From 3166a386eba1d9269352ba28d0d3dd5427bce57c Mon Sep 17 00:00:00 2001 From: nobody Date: Thu, 10 Apr 2003 19:59:37 +0000 Subject: This commit was manufactured by cvs2svn to create branch 'subset'. --- ACE-INSTALL.html | 2777 --- ACE-install.sh | 356 - ACEXML/ACEXML.dsw | 71 - ACEXML/Makefile | 21 - ACEXML/Makefile.bor | 10 - ACEXML/README | 17 - ACEXML/apps/Makefile | 17 - ACEXML/apps/Makefile.bor | 8 - ACEXML/apps/XML_Apps.dsw | 29 - ACEXML/apps/svcconf/Makefile | 400 - ACEXML/apps/svcconf/Makefile.bor | 20 - ACEXML/apps/svcconf/README | 4 - ACEXML/apps/svcconf/Svcconf.cpp | 117 - ACEXML/apps/svcconf/Svcconf.h | 48 - ACEXML/apps/svcconf/Svcconf_Handler.cpp | 642 - ACEXML/apps/svcconf/Svcconf_Handler.h | 292 - ACEXML/apps/svcconf/Svcconf_Handler.i | 133 - ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp | 121 - ACEXML/apps/svcconf/svcconf.mpc | 3 - ACEXML/common/ACEXML_Export.h | 49 - ACEXML/common/Attributes.h | 126 - ACEXML/common/AttributesImpl.cpp | 302 - ACEXML/common/AttributesImpl.h | 310 - ACEXML/common/AttributesImpl.i | 151 - ACEXML/common/Attributes_Def_Builder.cpp | 25 - ACEXML/common/Attributes_Def_Builder.h | 153 - ACEXML/common/CharStream.cpp | 7 - ACEXML/common/CharStream.h | 79 - ACEXML/common/ContentHandler.h | 128 - ACEXML/common/DTDHandler.h | 75 - ACEXML/common/DTD_Manager.cpp | 8 - ACEXML/common/DTD_Manager.h | 82 - ACEXML/common/DefaultHandler.cpp | 162 - ACEXML/common/DefaultHandler.h | 195 - ACEXML/common/DefaultHandler.i | 1 - ACEXML/common/Element_Def_Builder.cpp | 17 - ACEXML/common/Element_Def_Builder.h | 133 - ACEXML/common/Encoding.cpp | 53 - ACEXML/common/Encoding.h | 61 - ACEXML/common/EntityResolver.h | 57 - ACEXML/common/Env.cpp | 34 - ACEXML/common/Env.h | 72 - ACEXML/common/Env.i | 25 - ACEXML/common/ErrorHandler.h | 72 - ACEXML/common/Exception.cpp | 51 - ACEXML/common/Exception.h | 93 - ACEXML/common/Exception.i | 13 - ACEXML/common/FileCharStream.cpp | 227 - ACEXML/common/FileCharStream.h | 128 - ACEXML/common/HttpCharStream.cpp | 338 - ACEXML/common/HttpCharStream.h | 113 - ACEXML/common/InputSource.cpp | 100 - ACEXML/common/InputSource.h | 130 - ACEXML/common/Locator.h | 70 - ACEXML/common/LocatorImpl.cpp | 39 - ACEXML/common/LocatorImpl.h | 153 - ACEXML/common/LocatorImpl.i | 65 - ACEXML/common/Makefile | 2721 --- ACEXML/common/Makefile.bor | 38 - ACEXML/common/Mem_Map_Stream.cpp | 260 - ACEXML/common/Mem_Map_Stream.h | 192 - ACEXML/common/NamespaceSupport.cpp | 275 - ACEXML/common/NamespaceSupport.h | 239 - ACEXML/common/NamespaceSupport.i | 16 - ACEXML/common/SAXExceptions.cpp | 255 - ACEXML/common/SAXExceptions.h | 198 - ACEXML/common/SAXExceptions.i | 57 - ACEXML/common/StrCharStream.cpp | 135 - ACEXML/common/StrCharStream.h | 100 - ACEXML/common/StreamFactory.cpp | 43 - ACEXML/common/StreamFactory.h | 58 - ACEXML/common/Transcode.cpp | 83 - ACEXML/common/Transcode.h | 176 - ACEXML/common/Transcode.i | 234 - ACEXML/common/URL_Addr.cpp | 178 - ACEXML/common/URL_Addr.h | 134 - ACEXML/common/URL_Addr.inl | 61 - ACEXML/common/Validator.cpp | 8 - ACEXML/common/Validator.h | 64 - ACEXML/common/XMLFilter.h | 56 - ACEXML/common/XMLFilterImpl.cpp | 339 - ACEXML/common/XMLFilterImpl.h | 294 - ACEXML/common/XMLFilterImpl.i | 14 - ACEXML/common/XMLReader.h | 133 - ACEXML/common/XML_Codecs.cpp | 97 - ACEXML/common/XML_Codecs.h | 73 - ACEXML/common/XML_Common.dsp | 349 - ACEXML/common/XML_Macros.h | 443 - ACEXML/common/XML_Types.h | 80 - ACEXML/common/common.mpc | 4 - ACEXML/docs/TODO.txt | 17 - ACEXML/docs/bugs.txt | 17 - ACEXML/docs/guidelines.txt | 39 - ACEXML/docs/parser_features.txt | 25 - ACEXML/docs/readme.txt | 36 - ACEXML/examples/Makefile | 17 - ACEXML/examples/Makefile.bor | 9 - ACEXML/examples/SAXPrint/Makefile | 267 - ACEXML/examples/SAXPrint/Makefile.bor | 25 - ACEXML/examples/SAXPrint/Print_Handler.cpp | 256 - ACEXML/examples/SAXPrint/Print_Handler.h | 187 - ACEXML/examples/SAXPrint/Print_Handler.i | 1 - ACEXML/examples/SAXPrint/SAXPrint.dsp | 130 - ACEXML/examples/SAXPrint/SAXPrint.dsw | 29 - ACEXML/examples/SAXPrint/SAXPrint.mpc | 2 - ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp | 243 - ACEXML/examples/SAXPrint/SAXPrint_Handler.h | 195 - ACEXML/examples/SAXPrint/SAXPrint_Handler.i | 13 - ACEXML/examples/SAXPrint/broken.xml | 5 - ACEXML/examples/SAXPrint/main.cpp | 142 - ACEXML/examples/SAXPrint/ns.svc.conf.xml | 46 - ACEXML/examples/SAXPrint/simple.svcconf.xml | 38 - ACEXML/examples/SAXPrint/svc.conf.xml | 58 - ACEXML/examples/svcconf/Makefile.bor | 24 - ACEXML/examples/svcconf/README | 3 - ACEXML/examples/svcconf/Svcconf.dsp | 110 - ACEXML/examples/svcconf/Svcconf.dsw | 29 - ACEXML/examples/svcconf/Svcconf_Handler.cpp | 486 - ACEXML/examples/svcconf/Svcconf_Handler.h | 285 - ACEXML/examples/svcconf/Svcconf_Handler.i | 133 - ACEXML/examples/svcconf/main.cpp | 76 - ACEXML/examples/test_docs/svcconf.dtd | 60 - ACEXML/parser/Makefile | 17 - ACEXML/parser/Makefile.bor | 9 - .../debug_validator/Debug_Attributes_Builder.cpp | 215 - .../debug_validator/Debug_Attributes_Builder.h | 170 - .../parser/debug_validator/Debug_DTD_Manager.cpp | 71 - ACEXML/parser/debug_validator/Debug_DTD_Manager.h | 76 - .../debug_validator/Debug_DTD_Manager_Export.h | 38 - .../debug_validator/Debug_Element_Builder.cpp | 148 - .../parser/debug_validator/Debug_Element_Builder.h | 127 - ACEXML/parser/debug_validator/Debug_Validator.dsp | 145 - ACEXML/parser/debug_validator/Element_Tree.cpp | 72 - ACEXML/parser/debug_validator/Element_Tree.h | 160 - ACEXML/parser/debug_validator/Element_Tree.i | 92 - ACEXML/parser/debug_validator/Makefile.bor | 22 - ACEXML/parser/parser/Entity_Manager.cpp | 48 - ACEXML/parser/parser/Entity_Manager.h | 81 - ACEXML/parser/parser/Entity_Manager.i | 21 - ACEXML/parser/parser/Makefile | 328 - ACEXML/parser/parser/Makefile.bor | 20 - ACEXML/parser/parser/Parser.cpp | 1960 -- ACEXML/parser/parser/Parser.dsp | 125 - ACEXML/parser/parser/Parser.dsw | 28 - ACEXML/parser/parser/Parser.h | 516 - ACEXML/parser/parser/Parser.i | 140 - ACEXML/parser/parser/Parser_export.h | 47 - ACEXML/parser/parser/parser.mpc | 7 - ACEXML/tests/ContentHandler_Test.cpp | 91 - ACEXML/tests/ContentHandler_Test.dsp | 104 - ACEXML/tests/HttpCharStream_Test.cpp | 35 - ACEXML/tests/HttpCharStream_Test.dsp | 104 - ACEXML/tests/Makefile | 650 - ACEXML/tests/Makefile.bor | 26 - ACEXML/tests/NamespaceSupport_Test.cpp | 144 - ACEXML/tests/NamespaceSupport_Test.dsp | 104 - ACEXML/tests/Tests.dsw | 67 - ACEXML/tests/Transcoder_Test.cpp | 69 - ACEXML/tests/Transcoder_Test.dsp | 104 - ACEXML/tests/tests.mpc | 23 - ASNMP/COPYRIGHT | 68 - ASNMP/ChangeLog | 382 - ASNMP/Makefile | 34 - ASNMP/README | 177 - ASNMP/TO-DO | 3 - ASNMP/agent/Makefile | 45 - ASNMP/agent/agent_impl.cpp | 157 - ASNMP/agent/agent_impl.h | 52 - ASNMP/agent/main.cpp | 27 - ASNMP/agent/snmp_agent.cpp | 96 - ASNMP/agent/snmp_agent.h | 48 - ASNMP/asnmp-overview.html | 134 - ASNMP/asnmp/ChangeLog | 161 - ASNMP/asnmp/Makefile | 1028 - ASNMP/asnmp/TODO | 25 - ASNMP/asnmp/address.cpp | 2686 --- ASNMP/asnmp/address.h | 813 - ASNMP/asnmp/asn1.cpp | 1728 -- ASNMP/asnmp/asn1.h | 342 - ASNMP/asnmp/counter.cpp | 106 - ASNMP/asnmp/counter.h | 79 - ASNMP/asnmp/ctr64.cpp | 211 - ASNMP/asnmp/ctr64.h | 110 - ASNMP/asnmp/enttraps.h | 118 - ASNMP/asnmp/gauge.cpp | 113 - ASNMP/asnmp/gauge.h | 80 - ASNMP/asnmp/integer.cpp | 227 - ASNMP/asnmp/integer.h | 140 - ASNMP/asnmp/octet.cpp | 594 - ASNMP/asnmp/octet.h | 150 - ASNMP/asnmp/oid.cpp | 800 - ASNMP/asnmp/oid.h | 170 - ASNMP/asnmp/oid_def.h | 87 - ASNMP/asnmp/pdu.cpp | 496 - ASNMP/asnmp/pdu.h | 213 - ASNMP/asnmp/sagent.cpp | 97 - ASNMP/asnmp/sagent.h | 83 - ASNMP/asnmp/smi.h | 153 - ASNMP/asnmp/smival.h | 104 - ASNMP/asnmp/snmp.cpp | 283 - ASNMP/asnmp/snmp.h | 134 - ASNMP/asnmp/snmperrs.h | 214 - ASNMP/asnmp/target.cpp | 324 - ASNMP/asnmp/target.h | 252 - ASNMP/asnmp/timetick.cpp | 142 - ASNMP/asnmp/timetick.h | 85 - ASNMP/asnmp/transaction.cpp | 202 - ASNMP/asnmp/transaction.h | 80 - ASNMP/asnmp/transaction_result.h | 29 - ASNMP/asnmp/vb.cpp | 396 - ASNMP/asnmp/vb.h | 204 - ASNMP/asnmp/wpdu.cpp | 520 - ASNMP/asnmp/wpdu.h | 85 - ASNMP/examples/Makefile | 28 - ASNMP/examples/get/Makefile | 44 - ASNMP/examples/get/get.cpp | 195 - ASNMP/examples/get/get_async.cpp | 204 - ASNMP/examples/next/Makefile | 45 - ASNMP/examples/next/next.cpp | 193 - ASNMP/examples/set/Makefile | 45 - ASNMP/examples/set/set.cpp | 263 - ASNMP/examples/trap/Makefile | 45 - ASNMP/examples/trap/purify4.1.txt | 117 - ASNMP/examples/trap/trap.cpp | 182 - ASNMP/examples/walk/Makefile | 45 - ASNMP/examples/walk/walk.cpp | 260 - ASNMP/mibs/RFC1213-MIB.my | 2618 --- ASNMP/tests/Address_Test.cpp | 549 - ASNMP/tests/Counter64_Test.cpp | 154 - ASNMP/tests/Counter_Test.cpp | 136 - ASNMP/tests/Gauge_Test.cpp | 128 - ASNMP/tests/Integer_Test.cpp | 194 - ASNMP/tests/Makefile | 503 - ASNMP/tests/Octet_Test.cpp | 156 - ASNMP/tests/Oid_Test.cpp | 181 - ASNMP/tests/Target_Test.cpp | 147 - ASNMP/tests/Varbind_Test.cpp | 195 - ASNMP/tests/run_tests.bat | 44 - ASNMP/tests/run_tests.sh | 61 - ASNMP/tests/test_config.h | 197 - AUTHORS | 11 - COPYING | 90 - ChangeLog | 2324 --- ChangeLogs/ChangeLog-00a | 12664 ------------ ChangeLogs/ChangeLog-00b | 3845 ---- ChangeLogs/ChangeLog-01a | 8155 -------- ChangeLogs/ChangeLog-01b | 8242 -------- ChangeLogs/ChangeLog-02a | 9018 --------- ChangeLogs/ChangeLog-02b | 7227 ------- ChangeLogs/ChangeLog-03a | 1338 -- ChangeLogs/ChangeLog-93 | 52 - ChangeLogs/ChangeLog-94 | 1027 - ChangeLogs/ChangeLog-95 | 4179 ---- ChangeLogs/ChangeLog-96a | 3889 ---- ChangeLogs/ChangeLog-96b | 5878 ------ ChangeLogs/ChangeLog-97a | 9203 --------- ChangeLogs/ChangeLog-97b | 9182 --------- ChangeLogs/ChangeLog-98a | 6588 ------ ChangeLogs/ChangeLog-98b | 12943 ------------ ChangeLogs/ChangeLog-99a | 13411 ------------- ChangeLogs/ChangeLog-99b | 7290 ------- FAQ | 1847 -- Kokyu/Default_Dispatcher_Impl.cpp | 133 - Kokyu/Default_Dispatcher_Impl.h | 74 - Kokyu/Default_Dispatcher_Impl.i | 21 - Kokyu/Dispatcher_Impl.cpp | 9 - Kokyu/Dispatcher_Impl.h | 52 - Kokyu/Dispatcher_Impl.i | 28 - Kokyu/Dispatcher_Task.cpp | 155 - Kokyu/Dispatcher_Task.h | 106 - Kokyu/Dispatcher_Task.i | 76 - Kokyu/Kokyu.cpp | 45 - Kokyu/Kokyu.dsw | 41 - Kokyu/Kokyu.h | 136 - Kokyu/Kokyu.i | 33 - Kokyu/Kokyu.mpc | 7 - Kokyu/Kokyu_DLL.dsp | 198 - Kokyu/Kokyu_Static.dsp | 186 - Kokyu/Makefile | 582 - Kokyu/kokyu_export.h | 55 - Kokyu/tests/EDF/EDF.dsp | 104 - Kokyu/tests/EDF/EDF.dsw | 29 - Kokyu/tests/EDF/test.cpp | 96 - Kokyu/tests/FIFO/FIFO.dsp | 104 - Kokyu/tests/FIFO/FIFO.dsw | 29 - Kokyu/tests/FIFO/test.cpp | 84 - Makefile | 242 - Makefile.am | 101 - Makefile.bor | 24 - PACE/ChangeLog | 3716 ---- PACE/Makefile | 43 - PACE/Makefile.am | 30 - PACE/README | 49 - PACE/THANKS | 18 - PACE/VERSION | 5 - PACE/docs/ACE_Integration.txt | 17 - PACE/docs/README | 1 - PACE/docs/www/Introduction/begin.html | 135 - PACE/docs/www/Introduction/build.html | 107 - PACE/docs/www/Introduction/change.html | 108 - PACE/docs/www/Introduction/phases.html | 108 - PACE/docs/www/Introduction/porting.html | 111 - PACE/docs/www/Introduction/struct.html | 123 - PACE/docs/www/Introduction/team.html | 111 - PACE/docs/www/Introduction/using.html | 108 - PACE/docs/www/PACE-abstract.html | 152 - PACE/docs/www/PACE-car.html | 28 - PACE/docs/www/PACE-docs.html | 109 - PACE/docs/www/PACE-obtain.html | 124 - PACE/docs/www/PACE-overview.html | 229 - PACE/docs/www/PACE.html | 150 - PACE/docs/www/Pix/PACE-mini-logo.gif | Bin 7226 -> 0 bytes PACE/docs/www/Pix/PACE-red-blue-logo.gif | Bin 26888 -> 0 bytes PACE/docs/www/Pix/PACE-red-blue-smaller.gif | Bin 30650 -> 0 bytes PACE/docs/www/Pix/ace-tmp.jpg | Bin 15369 -> 0 bytes PACE/docs/www/Pix/doc-logo.jpg | Bin 18630 -> 0 bytes PACE/docs/www/Pix/heli-1.jpg | Bin 13921 -> 0 bytes PACE/docs/www/Pix/pace-car1.jpg | Bin 37364 -> 0 bytes PACE/docs/www/Pix/pace-car2.jpg | Bin 18615 -> 0 bytes PACE/docs/www/Pix/pace-car3.jpg | Bin 23161 -> 0 bytes PACE/docs/www/Pix/redball.gif | Bin 326 -> 0 bytes PACE/docs/www/Pix/stealth.jpg | Bin 40575 -> 0 bytes PACE/docs/www/index.html | 150 - PACE/examples/README | 0 PACE/include/makeinclude/rules.common.GNU | 121 - PACE/pace++/README | 0 PACE/pace/Makefile | 498 - PACE/pace/Makefile.am | 64 - PACE/pace/aio.h | 125 - PACE/pace/assert.h | 64 - PACE/pace/config/compiler.h | 69 - PACE/pace/config/config.h | 221 - PACE/pace/config/constants.h | 244 - PACE/pace/config/defaults.h | 26 - PACE/pace/config/defines.h | 27 - PACE/pace/config/features.h | 49 - PACE/pace/config/platform.h | 86 - PACE/pace/config/utility.h | 118 - PACE/pace/ctype.h | 164 - PACE/pace/dirent.h | 95 - PACE/pace/emulation/mqueue.c | 570 - PACE/pace/emulation/mqueue.h | 95 - PACE/pace/emulation/time.h | 46 - PACE/pace/errno.h | 37 - PACE/pace/fcntl.h | 94 - PACE/pace/grp.h | 93 - PACE/pace/limits.h | 29 - PACE/pace/locale.h | 65 - PACE/pace/man/Makefile | 13 - PACE/pace/man/banner | 5 - PACE/pace/man/pace.jpg | Bin 19144 -> 0 bytes PACE/pace/math.h | 245 - PACE/pace/mqueue.h | 131 - PACE/pace/posix/Makefile.am | 113 - PACE/pace/posix/README | 1 - PACE/pace/posix/TODO | 7 - PACE/pace/posix/aio.c | 20 - PACE/pace/posix/aio.h | 45 - PACE/pace/posix/aio.inl | 94 - PACE/pace/posix/assert.c | 20 - PACE/pace/posix/assert.h | 29 - PACE/pace/posix/assert.inl | 14 - PACE/pace/posix/ctype.c | 20 - PACE/pace/posix/ctype.h | 27 - PACE/pace/posix/ctype.inl | 133 - PACE/pace/posix/dirent.c | 20 - PACE/pace/posix/dirent.h | 40 - PACE/pace/posix/dirent.inl | 68 - PACE/pace/posix/errno.h | 76 - PACE/pace/posix/fcntl.c | 20 - PACE/pace/posix/fcntl.h | 63 - PACE/pace/posix/fcntl.inl | 23 - PACE/pace/posix/grp.c | 20 - PACE/pace/posix/grp.h | 34 - PACE/pace/posix/grp.inl | 73 - PACE/pace/posix/limits.h | 29 - PACE/pace/posix/locale.c | 20 - PACE/pace/posix/locale.h | 40 - PACE/pace/posix/locale.inl | 34 - PACE/pace/posix/math.c | 20 - PACE/pace/posix/math.h | 29 - PACE/pace/posix/math.inl | 215 - PACE/pace/posix/mman.c | 20 - PACE/pace/posix/mman.h | 42 - PACE/pace/posix/mman.inl | 127 - PACE/pace/posix/mqueue.c | 24 - PACE/pace/posix/mqueue.h | 43 - PACE/pace/posix/mqueue.inl | 87 - PACE/pace/posix/pthread.c | 20 - PACE/pace/posix/pthread.h | 81 - PACE/pace/posix/pthread.inl | 761 - PACE/pace/posix/pwd.c | 20 - PACE/pace/posix/pwd.h | 35 - PACE/pace/posix/pwd.inl | 81 - PACE/pace/posix/sched.c | 20 - PACE/pace/posix/sched.h | 38 - PACE/pace/posix/sched.inl | 95 - PACE/pace/posix/semaphore.c | 20 - PACE/pace/posix/semaphore.h | 31 - PACE/pace/posix/semaphore.inl | 86 - PACE/pace/posix/setjmp.c | 20 - PACE/pace/posix/setjmp.h | 32 - PACE/pace/posix/setjmp.inl | 34 - PACE/pace/posix/signal.c | 28 - PACE/pace/posix/signal.h | 71 - PACE/pace/posix/signal.inl | 167 - PACE/pace/posix/socket.c | 20 - PACE/pace/posix/socket.h | 231 - PACE/pace/posix/socket.inl | 242 - PACE/pace/posix/stat.c | 20 - PACE/pace/posix/stat.h | 58 - PACE/pace/posix/stat.inl | 77 - PACE/pace/posix/stdio.c | 20 - PACE/pace/posix/stdio.h | 58 - PACE/pace/posix/stdio.inl | 502 - PACE/pace/posix/stdlib.c | 20 - PACE/pace/posix/stdlib.h | 64 - PACE/pace/posix/stdlib.inl | 323 - PACE/pace/posix/string.c | 20 - PACE/pace/posix/string.h | 36 - PACE/pace/posix/string.inl | 206 - PACE/pace/posix/termios.c | 20 - PACE/pace/posix/termios.h | 50 - PACE/pace/posix/termios.inl | 109 - PACE/pace/posix/time.c | 20 - PACE/pace/posix/time.h | 95 - PACE/pace/posix/time.inl | 324 - PACE/pace/posix/times.c | 20 - PACE/pace/posix/times.h | 39 - PACE/pace/posix/times.inl | 23 - PACE/pace/posix/types.h | 134 - PACE/pace/posix/unistd.c | 20 - PACE/pace/posix/unistd.h | 56 - PACE/pace/posix/unistd.inl | 470 - PACE/pace/posix/utime.c | 20 - PACE/pace/posix/utime.h | 35 - PACE/pace/posix/utime.inl | 24 - PACE/pace/posix/utsname.c | 20 - PACE/pace/posix/utsname.h | 34 - PACE/pace/posix/utsname.inl | 23 - PACE/pace/posix/wait.c | 20 - PACE/pace/posix/wait.h | 38 - PACE/pace/posix/wait.inl | 34 - PACE/pace/pthread.h | 733 - PACE/pace/pwd.h | 93 - PACE/pace/sched.h | 124 - PACE/pace/semaphore.h | 130 - PACE/pace/setjmp.h | 85 - PACE/pace/signal.h | 199 - PACE/pace/stddef.h | 53 - PACE/pace/stdio.h | 528 - PACE/pace/stdlib.h | 305 - PACE/pace/string.h | 240 - PACE/pace/sys/mman.h | 151 - PACE/pace/sys/socket.h | 252 - PACE/pace/sys/stat.h | 80 - PACE/pace/sys/times.h | 51 - PACE/pace/sys/types.h | 37 - PACE/pace/sys/utsname.h | 51 - PACE/pace/sys/wait.h | 67 - PACE/pace/termios.h | 145 - PACE/pace/time.h | 274 - PACE/pace/unistd.h | 524 - PACE/pace/utime.h | 57 - PACE/pace/vxworks/README | 1 - PACE/pace/vxworks/aio.c | 20 - PACE/pace/vxworks/aio.h | 45 - PACE/pace/vxworks/aio.inl | 112 - PACE/pace/vxworks/assert.c | 20 - PACE/pace/vxworks/assert.h | 29 - PACE/pace/vxworks/assert.inl | 14 - PACE/pace/vxworks/ctype.c | 20 - PACE/pace/vxworks/ctype.h | 27 - PACE/pace/vxworks/ctype.inl | 159 - PACE/pace/vxworks/dirent.c | 20 - PACE/pace/vxworks/dirent.h | 40 - PACE/pace/vxworks/dirent.inl | 74 - PACE/pace/vxworks/errno.h | 75 - PACE/pace/vxworks/fcntl.c | 20 - PACE/pace/vxworks/fcntl.h | 63 - PACE/pace/vxworks/fcntl.inl | 39 - PACE/pace/vxworks/grp.c | 20 - PACE/pace/vxworks/grp.h | 32 - PACE/pace/vxworks/grp.inl | 82 - PACE/pace/vxworks/limits.h | 29 - PACE/pace/vxworks/locale.c | 20 - PACE/pace/vxworks/locale.h | 40 - PACE/pace/vxworks/locale.inl | 38 - PACE/pace/vxworks/math.c | 20 - PACE/pace/vxworks/math.h | 29 - PACE/pace/vxworks/math.inl | 259 - PACE/pace/vxworks/mman.c | 20 - PACE/pace/vxworks/mman.h | 42 - PACE/pace/vxworks/mman.inl | 153 - PACE/pace/vxworks/mqueue.c | 20 - PACE/pace/vxworks/mqueue.h | 43 - PACE/pace/vxworks/mqueue.inl | 101 - PACE/pace/vxworks/pthread.c | 1376 -- PACE/pace/vxworks/pthread.h | 163 - PACE/pace/vxworks/pthread.inl | 935 - PACE/pace/vxworks/pwd.c | 20 - PACE/pace/vxworks/pwd.h | 34 - PACE/pace/vxworks/pwd.inl | 82 - PACE/pace/vxworks/sched.c | 20 - PACE/pace/vxworks/sched.h | 38 - PACE/pace/vxworks/sched.inl | 107 - PACE/pace/vxworks/semaphore.c | 20 - PACE/pace/vxworks/semaphore.h | 31 - PACE/pace/vxworks/semaphore.inl | 102 - PACE/pace/vxworks/setjmp.c | 20 - PACE/pace/vxworks/setjmp.h | 33 - PACE/pace/vxworks/setjmp.inl | 38 - PACE/pace/vxworks/signal.c | 28 - PACE/pace/vxworks/signal.h | 71 - PACE/pace/vxworks/signal.inl | 207 - PACE/pace/vxworks/socket.c | 20 - PACE/pace/vxworks/socket.h | 218 - PACE/pace/vxworks/socket.inl | 280 - PACE/pace/vxworks/stat.c | 20 - PACE/pace/vxworks/stat.h | 59 - PACE/pace/vxworks/stat.inl | 99 - PACE/pace/vxworks/stdio.c | 20 - PACE/pace/vxworks/stdio.h | 58 - PACE/pace/vxworks/stdio.inl | 565 - PACE/pace/vxworks/stdlib.c | 20 - PACE/pace/vxworks/stdlib.h | 64 - PACE/pace/vxworks/stdlib.inl | 381 - PACE/pace/vxworks/string.c | 20 - PACE/pace/vxworks/string.h | 36 - PACE/pace/vxworks/string.inl | 238 - PACE/pace/vxworks/termios.c | 20 - PACE/pace/vxworks/termios.h | 49 - PACE/pace/vxworks/termios.inl | 145 - PACE/pace/vxworks/time.c | 20 - PACE/pace/vxworks/time.h | 87 - PACE/pace/vxworks/time.inl | 296 - PACE/pace/vxworks/times.c | 20 - PACE/pace/vxworks/times.h | 39 - PACE/pace/vxworks/times.inl | 26 - PACE/pace/vxworks/types.h | 261 - PACE/pace/vxworks/unistd.c | 20 - PACE/pace/vxworks/unistd.h | 56 - PACE/pace/vxworks/unistd.inl | 601 - PACE/pace/vxworks/utime.c | 20 - PACE/pace/vxworks/utime.h | 35 - PACE/pace/vxworks/utime.inl | 27 - PACE/pace/vxworks/utsname.c | 20 - PACE/pace/vxworks/utsname.h | 47 - PACE/pace/vxworks/utsname.inl | 40 - PACE/pace/vxworks/wait.c | 20 - PACE/pace/vxworks/wait.h | 38 - PACE/pace/vxworks/wait.inl | 42 - PACE/pace/win32/README | 1 - PACE/pace/win32/TODO | 29 - PACE/pace/win32/aio.c | 20 - PACE/pace/win32/aio.h | 44 - PACE/pace/win32/aio.inl | 106 - PACE/pace/win32/assert.c | 20 - PACE/pace/win32/assert.h | 29 - PACE/pace/win32/assert.inl | 14 - PACE/pace/win32/ctype.c | 20 - PACE/pace/win32/ctype.h | 27 - PACE/pace/win32/ctype.inl | 133 - PACE/pace/win32/dirent.c | 100 - PACE/pace/win32/dirent.h | 74 - PACE/pace/win32/dirent.inl | 68 - PACE/pace/win32/errno.h | 84 - PACE/pace/win32/fcntl.c | 164 - PACE/pace/win32/fcntl.h | 71 - PACE/pace/win32/fcntl.inl | 38 - PACE/pace/win32/grp.c | 20 - PACE/pace/win32/grp.h | 34 - PACE/pace/win32/grp.inl | 72 - PACE/pace/win32/limits.h | 29 - PACE/pace/win32/locale.c | 20 - PACE/pace/win32/locale.h | 40 - PACE/pace/win32/locale.inl | 34 - PACE/pace/win32/math.c | 20 - PACE/pace/win32/math.h | 29 - PACE/pace/win32/math.inl | 215 - PACE/pace/win32/mman.c | 123 - PACE/pace/win32/mman.h | 65 - PACE/pace/win32/mman.inl | 129 - PACE/pace/win32/mqueue.c | 20 - PACE/pace/win32/mqueue.h | 45 - PACE/pace/win32/mqueue.inl | 104 - PACE/pace/win32/pace.dsw | 41 - PACE/pace/win32/pace_dll.dsp | 623 - PACE/pace/win32/pace_lib.dsp | 609 - PACE/pace/win32/pthread.c | 359 - PACE/pace/win32/pthread.h | 178 - PACE/pace/win32/pthread.inl | 682 - PACE/pace/win32/pthreadtypes.h | 132 - PACE/pace/win32/pwd.c | 20 - PACE/pace/win32/pwd.h | 34 - PACE/pace/win32/pwd.inl | 72 - PACE/pace/win32/sched.c | 20 - PACE/pace/win32/sched.h | 34 - PACE/pace/win32/sched.inl | 103 - PACE/pace/win32/schedtypes.h | 67 - PACE/pace/win32/semaphore.c | 122 - PACE/pace/win32/semaphore.h | 62 - PACE/pace/win32/semaphore.inl | 108 - PACE/pace/win32/setjmp.c | 20 - PACE/pace/win32/setjmp.h | 42 - PACE/pace/win32/setjmp.inl | 36 - PACE/pace/win32/signal.c | 45 - PACE/pace/win32/signal.h | 81 - PACE/pace/win32/signal.inl | 193 - PACE/pace/win32/socket.c | 9 - PACE/pace/win32/socket.h | 5 - PACE/pace/win32/socket.inl | 7 - PACE/pace/win32/stat.c | 40 - PACE/pace/win32/stat.h | 65 - PACE/pace/win32/stat.inl | 99 - PACE/pace/win32/stdio.c | 51 - PACE/pace/win32/stdio.h | 90 - PACE/pace/win32/stdio.inl | 464 - PACE/pace/win32/stdlib.c | 20 - PACE/pace/win32/stdlib.h | 63 - PACE/pace/win32/stdlib.inl | 303 - PACE/pace/win32/string.c | 42 - PACE/pace/win32/string.h | 42 - PACE/pace/win32/string.inl | 198 - PACE/pace/win32/termios.c | 20 - PACE/pace/win32/termios.h | 56 - PACE/pace/win32/termios.inl | 124 - PACE/pace/win32/time.c | 20 - PACE/pace/win32/time.h | 107 - PACE/pace/win32/time.inl | 265 - PACE/pace/win32/times.c | 20 - PACE/pace/win32/times.h | 40 - PACE/pace/win32/times.inl | 24 - PACE/pace/win32/types.h | 100 - PACE/pace/win32/unistd.c | 146 - PACE/pace/win32/unistd.h | 119 - PACE/pace/win32/unistd.inl | 514 - PACE/pace/win32/utime.c | 41 - PACE/pace/win32/utime.h | 43 - PACE/pace/win32/utime.inl | 33 - PACE/pace/win32/utsname.c | 181 - PACE/pace/win32/utsname.h | 43 - PACE/pace/win32/utsname.inl | 26 - PACE/pace/win32/wait.c | 20 - PACE/pace/win32/wait.h | 38 - PACE/pace/win32/wait.inl | 45 - PACE/tests/Cond_Var_Test.c | 136 - PACE/tests/Makefile | 204 - PACE/tests/Makefile.am | 54 - PACE/tests/Posix_SP_Test.c | 253 - PACE/tests/Pthread_Storage_Test.c | 144 - PACE/tests/Pthreads_Test.c | 110 - PACE/tests/README | 6 - PACE/tests/Stat_Test.c | 83 - PACE/tests/Stdio_Test.c | 123 - PACE/tests/mqueue_test.c | 134 - PACE/tests/test_stdio.dsp | 162 - PACE/tests/tests.dsw | 59 - PACE/tests/vxworks_stub.c | 109 - PROBLEM-REPORT-FORM | 76 - README | 220 - Static_Performance.dsw | 263 - TAO/performance-tests/AMI_Latency/Roundtrip.cpp | 26 - TAO/performance-tests/AMI_Latency/Roundtrip.h | 46 - .../AMI_Latency/Roundtrip_Handler.cpp | 75 - .../AMI_Latency/Roundtrip_Handler.h | 61 - TAO/performance-tests/AMI_Latency/Server_Task.cpp | 24 - TAO/performance-tests/AMI_Latency/client.cpp | 185 - TAO/performance-tests/AMI_Latency/server.cpp | 155 - TAO/performance-tests/DII_Latency/Roundtrip.cpp | 26 - TAO/performance-tests/DII_Latency/Roundtrip.h | 46 - TAO/performance-tests/DII_Latency/client.cpp | 178 - TAO/performance-tests/DII_Latency/server.cpp | 136 - TAO/performance-tests/DSI_Latency/Roundtrip.cpp | 97 - TAO/performance-tests/DSI_Latency/Roundtrip.h | 48 - TAO/performance-tests/DSI_Latency/client.cpp | 163 - TAO/performance-tests/DSI_Latency/server.cpp | 142 - .../Deferred_Latency/Roundtrip.cpp | 26 - TAO/performance-tests/Deferred_Latency/Roundtrip.h | 46 - TAO/performance-tests/Deferred_Latency/client.cpp | 203 - TAO/performance-tests/Deferred_Latency/server.cpp | 136 - .../Endpoint_Per_Priority/Makefile | 616 - .../Single_Threaded_Latency/Roundtrip.cpp | 26 - .../Single_Threaded_Latency/Roundtrip.h | 46 - .../Single_Threaded_Latency/client.cpp | 164 - .../Single_Threaded_Latency/server.cpp | 136 - .../Thread_Per_Connection_Latency/Client_Task.cpp | 65 - .../Thread_Per_Connection_Latency/Client_Task.h | 46 - .../Thread_Per_Connection_Latency/Roundtrip.cpp | 26 - .../Thread_Per_Connection_Latency/Roundtrip.h | 46 - .../Thread_Per_Connection_Latency/client.cpp | 149 - .../Thread_Per_Connection_Latency/server.cpp | 136 - .../Thread_Pool_Latency/Client_Task.cpp | 65 - .../Thread_Pool_Latency/Client_Task.h | 46 - .../Thread_Pool_Latency/Roundtrip.cpp | 26 - .../Thread_Pool_Latency/Roundtrip.h | 46 - .../Thread_Pool_Latency/Worker_Thread.cpp | 24 - .../Thread_Pool_Latency/client.cpp | 149 - .../Thread_Pool_Latency/server.cpp | 139 - THANKS | 1711 -- TODO | 264 - VERSION | 11 - acconfig.h | 1469 -- ace-config.1.in | 57 - ace-config.in | 215 - ace/ACE.cpp | 3493 ---- ace/ACE.h | 786 - ace/ACE.i | 312 - ace/ACE_export.h | 46 - ace/ARGV.cpp | 345 - ace/ARGV.h | 179 - ace/ARGV.i | 68 - ace/ATM_Acceptor.cpp | 309 - ace/ATM_Acceptor.h | 110 - ace/ATM_Acceptor.i | 30 - ace/ATM_Addr.cpp | 503 - ace/ATM_Addr.h | 186 - ace/ATM_Addr.i | 49 - ace/ATM_Connector.cpp | 141 - ace/ATM_Connector.h | 158 - ace/ATM_Connector.i | 120 - ace/ATM_Params.cpp | 22 - ace/ATM_Params.h | 210 - ace/ATM_Params.i | 224 - ace/ATM_QoS.cpp | 633 - ace/ATM_QoS.h | 103 - ace/ATM_QoS.i | 17 - ace/ATM_Stream.cpp | 292 - ace/ATM_Stream.h | 99 - ace/ATM_Stream.i | 124 - ace/Acceptor.cpp | 1213 -- ace/Acceptor.h | 657 - ace/Activation_Queue.cpp | 109 - ace/Activation_Queue.h | 162 - ace/Activation_Queue.i | 34 - ace/Active_Map_Manager.cpp | 10 - ace/Active_Map_Manager.h | 110 - ace/Active_Map_Manager.i | 89 - ace/Active_Map_Manager_T.cpp | 20 - ace/Active_Map_Manager_T.h | 205 - ace/Active_Map_Manager_T.i | 303 - ace/Addr.cpp | 66 - ace/Addr.h | 108 - ace/Addr.i | 69 - ace/Arg_Shifter.cpp | 207 - ace/Arg_Shifter.h | 204 - ace/Argv_Type_Converter.cpp | 200 - ace/Argv_Type_Converter.h | 116 - ace/Argv_Type_Converter.inl | 41 - ace/Array.h | 27 - ace/Array_Base.cpp | 204 - ace/Array_Base.h | 210 - ace/Array_Base.inl | 84 - ace/Asynch_Acceptor.cpp | 461 - ace/Asynch_Acceptor.h | 286 - ace/Asynch_Connector.cpp | 288 - ace/Asynch_Connector.h | 169 - ace/Asynch_IO.cpp | 1452 -- ace/Asynch_IO.h | 1608 -- ace/Asynch_IO_Impl.cpp | 117 - ace/Asynch_IO_Impl.h | 820 - ace/Asynch_IO_Impl.i | 100 - ace/Asynch_Pseudo_Task.cpp | 313 - ace/Asynch_Pseudo_Task.h | 79 - ace/Atomic_Op.cpp | 227 - ace/Atomic_Op.h | 163 - ace/Atomic_Op.i | 150 - ace/Atomic_Op_T.cpp | 80 - ace/Atomic_Op_T.h | 254 - ace/Atomic_Op_T.i | 262 - ace/Auto_IncDec_T.cpp | 30 - ace/Auto_IncDec_T.h | 88 - ace/Auto_IncDec_T.i | 21 - ace/Auto_Ptr.cpp | 42 - ace/Auto_Ptr.h | 188 - ace/Auto_Ptr.i | 144 - ace/Base_Thread_Adapter.cpp | 125 - ace/Base_Thread_Adapter.h | 167 - ace/Base_Thread_Adapter.inl | 34 - ace/Based_Pointer_Repository.cpp | 127 - ace/Based_Pointer_Repository.h | 79 - ace/Based_Pointer_T.cpp | 114 - ace/Based_Pointer_T.h | 201 - ace/Based_Pointer_T.i | 136 - ace/Basic_Stats.cpp | 73 - ace/Basic_Stats.h | 87 - ace/Basic_Stats.inl | 59 - ace/Basic_Types.cpp | 131 - ace/Basic_Types.h | 668 - ace/Basic_Types.i | 529 - ace/Bound_Ptr.h | 338 - ace/Bound_Ptr.i | 481 - ace/CDR_Base.cpp | 591 - ace/CDR_Base.h | 298 - ace/CDR_Base.inl | 196 - ace/CDR_Stream.cpp | 1617 -- ace/CDR_Stream.h | 1239 -- ace/CDR_Stream.i | 1647 -- ace/CE_Screen_Output.cpp | 155 - ace/CE_Screen_Output.h | 103 - ace/CLASSIX/CLASSIX_Addr.cpp | 13 - ace/CLASSIX/CLASSIX_Addr.h | 99 - ace/CLASSIX/CLASSIX_Addr.i | 56 - ace/CLASSIX/CLASSIX_CLD_Connector.cpp | 116 - ace/CLASSIX/CLASSIX_CLD_Connector.h | 134 - ace/CLASSIX/CLASSIX_CLD_Connector.i | 24 - ace/CLASSIX/CLASSIX_CO_Acceptor.cpp | 199 - ace/CLASSIX/CLASSIX_CO_Acceptor.h | 146 - ace/CLASSIX/CLASSIX_CO_Acceptor.i | 31 - ace/CLASSIX/CLASSIX_CO_Connector.cpp | 118 - ace/CLASSIX/CLASSIX_CO_Connector.h | 118 - ace/CLASSIX/CLASSIX_CO_Connector.i | 36 - ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp | 83 - ace/CLASSIX/CLASSIX_Dgram_Mcast.h | 94 - ace/CLASSIX/CLASSIX_Dgram_Mcast.i | 21 - ace/CLASSIX/CLASSIX_Group.cpp | 89 - ace/CLASSIX/CLASSIX_Group.h | 118 - ace/CLASSIX/CLASSIX_Group.i | 89 - ace/CLASSIX/CLASSIX_Group_Dynamic.cpp | 22 - ace/CLASSIX/CLASSIX_Group_Dynamic.h | 63 - ace/CLASSIX/CLASSIX_Group_Dynamic.i | 16 - ace/CLASSIX/CLASSIX_Group_Stamp.cpp | 52 - ace/CLASSIX/CLASSIX_Group_Stamp.h | 90 - ace/CLASSIX/CLASSIX_Group_Stamp.i | 32 - ace/CLASSIX/CLASSIX_OS.cpp | 117 - ace/CLASSIX/CLASSIX_OS.h | 134 - ace/CLASSIX/CLASSIX_OS.i | 56 - ace/CLASSIX/CLASSIX_Peer_SAP.cpp | 77 - ace/CLASSIX/CLASSIX_Peer_SAP.h | 108 - ace/CLASSIX/CLASSIX_Peer_SAP.i | 99 - ace/CLASSIX/CLASSIX_Port.cpp | 129 - ace/CLASSIX/CLASSIX_Port.h | 162 - ace/CLASSIX/CLASSIX_Port.i | 112 - ace/CLASSIX/CLASSIX_Port_Core.cpp | 70 - ace/CLASSIX/CLASSIX_Port_Core.h | 103 - ace/CLASSIX/CLASSIX_Port_Core.i | 38 - ace/CLASSIX/CLASSIX_Port_Default.cpp | 26 - ace/CLASSIX/CLASSIX_Port_Default.h | 80 - ace/CLASSIX/CLASSIX_Port_Default.i | 28 - ace/CLASSIX/CLASSIX_SAP.cpp | 153 - ace/CLASSIX/CLASSIX_SAP.h | 145 - ace/CLASSIX/CLASSIX_SAP.i | 58 - ace/CLASSIX/CLASSIX_Select_Reactor.cpp | 337 - ace/CLASSIX/CLASSIX_Select_Reactor.h | 209 - ace/CLASSIX/CLASSIX_Select_Reactor.i | 63 - ace/CLASSIX/CLASSIX_Stream.cpp | 362 - ace/CLASSIX/CLASSIX_Stream.h | 272 - ace/CLASSIX/CLASSIX_Stream.i | 182 - ace/CLASSIX/Makefile | 544 - ace/CORBA_macros.h | 547 - ace/Cache_Map_Manager_T.cpp | 420 - ace/Cache_Map_Manager_T.h | 428 - ace/Cache_Map_Manager_T.i | 273 - ace/Cached_Connect_Strategy_T.cpp | 775 - ace/Cached_Connect_Strategy_T.h | 260 - ace/Caching_Strategies_T.cpp | 57 - ace/Caching_Strategies_T.h | 548 - ace/Caching_Strategies_T.i | 448 - ace/Caching_Utility_T.cpp | 502 - ace/Caching_Utility_T.h | 343 - ace/Capabilities.cpp | 367 - ace/Capabilities.h | 211 - ace/Capabilities.i | 48 - ace/Cleanup_Strategies_T.cpp | 89 - ace/Cleanup_Strategies_T.h | 148 - ace/Codecs.cpp | 210 - ace/Codecs.h | 110 - ace/Codeset_IBM1047.cpp | 309 - ace/Codeset_IBM1047.h | 126 - ace/Codeset_Registry.cpp | 106 - ace/Codeset_Registry.h | 99 - ace/Codeset_Registry.inl | 98 - ace/Codeset_Registry_db.cpp | 24 - ace/Configuration.cpp | 2149 -- ace/Configuration.h | 871 - ace/Configuration_Import_Export.cpp | 608 - ace/Configuration_Import_Export.h | 211 - ace/Connection_Recycling_Strategy.cpp | 13 - ace/Connection_Recycling_Strategy.h | 67 - ace/Connector.cpp | 1079 - ace/Connector.h | 583 - ace/Containers.cpp | 24 - ace/Containers.h | 73 - ace/Containers.i | 25 - ace/Containers_T.cpp | 1878 -- ace/Containers_T.h | 1995 -- ace/Containers_T.i | 469 - ace/Copy_Disabled.cpp | 21 - ace/Copy_Disabled.h | 60 - ace/DEV.cpp | 37 - ace/DEV.h | 74 - ace/DEV.i | 15 - ace/DEV_Addr.cpp | 81 - ace/DEV_Addr.h | 86 - ace/DEV_Addr.i | 65 - ace/DEV_Connector.cpp | 43 - ace/DEV_Connector.h | 104 - ace/DEV_Connector.i | 30 - ace/DEV_IO.cpp | 126 - ace/DEV_IO.h | 135 - ace/DEV_IO.i | 101 - ace/DLL.cpp | 220 - ace/DLL.h | 145 - ace/DLL_Manager.cpp | 496 - ace/DLL_Manager.h | 248 - ace/Date_Time.cpp | 10 - ace/Date_Time.h | 121 - ace/Date_Time.i | 194 - ace/Default_Constants.h | 389 - ace/Dev_Poll_Reactor.cpp | 2430 --- ace/Dev_Poll_Reactor.h | 1175 -- ace/Dev_Poll_Reactor.inl | 201 - ace/Dirent.cpp | 11 - ace/Dirent.h | 118 - ace/Dirent.i | 95 - ace/Dirent_Selector.cpp | 44 - ace/Dirent_Selector.h | 68 - ace/Dirent_Selector.inl | 15 - ace/Dump.cpp | 136 - ace/Dump.h | 168 - ace/Dump_T.cpp | 41 - ace/Dump_T.h | 78 - ace/Dynamic.cpp | 43 - ace/Dynamic.h | 71 - ace/Dynamic.i | 31 - ace/Dynamic_Service.cpp | 29 - ace/Dynamic_Service.h | 64 - ace/Dynamic_Service.i | 10 - ace/Dynamic_Service_Base.cpp | 42 - ace/Dynamic_Service_Base.h | 46 - ace/Dynamic_Service_Base.i | 2 - ace/Env_Value_T.cpp | 14 - ace/Env_Value_T.h | 161 - ace/Env_Value_T.i | 51 - ace/Event_Handler.cpp | 248 - ace/Event_Handler.h | 237 - ace/Event_Handler.i | 10 - ace/Event_Handler_T.cpp | 63 - ace/Event_Handler_T.h | 187 - ace/Event_Handler_T.i | 185 - ace/Exception_Macros.h | 55 - ace/FIFO.cpp | 74 - ace/FIFO.h | 78 - ace/FIFO.i | 20 - ace/FIFO_Recv.cpp | 82 - ace/FIFO_Recv.h | 80 - ace/FIFO_Recv.i | 18 - ace/FIFO_Recv_Msg.cpp | 61 - ace/FIFO_Recv_Msg.h | 131 - ace/FIFO_Recv_Msg.i | 101 - ace/FIFO_Send.cpp | 53 - ace/FIFO_Send.h | 70 - ace/FIFO_Send.i | 18 - ace/FIFO_Send_Msg.cpp | 72 - ace/FIFO_Send_Msg.h | 80 - ace/FIFO_Send_Msg.i | 48 - ace/FILE.cpp | 156 - ace/FILE.h | 143 - ace/FILE.i | 16 - ace/FILE_Addr.cpp | 113 - ace/FILE_Addr.h | 85 - ace/FILE_Addr.i | 43 - ace/FILE_Connector.cpp | 84 - ace/FILE_Connector.h | 110 - ace/FILE_Connector.i | 33 - ace/FILE_IO.cpp | 133 - ace/FILE_IO.h | 160 - ace/FILE_IO.i | 145 - ace/File_Lock.cpp | 78 - ace/File_Lock.h | 164 - ace/File_Lock.inl | 89 - ace/Filecache.cpp | 769 - ace/Filecache.h | 360 - ace/FlReactor.cpp | 331 - ace/FlReactor.h | 113 - ace/FlReactor.i | 2 - ace/Flag_Manip.cpp | 80 - ace/Flag_Manip.h | 52 - ace/Flag_Manip.i | 20 - ace/Framework_Component.cpp | 272 - ace/Framework_Component.h | 193 - ace/Framework_Component.inl | 35 - ace/Framework_Component_T.cpp | 35 - ace/Framework_Component_T.h | 70 - ace/Framework_Component_T.inl | 4 - ace/Free_List.cpp | 90 - ace/Free_List.h | 148 - ace/Free_List.i | 76 - ace/Functor.cpp | 48 - ace/Functor.h | 464 - ace/Functor.i | 241 - ace/Functor_T.cpp | 49 - ace/Functor_T.h | 152 - ace/Functor_T.i | 37 - ace/Future.cpp | 444 - ace/Future.h | 385 - ace/Future_Set.cpp | 137 - ace/Future_Set.h | 141 - ace/Get_Opt.cpp | 662 - ace/Get_Opt.h | 453 - ace/Get_Opt.i | 46 - ace/Global_Macros.h | 420 - ace/Handle_Gobbler.h | 66 - ace/Handle_Gobbler.i | 88 - ace/Handle_Ops.cpp | 43 - ace/Handle_Ops.h | 53 - ace/Handle_Ops.i | 1 - ace/Handle_Set.cpp | 556 - ace/Handle_Set.h | 224 - ace/Handle_Set.i | 168 - ace/Hash_Cache_Map_Manager_T.cpp | 230 - ace/Hash_Cache_Map_Manager_T.h | 216 - ace/Hash_Cache_Map_Manager_T.i | 68 - ace/Hash_Map_Manager.cpp | 19 - ace/Hash_Map_Manager.h | 29 - ace/Hash_Map_Manager_T.cpp | 520 - ace/Hash_Map_Manager_T.h | 947 - ace/Hash_Map_Manager_T.i | 960 - ace/Hash_Map_With_Allocator_T.cpp | 32 - ace/Hash_Map_With_Allocator_T.h | 103 - ace/Hash_Map_With_Allocator_T.i | 73 - ace/Hashable.cpp | 8 - ace/Hashable.h | 63 - ace/Hashable.inl | 30 - ace/High_Res_Timer.cpp | 526 - ace/High_Res_Timer.h | 310 - ace/High_Res_Timer.i | 158 - ace/INET_Addr.cpp | 941 - ace/INET_Addr.h | 332 - ace/INET_Addr.i | 177 - ace/IOStream.cpp | 658 - ace/IOStream.h | 513 - ace/IOStream_T.cpp | 210 - ace/IOStream_T.h | 288 - ace/IOStream_T.i | 160 - ace/IO_Cntl_Msg.cpp | 37 - ace/IO_Cntl_Msg.h | 105 - ace/IO_SAP.cpp | 142 - ace/IO_SAP.h | 90 - ace/IO_SAP.i | 39 - ace/IPC_SAP.cpp | 182 - ace/IPC_SAP.h | 84 - ace/IPC_SAP.i | 37 - ace/Init_ACE.cpp | 45 - ace/Init_ACE.h | 69 - ace/Init_ACE.i | 1 - ace/Intrusive_List.cpp | 151 - ace/Intrusive_List.h | 133 - ace/Intrusive_List.inl | 19 - ace/Intrusive_List_Node.cpp | 25 - ace/Intrusive_List_Node.h | 81 - ace/Intrusive_List_Node.inl | 25 - ace/LOCK_SOCK_Acceptor.cpp | 33 - ace/LOCK_SOCK_Acceptor.h | 62 - ace/LSOCK.cpp | 173 - ace/LSOCK.h | 79 - ace/LSOCK.i | 40 - ace/LSOCK_Acceptor.cpp | 135 - ace/LSOCK_Acceptor.h | 91 - ace/LSOCK_CODgram.cpp | 56 - ace/LSOCK_CODgram.h | 74 - ace/LSOCK_CODgram.i | 27 - ace/LSOCK_Connector.cpp | 54 - ace/LSOCK_Connector.h | 87 - ace/LSOCK_Connector.i | 26 - ace/LSOCK_Dgram.cpp | 65 - ace/LSOCK_Dgram.h | 71 - ace/LSOCK_Dgram.i | 20 - ace/LSOCK_Stream.cpp | 132 - ace/LSOCK_Stream.h | 78 - ace/LSOCK_Stream.i | 25 - ace/Lib_Find.cpp | 585 - ace/Lib_Find.h | 105 - ace/Lib_Find.i | 1 - ace/Local_Name_Space.cpp | 219 - ace/Local_Name_Space.h | 127 - ace/Local_Name_Space_T.cpp | 963 - ace/Local_Name_Space_T.h | 267 - ace/Local_Tokens.cpp | 1448 -- ace/Local_Tokens.h | 1114 -- ace/Local_Tokens.i | 458 - ace/Log_Msg.cpp | 2534 --- ace/Log_Msg.h | 722 - ace/Log_Msg_Backend.cpp | 9 - ace/Log_Msg_Backend.h | 64 - ace/Log_Msg_Callback.cpp | 9 - ace/Log_Msg_Callback.h | 65 - ace/Log_Msg_IPC.cpp | 72 - ace/Log_Msg_IPC.h | 63 - ace/Log_Msg_NT_Event_Log.cpp | 153 - ace/Log_Msg_NT_Event_Log.h | 68 - ace/Log_Msg_UNIX_Syslog.cpp | 191 - ace/Log_Msg_UNIX_Syslog.h | 72 - ace/Log_Priority.h | 76 - ace/Log_Record.cpp | 277 - ace/Log_Record.h | 194 - ace/Log_Record.i | 107 - ace/Logging_Strategy.cpp | 516 - ace/Logging_Strategy.h | 170 - ace/MEM_Acceptor.cpp | 241 - ace/MEM_Acceptor.h | 180 - ace/MEM_Acceptor.i | 91 - ace/MEM_Addr.cpp | 149 - ace/MEM_Addr.h | 153 - ace/MEM_Addr.i | 117 - ace/MEM_Connector.cpp | 142 - ace/MEM_Connector.h | 173 - ace/MEM_Connector.i | 24 - ace/MEM_IO.cpp | 538 - ace/MEM_IO.h | 301 - ace/MEM_IO.i | 230 - ace/MEM_SAP.cpp | 99 - ace/MEM_SAP.h | 161 - ace/MEM_SAP.i | 67 - ace/MEM_Stream.cpp | 41 - ace/MEM_Stream.h | 142 - ace/MEM_Stream.i | 176 - ace/Makefile | 17 - ace/Makefile.ace | 17438 ---------------- ace/Makefile.am | 1058 - ace/Makefile.bor | 289 - ace/Makefile.dirs | 37 - ace/Makefile.vac | 11 - ace/Malloc.cpp | 196 - ace/Malloc.h | 394 - ace/Malloc.i | 21 - ace/Malloc_Allocator.cpp | 164 - ace/Malloc_Allocator.h | 143 - ace/Malloc_Allocator.i | 213 - ace/Malloc_Base.h | 156 - ace/Malloc_Instantiations.cpp | 33 - ace/Malloc_T.cpp | 1036 - ace/Malloc_T.h | 850 - ace/Malloc_T.i | 354 - ace/Managed_Object.cpp | 23 - ace/Managed_Object.h | 162 - ace/Managed_Object.i | 18 - ace/Map.cpp | 19 - ace/Map.h | 30 - ace/Map_Manager.cpp | 692 - ace/Map_Manager.h | 712 - ace/Map_Manager.i | 713 - ace/Map_T.cpp | 18 - ace/Map_T.h | 1601 -- ace/Map_T.i | 1723 -- ace/Mem_Map.cpp | 387 - ace/Mem_Map.h | 217 - ace/Mem_Map.i | 249 - ace/Memory_Pool.cpp | 1356 -- ace/Memory_Pool.h | 814 - ace/Memory_Pool.i | 269 - ace/Message_Block.cpp | 1319 -- ace/Message_Block.h | 1035 - ace/Message_Block.i | 658 - ace/Message_Block_T.cpp | 48 - ace/Message_Block_T.h | 82 - ace/Message_Block_T.i | 29 - ace/Message_Queue.cpp | 510 - ace/Message_Queue.h | 604 - ace/Message_Queue.i | 232 - ace/Message_Queue_T.cpp | 2336 --- ace/Message_Queue_T.h | 1236 -- ace/Message_Queue_T.i | 336 - ace/Method_Object.h | 34 - ace/Method_Request.cpp | 26 - ace/Method_Request.h | 93 - ace/Min_Max.h | 75 - ace/Module.cpp | 269 - ace/Module.h | 209 - ace/Module.i | 62 - ace/Msg_WFMO_Reactor.cpp | 90 - ace/Msg_WFMO_Reactor.h | 116 - ace/Msg_WFMO_Reactor.i | 30 - ace/Multihomed_INET_Addr.cpp | 187 - ace/Multihomed_INET_Addr.h | 146 - ace/Multihomed_INET_Addr.i | 12 - ace/Multiplexor.cpp | 14 - ace/Multiplexor.h | 81 - ace/Multiplexor.i | 91 - ace/NT_Service.cpp | 610 - ace/NT_Service.h | 435 - ace/NT_Service.i | 79 - ace/Name_Proxy.cpp | 201 - ace/Name_Proxy.h | 91 - ace/Name_Request_Reply.cpp | 556 - ace/Name_Request_Reply.h | 260 - ace/Name_Space.cpp | 65 - ace/Name_Space.h | 161 - ace/Naming_Context.cpp | 694 - ace/Naming_Context.h | 380 - ace/Node.cpp | 49 - ace/Node.h | 86 - ace/Notification_Strategy.cpp | 18 - ace/Notification_Strategy.h | 73 - ace/Notification_Strategy.inl | 26 - ace/OS.cpp | 7681 ------- ace/OS.h | 7124 ------- ace/OS.i | 11142 ----------- ace/OS_Dirent.cpp | 257 - ace/OS_Dirent.h | 134 - ace/OS_Dirent.inl | 191 - ace/OS_Errno.cpp | 35 - ace/OS_Errno.h | 142 - ace/OS_Errno.inl | 87 - ace/OS_Export.h | 46 - ace/OS_Log_Msg_Attributes.cpp | 9 - ace/OS_Log_Msg_Attributes.h | 89 - ace/OS_Log_Msg_Attributes.inl | 6 - ace/OS_Memory.cpp | 43 - ace/OS_Memory.h | 216 - ace/OS_Memory.inl | 20 - ace/OS_QoS.cpp | 471 - ace/OS_QoS.h | 386 - ace/OS_String.cpp | 1073 - ace/OS_String.h | 631 - ace/OS_String.inl | 679 - ace/OS_TLI.cpp | 13 - ace/OS_TLI.h | 197 - ace/OS_TLI.inl | 343 - ace/OS_Thread_Adapter.cpp | 175 - ace/OS_Thread_Adapter.h | 78 - ace/OS_Thread_Adapter.inl | 1 - ace/Obchunk.cpp | 30 - ace/Obchunk.h | 72 - ace/Obchunk.i | 9 - ace/Object_Manager.cpp | 873 - ace/Object_Manager.h | 480 - ace/Object_Manager.i | 35 - ace/Obstack.cpp | 11 - ace/Obstack.h | 27 - ace/Obstack_T.cpp | 206 - ace/Obstack_T.h | 125 - ace/Obstack_T.i | 33 - ace/PI_Malloc.cpp | 170 - ace/PI_Malloc.h | 201 - ace/PI_Malloc.i | 25 - ace/POSIX_Asynch_IO.cpp | 2599 --- ace/POSIX_Asynch_IO.h | 1305 -- ace/POSIX_Asynch_IO.i | 2 - ace/POSIX_CB_Proactor.cpp | 167 - ace/POSIX_CB_Proactor.h | 90 - ace/POSIX_CB_Proactor.i | 12 - ace/POSIX_Proactor.cpp | 2000 -- ace/POSIX_Proactor.h | 656 - ace/POSIX_Proactor.i | 30 - ace/Pair.cpp | 19 - ace/Pair.h | 30 - ace/Pair_T.cpp | 18 - ace/Pair_T.h | 125 - ace/Pair_T.i | 84 - ace/Parse_Node.cpp | 647 - ace/Parse_Node.h | 381 - ace/Parse_Node.i | 19 - ace/Pipe.cpp | 235 - ace/Pipe.h | 90 - ace/Pipe.i | 25 - ace/Priority_Reactor.cpp | 171 - ace/Priority_Reactor.h | 89 - ace/Proactor.cpp | 1157 -- ace/Proactor.h | 649 - ace/Proactor.i | 75 - ace/Proactor_Impl.h | 251 - ace/Process.cpp | 965 - ace/Process.h | 593 - ace/Process.i | 411 - ace/Process_Manager.cpp | 945 - ace/Process_Manager.h | 397 - ace/Process_Manager.i | 8 - ace/Process_Mutex.cpp | 95 - ace/Process_Mutex.h | 201 - ace/Process_Mutex.inl | 85 - ace/Process_Semaphore.cpp | 91 - ace/Process_Semaphore.h | 142 - ace/Process_Semaphore.inl | 61 - ace/Profile_Timer.cpp | 418 - ace/Profile_Timer.h | 139 - ace/Profile_Timer.i | 104 - ace/QoS/ACE_QoS.dsp | 145 - ace/QoS/ACE_QoS.dsw | 41 - ace/QoS/ACE_QoS_Export.h | 46 - ace/QoS/ACE_QoS_Lib.dsp | 132 - ace/QoS/Makefile | 437 - ace/QoS/QoS_Decorator.cpp | 161 - ace/QoS/QoS_Decorator.h | 177 - ace/QoS/QoS_Manager.cpp | 47 - ace/QoS/QoS_Manager.h | 69 - ace/QoS/QoS_Session.h | 169 - ace/QoS/QoS_Session_Factory.cpp | 101 - ace/QoS/QoS_Session_Factory.h | 92 - ace/QoS/QoS_Session_Impl.cpp | 704 - ace/QoS/QoS_Session_Impl.h | 245 - ace/QoS/QoS_Session_Impl.i | 202 - ace/QoS/README | 55 - ace/QoS/SOCK_Dgram_Mcast_QoS.cpp | 256 - ace/QoS/SOCK_Dgram_Mcast_QoS.h | 138 - ace/QoS/SOCK_Dgram_Mcast_QoS.i | 52 - ace/QoS/makefile.bor | 24 - ace/QoS/qos.mpc | 7 - ace/QtReactor.cpp | 435 - ace/QtReactor.h | 154 - ace/RB_Tree.cpp | 1126 -- ace/RB_Tree.h | 863 - ace/RB_Tree.i | 1152 -- ace/README | 1603 -- ace/RMCast/Makefile | 2051 -- ace/RMCast/Makefile.bor | 44 - ace/RMCast/README | 57 - ace/RMCast/RMCast.cpp | 9 - ace/RMCast/RMCast.dsp | 389 - ace/RMCast/RMCast.dsw | 29 - ace/RMCast/RMCast.h | 261 - ace/RMCast/RMCast.i | 1 - ace/RMCast/RMCast_Ack_Worker.cpp | 25 - ace/RMCast/RMCast_Ack_Worker.h | 47 - ace/RMCast/RMCast_Ack_Worker.i | 12 - ace/RMCast/RMCast_Copy_On_Write.cpp | 199 - ace/RMCast/RMCast_Copy_On_Write.h | 212 - ace/RMCast/RMCast_Copy_On_Write.i | 34 - ace/RMCast/RMCast_Export.h | 44 - ace/RMCast/RMCast_Fork.cpp | 112 - ace/RMCast/RMCast_Fork.h | 55 - ace/RMCast/RMCast_Fork.i | 21 - ace/RMCast/RMCast_Fragment.cpp | 188 - ace/RMCast/RMCast_Fragment.h | 62 - ace/RMCast/RMCast_Fragment.i | 7 - ace/RMCast/RMCast_IO_UDP.cpp | 458 - ace/RMCast/RMCast_IO_UDP.h | 138 - ace/RMCast/RMCast_IO_UDP.i | 36 - ace/RMCast/RMCast_Membership.cpp | 184 - ace/RMCast/RMCast_Membership.h | 103 - ace/RMCast/RMCast_Membership.i | 8 - ace/RMCast/RMCast_Module.cpp | 102 - ace/RMCast/RMCast_Module.h | 88 - ace/RMCast/RMCast_Module.i | 7 - ace/RMCast/RMCast_Module_Factory.cpp | 13 - ace/RMCast/RMCast_Module_Factory.h | 71 - ace/RMCast/RMCast_Module_Factory.i | 1 - ace/RMCast/RMCast_Partial_Message.cpp | 215 - ace/RMCast/RMCast_Partial_Message.h | 102 - ace/RMCast/RMCast_Partial_Message.i | 15 - ace/RMCast/RMCast_Proxy.cpp | 46 - ace/RMCast/RMCast_Proxy.h | 102 - ace/RMCast/RMCast_Proxy.i | 8 - ace/RMCast/RMCast_Reassembly.cpp | 140 - ace/RMCast/RMCast_Reassembly.h | 73 - ace/RMCast/RMCast_Reassembly.i | 1 - ace/RMCast/RMCast_Receiver_Module.cpp | 157 - ace/RMCast/RMCast_Receiver_Module.h | 108 - ace/RMCast/RMCast_Receiver_Module.i | 7 - ace/RMCast/RMCast_Reliable_Factory.cpp | 54 - ace/RMCast/RMCast_Reliable_Factory.h | 60 - ace/RMCast/RMCast_Reliable_Factory.i | 8 - ace/RMCast/RMCast_Reordering.cpp | 178 - ace/RMCast/RMCast_Reordering.h | 96 - ace/RMCast/RMCast_Reordering.i | 8 - ace/RMCast/RMCast_Resend_Handler.cpp | 22 - ace/RMCast/RMCast_Resend_Handler.h | 44 - ace/RMCast/RMCast_Resend_Handler.i | 8 - ace/RMCast/RMCast_Resend_Worker.cpp | 31 - ace/RMCast/RMCast_Resend_Worker.h | 49 - ace/RMCast/RMCast_Resend_Worker.i | 12 - ace/RMCast/RMCast_Retransmission.cpp | 134 - ace/RMCast/RMCast_Retransmission.h | 120 - ace/RMCast/RMCast_Retransmission.i | 6 - ace/RMCast/RMCast_Sequencer.cpp | 25 - ace/RMCast/RMCast_Sequencer.h | 54 - ace/RMCast/RMCast_Sequencer.i | 7 - ace/RMCast/RMCast_Singleton_Factory.cpp | 24 - ace/RMCast/RMCast_Singleton_Factory.h | 61 - ace/RMCast/RMCast_Singleton_Factory.i | 8 - ace/RMCast/RMCast_UDP_Event_Handler.cpp | 36 - ace/RMCast/RMCast_UDP_Event_Handler.h | 59 - ace/RMCast/RMCast_UDP_Event_Handler.i | 8 - ace/RMCast/RMCast_UDP_Proxy.cpp | 186 - ace/RMCast/RMCast_UDP_Proxy.h | 88 - ace/RMCast/RMCast_UDP_Proxy.i | 7 - ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp | 32 - ace/RMCast/RMCast_UDP_Reliable_Receiver.h | 49 - ace/RMCast/RMCast_UDP_Reliable_Receiver.i | 7 - ace/RMCast/RMCast_UDP_Reliable_Sender.cpp | 70 - ace/RMCast/RMCast_UDP_Reliable_Sender.h | 78 - ace/RMCast/RMCast_UDP_Reliable_Sender.i | 19 - ace/RMCast/RMCast_Worker.cpp | 19 - ace/RMCast/RMCast_Worker.h | 36 - ace/RMCast/RMCast_Worker.i | 1 - ace/RMCast/rmcast.mpc | 7 - ace/RW_Process_Mutex.cpp | 59 - ace/RW_Process_Mutex.h | 114 - ace/RW_Process_Mutex.inl | 72 - ace/Reactor.cpp | 314 - ace/Reactor.h | 703 - ace/Reactor.i | 675 - ace/Reactor_Impl.h | 562 - ace/Reactor_Notification_Strategy.cpp | 33 - ace/Reactor_Notification_Strategy.h | 61 - ace/Reactor_Notification_Strategy.inl | 13 - ace/Read_Buffer.cpp | 165 - ace/Read_Buffer.h | 122 - ace/Read_Buffer.i | 28 - ace/Recyclable.cpp | 19 - ace/Recyclable.h | 78 - ace/Recyclable.inl | 19 - ace/Refcountable.cpp | 8 - ace/Refcountable.h | 57 - ace/Refcountable.inl | 30 - ace/Refcounted_Auto_Ptr.h | 193 - ace/Refcounted_Auto_Ptr.i | 223 - ace/Registry.cpp | 1147 -- ace/Registry.h | 568 - ace/Registry_Name_Space.cpp | 288 - ace/Registry_Name_Space.h | 134 - ace/Remote_Name_Space.cpp | 379 - ace/Remote_Name_Space.h | 142 - ace/Remote_Tokens.cpp | 438 - ace/Remote_Tokens.h | 316 - ace/Remote_Tokens.i | 122 - ace/SOCK.cpp | 182 - ace/SOCK.h | 121 - ace/SOCK.i | 34 - ace/SOCK_Acceptor.cpp | 403 - ace/SOCK_Acceptor.h | 173 - ace/SOCK_Acceptor.i | 12 - ace/SOCK_CODgram.cpp | 106 - ace/SOCK_CODgram.h | 73 - ace/SOCK_CODgram.i | 18 - ace/SOCK_Connector.cpp | 326 - ace/SOCK_Connector.h | 320 - ace/SOCK_Connector.i | 35 - ace/SOCK_Dgram.cpp | 542 - ace/SOCK_Dgram.h | 217 - ace/SOCK_Dgram.i | 158 - ace/SOCK_Dgram_Bcast.cpp | 334 - ace/SOCK_Dgram_Bcast.h | 135 - ace/SOCK_Dgram_Bcast.i | 34 - ace/SOCK_Dgram_Mcast.cpp | 683 - ace/SOCK_Dgram_Mcast.h | 422 - ace/SOCK_Dgram_Mcast.i | 47 - ace/SOCK_IO.cpp | 165 - ace/SOCK_IO.h | 147 - ace/SOCK_IO.i | 149 - ace/SOCK_SEQPACK_Acceptor.cpp | 513 - ace/SOCK_SEQPACK_Acceptor.h | 185 - ace/SOCK_SEQPACK_Acceptor.i | 12 - ace/SOCK_SEQPACK_Association.cpp | 173 - ace/SOCK_SEQPACK_Association.h | 192 - ace/SOCK_SEQPACK_Association.i | 172 - ace/SOCK_SEQPACK_Connector.cpp | 365 - ace/SOCK_SEQPACK_Connector.h | 240 - ace/SOCK_SEQPACK_Connector.i | 34 - ace/SOCK_Stream.cpp | 35 - ace/SOCK_Stream.h | 167 - ace/SOCK_Stream.i | 171 - ace/SPIPE.cpp | 63 - ace/SPIPE.h | 100 - ace/SPIPE.i | 16 - ace/SPIPE_Acceptor.cpp | 295 - ace/SPIPE_Acceptor.h | 164 - ace/SPIPE_Addr.cpp | 142 - ace/SPIPE_Addr.h | 118 - ace/SPIPE_Addr.i | 74 - ace/SPIPE_Connector.cpp | 154 - ace/SPIPE_Connector.h | 113 - ace/SPIPE_Connector.i | 13 - ace/SPIPE_Stream.cpp | 98 - ace/SPIPE_Stream.h | 166 - ace/SPIPE_Stream.i | 267 - ace/SSL/ACE_SSL.dsp | 182 - ace/SSL/ACE_SSL.dsw | 29 - ace/SSL/ACE_SSL_LIB.dsp | 174 - ace/SSL/ACE_SSL_LIB.dsw | 41 - ace/SSL/Makefile | 648 - ace/SSL/Makefile.bor | 28 - ace/SSL/SSL_Asynch_BIO.cpp | 199 - ace/SSL/SSL_Asynch_BIO.h | 51 - ace/SSL/SSL_Asynch_Stream.cpp | 1124 -- ace/SSL/SSL_Asynch_Stream.h | 242 - ace/SSL/SSL_Context.cpp | 539 - ace/SSL/SSL_Context.h | 360 - ace/SSL/SSL_Context.inl | 106 - ace/SSL/SSL_Export.h | 44 - ace/SSL/SSL_SOCK.cpp | 68 - ace/SSL/SSL_SOCK.h | 94 - ace/SSL/SSL_SOCK.i | 64 - ace/SSL/SSL_SOCK_Acceptor.cpp | 243 - ace/SSL/SSL_SOCK_Acceptor.h | 194 - ace/SSL/SSL_SOCK_Acceptor.i | 82 - ace/SSL/SSL_SOCK_Connector.cpp | 404 - ace/SSL/SSL_SOCK_Connector.h | 315 - ace/SSL/SSL_SOCK_Connector.i | 25 - ace/SSL/SSL_SOCK_Stream.cpp | 565 - ace/SSL/SSL_SOCK_Stream.h | 308 - ace/SSL/SSL_SOCK_Stream.i | 317 - ace/SSL/ssl.mpc | 8 - ace/SSL/sslconf.h | 55 - ace/SString.cpp | 552 - ace/SString.h | 484 - ace/SString.i | 284 - ace/SUN_Proactor.cpp | 313 - ace/SUN_Proactor.h | 126 - ace/SUN_Proactor.i | 8 - ace/SV_Message.cpp | 19 - ace/SV_Message.h | 64 - ace/SV_Message.i | 31 - ace/SV_Message_Queue.cpp | 39 - ace/SV_Message_Queue.h | 98 - ace/SV_Message_Queue.i | 78 - ace/SV_Semaphore_Complex.cpp | 252 - ace/SV_Semaphore_Complex.h | 155 - ace/SV_Semaphore_Complex.i | 83 - ace/SV_Semaphore_Simple.cpp | 212 - ace/SV_Semaphore_Simple.h | 162 - ace/SV_Semaphore_Simple.i | 106 - ace/SV_Shared_Memory.cpp | 83 - ace/SV_Shared_Memory.h | 116 - ace/SV_Shared_Memory.i | 114 - ace/Sample_History.cpp | 57 - ace/Sample_History.h | 86 - ace/Sample_History.inl | 20 - ace/Sched_Params.cpp | 321 - ace/Sched_Params.h | 225 - ace/Sched_Params.i | 136 - ace/Select_Reactor.cpp | 30 - ace/Select_Reactor.h | 59 - ace/Select_Reactor_Base.cpp | 1157 -- ace/Select_Reactor_Base.h | 549 - ace/Select_Reactor_Base.i | 93 - ace/Select_Reactor_T.cpp | 1517 -- ace/Select_Reactor_T.h | 778 - ace/Select_Reactor_T.i | 219 - ace/Service_Config.cpp | 872 - ace/Service_Config.h | 455 - ace/Service_Config.i | 101 - ace/Service_Manager.cpp | 374 - ace/Service_Manager.h | 120 - ace/Service_Manager.i | 10 - ace/Service_Object.cpp | 105 - ace/Service_Object.h | 172 - ace/Service_Object.i | 64 - ace/Service_Repository.cpp | 416 - ace/Service_Repository.h | 211 - ace/Service_Repository.i | 31 - ace/Service_Templates.cpp | 82 - ace/Service_Templates.h | 29 - ace/Service_Types.cpp | 454 - ace/Service_Types.h | 201 - ace/Service_Types.i | 64 - ace/Shared_Memory.cpp | 9 - ace/Shared_Memory.h | 54 - ace/Shared_Memory_MM.cpp | 52 - ace/Shared_Memory_MM.h | 116 - ace/Shared_Memory_MM.i | 90 - ace/Shared_Memory_SV.cpp | 30 - ace/Shared_Memory_SV.h | 97 - ace/Shared_Memory_SV.i | 75 - ace/Shared_Object.cpp | 46 - ace/Shared_Object.h | 55 - ace/Shared_Object.i | 9 - ace/Signal.cpp | 859 - ace/Signal.h | 519 - ace/Signal.i | 306 - ace/Singleton.cpp | 519 - ace/Singleton.h | 322 - ace/Singleton.i | 37 - ace/Sock_Connect.cpp | 1339 -- ace/Sock_Connect.h | 96 - ace/Sock_Connect.i | 1 - ace/Stats.cpp | 612 - ace/Stats.h | 273 - ace/Stats.i | 95 - ace/Strategies.h | 33 - ace/Strategies_T.cpp | 1234 -- ace/Strategies_T.h | 1073 - ace/Strategies_T.i | 443 - ace/Stream.cpp | 614 - ace/Stream.h | 233 - ace/Stream.i | 49 - ace/Stream_Modules.cpp | 371 - ace/Stream_Modules.h | 143 - ace/String_Base.cpp | 183 - ace/String_Base.h | 439 - ace/String_Base.i | 370 - ace/String_Base_Const.cpp | 5 - ace/String_Base_Const.h | 39 - ace/Svc_Conf.h | 205 - ace/Svc_Conf.l | 134 - ace/Svc_Conf.y | 436 - ace/Svc_Conf_Lexer_Guard.cpp | 39 - ace/Svc_Conf_Lexer_Guard.h | 79 - ace/Svc_Conf_Tokens.h | 21 - ace/Svc_Conf_l.cpp | 1855 -- ace/Svc_Conf_y.cpp | 1567 -- ace/Svc_Handler.cpp | 509 - ace/Svc_Handler.h | 333 - ace/Swap.cpp | 25 - ace/Swap.h | 46 - ace/Swap.inl | 15 - ace/Synch.cpp | 1010 - ace/Synch.h | 1864 -- ace/Synch.i | 1002 - ace/Synch_Options.cpp | 108 - ace/Synch_Options.h | 158 - ace/Synch_Options.i | 9 - ace/Synch_T.cpp | 892 - ace/Synch_T.h | 909 - ace/Synch_T.i | 452 - ace/System_Time.cpp | 141 - ace/System_Time.h | 87 - ace/TLI.cpp | 195 - ace/TLI.h | 108 - ace/TLI.i | 46 - ace/TLI_Acceptor.cpp | 547 - ace/TLI_Acceptor.h | 118 - ace/TLI_Connector.cpp | 248 - ace/TLI_Connector.h | 126 - ace/TLI_Connector.i | 47 - ace/TLI_Stream.cpp | 230 - ace/TLI_Stream.h | 133 - ace/TLI_Stream.i | 22 - ace/TP_Reactor.cpp | 872 - ace/TP_Reactor.h | 363 - ace/TP_Reactor.i | 101 - ace/TTY_IO.cpp | 515 - ace/TTY_IO.h | 86 - ace/Task.cpp | 234 - ace/Task.h | 282 - ace/Task.i | 114 - ace/Task_T.cpp | 105 - ace/Task_T.h | 183 - ace/Task_T.i | 103 - ace/Template_Instantiations.cpp | 356 - ace/Test_and_Set.cpp | 49 - ace/Test_and_Set.h | 76 - ace/Test_and_Set.i | 1 - ace/Thread.cpp | 90 - ace/Thread.h | 245 - ace/Thread.i | 272 - ace/Thread_Adapter.cpp | 248 - ace/Thread_Adapter.h | 94 - ace/Thread_Adapter.inl | 7 - ace/Thread_Control.cpp | 90 - ace/Thread_Control.h | 101 - ace/Thread_Control.inl | 42 - ace/Thread_Exit.cpp | 127 - ace/Thread_Exit.h | 107 - ace/Thread_Hook.cpp | 25 - ace/Thread_Hook.h | 56 - ace/Thread_Manager.cpp | 2273 --- ace/Thread_Manager.h | 1098 - ace/Thread_Manager.i | 334 - ace/Time_Request_Reply.cpp | 188 - ace/Time_Request_Reply.h | 137 - ace/Time_Value.cpp | 199 - ace/Time_Value.h | 330 - ace/Time_Value.inl | 329 - ace/Timeprobe.cpp | 44 - ace/Timeprobe.h | 173 - ace/Timeprobe.i | 8 - ace/Timeprobe_T.cpp | 300 - ace/Timeprobe_T.h | 188 - ace/Timer_Hash.cpp | 123 - ace/Timer_Hash.h | 71 - ace/Timer_Hash_T.cpp | 649 - ace/Timer_Hash_T.h | 289 - ace/Timer_Heap.cpp | 42 - ace/Timer_Heap.h | 37 - ace/Timer_Heap_T.cpp | 787 - ace/Timer_Heap_T.h | 333 - ace/Timer_List.cpp | 44 - ace/Timer_List.h | 38 - ace/Timer_List_T.cpp | 370 - ace/Timer_List_T.h | 222 - ace/Timer_Queue.cpp | 59 - ace/Timer_Queue.h | 45 - ace/Timer_Queue_Adapters.cpp | 321 - ace/Timer_Queue_Adapters.h | 244 - ace/Timer_Queue_Adapters.i | 53 - ace/Timer_Queue_T.cpp | 350 - ace/Timer_Queue_T.h | 504 - ace/Timer_Queue_T.i | 188 - ace/Timer_Wheel.cpp | 23 - ace/Timer_Wheel.h | 39 - ace/Timer_Wheel_T.cpp | 908 - ace/Timer_Wheel_T.h | 222 - ace/TkReactor.cpp | 439 - ace/TkReactor.h | 133 - ace/Token.cpp | 549 - ace/Token.h | 318 - ace/Token.i | 135 - ace/Token_Collection.cpp | 304 - ace/Token_Collection.h | 240 - ace/Token_Collection.i | 12 - ace/Token_Invariants.cpp | 371 - ace/Token_Invariants.h | 240 - ace/Token_Manager.cpp | 280 - ace/Token_Manager.h | 144 - ace/Token_Manager.i | 20 - ace/Token_Request_Reply.cpp | 178 - ace/Token_Request_Reply.h | 266 - ace/Token_Request_Reply.i | 196 - ace/Trace.cpp | 131 - ace/Trace.h | 94 - ace/Typed_SV_Message.cpp | 26 - ace/Typed_SV_Message.h | 105 - ace/Typed_SV_Message.i | 91 - ace/Typed_SV_Message_Queue.cpp | 53 - ace/Typed_SV_Message_Queue.h | 88 - ace/Typed_SV_Message_Queue.i | 77 - ace/UNIX_Addr.cpp | 114 - ace/UNIX_Addr.h | 101 - ace/UNIX_Addr.i | 67 - ace/UPIPE_Acceptor.cpp | 122 - ace/UPIPE_Acceptor.h | 94 - ace/UPIPE_Acceptor.i | 11 - ace/UPIPE_Addr.h | 28 - ace/UPIPE_Connector.cpp | 91 - ace/UPIPE_Connector.h | 112 - ace/UPIPE_Connector.i | 33 - ace/UPIPE_Stream.cpp | 226 - ace/UPIPE_Stream.h | 137 - ace/UPIPE_Stream.i | 12 - ace/Unbounded_Queue.cpp | 426 - ace/Unbounded_Queue.h | 294 - ace/Unbounded_Queue.inl | 21 - ace/Unbounded_Set.cpp | 443 - ace/Unbounded_Set.h | 314 - ace/Unbounded_Set.inl | 16 - ace/Unbounded_Set_Ex.cpp | 620 - ace/Unbounded_Set_Ex.h | 359 - ace/Unbounded_Set_Ex.inl | 16 - ace/Vector_T.cpp | 125 - ace/Vector_T.h | 244 - ace/Vector_T.i | 42 - ace/Version.h | 7 - ace/WFMO_Reactor.cpp | 2559 --- ace/WFMO_Reactor.h | 1334 -- ace/WFMO_Reactor.i | 1131 -- ace/WIN32_Asynch_IO.cpp | 3802 ---- ace/WIN32_Asynch_IO.h | 1945 -- ace/WIN32_Proactor.cpp | 803 - ace/WIN32_Proactor.h | 323 - ace/XML_Svc_Conf.cpp | 9 - ace/XML_Svc_Conf.h | 59 - ace/XTI_ATM_Mcast.cpp | 66 - ace/XTI_ATM_Mcast.h | 131 - ace/XTI_ATM_Mcast.i | 62 - ace/XtReactor.cpp | 450 - ace/XtReactor.h | 138 - ace/ace-dll.icc | 523 - ace/ace-lib.icc | 284 - ace/ace.dsw | 41 - ace/ace.icc | 654 - ace/ace.icp | 7 - ace/ace.mpc | 395 - ace/ace.mwc | 4 - ace/ace.rc | 38 - ace/ace_ce_dll.cfg | 1 - ace/ace_dll.dsp | 3472 ---- ace/ace_dll64.mak | 3456 ---- ace/ace_lib.dsp | 3427 ---- ace/ace_lib64.mak | 2361 --- ace/ace_message_table.bin | Bin 28 -> 0 bytes ace/ace_vacpp_options.icc | 12 - ace/ace_wchar.h | 329 - ace/ace_wchar.inl | 120 - ace/config-WinCE.h | 255 - ace/config-aix-4.1.x.h | 8 - ace/config-aix-4.2.x.h | 8 - ace/config-aix-4.3.x.h | 8 - ace/config-aix-4.x.h | 314 - ace/config-aix5.1.h | 21 - ace/config-all.h | 625 - ace/config-borland-common.h | 87 - ace/config-chorus.h | 159 - ace/config-cray.h | 242 - ace/config-cxx-common.h | 89 - ace/config-cygwin32-common.h | 154 - ace/config-cygwin32.h | 16 - ace/config-dgux-4.11-epc.h | 195 - ace/config-dgux-4.x-ghs.h | 214 - ace/config-doxygen.h | 103 - ace/config-freebsd.h | 247 - ace/config-fsu-pthread.h | 59 - ace/config-g++-common.h | 115 - ace/config-ghs-common.h | 44 - ace/config-hpux-10.x-g++.h | 28 - ace/config-hpux-10.x-hpc++.h | 145 - ace/config-hpux-10.x.h | 255 - ace/config-hpux-11.00.h | 442 - ace/config-hpux11.h | 250 - ace/config-icc-common.h | 60 - ace/config-irix5.2.h | 69 - ace/config-irix5.3-g++.h | 120 - ace/config-irix5.3-sgic++.h | 123 - ace/config-irix6.5.x-sgic++.h | 18 - ace/config-irix6.x-common.h | 173 - ace/config-irix6.x-g++.h | 54 - ace/config-irix6.x-kcc.h | 68 - ace/config-irix6.x-sgic++-nothreads.h | 95 - ace/config-irix6.x-sgic++.h | 59 - ace/config-kcc-common.h | 76 - ace/config-linux-common.h | 339 - ace/config-linux.h | 73 - ace/config-lynxos.h | 209 - ace/config-m88k.h | 227 - ace/config-macosx.h | 195 - ace/config-minimal.h | 39 - ace/config-mit-pthread.h | 53 - ace/config-mklinux.h | 20 - ace/config-mvs.h | 122 - ace/config-netbsd.h | 184 - ace/config-openbsd.h | 237 - ace/config-osf1-3.2.h | 188 - ace/config-osf1-4.0.h | 191 - ace/config-pharlap.h | 60 - ace/config-posix.h | 76 - ace/config-psos-diab-mips.h | 246 - ace/config-psos-diab-ppc.h | 281 - ace/config-psos-diab.h | 237 - ace/config-psos-tm.h | 210 - ace/config-psosim-g++.h | 246 - ace/config-qnx-neutrino.h | 148 - ace/config-qnx-rtp.h | 199 - ace/config-rtems.h | 164 - ace/config-sco-4.2-nothread.h | 116 - ace/config-sco-5.0.0-fsu-pthread.h | 15 - ace/config-sco-5.0.0-mit-pthread.h | 178 - ace/config-sco-5.0.0-nothread.h | 14 - ace/config-sco-5.0.0.h | 110 - ace/config-sunos4-g++.h | 105 - ace/config-sunos4-lucid3.2.h | 95 - ace/config-sunos4-sun3.x.h | 87 - ace/config-sunos4-sun4.1.4.h | 99 - ace/config-sunos4-sun4.x.h | 106 - ace/config-sunos5.4-centerline-2.x.h | 162 - ace/config-sunos5.4-g++.h | 181 - ace/config-sunos5.4-sunc++-4.x.h | 194 - ace/config-sunos5.5.h | 376 - ace/config-sunos5.6.h | 145 - ace/config-sunos5.7.h | 90 - ace/config-sunos5.8.h | 25 - ace/config-sunos5.9.h | 15 - ace/config-tandem.h | 445 - ace/config-tru64.h | 31 - ace/config-unixware-2.01-g++.h | 113 - ace/config-unixware-2.1.2-g++.h | 102 - ace/config-unixware-7.1.0.h | 447 - ace/config-unixware-7.1.0.udk.h | 529 - ace/config-visualage.h | 20 - ace/config-vxworks5.x.h | 222 - ace/config-win32-borland.h | 64 - ace/config-win32-common.h | 573 - ace/config-win32-ghs.h | 110 - ace/config-win32-mingw.h | 65 - ace/config-win32-msvc-5.h | 191 - ace/config-win32-msvc-6.h | 179 - ace/config-win32-msvc-7.h | 141 - ace/config-win32-msvc.h | 63 - ace/config-win32-visualage.h | 101 - ace/config-win32.h | 56 - ace/gethrtime.cpp | 60 - ace/iosfwd.h | 76 - ace/post.h | 25 - ace/pre.h | 27 - ace/streams.h | 140 - ace/svc_export.h | 44 - aceConf.sh.in | 8 - apps/FaCE/ACE.ico | Bin 1078 -> 0 bytes apps/FaCE/ACE_Racer.bmp | Bin 9918 -> 0 bytes apps/FaCE/CE_ARGV.CPP | 118 - apps/FaCE/CE_ARGV.H | 90 - apps/FaCE/CE_Screen_Output.cpp | 162 - apps/FaCE/CE_Screen_Output.h | 97 - apps/FaCE/FACE.ico | Bin 1078 -> 0 bytes apps/FaCE/FaCE.cpp | 652 - apps/FaCE/FaCE.h | 57 - apps/FaCE/FaCE.rc | 268 - apps/FaCE/FaCE.vcp | 604 - apps/FaCE/FaCE.vcw | 29 - apps/FaCE/FaCENOACE.vcp | 528 - apps/FaCE/FaCENOACE.vcw | 29 - apps/FaCE/FaCE_OS.h | 38 - apps/FaCE/License.txt | 27 - apps/FaCE/Main.cpp | 49 - apps/FaCE/ReadMe.txt | 287 - apps/FaCE/TAO.bmp | Bin 21798 -> 0 bytes apps/FaCE/newres.h | 43 - apps/FaCE/resource.h | 45 - .../Gateway/Concrete_Connection_Handlers.cpp | 802 - .../Gateway/Gateway/Concrete_Connection_Handlers.h | 151 - apps/Gateway/Gateway/Config_Files.cpp | 222 - apps/Gateway/Gateway/Config_Files.h | 98 - apps/Gateway/Gateway/Connection_Handler.cpp | 289 - apps/Gateway/Gateway/Connection_Handler.h | 157 - .../Gateway/Connection_Handler_Acceptor.cpp | 62 - apps/Gateway/Gateway/Connection_Handler_Acceptor.h | 65 - .../Gateway/Connection_Handler_Connector.cpp | 76 - .../Gateway/Gateway/Connection_Handler_Connector.h | 44 - apps/Gateway/Gateway/Consumer_Dispatch_Set.h | 32 - apps/Gateway/Gateway/Event.h | 223 - apps/Gateway/Gateway/Event_Channel.cpp | 599 - apps/Gateway/Gateway/Event_Channel.h | 135 - .../Gateway/Event_Forwarding_Discriminator.cpp | 64 - .../Gateway/Event_Forwarding_Discriminator.h | 65 - apps/Gateway/Gateway/File_Parser.cpp | 164 - apps/Gateway/Gateway/File_Parser.h | 93 - apps/Gateway/Gateway/Gateway.cpp | 342 - apps/Gateway/Gateway/Gateway.dsp | 98 - apps/Gateway/Gateway/Gateway.dsw | 44 - apps/Gateway/Gateway/Gateway.h | 34 - apps/Gateway/Gateway/Makefile | 1652 -- apps/Gateway/Gateway/Makefile.bor | 15 - apps/Gateway/Gateway/Options.cpp | 285 - apps/Gateway/Gateway/Options.h | 197 - apps/Gateway/Gateway/connection_config | 55 - apps/Gateway/Gateway/consumer_config | 35 - apps/Gateway/Gateway/gatewayd.cpp | 67 - apps/Gateway/Gateway/gatewayd.dsp | 59 - apps/Gateway/Gateway/svc.conf | 3 - apps/Gateway/Makefile | 26 - apps/Gateway/Makefile.bor | 3 - apps/Gateway/Peer/Makefile | 371 - apps/Gateway/Peer/Makefile.bor | 8 - apps/Gateway/Peer/Options.cpp | 195 - apps/Gateway/Peer/Options.h | 135 - apps/Gateway/Peer/Peer.cpp | 908 - apps/Gateway/Peer/Peer.dsp | 66 - apps/Gateway/Peer/Peer.dsw | 44 - apps/Gateway/Peer/Peer.h | 255 - apps/Gateway/Peer/peerd.cpp | 62 - apps/Gateway/Peer/peerd.dsp | 59 - apps/Gateway/Peer/svc.conf | 2 - apps/Gateway/README | 140 - apps/JAWS/ChangeLog | 932 - apps/JAWS/Makefile | 25 - apps/JAWS/Makefile.bor | 3 - apps/JAWS/README | 15 - apps/JAWS/clients/Blobby/Blob.cpp | 93 - apps/JAWS/clients/Blobby/Blob.h | 87 - apps/JAWS/clients/Blobby/Blob_Handler.cpp | 346 - apps/JAWS/clients/Blobby/Blob_Handler.h | 118 - apps/JAWS/clients/Blobby/Makefile | 642 - apps/JAWS/clients/Blobby/Makefile.bor | 10 - apps/JAWS/clients/Blobby/Options.cpp | 81 - apps/JAWS/clients/Blobby/Options.h | 71 - apps/JAWS/clients/Blobby/README | 33 - apps/JAWS/clients/Blobby/blobby.cpp | 98 - apps/JAWS/clients/Caching/Caching.dsp | 112 - apps/JAWS/clients/Caching/Caching.dsw | 29 - apps/JAWS/clients/Caching/ID_Generator.cpp | 61 - apps/JAWS/clients/Caching/ID_Generator.h | 62 - apps/JAWS/clients/Caching/Local_Locator.cpp | 257 - apps/JAWS/clients/Caching/Local_Locator.h | 118 - apps/JAWS/clients/Caching/Local_Locator.i | 44 - .../JAWS/clients/Caching/Locator_Request_Reply.cpp | 459 - apps/JAWS/clients/Caching/Locator_Request_Reply.h | 220 - apps/JAWS/clients/Caching/Locator_Request_Reply.i | 138 - apps/JAWS/clients/Caching/Makefile | 260 - apps/JAWS/clients/Caching/Makefile.bor | 6 - apps/JAWS/clients/Caching/README | 83 - apps/JAWS/clients/Caching/URL_Array_Helper.cpp | 43 - apps/JAWS/clients/Caching/URL_Array_Helper.h | 40 - apps/JAWS/clients/Caching/URL_Locator.cpp | 56 - apps/JAWS/clients/Caching/URL_Locator.h | 116 - apps/JAWS/clients/Caching/URL_Locator.i | 4 - apps/JAWS/clients/Caching/URL_Properties.cpp | 163 - apps/JAWS/clients/Caching/URL_Properties.h | 201 - apps/JAWS/clients/Caching/URL_Properties.i | 203 - apps/JAWS/clients/Caching/http_client.cpp | 76 - apps/JAWS/clients/Caching/http_handler.cpp | 255 - apps/JAWS/clients/Caching/http_handler.h | 81 - apps/JAWS/clients/Caching/test_URL.cpp | 35 - apps/JAWS/clients/Makefile | 26 - apps/JAWS/clients/Makefile.bor | 3 - apps/JAWS/clients/README | 13 - apps/JAWS/clients/WebSTONE/COPYING | 348 - apps/JAWS/clients/WebSTONE/README | 245 - apps/JAWS/clients/WebSTONE/README.DynamicWorkload | 37 - apps/JAWS/clients/WebSTONE/README.FIRST | 21 - apps/JAWS/clients/WebSTONE/WEBSTONE-VERSION-2.0 | 0 apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl | 63 - apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl | 33 - apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl | 39 - apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl | 97 - apps/JAWS/clients/WebSTONE/bin/checkfilelist | 35 - apps/JAWS/clients/WebSTONE/bin/genfiles | 41 - .../clients/WebSTONE/bin/genfiles-from-filelist.sh | 41 - apps/JAWS/clients/WebSTONE/bin/gui-configure | 174 - apps/JAWS/clients/WebSTONE/bin/killbench | 13 - apps/JAWS/clients/WebSTONE/bin/killbench.pl | 17 - apps/JAWS/clients/WebSTONE/bin/mine-logs.pl | 90 - apps/JAWS/clients/WebSTONE/bin/move-filelist.pl | 28 - apps/JAWS/clients/WebSTONE/bin/move-runs.pl | 26 - apps/JAWS/clients/WebSTONE/bin/rebootall | 9 - apps/JAWS/clients/WebSTONE/bin/runbench | 193 - apps/JAWS/clients/WebSTONE/bin/runbench.pl | 38 - apps/JAWS/clients/WebSTONE/bin/tabs2html | 13 - apps/JAWS/clients/WebSTONE/bin/view-results.pl | 55 - apps/JAWS/clients/WebSTONE/bin/webstone-gui.pl | 318 - apps/JAWS/clients/WebSTONE/bin/write-testbed.pl | 49 - apps/JAWS/clients/WebSTONE/bin/wscollect.pl | 142 - apps/JAWS/clients/WebSTONE/conf/filelist | 6 - apps/JAWS/clients/WebSTONE/conf/filelist.cgi-heavy | 6 - .../clients/WebSTONE/conf/filelist.dynamic-heavy | 6 - .../clients/WebSTONE/conf/filelist.dynamic-light | 6 - .../clients/WebSTONE/conf/filelist.dynamic-medium | 6 - apps/JAWS/clients/WebSTONE/conf/filelist.homepage | 2 - apps/JAWS/clients/WebSTONE/conf/filelist.sample | 6 - apps/JAWS/clients/WebSTONE/conf/filelist.standard | 6 - apps/JAWS/clients/WebSTONE/conf/fileset | 32 - apps/JAWS/clients/WebSTONE/conf/paths.pl | 4 - apps/JAWS/clients/WebSTONE/conf/paths.sh | 0 apps/JAWS/clients/WebSTONE/conf/testbed | 33 - apps/JAWS/clients/WebSTONE/doc/COPYING | 348 - apps/JAWS/clients/WebSTONE/doc/FAQ-webstone.html | 403 - apps/JAWS/clients/WebSTONE/doc/LICENSE.html | 17 - apps/JAWS/clients/WebSTONE/doc/WebStone.html | 25 - apps/JAWS/clients/WebSTONE/doc/testbed.help | 21 - .../clients/WebSTONE/doc/webstone-white-paper.ps | 8974 --------- apps/JAWS/clients/WebSTONE/doc/webstone.gif | Bin 14656 -> 0 bytes apps/JAWS/clients/WebSTONE/doc/webstone2.html | 73 - apps/JAWS/clients/WebSTONE/src/Makefile | 112 - apps/JAWS/clients/WebSTONE/src/README | 232 - apps/JAWS/clients/WebSTONE/src/acconfig.h | 15 - apps/JAWS/clients/WebSTONE/src/bench.c | 635 - apps/JAWS/clients/WebSTONE/src/bench.h | 274 - apps/JAWS/clients/WebSTONE/src/cgi-send.c | 46 - .../JAWS/clients/WebSTONE/src/client/webclient.mak | 479 - apps/JAWS/clients/WebSTONE/src/config.cache | 47 - apps/JAWS/clients/WebSTONE/src/config.guess | 565 - apps/JAWS/clients/WebSTONE/src/config.h | 91 - apps/JAWS/clients/WebSTONE/src/config.h.in | 89 - apps/JAWS/clients/WebSTONE/src/config.log | 4 - apps/JAWS/clients/WebSTONE/src/config.status | 288 - apps/JAWS/clients/WebSTONE/src/config.sub | 867 - apps/JAWS/clients/WebSTONE/src/configure | 2132 -- apps/JAWS/clients/WebSTONE/src/configure.in | 99 - apps/JAWS/clients/WebSTONE/src/debug.h | 18 - apps/JAWS/clients/WebSTONE/src/errexit.c | 106 - apps/JAWS/clients/WebSTONE/src/gendata/genrand.mak | 227 - apps/JAWS/clients/WebSTONE/src/genrand.c | 62 - apps/JAWS/clients/WebSTONE/src/get.c | 318 - apps/JAWS/clients/WebSTONE/src/get.h | 17 - apps/JAWS/clients/WebSTONE/src/getopt.c | 67 - apps/JAWS/clients/WebSTONE/src/gettimeofday.c | 57 - apps/JAWS/clients/WebSTONE/src/install-sh | 238 - apps/JAWS/clients/WebSTONE/src/logfile27859 | 9 - .../JAWS/clients/WebSTONE/src/master/webmaster.mak | 476 - .../WebSTONE/src/nsapi-includes/base/buffer.h | 220 - .../WebSTONE/src/nsapi-includes/base/cinfo.h | 146 - .../WebSTONE/src/nsapi-includes/base/crit.h | 127 - .../WebSTONE/src/nsapi-includes/base/daemon.h | 120 - .../clients/WebSTONE/src/nsapi-includes/base/dll.h | 124 - .../WebSTONE/src/nsapi-includes/base/ereport.h | 121 - .../WebSTONE/src/nsapi-includes/base/eventlog.h | 61 - .../WebSTONE/src/nsapi-includes/base/file.h | 217 - .../WebSTONE/src/nsapi-includes/base/minissl.h | 27 - .../clients/WebSTONE/src/nsapi-includes/base/net.h | 180 - .../WebSTONE/src/nsapi-includes/base/nodelock.h | 47 - .../WebSTONE/src/nsapi-includes/base/nterrors.h | 738 - .../WebSTONE/src/nsapi-includes/base/objndx.h | 29 - .../WebSTONE/src/nsapi-includes/base/pblock.h | 193 - .../clients/WebSTONE/src/nsapi-includes/base/sem.h | 70 - .../WebSTONE/src/nsapi-includes/base/session.h | 85 - .../WebSTONE/src/nsapi-includes/base/shexp.h | 97 - .../WebSTONE/src/nsapi-includes/base/shmem.h | 84 - .../WebSTONE/src/nsapi-includes/base/systems.h | 222 - .../WebSTONE/src/nsapi-includes/base/systhr.h | 130 - .../WebSTONE/src/nsapi-includes/base/util.h | 205 - .../WebSTONE/src/nsapi-includes/frame/conf.h | 155 - .../WebSTONE/src/nsapi-includes/frame/dnfilter.h | 44 - .../WebSTONE/src/nsapi-includes/frame/func.h | 111 - .../WebSTONE/src/nsapi-includes/frame/http.h | 170 - .../WebSTONE/src/nsapi-includes/frame/httpact.h | 120 - .../WebSTONE/src/nsapi-includes/frame/ipfilter.h | 48 - .../WebSTONE/src/nsapi-includes/frame/log.h | 51 - .../WebSTONE/src/nsapi-includes/frame/object.h | 167 - .../WebSTONE/src/nsapi-includes/frame/objset.h | 158 - .../WebSTONE/src/nsapi-includes/frame/protocol.h | 27 - .../WebSTONE/src/nsapi-includes/frame/req.h | 216 - .../WebSTONE/src/nsapi-includes/frame/servact.h | 26 - .../clients/WebSTONE/src/nsapi-includes/netsite.h | 67 - apps/JAWS/clients/WebSTONE/src/nsapi-send.c | 88 - apps/JAWS/clients/WebSTONE/src/parse_file_list.c | 290 - apps/JAWS/clients/WebSTONE/src/parse_file_list.h | 20 - apps/JAWS/clients/WebSTONE/src/rexec.c | 373 - apps/JAWS/clients/WebSTONE/src/statistics.c | 49 - apps/JAWS/clients/WebSTONE/src/statistics.h | 9 - apps/JAWS/clients/WebSTONE/src/sysdep.c | 51 - apps/JAWS/clients/WebSTONE/src/sysdep.h | 131 - apps/JAWS/clients/WebSTONE/src/timefunc.c | 171 - apps/JAWS/clients/WebSTONE/src/timefunc.h | 30 - apps/JAWS/clients/WebSTONE/src/webclient.c | 1298 -- apps/JAWS/clients/WebSTONE/src/webmaster.c | 1418 -- apps/JAWS/clients/WebSTONE/webstone | 75 - apps/JAWS/server/HTTP_Config.cpp | 140 - apps/JAWS/server/HTTP_Config.h | 95 - apps/JAWS/server/HTTP_Handler.cpp | 289 - apps/JAWS/server/HTTP_Handler.h | 196 - apps/JAWS/server/HTTP_Helpers.cpp | 438 - apps/JAWS/server/HTTP_Helpers.h | 108 - apps/JAWS/server/HTTP_Request.cpp | 661 - apps/JAWS/server/HTTP_Request.h | 200 - apps/JAWS/server/HTTP_Response.cpp | 385 - apps/JAWS/server/HTTP_Response.h | 80 - apps/JAWS/server/HTTP_Server.cpp | 395 - apps/JAWS/server/HTTP_Server.h | 142 - apps/JAWS/server/IO.cpp | 413 - apps/JAWS/server/IO.h | 231 - apps/JAWS/server/JAWS_Concurrency.cpp | 82 - apps/JAWS/server/JAWS_Concurrency.h | 101 - apps/JAWS/server/JAWS_Pipeline.cpp | 29 - apps/JAWS/server/JAWS_Pipeline.h | 36 - apps/JAWS/server/JAWS_Pipeline_Handler.cpp | 26 - apps/JAWS/server/JAWS_Pipeline_Handler.h | 29 - apps/JAWS/server/Makefile | 1387 -- apps/JAWS/server/Makefile.bor | 17 - apps/JAWS/server/Parse_Headers.cpp | 358 - apps/JAWS/server/Parse_Headers.h | 121 - apps/JAWS/server/README | 201 - apps/JAWS/server/jaws.auth | 2 - apps/JAWS/server/jaws.dsp | 178 - apps/JAWS/server/jaws.dsw | 29 - apps/JAWS/server/main.cpp | 55 - apps/JAWS/server/svc.conf | 44 - apps/JAWS/server/test.cgi | 9 - apps/JAWS/stress_testing/Makefile | 589 - apps/JAWS/stress_testing/README | 54 - apps/JAWS/stress_testing/benchd.cpp | 240 - apps/JAWS/stress_testing/client.h | 8 - apps/JAWS/stress_testing/config | 3 - apps/JAWS/stress_testing/connection.cpp | 98 - apps/JAWS/stress_testing/connection.h | 22 - apps/JAWS/stress_testing/cp.cpp | 11 - apps/JAWS/stress_testing/cp.h | 14 - apps/JAWS/stress_testing/global.h | 32 - apps/JAWS/stress_testing/http.h | 16 - apps/JAWS/stress_testing/http_tester.cpp | 172 - apps/JAWS/stress_testing/out | 2 - apps/JAWS/stress_testing/stats.cpp | 88 - apps/JAWS/stress_testing/stats.h | 31 - apps/JAWS/stress_testing/util.cpp | 60 - apps/JAWS/stress_testing/util.h | 34 - apps/JAWS2/1000K.html | 20001 ------------------- apps/JAWS2/100K.html | 2001 -- apps/JAWS2/500K.html | 10001 ---------- apps/JAWS2/50K.html | 1001 - apps/JAWS2/5K.html | 101 - apps/JAWS2/HTTPU/HTTPU.DSP | 171 - apps/JAWS2/HTTPU/HTTPU.DSW | 29 - apps/JAWS2/HTTPU/Makefile | 825 - apps/JAWS2/HTTPU/http_base.cpp | 323 - apps/JAWS2/HTTPU/http_base.h | 87 - apps/JAWS2/HTTPU/http_base.i | 53 - apps/JAWS2/HTTPU/http_export.h | 38 - apps/JAWS2/HTTPU/http_headers.cpp | 161 - apps/JAWS2/HTTPU/http_headers.h | 165 - apps/JAWS2/HTTPU/http_headers.i | 48 - apps/JAWS2/HTTPU/http_request.cpp | 86 - apps/JAWS2/HTTPU/http_request.h | 59 - apps/JAWS2/HTTPU/http_request.i | 41 - apps/JAWS2/HTTPU/http_response.cpp | 49 - apps/JAWS2/HTTPU/http_response.h | 51 - apps/JAWS2/HTTPU/http_response.i | 23 - apps/JAWS2/HTTPU/http_status.cpp | 87 - apps/JAWS2/HTTPU/http_status.h | 109 - apps/JAWS2/HTTPU/http_status.i | 19 - apps/JAWS2/HTTPU/parse_http_request.cpp | 116 - apps/JAWS2/HTTPU/parse_http_request.h | 59 - apps/JAWS2/HTTPU/parse_http_request.i | 49 - apps/JAWS2/HTTPU/parse_http_response.cpp | 72 - apps/JAWS2/HTTPU/parse_http_response.h | 56 - apps/JAWS2/HTTPU/parse_http_response.i | 43 - apps/JAWS2/HTTPU/parse_url.cpp | 321 - apps/JAWS2/HTTPU/parse_url.h | 63 - apps/JAWS2/HTTP_10.cpp | 32 - apps/JAWS2/HTTP_10.h | 68 - apps/JAWS2/HTTP_10_Parse.cpp | 82 - apps/JAWS2/HTTP_10_Read.cpp | 64 - apps/JAWS2/HTTP_10_Request.cpp | 119 - apps/JAWS2/HTTP_10_Request.h | 31 - apps/JAWS2/HTTP_10_Write.cpp | 160 - apps/JAWS2/HTTP_Policy.cpp | 17 - apps/JAWS2/HTTP_Policy.h | 22 - apps/JAWS2/JAWS/Assoc_Array.cpp | 274 - apps/JAWS2/JAWS/Assoc_Array.h | 102 - apps/JAWS2/JAWS/Cache_Hash_T.cpp | 237 - apps/JAWS2/JAWS/Cache_Hash_T.h | 61 - apps/JAWS2/JAWS/Cache_Heap_T.cpp | 290 - apps/JAWS2/JAWS/Cache_Heap_T.h | 103 - apps/JAWS2/JAWS/Cache_List_T.cpp | 222 - apps/JAWS2/JAWS/Cache_List_T.h | 111 - apps/JAWS2/JAWS/Cache_Manager.cpp | 189 - apps/JAWS2/JAWS/Cache_Manager.h | 66 - apps/JAWS2/JAWS/Cache_Manager_T.cpp | 576 - apps/JAWS2/JAWS/Cache_Manager_T.h | 185 - apps/JAWS2/JAWS/Cache_Object.cpp | 302 - apps/JAWS2/JAWS/Cache_Object.h | 149 - apps/JAWS2/JAWS/Concurrency.cpp | 349 - apps/JAWS2/JAWS/Concurrency.h | 132 - apps/JAWS2/JAWS/Data_Block.cpp | 76 - apps/JAWS2/JAWS/Data_Block.h | 50 - apps/JAWS2/JAWS/Export.h | 38 - apps/JAWS2/JAWS/FILE.cpp | 69 - apps/JAWS2/JAWS/FILE.h | 45 - apps/JAWS2/JAWS/Filecache.cpp | 136 - apps/JAWS2/JAWS/Filecache.h | 73 - apps/JAWS2/JAWS/Hash_Bucket_T.cpp | 462 - apps/JAWS2/JAWS/Hash_Bucket_T.h | 206 - apps/JAWS2/JAWS/Headers.cpp | 165 - apps/JAWS2/JAWS/Headers.h | 78 - apps/JAWS2/JAWS/IO.cpp | 603 - apps/JAWS2/JAWS/IO.h | 252 - apps/JAWS2/JAWS/IO_Acceptor.cpp | 210 - apps/JAWS2/JAWS/IO_Acceptor.h | 139 - apps/JAWS2/JAWS/IO_Handler.cpp | 509 - apps/JAWS2/JAWS/IO_Handler.h | 313 - apps/JAWS2/JAWS/JAWS.h | 14 - apps/JAWS2/JAWS/Makefile | 3209 --- apps/JAWS2/JAWS/Makefile.bor | 31 - apps/JAWS2/JAWS/Parse_Headers.cpp | 441 - apps/JAWS2/JAWS/Parse_Headers.h | 122 - apps/JAWS2/JAWS/Pipeline.cpp | 27 - apps/JAWS2/JAWS/Pipeline.h | 39 - apps/JAWS2/JAWS/Pipeline_Handler_T.cpp | 31 - apps/JAWS2/JAWS/Pipeline_Handler_T.h | 32 - apps/JAWS2/JAWS/Pipeline_Tasks.cpp | 213 - apps/JAWS2/JAWS/Pipeline_Tasks.h | 56 - apps/JAWS2/JAWS/Policy.cpp | 89 - apps/JAWS2/JAWS/Policy.h | 65 - apps/JAWS2/JAWS/Reaper.cpp | 45 - apps/JAWS2/JAWS/Reaper.h | 48 - apps/JAWS2/JAWS/Server.cpp | 190 - apps/JAWS2/JAWS/Server.h | 39 - apps/JAWS2/JAWS/Waiter.cpp | 73 - apps/JAWS2/JAWS/Waiter.h | 48 - apps/JAWS2/JAWS/jaws.dsp | 310 - apps/JAWS2/JAWS/jaws.dsw | 29 - apps/JAWS2/Makefile | 921 - apps/JAWS2/Makefile.bor | 18 - apps/JAWS2/README | 32 - apps/JAWS2/main.cpp | 47 - apps/JAWS2/server.dsp | 114 - apps/JAWS2/server.dsw | 29 - apps/Makefile | 26 - apps/Makefile.am | 27 - apps/Makefile.bor | 3 - apps/README | 20 - apps/build.bor | 15 - apps/drwho/BS_Client.cpp | 89 - apps/drwho/BS_Client.h | 46 - apps/drwho/BS_Server.cpp | 116 - apps/drwho/BS_Server.h | 47 - apps/drwho/Binary_Search.cpp | 80 - apps/drwho/Binary_Search.h | 71 - apps/drwho/CM_Client.cpp | 138 - apps/drwho/CM_Client.h | 51 - apps/drwho/CM_Server.cpp | 106 - apps/drwho/CM_Server.h | 39 - apps/drwho/ChangeLog | 340 - apps/drwho/Comm_Manager.h | 39 - apps/drwho/Drwho_Node.cpp | 101 - apps/drwho/Drwho_Node.h | 52 - apps/drwho/File_Manager.cpp | 177 - apps/drwho/File_Manager.h | 57 - apps/drwho/HT_Client.cpp | 34 - apps/drwho/HT_Client.h | 31 - apps/drwho/HT_Server.cpp | 37 - apps/drwho/HT_Server.h | 32 - apps/drwho/Hash_Table.cpp | 73 - apps/drwho/Hash_Table.h | 45 - apps/drwho/Makefile | 1737 -- apps/drwho/Multicast_Manager.cpp | 177 - apps/drwho/Multicast_Manager.h | 56 - apps/drwho/Options.cpp | 155 - apps/drwho/Options.h | 66 - apps/drwho/PMC_All.cpp | 98 - apps/drwho/PMC_All.h | 37 - apps/drwho/PMC_Flo.cpp | 122 - apps/drwho/PMC_Flo.h | 37 - apps/drwho/PMC_Ruser.cpp | 174 - apps/drwho/PMC_Ruser.h | 40 - apps/drwho/PMC_Usr.cpp | 114 - apps/drwho/PMC_Usr.h | 38 - apps/drwho/PMS_All.cpp | 97 - apps/drwho/PMS_All.h | 35 - apps/drwho/PMS_Flo.cpp | 73 - apps/drwho/PMS_Flo.h | 35 - apps/drwho/PMS_Ruser.cpp | 129 - apps/drwho/PMS_Ruser.h | 37 - apps/drwho/PMS_Usr.cpp | 80 - apps/drwho/PMS_Usr.h | 35 - apps/drwho/PM_Client.cpp | 138 - apps/drwho/PM_Client.h | 45 - apps/drwho/PM_Server.cpp | 82 - apps/drwho/PM_Server.h | 41 - apps/drwho/Protocol_Manager.cpp | 86 - apps/drwho/Protocol_Manager.h | 58 - apps/drwho/Protocol_Record.cpp | 97 - apps/drwho/Protocol_Record.h | 49 - apps/drwho/README | 308 - apps/drwho/Rwho_DB_Manager.cpp | 123 - apps/drwho/Rwho_DB_Manager.h | 52 - apps/drwho/SL_Client.cpp | 15 - apps/drwho/SL_Client.h | 33 - apps/drwho/SL_Server.cpp | 25 - apps/drwho/SL_Server.h | 34 - apps/drwho/SML_Client.cpp | 36 - apps/drwho/SML_Client.h | 36 - apps/drwho/SML_Server.cpp | 11 - apps/drwho/SML_Server.h | 29 - apps/drwho/SMR_Client.cpp | 22 - apps/drwho/SMR_Client.h | 29 - apps/drwho/SMR_Server.cpp | 18 - apps/drwho/SMR_Server.h | 29 - apps/drwho/SM_Client.cpp | 74 - apps/drwho/SM_Client.h | 38 - apps/drwho/SM_Server.cpp | 68 - apps/drwho/SM_Server.h | 36 - apps/drwho/Search_Struct.cpp | 23 - apps/drwho/Search_Struct.h | 41 - apps/drwho/Select_Manager.h | 30 - apps/drwho/Single_Lookup.cpp | 31 - apps/drwho/Single_Lookup.h | 39 - apps/drwho/client.cpp | 65 - apps/drwho/global.h | 52 - apps/drwho/server.cpp | 113 - apps/gperf/COPYING | 340 - apps/gperf/ChangeLog | 2010 -- apps/gperf/Makefile | 28 - apps/gperf/Makefile.am | 26 - apps/gperf/Makefile.bor | 3 - apps/gperf/README | 29 - apps/gperf/gperf.1 | 23 - apps/gperf/gperf.info | 1128 -- apps/gperf/gperf.texi | 1187 -- apps/gperf/mdate-sh | 92 - apps/gperf/src/Bool_Array.cpp | 106 - apps/gperf/src/Bool_Array.h | 75 - apps/gperf/src/Gen_Perf.cpp | 454 - apps/gperf/src/Gen_Perf.h | 81 - apps/gperf/src/Hash_Table.cpp | 114 - apps/gperf/src/Hash_Table.h | 66 - apps/gperf/src/Iterator.cpp | 97 - apps/gperf/src/Iterator.h | 80 - apps/gperf/src/Key_List.cpp | 1940 -- apps/gperf/src/Key_List.h | 173 - apps/gperf/src/List_Node.cpp | 129 - apps/gperf/src/List_Node.h | 80 - apps/gperf/src/Makefile | 413 - apps/gperf/src/Makefile.am | 40 - apps/gperf/src/Makefile.bor | 23 - apps/gperf/src/Options.cpp | 864 - apps/gperf/src/Options.h | 191 - apps/gperf/src/Vectors.cpp | 36 - apps/gperf/src/Vectors.h | 49 - apps/gperf/src/Version.cpp | 30 - apps/gperf/src/gperf.cpp | 85 - apps/gperf/src/gperf.dsp | 232 - apps/gperf/src/gperf.dsw | 29 - apps/gperf/src/gperf.mpc | 17 - apps/gperf/tests/Makefile | 263 - apps/gperf/tests/Makefile.am | 115 - apps/gperf/tests/ada-pred.exp | 54 - apps/gperf/tests/ada-res.exp | 63 - apps/gperf/tests/ada.gperf | 63 - apps/gperf/tests/adadefs.gperf | 54 - apps/gperf/tests/c++-res.exp | 73 - apps/gperf/tests/c++.gperf | 73 - apps/gperf/tests/c-parse.gperf | 56 - apps/gperf/tests/c.exp | 32 - apps/gperf/tests/c.gperf | 32 - apps/gperf/tests/corba.exp | 36 - apps/gperf/tests/corba.gperf | 36 - apps/gperf/tests/gpc.gperf | 48 - apps/gperf/tests/gplus.gperf | 76 - apps/gperf/tests/idl.exp | 9 - apps/gperf/tests/idl.gperf | 9 - apps/gperf/tests/irc.gperf | 63 - apps/gperf/tests/makeinfo.gperf | 116 - apps/gperf/tests/modula.exp | 106 - apps/gperf/tests/modula2.gperf | 40 - apps/gperf/tests/modula3.gperf | 106 - apps/gperf/tests/pascal.exp | 36 - apps/gperf/tests/pascal.gperf | 36 - apps/gperf/tests/tao.exp | 21 - apps/gperf/tests/tao.gperf | 21 - apps/gperf/tests/test-1.exp | 165 - apps/gperf/tests/test-2.exp | 214 - apps/gperf/tests/test-3.exp | 196 - apps/gperf/tests/test-4.exp | 170 - apps/gperf/tests/test-5.exp | 139 - apps/gperf/tests/test-6.exp | 90 - apps/gperf/tests/test-7.exp | 32 - apps/gperf/tests/test.cpp | 34 - apps/gperf/texinfo.tex | 4977 ----- apps/gperf/version.texi | 3 - apps/mkcsregdb/Makefile | 37 - apps/mkcsregdb/code_set_registry1.2g.txt | 1528 -- apps/mkcsregdb/cs_test.txt | 15 - apps/mkcsregdb/iso_only.txt | 7 - apps/mkcsregdb/mkcsregdb.cpp | 319 - apps/mkcsregdb/mkcsregdb.dsp | 103 - apps/soreduce/Library.cpp | 368 - apps/soreduce/Library.h | 126 - apps/soreduce/Makefile | 42 - apps/soreduce/Obj_Module.cpp | 193 - apps/soreduce/Obj_Module.h | 66 - apps/soreduce/README | 167 - apps/soreduce/SO_Group.cpp | 158 - apps/soreduce/SO_Group.h | 48 - apps/soreduce/Sig_List.cpp | 184 - apps/soreduce/Sig_List.h | 49 - apps/soreduce/Signature.cpp | 45 - apps/soreduce/Signature.h | 50 - apps/soreduce/soreduce.cpp | 51 - bin/.cvsignore | 2 - bin/ACEutils.pm | 117 - bin/ADDIDL.DSM | 150 - bin/Array.pl | 31 - bin/Array_Helper | 16 - bin/ChangeLogEditor/ChangeLogEdit.pm | 120 - bin/ChangeLogEditor/ChangeLogEntry.pm | 130 - bin/ChangeLogEditor/EmailTranslator.pm | 52 - bin/ChangeLogEditor/FileLocator.pm | 116 - bin/Hash_Map_Manager.pl | 146 - bin/Hash_Map_Manager_Helper | 76 - bin/MakeProjectCreator/README | 198 - bin/MakeProjectCreator/USAGE | 154 - bin/MakeProjectCreator/config/acedefaults.mpb | 5 - bin/MakeProjectCreator/config/aceexe.mpb | 6 - bin/MakeProjectCreator/config/acelib.mpb | 6 - bin/MakeProjectCreator/config/aceversion.mpb | 3 - bin/MakeProjectCreator/config/acexml.mpb | 5 - bin/MakeProjectCreator/config/avstreamsexe.mpb | 6 - bin/MakeProjectCreator/config/ciao_client.mpb | 8 - bin/MakeProjectCreator/config/ciao_component.mpb | 7 - bin/MakeProjectCreator/config/ciao_server.mpb | 4 - bin/MakeProjectCreator/config/client.mpb | 3 - bin/MakeProjectCreator/config/corba_messaging.mpb | 3 - bin/MakeProjectCreator/config/core.mpb | 3 - bin/MakeProjectCreator/config/default.rel | 7 - bin/MakeProjectCreator/config/global.mpb | 4 - bin/MakeProjectCreator/config/messaging.mpb | 2 - bin/MakeProjectCreator/config/messaging_only.mpb | 4 - bin/MakeProjectCreator/config/minimum_corba.mpb | 3 - bin/MakeProjectCreator/config/namingexe.mpb | 5 - bin/MakeProjectCreator/config/notify.mpb | 5 - bin/MakeProjectCreator/config/notifytest.mpb | 6 - bin/MakeProjectCreator/config/orbsvcsexe.mpb | 5 - bin/MakeProjectCreator/config/orbsvcslib.mpb | 7 - bin/MakeProjectCreator/config/rt_client.mpb | 5 - bin/MakeProjectCreator/config/rt_server.mpb | 5 - bin/MakeProjectCreator/config/rteventexe.mpb | 5 - bin/MakeProjectCreator/config/server.mpb | 5 - bin/MakeProjectCreator/config/strategies.mpb | 4 - bin/MakeProjectCreator/config/taoexe.mpb | 8 - bin/MakeProjectCreator/config/taolib.mpb | 6 - bin/MakeProjectCreator/config/taolib_with_idl.mpb | 4 - bin/MakeProjectCreator/config/taoversion.mpb | 3 - bin/MakeProjectCreator/config/vcfullmacros.mpt | 11 - bin/MakeProjectCreator/config/vcpartialmacros.mpt | 11 - .../modules/BorlandProjectCreator.pm | 76 - .../modules/BorlandWorkspaceCreator.pm | 94 - bin/MakeProjectCreator/modules/Creator.pm | 711 - bin/MakeProjectCreator/modules/Driver.pm | 346 - .../modules/EM3ProjectCreator.pm | 79 - .../modules/EM3WorkspaceCreator.pm | 43 - .../modules/GHSProjectCreator.pm | 62 - .../modules/GHSWorkspaceCreator.pm | 76 - .../modules/GNUACEProjectCreator.pm | 202 - .../modules/GNUACEWorkspaceCreator.pm | 98 - bin/MakeProjectCreator/modules/GUID.pm | 58 - .../modules/MakeProjectCreator.pm | 65 - .../modules/MakeWorkspaceCreator.pm | 98 - .../modules/NMakeProjectCreator.pm | 66 - .../modules/NMakeWorkspaceCreator.pm | 121 - bin/MakeProjectCreator/modules/Options.pm | 297 - bin/MakeProjectCreator/modules/Parser.pm | 175 - bin/MakeProjectCreator/modules/ProjectCreator.pm | 1663 -- bin/MakeProjectCreator/modules/StringProcessor.pm | 106 - .../modules/TemplateInputReader.pm | 143 - bin/MakeProjectCreator/modules/TemplateParser.pm | 1008 - .../modules/VA4ProjectCreator.pm | 129 - .../modules/VA4WorkspaceCreator.pm | 76 - .../modules/VC6ProjectCreator.pm | 229 - .../modules/VC6WorkspaceCreator.pm | 132 - .../modules/VC7ProjectCreator.pm | 104 - .../modules/VC7WorkspaceCreator.pm | 130 - bin/MakeProjectCreator/modules/WorkspaceCreator.pm | 815 - bin/MakeProjectCreator/templates/bor.mpd | 150 - bin/MakeProjectCreator/templates/bordll.mpt | 3 - bin/MakeProjectCreator/templates/borexe.mpt | 2 - bin/MakeProjectCreator/templates/em3vcp.mpd | 244 - bin/MakeProjectCreator/templates/em3vcpdll.mpt | 77 - bin/MakeProjectCreator/templates/em3vcpdllexe.mpt | 77 - bin/MakeProjectCreator/templates/em3vcplib.mpt | 79 - bin/MakeProjectCreator/templates/em3vcplibexe.mpt | 79 - bin/MakeProjectCreator/templates/ghs.mpd | 16 - bin/MakeProjectCreator/templates/gnu.mpd | 283 - bin/MakeProjectCreator/templates/gnudll.mpt | 1 - bin/MakeProjectCreator/templates/gnuexe.mpt | 1 - bin/MakeProjectCreator/templates/make.mpd | 100 - bin/MakeProjectCreator/templates/nmake.mpd | 258 - bin/MakeProjectCreator/templates/nmakedll.mpt | 137 - bin/MakeProjectCreator/templates/nmakeexe.mpt | 118 - bin/MakeProjectCreator/templates/va4icc.mpd | 138 - bin/MakeProjectCreator/templates/va4iccdll.mpt | 4 - bin/MakeProjectCreator/templates/va4iccdllexe.mpt | 4 - bin/MakeProjectCreator/templates/va4icclib.mpt | 4 - bin/MakeProjectCreator/templates/va4icclibexe.mpt | 5 - bin/MakeProjectCreator/templates/vc6dsp.mpd | 230 - bin/MakeProjectCreator/templates/vc6dspdll.mpt | 50 - bin/MakeProjectCreator/templates/vc6dspdllexe.mpt | 57 - bin/MakeProjectCreator/templates/vc6dsplib.mpt | 55 - bin/MakeProjectCreator/templates/vc6dsplibexe.mpt | 58 - bin/MakeProjectCreator/templates/vc7.mpd | 234 - bin/MakeProjectCreator/templates/vc7dll.mpt | 100 - bin/MakeProjectCreator/templates/vc7exe.mpt | 90 - bin/Makefile | 111 - bin/PerlACE/ConfigList.pm | 155 - bin/PerlACE/MSProject.pm | 393 - bin/PerlACE/MSProject/DSP.pm | 28 - bin/PerlACE/MSProject/VCP.pm | 30 - bin/PerlACE/Process.pm | 38 - bin/PerlACE/Process_Unix.pm | 351 - bin/PerlACE/Process_Win32.pm | 378 - bin/PerlACE/Run_Test.pm | 102 - bin/Process.pm | 18 - bin/Process_Unix.pm | 73 - bin/Process_Win32.pm | 58 - bin/Service_Config.perl | 31 - bin/Uniqueid.pm | 28 - bin/ace-install | 513 - bin/ace_components | 110 - bin/ace_ld | 237 - bin/ace_tests.lst | 13 - bin/aix_shr | 32 - bin/am_edit | 1368 -- bin/auto_compile | 607 - bin/auto_compile_wrapper | 56 - bin/auto_ptr.perl | 16 - bin/auto_run_tests.pl | 129 - bin/autoconf_compile | 520 - bin/autoconf_compile_wrapper | 56 - bin/bootstrap | 185 - bin/check_build_logs | 176 - bin/cle.pl | 233 - bin/clean_dsp.pl | 52 - bin/clean_sems.sh | 12 - bin/clone.1 | 297 - bin/clone.cpp | 980 - bin/clone.csh | 26 - bin/corba-boolean.perl | 19 - bin/count_lines | 234 - bin/create_ace_build | 182 - bin/cvslog | 169 - bin/doxygen-convert-h.pl | 527 - bin/dsp2dsp.pl | 29 - bin/envinfo.cpp | 29 - bin/footprint_stats.sh | 66 - bin/fuzz.pl | 904 - bin/g++dep | 117 - bin/generate_doxygen.pl | 235 - bin/generate_export_file.pl | 160 - bin/generate_footprint_chart.sh | 17 - bin/generate_performance_chart.sh | 16 - bin/generate_topinfo_charts.sh | 16 - bin/indent_macros.perl | 59 - bin/libsize.pl | 192 - bin/main2TMAIN.pl | 16 - bin/make-components | 17 - bin/make_pretty.pl | 694 - bin/make_release | 903 - bin/mpc.pl | 98 - bin/msvc_auto_compile.pl | 356 - bin/mwc.pl | 98 - bin/nightlybuilds/builds.lst | 97 - bin/nightlybuilds/clean_logs.pl | 73 - bin/nightlybuilds/pace.lst | 20 - bin/nightlybuilds/print_config.pl | 76 - bin/nightlybuilds/scoreboard_update.pl | 981 - bin/performance_stats.sh | 127 - bin/perltest2cpp.pl | 2251 --- bin/pippen.pl | 419 - bin/regenerate_exports.pl | 54 - bin/rename-ace.pl | 184 - bin/reverse_clean | 22 - bin/run_all.pl | 224 - bin/run_all_win32.pl | 180 - bin/sandbox.cpp | 167 - bin/show_log_dir.pl | 178 - bin/split-cpp | 422 - bin/subst_env.pl | 67 - bin/svcconf-convert.pl | 300 - bin/tao_env.pl | 17 - bin/tao_orb_tests.lst | 130 - bin/tao_other_tests.lst | 97 - bin/tao_svcconf.pl | 15 - bin/topinfo_iorsize_stats.sh | 78 - bin/topinfo_simple_stats.sh | 78 - bin/topinfo_stats.sh | 74 - bin/update-ace+tao.sh | 39 - bin/vc_filter.pl | 157 - bin/vxworks_modify.pl | 578 - docs/ACE-FMM.html | 283 - docs/ACE-SSL.html | 41 - docs/ACE-bug-process.html | 116 - docs/ACE-categories.html | 753 - docs/ACE-configuration.txt | 180 - docs/ACE-development-process.html | 167 - docs/ACE-guidelines.html | 1198 -- docs/ACE-inheritance.pdf | Bin 25088 -> 0 bytes docs/ACE-inheritance.ps.gz | Bin 18416 -> 0 bytes docs/ACE-lessons.html | 270 - docs/ACE-porting.html | 185 - docs/ACE-subsets.html | 913 - docs/ACE-tutorials.html | 57 - docs/CE-status.txt | 41 - docs/exceptions.html | 651 - docs/index.html | 101 - docs/minimumTAO.html | 475 - docs/msvc_notes.txt | 159 - docs/run_test.txt | 172 - docs/tutorials/001/001.dsp | 108 - docs/tutorials/001/00SetEnv | 2 - docs/tutorials/001/Makefile | 76 - docs/tutorials/001/acceptor.h | 128 - docs/tutorials/001/combine.shar | 574 - docs/tutorials/001/logger.h | 178 - docs/tutorials/001/page01.html | 104 - docs/tutorials/001/page02.html | 174 - docs/tutorials/001/page03.html | 197 - docs/tutorials/001/page04.html | 213 - docs/tutorials/001/page05.html | 56 - docs/tutorials/001/server.cpp | 79 - docs/tutorials/001/simple.fig | 57 - docs/tutorials/001/simple.gif | Bin 6040 -> 0 bytes docs/tutorials/002/002.dsp | 104 - docs/tutorials/002/00SetEnv | 2 - docs/tutorials/002/Makefile | 55 - docs/tutorials/002/combine.shar | 328 - docs/tutorials/002/handler.h | 167 - docs/tutorials/002/page01.html | 54 - docs/tutorials/002/page02.html | 159 - docs/tutorials/002/page03.html | 195 - docs/tutorials/002/page04.html | 40 - docs/tutorials/002/server.cpp | 90 - docs/tutorials/003/003.dsp | 100 - docs/tutorials/003/00SetEnv | 2 - docs/tutorials/003/Makefile | 51 - docs/tutorials/003/client.cpp | 99 - docs/tutorials/003/combine.shar | 217 - docs/tutorials/003/page01.html | 161 - docs/tutorials/004/004.dsp | 100 - docs/tutorials/004/00SetEnv | 2 - docs/tutorials/004/Makefile | 47 - docs/tutorials/004/client.cpp | 216 - docs/tutorials/004/combine.shar | 216 - docs/tutorials/004/page01.html | 277 - docs/tutorials/005/005.dsp | 114 - docs/tutorials/005/00SetEnv | 2 - docs/tutorials/005/Makefile | 118 - docs/tutorials/005/client_acceptor.h | 36 - docs/tutorials/005/client_handler.cpp | 225 - docs/tutorials/005/client_handler.h | 100 - docs/tutorials/005/combine.shar | 423 - docs/tutorials/005/page01.html | 35 - docs/tutorials/005/page02.html | 153 - docs/tutorials/005/page03.html | 73 - docs/tutorials/005/page04.html | 135 - docs/tutorials/005/page05.html | 255 - docs/tutorials/005/page06.html | 146 - docs/tutorials/005/page07.html | 97 - docs/tutorials/005/page08.html | 49 - docs/tutorials/005/server.brk | 154 - docs/tutorials/005/server.cpp | 114 - docs/tutorials/006/006.dsp | 112 - docs/tutorials/006/Makefile | 114 - docs/tutorials/006/client_acceptor.h | 74 - docs/tutorials/006/client_handler.cpp | 293 - docs/tutorials/006/client_handler.h | 118 - docs/tutorials/006/combine.shar | 508 - docs/tutorials/006/page01.html | 63 - docs/tutorials/006/page02.html | 149 - docs/tutorials/006/page03.html | 113 - docs/tutorials/006/page04.html | 154 - docs/tutorials/006/page05.html | 351 - docs/tutorials/006/page06.html | 47 - docs/tutorials/006/server.cpp | 115 - docs/tutorials/007/007.dsp | 124 - docs/tutorials/007/Makefile | 116 - docs/tutorials/007/client_acceptor.cpp | 56 - docs/tutorials/007/client_acceptor.h | 125 - docs/tutorials/007/client_handler.cpp | 233 - docs/tutorials/007/client_handler.h | 156 - docs/tutorials/007/combine.shar | 685 - docs/tutorials/007/page01.html | 84 - docs/tutorials/007/page02.html | 142 - docs/tutorials/007/page03.html | 155 - docs/tutorials/007/page04.html | 87 - docs/tutorials/007/page05.html | 188 - docs/tutorials/007/page06.html | 266 - docs/tutorials/007/page07.html | 112 - docs/tutorials/007/page08.html | 280 - docs/tutorials/007/page09.html | 79 - docs/tutorials/007/server.cpp | 113 - docs/tutorials/007/thread_pool.cpp | 250 - docs/tutorials/007/thread_pool.h | 81 - docs/tutorials/008/008-broadcast.dsp | 102 - docs/tutorials/008/008-direct.dsp | 102 - docs/tutorials/008/008-server.dsp | 102 - docs/tutorials/008/Makefile | 74 - docs/tutorials/008/broadcast_client.cpp | 84 - docs/tutorials/008/combine.shar | 465 - docs/tutorials/008/directed_client.cpp | 108 - docs/tutorials/008/page01.html | 75 - docs/tutorials/008/page02.html | 164 - docs/tutorials/008/page03.html | 148 - docs/tutorials/008/page04.html | 139 - docs/tutorials/008/page05.html | 41 - docs/tutorials/008/server.cpp | 116 - docs/tutorials/009/009-broadcast.dsp | 102 - docs/tutorials/009/009-directed.dsp | 102 - docs/tutorials/009/009-server.dsp | 102 - docs/tutorials/009/Makefile | 74 - docs/tutorials/009/broadcast_client.cpp | 47 - docs/tutorials/009/combine.shar | 394 - docs/tutorials/009/directed_client.cpp | 69 - docs/tutorials/009/page01.html | 62 - docs/tutorials/009/page02.html | 113 - docs/tutorials/009/page03.html | 103 - docs/tutorials/009/page04.html | 77 - docs/tutorials/009/page05.html | 48 - docs/tutorials/009/server.cpp | 81 - docs/tutorials/010/010.dsp | 112 - docs/tutorials/010/Makefile | 73 - docs/tutorials/010/block.h | 42 - docs/tutorials/010/combine.shar | 550 - docs/tutorials/010/message_queue.cpp | 88 - docs/tutorials/010/page01.html | 62 - docs/tutorials/010/page02.html | 127 - docs/tutorials/010/page03.html | 75 - docs/tutorials/010/page04.html | 78 - docs/tutorials/010/page05.html | 171 - docs/tutorials/010/page06.html | 58 - docs/tutorials/010/page07.html | 32 - docs/tutorials/010/task.cpp | 123 - docs/tutorials/010/task.h | 45 - docs/tutorials/011/011.dsp | 116 - docs/tutorials/011/Makefile | 73 - docs/tutorials/011/block.h | 38 - docs/tutorials/011/combine.shar | 489 - docs/tutorials/011/data.h | 73 - docs/tutorials/011/message_queue.cpp | 84 - docs/tutorials/011/page01.html | 37 - docs/tutorials/011/page02.html | 117 - docs/tutorials/011/page03.html | 189 - docs/tutorials/011/page04.html | 105 - docs/tutorials/011/page05.html | 94 - docs/tutorials/011/page06.html | 37 - docs/tutorials/011/task.cpp | 115 - docs/tutorials/011/task.h | 33 - docs/tutorials/012/012.dsp | 112 - docs/tutorials/012/Makefile | 73 - docs/tutorials/012/block.h | 65 - docs/tutorials/012/combine.shar | 466 - docs/tutorials/012/message_queue.cpp | 97 - docs/tutorials/012/page01.html | 45 - docs/tutorials/012/page02.html | 113 - docs/tutorials/012/page03.html | 107 - docs/tutorials/012/page04.html | 128 - docs/tutorials/012/page05.html | 234 - docs/tutorials/012/page06.html | 32 - docs/tutorials/012/task.cpp | 145 - docs/tutorials/012/task.h | 47 - docs/tutorials/012/work.h | 78 - docs/tutorials/013/013.dsp | 132 - docs/tutorials/013/Makefile | 74 - docs/tutorials/013/block.cpp | 81 - docs/tutorials/013/block.h | 84 - docs/tutorials/013/combine.shar | 661 - docs/tutorials/013/message_queue.cpp | 88 - docs/tutorials/013/mld.cpp | 23 - docs/tutorials/013/mld.h | 50 - docs/tutorials/013/page01.html | 65 - docs/tutorials/013/page02.html | 124 - docs/tutorials/013/page03.html | 127 - docs/tutorials/013/page04.html | 141 - docs/tutorials/013/page05.html | 109 - docs/tutorials/013/page06.html | 304 - docs/tutorials/013/page07.html | 258 - docs/tutorials/013/page08.html | 43 - docs/tutorials/013/task.cpp | 193 - docs/tutorials/013/task.h | 57 - docs/tutorials/013/work.cpp | 125 - docs/tutorials/013/work.h | 72 - docs/tutorials/014/014.dsp | 112 - docs/tutorials/014/EndTask.h | 84 - docs/tutorials/014/Makefile | 77 - docs/tutorials/014/Task.cpp | 207 - docs/tutorials/014/Task.h | 66 - docs/tutorials/014/combine.shar | 357 - docs/tutorials/014/page01.html | 74 - docs/tutorials/014/page02.html | 92 - docs/tutorials/014/page03.html | 262 - docs/tutorials/014/page04.html | 121 - docs/tutorials/014/page05.html | 218 - docs/tutorials/014/stream.cpp | 169 - docs/tutorials/015/015-client.dsp | 138 - docs/tutorials/015/015-server.dsp | 166 - docs/tutorials/015/Client_i.cpp | 60 - docs/tutorials/015/Client_i.h | 73 - docs/tutorials/015/Compressor.cpp | 101 - docs/tutorials/015/Compressor.h | 35 - docs/tutorials/015/Crypt.cpp | 83 - docs/tutorials/015/Crypt.h | 32 - docs/tutorials/015/Handler.cpp | 179 - docs/tutorials/015/Handler.h | 61 - docs/tutorials/015/Makefile | 33 - docs/tutorials/015/Makefile.client | 79 - docs/tutorials/015/Makefile.server | 81 - docs/tutorials/015/Protocol_Stream.cpp | 195 - docs/tutorials/015/Protocol_Stream.h | 86 - docs/tutorials/015/Protocol_Task.cpp | 79 - docs/tutorials/015/Protocol_Task.h | 60 - docs/tutorials/015/Recv.cpp | 93 - docs/tutorials/015/Recv.h | 58 - docs/tutorials/015/Server_i.cpp | 75 - docs/tutorials/015/Server_i.h | 50 - docs/tutorials/015/Xmit.cpp | 84 - docs/tutorials/015/Xmit.h | 46 - docs/tutorials/015/client.cpp | 70 - docs/tutorials/015/combine.shar | 1063 - docs/tutorials/015/page01.html | 106 - docs/tutorials/015/page02.html | 95 - docs/tutorials/015/page03.html | 99 - docs/tutorials/015/page04.html | 98 - docs/tutorials/015/page05.html | 95 - docs/tutorials/015/page06.html | 79 - docs/tutorials/015/page07.html | 102 - docs/tutorials/015/page08.html | 91 - docs/tutorials/015/page09.html | 227 - docs/tutorials/015/page10.html | 128 - docs/tutorials/015/page11.html | 221 - docs/tutorials/015/page12.html | 82 - docs/tutorials/015/page13.html | 105 - docs/tutorials/015/page14.html | 76 - docs/tutorials/015/page15.html | 120 - docs/tutorials/015/page16.html | 91 - docs/tutorials/015/page17.html | 118 - docs/tutorials/015/page18.html | 62 - docs/tutorials/015/page19.html | 126 - docs/tutorials/015/page20.html | 60 - docs/tutorials/015/page21.html | 107 - docs/tutorials/015/page22.html | 84 - docs/tutorials/015/server.cpp | 68 - docs/tutorials/015/stream.gif | Bin 3422 -> 0 bytes docs/tutorials/016/016.dsp | 108 - docs/tutorials/016/Condition_i.cpp | 201 - docs/tutorials/016/Condition_i.h | 154 - docs/tutorials/016/Makefile | 77 - docs/tutorials/016/combine.shar | 385 - docs/tutorials/016/condition.cpp | 252 - docs/tutorials/016/page01.html | 86 - docs/tutorials/016/page02.html | 220 - docs/tutorials/016/page03.html | 226 - docs/tutorials/016/page04.html | 278 - docs/tutorials/016/page05.html | 33 - docs/tutorials/017/017.dsp | 108 - docs/tutorials/017/Barrier_i.cpp | 160 - docs/tutorials/017/Barrier_i.h | 67 - docs/tutorials/017/Makefile | 77 - docs/tutorials/017/barrier.cpp | 166 - docs/tutorials/017/barrier2.cpp | 178 - docs/tutorials/017/combine.shar | 380 - docs/tutorials/017/page01.html | 52 - docs/tutorials/017/page02.html | 195 - docs/tutorials/017/page03.html | 100 - docs/tutorials/017/page04.html | 188 - docs/tutorials/017/page05.html | 32 - docs/tutorials/017/page06.html | 206 - docs/tutorials/018/018.dsp | 116 - docs/tutorials/018/Makefile | 77 - docs/tutorials/018/Mutex_i.h | 17 - docs/tutorials/018/Test_T.cpp | 196 - docs/tutorials/018/Test_T.h | 81 - docs/tutorials/018/Token_i.h | 20 - docs/tutorials/018/combine.shar | 440 - docs/tutorials/018/output | 33 - docs/tutorials/018/page01.html | 70 - docs/tutorials/018/page02.html | 61 - docs/tutorials/018/page03.html | 126 - docs/tutorials/018/page04.html | 229 - docs/tutorials/018/page05.html | 66 - docs/tutorials/018/page06.html | 81 - docs/tutorials/018/page07.html | 32 - docs/tutorials/018/token.cpp | 32 - docs/tutorials/019/019-client.dsp | 105 - docs/tutorials/019/019-client2.dsp | 105 - docs/tutorials/019/019-server.dsp | 105 - docs/tutorials/019/019-server2.dsp | 105 - docs/tutorials/019/Makefile | 79 - docs/tutorials/019/client.cpp | 76 - docs/tutorials/019/client2.cpp | 49 - docs/tutorials/019/combine.shar | 358 - docs/tutorials/019/page01.html | 62 - docs/tutorials/019/page02.html | 158 - docs/tutorials/019/page03.html | 100 - docs/tutorials/019/page04.html | 156 - docs/tutorials/019/page05.html | 127 - docs/tutorials/019/page06.html | 29 - docs/tutorials/019/server.cpp | 128 - docs/tutorials/019/server2.cpp | 68 - docs/tutorials/019/shmem.cpp | 54 - docs/tutorials/019/shmem.h | 45 - docs/tutorials/020/020-client.dsp | 105 - docs/tutorials/020/020-client2.dsp | 105 - docs/tutorials/020/020-server.dsp | 105 - docs/tutorials/020/020-server2.dsp | 105 - docs/tutorials/020/Makefile | 79 - docs/tutorials/020/client.cpp | 33 - docs/tutorials/020/client2.cpp | 26 - docs/tutorials/020/combine.shar | 364 - docs/tutorials/020/mmap.cpp | 36 - docs/tutorials/020/mmap.h | 38 - docs/tutorials/020/mmapfile | 8 - docs/tutorials/020/page01.html | 49 - docs/tutorials/020/page02.html | 77 - docs/tutorials/020/page03.html | 56 - docs/tutorials/020/page04.html | 93 - docs/tutorials/020/page05.html | 101 - docs/tutorials/020/page06.html | 29 - docs/tutorials/020/server.cpp | 42 - docs/tutorials/020/server2.cpp | 32 - docs/tutorials/021/021-client.dsp | 105 - docs/tutorials/021/021-server.dsp | 105 - docs/tutorials/021/Makefile | 79 - docs/tutorials/021/client.cpp | 123 - docs/tutorials/021/combine.shar | 398 - docs/tutorials/021/mpool.cpp | 66 - docs/tutorials/021/mpool.h | 67 - docs/tutorials/021/page01.html | 66 - docs/tutorials/021/page02.html | 186 - docs/tutorials/021/page03.html | 150 - docs/tutorials/021/page04.html | 111 - docs/tutorials/021/page05.html | 88 - docs/tutorials/021/page06.html | 34 - docs/tutorials/021/server.cpp | 158 - docs/tutorials/022/Acceptor_Service.cpp | 154 - docs/tutorials/022/Acceptor_Service.h | 101 - docs/tutorials/022/Makefile | 105 - docs/tutorials/022/client/Makefile | 47 - docs/tutorials/022/client/client.cpp | 216 - docs/tutorials/022/client_handler.cpp | 225 - docs/tutorials/022/client_handler.h | 100 - docs/tutorials/022/page01.html | 40 - docs/tutorials/022/page02.html | 98 - docs/tutorials/022/page03.html | 123 - docs/tutorials/022/page04.html | 177 - docs/tutorials/022/page05.html | 130 - docs/tutorials/022/server.cpp | 56 - docs/tutorials/022/svc.conf | 9 - docs/tutorials/Chap_2/Chap_2.zip | Bin 9758 -> 0 bytes docs/tutorials/Chap_2/ex01.html | 107 - docs/tutorials/Chap_2/ex02.html | 96 - docs/tutorials/Chap_2/ex03.html | 83 - docs/tutorials/Chap_2/ex04.html | 89 - docs/tutorials/Chap_2/ex05.htm | 88 - docs/tutorials/Chap_2/ex05.html | 88 - docs/tutorials/Chap_2/ex06.html | 77 - docs/tutorials/Chap_3/Chap_3.zip | Bin 3004 -> 0 bytes docs/tutorials/Chap_3/Makefile | 29 - docs/tutorials/Chap_3/README | 14 - docs/tutorials/Chap_3/ex01.html | 108 - docs/tutorials/Chap_3/ex02.html | 136 - docs/tutorials/Chap_3/ex03.html | 115 - docs/tutorials/Chap_3/mm.cpp | 113 - docs/tutorials/Chap_4/Chap_4.zip | Bin 8317 -> 0 bytes docs/tutorials/Chap_4/ex01.html | 75 - docs/tutorials/Chap_4/ex02.html | 68 - docs/tutorials/Chap_4/ex03.html | 79 - docs/tutorials/Chap_4/ex04.html | 70 - docs/tutorials/Chap_4/ex05.html | 70 - docs/tutorials/Chap_4/ex06.html | 96 - docs/tutorials/Chap_4/ex07.html | 85 - docs/tutorials/Chap_4/ex08.html | 73 - docs/tutorials/Chap_5/Chap_5.zip | Bin 5843 -> 0 bytes docs/tutorials/Chap_5/ex01.html | 76 - docs/tutorials/Chap_5/ex02.html | 149 - docs/tutorials/Chap_5/ex03.html | 87 - docs/tutorials/Chap_5/ex04.html | 85 - docs/tutorials/Chap_5/ex05.html | 88 - docs/tutorials/Chap_6/Chap_6.zip | Bin 14305 -> 0 bytes docs/tutorials/Chap_6/ex01.html | 82 - docs/tutorials/Chap_6/ex02.html | 95 - docs/tutorials/Chap_6/ex03.html | 51 - docs/tutorials/Chap_6/ex04.html | 45 - docs/tutorials/Chap_6/ex05.html | 130 - docs/tutorials/Chap_6/ex06.html | 135 - docs/tutorials/Chap_6/ex07.html | 174 - docs/tutorials/Chap_6/ex08.html | 97 - docs/tutorials/Chap_6/ex09.html | 212 - docs/tutorials/Chap_6/ex10.html | 111 - docs/tutorials/Chap_7/Chap_7.zip | Bin 4520 -> 0 bytes docs/tutorials/Chap_7/ex01.html | 91 - docs/tutorials/Chap_7/ex02.html | 166 - docs/tutorials/Chap_7/ex03.html | 159 - docs/tutorials/Makefile | 9 - docs/tutorials/colorize | 20 - docs/tutorials/combine | 171 - docs/tutorials/fix.Makefile | 68 - docs/tutorials/guide-tutorials.html | 47 - docs/tutorials/linify | 54 - docs/tutorials/new-tutorials.html | 76 - docs/tutorials/online-tutorials.html | 154 - docs/tutorials/templates.html | 190 - docs/tutorials/tutorials.dsw | 412 - docs/usage-bugzilla.html | 101 - docs/wchar.txt | 128 - etc/DOC-way.html | 63 - etc/README | 32 - etc/Svc_Conf_l.cpp.diff | 641 - etc/Svc_Conf_y.cpp.diff | 337 - etc/ace.doxygen | 194 - etc/ace_man.doxygen | 194 - etc/ace_qos.doxygen | 194 - etc/ace_rmcast.doxygen | 194 - etc/ace_ssl.doxygen | 194 - etc/acexml.doxygen | 194 - etc/create-jace-release | 9 - etc/enforce_ace_try.diff | 271 - etc/purify.solaris2 | 161 - etc/tao.doxygen | 195 - etc/tao_av.doxygen | 199 - etc/tao_cosevent.doxygen | 200 - etc/tao_cosnaming.doxygen | 196 - etc/tao_cosnotification.doxygen | 203 - etc/tao_costime.doxygen | 197 - etc/tao_costrader.doxygen | 200 - etc/tao_dynamicany.doxygen | 195 - etc/tao_dynamicinterface.doxygen | 195 - etc/tao_esf.doxygen | 196 - etc/tao_implrepo.doxygen | 197 - etc/tao_iormanip.doxygen | 196 - etc/tao_iortable.doxygen | 196 - etc/tao_portablegroup.doxygen | 199 - etc/tao_portableserver.doxygen | 196 - etc/tao_pss.doxygen | 196 - etc/tao_rtcorba.doxygen | 196 - etc/tao_rtevent.doxygen | 205 - etc/tao_rtportableserver.doxygen | 196 - etc/tao_security.doxygen | 201 - etc/tao_smartproxies.doxygen | 194 - etc/tao_ssliop.doxygen | 202 - etc/tao_strategies.doxygen | 194 - etc/xlc_dummy.cpp | 6 - examples/ASX/CCM_App/CCM_App.cpp | 116 - examples/ASX/CCM_App/CCM_App.dsp | 171 - examples/ASX/CCM_App/CCM_App.dsw | 71 - examples/ASX/CCM_App/CCM_App_static.dsp | 109 - examples/ASX/CCM_App/Makefile | 189 - examples/ASX/CCM_App/Makefile.CCM_App | 49 - examples/ASX/CCM_App/SC_Client.cpp | 13 - examples/ASX/CCM_App/SC_Client.dsp | 115 - examples/ASX/CCM_App/SC_Server.cpp | 84 - examples/ASX/CCM_App/SC_Server.dsp | 115 - examples/ASX/CCM_App/svc.conf | 21 - examples/ASX/CCM_App/svc.conf.xml | 33 - .../Event_Server/Event_Server/Consumer_Router.cpp | 149 - .../Event_Server/Event_Server/Consumer_Router.h | 70 - .../Event_Server/Event_Server/Event_Analyzer.cpp | 79 - .../ASX/Event_Server/Event_Server/Event_Analyzer.h | 45 - .../ASX/Event_Server/Event_Server/Event_Server.dsp | 115 - .../ASX/Event_Server/Event_Server/Event_Server.dsw | 29 - examples/ASX/Event_Server/Event_Server/Makefile | 930 - examples/ASX/Event_Server/Event_Server/Options.cpp | 195 - examples/ASX/Event_Server/Event_Server/Options.h | 124 - examples/ASX/Event_Server/Event_Server/Options.i | 141 - .../ASX/Event_Server/Event_Server/Peer_Router.cpp | 452 - .../ASX/Event_Server/Event_Server/Peer_Router.h | 157 - .../Event_Server/Event_Server/Supplier_Router.cpp | 156 - .../Event_Server/Event_Server/Supplier_Router.h | 72 - .../ASX/Event_Server/Event_Server/event_server.cpp | 252 - examples/ASX/Event_Server/Makefile | 23 - examples/ASX/Event_Server/README | 79 - examples/ASX/Event_Server/Transceiver/Makefile | 255 - .../ASX/Event_Server/Transceiver/transceiver.cpp | 253 - .../ASX/Event_Server/Transceiver/transceiver.dsp | 71 - .../ASX/Event_Server/Transceiver/transceiver.dsw | 29 - .../ASX/Event_Server/Transceiver/transceiver.h | 61 - examples/ASX/Makefile | 25 - examples/ASX/Message_Queue/Bounded_Buffer.dsp | 92 - examples/ASX/Message_Queue/Buffer_Stream.dsp | 92 - examples/ASX/Message_Queue/Makefile | 461 - .../ASX/Message_Queue/Message_Queue_Example.dsw | 53 - examples/ASX/Message_Queue/Priority_Buffer.dsp | 92 - examples/ASX/Message_Queue/bounded_buffer.cpp | 138 - examples/ASX/Message_Queue/buffer_stream.cpp | 308 - examples/ASX/Message_Queue/priority_buffer.cpp | 144 - .../ASX/UPIPE_Event_Server/Consumer_Router.cpp | 150 - examples/ASX/UPIPE_Event_Server/Consumer_Router.h | 53 - examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp | 72 - examples/ASX/UPIPE_Event_Server/Event_Analyzer.h | 38 - examples/ASX/UPIPE_Event_Server/Makefile | 929 - examples/ASX/UPIPE_Event_Server/Options.cpp | 194 - examples/ASX/UPIPE_Event_Server/Options.h | 88 - examples/ASX/UPIPE_Event_Server/Options.i | 166 - examples/ASX/UPIPE_Event_Server/Peer_Router.cpp | 274 - examples/ASX/UPIPE_Event_Server/Peer_Router.h | 126 - .../ASX/UPIPE_Event_Server/Supplier_Router.cpp | 160 - examples/ASX/UPIPE_Event_Server/Supplier_Router.h | 57 - .../ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp | 115 - .../ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsw | 29 - examples/ASX/UPIPE_Event_Server/event_server.cpp | 254 - examples/Bounded_Packet_Relay/BPR_Drivers.cpp | 531 - examples/Bounded_Packet_Relay/BPR_Drivers.h | 288 - examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp | 320 - examples/Bounded_Packet_Relay/BPR_Drivers_T.h | 178 - .../Bounded_Packet_Relay/Bounded_Packet_Relay.dsp | 116 - .../Bounded_Packet_Relay/Bounded_Packet_Relay.dsw | 29 - examples/Bounded_Packet_Relay/Makefile | 459 - examples/Bounded_Packet_Relay/README | 194 - .../Thread_Bounded_Packet_Relay.cpp | 805 - .../Thread_Bounded_Packet_Relay.h | 402 - examples/Bounded_Packet_Relay/bpr_thread.cpp | 131 - examples/C++NPv1/Iterative_Logging_Server.cpp | 17 - examples/C++NPv1/Iterative_Logging_Server.dsp | 91 - examples/C++NPv1/Iterative_Logging_Server.h | 62 - examples/C++NPv1/Logging_Client.cpp | 150 - examples/C++NPv1/Logging_Client.dsp | 71 - examples/C++NPv1/Logging_Handler.cpp | 128 - examples/C++NPv1/Logging_Handler.h | 53 - examples/C++NPv1/Logging_Server.cpp | 72 - examples/C++NPv1/Logging_Server.h | 42 - examples/C++NPv1/Makefile | 416 - examples/C++NPv1/Makefile.Iterative_Logging_Server | 38 - examples/C++NPv1/Makefile.Logging_Client | 38 - .../Makefile.Process_Per_Connection_Logging_Server | 40 - ...akefile.RT_Thread_Per_Connection_Logging_Server | 40 - examples/C++NPv1/Makefile.Reactive_Logging_Server | 38 - .../C++NPv1/Makefile.Reactive_Logging_Server_Ex | 38 - .../Makefile.Thread_Per_Connection_Logging_Server | 40 - .../Process_Per_Connection_Logging_Server.cpp | 178 - .../Process_Per_Connection_Logging_Server.dsp | 91 - .../Process_Per_Connection_Logging_Server.h | 53 - .../Process_Per_Connection_Logging_Server.mak | 40 - examples/C++NPv1/README | 73 - .../RT_Thread_Per_Connection_Logging_Server.cpp | 138 - .../RT_Thread_Per_Connection_Logging_Server.dsp | 91 - .../RT_Thread_Per_Connection_Logging_Server.h | 22 - examples/C++NPv1/Reactive_Logging_Server.cpp | 17 - examples/C++NPv1/Reactive_Logging_Server.dsp | 83 - examples/C++NPv1/Reactive_Logging_Server.h | 78 - examples/C++NPv1/Reactive_Logging_Server_Ex.cpp | 36 - examples/C++NPv1/Reactive_Logging_Server_Ex.dsp | 91 - examples/C++NPv1/Reactive_Logging_Server_Ex.h | 94 - .../Thread_Per_Connection_Logging_Server.cpp | 99 - .../Thread_Per_Connection_Logging_Server.dsp | 91 - .../C++NPv1/Thread_Per_Connection_Logging_Server.h | 49 - examples/C++NPv1/examples.dsw | 101 - examples/C++NPv2/AC_CLD.dsp | 121 - examples/C++NPv2/AC_CLD_export.h | 50 - examples/C++NPv2/AC_Client_Logging_Daemon.cpp | 441 - examples/C++NPv2/AIO_CLD.dsp | 113 - examples/C++NPv2/AIO_CLD_export.h | 50 - examples/C++NPv2/AIO_Client_Logging_Daemon.cpp | 437 - examples/C++NPv2/CLD.dsp | 137 - examples/C++NPv2/CLD_export.h | 34 - examples/C++NPv2/Client_Logging_Daemon.cpp | 379 - examples/C++NPv2/Configurable_Logging_Server.cpp | 20 - examples/C++NPv2/Configurable_Logging_Server.dsp | 112 - examples/C++NPv2/Logging_Acceptor.cpp | 38 - examples/C++NPv2/Logging_Acceptor.h | 53 - examples/C++NPv2/Logging_Acceptor_Ex.h | 41 - examples/C++NPv2/Logging_Event_Handler.cpp | 43 - examples/C++NPv2/Logging_Event_Handler.h | 61 - examples/C++NPv2/Logging_Event_Handler_Ex.cpp | 40 - examples/C++NPv2/Logging_Event_Handler_Ex.h | 56 - examples/C++NPv2/Logging_Handler.cpp | 128 - examples/C++NPv2/Logging_Handler.h | 55 - examples/C++NPv2/Makefile | 62 - examples/C++NPv2/Makefile.AC_CLD | 48 - examples/C++NPv2/Makefile.AIO_CLD | 47 - examples/C++NPv2/Makefile.CLD | 41 - .../C++NPv2/Makefile.Configurable_Logging_Server | 30 - examples/C++NPv2/Makefile.Reactor_Logging_Server | 33 - examples/C++NPv2/Makefile.SLD | 41 - examples/C++NPv2/Makefile.SLDex | 43 - .../Makefile.SR_Configurable_Logging_Server | 29 - .../C++NPv2/Makefile.Select_Reactor_Logging_Server | 34 - examples/C++NPv2/Makefile.TPCLS | 58 - examples/C++NPv2/Makefile.TPLS | 41 - .../C++NPv2/Makefile.TP_Reactor_Logging_Server | 34 - examples/C++NPv2/Makefile.display_logfile | 32 - examples/C++NPv2/README | 99 - examples/C++NPv2/Reactor_Logging_Server.cpp | 34 - examples/C++NPv2/Reactor_Logging_Server.dsp | 144 - examples/C++NPv2/Reactor_Logging_Server.h | 29 - .../C++NPv2/Reactor_Logging_Server_Adapter.cpp | 67 - examples/C++NPv2/Reactor_Logging_Server_Adapter.h | 35 - examples/C++NPv2/Reactor_Logging_Server_T.cpp | 26 - examples/C++NPv2/SLD.cpp | 23 - examples/C++NPv2/SLD.dsp | 149 - examples/C++NPv2/SLDEX_export.h | 34 - examples/C++NPv2/SLD_export.h | 34 - examples/C++NPv2/SLDex.cpp | 23 - examples/C++NPv2/SLDex.dsp | 157 - .../C++NPv2/SR_Configurable_Logging_Server.cpp | 25 - .../C++NPv2/SR_Configurable_Logging_Server.dsp | 104 - examples/C++NPv2/Select_Reactor_Logging_Server.cpp | 106 - examples/C++NPv2/Select_Reactor_Logging_Server.dsp | 144 - examples/C++NPv2/Server_Shutdown.cpp | 94 - examples/C++NPv2/Service_Reporter.cpp | 124 - examples/C++NPv2/Service_Reporter.h | 38 - examples/C++NPv2/TPCLS.dsp | 129 - examples/C++NPv2/TPCLS_export.h | 50 - examples/C++NPv2/TPC_Logging_Server.cpp | 105 - examples/C++NPv2/TPC_Logging_Server.h | 87 - examples/C++NPv2/TPLS.dsp | 145 - examples/C++NPv2/TPLS_export.h | 34 - examples/C++NPv2/TP_Logging_Server.cpp | 74 - examples/C++NPv2/TP_Logging_Server.h | 132 - examples/C++NPv2/TP_Reactor_Logging_Server.cpp | 113 - examples/C++NPv2/TP_Reactor_Logging_Server.dsp | 144 - examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp | 135 - examples/C++NPv2/WFMO_Reactor_Logging_Server.dsp | 144 - examples/C++NPv2/display_logfile.cpp | 363 - examples/C++NPv2/display_logfile.dsp | 104 - examples/C++NPv2/examples.dsw | 191 - examples/C++NPv2/svc.conf | 8 - examples/ConfigViewer/ConfigTreeCtrl.cpp | 229 - examples/ConfigViewer/ConfigTreeCtrl.h | 52 - examples/ConfigViewer/ConfigurationViewer.cpp | 45 - examples/ConfigViewer/ConfigurationViewer.dsp | 247 - examples/ConfigViewer/ConfigurationViewer.dsw | 29 - examples/ConfigViewer/ConfigurationViewer.rc | 9 - examples/ConfigViewer/MainFrame.cpp | 199 - examples/ConfigViewer/MainFrame.h | 72 - examples/ConfigViewer/README | 74 - examples/ConfigViewer/ValueDlg.cpp | 63 - examples/ConfigViewer/ValueDlg.h | 51 - examples/ConfigViewer/ValueListCtrl.cpp | 227 - examples/ConfigViewer/ValueListCtrl.h | 47 - examples/ConfigViewer/mondrian.ico | Bin 766 -> 0 bytes examples/ConfigViewer/mondrian.xpm | 44 - examples/ConfigViewer/stdafx.cpp | 3 - examples/ConfigViewer/stdafx.h | 16 - examples/Connection/Makefile | 25 - examples/Connection/blocking/README | 36 - examples/Connection/blocking/SPIPE-acceptor.cpp | 232 - examples/Connection/blocking/SPIPE-acceptor.h | 73 - examples/Connection/blocking/SPIPE-connector.cpp | 242 - examples/Connection/blocking/SPIPE-connector.h | 80 - examples/Connection/blocking/SPIPE.dsp | 79 - examples/Connection/blocking/SPIPE.dsw | 41 - examples/Connection/blocking/acceptor.dsp | 79 - .../Connection/blocking/test_spipe_acceptor.cpp | 22 - .../Connection/blocking/test_spipe_connector.cpp | 21 - examples/Connection/misc/Connection_Handler.cpp | 245 - examples/Connection/misc/Connection_Handler.dsp | 119 - examples/Connection/misc/Connection_Handler.h | 45 - examples/Connection/misc/Makefile | 468 - examples/Connection/misc/misc.dsw | 41 - examples/Connection/misc/test_upipe.cpp | 156 - examples/Connection/misc/test_upipe.dsp | 119 - examples/Connection/misc/test_upipe.h | 75 - examples/Connection/non_blocking/CPP-acceptor.cpp | 249 - examples/Connection/non_blocking/CPP-acceptor.h | 95 - examples/Connection/non_blocking/CPP-connector.cpp | 301 - examples/Connection/non_blocking/CPP-connector.h | 95 - examples/Connection/non_blocking/Makefile | 2099 -- examples/Connection/non_blocking/README | 28 - examples/Connection/non_blocking/non_blocking.dsp | 75 - examples/Connection/non_blocking/non_blocking.dsw | 41 - examples/Connection/non_blocking/server.dsp | 75 - .../non_blocking/test_lsock_acceptor.cpp | 64 - .../non_blocking/test_lsock_connector.cpp | 70 - .../Connection/non_blocking/test_sock_acceptor.cpp | 46 - .../non_blocking/test_sock_connector.cpp | 72 - .../non_blocking/test_spipe_acceptor.cpp | 56 - .../non_blocking/test_spipe_connector.cpp | 64 - .../Connection/non_blocking/test_tli_acceptor.cpp | 56 - .../Connection/non_blocking/test_tli_connector.cpp | 64 - examples/DLL/Dll.dsw | 59 - examples/DLL/Magazine.h | 42 - examples/DLL/Main.dsp | 92 - examples/DLL/Makefile | 43 - examples/DLL/Makefile.Newsweek | 39 - examples/DLL/Makefile.Today | 39 - examples/DLL/Newsweek.cpp | 42 - examples/DLL/Newsweek.dsp | 109 - examples/DLL/Newsweek.h | 51 - examples/DLL/README | 47 - examples/DLL/Today.cpp | 42 - examples/DLL/Today.dsp | 109 - examples/DLL/Today.h | 52 - examples/DLL/test_dll.cpp | 79 - examples/Export/Makefile.bor | 3 - examples/Export/README | 7 - examples/Export/dll.cpp | 21 - examples/Export/dll.h | 66 - examples/Export/export_dll.bor | 11 - examples/Export/export_dll.dsp | 117 - examples/Export/export_test.dsw | 44 - examples/Export/run_test.pl | 17 - examples/Export/test.bor | 11 - examples/Export/test.cpp | 64 - examples/Export/test.dsp | 104 - examples/Export/test_export.h | 40 - examples/IOStream/Makefile | 25 - examples/IOStream/README | 22 - examples/IOStream/client/Makefile | 98 - examples/IOStream/client/client.dsw | 29 - examples/IOStream/client/iostream_client.cpp | 78 - examples/IOStream/client/iostream_client.dsp | 115 - examples/IOStream/server/Makefile | 247 - examples/IOStream/server/iostream_server.cpp | 145 - examples/IOStream/server/iostream_server.dsp | 115 - examples/IOStream/server/iostream_server.h | 54 - examples/IOStream/server/server.dsw | 29 - examples/IPC_SAP/ATM_SAP/ATM_SAP.dsw | 41 - examples/IPC_SAP/ATM_SAP/CPP-client.cpp | 201 - examples/IPC_SAP/ATM_SAP/CPP-server.cpp | 155 - examples/IPC_SAP/ATM_SAP/CPP_client.dsp | 108 - examples/IPC_SAP/ATM_SAP/CPP_server.dsp | 108 - examples/IPC_SAP/ATM_SAP/Makefile | 48 - examples/IPC_SAP/ATM_SAP/Makefile.bor | 18 - examples/IPC_SAP/DEV_SAP/Makefile | 22 - examples/IPC_SAP/DEV_SAP/README | 23 - examples/IPC_SAP/DEV_SAP/reader/Makefile | 146 - examples/IPC_SAP/DEV_SAP/reader/reader.cpp | 65 - examples/IPC_SAP/DEV_SAP/reader/reader.dsp | 115 - examples/IPC_SAP/DEV_SAP/reader/reader.dsw | 29 - examples/IPC_SAP/DEV_SAP/writer/Makefile | 145 - examples/IPC_SAP/DEV_SAP/writer/writer.cpp | 71 - examples/IPC_SAP/DEV_SAP/writer/writer.dsp | 115 - examples/IPC_SAP/DEV_SAP/writer/writer.dsw | 29 - examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp | 38 - examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.dsp | 115 - examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp | 44 - examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.dsp | 115 - examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp | 26 - examples/IPC_SAP/FIFO_SAP/FIFO-client.dsp | 115 - examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp | 27 - examples/IPC_SAP/FIFO_SAP/FIFO-server.dsp | 115 - examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp | 118 - examples/IPC_SAP/FIFO_SAP/FIFO-test.dsp | 115 - examples/IPC_SAP/FIFO_SAP/FIFO_SAP.dsw | 77 - examples/IPC_SAP/FIFO_SAP/Makefile | 287 - examples/IPC_SAP/FIFO_SAP/Makefile.bor | 21 - examples/IPC_SAP/FILE_SAP/File_sap.dsw | 29 - examples/IPC_SAP/FILE_SAP/Makefile | 139 - examples/IPC_SAP/FILE_SAP/Makefile.bor | 17 - examples/IPC_SAP/FILE_SAP/client.cpp | 88 - examples/IPC_SAP/FILE_SAP/client.dsp | 59 - examples/IPC_SAP/FILE_SAP/testfile | 1 - examples/IPC_SAP/Makefile | 31 - examples/IPC_SAP/Makefile.bor | 13 - examples/IPC_SAP/SOCK_SAP/C-inclient.cpp | 77 - examples/IPC_SAP/SOCK_SAP/C-inserver.cpp | 109 - examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp | 426 - examples/IPC_SAP/SOCK_SAP/CPP-inclient.h | 108 - examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp | 587 - examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h | 43 - examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp | 204 - examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp | 390 - examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp | 56 - examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp | 70 - examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp | 70 - examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp | 158 - examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp | 71 - examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp | 71 - examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp | 75 - examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp | 71 - examples/IPC_SAP/SOCK_SAP/C_inserver.dsp | 71 - examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp | 58 - examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp | 96 - examples/IPC_SAP/SOCK_SAP/Makefile | 1206 -- examples/IPC_SAP/SOCK_SAP/Makefile.bor | 26 - examples/IPC_SAP/SOCK_SAP/README | 46 - examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp | 71 - examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsw | 89 - examples/IPC_SAP/SOCK_SAP/local_data | 1 - examples/IPC_SAP/SOCK_SAP/run_test | 36 - examples/IPC_SAP/SOCK_SAP/summarize | 45 - examples/IPC_SAP/SPIPE_SAP/Makefile | 846 - examples/IPC_SAP/SPIPE_SAP/Makefile.bor | 24 - examples/IPC_SAP/SPIPE_SAP/NPClient.cpp | 59 - examples/IPC_SAP/SPIPE_SAP/NPClient.dsp | 115 - examples/IPC_SAP/SPIPE_SAP/NPServer.cpp | 67 - examples/IPC_SAP/SPIPE_SAP/NPServer.dsp | 115 - examples/IPC_SAP/SPIPE_SAP/SPIPE_SAP.dsw | 113 - examples/IPC_SAP/SPIPE_SAP/client.cpp | 45 - examples/IPC_SAP/SPIPE_SAP/client.dsp | 115 - examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp | 55 - examples/IPC_SAP/SPIPE_SAP/consumer_msg.dsp | 115 - examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp | 52 - examples/IPC_SAP/SPIPE_SAP/consumer_read.dsp | 115 - examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp | 60 - examples/IPC_SAP/SPIPE_SAP/producer_msg.dsp | 115 - examples/IPC_SAP/SPIPE_SAP/producer_read.cpp | 51 - examples/IPC_SAP/SPIPE_SAP/producer_read.dsp | 115 - examples/IPC_SAP/SPIPE_SAP/server.cpp | 120 - examples/IPC_SAP/SPIPE_SAP/server.dsp | 115 - examples/IPC_SAP/SPIPE_SAP/shared.h | 10 - examples/IPC_SAP/SSL_SAP/Makefile | 990 - examples/IPC_SAP/SSL_SAP/README | 17 - examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp | 373 - examples/IPC_SAP/SSL_SAP/SSL-client-simple.h | 98 - examples/IPC_SAP/SSL_SAP/SSL-client.cpp | 420 - examples/IPC_SAP/SSL_SAP/SSL-client.dsp | 71 - examples/IPC_SAP/SSL_SAP/SSL-client.h | 110 - examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp | 615 - examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h | 44 - examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp | 202 - examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp | 365 - examples/IPC_SAP/SSL_SAP/SSL-server.cpp | 429 - examples/IPC_SAP/SSL_SAP/SSL-server.dsp | 63 - examples/IPC_SAP/SSL_SAP/SSL_SOCK_SAP.dsw | 41 - examples/IPC_SAP/SSL_SAP/dummy.pem | 15 - examples/IPC_SAP/SSL_SAP/key.pem | 15 - examples/IPC_SAP/SSL_SAP/local_data | 1 - examples/IPC_SAP/SSL_SAP/summarize | 45 - examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp | 162 - examples/IPC_SAP/TLI_SAP/CPP-ATM-client.dsp | 115 - examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp | 114 - examples/IPC_SAP/TLI_SAP/CPP-ATM-server.dsp | 115 - examples/IPC_SAP/TLI_SAP/CPP-client.cpp | 93 - examples/IPC_SAP/TLI_SAP/CPP-client.dsp | 115 - examples/IPC_SAP/TLI_SAP/CPP-server.cpp | 87 - examples/IPC_SAP/TLI_SAP/CPP-server.dsp | 115 - examples/IPC_SAP/TLI_SAP/Makefile | 501 - examples/IPC_SAP/TLI_SAP/TLI_SAP.dsw | 113 - examples/IPC_SAP/TLI_SAP/db-client.cpp | 58 - examples/IPC_SAP/TLI_SAP/db-client.dsp | 115 - examples/IPC_SAP/TLI_SAP/db-server.cpp | 120 - examples/IPC_SAP/TLI_SAP/db-server.dsp | 115 - examples/IPC_SAP/TLI_SAP/ftp-client.cpp | 47 - examples/IPC_SAP/TLI_SAP/ftp-client.dsp | 115 - examples/IPC_SAP/TLI_SAP/ftp-server.cpp | 82 - examples/IPC_SAP/TLI_SAP/ftp-server.dsp | 115 - examples/IPC_SAP/UPIPE_SAP/Makefile | 541 - examples/IPC_SAP/UPIPE_SAP/Makefile.bor | 19 - examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.dsw | 53 - examples/IPC_SAP/UPIPE_SAP/ex1.cpp | 181 - examples/IPC_SAP/UPIPE_SAP/ex1.dsp | 115 - examples/IPC_SAP/UPIPE_SAP/ex2.cpp | 177 - examples/IPC_SAP/UPIPE_SAP/ex2.dsp | 115 - examples/IPC_SAP/UPIPE_SAP/ex3.cpp | 157 - examples/IPC_SAP/UPIPE_SAP/ex3.dsp | 115 - examples/Log_Msg/Callback.dsp | 63 - examples/Log_Msg/Log_Msg.dsp | 63 - examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.cpp | 90 - examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.dsp | 124 - examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.dsw | 29 - examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h | 57 - examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.rc | 207 - examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp | 183 - examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.h | 53 - examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp | 34 - examples/Log_Msg/Log_Msg_MFC/MFC_Log.h | 45 - examples/Log_Msg/Log_Msg_MFC/README | 40 - examples/Log_Msg/Log_Msg_MFC/Resource.h | 21 - examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp | 9 - examples/Log_Msg/Log_Msg_MFC/StdAfx.h | 26 - examples/Log_Msg/Log_Msg_MFC/res/Log_Msg_MFC.ico | Bin 1078 -> 0 bytes examples/Log_Msg/Log_Msg_MFC/res/Log_Msg_MFC.rc2 | 13 - examples/Log_Msg/Makefile | 140 - examples/Log_Msg/Ostream.dsp | 63 - examples/Log_Msg/README | 65 - examples/Log_Msg/makefile.bor | 19 - examples/Log_Msg/test_callback.cpp | 162 - examples/Log_Msg/test_log_msg.cpp | 193 - examples/Log_Msg/test_ostream.cpp | 71 - examples/Logger/Acceptor-server/Makefile | 250 - examples/Logger/Acceptor-server/server_loggerd.cpp | 238 - examples/Logger/Acceptor-server/server_loggerd.dsp | 71 - examples/Logger/Acceptor-server/server_loggerd.dsw | 29 - examples/Logger/Acceptor-server/server_loggerd.h | 55 - examples/Logger/Makefile | 27 - examples/Logger/README | 32 - examples/Logger/client/Makefile | 99 - examples/Logger/client/client.dsp | 71 - examples/Logger/client/client.dsw | 29 - examples/Logger/client/logging_app.cpp | 55 - examples/Logger/simple-server/Logging_Acceptor.cpp | 85 - examples/Logger/simple-server/Logging_Acceptor.h | 59 - examples/Logger/simple-server/Logging_Handler.cpp | 161 - examples/Logger/simple-server/Logging_Handler.h | 70 - examples/Logger/simple-server/Makefile | 238 - examples/Logger/simple-server/Reactor_Singleton.h | 32 - examples/Logger/simple-server/server_loggerd.cpp | 88 - examples/Logger/simple-server/server_loggerd.dsp | 91 - examples/Logger/simple-server/server_loggerd.dsw | 29 - examples/Makefile | 52 - examples/Makefile.bor | 21 - examples/Map_Manager/Makefile | 156 - examples/Map_Manager/Map_Manager.dsw | 29 - examples/Map_Manager/makefile.bor | 15 - examples/Map_Manager/test_hash_map_manager.cpp | 104 - examples/Map_Manager/test_hash_map_manager.dsp | 115 - examples/Mem_Map/IO-tests/IO_Test.cpp | 232 - examples/Mem_Map/IO-tests/IO_Test.h | 96 - examples/Mem_Map/IO-tests/Makefile | 81 - examples/Mem_Map/IO-tests/test_io.cpp | 204 - examples/Mem_Map/Makefile | 30 - examples/Mem_Map/Makefile.bor | 8 - examples/Mem_Map/file-reverse/Makefile | 79 - examples/Mem_Map/file-reverse/file-reverse.cpp | 58 - examples/Mem_Map/file-reverse/file_reverse.dsp | 92 - examples/Mem_Map/file-reverse/file_reverse.dsw | 29 - examples/Mem_Map/file-reverse/makefile.bor | 15 - examples/Misc/Makefile | 626 - examples/Misc/Makefile.bor | 25 - examples/Misc/Misc.dsw | 125 - examples/Misc/test_XtReactor1.cpp | 175 - examples/Misc/test_XtReactor1.dsp | 115 - examples/Misc/test_XtReactor2.cpp | 104 - examples/Misc/test_XtReactor2.dsp | 115 - examples/Misc/test_dump.cpp | 42 - examples/Misc/test_dump.dsp | 119 - examples/Misc/test_dump.h | 50 - examples/Misc/test_get_opt.cpp | 53 - examples/Misc/test_get_opt.dsp | 115 - examples/Misc/test_profile_timer.cpp | 35 - examples/Misc/test_profile_timer.dsp | 115 - examples/Misc/test_read_buffer.cpp | 27 - examples/Misc/test_read_buffer.dsp | 115 - examples/Misc/test_set.cpp | 63 - examples/Misc/test_set.dsp | 115 - examples/Misc/test_sstring.cpp | 25 - examples/Misc/test_sstring.dsp | 115 - examples/Misc/test_trace.cpp | 116 - examples/Misc/test_trace.dsp | 115 - examples/NT_Service/Makefile | 41 - examples/NT_Service/Makefile.bor | 19 - examples/NT_Service/NT_Service.dsp | 100 - examples/NT_Service/NT_Service.dsw | 29 - examples/NT_Service/README | 45 - examples/NT_Service/main.cpp | 258 - examples/NT_Service/ntsvc.cpp | 111 - examples/NT_Service/ntsvc.h | 63 - examples/Naming/Makefile | 609 - examples/Naming/Makefile.bor | 20 - examples/Naming/Naming.dsp | 71 - examples/Naming/Naming.dsw | 53 - examples/Naming/multiple_contexts.dsp | 71 - examples/Naming/non_existent.dsp | 71 - examples/Naming/test_multiple_contexts.cpp | 84 - examples/Naming/test_non_existent.cpp | 53 - examples/Naming/test_open.cpp | 80 - examples/Naming/test_writers.cpp | 73 - examples/OS/Makefile | 21 - examples/OS/Process/Makefile | 46 - examples/OS/Process/Process.dsp | 104 - examples/OS/Process/Process.dsw | 41 - examples/OS/Process/README | 54 - examples/OS/Process/imore.cpp | 263 - examples/OS/Process/imore.dsp | 104 - examples/OS/Process/process.cpp | 559 - .../QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp | 114 - .../QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h | 76 - .../QOS/Change_Receiver_FlowSpec/FlowSpec_Dbase.h | 52 - examples/QOS/Change_Receiver_FlowSpec/Makefile | 359 - .../QoS_Signal_Handler.cpp | 34 - .../Change_Receiver_FlowSpec/QoS_Signal_Handler.h | 45 - examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp | 121 - examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h | 75 - examples/QOS/Change_Receiver_FlowSpec/README | 127 - .../Receiver_QoS_Event_Handler.cpp | 216 - .../Receiver_QoS_Event_Handler.h | 61 - .../Sender_QoS_Event_Handler.cpp | 147 - .../Sender_QoS_Event_Handler.h | 61 - examples/QOS/Change_Receiver_FlowSpec/receiver.cpp | 301 - examples/QOS/Change_Receiver_FlowSpec/receiver.dsp | 138 - examples/QOS/Change_Receiver_FlowSpec/sender.cpp | 317 - examples/QOS/Change_Receiver_FlowSpec/sender.dsp | 138 - examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp | 114 - examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h | 76 - examples/QOS/Change_Sender_TSpec/FlowSpec_Dbase.h | 52 - examples/QOS/Change_Sender_TSpec/Makefile | 359 - .../QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp | 34 - .../QOS/Change_Sender_TSpec/QoS_Signal_Handler.h | 45 - examples/QOS/Change_Sender_TSpec/QoS_Util.cpp | 121 - examples/QOS/Change_Sender_TSpec/QoS_Util.h | 75 - examples/QOS/Change_Sender_TSpec/README | 126 - .../Receiver_QoS_Event_Handler.cpp | 145 - .../Receiver_QoS_Event_Handler.h | 61 - .../Sender_QoS_Event_Handler.cpp | 222 - .../Change_Sender_TSpec/Sender_QoS_Event_Handler.h | 61 - examples/QOS/Change_Sender_TSpec/receiver.cpp | 320 - examples/QOS/Change_Sender_TSpec/receiver.dsp | 138 - examples/QOS/Change_Sender_TSpec/sender.cpp | 314 - examples/QOS/Change_Sender_TSpec/sender.dsp | 138 - examples/QOS/Diffserv/Diffserv.dsw | 41 - examples/QOS/Diffserv/Makefile | 35 - examples/QOS/Diffserv/NOTES.txt | 58 - examples/QOS/Diffserv/README | 107 - examples/QOS/Diffserv/diffserv_test.cpp | 133 - examples/QOS/Diffserv/diffserv_test.dsp | 115 - examples/QOS/Diffserv/run_test.pl | 40 - examples/QOS/Diffserv/server.cpp | 163 - examples/QOS/Diffserv/server.dsp | 115 - examples/QOS/Makefile | 29 - examples/QOS/QOS.dsw | 41 - examples/QOS/Simple/Fill_ACE_QoS.cpp | 114 - examples/QOS/Simple/Fill_ACE_QoS.h | 76 - examples/QOS/Simple/FlowSpec_Dbase.h | 52 - examples/QOS/Simple/Makefile | 359 - examples/QOS/Simple/QoS_Signal_Handler.cpp | 40 - examples/QOS/Simple/QoS_Signal_Handler.h | 45 - examples/QOS/Simple/QoS_Util.cpp | 121 - examples/QOS/Simple/QoS_Util.h | 75 - examples/QOS/Simple/README | 142 - examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp | 136 - examples/QOS/Simple/Receiver_QoS_Event_Handler.h | 61 - examples/QOS/Simple/Sender_QoS_Event_Handler.cpp | 143 - examples/QOS/Simple/Sender_QoS_Event_Handler.h | 61 - examples/QOS/Simple/receiver.cpp | 302 - examples/QOS/Simple/receiver.dsp | 140 - examples/QOS/Simple/sender.cpp | 316 - examples/QOS/Simple/sender.dsp | 140 - examples/README | 83 - examples/RMCast/Makefile | 21 - examples/RMCast/Makefile.bor | 8 - examples/RMCast/Send_File/Makefile | 380 - examples/RMCast/Send_File/Makefile.bor | 18 - examples/RMCast/Send_File/Receiver.cpp | 165 - examples/RMCast/Send_File/Receiver.dsp | 96 - examples/RMCast/Send_File/Send_File.dsw | 41 - examples/RMCast/Send_File/Sender.cpp | 116 - examples/RMCast/Send_File/Sender.dsp | 96 - examples/Reactor/Dgram/CODgram.cpp | 251 - examples/Reactor/Dgram/CODgram.dsp | 92 - examples/Reactor/Dgram/Dgram.cpp | 255 - examples/Reactor/Dgram/Dgram.dsp | 92 - examples/Reactor/Dgram/Dgram.dsw | 41 - examples/Reactor/Dgram/Makefile | 269 - examples/Reactor/Dgram/Makefile.bor | 18 - examples/Reactor/FIFO/FIFO.dsw | 41 - examples/Reactor/FIFO/Makefile | 209 - examples/Reactor/FIFO/client.cpp | 22 - examples/Reactor/FIFO/client.dsp | 115 - examples/Reactor/FIFO/server.cpp | 85 - examples/Reactor/FIFO/server.dsp | 115 - examples/Reactor/Makefile | 25 - examples/Reactor/Makefile.bor | 12 - examples/Reactor/Misc/Makefile | 956 - examples/Reactor/Misc/Misc.dsp | 71 - examples/Reactor/Misc/Misc.dsw | 101 - examples/Reactor/Misc/demuxing.dsp | 71 - examples/Reactor/Misc/early_timeouts.dsp | 59 - examples/Reactor/Misc/notification.cpp | 384 - examples/Reactor/Misc/notification.dsp | 71 - examples/Reactor/Misc/pingpong.cpp | 296 - examples/Reactor/Misc/reactors.dsp | 59 - examples/Reactor/Misc/signals_1.dsp | 59 - examples/Reactor/Misc/signals_2.dsp | 59 - examples/Reactor/Misc/test_demuxing.cpp | 378 - examples/Reactor/Misc/test_early_timeouts.cpp | 111 - examples/Reactor/Misc/test_event_handler_t.cpp | 55 - examples/Reactor/Misc/test_reactors.cpp | 202 - examples/Reactor/Misc/test_signals_1.cpp | 112 - examples/Reactor/Misc/test_signals_2.cpp | 290 - examples/Reactor/Misc/test_time_value.cpp | 81 - examples/Reactor/Misc/test_timer_queue.cpp | 112 - examples/Reactor/Multicast/Log_Wrapper.cpp | 72 - examples/Reactor/Multicast/Log_Wrapper.h | 68 - examples/Reactor/Multicast/Makefile | 91 - examples/Reactor/Multicast/Makefile.bor | 8 - examples/Reactor/Multicast/Multicast.dsw | 41 - examples/Reactor/Multicast/README | 15 - examples/Reactor/Multicast/client.bor | 19 - examples/Reactor/Multicast/client.cpp | 121 - examples/Reactor/Multicast/client.dsp | 96 - examples/Reactor/Multicast/server.bor | 19 - examples/Reactor/Multicast/server.cpp | 243 - examples/Reactor/Multicast/server.dsp | 96 - examples/Reactor/Ntalker/Makefile | 190 - examples/Reactor/Ntalker/Makefile.bor | 17 - examples/Reactor/Ntalker/README | 17 - examples/Reactor/Ntalker/ntalker.cpp | 230 - examples/Reactor/Ntalker/ntalker.dsp | 67 - examples/Reactor/Ntalker/ntalker.dsw | 29 - examples/Reactor/Proactor/Aio_Platform_Test_C.cpp | 137 - examples/Reactor/Proactor/Makefile | 48 - examples/Reactor/Proactor/Makefile.bor | 25 - examples/Reactor/Proactor/README | 77 - examples/Reactor/Proactor/post_completions.cpp | 315 - examples/Reactor/Proactor/post_completions.dsp | 64 - examples/Reactor/Proactor/simple_test_proactor.cpp | 268 - examples/Reactor/Proactor/test_aiocb.cpp | 239 - examples/Reactor/Proactor/test_aiocb_ace.cpp | 258 - examples/Reactor/Proactor/test_aiosig.cpp | 294 - examples/Reactor/Proactor/test_aiosig_ace.cpp | 353 - examples/Reactor/Proactor/test_cancel.cpp | 274 - examples/Reactor/Proactor/test_cancel.dsp | 63 - examples/Reactor/Proactor/test_end_event_loop.cpp | 173 - examples/Reactor/Proactor/test_end_event_loop.dsp | 60 - examples/Reactor/Proactor/test_multiple_loops.cpp | 135 - examples/Reactor/Proactor/test_multiple_loops.dsp | 63 - examples/Reactor/Proactor/test_proactor.cpp | 711 - examples/Reactor/Proactor/test_proactor.dsp | 59 - examples/Reactor/Proactor/test_proactor.dsw | 101 - examples/Reactor/Proactor/test_proactor2.cpp | 813 - examples/Reactor/Proactor/test_proactor3.cpp | 868 - examples/Reactor/Proactor/test_timeout.cpp | 136 - examples/Reactor/Proactor/test_timeout.dsp | 63 - examples/Reactor/Proactor/test_timeout_st.cpp | 98 - examples/Reactor/Proactor/test_udp_proactor.cpp | 419 - examples/Reactor/Proactor/test_udp_proactor.dsp | 95 - examples/Reactor/README | 20 - examples/Reactor/WFMO_Reactor/APC.DSP | 158 - examples/Reactor/WFMO_Reactor/APC.cpp | 109 - examples/Reactor/WFMO_Reactor/Abandoned.cpp | 125 - examples/Reactor/WFMO_Reactor/Abandoned.dsp | 158 - examples/Reactor/WFMO_Reactor/Console_Input.cpp | 84 - examples/Reactor/WFMO_Reactor/Console_Input.dsp | 158 - .../Reactor/WFMO_Reactor/Directory_Changes.cpp | 115 - .../Reactor/WFMO_Reactor/Directory_Changes.dsp | 158 - examples/Reactor/WFMO_Reactor/Exceptions.cpp | 97 - examples/Reactor/WFMO_Reactor/Exceptions.dsp | 158 - examples/Reactor/WFMO_Reactor/Handle_Close.cpp | 321 - examples/Reactor/WFMO_Reactor/Handle_Close.dsp | 158 - examples/Reactor/WFMO_Reactor/Makefile.bor | 32 - examples/Reactor/WFMO_Reactor/Multithreading.cpp | 250 - examples/Reactor/WFMO_Reactor/Multithreading.dsp | 158 - examples/Reactor/WFMO_Reactor/Network_Events.cpp | 207 - examples/Reactor/WFMO_Reactor/Network_Events.dsp | 158 - .../Reactor/WFMO_Reactor/Prerun_State_Changes.cpp | 64 - .../Reactor/WFMO_Reactor/Prerun_State_Changes.dsp | 158 - examples/Reactor/WFMO_Reactor/Registration.cpp | 155 - examples/Reactor/WFMO_Reactor/Registration.dsp | 158 - examples/Reactor/WFMO_Reactor/Registry_Changes.cpp | 133 - examples/Reactor/WFMO_Reactor/Registry_Changes.dsp | 158 - examples/Reactor/WFMO_Reactor/Removals.cpp | 103 - examples/Reactor/WFMO_Reactor/Removals.dsp | 158 - .../Reactor/WFMO_Reactor/Suspended_Removals.cpp | 163 - .../Reactor/WFMO_Reactor/Suspended_Removals.dsp | 158 - examples/Reactor/WFMO_Reactor/Talker.cpp | 583 - examples/Reactor/WFMO_Reactor/Talker.dsp | 158 - examples/Reactor/WFMO_Reactor/Timeouts.cpp | 80 - examples/Reactor/WFMO_Reactor/Timeouts.dsp | 158 - examples/Reactor/WFMO_Reactor/WFMO_Reactor.dsw | 209 - examples/Reactor/WFMO_Reactor/Window_Messages.cpp | 90 - examples/Reactor/WFMO_Reactor/Window_Messages.dsp | 158 - examples/Reactor/WFMO_Reactor/run_test.pl | 62 - examples/Registry/Makefile.bor | 18 - examples/Registry/Registry.dsp | 71 - examples/Registry/Registry.dsw | 41 - examples/Registry/test_registry_iterator.cpp | 133 - examples/Registry/test_registry_update.cpp | 149 - examples/Registry/update.dsp | 71 - examples/Service_Configurator/IPC-tests/Makefile | 24 - .../Service_Configurator/IPC-tests/Makefile.bor | 8 - examples/Service_Configurator/IPC-tests/README | 125 - .../Service_Configurator/IPC-tests/client/Makefile | 1201 -- .../IPC-tests/client/broadcast_client_test.cpp | 58 - .../IPC-tests/client/broadcast_client_test.dsp | 115 - .../IPC-tests/client/client.dsw | 137 - .../IPC-tests/client/local_data | 22 - .../IPC-tests/client/local_dgram_client_test.cpp | 122 - .../IPC-tests/client/local_dgram_client_test.dsp | 115 - .../IPC-tests/client/local_fifo_client_test.cpp | 98 - .../IPC-tests/client/local_fifo_client_test.dsp | 115 - .../IPC-tests/client/local_pipe_client_test.cpp | 146 - .../IPC-tests/client/local_pipe_client_test.dsp | 115 - .../IPC-tests/client/local_spipe_client_test.cpp | 104 - .../IPC-tests/client/local_spipe_client_test.dsp | 115 - .../IPC-tests/client/local_stream_client_test.cpp | 109 - .../IPC-tests/client/local_stream_client_test.dsp | 115 - .../IPC-tests/client/makefile.bor | 26 - .../IPC-tests/client/remote_data | 22 - .../IPC-tests/client/remote_data1 | 22 - .../IPC-tests/client/remote_data2 | 22 - .../IPC-tests/client/remote_data3 | 22 - .../IPC-tests/client/remote_data4 | 22 - .../IPC-tests/client/remote_dgram_client_test.cpp | 90 - .../IPC-tests/client/remote_dgram_client_test.dsp | 115 - .../client/remote_service_directory_test.cpp | 107 - .../client/remote_service_directory_test.dsp | 115 - .../IPC-tests/client/remote_stream_client_test.cpp | 130 - .../IPC-tests/client/remote_stream_client_test.dsp | 115 - .../client/remote_thr_stream_client_test.cpp | 120 - .../client/remote_thr_stream_client_test.dsp | 115 - .../IPC-tests/server/Handle_Broadcast.cpp | 38 - .../IPC-tests/server/Handle_Broadcast.h | 49 - .../IPC-tests/server/Handle_Broadcast.i | 109 - .../IPC-tests/server/Handle_L_CODgram.cpp | 18 - .../IPC-tests/server/Handle_L_CODgram.h | 50 - .../IPC-tests/server/Handle_L_CODgram.i | 119 - .../IPC-tests/server/Handle_L_Dgram.cpp | 17 - .../IPC-tests/server/Handle_L_Dgram.h | 51 - .../IPC-tests/server/Handle_L_Dgram.i | 108 - .../IPC-tests/server/Handle_L_FIFO.cpp | 38 - .../IPC-tests/server/Handle_L_FIFO.h | 48 - .../IPC-tests/server/Handle_L_FIFO.i | 97 - .../IPC-tests/server/Handle_L_Pipe.cpp | 64 - .../IPC-tests/server/Handle_L_Pipe.h | 55 - .../IPC-tests/server/Handle_L_Pipe.i | 92 - .../IPC-tests/server/Handle_L_SPIPE.cpp | 18 - .../IPC-tests/server/Handle_L_SPIPE.h | 52 - .../IPC-tests/server/Handle_L_SPIPE.i | 119 - .../IPC-tests/server/Handle_L_Stream.cpp | 22 - .../IPC-tests/server/Handle_L_Stream.h | 53 - .../IPC-tests/server/Handle_L_Stream.i | 146 - .../IPC-tests/server/Handle_R_Dgram.cpp | 38 - .../IPC-tests/server/Handle_R_Dgram.h | 48 - .../IPC-tests/server/Handle_R_Dgram.i | 105 - .../IPC-tests/server/Handle_R_Stream.cpp | 42 - .../IPC-tests/server/Handle_R_Stream.h | 52 - .../IPC-tests/server/Handle_R_Stream.i | 147 - .../IPC-tests/server/Handle_Thr_Stream.cpp | 220 - .../IPC-tests/server/Handle_Thr_Stream.h | 80 - .../IPC-tests/server/Handle_Thr_Stream.i | 2 - .../IPC-tests/server/Handle_Timeout.cpp | 36 - .../IPC-tests/server/Handle_Timeout.h | 44 - .../IPC-tests/server/Handle_Timeout.i | 85 - .../Service_Configurator/IPC-tests/server/Makefile | 1762 -- .../IPC-tests/server/Server.dsp | 299 - .../IPC-tests/server/Server_static.dsp | 237 - .../IPC-tests/server/server.dsw | 53 - .../IPC-tests/server/server_test.cpp | 48 - .../IPC-tests/server/server_test.dsp | 115 - .../Service_Configurator/IPC-tests/server/svc.conf | 19 - examples/Service_Configurator/Makefile | 22 - examples/Service_Configurator/Makefile.bor | 8 - examples/Service_Configurator/Misc/Makefile | 164 - examples/Service_Configurator/Misc/Makefile.Timer | 38 - examples/Service_Configurator/Misc/Makefile.main | 36 - examples/Service_Configurator/Misc/Misc.dsw | 44 - examples/Service_Configurator/Misc/README | 23 - examples/Service_Configurator/Misc/Timer.dsp | 109 - .../Service_Configurator/Misc/Timer_Service.cpp | 129 - examples/Service_Configurator/Misc/Timer_Service.h | 70 - examples/Service_Configurator/Misc/main.cpp | 79 - examples/Service_Configurator/Misc/main.dsp | 96 - examples/Service_Configurator/Misc/svc.conf1 | 8 - examples/Service_Configurator/Misc/svc.conf2 | 8 - examples/Shared_Malloc/Makefile | 811 - examples/Shared_Malloc/Malloc.cpp | 119 - examples/Shared_Malloc/Malloc.h | 29 - examples/Shared_Malloc/Options.cpp | 194 - examples/Shared_Malloc/Options.h | 85 - examples/Shared_Malloc/Shared_Malloc.dsw | 64 - examples/Shared_Malloc/malloc.dsp | 120 - examples/Shared_Malloc/multiple_mallocs.dsp | 120 - examples/Shared_Malloc/persistence.dsp | 104 - .../Shared_Malloc/position_independent_malloc.dsp | 120 - examples/Shared_Malloc/test_malloc.cpp | 223 - examples/Shared_Malloc/test_multiple_mallocs.cpp | 135 - examples/Shared_Malloc/test_persistence.cpp | 354 - .../test_position_independent_malloc.cpp | 211 - .../test_position_independent_malloc.h | 28 - examples/Shared_Memory/Makefile | 120 - examples/Shared_Memory/Shared_Memory.dsw | 41 - examples/Shared_Memory/test_MM.cpp | 66 - examples/Shared_Memory/test_MM.dsp | 115 - examples/Shared_Memory/test_SV.cpp | 63 - examples/Shared_Memory/test_SV.dsp | 115 - examples/Smart_Pointers/Gadget.cpp | 16 - examples/Smart_Pointers/Gadget.h | 51 - examples/Smart_Pointers/Gadget_Factory.cpp | 18 - examples/Smart_Pointers/Gadget_Factory.h | 32 - examples/Smart_Pointers/Gadget_Impl.cpp | 47 - examples/Smart_Pointers/Gadget_Impl.h | 51 - examples/Smart_Pointers/Gadget_Part.cpp | 16 - examples/Smart_Pointers/Gadget_Part.h | 43 - examples/Smart_Pointers/Gadget_Part_Factory.cpp | 20 - examples/Smart_Pointers/Gadget_Part_Factory.h | 35 - examples/Smart_Pointers/Gadget_Part_Impl.cpp | 68 - examples/Smart_Pointers/Gadget_Part_Impl.h | 64 - examples/Smart_Pointers/Makefile | 619 - examples/Smart_Pointers/Makefile.bor | 7 - examples/Smart_Pointers/README | 29 - examples/Smart_Pointers/Smart_Pointers.dsw | 41 - examples/Smart_Pointers/Widget.cpp | 16 - examples/Smart_Pointers/Widget.h | 40 - examples/Smart_Pointers/Widget_Factory.cpp | 18 - examples/Smart_Pointers/Widget_Factory.h | 30 - examples/Smart_Pointers/Widget_Impl.cpp | 52 - examples/Smart_Pointers/Widget_Impl.h | 64 - examples/Smart_Pointers/Widget_Part.cpp | 16 - examples/Smart_Pointers/Widget_Part.h | 33 - examples/Smart_Pointers/Widget_Part_Factory.cpp | 20 - examples/Smart_Pointers/Widget_Part_Factory.h | 31 - examples/Smart_Pointers/Widget_Part_Impl.cpp | 73 - examples/Smart_Pointers/Widget_Part_Impl.h | 49 - examples/Smart_Pointers/gadget_test.bor | 22 - examples/Smart_Pointers/gadget_test.cpp | 72 - examples/Smart_Pointers/gadget_test.dsp | 163 - examples/Smart_Pointers/widget_test.bor | 22 - examples/Smart_Pointers/widget_test.cpp | 77 - examples/Smart_Pointers/widget_test.dsp | 163 - examples/Synch/Makefile | 150 - examples/Synch/Makefile.bor | 17 - examples/Synch/README | 21 - examples/Synch/Synch.dsw | 29 - examples/Synch/proc_sema.cpp | 95 - examples/Synch/proc_sema.dsp | 92 - examples/System_V_IPC/Makefile | 32 - examples/System_V_IPC/README | 13 - .../System_V_IPC/SV_Message_Queues/MQ_Client.cpp | 49 - .../System_V_IPC/SV_Message_Queues/MQ_Server.cpp | 73 - examples/System_V_IPC/SV_Message_Queues/Makefile | 224 - .../System_V_IPC/SV_Message_Queues/TMQ_Client.cpp | 50 - .../System_V_IPC/SV_Message_Queues/TMQ_Server.cpp | 80 - examples/System_V_IPC/SV_Message_Queues/test.h | 58 - examples/System_V_IPC/SV_Semaphores/Makefile | 206 - .../System_V_IPC/SV_Semaphores/Semaphores_1.cpp | 104 - .../System_V_IPC/SV_Semaphores/Semaphores_2.cpp | 125 - examples/System_V_IPC/SV_Shared_Memory/Makefile | 76 - .../SV_Shared_Memory/SV_Shared_Memory_Test.cpp | 75 - .../SV_Shared_Memory/SV_Shared_Memory_Test.h | 12 - examples/Threads/Makefile | 3085 --- examples/Threads/Makefile.bor | 40 - examples/Threads/TSS_Data.h | 38 - examples/Threads/TSS_Obj.h | 39 - examples/Threads/TSS_Task.h | 43 - examples/Threads/auto_event.cpp | 122 - examples/Threads/barrier1.cpp | 82 - examples/Threads/barrier1.dsp | 71 - examples/Threads/barrier2.cpp | 317 - examples/Threads/barrier2.dsp | 71 - examples/Threads/cancel.cpp | 74 - examples/Threads/cancel.dsp | 71 - examples/Threads/future1.cpp | 434 - examples/Threads/future1.dsp | 71 - examples/Threads/future2.cpp | 555 - examples/Threads/future2.dsp | 71 - examples/Threads/manual_event.cpp | 119 - examples/Threads/manual_event.dsp | 71 - examples/Threads/process_manager.cpp | 294 - examples/Threads/process_mutex.cpp | 73 - examples/Threads/process_mutex.dsp | 71 - examples/Threads/process_semaphore.cpp | 61 - examples/Threads/process_semaphore.dsp | 71 - examples/Threads/reader_writer.cpp | 199 - examples/Threads/reader_writer.dsp | 71 - examples/Threads/recursive_mutex.cpp | 110 - examples/Threads/recursive_mutex.dsp | 71 - examples/Threads/task_five.cpp | 175 - examples/Threads/task_five.dsp | 59 - examples/Threads/task_four.cpp | 305 - examples/Threads/task_four.dsp | 71 - examples/Threads/task_one.cpp | 100 - examples/Threads/task_one.dsp | 71 - examples/Threads/task_three.cpp | 251 - examples/Threads/task_three.dsp | 71 - examples/Threads/task_two.cpp | 156 - examples/Threads/task_two.dsp | 71 - examples/Threads/test.dsp | 71 - examples/Threads/test.dsw | 281 - examples/Threads/thread_manager.cpp | 105 - examples/Threads/thread_manager.dsp | 71 - examples/Threads/thread_pool.cpp | 266 - examples/Threads/thread_pool.dsp | 71 - examples/Threads/thread_specific.cpp | 233 - examples/Threads/thread_specific.dsp | 71 - examples/Threads/thread_specific.h | 50 - examples/Threads/token.cpp | 76 - examples/Threads/token.dsp | 71 - examples/Threads/tss1.cpp | 165 - examples/Threads/tss1.dsp | 71 - examples/Threads/tss2.cpp | 210 - examples/Threads/tss2.dsp | 71 - examples/Threads/wfmo.cpp | 130 - examples/Timer_Queue/Async_Timer_Queue_Test.bor | 20 - examples/Timer_Queue/Async_Timer_Queue_Test.cpp | 308 - examples/Timer_Queue/Async_Timer_Queue_Test.dsp | 96 - examples/Timer_Queue/Async_Timer_Queue_Test.h | 118 - examples/Timer_Queue/Driver.cpp | 155 - examples/Timer_Queue/Driver.h | 135 - examples/Timer_Queue/Makefile | 1036 - examples/Timer_Queue/Makefile.bor | 7 - examples/Timer_Queue/README | 26 - examples/Timer_Queue/Reactor_Timer_Queue_Test.bor | 20 - examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp | 230 - examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp | 96 - examples/Timer_Queue/Reactor_Timer_Queue_Test.h | 152 - examples/Timer_Queue/Thread_Timer_Queue_Test.bor | 20 - examples/Timer_Queue/Thread_Timer_Queue_Test.cpp | 303 - examples/Timer_Queue/Thread_Timer_Queue_Test.dsp | 96 - examples/Timer_Queue/Thread_Timer_Queue_Test.h | 154 - examples/Timer_Queue/Timer_Queue.dsw | 53 - examples/Timer_Queue/main_async.cpp | 65 - examples/Timer_Queue/main_reactor.cpp | 69 - examples/Timer_Queue/main_thread.cpp | 64 - examples/Web_Crawler/Command_Processor.cpp | 135 - examples/Web_Crawler/Command_Processor.h | 98 - examples/Web_Crawler/HTTP_URL.cpp | 84 - examples/Web_Crawler/HTTP_URL.h | 64 - examples/Web_Crawler/Iterators.cpp | 162 - examples/Web_Crawler/Iterators.h | 117 - examples/Web_Crawler/Makefile | 56 - examples/Web_Crawler/Mem_Map_Stream.cpp | 244 - examples/Web_Crawler/Mem_Map_Stream.h | 188 - examples/Web_Crawler/Options.cpp | 175 - examples/Web_Crawler/Options.h | 123 - examples/Web_Crawler/README | 25 - examples/Web_Crawler/URL.cpp | 39 - examples/Web_Crawler/URL.h | 78 - examples/Web_Crawler/URL_Addr.cpp | 232 - examples/Web_Crawler/URL_Addr.h | 110 - examples/Web_Crawler/URL_Status.cpp | 40 - examples/Web_Crawler/URL_Status.h | 61 - examples/Web_Crawler/URL_Visitor.cpp | 725 - examples/Web_Crawler/URL_Visitor.h | 437 - examples/Web_Crawler/URL_Visitor_Factory.cpp | 46 - examples/Web_Crawler/URL_Visitor_Factory.h | 70 - examples/Web_Crawler/Web_Crawler.cpp | 95 - examples/Web_Crawler/Web_Crawler.dsp | 219 - examples/Web_Crawler/Web_Crawler.dsw | 29 - examples/Web_Crawler/Web_Crawler.h | 62 - examples/Web_Crawler/main.cpp | 49 - html/README | 11 - html/Stats/Stats.css | 4 - html/Stats/configuration.shtml | 82 - html/Stats/detailed_footprint.shtml | 287 - html/Stats/detailed_performance.shtml | 176 - html/Stats/footer.html | 12 - html/Stats/index.shtml | 80 - html/Stats/navigation.html | 31 - html/doxygen.css | 5 - html/index.html | 164 - include/makeinclude/Makefile.rtems | 31 - include/makeinclude/ace_flags.bor | 139 - include/makeinclude/build_core_exe.bor | 9 - include/makeinclude/build_core_library.bor | 9 - include/makeinclude/build_dll.bor | 120 - include/makeinclude/build_example.bor | 24 - include/makeinclude/build_exe.bor | 117 - include/makeinclude/build_lib.bor | 90 - include/makeinclude/build_library.bor | 10 - include/makeinclude/clean.bor | 66 - include/makeinclude/compiler.bor | 174 - include/makeinclude/decorator.bor | 54 - include/makeinclude/install.bor | 37 - include/makeinclude/macros.GNU | 23 - include/makeinclude/make_flags.bor | 54 - include/makeinclude/outputdir.bor | 135 - include/makeinclude/platform_aix.GNU | 3 - include/makeinclude/platform_aix4.2.GNU | 3 - include/makeinclude/platform_aix4_cset++.GNU | 120 - include/makeinclude/platform_aix_g++.GNU | 91 - include/makeinclude/platform_aix_ibm.GNU | 153 - include/makeinclude/platform_chorus.GNU | 116 - include/makeinclude/platform_chorus4.x_g++.GNU | 177 - include/makeinclude/platform_chorus_ghs.GNU | 77 - include/makeinclude/platform_cray.GNU | 50 - include/makeinclude/platform_cygwin32.GNU | 34 - include/makeinclude/platform_dgux4_epc.GNU | 23 - include/makeinclude/platform_dgux4_ghs.GNU | 27 - include/makeinclude/platform_freebsd.GNU | 56 - include/makeinclude/platform_g++_common.GNU | 59 - include/makeinclude/platform_gnuwin32_common.GNU | 117 - include/makeinclude/platform_hpux.GNU | 30 - include/makeinclude/platform_hpux_aCC.GNU | 186 - include/makeinclude/platform_hpux_gcc.GNU | 98 - include/makeinclude/platform_hpux_kcc.GNU | 123 - include/makeinclude/platform_irix5.2.GNU | 24 - include/makeinclude/platform_irix5.3_g++.GNU | 25 - include/makeinclude/platform_irix5.3_sgic++.GNU | 25 - include/makeinclude/platform_irix6.x_common.GNU | 14 - include/makeinclude/platform_irix6.x_g++.GNU | 35 - include/makeinclude/platform_irix6.x_kcc.GNU | 41 - include/makeinclude/platform_irix6.x_sgic++.GNU | 89 - include/makeinclude/platform_linux.GNU | 125 - include/makeinclude/platform_linux_borland.GNU | 143 - include/makeinclude/platform_linux_cxx.GNU | 51 - include/makeinclude/platform_linux_icc.GNU | 124 - include/makeinclude/platform_linux_kcc.GNU | 72 - include/makeinclude/platform_lynxos.GNU | 120 - include/makeinclude/platform_m88k.GNU | 32 - include/makeinclude/platform_macosx.GNU | 42 - include/makeinclude/platform_mingw32.GNU | 46 - include/makeinclude/platform_mvs.GNU | 34 - include/makeinclude/platform_netbsd.GNU | 31 - include/makeinclude/platform_openbsd.GNU | 54 - include/makeinclude/platform_osf1_3.2_cxx.GNU | 47 - include/makeinclude/platform_osf1_4.x_cxx.GNU | 164 - include/makeinclude/platform_osf1_4.x_g++.GNU | 46 - include/makeinclude/platform_osf1_4.x_kcc.GNU | 65 - include/makeinclude/platform_osf1_4.x_rcc.GNU | 41 - include/makeinclude/platform_psos_diab.GNU | 189 - include/makeinclude/platform_psos_diab_ppc.GNU | 202 - include/makeinclude/platform_psos_tm.GNU | 47 - include/makeinclude/platform_psosim_g++.GNU | 60 - include/makeinclude/platform_qnx_neutrino.GNU | 37 - include/makeinclude/platform_qnx_rtp_gcc.GNU | 39 - include/makeinclude/platform_rtems.x_g++.GNU | 96 - include/makeinclude/platform_sco-nothread.GNU | 25 - .../platform_sco5.0.0-CC-fsu-pthread.GNU | 36 - .../makeinclude/platform_sco5.0.0-fsu-pthread.GNU | 46 - .../makeinclude/platform_sco5.0.0-mit-pthread.GNU | 40 - include/makeinclude/platform_sco5.0.0-nothread.GNU | 38 - include/makeinclude/platform_sunos4_g++.GNU | 31 - include/makeinclude/platform_sunos4_lucid.GNU | 21 - include/makeinclude/platform_sunos4_sunc++3.x.GNU | 27 - include/makeinclude/platform_sunos4_sunc++4.x.GNU | 24 - include/makeinclude/platform_sunos5_centerline.GNU | 22 - include/makeinclude/platform_sunos5_g++.GNU | 79 - include/makeinclude/platform_sunos5_ghs.GNU | 51 - include/makeinclude/platform_sunos5_kcc.GNU | 111 - include/makeinclude/platform_sunos5_sunc++.GNU | 261 - include/makeinclude/platform_tandem.GNU | 92 - include/makeinclude/platform_tru64_cxx.GNU | 27 - include/makeinclude/platform_tru64_g++.GNU | 20 - include/makeinclude/platform_tru64_kcc.GNU | 35 - include/makeinclude/platform_tru64_post.GNU | 32 - include/makeinclude/platform_tru64_pre.GNU | 11 - include/makeinclude/platform_unixware_g++.GNU | 51 - include/makeinclude/platform_unixware_udk.GNU | 47 - include/makeinclude/platform_vxworks5.x_diab.GNU | 153 - include/makeinclude/platform_vxworks5.x_g++.GNU | 382 - include/makeinclude/platform_vxworks5.x_ghs.GNU | 115 - include/makeinclude/recurse.bor | 211 - include/makeinclude/rules.bin.GNU | 33 - include/makeinclude/rules.common.GNU | 17 - include/makeinclude/rules.lib.GNU | 141 - include/makeinclude/rules.local.GNU | 324 - include/makeinclude/rules.nested.GNU | 43 - include/makeinclude/rules.nolocal.GNU | 8 - include/makeinclude/rules.nonested.GNU | 8 - include/makeinclude/wrapper_macros.GNU | 700 - java/ChangeLog | 143 - java/EAC/BoundsException.java | 13 - java/EAC/Configuration.java | 220 - java/EAC/Configurator.java | 58 - java/EAC/ConnectionException.java | 14 - java/EAC/Connector.java | 197 - java/EAC/EACComponent.java | 460 - java/EAC/EACFont.java | 21 - java/EAC/EACLabel.java | 187 - java/EAC/EACMenuBar.java | 198 - java/EAC/EACPanel.java | 425 - java/EAC/EACPrintStream.java | 16 - java/EAC/EmptyQueueException.java | 13 - java/EAC/File.java | 118 - java/EAC/InputMode.java | 32 - java/EAC/Intersection.java | 62 - java/EAC/Operator.java | 206 - java/EAC/Primitive.java | 121 - java/EAC/Queue.java | 94 - java/EAC/README | 6 - java/EAC/ResourcePool.java | 46 - java/EAC/Rubberband.java | 103 - java/EAC/RubberbandLine.java | 28 - java/EAC/Sink.java | 231 - java/EAC/Source.java | 341 - java/EAC/System_Manual.doc | Bin 83968 -> 0 bytes java/EAC/TooManyPrimitivesException.java | 13 - java/EAC/Union.java | 56 - java/EAC/User_Manual.doc | Bin 95232 -> 0 bytes java/ImageProcessing/ImageProcessing.dsp | 253 - java/ImageProcessing/ImageProcessing.dsw | 29 - java/ImageProcessing/filters/Assert.java | 33 - java/ImageProcessing/filters/BleachFilter.java | 65 - java/ImageProcessing/filters/BlurFilter.java | 95 - java/ImageProcessing/filters/DarkenFilter.java | 48 - java/ImageProcessing/filters/DeSpeckleFilter.java | 123 - java/ImageProcessing/filters/DissolveFilter.java | 52 - java/ImageProcessing/filters/EdgeDetectFilter.java | 250 - java/ImageProcessing/filters/EmbossFilter.java | 86 - java/ImageProcessing/filters/Makefile | 36 - java/ImageProcessing/filters/MedFilter.java | 6 - java/ImageProcessing/filters/OilPaintFilter.java | 97 - java/ImageProcessing/filters/PixelizeFilter.java | 117 - java/ImageProcessing/filters/RandomizeFilter.java | 36 - java/ImageProcessing/filters/RotateFilter.java | 358 - java/ImageProcessing/filters/SharpenFilter.java | 272 - java/ImageProcessing/filters/SpatialFilter.java | 213 - java/ImageProcessing/filters/SpreadFilter.java | 130 - java/ImageProcessing/filters/Timer.java | 23 - java/ImageProcessing/framework/BaseButton.java | 234 - .../ImageProcessing/framework/BenchmarkApplet.java | 622 - java/ImageProcessing/framework/DialogManager.java | 277 - java/ImageProcessing/framework/DialogType.java | 11 - java/ImageProcessing/framework/FileBrowser.java | 173 - java/ImageProcessing/framework/FilePanel.java | 161 - java/ImageProcessing/framework/FilterTest.java | 62 - java/ImageProcessing/framework/GIFHandler.java | 75 - java/ImageProcessing/framework/GifEncoder.java | 693 - java/ImageProcessing/framework/Hierarchy.java | 347 - .../framework/HierarchyAdapter.java | 34 - java/ImageProcessing/framework/Icon.java | 70 - java/ImageProcessing/framework/ImageApp.java | 303 - .../framework/ImageByteCounter.java | 94 - java/ImageProcessing/framework/ImageCanvas.java | 166 - java/ImageProcessing/framework/ImageEncoder.java | 271 - java/ImageProcessing/framework/ImageProcessor.java | 111 - java/ImageProcessing/framework/ImageSender.java | 128 - java/ImageProcessing/framework/IntHashtable.java | 396 - java/ImageProcessing/framework/ListFiles.java | 167 - java/ImageProcessing/framework/LoadURLFrame.java | 142 - java/ImageProcessing/framework/Makefile | 45 - java/ImageProcessing/framework/MedJava.html | 15 - java/ImageProcessing/framework/Options.java | 25 - java/ImageProcessing/framework/SaveURLFrame.java | 133 - java/ImageProcessing/framework/Separator.java | 90 - java/ImageProcessing/framework/ServerHandler.java | 50 - java/ImageProcessing/framework/ServerTest.java | 67 - java/ImageProcessing/framework/StatusDisplay.java | 23 - .../ImageProcessing/framework/StatusIndicator.java | 70 - java/ImageProcessing/framework/TestHandler.java | 149 - java/ImageProcessing/framework/Tester.java | 148 - java/ImageProcessing/framework/doc01.gif | Bin 223 -> 0 bytes java/ImageProcessing/framework/file03.gif | Bin 267 -> 0 bytes java/ImageProcessing/framework/filter.conf | 15 - java/ImageProcessing/framework/help.conf | 216 - java/ImageProcessing/framework/test.html | 20 - java/ImageProcessing/framework/testFilter.conf | 15 - java/JACE/ASX/IOCntlCmds.java | 38 - java/JACE/ASX/IOCntlMsg.java | 124 - java/JACE/ASX/MessageBlock.java | 447 - java/JACE/ASX/MessageQueue.java | 633 - java/JACE/ASX/MessageType.java | 102 - java/JACE/ASX/Module.java | 246 - java/JACE/ASX/Stream.java | 436 - java/JACE/ASX/StreamHead.java | 123 - java/JACE/ASX/StreamTail.java | 114 - java/JACE/ASX/Task.java | 443 - java/JACE/ASX/TaskFlags.java | 49 - java/JACE/ASX/ThruTask.java | 44 - java/JACE/ASX/TimeValue.java | 296 - java/JACE/ASX/TimedWait.java | 157 - java/JACE/ASX/TimeoutException.java | 37 - java/JACE/ASX/package.html | 11 - java/JACE/Concurrency/AbstractLock.java | 269 - java/JACE/Concurrency/Condition.java | 124 - java/JACE/Concurrency/LockAdapter.java | 262 - java/JACE/Concurrency/LockException.java | 28 - java/JACE/Concurrency/Mutex.java | 239 - java/JACE/Concurrency/RWMutex.java | 268 - java/JACE/Concurrency/RenewObject.java | 36 - java/JACE/Concurrency/Semaphore.java | 263 - java/JACE/Concurrency/ThreadManager.java | 113 - java/JACE/Concurrency/Token.java | 301 - java/JACE/Concurrency/WaitObject.java | 39 - java/JACE/Concurrency/package.html | 15 - java/JACE/Connection/AcceptStrategy.java | 87 - java/JACE/Connection/Acceptor.java | 215 - java/JACE/Connection/ActivateStrategy.java | 40 - java/JACE/Connection/Blob.java | 114 - java/JACE/Connection/BlobHandler.java | 35 - java/JACE/Connection/BlobReader.java | 108 - java/JACE/Connection/BlobWriter.java | 224 - java/JACE/Connection/Connector.java | 148 - java/JACE/Connection/CreationStrategy.java | 57 - java/JACE/Connection/HTTPHelper.java | 182 - java/JACE/Connection/StrategyAcceptor.java | 174 - java/JACE/Connection/SvcHandler.java | 101 - java/JACE/Connection/package.html | 7 - java/JACE/Makefile | 234 - java/JACE/Misc/GetOpt.java | 171 - java/JACE/Misc/package.html | 6 - java/JACE/OS/ACE.java | 156 - java/JACE/OS/OS.java | 65 - java/JACE/OS/package.html | 6 - java/JACE/Reactor/EventHandler.java | 43 - java/JACE/Reactor/TimerQueue.java | 437 - java/JACE/Reactor/package.html | 6 - java/JACE/SOCK_SAP/INETAddr.java | 96 - java/JACE/SOCK_SAP/SOCKAcceptor.java | 113 - java/JACE/SOCK_SAP/SOCKConnector.java | 73 - java/JACE/SOCK_SAP/SOCKStream.java | 227 - java/JACE/SOCK_SAP/package.html | 8 - java/JACE/ServiceConfigurator/Service.java | 96 - java/JACE/ServiceConfigurator/ServiceConfig.java | 482 - java/JACE/ServiceConfigurator/ServiceLoader.java | 254 - java/JACE/ServiceConfigurator/ServiceObject.java | 130 - .../ServiceConfigurator/ServiceRepository.java | 274 - java/JACE/ServiceConfigurator/package.html | 10 - java/JACE/Timers/ProfileTimer.java | 46 - java/JACE/Timers/package.html | 8 - java/JACE/makebat.zip | Bin 1326 -> 0 bytes java/JACE/netsvcs/Handler.java | 185 - java/JACE/netsvcs/Logger/LogRecord.java | 290 - java/JACE/netsvcs/Logger/LoggingStrategy.java | 35 - .../JACE/netsvcs/Logger/ServerLoggingAcceptor.java | 147 - java/JACE/netsvcs/Logger/ServerLoggingHandler.java | 60 - java/JACE/netsvcs/Logger/StderrStrategy.java | 36 - java/JACE/netsvcs/Logger/c.bat | 2 - java/JACE/netsvcs/Logger/package.html | 17 - java/JACE/netsvcs/Naming/NameAcceptor.java | 313 - java/JACE/netsvcs/Naming/NameHandler.java | 473 - java/JACE/netsvcs/Naming/NameProxy.java | 405 - java/JACE/netsvcs/Naming/NameReply.java | 169 - java/JACE/netsvcs/Naming/NameRequest.java | 373 - java/JACE/netsvcs/Naming/c.bat | 2 - java/JACE/netsvcs/Naming/package.html | 11 - java/JACE/netsvcs/Server.java | 356 - java/JACE/netsvcs/Time/TSClerkHandler.java | 195 - java/JACE/netsvcs/Time/TSClerkProcessor.java | 307 - java/JACE/netsvcs/Time/TSServerAcceptor.java | 116 - java/JACE/netsvcs/Time/TSServerHandler.java | 53 - java/JACE/netsvcs/Time/TimeInfo.java | 90 - java/JACE/netsvcs/Time/TimeRequest.java | 121 - java/JACE/netsvcs/Time/c.bat | 1 - java/JACE/netsvcs/Time/package.html | 10 - java/JACE/netsvcs/Time/r.bat | 1 - java/JACE/netsvcs/Token/LockHandler.java | 38 - java/JACE/netsvcs/Token/LockHandlerAdapter.java | 380 - java/JACE/netsvcs/Token/LockOperations.java | 16 - java/JACE/netsvcs/Token/LockTypes.java | 19 - java/JACE/netsvcs/Token/MutexHandler.java | 51 - java/JACE/netsvcs/Token/RWMutexHandler.java | 54 - java/JACE/netsvcs/Token/RemoteLock.java | 543 - java/JACE/netsvcs/Token/RemoteMutex.java | 28 - java/JACE/netsvcs/Token/RemoteRWMutex.java | 29 - java/JACE/netsvcs/Token/TokenAcceptor.java | 353 - java/JACE/netsvcs/Token/TokenReply.java | 171 - java/JACE/netsvcs/Token/TokenRequest.java | 426 - java/JACE/netsvcs/Token/TokenRequestHandler.java | 180 - java/JACE/netsvcs/Token/package.html | 16 - java/JACE/netsvcs/package.html | 11 - java/JACE/overview.html | 84 - java/JACE/package.html | 32 - java/JACE/tests/ASX/BufferStreamTest.java | 189 - java/JACE/tests/ASX/MessageQueueTest.java | 54 - java/JACE/tests/ASX/PriorityBufferTest.java | 118 - java/JACE/tests/ASX/TaskTest.java | 95 - java/JACE/tests/ASX/ThreadPoolTest.java | 187 - .../JACE/tests/Concurrency/Condition/Consumer.java | 75 - .../Concurrency/Condition/JoinableThreadGroup.java | 24 - .../JACE/tests/Concurrency/Condition/Producer.java | 70 - .../tests/Concurrency/Condition/QueueTest.java | 68 - .../Concurrency/Condition/SimpleMessageQueue.java | 86 - java/JACE/tests/Concurrency/IterationTest.java | 235 - java/JACE/tests/Concurrency/RWMutexTest.java | 137 - java/JACE/tests/Concurrency/TimingTest.java | 290 - java/JACE/tests/Concurrency/TokenTest.java | 95 - java/JACE/tests/Connection/AcceptorTest.java | 83 - java/JACE/tests/Connection/ClientHandler.java | 77 - java/JACE/tests/Connection/ConnectorTest.java | 78 - java/JACE/tests/Connection/HTTPHelperTest.java | 34 - java/JACE/tests/Connection/ServerHandler.java | 68 - java/JACE/tests/Makefile | 115 - java/JACE/tests/Misc/ParseArgsTest.java | 48 - java/JACE/tests/Reactor/TimeValueTest.java | 52 - java/JACE/tests/Reactor/TimerQueueTest.java | 84 - java/JACE/tests/SOCK_SAP/SOCKAcceptorTest.java | 110 - java/JACE/tests/SOCK_SAP/SOCKConnectorTest.java | 97 - java/JACE/tests/ServiceConfigurator/Main.java | 113 - java/JACE/tests/ServiceConfigurator/svc.conf | 4 - java/JACE/tests/netsvcs/Logger/LoggerTest.java | 115 - java/JACE/tests/netsvcs/Naming/ClientTest.java | 107 - java/JACE/tests/netsvcs/Time/TSClient.java | 37 - java/JACE/tests/netsvcs/Token/ProxyClientTest.java | 200 - java/MSVJProjects.zip | Bin 35698 -> 0 bytes java/README | 40 - java/VERSION | 5 - java/apps/NexusII/README | 58 - java/apps/NexusII/classes/ClientHandler.class | Bin 689 -> 0 bytes java/apps/NexusII/classes/FrameHandler.class | Bin 828 -> 0 bytes java/apps/NexusII/classes/ImageCanvas.class | Bin 1771 -> 0 bytes java/apps/NexusII/classes/NexusClientApplet.class | Bin 581 -> 0 bytes java/apps/NexusII/classes/NexusIIserver.class | Bin 1265 -> 0 bytes java/apps/NexusII/classes/Room.class | Bin 2049 -> 0 bytes java/apps/NexusII/classes/RoomFactory.class | Bin 751 -> 0 bytes java/apps/NexusII/classes/RoomFrame.class | Bin 186 -> 0 bytes java/apps/NexusII/classes/RoomThread.class | Bin 79 -> 0 bytes java/apps/NexusII/classes/awtCommand/CApplet.class | Bin 29 -> 0 bytes java/apps/NexusII/classes/awtCommand/CApplet.java | 199 - java/apps/NexusII/classes/awtCommand/CButton.class | Bin 41 -> 0 bytes java/apps/NexusII/classes/awtCommand/CButton.java | 41 - java/apps/NexusII/classes/awtCommand/CCanvas.class | Bin 2249 -> 0 bytes java/apps/NexusII/classes/awtCommand/CCanvas.java | 381 - java/apps/NexusII/classes/awtCommand/CFrame.class | Bin 3543 -> 0 bytes java/apps/NexusII/classes/awtCommand/CFrame.java | 486 - java/apps/NexusII/classes/awtCommand/CList.class | Bin 825 -> 0 bytes java/apps/NexusII/classes/awtCommand/CList.java | 96 - java/apps/NexusII/classes/awtCommand/CPanel.class | Bin 2246 -> 0 bytes java/apps/NexusII/classes/awtCommand/CPanel.java | 381 - .../NexusII/classes/awtCommand/CTextArea.class | Bin 57 -> 0 bytes .../apps/NexusII/classes/awtCommand/CTextArea.java | 93 - .../NexusII/classes/awtCommand/CTextField.class | Bin 91 -> 0 bytes .../NexusII/classes/awtCommand/CTextField.java | 110 - java/apps/NexusII/classes/awtCommand/Command.class | Bin 253 -> 0 bytes java/apps/NexusII/classes/awtCommand/Command.java | 25 - java/apps/NexusII/classes/commandHandler.class | Bin 58 -> 0 bytes java/apps/NexusII/classes/commandParser.class | Bin 1430 -> 0 bytes java/apps/NexusII/classes/connectionHandler.class | Bin 248 -> 0 bytes java/apps/NexusII/classes/joinHandler.class | Bin 2048 -> 0 bytes java/apps/NexusII/classes/roomHandler.class | Bin 1837 -> 0 bytes java/apps/NexusII/classes/textHandler.class | Bin 1752 -> 0 bytes java/apps/NexusII/src/Consumer.java | 74 - java/apps/NexusII/src/MT_Bounded_Queue.java | 226 - java/apps/NexusII/src/MT_Bounded_Queue_Group.java | 79 - java/apps/NexusII/src/NexusClientApplet.java | 494 - java/apps/NexusII/src/NexusIIserver.java | 280 - java/apps/NexusII/src/Producer.java | 87 - java/apps/NexusII/src/Room.java | 97 - java/apps/NexusII/src/RoomFrame.java | 297 - java/apps/NexusII/src/RoomSpace.java | 110 - java/apps/NexusII/src/Timed_Wait.java | 86 - java/apps/NexusII/src/Timer.java | 31 - java/apps/NexusII/src/commandHandler.java | 44 - java/apps/NexusII/src/commandParser.java | 124 - java/apps/NexusII/src/connectionHandler.java | 236 - java/apps/NexusII/src/consts.java | 40 - java/apps/NexusII/src/dataPacket.java | 124 - java/apps/NexusII/src/joinHandler.java | 181 - java/apps/NexusII/src/makefile | 15 - java/apps/NexusII/src/nexusDemuxThread.java | 97 - java/apps/NexusII/src/roomHandler.java | 125 - java/apps/NexusII/src/socketReaderThread.java | 126 - java/apps/NexusII/src/socketWriterThread.java | 119 - java/apps/NexusII/src/url_to_url.java | 33 - java/apps/NexusII/start | 27 - java/apps/NexusII/start.html | 4 - java/classes/README.TXT | 2 - java/doc/images/GridBagEx.gif | Bin 2453 -> 0 bytes java/doc/images/OpenBookIcon.gif | Bin 2241 -> 0 bytes java/doc/images/blue-ball-small.gif | Bin 255 -> 0 bytes java/doc/images/blue-ball.gif | Bin 925 -> 0 bytes java/doc/images/class-index.gif | Bin 1497 -> 0 bytes java/doc/images/constructor-index.gif | Bin 1711 -> 0 bytes java/doc/images/constructors.gif | Bin 1565 -> 0 bytes java/doc/images/cyan-ball-small.gif | Bin 255 -> 0 bytes java/doc/images/cyan-ball.gif | Bin 925 -> 0 bytes java/doc/images/error-index.gif | Bin 1438 -> 0 bytes java/doc/images/exception-index.gif | Bin 1707 -> 0 bytes java/doc/images/green-ball-small.gif | Bin 102 -> 0 bytes java/doc/images/green-ball.gif | Bin 886 -> 0 bytes java/doc/images/interface-index.gif | Bin 1648 -> 0 bytes java/doc/images/magenta-ball-small.gif | Bin 104 -> 0 bytes java/doc/images/magenta-ball.gif | Bin 896 -> 0 bytes java/doc/images/method-index.gif | Bin 1588 -> 0 bytes java/doc/images/methods.gif | Bin 1403 -> 0 bytes java/doc/images/package-index.gif | Bin 1607 -> 0 bytes java/doc/images/red-ball-small.gif | Bin 255 -> 0 bytes java/doc/images/red-ball.gif | Bin 527 -> 0 bytes java/doc/images/variable-index.gif | Bin 1576 -> 0 bytes java/doc/images/variables.gif | Bin 1380 -> 0 bytes java/doc/images/yellow-ball-small.gif | Bin 255 -> 0 bytes java/doc/images/yellow-ball.gif | Bin 925 -> 0 bytes java/examples/Logger/README | 29 - java/examples/Logger/simple-server/LogRecord.java | 145 - .../Logger/simple-server/LoggerConstants.java | 7 - .../Logger/simple-server/LoggingAcceptor.java | 33 - .../Logger/simple-server/LoggingClient.java | 108 - .../Logger/simple-server/LoggingHandler.java | 121 - java/examples/Logger/simple-server/Makefile | 34 - java/examples/Logger/simple-server/README | 25 - .../Logger/simple-server/SimpleLogger.java | 44 - java/gjt/Assert.java | 33 - java/gjt/Bargauge.java | 80 - java/gjt/Border.java | 105 - java/gjt/Box.java | 81 - java/gjt/BulletinLayout.java | 100 - java/gjt/ButtonPanel.java | 51 - java/gjt/CardPanel.java | 48 - java/gjt/ChoiceCardPanel.java | 53 - java/gjt/ColumnLayout.java | 154 - java/gjt/ComponentScroller.java | 42 - java/gjt/DialogClient.java | 20 - java/gjt/DrawingPanel.java | 72 - java/gjt/DrawnRectangle.java | 136 - java/gjt/EtchedBorder.java | 59 - java/gjt/EtchedRectangle.java | 97 - java/gjt/Etching.java | 22 - java/gjt/ExclusiveImageButtonPanel.java | 47 - java/gjt/FontDialog.java | 362 - java/gjt/GJT.DSP | 456 - java/gjt/GJT.DSW | 29 - java/gjt/GJTDialog.java | 51 - java/gjt/IconCardPanel.java | 55 - java/gjt/ImageButton.java | 209 - java/gjt/ImageButtonController.java | 79 - java/gjt/ImageButtonEvent.java | 103 - java/gjt/ImageButtonPanel.java | 106 - java/gjt/ImageButtonPanelController.java | 47 - java/gjt/ImageCanvas.java | 31 - java/gjt/ImageScroller.java | 62 - java/gjt/LabelCanvas.java | 93 - java/gjt/Makefile | 67 - java/gjt/MessageDialog.java | 77 - java/gjt/MouseController.java | 32 - java/gjt/Orientation.java | 87 - java/gjt/ProgressDialog.java | 67 - java/gjt/QuestionDialog.java | 130 - java/gjt/RadioImageButtonPanelController.java | 45 - java/gjt/RowLayout.java | 153 - java/gjt/Scroller.java | 154 - java/gjt/ScrollerLayout.java | 160 - java/gjt/SelectionEvent.java | 82 - java/gjt/Separator.java | 90 - java/gjt/SpringyImageButtonController.java | 54 - java/gjt/StateButton.java | 45 - java/gjt/StateButtonController.java | 27 - java/gjt/StickyImageButtonController.java | 87 - java/gjt/Stopwatch.java | 94 - java/gjt/StopwatchClient.java | 14 - java/gjt/ThreeDBorder.java | 53 - java/gjt/ThreeDBorderStyle.java | 24 - java/gjt/ThreeDRectangle.java | 105 - java/gjt/Toolbar.java | 58 - java/gjt/Util.java | 69 - java/gjt/YesNoDialog.java | 80 - java/gjt/animation/CollisionArena.java | 39 - java/gjt/animation/CollisionDetector.java | 24 - java/gjt/animation/EdgeCollisionDetector.java | 53 - java/gjt/animation/Playfield.java | 140 - java/gjt/animation/Sequence.java | 119 - java/gjt/animation/Sprite.java | 191 - java/gjt/animation/SpriteCollisionDetector.java | 45 - java/gjt/image/BleachImageFilter.java | 53 - java/gjt/image/DissolveFilter.java | 48 - java/gjt/image/ImageDissolver.java | 132 - java/gjt/rubberband/Rubberband.java | 100 - java/gjt/rubberband/RubberbandEllipse.java | 32 - java/gjt/rubberband/RubberbandLine.java | 25 - java/gjt/rubberband/RubberbandPanel.java | 38 - java/gjt/rubberband/RubberbandRectangle.java | 29 - java/gjt/test/AttributesPanel.java | 78 - java/gjt/test/BargaugeTest.java | 130 - java/gjt/test/BleachImageFilterTest.java | 86 - java/gjt/test/BorderTest.java | 202 - java/gjt/test/BoxTest.java | 100 - java/gjt/test/BumpAnimationTest.java | 107 - java/gjt/test/ChoiceCardPanelTest.java | 34 - java/gjt/test/ColumnLayoutTest.java | 126 - java/gjt/test/ComponentScrollerTest.java | 205 - java/gjt/test/ConnectionsPanel.java | 9 - java/gjt/test/DialogTest.java | 140 - java/gjt/test/DrawnRectangleTest.java | 119 - java/gjt/test/FontDialogTest.java | 95 - java/gjt/test/IconCardPanelTest.java | 47 - java/gjt/test/ImageButtonTest.java | 130 - java/gjt/test/ImageDissolverTest.java | 69 - java/gjt/test/ImageScrollerTest.java | 55 - java/gjt/test/LabelCanvasTest.java | 75 - java/gjt/test/MessageDialogTest.java | 50 - java/gjt/test/OccupationOracle.java | 334 - java/gjt/test/RowLayoutTest.java | 124 - java/gjt/test/RubberbandTest.java | 112 - java/gjt/test/SeparatorTest.java | 64 - java/gjt/test/SimpleAnimationTest.java | 87 - java/gjt/test/SimpleBargaugeTest.java | 61 - java/gjt/test/StateButtonTest.java | 41 - java/gjt/test/TenPixelBorder.java | 44 - java/gjt/test/TitledPanel.java | 22 - java/gjt/test/ToolbarTest.java | 111 - java/gjt/test/TwoDrinkersAnimationTest.java | 130 - java/gjt/test/UnitTest.java | 46 - java/java-ace.gif | Bin 11028 -> 0 bytes java/netsvcs/Logger/DefaultLMR.java | 36 - java/netsvcs/Logger/LogMessageReceiver.java | 33 - java/netsvcs/Logger/LogRecord.java | 188 - java/netsvcs/Logger/Makefile | 23 - java/netsvcs/Logger/ServerLoggingAcceptor.java | 171 - java/netsvcs/Logger/ServerLoggingHandler.java | 105 - java/netsvcs/Naming/Makefile | 24 - java/netsvcs/Naming/NameAcceptor.java | 306 - java/netsvcs/Naming/NameHandler.java | 521 - java/netsvcs/Naming/NameProxy.java | 351 - java/netsvcs/Naming/NameReply.java | 145 - java/netsvcs/Naming/NameRequest.java | 331 - java/netsvcs/Time/Clerk.java | 23 - java/netsvcs/Time/Makefile | 26 - java/netsvcs/Time/Server.java | 23 - java/netsvcs/Time/TSClerkHandler.java | 296 - java/netsvcs/Time/TSClerkProcessor.java | 267 - java/netsvcs/Time/TSRequestAcceptor.java | 142 - java/netsvcs/Time/TSRequestHandler.java | 106 - java/netsvcs/Time/TSServerAcceptor.java | 100 - java/netsvcs/Time/TSServerHandler.java | 99 - java/src/ACE.java | 164 - java/src/AcceptStrategy.java | 89 - java/src/Acceptor.java | 216 - java/src/ActivateStrategy.java | 43 - java/src/AddServiceObjectNode.java | 54 - java/src/Blob.java | 94 - java/src/BlobHandler.java | 35 - java/src/BlobReader.java | 104 - java/src/BlobWriter.java | 220 - java/src/ClassNameGenerator.java | 181 - java/src/ClassReader.java | 146 - java/src/Condition.java | 122 - java/src/Connector.java | 157 - java/src/CreationStrategy.java | 64 - java/src/EventHandler.java | 53 - java/src/GetOpt.java | 150 - java/src/HTTPHelper.java | 84 - java/src/INETAddr.java | 99 - java/src/IOCntlCmds.java | 34 - java/src/IOCntlMsg.java | 128 - java/src/JACE.DSP | 292 - java/src/JACE.DSW | 29 - java/src/Makefile | 153 - java/src/MessageBlock.java | 453 - java/src/MessageQueue.java | 639 - java/src/MessageType.java | 110 - java/src/Module.java | 253 - java/src/Mutex.java | 109 - java/src/OS.java | 72 - java/src/ParseNode.java | 69 - java/src/ProfileTimer.java | 48 - java/src/README | 19 - java/src/RWMutex.java | 174 - java/src/RemoveNode.java | 35 - java/src/ResumeNode.java | 34 - java/src/SOCKAcceptor.java | 115 - java/src/SOCKConnector.java | 75 - java/src/SOCKStream.java | 218 - java/src/Semaphore.java | 103 - java/src/ServiceConfig.java | 375 - java/src/ServiceLoader.java | 260 - java/src/ServiceObject.java | 80 - java/src/ServiceObjectRecord.java | 33 - java/src/ServiceRecord.java | 253 - java/src/ServiceRepository.java | 189 - java/src/StrategyAcceptor.java | 156 - java/src/Stream.java | 440 - java/src/StreamHead.java | 127 - java/src/StreamTail.java | 119 - java/src/SuspendNode.java | 34 - java/src/SvcHandler.java | 85 - java/src/Task.java | 439 - java/src/TaskFlags.java | 44 - java/src/ThreadManager.java | 109 - java/src/ThruTask.java | 48 - java/src/TimeValue.java | 285 - java/src/TimedWait.java | 150 - java/src/TimeoutException.java | 34 - java/src/TimerQueue.java | 432 - java/src/Token.java | 336 - java/tests/ASX/BufferStreamTest.dsp | 73 - java/tests/ASX/BufferStreamTest.java | 185 - java/tests/ASX/Makefile | 26 - java/tests/ASX/MessageQueueTest.dsp | 73 - java/tests/ASX/MessageQueueTest.java | 50 - java/tests/ASX/PriorityBufferTest.dsp | 73 - java/tests/ASX/PriorityBufferTest.java | 116 - java/tests/ASX/TaskTest.dsp | 72 - java/tests/ASX/TaskTest.java | 86 - java/tests/ASX/ThreadPoolTest.dsp | 73 - java/tests/ASX/ThreadPoolTest.java | 185 - java/tests/Concurrency/Condition/Condition.dsp | 88 - java/tests/Concurrency/Condition/Consumer.java | 73 - .../Concurrency/Condition/JoinableThreadGroup.java | 24 - java/tests/Concurrency/Condition/Makefile | 25 - java/tests/Concurrency/Condition/Producer.java | 67 - java/tests/Concurrency/Condition/QueueTest.java | 64 - .../Concurrency/Condition/SimpleMessageQueue.java | 86 - java/tests/Concurrency/Makefile | 23 - java/tests/Concurrency/MutexTest.dsp | 72 - java/tests/Concurrency/MutexTest.java | 154 - java/tests/Concurrency/RWMutexTest.dsp | 73 - java/tests/Concurrency/RWMutexTest.java | 93 - java/tests/Concurrency/SemaphoreTest.dsp | 73 - java/tests/Concurrency/SemaphoreTest.java | 102 - java/tests/Concurrency/TokenTest.dsp | 72 - java/tests/Concurrency/TokenTest.java | 73 - java/tests/Connection/AcceptorTest.dsp | 73 - java/tests/Connection/AcceptorTest.java | 79 - java/tests/Connection/ClientHandler.dsp | 73 - java/tests/Connection/ClientHandler.java | 77 - java/tests/Connection/ConnectorTest.dsp | 73 - java/tests/Connection/ConnectorTest.java | 76 - java/tests/Connection/HTTPHelperTest.java | 27 - java/tests/Connection/Makefile | 26 - java/tests/Connection/ServerHandler.dsp | 73 - java/tests/Connection/ServerHandler.java | 68 - java/tests/Misc/Makefile | 21 - java/tests/Misc/ParseArgsTest.dsp | 73 - java/tests/Misc/ParseArgsTest.java | 45 - java/tests/Reactor/Makefile | 22 - java/tests/Reactor/TimeValueTest.dsp | 73 - java/tests/Reactor/TimeValueTest.java | 50 - java/tests/Reactor/TimerQueueTest.dsp | 73 - java/tests/Reactor/TimerQueueTest.java | 80 - java/tests/SOCK_SAP/Makefile | 22 - java/tests/SOCK_SAP/SOCKAcceptorTest.dsp | 73 - java/tests/SOCK_SAP/SOCKAcceptorTest.java | 108 - java/tests/SOCK_SAP/SOCKConnectorTest.dsp | 73 - java/tests/SOCK_SAP/SOCKConnectorTest.java | 95 - java/tests/ServiceConfigurator/Makefile | 25 - .../ServiceConfigurator/ServiceConfigurator.dsp | 81 - java/tests/ServiceConfigurator/TestService.java | 52 - java/tests/ServiceConfigurator/reloadTest.java | 61 - java/tests/ServiceConfigurator/suspendTest.java | 80 - java/tests/ServiceConfigurator/suspendTest1.conf | 1 - java/tests/ServiceConfigurator/suspendTest2.conf | 1 - java/tests/ServiceConfigurator/suspendTest3.conf | 1 - java/tests/ServiceConfigurator/svc.conf | 1 - java/tests/Tests.dsw | 257 - java/tests/netsvcs/Logger/LoggerTest.java | 122 - java/tests/netsvcs/Logger/Makefile | 19 - java/tests/netsvcs/Naming/ClientTest.java | 117 - java/tests/netsvcs/Naming/Makefile | 21 - m4/ace.m4 | 579 - m4/acinclude.m4 | 803 - m4/compiler.m4 | 319 - m4/features.m4 | 626 - m4/platform.m4 | 324 - m4/subsets.m4 | 630 - m4/threads.m4 | 433 - man/Makefile.am | 16 - man/man3/Makefile.am | 25 - netsvcs/ACE-netsvcs.html | 879 - netsvcs/Makefile | 29 - netsvcs/Makefile.am | 16 - netsvcs/Makefile.bor | 7 - netsvcs/README | 20 - netsvcs/build.bor | 16 - netsvcs/clients/Logger/Logger.dsw | 41 - netsvcs/clients/Logger/Makefile | 137 - netsvcs/clients/Logger/Makefile.am | 29 - netsvcs/clients/Logger/Makefile.bor | 16 - netsvcs/clients/Logger/README | 18 - netsvcs/clients/Logger/direct_logging.cpp | 41 - netsvcs/clients/Logger/direct_logging.dsp | 94 - netsvcs/clients/Logger/indirect_logging.cpp | 50 - netsvcs/clients/Logger/indirect_logging.dsp | 94 - netsvcs/clients/Makefile | 19 - netsvcs/clients/Makefile.am | 18 - netsvcs/clients/Makefile.bor | 3 - netsvcs/clients/Naming/Client/Client.dsw | 44 - netsvcs/clients/Naming/Client/Client_Test.cpp | 647 - netsvcs/clients/Naming/Client/Client_Test.dsp | 97 - netsvcs/clients/Naming/Client/Client_Test.h | 13 - netsvcs/clients/Naming/Client/Makefile | 373 - netsvcs/clients/Naming/Client/Makefile.am | 36 - netsvcs/clients/Naming/Client/Makefile.bor | 8 - netsvcs/clients/Naming/Client/README | 123 - netsvcs/clients/Naming/Client/main.cpp | 79 - netsvcs/clients/Naming/Client/main.dsp | 93 - netsvcs/clients/Naming/Client/svc.conf | 7 - netsvcs/clients/Naming/Client/svc2.conf | 9 - .../clients/Naming/Dump_Restore/Dump_Restore.cpp | 462 - .../clients/Naming/Dump_Restore/Dump_Restore.dsp | 175 - .../clients/Naming/Dump_Restore/Dump_Restore.dsw | 53 - netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h | 86 - .../Naming/Dump_Restore/Dump_Restore_static.dsp | 113 - netsvcs/clients/Naming/Dump_Restore/Makefile | 371 - netsvcs/clients/Naming/Dump_Restore/Makefile.am | 33 - netsvcs/clients/Naming/Dump_Restore/Makefile.bor | 8 - netsvcs/clients/Naming/Dump_Restore/README | 66 - netsvcs/clients/Naming/Dump_Restore/createfile.cpp | 34 - netsvcs/clients/Naming/Dump_Restore/main.cpp | 26 - netsvcs/clients/Naming/Dump_Restore/main.dsp | 115 - netsvcs/clients/Naming/Makefile | 25 - netsvcs/clients/Naming/Makefile.am | 19 - netsvcs/clients/Naming/Makefile.bor | 3 - netsvcs/clients/README | 8 - netsvcs/clients/Tokens/Makefile | 26 - netsvcs/clients/Tokens/Makefile.am | 22 - netsvcs/clients/Tokens/Makefile.bor | 3 - netsvcs/clients/Tokens/README | 34 - netsvcs/clients/Tokens/collection/Makefile | 212 - netsvcs/clients/Tokens/collection/Makefile.am | 23 - netsvcs/clients/Tokens/collection/Makefile.bor | 5 - netsvcs/clients/Tokens/collection/README | 25 - netsvcs/clients/Tokens/collection/collection.cpp | 211 - netsvcs/clients/Tokens/collection/collection.dsp | 109 - netsvcs/clients/Tokens/collection/collection.dsw | 29 - netsvcs/clients/Tokens/collection/rw_locks.cpp | 174 - netsvcs/clients/Tokens/deadlock/Makefile | 213 - netsvcs/clients/Tokens/deadlock/Makefile.am | 24 - netsvcs/clients/Tokens/deadlock/Makefile.bor | 5 - netsvcs/clients/Tokens/deadlock/README | 98 - netsvcs/clients/Tokens/deadlock/deadlock.dsp | 112 - netsvcs/clients/Tokens/deadlock/deadlock.dsw | 29 - .../Tokens/deadlock/deadlock_detection_test.cpp | 341 - netsvcs/clients/Tokens/invariant/Makefile | 192 - netsvcs/clients/Tokens/invariant/Makefile.am | 24 - netsvcs/clients/Tokens/invariant/Makefile.bor | 5 - netsvcs/clients/Tokens/invariant/README | 27 - netsvcs/clients/Tokens/invariant/invariant.cpp | 197 - netsvcs/clients/Tokens/invariant/invariant.dsp | 99 - netsvcs/clients/Tokens/invariant/invariant.dsw | 29 - netsvcs/clients/Tokens/manual/Makefile | 47 - netsvcs/clients/Tokens/manual/Makefile.am | 28 - netsvcs/clients/Tokens/manual/Makefile.bor | 5 - netsvcs/clients/Tokens/manual/README | 67 - netsvcs/clients/Tokens/manual/manual.cpp | 380 - netsvcs/clients/Tokens/manual/manual.dsp | 97 - netsvcs/clients/Tokens/manual/manual.dsw | 29 - netsvcs/clients/Tokens/mutex/Makefile | 191 - netsvcs/clients/Tokens/mutex/Makefile.am | 25 - netsvcs/clients/Tokens/mutex/Makefile.bor | 5 - netsvcs/clients/Tokens/mutex/README | 23 - netsvcs/clients/Tokens/mutex/mutex.dsp | 97 - netsvcs/clients/Tokens/mutex/mutex.dsw | 29 - netsvcs/clients/Tokens/mutex/test_mutex.cpp | 143 - netsvcs/clients/Tokens/rw_lock/Makefile | 211 - netsvcs/clients/Tokens/rw_lock/Makefile.am | 24 - netsvcs/clients/Tokens/rw_lock/Makefile.bor | 5 - netsvcs/clients/Tokens/rw_lock/README | 40 - netsvcs/clients/Tokens/rw_lock/rw_lock.dsp | 98 - netsvcs/clients/Tokens/rw_lock/rw_lock.dsw | 29 - netsvcs/clients/Tokens/rw_lock/rw_locks.cpp | 253 - netsvcs/lib/Base_Optimizer.cpp | 29 - netsvcs/lib/Base_Optimizer.h | 52 - netsvcs/lib/Client_Logging_Handler.cpp | 555 - netsvcs/lib/Client_Logging_Handler.h | 104 - netsvcs/lib/Log_Message_Receiver.cpp | 180 - netsvcs/lib/Log_Message_Receiver.h | 215 - netsvcs/lib/Makefile | 1622 -- netsvcs/lib/Makefile.am | 57 - netsvcs/lib/Makefile.bor | 21 - netsvcs/lib/Name_Handler.cpp | 645 - netsvcs/lib/Name_Handler.h | 212 - netsvcs/lib/README | 267 - netsvcs/lib/Server_Logging_Handler.cpp | 251 - netsvcs/lib/Server_Logging_Handler.h | 97 - netsvcs/lib/Server_Logging_Handler_T.cpp | 361 - netsvcs/lib/Server_Logging_Handler_T.h | 205 - netsvcs/lib/TS_Clerk_Handler.cpp | 637 - netsvcs/lib/TS_Clerk_Handler.h | 251 - netsvcs/lib/TS_Server_Handler.cpp | 283 - netsvcs/lib/TS_Server_Handler.h | 116 - netsvcs/lib/Token_Handler.cpp | 674 - netsvcs/lib/Token_Handler.h | 263 - netsvcs/lib/netsvcs.dsp | 153 - netsvcs/lib/netsvcs.dsw | 29 - netsvcs/netsvcs.dsw | 167 - netsvcs/servers/Makefile | 303 - netsvcs/servers/Makefile.am | 26 - netsvcs/servers/Makefile.bor | 7 - netsvcs/servers/README | 35 - netsvcs/servers/main.cpp | 167 - netsvcs/servers/servers.dsp | 104 - netsvcs/servers/servers.dsw | 29 - netsvcs/servers/svc.conf | 18 - netsvcs/servers/svc.conf.xml | 32 - nightly.mwc | 7 - os-patches/linux-patches.html | 214 - os-patches/lynxos-patches.html | 93 - os-patches/vxworks-5.1.txt | 77 - performance-tests/Makefile | 36 - performance-tests/Makefile.bor | 11 - performance-tests/Misc/Makefile | 941 - performance-tests/Misc/basic_func.cpp | 49 - performance-tests/Misc/basic_func.h | 77 - performance-tests/Misc/basic_perf.bor | 20 - performance-tests/Misc/basic_perf.cpp | 644 - performance-tests/Misc/basic_perf.dsp | 168 - performance-tests/Misc/childbirth_time.bor | 19 - performance-tests/Misc/childbirth_time.cpp | 401 - performance-tests/Misc/childbirth_time.dsp | 104 - performance-tests/Misc/context_switch_time.bor | 19 - performance-tests/Misc/context_switch_time.cpp | 1316 -- performance-tests/Misc/context_switch_time.dsp | 160 - performance-tests/Misc/makefile.bor | 15 - performance-tests/Misc/misc.dsw | 89 - performance-tests/Misc/preempt.bor | 18 - performance-tests/Misc/preempt.cpp | 455 - performance-tests/Misc/test_guard.cpp | 114 - performance-tests/Misc/test_mutex.bor | 18 - performance-tests/Misc/test_mutex.cpp | 232 - performance-tests/Misc/test_mutex.dsp | 104 - performance-tests/Misc/test_naming.bor | 18 - performance-tests/Misc/test_naming.cpp | 190 - performance-tests/Misc/test_naming.dsp | 104 - performance-tests/Misc/test_singleton.bor | 18 - performance-tests/Misc/test_singleton.cpp | 181 - performance-tests/Misc/test_singleton.dsp | 104 - performance-tests/Misc/test_singleton.h | 24 - performance-tests/README | 16 - performance-tests/RPC/Makefile | 135 - performance-tests/RPC/README | 6 - performance-tests/RPC/client.cpp | 72 - performance-tests/RPC/ping.x | 12 - performance-tests/RPC/run_test.pl | 34 - performance-tests/RPC/server.c | 15 - performance-tests/SCTP/Makefile | 823 - performance-tests/SCTP/Options_Manager.cpp | 518 - performance-tests/SCTP/Options_Manager.h | 64 - performance-tests/SCTP/README | 46 - performance-tests/SCTP/README.SCTP | 0 performance-tests/SCTP/README.SCTP_PERF_TEST | 405 - performance-tests/SCTP/README.SCTP_in_ACE | 189 - performance-tests/SCTP/SCTP.dsw | 65 - performance-tests/SCTP/SOCK_SEQPACK_clt.cpp | 312 - performance-tests/SCTP/SOCK_SEQPACK_clt.dsp | 120 - performance-tests/SCTP/SOCK_SEQPACK_srv.cpp | 405 - performance-tests/SCTP/SOCK_SEQPACK_srv.dsp | 120 - performance-tests/SCTP/SOCK_STREAM_clt.cpp | 321 - performance-tests/SCTP/SOCK_STREAM_clt.dsp | 120 - performance-tests/SCTP/SOCK_STREAM_srv.cpp | 349 - performance-tests/SCTP/SOCK_STREAM_srv.dsp | 120 - performance-tests/SCTP/THANKS | 30 - performance-tests/SCTP/hist.cpp | 304 - performance-tests/SCTP/hist.h | 68 - performance-tests/SCTP/run_spectrum.config | 12 - performance-tests/SCTP/run_spectrum.pl | 257 - performance-tests/SCTP/sample-spectrum.png | Bin 5369 -> 0 bytes .../Server_Concurrency/Latency_Stats.h | 217 - .../Leader_Follower/Leader_Follower.dsp | 104 - .../Leader_Follower/Leader_Follower.dsw | 28 - .../Server_Concurrency/Leader_Follower/Makefile | 358 - .../Leader_Follower/RT_CORBA_Leader_Follower.cpp | 402 - .../Leader_Follower/RT_CORBA_Leader_Follower.h | 109 - .../Leader_Follower/leader_follower.cpp | 330 - .../Leader_Follower/makefile.bor | 17 - performance-tests/Server_Concurrency/Makefile | 24 - performance-tests/Server_Concurrency/Makefile.bor | 9 - .../Queue_Based_Workers/Makefile | 355 - .../Queue_Based_Workers/Queue_Based_Workers.dsp | 104 - .../Queue_Based_Workers/Queue_Based_Workers.dsw | 41 - .../Queue_Based_Workers/RT_CORBA_Workers.cpp | 599 - .../Queue_Based_Workers/RT_CORBA_Workers.dsp | 108 - .../Queue_Based_Workers/RT_CORBA_Workers.h | 166 - .../Queue_Based_Workers/makefile.bor | 17 - .../Queue_Based_Workers/workers.cpp | 421 - .../Server_Concurrency/Server_Concurrency.dsw | 41 - performance-tests/Server_Concurrency/run_test.sh | 13 - .../Synch-Benchmarks/Base_Test/Base_Test.dsp | 117 - .../Synch-Benchmarks/Base_Test/Baseline_Test.cpp | 225 - .../Synch-Benchmarks/Base_Test/Baseline_Test.h | 148 - .../Synch-Benchmarks/Base_Test/Baseline_Test.i | 43 - .../Synch-Benchmarks/Base_Test/Makefile | 343 - .../Synch-Benchmarks/Base_Test/base_test.cpp | 57 - .../Synch-Benchmarks/Base_Test/mutex_test.cpp | 234 - performance-tests/Synch-Benchmarks/Makefile | 52 - performance-tests/Synch-Benchmarks/Makefile.driver | 41 - .../Synch-Benchmarks/Makefile.synch_tests | 948 - .../Adaptive_Lock_Performance_Test_Base.cpp | 49 - .../Adaptive_Lock_Performance_Test_Base.h | 24 - .../Perf_Test/Benchmark_Performance.cpp | 59 - .../Perf_Test/Benchmark_Performance.h | 48 - .../Synch-Benchmarks/Perf_Test/Makefile | 2108 -- .../Synch-Benchmarks/Perf_Test/Perf_Test.dsp | 189 - .../Perf_Test/Performance_Test.cpp | 114 - .../Synch-Benchmarks/Perf_Test/Performance_Test.h | 25 - .../Perf_Test/Performance_Test_Options.cpp | 478 - .../Perf_Test/Performance_Test_Options.h | 133 - .../Perf_Test/Performance_Test_Options.i | 269 - .../Synch-Benchmarks/Perf_Test/README | 76 - .../Perf_Test/adaptive_mutex_test.cpp | 36 - .../Perf_Test/adaptive_recursive_lock_test.cpp | 36 - .../Perf_Test/adaptive_sema_test.cpp | 41 - .../Synch-Benchmarks/Perf_Test/condb_test.cpp | 70 - .../Synch-Benchmarks/Perf_Test/conds_test.cpp | 73 - .../Synch-Benchmarks/Perf_Test/context_test.cpp | 39 - .../Synch-Benchmarks/Perf_Test/guard_test.cpp | 123 - .../Synch-Benchmarks/Perf_Test/memory_test.cpp | 41 - .../Synch-Benchmarks/Perf_Test/mutex_test.cpp | 46 - .../Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp | 84 - .../Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp | 77 - .../Perf_Test/recursive_lock_test.cpp | 44 - .../Synch-Benchmarks/Perf_Test/rwrd_test.cpp | 45 - .../Synch-Benchmarks/Perf_Test/rwwr_test.cpp | 45 - .../Synch-Benchmarks/Perf_Test/sema_test.cpp | 45 - .../Synch-Benchmarks/Perf_Test/sysvsema_test.cpp | 67 - .../Synch-Benchmarks/Perf_Test/token_test.cpp | 46 - performance-tests/Synch-Benchmarks/README | 46 - .../Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp | 101 - .../Synch-Benchmarks/Synch_Lib/Benchmark_Base.h | 113 - .../Synch-Benchmarks/Synch_Lib/Makefile | 135 - .../Synch-Benchmarks/Synch_Lib/README | 4 - .../Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp | 101 - .../Synch-Benchmarks/Synch_Lib/export_mac.h | 36 - performance-tests/Synch-Benchmarks/Synch_Tests.dsw | 77 - performance-tests/Synch-Benchmarks/benchmarks | 19 - performance-tests/Synch-Benchmarks/context.c | 73 - performance-tests/Synch-Benchmarks/context.csh | 16 - performance-tests/Synch-Benchmarks/orig-results | 73 - .../Synch-Benchmarks/results/.no_prune | 1 - performance-tests/Synch-Benchmarks/run_tests.pl | 131 - .../Synch-Benchmarks/svcconf/base_acquire.conf | 20 - .../svcconf/base_acquire_read.conf | 20 - .../svcconf/base_acquire_write.conf | 20 - .../Synch-Benchmarks/svcconf/base_tryacquire.conf | 20 - .../svcconf/base_tryacquire_read.conf | 20 - .../svcconf/base_tryacquire_write.conf | 20 - .../Synch-Benchmarks/svcconf/perf_t1.conf | 32 - .../Synch-Benchmarks/svcconf/perf_t16.conf | 32 - .../Synch-Benchmarks/svcconf/perf_t2.conf | 32 - .../Synch-Benchmarks/svcconf/perf_t32.conf | 32 - .../Synch-Benchmarks/svcconf/perf_t4.conf | 32 - .../Synch-Benchmarks/svcconf/perf_t64.conf | 32 - .../Synch-Benchmarks/svcconf/perf_t8.conf | 32 - .../Synch-Benchmarks/svcconf/svc.conf | 29 - .../Synch-Benchmarks/synch_driver.cpp | 52 - .../Synch-Benchmarks/synch_driver.dsp | 112 - performance-tests/TCP/Makefile | 219 - performance-tests/TCP/README | 17 - performance-tests/TCP/TCP.dsp | 104 - performance-tests/TCP/TCP.dsw | 29 - performance-tests/TCP/makefile.bor | 17 - performance-tests/TCP/run_test.pl | 34 - performance-tests/TCP/tcp_test.cpp | 686 - performance-tests/TTCP/ACE-C++/How_to_run_tests | 29 - performance-tests/TTCP/ACE-C++/Makefile | 47 - performance-tests/TTCP/ACE-C++/run_test | 35 - .../TTCP/ACE-C++/wrapper-new-ttcp.cpp | 957 - performance-tests/TTCP/C/How_to_run_tests | 30 - performance-tests/TTCP/C/Makefile | 47 - performance-tests/TTCP/C/README | 35 - performance-tests/TTCP/C/new-ttcp.cpp | 970 - performance-tests/TTCP/C/run_test | 35 - performance-tests/TTCP/Makefile | 25 - performance-tests/UDP/Makefile | 172 - performance-tests/UDP/README | 17 - performance-tests/UDP/makefile.bor | 17 - performance-tests/UDP/run_test.pl | 34 - performance-tests/UDP/udp_test.cpp | 751 - performance-tests/UDP/udp_test.dsp | 102 - performance-tests/UDP/udp_test.dsw | 29 - protocols/ace/RMCast/Makefile | 2051 -- protocols/ace/RMCast/Makefile.bor | 44 - protocols/ace/RMCast/README | 57 - protocols/ace/RMCast/RMCast.cpp | 9 - protocols/ace/RMCast/RMCast.dsp | 389 - protocols/ace/RMCast/RMCast.dsw | 29 - protocols/ace/RMCast/RMCast.h | 261 - protocols/ace/RMCast/RMCast.i | 1 - protocols/ace/RMCast/RMCast_Ack_Worker.cpp | 25 - protocols/ace/RMCast/RMCast_Ack_Worker.h | 47 - protocols/ace/RMCast/RMCast_Ack_Worker.i | 12 - protocols/ace/RMCast/RMCast_Copy_On_Write.cpp | 199 - protocols/ace/RMCast/RMCast_Copy_On_Write.h | 212 - protocols/ace/RMCast/RMCast_Copy_On_Write.i | 34 - protocols/ace/RMCast/RMCast_Export.h | 44 - protocols/ace/RMCast/RMCast_Fork.cpp | 112 - protocols/ace/RMCast/RMCast_Fork.h | 55 - protocols/ace/RMCast/RMCast_Fork.i | 21 - protocols/ace/RMCast/RMCast_Fragment.cpp | 188 - protocols/ace/RMCast/RMCast_Fragment.h | 62 - protocols/ace/RMCast/RMCast_Fragment.i | 7 - protocols/ace/RMCast/RMCast_IO_UDP.cpp | 458 - protocols/ace/RMCast/RMCast_IO_UDP.h | 138 - protocols/ace/RMCast/RMCast_IO_UDP.i | 36 - protocols/ace/RMCast/RMCast_Membership.cpp | 184 - protocols/ace/RMCast/RMCast_Membership.h | 103 - protocols/ace/RMCast/RMCast_Membership.i | 8 - protocols/ace/RMCast/RMCast_Module.cpp | 102 - protocols/ace/RMCast/RMCast_Module.h | 88 - protocols/ace/RMCast/RMCast_Module.i | 7 - protocols/ace/RMCast/RMCast_Module_Factory.cpp | 13 - protocols/ace/RMCast/RMCast_Module_Factory.h | 71 - protocols/ace/RMCast/RMCast_Module_Factory.i | 1 - protocols/ace/RMCast/RMCast_Partial_Message.cpp | 215 - protocols/ace/RMCast/RMCast_Partial_Message.h | 102 - protocols/ace/RMCast/RMCast_Partial_Message.i | 15 - protocols/ace/RMCast/RMCast_Proxy.cpp | 46 - protocols/ace/RMCast/RMCast_Proxy.h | 102 - protocols/ace/RMCast/RMCast_Proxy.i | 8 - protocols/ace/RMCast/RMCast_Reassembly.cpp | 140 - protocols/ace/RMCast/RMCast_Reassembly.h | 73 - protocols/ace/RMCast/RMCast_Reassembly.i | 1 - protocols/ace/RMCast/RMCast_Receiver_Module.cpp | 157 - protocols/ace/RMCast/RMCast_Receiver_Module.h | 108 - protocols/ace/RMCast/RMCast_Receiver_Module.i | 7 - protocols/ace/RMCast/RMCast_Reliable_Factory.cpp | 54 - protocols/ace/RMCast/RMCast_Reliable_Factory.h | 60 - protocols/ace/RMCast/RMCast_Reliable_Factory.i | 8 - protocols/ace/RMCast/RMCast_Reordering.cpp | 178 - protocols/ace/RMCast/RMCast_Reordering.h | 96 - protocols/ace/RMCast/RMCast_Reordering.i | 8 - protocols/ace/RMCast/RMCast_Resend_Handler.cpp | 22 - protocols/ace/RMCast/RMCast_Resend_Handler.h | 44 - protocols/ace/RMCast/RMCast_Resend_Handler.i | 8 - protocols/ace/RMCast/RMCast_Resend_Worker.cpp | 31 - protocols/ace/RMCast/RMCast_Resend_Worker.h | 49 - protocols/ace/RMCast/RMCast_Resend_Worker.i | 12 - protocols/ace/RMCast/RMCast_Retransmission.cpp | 134 - protocols/ace/RMCast/RMCast_Retransmission.h | 120 - protocols/ace/RMCast/RMCast_Retransmission.i | 6 - protocols/ace/RMCast/RMCast_Sequencer.cpp | 25 - protocols/ace/RMCast/RMCast_Sequencer.h | 54 - protocols/ace/RMCast/RMCast_Sequencer.i | 7 - protocols/ace/RMCast/RMCast_Singleton_Factory.cpp | 24 - protocols/ace/RMCast/RMCast_Singleton_Factory.h | 61 - protocols/ace/RMCast/RMCast_Singleton_Factory.i | 8 - protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp | 36 - protocols/ace/RMCast/RMCast_UDP_Event_Handler.h | 59 - protocols/ace/RMCast/RMCast_UDP_Event_Handler.i | 8 - protocols/ace/RMCast/RMCast_UDP_Proxy.cpp | 186 - protocols/ace/RMCast/RMCast_UDP_Proxy.h | 88 - protocols/ace/RMCast/RMCast_UDP_Proxy.i | 7 - .../ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp | 32 - .../ace/RMCast/RMCast_UDP_Reliable_Receiver.h | 49 - .../ace/RMCast/RMCast_UDP_Reliable_Receiver.i | 7 - .../ace/RMCast/RMCast_UDP_Reliable_Sender.cpp | 70 - protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.h | 78 - protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.i | 19 - protocols/ace/RMCast/RMCast_Worker.cpp | 19 - protocols/ace/RMCast/RMCast_Worker.h | 36 - protocols/ace/RMCast/RMCast_Worker.i | 1 - psosim/Makefile | 76 - psosim/drv_conf.c | 80 - samwise/ChangeLog | 73 - samwise/PerlACE/MSProject.pm | 455 - samwise/PerlACE/MSProject/DSP.pm | 28 - samwise/PerlSam/Generator.pm | 482 - samwise/PerlSam/Generator/Automake.pm | 264 - samwise/PerlSam/Generator/Borland.pm | 383 - samwise/PerlSam/Generator/GNUMake.pm | 390 - samwise/PerlSam/Generator/MSVC6.pm | 847 - samwise/PerlSam/Generator/View.pm | 42 - samwise/PerlSam/Generator/VisualAge.pm | 118 - samwise/PerlSam/Parser.pm | 57 - samwise/PerlSam/Parser/Simple.pm | 331 - samwise/README.txt | 77 - samwise/TODO.txt | 258 - samwise/create_sam.pl | 940 - samwise/libs.xml | 48 - samwise/makeinclude/executable.GNU | 26 - samwise/makeinclude/library.GNU | 17 - samwise/makeinclude/macros.GNU | 8 - samwise/makeinclude/rules.common.GNU | 7 - samwise/makeinclude/rules.makefiles.GNU | 25 - samwise/makeinclude/rules.nomakefiles.GNU | 6 - samwise/makeinclude/vacpp_setup.icc | 28 - samwise/makeinclude/workspace.GNU | 10 - samwise/sam.dtd | 42 - samwise/sam.pl | 127 - tests/.cvsignore | 5 - tests/ACE_Init_Test.cpp | 129 - tests/ACE_Init_Test.dsp | 107 - tests/ACE_Init_Test.h | 59 - tests/ACE_Init_Test.ico | Bin 1078 -> 0 bytes tests/ACE_Init_Test.rc | 174 - tests/ACE_Init_Test.rc2 | 13 - tests/ACE_Init_TestDlg.cpp | 98 - tests/ACE_Init_TestDlg.h | 47 - tests/ACE_Init_Test_Resource.h | 19 - tests/ACE_Init_Test_StdAfx.h | 44 - tests/ACE_Test.cpp | 79 - tests/ACE_Test.dsp | 162 - tests/ARGV_Test.cpp | 53 - tests/ARGV_Test.dsp | 162 - tests/ARGV_Test.icc | 22 - tests/Aio_Platform_Test.cpp | 187 - tests/Aio_Platform_Test.icc | 22 - tests/Arg_Shifter_Test.cpp | 43 - tests/Arg_Shifter_Test.dsp | 161 - tests/Arg_Shifter_Test.icc | 22 - tests/Atomic_Op_Test.cpp | 223 - tests/Atomic_Op_Test.dsp | 158 - tests/Atomic_Op_Test.icc | 23 - tests/Auto_IncDec_Test.cpp | 156 - tests/Auto_IncDec_Test.dsp | 158 - tests/Auto_IncDec_Test.icc | 24 - tests/Barrier_Test.cpp | 105 - tests/Barrier_Test.dsp | 162 - tests/Barrier_Test.icc | 22 - tests/Basic_Types_Test.cpp | 172 - tests/Basic_Types_Test.dsp | 162 - tests/Basic_Types_Test.icc | 22 - tests/Bound_Ptr_Test.cpp | 567 - tests/Bound_Ptr_Test.dsp | 162 - tests/Bound_Ptr_Test.icc | 23 - tests/Buffer_Stream_Test.cpp | 234 - tests/Buffer_Stream_Test.dsp | 162 - tests/Buffer_Stream_Test.icc | 22 - tests/CDR_Array_Test.cpp | 1024 - tests/CDR_Array_Test.dsp | 150 - tests/CDR_Array_Test.icc | 22 - tests/CDR_File_Test.cpp | 462 - tests/CDR_File_Test.dsp | 162 - tests/CDR_File_Test.icc | 22 - tests/CDR_Test.cpp | 535 - tests/CDR_Test.dsp | 150 - tests/CDR_Test.icc | 23 - tests/CE_fostream.cpp | 149 - tests/CE_fostream.h | 106 - tests/CLASSIX/CLASSIX_Addr_Test.cpp | 116 - tests/CLASSIX/CLASSIX_Addr_Test.icc | 22 - tests/CLASSIX/CLASSIX_CLD_Connector_Test.cpp | 392 - tests/CLASSIX/CLASSIX_CLD_Connector_Test.icc | 22 - tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp | 373 - tests/CLASSIX/CLASSIX_Con_Acc_Test.h | 82 - tests/CLASSIX/CLASSIX_Con_Acc_Test.icc | 22 - tests/CLASSIX/CLASSIX_Group_Test.cpp | 85 - tests/CLASSIX/CLASSIX_Group_Test.icc | 22 - tests/CLASSIX/CLASSIX_Notify_Test.cpp | 267 - tests/CLASSIX/CLASSIX_Notify_Test.icc | 22 - tests/CLASSIX/CLASSIX_OS_Test.cpp | 43 - tests/CLASSIX/CLASSIX_OS_Test.icc | 22 - tests/CLASSIX/CLASSIX_Reactor_Test.cpp | 149 - tests/CLASSIX/CLASSIX_Reactor_Test.h | 57 - tests/CLASSIX/CLASSIX_Reactor_Test.icc | 22 - tests/CLASSIX/CLASSIX_Select_Reactor_Test.cpp | 166 - tests/CLASSIX/CLASSIX_Select_Reactor_Test.h | 56 - tests/CLASSIX/CLASSIX_Select_Reactor_Test.icc | 22 - tests/CLASSIX/CLASSIX_Stream_Test.cpp | 111 - tests/CLASSIX/CLASSIX_Stream_Test.icc | 22 - tests/CLASSIX/CLASSIX_test_config.h | 277 - tests/CLASSIX/Imakefile | 152 - tests/Cache_Map_Manager_Test.cpp | 705 - tests/Cache_Map_Manager_Test.dsp | 158 - tests/Cache_Map_Manager_Test.h | 38 - tests/Cache_Map_Manager_Test.icc | 30 - tests/Cached_Accept_Conn_Test.cpp | 736 - tests/Cached_Accept_Conn_Test.dsp | 166 - tests/Cached_Accept_Conn_Test.h | 147 - tests/Cached_Accept_Conn_Test.icc | 28 - tests/Cached_Allocator_Test.cpp | 272 - tests/Cached_Allocator_Test.dsp | 162 - tests/Cached_Allocator_Test.icc | 22 - tests/Cached_Conn_Test.cpp | 703 - tests/Cached_Conn_Test.dsp | 158 - tests/Cached_Conn_Test.h | 36 - tests/Cached_Conn_Test.icc | 22 - tests/Capabilities_Test.cpp | 117 - tests/Capabilities_Test.dsp | 166 - tests/Capabilities_Test.icc | 22 - tests/Codecs_Test.cpp | 123 - tests/Codecs_Test.dsp | 162 - tests/Codecs_Test.icc | 22 - tests/Collection_Test.cpp | 203 - tests/Collection_Test.dsp | 162 - tests/Collection_Test.h | 34 - tests/Collection_Test.icc | 22 - tests/Config_Test.cpp | 1420 -- tests/Config_Test.dsp | 166 - tests/Config_Test.h | 73 - tests/Config_Test.icc | 22 - tests/Config_Test.ini | 22 - tests/Config_Test_Import_1.ini | 5 - tests/Conn_Test.cpp | 880 - tests/Conn_Test.dsp | 166 - tests/Conn_Test.h | 61 - tests/Conn_Test.icc | 22 - tests/DLL_Test.bor | 17 - tests/DLL_Test.cpp | 157 - tests/DLL_Test.dsp | 162 - tests/DLL_Test.h | 56 - tests/DLL_Test.icc | 22 - tests/DLL_Test_Impl.cpp | 108 - tests/DLL_Test_Impl.dsp | 173 - tests/DLL_Test_Impl.h | 64 - tests/DLL_Test_Impl.icc | 25 - tests/DLList_Test.cpp | 120 - tests/DLList_Test.dsp | 162 - tests/DLList_Test.icc | 22 - tests/Date_Time_Test.cpp | 87 - tests/Date_Time_Test.dsp | 153 - tests/Date_Time_Test.icc | 22 - tests/Dev_Poll_Reactor_Test.cpp | 608 - tests/Dev_Poll_Reactor_Test.icc | 22 - tests/Dirent_Test.cpp | 146 - tests/Dirent_Test.dsp | 158 - tests/Dirent_Test.icc | 22 - tests/Dynamic_Priority_Test.cpp | 791 - tests/Dynamic_Priority_Test.dsp | 162 - tests/Dynamic_Priority_Test.icc | 22 - tests/Enum_Interfaces_Test.cpp | 74 - tests/Enum_Interfaces_Test.dsp | 162 - tests/Enum_Interfaces_Test.icc | 22 - tests/Env_Value_Test.cpp | 128 - tests/Env_Value_Test.dsp | 162 - tests/Env_Value_Test.icc | 22 - tests/FIFO_Test.cpp | 301 - tests/FIFO_Test.icc | 22 - tests/FlReactor_Test.cpp | 300 - tests/FlReactor_Test.icc | 22 - tests/Framework_Component_DLL.bor | 17 - tests/Framework_Component_DLL.cpp | 91 - tests/Framework_Component_DLL.dsp | 177 - tests/Framework_Component_DLL.h | 58 - tests/Framework_Component_DLL.icc | 25 - tests/Framework_Component_DLL_Export.h | 50 - tests/Framework_Component_Test.cpp | 121 - tests/Framework_Component_Test.dsp | 162 - tests/Framework_Component_Test.h | 39 - tests/Framework_Component_Test.icc | 22 - tests/Future_Set_Test.cpp | 644 - tests/Future_Set_Test.dsp | 162 - tests/Future_Set_Test.icc | 22 - tests/Future_Test.cpp | 643 - tests/Future_Test.dsp | 162 - tests/Future_Test.icc | 22 - tests/Get_Opt_Test.cpp | 321 - tests/Get_Opt_Test.dsp | 162 - tests/Get_Opt_Test.icc | 22 - tests/Handle_Set_Test.cpp | 260 - tests/Handle_Set_Test.dsp | 162 - tests/Handle_Set_Test.icc | 22 - tests/Hash_Map_Bucket_Iterator_Test.cpp | 136 - tests/Hash_Map_Bucket_Iterator_Test.dsp | 158 - tests/Hash_Map_Bucket_Iterator_Test.icc | 22 - tests/Hash_Map_Manager_Test.cpp | 261 - tests/Hash_Map_Manager_Test.dsp | 158 - tests/Hash_Map_Manager_Test.icc | 22 - tests/High_Res_Timer_Test.cpp | 175 - tests/High_Res_Timer_Test.dsp | 162 - tests/High_Res_Timer_Test.icc | 22 - tests/INET_Addr_Test.cpp | 198 - tests/INET_Addr_Test.dsp | 155 - tests/INET_Addr_Test.icc | 22 - tests/IOStream_Test.cpp | 510 - tests/IOStream_Test.dsp | 162 - tests/IOStream_Test.icc | 22 - tests/Lazy_Map_Manager_Test.cpp | 368 - tests/Lazy_Map_Manager_Test.dsp | 158 - tests/Lazy_Map_Manager_Test.icc | 22 - tests/Log_Msg_Test.cpp | 578 - tests/Log_Msg_Test.dsp | 146 - tests/Log_Msg_Test.icc | 22 - tests/Logging_Strategy_Test.cpp | 511 - tests/Logging_Strategy_Test.dsp | 146 - tests/Logging_Strategy_Test.icc | 22 - tests/MEM_Stream_Test.cpp | 543 - tests/MEM_Stream_Test.dsp | 162 - tests/MEM_Stream_Test.h | 58 - tests/MEM_Stream_Test.icc | 22 - tests/MM_Shared_Memory_Test.cpp | 229 - tests/MM_Shared_Memory_Test.dsp | 162 - tests/MM_Shared_Memory_Test.icc | 22 - tests/MT_Reactor_Timer_Test.cpp | 360 - tests/MT_Reactor_Timer_Test.dsp | 162 - tests/MT_Reactor_Timer_Test.h | 109 - tests/MT_Reactor_Timer_Test.icc | 22 - tests/MT_Reactor_Upcall_Test.cpp | 352 - tests/MT_Reactor_Upcall_Test.dsp | 162 - tests/MT_Reactor_Upcall_Test.icc | 22 - tests/MT_SOCK_Test.cpp | 362 - tests/MT_SOCK_Test.dsp | 146 - tests/MT_SOCK_Test.icc | 22 - tests/Makefile | 15819 --------------- tests/Makefile.DLL_Test | 55 - tests/Makefile.Framework_Component_DLL | 54 - tests/Makefile.Service_Config_DLL | 55 - tests/Makefile.am | 361 - tests/Makefile.bor | 146 - tests/Makefile.vac | 35 - tests/Malloc_Test.cpp | 447 - tests/Malloc_Test.dsp | 162 - tests/Malloc_Test.h | 44 - tests/Malloc_Test.icc | 22 - tests/Map_Manager_Test.cpp | 1027 - tests/Map_Manager_Test.dsp | 162 - tests/Map_Manager_Test.icc | 22 - tests/Map_Test.cpp | 483 - tests/Map_Test.dsp | 162 - tests/Map_Test.h | 150 - tests/Map_Test.icc | 22 - tests/Max_Default_Port_Test.cpp | 257 - tests/Max_Default_Port_Test.dsp | 162 - tests/Max_Default_Port_Test.h | 53 - tests/Max_Default_Port_Test.icc | 22 - tests/Mem_Map_Test.cpp | 241 - tests/Mem_Map_Test.dsp | 162 - tests/Mem_Map_Test.icc | 22 - tests/Message_Block_Test.cpp | 347 - tests/Message_Block_Test.dsp | 162 - tests/Message_Block_Test.icc | 22 - tests/Message_Queue_Notifications_Test.cpp | 365 - tests/Message_Queue_Notifications_Test.dsp | 162 - tests/Message_Queue_Notifications_Test.icc | 22 - tests/Message_Queue_Test.cpp | 527 - tests/Message_Queue_Test.dsp | 162 - tests/Message_Queue_Test.icc | 22 - tests/Message_Queue_Test_Ex.cpp | 356 - tests/Message_Queue_Test_Ex.dsp | 162 - tests/Message_Queue_Test_Ex.h | 42 - tests/Message_Queue_Test_Ex.icc | 22 - tests/Multicast_Test.cpp | 937 - tests/Multicast_Test.dsp | 162 - tests/Multicast_Test.icc | 22 - tests/Multihomed_INET_Addr_Test.cpp | 469 - tests/Multihomed_INET_Addr_Test.dsp | 155 - tests/Naming_Test.cpp | 258 - tests/Naming_Test.dsp | 162 - tests/Naming_Test.icc | 22 - tests/New_Fail_Test.cpp | 200 - tests/New_Fail_Test.dsp | 162 - tests/New_Fail_Test.icc | 22 - tests/Notify_Performance_Test.cpp | 255 - tests/Notify_Performance_Test.dsp | 146 - tests/Notify_Performance_Test.icc | 22 - tests/OS_Test.cpp | 725 - tests/OS_Test.dsp | 162 - tests/OS_Test.icc | 22 - tests/Object_Manager_Test.cpp | 117 - tests/Object_Manager_Test.dsp | 162 - tests/Object_Manager_Test.icc | 22 - tests/Obstack_Test.cpp | 116 - tests/Obstack_Test.dsp | 162 - tests/Obstack_Test.icc | 22 - tests/OrdMultiSet_Test.cpp | 233 - tests/OrdMultiSet_Test.dsp | 162 - tests/OrdMultiSet_Test.icc | 22 - tests/Pipe_Test.cpp | 157 - tests/Pipe_Test.dsp | 162 - tests/Pipe_Test.icc | 22 - tests/Priority_Buffer_Test.cpp | 184 - tests/Priority_Buffer_Test.dsp | 162 - tests/Priority_Buffer_Test.icc | 22 - tests/Priority_Reactor_Test.cpp | 425 - tests/Priority_Reactor_Test.dsp | 146 - tests/Priority_Reactor_Test.h | 76 - tests/Priority_Reactor_Test.icc | 22 - tests/Priority_Task_Test.cpp | 249 - tests/Priority_Task_Test.dsp | 162 - tests/Priority_Task_Test.icc | 22 - tests/Proactor_Scatter_Gather_Test.cpp | 1461 -- tests/Proactor_Scatter_Gather_Test.dsp | 162 - tests/Proactor_Scatter_Gather_Test.icc | 22 - tests/Proactor_Test.cpp | 2069 -- tests/Proactor_Test.dsp | 67 - tests/Proactor_Test.icc | 22 - tests/Proactor_Timer_Test.cpp | 246 - tests/Proactor_Timer_Test.dsp | 108 - tests/Proactor_Timer_Test.icc | 22 - tests/Process_Manager_Test.cpp | 314 - tests/Process_Manager_Test.dsp | 162 - tests/Process_Manager_Test.icc | 22 - tests/Process_Mutex_Test.cpp | 206 - tests/Process_Mutex_Test.dsp | 162 - tests/Process_Mutex_Test.icc | 22 - tests/Process_Strategy_Test.cpp | 726 - tests/Process_Strategy_Test.dsp | 162 - tests/Process_Strategy_Test.h | 144 - tests/Process_Strategy_Test.icc | 22 - tests/RB_Tree_Test.cpp | 664 - tests/RB_Tree_Test.dsp | 158 - tests/RB_Tree_Test.h | 112 - tests/RB_Tree_Test.icc | 22 - tests/README | 82 - tests/RMCast/Makefile | 1045 - tests/RMCast/Makefile.bor | 33 - tests/RMCast/RMCast_Fragment_Test.cpp | 301 - tests/RMCast/RMCast_Fragment_Test.dsp | 96 - tests/RMCast/RMCast_Membership_Test.cpp | 452 - tests/RMCast/RMCast_Membership_Test.dsp | 96 - tests/RMCast/RMCast_Reassembly_Test.cpp | 303 - tests/RMCast/RMCast_Reassembly_Test.dsp | 96 - tests/RMCast/RMCast_Reordering_Test.cpp | 317 - tests/RMCast/RMCast_Reordering_Test.dsp | 96 - tests/RMCast/RMCast_Retransmission_Test.cpp | 499 - tests/RMCast/RMCast_Retransmission_Test.dsp | 96 - tests/RMCast/RMCast_Tests.dsw | 89 - tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp | 267 - tests/RMCast/RMCast_UDP_Best_Effort_Test.dsp | 96 - tests/RMCast/tests.mpc | 60 - tests/Reactor_Dispatch_Order_Test.cpp | 182 - tests/Reactor_Dispatch_Order_Test.dsp | 162 - tests/Reactor_Dispatch_Order_Test.icc | 22 - tests/Reactor_Exceptions_Test.cpp | 230 - tests/Reactor_Exceptions_Test.dsp | 162 - tests/Reactor_Exceptions_Test.icc | 22 - tests/Reactor_Notify_Test.cpp | 500 - tests/Reactor_Notify_Test.dsp | 162 - tests/Reactor_Notify_Test.icc | 22 - tests/Reactor_Performance_Test.cpp | 454 - tests/Reactor_Performance_Test.dsp | 146 - tests/Reactor_Performance_Test.h | 63 - tests/Reactor_Performance_Test.icc | 22 - tests/Reactor_Timer_Test.cpp | 265 - tests/Reactor_Timer_Test.dsp | 162 - tests/Reactor_Timer_Test.icc | 22 - tests/Reactors_Test.cpp | 271 - tests/Reactors_Test.dsp | 162 - tests/Reactors_Test.icc | 22 - tests/Reader_Writer_Test.cpp | 300 - tests/Reader_Writer_Test.dsp | 162 - tests/Reader_Writer_Test.icc | 22 - tests/Recursive_Condition_Bug_Test.cpp | 183 - tests/Recursive_Condition_Bug_Test.dsp | 162 - tests/Recursive_Condition_Test.cpp | 309 - tests/Recursive_Condition_Test.dsp | 162 - tests/Recursive_Condition_Test.icc | 22 - tests/Recursive_Mutex_Test.cpp | 95 - tests/Recursive_Mutex_Test.dsp | 162 - tests/Recursive_Mutex_Test.icc | 22 - tests/Refcounted_Auto_Ptr_Test.cpp | 390 - tests/Refcounted_Auto_Ptr_Test.dsp | 162 - tests/Refcounted_Auto_Ptr_Test.h | 34 - tests/Refcounted_Auto_Ptr_Test.icc | 22 - tests/Reverse_Lock_Test.cpp | 55 - tests/Reverse_Lock_Test.dsp | 162 - tests/Reverse_Lock_Test.icc | 22 - tests/SOCK_Connector_Test.cpp | 311 - tests/SOCK_Connector_Test.dsp | 162 - tests/SOCK_Connector_Test.icc | 22 - tests/SOCK_SEQPACK_Association_Test.cpp | 153 - tests/SOCK_SEQPACK_Association_Test.dsp | 155 - tests/SOCK_Send_Recv_Test.cpp | 397 - tests/SOCK_Send_Recv_Test.dsp | 162 - tests/SOCK_Send_Recv_Test.icc | 22 - tests/SOCK_Test.cpp | 283 - tests/SOCK_Test.dsp | 162 - tests/SOCK_Test.icc | 22 - tests/SPIPE_Test.cpp | 221 - tests/SPIPE_Test.dsp | 162 - tests/SPIPE_Test.icc | 22 - tests/SSL/Makefile | 307 - tests/SSL/Makefile.bor | 24 - tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp | 368 - tests/SSL/Thread_Pool_Reactor_SSL_Test.h | 51 - tests/SSL/dummy.pem | 15 - tests/SSL/key.pem | 15 - tests/SSL/tests.mpc | 12 - tests/SString_Test.cpp | 272 - tests/SString_Test.dsp | 162 - tests/SString_Test.icc | 22 - tests/SV_Shared_Memory_Test.cpp | 197 - tests/SV_Shared_Memory_Test.dsp | 162 - tests/SV_Shared_Memory_Test.icc | 22 - tests/Semaphore_Test.cpp | 240 - tests/Semaphore_Test.dsp | 158 - tests/Semaphore_Test.icc | 22 - tests/Service_Config_DLL.bor | 17 - tests/Service_Config_DLL.cpp | 193 - tests/Service_Config_DLL.dsp | 118 - tests/Service_Config_DLL.h | 68 - tests/Service_Config_DLL.icc | 25 - tests/Service_Config_DLL_Export.h | 34 - tests/Service_Config_Test.UTF-16.conf | Bin 2006 -> 0 bytes tests/Service_Config_Test.UTF-16.conf.xml | Bin 2874 -> 0 bytes tests/Service_Config_Test.conf | 19 - tests/Service_Config_Test.conf.xml | 27 - tests/Service_Config_Test.cpp | 184 - tests/Service_Config_Test.dsp | 108 - tests/Service_Config_Test.icc | 22 - tests/Signal_Test.cpp | 489 - tests/Signal_Test.icc | 22 - tests/Sigset_Ops_Test.cpp | 130 - tests/Sigset_Ops_Test.dsp | 162 - tests/Sigset_Ops_Test.icc | 22 - tests/Simple_Message_Block_Test.cpp | 217 - tests/Simple_Message_Block_Test.dsp | 162 - tests/Simple_Message_Block_Test.icc | 22 - tests/Svc_Handler_Test.cpp | 161 - tests/Svc_Handler_Test.dsp | 162 - tests/Svc_Handler_Test.icc | 22 - tests/TP_Reactor_Test.cpp | 1256 -- tests/TP_Reactor_Test.dsp | 67 - tests/TP_Reactor_Test.h | 201 - tests/TP_Reactor_Test.icc | 22 - tests/TSS_Test.cpp | 302 - tests/TSS_Test.dsp | 166 - tests/TSS_Test.icc | 22 - tests/TSS_Test_Errno.h | 76 - tests/Task_Test.cpp | 130 - tests/Task_Test.dsp | 162 - tests/Task_Test.icc | 22 - tests/Thread_Manager_Test.cpp | 441 - tests/Thread_Manager_Test.dsp | 162 - tests/Thread_Manager_Test.icc | 22 - tests/Thread_Mutex_Test.cpp | 275 - tests/Thread_Mutex_Test.dsp | 162 - tests/Thread_Mutex_Test.icc | 22 - tests/Thread_Pool_Reactor_Resume_Test.cpp | 418 - tests/Thread_Pool_Reactor_Resume_Test.dsp | 158 - tests/Thread_Pool_Reactor_Resume_Test.h | 67 - tests/Thread_Pool_Reactor_Resume_Test.icc | 22 - tests/Thread_Pool_Reactor_Test.cpp | 358 - tests/Thread_Pool_Reactor_Test.dsp | 158 - tests/Thread_Pool_Reactor_Test.h | 50 - tests/Thread_Pool_Reactor_Test.icc | 22 - tests/Thread_Pool_Test.cpp | 461 - tests/Thread_Pool_Test.dsp | 162 - tests/Thread_Pool_Test.icc | 22 - tests/Time_Service_Test.cpp | 124 - tests/Time_Service_Test.dsp | 162 - tests/Time_Service_Test.icc | 22 - tests/Time_Value_Test.cpp | 225 - tests/Time_Value_Test.dsp | 162 - tests/Time_Value_Test.icc | 22 - tests/Timeprobe_Test.cpp | 129 - tests/Timeprobe_Test.dsp | 162 - tests/Timeprobe_Test.icc | 22 - tests/Timer_Queue_Test.cpp | 605 - tests/Timer_Queue_Test.dsp | 162 - tests/Timer_Queue_Test.icc | 22 - tests/TkReactor_Test.cpp | 343 - tests/TkReactor_Test.icc | 22 - tests/TkReactor_Test.tcl | 15 - tests/Token_Strategy_Test.cpp | 265 - tests/Token_Strategy_Test.dsp | 162 - tests/Token_Strategy_Test.icc | 22 - tests/Tokens_Test.cpp | 315 - tests/Tokens_Test.dsp | 162 - tests/Tokens_Test.icc | 22 - tests/UNIXclerk.conf | 3 - tests/UNIXserver.conf | 7 - tests/UNIXtokens.conf | 5 - tests/UPIPE_SAP_Test.cpp | 202 - tests/UPIPE_SAP_Test.dsp | 162 - tests/UPIPE_SAP_Test.icc | 22 - tests/Unbounded_Set_Test.cpp | 169 - tests/Unbounded_Set_Test.icc | 22 - tests/Unbounded_Set_Test_Ex.cpp | 163 - tests/Unbounded_Set_Test_Ex.dsp | 162 - tests/Unbounded_Set_Test_Ex.h | 37 - tests/Unbounded_Set_Test_Ex.icc | 21 - tests/Upgradable_RW_Test.cpp | 512 - tests/Upgradable_RW_Test.dsp | 162 - tests/Upgradable_RW_Test.h | 147 - tests/Upgradable_RW_Test.icc | 22 - tests/Vector_Test.cpp | 109 - tests/Vector_Test.dsp | 162 - tests/Vector_Test.icc | 22 - tests/Win32clerk.conf | 3 - tests/Win32server.conf | 10 - tests/Win32tokens.conf | 4 - tests/XtReactor_Test.cpp | 362 - tests/XtReactor_Test.icc | 22 - tests/icc.bat | 80 - tests/libDLL_Test.icc | 27 - tests/libService_Config_DLL.icc | 27 - tests/log/.cvsignore | 1 - tests/log/Makefile.am | 81 - tests/makeicc.pl | 42 - tests/pharlap/Atomic_Op_Test.dsp | 74 - tests/pharlap/Auto_IncDec_Test.dsp | 74 - tests/pharlap/Barrier_Test.dsp | 78 - tests/pharlap/Basic_Types_Test.dsp | 78 - tests/pharlap/Buffer_Stream_Test.dsp | 78 - tests/pharlap/CDR_File_Test.dsp | 78 - tests/pharlap/CDR_Test.dsp | 66 - tests/pharlap/Cache_Map_Manager_Test.dsp | 74 - tests/pharlap/Cached_Accept_Conn_Test.dsp | 82 - tests/pharlap/Cached_Conn_Test.dsp | 74 - tests/pharlap/Capabilities_Test.dsp | 82 - tests/pharlap/Collection_Test.dsp | 78 - tests/pharlap/Conn_Test.dsp | 82 - tests/pharlap/DLList_Test.dsp | 78 - tests/pharlap/Dynamic_Priority_Test.dsp | 78 - tests/pharlap/Enum_Interfaces_Test.dsp | 78 - tests/pharlap/Env_Value_Test.dsp | 78 - tests/pharlap/Future_Set_Test.dsp | 78 - tests/pharlap/Future_Test.dsp | 78 - tests/pharlap/Handle_Set_Test.dsp | 78 - tests/pharlap/Hash_Map_Bucket_Iterator_Test.dsp | 74 - tests/pharlap/Hash_Map_Manager_Test.dsp | 74 - tests/pharlap/High_Res_Timer_Test.dsp | 78 - tests/pharlap/IOStream_Test.dsp | 78 - tests/pharlap/Lazy_Map_Manager_Test.dsp | 74 - tests/pharlap/MM_Shared_Memory_Test.dsp | 78 - tests/pharlap/MT_Reactor_Timer_Test.dsp | 78 - tests/pharlap/MT_SOCK_Test.dsp | 62 - tests/pharlap/Malloc_Test.dsp | 78 - tests/pharlap/Map_Manager_Test.dsp | 78 - tests/pharlap/Map_Test.dsp | 78 - tests/pharlap/Mem_Map_Test.dsp | 78 - tests/pharlap/Message_Block_Test.dsp | 78 - tests/pharlap/Message_Queue_Notifications_Test.dsp | 78 - tests/pharlap/Message_Queue_Test.dsp | 78 - tests/pharlap/Naming_Test.dsp | 78 - tests/pharlap/New_Fail_Test.dsp | 78 - tests/pharlap/Notify_Performance_Test.dsp | 62 - tests/pharlap/Object_Manager_Test.dsp | 78 - tests/pharlap/OrdMultiSet_Test.dsp | 78 - tests/pharlap/Pipe_Test.dsp | 78 - tests/pharlap/Priority_Buffer_Test.dsp | 78 - tests/pharlap/Priority_Reactor_Test.dsp | 62 - tests/pharlap/Priority_Task_Test.dsp | 78 - tests/pharlap/Process_Manager_Test.dsp | 78 - tests/pharlap/Process_Mutex_Test.dsp | 78 - tests/pharlap/Process_Strategy_Test.dsp | 78 - tests/pharlap/RB_Tree_Test.dsp | 74 - tests/pharlap/Reactor_Exceptions_Test.dsp | 78 - tests/pharlap/Reactor_Notify_Test.dsp | 78 - tests/pharlap/Reactor_Performance_Test.dsp | 62 - tests/pharlap/Reactor_Timer_Test.dsp | 78 - tests/pharlap/Reactors_Test.dsp | 78 - tests/pharlap/Reader_Writer_Test.dsp | 78 - tests/pharlap/Recursive_Mutex_Test.dsp | 78 - tests/pharlap/Reverse_Lock_Test.dsp | 78 - tests/pharlap/SOCK_Connector_Test.dsp | 78 - tests/pharlap/SOCK_Send_Recv_Test.dsp | 78 - tests/pharlap/SOCK_Test.dsp | 78 - tests/pharlap/SPIPE_Test.dsp | 78 - tests/pharlap/SString_Test.dsp | 78 - tests/pharlap/SV_Shared_Memory_Test.dsp | 78 - tests/pharlap/Semaphore_Test.dsp | 74 - tests/pharlap/Service_Config_Test.dsp | 78 - tests/pharlap/Sigset_Ops_Test.dsp | 78 - tests/pharlap/Simple_Message_Block_Test.dsp | 78 - tests/pharlap/Svc_Handler_Test.dsp | 78 - tests/pharlap/TSS_Test.dsp | 82 - tests/pharlap/Task_Test.dsp | 78 - tests/pharlap/Thread_Manager_Test.dsp | 78 - tests/pharlap/Thread_Mutex_Test.dsp | 78 - tests/pharlap/Thread_Pool_Reactor_Test.dsp | 74 - tests/pharlap/Thread_Pool_Test.dsp | 78 - tests/pharlap/Time_Service_Test.dsp | 78 - tests/pharlap/Time_Value_Test.dsp | 78 - tests/pharlap/Timeprobe_Test.dsp | 78 - tests/pharlap/Timer_Queue_Test.dsp | 78 - tests/pharlap/Tokens_Test.dsp | 78 - tests/pharlap/UPIPE_SAP_Test.dsp | 78 - tests/pharlap/Upgradable_RW_Test.dsp | 78 - tests/pharlap/pharlap_tests.dsw | 977 - tests/pharlap/run_pharlap_tests.bat | 130 - tests/rtems_init.c | 210 - tests/run_test.lst | 134 - tests/run_test.pl | 399 - tests/run_tests.bat | 223 - tests/run_tests.check | 41 - tests/run_tests.psosim | 200 - tests/run_tests_remote.sh | 246 - tests/test_config.h | 322 - tests/tests.dsw | 1453 -- tests/tests.icp | 562 - tests/tests.mpc | 1151 -- tests/tests.mwc | 4 - tests/tests_pharlap_msvc.lnk | 72 - tests/vacpp_setup.icc | 31 - vc7_nightly.mwc | 7 - websvcs/Makefile | 24 - websvcs/README | 11 - websvcs/lib/Makefile | 106 - websvcs/lib/URL_Addr.cpp | 947 - websvcs/lib/URL_Addr.h | 404 - websvcs/lib/URL_Addr.i | 152 - websvcs/lib/websvcs.dsp | 121 - websvcs/lib/websvcs.dsw | 29 - websvcs/lib/websvcs_export.h | 44 - websvcs/tests/Makefile | 103 - websvcs/tests/Test_URL_Addr.cpp | 217 - websvcs/tests/Test_URL_Addr.dsp | 100 - websvcs/tests/tests.dsw | 29 - websvcs/websvcs.dsw | 41 - 5714 files changed, 1145728 deletions(-) delete mode 100644 ACE-INSTALL.html delete mode 100644 ACE-install.sh delete mode 100644 ACEXML/ACEXML.dsw delete mode 100644 ACEXML/Makefile delete mode 100644 ACEXML/Makefile.bor delete mode 100644 ACEXML/README delete mode 100644 ACEXML/apps/Makefile delete mode 100644 ACEXML/apps/Makefile.bor delete mode 100644 ACEXML/apps/XML_Apps.dsw delete mode 100644 ACEXML/apps/svcconf/Makefile delete mode 100644 ACEXML/apps/svcconf/Makefile.bor delete mode 100644 ACEXML/apps/svcconf/README delete mode 100644 ACEXML/apps/svcconf/Svcconf.cpp delete mode 100644 ACEXML/apps/svcconf/Svcconf.h delete mode 100644 ACEXML/apps/svcconf/Svcconf_Handler.cpp delete mode 100644 ACEXML/apps/svcconf/Svcconf_Handler.h delete mode 100644 ACEXML/apps/svcconf/Svcconf_Handler.i delete mode 100644 ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp delete mode 100644 ACEXML/apps/svcconf/svcconf.mpc delete mode 100644 ACEXML/common/ACEXML_Export.h delete mode 100644 ACEXML/common/Attributes.h delete mode 100644 ACEXML/common/AttributesImpl.cpp delete mode 100644 ACEXML/common/AttributesImpl.h delete mode 100644 ACEXML/common/AttributesImpl.i delete mode 100644 ACEXML/common/Attributes_Def_Builder.cpp delete mode 100644 ACEXML/common/Attributes_Def_Builder.h delete mode 100644 ACEXML/common/CharStream.cpp delete mode 100644 ACEXML/common/CharStream.h delete mode 100644 ACEXML/common/ContentHandler.h delete mode 100644 ACEXML/common/DTDHandler.h delete mode 100644 ACEXML/common/DTD_Manager.cpp delete mode 100644 ACEXML/common/DTD_Manager.h delete mode 100644 ACEXML/common/DefaultHandler.cpp delete mode 100644 ACEXML/common/DefaultHandler.h delete mode 100644 ACEXML/common/DefaultHandler.i delete mode 100644 ACEXML/common/Element_Def_Builder.cpp delete mode 100644 ACEXML/common/Element_Def_Builder.h delete mode 100644 ACEXML/common/Encoding.cpp delete mode 100644 ACEXML/common/Encoding.h delete mode 100644 ACEXML/common/EntityResolver.h delete mode 100644 ACEXML/common/Env.cpp delete mode 100644 ACEXML/common/Env.h delete mode 100644 ACEXML/common/Env.i delete mode 100644 ACEXML/common/ErrorHandler.h delete mode 100644 ACEXML/common/Exception.cpp delete mode 100644 ACEXML/common/Exception.h delete mode 100644 ACEXML/common/Exception.i delete mode 100644 ACEXML/common/FileCharStream.cpp delete mode 100644 ACEXML/common/FileCharStream.h delete mode 100644 ACEXML/common/HttpCharStream.cpp delete mode 100644 ACEXML/common/HttpCharStream.h delete mode 100644 ACEXML/common/InputSource.cpp delete mode 100644 ACEXML/common/InputSource.h delete mode 100644 ACEXML/common/Locator.h delete mode 100644 ACEXML/common/LocatorImpl.cpp delete mode 100644 ACEXML/common/LocatorImpl.h delete mode 100644 ACEXML/common/LocatorImpl.i delete mode 100644 ACEXML/common/Makefile delete mode 100644 ACEXML/common/Makefile.bor delete mode 100644 ACEXML/common/Mem_Map_Stream.cpp delete mode 100644 ACEXML/common/Mem_Map_Stream.h delete mode 100644 ACEXML/common/NamespaceSupport.cpp delete mode 100644 ACEXML/common/NamespaceSupport.h delete mode 100644 ACEXML/common/NamespaceSupport.i delete mode 100644 ACEXML/common/SAXExceptions.cpp delete mode 100644 ACEXML/common/SAXExceptions.h delete mode 100644 ACEXML/common/SAXExceptions.i delete mode 100644 ACEXML/common/StrCharStream.cpp delete mode 100644 ACEXML/common/StrCharStream.h delete mode 100644 ACEXML/common/StreamFactory.cpp delete mode 100644 ACEXML/common/StreamFactory.h delete mode 100644 ACEXML/common/Transcode.cpp delete mode 100644 ACEXML/common/Transcode.h delete mode 100644 ACEXML/common/Transcode.i delete mode 100644 ACEXML/common/URL_Addr.cpp delete mode 100644 ACEXML/common/URL_Addr.h delete mode 100644 ACEXML/common/URL_Addr.inl delete mode 100644 ACEXML/common/Validator.cpp delete mode 100644 ACEXML/common/Validator.h delete mode 100644 ACEXML/common/XMLFilter.h delete mode 100644 ACEXML/common/XMLFilterImpl.cpp delete mode 100644 ACEXML/common/XMLFilterImpl.h delete mode 100644 ACEXML/common/XMLFilterImpl.i delete mode 100644 ACEXML/common/XMLReader.h delete mode 100644 ACEXML/common/XML_Codecs.cpp delete mode 100644 ACEXML/common/XML_Codecs.h delete mode 100644 ACEXML/common/XML_Common.dsp delete mode 100644 ACEXML/common/XML_Macros.h delete mode 100644 ACEXML/common/XML_Types.h delete mode 100644 ACEXML/common/common.mpc delete mode 100644 ACEXML/docs/TODO.txt delete mode 100644 ACEXML/docs/bugs.txt delete mode 100644 ACEXML/docs/guidelines.txt delete mode 100644 ACEXML/docs/parser_features.txt delete mode 100644 ACEXML/docs/readme.txt delete mode 100644 ACEXML/examples/Makefile delete mode 100644 ACEXML/examples/Makefile.bor delete mode 100644 ACEXML/examples/SAXPrint/Makefile delete mode 100644 ACEXML/examples/SAXPrint/Makefile.bor delete mode 100644 ACEXML/examples/SAXPrint/Print_Handler.cpp delete mode 100644 ACEXML/examples/SAXPrint/Print_Handler.h delete mode 100644 ACEXML/examples/SAXPrint/Print_Handler.i delete mode 100644 ACEXML/examples/SAXPrint/SAXPrint.dsp delete mode 100644 ACEXML/examples/SAXPrint/SAXPrint.dsw delete mode 100644 ACEXML/examples/SAXPrint/SAXPrint.mpc delete mode 100644 ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp delete mode 100644 ACEXML/examples/SAXPrint/SAXPrint_Handler.h delete mode 100644 ACEXML/examples/SAXPrint/SAXPrint_Handler.i delete mode 100644 ACEXML/examples/SAXPrint/broken.xml delete mode 100644 ACEXML/examples/SAXPrint/main.cpp delete mode 100644 ACEXML/examples/SAXPrint/ns.svc.conf.xml delete mode 100644 ACEXML/examples/SAXPrint/simple.svcconf.xml delete mode 100644 ACEXML/examples/SAXPrint/svc.conf.xml delete mode 100644 ACEXML/examples/svcconf/Makefile.bor delete mode 100644 ACEXML/examples/svcconf/README delete mode 100644 ACEXML/examples/svcconf/Svcconf.dsp delete mode 100644 ACEXML/examples/svcconf/Svcconf.dsw delete mode 100644 ACEXML/examples/svcconf/Svcconf_Handler.cpp delete mode 100644 ACEXML/examples/svcconf/Svcconf_Handler.h delete mode 100644 ACEXML/examples/svcconf/Svcconf_Handler.i delete mode 100644 ACEXML/examples/svcconf/main.cpp delete mode 100644 ACEXML/examples/test_docs/svcconf.dtd delete mode 100644 ACEXML/parser/Makefile delete mode 100644 ACEXML/parser/Makefile.bor delete mode 100644 ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp delete mode 100644 ACEXML/parser/debug_validator/Debug_Attributes_Builder.h delete mode 100644 ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp delete mode 100644 ACEXML/parser/debug_validator/Debug_DTD_Manager.h delete mode 100644 ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h delete mode 100644 ACEXML/parser/debug_validator/Debug_Element_Builder.cpp delete mode 100644 ACEXML/parser/debug_validator/Debug_Element_Builder.h delete mode 100644 ACEXML/parser/debug_validator/Debug_Validator.dsp delete mode 100644 ACEXML/parser/debug_validator/Element_Tree.cpp delete mode 100644 ACEXML/parser/debug_validator/Element_Tree.h delete mode 100644 ACEXML/parser/debug_validator/Element_Tree.i delete mode 100644 ACEXML/parser/debug_validator/Makefile.bor delete mode 100644 ACEXML/parser/parser/Entity_Manager.cpp delete mode 100644 ACEXML/parser/parser/Entity_Manager.h delete mode 100644 ACEXML/parser/parser/Entity_Manager.i delete mode 100644 ACEXML/parser/parser/Makefile delete mode 100644 ACEXML/parser/parser/Makefile.bor delete mode 100644 ACEXML/parser/parser/Parser.cpp delete mode 100644 ACEXML/parser/parser/Parser.dsp delete mode 100644 ACEXML/parser/parser/Parser.dsw delete mode 100644 ACEXML/parser/parser/Parser.h delete mode 100644 ACEXML/parser/parser/Parser.i delete mode 100644 ACEXML/parser/parser/Parser_export.h delete mode 100644 ACEXML/parser/parser/parser.mpc delete mode 100644 ACEXML/tests/ContentHandler_Test.cpp delete mode 100644 ACEXML/tests/ContentHandler_Test.dsp delete mode 100644 ACEXML/tests/HttpCharStream_Test.cpp delete mode 100644 ACEXML/tests/HttpCharStream_Test.dsp delete mode 100644 ACEXML/tests/Makefile delete mode 100644 ACEXML/tests/Makefile.bor delete mode 100644 ACEXML/tests/NamespaceSupport_Test.cpp delete mode 100644 ACEXML/tests/NamespaceSupport_Test.dsp delete mode 100644 ACEXML/tests/Tests.dsw delete mode 100644 ACEXML/tests/Transcoder_Test.cpp delete mode 100644 ACEXML/tests/Transcoder_Test.dsp delete mode 100644 ACEXML/tests/tests.mpc delete mode 100644 ASNMP/COPYRIGHT delete mode 100644 ASNMP/ChangeLog delete mode 100644 ASNMP/Makefile delete mode 100644 ASNMP/README delete mode 100644 ASNMP/TO-DO delete mode 100644 ASNMP/agent/Makefile delete mode 100644 ASNMP/agent/agent_impl.cpp delete mode 100644 ASNMP/agent/agent_impl.h delete mode 100644 ASNMP/agent/main.cpp delete mode 100644 ASNMP/agent/snmp_agent.cpp delete mode 100644 ASNMP/agent/snmp_agent.h delete mode 100644 ASNMP/asnmp-overview.html delete mode 100644 ASNMP/asnmp/ChangeLog delete mode 100644 ASNMP/asnmp/Makefile delete mode 100644 ASNMP/asnmp/TODO delete mode 100644 ASNMP/asnmp/address.cpp delete mode 100644 ASNMP/asnmp/address.h delete mode 100644 ASNMP/asnmp/asn1.cpp delete mode 100644 ASNMP/asnmp/asn1.h delete mode 100644 ASNMP/asnmp/counter.cpp delete mode 100644 ASNMP/asnmp/counter.h delete mode 100644 ASNMP/asnmp/ctr64.cpp delete mode 100644 ASNMP/asnmp/ctr64.h delete mode 100644 ASNMP/asnmp/enttraps.h delete mode 100644 ASNMP/asnmp/gauge.cpp delete mode 100644 ASNMP/asnmp/gauge.h delete mode 100644 ASNMP/asnmp/integer.cpp delete mode 100644 ASNMP/asnmp/integer.h delete mode 100644 ASNMP/asnmp/octet.cpp delete mode 100644 ASNMP/asnmp/octet.h delete mode 100644 ASNMP/asnmp/oid.cpp delete mode 100644 ASNMP/asnmp/oid.h delete mode 100644 ASNMP/asnmp/oid_def.h delete mode 100644 ASNMP/asnmp/pdu.cpp delete mode 100644 ASNMP/asnmp/pdu.h delete mode 100644 ASNMP/asnmp/sagent.cpp delete mode 100644 ASNMP/asnmp/sagent.h delete mode 100644 ASNMP/asnmp/smi.h delete mode 100644 ASNMP/asnmp/smival.h delete mode 100644 ASNMP/asnmp/snmp.cpp delete mode 100644 ASNMP/asnmp/snmp.h delete mode 100644 ASNMP/asnmp/snmperrs.h delete mode 100644 ASNMP/asnmp/target.cpp delete mode 100644 ASNMP/asnmp/target.h delete mode 100644 ASNMP/asnmp/timetick.cpp delete mode 100644 ASNMP/asnmp/timetick.h delete mode 100644 ASNMP/asnmp/transaction.cpp delete mode 100644 ASNMP/asnmp/transaction.h delete mode 100644 ASNMP/asnmp/transaction_result.h delete mode 100644 ASNMP/asnmp/vb.cpp delete mode 100644 ASNMP/asnmp/vb.h delete mode 100644 ASNMP/asnmp/wpdu.cpp delete mode 100644 ASNMP/asnmp/wpdu.h delete mode 100644 ASNMP/examples/Makefile delete mode 100644 ASNMP/examples/get/Makefile delete mode 100644 ASNMP/examples/get/get.cpp delete mode 100644 ASNMP/examples/get/get_async.cpp delete mode 100644 ASNMP/examples/next/Makefile delete mode 100644 ASNMP/examples/next/next.cpp delete mode 100644 ASNMP/examples/set/Makefile delete mode 100644 ASNMP/examples/set/set.cpp delete mode 100644 ASNMP/examples/trap/Makefile delete mode 100644 ASNMP/examples/trap/purify4.1.txt delete mode 100644 ASNMP/examples/trap/trap.cpp delete mode 100644 ASNMP/examples/walk/Makefile delete mode 100644 ASNMP/examples/walk/walk.cpp delete mode 100644 ASNMP/mibs/RFC1213-MIB.my delete mode 100644 ASNMP/tests/Address_Test.cpp delete mode 100644 ASNMP/tests/Counter64_Test.cpp delete mode 100644 ASNMP/tests/Counter_Test.cpp delete mode 100644 ASNMP/tests/Gauge_Test.cpp delete mode 100644 ASNMP/tests/Integer_Test.cpp delete mode 100644 ASNMP/tests/Makefile delete mode 100644 ASNMP/tests/Octet_Test.cpp delete mode 100644 ASNMP/tests/Oid_Test.cpp delete mode 100644 ASNMP/tests/Target_Test.cpp delete mode 100644 ASNMP/tests/Varbind_Test.cpp delete mode 100644 ASNMP/tests/run_tests.bat delete mode 100755 ASNMP/tests/run_tests.sh delete mode 100644 ASNMP/tests/test_config.h delete mode 100644 AUTHORS delete mode 100644 COPYING delete mode 100644 ChangeLog delete mode 100644 ChangeLogs/ChangeLog-00a delete mode 100644 ChangeLogs/ChangeLog-00b delete mode 100644 ChangeLogs/ChangeLog-01a delete mode 100644 ChangeLogs/ChangeLog-01b delete mode 100644 ChangeLogs/ChangeLog-02a delete mode 100644 ChangeLogs/ChangeLog-02b delete mode 100644 ChangeLogs/ChangeLog-03a delete mode 100644 ChangeLogs/ChangeLog-93 delete mode 100644 ChangeLogs/ChangeLog-94 delete mode 100644 ChangeLogs/ChangeLog-95 delete mode 100644 ChangeLogs/ChangeLog-96a delete mode 100644 ChangeLogs/ChangeLog-96b delete mode 100644 ChangeLogs/ChangeLog-97a delete mode 100644 ChangeLogs/ChangeLog-97b delete mode 100644 ChangeLogs/ChangeLog-98a delete mode 100644 ChangeLogs/ChangeLog-98b delete mode 100644 ChangeLogs/ChangeLog-99a delete mode 100644 ChangeLogs/ChangeLog-99b delete mode 100644 FAQ delete mode 100644 Kokyu/Default_Dispatcher_Impl.cpp delete mode 100644 Kokyu/Default_Dispatcher_Impl.h delete mode 100644 Kokyu/Default_Dispatcher_Impl.i delete mode 100644 Kokyu/Dispatcher_Impl.cpp delete mode 100644 Kokyu/Dispatcher_Impl.h delete mode 100644 Kokyu/Dispatcher_Impl.i delete mode 100644 Kokyu/Dispatcher_Task.cpp delete mode 100644 Kokyu/Dispatcher_Task.h delete mode 100644 Kokyu/Dispatcher_Task.i delete mode 100644 Kokyu/Kokyu.cpp delete mode 100644 Kokyu/Kokyu.dsw delete mode 100644 Kokyu/Kokyu.h delete mode 100644 Kokyu/Kokyu.i delete mode 100644 Kokyu/Kokyu.mpc delete mode 100644 Kokyu/Kokyu_DLL.dsp delete mode 100644 Kokyu/Kokyu_Static.dsp delete mode 100644 Kokyu/Makefile delete mode 100644 Kokyu/kokyu_export.h delete mode 100644 Kokyu/tests/EDF/EDF.dsp delete mode 100644 Kokyu/tests/EDF/EDF.dsw delete mode 100644 Kokyu/tests/EDF/test.cpp delete mode 100644 Kokyu/tests/FIFO/FIFO.dsp delete mode 100644 Kokyu/tests/FIFO/FIFO.dsw delete mode 100644 Kokyu/tests/FIFO/test.cpp delete mode 100644 Makefile delete mode 100644 Makefile.am delete mode 100644 Makefile.bor delete mode 100644 PACE/ChangeLog delete mode 100644 PACE/Makefile delete mode 100644 PACE/Makefile.am delete mode 100644 PACE/README delete mode 100644 PACE/THANKS delete mode 100644 PACE/VERSION delete mode 100644 PACE/docs/ACE_Integration.txt delete mode 100644 PACE/docs/README delete mode 100644 PACE/docs/www/Introduction/begin.html delete mode 100644 PACE/docs/www/Introduction/build.html delete mode 100644 PACE/docs/www/Introduction/change.html delete mode 100644 PACE/docs/www/Introduction/phases.html delete mode 100644 PACE/docs/www/Introduction/porting.html delete mode 100644 PACE/docs/www/Introduction/struct.html delete mode 100644 PACE/docs/www/Introduction/team.html delete mode 100644 PACE/docs/www/Introduction/using.html delete mode 100644 PACE/docs/www/PACE-abstract.html delete mode 100644 PACE/docs/www/PACE-car.html delete mode 100644 PACE/docs/www/PACE-docs.html delete mode 100644 PACE/docs/www/PACE-obtain.html delete mode 100644 PACE/docs/www/PACE-overview.html delete mode 100644 PACE/docs/www/PACE.html delete mode 100644 PACE/docs/www/Pix/PACE-mini-logo.gif delete mode 100644 PACE/docs/www/Pix/PACE-red-blue-logo.gif delete mode 100644 PACE/docs/www/Pix/PACE-red-blue-smaller.gif delete mode 100644 PACE/docs/www/Pix/ace-tmp.jpg delete mode 100644 PACE/docs/www/Pix/doc-logo.jpg delete mode 100644 PACE/docs/www/Pix/heli-1.jpg delete mode 100644 PACE/docs/www/Pix/pace-car1.jpg delete mode 100644 PACE/docs/www/Pix/pace-car2.jpg delete mode 100644 PACE/docs/www/Pix/pace-car3.jpg delete mode 100644 PACE/docs/www/Pix/redball.gif delete mode 100644 PACE/docs/www/Pix/stealth.jpg delete mode 100755 PACE/docs/www/index.html delete mode 100644 PACE/examples/README delete mode 100644 PACE/include/makeinclude/rules.common.GNU delete mode 100644 PACE/pace++/README delete mode 100644 PACE/pace/Makefile delete mode 100644 PACE/pace/Makefile.am delete mode 100644 PACE/pace/aio.h delete mode 100644 PACE/pace/assert.h delete mode 100644 PACE/pace/config/compiler.h delete mode 100644 PACE/pace/config/config.h delete mode 100644 PACE/pace/config/constants.h delete mode 100644 PACE/pace/config/defaults.h delete mode 100644 PACE/pace/config/defines.h delete mode 100644 PACE/pace/config/features.h delete mode 100644 PACE/pace/config/platform.h delete mode 100644 PACE/pace/config/utility.h delete mode 100644 PACE/pace/ctype.h delete mode 100644 PACE/pace/dirent.h delete mode 100644 PACE/pace/emulation/mqueue.c delete mode 100644 PACE/pace/emulation/mqueue.h delete mode 100644 PACE/pace/emulation/time.h delete mode 100644 PACE/pace/errno.h delete mode 100644 PACE/pace/fcntl.h delete mode 100644 PACE/pace/grp.h delete mode 100644 PACE/pace/limits.h delete mode 100644 PACE/pace/locale.h delete mode 100644 PACE/pace/man/Makefile delete mode 100644 PACE/pace/man/banner delete mode 100644 PACE/pace/man/pace.jpg delete mode 100644 PACE/pace/math.h delete mode 100644 PACE/pace/mqueue.h delete mode 100644 PACE/pace/posix/Makefile.am delete mode 100644 PACE/pace/posix/README delete mode 100644 PACE/pace/posix/TODO delete mode 100644 PACE/pace/posix/aio.c delete mode 100644 PACE/pace/posix/aio.h delete mode 100644 PACE/pace/posix/aio.inl delete mode 100644 PACE/pace/posix/assert.c delete mode 100644 PACE/pace/posix/assert.h delete mode 100644 PACE/pace/posix/assert.inl delete mode 100644 PACE/pace/posix/ctype.c delete mode 100644 PACE/pace/posix/ctype.h delete mode 100644 PACE/pace/posix/ctype.inl delete mode 100644 PACE/pace/posix/dirent.c delete mode 100644 PACE/pace/posix/dirent.h delete mode 100644 PACE/pace/posix/dirent.inl delete mode 100644 PACE/pace/posix/errno.h delete mode 100644 PACE/pace/posix/fcntl.c delete mode 100644 PACE/pace/posix/fcntl.h delete mode 100644 PACE/pace/posix/fcntl.inl delete mode 100644 PACE/pace/posix/grp.c delete mode 100644 PACE/pace/posix/grp.h delete mode 100644 PACE/pace/posix/grp.inl delete mode 100644 PACE/pace/posix/limits.h delete mode 100644 PACE/pace/posix/locale.c delete mode 100644 PACE/pace/posix/locale.h delete mode 100644 PACE/pace/posix/locale.inl delete mode 100644 PACE/pace/posix/math.c delete mode 100644 PACE/pace/posix/math.h delete mode 100644 PACE/pace/posix/math.inl delete mode 100644 PACE/pace/posix/mman.c delete mode 100644 PACE/pace/posix/mman.h delete mode 100644 PACE/pace/posix/mman.inl delete mode 100644 PACE/pace/posix/mqueue.c delete mode 100644 PACE/pace/posix/mqueue.h delete mode 100644 PACE/pace/posix/mqueue.inl delete mode 100644 PACE/pace/posix/pthread.c delete mode 100644 PACE/pace/posix/pthread.h delete mode 100644 PACE/pace/posix/pthread.inl delete mode 100644 PACE/pace/posix/pwd.c delete mode 100644 PACE/pace/posix/pwd.h delete mode 100644 PACE/pace/posix/pwd.inl delete mode 100644 PACE/pace/posix/sched.c delete mode 100644 PACE/pace/posix/sched.h delete mode 100644 PACE/pace/posix/sched.inl delete mode 100644 PACE/pace/posix/semaphore.c delete mode 100644 PACE/pace/posix/semaphore.h delete mode 100644 PACE/pace/posix/semaphore.inl delete mode 100644 PACE/pace/posix/setjmp.c delete mode 100644 PACE/pace/posix/setjmp.h delete mode 100644 PACE/pace/posix/setjmp.inl delete mode 100644 PACE/pace/posix/signal.c delete mode 100644 PACE/pace/posix/signal.h delete mode 100644 PACE/pace/posix/signal.inl delete mode 100644 PACE/pace/posix/socket.c delete mode 100644 PACE/pace/posix/socket.h delete mode 100644 PACE/pace/posix/socket.inl delete mode 100644 PACE/pace/posix/stat.c delete mode 100644 PACE/pace/posix/stat.h delete mode 100644 PACE/pace/posix/stat.inl delete mode 100644 PACE/pace/posix/stdio.c delete mode 100644 PACE/pace/posix/stdio.h delete mode 100644 PACE/pace/posix/stdio.inl delete mode 100644 PACE/pace/posix/stdlib.c delete mode 100644 PACE/pace/posix/stdlib.h delete mode 100644 PACE/pace/posix/stdlib.inl delete mode 100644 PACE/pace/posix/string.c delete mode 100644 PACE/pace/posix/string.h delete mode 100644 PACE/pace/posix/string.inl delete mode 100644 PACE/pace/posix/termios.c delete mode 100644 PACE/pace/posix/termios.h delete mode 100644 PACE/pace/posix/termios.inl delete mode 100644 PACE/pace/posix/time.c delete mode 100644 PACE/pace/posix/time.h delete mode 100644 PACE/pace/posix/time.inl delete mode 100644 PACE/pace/posix/times.c delete mode 100644 PACE/pace/posix/times.h delete mode 100644 PACE/pace/posix/times.inl delete mode 100644 PACE/pace/posix/types.h delete mode 100644 PACE/pace/posix/unistd.c delete mode 100644 PACE/pace/posix/unistd.h delete mode 100644 PACE/pace/posix/unistd.inl delete mode 100644 PACE/pace/posix/utime.c delete mode 100644 PACE/pace/posix/utime.h delete mode 100644 PACE/pace/posix/utime.inl delete mode 100644 PACE/pace/posix/utsname.c delete mode 100644 PACE/pace/posix/utsname.h delete mode 100644 PACE/pace/posix/utsname.inl delete mode 100644 PACE/pace/posix/wait.c delete mode 100644 PACE/pace/posix/wait.h delete mode 100644 PACE/pace/posix/wait.inl delete mode 100644 PACE/pace/pthread.h delete mode 100644 PACE/pace/pwd.h delete mode 100644 PACE/pace/sched.h delete mode 100644 PACE/pace/semaphore.h delete mode 100644 PACE/pace/setjmp.h delete mode 100644 PACE/pace/signal.h delete mode 100644 PACE/pace/stddef.h delete mode 100644 PACE/pace/stdio.h delete mode 100644 PACE/pace/stdlib.h delete mode 100644 PACE/pace/string.h delete mode 100644 PACE/pace/sys/mman.h delete mode 100644 PACE/pace/sys/socket.h delete mode 100644 PACE/pace/sys/stat.h delete mode 100644 PACE/pace/sys/times.h delete mode 100644 PACE/pace/sys/types.h delete mode 100644 PACE/pace/sys/utsname.h delete mode 100644 PACE/pace/sys/wait.h delete mode 100644 PACE/pace/termios.h delete mode 100644 PACE/pace/time.h delete mode 100644 PACE/pace/unistd.h delete mode 100644 PACE/pace/utime.h delete mode 100644 PACE/pace/vxworks/README delete mode 100644 PACE/pace/vxworks/aio.c delete mode 100644 PACE/pace/vxworks/aio.h delete mode 100644 PACE/pace/vxworks/aio.inl delete mode 100644 PACE/pace/vxworks/assert.c delete mode 100644 PACE/pace/vxworks/assert.h delete mode 100644 PACE/pace/vxworks/assert.inl delete mode 100644 PACE/pace/vxworks/ctype.c delete mode 100644 PACE/pace/vxworks/ctype.h delete mode 100644 PACE/pace/vxworks/ctype.inl delete mode 100644 PACE/pace/vxworks/dirent.c delete mode 100644 PACE/pace/vxworks/dirent.h delete mode 100644 PACE/pace/vxworks/dirent.inl delete mode 100644 PACE/pace/vxworks/errno.h delete mode 100644 PACE/pace/vxworks/fcntl.c delete mode 100644 PACE/pace/vxworks/fcntl.h delete mode 100644 PACE/pace/vxworks/fcntl.inl delete mode 100644 PACE/pace/vxworks/grp.c delete mode 100644 PACE/pace/vxworks/grp.h delete mode 100644 PACE/pace/vxworks/grp.inl delete mode 100644 PACE/pace/vxworks/limits.h delete mode 100644 PACE/pace/vxworks/locale.c delete mode 100644 PACE/pace/vxworks/locale.h delete mode 100644 PACE/pace/vxworks/locale.inl delete mode 100644 PACE/pace/vxworks/math.c delete mode 100644 PACE/pace/vxworks/math.h delete mode 100644 PACE/pace/vxworks/math.inl delete mode 100644 PACE/pace/vxworks/mman.c delete mode 100644 PACE/pace/vxworks/mman.h delete mode 100644 PACE/pace/vxworks/mman.inl delete mode 100644 PACE/pace/vxworks/mqueue.c delete mode 100644 PACE/pace/vxworks/mqueue.h delete mode 100644 PACE/pace/vxworks/mqueue.inl delete mode 100644 PACE/pace/vxworks/pthread.c delete mode 100644 PACE/pace/vxworks/pthread.h delete mode 100644 PACE/pace/vxworks/pthread.inl delete mode 100644 PACE/pace/vxworks/pwd.c delete mode 100644 PACE/pace/vxworks/pwd.h delete mode 100644 PACE/pace/vxworks/pwd.inl delete mode 100644 PACE/pace/vxworks/sched.c delete mode 100644 PACE/pace/vxworks/sched.h delete mode 100644 PACE/pace/vxworks/sched.inl delete mode 100644 PACE/pace/vxworks/semaphore.c delete mode 100644 PACE/pace/vxworks/semaphore.h delete mode 100644 PACE/pace/vxworks/semaphore.inl delete mode 100644 PACE/pace/vxworks/setjmp.c delete mode 100644 PACE/pace/vxworks/setjmp.h delete mode 100644 PACE/pace/vxworks/setjmp.inl delete mode 100644 PACE/pace/vxworks/signal.c delete mode 100644 PACE/pace/vxworks/signal.h delete mode 100644 PACE/pace/vxworks/signal.inl delete mode 100644 PACE/pace/vxworks/socket.c delete mode 100644 PACE/pace/vxworks/socket.h delete mode 100644 PACE/pace/vxworks/socket.inl delete mode 100644 PACE/pace/vxworks/stat.c delete mode 100644 PACE/pace/vxworks/stat.h delete mode 100644 PACE/pace/vxworks/stat.inl delete mode 100644 PACE/pace/vxworks/stdio.c delete mode 100644 PACE/pace/vxworks/stdio.h delete mode 100644 PACE/pace/vxworks/stdio.inl delete mode 100644 PACE/pace/vxworks/stdlib.c delete mode 100644 PACE/pace/vxworks/stdlib.h delete mode 100644 PACE/pace/vxworks/stdlib.inl delete mode 100644 PACE/pace/vxworks/string.c delete mode 100644 PACE/pace/vxworks/string.h delete mode 100644 PACE/pace/vxworks/string.inl delete mode 100644 PACE/pace/vxworks/termios.c delete mode 100644 PACE/pace/vxworks/termios.h delete mode 100644 PACE/pace/vxworks/termios.inl delete mode 100644 PACE/pace/vxworks/time.c delete mode 100644 PACE/pace/vxworks/time.h delete mode 100644 PACE/pace/vxworks/time.inl delete mode 100644 PACE/pace/vxworks/times.c delete mode 100644 PACE/pace/vxworks/times.h delete mode 100644 PACE/pace/vxworks/times.inl delete mode 100644 PACE/pace/vxworks/types.h delete mode 100644 PACE/pace/vxworks/unistd.c delete mode 100644 PACE/pace/vxworks/unistd.h delete mode 100644 PACE/pace/vxworks/unistd.inl delete mode 100644 PACE/pace/vxworks/utime.c delete mode 100644 PACE/pace/vxworks/utime.h delete mode 100644 PACE/pace/vxworks/utime.inl delete mode 100644 PACE/pace/vxworks/utsname.c delete mode 100644 PACE/pace/vxworks/utsname.h delete mode 100644 PACE/pace/vxworks/utsname.inl delete mode 100644 PACE/pace/vxworks/wait.c delete mode 100644 PACE/pace/vxworks/wait.h delete mode 100644 PACE/pace/vxworks/wait.inl delete mode 100644 PACE/pace/win32/README delete mode 100644 PACE/pace/win32/TODO delete mode 100644 PACE/pace/win32/aio.c delete mode 100644 PACE/pace/win32/aio.h delete mode 100644 PACE/pace/win32/aio.inl delete mode 100644 PACE/pace/win32/assert.c delete mode 100644 PACE/pace/win32/assert.h delete mode 100644 PACE/pace/win32/assert.inl delete mode 100644 PACE/pace/win32/ctype.c delete mode 100644 PACE/pace/win32/ctype.h delete mode 100644 PACE/pace/win32/ctype.inl delete mode 100644 PACE/pace/win32/dirent.c delete mode 100644 PACE/pace/win32/dirent.h delete mode 100644 PACE/pace/win32/dirent.inl delete mode 100644 PACE/pace/win32/errno.h delete mode 100644 PACE/pace/win32/fcntl.c delete mode 100644 PACE/pace/win32/fcntl.h delete mode 100644 PACE/pace/win32/fcntl.inl delete mode 100644 PACE/pace/win32/grp.c delete mode 100644 PACE/pace/win32/grp.h delete mode 100644 PACE/pace/win32/grp.inl delete mode 100644 PACE/pace/win32/limits.h delete mode 100644 PACE/pace/win32/locale.c delete mode 100644 PACE/pace/win32/locale.h delete mode 100644 PACE/pace/win32/locale.inl delete mode 100644 PACE/pace/win32/math.c delete mode 100644 PACE/pace/win32/math.h delete mode 100644 PACE/pace/win32/math.inl delete mode 100644 PACE/pace/win32/mman.c delete mode 100644 PACE/pace/win32/mman.h delete mode 100644 PACE/pace/win32/mman.inl delete mode 100644 PACE/pace/win32/mqueue.c delete mode 100644 PACE/pace/win32/mqueue.h delete mode 100644 PACE/pace/win32/mqueue.inl delete mode 100644 PACE/pace/win32/pace.dsw delete mode 100644 PACE/pace/win32/pace_dll.dsp delete mode 100644 PACE/pace/win32/pace_lib.dsp delete mode 100644 PACE/pace/win32/pthread.c delete mode 100644 PACE/pace/win32/pthread.h delete mode 100644 PACE/pace/win32/pthread.inl delete mode 100644 PACE/pace/win32/pthreadtypes.h delete mode 100644 PACE/pace/win32/pwd.c delete mode 100644 PACE/pace/win32/pwd.h delete mode 100644 PACE/pace/win32/pwd.inl delete mode 100644 PACE/pace/win32/sched.c delete mode 100644 PACE/pace/win32/sched.h delete mode 100644 PACE/pace/win32/sched.inl delete mode 100644 PACE/pace/win32/schedtypes.h delete mode 100644 PACE/pace/win32/semaphore.c delete mode 100644 PACE/pace/win32/semaphore.h delete mode 100644 PACE/pace/win32/semaphore.inl delete mode 100644 PACE/pace/win32/setjmp.c delete mode 100644 PACE/pace/win32/setjmp.h delete mode 100644 PACE/pace/win32/setjmp.inl delete mode 100644 PACE/pace/win32/signal.c delete mode 100644 PACE/pace/win32/signal.h delete mode 100644 PACE/pace/win32/signal.inl delete mode 100644 PACE/pace/win32/socket.c delete mode 100644 PACE/pace/win32/socket.h delete mode 100644 PACE/pace/win32/socket.inl delete mode 100644 PACE/pace/win32/stat.c delete mode 100644 PACE/pace/win32/stat.h delete mode 100644 PACE/pace/win32/stat.inl delete mode 100644 PACE/pace/win32/stdio.c delete mode 100644 PACE/pace/win32/stdio.h delete mode 100644 PACE/pace/win32/stdio.inl delete mode 100644 PACE/pace/win32/stdlib.c delete mode 100644 PACE/pace/win32/stdlib.h delete mode 100644 PACE/pace/win32/stdlib.inl delete mode 100644 PACE/pace/win32/string.c delete mode 100644 PACE/pace/win32/string.h delete mode 100644 PACE/pace/win32/string.inl delete mode 100644 PACE/pace/win32/termios.c delete mode 100644 PACE/pace/win32/termios.h delete mode 100644 PACE/pace/win32/termios.inl delete mode 100644 PACE/pace/win32/time.c delete mode 100644 PACE/pace/win32/time.h delete mode 100644 PACE/pace/win32/time.inl delete mode 100644 PACE/pace/win32/times.c delete mode 100644 PACE/pace/win32/times.h delete mode 100644 PACE/pace/win32/times.inl delete mode 100644 PACE/pace/win32/types.h delete mode 100644 PACE/pace/win32/unistd.c delete mode 100644 PACE/pace/win32/unistd.h delete mode 100644 PACE/pace/win32/unistd.inl delete mode 100644 PACE/pace/win32/utime.c delete mode 100644 PACE/pace/win32/utime.h delete mode 100644 PACE/pace/win32/utime.inl delete mode 100644 PACE/pace/win32/utsname.c delete mode 100644 PACE/pace/win32/utsname.h delete mode 100644 PACE/pace/win32/utsname.inl delete mode 100644 PACE/pace/win32/wait.c delete mode 100644 PACE/pace/win32/wait.h delete mode 100644 PACE/pace/win32/wait.inl delete mode 100644 PACE/tests/Cond_Var_Test.c delete mode 100644 PACE/tests/Makefile delete mode 100644 PACE/tests/Makefile.am delete mode 100644 PACE/tests/Posix_SP_Test.c delete mode 100644 PACE/tests/Pthread_Storage_Test.c delete mode 100644 PACE/tests/Pthreads_Test.c delete mode 100644 PACE/tests/README delete mode 100644 PACE/tests/Stat_Test.c delete mode 100644 PACE/tests/Stdio_Test.c delete mode 100644 PACE/tests/mqueue_test.c delete mode 100644 PACE/tests/test_stdio.dsp delete mode 100644 PACE/tests/tests.dsw delete mode 100644 PACE/tests/vxworks_stub.c delete mode 100644 PROBLEM-REPORT-FORM delete mode 100644 README delete mode 100644 Static_Performance.dsw delete mode 100644 TAO/performance-tests/AMI_Latency/Roundtrip.cpp delete mode 100644 TAO/performance-tests/AMI_Latency/Roundtrip.h delete mode 100644 TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp delete mode 100644 TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h delete mode 100644 TAO/performance-tests/AMI_Latency/Server_Task.cpp delete mode 100644 TAO/performance-tests/AMI_Latency/client.cpp delete mode 100644 TAO/performance-tests/AMI_Latency/server.cpp delete mode 100644 TAO/performance-tests/DII_Latency/Roundtrip.cpp delete mode 100644 TAO/performance-tests/DII_Latency/Roundtrip.h delete mode 100644 TAO/performance-tests/DII_Latency/client.cpp delete mode 100644 TAO/performance-tests/DII_Latency/server.cpp delete mode 100644 TAO/performance-tests/DSI_Latency/Roundtrip.cpp delete mode 100644 TAO/performance-tests/DSI_Latency/Roundtrip.h delete mode 100644 TAO/performance-tests/DSI_Latency/client.cpp delete mode 100644 TAO/performance-tests/DSI_Latency/server.cpp delete mode 100644 TAO/performance-tests/Deferred_Latency/Roundtrip.cpp delete mode 100644 TAO/performance-tests/Deferred_Latency/Roundtrip.h delete mode 100644 TAO/performance-tests/Deferred_Latency/client.cpp delete mode 100644 TAO/performance-tests/Deferred_Latency/server.cpp delete mode 100644 TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile delete mode 100644 TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp delete mode 100644 TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h delete mode 100644 TAO/performance-tests/Single_Threaded_Latency/client.cpp delete mode 100644 TAO/performance-tests/Single_Threaded_Latency/server.cpp delete mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp delete mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h delete mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp delete mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h delete mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp delete mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp delete mode 100644 TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp delete mode 100644 TAO/performance-tests/Thread_Pool_Latency/Client_Task.h delete mode 100644 TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp delete mode 100644 TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h delete mode 100644 TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp delete mode 100644 TAO/performance-tests/Thread_Pool_Latency/client.cpp delete mode 100644 TAO/performance-tests/Thread_Pool_Latency/server.cpp delete mode 100644 THANKS delete mode 100644 TODO delete mode 100644 VERSION delete mode 100644 acconfig.h delete mode 100644 ace-config.1.in delete mode 100644 ace-config.in delete mode 100644 ace/ACE.cpp delete mode 100644 ace/ACE.h delete mode 100644 ace/ACE.i delete mode 100644 ace/ACE_export.h delete mode 100644 ace/ARGV.cpp delete mode 100644 ace/ARGV.h delete mode 100644 ace/ARGV.i delete mode 100644 ace/ATM_Acceptor.cpp delete mode 100644 ace/ATM_Acceptor.h delete mode 100644 ace/ATM_Acceptor.i delete mode 100644 ace/ATM_Addr.cpp delete mode 100644 ace/ATM_Addr.h delete mode 100644 ace/ATM_Addr.i delete mode 100644 ace/ATM_Connector.cpp delete mode 100644 ace/ATM_Connector.h delete mode 100644 ace/ATM_Connector.i delete mode 100644 ace/ATM_Params.cpp delete mode 100644 ace/ATM_Params.h delete mode 100644 ace/ATM_Params.i delete mode 100644 ace/ATM_QoS.cpp delete mode 100644 ace/ATM_QoS.h delete mode 100644 ace/ATM_QoS.i delete mode 100644 ace/ATM_Stream.cpp delete mode 100644 ace/ATM_Stream.h delete mode 100644 ace/ATM_Stream.i delete mode 100644 ace/Acceptor.cpp delete mode 100644 ace/Acceptor.h delete mode 100644 ace/Activation_Queue.cpp delete mode 100644 ace/Activation_Queue.h delete mode 100644 ace/Activation_Queue.i delete mode 100644 ace/Active_Map_Manager.cpp delete mode 100644 ace/Active_Map_Manager.h delete mode 100644 ace/Active_Map_Manager.i delete mode 100644 ace/Active_Map_Manager_T.cpp delete mode 100644 ace/Active_Map_Manager_T.h delete mode 100644 ace/Active_Map_Manager_T.i delete mode 100644 ace/Addr.cpp delete mode 100644 ace/Addr.h delete mode 100644 ace/Addr.i delete mode 100644 ace/Arg_Shifter.cpp delete mode 100644 ace/Arg_Shifter.h delete mode 100644 ace/Argv_Type_Converter.cpp delete mode 100644 ace/Argv_Type_Converter.h delete mode 100644 ace/Argv_Type_Converter.inl delete mode 100644 ace/Array.h delete mode 100644 ace/Array_Base.cpp delete mode 100644 ace/Array_Base.h delete mode 100644 ace/Array_Base.inl delete mode 100644 ace/Asynch_Acceptor.cpp delete mode 100644 ace/Asynch_Acceptor.h delete mode 100644 ace/Asynch_Connector.cpp delete mode 100644 ace/Asynch_Connector.h delete mode 100644 ace/Asynch_IO.cpp delete mode 100644 ace/Asynch_IO.h delete mode 100644 ace/Asynch_IO_Impl.cpp delete mode 100644 ace/Asynch_IO_Impl.h delete mode 100644 ace/Asynch_IO_Impl.i delete mode 100644 ace/Asynch_Pseudo_Task.cpp delete mode 100644 ace/Asynch_Pseudo_Task.h delete mode 100644 ace/Atomic_Op.cpp delete mode 100644 ace/Atomic_Op.h delete mode 100644 ace/Atomic_Op.i delete mode 100644 ace/Atomic_Op_T.cpp delete mode 100644 ace/Atomic_Op_T.h delete mode 100644 ace/Atomic_Op_T.i delete mode 100644 ace/Auto_IncDec_T.cpp delete mode 100644 ace/Auto_IncDec_T.h delete mode 100644 ace/Auto_IncDec_T.i delete mode 100644 ace/Auto_Ptr.cpp delete mode 100644 ace/Auto_Ptr.h delete mode 100644 ace/Auto_Ptr.i delete mode 100644 ace/Base_Thread_Adapter.cpp delete mode 100644 ace/Base_Thread_Adapter.h delete mode 100644 ace/Base_Thread_Adapter.inl delete mode 100644 ace/Based_Pointer_Repository.cpp delete mode 100644 ace/Based_Pointer_Repository.h delete mode 100644 ace/Based_Pointer_T.cpp delete mode 100644 ace/Based_Pointer_T.h delete mode 100644 ace/Based_Pointer_T.i delete mode 100644 ace/Basic_Stats.cpp delete mode 100644 ace/Basic_Stats.h delete mode 100644 ace/Basic_Stats.inl delete mode 100644 ace/Basic_Types.cpp delete mode 100644 ace/Basic_Types.h delete mode 100644 ace/Basic_Types.i delete mode 100644 ace/Bound_Ptr.h delete mode 100644 ace/Bound_Ptr.i delete mode 100644 ace/CDR_Base.cpp delete mode 100644 ace/CDR_Base.h delete mode 100644 ace/CDR_Base.inl delete mode 100644 ace/CDR_Stream.cpp delete mode 100644 ace/CDR_Stream.h delete mode 100644 ace/CDR_Stream.i delete mode 100644 ace/CE_Screen_Output.cpp delete mode 100644 ace/CE_Screen_Output.h delete mode 100644 ace/CLASSIX/CLASSIX_Addr.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Addr.h delete mode 100644 ace/CLASSIX/CLASSIX_Addr.i delete mode 100644 ace/CLASSIX/CLASSIX_CLD_Connector.cpp delete mode 100644 ace/CLASSIX/CLASSIX_CLD_Connector.h delete mode 100644 ace/CLASSIX/CLASSIX_CLD_Connector.i delete mode 100644 ace/CLASSIX/CLASSIX_CO_Acceptor.cpp delete mode 100644 ace/CLASSIX/CLASSIX_CO_Acceptor.h delete mode 100644 ace/CLASSIX/CLASSIX_CO_Acceptor.i delete mode 100644 ace/CLASSIX/CLASSIX_CO_Connector.cpp delete mode 100644 ace/CLASSIX/CLASSIX_CO_Connector.h delete mode 100644 ace/CLASSIX/CLASSIX_CO_Connector.i delete mode 100644 ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Dgram_Mcast.h delete mode 100644 ace/CLASSIX/CLASSIX_Dgram_Mcast.i delete mode 100644 ace/CLASSIX/CLASSIX_Group.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Group.h delete mode 100644 ace/CLASSIX/CLASSIX_Group.i delete mode 100644 ace/CLASSIX/CLASSIX_Group_Dynamic.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Group_Dynamic.h delete mode 100644 ace/CLASSIX/CLASSIX_Group_Dynamic.i delete mode 100644 ace/CLASSIX/CLASSIX_Group_Stamp.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Group_Stamp.h delete mode 100644 ace/CLASSIX/CLASSIX_Group_Stamp.i delete mode 100644 ace/CLASSIX/CLASSIX_OS.cpp delete mode 100644 ace/CLASSIX/CLASSIX_OS.h delete mode 100644 ace/CLASSIX/CLASSIX_OS.i delete mode 100644 ace/CLASSIX/CLASSIX_Peer_SAP.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Peer_SAP.h delete mode 100644 ace/CLASSIX/CLASSIX_Peer_SAP.i delete mode 100644 ace/CLASSIX/CLASSIX_Port.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Port.h delete mode 100644 ace/CLASSIX/CLASSIX_Port.i delete mode 100644 ace/CLASSIX/CLASSIX_Port_Core.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Port_Core.h delete mode 100644 ace/CLASSIX/CLASSIX_Port_Core.i delete mode 100644 ace/CLASSIX/CLASSIX_Port_Default.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Port_Default.h delete mode 100644 ace/CLASSIX/CLASSIX_Port_Default.i delete mode 100644 ace/CLASSIX/CLASSIX_SAP.cpp delete mode 100644 ace/CLASSIX/CLASSIX_SAP.h delete mode 100644 ace/CLASSIX/CLASSIX_SAP.i delete mode 100644 ace/CLASSIX/CLASSIX_Select_Reactor.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Select_Reactor.h delete mode 100644 ace/CLASSIX/CLASSIX_Select_Reactor.i delete mode 100644 ace/CLASSIX/CLASSIX_Stream.cpp delete mode 100644 ace/CLASSIX/CLASSIX_Stream.h delete mode 100644 ace/CLASSIX/CLASSIX_Stream.i delete mode 100644 ace/CLASSIX/Makefile delete mode 100644 ace/CORBA_macros.h delete mode 100644 ace/Cache_Map_Manager_T.cpp delete mode 100644 ace/Cache_Map_Manager_T.h delete mode 100644 ace/Cache_Map_Manager_T.i delete mode 100644 ace/Cached_Connect_Strategy_T.cpp delete mode 100644 ace/Cached_Connect_Strategy_T.h delete mode 100644 ace/Caching_Strategies_T.cpp delete mode 100644 ace/Caching_Strategies_T.h delete mode 100644 ace/Caching_Strategies_T.i delete mode 100644 ace/Caching_Utility_T.cpp delete mode 100644 ace/Caching_Utility_T.h delete mode 100644 ace/Capabilities.cpp delete mode 100644 ace/Capabilities.h delete mode 100644 ace/Capabilities.i delete mode 100644 ace/Cleanup_Strategies_T.cpp delete mode 100644 ace/Cleanup_Strategies_T.h delete mode 100644 ace/Codecs.cpp delete mode 100644 ace/Codecs.h delete mode 100644 ace/Codeset_IBM1047.cpp delete mode 100644 ace/Codeset_IBM1047.h delete mode 100644 ace/Codeset_Registry.cpp delete mode 100644 ace/Codeset_Registry.h delete mode 100644 ace/Codeset_Registry.inl delete mode 100644 ace/Codeset_Registry_db.cpp delete mode 100644 ace/Configuration.cpp delete mode 100644 ace/Configuration.h delete mode 100644 ace/Configuration_Import_Export.cpp delete mode 100644 ace/Configuration_Import_Export.h delete mode 100644 ace/Connection_Recycling_Strategy.cpp delete mode 100644 ace/Connection_Recycling_Strategy.h delete mode 100644 ace/Connector.cpp delete mode 100644 ace/Connector.h delete mode 100644 ace/Containers.cpp delete mode 100644 ace/Containers.h delete mode 100644 ace/Containers.i delete mode 100644 ace/Containers_T.cpp delete mode 100644 ace/Containers_T.h delete mode 100644 ace/Containers_T.i delete mode 100644 ace/Copy_Disabled.cpp delete mode 100644 ace/Copy_Disabled.h delete mode 100644 ace/DEV.cpp delete mode 100644 ace/DEV.h delete mode 100644 ace/DEV.i delete mode 100644 ace/DEV_Addr.cpp delete mode 100644 ace/DEV_Addr.h delete mode 100644 ace/DEV_Addr.i delete mode 100644 ace/DEV_Connector.cpp delete mode 100644 ace/DEV_Connector.h delete mode 100644 ace/DEV_Connector.i delete mode 100644 ace/DEV_IO.cpp delete mode 100644 ace/DEV_IO.h delete mode 100644 ace/DEV_IO.i delete mode 100644 ace/DLL.cpp delete mode 100644 ace/DLL.h delete mode 100644 ace/DLL_Manager.cpp delete mode 100644 ace/DLL_Manager.h delete mode 100644 ace/Date_Time.cpp delete mode 100644 ace/Date_Time.h delete mode 100644 ace/Date_Time.i delete mode 100644 ace/Default_Constants.h delete mode 100644 ace/Dev_Poll_Reactor.cpp delete mode 100644 ace/Dev_Poll_Reactor.h delete mode 100644 ace/Dev_Poll_Reactor.inl delete mode 100644 ace/Dirent.cpp delete mode 100644 ace/Dirent.h delete mode 100644 ace/Dirent.i delete mode 100644 ace/Dirent_Selector.cpp delete mode 100644 ace/Dirent_Selector.h delete mode 100644 ace/Dirent_Selector.inl delete mode 100644 ace/Dump.cpp delete mode 100644 ace/Dump.h delete mode 100644 ace/Dump_T.cpp delete mode 100644 ace/Dump_T.h delete mode 100644 ace/Dynamic.cpp delete mode 100644 ace/Dynamic.h delete mode 100644 ace/Dynamic.i delete mode 100644 ace/Dynamic_Service.cpp delete mode 100644 ace/Dynamic_Service.h delete mode 100644 ace/Dynamic_Service.i delete mode 100644 ace/Dynamic_Service_Base.cpp delete mode 100644 ace/Dynamic_Service_Base.h delete mode 100644 ace/Dynamic_Service_Base.i delete mode 100644 ace/Env_Value_T.cpp delete mode 100644 ace/Env_Value_T.h delete mode 100644 ace/Env_Value_T.i delete mode 100644 ace/Event_Handler.cpp delete mode 100644 ace/Event_Handler.h delete mode 100644 ace/Event_Handler.i delete mode 100644 ace/Event_Handler_T.cpp delete mode 100644 ace/Event_Handler_T.h delete mode 100644 ace/Event_Handler_T.i delete mode 100644 ace/Exception_Macros.h delete mode 100644 ace/FIFO.cpp delete mode 100644 ace/FIFO.h delete mode 100644 ace/FIFO.i delete mode 100644 ace/FIFO_Recv.cpp delete mode 100644 ace/FIFO_Recv.h delete mode 100644 ace/FIFO_Recv.i delete mode 100644 ace/FIFO_Recv_Msg.cpp delete mode 100644 ace/FIFO_Recv_Msg.h delete mode 100644 ace/FIFO_Recv_Msg.i delete mode 100644 ace/FIFO_Send.cpp delete mode 100644 ace/FIFO_Send.h delete mode 100644 ace/FIFO_Send.i delete mode 100644 ace/FIFO_Send_Msg.cpp delete mode 100644 ace/FIFO_Send_Msg.h delete mode 100644 ace/FIFO_Send_Msg.i delete mode 100644 ace/FILE.cpp delete mode 100644 ace/FILE.h delete mode 100644 ace/FILE.i delete mode 100644 ace/FILE_Addr.cpp delete mode 100644 ace/FILE_Addr.h delete mode 100644 ace/FILE_Addr.i delete mode 100644 ace/FILE_Connector.cpp delete mode 100644 ace/FILE_Connector.h delete mode 100644 ace/FILE_Connector.i delete mode 100644 ace/FILE_IO.cpp delete mode 100644 ace/FILE_IO.h delete mode 100644 ace/FILE_IO.i delete mode 100644 ace/File_Lock.cpp delete mode 100644 ace/File_Lock.h delete mode 100644 ace/File_Lock.inl delete mode 100644 ace/Filecache.cpp delete mode 100644 ace/Filecache.h delete mode 100644 ace/FlReactor.cpp delete mode 100644 ace/FlReactor.h delete mode 100644 ace/FlReactor.i delete mode 100644 ace/Flag_Manip.cpp delete mode 100644 ace/Flag_Manip.h delete mode 100644 ace/Flag_Manip.i delete mode 100644 ace/Framework_Component.cpp delete mode 100644 ace/Framework_Component.h delete mode 100644 ace/Framework_Component.inl delete mode 100644 ace/Framework_Component_T.cpp delete mode 100644 ace/Framework_Component_T.h delete mode 100644 ace/Framework_Component_T.inl delete mode 100644 ace/Free_List.cpp delete mode 100644 ace/Free_List.h delete mode 100644 ace/Free_List.i delete mode 100644 ace/Functor.cpp delete mode 100644 ace/Functor.h delete mode 100644 ace/Functor.i delete mode 100644 ace/Functor_T.cpp delete mode 100644 ace/Functor_T.h delete mode 100644 ace/Functor_T.i delete mode 100644 ace/Future.cpp delete mode 100644 ace/Future.h delete mode 100644 ace/Future_Set.cpp delete mode 100644 ace/Future_Set.h delete mode 100644 ace/Get_Opt.cpp delete mode 100644 ace/Get_Opt.h delete mode 100644 ace/Get_Opt.i delete mode 100644 ace/Global_Macros.h delete mode 100644 ace/Handle_Gobbler.h delete mode 100644 ace/Handle_Gobbler.i delete mode 100644 ace/Handle_Ops.cpp delete mode 100644 ace/Handle_Ops.h delete mode 100644 ace/Handle_Ops.i delete mode 100644 ace/Handle_Set.cpp delete mode 100644 ace/Handle_Set.h delete mode 100644 ace/Handle_Set.i delete mode 100644 ace/Hash_Cache_Map_Manager_T.cpp delete mode 100644 ace/Hash_Cache_Map_Manager_T.h delete mode 100644 ace/Hash_Cache_Map_Manager_T.i delete mode 100644 ace/Hash_Map_Manager.cpp delete mode 100644 ace/Hash_Map_Manager.h delete mode 100644 ace/Hash_Map_Manager_T.cpp delete mode 100644 ace/Hash_Map_Manager_T.h delete mode 100644 ace/Hash_Map_Manager_T.i delete mode 100644 ace/Hash_Map_With_Allocator_T.cpp delete mode 100644 ace/Hash_Map_With_Allocator_T.h delete mode 100644 ace/Hash_Map_With_Allocator_T.i delete mode 100644 ace/Hashable.cpp delete mode 100644 ace/Hashable.h delete mode 100644 ace/Hashable.inl delete mode 100644 ace/High_Res_Timer.cpp delete mode 100644 ace/High_Res_Timer.h delete mode 100644 ace/High_Res_Timer.i delete mode 100644 ace/INET_Addr.cpp delete mode 100644 ace/INET_Addr.h delete mode 100644 ace/INET_Addr.i delete mode 100644 ace/IOStream.cpp delete mode 100644 ace/IOStream.h delete mode 100644 ace/IOStream_T.cpp delete mode 100644 ace/IOStream_T.h delete mode 100644 ace/IOStream_T.i delete mode 100644 ace/IO_Cntl_Msg.cpp delete mode 100644 ace/IO_Cntl_Msg.h delete mode 100644 ace/IO_SAP.cpp delete mode 100644 ace/IO_SAP.h delete mode 100644 ace/IO_SAP.i delete mode 100644 ace/IPC_SAP.cpp delete mode 100644 ace/IPC_SAP.h delete mode 100644 ace/IPC_SAP.i delete mode 100644 ace/Init_ACE.cpp delete mode 100644 ace/Init_ACE.h delete mode 100644 ace/Init_ACE.i delete mode 100644 ace/Intrusive_List.cpp delete mode 100644 ace/Intrusive_List.h delete mode 100644 ace/Intrusive_List.inl delete mode 100644 ace/Intrusive_List_Node.cpp delete mode 100644 ace/Intrusive_List_Node.h delete mode 100644 ace/Intrusive_List_Node.inl delete mode 100644 ace/LOCK_SOCK_Acceptor.cpp delete mode 100644 ace/LOCK_SOCK_Acceptor.h delete mode 100644 ace/LSOCK.cpp delete mode 100644 ace/LSOCK.h delete mode 100644 ace/LSOCK.i delete mode 100644 ace/LSOCK_Acceptor.cpp delete mode 100644 ace/LSOCK_Acceptor.h delete mode 100644 ace/LSOCK_CODgram.cpp delete mode 100644 ace/LSOCK_CODgram.h delete mode 100644 ace/LSOCK_CODgram.i delete mode 100644 ace/LSOCK_Connector.cpp delete mode 100644 ace/LSOCK_Connector.h delete mode 100644 ace/LSOCK_Connector.i delete mode 100644 ace/LSOCK_Dgram.cpp delete mode 100644 ace/LSOCK_Dgram.h delete mode 100644 ace/LSOCK_Dgram.i delete mode 100644 ace/LSOCK_Stream.cpp delete mode 100644 ace/LSOCK_Stream.h delete mode 100644 ace/LSOCK_Stream.i delete mode 100644 ace/Lib_Find.cpp delete mode 100644 ace/Lib_Find.h delete mode 100644 ace/Lib_Find.i delete mode 100644 ace/Local_Name_Space.cpp delete mode 100644 ace/Local_Name_Space.h delete mode 100644 ace/Local_Name_Space_T.cpp delete mode 100644 ace/Local_Name_Space_T.h delete mode 100644 ace/Local_Tokens.cpp delete mode 100644 ace/Local_Tokens.h delete mode 100644 ace/Local_Tokens.i delete mode 100644 ace/Log_Msg.cpp delete mode 100644 ace/Log_Msg.h delete mode 100644 ace/Log_Msg_Backend.cpp delete mode 100644 ace/Log_Msg_Backend.h delete mode 100644 ace/Log_Msg_Callback.cpp delete mode 100644 ace/Log_Msg_Callback.h delete mode 100644 ace/Log_Msg_IPC.cpp delete mode 100644 ace/Log_Msg_IPC.h delete mode 100644 ace/Log_Msg_NT_Event_Log.cpp delete mode 100644 ace/Log_Msg_NT_Event_Log.h delete mode 100644 ace/Log_Msg_UNIX_Syslog.cpp delete mode 100644 ace/Log_Msg_UNIX_Syslog.h delete mode 100644 ace/Log_Priority.h delete mode 100644 ace/Log_Record.cpp delete mode 100644 ace/Log_Record.h delete mode 100644 ace/Log_Record.i delete mode 100644 ace/Logging_Strategy.cpp delete mode 100644 ace/Logging_Strategy.h delete mode 100644 ace/MEM_Acceptor.cpp delete mode 100644 ace/MEM_Acceptor.h delete mode 100644 ace/MEM_Acceptor.i delete mode 100644 ace/MEM_Addr.cpp delete mode 100644 ace/MEM_Addr.h delete mode 100644 ace/MEM_Addr.i delete mode 100644 ace/MEM_Connector.cpp delete mode 100644 ace/MEM_Connector.h delete mode 100644 ace/MEM_Connector.i delete mode 100644 ace/MEM_IO.cpp delete mode 100644 ace/MEM_IO.h delete mode 100644 ace/MEM_IO.i delete mode 100644 ace/MEM_SAP.cpp delete mode 100644 ace/MEM_SAP.h delete mode 100644 ace/MEM_SAP.i delete mode 100644 ace/MEM_Stream.cpp delete mode 100644 ace/MEM_Stream.h delete mode 100644 ace/MEM_Stream.i delete mode 100644 ace/Makefile delete mode 100644 ace/Makefile.ace delete mode 100644 ace/Makefile.am delete mode 100644 ace/Makefile.bor delete mode 100644 ace/Makefile.dirs delete mode 100644 ace/Makefile.vac delete mode 100644 ace/Malloc.cpp delete mode 100644 ace/Malloc.h delete mode 100644 ace/Malloc.i delete mode 100644 ace/Malloc_Allocator.cpp delete mode 100644 ace/Malloc_Allocator.h delete mode 100644 ace/Malloc_Allocator.i delete mode 100644 ace/Malloc_Base.h delete mode 100644 ace/Malloc_Instantiations.cpp delete mode 100644 ace/Malloc_T.cpp delete mode 100644 ace/Malloc_T.h delete mode 100644 ace/Malloc_T.i delete mode 100644 ace/Managed_Object.cpp delete mode 100644 ace/Managed_Object.h delete mode 100644 ace/Managed_Object.i delete mode 100644 ace/Map.cpp delete mode 100644 ace/Map.h delete mode 100644 ace/Map_Manager.cpp delete mode 100644 ace/Map_Manager.h delete mode 100644 ace/Map_Manager.i delete mode 100644 ace/Map_T.cpp delete mode 100644 ace/Map_T.h delete mode 100644 ace/Map_T.i delete mode 100644 ace/Mem_Map.cpp delete mode 100644 ace/Mem_Map.h delete mode 100644 ace/Mem_Map.i delete mode 100644 ace/Memory_Pool.cpp delete mode 100644 ace/Memory_Pool.h delete mode 100644 ace/Memory_Pool.i delete mode 100644 ace/Message_Block.cpp delete mode 100644 ace/Message_Block.h delete mode 100644 ace/Message_Block.i delete mode 100644 ace/Message_Block_T.cpp delete mode 100644 ace/Message_Block_T.h delete mode 100644 ace/Message_Block_T.i delete mode 100644 ace/Message_Queue.cpp delete mode 100644 ace/Message_Queue.h delete mode 100644 ace/Message_Queue.i delete mode 100644 ace/Message_Queue_T.cpp delete mode 100644 ace/Message_Queue_T.h delete mode 100644 ace/Message_Queue_T.i delete mode 100644 ace/Method_Object.h delete mode 100644 ace/Method_Request.cpp delete mode 100644 ace/Method_Request.h delete mode 100644 ace/Min_Max.h delete mode 100644 ace/Module.cpp delete mode 100644 ace/Module.h delete mode 100644 ace/Module.i delete mode 100644 ace/Msg_WFMO_Reactor.cpp delete mode 100644 ace/Msg_WFMO_Reactor.h delete mode 100644 ace/Msg_WFMO_Reactor.i delete mode 100644 ace/Multihomed_INET_Addr.cpp delete mode 100644 ace/Multihomed_INET_Addr.h delete mode 100644 ace/Multihomed_INET_Addr.i delete mode 100644 ace/Multiplexor.cpp delete mode 100644 ace/Multiplexor.h delete mode 100644 ace/Multiplexor.i delete mode 100644 ace/NT_Service.cpp delete mode 100644 ace/NT_Service.h delete mode 100644 ace/NT_Service.i delete mode 100644 ace/Name_Proxy.cpp delete mode 100644 ace/Name_Proxy.h delete mode 100644 ace/Name_Request_Reply.cpp delete mode 100644 ace/Name_Request_Reply.h delete mode 100644 ace/Name_Space.cpp delete mode 100644 ace/Name_Space.h delete mode 100644 ace/Naming_Context.cpp delete mode 100644 ace/Naming_Context.h delete mode 100644 ace/Node.cpp delete mode 100644 ace/Node.h delete mode 100644 ace/Notification_Strategy.cpp delete mode 100644 ace/Notification_Strategy.h delete mode 100644 ace/Notification_Strategy.inl delete mode 100644 ace/OS.cpp delete mode 100644 ace/OS.h delete mode 100644 ace/OS.i delete mode 100644 ace/OS_Dirent.cpp delete mode 100644 ace/OS_Dirent.h delete mode 100644 ace/OS_Dirent.inl delete mode 100644 ace/OS_Errno.cpp delete mode 100644 ace/OS_Errno.h delete mode 100644 ace/OS_Errno.inl delete mode 100644 ace/OS_Export.h delete mode 100644 ace/OS_Log_Msg_Attributes.cpp delete mode 100644 ace/OS_Log_Msg_Attributes.h delete mode 100644 ace/OS_Log_Msg_Attributes.inl delete mode 100644 ace/OS_Memory.cpp delete mode 100644 ace/OS_Memory.h delete mode 100644 ace/OS_Memory.inl delete mode 100644 ace/OS_QoS.cpp delete mode 100644 ace/OS_QoS.h delete mode 100644 ace/OS_String.cpp delete mode 100644 ace/OS_String.h delete mode 100644 ace/OS_String.inl delete mode 100644 ace/OS_TLI.cpp delete mode 100644 ace/OS_TLI.h delete mode 100644 ace/OS_TLI.inl delete mode 100644 ace/OS_Thread_Adapter.cpp delete mode 100644 ace/OS_Thread_Adapter.h delete mode 100644 ace/OS_Thread_Adapter.inl delete mode 100644 ace/Obchunk.cpp delete mode 100644 ace/Obchunk.h delete mode 100644 ace/Obchunk.i delete mode 100644 ace/Object_Manager.cpp delete mode 100644 ace/Object_Manager.h delete mode 100644 ace/Object_Manager.i delete mode 100644 ace/Obstack.cpp delete mode 100644 ace/Obstack.h delete mode 100644 ace/Obstack_T.cpp delete mode 100644 ace/Obstack_T.h delete mode 100644 ace/Obstack_T.i delete mode 100644 ace/PI_Malloc.cpp delete mode 100644 ace/PI_Malloc.h delete mode 100644 ace/PI_Malloc.i delete mode 100644 ace/POSIX_Asynch_IO.cpp delete mode 100644 ace/POSIX_Asynch_IO.h delete mode 100644 ace/POSIX_Asynch_IO.i delete mode 100644 ace/POSIX_CB_Proactor.cpp delete mode 100644 ace/POSIX_CB_Proactor.h delete mode 100644 ace/POSIX_CB_Proactor.i delete mode 100644 ace/POSIX_Proactor.cpp delete mode 100644 ace/POSIX_Proactor.h delete mode 100644 ace/POSIX_Proactor.i delete mode 100644 ace/Pair.cpp delete mode 100644 ace/Pair.h delete mode 100644 ace/Pair_T.cpp delete mode 100644 ace/Pair_T.h delete mode 100644 ace/Pair_T.i delete mode 100644 ace/Parse_Node.cpp delete mode 100644 ace/Parse_Node.h delete mode 100644 ace/Parse_Node.i delete mode 100644 ace/Pipe.cpp delete mode 100644 ace/Pipe.h delete mode 100644 ace/Pipe.i delete mode 100644 ace/Priority_Reactor.cpp delete mode 100644 ace/Priority_Reactor.h delete mode 100644 ace/Proactor.cpp delete mode 100644 ace/Proactor.h delete mode 100644 ace/Proactor.i delete mode 100644 ace/Proactor_Impl.h delete mode 100644 ace/Process.cpp delete mode 100644 ace/Process.h delete mode 100644 ace/Process.i delete mode 100644 ace/Process_Manager.cpp delete mode 100644 ace/Process_Manager.h delete mode 100644 ace/Process_Manager.i delete mode 100644 ace/Process_Mutex.cpp delete mode 100644 ace/Process_Mutex.h delete mode 100644 ace/Process_Mutex.inl delete mode 100644 ace/Process_Semaphore.cpp delete mode 100644 ace/Process_Semaphore.h delete mode 100644 ace/Process_Semaphore.inl delete mode 100644 ace/Profile_Timer.cpp delete mode 100644 ace/Profile_Timer.h delete mode 100644 ace/Profile_Timer.i delete mode 100644 ace/QoS/ACE_QoS.dsp delete mode 100644 ace/QoS/ACE_QoS.dsw delete mode 100644 ace/QoS/ACE_QoS_Export.h delete mode 100644 ace/QoS/ACE_QoS_Lib.dsp delete mode 100644 ace/QoS/Makefile delete mode 100644 ace/QoS/QoS_Decorator.cpp delete mode 100644 ace/QoS/QoS_Decorator.h delete mode 100644 ace/QoS/QoS_Manager.cpp delete mode 100644 ace/QoS/QoS_Manager.h delete mode 100644 ace/QoS/QoS_Session.h delete mode 100644 ace/QoS/QoS_Session_Factory.cpp delete mode 100644 ace/QoS/QoS_Session_Factory.h delete mode 100644 ace/QoS/QoS_Session_Impl.cpp delete mode 100644 ace/QoS/QoS_Session_Impl.h delete mode 100644 ace/QoS/QoS_Session_Impl.i delete mode 100644 ace/QoS/README delete mode 100644 ace/QoS/SOCK_Dgram_Mcast_QoS.cpp delete mode 100644 ace/QoS/SOCK_Dgram_Mcast_QoS.h delete mode 100644 ace/QoS/SOCK_Dgram_Mcast_QoS.i delete mode 100644 ace/QoS/makefile.bor delete mode 100644 ace/QoS/qos.mpc delete mode 100644 ace/QtReactor.cpp delete mode 100644 ace/QtReactor.h delete mode 100644 ace/RB_Tree.cpp delete mode 100644 ace/RB_Tree.h delete mode 100644 ace/RB_Tree.i delete mode 100644 ace/README delete mode 100644 ace/RMCast/Makefile delete mode 100644 ace/RMCast/Makefile.bor delete mode 100644 ace/RMCast/README delete mode 100644 ace/RMCast/RMCast.cpp delete mode 100644 ace/RMCast/RMCast.dsp delete mode 100644 ace/RMCast/RMCast.dsw delete mode 100644 ace/RMCast/RMCast.h delete mode 100644 ace/RMCast/RMCast.i delete mode 100644 ace/RMCast/RMCast_Ack_Worker.cpp delete mode 100644 ace/RMCast/RMCast_Ack_Worker.h delete mode 100644 ace/RMCast/RMCast_Ack_Worker.i delete mode 100644 ace/RMCast/RMCast_Copy_On_Write.cpp delete mode 100644 ace/RMCast/RMCast_Copy_On_Write.h delete mode 100644 ace/RMCast/RMCast_Copy_On_Write.i delete mode 100644 ace/RMCast/RMCast_Export.h delete mode 100644 ace/RMCast/RMCast_Fork.cpp delete mode 100644 ace/RMCast/RMCast_Fork.h delete mode 100644 ace/RMCast/RMCast_Fork.i delete mode 100644 ace/RMCast/RMCast_Fragment.cpp delete mode 100644 ace/RMCast/RMCast_Fragment.h delete mode 100644 ace/RMCast/RMCast_Fragment.i delete mode 100644 ace/RMCast/RMCast_IO_UDP.cpp delete mode 100644 ace/RMCast/RMCast_IO_UDP.h delete mode 100644 ace/RMCast/RMCast_IO_UDP.i delete mode 100644 ace/RMCast/RMCast_Membership.cpp delete mode 100644 ace/RMCast/RMCast_Membership.h delete mode 100644 ace/RMCast/RMCast_Membership.i delete mode 100644 ace/RMCast/RMCast_Module.cpp delete mode 100644 ace/RMCast/RMCast_Module.h delete mode 100644 ace/RMCast/RMCast_Module.i delete mode 100644 ace/RMCast/RMCast_Module_Factory.cpp delete mode 100644 ace/RMCast/RMCast_Module_Factory.h delete mode 100644 ace/RMCast/RMCast_Module_Factory.i delete mode 100644 ace/RMCast/RMCast_Partial_Message.cpp delete mode 100644 ace/RMCast/RMCast_Partial_Message.h delete mode 100644 ace/RMCast/RMCast_Partial_Message.i delete mode 100644 ace/RMCast/RMCast_Proxy.cpp delete mode 100644 ace/RMCast/RMCast_Proxy.h delete mode 100644 ace/RMCast/RMCast_Proxy.i delete mode 100644 ace/RMCast/RMCast_Reassembly.cpp delete mode 100644 ace/RMCast/RMCast_Reassembly.h delete mode 100644 ace/RMCast/RMCast_Reassembly.i delete mode 100644 ace/RMCast/RMCast_Receiver_Module.cpp delete mode 100644 ace/RMCast/RMCast_Receiver_Module.h delete mode 100644 ace/RMCast/RMCast_Receiver_Module.i delete mode 100644 ace/RMCast/RMCast_Reliable_Factory.cpp delete mode 100644 ace/RMCast/RMCast_Reliable_Factory.h delete mode 100644 ace/RMCast/RMCast_Reliable_Factory.i delete mode 100644 ace/RMCast/RMCast_Reordering.cpp delete mode 100644 ace/RMCast/RMCast_Reordering.h delete mode 100644 ace/RMCast/RMCast_Reordering.i delete mode 100644 ace/RMCast/RMCast_Resend_Handler.cpp delete mode 100644 ace/RMCast/RMCast_Resend_Handler.h delete mode 100644 ace/RMCast/RMCast_Resend_Handler.i delete mode 100644 ace/RMCast/RMCast_Resend_Worker.cpp delete mode 100644 ace/RMCast/RMCast_Resend_Worker.h delete mode 100644 ace/RMCast/RMCast_Resend_Worker.i delete mode 100644 ace/RMCast/RMCast_Retransmission.cpp delete mode 100644 ace/RMCast/RMCast_Retransmission.h delete mode 100644 ace/RMCast/RMCast_Retransmission.i delete mode 100644 ace/RMCast/RMCast_Sequencer.cpp delete mode 100644 ace/RMCast/RMCast_Sequencer.h delete mode 100644 ace/RMCast/RMCast_Sequencer.i delete mode 100644 ace/RMCast/RMCast_Singleton_Factory.cpp delete mode 100644 ace/RMCast/RMCast_Singleton_Factory.h delete mode 100644 ace/RMCast/RMCast_Singleton_Factory.i delete mode 100644 ace/RMCast/RMCast_UDP_Event_Handler.cpp delete mode 100644 ace/RMCast/RMCast_UDP_Event_Handler.h delete mode 100644 ace/RMCast/RMCast_UDP_Event_Handler.i delete mode 100644 ace/RMCast/RMCast_UDP_Proxy.cpp delete mode 100644 ace/RMCast/RMCast_UDP_Proxy.h delete mode 100644 ace/RMCast/RMCast_UDP_Proxy.i delete mode 100644 ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp delete mode 100644 ace/RMCast/RMCast_UDP_Reliable_Receiver.h delete mode 100644 ace/RMCast/RMCast_UDP_Reliable_Receiver.i delete mode 100644 ace/RMCast/RMCast_UDP_Reliable_Sender.cpp delete mode 100644 ace/RMCast/RMCast_UDP_Reliable_Sender.h delete mode 100644 ace/RMCast/RMCast_UDP_Reliable_Sender.i delete mode 100644 ace/RMCast/RMCast_Worker.cpp delete mode 100644 ace/RMCast/RMCast_Worker.h delete mode 100644 ace/RMCast/RMCast_Worker.i delete mode 100644 ace/RMCast/rmcast.mpc delete mode 100644 ace/RW_Process_Mutex.cpp delete mode 100644 ace/RW_Process_Mutex.h delete mode 100644 ace/RW_Process_Mutex.inl delete mode 100644 ace/Reactor.cpp delete mode 100644 ace/Reactor.h delete mode 100644 ace/Reactor.i delete mode 100644 ace/Reactor_Impl.h delete mode 100644 ace/Reactor_Notification_Strategy.cpp delete mode 100644 ace/Reactor_Notification_Strategy.h delete mode 100644 ace/Reactor_Notification_Strategy.inl delete mode 100644 ace/Read_Buffer.cpp delete mode 100644 ace/Read_Buffer.h delete mode 100644 ace/Read_Buffer.i delete mode 100644 ace/Recyclable.cpp delete mode 100644 ace/Recyclable.h delete mode 100644 ace/Recyclable.inl delete mode 100644 ace/Refcountable.cpp delete mode 100644 ace/Refcountable.h delete mode 100644 ace/Refcountable.inl delete mode 100644 ace/Refcounted_Auto_Ptr.h delete mode 100644 ace/Refcounted_Auto_Ptr.i delete mode 100644 ace/Registry.cpp delete mode 100644 ace/Registry.h delete mode 100644 ace/Registry_Name_Space.cpp delete mode 100644 ace/Registry_Name_Space.h delete mode 100644 ace/Remote_Name_Space.cpp delete mode 100644 ace/Remote_Name_Space.h delete mode 100644 ace/Remote_Tokens.cpp delete mode 100644 ace/Remote_Tokens.h delete mode 100644 ace/Remote_Tokens.i delete mode 100644 ace/SOCK.cpp delete mode 100644 ace/SOCK.h delete mode 100644 ace/SOCK.i delete mode 100644 ace/SOCK_Acceptor.cpp delete mode 100644 ace/SOCK_Acceptor.h delete mode 100644 ace/SOCK_Acceptor.i delete mode 100644 ace/SOCK_CODgram.cpp delete mode 100644 ace/SOCK_CODgram.h delete mode 100644 ace/SOCK_CODgram.i delete mode 100644 ace/SOCK_Connector.cpp delete mode 100644 ace/SOCK_Connector.h delete mode 100644 ace/SOCK_Connector.i delete mode 100644 ace/SOCK_Dgram.cpp delete mode 100644 ace/SOCK_Dgram.h delete mode 100644 ace/SOCK_Dgram.i delete mode 100644 ace/SOCK_Dgram_Bcast.cpp delete mode 100644 ace/SOCK_Dgram_Bcast.h delete mode 100644 ace/SOCK_Dgram_Bcast.i delete mode 100644 ace/SOCK_Dgram_Mcast.cpp delete mode 100644 ace/SOCK_Dgram_Mcast.h delete mode 100644 ace/SOCK_Dgram_Mcast.i delete mode 100644 ace/SOCK_IO.cpp delete mode 100644 ace/SOCK_IO.h delete mode 100644 ace/SOCK_IO.i delete mode 100644 ace/SOCK_SEQPACK_Acceptor.cpp delete mode 100644 ace/SOCK_SEQPACK_Acceptor.h delete mode 100644 ace/SOCK_SEQPACK_Acceptor.i delete mode 100644 ace/SOCK_SEQPACK_Association.cpp delete mode 100644 ace/SOCK_SEQPACK_Association.h delete mode 100644 ace/SOCK_SEQPACK_Association.i delete mode 100644 ace/SOCK_SEQPACK_Connector.cpp delete mode 100644 ace/SOCK_SEQPACK_Connector.h delete mode 100644 ace/SOCK_SEQPACK_Connector.i delete mode 100644 ace/SOCK_Stream.cpp delete mode 100644 ace/SOCK_Stream.h delete mode 100644 ace/SOCK_Stream.i delete mode 100644 ace/SPIPE.cpp delete mode 100644 ace/SPIPE.h delete mode 100644 ace/SPIPE.i delete mode 100644 ace/SPIPE_Acceptor.cpp delete mode 100644 ace/SPIPE_Acceptor.h delete mode 100644 ace/SPIPE_Addr.cpp delete mode 100644 ace/SPIPE_Addr.h delete mode 100644 ace/SPIPE_Addr.i delete mode 100644 ace/SPIPE_Connector.cpp delete mode 100644 ace/SPIPE_Connector.h delete mode 100644 ace/SPIPE_Connector.i delete mode 100644 ace/SPIPE_Stream.cpp delete mode 100644 ace/SPIPE_Stream.h delete mode 100644 ace/SPIPE_Stream.i delete mode 100644 ace/SSL/ACE_SSL.dsp delete mode 100644 ace/SSL/ACE_SSL.dsw delete mode 100644 ace/SSL/ACE_SSL_LIB.dsp delete mode 100644 ace/SSL/ACE_SSL_LIB.dsw delete mode 100644 ace/SSL/Makefile delete mode 100644 ace/SSL/Makefile.bor delete mode 100644 ace/SSL/SSL_Asynch_BIO.cpp delete mode 100644 ace/SSL/SSL_Asynch_BIO.h delete mode 100644 ace/SSL/SSL_Asynch_Stream.cpp delete mode 100644 ace/SSL/SSL_Asynch_Stream.h delete mode 100644 ace/SSL/SSL_Context.cpp delete mode 100644 ace/SSL/SSL_Context.h delete mode 100644 ace/SSL/SSL_Context.inl delete mode 100644 ace/SSL/SSL_Export.h delete mode 100644 ace/SSL/SSL_SOCK.cpp delete mode 100644 ace/SSL/SSL_SOCK.h delete mode 100644 ace/SSL/SSL_SOCK.i delete mode 100644 ace/SSL/SSL_SOCK_Acceptor.cpp delete mode 100644 ace/SSL/SSL_SOCK_Acceptor.h delete mode 100644 ace/SSL/SSL_SOCK_Acceptor.i delete mode 100644 ace/SSL/SSL_SOCK_Connector.cpp delete mode 100644 ace/SSL/SSL_SOCK_Connector.h delete mode 100644 ace/SSL/SSL_SOCK_Connector.i delete mode 100644 ace/SSL/SSL_SOCK_Stream.cpp delete mode 100644 ace/SSL/SSL_SOCK_Stream.h delete mode 100644 ace/SSL/SSL_SOCK_Stream.i delete mode 100644 ace/SSL/ssl.mpc delete mode 100644 ace/SSL/sslconf.h delete mode 100644 ace/SString.cpp delete mode 100644 ace/SString.h delete mode 100644 ace/SString.i delete mode 100644 ace/SUN_Proactor.cpp delete mode 100644 ace/SUN_Proactor.h delete mode 100644 ace/SUN_Proactor.i delete mode 100644 ace/SV_Message.cpp delete mode 100644 ace/SV_Message.h delete mode 100644 ace/SV_Message.i delete mode 100644 ace/SV_Message_Queue.cpp delete mode 100644 ace/SV_Message_Queue.h delete mode 100644 ace/SV_Message_Queue.i delete mode 100644 ace/SV_Semaphore_Complex.cpp delete mode 100644 ace/SV_Semaphore_Complex.h delete mode 100644 ace/SV_Semaphore_Complex.i delete mode 100644 ace/SV_Semaphore_Simple.cpp delete mode 100644 ace/SV_Semaphore_Simple.h delete mode 100644 ace/SV_Semaphore_Simple.i delete mode 100644 ace/SV_Shared_Memory.cpp delete mode 100644 ace/SV_Shared_Memory.h delete mode 100644 ace/SV_Shared_Memory.i delete mode 100644 ace/Sample_History.cpp delete mode 100644 ace/Sample_History.h delete mode 100644 ace/Sample_History.inl delete mode 100644 ace/Sched_Params.cpp delete mode 100644 ace/Sched_Params.h delete mode 100644 ace/Sched_Params.i delete mode 100644 ace/Select_Reactor.cpp delete mode 100644 ace/Select_Reactor.h delete mode 100644 ace/Select_Reactor_Base.cpp delete mode 100644 ace/Select_Reactor_Base.h delete mode 100644 ace/Select_Reactor_Base.i delete mode 100644 ace/Select_Reactor_T.cpp delete mode 100644 ace/Select_Reactor_T.h delete mode 100644 ace/Select_Reactor_T.i delete mode 100644 ace/Service_Config.cpp delete mode 100644 ace/Service_Config.h delete mode 100644 ace/Service_Config.i delete mode 100644 ace/Service_Manager.cpp delete mode 100644 ace/Service_Manager.h delete mode 100644 ace/Service_Manager.i delete mode 100644 ace/Service_Object.cpp delete mode 100644 ace/Service_Object.h delete mode 100644 ace/Service_Object.i delete mode 100644 ace/Service_Repository.cpp delete mode 100644 ace/Service_Repository.h delete mode 100644 ace/Service_Repository.i delete mode 100644 ace/Service_Templates.cpp delete mode 100644 ace/Service_Templates.h delete mode 100644 ace/Service_Types.cpp delete mode 100644 ace/Service_Types.h delete mode 100644 ace/Service_Types.i delete mode 100644 ace/Shared_Memory.cpp delete mode 100644 ace/Shared_Memory.h delete mode 100644 ace/Shared_Memory_MM.cpp delete mode 100644 ace/Shared_Memory_MM.h delete mode 100644 ace/Shared_Memory_MM.i delete mode 100644 ace/Shared_Memory_SV.cpp delete mode 100644 ace/Shared_Memory_SV.h delete mode 100644 ace/Shared_Memory_SV.i delete mode 100644 ace/Shared_Object.cpp delete mode 100644 ace/Shared_Object.h delete mode 100644 ace/Shared_Object.i delete mode 100644 ace/Signal.cpp delete mode 100644 ace/Signal.h delete mode 100644 ace/Signal.i delete mode 100644 ace/Singleton.cpp delete mode 100644 ace/Singleton.h delete mode 100644 ace/Singleton.i delete mode 100644 ace/Sock_Connect.cpp delete mode 100644 ace/Sock_Connect.h delete mode 100644 ace/Sock_Connect.i delete mode 100644 ace/Stats.cpp delete mode 100644 ace/Stats.h delete mode 100644 ace/Stats.i delete mode 100644 ace/Strategies.h delete mode 100644 ace/Strategies_T.cpp delete mode 100644 ace/Strategies_T.h delete mode 100644 ace/Strategies_T.i delete mode 100644 ace/Stream.cpp delete mode 100644 ace/Stream.h delete mode 100644 ace/Stream.i delete mode 100644 ace/Stream_Modules.cpp delete mode 100644 ace/Stream_Modules.h delete mode 100644 ace/String_Base.cpp delete mode 100644 ace/String_Base.h delete mode 100644 ace/String_Base.i delete mode 100644 ace/String_Base_Const.cpp delete mode 100644 ace/String_Base_Const.h delete mode 100644 ace/Svc_Conf.h delete mode 100644 ace/Svc_Conf.l delete mode 100644 ace/Svc_Conf.y delete mode 100644 ace/Svc_Conf_Lexer_Guard.cpp delete mode 100644 ace/Svc_Conf_Lexer_Guard.h delete mode 100644 ace/Svc_Conf_Tokens.h delete mode 100644 ace/Svc_Conf_l.cpp delete mode 100644 ace/Svc_Conf_y.cpp delete mode 100644 ace/Svc_Handler.cpp delete mode 100644 ace/Svc_Handler.h delete mode 100644 ace/Swap.cpp delete mode 100644 ace/Swap.h delete mode 100644 ace/Swap.inl delete mode 100644 ace/Synch.cpp delete mode 100644 ace/Synch.h delete mode 100644 ace/Synch.i delete mode 100644 ace/Synch_Options.cpp delete mode 100644 ace/Synch_Options.h delete mode 100644 ace/Synch_Options.i delete mode 100644 ace/Synch_T.cpp delete mode 100644 ace/Synch_T.h delete mode 100644 ace/Synch_T.i delete mode 100644 ace/System_Time.cpp delete mode 100644 ace/System_Time.h delete mode 100644 ace/TLI.cpp delete mode 100644 ace/TLI.h delete mode 100644 ace/TLI.i delete mode 100644 ace/TLI_Acceptor.cpp delete mode 100644 ace/TLI_Acceptor.h delete mode 100644 ace/TLI_Connector.cpp delete mode 100644 ace/TLI_Connector.h delete mode 100644 ace/TLI_Connector.i delete mode 100644 ace/TLI_Stream.cpp delete mode 100644 ace/TLI_Stream.h delete mode 100644 ace/TLI_Stream.i delete mode 100644 ace/TP_Reactor.cpp delete mode 100644 ace/TP_Reactor.h delete mode 100644 ace/TP_Reactor.i delete mode 100644 ace/TTY_IO.cpp delete mode 100644 ace/TTY_IO.h delete mode 100644 ace/Task.cpp delete mode 100644 ace/Task.h delete mode 100644 ace/Task.i delete mode 100644 ace/Task_T.cpp delete mode 100644 ace/Task_T.h delete mode 100644 ace/Task_T.i delete mode 100644 ace/Template_Instantiations.cpp delete mode 100644 ace/Test_and_Set.cpp delete mode 100644 ace/Test_and_Set.h delete mode 100644 ace/Test_and_Set.i delete mode 100644 ace/Thread.cpp delete mode 100644 ace/Thread.h delete mode 100644 ace/Thread.i delete mode 100644 ace/Thread_Adapter.cpp delete mode 100644 ace/Thread_Adapter.h delete mode 100644 ace/Thread_Adapter.inl delete mode 100644 ace/Thread_Control.cpp delete mode 100644 ace/Thread_Control.h delete mode 100644 ace/Thread_Control.inl delete mode 100644 ace/Thread_Exit.cpp delete mode 100644 ace/Thread_Exit.h delete mode 100644 ace/Thread_Hook.cpp delete mode 100644 ace/Thread_Hook.h delete mode 100644 ace/Thread_Manager.cpp delete mode 100644 ace/Thread_Manager.h delete mode 100644 ace/Thread_Manager.i delete mode 100644 ace/Time_Request_Reply.cpp delete mode 100644 ace/Time_Request_Reply.h delete mode 100644 ace/Time_Value.cpp delete mode 100644 ace/Time_Value.h delete mode 100644 ace/Time_Value.inl delete mode 100644 ace/Timeprobe.cpp delete mode 100644 ace/Timeprobe.h delete mode 100644 ace/Timeprobe.i delete mode 100644 ace/Timeprobe_T.cpp delete mode 100644 ace/Timeprobe_T.h delete mode 100644 ace/Timer_Hash.cpp delete mode 100644 ace/Timer_Hash.h delete mode 100644 ace/Timer_Hash_T.cpp delete mode 100644 ace/Timer_Hash_T.h delete mode 100644 ace/Timer_Heap.cpp delete mode 100644 ace/Timer_Heap.h delete mode 100644 ace/Timer_Heap_T.cpp delete mode 100644 ace/Timer_Heap_T.h delete mode 100644 ace/Timer_List.cpp delete mode 100644 ace/Timer_List.h delete mode 100644 ace/Timer_List_T.cpp delete mode 100644 ace/Timer_List_T.h delete mode 100644 ace/Timer_Queue.cpp delete mode 100644 ace/Timer_Queue.h delete mode 100644 ace/Timer_Queue_Adapters.cpp delete mode 100644 ace/Timer_Queue_Adapters.h delete mode 100644 ace/Timer_Queue_Adapters.i delete mode 100644 ace/Timer_Queue_T.cpp delete mode 100644 ace/Timer_Queue_T.h delete mode 100644 ace/Timer_Queue_T.i delete mode 100644 ace/Timer_Wheel.cpp delete mode 100644 ace/Timer_Wheel.h delete mode 100644 ace/Timer_Wheel_T.cpp delete mode 100644 ace/Timer_Wheel_T.h delete mode 100644 ace/TkReactor.cpp delete mode 100644 ace/TkReactor.h delete mode 100644 ace/Token.cpp delete mode 100644 ace/Token.h delete mode 100644 ace/Token.i delete mode 100644 ace/Token_Collection.cpp delete mode 100644 ace/Token_Collection.h delete mode 100644 ace/Token_Collection.i delete mode 100644 ace/Token_Invariants.cpp delete mode 100644 ace/Token_Invariants.h delete mode 100644 ace/Token_Manager.cpp delete mode 100644 ace/Token_Manager.h delete mode 100644 ace/Token_Manager.i delete mode 100644 ace/Token_Request_Reply.cpp delete mode 100644 ace/Token_Request_Reply.h delete mode 100644 ace/Token_Request_Reply.i delete mode 100644 ace/Trace.cpp delete mode 100644 ace/Trace.h delete mode 100644 ace/Typed_SV_Message.cpp delete mode 100644 ace/Typed_SV_Message.h delete mode 100644 ace/Typed_SV_Message.i delete mode 100644 ace/Typed_SV_Message_Queue.cpp delete mode 100644 ace/Typed_SV_Message_Queue.h delete mode 100644 ace/Typed_SV_Message_Queue.i delete mode 100644 ace/UNIX_Addr.cpp delete mode 100644 ace/UNIX_Addr.h delete mode 100644 ace/UNIX_Addr.i delete mode 100644 ace/UPIPE_Acceptor.cpp delete mode 100644 ace/UPIPE_Acceptor.h delete mode 100644 ace/UPIPE_Acceptor.i delete mode 100644 ace/UPIPE_Addr.h delete mode 100644 ace/UPIPE_Connector.cpp delete mode 100644 ace/UPIPE_Connector.h delete mode 100644 ace/UPIPE_Connector.i delete mode 100644 ace/UPIPE_Stream.cpp delete mode 100644 ace/UPIPE_Stream.h delete mode 100644 ace/UPIPE_Stream.i delete mode 100644 ace/Unbounded_Queue.cpp delete mode 100644 ace/Unbounded_Queue.h delete mode 100644 ace/Unbounded_Queue.inl delete mode 100644 ace/Unbounded_Set.cpp delete mode 100644 ace/Unbounded_Set.h delete mode 100644 ace/Unbounded_Set.inl delete mode 100644 ace/Unbounded_Set_Ex.cpp delete mode 100644 ace/Unbounded_Set_Ex.h delete mode 100644 ace/Unbounded_Set_Ex.inl delete mode 100644 ace/Vector_T.cpp delete mode 100644 ace/Vector_T.h delete mode 100644 ace/Vector_T.i delete mode 100644 ace/Version.h delete mode 100644 ace/WFMO_Reactor.cpp delete mode 100644 ace/WFMO_Reactor.h delete mode 100644 ace/WFMO_Reactor.i delete mode 100644 ace/WIN32_Asynch_IO.cpp delete mode 100644 ace/WIN32_Asynch_IO.h delete mode 100644 ace/WIN32_Proactor.cpp delete mode 100644 ace/WIN32_Proactor.h delete mode 100644 ace/XML_Svc_Conf.cpp delete mode 100644 ace/XML_Svc_Conf.h delete mode 100644 ace/XTI_ATM_Mcast.cpp delete mode 100644 ace/XTI_ATM_Mcast.h delete mode 100644 ace/XTI_ATM_Mcast.i delete mode 100644 ace/XtReactor.cpp delete mode 100644 ace/XtReactor.h delete mode 100644 ace/ace-dll.icc delete mode 100644 ace/ace-lib.icc delete mode 100644 ace/ace.dsw delete mode 100755 ace/ace.icc delete mode 100644 ace/ace.icp delete mode 100644 ace/ace.mpc delete mode 100644 ace/ace.mwc delete mode 100644 ace/ace.rc delete mode 100644 ace/ace_ce_dll.cfg delete mode 100644 ace/ace_dll.dsp delete mode 100644 ace/ace_dll64.mak delete mode 100644 ace/ace_lib.dsp delete mode 100644 ace/ace_lib64.mak delete mode 100644 ace/ace_message_table.bin delete mode 100644 ace/ace_vacpp_options.icc delete mode 100644 ace/ace_wchar.h delete mode 100644 ace/ace_wchar.inl delete mode 100644 ace/config-WinCE.h delete mode 100644 ace/config-aix-4.1.x.h delete mode 100644 ace/config-aix-4.2.x.h delete mode 100644 ace/config-aix-4.3.x.h delete mode 100644 ace/config-aix-4.x.h delete mode 100644 ace/config-aix5.1.h delete mode 100644 ace/config-all.h delete mode 100644 ace/config-borland-common.h delete mode 100644 ace/config-chorus.h delete mode 100644 ace/config-cray.h delete mode 100644 ace/config-cxx-common.h delete mode 100644 ace/config-cygwin32-common.h delete mode 100644 ace/config-cygwin32.h delete mode 100644 ace/config-dgux-4.11-epc.h delete mode 100644 ace/config-dgux-4.x-ghs.h delete mode 100644 ace/config-doxygen.h delete mode 100644 ace/config-freebsd.h delete mode 100644 ace/config-fsu-pthread.h delete mode 100644 ace/config-g++-common.h delete mode 100644 ace/config-ghs-common.h delete mode 100644 ace/config-hpux-10.x-g++.h delete mode 100644 ace/config-hpux-10.x-hpc++.h delete mode 100644 ace/config-hpux-10.x.h delete mode 100644 ace/config-hpux-11.00.h delete mode 100644 ace/config-hpux11.h delete mode 100644 ace/config-icc-common.h delete mode 100644 ace/config-irix5.2.h delete mode 100644 ace/config-irix5.3-g++.h delete mode 100644 ace/config-irix5.3-sgic++.h delete mode 100644 ace/config-irix6.5.x-sgic++.h delete mode 100644 ace/config-irix6.x-common.h delete mode 100644 ace/config-irix6.x-g++.h delete mode 100644 ace/config-irix6.x-kcc.h delete mode 100644 ace/config-irix6.x-sgic++-nothreads.h delete mode 100644 ace/config-irix6.x-sgic++.h delete mode 100644 ace/config-kcc-common.h delete mode 100644 ace/config-linux-common.h delete mode 100644 ace/config-linux.h delete mode 100644 ace/config-lynxos.h delete mode 100644 ace/config-m88k.h delete mode 100644 ace/config-macosx.h delete mode 100644 ace/config-minimal.h delete mode 100644 ace/config-mit-pthread.h delete mode 100644 ace/config-mklinux.h delete mode 100644 ace/config-mvs.h delete mode 100644 ace/config-netbsd.h delete mode 100644 ace/config-openbsd.h delete mode 100644 ace/config-osf1-3.2.h delete mode 100644 ace/config-osf1-4.0.h delete mode 100644 ace/config-pharlap.h delete mode 100644 ace/config-posix.h delete mode 100644 ace/config-psos-diab-mips.h delete mode 100644 ace/config-psos-diab-ppc.h delete mode 100644 ace/config-psos-diab.h delete mode 100644 ace/config-psos-tm.h delete mode 100644 ace/config-psosim-g++.h delete mode 100644 ace/config-qnx-neutrino.h delete mode 100644 ace/config-qnx-rtp.h delete mode 100644 ace/config-rtems.h delete mode 100644 ace/config-sco-4.2-nothread.h delete mode 100644 ace/config-sco-5.0.0-fsu-pthread.h delete mode 100644 ace/config-sco-5.0.0-mit-pthread.h delete mode 100644 ace/config-sco-5.0.0-nothread.h delete mode 100644 ace/config-sco-5.0.0.h delete mode 100644 ace/config-sunos4-g++.h delete mode 100644 ace/config-sunos4-lucid3.2.h delete mode 100644 ace/config-sunos4-sun3.x.h delete mode 100644 ace/config-sunos4-sun4.1.4.h delete mode 100644 ace/config-sunos4-sun4.x.h delete mode 100644 ace/config-sunos5.4-centerline-2.x.h delete mode 100644 ace/config-sunos5.4-g++.h delete mode 100644 ace/config-sunos5.4-sunc++-4.x.h delete mode 100644 ace/config-sunos5.5.h delete mode 100644 ace/config-sunos5.6.h delete mode 100644 ace/config-sunos5.7.h delete mode 100644 ace/config-sunos5.8.h delete mode 100644 ace/config-sunos5.9.h delete mode 100644 ace/config-tandem.h delete mode 100644 ace/config-tru64.h delete mode 100644 ace/config-unixware-2.01-g++.h delete mode 100644 ace/config-unixware-2.1.2-g++.h delete mode 100644 ace/config-unixware-7.1.0.h delete mode 100644 ace/config-unixware-7.1.0.udk.h delete mode 100644 ace/config-visualage.h delete mode 100644 ace/config-vxworks5.x.h delete mode 100644 ace/config-win32-borland.h delete mode 100644 ace/config-win32-common.h delete mode 100644 ace/config-win32-ghs.h delete mode 100644 ace/config-win32-mingw.h delete mode 100644 ace/config-win32-msvc-5.h delete mode 100644 ace/config-win32-msvc-6.h delete mode 100644 ace/config-win32-msvc-7.h delete mode 100644 ace/config-win32-msvc.h delete mode 100644 ace/config-win32-visualage.h delete mode 100644 ace/config-win32.h delete mode 100644 ace/gethrtime.cpp delete mode 100644 ace/iosfwd.h delete mode 100644 ace/post.h delete mode 100644 ace/pre.h delete mode 100644 ace/streams.h delete mode 100644 ace/svc_export.h delete mode 100644 aceConf.sh.in delete mode 100644 apps/FaCE/ACE.ico delete mode 100644 apps/FaCE/ACE_Racer.bmp delete mode 100644 apps/FaCE/CE_ARGV.CPP delete mode 100644 apps/FaCE/CE_ARGV.H delete mode 100644 apps/FaCE/CE_Screen_Output.cpp delete mode 100644 apps/FaCE/CE_Screen_Output.h delete mode 100644 apps/FaCE/FACE.ico delete mode 100644 apps/FaCE/FaCE.cpp delete mode 100644 apps/FaCE/FaCE.h delete mode 100644 apps/FaCE/FaCE.rc delete mode 100644 apps/FaCE/FaCE.vcp delete mode 100644 apps/FaCE/FaCE.vcw delete mode 100644 apps/FaCE/FaCENOACE.vcp delete mode 100644 apps/FaCE/FaCENOACE.vcw delete mode 100644 apps/FaCE/FaCE_OS.h delete mode 100644 apps/FaCE/License.txt delete mode 100644 apps/FaCE/Main.cpp delete mode 100644 apps/FaCE/ReadMe.txt delete mode 100644 apps/FaCE/TAO.bmp delete mode 100644 apps/FaCE/newres.h delete mode 100644 apps/FaCE/resource.h delete mode 100644 apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp delete mode 100644 apps/Gateway/Gateway/Concrete_Connection_Handlers.h delete mode 100644 apps/Gateway/Gateway/Config_Files.cpp delete mode 100644 apps/Gateway/Gateway/Config_Files.h delete mode 100644 apps/Gateway/Gateway/Connection_Handler.cpp delete mode 100644 apps/Gateway/Gateway/Connection_Handler.h delete mode 100644 apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp delete mode 100644 apps/Gateway/Gateway/Connection_Handler_Acceptor.h delete mode 100644 apps/Gateway/Gateway/Connection_Handler_Connector.cpp delete mode 100644 apps/Gateway/Gateway/Connection_Handler_Connector.h delete mode 100644 apps/Gateway/Gateway/Consumer_Dispatch_Set.h delete mode 100644 apps/Gateway/Gateway/Event.h delete mode 100644 apps/Gateway/Gateway/Event_Channel.cpp delete mode 100644 apps/Gateway/Gateway/Event_Channel.h delete mode 100644 apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp delete mode 100644 apps/Gateway/Gateway/Event_Forwarding_Discriminator.h delete mode 100644 apps/Gateway/Gateway/File_Parser.cpp delete mode 100644 apps/Gateway/Gateway/File_Parser.h delete mode 100644 apps/Gateway/Gateway/Gateway.cpp delete mode 100644 apps/Gateway/Gateway/Gateway.dsp delete mode 100644 apps/Gateway/Gateway/Gateway.dsw delete mode 100644 apps/Gateway/Gateway/Gateway.h delete mode 100644 apps/Gateway/Gateway/Makefile delete mode 100644 apps/Gateway/Gateway/Makefile.bor delete mode 100644 apps/Gateway/Gateway/Options.cpp delete mode 100644 apps/Gateway/Gateway/Options.h delete mode 100644 apps/Gateway/Gateway/connection_config delete mode 100644 apps/Gateway/Gateway/consumer_config delete mode 100644 apps/Gateway/Gateway/gatewayd.cpp delete mode 100644 apps/Gateway/Gateway/gatewayd.dsp delete mode 100644 apps/Gateway/Gateway/svc.conf delete mode 100644 apps/Gateway/Makefile delete mode 100644 apps/Gateway/Makefile.bor delete mode 100644 apps/Gateway/Peer/Makefile delete mode 100644 apps/Gateway/Peer/Makefile.bor delete mode 100644 apps/Gateway/Peer/Options.cpp delete mode 100644 apps/Gateway/Peer/Options.h delete mode 100644 apps/Gateway/Peer/Peer.cpp delete mode 100644 apps/Gateway/Peer/Peer.dsp delete mode 100644 apps/Gateway/Peer/Peer.dsw delete mode 100644 apps/Gateway/Peer/Peer.h delete mode 100644 apps/Gateway/Peer/peerd.cpp delete mode 100644 apps/Gateway/Peer/peerd.dsp delete mode 100644 apps/Gateway/Peer/svc.conf delete mode 100644 apps/Gateway/README delete mode 100644 apps/JAWS/ChangeLog delete mode 100644 apps/JAWS/Makefile delete mode 100644 apps/JAWS/Makefile.bor delete mode 100644 apps/JAWS/README delete mode 100644 apps/JAWS/clients/Blobby/Blob.cpp delete mode 100644 apps/JAWS/clients/Blobby/Blob.h delete mode 100644 apps/JAWS/clients/Blobby/Blob_Handler.cpp delete mode 100644 apps/JAWS/clients/Blobby/Blob_Handler.h delete mode 100644 apps/JAWS/clients/Blobby/Makefile delete mode 100644 apps/JAWS/clients/Blobby/Makefile.bor delete mode 100644 apps/JAWS/clients/Blobby/Options.cpp delete mode 100644 apps/JAWS/clients/Blobby/Options.h delete mode 100644 apps/JAWS/clients/Blobby/README delete mode 100644 apps/JAWS/clients/Blobby/blobby.cpp delete mode 100644 apps/JAWS/clients/Caching/Caching.dsp delete mode 100644 apps/JAWS/clients/Caching/Caching.dsw delete mode 100644 apps/JAWS/clients/Caching/ID_Generator.cpp delete mode 100644 apps/JAWS/clients/Caching/ID_Generator.h delete mode 100644 apps/JAWS/clients/Caching/Local_Locator.cpp delete mode 100644 apps/JAWS/clients/Caching/Local_Locator.h delete mode 100644 apps/JAWS/clients/Caching/Local_Locator.i delete mode 100644 apps/JAWS/clients/Caching/Locator_Request_Reply.cpp delete mode 100644 apps/JAWS/clients/Caching/Locator_Request_Reply.h delete mode 100644 apps/JAWS/clients/Caching/Locator_Request_Reply.i delete mode 100644 apps/JAWS/clients/Caching/Makefile delete mode 100644 apps/JAWS/clients/Caching/Makefile.bor delete mode 100644 apps/JAWS/clients/Caching/README delete mode 100644 apps/JAWS/clients/Caching/URL_Array_Helper.cpp delete mode 100644 apps/JAWS/clients/Caching/URL_Array_Helper.h delete mode 100644 apps/JAWS/clients/Caching/URL_Locator.cpp delete mode 100644 apps/JAWS/clients/Caching/URL_Locator.h delete mode 100644 apps/JAWS/clients/Caching/URL_Locator.i delete mode 100644 apps/JAWS/clients/Caching/URL_Properties.cpp delete mode 100644 apps/JAWS/clients/Caching/URL_Properties.h delete mode 100644 apps/JAWS/clients/Caching/URL_Properties.i delete mode 100644 apps/JAWS/clients/Caching/http_client.cpp delete mode 100644 apps/JAWS/clients/Caching/http_handler.cpp delete mode 100644 apps/JAWS/clients/Caching/http_handler.h delete mode 100644 apps/JAWS/clients/Caching/test_URL.cpp delete mode 100644 apps/JAWS/clients/Makefile delete mode 100644 apps/JAWS/clients/Makefile.bor delete mode 100644 apps/JAWS/clients/README delete mode 100644 apps/JAWS/clients/WebSTONE/COPYING delete mode 100644 apps/JAWS/clients/WebSTONE/README delete mode 100644 apps/JAWS/clients/WebSTONE/README.DynamicWorkload delete mode 100644 apps/JAWS/clients/WebSTONE/README.FIRST delete mode 100644 apps/JAWS/clients/WebSTONE/WEBSTONE-VERSION-2.0 delete mode 100755 apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/checkfilelist delete mode 100755 apps/JAWS/clients/WebSTONE/bin/genfiles delete mode 100755 apps/JAWS/clients/WebSTONE/bin/genfiles-from-filelist.sh delete mode 100755 apps/JAWS/clients/WebSTONE/bin/gui-configure delete mode 100755 apps/JAWS/clients/WebSTONE/bin/killbench delete mode 100755 apps/JAWS/clients/WebSTONE/bin/killbench.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/mine-logs.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/move-filelist.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/move-runs.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/rebootall delete mode 100755 apps/JAWS/clients/WebSTONE/bin/runbench delete mode 100755 apps/JAWS/clients/WebSTONE/bin/runbench.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/tabs2html delete mode 100755 apps/JAWS/clients/WebSTONE/bin/view-results.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/webstone-gui.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/write-testbed.pl delete mode 100755 apps/JAWS/clients/WebSTONE/bin/wscollect.pl delete mode 100644 apps/JAWS/clients/WebSTONE/conf/filelist delete mode 100644 apps/JAWS/clients/WebSTONE/conf/filelist.cgi-heavy delete mode 100644 apps/JAWS/clients/WebSTONE/conf/filelist.dynamic-heavy delete mode 100644 apps/JAWS/clients/WebSTONE/conf/filelist.dynamic-light delete mode 100644 apps/JAWS/clients/WebSTONE/conf/filelist.dynamic-medium delete mode 100644 apps/JAWS/clients/WebSTONE/conf/filelist.homepage delete mode 100644 apps/JAWS/clients/WebSTONE/conf/filelist.sample delete mode 100644 apps/JAWS/clients/WebSTONE/conf/filelist.standard delete mode 100644 apps/JAWS/clients/WebSTONE/conf/fileset delete mode 100755 apps/JAWS/clients/WebSTONE/conf/paths.pl delete mode 100644 apps/JAWS/clients/WebSTONE/conf/paths.sh delete mode 100644 apps/JAWS/clients/WebSTONE/conf/testbed delete mode 100644 apps/JAWS/clients/WebSTONE/doc/COPYING delete mode 100644 apps/JAWS/clients/WebSTONE/doc/FAQ-webstone.html delete mode 100644 apps/JAWS/clients/WebSTONE/doc/LICENSE.html delete mode 100644 apps/JAWS/clients/WebSTONE/doc/WebStone.html delete mode 100755 apps/JAWS/clients/WebSTONE/doc/testbed.help delete mode 100644 apps/JAWS/clients/WebSTONE/doc/webstone-white-paper.ps delete mode 100644 apps/JAWS/clients/WebSTONE/doc/webstone.gif delete mode 100644 apps/JAWS/clients/WebSTONE/doc/webstone2.html delete mode 100644 apps/JAWS/clients/WebSTONE/src/Makefile delete mode 100755 apps/JAWS/clients/WebSTONE/src/README delete mode 100644 apps/JAWS/clients/WebSTONE/src/acconfig.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/bench.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/bench.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/cgi-send.c delete mode 100755 apps/JAWS/clients/WebSTONE/src/client/webclient.mak delete mode 100644 apps/JAWS/clients/WebSTONE/src/config.cache delete mode 100755 apps/JAWS/clients/WebSTONE/src/config.guess delete mode 100644 apps/JAWS/clients/WebSTONE/src/config.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/config.h.in delete mode 100644 apps/JAWS/clients/WebSTONE/src/config.log delete mode 100755 apps/JAWS/clients/WebSTONE/src/config.status delete mode 100755 apps/JAWS/clients/WebSTONE/src/config.sub delete mode 100755 apps/JAWS/clients/WebSTONE/src/configure delete mode 100644 apps/JAWS/clients/WebSTONE/src/configure.in delete mode 100644 apps/JAWS/clients/WebSTONE/src/debug.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/errexit.c delete mode 100755 apps/JAWS/clients/WebSTONE/src/gendata/genrand.mak delete mode 100644 apps/JAWS/clients/WebSTONE/src/genrand.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/get.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/get.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/getopt.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/gettimeofday.c delete mode 100755 apps/JAWS/clients/WebSTONE/src/install-sh delete mode 100644 apps/JAWS/clients/WebSTONE/src/logfile27859 delete mode 100755 apps/JAWS/clients/WebSTONE/src/master/webmaster.mak delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/crit.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/dll.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nterrors.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/objndx.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/pblock.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/sem.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shmem.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/log.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/protocol.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/servact.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-includes/netsite.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/nsapi-send.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/parse_file_list.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/parse_file_list.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/rexec.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/statistics.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/statistics.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/sysdep.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/sysdep.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/timefunc.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/timefunc.h delete mode 100644 apps/JAWS/clients/WebSTONE/src/webclient.c delete mode 100644 apps/JAWS/clients/WebSTONE/src/webmaster.c delete mode 100755 apps/JAWS/clients/WebSTONE/webstone delete mode 100644 apps/JAWS/server/HTTP_Config.cpp delete mode 100644 apps/JAWS/server/HTTP_Config.h delete mode 100644 apps/JAWS/server/HTTP_Handler.cpp delete mode 100644 apps/JAWS/server/HTTP_Handler.h delete mode 100644 apps/JAWS/server/HTTP_Helpers.cpp delete mode 100644 apps/JAWS/server/HTTP_Helpers.h delete mode 100644 apps/JAWS/server/HTTP_Request.cpp delete mode 100644 apps/JAWS/server/HTTP_Request.h delete mode 100644 apps/JAWS/server/HTTP_Response.cpp delete mode 100644 apps/JAWS/server/HTTP_Response.h delete mode 100644 apps/JAWS/server/HTTP_Server.cpp delete mode 100644 apps/JAWS/server/HTTP_Server.h delete mode 100644 apps/JAWS/server/IO.cpp delete mode 100644 apps/JAWS/server/IO.h delete mode 100644 apps/JAWS/server/JAWS_Concurrency.cpp delete mode 100644 apps/JAWS/server/JAWS_Concurrency.h delete mode 100644 apps/JAWS/server/JAWS_Pipeline.cpp delete mode 100644 apps/JAWS/server/JAWS_Pipeline.h delete mode 100644 apps/JAWS/server/JAWS_Pipeline_Handler.cpp delete mode 100644 apps/JAWS/server/JAWS_Pipeline_Handler.h delete mode 100644 apps/JAWS/server/Makefile delete mode 100644 apps/JAWS/server/Makefile.bor delete mode 100644 apps/JAWS/server/Parse_Headers.cpp delete mode 100644 apps/JAWS/server/Parse_Headers.h delete mode 100644 apps/JAWS/server/README delete mode 100644 apps/JAWS/server/jaws.auth delete mode 100644 apps/JAWS/server/jaws.dsp delete mode 100644 apps/JAWS/server/jaws.dsw delete mode 100644 apps/JAWS/server/main.cpp delete mode 100644 apps/JAWS/server/svc.conf delete mode 100755 apps/JAWS/server/test.cgi delete mode 100644 apps/JAWS/stress_testing/Makefile delete mode 100644 apps/JAWS/stress_testing/README delete mode 100644 apps/JAWS/stress_testing/benchd.cpp delete mode 100644 apps/JAWS/stress_testing/client.h delete mode 100644 apps/JAWS/stress_testing/config delete mode 100644 apps/JAWS/stress_testing/connection.cpp delete mode 100644 apps/JAWS/stress_testing/connection.h delete mode 100644 apps/JAWS/stress_testing/cp.cpp delete mode 100644 apps/JAWS/stress_testing/cp.h delete mode 100644 apps/JAWS/stress_testing/global.h delete mode 100644 apps/JAWS/stress_testing/http.h delete mode 100644 apps/JAWS/stress_testing/http_tester.cpp delete mode 100644 apps/JAWS/stress_testing/out delete mode 100644 apps/JAWS/stress_testing/stats.cpp delete mode 100644 apps/JAWS/stress_testing/stats.h delete mode 100644 apps/JAWS/stress_testing/util.cpp delete mode 100644 apps/JAWS/stress_testing/util.h delete mode 100644 apps/JAWS2/1000K.html delete mode 100644 apps/JAWS2/100K.html delete mode 100644 apps/JAWS2/500K.html delete mode 100644 apps/JAWS2/50K.html delete mode 100644 apps/JAWS2/5K.html delete mode 100644 apps/JAWS2/HTTPU/HTTPU.DSP delete mode 100644 apps/JAWS2/HTTPU/HTTPU.DSW delete mode 100644 apps/JAWS2/HTTPU/Makefile delete mode 100644 apps/JAWS2/HTTPU/http_base.cpp delete mode 100644 apps/JAWS2/HTTPU/http_base.h delete mode 100644 apps/JAWS2/HTTPU/http_base.i delete mode 100644 apps/JAWS2/HTTPU/http_export.h delete mode 100644 apps/JAWS2/HTTPU/http_headers.cpp delete mode 100644 apps/JAWS2/HTTPU/http_headers.h delete mode 100644 apps/JAWS2/HTTPU/http_headers.i delete mode 100644 apps/JAWS2/HTTPU/http_request.cpp delete mode 100644 apps/JAWS2/HTTPU/http_request.h delete mode 100644 apps/JAWS2/HTTPU/http_request.i delete mode 100644 apps/JAWS2/HTTPU/http_response.cpp delete mode 100644 apps/JAWS2/HTTPU/http_response.h delete mode 100644 apps/JAWS2/HTTPU/http_response.i delete mode 100644 apps/JAWS2/HTTPU/http_status.cpp delete mode 100644 apps/JAWS2/HTTPU/http_status.h delete mode 100644 apps/JAWS2/HTTPU/http_status.i delete mode 100644 apps/JAWS2/HTTPU/parse_http_request.cpp delete mode 100644 apps/JAWS2/HTTPU/parse_http_request.h delete mode 100644 apps/JAWS2/HTTPU/parse_http_request.i delete mode 100644 apps/JAWS2/HTTPU/parse_http_response.cpp delete mode 100644 apps/JAWS2/HTTPU/parse_http_response.h delete mode 100644 apps/JAWS2/HTTPU/parse_http_response.i delete mode 100644 apps/JAWS2/HTTPU/parse_url.cpp delete mode 100644 apps/JAWS2/HTTPU/parse_url.h delete mode 100644 apps/JAWS2/HTTP_10.cpp delete mode 100644 apps/JAWS2/HTTP_10.h delete mode 100644 apps/JAWS2/HTTP_10_Parse.cpp delete mode 100644 apps/JAWS2/HTTP_10_Read.cpp delete mode 100644 apps/JAWS2/HTTP_10_Request.cpp delete mode 100644 apps/JAWS2/HTTP_10_Request.h delete mode 100644 apps/JAWS2/HTTP_10_Write.cpp delete mode 100644 apps/JAWS2/HTTP_Policy.cpp delete mode 100644 apps/JAWS2/HTTP_Policy.h delete mode 100644 apps/JAWS2/JAWS/Assoc_Array.cpp delete mode 100644 apps/JAWS2/JAWS/Assoc_Array.h delete mode 100644 apps/JAWS2/JAWS/Cache_Hash_T.cpp delete mode 100644 apps/JAWS2/JAWS/Cache_Hash_T.h delete mode 100644 apps/JAWS2/JAWS/Cache_Heap_T.cpp delete mode 100644 apps/JAWS2/JAWS/Cache_Heap_T.h delete mode 100644 apps/JAWS2/JAWS/Cache_List_T.cpp delete mode 100644 apps/JAWS2/JAWS/Cache_List_T.h delete mode 100644 apps/JAWS2/JAWS/Cache_Manager.cpp delete mode 100644 apps/JAWS2/JAWS/Cache_Manager.h delete mode 100644 apps/JAWS2/JAWS/Cache_Manager_T.cpp delete mode 100644 apps/JAWS2/JAWS/Cache_Manager_T.h delete mode 100644 apps/JAWS2/JAWS/Cache_Object.cpp delete mode 100644 apps/JAWS2/JAWS/Cache_Object.h delete mode 100644 apps/JAWS2/JAWS/Concurrency.cpp delete mode 100644 apps/JAWS2/JAWS/Concurrency.h delete mode 100644 apps/JAWS2/JAWS/Data_Block.cpp delete mode 100644 apps/JAWS2/JAWS/Data_Block.h delete mode 100644 apps/JAWS2/JAWS/Export.h delete mode 100644 apps/JAWS2/JAWS/FILE.cpp delete mode 100644 apps/JAWS2/JAWS/FILE.h delete mode 100644 apps/JAWS2/JAWS/Filecache.cpp delete mode 100644 apps/JAWS2/JAWS/Filecache.h delete mode 100644 apps/JAWS2/JAWS/Hash_Bucket_T.cpp delete mode 100644 apps/JAWS2/JAWS/Hash_Bucket_T.h delete mode 100644 apps/JAWS2/JAWS/Headers.cpp delete mode 100644 apps/JAWS2/JAWS/Headers.h delete mode 100644 apps/JAWS2/JAWS/IO.cpp delete mode 100644 apps/JAWS2/JAWS/IO.h delete mode 100644 apps/JAWS2/JAWS/IO_Acceptor.cpp delete mode 100644 apps/JAWS2/JAWS/IO_Acceptor.h delete mode 100644 apps/JAWS2/JAWS/IO_Handler.cpp delete mode 100644 apps/JAWS2/JAWS/IO_Handler.h delete mode 100644 apps/JAWS2/JAWS/JAWS.h delete mode 100644 apps/JAWS2/JAWS/Makefile delete mode 100644 apps/JAWS2/JAWS/Makefile.bor delete mode 100644 apps/JAWS2/JAWS/Parse_Headers.cpp delete mode 100644 apps/JAWS2/JAWS/Parse_Headers.h delete mode 100644 apps/JAWS2/JAWS/Pipeline.cpp delete mode 100644 apps/JAWS2/JAWS/Pipeline.h delete mode 100644 apps/JAWS2/JAWS/Pipeline_Handler_T.cpp delete mode 100644 apps/JAWS2/JAWS/Pipeline_Handler_T.h delete mode 100644 apps/JAWS2/JAWS/Pipeline_Tasks.cpp delete mode 100644 apps/JAWS2/JAWS/Pipeline_Tasks.h delete mode 100644 apps/JAWS2/JAWS/Policy.cpp delete mode 100644 apps/JAWS2/JAWS/Policy.h delete mode 100644 apps/JAWS2/JAWS/Reaper.cpp delete mode 100644 apps/JAWS2/JAWS/Reaper.h delete mode 100644 apps/JAWS2/JAWS/Server.cpp delete mode 100644 apps/JAWS2/JAWS/Server.h delete mode 100644 apps/JAWS2/JAWS/Waiter.cpp delete mode 100644 apps/JAWS2/JAWS/Waiter.h delete mode 100644 apps/JAWS2/JAWS/jaws.dsp delete mode 100644 apps/JAWS2/JAWS/jaws.dsw delete mode 100644 apps/JAWS2/Makefile delete mode 100644 apps/JAWS2/Makefile.bor delete mode 100644 apps/JAWS2/README delete mode 100644 apps/JAWS2/main.cpp delete mode 100644 apps/JAWS2/server.dsp delete mode 100644 apps/JAWS2/server.dsw delete mode 100644 apps/Makefile delete mode 100644 apps/Makefile.am delete mode 100644 apps/Makefile.bor delete mode 100644 apps/README delete mode 100644 apps/build.bor delete mode 100644 apps/drwho/BS_Client.cpp delete mode 100644 apps/drwho/BS_Client.h delete mode 100644 apps/drwho/BS_Server.cpp delete mode 100644 apps/drwho/BS_Server.h delete mode 100644 apps/drwho/Binary_Search.cpp delete mode 100644 apps/drwho/Binary_Search.h delete mode 100644 apps/drwho/CM_Client.cpp delete mode 100644 apps/drwho/CM_Client.h delete mode 100644 apps/drwho/CM_Server.cpp delete mode 100644 apps/drwho/CM_Server.h delete mode 100644 apps/drwho/ChangeLog delete mode 100644 apps/drwho/Comm_Manager.h delete mode 100644 apps/drwho/Drwho_Node.cpp delete mode 100644 apps/drwho/Drwho_Node.h delete mode 100644 apps/drwho/File_Manager.cpp delete mode 100644 apps/drwho/File_Manager.h delete mode 100644 apps/drwho/HT_Client.cpp delete mode 100644 apps/drwho/HT_Client.h delete mode 100644 apps/drwho/HT_Server.cpp delete mode 100644 apps/drwho/HT_Server.h delete mode 100644 apps/drwho/Hash_Table.cpp delete mode 100644 apps/drwho/Hash_Table.h delete mode 100644 apps/drwho/Makefile delete mode 100644 apps/drwho/Multicast_Manager.cpp delete mode 100644 apps/drwho/Multicast_Manager.h delete mode 100644 apps/drwho/Options.cpp delete mode 100644 apps/drwho/Options.h delete mode 100644 apps/drwho/PMC_All.cpp delete mode 100644 apps/drwho/PMC_All.h delete mode 100644 apps/drwho/PMC_Flo.cpp delete mode 100644 apps/drwho/PMC_Flo.h delete mode 100644 apps/drwho/PMC_Ruser.cpp delete mode 100644 apps/drwho/PMC_Ruser.h delete mode 100644 apps/drwho/PMC_Usr.cpp delete mode 100644 apps/drwho/PMC_Usr.h delete mode 100644 apps/drwho/PMS_All.cpp delete mode 100644 apps/drwho/PMS_All.h delete mode 100644 apps/drwho/PMS_Flo.cpp delete mode 100644 apps/drwho/PMS_Flo.h delete mode 100644 apps/drwho/PMS_Ruser.cpp delete mode 100644 apps/drwho/PMS_Ruser.h delete mode 100644 apps/drwho/PMS_Usr.cpp delete mode 100644 apps/drwho/PMS_Usr.h delete mode 100644 apps/drwho/PM_Client.cpp delete mode 100644 apps/drwho/PM_Client.h delete mode 100644 apps/drwho/PM_Server.cpp delete mode 100644 apps/drwho/PM_Server.h delete mode 100644 apps/drwho/Protocol_Manager.cpp delete mode 100644 apps/drwho/Protocol_Manager.h delete mode 100644 apps/drwho/Protocol_Record.cpp delete mode 100644 apps/drwho/Protocol_Record.h delete mode 100644 apps/drwho/README delete mode 100644 apps/drwho/Rwho_DB_Manager.cpp delete mode 100644 apps/drwho/Rwho_DB_Manager.h delete mode 100644 apps/drwho/SL_Client.cpp delete mode 100644 apps/drwho/SL_Client.h delete mode 100644 apps/drwho/SL_Server.cpp delete mode 100644 apps/drwho/SL_Server.h delete mode 100644 apps/drwho/SML_Client.cpp delete mode 100644 apps/drwho/SML_Client.h delete mode 100644 apps/drwho/SML_Server.cpp delete mode 100644 apps/drwho/SML_Server.h delete mode 100644 apps/drwho/SMR_Client.cpp delete mode 100644 apps/drwho/SMR_Client.h delete mode 100644 apps/drwho/SMR_Server.cpp delete mode 100644 apps/drwho/SMR_Server.h delete mode 100644 apps/drwho/SM_Client.cpp delete mode 100644 apps/drwho/SM_Client.h delete mode 100644 apps/drwho/SM_Server.cpp delete mode 100644 apps/drwho/SM_Server.h delete mode 100644 apps/drwho/Search_Struct.cpp delete mode 100644 apps/drwho/Search_Struct.h delete mode 100644 apps/drwho/Select_Manager.h delete mode 100644 apps/drwho/Single_Lookup.cpp delete mode 100644 apps/drwho/Single_Lookup.h delete mode 100644 apps/drwho/client.cpp delete mode 100644 apps/drwho/global.h delete mode 100644 apps/drwho/server.cpp delete mode 100644 apps/gperf/COPYING delete mode 100644 apps/gperf/ChangeLog delete mode 100644 apps/gperf/Makefile delete mode 100644 apps/gperf/Makefile.am delete mode 100644 apps/gperf/Makefile.bor delete mode 100644 apps/gperf/README delete mode 100644 apps/gperf/gperf.1 delete mode 100644 apps/gperf/gperf.info delete mode 100644 apps/gperf/gperf.texi delete mode 100755 apps/gperf/mdate-sh delete mode 100644 apps/gperf/src/Bool_Array.cpp delete mode 100644 apps/gperf/src/Bool_Array.h delete mode 100644 apps/gperf/src/Gen_Perf.cpp delete mode 100644 apps/gperf/src/Gen_Perf.h delete mode 100644 apps/gperf/src/Hash_Table.cpp delete mode 100644 apps/gperf/src/Hash_Table.h delete mode 100644 apps/gperf/src/Iterator.cpp delete mode 100644 apps/gperf/src/Iterator.h delete mode 100644 apps/gperf/src/Key_List.cpp delete mode 100644 apps/gperf/src/Key_List.h delete mode 100644 apps/gperf/src/List_Node.cpp delete mode 100644 apps/gperf/src/List_Node.h delete mode 100644 apps/gperf/src/Makefile delete mode 100644 apps/gperf/src/Makefile.am delete mode 100644 apps/gperf/src/Makefile.bor delete mode 100644 apps/gperf/src/Options.cpp delete mode 100644 apps/gperf/src/Options.h delete mode 100644 apps/gperf/src/Vectors.cpp delete mode 100644 apps/gperf/src/Vectors.h delete mode 100644 apps/gperf/src/Version.cpp delete mode 100644 apps/gperf/src/gperf.cpp delete mode 100644 apps/gperf/src/gperf.dsp delete mode 100644 apps/gperf/src/gperf.dsw delete mode 100644 apps/gperf/src/gperf.mpc delete mode 100644 apps/gperf/tests/Makefile delete mode 100644 apps/gperf/tests/Makefile.am delete mode 100644 apps/gperf/tests/ada-pred.exp delete mode 100644 apps/gperf/tests/ada-res.exp delete mode 100644 apps/gperf/tests/ada.gperf delete mode 100644 apps/gperf/tests/adadefs.gperf delete mode 100644 apps/gperf/tests/c++-res.exp delete mode 100644 apps/gperf/tests/c++.gperf delete mode 100644 apps/gperf/tests/c-parse.gperf delete mode 100644 apps/gperf/tests/c.exp delete mode 100644 apps/gperf/tests/c.gperf delete mode 100644 apps/gperf/tests/corba.exp delete mode 100644 apps/gperf/tests/corba.gperf delete mode 100644 apps/gperf/tests/gpc.gperf delete mode 100644 apps/gperf/tests/gplus.gperf delete mode 100644 apps/gperf/tests/idl.exp delete mode 100644 apps/gperf/tests/idl.gperf delete mode 100644 apps/gperf/tests/irc.gperf delete mode 100644 apps/gperf/tests/makeinfo.gperf delete mode 100644 apps/gperf/tests/modula.exp delete mode 100644 apps/gperf/tests/modula2.gperf delete mode 100644 apps/gperf/tests/modula3.gperf delete mode 100644 apps/gperf/tests/pascal.exp delete mode 100644 apps/gperf/tests/pascal.gperf delete mode 100644 apps/gperf/tests/tao.exp delete mode 100644 apps/gperf/tests/tao.gperf delete mode 100644 apps/gperf/tests/test-1.exp delete mode 100644 apps/gperf/tests/test-2.exp delete mode 100644 apps/gperf/tests/test-3.exp delete mode 100644 apps/gperf/tests/test-4.exp delete mode 100644 apps/gperf/tests/test-5.exp delete mode 100644 apps/gperf/tests/test-6.exp delete mode 100644 apps/gperf/tests/test-7.exp delete mode 100644 apps/gperf/tests/test.cpp delete mode 100644 apps/gperf/texinfo.tex delete mode 100644 apps/gperf/version.texi delete mode 100644 apps/mkcsregdb/Makefile delete mode 100644 apps/mkcsregdb/code_set_registry1.2g.txt delete mode 100644 apps/mkcsregdb/cs_test.txt delete mode 100644 apps/mkcsregdb/iso_only.txt delete mode 100644 apps/mkcsregdb/mkcsregdb.cpp delete mode 100644 apps/mkcsregdb/mkcsregdb.dsp delete mode 100644 apps/soreduce/Library.cpp delete mode 100644 apps/soreduce/Library.h delete mode 100644 apps/soreduce/Makefile delete mode 100644 apps/soreduce/Obj_Module.cpp delete mode 100644 apps/soreduce/Obj_Module.h delete mode 100644 apps/soreduce/README delete mode 100644 apps/soreduce/SO_Group.cpp delete mode 100644 apps/soreduce/SO_Group.h delete mode 100644 apps/soreduce/Sig_List.cpp delete mode 100644 apps/soreduce/Sig_List.h delete mode 100644 apps/soreduce/Signature.cpp delete mode 100644 apps/soreduce/Signature.h delete mode 100644 apps/soreduce/soreduce.cpp delete mode 100755 bin/.cvsignore delete mode 100644 bin/ACEutils.pm delete mode 100644 bin/ADDIDL.DSM delete mode 100755 bin/Array.pl delete mode 100755 bin/Array_Helper delete mode 100644 bin/ChangeLogEditor/ChangeLogEdit.pm delete mode 100644 bin/ChangeLogEditor/ChangeLogEntry.pm delete mode 100644 bin/ChangeLogEditor/EmailTranslator.pm delete mode 100644 bin/ChangeLogEditor/FileLocator.pm delete mode 100755 bin/Hash_Map_Manager.pl delete mode 100755 bin/Hash_Map_Manager_Helper delete mode 100644 bin/MakeProjectCreator/README delete mode 100644 bin/MakeProjectCreator/USAGE delete mode 100644 bin/MakeProjectCreator/config/acedefaults.mpb delete mode 100644 bin/MakeProjectCreator/config/aceexe.mpb delete mode 100644 bin/MakeProjectCreator/config/acelib.mpb delete mode 100644 bin/MakeProjectCreator/config/aceversion.mpb delete mode 100644 bin/MakeProjectCreator/config/acexml.mpb delete mode 100644 bin/MakeProjectCreator/config/avstreamsexe.mpb delete mode 100644 bin/MakeProjectCreator/config/ciao_client.mpb delete mode 100644 bin/MakeProjectCreator/config/ciao_component.mpb delete mode 100644 bin/MakeProjectCreator/config/ciao_server.mpb delete mode 100644 bin/MakeProjectCreator/config/client.mpb delete mode 100644 bin/MakeProjectCreator/config/corba_messaging.mpb delete mode 100644 bin/MakeProjectCreator/config/core.mpb delete mode 100644 bin/MakeProjectCreator/config/default.rel delete mode 100644 bin/MakeProjectCreator/config/global.mpb delete mode 100644 bin/MakeProjectCreator/config/messaging.mpb delete mode 100644 bin/MakeProjectCreator/config/messaging_only.mpb delete mode 100644 bin/MakeProjectCreator/config/minimum_corba.mpb delete mode 100644 bin/MakeProjectCreator/config/namingexe.mpb delete mode 100644 bin/MakeProjectCreator/config/notify.mpb delete mode 100644 bin/MakeProjectCreator/config/notifytest.mpb delete mode 100644 bin/MakeProjectCreator/config/orbsvcsexe.mpb delete mode 100644 bin/MakeProjectCreator/config/orbsvcslib.mpb delete mode 100644 bin/MakeProjectCreator/config/rt_client.mpb delete mode 100644 bin/MakeProjectCreator/config/rt_server.mpb delete mode 100644 bin/MakeProjectCreator/config/rteventexe.mpb delete mode 100644 bin/MakeProjectCreator/config/server.mpb delete mode 100644 bin/MakeProjectCreator/config/strategies.mpb delete mode 100644 bin/MakeProjectCreator/config/taoexe.mpb delete mode 100644 bin/MakeProjectCreator/config/taolib.mpb delete mode 100644 bin/MakeProjectCreator/config/taolib_with_idl.mpb delete mode 100644 bin/MakeProjectCreator/config/taoversion.mpb delete mode 100644 bin/MakeProjectCreator/config/vcfullmacros.mpt delete mode 100644 bin/MakeProjectCreator/config/vcpartialmacros.mpt delete mode 100644 bin/MakeProjectCreator/modules/BorlandProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/Creator.pm delete mode 100644 bin/MakeProjectCreator/modules/Driver.pm delete mode 100644 bin/MakeProjectCreator/modules/EM3ProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/EM3WorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/GHSProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/GUID.pm delete mode 100644 bin/MakeProjectCreator/modules/MakeProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/NMakeProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/Options.pm delete mode 100644 bin/MakeProjectCreator/modules/Parser.pm delete mode 100644 bin/MakeProjectCreator/modules/ProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/StringProcessor.pm delete mode 100644 bin/MakeProjectCreator/modules/TemplateInputReader.pm delete mode 100644 bin/MakeProjectCreator/modules/TemplateParser.pm delete mode 100644 bin/MakeProjectCreator/modules/VA4ProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/VA4WorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/VC6ProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/VC7ProjectCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/modules/WorkspaceCreator.pm delete mode 100644 bin/MakeProjectCreator/templates/bor.mpd delete mode 100644 bin/MakeProjectCreator/templates/bordll.mpt delete mode 100644 bin/MakeProjectCreator/templates/borexe.mpt delete mode 100644 bin/MakeProjectCreator/templates/em3vcp.mpd delete mode 100644 bin/MakeProjectCreator/templates/em3vcpdll.mpt delete mode 100644 bin/MakeProjectCreator/templates/em3vcpdllexe.mpt delete mode 100644 bin/MakeProjectCreator/templates/em3vcplib.mpt delete mode 100644 bin/MakeProjectCreator/templates/em3vcplibexe.mpt delete mode 100644 bin/MakeProjectCreator/templates/ghs.mpd delete mode 100644 bin/MakeProjectCreator/templates/gnu.mpd delete mode 100644 bin/MakeProjectCreator/templates/gnudll.mpt delete mode 100644 bin/MakeProjectCreator/templates/gnuexe.mpt delete mode 100644 bin/MakeProjectCreator/templates/make.mpd delete mode 100644 bin/MakeProjectCreator/templates/nmake.mpd delete mode 100644 bin/MakeProjectCreator/templates/nmakedll.mpt delete mode 100644 bin/MakeProjectCreator/templates/nmakeexe.mpt delete mode 100644 bin/MakeProjectCreator/templates/va4icc.mpd delete mode 100644 bin/MakeProjectCreator/templates/va4iccdll.mpt delete mode 100644 bin/MakeProjectCreator/templates/va4iccdllexe.mpt delete mode 100644 bin/MakeProjectCreator/templates/va4icclib.mpt delete mode 100644 bin/MakeProjectCreator/templates/va4icclibexe.mpt delete mode 100644 bin/MakeProjectCreator/templates/vc6dsp.mpd delete mode 100644 bin/MakeProjectCreator/templates/vc6dspdll.mpt delete mode 100644 bin/MakeProjectCreator/templates/vc6dspdllexe.mpt delete mode 100644 bin/MakeProjectCreator/templates/vc6dsplib.mpt delete mode 100644 bin/MakeProjectCreator/templates/vc6dsplibexe.mpt delete mode 100644 bin/MakeProjectCreator/templates/vc7.mpd delete mode 100644 bin/MakeProjectCreator/templates/vc7dll.mpt delete mode 100644 bin/MakeProjectCreator/templates/vc7exe.mpt delete mode 100644 bin/Makefile delete mode 100644 bin/PerlACE/ConfigList.pm delete mode 100644 bin/PerlACE/MSProject.pm delete mode 100644 bin/PerlACE/MSProject/DSP.pm delete mode 100644 bin/PerlACE/MSProject/VCP.pm delete mode 100644 bin/PerlACE/Process.pm delete mode 100644 bin/PerlACE/Process_Unix.pm delete mode 100644 bin/PerlACE/Process_Win32.pm delete mode 100644 bin/PerlACE/Run_Test.pm delete mode 100644 bin/Process.pm delete mode 100644 bin/Process_Unix.pm delete mode 100644 bin/Process_Win32.pm delete mode 100755 bin/Service_Config.perl delete mode 100644 bin/Uniqueid.pm delete mode 100755 bin/ace-install delete mode 100755 bin/ace_components delete mode 100755 bin/ace_ld delete mode 100644 bin/ace_tests.lst delete mode 100755 bin/aix_shr delete mode 100755 bin/am_edit delete mode 100755 bin/auto_compile delete mode 100755 bin/auto_compile_wrapper delete mode 100755 bin/auto_ptr.perl delete mode 100755 bin/auto_run_tests.pl delete mode 100755 bin/autoconf_compile delete mode 100755 bin/autoconf_compile_wrapper delete mode 100755 bin/bootstrap delete mode 100755 bin/check_build_logs delete mode 100755 bin/cle.pl delete mode 100755 bin/clean_dsp.pl delete mode 100755 bin/clean_sems.sh delete mode 100644 bin/clone.1 delete mode 100644 bin/clone.cpp delete mode 100644 bin/clone.csh delete mode 100755 bin/corba-boolean.perl delete mode 100755 bin/count_lines delete mode 100755 bin/create_ace_build delete mode 100755 bin/cvslog delete mode 100755 bin/doxygen-convert-h.pl delete mode 100755 bin/dsp2dsp.pl delete mode 100644 bin/envinfo.cpp delete mode 100755 bin/footprint_stats.sh delete mode 100755 bin/fuzz.pl delete mode 100755 bin/g++dep delete mode 100755 bin/generate_doxygen.pl delete mode 100755 bin/generate_export_file.pl delete mode 100755 bin/generate_footprint_chart.sh delete mode 100755 bin/generate_performance_chart.sh delete mode 100755 bin/generate_topinfo_charts.sh delete mode 100755 bin/indent_macros.perl delete mode 100755 bin/libsize.pl delete mode 100755 bin/main2TMAIN.pl delete mode 100755 bin/make-components delete mode 100755 bin/make_pretty.pl delete mode 100755 bin/make_release delete mode 100755 bin/mpc.pl delete mode 100755 bin/msvc_auto_compile.pl delete mode 100755 bin/mwc.pl delete mode 100644 bin/nightlybuilds/builds.lst delete mode 100755 bin/nightlybuilds/clean_logs.pl delete mode 100644 bin/nightlybuilds/pace.lst delete mode 100644 bin/nightlybuilds/print_config.pl delete mode 100755 bin/nightlybuilds/scoreboard_update.pl delete mode 100755 bin/performance_stats.sh delete mode 100755 bin/perltest2cpp.pl delete mode 100755 bin/pippen.pl delete mode 100755 bin/regenerate_exports.pl delete mode 100755 bin/rename-ace.pl delete mode 100755 bin/reverse_clean delete mode 100755 bin/run_all.pl delete mode 100755 bin/run_all_win32.pl delete mode 100644 bin/sandbox.cpp delete mode 100755 bin/show_log_dir.pl delete mode 100755 bin/split-cpp delete mode 100755 bin/subst_env.pl delete mode 100755 bin/svcconf-convert.pl delete mode 100755 bin/tao_env.pl delete mode 100644 bin/tao_orb_tests.lst delete mode 100644 bin/tao_other_tests.lst delete mode 100755 bin/tao_svcconf.pl delete mode 100755 bin/topinfo_iorsize_stats.sh delete mode 100755 bin/topinfo_simple_stats.sh delete mode 100755 bin/topinfo_stats.sh delete mode 100755 bin/update-ace+tao.sh delete mode 100755 bin/vc_filter.pl delete mode 100755 bin/vxworks_modify.pl delete mode 100644 docs/ACE-FMM.html delete mode 100644 docs/ACE-SSL.html delete mode 100644 docs/ACE-bug-process.html delete mode 100644 docs/ACE-categories.html delete mode 100644 docs/ACE-configuration.txt delete mode 100644 docs/ACE-development-process.html delete mode 100644 docs/ACE-guidelines.html delete mode 100644 docs/ACE-inheritance.pdf delete mode 100644 docs/ACE-inheritance.ps.gz delete mode 100644 docs/ACE-lessons.html delete mode 100644 docs/ACE-porting.html delete mode 100644 docs/ACE-subsets.html delete mode 100644 docs/ACE-tutorials.html delete mode 100644 docs/CE-status.txt delete mode 100644 docs/exceptions.html delete mode 100644 docs/index.html delete mode 100644 docs/minimumTAO.html delete mode 100644 docs/msvc_notes.txt delete mode 100644 docs/run_test.txt delete mode 100644 docs/tutorials/001/001.dsp delete mode 100644 docs/tutorials/001/00SetEnv delete mode 100644 docs/tutorials/001/Makefile delete mode 100644 docs/tutorials/001/acceptor.h delete mode 100644 docs/tutorials/001/combine.shar delete mode 100644 docs/tutorials/001/logger.h delete mode 100644 docs/tutorials/001/page01.html delete mode 100644 docs/tutorials/001/page02.html delete mode 100644 docs/tutorials/001/page03.html delete mode 100644 docs/tutorials/001/page04.html delete mode 100644 docs/tutorials/001/page05.html delete mode 100644 docs/tutorials/001/server.cpp delete mode 100644 docs/tutorials/001/simple.fig delete mode 100644 docs/tutorials/001/simple.gif delete mode 100644 docs/tutorials/002/002.dsp delete mode 100644 docs/tutorials/002/00SetEnv delete mode 100644 docs/tutorials/002/Makefile delete mode 100644 docs/tutorials/002/combine.shar delete mode 100644 docs/tutorials/002/handler.h delete mode 100644 docs/tutorials/002/page01.html delete mode 100644 docs/tutorials/002/page02.html delete mode 100644 docs/tutorials/002/page03.html delete mode 100644 docs/tutorials/002/page04.html delete mode 100644 docs/tutorials/002/server.cpp delete mode 100644 docs/tutorials/003/003.dsp delete mode 100644 docs/tutorials/003/00SetEnv delete mode 100644 docs/tutorials/003/Makefile delete mode 100644 docs/tutorials/003/client.cpp delete mode 100644 docs/tutorials/003/combine.shar delete mode 100644 docs/tutorials/003/page01.html delete mode 100644 docs/tutorials/004/004.dsp delete mode 100644 docs/tutorials/004/00SetEnv delete mode 100644 docs/tutorials/004/Makefile delete mode 100644 docs/tutorials/004/client.cpp delete mode 100644 docs/tutorials/004/combine.shar delete mode 100644 docs/tutorials/004/page01.html delete mode 100644 docs/tutorials/005/005.dsp delete mode 100644 docs/tutorials/005/00SetEnv delete mode 100644 docs/tutorials/005/Makefile delete mode 100644 docs/tutorials/005/client_acceptor.h delete mode 100644 docs/tutorials/005/client_handler.cpp delete mode 100644 docs/tutorials/005/client_handler.h delete mode 100644 docs/tutorials/005/combine.shar delete mode 100644 docs/tutorials/005/page01.html delete mode 100644 docs/tutorials/005/page02.html delete mode 100644 docs/tutorials/005/page03.html delete mode 100644 docs/tutorials/005/page04.html delete mode 100644 docs/tutorials/005/page05.html delete mode 100644 docs/tutorials/005/page06.html delete mode 100644 docs/tutorials/005/page07.html delete mode 100644 docs/tutorials/005/page08.html delete mode 100644 docs/tutorials/005/server.brk delete mode 100644 docs/tutorials/005/server.cpp delete mode 100644 docs/tutorials/006/006.dsp delete mode 100644 docs/tutorials/006/Makefile delete mode 100644 docs/tutorials/006/client_acceptor.h delete mode 100644 docs/tutorials/006/client_handler.cpp delete mode 100644 docs/tutorials/006/client_handler.h delete mode 100644 docs/tutorials/006/combine.shar delete mode 100644 docs/tutorials/006/page01.html delete mode 100644 docs/tutorials/006/page02.html delete mode 100644 docs/tutorials/006/page03.html delete mode 100644 docs/tutorials/006/page04.html delete mode 100644 docs/tutorials/006/page05.html delete mode 100644 docs/tutorials/006/page06.html delete mode 100644 docs/tutorials/006/server.cpp delete mode 100644 docs/tutorials/007/007.dsp delete mode 100644 docs/tutorials/007/Makefile delete mode 100644 docs/tutorials/007/client_acceptor.cpp delete mode 100644 docs/tutorials/007/client_acceptor.h delete mode 100644 docs/tutorials/007/client_handler.cpp delete mode 100644 docs/tutorials/007/client_handler.h delete mode 100644 docs/tutorials/007/combine.shar delete mode 100644 docs/tutorials/007/page01.html delete mode 100644 docs/tutorials/007/page02.html delete mode 100644 docs/tutorials/007/page03.html delete mode 100644 docs/tutorials/007/page04.html delete mode 100644 docs/tutorials/007/page05.html delete mode 100644 docs/tutorials/007/page06.html delete mode 100644 docs/tutorials/007/page07.html delete mode 100644 docs/tutorials/007/page08.html delete mode 100644 docs/tutorials/007/page09.html delete mode 100644 docs/tutorials/007/server.cpp delete mode 100644 docs/tutorials/007/thread_pool.cpp delete mode 100644 docs/tutorials/007/thread_pool.h delete mode 100644 docs/tutorials/008/008-broadcast.dsp delete mode 100644 docs/tutorials/008/008-direct.dsp delete mode 100644 docs/tutorials/008/008-server.dsp delete mode 100644 docs/tutorials/008/Makefile delete mode 100644 docs/tutorials/008/broadcast_client.cpp delete mode 100644 docs/tutorials/008/combine.shar delete mode 100644 docs/tutorials/008/directed_client.cpp delete mode 100644 docs/tutorials/008/page01.html delete mode 100644 docs/tutorials/008/page02.html delete mode 100644 docs/tutorials/008/page03.html delete mode 100644 docs/tutorials/008/page04.html delete mode 100644 docs/tutorials/008/page05.html delete mode 100644 docs/tutorials/008/server.cpp delete mode 100644 docs/tutorials/009/009-broadcast.dsp delete mode 100644 docs/tutorials/009/009-directed.dsp delete mode 100644 docs/tutorials/009/009-server.dsp delete mode 100644 docs/tutorials/009/Makefile delete mode 100644 docs/tutorials/009/broadcast_client.cpp delete mode 100644 docs/tutorials/009/combine.shar delete mode 100644 docs/tutorials/009/directed_client.cpp delete mode 100644 docs/tutorials/009/page01.html delete mode 100644 docs/tutorials/009/page02.html delete mode 100644 docs/tutorials/009/page03.html delete mode 100644 docs/tutorials/009/page04.html delete mode 100644 docs/tutorials/009/page05.html delete mode 100644 docs/tutorials/009/server.cpp delete mode 100644 docs/tutorials/010/010.dsp delete mode 100644 docs/tutorials/010/Makefile delete mode 100644 docs/tutorials/010/block.h delete mode 100644 docs/tutorials/010/combine.shar delete mode 100644 docs/tutorials/010/message_queue.cpp delete mode 100644 docs/tutorials/010/page01.html delete mode 100644 docs/tutorials/010/page02.html delete mode 100644 docs/tutorials/010/page03.html delete mode 100644 docs/tutorials/010/page04.html delete mode 100644 docs/tutorials/010/page05.html delete mode 100644 docs/tutorials/010/page06.html delete mode 100644 docs/tutorials/010/page07.html delete mode 100644 docs/tutorials/010/task.cpp delete mode 100644 docs/tutorials/010/task.h delete mode 100644 docs/tutorials/011/011.dsp delete mode 100644 docs/tutorials/011/Makefile delete mode 100644 docs/tutorials/011/block.h delete mode 100644 docs/tutorials/011/combine.shar delete mode 100644 docs/tutorials/011/data.h delete mode 100644 docs/tutorials/011/message_queue.cpp delete mode 100644 docs/tutorials/011/page01.html delete mode 100644 docs/tutorials/011/page02.html delete mode 100644 docs/tutorials/011/page03.html delete mode 100644 docs/tutorials/011/page04.html delete mode 100644 docs/tutorials/011/page05.html delete mode 100644 docs/tutorials/011/page06.html delete mode 100644 docs/tutorials/011/task.cpp delete mode 100644 docs/tutorials/011/task.h delete mode 100644 docs/tutorials/012/012.dsp delete mode 100644 docs/tutorials/012/Makefile delete mode 100644 docs/tutorials/012/block.h delete mode 100644 docs/tutorials/012/combine.shar delete mode 100644 docs/tutorials/012/message_queue.cpp delete mode 100644 docs/tutorials/012/page01.html delete mode 100644 docs/tutorials/012/page02.html delete mode 100644 docs/tutorials/012/page03.html delete mode 100644 docs/tutorials/012/page04.html delete mode 100644 docs/tutorials/012/page05.html delete mode 100644 docs/tutorials/012/page06.html delete mode 100644 docs/tutorials/012/task.cpp delete mode 100644 docs/tutorials/012/task.h delete mode 100644 docs/tutorials/012/work.h delete mode 100644 docs/tutorials/013/013.dsp delete mode 100644 docs/tutorials/013/Makefile delete mode 100644 docs/tutorials/013/block.cpp delete mode 100644 docs/tutorials/013/block.h delete mode 100644 docs/tutorials/013/combine.shar delete mode 100644 docs/tutorials/013/message_queue.cpp delete mode 100644 docs/tutorials/013/mld.cpp delete mode 100644 docs/tutorials/013/mld.h delete mode 100644 docs/tutorials/013/page01.html delete mode 100644 docs/tutorials/013/page02.html delete mode 100644 docs/tutorials/013/page03.html delete mode 100644 docs/tutorials/013/page04.html delete mode 100644 docs/tutorials/013/page05.html delete mode 100644 docs/tutorials/013/page06.html delete mode 100644 docs/tutorials/013/page07.html delete mode 100644 docs/tutorials/013/page08.html delete mode 100644 docs/tutorials/013/task.cpp delete mode 100644 docs/tutorials/013/task.h delete mode 100644 docs/tutorials/013/work.cpp delete mode 100644 docs/tutorials/013/work.h delete mode 100644 docs/tutorials/014/014.dsp delete mode 100644 docs/tutorials/014/EndTask.h delete mode 100644 docs/tutorials/014/Makefile delete mode 100644 docs/tutorials/014/Task.cpp delete mode 100644 docs/tutorials/014/Task.h delete mode 100644 docs/tutorials/014/combine.shar delete mode 100644 docs/tutorials/014/page01.html delete mode 100644 docs/tutorials/014/page02.html delete mode 100644 docs/tutorials/014/page03.html delete mode 100644 docs/tutorials/014/page04.html delete mode 100644 docs/tutorials/014/page05.html delete mode 100644 docs/tutorials/014/stream.cpp delete mode 100644 docs/tutorials/015/015-client.dsp delete mode 100644 docs/tutorials/015/015-server.dsp delete mode 100644 docs/tutorials/015/Client_i.cpp delete mode 100644 docs/tutorials/015/Client_i.h delete mode 100644 docs/tutorials/015/Compressor.cpp delete mode 100644 docs/tutorials/015/Compressor.h delete mode 100644 docs/tutorials/015/Crypt.cpp delete mode 100644 docs/tutorials/015/Crypt.h delete mode 100644 docs/tutorials/015/Handler.cpp delete mode 100644 docs/tutorials/015/Handler.h delete mode 100644 docs/tutorials/015/Makefile delete mode 100644 docs/tutorials/015/Makefile.client delete mode 100644 docs/tutorials/015/Makefile.server delete mode 100644 docs/tutorials/015/Protocol_Stream.cpp delete mode 100644 docs/tutorials/015/Protocol_Stream.h delete mode 100644 docs/tutorials/015/Protocol_Task.cpp delete mode 100644 docs/tutorials/015/Protocol_Task.h delete mode 100644 docs/tutorials/015/Recv.cpp delete mode 100644 docs/tutorials/015/Recv.h delete mode 100644 docs/tutorials/015/Server_i.cpp delete mode 100644 docs/tutorials/015/Server_i.h delete mode 100644 docs/tutorials/015/Xmit.cpp delete mode 100644 docs/tutorials/015/Xmit.h delete mode 100644 docs/tutorials/015/client.cpp delete mode 100644 docs/tutorials/015/combine.shar delete mode 100644 docs/tutorials/015/page01.html delete mode 100644 docs/tutorials/015/page02.html delete mode 100644 docs/tutorials/015/page03.html delete mode 100644 docs/tutorials/015/page04.html delete mode 100644 docs/tutorials/015/page05.html delete mode 100644 docs/tutorials/015/page06.html delete mode 100644 docs/tutorials/015/page07.html delete mode 100644 docs/tutorials/015/page08.html delete mode 100644 docs/tutorials/015/page09.html delete mode 100644 docs/tutorials/015/page10.html delete mode 100644 docs/tutorials/015/page11.html delete mode 100644 docs/tutorials/015/page12.html delete mode 100644 docs/tutorials/015/page13.html delete mode 100644 docs/tutorials/015/page14.html delete mode 100644 docs/tutorials/015/page15.html delete mode 100644 docs/tutorials/015/page16.html delete mode 100644 docs/tutorials/015/page17.html delete mode 100644 docs/tutorials/015/page18.html delete mode 100644 docs/tutorials/015/page19.html delete mode 100644 docs/tutorials/015/page20.html delete mode 100644 docs/tutorials/015/page21.html delete mode 100644 docs/tutorials/015/page22.html delete mode 100644 docs/tutorials/015/server.cpp delete mode 100644 docs/tutorials/015/stream.gif delete mode 100644 docs/tutorials/016/016.dsp delete mode 100644 docs/tutorials/016/Condition_i.cpp delete mode 100644 docs/tutorials/016/Condition_i.h delete mode 100644 docs/tutorials/016/Makefile delete mode 100644 docs/tutorials/016/combine.shar delete mode 100644 docs/tutorials/016/condition.cpp delete mode 100644 docs/tutorials/016/page01.html delete mode 100644 docs/tutorials/016/page02.html delete mode 100644 docs/tutorials/016/page03.html delete mode 100644 docs/tutorials/016/page04.html delete mode 100644 docs/tutorials/016/page05.html delete mode 100644 docs/tutorials/017/017.dsp delete mode 100644 docs/tutorials/017/Barrier_i.cpp delete mode 100644 docs/tutorials/017/Barrier_i.h delete mode 100644 docs/tutorials/017/Makefile delete mode 100644 docs/tutorials/017/barrier.cpp delete mode 100644 docs/tutorials/017/barrier2.cpp delete mode 100644 docs/tutorials/017/combine.shar delete mode 100644 docs/tutorials/017/page01.html delete mode 100644 docs/tutorials/017/page02.html delete mode 100644 docs/tutorials/017/page03.html delete mode 100644 docs/tutorials/017/page04.html delete mode 100644 docs/tutorials/017/page05.html delete mode 100644 docs/tutorials/017/page06.html delete mode 100644 docs/tutorials/018/018.dsp delete mode 100644 docs/tutorials/018/Makefile delete mode 100644 docs/tutorials/018/Mutex_i.h delete mode 100644 docs/tutorials/018/Test_T.cpp delete mode 100644 docs/tutorials/018/Test_T.h delete mode 100644 docs/tutorials/018/Token_i.h delete mode 100644 docs/tutorials/018/combine.shar delete mode 100644 docs/tutorials/018/output delete mode 100644 docs/tutorials/018/page01.html delete mode 100644 docs/tutorials/018/page02.html delete mode 100644 docs/tutorials/018/page03.html delete mode 100644 docs/tutorials/018/page04.html delete mode 100644 docs/tutorials/018/page05.html delete mode 100644 docs/tutorials/018/page06.html delete mode 100644 docs/tutorials/018/page07.html delete mode 100644 docs/tutorials/018/token.cpp delete mode 100644 docs/tutorials/019/019-client.dsp delete mode 100644 docs/tutorials/019/019-client2.dsp delete mode 100644 docs/tutorials/019/019-server.dsp delete mode 100644 docs/tutorials/019/019-server2.dsp delete mode 100644 docs/tutorials/019/Makefile delete mode 100644 docs/tutorials/019/client.cpp delete mode 100644 docs/tutorials/019/client2.cpp delete mode 100644 docs/tutorials/019/combine.shar delete mode 100644 docs/tutorials/019/page01.html delete mode 100644 docs/tutorials/019/page02.html delete mode 100644 docs/tutorials/019/page03.html delete mode 100644 docs/tutorials/019/page04.html delete mode 100644 docs/tutorials/019/page05.html delete mode 100644 docs/tutorials/019/page06.html delete mode 100644 docs/tutorials/019/server.cpp delete mode 100644 docs/tutorials/019/server2.cpp delete mode 100644 docs/tutorials/019/shmem.cpp delete mode 100644 docs/tutorials/019/shmem.h delete mode 100644 docs/tutorials/020/020-client.dsp delete mode 100644 docs/tutorials/020/020-client2.dsp delete mode 100644 docs/tutorials/020/020-server.dsp delete mode 100644 docs/tutorials/020/020-server2.dsp delete mode 100644 docs/tutorials/020/Makefile delete mode 100644 docs/tutorials/020/client.cpp delete mode 100644 docs/tutorials/020/client2.cpp delete mode 100644 docs/tutorials/020/combine.shar delete mode 100644 docs/tutorials/020/mmap.cpp delete mode 100644 docs/tutorials/020/mmap.h delete mode 100644 docs/tutorials/020/mmapfile delete mode 100644 docs/tutorials/020/page01.html delete mode 100644 docs/tutorials/020/page02.html delete mode 100644 docs/tutorials/020/page03.html delete mode 100644 docs/tutorials/020/page04.html delete mode 100644 docs/tutorials/020/page05.html delete mode 100644 docs/tutorials/020/page06.html delete mode 100644 docs/tutorials/020/server.cpp delete mode 100644 docs/tutorials/020/server2.cpp delete mode 100644 docs/tutorials/021/021-client.dsp delete mode 100644 docs/tutorials/021/021-server.dsp delete mode 100644 docs/tutorials/021/Makefile delete mode 100644 docs/tutorials/021/client.cpp delete mode 100644 docs/tutorials/021/combine.shar delete mode 100644 docs/tutorials/021/mpool.cpp delete mode 100644 docs/tutorials/021/mpool.h delete mode 100644 docs/tutorials/021/page01.html delete mode 100644 docs/tutorials/021/page02.html delete mode 100644 docs/tutorials/021/page03.html delete mode 100644 docs/tutorials/021/page04.html delete mode 100644 docs/tutorials/021/page05.html delete mode 100644 docs/tutorials/021/page06.html delete mode 100644 docs/tutorials/021/server.cpp delete mode 100644 docs/tutorials/022/Acceptor_Service.cpp delete mode 100644 docs/tutorials/022/Acceptor_Service.h delete mode 100644 docs/tutorials/022/Makefile delete mode 100644 docs/tutorials/022/client/Makefile delete mode 100644 docs/tutorials/022/client/client.cpp delete mode 100644 docs/tutorials/022/client_handler.cpp delete mode 100644 docs/tutorials/022/client_handler.h delete mode 100644 docs/tutorials/022/page01.html delete mode 100644 docs/tutorials/022/page02.html delete mode 100644 docs/tutorials/022/page03.html delete mode 100644 docs/tutorials/022/page04.html delete mode 100644 docs/tutorials/022/page05.html delete mode 100644 docs/tutorials/022/server.cpp delete mode 100644 docs/tutorials/022/svc.conf delete mode 100644 docs/tutorials/Chap_2/Chap_2.zip delete mode 100644 docs/tutorials/Chap_2/ex01.html delete mode 100644 docs/tutorials/Chap_2/ex02.html delete mode 100644 docs/tutorials/Chap_2/ex03.html delete mode 100644 docs/tutorials/Chap_2/ex04.html delete mode 100644 docs/tutorials/Chap_2/ex05.htm delete mode 100644 docs/tutorials/Chap_2/ex05.html delete mode 100644 docs/tutorials/Chap_2/ex06.html delete mode 100644 docs/tutorials/Chap_3/Chap_3.zip delete mode 100644 docs/tutorials/Chap_3/Makefile delete mode 100644 docs/tutorials/Chap_3/README delete mode 100644 docs/tutorials/Chap_3/ex01.html delete mode 100644 docs/tutorials/Chap_3/ex02.html delete mode 100644 docs/tutorials/Chap_3/ex03.html delete mode 100644 docs/tutorials/Chap_3/mm.cpp delete mode 100644 docs/tutorials/Chap_4/Chap_4.zip delete mode 100644 docs/tutorials/Chap_4/ex01.html delete mode 100644 docs/tutorials/Chap_4/ex02.html delete mode 100644 docs/tutorials/Chap_4/ex03.html delete mode 100644 docs/tutorials/Chap_4/ex04.html delete mode 100644 docs/tutorials/Chap_4/ex05.html delete mode 100644 docs/tutorials/Chap_4/ex06.html delete mode 100644 docs/tutorials/Chap_4/ex07.html delete mode 100644 docs/tutorials/Chap_4/ex08.html delete mode 100644 docs/tutorials/Chap_5/Chap_5.zip delete mode 100644 docs/tutorials/Chap_5/ex01.html delete mode 100644 docs/tutorials/Chap_5/ex02.html delete mode 100644 docs/tutorials/Chap_5/ex03.html delete mode 100644 docs/tutorials/Chap_5/ex04.html delete mode 100644 docs/tutorials/Chap_5/ex05.html delete mode 100644 docs/tutorials/Chap_6/Chap_6.zip delete mode 100644 docs/tutorials/Chap_6/ex01.html delete mode 100644 docs/tutorials/Chap_6/ex02.html delete mode 100644 docs/tutorials/Chap_6/ex03.html delete mode 100644 docs/tutorials/Chap_6/ex04.html delete mode 100644 docs/tutorials/Chap_6/ex05.html delete mode 100644 docs/tutorials/Chap_6/ex06.html delete mode 100644 docs/tutorials/Chap_6/ex07.html delete mode 100644 docs/tutorials/Chap_6/ex08.html delete mode 100644 docs/tutorials/Chap_6/ex09.html delete mode 100644 docs/tutorials/Chap_6/ex10.html delete mode 100644 docs/tutorials/Chap_7/Chap_7.zip delete mode 100644 docs/tutorials/Chap_7/ex01.html delete mode 100644 docs/tutorials/Chap_7/ex02.html delete mode 100644 docs/tutorials/Chap_7/ex03.html delete mode 100644 docs/tutorials/Makefile delete mode 100755 docs/tutorials/colorize delete mode 100755 docs/tutorials/combine delete mode 100755 docs/tutorials/fix.Makefile delete mode 100644 docs/tutorials/guide-tutorials.html delete mode 100755 docs/tutorials/linify delete mode 100644 docs/tutorials/new-tutorials.html delete mode 100644 docs/tutorials/online-tutorials.html delete mode 100644 docs/tutorials/templates.html delete mode 100644 docs/tutorials/tutorials.dsw delete mode 100644 docs/usage-bugzilla.html delete mode 100644 docs/wchar.txt delete mode 100644 etc/DOC-way.html delete mode 100644 etc/README delete mode 100644 etc/Svc_Conf_l.cpp.diff delete mode 100644 etc/Svc_Conf_y.cpp.diff delete mode 100644 etc/ace.doxygen delete mode 100644 etc/ace_man.doxygen delete mode 100644 etc/ace_qos.doxygen delete mode 100644 etc/ace_rmcast.doxygen delete mode 100644 etc/ace_ssl.doxygen delete mode 100644 etc/acexml.doxygen delete mode 100755 etc/create-jace-release delete mode 100644 etc/enforce_ace_try.diff delete mode 100644 etc/purify.solaris2 delete mode 100644 etc/tao.doxygen delete mode 100644 etc/tao_av.doxygen delete mode 100644 etc/tao_cosevent.doxygen delete mode 100644 etc/tao_cosnaming.doxygen delete mode 100644 etc/tao_cosnotification.doxygen delete mode 100644 etc/tao_costime.doxygen delete mode 100644 etc/tao_costrader.doxygen delete mode 100644 etc/tao_dynamicany.doxygen delete mode 100644 etc/tao_dynamicinterface.doxygen delete mode 100644 etc/tao_esf.doxygen delete mode 100644 etc/tao_implrepo.doxygen delete mode 100644 etc/tao_iormanip.doxygen delete mode 100644 etc/tao_iortable.doxygen delete mode 100644 etc/tao_portablegroup.doxygen delete mode 100644 etc/tao_portableserver.doxygen delete mode 100644 etc/tao_pss.doxygen delete mode 100644 etc/tao_rtcorba.doxygen delete mode 100644 etc/tao_rtevent.doxygen delete mode 100644 etc/tao_rtportableserver.doxygen delete mode 100644 etc/tao_security.doxygen delete mode 100644 etc/tao_smartproxies.doxygen delete mode 100644 etc/tao_ssliop.doxygen delete mode 100644 etc/tao_strategies.doxygen delete mode 100644 etc/xlc_dummy.cpp delete mode 100644 examples/ASX/CCM_App/CCM_App.cpp delete mode 100644 examples/ASX/CCM_App/CCM_App.dsp delete mode 100644 examples/ASX/CCM_App/CCM_App.dsw delete mode 100644 examples/ASX/CCM_App/CCM_App_static.dsp delete mode 100644 examples/ASX/CCM_App/Makefile delete mode 100644 examples/ASX/CCM_App/Makefile.CCM_App delete mode 100644 examples/ASX/CCM_App/SC_Client.cpp delete mode 100644 examples/ASX/CCM_App/SC_Client.dsp delete mode 100644 examples/ASX/CCM_App/SC_Server.cpp delete mode 100644 examples/ASX/CCM_App/SC_Server.dsp delete mode 100644 examples/ASX/CCM_App/svc.conf delete mode 100644 examples/ASX/CCM_App/svc.conf.xml delete mode 100644 examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp delete mode 100644 examples/ASX/Event_Server/Event_Server/Consumer_Router.h delete mode 100644 examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp delete mode 100644 examples/ASX/Event_Server/Event_Server/Event_Analyzer.h delete mode 100644 examples/ASX/Event_Server/Event_Server/Event_Server.dsp delete mode 100644 examples/ASX/Event_Server/Event_Server/Event_Server.dsw delete mode 100644 examples/ASX/Event_Server/Event_Server/Makefile delete mode 100644 examples/ASX/Event_Server/Event_Server/Options.cpp delete mode 100644 examples/ASX/Event_Server/Event_Server/Options.h delete mode 100644 examples/ASX/Event_Server/Event_Server/Options.i delete mode 100644 examples/ASX/Event_Server/Event_Server/Peer_Router.cpp delete mode 100644 examples/ASX/Event_Server/Event_Server/Peer_Router.h delete mode 100644 examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp delete mode 100644 examples/ASX/Event_Server/Event_Server/Supplier_Router.h delete mode 100644 examples/ASX/Event_Server/Event_Server/event_server.cpp delete mode 100644 examples/ASX/Event_Server/Makefile delete mode 100644 examples/ASX/Event_Server/README delete mode 100644 examples/ASX/Event_Server/Transceiver/Makefile delete mode 100644 examples/ASX/Event_Server/Transceiver/transceiver.cpp delete mode 100644 examples/ASX/Event_Server/Transceiver/transceiver.dsp delete mode 100644 examples/ASX/Event_Server/Transceiver/transceiver.dsw delete mode 100644 examples/ASX/Event_Server/Transceiver/transceiver.h delete mode 100644 examples/ASX/Makefile delete mode 100644 examples/ASX/Message_Queue/Bounded_Buffer.dsp delete mode 100644 examples/ASX/Message_Queue/Buffer_Stream.dsp delete mode 100644 examples/ASX/Message_Queue/Makefile delete mode 100644 examples/ASX/Message_Queue/Message_Queue_Example.dsw delete mode 100644 examples/ASX/Message_Queue/Priority_Buffer.dsp delete mode 100644 examples/ASX/Message_Queue/bounded_buffer.cpp delete mode 100644 examples/ASX/Message_Queue/buffer_stream.cpp delete mode 100644 examples/ASX/Message_Queue/priority_buffer.cpp delete mode 100644 examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp delete mode 100644 examples/ASX/UPIPE_Event_Server/Consumer_Router.h delete mode 100644 examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp delete mode 100644 examples/ASX/UPIPE_Event_Server/Event_Analyzer.h delete mode 100644 examples/ASX/UPIPE_Event_Server/Makefile delete mode 100644 examples/ASX/UPIPE_Event_Server/Options.cpp delete mode 100644 examples/ASX/UPIPE_Event_Server/Options.h delete mode 100644 examples/ASX/UPIPE_Event_Server/Options.i delete mode 100644 examples/ASX/UPIPE_Event_Server/Peer_Router.cpp delete mode 100644 examples/ASX/UPIPE_Event_Server/Peer_Router.h delete mode 100644 examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp delete mode 100644 examples/ASX/UPIPE_Event_Server/Supplier_Router.h delete mode 100644 examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp delete mode 100644 examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsw delete mode 100644 examples/ASX/UPIPE_Event_Server/event_server.cpp delete mode 100644 examples/Bounded_Packet_Relay/BPR_Drivers.cpp delete mode 100644 examples/Bounded_Packet_Relay/BPR_Drivers.h delete mode 100644 examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp delete mode 100644 examples/Bounded_Packet_Relay/BPR_Drivers_T.h delete mode 100644 examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp delete mode 100644 examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsw delete mode 100644 examples/Bounded_Packet_Relay/Makefile delete mode 100644 examples/Bounded_Packet_Relay/README delete mode 100644 examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp delete mode 100644 examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h delete mode 100644 examples/Bounded_Packet_Relay/bpr_thread.cpp delete mode 100644 examples/C++NPv1/Iterative_Logging_Server.cpp delete mode 100644 examples/C++NPv1/Iterative_Logging_Server.dsp delete mode 100644 examples/C++NPv1/Iterative_Logging_Server.h delete mode 100644 examples/C++NPv1/Logging_Client.cpp delete mode 100644 examples/C++NPv1/Logging_Client.dsp delete mode 100644 examples/C++NPv1/Logging_Handler.cpp delete mode 100644 examples/C++NPv1/Logging_Handler.h delete mode 100644 examples/C++NPv1/Logging_Server.cpp delete mode 100644 examples/C++NPv1/Logging_Server.h delete mode 100644 examples/C++NPv1/Makefile delete mode 100644 examples/C++NPv1/Makefile.Iterative_Logging_Server delete mode 100644 examples/C++NPv1/Makefile.Logging_Client delete mode 100644 examples/C++NPv1/Makefile.Process_Per_Connection_Logging_Server delete mode 100644 examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server delete mode 100644 examples/C++NPv1/Makefile.Reactive_Logging_Server delete mode 100644 examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex delete mode 100644 examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server delete mode 100644 examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp delete mode 100644 examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp delete mode 100644 examples/C++NPv1/Process_Per_Connection_Logging_Server.h delete mode 100644 examples/C++NPv1/Process_Per_Connection_Logging_Server.mak delete mode 100644 examples/C++NPv1/README delete mode 100644 examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp delete mode 100644 examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp delete mode 100644 examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.h delete mode 100644 examples/C++NPv1/Reactive_Logging_Server.cpp delete mode 100644 examples/C++NPv1/Reactive_Logging_Server.dsp delete mode 100644 examples/C++NPv1/Reactive_Logging_Server.h delete mode 100644 examples/C++NPv1/Reactive_Logging_Server_Ex.cpp delete mode 100644 examples/C++NPv1/Reactive_Logging_Server_Ex.dsp delete mode 100644 examples/C++NPv1/Reactive_Logging_Server_Ex.h delete mode 100644 examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp delete mode 100644 examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp delete mode 100644 examples/C++NPv1/Thread_Per_Connection_Logging_Server.h delete mode 100644 examples/C++NPv1/examples.dsw delete mode 100644 examples/C++NPv2/AC_CLD.dsp delete mode 100644 examples/C++NPv2/AC_CLD_export.h delete mode 100644 examples/C++NPv2/AC_Client_Logging_Daemon.cpp delete mode 100644 examples/C++NPv2/AIO_CLD.dsp delete mode 100644 examples/C++NPv2/AIO_CLD_export.h delete mode 100644 examples/C++NPv2/AIO_Client_Logging_Daemon.cpp delete mode 100644 examples/C++NPv2/CLD.dsp delete mode 100644 examples/C++NPv2/CLD_export.h delete mode 100644 examples/C++NPv2/Client_Logging_Daemon.cpp delete mode 100644 examples/C++NPv2/Configurable_Logging_Server.cpp delete mode 100644 examples/C++NPv2/Configurable_Logging_Server.dsp delete mode 100644 examples/C++NPv2/Logging_Acceptor.cpp delete mode 100644 examples/C++NPv2/Logging_Acceptor.h delete mode 100644 examples/C++NPv2/Logging_Acceptor_Ex.h delete mode 100644 examples/C++NPv2/Logging_Event_Handler.cpp delete mode 100644 examples/C++NPv2/Logging_Event_Handler.h delete mode 100644 examples/C++NPv2/Logging_Event_Handler_Ex.cpp delete mode 100644 examples/C++NPv2/Logging_Event_Handler_Ex.h delete mode 100644 examples/C++NPv2/Logging_Handler.cpp delete mode 100644 examples/C++NPv2/Logging_Handler.h delete mode 100644 examples/C++NPv2/Makefile delete mode 100644 examples/C++NPv2/Makefile.AC_CLD delete mode 100644 examples/C++NPv2/Makefile.AIO_CLD delete mode 100644 examples/C++NPv2/Makefile.CLD delete mode 100644 examples/C++NPv2/Makefile.Configurable_Logging_Server delete mode 100644 examples/C++NPv2/Makefile.Reactor_Logging_Server delete mode 100644 examples/C++NPv2/Makefile.SLD delete mode 100644 examples/C++NPv2/Makefile.SLDex delete mode 100644 examples/C++NPv2/Makefile.SR_Configurable_Logging_Server delete mode 100644 examples/C++NPv2/Makefile.Select_Reactor_Logging_Server delete mode 100644 examples/C++NPv2/Makefile.TPCLS delete mode 100644 examples/C++NPv2/Makefile.TPLS delete mode 100644 examples/C++NPv2/Makefile.TP_Reactor_Logging_Server delete mode 100644 examples/C++NPv2/Makefile.display_logfile delete mode 100644 examples/C++NPv2/README delete mode 100644 examples/C++NPv2/Reactor_Logging_Server.cpp delete mode 100644 examples/C++NPv2/Reactor_Logging_Server.dsp delete mode 100644 examples/C++NPv2/Reactor_Logging_Server.h delete mode 100644 examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp delete mode 100644 examples/C++NPv2/Reactor_Logging_Server_Adapter.h delete mode 100644 examples/C++NPv2/Reactor_Logging_Server_T.cpp delete mode 100644 examples/C++NPv2/SLD.cpp delete mode 100644 examples/C++NPv2/SLD.dsp delete mode 100644 examples/C++NPv2/SLDEX_export.h delete mode 100644 examples/C++NPv2/SLD_export.h delete mode 100644 examples/C++NPv2/SLDex.cpp delete mode 100644 examples/C++NPv2/SLDex.dsp delete mode 100644 examples/C++NPv2/SR_Configurable_Logging_Server.cpp delete mode 100644 examples/C++NPv2/SR_Configurable_Logging_Server.dsp delete mode 100644 examples/C++NPv2/Select_Reactor_Logging_Server.cpp delete mode 100644 examples/C++NPv2/Select_Reactor_Logging_Server.dsp delete mode 100644 examples/C++NPv2/Server_Shutdown.cpp delete mode 100644 examples/C++NPv2/Service_Reporter.cpp delete mode 100644 examples/C++NPv2/Service_Reporter.h delete mode 100644 examples/C++NPv2/TPCLS.dsp delete mode 100644 examples/C++NPv2/TPCLS_export.h delete mode 100644 examples/C++NPv2/TPC_Logging_Server.cpp delete mode 100644 examples/C++NPv2/TPC_Logging_Server.h delete mode 100644 examples/C++NPv2/TPLS.dsp delete mode 100644 examples/C++NPv2/TPLS_export.h delete mode 100644 examples/C++NPv2/TP_Logging_Server.cpp delete mode 100644 examples/C++NPv2/TP_Logging_Server.h delete mode 100644 examples/C++NPv2/TP_Reactor_Logging_Server.cpp delete mode 100644 examples/C++NPv2/TP_Reactor_Logging_Server.dsp delete mode 100644 examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp delete mode 100644 examples/C++NPv2/WFMO_Reactor_Logging_Server.dsp delete mode 100644 examples/C++NPv2/display_logfile.cpp delete mode 100644 examples/C++NPv2/display_logfile.dsp delete mode 100644 examples/C++NPv2/examples.dsw delete mode 100644 examples/C++NPv2/svc.conf delete mode 100644 examples/ConfigViewer/ConfigTreeCtrl.cpp delete mode 100644 examples/ConfigViewer/ConfigTreeCtrl.h delete mode 100644 examples/ConfigViewer/ConfigurationViewer.cpp delete mode 100644 examples/ConfigViewer/ConfigurationViewer.dsp delete mode 100644 examples/ConfigViewer/ConfigurationViewer.dsw delete mode 100644 examples/ConfigViewer/ConfigurationViewer.rc delete mode 100644 examples/ConfigViewer/MainFrame.cpp delete mode 100644 examples/ConfigViewer/MainFrame.h delete mode 100644 examples/ConfigViewer/README delete mode 100644 examples/ConfigViewer/ValueDlg.cpp delete mode 100644 examples/ConfigViewer/ValueDlg.h delete mode 100644 examples/ConfigViewer/ValueListCtrl.cpp delete mode 100644 examples/ConfigViewer/ValueListCtrl.h delete mode 100644 examples/ConfigViewer/mondrian.ico delete mode 100644 examples/ConfigViewer/mondrian.xpm delete mode 100644 examples/ConfigViewer/stdafx.cpp delete mode 100644 examples/ConfigViewer/stdafx.h delete mode 100644 examples/Connection/Makefile delete mode 100644 examples/Connection/blocking/README delete mode 100644 examples/Connection/blocking/SPIPE-acceptor.cpp delete mode 100644 examples/Connection/blocking/SPIPE-acceptor.h delete mode 100644 examples/Connection/blocking/SPIPE-connector.cpp delete mode 100644 examples/Connection/blocking/SPIPE-connector.h delete mode 100644 examples/Connection/blocking/SPIPE.dsp delete mode 100644 examples/Connection/blocking/SPIPE.dsw delete mode 100644 examples/Connection/blocking/acceptor.dsp delete mode 100644 examples/Connection/blocking/test_spipe_acceptor.cpp delete mode 100644 examples/Connection/blocking/test_spipe_connector.cpp delete mode 100644 examples/Connection/misc/Connection_Handler.cpp delete mode 100644 examples/Connection/misc/Connection_Handler.dsp delete mode 100644 examples/Connection/misc/Connection_Handler.h delete mode 100644 examples/Connection/misc/Makefile delete mode 100644 examples/Connection/misc/misc.dsw delete mode 100644 examples/Connection/misc/test_upipe.cpp delete mode 100644 examples/Connection/misc/test_upipe.dsp delete mode 100644 examples/Connection/misc/test_upipe.h delete mode 100644 examples/Connection/non_blocking/CPP-acceptor.cpp delete mode 100644 examples/Connection/non_blocking/CPP-acceptor.h delete mode 100644 examples/Connection/non_blocking/CPP-connector.cpp delete mode 100644 examples/Connection/non_blocking/CPP-connector.h delete mode 100644 examples/Connection/non_blocking/Makefile delete mode 100644 examples/Connection/non_blocking/README delete mode 100644 examples/Connection/non_blocking/non_blocking.dsp delete mode 100644 examples/Connection/non_blocking/non_blocking.dsw delete mode 100644 examples/Connection/non_blocking/server.dsp delete mode 100644 examples/Connection/non_blocking/test_lsock_acceptor.cpp delete mode 100644 examples/Connection/non_blocking/test_lsock_connector.cpp delete mode 100644 examples/Connection/non_blocking/test_sock_acceptor.cpp delete mode 100644 examples/Connection/non_blocking/test_sock_connector.cpp delete mode 100644 examples/Connection/non_blocking/test_spipe_acceptor.cpp delete mode 100644 examples/Connection/non_blocking/test_spipe_connector.cpp delete mode 100644 examples/Connection/non_blocking/test_tli_acceptor.cpp delete mode 100644 examples/Connection/non_blocking/test_tli_connector.cpp delete mode 100644 examples/DLL/Dll.dsw delete mode 100644 examples/DLL/Magazine.h delete mode 100644 examples/DLL/Main.dsp delete mode 100644 examples/DLL/Makefile delete mode 100644 examples/DLL/Makefile.Newsweek delete mode 100644 examples/DLL/Makefile.Today delete mode 100644 examples/DLL/Newsweek.cpp delete mode 100644 examples/DLL/Newsweek.dsp delete mode 100644 examples/DLL/Newsweek.h delete mode 100644 examples/DLL/README delete mode 100644 examples/DLL/Today.cpp delete mode 100644 examples/DLL/Today.dsp delete mode 100644 examples/DLL/Today.h delete mode 100644 examples/DLL/test_dll.cpp delete mode 100644 examples/Export/Makefile.bor delete mode 100644 examples/Export/README delete mode 100644 examples/Export/dll.cpp delete mode 100644 examples/Export/dll.h delete mode 100644 examples/Export/export_dll.bor delete mode 100644 examples/Export/export_dll.dsp delete mode 100644 examples/Export/export_test.dsw delete mode 100755 examples/Export/run_test.pl delete mode 100644 examples/Export/test.bor delete mode 100644 examples/Export/test.cpp delete mode 100644 examples/Export/test.dsp delete mode 100644 examples/Export/test_export.h delete mode 100644 examples/IOStream/Makefile delete mode 100644 examples/IOStream/README delete mode 100644 examples/IOStream/client/Makefile delete mode 100644 examples/IOStream/client/client.dsw delete mode 100644 examples/IOStream/client/iostream_client.cpp delete mode 100644 examples/IOStream/client/iostream_client.dsp delete mode 100644 examples/IOStream/server/Makefile delete mode 100644 examples/IOStream/server/iostream_server.cpp delete mode 100644 examples/IOStream/server/iostream_server.dsp delete mode 100644 examples/IOStream/server/iostream_server.h delete mode 100644 examples/IOStream/server/server.dsw delete mode 100644 examples/IPC_SAP/ATM_SAP/ATM_SAP.dsw delete mode 100644 examples/IPC_SAP/ATM_SAP/CPP-client.cpp delete mode 100644 examples/IPC_SAP/ATM_SAP/CPP-server.cpp delete mode 100644 examples/IPC_SAP/ATM_SAP/CPP_client.dsp delete mode 100644 examples/IPC_SAP/ATM_SAP/CPP_server.dsp delete mode 100644 examples/IPC_SAP/ATM_SAP/Makefile delete mode 100644 examples/IPC_SAP/ATM_SAP/Makefile.bor delete mode 100644 examples/IPC_SAP/DEV_SAP/Makefile delete mode 100644 examples/IPC_SAP/DEV_SAP/README delete mode 100644 examples/IPC_SAP/DEV_SAP/reader/Makefile delete mode 100644 examples/IPC_SAP/DEV_SAP/reader/reader.cpp delete mode 100644 examples/IPC_SAP/DEV_SAP/reader/reader.dsp delete mode 100644 examples/IPC_SAP/DEV_SAP/reader/reader.dsw delete mode 100644 examples/IPC_SAP/DEV_SAP/writer/Makefile delete mode 100644 examples/IPC_SAP/DEV_SAP/writer/writer.cpp delete mode 100644 examples/IPC_SAP/DEV_SAP/writer/writer.dsp delete mode 100644 examples/IPC_SAP/DEV_SAP/writer/writer.dsw delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.dsp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.dsp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-client.dsp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-server.dsp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO-test.dsp delete mode 100644 examples/IPC_SAP/FIFO_SAP/FIFO_SAP.dsw delete mode 100644 examples/IPC_SAP/FIFO_SAP/Makefile delete mode 100644 examples/IPC_SAP/FIFO_SAP/Makefile.bor delete mode 100644 examples/IPC_SAP/FILE_SAP/File_sap.dsw delete mode 100644 examples/IPC_SAP/FILE_SAP/Makefile delete mode 100644 examples/IPC_SAP/FILE_SAP/Makefile.bor delete mode 100644 examples/IPC_SAP/FILE_SAP/client.cpp delete mode 100644 examples/IPC_SAP/FILE_SAP/client.dsp delete mode 100644 examples/IPC_SAP/FILE_SAP/testfile delete mode 100644 examples/IPC_SAP/Makefile delete mode 100644 examples/IPC_SAP/Makefile.bor delete mode 100644 examples/IPC_SAP/SOCK_SAP/C-inclient.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/C-inserver.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-inclient.h delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp delete mode 100644 examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp delete mode 100644 examples/IPC_SAP/SOCK_SAP/C_inserver.dsp delete mode 100644 examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp delete mode 100644 examples/IPC_SAP/SOCK_SAP/Makefile delete mode 100644 examples/IPC_SAP/SOCK_SAP/Makefile.bor delete mode 100644 examples/IPC_SAP/SOCK_SAP/README delete mode 100644 examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp delete mode 100644 examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsw delete mode 100644 examples/IPC_SAP/SOCK_SAP/local_data delete mode 100755 examples/IPC_SAP/SOCK_SAP/run_test delete mode 100755 examples/IPC_SAP/SOCK_SAP/summarize delete mode 100644 examples/IPC_SAP/SPIPE_SAP/Makefile delete mode 100644 examples/IPC_SAP/SPIPE_SAP/Makefile.bor delete mode 100644 examples/IPC_SAP/SPIPE_SAP/NPClient.cpp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/NPClient.dsp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/NPServer.cpp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/NPServer.dsp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/SPIPE_SAP.dsw delete mode 100644 examples/IPC_SAP/SPIPE_SAP/client.cpp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/client.dsp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/consumer_msg.dsp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/consumer_read.dsp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/producer_msg.dsp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/producer_read.cpp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/producer_read.dsp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/server.cpp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/server.dsp delete mode 100644 examples/IPC_SAP/SPIPE_SAP/shared.h delete mode 100644 examples/IPC_SAP/SSL_SAP/Makefile delete mode 100644 examples/IPC_SAP/SSL_SAP/README delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-client-simple.h delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-client.cpp delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-client.dsp delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-client.h delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-server.cpp delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL-server.dsp delete mode 100644 examples/IPC_SAP/SSL_SAP/SSL_SOCK_SAP.dsw delete mode 100644 examples/IPC_SAP/SSL_SAP/dummy.pem delete mode 100644 examples/IPC_SAP/SSL_SAP/key.pem delete mode 100644 examples/IPC_SAP/SSL_SAP/local_data delete mode 100755 examples/IPC_SAP/SSL_SAP/summarize delete mode 100644 examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp delete mode 100644 examples/IPC_SAP/TLI_SAP/CPP-ATM-client.dsp delete mode 100644 examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp delete mode 100644 examples/IPC_SAP/TLI_SAP/CPP-ATM-server.dsp delete mode 100644 examples/IPC_SAP/TLI_SAP/CPP-client.cpp delete mode 100644 examples/IPC_SAP/TLI_SAP/CPP-client.dsp delete mode 100644 examples/IPC_SAP/TLI_SAP/CPP-server.cpp delete mode 100644 examples/IPC_SAP/TLI_SAP/CPP-server.dsp delete mode 100644 examples/IPC_SAP/TLI_SAP/Makefile delete mode 100644 examples/IPC_SAP/TLI_SAP/TLI_SAP.dsw delete mode 100644 examples/IPC_SAP/TLI_SAP/db-client.cpp delete mode 100644 examples/IPC_SAP/TLI_SAP/db-client.dsp delete mode 100644 examples/IPC_SAP/TLI_SAP/db-server.cpp delete mode 100644 examples/IPC_SAP/TLI_SAP/db-server.dsp delete mode 100644 examples/IPC_SAP/TLI_SAP/ftp-client.cpp delete mode 100644 examples/IPC_SAP/TLI_SAP/ftp-client.dsp delete mode 100644 examples/IPC_SAP/TLI_SAP/ftp-server.cpp delete mode 100644 examples/IPC_SAP/TLI_SAP/ftp-server.dsp delete mode 100644 examples/IPC_SAP/UPIPE_SAP/Makefile delete mode 100644 examples/IPC_SAP/UPIPE_SAP/Makefile.bor delete mode 100644 examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.dsw delete mode 100644 examples/IPC_SAP/UPIPE_SAP/ex1.cpp delete mode 100644 examples/IPC_SAP/UPIPE_SAP/ex1.dsp delete mode 100644 examples/IPC_SAP/UPIPE_SAP/ex2.cpp delete mode 100644 examples/IPC_SAP/UPIPE_SAP/ex2.dsp delete mode 100644 examples/IPC_SAP/UPIPE_SAP/ex3.cpp delete mode 100644 examples/IPC_SAP/UPIPE_SAP/ex3.dsp delete mode 100644 examples/Log_Msg/Callback.dsp delete mode 100644 examples/Log_Msg/Log_Msg.dsp delete mode 100644 examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.cpp delete mode 100644 examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.dsp delete mode 100644 examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.dsw delete mode 100644 examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h delete mode 100644 examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.rc delete mode 100644 examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp delete mode 100644 examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.h delete mode 100644 examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp delete mode 100644 examples/Log_Msg/Log_Msg_MFC/MFC_Log.h delete mode 100644 examples/Log_Msg/Log_Msg_MFC/README delete mode 100644 examples/Log_Msg/Log_Msg_MFC/Resource.h delete mode 100644 examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp delete mode 100644 examples/Log_Msg/Log_Msg_MFC/StdAfx.h delete mode 100644 examples/Log_Msg/Log_Msg_MFC/res/Log_Msg_MFC.ico delete mode 100644 examples/Log_Msg/Log_Msg_MFC/res/Log_Msg_MFC.rc2 delete mode 100644 examples/Log_Msg/Makefile delete mode 100644 examples/Log_Msg/Ostream.dsp delete mode 100644 examples/Log_Msg/README delete mode 100644 examples/Log_Msg/makefile.bor delete mode 100644 examples/Log_Msg/test_callback.cpp delete mode 100644 examples/Log_Msg/test_log_msg.cpp delete mode 100644 examples/Log_Msg/test_ostream.cpp delete mode 100644 examples/Logger/Acceptor-server/Makefile delete mode 100644 examples/Logger/Acceptor-server/server_loggerd.cpp delete mode 100644 examples/Logger/Acceptor-server/server_loggerd.dsp delete mode 100644 examples/Logger/Acceptor-server/server_loggerd.dsw delete mode 100644 examples/Logger/Acceptor-server/server_loggerd.h delete mode 100644 examples/Logger/Makefile delete mode 100644 examples/Logger/README delete mode 100644 examples/Logger/client/Makefile delete mode 100644 examples/Logger/client/client.dsp delete mode 100644 examples/Logger/client/client.dsw delete mode 100644 examples/Logger/client/logging_app.cpp delete mode 100644 examples/Logger/simple-server/Logging_Acceptor.cpp delete mode 100644 examples/Logger/simple-server/Logging_Acceptor.h delete mode 100644 examples/Logger/simple-server/Logging_Handler.cpp delete mode 100644 examples/Logger/simple-server/Logging_Handler.h delete mode 100644 examples/Logger/simple-server/Makefile delete mode 100644 examples/Logger/simple-server/Reactor_Singleton.h delete mode 100644 examples/Logger/simple-server/server_loggerd.cpp delete mode 100644 examples/Logger/simple-server/server_loggerd.dsp delete mode 100644 examples/Logger/simple-server/server_loggerd.dsw delete mode 100644 examples/Makefile delete mode 100644 examples/Makefile.bor delete mode 100644 examples/Map_Manager/Makefile delete mode 100644 examples/Map_Manager/Map_Manager.dsw delete mode 100644 examples/Map_Manager/makefile.bor delete mode 100644 examples/Map_Manager/test_hash_map_manager.cpp delete mode 100644 examples/Map_Manager/test_hash_map_manager.dsp delete mode 100644 examples/Mem_Map/IO-tests/IO_Test.cpp delete mode 100644 examples/Mem_Map/IO-tests/IO_Test.h delete mode 100644 examples/Mem_Map/IO-tests/Makefile delete mode 100644 examples/Mem_Map/IO-tests/test_io.cpp delete mode 100644 examples/Mem_Map/Makefile delete mode 100644 examples/Mem_Map/Makefile.bor delete mode 100644 examples/Mem_Map/file-reverse/Makefile delete mode 100644 examples/Mem_Map/file-reverse/file-reverse.cpp delete mode 100644 examples/Mem_Map/file-reverse/file_reverse.dsp delete mode 100644 examples/Mem_Map/file-reverse/file_reverse.dsw delete mode 100644 examples/Mem_Map/file-reverse/makefile.bor delete mode 100644 examples/Misc/Makefile delete mode 100644 examples/Misc/Makefile.bor delete mode 100644 examples/Misc/Misc.dsw delete mode 100644 examples/Misc/test_XtReactor1.cpp delete mode 100644 examples/Misc/test_XtReactor1.dsp delete mode 100644 examples/Misc/test_XtReactor2.cpp delete mode 100644 examples/Misc/test_XtReactor2.dsp delete mode 100644 examples/Misc/test_dump.cpp delete mode 100644 examples/Misc/test_dump.dsp delete mode 100644 examples/Misc/test_dump.h delete mode 100644 examples/Misc/test_get_opt.cpp delete mode 100644 examples/Misc/test_get_opt.dsp delete mode 100644 examples/Misc/test_profile_timer.cpp delete mode 100644 examples/Misc/test_profile_timer.dsp delete mode 100644 examples/Misc/test_read_buffer.cpp delete mode 100644 examples/Misc/test_read_buffer.dsp delete mode 100644 examples/Misc/test_set.cpp delete mode 100644 examples/Misc/test_set.dsp delete mode 100644 examples/Misc/test_sstring.cpp delete mode 100644 examples/Misc/test_sstring.dsp delete mode 100644 examples/Misc/test_trace.cpp delete mode 100644 examples/Misc/test_trace.dsp delete mode 100644 examples/NT_Service/Makefile delete mode 100644 examples/NT_Service/Makefile.bor delete mode 100644 examples/NT_Service/NT_Service.dsp delete mode 100644 examples/NT_Service/NT_Service.dsw delete mode 100644 examples/NT_Service/README delete mode 100644 examples/NT_Service/main.cpp delete mode 100644 examples/NT_Service/ntsvc.cpp delete mode 100644 examples/NT_Service/ntsvc.h delete mode 100644 examples/Naming/Makefile delete mode 100644 examples/Naming/Makefile.bor delete mode 100644 examples/Naming/Naming.dsp delete mode 100644 examples/Naming/Naming.dsw delete mode 100644 examples/Naming/multiple_contexts.dsp delete mode 100644 examples/Naming/non_existent.dsp delete mode 100644 examples/Naming/test_multiple_contexts.cpp delete mode 100644 examples/Naming/test_non_existent.cpp delete mode 100644 examples/Naming/test_open.cpp delete mode 100644 examples/Naming/test_writers.cpp delete mode 100644 examples/OS/Makefile delete mode 100644 examples/OS/Process/Makefile delete mode 100644 examples/OS/Process/Process.dsp delete mode 100644 examples/OS/Process/Process.dsw delete mode 100644 examples/OS/Process/README delete mode 100644 examples/OS/Process/imore.cpp delete mode 100644 examples/OS/Process/imore.dsp delete mode 100644 examples/OS/Process/process.cpp delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/FlowSpec_Dbase.h delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/Makefile delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/README delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/receiver.cpp delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/receiver.dsp delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/sender.cpp delete mode 100644 examples/QOS/Change_Receiver_FlowSpec/sender.dsp delete mode 100644 examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp delete mode 100644 examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h delete mode 100644 examples/QOS/Change_Sender_TSpec/FlowSpec_Dbase.h delete mode 100644 examples/QOS/Change_Sender_TSpec/Makefile delete mode 100644 examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp delete mode 100644 examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h delete mode 100644 examples/QOS/Change_Sender_TSpec/QoS_Util.cpp delete mode 100644 examples/QOS/Change_Sender_TSpec/QoS_Util.h delete mode 100644 examples/QOS/Change_Sender_TSpec/README delete mode 100644 examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp delete mode 100644 examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h delete mode 100644 examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp delete mode 100644 examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h delete mode 100644 examples/QOS/Change_Sender_TSpec/receiver.cpp delete mode 100644 examples/QOS/Change_Sender_TSpec/receiver.dsp delete mode 100644 examples/QOS/Change_Sender_TSpec/sender.cpp delete mode 100644 examples/QOS/Change_Sender_TSpec/sender.dsp delete mode 100644 examples/QOS/Diffserv/Diffserv.dsw delete mode 100644 examples/QOS/Diffserv/Makefile delete mode 100644 examples/QOS/Diffserv/NOTES.txt delete mode 100644 examples/QOS/Diffserv/README delete mode 100644 examples/QOS/Diffserv/diffserv_test.cpp delete mode 100644 examples/QOS/Diffserv/diffserv_test.dsp delete mode 100755 examples/QOS/Diffserv/run_test.pl delete mode 100644 examples/QOS/Diffserv/server.cpp delete mode 100644 examples/QOS/Diffserv/server.dsp delete mode 100644 examples/QOS/Makefile delete mode 100644 examples/QOS/QOS.dsw delete mode 100644 examples/QOS/Simple/Fill_ACE_QoS.cpp delete mode 100644 examples/QOS/Simple/Fill_ACE_QoS.h delete mode 100644 examples/QOS/Simple/FlowSpec_Dbase.h delete mode 100644 examples/QOS/Simple/Makefile delete mode 100644 examples/QOS/Simple/QoS_Signal_Handler.cpp delete mode 100644 examples/QOS/Simple/QoS_Signal_Handler.h delete mode 100644 examples/QOS/Simple/QoS_Util.cpp delete mode 100644 examples/QOS/Simple/QoS_Util.h delete mode 100644 examples/QOS/Simple/README delete mode 100644 examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp delete mode 100644 examples/QOS/Simple/Receiver_QoS_Event_Handler.h delete mode 100644 examples/QOS/Simple/Sender_QoS_Event_Handler.cpp delete mode 100644 examples/QOS/Simple/Sender_QoS_Event_Handler.h delete mode 100644 examples/QOS/Simple/receiver.cpp delete mode 100644 examples/QOS/Simple/receiver.dsp delete mode 100644 examples/QOS/Simple/sender.cpp delete mode 100644 examples/QOS/Simple/sender.dsp delete mode 100644 examples/README delete mode 100644 examples/RMCast/Makefile delete mode 100644 examples/RMCast/Makefile.bor delete mode 100644 examples/RMCast/Send_File/Makefile delete mode 100644 examples/RMCast/Send_File/Makefile.bor delete mode 100644 examples/RMCast/Send_File/Receiver.cpp delete mode 100644 examples/RMCast/Send_File/Receiver.dsp delete mode 100644 examples/RMCast/Send_File/Send_File.dsw delete mode 100644 examples/RMCast/Send_File/Sender.cpp delete mode 100644 examples/RMCast/Send_File/Sender.dsp delete mode 100644 examples/Reactor/Dgram/CODgram.cpp delete mode 100644 examples/Reactor/Dgram/CODgram.dsp delete mode 100644 examples/Reactor/Dgram/Dgram.cpp delete mode 100644 examples/Reactor/Dgram/Dgram.dsp delete mode 100644 examples/Reactor/Dgram/Dgram.dsw delete mode 100644 examples/Reactor/Dgram/Makefile delete mode 100644 examples/Reactor/Dgram/Makefile.bor delete mode 100644 examples/Reactor/FIFO/FIFO.dsw delete mode 100644 examples/Reactor/FIFO/Makefile delete mode 100644 examples/Reactor/FIFO/client.cpp delete mode 100644 examples/Reactor/FIFO/client.dsp delete mode 100644 examples/Reactor/FIFO/server.cpp delete mode 100644 examples/Reactor/FIFO/server.dsp delete mode 100644 examples/Reactor/Makefile delete mode 100644 examples/Reactor/Makefile.bor delete mode 100644 examples/Reactor/Misc/Makefile delete mode 100644 examples/Reactor/Misc/Misc.dsp delete mode 100644 examples/Reactor/Misc/Misc.dsw delete mode 100644 examples/Reactor/Misc/demuxing.dsp delete mode 100644 examples/Reactor/Misc/early_timeouts.dsp delete mode 100644 examples/Reactor/Misc/notification.cpp delete mode 100644 examples/Reactor/Misc/notification.dsp delete mode 100644 examples/Reactor/Misc/pingpong.cpp delete mode 100644 examples/Reactor/Misc/reactors.dsp delete mode 100644 examples/Reactor/Misc/signals_1.dsp delete mode 100644 examples/Reactor/Misc/signals_2.dsp delete mode 100644 examples/Reactor/Misc/test_demuxing.cpp delete mode 100644 examples/Reactor/Misc/test_early_timeouts.cpp delete mode 100644 examples/Reactor/Misc/test_event_handler_t.cpp delete mode 100644 examples/Reactor/Misc/test_reactors.cpp delete mode 100644 examples/Reactor/Misc/test_signals_1.cpp delete mode 100644 examples/Reactor/Misc/test_signals_2.cpp delete mode 100644 examples/Reactor/Misc/test_time_value.cpp delete mode 100644 examples/Reactor/Misc/test_timer_queue.cpp delete mode 100644 examples/Reactor/Multicast/Log_Wrapper.cpp delete mode 100644 examples/Reactor/Multicast/Log_Wrapper.h delete mode 100644 examples/Reactor/Multicast/Makefile delete mode 100644 examples/Reactor/Multicast/Makefile.bor delete mode 100644 examples/Reactor/Multicast/Multicast.dsw delete mode 100644 examples/Reactor/Multicast/README delete mode 100644 examples/Reactor/Multicast/client.bor delete mode 100644 examples/Reactor/Multicast/client.cpp delete mode 100644 examples/Reactor/Multicast/client.dsp delete mode 100644 examples/Reactor/Multicast/server.bor delete mode 100644 examples/Reactor/Multicast/server.cpp delete mode 100644 examples/Reactor/Multicast/server.dsp delete mode 100644 examples/Reactor/Ntalker/Makefile delete mode 100644 examples/Reactor/Ntalker/Makefile.bor delete mode 100644 examples/Reactor/Ntalker/README delete mode 100644 examples/Reactor/Ntalker/ntalker.cpp delete mode 100644 examples/Reactor/Ntalker/ntalker.dsp delete mode 100644 examples/Reactor/Ntalker/ntalker.dsw delete mode 100644 examples/Reactor/Proactor/Aio_Platform_Test_C.cpp delete mode 100644 examples/Reactor/Proactor/Makefile delete mode 100644 examples/Reactor/Proactor/Makefile.bor delete mode 100644 examples/Reactor/Proactor/README delete mode 100644 examples/Reactor/Proactor/post_completions.cpp delete mode 100644 examples/Reactor/Proactor/post_completions.dsp delete mode 100644 examples/Reactor/Proactor/simple_test_proactor.cpp delete mode 100644 examples/Reactor/Proactor/test_aiocb.cpp delete mode 100644 examples/Reactor/Proactor/test_aiocb_ace.cpp delete mode 100644 examples/Reactor/Proactor/test_aiosig.cpp delete mode 100644 examples/Reactor/Proactor/test_aiosig_ace.cpp delete mode 100644 examples/Reactor/Proactor/test_cancel.cpp delete mode 100644 examples/Reactor/Proactor/test_cancel.dsp delete mode 100644 examples/Reactor/Proactor/test_end_event_loop.cpp delete mode 100644 examples/Reactor/Proactor/test_end_event_loop.dsp delete mode 100644 examples/Reactor/Proactor/test_multiple_loops.cpp delete mode 100644 examples/Reactor/Proactor/test_multiple_loops.dsp delete mode 100644 examples/Reactor/Proactor/test_proactor.cpp delete mode 100644 examples/Reactor/Proactor/test_proactor.dsp delete mode 100644 examples/Reactor/Proactor/test_proactor.dsw delete mode 100644 examples/Reactor/Proactor/test_proactor2.cpp delete mode 100644 examples/Reactor/Proactor/test_proactor3.cpp delete mode 100644 examples/Reactor/Proactor/test_timeout.cpp delete mode 100644 examples/Reactor/Proactor/test_timeout.dsp delete mode 100644 examples/Reactor/Proactor/test_timeout_st.cpp delete mode 100644 examples/Reactor/Proactor/test_udp_proactor.cpp delete mode 100644 examples/Reactor/Proactor/test_udp_proactor.dsp delete mode 100644 examples/Reactor/README delete mode 100644 examples/Reactor/WFMO_Reactor/APC.DSP delete mode 100644 examples/Reactor/WFMO_Reactor/APC.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Abandoned.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Abandoned.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Console_Input.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Console_Input.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Directory_Changes.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Directory_Changes.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Exceptions.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Exceptions.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Handle_Close.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Handle_Close.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Makefile.bor delete mode 100644 examples/Reactor/WFMO_Reactor/Multithreading.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Multithreading.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Network_Events.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Network_Events.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Prerun_State_Changes.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Registration.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Registration.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Registry_Changes.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Registry_Changes.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Removals.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Removals.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Suspended_Removals.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Talker.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Talker.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/Timeouts.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Timeouts.dsp delete mode 100644 examples/Reactor/WFMO_Reactor/WFMO_Reactor.dsw delete mode 100644 examples/Reactor/WFMO_Reactor/Window_Messages.cpp delete mode 100644 examples/Reactor/WFMO_Reactor/Window_Messages.dsp delete mode 100755 examples/Reactor/WFMO_Reactor/run_test.pl delete mode 100644 examples/Registry/Makefile.bor delete mode 100644 examples/Registry/Registry.dsp delete mode 100644 examples/Registry/Registry.dsw delete mode 100644 examples/Registry/test_registry_iterator.cpp delete mode 100644 examples/Registry/test_registry_update.cpp delete mode 100644 examples/Registry/update.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/Makefile delete mode 100644 examples/Service_Configurator/IPC-tests/Makefile.bor delete mode 100644 examples/Service_Configurator/IPC-tests/README delete mode 100644 examples/Service_Configurator/IPC-tests/client/Makefile delete mode 100644 examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/broadcast_client_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/client/client.dsw delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_data delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/local_stream_client_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/client/makefile.bor delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_data delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_data1 delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_data2 delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_data3 delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_data4 delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h delete mode 100644 examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i delete mode 100644 examples/Service_Configurator/IPC-tests/server/Makefile delete mode 100644 examples/Service_Configurator/IPC-tests/server/Server.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/server/Server_static.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/server/server.dsw delete mode 100644 examples/Service_Configurator/IPC-tests/server/server_test.cpp delete mode 100644 examples/Service_Configurator/IPC-tests/server/server_test.dsp delete mode 100644 examples/Service_Configurator/IPC-tests/server/svc.conf delete mode 100644 examples/Service_Configurator/Makefile delete mode 100644 examples/Service_Configurator/Makefile.bor delete mode 100644 examples/Service_Configurator/Misc/Makefile delete mode 100644 examples/Service_Configurator/Misc/Makefile.Timer delete mode 100644 examples/Service_Configurator/Misc/Makefile.main delete mode 100644 examples/Service_Configurator/Misc/Misc.dsw delete mode 100644 examples/Service_Configurator/Misc/README delete mode 100644 examples/Service_Configurator/Misc/Timer.dsp delete mode 100644 examples/Service_Configurator/Misc/Timer_Service.cpp delete mode 100644 examples/Service_Configurator/Misc/Timer_Service.h delete mode 100644 examples/Service_Configurator/Misc/main.cpp delete mode 100644 examples/Service_Configurator/Misc/main.dsp delete mode 100644 examples/Service_Configurator/Misc/svc.conf1 delete mode 100644 examples/Service_Configurator/Misc/svc.conf2 delete mode 100644 examples/Shared_Malloc/Makefile delete mode 100644 examples/Shared_Malloc/Malloc.cpp delete mode 100644 examples/Shared_Malloc/Malloc.h delete mode 100644 examples/Shared_Malloc/Options.cpp delete mode 100644 examples/Shared_Malloc/Options.h delete mode 100644 examples/Shared_Malloc/Shared_Malloc.dsw delete mode 100644 examples/Shared_Malloc/malloc.dsp delete mode 100644 examples/Shared_Malloc/multiple_mallocs.dsp delete mode 100644 examples/Shared_Malloc/persistence.dsp delete mode 100644 examples/Shared_Malloc/position_independent_malloc.dsp delete mode 100644 examples/Shared_Malloc/test_malloc.cpp delete mode 100644 examples/Shared_Malloc/test_multiple_mallocs.cpp delete mode 100644 examples/Shared_Malloc/test_persistence.cpp delete mode 100644 examples/Shared_Malloc/test_position_independent_malloc.cpp delete mode 100644 examples/Shared_Malloc/test_position_independent_malloc.h delete mode 100644 examples/Shared_Memory/Makefile delete mode 100644 examples/Shared_Memory/Shared_Memory.dsw delete mode 100644 examples/Shared_Memory/test_MM.cpp delete mode 100644 examples/Shared_Memory/test_MM.dsp delete mode 100644 examples/Shared_Memory/test_SV.cpp delete mode 100644 examples/Shared_Memory/test_SV.dsp delete mode 100644 examples/Smart_Pointers/Gadget.cpp delete mode 100644 examples/Smart_Pointers/Gadget.h delete mode 100644 examples/Smart_Pointers/Gadget_Factory.cpp delete mode 100644 examples/Smart_Pointers/Gadget_Factory.h delete mode 100644 examples/Smart_Pointers/Gadget_Impl.cpp delete mode 100644 examples/Smart_Pointers/Gadget_Impl.h delete mode 100644 examples/Smart_Pointers/Gadget_Part.cpp delete mode 100644 examples/Smart_Pointers/Gadget_Part.h delete mode 100644 examples/Smart_Pointers/Gadget_Part_Factory.cpp delete mode 100644 examples/Smart_Pointers/Gadget_Part_Factory.h delete mode 100644 examples/Smart_Pointers/Gadget_Part_Impl.cpp delete mode 100644 examples/Smart_Pointers/Gadget_Part_Impl.h delete mode 100644 examples/Smart_Pointers/Makefile delete mode 100644 examples/Smart_Pointers/Makefile.bor delete mode 100644 examples/Smart_Pointers/README delete mode 100644 examples/Smart_Pointers/Smart_Pointers.dsw delete mode 100644 examples/Smart_Pointers/Widget.cpp delete mode 100644 examples/Smart_Pointers/Widget.h delete mode 100644 examples/Smart_Pointers/Widget_Factory.cpp delete mode 100644 examples/Smart_Pointers/Widget_Factory.h delete mode 100644 examples/Smart_Pointers/Widget_Impl.cpp delete mode 100644 examples/Smart_Pointers/Widget_Impl.h delete mode 100644 examples/Smart_Pointers/Widget_Part.cpp delete mode 100644 examples/Smart_Pointers/Widget_Part.h delete mode 100644 examples/Smart_Pointers/Widget_Part_Factory.cpp delete mode 100644 examples/Smart_Pointers/Widget_Part_Factory.h delete mode 100644 examples/Smart_Pointers/Widget_Part_Impl.cpp delete mode 100644 examples/Smart_Pointers/Widget_Part_Impl.h delete mode 100644 examples/Smart_Pointers/gadget_test.bor delete mode 100644 examples/Smart_Pointers/gadget_test.cpp delete mode 100644 examples/Smart_Pointers/gadget_test.dsp delete mode 100644 examples/Smart_Pointers/widget_test.bor delete mode 100644 examples/Smart_Pointers/widget_test.cpp delete mode 100644 examples/Smart_Pointers/widget_test.dsp delete mode 100644 examples/Synch/Makefile delete mode 100644 examples/Synch/Makefile.bor delete mode 100644 examples/Synch/README delete mode 100644 examples/Synch/Synch.dsw delete mode 100644 examples/Synch/proc_sema.cpp delete mode 100644 examples/Synch/proc_sema.dsp delete mode 100644 examples/System_V_IPC/Makefile delete mode 100644 examples/System_V_IPC/README delete mode 100644 examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp delete mode 100644 examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp delete mode 100644 examples/System_V_IPC/SV_Message_Queues/Makefile delete mode 100644 examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp delete mode 100644 examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp delete mode 100644 examples/System_V_IPC/SV_Message_Queues/test.h delete mode 100644 examples/System_V_IPC/SV_Semaphores/Makefile delete mode 100644 examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp delete mode 100644 examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp delete mode 100644 examples/System_V_IPC/SV_Shared_Memory/Makefile delete mode 100644 examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp delete mode 100644 examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.h delete mode 100644 examples/Threads/Makefile delete mode 100644 examples/Threads/Makefile.bor delete mode 100644 examples/Threads/TSS_Data.h delete mode 100644 examples/Threads/TSS_Obj.h delete mode 100644 examples/Threads/TSS_Task.h delete mode 100644 examples/Threads/auto_event.cpp delete mode 100644 examples/Threads/barrier1.cpp delete mode 100644 examples/Threads/barrier1.dsp delete mode 100644 examples/Threads/barrier2.cpp delete mode 100644 examples/Threads/barrier2.dsp delete mode 100644 examples/Threads/cancel.cpp delete mode 100644 examples/Threads/cancel.dsp delete mode 100644 examples/Threads/future1.cpp delete mode 100644 examples/Threads/future1.dsp delete mode 100644 examples/Threads/future2.cpp delete mode 100644 examples/Threads/future2.dsp delete mode 100644 examples/Threads/manual_event.cpp delete mode 100644 examples/Threads/manual_event.dsp delete mode 100644 examples/Threads/process_manager.cpp delete mode 100644 examples/Threads/process_mutex.cpp delete mode 100644 examples/Threads/process_mutex.dsp delete mode 100644 examples/Threads/process_semaphore.cpp delete mode 100644 examples/Threads/process_semaphore.dsp delete mode 100644 examples/Threads/reader_writer.cpp delete mode 100644 examples/Threads/reader_writer.dsp delete mode 100644 examples/Threads/recursive_mutex.cpp delete mode 100644 examples/Threads/recursive_mutex.dsp delete mode 100644 examples/Threads/task_five.cpp delete mode 100644 examples/Threads/task_five.dsp delete mode 100644 examples/Threads/task_four.cpp delete mode 100644 examples/Threads/task_four.dsp delete mode 100644 examples/Threads/task_one.cpp delete mode 100644 examples/Threads/task_one.dsp delete mode 100644 examples/Threads/task_three.cpp delete mode 100644 examples/Threads/task_three.dsp delete mode 100644 examples/Threads/task_two.cpp delete mode 100644 examples/Threads/task_two.dsp delete mode 100644 examples/Threads/test.dsp delete mode 100644 examples/Threads/test.dsw delete mode 100644 examples/Threads/thread_manager.cpp delete mode 100644 examples/Threads/thread_manager.dsp delete mode 100644 examples/Threads/thread_pool.cpp delete mode 100644 examples/Threads/thread_pool.dsp delete mode 100644 examples/Threads/thread_specific.cpp delete mode 100644 examples/Threads/thread_specific.dsp delete mode 100644 examples/Threads/thread_specific.h delete mode 100644 examples/Threads/token.cpp delete mode 100644 examples/Threads/token.dsp delete mode 100644 examples/Threads/tss1.cpp delete mode 100644 examples/Threads/tss1.dsp delete mode 100644 examples/Threads/tss2.cpp delete mode 100644 examples/Threads/tss2.dsp delete mode 100644 examples/Threads/wfmo.cpp delete mode 100644 examples/Timer_Queue/Async_Timer_Queue_Test.bor delete mode 100644 examples/Timer_Queue/Async_Timer_Queue_Test.cpp delete mode 100644 examples/Timer_Queue/Async_Timer_Queue_Test.dsp delete mode 100644 examples/Timer_Queue/Async_Timer_Queue_Test.h delete mode 100644 examples/Timer_Queue/Driver.cpp delete mode 100644 examples/Timer_Queue/Driver.h delete mode 100644 examples/Timer_Queue/Makefile delete mode 100644 examples/Timer_Queue/Makefile.bor delete mode 100644 examples/Timer_Queue/README delete mode 100644 examples/Timer_Queue/Reactor_Timer_Queue_Test.bor delete mode 100644 examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp delete mode 100644 examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp delete mode 100644 examples/Timer_Queue/Reactor_Timer_Queue_Test.h delete mode 100644 examples/Timer_Queue/Thread_Timer_Queue_Test.bor delete mode 100644 examples/Timer_Queue/Thread_Timer_Queue_Test.cpp delete mode 100644 examples/Timer_Queue/Thread_Timer_Queue_Test.dsp delete mode 100644 examples/Timer_Queue/Thread_Timer_Queue_Test.h delete mode 100644 examples/Timer_Queue/Timer_Queue.dsw delete mode 100644 examples/Timer_Queue/main_async.cpp delete mode 100644 examples/Timer_Queue/main_reactor.cpp delete mode 100644 examples/Timer_Queue/main_thread.cpp delete mode 100644 examples/Web_Crawler/Command_Processor.cpp delete mode 100644 examples/Web_Crawler/Command_Processor.h delete mode 100644 examples/Web_Crawler/HTTP_URL.cpp delete mode 100644 examples/Web_Crawler/HTTP_URL.h delete mode 100644 examples/Web_Crawler/Iterators.cpp delete mode 100644 examples/Web_Crawler/Iterators.h delete mode 100644 examples/Web_Crawler/Makefile delete mode 100644 examples/Web_Crawler/Mem_Map_Stream.cpp delete mode 100644 examples/Web_Crawler/Mem_Map_Stream.h delete mode 100644 examples/Web_Crawler/Options.cpp delete mode 100644 examples/Web_Crawler/Options.h delete mode 100644 examples/Web_Crawler/README delete mode 100644 examples/Web_Crawler/URL.cpp delete mode 100644 examples/Web_Crawler/URL.h delete mode 100644 examples/Web_Crawler/URL_Addr.cpp delete mode 100644 examples/Web_Crawler/URL_Addr.h delete mode 100644 examples/Web_Crawler/URL_Status.cpp delete mode 100644 examples/Web_Crawler/URL_Status.h delete mode 100644 examples/Web_Crawler/URL_Visitor.cpp delete mode 100644 examples/Web_Crawler/URL_Visitor.h delete mode 100644 examples/Web_Crawler/URL_Visitor_Factory.cpp delete mode 100644 examples/Web_Crawler/URL_Visitor_Factory.h delete mode 100644 examples/Web_Crawler/Web_Crawler.cpp delete mode 100644 examples/Web_Crawler/Web_Crawler.dsp delete mode 100644 examples/Web_Crawler/Web_Crawler.dsw delete mode 100644 examples/Web_Crawler/Web_Crawler.h delete mode 100644 examples/Web_Crawler/main.cpp delete mode 100644 html/README delete mode 100644 html/Stats/Stats.css delete mode 100644 html/Stats/configuration.shtml delete mode 100644 html/Stats/detailed_footprint.shtml delete mode 100644 html/Stats/detailed_performance.shtml delete mode 100644 html/Stats/footer.html delete mode 100644 html/Stats/index.shtml delete mode 100644 html/Stats/navigation.html delete mode 100644 html/doxygen.css delete mode 100644 html/index.html delete mode 100644 include/makeinclude/Makefile.rtems delete mode 100644 include/makeinclude/ace_flags.bor delete mode 100644 include/makeinclude/build_core_exe.bor delete mode 100644 include/makeinclude/build_core_library.bor delete mode 100644 include/makeinclude/build_dll.bor delete mode 100644 include/makeinclude/build_example.bor delete mode 100644 include/makeinclude/build_exe.bor delete mode 100644 include/makeinclude/build_lib.bor delete mode 100644 include/makeinclude/build_library.bor delete mode 100644 include/makeinclude/clean.bor delete mode 100644 include/makeinclude/compiler.bor delete mode 100644 include/makeinclude/decorator.bor delete mode 100644 include/makeinclude/install.bor delete mode 100644 include/makeinclude/macros.GNU delete mode 100644 include/makeinclude/make_flags.bor delete mode 100644 include/makeinclude/outputdir.bor delete mode 100644 include/makeinclude/platform_aix.GNU delete mode 100644 include/makeinclude/platform_aix4.2.GNU delete mode 100644 include/makeinclude/platform_aix4_cset++.GNU delete mode 100644 include/makeinclude/platform_aix_g++.GNU delete mode 100644 include/makeinclude/platform_aix_ibm.GNU delete mode 100644 include/makeinclude/platform_chorus.GNU delete mode 100644 include/makeinclude/platform_chorus4.x_g++.GNU delete mode 100644 include/makeinclude/platform_chorus_ghs.GNU delete mode 100644 include/makeinclude/platform_cray.GNU delete mode 100644 include/makeinclude/platform_cygwin32.GNU delete mode 100644 include/makeinclude/platform_dgux4_epc.GNU delete mode 100644 include/makeinclude/platform_dgux4_ghs.GNU delete mode 100644 include/makeinclude/platform_freebsd.GNU delete mode 100644 include/makeinclude/platform_g++_common.GNU delete mode 100644 include/makeinclude/platform_gnuwin32_common.GNU delete mode 100644 include/makeinclude/platform_hpux.GNU delete mode 100644 include/makeinclude/platform_hpux_aCC.GNU delete mode 100644 include/makeinclude/platform_hpux_gcc.GNU delete mode 100644 include/makeinclude/platform_hpux_kcc.GNU delete mode 100644 include/makeinclude/platform_irix5.2.GNU delete mode 100644 include/makeinclude/platform_irix5.3_g++.GNU delete mode 100644 include/makeinclude/platform_irix5.3_sgic++.GNU delete mode 100644 include/makeinclude/platform_irix6.x_common.GNU delete mode 100644 include/makeinclude/platform_irix6.x_g++.GNU delete mode 100644 include/makeinclude/platform_irix6.x_kcc.GNU delete mode 100644 include/makeinclude/platform_irix6.x_sgic++.GNU delete mode 100644 include/makeinclude/platform_linux.GNU delete mode 100644 include/makeinclude/platform_linux_borland.GNU delete mode 100644 include/makeinclude/platform_linux_cxx.GNU delete mode 100644 include/makeinclude/platform_linux_icc.GNU delete mode 100644 include/makeinclude/platform_linux_kcc.GNU delete mode 100644 include/makeinclude/platform_lynxos.GNU delete mode 100644 include/makeinclude/platform_m88k.GNU delete mode 100644 include/makeinclude/platform_macosx.GNU delete mode 100644 include/makeinclude/platform_mingw32.GNU delete mode 100644 include/makeinclude/platform_mvs.GNU delete mode 100644 include/makeinclude/platform_netbsd.GNU delete mode 100644 include/makeinclude/platform_openbsd.GNU delete mode 100644 include/makeinclude/platform_osf1_3.2_cxx.GNU delete mode 100644 include/makeinclude/platform_osf1_4.x_cxx.GNU delete mode 100644 include/makeinclude/platform_osf1_4.x_g++.GNU delete mode 100644 include/makeinclude/platform_osf1_4.x_kcc.GNU delete mode 100644 include/makeinclude/platform_osf1_4.x_rcc.GNU delete mode 100644 include/makeinclude/platform_psos_diab.GNU delete mode 100644 include/makeinclude/platform_psos_diab_ppc.GNU delete mode 100644 include/makeinclude/platform_psos_tm.GNU delete mode 100644 include/makeinclude/platform_psosim_g++.GNU delete mode 100644 include/makeinclude/platform_qnx_neutrino.GNU delete mode 100644 include/makeinclude/platform_qnx_rtp_gcc.GNU delete mode 100644 include/makeinclude/platform_rtems.x_g++.GNU delete mode 100644 include/makeinclude/platform_sco-nothread.GNU delete mode 100644 include/makeinclude/platform_sco5.0.0-CC-fsu-pthread.GNU delete mode 100644 include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU delete mode 100644 include/makeinclude/platform_sco5.0.0-mit-pthread.GNU delete mode 100644 include/makeinclude/platform_sco5.0.0-nothread.GNU delete mode 100644 include/makeinclude/platform_sunos4_g++.GNU delete mode 100644 include/makeinclude/platform_sunos4_lucid.GNU delete mode 100644 include/makeinclude/platform_sunos4_sunc++3.x.GNU delete mode 100644 include/makeinclude/platform_sunos4_sunc++4.x.GNU delete mode 100644 include/makeinclude/platform_sunos5_centerline.GNU delete mode 100644 include/makeinclude/platform_sunos5_g++.GNU delete mode 100644 include/makeinclude/platform_sunos5_ghs.GNU delete mode 100644 include/makeinclude/platform_sunos5_kcc.GNU delete mode 100644 include/makeinclude/platform_sunos5_sunc++.GNU delete mode 100644 include/makeinclude/platform_tandem.GNU delete mode 100644 include/makeinclude/platform_tru64_cxx.GNU delete mode 100644 include/makeinclude/platform_tru64_g++.GNU delete mode 100644 include/makeinclude/platform_tru64_kcc.GNU delete mode 100644 include/makeinclude/platform_tru64_post.GNU delete mode 100644 include/makeinclude/platform_tru64_pre.GNU delete mode 100644 include/makeinclude/platform_unixware_g++.GNU delete mode 100644 include/makeinclude/platform_unixware_udk.GNU delete mode 100644 include/makeinclude/platform_vxworks5.x_diab.GNU delete mode 100644 include/makeinclude/platform_vxworks5.x_g++.GNU delete mode 100644 include/makeinclude/platform_vxworks5.x_ghs.GNU delete mode 100644 include/makeinclude/recurse.bor delete mode 100644 include/makeinclude/rules.bin.GNU delete mode 100644 include/makeinclude/rules.common.GNU delete mode 100644 include/makeinclude/rules.lib.GNU delete mode 100644 include/makeinclude/rules.local.GNU delete mode 100644 include/makeinclude/rules.nested.GNU delete mode 100644 include/makeinclude/rules.nolocal.GNU delete mode 100644 include/makeinclude/rules.nonested.GNU delete mode 100644 include/makeinclude/wrapper_macros.GNU delete mode 100644 java/ChangeLog delete mode 100644 java/EAC/BoundsException.java delete mode 100644 java/EAC/Configuration.java delete mode 100644 java/EAC/Configurator.java delete mode 100644 java/EAC/ConnectionException.java delete mode 100644 java/EAC/Connector.java delete mode 100644 java/EAC/EACComponent.java delete mode 100644 java/EAC/EACFont.java delete mode 100644 java/EAC/EACLabel.java delete mode 100644 java/EAC/EACMenuBar.java delete mode 100644 java/EAC/EACPanel.java delete mode 100644 java/EAC/EACPrintStream.java delete mode 100644 java/EAC/EmptyQueueException.java delete mode 100644 java/EAC/File.java delete mode 100644 java/EAC/InputMode.java delete mode 100644 java/EAC/Intersection.java delete mode 100644 java/EAC/Operator.java delete mode 100644 java/EAC/Primitive.java delete mode 100644 java/EAC/Queue.java delete mode 100644 java/EAC/README delete mode 100644 java/EAC/ResourcePool.java delete mode 100644 java/EAC/Rubberband.java delete mode 100644 java/EAC/RubberbandLine.java delete mode 100644 java/EAC/Sink.java delete mode 100644 java/EAC/Source.java delete mode 100644 java/EAC/System_Manual.doc delete mode 100644 java/EAC/TooManyPrimitivesException.java delete mode 100644 java/EAC/Union.java delete mode 100644 java/EAC/User_Manual.doc delete mode 100644 java/ImageProcessing/ImageProcessing.dsp delete mode 100644 java/ImageProcessing/ImageProcessing.dsw delete mode 100644 java/ImageProcessing/filters/Assert.java delete mode 100644 java/ImageProcessing/filters/BleachFilter.java delete mode 100644 java/ImageProcessing/filters/BlurFilter.java delete mode 100644 java/ImageProcessing/filters/DarkenFilter.java delete mode 100644 java/ImageProcessing/filters/DeSpeckleFilter.java delete mode 100644 java/ImageProcessing/filters/DissolveFilter.java delete mode 100644 java/ImageProcessing/filters/EdgeDetectFilter.java delete mode 100644 java/ImageProcessing/filters/EmbossFilter.java delete mode 100644 java/ImageProcessing/filters/Makefile delete mode 100644 java/ImageProcessing/filters/MedFilter.java delete mode 100644 java/ImageProcessing/filters/OilPaintFilter.java delete mode 100644 java/ImageProcessing/filters/PixelizeFilter.java delete mode 100644 java/ImageProcessing/filters/RandomizeFilter.java delete mode 100644 java/ImageProcessing/filters/RotateFilter.java delete mode 100644 java/ImageProcessing/filters/SharpenFilter.java delete mode 100644 java/ImageProcessing/filters/SpatialFilter.java delete mode 100644 java/ImageProcessing/filters/SpreadFilter.java delete mode 100644 java/ImageProcessing/filters/Timer.java delete mode 100644 java/ImageProcessing/framework/BaseButton.java delete mode 100644 java/ImageProcessing/framework/BenchmarkApplet.java delete mode 100644 java/ImageProcessing/framework/DialogManager.java delete mode 100644 java/ImageProcessing/framework/DialogType.java delete mode 100644 java/ImageProcessing/framework/FileBrowser.java delete mode 100644 java/ImageProcessing/framework/FilePanel.java delete mode 100644 java/ImageProcessing/framework/FilterTest.java delete mode 100644 java/ImageProcessing/framework/GIFHandler.java delete mode 100644 java/ImageProcessing/framework/GifEncoder.java delete mode 100644 java/ImageProcessing/framework/Hierarchy.java delete mode 100644 java/ImageProcessing/framework/HierarchyAdapter.java delete mode 100644 java/ImageProcessing/framework/Icon.java delete mode 100644 java/ImageProcessing/framework/ImageApp.java delete mode 100644 java/ImageProcessing/framework/ImageByteCounter.java delete mode 100644 java/ImageProcessing/framework/ImageCanvas.java delete mode 100644 java/ImageProcessing/framework/ImageEncoder.java delete mode 100644 java/ImageProcessing/framework/ImageProcessor.java delete mode 100644 java/ImageProcessing/framework/ImageSender.java delete mode 100644 java/ImageProcessing/framework/IntHashtable.java delete mode 100644 java/ImageProcessing/framework/ListFiles.java delete mode 100755 java/ImageProcessing/framework/LoadURLFrame.java delete mode 100644 java/ImageProcessing/framework/Makefile delete mode 100644 java/ImageProcessing/framework/MedJava.html delete mode 100644 java/ImageProcessing/framework/Options.java delete mode 100755 java/ImageProcessing/framework/SaveURLFrame.java delete mode 100644 java/ImageProcessing/framework/Separator.java delete mode 100644 java/ImageProcessing/framework/ServerHandler.java delete mode 100644 java/ImageProcessing/framework/ServerTest.java delete mode 100644 java/ImageProcessing/framework/StatusDisplay.java delete mode 100644 java/ImageProcessing/framework/StatusIndicator.java delete mode 100644 java/ImageProcessing/framework/TestHandler.java delete mode 100644 java/ImageProcessing/framework/Tester.java delete mode 100644 java/ImageProcessing/framework/doc01.gif delete mode 100644 java/ImageProcessing/framework/file03.gif delete mode 100644 java/ImageProcessing/framework/filter.conf delete mode 100644 java/ImageProcessing/framework/help.conf delete mode 100644 java/ImageProcessing/framework/test.html delete mode 100644 java/ImageProcessing/framework/testFilter.conf delete mode 100644 java/JACE/ASX/IOCntlCmds.java delete mode 100644 java/JACE/ASX/IOCntlMsg.java delete mode 100644 java/JACE/ASX/MessageBlock.java delete mode 100644 java/JACE/ASX/MessageQueue.java delete mode 100644 java/JACE/ASX/MessageType.java delete mode 100644 java/JACE/ASX/Module.java delete mode 100644 java/JACE/ASX/Stream.java delete mode 100644 java/JACE/ASX/StreamHead.java delete mode 100644 java/JACE/ASX/StreamTail.java delete mode 100644 java/JACE/ASX/Task.java delete mode 100644 java/JACE/ASX/TaskFlags.java delete mode 100644 java/JACE/ASX/ThruTask.java delete mode 100644 java/JACE/ASX/TimeValue.java delete mode 100644 java/JACE/ASX/TimedWait.java delete mode 100644 java/JACE/ASX/TimeoutException.java delete mode 100644 java/JACE/ASX/package.html delete mode 100644 java/JACE/Concurrency/AbstractLock.java delete mode 100644 java/JACE/Concurrency/Condition.java delete mode 100644 java/JACE/Concurrency/LockAdapter.java delete mode 100644 java/JACE/Concurrency/LockException.java delete mode 100644 java/JACE/Concurrency/Mutex.java delete mode 100644 java/JACE/Concurrency/RWMutex.java delete mode 100644 java/JACE/Concurrency/RenewObject.java delete mode 100644 java/JACE/Concurrency/Semaphore.java delete mode 100644 java/JACE/Concurrency/ThreadManager.java delete mode 100644 java/JACE/Concurrency/Token.java delete mode 100644 java/JACE/Concurrency/WaitObject.java delete mode 100644 java/JACE/Concurrency/package.html delete mode 100644 java/JACE/Connection/AcceptStrategy.java delete mode 100644 java/JACE/Connection/Acceptor.java delete mode 100644 java/JACE/Connection/ActivateStrategy.java delete mode 100644 java/JACE/Connection/Blob.java delete mode 100644 java/JACE/Connection/BlobHandler.java delete mode 100644 java/JACE/Connection/BlobReader.java delete mode 100644 java/JACE/Connection/BlobWriter.java delete mode 100644 java/JACE/Connection/Connector.java delete mode 100644 java/JACE/Connection/CreationStrategy.java delete mode 100644 java/JACE/Connection/HTTPHelper.java delete mode 100644 java/JACE/Connection/StrategyAcceptor.java delete mode 100644 java/JACE/Connection/SvcHandler.java delete mode 100644 java/JACE/Connection/package.html delete mode 100644 java/JACE/Makefile delete mode 100644 java/JACE/Misc/GetOpt.java delete mode 100644 java/JACE/Misc/package.html delete mode 100644 java/JACE/OS/ACE.java delete mode 100644 java/JACE/OS/OS.java delete mode 100644 java/JACE/OS/package.html delete mode 100644 java/JACE/Reactor/EventHandler.java delete mode 100644 java/JACE/Reactor/TimerQueue.java delete mode 100644 java/JACE/Reactor/package.html delete mode 100644 java/JACE/SOCK_SAP/INETAddr.java delete mode 100644 java/JACE/SOCK_SAP/SOCKAcceptor.java delete mode 100644 java/JACE/SOCK_SAP/SOCKConnector.java delete mode 100644 java/JACE/SOCK_SAP/SOCKStream.java delete mode 100644 java/JACE/SOCK_SAP/package.html delete mode 100644 java/JACE/ServiceConfigurator/Service.java delete mode 100644 java/JACE/ServiceConfigurator/ServiceConfig.java delete mode 100644 java/JACE/ServiceConfigurator/ServiceLoader.java delete mode 100644 java/JACE/ServiceConfigurator/ServiceObject.java delete mode 100644 java/JACE/ServiceConfigurator/ServiceRepository.java delete mode 100644 java/JACE/ServiceConfigurator/package.html delete mode 100644 java/JACE/Timers/ProfileTimer.java delete mode 100644 java/JACE/Timers/package.html delete mode 100644 java/JACE/makebat.zip delete mode 100644 java/JACE/netsvcs/Handler.java delete mode 100644 java/JACE/netsvcs/Logger/LogRecord.java delete mode 100644 java/JACE/netsvcs/Logger/LoggingStrategy.java delete mode 100644 java/JACE/netsvcs/Logger/ServerLoggingAcceptor.java delete mode 100644 java/JACE/netsvcs/Logger/ServerLoggingHandler.java delete mode 100644 java/JACE/netsvcs/Logger/StderrStrategy.java delete mode 100644 java/JACE/netsvcs/Logger/c.bat delete mode 100644 java/JACE/netsvcs/Logger/package.html delete mode 100644 java/JACE/netsvcs/Naming/NameAcceptor.java delete mode 100644 java/JACE/netsvcs/Naming/NameHandler.java delete mode 100644 java/JACE/netsvcs/Naming/NameProxy.java delete mode 100644 java/JACE/netsvcs/Naming/NameReply.java delete mode 100644 java/JACE/netsvcs/Naming/NameRequest.java delete mode 100644 java/JACE/netsvcs/Naming/c.bat delete mode 100644 java/JACE/netsvcs/Naming/package.html delete mode 100644 java/JACE/netsvcs/Server.java delete mode 100644 java/JACE/netsvcs/Time/TSClerkHandler.java delete mode 100644 java/JACE/netsvcs/Time/TSClerkProcessor.java delete mode 100644 java/JACE/netsvcs/Time/TSServerAcceptor.java delete mode 100644 java/JACE/netsvcs/Time/TSServerHandler.java delete mode 100644 java/JACE/netsvcs/Time/TimeInfo.java delete mode 100644 java/JACE/netsvcs/Time/TimeRequest.java delete mode 100644 java/JACE/netsvcs/Time/c.bat delete mode 100644 java/JACE/netsvcs/Time/package.html delete mode 100644 java/JACE/netsvcs/Time/r.bat delete mode 100644 java/JACE/netsvcs/Token/LockHandler.java delete mode 100644 java/JACE/netsvcs/Token/LockHandlerAdapter.java delete mode 100644 java/JACE/netsvcs/Token/LockOperations.java delete mode 100644 java/JACE/netsvcs/Token/LockTypes.java delete mode 100644 java/JACE/netsvcs/Token/MutexHandler.java delete mode 100644 java/JACE/netsvcs/Token/RWMutexHandler.java delete mode 100644 java/JACE/netsvcs/Token/RemoteLock.java delete mode 100644 java/JACE/netsvcs/Token/RemoteMutex.java delete mode 100644 java/JACE/netsvcs/Token/RemoteRWMutex.java delete mode 100644 java/JACE/netsvcs/Token/TokenAcceptor.java delete mode 100644 java/JACE/netsvcs/Token/TokenReply.java delete mode 100644 java/JACE/netsvcs/Token/TokenRequest.java delete mode 100644 java/JACE/netsvcs/Token/TokenRequestHandler.java delete mode 100644 java/JACE/netsvcs/Token/package.html delete mode 100644 java/JACE/netsvcs/package.html delete mode 100644 java/JACE/overview.html delete mode 100644 java/JACE/package.html delete mode 100644 java/JACE/tests/ASX/BufferStreamTest.java delete mode 100644 java/JACE/tests/ASX/MessageQueueTest.java delete mode 100644 java/JACE/tests/ASX/PriorityBufferTest.java delete mode 100644 java/JACE/tests/ASX/TaskTest.java delete mode 100644 java/JACE/tests/ASX/ThreadPoolTest.java delete mode 100644 java/JACE/tests/Concurrency/Condition/Consumer.java delete mode 100644 java/JACE/tests/Concurrency/Condition/JoinableThreadGroup.java delete mode 100644 java/JACE/tests/Concurrency/Condition/Producer.java delete mode 100644 java/JACE/tests/Concurrency/Condition/QueueTest.java delete mode 100644 java/JACE/tests/Concurrency/Condition/SimpleMessageQueue.java delete mode 100644 java/JACE/tests/Concurrency/IterationTest.java delete mode 100644 java/JACE/tests/Concurrency/RWMutexTest.java delete mode 100644 java/JACE/tests/Concurrency/TimingTest.java delete mode 100644 java/JACE/tests/Concurrency/TokenTest.java delete mode 100644 java/JACE/tests/Connection/AcceptorTest.java delete mode 100644 java/JACE/tests/Connection/ClientHandler.java delete mode 100644 java/JACE/tests/Connection/ConnectorTest.java delete mode 100644 java/JACE/tests/Connection/HTTPHelperTest.java delete mode 100644 java/JACE/tests/Connection/ServerHandler.java delete mode 100644 java/JACE/tests/Makefile delete mode 100644 java/JACE/tests/Misc/ParseArgsTest.java delete mode 100644 java/JACE/tests/Reactor/TimeValueTest.java delete mode 100644 java/JACE/tests/Reactor/TimerQueueTest.java delete mode 100644 java/JACE/tests/SOCK_SAP/SOCKAcceptorTest.java delete mode 100644 java/JACE/tests/SOCK_SAP/SOCKConnectorTest.java delete mode 100644 java/JACE/tests/ServiceConfigurator/Main.java delete mode 100644 java/JACE/tests/ServiceConfigurator/svc.conf delete mode 100644 java/JACE/tests/netsvcs/Logger/LoggerTest.java delete mode 100644 java/JACE/tests/netsvcs/Naming/ClientTest.java delete mode 100644 java/JACE/tests/netsvcs/Time/TSClient.java delete mode 100644 java/JACE/tests/netsvcs/Token/ProxyClientTest.java delete mode 100644 java/MSVJProjects.zip delete mode 100644 java/README delete mode 100644 java/VERSION delete mode 100644 java/apps/NexusII/README delete mode 100644 java/apps/NexusII/classes/ClientHandler.class delete mode 100644 java/apps/NexusII/classes/FrameHandler.class delete mode 100644 java/apps/NexusII/classes/ImageCanvas.class delete mode 100644 java/apps/NexusII/classes/NexusClientApplet.class delete mode 100644 java/apps/NexusII/classes/NexusIIserver.class delete mode 100644 java/apps/NexusII/classes/Room.class delete mode 100644 java/apps/NexusII/classes/RoomFactory.class delete mode 100644 java/apps/NexusII/classes/RoomFrame.class delete mode 100644 java/apps/NexusII/classes/RoomThread.class delete mode 100644 java/apps/NexusII/classes/awtCommand/CApplet.class delete mode 100644 java/apps/NexusII/classes/awtCommand/CApplet.java delete mode 100644 java/apps/NexusII/classes/awtCommand/CButton.class delete mode 100644 java/apps/NexusII/classes/awtCommand/CButton.java delete mode 100644 java/apps/NexusII/classes/awtCommand/CCanvas.class delete mode 100644 java/apps/NexusII/classes/awtCommand/CCanvas.java delete mode 100644 java/apps/NexusII/classes/awtCommand/CFrame.class delete mode 100644 java/apps/NexusII/classes/awtCommand/CFrame.java delete mode 100644 java/apps/NexusII/classes/awtCommand/CList.class delete mode 100644 java/apps/NexusII/classes/awtCommand/CList.java delete mode 100644 java/apps/NexusII/classes/awtCommand/CPanel.class delete mode 100644 java/apps/NexusII/classes/awtCommand/CPanel.java delete mode 100644 java/apps/NexusII/classes/awtCommand/CTextArea.class delete mode 100644 java/apps/NexusII/classes/awtCommand/CTextArea.java delete mode 100644 java/apps/NexusII/classes/awtCommand/CTextField.class delete mode 100644 java/apps/NexusII/classes/awtCommand/CTextField.java delete mode 100644 java/apps/NexusII/classes/awtCommand/Command.class delete mode 100644 java/apps/NexusII/classes/awtCommand/Command.java delete mode 100644 java/apps/NexusII/classes/commandHandler.class delete mode 100644 java/apps/NexusII/classes/commandParser.class delete mode 100644 java/apps/NexusII/classes/connectionHandler.class delete mode 100644 java/apps/NexusII/classes/joinHandler.class delete mode 100644 java/apps/NexusII/classes/roomHandler.class delete mode 100644 java/apps/NexusII/classes/textHandler.class delete mode 100644 java/apps/NexusII/src/Consumer.java delete mode 100644 java/apps/NexusII/src/MT_Bounded_Queue.java delete mode 100644 java/apps/NexusII/src/MT_Bounded_Queue_Group.java delete mode 100644 java/apps/NexusII/src/NexusClientApplet.java delete mode 100644 java/apps/NexusII/src/NexusIIserver.java delete mode 100644 java/apps/NexusII/src/Producer.java delete mode 100644 java/apps/NexusII/src/Room.java delete mode 100644 java/apps/NexusII/src/RoomFrame.java delete mode 100644 java/apps/NexusII/src/RoomSpace.java delete mode 100644 java/apps/NexusII/src/Timed_Wait.java delete mode 100644 java/apps/NexusII/src/Timer.java delete mode 100644 java/apps/NexusII/src/commandHandler.java delete mode 100644 java/apps/NexusII/src/commandParser.java delete mode 100644 java/apps/NexusII/src/connectionHandler.java delete mode 100644 java/apps/NexusII/src/consts.java delete mode 100644 java/apps/NexusII/src/dataPacket.java delete mode 100644 java/apps/NexusII/src/joinHandler.java delete mode 100644 java/apps/NexusII/src/makefile delete mode 100644 java/apps/NexusII/src/nexusDemuxThread.java delete mode 100644 java/apps/NexusII/src/roomHandler.java delete mode 100644 java/apps/NexusII/src/socketReaderThread.java delete mode 100644 java/apps/NexusII/src/socketWriterThread.java delete mode 100644 java/apps/NexusII/src/url_to_url.java delete mode 100755 java/apps/NexusII/start delete mode 100644 java/apps/NexusII/start.html delete mode 100644 java/classes/README.TXT delete mode 100644 java/doc/images/GridBagEx.gif delete mode 100644 java/doc/images/OpenBookIcon.gif delete mode 100644 java/doc/images/blue-ball-small.gif delete mode 100644 java/doc/images/blue-ball.gif delete mode 100644 java/doc/images/class-index.gif delete mode 100644 java/doc/images/constructor-index.gif delete mode 100644 java/doc/images/constructors.gif delete mode 100644 java/doc/images/cyan-ball-small.gif delete mode 100644 java/doc/images/cyan-ball.gif delete mode 100644 java/doc/images/error-index.gif delete mode 100644 java/doc/images/exception-index.gif delete mode 100644 java/doc/images/green-ball-small.gif delete mode 100644 java/doc/images/green-ball.gif delete mode 100644 java/doc/images/interface-index.gif delete mode 100644 java/doc/images/magenta-ball-small.gif delete mode 100644 java/doc/images/magenta-ball.gif delete mode 100644 java/doc/images/method-index.gif delete mode 100644 java/doc/images/methods.gif delete mode 100644 java/doc/images/package-index.gif delete mode 100644 java/doc/images/red-ball-small.gif delete mode 100644 java/doc/images/red-ball.gif delete mode 100644 java/doc/images/variable-index.gif delete mode 100644 java/doc/images/variables.gif delete mode 100644 java/doc/images/yellow-ball-small.gif delete mode 100644 java/doc/images/yellow-ball.gif delete mode 100644 java/examples/Logger/README delete mode 100644 java/examples/Logger/simple-server/LogRecord.java delete mode 100644 java/examples/Logger/simple-server/LoggerConstants.java delete mode 100644 java/examples/Logger/simple-server/LoggingAcceptor.java delete mode 100644 java/examples/Logger/simple-server/LoggingClient.java delete mode 100644 java/examples/Logger/simple-server/LoggingHandler.java delete mode 100644 java/examples/Logger/simple-server/Makefile delete mode 100644 java/examples/Logger/simple-server/README delete mode 100644 java/examples/Logger/simple-server/SimpleLogger.java delete mode 100644 java/gjt/Assert.java delete mode 100644 java/gjt/Bargauge.java delete mode 100644 java/gjt/Border.java delete mode 100644 java/gjt/Box.java delete mode 100644 java/gjt/BulletinLayout.java delete mode 100644 java/gjt/ButtonPanel.java delete mode 100644 java/gjt/CardPanel.java delete mode 100644 java/gjt/ChoiceCardPanel.java delete mode 100644 java/gjt/ColumnLayout.java delete mode 100644 java/gjt/ComponentScroller.java delete mode 100644 java/gjt/DialogClient.java delete mode 100644 java/gjt/DrawingPanel.java delete mode 100644 java/gjt/DrawnRectangle.java delete mode 100644 java/gjt/EtchedBorder.java delete mode 100644 java/gjt/EtchedRectangle.java delete mode 100644 java/gjt/Etching.java delete mode 100644 java/gjt/ExclusiveImageButtonPanel.java delete mode 100644 java/gjt/FontDialog.java delete mode 100644 java/gjt/GJT.DSP delete mode 100644 java/gjt/GJT.DSW delete mode 100644 java/gjt/GJTDialog.java delete mode 100644 java/gjt/IconCardPanel.java delete mode 100644 java/gjt/ImageButton.java delete mode 100644 java/gjt/ImageButtonController.java delete mode 100644 java/gjt/ImageButtonEvent.java delete mode 100644 java/gjt/ImageButtonPanel.java delete mode 100644 java/gjt/ImageButtonPanelController.java delete mode 100644 java/gjt/ImageCanvas.java delete mode 100644 java/gjt/ImageScroller.java delete mode 100644 java/gjt/LabelCanvas.java delete mode 100644 java/gjt/Makefile delete mode 100644 java/gjt/MessageDialog.java delete mode 100644 java/gjt/MouseController.java delete mode 100644 java/gjt/Orientation.java delete mode 100644 java/gjt/ProgressDialog.java delete mode 100644 java/gjt/QuestionDialog.java delete mode 100644 java/gjt/RadioImageButtonPanelController.java delete mode 100644 java/gjt/RowLayout.java delete mode 100644 java/gjt/Scroller.java delete mode 100644 java/gjt/ScrollerLayout.java delete mode 100644 java/gjt/SelectionEvent.java delete mode 100644 java/gjt/Separator.java delete mode 100644 java/gjt/SpringyImageButtonController.java delete mode 100644 java/gjt/StateButton.java delete mode 100644 java/gjt/StateButtonController.java delete mode 100644 java/gjt/StickyImageButtonController.java delete mode 100644 java/gjt/Stopwatch.java delete mode 100644 java/gjt/StopwatchClient.java delete mode 100644 java/gjt/ThreeDBorder.java delete mode 100644 java/gjt/ThreeDBorderStyle.java delete mode 100644 java/gjt/ThreeDRectangle.java delete mode 100644 java/gjt/Toolbar.java delete mode 100644 java/gjt/Util.java delete mode 100644 java/gjt/YesNoDialog.java delete mode 100644 java/gjt/animation/CollisionArena.java delete mode 100644 java/gjt/animation/CollisionDetector.java delete mode 100644 java/gjt/animation/EdgeCollisionDetector.java delete mode 100644 java/gjt/animation/Playfield.java delete mode 100644 java/gjt/animation/Sequence.java delete mode 100644 java/gjt/animation/Sprite.java delete mode 100644 java/gjt/animation/SpriteCollisionDetector.java delete mode 100644 java/gjt/image/BleachImageFilter.java delete mode 100644 java/gjt/image/DissolveFilter.java delete mode 100644 java/gjt/image/ImageDissolver.java delete mode 100644 java/gjt/rubberband/Rubberband.java delete mode 100644 java/gjt/rubberband/RubberbandEllipse.java delete mode 100644 java/gjt/rubberband/RubberbandLine.java delete mode 100644 java/gjt/rubberband/RubberbandPanel.java delete mode 100644 java/gjt/rubberband/RubberbandRectangle.java delete mode 100644 java/gjt/test/AttributesPanel.java delete mode 100644 java/gjt/test/BargaugeTest.java delete mode 100644 java/gjt/test/BleachImageFilterTest.java delete mode 100644 java/gjt/test/BorderTest.java delete mode 100644 java/gjt/test/BoxTest.java delete mode 100644 java/gjt/test/BumpAnimationTest.java delete mode 100644 java/gjt/test/ChoiceCardPanelTest.java delete mode 100644 java/gjt/test/ColumnLayoutTest.java delete mode 100644 java/gjt/test/ComponentScrollerTest.java delete mode 100644 java/gjt/test/ConnectionsPanel.java delete mode 100644 java/gjt/test/DialogTest.java delete mode 100644 java/gjt/test/DrawnRectangleTest.java delete mode 100644 java/gjt/test/FontDialogTest.java delete mode 100644 java/gjt/test/IconCardPanelTest.java delete mode 100644 java/gjt/test/ImageButtonTest.java delete mode 100644 java/gjt/test/ImageDissolverTest.java delete mode 100644 java/gjt/test/ImageScrollerTest.java delete mode 100644 java/gjt/test/LabelCanvasTest.java delete mode 100644 java/gjt/test/MessageDialogTest.java delete mode 100644 java/gjt/test/OccupationOracle.java delete mode 100644 java/gjt/test/RowLayoutTest.java delete mode 100644 java/gjt/test/RubberbandTest.java delete mode 100644 java/gjt/test/SeparatorTest.java delete mode 100644 java/gjt/test/SimpleAnimationTest.java delete mode 100644 java/gjt/test/SimpleBargaugeTest.java delete mode 100644 java/gjt/test/StateButtonTest.java delete mode 100644 java/gjt/test/TenPixelBorder.java delete mode 100644 java/gjt/test/TitledPanel.java delete mode 100644 java/gjt/test/ToolbarTest.java delete mode 100644 java/gjt/test/TwoDrinkersAnimationTest.java delete mode 100644 java/gjt/test/UnitTest.java delete mode 100644 java/java-ace.gif delete mode 100644 java/netsvcs/Logger/DefaultLMR.java delete mode 100644 java/netsvcs/Logger/LogMessageReceiver.java delete mode 100644 java/netsvcs/Logger/LogRecord.java delete mode 100644 java/netsvcs/Logger/Makefile delete mode 100644 java/netsvcs/Logger/ServerLoggingAcceptor.java delete mode 100644 java/netsvcs/Logger/ServerLoggingHandler.java delete mode 100644 java/netsvcs/Naming/Makefile delete mode 100644 java/netsvcs/Naming/NameAcceptor.java delete mode 100644 java/netsvcs/Naming/NameHandler.java delete mode 100644 java/netsvcs/Naming/NameProxy.java delete mode 100644 java/netsvcs/Naming/NameReply.java delete mode 100644 java/netsvcs/Naming/NameRequest.java delete mode 100755 java/netsvcs/Time/Clerk.java delete mode 100755 java/netsvcs/Time/Makefile delete mode 100755 java/netsvcs/Time/Server.java delete mode 100755 java/netsvcs/Time/TSClerkHandler.java delete mode 100755 java/netsvcs/Time/TSClerkProcessor.java delete mode 100755 java/netsvcs/Time/TSRequestAcceptor.java delete mode 100755 java/netsvcs/Time/TSRequestHandler.java delete mode 100755 java/netsvcs/Time/TSServerAcceptor.java delete mode 100755 java/netsvcs/Time/TSServerHandler.java delete mode 100644 java/src/ACE.java delete mode 100644 java/src/AcceptStrategy.java delete mode 100644 java/src/Acceptor.java delete mode 100644 java/src/ActivateStrategy.java delete mode 100644 java/src/AddServiceObjectNode.java delete mode 100644 java/src/Blob.java delete mode 100644 java/src/BlobHandler.java delete mode 100644 java/src/BlobReader.java delete mode 100644 java/src/BlobWriter.java delete mode 100644 java/src/ClassNameGenerator.java delete mode 100644 java/src/ClassReader.java delete mode 100644 java/src/Condition.java delete mode 100644 java/src/Connector.java delete mode 100644 java/src/CreationStrategy.java delete mode 100644 java/src/EventHandler.java delete mode 100644 java/src/GetOpt.java delete mode 100644 java/src/HTTPHelper.java delete mode 100644 java/src/INETAddr.java delete mode 100644 java/src/IOCntlCmds.java delete mode 100644 java/src/IOCntlMsg.java delete mode 100644 java/src/JACE.DSP delete mode 100644 java/src/JACE.DSW delete mode 100644 java/src/Makefile delete mode 100644 java/src/MessageBlock.java delete mode 100644 java/src/MessageQueue.java delete mode 100644 java/src/MessageType.java delete mode 100644 java/src/Module.java delete mode 100644 java/src/Mutex.java delete mode 100644 java/src/OS.java delete mode 100644 java/src/ParseNode.java delete mode 100644 java/src/ProfileTimer.java delete mode 100644 java/src/README delete mode 100644 java/src/RWMutex.java delete mode 100644 java/src/RemoveNode.java delete mode 100644 java/src/ResumeNode.java delete mode 100644 java/src/SOCKAcceptor.java delete mode 100644 java/src/SOCKConnector.java delete mode 100644 java/src/SOCKStream.java delete mode 100644 java/src/Semaphore.java delete mode 100644 java/src/ServiceConfig.java delete mode 100644 java/src/ServiceLoader.java delete mode 100644 java/src/ServiceObject.java delete mode 100644 java/src/ServiceObjectRecord.java delete mode 100644 java/src/ServiceRecord.java delete mode 100644 java/src/ServiceRepository.java delete mode 100644 java/src/StrategyAcceptor.java delete mode 100644 java/src/Stream.java delete mode 100644 java/src/StreamHead.java delete mode 100644 java/src/StreamTail.java delete mode 100644 java/src/SuspendNode.java delete mode 100644 java/src/SvcHandler.java delete mode 100644 java/src/Task.java delete mode 100644 java/src/TaskFlags.java delete mode 100644 java/src/ThreadManager.java delete mode 100644 java/src/ThruTask.java delete mode 100644 java/src/TimeValue.java delete mode 100644 java/src/TimedWait.java delete mode 100644 java/src/TimeoutException.java delete mode 100644 java/src/TimerQueue.java delete mode 100644 java/src/Token.java delete mode 100644 java/tests/ASX/BufferStreamTest.dsp delete mode 100644 java/tests/ASX/BufferStreamTest.java delete mode 100644 java/tests/ASX/Makefile delete mode 100644 java/tests/ASX/MessageQueueTest.dsp delete mode 100644 java/tests/ASX/MessageQueueTest.java delete mode 100644 java/tests/ASX/PriorityBufferTest.dsp delete mode 100644 java/tests/ASX/PriorityBufferTest.java delete mode 100644 java/tests/ASX/TaskTest.dsp delete mode 100644 java/tests/ASX/TaskTest.java delete mode 100644 java/tests/ASX/ThreadPoolTest.dsp delete mode 100644 java/tests/ASX/ThreadPoolTest.java delete mode 100644 java/tests/Concurrency/Condition/Condition.dsp delete mode 100644 java/tests/Concurrency/Condition/Consumer.java delete mode 100644 java/tests/Concurrency/Condition/JoinableThreadGroup.java delete mode 100644 java/tests/Concurrency/Condition/Makefile delete mode 100644 java/tests/Concurrency/Condition/Producer.java delete mode 100644 java/tests/Concurrency/Condition/QueueTest.java delete mode 100644 java/tests/Concurrency/Condition/SimpleMessageQueue.java delete mode 100644 java/tests/Concurrency/Makefile delete mode 100644 java/tests/Concurrency/MutexTest.dsp delete mode 100644 java/tests/Concurrency/MutexTest.java delete mode 100644 java/tests/Concurrency/RWMutexTest.dsp delete mode 100644 java/tests/Concurrency/RWMutexTest.java delete mode 100644 java/tests/Concurrency/SemaphoreTest.dsp delete mode 100644 java/tests/Concurrency/SemaphoreTest.java delete mode 100644 java/tests/Concurrency/TokenTest.dsp delete mode 100644 java/tests/Concurrency/TokenTest.java delete mode 100644 java/tests/Connection/AcceptorTest.dsp delete mode 100644 java/tests/Connection/AcceptorTest.java delete mode 100644 java/tests/Connection/ClientHandler.dsp delete mode 100644 java/tests/Connection/ClientHandler.java delete mode 100644 java/tests/Connection/ConnectorTest.dsp delete mode 100644 java/tests/Connection/ConnectorTest.java delete mode 100644 java/tests/Connection/HTTPHelperTest.java delete mode 100644 java/tests/Connection/Makefile delete mode 100644 java/tests/Connection/ServerHandler.dsp delete mode 100644 java/tests/Connection/ServerHandler.java delete mode 100644 java/tests/Misc/Makefile delete mode 100644 java/tests/Misc/ParseArgsTest.dsp delete mode 100644 java/tests/Misc/ParseArgsTest.java delete mode 100644 java/tests/Reactor/Makefile delete mode 100644 java/tests/Reactor/TimeValueTest.dsp delete mode 100644 java/tests/Reactor/TimeValueTest.java delete mode 100644 java/tests/Reactor/TimerQueueTest.dsp delete mode 100644 java/tests/Reactor/TimerQueueTest.java delete mode 100644 java/tests/SOCK_SAP/Makefile delete mode 100644 java/tests/SOCK_SAP/SOCKAcceptorTest.dsp delete mode 100644 java/tests/SOCK_SAP/SOCKAcceptorTest.java delete mode 100644 java/tests/SOCK_SAP/SOCKConnectorTest.dsp delete mode 100644 java/tests/SOCK_SAP/SOCKConnectorTest.java delete mode 100644 java/tests/ServiceConfigurator/Makefile delete mode 100644 java/tests/ServiceConfigurator/ServiceConfigurator.dsp delete mode 100644 java/tests/ServiceConfigurator/TestService.java delete mode 100644 java/tests/ServiceConfigurator/reloadTest.java delete mode 100644 java/tests/ServiceConfigurator/suspendTest.java delete mode 100644 java/tests/ServiceConfigurator/suspendTest1.conf delete mode 100644 java/tests/ServiceConfigurator/suspendTest2.conf delete mode 100644 java/tests/ServiceConfigurator/suspendTest3.conf delete mode 100644 java/tests/ServiceConfigurator/svc.conf delete mode 100644 java/tests/Tests.dsw delete mode 100644 java/tests/netsvcs/Logger/LoggerTest.java delete mode 100644 java/tests/netsvcs/Logger/Makefile delete mode 100644 java/tests/netsvcs/Naming/ClientTest.java delete mode 100644 java/tests/netsvcs/Naming/Makefile delete mode 100644 m4/ace.m4 delete mode 100644 m4/acinclude.m4 delete mode 100644 m4/compiler.m4 delete mode 100644 m4/features.m4 delete mode 100644 m4/platform.m4 delete mode 100644 m4/subsets.m4 delete mode 100644 m4/threads.m4 delete mode 100644 man/Makefile.am delete mode 100644 man/man3/Makefile.am delete mode 100644 netsvcs/ACE-netsvcs.html delete mode 100644 netsvcs/Makefile delete mode 100644 netsvcs/Makefile.am delete mode 100644 netsvcs/Makefile.bor delete mode 100644 netsvcs/README delete mode 100644 netsvcs/build.bor delete mode 100644 netsvcs/clients/Logger/Logger.dsw delete mode 100644 netsvcs/clients/Logger/Makefile delete mode 100644 netsvcs/clients/Logger/Makefile.am delete mode 100644 netsvcs/clients/Logger/Makefile.bor delete mode 100644 netsvcs/clients/Logger/README delete mode 100644 netsvcs/clients/Logger/direct_logging.cpp delete mode 100644 netsvcs/clients/Logger/direct_logging.dsp delete mode 100644 netsvcs/clients/Logger/indirect_logging.cpp delete mode 100644 netsvcs/clients/Logger/indirect_logging.dsp delete mode 100644 netsvcs/clients/Makefile delete mode 100644 netsvcs/clients/Makefile.am delete mode 100644 netsvcs/clients/Makefile.bor delete mode 100644 netsvcs/clients/Naming/Client/Client.dsw delete mode 100644 netsvcs/clients/Naming/Client/Client_Test.cpp delete mode 100644 netsvcs/clients/Naming/Client/Client_Test.dsp delete mode 100644 netsvcs/clients/Naming/Client/Client_Test.h delete mode 100644 netsvcs/clients/Naming/Client/Makefile delete mode 100644 netsvcs/clients/Naming/Client/Makefile.am delete mode 100644 netsvcs/clients/Naming/Client/Makefile.bor delete mode 100644 netsvcs/clients/Naming/Client/README delete mode 100644 netsvcs/clients/Naming/Client/main.cpp delete mode 100644 netsvcs/clients/Naming/Client/main.dsp delete mode 100644 netsvcs/clients/Naming/Client/svc.conf delete mode 100644 netsvcs/clients/Naming/Client/svc2.conf delete mode 100644 netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp delete mode 100644 netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp delete mode 100644 netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsw delete mode 100644 netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h delete mode 100644 netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp delete mode 100644 netsvcs/clients/Naming/Dump_Restore/Makefile delete mode 100644 netsvcs/clients/Naming/Dump_Restore/Makefile.am delete mode 100644 netsvcs/clients/Naming/Dump_Restore/Makefile.bor delete mode 100644 netsvcs/clients/Naming/Dump_Restore/README delete mode 100644 netsvcs/clients/Naming/Dump_Restore/createfile.cpp delete mode 100644 netsvcs/clients/Naming/Dump_Restore/main.cpp delete mode 100644 netsvcs/clients/Naming/Dump_Restore/main.dsp delete mode 100644 netsvcs/clients/Naming/Makefile delete mode 100644 netsvcs/clients/Naming/Makefile.am delete mode 100644 netsvcs/clients/Naming/Makefile.bor delete mode 100644 netsvcs/clients/README delete mode 100644 netsvcs/clients/Tokens/Makefile delete mode 100644 netsvcs/clients/Tokens/Makefile.am delete mode 100644 netsvcs/clients/Tokens/Makefile.bor delete mode 100644 netsvcs/clients/Tokens/README delete mode 100644 netsvcs/clients/Tokens/collection/Makefile delete mode 100644 netsvcs/clients/Tokens/collection/Makefile.am delete mode 100644 netsvcs/clients/Tokens/collection/Makefile.bor delete mode 100644 netsvcs/clients/Tokens/collection/README delete mode 100644 netsvcs/clients/Tokens/collection/collection.cpp delete mode 100644 netsvcs/clients/Tokens/collection/collection.dsp delete mode 100644 netsvcs/clients/Tokens/collection/collection.dsw delete mode 100644 netsvcs/clients/Tokens/collection/rw_locks.cpp delete mode 100644 netsvcs/clients/Tokens/deadlock/Makefile delete mode 100644 netsvcs/clients/Tokens/deadlock/Makefile.am delete mode 100644 netsvcs/clients/Tokens/deadlock/Makefile.bor delete mode 100644 netsvcs/clients/Tokens/deadlock/README delete mode 100644 netsvcs/clients/Tokens/deadlock/deadlock.dsp delete mode 100644 netsvcs/clients/Tokens/deadlock/deadlock.dsw delete mode 100644 netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp delete mode 100644 netsvcs/clients/Tokens/invariant/Makefile delete mode 100644 netsvcs/clients/Tokens/invariant/Makefile.am delete mode 100644 netsvcs/clients/Tokens/invariant/Makefile.bor delete mode 100644 netsvcs/clients/Tokens/invariant/README delete mode 100644 netsvcs/clients/Tokens/invariant/invariant.cpp delete mode 100644 netsvcs/clients/Tokens/invariant/invariant.dsp delete mode 100644 netsvcs/clients/Tokens/invariant/invariant.dsw delete mode 100644 netsvcs/clients/Tokens/manual/Makefile delete mode 100644 netsvcs/clients/Tokens/manual/Makefile.am delete mode 100644 netsvcs/clients/Tokens/manual/Makefile.bor delete mode 100644 netsvcs/clients/Tokens/manual/README delete mode 100644 netsvcs/clients/Tokens/manual/manual.cpp delete mode 100644 netsvcs/clients/Tokens/manual/manual.dsp delete mode 100644 netsvcs/clients/Tokens/manual/manual.dsw delete mode 100644 netsvcs/clients/Tokens/mutex/Makefile delete mode 100644 netsvcs/clients/Tokens/mutex/Makefile.am delete mode 100644 netsvcs/clients/Tokens/mutex/Makefile.bor delete mode 100644 netsvcs/clients/Tokens/mutex/README delete mode 100644 netsvcs/clients/Tokens/mutex/mutex.dsp delete mode 100644 netsvcs/clients/Tokens/mutex/mutex.dsw delete mode 100644 netsvcs/clients/Tokens/mutex/test_mutex.cpp delete mode 100644 netsvcs/clients/Tokens/rw_lock/Makefile delete mode 100644 netsvcs/clients/Tokens/rw_lock/Makefile.am delete mode 100644 netsvcs/clients/Tokens/rw_lock/Makefile.bor delete mode 100644 netsvcs/clients/Tokens/rw_lock/README delete mode 100644 netsvcs/clients/Tokens/rw_lock/rw_lock.dsp delete mode 100644 netsvcs/clients/Tokens/rw_lock/rw_lock.dsw delete mode 100644 netsvcs/clients/Tokens/rw_lock/rw_locks.cpp delete mode 100644 netsvcs/lib/Base_Optimizer.cpp delete mode 100644 netsvcs/lib/Base_Optimizer.h delete mode 100644 netsvcs/lib/Client_Logging_Handler.cpp delete mode 100644 netsvcs/lib/Client_Logging_Handler.h delete mode 100644 netsvcs/lib/Log_Message_Receiver.cpp delete mode 100644 netsvcs/lib/Log_Message_Receiver.h delete mode 100644 netsvcs/lib/Makefile delete mode 100644 netsvcs/lib/Makefile.am delete mode 100644 netsvcs/lib/Makefile.bor delete mode 100644 netsvcs/lib/Name_Handler.cpp delete mode 100644 netsvcs/lib/Name_Handler.h delete mode 100644 netsvcs/lib/README delete mode 100644 netsvcs/lib/Server_Logging_Handler.cpp delete mode 100644 netsvcs/lib/Server_Logging_Handler.h delete mode 100644 netsvcs/lib/Server_Logging_Handler_T.cpp delete mode 100644 netsvcs/lib/Server_Logging_Handler_T.h delete mode 100644 netsvcs/lib/TS_Clerk_Handler.cpp delete mode 100644 netsvcs/lib/TS_Clerk_Handler.h delete mode 100644 netsvcs/lib/TS_Server_Handler.cpp delete mode 100644 netsvcs/lib/TS_Server_Handler.h delete mode 100644 netsvcs/lib/Token_Handler.cpp delete mode 100644 netsvcs/lib/Token_Handler.h delete mode 100644 netsvcs/lib/netsvcs.dsp delete mode 100644 netsvcs/lib/netsvcs.dsw delete mode 100644 netsvcs/netsvcs.dsw delete mode 100644 netsvcs/servers/Makefile delete mode 100644 netsvcs/servers/Makefile.am delete mode 100644 netsvcs/servers/Makefile.bor delete mode 100644 netsvcs/servers/README delete mode 100644 netsvcs/servers/main.cpp delete mode 100644 netsvcs/servers/servers.dsp delete mode 100644 netsvcs/servers/servers.dsw delete mode 100644 netsvcs/servers/svc.conf delete mode 100644 netsvcs/servers/svc.conf.xml delete mode 100644 nightly.mwc delete mode 100644 os-patches/linux-patches.html delete mode 100644 os-patches/lynxos-patches.html delete mode 100644 os-patches/vxworks-5.1.txt delete mode 100644 performance-tests/Makefile delete mode 100644 performance-tests/Makefile.bor delete mode 100644 performance-tests/Misc/Makefile delete mode 100644 performance-tests/Misc/basic_func.cpp delete mode 100644 performance-tests/Misc/basic_func.h delete mode 100644 performance-tests/Misc/basic_perf.bor delete mode 100644 performance-tests/Misc/basic_perf.cpp delete mode 100644 performance-tests/Misc/basic_perf.dsp delete mode 100644 performance-tests/Misc/childbirth_time.bor delete mode 100644 performance-tests/Misc/childbirth_time.cpp delete mode 100644 performance-tests/Misc/childbirth_time.dsp delete mode 100644 performance-tests/Misc/context_switch_time.bor delete mode 100644 performance-tests/Misc/context_switch_time.cpp delete mode 100644 performance-tests/Misc/context_switch_time.dsp delete mode 100644 performance-tests/Misc/makefile.bor delete mode 100644 performance-tests/Misc/misc.dsw delete mode 100644 performance-tests/Misc/preempt.bor delete mode 100644 performance-tests/Misc/preempt.cpp delete mode 100644 performance-tests/Misc/test_guard.cpp delete mode 100644 performance-tests/Misc/test_mutex.bor delete mode 100644 performance-tests/Misc/test_mutex.cpp delete mode 100644 performance-tests/Misc/test_mutex.dsp delete mode 100644 performance-tests/Misc/test_naming.bor delete mode 100644 performance-tests/Misc/test_naming.cpp delete mode 100644 performance-tests/Misc/test_naming.dsp delete mode 100644 performance-tests/Misc/test_singleton.bor delete mode 100644 performance-tests/Misc/test_singleton.cpp delete mode 100644 performance-tests/Misc/test_singleton.dsp delete mode 100644 performance-tests/Misc/test_singleton.h delete mode 100644 performance-tests/README delete mode 100644 performance-tests/RPC/Makefile delete mode 100644 performance-tests/RPC/README delete mode 100644 performance-tests/RPC/client.cpp delete mode 100644 performance-tests/RPC/ping.x delete mode 100755 performance-tests/RPC/run_test.pl delete mode 100644 performance-tests/RPC/server.c delete mode 100644 performance-tests/SCTP/Makefile delete mode 100644 performance-tests/SCTP/Options_Manager.cpp delete mode 100644 performance-tests/SCTP/Options_Manager.h delete mode 100644 performance-tests/SCTP/README delete mode 100644 performance-tests/SCTP/README.SCTP delete mode 100644 performance-tests/SCTP/README.SCTP_PERF_TEST delete mode 100644 performance-tests/SCTP/README.SCTP_in_ACE delete mode 100644 performance-tests/SCTP/SCTP.dsw delete mode 100644 performance-tests/SCTP/SOCK_SEQPACK_clt.cpp delete mode 100644 performance-tests/SCTP/SOCK_SEQPACK_clt.dsp delete mode 100644 performance-tests/SCTP/SOCK_SEQPACK_srv.cpp delete mode 100644 performance-tests/SCTP/SOCK_SEQPACK_srv.dsp delete mode 100644 performance-tests/SCTP/SOCK_STREAM_clt.cpp delete mode 100644 performance-tests/SCTP/SOCK_STREAM_clt.dsp delete mode 100644 performance-tests/SCTP/SOCK_STREAM_srv.cpp delete mode 100644 performance-tests/SCTP/SOCK_STREAM_srv.dsp delete mode 100644 performance-tests/SCTP/THANKS delete mode 100644 performance-tests/SCTP/hist.cpp delete mode 100644 performance-tests/SCTP/hist.h delete mode 100644 performance-tests/SCTP/run_spectrum.config delete mode 100755 performance-tests/SCTP/run_spectrum.pl delete mode 100644 performance-tests/SCTP/sample-spectrum.png delete mode 100644 performance-tests/Server_Concurrency/Latency_Stats.h delete mode 100644 performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp delete mode 100644 performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsw delete mode 100644 performance-tests/Server_Concurrency/Leader_Follower/Makefile delete mode 100644 performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp delete mode 100644 performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h delete mode 100644 performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp delete mode 100644 performance-tests/Server_Concurrency/Leader_Follower/makefile.bor delete mode 100644 performance-tests/Server_Concurrency/Makefile delete mode 100644 performance-tests/Server_Concurrency/Makefile.bor delete mode 100644 performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile delete mode 100644 performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp delete mode 100644 performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsw delete mode 100644 performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp delete mode 100644 performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.dsp delete mode 100644 performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h delete mode 100644 performance-tests/Server_Concurrency/Queue_Based_Workers/makefile.bor delete mode 100644 performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp delete mode 100644 performance-tests/Server_Concurrency/Server_Concurrency.dsw delete mode 100755 performance-tests/Server_Concurrency/run_test.sh delete mode 100644 performance-tests/Synch-Benchmarks/Base_Test/Base_Test.dsp delete mode 100644 performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h delete mode 100644 performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i delete mode 100644 performance-tests/Synch-Benchmarks/Base_Test/Makefile delete mode 100644 performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Makefile delete mode 100644 performance-tests/Synch-Benchmarks/Makefile.driver delete mode 100644 performance-tests/Synch-Benchmarks/Makefile.synch_tests delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Makefile delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Perf_Test.dsp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.i delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/README delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp delete mode 100644 performance-tests/Synch-Benchmarks/README delete mode 100644 performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp delete mode 100644 performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h delete mode 100644 performance-tests/Synch-Benchmarks/Synch_Lib/Makefile delete mode 100644 performance-tests/Synch-Benchmarks/Synch_Lib/README delete mode 100644 performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp delete mode 100644 performance-tests/Synch-Benchmarks/Synch_Lib/export_mac.h delete mode 100644 performance-tests/Synch-Benchmarks/Synch_Tests.dsw delete mode 100644 performance-tests/Synch-Benchmarks/benchmarks delete mode 100644 performance-tests/Synch-Benchmarks/context.c delete mode 100644 performance-tests/Synch-Benchmarks/context.csh delete mode 100644 performance-tests/Synch-Benchmarks/orig-results delete mode 100644 performance-tests/Synch-Benchmarks/results/.no_prune delete mode 100755 performance-tests/Synch-Benchmarks/run_tests.pl delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/base_acquire.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/base_acquire_read.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/base_acquire_write.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/base_tryacquire.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/base_tryacquire_read.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/base_tryacquire_write.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/perf_t1.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/perf_t16.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/perf_t2.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/perf_t32.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/perf_t4.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/perf_t64.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/perf_t8.conf delete mode 100644 performance-tests/Synch-Benchmarks/svcconf/svc.conf delete mode 100644 performance-tests/Synch-Benchmarks/synch_driver.cpp delete mode 100644 performance-tests/Synch-Benchmarks/synch_driver.dsp delete mode 100644 performance-tests/TCP/Makefile delete mode 100644 performance-tests/TCP/README delete mode 100644 performance-tests/TCP/TCP.dsp delete mode 100644 performance-tests/TCP/TCP.dsw delete mode 100644 performance-tests/TCP/makefile.bor delete mode 100755 performance-tests/TCP/run_test.pl delete mode 100644 performance-tests/TCP/tcp_test.cpp delete mode 100644 performance-tests/TTCP/ACE-C++/How_to_run_tests delete mode 100644 performance-tests/TTCP/ACE-C++/Makefile delete mode 100644 performance-tests/TTCP/ACE-C++/run_test delete mode 100644 performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp delete mode 100644 performance-tests/TTCP/C/How_to_run_tests delete mode 100644 performance-tests/TTCP/C/Makefile delete mode 100644 performance-tests/TTCP/C/README delete mode 100644 performance-tests/TTCP/C/new-ttcp.cpp delete mode 100644 performance-tests/TTCP/C/run_test delete mode 100644 performance-tests/TTCP/Makefile delete mode 100644 performance-tests/UDP/Makefile delete mode 100644 performance-tests/UDP/README delete mode 100644 performance-tests/UDP/makefile.bor delete mode 100755 performance-tests/UDP/run_test.pl delete mode 100644 performance-tests/UDP/udp_test.cpp delete mode 100644 performance-tests/UDP/udp_test.dsp delete mode 100644 performance-tests/UDP/udp_test.dsw delete mode 100644 protocols/ace/RMCast/Makefile delete mode 100644 protocols/ace/RMCast/Makefile.bor delete mode 100644 protocols/ace/RMCast/README delete mode 100644 protocols/ace/RMCast/RMCast.cpp delete mode 100644 protocols/ace/RMCast/RMCast.dsp delete mode 100644 protocols/ace/RMCast/RMCast.dsw delete mode 100644 protocols/ace/RMCast/RMCast.h delete mode 100644 protocols/ace/RMCast/RMCast.i delete mode 100644 protocols/ace/RMCast/RMCast_Ack_Worker.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Ack_Worker.h delete mode 100644 protocols/ace/RMCast/RMCast_Ack_Worker.i delete mode 100644 protocols/ace/RMCast/RMCast_Copy_On_Write.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Copy_On_Write.h delete mode 100644 protocols/ace/RMCast/RMCast_Copy_On_Write.i delete mode 100644 protocols/ace/RMCast/RMCast_Export.h delete mode 100644 protocols/ace/RMCast/RMCast_Fork.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Fork.h delete mode 100644 protocols/ace/RMCast/RMCast_Fork.i delete mode 100644 protocols/ace/RMCast/RMCast_Fragment.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Fragment.h delete mode 100644 protocols/ace/RMCast/RMCast_Fragment.i delete mode 100644 protocols/ace/RMCast/RMCast_IO_UDP.cpp delete mode 100644 protocols/ace/RMCast/RMCast_IO_UDP.h delete mode 100644 protocols/ace/RMCast/RMCast_IO_UDP.i delete mode 100644 protocols/ace/RMCast/RMCast_Membership.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Membership.h delete mode 100644 protocols/ace/RMCast/RMCast_Membership.i delete mode 100644 protocols/ace/RMCast/RMCast_Module.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Module.h delete mode 100644 protocols/ace/RMCast/RMCast_Module.i delete mode 100644 protocols/ace/RMCast/RMCast_Module_Factory.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Module_Factory.h delete mode 100644 protocols/ace/RMCast/RMCast_Module_Factory.i delete mode 100644 protocols/ace/RMCast/RMCast_Partial_Message.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Partial_Message.h delete mode 100644 protocols/ace/RMCast/RMCast_Partial_Message.i delete mode 100644 protocols/ace/RMCast/RMCast_Proxy.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Proxy.h delete mode 100644 protocols/ace/RMCast/RMCast_Proxy.i delete mode 100644 protocols/ace/RMCast/RMCast_Reassembly.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Reassembly.h delete mode 100644 protocols/ace/RMCast/RMCast_Reassembly.i delete mode 100644 protocols/ace/RMCast/RMCast_Receiver_Module.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Receiver_Module.h delete mode 100644 protocols/ace/RMCast/RMCast_Receiver_Module.i delete mode 100644 protocols/ace/RMCast/RMCast_Reliable_Factory.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Reliable_Factory.h delete mode 100644 protocols/ace/RMCast/RMCast_Reliable_Factory.i delete mode 100644 protocols/ace/RMCast/RMCast_Reordering.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Reordering.h delete mode 100644 protocols/ace/RMCast/RMCast_Reordering.i delete mode 100644 protocols/ace/RMCast/RMCast_Resend_Handler.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Resend_Handler.h delete mode 100644 protocols/ace/RMCast/RMCast_Resend_Handler.i delete mode 100644 protocols/ace/RMCast/RMCast_Resend_Worker.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Resend_Worker.h delete mode 100644 protocols/ace/RMCast/RMCast_Resend_Worker.i delete mode 100644 protocols/ace/RMCast/RMCast_Retransmission.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Retransmission.h delete mode 100644 protocols/ace/RMCast/RMCast_Retransmission.i delete mode 100644 protocols/ace/RMCast/RMCast_Sequencer.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Sequencer.h delete mode 100644 protocols/ace/RMCast/RMCast_Sequencer.i delete mode 100644 protocols/ace/RMCast/RMCast_Singleton_Factory.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Singleton_Factory.h delete mode 100644 protocols/ace/RMCast/RMCast_Singleton_Factory.i delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Event_Handler.cpp delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Event_Handler.h delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Event_Handler.i delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Proxy.cpp delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Proxy.h delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Proxy.i delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.h delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Reliable_Receiver.i delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.h delete mode 100644 protocols/ace/RMCast/RMCast_UDP_Reliable_Sender.i delete mode 100644 protocols/ace/RMCast/RMCast_Worker.cpp delete mode 100644 protocols/ace/RMCast/RMCast_Worker.h delete mode 100644 protocols/ace/RMCast/RMCast_Worker.i delete mode 100644 psosim/Makefile delete mode 100644 psosim/drv_conf.c delete mode 100644 samwise/ChangeLog delete mode 100644 samwise/PerlACE/MSProject.pm delete mode 100644 samwise/PerlACE/MSProject/DSP.pm delete mode 100644 samwise/PerlSam/Generator.pm delete mode 100644 samwise/PerlSam/Generator/Automake.pm delete mode 100644 samwise/PerlSam/Generator/Borland.pm delete mode 100644 samwise/PerlSam/Generator/GNUMake.pm delete mode 100644 samwise/PerlSam/Generator/MSVC6.pm delete mode 100644 samwise/PerlSam/Generator/View.pm delete mode 100644 samwise/PerlSam/Generator/VisualAge.pm delete mode 100644 samwise/PerlSam/Parser.pm delete mode 100644 samwise/PerlSam/Parser/Simple.pm delete mode 100644 samwise/README.txt delete mode 100644 samwise/TODO.txt delete mode 100755 samwise/create_sam.pl delete mode 100644 samwise/libs.xml delete mode 100644 samwise/makeinclude/executable.GNU delete mode 100644 samwise/makeinclude/library.GNU delete mode 100644 samwise/makeinclude/macros.GNU delete mode 100644 samwise/makeinclude/rules.common.GNU delete mode 100644 samwise/makeinclude/rules.makefiles.GNU delete mode 100644 samwise/makeinclude/rules.nomakefiles.GNU delete mode 100644 samwise/makeinclude/vacpp_setup.icc delete mode 100644 samwise/makeinclude/workspace.GNU delete mode 100644 samwise/sam.dtd delete mode 100755 samwise/sam.pl delete mode 100755 tests/.cvsignore delete mode 100644 tests/ACE_Init_Test.cpp delete mode 100644 tests/ACE_Init_Test.dsp delete mode 100644 tests/ACE_Init_Test.h delete mode 100644 tests/ACE_Init_Test.ico delete mode 100644 tests/ACE_Init_Test.rc delete mode 100644 tests/ACE_Init_Test.rc2 delete mode 100644 tests/ACE_Init_TestDlg.cpp delete mode 100644 tests/ACE_Init_TestDlg.h delete mode 100644 tests/ACE_Init_Test_Resource.h delete mode 100644 tests/ACE_Init_Test_StdAfx.h delete mode 100644 tests/ACE_Test.cpp delete mode 100644 tests/ACE_Test.dsp delete mode 100644 tests/ARGV_Test.cpp delete mode 100644 tests/ARGV_Test.dsp delete mode 100644 tests/ARGV_Test.icc delete mode 100644 tests/Aio_Platform_Test.cpp delete mode 100644 tests/Aio_Platform_Test.icc delete mode 100644 tests/Arg_Shifter_Test.cpp delete mode 100644 tests/Arg_Shifter_Test.dsp delete mode 100644 tests/Arg_Shifter_Test.icc delete mode 100644 tests/Atomic_Op_Test.cpp delete mode 100644 tests/Atomic_Op_Test.dsp delete mode 100644 tests/Atomic_Op_Test.icc delete mode 100644 tests/Auto_IncDec_Test.cpp delete mode 100644 tests/Auto_IncDec_Test.dsp delete mode 100644 tests/Auto_IncDec_Test.icc delete mode 100644 tests/Barrier_Test.cpp delete mode 100644 tests/Barrier_Test.dsp delete mode 100644 tests/Barrier_Test.icc delete mode 100644 tests/Basic_Types_Test.cpp delete mode 100644 tests/Basic_Types_Test.dsp delete mode 100644 tests/Basic_Types_Test.icc delete mode 100644 tests/Bound_Ptr_Test.cpp delete mode 100644 tests/Bound_Ptr_Test.dsp delete mode 100644 tests/Bound_Ptr_Test.icc delete mode 100644 tests/Buffer_Stream_Test.cpp delete mode 100644 tests/Buffer_Stream_Test.dsp delete mode 100644 tests/Buffer_Stream_Test.icc delete mode 100644 tests/CDR_Array_Test.cpp delete mode 100644 tests/CDR_Array_Test.dsp delete mode 100644 tests/CDR_Array_Test.icc delete mode 100644 tests/CDR_File_Test.cpp delete mode 100644 tests/CDR_File_Test.dsp delete mode 100644 tests/CDR_File_Test.icc delete mode 100644 tests/CDR_Test.cpp delete mode 100644 tests/CDR_Test.dsp delete mode 100644 tests/CDR_Test.icc delete mode 100644 tests/CE_fostream.cpp delete mode 100644 tests/CE_fostream.h delete mode 100644 tests/CLASSIX/CLASSIX_Addr_Test.cpp delete mode 100644 tests/CLASSIX/CLASSIX_Addr_Test.icc delete mode 100644 tests/CLASSIX/CLASSIX_CLD_Connector_Test.cpp delete mode 100644 tests/CLASSIX/CLASSIX_CLD_Connector_Test.icc delete mode 100644 tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp delete mode 100644 tests/CLASSIX/CLASSIX_Con_Acc_Test.h delete mode 100644 tests/CLASSIX/CLASSIX_Con_Acc_Test.icc delete mode 100644 tests/CLASSIX/CLASSIX_Group_Test.cpp delete mode 100644 tests/CLASSIX/CLASSIX_Group_Test.icc delete mode 100644 tests/CLASSIX/CLASSIX_Notify_Test.cpp delete mode 100644 tests/CLASSIX/CLASSIX_Notify_Test.icc delete mode 100644 tests/CLASSIX/CLASSIX_OS_Test.cpp delete mode 100644 tests/CLASSIX/CLASSIX_OS_Test.icc delete mode 100644 tests/CLASSIX/CLASSIX_Reactor_Test.cpp delete mode 100644 tests/CLASSIX/CLASSIX_Reactor_Test.h delete mode 100644 tests/CLASSIX/CLASSIX_Reactor_Test.icc delete mode 100644 tests/CLASSIX/CLASSIX_Select_Reactor_Test.cpp delete mode 100644 tests/CLASSIX/CLASSIX_Select_Reactor_Test.h delete mode 100644 tests/CLASSIX/CLASSIX_Select_Reactor_Test.icc delete mode 100644 tests/CLASSIX/CLASSIX_Stream_Test.cpp delete mode 100644 tests/CLASSIX/CLASSIX_Stream_Test.icc delete mode 100644 tests/CLASSIX/CLASSIX_test_config.h delete mode 100644 tests/CLASSIX/Imakefile delete mode 100644 tests/Cache_Map_Manager_Test.cpp delete mode 100644 tests/Cache_Map_Manager_Test.dsp delete mode 100644 tests/Cache_Map_Manager_Test.h delete mode 100644 tests/Cache_Map_Manager_Test.icc delete mode 100644 tests/Cached_Accept_Conn_Test.cpp delete mode 100644 tests/Cached_Accept_Conn_Test.dsp delete mode 100644 tests/Cached_Accept_Conn_Test.h delete mode 100644 tests/Cached_Accept_Conn_Test.icc delete mode 100644 tests/Cached_Allocator_Test.cpp delete mode 100644 tests/Cached_Allocator_Test.dsp delete mode 100644 tests/Cached_Allocator_Test.icc delete mode 100644 tests/Cached_Conn_Test.cpp delete mode 100644 tests/Cached_Conn_Test.dsp delete mode 100644 tests/Cached_Conn_Test.h delete mode 100644 tests/Cached_Conn_Test.icc delete mode 100644 tests/Capabilities_Test.cpp delete mode 100644 tests/Capabilities_Test.dsp delete mode 100644 tests/Capabilities_Test.icc delete mode 100644 tests/Codecs_Test.cpp delete mode 100644 tests/Codecs_Test.dsp delete mode 100644 tests/Codecs_Test.icc delete mode 100644 tests/Collection_Test.cpp delete mode 100644 tests/Collection_Test.dsp delete mode 100644 tests/Collection_Test.h delete mode 100644 tests/Collection_Test.icc delete mode 100644 tests/Config_Test.cpp delete mode 100644 tests/Config_Test.dsp delete mode 100644 tests/Config_Test.h delete mode 100644 tests/Config_Test.icc delete mode 100644 tests/Config_Test.ini delete mode 100644 tests/Config_Test_Import_1.ini delete mode 100644 tests/Conn_Test.cpp delete mode 100644 tests/Conn_Test.dsp delete mode 100644 tests/Conn_Test.h delete mode 100644 tests/Conn_Test.icc delete mode 100644 tests/DLL_Test.bor delete mode 100644 tests/DLL_Test.cpp delete mode 100644 tests/DLL_Test.dsp delete mode 100644 tests/DLL_Test.h delete mode 100644 tests/DLL_Test.icc delete mode 100644 tests/DLL_Test_Impl.cpp delete mode 100644 tests/DLL_Test_Impl.dsp delete mode 100644 tests/DLL_Test_Impl.h delete mode 100644 tests/DLL_Test_Impl.icc delete mode 100644 tests/DLList_Test.cpp delete mode 100644 tests/DLList_Test.dsp delete mode 100644 tests/DLList_Test.icc delete mode 100644 tests/Date_Time_Test.cpp delete mode 100644 tests/Date_Time_Test.dsp delete mode 100644 tests/Date_Time_Test.icc delete mode 100644 tests/Dev_Poll_Reactor_Test.cpp delete mode 100644 tests/Dev_Poll_Reactor_Test.icc delete mode 100644 tests/Dirent_Test.cpp delete mode 100644 tests/Dirent_Test.dsp delete mode 100644 tests/Dirent_Test.icc delete mode 100644 tests/Dynamic_Priority_Test.cpp delete mode 100644 tests/Dynamic_Priority_Test.dsp delete mode 100644 tests/Dynamic_Priority_Test.icc delete mode 100644 tests/Enum_Interfaces_Test.cpp delete mode 100644 tests/Enum_Interfaces_Test.dsp delete mode 100644 tests/Enum_Interfaces_Test.icc delete mode 100644 tests/Env_Value_Test.cpp delete mode 100644 tests/Env_Value_Test.dsp delete mode 100644 tests/Env_Value_Test.icc delete mode 100644 tests/FIFO_Test.cpp delete mode 100644 tests/FIFO_Test.icc delete mode 100644 tests/FlReactor_Test.cpp delete mode 100644 tests/FlReactor_Test.icc delete mode 100644 tests/Framework_Component_DLL.bor delete mode 100644 tests/Framework_Component_DLL.cpp delete mode 100644 tests/Framework_Component_DLL.dsp delete mode 100644 tests/Framework_Component_DLL.h delete mode 100644 tests/Framework_Component_DLL.icc delete mode 100644 tests/Framework_Component_DLL_Export.h delete mode 100644 tests/Framework_Component_Test.cpp delete mode 100644 tests/Framework_Component_Test.dsp delete mode 100644 tests/Framework_Component_Test.h delete mode 100644 tests/Framework_Component_Test.icc delete mode 100644 tests/Future_Set_Test.cpp delete mode 100644 tests/Future_Set_Test.dsp delete mode 100644 tests/Future_Set_Test.icc delete mode 100644 tests/Future_Test.cpp delete mode 100644 tests/Future_Test.dsp delete mode 100644 tests/Future_Test.icc delete mode 100644 tests/Get_Opt_Test.cpp delete mode 100644 tests/Get_Opt_Test.dsp delete mode 100644 tests/Get_Opt_Test.icc delete mode 100644 tests/Handle_Set_Test.cpp delete mode 100644 tests/Handle_Set_Test.dsp delete mode 100644 tests/Handle_Set_Test.icc delete mode 100644 tests/Hash_Map_Bucket_Iterator_Test.cpp delete mode 100644 tests/Hash_Map_Bucket_Iterator_Test.dsp delete mode 100644 tests/Hash_Map_Bucket_Iterator_Test.icc delete mode 100644 tests/Hash_Map_Manager_Test.cpp delete mode 100644 tests/Hash_Map_Manager_Test.dsp delete mode 100644 tests/Hash_Map_Manager_Test.icc delete mode 100644 tests/High_Res_Timer_Test.cpp delete mode 100644 tests/High_Res_Timer_Test.dsp delete mode 100644 tests/High_Res_Timer_Test.icc delete mode 100644 tests/INET_Addr_Test.cpp delete mode 100644 tests/INET_Addr_Test.dsp delete mode 100644 tests/INET_Addr_Test.icc delete mode 100644 tests/IOStream_Test.cpp delete mode 100644 tests/IOStream_Test.dsp delete mode 100644 tests/IOStream_Test.icc delete mode 100644 tests/Lazy_Map_Manager_Test.cpp delete mode 100644 tests/Lazy_Map_Manager_Test.dsp delete mode 100644 tests/Lazy_Map_Manager_Test.icc delete mode 100644 tests/Log_Msg_Test.cpp delete mode 100644 tests/Log_Msg_Test.dsp delete mode 100644 tests/Log_Msg_Test.icc delete mode 100644 tests/Logging_Strategy_Test.cpp delete mode 100644 tests/Logging_Strategy_Test.dsp delete mode 100644 tests/Logging_Strategy_Test.icc delete mode 100644 tests/MEM_Stream_Test.cpp delete mode 100644 tests/MEM_Stream_Test.dsp delete mode 100644 tests/MEM_Stream_Test.h delete mode 100644 tests/MEM_Stream_Test.icc delete mode 100644 tests/MM_Shared_Memory_Test.cpp delete mode 100644 tests/MM_Shared_Memory_Test.dsp delete mode 100644 tests/MM_Shared_Memory_Test.icc delete mode 100644 tests/MT_Reactor_Timer_Test.cpp delete mode 100644 tests/MT_Reactor_Timer_Test.dsp delete mode 100644 tests/MT_Reactor_Timer_Test.h delete mode 100644 tests/MT_Reactor_Timer_Test.icc delete mode 100644 tests/MT_Reactor_Upcall_Test.cpp delete mode 100644 tests/MT_Reactor_Upcall_Test.dsp delete mode 100644 tests/MT_Reactor_Upcall_Test.icc delete mode 100644 tests/MT_SOCK_Test.cpp delete mode 100644 tests/MT_SOCK_Test.dsp delete mode 100644 tests/MT_SOCK_Test.icc delete mode 100644 tests/Makefile delete mode 100644 tests/Makefile.DLL_Test delete mode 100644 tests/Makefile.Framework_Component_DLL delete mode 100644 tests/Makefile.Service_Config_DLL delete mode 100644 tests/Makefile.am delete mode 100644 tests/Makefile.bor delete mode 100644 tests/Makefile.vac delete mode 100644 tests/Malloc_Test.cpp delete mode 100644 tests/Malloc_Test.dsp delete mode 100644 tests/Malloc_Test.h delete mode 100644 tests/Malloc_Test.icc delete mode 100644 tests/Map_Manager_Test.cpp delete mode 100644 tests/Map_Manager_Test.dsp delete mode 100644 tests/Map_Manager_Test.icc delete mode 100644 tests/Map_Test.cpp delete mode 100644 tests/Map_Test.dsp delete mode 100644 tests/Map_Test.h delete mode 100644 tests/Map_Test.icc delete mode 100644 tests/Max_Default_Port_Test.cpp delete mode 100644 tests/Max_Default_Port_Test.dsp delete mode 100644 tests/Max_Default_Port_Test.h delete mode 100644 tests/Max_Default_Port_Test.icc delete mode 100644 tests/Mem_Map_Test.cpp delete mode 100644 tests/Mem_Map_Test.dsp delete mode 100644 tests/Mem_Map_Test.icc delete mode 100644 tests/Message_Block_Test.cpp delete mode 100644 tests/Message_Block_Test.dsp delete mode 100644 tests/Message_Block_Test.icc delete mode 100644 tests/Message_Queue_Notifications_Test.cpp delete mode 100644 tests/Message_Queue_Notifications_Test.dsp delete mode 100644 tests/Message_Queue_Notifications_Test.icc delete mode 100644 tests/Message_Queue_Test.cpp delete mode 100644 tests/Message_Queue_Test.dsp delete mode 100644 tests/Message_Queue_Test.icc delete mode 100644 tests/Message_Queue_Test_Ex.cpp delete mode 100644 tests/Message_Queue_Test_Ex.dsp delete mode 100644 tests/Message_Queue_Test_Ex.h delete mode 100644 tests/Message_Queue_Test_Ex.icc delete mode 100644 tests/Multicast_Test.cpp delete mode 100644 tests/Multicast_Test.dsp delete mode 100644 tests/Multicast_Test.icc delete mode 100644 tests/Multihomed_INET_Addr_Test.cpp delete mode 100644 tests/Multihomed_INET_Addr_Test.dsp delete mode 100644 tests/Naming_Test.cpp delete mode 100644 tests/Naming_Test.dsp delete mode 100644 tests/Naming_Test.icc delete mode 100644 tests/New_Fail_Test.cpp delete mode 100644 tests/New_Fail_Test.dsp delete mode 100644 tests/New_Fail_Test.icc delete mode 100644 tests/Notify_Performance_Test.cpp delete mode 100644 tests/Notify_Performance_Test.dsp delete mode 100644 tests/Notify_Performance_Test.icc delete mode 100644 tests/OS_Test.cpp delete mode 100644 tests/OS_Test.dsp delete mode 100644 tests/OS_Test.icc delete mode 100644 tests/Object_Manager_Test.cpp delete mode 100644 tests/Object_Manager_Test.dsp delete mode 100644 tests/Object_Manager_Test.icc delete mode 100644 tests/Obstack_Test.cpp delete mode 100644 tests/Obstack_Test.dsp delete mode 100644 tests/Obstack_Test.icc delete mode 100644 tests/OrdMultiSet_Test.cpp delete mode 100644 tests/OrdMultiSet_Test.dsp delete mode 100644 tests/OrdMultiSet_Test.icc delete mode 100644 tests/Pipe_Test.cpp delete mode 100644 tests/Pipe_Test.dsp delete mode 100644 tests/Pipe_Test.icc delete mode 100644 tests/Priority_Buffer_Test.cpp delete mode 100644 tests/Priority_Buffer_Test.dsp delete mode 100644 tests/Priority_Buffer_Test.icc delete mode 100644 tests/Priority_Reactor_Test.cpp delete mode 100644 tests/Priority_Reactor_Test.dsp delete mode 100644 tests/Priority_Reactor_Test.h delete mode 100644 tests/Priority_Reactor_Test.icc delete mode 100644 tests/Priority_Task_Test.cpp delete mode 100644 tests/Priority_Task_Test.dsp delete mode 100644 tests/Priority_Task_Test.icc delete mode 100644 tests/Proactor_Scatter_Gather_Test.cpp delete mode 100644 tests/Proactor_Scatter_Gather_Test.dsp delete mode 100644 tests/Proactor_Scatter_Gather_Test.icc delete mode 100644 tests/Proactor_Test.cpp delete mode 100644 tests/Proactor_Test.dsp delete mode 100644 tests/Proactor_Test.icc delete mode 100644 tests/Proactor_Timer_Test.cpp delete mode 100644 tests/Proactor_Timer_Test.dsp delete mode 100644 tests/Proactor_Timer_Test.icc delete mode 100644 tests/Process_Manager_Test.cpp delete mode 100644 tests/Process_Manager_Test.dsp delete mode 100644 tests/Process_Manager_Test.icc delete mode 100644 tests/Process_Mutex_Test.cpp delete mode 100644 tests/Process_Mutex_Test.dsp delete mode 100644 tests/Process_Mutex_Test.icc delete mode 100644 tests/Process_Strategy_Test.cpp delete mode 100644 tests/Process_Strategy_Test.dsp delete mode 100644 tests/Process_Strategy_Test.h delete mode 100644 tests/Process_Strategy_Test.icc delete mode 100644 tests/RB_Tree_Test.cpp delete mode 100644 tests/RB_Tree_Test.dsp delete mode 100644 tests/RB_Tree_Test.h delete mode 100644 tests/RB_Tree_Test.icc delete mode 100644 tests/README delete mode 100644 tests/RMCast/Makefile delete mode 100644 tests/RMCast/Makefile.bor delete mode 100644 tests/RMCast/RMCast_Fragment_Test.cpp delete mode 100644 tests/RMCast/RMCast_Fragment_Test.dsp delete mode 100644 tests/RMCast/RMCast_Membership_Test.cpp delete mode 100644 tests/RMCast/RMCast_Membership_Test.dsp delete mode 100644 tests/RMCast/RMCast_Reassembly_Test.cpp delete mode 100644 tests/RMCast/RMCast_Reassembly_Test.dsp delete mode 100644 tests/RMCast/RMCast_Reordering_Test.cpp delete mode 100644 tests/RMCast/RMCast_Reordering_Test.dsp delete mode 100644 tests/RMCast/RMCast_Retransmission_Test.cpp delete mode 100644 tests/RMCast/RMCast_Retransmission_Test.dsp delete mode 100644 tests/RMCast/RMCast_Tests.dsw delete mode 100644 tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp delete mode 100644 tests/RMCast/RMCast_UDP_Best_Effort_Test.dsp delete mode 100644 tests/RMCast/tests.mpc delete mode 100644 tests/Reactor_Dispatch_Order_Test.cpp delete mode 100644 tests/Reactor_Dispatch_Order_Test.dsp delete mode 100644 tests/Reactor_Dispatch_Order_Test.icc delete mode 100644 tests/Reactor_Exceptions_Test.cpp delete mode 100644 tests/Reactor_Exceptions_Test.dsp delete mode 100644 tests/Reactor_Exceptions_Test.icc delete mode 100644 tests/Reactor_Notify_Test.cpp delete mode 100644 tests/Reactor_Notify_Test.dsp delete mode 100644 tests/Reactor_Notify_Test.icc delete mode 100644 tests/Reactor_Performance_Test.cpp delete mode 100644 tests/Reactor_Performance_Test.dsp delete mode 100644 tests/Reactor_Performance_Test.h delete mode 100644 tests/Reactor_Performance_Test.icc delete mode 100644 tests/Reactor_Timer_Test.cpp delete mode 100644 tests/Reactor_Timer_Test.dsp delete mode 100644 tests/Reactor_Timer_Test.icc delete mode 100644 tests/Reactors_Test.cpp delete mode 100644 tests/Reactors_Test.dsp delete mode 100644 tests/Reactors_Test.icc delete mode 100644 tests/Reader_Writer_Test.cpp delete mode 100644 tests/Reader_Writer_Test.dsp delete mode 100644 tests/Reader_Writer_Test.icc delete mode 100644 tests/Recursive_Condition_Bug_Test.cpp delete mode 100644 tests/Recursive_Condition_Bug_Test.dsp delete mode 100644 tests/Recursive_Condition_Test.cpp delete mode 100644 tests/Recursive_Condition_Test.dsp delete mode 100644 tests/Recursive_Condition_Test.icc delete mode 100644 tests/Recursive_Mutex_Test.cpp delete mode 100644 tests/Recursive_Mutex_Test.dsp delete mode 100644 tests/Recursive_Mutex_Test.icc delete mode 100644 tests/Refcounted_Auto_Ptr_Test.cpp delete mode 100644 tests/Refcounted_Auto_Ptr_Test.dsp delete mode 100644 tests/Refcounted_Auto_Ptr_Test.h delete mode 100644 tests/Refcounted_Auto_Ptr_Test.icc delete mode 100644 tests/Reverse_Lock_Test.cpp delete mode 100644 tests/Reverse_Lock_Test.dsp delete mode 100644 tests/Reverse_Lock_Test.icc delete mode 100644 tests/SOCK_Connector_Test.cpp delete mode 100644 tests/SOCK_Connector_Test.dsp delete mode 100644 tests/SOCK_Connector_Test.icc delete mode 100644 tests/SOCK_SEQPACK_Association_Test.cpp delete mode 100644 tests/SOCK_SEQPACK_Association_Test.dsp delete mode 100644 tests/SOCK_Send_Recv_Test.cpp delete mode 100644 tests/SOCK_Send_Recv_Test.dsp delete mode 100644 tests/SOCK_Send_Recv_Test.icc delete mode 100644 tests/SOCK_Test.cpp delete mode 100644 tests/SOCK_Test.dsp delete mode 100644 tests/SOCK_Test.icc delete mode 100644 tests/SPIPE_Test.cpp delete mode 100644 tests/SPIPE_Test.dsp delete mode 100644 tests/SPIPE_Test.icc delete mode 100644 tests/SSL/Makefile delete mode 100644 tests/SSL/Makefile.bor delete mode 100644 tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp delete mode 100644 tests/SSL/Thread_Pool_Reactor_SSL_Test.h delete mode 100644 tests/SSL/dummy.pem delete mode 100644 tests/SSL/key.pem delete mode 100644 tests/SSL/tests.mpc delete mode 100644 tests/SString_Test.cpp delete mode 100644 tests/SString_Test.dsp delete mode 100644 tests/SString_Test.icc delete mode 100644 tests/SV_Shared_Memory_Test.cpp delete mode 100644 tests/SV_Shared_Memory_Test.dsp delete mode 100644 tests/SV_Shared_Memory_Test.icc delete mode 100644 tests/Semaphore_Test.cpp delete mode 100644 tests/Semaphore_Test.dsp delete mode 100644 tests/Semaphore_Test.icc delete mode 100644 tests/Service_Config_DLL.bor delete mode 100644 tests/Service_Config_DLL.cpp delete mode 100644 tests/Service_Config_DLL.dsp delete mode 100644 tests/Service_Config_DLL.h delete mode 100644 tests/Service_Config_DLL.icc delete mode 100644 tests/Service_Config_DLL_Export.h delete mode 100644 tests/Service_Config_Test.UTF-16.conf delete mode 100644 tests/Service_Config_Test.UTF-16.conf.xml delete mode 100644 tests/Service_Config_Test.conf delete mode 100644 tests/Service_Config_Test.conf.xml delete mode 100644 tests/Service_Config_Test.cpp delete mode 100644 tests/Service_Config_Test.dsp delete mode 100644 tests/Service_Config_Test.icc delete mode 100644 tests/Signal_Test.cpp delete mode 100644 tests/Signal_Test.icc delete mode 100644 tests/Sigset_Ops_Test.cpp delete mode 100644 tests/Sigset_Ops_Test.dsp delete mode 100644 tests/Sigset_Ops_Test.icc delete mode 100644 tests/Simple_Message_Block_Test.cpp delete mode 100644 tests/Simple_Message_Block_Test.dsp delete mode 100644 tests/Simple_Message_Block_Test.icc delete mode 100644 tests/Svc_Handler_Test.cpp delete mode 100644 tests/Svc_Handler_Test.dsp delete mode 100644 tests/Svc_Handler_Test.icc delete mode 100644 tests/TP_Reactor_Test.cpp delete mode 100644 tests/TP_Reactor_Test.dsp delete mode 100644 tests/TP_Reactor_Test.h delete mode 100644 tests/TP_Reactor_Test.icc delete mode 100644 tests/TSS_Test.cpp delete mode 100644 tests/TSS_Test.dsp delete mode 100644 tests/TSS_Test.icc delete mode 100644 tests/TSS_Test_Errno.h delete mode 100644 tests/Task_Test.cpp delete mode 100644 tests/Task_Test.dsp delete mode 100644 tests/Task_Test.icc delete mode 100644 tests/Thread_Manager_Test.cpp delete mode 100644 tests/Thread_Manager_Test.dsp delete mode 100644 tests/Thread_Manager_Test.icc delete mode 100644 tests/Thread_Mutex_Test.cpp delete mode 100644 tests/Thread_Mutex_Test.dsp delete mode 100644 tests/Thread_Mutex_Test.icc delete mode 100644 tests/Thread_Pool_Reactor_Resume_Test.cpp delete mode 100644 tests/Thread_Pool_Reactor_Resume_Test.dsp delete mode 100644 tests/Thread_Pool_Reactor_Resume_Test.h delete mode 100644 tests/Thread_Pool_Reactor_Resume_Test.icc delete mode 100644 tests/Thread_Pool_Reactor_Test.cpp delete mode 100644 tests/Thread_Pool_Reactor_Test.dsp delete mode 100644 tests/Thread_Pool_Reactor_Test.h delete mode 100644 tests/Thread_Pool_Reactor_Test.icc delete mode 100644 tests/Thread_Pool_Test.cpp delete mode 100644 tests/Thread_Pool_Test.dsp delete mode 100644 tests/Thread_Pool_Test.icc delete mode 100644 tests/Time_Service_Test.cpp delete mode 100644 tests/Time_Service_Test.dsp delete mode 100644 tests/Time_Service_Test.icc delete mode 100644 tests/Time_Value_Test.cpp delete mode 100644 tests/Time_Value_Test.dsp delete mode 100644 tests/Time_Value_Test.icc delete mode 100644 tests/Timeprobe_Test.cpp delete mode 100644 tests/Timeprobe_Test.dsp delete mode 100644 tests/Timeprobe_Test.icc delete mode 100644 tests/Timer_Queue_Test.cpp delete mode 100644 tests/Timer_Queue_Test.dsp delete mode 100644 tests/Timer_Queue_Test.icc delete mode 100644 tests/TkReactor_Test.cpp delete mode 100644 tests/TkReactor_Test.icc delete mode 100644 tests/TkReactor_Test.tcl delete mode 100644 tests/Token_Strategy_Test.cpp delete mode 100644 tests/Token_Strategy_Test.dsp delete mode 100644 tests/Token_Strategy_Test.icc delete mode 100644 tests/Tokens_Test.cpp delete mode 100644 tests/Tokens_Test.dsp delete mode 100644 tests/Tokens_Test.icc delete mode 100644 tests/UNIXclerk.conf delete mode 100644 tests/UNIXserver.conf delete mode 100644 tests/UNIXtokens.conf delete mode 100644 tests/UPIPE_SAP_Test.cpp delete mode 100644 tests/UPIPE_SAP_Test.dsp delete mode 100644 tests/UPIPE_SAP_Test.icc delete mode 100644 tests/Unbounded_Set_Test.cpp delete mode 100644 tests/Unbounded_Set_Test.icc delete mode 100644 tests/Unbounded_Set_Test_Ex.cpp delete mode 100644 tests/Unbounded_Set_Test_Ex.dsp delete mode 100644 tests/Unbounded_Set_Test_Ex.h delete mode 100644 tests/Unbounded_Set_Test_Ex.icc delete mode 100644 tests/Upgradable_RW_Test.cpp delete mode 100644 tests/Upgradable_RW_Test.dsp delete mode 100644 tests/Upgradable_RW_Test.h delete mode 100644 tests/Upgradable_RW_Test.icc delete mode 100644 tests/Vector_Test.cpp delete mode 100644 tests/Vector_Test.dsp delete mode 100644 tests/Vector_Test.icc delete mode 100644 tests/Win32clerk.conf delete mode 100644 tests/Win32server.conf delete mode 100644 tests/Win32tokens.conf delete mode 100644 tests/XtReactor_Test.cpp delete mode 100644 tests/XtReactor_Test.icc delete mode 100644 tests/icc.bat delete mode 100644 tests/libDLL_Test.icc delete mode 100644 tests/libService_Config_DLL.icc delete mode 100755 tests/log/.cvsignore delete mode 100644 tests/log/Makefile.am delete mode 100755 tests/makeicc.pl delete mode 100644 tests/pharlap/Atomic_Op_Test.dsp delete mode 100644 tests/pharlap/Auto_IncDec_Test.dsp delete mode 100644 tests/pharlap/Barrier_Test.dsp delete mode 100644 tests/pharlap/Basic_Types_Test.dsp delete mode 100644 tests/pharlap/Buffer_Stream_Test.dsp delete mode 100644 tests/pharlap/CDR_File_Test.dsp delete mode 100644 tests/pharlap/CDR_Test.dsp delete mode 100644 tests/pharlap/Cache_Map_Manager_Test.dsp delete mode 100644 tests/pharlap/Cached_Accept_Conn_Test.dsp delete mode 100644 tests/pharlap/Cached_Conn_Test.dsp delete mode 100644 tests/pharlap/Capabilities_Test.dsp delete mode 100644 tests/pharlap/Collection_Test.dsp delete mode 100644 tests/pharlap/Conn_Test.dsp delete mode 100644 tests/pharlap/DLList_Test.dsp delete mode 100644 tests/pharlap/Dynamic_Priority_Test.dsp delete mode 100644 tests/pharlap/Enum_Interfaces_Test.dsp delete mode 100644 tests/pharlap/Env_Value_Test.dsp delete mode 100644 tests/pharlap/Future_Set_Test.dsp delete mode 100644 tests/pharlap/Future_Test.dsp delete mode 100644 tests/pharlap/Handle_Set_Test.dsp delete mode 100644 tests/pharlap/Hash_Map_Bucket_Iterator_Test.dsp delete mode 100644 tests/pharlap/Hash_Map_Manager_Test.dsp delete mode 100644 tests/pharlap/High_Res_Timer_Test.dsp delete mode 100644 tests/pharlap/IOStream_Test.dsp delete mode 100644 tests/pharlap/Lazy_Map_Manager_Test.dsp delete mode 100644 tests/pharlap/MM_Shared_Memory_Test.dsp delete mode 100644 tests/pharlap/MT_Reactor_Timer_Test.dsp delete mode 100644 tests/pharlap/MT_SOCK_Test.dsp delete mode 100644 tests/pharlap/Malloc_Test.dsp delete mode 100644 tests/pharlap/Map_Manager_Test.dsp delete mode 100644 tests/pharlap/Map_Test.dsp delete mode 100644 tests/pharlap/Mem_Map_Test.dsp delete mode 100644 tests/pharlap/Message_Block_Test.dsp delete mode 100644 tests/pharlap/Message_Queue_Notifications_Test.dsp delete mode 100644 tests/pharlap/Message_Queue_Test.dsp delete mode 100644 tests/pharlap/Naming_Test.dsp delete mode 100644 tests/pharlap/New_Fail_Test.dsp delete mode 100644 tests/pharlap/Notify_Performance_Test.dsp delete mode 100644 tests/pharlap/Object_Manager_Test.dsp delete mode 100644 tests/pharlap/OrdMultiSet_Test.dsp delete mode 100644 tests/pharlap/Pipe_Test.dsp delete mode 100644 tests/pharlap/Priority_Buffer_Test.dsp delete mode 100644 tests/pharlap/Priority_Reactor_Test.dsp delete mode 100644 tests/pharlap/Priority_Task_Test.dsp delete mode 100644 tests/pharlap/Process_Manager_Test.dsp delete mode 100644 tests/pharlap/Process_Mutex_Test.dsp delete mode 100644 tests/pharlap/Process_Strategy_Test.dsp delete mode 100644 tests/pharlap/RB_Tree_Test.dsp delete mode 100644 tests/pharlap/Reactor_Exceptions_Test.dsp delete mode 100644 tests/pharlap/Reactor_Notify_Test.dsp delete mode 100644 tests/pharlap/Reactor_Performance_Test.dsp delete mode 100644 tests/pharlap/Reactor_Timer_Test.dsp delete mode 100644 tests/pharlap/Reactors_Test.dsp delete mode 100644 tests/pharlap/Reader_Writer_Test.dsp delete mode 100644 tests/pharlap/Recursive_Mutex_Test.dsp delete mode 100644 tests/pharlap/Reverse_Lock_Test.dsp delete mode 100644 tests/pharlap/SOCK_Connector_Test.dsp delete mode 100644 tests/pharlap/SOCK_Send_Recv_Test.dsp delete mode 100644 tests/pharlap/SOCK_Test.dsp delete mode 100644 tests/pharlap/SPIPE_Test.dsp delete mode 100644 tests/pharlap/SString_Test.dsp delete mode 100644 tests/pharlap/SV_Shared_Memory_Test.dsp delete mode 100644 tests/pharlap/Semaphore_Test.dsp delete mode 100644 tests/pharlap/Service_Config_Test.dsp delete mode 100644 tests/pharlap/Sigset_Ops_Test.dsp delete mode 100644 tests/pharlap/Simple_Message_Block_Test.dsp delete mode 100644 tests/pharlap/Svc_Handler_Test.dsp delete mode 100644 tests/pharlap/TSS_Test.dsp delete mode 100644 tests/pharlap/Task_Test.dsp delete mode 100644 tests/pharlap/Thread_Manager_Test.dsp delete mode 100644 tests/pharlap/Thread_Mutex_Test.dsp delete mode 100644 tests/pharlap/Thread_Pool_Reactor_Test.dsp delete mode 100644 tests/pharlap/Thread_Pool_Test.dsp delete mode 100644 tests/pharlap/Time_Service_Test.dsp delete mode 100644 tests/pharlap/Time_Value_Test.dsp delete mode 100644 tests/pharlap/Timeprobe_Test.dsp delete mode 100644 tests/pharlap/Timer_Queue_Test.dsp delete mode 100644 tests/pharlap/Tokens_Test.dsp delete mode 100644 tests/pharlap/UPIPE_SAP_Test.dsp delete mode 100644 tests/pharlap/Upgradable_RW_Test.dsp delete mode 100644 tests/pharlap/pharlap_tests.dsw delete mode 100755 tests/pharlap/run_pharlap_tests.bat delete mode 100644 tests/rtems_init.c delete mode 100644 tests/run_test.lst delete mode 100755 tests/run_test.pl delete mode 100644 tests/run_tests.bat delete mode 100755 tests/run_tests.check delete mode 100755 tests/run_tests.psosim delete mode 100755 tests/run_tests_remote.sh delete mode 100644 tests/test_config.h delete mode 100644 tests/tests.dsw delete mode 100644 tests/tests.icp delete mode 100644 tests/tests.mpc delete mode 100644 tests/tests.mwc delete mode 100644 tests/tests_pharlap_msvc.lnk delete mode 100644 tests/vacpp_setup.icc delete mode 100644 vc7_nightly.mwc delete mode 100644 websvcs/Makefile delete mode 100644 websvcs/README delete mode 100644 websvcs/lib/Makefile delete mode 100644 websvcs/lib/URL_Addr.cpp delete mode 100644 websvcs/lib/URL_Addr.h delete mode 100644 websvcs/lib/URL_Addr.i delete mode 100644 websvcs/lib/websvcs.dsp delete mode 100644 websvcs/lib/websvcs.dsw delete mode 100644 websvcs/lib/websvcs_export.h delete mode 100644 websvcs/tests/Makefile delete mode 100644 websvcs/tests/Test_URL_Addr.cpp delete mode 100644 websvcs/tests/Test_URL_Addr.dsp delete mode 100644 websvcs/tests/tests.dsw delete mode 100644 websvcs/websvcs.dsw diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html deleted file mode 100644 index b01171a817e..00000000000 --- a/ACE-INSTALL.html +++ /dev/null @@ -1,2777 +0,0 @@ - - - - - Building and Installing ACE and Its Auxiliary Libraries and Services - - - - - -
-

Building and Installing ACE and Its Auxiliary Libraries and Services

- -

Synopsis

- -The file explains how to build and install ACE and its Network -Services on the various OS platforms and compilers that it has been -ported to. Please consult the ChangeLog file -to see whether any recent changes to the release will affect your -code. In addition, you should check out our development -process. As you start working with ACE, we suggest you get copies -of the C++NPv1 and C++NPv2 books -to help guide you after you've built and installed ACE. You should -also consult the ACE Frequently Made -Mistakes page. If you encounter any problems or would like to -request an enhancement, then use our bug tracking system to submit a -report in accordance with our bug -report process.

- -

Document Index

- - - - -


-

Platforms, C++ Compilers, and Support

- -

ACE has been ported to a large number of platforms, -using many different compilers over the years. The DOC group, Riverace, OCI, and members of the ACE user -community have all contributed ports to make ACE the successful and -far-reaching toolkit it is today. Any UNIX/POSIX/Win32 variation is a -potential target platform for ACE. If you have porting questions or have a problem -compiling the ACE source distribution, please contact one of the -commercial support companies, or send a copy of the -PROBLEM-REPORT-FORM to either the ACE -Newsgroup or the ACE -mailing list and someone will try to help you fix the problems. - -

The responsibility for maintaining ACE across this wide range of -platforms is divided among a few different groups: the DOC group, -Riverace, OCI, and the ACE user community itself. -The table below summarizes each group's role -and where you can get more detailed information. -For information on TAO's platform coverage and support, please also see -TAO's install document.

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Groups Involved in ACE Development and Support
Group - Platforms - For more information -
DOC GroupTested and used - daily by the DOC group: - Solaris 2.6, 7 and 8 (many compilers excluding SunC++ 4.x)
- Windows NT 4.0, 2000, XP (MSVC++ 6.x, and 7.x, and - Borland C++ Builder 5.0)
- Linux/Intel (many compilers), Linux/IA64 (GCC). -
DOC sites at UCI and - Washington University -
RiveraceOffers support services for many platforms including those - above, HP-UX, AIX, and Windows CE. - Riverace's web site
OCIMaintains ACE on certain platforms required for their TAO - software and service offerings. - OCI's web site and - the TAO install document
ACE user communityResponsible for continued maintenance and testing of platforms - to which ACE has been ported, but aren't supported by the - above groups. These include - Windows 95/98 using Borland C++ Builder 4.0 and later, - and GNU g++ on MinGW; - Digital UNIX (Compaq Tru64) 4.0 and 5.0; - IRIX 6.x; UnixWare 7.1.0; SunOS 4.x and Solaris with SunC++ 4.x; - Linux on Alpha and PPC; OpenMVS; - Tandem; SCO; FreeBSD; NetBSD; OpenBSD; - Chorus; OS/9; PharLap TNT Embedded ToolSuite 9.1; - QNX RTP and Neutrino 2.0; VxWorks; LynxOS; RTEMS -

- -

Although the DOC group has provided outstanding, world-class -support for ACE over the years, ACE's success has greatly increased -the amount of effort required to keep up with its maintenance, answer -users' questions, and give design guidance. Riverace offers -world-class commercial services to support ACE users and OCI offers -similar services for TAO, allowing the DOC group's primary focus to -shift back to their main goal: research. The DOC group is -fundamentally focused on (and funded -by) advanced R&D projects. The group continues to be intimately -involved in ACE+TAO development and maintenance, but with revised -priorities for maintenance. The bug fixing policies followed by -the DOC group are designed to strike a balance between their many research -projects and their commitment to the ACE+TAO user -community. Naturally, we will be happy to accept well-tested -patches from the ACE+TAO user community for any platforms that aren't -supported by the DOC group, Riverace, or OCI.

- -


-

Installation Notes

- - - - -
-

Compiling ACE with GNU g++

- -If you use the GNU GCC g++ compiler please note the following: - - - - -


-

Compiling ACE with egcs

- - - -


-

Building and Installing ACE

- -The following explains how to build ACE on UNIX -and Win32. - -

General Rules

- - -
-

Building and Installing ACE on UNIX

- -Building and installing ACE on UNIX is relatively simple (the process for Win32 is different). Here's what you -need to do:

- -

    -
  1. Install GNU make - 3.79.1 or greater on your system (available via - anonymous ftp from prep.ai.mit.edu in the pub/gnu/make/ directory). - You must use GNU make or ACE won't compile.

    - -

  2. Add an environment variable called ACE_ROOT that contains the - name of the root of the directory where you keep the ACE wrapper - source tree. The ACE recursive Makefile scheme needs this information. - There are several ways to set the ACE_ROOT variable. For - instance, in my .login file I have the following entry:

    - -

    
    -      % setenv ACE_ROOT /home/cs/faculty/schmidt/ACE_wrappers
    -      

    - - However, if you're building a number of versions of ACE, e.g., for - different OS platforms or for different releases of ACE, you might use - the following approach: - -

    
    -      % setenv ACE_ROOT $cwd
    -      
    - -
  3. Edit the $ACE_ROOT/ace/OS.h file to update things like default - hostname and port numbers you'd like the programs in the - $ACE_ROOT/{apps,tests} directories to use by default. Note, - however that you can normally skip this step because the - defaults are typically fine for most systems.

    - -

  4. Create (via ln -s or cp) a - $ACE_ROOT/ace/config.h - file that contains the appropriate platform/compiler-specific - header configurations, e.g., -
    
    -% ln -s config-sunos5-sunc++-4.x.h config.h
    -
    - This file - contains the #defines that are used throughout ACE to indicate - which features your system supports (see the - $ACE_ROOT/ace/OS.h file for many examples of how - the ACE build configuration is affected by these macro - settings). Make sure you settings are placed - before the inclusion of the platform-specific - header file.

    - - There are config files for most versions of UNIX. If there - isn't a version of this file that matches your - platform/compiler, you'll need to make one. Please send me - email if you get it working so I can add it to the master ACE - release.

    - -

  5. Create (via ln -s or cp) a - $ACE_ROOT/include/makeinclude/platform_macros.GNU file - that contains the appropriate platform/compiler-specific - Makefile configurations, e.g., -
    
    -% ln -s platform_sunos5_sunc++.GNU platform_macros.GNU
    -
    - This file - contains the compiler and Makefile directives that are - platform/compiler-specific

    - -

  6. Note that because ACE builds shared libraries, you'll need to set - LD_LIBRARY_PATH to whereever you put the binary version of the - ACE library. For example, you probably want to do something - like the following

    - -

    
    -      % setenv LD_LIBRARY_PATH $ACE_ROOT/ace:$LD_LIBRARY_PATH
    -      

    - -

  7. When all this is done, hopefully all you'll need to do is type:

    - -

    
    -      % make
    -      

    - - at the root of the ACE source tree. This will build the ACE - library, tests, the examples, and the sample applications. - Building the entire ACE release can take a long time and consume - lots of disk space, however. Therefore, you might consider - cd'ing into the $ACE_ROOT/ace/ directory and - running make there to build just the ACE library. - As a sanity check, you might also want to build and run the - automated "one-button" tests in $ACE_ROOT/tests/. Finally, if you're also - planning on building TAO, you - should build the gperf - perfect hash function generator application in $ACE_ROOT/apps/gperf/.

    - -

  8. If you need to regenerate the Svc_Conf_y.cpp file, you'll need to - get Berkeley - YACC. However, you should rarely, if ever, need to do this.

    - -

- - -


-

Building and Installing ACE on Win32

- -Below are instructions for building ACE with Borland C++Builder, Microsoft -Visual C++ and Mingw.

- -First, if you are upgrading from an older release, clean up everything -and rebuild from scratch to ensure that everything is rebuilt -correctly. You might have to manually go through the ACE directories -and delete all *.obj, *.dll, *.lib, *.ilk, *.pdb, *.idb, *.ncb, *.opt, -and *.exp files in order to start over from scratch (the Clean command -in MSVC may not do this).

- -ACE contains project files for Microsoft Visual C++ 5.0 or later -(*.dsw) and IBM's VisualAge C++ compiler (*.icc). There are also -Makefile.bor files to compile ACE, the ACE one-button tests, and TAO -with Borland C++ Builder.

- -


-

Building and Installing ACE on Win32 with Borland -C++Builder

- -If you are building for a machine without a network card, you may want -to check here first.

- -

    -
  1. Uncompress the ACE distribution into a directory, where it will -create an - ACE_wrappers directory containing the source. The ACE_wrappers - directory will be referred to as ACE_ROOT in the following steps -- so - ACE_ROOT\ace would be C:\ACE_wrappers\ace if you uncompressed into the - root directory.
    -
    -
  2. Create a file called config.h in the ACE_ROOT\ace - directory that contains:
    -
    - #include "ace/config-win32.h"
    -
    - If you are building for Windows NT 4, Windows 2000, or Windows XP, - then you can start without any more changes. If you are building - on Windows 9x/Me, then you should add the line
    -
    - #define ACE_HAS_WINNT4 0
    -
    - before the #include statement in ACE_ROOT\ace\config.h and it - will turn off some WinNT/Win2K-specific code in ACE.
    -
    -
  3. Open a Command Prompt (DOS Box).
    -
    -
  4. Set the ACE_ROOT environment variable to point to the ACE_wrappers - directory. For example:
    -
    - set ACE_ROOT=C:\ACE_wrappers
    -
    -
  5. Set the BCBVER environment vairable to the main version of your BCB compiler. - Currently 4, 5, and 6 are supported. For example:
    -
    - set BCBVER=5
    -
    -
  6. Change to the ACE_ROOT\ace directory.
    -
    -
  7. Build release DLLs for ACE by going:
    -
    - make -f Makefile.bor
    -
    -
  8. You can build several different versions of ACE by setting environment -variables - before you run make:
    -
    - Set the environment variable below to build a debug version of ACE
    - set DEBUG=1
    -
    - Set the environment variable below to build a static version of ACE
    - set STATIC=1
    -
    - Set the environment variable below to build a unicode version of ACE
    - set UNICODE=1
    -
    - Set the environment variable below to build a version of ACE with Codeguard support. Should only be used when DEBUG is also set
    - set CODEGUARD=1
    -
    - Set the environment variable below to build a version of ACE that is build against the VCL-compatible run-time library. This can only be used with BCB version 4
    - set PASCAL=1
    -
    - You can then start the build with the command -
    make -f Makefile.bor
    -
    - You may also enable the options by passing them as command line options to make, for example:
    - make -f Makefile.bor -DDEBUG -DPASCAL
    -
    -
  9. Optionally install the ACE header files, libraries and executables -for use - in your applications. Here we are installing them into C:\ACETAO:
    -
    - make -f Makefile.bor -DINSTALL_DIR=C:\ACETAO install
    -
    -
- -These instructions do not cover all possible build configurations. Please -see http://www.tenermerx.com/tao_bcb/index.html -for more detailed information on building and using ACE+TAO with Borland C++ -Builder.

- -If you are using C++Builder 4, then the libraries built using the above -instructions are intended for use with generic console or windows applications -and they link against the corresponding C++ runtime library. VCL applications -created using BCB4's RAD environment must link against the VCL-compatible (ie -pascal-compatible) runtime library. To tell the difference between these -libraries the VCL-compatible ones have a 'p' in the suffix (i.e., 'p' for -pascal). To build VCL compatible libraries try -

set PASCAL=1
-make -f Makefile.bor
-

- -The Borland C++ Builder 4.0/5.0 port has been done by Jody Hagins and Christopher Kohlhoff.

- -ACE TESTS

- -The tests are located in ACE_ROOT\tests. You build the tests using the -Makefile.bor file, that is:

-

-make -f Makefile.bor -

- -Once you build all the tests, you can run a perl script:

-

run_test.pl -ExeSubDir -Dynamic\Release

or the the batch file:

-

run_tests.bat bor

in the -tests directory to try all the tests. You need to make -sure the ACE bin directory (in this case ACE_ROOT\bin\Dynamic\Release) -is on the path before you try to run the tests.

- -


-

Building and Installing ACE on Win32 with -Microsoft Visual C++

- -Note concerning MSVC 5.0 and Service Pack 3: There has been -confusion regarding MSVC 5 and its Service Pack 3. Some ACE users -have, in the past, had problems with SP3 that were not present in SP2. -Thanks to the diligent efforts of Bill Fulton, the -mystery appears to be solved. The key? (Oh, this is a good one...) -It would appear that there are actually multiple versions of SP3 in -existence. The earlier ones have the bug, while later ones have it -fixed. The service pack downloadable from Microsoft's web site as of -June 16, 1998 works fine. The CD containing SP3, if it has part -number X03-50158 on the disc (the part number on the jacket is -probably different), also works fine. - -Note, however, that regardless of the version of SP3, there are some -STL bugs in SP3 which you should get corrected. Please see http://www.dinkumware.com/vc_fixes.html -for details. Thank you to Ben Eng -for the pointer to the STL fixes.

- -Right now there is a SP4 (and hopefully only one of them) which fixes a -deadlock problem in the STL.

- -We no longer actively support MSVC 4.x or earlier. ACE might work with -these compilers but probably not without a bit of effort.

- - -

    -
  1. Uncompress the ACE distribution into a directory, where it will create a - ACE_wrappers directory containing the distribution. The ACE_wrappers - directory will be referred to as ACE_ROOT in the following steps -- so - ACE_ROOT\ace would be C:\ACE_wrappers\ace if you uncompressed into the - root directory.
    -
    -
  2. Create a file called config.h in the ACE_ROOT\ace - directory that contains:
    -
    - #include "ace/config-win32.h"
    -
    -
  3. Now load up the project file for ACE (ACE_ROOT\ace\ace.dsw).
    -
    -
  4. Each project will contain several different configurations. These - are a mixture of Debug/Release, MFC/Non-MFC, and Static/Dynamic - library versions. - Make sure you are building the one you'll use (for example, the - debug tests need the debug version of ACE, and so on). All these - different configurations are provided for your convenience. You - can either adopt the scheme to build your applications with - different configurations, or use ace/config.h to - tweak with the default settings on NT.
    - Note: If you - use the dynamic libraries, make sure you include ACE_ROOT\bin - in your PATH whenever you run programs that uses ACE. Otherwise - you may experience problems finding ace.dll or aced.dll.
    -
    -
  5. If you are building for Windows NT or Windows 2K then you can start building - without anymore changes. If you are building on Windows 9x/Me, - then you should add the line
    -
    - #define ACE_HAS_WINNT4 0
    -
    - before the #include statement in ACE_ROOT\ace\config.h and it - will turn off some WinNT/Win2K-specific code in ACE.
    -
    -
  6. If you want to use the standard C++ headers (iostream, cstdio, ... - as defined by the C++ Standard Draft 2) that comes with MSVC, - then add the line:
    -
    - #define ACE_HAS_STANDARD_CPP_LIBRARY 1
    -
    - before the #include statement in ACE_ROOT\ace\config.h.
    -
    -
  7. To use ACE with MFC libraries, also add the following to - your config.h file. Notice that if you want to - spawn a new thread with CWinThread, make sure you spawn the - thread with THR_USE_AFX flag set.
    -
    - #define ACE_HAS_MFC 1
    -
    - By default, all of the ACE projects use the DLL versions of the - MSVC run-time libraries. You can still choose use the static (LIB) - versions of ACE libraries regardless of run-time libraries. The - reason we chose to link only the dynamic run-time library is that - almost every NT box has these library installed and to save disk - space. If you prefer to link MFC as a static library into ACE, you - can do this by defining ACE_USES_STATIC_MFC in your - config.h file. However, if you would like to link - everything (including the MSVC run-time libraries) statically, - you'll need to modify the project files in ACE yourself.

    -

  8. Static version of ACE libraries are build with - ACE_AS_STATIC_LIBS
    defined. This macro should - also be used in application projects that link to static ACE - libraries
    -
    - Optionally you can also add the line
    -
    - #define ACE_NO_INLINE
    -
    - before the #include statement in ACE_ROOT\ace\config.h to disable - inline function and reduce the size of static libraries (and your - executables.)
    -
    -
  9. ACE DLL and LIB naming scheme:
    -
    - We use the following rules to name the DLL and LIB files in ACE - when using MSVC.
    -
    - "Library/DLL name" + (Is static library ? "s" : - "") + (Is Debugging enable ? "d" : "") - + {".dll"|".lib"}
    -
    -
- -

More information for ACE/TAO on MSVC can be found -here. The doxygen version of this -document is available under Related Topics in the ACE Library.

- -ACE TESTS

- -The tests are located in ACE_ROOT\tests. There is also a workspace in -that directory to build all the tests (tests.dsw)

- -Once you build all the tests (Batch Build works well for this), you -can run perl script run_test.pl or the the batch file run_tests.bat in the -tests directory to try all the tests.

- - - BUILDING ACE ON A WIN32 MACHINE THAT LACKS A NETWORK CARD

- -You may want to run ACE on a non-networked machine. To do so, you must -install TCP/IP and configure it to ignore the absence of a network -card. This is one method:

- -

    -
  1. Run Control Panel -
  2. Choose Network from Control Panel -
  3. Add Adapter: MS Loopback Adapter -
  4. Configure MS Loopback Adapter with 802.3 (default) -
  5. Add Protocol: TCP/IP Protocol -
  6. Configure TCP/IP Protocol with a valid IP address and subnet mask. - Leave everything else at the default settings. -
  7. Add Service: Workstation -
  8. Exit and Restart System -
  9. Run Control Panel again -
  10. Choose Services from Control Panel -
  11. The following services are not necessary and may - be set to Disabled Startup:
    - Alerter
    - Computer Browser
    - Net logon
    - Messanger
    -
  12. Choose Network from Control Panel -
  13. Confirm the following setup. This is all you need to run ACE:
    - Installed Software:
    - Computer Browser
    - MS Loopback Adapter Driver
    - TCP/IP Protocol
    - Workstation
    - Installed Adapter Cards:
    - MS Loopback Adapter

    -

- -WIN32 ALPHA CONFIGURATIONS - -

The project files for Visual C++ no longer contain any configurations -targetted to Windows NT on the DEC Alpha. Below are the steps needed to -recreate the Alpha configurations:

- -
    -
  1. Load the project on the Alpha machine. -
  2. Go to the Build menu and then select Configurations. -
  3. Select the project that you want to convert. -
  4. Click on Add. -
  5. Select the x86 configuration to "Copy settings from" - (either Debug or Release versions). -
  6. Prepend "Alpha " to the beginning of the name under - "Configuration". -
  7. Click OK. -
  8. Close the "Configurations" window. -
  9. Now go to the Project settings. -
  10. For the General Settings, change the output directories to standard ACE - output directories. Intermediate Directories are "Debug" and - "Release" in most cases. The Output Directories are blank, - except for Release versions of executables, in which it is also - "Release". -
  11. For the C/C++ Settings, make sure that the Code Generation's runtime - library is set to "Multithreaded DLL" or "Debug Multithreaded - DLL". -
- -

Note: MSVC 6 has a bug where if a .dsp is converted from version 5 to 6 on -x86, the Alpha configuration can get corrupted. This seems to happen when additional -include or library directories are specified using backslashes instead of forward -slashes. If this occurs, the easiest way to fix it is to recreate it.

- - -


-

Building and Installing ACE on Win32 with Mingw

- -

-If you are building for a machine without a network card, you may want -to check here first. - -

-Building and installing ACE on Mingw -uses a mix of a UNIX building process and -Win32 configuration files. -Also, as Mingw uses GNU g++, you may want to take -a look at the Compiling ACE with GNU g++ section. - -

-You will need the Mingw build tools and libraries, downloable from -http://www.mingw.org. -For our build we required the following packages: - -

-gcc, binutils, ld, libbfd, mingw-runtime, w32api. -
- -

-You will also need GNU make for Win32 and the set of UNIX tools that -the ACE UNIX build system uses (this include but is not limited to -sh, rm, cp). -For this purpose you can grab the -cygwin -distribution from -http://cygwin.com. - -

-Be careful, because cygwin includes it's own version of the compiler -and build tools, you will need to have the Mingw build tools before -the cygwin set on you PATH environment variable (more on this later). -The steps we followed in the build are: - -

    - -
  1. Install cygwin (this can be easy downloading and running - setup.exe - from the cygwin site). -

    - -
  2. Install the Mingw tools. Download all the needed packages (see - above) and - unpack them on the same base directory, say c:/mingw32. - If some of the packages are distributed on - .tar.gz format, you may need to use - the cygwin version of the tar utility. -

    - -
  3. Open a cygwin shell. Set your PATH environment variable so - your Mingw's bin directory is first: - -
    -       % export PATH=//c/mingw32/bin:$PATH
    -       
    - -

    - Note cygwin uses ``/'' as directory separator, - and ``//X'' as a notation for Win32 drive X. - Note also that you can't use ``c:/mingw32/bin'' - because, for cygwin, - ``:'' is path separator character, as in UNIX. -

    - -

  4. Add an ACE_ROOT environment variable pointing to the - root of your ACE wrappers source tree: - -
    -       % export ACE_ROOT=c:/work/mingw/ACE_wrappers
    -       
    - -

    - Note here you can't use the ``//X'' cygwin - notation as this is seen by Mingw's compiler and it doesn't - support that (it does support ``/'' as directory - separator however). - -

    - From now on, we will refer to the root directory of the ACE - source tree as $ACE_ROOT. -

    - -

  5. Create a file called config.h in the - $ACE_ROOT/ace directory that contains: - -
    -       #include "ace/config-win32.h"
    -       
    - - If you are building for Windows 9X/Me (ie, not WinNT or - Win2K), you will need to add: - -
    -       #define ACE_HAS_WINNT4 0
    -       
    - - before the #include line. - - Also, if you don't have Winsock 2 (check the SYSTEM - and/or SYSTEM32 subdirectories of the windows - instalation directory for ws2_32.dll), you - will need - -
    -       #define ACE_HAS_WINSOCK2 0
    -       
    - - before the #include line. On NT 4, Windows 98 and - later versions, you surely have Winsock 2. In Windows 95, - including OSR2, you may don't have it if it wasn't specially - installed. You may download it from the microsoft site. This is - recommended as much ACE functionality depends on Winsock 2, and - ACE without Winsock 2 support is tested very infrequently. -

    - -
  6. Create a file called platform_macros.GNU in the - $ACE_ROOT/include/makeinclude directory containing: - -
    -       include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
    -       
    - - In the above text, don't replace $(ACE_ROOT) with the - actual directory, GNU make will take the value from the - environment variable you defined previously. - - If you lack Winsock 2, add the line - -
    -       winsock2 = 0
    -       
    - - before the previous one. -

    - -
  7. On the cygwin shell, change to the $ACE_ROOT/ace directory and - run make: - -
    -       % cd $ACE_ROOT/ace
    -       % make
    -       
    - -

    - This should create libACE.dll (the Win32 shared library) and - libACE.dll.a (the Win32 import library for the DLL). - Note the name for the ACE DLL on Mingw follows the Mingw - convention, that resembles UNIX. -

    - -

    - If you want static libs also, you may run: - -

    -       % make static_libs=1
    -       
    - - -
  8. - The same rules for Win32 search of DLLs apply for Mingw. If you - want to run some ACE programs from the cygwin shell, you may - need to add the directory for libACE.dll to your PATH: - -
    -       # export PATH=//c/work/mingw/ACE_wrappers/ace:$PATH
    -       
    - - -
- -ACE TESTS

- -The tests are located in $ACE_ROOT/tests. -After building the library, you can change to that directory and run -make: - -

-       % cd $ACE_ROOT/tests
-       % make
-       
- -

-Once you build all the tests, you can run -run_tests.sh in the -tests directory to try all the tests: - -

-       % run_tests.sh
-       
- -

-If you are using ACE as a DLL, you will need to modify your PATH -variable as explained above. - -

-You may want to check $ACE_ROOT/tests/README for the status -of the various tests on Mingw and the different Windows flavors. - -


-

Building and Installing ACE on VxWorks

-For the most part, you should be able to follow the instructions above -to build ACE and applications that use it. Start with the -Unix instructions above to build ACE and the -applications that use it. Please see below for more information on -building ACE on NT hosts for VxWorks targets.

- -A few notes on VxWorks builds (thanks to -Paul von Behren -for these notes):

-

- -You'll have to let ACE know the target type at compile time. There -are several ways to do this; please see the -$ACE_ROOT/include/makeinclude/platform_vxworks5.x_g++.GNU -platform file for detailed information.

- -The VxWorks platform_vxworks*.GNU files are set up so that shared -libraries are not built on VxWorks, by default. Only static -libraries, with .a extension, are built. Therefore, it's not -necessary to set the LD_LIBRARY_PATH environment variable on your host -system when building for VxWorks targets. Please note, however, if -you use TAO on VxWorks that you will need to set your LD_LIBRARY_PATH -to find the TAO IDL compiler libraries (installed in the ace -directory) on the host.

- -With g++, $ACE_ROOT/bin/ace_ld is used to munch object files and -libraries to set up calls to static constructors and destructors. -bin/ace_ld requires perl on the host platform.

- -These non-default VxWorks kernel configuration #defines -are required with ACE:

- -

-#define INCLUDE_CPLUS           /* include C++ support */
-#define INCLUDE_CPLUS_IOSTREAMS /* include iostreams classes */
-#define INCLUDE_POSIX_ALL       /* include all available POSIX functions */
-
- -For completeness, here are the non-default #defines that -we used for VxWorks 5.3.1/g++ 2.7.2: - -
-#define INCLUDE_CPLUS           /* include C++ support */
-#define INCLUDE_CPLUS_IOSTREAMS /* include iostreams classes */
-#define INCLUDE_CONFIGURATION_5_2 /* pre-tornado tools */
-#define INCLUDE_DEBUG           /* pre-tornado debugging */
-#define INCLUDE_LOADER          /* object module loading */
-#define INCLUDE_NET_SYM_TBL     /* load symbol table from network */
-#define INCLUDE_SYM_TBL_SYNC    /* synchronize host and target symbol tables */
-#define INCLUDE_NFS             /* nfs package */
-#define INCLUDE_PING            /* ping() utility */
-#define INCLUDE_POSIX_ALL       /* include all available POSIX functions */
-#define INCLUDE_RDB             /* remote debugging package */
-#define INCLUDE_RLOGIN          /* remote login */
-#define INCLUDE_RPC             /* rpc package */
-#define INCLUDE_SECURITY        /* shell security for network access */
-#define INCLUDE_SHELL           /* interactive c-expression interpreter */
-#define INCLUDE_SHOW_ROUTINES   /* show routines for system facilities*/
-#define INCLUDE_SPY             /* spyLib for task monitoring */
-#define INCLUDE_STARTUP_SCRIPT  /* execute start-up script */
-#define INCLUDE_STAT_SYM_TBL    /* create user-readable error status */
-#define INCLUDE_SYM_TBL         /* symbol table package */
-#define INCLUDE_UNLOADER        /* object module unloading */
-#define INCLUDE_WINDVIEW        /* WindView command server */
-
- -Also, automatic construction/destruction of static objects -should be enabled.

- -If you use TAO, it's also a good idea to increase the -NUM_FILES parameter from its default of 50 to, -say, 1000.

- -Please note that those VxWorks kernel configuration parameters -are set in the VxWorks configAll.h file. You must rebuild your -VxWorks kernel after modifying that file.

- -If you're first getting started with ACE and/or VxWorks, I recommend -just building the ACE library and tests first. (Some of the ACE -examples, in System_V_IPC, don't build on VxWorks yet.) Then try -running the tests. Please see $ACE_ROOT/tests/README for the latest -status of the ACE tests on VxWorks.

- -Please note that the main entry point is renamed to -ace_main (configurable via ACE_MAIN) on VxWorks with g++, -to comply with its restriction against using main. -In addition, ACE_HAS_NONSTATIC_OBJECT_MANAGER is enabled by default -to cleanly support construction and destruction of static objects. -Please see the Non-static -ACE_Object_Manager discussion for the important implication -of this feature.

- -ACE threads (VxWorks tasks) can be named, for example, by supplying a -non-null argument to the Thread_Manager spawn routines. However, -names beginning with "==ace_t==" are forbidden because -that prefix is used internally by ACE.

- -You can spawn a new task to run ace_main, using either -VxWorks sp, or ACE'S spa. -spa can be used from the VxWorks shell to pass arguments -to ace_main. Its usage is: - -


-spa ace_main, "arg1" [, ...]
-
- -All arguments must be quoted, even numbers.

- -The ACE tests write their output files in a -directory named log/, below the current -(tests) directory. If you don't have NFS included in -your VxWorks kernel, you can use these steps, provided by -Clarence M. Weaver, -to run the tests and capture their output:

-

    -
  1. What I did was create a log directory on the boot NT host of my vxworks - target.

    -

  2. I copied all the test applications and the run_tests.vxworks script to - the parent of the log directory.

    -

  3. Using the target shell not the host shell, I "cd" to the directory - containing the script and test programs.

    -

  4. Invoked the script < run_tests.vxworks from this target shell.

    -

- -Kirk Davies provided this -approach for running the ACE tests on Tornado II: - - - -
Building Shared Libraries for VxWorks.
- -ACE supports shared libraries for VxWorks, but only with the g++ -compiler. To build shared libraries instead of the default static -libraries, added shared_libs=1 (not -shared_libs_only=1) to either your -ACE_wrappers/include/makeinclude/platform_macros.GNU or -your make invocation. Then, be sure to load the ACE (and -any other) shared library before loading your executable(s).

- -A shared library for VxWorks uses the same code as for a static -(non-shared) library. However, calls to static constructors/ -destructors are added. The code in the shared library must -be reentrant if you shared it between programs (tasks). The -ACE library meets this requirement.

- -Shared libraries reduce build time, executable size, and load -time of the executable. But, you must manually load the shared -library before loading your executable(s) with a command such as: -


--> ld < libACE.so
-
-Shared libraries can be unloaded the same way an executable -(module) is unloaded.

- -NOTE: Shared libraries on VxWorks aren't the same as -shared libraries on other operating systems. In particular, there is -no support for creating copies of writeable global (static) data in -the shared library. This includes the singleton ACE_Object_Manager -instance pointer. If you share global data between separate programs, -they may not work properly. See the discussion of shared code and -reentrancy in the VxWorks' Programmers Guide.

- -Instead of trying to run separate programs onto a VxWorks target, we -recommend creating just one program, and spawning a thread for each -task. The TAO IDL_Cubit test collocation -test is a good example.

- -

Linking ACE and/or TAO Libraries into the VxWorks Kernel.
- -It's easy to link your ACE and/or TAO libraries into the VxWorks kernel. -Just build shared versions, but -disable the munch step. The easiest way to do that is to set the -LD make variable to the name of your linker. For -example, to build a libACE.so for PowerPC that can be linked into -the kernel: -
-% cd $ACE_ROOT/ace
-% make LD=ldppc shared_libs=1
-
-After building the shared lib, link it into the kernel by setting -the MACH_EXTRA make variable in the kernel configuration -Makefile. Then, build the kernel using make exe.

- -

Building ACE on Tornado/NT hosts for VxWorks targets.
-The following, very useful information was contributed by -Chris Ryan -and Paul von Behren. -Please submit corrections, additions, or clarifications to the -the ACE mailing list.

- -NOTE:The make (version 3.74) that is provided with -Tornado II cannot be used to build ACE. Use Cygnus' make (version 3.75) -instead.)

- -NOTE:Optimization is enabled be default in -platform_vxworks5.x_g++.GNU. However, the compiler that is shipped with Tornado II has -trouble compiling some files with -O2. To disable optimization -for an individual file, just add optimize=0 to your -make invocation when compiling that file.

- -Using the Cygnus tools, this approach works: -

- -A few additional Windows Notes, from Paul von Behren:

-

- -And Chris Ryan's instructions for building for VxWorks targets -on Windows NT hosts: - -
    -
  1. Path setting that seems to be working is:

    -

    -      /tornado/host/x86-win32/bin:
    -      /tornado/host/x86-win32/lib/gcc-lib/i386-wrs-vxworks/cygnus-2.7.2-960126:
    -      /tornado/host/x86-win32/i386-wrs-vxworks/bin:
    -      /ace/ace_wrappers/bin:
    -      /gnuwin32/b18/H-i386-cygwin32/bin:
    -      /gnuwin32/b18/tcl/bin:
    -      /WINNT/system32:
    -      /WINNT:
    -      /WINNT/system32/nls/ENGLISH:
    -      /bin
    -      
    - - Other environment variables:

    -

    -      WIND_BASE=/tornado
    -      SHELL=/bin/sh.exe
    -      TERM=pcbios
    -      TAO_ROOT=/ace/ACE_wrappers.vxworks/TAO
    -      CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.EXE
    -      GCC_EXEC_PREFIX=/tornado/host/x86-win32/lib/gcc-lib/
    -      WIND_HOST_TYPE=x86-win32
    -      ACE_ROOT=/ace/ACE_wrappers.vxworks
    -      
    - -
  2. /tornado is the root of the Tornado install - ($WIND_BASE). - -
  3. /gnuwin32 is the root of a Cygnus GNU download and install. - -
  4. /bin content is:

    -

    -      aced.dll
    -      cygwin.dll
    -      perl.exe
    -      rm.exe
    -      sh.exe
    -      true
    -      
    - - aced.dll is produced in an ACE NT source tree according to - documented procedure for NT VC++5.0 ACE build. - - cygwin.dll is from the Cygnus GNU software download and install. - -
  5. Basically, follow documented procedure for ACE build/install on UNIX - platform. Create a $ACE_ROOT/ace/config.h that looks - like:

    -

    -      #include "config-vxworks5.x.h"
    -      
    - - And create a - $ACE_ROOT/include/makeinclude/platform_macros.GNU - that looks like:

    -

    -      WIND_BASE = /tornado
    -      WIND_HOST_TYPE = x86-win32
    -      CPU = I80486
    -      include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU
    -      
    - -
  6. When using cygnus windows GNUTools on WinNT you have to start - make with "--unix" option, otherwise WinNT shell cmd.exe is responded and - not sh.exe, i.e., -
    - make --unix static_libs=1
    - 
    -
- -
TAO on NT Tornado host, VxWorks target.
- -
    -
  1. Build ACE and TAO_IDL in the NT tree as already documented. As - mentioned above, I put aced.dll in /bin. - Be sure to build ACE's gperf on NT, in - ACE_wrappers/apps/gperf/src.

    - -

  2. Build $TAO_ROOT/tao -
    -      CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
    -      cd $TAO_ROOT/tao
    -      /gnuwin32/b18/H-i386-cygwin32/bin/make
    -      
    - -
  3. Build orbsvcs. -
    -      CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
    -      cd $TAO_ROOT/orbsvcs/orbsvcs
    -      /gnuwin32/b18/H-i386-cygwin32/bin/make
    -      
    - -
  4. Build $TAO_ROOT/tests

    -

- - -

  -Jaffar Shaikh's -Notes for Building ACE and TAO for VxWorks on NT host

-

Scenario: I was building the ACE and TAO for VxWorks = -on NT. The target system was a PPC860 based chassis and another a NT = -host based card.

-

Host System:

-

NT 4.0 workstation with 128 M RAM, 266MHz Pentium.

- -

Software Needed For Building TAO

-

1) PERL: Active State's ActivePerl 5.6.0.618 for NT available as = -freeware from = -http://www.ActiveState.com/download/contrib/Microsoft/NT/InstMsi.exe = -

- -

2) Tornado II .Release V 9904 from Windriver.

- -

3) Cygwin GNU to build TAO. It is available for NT as a freeware = -from

-

http://sources.redhat.com/cygwin/

-

The Cygwin Make (version 3.75) can only build the TAO not the = -Tornado II make (version 3.74)

- -

Environment Variables:

-

On NT the environment Variables are set as follows, (from = -Control Panel-> System -> Environment)

-

I added following Environment variable entries to PATH

- -

C:\Perl\bin\;

-

C:\tornado\host\x86-win32\bin;

-

C:\tornado\host\x86-win32\powerpc-wrs-vxworks\bin;

-

C:\tornado\host\x86-win32\lib\gcc-lib\powerpc-wrs-vxworks\cygnus-2.7.= -2-960126;

-

C:\Corba\Ace_wrappers\bin;

-

C:\Cygwin\bin;

-

C:\Cygwin\usr\bin;

-

C:\bin

- -

Additional Environmental variables and the values,

-

CPU=PPC860

-

LD_LIBRARY_PATH=

-

SHELL=/bin/sh.exe

- -

ACE_ROOT=/Corba/ACE_wrappers

-

WIND_BASE=/tornado

-

SHELL=/bin/sh.exe

-

TERM=pcbios

-

TAO_ROOT=/Corba/ACE_wrapper/Tao

-

CPP_LOCATION=/Program Files/Microsoft Visual = -Studio/VC98/Bin/CL.exe

-

GCC_EXEC_PREFIX=/tornado/host/x86-win32/lib/gcc-lib/

-

WIND_HOST_TYPE=x86-win32

-

PERL_PATH=/perl/bin/perl.exe

- -

Directories of importance

-

C:\Corba <-- Ace_wrappers (uzipped)

-

C:\tornado <-- Tornado installed

-

C:\Perl <-- Perl installed

-

C:\Cygwin <-- Cygwin installed

-

C:\bin <-- Copy these files,

-

Ace.dll, <-- After you build Ace

-

gperf.exe <-- After you build gperf

-

Cygwin1.dll, <-- After you install Cygwin

-

perl.exe, <-- After you install Perl

-

rm.exe <-- After you install Cygwin

-

sh.exe <-- After you install Cygwin

-

true <-- After you install Cygwin

-

Create Files

-

1) C:\Corba\ACE_Wrappers\ace\config.h

-

with entry

-

#if defined (_MSC_VER) || (__BORLANDC__)

-

#include "ace/config-win32.h"

-

#undef ACE_HAS_EXCEPTIONS

-

#else

-

#include "ace/config-vxworks5.x.h"

-

#define ACE_HAS_IP_MULTICAST

-

#endif

- -

2) C:\Corba\ACE_wrappers\include\makeinclude\platform_macros.GNU

-

WIND_BASE = /tornado

-

WIND_HOST_TYPE = x86-win32

-

include = -$(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU

-

ACE_COMPONENTS=FOR_TAO (you may choose this option to build ACE = -library that supports TAO)

- -

 

-

Steps to Build

-

1) Build Ace.dll under NT

-

In MS Visual C++ open C:\Corba\ACE_wrappers\ace.dsw And build Ace = -DLL

-

Copy Ace.dll in C:\bin

- -

2) Build gperf utility under NT

-

In MS Visual C++ open = -C:\Corba\ACE_wrappers\apps\gperf\src\gperf.dsw. Build gperf.exe

-

Copy gperf.exe to C:\bin

- -

3) Mount Directries in Cygwin

-

Click on Cygnus Solutions -> Cygwin Bash Shell

-

Mount following directories by using mount command.

-

create respective directories first then use mount command

- -

e.g. Create /Corba directory then use $mount -s "C:\Corba" = -/Corba

- -

C:\Corba mount to /Corba

-

C:\tornado mount to /tornado

-

C:\Perl mount to /perl

-

C:\Cygwin mount to /cygwin

-

C:\bin mount to /bin

-

C:\Program Files mount to /Program Files

- -

4) Build ACE in Cygwin

-

$cd /Corba/ACE_wrappers/ace

-

$make static_libs=1

-

This will build your ace library libACE.a for VxWorks. If you use = -option shared_libs=1 then the build will be libACE.so. The other = -options are same as follows.

- -

5) Build TAO in Cygwin

-

$cd $TAO_ROOT/tao

-

$make debug=0 optimize=1 static_libs_only=1 minimum_orb=1 = -

-

for shared libs use shared_libs=1

- -

The minimum Tao does not have following components,

-

Dynamic Skeleton Interface

-

Dynamic Invocation Interface

-

Dynamic Any

-

Interceptors

-

Interface Repository

-

Advanced POA features

-

CORBA/COM interworking

- -

You may play around with above options to find suitable build for = -your needs. For example when you give option debug=1 all the debug = -symbols will be created and the build will huge in size. The debug = -symbols are necessary when you want to debug your code.

- - -
-

Building and Installing ACE Network Services

- -The following explains how to build the ACE network services on UNIX and Win32. - -


-

Building and Installing ACE Network Services on UNIX

- -Building and installing ACE Network Services on UNIX is relatively -simple (the process for Win32 is different). -Here's what you need to do:

- -

    - -
  1. Build and install ACE on UNIX as described earlier. If ACE is built at the root of the ACE - source tree (and ACE has been ported to your platform, of course) the - netsvcs static and shared object libraries should be built - automatically. In addition, the server driver program - (main) contained in $ACE_ROOT/netsvcs/servers/main.cpp - should also be compiled and ready to run.

    - -

  2. Set your LD_LIBRARY_PATH environment variable to where the binary - version of the ACE netsvcs library. For example, you probably - want to do something like the following

    - -

    
    -      % setenv LD_LIBRARY_PATH $ACE_ROOT/ace:$LD_LIBRARY_PATH
    -      

    - -

  3. By default, if the shared object library is built, the services - are linked into the main driver program dynamically. - To specify which services should be linked in and executed, edit the - $ACE_ROOT/netsvcs/servers/svc.conf - file. During your editing, you should update information (such as the - default service port numbers) that affects the initialization of - services in this file. Refer to the - Service Configurator - documentation to learn how the configuration file is parsed and - how the services are dynamically linked and executed. In - addition, refer to the Network - Services documentation to learn more about how to configure - each network service.

    - -

  4. If you only want to link the services statically, simply remove - or rename the svc.conf file.

    -

- -


-

Building and Installing ACE on RTEMS

- -
-export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP
-# setup the build structure
-cd ACE_wrappers
-
-# create the host (e.g. Linux in this case) build tree
-./bin/create_ace_build Linux_g++
-cd build/Linux_g++/ace
-ln -s ../../../ace/config-linux.h config.h
-cd ../include/makeinclude
-ln -s ../../../../include/makeinclude/platform_linux.GNU platform_macros.GNU
-cd ../../../..
-
-# create the target build tree
-./bin/create_ace_build rtems
-cd build/rtems/TAO
-/bin/rm -r TAO_IDL
-ln -s ../../Linux_g++/TAO/TAO_IDL .
-cd ../ace
-ln -s ../../../ace/config-rtems.h config.h
-cd ../include/makeinclude
-ln -s ../../../../include/makeinclude/platform_rtems.x_g++.GNU platform_macros.GNU
-cd ../../../..
-
-# build the host side of things
-cd build/Linux_g++
-export ACE_ROOT=`pwd`; export LD_LIBRARY_PATH=`pwd`/ace:$LD_LIBRARY_PATH
-cd ace
-make
-
-# optionally build the ACE tests
-cd ../tests
-make
-
-cd ../TAO
-make
-
-# build the target side of things
-cd ../rtems
-export ACE_ROOT=`pwd`
-cd ace
-make
-cd ../tests
-# build rtems_init.o by hand
-make -f  ../include/makeinclude/Makefile.rtems rtems_init.o
-make
-cd ../TAO
-make
-
- -


-

Building and Installing ACE Network Services on Win32

- -Once again, there are supplied project for MSVC 5.0 or later for -the Network Services.

- -


-

Building and Installing The ACE_SSL Library

- -

The first step for all platforms is to build and install the -OpenSSL distribution. Then the -ACE_SSL library must be built according to the instructions -below.

-

Unix

-
    -
  1. Make sure the OpenSSL header file directory is in your compiler's - include path, and that OpenSSL libraries are in your library link/load - path (e.g. - LD_LIBRARY_PATH). If you - installed OpenSSL into a set of directories unknown by the compiler, - then set the following variables in your - platform_macros.GNU - file: -

    - - - - - - - - - - - - -
    PLATFORM_SSL_CPPFLAGSPlatform preprocessor options for OpenSSL (e.g. -I...)
    PLATFORM_SSL_LDFLAGSPlatform linker options for OpenSSL (e.g. -L...)
    PLATFORM_SSL_LIBSPlatform libraries required with OpenSSL (e.g. -lssl -lcrypto)
    -
    -

  2. -
  3. Build ACE as described above. When building ACE, add - "ssl=1" - to your make - command line invocation, or add it to your - platform_macros.GNU - file.
  4. -
  5. Build the ACE_SSL library in the $ACE_ROOT/ace/SSL - directory. The ACE_ROOT environment variable should be set - prior to this point.
  6. -
-

Microsoft Visual Studio

-
    -
  1. Set the OpenSSL include/header directory path under the - Directories tab - Include Files setting in - the Tools->Options dialog. A typical value would be - something like: openssl-0.9.6\inc32
  2. -
  3. Set the OpenSSL library directory path under the - Directories tab - Library Files setting in - the Tools->Options dialog. A typical value would be - something like: openssl-0.9.6\out32dll
  4. -
  5. Open the ACE.dsw workspace, and refer to the ACE build - and installation instructions above for details on creating a - config.h configuration header for this platform. Once - the config.h file has been created, build the - ACE_SSL project.
  6. -
-

Borland C++

-

Support for building TAO's SSLIOP pluggable protocol with Borland C++ - does exist. First get a patch for the Open SSL makefile from - http://www.tenermerx.com/tao_bcb/index.html. Then build the OpenSSL - library. When you use the DLL version of ACE+TAO you have to build a DLL - version of OpenSSL. Then you must set the environment variable SSL_ROOT - to the location of your OpenSSL and then build ACE and TAO as normally. -

- - -

-

What Do I Need to Build for TAO?

-Toshio Hori <toshi@etl.go.jp> provided these suggestions on building -just what's needed for (a subset of) TAO:

- -I usually make: -

-    $ACE_ROOT/ace,
-    $ACE_ROOT/apps/gperf,
-    $TAO_ROOT/tao,
-    $TAO_ROOT/TAO_IDL, and
-    $TAO_ROOT/orbsvcs/orbsvcs
-
-and the whole make takes less than an hour on my Solaris 7 for intel, -Pentium-III/550MHz, 256MB memory, 512MB swap machine. (Top secret: I -renice the 'make' process to the highest priority, -20... ;-) - -To save time and space, I set -
-    TAO_ORBSVCS = Naming Time Trader ImplRepo
-
-in $ACE_ROOT/include/makeinclude/platform_macros.GNU also. See -TAO's orbsvcs -library customization instructions for more information.

- - -


System Resource -Requirements

The amount of system resources required to build -ACE and TAO varies greatly. The required system resources are -influenced by OS and compiler platform, build options, and component -configurations. As a rough guide, the typical peak memory requirement -can be well over 256 MB (notably, for TAO's orbsvcs). Depending on -your OS and compiler configuration, an entire build -of ACE and TAO can use well over 2 MB of disk space. It's usually not -necessary to build all of ACE and TAO, though.

- -Much less disk space is required for just the libraries. For example, -see the ACE -library subset sizes.

- -If you run out of memory when building, you might consider trying -some or all of these suggestions:

-

- - -

-

Advanced Topics

- - - -


-

Non-static -ACE_Object_Manager

The ACE_Object_Manager can be instantiated -as a static object, can be instantiated on the stack of the main -program thread, or can be explicitly instantiated and destroyed by the -application with ACE::init () and ACE::fini -(). The comments in the header -file, ace/Object_Manager.h provide more detail.

- -NOTE: -Special requirements are imposed on applications if the -ACE_Object_Manager is instantiated, by ACE, on the stack of the main -thread. This behavior is selected by defining -ACE_HAS_NONSTATIC_OBJECT_MANAGER in -ace/config.h. Again, see the ACE Object_Manager header file, -ace/Object_Manager.h for more information. One of -these requirements is discussed here, because it is so important. -Please note that ACE_HAS_NONSTATIC_OBJECT_MANAGER is -defined in the distributed ACE config.h headers for -VxWorks and Win32.

- -The important requirement is that the program must -declare its main function with two arguments, even if -they're not used, and with int return type: - -


-int
-main (int, char *[])
-
- -If you don't declare main exactly that -way, then you'll see a link error about ace_main_i being -undefined.

- -Alternatively, this feature can be disabled by commenting out the -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER in the -ace/config.h. But, that will make repeated testing more -difficult on VxWorks. And, you'd either have to call static -constructors and destructors manually or unload/load the program -between runs. On Win32, disabling the feature can possibly lead to -shutdown difficulties.

- -WARNING: -ACE_HAS_NONSTATIC_OBJECT_MANAGER assumes that your -main function is named main. Any violation -of this assumption is at your peril. If you really need to call your -entry point something other than main, you'll need to -construct and destroy the ACE_Object_Manager. The best way to do that -is to call ACE::init () and ACE::fini (). -Or, see the #define of main (int, char *[]) -in ace/OS.h to see how ACE does -that for entry points named main. - -


-

Cloning the Source Tree

- -On UNIX platforms, we typically like to support multiple platform -builds using the same ACE source tree. This idiom is supported by ACE -using the $ACE_ROOT/bin/create_ace_build script or -$ACE_ROOT/bin/clone.cpp program. - -To use build and use the clone program, first make sure there's a file -called platform_macros.GNU that contains the correct platform-specific -Makefile configurations in the $ACE_ROOT/include/makeinclude/ -directory, as well as making sure there's a $ACE_ROOT/ace/config.h -file that includes the desired platform/compiler specific -configuration header. Then perform the following steps:

- -

-% cd $ACE_ROOT/bin
-% make
-% mv clone ~/bin
-% rehash
-

- -Then create a ./build subdirectory someplace, e.g., under $ACE_ROOT. -Once this is done, then invoke the top-level Makefile with the -"clone" target, e.g.:

- -

-% cd $ACE_ROOT
-% mkdir build-SunOS5
-% cd build-SunOS5
-% make -f ../Makefile clone
-% setenv ACE_ROOT $cwd
-% make
-

- -This will establish a complete tree of links. In addition, make sure -you set your LD_LIBRARY_PATH to $ACE_ROOT/ace:$LD_LIBRARY_PATH on SVR4 -UNIX platforms.

- -When you do a make in the $ACE_ROOT directory you will be producing -object code that is not stored in the same place as the original -source tree. This way, you can easily build another platform in a -parallel tree structure.

- - VERY IMPORTANT!

- -If you use the "clone trick" discussed above, make sure that the -symbolic links are correctly in place before starting the build. In -particular, if you plan to clone the tree, it is preferable to do so -before you start a build procedure on the original tree. This is -because the build procedure create object directories (.obj and -.shobj) and the cloning procedure will clone these directories also. -You would end up with links pointing to object files of another -platform. If you clone the tree after you've done a build on the -original tree, make sure to remove all ".obj", ".shobj" and (any other -files or directories) in all subdirectories before starting the build -on your cloned tree.

- -Alternatively, the perl script -ACE_wrappers/bin/create_ace_build can be used to create -build trees. It creates them below ACE_wrappers/build. -It filters out all but the necessary files, so the warning above does -not apply. See the comments at the top of the script itself for usage -information. - -


-

Additional Build Tips for MVS

- -For all intents and purpose, MVS OpenEdition (OE) is another flavor of -UNIX, therefore, the instructions under Building -and Installing ACE on Unix can be used along with the following -additional tips:

- -You can get a copy of GNU make that has been ported to MVS OpenEdition from -the IBM OpenEdition web site. -ACE's make scheme generates compile commands that have options and -operands interspersed. By default, the c89/cc/c++ compiler expects all options to -precede all operands. To get around this, you must set a special -compiler environment variable (_CXX_CCMODE) to 1 which tells the compiler -to allow options and operands to be interspersed.

- -Note that the environment variable LD_LIBRARY_PATH is called LIBPATH -on MVS.

- -Shared objects are built a little different on MVS than on -other UNIX implementations. This has been accounted for in the makefiles -that come with ACE When the linker (via the cxx command) builds the -libACE.so file it will also create a file called libACE.x. This is a -side-deck file and it must be included in subsequent link edits with -application code. For more information on this see the C/C++ MVS -Programming Guide. If you want to build your application statically, -i.e., using libACE.a instead of libACE.so, you can set ACELIB to -ACELIB_STATIC in platform_mvs.GNU.

- -When the libACE.so file is built (via the MVS pre-linker and binder), you -will get a rc=4 from the pre-linker. This is ok. This is due to some -warnings about unresolved references which should get resolved during the -link step. Note, however, there shouldn't be any unresolved references -from the binder (linkage editor). You can get pre-link and link maps by -uncommenting the PMAP and LMAP lines in the platform_mvs.GNU file. - -


-

Makefile Flags

- -GNU make provides many options to customize its operation. See its -documentation for more information. One example is that for multi-cpu -UNIX machines you will be able to build faster if you use:

- -


-% make -j n
-

- -which allows parallel compilation. The number n should -typically be the number of CPUs. It is likely that builds will be -faster even on single-CPU UNIX machines with make -j -2.

- -ACE further supports the following flags. They can be enabled either -on the command line, e.g., "make purify=1", or added to your -platform_macros.GNU. To disable the option, set the flag to null, -e.g., "make debug=". Some flags support setting to 0 disable, e.g., -"make debug=0". debug=1 is enabled in the platform files that are -released with ACE.

- -Please note that the effects of a flag may be platform specific. -Also, combinations of certain flags may or may not be allowed on -specific platforms, e.g., debug=1 opt=1 is supported by g++ but -not all other C++ compilers.

- -If you use Purify or Quantify: purify or quantify must -be on your PATH. By default, ACE puts the Purify/Quantify -caches below /tmp. To override that, set the -PURE_CACHE_BASE_DIR variable, either in your environment -or on the make make command line, to the destination -directory for your instrumented libraries.

- -

-Flag             Description
-----             -----------
-debug            Enable debugging; see DCFLAGS and DCCFLAGS.
-exceptions       Enable exception handling (not supported by all platforms).
-include_env      Support old-style ACE_TRY_ENV declarations in methods.
-                 This switch is necessary for compiling TAO applications
-                 in the native exception configuration that were written
-                 for TAO versions before 1.2.2.
-                 In TAO 1.2.2, new macros were introduced that supercede
-                 the direct ACE_TRY_ENV declarations. These are the
-                 ACE_ENV_ARG macros that are defined in ace/CORBA_macros.h
-                 and are documented in docs/exceptions.html.
-                 This switch only affects the exceptions=1 configuration.
-                 It is for backward compatibility only.
-                 There will be warnings about unused _ACE_environment_variable
-                 parameters when using include_env=1.
-                 If possible, do not use it, but instead change your TAO
-                 applications to use the ACE_ENV_ARG macros.
-fast             Enable -fast option, e.g., with Sun C++.
-inline           Enable ACE inlining.  Some platforms enable inlining by
-                   default, others do not.
-optimize         Enable optimization; see OCFLAGS and OCCFLAGS.
-pace             Enable PACE as the underpinnings of ACE_OS.
-probe            Enable ACE_Timeprobes.
-profile          Enable profiling; see PCFLAGS and PCCFLAGS.
-purify           Purify all executables.
-quantify         Quantify all executables.
-repo             Use GNU template repository (g++ with repo patches and
-                   egcs only).
-rtti             Enable run-time type identification.  On some platforms,
-                   it is enabled by default, so this is ignored.
-shared_libs      Build shared libraries. Ignored if static_libs_only is set.
-static_libs      Build shared libraries. Ignored if shared_libs_only is set.
-shared_libs_only Only build shared libraries.  Ignored if no SHLIBs are
-                   specified by the Makefile, as in performance-tests/Misc.
-static_libs_only Only build static libraries.
-threads          Build with thread support.
-xt_reactor       Build the XtReactor.
-fl_reactor       Build the FlReactor.
-tk_reactor       Build the TkReactor.
-qt_reactor       Build the QtReactor.
-gtk_reactor      Build the GtkReactor.
-ssl              Build with OpenSSL support.
-rapi             Build with RAPI
-split            Build the library by first splitting up the ACE source
-                   to several files, with one object code entity for each
-                   source file. This allows an application that is linked
-                   with ACE to extract _exactly_ what it needs from the
-                   library, resulting in a smaller executable.  Setting this
-                   to 1 overrides debug to 0.
-
-Usually, users do not need to be concerned with make targets.
-Just enter "make" on the command line to build.  A few notable
-targets are listed below.
-
-Target             Description
-------             -----------
-show_statics       Lists all static objects in object files built for
-                     current directory.  Only supported for g++.
-show_uninit        Lists all uninitialized in object files built for
-                     current directory.  Only supported for g++.
-
-
-

- -Back to the ACE -home page. - - - - diff --git a/ACE-install.sh b/ACE-install.sh deleted file mode 100644 index 76c1e8064f7..00000000000 --- a/ACE-install.sh +++ /dev/null @@ -1,356 +0,0 @@ -#!/bin/sh -########################## Begin Install Script ########################## -# -# NAME: ACE-install.sh -# -# PURPOSE: Bourne shell script to install ACE for UNIX platforms -# -# AUTHOR: Ajit Sagar -# -# HISTORY: 5/20/96 Ajit Sagar Created -# x/xx/xx xxxxxxxxxxxxxx Modified -# x/xx/xx xxxxxxxxxxxxxx Modified -# -# DESCRIPTION: This script installs the ACE toolkit for a Unix system. -# Before using this script, you must do the following: -# -# NOTES: 1) Download the gzipped version of ACE from -# http://www.cs.wustl.edu/~schmidt/ (Select "Obtaining ACE") -# OR -# ftp from wuarchive.wustl.edu in the /languages/c++/ACE directory -# -# The local directory to which this will be downloaded is -# refered to as the "MY_ACEDIR" in this script. -# -# 2) Make sure there is only one file that matches "ACE*tar*". -# This should be the one you just downloaded. -# remove older versions of tar files downloaded earlier. -# -# 3) At the end of this script, you should have: -# -# a) A compiled toolkit in the $ACE_ROOT directory -# b) If you selected to save the existing installation, -# a file oldACE.tar.gz will be created in MY_ACEDIR -# c) The gzipped ACE source file that was initially downloaded. -# -# 4) This script may be executed without user interaction -# by using the "auto" option (see USAGE section below). -# It is advisable to execute it without the "auto" option the -# first time to make sure everything works. -# -# THE FOLLOWING NEED TO BE DONE ONLY THE FIRST TIME THIS -# SCRIPT IS RUN: -# -# 5) Read the README file in -# http://www.cs.wustl.edu/~schmidt/ACE.html directory -# -# 6) Define an environment variable ACE_ROOT the -# defines which directory your ACE toolkit is to be -# installed in. -# -# DO NOT MAKE "ACE_ROOT" THE SAME AS "MY_ACEDIR". -# -# 7) Redefine "MY_ACEDIR" in this script to default -# to the directory in which you have downloaded the ACE source. -# -# 8) This script has been tested on Solaris 2.x for the -# Sun C++4.0 compiler. To use this on some other UNIX -# platform, uncomment and redefine the following -# in this script: -# -# MY_ACE_CONFIG -# MY_ACE_GNU_MACROS -# -# Check the README file to define these variables. If -# these are not defined, the script will prompt you -# help you to change these variables. But in that case -# you cannot run with the "auto" option. -# -# -# USAGE: myacemaker [ auto ] -# -# auto automatic make (no user interaction) -# -# Under this option, the source will be -# extracted and compiled without any user interaction, -# i.e., you can kick off this script, go home, -# and check it in the morning. The following -# assumptions are made: -# -# 1) MY_ACE_DIR is properly defined in this script. -# 2) MY_ACE_CONFIG is properlly defined -# in this script. -# 3) MY_ACE_GNU_MACROS is properly defined in this -# script. -# 4) A backup of existing installation -# is to be made. -# -# COPYRIGHT INFORMATION: -# -# You are free to do anything you like with this script such as -# including it in commercial software. You may modify it and freely redistribute -# it. The author accepts no responsibility for any bugs or problems that -# arise as a consequence of using this code. -# -# -- Ajit Sagar -# -######################################################################### -# -ACE_ERRFILE=/tmp/myacemaker.err -OLD_ACE_TAR_FILE=oldACE.tar -OLD_ACE_GZIPPED_TAR_FILE=oldACE.tar.gz -USAGE=" : myacemaker [ auto ]" -# -############################################################## -# -# Platform-specific definitions -# -############################################################## - -# Directory where ACE-x.x.xx.tar.gz is located - -MY_ACEDIR=${HOME}/aceconfig - -####################################################### -# Platform specific config file in ${ACE_ROOT}/ace/ -# Uncomment and redefine this -####################################################### - -# MY_ACE_CONFIG=config-sunos5.4-sunc++-4.x.h - -####################################################### -# Platform specific GNU macros file in -# ${ACE_ROOT}/include/makeinclude/ -# Uncomment and redefine this -####################################################### - -# MY_ACE_GNU_MACROS=platform_sunos5_sunc++.GNU - - -############################################################## -# -# Main Script For Installing ACE -# -############################################################## - -AUTO="$#" - -ACE_ROOT=${ACE_ROOT:?"ERROR: Environment variable ACE_ROOT not set"} -if [ ${AUTO} -gt 1 ] -then - echo "$USAGE" - exit 1 -fi - -if [ ${AUTO} -eq 1 ] -then - if [ $1 != "auto" ] - then - if [ $1 = "nounzip" ] ; then - UNZIP=0 - AUTO=0 - else - echo "$USAGE" - exit 2 - fi - fi -fi - -echo "" -echo "ACE source in `ls ${MY_ACEDIR}/ACE*tar.gz`" -echo "ACE will be installed in ${ACE_ROOT}" -echo "" - -if [ $AUTO -eq 0 ] -then - echo "OK to continue? [Y/N] : \c" - read choice -else - choice='Y' -fi - -if [ ${choice} != 'Y' -a ${choice} != 'y' ] -then - echo "" - echo "ACE installation aborted" - echo "" - exit 11 -fi - -cd ${MY_ACEDIR} - -echo "Uncomressing ACE archive and extracting ACE files" -echo "into `pwd`/ACE_wrappers directory ..." -echo "" - -gunzip -c ACE*tar.gz | tar xvf - || \ -{ - echo "" - echo "gunzip or tar failed. Aborting script !!" - echo "" - exit 33 -} - -if [ -d ${ACE_ROOT} ] -then - - if [ $AUTO -eq 0 ] - then - echo "Save a copy of existing ACE installation? [Y/N] : \c" - read choice - echo "" - else - choice='Y' - fi - - if [ ${choice} = 'Y' -o ${choice} = 'y' ] - then - - echo "Archiving ${ACE_ROOT} to `pwd`/${OLD_ACE_TAR_FILE} using ..." - tar cvpf ${OLD_ACE_TAR_FILE} ${ACE_ROOT} - echo "" - - if [ -f ${OLD_ACE_GZIPPED_TAR_FILE} ] - then - echo "Removing ${OLD_ACE_GZIPPED_TAR_FILE} ..." - rm ${OLD_ACE_GZIPPED_TAR_FILE} - echo "" - fi - - echo "Compressing ${OLD_ACE_TAR_FILE} using ..." - gzip -9 ${OLD_ACE_TAR_FILE} - echo "" - - fi - - echo "Removing ${ACE_ROOT} ..." - rm -r ${ACE_ROOT} - echo "" -fi - -echo "Moving `pwd`/ACE_wrappers to ${ACE_ROOT} ..." -mv ./ACE_wrappers ${ACE_ROOT} -echo "" - -cd ${ACE_ROOT}/ace - -if [ ${MY_ACE_CONFIG:-undefined} = undefined ] -then - - if [ $AUTO -eq 1 ] - then - if [ ! -f ${MY_ACE_CONFIG} ] - then - echo "" - echo "${MY_ACE_CONFIG} does not exist. Aborting script ..." - echo "" - exit 44 - fi - fi - - echo "Select one of the following files for linking to config.h" - echo "" - echo "`ls config*h`" - echo "" - - echo "Type the filename for your compiler: \c" - read MY_ACE_CONFIG - echo "" - - if [ ! -f ${MY_ACE_CONFIG} ] - then - echo "" - echo "${MY_ACE_CONFIG} does not exist. Aborting script ..." - echo "" - exit 55 - fi - -fi - - -echo "Creating link config.h for ${MY_ACE_CONFIG} in directory `pwd` ..." - -rm ./config.h -ln -s ${MY_ACE_CONFIG} config.h - -echo "" - -cd ${ACE_ROOT}/include/makeinclude - -if [ ${MY_ACE_GNU_MACROS:-undefined} = undefined ] -then - - if [ $AUTO -eq 1 ] - then - if [ ! -f ${MY_ACE_GNU_MACROS} ] - then - echo "" - echo "${MY_ACE_GNU_MACROS} does not exist. Aborting script ..." - echo "" - exit 66 - fi - fi - - echo "Select one of the following files for linking to config.h" - echo "" - echo "`ls platform*GNU`" - echo "" - echo "Type the filename for your compiler: \c" - - read MY_ACE_GNU_MACROS - echo "" - - if [ ! -f ${MY_ACE_GNU_MACROS} ] - then - echo "" - echo "${MY_ACE_GNU_MACROS} does not exist. Aborting script ..." - echo "" - exit 77 - fi - -fi - -echo "Creating link platform_macros.GNU for ${MY_ACE_GNU_MACROS}" -echo "in directory `pwd` ..." - -rm ./platform_macros.GNU -ln -s ${MY_ACE_GNU_MACROS} platform_macros.GNU - -echo "" - -if [ ${AUTO} -eq 0 ] -then - echo "Make ACE now with default setup? [Y/N] : \c" - read choice - echo "" -else - choice='Y' -fi - -if [ ${choice} != 'Y' -a ${choice} != 'y' ] -then - echo "" - echo "ACE make skipped. You can use to make ACE later" - echo "" - exit 0 -fi - -echo "" -echo "Making ACE now. Examine file ${ACE_ERRFILE} for errors ..." -echo "" - -cd ${ACE_ROOT} - -echo "" -echo "Executing ..." -echo "" -gmake | tee ${ACE_ERRFILE} 2>&1 - -echo "" -echo "Examine file ${ACE_ERRFILE} for possible errors ..." -echo "" -echo "********** End of myacemaker script !!! ***********" -echo "" - -# -######################################################################### diff --git a/ACEXML/ACEXML.dsw b/ACEXML/ACEXML.dsw deleted file mode 100644 index 096b5e0916d..00000000000 --- a/ACEXML/ACEXML.dsw +++ /dev/null @@ -1,71 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ACEXML_Parser"=.\parser\parser\Parser.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name XML_Common - End Project Dependency -}}} - -############################################################################### - -Project: "Debug_Validator"=.\PARSER\DEBUG_VALIDATOR\Debug_Validator.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name XML_Common - End Project Dependency -}}} - -############################################################################### - -Project: "XML_Common"=.\COMMON\XML_Common.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "XML_Svc_Conf_Parser"=.\apps\svcconf\XML_Svc_Conf_Parser.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ACEXML/Makefile b/ACEXML/Makefile deleted file mode 100644 index ccba2b77d1c..00000000000 --- a/ACEXML/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the client programs that test the ACE network services -#---------------------------------------------------------------------------- - -DIRS = common \ - parser \ - apps \ - tests \ - examples - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/ACEXML/Makefile.bor b/ACEXML/Makefile.bor deleted file mode 100644 index 85ed6f2c300..00000000000 --- a/ACEXML/Makefile.bor +++ /dev/null @@ -1,10 +0,0 @@ -# -# Makefile for building the ACE XML Library -# - -DIRS = \ - common \ - parser \ - apps - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/ACEXML/README b/ACEXML/README deleted file mode 100644 index 1e65588029e..00000000000 --- a/ACEXML/README +++ /dev/null @@ -1,17 +0,0 @@ -$Id$ - -ACE XML PARSER Framework README file - -* Character set - -ACE XML only deal with pure unicode encoding. I.e., ACE XML -does not care about language specific encoding information. - -* SAX - The Simple API for XML - -ACE XML Parser interfaces follows the the design of SAX 2.0, which is -a public domain specification for Java. The major difference between -ACE XML Parser interfaces and SAX is that we added an reference of -ACEXML_Env to every SAX method to accomodate platforms/compilers that -don't support C++ exceptions. SAX is defined by David Megginson - diff --git a/ACEXML/apps/Makefile b/ACEXML/apps/Makefile deleted file mode 100644 index a5f05b99ae5..00000000000 --- a/ACEXML/apps/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the client programs that test the ACE network services -#---------------------------------------------------------------------------- - -DIRS = svcconf - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/ACEXML/apps/Makefile.bor b/ACEXML/apps/Makefile.bor deleted file mode 100644 index 1da5c84407c..00000000000 --- a/ACEXML/apps/Makefile.bor +++ /dev/null @@ -1,8 +0,0 @@ -# -# Makefile for building the ACE XML Library -# - -DIRS = \ - svcconf - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/ACEXML/apps/XML_Apps.dsw b/ACEXML/apps/XML_Apps.dsw deleted file mode 100644 index 0ed29a77e72..00000000000 --- a/ACEXML/apps/XML_Apps.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "XML_Svc_Conf_Parser"=.\svcconf\XML_Svc_Conf_Parser.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ACEXML/apps/svcconf/Makefile b/ACEXML/apps/svcconf/Makefile deleted file mode 100644 index e291d22d14a..00000000000 --- a/ACEXML/apps/svcconf/Makefile +++ /dev/null @@ -1,400 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the server-side ACE network services -#---------------------------------------------------------------------------- - -LIB = libACEXML_XML_Svc_Conf_Parser.a -SHLIB = libACEXML_XML_Svc_Conf_Parser.$(SOEXT) - -FILES = Svcconf_Handler \ - Svcconf - -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -LIBS += -lACEXML_Parser -lACEXML $(ACELIB) - -BUILD = $(VLIB) $(VSHLIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Svcconf_Handler.o .obj/Svcconf_Handler.so .shobj/Svcconf_Handler.o .shobj/Svcconf_Handler.so: Svcconf_Handler.cpp Svcconf_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/ARGV.h $(ACE_ROOT)/ace/ARGV.i \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp - -.obj/Svcconf.o .obj/Svcconf.so .shobj/Svcconf.o .shobj/Svcconf.so: Svcconf.cpp Svcconf.h $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \ - $(ACE_ROOT)/ACEXML/common/XMLReader.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \ - $(ACE_ROOT)/ace/Obstack.h \ - $(ACE_ROOT)/ace/Obstack_T.h \ - $(ACE_ROOT)/ace/Obchunk.h \ - $(ACE_ROOT)/ace/Obchunk.i \ - $(ACE_ROOT)/ace/Obstack_T.i \ - $(ACE_ROOT)/ace/Obstack_T.cpp \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.i Svcconf_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ACEXML/common/FileCharStream.h \ - $(ACE_ROOT)/ACEXML/common/Encoding.h \ - $(ACE_ROOT)/ACEXML/common/StrCharStream.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/apps/svcconf/Makefile.bor b/ACEXML/apps/svcconf/Makefile.bor deleted file mode 100644 index 0f40444b564..00000000000 --- a/ACEXML/apps/svcconf/Makefile.bor +++ /dev/null @@ -1,20 +0,0 @@ -# Makefile for building the parser - -NAME = ACEXML_XML_Svc_Conf_Parser - -OBJFILES = \ - $(OBJDIR)\Svcconf.obj \ - $(OBJDIR)\Svcconf_Handler.obj - -CFLAGS = \ - $(ACE_CFLAGS) \ - $(ACE_XML_CFLAGS) - -CPPDIR = .;.. - -LIBFILES = \ - $(ACE_LIB) \ - $(ACE_XML_LIB) -# WE need both -lACEXML and -lACEXML_Parser here - -!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> diff --git a/ACEXML/apps/svcconf/README b/ACEXML/apps/svcconf/README deleted file mode 100644 index 8a39a40bfe3..00000000000 --- a/ACEXML/apps/svcconf/README +++ /dev/null @@ -1,4 +0,0 @@ -$Id$ - -This directory implement a DLL that contains the parser for XML based -service configurator. diff --git a/ACEXML/apps/svcconf/Svcconf.cpp b/ACEXML/apps/svcconf/Svcconf.cpp deleted file mode 100644 index 12a6f3144fc..00000000000 --- a/ACEXML/apps/svcconf/Svcconf.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// $Id$ - - -#include "Svcconf.h" -#include "ACEXML/common/FileCharStream.h" -#include "ACEXML/common/StrCharStream.h" -#include "ACEXML/parser/parser/Parser.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 0) - -extern "C" ACE_Proper_Export_Flag ACE_XML_Svc_Conf * -_ACEXML_create_XML_Svc_Conf_Object (void) -{ - ACE_XML_Svc_Conf *retp = 0; - - ACE_NEW_RETURN (retp, - ACEXML_Svcconf_Parser (), - 0); - - return retp; -} - -ACEXML_Svcconf_Parser::ACEXML_Svcconf_Parser () -{ - this->parser_.setContentHandler (&this->svcconf_handler_); - this->parser_.setDTDHandler (&this->svcconf_handler_); - this->parser_.setErrorHandler (&this->svcconf_handler_); - this->parser_.setEntityResolver (&this->svcconf_handler_); -} - -ACEXML_Svcconf_Parser::~ACEXML_Svcconf_Parser () -{ - -} - -void * -ACEXML_Svcconf_Parser::operator new (size_t s) -{ - return ::new char[s]; -} - -void -ACEXML_Svcconf_Parser::operator delete (void *p) -{ - delete[] (char*)p; -} - -int -ACEXML_Svcconf_Parser::parse_file (const ACE_TCHAR file[]) -{ - if (file == 0) - ACE_ERROR_RETURN ((LM_ERROR, "ACEXML_Svcconf_Parser: No filename specified\n"), -1); - - ACEXML_FileCharStream *fstm = 0; - ACE_NEW_RETURN (fstm, - ACEXML_FileCharStream (), - 1); - - if (fstm->open (file) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("ACEXML_Svcconf_Parser: Fail to open XML file: %s\n"), - file), - -1); - - this->input_stream_.setCharStream (fstm); - - ACEXML_TRY_NEW_ENV - { - this->parser_.parse (&this->input_stream_ ACEXML_ENV_ARG_PARAMETER); - ACEXML_TRY_CHECK; - } - ACEXML_CATCH (ACEXML_SAXException, ex) - { - ex.print (); - return -1; - } - ACEXML_ENDTRY; - return 0; -} - - -int -ACEXML_Svcconf_Parser::parse_string (const ACE_TCHAR str[]) -{ - if (str == 0) - ACE_ERROR_RETURN ((LM_ERROR, "ACEXML_Svcconf_Parser: Can't parse a null string\n"), -1); - - ACEXML_StrCharStream *stm = 0; - ACE_NEW_RETURN (stm, - ACEXML_StrCharStream (str), - -1); - - this->input_stream_.setCharStream (stm); - ACEXML_TRY_NEW_ENV - { - this->parser_.parse (&this->input_stream_ ACEXML_ENV_ARG_PARAMETER); - ACEXML_TRY_CHECK; - } - ACEXML_CATCH (ACEXML_SAXException, ex) - { - ex.print (); - return -1; - } - ACEXML_ENDTRY; - return 0; -} - -#else - -# if defined (_AIX) && \ - (defined (__IBMCPP__) && (__IBMCPP__ >= 500) && (__IBMCPP__ < 600)) -// This simply shuts up the AIX linker that complains there are no -// csects or exported symbols when building with Visual Age C++ 5. -extern "C" void ace_shut_up_aix_ld (void) {}; -# endif /* AIX && __IBMCPP__ == 500 */ - -#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ diff --git a/ACEXML/apps/svcconf/Svcconf.h b/ACEXML/apps/svcconf/Svcconf.h deleted file mode 100644 index 324bec6ec8d..00000000000 --- a/ACEXML/apps/svcconf/Svcconf.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Svcconf.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - - -#ifndef ACEXML_SVCCONF_H -#define ACEXML_SVCCONF_H - -#include "ace/pre.h" -#include "ace/XML_Svc_Conf.h" -#include "ACEXML/parser/parser/Parser.h" -#include "Svcconf_Handler.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 0) - -class ACEXML_Svcconf_Parser : public ACE_XML_Svc_Conf -{ -public: - ACEXML_Svcconf_Parser (); - - virtual ~ACEXML_Svcconf_Parser (); - - virtual int parse_file (const ACE_TCHAR file[]); - - virtual int parse_string (const ACE_TCHAR str[]); - - void * operator new (size_t bytes); - - void operator delete (void *ptr); - -protected: - ACEXML_Parser parser_; - ACEXML_Svcconf_Handler svcconf_handler_; - ACEXML_InputSource input_stream_; -}; - -#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ - -#include "ace/post.h" -#endif /* ACEXML_SVCCONF_H */ diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACEXML/apps/svcconf/Svcconf_Handler.cpp deleted file mode 100644 index 5f335c42821..00000000000 --- a/ACEXML/apps/svcconf/Svcconf_Handler.cpp +++ /dev/null @@ -1,642 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "Svcconf_Handler.h" -#include "ace/ACE.h" -#include "ace/Log_Msg.h" -#include "ace/Service_Config.h" -#include "ace/Service_Types.h" -#include "ace/Service_Repository.h" -#include "ace/DLL.h" -#include "ace/ARGV.h" -#include "ace/Module.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 0) - -#if !defined (__ACEXML_INLINE__) -# include "Svcconf_Handler.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler (void) - : in_stream_def_ (0), - in_module_ (0), - stream_svc_type_ (0), - stream_ (0) -{ - // no-op -} - -ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler (void) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::characters (const ACEXML_Char *, - int, - int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::endDocument ( ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0) - { - ACE_Parsed_Info *active_info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - - ACE_DLL svc_dll; - - if (svc_dll.open (active_info->path ()) == -1) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT("Cannot locate DLL\n"))); - } - - void *(*func) (ACE_Service_Object_Exterminator *) = 0; - ACE_Service_Object_Exterminator gobbler = 0; - void *symbol = 0; - - long temp_ptr = - ACE_reinterpret_cast(long, svc_dll.symbol (active_info->init_func ())); - func = ACE_reinterpret_cast(void *(*)(ACE_Service_Object_Exterminator *), - temp_ptr); - - if (func == 0) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Cannot locate init function\n"))); - } - symbol = (*func)(&gobbler); // target object created in the loaded DLL. - - ACE_Service_Type_Impl *stp = ACE_Service_Config::create_service_type_impl - (active_info->name (), - active_info->service_type (), - symbol, - ACE_Service_Type::DELETE_THIS | - ACE_Service_Type::DELETE_OBJ, - gobbler); - - if (this->in_stream_def_) - { -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Create dynamic %s for stream\n"), -// this->stream_info_.name ())); - if (active_info->service_type () == ACE_Service_Type::STREAM) - { - this->stream_ = (ACE_Stream_Type *) stp; - } - else - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Expecting Stream type in stream header\n"))); - } - - this->stream_svc_type_ = - ACE_Service_Config::create_service_type (this->stream_info_.name (), - this->stream_, - svc_dll, - this->stream_info_.active ()); - - } - else - { - if (this->in_module_) - { - ACE_ARGV args (active_info->init_params ()); - - ACE_Module_Type *mt = (ACE_Module_Type *) stp; - - ACE_Module *mp = (ACE_Module *) mt->object (); - - if (ACE_OS::strcmp (mp->name (), active_info->name ()) != 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), - active_info->name (), - mp->name ())); - mp->name (active_info->name ()); - } - - if (mt->init (args.argc (), args.argv ()) == -1 - || this->stream_->push (mt) == -1) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Error initializing module"))); - } - - -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Push dynamic %s into stream %s\n"), -// this->parsed_info_.name (), -// this->stream_info_.name ())); - } - else - { - ACE_Service_Type *stype = - ACE_Service_Config::create_service_type (active_info->name (), - stp, - svc_dll, - active_info->active ()); - // @@ Check error here. - - // ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply dynamic %s\n"), -// this->parsed_info_.name ())); - if (ACE_Service_Config::initialize (stype, - active_info->init_params ()) == -1) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Failed to initialize dynamic service\n"))); - } - } - this->parsed_info_.reset (); - } - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0) - { - if (this->in_stream_def_) - { - // @@ Couldn't make sense out of the original Svc_Conf.y. - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Create static %s for stream\n"), - this->stream_info_.name ())); - } - else - { - if (this->in_module_) - { - // @@ Couldn't make sense out of the original Svc_Conf.y. - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Push static %s into stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply static %s\n"), -// this->parsed_info_.name ())); - if (ACE_Service_Config::initialize (this->parsed_info_.name (), - this->parsed_info_.init_params ()) == -1) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Failed to initialize static service\n"))); - } - } - this->parsed_info_.reset (); - } - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0) - { - this->in_module_ = 0; - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0) - { -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply stream %s of type %s\n"), -// this->stream_info_.name (), -// this->stream_info_.name ())); - ACE_Service_Config::initialize (this->stream_svc_type_, - this->stream_info_.init_params ()); - - this->stream_info_.reset (); - this->stream_svc_type_ = 0; - this->stream_ = 0; - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0) - { -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply stream %s of type %s\n"), -// this->stream_info_.name (), -// this->stream_info_.name ())); - this->stream_info_.reset (); - } - else - { - } -} - -void -ACEXML_Svcconf_Handler::endPrefixMapping (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::ignorableWhitespace (const ACEXML_Char *, - int, - int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::processingInstruction (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::setDocumentLocator (ACEXML_Locator* locator) -{ - this->locator_ = locator; -} - -void -ACEXML_Svcconf_Handler::skippedEntity (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::startDocument ( ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName, - ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0) - { - this->get_dynamic_attrs (alist ACEXML_ENV_ARG_PARAMETER); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("initializer")) == 0) - { - this->get_initializer_attrs (alist ACEXML_ENV_ARG_PARAMETER); - - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0) - { - this->get_static_attrs (alist ACEXML_ENV_ARG_PARAMETER); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0) - { - this->get_stream_id (alist ACEXML_ENV_ARG_PARAMETER); - - if (ACE_Service_Repository::instance()->find - (this->stream_info_.name (), - (const ACE_Service_Type **) &this->stream_svc_type_) == -1) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Cannot find stream\n"))); - } - this->stream_ = this->stream_svc_type_ == 0 - ? 0 - : ACE_dynamic_cast (ACE_Stream_Type *, - ACE_const_cast (ACE_Service_Type_Impl *, - this->stream_svc_type_->type ())); - -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Retrieve stream %s from repository\n"), -// this->stream_info_.name ())); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0) - { - this->in_stream_def_ = 1; - // @@ Set up stream service object - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0) - { - this->in_stream_def_ = 0; - this->in_module_ = 1; - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("resume")) == 0) - { - this->get_id (alist ACEXML_ENV_ARG_PARAMETER); - if (this->in_module_) - { -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Resume %s in stream %s\n"), -// this->parsed_info_.name (), -// this->stream_info_.name ())); - ACE_Module_Type *mt = (this->stream_ == 0) - ? 0 - : this->stream_->find (this->parsed_info_.name ()); - - if (mt == 0) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Can't locate module\n"))); - } - - mt->resume (); - } - else - { -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Resume %s\n"), -// this->parsed_info_.name ())); - if (ACE_Service_Config::resume (this->parsed_info_.name ()) == -1) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Resume fail\n"))); - } - } - this->parsed_info_.reset (); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("suspend")) == 0) - { - this->get_id (alist ACEXML_ENV_ARG_PARAMETER); - if (this->in_module_) - { -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Suspend %s in stream %s\n"), -// this->parsed_info_.name (), -// this->stream_info_.name ())); - ACE_Module_Type *mt = (this->stream_ == 0) - ? 0 - : this->stream_->find (this->parsed_info_.name ()); - - if (mt == 0) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Can't locate module\n"))); - } - - mt->suspend (); - } - else - { - // ACE_DEBUG ((LM_INFO, ACE_TEXT ("Suspend %s\n"), - // this->parsed_info_.name ())); - if (ACE_Service_Config::suspend (this->parsed_info_.name ()) == -1) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Suspend failed\n"))); - } - } - this->parsed_info_.reset (); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("remove")) == 0) - { - this->get_id (alist ACEXML_ENV_ARG_PARAMETER); - if (this->in_module_) - { -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Remove %s in stream %s\n"), -// this->parsed_info_.name (), -// this->stream_info_.name ())); - ACE_Module_Type *mt = (this->stream_ == 0) - ? 0 - : this->stream_->find (this->parsed_info_.name ()); - - if (mt == 0) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Can't locate module\n"))); - } - - this->stream_->remove (mt); - } - else - { -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("Remove %s\n"), -// this->parsed_info_.name ())); - if (ACE_Service_Config::remove (this->parsed_info_.name ()) == -1) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Remove failed\n"))); - } - } - this->parsed_info_.reset (); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("ACE_Svc_Conf")) == 0) - { - // Main document tag. no-op. -// ACE_DEBUG ((LM_INFO, ACE_TEXT ("ACE_Svc_Conf tag\n"))); - } - else - { - // @@ Error. Perhaps we should relay to user event handler here, if available. - } - - return; -} - -void -ACEXML_Svcconf_Handler::startPrefixMapping (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -// *** Methods inherit from ACEXML_DTDHandler. - -void -ACEXML_Svcconf_Handler::notationDecl (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_Svcconf_Handler::unparsedEntityDecl (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -// Methods inherit from ACEXML_EnitityResolver. - -ACEXML_InputSource * -ACEXML_Svcconf_Handler::resolveEntity (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. - return 0; -} - -// Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ -void -ACEXML_Svcconf_Handler::error (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->locator_->getSystemId(), - this->locator_->getLineNumber(), - this->locator_->getColumnNumber())); - ex.print(); -} - -void -ACEXML_Svcconf_Handler::fatalError (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->locator_->getSystemId(), - this->locator_->getLineNumber(), - this->locator_->getColumnNumber())); - ex.print(); -} - -void -ACEXML_Svcconf_Handler::warning (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->locator_->getSystemId(), - this->locator_->getLineNumber(), - this->locator_->getColumnNumber())); - ex.print(); -} - -int -ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - this->stream_info_.name (alist->getValue (i)); - } - else - { - ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid stream attribute\n")), - -1); - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - this->parsed_info_.name (alist->getValue (i)); - } - else - { - ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid attribute, expecting 'id'\n")), -1); - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - if (alist != 0) - { - ACE_Parsed_Info *info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - info->name (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("status")) == 0) - { - if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("inactive")) == 0) - { - info->active (0); - } - else if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("active")) == 0) - { - info->active (1); - } - else - { - ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid attribute value, expecting 'active' or 'inactive'\n")), -1); - } - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0) - { - if (ACE_OS_String::strcasecmp (alist->getValue (i), ACE_TEXT ("service_object")) == 0) - { - info->service_type (ACE_Service_Type::SERVICE_OBJECT); - } - else if (ACE_OS_String::strcasecmp (alist->getValue (i), ACE_TEXT ("stream")) == 0) - { - info->service_type (ACE_Service_Type::STREAM); - } - else if (ACE_OS_String::strcasecmp (alist->getValue (i), ACE_TEXT ("module")) == 0) - { - info->service_type (ACE_Service_Type::MODULE); - } - else - { - ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid Service_Object attribute value\n")), -1); - } - } - else - { - ACEXML_THROW_RETURN(ACEXML_SAXException(ACE_TEXT ("Invalid attribute\n")), -1); - } - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - if (alist != 0) - { - ACE_Parsed_Info *info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("init")) == 0) - { - info->init_func (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("path")) == 0) - { - info->path (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) - { - info->init_params (alist->getValue (i)); - } - else - { - ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid initializer attribute.\n")), -1); - } - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - if (alist != 0) - { - ACE_Parsed_Info *info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - info->name (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) - { - info->init_params (alist->getValue (i)); - } - else - { - ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid static attribute.\n")), -1); - } - } - } - return 0; -} - -#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.h b/ACEXML/apps/svcconf/Svcconf_Handler.h deleted file mode 100644 index c9093f9bd7a..00000000000 --- a/ACEXML/apps/svcconf/Svcconf_Handler.h +++ /dev/null @@ -1,292 +0,0 @@ -// $Id$ - -//============================================================================= -/** - * @file Svcconf_Handler.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef ACEXML_SVCCONF_HANDLER_H -#define ACEXML_SVCCONF_HANDLER_H - -#include "ACEXML/common/DefaultHandler.h" -#include "ace/Service_Types.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 0) - -class ACE_Parsed_Info -{ -public: - ACE_Parsed_Info (); - ~ACE_Parsed_Info (); - - /** - * Set/get name of a parsed entity. - */ - int name (const ACEXML_Char *n); - const ACEXML_Char *name (void); - - /** - * Set/get type of a dynamic node. - */ - int service_type (int type); - int service_type (void); - - /** - * Set/Get active status. - */ - int active (int a); - int active (void); - - /** - * Set/get initializer path. - */ - int path (const ACEXML_Char *n); - const ACEXML_Char *path (void); - - /** - * Set/get initializer init function. - */ - int init_func (const ACEXML_Char *n); - const ACEXML_Char *init_func (void); - - /** - * Set/get initializer init parameter. - */ - int init_params (const ACEXML_Char *n); - const ACEXML_Char *init_params (void); - - /** - * Reset Parsed_Info. - */ - void reset (void); - -protected: - ACEXML_Char *name_; - int service_type_; - int active_; - ACEXML_Char *path_; - ACEXML_Char *init_func_; - ACEXML_Char *init_params_; -}; - -/** - * @class ACEXML_Svcconf_Handler - * - * @brief ACEXML_Svcconf_Handler is an example SAX event handler. - * - * This SAX event handler try to regenerate the XML document it - * reads with correct indentation. - */ -class ACEXML_Svcconf_Handler : public ACEXML_DefaultHandler -{ -public: - /* - * Default constructor. - */ - ACEXML_Svcconf_Handler (void); - - /* - * Default destructor. - */ - virtual ~ACEXML_Svcconf_Handler (void); - - // Methods inherit from ACEXML_ContentHandler. - - /* - * Receive notification of character data. - */ - virtual void characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the end of a document. - */ - virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the end of an element. - */ - virtual void endElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * End the scope of a prefix-URI mapping. - */ - virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of ignorable whitespace in element content. - */ - virtual void ignorableWhitespace (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a processing instruction. - */ - virtual void processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive an object for locating the origin of SAX document events. - */ - virtual void setDocumentLocator (ACEXML_Locator *locator) ; - - /* - * Receive notification of a skipped entity. - */ - virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the beginning of a document. - */ - virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the beginning of an element. - */ - virtual void startElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Begin the scope of a prefix-URI Namespace mapping. - */ - virtual void startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // *** Methods inherit from ACEXML_DTDHandler. - - /* - * Receive notification of a notation declaration event. - */ - virtual void notationDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of an unparsed entity declaration event. - */ - virtual void unparsedEntityDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // Methods inherit from ACEXML_EnitityResolver. - - /* - * Allow the application to resolve external entities. - */ - virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ - virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a non-recoverable error. - */ - virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a warning. - */ - virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - -protected: - /** - * Get the only attribute in or . - */ - int get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the only attribute in , , - */ - int get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the dynamic tag attributes. - */ - int get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the initializer tag attributes. - */ - int get_initializer_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the static tag attributes. - */ - int get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - -private: - /// We are parsing a stream definition - int in_stream_def_; - - /// We are defining a steam module - int in_module_; - - /// @a stream_ holds the actually Stream_Type object managed by @a stream_svc_type_. - ACE_Service_Type *stream_svc_type_; - ACE_Stream_Type *stream_; - - //ACE_SHLIB_HANDLE dll_handle_; - - ACE_Parsed_Info parsed_info_; - - ACE_Parsed_Info stream_info_; - - ACEXML_Locator* locator_; -}; - -#if defined (__ACEXML_INLINE__) -# include "Svcconf_Handler.i" -#endif /* __ACEXML_INLINE__ */ - -#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ - -#endif /* ACEXML_SVCCONF_HANDLER_H */ diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.i b/ACEXML/apps/svcconf/Svcconf_Handler.i deleted file mode 100644 index 605dec5f2f7..00000000000 --- a/ACEXML/apps/svcconf/Svcconf_Handler.i +++ /dev/null @@ -1,133 +0,0 @@ -// -*- C++ -*- $Id$ - -ACE_INLINE -ACE_Parsed_Info::ACE_Parsed_Info () - : name_ (0), - service_type_ (ACE_Service_Type::INVALID_TYPE), - active_ (1), - path_ (0), - init_func_ (0), - init_params_ (0) -{ -} - -ACE_INLINE -ACE_Parsed_Info::~ACE_Parsed_Info () -{ - delete[] this->name_; - delete[] this->path_; - delete[] this->init_func_; - delete[] this->init_params_; -} - -ACE_INLINE int -ACE_Parsed_Info::name (const ACEXML_Char *n) -{ - if (this->name_ == 0) - { - this->name_ = ACE::strnew (n); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::name (void) -{ - return this->name_; -} - -ACE_INLINE int -ACE_Parsed_Info::service_type (int type) -{ - if (this->service_type_ == -1) - { - this->service_type_ = type; - return 0; - } - return -1; -} - -ACE_INLINE int -ACE_Parsed_Info::service_type (void) -{ - return this->service_type_; -} - -ACE_INLINE int -ACE_Parsed_Info::active (int a) -{ - this->active_ = a; - return 0; -} - -ACE_INLINE int -ACE_Parsed_Info::active (void) -{ - return this->active_; -} - -ACE_INLINE int -ACE_Parsed_Info::path (const ACEXML_Char *p) -{ - if (this->path_ == 0) - { - this->path_ = ACE::strnew (p); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::path (void) -{ - return this->path_; -} - -ACE_INLINE int -ACE_Parsed_Info::init_func (const ACEXML_Char *n) -{ - if (this->init_func_ == 0) - { - this->init_func_ = ACE::strnew (n); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::init_func (void) -{ - return this->init_func_; -} - -ACE_INLINE int -ACE_Parsed_Info::init_params (const ACEXML_Char *n) -{ - if (this->init_params_ == 0) - { - this->init_params_ = ACE::strnew (n); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::init_params (void) -{ - return this->init_params_; -} - -ACE_INLINE void -ACE_Parsed_Info::reset (void) -{ - delete[] this->name_; - this->name_ = 0; - this->service_type_ = -1; - delete[] this->path_; - this->path_ = 0; - delete[] this->init_func_; - this->init_func_ = 0; - delete[] this->init_params_; - this->init_params_ = 0; -} diff --git a/ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp b/ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp deleted file mode 100644 index 7c48917d940..00000000000 --- a/ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp +++ /dev/null @@ -1,121 +0,0 @@ -# Microsoft Developer Studio Project File - Name="XML_Svc_Conf_Parser" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=XML_Svc_Conf_Parser - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "XML_Svc_Conf_Parser.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "XML_Svc_Conf_Parser.mak" CFG="XML_Svc_Conf_Parser - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "XML_Svc_Conf_Parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "XML_Svc_Conf_Parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "XML_Svc_Conf_Parser - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_SVC_CONF_PARSER_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ace.lib ACEXML.lib ACEXML_Parser.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\ACEXML_XML_Svc_Conf_Parser.dll" /libpath:"..\..\..\ace" /libpath:"..\..\Common" /libpath:"..\..\parser\parser" - -!ELSEIF "$(CFG)" == "XML_Svc_Conf_Parser - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "XML_Svc_Conf_Parser___Win32_Debug" -# PROP BASE Intermediate_Dir "XML_Svc_Conf_Parser___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_SVC_CONF_PARSER_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib ACEXMLd.lib ACEXML_Parserd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\ACEXML_XML_Svc_Conf_Parserd.dll" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\Common" /libpath:"..\..\parser\parser" - -!ENDIF - -# Begin Target - -# Name "XML_Svc_Conf_Parser - Win32 Release" -# Name "XML_Svc_Conf_Parser - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Svcconf.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svcconf_Handler.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Svcconf.h -# End Source File -# Begin Source File - -SOURCE=.\Svcconf_Handler.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/ACEXML/apps/svcconf/svcconf.mpc b/ACEXML/apps/svcconf/svcconf.mpc deleted file mode 100644 index 1bcc8b040c1..00000000000 --- a/ACEXML/apps/svcconf/svcconf.mpc +++ /dev/null @@ -1,3 +0,0 @@ -project(ACEXML_XML_Svc_Conf_Parser): acelib, acexml { - sharedname = ACEXML_XML_Svc_Conf_Parser -} diff --git a/ACEXML/common/ACEXML_Export.h b/ACEXML/common/ACEXML_Export.h deleted file mode 100644 index 39546eeafcc..00000000000 --- a/ACEXML/common/ACEXML_Export.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ACEXML_Export.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef ACEXML_EXPORT_H -#define ACEXML_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) -# if !defined (ACEXML_HAS_DLL) -# define ACEXML_HAS_DLL 0 -# endif /* ! ACEXML_HAS_DLL */ -#else -# if !defined (ACEXML_HAS_DLL) -# define ACEXML_HAS_DLL 1 -# endif /* ! ACEXML_HAS_DLL */ -#endif /* ACE_AS_STATIC_LIB */ - -#if defined (ACEXML_HAS_DLL) && (ACEXML_HAS_DLL == 1) -# if defined (ACEXML_BUILD_DLL) -# define ACEXML_Export ACE_Proper_Export_Flag -# define ACEXML_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACEXML_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ACEXML_BUILD_DLL */ -# define ACEXML_Export ACE_Proper_Import_Flag -# define ACEXML_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACEXML_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACEXML_BUILD_DLL */ -#else /* ACEXML_HAS_DLL == 1 */ -# define ACEXML_Export -# define ACEXML_SINGLETON_DECLARATION(T) -# define ACEXML_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACEXML_HAS_DLL == 1 */ - -#endif /* ACEXML_EXPORT_H */ - -// End of auto generated file. diff --git a/ACEXML/common/Attributes.h b/ACEXML/common/Attributes.h deleted file mode 100644 index 87937a5624c..00000000000 --- a/ACEXML/common/Attributes.h +++ /dev/null @@ -1,126 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Attributes.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_ATTRIBUTES_H_ -#define _ACEXML_ATTRIBUTES_H_ -#include "ace/pre.h" - -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" - -/** - * @class ACEXML_Attributes Attributes.h "ACEXML/common/Attributes.h" - * - * @brief ACEXML_Attributes defines a collection of attributes of an XML element. - * - * This is an abstract class (interface in Java) that defines - * the API for accessing attributes of an XML entity. - * - * This interface allows access to a list of attributes in three different ways: - * - * - by attribute index; - * - by Namespace-qualified name; or - * - by qualified (prefixed) name. - * - * The list will not contain attributes that were declared #IMPLIED - * but not specified in the start tag. It will also not contain - * attributes used as Namespace declarations (xmlns*) unless the - * http://xml.org/sax/features/namespace-prefixes feature is set to - * true (it is false by default). - * - * If the namespace-prefixes feature (see above) is false, access by - * qualified name may not be available; if the - * http://xml.org/sax/features/namespaces feature is false, access by - * Namespace-qualified names may not be available. - * - * This interface replaces the now-deprecated SAX1 AttributeList - * interface, which does not contain Namespace support. In addition to - * Namespace support, it adds the getIndex methods (below). - * - * The order of attributes in the list is unspecified, and will vary - * from implementation to implementation. - */ -class ACEXML_Export ACEXML_Attributes -{ -public: - /** - * Look up the index of an attribute by XML 1.0 qualified name. - */ - virtual int getIndex (const ACEXML_Char *qName) = 0; - - /** - * Look up the index of an attribute by Namespace name. - */ - virtual int getIndex (const ACEXML_Char *uri, - const ACEXML_Char *localPart) = 0; - - /** - * Return the number of attributes in the list. - */ - virtual size_t getLength (void) = 0; - - /** - * Look up an attribute's local name by index. - */ - virtual const ACEXML_Char *getLocalName (size_t index) = 0; - - /** - * Look up an attribute's XML 1.0 qualified name by index. - */ - virtual const ACEXML_Char *getQName (size_t index) = 0; - - /** - * Look up an attribute's type by index. - */ - virtual const ACEXML_Char *getType (size_t index) = 0; - - /** - * Look up an attribute's type by XML 1.0 qualified name. - */ - virtual const ACEXML_Char *getType (const ACEXML_Char *qName) = 0; - - /** - * Look up an attribute's type by Namespace name. - */ - virtual const ACEXML_Char *getType (const ACEXML_Char *uri, - const ACEXML_Char *localPart) = 0; - - /** - * Look up an attribute's Namespace URI by index. - */ - virtual const ACEXML_Char *getURI (size_t index) = 0; - - /** - * Look up an attribute's value by index. - */ - virtual const ACEXML_Char *getValue (size_t index) = 0; - - /** - * Look up an attribute's value by XML 1.0 qualified name. - */ - virtual const ACEXML_Char *getValue (const ACEXML_Char *qName) = 0; - - /** - * Look up an attribute's value by Namespace name. - */ - virtual const ACEXML_Char *getValue (const ACEXML_Char *uri, - const ACEXML_Char *localPart) = 0; -}; - -#include "ace/post.h" - -#endif /* _ACEXML_ ATTRIBUTES_H_ */ diff --git a/ACEXML/common/AttributesImpl.cpp b/ACEXML/common/AttributesImpl.cpp deleted file mode 100644 index 95eb4c2742b..00000000000 --- a/ACEXML/common/AttributesImpl.cpp +++ /dev/null @@ -1,302 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/AttributesImpl.h" - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/AttributesImpl.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_AttributesImpl::ACEXML_AttributesImpl (int size) - : attrs_ (size) -{ - this->attrs_.size (0); // attrs array contains nothing -} - -ACEXML_AttributesImpl::ACEXML_AttributesImpl (const - ACEXML_AttributesImpl &attrs) - : ACEXML_Attributes (attrs), - attrs_ (attrs.attrs_.size ()) -{ - for (size_t i = 0; i < attrs.attrs_.size (); i++) - this->attrs_[i] = attrs.attrs_[i]; -} - -ACEXML_AttributesImpl::~ACEXML_AttributesImpl (void) -{ -} - -int -ACEXML_AttributesImpl::addAttribute (const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - const ACEXML_Char *type, - const ACEXML_Char *value) -{ - if (this->isDuplicate (uri, localName, qName)) - return -1; - int length = this->attrs_.size (); - this->attrs_.size (length+1); - this->setAttribute (length, - uri, - localName, - qName, - type, - value); - return length; -} - -int -ACEXML_AttributesImpl::addAttribute (const ACEXML_Attribute &att) -{ - if (this->isDuplicate (att.uri(), att.localName(), att.qName())) - return -1; - int length = this->attrs_.size (); - this->attrs_.size (length+1); - this->attrs_[length] = att; - return length; -} - -int -ACEXML_AttributesImpl::isDuplicate (const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName) -{ - for (size_t i = 0; i < this->attrs_.size(); ++i) - { - if (ACE_OS::strcmp (this->attrs_[i].localName(), localName) == 0) - { - if (qName != 0 && this->attrs_[i].qName() != 0 - && ACE_OS::strcmp (this->attrs_[i].qName(), qName) == 0) - { - if (uri != 0 && this->attrs_[i].uri() != 0 - && ACE_OS::strcmp (this->attrs_[i].uri(), uri) == 0) - return 1; - } - } - } - return 0; -} - -int -ACEXML_AttributesImpl::removeAttribute (size_t index) -{ - size_t length = this->attrs_.size (); - - if (index >= length) - return -1; - - this->attrs_[index] = this->attrs_[length - 1]; - this->attrs_.size (length - 1); - - return 0; -} - - -int -ACEXML_AttributesImpl::getIndex (const ACEXML_Char *qName) -{ - for (size_t i = 0; i < this->attrs_.size (); i++) - if (ACE_OS::strcmp (qName, this->attrs_[i].qName ()) == 0) - return i; - - return -1; -} - -int -ACEXML_AttributesImpl::getIndex (const ACEXML_Char *uri, - const ACEXML_Char *localPart) -{ - for (size_t i = 0; i < this->attrs_.size (); i++) - if (ACE_OS::strcmp (uri, this->attrs_[i].uri ()) == 0 && - ACE_OS::strcmp (localPart, this->attrs_[i].localName ()) == 0) - return i; - - return -1; -} - -size_t -ACEXML_AttributesImpl::getLength (void) -{ - return this->attrs_.size (); -} - -const ACEXML_Char * -ACEXML_AttributesImpl::getLocalName (size_t index) -{ - if (index < this->attrs_.size ()) - return this->attrs_[index].localName (); - return 0; -} - - -const ACEXML_Char * -ACEXML_AttributesImpl::getQName (size_t index) -{ - if (index < this->attrs_.size ()) - return this->attrs_[index].qName (); - return 0; -} - -const ACEXML_Char * -ACEXML_AttributesImpl::getType (size_t index) -{ - if (index < this->attrs_.size ()) - return this->attrs_[index].type (); - return 0; -} - - -const ACEXML_Char * -ACEXML_AttributesImpl::getType (const ACEXML_Char *qName) -{ - for (size_t i = 0; i < this->attrs_.size (); i++) - if (ACE_OS::strcmp (qName, this->attrs_[i].qName ()) == 0) - return this->attrs_[i].type (); - - return 0; -} - -const ACEXML_Char * -ACEXML_AttributesImpl::getType (const ACEXML_Char *uri, - const ACEXML_Char *localPart) -{ - for (size_t i = 0; i < this->attrs_.size (); i++) - if (ACE_OS::strcmp (uri, this->attrs_[i].uri ()) == 0 && - ACE_OS::strcmp (localPart, this->attrs_[i].localName ()) == 0) - return this->attrs_[i].type (); - - return 0; -} - - -const ACEXML_Char * -ACEXML_AttributesImpl::getURI (size_t index) -{ - if (index < this->attrs_.size ()) - return this->attrs_[index].uri (); - return 0; -} - - -const ACEXML_Char * -ACEXML_AttributesImpl::getValue (size_t index) -{ - if (index < this->attrs_.size ()) - return this->attrs_[index].value (); - return 0; -} - -const ACEXML_Char * -ACEXML_AttributesImpl::getValue (const ACEXML_Char *qName) -{ - for (size_t i = 0; i < this->attrs_.size (); i++) - if (ACE_OS::strcmp (qName, this->attrs_[i].qName ()) == 0) - return this->attrs_[i].value (); - - return 0; -} - -const ACEXML_Char * -ACEXML_AttributesImpl::getValue (const ACEXML_Char *uri, - const ACEXML_Char *localPart) -{ - for (size_t i = 0; i < this->attrs_.size (); i++) - if (ACE_OS::strcmp (uri, this->attrs_[i].uri ()) == 0 && - ACE_OS::strcmp (localPart, this->attrs_[i].localName ()) == 0) - return this->attrs_[i].value (); - - return 0; -} - -int -ACEXML_AttributesImpl::setAttribute (size_t index, - const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - const ACEXML_Char *type, - const ACEXML_Char *value) -{ - if (index < this->attrs_.size ()) - { - this->attrs_[index].setAttribute (uri, - localName, - qName, - type, - value); - return 0; - } - - return -1; -} - - -int -ACEXML_AttributesImpl::setLocalName (size_t index, - const ACEXML_Char *localName) -{ - if (index < this->attrs_.size ()) - { - this->attrs_[index].localName (localName); - return 0; - } - return -1; -} - -int -ACEXML_AttributesImpl::setQName (size_t index, - const ACEXML_Char *qName) -{ - if (index < this->attrs_.size ()) - { - this->attrs_[index].qName (qName); - return 0; - } - return -1; -} - - -int -ACEXML_AttributesImpl::setURI (size_t index, - const ACEXML_Char *uri) -{ - if (index < this->attrs_.size ()) - { - this->attrs_[index].uri (uri); - return 0; - } - return -1; -} - -int -ACEXML_AttributesImpl::setType (size_t index, - const ACEXML_Char *type) -{ - if (index < this->attrs_.size ()) - { - this->attrs_[index].type (type); - return 0; - } - return -1; -} - -int -ACEXML_AttributesImpl::setValue (size_t index, - const ACEXML_Char *value) -{ - if (index < this->attrs_.size ()) - { - this->attrs_[index].value (value); - return 0; - } - return -1; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Array_Base; -template class ACE_Array; -template class ACE_Array_Iterator; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Array_Base -#pragma instantiate ACE_Array -#pragma instantiate ACE_Array_Iterator -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ACEXML/common/AttributesImpl.h b/ACEXML/common/AttributesImpl.h deleted file mode 100644 index 728458b9533..00000000000 --- a/ACEXML/common/AttributesImpl.h +++ /dev/null @@ -1,310 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file AttributesImpl.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - - -#ifndef ACEXML_ATTRIBUTESIMPL_H -#define ACEXML_ATTRIBUTESIMPL_H - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Attributes.h" -#include "ace/Containers_T.h" - -#if !defined ACEXML_AttributesImpl_Default_Size -#define ACEXML_AttributesImpl_Default_Size 20 -#endif /* ACEXML_AttributesImpl_Default_Size */ - -class ACEXML_AttributesImpl; - -/** - * @class ACEXML_Attribute AttributesImpl.h "ACEXML/common/AttributesImpl.h" - * - * @brief ACEXML_Attribute defines the data structure of an attribute - * - * @sa ACEXML_AttributesImpl - */ -class ACEXML_Export ACEXML_Attribute -{ -public: - friend class ACEXML_AttributesImpl; - - /// Default constructor. - ACEXML_Attribute (void); - - /// Copy constructor. - ACEXML_Attribute (const ACEXML_Attribute &attr); - - /// Initialize all constructor. - ACEXML_Attribute (const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - const ACEXML_Char *type, - const ACEXML_Char *value); - - /// Destructor. - ~ACEXML_Attribute (void); - - /// Set all members. - void setAttribute (const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - const ACEXML_Char *type, - const ACEXML_Char *value); - - /// Get \a uri_. - const ACEXML_Char *uri (void) const; - - /// Set \a uri_. - void uri (const ACEXML_Char *uri); - - /// Get \a localName_. - const ACEXML_Char *localName (void) const; - - /// Set \a localName_. - void localName (const ACEXML_Char *localName); - - /// Get \a qName_. - const ACEXML_Char *qName (void) const; - - /// Set \a qName_. - void qName (const ACEXML_Char *qName); - - /// Get \a type_. - const ACEXML_Char *type (void) const; - - /// Set \a type_. - void type (const ACEXML_Char *type); - - /// Get \a value_. - const ACEXML_Char *value (void) const; - - /// Set \a value_. - void value (const ACEXML_Char *value); - - /// Assignment operator. - ACEXML_Attribute &operator= (const ACEXML_Attribute &rhs); - - /// Comparison operator. - int operator!= (const ACEXML_Attribute&rhs) const; - -private: - /// @var uri_ Namespace URI of an attribute - ACEXML_Char *uri_; - - /// @var localName_ - ACEXML_Char *localName_; - ACEXML_Char *qName_; - ACEXML_Char *type_; - ACEXML_Char *value_; -}; - -/** - * @typedef ACE_Array ACEXML_Attribute_Array - */ -typedef ACE_Array ACEXML_Attribute_Array; - -/** - * @class ACEXML_AttributesImpl AttributesImpl.h "ACEXML/common/AttributesImpl.h" - * - * @brief ACEXML_AttributesImpl provides the default implementation - * of interface ACEXML_Attributes. - * - * This class provides a default implementation of the SAX2 Attributes - * interface, with the addition of manipulators so that the list can - * be modified or reused. - * - * There are two typical uses of this class: - * - * - to take a persistent snapshot of an Attributes object in a - * startElement event; or - * - to construct or modify an Attributes object in a SAX2 driver or filter. - * - * This class replaces the now-deprecated SAX1 AttributeListImpl - * class; in addition to supporting the updated Attributes interface - * rather than the deprecated AttributeList interface, it also - * includes a much more efficient implementation using a single array - * rather than a set of Vectors. - * - * @sa ACEXML_Attributes - */ -class ACEXML_Export ACEXML_AttributesImpl - : public ACEXML_Attributes -{ -public: - /** - * Initialize an AttributesImpl that holds attributes. - */ - ACEXML_AttributesImpl (int size = ACEXML_AttributesImpl_Default_Size); - ACEXML_AttributesImpl (const ACEXML_AttributesImpl &attrs); - virtual ~ACEXML_AttributesImpl (void); - - /** - * Add a new attribute using the argument(s) supplied. - * Return -1 if an attribute with the same name already exists. - */ - virtual int addAttribute (const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - const ACEXML_Char *type, - const ACEXML_Char *value); - virtual int addAttribute (const ACEXML_Attribute &att); - - /** - * Check for duplicate attributes. - */ - virtual int isDuplicate (const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName); - /** - * Remove an attribute from the array. Notice that this - * operation can invalidate previously acquired - * value. (It will repack the array.) - */ - virtual int removeAttribute (size_t index); - - - /** - * Look up the index of an attribute by XML 1.0 qualified name. - * Return -1 if we fail to find a match. - */ - virtual int getIndex (const ACEXML_Char *qName); - - /** - * Look up the index of an attribute by Namespace name. - * Return -1 if we fail to find a match. - */ - virtual int getIndex (const ACEXML_Char *uri, - const ACEXML_Char *localPart); - - /** - * Return the number of attributes in the list. - */ - virtual size_t getLength (void); - - /** - * Look up an attribute's local name by index. - * Return 0 if index is out of range. - */ - virtual const ACEXML_Char *getLocalName (size_t index); - - /** - * Look up an attribute's XML 1.0 qualified name by index. - * Return 0 if index is out of range. - */ - virtual const ACEXML_Char *getQName (size_t index); - - /** - * Look up an attribute's type by index. - * Return 0 if index is out of range. - */ - virtual const ACEXML_Char *getType (size_t index); - - /** - * Look up an attribute's type by XML 1.0 qualified name. - * Return 0 if we fail to find a match. - */ - virtual const ACEXML_Char *getType (const ACEXML_Char *qName); - - /** - * Look up an attribute's type by Namespace name. - * Return 0 if we fail to find a match. - */ - virtual const ACEXML_Char *getType (const ACEXML_Char *uri, - const ACEXML_Char *localPart); - - /** - * Look up an attribute's Namespace URI by index. - * Return 0 if index is out of range. - */ - virtual const ACEXML_Char *getURI (size_t index); - - /** - * Look up an attribute's value by index. - * Return 0 if index is out of range. - */ - virtual const ACEXML_Char *getValue (size_t index); - - /** - * Look up an attribute's value by XML 1.0 qualified name. - * Return 0 if we fail to find a match. - */ - virtual const ACEXML_Char *getValue (const ACEXML_Char *qName); - - /** - * Look up an attribute's value by Namespace name. - * Return 0 if we fail to find a match. - */ - virtual const ACEXML_Char *getValue (const ACEXML_Char *uri, - const ACEXML_Char *localPart); - - /** - * Set an attribute at index. Return -1 if index is out of - * range. - */ - virtual int setAttribute (size_t index, - const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - const ACEXML_Char *type, - const ACEXML_Char *value); - - /** - * Set the localName of the attribute at . - * return -1 if is out of range. - */ - virtual int setLocalName (size_t index, - const ACEXML_Char *localName); - - /** - * Set the qName of the attribute at . - * return -1 if is out of range. - */ - virtual int setQName (size_t index, - const ACEXML_Char *qName); - - /** - * Set the URI of the attribute at . - * return -1 if is out of range. - */ - virtual int setURI (size_t index, - const ACEXML_Char *uri); - - /** - * Set the type of the attribute at . - * return -1 if is out of range. - */ - virtual int setType (size_t index, - const ACEXML_Char *type); - - /** - * Set the value of the attribute at . - * return -1 if is out of range. - */ - virtual int setValue (size_t index, - const ACEXML_Char *value); -private: - /// Container for all attributes. - ACEXML_Attribute_Array attrs_; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/AttributesImpl.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACEXML_ATTRIBUTESIMPL_H */ diff --git a/ACEXML/common/AttributesImpl.i b/ACEXML/common/AttributesImpl.i deleted file mode 100644 index 87a905b3304..00000000000 --- a/ACEXML/common/AttributesImpl.i +++ /dev/null @@ -1,151 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ace/ACE.h" - -ACEXML_INLINE -ACEXML_Attribute::ACEXML_Attribute (void) - : uri_ (0), - localName_ (0), - qName_ (0), - type_ (0), - value_ (0) -{ -} - -ACEXML_INLINE -ACEXML_Attribute::ACEXML_Attribute (const ACEXML_Attribute &attr) - : uri_ (ACE::strnew (attr.uri_)), - localName_ (ACE::strnew (attr.localName_)), - qName_ (ACE::strnew (attr.qName_)), - type_ (ACE::strnew (attr.type_)), - value_ (ACE::strnew (attr.value_)) -{ -} - -ACEXML_INLINE -ACEXML_Attribute::ACEXML_Attribute (const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - const ACEXML_Char *type, - const ACEXML_Char *value) - : uri_ (ACE::strnew (uri)), - localName_ (ACE::strnew (localName)), - qName_ (ACE::strnew (qName)), - type_ (ACE::strnew (type)), - value_ (ACE::strnew (value)) -{ -} - -ACEXML_INLINE -ACEXML_Attribute::~ACEXML_Attribute (void) -{ - delete[] this->uri_; - delete[] this->localName_; - delete[] this->qName_; - delete[] this->type_; - delete[] this->value_; -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::uri (void) const -{ - return this->uri_; -} - -ACEXML_INLINE void -ACEXML_Attribute::uri (const ACEXML_Char *uri) -{ - delete[] this->uri_; - this->uri_ = ACE::strnew (uri); -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::localName (void) const -{ - return this->localName_; -} - -ACEXML_INLINE void -ACEXML_Attribute::localName (const ACEXML_Char *localName) -{ - delete[] this->localName_; - this->localName_ = ACE::strnew (localName); -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::qName (void) const -{ - return this->qName_; -} - -ACEXML_INLINE void -ACEXML_Attribute::qName (const ACEXML_Char *qName) -{ - delete[] this->qName_; - this->qName_ = ACE::strnew (qName); -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::type (void) const -{ - return this->type_; -} - -ACEXML_INLINE void -ACEXML_Attribute::type (const ACEXML_Char *type) -{ - delete[] this->type_; - this->type_ = ACE::strnew (type); -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::value (void) const -{ - return this->value_; -} - -ACEXML_INLINE void -ACEXML_Attribute::value (const ACEXML_Char *value) -{ - delete[] this->value_; - this->value_ = ACE::strnew (value); -} - -ACEXML_INLINE void -ACEXML_Attribute::setAttribute (const ACEXML_Char *uri, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - const ACEXML_Char *type, - const ACEXML_Char *value) -{ - this->uri (uri); - this->qName (qName); - this->localName (localName); - this->type (type); - this->value (value); -} - -ACEXML_INLINE ACEXML_Attribute & -ACEXML_Attribute::operator= (const ACEXML_Attribute &rhs) -{ - if (this != &rhs) // Check for self assignment - { - this->uri (rhs.uri ()); - this->qName (rhs.qName ()); - this->localName (rhs.localName ()); - this->type (rhs.type ()); - this->value (rhs.value ()); - } - return *this; -} - -ACEXML_INLINE int -ACEXML_Attribute::operator!= (const ACEXML_Attribute &rhs) const -{ - return (ACE_OS::strcmp (this->uri_, rhs.uri ()) == 0 && - ACE_OS::strcmp (this->localName_, rhs.localName ()) == 0 && - ACE_OS::strcmp (this->qName_, rhs .qName ()) == 0 && - ACE_OS::strcmp (this->type_, rhs.type ()) == 0 && - ACE_OS::strcmp (this->value_, rhs.value ()) == 0 ? 0 : 1); - -} diff --git a/ACEXML/common/Attributes_Def_Builder.cpp b/ACEXML/common/Attributes_Def_Builder.cpp deleted file mode 100644 index d70a80f2925..00000000000 --- a/ACEXML/common/Attributes_Def_Builder.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// $Id$ - -#include "ACEXML/common/Attributes_Def_Builder.h" - -ACEXML_Attribute_Def_Builder::~ACEXML_Attribute_Def_Builder () -{ - -} - -ACEXML_Attributes_Def_Builder::~ACEXML_Attributes_Def_Builder () -{ - -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class auto_ptr; -template class auto_ptr; -template class ACE_Auto_Basic_Ptr; -template class ACE_Auto_Basic_Ptr; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate auto_ptr -#pragma instantiate auto_ptr -#pragma instantiate ACE_Auto_Basic_Ptr -#pragma instantiate ACE_Auto_Basic_Ptr -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ACEXML/common/Attributes_Def_Builder.h b/ACEXML/common/Attributes_Def_Builder.h deleted file mode 100644 index 26404fe6d86..00000000000 --- a/ACEXML/common/Attributes_Def_Builder.h +++ /dev/null @@ -1,153 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Attributes_Def_Builder.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_ATTRIBUTES_DEF_BUILDER_H_ -#define _ACEXML_ATTRIBUTES_DEF_BUILDER_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" -#include "ACEXML/common/Env.h" -#include "ACEXML/common/SAXExceptions.h" -#include "ace/Auto_Ptr.h" - -/** - * @class ACEXML_Attribute_Def_Builder Attributes_Def_Builder.h "common/Attributes_Def_Builder.h" - * - * @brief An abstract virtual class defining an interface for building an - * attribute definition from DTD. - * - * This class should be invisible to application programmers and is only - * used for validator implementors. - */ -class ACEXML_Export ACEXML_Attribute_Def_Builder -{ -public: - - typedef auto_ptr VAR; - - typedef enum { - CDATA, - ID, - IDREF, - IDREFS, - ENTITY, - ENTITIES, - NMTOKEN, - NMTOKENS, - NOTATION, - ENUMERATION, - ERROR_TYPE - } ATT_TYPE; - - typedef enum { - REQUIRED, - IMPLIED, - FIXED, - INVALID - } DEFAULT_DECL; - - virtual ~ACEXML_Attribute_Def_Builder () = 0; - - /** - * Specify the name of the attribute. - */ - virtual int setName (const ACEXML_Char *n) = 0; - - /** - * Get the name of the attribute. - */ - virtual const ACEXML_Char *getName (void) = 0; - - /** - * Set the attribute type. - */ - virtual int setAttType (const ATT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Insert an element for NOTATION or ENUMERATION type attribute. - */ - virtual int insertList (const ACEXML_Char *Name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Set default attribute declaration. - */ - virtual int setDefault (const DEFAULT_DECL def, - const ACEXML_Char *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Check validity of the current attribute definition being built. - * - * @retval 0 if the attribute is not a valid combo. - */ - virtual int validAttr (void) = 0; - - /** - * Dump the content of the attribute definition. - */ - virtual void dump (void) = 0; -}; - -/** - * @ class ACEXML_Attributes_Def_Builder Attributes_Def_Builder.h "common/Attributes_Def_Builder.h" - * - * @ brief An abstract virtual class defining an interface for building - * attribute definitions from DTD. - * - * This class should be invisible to application programmers and - * is only used for validator implementors. - */ -class ACEXML_Export ACEXML_Attributes_Def_Builder -{ -public: - - typedef auto_ptr VAR; - - virtual ~ACEXML_Attributes_Def_Builder () = 0; - - /** - * Set the element name that the attribute builder applies. - * - * @retval 0 if valid, -1 otherwise. - */ - virtual int setElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Acquire an Attribute_Builder. - */ - virtual ACEXML_Attribute_Def_Builder *getAttribute_Def_Builder () = 0; - - /** - * Add a definition for one attribute. - */ - virtual int insertAttribute (ACEXML_Attribute_Def_Builder *def ACEXML_ENV_ARG_DECL) = 0; - - - /** - * Dump the content of the attribute definition. - */ - virtual void dump (void) = 0; -}; - -#include "ace/post.h" - -#endif /* _ACEXML_ATTRIBUTES_DEF_BUILDER_H_ */ diff --git a/ACEXML/common/CharStream.cpp b/ACEXML/common/CharStream.cpp deleted file mode 100644 index 2c6ea29600f..00000000000 --- a/ACEXML/common/CharStream.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/CharStream.h" - -ACEXML_CharStream::~ACEXML_CharStream (void) -{ -} diff --git a/ACEXML/common/CharStream.h b/ACEXML/common/CharStream.h deleted file mode 100644 index 1b5c199f527..00000000000 --- a/ACEXML/common/CharStream.h +++ /dev/null @@ -1,79 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CharStream.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_CHARSTREAM_H_ -#define _ACEXML_CHARSTREAM_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ACEXML/common/XML_Types.h" - -/** - * @class ACEXML_CharStream CharStream.h "ACEXML/common/CharStream.h" - * - * ACEXML_CharStream is an abstract class (interface) which defines the - * basic opertions a parser could use to retrieve XML charater sequence. - * The sequence can be read from a file or a character buffer. - */ -class ACEXML_Export ACEXML_CharStream -{ -public: - - /** - * Virtual destructor, must have. - */ - virtual ~ACEXML_CharStream () = 0; - - /** - * Returns the available ACEXML_Char in the buffer. -1 - * if the object is not initialized properly. - */ - virtual int available (void) = 0; - - /** - * Close this stream and release all resources used by it. - */ - virtual int close (void) = 0; - - /** - * Read the next ACEXML_Char. Return -1 if we are not able to - * return an ACEXML_Char, 0 if EOS is reached, or 1 if succeed. - */ - virtual int get (ACEXML_Char& ch) = 0; - - /** - * Read the next batch of ACEXML_Char strings - */ - virtual int read (ACEXML_Char *str, - size_t len) = 0; - - /** - * Peek the next ACEXML_Char in the CharStream. Return the - * character if succeess, -1 if EOS is reached. - */ - virtual int peek (void) = 0; - - /* - * Get the character encoding for a byte stream or URI. - */ - virtual const ACEXML_Char *getEncoding (void) = 0; - -}; - -#include "ace/post.h" - - -#endif /* _ACEXML_CHARSTREAM_H_ */ diff --git a/ACEXML/common/ContentHandler.h b/ACEXML/common/ContentHandler.h deleted file mode 100644 index ee0a237cc82..00000000000 --- a/ACEXML/common/ContentHandler.h +++ /dev/null @@ -1,128 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ContentHandler.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_CONTENTHANDLER_H_ -#define _ACEXML_CONTENTHANDLER_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Env.h" -#include "ACEXML/common/SAXExceptions.h" -#include "ACEXML/common/Locator.h" -#include "ACEXML/common/Attributes.h" - -/** - * @class ACEXML_ContentHandler ContentHandler.h "ACEXML/common/ContentHandler.h" - * - * @brief ACEXML_ContentHandler - * - * This is the main interface that most SAX applications implement: if the - * application needs to be informed of basic parsing events, it implements - * this interface and registers an instance with the SAX parser using the - * setContentHandler method. The parser uses the instance to report basic - * document-related events like the start and end of elements and character - * data. - * - * The order of events in this interface is very important, and mirrors the - * order of information in the document itself. For example, all of an - * element's content (character data, processing instructions, and/or - * subelements) will appear, in order, between the startElement event and - * the corresponding endElement event. - */ -class ACEXML_Export ACEXML_ContentHandler -{ -public: - /** - * Receive notification of character data. - */ - virtual void characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive notification of the end of a document. - */ - virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive notification of the end of an element. - */ - virtual void endElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * End the scope of a prefix-URI mapping. - */ - virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive notification of ignorable whitespace in element content. - */ - virtual void ignorableWhitespace (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive notification of a processing instruction. - */ - virtual void processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive an object for locating the origin of SAX document events. - */ - virtual void setDocumentLocator (ACEXML_Locator *locator) = 0; - - /** - * Receive notification of a skipped entity. - */ - virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive notification of the beginning of a document. - */ - virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive notification of the beginning of an element. - */ - virtual void startElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Begin the scope of a prefix-URI Namespace mapping. - */ - virtual void startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; -}; - -#include "ace/post.h" - - -#endif /* _ACEXML_CONTENTHANDLER_H_ */ diff --git a/ACEXML/common/DTDHandler.h b/ACEXML/common/DTDHandler.h deleted file mode 100644 index 3e9e59f086e..00000000000 --- a/ACEXML/common/DTDHandler.h +++ /dev/null @@ -1,75 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file DTDHandler.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_DTDHANDLER_H_ -#define _ACEXML_DTDHANDLER_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Env.h" -#include "ACEXML/common/SAXExceptions.h" - -/** - * @class ACEXML_DTDHandler DTDHandler.h "ACEXML/common/DTDHandler.h" - * - * @brief ACEXML_DTDHandler - * - * If a SAX application needs information about notations and unparsed - * entities, then the application implements this interface and registers - * an instance with the SAX parser using the parser's setDTDHandler method. - * The parser uses the instance to report notation and unparsed entity - * declarations to the application. - * - * Note that this interface includes only those DTD events that the XML - * recommendation requires processors to report: notation and unparsed - * entity declarations. - * - * The SAX parser may report these events in any order, regardless of the - * order in which the notations and unparsed entities were declared; - * however, all DTD events must be reported after the document handler's - * startDocument event, and before the first startElement event. - * - * It is up to the application to store the information for future use - * (perhaps in a hash table or object tree). If the application encounters - * attributes of type "NOTATION", "ENTITY", or "ENTITIES", it can use the - * information that it obtained through this interface to find the entity - * and/or notation corresponding with the attribute value. - */ -class ACEXML_Export ACEXML_DTDHandler -{ -public: - /** - * Receive notification of a notation declaration event. - */ - virtual void notationDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive notification of an unparsed entity declaration event. - */ - virtual void unparsedEntityDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_DTDHANDLER_H_ */ diff --git a/ACEXML/common/DTD_Manager.cpp b/ACEXML/common/DTD_Manager.cpp deleted file mode 100644 index 39b3d2acef0..00000000000 --- a/ACEXML/common/DTD_Manager.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -#include "ACEXML/common/DTD_Manager.h" - -ACEXML_DTD_Manager::~ACEXML_DTD_Manager () -{ - -} diff --git a/ACEXML/common/DTD_Manager.h b/ACEXML/common/DTD_Manager.h deleted file mode 100644 index 541efc5f8ca..00000000000 --- a/ACEXML/common/DTD_Manager.h +++ /dev/null @@ -1,82 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file DTD_Manager.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_DTD_Manager_H_ -#define _ACEXML_DTD_Manager_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Attributes_Def_Builder.h" -#include "ACEXML/common/Element_Def_Builder.h" -#include "ACEXML/common/Validator.h" - -/** - * @class ACEXML_DTD_Manager DTD_Manager.h "common/DTD_Manager.h" - * - * @todo Fill in the blank. - */ -class ACEXML_Export ACEXML_DTD_Manager -{ -public: - virtual ~ACEXML_DTD_Manager () = 0; - - /** - * Acquire a pointer to an element definition builder. - * The XML parser use this interface to acquire the - * definition builder and use the builder to create - * the DTD element definition. The resulting builder - * is then registered with the DTD Manager or destroyed - * if error occured when the builder encountered errors. - * - * @retval 0 if error occurs creating the builder. - */ - virtual ACEXML_Element_Def_Builder *getElement_Def_Builder () = 0; - - /** - * Insert a new element definition into the DTD Manager. - * - * @retval 0 if success, -1 if error. - */ - virtual int insertElement_Definition (ACEXML_Element_Def_Builder *def ACEXML_ENV_ARG_DECL) = 0; - - /** - * Acquire a pointer to an attributes definition builder. - * - */ - virtual ACEXML_Attributes_Def_Builder *getAttribute_Def_Builder () = 0; - - /** - * Insert a new attributes definition into the DTD Manager. - * - * @retval 0 if success, -1 otherwise. - */ - virtual int insertAttributes_Definition (ACEXML_Attributes_Def_Builder *def ACEXML_ENV_ARG_DECL) = 0; - - /** - * Acquire an element validator to validate an XML element. - * - * @todo I haven't figured out what memory management scheme - * we should use for the acquired validator. - */ - virtual ACEXML_Validator *getValidator (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) = 0; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_DTD_Manager_H_ */ diff --git a/ACEXML/common/DefaultHandler.cpp b/ACEXML/common/DefaultHandler.cpp deleted file mode 100644 index f96e29d3cf3..00000000000 --- a/ACEXML/common/DefaultHandler.cpp +++ /dev/null @@ -1,162 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/DefaultHandler.h" -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/DefaultHandler.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_DefaultHandler::ACEXML_DefaultHandler (void) -{ - // no-op -} - -ACEXML_DefaultHandler::~ACEXML_DefaultHandler (void) -{ - // no-op -} - -void -ACEXML_DefaultHandler::characters (const ACEXML_Char *, - int, - int - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::endElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::endPrefixMapping (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::ignorableWhitespace (const ACEXML_Char *, - int, - int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::processingInstruction (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::setDocumentLocator (ACEXML_Locator * ) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::skippedEntity (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::startElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *, - ACEXML_Attributes * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::startPrefixMapping (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - - // *** Methods inherit from ACEXML_DTDHandler. - -void -ACEXML_DefaultHandler::notationDecl (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::unparsedEntityDecl (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - - // Methods inherit from ACEXML_EnitityResolver. - -ACEXML_InputSource * -ACEXML_DefaultHandler::resolveEntity (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. - return 0; -} - - // Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ -void -ACEXML_DefaultHandler::error (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::fatalError (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_DefaultHandler::warning (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} diff --git a/ACEXML/common/DefaultHandler.h b/ACEXML/common/DefaultHandler.h deleted file mode 100644 index 6b33800b57c..00000000000 --- a/ACEXML/common/DefaultHandler.h +++ /dev/null @@ -1,195 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file DefaultHandler.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef ACEXML_DEFAULTHANDLER_H -#define ACEXML_DEFAULTHANDLER_H - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/ContentHandler.h" -#include "ACEXML/common/DTDHandler.h" -#include "ACEXML/common/EntityResolver.h" -#include "ACEXML/common/ErrorHandler.h" - -/** - * @class ACEXML_DefaultHandler DefaultHandler.h "ACEXML/common/DefaultHandler.h" - * - * @brief ACEXML_DefaultHandler - * - * This class is available as a convenience base class for SAX2 - * applications: it provides default implementations for all of the - * callbacks in the four core SAX2 handler classes: - * - * - EntityResolver - * - DTDHandler - * - ContentHandler - * - ErrorHandler - * - * Application writers can extend this class when they need to implement - * only part of an interface; parser writers can instantiate this class to - * provide default handlers when the application has not supplied its own. - */ -class ACEXML_Export ACEXML_DefaultHandler - : public ACEXML_ContentHandler, - public ACEXML_DTDHandler, - public ACEXML_EntityResolver, - public ACEXML_ErrorHandler -{ -public: - /** - * Default constructor. - */ - ACEXML_DefaultHandler (void); - - /** - * destructor. - */ - virtual ~ACEXML_DefaultHandler (void); - - // Methods inherit from ACEXML_ContentHandler. - - /* - * Receive notification of character data. - */ - virtual void characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of the end of a document. - */ - virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of the end of an element. - */ - virtual void endElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * End the scope of a prefix-URI mapping. - */ - virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of ignorable whitespace in element content. - */ - virtual void ignorableWhitespace (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of a processing instruction. - */ - virtual void processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive an object for locating the origin of SAX document events. - */ - virtual void setDocumentLocator (ACEXML_Locator *locator) ; - - /* - * Receive notification of a skipped entity. - */ - virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of the beginning of a document. - */ - virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of the beginning of an element. - */ - virtual void startElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Begin the scope of a prefix-URI Namespace mapping. - */ - virtual void startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - // *** Methods inherit from ACEXML_DTDHandler. - - /* - * Receive notification of a notation declaration event. - */ - virtual void notationDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of an unparsed entity declaration event. - */ - virtual void unparsedEntityDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - // Methods inherit from ACEXML_EnitityResolver. - - /* - * Allow the application to resolve external entities. - */ - virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - // Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ - virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of a non-recoverable error. - */ - virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of a warning. - */ - virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/DefaultHandler.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACEXML_DEFAULTHANDLER_H */ diff --git a/ACEXML/common/DefaultHandler.i b/ACEXML/common/DefaultHandler.i deleted file mode 100644 index 77b4466a3cb..00000000000 --- a/ACEXML/common/DefaultHandler.i +++ /dev/null @@ -1 +0,0 @@ -// -*- C++ -*- $Id$ diff --git a/ACEXML/common/Element_Def_Builder.cpp b/ACEXML/common/Element_Def_Builder.cpp deleted file mode 100644 index 15be5e0feca..00000000000 --- a/ACEXML/common/Element_Def_Builder.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// $Id$ - -#include "ACEXML/common/Element_Def_Builder.h" - -ACEXML_Element_Def_Builder::~ACEXML_Element_Def_Builder () -{ - -} - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class auto_ptr; -template class ACE_Auto_Basic_Ptr; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate auto_ptr -#pragma instantiate ACE_Auto_Basic_Ptr -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ACEXML/common/Element_Def_Builder.h b/ACEXML/common/Element_Def_Builder.h deleted file mode 100644 index ea105c10c1c..00000000000 --- a/ACEXML/common/Element_Def_Builder.h +++ /dev/null @@ -1,133 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Element_Def_Builder.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_ELEMENT_DEF_BUILDER_H_ -#define _ACEXML_ELEMENT_DEF_BUILDER_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Auto_Ptr.h" -#include "ACEXML/common/XML_Types.h" -#include "ACEXML/common/Env.h" -#include "ACEXML/common/SAXExceptions.h" - -/** - * @class ACEXML_Element_Def_Builder Element_Def_Builder.h "common/Element_Def_Builder.h" - * - * @brief An abstract virtual class that defines the interface to define an - * element definition. - * - * This class defines how to define an element definition after parsing a - * DTD. - */ -class ACEXML_Export ACEXML_Element_Def_Builder -{ -public: - - typedef auto_ptr VAR; - - typedef enum { - EMPTY, - ANY, - MIXED, - CHILDREN, - UNDEFINED - } CONTENT_TYPE; - - typedef enum { - ONE, - ZERO_OR_MORE, - ONE_OR_MORE, - ONE_OR_ZERO - } CARDINALITY; - - virtual ~ACEXML_Element_Def_Builder () = 0; - - /** - * Define the name of the element. - * - * @retval 0 if valid, -1 otherwise. - */ - virtual int setElementName (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Define the content type of the element. - * - * @retval 0 if valid, -1 otherwise. - */ - virtual int setContentType (CONTENT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Insert one more element into Mixed definition. - */ - virtual int insertMixedElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Start a new group of children. - */ - virtual int startChildGroup () = 0; - - /** - * End a new group of children. - * - * @retval 0 on success. - */ - virtual int endChildGroup (CARDINALITY card ACEXML_ENV_ARG_DECL) = 0; - - /** - * Set the type of current child group to Choice. - * - * @retval 0 on success, -1 if the type of the child group has - * already been set and this action conflicts with the previous - * setting. - */ - virtual int setChoice () = 0; - - /** - * Set the type of current child group to Sequence. - * - * @retval 0 on success, -1 if the type of the child group has - * already been set and this action conflicts with the previous - * setting. - */ - virtual int setSequence () = 0; - - /** - * Insert an new element into the current child group. - * - * @retval 0 on success, -1 otherwise. - */ - virtual int insertElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Dump the content of the attribute definition. - */ - virtual void dump (void) = 0; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_ELEMENT_DEF_BUILDER_H_ */ diff --git a/ACEXML/common/Encoding.cpp b/ACEXML/common/Encoding.cpp deleted file mode 100644 index 7fe8811cdbd..00000000000 --- a/ACEXML/common/Encoding.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/Encoding.h" - -const ACEXML_Char* ACEXML_Encoding::encoding_names_[8] = { - ACE_TEXT ("UCS-4BE"), - ACE_TEXT ("UCS-4LE"), - ACE_TEXT ("UCS-4_2143"), - ACE_TEXT ("UCS-4_3412"), - ACE_TEXT ("UTF-16BE"), - ACE_TEXT ("UTF-16LE"), - ACE_TEXT ("UTF-8"), - ACE_TEXT ("Unsupported Encoding") -}; - -const ACEXML_UTF8 ACEXML_Encoding::byte_order_mark_[][4] = { - { '\x00', '\x00', '\xFE', '\xFF' }, // UCS-4, big-endian (1234 order) - { '\xFF', '\xFE', '\x00', '\x00' }, // UCS-4, little-endian (4321 order) - { '\x00', '\x00', '\xFF', '\xFE' }, // UCS-4, unusual octet order (2143) - { '\xFE', '\xFF', '\x00', '\x00' }, // UCS-4, unusual octet order (3412) - { '\xFE', '\xFF', '\xFF', '\xFF' }, // UTF-16, big-endian (3 & 4 ignored) - { '\xFF', '\xFE', '\xFF', '\xFF' }, // UTF-16, little-endian ( 3 & 4 ignored) - { '\xEF', '\xBB', '\xBF', '\xFF' } // UTF-8 -}; - -const ACEXML_UTF8 ACEXML_Encoding::magic_values_[][4] = { - { '\x00', '\x00', '\x00', '\x3c' }, // - { '\x3c', '\x00', '\x00', '\x00' }, // UCS-4 and variants - { '\x00', '\x00', '\x3c', '\x00' }, // - { '\x00', '\x3c', '\x00', '\x00' }, // - { '\x00', '\x3c', '\x00', '\x3f' }, // UTF-16BE - { '\x3c', '\x00', '\x3f', '\x00' }, // UTF-16LE - { '\x3c', '\x3f', '\x78', '\x6d' }, // UTF-8 -}; - -const ACEXML_Char* -ACEXML_Encoding::get_encoding (const char* input) -{ - if (ACE_OS::memcmp (&ACEXML_Encoding::byte_order_mark_[ACEXML_Encoding::UTF16BE][0], input, 2) == 0) - return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF16BE]; - else if (ACE_OS::memcmp (&ACEXML_Encoding::byte_order_mark_[ACEXML_Encoding::UTF16LE][0], input, 2) == 0) - return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF16LE]; - else if (ACE_OS::memcmp (&ACEXML_Encoding::byte_order_mark_[ACEXML_Encoding::UTF8][0], input, 4) == 0) - return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF8]; - else if (ACE_OS::memcmp (&ACEXML_Encoding::magic_values_[ACEXML_Encoding::UTF16BE][0], input, 4) == 0) - return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF16BE]; - else if (ACE_OS::memcmp (&ACEXML_Encoding::magic_values_[ACEXML_Encoding::UTF16LE][0], input, 4) == 0) - return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF16LE]; - else if (ACE_OS::memcmp (&ACEXML_Encoding::magic_values_[ACEXML_Encoding::UTF8][0], input, 4) == 0) - return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF8]; - else - return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::OTHER]; -} diff --git a/ACEXML/common/Encoding.h b/ACEXML/common/Encoding.h deleted file mode 100644 index fc0917c0b91..00000000000 --- a/ACEXML/common/Encoding.h +++ /dev/null @@ -1,61 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Encoding.h - * - * This file provides utility functions to determine the encoding of a file - * or a byte stream automatically. - * - * $Id$ - * - * @author Krishnakumar B - */ -//============================================================================= - -#ifndef _ACEXML_ENCODING_H -#define _ACEXML_ENCODING_H - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" - -/** - * @class ACEXML_Encoding Encoding.h "ACEXML/common/Encoding.h" - * - * @brief ACEXML_Encoding - * - * Wrapper class for determining the encoding of a file or a byte stream. - */ -class ACEXML_Export ACEXML_Encoding -{ -public: - enum { - UCS4BE = 0, - UCS4LE = 1, - UCS4_2143 = 2, - UCS4_3412 = 3, - UTF16BE = 4, - UTF16LE = 5, - UTF8 = 6, - OTHER = 7 - } ENCODING; - - static const ACEXML_Char* encoding_names_[8]; - - static const ACEXML_UTF8 byte_order_mark_[][4]; - - static const ACEXML_UTF8 magic_values_[][4]; - - static const ACEXML_Char* get_encoding (const char* input); - -}; - -#include "ace/post.h" - -#endif /* _ACEXML_ENCODING_H */ diff --git a/ACEXML/common/EntityResolver.h b/ACEXML/common/EntityResolver.h deleted file mode 100644 index cd43b31db41..00000000000 --- a/ACEXML/common/EntityResolver.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file EntityResolver.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_ENTITYHANDLER_H_ -#define _ACEXML_ENTITYHANDLER_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Env.h" -#include "ACEXML/common/InputSource.h" - -/** - * @class ACEXML_EntityResolver EntityResolver.h "ACEXML/common/EntityResolver.h" - * - * @brief ACEXML_EntityResolver - * - * If a SAX application needs to implement customized handling for - * external entities, it must implement this interface and register an - * instance with the SAX driver using the setEntityResolver method. - * - * The XML reader will then allow the application to intercept any - * external entities (including the external DTD subset and external - * parameter entities, if any) before including them. - * - * Many SAX applications will not need to implement this interface, - * but it will be especially useful for applications that build XML - * documents from databases or other specialised input sources, or for - * applications that use URI types other than URLs. - */ -class ACEXML_Export ACEXML_EntityResolver -{ -public: - /** - * Allow the application to resolve external entities. - */ - virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_ENTITYHANDLER_H_ */ diff --git a/ACEXML/common/Env.cpp b/ACEXML/common/Env.cpp deleted file mode 100644 index 6d1ce2158d6..00000000000 --- a/ACEXML/common/Env.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/Env.h" - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/Env.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_Env::ACEXML_Env (void) - : exception_ (0) -{ -} - -ACEXML_Env::ACEXML_Env (const ACEXML_Env &rhs) - : exception_ (0) -{ - if (rhs.exception()) - this->exception_ = rhs.exception_->duplicate(); -} - -ACEXML_Env& -ACEXML_Env::operator= (const ACEXML_Env& rhs) -{ - ACEXML_Env tmp (rhs); - ACEXML_Exception* tmp_ex = this->exception_; - this->exception_ = tmp.exception_; - tmp.exception_ = tmp_ex; - return *this; -} - -ACEXML_Env::~ACEXML_Env (void) -{ - this->clear(); -} diff --git a/ACEXML/common/Env.h b/ACEXML/common/Env.h deleted file mode 100644 index 8e6c7ee9641..00000000000 --- a/ACEXML/common/Env.h +++ /dev/null @@ -1,72 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Env.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_ENV_H_ -#define _ACEXML_ENV_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Macros.h" -#include "ACEXML/common/Exception.h" - -/** - * @class ACEXML_Env Env.h "ACEXML/common/Env.h" - * - * @brief ACEXML_Env - * - * ACEXML_Env is modeled after CORBA_Environment class. It provides a place - * holder for callees to propagate exceptions back to callers. ACEXML does - * not support native exceptions at this moment. - * - * @sa ACEXML_Exception - */ -class ACEXML_Export ACEXML_Env -{ -public: - /// Default constructor. - ACEXML_Env (void); - - /// Copy constructor. - ACEXML_Env (const ACEXML_Env& ACEXML_TRY_ENV); - - /// Assignment - ACEXML_Env& operator= (const ACEXML_Env& ACEXML_TRY_ENV); - - /// Destructor. - ~ACEXML_Env (void); - - /// Return the contained exception. - ACEXML_Exception *exception (void) const; - - /// Set the contained exception to @arg ex - void exception (ACEXML_Exception* ex); - - /// Clear the exception and reset the evnrionment. - void clear (void); - -private: - /// Place holder for exception (if one occurs.) - ACEXML_Exception *exception_; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/Env.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* _ACEXML_ENV_H_ */ diff --git a/ACEXML/common/Env.i b/ACEXML/common/Env.i deleted file mode 100644 index 95c3f41c8aa..00000000000 --- a/ACEXML/common/Env.i +++ /dev/null @@ -1,25 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ace/Log_Msg.h" /* to get ACE_ASSERT */ -#include "ACEXML/common/Exception.h" - -ACEXML_INLINE ACEXML_Exception * -ACEXML_Env::exception (void) const -{ - return this->exception_; -} - -ACEXML_INLINE void -ACEXML_Env::exception (ACEXML_Exception *ex) -{ - ACE_ASSERT (ex != this->exception_); - this->clear(); - this->exception_ = ex; -} - -ACEXML_INLINE void -ACEXML_Env::clear (void) -{ - delete this->exception_; - this->exception_ = 0; -} diff --git a/ACEXML/common/ErrorHandler.h b/ACEXML/common/ErrorHandler.h deleted file mode 100644 index 00d793841db..00000000000 --- a/ACEXML/common/ErrorHandler.h +++ /dev/null @@ -1,72 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ErrorHandler.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_ERRORHANDLER_H_ -#define _ACEXML_ERRORHANDLER_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Env.h" -#include "ACEXML/common/SAXExceptions.h" - -/** - * @class ACEXML_ErrorHandler ErrorHandler.h "ACEXML/common/ErrorHandler.h" - * - * @brief ACEXML_ErrorHandler - * - * If a SAX application needs to implement customized error handling, - * it must implement this interface and then register an instance with - * the XML reader using the setErrorHandler method. The parser will - * then report all errors and warnings through this interface. - * - * @b WARNING: If an application does not register an ErrorHandler, - * XML parsing errors will go unreported and bizarre behaviour may - * result. - * - * For XML processing errors, a SAX driver must use this interface - * instead of throwing an exception: it is up to the application to - * decide whether to throw an exception for different types of errors - * and warnings. Note, however, that there is no requirement that the - * parser continue to provide useful information after a call to - * fatalError (in other words, a SAX driver class could catch an - * exception and report a fatalError). - */ -class ACEXML_Export ACEXML_ErrorHandler -{ -public: - /** - * Receive notification of a recoverable error. - */ - virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive notification of a non-recoverable error. - */ - virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Receive notification of a warning. - */ - virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_ERRORHANDLER_H_ */ diff --git a/ACEXML/common/Exception.cpp b/ACEXML/common/Exception.cpp deleted file mode 100644 index 3086a8a7bfb..00000000000 --- a/ACEXML/common/Exception.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/Exception.h" -#include "ace/Log_Msg.h" -#include "ace/ACE.h" - -static const ACEXML_Char ACEXML_Exception_name[] = { - 'A', 'C', 'E', 'X', 'M', 'L', - '_', 'E', 'x', 'c', 'e', 'p', - 't', 'i', 'o', 'n', 0}; -const ACEXML_Char *ACEXML_Exception::exception_name_ = ACEXML_Exception_name; - -static const ACEXML_Char ACEXML_Exception_null [] = {0}; -const ACEXML_Char *ACEXML_Exception::null_ = ACEXML_Exception_null; - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/Exception.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_Exception::ACEXML_Exception (void) -{ -} - -ACEXML_Exception::ACEXML_Exception (const ACEXML_Exception &) -{ -} - - -ACEXML_Exception::~ACEXML_Exception (void) -{ - -} - -int -ACEXML_Exception::is_a (const ACEXML_Char *name) -{ - if (name == ACEXML_Exception::exception_name_ - || ACE_OS::strcmp (ACEXML_Exception::exception_name_, - name) == 0) - return 1; - - return 0; -} - -void -ACEXML_Exception::print (void) -{ - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ACEXML: (%P|%t) EXCEPTION : %s\n"), - this->exception_name_)); -} diff --git a/ACEXML/common/Exception.h b/ACEXML/common/Exception.h deleted file mode 100644 index e09f513a68b..00000000000 --- a/ACEXML/common/Exception.h +++ /dev/null @@ -1,93 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Exception.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_EXCEPTION_H_ -#define _ACEXML_EXCEPTION_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" -#include "ACEXML/common/XML_Macros.h" - -#if defined (ACE_USES_NATIVE_EXCEPTIONS) -# define ACEXML_RAISE(EXCEPTION) throw EXCEPTION -#else -# define ACEXML_RAISE(EXCEPTION) -#endif - - -/** - * @class ACEXML_Exception Exception.h "ACEXML/common/Exception.h" - * - * @brief ACEXML_Exception - * - * ACEXML_Exception is the base class for all ACEXML related exceptions. - * Since ACEXML currently does not support native exceptions, all - * exceptions should be thrown thru ACEXML_Env. - * - * @sa ACEXML_Env - */ -class ACEXML_Export ACEXML_Exception -{ -public: - - /// Copy constructor. - ACEXML_Exception (const ACEXML_Exception &src); - - /// Assignment operator. - ACEXML_Exception& operator= (const ACEXML_Exception& src); - - /// Destructor. - virtual ~ACEXML_Exception (void); - - /// Throw the exception. - virtual void _raise (void) = 0; - - /// Static narrow operation. - static ACEXML_Exception* _downcast (ACEXML_Exception* ex); - - /// Return the exception type. (for safe downcast.) - virtual const ACEXML_Char *id (void) const ; - - /// Dynamically create a copy of this exception. - virtual ACEXML_Exception *duplicate (void) const = 0; - - /// Check whether this is an exception of type specified by . - virtual int is_a (const ACEXML_Char *name) = 0; - - /// Print out exception using ACE_DEBUG. - virtual void print (void) = 0; - -protected: - /// Default contructor. - ACEXML_Exception (void); - - /// All exceptions have names. This name is used to identify the - /// type of an exception. - static const ACEXML_Char *exception_name_; - - /// A null string that we return when there is no exception. - static const ACEXML_Char *null_; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/Exception.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* _ACEXML_EXCEPTION_H_ */ diff --git a/ACEXML/common/Exception.i b/ACEXML/common/Exception.i deleted file mode 100644 index e2d97fa37ea..00000000000 --- a/ACEXML/common/Exception.i +++ /dev/null @@ -1,13 +0,0 @@ -// -*- C++ -*- $Id$ - -ACEXML_INLINE const ACEXML_Char * -ACEXML_Exception::id (void) const -{ - return ACEXML_Exception::exception_name_; -} - -ACEXML_INLINE ACEXML_Exception* -ACEXML_Exception::_downcast (ACEXML_Exception* x) -{ - return x; -} diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp deleted file mode 100644 index 5b989173d2e..00000000000 --- a/ACEXML/common/FileCharStream.cpp +++ /dev/null @@ -1,227 +0,0 @@ -// $Id$ - -#include "ACEXML/common/FileCharStream.h" -#include "ace/ACE.h" -#include "ace/Log_Msg.h" - -ACEXML_FileCharStream::ACEXML_FileCharStream (void) - : filename_ (0), encoding_ (0), size_ (0), infile_ (NULL), peek_ (0) -{ -} - -ACEXML_FileCharStream::~ACEXML_FileCharStream (void) -{ - this->close(); -} - -int -ACEXML_FileCharStream::open (const ACEXML_Char *name) -{ - delete[] this->filename_; - this->filename_ = 0; - - delete[] this->encoding_; - this->encoding_ = 0; - - this->infile_ = ACE_OS::fopen (name, ACE_TEXT ("r")); - if (this->infile_ == NULL) - return -1; - - ACE_stat statbuf; - if (ACE_OS::stat (name, &statbuf) < 0) - return -1; - - this->size_ = statbuf.st_size; - this->filename_ = ACE::strnew (name); - this->determine_encoding(); - return 0; -} - -int -ACEXML_FileCharStream::determine_encoding (void) -{ - char input[4]; - int retval = 0; - int i = 0; - for (; i < 4 && retval != -1; ++i) - retval = this->getchar_i(input[i]); - if (i < 4) - return -1; - - // Rewind the stream - this->rewind(); - - const ACEXML_Char* temp = ACEXML_Encoding::get_encoding (input); - if (!temp) - return -1; - if (ACE_OS::strcmp (temp, - ACEXML_Encoding::encoding_names_[ACEXML_Encoding::OTHER]) == 0) - return -1; - else - { - this->encoding_ = ACE::strnew (temp); -// ACE_DEBUG ((LM_DEBUG, "File's encoding is %s\n", this->encoding_)); - } - // Move over the byte-order-mark if present. - char ch; - for (int j = 0; j < 2; ++j) - { - this->getchar_i (ch); - if (ch == '\xFF' || ch == '\xFE' || ch == '\xEF') - continue; - else - { - ungetc (ch, this->infile_); - break; - } - } - return 0; -} - -void -ACEXML_FileCharStream::rewind() -{ - ACE_OS::rewind (this->infile_); -} - -int -ACEXML_FileCharStream::available (void) -{ - long curr; - if ((curr = ACE_OS::ftell (this->infile_)) < 0) - return -1; - return (this->size_ - curr); -} - -int -ACEXML_FileCharStream::close (void) -{ - if (this->infile_ != NULL) - { - ACE_OS::fclose (this->infile_); - this->infile_ = NULL; - } - delete[] this->filename_; - this->filename_ = 0; - delete[] this->encoding_; - this->encoding_ = 0; - this->size_ = 0; - this->peek_ = 0; - return 0; -} - - -int -ACEXML_FileCharStream::getchar_i (char& ch) -{ - ch = ACE_OS::fgetc (this->infile_); - return (feof(this->infile_) ? -1 : 0); -} - -int -ACEXML_FileCharStream::read (ACEXML_Char *str, - size_t len) -{ - return ACE_OS::fread (str, len, 1, this->infile_); -} - -int -ACEXML_FileCharStream::get (ACEXML_Char& ch) -{ -#if defined (ACE_USES_WCHAR) - return this->get_i (ch); -#else - ch = (ACEXML_Char) ACE_OS::fgetc (this->infile_); - return (feof(this->infile_) ? -1 : 0); -#endif /* ACE_USES_WCHAR */ -} - -#if defined (ACE_USES_WCHAR) -int -ACEXML_FileCharStream::get_i (ACEXML_Char& ch) -{ - if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) - { - ch = (ACEXML_Char) ACE_OS::fgetc (this->infile_); - return (feof(this->infile_) ? -1 : 0); - } - // If we have a value in peek_, return it. - if (this->peek_ != 0) - { - ch = this->peek_; - this->peek_ = 0; - return 0; - } - - int BE = (ACE_OS::strcmp (this->encoding_, - ACE_TEXT ("UTF-16BE")) == 0) ? 1 : 0; - ACEXML_Char input[2]; - int i = 0; - for (; i < 2 && !feof (this->infile_); ++i) - { - input[i] = ACE_OS::fgetwc (this->infile_); - } - if (i < 2) - { - ch = 0; - return -1; - } - ch = (BE) ? (input[0] << 8) | input[1] : (input[1] << 8) | input[0]; - return 0; -} -#endif /* ACE_USES_WCHAR */ - -int -ACEXML_FileCharStream::peek (void) -{ -#if defined (ACE_USES_WCHAR) - return this->peek_i(); -#else - ACEXML_Char ch = ACE_OS::fgetc (this->infile_); - ::ungetc (ch, this->infile_); - return ch; -#endif /* ACE_USES_WCHAR */ -} - -#if defined (ACE_USES_WCHAR) -int -ACEXML_FileCharStream::peek_i (void) -{ - // If we are reading a UTF-8 encoded file, just use the plain unget. - if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) - { - ACEXML_Char ch = (ACEXML_Char) ACE_OS::fgetc (this->infile_); - ::ungetc (ch, this->infile_); - return ch; - } - - // If somebody had already called peek() and not consumed it, return the - // value held in this->peek_. - if (this->peek_ != 0) - return this->peek_; - - // Peek into the stream. This reads two characters off the stream, keeps - // it in peek_. - int BE = (ACE_OS::strcmp (this->encoding_, - ACE_TEXT ("UTF-16BE")) == 0) ? 1 : 0; - ACEXML_Char input[2]; - int i = 0; - for (; i < 2 && !feof (this->infile_); ++i) - { - input[i] = ACE_OS::fgetwc (this->infile_); - } - if (i < 2) - { - this->peek_ = 0; - return -1; - } - this->peek_ = (BE) ? (input[0] << 8) | input[1] : (input[1] << 8) | input[0]; - return this->peek_; -} -#endif /* ACE_USES_WCHAR */ - -const ACEXML_Char* -ACEXML_FileCharStream::getEncoding (void) -{ - return this->encoding_; -} diff --git a/ACEXML/common/FileCharStream.h b/ACEXML/common/FileCharStream.h deleted file mode 100644 index d71792aac59..00000000000 --- a/ACEXML/common/FileCharStream.h +++ /dev/null @@ -1,128 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file FileCharStream.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_FILECHARSTREAM_H_ -#define _ACEXML_FILECHARSTREAM_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/CharStream.h" -#include "ACEXML/common/Encoding.h" -#include "ace/streams.h" - -/** - * @class ACEXML_FileCharStream FileCharStream.h "ACEXML/common/FileCharStream.h" - * - * An implementation of ACEXML_CharStream for reading input from a file. - */ -class ACEXML_Export ACEXML_FileCharStream : public ACEXML_CharStream -{ -public: - /// Default constructor. - ACEXML_FileCharStream (void); - - /// Destructor - virtual ~ACEXML_FileCharStream (void); - - /// Open a file. - int open (const ACEXML_Char *name); - - /** - * Returns the available ACEXML_Char in the buffer. -1 - * if the object is not initialized properly. - */ - virtual int available (void); - - /** - * Close this stream and release all resources used by it. - */ - virtual int close (void); - - /** - * Read the next ACEXML_Char. Return -1 if we are not able to - * return an ACEXML_Char, 0 if EOS is reached, or 1 if succeed. - */ - virtual int get (ACEXML_Char& ch); - - /** - * Read the next batch of ACEXML_Char strings - */ - virtual int read (ACEXML_Char *str, - size_t len); - - /** - * Determine the encoding of the file. - */ - virtual int determine_encoding (void); - - - /** - * Peek the next ACEXML_Char in the CharStream. Return the - * character if success, -1 if EOF is reached. - */ - virtual int peek (void); - - /** - * Resets the file pointer to the beginning of the stream. - */ - virtual void rewind (void); - - /* - * Get the character encoding for a byte stream or URI. - */ - virtual const ACEXML_Char *getEncoding (void); - -protected: - - /** Read the next character as a normal character. Return -1 if EOF is - * reached, else return 0. - */ - virtual int getchar_i (char& ch); - -private: - -#if defined (ACE_USES_WCHAR) - /** - * Read the next character from the stream taking into account the - * encoding of the file. - */ - int get_i (ACEXML_Char& ch); - - /** - * Read the next character from the stream taking into account the - * encoding of the file. Subsequent call to get() returns this - * character. - */ - int peek_i (void); - -#endif /* ACE_USES_WCHAR */ - - ACEXML_Char* filename_; - ACEXML_Char* encoding_; - off_t size_; - FILE* infile_; - // This is needed to ensure that we can implement a peek operation on a - // UTF-16 encoded file. It is a bit hackish, but there is no other way of - // implementing a peek() as the standard I/O FILE* guarantees only one - // pushback. - ACEXML_Char peek_; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_FILECHARSTREAM_H_ */ diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp deleted file mode 100644 index 83426595168..00000000000 --- a/ACEXML/common/HttpCharStream.cpp +++ /dev/null @@ -1,338 +0,0 @@ -// $Id$ - -#include "ace/ACE.h" -#include "ace/ace_wchar.h" -#include "ace/Auto_Ptr.h" -#include "ACEXML/common/HttpCharStream.h" - -ACE_RCSID (common, HttpCharStream, "$Id$") - -/* Header FSM states. */ -static const int HDST_LINE1_PROTOCOL = 0; -static const int HDST_LINE1_WHITESPACE = 1; -static const int HDST_LINE1_STATUS = 2; -static const int HDST_BOL = 10; -static const int HDST_TEXT = 11; -static const int HDST_LF = 12; -static const int HDST_CR = 13; -static const int HDST_CRLF = 14; -static const int HDST_CRLFCR = 15; - -ACEXML_HttpCharStream::ACEXML_HttpCharStream (void) - : url_(0), - url_addr_(0), - stream_(0), - connector_(0), - size_(0), - encoding_ (0) -{ - -} - -ACEXML_HttpCharStream::~ACEXML_HttpCharStream (void) -{ - this->close (); -} - -int -ACEXML_HttpCharStream::open (const ACEXML_Char *url) -{ - this->url_ = ACE::strnew (url); - - ACE_NEW_RETURN (this->url_addr_, ACEXML_URL_Addr, -1); - ACE_NEW_RETURN (this->stream_, ACEXML_Mem_Map_Stream, -1); - - if (this->url_addr_->string_to_addr (this->url_) == -1) { - this->close(); - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "cannot convert URL"), -1); - } - - ACE_NEW_RETURN (this->connector_, - Connector (0, ACE_NONBLOCK), - -1); - - if (this->stream_->open (this->connector_, *this->url_addr_) == -1) { - this->close(); - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "cannot open backing store"), -1); - } - - int result = this->send_request(); - if (result == -1) { - this->close(); - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send_request"), -1); - } - - size_t len = 0; - result = this->get_url(len); - if (result == -1) { - this->close(); - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_url"), -1); - } - if (result != 200) { - this->close(); - ACE_ERROR_RETURN ((LM_ERROR, "Server returned status %d : %s\n", - result, - "Refer HTTP/1.1 for details"), -1); - } - - this->size_ = len; - return 0; -} - -// The FSM was taken from the implementation of http_get and that falls -// under the following license: -// -// Copyrigh (c) 2000 by Jef Poskanzer . All rights reserved. - -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. - -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -// SUCH DAMAGE. - - -int -ACEXML_HttpCharStream::get_url (size_t& len) -{ - int header_state = HDST_LINE1_PROTOCOL; - int status = 0; - size_t b = 0; - char* buf = 0; - size_t buflen = BUFSIZ; - for (;;) - { - if ((buf = ACE_const_cast (char*, - this->stream_->recv (buflen))) == 0) - if (buflen <= 0) - break; - - for (b = 0; b < buflen; ++b) - { - switch ( header_state ) - { - case HDST_LINE1_PROTOCOL: - switch ( buf[b] ) - { - case ' ': case '\t': - header_state = HDST_LINE1_WHITESPACE; break; - case '\n': header_state = HDST_LF ; break; - case '\r': header_state = HDST_CR; break; - } - break; - case HDST_LINE1_WHITESPACE: - switch ( buf[b] ) - { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - status = buf[b] - '0'; - header_state = HDST_LINE1_STATUS; - break; - case '\n': header_state = HDST_LF ; break; - case '\r': header_state = HDST_CR; break; - default: header_state = HDST_TEXT; break; - } - break; - case HDST_LINE1_STATUS: - switch ( buf[b] ) - { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - status = status * 10 + buf[b] - '0'; - break; - case '\n': header_state = HDST_LF ; break; - case '\r': header_state = HDST_CR; break; - default: header_state = HDST_TEXT; break; - } - break; - case HDST_BOL: - switch ( buf[b] ) - { - case '\n': header_state = HDST_LF; break; - case '\r': header_state = HDST_CR; break; - default: header_state = HDST_TEXT; break; - } - break; - case HDST_TEXT: - switch ( buf[b] ) - { - case '\n': header_state = HDST_LF; break; - case '\r': header_state = HDST_CR; break; - } - break; - - case HDST_LF: - switch ( buf[b] ) - { - case '\n': goto end_of_headers; - case '\r': header_state = HDST_CR; break; - default: header_state = HDST_TEXT; break; - } - break; - - case HDST_CR: - switch ( buf[b] ) - { - case '\n': header_state = HDST_CRLF; break; - case '\r': goto end_of_headers; - default: header_state = HDST_TEXT; break; - } - break; - - case HDST_CRLF: - switch ( buf[b] ) - { - case '\n': goto end_of_headers; - case '\r': header_state = HDST_CRLFCR; break; - default: header_state = HDST_TEXT; break; - } - break; - - case HDST_CRLFCR: - switch ( buf[b] ) - { - case '\n': case '\r': goto end_of_headers; - default: header_state = HDST_TEXT; break; - } - break; - } - } - } - end_of_headers: - ++b; - // Store the address of the beginning of data. We will use it to seek to - // beginning of the data in the URL. - char* data_beg = buf + b; - buflen = BUFSIZ; - - // Get all of the data. Since this is backed by file store, we won't lose - // any of the data. - while (( buf = ACE_const_cast (char*, - this->stream_->recv (buflen))) != 0) - ; - - // Length of data in the URL. - len = this->stream_->recv() - data_beg; - - // Move the pointer to the beginning of the file store. - this->stream_->rewind(); - - off_t data_offset = data_beg - this->stream_->recv(); - // Forward to the beginning of data. - if (this->stream_->seek (data_offset, SEEK_SET) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%s: %m", - "Error in seeking to beginning of data"), -1); - return status; -} - - -int -ACEXML_HttpCharStream::send_request (void) -{ - char* path = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (this->url_addr_->get_path_name())); - ACE_Auto_Basic_Array_Ptr path_ptr (path); - int commandsize = ACE_OS::strlen (path) - + ACE_OS::strlen (this->url_addr_->get_host_name ()) - + 20 // Extra - + 1 // NUL byte - + 16 ; // Protocol filler... - - char* command; - ACE_NEW_RETURN (command, char[commandsize], -1); - - // Ensure that the memory is deallocated. - ACE_Auto_Basic_Array_Ptr cmd_ptr (command); - - int bytes = ACE_OS::sprintf (command, "GET %s HTTP/1.1\r\n", path); - bytes += ACE_OS::sprintf (&command[bytes], "Host: %s\r\n", - this->url_addr_->get_host_name ()); - bytes += ACE_OS::sprintf (&command[bytes], "\r\n"); - - ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT); - - // Send the command to the connected server. - int retval = this->stream_->send_n (command, bytes, &tv); - if (retval <= 0) - return -1; - return retval; -} - - -int -ACEXML_HttpCharStream::available (void) -{ - return this->stream_->available(); -} - -int -ACEXML_HttpCharStream::close (void) -{ - delete[] this->url_; - this->url_ = 0; - - delete this->url_addr_; - this->url_addr_ = 0; - - delete this->stream_; - this->stream_ = 0; - - delete this->connector_; - this->connector_ = 0; - - this->size_ = 0; - - delete[] this->encoding_; - this->encoding_ = 0; - - return 0; -} - -int -ACEXML_HttpCharStream::get (ACEXML_Char& ch) -{ - ch = (ACEXML_Char) this->stream_->get_char(); - return (ch == (ACEXML_Char)EOF ? -1 :0); -} - -int -ACEXML_HttpCharStream::read (ACEXML_Char *str, - size_t len) -{ - char* temp = ACE_const_cast (char*, this->stream_->recv (len)); - str = ACE_TEXT_CHAR_TO_TCHAR (temp); - if (str == 0) - return -1; - return len; -} - -int -ACEXML_HttpCharStream::peek (void) -{ - return this->stream_->peek_char (0); -} - -void -ACEXML_HttpCharStream::rewind (void) -{ - this->stream_->rewind(); -} - -const ACEXML_Char* -ACEXML_HttpCharStream::getEncoding (void) -{ - return this->encoding_; -} diff --git a/ACEXML/common/HttpCharStream.h b/ACEXML/common/HttpCharStream.h deleted file mode 100644 index 7bce23a224b..00000000000 --- a/ACEXML/common/HttpCharStream.h +++ /dev/null @@ -1,113 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file HttpCharStream.h - * - * $Id$ - * - * @author Krishnakumar B - */ -//============================================================================= - -#ifndef _ACEXML_HTTPCHARSTREAM_H_ -#define _ACEXML_HTTPCHARSTREAM_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/CharStream.h" -#include "ACEXML/common/URL_Addr.h" -#include "ACEXML/common/Mem_Map_Stream.h" -#include "ace/streams.h" - -/** - * @class ACEXML_HttpCharStream HttpCharStream.h "ACEXML/common/HttpCharStream.h" - * - * An implementation of ACEXML_CharStream for reading input from a URL. - */ -class ACEXML_Export ACEXML_HttpCharStream : public ACEXML_CharStream -{ -public: - /// Default constructor. - ACEXML_HttpCharStream (void); - - /// Destructor - virtual ~ACEXML_HttpCharStream (void); - - /// Open an URL. - int open (const ACEXML_Char *url); - - /** - * Returns the available ACEXML_Char in the buffer. -1 - * if the object is not initialized properly. - */ - virtual int available (void); - - /** - * Close this stream and release all resources used by it. - */ - virtual int close (void); - - /** - * Read the next ACEXML_Char. Return -1 if we are not able to - * return an ACEXML_Char, 0 if EOS is reached, or 1 if succeed. - */ - virtual int get (ACEXML_Char& ch); - - /** - * Read the next batch of ACEXML_Char strings - */ - virtual int read (ACEXML_Char *str, - size_t len); - - /** - * Peek the next ACEXML_Char in the CharStream. Return the - * character if succeess, -1 if EOS is reached. - */ - virtual int peek (void); - - /** - * Resets the file pointer to the beginning of the stream. - */ - virtual void rewind (void); - - /** - * Get the encoding of the file - */ - virtual const ACEXML_Char* getEncoding (void); - -private: - - /** - * Send a HTTP/1.1 request to fetch the contents of the URL. - */ - int send_request (void); - - /** - * Fetch the URL and save it in backing store. - */ - int get_url (size_t& len); - - ACEXML_Char *url_; - - ACEXML_URL_Addr* url_addr_; - - ACEXML_Mem_Map_Stream* stream_; - - Connector* connector_; - - off_t size_; - - ACEXML_Char* encoding_; - -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_HTTPCHARSTREAM_H_ */ diff --git a/ACEXML/common/InputSource.cpp b/ACEXML/common/InputSource.cpp deleted file mode 100644 index 0dcdeb0f2ba..00000000000 --- a/ACEXML/common/InputSource.cpp +++ /dev/null @@ -1,100 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/InputSource.h" -#include "ace/ACE.h" - -ACEXML_InputSource::ACEXML_InputSource (void) - : publicId_ (0), - systemId_ (0), - charStream_ (0), - encoding_ (0) -{ -} - -ACEXML_InputSource::ACEXML_InputSource (ACEXML_CharStream *stm) - : publicId_ (0), - systemId_ (0), - charStream_ (stm), - encoding_ (0) -{ - this->setEncoding (stm->getEncoding()); -} - - /* - * Create a new input source with a character stream. - * / - InputSource (Reader); - */ - -ACEXML_InputSource::ACEXML_InputSource (const ACEXML_Char *systemId) - : systemId_ (ACE::strnew (systemId)) -{ -} - -ACEXML_InputSource::~ACEXML_InputSource (void) -{ - delete[] this->publicId_; - delete[] this->systemId_; - delete this->charStream_; - delete[] this->encoding_; -} - -ACEXML_CharStream * -ACEXML_InputSource::getCharStream (void) -{ - return this->charStream_; -} - - /* - * Get the character stream for this input source. - * / - virtual Reader *getCharacterStream (void); - */ - -const ACEXML_Char * -ACEXML_InputSource::getEncoding (void) -{ - return this->encoding_; -} - -const ACEXML_Char * -ACEXML_InputSource::getPublicId (void) -{ - return this->publicId_; -} - -const ACEXML_Char * -ACEXML_InputSource::getSystemId (void) -{ - return this->systemId_; -} - -void -ACEXML_InputSource::setCharStream (ACEXML_CharStream *stm) -{ - delete this->charStream_; - this->charStream_ = stm; -} - - /* - * Set the character stream for this input source. - * - */ - -void -ACEXML_InputSource::setEncoding (const ACEXML_Char *encoding) -{ - this->encoding_ = ACE::strnew (encoding); -} - -void -ACEXML_InputSource::setPublicId (const ACEXML_Char *publicId) -{ - this->publicId_ = ACE::strnew (publicId); -} - -void -ACEXML_InputSource::setSystemId (const ACEXML_Char *systemId) -{ - this->systemId_ = ACE::strnew (systemId); -} diff --git a/ACEXML/common/InputSource.h b/ACEXML/common/InputSource.h deleted file mode 100644 index 2d8c5a7beb5..00000000000 --- a/ACEXML/common/InputSource.h +++ /dev/null @@ -1,130 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file InputSource.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_INPUTSOURCE_H_ -#define _ACEXML_INPUTSOURCE_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/CharStream.h" - -/** - * @class ACEXML_InputSource InputSource.h "ACEXML/common/InputSource.h" - * - * @brief ACEXML_InputSource encapsulates the actual input stream with some - * added information. - * - * This class allows a SAX application to encapsulate information - * about an input source in a single object, which may include a - * public identifier, a system identifier, a byte stream (possibly - * with a specified encoding), and/or a character stream. - * - * There are two places that the application will deliver this input - * source to the parser: as the argument to the Parser.parse method, - * or as the return value of the EntityResolver.resolveEntity method. - * - * The SAX parser will use the InputSource object to determine how to - * read XML input. If there is a character stream available, the - * parser will read that stream directly; if not, the parser will use - * a byte stream, if available; if neither a character stream nor a - * byte stream is available, the parser will attempt to open a URI - * connection to the resource identified by the system identifier. - * - * An InputSource object belongs to the application: the SAX parser - * shall never modify it in any way (it may modify a copy if - * necessary). - * - * @sa ACEXML_CharStream - */ -class ACEXML_Export ACEXML_InputSource -{ -public: - /* - * Default constructor. - */ - ACEXML_InputSource (void); - - /* - * Create a new input source with a ACEXML_Char stream. - * Notice that ACEXML_InputSource assumes the ownership - * of - */ - ACEXML_InputSource (ACEXML_CharStream *stream); - - /* - * Create a new input source with a system identifier. - */ - ACEXML_InputSource (const ACEXML_Char *systemId); - - /* - * Default destructor. - */ - virtual ~ACEXML_InputSource (void); - - /* - * Get the ACEXML_Char stream for this input source. - */ - virtual ACEXML_CharStream *getCharStream (void); - - /* - * Get the character encoding for a byte stream or URI. - */ - virtual const ACEXML_Char *getEncoding (void); - - /* - * Get the public identifier for this input source. - */ - virtual const ACEXML_Char *getPublicId (void); - - /* - * Get the system identifier for this input source. - */ - virtual const ACEXML_Char *getSystemId (void); - - /* - * Set the ACEXML_Char stream for this input source. - * Notice that ACEXML_InputSource assumes the ownership - * of - */ - virtual void setCharStream (ACEXML_CharStream *charStream); - - /* - * Set the character encoding, if known. - */ - virtual void setEncoding (const ACEXML_Char *encoding); - - /* - * Set the public identifier for this input source. - */ - virtual void setPublicId (const ACEXML_Char *publicId); - - /* - * Set the public identifier for this input source. - */ - virtual void setSystemId (const ACEXML_Char *systemId); - -private: - ACEXML_Char *publicId_; - ACEXML_Char *systemId_; - ACEXML_CharStream *charStream_; - ACEXML_Char *encoding_; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_INPUTSOURCE_H_ */ diff --git a/ACEXML/common/Locator.h b/ACEXML/common/Locator.h deleted file mode 100644 index fc3f4170d38..00000000000 --- a/ACEXML/common/Locator.h +++ /dev/null @@ -1,70 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Locator.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_LOCATOR_H_ -#define _ACEXML_LOCATOR_H_ -#include "ace/pre.h" - -#include "ACEXML/common/XML_Types.h" - -/** - * @class ACEXML_Locator Locator.h "ACEXML/common/Locator.h" - * - * @brief ACEXML_Locator defines operations that an XML locator should support. - * - * If a SAX parser provides location information to the SAX - * application, it does so by implementing this interface and then - * passing an instance to the application using the content handler's - * setDocumentLocator method. The application can use the object to - * obtain the location of any other content handler event in the XML - * source document. - * - * Note that the results returned by the object will be valid only - * during the scope of each content handler method: the application - * will receive unpredictable results if it attempts to use the - * locator at any other time. - * - * SAX parsers are not required to supply a locator, but they are very - * strongly encouraged to do so. If the parser supplies a locator, it - * must do so before reporting any other document events. If no - * locator has been set by the time the application receives the - * startDocument event, the application should assume that a locator - * is not available. - */ -class ACEXML_Export ACEXML_Locator -{ -public: - /* - * Return the column number where the current document event ends. - */ - virtual int getColumnNumber (void) const = 0; - - /* - * Return the line number where the current document event ends. - */ - virtual int getLineNumber (void) const = 0; - - /* - * Return the public identifier for the current document event. - */ - virtual const ACEXML_Char *getPublicId (void) const = 0; - - /* - * Return the system identifier for the current document event. - */ - virtual const ACEXML_Char *getSystemId (void) const = 0; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_LOCATOR_H_ */ diff --git a/ACEXML/common/LocatorImpl.cpp b/ACEXML/common/LocatorImpl.cpp deleted file mode 100644 index 0ccf9c1773a..00000000000 --- a/ACEXML/common/LocatorImpl.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/LocatorImpl.h" - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/LocatorImpl.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_LocatorImpl::ACEXML_LocatorImpl (void) - : publicId_ (0), - systemId_ (0), - lineNumber_ (1), - columnNumber_ (0) -{ -} - -ACEXML_LocatorImpl::ACEXML_LocatorImpl (const ACEXML_Locator& locator) - : publicId_ (ACE::strnew (locator.getPublicId ())), - systemId_ (ACE::strnew (locator.getSystemId ())), - lineNumber_ (locator.getLineNumber ()), - columnNumber_ (locator.getColumnNumber ()) -{ -} - -ACEXML_LocatorImpl::~ACEXML_LocatorImpl (void) -{ - -} - -void -ACEXML_LocatorImpl::reset (void) -{ - delete[] this->publicId_; - this->publicId_ = 0; - delete[] this->systemId_; - this->systemId_ = 0; - this->columnNumber_ = 0; - this->lineNumber_ = 1; -} diff --git a/ACEXML/common/LocatorImpl.h b/ACEXML/common/LocatorImpl.h deleted file mode 100644 index 5e0bbdace23..00000000000 --- a/ACEXML/common/LocatorImpl.h +++ /dev/null @@ -1,153 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file LocatorImpl.h - * - * $Id$ - * - * @author Nanbor Wang - * @author Krishnakumar Balasubramanian - */ -//============================================================================= - -#ifndef ACEXML_LOCALTORIMPL_H -#define ACEXML_LOCALTORIMPL_H - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Locator.h" - -/** - * @class ACEXML_LocatorImpl LocatorImpl.h "ACEXML/common/LocatorImpl.h" - * - * @brief ACEXML_LocatorImpl is an implementation of ACEXML_Locator. - * - * This class is available mainly for application writers, who can - * use it to make a persistent snapshot of a locator at any point - * during a document parse: - * - * @code - * ACEXML_Locator locator; - * ACEXML_Locator startloc; - * - * public void setLocator (ACEXML_Locator locator) - * { - * // note the locator - * this.locator = locator; - * } - * - * public void startDocument () - * { - * // save the location of the start of the document - * // for future use. - * ACEXML_Locator startloc = new ACEXML_LocatorImpl(locator); - * } - * @endcode - * - * Normally, parser writers will not use this class, since it is more - * efficient to provide location information only when requested, - * rather than constantly updating a Locator object. - * - * @todo ACEXML parser doesn't support the use of Locator yet. - * - * @sa ACEXML_Locator - */ -class ACEXML_Export ACEXML_LocatorImpl : public ACEXML_Locator -{ -public: - /* - * Default constructor. - */ - ACEXML_LocatorImpl (void); - - /* - * Copy constructor. Create a persistent copy of the current state - * of a locator. When the original locator changes, this copy will - * still keep the original values (and it can be used outside the - * scope of DocumentHandler methods). - */ - ACEXML_LocatorImpl (const ACEXML_Locator& locator); - - /* - * Destructor. - */ - virtual ~ACEXML_LocatorImpl (void); - - /* - * Return the column number where the current document event ends. - */ - virtual int getColumnNumber (void) const; - - /* - * Return the line number where the current document event ends. - */ - virtual int getLineNumber (void) const; - - /* - * Return the public identifier for the current document event. - */ - virtual const ACEXML_Char *getPublicId (void) const; - - /* - * Return the system identifier for the current document event. - */ - virtual const ACEXML_Char *getSystemId (void) const; - - /* - * Set the column number of this locator. - */ - void setColumnNumber (int cn); - - /* - * Set the line number of this locator. - */ - void setLineNumber (int ln); - - /* - * Set the public identifier of this locator. - */ - void setPublicId (const ACEXML_Char *id); - - /* - * Set the system identifier of this locator. - */ - void setSystemId (const ACEXML_Char *id); - - /* - * Increment the line number. - */ - void incrLineNumber (); - - /* - * Increment the column number. - */ - void incrColumnNumber (); - - /* - * Reset the Locator information. This is necessary because one might - * want to use the same parser to parse multiple files. In that case, - * tying the life of the Locator with the parser is not appropriate. The - * parser calls this method as soon as issuing an endDocument() call. - */ - void reset (void); - -private: - ACEXML_Char *publicId_; - ACEXML_Char *systemId_; - int lineNumber_; - int columnNumber_; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/LocatorImpl.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACEXML_LOCALTORIMPL_H */ diff --git a/ACEXML/common/LocatorImpl.i b/ACEXML/common/LocatorImpl.i deleted file mode 100644 index 808a8bd4ac4..00000000000 --- a/ACEXML/common/LocatorImpl.i +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ace/ACE.h" - -ACEXML_INLINE void -ACEXML_LocatorImpl::setColumnNumber (int cn) -{ - this->columnNumber_ = cn; -} - -ACEXML_INLINE void -ACEXML_LocatorImpl::setLineNumber (int ln) -{ - this->lineNumber_ = ln; -} - -ACEXML_INLINE int -ACEXML_LocatorImpl::getColumnNumber (void) const -{ - return this->columnNumber_; -} - -ACEXML_INLINE int -ACEXML_LocatorImpl::getLineNumber (void) const -{ - return this->lineNumber_; -} - -ACEXML_INLINE void -ACEXML_LocatorImpl::setPublicId (const ACEXML_Char *id) -{ - delete[] this->publicId_; - this->publicId_ = ACE::strnew (id); -} - -ACEXML_INLINE void -ACEXML_LocatorImpl::setSystemId (const ACEXML_Char *id) -{ - delete[] this->systemId_; - this->systemId_ = ACE::strnew (id); -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_LocatorImpl::getPublicId (void) const -{ - return this->publicId_; -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_LocatorImpl::getSystemId (void) const -{ - return this->systemId_; -} - -ACEXML_INLINE void -ACEXML_LocatorImpl::incrLineNumber () -{ - ++this->lineNumber_; -} - -ACEXML_INLINE void -ACEXML_LocatorImpl::incrColumnNumber () -{ - ++this->columnNumber_; -} diff --git a/ACEXML/common/Makefile b/ACEXML/common/Makefile deleted file mode 100644 index 2a0eb4077b8..00000000000 --- a/ACEXML/common/Makefile +++ /dev/null @@ -1,2721 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the server-side ACE network services -#---------------------------------------------------------------------------- - -LIB = libACEXML.a -SHLIB = libACEXML.$(SOEXT) - -FILES = Attributes_Def_Builder \ - AttributesImpl \ - CharStream \ - DefaultHandler \ - DTD_Manager \ - Element_Def_Builder \ - Env \ - Exception \ - FileCharStream \ - InputSource \ - LocatorImpl \ - NamespaceSupport \ - SAXExceptions \ - StrCharStream \ - Transcode \ - Validator \ - XMLFilterImpl \ - XML_Codecs \ - Mem_Map_Stream \ - URL_Addr \ - HttpCharStream \ - StreamFactory \ - Encoding - -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -LIBS += $(ACELIB) - -BUILD = $(VLIB) $(VSHLIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -ifeq ($(shared_libs),1) -ifneq ($(SHLIB),) -CPPFLAGS += -DACEXML_BUILD_DLL -endif -endif - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Attributes_Def_Builder.o .obj/Attributes_Def_Builder.so .shobj/Attributes_Def_Builder.o .shobj/Attributes_Def_Builder.so: Attributes_Def_Builder.cpp \ - Attributes_Def_Builder.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Env.h \ - XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.h \ - Exception.i \ - Env.i \ - SAXExceptions.h \ - SAXExceptions.i - -.obj/AttributesImpl.o .obj/AttributesImpl.so .shobj/AttributesImpl.o .shobj/AttributesImpl.so: AttributesImpl.cpp \ - AttributesImpl.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - Attributes.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - AttributesImpl.i - -.obj/CharStream.o .obj/CharStream.so .shobj/CharStream.o .shobj/CharStream.so: CharStream.cpp \ - CharStream.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i - -.obj/DefaultHandler.o .obj/DefaultHandler.so .shobj/DefaultHandler.o .shobj/DefaultHandler.so: DefaultHandler.cpp \ - DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - ContentHandler.h \ - Env.h \ - XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Env.i \ - SAXExceptions.h \ - SAXExceptions.i \ - Locator.h \ - Attributes.h \ - DTDHandler.h \ - EntityResolver.h \ - InputSource.h \ - CharStream.h \ - ErrorHandler.h \ - DefaultHandler.i - -.obj/DTD_Manager.o .obj/DTD_Manager.so .shobj/DTD_Manager.o .shobj/DTD_Manager.so: DTD_Manager.cpp \ - DTD_Manager.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - Attributes_Def_Builder.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Env.h \ - XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.h \ - Exception.i \ - Env.i \ - SAXExceptions.h \ - SAXExceptions.i \ - Element_Def_Builder.h \ - Validator.h \ - Attributes.h - -.obj/Element_Def_Builder.o .obj/Element_Def_Builder.so .shobj/Element_Def_Builder.o .shobj/Element_Def_Builder.so: Element_Def_Builder.cpp \ - Element_Def_Builder.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - Env.h \ - XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.h \ - Exception.i \ - Env.i \ - SAXExceptions.h \ - SAXExceptions.i - -.obj/Env.o .obj/Env.so .shobj/Env.o .shobj/Env.so: Env.cpp Env.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Env.i - -.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \ - Exception.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.i - -.obj/FileCharStream.o .obj/FileCharStream.so .shobj/FileCharStream.o .shobj/FileCharStream.so: FileCharStream.cpp \ - FileCharStream.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - CharStream.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Encoding.h - -.obj/InputSource.o .obj/InputSource.so .shobj/InputSource.o .shobj/InputSource.so: InputSource.cpp \ - InputSource.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - CharStream.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i - -.obj/LocatorImpl.o .obj/LocatorImpl.so .shobj/LocatorImpl.o .shobj/LocatorImpl.so: LocatorImpl.cpp \ - LocatorImpl.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - Locator.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - LocatorImpl.i - -.obj/NamespaceSupport.o .obj/NamespaceSupport.so .shobj/NamespaceSupport.o .shobj/NamespaceSupport.so: NamespaceSupport.cpp \ - NamespaceSupport.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - NamespaceSupport.i - -.obj/SAXExceptions.o .obj/SAXExceptions.so .shobj/SAXExceptions.o .shobj/SAXExceptions.so: SAXExceptions.cpp \ - SAXExceptions.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - Exception.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.i \ - SAXExceptions.i - -.obj/StrCharStream.o .obj/StrCharStream.so .shobj/StrCharStream.o .shobj/StrCharStream.so: StrCharStream.cpp \ - StrCharStream.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - CharStream.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Encoding.h - -.obj/Transcode.o .obj/Transcode.so .shobj/Transcode.o .shobj/Transcode.so: Transcode.cpp \ - Transcode.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Transcode.i - -.obj/Validator.o .obj/Validator.so .shobj/Validator.o .shobj/Validator.so: Validator.cpp \ - Validator.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - Attributes.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Env.h \ - XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.h \ - Exception.i \ - Env.i \ - SAXExceptions.h \ - SAXExceptions.i - -.obj/XMLFilterImpl.o .obj/XMLFilterImpl.so .shobj/XMLFilterImpl.o .shobj/XMLFilterImpl.so: XMLFilterImpl.cpp \ - XMLFilterImpl.h \ - $(ACE_ROOT)/ace/pre.h \ - XMLFilter.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - XMLReader.h \ - ContentHandler.h \ - Env.h \ - XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - Exception.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Env.i \ - SAXExceptions.h \ - SAXExceptions.i \ - Locator.h \ - Attributes.h \ - DTDHandler.h \ - EntityResolver.h \ - InputSource.h \ - CharStream.h \ - ErrorHandler.h \ - XMLFilterImpl.i - -.obj/XML_Codecs.o .obj/XML_Codecs.so .shobj/XML_Codecs.o .shobj/XML_Codecs.so: XML_Codecs.cpp $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - XML_Codecs.h \ - ACEXML_Export.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Codecs.h - -.obj/Mem_Map_Stream.o .obj/Mem_Map_Stream.so .shobj/Mem_Map_Stream.o .shobj/Mem_Map_Stream.so: Mem_Map_Stream.cpp \ - $(ACE_ROOT)/ace/FILE_Addr.h \ - $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/FILE_Addr.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - Mem_Map_Stream.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - XML_Types.h - -.obj/URL_Addr.o .obj/URL_Addr.so .shobj/URL_Addr.o .shobj/URL_Addr.so: URL_Addr.cpp $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - URL_Addr.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - XML_Types.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - URL_Addr.inl - -.obj/HttpCharStream.o .obj/HttpCharStream.so .shobj/HttpCharStream.o .shobj/HttpCharStream.so: HttpCharStream.cpp $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - HttpCharStream.h \ - ACEXML_Export.h \ - CharStream.h \ - XML_Types.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - URL_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - URL_Addr.inl \ - Mem_Map_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i - -.obj/StreamFactory.o .obj/StreamFactory.so .shobj/StreamFactory.o .shobj/StreamFactory.so: StreamFactory.cpp \ - StreamFactory.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - FileCharStream.h \ - CharStream.h \ - Encoding.h \ - HttpCharStream.h \ - URL_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - URL_Addr.inl \ - Mem_Map_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i - -.obj/Encoding.o .obj/Encoding.so .shobj/Encoding.o .shobj/Encoding.so: Encoding.cpp Encoding.h \ - $(ACE_ROOT)/ace/pre.h \ - ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/common/Makefile.bor b/ACEXML/common/Makefile.bor deleted file mode 100644 index 8545b53d384..00000000000 --- a/ACEXML/common/Makefile.bor +++ /dev/null @@ -1,38 +0,0 @@ -# Makefile for building the XML library - -NAME = ACEXML - -OBJFILES = \ - $(OBJDIR)\Attributes_Def_Builder.obj \ - $(OBJDIR)\AttributesImpl.obj \ - $(OBJDIR)\CharStream.obj \ - $(OBJDIR)\DefaultHandler.obj \ - $(OBJDIR)\DTD_Manager.obj \ - $(OBJDIR)\Element_Def_Builder.obj \ - $(OBJDIR)\Env.obj \ - $(OBJDIR)\Encoding.obj \ - $(OBJDIR)\Exception.obj \ - $(OBJDIR)\FileCharStream.obj \ - $(OBJDIR)\InputSource.obj \ - $(OBJDIR)\LocatorImpl.obj \ - $(OBJDIR)\NamespaceSupport.obj \ - $(OBJDIR)\SAXExceptions.obj \ - $(OBJDIR)\StrCharStream.obj \ - $(OBJDIR)\Transcode.obj \ - $(OBJDIR)\Validator.obj \ - $(OBJDIR)\XMLFilterImpl.obj \ - $(OBJDIR)\Mem_Map_Stream.obj \ - $(OBJDIR)\HttpCharStream.obj \ - $(OBJDIR)\URL_Addr.obj - -CFLAGS = \ - $(ACE_CFLAGS) \ - $(ACE_XML_CFLAGS) \ - -DACEXML_BUILD_DLL - -CPPDIR = .;.. - -LIBFILES = \ - $(ACE_LIB) - -!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> diff --git a/ACEXML/common/Mem_Map_Stream.cpp b/ACEXML/common/Mem_Map_Stream.cpp deleted file mode 100644 index 818bd11b230..00000000000 --- a/ACEXML/common/Mem_Map_Stream.cpp +++ /dev/null @@ -1,260 +0,0 @@ -// $Id$ - -#include "ace/FILE_Addr.h" -#include "ACEXML/common/Mem_Map_Stream.h" - -ACE_RCSID(common, Mem_Map_Stream, "$Id$") - -ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream (void) -{ - -} - -ACE_SOCK_Stream & -ACEXML_Mem_Map_Stream::stream (void) -{ - return svc_handler_->peer (); -} - -ssize_t -ACEXML_Mem_Map_Stream::send_n (const void *buf, size_t size, - ACE_Time_Value *tv) -{ - return svc_handler_->peer ().send_n (buf, size, 0, tv); -} - -int -ACEXML_Mem_Map_Stream::eof (void) const -{ - return this->get_pos_ >= this->end_of_mapping_plus1_; -} - -int -ACEXML_Mem_Map_Stream::get_char (void) -{ - if (this->eof () && this->grow_file_and_remap () == -1) - return EOF; - - return *this->get_pos_++; -} - -void -ACEXML_Mem_Map_Stream::rewind (void) -{ - this->recv_pos_ = ACE_reinterpret_cast (char *, - this->mem_map_.addr ()); - this->get_pos_ = this->recv_pos_; - this->end_of_mapping_plus1_ = this->recv_pos_ + this->mem_map_.size (); -} - -int -ACEXML_Mem_Map_Stream::peek_char (size_t offset) -{ - // We may need to iterate if the size of is large. - while (this->get_pos_ + offset >= this->end_of_mapping_plus1_) - if (this->grow_file_and_remap () == -1) - return EOF; - - return this->get_pos_[offset]; -} - -const char * -ACEXML_Mem_Map_Stream::recv (void) const -{ - return this->recv_pos_; -} - -const char * -ACEXML_Mem_Map_Stream::recv (size_t &len) -{ - if (this->eof () && this->grow_file_and_remap () == -1) - return 0; - - const char *s = this->recv_pos_; - this->seek (len, SEEK_CUR); - len = this->get_pos_ - s; - return s; -} - -size_t -ACEXML_Mem_Map_Stream::recv_len (void) const -{ - return this->get_pos_ - this->recv_pos_; -} - -const char * -ACEXML_Mem_Map_Stream::peek_str (size_t offset, - size_t size) -{ - // We will iterate if the size of is large. - while (this->get_pos_ + (offset + size) > this->end_of_mapping_plus1_) - if (this->grow_file_and_remap () == -1) - return 0; - - return &this->get_pos_[offset]; -} - -off_t -ACEXML_Mem_Map_Stream::seek (off_t offset, int whence) -{ - switch (whence) - { - case SEEK_SET: - this->get_pos_ = - ACE_reinterpret_cast (char *, - this->mem_map_.addr ()) - + offset; - break; - - case SEEK_CUR: - this->get_pos_ += offset; - break; - - case SEEK_END: - this->get_pos_ = - this->end_of_mapping_plus1_ + offset; - // @@ Not sure how to implement this (yet). - ACE_NOTSUP_RETURN (-1); - break; - } - - // Make sure that the backing store will cover this. - while (this->get_pos_ > this->end_of_mapping_plus1_) - if (this->grow_file_and_remap () == -1) - this->get_pos_ = this->end_of_mapping_plus1_; - - this->recv_pos_ = this->get_pos_; - return this->recv_pos_ - ACE_reinterpret_cast (char *, - this->mem_map_.addr ()); -} - -Svc_Handler * -ACEXML_Mem_Map_Stream::svc_handler (void) -{ - return this->svc_handler_; -} - -size_t -ACEXML_Mem_Map_Stream::available (void) const -{ - return this->end_of_mapping_plus1_ - this->get_pos_; -} - -int -ACEXML_Mem_Map_Stream::open (Connector *connector, - const ACE_INET_Addr &addr) -{ - svc_handler_ = 0; - - // Connect to the server at . If the handler has to be - // connected to the server again, the Caching strategy takes care - // and uses the same connection. - if (connector->connect (svc_handler_, - addr) == -1) - { - - ACE_ERROR_RETURN ((LM_ERROR, - "%p %s %d\n", - "Connect failed", - addr.get_host_name (), - addr.get_port_number ()), - -1); - } - // Create a temporary filename. - ACE_FILE_Addr file (ACE_sap_any_cast (ACE_FILE_Addr &)); - - // Create the temporary file via the class API. - if (this->mem_map_.open (file.get_path_name (), - O_RDWR | O_CREAT | O_APPEND, - ACE_DEFAULT_FILE_PERMS) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "open"), - -1); - // Make sure to unlink this right away so that if this process - // crashes these files will be removed automatically. - else if (ACE_OS::unlink (file.get_path_name ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "unlink"), - -1); - else - // Initialize all the position pointers to 0. - this->rewind (); - - return 0; -} - -int -ACEXML_Mem_Map_Stream::grow_file_and_remap (void) -{ - char buf[BUFSIZ + 1]; - - // Copy the next chunk of bytes from the socket into the temporary - // file. - ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT); - - ssize_t n = this->svc_handler_->peer ().recv (buf, sizeof buf, 0, &tv); - if (n == -1) - { - ACE_ERROR ((LM_ERROR, "%p\n", "recv")); - return -1; - } - else if (n == 0) - return -1; - else if (ACE::write_n (this->mem_map_.handle (), buf, n) != n) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "write_n"), - -1); - - // Grow the memory-mapping to encompass the entire temporary file. - if (this->mem_map_.map (-1, - PROT_RDWR, - ACE_MAP_PRIVATE | ACE_MAP_FIXED, - ACE_DEFAULT_BASE_ADDR) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "map"), - -1); - // MAP_FAILED is used as a "first time in" flag. - if (this->recv_pos_ == MAP_FAILED) - { - this->recv_pos_ = ACE_reinterpret_cast (char *, - this->mem_map_.addr ()); - this->get_pos_ = this->recv_pos_; - } - - this->end_of_mapping_plus1_ = - ACE_reinterpret_cast (char *, - this->mem_map_.addr ()) - + this->mem_map_.size (); - - return 0; -} - -ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream (void) -{ - // Remove the mapping and the file. - this->mem_map_.remove (); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Svc_Handler; -template class ACE_Connector ; -template class ACE_Svc_Tuple; -template class ACE_Map_Entry *>; -template class ACE_Map_Manager *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base *, ACE_SYNCH_RW_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Svc_Handler -#pragma instantiate ACE_Connector -#pragma instantiate ACE_Svc_Tuple -#pragma instantiate ACE_Map_Entry *> -#pragma instantiate ACE_Map_Manager *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base *, ACE_SYNCH_RW_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ACEXML/common/Mem_Map_Stream.h b/ACEXML/common/Mem_Map_Stream.h deleted file mode 100644 index 6dfd468a90e..00000000000 --- a/ACEXML/common/Mem_Map_Stream.h +++ /dev/null @@ -1,192 +0,0 @@ -/* -*- C++ -*- */ - -/** @file Mem_Map_Stream.h - * - * $Id$ - * - * @author Douglas C. Schmidt - * @author Krishnakumar B - * - */ - -#ifndef _ACEXML_MEM_MAP_STREAM_H -#define _ACEXML_MEM_MAP_STREAM_H - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK_Stream.h" -#include "ace/Mem_Map.h" -#include "ace/SOCK_Connector.h" -#include "ace/Connector.h" -#include "ace/Svc_Handler.h" -#include "ace/Synch_T.h" -#include "ACEXML/common/XML_Types.h" - -typedef ACE_Svc_Handler Svc_Handler; -typedef ACE_Connector Connector; - -/** - * @class ACEXML_Mem_Map_Stream Mem_Map_Stream.h "ACEXML/common/Mem_Map_Stream.h" - * - * @brief Provides a memory-mapped stream abstraction to simplify parsing - * of tokens. - * - * This class makes it possible to treat an connection as a stream of - * bytes, similar to the C library stdio streams. The contents of the - * connection are buffered incrementally in a memory-mapped file. This - * class maintains pointers to two positions in the stream: - * - * 1. The position, which keeps track of the beginning of a - * token that is in the stream. - * - * 2. The position, which moves along character-by-character - * until the end of the token is reached. - * - * Once a token has been located, it can be extracted from the stream by - * calling the . The length of the token, i.e., the , is - * the length in bytes between the position and the position. - * Once the token has been extracted, the and positions can be - * updated by the method. - */ -class ACEXML_Export ACEXML_Mem_Map_Stream -{ -public: - /// Default constructor - ACEXML_Mem_Map_Stream (void); - - /// Initialize this object. - virtual int open (Connector *connector, - const ACE_INET_Addr &); - - /// Destructor. - virtual ~ACEXML_Mem_Map_Stream (void); - - /// Returns the underlying . - ACE_SOCK_Stream &stream (void); - - /** - * Send bytes in to the connected peer. This is a - * completely unbuffered call. - */ - virtual ssize_t send_n (const void *buf, - size_t size, - ACE_Time_Value *tv = 0); - - /** - * Return the next character in the stream and advance the - * position. Returns EOF when the position reaches the end of the - * HTTP stream. - */ - virtual int get_char (void); - - /** - * Returns a pointer to array of at most characters starting at - * the position. If the position + extends past the - * EOF then is set to the number of characters between the - * position and the EOF and both the and positions are - * advanced by . Returns 0 if the position is at the EOF. - */ - virtual const char *recv (size_t &len); - - /** - * Returns a pointer to array of characters starting at the - * position. - */ - virtual const char *recv (void) const; - - /** - * Returns the length in bytes between the position and the - * position. - */ - virtual size_t recv_len (void) const; - - /** - * Returns the no. of bytes available in the stream. - */ - virtual size_t available (void) const; - - /** - * Resets the and positions to the beginning of the stream. - * This works since all the data has been cached in the memory-mapped - * backing store. - */ - virtual void rewind (void); - - /** - * Returns the nth character from the position in the - * stream without advancing the position. Automatically extends - * the backing store if necessary. Returns EOF if is past the - * end of the stream. - */ - virtual int peek_char (size_t offset); - - /** - * Return a pointer to an array of characters starting at - * characters from the position in the stream without - * advancing the position. Automatically extends the backing store - * if necessary. Returns 0 if or is past the - * end of the stream. - */ - virtual const char *peek_str (size_t offset, size_t size); - - /** - * Sets the and positions as follows: - * o If is , the positions are set to - * bytes from the start of the stream. - * o If is , the positions are set to the - * current position plus . - * o If is , the positions are set to the size - * of the stream plus . - * - * If offset is greater than EOF, both and are set to EOF. - * Note special return value is returned to indicate this condition. - */ - virtual off_t seek (off_t offset, int whence = SEEK_CUR); - - /// Returns 1 if we're at the end of the HTTP stream, else 0. - virtual int eof (void) const; - - /// Returns the underlying service handler. - Svc_Handler *svc_handler (void); - -private: - /** - * Grow the file by reading another chunk from the HTTP socket and - * extend the mapping to cover this chunk. Returns -1 on failure or - * EOF, else 0. - */ - int grow_file_and_remap (void); - - /** - * Connection to peer. The granularity is at the Svc_Handler level. - * The Svc_Handler has an SOCK_Stream. - */ - Svc_Handler *svc_handler_; - - /// Memory-mapped file that we're iterating over. - ACE_Mem_Map mem_map_; - - /// Pointer to the address where the next method will start. - char *recv_pos_; - - /** - * Pointer to the address where the next method will - * start. - */ - char *get_pos_; - - /// Address at the end of the file mapping. - char *end_of_mapping_plus1_; - -}; - - -#include "ace/post.h" - - -#endif /* _ACEXML_MEM_MAP_STREAM_H */ diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp deleted file mode 100644 index b28b9d07248..00000000000 --- a/ACEXML/common/NamespaceSupport.cpp +++ /dev/null @@ -1,275 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/NamespaceSupport.h" - -static const ACEXML_Char ACEXML_XMLNS_PREFIX_name[] = {'x', 'm', 'l', 'n', 's', 0}; -const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS_PREFIX = ACEXML_XMLNS_PREFIX_name; - -static const ACEXML_Char ACEXML_DEFAULT_NS_PREFIX[] = {0}; - -static const ACEXML_Char ACEXML_TABOO_NS_PREFIX[] = {'x', 'm', 'l', 0}; - -static const ACEXML_Char ACEXML_XMLNS_URI_name[] = { - 'h', 't', 't', 'p', ':', '/', '/', - 'w', 'w', 'w', '.', 'w', '3', '.', 'o', 'r', 'g', '/', - 'X', 'M', 'L', '/', '1', '9', '9', '8', '/', - 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', 0}; -const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name; - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/NamespaceSupport.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack (void) - : head_ (0) -{ -} - -ACEXML_Namespace_Context_Stack::~ACEXML_Namespace_Context_Stack (void) -{ - // Clean up stuff. -} - -int -ACEXML_Namespace_Context_Stack::push (ACEXML_NS_CONTEXT *nsc) -{ - struct NS_Node_T *temp = 0; - ACE_NEW_RETURN (temp, struct NS_Node_T, -1); - - temp->item_ = nsc; - temp->next_ = this->head_; - - this->head_ = temp; - return 0; -} - -ACEXML_NS_CONTEXT * -ACEXML_Namespace_Context_Stack::pop (void) -{ - if (this->head_ != 0) - { - struct NS_Node_T *temp = this->head_; - this->head_ = temp->next_; - - ACEXML_NS_CONTEXT* retv = temp->item_; - delete temp; - return retv; - } - return 0; -} - - -ACEXML_NamespaceSupport::ACEXML_NamespaceSupport (void) - : ns_stack_ (), - effective_context_ (0) -{ - // @@ No way to tell if the new fails. - ACE_NEW (effective_context_, - ACEXML_NS_CONTEXT ()); - - ACEXML_String prefix (ACEXML_TABOO_NS_PREFIX, 0, 0); - ACEXML_String uri (ACEXML_XMLNS_URI_name, 0, 0); - this->effective_context_->bind (prefix, uri); -} - -ACEXML_NamespaceSupport::~ACEXML_NamespaceSupport (void) -{ - while (this->popContext () == 0) - ; -} - -int -ACEXML_NamespaceSupport::declarePrefix (const ACEXML_Char *prefix, - const ACEXML_Char *uri) -{ - // Unless predefined by w3.org(?) NS prefix can never start with - // "xml". - if (ACE_OS_String::strcmp (ACEXML_TABOO_NS_PREFIX, prefix) == 0) - return -1; - - ACEXML_String ns_prefix (prefix, 0, 0); - ACEXML_String ns_uri (uri, 0, 0); - - return this->effective_context_->bind (ns_prefix, - ns_uri); -} - -int -ACEXML_NamespaceSupport::getDeclaredPrefixes (ACEXML_STR_LIST &prefixes) const -{ - ACEXML_NS_CONTEXT_ENTRY *entry; - - // The prefix for default namespace (empty string) is included in - // the return list. - for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_); - iter.next (entry) != 0; - iter.advance ()) - prefixes.enqueue_tail (entry->ext_id_.c_str ()); - - return 0; -} - -const ACEXML_Char * -ACEXML_NamespaceSupport::getPrefix (const ACEXML_Char *uri) const -{ - ACEXML_NS_CONTEXT_ENTRY *entry; - - for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_); - iter.next (entry) != 0; - iter.advance ()) - if (entry->int_id_ == ACEXML_String (uri, 0, 0) && - entry->ext_id_ != ACEXML_String (ACEXML_DEFAULT_NS_PREFIX, 0, 0)) - return entry->ext_id_.c_str (); - - return 0; // Nothing found. -} - -int -ACEXML_NamespaceSupport::getPrefixes (ACEXML_STR_LIST &prefixes) const -{ - ACEXML_NS_CONTEXT_ENTRY *entry; - - // The prefix for default namespace (empty string) is not included - // in the return list. - for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_); - iter.next (entry) != 0; - iter.advance ()) - if (entry->ext_id_ != ACEXML_String(ACEXML_DEFAULT_NS_PREFIX, 0, 0)) - prefixes.enqueue_tail (entry->ext_id_.c_str ()); - else - continue; - - return 0; -} - -int -ACEXML_NamespaceSupport::getPrefixes (const ACEXML_Char *uri, - ACEXML_STR_LIST &prefixes) const -{ - ACEXML_NS_CONTEXT_ENTRY *entry; - - for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_); - iter.next (entry) != 0; - iter.advance ()) - if (entry->int_id_ == ACEXML_String (uri, 0, 0) && - entry->ext_id_ != ACEXML_String (ACEXML_DEFAULT_NS_PREFIX, 0, 0)) - prefixes.enqueue_tail (entry->ext_id_.c_str ()); - else - continue; - - return 0; // Nothing found. -} - -const ACEXML_Char * -ACEXML_NamespaceSupport::getURI (const ACEXML_Char *prefix) const -{ - ACEXML_NS_CONTEXT_ENTRY *entry; - - if (this->effective_context_->find (ACEXML_String (prefix, 0, 0), - entry) == 0) - return entry->int_id_.c_str (); - return 0; -} - -int -ACEXML_NamespaceSupport::popContext (void) -{ - delete this->effective_context_; - - if ((this->effective_context_ = this->ns_stack_.pop ()) == 0) - return -1; - return 0; -} - -int -ACEXML_NamespaceSupport::pushContext (void) -{ - ACEXML_NS_CONTEXT *temp = this->effective_context_; - ACE_NEW_RETURN (this->effective_context_, - ACEXML_NS_CONTEXT (), - -1); - - // @@ Copy everything from the old context to the new one. - ACEXML_NS_CONTEXT_ENTRY *entry; - - for (ACEXML_NS_CONTEXT_ITER iter (*temp); - iter.next (entry) != 0; - iter.advance ()) - this->effective_context_->bind (entry->ext_id_, - entry->int_id_); - this->ns_stack_.push (temp); - return 0; -} - - -int -ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName, - const ACEXML_Char *&uri, - const ACEXML_Char *&name, - int is_attribute) const -{ - int qlen = ACE_OS_String::strlen (qName); - int len = -1; - for (int i = 0; i < qlen; ++i) - if (qName [i] == ':') - { - len = i; - break; - } - - ACEXML_String prefix; - - if (len == -1) - { - name = qName; - } - else - { - prefix.set (qName, len, 1); - name = qName + len + 1; - } - - if (is_attribute && len == -1) { - uri = ACEXML_DEFAULT_NS_PREFIX; - return 0; - } - - ACEXML_NS_CONTEXT_ENTRY *entry; - - if (this->effective_context_->find (prefix, entry) == 0) - uri = entry->int_id_.c_str (); - else - { - uri = ACEXML_DEFAULT_NS_PREFIX; - return -1; - } - - return 0; -} - -int -ACEXML_NamespaceSupport::reset (void) -{ - // Not implemented. - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Entry; -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Unbounded_Queue; -template class ACE_Unbounded_Queue_Iterator; -template class ACE_Node; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Entry -#pragma instantiate ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Unbounded_Queue -#pragma instantiate ACE_Unbounded_Queue_Iterator -#pragma instantiate ACE_Node -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ACEXML/common/NamespaceSupport.h b/ACEXML/common/NamespaceSupport.h deleted file mode 100644 index 7d2c7bf10ac..00000000000 --- a/ACEXML/common/NamespaceSupport.h +++ /dev/null @@ -1,239 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file NamespaceSupport.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef ACEXML_NAMESPACESUPPORT_H -#define ACEXML_NAMESPACESUPPORT_H - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" -#include "ace/Functor.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Containers_T.h" -#include "ace/Synch.h" - -typedef ACE_Hash_Map_Entry ACEXML_NS_CONTEXT_ENTRY; - -typedef ACE_Hash_Map_Manager_Ex, - ACE_Equal_To, - ACE_Null_Mutex> ACEXML_NS_CONTEXT; - -typedef ACE_Hash_Map_Iterator_Ex, - ACE_Equal_To, - ACE_Null_Mutex> ACEXML_NS_CONTEXT_ITER; - -typedef ACE_Hash_Map_Reverse_Iterator_Ex, - ACE_Equal_To, - ACE_Null_Mutex> ACEXML_NS_CONTEXT_REVERSE_ITER; - -typedef ACE_Unbounded_Queue ACEXML_STR_LIST; - -/** - * @class ACEXML_Namespace_Context_Stack NamespaceSupport.h "ACEXML/common/NamespaceSupport.h" - * - * @brief ACEXML_Namespace_Context_Stack implements a simple stack - * that ACEXML_NamespaceSupport uses to keep track of namespace scopes. - * - * @sa ACEXML_NamespaceSupport - */ -class ACEXML_Export ACEXML_Namespace_Context_Stack -{ -public: - /// Default constructor. - ACEXML_Namespace_Context_Stack (void); - - /// Destructor. - ~ACEXML_Namespace_Context_Stack (void); - - /// Push the old namespace before entering into a new namespace scope. - int push (ACEXML_NS_CONTEXT * old); - - /// Pop the old namespace when exiting a namespace scope. - ACEXML_NS_CONTEXT *pop (void); - -private: - /// Internal stack structure to hold namespace context. - struct NS_Node_T { - ACEXML_NS_CONTEXT *item_; - struct NS_Node_T *next_; - }; - - /// Anchor point for head of stack. - NS_Node_T *head_; -}; - -/** - * @class ACEXML_NamespaceSupport NamespaceSupport.h "ACEXML/common/NamespaceSupport.h" - * - * @brief ACEXML_NamespaceSupport provides namespace management - * operation for an XML parser. - * - * This class encapsulates the logic of Namespace processing: it - * tracks the declarations currently in force for each context and - * automatically processes qualified XML 1.0 names into their - * Namespace parts; it can also be used in reverse for generating XML - * 1.0 from Namespaces. - * - * Namespace support objects are reusable, but the reset method must - * be invoked between each session. - * - * Here is a simple session (in Java :-p): - * @code - * String parts[] = new String[3]; - * NamespaceSupport support = new NamespaceSupport(); - * - * support.pushContext(); - * support.declarePrefix("", "http://www.w3.org/1999/xhtml"); - * support.declarePrefix("dc", "http://www.purl.org/dc#"); - * - * String parts[] = support.processName("p", parts, false); - * System.out.println("Namespace URI: " + parts[0]); - * System.out.println("Local name: " + parts[1]); - * System.out.println("Raw name: " + parts[2]); - * - * String parts[] = support.processName("dc:title", parts, false); - * System.out.println("Namespace URI: " + parts[0]); - * System.out.println("Local name: " + parts[1]); - * System.out.println("Raw name: " + parts[2]); - * - * support.popContext(); - * @endcode - * - * Note that this class is optimized for the use case where most - * elements do not contain Namespace declarations: if the same - * prefix/URI mapping is repeated for each context (for example), this - * class will be somewhat less efficient. - * - * @sa ACEXML_Exception - */ -class ACEXML_Export ACEXML_NamespaceSupport -{ -public: - /** - * Default constructor. - */ - ACEXML_NamespaceSupport (void); - - /** - * Default destructor. - */ - ~ACEXML_NamespaceSupport (void); - - /** - * XMLNS default prefix and URI strings. - */ - static const ACEXML_Char *XMLNS_PREFIX; - static const ACEXML_Char *XMLNS; - - /** - * Declare a Namespace prefix. Return -1 if the prefix was illegal - * or an internal error occured. Return 0 if the prefix gets declared - * successfully, 1 if the prefix replaces an existing prefix definition. - */ - int declarePrefix (const ACEXML_Char *prefix, - const ACEXML_Char *uri); - - /** - * Return all prefixes declared in current context in - * the user-supplied list @a prefixes. It is user's reponsibility - * to ensure the list was empty originally. - */ - int getDeclaredPrefixes (ACEXML_STR_LIST &prefixes) const; - - /** - * Return one of the prefixes mapped to a Namespace URI. - */ - const ACEXML_Char *getPrefix (const ACEXML_Char *uri) const; - - /** - * Return all prefixes currently declared in the user-supplied list. - * @@ Known bug: This function should only return user-defined prefixes. - */ - int getPrefixes (ACEXML_STR_LIST &prefixes) const; - - /** - * Return all prefixes currently declared for a URI in the - * user-supplied list. - */ - int getPrefixes (const ACEXML_Char *uri, - ACEXML_STR_LIST &prefixes) const; - - /** - * Look up a prefix and get the currently-mapped Namespace URI. - */ - const ACEXML_Char *getURI (const ACEXML_Char *prefix) const; - - /** - * Revert to the previous namespace context. - */ - int popContext (void); - - /** - * Process a raw XML 1.0 name. - * @a qName is the raw XML name we want to parse, - * @a uri contains the URI string of the raw name. It points to a null - * string if the namespace is not valid or there's no namespace defined. - * @a name contains the original name without the prefix. - * @a is_attribute specifies whether the name is an attribute or not. - * Attributes have different scoping rules from elements. - */ - int processName (const ACEXML_Char *qName, - const ACEXML_Char *&uri, - const ACEXML_Char *&name, - int is_attribute) const; - - /** - * Start a new Namespace context. Prefixes defined in previous - * context are copied over to the new context. - */ - int pushContext (void); - - /** - * Reset this Namespace support object for reuse. - * @todo Not implemented. - */ - int reset (void); - -private: - /** - * Namespace Context stack. When we entering a new namespace - * context, the old context is duplicated and pushed into - * this stack. - */ - ACEXML_Namespace_Context_Stack ns_stack_; - - /** - * The effective namespace context. - */ - ACEXML_NS_CONTEXT *effective_context_; -}; - - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/NamespaceSupport.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACEXML_NAMESPACESUPPORT_H */ diff --git a/ACEXML/common/NamespaceSupport.i b/ACEXML/common/NamespaceSupport.i deleted file mode 100644 index 9ae7aa1cb3a..00000000000 --- a/ACEXML/common/NamespaceSupport.i +++ /dev/null @@ -1,16 +0,0 @@ -// -*- C++ -*- $Id$ - -ACE_TEMPLATE_SPECIALIZATION -ACEXML_INLINE int -ACE_Equal_To::operator () (const ACEXML_String &lhs, - const ACEXML_String &rhs) const -{ - return lhs == rhs; -} - -ACE_TEMPLATE_SPECIALIZATION -ACE_INLINE u_long -ACE_Hash::operator () (const ACEXML_String &t) const -{ - return ACE::hash_pjw (t.c_str ()); -} diff --git a/ACEXML/common/SAXExceptions.cpp b/ACEXML/common/SAXExceptions.cpp deleted file mode 100644 index fe0963cd169..00000000000 --- a/ACEXML/common/SAXExceptions.cpp +++ /dev/null @@ -1,255 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/SAXExceptions.h" -#include "ace/Log_Msg.h" -#include "ace/ACE.h" - -static const ACEXML_Char ACEXML_SAXException_name[] = { - 'A', 'C', 'E', 'X', 'M', 'L', '_', - 'S', 'A', 'X', - 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0}; -const ACEXML_Char *ACEXML_SAXException::exception_name_ = ACEXML_SAXException_name; - -static const ACEXML_Char ACEXML_SAXNotSupportedException_name[] = { - 'A', 'C', 'E', 'X', 'M', 'L', '_', - 'S', 'A', 'X', - 'N', 'o', 't', - 'S', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd', - 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0}; -const ACEXML_Char *ACEXML_SAXNotSupportedException::exception_name_ = ACEXML_SAXNotSupportedException_name; - -static const ACEXML_Char ACEXML_SAXNotRecognizedException_name[] = { - 'A', 'C', 'E', 'X', 'M', 'L', '_', - 'S', 'A', 'X', - 'N', 'o', 't', - 'R', 'e', 'c', 'o', 'g', 'n', 'i', 'z', 'e', 'd', - 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0}; -const ACEXML_Char *ACEXML_SAXNotRecognizedException::exception_name_ = ACEXML_SAXNotRecognizedException_name; - -static const ACEXML_Char ACEXML_SAXParseException_name[] = { - 'A', 'C', 'E', 'X', 'M', 'L', '_', - 'S', 'A', 'X', - 'P', 'a', 'r', 's', 'e', - 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0}; -const ACEXML_Char *ACEXML_SAXParseException::exception_name_ = ACEXML_SAXParseException_name; - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/SAXExceptions.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_SAXException::ACEXML_SAXException (void) - : message_ (0) -{ -} - -ACEXML_SAXException::ACEXML_SAXException (const ACEXML_Char *msg) - : message_ (ACE::strnew (msg)) -{ -} - -ACEXML_SAXException::ACEXML_SAXException (const ACEXML_SAXException &ex) - : ACEXML_Exception (ex), - message_ (ACE::strnew (ex.message_)) - -{ -} - -ACEXML_SAXException& -ACEXML_SAXException::operator= (const ACEXML_SAXException& src) -{ - ACEXML_SAXException temp (src); - ACEXML_Char* message = this->message_; - this->exception_name_ = temp.exception_name_; - this->message_ = temp.message_; - temp.message_ = message; - return *this; -} - - -ACEXML_SAXException* -ACEXML_SAXException::_downcast (ACEXML_Exception* ex) -{ - if (ex->is_a (ACE_TEXT ("ACEXML_SAXException"))) - return ACE_dynamic_cast (ACEXML_SAXException*, ex); - return 0; -} - -ACEXML_SAXException::~ACEXML_SAXException (void) -{ - delete[] this->message_; -} - - - -ACEXML_Exception * -ACEXML_SAXException::duplicate (void) const -{ - ACEXML_Exception *tmp; - ACE_NEW_RETURN (tmp, ACEXML_SAXException (*this), 0); - return tmp; -} - -int -ACEXML_SAXException::is_a (const ACEXML_Char *name) -{ - if (name == ACEXML_SAXException::exception_name_ - || ACE_OS::strcmp (ACEXML_Exception::exception_name_, - name) == 0) - return 1; - else - return this->ACEXML_Exception::is_a (name); - - ACE_NOTREACHED (return 0;) -} - -void -ACEXML_SAXException::print (void) -{ - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), - this->exception_name_, this->message())); -} - -ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (void) -{ -} - -ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (const ACEXML_SAXNotSupportedException &ex) - : ACEXML_SAXException (ex) -{ -} - -ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (const ACEXML_Char* msg) - : ACEXML_SAXException (msg) -{ -} - -ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException (void) -{ - delete[] this->message_; -} - - -ACEXML_Exception * -ACEXML_SAXNotSupportedException::duplicate (void) const -{ - ACEXML_Exception *tmp; - ACE_NEW_RETURN (tmp, ACEXML_SAXNotSupportedException (*this), 0); - return tmp; -} - -int -ACEXML_SAXNotSupportedException::is_a (const ACEXML_Char *name) -{ - if (name == ACEXML_SAXNotSupportedException::exception_name_ - || ACE_OS::strcmp (ACEXML_Exception::exception_name_, - name) == 0) - return 1; - else - return this->ACEXML_SAXException::is_a (name); - - ACE_NOTREACHED (return 0;) -} - -void -ACEXML_SAXNotSupportedException::print (void) -{ - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), - this->exception_name_, this->message())); -} - -ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException (void) -{ -} - -ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException (const ACEXML_Char *msg) - : ACEXML_SAXException (msg) -{ -} - -ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException (const ACEXML_SAXNotRecognizedException &ex) - : ACEXML_SAXException (ex) -{ -} - -ACEXML_SAXNotRecognizedException::~ACEXML_SAXNotRecognizedException (void) -{ - delete[] this->message_; -} - -ACEXML_Exception * -ACEXML_SAXNotRecognizedException::duplicate (void) const -{ - ACEXML_Exception *tmp; - ACE_NEW_RETURN (tmp, ACEXML_SAXNotRecognizedException (*this), 0); - return tmp; -} - -int -ACEXML_SAXNotRecognizedException::is_a (const ACEXML_Char *name) -{ - if (name == ACEXML_SAXNotRecognizedException::exception_name_ - || ACE_OS::strcmp (ACEXML_Exception::exception_name_, - name) == 0) - return 1; - else - return this->ACEXML_SAXException::is_a (name); - - ACE_NOTREACHED (return 0;) -} - -void -ACEXML_SAXNotRecognizedException::print (void) -{ - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), - this->exception_name_, this->message())); -} - -ACEXML_SAXParseException::ACEXML_SAXParseException (void) -{ -} - -ACEXML_SAXParseException::ACEXML_SAXParseException (const ACEXML_Char *msg) - : ACEXML_SAXException (msg) -{ -} - -ACEXML_SAXParseException::ACEXML_SAXParseException (const ACEXML_SAXParseException &ex) - : ACEXML_SAXException (ex) -{ -} - -ACEXML_SAXParseException::~ACEXML_SAXParseException (void) -{ -} - -ACEXML_Exception * -ACEXML_SAXParseException::duplicate (void) const -{ - ACEXML_Exception *tmp; - ACE_NEW_RETURN (tmp, ACEXML_SAXParseException (*this), 0); - return tmp; -} - -int -ACEXML_SAXParseException::is_a (const ACEXML_Char *name) -{ - if (name == ACEXML_SAXParseException::exception_name_ - || ACE_OS::strcmp (ACEXML_Exception::exception_name_, - name) == 0) - return 1; - else - return this->ACEXML_SAXException::is_a (name); - - ACE_NOTREACHED (return 0;) -} - -void -ACEXML_SAXParseException::print (void) -{ - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), - this->exception_name_, this->message())); -} diff --git a/ACEXML/common/SAXExceptions.h b/ACEXML/common/SAXExceptions.h deleted file mode 100644 index 8b73da50471..00000000000 --- a/ACEXML/common/SAXExceptions.h +++ /dev/null @@ -1,198 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SAXExceptions.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_SAXEXCEPTIONS_H_ -#define _ACEXML_SAXEXCEPTIONS_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Exception.h" - -/** - * @class ACEXML_SAXException SAXExceptions.h "ACEXML/common/SAXExceptions.h" - * - * @brief ACEXML_SAXException - * - * ACEXML_SAXException is the mother of all SAX related exceptions. - */ -class ACEXML_Export ACEXML_SAXException : public ACEXML_Exception -{ -public: - /// Default constructor. - ACEXML_SAXException (void); - - /// Constructor initializing the exception message. - ACEXML_SAXException (const ACEXML_Char *msg); - - /// Assignment operator - ACEXML_SAXException& operator= (const ACEXML_SAXException& src); - - /// Copy constructor. - ACEXML_SAXException (const ACEXML_SAXException &ex); - - /// Destructor. - virtual ~ACEXML_SAXException (void); - - /// Throw the exception. - virtual void _raise (void); - - /// Static narrow operation. - static ACEXML_SAXException* _downcast (ACEXML_Exception* ex); - - /// Return the name of the exception. - virtual const ACEXML_Char *id (void) const; - - /// Return the extra message accompanying the exception. - const ACEXML_Char *message (void); - - virtual ACEXML_Exception *duplicate (void) const; - - virtual int is_a (const ACEXML_Char *name); - - virtual void print (void); - -protected: - static const ACEXML_Char *exception_name_; - - /// A message providing more information about the exception being thrown. - ACEXML_Char *message_; -}; - -/** - * @class ACEXML_SAXNotSupportedException SAXExceptions.h "ACEXML/common/SAXExceptions.h" - * - * @brief ACEXML_SAXNotSupportedException - */ -class ACEXML_Export ACEXML_SAXNotSupportedException - : public ACEXML_SAXException -{ -public: - /// Default constructor. - ACEXML_SAXNotSupportedException (void); - - /// Copy constructor. - ACEXML_SAXNotSupportedException (const ACEXML_SAXNotSupportedException &ex); - - /// Constructor which accepts an informational message - ACEXML_SAXNotSupportedException (const ACEXML_Char* msg); - - /// Destructor. - virtual ~ACEXML_SAXNotSupportedException (void); - - /// Throw the exception. - virtual void _raise (void); - - /// Static narrow operation. - static ACEXML_SAXNotSupportedException* _downcast (ACEXML_Exception* ex); - - virtual const ACEXML_Char *id (void) const; - - virtual ACEXML_Exception *duplicate (void) const; - - virtual int is_a (const ACEXML_Char *name); - - virtual void print (void); - -protected: - static const ACEXML_Char *exception_name_; -}; - -/** - * @class ACEXML_SAXNotRecognizedException SAXExceptions.h "ACEXML/common/SAXExceptions.h" - * - * @brief ACEXML_SAXNotRecognizedException - */ -class ACEXML_Export ACEXML_SAXNotRecognizedException - : public ACEXML_SAXException -{ -public: - /// Default constructor. - ACEXML_SAXNotRecognizedException (void); - - /// Constructor with an initializing exception message. - ACEXML_SAXNotRecognizedException (const ACEXML_Char *msg); - - /// Copy constructor. - ACEXML_SAXNotRecognizedException (const ACEXML_SAXNotRecognizedException &ex); - /// Destructor. - virtual ~ACEXML_SAXNotRecognizedException (void); - - /// Throw the exception. - virtual void _raise (void); - - /// Static narrow operation. - static ACEXML_SAXNotRecognizedException* _downcast (ACEXML_Exception* ex); - - virtual const ACEXML_Char *id (void) const; - - virtual ACEXML_Exception *duplicate (void) const; - - virtual int is_a (const ACEXML_Char *name); - - virtual void print (void); - -protected: - static const ACEXML_Char *exception_name_; -}; - -/** - * @class ACEXML_SAXParseException SAXExceptions.h "ACEXML/common/SAXExceptions.h" - * - * @brief ACEXML_SAXParseException - * - */ -class ACEXML_Export ACEXML_SAXParseException - : public ACEXML_SAXException -{ -public: - /// Default constructor. - ACEXML_SAXParseException (void); - - /// Constructor with an initializing exception message. - ACEXML_SAXParseException (const ACEXML_Char *msg); - - /// Copy constructor. - ACEXML_SAXParseException (const ACEXML_SAXParseException &ex); - - /// Destructor. - virtual ~ACEXML_SAXParseException (void); - - /// Throw the exception. - virtual void _raise (void); - - /// Static narrow operation. - static ACEXML_SAXParseException* _downcast (ACEXML_Exception* ex); - - virtual const ACEXML_Char *id (void) const; - - virtual ACEXML_Exception *duplicate (void) const; - - virtual int is_a (const ACEXML_Char *name); - - virtual void print (void); - -protected: - static const ACEXML_Char *exception_name_; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/SAXExceptions.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* _ACEXML_SAXEXCEPTIONS_H_ */ diff --git a/ACEXML/common/SAXExceptions.i b/ACEXML/common/SAXExceptions.i deleted file mode 100644 index 3aee40632b5..00000000000 --- a/ACEXML/common/SAXExceptions.i +++ /dev/null @@ -1,57 +0,0 @@ -// -*- C++ -*- $Id$ - -ACEXML_INLINE const ACEXML_Char * -ACEXML_SAXException::message (void) -{ - return (this->message_ == 0 ? - ACEXML_Exception::null_ : - this->message_); -} - -ACEXML_INLINE void -ACEXML_SAXException::_raise (void) -{ - ACEXML_RAISE (*this); -} - -ACEXML_INLINE void -ACEXML_SAXNotSupportedException::_raise (void) -{ - ACEXML_RAISE (*this); -} - -ACEXML_INLINE void -ACEXML_SAXNotRecognizedException::_raise (void) -{ - ACEXML_RAISE (*this); -} - -ACEXML_INLINE void -ACEXML_SAXParseException::_raise (void) -{ - ACEXML_RAISE (*this); -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_SAXException::id (void) const -{ - return ACEXML_SAXException::exception_name_; -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_SAXNotSupportedException::id (void) const -{ - return ACEXML_SAXNotSupportedException::exception_name_; -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_SAXNotRecognizedException::id (void) const -{ - return ACEXML_SAXNotRecognizedException::exception_name_; -} - -ACEXML_INLINE const ACEXML_Char * -ACEXML_SAXParseException::id (void) const -{ - return ACEXML_SAXParseException::exception_name_; -} diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp deleted file mode 100644 index 26211eeff70..00000000000 --- a/ACEXML/common/StrCharStream.cpp +++ /dev/null @@ -1,135 +0,0 @@ -// $Id$ - -#include "ACEXML/common/StrCharStream.h" -#include "ACEXML/common/Encoding.h" -#include "ace/ACE.h" -#include "ace/Log_Msg.h" - -ACEXML_StrCharStream::ACEXML_StrCharStream (void) - : start_ (0), ptr_ (0), end_ (0), encoding_ (0) -{ -} - -ACEXML_StrCharStream::ACEXML_StrCharStream (const ACEXML_Char *str) - : start_ (0), ptr_ (0), end_ (0), encoding_ (0) -{ - this->open (str); -} - - -ACEXML_StrCharStream::~ACEXML_StrCharStream (void) -{ - this->close(); -} - -int -ACEXML_StrCharStream::open (const ACEXML_Char *str) -{ - delete[] this->start_; - delete[] this->encoding_; - - if (str != 0 && (this->start_ = ACE::strnew (str)) != 0) - { - this->ptr_ = this->start_; - this->end_ = this->start_ + ACE_OS_String::strlen (this->start_); - this->determine_encoding(); - return 0; - } - - this->start_ = this->ptr_ = this->end_ = 0; - return -1; // Invalid string passed. -} - -int -ACEXML_StrCharStream::available (void) -{ - if (this->start_ != 0) - return (this->end_ - this->start_); // @@ Will this work on all platforms? - return -1; -} - -int -ACEXML_StrCharStream::close (void) -{ - delete[] this->start_; - delete[] this->encoding_; - this->start_ = this->ptr_ = this->end_ = 0; - return 0; -} - -int -ACEXML_StrCharStream::determine_encoding (void) -{ - char input[4]; - int retval = 0; - char* sptr = (char*)this->start_; - int i = 0; - for ( ; i < 4 && sptr != (char*)this->end_; ++sptr, ++i) - { - retval = input[i] = *sptr; - } - if (i < 4) - return -1; - const ACEXML_Char* temp = ACEXML_Encoding::get_encoding (input); - if (!temp) - return -1; - if (ACE_OS::strcmp (temp, - ACEXML_Encoding::encoding_names_[ACEXML_Encoding::OTHER]) == 0) - return -1; - else - { - this->encoding_ = ACE::strnew (temp); - ACE_DEBUG ((LM_DEBUG, "String's encoding is %s\n", this->encoding_)); - } - return 0; -} - -void -ACEXML_StrCharStream::rewind (void) -{ - this->ptr_ = this->start_; -} - -int -ACEXML_StrCharStream::get (ACEXML_Char& ch) -{ - if (this->start_ != 0 && this->ptr_ != this->end_) - { - ch = *this->ptr_++; - - return 0; - } - - return -1; -} - -int -ACEXML_StrCharStream::read (ACEXML_Char *str, - size_t len) -{ - if (this->start_ != 0 && - this->ptr_ != this->end_) - { - if ((int) len > this->end_ - this->ptr_) - len = this->end_ - this->ptr_; - - ACE_OS_String::strncpy (str, this->ptr_, len); - this->ptr_ += len; - return len; - } - return 0; -} - -int -ACEXML_StrCharStream::peek (void) -{ - if (this->start_ != 0 && this->ptr_ != this->end_) - return *this->ptr_; - return -1; -} - -const ACEXML_Char* -ACEXML_StrCharStream::getEncoding (void) -{ - return this->encoding_; -} diff --git a/ACEXML/common/StrCharStream.h b/ACEXML/common/StrCharStream.h deleted file mode 100644 index 6321decb9a2..00000000000 --- a/ACEXML/common/StrCharStream.h +++ /dev/null @@ -1,100 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file StrCharStream.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_STRCHARSTREAM_H_ -#define _ACEXML_STRCHARSTREAM_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/CharStream.h" - -/** - * @class ACEXML_StrCharStream StrCharStream.h "common/StrCharStream.h" - * - * An implementation of ACEXML_CharStream for reading - * input from a null-terminated ACEXML_Char string. - */ -class ACEXML_Export ACEXML_StrCharStream : public ACEXML_CharStream -{ -public: - /// Default constructor. - ACEXML_StrCharStream (void); - - /// Initializing Constructor. - ACEXML_StrCharStream (const ACEXML_Char *str); - - /// Destructor - virtual ~ACEXML_StrCharStream (void); - - /// Initializing and reset the StrCharStream with @a str. - int open (const ACEXML_Char *str); - - /** - * Returns the available ACEXML_Char in the buffer. -1 - * if the object is not initialized properly. - */ - virtual int available (void); - - /** - * Close this stream and release all resources used by it. - */ - virtual int close (void); - - /** - * Determine the encoding of the file. - */ - virtual int determine_encoding (void); - - /** - * Read the next ACEXML_Char. Return -1 if we are not able to - * return an ACEXML_Char, 0 if EOS is reached, or 1 if succeed. - */ - virtual int get (ACEXML_Char& ch); - - /** - * Read the next batch of ACEXML_Char strings - */ - virtual int read (ACEXML_Char *str, - size_t len); - - /** - * Peek the next ACEXML_Char in the CharStream. Return the - * character if succeess, -1 if EOS is reached. - */ - virtual int peek (void); - - /* - * Get the character encoding for a byte stream or URI. - */ - virtual const ACEXML_Char *getEncoding (void); - - /** - * Resets the pointer to the beginning of the stream. - */ - virtual void rewind (void); - -private: - ACEXML_Char *start_; - ACEXML_Char *ptr_; - ACEXML_Char *end_; - ACEXML_Char* encoding_; - -}; - -#include "ace/post.h" - -#endif /* _ACEXML_STRCHARSTREAM_H_ */ diff --git a/ACEXML/common/StreamFactory.cpp b/ACEXML/common/StreamFactory.cpp deleted file mode 100644 index 80edc8a265f..00000000000 --- a/ACEXML/common/StreamFactory.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// $Id$ - -#include "ACEXML/common/StreamFactory.h" -#include "ACEXML/common/FileCharStream.h" -#include "ACEXML/common/HttpCharStream.h" - -ACE_RCSID (common, StreamFactory, "$Id$") - -ACEXML_CharStream* -ACEXML_StreamFactory::create_stream (const ACEXML_Char* uri) -{ - if (uri == 0) - return 0; - - ACEXML_FileCharStream* fstream = 0; - ACEXML_HttpCharStream* hstream = 0; - - if (ACE_OS::strstr (uri, ACE_TEXT("ftp://")) != 0) - { - return 0; - } - else if (ACE_OS::strstr (uri, ACE_TEXT ("http://")) != 0) - { - ACE_NEW_RETURN (hstream, ACEXML_HttpCharStream, 0); - if (hstream->open (uri) != -1) - return hstream; - else - return 0; - } - else - { - ACE_NEW_RETURN (fstream, ACEXML_FileCharStream, 0); - if (fstream->open (uri) != -1) - return fstream; - else - return 0; - } -} - -ACEXML_StreamFactory::~ACEXML_StreamFactory () -{ - // No op -} diff --git a/ACEXML/common/StreamFactory.h b/ACEXML/common/StreamFactory.h deleted file mode 100644 index fcfda00154a..00000000000 --- a/ACEXML/common/StreamFactory.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * @file StreamFactory.h - * - * $Id$ - * - * @author Krishnakumar B - */ - -#ifndef _ACEXML_STREAM_FACTORY_H -#define _ACEXML_STREAM_FACTORY_H - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" - -// Forward declarations - -class ACEXML_CharStream; - -/** - * @class ACEXML_StreamFactory StreamFactory.h "ACEXML/common/ACEXML_StreamFactory.h" - * - * @brief A generic factory used to create an appropriate @sa - * ACEXML_CharStream from a SYSTEM id. This class creates a @sa - * ACEXML_FileCharStream or a @sa ACEXML_HttpCharStream depending on the - * URI supplied. - * - * @todo Write a stream abstraction for handling ftp:// type URIs and add - * a function to create and return such streams. That is the only chunk - * missing in the armour. - */ - -class ACEXML_Export ACEXML_StreamFactory -{ -public: - - // Destructor - virtual ~ACEXML_StreamFactory (void); - - /** - * Create the appropriate stream from the @a uri passed and return the - * stream. The caller is responsible for deallocating the returned - * stream. - * - * @param uri SYSTEM id or a stream of characters (in the case of a - * StrCharStream). - */ - virtual ACEXML_CharStream* create_stream (const ACEXML_Char* uri); -}; - -#include "ace/post.h" - -#endif /* _ACEXML_STREAM_FACTORY_H */ diff --git a/ACEXML/common/Transcode.cpp b/ACEXML/common/Transcode.cpp deleted file mode 100644 index 4007d346494..00000000000 --- a/ACEXML/common/Transcode.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/Transcode.h" - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/Transcode.i" -#endif /* __ACEXML_INLINE__ */ - -int -ACEXML_Transcoder::utf8s2utf16s (const ACEXML_UTF8 *src, - ACEXML_UTF16 *dst, - size_t len) -{ - if (src == 0 || dst == 0) - return INVALID_ARGS; - - size_t src_len = ACE_OS::strlen (src) + 1; - - size_t total_len = 0; - int forward; - ACEXML_UCS4 temp; - - while (src_len > 0) - { - if ((forward = ACEXML_Transcoder::utf82ucs4 (src, - src_len, - temp)) <= 0) - return forward; - - src += forward; - src_len -= forward; - - if ((forward = ACEXML_Transcoder::ucs42utf16 (temp, - dst, - len)) <= 0) - return forward; - - total_len += forward; - dst += forward; - len -= forward; - } - - return total_len; -} - -int -ACEXML_Transcoder::utf16s2utf8s (const ACEXML_UTF16 *src, - ACEXML_UTF8 *dst, - size_t len) -{ - if (src == 0 || dst == 0) - return INVALID_ARGS; - - size_t src_len = 1; - for (const ACEXML_UTF16 *p = src; *p++ != 0; ++src_len) - ; - - size_t total_len = 0; - int forward; - ACEXML_UCS4 temp; - - while (src_len > 0) - { - if ((forward = ACEXML_Transcoder::utf162ucs4 (src, - src_len, - temp)) <= 0) - return forward; - - src += forward; - src_len -= forward; - - if ((forward = ACEXML_Transcoder::ucs42utf8 (temp, - dst, - len)) <= 0) - return forward; - - total_len += forward; - dst += forward; - len -= forward; - } - - return total_len; -} diff --git a/ACEXML/common/Transcode.h b/ACEXML/common/Transcode.h deleted file mode 100644 index 427784891db..00000000000 --- a/ACEXML/common/Transcode.h +++ /dev/null @@ -1,176 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Transcode.h - * - * This file declares functions to convert char string among different - * unicode encoding (utf8, utf16, utf32) - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_TRANSCODE_H_ -#define _ACEXML_TRANSCODE_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" - -/** - * @class ACEXML_Transcoder Transcode.h "ACEXML/common/Transcode.h" - * - * @brief ACEXML_Transcoder - * - * Wrapper class for performing transcoding among different UNICODE - * encoding. - */ -class ACEXML_Export ACEXML_Transcoder -{ -public: - /* - * Status of the conversion function. - */ - enum - { - SUCCESS = 0, - DESTINATION_TOO_SHORT = -1, - END_OF_SOURCE = -2, - INVALID_ARGS = -3, - IS_SURROGATE = -4, - NON_UNICODE = -5 - } STATUS; - - - // The following functions translate a unicode characters - // into different encoding. Return number of characters put into - // destination or consumed from src if success without - // error, otherwise, return corresponding error code. - /* - * Convert a UTF-16 character into a string in UTF-8 encoding. - * - * @return number of characters the function uses to store the - * converted string if succeeds or one of the error STATUS - * otherwise. - */ - static int utf162utf8 (ACEXML_UTF16 src, - ACEXML_UTF8 *dst, - size_t len); - - /* - * Convert a UCS-4 character into a string in UTF-8 encoding. - * - * @return number of characters the function uses to store the - * converted string if succeeds or one of the error STATUS - * otherwise. - */ - static int ucs42utf8 (ACEXML_UCS4 src, - ACEXML_UTF8 *dst, - size_t len); - - /* - * Convert a UCS-4 character into a string in UTF-16 encoding. - * - * @return number of characters the function uses to store the - * converted string if succeeds or one of the error STATUS - * otherwise. - */ - static int ucs42utf16 (ACEXML_UCS4 src, - ACEXML_UTF16 *dst, - size_t len); - - /* - * Convert a UTF-16 surrogate character pair into a string in UTF-8 encoding. - * - * @return number of characters the function uses to store the - * converted string if succeeds or one of the error STATUS - * otherwise. - */ - static int surrogate2utf8 (ACEXML_UTF16 high, - ACEXML_UTF16 low, - ACEXML_UTF8 *dst, - size_t len); - - /* - * Convert a UTF-16 surrogate character pair into a UCS-4 character. - * - * @return SUCCESS if succeeds or one of the error STATUS - * otherwise. - */ - static int surrogate2ucs4 (ACEXML_UTF16 high, - ACEXML_UTF16 low, - ACEXML_UCS4 &dst); - - /* - * Convert the first UNICODE character in a UTF-8 character string - * into a UCS-4 character. - * - * @return number of characters the function consumed from the - * UTF-8 string if succeeds or one of the error STATUS - * otherwise. - */ - static int utf82ucs4 (const ACEXML_UTF8 *src, - size_t len, - ACEXML_UCS4 &dst); - - /* - * Convert the first UNICODE character in a UTF-16 character string - * into a UCS-4 character. - * - * @return number of characters the function consumed from the - * UTF-16 string if succeeds or one of the error STATUS - * otherwise. - */ - static int utf162ucs4 (const ACEXML_UTF16 *src, - size_t len, - ACEXML_UCS4 &dst); - -// static int utf82utf16 (const ACEXML_UTF8 *src, -// size_t len, -// ACEXML_UTF16 &dst); - // This function does not handle surrogates. - - // = The following functions are non-inlined: - - /* - * Convert a UTF-8 string into a UTF-16 string. - * - * @param len The length of @a dst string. - * - * @return number of characters the function consumed from the - * UTF-8 string if succeeds or one of the error STATUS - * otherwise. - */ - static int utf8s2utf16s (const ACEXML_UTF8 *src, - ACEXML_UTF16 *dst, - size_t len); - - /* - * Convert a UTF-16 string into a UTF-8 string. - * - * @param len The length of @a dst string. - * - * @return number of characters the function uses in - * UTF-8 string if succeeds or one of the error STATUS - * otherwise. - */ - static int utf16s2utf8s (const ACEXML_UTF16 *src, - ACEXML_UTF8 *dst, - size_t len); -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/Transcode.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* _ACEXML_TRANSCODE_H_ */ diff --git a/ACEXML/common/Transcode.i b/ACEXML/common/Transcode.i deleted file mode 100644 index e9ec3936e80..00000000000 --- a/ACEXML/common/Transcode.i +++ /dev/null @@ -1,234 +0,0 @@ -// -*- C++ -*- $Id$ - -ACEXML_INLINE int -ACEXML_Transcoder::utf162utf8 (ACEXML_UTF16 src, - ACEXML_UTF8 *dst, - size_t len) -{ - // Check for valid argument first... - - if (dst == 0) - return INVALID_ARGS; - - if (src < 0x80) - { - if (len < 1) - return DESTINATION_TOO_SHORT; - - *dst = ACE_static_cast (ACEXML_UTF8, src); - return 1; - } - else if (src < 0x800) - { - if (len < 2) - return DESTINATION_TOO_SHORT; - - *dst = 0xc0 | (src / 0x40); - *(dst+1) = 0x80 | (src % 0x40); - return 2; - } - else - { - if (len < 3) - return DESTINATION_TOO_SHORT; - - // Surrogates (0xD800 - 0xDFFF) are not valid unicode values - if (src >= 0xD800 && src < 0xE000) - return IS_SURROGATE; - - *dst = 0xe0 | (src / 0x1000); - *(dst+1) = 0x80 | ((src % 0x1000) / 0x40); - *(dst+2) = 0x80 | (src % 0x40); - return 3; - } - ACE_NOTREACHED (return NON_UNICODE;) -} - -ACEXML_INLINE int -ACEXML_Transcoder::ucs42utf8 (ACEXML_UCS4 src, - ACEXML_UTF8 *dst, - size_t len) -{ - if (src < 0x10000) - { - int retv = ACEXML_Transcoder::utf162utf8 - (ACE_static_cast (ACEXML_UTF16, src), - dst, len); - return (retv == IS_SURROGATE ? NON_UNICODE : retv); - } - else if (src >= 0x100000 && src < 0x110000) - { - if (len < 4) - return DESTINATION_TOO_SHORT; - - if (dst == 0) - return INVALID_ARGS; - - *dst = 0xf0 | (src / 0x40000); - *(dst+1) = 0x80 | ((src % 0x40000) / 0x1000); - *(dst+2) = 0x80 | ((src % 0x1000) / 0x40); - *(dst+3) = 0x80 | (src % 0x40); - return 4; - } - return NON_UNICODE; -} - - -ACEXML_INLINE int -ACEXML_Transcoder::ucs42utf16 (ACEXML_UCS4 src, - ACEXML_UTF16 *dst, - size_t len) -{ - if (dst == 0) - return INVALID_ARGS; - - if (src < 0x10000) - { - if (len < 1) - return DESTINATION_TOO_SHORT; - - if (src >= 0xD800 && src < 0xE000) - return NON_UNICODE; // Surrogates are not valid unicode value - - *dst = ACE_static_cast (ACEXML_UTF16, src); - return 1; - } - else if (src >= 0x100000 && src < 0x110000) - // Scalar values are encoded into surrogates - { - if (len < 2) - return DESTINATION_TOO_SHORT; - - *dst = 0xD800 | (src / 0x400); - *(dst+1) = 0xDC00 | (src % 0x400); - return 2; - } - - return NON_UNICODE; -} - -ACEXML_INLINE int -ACEXML_Transcoder::surrogate2utf8 (ACEXML_UTF16 high, - ACEXML_UTF16 low, - ACEXML_UTF8 *dst, - size_t len) -{ - if (len < 3) - return DESTINATION_TOO_SHORT; - - if (dst == 0 || - (high >= 0xD800 && high < 0xDC00) || - (low >= 0xDC00 && low < 0xE000)) - return INVALID_ARGS; - - ACEXML_UCS4 src = (high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000; - *dst = 0xD800 | (src / 0x400); - *(dst+1) = 0xDC00 | (src % 0x400); - return 2; -} - -ACEXML_INLINE int -ACEXML_Transcoder::surrogate2ucs4 (ACEXML_UTF16 high, - ACEXML_UTF16 low, - ACEXML_UCS4 &dst) -{ - if ((high >= 0xD800 && high < 0xDC00) || - (low >= 0xDC00 && low < 0xE000)) - return INVALID_ARGS; - - dst = (high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000; - return SUCCESS; -} - -ACEXML_INLINE int -ACEXML_Transcoder::utf82ucs4 (const ACEXML_UTF8 *the_src, - size_t len, - ACEXML_UCS4 &dst) -{ - if (the_src == 0) - return INVALID_ARGS; - - const unsigned char *src = ACE_reinterpret_cast (const unsigned char *, - the_src); - - size_t forward = 1; - - if (forward > len) - return END_OF_SOURCE; - - if (ACE_static_cast (unsigned char, *src) < 0x80) - dst = *src; - else if ((*src & 0xE0) == 0xC0) - { - dst = (*(src++) & 0x1f) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; // Error transcoding unicode scalar - dst += *src & 0x3f; - } - else if ((*src & 0xF0) == 0xE0) - { - dst = (*src++ & 0x0f) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst = (dst + (*src++ & 0x3f)) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst += *src & 0x3f; - } - else if ((*src & 0xF8) == 0xF0) - { - dst = (*src++ & 0x0f) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst = (dst + (*src++ & 0x3f)) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst = (dst + (*src++ & 0x3f)) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst += *src & 0x3f; - } - else - return NON_UNICODE; - - return forward; -} - -ACEXML_INLINE int -ACEXML_Transcoder::utf162ucs4 (const ACEXML_UTF16 *src, - size_t len, - ACEXML_UCS4 &dst) -{ - if (src == 0) - return INVALID_ARGS; - - size_t forward = 1; - if (*src >= 0xDC00 && *src < 0xE000) - { - if (len < 2) - return END_OF_SOURCE; - return ACEXML_Transcoder::surrogate2ucs4 (*src, - *(src+1), - dst); - } - else - { - if (len < 1) - return END_OF_SOURCE; - dst = *src; - } - - return forward; -} diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp deleted file mode 100644 index 3f06e15f7be..00000000000 --- a/ACEXML/common/URL_Addr.cpp +++ /dev/null @@ -1,178 +0,0 @@ -// $Id$ - -#include "ace/Log_Msg.h" -#include "ace/Auto_Ptr.h" -#include "ACEXML/common/URL_Addr.h" - - -ACE_RCSID(common, ACEXML_URL_Addr, "$Id$") - -#if !defined (__ACEXML_INLINE__) -#include "ACEXML/common/URL_Addr.inl" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_URL_Addr::ACEXML_URL_Addr (void) - : path_name_ (0), - addr_string_ (0), - addr_string_len_ (0) -{ -} - -int -ACEXML_URL_Addr::addr_to_string (ACEXML_Char *s, - size_t size, - int ipaddr_format) const -{ - size_t total_len = this->calculate_length (ipaddr_format); - if (size < total_len) - return -1; - else - { - ACE_OS::sprintf (s, ACE_TEXT ("%s:%d/%s"), - ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0 - ? this->get_host_name () - : this->get_host_addr ()), - this->get_port_number (), - this->get_path_name ()); - return 0; - } -} - -const ACEXML_Char * -ACEXML_URL_Addr::addr_to_string (int ipaddr_format) -{ - size_t size = this->calculate_length (ipaddr_format); - if (size > this->addr_string_len_) - { - ACE_ALLOCATOR_RETURN (this->addr_string_, - (ACEXML_Char *) ACE_OS::realloc(this->addr_string_, - size), 0); - this->addr_string_len_ = size; - } - ACE_OS::sprintf (this->addr_string_, - ACE_TEXT ("%s:%d/%s"), - ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0 - ? this->get_host_name () - : this->get_host_addr ()), - this->get_port_number (), - this->get_path_name ()); - return this->addr_string_; -} - -#if defined (ACE_USES_WCHAR) -int -ACEXML_URL_Addr::string_to_addr (const char* s) -{ - return this->string_to_addr (ACE_TEXT_CHAR_TO_TCHAR (s)); -} -#endif /* ACE_USES_WCHAR */ - -int -ACEXML_URL_Addr::string_to_addr (const ACEXML_Char* s) -{ - if (s == 0) - return -1; - - const ACEXML_Char* http = ACE_TEXT ("http://"); - size_t http_len = ACE_OS::strlen (http); - - // Check validity of URL - if (ACE_OS::strncmp (http, s, http_len) != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Invalid URL %s\n"), s), -1); - - const ACEXML_Char* url = 0; - // Get the host name - for (url = s + http_len; *url != '\0' && *url != ':' && *url != '/'; ++url) - ; - - size_t host_len = url - s; - host_len -= http_len; - - ACEXML_Char* host_name = 0; - ACE_NEW_RETURN (host_name, ACEXML_Char[host_len + 1], -1); - ACE_OS::strncpy (host_name, s + http_len, host_len); - host_name[host_len] = '\0'; - ACE_Auto_Basic_Array_Ptr cleanup_host_name (host_name); - - // Get the port number (if any) - unsigned short port = ACE_DEFAULT_HTTP_PORT; - if (*url == ':') - { - port = (unsigned short) ACE_OS::strtol (++url, 0, 10); // Skip over ':' - while ( *url != '\0' && *url != '/' ) - ++url; - } - - // Set the addr - int result = this->ACE_INET_Addr::set (port, host_name); - - if (result == -1) - return -1; - - // Get the path name - const ACEXML_Char* path_name = 0; - if (*url == '\0') - path_name = ACE_TEXT ("/"); - else - path_name = url; - - ACE_ALLOCATOR_RETURN (this->path_name_, ACE_OS::strdup (path_name), -1); - return result; -} - -ACEXML_URL_Addr::ACEXML_URL_Addr (const ACEXML_URL_Addr &addr) - : ACE_INET_Addr (), - path_name_ (0), - addr_string_ (0), - addr_string_len_ (0) -{ - if (this->set (addr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACEXML_URL_Addr::ACEXML_URL_Addr"))); -} - -int -ACEXML_URL_Addr::set (const ACEXML_URL_Addr &addr) -{ - ACE_OS::free (this->path_name_); - ACE_OS::free (this->addr_string_); - if (this->ACE_INET_Addr::set (addr) == -1) - return -1; - else - { - if (addr.path_name_) - ACE_ALLOCATOR_RETURN (this->path_name_, - ACE_OS::strdup (addr.path_name_), - -1); - if (addr.addr_string_) - ACE_ALLOCATOR_RETURN (this->addr_string_, - ACE_OS::strdup (addr.addr_string_), - -1); - this->addr_string_len_ = addr.addr_string_len_; - return 0; - } -} - -ACEXML_URL_Addr::ACEXML_URL_Addr (const ACEXML_Char *host_name, - const ACEXML_Char *path_name, - unsigned short port) - : ACE_INET_Addr (port, host_name), - path_name_ (ACE_OS::strdup (path_name)), - addr_string_ (0), - addr_string_len_ (0) -{ -} - -ACEXML_URL_Addr::~ACEXML_URL_Addr (void) -{ - ACE_OS::free (this->path_name_); - ACE_OS::free (this->addr_string_); - this->path_name_ = 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Auto_Basic_Array_Ptr; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Auto_Basic_Array_Ptr -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ACEXML/common/URL_Addr.h b/ACEXML/common/URL_Addr.h deleted file mode 100644 index fec3c560526..00000000000 --- a/ACEXML/common/URL_Addr.h +++ /dev/null @@ -1,134 +0,0 @@ -/* -*- C++ -*- */ - -/** @file URL_Addr.h - * - * $Id$ - * - * @author Douglas C. Schmidt - * @author Krishnakumar B - * - */ - -#ifndef _ACEXML_URL_ADDR_H -#define _ACEXML_URL_ADDR_H - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/INET_Addr.h" -#include "ACEXML/common/XML_Types.h" -#include "ACEXML/common/ACEXML_Export.h" - -/** - * @class ACEXML_URL_Addr URL_Addr.h "ACEXML/common/URL_Addr.h" - * - * Defines a URL address family address format. - */ -class ACEXML_Export ACEXML_URL_Addr : public ACE_INET_Addr -{ -public: - /// Initialization and termination methods. - ACEXML_URL_Addr (void); - - /// Constructor. - ACEXML_URL_Addr (const ACEXML_Char *host_name, - const ACEXML_Char *path_name, - unsigned short port = ACE_DEFAULT_HTTP_PORT); - - /// Copy constructor. - ACEXML_URL_Addr (const ACEXML_URL_Addr &addr); - - /// Essentially the copy constructor. - int set (const ACEXML_URL_Addr &addr); - - /** - * Initializes an from the

, which can be - * "ip-number:port-number/path-name" (e.g., - * "www.cs.wustl.edu:1234/~schmidt/" "ip-number:port-number/path-name" - * (e.g., "128.252.166.57:1234/~schmidt"). If there is no ':' in the - *
it is assumed to be an ip-number or ip-address number, with - * the port number . - */ - virtual int string_to_addr (const ACEXML_Char* address); - - // Function to shut up Borland C++ -#if defined (ACE_USES_WCHAR) - virtual int string_to_addr (const char* address); -#endif - - /** - * Transform the current address into string format. If - * is non-0 this produces - * "ip-number:port-number/path-name" (e.g., - * "128.252.166.57:80/~schmidt/"), whereas if is 0 this - * produces "ip-name:port-number" (e.g., - * "www.cs.wustl.edu:80/~schmidt/"). Returns -1 if the of the - * is too small, else 0. - */ - virtual int addr_to_string (ACEXML_Char *s, - size_t size, - int ipaddr_format = 1) const; - - /** - * Transform the current address into string format. If - * is non-0 this produces - * "ip-number:port-number/path-name" (e.g., - * "128.252.166.57:80/~schmidt/"), whereas if is 0 this - * produces "ip-name:port-number" (e.g., - * "www.cs.wustl.edu:80/~schmidt/"). Uses dynamic memory, which is - * allocated on demand and deallocated when the object is destroyed. - * Returns -1 if dynamic memory fails, else 0. - */ - virtual const ACEXML_Char *addr_to_string (int ipaddr_format = 1); - - /// Assignment operator. - void operator= (const ACEXML_URL_Addr &addr); - - /// Destructor. - ~ACEXML_URL_Addr (void); - - /** - * Compare two addresses for equality. The addresses are considered - * equal if they contain the same IP address, port number, and path name. - */ - int operator == (const ACEXML_URL_Addr &SAP) const; - - /// Compare two addresses for inequality. - int operator != (const ACEXML_URL_Addr &SAP) const; - - /// Computes and returns hash value. - virtual u_long hash (void) const; - - /// Return the path name. - const ACEXML_Char *get_path_name (void) const; - - /// Commit suicide. - int destroy (void); - -private: - - /// Calculate the maximum length of the address string - size_t calculate_length (int ipaddr_format) const; - - /// Our path name. - ACEXML_Char *path_name_; - - /// The dynamically created address string that's used for the - /// method. - ACEXML_Char *addr_string_; - - /// Current length of the - size_t addr_string_len_; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/URL_Addr.inl" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* _ACEXML_URL_ADDR_H */ diff --git a/ACEXML/common/URL_Addr.inl b/ACEXML/common/URL_Addr.inl deleted file mode 100644 index 1430bfa227f..00000000000 --- a/ACEXML/common/URL_Addr.inl +++ /dev/null @@ -1,61 +0,0 @@ -// $Id$ - -#include "ace/Log_Msg.h" - - -ACE_INLINE size_t -ACEXML_URL_Addr::calculate_length (int ipaddr_format) const -{ - return ACE_OS::strlen (ipaddr_format == 0 ? - this->get_host_name () : this->get_host_addr ()) - + ACE_OS::strlen ("65536") // Assume the max port number. - + ACE_OS::strlen (this->get_path_name ()) - + sizeof (':') - + sizeof ('/') - + sizeof ('\0'); // For trailing '\0'. -} - -ACE_INLINE void -ACEXML_URL_Addr::operator= (const ACEXML_URL_Addr &addr) -{ - if (this->set (addr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACEXML_URL_Addr::ACEXML_URL_Addr"))); -} - -ACE_INLINE u_long -ACEXML_URL_Addr::hash (void) const -{ - u_long result = this->ACE_INET_Addr::hash () - + ACE::hash_pjw (this->get_path_name ()); - return result; -} - -ACE_INLINE int -ACEXML_URL_Addr::operator== (const ACEXML_URL_Addr &addr) const -{ - return ACE_OS::strcmp (addr.get_path_name (), this->get_path_name ()) == 0 - && addr.get_port_number () == this->get_port_number () - && addr.get_ip_address () == this->get_ip_address (); -} - -ACE_INLINE int -ACEXML_URL_Addr::operator!= (const ACEXML_URL_Addr &addr) const -{ - return !(*this == addr); -} - -ACE_INLINE const ACEXML_Char * -ACEXML_URL_Addr::get_path_name (void) const -{ - return this->path_name_; -} - -ACE_INLINE int -ACEXML_URL_Addr::destroy (void) -{ - // Commit suicide. - delete this; - return 0; -} diff --git a/ACEXML/common/Validator.cpp b/ACEXML/common/Validator.cpp deleted file mode 100644 index cf3ce502200..00000000000 --- a/ACEXML/common/Validator.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -#include "ACEXML/common/Validator.h" - -ACEXML_Validator::~ACEXML_Validator () -{ - -} diff --git a/ACEXML/common/Validator.h b/ACEXML/common/Validator.h deleted file mode 100644 index fee02666088..00000000000 --- a/ACEXML/common/Validator.h +++ /dev/null @@ -1,64 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Validator.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_VALIDATOR_H_ -#define _ACEXML_VALIDATOR_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Attributes.h" -#include "ACEXML/common/Env.h" -#include "ACEXML/common/SAXExceptions.h" - -/** - * @class ACEXML_Validator Validator.h "common/Validator.h" - * - * @brief An abstract virtual class defining validator interface. - * - * An validator provides validation service for one XML element. - * ACEXML_Validators are stateful object. Implementations should - * remember the current element encountered and determine if - * it's a valid sequence of child elements. A parser fishes - * out a validator of certain - */ -class ACEXML_Export ACEXML_Validator -{ -public: - virtual ~ACEXML_Validator () = 0; - - /** - * Validate attributes of an element. - * - * @retval 0 if valid, -1 otherwise. - */ - virtual int startElement (ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Validate the next child element. - * - * @retval 0 if valid, -1 otherwise. - */ - virtual int nextElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_VALIDATOR_H_ */ diff --git a/ACEXML/common/XMLFilter.h b/ACEXML/common/XMLFilter.h deleted file mode 100644 index dac592dc6b9..00000000000 --- a/ACEXML/common/XMLFilter.h +++ /dev/null @@ -1,56 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file XMLFilter.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_XMLFILTER_H_ -#define _ACEXML_XMLFILTER_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XMLReader.h" - -/** - * @class ACEXML_XMLFilter XMLFilter.h "ACEXML/common/XMLFilter.h" - * - * @brief ACEXML_XMLFilter - * - * An XML filter is like an XML reader, except that it obtains its events - * from another XML reader rather than a primary source like an XML - * document or database. Filters can modify a stream of events as they pass - * on to the final application. - * - * The XMLFilterImpl helper class provides a convenient base for creating - * SAX2 filters, by passing on all ACEXML_EntityResolver, - * ACEXML_DTDHandler, ACEXML_ContentHandler and ACEXML_ErrorHandler events - * automatically. - */ -class ACEXML_Export ACEXML_XMLFilter : public ACEXML_XMLReader -{ -public: - /** - * Get the parent reader. - */ - virtual ACEXML_XMLReader *getParent (void) const = 0; - - /** - * Set the parent reader. - */ - virtual void setParent (ACEXML_XMLReader *parent) = 0; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_XMLFILTER_H_ */ diff --git a/ACEXML/common/XMLFilterImpl.cpp b/ACEXML/common/XMLFilterImpl.cpp deleted file mode 100644 index 300c6b7ea4b..00000000000 --- a/ACEXML/common/XMLFilterImpl.cpp +++ /dev/null @@ -1,339 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/XMLFilterImpl.h" - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/XMLFilterImpl.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl (void) - : parent_ (0), - locator_ (0), - entityResolver_ (0), - dtdHandler_ (0), - contentHandler_ (0), - errorHandler_ (0) -{ -} - -ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl (ACEXML_XMLReader *parent) - : parent_ (parent), - locator_ (0), - entityResolver_ (0), - dtdHandler_ (0), - contentHandler_ (0), - errorHandler_ (0) -{ -} - -ACEXML_XMLFilterImpl::~ACEXML_XMLFilterImpl (void) -{ - // @@ How are all the object lifecycles managed? -} - -void -ACEXML_XMLFilterImpl::parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->setupParser () < 0) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("No Parent available"))); - } - this->parent_->parse (input ACEXML_ENV_ARG_PARAMETER); - return; -} - -void -ACEXML_XMLFilterImpl::parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->setupParser () < 0) - { - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("No Parent available"))); - } - - this->parent_->parse (new ACEXML_InputSource (systemId) ACEXML_ENV_ARG_PARAMETER); - return; -} - -int -ACEXML_XMLFilterImpl::getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - if (this->parent_ != 0) - return this->parent_->getFeature (name ACEXML_ENV_ARG_PARAMETER); - - ACEXML_THROW_RETURN (ACEXML_SAXNotRecognizedException (name), 0); -} - -void * -ACEXML_XMLFilterImpl::getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - if (this->parent_ != 0) - return this->parent_->getProperty (name ACEXML_ENV_ARG_PARAMETER); - - ACEXML_THROW_RETURN (ACEXML_SAXNotRecognizedException (name), 0); -} - -void -ACEXML_XMLFilterImpl::setFeature (const ACEXML_Char *name, - int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - if (this->parent_ != 0) - { - this->parent_->setFeature (name, - boolean_value ACEXML_ENV_ARG_PARAMETER); - return; - } - - ACEXML_THROW (ACEXML_SAXNotRecognizedException (name)); -} - -void -ACEXML_XMLFilterImpl::setProperty (const ACEXML_Char *name, - void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - if (this->parent_ != 0) - { - this->parent_->setProperty (name, - value ACEXML_ENV_ARG_PARAMETER); - return; - } - - ACEXML_THROW (ACEXML_SAXNotRecognizedException (name)); -} - -ACEXML_XMLReader * -ACEXML_XMLFilterImpl::getParent (void) const -{ - return this->parent_; -} - -void -ACEXML_XMLFilterImpl::setParent (ACEXML_XMLReader *parent) -{ - this->parent_ = parent; -} - -void -ACEXML_XMLFilterImpl::characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->characters (ch, start, length ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->endDocument (ACEXML_ENV_SINGLE_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::endElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->endElement (namespaceURI, - localName, - qName ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->endPrefixMapping (prefix ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::ignorableWhitespace (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->ignorableWhitespace (ch, - start, - length ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->processingInstruction (target, - data ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::setDocumentLocator (ACEXML_Locator *locator) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->setDocumentLocator (locator); -} - -void -ACEXML_XMLFilterImpl::skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->skippedEntity (name ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->startDocument (ACEXML_ENV_SINGLE_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::startElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->startElement (namespaceURI, - localName, - qName, - atts ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->contentHandler_ != 0) - this->contentHandler_->startPrefixMapping (prefix, - uri ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::notationDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->dtdHandler_ != 0) - this->dtdHandler_->notationDecl (name, - publicId, - systemId ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::unparsedEntityDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->dtdHandler_ != 0) - this->dtdHandler_->unparsedEntityDecl (name, - publicId, - systemId, - notationName ACEXML_ENV_ARG_PARAMETER); -} - -ACEXML_InputSource * -ACEXML_XMLFilterImpl::resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->entityResolver_ != 0) - return this->entityResolver_->resolveEntity (publicId, - systemId ACEXML_ENV_ARG_PARAMETER); - return 0; -} - -void -ACEXML_XMLFilterImpl::error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->errorHandler_ != 0) - this->errorHandler_->error (exception ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->errorHandler_ != 0) - this->errorHandler_->fatalError (exception ACEXML_ENV_ARG_PARAMETER); -} - -void -ACEXML_XMLFilterImpl::warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->errorHandler_ != 0) - this->errorHandler_->warning (exception ACEXML_ENV_ARG_PARAMETER); -} - -ACEXML_DTDHandler * -ACEXML_XMLFilterImpl::getDTDHandler (void) const -{ - return this->dtdHandler_; -} - -ACEXML_ContentHandler * -ACEXML_XMLFilterImpl::getContentHandler (void) const -{ - return this->contentHandler_; -} - -ACEXML_EntityResolver * -ACEXML_XMLFilterImpl::getEntityResolver (void) const -{ - return this->entityResolver_; -} - -ACEXML_ErrorHandler * -ACEXML_XMLFilterImpl::getErrorHandler (void) const -{ - return this->errorHandler_; -} - -void -ACEXML_XMLFilterImpl::setDTDHandler (ACEXML_DTDHandler *handler) -{ - this->dtdHandler_ = handler; -} - -void -ACEXML_XMLFilterImpl::setContentHandler (ACEXML_ContentHandler *handler) -{ - this->contentHandler_ = handler; -} - -void -ACEXML_XMLFilterImpl::setEntityResolver (ACEXML_EntityResolver *handler) -{ - this->entityResolver_ = handler; -} - -void -ACEXML_XMLFilterImpl::setErrorHandler (ACEXML_ErrorHandler *handler) -{ - this->errorHandler_ = handler; -} diff --git a/ACEXML/common/XMLFilterImpl.h b/ACEXML/common/XMLFilterImpl.h deleted file mode 100644 index efff84ddfd1..00000000000 --- a/ACEXML/common/XMLFilterImpl.h +++ /dev/null @@ -1,294 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file XMLFilterImpl.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef ACEXML_XMLFILTERIMPL_H -#define ACEXML_XMLFILTERIMPL_H -#include "ace/pre.h" - -#include "ACEXML/common/XMLFilter.h" -#include "ACEXML/common/XMLReader.h" -#include "ACEXML/common/Locator.h" -#include "ACEXML/common/ContentHandler.h" -#include "ACEXML/common/DTDHandler.h" -#include "ACEXML/common/EntityResolver.h" -#include "ACEXML/common/ErrorHandler.h" - -/** - * @class ACEXML_XMLFilterImpl XMLFilterImpl.h "ACEXML/common/XMLFilterImpl.h" - * - * @brief ACEXML_XMLFilterImpl - * - * This class is designed to sit between an XMLReader and the client - * application's event handlers. By default, it does nothing but pass - * requests up to the reader and events on to the handlers unmodified, but - * subclasses can override specific methods to modify the event stream or - * the configuration requests as they pass through. - */ -class ACEXML_Export ACEXML_XMLFilterImpl - : public ACEXML_XMLFilter, - public ACEXML_ContentHandler, - public ACEXML_DTDHandler, - public ACEXML_EntityResolver, - public ACEXML_ErrorHandler -{ -public: - /** - * Default constructor. Create with no parent. - */ - ACEXML_XMLFilterImpl (void); - - /** - * Construct an XML filter with the specified parent. - */ - ACEXML_XMLFilterImpl (ACEXML_XMLReader *parent); - - /** - * Destructor. - */ - virtual ~ACEXML_XMLFilterImpl (void); - - /* - * Look up the value of a feature. - */ - virtual int getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; - - /* - * Look up the value of a property. - */ - virtual void * getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; - - /* - * Parse an XML document. - */ - virtual void parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Parse an XML document from a system identifier (URI). - */ - virtual void parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - // @@ throw IOException??? - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Set the state of a feature. - */ - virtual void setFeature (const ACEXML_Char *name, - int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; - - /* - * Set the value of a property. - */ - virtual void setProperty (const ACEXML_Char *name, - void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; - - /* - * Get the parent reader. - */ - virtual ACEXML_XMLReader *getParent (void) const; - - /* - * Set the parent reader. - */ - virtual void setParent (ACEXML_XMLReader *parent); - - /* - * Get the current DTD event handler. - */ - virtual ACEXML_DTDHandler *getDTDHandler (void) const; - - /* - * Get the current content event handler. - */ - virtual ACEXML_ContentHandler *getContentHandler (void) const; - - /* - * Get the current entity resolver. - */ - virtual ACEXML_EntityResolver *getEntityResolver (void) const; - - /* - * Get the current error event handler. - */ - virtual ACEXML_ErrorHandler *getErrorHandler (void) const; - - /* - * Set the DTD event handler. - */ - virtual void setDTDHandler (ACEXML_DTDHandler *handler); - - /* - * Set the content event handler. - */ - virtual void setContentHandler (ACEXML_ContentHandler *handler); - - /* - * Set the entity resolver. - */ - virtual void setEntityResolver (ACEXML_EntityResolver *handler); - - /* - * Set the error event handler. - */ - virtual void setErrorHandler (ACEXML_ErrorHandler *handler); - - /* - * Receive notification of character data. - */ - virtual void characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of the end of a document. - */ - virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of the end of an element. - */ - virtual void endElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * End the scope of a prefix-URI mapping. - */ - virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of ignorable whitespace in element content. - */ - virtual void ignorableWhitespace (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of a processing instruction. - */ - virtual void processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive an object for locating the origin of SAX document events. - */ - virtual void setDocumentLocator (ACEXML_Locator *locator) ; - - /* - * Receive notification of a skipped entity. - */ - virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of the beginning of a document. - */ - virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of the beginning of an element. - */ - virtual void startElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Begin the scope of a prefix-URI Namespace mapping. - */ - virtual void startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - // *** Methods inherit from ACEXML_DTDHandler. - - /* - * Receive notification of a notation declaration event. - */ - virtual void notationDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Receive notification of an unparsed entity declaration event. - */ - virtual void unparsedEntityDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - // Methods inherit from ACEXML_EnitityResolver. - - /* - * Allow the application to resolve external entities. - */ - virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - // Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ - virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); - - /* - * Receive notification of a non-recoverable error. - */ - virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); - - /* - * Receive notification of a warning. - */ - virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); -protected: - int setupParser (void); - // Set up the event handlers of parent parser to this. - // Returns -1 if no valid parent is set. - -private: - ACEXML_XMLReader *parent_; - ACEXML_Locator *locator_; - ACEXML_EntityResolver *entityResolver_; - ACEXML_DTDHandler *dtdHandler_; - ACEXML_ContentHandler *contentHandler_; - ACEXML_ErrorHandler *errorHandler_; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/common/XMLFilterImpl.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACEXML_XMLFILTERIMPL_H */ diff --git a/ACEXML/common/XMLFilterImpl.i b/ACEXML/common/XMLFilterImpl.i deleted file mode 100644 index 4be2ceeceea..00000000000 --- a/ACEXML/common/XMLFilterImpl.i +++ /dev/null @@ -1,14 +0,0 @@ -// -*- C++ -*- $Id$ - -ACEXML_INLINE int -ACEXML_XMLFilterImpl::setupParser (void) -{ - if (this->parent_ == 0) - return -1; - - this->parent_->setEntityResolver (this); - this->parent_->setDTDHandler (this); - this->parent_->setContentHandler (this); - this->parent_->setErrorHandler (this); - return 0; -} diff --git a/ACEXML/common/XMLReader.h b/ACEXML/common/XMLReader.h deleted file mode 100644 index 79e59a86197..00000000000 --- a/ACEXML/common/XMLReader.h +++ /dev/null @@ -1,133 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file XMLReader.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_XMLREADER_H_ -#define _ACEXML_XMLREADER_H_ - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/ContentHandler.h" -#include "ACEXML/common/DTDHandler.h" -#include "ACEXML/common/EntityResolver.h" -#include "ACEXML/common/ErrorHandler.h" - -/** - * @class ACEXML_XMLReader XMLReader.h "ACEXML/common/XMLReader.h" - * - * @brief ACEXML_XMLReader - * - * XMLReader is the interface that an XML parser's SAX2 driver must - * implement. This interface allows an application to set and query - * features and properties in the parser, to register event handlers - * for document processing, and to initiate a document parse. - * - * All SAX interfaces are assumed to be synchronous: the parse methods - * must not return until parsing is complete, and readers must wait - * for an event-handler callback to return before reporting the next - * event. - */ -class ACEXML_Export ACEXML_XMLReader -{ -public: - /** - * Return the current content handler. - */ - virtual ACEXML_ContentHandler *getContentHandler (void) const = 0; - - /** - * Return the current DTD handler. - */ - virtual ACEXML_DTDHandler *getDTDHandler (void) const = 0; - - /** - * Return the current entity resolver. - */ - virtual ACEXML_EntityResolver *getEntityResolver (void) const = 0; - - /** - * Return the current error handler. - */ - virtual ACEXML_ErrorHandler *getErrorHandler (void) const = 0; - - /** - * Look up the value of a feature. This method allows - * programmers to check whether a specific feature has been - * activated in the parser. - */ - virtual int getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) = 0; - - /** - * Look up the value of a property. - */ - virtual void * getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) = 0; - - /** - * Parse an XML document. - */ - virtual void parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Parse an XML document from a system identifier (URI). - */ - virtual void parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) = 0; - - /** - * Allow an application to register a content event handler. - */ - virtual void setContentHandler (ACEXML_ContentHandler *handler) = 0; - - /** - * Allow an application to register a DTD event handler. - */ - virtual void setDTDHandler (ACEXML_DTDHandler *handler) = 0; - - /** - * Allow an application to register an entity resolver. - */ - virtual void setEntityResolver (ACEXML_EntityResolver *resolver) = 0; - - /** - * Allow an application to register an error event handler. - */ - virtual void setErrorHandler (ACEXML_ErrorHandler *handler) = 0; - - /** - * Activating or deactivating a feature. - */ - virtual void setFeature (const ACEXML_Char *name, - int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) = 0; - - /** - * Set the value of a property. - */ - virtual void setProperty (const ACEXML_Char *name, - void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) = 0; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_XMLREADER_H_ */ diff --git a/ACEXML/common/XML_Codecs.cpp b/ACEXML/common/XML_Codecs.cpp deleted file mode 100644 index 63230d8c6d7..00000000000 --- a/ACEXML/common/XML_Codecs.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ace/Auto_Ptr.h" -#include "ACEXML/common/XML_Codecs.h" - -ACE_RCSID (common, XML_Codecs, "$Id$") - -ACEXML_Char* -ACEXML_Base64::encode (const ACEXML_Char* input, - size_t* output_len) -{ - if (!input) - return 0; - size_t len = ACE_OS::strlen (input); - - ACE_Byte* buf = 0; - ACE_NEW_RETURN (buf, - ACE_Byte[len], - 0); - ACE_Auto_Basic_Array_Ptr cleanup_buf (buf); - - for (size_t i = 0; i < len; ++i) - buf[i] = (ACE_Byte)input[i]; - buf[len] = 0; - - size_t encode_len = 0; - ACE_Byte* encodedBuf = ACE_Base64::encode (buf, len, &encode_len); - - if (!encodedBuf) - return 0; - - ACEXML_Char* result = 0; - ACE_NEW_RETURN (result, - ACEXML_Char[encode_len+1], - 0); - - for (size_t j = 0; j < encode_len; ++j) - result[j] = (ACEXML_Char)encodedBuf[j]; - result[encode_len] = 0; - - *output_len = encode_len; - delete[] encodedBuf; - return result; -} - - -ACEXML_Char* -ACEXML_Base64::decode (const ACEXML_Char* input, - size_t* output_len) -{ - if (!input) - return 0; - - size_t len = ACE_OS::strlen (input); - - ACE_Byte* buf = 0; - - ACE_NEW_RETURN (buf, - ACE_Byte[len], - 0); - - ACE_Auto_Basic_Array_Ptr cleanup (buf); - - for (size_t i = 0; i < len; ++i) - buf[i] = (ACE_Byte)input[i]; - - buf[len] = 0; - - size_t decode_len = 0; - - ACE_Byte* decodedBuf = ACE_Base64::decode (buf, &decode_len); - - if (!decodedBuf) - return 0; - - ACEXML_Char* result = 0; - - ACE_NEW_RETURN (result, - ACEXML_Char[decode_len+1], - 0); - - for (size_t j = 0; j < decode_len; ++j) - result[j] = (ACEXML_Char)decodedBuf[j]; - - result[decode_len] = 0; - - *output_len = decode_len; - delete[] decodedBuf; - - return result; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Auto_Basic_Array_Ptr; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Auto_Basic_Array_Ptr -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ACEXML/common/XML_Codecs.h b/ACEXML/common/XML_Codecs.h deleted file mode 100644 index b72565a2cfe..00000000000 --- a/ACEXML/common/XML_Codecs.h +++ /dev/null @@ -1,73 +0,0 @@ -// -*- C++ -*- - -/** - * @file XML_Codecs.h - * - * $Id$ - * - * @author Krishnakumar B - * - * XML_Codecs is a generic wrapper for various encoding and decoding - * mechanisms used in ACEXML. Currently it includes support for handling - * Base64 content transfer-encoding of ACEXML_Chars. - * - */ - -#ifndef _ACEXML_XML_CODECS_H -#define _ACEXML_XML_CODECS_H - -#include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" -#include "ace/Codecs.h" - -/** - * @class ACEXML_Base64 - * - * @brief Encode/Decode a stream of ACEXML_Chars according to Base64 encoding. - * - * This class provides methods to encode or decode a stream of ACEXML_Chars - * to/from Base64 encoding. It doesn't convert the input stream to a - * canonical form before encoding. - * - */ -class ACEXML_Export ACEXML_Base64 : public ACE_Base64 -{ -public: - - //@{ - - /** - * Encodes a stream of octets to Base64 data - * - * @param input Binary data in ACEXML_Char stream. - * @param output_len Length of the encoded Base64 ACEXML_Char stream. - * @return Encoded Base64 data in ACEXML_Char stream or NULL if input data - * cannot be encoded. - */ - - static ACEXML_Char* encode (const ACEXML_Char* input, - size_t* output_len); - /** - * Decodes a stream of Base64 to octets data - * - * @param input Encoded Base64 data in ACEXML_Char stream. - * @param output_len Length of the binary ACEXML_Char stream. - * @return Binary data in ACEXML_Char stream or NULL if input data cannot - * be encoded. - */ - static ACEXML_Char* decode (const ACEXML_Char* input, - size_t* output_len); - - //@} -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_XML_CODECS_H */ diff --git a/ACEXML/common/XML_Common.dsp b/ACEXML/common/XML_Common.dsp deleted file mode 100644 index decdb107711..00000000000 --- a/ACEXML/common/XML_Common.dsp +++ /dev/null @@ -1,349 +0,0 @@ -# Microsoft Developer Studio Project File - Name="XML_Common" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=XML_Common - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "XML_Common.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "XML_Common.mak" CFG="XML_Common - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "XML_Common - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "XML_Common - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "XML_Common - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_COMMON_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D ACEXML_HAS_DLL=1 /D "ACEXML_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ace.lib /nologo /dll /machine:I386 /out:"../../bin/ACEXML.dll" /libpath:"..\..\ace" - -!ELSEIF "$(CFG)" == "XML_Common - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "XML_Common___Win32_Debug" -# PROP BASE Intermediate_Dir "XML_Common___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XML_COMMON_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D ACEXML_HAS_DLL=1 /D "ACEXML_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"../../bin/ACEXMLD.dll" /pdbtype:sept /libpath:"..\..\ace" - -!ENDIF - -# Begin Target - -# Name "XML_Common - Win32 Release" -# Name "XML_Common - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Attributes_Def_Builder.cpp -# End Source File -# Begin Source File - -SOURCE=.\AttributesImpl.cpp -# End Source File -# Begin Source File - -SOURCE=.\CharStream.cpp -# End Source File -# Begin Source File - -SOURCE=.\DefaultHandler.cpp -# End Source File -# Begin Source File - -SOURCE=.\DTD_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Element_Def_Builder.cpp -# End Source File -# Begin Source File - -SOURCE=.\Encoding.cpp -# End Source File -# Begin Source File - -SOURCE=.\Env.cpp -# End Source File -# Begin Source File - -SOURCE=.\Exception.cpp -# End Source File -# Begin Source File - -SOURCE=.\FileCharStream.cpp -# End Source File -# Begin Source File - -SOURCE=.\HttpCharStream.cpp -# End Source File -# Begin Source File - -SOURCE=.\InputSource.cpp -# End Source File -# Begin Source File - -SOURCE=.\LocatorImpl.cpp -# End Source File -# Begin Source File - -SOURCE=.\Mem_Map_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\NamespaceSupport.cpp -# End Source File -# Begin Source File - -SOURCE=.\SAXExceptions.cpp -# End Source File -# Begin Source File - -SOURCE=.\StrCharStream.cpp -# End Source File -# Begin Source File - -SOURCE=.\StreamFactory.cpp -# End Source File -# Begin Source File - -SOURCE=.\Transcode.cpp -# End Source File -# Begin Source File - -SOURCE=.\URL_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\Validator.cpp -# End Source File -# Begin Source File - -SOURCE=.\XML_Codecs.cpp -# End Source File -# Begin Source File - -SOURCE=.\XMLFilterImpl.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\ACEXML_Export.h -# End Source File -# Begin Source File - -SOURCE=.\Attributes.h -# End Source File -# Begin Source File - -SOURCE=.\Attributes_Def_Builder.h -# End Source File -# Begin Source File - -SOURCE=.\AttributesImpl.h -# End Source File -# Begin Source File - -SOURCE=.\CharStream.h -# End Source File -# Begin Source File - -SOURCE=.\ContentHandler.h -# End Source File -# Begin Source File - -SOURCE=.\DefaultHandler.h -# End Source File -# Begin Source File - -SOURCE=.\DTD_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\DTDHandler.h -# End Source File -# Begin Source File - -SOURCE=.\Element_Def_Builder.h -# End Source File -# Begin Source File - -SOURCE=.\Encoding.h -# End Source File -# Begin Source File - -SOURCE=.\EntityResolver.h -# End Source File -# Begin Source File - -SOURCE=.\Env.h -# End Source File -# Begin Source File - -SOURCE=.\ErrorHandler.h -# End Source File -# Begin Source File - -SOURCE=.\Exception.h -# End Source File -# Begin Source File - -SOURCE=.\FileCharStream.h -# End Source File -# Begin Source File - -SOURCE=.\HttpCharStream.h -# End Source File -# Begin Source File - -SOURCE=.\InputSource.h -# End Source File -# Begin Source File - -SOURCE=.\Locator.h -# End Source File -# Begin Source File - -SOURCE=.\LocatorImpl.h -# End Source File -# Begin Source File - -SOURCE=.\Mem_Map_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\NamespaceSupport.h -# End Source File -# Begin Source File - -SOURCE=.\SAXExceptions.h -# End Source File -# Begin Source File - -SOURCE=.\StrCharStream.h -# End Source File -# Begin Source File - -SOURCE=.\StreamFactory.h -# End Source File -# Begin Source File - -SOURCE=.\Transcode.h -# End Source File -# Begin Source File - -SOURCE=.\URL_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\Validator.h -# End Source File -# Begin Source File - -SOURCE=.\XML_Codecs.h -# End Source File -# Begin Source File - -SOURCE=.\XML_Macros.h -# End Source File -# Begin Source File - -SOURCE=.\XML_Types.h -# End Source File -# Begin Source File - -SOURCE=.\XMLFilter.h -# End Source File -# Begin Source File - -SOURCE=.\XMLFilterImpl.h -# End Source File -# Begin Source File - -SOURCE=.\XMLReader.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "i" -# Begin Source File - -SOURCE=.\Env.i -# End Source File -# Begin Source File - -SOURCE=.\Exception.i -# End Source File -# Begin Source File - -SOURCE=.\URL_Addr.inl -# End Source File -# End Group -# End Target -# End Project diff --git a/ACEXML/common/XML_Macros.h b/ACEXML/common/XML_Macros.h deleted file mode 100644 index 3593a258a21..00000000000 --- a/ACEXML/common/XML_Macros.h +++ /dev/null @@ -1,443 +0,0 @@ -// -*- C++ -*- - -// ============================================================================ -/** - * @file XML_Macros.h - * - * $Id$ - * - * Writing code that is portable between platforms with or without - * native C++ exceptions is hard. The following macros offer some - * help on this task. - * - * @author Nanbor Wang - * @author Aniruddha Gokhale - * @author Carlos O'Ryan - * @author Krishnakumar B , et al. - */ -// ============================================================================ - -// Macros for handling exceptions. - -#ifndef _ACEXML_MACROS_H -#define _ACEXML_MACROS_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -# if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -# endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Exception_Macros.h" - -// The following macros assume that an environment variable is passed -// in/out of each function that can throw an exception. The type of the -// environment variable is defined by ACEXML_ENV_TYPE. - -#if !defined (ACEXML_ENV_TYPE) -# define ACEXML_ENV_TYPE ACEXML_Env -#endif /* ACEXML_ENV_TYPE */ - -// The name of the variable defined by ACEXML_TRY_ENV. Below is the name -// that we use by default. If you wish to change it you can redefine -// ACEXML_TRY_ENV to change the default name. Also ACEXML_ADOPT_ENV allows the -// use of non-standard name within a scope. - -#if !defined (ACEXML_TRY_ENV) -# define ACEXML_TRY_ENV _ACEXML_Env_variable -#endif /* ACEXML_TRY_ENV */ - -// The base type of Exception from which all the other exception types are -// derived. By default, it is set to ACEXML_Exception. - -#if !defined (ACEXML_EXCEPTION_TYPE) -# define ACEXML_EXCEPTION_TYPE ACEXML_Exception -#endif /* ACEXML_EXCEPTION_TYPE */ - -// This is the exception caught by ACEXML_CATCHANY. -#if !defined (ACEXML_ANY_EXCEPTION) -# define ACEXML_ANY_EXCEPTION ex -#endif /* ACEXML_ANY_EXCEPTION */ - -// Declare a new environment variable on the stack. The type of the -// environment variable is determined by ACEXML_ENV_TYPE. -#define ACEXML_DECLARE_NEW_ENV \ - ACEXML_ENV_TYPE ACEXML_TRY_ENV - -#if defined (ACE_USES_NATIVE_EXCEPTIONS) -// ----------------------------------------------------------------- - -#define ACEXML_ADOPT_ENV (ENV) - -// No need to check. Native exceptions handle the control flow -// automatically when an exception occurs. -# define ACEXML_CHECK - -// Used when the function requires a return value. -# define ACEXML_CHECK_RETURN(RETV) - -// ACEXML_THROW_R_INT should not be used by the user. -# define ACEXML_THROW_R_INT(EXCEPTION) \ - throw EXCEPTION - -// Throwing an exception is easy. These two macros should _NOT_ be -// used within try blocks. -# define ACEXML_THROW(EXCEPTION) \ - throw EXCEPTION - -// Throwing an exception when the function reqires a return value. -# if defined (WIN32) || defined (__HP_aCC) -# define ACEXML_THROW_RETURN(EXCEPTION, RETV) \ - do \ - { \ - throw EXCEPTION; \ - return RETV; \ - } while (0) -# else /* WIN32 */ -# define ACEXML_THROW_RETURN(EXCEPTION,RETV) \ - throw EXCEPTION -# endif /* WIN32 */ - -// For compilers with native exceptions, we can simply use try to try. ;-) -// do {} while (0) is required to avoid compilation warnings. -# define ACEXML_TRY \ - do \ - { \ - try \ - { -# define ACEXML_TRY_NEW_ENV \ - do \ - { \ - ACEXML_ENV_TYPE ACEXML_TRY_ENV; \ - try \ - { -# define ACEXML_TRY_EX(LABEL) \ - do \ - { \ - try \ - { - -// No need to check for exceptions within try block for compilers with -// native exceptions. -# define ACEXML_TRY_CHECK -# define ACEXML_TRY_CHECK_EX(LABEL) - -// Likewise, throwing exceptions within try blocks is easy. -# define ACEXML_TRY_THROW(EXCEPTION) throw EXCEPTION -# define ACEXML_TRY_THROW_EX(EXCEPTION,LABEL) throw EXCEPTION - -// Same thing for catch. -# define ACEXML_CATCH(EXCEPTION,VAR) \ - } \ - catch (EXCEPTION & VAR) \ - { \ - ACE_UNUSED_ARG (VAR); - -# define ACEXML_CATCHANY \ - ACEXML_CATCH(ACEXML_EXCEPTION_TYPE, ACEXML_ANY_EXCEPTION) - -# define ACEXML_CATCHALL \ - } \ - catch (...) \ - { - -// Rethrowing the exception from catch blocks. -# define ACEXML_RE_THROW throw -# define ACEXML_RE_THROW_EX(LABEL) throw - -// Close the catch block. -# define ACEXML_ENDTRY \ - } \ - } while (0) - -#else /* ! ACEXML_USES_NATIVE_EXCEPTIONS */ -// ----------------------------------------------------------------- - -// When handling compilers without native exceptions, things get a bit -// hairy. Exceptions are simulated using ACEXML_ENV_TYPE. The trick here is to -// make sure the flow-of-control can simulate the case when native -// exceptions occur... - -# define ACEXML_ADOPT_ENV(ENV) ACEXML_ENV_TYPE &ACEXML_TRY_ENV = ENV - -// Follow every statement that could throw exceptions with ACEXML_CHECK or -// ACEXML_CHECK_RETURN. These two macros should _NOT_ be used within try -// blocks. Use ACEXML_TRY_CHECK or ACEXML_TRY_CHECK_EX instead. -# define ACEXML_CHECK \ - if (ACEXML_TRY_ENV . exception () != 0) \ - return -// When function requires a return value -# define ACEXML_CHECK_RETURN(RETV) \ - if (ACEXML_TRY_ENV . exception () != 0) \ - return RETV - -// ACEXML_THROW_R_INT should not be used by the user. -# define ACEXML_THROW_R_INT(EXCEPTION) ACEXML_TRY_ENV.exception (new EXCEPTION) - -// Throwing exceptions will inevitably cause a return from the current -// function. These two macros should _NOT_ be used within try blocks. Use -// ACEXML_TRY_THROW or ACEXML_TRY_THROW_EX instead. -# define ACEXML_THROW(EXCEPTION) \ - do \ - { \ - ACEXML_TRY_ENV.exception (new EXCEPTION); \ - return; \ - } while (0) - -# define ACEXML_THROW_RETURN(EXCEPTION,RETV) \ - do \ - { \ - ACEXML_TRY_ENV.exception (new EXCEPTION); \ - return RETV; \ - } while (0) - -// ACEXML_TRY sets up flags to control program flow. ACEXML_TRY_FLAG acts -// like a one-shot flip-flop. When an exception occurs (detected using -// ACEXML_TRY_CHECK,) ACEXML_TRY_FLAG will be reset and the control goes -// back into ACEXML_TRY_LABEL. Since ACEXML_TRY_FLAG is reset, the try -// block won't get executed again and the control proceeds to the following -// catch blocks. ACEXML_EXCEPTION_NOT_CAUGHT flag is used to prevent -// catching an exception twice. This macro assumes there's already an -// ACEXML_ENV_TYPE variable ACEXML_TRY_ENV defined (which should be the -// case normally) -# define ACEXML_TRY \ - do { \ - int ACEXML_TRY_FLAG = 1; \ - int ACEXML_EXCEPTION_NOT_CAUGHT = 1; \ - ACEXML_TRY_LABEL: \ - if (ACEXML_TRY_FLAG) \ - do { - -// ACEXML_TRY_NEW_ENV functions like the macro ACEXML_TRY but defines a new -// ACEXML_ENV_TYPE variable ACEXML_TRY_ENV. It is most often used in the outer -// most function where no ACEXML_TRY_ENV is available. -# define ACEXML_TRY_NEW_ENV \ - do { \ - ACEXML_ENV_TYPE ACEXML_TRY_ENV;\ - int ACEXML_TRY_FLAG = 1; \ - int ACEXML_EXCEPTION_NOT_CAUGHT = 1; \ - ACEXML_TRY_LABEL: \ - if (ACEXML_TRY_FLAG) \ - do { - -// ACEXML_TRY_EX works exactly like ACEXML_TRY macro except the label used -// in the try block is customizable to avoid name clashing. It should be -// used when nested try blocks or multiple try blocks are required, in the -// same function. -# define ACEXML_TRY_EX(LABEL) \ - do { \ - int ACEXML_TRY_FLAG = 1; \ - int ACEXML_EXCEPTION_NOT_CAUGHT = 1; \ - ACEXML_TRY_LABEL ## LABEL: \ - if (ACEXML_TRY_FLAG) \ - do { - -// Check for exceptions within try blocks. -# define ACEXML_TRY_CHECK \ - { \ - if (ACEXML_TRY_ENV.exception () != 0) \ - { \ - ACEXML_TRY_FLAG = 0; \ - goto ACEXML_TRY_LABEL; \ - } \ - } - -// Checking exception within EX try blocks. -# define ACEXML_TRY_CHECK_EX(LABEL) \ - { \ - if (ACEXML_TRY_ENV.exception () != 0) \ - { \ - ACEXML_TRY_FLAG = 0; \ - goto ACEXML_TRY_LABEL ## LABEL; \ - } \ - } - -// Throwing exception within TRY blocks. -# define ACEXML_TRY_THROW(EXCEPTION) \ - { \ - ACEXML_TRY_ENV.exception (new EXCEPTION); \ - ACEXML_TRY_FLAG = 0; \ - goto ACEXML_TRY_LABEL; \ - } - -# define ACEXML_TRY_THROW_EX(EXCEPTION,LABEL) \ - { \ - ACEXML_TRY_ENV.exception (new EXCEPTION); \ - ACEXML_TRY_FLAG = 0; \ - goto ACEXML_TRY_LABEL ## LABEL; \ - } - -// When exceptions occur or try block finishes execution without exception, -// control will continue in the catch block. This macro first checks if -// there's any uncaught exception left. If all the conditions are met, we -// have caught an exception. It then resets ACEXML_EXCEPTION_NOT_CAUGHT to -// prevent subsequent catch blocks from catching the same exception again, -// and extracts out the underlying exception in ACEXML_TRY_ENV. We also make a -// copy of ACEXML_TRY_ENV in ACEXML_CAUGHT_ENV, in case we want to rethrow the -// exception. ACEXML_TRY_ENV is cleared out after the exception is caught so -// you should not use ACEXML_TRY_ENV within the catch block(You should use the -// exception directly). -# define ACEXML_CATCH(TYPE,VAR) \ - } while (0); \ - do \ - if (ACEXML_TRY_ENV.exception () != 0 && ACEXML_EXCEPTION_NOT_CAUGHT && \ - TYPE::_downcast(ACEXML_TRY_ENV.exception ()) != 0) \ - { \ - ACEXML_ENV_TYPE ACEXML_CAUGHT_ENV = ACEXML_TRY_ENV;\ - ACEXML_EXCEPTION_NOT_CAUGHT = 0; \ - TYPE &VAR = *TYPE::_downcast (ACEXML_CAUGHT_ENV.exception ()); \ - ACE_UNUSED_ARG (VAR); \ - ACEXML_TRY_ENV.clear (); - -// ACEXML_CATCHANY uses ACEXML_CATCH to catch all exceptions derived from -// ACEXML_EXCEPTION_TYPE -# define ACEXML_CATCHANY ACEXML_CATCH (ACEXML_EXCEPTION_TYPE, ACEXML_ANY_EXCEPTION) - -// Since there's no other exception for compilers without exception -// support, we simply catch all ACEXML_EXCEPTION_TYPE exceptions for -// ACEXML_CATCHALL. -# define ACEXML_CATCHALL ACEXML_CATCHANY - -// Rethrowing exception within catch blocks. Notice that we depend on the -// ACEXML_CHECK/ACEXML_CHECK_RETURN following the ACEXML_ENDTRY, or -// ACEXML_TRY_CHECK/ ACEXML_TRY_CHECK_EX following the ACEXML_ENDTRY when -// the catch block is within another try block, to do the "Right -// Thing[TM]." -# define ACEXML_RE_THROW \ - do {\ - ACEXML_TRY_ENV = ACEXML_CAUGHT_ENV; \ - goto ACEXML_TRY_LABEL; \ - } while (0) -# define ACEXML_RE_THROW_EX(LABEL) \ - do {\ - ACEXML_TRY_ENV = ACEXML_CAUGHT_ENV; \ - goto ACEXML_TRY_LABEL ## LABEL; \ - } while (0) - -// Close the try block. Since exceptions may not get caught, and exceptions -// can also be rethrown from the catch block, it's always a good idea to -// follow ACEXML_ENDTRY with ACEXML_CHECK or ACEXML_TRY_CHECK (depending on -// the context.) -# define ACEXML_ENDTRY \ - } while (0); \ - } while (0) - -#endif /* ! ACE_USES_NATIVE_EXCEPTIONS */ - -// ACE_HAS_EXCEPTIONS is not the same as ACE_NEW_THROWS_EXCEPTIONS. -#if defined(ACE_NEW_THROWS_EXCEPTIONS) - -# define ACEXML_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \ - do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { errno = ENOMEM; ACEXML_THROW_R_INT (EXCEPTION); } \ - } while (0) - -#else /* ! ACE_NEW_THROWS_EXCEPTIONS */ - -# define ACEXML_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \ - do { POINTER = new CONSTRUCTOR; \ - if (POINTER == 0) { errno = ENOMEM; ACEXML_THROW_R_INT (EXCEPTION); } \ - } while (0) - -#endif /* ACE_NEW_THROWS_EXCEPTIONS */ - -# define ACEXML_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ - ACE_Guard< MUTEX > OBJ (LOCK); \ - if (OBJ.locked () == 0) ACEXML_THROW_R_INT (EXCEPTION); - -# define ACEXML_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ - ACE_Read_Guard< MUTEX > OBJ (LOCK); \ - if (OBJ.locked () == 0) ACEXML_THROW_R_INT (EXCEPTION); - -# define ACEXML_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ - ACE_Write_Guard< MUTEX > OBJ (LOCK); \ - if (OBJ.locked () == 0) ACEXML_THROW_R_INT (EXCEPTION); - -//@{ -/** - * @name Native C++ exceptions portability macros. - * - * The following macros are used to write code portable between platforms - * with and without native C++ exception support. Their main goal is to - * hide the presence of the ACEXML_ENV_TYPE argument, but they collaborate - * with the ACEXML_TRY_* macros to emulate the try/catch blocks. - */ - -/// Define a macro to emit code only when ACEXML_ENV_TYPE is used -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) || defined (ACEXML_ENV_BKWD_COMPAT) -# define ACEXML_ENV_EMIT_CODE(X) X -#else -# define ACEXML_ENV_EMIT_CODE(X) -#endif /* ACE_USES_NATIVE_EXCEPTIONS && ! ACEXML_ENV_BKWD_COMPAT */ - -/// Another macro to emit code only when ACEXML_ENV_TYPE is used -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) || defined (ACEXML_ENV_BKWD_COMPAT) -# define ACEXML_ENV_EMIT_CODE2(X,Y) X,Y -#else -# define ACEXML_ENV_EMIT_CODE2(X,Y) -#endif /* ACE_USES_NATIVE_EXCEPTIONS && ! ACEXML_ENV_BKWD_COMPAT */ - -/// Helper macro -#define ACEXML_ENV_EMIT_DUMMY - -/// Declare a ACEXML_ENV_TYPE argument as the last argument of a -/// function -/** - * Normally this macro is used as follows: - * - * void my_funct (int x, int y ACEXML_ENV_ARG_DECL); - * - * Its purpose is to provide developers (and users) with a mechanism to - * write code that is portable to platforms with and without native C++ - * exceptions. - */ -#define ACEXML_ENV_ARG_DECL \ - ACEXML_ENV_EMIT_CODE2(ACEXML_ENV_EMIT_DUMMY, \ - ACEXML_ENV_TYPE &ACEXML_TRY_ENV) - -/// Declare a ACEXML_ENV_TYPE argument that is not used by the -/// function definition. -/** - * Similar to ACEXML_ENV_ARG_DECL, but the formal parameter name is dropped to - * avoid warnings about unused parameters - */ -#define ACEXML_ENV_ARG_DECL_NOT_USED \ - ACEXML_ENV_EMIT_CODE2(ACEXML_ENV_EMIT_DUMMY, \ - ACEXML_ENV_TYPE &) - -/// Declare a ACEXML_ENV_TYPE argument for methods that do not take any other -/// parameters -#define ACEXML_ENV_SINGLE_ARG_DECL \ - ACEXML_ENV_EMIT_CODE(ACEXML_ENV_TYPE &ACEXML_TRY_ENV) - -/// Declare a ACEXML_ENV_TYPE argument for methods which don't use it. -#define ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED \ - ACEXML_ENV_EMIT_CODE(ACEXML_ENV_TYPE &) - -/// Use the ACEXML_ENV_TYPE argument in a nested call -#define ACEXML_ENV_ARG_PARAMETER \ - ACEXML_ENV_EMIT_CODE2(ACEXML_ENV_EMIT_DUMMY, \ - ACEXML_TRY_ENV) - -/// Use the ACEXML_ENV_TYPE argument in a nested call, assuming that the -/// called function takes only the ACEXML_TRY_ENV argument. -#define ACEXML_ENV_SINGLE_ARG_PARAMETER \ - ACEXML_ENV_EMIT_CODE(ACEXML_TRY_ENV) - -/// Eliminate unused argument warnings about ACEXML_TRY_ENV -#define ACEXML_ENV_ARG_NOT_USED \ - ACEXML_ENV_EMIT_CODE(ACE_UNUSED_ARG(ACEXML_TRY_ENV)) -//@} - -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) -// This thing can be moved above when we drop ACEXML_ENV_BKWD_COMPAT. -# define ACEXML_ENV_RAISE(ex) ACEXML_TRY_ENV.exception (ex) -#else -# define ACEXML_ENV_RAISE(ex) (ex)->_raise () -#endif /* ACEXML_CORBA_HAS_EXCEPTIONS */ - -#include "ace/post.h" - -#endif /* _ACEXML_MACROS_H */ diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h deleted file mode 100644 index 7761cc7f654..00000000000 --- a/ACEXML/common/XML_Types.h +++ /dev/null @@ -1,80 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file XML_Types.h - * - * This file collects the type definitions for data types - * used in ACE XML parser. - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_XML_TYPES_H_ -#define _ACEXML_XML_TYPES_H_ - -#include "ace/pre.h" -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" - -# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 2) -typedef wchar_t ACEXML_UTF16; -# else -typedef ACE_USHORT16 ACEXML_UTF16; -# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 2 */ - -# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 4) -typedef wchar_t ACEXML_UCS4; -# else -typedef ACE_UINT32 ACEXML_UCS4; -# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 4 */ - -typedef char ACEXML_UTF8; - -/** - * @typedef ACEXML_Char - * ACEXML_Char only maps to ACEXML_UTF16 when ACE_USES_WCHAR is defined. - * Here we assume sizeof (wchar_t) is always 2 bytes. - * - * Default XML strings will use UTF-8 encoding. We would like to use - * the string classes in standard C++ Library here. But they are not - * very portable yet (as far as I know,) and I'll just use ACE_CString - * for now, unless UNICODE support is turned on. Notice that you - * should never convert strings between ACE_CString and ACE_WString - * using the built-in conversion functions as they only perform simple - * copy without any encoding conversion. - */ -# if defined (ACE_USES_WCHAR) -typedef ACEXML_UTF16 ACEXML_Char; -typedef ACE_WString ACEXML_String; -# else -typedef ACEXML_UTF8 ACEXML_Char; -typedef ACE_CString ACEXML_String; -# endif /* ACE_USES_WCHAR */ - -# if (!defined (ACEXML_HAS_INLINE) && defined (__ACE_INLINE__)) || (ACEXML_HAS_INLINE == 1) -# define __ACEXML_INLINE__ inline -# else -# if defined (__ACEXML_INLINE__) -# undef __ACEXML_INLINE__ -# endif /* __ACEXML_INLINE__ */ -# endif /* (!ACEXML_HAS_INLINE) && (__ACE_INLINE__) || (ACEXML_HAS_INLINE == 1) */ - -# if defined (__ACEXML_INLINE__) -# define ACEXML_INLINE inline -# else -# define ACEXML_INLINE -# endif /* __ACEXML_INLINE */ - - -#include "ace/post.h" - -#endif /* _ACEXML_XML_TYPE_H_ */ diff --git a/ACEXML/common/common.mpc b/ACEXML/common/common.mpc deleted file mode 100644 index 814e10d88cc..00000000000 --- a/ACEXML/common/common.mpc +++ /dev/null @@ -1,4 +0,0 @@ -project(ACEXML): acelib { - sharedname = ACEXML - dllflags += ACEXML_BUILD_DLL -} diff --git a/ACEXML/docs/TODO.txt b/ACEXML/docs/TODO.txt deleted file mode 100644 index e7e48ca67c4..00000000000 --- a/ACEXML/docs/TODO.txt +++ /dev/null @@ -1,17 +0,0 @@ -/** -@page acexml_todo ACEXML TO-DO List - -
    - -
  • Add Schema parsing ability. - -
  • Add support for resolving external entities, such as a - schema/namespace definition located on the web. - -
  • Add parameterized entity management class. See above. - -
  • Define validator building/calling interfaces. - -
- -*/ diff --git a/ACEXML/docs/bugs.txt b/ACEXML/docs/bugs.txt deleted file mode 100644 index 136e0cd7117..00000000000 --- a/ACEXML/docs/bugs.txt +++ /dev/null @@ -1,17 +0,0 @@ -/** -@page acexml_bugs ACEXML Known Bugs - -
    -
  • ACEXML currently do not validate an XML files. The validator - hooks have not fully integrated into the parser yet. - -
  • Need to verify predefined entities are working correctly. Check - out the SAXPrint example. - -
  • Currently, replacement of parameterized reference (PEReference) is - not working. - -
- - -*/ diff --git a/ACEXML/docs/guidelines.txt b/ACEXML/docs/guidelines.txt deleted file mode 100644 index 9d084924c2c..00000000000 --- a/ACEXML/docs/guidelines.txt +++ /dev/null @@ -1,39 +0,0 @@ -// -*- HTML-Helper -*- $Id$ - -/** -@page acexml_guides ACEXML Programming Guidelines - -
    -
  • A lot of class names under @c $(ACE_ROOT)/ACEXML/common do not - follow the naming convention suggested in ACE-guidelines.html. - The reason for that is because those classes were derived from - the SAX2 API and we would like to keep them as similar as - possible. -
  • Character encoding: The default character encoding for ACEXML - can be set at compile time. ACEXML uses UTF-8 encoding in most - platforms where ACEXML_Char maps to - char in this case. When ACE is configured to use - wchar and UNICODE, ACEXML uses UTF-16 - encoding and ACEXML_Char maps to - wchar_t. Notice that ACEXML assume - sizeof (wchar_t) is of 2-byte long. For platforms - using 4-byte wchar_t, ACEXML will not work - correctly, but it should be trivial to fix.

    - -

  • Currently, there's only an example showing how to use the parser - under @c $(ACE_ROOT)/ACEXML/examples/SAXPrint/. - -
  • (Not supported yet) To develop a new validator, one must - create a DLL implementing - @c ACEXML_Attributes_Def_Builder, @c - ACEXML_Attribute_Def_Builder, @c ACEXML_Element_Def_Builder, - @c ACEXML_Validator, and @c ACEXML_DTD_Manager. The DLL should - also export a traditional C function called @c - create_dtd_manager. The XML parser itself should also be - modified to support and dynamically link with the new validator. - See @c $(ACE_ROOT)/ACEXML/parser/debug_validator/ for an example. - -
- - -*/ diff --git a/ACEXML/docs/parser_features.txt b/ACEXML/docs/parser_features.txt deleted file mode 100644 index c65930e32a2..00000000000 --- a/ACEXML/docs/parser_features.txt +++ /dev/null @@ -1,25 +0,0 @@ -/** -*- HTML-Helper -*- $Id$ -@defgroup acexml_parser_features Configurable Special Features of ACEXML Parser -@{ - -There are special features in ACEXML Parser that can be -activated/deactivated thru @c setFeature. Likewise, whether a feature -has been activated or not can be queried using @c getFeature. - -@sa ACEXML_XMLReader::setFeature -@sa ACEXML_XMLReader::getFeature - -Here is a list of supported features: - -
    -
  1. namespaces - When this feature is enabled, ACEXML parser allows - access by namespace qualified names. - -
  2. namespace_prefixes - Normally the list of attributes returned by the - parser will not contain attributes used as namespace declarations - (xmlns:foo="bar"). When this feature is enabled, the list of attributes - contains the namespace declarations also. -
- -@} -*/ diff --git a/ACEXML/docs/readme.txt b/ACEXML/docs/readme.txt deleted file mode 100644 index f0de833b526..00000000000 --- a/ACEXML/docs/readme.txt +++ /dev/null @@ -1,36 +0,0 @@ -/** -*- HTML-Helper -*- $Id$ -@mainpage ACEXML - A Small and Portable XML Parser - -@section acexml_synopsis Synopsis -ACEXML is a small footprint and portable framework for integrating XML -parsing ability into user applications. The framework is based on the - Simple API for XML -(SAX 2.0) by David Megginson. A simple non-conformant XML parser -is also included in the framework. Since our original motivation was -to use the parser for specifying software composition and -configuration descriptors, at the current stage, the parser does not -fully support all the features specified in the XML specification. - -We do, however, plan to add more features to the parser and will -either release a more versatile parser or allow the current parser to -dynamically load in the extra features in the future. - -@section acexml_features Features of ACEXML -
    -
  • ACEXML only recognize UNICODE documents, although they can be - in various different encoding, such as UTF-8, UTF-16, or UCS-4. - Therefore, it might be a problem to handle document containing - multi-byte charatersets. They can, however, be translated into - UNICODE before being parsed by ACEXML parser. -
- - -@section acexml_others Other Topics -
    -
  1. @ref acexml_parser_features -
  2. @ref acexml_guides -
  3. @ref acexml_bugs -
  4. @ref acexml_todo -
- -*/ diff --git a/ACEXML/examples/Makefile b/ACEXML/examples/Makefile deleted file mode 100644 index a508ee1d096..00000000000 --- a/ACEXML/examples/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the client programs that test the ACE network services -#---------------------------------------------------------------------------- - -DIRS = SAXPrint - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/ACEXML/examples/Makefile.bor b/ACEXML/examples/Makefile.bor deleted file mode 100644 index a2aa4f15bbb..00000000000 --- a/ACEXML/examples/Makefile.bor +++ /dev/null @@ -1,9 +0,0 @@ -# -# Makefile for building the ACE XML examples -# - -DIRS = \ - SAXPrint \ - svcconf - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/ACEXML/examples/SAXPrint/Makefile b/ACEXML/examples/SAXPrint/Makefile deleted file mode 100644 index 728d6d7f1f5..00000000000 --- a/ACEXML/examples/SAXPrint/Makefile +++ /dev/null @@ -1,267 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for repeating token client application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lACEXML_Parser -lACEXML -FILES = Print_Handler \ - SAXPrint_Handler - -SRC = $(addsuffix .cpp,$(FILES)) -OBJ = $(LSRC:%.cpp=$(VDIR)%.o) - -BIN = main - -BUILD = $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Print_Handler.o .obj/Print_Handler.so .shobj/Print_Handler.o .shobj/Print_Handler.so: Print_Handler.cpp Print_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i - -.obj/SAXPrint_Handler.o .obj/SAXPrint_Handler.so .shobj/SAXPrint_Handler.o .shobj/SAXPrint_Handler.so: SAXPrint_Handler.cpp SAXPrint_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - SAXPrint_Handler.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/examples/SAXPrint/Makefile.bor b/ACEXML/examples/SAXPrint/Makefile.bor deleted file mode 100644 index 89c1f051772..00000000000 --- a/ACEXML/examples/SAXPrint/Makefile.bor +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# Makefile for building the SAXPrint example -# - -NAME = SAXPrint - -OBJFILES = \ - $(OBJDIR)\Print_Handler.obj \ - $(OBJDIR)\SAXPrint_Handler.obj \ - $(OBJDIR)\main.obj - -CFLAGS = \ - $(ACE_CFLAGS) \ - $(ACE_XML_CFLAGS) \ - $(ACE_XML_PARSER_CFLAGS) - -CPPDIR = . - -LIBFILES = \ - $(ACE_LIB) \ - $(ACE_XML_LIB) \ - $(ACE_XML_PARSER_LIB) - -!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/ACEXML/examples/SAXPrint/Print_Handler.cpp b/ACEXML/examples/SAXPrint/Print_Handler.cpp deleted file mode 100644 index 19cfb44ba8d..00000000000 --- a/ACEXML/examples/SAXPrint/Print_Handler.cpp +++ /dev/null @@ -1,256 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "Print_Handler.h" -#include "ace/ACE.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACEXML_INLINE__) -# include "Print_Handler.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_Print_Handler::ACEXML_Print_Handler (ACEXML_Char* fileName) - : fileName_(ACE::strnew (fileName)) -{ - -} - -ACEXML_Print_Handler::~ACEXML_Print_Handler (void) -{ - delete[] this->fileName_; -} - -void -ACEXML_Print_Handler::characters (const ACEXML_Char *cdata, - int start, - int end ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event characters () ** start: %d end: %d ***************\n%s\n- End event characters () ---------------\n"), - start, end, cdata)); -} - -void -ACEXML_Print_Handler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event endDocument () ***************\n"))); -} - -void -ACEXML_Print_Handler::endElement (const ACEXML_Char *uri, - const ACEXML_Char *name, - const ACEXML_Char *qName - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event endElement (%s, %s, %s) ***************\n"), - uri, name, qName)); -} - -void -ACEXML_Print_Handler::endPrefixMapping (const ACEXML_Char *prefix - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event endPrefixMapping (%s) ***************\n"), - prefix)); -} - -void -ACEXML_Print_Handler::ignorableWhitespace (const ACEXML_Char *, - int, - int - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event ignorableWhitespace () ***************\n"))); -} - -void -ACEXML_Print_Handler::processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event processingInstruction (%s, %s) ***************\n"), - target, data)); -} - -void -ACEXML_Print_Handler::setDocumentLocator (ACEXML_Locator * locator) -{ - - this->locator_ = locator; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event setDocumentLocator () ***************\n"))); -} - -void -ACEXML_Print_Handler::skippedEntity (const ACEXML_Char *name - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event skippedEntity (%s) ***************\n"), - name)); -} - -void -ACEXML_Print_Handler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event startDocument () ***************\n"))); -} - -void -ACEXML_Print_Handler::startElement (const ACEXML_Char *uri, - const ACEXML_Char *name, - const ACEXML_Char *qName, - ACEXML_Attributes *alist - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event startElement (%s, %s, %s) ***************\n"), - uri, name, qName)); - - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" %s = \"%s\"\n"), - alist->getQName (i), alist->getValue (i))); - } -} - -void -ACEXML_Print_Handler::startPrefixMapping (const ACEXML_Char * prefix, - const ACEXML_Char * uri ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event startPrefixMapping () ***************\n"))); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Prefix = %s, URI = %s\n"), prefix, uri)); -} - -// *** Methods inherit from ACEXML_DTDHandler. - -void -ACEXML_Print_Handler::notationDecl (const ACEXML_Char *name, - const ACEXML_Char *publicID, - const ACEXML_Char *systemID ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event notationDecl: (%s) "), - name)); - - if (publicID == 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("SYSTEM %s\n"), - systemID)); - else if (systemID == 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("PUBLIC %s\n"), - publicID)); - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("PUBLIC %s %s\n"), - publicID, systemID)); -} - -void -ACEXML_Print_Handler::unparsedEntityDecl (const ACEXML_Char *name, - const ACEXML_Char *publicID, - const ACEXML_Char *systemID, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Unparsed Entity: %s"), - name)); - - if (publicID == 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" SYSTEM %s"), - systemID)); - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" PUBLIC %s %s"), - publicID, systemID)); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" NDATA %s\n"), - notationName)); -} - -// Methods inherit from ACEXML_EnitityResolver. - -ACEXML_InputSource * -ACEXML_Print_Handler::resolveEntity (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. - return 0; -} - -// Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ -void -ACEXML_Print_Handler::error (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - ACE_DEBUG ((LM_DEBUG, "%s:%d:%d ", this->fileName_, - this->locator_->getLineNumber(), - this->locator_->getColumnNumber())); - ex.print(); -} - -void -ACEXML_Print_Handler::fatalError (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - ACE_DEBUG ((LM_DEBUG, "%s:%d:%d ", this->fileName_, - this->locator_->getLineNumber(), - this->locator_->getColumnNumber())); - ex.print(); -} - -void -ACEXML_Print_Handler::warning (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} diff --git a/ACEXML/examples/SAXPrint/Print_Handler.h b/ACEXML/examples/SAXPrint/Print_Handler.h deleted file mode 100644 index 3f28e6d9165..00000000000 --- a/ACEXML/examples/SAXPrint/Print_Handler.h +++ /dev/null @@ -1,187 +0,0 @@ -// $Id$ - -//============================================================================= -/** - * @file Print_Handler.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef ACEXML_PRINT_HANDLER_H -#define ACEXML_PRINT_HANDLER_H - -#include "ACEXML/common/DefaultHandler.h" - -/** - * @class ACEXML_Print_Handler - * - * @brief ACEXML_Print_Handler is an example SAX event handler. - * - * This SAX event handler prints out a detailed event report - * on every event it receives. - */ -class ACEXML_Print_Handler : public ACEXML_DefaultHandler -{ -public: - /* - * Default constructor. - */ - ACEXML_Print_Handler (ACEXML_Char* fileName); - - /* - * Default destructor. - */ - virtual ~ACEXML_Print_Handler (void); - - // Methods inherited from ACEXML_ContentHandler. - - /* - * Receive notification of character data. - */ - virtual void characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the end of a document. - */ - virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the end of an element. - */ - virtual void endElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * End the scope of a prefix-URI mapping. - */ - virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of ignorable whitespace in element content. - */ - virtual void ignorableWhitespace (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a processing instruction. - */ - virtual void processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive an object for locating the origin of SAX document events. - */ - virtual void setDocumentLocator (ACEXML_Locator *locator) ; - - /* - * Receive notification of a skipped entity. - */ - virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the beginning of a document. - */ - virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the beginning of an element. - */ - virtual void startElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Begin the scope of a prefix-URI Namespace mapping. - */ - virtual void startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // *** Methods inherit from ACEXML_DTDHandler. - - /* - * Receive notification of a notation declaration event. - */ - virtual void notationDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of an unparsed entity declaration event. - */ - virtual void unparsedEntityDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // Methods inherit from ACEXML_EnitityResolver. - - /* - * Allow the application to resolve external entities. - */ - virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ - virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a non-recoverable error. - */ - virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a warning. - */ - virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; -private: - - ACEXML_Char* fileName_; - ACEXML_Locator* locator_; - -}; - -#endif /* ACEXML_PRINT_HANDLER_H */ diff --git a/ACEXML/examples/SAXPrint/Print_Handler.i b/ACEXML/examples/SAXPrint/Print_Handler.i deleted file mode 100644 index 77b4466a3cb..00000000000 --- a/ACEXML/examples/SAXPrint/Print_Handler.i +++ /dev/null @@ -1 +0,0 @@ -// -*- C++ -*- $Id$ diff --git a/ACEXML/examples/SAXPrint/SAXPrint.dsp b/ACEXML/examples/SAXPrint/SAXPrint.dsp deleted file mode 100644 index 2d9a6cc4a98..00000000000 --- a/ACEXML/examples/SAXPrint/SAXPrint.dsp +++ /dev/null @@ -1,130 +0,0 @@ -# Microsoft Developer Studio Project File - Name="SAXPrint" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=SAXPrint - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "SAXPrint.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "SAXPrint.mak" CFG="SAXPrint - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "SAXPrint - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "SAXPrint - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "SAXPrint - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ace.lib ACEXML.lib ACEXML_Parser.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\Common" /libpath:"..\..\parser\parser" - -!ELSEIF "$(CFG)" == "SAXPrint - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib ACEXMLd.lib ACEXML_Parserd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\Common" /libpath:"..\..\parser\parser" - -!ENDIF - -# Begin Target - -# Name "SAXPrint - Win32 Release" -# Name "SAXPrint - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\main.cpp -# End Source File -# Begin Source File - -SOURCE=.\Print_Handler.cpp -# End Source File -# Begin Source File - -SOURCE=.\SAXPrint_Handler.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Print_Handler.h -# End Source File -# Begin Source File - -SOURCE=.\SAXPrint_Handler.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "i" -# Begin Source File - -SOURCE=.\Print_Handler.i -# End Source File -# Begin Source File - -SOURCE=.\SAXPrint_Handler.i -# End Source File -# End Group -# End Target -# End Project diff --git a/ACEXML/examples/SAXPrint/SAXPrint.dsw b/ACEXML/examples/SAXPrint/SAXPrint.dsw deleted file mode 100644 index 3ec5cb65624..00000000000 --- a/ACEXML/examples/SAXPrint/SAXPrint.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "SAXPrint"=.\SAXPrint.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ACEXML/examples/SAXPrint/SAXPrint.mpc b/ACEXML/examples/SAXPrint/SAXPrint.mpc deleted file mode 100644 index fb64bc80fcd..00000000000 --- a/ACEXML/examples/SAXPrint/SAXPrint.mpc +++ /dev/null @@ -1,2 +0,0 @@ -project(SAXPrint): aceexe, acexml { -} diff --git a/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp b/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp deleted file mode 100644 index 66d96dca47b..00000000000 --- a/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp +++ /dev/null @@ -1,243 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "SAXPrint_Handler.h" -#include "ace/ACE.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACEXML_INLINE__) -# include "SAXPrint_Handler.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_SAXPrint_Handler::ACEXML_SAXPrint_Handler (const ACEXML_Char* filename) - : indent_ (0), fileName_(ACE::strnew (filename)), locator_ (0) -{ - // no-op -} - -ACEXML_SAXPrint_Handler::~ACEXML_SAXPrint_Handler (void) -{ - delete [] this->fileName_; -} - -void -ACEXML_SAXPrint_Handler::characters (const ACEXML_Char *cdata, - int start, - int end ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - ACE_UNUSED_ARG (start); - ACE_UNUSED_ARG (end); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s"), - cdata)); -} - -void -ACEXML_SAXPrint_Handler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); -} - -void -ACEXML_SAXPrint_Handler::endElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - this->dec_indent (); - this->print_indent (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (""), - qName)); -} - -void -ACEXML_SAXPrint_Handler::endPrefixMapping (const ACEXML_Char *prefix - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event endPrefixMapping (%s) ***************\n"), - prefix)); -} - -void -ACEXML_SAXPrint_Handler::ignorableWhitespace (const ACEXML_Char *, - int, - int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event ignorableWhitespace () ***************\n"))); -} - -void -ACEXML_SAXPrint_Handler::processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - this->print_indent (); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n"), - target, data)); -} - -void -ACEXML_SAXPrint_Handler::setDocumentLocator (ACEXML_Locator * locator) -{ - - this->locator_ = locator; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event setDocumentLocator () ***************\n"))); -} - -void -ACEXML_SAXPrint_Handler::skippedEntity (const ACEXML_Char *name - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event skippedEntity (%s) ***************\n"), - name)); -} - -void -ACEXML_SAXPrint_Handler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event startDocument () ***************\n"))); -} - -void -ACEXML_SAXPrint_Handler::startElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName, - ACEXML_Attributes *alist - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - this->print_indent (); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<%s"), - qName)); - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" %s = \"%s\""), - alist->getQName (i), alist->getValue (i))); - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (">"))); - this->inc_indent (); -} - -void -ACEXML_SAXPrint_Handler::startPrefixMapping (const ACEXML_Char * prefix, - const ACEXML_Char * uri ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event startPrefixMapping () ***************\n"))); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Prefix = %s, URI = %s\n"), prefix, uri)); - -} - -// *** Methods inherited from ACEXML_DTDHandler. - -void -ACEXML_SAXPrint_Handler::notationDecl (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_SAXPrint_Handler::unparsedEntityDecl (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -// Methods inherited from ACEXML_EnitityResolver. - -ACEXML_InputSource * -ACEXML_SAXPrint_Handler::resolveEntity (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. - return 0; -} - -// Methods inherited from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ -void -ACEXML_SAXPrint_Handler::error (ACEXML_SAXParseException & ex - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->fileName_, - this->locator_->getLineNumber(), - this->locator_->getColumnNumber())); - ex.print(); -} - -void -ACEXML_SAXPrint_Handler::fatalError (ACEXML_SAXParseException & ex - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->fileName_, - this->locator_->getLineNumber(), - this->locator_->getColumnNumber())); - ex.print(); -} - -void -ACEXML_SAXPrint_Handler::warning (ACEXML_SAXParseException & ex - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->fileName_, - this->locator_->getLineNumber(), - this->locator_->getColumnNumber())); - ex.print(); -} - -void -ACEXML_SAXPrint_Handler::print_indent (void) -{ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - for (size_t i = 0; i < this->indent_; ++i) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" "))); -} diff --git a/ACEXML/examples/SAXPrint/SAXPrint_Handler.h b/ACEXML/examples/SAXPrint/SAXPrint_Handler.h deleted file mode 100644 index 612dd406c06..00000000000 --- a/ACEXML/examples/SAXPrint/SAXPrint_Handler.h +++ /dev/null @@ -1,195 +0,0 @@ -// $Id$ - -//============================================================================= -/** - * @file SAXPrint_Handler.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef ACEXML_SAXPRINT_HANDLER_H -#define ACEXML_SAXPRINT_HANDLER_H - -#include "ACEXML/common/DefaultHandler.h" - -/** - * @class ACEXML_SAXPrint_Handler - * - * @brief ACEXML_SAXPrint_Handler is an example SAX event handler. - * - * This SAX event handler try to regenerate the XML document it - * reads with correct indentation. - */ -class ACEXML_SAXPrint_Handler : public ACEXML_DefaultHandler -{ -public: - /* - * Default constructor. - */ - ACEXML_SAXPrint_Handler (const ACEXML_Char* name); - - /* - * Default destructor. - */ - virtual ~ACEXML_SAXPrint_Handler (void); - - // Methods inherit from ACEXML_ContentHandler. - - /* - * Receive notification of character data. - */ - virtual void characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the end of a document. - */ - virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the end of an element. - */ - virtual void endElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * End the scope of a prefix-URI mapping. - */ - virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of ignorable whitespace in element content. - */ - virtual void ignorableWhitespace (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a processing instruction. - */ - virtual void processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive an object for locating the origin of SAX document events. - */ - virtual void setDocumentLocator (ACEXML_Locator *locator) ; - - /* - * Receive notification of a skipped entity. - */ - virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the beginning of a document. - */ - virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the beginning of an element. - */ - virtual void startElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Begin the scope of a prefix-URI Namespace mapping. - */ - virtual void startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // *** Methods inherit from ACEXML_DTDHandler. - - /* - * Receive notification of a notation declaration event. - */ - virtual void notationDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of an unparsed entity declaration event. - */ - virtual void unparsedEntityDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // Methods inherit from ACEXML_EnitityResolver. - - /* - * Allow the application to resolve external entities. - */ - virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ - virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a non-recoverable error. - */ - virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a warning. - */ - virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - void inc_indent (); - void dec_indent (); - void print_indent (); - -private: - - size_t indent_; - ACEXML_Char* fileName_; - ACEXML_Locator* locator_; -}; - -#if defined (__ACEXML_INLINE__) -# include "SAXPrint_Handler.i" -#endif /* __ACEXML_INLINE__ */ -#endif /* ACEXML_SAXPRINT_HANDLER_H */ diff --git a/ACEXML/examples/SAXPrint/SAXPrint_Handler.i b/ACEXML/examples/SAXPrint/SAXPrint_Handler.i deleted file mode 100644 index 2102291ea68..00000000000 --- a/ACEXML/examples/SAXPrint/SAXPrint_Handler.i +++ /dev/null @@ -1,13 +0,0 @@ -// -*- C++ -*- $Id$ - -ACEXML_INLINE void -ACEXML_SAXPrint_Handler::inc_indent (void) -{ - this->indent_ += 1; -} - -ACEXML_INLINE void -ACEXML_SAXPrint_Handler::dec_indent (void) -{ - this->indent_ -= 1; -} diff --git a/ACEXML/examples/SAXPrint/broken.xml b/ACEXML/examples/SAXPrint/broken.xml deleted file mode 100644 index fc8432680e8..00000000000 --- a/ACEXML/examples/SAXPrint/broken.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - kid \ No newline at end of file diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp deleted file mode 100644 index 64ce0125fe4..00000000000 --- a/ACEXML/examples/SAXPrint/main.cpp +++ /dev/null @@ -1,142 +0,0 @@ -// $Id$ - -#include "ACEXML/common/FileCharStream.h" -#include "ACEXML/common/HttpCharStream.h" -#include "ACEXML/common/StrCharStream.h" -#include "ACEXML/parser/parser/Parser.h" -#include "Print_Handler.h" -#include "SAXPrint_Handler.h" -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" - -static const ACEXML_Char *test_string = -ACE_TEXT (" A & "); - -static void -usage (const ACE_TCHAR* program) -{ - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Usage: %s [-sl] [-f | -u ]\n") - ACE_TEXT (" -s: Use SAXPrint_Handler (Default is Print_Handler)\n") - ACE_TEXT (" -l: Parse the internal strings (test the StrCharStream class)\n") - ACE_TEXT (" -f: Specify the filename when -l is not specified\n") - ACE_TEXT (" -n: Use the \"Simple\" parsing feature\n") - ACE_TEXT (" -u: URL specifying the path to the file\n"), - program)); -} - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - ACEXML_Char* filename = 0; - int sax = 0; // Use SAXPrint handler or not. - int str = 0; - int simple = 0; - ACEXML_Char* url = 0; - - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("snf:lu:")); - int c; - - while ((c = get_opt ()) != EOF) - { - switch (c) - { - case 's': - sax = 1; - break; - case 'l': - str = 1; - break; - case 'f': - filename = get_opt.opt_arg (); - break; - case 'n': - simple = 1; - break; - case 'u': - url = get_opt.opt_arg(); - break; - default: - usage(argv[0]); - return -1; - } - } - - if (str == 0 && filename == 0 && url == 0) { - usage(argv[0]); - return -1; - } - - ACEXML_DefaultHandler *handler = 0; - auto_ptr cleanup_handler (handler); - ACEXML_CharStream *stm = 0; - ACEXML_FileCharStream *fstm = 0; - ACEXML_HttpCharStream *ustm = 0; - if (filename != 0) - { - ACE_NEW_RETURN (fstm, - ACEXML_FileCharStream (), - -1); - - if (fstm->open (filename) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Failed to open XML file: %s\n"), - filename), - -1); - stm = fstm; - } - else if (url != 0) - { - - ACE_NEW_RETURN (ustm, - ACEXML_HttpCharStream (), - -1); - if (ustm->open (url) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Failed to open URL : %s\n"), - url), - -1); - stm = ustm; - } - else { - ACE_NEW_RETURN (stm, - ACEXML_StrCharStream (test_string), - -1); - } - - ACEXML_Char* name = (filename == 0) ? url : filename; - if (sax == 0) - ACE_NEW_RETURN (handler, - ACEXML_Print_Handler (name), - -1); - else - ACE_NEW_RETURN (handler, - ACEXML_SAXPrint_Handler (name), - -1); - - ACEXML_TRY_NEW_ENV - { - ACEXML_Parser parser; - if (simple != 0) - { - parser.setFeature (ACE_TEXT ("Simple"), 1 ACEXML_ENV_ARG_PARAMETER); - ACEXML_TRY_CHECK; - } - ACEXML_InputSource input(stm); - - parser.setContentHandler (handler); - parser.setDTDHandler (handler); - parser.setErrorHandler (handler); - parser.setEntityResolver (handler); - - parser.parse (&input ACEXML_ENV_ARG_PARAMETER); - ACEXML_TRY_CHECK; - } - ACEXML_CATCH (ACEXML_SAXException, ex) - { - ACE_UNUSED_ARG (ex); - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n"))); - } - ACEXML_ENDTRY; - return 0; -} diff --git a/ACEXML/examples/SAXPrint/ns.svc.conf.xml b/ACEXML/examples/SAXPrint/ns.svc.conf.xml deleted file mode 100644 index db1821d7ac0..00000000000 --- a/ACEXML/examples/SAXPrint/ns.svc.conf.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - -d - -p 4911 - - - A & - - -p 3000 - - - - - - - - - - - - - - - - - -p - 3001 - - - - - - - - - - - - - - - - - diff --git a/ACEXML/examples/SAXPrint/simple.svcconf.xml b/ACEXML/examples/SAXPrint/simple.svcconf.xml deleted file mode 100644 index 32afe359fdb..00000000000 --- a/ACEXML/examples/SAXPrint/simple.svcconf.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - A & - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACEXML/examples/SAXPrint/svc.conf.xml b/ACEXML/examples/SAXPrint/svc.conf.xml deleted file mode 100644 index 152f3b44406..00000000000 --- a/ACEXML/examples/SAXPrint/svc.conf.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - ]> - - - - - A & - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACEXML/examples/svcconf/Makefile.bor b/ACEXML/examples/svcconf/Makefile.bor deleted file mode 100644 index 91b14f910cb..00000000000 --- a/ACEXML/examples/svcconf/Makefile.bor +++ /dev/null @@ -1,24 +0,0 @@ -# -# $Id$ -# Makefile for building the svcconf example -# - -NAME = Svcconf - -OBJFILES = \ - $(OBJDIR)\Svcconf_Handler.obj \ - $(OBJDIR)\main.obj - -CFLAGS = \ - $(ACE_CFLAGS) \ - $(ACE_XML_CFLAGS) \ - $(ACE_XML_PARSER_CFLAGS) - -CPPDIR = . - -LIBFILES = \ - $(ACE_LIB) \ - $(ACE_XML_LIB) \ - $(ACE_XML_PARSER_LIB) - -!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/ACEXML/examples/svcconf/README b/ACEXML/examples/svcconf/README deleted file mode 100644 index 7463c7e9572..00000000000 --- a/ACEXML/examples/svcconf/README +++ /dev/null @@ -1,3 +0,0 @@ -$Id$ - -A test workspace for svc.conf handler. \ No newline at end of file diff --git a/ACEXML/examples/svcconf/Svcconf.dsp b/ACEXML/examples/svcconf/Svcconf.dsp deleted file mode 100644 index 15911671e1c..00000000000 --- a/ACEXML/examples/svcconf/Svcconf.dsp +++ /dev/null @@ -1,110 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Svcconf" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Svcconf - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Svcconf.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Svcconf.mak" CFG="Svcconf - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Svcconf - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Svcconf - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Svcconf - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ace.lib ACEXML.lib ACEXML_Parser.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\Common" /libpath:"..\..\parser\parser" - -!ELSEIF "$(CFG)" == "Svcconf - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib ACEXMLd.lib ACEXML_Parserd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\Common" /libpath:"..\..\parser\parser" - -!ENDIF - -# Begin Target - -# Name "Svcconf - Win32 Release" -# Name "Svcconf - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\main.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svcconf_Handler.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Svcconf_Handler.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/ACEXML/examples/svcconf/Svcconf.dsw b/ACEXML/examples/svcconf/Svcconf.dsw deleted file mode 100644 index f25a54a4e72..00000000000 --- a/ACEXML/examples/svcconf/Svcconf.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Svcconf"=.\Svcconf.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ACEXML/examples/svcconf/Svcconf_Handler.cpp b/ACEXML/examples/svcconf/Svcconf_Handler.cpp deleted file mode 100644 index f2bc70292cf..00000000000 --- a/ACEXML/examples/svcconf/Svcconf_Handler.cpp +++ /dev/null @@ -1,486 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "Svcconf_Handler.h" -#include "ace/ACE.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACEXML_INLINE__) -# include "Svcconf_Handler.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler (void) - : in_stream_def_ (0), - in_module_ (0) -{ - // no-op -} - -ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler (void) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::characters (const ACEXML_Char *, - int, - int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0) - { - if (this->in_stream_def_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Create dynamic %s for stream\n"), - this->stream_info_.name ())); - } - else - { - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Push dynamic %s into stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply dynamic %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0) - { - if (this->in_stream_def_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Create sttaic %s for stream\n"), - this->stream_info_.name ())); - } - else - { - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Push static %s into stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply static %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0) - { - this->in_module_ = 0; - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0 || - ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply stream %s of type %s\n"), - this->stream_info_.name (), - this->stream_info_.name ())); - this->stream_info_.reset (); - } - else - { - } -} - -void -ACEXML_Svcconf_Handler::endPrefixMapping (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::ignorableWhitespace (const ACEXML_Char *, - int, - int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::processingInstruction (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::setDocumentLocator (ACEXML_Locator* ) -{ -} - -void -ACEXML_Svcconf_Handler::skippedEntity (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName, - ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0) - { - this->get_dynamic_attrs (alist ACEXML_ENV_ARG_PARAMETER); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("initializer")) == 0) - { - this->get_initializer_attrs (alist ACEXML_ENV_ARG_PARAMETER); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0) - { - this->get_static_attrs (alist ACEXML_ENV_ARG_PARAMETER); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0) - { - this->get_stream_id (alist ACEXML_ENV_ARG_PARAMETER); - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Retrieve stream %s from repository\n"), - this->stream_info_.name ())); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0) - { - this->in_stream_def_ = 1; - // @@ Set up stream service object - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0) - { - this->in_stream_def_ = 0; - this->in_module_ = 1; - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("resume")) == 0) - { - this->get_id (alist ACEXML_ENV_ARG_PARAMETER); - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Resume %s in stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Resume %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("suspend")) == 0) - { - this->get_id (alist ACEXML_ENV_ARG_PARAMETER); - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Suspend %s in stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Suspend %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("remove")) == 0) - { - this->get_id (alist ACEXML_ENV_ARG_PARAMETER); - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Remove %s in stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Remove %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("ACE_Svc_Conf")) == 0) - { - // Main document tag. no-op. - ACE_DEBUG ((LM_INFO, ACE_TEXT ("ACE_Svc_Conf tag\n"))); - } - else - { - // @@ Error. Perhaps we should relay to user event handler here, if available. - } - - return; - - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" %s = \"%s\""), - alist->getQName (i), alist->getValue (i))); - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (">"))); -} - -void -ACEXML_Svcconf_Handler::startPrefixMapping (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -// *** Methods inherit from ACEXML_DTDHandler. - -void -ACEXML_Svcconf_Handler::notationDecl (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_Svcconf_Handler::unparsedEntityDecl (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -// Methods inherit from ACEXML_EnitityResolver. - -ACEXML_InputSource * -ACEXML_Svcconf_Handler::resolveEntity (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. - return 0; -} - -// Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ -void -ACEXML_Svcconf_Handler::error (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_Svcconf_Handler::fatalError (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_Svcconf_Handler::warning (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -int -ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - this->stream_info_.name (alist->getValue (i)); - } - else - { - // @@ Exception... - return -1; - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - this->parsed_info_.name (alist->getValue (i)); - } - else - { - // @@ Exception... - return -1; - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - { - ACE_Parsed_Info *info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - info->name (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("status")) == 0) - { - if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("inactive")) == 0) - { - } - else if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("active")) == 0) - { - } - else - { - // @@ error, invalid 'status' value. - } - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0) - { - if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("service_object")) == 0) - { - info->service_type (ACE_Parsed_Info::SERVICE_OBJECT_TYPE); - } - else if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("stream")) == 0) - { - info->service_type (ACE_Parsed_Info::STREAM_TYPE); - } - else if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("module")) == 0) - { - info->service_type (ACE_Parsed_Info::MODULE_TYPE); - } - else - { - // @@ error, invalid 'type' value. - } - } - else - { - // @@ Exception... - return -1; - } - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - { - ACE_Parsed_Info *info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("init")) == 0) - { - info->init_func (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("path")) == 0) - { - info->path (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) - { - info->init_params (alist->getValue (i)); - } - else - { - // @@ Exception... - return -1; - } - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - { - ACE_Parsed_Info *info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - info->name (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) - { - info->init_params (alist->getValue (i)); - } - else - { - // @@ Exception... - return -1; - } - } - } - return 0; -} diff --git a/ACEXML/examples/svcconf/Svcconf_Handler.h b/ACEXML/examples/svcconf/Svcconf_Handler.h deleted file mode 100644 index 3c02f9e9d4a..00000000000 --- a/ACEXML/examples/svcconf/Svcconf_Handler.h +++ /dev/null @@ -1,285 +0,0 @@ -// $Id$ - -//============================================================================= -/** - * @file Svcconf_Handler.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef ACEXML_SVCCONF_HANDLER_H -#define ACEXML_SVCCONF_HANDLER_H - -#include "ACEXML/common/DefaultHandler.h" - -class ACE_Parsed_Info -{ -public: - typedef enum { - MODULE_TYPE, - SERVICE_OBJECT_TYPE, - STREAM_TYPE, - INVALID_TYPE - } Service_Type; - - ACE_Parsed_Info (); - ~ACE_Parsed_Info (); - - /** - * Set/get name of a parsed entity. - */ - int name (const ACEXML_Char *n); - const ACEXML_Char *name (void); - - /** - * Set/get type of a dynamic node. - */ - int service_type (Service_Type type); - Service_Type service_type (void); - - /** - * Set/Get active status. - */ - int active (int a); - int active (void); - - /** - * Set/get initializer path. - */ - int path (const ACEXML_Char *n); - const ACEXML_Char *path (void); - - /** - * Set/get initializer init function. - */ - int init_func (const ACEXML_Char *n); - const ACEXML_Char *init_func (void); - - /** - * Set/get initializer init parameter. - */ - int init_params (const ACEXML_Char *n); - const ACEXML_Char *init_params (void); - - /** - * Reset Parsed_Info. - */ - void reset (void); - -protected: - ACEXML_Char *name_; - Service_Type service_type_; - int active_; - ACEXML_Char *path_; - ACEXML_Char *init_func_; - ACEXML_Char *init_params_; -}; - -/** - * @class ACEXML_Svcconf_Handler - * - * @brief ACEXML_Svcconf_Handler is an example SAX event handler. - * - * This SAX event handler try to regenerate the XML document it - * reads with correct indentation. - */ -class ACEXML_Svcconf_Handler : public ACEXML_DefaultHandler -{ -public: - /* - * Default constructor. - */ - ACEXML_Svcconf_Handler (void); - - /* - * Default destructor. - */ - virtual ~ACEXML_Svcconf_Handler (void); - - // Methods inherit from ACEXML_ContentHandler. - - /* - * Receive notification of character data. - */ - virtual void characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the end of a document. - */ - virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the end of an element. - */ - virtual void endElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * End the scope of a prefix-URI mapping. - */ - virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of ignorable whitespace in element content. - */ - virtual void ignorableWhitespace (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a processing instruction. - */ - virtual void processingInstruction (const ACEXML_Char *target, - const ACEXML_Char *data ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive an object for locating the origin of SAX document events. - */ - virtual void setDocumentLocator (ACEXML_Locator *) ; - - /* - * Receive notification of a skipped entity. - */ - virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the beginning of a document. - */ - virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of the beginning of an element. - */ - virtual void startElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName, - ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Begin the scope of a prefix-URI Namespace mapping. - */ - virtual void startPrefixMapping (const ACEXML_Char *prefix, - const ACEXML_Char *uri ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // *** Methods inherit from ACEXML_DTDHandler. - - /* - * Receive notification of a notation declaration event. - */ - virtual void notationDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of an unparsed entity declaration event. - */ - virtual void unparsedEntityDecl (const ACEXML_Char *name, - const ACEXML_Char *publicId, - const ACEXML_Char *systemId, - const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // Methods inherit from ACEXML_EnitityResolver. - - /* - * Allow the application to resolve external entities. - */ - virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId, - const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - // Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ - virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a non-recoverable error. - */ - virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Receive notification of a warning. - */ - virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - -protected: - /** - * Get the only attribute in or . - */ - int get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the only attribute in , , - */ - int get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the dynamic tag attributes. - */ - int get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the initializer tag attributes. - */ - int get_initializer_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the static tag attributes. - */ - int get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - -private: - /// We are parsing a stream definition - int in_stream_def_; - - /// We are defining a steam module - int in_module_; - - ACE_Parsed_Info parsed_info_; - - ACE_Parsed_Info stream_info_; -}; - -#if defined (__ACEXML_INLINE__) -# include "Svcconf_Handler.i" -#endif /* __ACEXML_INLINE__ */ -#endif /* ACEXML_SVCCONF_HANDLER_H */ diff --git a/ACEXML/examples/svcconf/Svcconf_Handler.i b/ACEXML/examples/svcconf/Svcconf_Handler.i deleted file mode 100644 index fb6ea3db2ce..00000000000 --- a/ACEXML/examples/svcconf/Svcconf_Handler.i +++ /dev/null @@ -1,133 +0,0 @@ -// -*- C++ -*- $Id$ - -ACE_INLINE -ACE_Parsed_Info::ACE_Parsed_Info () - : name_ (0), - service_type_ (INVALID_TYPE), - active_ (1), - path_ (0), - init_func_ (0), - init_params_ (0) -{ -} - -ACE_INLINE -ACE_Parsed_Info::~ACE_Parsed_Info () -{ - delete this->name_; - delete this->path_; - delete this->init_func_; - delete this->init_params_; -} - -ACE_INLINE int -ACE_Parsed_Info::name (const ACEXML_Char *n) -{ - if (this->name_ == 0) - { - this->name_ = ACE::strnew (n); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::name (void) -{ - return this->name_; -} - -ACE_INLINE int -ACE_Parsed_Info::service_type (Service_Type type) -{ - if (this->service_type_ == INVALID_TYPE) - { - this->service_type_ = type; - return 0; - } - return -1; -} - -ACE_INLINE ACE_Parsed_Info::Service_Type -ACE_Parsed_Info::service_type (void) -{ - return this->service_type_; -} - -ACE_INLINE int -ACE_Parsed_Info::active (int a) -{ - this->active_ = a; - return 0; -} - -ACE_INLINE int -ACE_Parsed_Info::active (void) -{ - return this->active_; -} - -ACE_INLINE int -ACE_Parsed_Info::path (const ACEXML_Char *p) -{ - if (this->path_ == 0) - { - this->path_ = ACE::strnew (p); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::path (void) -{ - return this->path_; -} - -ACE_INLINE int -ACE_Parsed_Info::init_func (const ACEXML_Char *n) -{ - if (this->init_func_ == 0) - { - this->init_func_ = ACE::strnew (n); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::init_func (void) -{ - return this->init_func_; -} - -ACE_INLINE int -ACE_Parsed_Info::init_params (const ACEXML_Char *n) -{ - if (this->init_params_ == 0) - { - this->init_params_ = ACE::strnew (n); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::init_params (void) -{ - return this->init_params_; -} - -ACE_INLINE void -ACE_Parsed_Info::reset (void) -{ - delete this->name_; - this->name_ = 0; - this->service_type_ = INVALID_TYPE; - delete this->path_; - this->path_ = 0; - delete this->init_func_; - this->init_func_ = 0; - delete this->init_params_; - this->init_params_ = 0; -} diff --git a/ACEXML/examples/svcconf/main.cpp b/ACEXML/examples/svcconf/main.cpp deleted file mode 100644 index d23ffcbe91a..00000000000 --- a/ACEXML/examples/svcconf/main.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// $Id$ - -#include "ACEXML/common/FileCharStream.h" -#include "ACEXML/common/StrCharStream.h" -#include "ACEXML/parser/parser/Parser.h" -#include "Svcconf_Handler.h" -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - ACE_TCHAR *filename = 0; - - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:")); - ACE_TCHAR c; - - while ((c = get_opt ()) != -1) - { - switch (c) - { - case 'f': - filename = get_opt.opt_arg (); - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Usage: %s [-f ]\n") - ACE_TEXT (" -f: Specify the svcconf filename\n"), - argv[0]), - -1); - } - }; - - if (filename == 0) - ACE_ERROR_RETURN ((LM_ERROR, "No filename specified\n"), -1); - - ACEXML_DefaultHandler *handler = 0; - auto_ptr cleanup_handler (handler); - ACEXML_CharStream *stm = 0; - ACEXML_FileCharStream *fstm = 0; - ACE_NEW_RETURN (fstm, - ACEXML_FileCharStream (), - 1); - - if (fstm->open (filename) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Fail to open XML file: %s\n"), - filename), - -1); - stm = fstm; - - ACE_NEW_RETURN (handler, - ACEXML_Svcconf_Handler (), - -1); - - ACEXML_Parser parser; - ACEXML_InputSource input(stm); - - parser.setContentHandler (handler); - parser.setDTDHandler (handler); - parser.setErrorHandler (handler); - parser.setEntityResolver (handler); - - ACEXML_TRY_NEW_ENV - { - parser.parse (&input ACEXML_ENV_ARG_PARAMETER); - ACEXML_TRY_CHECK; - } - ACEXML_CATCH (ACEXML_SAXException, ex) - { - ex.print (); - return -1; - } - ACEXML_ENDTRY; - return 0; -} diff --git a/ACEXML/examples/test_docs/svcconf.dtd b/ACEXML/examples/test_docs/svcconf.dtd deleted file mode 100644 index b9e6cc41c8e..00000000000 --- a/ACEXML/examples/test_docs/svcconf.dtd +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACEXML/parser/Makefile b/ACEXML/parser/Makefile deleted file mode 100644 index 9a519bc492b..00000000000 --- a/ACEXML/parser/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the client programs that test the ACE network services -#---------------------------------------------------------------------------- - -DIRS = parser - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/ACEXML/parser/Makefile.bor b/ACEXML/parser/Makefile.bor deleted file mode 100644 index cb61c1c99dd..00000000000 --- a/ACEXML/parser/Makefile.bor +++ /dev/null @@ -1,9 +0,0 @@ -# -# Makefile for building the ACE XML parser Library -# - -DIRS = \ - debug_validator \ - parser - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp b/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp deleted file mode 100644 index 2ad9e7183bf..00000000000 --- a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp +++ /dev/null @@ -1,215 +0,0 @@ -// $Id$ - -#include "ACEXML/common/SAXExceptions.h" -#include "ACEXML/parser/debug_validator/Debug_Attributes_Builder.h" - -ACEXML_Debug_Attribute_Builder::ACEXML_Debug_Attribute_Builder () - : type_ (ERROR_TYPE), - default_decl_ (INVALID) -{ -} - -ACEXML_Debug_Attribute_Builder::ACEXML_Debug_Attribute_Builder (const ACEXML_Debug_Attribute_Builder &rhs) - : name_ (rhs.name_), - type_ (rhs.type_), - default_decl_ (rhs.default_decl_), - default_value_ (rhs.default_value_), - att_value_queue_ (rhs.att_value_queue_) -{ -} - -ACEXML_Debug_Attribute_Builder::~ACEXML_Debug_Attribute_Builder () -{ -} - -int -ACEXML_Debug_Attribute_Builder::setName (const ACEXML_Char *n) -{ - this->name_.set (n, 0); - return 0; -} - -const ACEXML_Char * -ACEXML_Debug_Attribute_Builder::getName (void) -{ - return this->name_.fast_rep (); -} - -int -ACEXML_Debug_Attribute_Builder::setAttType (const ATT_TYPE type - ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->type_ == ERROR_TYPE) - { - this->type_ = type; - return 0; - } - ACEXML_THROW_RETURN (ACEXML_SAXParseException (ACE_TEXT("Attribute type redefinition in Debug Validator")), -1); - -} - -int -ACEXML_Debug_Attribute_Builder::insertList (const ACEXML_Char *n - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACEXML_String str (n, 0, 0); - - this->att_value_queue_.enqueue_tail (str); - return 0; -} - -int -ACEXML_Debug_Attribute_Builder::setDefault (const DEFAULT_DECL def, - const ACEXML_Char *value - ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - this->default_decl_ = def; - this->default_value_.set (value, 0); - return 0; -} - -int -ACEXML_Debug_Attribute_Builder::validAttr (void) -{ - // @@ Not implemented. Always return 1 (true) for now. - return 1; -} - -void -ACEXML_Debug_Attribute_Builder::dump (void) -{ - cout << this->name_ << " "; - - switch (this->type_) - { - case CDATA: - cout << "CDATA "; - break; - case ID: - cout << "ID "; - break; - case IDREF: - cout << "IDREF "; - break; - case IDREFS: - cout << "IDREFS "; - break; - case ENTITY: - cout << "ENTITY "; - break; - case ENTITIES: - cout << "ENTITIES "; - break; - case NMTOKEN: - cout << "NMTOKEN "; - break; - case NMTOKENS: - cout << "NMTOKENS "; - break; - case NOTATION: - cout << "NOTATION "; - // Fall thru - case ENUMERATION: - { - cout << "("; - ACEXML_STRING_QUEUE_ITERATOR iter (this->att_value_queue_); - ACEXML_String *n = 0; - - while (iter.advance () != 0) - { - if (n == 0) - cout << " | "; - iter.next (n); - cout << *n; - } - cout << ") "; - } - break; - default: - cout << "*** UNKNOWN TYPE ***"; - break; - } - - switch (this->default_decl_) - { - case REQUIRED: - cout << "#REQUIRED"; - break; - case IMPLIED: - cout << "#IMPLIED"; - break; - case FIXED: - cout << "#FIXED " << this->default_value_; - break; - default: - cout << "**** UNDEFINED DEFAULT DECL ****"; - break; - } -} -// ======================================== - -ACEXML_Debug_Attributes_Builder::ACEXML_Debug_Attributes_Builder () -{ -} - -ACEXML_Debug_Attributes_Builder::~ACEXML_Debug_Attributes_Builder () -{ -} - -int -ACEXML_Debug_Attributes_Builder::setElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - this->element_name_.set (qName, 0); - return 0; -} - -ACEXML_Attribute_Def_Builder * -ACEXML_Debug_Attributes_Builder::getAttribute_Def_Builder () -{ - ACEXML_Attribute_Def_Builder *tmp; - - ACE_NEW_RETURN (tmp, - ACEXML_Debug_Attribute_Builder (), - 0); - return tmp; -} - -int -ACEXML_Debug_Attributes_Builder::insertAttribute (ACEXML_Attribute_Def_Builder *def ACEXML_ENV_ARG_DECL) -{ - ACEXML_Attribute_Def_Builder::VAR ptr (def); - - if (def != 0) - { - ACEXML_String attname (def->getName (), 0, 0); - ACEXML_Debug_Attribute_Builder *ptr = - ACE_dynamic_cast (ACEXML_Debug_Attribute_Builder *, def); - this->attributes_.bind (attname, *ptr); - return 0; - } - ACEXML_THROW_RETURN (ACEXML_SAXParseException (ACE_TEXT("ACEXML_Debug_Attributes_Builder internal error")), -1); -} - -void -ACEXML_Debug_Attributes_Builder::dump (void) -{ - // @@ Print print. - cout << "element_name_ << endl; - - ACEXML_ATT_MAP_ITER iter (this->attributes_); - ACEXML_ATT_MAP_ENTRY *item; - - while (iter.advance () != 0) - { - iter.next (item); - cout << "\n\t"; - item->int_id_.dump (); - } - cout << ">" << endl; -} diff --git a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h b/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h deleted file mode 100644 index 82f7b1b4f65..00000000000 --- a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h +++ /dev/null @@ -1,170 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Debug_Attributes_Builder.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_DEBUG_ATTRIBUTES_BUILDER_H_ -#define _ACEXML_DEBUG_ATTRIBUTES_BUILDER_H_ - -#include "ace/pre.h" -#include "ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Attributes_Def_Builder.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Unbounded_Queue.h" - -typedef ACE_Unbounded_Queue ACEXML_STRING_QUEUE; -typedef ACE_Unbounded_Queue_Iterator ACEXML_STRING_QUEUE_ITERATOR; - -/** - * @class ACEXML_Debug_Attribute_Builder Debug_Attributes_Builder.h "parser/debug_validator/Debug_Attributes_Builder.h" - * - * This class prints out the Attribute definition for debugging purpose. - */ -class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Debug_Attribute_Builder - : public ACEXML_Attribute_Def_Builder -{ -public: - ACEXML_Debug_Attribute_Builder (); - - ACEXML_Debug_Attribute_Builder (const ACEXML_Debug_Attribute_Builder &rhs); - - virtual ~ACEXML_Debug_Attribute_Builder (); - - /** - * Specify the name of the attribute. - */ - virtual int setName (const ACEXML_Char *n); - virtual const ACEXML_Char *getName (void); - - /** - * Set the attribute type. - */ - virtual int setAttType (const ATT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /** - * Insert an element for NOTATION or ENUMERATION type attribute. - */ - virtual int insertList (const ACEXML_Char *Name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /** - * Set default attribute declaration. - */ - virtual int setDefault (const DEFAULT_DECL def, - const ACEXML_Char *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /** - * Check validity of the current attribute definition being built. - * - * @retval 0 if the attribute is not a valid combo. - */ - virtual int validAttr (void); - - - /** - * Dump the content of the attribute definition. - */ - virtual void dump (void); -private: - /// Attribute name. - ACEXML_String name_; - - /// Type of attribute. - ATT_TYPE type_; - - /// Default value type. - DEFAULT_DECL default_decl_; - - /// Default attribute value. - ACEXML_String default_value_; - - /// Holds a queue of enumerated attribute values. - ACEXML_STRING_QUEUE att_value_queue_; -}; - -typedef ACE_Hash_Map_Entry ACEXML_ATT_MAP_ENTRY; - -typedef ACE_Hash_Map_Manager_Ex , - ACE_Equal_To, - ACE_Null_Mutex> ACEXML_ATT_MAP; - -typedef ACE_Hash_Map_Iterator_Ex, - ACE_Equal_To, - ACE_Null_Mutex> ACEXML_ATT_MAP_ITER; - -typedef ACE_Hash_Map_Reverse_Iterator_Ex, - ACE_Equal_To, - ACE_Null_Mutex> ACEXML_ATT_MAP_REVERSE_ITER; - -/** - * @class ACEXML_Debug_Attributes_Builder Debug_Attributes_Builder.h "parser/debug_validator/Debug_Attributes_Builder.h" - * - * This class prints out Attribute definitions for debugging purpose. - */ -class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Debug_Attributes_Builder - : public ACEXML_Attributes_Def_Builder -{ -public: - ACEXML_Debug_Attributes_Builder (); - - virtual ~ACEXML_Debug_Attributes_Builder (); - - /** - * Set the element name that the attribute builder applies. - * - * @retval 0 if valid, -1 otherwise. - */ - virtual int setElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /** - * Acquire an Attribute_Builder. - */ - virtual ACEXML_Attribute_Def_Builder *getAttribute_Def_Builder (); - - /** - * Add a definition for one attribute. - */ - virtual int insertAttribute (ACEXML_Attribute_Def_Builder *def ACEXML_ENV_ARG_DECL); - - - /** - * Dump the content of the attribute definition. - */ - virtual void dump (void); -protected: - /// The name of the element type these attributes applied. - ACEXML_String element_name_; - - /// Collection of attributes. - ACEXML_ATT_MAP attributes_; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_DEBUG_ATTRIBUTES_BUILDER_H_ */ diff --git a/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp b/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp deleted file mode 100644 index d0745d13bfc..00000000000 --- a/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/SAXExceptions.h" -#include "ACEXML/parser/debug_validator/Debug_DTD_Manager.h" -#include "ACEXML/parser/debug_validator/Debug_Element_Builder.h" -#include "ACEXML/parser/debug_validator/Debug_Attributes_Builder.h" - -ACEXML_Debug_DTD_Manager::ACEXML_Debug_DTD_Manager () -{ - -} - -ACEXML_Debug_DTD_Manager::~ACEXML_Debug_DTD_Manager () -{ - -} - -ACEXML_Element_Def_Builder * -ACEXML_Debug_DTD_Manager::getElement_Def_Builder () -{ - return new ACEXML_Debug_Element_Builder (); -} - -int -ACEXML_Debug_DTD_Manager::insertElement_Definition (ACEXML_Element_Def_Builder *def ACEXML_ENV_ARG_DECL) -{ - ACEXML_Element_Def_Builder::VAR ptr (def); - - if (def != 0) - { - ptr->dump (); - return 0; - } - - ACEXML_THROW_RETURN (ACEXML_SAXParseException (ACE_TEXT("ACEXML_Debug_Attributes_Builder internal error")), -1); -} - -ACEXML_Attributes_Def_Builder * -ACEXML_Debug_DTD_Manager::getAttribute_Def_Builder () -{ - ACEXML_Attributes_Def_Builder *tmp; - ACE_NEW_RETURN (tmp, - ACEXML_Debug_Attributes_Builder (), - 0); - return tmp; -} - -int -ACEXML_Debug_DTD_Manager::insertAttributes_Definition (ACEXML_Attributes_Def_Builder *def ACEXML_ENV_ARG_DECL) -{ - ACEXML_Attributes_Def_Builder::VAR ptr (def); - if (def != 0) - { - ptr->dump (); - return 0; - } - - ACEXML_THROW_RETURN (ACEXML_SAXParseException (ACE_TEXT("ACEXML_Debug_Attributes_Builder internal error")), -1); -} - -ACEXML_Validator * -ACEXML_Debug_DTD_Manager::getValidator (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) -{ - ACE_UNUSED_ARG (namespaceURI); - ACE_UNUSED_ARG (localName); - ACE_UNUSED_ARG (qName); - - ACEXML_THROW_RETURN (ACEXML_SAXNotSupportedException (ACE_TEXT ("getValidator()")), 0); -} diff --git a/ACEXML/parser/debug_validator/Debug_DTD_Manager.h b/ACEXML/parser/debug_validator/Debug_DTD_Manager.h deleted file mode 100644 index e493477d0d9..00000000000 --- a/ACEXML/parser/debug_validator/Debug_DTD_Manager.h +++ /dev/null @@ -1,76 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Debug_DTD_Manager.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_DEBUG_DTD_Manager_H_ -#define _ACEXML_DEBUG_DTD_Manager_H_ - -#include "ace/pre.h" -#include "ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/DTD_Manager.h" - -class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Debug_DTD_Manager : public ACEXML_DTD_Manager -{ -public: - ACEXML_Debug_DTD_Manager (); - - virtual ~ACEXML_Debug_DTD_Manager (); - - /** - * Acquire a pointer to an element definition builder. The XML parser use - * this interface to acquire the definition builder and use the builder - * to create the DTD element definition. The resulting builder is then - * registered with the DTD Manager or destroyed if error occured when the - * builder encountered errors. - * - * @retval 0 if error occurs creating the builder. - */ - virtual ACEXML_Element_Def_Builder *getElement_Def_Builder (); - - /** - * Insert a new element definition into the DTD Manager. - * - * @retval 0 if success, -1 if error. - */ - virtual int insertElement_Definition (ACEXML_Element_Def_Builder *def ACEXML_ENV_ARG_DECL); - - /** - * Acquire a pointer to an attributes definition builder. - * - */ - virtual ACEXML_Attributes_Def_Builder *getAttribute_Def_Builder (); - - /** - * Insert a new attributes definition into the DTD Manager. - * - * @retval 0 if success, -1 otherwise. - */ - virtual int insertAttributes_Definition (ACEXML_Attributes_Def_Builder *def ACEXML_ENV_ARG_DECL); - - /** - * Acquire an element validator to validate an XML element. - * - * @todo I haven't figured out what memory management scheme - * we should use for the acquired validator. - */ - virtual ACEXML_Validator *getValidator (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL); -}; - -#include "ace/post.h" - - -#endif /* _ACEXML_DTD_Manager_H_ */ diff --git a/ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h b/ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h deleted file mode 100644 index b4cf1c8a536..00000000000 --- a/ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h +++ /dev/null @@ -1,38 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s ACEXML_DEBUG_DTD_MANAGER -// ------------------------------ -#ifndef ACEXML_DEBUG_DTD_MANAGER_EXPORT_H -#define ACEXML_DEBUG_DTD_MANAGER_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACEXML_DEBUG_DTD_MANAGER_HAS_DLL) -# define ACEXML_DEBUG_DTD_MANAGER_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACEXML_DEBUG_DTD_MANAGER_HAS_DLL */ - -#if !defined (ACEXML_DEBUG_DTD_MANAGER_HAS_DLL) -# define ACEXML_DEBUG_DTD_MANAGER_HAS_DLL 1 -#endif /* ! ACEXML_DEBUG_DTD_MANAGER_HAS_DLL */ - -#if defined (ACEXML_DEBUG_DTD_MANAGER_HAS_DLL) && (ACEXML_DEBUG_DTD_MANAGER_HAS_DLL == 1) -# if defined (ACEXML_DEBUG_DTD_MANAGER_BUILD_DLL) -# define ACEXML_DEBUG_DTD_MANAGER_Export ACE_Proper_Export_Flag -# define ACEXML_DEBUG_DTD_MANAGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACEXML_DEBUG_DTD_MANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ACEXML_DEBUG_DTD_MANAGER_BUILD_DLL */ -# define ACEXML_DEBUG_DTD_MANAGER_Export ACE_Proper_Import_Flag -# define ACEXML_DEBUG_DTD_MANAGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACEXML_DEBUG_DTD_MANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACEXML_DEBUG_DTD_MANAGER_BUILD_DLL */ -#else /* ACEXML_DEBUG_DTD_MANAGER_HAS_DLL == 1 */ -# define ACEXML_DEBUG_DTD_MANAGER_Export -# define ACEXML_DEBUG_DTD_MANAGER_SINGLETON_DECLARATION(T) -# define ACEXML_DEBUG_DTD_MANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACEXML_DEBUG_DTD_MANAGER_HAS_DLL == 1 */ - -#endif /* ACEXML_DEBUG_DTD_MANAGER_EXPORT_H */ - -// End of auto generated file. diff --git a/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp b/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp deleted file mode 100644 index 48fff495365..00000000000 --- a/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp +++ /dev/null @@ -1,148 +0,0 @@ -// $Id$ - -#include "ACEXML/common/SAXExceptions.h" -#include "ACEXML/parser/debug_validator/Debug_Element_Builder.h" - -ACEXML_Debug_Element_Builder::ACEXML_Debug_Element_Builder () - : type_ (UNDEFINED), - root_ (0) -{ -} - -ACEXML_Debug_Element_Builder::~ACEXML_Debug_Element_Builder () -{ - delete this->root_; -} - -int -ACEXML_Debug_Element_Builder::setElementName (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - this->element_.set (qName, 0); - return 0; -} - -int -ACEXML_Debug_Element_Builder::setContentType (CONTENT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->type_ == UNDEFINED) - { - this->type_ = type; - return 0; - } - - ACEXML_THROW_RETURN (ACEXML_SAXParseException (ACE_TEXT("Element type redefinition in Debug_Validator.")), -1); -} - -int -ACEXML_Debug_Element_Builder::insertMixedElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACEXML_Element_Tree_Name_Node *node; - - // @@ We should "throw" an exception here instead of returning -1. - ACE_NEW_RETURN (node, - ACEXML_Element_Tree_Name_Node (qName), - -1); - - if (this->root_ == 0) - // @@ Memory leak if fail? - ACE_NEW_RETURN (this->root_, - ACEXML_Element_Tree_List_Node (), - -1); - - - return this->root_->insert (node); -} - -int -ACEXML_Debug_Element_Builder::startChildGroup () -{ - ACEXML_Element_Tree_List_Node *lnode; - - ACE_NEW_RETURN (lnode, - ACEXML_Element_Tree_List_Node (), - -1); - - if (this->root_ == 0) - { - this->root_ = lnode; - } - else - { - // @@ check error? - this->root_->insert (lnode); - } - - this->active_list_.push (lnode); - return 0; -} - -int -ACEXML_Debug_Element_Builder::endChildGroup (CARDINALITY ACEXML_ENV_ARG_DECL_NOT_USED) -{ - this->active_list_.pop (); - return 0; -} - -int -ACEXML_Debug_Element_Builder::setChoice () -{ - this->active_list_.top ()->set (ACEXML_Element_Tree_List_Node::CHOICE); - return 0; -} - -int -ACEXML_Debug_Element_Builder::setSequence () -{ - this->active_list_.top ()->set (ACEXML_Element_Tree_List_Node::SEQUENCE); - return 0; -} - -int -ACEXML_Debug_Element_Builder::insertElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - ACEXML_Element_Tree_Name_Node *node; - - // @@ We should "throw" an exception here instead of returning -1. - ACE_NEW_RETURN (node, - ACEXML_Element_Tree_Name_Node (qName), - -1); - - return this->active_list_.top ()->insert (node); -} - -void -ACEXML_Debug_Element_Builder::dump () -{ - cout << "element_; - - // @@ Also dump element contentspec here. - switch (this->type_) - { - case EMPTY: - cout << "EMPTY"; - break; - case ANY: - cout << "ANY"; - break; - case MIXED: - case CHILDREN: - // @@ Dump the content of this->root_ - cout << "*** not implemented ***"; - break; - default: - cout << "*** Unidentified element type ***"; - break; - } - - cout << ">" << endl; -} diff --git a/ACEXML/parser/debug_validator/Debug_Element_Builder.h b/ACEXML/parser/debug_validator/Debug_Element_Builder.h deleted file mode 100644 index b2530e42b09..00000000000 --- a/ACEXML/parser/debug_validator/Debug_Element_Builder.h +++ /dev/null @@ -1,127 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Debug_Element_Builder.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_DEBUG_ELEMENT_BUILDER_H_ -#define _ACEXML_DEBUG_ELEMENT_BUILDER_H_ - -#include "ace/pre.h" -#include "ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/Element_Def_Builder.h" -#include "ACEXML/parser/debug_validator/Element_Tree.h" - -/** - * @class ACEXML_Debug_Element_Builder Debug_Element_Builder.h "parser/debug_validator/Debug_Element_Builder.h" - * - * This class prints out the element definition for debugging purpose. - * - * @todo This class is not namespace-aware. - */ -class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Debug_Element_Builder - : public ACEXML_Element_Def_Builder -{ -public: - ACEXML_Debug_Element_Builder (); - - virtual ~ACEXML_Debug_Element_Builder (); - - /** - * Define the name of the element. - * - * @retval 0 if valid, -1 otherwise. - */ - virtual int setElementName (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /** - * Define the content type of the element. - * - * @retval 0 if valid, -1 otherwise. - */ - virtual int setContentType (CONTENT_TYPE type ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /** - * Insert one more element into Mixed definition. - */ - virtual int insertMixedElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /** - * Start a new group of children. - */ - virtual int startChildGroup (); - - /** - * End a new group of children. - * - * @retval 0 on success. - */ - virtual int endChildGroup (CARDINALITY card ACEXML_ENV_ARG_DECL); - - /** - * Set the type of current child group to Choice. - * - * @retval 0 on success, -1 if the type of the child group has - * already been set and this action conflicts with the previous - * setting. - */ - virtual int setChoice (); - - /** - * Set the type of current child group to Sequence. - * - * @retval 0 on success, -1 if the type of the child group has - * already been set and this action conflicts with the previous - * setting. - */ - virtual int setSequence (); - - /** - * Insert an new element into the current child group. - * - * @retval 0 on success, -1 otherwise. - */ - virtual int insertElement (const ACEXML_Char *namespaceURI, - const ACEXML_Char *localName, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /** - * Dump the content of the attribute definition. - */ - virtual void dump (void); -private: - CONTENT_TYPE type_; - - ACEXML_String element_; - - ACEXML_Element_Tree_List_Node *root_; - - ACEXML_Element_Tree_List_Stack active_list_; -}; - - -#include "ace/post.h" - -#endif /* _ACEXML_DEBUG_ELEMENT_BUILDER_H_ */ diff --git a/ACEXML/parser/debug_validator/Debug_Validator.dsp b/ACEXML/parser/debug_validator/Debug_Validator.dsp deleted file mode 100644 index ee0f98624c6..00000000000 --- a/ACEXML/parser/debug_validator/Debug_Validator.dsp +++ /dev/null @@ -1,145 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Debug_Validator" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=Debug_Validator - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Debug_Validator.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Debug_Validator.mak" CFG="Debug_Validator - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Debug_Validator - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Debug_Validator - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Debug_Validator - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEBUG_VALIDATOR_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACEXML_DEBUG_DTD_MANAGER_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ace.lib ACEXML.lib /nologo /dll /machine:I386 /out:"../../../bin/ACEXML_Debug_DTD_Manager.dll" /libpath:"../../../ace" /libpath:"../../Common" - -!ELSEIF "$(CFG)" == "Debug_Validator - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEBUG_VALIDATOR_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACEXML_DEBUG_DTD_MANAGER_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib ACEXMLd.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/ACEXML_Debug_DTD_Managerd.dll" /pdbtype:sept /libpath:"../../../ace" /libpath:"../../Common" - -!ENDIF - -# Begin Target - -# Name "Debug_Validator - Win32 Release" -# Name "Debug_Validator - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Debug_Attributes_Builder.cpp -# End Source File -# Begin Source File - -SOURCE=.\Debug_DTD_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Debug_Element_Builder.cpp -# End Source File -# Begin Source File - -SOURCE=.\Element_Tree.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Debug_Attributes_Builder.h -# End Source File -# Begin Source File - -SOURCE=.\Debug_DTD_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Debug_DTD_Manager_Export.h -# End Source File -# Begin Source File - -SOURCE=.\Debug_Element_Builder.h -# End Source File -# Begin Source File - -SOURCE=.\Element_Tree.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Element_Tree.i -# End Source File -# End Target -# End Project diff --git a/ACEXML/parser/debug_validator/Element_Tree.cpp b/ACEXML/parser/debug_validator/Element_Tree.cpp deleted file mode 100644 index e9275061b52..00000000000 --- a/ACEXML/parser/debug_validator/Element_Tree.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// $Id$ - -#include "ACEXML/parser/debug_validator/Element_Tree.h" - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/parser/debug_validator/Element_Tree.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_Element_Tree_Node::~ACEXML_Element_Tree_Node () -{ - delete this->next_; -} - -ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_Node) - -void -ACEXML_Element_Tree_Name_Node::dump () -{ - cout << this->name_; -} - -ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_Name_Node) - -ACEXML_Element_Tree_List_Node::~ACEXML_Element_Tree_List_Node (void) -{ - delete this->head_; -} - -int -ACEXML_Element_Tree_List_Node::insert (ACEXML_Element_Tree_Node *node) -{ - if (this->head_ == 0) - { - this->tail_ = this->head_ = node; - } - else - { - this->tail_->next (node); - this->tail_ = node; - } - return 0; -} - -void -ACEXML_Element_Tree_List_Node::dump (void) -{ - ACEXML_Element_Tree_Node *ptr = this->head_; - const ACEXML_Char *separator = (this->type_ == SEQUENCE) ? ACE_TEXT(" , ") : ACE_TEXT(" | "); - - cout << "("; - - if (ptr != 0) - { - ptr->dump (); - ptr = ptr->next (); - - while (ptr != 0) - { - cout << separator; - ptr->dump (); - ptr->next (); - } - } - - cout << ")"; -} - -ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_List_Node) - - - -ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_List_Stack) diff --git a/ACEXML/parser/debug_validator/Element_Tree.h b/ACEXML/parser/debug_validator/Element_Tree.h deleted file mode 100644 index ae0c3d6dd93..00000000000 --- a/ACEXML/parser/debug_validator/Element_Tree.h +++ /dev/null @@ -1,160 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Element_Tree.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= -#ifndef _ACEXML_ELEMENT_TREE_H_ -#define _ACEXML_ELEMENT_TREE_H_ - -#include "ace/pre.h" -#include "ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" - -/** - * @class ACEXML_Element_Tree_Node Element_Tree.h "parser/debug_validator/Element_Tree.h" - * - * @brief An abstract base class for describing DTD child element definition. - * - * @sa ACEXML_Element_Tree_Name_Node, ACEXML_Element_Tree_List_Node - */ -class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Element_Tree_Node -{ -public: - - /// Default constructor. - ACEXML_Element_Tree_Node (); - - /// Destructor - virtual ~ACEXML_Element_Tree_Node (); - - /// Accessor for next element in chain - ACEXML_Element_Tree_Node *next (); - void next (ACEXML_Element_Tree_Node *n); - - /// Displaying the content. - virtual void dump () = 0; - - ACE_ALLOC_HOOK_DECLARE; - -protected: - ACEXML_Element_Tree_Node *next_; -}; - -/** - * @class ACEXML_Element_Tree_Name_Node Element_Tree.h "parser/debug_validator/Element_Tree.h" - * - * @brief An abstract base class for describing a name node in a DTD child - * element definition. - * - * @sa ACEXML_Element_Tree_Node, ACEXML_Element_Tree_List_Node - */ -class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Element_Tree_Name_Node - : public ACEXML_Element_Tree_Node -{ -public: - /// Constructor. - ACEXML_Element_Tree_Name_Node (const ACEXML_Char *name, - int release = 1); - - /// Change the name of this node. - void set (const ACEXML_Char *name, - int release = 1); - - virtual void dump (); - - ACE_ALLOC_HOOK_DECLARE; -protected: - ACEXML_String name_; -}; - -class ACEXML_Element_Tree_List_Stack; - -/** - * @class ACEXML_Element_Tree_List_Node Element_Tree.h "parser/debug_validator/Element_Tree.h" - * - * @brief An abstract base class for describing a node list in a DTD child - * element definition. - * - * @sa ACEXML_Element_Tree_Node, ACEXML_Element_Tree_Name_Node - */ -class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Element_Tree_List_Node - : public ACEXML_Element_Tree_Node -{ -public: - friend class ACEXML_Element_Tree_List_Stack; - - typedef enum { - SEQUENCE, - CHOICE - } LIST_TYPE; - - /// Default constructor. - ACEXML_Element_Tree_List_Node (void); - - /// Destructor. - virtual ~ACEXML_Element_Tree_List_Node (void); - - /// Insert a new ACEXML_Element_Tree_Node into the list. - int insert (ACEXML_Element_Tree_Node *node); - - /// Get/set the type of list. - LIST_TYPE get (void); - int set (LIST_TYPE type); - - virtual void dump (); - - ACE_ALLOC_HOOK_DECLARE; -protected: - LIST_TYPE type_; - - ACEXML_Element_Tree_Node *head_; - - ACEXML_Element_Tree_Node *tail_; - - ACEXML_Element_Tree_List_Node *pop_next_; -}; - -/** - * @class ACEXML_Element_Tree_List_Stack Element_Tree.h "parser/debug_validator/Element_Tree.h" - * - * @brief A class for managing a stack of ACEXML_Element_Tree_List_Node's. - * - * @sa ACEXML_Element_Tree_List_Node - */ -class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Element_Tree_List_Stack -{ -public: - ACEXML_Element_Tree_List_Stack (); - - void push (ACEXML_Element_Tree_List_Node *n); - - ACEXML_Element_Tree_List_Node *pop (void); - - ACEXML_Element_Tree_List_Node *top (void); - - int empty (void); - - ACE_ALLOC_HOOK_DECLARE; - -protected: - ACEXML_Element_Tree_List_Node *top_; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/parser/debug_validator/Element_Tree.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* _ACEXML_ELEMENT_TREE_H_ */ diff --git a/ACEXML/parser/debug_validator/Element_Tree.i b/ACEXML/parser/debug_validator/Element_Tree.i deleted file mode 100644 index 4b408835403..00000000000 --- a/ACEXML/parser/debug_validator/Element_Tree.i +++ /dev/null @@ -1,92 +0,0 @@ -// $Id$ - -ACEXML_INLINE -ACEXML_Element_Tree_Node::ACEXML_Element_Tree_Node () - : next_ (0) -{ -} - -ACEXML_INLINE ACEXML_Element_Tree_Node * -ACEXML_Element_Tree_Node::next () -{ - return this->next_; -} - -ACEXML_INLINE void -ACEXML_Element_Tree_Node::next (ACEXML_Element_Tree_Node * n) -{ - this->next_ = n; -} - -ACEXML_INLINE -ACEXML_Element_Tree_Name_Node::ACEXML_Element_Tree_Name_Node (const ACEXML_Char *name, - int release) - : name_ (name, 0, release) -{ -} - -ACEXML_INLINE void -ACEXML_Element_Tree_Name_Node::set (const ACEXML_Char *name, - int release) -{ - this->name_.set (name, release); -} - -ACEXML_INLINE -ACEXML_Element_Tree_List_Node::ACEXML_Element_Tree_List_Node (void) - : type_ (SEQUENCE), - head_ (0), - tail_ (0), - pop_next_ (0) -{ -} - -ACEXML_INLINE ACEXML_Element_Tree_List_Node::LIST_TYPE -ACEXML_Element_Tree_List_Node::get (void) -{ - return this->type_; -} - -ACEXML_INLINE int -ACEXML_Element_Tree_List_Node::set (ACEXML_Element_Tree_List_Node::LIST_TYPE type) -{ - this->type_ = type; - return 0; -} - -ACEXML_INLINE -ACEXML_Element_Tree_List_Stack::ACEXML_Element_Tree_List_Stack (void) - : top_ (0) -{ -} - -ACEXML_INLINE ACEXML_Element_Tree_List_Node * -ACEXML_Element_Tree_List_Stack::top () -{ - return this->top_; -} - -ACEXML_INLINE void -ACEXML_Element_Tree_List_Stack::push (ACEXML_Element_Tree_List_Node *n) -{ - n->pop_next_ = this->top_; - this->top_ = n; -} - -ACEXML_INLINE ACEXML_Element_Tree_List_Node * -ACEXML_Element_Tree_List_Stack::pop () -{ - if (this->top_ != 0) - { - ACEXML_Element_Tree_List_Node *ptr = this->top_; - this->top_ = this->top_->pop_next_; - return ptr; - } - return 0; -} - -ACEXML_INLINE int -ACEXML_Element_Tree_List_Stack::empty () -{ - return this->top_ == 0; -} diff --git a/ACEXML/parser/debug_validator/Makefile.bor b/ACEXML/parser/debug_validator/Makefile.bor deleted file mode 100644 index 08ee7c36e43..00000000000 --- a/ACEXML/parser/debug_validator/Makefile.bor +++ /dev/null @@ -1,22 +0,0 @@ -# Makefile for building the debug_validator - -NAME = ACEXML_Debug_DTD_Manager - -OBJFILES = \ - $(OBJDIR)\Debug_Attributes_Builder.obj \ - $(OBJDIR)\Debug_DTD_Manager.obj \ - $(OBJDIR)\Debug_Element_Builder.obj \ - $(OBJDIR)\Element_Tree.obj - -CFLAGS = \ - $(ACE_CFLAGS) \ - $(ACE_XML_CFLAGS) \ - -DACEXML_DEBUG_DTD_MANAGER_BUILD_DLL - -CPPDIR = .;.. - -LIBFILES = \ - $(ACE_LIB) \ - $(ACE_XML_LIB) - -!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> diff --git a/ACEXML/parser/parser/Entity_Manager.cpp b/ACEXML/parser/parser/Entity_Manager.cpp deleted file mode 100644 index d0c86862805..00000000000 --- a/ACEXML/parser/parser/Entity_Manager.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "ACEXML/parser/parser/Entity_Manager.h" - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/parser/parser/Entity_Manager.i" -#endif /* __ACEXML_INLINE__ */ - -static const ACEXML_Char amp_name[] = {'a', 'm', 'p', 0 }; -static const ACEXML_Char amp_value[] = {'&', 0}; -static const ACEXML_Char lt_name[] = {'l', 't', 0}; -static const ACEXML_Char lt_value[] = {'<', 0}; -static const ACEXML_Char gt_name[] = {'g', 't', 0}; -static const ACEXML_Char gt_value[] = {'>', 0}; -static const ACEXML_Char apos_name[] = {'a', 'p', 'o', 's', 0}; -static const ACEXML_Char apos_value[] = {'\'', 0}; -static const ACEXML_Char quot_name[] = {'q', 'u', 'o', 't', 0}; -static const ACEXML_Char quot_value[] = {'"', 0}; - -ACEXML_Entity_Manager::ACEXML_Entity_Manager (void) - : entities_ () -{ - // @@ No way to know if these bindings succeed or not. - - ACEXML_String ampname (amp_name, 0, 0); - ACEXML_String ampvalue (amp_value, 0, 0); - this->entities_.bind (ampname, ampvalue); - - ACEXML_String ltname (lt_name, 0, 0); - ACEXML_String ltvalue (lt_value, 0, 0); - this->entities_.bind (ltname, ltvalue); - - ACEXML_String gtname (gt_name, 0, 0); - ACEXML_String gtvalue (gt_value, 0, 0); - this->entities_.bind (gtname, gtvalue); - - ACEXML_String aposname (apos_name, 0, 0); - ACEXML_String aposvalue (apos_value, 0, 0); - this->entities_.bind (aposname, aposvalue); - - ACEXML_String quotname (quot_name, 0, 0); - ACEXML_String quotvalue (quot_value, 0, 0); - this->entities_.bind (quotname, quotvalue); -} - -ACEXML_Entity_Manager::~ACEXML_Entity_Manager (void) -{ -} diff --git a/ACEXML/parser/parser/Entity_Manager.h b/ACEXML/parser/parser/Entity_Manager.h deleted file mode 100644 index 9bcfcc443a3..00000000000 --- a/ACEXML/parser/parser/Entity_Manager.h +++ /dev/null @@ -1,81 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Entity_Manager.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef ACEXML_ENTITY_MANAGER_H -#define ACEXML_ENTITY_MANAGER_H - -#include "ace/pre.h" -#include "ACEXML/parser/parser/Parser_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XML_Types.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" - -typedef ACE_Hash_Map_Entry ACEXML_ENTITY_ENTRY; - -typedef ACE_Hash_Map_Manager_Ex, - ACE_Equal_To, - ACE_Null_Mutex> ACEXML_ENTITIES_MANAGER; - -typedef ACE_Hash_Map_Iterator_Ex, - ACE_Equal_To, - ACE_Null_Mutex> ACEXML_ENTITIES_MANAGER_ITER; - -typedef ACE_Hash_Map_Reverse_Iterator_Ex, - ACE_Equal_To, - ACE_Null_Mutex> ACEXML_ENTITIES_MANAGER_REVERSE_ITER; - -/** - * @class ACEXML_Entity_Manager Entity_Manager.h "ACEXML/parser/parser/Entity_Manager.h" - * - * @brief Class to manage and resolve entity references. - * - * @todo Fill in details for this class. - */ -class ACEXML_PARSER_Export ACEXML_Entity_Manager -{ -public: - /// Default constructor. - ACEXML_Entity_Manager (void); - - /// Destructor. - ~ACEXML_Entity_Manager (void); - - /// Add a new entity declaration. - int add_entity (const ACEXML_Char *ref, - const ACEXML_Char *value); - - /// Resolve an entity reference. - const ACEXML_String *resolve_entity (const ACEXML_Char *ref); - -private: - ACEXML_ENTITIES_MANAGER entities_; -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/parser/parser/Entity_Manager.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACEXML_ENTITY_MANAGER_H */ diff --git a/ACEXML/parser/parser/Entity_Manager.i b/ACEXML/parser/parser/Entity_Manager.i deleted file mode 100644 index 696b82b64e4..00000000000 --- a/ACEXML/parser/parser/Entity_Manager.i +++ /dev/null @@ -1,21 +0,0 @@ -// $Id$ - -ACEXML_INLINE int -ACEXML_Entity_Manager::add_entity (const ACEXML_Char *ref, - const ACEXML_Char *v) -{ - ACEXML_String name (ref, 0, 0); - ACEXML_String value (v, 0, 0); - return this->entities_.bind (name, value); -} - -ACEXML_INLINE const ACEXML_String * -ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char *ref) -{ - ACEXML_ENTITY_ENTRY *entry; - - if (this->entities_.find (ACEXML_String (ref, 0, 0), - entry) == 0) - return &entry->int_id_; - return 0; -} diff --git a/ACEXML/parser/parser/Makefile b/ACEXML/parser/parser/Makefile deleted file mode 100644 index 61de3fb95c0..00000000000 --- a/ACEXML/parser/parser/Makefile +++ /dev/null @@ -1,328 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the server-side ACE network services -#---------------------------------------------------------------------------- - -LIB = libACEXML_Parser.a -SHLIB = libACEXML_Parser.$(SOEXT) - -FILES = Entity_Manager \ - Parser - -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -LIBS += -lACEXML $(ACELIB) - -BUILD = $(VLIB) $(VSHLIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Entity_Manager.o .obj/Entity_Manager.so .shobj/Entity_Manager.o .shobj/Entity_Manager.so: Entity_Manager.cpp \ - Entity_Manager.h \ - $(ACE_ROOT)/ace/pre.h \ - Parser_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Entity_Manager.i - -.obj/Parser.o .obj/Parser.so .shobj/Parser.o .shobj/Parser.so: Parser.cpp \ - Parser.h \ - $(ACE_ROOT)/ace/pre.h \ - Parser_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XMLReader.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \ - $(ACE_ROOT)/ace/Obstack.h \ - $(ACE_ROOT)/ace/Obstack_T.h \ - $(ACE_ROOT)/ace/Obchunk.h \ - $(ACE_ROOT)/ace/Obchunk.i \ - $(ACE_ROOT)/ace/Obstack_T.i \ - $(ACE_ROOT)/ace/Obstack_T.cpp \ - Entity_Manager.h \ - Entity_Manager.i \ - Parser.i \ - $(ACE_ROOT)/ACEXML/common/Transcode.h \ - $(ACE_ROOT)/ACEXML/common/Transcode.i \ - $(ACE_ROOT)/ACEXML/common/AttributesImpl.h \ - $(ACE_ROOT)/ACEXML/common/AttributesImpl.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/parser/parser/Makefile.bor b/ACEXML/parser/parser/Makefile.bor deleted file mode 100644 index 04603884700..00000000000 --- a/ACEXML/parser/parser/Makefile.bor +++ /dev/null @@ -1,20 +0,0 @@ -# Makefile for building the parser - -NAME = ACEXML_Parser - -OBJFILES = \ - $(OBJDIR)\Parser.obj \ - $(OBJDIR)\Entity_Manager.obj - -CFLAGS = \ - $(ACE_CFLAGS) \ - $(ACE_XML_CFLAGS) \ - -DACEXML_PARSER_BUILD_DLL - -CPPDIR = .;.. - -LIBFILES = \ - $(ACE_LIB) \ - $(ACE_XML_LIB) - -!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp deleted file mode 100644 index 3c94ce538a9..00000000000 --- a/ACEXML/parser/parser/Parser.cpp +++ /dev/null @@ -1,1960 +0,0 @@ -// $Id$ - -#include "ACEXML/parser/parser/Parser.h" -#include "ACEXML/common/Transcode.h" -#include "ACEXML/common/AttributesImpl.h" -#include "ace/ACE.h" - -static const ACEXML_Char default_attribute_type[] = {'C', 'D', 'A', 'T', 'A', 0}; -static const ACEXML_Char empty_string[] = { 0 }; - -const ACEXML_Char -ACEXML_Parser::simple_parsing_feature_[] = { 'S', 'i', 'm', 'p', 'l', 'e', 0 }; - -const ACEXML_Char -ACEXML_Parser::namespaces_feature_[] = {'h', 't', 't', 'p', ':', '/', '/', 'x', 'm', 'l', '.', 'o', 'r', 'g', '/', 's', 'a', 'x', '/', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '/', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', 's', 0 }; - -const ACEXML_Char -ACEXML_Parser::namespace_prefixes_feature_[] = {'h', 't', 't', 'p', ':', '/', '/', 'x', 'm', 'l', '.', 'o', 'r', 'g', '/', 's', 'a', 'x', '/', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '/', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '-', 'p', 'r', 'e', 'f', 'i', 'x', 'e', 's', 0 }; - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/parser/parser/Parser.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_Parser::ACEXML_Parser (void) - : dtd_handler_ (0), - entity_resolver_ (0), - content_handler_ (0), - error_handler_ (0), - instream_ (0), - doctype_ (0), - dtd_system_ (0), - dtd_public_ (0), - locator_(), - simple_parsing_ (0), - namespaces_(1), - namespace_prefixes_ (0) -{ -} - -ACEXML_Parser::~ACEXML_Parser (void) -{ -} - -int -ACEXML_Parser::getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - if (ACE_OS::strcmp (name, - ACEXML_Parser::simple_parsing_feature_) == 0) - { - return this->simple_parsing_; - } - else if (ACE_OS::strcmp (name, - ACEXML_Parser::namespaces_feature_) == 0) - { - return this->namespaces_; - } - else if (ACE_OS::strcmp (name, - ACEXML_Parser::namespace_prefixes_feature_) == 0) - { - return this->namespace_prefixes_; - } - - ACEXML_THROW_RETURN (ACEXML_SAXNotRecognizedException (name), -1); -} - - - -void -ACEXML_Parser::setFeature (const ACEXML_Char *name, - int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - if (ACE_OS::strcmp (name, - ACEXML_Parser::simple_parsing_feature_) == 0) - { - this->simple_parsing_ = (boolean_value == 0 ? 0 : 1); - return; - } - else if (ACE_OS::strcmp (name, - ACEXML_Parser::namespaces_feature_) == 0) - { - this->namespaces_ = (boolean_value == 0 ? 0 : 1); - return; - } - else if (ACE_OS::strcmp (name, - ACEXML_Parser::namespace_prefixes_feature_) == 0) - { - this->namespace_prefixes_ = (boolean_value == 0 ? 0 : 1); - return; - } - - ACEXML_THROW (ACEXML_SAXNotRecognizedException (name)); -} - -void * -ACEXML_Parser::getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - ACEXML_THROW_RETURN (ACEXML_SAXNotSupportedException (name), 0); -} - -void -ACEXML_Parser::setProperty (const ACEXML_Char *name, - void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - ACE_UNUSED_ARG (value); - - ACEXML_THROW (ACEXML_SAXNotSupportedException (name)); -} - -void -ACEXML_Parser::report_error (const ACEXML_Char* message ACEXML_ENV_ARG_DECL) -{ - ACEXML_SAXParseException* exception = 0; - ACE_NEW_NORETURN (exception, - ACEXML_SAXParseException (message)); - if (this->error_handler_) - this->error_handler_->error (*exception ACEXML_ENV_ARG_PARAMETER); - else - ACEXML_ENV_RAISE (exception); - return; -} - -void -ACEXML_Parser::report_warning (const ACEXML_Char* message ACEXML_ENV_ARG_DECL) -{ - ACEXML_SAXParseException* exception = 0; - ACE_NEW_NORETURN (exception, - ACEXML_SAXParseException (message)); - if (this->error_handler_) - this->error_handler_->warning (*exception ACEXML_ENV_ARG_PARAMETER); - return; -} - -void -ACEXML_Parser::report_fatal_error (const ACEXML_Char* message ACEXML_ENV_ARG_DECL) -{ - ACEXML_SAXParseException* exception = 0; - ACE_NEW_NORETURN (exception, - ACEXML_SAXParseException (message)); - if (this->error_handler_) - this->error_handler_->fatalError (*exception ACEXML_ENV_ARG_PARAMETER); - ACEXML_ENV_RAISE (exception); - return; -} - -void -ACEXML_Parser::parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (input == 0 || (this->instream_ = input->getCharStream ()) == 0) - { - this->report_fatal_error(ACE_TEXT ("Invalid input source") ACEXML_ENV_ARG_PARAMETER); - return; - } - - // Set up Locator. At this point, the systemId and publicId are null. We - // can't do better, as we don't know anything about the InputSource - // currently, and according to the SAX spec, the parser should set up the - // locator before reporting any document events. - if (this->content_handler_) - this->content_handler_->setDocumentLocator (&this->locator_); - - if (this->simple_parsing_ == 0) - { - this->parse_xml_prolog (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - } - - this->content_handler_->startDocument (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - - int doctype_defined = 0; - - for (int prolog_done = 0; prolog_done == 0; ) - { - if (this->skip_whitespace (0) != '<') - { - this->report_fatal_error (ACE_TEXT ("Expecting '<'") ACEXML_ENV_ARG_PARAMETER); - return; - } - ACEXML_Char fwd = this->peek (); - switch (fwd) - { - case '!': - this->get (); // consume the '!' - fwd = this->peek (); - if (fwd == 'D' && !doctype_defined) // DOCTYPE - { - // This will also take care of the trailing MISC block if any. - this->parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - doctype_defined = 1; - break; - } - else if (fwd == '-') // COMMENT - { - if (this->grok_comment () < 0) - { - this->report_fatal_error(ACE_TEXT ("Invalid comment") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - else - { - this->report_fatal_error (ACE_TEXT ("Duplicate DOCTYPE definitions") ACEXML_ENV_ARG_PARAMETER); - return; - } - break; - case '?': - this->parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - break; - case 0: - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return; - default: // Root element begins - prolog_done = 1; - break; - } - } - - // Now parse root element. - this->parse_element (1 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - - this->content_handler_->endDocument (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - - // Reset the Locator held within the parser - this->locator_.reset(); -} - -void -ACEXML_Parser::parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // @@ Not implemented. - ACE_UNUSED_ARG (systemId); - - ACEXML_THROW (ACEXML_SAXNotSupportedException ()); -} - - -void -ACEXML_Parser::parse_xml_prolog (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->parse_token (ACE_TEXT("report_fatal_error(ACE_TEXT ("Invalid XMLDecl ('skip_whitespace (0) != 'v' // Discard whitespace - || (this->parse_token (ACE_TEXT("ersion")) < 0) - || this->skip_equal () != 0 - || this->get_quoted_string (astring) != 0) - { - this->report_fatal_error (ACE_TEXT ("Unrecognized XMLDecl ('version'?)") ACEXML_ENV_ARG_PARAMETER); - return; - } - // @@ Handle version number here. - int xmldecl_state = 0; - int seen_encoding = 0; - - while (1) - { - ACEXML_Char fwd = this->peek (); - if (fwd != '?') - { - fwd = this->skip_whitespace (0); // Discard whitespace - if (fwd == '?') - { - // Fall down to consume the '?' and wrap up the XML Decl parsing. - } - else if (xmldecl_state == 0 && fwd == 'e') - { - if ((this->parse_token (ACE_TEXT("ncoding")) == 0) && - this->skip_equal () == 0 && - this->get_quoted_string (astring) == 0) - { - if (seen_encoding) - { - this->report_fatal_error (ACE_TEXT ("Duplicate encoding defined") ACEXML_ENV_ARG_PARAMETER); - return; - } - else - { - seen_encoding = 1; - if (ACE_OS::strcmp (astring, - this->instream_->getEncoding()) != 0) - { - if (ACE_OS::strstr (astring, - this->instream_->getEncoding()) != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Detected Encoding is %s : Declared Encoding is %s"), - this->instream_->getEncoding(), astring)); - this->report_fatal_error (ACE_TEXT ("Encoding declaration doesn't match detected encoding") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - } - continue; - } - else - break; - } - else if (xmldecl_state < 2 && fwd == 's') - { - if ((this->parse_token (ACE_TEXT("tandalone")) == 0) && - this->skip_equal () == 0 && - this->get_quoted_string (astring) == 0) - { - xmldecl_state = 2; - if (ACE_OS::strcmp (astring, ACE_TEXT ("yes")) == 0) - { - // @@ This is a standalone XML file. - continue; - } - else if (ACE_OS::strcmp (astring, ACE_TEXT ("no")) == 0) - { - // @@ This is not a stand alone XML file. - continue; - } - } - break; - } - else - break; - } - if (this->parse_token (ACE_TEXT ("?>")) < 0) - break; - return; - } // End parsing XML Decl. - this->report_fatal_error (ACE_TEXT ("Unrecognized XML Decl ('standalone'?)") ACEXML_ENV_ARG_PARAMETER); - return; -} - -int -ACEXML_Parser::grok_comment (void) -{ - /// Simply filter out all the comment - int state = 0; - - if (this->get () != '-' || // Skip the opening "'. Notice that - // according to the spec, '--->' is not a valid closing comment - // sequence. But we'll let it pass anyway. - { - ACEXML_Char fwd = this->get (); - if ((fwd == '-' && state < 2) || - (fwd == '>' && state == 2)) - state += 1; - else - state = 0; // Reset parse state. - } - return 0; -} - -int -ACEXML_Parser::parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_DECL) -{ - if (this->get () != '?') - { // How did we get here? - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - const ACEXML_Char *pitarget = this->read_name (); - ACEXML_Char *instruction = 0; - - if (ACE_OS::strcasecmp (ACE_TEXT ("xml"), pitarget) != 0) - { - // Invalid PITarget name. - this->report_fatal_error(ACE_TEXT ("PITarget name cannot start with 'xml'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - int state = 0; - ACEXML_Char ch = this->skip_whitespace (0); - - while (state < 2) - { - switch (ch) - { - case '?': - if (state == 0) - state = 1; - break; - case '>': - if (state == 1) - { - instruction = this->obstack_.freeze (); - this->content_handler_->processingInstruction (pitarget, - instruction ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - this->obstack_.unwind (ACE_const_cast (ACEXML_Char*, pitarget)); - return 0; - } - break; - case 0x0D: // End-of-Line handling - ch = (this->peek () == 0x0A ? this->get () : 0x0A); - // Fall thru... - case 0x0A: - // Fall thru... - default: - if (state == 1) - this->obstack_.grow ('?'); - this->obstack_.grow (ch); - state = 0; - } - ch = this->get (); - } - return -1; -} - -int -ACEXML_Parser::parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (this->parse_token (ACE_TEXT ("DOCTYPE")) < 0) - { - this->report_fatal_error(ACE_TEXT ("Expecting keyword 'DOCTYPE'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char nextch = this->skip_whitespace (0); - if (nextch == 0) - { - this->report_fatal_error(ACE_TEXT ("Expecting a DOCTYPE name") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - this->doctype_ = this->read_name (nextch); - - this->skip_whitespace_count (&nextch); - - if (nextch == 'S' || nextch == 'P') // ExternalID defined - { - this->parse_external_id_and_ref (this->dtd_public_, - this->dtd_system_ - ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); -// if (this->dtd_public_ == 0) -// ACE_DEBUG ((LM_DEBUG, -// ACE_TEXT ("ACEXML Parser got external DTD id: SYSTEM %s\n"), -// this->dtd_system_)); -// else -// ACE_DEBUG ((LM_DEBUG, -// ACE_TEXT ("ACEXML Parser got DTD external id: PUBLIC %s %s\n"), -// this->dtd_public_, this->dtd_system_)); - } - - nextch = this->skip_whitespace (0); - switch (nextch) - { - case '[': // Internal DTD definition - if (this->parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; // Error in markupdecl - break; - case '>': // End of DTD definition - // this is an XML document without a dectypedecl. - return 0; - case '0': - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return -1; - default: - break; - } - - if (this->skip_whitespace (0) != '>') - { - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - return 0; -} - -void -ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // Parse STag. - const ACEXML_Char *startname = this->read_name (); - if (startname == 0) - { - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return; - } - if (is_root && this->doctype_ != 0 - && ACE_OS::strcmp (startname, this->doctype_) != 0) - { - this->report_fatal_error (ACE_TEXT ("Root element missing") ACEXML_ENV_ARG_PARAMETER); - return; - } - ACEXML_AttributesImpl attributes; - ACEXML_Char ch; - int new_namespace = 0; - const ACEXML_Char *endname = 0; - const ACEXML_Char *ns_uri, *ns_lname; // namespace URI and localName - ACEXML_Char* prefix = 0; - ACEXML_Char* name = 0; - for (int start_element_done = 0; start_element_done == 0;) - { - ch = this->skip_whitespace (0); - - switch (ch) - { - case 0: - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return; - case '/': - if (this->get () != '>') - { - this->report_fatal_error(ACE_TEXT ("Expecting '>'") ACEXML_ENV_ARG_PARAMETER); - return; - } - else - { - this->xml_namespace_.processName(startname, ns_uri, ns_lname, 0); - prefix = ACE_const_cast (ACEXML_Char*, - this->xml_namespace_.getPrefix(ns_uri)); - this->report_prefix_mapping (prefix, ns_uri, ns_lname, 1 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->content_handler_->startElement (ns_uri, ns_lname, - startname, &attributes ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->content_handler_->endElement (ns_uri, ns_lname, startname ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->report_prefix_mapping (prefix, ns_uri, ns_lname, 0 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - } - if (new_namespace != 0) - this->xml_namespace_.popContext (); - return; - - case '>': - { - this->xml_namespace_.processName (startname, ns_uri, ns_lname, 0); - prefix = ACE_const_cast (ACEXML_Char*, - this->xml_namespace_.getPrefix (ns_uri)); - this->report_prefix_mapping (prefix, ns_uri, ns_lname, 1 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->content_handler_->startElement (ns_uri, ns_lname, startname, - &attributes ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - start_element_done = 1; - break; - } - default: - ACEXML_Char *attvalue = 0; - ACEXML_Char *attname = this->read_name (ch); - - if (attname == 0 || - this->skip_equal () != 0 || - this->get_quoted_string (attvalue) != 0) - { - this->report_fatal_error(ACE_TEXT ("Error reading attribute") ACEXML_ENV_ARG_PARAMETER); - return; - } - - // Handling new namespace if any. Notice that the order of - // namespace declaration does matter. - if (ACE_OS::strncmp (attname, ACE_TEXT("xmlns"), 5) == 0) - { - if (this->namespaces_) - { - if (new_namespace == 0) - { - this->xml_namespace_.pushContext (); - new_namespace = 1; - } - name = ACE_OS::strchr (attname, ':'); - const ACEXML_Char* ns_name = (name == 0)?empty_string:name+1; - if (this->xml_namespace_.declarePrefix (ns_name, - attvalue) == -1) - { - this->report_fatal_error(ACE_TEXT ("Duplicate namespace prefix") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - if (this->namespace_prefixes_) - { - // Namespace_prefixes_feature_ is required. So add the - // xmlns:foo to the list of attributes. - if (attributes.addAttribute (0, 0, attname, - default_attribute_type, - attvalue) == -1) - { - this->report_fatal_error(ACE_TEXT ("Duplicate attribute found") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - if (!this->namespaces_ && !this->namespace_prefixes_) - { - this->report_fatal_error(ACE_TEXT ("Both namespaces feature and namespace_prefixes feature are false. Illegal Mode") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - else - { - const ACEXML_Char *uri, *lName; - this->xml_namespace_.processName (attname, uri, lName, 1); - if (attributes.addAttribute (uri, lName, attname, - default_attribute_type, - attvalue) == -1) - { - this->report_fatal_error(ACE_TEXT ("Duplicate attribute found") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - break; - } - } - ACEXML_Char *cdata; - size_t cdata_length = 0; - - // Parse element contents. - while (1) - { - ACEXML_Char ch = this->get (); - - switch (ch) - { - case 0: - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return; - case '<': - // Push out old 'characters' event. - if (cdata_length != 0) - { - cdata = this->obstack_.freeze (); - this->content_handler_->characters (cdata, 0, cdata_length ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->obstack_.unwind (cdata); - cdata_length = 0; - } - - switch (this->peek ()) - { - case '!': // a comment or a CDATA section. - this->get (); // consume '!' - ch = this->peek (); - if (ch == '-') // a comment - { - if (this->grok_comment () < 0) - { - this->report_fatal_error(ACE_TEXT ("Error parsing comment") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - else if (ch == '[') // a CDATA section. - { - this->parse_cdata (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - } - else - { - this->report_fatal_error(ACE_TEXT ("Unexpected character") ACEXML_ENV_ARG_PARAMETER); - return; - } - break; - case '?': // a PI. - this->parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - break; - case '/': // an ETag. - { - this->get (); // consume '/' - endname = this->read_name (); - if (endname == 0 || - ACE_OS::strcmp (startname, endname) != 0) - { - this->report_fatal_error(ACE_TEXT ("Mismatched End-tag encountered") ACEXML_ENV_ARG_PARAMETER); - return ; - } - if (this->skip_whitespace (0) != '>') - { - this->report_fatal_error(ACE_TEXT ("Expecting '>' in an end-tag") ACEXML_ENV_ARG_PARAMETER); - return; - } - this->content_handler_->endElement (ns_uri, ns_lname, endname ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - prefix = ACE_const_cast (ACEXML_Char*, - this->xml_namespace_.getPrefix(ns_uri)); - this->report_prefix_mapping (prefix, ns_uri, ns_lname, 0 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - if (new_namespace != 0) - this->xml_namespace_.popContext (); - return; - } - default: // a new nested element? - this->parse_element (0 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - break; - } - break; - case '&': - { - const ACEXML_String *replace = 0; - ACEXML_String charval; - ACEXML_Char buffer[6]; - - if (this->peek () == '#') - { - if (this->parse_char_reference (buffer, 6) != 0) - { - // not referring to any character exception? - return; - } - charval.set (buffer, 0); - replace = &charval; - } - else - replace = this->parse_reference (); - - if (replace == 0) - { - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return; - } -// if (this->try_grow_cdata (replace->length (), -// cdata_length, xmlenv) == 0) -// { - cdata_length += replace->length (); - for (size_t i = 0; i < replace->length (); ++i) - this->obstack_.grow ((*replace)[i]); -// } -// else -// return; - } - break; - case 0x0D: // End-of-Line handling - ch = (this->peek () == 0x0A ? this->get () : 0x0A); - // Fall thru... - case 0x0A: - // Fall thru... - default: - ++cdata_length; - cdata = this->obstack_.grow (ch); - if (cdata == 0) - { - cdata = this->obstack_.freeze (); - this->content_handler_->characters (cdata, - 0, - cdata_length ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->obstack_.grow (ch); - cdata_length = 1; // the missing char. - } - } - } - ACE_NOTREACHED (return;) -} - -int -ACEXML_Parser::parse_char_reference (ACEXML_Char *buf, size_t len) -{ - if (this->get () != '#') - { - // Internal error. - return -1; - } - - int hex = 0; - - if (this->peek () == 'x') - { - hex = 1; - this->get (); - } - - int more_digit = 0; - ACEXML_UCS4 sum = 0; - - while (1) - { - ACEXML_Char ch = this->get (); - switch (ch) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - sum = sum * (hex ? 16 : 10) + (ch - '0'); - break; - case 'a': - case 'A': - if (!hex) - return -1; - sum = sum * 16 + 10; - break; - case 'b': - case 'B': - if (!hex) - return -1; - sum = sum * 16 + 11; - break; - case 'c': - case 'C': - if (!hex) - return -1; - sum = sum * 16 + 12; - break; - case 'd': - case 'D': - if (!hex) - return -1; - sum = sum * 16 + 13; - break; - case 'e': - case 'E': - if (!hex) - return -1; - sum = sum * 16 + 14; - break; - case 'f': - case 'F': - if (!hex) - return -1; - sum = sum * 16 + 15; - break; - case ';': - if (more_digit == 0) // no digit exist??? - return -1; - int clen; -#if defined (ACE_USES_WCHAR) // UTF-16 - if ((clen = ACEXML_Transcoder::ucs42utf16 (sum, buf, len)) < 0) - return -1; - -#elif 1 // or UTF-8 - if ((clen = ACEXML_Transcoder::ucs42utf8 (sum, buf, len)) < 0) - return -1; - // #elif 0 // UCS 4, not likely - // buf [0] = sum; - // buf [1] = 0; -#endif - buf [clen] = 0; - return 0; - default: - return -1; - } - more_digit = 1; - } - ACE_NOTREACHED (return -1); -} - -const ACEXML_String * -ACEXML_Parser::parse_reference (void) -{ - // @@ We'll use a temporary buffer here as the Obstack is most likely in - // use when we are here. This puts a limit on the max length of a - // reference. - ACEXML_Char ref[MAXPATHLEN]; - - size_t loc = 0; - - while (loc < MAXPATHLEN -1) - { - ACEXML_Char ch = this->get (); - if (ch == ';') - { - ref[loc] = 0; - break; - } - else - ref[loc++] = ch; - } - - return this->entities_.resolve_entity (ref); -} - -int -ACEXML_Parser::parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL) -{ - if (this->parse_token (ACE_TEXT ("[CDATA[")) < 0) - { - this->report_fatal_error(ACE_TEXT ("'[CDATA[' expected") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - int parse_state = 0; - size_t datalen = 0; - - while (1) - { - ACEXML_Char ch; - ACEXML_Char *cdata; - - ch = this->get (); - // Anything goes except the sequence "]]>". - switch (parse_state) - { - case 2: - if (ch == ']') - { - parse_state = 3; - continue; - } - break; - case 3: - if (ch == '>') // Yay! - { - cdata = this->obstack_.freeze (); - this->content_handler_->characters (cdata, - 0, - datalen ACEXML_ENV_ARG_PARAMETER); - // ACEXML_CHECK_RETURN (-1); - this->obstack_.unwind(cdata); - return 0; - } - break; - default: - if (ch == ']') - { - parse_state = 2; - continue; - } - else - parse_state = 1; - } - while (parse_state > 0) - { - if (this->try_grow_cdata (1, datalen ACEXML_ENV_ARG_PARAMETER) < 0) - return -1; - - if (parse_state != 1) - this->obstack_.grow (']'); - else - { - if (ch == 0x0D) - ch = (this->peek () == 0x0A ? this->get () : 0x0A); - this->obstack_.grow (ch); - } - ++datalen; - --parse_state; - } - }; - ACE_NOTREACHED (return -1); -} - -int -ACEXML_Parser::try_grow_cdata (size_t size, size_t &len ACEXML_ENV_ARG_DECL) -{ - if (this->obstack_.request (size) != 0) - { - if (len != 0) - { - ACEXML_Char *cdata = this->obstack_.freeze (); - if (cdata == 0) - { - this->report_fatal_error(ACE_TEXT ("Internal Error growing CDATA buffer") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->content_handler_->characters (cdata, - 0, - len ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - len = 0; // reset counter - if (this->obstack_.request (size) == 0) - return 0; - } - this->report_fatal_error(ACE_TEXT ("Internal Error, buffer overflowed") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - return 0; -} - - -int -ACEXML_Parser::parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL) -{ - ACEXML_Char nextch = this->skip_whitespace (0); - - do { - switch (nextch) - { - case '<': // Start of markup Decl. - nextch = this->peek (); - switch (nextch) - { - case '!': - this->get (); // Discard '!' - nextch = this->peek (); - switch (nextch) - { - case 'E': // An ELEMENT or ENTITY decl - this->get (); - nextch = this->peek (); - switch (nextch) - { - case 'L': - if (this->parse_element_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; - break; - - case 'N': - if (this->parse_entity_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; - break; - - default: - this->report_fatal_error(ACE_TEXT ("Invalid keyword in decl spec") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - - case 'A': // An ATTLIST decl - if (this->parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; - break; - - case 'N': // A NOTATION decl - if (this->parse_notation_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; - break; - - case '-': // a comment. - if (this->grok_comment () < 0) - { - this->report_fatal_error(ACE_TEXT ("Error parsing comment") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - case 0: - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return -1; - default: - this->report_fatal_error (ACE_TEXT ("Invalid char. follows 'parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - break; - - case 0: - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return -1; - default: - this->report_fatal_error (ACE_TEXT ("Invalid char. follows 'report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return -1; - - default: - this->report_fatal_error (ACE_TEXT ("Expecting markupdecl or DecSep") ACEXML_ENV_ARG_PARAMETER); - return -1; - }; - - // To fully conform with the spec., whitespaces are only allowed - // following a 'DeclSep' section. However, I found it - // hard/impossible to eliminate all the whitespaces between - // markupdecls. - - nextch = this->skip_whitespace (0); - - } while (1); - - ACE_NOTREACHED (return -1); -} - -int -ACEXML_Parser::parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL) -{ - if ((this->parse_token (ACE_TEXT ("LEMENT")) < 0) || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error (ACE_TEXT ("Expecting keyword `ELEMENT'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char *element_name = this->read_name (); - if (element_name == 0) - { - this->report_fatal_error (ACE_TEXT ("Error reading element name while defining ELEMENT.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char nextch ; - this->skip_whitespace_count (&nextch); - - switch (nextch) - { - case 'E': // EMPTY - if (this->parse_token (ACE_TEXT ("EMPTY")) < 0) - { - this->report_fatal_error (ACE_TEXT ("Expecting keyword `EMPTY' in ELEMENT definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - case 'A': // ANY - if (this->parse_token (ACE_TEXT ("ANY")) < 0) - { - this->report_fatal_error (ACE_TEXT ("Expecting keyword `ANY' in ELEMENT definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - case '(': // children - this->parse_children_definition (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - break; - default: // error - this->report_fatal_error (ACE_TEXT ("Error reading ELEMENT definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - if (this->skip_whitespace (0) != '>') - { - this->report_fatal_error (ACE_TEXT ("Expecting '>' in ELEMENT definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - return 0; -} - -int -ACEXML_Parser::parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL) -{ - ACEXML_Char nextch; - - if ((this->parse_token (ACE_TEXT ("NTITY")) < 0) || - this->skip_whitespace_count (&nextch) == 0) - { - this->report_fatal_error (ACE_TEXT ("Expecting keyword `ENTITY'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - int is_GEDecl = 1; - if (nextch == '%') // This is a PEDecl. - { - is_GEDecl = 0; - this->get (); // consume the '%' - if (this->skip_whitespace_count (&nextch) == 0) - { - this->report_fatal_error (ACE_TEXT ("Can't use a reference when defining entity name") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - } - - ACEXML_Char *entity_name = this->read_name (); - if (entity_name == 0) - { - this->report_fatal_error (ACE_TEXT ("Error reading ENTITY name.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - this->skip_whitespace_count (&nextch); - - if (nextch == '\'' || nextch == '"') - { - ACEXML_Char *entity_value = 0; - - if (this->get_quoted_string (entity_value) != 0) - { - this->report_fatal_error(ACE_TEXT("Error reading ENTITY value.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - if (is_GEDecl) - { - if (this->entities_.add_entity (entity_name, entity_value) != 0) - { - this->report_fatal_error(ACE_TEXT("Error storing entity definition (duplicate definition?)") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - } - else - { - // @@ need to implement PEdecl lookup mechanism - ACEXML_THROW_RETURN (ACEXML_SAXNotSupportedException (), -1); - } - } - else - { - ACEXML_Char *systemid, *publicid; - - this->parse_external_id_and_ref (publicid, systemid ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - if (systemid == 0) - { - this->report_fatal_error(ACE_TEXT("Invalid ExternalID definition (system ID missing.)") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->skip_whitespace_count (&nextch); - if (nextch == 'N') // NDATA section followed - { - if (is_GEDecl == 0) - { - this->report_fatal_error(ACE_TEXT("Unexpected keyword NDATA in PEDecl.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - if ((this->parse_token (ACE_TEXT ("NDATA")) < 0) || - this->skip_whitespace_count (&nextch) == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword NDATA") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char *ndata = this->read_name (); - this->dtd_handler_->unparsedEntityDecl (entity_name, - publicid, - systemid, - ndata ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - } - else - { - // @@ Need to support external CharStream sources - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ENTITY: (%s) "), - entity_name)); - - if (publicid == 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("SYSTEM %s\n"), - systemid)); - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("PUBLIC %s %s\n"), - publicid, systemid)); - } - } - - // End of ENTITY definition - if (this->skip_whitespace (0) != '>') - { - this->report_fatal_error(ACE_TEXT("Expecting end of ENTITY definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - return 0; -} - -int -ACEXML_Parser::parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL) -{ - if ((this->parse_token (ACE_TEXT ("ATTLIST")) < 0) || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `ATTLIST'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char *element_name = this->read_name (); - if (element_name == 0) - { - this->report_fatal_error(ACE_TEXT("Error reading element name while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char nextch = this->skip_whitespace (0); - - // Parse AttDef* - while (nextch != '>') - { - // Parse attribute name - ACEXML_Char *att_name = this->read_name (nextch); - if (att_name == 0) - { - this->report_fatal_error(ACE_TEXT("Error reading attribute name while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - /* - Parse AttType: - Possible keywords: - CDATA // StringType - ID // TokenizedType - IDREF - IDREFS - ENTITY - ENTITIES - NMTOKEN - NMTOKENS - NOTATION // EnumeratedType - NotationTYpe - ( // EnumeratedType - Enumeration - */ - nextch = this->skip_whitespace (0); - switch (nextch) - { - case 'C': // CDATA - if ((this->parse_token (ACE_TEXT ("DATA")) < 0) || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `CDATA' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // Else, we have successfully identified the type of the - // attribute as CDATA - // @@ Set up validator appropriately here. - break; - case 'I': // ID, IDREF, or, IDREFS - if (this->get () == 'D') - { - if (this->skip_whitespace_count (&nextch) > 0) - { - // We have successfully identified the type of the - // attribute as ID @@ Set up validator as such. - break; - } - if (this->parse_token (ACE_TEXT ("REF")) == 0) - { - if (this->skip_whitespace_count (&nextch) > 0) - { - // We have successfully identified the type of - // the attribute as IDREF - // @@ Set up validator as such. - break; - } - else if (nextch == 'S' && - this->get () && // consume the 'S' - this->skip_whitespace_count () != 0) - { - // We have successfully identified the type of - // the attribute as IDREFS - // @@ Set up validator as such. - break; - } - } - } - // Admittedly, this error message is not precise enough - this->report_fatal_error(ACE_TEXT("Expecting keyword `ID', `IDREF', or `IDREFS' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - case 'E': // ENTITY or ENTITIES - if (this->parse_token (ACE_TEXT ("NTIT")) == 0) - { - nextch = this->get (); - if (nextch == 'Y') - { - // We have successfully identified the type of - // the attribute as ENTITY - // @@ Set up validator as such. - } - else if (nextch == 'I'&& this->get () == 'E' && - this->get () == 'S') - { - // We have successfully identified the type of - // the attribute as ENTITIES - // @@ Set up validator as such. - } - if (this->skip_whitespace_count () > 0) - { - // success - break; - } - } - // Admittedly, this error message is not precise enough - this->report_fatal_error(ACE_TEXT("Expecting keyword `ENTITY', or `ENTITIES' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - case 'N': // NMTOKEN, NMTOKENS, or, NOTATION - nextch = this->get (); - if (nextch != 'M' || nextch != 'O') - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `NMTOKEN', `NMTOKENS', or `NOTATION' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - if (nextch == 'M') - { - if (this->parse_token (ACE_TEXT ("TOKEN")) == 0) - { - if (this->skip_whitespace_count (&nextch) > 0) - { - // We have successfully identified the type of - // the attribute as NMTOKEN - // @@ Set up validator as such. - break; - } - else if (nextch == 'S' && this->skip_whitespace_count () > 0) - { - // We have successfully identified the type of - // the attribute as NMTOKENS - // @@ Set up validator as such. - break; - } - } - this->report_fatal_error(ACE_TEXT("Expecting keyword `NMTOKEN' or `NMTOKENS' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - else // NOTATION - { - if ((this->parse_token (ACE_TEXT ("TATION")) < 0) || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `NOTATION' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - if (this->get () != '(') - { - this->report_fatal_error(ACE_TEXT("Expecting `(' following NOTATION while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - this->skip_whitespace_count (); - - do { - ACEXML_Char *notation_name = this->read_name (); - if (notation_name == 0) - { - this->report_fatal_error(ACE_TEXT("Error reading NOTATION name while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // @@ get another notation name, set up validator as such - this->skip_whitespace_count (&nextch); - } while (nextch != ')'); - - this->get (); // consume the closing paren. - this->skip_whitespace_count (); - } - break; - case '(': // EnumeratedType - Enumeration - this->skip_whitespace_count (); - - do { - ACEXML_Char *token_name = this->read_name (); // @@ need a special read_nmtoken? - if (token_name == 0) - { - this->report_fatal_error(ACE_TEXT("Error reading enumerated nmtoken name while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // @@ get another nmtoken, set up validator as such - this->skip_whitespace_count (&nextch); - } while (nextch != ')'); - - this->get (); // consume the closing paren. - this->skip_whitespace_count (); - break; - default: - { - this->report_fatal_error(ACE_TEXT("Invalid Attribute Type while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - ACE_NOTREACHED (break); - } - - /* - Parse DefaultDecl: - #REQUIRED - #IMPLIED - #FIXED - quoted string // #FIXED - */ - nextch = this->peek (); - switch (nextch) - { - case '#': - this->get (); // consume the '#' - switch (this->get ()) - { - case 'R': - if (this->parse_token (ACE_TEXT ("EQUIRED")) < 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `#REQUIRED' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // We now know this attribute is required - // @@ Set up the validator as such. - break; - case 'I': - if (this->parse_token (ACE_TEXT ("MPLIED")) < 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `#IMPLIED' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // We now know this attribute is impleid. - // @@ Set up the validator as such. - break; - case 'F': - if (this->parse_token (ACE_TEXT ("IXED")) < 0 || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `#FIXED' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // We now know this attribute is fixed. - - ACEXML_Char *fixed_attr; - if (this->get_quoted_string (fixed_attr) != 0) - { - this->report_fatal_error(ACE_TEXT("Error parsing `#FIXED' attribute value while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // @@ set up validator - break; - default: - break; - } - break; - case '\'': - case '"': - ACEXML_Char *fixed_attr; - if (this->get_quoted_string (fixed_attr) != 0) - { - this->report_fatal_error(ACE_TEXT("Error parsing `#FIXED' attribute value while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // @@ set up validator - break; - default: - break; - } - this->skip_whitespace_count (&nextch); - } - - this->get (); // consume closing '>' - - return 0; -} - -int -ACEXML_Parser::parse_notation_decl (ACEXML_ENV_SINGLE_ARG_DECL) -{ - if (this->parse_token (ACE_TEXT ("NOTATION")) < 0 || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `NOTATION'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char *notation = this->read_name (); - if (notation == 0) - { - this->report_fatal_error(ACE_TEXT("Invalid notation name.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - this->skip_whitespace_count (); - ACEXML_Char *systemid, *publicid; - - this->parse_external_id_and_ref (publicid, systemid ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - - if (this->get () != '>') - { - this->report_fatal_error(ACE_TEXT("Expecting NOTATION closing '>'.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - this->dtd_handler_->notationDecl (notation, - publicid, - systemid ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - - return 0; -} - -int -ACEXML_Parser::parse_external_id_and_ref (ACEXML_Char *&publicId, - ACEXML_Char *&systemId ACEXML_ENV_ARG_DECL) -{ - publicId = systemId = 0; - ACEXML_Char nextch = this->get (); - - switch (nextch) - { - case 'S': // External SYSTEM id. - if (this->parse_token (ACE_TEXT ("YSTEM")) < 0 || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword 'SYSTEM'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - if (this->get_quoted_string (systemId) != 0) - { - this->report_fatal_error(ACE_TEXT("Error while parsing SYSTEM literal for SYSTEM id.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->locator_.setSystemId (systemId); - break; - case 'P': // External PUBLIC id or previously defined PUBLIC id. - if (this->parse_token (ACE_TEXT ("UBLIC")) < 0 || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword 'PUBLIC'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - if (this->get_quoted_string (publicId) != 0) - { - this->report_fatal_error(ACE_TEXT("Error while parsing public literal for PUBLIC id.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->locator_.setPublicId (publicId); - - this->skip_whitespace_count (&nextch); - if (nextch == '\'' || nextch == '"') // not end of NOTATION yet. - { - if (this->get_quoted_string (systemId) != 0) - { - this->report_fatal_error(ACE_TEXT("Error while parsing system literal for PUBLIC id.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->locator_.setSystemId (systemId); - } - break; - default: - this->report_fatal_error(ACE_TEXT("Expecting either keyword `SYSTEM' or `PUBLIC'.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - return 0; -} - -int -ACEXML_Parser::parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL) -{ - this->get (); // consume the '(' - - ACEXML_Char nextch; - int subelement_number = 0; - this->skip_whitespace_count (&nextch); - - switch (nextch) - { - case '#': // Mixed element, - if (this->parse_token (ACE_TEXT ("#PCDATA")) < 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `#PCDATA' while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - this->skip_whitespace_count (&nextch); - - while (nextch != ')') - { - if (this->get () != '|') - { - this->report_fatal_error(ACE_TEXT("Expecting end of Mixed section while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->skip_whitespace_count (); - - ACEXML_Char *name = this->read_name (); - // @@ name will be used in the Validator later. - ACE_UNUSED_ARG (name); - ++subelement_number; - // @@ Install Mixed element name into the validator. - this->skip_whitespace_count (&nextch); - } - - if (this->get () != ')' || - (subelement_number && this->get () != '*')) - { - this->report_fatal_error(ACE_TEXT("Expecting closing `)*' or ')' while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // @@ close the element definition in the validator. - break; - default: - int status = this->parse_child (1 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - if (status != 0) - return -1; - } - - return 0; -} - -int -ACEXML_Parser::parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL) -{ - // Conditionally consume the open paren. - if (skip_open_paren == 0 && - this->get () != '(') - { - this->report_fatal_error(ACE_TEXT("Expecting opening `(' while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char node_type = 0; - ACEXML_Char nextch; - - do { - this->skip_whitespace_count (&nextch); - switch (nextch) - { - case '(': - this->parse_child (0 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - break; - default: - // must be an element name here. - ACEXML_Char *subelement = this->read_name (); - if (subelement == 0) - { - this->report_fatal_error(ACE_TEXT("Error reading sub-element name while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // @@ Inform validator of the new element here. - break; - } - - this->skip_whitespace_count (&nextch); - switch (nextch) - { - case '|': - switch (node_type) - { - case 0: - node_type = '|'; - // @@ inform validator of this new type?? - break; - case '|': - break; - default: - this->report_fatal_error(ACE_TEXT("Expecting `,', `|', or `)' while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - case ',': - switch (node_type) - { - case 0: - node_type = ','; - // @@ inform validator of this new type?? - break; - case ',': - break; - default: - this->report_fatal_error(ACE_TEXT("Expecting `,', `|', or `)'while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - case ')': - break; - default: - this->report_fatal_error(ACE_TEXT("Expecting `,', `|', or `)' while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->get (); // consume , | or ) - } while (nextch != ')'); - - // Check for trailing '?', '*', '+' - nextch = this->peek (); - switch (nextch) - { - case '?': - // @@ Consume the character and inform validator as such, - this->get (); - break; - case '*': - // @@ Consume the character and inform validator as such, - this->get (); - break; - case '+': - // @@ Consume the character and inform validator as such, - this->get (); - break; - default: - break; // not much to do. - } - - return 0; -} - -ACEXML_Char -ACEXML_Parser::skip_whitespace (ACEXML_Char **whitespace) -{ - ACEXML_Char ch = this->get (); - - if (this->is_whitespace (ch) == 0) - { - if (whitespace != 0) - *whitespace = 0; - return ch; - } - - do - { - if (whitespace != 0) - this->obstack_.grow (ch); - ch = this->get (); - } - while (this->is_whitespace (ch)); - - if (whitespace != 0) - *whitespace = this->obstack_.freeze (); - - return ch; -} - -int -ACEXML_Parser::skip_whitespace_count (ACEXML_Char *peeky) -{ - int wscount = 0; - ACEXML_Char dummy; - ACEXML_Char &forward = (peeky == 0 ? dummy : *peeky); - - for (;this->is_whitespace ((forward = this->peek ())); ++wscount) - this->get (); - - return wscount; -} - -int -ACEXML_Parser::parse_token (const ACEXML_Char* keyword) -{ - if (keyword == 0) - return -1; - const ACEXML_Char* ptr = keyword; - ACEXML_Char ch; - for (; *ptr != 0 && ((ch = this->get()) == *ptr); ++ptr) - { - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ch = %c : ptr = %c"), ch, *ptr)); - } - if (*ptr == 0) - return 0; - else - return -1; -} - -int -ACEXML_Parser::skip_equal (void) -{ - if (this->skip_whitespace (0) != '=') - return -1; - - while (this->is_whitespace (this->peek ())) - this->get (); - return 0; -} - -int -ACEXML_Parser::get_quoted_string (ACEXML_Char *&str) -{ - ACEXML_Char quote = this->get (); - if (quote != '\'' && quote != '"') // Not a quoted string. - return -1; - - while (1) - { - ACEXML_Char ch = this->get (); - - // @@ Deoes not handle buffer overflow yet. - if (ch == quote) - { - str = this->obstack_.freeze (); - return 0; - } - - const ACEXML_String *replace = 0; - ACEXML_String charval; - ACEXML_Char buffer[6]; - size_t i = 0; - - switch (ch) - { - case '&': - if (this->peek () == '#') - { - if (this->parse_char_reference (buffer, 6) != 0) - { -// xmlenv.exception (new ACEXML_SAXParseException -// (ACE_TEXT ("CharRef does not resolves to a valid character"))); - return -1; - } - charval.set (buffer, 0); - replace = &charval; - } - else - replace = this->parse_reference (); - - if (replace == 0) - { - // xmlenv.exception (new ACEXML_SAXParseException - // (ACE_TEXT ("Undefined reference"))); - return -1; - } - for (i = 0; i < replace->length (); ++i) - this->obstack_.grow ((*replace)[i]); - // handle reference here. - break; - case 0x0D: // End-of-Line handling - ch = (this->peek () == 0x0A ? this->get () : 0x0A); - // Fall thru... - case 0x0A: - // Fall thru... - default: - this->obstack_.grow (ch); - break; - } - } -} - -ACEXML_Char * -ACEXML_Parser::read_name (ACEXML_Char ch) -{ - if (ch == 0) - { - ch = this->get (); - - if (this->is_whitespace (ch)) - // No white space is allowed here. - return 0; - } - else if (this->is_nonname (ch)) - return 0; - - while (1) - { - this->obstack_.grow (ch); - ch = this->peek (); - if (this->is_nonname (ch)) - break; - ch = this->get (); - }; - - return this->obstack_.freeze (); -} - -void -ACEXML_Parser::report_prefix_mapping (const ACEXML_Char* prefix, - const ACEXML_Char* uri, - const ACEXML_Char* name, - int start ACEXML_ENV_ARG_DECL) -{ - if (this->namespaces_) - { - const ACEXML_Char* temp = (name == 0) ? empty_string : prefix; - if (start) { - this->content_handler_->startPrefixMapping (temp, uri ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - } - else - { - this->content_handler_->endPrefixMapping(temp ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - } - } -} diff --git a/ACEXML/parser/parser/Parser.dsp b/ACEXML/parser/parser/Parser.dsp deleted file mode 100644 index 838bc6d306d..00000000000 --- a/ACEXML/parser/parser/Parser.dsp +++ /dev/null @@ -1,125 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ACEXML_Parser" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ACEXML_Parser - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Parser.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Parser.mak" CFG="ACEXML_Parser - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ACEXML_Parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ACEXML_Parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ACEXML_Parser - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACEXML_PARSER_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACEXML_PARSER_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ace.lib ACEXML.lib /nologo /dll /machine:I386 /out:"../../../bin/ACEXML_Parser.dll" /libpath:"../../../ace" /libpath:"../../Common" - -!ELSEIF "$(CFG)" == "ACEXML_Parser - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACEXML_PARSER_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACEXML_PARSER_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib ACEXMLd.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/ACEXML_Parserd.dll" /pdbtype:sept /libpath:"../../../ace" /libpath:"../../Common" - -!ENDIF - -# Begin Target - -# Name "ACEXML_Parser - Win32 Release" -# Name "ACEXML_Parser - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Entity_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Parser.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Entity_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Parser.h -# End Source File -# Begin Source File - -SOURCE=.\Parser_export.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/ACEXML/parser/parser/Parser.dsw b/ACEXML/parser/parser/Parser.dsw deleted file mode 100644 index c2e1b8458e6..00000000000 --- a/ACEXML/parser/parser/Parser.dsw +++ /dev/null @@ -1,28 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Parser"=.\Parser.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### diff --git a/ACEXML/parser/parser/Parser.h b/ACEXML/parser/parser/Parser.h deleted file mode 100644 index e45e290ca79..00000000000 --- a/ACEXML/parser/parser/Parser.h +++ /dev/null @@ -1,516 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Parser.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef _ACEXML_BASIC_PARSER_H_ -#define _ACEXML_BASIC_PARSER_H_ - -#include "ace/pre.h" -#include "ACEXML/parser/parser/Parser_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ACEXML/common/XMLReader.h" -#include "ACEXML/common/LocatorImpl.h" -#include "ACEXML/common/NamespaceSupport.h" -#include "ACEXML/common/CharStream.h" -#include "ace/Obstack.h" -#include "ace/Functor.h" -#include "ace/SString.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Containers_T.h" -#include "ace/Auto_Ptr.h" -#include "ACEXML/parser/parser/Entity_Manager.h" - -/** - * @class ACEXML_Parser Parser.h "ACEXML/parser/parser/Parser.h" - * - * @brief A SAX based parser. - * - */ -class ACEXML_PARSER_Export ACEXML_Parser : public ACEXML_XMLReader -{ -public: - /// Default constructor. - ACEXML_Parser (void); - - /// Destructor. - virtual ~ACEXML_Parser (void); - - /* - * Return the current content handler. - */ - virtual ACEXML_ContentHandler *getContentHandler (void) const; - - /* - * Return the current DTD handler. - */ - virtual ACEXML_DTDHandler *getDTDHandler (void) const; - - /* - * Return the current entity resolver. - */ - virtual ACEXML_EntityResolver *getEntityResolver (void) const; - - /* - * Return the current error handler. - */ - virtual ACEXML_ErrorHandler *getErrorHandler (void) const; - - /** - * Look up the value of a feature. This method allows - * programmers to check whether a specific feature has been - * activated in the parser. - */ - virtual int getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; - - /** - * Activating or deactivating a feature. - */ - virtual void setFeature (const ACEXML_Char *name, - int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; - - /* - * Look up the value of a property. - */ - virtual void * getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; - - /* - * Set the value of a property. - */ - virtual void setProperty (const ACEXML_Char *name, - void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) ; - - /* - * Parse an XML document. - */ - virtual void parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) ; - - /* - * Parse an XML document from a system identifier (URI). - */ - virtual void parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /* - * Allow an application to register a content event handler. - */ - virtual void setContentHandler (ACEXML_ContentHandler *handler); - - /* - * Allow an application to register a DTD event handler. - */ - virtual void setDTDHandler (ACEXML_DTDHandler *handler); - - /* - * Allow an application to register an entity resolver. - */ - virtual void setEntityResolver (ACEXML_EntityResolver *resolver); - - /* - * Allow an application to register an error event handler. - */ - virtual void setErrorHandler (ACEXML_ErrorHandler *handler); - - // *** Helper functions for parsing XML - - /** - * Skip any whitespaces encountered until the first non-whitespace - * character is encountered and consumed from the current input - * CharStream. - * - * @param whitespace Return a pointer to the string of skipped - * whitespace after proper conversion. Null if there's no - * whitespace found. - * - * @return The first none-white space characters (which will be - * consumed from the CharStream.) If no whitespace is found, it - * returns 0. - * - * @sa skip_whitespace_count - */ - ACEXML_Char skip_whitespace (ACEXML_Char **whitespace); - - /** - * Skip any whitespaces encountered until the first non-whitespace - * character. The first non-whitespace character is not consumed. - * This method does peek into the input CharStream and therefore - * is more expensive than @ref skip_whitespace. - * - * @param peek If non-null, @a peek points to a ACEXML_Char where - * skip_whitespace_count stores the first non-whitespace - * character it sees (character is not removed from the stream.) - * - * @return The number of whitespace characters consumed. - * - * @sa skip_whitespace - */ - int skip_whitespace_count (ACEXML_Char *peek = 0); - - /** - * Check if a character @a c is a whitespace. - * - * @retval 1 if @a c is a valid white space character. 0 otherwise. - */ - int is_whitespace (ACEXML_Char c); - - /** - * Check if a character @a c is a whitespace or '='. - * - * @retval 1 if true, 0 otherwise. - */ - int is_whitespace_or_equal (ACEXML_Char c); - - /** - * Check if a character @a c is a valid character for nonterminal NAME. - * - * @retval 1 if true, 0 otherwise. - */ - int is_nonname (ACEXML_Char c); - - /** - * Skip an equal sign. - * - * @retval 0 when succeeds, -1 if no equal sign is found. - */ - int skip_equal (void); - - /** - * Get a quoted string. Quoted strings are used to specify - * attribute values and this routine will replace character and - * entity references on-the-fly. Parameter entities are not allowed - * (or replaced) in this function. (But regular entities are.) - * - * @param str returns the un-quoted string. - * - * @retval 0 on success, -1 otherwise. - */ - int get_quoted_string (ACEXML_Char *&str); - - /** - * Parse a PI statement. The first character encountered - * should always be '?' in the PI prefix "@get() to acquire the initial character. - * - * @return A pointer to the string in the obstack, 0 if it's not - * a valid name. - */ - ACEXML_Char *read_name (ACEXML_Char ch = 0); - - /** - * Parse the DOCTYPE declaration. The first character encountered - * should always be 'D' in doctype prefix: "@<@!DOCTYPE". - */ - int parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /** - * Parse an XML element. The first character encountered should - * be the first character of the element "Name". - * - * @param is_root If not 0, then we are expecting to see the "root" - * element now, and the next element's name need to match the name - * defined in DOCTYPE definition, i.e., @a this->doctype_. - * - * @todo Instead of simply checking for the root element based on the - * argument @a is_root, we should instead either pass in some sort - * of validator or allow the function to return the element name so it - * can be used in a validator. - */ - void parse_element (int is_root ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; - - /** - * Parse XML Prolog. - */ - void parse_xml_prolog (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); - - - /** - * Parse a character reference, i.e., " " or "". The first - * character encountered should be the '#' char. - * - * @param buf points to a character buffer for the result. - * @param len specifies the capacities of the buffer. - * - * @retval 0 on success and -1 otherwise. - */ - int parse_char_reference (ACEXML_Char *buf, size_t len); - - /** - * Parse an entity reference, i.e., "&". The first character - * encountered should be the character following '&'. - * - * @return A pointer to the resolved const ACEXML_String if success - * (previously defined), 0 otherwise. - */ - const ACEXML_String *parse_reference (void); - - /** - * Parse a CDATA section. The first character should always be the first - * '[' in CDATA definition. - * - * @retval 0 on success. - * @retval -1 if fail. - */ - int parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL); - - /** - * Parse a "markupdecl" section, this includes both "markupdecl" and - * "DeclSep" sections in XML specification - */ - int parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL); - - /** - * Parse an "ELEMENT" decl. The first character this method - * expects is always the 'L' (the second char) in the word - * "ELEMENT". - * - * @retval 0 on success, -1 otherwise. - */ - int parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL); - - /** - * Parse an "ENTITY" decl. The first character this method expects - * is always the 'N' (the second char) in the word "ENTITY". - * - * @retval 0 on success, -1 otherwise. - */ - int parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL); - - /** - * Parse an "ATTLIST" decl. Thse first character this method - * expects is always the 'A' (the first char) in the word - * "ATTLIST". - * - * @retval 0 on success, -1 otherwise. - */ - int parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL); - - /** - *Parse a "NOTATION" decl. The first character this method - * expects is always the 'N' (the first char) in the word - * "NOTATION". - * - * @retval 0 on success, -1 otherwise. - */ - int parse_notation_decl (ACEXML_ENV_SINGLE_ARG_DECL); - - /** - * Parse an ExternalID or a reference to PUBLIC ExternalID. - * Possible cases are in the forms of: - * - * SYSTEM 'quoted string representing system resource' - * PUBLIC 'quoted name of public ID' 'quoted resource' - * PUBLIC 'quoted name we are referring to' - * - * - * The first character this function sees must be either 'S' or 'P'. - * When the function finishes parsing, the input stream points - * at the first non-whitespace character. - * - * @param publicId returns the unquoted publicId read. If none - * is available, it will be reset to 0. - * @param systemId returns the unquoted systemId read. If none - * is available, it will be reset to 0. - * - * @retval 0 on success, -1 otherwise. - */ - int parse_external_id_and_ref (ACEXML_Char *&publicId, - ACEXML_Char *&systemId ACEXML_ENV_ARG_DECL); - - /** - * Parse the "children" and "Mixed" non-terminals in contentspec. - * - * The first character this function sees must be the first - * open paren '(' in children. - * - * @retval 0 on success, -1 otherwise. - */ - int parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL); - - /** - * Parse a @c cp non-terminal. @c cp can either be a @c seq or a @c choice. - * This function calls itself recursively. - * - * @param skip_open_paren when non-zero, it indicates that the open paren of - * the @c seq or @c choice has already been removed from the input - * stream. - * - * @retval 0 on success, -1 otherwise. - */ - int parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL); - -protected: - /// Get a character. - ACEXML_Char get (void); - - /// Peek a character. - ACEXML_Char peek (void); - - /** - * Check if more data can be added to a character buffer in obstack. - * If not, the existing data in the buffer will be cleared out by - * freezing the segment and pass it out thru a content_handler_->characters () - * call. @a counter records the length of the existing data in - * obstack. - */ - int try_grow_cdata (size_t size, size_t &len ACEXML_ENV_ARG_DECL); - - // Feature names: - - /** - * \addtogroup acexml_parser_features - * @{ - */ - - /** - * @var simple_parsing_feature_ - * - * This constant string defines the name of "simple XML parsing" - * feature. When this feature is enabled, ACEXML parser is allowed - * to parse a simple XML stream without mandated XML prolog - * and no DTD defintion. - */ - static const ACEXML_Char simple_parsing_feature_[]; - - /** - * @var namespaces_feature_ - * - * This constant string defines the SAX XML Namespace feature. When this - * feature is enabled, ACEXML parser allows access by namespace qualified - * names. - */ - static const ACEXML_Char namespaces_feature_[]; - - /** - * @var namespace_prefixes_feature_ - * - * This constant string defines the SAX XML Namespace prefixes feature. - * Normally the list of attributes returned by the parser will not - * contain attributes used as namespace declarations (xmlns*). When this - * feature is enabled, the list of attributes contains the namespace - * declarations also. - */ - static const ACEXML_Char namespace_prefixes_feature_[]; - - /* @} */ - -private: - /** - * Dispatch errors to ErrorHandler. - * - */ - void report_error (const ACEXML_Char* message ACEXML_ENV_ARG_DECL); - - /** - * Dispatch warnings to ErrorHandler. - * - */ - void report_warning (const ACEXML_Char* message ACEXML_ENV_ARG_DECL); - - /** - * Dispatch fatal errors to ErrorHandler. - * - */ - void report_fatal_error (const ACEXML_Char* message ACEXML_ENV_ARG_DECL); - - /** - * Dispatch prefix mapping calls to the ContentHandler. - * - * @param prefix Namespace prefix - * @param uri Namespace URI - * @param name Local name - * @param start 1 => startPrefixMapping 0 => endPrefixMapping - */ - void report_prefix_mapping (const ACEXML_Char* prefix, - const ACEXML_Char* uri, - const ACEXML_Char* name, - int start ACEXML_ENV_ARG_DECL); - /** - * Parse a keyword. - */ - int parse_token (const ACEXML_Char* keyword); - - /// Keeping track of the handlers. We do not manage the memory for - /// handlers. - ACEXML_DTDHandler *dtd_handler_; - ACEXML_EntityResolver *entity_resolver_; - ACEXML_ContentHandler *content_handler_; - ACEXML_ErrorHandler *error_handler_; - - /// @@ Feature and properties management structure here. - /// Current input char stream. - ACEXML_CharStream *instream_; - - /// My doctype, if any. - ACEXML_Char *doctype_; - - /// External DTD System Literal, if any. - ACEXML_Char *dtd_system_; - - /// External DTD Public Literal, if any. - ACEXML_Char *dtd_public_; - - ACE_Obstack_T obstack_; - - ACEXML_NamespaceSupport xml_namespace_; - - ACEXML_Entity_Manager entities_; - - // Locator - ACEXML_LocatorImpl locator_; - - // Feature flags & - int simple_parsing_; - int namespaces_; - int namespace_prefixes_; - -}; - -#if defined (__ACEXML_INLINE__) -# include "ACEXML/parser/parser/Parser.i" -#endif /* __ACEXML_INLINE__ */ - -#include "ace/post.h" - -#endif /* _ACEXML_BASIC_PARSER_H_ */ diff --git a/ACEXML/parser/parser/Parser.i b/ACEXML/parser/parser/Parser.i deleted file mode 100644 index c346c99471d..00000000000 --- a/ACEXML/parser/parser/Parser.i +++ /dev/null @@ -1,140 +0,0 @@ -//============================================================================= -/** - * @file Parser.i - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -ACEXML_INLINE ACEXML_ContentHandler * -ACEXML_Parser::getContentHandler (void) const -{ - return this->content_handler_; -} - -ACEXML_INLINE ACEXML_DTDHandler * -ACEXML_Parser::getDTDHandler (void) const -{ - return this->dtd_handler_; -} - -ACEXML_INLINE ACEXML_EntityResolver * -ACEXML_Parser::getEntityResolver (void) const -{ - return this->entity_resolver_; -} - -ACEXML_INLINE ACEXML_ErrorHandler * -ACEXML_Parser::getErrorHandler (void) const -{ - return this->error_handler_; -} - -ACEXML_INLINE void -ACEXML_Parser::setContentHandler (ACEXML_ContentHandler *handler) -{ - this->content_handler_ = handler; -} - -ACEXML_INLINE void -ACEXML_Parser::setDTDHandler (ACEXML_DTDHandler *handler) -{ - this->dtd_handler_ = handler; -} - -ACEXML_INLINE void -ACEXML_Parser::setEntityResolver (ACEXML_EntityResolver *resolver) -{ - this->entity_resolver_ = resolver; -} - -ACEXML_INLINE void -ACEXML_Parser::setErrorHandler (ACEXML_ErrorHandler *handler) -{ - this->error_handler_ = handler; -} - -ACEXML_INLINE int -ACEXML_Parser::is_whitespace (ACEXML_Char c) -{ - switch (c) - { - case 0xa: - case 0x20: - case 0x9: - case 0xd: - return 1; - default: - return 0; - } -} - - -ACEXML_INLINE int -ACEXML_Parser::is_whitespace_or_equal (ACEXML_Char c) -{ - return (is_whitespace (c) || c == '=') ? 1 : 0; -} - -ACEXML_INLINE int -ACEXML_Parser::is_nonname (ACEXML_Char c) -{ - // Handle this separately as doing so avoids code duplication and enables - // setting of line and column numbers in one place. - if (is_whitespace_or_equal (c)) - return 1; - - switch (c) - { - case '/': - case '?': - case '>': - case '<': - case ')': - case '(': - case '+': - case '*': - case '\'': - case '"': - case ',': - case '|': - return 1; - default: - return 0; - } -} - -ACEXML_INLINE ACEXML_Char -ACEXML_Parser::get (void) -{ - // Using an extra level of indirection so we can - // manage document location in the future. - - if (this->instream_ != 0) - { - ACEXML_Char ch; - if (this->instream_->get (ch) == -1) // EOF reached. - return 0; - this->locator_.incrColumnNumber(); - if (ch == 0x0A) { - this->locator_.incrLineNumber(); - this->locator_.setColumnNumber (0); - } - return ch; - } - return 0; -} - -ACEXML_INLINE ACEXML_Char -ACEXML_Parser::peek (void) -{ - // Using an extra level of indirection so we can - // manage document location in the future. - - if (this->instream_ != 0) - return this->instream_->peek (); - return 0; - -} diff --git a/ACEXML/parser/parser/Parser_export.h b/ACEXML/parser/parser/Parser_export.h deleted file mode 100644 index 71630ccd962..00000000000 --- a/ACEXML/parser/parser/Parser_export.h +++ /dev/null @@ -1,47 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Parser_export.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef ACEXML_PARSER_EXPORT_H -#define ACEXML_PARSER_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACEXML_PARSER_HAS_DLL) -# define ACEXML_PARSER_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACEXML_PARSER_HAS_DLL */ - -#if !defined (ACEXML_PARSER_HAS_DLL) -# define ACEXML_PARSER_HAS_DLL 1 -#endif /* ! ACEXML_PARSER_HAS_DLL */ - -#if defined (ACEXML_PARSER_HAS_DLL) && (ACEXML_PARSER_HAS_DLL == 1) -# if defined (ACEXML_PARSER_BUILD_DLL) -# define ACEXML_PARSER_Export ACE_Proper_Export_Flag -# define ACEXML_PARSER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACEXML_PARSER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ACEXML_PARSER_BUILD_DLL */ -# define ACEXML_PARSER_Export ACE_Proper_Import_Flag -# define ACEXML_PARSER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACEXML_PARSER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACEXML_PARSER_BUILD_DLL */ -#else /* ACEXML_PARSER_HAS_DLL == 1 */ -# define ACEXML_PARSER_Export -# define ACEXML_PARSER_SINGLETON_DECLARATION(T) -# define ACEXML_PARSER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACEXML_PARSER_HAS_DLL == 1 */ - -#endif /* ACEXML_PARSER_EXPORT_H */ - -// End of auto generated file. diff --git a/ACEXML/parser/parser/parser.mpc b/ACEXML/parser/parser/parser.mpc deleted file mode 100644 index 6816ce41cf2..00000000000 --- a/ACEXML/parser/parser/parser.mpc +++ /dev/null @@ -1,7 +0,0 @@ -project(ACEXML_Parser): acelib { - sharedname = ACEXML_Parser - depends += ACEXML - libs += ACEXML - libpaths += $(ACE_ROOT)/ACEXML/common - dllflags += ACEXML_PARSER_BUILD_DLL -} diff --git a/ACEXML/tests/ContentHandler_Test.cpp b/ACEXML/tests/ContentHandler_Test.cpp deleted file mode 100644 index b91557cb896..00000000000 --- a/ACEXML/tests/ContentHandler_Test.cpp +++ /dev/null @@ -1,91 +0,0 @@ -//============================================================================= -/** - * @file ContentHandler_Test.cpp - * - * $Id$ - * - * @author Steve Huston - */ -//============================================================================= - -#include "ACEXML/common/DefaultHandler.h" -#include "ACEXML/common/InputSource.h" -#include "ACEXML/common/StrCharStream.h" -#include "ACEXML/parser/parser/Parser.h" - -class Basic_Content_Tester : public ACEXML_DefaultHandler -{ -public: - /** - * Receive notification of character data. - */ - virtual void characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); - - const ACEXML_Char *get_test_string (void) - { return Basic_Content_Tester::test_string_; } - -private: - static const ACEXML_Char *test_string_; -}; - -const ACEXML_Char * Basic_Content_Tester::test_string_ = - ACE_TEXT ("") - ACE_TEXT ("Example\n") - ACE_TEXT ("d'internationalisation"); - -void -Basic_Content_Tester::characters (const ACEXML_Char *ch, - int start, - int length ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - static int already_called = 0; - static const ACEXML_Char *expect = - ACE_TEXT ("Example\nd'internationalisation"); - - if (already_called) - { - ACEXML_THROW (ACEXML_SAXException - (ACE_TEXT ("characters() called too much\n"))); - } - already_called = 1; - - int expected_len = ACE_static_cast (int, ACE_OS::strlen (expect)); - if (length != expected_len) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("characters() expected len %d (%*s); ") - ACE_TEXT ("got %d (%*s)\n"), - expected_len, expected_len, ch + start, - length, length, ch + start)); - ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Functionality failure"))); - } - return; -} - -int -ACE_TMAIN (int, ACE_TCHAR *[]) -{ - int status = 0; - Basic_Content_Tester tester; - ACEXML_StrCharStream *test_stream = - new ACEXML_StrCharStream (tester.get_test_string ()); - ACEXML_InputSource input (test_stream); - ACEXML_Parser parser; - parser.setContentHandler (&tester); - ACEXML_TRY_NEW_ENV - { - parser.parse (&input ACEXML_ENV_ARG_PARAMETER); - ACEXML_TRY_CHECK; - } - ACEXML_CATCHANY - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Caught exception.\n"))); - status = 1; - } - ACEXML_ENDTRY; - return status; -} diff --git a/ACEXML/tests/ContentHandler_Test.dsp b/ACEXML/tests/ContentHandler_Test.dsp deleted file mode 100644 index 84ab3108878..00000000000 --- a/ACEXML/tests/ContentHandler_Test.dsp +++ /dev/null @@ -1,104 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ContentHandler_Test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ContentHandler_Test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ContentHandler_Test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ContentHandler_Test.mak" CFG="ContentHandler_Test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ContentHandler_Test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "ContentHandler_Test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ContentHandler_Test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ace.lib ACEXML_Parser.lib ACEXML.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"..\Common" /libpath:"..\parser\parser" - -!ELSEIF "$(CFG)" == "ContentHandler_Test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib ACEXML_Parserd.lib ACEXMLd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace" /libpath:"..\Common" /libpath:"..\parser\parser" - -!ENDIF - -# Begin Target - -# Name "ContentHandler_Test - Win32 Release" -# Name "ContentHandler_Test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ContentHandler_Test.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/ACEXML/tests/HttpCharStream_Test.cpp b/ACEXML/tests/HttpCharStream_Test.cpp deleted file mode 100644 index 982fbcd4e34..00000000000 --- a/ACEXML/tests/HttpCharStream_Test.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// $Id$ - -#include "ACEXML/common/HttpCharStream.h" - -int ACE_TMAIN (int, ACE_TCHAR *[]) -{ - const ACEXML_Char* test = ACE_TEXT("http://www.cs.wustl.edu/~nanbor/"); - - const ACEXML_Char* simple = ACE_TEXT("http://www.cs.wustl.edu/~kitty/"); - - ACEXML_HttpCharStream stream; - ACEXML_Char ch; - - if (stream.open (test) != -1) - { - while (stream.get (ch) != -1) - ACE_OS::printf ("%c", ch); - stream.close(); - } - else - { - ACE_ERROR ((LM_ERROR, "Error in opening stream : %m\n")); - } - - if (stream.open (simple) != -1) - { - while (stream.get (ch) != -1) - ACE_OS::printf ("%c", ch); - } - else - { - ACE_ERROR ((LM_ERROR, "Error in opening stream : %m\n")); - } - return 0; -} diff --git a/ACEXML/tests/HttpCharStream_Test.dsp b/ACEXML/tests/HttpCharStream_Test.dsp deleted file mode 100644 index b2142eab85d..00000000000 --- a/ACEXML/tests/HttpCharStream_Test.dsp +++ /dev/null @@ -1,104 +0,0 @@ -# Microsoft Developer Studio Project File - Name="HttpCharStream_Test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=HttpCharStream_Test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "HttpCharStream_Test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "HttpCharStream_Test.mak" CFG="HttpCharStream_Test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "HttpCharStream_Test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "HttpCharStream_Test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "HttpCharStream_Test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ace.lib ACEXML.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"..\Common" - -!ELSEIF "$(CFG)" == "HttpCharStream_Test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib ACEXMLd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace" /libpath:"..\Common" - -!ENDIF - -# Begin Target - -# Name "HttpCharStream_Test - Win32 Release" -# Name "HttpCharStream_Test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\HttpCharStream_Test.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/ACEXML/tests/Makefile b/ACEXML/tests/Makefile deleted file mode 100644 index 8ecb4688792..00000000000 --- a/ACEXML/tests/Makefile +++ /dev/null @@ -1,650 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for repeating token client application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lACEXML_Parser -lACEXML -BIN = Transcoder_Test \ - NamespaceSupport_Test \ - HttpCharStream_Test \ - ContentHandler_Test - -LSRC = $(addsuffix .cpp,$(BIN)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -#SHOBJ = $(addsuffix .so,$(BIN)) - -BUILD = $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Transcoder_Test.o .obj/Transcoder_Test.so .shobj/Transcoder_Test.o .shobj/Transcoder_Test.so: Transcoder_Test.cpp \ - $(ACE_ROOT)/ACEXML/common/Transcode.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Transcode.i - -.obj/NamespaceSupport_Test.o .obj/NamespaceSupport_Test.so .shobj/NamespaceSupport_Test.o .shobj/NamespaceSupport_Test.so: NamespaceSupport_Test.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i - -.obj/HttpCharStream_Test.o .obj/HttpCharStream_Test.so .shobj/HttpCharStream_Test.o .shobj/HttpCharStream_Test.so: HttpCharStream_Test.cpp \ - $(ACE_ROOT)/ACEXML/common/HttpCharStream.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.inl \ - $(ACE_ROOT)/ACEXML/common/Mem_Map_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i - -.obj/ContentHandler_Test.o .obj/ContentHandler_Test.so .shobj/ContentHandler_Test.o .shobj/ContentHandler_Test.so: ContentHandler_Test.cpp \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - $(ACE_ROOT)/ACEXML/common/StrCharStream.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \ - $(ACE_ROOT)/ACEXML/common/XMLReader.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \ - $(ACE_ROOT)/ace/Obstack.h \ - $(ACE_ROOT)/ace/Obstack_T.h \ - $(ACE_ROOT)/ace/Obchunk.h \ - $(ACE_ROOT)/ace/Obchunk.i \ - $(ACE_ROOT)/ace/Obstack_T.i \ - $(ACE_ROOT)/ace/Obstack_T.cpp \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/Makefile.bor b/ACEXML/tests/Makefile.bor deleted file mode 100644 index d2bc13a9dc2..00000000000 --- a/ACEXML/tests/Makefile.bor +++ /dev/null @@ -1,26 +0,0 @@ -# -# $Id$ -# Makefile for building the ACE XML tests -# - -NAMES = \ - NamespaceSupport_Test \ - Transcoder_Test \ - HttpCharStream_Test \ - ContentHandler_Test - -OBJFILES = $(OBJDIR)\$(NAME).obj - -CFLAGS = \ - $(ACE_CFLAGS) \ - $(ACE_XML_CFLAGS) - -CPPDIR = . - -LIBFILES = \ - $(ACE_LIB) \ - $(ACE_XML_PARSER_LIB) \ - $(ACE_XML_LIB) - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> -!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/ACEXML/tests/NamespaceSupport_Test.cpp b/ACEXML/tests/NamespaceSupport_Test.cpp deleted file mode 100644 index 96bcfa7ab30..00000000000 --- a/ACEXML/tests/NamespaceSupport_Test.cpp +++ /dev/null @@ -1,144 +0,0 @@ -// $Id$ - -#include "ACEXML/common/NamespaceSupport.h" - -int ACE_TMAIN (int, ACE_TCHAR *[]) -{ - ACEXML_NamespaceSupport xmlns; - - xmlns.pushContext(); - xmlns.declarePrefix(ACE_TEXT (""), - ACE_TEXT ("http://www.w3.org/1999/xhtml")); - xmlns.declarePrefix(ACE_TEXT ("dc"), - ACE_TEXT ("http://www.purl.org/dc#")); - xmlns.declarePrefix(ACE_TEXT ("xc"), - ACE_TEXT ("http://www.purl.org/dc#")); - - const ACEXML_Char *lName, *uri; - const ACEXML_Char *n1 = ACE_TEXT ("p"); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*** Checking processName:\n"))); - if (xmlns.processName (n1, uri, lName, 0) != 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Fail to resolve namespace name %s\n"), - n1)); - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Namespace URI: %s\nLocal name: %s\nRaw name: %s\n"), - uri, lName, n1)); - - const ACEXML_Char *n2 = ACE_TEXT ("dc:title"); - if (xmlns.processName(n2, uri, lName, 0) != 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Fail to resolve namespace name %S\n"), - n2)); - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Namespace URI: %s\nLocal name: %s\nRaw name: %s\n"), - uri, lName, n2)); - - const ACEXML_Char *n3 = ACE_TEXT ("xml:title"); - if (xmlns.processName(n3, uri, lName, 0) != 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Fail to resolve namespace name %S\n"), - n3)); - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Namespace URI: %s\nLocal name: %s\nRaw name: %s\n"), - uri, lName, n3)); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n*** Checking getDeclaredPrefixes\n"))); - - ACEXML_STR_LIST prefixes; - if (xmlns.getDeclaredPrefixes (prefixes) != 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Fail to get a list of declared prefixes\n"))); - else - { - ACEXML_STR_LIST::ITERATOR iter = prefixes.begin (); - const ACEXML_Char **prefix = 0; - - for (; iter.next (prefix);iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prefix: \"%s\"\n"), *prefix)); - } - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** Checking getPrefix\n"))); - const ACEXML_Char *prefix = 0; - - if ((prefix = xmlns.getPrefix (ACE_TEXT ("http://www.purl.org/dc#"))) == 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Fail to get prefix of http://www.purl.org/dc#\n"))); - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Prefix of http://www.purl.org/dc# is %s\n"), - prefix)); - - if ((prefix = xmlns.getPrefix (ACE_TEXT ("http://www.w3.org/1999/xhtml"))) == 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Fail to get prefix of http://www.w3.org/1999/xhtml which is okay\n"))); - else - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("ERROR: Prefix of http://www.w3.org/1999/xhtml is %s\n"), - prefix)); - - if ((prefix = xmlns.getPrefix (ACE_TEXT ("http://www.w3.org/XML/1998/namespace"))) == 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Fail to get prefix of http://www.w3.org/XML/1998/namespace\n"))); - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Prefix of http://www.w3.org/XML/1998/namespace is %s\n"), - prefix)); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** Checking getPrefixes with known URI\n"))); - prefixes.reset (); - - if (xmlns.getPrefixes (ACE_TEXT ("http://www.purl.org/dc#"), prefixes) != 0) - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Fail to getPrefixes based on known URI\n"))); - else - { - ACEXML_STR_LIST::ITERATOR iter = prefixes.begin (); - const ACEXML_Char **prefix = 0; - - for (; iter.next (prefix);iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prefix: \"%s\"\n"), *prefix)); - } - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** Checking getPrefixes\n"))); - prefixes.reset (); - - if (xmlns.getPrefixes (prefixes) != 0) - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Fail to getPrefixes\n"))); - else - { - ACEXML_STR_LIST::ITERATOR iter = prefixes.begin (); - const ACEXML_Char **prefix = 0; - - for (; iter.next (prefix);iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prefix: \"%s\"\n"), *prefix)); - } - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** Checking getURI\n"))); - const ACEXML_Char *URI = 0; - - if ((URI = xmlns.getURI (ACE_TEXT ("dc"))) == 0) - ACE_DEBUG((LM_ERROR, ACE_TEXT ("Fail to get URI for \"dc\"\n"))); - else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("URI for \"dc\" is %s\n"), URI)); - if ((URI = xmlns.getURI (ACE_TEXT ("xc"))) == 0) - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Fail to get URI for \"xc\"\n"))); - else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("URI for \"xc\" is %s\n"), URI)); - if ((URI = xmlns.getURI (ACE_TEXT ("xml"))) == 0) - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Fail to get URI for \"xml\"\n"))); - else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("URI for \"xml\" is %s\n"), URI)); - if ((URI = xmlns.getURI (ACE_TEXT (""))) == 0) - ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Fail to get default namespace URI\n"))); - else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("URI for default namespace is %s\n"), URI)); - - xmlns.popContext(); - - return 0; -} diff --git a/ACEXML/tests/NamespaceSupport_Test.dsp b/ACEXML/tests/NamespaceSupport_Test.dsp deleted file mode 100644 index c6efd71974a..00000000000 --- a/ACEXML/tests/NamespaceSupport_Test.dsp +++ /dev/null @@ -1,104 +0,0 @@ -# Microsoft Developer Studio Project File - Name="NamespaceSupport_Test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=NamespaceSupport_Test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "NamespaceSupport_Test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "NamespaceSupport_Test.mak" CFG="NamespaceSupport_Test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "NamespaceSupport_Test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "NamespaceSupport_Test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "NamespaceSupport_Test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ace.lib ACEXML.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"..\Common" - -!ELSEIF "$(CFG)" == "NamespaceSupport_Test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib ACEXMLd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace" /libpath:"..\Common" - -!ENDIF - -# Begin Target - -# Name "NamespaceSupport_Test - Win32 Release" -# Name "NamespaceSupport_Test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\NamespaceSupport_Test.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/ACEXML/tests/Tests.dsw b/ACEXML/tests/Tests.dsw deleted file mode 100644 index 176ab08e31c..00000000000 --- a/ACEXML/tests/Tests.dsw +++ /dev/null @@ -1,67 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ContentHandler_Test"=.\ContentHandler_Test.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -############################################################################### - -Project: "HttpCharStream_Test"=.\HttpCharStream_Test.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "NamespaceSupport_Test"=.\NamespaceSupport_Test.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Transcoder_Test"=.\Transcoder_Test.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ACEXML/tests/Transcoder_Test.cpp b/ACEXML/tests/Transcoder_Test.cpp deleted file mode 100644 index 2e87a52a7e7..00000000000 --- a/ACEXML/tests/Transcoder_Test.cpp +++ /dev/null @@ -1,69 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "ACEXML/common/Transcode.h" -#include "ace/Log_Msg.h" - -void dump_utf16 (const ACEXML_UTF16 *data, - size_t len) -{ - size_t ptr = 0; - - while (1) - { - ACE_DEBUG ((LM_DEBUG, "%04x", data[ptr])); - - if (++ptr >= len) - break; - - if (ptr % 4 == 0) - ACE_DEBUG ((LM_DEBUG, "\n")); - else - ACE_DEBUG ((LM_DEBUG, " ")); - } - ACE_DEBUG ((LM_DEBUG, "\n")); - return; -} - -int -ACE_TMAIN (int, ACE_TCHAR*[]) -{ - ACEXML_UTF16 org [18]; -// = { 1, 2, 4, 8, 0x10, 0x20, 0x40, -// 0x80, -// 0x100, 0x200, 0x400, -// 0x800, 0x801, 0x802, 0x804, 0x808, 0x810, 0x820, -// 0x840, 0x880, 0x900, 0xa00, 0xc00, -// 0x1000, 0x2000, 0x4000, 0x8000, 0 } - ACEXML_UCS4 temp = 1; - - ACE_OS::memset (org, 0, sizeof org); - size_t x; - - for (x = 0; temp < 0x10000; x++, temp <<= 1) - { - org[x] = ACE_static_cast (ACEXML_UTF16, temp); - } - - ACE_DEBUG ((LM_DEBUG, "Original UTF16 string:\n")); - dump_utf16 (org, x); - ACE_DEBUG ((LM_DEBUG, "\n\n")); - - ACEXML_UTF8 decoded [MAXPATHLEN]; - ACE_OS::memset (decoded, 0, sizeof decoded); - - ACEXML_Transcoder::utf16s2utf8s (org, decoded, MAXPATHLEN); - - ACE_DEBUG ((LM_DEBUG, "Transcoded UTF8 string:\n")); - ACE_HEX_DUMP ((LM_DEBUG, decoded, ACE_OS::strlen (decoded) + 1)); - ACE_DEBUG ((LM_DEBUG, "\n\n")); - - ACEXML_UTF16 after [18]; - ACE_OS::memset (after, 0, sizeof after); - ACEXML_Transcoder::utf8s2utf16s (decoded, after, 18); - - ACE_DEBUG ((LM_DEBUG, "Restored UTF16 string:\n")); - dump_utf16 (after, x); - ACE_DEBUG ((LM_DEBUG, "\n\n")); - - return 0; -} diff --git a/ACEXML/tests/Transcoder_Test.dsp b/ACEXML/tests/Transcoder_Test.dsp deleted file mode 100644 index 3c329c92e51..00000000000 --- a/ACEXML/tests/Transcoder_Test.dsp +++ /dev/null @@ -1,104 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Transcoder_Test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Transcoder_Test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Transcoder_Test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Transcoder_Test.mak" CFG="Transcoder_Test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Transcoder_Test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Transcoder_Test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Transcoder_Test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ace.lib ACEXML.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"..\Common" - -!ELSEIF "$(CFG)" == "Transcoder_Test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib ACEXMLd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace" /libpath:"..\Common" - -!ENDIF - -# Begin Target - -# Name "Transcoder_Test - Win32 Release" -# Name "Transcoder_Test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Transcoder_Test.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/ACEXML/tests/tests.mpc b/ACEXML/tests/tests.mpc deleted file mode 100644 index f178c15ac88..00000000000 --- a/ACEXML/tests/tests.mpc +++ /dev/null @@ -1,23 +0,0 @@ -project(Transcoder_Test): aceexe, acexml { - Source_Files { - Transcoder_Test.cpp - } -} - -project(NamespaceSupport_Test): aceexe, acexml { - Source_Files { - NamespaceSupport_Test.cpp - } -} - -project(HttpCharStream_Test): aceexe, acexml { - Source_Files { - HttpCharStream_Test.cpp - } -} - -project(ContentHandler_Test): aceexe, acexml { - Source_Files { - ContentHandler_Test.cpp - } -} diff --git a/ASNMP/COPYRIGHT b/ASNMP/COPYRIGHT deleted file mode 100644 index ad880b9cf90..00000000000 --- a/ASNMP/COPYRIGHT +++ /dev/null @@ -1,68 +0,0 @@ -Mon Jul 14 12:12:32 PDT 1997 - -These copyrights apply to the SNMP++ module shipped with the ACE library: - - -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. - -=====================================================================*/ - -/********************************************************************** - Copyright 1988, 1989, 1991, 1992 by Carnegie Mellon University - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of CMU not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. -******************************************************************/ - -Certain portions of this version of HP's SNMP++ are: - -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - diff --git a/ASNMP/ChangeLog b/ASNMP/ChangeLog deleted file mode 100644 index acd3ed9ba87..00000000000 --- a/ASNMP/ChangeLog +++ /dev/null @@ -1,382 +0,0 @@ -Sun Nov 24 17:04:33 2002 Douglas C. Schmidt - - * agent/main.cpp (main): Added ACE::init() to the beginning of - main() to prevent crashes on Windows. Thanks to Huseyin Calgin - for reporting this. - -Fri Feb 8 04:42:21 2002 Douglas C. Schmidt - - * asnmp/transaction.cpp (run): Changed the code to use ACE_Reactor::instance () - rather than a local ACE_Reactor on the stack. Thanks to Paresh - Raote for reporting this. - -Thu Jan 25 12:48:33 2001 Craig Rodrigues - - * agent/Makefile.orig - asnmp/address.h.orig - examples/next/next.cpp - examples/trap/trap.cpp - examples/walk/walk.cpp - tests/test_config.h - tests/Varbind_Test.cpp - tests/Counter64_Test.cpp - tests/run_tests.sh - - New agent Makefile, and compilation fixes. - -Sun Jun 4 14:51:33 2000 Darrell Brunsch - - * asnmp-overview.html: - - Added missing CVS Id string. - -Tue Dec 21 16:22:21 1999 David L. Levine - - * tests/*.cpp: removed the unnecessary explicit template - instantiation. Other instantiations were necessary - with it, and it seemed to serve no useful purpose: - there was no use of an ACE_Unbounded_Set. - Thanks to Jose Rubio for - reporting link failures with Sun CC 5.0, with explicit - template instantiation enabled. - - * tests/test_config.h: added #include of "ace/ACE.h", - because the file uses it later. g++ 2.91.66 on Linux - needed it. - -Wed Jul 14 08:26:42 1999 Brian Raven - - * asnmp/snmp.{h,cpp},wpdu.cpp: - SYNOPSIS: - 1) The agent IP address in traps originating from logical - domains on an Enterprise 10000 is that of the physical domain. - - 2) The code that gets the IP address uses gethostbyname - which is unsafe in a MT environment (according to the man page). - - DESCRIPTION: - 1) The problem seems to be caused by hostname only returning - the physical domain name. - - SAMPLE FIX/WORKAROUND: - 1) To get around this problem I added the capability to - override the local host name. - - 2) I would suggest using the GenAddress class to obtain the - IP address. - -Tue Jun 22 13:34:54 1999 David L. Levine - - * agent/Makefile: replaced rm -f with $(RM). - -Thu Apr 29 06:46:46 1999 David L. Levine - - * tests/Makefile: changed SRC to PSRC (for make depend). - Thanks to Sandeep Goyal for reporting - that the Makefile was broken. - -Mon Dec 28 22:03:57 1998 David L. Levine - - * agent/main.cpp: added #include "ace/inc_user_config.h", for - ACE_RCSID definition. Thanks to wym for - reporting that it won't compile without it. - -Tue Oct 27 08:52:05 1998 David L. Levine - - * asnmp/Makefile,tests/Makefile: added SRC definition for make depend, and updated dependencies. - -Mon Aug 3 17:50:08 1998 Gonzalo Diethelm - - * examples/get/get_async.cpp: - * examples/get/get.cpp: - Added ACE_RCSID to these files. - -Fri Jul 31 19:26:07 1998 Gonzalo Diethelm - - * examples/Makefile: - It had a missing info subdirectory. - - * agent/agent_impl.cpp: - * agent/main.cpp: - * agent/snmp_agent.cpp: - * asnmp/address.cpp: - * asnmp/asn1.cpp: - * asnmp/counter.cpp: - * asnmp/ctr64.cpp: - * asnmp/gauge.cpp: - * asnmp/integer.cpp: - * asnmp/octet.cpp: - * asnmp/oid.cpp: - * asnmp/pdu.cpp: - * asnmp/sagent.cpp: - * asnmp/snmp.cpp: - * asnmp/target.cpp: - * asnmp/timetick.cpp: - * asnmp/transaction.cpp: - * asnmp/vb.cpp: - * asnmp/wpdu.cpp: - * examples/get/get.cpp: - * examples/next/next.cpp: - * examples/set/set.cpp: - * examples/trap/trap.cpp: - * examples/walk/walk.cpp: - * tests/Address_Test.cpp: - * tests/Counter64_Test.cpp: - * tests/Counter_Test.cpp: - * tests/Gauge_Test.cpp: - * tests/Integer_Test.cpp: - * tests/Octet_Test.cpp: - * tests/Oid_Test.cpp: - * tests/Target_Test.cpp: - * tests/Varbind_Test.cpp: - Added ACE_RCSID to these files. - -Wed Jul 15 20:34:55 CDT 1998 - * general fixes for SNMPv1 trap generation code reported by - Hien Nguyen and Jeff Hall - Added Hien's fixes, plus fixed -c option - in examples/trap to properly set community string. - * release 2.0 - -Fri Jan 30 15:29:42 CST 1998 - * fix vb.cpp to handle Gauge/uInt the same way. While retrieving - ifTable found the bug. - -Wed Dec 10 12:09:36 CST 1997 - * sagent.cpp, Eric Newton fix. result not checked. v1.8 - -Mon Dec 8 14:33:59 CST 1997 - * Thanks to Eric Newton's continued patches - Version 1.7 has fixes for: agent, base library - Fix to the response type fixes the interoperability with CMU snmp on - linux. (and SNMP Research as well) - - Initialize member of Pdu: output_ - Send responses as response messages - Deallocate and reset the io_vec - - The transaction object didn't initialize the io_vec used to receive - a packet when it was used for an agent transaction. - - Cleans up a warning about using a const object from a previous - patch. - - Removes the transaction object from the Reactor. - - -Sun Nov 30 17:49:12 CST 1997 Mike MacFaden - * Thanks to Eric Newton's apply patches: - Removed G++ warnings: - Removed unused variables - Cleaned up unused args to functions - Initialized variables - Inserted casts in *printf* functions - Added int return types to function definitions - Converted some variables from int to size_t to cut down on - sign comparison warnings - Reordered constructor initializer lists - Added return statements to functions returning int - - Modified for G++ language differences: - Modified for loops for ANSI scoping rules - - Fixed Bugs: - Deleted incorrect (cut-n-pasted) header to transaction.h - Removed "assignment in if condition" error - Added missing "break;" in switch statement in wpdu - - Features: - Added async interface. - - Noise: - Modified makefiles for g++ on Linux RedHat 4.1 - - * The new async interface has a test example in examples/get/get_async.cpp - that is useful if you are extending the get application. - - * Fixed makefile to include -lasnmp when building tests/examples - - * Compile and test with ACE 4.4 on Solaris 2.5.1 using Sun CC 4.2 - no warnings/errors. get_async will sigbus however in destructors. - -Thu Sep 4 18:56:12 1997 Mike MacFaden - - * commit agent/ mibs/ and update asnmp/ with sagent.h, cpp - to implement a trivial SNMPv1 agent that hard codes support - for mib II system group only. - -Fri Aug 22 23:43:20 1997 Mike MacFaden - - * clean up two memory leaks in octet class and one umr - -Thu Aug 21 20:59:23 1997 Mike MacFaden - - * Added Netbios address support to GenAddress - and added DecNetAddress, AppleTalkAddress classes per CISCO-TC.my - (ftp://ftp.cisco.com/pub/mibs) - -Tue Aug 19 20:19:32 1997 Michael R. MacFaden - * change IpAddress::is_arpa() to is_private() and update the comments - per RFC 1597. Add new test routine to verify this function in - tests/Address_Test.cpp - - * add IpAddress::to_octet(OctetStr& val) which is useful when having to - send a network address as an Octet String as in CISCO-PING-MIB.my - -Tue Aug 5 12:12:39 1997 Mike MacFaden (mrm@mrm-ss20) - * Thanks to Amos Shapira apply patches - to support IRIX 6.3. Stated request for: - I think it would make things "righter" to make the code use C++ - strings (and maybe vectors?). - - * Begin testing on HP-UX 10.01 (missing ucontext.h) - -Sat Aug 2 12:07:43 1997 Douglas C. Schmidt - - * Started to integrate the code into a more ACE-like style, e.g., - added a the "asnmp/" prefix to all the header files so that we - don't need to play games with the -I flags and so we can always - know where we're getting the headers from. - -Fri Aug 1 19:23:52 1997 Mike MacFaden (mrm@mrm-ss20) - - * NOTES: This first version only tested on Solaris 2.5 - - * review classes for thread safety. Current thread design only - allows for one thread to safely access any ASNMP object created. - - * run purify test of get routine no -memory leaks. - - * verify both shared archive/static archive types work with - example programs - - * << Globals Changes >> - - * tested only archiver library version - - * reformat code to use one brace style. - - * changed all manifest constants defined as _XX to XX_ to stay out - of compiler namespace - - * change all OS calls to use ACE_OS:: portability layer, #include - - - * reformat code to use one consistent brace layout and redo - header using ACE - - * remove semicolons on member functions foo{}; - not necessary - - * make get() methods const member functions - - * removed unnecessary casts that looked like this: and revamped - all memory allocations via ACE_NEW macro - - new_oid = (SmiLPUINT32) new unsigned long [ smival.value.oid.len - - To - - ACE_NEW(new_oid, SmiUINT32[ smival.value.oid.len]) - - * Collapsed default constructors with constructors to constructors - with default arguments. - - * removed unused #include - - * Added ACE_TRACE() to classes - - * change get_printable() to to_string() - there will be more java - programmers in the future so this should be the first step... - - * removed ASYNC interface till it can be rebuilt using ACE patterns - - * Attempt to make interface more type strict but leaving generic - interfaces as escape hatch. Example: CTarget becomes UdpTarget - for UDP/IP based agents. - - * << Class Specific Changes >> - - * Oid class: - - remove char * routines, simplify class - - added suboid method and removed get_printable() overloads - - * CTarget class: - - renamed to UdpTarget. Stay out of Microsoft Namespace per MSJ - Article by Allen Hollub. - - * Varbind class: - - remove generic set_value for char,int, etc. Too easy to get - this wrong. Allow just types defined. - - added overload for equality operator (==) - - added new constructor to allow setting full vb state oid,value, exception - - add to_string() - - * Address class: - - change manifest constants to enums for address lengths, add IP V6 lens - - - add a netbios name class, still pretty worthless since I don't have spec - in front of me yet... - - - rewrite resolver calls to be thread safe and cleaner by moving to two - class (static) member functions: - - // thread safe routine to lookup ip address given hostname - // return <> 0 on error - static int resolve_to_addr(const char *hostname, in_addr& quad_addr); - - // thread safe routine to lookup name given ip address - // return <> 0 on error - static int resolve_to_hostname(const in_addr& quad_addr, char *hostname) - - * added some interrogation routines to class IpAddress: - is_loopback() const; - - * Ctr64 class: - - added constructor using long long datatype (needs to be made - portable to NT - - * Pdu class: add to_string() - - * Classes added wpdu class: - - a new adpater class between CMU and HP pdu, varbind data structures - - * transaction class: - - implement get/getnext timeout and retry logic using ACE - Reactor class, ACE_Time_Value - -Sat Jul 5 19:13:30 1997 Mike MacFaden (mrm@mrm-ss20) - - * unpacked snmp++.tar.Z into ACE_wrappers, remove X11 support. If - you need GUI support in a communications package, something's - wrong, very wrong.... - - * Change HP-UX Makefiles to use ACE makefile system - - * Change includes to use ACE OS Adaption Layer - - * change all OS calls to use ACE_OS:: versions - - * Add ACE_TRACE macros to all functions. - - * clean up the global namespace by puting all global functions - into C++ classes as static member functions and make public only - those that are used (uxsnmp.cpp, eventlist.cpp) - - * create README from readme.txt, COPYRIGHT files. - - * create tests/ directory rename ConsoleExamples to examples - - * cull out dead code modules and dump them into misc dir: - oidname.cpp, ipresolv.cpp - - * ipresolv.cpp had broken hostname buffer size (200), when DNS has - aways defined a max FQDN as 256...go figure. - - * add General Error handler since existing ones are not very - useful in and of themselves. - - * change all _DEF to DEF_ since _ANYTHING is reserved for compiler - writer namespace, NOT app writer - - * convert cmu code to use C++ new/delete from malloc/free so - entire library uses C++ new constructor diff --git a/ASNMP/Makefile b/ASNMP/Makefile deleted file mode 100644 index dfcb25362d9..00000000000 --- a/ASNMP/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the SNMP+ACE examples directory -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -INFO = README - -DIRS = asnmp \ - examples \ - tests -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU - - -LDLIBS := -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR)) - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ASNMP/README b/ASNMP/README deleted file mode 100644 index f07563c61a5..00000000000 --- a/ASNMP/README +++ /dev/null @@ -1,177 +0,0 @@ -Fri Dec 18 09:43:35 CST 1998 -==================================================================== -ASNMP = ACE+SNMP++ Version 2.1 -By Michael R. MacFaden mrm@acm.org, mrm@yagosys.com -==================================================================== - -What is ASNMP ? ==> ACE+SNMP! aka Another SNMP API - HP's SNMP++ 2.5 freely available C++ SNMP class library - has been adapted to the ACE 4.2 Framework. - -What is Simple Network Management Protocol(SNMP)? - See the FAQ: - http://www.snmp.com/FAQs/snmp-faq-part1.txt - http://www.snmp.com/FAQs/snmp-faq-part2.txt - - -What was changed from HP version? - See src/ChangeLog file. - -Is HP SNMP++ compatible with ASNMP? - It is neither source nor binary compatible. About 10% of the API has changed. - There have been API changes to make the interface more orthogonal - and to reduce implementation complexity such as consolidating constructors - with default formal values, and to remove some inconsistencies - with the HP interface as well as locking down valid() semantics, etc. - -What platforms have the test programs been verified on? - Solaris 2.4, 2.5.1 using SUN C++ 4.1,4.2 compiler. Linux/GCC - fixes are now in as well. - -Why use this version? - The SNMP++ version ships only for HP-UX and for Windows. - It is not very portable nor does it do a good job at checking - for out of memory exhaustion conditions (asn1.cpp). There is some great - code here. ACE needs an SNMP library to build NM type - communications applications. Hence ASNMP was born in my spare time. - -How does ASNMP differ from SNMP? - Current version uses ACE OS Adaption layer. All memory - allocation is now consistent, uses ACE_NEW(). - Standard ACE Debugging (ACE_TRACE) has been inserted. - ASNMP has less global namespace pollution by moving all non-class - functions into interface classes or made into static locals. - - An agent inteface has been added (asnmp/sagent.h) so both agents - and managers can use this class library. A trivial agent - exists in ASNMP/agent/ - - X11 GUI support removed from this version since this is - not the place to include GUI support in the new world of - multi-threaded apps. - - The async interface does not match the HP implementation. - -How to build this library - Set ACE_ROOT and platform_macros.GNU per ../INSTALL file. - create libasnmp.a, libasnmp.so and then run the tests - -Any Support for ASNMP? - As time permits from the mailing list. - -Where to ask questions? - Please use ace-users@cs.wustl.edu mailing list or mrm@acm.org - -NOTE: Please do not bother Eric Mellquist unless you are using - the original HP version of this library. - -Where can I get the original HP SNMP++? - From ftp://rosegarden.external.hp.com:/pub/snmp++ - -What version of SNMP is fully supported? - SNMP Version 1 (RFC 1155,1157, 1215) - -What about SNMP Version 2c? - V2c is defined in RFC 1901 - 1908 - These bits are added to v1 code in this library: GetBulk PDU, Counter64 - These bits are missing Inform (RFC 1905) - RFC 1903 defined new datatypes using existing SMI via macros. - These should be coded as if they were SMI datatypes to encapsulate - their behavior. V2c hasn't been deployed - -What about SNMP Version 3? - It is looking good for V3, but so far, we're just watching. - http://www.ietf.org/html.charters/snmpv3-charter.html - A C implemenation is now available from UC Davis. - -What copyrights/legal requirements are required when using this code? - See ./COPYRIGHT - -Does this really work? - See tests/ directory for the current test reports (purify/purecov/...). - -How does one Extend an SNMP Agent? - Extending an agent typically means updating the agent source or - using a dynamic link style API. RFC 2257 (AgentX) is the current design - for doing this in a standard way. This hasn't been well formalized yet - so extending an existing agent is still a vendor API thing. - - The agent provided here is a template. A mib compiler and agent - library typically provide better agent support. See the UC-Davis - SNMP software for an example Agent that is portable and can report - on many flavors of UNIX and Windows. - -Any Future Plans? - The ASNMP library will be improved for performance and made to use - higher level design patterns. Hopefully it will be used as a - vehicle for grad students to learn something about network mgmt - code work a related cousin of general distributed programming. - - -Regards, -Michael R. MacFaden -Member of the Technical Staff -Cabletron Systems, Inc. -215 Moffet Park Drive -Sunnyvale, CA 94089 -mrm@yagosys.com -http://www.yagosys.com - -==================================================================== -SNMP++ For UNIX Source Code and Examples: -==================================================================== -Included within this package can be found the source code and -examples for SNMP++. The following represents the directories which -are included within the compressed tar file and their contents. - -For more details on the API , please refer to the API specification. - -This library is a complete implementation of SNMP++ and does not -require other SNMP libraries to be present. - -Required Tools: ---------------------------------------------------------------------- - - -readme.txt ( this file) -| -| -|------ src ( .cpp files and Makefile for building libraries ) -| -|------ examples ( a variety of apps, .cpp and Makefile included ) -| -|------ tests - unit test routines - - -src Directory Contents: --------------------------------------------------------------------- -Makefile - make file for ACE/Solaris 2. build -target.cpp - Collection of attributes(address, timeout, etc) used - to define a command session -snmp.cpp - A logical session between NM app and agent -pdu.cpp - Pdu class source (vb list and API command) -wpdu.cpp - Adapter pattern based class between CMU and HP code -transaction.cpp - synchronous transaction clss -vb.cpp - Variable Binding class source (oid + value) - -<< SMI datatypes used to get/set values in SNMPv1 agents >> - -address.cpp - Address class source -gauge.cpp - Gauge32 class source -integer.cpp - Integer32 class source -counter.cpp - Counter32 class source -ctr64.cpp - Counter64 class source -timetick.cpp - TimeTicks class source -octet.cpp - Octet String class source -oid.cpp - Oid class source -asn1.cpp - ASN1 encoding and decoding code. CMU code. - -examples Directory Contents: ---------------------------------------------------------------------- -Makefile - make file for building console apps -get.cpp - source for SNMP get program -next.cpp - source for SNMP get Next program -set.cpp - source for SNMP set program -trap.cpp - source for SNMP trap send program -walk.cpp - source for SNMP walk program - diff --git a/ASNMP/TO-DO b/ASNMP/TO-DO deleted file mode 100644 index a05b7106f58..00000000000 --- a/ASNMP/TO-DO +++ /dev/null @@ -1,3 +0,0 @@ -TODO: - - Attempt to make all subroutines thread safe - - work on test suite - validate basic stuff doesn't leak diff --git a/ASNMP/agent/Makefile b/ASNMP/agent/Makefile deleted file mode 100644 index 4c2fba1d9b5..00000000000 --- a/ASNMP/agent/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -#---------------------------------------------------------------------------- -# -# $Id$ -# -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -BIN = agent - -SRC = agent_impl.cpp main.cpp snmp_agent.cpp - -LIBS += -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- -CPPFLAGS += -I$(ACE_ROOT)/ASNMP - -BIN = agent - -all: $(BIN) - -agent: $(addprefix $(VDIR),agent_impl.o main.o snmp_agent.o) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ASNMP/agent/agent_impl.cpp b/ASNMP/agent/agent_impl.cpp deleted file mode 100644 index 0c3f8da4078..00000000000 --- a/ASNMP/agent/agent_impl.cpp +++ /dev/null @@ -1,157 +0,0 @@ -// $Id$ - -// implement a prototype SNMP Agent using ASNMP and ACE - -#include -#include -#include - -#include "agent_impl.h" - -ACE_RCSID(agent, agent_impl, "$Id$") - -agent_impl::agent_impl(unsigned short port, const char *rd, const char *wr) : -sagent(port) -{ - ACE_TRACE("agent_impl::agent_impl"); - tgt_.set_read_community(rd); - tgt_.set_write_community(wr); - agent_clock_.start(); -} - -agent_impl::~agent_impl() -{ - ACE_TRACE("agent_impl::~agent_impl"); -} - -// callback : have received a Pdu from the target host with given read comm str -// this is really simplistic, but gives the general idea -int agent_impl::handle_get( Pdu &pdu, UdpTarget &target) -{ - ACE_TRACE("agent_impl::handle_get"); - OctetStr mgr_rd_str, agent_rd_str; - target.get_read_community(mgr_rd_str); // requster's read community string - tgt_.get_read_community(agent_rd_str); // this agent's read community string - - // 1. verify we have a valid read string else drop pdu (no response to caller) - if (mgr_rd_str != agent_rd_str) { - ACE_DEBUG((LM_DEBUG, "agent_impl::handle_get: invalid read community recvd\n")); - return 0; - } - - // 2. iterate over each varbind in the pdu, filling providing responses - int fdone = 0; - for (int i = 0; (i < pdu.get_vb_count()) && !fdone; i++) { - Vb vb; - pdu.get_vb(vb, i); - if (get_response(vb)) { // set a value for the oid if we can else - set_error_status(&pdu, SNMP_ERROR_NO_SUCH_NAME); // these ought to be member - set_error_index(&pdu, i); // functions but are not yet... - fdone++; // trigger flag to exit loop early - } - else // failed, return noSuch error - pdu.set_vb(vb, i); - } - - // 3. lastly, return the pkt to the caller - return respond(pdu, target); -} - -// this routine makes up the brains of the agent -// it knows only the MIB II system group set of variables for a get operation -int agent_impl::get_response(Vb& vb) -{ - // these objects represent the MIB II system group per RFC 1213 - static Oid sysDescr("1.3.6.1.2.1.1.1.0"), - sysObjectID("1.3.6.1.2.1.1.2.0"), sysUpTime("1.3.6.1.2.1.1.3.0"), - sysContact("1.3.6.1.2.1.1.4.0"), sysName("1.3.6.1.2.1.1.5.0"), - sysLocation("1.3.6.1.2.1.1.6.0"), sysServices("1.3.6.1.2.1.1.7.0"); - - Oid oid; - vb.get_oid(oid); - if (oid == sysDescr) { - OctetStr desc("ASNMP Prototype Agent 1.0"); - vb.set_value(desc); - } - else if (oid == sysObjectID) { // the IANA gives assigns Enterprise Numbers - // see ftp://ftp.isi.edu/in-notes/iana/assignments/enterprise-numbers - // for the official list of enterprise numbers. Then under this tree - // assign a unique subtree to identify this agent - Oid id("1.3.6.1.4.1.2533.9.1"); - vb.set_value(id); - } - else if (oid == sysUpTime) { - ACE_Time_Value tv; - agent_clock_.elapsed_time (tv); - TimeTicks tt(tv.msec()); - vb.set_value(tt); - } - else if (oid == sysContact) { - OctetStr contact("mrm@acm.org"); - vb.set_value(contact); - } - else if (oid == sysName) { - OctetStr fqdn("foo.org"); // extract this from the gethostbyname() TODO - vb.set_value(fqdn); - } - else if (oid == sysLocation) { - OctetStr loc(""); - vb.set_value(loc); - } - else if (oid == sysServices) { - SnmpInt32 svcs(72); - vb.set_value(svcs); - } - else - return 1; // noSuchName - - return 0; -} - -int agent_impl::handle_get_next( Pdu &pdu, UdpTarget &target) -{ - ACE_TRACE("agent_impl::handle_get_next -NI"); - return 0; -} - -int agent_impl::handle_set( Pdu &pdu, UdpTarget &target) -{ - ACE_TRACE("agent_impl::handle_set -NI"); - return 0; -} - -// stuff used by process_requests - -// called when SIGINT -static sig_atomic_t finished = 0; - -extern "C" void -sig_handler (int) -{ - ACE_TRACE("::sig_handler"); - finished = 1; -} - -int agent_impl::process_requests() -{ - ACE_TRACE("agent_impl::process_requests"); - ACE_Reactor reactor; - - ACE_Sig_Action sa ((ACE_SignalHandler) sig_handler, SIGINT); - ACE_UNUSED_ARG (sa); - - // Read data from other side. - if (reactor.register_handler (this, ACE_Event_Handler::READ_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "ACE_Reactor::register_handler"), -1); - - // TODO: register signal handler to shut down gracefully here - - while (!finished) - { - reactor.handle_events (); - ACE_DEBUG ((LM_DEBUG, "return from handle events\n")); - } - - ACE_DEBUG ((LM_DEBUG, "return from handle events - normal shut down\n")); - return 0; -} diff --git a/ASNMP/agent/agent_impl.h b/ASNMP/agent/agent_impl.h deleted file mode 100644 index 60ee90034a2..00000000000 --- a/ASNMP/agent/agent_impl.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ASNMP -// -// = FILENAME -// agent_impl.h -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ - -#ifndef AGENT_IMPL_H -#define AGENT_IMPL_H - -#include -#include -#include -#include -#include -#include - -class agent_impl : public sagent -{ -public: - agent_impl(unsigned short port, const char *rd, const char *wr); - virtual ~agent_impl(); - - virtual int handle_get( Pdu &pdu, UdpTarget &target); - // retrieve data from a peer agent for a given list of oid values - - virtual int handle_get_next( Pdu &pdu, UdpTarget &target); - // retrieve data lexically adjacent to the oids specified in the pdu - // from the peer agent - - virtual int handle_set( Pdu &pdu, UdpTarget &target); - // set data in the agent from the list of oids in the pdu - - int process_requests(); - // main loop here using a reactor object - -private: - UdpTarget tgt_; // this agent's read, write community strings - int get_response(Vb& vb); // set values for a "get" cmd - ACE_High_Res_Timer agent_clock_; // agent "uptime" ticks reported in 1/100 second -}; - -#endif /* AGENT_IMPL_H */ diff --git a/ASNMP/agent/main.cpp b/ASNMP/agent/main.cpp deleted file mode 100644 index c9ae175d04b..00000000000 --- a/ASNMP/agent/main.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// $Id$ - -// This server daemon processes SNMP Version 1 get, get-next, and set -// commands. over the MIB II "System" group only. - -#include "ace/config-all.h" -#include "snmp_agent.h" - -ACE_RCSID(agent, main, "$Id$") - -int -main (int argc, char *argv[]) -{ - ACE::init (); - snmp_agent the_agent; - - if (the_agent.set_args(argc, argv)) - return 1; - - if (!the_agent.valid()) { - return 1; - } - - the_agent.run(); // main loop - - return 0; -} diff --git a/ASNMP/agent/snmp_agent.cpp b/ASNMP/agent/snmp_agent.cpp deleted file mode 100644 index 43a5342a3ec..00000000000 --- a/ASNMP/agent/snmp_agent.cpp +++ /dev/null @@ -1,96 +0,0 @@ -// $Id$ - -// This server daemon processes SNMPv1 requests over MIB II System group - -#include "snmp_agent.h" -#include "agent_impl.h" // actual implementation -#include "ace/Get_Opt.h" -#include "ace/Reactor.h" - -ACE_RCSID(agent, snmp_agent, "$Id$") - -// module globals -#define SNMP_AGENT_PORT (161) -#define WR_COM ("private") -#define RD_COM ("public") - -snmp_agent::snmp_agent() : agent_(0) -{ - ACE_TRACE("snmp_agent::snmp_agent"); -} - -snmp_agent::~snmp_agent() -{ - ACE_TRACE("snmp_agent::~snmp_agent"); - delete agent_; -} - - -int snmp_agent::valid() const -{ - ACE_TRACE("snmp_agent::valid"); - return (agent_ != 0); -} - -int snmp_agent::set_args(int argc, char *argv[]) -{ - ACE_TRACE("snmp_agent::set_args"); - unsigned short port = SNMP_AGENT_PORT; - char *rd = RD_COM, *wr = WR_COM; - - ACE_Get_Opt get_opt (argc, argv, "p:w:r:hv"); - for (int c; (c = get_opt ()) != -1; ) { - switch (c) - { - case 'p': - port = (ACE_OS::atoi (get_opt.optarg)); - break; - case 'w': // write community string - wr = get_opt.optarg; - break; - case 'r': // read community string - rd = get_opt.optarg; - break; - - case 'h': // help & version info - case 'v': - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Example SNMP Version 1 Agent - ASNMP/ACE\n")); - return -1; - break; - - default: - return -1; // invalid arg - } - } - - - agent_ = new agent_impl(port, rd, wr); // opens OS IO port - return 0; -} - -int snmp_agent::run() -{ - ACE_TRACE("snmp_agent::run"); - ACE_ASSERT(agent_); - - // open service port -#if 0 - if (agent_->open_port()) { - ACE_DEBUG((LM_DEBUG, "(%P|%t) open port %d failed\n", agent_->get_port())); - return -1; - } -#endif - - // Run forever, processing SNMP requests. - - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) starting up snmp agent (server) daemon\n")); - - agent_->process_requests(); - - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) shutting down snmp agent (server) daemon\n")); - return 0; -} - diff --git a/ASNMP/agent/snmp_agent.h b/ASNMP/agent/snmp_agent.h deleted file mode 100644 index a7fc4c42de8..00000000000 --- a/ASNMP/agent/snmp_agent.h +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -/* -*-C++-*- */ - -#ifndef SNMP_AGENT_ -#define SNMP_AGENT_ -// ============================================================================ -// -// = LIBRARY -// ASNMP -// -// = FILENAME -// snmp_agent.h -// -// = AUTHOR -// Michael R. MacFaden (mrm@cisco.com) -// -// ============================================================================ - -class agent_impl; - -class snmp_agent { - // = TITLE - // An SNMP v1 agent class - // - // = DESCRIPTION - // Contructs agents that are capable of processing SNMPv1 requests - // over the MIB II System group - - public: - snmp_agent(); // uses port 161, public, private - ~snmp_agent(); - - int valid() const; - // did object construct ok - - int set_args(int argc, char *argv[]); - // runtime arguments such as community strings, port to use - - int run(); - // begin processing requests - - private: - snmp_agent(const snmp_agent&); - agent_impl *agent_; -}; - -#endif // SNMP_AGENT_ diff --git a/ASNMP/asnmp-overview.html b/ASNMP/asnmp-overview.html deleted file mode 100644 index 4e336178b0d..00000000000 --- a/ASNMP/asnmp-overview.html +++ /dev/null @@ -1,134 +0,0 @@ - - - -ASNMP Overview - -

ASNMP Overview

- -

The Another SNMP class library is an Object Oriented programming -toolkit for using IETF standard network management protocols in the -Internet. The SNMP protocol is perhaps the most ubiquitous management -protocol running on most very device or application deployed in the -modern network today. - -

ASNMP is targeted to programmers that want to write command and -control (C&C) applications. C&C Applications communicate with -a variety of objects: - -

  • network devices such as ATM switches, Internet routers, -LAN bridges and LAN printers -
  • Routing protocols such as OSPF -
  • database servers such as ORACLE or Informix. - -

    ASNMP Version 1 implements a blocking SNMP Version 1 with some -Version 2c additions (Counter32, Counter64 SMI values). See -SNMP Version 1 as defined in the IETF Request for Comments (RFC) - -

  • 1155 -
  • 1157 -
  • 1213 -
  • 1215 - -

    Also see the RFC 1902 spec for new SMI datatypes such as Counter64. - -

    ASNMP is built using the CMU SNMP and HP SNMP++ as the base -classes then modified for use in the ACE framework. About 10% of the API -changed during code rework. See ASNMP/asnmp/ChangeLog for details. - -

    ASNMP can be used for either manager applications or agent applications. -The Snmp class contains the interface for manager applications. The -sagent class contains the interface for agent applications. A -trivial agent that implements the mib II system group per rfc1213 is -in the agents/ directory. - -

    Class Heirarchy

    - -
    -UdpTarget - Defines a collection of attributes needed to define a 
    -             communications session with an SNMP agent 
    -            This includes  network address, response timeout, etc.
    -  
    -Snmp - A logical session between NM app and agent. Provides the
    -       commands get, get_next, trap. Manages transactions between app and 
    -       server.
    -
    -Pdu  - A container object that represents an SNMP Protocol Data Unit.
    -       A Pdu contains a command (get,getnext,trap) Varbind List list, 
    -       a community string.
    -
    -Vb   - Aka Varbind or Variable Binding.  A pdu can have zero, 
    -       one or more of these. A Vb consists of an Oid to identify 
    -       the variable and a value corresponding to  one of the SMI values. 
    -       The oid/value binding is defined in a MIB file (RFC 1155)
    -       Agents hava a MIB file that defines what each variable means.
    -       Most agents implement MIB II as defined in RFC 1156.        
    -
    -

    The Structure of Managment Information (SMI) datatypes -and related types are: -

      -
    • Address->IpAddress->UdpAddress as well as MAC, IPX, IPXSOCK, Netbios -
    • Unsigned Integer -
    • Gauge32 -
    • Integer32 -
    • Counter32 -
    • Counter64 -
    • TimeTicks -
    • OctetStr -
    • Oid -
    - -
    - -

    Sample program

    -

    A sample Object to get obtain an Agent's Systems' Description -given an network address and a community string. - -class system_id { - public: - system_id(UdpAddress addr, OctetStr read_community_string) - { - UdpTarget tgt; - Snmp snmp; - Pdu pdu; - Oid oid("1.3.6.1.2.1.1.1.0"); - Vb vb(oid); - tgt.set_address(addr); - tgt.set_read_community(read_community_string); - pdu += vb; - - if (snmp.get(pdu, tgt) == 0) { - pdu.get_vb(vb, 0); - vb.get_value(desc_); - } - else - desc_ = "" - } - - int get_description(OctetStr& description) { - description = desc_; - return 0; - } - -private: - OctetStr desc_; -}; - -

    Future Directions

    -

    Here are some areas for further work - -

  • Add OO mib parser and mib code generator -
  • Collapse the CMU/HP code into one set of classes. -
  • Add full V2c support. -
  • Size/Speed improvements - - -

    References

    - - diff --git a/ASNMP/asnmp/ChangeLog b/ASNMP/asnmp/ChangeLog deleted file mode 100644 index af4c2469745..00000000000 --- a/ASNMP/asnmp/ChangeLog +++ /dev/null @@ -1,161 +0,0 @@ -Tue Mar 16 16:28:14 1999 David L. Levine - - * address.cpp, address.h, asn1.cpp, asn1.h, counter.cpp, ctr64.cpp, - gauge.cpp, integer.cpp, octet.cpp, oid.cpp, pdu.cpp, sagent.cpp, - snmp.cpp, target.cpp, timetick.cpp, transaction.cpp, vb.cpp, - wpdu.cpp: - replaced TRUE with 1, and FALSE and NULL with 0. Thanks to - Achint Sandhu for reporting that - TRUE and FALSE weren't define on his Linux platform. - - * wpdu.cpp (set_trap_info): wrapped condition with () to - avoid g++ warning about using result of an assignment as - the condition. - - * ctr64.cpp: made MAX64 unsigned, to avoid warning about it - being to big to be signed. - -Wed Jul 15 20:27:23 1998 Mike MacFaden - * asn1.cpp - Hien Nguyen fixed these bugs: - - Problem: The V1 trap agent-addr field tag value is OCTET STRING - instead of IPADDRESS, and the time stamp field tag value is INTEGER - instead of TIME TICKS. - - Fix: Change cmu_snmp::build() to pass in the correct type for agent-addr - and time stamp. - - 2. Problem: The V1 trap enterprise OID is corrupted after is was set in - wpdu constructor. - - Fix: In wpdu::set_trap_info(), the raw_pdu enterprise OID pointer was - assigned to the raw data of an enterprise Oid object on the stack. - Changed to perform an ACE_NEW_RETURN on the raw_pdu->enterprise and - perform a memcpy to copy the OID. The allocated memory is freed in - cmu_snmp::free_pdu() as currently implemented. - - 3. The V1 trap agent-addr field is currently initialized to "0.0.0.0". - I changed wpdu::set_trap_info to initialize it to the local host IP - Address. - - 4. I noticed that the memory allocation for OID in asn1.cpp using - ACE_NEW consistently use (OID length * size(oid)) as the size. - Shouldn't it be simply OID length ? Since there are numerous instances - of this usage in asn1.cpp, I have not fixed those. If you can double - check and fix these, I appreciate it. - - -Wed Aug 20 15:11:23 1997 Mike MacFaden - - * rebuilt Makefile using g++dep - - * pdu.h pdu.cpp initialization errors fixed - - * address.h address.cpp IpAddress::to_octet() added - -Fri Aug 1 19:23:52 1997 Mike MacFaden (mrm@mrm-ss20) - - * NOTES: This first version only tested on Solaris 2.5 - - * review classes for thread safety. Current thread design only - allows for one thread to safely access any ASNMP object created. - - * run purify test of get routine no -memory leaks. - - * verify both shared archive/static archive types work with - example programs - - * << Globals Changes >> - - * tested only archiver library version - - * reformat code to use one brace style. - - * changed all manifest constants defined as _XX to XX_ to stay out - of compiler namespace - - * change all OS calls to use ACE_OS:: portability layer, #include - - - * reformat code to use one consistent brace layout and redo - header using ACE - - * remove semicolons on member functions foo{}; - not necessary - - * make get() methods const member functions - - * removed unnecessary casts that looked like this: and revamped - all memory allocations via ACE_NEW macro - - new_oid = (SmiLPUINT32) new unsigned long [ smival.value.oid.len - - To - - ACE_NEW(new_oid, SmiUINT32[ smival.value.oid.len]) - - * Collapsed default constructors with constructors to constructors - with default arguments. - - * removed unused #include - - * Added ACE_TRACE() to classes - - * change get_printable() to to_string() - there will be more java - programmers in the future so this should be the first step... - - * removed ASYNC interface till it can be rebuilt using ACE patterns - - * Attempt to make interface more type strict but leaving generic - interfaces as escape hatch. Example: CTarget becomes UdpTarget - for UDP/IP based agents. - - * << Class Specific Changes >> - - * Oid class: - - remove char * routines, simplify class - - added suboid method and removed get_printable() overloads - - * CTarget class: - - renamed to UdpTarget. Stay out of Microsoft Namespace per MSJ - Article by Allen Hollub. - - * Varbind class: - - remove generic set_value for char,int, etc. Too easy to get - this wrong. Allow just types defined. - - added overload for equality operator (==) - - added new constructor to allow setting full vb state oid,value, exception - - add to_string() - - * Address class: - - change manifest constants to enums for address lengths, add IP V6 lens - - - add a netbios name class, still pretty worthless since I don't have spec - in front of me yet... - - - rewrite resolver calls to be thread safe and cleaner by moving to two - class (static) member functions: - - // thread safe routine to lookup ip address given hostname - // return <> 0 on error - static int resolve_to_addr(const char *hostname, in_addr& quad_addr); - - // thread safe routine to lookup name given ip address - // return <> 0 on error - static int resolve_to_hostname(const in_addr& quad_addr, char *hostname) - - * added some interrogation routines to class IpAddress: - is_loopback() const; - - * Ctr64 class: - - added constructor using long long datatype (needs to be made - portable to NT - - * Pdu class: add to_string() - - * Classes added wpdu class: - - a new adpater class between CMU and HP pdu, varbind data structures - - * transaction class: - - implement get/getnext timeout and retry logic using ACE - Reactor class, ACE_Time_Value - diff --git a/ASNMP/asnmp/Makefile b/ASNMP/asnmp/Makefile deleted file mode 100644 index aabe678368a..00000000000 --- a/ASNMP/asnmp/Makefile +++ /dev/null @@ -1,1028 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the SNMP+ACE Release -#---------------------------------------------------------------------------- - -MAKEFILE = Makefile -LIB = libasnmp.a -SHLIB = libasnmp.$(SOEXT) - -FILES = address \ - asn1 \ - counter \ - ctr64 \ - gauge \ - integer \ - octet \ - oid \ - pdu \ - snmp \ - target \ - timetick \ - transaction \ - vb \ - wpdu \ - sagent - -TEMPLATE_FILES = - -DEFS = $(addsuffix .h,$(FILES)) -DEFS += $(addsuffix .i,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) -#LSRC2 = $(addsuffix .cpp,$(TEMPLATE_FILES)) - -#### Build the SNMP++ shared library _before_ the static library. -#### This works around an apparent problem with template -#### instantiation with Sun C++ 4.1 and 4.2 (the symptom is link -#### error due to ACE_TimeValue::normalize () not being found). -BUILD = $(VSHLIB) $(SHLIBA) $(VLIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -CCFLAGS += -I$(ACE_ROOT)/ASNMP/ -# For make depend: -CPPFLAGS += -I$(ACE_ROOT)/ASNMP - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/address.o .obj/address.so .shobj/address.o .shobj/address.so: address.cpp \ - address.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - smival.h \ - smi.h \ - octet.h - -.obj/asn1.o .obj/asn1.so .shobj/asn1.o .shobj/asn1.so: asn1.cpp \ - asn1.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - snmp.h \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - oid.h \ - smival.h \ - smi.h \ - vb.h \ - snmperrs.h \ - timetick.h \ - integer.h \ - counter.h \ - gauge.h \ - ctr64.h \ - octet.h \ - address.h \ - target.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - pdu.h \ - transaction_result.h - -.obj/counter.o .obj/counter.so .shobj/counter.o .shobj/counter.so: counter.cpp \ - counter.h \ - smival.h \ - smi.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - integer.h - -.obj/ctr64.o .obj/ctr64.so .shobj/ctr64.o .shobj/ctr64.so: ctr64.cpp \ - ctr64.h \ - smival.h \ - smi.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i - -.obj/gauge.o .obj/gauge.so .shobj/gauge.o .shobj/gauge.so: gauge.cpp \ - gauge.h \ - integer.h \ - smival.h \ - smi.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i - -.obj/integer.o .obj/integer.so .shobj/integer.o .shobj/integer.so: integer.cpp \ - integer.h \ - smival.h \ - smi.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i - -.obj/octet.o .obj/octet.so .shobj/octet.o .shobj/octet.so: octet.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - octet.h \ - smival.h \ - smi.h - -.obj/oid.o .obj/oid.so .shobj/oid.o .shobj/oid.so: oid.cpp \ - oid.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - smival.h \ - smi.h - -.obj/pdu.o .obj/pdu.so .shobj/pdu.o .shobj/pdu.so: pdu.cpp \ - snmp.h \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - oid.h \ - smival.h \ - smi.h \ - vb.h \ - snmperrs.h \ - timetick.h \ - integer.h \ - counter.h \ - gauge.h \ - ctr64.h \ - octet.h \ - address.h \ - target.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - pdu.h \ - transaction_result.h - -.obj/snmp.o .obj/snmp.so .shobj/snmp.o .shobj/snmp.so: snmp.cpp \ - snmp.h \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - oid.h \ - smival.h \ - smi.h \ - vb.h \ - snmperrs.h \ - timetick.h \ - integer.h \ - counter.h \ - gauge.h \ - ctr64.h \ - octet.h \ - address.h \ - target.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - pdu.h \ - transaction_result.h \ - enttraps.h \ - asn1.h \ - wpdu.h \ - transaction.h - -.obj/target.o .obj/target.so .shobj/target.o .shobj/target.so: target.cpp \ - target.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - address.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - smival.h \ - smi.h \ - octet.h \ - oid.h - -.obj/timetick.o .obj/timetick.so .shobj/timetick.o .shobj/timetick.so: timetick.cpp \ - timetick.h \ - integer.h \ - smival.h \ - smi.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i - -.obj/transaction.o .obj/transaction.so .shobj/transaction.o .shobj/transaction.so: transaction.cpp \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - transaction.h \ - target.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - address.h \ - smival.h \ - smi.h \ - octet.h \ - oid.h \ - pdu.h \ - vb.h \ - snmperrs.h \ - timetick.h \ - integer.h \ - counter.h \ - gauge.h \ - ctr64.h \ - transaction_result.h \ - wpdu.h \ - asn1.h \ - snmp.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i - -.obj/vb.o .obj/vb.so .shobj/vb.o .shobj/vb.so: vb.cpp \ - oid.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - smival.h \ - smi.h \ - vb.h \ - snmperrs.h \ - timetick.h \ - integer.h \ - counter.h \ - gauge.h \ - ctr64.h \ - octet.h \ - address.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl - -.obj/wpdu.o .obj/wpdu.so .shobj/wpdu.o .shobj/wpdu.so: wpdu.cpp \ - wpdu.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - asn1.h \ - snmp.h \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - oid.h \ - smival.h \ - smi.h \ - vb.h \ - snmperrs.h \ - timetick.h \ - integer.h \ - counter.h \ - gauge.h \ - ctr64.h \ - octet.h \ - address.h \ - target.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - pdu.h \ - transaction_result.h \ - enttraps.h - -.obj/sagent.o .obj/sagent.so .shobj/sagent.o .shobj/sagent.so: sagent.cpp \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - oid.h \ - smival.h \ - smi.h \ - vb.h \ - snmperrs.h \ - timetick.h \ - integer.h \ - counter.h \ - gauge.h \ - ctr64.h \ - octet.h \ - address.h \ - target.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - pdu.h \ - snmp.h \ - transaction_result.h \ - sagent.h \ - transaction.h \ - wpdu.h \ - asn1.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ASNMP/asnmp/TODO b/ASNMP/asnmp/TODO deleted file mode 100644 index 12beb91406b..00000000000 --- a/ASNMP/asnmp/TODO +++ /dev/null @@ -1,25 +0,0 @@ -This is the todo list aka wish list: feel free to add/implmement -Fri Aug 1 19:40:55 PDT 1997 - -0) collapse CMU and HP code - make this thing faster since it is really - slow and bulky... - -1) implement response time statistics collection so that timeout can vary based - on empirical response times - -2) Implement pdu fragmentation based on tooBig errors or app directed - Snmp::set_pdu_max_size() command - -3) implement async interface - -4) make templatized version to implement sync/nonsync (thread safe version) - -5) add V2c when a real agent is in the field that supports it - -6) Add DISMAN support when IETF approves the Expression Mib - -7) way too many procedural case stmts in the code... - -8) add compare_right() method to be orthogonal to oid class. - - diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp deleted file mode 100644 index 230788e9f67..00000000000 --- a/ASNMP/asnmp/address.cpp +++ /dev/null @@ -1,2686 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// address.cpp -// -// = DESCRIPTION -// The Vb class is an encapsulation of the snmp variable binding. -// This module contains the class definition for the variable binding (VB) -// class. The VB class is an encapsulation of a SNMP VB. A VB object is -// composed of one SNMP++ Oid and one SMI value. The Vb class utilizes Oid -// objects and thus requires the Oid class. To use this class, -// set oid, value then call valid() to be sure object was constructed correctly. -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. - =====================================================================*/ - -#include "asnmp/address.h" - -ACE_RCSID(asnmp, address, "$Id$") - -//================================================================= -//======== Abstract Address Class Implementation ================== -//================================================================= - -// allow destruction of derived classes -Address::~Address() -{ -} - - -//----------------------------------------------------------------- -// is the address object valid? -int Address::valid() const -{ - return valid_flag; -} - -//------------[ Address::trim_white_space( char * ptr) ]------------ -// destructive trim white space -void Address::trim_white_space( char * ptr) -{ - char *tmp; - - tmp = ptr; - // skip leading white space - while (*tmp==' ')tmp++; - ACE_OS::strcpy(ptr,tmp); - - // find end of string - while ((*tmp!=' ') && (*tmp !=0)) tmp++; - if (*tmp!=0) *tmp=0; -} - -//TM: this is not used nor needed, remove? -//-----[ element access ]---------------------------------------------- -unsigned char& Address::operator[]( const int position) -{ - if ( position < MAX_ADDR_SZ) - return address_buffer[ position]; - else - return address_buffer[0]; -} - - -//----------------------------------------------------------------------- -// overloaded equivlence operator, are two addresses equal? -int operator==( const Address &lhs, const Address &rhs) -{ - if ( strcmp( (const char*) lhs, (const char*)rhs)==0) - return 1; - else - return 0; -} - -//----------------------------------------------------------------------- -// overloaded equivlence operator, are two addresses equal? -int operator!=( const Address &lhs, const Address &rhs) -{ - return (!( lhs == rhs)); -} - - -//------------------------------------------------------------------ -// overloaded > operator, is a1 > a2 -int operator>( const Address &lhs, const Address &rhs) -{ - if ( strcmp( (const char*) lhs, (const char*)rhs)>0) - return 1; - else - return 0; -} - -// overloaded >= operator, is a1 > a2 -int operator>=( const Address &lhs,const Address &rhs) -{ - if (( lhs > rhs) || ( lhs == rhs)) - return 1; - else - return 0; -} - -// overloaded < operator, is a1 <= a2 -int operator<=( const Address &lhs,const Address &rhs) -{ - if (( lhs < rhs) || ( lhs == rhs)) - return 1; - else - return 0; - -} - - -//----------------------------------------------------------------- -// overloaded < operator, is a1 < a2 -int operator<( const Address &lhs, const Address &rhs) -{ - if ( strcmp( (const char*) lhs, (const char*)rhs)<0) - return 1; - else - return 0; -} - -//------------------------------------------------------------------ -// equivlence operator overloaded, are an address and a string equal? -int operator==( const Address &lhs,const char *rhs) -{ - if (!rhs && !lhs.valid()) - return 1; - if (strcmp( (const char *) lhs, rhs)== 0) - return 1; - else - return 0; -} - -//------------------------------------------------------------------ -// not equal operator overloaded, are an address and a string not equal? -int operator!=( const Address &lhs,const char *rhs) -{ - return (!( lhs == rhs)); -} - -//------------------------------------------------------------------ -// overloaded > , is a > inaddr -int operator>( const Address &lhs,const char *rhs) -{ - if (!rhs) - return lhs.valid(); // if lhs valid then > 0, else invalid !> 0 - if (strcmp( (const char *) lhs, rhs)> 0) - return 1; - else - return 0; -} - -//------------------------------------------------------------------ -// overloaded >= , is a >= inaddr -int operator>=( const Address &lhs,const char *rhs) -{ - if (!rhs) - return 1; // always >= 0 - if (strcmp( (const char *) lhs, rhs)>= 0) - return 1; - else - return 0; -} - -//----------------------------------------------------------------- -// overloaded < , are an address and a string equal? -int operator<( const Address &lhs,const char *rhs) -{ - if (!rhs) - return 0; // always >= 0 - if (strcmp( (const char *) lhs, rhs)< 0) - return 1; - else - return 0; -} - -//----------------------------------------------------------------- -// overloaded <= , is a <= inaddr -int operator<=( const Address &lhs,const char *rhs) -{ - if (!rhs) - return !lhs.valid(); // invalid == 0, else valid > 0 - if (strcmp( (const char *) lhs, rhs)<= 0) - return 1; - else - return 0; -} - - -//===================================================================== -//============ IPAddress Implementation =============================== -//===================================================================== - -//-----------[ syntax type ]---------------------------------------------- -SmiUINT32 IpAddress::get_syntax() -{ - return sNMP_SYNTAX_IPADDR; -} - -//-----[ IP Address copy constructor ]--------------------------------- -IpAddress::IpAddress(const IpAddress &ipaddr) -{ - // always initialize what type this object is - smival.syntax = sNMP_SYNTAX_IPADDR; - smival.value.string.len =IPV4LEN; - smival.value.string.ptr = address_buffer; - - iv_friendly_name_[0] = 0; - iv_friendly_name_status_ = 0; - valid_flag = ipaddr.valid_flag; - if (valid_flag) { - ACE_OS::memcpy(address_buffer, ipaddr.address_buffer,IPV4LEN); - ACE_OS::strcpy( iv_friendly_name_, ipaddr.iv_friendly_name_); - } - - IpAddress::format_output(); -} - - -//-------[ default construct, an IP address with a string ]--------------------- -IpAddress::IpAddress( const char *inaddr): Address() -{ - // always initialize what type this object is - smival.syntax = sNMP_SYNTAX_IPADDR; - smival.value.string.len = IPV4LEN; - smival.value.string.ptr = address_buffer; - - if (ACE_OS::strlen(inaddr) == 0) { - - valid_flag = 0; - iv_friendly_name_[0] = 0; - iv_friendly_name_status_ = 0; - IpAddress::format_output(); - return; - } - - // parse_address initializes valid, address_buffer & iv_friendly_name_ - valid_flag = parse_address(inaddr); - IpAddress::format_output(); -} - - -//-----[ construct an IP address with a GenAddress ]--------------------- -IpAddress::IpAddress( const GenAddress &genaddr) -{ - // always initialize what type this object is - smival.syntax = sNMP_SYNTAX_IPADDR; - smival.value.string.len = IPV4LEN; - smival.value.string.ptr = address_buffer; - - valid_flag = 0; - iv_friendly_name_[0] = 0; - iv_friendly_name_status_ = 0; - // allow use of an ip or udp genaddress - if (genaddr.get_type() == type_ip) { - valid_flag = genaddr.valid(); - if ( valid_flag) { - // copy in the IP address data - IpAddress temp_ip( (const char *) genaddr); - *this = temp_ip; - } - } - else - if (genaddr.get_type() == type_udp) { - valid_flag = genaddr.valid(); - if ( valid_flag) { - // copy in the IP address data - UdpAddress temp_udp( (const char *) genaddr); - *this = temp_udp; - } - } - IpAddress::format_output(); -} - -//-----[ destructor ]-------------------------------------------------- -IpAddress::~IpAddress() -{ -} - -// assumes member data is word aligned to avoid sigbus -int IpAddress::is_loopback() const -{ - if (valid()) { - return (*(u_long *)&address_buffer == INADDR_LOOPBACK); - } - return 0; -} - -int IpAddress::is_multicast() const -{ - if (valid()) { - return (IN_MULTICAST(*(u_long *)&address_buffer)); - } - return 0; -} - -// Private addressess not are not assignable in the Internet, they are -// defined in RFC 1597 as: 10, 172.16, and 192.168.0 -// Some companies use them internally and apply NAT to allow translation -// instead of paying for ip networks. -// Cisco IOS devices can provide NAT aka Network Address Translation -// but don't expect SNMP based networks to handle cross-NAT address spaces. -// assumes storage in network byte order mrm@cisco.com 7/28/97 - -int IpAddress::is_private() const -{ - if (valid()) { - if (address_buffer[0] == 10) - return 1; - if (address_buffer[0] == 172 && address_buffer[1] == 16) - return 1; - if (address_buffer[0] == 192 && address_buffer[1] == 168 && - address_buffer[2] == 0) - return 1; - } - return 0; -} - - -// convert address into octet string format in network byte order -void IpAddress::to_octet(OctetStr& octet) const -{ - octet.set_data( smival.value.string.ptr, smival.value.string.len); -} - - -int IpAddress::is_broadcast() const -{ - if (valid()) { - return ( (*(u_long *)&address_buffer) & INADDR_BROADCAST); - } - return 0; -} - -//-----[ IP Address general = operator ]------------------------------- -SnmpSyntax& IpAddress::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag = 0; // will get set 1 if really valid - iv_friendly_name_[0]=0; - - if (val.valid()) { - switch (val.get_syntax()) { - case sNMP_SYNTAX_IPADDR: - case sNMP_SYNTAX_OCTETS: - if (((IpAddress &)val).smival.value.string.len ==IPV4LEN) { - ACE_OS::memcpy(address_buffer, - ((IpAddress &)val).smival.value.string.ptr,IPV4LEN); - valid_flag = 1; - } - break; - - // NOTE: as a value add, other types could have "logical" - // mappings, i.e. integer32 and unsigned32 - } - } - IpAddress::format_output(); - return *this; -} - -//------[ assignment to another ipaddress object overloaded ]----------------- -IpAddress& IpAddress::operator=( const IpAddress &ipaddress) -{ - // protect against assignment from itself - if ( this == &ipaddress ) - return *this; - - valid_flag = ipaddress.valid_flag; - iv_friendly_name_[0]=0; - - if (valid_flag) { - ACE_OS::memcpy(address_buffer, ipaddress.address_buffer, IPV4LEN); - ACE_OS::strcpy(iv_friendly_name_, ipaddress.iv_friendly_name_); - } - IpAddress::format_output(); - return *this; -} - - -//--------[ create a new instance of this Value ]----------------------- -SnmpSyntax *IpAddress::clone() const -{ - return (SnmpSyntax *) new IpAddress(*this); -} - -//-------[ return the Fully Qualified Domain Name ]---------------------- -char *IpAddress::resolve_hostname(int &status) -{ - if ((iv_friendly_name_[0] == 0) && valid_flag) - addr_to_friendly(); - status = iv_friendly_name_status_; - return iv_friendly_name_; -} - -// parse a dotted string -int IpAddress::parse_dotted_ipstring( const char *inaddr) -{ - char *ip_token; - int token_count=0; - unsigned int value; - int error_status = 0; - char temp[MAXHOSTNAMELEN +1]; // temp buffer for destruction - int z,w; - - // check len, an ip can never be bigger than 15 - // 123456789012345 - // XXX.XXX.XXX.XXX - if ( !inaddr || (ACE_OS::strlen( inaddr) > 30)) - return 0; - ACE_OS::strcpy( temp, inaddr); - trim_white_space( temp); - if ( ACE_OS::strlen( temp) > 15) - return 0; - - // must only have three dots - // strtok will not catch this ! - char *ptr = temp; - int dot_count = 0; - while ( *ptr != 0) { - if ( *ptr == '.') dot_count++; - ptr++; - } - if ( dot_count != 3) - return 0; - - // look for dot token separator - ip_token = strtok( (char *) temp,"."); - - // while more tokens.. - while ( ip_token != 0) { - // verify that the token is all numerics - w = ACE_OS::strlen( ip_token); - if (w>3) - return 0; - for (z=0;z '9')) - return 0; - - value = ( unsigned int) strtod(ip_token,0); - if (( value > 0)&& ( value <=255)) - address_buffer[token_count] = (unsigned char) value; - else - if ( strcmp(ip_token,"0")==0) - address_buffer[token_count]= (unsigned char) 0; - else - error_status = 1; - token_count++; - ip_token = strtok( 0, "."); - } - - // gota be four in len - if ( token_count != 4) - return 0; - - // any parsing errors? - if ( error_status) - return 0; - - return 1; -} - -//-----[ IP Address parse Address ]--------------------------------- -int IpAddress::parse_address( const char *inaddr) -{ - // parse the input char array - // fill up internal buffer with four ip bytes - // set and return validity flag - - in_addr ipAddr; - char ds[MAXHOSTNAMELEN +1]; - - // intialize the friendly_name member variable - iv_friendly_name_[0] = 0; - iv_friendly_name_status_ = 0; - - // is this a dotted IP notation string or - // a friendly name - if ( parse_dotted_ipstring( inaddr)) { - - // since this is a valid dotted string - // don't do any DNS (Performance!) - return 1; - } - else { - int rc; - if ((rc = resolve_to_address(inaddr, ipAddr)) == 0) { - - // now lets check out the dotted string - ACE_OS::strncpy( ds, ACE_OS::inet_ntoa(ipAddr), MAXHOSTNAMELEN); - - if ( !parse_dotted_ipstring( ds)) - return 0; - - // save the friendly name - ACE_OS::strcpy( iv_friendly_name_, inaddr); - return 1; - - } // end if lookup result - else { - iv_friendly_name_status_ = rc; - return 0; - } - } // end else not a dotted string - return 1; -} - -// using the currently defined address, do a DNS -// and try to fill up the name -int IpAddress::addr_to_friendly() -{ - in_addr ipAddr; - long result = ACE_OS::inet_addr(to_string()); - if (result == -1) - return -1; // expected a dotted quad! - - ipAddr.s_addr = result; - - // set iv_friendly_name_ from ipAddr - if (resolve_to_hostname(ipAddr, iv_friendly_name_) == 0) { - return 0; - } - else { - iv_friendly_name_status_ = h_errno; - return iv_friendly_name_status_; - } -} - -// static aka class member function (1.2.3.4 -> foo.com) -int IpAddress::resolve_to_hostname(const in_addr& quad_addr, char *hostname) -{ - struct hostent lookupResult; - int loc_errno = 0; - ACE_HOSTENT_DATA buffer; - ACE_OS::memset(&lookupResult, 0, sizeof(struct hostent)); - ACE_OS::memset(&buffer, 0, sizeof(ACE_HOSTENT_DATA)); - - // reverse lookup (requires in-addr.arpa to be setup in DNS - if (ACE_OS::gethostbyaddr_r((const char *)&quad_addr.s_addr, IPV4LEN, - AF_INET, &lookupResult, buffer, &loc_errno)) { - - // verify right type of record - if (lookupResult.h_addrtype == AF_INET && - lookupResult.h_length == IPV4LEN) { - ACE_OS::strcpy( hostname, lookupResult.h_name); - // setup multiple entries - return 0; - } - else { - ACE_ASSERT(0); // todo add trace and debug and dump - return -1; // wrong resource record type - } - } - - return loc_errno; -} - -// static aka class member function (foo.com -> 1.2.3.4) -int IpAddress::resolve_to_address(const char *hostname, in_addr& quad_addr) -{ - struct hostent lookupResult; - ACE_HOSTENT_DATA buffer; - ACE_OS::memset(&buffer, 0, sizeof(ACE_HOSTENT_DATA)); - ACE_OS::memset(&lookupResult, 0, sizeof(struct hostent)); - int loc_errno = 0; - if (ACE_OS::gethostbyname_r( hostname, &lookupResult, buffer, &loc_errno)) { - if (lookupResult.h_length == sizeof(in_addr) && - lookupResult.h_addrtype == AF_INET) { - ACE_OS::memcpy((void *) &quad_addr, - (void *) lookupResult.h_addr_list[0], sizeof(in_addr)); - return 0; - } - else - return -1; // wrong address size - } - return loc_errno; -} - -//----[ IP address char * cast ]-------------------------------------- -IpAddress::operator const char *() const -{ - return (char *)output_buffer; -} - -//----[ IP address get char representation ]-------------------------- -char * IpAddress::to_string() -{ - return (char *)output_buffer; -} - -//----[ IP address format output ]------------------------------------ -void IpAddress::format_output() -{ - // if valid format else null it - if ( valid_flag) - ACE_OS::sprintf( (char *) output_buffer,"%d.%d.%d.%d",address_buffer[0], - address_buffer[1], address_buffer[2], address_buffer[3]); - else - output_buffer[0] = 0; -} - -//------[ return the type ]---------------------------------- -addr_type IpAddress::get_type() const -{ - return type_ip; -} - -//----------------------------------------------------------------- -// logically and two IPaddresses and -// return the new one -void IpAddress::mask( const IpAddress& ipaddr) -{ - if ( this->valid() && ipaddr.valid()) { - this->address_buffer[0] = this->address_buffer[0] & ipaddr.address_buffer[0]; - this->address_buffer[1] = this->address_buffer[1] & ipaddr.address_buffer[1]; - this->address_buffer[2] = this->address_buffer[2] & ipaddr.address_buffer[2]; - this->address_buffer[3] = this->address_buffer[3] & ipaddr.address_buffer[3]; - format_output(); - } - -} - -//======================================================================= -//========== DNS Iterator Implementation ================================ -//======================================================================= - - -Address_Iter::Address_Iter(const char *hostname): valid_(0), count_(0), - entry_(0) -{ - ACE_OS::memset(&buffer_, 0, sizeof(ACE_HOSTENT_DATA)); - ACE_OS::memset(&lookupResult_, 0, sizeof(struct hostent)); - if (ACE_OS::inet_addr(hostname) == -1) - valid_ = query_dns(hostname); - else { - ACE_ASSERT(0); // don't support dot-quad lookup yet - } - - // count number of hostnames - int n; - char **pc; - for (n = 0, pc = lookupResult_.h_addr_list; *pc != 0; ++n, ++pc); - count_ = n; // plus first one - entry_ = lookupResult_.h_addr_list; -} - -int Address_Iter::valid() const -{ - return (valid_ == 1); -} - -int Address_Iter::how_many_addresses() -{ - return count_; -} - -// return next entry, rc = 0, if entry is null return 0 -int Address_Iter::next(IpAddress& addr) -{ - if (!entry_ || *entry_ == 0) - return 1; - - IpAddress tmp(*entry_++); // return data - addr = tmp; - if (*entry_ == 0) - return 1; - return 0; -} - -// query DNS here -int Address_Iter::query_dns(const char *hostname) -{ - int loc_errno = 0; - if (ACE_OS::gethostbyname_r( hostname, &lookupResult_, buffer_, - &loc_errno)) { - if (lookupResult_.h_length == sizeof(IPV4LEN) && - lookupResult_.h_addrtype == AF_INET) { - return 0; - } - else - return -1; // wrong address size - } - return loc_errno; -} - -//======================================================================= -//========== Udp Address Implementation ================================= -//======================================================================= - -//-----------[ syntax type ]---------------------------------------------- -SmiUINT32 UdpAddress::get_syntax() -{ - return sNMP_SYNTAX_OCTETS; -} - -//-----------------[ construct an Udp address with another Udp address ]--- -UdpAddress::UdpAddress( const UdpAddress &udpaddr):IpAddress(udpaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = UDPIPV4LEN; - smival.value.string.ptr = address_buffer; - - // Copy the port value - set_port(udpaddr.get_port()); - format_output(); -} - -// default constructor with a dotted string -UdpAddress::UdpAddress( const char *inaddr):IpAddress() -{ - if (ACE_OS::strlen(inaddr) == 0) { - // Inherits IP Address attributes - // Always initialize (override) what type this object is - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = UDPIPV4LEN; - smival.value.string.ptr = address_buffer; - set_port(0); - format_output(); - return; - } - - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = UDPIPV4LEN; - smival.value.string.ptr = address_buffer; - - valid_flag = parse_address( (char *)inaddr); - format_output(); -} - -//-----------------[ construct a UdpAddress from a GenAddress ]-------------- -UdpAddress::UdpAddress( const GenAddress &genaddr):IpAddress() -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = UDPIPV4LEN; - smival.value.string.ptr = address_buffer; - - unsigned int port = 0; - valid_flag = 0; - - // allow use of an ip or udp genaddress - if (genaddr.get_type() == type_udp) - { - valid_flag = genaddr.valid(); - if ( valid_flag) - { - // copy in the IP address data - UdpAddress temp_udp( (const char *) genaddr); - *this = temp_udp; - - // port info since are making an UpAddress - port = temp_udp.get_port(); - } - } - else - if (genaddr.get_type() == type_ip) - { - valid_flag = genaddr.valid(); - if ( valid_flag) - { - // copy in the IP address data - IpAddress temp_ip( (const char *) genaddr); - *this = temp_ip; - } - } - set_port(port); - format_output(); -} - - -//--------[ construct a udp from an IpAddress ]-------------------------- -UdpAddress::UdpAddress( const IpAddress &ipaddr):IpAddress(ipaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = UDPIPV4LEN; - smival.value.string.ptr = address_buffer; - - set_port(0); - format_output(); -} - - -//-----[ destructor ]-------------------------------------------------- -UdpAddress::~UdpAddress() -{ -} - - - // copy an instance of this Value -SnmpSyntax& UdpAddress::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag=0; // will get set 1 if really valid - if (val.valid()){ - switch (val.get_syntax()){ - case sNMP_SYNTAX_IPADDR: - { - UdpAddress temp_udp(val.to_string()); - *this = temp_udp; // valid_flag is set by the udp assignment - } - break; - - case sNMP_SYNTAX_OCTETS: - if (((UdpAddress &)val).smival.value.string.len == UDPIPV4LEN){ - ACE_OS::memcpy(address_buffer, - ((UdpAddress &)val).smival.value.string.ptr, UDPIPV4LEN); - iv_friendly_name_[0] = 0; - valid_flag = 1; - } - break; - - // NOTE: as a value add, other types could have "logical" - // mappings, i.e. integer32 and unsigned32 - } - } - format_output(); - return *this; -} - - // assignment to another UdpAddress object overloaded -UdpAddress& UdpAddress::operator=( const UdpAddress &udpaddr) -{ - // protect against assignment from itself - if ( this == &udpaddr ) - return *this; - - (IpAddress &)*this = udpaddr; // use ancestor assignment for ipaddr value - set_port(udpaddr.get_port()); // copy to port value - format_output(); - return *this; -} - - -//-----[ IP Address parse Address ]--------------------------------- -int UdpAddress::parse_address( const char *inaddr) -{ - char buffer[MAXHOSTNAMELEN +1]; - - unsigned short port = 0; - if (inaddr && (ACE_OS::strlen( inaddr)< MAXHOSTNAMELEN +1)) - ACE_OS::strcpy( buffer, inaddr); - else { - valid_flag = 0; - return 0; - } - // look for port info @ the end of the string - // port can be delineated by a ':' or a '/' - // if neither are present then just treat it - // like a normal IpAddress - char *tmp; - tmp = ACE_OS::strstr( buffer,":"); - if (tmp==0) - tmp = ACE_OS::strstr(buffer,"/"); - - if ( tmp != 0) { - *tmp=0; // null terminator - tmp++; - port = ACE_OS::atoi( tmp); - } - - set_port(port); - return IpAddress::parse_address( buffer); -} - - -//----------[ create a new instance of this Value ]------------------------ -SnmpSyntax *UdpAddress::clone() const -{ - return (SnmpSyntax *) new UdpAddress(*this); -} - -//--------[ set the port number ]--------------------------------------- -void UdpAddress::set_port( const unsigned short p) -{ - unsigned short port_nbo = htons(p); - ACE_OS::memcpy(&address_buffer[IPV4LEN], &port_nbo, 2); - format_output(); -} - -//---------[ get the port number ]-------------------------------------- -unsigned short UdpAddress::get_port() const -{ - if (valid_flag) { - unsigned short port_nbo; - ACE_OS::memcpy(&port_nbo, &address_buffer[IPV4LEN], 2); - return ntohs(port_nbo); - } - else - return 0; // don't use uninitialized memory -} - -//------[ return the type ]-------------------------------------------- -addr_type UdpAddress::get_type() const -{ - return type_udp; -} - -//----[ UDP address char * cast ]-------------------------------------- -UdpAddress::operator const char *() const -{ - return (char *)output_buffer; -} - -//----[ UDP address get char representation ]-------------------------- -char * UdpAddress::to_string() -{ - return (char *)output_buffer; -} - -// make format same as ACE_INET_Addr class (addr:port) -void UdpAddress::format_output() -{ - IpAddress::format_output(); // allow ancestors to format their buffers - - // if valid format else null it - if ( valid_flag) - ACE_OS::sprintf( (char *) output_buffer,"%s:%d", - IpAddress::to_string(), - get_port() ); - else - output_buffer[0] = 0; -} - - -//======================================================================= -//=========== Netbios Address Implementation ============================ -//======================================================================= - -void NetbiosAddress::format_output() -{ - if ( valid_flag) - ACE_OS::memcpy(output_buffer, address_buffer, NETBIOSLEN); - else - output_buffer[0] = 0; -} - -void NetbiosAddress::InitNBAddr(const char *inaddr) -{ - if (ACE_OS::strlen(inaddr) == 0) { - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = NETBIOSLEN; - smival.value.string.ptr = address_buffer; - - valid_flag=0; - NetbiosAddress::format_output(); - return; - } - - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = parse_address( (char *) inaddr); - NetbiosAddress::format_output(); -} - -// TODO: how to handle addresses < 15 chars (zero out or pad with ' ') -NetbiosAddress::NetbiosAddress( const char *inaddr) -{ - InitNBAddr(inaddr); - -} - -NetbiosAddress::NetbiosAddress( const char *inaddr, nb_service svc) -{ - InitNBAddr(inaddr); - address_buffer[15] = svc; -} - -// TODO: go back over ms/ibm specs and verify this -// 16 chars, 15 can be any character, 16th is service number between 0 and 20 -// names beginning with IBM are reserved, and hence invalid -// and doubt IBM would use this class anyway -int NetbiosAddress::parse_address(const char *address) -{ - if (ACE_OS::strlen(address) > NETBIOSLEN) - return 0; // invalid - - if (ACE_OS::strncmp(address, "IBM", 3) == 0) - return 0; // invalid - - // addresses are free form but this check may need to be expose to user - // - //if (address[15] < nb_workstation || address[15] > nb_server) - // return 0; //invalid service type - - ACE_OS::memset(address_buffer, 0, NETBIOSLEN); - ACE_OS::memcpy(address_buffer, address, NETBIOSLEN); - - return 1; // valid -} - -NetbiosAddress::NetbiosAddress( const NetbiosAddress& nbaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = NETBIOSLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = nbaddr.valid_flag; - if (valid_flag) - ACE_OS::memcpy(address_buffer, nbaddr.address_buffer, NETBIOSLEN); - NetbiosAddress::format_output(); -} - -NetbiosAddress::NetbiosAddress( const GenAddress& genaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = NETBIOSLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = 0; - // allow use of an ipx or ipxsock address - if ( (genaddr.get_type() == type_nb) ) { - valid_flag = genaddr.valid(); - if ( valid_flag) { - // copy in the Ipx address data - NetbiosAddress temp_nb( (const char *) genaddr); - *this = temp_nb; - } - } - NetbiosAddress::format_output(); -} - -NetbiosAddress::~NetbiosAddress() -{ -} - -char *NetbiosAddress::to_string() -{ - return (char *)output_buffer; -} - -void NetbiosAddress::to_octet(OctetStr& octet) const -{ - octet.set_data( smival.value.string.ptr, smival.value.string.len); -} - -NetbiosAddress& NetbiosAddress::operator=( const NetbiosAddress &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag = 0; // will set to 1 if really valid - if (val.valid()) { - switch (((NetbiosAddress *) &val)->get_syntax()) { - case sNMP_SYNTAX_OCTETS: - ACE_OS::memcpy(address_buffer, - ((NetbiosAddress &)val).smival.value.string.ptr, NETBIOSLEN); - valid_flag = 1; - break; - } - } - NetbiosAddress::format_output(); - return *this; -} - -nb_service NetbiosAddress::get_service_type() const -{ - return (nb_service) address_buffer[15]; -} - -void NetbiosAddress::set_service_type(nb_service nbservice) -{ - address_buffer[15] = nbservice; - NetbiosAddress::format_output(); -} - -NetbiosAddress::operator const char *() const -{ - return (char *)output_buffer; -} - -SnmpSyntax& NetbiosAddress::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag = 0; // will set to 1 if really valid - if (val.valid()) { - switch (val.get_syntax()) { - case sNMP_SYNTAX_OCTETS: - if (((NetbiosAddress &)val).smival.value.string.len == NETBIOSLEN) { - ACE_OS::memcpy(address_buffer, - ((NetbiosAddress &)val).smival.value.string.ptr, NETBIOSLEN); - valid_flag=1; - } - break; - } - } - NetbiosAddress::format_output(); - return *this; -} - -SnmpSyntax *NetbiosAddress::clone() const -{ - return (SnmpSyntax *) new NetbiosAddress(*this); -} - -SmiUINT32 NetbiosAddress::get_syntax() -{ - return sNMP_SYNTAX_OCTETS; -} - -addr_type NetbiosAddress::get_type() const -{ - return type_nb; -} - -//======================================================================= -//=========== IPX Address Implementation ================================ -//======================================================================= - -//-----------[ syntax type ]---------------------------------------------- -SmiUINT32 IpxAddress::get_syntax() -{ - return sNMP_SYNTAX_OCTETS; -} - - -//----------[ default constructor with a string arg ]--------------------------- -IpxAddress::IpxAddress( const char *inaddr):Address( ) -{ - if (ACE_OS::strlen(inaddr) == 0) { - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXLEN; - smival.value.string.ptr = address_buffer; - - separator = '\0'; - valid_flag=0; - IpxAddress::format_output(); - return; - } - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXLEN; - smival.value.string.ptr = address_buffer; - - separator = '\0'; - valid_flag = parse_address( (char *) inaddr); - IpxAddress::format_output(); -} - - -//-----[ IPX Address copy constructor ]---------------------------------- -IpxAddress::IpxAddress(const IpxAddress &ipxaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXLEN; - smival.value.string.ptr = address_buffer; - - separator = '\0'; - valid_flag = ipxaddr.valid_flag; - if (valid_flag) - ACE_OS::memcpy(address_buffer, ipxaddr.address_buffer, IPXLEN); - IpxAddress::format_output(); -} - - -//----[ construct an IpxAddress from a GenAddress ]--------------------------- -IpxAddress::IpxAddress( const GenAddress &genaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = 0; - // allow use of an ipx or ipxsock address - if ( (genaddr.get_type() == type_ipx) ) { - valid_flag = genaddr.valid(); - if ( valid_flag) { - // copy in the Ipx address data - IpxAddress temp_ipx( (const char *) genaddr); - *this = temp_ipx; - } - } - else - if ( (genaddr.get_type() == type_ipxsock) ) { - valid_flag = genaddr.valid(); - if ( valid_flag) { - // copy in the Ipx address data - IpxSockAddress temp_ipxsock( (const char *) genaddr); - *this = temp_ipxsock; - } - } - IpxAddress::format_output(); -} - - -//-----[ destructor ]-------------------------------------------------- -IpxAddress::~IpxAddress() -{ -} - - -//-----[ IPX Address general = operator ]------------------------------- -SnmpSyntax& IpxAddress::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag=0; // will set to 1 if really valid - if (val.valid()){ - switch (val.get_syntax()){ - case sNMP_SYNTAX_OCTETS: - if (((IpxAddress &)val).smival.value.string.len == IPXLEN){ - ACE_OS::memcpy(address_buffer, ((IpxAddress &)val).smival.value.string.ptr, IPXLEN); - valid_flag=1; - } - break; - } - } - IpxAddress::format_output(); - return *this; -} - -//--------[ assignment to another IpAddress object overloaded ]---------- -IpxAddress& IpxAddress::operator=( const IpxAddress &ipxaddress) -{ - // protect against assignment from itself - if ( this == &ipxaddress ) - return *this; - - valid_flag = ipxaddress.valid_flag; - if (valid_flag) - ACE_OS::memcpy(address_buffer, ipxaddress.address_buffer, IPXLEN); - IpxAddress::format_output(); - return *this; -} - - -// create a new instance of this Value -SnmpSyntax *IpxAddress::clone() const -{ - return (SnmpSyntax *) new IpxAddress(*this); -} - -//-----[ IPX Address parse Address ]----------------------------------- -// Convert a string to a ten byte ipx address -// On success sets validity 1 or 0 -// -// IPX address format -// -// NETWORK ID| MAC ADDRESS -// 01 02 03 04|05 06 07 08 09 10 -// XX XX XX XX|XX XX XX XX XX XX -// -// Valid input format -// -// XXXXXXXX.XXXXXXXXXXXX -// Total length must be 21 -// Must have a separator in it -// First string length must be 8 -// Second string length must be 12 -// Each char must take on value 0-F -// -// -// Input formats recognized -// -// XXXXXXXX.XXXXXXXXXXXX -// XXXXXXXX:XXXXXXXXXXXX -// XXXXXXXX-XXXXXXXXXXXX -// XXXXXXXX.XXXXXX-XXXXXX -// XXXXXXXX:XXXXXX-XXXXXX -// XXXXXXXX-XXXXXX-XXXXXX -int IpxAddress::parse_address( const char *inaddr) -{ - char unsigned *str1,*str2; - char temp[30]; // don't destroy original - char unsigned *tmp; - size_t z, tmplen; - - - // save the orginal source - if (!inaddr || (ACE_OS::strlen( inaddr) >(sizeof(temp)-1))) return 0; - ACE_OS::strcpy( temp, inaddr); - trim_white_space( temp); - tmplen = ACE_OS::strlen(temp); - - // bad total length check - // 123456789012345678901 - // XXXXXXXX-XXXXXXXXXXXX 21 len - // - // XXXXXXXX-XXXXXX-XXXXXX 22 len - // need at least 21 chars and no more than 22 - if ( (tmplen <21) || (tmplen >22)) - return 0; - - // convert the string to all lower case - // this allows hex values to be in upper or lower - for (z=0;z< tmplen;z++) - temp[z] = tolower(temp[z]); - - // check for separated nodeid - // if found remove it - if (temp[15] == '-') - { - for(z=16;z= '0') && (*tmp <= '9'))|| // good 0-9 - ((*tmp >= 'a') && (*tmp <= 'f'))) // or a-f - tmp++; - else - return 0; - - // check out the MAC address - tmp = str2; - while( *tmp != 0) - if (((*tmp >= '0') && (*tmp <= '9'))|| // good 0-9 - ((*tmp >= 'a') && (*tmp <= 'f'))) // or a-f - tmp++; - else - return 0; - - // convert to target string - tmp = str1; - while ( *tmp != 0) - { - if (( *tmp >= '0') && ( *tmp <= '9')) - *tmp = *tmp - (char unsigned )'0'; - else - *tmp = *tmp - (char unsigned) 'a' + (char unsigned) 10; - tmp++; - } - - // network id portion - address_buffer[0] = (str1[0]*16) + str1[1]; - address_buffer[1] = (str1[2]*16) + str1[3]; - address_buffer[2] = (str1[4]*16) + str1[5]; - address_buffer[3] = (str1[6]*16) + str1[7]; - - tmp = str2; - while ( *tmp != 0) - { - if (( *tmp >= '0') && ( *tmp <= '9')) - *tmp = *tmp - (char unsigned) '0'; - else - *tmp = *tmp - (char unsigned) 'a'+ (char unsigned) 10; - tmp++; - } - - address_buffer[4] = (str2[0]*16) + str2[1]; - address_buffer[5] = (str2[2]*16) + str2[3]; - address_buffer[6] = (str2[4]*16) + str2[5]; - address_buffer[7] = (str2[6]*16) + str2[7]; - address_buffer[8] = (str2[8]*16) + str2[9]; - address_buffer[9] = (str2[10]*16) + str2[11]; - - return 1; -} - -//----[ IPX address char * cast ]-------------------------------------- -IpxAddress::operator const char *() const -{ - return (char *)output_buffer; -} - -//----[ IPX address get char representation ]-------------------------- -char * IpxAddress::to_string() -{ - return (char *)output_buffer; -} - - -//----[ IPX address format output ]------------------------------------- -void IpxAddress::format_output() -{ - if ( valid_flag) - ACE_OS::sprintf((char *) output_buffer, - "%02x%02x%02x%02x%c%02x%02x%02x%02x%02x%02x", - address_buffer[0],address_buffer[1], - address_buffer[2],address_buffer[3],'-', - address_buffer[4],address_buffer[5], - address_buffer[6],address_buffer[7], - address_buffer[8],address_buffer[9]); - else - output_buffer[0] = 0; -} - - -// get the host id portion of an ipx address -int IpxAddress::get_hostid( MacAddress& mac) -{ - if ( valid_flag) - { - char buffer[18]; - ACE_OS::sprintf( buffer,"%02x:%02x:%02x:%02x:%02x:%02x", - address_buffer[4], - address_buffer[5], address_buffer[6], address_buffer[7], - address_buffer[8], address_buffer[9]); - MacAddress temp( buffer); - // mac = (SnmpSyntax&) temp; - mac = temp; - if ( mac.valid()) - return 1; - else - return 0; - } - else - return 0; -} - - -//------[ return the type ]---------------------------------- -addr_type IpxAddress::get_type() const -{ - return type_ipx; -} - -void IpxAddress::to_octet(OctetStr& octet) const -{ - octet.set_data( smival.value.string.ptr, smival.value.string.len); -} - - -//======================================================================== -//======== IpxSockAddress Implementation ================================= -//======================================================================== - -//-----------[ syntax type ]---------------------------------------------- -SmiUINT32 IpxSockAddress::get_syntax() -{ - return sNMP_SYNTAX_OCTETS; -} - -//-----------[ construct an IpxSockAddress with another IpxSockAddress]---- -IpxSockAddress::IpxSockAddress( const IpxSockAddress &ipxaddr):IpxAddress(ipxaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXSOCKLEN; - smival.value.string.ptr = address_buffer; - - // copy the socket value - set_socket(ipxaddr.get_socket()); - format_output(); -} - - -//---------------[ default construct a IpxSockAddress ]-------------- -IpxSockAddress::IpxSockAddress( const char *inaddr):IpxAddress() -{ - if (ACE_OS::strlen(inaddr) == 0) { - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXSOCKLEN; - smival.value.string.ptr = address_buffer; - - set_socket(0); - format_output(); - return; - } - - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXSOCKLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = parse_address( (char *) inaddr); - format_output(); -} - - -//---------------[ construct a IpxSockAddress from a GenAddress ]---------- -IpxSockAddress::IpxSockAddress( const GenAddress &genaddr):IpxAddress() -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXSOCKLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = 0; - unsigned short socketid = 0; - // allow use of an ipx or ipxsock address - if ( (genaddr.get_type() == type_ipx) ) - { - valid_flag = genaddr.valid(); - if ( valid_flag) - { - // copy in the Ipx address data - IpxAddress temp_ipx( (const char *) genaddr); - *this = temp_ipx; - } - } - else - if ( (genaddr.get_type() == type_ipxsock) ) - { - valid_flag = genaddr.valid(); - if ( valid_flag) - { - // copy in the Ipx address data - IpxSockAddress temp_ipxsock( (const char *) genaddr); - *this = temp_ipxsock; - // socketid info since are making an IpxSockAddress - socketid = temp_ipxsock.get_socket(); - } - } - set_socket(socketid); - format_output(); -} - - -//------------[ construct an IpxSockAddress from a IpxAddress ]-------------- -IpxSockAddress::IpxSockAddress( const IpxAddress &ipxaddr):IpxAddress(ipxaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = IPXSOCKLEN; - smival.value.string.ptr = address_buffer; - - set_socket(0); - format_output(); -} - -//-----[ destructor ]-------------------------------------------------- -IpxSockAddress::~IpxSockAddress() -{ -} - -// copy an instance of this Value -SnmpSyntax& IpxSockAddress::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag=0; // will set to 1 if really valid - if (val.valid()){ - switch (val.get_syntax()){ - case sNMP_SYNTAX_OCTETS: - { - // See if it is of the Ipx address family - // This handles IpxSockAddress == IpxAddress - IpxSockAddress temp_ipx(val.to_string()); - if (temp_ipx.valid()){ - *this = temp_ipx; // ipxsock = ipxsock - } - // See if it is an OctetStr of appropriate length - else if (((IpxSockAddress &)val).smival.value.string.len == IPXSOCKLEN){ - ACE_OS::memcpy(address_buffer, - ((IpxSockAddress &)val).smival.value.string.ptr, - IPXSOCKLEN); - valid_flag=1; - } - } - break; - } - } - format_output(); - return *this; -} - -// assignment to another IpAddress object overloaded -IpxSockAddress& IpxSockAddress::operator=( const IpxSockAddress &ipxaddr) -{ - // protect against assignment from itself - if ( this == &ipxaddr ) - return *this; - - (IpxAddress&)*this = ipxaddr; // use ancestor assignment for ipx addr - set_socket(ipxaddr.get_socket()); // copy socket value - format_output(); - return *this; -} - - -//----------[ create a new instance of this Value ]------------------------ -SnmpSyntax *IpxSockAddress::clone() const -{ - return (SnmpSyntax *) new IpxSockAddress(*this); -} - -//----[ IPXSock address char * cast ]-------------------------------------- -IpxSockAddress::operator const char *() const -{ - return (char *)output_buffer; -} - -//----[ IPXSock address get char representation ]-------------------------- -char * IpxSockAddress::to_string() -{ - return (char *)output_buffer; -} - -//----[ IPX address format output ]------------------------------------- -void IpxSockAddress::format_output() -{ - IpxAddress::format_output(); // allow ancestors to format their buffers - - if ( valid_flag) - ACE_OS::sprintf((char *) output_buffer,"%s/%d", - IpxAddress::to_string(), get_socket()); - else - output_buffer[0] = 0; -} - -//-----[ IP Address parse Address ]--------------------------------- -int IpxSockAddress::parse_address( const char *inaddr) -{ - char buffer[MAXHOSTNAMELEN +1]; - unsigned short socketid=0; - - if (inaddr && (ACE_OS::strlen( inaddr)< MAXHOSTNAMELEN)) - ACE_OS::strcpy( buffer, inaddr); - else - { - valid_flag = 0; - return 0; - } - // look for port info @ the end of the string - // port can be delineated by a ':' or a '/' - // if neither are present then just treat it - // like a normal IpAddress - char *tmp; - tmp = ACE_OS::strstr( buffer,"/"); - - if (tmp != 0) - { - *tmp=0; // null terminator - tmp++; - socketid = ACE_OS::atoi( tmp); - } - set_socket(socketid); - return IpxAddress::parse_address( buffer); -} - - - -//-------------[ set the socket number ]---------------------------------- -void IpxSockAddress::set_socket( const unsigned short s) -{ - unsigned short sock_nbo = htons(s); - ACE_OS::memcpy(&address_buffer[IPXLEN], &sock_nbo, 2); -} - -//--------------[ get the socket number ]--------------------------------- -unsigned short IpxSockAddress::get_socket() const -{ - if (valid_flag) - { - unsigned short sock_nbo; - ACE_OS::memcpy(&sock_nbo, &address_buffer[IPXLEN], 2); - return ntohs(sock_nbo); - } - else - return 0; // don't use uninitialized memory -} - -//------[ return the type ]---------------------------------------------- -addr_type IpxSockAddress::get_type() const -{ - return type_ipxsock; -} - - -//======================================================================== -//======== MACAddress Implementation ===================================== -//======================================================================== - -//-----------[ syntax type ]---------------------------------------------- -SmiUINT32 MacAddress::get_syntax() -{ - return sNMP_SYNTAX_OCTETS; -} - -//-----[ MAC Address copy constructor ]--------------------------------- -MacAddress::MacAddress(const MacAddress &macaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = MACLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = macaddr.valid_flag; - if (valid_flag) - ACE_OS::memcpy(address_buffer, macaddr.address_buffer, MACLEN); - format_output(); -} - -//---------[ constructor with a string argument ]------------------------- -MacAddress::MacAddress( const char *inaddr):Address( ) -{ - if (ACE_OS::strlen(inaddr) == 0) { - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = MACLEN; - smival.value.string.ptr = address_buffer; - - valid_flag=0; - format_output(); - return; - } - - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = MACLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = parse_address( (char *) inaddr); - format_output(); -} - -//-----[ construct a MacAddress from a GenAddress ]------------------------ -MacAddress::MacAddress( const GenAddress &genaddr) -{ - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = MACLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = 0; - // allow use of mac address - if (genaddr.get_type() == type_mac) - { - valid_flag = genaddr.valid(); - if ( valid_flag) - { - // copy in the Mac address data - MacAddress temp_mac( (const char *) genaddr); - *this = temp_mac; - } - } - format_output(); -} - -//-----[ destructor ]-------------------------------------------------- -MacAddress::~MacAddress() -{ -} - -//---------[ MacAddress clone ]------------------------------------------- -SnmpSyntax *MacAddress::clone() const -{ - return (SnmpSyntax *) new MacAddress(*this); -} - -//------[ assignment to another ipaddress object overloaded ]-------------- -MacAddress& MacAddress::operator=( const MacAddress &macaddress) -{ - // protect against assignment from itself - if ( this == &macaddress ) - return *this; - - valid_flag = macaddress.valid_flag; - if (valid_flag) - ACE_OS::memcpy(address_buffer, macaddress.address_buffer, MACLEN); - format_output(); - return *this; -} - - - -//-----[ MAC Address general = operator ]--------------------------------- -SnmpSyntax& MacAddress::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag=0; // will set to 1 if really valid - if (val.valid()){ - switch (val.get_syntax()){ - case sNMP_SYNTAX_OCTETS: - if (((MacAddress &)val).smival.value.string.len == MACLEN){ - ACE_OS::memcpy(address_buffer, - ((MacAddress &)val).smival.value.string.ptr, MACLEN); - valid_flag=1; - } - break; - } - } - format_output(); - return *this; -} - -//-----[ MAC Address parse Address ]-------------------------------------- -// Convert a string to a six byte MAC address -// On success sets validity 1 or 0 -// -// MAC address format -// -// MAC ADDRESS -// 01 02 03 04 05 06 -// XX:XX:XX:XX:XX:XX -// Valid input format -// -// XXXXXXXXXXXX -// Total length must be 17 -// Each char must take on value 0-F -// -// -int MacAddress::parse_address( const char *inaddr) -{ - char temp[MAXHOSTNAMELEN +1]; // don't destroy original - char unsigned *tmp; - size_t z; - - - // save the orginal source - if ( !inaddr || (ACE_OS::strlen( inaddr) > 30)) return 0; - ACE_OS::strcpy( temp, inaddr); - trim_white_space( temp); - - // bad total length check - if ( ACE_OS::strlen(temp) != 17) - return 0; - - // check for colons - if ((temp[2] != ':')||(temp[5] != ':')||(temp[8]!=':')||(temp[11]!=':') - ||(temp[14] !=':')) - return 0; - - // strip off the colons - tmp = ( unsigned char *) temp; - int i = 0; - while ( *tmp != 0) - { - if (*tmp != ':') - { - temp[i] = *tmp; - i++; - } - tmp++; - } - temp[i] = 0; - - // convert to lower - for(z=0;z= '0') && (*tmp <= '9'))|| // good 0-9 - ((*tmp >= 'a') && (*tmp <= 'f'))) // or a-f - tmp++; - else - return 0; - - // convert to target string - tmp = (unsigned char *) temp; - while ( *tmp != 0) - { - if (( *tmp >= '0') && ( *tmp <= '9')) - *tmp = *tmp - (char unsigned )'0'; - else - *tmp = *tmp - (char unsigned) 'a' + (char unsigned) 10; - tmp++; - } - - address_buffer[0] = (temp[0]*16) + temp[1]; - address_buffer[1] = (temp[2]*16) + temp[3]; - address_buffer[2] = (temp[4]*16) + temp[5]; - address_buffer[3] = (temp[6]*16) + temp[7]; - address_buffer[4] = (temp[8]*16) + temp[9]; - address_buffer[5] = (temp[10]*16) + temp[11]; - - return 1; -} - -//----[ MAC address char * cast ]-------------------------------------- -MacAddress::operator const char *() const -{ - return (char *)output_buffer; -} -//----[ MAC address get char representation ]-------------------------- -char * MacAddress::to_string() -{ - return (char *)output_buffer; -} - -//----[ MAC address format output ]--------------------------------- -void MacAddress::format_output() -{ - if ( valid_flag) - sprintf(output_buffer,"%02x:%02x:%02x:%02x:%02x:%02x",address_buffer[0], - address_buffer[1],address_buffer[2],address_buffer[3], - address_buffer[4],address_buffer[5]); - else - output_buffer[0] = 0; -} - -//------[ return the type ]---------------------------------- -addr_type MacAddress::get_type() const -{ - return type_mac; -} - - -unsigned int MacAddress::hashFunction() const -{ - return ((((address_buffer[0] << 8) + address_buffer[1]) * HASH0) - + (((address_buffer[2] << 8) + address_buffer[3]) * HASH1) - + (((address_buffer[4] << 8) + address_buffer[5]) * HASH2)); -} - -void MacAddress::to_octet(OctetStr& octet) const -{ - octet.set_data( smival.value.string.ptr, smival.value.string.len); -} - -//======================================================================== -//========== Generic Address Implementation ============================== -//======================================================================== - -//-----------[ get the syntax]---------------------------------------------- -SmiUINT32 GenAddress::get_syntax() -{ - if (address != 0) - return address->get_syntax(); - - return sNMP_SYNTAX_NULL; -} - -void GenAddress::init_smi() -{ - smival.syntax = sNMP_SYNTAX_NULL; // to be overridden - smival.value.string.len = 0; // to be overridden - smival.value.string.ptr = address_buffer; // constant -} - -//-----------[ constructor with a string argument ]---------------------- -GenAddress::GenAddress( const char *addr): address(0) -{ - valid_flag = 0; - // initialize SMI info - // BOK: smival is generally not used for GenAddress, but - // we need this to be a replica of the real address' - // smival info so that ::operator=SnmpSyntax - // will work. - init_smi(); - - if (addr && ACE_OS::strlen(addr) == 0) { - format_output(); - return; - } - - parse_address(addr); - - // Copy real address smival info into GenAddr smival - // BOK: smival is generally not used for GenAddress, but - // we need this to be a replica of the real address' - // smival info so that ::operator=SnmpSyntax - // will work. - if ( valid_flag ) { - smival.syntax = ((GenAddress *)address)->smival.syntax; - smival.value.string.len = - ((GenAddress *)address)->smival.value.string.len; - ACE_OS::memcpy(smival.value.string.ptr, - ((GenAddress *)address)->smival.value.string.ptr, - (size_t)smival.value.string.len); - } -} - -//-----------[ constructor with an Address argument ]-------------------- -GenAddress::GenAddress( const Address &addr): address(0) -{ - valid_flag = 0; - - // initialize SMI info - // BOK: this is generally not used for GenAddress, - // but we need this to be a replica of the real address' - // smival info so that operator=SnmpSyntax will work. - init_smi(); - // make sure that the object is valid - if (!addr.valid()) { - format_output(); - return; - } - - address = (Address*)addr.clone(); - if (address) - valid_flag = address->valid(); - - // Copy real address smival info into GenAddr smival - // BOK: smival is generally not used for GenAddress, but - // we need this to be a replica of the real address' - // smival info so that ::operator=SnmpSyntax - // will work. - if ( valid_flag ) { - smival.syntax = address->get_syntax(); - smival.value.string.len = - ((GenAddress *)address)->smival.value.string.len; - ACE_OS::memcpy(smival.value.string.ptr, - ((GenAddress *)address)->smival.value.string.ptr, - (size_t)smival.value.string.len); - } - - format_output(); -} - -//-----------------[ constructor with another GenAddress object ]------------- -GenAddress::GenAddress( const GenAddress &addr): address(0) -{ - valid_flag = 0; - - // initialize SMI info - // BOK: this is generally not used for GenAddress, - // but we need this to be a replica of the real address' - // smival info so that operator=SnmpSyntax will work. - init_smi(); - - // make sure that the object is valid - if (!addr.valid_flag) { - format_output(); - return; - } - - address = (Address *)addr.address->clone(); - if (address) - valid_flag = address->valid(); - - // Copy real address smival info into GenAddr smival - // BOK: smival is generally not used for GenAddress, but - // we need this to be a replica of the real address' - // smival info so that ::operator=SnmpSyntax - // will work. - if ( valid_flag ) { - smival.syntax = ((GenAddress *)address)->smival.syntax; - smival.value.string.len = - ((GenAddress *)address)->smival.value.string.len; - ACE_OS::memcpy(smival.value.string.ptr, - ((GenAddress *)address)->smival.value.string.ptr, - (size_t)smival.value.string.len); - } - - format_output(); -} - -//----------[ destructor ] ------------------------------------------------ -GenAddress::~GenAddress() -{ - if ( address != 0) - delete address; -} - -//----------[ create a new instance of this Value ]------------------------ -SnmpSyntax *GenAddress::clone() const -{ - return (SnmpSyntax *) new GenAddress(*this); -} - -//------[ assignment GenAddress = GenAddress ]----------------------------- -GenAddress& GenAddress::operator=( const GenAddress &addr) -{ - // protect against assignment from itself - if ( this == &addr ) - return *this; - - valid_flag = 0; - if (address) { - delete address; - address = 0; - } - - if (addr.address) - address = (Address *)(addr.address)->clone(); - - if (address) - valid_flag = address->valid(); - - // Copy real address smival info into GenAddr smival - // BOK: smival is generally not used for GenAddress, but - // we need this to be a replica of the real address' - // smival info so that ::operator=SnmpSyntax - // will work. - if ( valid_flag ) { - smival.syntax = ((GenAddress *)address)->smival.syntax; - smival.value.string.len = - ((GenAddress *)address)->smival.value.string.len; - ACE_OS::memcpy(smival.value.string.ptr, - ((GenAddress *)address)->smival.value.string.ptr, - (size_t)smival.value.string.len); - } - - format_output(); - return *this; -} - - -//------[ assignment GenAddress = any SnmpSyntax ]----------------------- -SnmpSyntax& GenAddress::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag = 0; // will get set to 1 if really valid - if ( address != 0) { - delete address; - address = 0; - } - - if (val.valid()) { - switch ( val.get_syntax() ) { - //-----[ ip address case ]------------- - // BOK: this case shouldn't be needed since there is an explicit - // GenAddr=Address assignment that will override this assignment. - // Left here for posterity. - case sNMP_SYNTAX_IPADDR: - { - address = (Address *)val.clone(); - if (address) - valid_flag = address->valid(); - } - break; - - //-----[ udp address case ]------------ - //-----[ ipx address case ]------------ - //-----[ mac address case ]------------ - // BOK: This is here only to support GenAddr = primitive OctetStr. - // The explicit GenAddr=Address assignment will handle the cases - // GenAddr = [UdpAdd|IpxAddr|IpxSock|MacAddr|DecNetAddr|NetbiosAddr|AppleTlk]. - // Note, using the heuristic of octet str len to determine type of - // address to create is not accurate when address lengths are equal - // (e.g., UDPIPV4LEN == MACLEN). It gets worse if we add AppleTalk or - // OSI which use variable length addresses! assume AppleTalk as used in IOS Mibs - // is defined in CISCO-TC.my as fixed length of 3 octets - - case sNMP_SYNTAX_OCTETS: - { - unsigned long val_len; - val_len = ((GenAddress &)val).smival.value.string.len; - - if (val_len == UDPIPV4LEN) { - ACE_NEW_RETURN(address, UdpAddress, *this); - } - else if (val_len ==IPV4LEN) { - ACE_NEW_RETURN(address, IpAddress, *this); - } - else if (val_len == IPXLEN) { - ACE_NEW_RETURN(address, IpxAddress, *this); - } - else if (val_len == IPXSOCKLEN) { - ACE_NEW_RETURN(address, IpxSockAddress, *this); - } - else if (val_len == MACLEN) { - ACE_NEW_RETURN(address, MacAddress, *this); - } - else if (val_len == APPLETKLEN) { - ACE_NEW_RETURN(address, AppleTalkAddress, *this); - } - else if (val_len == DECNETLEN) { - ACE_NEW_RETURN(address, DecNetAddress, *this); - } - else if (val_len == NETBIOSLEN) { - ACE_NEW_RETURN(address, DecNetAddress, *this); - } - - if (address) { - *address = val; - valid_flag = address->valid(); - } - } - break; - } // end switch - } - - // Copy real address smival info into GenAddr smival - // BOK: smival is generally not used for GenAddress, but - // we need this to be a replica of the real address' - // smival info so that ::operator=SnmpSyntax - // will work. - if ( valid_flag ) { - smival.syntax = ((GenAddress *)address)->smival.syntax; - smival.value.string.len = - ((GenAddress *)address)->smival.value.string.len; - ACE_OS::memcpy(smival.value.string.ptr, - ((GenAddress *)address)->smival.value.string.ptr, - (size_t)smival.value.string.len); - } - - format_output(); - return *this; -} - - -// redefined parse address for macs -// TODO: Add netbios, appletalk, and decnet addresses here -int GenAddress::parse_address( const char *addr) -{ - if ( address != 0) - delete address; - - // try to create each of the addresses until the correct one - // is found - -//BOK: Need to try IPX Sock and IPX before UDP since on Win32, -// gethostbyname() seems to think the ipx network number -// portion is a valid ipaddress string... stupid WinSOCK! - - // ipxsock address - ACE_NEW_RETURN(address, IpxSockAddress( addr), -1); - valid_flag = address->valid(); - if ( valid_flag && ((IpxSockAddress*)address)->get_socket()) { - format_output(); - return 1; // ok its an ipxsock address - } - // otherwise delete it and try another - delete address; - - // ipx address - ACE_NEW_RETURN(address, IpxAddress( addr), -1); - valid_flag = address->valid(); - if ( valid_flag) { - format_output(); - return 1; // ok its an ipx address - } - // otherwise delete it and try another - delete address; - -//TM: Must try the derived classes first...one pitfall of the -//following solution is if someone creates with a port/socket of 0 the -//class will get demoted to ip/ipx. The only proper way to do this is -//to parse the strings ourselves. - - // udp address - ACE_NEW_RETURN(address, UdpAddress( addr), -1); - valid_flag = address->valid(); - if ( valid_flag && ((UdpAddress*)address)->get_port()) { - format_output(); - return 1; // ok its a udp address - } - - // otherwise delete it and try another - delete address; - - // ip address - ACE_NEW_RETURN(address, IpAddress( addr), -1); - valid_flag = address->valid(); - if ( valid_flag) - { - format_output(); - return 1; // ok its an ip address - } - // otherwise delete it and try another - delete address; - - // mac address - ACE_NEW_RETURN(address, MacAddress( addr), -1); - valid_flag = address->valid(); - if ( valid_flag) { - format_output(); - return 1; // ok, its a mac - } - - // guess by length of argument the type of address - switch (ACE_OS::strlen(addr)) { - case NETBIOSLEN: - ACE_NEW_RETURN(address, NetbiosAddress( addr), -1); - valid_flag = address->valid(); - if ( valid_flag) { - format_output(); - return 1; // ok, its a mac - } - break; - - case APPLETKLEN: - ACE_NEW_RETURN(address, AppleTalkAddress( addr), -1); - valid_flag = address->valid(); - if ( valid_flag) { - format_output(); - return 1; // ok, its a mac - } - break; - - case DECNETLEN: - ACE_NEW_RETURN(address, DecNetAddress( addr), -1); - valid_flag = address->valid(); - if ( valid_flag) { - format_output(); - return 1; // ok, its a mac - } - break; - - } - // otherwise its invalid - delete address; - address = 0; - format_output(); - return 0; -} - -GenAddress::operator const char *() const -{ - if ( address != 0) - return (const char *)*address; // pass thru - else - return (char *)output_buffer; -} - -// to_string form of the contained address -char * GenAddress::to_string() -{ - if ( address != 0) - return address->to_string(); // pass thru - else - return (char *)output_buffer; -} - -// format output -void GenAddress::format_output() -{ - output_buffer[0] = '\0'; -} - -//------[ return the type ]---------------------------------- -addr_type GenAddress::get_type() const -{ - if (!valid()) - return type_invalid; - else - return address->get_type(); -} - -// call the particular type class here -void GenAddress::to_octet(OctetStr& octet) const -{ - if (!valid()) - return; - - address->to_octet(octet); -} - -//------------------------------------------------------------------------ -//---------[ DecNet Address Class ]--------------------------------------- -//------------------------------------------------------------------------ - -DecNetAddress::DecNetAddress( const char *inaddr): Address() -{ - if (ACE_OS::strlen(inaddr) == 0) { - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = DECNETLEN; - smival.value.string.ptr = address_buffer; - - valid_flag=0; - DecNetAddress::format_output(); - return; - } - - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = DECNETLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = parse_address( (char *) inaddr); - DecNetAddress::format_output(); -} - -DecNetAddress::DecNetAddress( const DecNetAddress&) -{ -} - -DecNetAddress::DecNetAddress( const GenAddress& genaddr) -{ - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = DECNETLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = 0; - // allow use of an ipx or ipxsock address - if ( (genaddr.get_type() == type_decnet) ) { - valid_flag = genaddr.valid(); - if ( valid_flag) { - // copy in the Ipx address data - DecNetAddress temp_ipx( (const char *) genaddr); - *this = temp_ipx; - } - } - DecNetAddress::format_output(); -} - -DecNetAddress::~DecNetAddress() -{ -} - -char *DecNetAddress::to_string() -{ - return (char *)output_buffer; -} - -DecNetAddress& DecNetAddress::operator=( const DecNetAddress &decaddr) -{ - // protect against assignment from itself - if ( this == &decaddr ) - return *this; - valid_flag = decaddr.valid_flag; - if (valid_flag) - ACE_OS::memcpy(address_buffer, decaddr.address_buffer, DECNETLEN); - format_output(); - return *this; -} - -void DecNetAddress::to_octet(OctetStr& octet) const -{ - octet.set_data( smival.value.string.ptr, smival.value.string.len); -} - -DecNetAddress::operator const char *() const -{ - return (char *)output_buffer; -} - -SmiUINT32 DecNetAddress::get_syntax() -{ - return sNMP_SYNTAX_OCTETS; -} - -SnmpSyntax& DecNetAddress::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag = 0; // will get set 1 if really valid - - if (val.valid()) { - if (((DecNetAddress &)val).smival.value.string.len ==DECNETLEN) { - ACE_OS::memcpy(address_buffer, - ((DecNetAddress &)val).smival.value.string.ptr, DECNETLEN); - valid_flag = 1; - } - } - DecNetAddress::format_output(); - return *this; -} - -SnmpSyntax *DecNetAddress::clone() const -{ - return (SnmpSyntax *) new DecNetAddress(*this); -} - -addr_type DecNetAddress::get_type() const -{ - return type_decnet; -} - -void DecNetAddress::format_output() -{ - // if valid format else null it - if ( valid_flag) - ACE_OS::sprintf( (char *) output_buffer,"%d.%d",address_buffer[0], - address_buffer[1]); - else - output_buffer[0] = 0; -} - -int DecNetAddress::parse_address( const char *address) -{ - if (ACE_OS::strlen(address) > DECNETLEN) - return 0; // invalid - - ACE_OS::memset(address_buffer, 0, DECNETLEN); - ACE_OS::memcpy(address_buffer, address, DECNETLEN); - - return 1; // valid -} - - -//------------------------------------------------------------------------ -//---------[ AppleTalk Address Class ]------------------------------------ -//------------------------------------------------------------------------ - -AppleTalkAddress::AppleTalkAddress( const char *inaddr): Address() -{ - if (ACE_OS::strlen(inaddr) == 0) { - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = APPLETKLEN; - smival.value.string.ptr = address_buffer; - - valid_flag=0; - AppleTalkAddress::format_output(); - return; - } - - // always initialize SMI info - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = APPLETKLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = parse_address( (char *) inaddr); - AppleTalkAddress::format_output(); -} -AppleTalkAddress::AppleTalkAddress( const AppleTalkAddress&) -{ -} - -AppleTalkAddress::AppleTalkAddress( const GenAddress& genaddr) -{ - smival.syntax = sNMP_SYNTAX_OCTETS; - smival.value.string.len = APPLETKLEN; - smival.value.string.ptr = address_buffer; - - valid_flag = 0; - // allow use of an ipx or ipxsock address - if ( (genaddr.get_type() == type_atk) ) { - valid_flag = genaddr.valid(); - if ( valid_flag) { - // copy in the Ipx address data - AppleTalkAddress temp_ipx( (const char *) genaddr); - *this = temp_ipx; - } - } - AppleTalkAddress::format_output(); -} - -AppleTalkAddress::~AppleTalkAddress() -{ -} - -char *AppleTalkAddress::to_string() -{ - return (char *)output_buffer; -} - -AppleTalkAddress& AppleTalkAddress::operator=( const AppleTalkAddress &ataddr) -{ - // protect against assignment from itself - if ( this == &ataddr ) - return *this; - valid_flag = ataddr.valid_flag; - if (valid_flag) - ACE_OS::memcpy(address_buffer, ataddr.address_buffer, APPLETKLEN); - format_output(); - return *this; -} - -void AppleTalkAddress::to_octet(OctetStr& octet) const -{ - octet.set_data( smival.value.string.ptr, smival.value.string.len); -} - -AppleTalkAddress::operator const char *() const -{ - return (char *)output_buffer; -} - -SmiUINT32 AppleTalkAddress::get_syntax() -{ - return sNMP_SYNTAX_OCTETS; -} - -SnmpSyntax& AppleTalkAddress::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - valid_flag = 0; // will get set 1 if really valid - - if (val.valid()) { - if (((AppleTalkAddress &)val).smival.value.string.len ==APPLETKLEN) { - ACE_OS::memcpy(address_buffer, - ((AppleTalkAddress &)val).smival.value.string.ptr,APPLETKLEN); - valid_flag = 1; - } - } - AppleTalkAddress::format_output(); - return *this; -} - -SnmpSyntax *AppleTalkAddress::clone() const -{ - return (SnmpSyntax *) new AppleTalkAddress(*this); -} - -addr_type AppleTalkAddress::get_type() const -{ - return type_atk; -} - -void AppleTalkAddress::format_output() -{ - // if valid format else null it - if ( valid_flag) - ACE_OS::sprintf( (char *) output_buffer,"%d.%d.%d", address_buffer[0], - address_buffer[1], address_buffer[3]); - else - output_buffer[0] = 0; -} - -int AppleTalkAddress::parse_address( const char *address) -{ - if (ACE_OS::strlen(address) > APPLETKLEN) - return 0; // invalid - - ACE_OS::memset(address_buffer, 0, APPLETKLEN); - ACE_OS::memcpy(address_buffer, address, APPLETKLEN); - - return 1; // valid -} - -char AppleTalkAddress::get_host_address() const -{ - return address_buffer[2]; -} - -void AppleTalkAddress::set_host_address(const char host) -{ - address_buffer[2] = host; -} - -short AppleTalkAddress::get_net_address() const -{ - short net; - ACE_OS::memcpy(&net, address_buffer, APPLETKLEN - 1); - return net; -} - -void AppleTalkAddress::set_net_address(const short atknet) -{ - ACE_OS::memcpy(address_buffer, &atknet, APPLETKLEN -1); -} diff --git a/ASNMP/asnmp/address.h b/ASNMP/asnmp/address.h deleted file mode 100644 index 898e6968f56..00000000000 --- a/ASNMP/asnmp/address.h +++ /dev/null @@ -1,813 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef ADDRESS_ -#define ADDRESS_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// address.h -// -// = DESCRIPTION -// Address class definition. Encapsulates various network -// addresses into easy to use, safe and portable classes. -// -// = AUTHOR -// Peter E Mellquist -// -// ============================================================================ - -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -//----[ includes ]----------------------------------------------------- -// ACE OS Adaption layer -#include "ace/OS.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "asnmp/smival.h" -#include "asnmp/octet.h" - -//----[ enumerated types ] -------------------------------- -enum address_lengths { - IPV4LEN=4, - UDPIPV4LEN=6, - IPV6LEN=16, - UDPIPV6LEN=18, - IPXLEN=10, - IPXSOCKLEN=12, - NETBIOSLEN=16, - APPLETKLEN=3, - DECNETLEN=2, - MACLEN=6, - HASH0=19, - HASH1=13, - HASH2=7, - MAX_ADDR_SZ=20, - MAX_DISPLAY_SZ=MAXHOSTNAMELEN+1 -}; - -enum addr_type { - type_ip, - type_ipx, - type_udp, - type_ipxsock, - type_mac, - type_nb, - type_atk, - type_decnet, - type_e164, - type_sip, // IPv6 - type_invalid -}; - -// TODO: get rest of nb service types added here -enum nb_service { - nb_workstation = 0x0, nb_server = 0x20 -}; - -//---[ forward declarations ]----------------------------------------- -class GenAddress; -class UdpAddress; -class IpxSockAddress; -class NetbiosAddress; -class SIPAddress; // aka ipv6 - -// TODO: -// class AtmE164Address; - - -//-------------------------------------------------------------------- -//----[ Address class ]----------------------------------------------- -//-------------------------------------------------------------------- -class ACE_Export Address: public SnmpSyntax - // = TITLE - // Defines the member functions for the abstract base class - // Address. An Address is a unique network endpoint. -{ - -public: - virtual ~Address(); - // allow destruction of derived classes - - friend int operator==( const Address &lhs,const Address &rhs); - // overloaded equivlence operator, are two addresses equal? - - friend int operator!=( const Address &lhs,const Address &rhs); - // overloaded not equivlence operator, are two addresses not equal? - - friend int operator>( const Address &lhs,const Address &rhs); - // overloaded > operator, is a1 > a2 - - friend int operator>=( const Address &lhs,const Address &rhs); - // overloaded >= operator, is a1 >= a2 - - friend int operator<( const Address &lhs,const Address &rhs); - // overloaded < operator, is a1 < a2 - - friend int operator<=( const Address &lhs,const Address &rhs); - // overloaded <= operator, is a1 <= a2 - - friend int operator==( const Address &lhs,const char *rhs); - // equivlence operator overloaded, are an address and a string equal? - - friend int operator!=( const Address &lhs,const char *rhs); - // overloaded not equivlence operator, are an address and string not equal? - - friend int operator>( const Address &lhs,const char *rhs); - // overloaded < , is an address greater than a string? - - friend int operator>=( const Address &lhs,const char *rhs); - // overloaded >=, is an address greater than or equal to a string? - - friend int operator<( const Address &lhs,const char *rhs); - // overloaded < , is an address less than a string? - - friend int operator<=( const Address &lhs,const char *rhs); - // overloaded <=, is an address less than or equal to a string? - - virtual operator const char *() const = 0; - // overloaded const char * cast - - virtual int valid() const; - // verify the is the address object constructed ok - - virtual void to_octet(OctetStr& octet) const = 0; - // return a suitable buffer to contain the address - - virtual SmiUINT32 get_syntax() = 0; - // (pure virtual) syntax type - - unsigned char& operator[]( const int position); - // for non const [], allows reading and writing - - virtual char *to_string() = 0; - // get a printable ASCII value - - virtual SnmpSyntax *clone() const = 0; - // create a new instance of this Value - - virtual addr_type get_type() const = 0; - // return the type of address - - virtual SnmpSyntax& operator=( SnmpSyntax &val) = 0; - // overloaded assignment operator - - virtual unsigned int hashFunction() const { return 0;}; - // return a hash key - - -protected: - int valid_flag; - // state of constructed object (1/0) - unsigned char address_buffer[MAX_ADDR_SZ]; - // addr internal representation - - virtual int parse_address( const char * inaddr) =0; - // parse the address string - // redefined for each specific address subclass - - virtual void format_output() =0; - // format the output - // redefined for each specific address subclass - - void trim_white_space( char * ptr); - // a reused trimm white space method -}; - - -//----------------------------------------------------------------------- -//---------[ IPv4 Address Class ]---------------------------------------- -//----------------------------------------------------------------------- -class ACE_Export IpAddress : public Address - // = TITLE - // Defines the member functions for the concrete class IpAddress - // An IP Version 4 Address is 4 bytes long and consists of a - // Network, Sub Network, and host component. -{ -public: - IpAddress( const char *inaddr = ""); - // default construct an IP address with a string - - IpAddress( const IpAddress &ipaddr); - // construct an IP address with another IP address - - IpAddress( const GenAddress &genaddr); - // construct an IP address with a GenAddress - - ~IpAddress(); - // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden) - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - IpAddress& operator=( const IpAddress &ipaddress); - // assignment to another IpAddress object overloaded - - // TODO: add ability to set addr given long - - SnmpSyntax *clone() const; - // create a new instance of this Value - - char *resolve_hostname(int& was_found); - // return the DNS Fully Qualified Domain Name (host.domain) - // on failure returns dotted_quad string - - virtual char *to_string() ; - // return string representation of object (dotted quad returned) - - virtual operator const char *() const; - // const char * operator overloaded for streaming output - - void mask( const IpAddress& ipaddr); - // logically AND two IPaddresses and - // return the new one - - virtual addr_type get_type() const; - // return the type - - virtual SmiUINT32 get_syntax(); - // syntax type - - int is_loopback() const; - // is this the loopback address? 127.0.0.1/loopback/1.0.0.127.in-addr.arpa - - int is_multicast() const; - // determine if this is a multicast address - - int is_broadcast() const; - // determine if this a broadcast address - - int is_private() const; - // per RFC 1597, private addresses are:: 10, 172.16, and 192.168.0 - - virtual void to_octet(OctetStr& octet) const; - // convert address into octet string format in network byte order - -protected: - char output_buffer[MAX_DISPLAY_SZ]; // output buffer - - char iv_friendly_name_[MAX_DISPLAY_SZ]; - // friendly name storage - - int iv_friendly_name_status_; - // did resolver call work? some addrs won't resolve - - virtual int parse_address( const char *inaddr); - // redefined parse address - // specific to IP addresses - - virtual void format_output(); - // redefined format output - // specific to IP addresses - - int parse_dotted_ipstring( const char *inaddr); - // parse a dotted string - - int addr_to_friendly(); - // using the currently defined address, do a gethostbyname() - // and try to fill up the name - - static int resolve_to_address(const char *hostname, in_addr& quad_addr); - // thread safe routine to lookup ip address given hostname - // return <> 0 on error - - static int resolve_to_hostname(const in_addr& quad_addr, char *hostname); - // thread safe routine to lookup name given ip address - // return <> 0 on error - -}; - -//------------------------------------------------------------------------ -//--------------[ DNS Iterator Class ]------------------------------------ -//------------------------------------------------------------------------ - -class ACE_Export Address_Iter - // = TITLE - // Defines routines to obtain information on a hostname/FQDN - // such as multiple addresses -{ -public: - Address_Iter(const char *hostname); // fully qualified domain name, hostname - - int valid() const; - // did hostname resolve via DNS? - - int how_many_addresses(); - // how many addresses associated with this hostname - - int next(IpAddress& addr); - // return next address - -private: - Address_Iter(const Address_Iter&); - int valid_; // ctor status - int count_; // number of addresses - char **entry_; // ptr to current address - struct hostent lookupResult_; - ACE_HOSTENT_DATA buffer_; - int query_dns(const char *hostname); -}; - -//------------------------------------------------------------------------ -//---------[ UDP/IPv4 Address Class ]------------------------------------- -//------------------------------------------------------------------------ -class ACE_Export UdpAddress : public IpAddress - // = TITLE - // Defines the member functions for the concrete class UdpAddress - // A Udp Address consists of an IP Version 4 Address (IpAddress) - // and a 2 byte unsigned port number. (see /etc/services file) - // User Datagram Protocol (UDP) is a best effort transport -{ -public: - UdpAddress( const char *inaddr = ""); - // default constructor with a dotted string in the form of addr:port - - UdpAddress( const UdpAddress &udpaddr); - // construct an Udp address with another Udp address - - UdpAddress( const GenAddress &genaddr); - // construct a Udp address with a GenAddress - - UdpAddress( const IpAddress &ipaddr); - // construct a Udp address with an IpAddress - // default port # to zero - - ~UdpAddress(); - // destructor - - SmiUINT32 get_syntax(); - // syntax type - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - UdpAddress& operator=( const UdpAddress &udpaddr); - // assignment to another IpAddress object overloaded - - SnmpSyntax *clone() const; - // create a new instance of this Value - - virtual char *to_string() ; - // output in the form of address:port - - virtual operator const char *() const; - // const char * operator overloaded for streaming output - - void set_port( const unsigned short p); - // set the port number - - unsigned short get_port() const; - // get the port number - - virtual addr_type get_type() const; - // return the type - -protected: - char output_buffer[MAX_DISPLAY_SZ]; - // output buffer - - virtual int parse_address( const char *inaddr); - // redefined parse address - // specific to IP addresses - - virtual void format_output(); - // redefined format output - // specific to IP addresses -}; - - -//------------------------------------------------------------------------- -//---------[ 802.3 MAC Address Class ]------------------------------------- -//------------------------------------------------------------------------- -class ACE_Export MacAddress : public Address - // = TITLE - // Defines the member functions for the concrete class MacAddress. - // A Media Access Control Address consists of 48 bits as defined - // in IEEE 802.3 specifications. -{ -public: - MacAddress( const char *inaddr = ""); - // constructor with a string argument - - MacAddress( const MacAddress &macaddr); - // constructor with another MAC object - - MacAddress( const GenAddress &genaddr); - // construct a MacAddress with a GenAddress - - ~MacAddress(); - // destructor - - SmiUINT32 get_syntax(); - // syntax type - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - MacAddress& operator=( const MacAddress &macaddress); - // assignment to another IpAddress object overloaded - - SnmpSyntax *clone() const; - // create a new instance of this Value - - virtual char *to_string(); - // create a string to internal class storage representing object - - virtual operator const char *() const; - // const char * operator overloaded for streaming output - - virtual addr_type get_type() const; - // return the type - - unsigned int hashFunction() const; - // return a hash key - - virtual void to_octet(OctetStr& octet) const; - // return byte array of the mac address - -protected: - char output_buffer[MAX_DISPLAY_SZ]; - // output buffer containing string representation of object - - virtual int parse_address( const char *inaddr); - // redefined parse address for macs - - virtual void format_output(); - // redefined format output for MACs -}; - -//------------------------------------------------------------------------ -//---------[ Netbios Address Class ]-------------------------------------- -//------------------------------------------------------------------------ -class ACE_Export NetbiosAddress : public Address - // = TITLE - // Defines the member functions for the concrete class NetbiosAddress. - // The IBM/Microsoft address for NETBIOS, NETBEUI protocol transport. -{ -public: - - NetbiosAddress( const char *inaddr = ""); - // default constructor with string arg - - NetbiosAddress( const char *inaddr, nb_service svc); - // set name and service type - - NetbiosAddress( const NetbiosAddress& nbaddr); - // copy constructor - - NetbiosAddress( const GenAddress& genaddr); - // construct with a GenAddress - - ~NetbiosAddress(); - - virtual char *to_string(); - - NetbiosAddress& operator=( const NetbiosAddress &nbaddr); - - nb_service get_service_type() const; - // retrieve the network service type - - void set_service_type(nb_service nbservice); - // set the service type (workstation, server, etc) - - virtual operator const char *() const; - // const char * operator overloaded for streaming output - - virtual SmiUINT32 get_syntax(); - // syntax type - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - SnmpSyntax *clone() const; - // create a new instance of this Value - - virtual void to_octet(OctetStr& octet) const; - // output byte buffer containing netbios name - -protected: - void InitNBAddr(const char *inaddr); - char output_buffer[MAX_DISPLAY_SZ]; - - virtual void format_output(); - // output buffer to hold string representation - virtual int parse_address( const char *inaddr); - virtual addr_type get_type() const; -}; - -//------------------------------------------------------------------------ -//---------[ DecNet Address Class ]--------------------------------------- -//------------------------------------------------------------------------ -class ACE_Export DecNetAddress : public Address - // = TITLE - // Defines the member functions for the concrete class DecNetAddress. - // DecNet Phase ? address consists of two octets (CISCO-TC.my) -{ - public: - DecNetAddress( const char *inaddr = ""); - // default constructor with string arg - - DecNetAddress( const DecNetAddress& decaddr); - // copy constructor - - DecNetAddress( const GenAddress& genaddr); - // construct with a GenAddress - - ~DecNetAddress(); - - virtual char *to_string(); - - DecNetAddress& operator=( const DecNetAddress &decaddr); - - virtual void to_octet(OctetStr& octet) const; - // convert address into octet string format 2 bytes of decnet address - - virtual operator const char *() const; - // const char * operator overloaded for streaming output - - virtual SmiUINT32 get_syntax(); - // syntax type - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - SnmpSyntax *clone() const; - // create a new instance of this Value - - protected: - virtual int parse_address( const char *inaddr); - virtual addr_type get_type() const; - virtual void format_output(); - char output_buffer[MAX_DISPLAY_SZ]; -}; - -//------------------------------------------------------------------------ -//---------[ AppleTalk Address Class ]------------------------------------ -//------------------------------------------------------------------------ -class ACE_Export AppleTalkAddress : public Address - // = TITLE - // Defines the member functions for the concrete class DecNetAddress. - // DecNet Phase ? address consists of two octets (CISCO-TC.my) -{ - public: - AppleTalkAddress( const char *inaddr = ""); - // default constructor with string arg - - AppleTalkAddress( const AppleTalkAddress& atkaddr); - // copy constructor - - AppleTalkAddress( const GenAddress& genaddr); - // construct with a GenAddress - - ~AppleTalkAddress(); - - virtual char *to_string(); - - AppleTalkAddress& operator=( const AppleTalkAddress &atkaddr); - - virtual void to_octet(OctetStr& octet) const; - // convert address into octet string format 3 bytes of atk address - - char get_host_address() const; - // get the host part of the address - - void set_host_address(const char); - // set the host part of the address - - short get_net_address() const; - // get the 2 byte atk network address - - void set_net_address(const short atknet); - // set the host 2 byte atk network address - - virtual operator const char *() const; - // const char * operator overloaded for streaming output - - virtual SmiUINT32 get_syntax(); - // syntax type - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - SnmpSyntax *clone() const; - // create a new instance of this Value - - private: - virtual int parse_address( const char *inaddr); - virtual addr_type get_type() const; - virtual void format_output(); - char output_buffer[MAX_DISPLAY_SZ]; -}; - -//------------------------------------------------------------------------ -//---------[ IPX Address Class ]------------------------------------------ -//------------------------------------------------------------------------ -class ACE_Export IpxAddress : public Address - // = TITLE - // Defines the member functions for the concrete class IpxAddress. - // Novell's IPX (version ?) network protocol endpoint -{ -public: - IpxAddress( const char *inaddr = ""); - // default constructor with a string arg - - IpxAddress( const IpxAddress &ipxaddr); - // constructor with another ipx object - - IpxAddress( const GenAddress &genaddr); - // construct with a GenAddress - - ~IpxAddress(); - // destructor - - virtual SmiUINT32 get_syntax(); - // syntax type - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - IpxAddress& operator=( const IpxAddress &ipxaddress); - // assignment to another IpxAddress object overloaded - - int get_hostid( MacAddress& mac); - // get the host id portion of an ipx address - - SnmpSyntax *clone() const; - // create a new instance of this Value - - virtual char *to_string(); - // create string represtation of object value - - virtual operator const char *() const; - // const char * operator overloaded for streaming output - - virtual addr_type get_type() const; - // return the type - - virtual void to_octet(OctetStr& octet) const; - // return byte sequence containing ipx address - -protected: - char separator; - // ipx format separator {:,/} - - char output_buffer[MAX_DISPLAY_SZ]; - // output buffer to hold string representation - - virtual int parse_address( const char *inaddr); - // redefined parse address for ipx strings - - virtual void format_output(); - // redefined format output for ipx strings - // uses same separator as when constructed -}; - - - -//------------------------------------------------------------------------ -//---------[ IpxSock Address Class ]-------------------------------------- -//------------------------------------------------------------------------ -class ACE_Export IpxSockAddress : public IpxAddress - // = TITLE - // Defines the member functions for the concrete class IpxAddress. - // Novell's IPX (version ?) network protocol endpoint -{ -public: - IpxSockAddress( const char *inaddr = ""); - // constructor with a dotted string - - IpxSockAddress( const IpxSockAddress &ipxaddr); - // construct an Udp address with another Udp address - - IpxSockAddress( const GenAddress &genaddr); - //constructor with a GenAddress - - IpxSockAddress( const IpxAddress &ipxaddr); - //constructor with a IpxAddress - // default socket # is 0 - - ~IpxSockAddress(); - // destructor - - virtual SmiUINT32 get_syntax(); - // syntax type - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - IpxSockAddress& operator=( const IpxSockAddress &ipxaddr); - // assignment to another IpxAddress object overloaded - - SnmpSyntax *clone() const; - // create a new instance of this Value - - void set_socket( const unsigned short s); - // set the socket number - - unsigned short get_socket() const; - // get the socket number - - virtual char *to_string(); - // create string representation of object value - - virtual operator const char *() const; - // const char * operator overloaded for streaming output - - virtual addr_type get_type() const; - // return the type - -protected: - char output_buffer[MAX_DISPLAY_SZ]; - // output buffer to hold string representation of object - - virtual int parse_address( const char *inaddr); - // redefined parse address for ipx strings - - virtual void format_output(); - // redefined format output - // specific to IP addresses -}; - -//------------------------------------------------------------------------- -//--------[ Generic Address ]---------------------------------------------- -//------------------------------------------------------------------------- -class ACE_Export GenAddress : public Address - // = TITLE - // Defines the member functions for the concrete class GenAddress. - // This class attempts to determine an address type given a char string. -{ -public: - GenAddress( const char *addr = ""); - // constructor with a string argument - - GenAddress( const Address &addr); - // constructor with an Address - - GenAddress( const GenAddress &addr); - // constructor with another GenAddress - - ~GenAddress(); - // destructor - - SmiUINT32 get_syntax(); - // get the snmp syntax of the contained address - - SnmpSyntax *clone() const; - // create a new instance of this Value - - GenAddress& operator=( const GenAddress &addr); - // assignment of a GenAddress - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - virtual char *to_string(); - // string representation of object value - - virtual operator const char *() const; - // const char * operator overloaded for streaming output - - virtual addr_type get_type() const; - // return the type - - virtual void to_octet(OctetStr& octet) const; - // return the address as a octet sequence - -protected: - Address *address; - // pointer to a a concrete address - - char output_buffer[MAX_DISPLAY_SZ]; - // output buffer of objects value - - virtual int parse_address( const char *addr); - // redefined parse address for macs - - virtual void format_output(); - // format output for a generic address - - void init_smi(); - // initialize smi data structure -}; - -#endif //_ADDRESS diff --git a/ASNMP/asnmp/asn1.cpp b/ASNMP/asnmp/asn1.cpp deleted file mode 100644 index 77dc9baa5ec..00000000000 --- a/ASNMP/asnmp/asn1.cpp +++ /dev/null @@ -1,1728 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// asn1.cpp -// -// = DESCRIPTION -// The Vb class is an encapsulation of the snmp variable binding. -// This module contains the class definition for the variable binding (VB) -// class. The VB class is an encapsulation of a SNMP VB. A VB object is -// composed of one SNMP++ Oid and one SMI value. The Vb class utilizes Oid -// objects and thus requires the Oid class. To use this class, -// set oid, value then call valid() to be sure object was constructed correctly. -// -// = AUTHOR -// S. Waldbusser (assumed) -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/********************************************************************** -// * - * Abstract Syntax Notation One, ASN.1 - * As defined in ISO/IS 8824 and ISO/IS 8825 - * This implements a subset of the above International Standards that - * is sufficient to implement SNMP. - * - * Encodes abstract data types into a machine independent stream of bytes. - * - Copyright 1988, 1989, 1991, 1992 by Carnegie Mellon University - - All Rights Reserved - - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, - provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in - supporting documentation, and that the name of CMU not be - used in advertising or publicity pertaining to distribution of the - software without specific, written prior permission. - - CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING - ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL - CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR - ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - SOFTWARE. - ******************************************************************/ - -#include "asnmp/asn1.h" -#include "asnmp/snmp.h" - -ACE_RCSID(asnmp, asn1, "$Id$") - -/* - * parse_int - pulls a long out of an ASN int type. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the end of this object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char * asn1::parse_int( u_char *data, - int *datalength, - u_char *type, - long int *intp, - int intsize) -{ - ACE_TRACE("asn1::parse_int"); - /* - * ASN.1 integer ::= 0x02 asnlength byte {byte}* - */ - u_char *bufp = data; - u_long asn_length; - long value = 0; - - if (intsize != sizeof (long)){ - ASNERROR("not long"); - return 0; - } - *type = *bufp++; - bufp =asn1::parse_length(bufp, &asn_length); - if (bufp == 0){ - ASNERROR("bad length"); - return 0; - } - if ((int)(asn_length + (bufp - data)) > *datalength){ - ASNERROR("overflow of message"); - return 0; - } - if ((int)asn_length > intsize){ - ASNERROR("I don't support such large integers"); - return 0; - } - *datalength -= (int)asn_length + (bufp - data); - if (*bufp & 0x80) - value = -1; /* integer is negative */ - while(asn_length--) - value = (value << 8) | *bufp++; - *intp = value; - return bufp; -}; - - -/* - * parse_unsigned_int - pulls an u_long out of an ASN int type. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the end of this object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char * asn1::parse_unsigned_int( u_char *data, - int *datalength, - u_char *type, - u_long *intp, - int intsize) -{ - ACE_TRACE("asn1::parse_unsigned_int"); - /* - * ASN.1 integer ::= 0x02 asnlength byte {byte}* - */ - u_char *bufp = data; - u_long asn_length; - u_long value = 0; - - if (intsize != sizeof (long)){ - ASNERROR("not long"); - return 0; - } - *type = *bufp++; - bufp = asn1::parse_length(bufp, &asn_length); - if (bufp == 0){ - ASNERROR("bad length"); - return 0; - } - if ((int)(asn_length + (bufp - data)) > *datalength){ - ASNERROR("overflow of message"); - return 0; - } - if (((int)asn_length > (intsize + 1)) || - (((int)asn_length == intsize + 1) && *bufp != 0x00)){ - ASNERROR("I don't support such large integers"); - return 0; - } - *datalength -= (int)asn_length + (bufp - data); - if (*bufp & 0x80) - value = (u_long) -1; - while(asn_length--) - value = (value << 8) | *bufp++; - *intp = value; - return bufp; -}; - - -/* - * build_int - builds an ASN object containing an integer. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the end of this object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char * asn1::build_int( u_char *data, - int *datalength, - u_char type, - long *intp, - int intsize) -{ - ACE_TRACE("asn1::build_int"); - /* - * ASN.1 integer ::= 0x02 asnlength byte {byte}* - */ - - long integer; - u_long mask; - - if (intsize != sizeof (long)) - return 0; - integer = *intp; - /* - * Truncate "unnecessary" bytes off of the most significant end of this - * 2's complement integer. There should be no sequence of 9 - * consecutive 1's or 0's at the most significant end of the - * integer. - */ - mask = 0x1FF << ((8 * (sizeof(long) - 1)) - 1); - /* mask is 0xFF800000 on a big-endian machine */ - while((((integer & mask) == 0) || ((integer & mask) == mask)) - && intsize > 1){ - intsize--; - integer <<= 8; - } - data = asn1::build_header(data, datalength, type, intsize); - if (data == 0) - return 0; - if (*datalength < intsize) - return 0; - *datalength -= intsize; - mask = 0xFF << (8 * (sizeof(long) - 1)); - /* mask is 0xFF000000 on a big-endian machine */ - while(intsize--){ - *data++ = (u_char)((integer & mask) >> (8 * (sizeof(long) - 1))); - integer <<= 8; - } - return data; -}; - - -/* - * build_unsigned_int - builds an ASN object containing an integer. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the end of this object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char * asn1::build_unsigned_int( u_char *data, - int *datalength, - u_char type, - u_long *intp, - int intsize) -{ - ACE_TRACE("asn1::build_unsigned_int"); - /* - * ASN.1 integer ::= 0x02 asnlength byte {byte}* - */ - - u_long integer; - u_long mask; - int add_null_byte = 0; - - if (intsize != sizeof (long)) - return 0; - integer = *intp; - mask = 0xFF << (8 * (sizeof(long) - 1)); - /* mask is 0xFF000000 on a big-endian machine */ - if ((u_char)((integer & mask) >> (8 * (sizeof(long) - 1))) & 0x80){ - /* if MSB is set */ - add_null_byte = 1; - intsize++; - } - /* - * Truncate "unnecessary" bytes off of the most significant end of this 2's complement integer. - * There should be no sequence of 9 consecutive 1's or 0's at the most significant end of the - * integer. - */ - mask = 0x1FF << ((8 * (sizeof(long) - 1)) - 1); - /* mask is 0xFF800000 on a big-endian machine */ - while((((integer & mask) == 0) || ((integer & mask) == mask)) && intsize > 1){ - intsize--; - integer <<= 8; - } - data = asn1::build_header(data, datalength, type, intsize); - if (data == 0) - return 0; - if (*datalength < intsize) - return 0; - *datalength -= intsize; - if (add_null_byte == 1){ - *data++ = '\0'; - intsize--; - } - mask = 0xFF << (8 * (sizeof(long) - 1)); - /* mask is 0xFF000000 on a big-endian machine */ - while(intsize--){ - *data++ = (u_char)((integer & mask) >> (8 * (sizeof(long) - 1))); - integer <<= 8; - } - return data; -}; - - -/* - * parse_string - pulls an octet string out of an ASN octet string type. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the beginning of the next object. - * - * "string" is filled with the octet string. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char * asn1::parse_string( u_char *data, - int *datalength, - u_char *type, - u_char *string, - int *strlength) -{ - ACE_TRACE("asn1::parse_string"); - /* - * ASN.1 octet string ::= primstring | cmpdstring - * primstring ::= 0x04 asnlength byte {byte}* - * cmpdstring ::= 0x24 asnlength string {string}* - */ - u_char *bufp = data; - u_long asn_length; - - *type = *bufp++; - bufp = asn1::parse_length(bufp, &asn_length); - if (bufp == 0) - return 0; - if ((int)(asn_length + (bufp - data)) > *datalength){ - ASNERROR("overflow of message"); - return 0; - } - if ((int)asn_length > *strlength){ - ASNERROR("I don't support such long strings"); - return 0; - } - // fixed - ACE_OS::memcpy((char *)string, (char *)bufp, (int)asn_length); - *strlength = (int)asn_length; - *datalength -= (int)asn_length + (bufp - data); - return bufp + asn_length; -}; - - -/* - * build_string - Builds an ASN octet string object containing the input string. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the beginning of the next object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char * asn1::build_string( u_char *data, - int *datalength, - u_char type, - u_char *string, - int strlength) -{ - ACE_TRACE("asn1::build_string"); - /* - * ASN.1 octet string ::= primstring | cmpdstring - * primstring ::= 0x04 asnlength byte {byte}* - * cmpdstring ::= 0x24 asnlength string {string}* - * This code will never send a compound string. - */ - data = asn1::build_header(data, datalength, type, strlength); - if (data == 0) - return 0; - if (*datalength < strlength) - return 0; - // fixed - ACE_OS::memcpy((u_char *)data,(u_char *)string, strlength); - *datalength -= strlength; - return data + strlength; -}; - - -/* - * parse_header - interprets the ID and length of the current object. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * in this object following the id and length. - * - * Returns a pointer to the first byte of the contents of this object. - * Returns 0 on any error. - */ -u_char *asn1::parse_header( u_char *data, - int *datalength, - u_char *type) -{ - ACE_TRACE("asn1::parse_header"); - u_char *bufp = data; - register int header_len; - u_long asn_length; - - /* this only works on data types < 30, i.e. no extension octets */ - if (IS_EXTENSION_ID(*bufp)){ - ASNERROR("can't process ID >= 30"); - return 0; - } - *type = *bufp; - bufp = asn1::parse_length(bufp + 1, &asn_length); - if (bufp == 0) - return 0; - header_len = bufp - data; - if ((int)(header_len + asn_length) > *datalength){ - ASNERROR("asn length too long"); - return 0; - } - *datalength = (int)asn_length; - return bufp; -} - -/* - * asn1::build_header - builds an ASN header for an object with the ID and - * length specified. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * in this object following the id and length. - * - * This only works on data types < 30, i.e. no extension octets. - * The maximum length is 0xFFFF; - * - * Returns a pointer to the first byte of the contents of this object. - * Returns 0 on any error. - */ -u_char * asn1::build_header( u_char *data, - int *datalength, - u_char type, - int length) -{ - ACE_TRACE("asn1::build_header"); - if (*datalength < 1) - return 0; - *data++ = type; - (*datalength)--; - return asn1::build_length(data, datalength, length); - -} - -/* - * asn_build_sequence - builds an ASN header for a sequence with the ID and - * length specified. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * in this object following the id and length. - * - * This only works on data types < 30, i.e. no extension octets. - * The maximum length is 0xFFFF; - * - * Returns a pointer to the first byte of the contents of this object. - * Returns 0 on any error. - */ -u_char * asn1::build_sequence( u_char *data, - int *datalength, - u_char type, - int length) -{ - ACE_TRACE("asn1::build_sequence"); - *datalength -= 4; - if (*datalength < 0){ - *datalength += 4; /* fix up before punting */ - return 0; - } - *data++ = type; - *data++ = (u_char)(0x02 | ASN_LONG_LEN); - *data++ = (u_char)((length >> 8) & 0xFF); - *data++ = (u_char)(length & 0xFF); - return data; -}; - -/* - * parse_length - interprets the length of the current object. - * On exit, length contains the value of this length field. - * - * Returns a pointer to the first byte after this length - * field (aka: the start of the data field). - * Returns 0 on any error. - */ -u_char * asn1::parse_length( u_char *data, - u_long *length) -{ - ACE_TRACE("asn1::parse_length"); - u_char lengthbyte = *data; - - if (lengthbyte & ASN_LONG_LEN){ - lengthbyte &= ~ASN_LONG_LEN; /* turn MSb off */ - if (lengthbyte == 0){ - ASNERROR("We don't support indefinite lengths"); - return 0; - } - if (lengthbyte > sizeof(long)){ - ASNERROR("we can't support data lengths that long"); - return 0; - } - // fixed - ACE_OS::memcpy((char *)length, (char *)data + 1, (int)lengthbyte); - *length = ntohl(*length); - *length >>= (8 * ((sizeof *length) - lengthbyte)); - return data + lengthbyte + 1; - } else { /* short asnlength */ - *length = (long)lengthbyte; - return data + 1; - } -}; - -u_char *asn1::build_length( u_char *data, - int *datalength, - int length) -{ - ACE_TRACE("asn1::build_length"); - u_char *start_data = data; - - /* no indefinite lengths sent */ - if (length < 0x80){ - if (*datalength < 1){ - ASNERROR("build_length"); - return 0; - } - *data++ = (u_char)length; - } else if (length <= 0xFF){ - if (*datalength < 2){ - ASNERROR("build_length"); - return 0; - } - *data++ = (u_char)(0x01 | ASN_LONG_LEN); - *data++ = (u_char)length; - } else { /* 0xFF < length <= 0xFFFF */ - if (*datalength < 3){ - ASNERROR("build_length"); - return 0; - } - *data++ = (u_char)(0x02 | ASN_LONG_LEN); - *data++ = (u_char)((length >> 8) & 0xFF); - *data++ = (u_char)(length & 0xFF); - } - *datalength -= (data - start_data); - return data; - -} - -/* - * parse_objid - pulls an object indentifier out of an ASN object identifier type. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the beginning of the next object. - * - * "objid" is filled with the object identifier. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char *asn1::parse_objid( u_char *data, - int *datalength, - u_char *type, - oid *objid, - int *objidlength) -{ - ACE_TRACE("asn1::parse_objid"); - /* - * ASN.1 objid ::= 0x06 asnlength subidentifier {subidentifier}* - * subidentifier ::= {leadingbyte}* lastbyte - * leadingbyte ::= 1 7bitvalue - * lastbyte ::= 0 7bitvalue - */ - u_char *bufp = data; - oid *oidp = objid + 1; - u_long subidentifier; - long length; - u_long asn_length; - - *type = *bufp++; - bufp = asn1::parse_length(bufp, &asn_length); - if (bufp == 0) - return 0; - if ((int)asn_length + (bufp - data) > *datalength){ - ASNERROR("overflow of message"); - return 0; - } - *datalength -= (int)asn_length + (bufp - data); - - /* Handle invalid object identifier encodings of the form 06 00 robustly */ - if (asn_length == 0) - objid[0] = objid[1] = 0; - - length = asn_length; - (*objidlength)--; /* account for expansion of first byte */ - while (length > 0 && (*objidlength)-- > 0){ - subidentifier = 0; - do { /* shift and add in low order 7 bits */ - subidentifier = (subidentifier << 7) + (*(u_char *)bufp & ~ASN_BIT8); - length--; - } while (*(u_char *)bufp++ & ASN_BIT8); /* last byte has high bit clear */ - if (subidentifier > (u_long)MAX_SUBID){ - ASNERROR("subidentifier too long"); - return 0; - } - *oidp++ = (oid)subidentifier; - } - - /* - * The first two subidentifiers are encoded into the first component - * with the value (X * 40) + Y, where: - * X is the value of the first subidentifier. - * Y is the value of the second subidentifier. - */ - subidentifier = (u_long)objid[1]; - if (subidentifier == 0x2B){ - objid[0] = 1; - objid[1] = 3; - } else { - objid[1] = (u_char)(subidentifier % 40); - objid[0] = (u_char)((subidentifier - objid[1]) / 40); - } - - *objidlength = (int)(oidp - objid); - return bufp; -} - -/* - * build_objid - Builds an ASN object identifier object containing the - * input string. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the beginning of the next object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char *asn1::build_objid( u_char *data, - int *datalength, - u_char type, - oid *objid, - int objidlength) -{ - ACE_TRACE("asn1::build_objid"); - /* - * ASN.1 objid ::= 0x06 asnlength subidentifier {subidentifier}* - * subidentifier ::= {leadingbyte}* lastbyte - * leadingbyte ::= 1 7bitvalue - * lastbyte ::= 0 7bitvalue - */ - u_char buf[MAX_OID_LEN]; - u_char *bp = buf; - oid *op = objid; - int asnlength; - u_long subid, mask, testmask; - int bits, testbits; - - if (objidlength < 2){ - *bp++ = 0; - objidlength = 0; - } else { - *bp++ = (u_char) (op[1] + (op[0] * 40)); - objidlength -= 2; - op += 2; - } - - while(objidlength-- > 0){ - subid = *op++; - if (subid < 127){ /* off by one? */ - *bp++ = (u_char )subid; - } else { - mask = 0x7F; /* handle subid == 0 case */ - bits = 0; - /* testmask *MUST* !!!! be of an u_type */ - for(testmask = 0x7F, testbits = 0; testmask != 0; - testmask <<= 7, testbits += 7){ - if (subid & testmask){ /* if any bits set */ - mask = testmask; - bits = testbits; - } - } - /* mask can't be zero here */ - for(;mask != 0x7F; mask >>= 7, bits -= 7){ - /* fix a mask that got truncated above */ - if (mask == 0x1E00000) - mask = 0xFE00000; - *bp++ = (u_char)(((subid & mask) >> bits) | ASN_BIT8); - } - *bp++ = (u_char)(subid & mask); - } - } - asnlength = bp - buf; - data = asn1::build_header(data, datalength, type, asnlength); - if (data == 0) - return 0; - if (*datalength < asnlength) - return 0; - // fixed - ACE_OS::memcpy((char *)data, (char *)buf, asnlength); - *datalength -= asnlength; - return data + asnlength; -} - -/* - * parse_null - Interprets an ASN null type. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the beginning of the next object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char *asn1::parse_null(u_char *data, - int *datalength, - u_char *type) -{ - ACE_TRACE("asn1::parse_null"); - /* - * ASN.1 null ::= 0x05 0x00 - */ - u_char *bufp = data; - u_long asn_length; - - *type = *bufp++; - bufp = asn1::parse_length(bufp, &asn_length); - if (bufp == 0) - return 0; - if (asn_length != 0){ - ASNERROR("Malformed 0"); - return 0; - } - *datalength -= (bufp - data); - return bufp + asn_length; -} - - -/* - * build_null - Builds an ASN null object. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the beginning of the next object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char *asn1::build_null( u_char *data, - int *datalength, - u_char type) -{ - ACE_TRACE("asn1::build_null"); - /* - * ASN.1 null ::= 0x05 0x00 - */ - return asn1::build_header(data, datalength, type, 0); -}; - -/* - * parse_bitstring - pulls a bitstring out of an ASN bitstring type. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the beginning of the next object. - * - * "string" is filled with the bit string. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char *asn1::parse_bitstring( u_char *data, - int *datalength, - u_char *type, - u_char *string, - int *strlength) -{ - ACE_TRACE("asn1::parse_bitstring"); - /* - * bitstring ::= 0x03 asnlength unused {byte}* - */ - u_char *bufp = data; - u_long asn_length; - - *type = *bufp++; - bufp = asn1::parse_length(bufp, &asn_length); - if (bufp == 0) - return 0; - if ((int)(asn_length + (bufp - data)) > *datalength){ - ASNERROR("overflow of message"); - return 0; - } - if ((int) asn_length > *strlength){ - ASNERROR("I don't support such long bitstrings"); - return 0; - } - if (asn_length < 1){ - ASNERROR("Invalid bitstring"); - return 0; - } - if (*bufp > 7){ - ASNERROR("Invalid bitstring"); - return 0; - } - // fixed - ACE_OS::memcpy((char *)string,(char *)bufp, (int)asn_length); - *strlength = (int)asn_length; - *datalength -= (int)asn_length + (bufp - data); - return bufp + asn_length; -} - - -/* - * build_bitstring - Builds an ASN bit string object containing the - * input string. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the beginning of the next object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char *asn1::build_bitstring( u_char *data, - int *datalength, - u_char type, - u_char *string, - int strlength) -{ - ACE_TRACE("asn1::build_bitstring"); - /* - * ASN.1 bit string ::= 0x03 asnlength unused {byte}* - */ - if (strlength < 1 || *string || *string > 7){ - ASNERROR("Building invalid bitstring"); - return 0; - } - data = asn1::build_header(data, datalength, type, strlength); - if (data == 0) - return 0; - if (*datalength < strlength) - return 0; - // fixed - ACE_OS::memcpy((char *)data,(char *)string, strlength); - *datalength -= strlength; - return data + strlength; -} - - -/* - * parse_unsigned_int64 - pulls a 64 bit u_long out of an ASN int - * type. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the end of this object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char * asn1::parse_unsigned_int64(u_char *data, - int *datalength, - u_char *type, - struct counter64 *cp, - int countersize) -{ - ACE_TRACE("asn1::parse_unsigned_int64"); - /* - * ASN.1 integer ::= 0x02 asnlength byte {byte}* - */ - u_char *bufp = data; - u_long asn_length; - u_long low = 0, high = 0; - int intsize = 4; - - if (countersize != sizeof(struct counter64)){ - ASNERROR("not right size"); - return 0; - } - *type = *bufp++; - bufp = asn1::parse_length(bufp, &asn_length); - if (bufp == 0){ - ASNERROR("bad length"); - return 0; - } - if ((int)(asn_length + (bufp - data)) > *datalength){ - ASNERROR("overflow of message"); - return 0; - } - if (((int)asn_length > (intsize * 2 + 1)) || - (((int)asn_length == (intsize * 2) + 1) && *bufp != 0x00)){ - ASNERROR("I don't support such large integers"); - return 0; - } - *datalength -= (int)asn_length + (bufp - data); - if (*bufp & 0x80){ - low = (u_long) -1; // integer is negative - high = (u_long) -1; - } - while(asn_length--){ - high = (high << 8) | ((low & 0xFF000000) >> 24); - low = (low << 8) | *bufp++; - } - cp->low = low; - cp->high = high; - return bufp; -} - - -/* - * build_unsigned_int64 - builds an ASN object containing a 64 bit integer. - * On entry, datalength is input as the number of valid bytes following - * "data". On exit, it is returned as the number of valid bytes - * following the end of this object. - * - * Returns a pointer to the first byte past the end - * of this object (i.e. the start of the next object). - * Returns 0 on any error. - */ -u_char * asn1::build_unsigned_int64( u_char *data, - int *datalength, - u_char type, - struct counter64 *cp, - int countersize) -{ - ACE_TRACE("asn1::build_unsigned_int64"); - /* - * ASN.1 integer ::= 0x02 asnlength byte {byte}* - */ - - u_long low, high; - u_long mask, mask2; - int add_null_byte = 0; - int intsize; - - if (countersize != sizeof (struct counter64)) - return 0; - intsize = 8; - low = cp->low; - high = cp->high; - mask = 0xFF << (8 * (sizeof(long) - 1)); - /* mask is 0xFF000000 on a big-endian machine */ - if ((u_char)((high & mask) >> (8 * (sizeof(long) - 1))) & 0x80){ - /* if MSB is set */ - add_null_byte = 1; - intsize++; - } - /* - * Truncate "unnecessary" bytes off of the most significant end of this 2's - * complement integer. - * There should be no sequence of 9 consecutive 1's or 0's at the most - * significant end of the integer. - */ - mask2 = 0x1FF << ((8 * (sizeof(long) - 1)) - 1); - /* mask2 is 0xFF800000 on a big-endian machine */ - while((((high & mask2) == 0) || ((high & mask2) == mask2)) - && intsize > 1){ - intsize--; - high = (high << 8) - | ((low & mask) >> (8 * (sizeof(long) - 1))); - low <<= 8; - } - data = asn1::build_header(data, datalength, type, intsize); - if (data == 0) - return 0; - if (*datalength < intsize) - return 0; - *datalength -= intsize; - if (add_null_byte == 1){ - *data++ = '\0'; - intsize--; - } - while(intsize--){ - *data++ = (u_char)((high & mask) >> (8 * (sizeof(long) - 1))); - high = (high << 8) - | ((low & mask) >> (8 * (sizeof(long) - 1))); - low <<= 8; - - } - return data; -} - - -// create a pdu -struct snmp_pdu * cmu_snmp::pdu_create( int command) -{ - ACE_TRACE("cmu_snmp::snmp_pdu_create"); - struct snmp_pdu *pdu; - - ACE_NEW_RETURN(pdu, snmp_pdu, 0); - ACE_OS::memset((char *)pdu, 0,sizeof(struct snmp_pdu)); - pdu->command = command; - pdu->errstat = 0; - pdu->errindex = 0; - pdu->enterprise = 0; - pdu->enterprise_length = 0; - pdu->variables = 0; - return pdu; -} - -// release a pdu from memory -void cmu_snmp::free_pdu( struct snmp_pdu *pdu) -{ - ACE_TRACE("cmu_snmp::free_pdu"); - struct variable_list *vp, *ovp; - - vp = pdu->variables; - while(vp){ - // release the oid part - if (vp->name) - delete [] vp->name; - // if deep data, then release as well - if (vp->val.string) - delete [] vp->val.string; - ovp = vp; - // go to the next one - vp = vp->next_variable; - // release up vb itself - delete ovp; - } - // if enterprise release it up - if (pdu->enterprise) - delete [] pdu->enterprise; - // release up pdu itself - delete pdu; -} - - -// add a null var to a pdu -void cmu_snmp::add_var(struct snmp_pdu *pdu, - oid *name, - int name_length, - SmiVALUE *smival) -{ - ACE_TRACE("cmu_snmp::add_var"); - - struct variable_list *vars; - - // if we don't have a vb list ,create one - if (pdu->variables == 0) { - ACE_NEW(pdu->variables, variable_list); - vars = pdu->variables; - } - else - { // we have one, find the end - for(vars = pdu->variables; vars->next_variable; vars = vars->next_variable); - // create one - ACE_NEW(vars->next_variable, variable_list); - // bump ptr - vars = vars->next_variable; - } - - // add the oid with no data - vars->next_variable = 0; - - // hook in the Oid portion - ACE_NEW(vars->name, oid[(name_length)]); - - // fixed - ACE_OS::memcpy((char *)vars->name,(char *)name, name_length * sizeof(oid)); - vars->name_length = name_length; - - // hook in the SMI value - switch( smival->syntax) - { - // null , do nothing - case sNMP_SYNTAX_NULL: - case sNMP_SYNTAX_NOSUCHOBJECT: - case sNMP_SYNTAX_NOSUCHINSTANCE: - case sNMP_SYNTAX_ENDOFMIBVIEW: - { - vars->type = (u_char) smival->syntax; - vars->val.string = 0; - vars->val_len = 0; - } - break; - - // octects - case sNMP_SYNTAX_OCTETS: - case sNMP_SYNTAX_OPAQUE: - case sNMP_SYNTAX_IPADDR: - { - vars->type = (u_char) smival->syntax; - ACE_NEW(vars->val.string, - u_char[(unsigned)smival->value.string.len]); - vars->val_len = (int) smival->value.string.len; - ACE_OS::memcpy( (u_char *) vars->val.string, - (u_char *) smival->value.string.ptr, - (unsigned) smival->value.string.len); - } - break; - - // oid - case sNMP_SYNTAX_OID: - { - vars->type = (u_char) smival->syntax; - vars->val_len = (int) smival->value.oid.len * sizeof(oid); - ACE_NEW(vars->val.objid, oid[(unsigned)vars->val_len]); - ACE_OS::memcpy((u_long *)vars->val.objid, - (u_long *)smival->value.oid.ptr, - (unsigned) vars->val_len); - } - break; - - - - case sNMP_SYNTAX_TIMETICKS: - case sNMP_SYNTAX_CNTR32: - case sNMP_SYNTAX_GAUGE32: - case sNMP_SYNTAX_UINT32: - { - long templong; - vars->type = (u_char) smival->syntax; - ACE_NEW(vars->val.integer, long); - vars->val_len = sizeof(long); - templong = (long) smival->value.uNumber; - ACE_OS::memcpy( (long*) vars->val.integer, - (long*) &templong, - sizeof(long)); - } - break; - - case sNMP_SYNTAX_INT32: - { - long templong; - vars->type = (u_char) smival->syntax; - ACE_NEW(vars->val.integer, long); - vars->val_len = sizeof(long); - templong = (long) smival->value.sNumber; - ACE_OS::memcpy( (long*) vars->val.integer, - (long*) &templong, - sizeof(long)); - } - break; - - // 64 bit counter - case sNMP_SYNTAX_CNTR64: - { - vars->type = ( u_char) smival->syntax; - ACE_NEW(vars->val.counter64, counter64); - vars->val_len = sizeof(struct counter64); - ACE_OS::memcpy( (struct counter64*) vars->val.counter64, - (SmiLPCNTR64) &(smival->value.hNumber), - sizeof( SmiCNTR64)); - } - break; - - } // end switch - -} - -// build the authentication -// works for v1 or v2c -u_char *cmu_snmp::auth_build( u_char *data, - int *length, - long int version, - u_char *community, - int community_len, - int messagelen) -{ - ACE_TRACE("cmu_snmp::auth_build"); - u_char *params; - int plen; - - params = community; - plen = community_len; - - data = asn1::build_sequence(data, - length, - (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR), - messagelen + plen + 5); - if (data == 0){ - ASNERROR("buildheader"); - return 0; - } - data = asn1::build_int(data, - length, - (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER), - (long *)&version, - sizeof(version)); - if (data == 0){ - ASNERROR("buildint"); - return 0; - } - - data = asn1::build_string(data, - length, - (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OCTET_STR), - params, - plen ); - if (data == 0){ - ASNERROR("buildstring"); - return 0; - } - - return (u_char *)data; -}; - - -// build a variable binding -u_char * cmu_snmp::build_var_op(u_char *data, oid * var_name, - int *var_name_len, - u_char var_val_type, - int var_val_len, u_char *var_val, - int *listlength) - -{ - ACE_TRACE("cmu_snmp::build_var_op"); - int dummyLen, headerLen; - u_char *dataPtr; - - dummyLen = *listlength; - dataPtr = data; - - data += 4; - dummyLen -=4; - if (dummyLen < 0) - return 0; - - headerLen = data - dataPtr; - *listlength -= headerLen; - data = asn1::build_objid( data, listlength, - (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID), - var_name, *var_name_len); - if (data == 0) { - ASNERROR(""); - return 0; - } - - // based on the type... - switch(var_val_type) { - case ASN_INTEGER: - data = asn1::build_int( data, listlength, var_val_type, (long *)var_val, - var_val_len); - break; - - case SMI_GAUGE: - case SMI_COUNTER: - case SMI_TIMETICKS: - case SMI_UINTEGER: - data = asn1::build_unsigned_int( data, - listlength, - var_val_type, - (u_long *)var_val, - var_val_len); - break; - - case SMI_COUNTER64: - data = asn1::build_unsigned_int64(data, - listlength, - var_val_type, - (struct counter64 *)var_val, - var_val_len); - break; - - case ASN_OCTET_STR: - case SMI_IPADDRESS: - case SMI_OPAQUE: - case SMI_NSAP: - data = asn1::build_string(data, listlength, var_val_type, - var_val, var_val_len); - break; - - case ASN_OBJECT_ID: - data = asn1::build_objid(data, listlength, var_val_type, - (oid *)var_val, var_val_len / sizeof(oid)); - break; - - case ASN_NULL: - data = asn1::build_null(data, listlength, var_val_type); - break; - - case ASN_BIT_STR: - data = asn1::build_bitstring(data, listlength, var_val_type, - var_val, var_val_len); - break; - - case SNMP_NOSUCHOBJECT: - case SNMP_NOSUCHINSTANCE: - case SNMP_ENDOFMIBVIEW: - data = asn1::build_null(data, listlength, var_val_type); - break; - - default: - ASNERROR("wrong type"); - return 0; - } - if (data == 0) { - ASNERROR(""); - return 0; - } - dummyLen = (data - dataPtr) - headerLen; - - asn1::build_sequence(dataPtr, &dummyLen, - (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR), - dummyLen); - return data; -} - - -// serialize the pdu -int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet, - int *out_length, long version, - u_char* community, int community_len) -{ - ACE_TRACE("cmu_snmp::build"); - u_char buf[SNMP_MSG_LENGTH]; - u_char *cp; - struct variable_list *vp; - int length; - int totallength; - - length = *out_length; - cp = packet; - for(vp = pdu->variables; vp; vp = vp->next_variable) { - cp = cmu_snmp::build_var_op( cp, vp->name, - &vp->name_length, vp->type, - vp->val_len, (u_char *)vp->val.string, - &length); - if (cp == 0) - return -1; - } - totallength = cp - packet; - - length = SNMP_MSG_LENGTH; - - // encode the total len - cp = asn1::build_header( buf, &length, - (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR), - totallength); - if (cp == 0) - return -1; - ACE_OS::memcpy( (char *)cp, (char *)packet,totallength); - totallength += cp - buf; - - length = *out_length; - if (pdu->command != TRP_REQ_MSG) { - - // request id - cp = asn1::build_int( packet, - &length, - (u_char )(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER), - (long *)&pdu->reqid, - sizeof(pdu->reqid)); - if (cp == 0) - return -1; - - // error status - cp = asn1::build_int(cp, - &length, - (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER), - (long *)&pdu->errstat, sizeof(pdu->errstat)); - if (cp == 0) - return -1; - - // error index - cp = asn1::build_int(cp, - &length, - (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER), - (long *)&pdu->errindex, sizeof(pdu->errindex)); - if (cp == 0) - return -1; - } - else { // this is a trap message - - // enterprise - cp = asn1::build_objid( packet, - &length, - (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID), - (oid *)pdu->enterprise, - pdu->enterprise_length); - if (cp == 0) - return -1; - - // agent-addr - cp = asn1::build_string(cp, - &length, - // HDN Fixed to use correct tag - (u_char)SMI_IPADDRESS, - //(u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OCTET_STR), - (u_char *)&pdu->agent_addr.sin_addr.s_addr, - sizeof(pdu->agent_addr.sin_addr.s_addr)); - if (cp == 0) - return -1; - - // generic trap - cp = asn1::build_int(cp, - &length, - (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER), - (long *)&pdu->trap_type, - sizeof(pdu->trap_type)); - if (cp == 0) - return -1; - - // specific trap - cp = asn1::build_int( cp, - &length, - (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER), - (long *)&pdu->specific_type, - sizeof(pdu->specific_type)); - if (cp == 0) - return -1; - - // timestamp - cp = asn1::build_int(cp, - &length, - // HDN Fixed to use correct tag - (u_char)SMI_TIMETICKS, - //(u_char )(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER), - (long *)&pdu->time, - sizeof(pdu->time)); - if (cp == 0) - return -1; - } - - if (length < totallength) - return -1; - // fixed - ACE_OS::memcpy((char *)cp, (char *)buf, totallength); - totallength += cp - packet; - - length = SNMP_MSG_LENGTH; - cp = asn1::build_header(buf, - &length, - (u_char)pdu->command, - totallength); - if (cp == 0) - return -1; - if (length < totallength) - return -1; - // fixed - ACE_OS::memcpy((char *)cp, (char *)packet, totallength); - totallength += cp - buf; - - length = *out_length; - - cp = cmu_snmp::auth_build( packet, - &length, - version, - community, - community_len, - totallength ); - if (cp == 0) - return -1; - if ((*out_length - (cp - packet)) < totallength) - return -1; - // fixed - ACE_OS::memcpy((char *)cp, (char *)buf, totallength); - totallength += cp - packet; - *out_length = totallength; - - return 0; -} - -// parse the authentication header -u_char *cmu_snmp::auth_parse(u_char *data, - int *length, u_char *sid, - int *slen, long *version) -{ - ACE_TRACE("cmu_snmp::auth_parse"); - u_char type; - - // get the type - data = asn1::parse_header( data, length, &type); - if (data == 0){ - ASNERROR("bad header"); - return 0; - } - - if (type != (ASN_SEQUENCE | ASN_CONSTRUCTOR)) { - ASNERROR("wrong auth header type"); - return 0; - } - - // get the version - data = asn1::parse_int(data, length, &type, version, sizeof(*version)); - if (data == 0) { - ASNERROR("bad parse of version"); - return 0; - } - - // get the community name - data = asn1::parse_string(data, length, &type, sid, slen); - if (data == 0) { - ASNERROR("bad parse of community"); - return 0; - } - - return (u_char *)data; -} - -/* u_char *data, // IN - pointer to the start of object - oid *var_name, // OUT - object id of variable - int *var_name_len, // IN/OUT - length of variable name - u_char *var_val_type, // OUT - type of variable - (int or octet string) (one byte) - int *var_val_len, // OUT - length of variable - u_char **var_val, // OUT - pointer to ASN1 encoded value of variable -*/ - -u_char * -cmu_snmp::parse_var_op( u_char *data, oid *var_name, - int *var_name_len, u_char *var_val_type, - int *var_val_len, u_char **var_val, - int *listlength) -{ - ACE_TRACE("cmu_snmp::parse_var_op"); - u_char var_op_type; - int var_op_len = *listlength; - u_char *var_op_start = data; - - data = asn1::parse_header(data, &var_op_len, &var_op_type); - if (data == 0){ - ASNERROR(""); - return 0; - } - if (var_op_type != (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR)) - return 0; - data = asn1::parse_objid(data, &var_op_len, &var_op_type, var_name, var_name_len); - if (data == 0) { - ASNERROR(""); - return 0; - } - if (var_op_type != (u_char) - (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID)) - return 0; - *var_val = data; /* save pointer to this object */ - /* find out what type of object this is */ - data = asn1::parse_header(data, &var_op_len, var_val_type); - if (data == 0) { - ASNERROR(""); - return 0; - } - *var_val_len = var_op_len; - data += var_op_len; - *listlength -= (int)(data - var_op_start); - return data; -} - - - -// build a pdu from a data and length -int cmu_snmp::parse( struct snmp_pdu *pdu, - u_char *data, - u_char *community_name, - u_long &community_len, - snmp_version &spp_version, - int length) -{ - ACE_TRACE("cmu_snmp::parse"); - u_char msg_type; - u_char type; - u_char *var_val; - long version; - int len, four; - u_char community[256]; - int community_length = 256; - struct variable_list *vp = 0; - oid objid[MAX_NAME_LEN], *op; - - // authenticates message and returns length if valid - data = cmu_snmp::auth_parse(data, - &length, - community, - &community_length, - &version); - if (data == 0) - return -1; - - // copy the returned community name - ACE_OS::memcpy( (u_char *) community_name, - (u_char *) community, - community_length); - community_len = (long) community_length; - - if( version != SNMP_VERSION_1 && version != SNMP_VERSION_2C ) { - ASNERROR("Wrong version"); - return -1; - } - - spp_version = (snmp_version) version; - - data = asn1::parse_header(data, - &length, - &msg_type); - if (data == 0) - return -1; - pdu->command = msg_type; - - if (pdu->command != TRP_REQ_MSG){ - // get the rid - data = asn1::parse_int(data, - &length, &type, - (long *)&pdu->reqid, - sizeof(pdu->reqid)); - if (data == 0) - return -1; - // get the error status - data = asn1::parse_int(data, - &length, - &type, - (long *)&pdu->errstat, - sizeof(pdu->errstat)); - if (data == 0) - return -1; - // get the error index - data = asn1::parse_int(data, - &length, - &type, - (long *)&pdu->errindex, - sizeof(pdu->errindex)); - if (data == 0) - return -1; - } - else { // is a trap - - // get the enterprise - pdu->enterprise_length = MAX_NAME_LEN; - data = asn1::parse_objid(data, - &length, - &type, - objid, - &pdu->enterprise_length); - if (data == 0) - return -1; - - ACE_NEW_RETURN(pdu->enterprise, - oid[pdu->enterprise_length*sizeof(oid)],-1); - - // fixed - ACE_OS::memcpy((char *)pdu->enterprise,(char *)objid, - pdu->enterprise_length * sizeof(oid)); - - // get source address - four = 4; - data = asn1::parse_string(data, &length, &type, - (u_char *)&pdu->agent_addr.sin_addr.s_addr, - &four); - if (data == 0) - return -1; - - // get trap type - data = asn1::parse_int(data, &length, &type, (long *)&pdu->trap_type, - sizeof(pdu->trap_type)); - if (data == 0) - return -1; - - // trap type - data = asn1::parse_int(data, &length, &type, (long *)&pdu->specific_type, - sizeof(pdu->specific_type)); - if (data == 0) - return -1; - - // timestamp - data = asn1::parse_int(data, &length, &type, (long *)&pdu->time, - sizeof(pdu->time)); - if (data == 0) - return -1; - } - - // get the vb list - data = asn1::parse_header(data, &length, &type); - if (data == 0) - return -1; - - if (type != (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR)) - return -1; - - while((int)length > 0) { - if (pdu->variables == 0) { - ACE_NEW_RETURN(pdu->variables, variable_list, -1); - vp = pdu->variables; - } else { - ACE_NEW_RETURN(vp->next_variable, variable_list, -1); - vp = vp->next_variable; - } - vp->next_variable = 0; - vp->val.string = 0; - vp->name = 0; - vp->name_length = MAX_NAME_LEN; - data = cmu_snmp::parse_var_op( data, objid, - &vp->name_length, &vp->type, - &vp->val_len, &var_val, - (int *)&length); - if (data == 0) - return -1; - - ACE_NEW_RETURN(op, oid[(unsigned)vp->name_length * sizeof(oid)], -1); - - // fixed - ACE_OS::memcpy((char *)op, (char *)objid, vp->name_length * sizeof(oid)); - vp->name = op; - - len = SNMP_MSG_LENGTH; - switch((short)vp->type) { - case ASN_INTEGER: - case SMI_COUNTER: - case SMI_GAUGE: - case SMI_TIMETICKS: - case SMI_UINTEGER: - ACE_NEW_RETURN(vp->val.integer,long, -1); - vp->val_len = sizeof(long); - asn1::parse_int(var_val, &len, &vp->type, (long *)vp->val.integer, sizeof(vp->val.integer)); - break; - case SMI_COUNTER64: - ACE_NEW_RETURN(vp->val.counter64, counter64, -1); - vp->val_len = sizeof(struct counter64); - asn1::parse_unsigned_int64(var_val, &len, &vp->type, - (struct counter64 *)vp->val.counter64, - sizeof(*vp->val.counter64)); - break; - - case ASN_OCTET_STR: - case SMI_IPADDRESS: - case SMI_OPAQUE: - case SMI_NSAP: - ACE_NEW_RETURN(vp->val.string, u_char[(unsigned)vp->val_len + 1], -1); - asn1::parse_string(var_val, &len, &vp->type, vp->val.string, - &vp->val_len); - break; - - case ASN_OBJECT_ID: - vp->val_len = MAX_NAME_LEN; - asn1::parse_objid(var_val, &len, &vp->type, objid, &vp->val_len); - //vp->val_len *= sizeof(oid); - - ACE_NEW_RETURN(vp->val.objid, oid[(unsigned)vp->val_len*sizeof(oid)], -1); - - // fixed - ACE_OS::memcpy((char *)vp->val.objid, - (char *)objid, - vp->val_len * sizeof(oid)); - break; - - case SNMP_NOSUCHOBJECT: - case SNMP_NOSUCHINSTANCE: - case SNMP_ENDOFMIBVIEW: - case ASN_NULL: - break; - default: - ASNERROR("bad type returned "); - break; - } - } - return 0; -} diff --git a/ASNMP/asnmp/asn1.h b/ASNMP/asnmp/asn1.h deleted file mode 100644 index 82a81f4a561..00000000000 --- a/ASNMP/asnmp/asn1.h +++ /dev/null @@ -1,342 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef ASN1 -#define ASN1 -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// asn1.h -// -// = DESCRIPTION -// Abstract Syntax Notation One, ASN.1 -// As defined in ISO/IS 8824 and ISO/IS 8825 -// This implements a subset of the above International Standards that -// is sufficient to implement SNMP. -// -// = AUTHOR -// Steve Waldbusser/CMU ? -// -// ============================================================================ - -/********************************************************************** - Copyright 1988, 1989, 1991, 1992 by Carnegie Mellon University - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of CMU not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. -******************************************************************/ - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "asnmp/snmp.h" - -// CMU code to define "oid" typedef (old C style) -#ifndef EIGHTBIT_SUBIDS -typedef unsigned long oid; -#define MAX_SUBID 0xFFFFFFFF -#else -typedef unsigned char oid; -#define MAX_SUBID 0xFF -#endif - -#define MAX_OID_LEN 64 /* max subid's in an oid */ - - -// asn.1 values -#define ASN_BOOLEAN (0x01) -#define ASN_INTEGER (0x02) -#define ASN_BIT_STR (0x03) -#define ASN_OCTET_STR (0x04) -#define ASN_NULL (0x05) -#define ASN_OBJECT_ID (0x06) -#define ASN_SEQUENCE (0x10) -#define ASN_SET (0x11) -#define ASN_UNIVERSAL (0x00) -#define ASN_APPLICATION (0x40) -#define ASN_CONTEXT (0x80) -#define ASN_PRIVATE (0xC0) -#define ASN_PRIMITIVE (0x00) -#define ASN_CONSTRUCTOR (0x20) -#define ASN_LONG_LEN (0x80) -#define ASN_EXTENSION_ID (0x1F) -#define ASN_BIT8 (0x80) - -#define IS_CONSTRUCTOR(byte) ((byte) & ASN_CONSTRUCTOR) -#define IS_EXTENSION_ID(byte) (((byte) & ASN_EXTENSION_ID) == ASN_EXTENSION_ID) - -#define ASNERROR( string) -#define MAX_NAME_LEN 64 -#define SNMP_VERSION_1 0 -#define SNMP_VERSION_2C 1 - - -// defined types (from the SMI, RFC 1065) -#define SMI_IPADDRESS (ASN_APPLICATION | 0) -#define SMI_COUNTER (ASN_APPLICATION | 1) -#define SMI_GAUGE (ASN_APPLICATION | 2) -#define SMI_TIMETICKS (ASN_APPLICATION | 3) -#define SMI_OPAQUE (ASN_APPLICATION | 4) -#define SMI_NSAP (ASN_APPLICATION | 5) -#define SMI_COUNTER64 (ASN_APPLICATION | 6) -#define SMI_UINTEGER (ASN_APPLICATION | 7) - -#define GET_REQ_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x0) -#define GETNEXT_REQ_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x1) -#define GET_RSP_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x2) -#define SET_REQ_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x3) -#define TRP_REQ_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x4) - -#define GETBULK_REQ_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x5) -#define INFORM_REQ_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x6) -#define TRP2_REQ_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x7) -#define REPORT_MSG (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x8) - -#define SNMP_NOSUCHOBJECT (ASN_CONTEXT | ASN_PRIMITIVE | 0x0) -#define SNMP_NOSUCHINSTANCE (ASN_CONTEXT | ASN_PRIMITIVE | 0x1) -#define SNMP_ENDOFMIBVIEW (ASN_CONTEXT | ASN_PRIMITIVE | 0x2) - -#define SNMP_MSG_LENGTH 1500 - -typedef struct sockaddr_in ipaddr; - -// pdu -struct snmp_pdu { - int command; // pdu type - unsigned long reqid; // Request id - unsigned long errstat; // Error status - unsigned long errindex; // Error index - - // Trap information - oid *enterprise; // System OID - int enterprise_length; - ipaddr agent_addr; // address of object generating trap - int trap_type; // trap type - int specific_type; // specific type - unsigned long time; // Uptime - - // vb list - struct variable_list *variables; -}; - -// vb list -struct variable_list { - struct variable_list *next_variable; // 0 for last variable - oid *name; // Object identifier of variable - int name_length; // number of subid's in name - unsigned char type; // ASN type of variable - union { // value of variable - long *integer; - unsigned char *string; - oid *objid; - unsigned char *bitstring; - struct counter64 *counter64; - } val; - int val_len; -}; - -struct counter64 { - unsigned long high; - unsigned long low; -}; - -// CMU Interface class for ASN.1 routines -class ACE_Export asn1 - // = TITLE - // Defines the member functions for the asn1 concrete interface class - // CMU routines for performing ASN.1 data marshalling / representation - -{ -public: -static unsigned char *parse_int( unsigned char *data, - int *datalength, - unsigned char *type, - long int *intp, - int intsize); -static unsigned char *parse_unsigned_int( unsigned char *data, - int *datalength, - unsigned char *type, - unsigned long *intp, - int intsize); -static unsigned char *build_int( unsigned char *data, - int *datalength, - unsigned char type, - long *intp, - int intsize); - -static unsigned char *build_unsigned_int( unsigned char *data, - int *datalength, - unsigned char type, - unsigned long *intp, - int intsize); - -static unsigned char *parse_string( unsigned char *data, - int *datalength, - unsigned char *type, - unsigned char *string, - int *strlength); - -static unsigned char *build_string( unsigned char *data, - int *datalength, - unsigned char type, - unsigned char *string, - int strlength); - -static unsigned char *parse_header( unsigned char *data, - int *datalength, - unsigned char *type); - -static unsigned char * build_header( unsigned char *data, - int *datalength, - unsigned char type, - int length); - -static unsigned char * build_sequence( unsigned char *data, - int *datalength, - unsigned char type, - int length); - -static unsigned char * parse_length( unsigned char *data, - unsigned long *length); - -static unsigned char *build_length( unsigned char *data, - int *datalength, - int length); - -static unsigned char *build_objid( unsigned char *data, - int *datalength, - unsigned char type, - oid *objid, - int objidlength); - -static unsigned char *parse_objid( unsigned char *data, - int *datalength, - unsigned char *type, - oid *objid, - int *objidlength); - -static unsigned char *parse_null(unsigned char *data, - int *datalength, unsigned - char *type); - -static unsigned char *build_null( unsigned char *data, - int *datalength, - unsigned char type); - -static unsigned char *parse_bitstring( unsigned char *data, - int *datalength, - unsigned char *type, - unsigned char *string, - int *strlength); - -static unsigned char *build_bitstring( unsigned char *data, - int *datalength, - unsigned char type, - unsigned char *string, - int strlength); - -static unsigned char * parse_unsigned_int64(unsigned char *data, - int *datalength, - unsigned char *type, - struct counter64 *cp, - int countersize); - -static unsigned char * build_unsigned_int64( unsigned char *data, - int *datalength, - unsigned char type, - struct counter64 *cp, - int countersize); - -}; - - -// CMU Interface class for SNMPv1, SNMPv2c routines -class ACE_Export cmu_snmp - // = TITLE - // Defines the static functions for the cmu_snmp concrete class. - // These routine create cmu pdu's that can be sent/received on/from agents -{ - public: - static struct snmp_pdu *pdu_create( int command); - static void free_pdu( struct snmp_pdu *pdu); - static int build( struct snmp_pdu *pdu, - unsigned char *packet, - int *out_length, - long version, - unsigned char* community, - int community_len); - - static void add_var(struct snmp_pdu *pdu, - oid *name, - int name_length, - SmiVALUE *smival); - - static int parse( struct snmp_pdu *pdu, - unsigned char *data, - unsigned char *community_name, - unsigned long &community_len, - snmp_version &version, - int length); - static unsigned char *auth_build( unsigned char *data, - int *length, - long int version, - unsigned char *community, - int community_len, - int messagelen); - - static unsigned char *build_var_op(unsigned char *data, - oid * var_name, - int *var_name_len, - unsigned char var_val_type, - int var_val_len, - unsigned char *var_val, - int *listlength); - - -static unsigned char *auth_parse(unsigned char *data, - int *length, - unsigned char *sid, - int *slen, - long *version); - -/* - @params data, IN - pointer to the start of object - var_name OUT - object id of variable - var_name_len IN/OUT - length of variable name - var_val_type OUT - type of variable (int or octet string) (one byte) - var_val_len OUT - length of variable - var_val, OUT - pointer to ASN1 encoded value of variable - listlength IN/OUT - number of valid bytes left in var_op_list -*/ -static unsigned char *parse_var_op( unsigned char *data, - oid *var_name, - int *var_name_len, - unsigned char *var_val_type, - int *var_val_len, - unsigned char **var_val, - int *listlength); - -}; - -#endif // ASN1 - diff --git a/ASNMP/asnmp/counter.cpp b/ASNMP/asnmp/counter.cpp deleted file mode 100644 index 04c50dd6475..00000000000 --- a/ASNMP/asnmp/counter.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// counter.cpp -// -// = DESCRIPTION -// Class implementation for SMI Counter32 class. -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/counter.h" - -ACE_RCSID(asnmp, counter, "$Id$") - -// constructor with a value -Counter32::Counter32( const unsigned long i):SnmpUInt32(i) -{ - smival.syntax = sNMP_SYNTAX_CNTR32; -} - -// copy constructor -Counter32::Counter32( const Counter32 &c) -{ - this->smival.value.uNumber = c.smival.value.uNumber; - smival.syntax = sNMP_SYNTAX_CNTR32; - valid_flag = 1; -} - -// syntax type -SmiUINT32 Counter32::get_syntax() -{ - return sNMP_SYNTAX_CNTR32; -} - -// general assignment from any Value -SnmpSyntax& Counter32::operator=( SnmpSyntax &in_val){ - if ( this == &in_val ) // handle assignement from itself - return *this; - - valid_flag = 0; // will get set true if really valid - if (in_val.valid()) - { - switch (in_val.get_syntax()) - { - case sNMP_SYNTAX_UINT32: - // case sNMP_SYNTAX_GAUGE32: .. indistinquishable from UINT32 - case sNMP_SYNTAX_CNTR32: - case sNMP_SYNTAX_TIMETICKS: - case sNMP_SYNTAX_INT32: // implied cast int -> uint - this->smival.value.uNumber = - ((Counter32 &)in_val).smival.value.uNumber; - valid_flag = 1; - break; - } - } - return *this; -} - -// overloaded assignment -Counter32& Counter32::operator=( const unsigned long int i) -{ - this->smival.value.uNumber=i; - return *this; -} - -// overloaded assignment -Counter32& Counter32::operator=( const Counter32 &uli) -{ - this->smival.value.uNumber = uli.smival.value.uNumber; - return *this; -} - -// otherwise, behave like an unsigned long int -Counter32::operator unsigned long() -{ - return this->smival.value.uNumber; -} - -// clone -SnmpSyntax * Counter32::clone() const -{ - return ( SnmpSyntax *) new Counter32(*this); -} diff --git a/ASNMP/asnmp/counter.h b/ASNMP/asnmp/counter.h deleted file mode 100644 index 2b0f79807f3..00000000000 --- a/ASNMP/asnmp/counter.h +++ /dev/null @@ -1,79 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef COUNTER_ -#define COUNTER_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// counter.h -// -// = DESCRIPTION -// Class definition for SMI Counter32 class. -// -// = AUTHOR -// Peter E Mellquist -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/smival.h" -#include "asnmp/integer.h" - -//------------[ Counter32 Class ]------------------------------------------ -// The counter class allows all the functionality of unsigned -// 32 bit integers but is recognized as a distinct SMI type. Counter32 -// class objects may be set or get into Vb objects. -// -// This class does not behave as defined by the abstract model -// in RFC 1155 section 3.2.3.3 - -class ACE_Export Counter32: public SnmpUInt32 - // = TITLE - // Defines the member functions for the Counter32 concrete class - // This class implements RFC 1155 Counter Object and is named - // Counter32 after the RFC1902 redefinition of V1 SMI datatypes -{ - public: - Counter32( const unsigned long i = 0); - // constructor with a value - - Counter32( const Counter32 &c); - // copy constructor - - SmiUINT32 get_syntax(); - // syntax type - - SnmpSyntax *clone() const; - // create a new instance of this Value - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - Counter32& operator=( const Counter32 &uli); - // overloaded assignment - - Counter32& operator=( const unsigned long i); - // overloaded assignment - - operator unsigned long(); - // otherwise, behave like an unsigned long int -}; - -#endif // COUNTER_ diff --git a/ASNMP/asnmp/ctr64.cpp b/ASNMP/asnmp/ctr64.cpp deleted file mode 100644 index 264c97a3ac2..00000000000 --- a/ASNMP/asnmp/ctr64.cpp +++ /dev/null @@ -1,211 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// ctr64.cpp -// -// = DESCRIPTION -// Implementation for Counter64 ( 64 bit counter class). -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/ctr64.h" - -ACE_RCSID(asnmp, ctr64, "$Id$") - -#define MAX32 4294967295u - -//-----------[ syntax type ]---------------------------------------------- -SmiUINT32 Counter64::get_syntax() -{ - return sNMP_SYNTAX_CNTR64; -} - -//------------------[ constructor with values ]-------------------------- -Counter64::Counter64( unsigned long hiparm, unsigned long loparm) -{ - smival.syntax = sNMP_SYNTAX_CNTR64; - smival.value.hNumber.hipart = hiparm; - smival.value.hNumber.lopart = loparm; -} - -//------------------[ constructor with low value only ]------------------ -Counter64::Counter64( unsigned long long llw ) -{ - smival.syntax = sNMP_SYNTAX_CNTR64; - smival.value.hNumber.hipart = (unsigned long) (llw >> 32); - smival.value.hNumber.lopart = (unsigned long) llw & 0xffffffff; -} - -//------------------[ copy constructor ]--------------------------------- -Counter64::Counter64( const Counter64 &ctr64 ) -{ - smival.syntax = sNMP_SYNTAX_CNTR64; - smival.value.hNumber.hipart = ctr64.high(); - smival.value.hNumber.lopart = ctr64.low(); -} - -//------------------[ destructor ]--------------------------------- -Counter64::~Counter64() -{ -} - - -//------------------[ Counter64::high() ]------------------------------ -// return the high part -unsigned long Counter64::high() const -{ - return smival.value.hNumber.hipart; -} - - -//------------------[ Counter64::low() ]------------------------------- -// return the low part -unsigned long Counter64::low() const -{ - return smival.value.hNumber.lopart; -} - -//------------------[ set_high( const unsigned long h) ]----------- -// set the high part -void Counter64::set_high( const unsigned long h) -{ - smival.value.hNumber.hipart = h; -} - -//------------------[ set_low( const unsigned long l) ]------------ -// set the low part -void Counter64::set_low( const unsigned long l) -{ - smival.value.hNumber.lopart = l; -} - - -//-----------[ to_long_double( Counter64 c64) ]----------------------------- -// convert a Counter 64 to a long double -long double Counter64::to_long_double() const -{ - long double ld = this->high(); - ld *= MAX32; - ld += this->low(); - return ld; -} - - -//-----------[ ld_to_c64( long double ld) ]---------------------------- -// convert a long double to a Counter64 -// semantics changed from prior version -Counter64& Counter64::assign( long double ld) -{ - smival.syntax = sNMP_SYNTAX_CNTR64; - unsigned long h = smival.value.hNumber.hipart = (unsigned long)(ld / MAX32); - smival.value.hNumber.lopart = (unsigned long)(ld - h); - return *this; -} - -//----------------[ general Value = operator ]--------------------- -SnmpSyntax& Counter64::operator=( SnmpSyntax &val) -{ - // protect against assignment from itself - if ( this == &val ) - return *this; - - smival.value.hNumber.lopart = 0; // pessimsitic - assume no mapping - smival.value.hNumber.hipart = 0; - - // try to make assignment valid - if (val.valid()){ - switch (val.get_syntax()){ - case sNMP_SYNTAX_CNTR64: - smival.value.hNumber.hipart = - ((Counter64 &)val).smival.value.hNumber.hipart; - smival.value.hNumber.lopart = - ((Counter64 &)val).smival.value.hNumber.lopart; - break; - - case sNMP_SYNTAX_CNTR32: - case sNMP_SYNTAX_TIMETICKS: - case sNMP_SYNTAX_GAUGE32: - // case sNMP_SYNTAX_UINT32: .. indistinguishable from GAUGE32 - case sNMP_SYNTAX_INT32: - // take advantage of union... - smival.value.hNumber.lopart = ((Counter64 &)val).smival.value.uNumber; - smival.value.hNumber.hipart = 0; - break; - } - } - return *this; -} - -// overloaded assignment -Counter64& Counter64::operator=( const unsigned long long rhs) -{ - smival.value.hNumber.hipart = (unsigned long) (rhs >> 32); - smival.value.hNumber.lopart = (unsigned long) rhs; - return *this; -} - -// overloaded assignment -Counter64& Counter64::operator=( const Counter64 &rhs) -{ - smival.value.hNumber.hipart = rhs.high(); - smival.value.hNumber.lopart = rhs.low(); - return *this; -} - -// otherwise, behave like an unsigned long int -Counter64::operator unsigned long long() -{ - unsigned long long val = smival.value.hNumber.hipart; - val = val << 32; // shift right 4 bytes - val |= smival.value.hNumber.lopart; - return val; -} - -//----------------[ Counter64::clone() ]----------------------------------- -// create a new instance of this Value -SnmpSyntax* Counter64::clone() const -{ - return ( SnmpSyntax *) new Counter64(*this); -} - -//----------------[ Counter64::valid() ]------------------------------------- -int Counter64::valid() const -{ - return 1; -} - -//----------[ return ASCII format ]------------------------- -// TODO: Fix up to do real 64bit decimal value printing... -// For now, print > 32-bit values in hex -char * Counter64::to_string() -{ - if ( high() != 0 ) - sprintf(output_buffer, "0x%X%08X", - (unsigned int)high(), (unsigned int)low()); - else - sprintf(output_buffer, "%d", (int) low()); - return output_buffer; -} diff --git a/ASNMP/asnmp/ctr64.h b/ASNMP/asnmp/ctr64.h deleted file mode 100644 index f9dc641a94a..00000000000 --- a/ASNMP/asnmp/ctr64.h +++ /dev/null @@ -1,110 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef CTR64_ -#define CTR64_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// ctr64.h -// -// = DESCRIPTION -// SNMP Counter64 class definition. -// -// = AUTHOR -// Peter E Mellquist -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/smival.h" - -#define CTR64OUTBUF 30 // maximum ascii string for a 64-bit ctr - - -//---------[ 64 bit Counter Class ]-------------------------------- -// Counter64 Class encapsulates two unsigned integers into a -// a single entity. This type has is available in SNMPv2 but -// may be used anywhere where needed. -// -class ACE_Export Counter64: public SnmpSyntax - // = TITLE - // Defines the member functions for the Counter64 concrete class - // This class implements RFC 1902 64 bit Counter Object. -{ -public: - Counter64( unsigned long long llw = 0); - // default constructor - - Counter64( unsigned long hiparm, unsigned long loparm); - // constructor with values - - Counter64( const Counter64 &ctr64); - // copy constructor - - ~Counter64(); - // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden) - - SmiUINT32 get_syntax(); - // syntax type - - long double to_long_double() const; - // return a long double representation - - Counter64& assign( long double ld); - // assign a long double to a counter64 - - unsigned long high() const; - // return the high part - - unsigned long low() const; - // return the low part - - void set_high( const unsigned long h); - // set the high part - - void set_low( const unsigned long l); - // set the low part - - Counter64& operator=( const unsigned long long rhs); - // overloaded assignment - - Counter64& operator=( const Counter64 &rhs); - // overloaded assignment - - char *to_string(); - // get a printable ASCII representation - - SnmpSyntax *clone() const; - // create a new instance of this Value - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - int valid() const; - // general validity test, always true - - operator unsigned long long(); - // otherwise, behave like an unsigned long long - -protected: - char output_buffer[CTR64OUTBUF]; -}; - -#endif // CTR64_ diff --git a/ASNMP/asnmp/enttraps.h b/ASNMP/asnmp/enttraps.h deleted file mode 100644 index d90a593a4e4..00000000000 --- a/ASNMP/asnmp/enttraps.h +++ /dev/null @@ -1,118 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef ENTTRAPS_ -#define ENTTRAPS_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// enttraps.cpp -// -// = DESCRIPTION -// constants for Enterprise Traps -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/asn1.h" // ASN.1 header file - -//--------------[ well known trap ids ]----------------------------------- -class ACE_Export snmpTrapsOid: public Oid - // = TITLE - // Defines the member functions for the snmpTrapsOid base class - // to implement the traps defined in RFC 1215 -{ - public: - snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){} -}; - -class ACE_Export snmpTrapEnterpriseOid: public Oid - // = TITLE - // Defines the default Enterprise Oid for this software package -{ - public: - snmpTrapEnterpriseOid(void): Oid("1.3.6.1.6.3.1.1.4.3.0") { } -}; - -class ACE_Export coldStartOid: public snmpTrapsOid - // = TITLE - // Defines the RFC 1215 agent cold start generic trap (system reboot) -{ - public: - coldStartOid( void){*this+=".1";} -}; - -class ACE_Export warmStartOid: public snmpTrapsOid - // = TITLE - // Defines the RFC 1215 agent warm start generic trap (agent reboot) -{ - public: - warmStartOid( void){*this+=".2";} -}; - -class ACE_Export linkDownOid: public snmpTrapsOid - // = TITLE - // Defines the RFC 1215 interface (link) down trap -{ - public: - linkDownOid( void){*this+=".3";} -}; - - -// SMI LinkUp Oid -class ACE_Export linkUpOid: public snmpTrapsOid - // = TITLE - // Defines the RFC 1215 interface (link) up trap -{ - public: - linkUpOid( void){*this+=".4";} -}; - -class ACE_Export authenticationFailureOid: public snmpTrapsOid - // = TITLE - // Defines the RFC 1215 device/agent invalid access trap -{ - public: - authenticationFailureOid( void){*this+=".5";} -}; - -class ACE_Export egpNeighborLossOid: public snmpTrapsOid - // = TITLE - // Defines the RFC 1215 Exterior Gateway Protocol neighbor loss trap -{ - public: - egpNeighborLossOid( void){*this+=".6";} -}; - -#ifdef DEFINE_TRAP_CONSTANTS_ - -const coldStartOid coldStart; -const warmStartOid warmStart; -const linkDownOid linkDown; -const linkUpOid linkUp; -const authenticationFailureOid authenticationFailure; -const egpNeighborLossOid egpNeighborLoss; -const snmpTrapEnterpriseOid snmpTrapEnterprise; - -#endif - -#endif // ENTTRAPS_ diff --git a/ASNMP/asnmp/gauge.cpp b/ASNMP/asnmp/gauge.cpp deleted file mode 100644 index aac715f2730..00000000000 --- a/ASNMP/asnmp/gauge.cpp +++ /dev/null @@ -1,113 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// gauge.cpp -// -// = DESCRIPTION -// Class implemtation for SMI Gauge32 class. -// NOTES: This does not behave exactly as a Gauge described in RFC 1155 -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/gauge.h" // header file for gauge class - -ACE_RCSID(asnmp, gauge, "$Id$") - -// constructor with a value -Gauge32::Gauge32( const unsigned long i):SnmpUInt32(i) -{ - smival.syntax = sNMP_SYNTAX_GAUGE32; -} - -// copy constructor -Gauge32::Gauge32 ( const Gauge32 &g) -{ this->smival.value.uNumber = g.smival.value.uNumber; - smival.syntax = sNMP_SYNTAX_GAUGE32; - valid_flag = 1; -} - -// destructor -Gauge32::~Gauge32() -{ -} - -// syntax type -SmiUINT32 Gauge32::get_syntax() -{ - return sNMP_SYNTAX_GAUGE32; -} - -// overloaded assignment -Gauge32& Gauge32::operator=( const Gauge32 &uli) -{ - this->smival.value.uNumber = uli.smival.value.uNumber; - return *this; -} - -// overloaded assignment -Gauge32& Gauge32::operator=( const unsigned long int i) -{ - smival.value.uNumber=i; return *this; -} - -// general assignment from any Value -// TODO: this is broken if not inherited from UInt32 (see UInt32 code). -SnmpSyntax& Gauge32::operator=( SnmpSyntax &in_val) -{ - - if ( this == &in_val ) // handle assignement from itself - return *this; - - valid_flag = 0; // will get set true if really valid - if (in_val.valid()) - { - switch (in_val.get_syntax()) - { - case sNMP_SYNTAX_UINT32: - case sNMP_SYNTAX_GAUGE32: - case sNMP_SYNTAX_CNTR32: - case sNMP_SYNTAX_TIMETICKS: - case sNMP_SYNTAX_INT32: // implied cast int -> uint - this->smival.value.uNumber = - ((Gauge32 &)in_val).smival.value.uNumber; - valid_flag = 1; - break; - } - } - return *this; -} - -// otherwise, act as unsigned long -Gauge32::operator unsigned long() -{ - return smival.value.uNumber; -} - -// clone - create a new instance of this Value -SnmpSyntax* Gauge32::clone() const -{ - return ( SnmpSyntax *) new Gauge32(*this); -} diff --git a/ASNMP/asnmp/gauge.h b/ASNMP/asnmp/gauge.h deleted file mode 100644 index 765a713736c..00000000000 --- a/ASNMP/asnmp/gauge.h +++ /dev/null @@ -1,80 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef GAUGE_ -#define GAUGE_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// gauge32.cpp -// -// = DESCRIPTION -// Class definition for SMI Gauge32 class. -// This class currently does not behave as defined by the abstract model -// in RFC 1155 section 3.2.3.4 (ie the value doesn't latch on the max value) -// -// = AUTHOR -// Peter E Mellquist -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/integer.h" - -//------------[ Gauge32 Class ]------------------------------------------ -// The gauge class allows all the functionality of unsigned -// integers but is recognized as a distinct SMI type. Gauge32 -// objects may be set or get into Vb objects. -// - -class ACE_Export Gauge32: public SnmpUInt32 - // = TITLE - // Define RFC1902 Gauge datatype from RFC 1155 section 3.2.3.4 - // Note that this datatype does not behave exactly (acts like a long) -{ - public: - Gauge32( const unsigned long i = 0); - // constructor with a value - - Gauge32 ( const Gauge32 &g); - // copy constructor - - ~Gauge32(); - // destructor for a Gauge32 (ensure that Value::~Value() is overridden) - - SmiUINT32 get_syntax(); - // syntax type - - SnmpSyntax *clone() const; - // create a new instance of this Value - - Gauge32& operator=( const Gauge32 &uli); - // overloaded assignment - - Gauge32& operator=( const unsigned long i); - // overloaded assignment - - operator unsigned long(); - // otherwise, behave like an unsigned int - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value -}; -#endif //GAUGE_ - diff --git a/ASNMP/asnmp/integer.cpp b/ASNMP/asnmp/integer.cpp deleted file mode 100644 index e0da5b6dfab..00000000000 --- a/ASNMP/asnmp/integer.cpp +++ /dev/null @@ -1,227 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// integer.cpp -// -// = DESCRIPTION -// Class implemtation for SMI Integer classes. -// -// = AUTHOR -// Jeff Meyer -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/integer.h" // header file for gauge class - -ACE_RCSID(asnmp, integer, "$Id$") - -// constructor with value -SnmpUInt32::SnmpUInt32 (const u_long i) -{ - smival.value.uNumber=i; - smival.syntax = sNMP_SYNTAX_UINT32; - valid_flag = 1; -} - -// copy constructor -SnmpUInt32::SnmpUInt32( const SnmpUInt32 &c) -{ - smival.value.uNumber=c.smival.value.uNumber; - smival.syntax = sNMP_SYNTAX_UINT32; - valid_flag = 1; -} - -// destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden) -SnmpUInt32::~SnmpUInt32() -{ -} - -// syntax type -SmiUINT32 SnmpUInt32::get_syntax() -{ - return sNMP_SYNTAX_UINT32; -} - -// object validity -int SnmpUInt32::valid( void) const -{ - return valid_flag; -} - -// overloaded assignment -SnmpUInt32& SnmpUInt32::operator=( const unsigned long int i) -{ - smival.value.uNumber=i; - valid_flag = 1; - return *this; -} - -// general assignment from any Value -SnmpSyntax& SnmpUInt32::operator=( SnmpSyntax &in_val) -{ - if ( this == &in_val ) // handle assignement from itself - return *this; - - valid_flag = 0; // will get set true if really valid - if (in_val.valid()) - { - switch (in_val.get_syntax()) - { - case sNMP_SYNTAX_UINT32: - // case sNMP_SYNTAX_GAUGE32: .. indistinquishable from UINT32 - case sNMP_SYNTAX_CNTR32: - case sNMP_SYNTAX_TIMETICKS: - case sNMP_SYNTAX_INT32: // implied cast int -> uint - this->smival.value.uNumber = - ((SnmpUInt32 &)in_val).smival.value.uNumber; - valid_flag = 1; - break; - } - } - return *this; -} - -// overloaded assignment -SnmpUInt32& SnmpUInt32::operator=( const SnmpUInt32 &uli) -{ - this->smival.value.uNumber = uli.smival.value.uNumber; return *this; -} - -// otherwise, behave like an unsigned long int -SnmpUInt32::operator unsigned long() -{ - return smival.value.uNumber; -} - -// create a new instance of this Value -SnmpSyntax* SnmpUInt32::clone() const -{ - return (SnmpSyntax *) new SnmpUInt32(*this); -} - -// ASCII format return -char * SnmpUInt32::to_string() -{ - sprintf(output_buffer, "%d", (int) (this->smival.value.uNumber)); - return output_buffer; -} - - -//==================================================================== -// INT 32 Implementation -//==================================================================== - -// default constructor -SnmpInt32::SnmpInt32 (const long i) -{ - smival.value.sNumber=i; - smival.syntax = sNMP_SYNTAX_INT32; - valid_flag = 1; -} - -// constructor with value -SnmpInt32::SnmpInt32 (const SnmpInt32 &c) -{ - smival.value.sNumber=c.smival.value.sNumber; - smival.syntax = sNMP_SYNTAX_INT32; - valid_flag = 1; -} - -// destructor -SnmpInt32::~SnmpInt32() -{ -} - -// syntax type -SmiUINT32 SnmpInt32::get_syntax() -{ - return sNMP_SYNTAX_INT32; -} - -// object validity -int SnmpInt32::valid( void) const -{ - return valid_flag; -} - -// overloaded assignment -SnmpInt32& SnmpInt32::operator=( const long i) -{ - this->smival.value.sNumber = (unsigned long) i; - valid_flag = 1; - return *this; -} - -// overloaded assignment -SnmpInt32& SnmpInt32::operator=( const SnmpInt32 &uli) -{ - this->smival.value.sNumber = uli.smival.value.sNumber; - valid_flag = 1; - return *this; -} - -// general assignment from any Value -SnmpSyntax& SnmpInt32::operator=( SnmpSyntax &in_val) -{ - if ( this == &in_val ) // handle assignement from itself - return *this; - - valid_flag = 0; // will get set true if really valid - if (in_val.valid()) - { - switch (in_val.get_syntax()) - { - case sNMP_SYNTAX_INT32: - case sNMP_SYNTAX_UINT32: // implied cast uint -> int - // case sNMP_SYNTAX_GAUGE32: .. indistinquishable from UINT32 - case sNMP_SYNTAX_CNTR32: // implied cast uint -> int - case sNMP_SYNTAX_TIMETICKS: // implied cast uint -> int - this->smival.value.sNumber = - ((SnmpInt32 &)in_val).smival.value.sNumber; - valid_flag = 1; - break; - } - } - return *this; -} - -// otherwise, behave like a long int -SnmpInt32::operator long() -{ - return (long) smival.value.sNumber; -} - -// clone - create a new instance of this Value -SnmpSyntax* SnmpInt32::clone() const -{ - return ( SnmpSyntax *) new SnmpInt32(*this); -} - -// ASCII format return - -char *SnmpInt32::to_string() -{ - sprintf(output_buffer, "%d", (int) (long) this->smival.value.sNumber); - return output_buffer; -} diff --git a/ASNMP/asnmp/integer.h b/ASNMP/asnmp/integer.h deleted file mode 100644 index d0dc2972742..00000000000 --- a/ASNMP/asnmp/integer.h +++ /dev/null @@ -1,140 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef SNMPINTEGER_ -#define SNMPINTEGER_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// integer.cpp -// -// = DESCRIPTION -// Class definition for Integer classes convertable to SMI. -// -// = AUTHOR -// Jeff Meyer -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/smival.h" - -// TODO get rid of this constant -#define INTOUTBUF 15 // largest ASCII formatted integer - -//------------[ Integer Classes ]------------------------------------------ -// The integer class allows all the functionality of the various -// integers but is contained in a Value object for consistency -// among the various types. -// class objects may be set or get into Vb objects. -// - -// 32 bit unsigned integer class -class ACE_Export SnmpUInt32: public SnmpSyntax - // = TITLE - // Implement RFC 1920 Unsigned Integer SMI datatype -{ - - public: - SnmpUInt32 (const unsigned long i = 0); - // default constructor - - SnmpUInt32( const SnmpUInt32 &c); - // copy constructor - - virtual ~SnmpUInt32(); - // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden) - - virtual SmiUINT32 get_syntax(); - // syntax type - - SnmpUInt32& operator=( const unsigned long i); - // overloaded assignment - - SnmpUInt32& operator=( const SnmpUInt32 &uli); - // overloaded assignment - - operator unsigned long(); - // otherwise, behave like an unsigned long int - - virtual char *to_string(); - // get a printable ASCII value - - virtual SnmpSyntax *clone() const; - // create a new instance of this Value - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - int valid() const; - // did object construct properly - - protected: - int valid_flag; - char output_buffer[INTOUTBUF]; - // contain string representation of object -}; - - -// 32 bit signed integer class -class ACE_Export SnmpInt32: public SnmpSyntax -{ - // = TITLE - // Implement RFC 1902 32 bit Integer SMI data object - public: - SnmpInt32 (const long i = 0); - // constructor with value - - SnmpInt32 (const SnmpInt32 &c); - // constructor with value - - virtual ~SnmpInt32(); - // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden) - - virtual SmiUINT32 get_syntax(); - // syntax type - - SnmpInt32& operator=( const long i); - // overloaded assignment - - SnmpInt32& operator=( const SnmpInt32 &li); - // overloaded assignment - - operator long(); - // otherwise, behave like a long int - - SnmpSyntax *clone() const; - // create a new instance of this Value - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - - char *to_string(); - // get a printable ASCII value - - int valid() const; - // logical state of object - - protected: - int valid_flag; - char output_buffer[INTOUTBUF]; - // contain string representation of object -}; - -#endif diff --git a/ASNMP/asnmp/octet.cpp b/ASNMP/asnmp/octet.cpp deleted file mode 100644 index 2a422a5fe88..00000000000 --- a/ASNMP/asnmp/octet.cpp +++ /dev/null @@ -1,594 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// octet.cpp -// -// = DESCRIPTION -// Implements the SMI Octet datatype (RFC 1155) -// This class is fully contained and does not rely on or any other -// SNMP libraries. Ported to ACE by Michael MacFaden mrm@cisco.com -// -// = AUTHOR -// Peter E Mellquist -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "ace/OS.h" -#include "asnmp/octet.h" // include definition for octet class - -ACE_RCSID(asnmp, octet, "$Id$") - -//============[ syntax type ]========================================= -SmiUINT32 OctetStr::get_syntax() -{ - return sNMP_SYNTAX_OCTETS; -} - -inline -void init_octet_smi(SmiVALUE& smi) -{ - smi.syntax = sNMP_SYNTAX_OCTETS; - smi.value.string.ptr = 0; - smi.value.string.len = 0; -} - -inline -void reset_octet_smi(SmiVALUE& smi) -{ - delete [] smi.value.string.ptr; - smi.value.string.ptr = 0; - smi.value.string.len = 0; -} - -inline -int copy_octet_smi(SmiVALUE& smi, int size, const char *src, int& valid_flag) -{ - valid_flag = 0; - - if (smi.value.string.ptr) - delete [] smi.value.string.ptr; - - ACE_NEW_RETURN(smi.value.string.ptr, SmiBYTE[size], 1); - ACE_OS::memcpy( smi.value.string.ptr, src, size); - smi.value.string.len = size; - valid_flag = 1; - return 0; -} - -//============[ default constructor ]========================= -OctetStr::OctetStr( const char * string, long size): - output_buffer(0), validity(0) -{ - - size_t z; - init_octet_smi(smival); - - // check for null string - if ( !string) - return; - - if (size == -1) // calc if no length given - assume c style string - size = z = ACE_OS::strlen( string); - - copy_octet_smi(smival, size, string, validity); -} - - -//============[ set the data on an already constructed Octet ]============ -// TODO: should return status since it can fail in so many places -void OctetStr::set_data( const SmiBYTE* string, long size) -{ - size_t z; - - // invalid args, set octetStr to not valid - if ( !string || !size) { - validity = 0; - return; - } - - // assume non-zero terminated string - if (size == -1) // calc if no length given - assume c style string - size = z = ACE_OS::strlen( (char *)string); - - // free up already used space - if ( smival.value.string.ptr ) { - reset_octet_smi(smival); - } - smival.value.string.len = 0; - - - copy_octet_smi(smival, size, (const char *)string, validity); -} - -//============[ constructor using another octet object ]============== -OctetStr::OctetStr ( const OctetStr &octet): - output_buffer(0), validity(1) -{ - init_octet_smi(smival); - // check for zero len case - if ( octet.smival.value.string.len == 0) { - return; - } - - // must be a valid object - if ( octet.validity == 0) { - validity = 0; - return; - } - - // get the mem needed - copy_octet_smi(smival, octet.smival.value.string.len, - (const char *)octet.smival.value.string.ptr, validity); -} - -//=============[ destructor ]========================================= -OctetStr::~OctetStr() -{ - reset_octet_smi(smival); - delete [] output_buffer; -} - - -//=============[ assignment to a string operator overloaded ]========= -OctetStr& OctetStr::operator=( const char *string) -{ - // get the string size - size_t nz; - - // free up previous memory if needed - if ( smival.value.string.ptr ) { - reset_octet_smi(smival); - } - - // if empty then we are done - if (!string || !(nz = ACE_OS::strlen( string))) { - validity = 1; - return *this; - } - - // get memory needed - copy_octet_smi(smival, nz, string, validity); - return *this; -} - -//=============[ assignment to another oid object overloaded ]======== -OctetStr& OctetStr::operator=( const OctetStr &octet) -{ - // protect against assignment from self - if ( this == &octet ) - return *this; - - // don't assign from invalid objs - if (!octet.validity) { - return *this; - } - - // free up previous memory if needed - if ( smival.value.string.len ) { - reset_octet_smi(smival); - } - - if (!octet.smival.value.string.len) { - validity = 1; - return *this; - } - - // get some memory - copy_octet_smi(smival, octet.smival.value.string.len, - (const char*) octet.smival.value.string.ptr, validity); - return *this; // return self reference -} - -//==============[ equivlence operator overloaded ]==================== -int operator==( const OctetStr &lhs, const OctetStr &rhs) -{ - if( lhs.left_comparison( rhs.smival.value.string.len, rhs)==0) - return 1; - else - return 0; -} - -//==============[ not equivlence operator overloaded ]================ -int operator!=( const OctetStr &lhs, const OctetStr &rhs) -{ - if( lhs.left_comparison( rhs.smival.value.string.len, rhs)!=0) - return 1; - else - return 0; -} - -//==============[ less than < overloaded ]============================ -int operator<( const OctetStr &lhs, const OctetStr &rhs) -{ - if( lhs.left_comparison( rhs.smival.value.string.len, rhs)<0) - return 1; - else - return 0; -} - -//==============[ less than <= overloaded ]=========================== -int operator<=( const OctetStr &lhs, const OctetStr &rhs) -{ - if(( lhs.left_comparison( rhs.smival.value.string.len, rhs)<0) || - ( lhs.left_comparison( rhs.smival.value.string.len, rhs)==0)) - return 1; - else - return 0; -} - -//===============[ greater than > overloaded ]======================== -int operator>( const OctetStr &lhs, const OctetStr &rhs) -{ - if( lhs.left_comparison( rhs.smival.value.string.len, rhs)>0) - return 1; - else - return 0; -} - -//===============[ greater than >= overloaded ]======================= -int operator>=( const OctetStr &lhs, const OctetStr &rhs) -{ - if(( lhs.left_comparison( rhs.smival.value.string.len, rhs)>0) || - ( lhs.left_comparison( rhs.smival.value.string.len, rhs)==0)) - return 1; - else - return 0; -} - -//===============[ equivlence operator overloaded ]=================== -int operator==( const OctetStr &lhs,const char *rhs) -{ - OctetStr to( rhs); - if( lhs.left_comparison( to.smival.value.string.len,to)==0) - return 1; - else - return 0; -} - -//===============[ not equivlence operator overloaded ]=============== -int operator!=( const OctetStr &lhs,const char *rhs) -{ - OctetStr to( rhs); - if ( lhs.left_comparison( to.smival.value.string.len,to)!=0) - return 1; - else - return 0; -} - -//===============[ less than < operator overloaded ]================== -int operator<( const OctetStr &lhs,const char *rhs) -{ - OctetStr to( rhs); - if ( lhs.left_comparison( to.smival.value.string.len,to)<0) - return 1; - else - return 0; -} - -//===============[ less than <= operator overloaded ]================= -int operator<=( const OctetStr &lhs,char *rhs) -{ - OctetStr to( rhs); - if (( lhs.left_comparison( to.smival.value.string.len,to)<0) || - ( lhs.left_comparison( to.smival.value.string.len,to)==0)) - return 1; - else - return 0; -} - -//===============[ greater than > operator overloaded ]=============== -int operator>( const OctetStr &lhs,const char *rhs) -{ - OctetStr to( rhs); - if ( lhs.left_comparison( to.smival.value.string.len,to)>0) - return 1; - else - return 0; -} - -//===============[ greater than >= operator overloaded ]============== -int operator>=( const OctetStr &lhs,const char *rhs) -{ - OctetStr to( rhs); - if (( lhs.left_comparison( to.smival.value.string.len,to)>0) || - ( lhs.left_comparison( to.smival.value.string.len,to)==0)) - return 1; - else - return 0; -} - -//===============[ append operator, appends a string ]================ -OctetStr& OctetStr::operator+=( const char *a) -{ - SmiBYTE *tmp; // temp pointer - size_t slen,nlen; - - // get len of string - if ( !a || ((slen = ACE_OS::strlen( a)) == 0)) - return *this; - - // total len of octet - nlen = slen + (size_t) smival.value.string.len; - ACE_NEW_RETURN(tmp, SmiBYTE [ nlen], *this); - ACE_OS::memcpy ( tmp, smival.value.string.ptr, - (size_t) smival.value.string.len); - ACE_OS::memcpy( tmp + smival.value.string.len, a, (size_t) slen); - // delete the original - if ( smival.value.string.ptr ) - reset_octet_smi(smival); - smival.value.string.ptr = tmp; - smival.value.string.len = nlen; - return *this; -} - -//================[ append one OctetStr to another ]================== -OctetStr& OctetStr::operator+=( const OctetStr& octetstr) -{ - SmiBYTE *tmp; // temp pointer - size_t slen,nlen; - - if (!octetstr.validity || - !(slen = (size_t)octetstr.length())) - return *this; - - // total len of octet - nlen = slen + (size_t) smival.value.string.len; - // get mem needed - ACE_NEW_RETURN(tmp, SmiBYTE[ nlen], *this); - ACE_OS::memcpy ( tmp, smival.value.string.ptr, - (size_t) smival.value.string.len); - ACE_OS::memcpy( tmp + smival.value.string.len, octetstr.data(), - (size_t) slen); - if ( smival.value.string.ptr ) - reset_octet_smi(smival); - smival.value.string.ptr = tmp; - smival.value.string.len = nlen; - return *this; -} - -//================[ appends an int ]================================== -OctetStr& OctetStr::operator+=( const char c) -{ - SmiBYTE *tmp; - // get the memory needed plus one extra byte - ACE_NEW_RETURN(tmp, SmiBYTE[ smival.value.string.len + 1], *this); - ACE_OS::memcpy ( tmp, smival.value.string.ptr, - (size_t) smival.value.string.len); // len of original - tmp[ smival.value.string.len ] = c; // assign in byte - if ( smival.value.string.ptr ) // delete the original - reset_octet_smi(smival); - - smival.value.string.ptr = tmp; // point to one - smival.value.string.len++; // up the len - return *this; -} - - -//================[ compare n elements of an Octet ]================== -int OctetStr::left_comparison( const long n, const OctetStr &o) const -{ - long z, w; - - // both are empty, they are equal - if (( smival.value.string.len == 0) && - ( o.smival.value.string.len == 0)) - return 0; // equal - - // self is empty and param has something - if (( smival.value.string.len == 0) && - ( o.smival.value.string.len >0) && - (n>0)) - return -1; - - // self has something and param has nothing - if (( smival.value.string.len > 0) && - ( o.smival.value.string.len ==0) && - (n>0)) - return 1; - - // special case - if (( smival.value.string.len == 0) && - ( o.smival.value.string.len > 0) && - ( n == 0)) - return 0; - - // pick the Min of n, this and the param len - // this is the maximum # to iterate a search - w = smival.value.string.len < o.smival.value.string.len - ? smival.value.string.len : o.smival.value.string.len; - if (n o.smival.value.string.ptr[z]) - return 1; // greater than - z++; - } - - if (( z == 0) && - ( smival.value.string.len == 0) && - ( o.smival.value.string.len > 0)) - return -1; - - if (( z == 0) && - ( o.smival.value.string.len == 0) && - ( smival.value.string.len > 0)) - return 1; - - return 0; -} - -//================[ return the length of the oid ]======================= -size_t OctetStr::length() const -{ - return (size_t) smival.value.string.len; -} - -//================[ operator[]: access as if array ]================== -SmiBYTE& OctetStr::operator[]( int position) -{ - return smival.value.string.ptr[position]; -} - -//===============[ reuturns pointer to internal data ]=============== -SmiBYTE * OctetStr::data() const -{ - return smival.value.string.ptr; -} - -//================[ returns validity ]================================ -int OctetStr::valid() const -{ - return validity; -} - -//================[ clone() ]========================================= -SnmpSyntax * OctetStr::clone() const -{ - OctetStr *tmp = new OctetStr(*this); - return ( SnmpSyntax *) tmp; -} - -//================[ ASCII format return ]============================= -char * OctetStr::to_string() -{ - for ( unsigned long i=0; i < smival.value.string.len; i++) { - if (( smival.value.string.ptr[i] != '\r')&& - ( smival.value.string.ptr[i] != '\n')&& - (isprint((int) (smival.value.string.ptr[i]))==0)) - return(to_string_hex()); - } - - if ( output_buffer != 0) - delete [] output_buffer; - - ACE_NEW_RETURN(output_buffer, char[smival.value.string.len + 1], ""); - if (smival.value.string.len) - ACE_OS::memcpy(output_buffer, smival.value.string.ptr, - (int) smival.value.string.len); - output_buffer[smival.value.string.len] = '\0'; - return output_buffer; -} - - -//================[ general Value = operator ]======================== -SnmpSyntax& OctetStr::operator=( SnmpSyntax &val) -{ - // protect against assignment from self - if ( this == &val ) - return *this; - - // blow away the old value - validity=0; - if (smival.value.string.ptr) { - reset_octet_smi(smival); - } - smival.value.string.len = 0; - if (val.valid()){ - switch (val.get_syntax()) { - case sNMP_SYNTAX_OCTETS: - case sNMP_SYNTAX_IPADDR: - set_data( ((OctetStr &)val).smival.value.string.ptr, - ((OctetStr &)val).smival.value.string.len); - break; - } - } - return *this; -} - -//================[ format the output into hex ]======================== -char *OctetStr::to_string_hex() -{ - int cnt; - char char_buf[80]; // holds ASCII representation of data - char *buf_ptr; // pointer into ASCII listing - char *line_ptr; // pointer into Hex listing - int storageNeeded; // how much space do we need ? - int local_len = (int) smival.value.string.len; - SmiBYTE *bytes = smival.value.string.ptr; - - - storageNeeded = (int) ((smival.value.string.len/16)+1) * 72 + 1; - - if ( output_buffer != 0) - delete [] output_buffer; - - ACE_NEW_RETURN(output_buffer, char[storageNeeded], ""); - - line_ptr = output_buffer; - - /*----------------------------------------*/ - /* processing loop for entire data buffer */ - /*----------------------------------------*/ - while (local_len > 0) { - cnt = 16; /* print 16 bytes per line */ - buf_ptr = char_buf; - sprintf(line_ptr, " "); - line_ptr += 2; /* indent */ - - /*-----------------------*/ - /* process a single line */ - /*-----------------------*/ - while (cnt-- > 0 && local_len-- > 0) { - sprintf(line_ptr, "%2.2X ", *bytes); - - line_ptr +=3; /* the display of a byte always 3 chars long */ - if (isprint(*bytes)) - sprintf(buf_ptr, "%c", *bytes); - else - sprintf(buf_ptr, "."); - bytes++; - buf_ptr++; - } - cnt++; - - /*----------------------------------------------------------*/ - /* this is to make sure that the ASCII displays line up for */ - /* incomplete lines of hex */ - /*----------------------------------------------------------*/ - while (cnt-- > 0) { - sprintf(line_ptr," "); - line_ptr += 3; - } - - /*------------------------------------------*/ - /* append the ASCII display to the Hex line */ - /*------------------------------------------*/ - -// TODO: verify ACE_OS:: on NT works like this or not -#if defined(__unix) - char *fmt = " %s\n"; -#endif // __unix - -#if defined(_WIN32) - char *fmt = " %s\r\n"; -#endif // _WIN32 - - ACE_OS::sprintf(line_ptr, fmt, char_buf); - line_ptr += 3 + strlen(char_buf); - } - - return output_buffer; -} diff --git a/ASNMP/asnmp/octet.h b/ASNMP/asnmp/octet.h deleted file mode 100644 index 28b3d9fda21..00000000000 --- a/ASNMP/asnmp/octet.h +++ /dev/null @@ -1,150 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef OCTET_CLS_ -#define OCTET_CLS_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// octet.h -// -// = DESCRIPTION -// This class is fully contained and does not rely on or any other -// SNMP libraries. This class is portable across any platform -// which supports C++. -// -// = AUTHOR -// Peter E Mellquist / design/original code -// Michael R. MacFaden / modified for ACE, added suboid(),collapse ctor's -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -//------------------------------------------------------------------------ -#include "asnmp/smival.h" - -class ACE_Export OctetStr: public SnmpSyntax - // = TITLE - // Implement RFC1155 Octet SMI data object - -{ -public: - OctetStr( const char *string = "", long size = -1); - // construct octet from byte buffer, assume c style string if size == -1 - - OctetStr ( const OctetStr &octet); - // constructor using another octet object - - ~OctetStr(); - // destructor - - SmiUINT32 get_syntax(); - // syntax type - - void set_data( const SmiBYTE* string, long int size = -1); - // set octet from byte buffer, assume c style string if size == -1 - - OctetStr& operator=( const char *string); - // assignment to a string operator overloaded - - OctetStr& operator=( const OctetStr &octet); - // assignment to another oid object overloaded - - friend int operator==( const OctetStr &lhs, const OctetStr &rhs); - // equivlence operator overloaded - - friend int operator!=( const OctetStr &lhs, const OctetStr &rhs); - // not equivlence operator overloaded - - friend int operator<( const OctetStr &lhs, const OctetStr &rhs); - // less than < overloaded - - friend int operator<=( const OctetStr &lhs,const OctetStr &rhs); - // less than <= overloaded - - friend int operator>( const OctetStr &lhs, const OctetStr &rhs); - // greater than > overloaded - - friend int operator>=( const OctetStr &lhs, const OctetStr &rhs); - // greater than >= overloaded - - friend int operator==( const OctetStr &lhs,const char *rhs); - // equivlence operator overloaded - - friend int operator!=( const OctetStr &lhs,const char *rhs); - // not equivlence operator overloaded - - friend int operator<( const OctetStr &lhs,const char *rhs); - // less than < operator overloaded - - friend int operator<=( const OctetStr &lhs,char *rhs); - // less than <= operator overloaded - - friend int operator>( const OctetStr &lhs,const char *rhs); - // greater than > operator overloaded - - friend int operator>=( const OctetStr &lhs,const char *rhs); - // greater than >= operator overloaded - - OctetStr& operator+=( const char *a); - // append operator, appends a string - - OctetStr& operator+=( const char c); - // appends an int - - OctetStr& operator+=( const OctetStr& octetstr); - // append one octetStr to another - - SmiBYTE& operator[]( int position); - // for non const [], allows reading and writing - - int left_comparison( const long n, const OctetStr &o) const; - // compare the n leftmost bytes (left-to-right) - // returns 0, equal - // returns -1, < - // returns 1 , > - - size_t length() const ; - // return the len of the oid - - int valid() const; - // returns validity - - SmiBYTE *data() const; - // returns pointer to internal data - - char *to_string(); - // get a printable ASCII value - - char *to_string_hex(); - // get an ASCII formattted hex dump of the contents - - SnmpSyntax *clone() const; - // create a new instance of this Value - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - -protected: - //----[ instance variables ] - char *output_buffer; // formatted Octet value - int validity; // validity boolean -}; - -#endif // OCTET_CLS_ diff --git a/ASNMP/asnmp/oid.cpp b/ASNMP/asnmp/oid.cpp deleted file mode 100644 index d0bbcd3c4aa..00000000000 --- a/ASNMP/asnmp/oid.cpp +++ /dev/null @@ -1,800 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// oid.cpp -// -// = DESCRIPTION -// This module contains the implementation of the oid class. This -// includes all protected and public member functions. The oid class -// may be compiled stand alone without the use of any other library. -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS" without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -//---------[ external C libaries used ]-------------------------------- - -#include "asnmp/oid.h" // include def for oid class - -ACE_RCSID(asnmp, oid, "$Id$") - -enum Defs {SNMPBUFFSIZE=300, - SNMPCHARSIZE=15}; // max oid value (4294967295UL) - -#define NO_MEM_STR "ERROR: Oid::to_string: memory allocation failure" - -//=============[Oid::get_syntax(void)]==================================== -SmiUINT32 Oid::get_syntax() -{ - return sNMP_SYNTAX_OID; -} - - -//=============[Oid::Oid( const char *dotted_string ]===================== -// constructor using a dotted string -// -// do a string to oid using the string passed in -Oid::Oid( const char * dotted_oid_string, size_t size) -{ - // can't init enum SmiValue so just memset it clean - set_null(); - - size_t z; - if ((z = ACE_OS::strlen(dotted_oid_string)) == 0) { - set_invalid(); - return; - } - - if (size == (unsigned int)-1) - size = z; - if (size > z) - size = z; - - char *ptr = (char *)dotted_oid_string;; - if (size < z) { - // create new buffer if needed - ACE_NEW(ptr, char [size]); - - // sz should be in StrToOid? - ACE_OS::memcpy( (void *)ptr, dotted_oid_string, size); - } - - size_t byte_counter; - if (StrToOid( (char *) ptr, &smival.value.oid, byte_counter) < 0) - set_invalid(); - if (ptr != dotted_oid_string) - delete [] ptr; -} - - -//=============[Oid::Oid( const Oid &oid) ]================================ -// constructor using another oid object -// -// do an oid copy using the oid object passed in -Oid::Oid ( const Oid &oid) -{ - set_null(); - - // allocate some memory for the oid - // in this case the size to allocate is the same - // size as the source oid - if (oid.smival.value.oid.len) { - ACE_NEW(smival.value.oid.ptr, SmiUINT32[ oid.smival.value.oid.len]); - size_t byte_counter; - OidCopy( (SmiLPOID) &(oid.smival.value.oid),(SmiLPOID) - &smival.value.oid, byte_counter); - } -} - - -//=============[Oid::Oid( const unsigned long *raw_oid, int oid_len) ]==== -// constructor using raw numeric form -// -// copy the integer values into the private member -Oid::Oid(const unsigned long *raw_oid, size_t oid_len) -{ - set_null(); - - smival.syntax = sNMP_SYNTAX_OID; - set_invalid(); - - if (raw_oid && oid_len > 0) { - ACE_NEW(smival.value.oid.ptr, SmiUINT32[ oid_len]); - smival.value.oid.len = oid_len; - for (size_t i=0; i < oid_len; i++) - smival.value.oid.ptr[i] = raw_oid[i]; - } -} - -//=============[Oid::~Oid]============================================== -// destructor -// -// free up the descriptor space -Oid::~Oid() -{ - // free up the octet deep memory - if ( smival.value.oid.ptr ) { - set_invalid(); - } - - // free up the output string - if ( iv_str != 0) - delete [] iv_str; -} - - -//=============[Oid::operator = const char * dotted_string ]============== -// assignment to a string operator overloaded -// -// free the existing oid -// create the new oid from the string -// return this object -void Oid::set_data( const char *dotted_oid_string) -{ - // delete the old value - if ( smival.value.oid.ptr ) { - set_invalid(); - } - - // assign the new value - size_t byte_counter; - if (StrToOid( (char *) dotted_oid_string, &smival.value.oid, byte_counter) <0) - set_invalid(); -} - - -//=============[Oid:: operator = const Oid &oid ]========================== -// assignment to another oid object overloaded -// -// free the existing oid -// create a new one from the object passed in -// TODO: measure perf vs memory of no realloc in case where len >= oid.len -Oid& Oid::operator=( const Oid &oid) -{ - // protect against assignment from self - if ( this == &oid) - return *this; - - set_invalid(); - - // check for zero len on source - if ( oid.smival.value.oid.len == 0) - return *this; - - init_value((const SmiLPOID) &(oid.smival.value.oid), - oid.smival.value.oid.len); - return *this; -} - -// assign this object the oid, set to invalid if copy fails -void Oid::init_value(const SmiLPOID srcOid, size_t len) -{ - // allocate some memory for the oid - ACE_NEW(smival.value.oid.ptr, SmiUINT32[ len]); - size_t byte_counter; - OidCopy( srcOid, (SmiLPOID) &smival.value.oid, byte_counter); -} - -void Oid::init_value(const unsigned long *raw_oid, size_t oid_len) -{ - if (smival.value.oid.ptr) - delete [] smival.value.oid.ptr; - - ACE_NEW(smival.value.oid.ptr, SmiUINT32[ oid_len]); - ACE_OS::memcpy((SmiLPBYTE) smival.value.oid.ptr, - (SmiLPBYTE) raw_oid, - (size_t) (oid_len * sizeof(SmiUINT32))); - smival.value.oid.len = oid_len; -} - -//==============[Oid:: operator += const char *a ]========================= -// append operator, appends a string -// -// allocate some space for a max oid string -// extract current string into space -// concat new string -// free up existing oid -// make a new oid from string -// delete allocated space -Oid& Oid::operator+=( const char *a) -{ - unsigned long n; - - if (!a) - return *this; - - if ( *a=='.') - a++; - size_t sz = ACE_OS::strlen(a); - - if (valid()) { - n = (smival.value.oid.len *SNMPCHARSIZE) + smival.value.oid.len + 1 + sz; - char *ptr; - ACE_NEW_RETURN(ptr, char[ n], *this); - size_t byte_counter; - if (OidToStr(&smival.value.oid, n,ptr, byte_counter) > 0) { - delete [] ptr; - set_invalid(); - return *this; - } - - if (ACE_OS::strlen(ptr)) - ACE_OS::strcat(ptr,"."); - ACE_OS::strcat(ptr,a); - if ( smival.value.oid.len !=0) { - set_invalid(); - delete [] smival.value.oid.ptr; - smival.value.oid.len = 0; - } - - if (StrToOid( (char *) ptr, &smival.value.oid, byte_counter) < 0) { - set_invalid(); - } - delete [] ptr; - } - else { - size_t byte_counter; - if (StrToOid( (char *) a, &smival.value.oid, byte_counter) < 0) { - set_invalid(); - } - } - - return *this; -} - -//=============[ int operator == oid,oid ]================================= -// equivlence operator overloaded -int operator==( const Oid &lhs, const Oid &rhs) -{ - // ensure same len, then use left_comparison - if (rhs.length() != lhs.length()) - return 0; - if( lhs.left_comparison( rhs.length(), rhs) == 0) - return 1; - else - return 0; -} - -//==============[ operator!=( Oid &x,Oid &y) ]============================= -//not equivlence operator overloaded -int operator!=( const Oid &lhs,const Oid &rhs) -{ - return (!(lhs == rhs)); -} - -//==============[ operator<( Oid &x,Oid &y) ]============================= -// less than < overloaded -int operator<( const Oid &lhs,const Oid &rhs) -{ - int result; - - // call left_comparison with the current - // Oidx, Oidy and len of Oidx - if ((result = lhs.left_comparison( rhs.length(), rhs)) < 0) - return 1; - else if (result > 0) - return 0; - - else{ - // if here, equivalent substrings, call the shorter one < - if (lhs.length() < rhs.length()) - return 1; - else - return 0; - } -} - -//==============[ operator<=( Oid &x,Oid &y) ]============================= -// less than <= overloaded -int operator<=( const Oid &x,const Oid &y) -{ - if ( (x < y) || (x == y) ) - return 1; - else - return 0; -} - -//==============[ operator>( Oid &x,Oid &y) ]============================= -// greater than > overloaded -int operator>( const Oid &x,const Oid &y) -{ - // just invert existing <= - if (!(x<=y)) - return 1; - else - return 0; -} - -//==============[ operator>=( Oid &x,Oid &y) ]============================= -// greater than >= overloaded -int operator>=( const Oid &x,const Oid &y) -{ - // just invert existing < - if (!(x0)) { - smival.value.oid.len -= n; - - if (smival.value.oid.len == 0) { - set_invalid(); - } - } -} - -//===============[Oid::set_invalid() ]==================== -// make this object invalid by resetting all values -void Oid::set_invalid() { - delete [] smival.value.oid.ptr; - smival.value.oid.ptr = 0; - smival.value.oid.len = 0; - delete [] iv_str; - iv_str = 0; -} - -//===============[Oid::set_null() ]==================== -void Oid::set_null() { - smival.syntax = sNMP_SYNTAX_OID; - smival.value.oid.ptr = 0; - smival.value.oid.len = 0; - iv_str = 0; -} - -//===============[Oid::operator += const unsigned int) ]==================== -// append operator, appends an int -// -// allocate some space for a max oid string -// extract current string into space -// concat new string -// free up existing oid -// make a new oid from string -// delete allocated space -Oid& Oid::operator+=( const unsigned long i) -{ - unsigned long n = (smival.value.oid.len * SNMPCHARSIZE) - + ( smival.value.oid.len -1) + 1 + 4; - char buffer[SNMPBUFFSIZE]; - - // two cases: null oid, existing oid - if (valid()) { - // allocate some temporary space - char *ptr; - ACE_NEW_RETURN(ptr, char[ n], *this); - size_t byte_counter; - if (OidToStr(&smival.value.oid, n, ptr, byte_counter) < 0) { - set_invalid(); - delete [] ptr; - return *this; - } - - if (ACE_OS::strlen(ptr)) - ACE_OS::strcat(ptr,"."); - - if (ACE_OS::sprintf( buffer,"%u",i) != -1) { - ACE_OS::strcat(ptr, buffer); - if ( smival.value.oid.ptr ) { - set_invalid(); - } - if (StrToOid( (char *) ptr, &smival.value.oid, byte_counter) < 0) { - set_invalid(); - } - delete [] ptr; - } - } - else { - init_value((const unsigned long *)&i, (size_t)1); - } - - return *this; -} - -//===============[Oid::operator += const Oid) ]======================== -// append operator, appends an Oid -// -// allocate some space for a max oid string -// extract current string into space -// concat new string -// free up existing oid -// make a new oid from string -// delete allocated space -Oid& Oid::operator+=( const Oid &o) -{ - SmiLPUINT32 new_oid; - - if (o.smival.value.oid.len == 0) - return *this; - - ACE_NEW_RETURN(new_oid, - SmiUINT32[ smival.value.oid.len + o.smival.value.oid.len], *this); - if (smival.value.oid.ptr) { - ACE_OS::memcpy((SmiLPBYTE) new_oid, - (SmiLPBYTE) smival.value.oid.ptr, - (size_t) (smival.value.oid.len*sizeof(SmiUINT32))); - - delete [] smival.value.oid.ptr; - } - - // out with the old, in with the new... - smival.value.oid.ptr = new_oid; - - ACE_OS::memcpy((SmiLPBYTE) &new_oid[smival.value.oid.len], - (SmiLPBYTE) o.smival.value.oid.ptr, - (size_t) (o.smival.value.oid.len*sizeof(SmiUINT32))); - - smival.value.oid.len += o.smival.value.oid.len; - return *this; -} - -// return string portion of the oid -// -char * Oid::to_string() -{ - unsigned long n; - if (!valid()) - return ""; // be consistent with other classes - - // the worst case char len of an oid can be.. - // oid.len*3 + dots in between if each oid is XXXX - // so.. size = (len*4) + (len-1) + 1 , extra for a null - - n = (smival.value.oid.len *SNMPCHARSIZE) + ( smival.value.oid.len -1) + 1 ; - if (n == 0) - n = 1; // need at least 1 byte for a null string - - // adjust the len of output array in case size was adjusted - if ( iv_str != 0) - delete [] iv_str; - // allocate some space for the output string - ACE_NEW_RETURN(iv_str, char[ n], ""); - - // convert to an output string - size_t how_many; - if ( valid() && iv_str != 0) - if (OidToStr(&smival.value.oid,n,iv_str, how_many) < 0) - return "ERROR: Oid::OidToStr failed"; - return iv_str; -} - -//==============[Oid::suboid( unsigned int start, n) ]============= -int Oid::suboid(Oid& new_oid, size_t start, size_t how_many) -{ - if (how_many == 0) - return 0; - else - if (how_many == (size_t)-1) - how_many = length(); - else - if (how_many > length()) - how_many = length(); - - // reset new_oid - new_oid.set_invalid(); - - size_t new_size = how_many - start; - if (new_size == 0) - new_size++; - new_oid.smival.value.oid.len = new_size; - ACE_NEW_RETURN(new_oid.smival.value.oid.ptr, - SmiUINT32 [ new_oid.smival.value.oid.len], -1); - // copy source to destination - ACE_OS::memcpy( (SmiLPBYTE) new_oid.smival.value.oid.ptr, - (SmiLPBYTE) (smival.value.oid.ptr + start), - new_size * sizeof(SmiLPBYTE)); - return 0; -} - - -//=============[Oid::StrToOid( char *string, SmiLPOID dst) ]============== -// convert a string to an oid -int Oid::StrToOid( const char *string, SmiLPOID dstOid, size_t& how_many) -{ - size_t index = 0; - size_t number = 0; - - // make a temp buffer to copy the data into first - SmiLPUINT32 temp; - unsigned long nz; - - if (string && *string) { - nz = ACE_OS::strlen( string); - } - else { - dstOid->len = 0; - dstOid->ptr = 0; - return -1; - } - - ACE_NEW_RETURN(temp, SmiUINT32[ nz], -1); - while (*string!=0 && indexptr, SmiUINT32[ index], -1); - // TODO: make tmp autoptr type delete [] temp to prevent leak - - // copy in the temp data - ACE_OS::memcpy((SmiLPBYTE) dstOid->ptr, (SmiLPBYTE) temp, - (size_t) (index*sizeof(SmiUINT32))); - - // set the len of the oid - dstOid->len = index; - - // free up temp data - delete [] temp; - - how_many = index; - return 0; -} - - -//===============[Oid::OidCopy( source, destination) ]==================== -// Copy an oid, return bytes copied -int Oid::OidCopy( SmiLPOID srcOid, SmiLPOID dstOid, size_t& how_many_bytes) -{ - // check source len ! zero - if (srcOid->len == 0) - return -1; - - // copy source to destination - ACE_OS::memcpy((SmiLPBYTE) dstOid->ptr, - (SmiLPBYTE) srcOid->ptr, - (size_t) (srcOid->len * sizeof(SmiUINT32))); - - //set the new len - dstOid->len = srcOid->len; - how_many_bytes = srcOid->len; - - return 0; -} - - -//===============[Oid::left_comparison( n, Oid) ]================================= -// compare the n leftmost values of two oids ( left-to_right ) -// -// self == Oid then return 0, they are equal -// self < Oid then return -1, < -// self > Oid then return 1, > -int Oid::left_comparison( const unsigned long n, const Oid &o) const -{ - unsigned long z; - unsigned long len = n; - int reduced_len = 0; - - // 1st case they both are null - if (( len==0)&&( this->smival.value.oid.len==0)) - return 0; // equal - - // verify that n is valid, must be >= 0 - if ( len <=0) - return 1; // ! equal - - // only compare for the minimal length - if (len > this->smival.value.oid.len) { - len = this->smival.value.oid.len; - reduced_len = 1; - } - if (len > o.smival.value.oid.len) { - len = o.smival.value.oid.len; - reduced_len = 1; - } - - z = 0; - while(z < len) { - if ( this->smival.value.oid.ptr[z] < o.smival.value.oid.ptr[z]) - return -1; // less than - if ( this->smival.value.oid.ptr[z] > o.smival.value.oid.ptr[z]) - return 1; // greater than - z++; - } - - // if we truncated the len then these may not be equal - if (reduced_len) { - if (this->smival.value.oid.len < o.smival.value.oid.len) - return -1; - if (this->smival.value.oid.len > o.smival.value.oid.len) - return 1; - } - return 0; // equal - -} - - -//===============[Oid::left_comparison( n, Oid) ]================================= -// compare the n rightmost bytes (right-to-left) -// returns 0, equal -// returns -1, < -// returns 1 , > -int Oid::right_comparison( const unsigned long n, const Oid &o) const -{ - // oid to compare must have at least the same number - // of sub-ids to comparison else the argument Oid is - // less than THIS - if ( o.length() < n) - return -1; - - // also can't compare argument oid for sub-ids which - // THIS does not have - if ( this->length() < n) - return -1; - - int start = (int) this->length(); - int end = (int) start - (int) n; - for ( int z=start;z< end;z--) - { - if ( o.smival.value.oid.ptr[z] < this->smival.value.oid.ptr[z]) - return -1; - if ( o.smival.value.oid.ptr[z] > this->smival.value.oid.ptr[z]) - return 1; - } - - return 0; // they are equal - -} - - -//================[ Oid::valid() ]======================================== -// is the Oid object valid -// returns validity -int Oid::valid() const -{ - return ( smival.value.oid.ptr ? 1 : 0 ); -} - -//================[Oid::OidToStr ]========================================= -// convert an oid to a string -int Oid::OidToStr( SmiLPOID srcOid, unsigned long size, - char *string, size_t& how_many_bytes) -{ - unsigned long index = 0; - unsigned totLen = 0; - char szNumber[SNMPBUFFSIZE]; - - // init the string - string[totLen] = 0; - - // verify there is something to copy - if (srcOid->len == 0) - return -1; - - // loop through and build up a string - for (index=0; index < srcOid->len; index++) { - - // convert data element to a string - if (ACE_OS::sprintf( szNumber,"%u", srcOid->ptr[index]) == -1) - return -1; - - // verify len is not over - if (totLen + ACE_OS::strlen(szNumber) + 1 >= size) - return -2; - - // if not at end, pad with a dot - if (totLen!=0) - string[totLen++] = '.'; - - // copy the string token into the main string - ACE_OS::strcpy(string + totLen, szNumber); - - // adjust the total len - totLen += ACE_OS::strlen(szNumber); - } - - how_many_bytes = totLen + 1; - return 0; -} - - -//================[ general Value = operator ]======================== -SnmpSyntax& Oid::operator=( SnmpSyntax &val) -{ - // protect against assignment from self - if ( this == &val ) - return *this; - - // blow away old value - smival.value.oid.len = 0; - if (smival.value.oid.ptr) { - set_invalid(); - } - - // assign new value - if (val.valid()) { - switch (val.get_syntax()) { - case sNMP_SYNTAX_OID: - set_data( ((Oid &)val).smival.value.oid.ptr, - (unsigned int)((Oid &)val).smival.value.oid.len); - break; - } - } - return *this; -} - -//================[ [] operator ]===================================== -unsigned long& Oid::operator[](size_t position) -{ - return smival.value.oid.ptr[position]; -} - -//================[ clone ]=========================================== -SnmpSyntax *Oid::clone() const -{ - return (SnmpSyntax *) new Oid(*this); -} diff --git a/ASNMP/asnmp/oid.h b/ASNMP/asnmp/oid.h deleted file mode 100644 index 16020e374c0..00000000000 --- a/ASNMP/asnmp/oid.h +++ /dev/null @@ -1,170 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef OID_CLS_ -#define OID_CLS_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// oid.h -// -// = DESCRIPTION -// This class is fully contained and does not rely on or any other -// SNMP libraries. This class is portable across any platform -// which supports C++. Ported to ACE by Mike MacFaden mrm@cisco.com -// and modified for MT. Some API cleanup: collapse constructors, -// add suboid() method remove unnecessary overload, and update a few -// names and types to improve clarity. -// -// = AUTHOR -// Peter E Mellquist -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -//----------[ extern C libraries Needed ]--------------------------------- -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "asnmp/smival.h" // derived class for all values - -class ACE_Export Oid: public SnmpSyntax - // = TITLE - // Implement RFC 1155 Object Identifier (OID) datatype -{ -public: - Oid( const char * dotted_oid_string = "", size_t size = unsigned(-1) ); - // constructor using a dotted string - - Oid ( const Oid &oid); - // constructor using another oid object - - Oid(const unsigned long *raw_oid, size_t oid_len); - // constructor from raw form - - ~Oid(); - // destructor - - SmiUINT32 get_syntax(); - // syntax type - - Oid& operator=( const Oid &oid); - // assignment to another oid object overloaded - - friend int operator==( const Oid &lhs,const Oid &rhs); - // equal operator overloaded - - friend int operator!=( const Oid &lhs,const Oid &rhs); - // not equal operator overloaded - - friend int operator<( const Oid &lhs,const Oid &rhs); - // less than < overloaded - - friend int operator<=( const Oid &lhs,const Oid &rhs); - // less than <= overloaded - - friend int operator>( const Oid &lhs,const Oid &rhs); - // greater than > overloaded - - friend int operator>=( const Oid &lhs,const Oid &rhs); - // greater than >= overloaded - - Oid& operator+=( const char *a); - // append operator, appends a string - - Oid& operator+=( const unsigned long i); - // appends an int - - Oid& operator+=( const Oid &o); - // appends an Oid - - unsigned long & operator[]( size_t position); - // allows element access - - SmiLPOID oidval(); - // return the WinSnmp oid part - - void set_data( const char *dotted_oid_string); - // reset the data from raw 1 byte format - - void set_data( const unsigned long *raw_oid, const size_t oid_len); - // reset the data from raw 4byte integer format - - size_t length() const; - // return the len of the oid - - void trim( const size_t how_many = 1); - // trim off the n rightmost values of an oid - - int suboid(Oid& oid, size_t start = 0, size_t how_many = -1); - // the equivalent of a substr(new_str, 0, 1) - - int left_comparison( const unsigned long n, const Oid &o) const; - // compare the n leftmost bytes (left-to-right) - // returns 0, equal - // returns -1, < - // returns 1 , > - - - int right_comparison( const unsigned long n, const Oid &o) const; - // compare the n rightmost bytes (right-to-left) - // returns 0, equal - // returns -1, < - // returns 1 , > - - int valid() const; - // is the Oid object valid - - char *to_string(); - // return dotted string value from the right - // where the user specifies how many positions to print - - SnmpSyntax *clone() const; - // create a new instance of this Value - - SnmpSyntax& operator=( SnmpSyntax &val); - // copy an instance of this Value - -protected: - char *iv_str; - // used for returning oid string - - int StrToOid( const char *string, SmiLPOID dstOid, size_t& how_many_bytes); - // convert a string to an smi oid - - int OidCopy( SmiLPOID srcOid, SmiLPOID dstOid, size_t& how_many_bytes); - // clone an smi oid - - int OidToStr(SmiLPOID srcOid, SmiUINT32 size, char *string, size_t& how_many_bytes); - // convert an smi oid to its string representation - - private: - void set_invalid(); - // release memory, re-init data members - - void set_null(); - // initialize object data members - void init_value( const SmiLPOID srcOid, size_t len); - void init_value(const unsigned long *raw_oid, size_t oid_len); -}; - -#endif //OID_CLS_ diff --git a/ASNMP/asnmp/oid_def.h b/ASNMP/asnmp/oid_def.h deleted file mode 100644 index bdf46ec4f88..00000000000 --- a/ASNMP/asnmp/oid_def.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef OID_DEF -#define OID_DEF -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// address.cpp -// -// = DESCRIPTION -// Well known Oids defined in RFC 1215 -// -// = AUTHOR -// Peter E Mellquist -// -// ============================================================================ -/*=================================================================== - - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -// SMI trap oid def -class snmpTrapsOid: public Oid { - public: - snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){}; -}; - -// SMI Enterprose Oid -class snmpTrapEnterpriseOid: public Oid { - public: - snmpTrapEnterpriseOid(void):Oid("1.3.6.1.6.3.1.1.4.3.0"){}; -}; - -// SMI Cold Start Oid -class coldStartOid: public snmpTrapsOid { - public: - coldStartOid( void){*this+=".1";}; -}; - -// SMI WarmStart Oid -class warmStartOid: public snmpTrapsOid { - public: - warmStartOid( void){*this+=".2";}; -}; - -// SMI LinkDown Oid -class linkDownOid: public snmpTrapsOid { - public: - linkDownOid( void){*this+=".3";}; -}; - - -// SMI LinkUp Oid -class linkUpOid: public snmpTrapsOid { - public: - linkUpOid( void){*this+=".4";}; -}; - -// SMI Authentication Failure Oid -class authenticationFailureOid: public snmpTrapsOid { - public: - authenticationFailureOid( void){*this+=".5";}; -}; - -// SMI egpneighborloss Oid -class egpNeighborLossOid: public snmpTrapsOid { - public: - egpNeighborLossOid( void){*this+=".6";}; -}; - - -#endif // OID_DEF diff --git a/ASNMP/asnmp/pdu.cpp b/ASNMP/asnmp/pdu.cpp deleted file mode 100644 index 6ac3acc04d5..00000000000 --- a/ASNMP/asnmp/pdu.cpp +++ /dev/null @@ -1,496 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// pdu.cpp -// -// = DESCRIPTION -// Pdu class implementation. Encapsulation of an SMI Protocol -// Data Unit (PDU) in C++. -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/snmp.h" -#include "asnmp/pdu.h" // include Pdu class definition - -ACE_RCSID(asnmp, pdu, "$Id$") - -//=====================[ constructor no args ]========================= -Pdu::Pdu( void): vb_count_(0), error_status_(0), error_index_(0), -validity_(0), request_id_(0), pdu_type_(0), notify_timestamp_(0), -output_(0) -{ -} - -//=====================[ constructor with vbs_ and count ]============== -Pdu::Pdu( Vb* pvbs, const int pvb_count): vb_count_(0), error_index_(0), -validity_(0), request_id_(0), pdu_type_(0), notify_timestamp_(0), -output_(0) -{ - int z; // looping variable - - // zero is ok - if ( pvb_count == 0) { - validity_ = 1; - return; - } - - // check for over then max - if ( pvb_count > MAX_VBS) { - validity_ = 0; - return; - } - - // loop through and assign internal vbs_ - for (z = 0;z < pvb_count; z++) { - validity_ = 0; - ACE_NEW(vbs_[z], Vb( pvbs[z])); - validity_ = 1; - } - - // assign the vb count - vb_count_ = pvb_count; - - validity_ = 1; -} - -//=====================[ constructor with another Pdu instance ]======== -Pdu::Pdu( const Pdu &pdu): vb_count_(0), -error_index_(0), validity_(0), request_id_(0), pdu_type_(0), -notify_timestamp_(0), output_(0) -{ - *this = pdu; - return; -} - -//=====================[ destructor ]==================================== -Pdu::~Pdu() -{ - delete_all_vbs(); - delete [] output_; -} - - -//=====================[ assignment to another Pdu object overloaded ]=== -Pdu& Pdu::operator=( const Pdu &pdu) -{ - int z; // looping variable - - // Initialize all mv's - error_status_ = pdu.error_status_; - error_index_ = pdu.error_index_; - request_id_ = pdu.request_id_; - pdu_type_ = pdu.pdu_type_; - notify_id_ = pdu.notify_id_; - notify_timestamp_ = pdu.notify_timestamp_; - notify_enterprise_ = pdu.notify_enterprise_; - validity_ = 1; - - // free up old vbs_ - for ( z = 0;z < vb_count_; z++) - delete vbs_[z]; - vb_count_ = 0; - - // check for zero case - if ( pdu.vb_count_ == 0) { - return *this; - } - - // loop through and fill em up - for (z = 0; z < pdu.vb_count_; z++) { - validity_ = 0; - ACE_NEW_RETURN(vbs_[z], Vb ( *(pdu.vbs_[z])), *this); - validity_ = 1; - } - - vb_count_ = pdu.vb_count_; - return *this; -} - -// append operator, appends a string -Pdu& Pdu::operator+=( Vb &vb) -{ - - // do we have room? - if ( vb_count_ + 1 > MAX_VBS) - return *this; - - // add the new one - validity_ = 0; - ACE_NEW_RETURN(vbs_[vb_count_], Vb (vb), *this); - // set up validity_ - validity_ = 1; - - // up the vb count - vb_count_++; - - // return self reference - return *this; - -} - -// return fomatted version of this object -char * Pdu::to_string() -{ - // determine how big a buffer and allocate it - const int HEADER_STR = 100; - unsigned size = HEADER_STR; // header takes up this much room - int z; - - for ( z = 0; z < vb_count_; z++) - size += ACE_OS::strlen(vbs_[z]->to_string()); - - ACE_NEW_RETURN(output_, char[size], ""); - - // print pdu header info - sprintf(output_, "pdu: valid: %d type:%d, req:%d, cnt: %d, err stat: %d \ - err idx: %d\n", validity_, pdu_type_, (int) request_id_, - vb_count_, error_status_, error_index_ ); - - // now append vb pairs in this object - for ( z = 0; z < vb_count_; z++) { - ACE_OS::strcat(output_, vbs_[z]->to_string()); - ACE_OS::strcat(output_, "\n\t"); - } - - return output_; -} - - -//=====================[ extract Vbs from Pdu ]========================== -// how do you know that the caler has enough memory??? -// should I self allocate this in here and require the -// caller then to free it up at soem later time -int Pdu::get_vblist( Vb* pvbs, const int pvb_count) -{ - if ((!pvbs) || ( pvb_count < 0) || ( pvb_count > vb_count_)) - return 0; - - // loop through all vbs_ and assign to params - int z; - for (z = 0; z < pvb_count; z++) - pvbs[z] = *vbs_[z]; - - return 1; - -} - -//=====================[ deposit Vbs ]=================================== -int Pdu::set_vblist( Vb* pvbs, const int pvb_count) -{ - - // if invalid then don't destroy - if ((!pvbs) || ( pvb_count < 0) || ( pvb_count > MAX_VBS)) - return 0; - - // free up current vbs_ - int z; - for ( z = 0; z < vb_count_; z++) - delete vbs_[z]; - vb_count_ = 0; - - // check for zero case - if ( pvb_count == 0) { - validity_ = 1; - error_status_ = 0; - error_index_ = 0; - request_id_ = 0; - return 0; - } - - - // loop through all vbs_ and reassign them - for ( z = 0; z < pvb_count; z++) { - validity_ = 0; - ACE_NEW_RETURN(vbs_[z], Vb (pvbs[z]), 0); - validity_ = 1; - } - - vb_count_ = pvb_count; - - // clear error status and index since no longer valid - // request id may still apply so don't reassign it - error_status_ = 0; - error_index_ = 0; - validity_ = 1; - - return 1; -} - -//===================[ get a particular vb ]============================= -// here the caller has already instantiated a vb object -// index is zero based -int Pdu::get_vb( Vb &vb, const int index) const -{ - // can't have an index less than 0 - if ( index < 0) - return 0; - - // can't ask for something not there - if ( index > (vb_count_ - 1)) - return 0; - - // asssign it - vb = *vbs_[index]; - - return 1; -} - -//===================[ set a particular vb ]============================= -int Pdu::set_vb( Vb &vb, const int index) -{ - // can't set a vb at index less than 0 - if ( index < 0) - return 0; - - // can't ask for something not there - if ( index > (vb_count_ - 1)) - return 0; - - // delete what is there - delete vbs_[index]; - - // assign it - validity_ = 0; - ACE_NEW_RETURN(vbs_[index], Vb (vb), 0); - validity_ = 1; - - return 1; - -} - -//=====================[ return number of vbs_ ]========================== -int Pdu::get_vb_count() const -{ - return vb_count_; -} - -//=====================[ return the error status ]======================= -int Pdu::get_error_status() const -{ - return error_status_; -} - -char *Pdu::agent_error_reason() -{ - int pdu_err = get_error_status(); - if (pdu_err == 0) // any real error? - return "not in error state"; - - int n_vbs = get_vb_count(); - Vb bad; - get_vb(bad, get_error_index() -1); // not zero based?? - char *pmsg = Snmp::error_string(get_error_status()); - char *id = bad.to_string_oid(); - char *val = bad.to_string_value(); - const int HDR_SZ = 100; - - if (!output_) { - int size = ACE_OS::strlen(pmsg) + ACE_OS::strlen(id) + - ACE_OS::strlen(val); - ACE_NEW_RETURN(output_, char[size + HDR_SZ], ""); - } - - ACE_OS::sprintf(output_, -"FAIL PDU REPORT: pdu id: %d vb cnt: %d vb idx: %d \n\ -msg: %s vb oid: %s value: %s", - get_request_id(), n_vbs, get_error_index(), pmsg, id, val); - - return output_; -} - -//=====================[ set the error status ]========================== -// friend -void set_error_status( Pdu *pdu, const int status) -{ - if (pdu) - pdu->error_status_ = status; -} - -//=====================[ return the error index ]======================== -int Pdu::get_error_index() const -{ - return error_index_; -} - -//=====================[ set the error index ]=========================== -// friend -void set_error_index( Pdu *pdu, const int index) -{ - if (pdu) - pdu->error_index_ = index; -} - -//=====================[ clear error status ]============================= -void clear_error_status( Pdu *pdu) -{ - if (pdu) - pdu->error_status_ = 0; -} - -//=====================[ clear error index ]============================== -void clear_error_index( Pdu *pdu) -{ - if (pdu) - pdu->error_index_ = 0; -} - -//=====================[ return the request id ]========================== -unsigned long Pdu::get_request_id() const -{ - return request_id_; -} - -//=====================[ set the request id ]============================= -// friend function -void set_request_id( Pdu *pdu, const unsigned long rid) -{ - if (pdu) - pdu->request_id_ = rid; -} - -//=====================[ returns validity_ of Pdu instance ]=============== -int Pdu::valid() const -{ - return validity_; -} - -//=====================[ get the pdu type ]=============================== -unsigned short Pdu::get_type()const -{ - return pdu_type_; -} - -// set the pdu type -void Pdu::set_type( unsigned short type) -{ - pdu_type_ = type; -} - - -// trim off the last vb -int Pdu::trim(const int p) -{ - int lp = p; - - // verify that lp is legal - if ( lp < 0 || lp > vb_count_) - return 0; - - while ( lp != 0) { - if ( vb_count_ > 0) { - delete vbs_[vb_count_ - 1]; - vb_count_--; - } - lp--; - } - return 1; -} - - - -// delete a Vb anywhere within the Pdu -int Pdu::delete_vb( const int p) -{ - // position has to be in range - if (( p < 0) || ( p > (vb_count_ - 1))) - return 0; - - // safe to remove it - delete vbs_[ p]; - - for ( int z=p;z < (vb_count_-1);z++) { - vbs_[z] = vbs_[z+1]; - } - vb_count_--; - - return 1; -} - -void Pdu::delete_all_vbs() -{ - for ( int z = 0; z < vb_count_; z++) - delete vbs_[z]; - vb_count_ = 0; -} - - -// set notify timestamp -void Pdu::set_notify_timestamp( const TimeTicks & timestamp) -{ - notify_timestamp_ = timestamp; -} - - -// get notify timestamp -void Pdu::get_notify_timestamp( TimeTicks & timestamp) const -{ - timestamp = notify_timestamp_; -} - -// set the notify id -void Pdu::set_notify_id( const Oid id) -{ - notify_id_ = id; -} - -// get the notify id -void Pdu::get_notify_id( Oid &id) const -{ - id = notify_id_; -} - -// set the notify enterprise -void Pdu::set_notify_enterprise( const Oid &enterprise) -{ - notify_enterprise_ = enterprise; -} - -// get the notify enterprise -void Pdu::get_notify_enterprise( Oid & enterprise) const -{ - enterprise = notify_enterprise_; -} - -// ------ class VbIter ------------------- -VbIter::VbIter(Pdu& pdu): idx_(-1), pdu_(&pdu) -{ -} - -// returns 1 if ok, else 0 if none left -int VbIter::next(Vb& vb) -{ - if (idx_ == -1) { - idx_ = 0; - pdu_->get_vb(vb, idx_++); - return 1; - } - else - if (idx_ < pdu_->get_vb_count()) { - pdu_->get_vb(vb, idx_++); - return 1; - } - return 0; // non left -} diff --git a/ASNMP/asnmp/pdu.h b/ASNMP/asnmp/pdu.h deleted file mode 100644 index e748ac5b528..00000000000 --- a/ASNMP/asnmp/pdu.h +++ /dev/null @@ -1,213 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef PDU_CLS_ -#define PDU_CLS_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// pdu.h -// -// = DESCRIPTION -// Pdu class definition. Encapsulation of an SMI Protocol -// Data Unit (PDU) aka Packet in C++. -// -// = AUTHOR -// Peter E Mellquist original code -// Michael MacFaden mrm@cisco.com ACE port, add iterator class for pdus -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -// TODO: this needs to be moved into the CLASS and modifyable at runtime -// TODO: define an iterator object to traverse the vbs in a pdu - -#define MAX_VBS 25 -#include "asnmp/vb.h" // include Vb class definition - -class ACE_Export Pdu - // = TITLE - // Protocol Data Unit (PDU) concrete class. An abstraction of the - // data packet used to by two SNMP sessions to communicate. -{ -public: - Pdu( void); - // constructor no args - - Pdu( Vb* pvbs, const int pvb_count); - // constructor with vbs and count - - Pdu( const Pdu &pdu); - // constructor with another Pdu instance - - ~Pdu(); - // destructor - - Pdu& operator=( const Pdu &pdu); - // assignment to another Pdu object overloaded - - Pdu& operator+=( Vb &vb); - // append a vb to the pdu - - // TODO: add Pdu& operator-=(const Vb &vb); - - int get_vblist( Vb* pvbs, const int pvb_count); - // extract all Vbs from Pdu - - int set_vblist( Vb* pvbs, const int pvb_count); - // deposit all Vbs to Pdu - - int get_vb( Vb &vb, const int index = 0) const; - // get a particular vb - // where 0 is the first vb - - int set_vb( Vb &vb, const int index); - // set a particular vb - // where 0 is the first vb - - int get_vb_count() const; - // return number of vbs - - int get_error_status() const; - // return the error status - - char *agent_error_reason(); - // return the complete error info from this pdu - - friend void set_error_status( Pdu *pdu, const int status); - // set the error status - - int get_error_index() const; - // return the error index - - friend void set_error_index( Pdu *pdu, const int index); - // set the error index - - friend void clear_error_status( Pdu *pdu); - // clear error status - - friend void clear_error_index( Pdu *pdu); - // clear error index - - unsigned long get_request_id() const; - // return the request id - - friend void set_request_id( Pdu *pdu, const unsigned long rid); - // set the request id - - unsigned short get_type() const; - // get the pdu type - - void set_type( unsigned short type); - // set the pdu type - - int valid() const; - // returns validity of Pdu instance - - int trim(const int count=1); - // trim off count vbs from the end of the vb list - - int delete_vb( const int position); - // delete a Vb anywhere within the Pdu - - void delete_all_vbs(); - // delete_all vbs in pdu - - void set_notify_timestamp( const TimeTicks & timestamp); - // set notify timestamp - - void get_notify_timestamp( TimeTicks & timestamp) const; - // get notify timestamp - - void set_notify_id( const Oid id); - // set the notify id - - void get_notify_id( Oid &id) const; - // get the notify id - - void set_notify_enterprise( const Oid &enterprise); - // set the notify enterprise - - void get_notify_enterprise( Oid & enterprise) const; - // get the notify enterprise - - char *to_string(); - // return fomatted version of this object - - - protected: - Vb *vbs_[MAX_VBS]; - // pointer to array of Vbs - - int vb_count_; - // count of Vbs - - int error_status_; - // SMI error status - - int error_index_; - // SMI error index - - int validity_; - // valid boolean status of object construction - unsigned long request_id_; - // SMI request id - - unsigned short pdu_type_; - // derived at run time based on request type - - TimeTicks notify_timestamp_; - // a timestamp associated with an infor - // for notify Pdu objects only - // traps & notifies - - Oid notify_id_; - // an id - - Oid notify_enterprise_; - - private: - char *output_; - // buffer for to_string() -}; - - -class VbIter - // = TITLE - // Utility class to iterate once through a PDU varbind list -{ - public: - VbIter(Pdu& pdu); - // default constructor - - int next(Vb& vb); - // returns 1 if ok, else 0 if none left - - private: - VbIter(const VbIter&); - // disallow copy constructor use - - int idx_; - // current object in list - - Pdu *pdu_; - // ptr to pdu being interated over -}; - -#endif //PDU_CLS_ - diff --git a/ASNMP/asnmp/sagent.cpp b/ASNMP/asnmp/sagent.cpp deleted file mode 100644 index fc56a2c728f..00000000000 --- a/ASNMP/asnmp/sagent.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// sagent.cpp -// -// = DESCRIPTION -// SNMP agent class definition. The sagent class provides an object oriented -// approach for creating SNMP Agents. The sagent class is an encapsulation -// of SNMP sessions, gets, sets, etc. -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ -#include "ace/Reactor.h" -#include "ace/SOCK_Dgram.h" - -#include "asnmp/oid.h" // snmp++ oid class -#include "asnmp/vb.h" // snbmp++ vb class -#include "asnmp/target.h" // snmp++ target class -#include "asnmp/pdu.h" // snmp++ pdu class -#include "asnmp/snmperrs.h" // error macros and strings -#include "asnmp/address.h" // snmp++ address class defs -#include "asnmp/snmp.h" // manager snmp interface -#include "asnmp/sagent.h" // agent interface -#include "asnmp/transaction.h" // convert from wire to API - -ACE_RCSID(asnmp, sagent, "$Id$") - -sagent::sagent(unsigned short port): Snmp(port) -{ - ACE_TRACE("sagent::sagent(short)"); -} - -sagent::~sagent() -{ - ACE_TRACE("sagent::~sagent"); -} - -int sagent::handle_input(ACE_HANDLE fd) -{ - ACE_TRACE("sagent::handle_input"); - - transaction tr(iv_snmp_session_); // this section needs a better design - tr.handle_input(fd); - char rcv_com_str[MAX_COMM_STR_LEN]; - if (tr.result(pdu_, rcv_com_str) < 0) - return 0; - OctetStr community(rcv_com_str); - const ACE_INET_Addr &ta = tr.get_from_addr(); - char buf_tmp[MAXHOSTNAMELEN + 1]; - ta.addr_to_string (buf_tmp, MAXHOSTNAMELEN); - UdpAddress ra(buf_tmp); - tgt_.set_address(ra); - - - // process msg here by calling subclass's implementation - switch (pdu_.get_type()){ - case sNMP_PDU_GET: - tgt_.set_read_community(community); - this->handle_get(pdu_, tgt_); - break; - - case sNMP_PDU_GETNEXT: - tgt_.set_read_community(community); - this->handle_get_next(pdu_, tgt_); - break; - - case sNMP_PDU_SET: - tgt_.set_write_community(community); - this->handle_set(pdu_, tgt_); - break; - - default: - ACE_ASSERT(0); - } - return 0; -} - -ACE_HANDLE sagent::get_handle() const -{ - ACE_TRACE("sagent::get_handle"); - return iv_snmp_session_.get_handle(); -} - -int sagent::respond(Pdu& pdu,UdpTarget& tgt) -{ - pdu.set_type(sNMP_PDU_RESPONSE); - transaction tr(pdu, tgt, iv_snmp_session_); - tr.send(); - return 0; -} diff --git a/ASNMP/asnmp/sagent.h b/ASNMP/asnmp/sagent.h deleted file mode 100644 index e97d7839be5..00000000000 --- a/ASNMP/asnmp/sagent.h +++ /dev/null @@ -1,83 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef SAGENT_CLS_ -#define SAGENT_CLS_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// sagent.h -// -// = DESCRIPTION -// SNMP agent class defintion. The sagent class provides an object oriented -// approach for creating SNMP Agents. The sagent class is an encapsulation of SNMP -// sessions, gets, sets, etc. -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ -#include "ace/Reactor.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK_Dgram.h" - -#include "asnmp/oid.h" // snmp++ oid class -#include "asnmp/vb.h" // snbmp++ vb class -#include "asnmp/target.h" // snmp++ target class -#include "asnmp/pdu.h" // snmp++ pdu class -#include "asnmp/snmperrs.h" // error macros and strings -#include "asnmp/address.h" // snmp++ address class defs -#include "asnmp/snmp.h" // snmp interface - -// sagent - supports Version 1 operations in blocking mode - -#define DEF_AGENT_PORT (161) - -class ACE_Export sagent : public ACE_Event_Handler, Snmp - // = TITLE - // Concrete class sagent defines the session and interface to - // communicate with another SNMP Version 1 manager -{ - public: - - - // override the next three methods (callbacks) to implment your agent - // - - virtual int handle_get( Pdu &pdu, UdpTarget &target) = 0; - // retrieve data from a peer agent for a given list of oid values - - virtual int handle_get_next( Pdu &pdu, UdpTarget &target) = 0; - // retrieve data lexically adjacent to the oids specified in the pdu - // from the peer agent - - virtual int handle_set( Pdu &pdu, UdpTarget &target) = 0; - // set data in the agent from the list of oids in the pdu - - virtual int handle_input(ACE_HANDLE); - // new pdu received from mgr (reactor calls this) - - virtual ACE_HANDLE get_handle() const; - // retrieve io descriptor (reactor uses this) - - int respond(Pdu& pdu, UdpTarget& tgt); - // send a response pdu to the mgr - - protected: - sagent(unsigned short port = DEF_AGENT_PORT); - virtual ~sagent(); - -private: - sagent(const sagent&); - Pdu pdu_; // current input pdu - UdpTarget tgt_; // addr & com strs -}; - -#endif //SAGENT_CLS_ - diff --git a/ASNMP/asnmp/smi.h b/ASNMP/asnmp/smi.h deleted file mode 100644 index 09b3927b220..00000000000 --- a/ASNMP/asnmp/smi.h +++ /dev/null @@ -1,153 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef SMIDEF_ -#define SMIDEF_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// smi.h -// -// = DESCRIPTION -// Address class definition. Encapsulates various network -// addresses into easy to use, safe and portable classes. -// -// = AUTHOR -// ?? -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. - -=====================================================================*/ - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -//----------[ ASN/BER Base Types ]----------------------------------------- -// Basic Encoding Rules (BER) -// (used in forming SYNTAXes and certain SNMP types/values) -#define aSN_UNIVERSAL (0x00) -#define aSN_APPLICATION (0x40) -#define aSN_CONTEXT (0x80) -#define aSN_PRIVATE (0xC0) -#define aSN_PRIMITIVE (0x00) -#define aSN_CONSTRUCTOR (0x20) - -//------[ SNMP ObjectSyntax Values ]--------------------------------------- -#define sNMP_SYNTAX_SEQUENCE (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x10) - - -//------------------------------------------------------------------------- -// These values are used in the "syntax" member -// of the smiVALUE structure which follows. -// Note: UInt32 is indistinguishable from Gauge32 per SNMPv2 Draft Standard -// NsapAddr is obsoleted as unique SMI type per SNMPv2 Draft Standard -#define sNMP_SYNTAX_INT (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x02) -#define sNMP_SYNTAX_BITS (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x03) -#define sNMP_SYNTAX_OCTETS (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x04) -#define sNMP_SYNTAX_NULL (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x05) -#define sNMP_SYNTAX_OID (aSN_UNIVERSAL | aSN_PRIMITIVE | 0x06) -#define sNMP_SYNTAX_INT32 sNMP_SYNTAX_INT -#define sNMP_SYNTAX_IPADDR (aSN_APPLICATION | aSN_PRIMITIVE | 0x00) -#define sNMP_SYNTAX_CNTR32 (aSN_APPLICATION | aSN_PRIMITIVE | 0x01) -#define sNMP_SYNTAX_GAUGE32 (aSN_APPLICATION | aSN_PRIMITIVE | 0x02) -#define sNMP_SYNTAX_TIMETICKS (aSN_APPLICATION | aSN_PRIMITIVE | 0x03) -#define sNMP_SYNTAX_OPAQUE (aSN_APPLICATION | aSN_PRIMITIVE | 0x04) -#define sNMP_SYNTAX_CNTR64 (aSN_APPLICATION | aSN_PRIMITIVE | 0x06) -#define sNMP_SYNTAX_UINT32 (aSN_APPLICATION | aSN_PRIMITIVE | 0x07) - -//------------------------------------------------------------------------- - -//---------------[ Exception conditions for SNMPv2 ]----------------------- -// support SNMP v2 -#define sNMP_SYNTAX_NOSUCHOBJECT (aSN_CONTEXT | aSN_PRIMITIVE | 0x00) -#define sNMP_SYNTAX_NOSUCHINSTANCE (aSN_CONTEXT | aSN_PRIMITIVE | 0x01) -#define sNMP_SYNTAX_ENDOFMIBVIEW (aSN_CONTEXT | aSN_PRIMITIVE | 0x02) - - -//--------------[ different types of PDU's ]------------------------------- -#define sNMP_PDU_GET (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x0) -#define sNMP_PDU_GETNEXT (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x1) -#define sNMP_PDU_RESPONSE (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x2) -#define sNMP_PDU_SET (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x3) -#define sNMP_PDU_V1TRAP (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x4) -#define sNMP_PDU_GETBULK (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x5) -#define sNMP_PDU_INFORM (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x6) -#define sNMP_PDU_TRAP (aSN_CONTEXT | aSN_CONSTRUCTOR | 0x7) - - -//------[ smi typedefs ]--------------------------------------------------- -// SNMP-related types from RFC1442 (SMI) - -typedef unsigned char SmiBYTE, *SmiLPBYTE; - -//------------------------------------------------------------------------- -// SNMP-related types from RFC1442 (SMI) - -// int -typedef long SmiINT, *SmiLPINT; - -// int 32 -typedef SmiINT SmiINT32, *SmiLPINT32; - -// unit32 -typedef unsigned long SmiUINT32, *SmiLPUINT32; - -// octet struct -typedef struct { - SmiUINT32 len; - SmiLPBYTE ptr;} SmiOCTETS, *SmiLPOCTETS; - -// bits -typedef SmiOCTETS SmiBITS, *SmiLPBITS; - -// SMI oid struct -typedef struct { - SmiUINT32 len; - SmiLPUINT32 ptr;} SmiOID, *SmiLPOID; - -// ipaddr -typedef SmiOCTETS SmiIPADDR, *SmiLPIPADDR; - -// 32bit counter -typedef SmiUINT32 SmiCNTR32, *SmiLPCNTR32; - -// gauge -typedef SmiUINT32 SmiGAUGE32, *SmiLPGAUGE32; - -// timeticks -typedef SmiUINT32 SmiTIMETICKS, *SmiLPTIMETICKS; - -// opaque -typedef SmiOCTETS SmiOPAQUE, *SmiLPOPAQUE; - -// nsapaddr -typedef SmiOCTETS SmiNSAPADDR, *SmiLPNSAPADDR; - -// 64 bit counter -typedef struct { - SmiUINT32 hipart; - SmiUINT32 lopart; -} SmiCNTR64, *SmiLPCNTR64; - -#endif // SMIDEF_ - - diff --git a/ASNMP/asnmp/smival.h b/ASNMP/asnmp/smival.h deleted file mode 100644 index 6e7c8c4c1b9..00000000000 --- a/ASNMP/asnmp/smival.h +++ /dev/null @@ -1,104 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef SMIVALUE_ -#define SMIVALUE_ -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// smival.h -// -// = DESCRIPTION -// SMIValue class definition. Superclass for the various types -// of SNMP values (Address, Oid, Octet, etc.). Provides -// only a few functions, most info is in subclass. -// -// = AUTHOR -// Jeff Meyer -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -//----[ includes ]----------------------------------------------------- -#include "asnmp/smi.h" - -//----[ macros ]------------------------------------------------------- - -//====================================================================== -// SMI value structure conforming with SMI RFC -// -typedef struct { /* smiVALUE portion of VarBind */ - SmiUINT32 syntax; /* Insert SNMP_SYNTAX_ */ - union { - SmiINT sNumber; /* SNMP_SYNTAX_INT - SNMP_SYNTAX_INT32 */ - SmiUINT32 uNumber; /* SNMP_SYNTAX_UINT32 - SNMP_SYNTAX_CNTR32 - SNMP_SYNTAX_GAUGE32 - SNMP_SYNTAX_TIMETICKS */ - SmiCNTR64 hNumber; /* SNMP_SYNTAX_CNTR64 */ - SmiOCTETS string; /* SNMP_SYNTAX_OCTETS - SNMP_SYNTAX_BITS - SNMP_SYNTAX_OPAQUE - SNMP_SYNTAX_IPADDR - SNMP_SYNTAX_NSAPADDR */ - SmiOID oid; /* SNMP_SYNTAX_OID */ - SmiBYTE empty; /* SNMP_SYNTAX_NULL - SNMP_SYNTAX_NOSUCHOBJECT - SNMP_SYNTAX_NOSUCHINSTANCE - SNMP_SYNTAX_ENDOFMIBVIEW */ - } value; -} SmiVALUE, *SmiLPVALUE; - -// An "abstract" (pure virtual) class that serves as the base class -// for all specific SNMP syntax types. -// -class ACE_Export SnmpSyntax { - -public: - virtual char * to_string() = 0; - // virtual function for getting a printable ASCII value for any SNMP Value - - virtual SmiUINT32 get_syntax() = 0; - // return the current syntax - - virtual SnmpSyntax * clone() const = 0; - // virtual clone operation for creating a new Value from an existing - // value. The caller MUST use the delete operation on the return - // value when done. - - virtual ~SnmpSyntax() {}; - // virtual destructor to ensure deletion of derived classes... - - virtual SnmpSyntax& operator=( SnmpSyntax &/*val*/) - { - return *this; - } - // overloaded assignment operator - // This should be pure virtual, but WinNT compiler - // complains about unresolved reference at link time. - - virtual int valid() const = 0; - // return validity of value object. - -protected: - SmiVALUE smival; -}; - -#endif // SMIVALUE_ diff --git a/ASNMP/asnmp/snmp.cpp b/ASNMP/asnmp/snmp.cpp deleted file mode 100644 index f6ad69fb25a..00000000000 --- a/ASNMP/asnmp/snmp.cpp +++ /dev/null @@ -1,283 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// snmp.cpp -// -// = DESCRIPTION -// The basic SNMPv1 API - blocking version using UDP/IPv4 transport -// and addressing. -// -// = AUTHOR -// Peter E Mellquist class design/orig code -// Michael R MacFaden mrm@cisco.com / rework API, use ACE facilities -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - - -#define INCLUDE_SNMP_ERR_STRINGS_ - -//----[ snmp++ includes ]---------------------------------------------- -#include "asnmp/snmp.h" // class def for this module -#include "asnmp/oid.h" // class def for oids -#include "asnmp/enttraps.h" // class def for well known trap oids -#include "asnmp/vb.h" // class def for vbs -#include "asnmp/address.h" // class def for addresses -#include "asnmp/wpdu.h" // adapter to cmu_library / wire protocol -#include "asnmp/transaction.h" // synchronous transaction processor - -ACE_RCSID(asnmp, snmp, "$Id$") - -const coldStartOid coldStart; -const warmStartOid warmStart; -const linkDownOid linkDown; -const linkUpOid linkUp; -const authenticationFailureOid authenticationFailure; -const egpNeighborLossOid egpNeighborLoss; -const snmpTrapEnterpriseOid snmpTrapEnterprise; - -char Snmp::host_name_[MAXHOSTNAMELEN] = ""; - -Snmp::Snmp(unsigned short port): result_(0), construct_status_(SNMP_CLASS_ERROR), last_transaction_status_(0) -{ - ACE_TRACE("Snmp::Snmp"); - - ACE_INET_Addr addr(port); // any port,address is ok - if (iv_snmp_session_.open(addr) < 0) { - last_transaction_status_ = errno; // open udp/ipv4 socket - ACE_DEBUG((LM_DEBUG, "Snmp::snmp::open port %d failed", port)); - return; - } - - // initial request id randomly generated then monotonically incremented - req_id_ = (unsigned) ACE_OS::time(0); - - construct_status_ = SNMP_CLASS_SUCCESS; - return; -} - -Snmp::~Snmp() -{ - ACE_TRACE("Snmp::~Snmp"); - iv_snmp_session_.close(); -} - -int Snmp::valid() const -{ - return construct_status_; -} - -// given error code, return string definition -// class version -// static -char * Snmp::error_string(int last_transaction_status_) -{ - ACE_TRACE("Snmp::error_string"); - - return ((last_transaction_status_ < 0) ? - ((last_transaction_status_ < MAX_NEG_ERROR)? - nErrs[ abs(MAX_NEG_ERROR) + 1] : nErrs[abs(last_transaction_status_)]): - ((last_transaction_status_ > MAX_POS_ERROR)? - pErrs[MAX_POS_ERROR+1] : pErrs[last_transaction_status_])); -} - -// instance version -char * Snmp::error_string() -{ - return Snmp::error_string(last_transaction_status_); -} - -void Snmp::check_default_port(UdpTarget& target, unsigned short port) -{ - UdpAddress tmp; - target.get_address(tmp); - if (tmp.get_port() == 0) { - tmp.set_port(port); - target.set_address(tmp); - } -} - -int Snmp::run_transaction(Pdu& pdu, UdpTarget& target) -{ - int rc, done = 0; - - // 1. set unique id to match this packet on return - size_t hold_req_id = req_id_++; - set_request_id(&pdu, hold_req_id); - - // 2. write request to agent - transaction trans(pdu, target, iv_snmp_session_); - - // this call blocks while it attempts to retrieve agent response - while (!done) { - if ((rc = trans.run()) < 0) { - last_transaction_status_ = rc; - return rc; - } - else { - trans.result(pdu); - // verify this is the pdu we are after - if (pdu.get_request_id() == hold_req_id) - done = 1 ; - } - } - return 0; -} - -int Snmp::run_transaction(Pdu& pdu, UdpTarget& target, Snmp_Result * cb) -{ - if (!cb) - return run_transaction(pdu, target); - - // 1. set unique id to match this packet on return - hold_req_id_ = req_id_++; - set_request_id(&pdu, hold_req_id_); - pdu_ = &pdu; - result_ = cb; - - // 2. write request to agent - transaction * trans = new transaction(pdu, target, iv_snmp_session_); - return trans->run(this); -} - -void Snmp::result(transaction *t, int rc) -{ - t->result(*pdu_); - // verify this is the pdu we are after - if (pdu_->get_request_id() == hold_req_id_) - { - last_transaction_status_ = rc; - delete t; - result_->result(this, rc); - } - else - { - rc = t->run(this); - if (rc < 0) - { - delete t; - result_->result(this, rc); - } - } -} - -int Snmp::validate_args(const Pdu& pdu, const UdpTarget& target) const -{ - // 0. check object status - if (construct_status_ != SNMP_CLASS_SUCCESS) - return construct_status_; - - // 1. check args passed - if ( !pdu.valid() || !target.valid() ) - return SNMP_INVALID_ARGS; - return 0; -} - -// SYNC API: write request to wire then wait for reply or timeout -int Snmp::get( Pdu &pdu, UdpTarget &target, Snmp_Result * cb) -{ - ACE_TRACE("Snmp::get"); - int rc; - if ((rc = validate_args(pdu, target)) != 0) - return rc; - - pdu.set_type( sNMP_PDU_GET); - check_default_port(target); - return run_transaction(pdu, target, cb); -} - -int Snmp::get_next( Pdu &pdu, UdpTarget &target, Snmp_Result * cb) -{ - ACE_TRACE("Snmp::get_next"); - int rc; - if ((rc = validate_args(pdu, target)) != 0) - return rc; - - pdu.set_type( sNMP_PDU_GETNEXT); - check_default_port(target); - return run_transaction(pdu, target, cb); -} - -int Snmp::set( Pdu &pdu, UdpTarget &target, Snmp_Result * cb) -{ - ACE_TRACE("Snmp::set"); - int rc; - if ((rc = validate_args(pdu, target)) != 0) - return rc; - - pdu.set_type( sNMP_PDU_SET); - check_default_port(target); - return run_transaction(pdu, target, cb); -} - -// one way, best of luck, non-confirmed alert -int Snmp::trap( Pdu &pdu, UdpTarget &target) -{ - ACE_TRACE("Snmp::trap"); - int rc; - if ((rc = validate_args(pdu, target)) != 0) - return rc; - - pdu.set_type( sNMP_PDU_V1TRAP); - check_default_port(target, DEF_TRAP_PORT); - - // 2. write request to agent - transaction trans(pdu, target, iv_snmp_session_); - if (trans.send() > 0) // expect number of bytes sent on - return 0; - - last_transaction_status_ = SNMP_CLASS_INTERNAL_ERROR; - return -1; -} - -// Allow host name to be overriden. Supplying a null pointer or zero -// length string removes the override. -void Snmp::override_host_name(const char* name) -{ - if (name) - { - ACE_OS::strncpy(host_name_, name, MAXHOSTNAMELEN); - host_name_[MAXHOSTNAMELEN-1] = 0; - } - else { - host_name_[0] = 0; - } -} - -// Returns the current host name in the supplied string. -void Snmp::get_host_name(char* name, int len) -{ - if (name) - { - if (ACE_OS::strlen(host_name_) > 0) - { - ACE_OS::strncpy(name, host_name_, len); - name[len-1] = 0; - } - else - { - if (ACE_OS::hostname(name, len-1) == -1) - name[0] = 0; - } - } -} - -Snmp_Result::~Snmp_Result() {} diff --git a/ASNMP/asnmp/snmp.h b/ASNMP/asnmp/snmp.h deleted file mode 100644 index d57a9711324..00000000000 --- a/ASNMP/asnmp/snmp.h +++ /dev/null @@ -1,134 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef SNMP_CLS_ -#define SNMP_CLS_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// snmp.h -// -// = DESCRIPTION -// SNMP class defintion. The Snmp class provides an object oriented -// approach to SNMP. The SNMP class is an encapsulation of SNMP -// sessions, gets, sets, etc. The class manages all SNMP -// resources and provides complete retry and timeout capability. -// -// = AUTHOR -// Peter E Mellquist design, first implementation -// Michael R. MacFaden port to ACE / use Reactor pattern -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "ace/Reactor.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK_Dgram.h" - -#include "asnmp/oid.h" // snmp++ oid class -#include "asnmp/vb.h" // snbmp++ vb class -#include "asnmp/target.h" // snmp++ target class -#include "asnmp/pdu.h" // snmp++ pdu class -#include "asnmp/snmperrs.h" // error macros and strings -#include "asnmp/address.h" // snmp++ address class defs -#include "asnmp/transaction_result.h" - -class Snmp; -class ACE_Export Snmp_Result -{ - public: - virtual ~Snmp_Result(); - virtual void result(Snmp *snmp, int result) = 0; -}; - -// Snmp session class - supports Version 1 operations in blocking mode -class ACE_Export Snmp : public transaction_result - // = TITLE - // Concrete class Snmp defined the session and interface to - // communicate with another SNMP Version 1 agent -{ - Snmp_Result * result_; - Pdu * pdu_; - unsigned hold_req_id_; - public: - Snmp(unsigned short port = INADDR_ANY); - virtual ~Snmp(); - - int get( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0); - // retrieve data from a peer agent for a given list of oid values - // default port 161 - - int get_next( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0); - // retrieve data lexically adjacent to the oids specified in the pdu - // from the peer agent - // default port 161 - - int set( Pdu &pdu, UdpTarget &target, Snmp_Result * cb = 0); - // set data in the agent from the list of oids in the pdu - // default port 161 - - int trap( Pdu &pdu, UdpTarget &target); - // send an SNMPv1 trap (unreliable) to a remote system (def port 162) - - int valid() const; - // status of object after construction - - static char * error_string(int code); - // given error code, return string reason - - char * error_string(); - // retrieve a reason string if any of the above commands fail - - void result(transaction * t, int rc); - // for async transaction results - - static void override_host_name(const char* name); - // allow the host name to be overriden - - static void get_host_name(char* name, int len); - // returns the overriden host name - - protected: - void check_default_port(UdpTarget& target,unsigned short port=DEF_AGENT_PORT); - int run_transaction(Pdu& pdu, UdpTarget& target); - int run_transaction(Pdu& pdu, UdpTarget& target, Snmp_Result * cb); - int validate_args(const Pdu& pdu, const UdpTarget& target) const; - - Snmp(const Snmp&); - - ACE_SOCK_Dgram iv_snmp_session_; - // io object - - int construct_status_; - // status of construction - - int last_transaction_status_; - // result code from last transaction - - unsigned req_id_; - // transaction request id - - static char host_name_[MAXHOSTNAMELEN]; -}; - -#endif //SNMP_CLS_ diff --git a/ASNMP/asnmp/snmperrs.h b/ASNMP/asnmp/snmperrs.h deleted file mode 100644 index bd7a5e9df56..00000000000 --- a/ASNMP/asnmp/snmperrs.h +++ /dev/null @@ -1,214 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef SNMPERRS_H_ -#define SNMPERRS_H_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// snmperrs.h -// -// = DESCRIPTION -// Definition of error macros and error strings -// -// = AUTHOR -// Jeff Meyer -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -============================================================================*/ - - -//-------[ Positive ASNMP Error Return Codes ]------------------------------ -// These values are error status values from RFC 1905 -// -// The values can be returned via Pdu::get_error_status() -// -#define SNMP_ERROR_SUCCESS 0 // Success Status -#define SNMP_ERROR_TOO_BIG 1 // Pdu encoding too big -#define SNMP_ERROR_NO_SUCH_NAME 2 // No such VB name, see error index -#define SNMP_ERROR_BAD_VALUE 3 // Bad Vb -#define SNMP_ERROR_READ_ONLY 4 // VB is read only, see error index -#define SNMP_ERROR_GENERAL_VB_ERR 5 // General VB error, see error index -#define SNMP_ERROR_NO_ACCESS 6 // No access to MIBs data -#define SNMP_ERROR_WRONG_TYPE 7 // Requested type was incorrect -#define SNMP_ERROR_WRONG_LENGTH 8 // Request Pdu has inccorect length -#define SNMP_ERROR_WRONG_ENCODING 9 // Request Pdu has wrong encoding -#define SNMP_ERROR_WRONG_VALUE 10 // Request Pdu has wrong value -#define SNMP_ERROR_NO_CREATION 11 // Unable to create object specified -#define SNMP_ERROR_INCONSIST_VAL 12 // Inconsistent value in request -#define SNMP_ERROR_RESOURCE_UNAVAIL 13 // Resources unavailable -#define SNMP_ERROR_COMITFAIL 14 // Unable to comit -#define SNMP_ERROR_UNDO_FAIL 15 // Unable to undo -#define SNMP_ERROR_AUTH_ERR 16 // Authentication failure -#define SNMP_ERROR_NOT_WRITEABLE 17 // Mib Object not writeable -#define SNMP_ERROR_INCONSIS_NAME 18 // Inconsistent naming used - - -//-------[ Negative ASNMP Result/Error Return Codes ]------------------- - -// General -#define SNMP_CLASS_SUCCESS 0 // success -#define SNMP_CLASS_ERROR -1 // general error -#define SNMP_CLASS_RESOURCE_UNAVAIL -2 // e.g., malloc failed -#define SNMP_CLASS_INTERNAL_ERROR -3 // unexpected / internal error -#define SNMP_CLASS_UNSUPPORTED -4 // unsupported function - -// Callback reasons: -#define SNMP_CLASS_TIMEOUT -5 // outstanding request timed out -#define SNMP_CLASS_ASYNC_RESPONSE -6 // received response for outstd request -#define SNMP_CLASS_NOTIFICATION -7 // received notification (trap/inform) -#define SNMP_CLASS_SESSION_DESTROYED -8 // snmp::destroyed with oustanding reqs pending - -// Snmp Class: -#define SNMP_CLASS_INVALID -10 // snmp::mf called on invalid instance -#define SNMP_CLASS_INVALID_PDU -11 // invalid pdu passed to mf -#define SNMP_CLASS_INVALID_TARGET -12 // invalid target passed to mf -#define SNMP_CLASS_INVALID_CALLBACK -13 // invalid callback to mf -#define SNMP_CLASS_INVALID_REQID -14 // invalid request id to cancel -#define SNMP_CLASS_INVALID_NOTIFYID -15 // missing trap/inform oid -#define SNMP_CLASS_INVALID_OPERATION -16 // snmp operation not allowed for specified target -#define SNMP_CLASS_INVALID_OID -17 // invalid oid passed to mf -#define SNMP_CLASS_INVALID_ADDRESS -18 // invalid address passed to mf -#define SNMP_CLASS_ERR_STATUS_SET -19 // agent returned response pdu with error_status set - -// Transport Errors: -#define SNMP_CLASS_TL_UNSUPPORTED -20 // transport unsupported -#define SNMP_CLASS_TL_IN_USE -21 // transport in use -#define SNMP_CLASS_TL_FAILED -22 // transport operation failed - -// extras -#define SNMP_CLASS_SHUTDOWN -23 // used for back door shutdown -#define SNMP_INVALID_ARGS -24 // invalid args passed - -#ifdef INCLUDE_SNMP_ERR_STRINGS_ - -// ASCII strings returned through Snmp::error() function. NOTE: altering -// the strings in this header file will not affect the return values of -// Snmp::error(), unless you rebuild the ASNMP library from source. - -#define MAX_POS_ERROR SNMP_ERROR_INCONSIS_NAME -#define MAX_NEG_ERROR SNMP_CLASS_SHUTDOWN - -static char * pErrs[] = { - "Success", // 0 - "SNMP: Response PDU Too Big", // 1 - "SNMP: Variable does not exist", // 2 - "SNMP: Cannot modify variable: Bad Value", // 3 - "SNMP: Cannot modify object, Read Only", // 4 - "SNMP: Cannot perform operation, General Error", // 5 - "SNMP: Cannot access variable, No Access", // 6 - "SNMP: Cannot create/modify variable, Wrong Type", // 7 - "SNMP: Cannot create/set variable, Wrong Length", // 8 - "SNMP: Cannot create/set variable, Wrong Encoding", // 9 - "SNMP: Cannot create/set variable, Wrong Value", // 10 - "SNMP: Cannot create variable, Creation Not Allowed", // 11 - "SNMP: Cannot create/set variable, Inconsistent Value", // 12 - "SNMP: Cannot create/set variable, Resource Unavailable", // 13 - "SNMP: Cannot create/set variable, Commit Failed", // 14 - "SNMP: Cannot create/set variable, Undo Failed", // 15 - "SNMP: Cannot perform operation, Authorization Error", // 16 - "SNMP: Cannot create/set variable, Not Writable", // 17 - "SNMP: Cannot create variable, Inconsistent Name", // 18 -}; - - -static char * nErrs[] = { - // General: - // 0 SNMP_CLASS_SUCCESS - "ASNMP: Success", - - // 1 SNMP_CLASS_ERROR - "ASNMP: Operation failed", - - // 2 SNMP_CLASS_RESOURCE_UNAVAIL - "ASNMP: Resource unavailable", - - // 3 SNMP_CLASS_INTERNAL_ERROR - "ASNMP: Internal error", - - // 4 SNMP_CLASS_UNSUPPORTED - "ASNMP: Unsupported function", - - // Callback reasons: - // 5 SNMP_CLASS_TIMEOUT - "ASNMP: SNMP request timed out", - - // 6 SNMP_CLASS_ASYNC_RESPONSE - "ASNMP: Received SNMP Response", - - // 7 SNMP_CLASS_NOTIFICATION - "ASNMP: Received SNMP Notification (trap or inform)", - - // 8 SNMP_CLASS_SESSION_DESTROYED - "ASNMP: Closing session with outstanding requests", - - // 9 reserved for future - "Unknown error code", - - // Snmp Class errors: - // 10 SNMP_CLASS_INVALID - "ASNMP: Class not valid", - - // 11 SNMP_CLASS_INVALID_PDU - "ASNMP: Invalid Pdu", - - // 12 SNMP_CLASS_INVALID_TARGET - "ASNMP: Invalid Target", - - // 13 SNMP_CLASS_INVALID_CALLBACK - "ASNMP: Invalid (null) Callback Function", - - // 14 SNMP_CLASS_INVALID_REQID - "ASNMP: Invalid Request Id", - - // 15 SNMP_CLASS_INVALID_NOTIFYID - "ASNMP: Invalid Notification Id", - - // 16 SNMP_CLASS_INVALID_OPERATION - "ASNMP: SNMP Operation not supported on specified Target", - - // 17 SNMP_CLASS_INVALID_OID - "ASNMP: Invalid Object Identifier", - - // 18 SNMP_CLASS_INVALID_ADDRESS - "ASNMP: Invalid Address", - - // 19 SNMP_CLASS_ERR_STATUS_SET - "ASNMP: Agent indicates error in SNMP request", - - // Transport Errors: - // 20 SNMP_CLASS_TL_UNSUPPORTED - "ASNMP: Transport is not supported", - - // 21 SNMP_CLASS_TL_IN_USE - "ASNMP: Transport is in use", - - // 22 SNMP_CLASS_TL_FAILED - "ASNMP: Transport operation failed", - - // 23 SNMP_CLASS_SHUTDOWN - "ASNMP: Blocked Mode Shutdown", - - // unknown error code - "Unknown error code", -}; - -#endif //INCLUDE_SNMP_ERR_STRINGS_ - -#endif //SNMPERRS_H_ diff --git a/ASNMP/asnmp/target.cpp b/ASNMP/asnmp/target.cpp deleted file mode 100644 index c9e27865f31..00000000000 --- a/ASNMP/asnmp/target.cpp +++ /dev/null @@ -1,324 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// target.cpp -// -// = DESCRIPTION -// Target class defines target SNMP agents. -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. - =====================================================================*/ - -#include "asnmp/target.h" - -ACE_RCSID(asnmp, target, "$Id$") - -//---------------------------------------------------------------------- -//--------[ Class default values ]---------------------- -//---------------------------------------------------------------------- -u_long SnmpTarget::default_timeout_ = DEF_TIMEOUT; -int SnmpTarget::default_retries_ = DEF_RETRIES; -u_long SnmpTarget::default_max_pdu_size_ = DEF_MAX_SNMP_PACKET; -snmp_version SnmpTarget::default_version_ = version1; - -OctetStr UdpTarget::default_rd_community_(READ_COMM_STR); -OctetStr UdpTarget::default_wr_community_(WRITE_COMM_STR); - -//---------------------------------------------------------------------- -//--------[ Abstract SnmpTarget Member Functions ]---------------------- -//---------------------------------------------------------------------- -SnmpTarget::SnmpTarget(): - validity_(0), timeout_(default_timeout_), retries_(default_retries_), - max_pdu_size_(default_max_pdu_size_), version_(default_version_) -{ -} - -// return validity of target -int SnmpTarget::valid() const -{ - return validity_; -} - -// allow destruction of derived classes -SnmpTarget::~SnmpTarget() -{ -} - -// set the timeout -void SnmpTarget::set_timeout( const u_long t) -{ - timeout_ = t; -} - -// change the default timeout -void SnmpTarget::set_default_timeout( const u_long t) -{ - default_timeout_ = t; -} - -// set the retry value -void SnmpTarget::set_retry( const int r) -{ - retries_ = r; -} - -// change the default retries -void SnmpTarget::set_default_retry( const int r) -{ - default_retries_ = r; -} - -void SnmpTarget:: set_max_pdu_size(const u_long max_pdu_sz) -{ - max_pdu_size_ = max_pdu_sz; -} - - -void SnmpTarget::set_default_max_pdu_size(const u_long max_pdu_sz) -{ - default_max_pdu_size_ = max_pdu_sz; -} - -void SnmpTarget::set_version( const snmp_version v) -{ - version_ = v; -} - -void SnmpTarget::set_default_version( const snmp_version v) -{ - default_version_ = v; -} - -snmp_version SnmpTarget::get_version() const -{ - return version_; -} - -snmp_version SnmpTarget::get_default_version() const -{ - return default_version_; -} - -u_long SnmpTarget::get_max_pdu_size() const -{ - return max_pdu_size_; -} - -// get the retry value -int SnmpTarget::get_retry() const -{ - return retries_; -} - -// get the retry value -int SnmpTarget::get_default_retry() const -{ - return default_retries_; -} - -// get the timeout -u_long SnmpTarget::get_timeout() const -{ - return timeout_; -} - -SnmpTarget& SnmpTarget::operator=(const SnmpTarget& lhs) -{ - if (this == &lhs) - return *this; - - validity_ = lhs.validity_; - timeout_ = lhs.timeout_; - retries_ = lhs.retries_; - max_pdu_size_ =lhs.max_pdu_size_; - version_ = lhs.version_; - return *this; -} - -int operator==(const SnmpTarget& lhs, const SnmpTarget& rhs) -{ - if (lhs == rhs) - return 1; - - if (lhs.timeout_ != rhs.timeout_) - return 0; - - if (lhs.retries_ != rhs.retries_) - return 0; - - if (lhs.max_pdu_size_ != rhs.max_pdu_size_) - return 0; - - if (lhs.version_ != rhs.version_) - return 0; - - return 1; -} - - -//---------------------------------------------------------------------- -//--------[ IpTarget Member Functions ]---------------------------------- -//---------------------------------------------------------------------- - - -//---------[ UdpTarget::UdpTarget( void) ]---------------------------------- - -UdpTarget::UdpTarget() -{ - validity_ = 0; - read_community_ = default_rd_community_; // assign by init fails - write_community_ = default_wr_community_; -} - -UdpTarget::UdpTarget(const UdpAddress& udp) : udp_address_(udp) -{ - if (udp_address_.valid()) - validity_ = 1; - read_community_ = default_rd_community_; - write_community_ = default_wr_community_; -} - -// - copy constructor can be synthesised by compiler - -//-----------[ UdpTarget::~UdpTarget() ]-------------------------------- -UdpTarget::~UdpTarget() -{ -} - -//-----------[ UdpTarget::clone() ]-------------------------------- -SnmpTarget * UdpTarget::clone() const -{ - return (SnmpTarget *) new UdpTarget(*this); -} - - -void UdpTarget::set_default_read_community(const OctetStr& rd_community) -{ - default_rd_community_ = rd_community; -} - -void UdpTarget::set_default_write_community(const OctetStr& wr_community) -{ - default_wr_community_ = wr_community; -} - - -// get the read community name as an u_char and len -void UdpTarget::get_read_community( OctetStr& read_community_oct) const -{ - read_community_oct = read_community_; -} - -//---------[ UdpTarget::set_getcommunity ]--------------------------------- -// set the read community name -void UdpTarget::set_read_community( const OctetStr& new_read_community) -{ - read_community_ = new_read_community; -} - -//---------[ UdpTarget::get_writecommunity ]---------------------------- -// get the write community -void UdpTarget::get_write_community( OctetStr &write_community_oct) const -{ - write_community_oct = write_community_; -} - -//-----------[ UdpTarget::set_writecommunity ]--------------------------- -// set the write community -void UdpTarget::set_write_community( const OctetStr& write_community_oct) -{ - write_community_ = write_community_oct; -} - -//------------[ Address& UdpTarget::get_address() ]--------------------- -// get the address -void UdpTarget::get_address( UdpAddress &address) const -{ - address = udp_address_; - return; -} - -//-------------[ UdpTarget::set_address ]-------------------------------- -// set the address -int UdpTarget::set_address( UdpAddress &udp_address) -{ - udp_address_ = udp_address; - if ( udp_address_.valid()) - validity_ = 1; - else - validity_ = 0; - - return validity_; -} - -// overloaded assignment -UdpTarget& UdpTarget::operator=( const UdpTarget& lhs) -{ - if (this == &lhs) - return *this; - - // assign base part - *((SnmpTarget *) this) = *((SnmpTarget *)&lhs); - - udp_address_ = lhs.udp_address_; - read_community_ = lhs.read_community_; - write_community_ = lhs.write_community_; - validity_ = lhs.validity_; - - return *this; -} - -char *UdpTarget::to_string() -{ - sprintf(output_buffer_,"UdpTarget: [ valid: %d addr: %s rd: %s wr: %s \ -ver: %d, timeout: %d, retries: %d max_pdu_size: %d]", - valid(), udp_address_.to_string(), read_community_.to_string(), - write_community_.to_string(), version_, (int) timeout_, - retries_, max_pdu_size_); - return output_buffer_; -} - -//=============[ int operator == UdpTarget, UdpTarget ]=============== -// equivlence operator overloaded -int operator==( const UdpTarget &lhs,const UdpTarget &rhs) -{ - // need to compare all the members of a UdpTarget - if ( lhs.read_community_ != rhs.read_community_) - return 0; // != - - if ( lhs.write_community_ != rhs.write_community_) - return 0; // != - - if ( lhs.udp_address_ != rhs.udp_address_) - return 0; - - if ( lhs.timeout_ != rhs.timeout_) - return 0; - - if ( lhs.retries_ != rhs.retries_) - return 0; - - return 1; // they are equal -} diff --git a/ASNMP/asnmp/target.h b/ASNMP/asnmp/target.h deleted file mode 100644 index 7dfc14ab5d8..00000000000 --- a/ASNMP/asnmp/target.h +++ /dev/null @@ -1,252 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef TARGET_ -#define TARGET_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// target.h -// -// = DESCRIPTION -// -// = AUTHOR -// Peter E Mellquist -// Michael R. MacFaden (ported to ACE) -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS" without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -//----[ includes ]------------------------------------------------ -#include "ace/INET_Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "asnmp/address.h" -#include "asnmp/oid.h" -#include "asnmp/octet.h" - -//----[ enumerated types for SNMP versions ]------------------------- -enum snmp_version { - version1, // 0 - version2c, // 1 (Cisco IOS does not have IOS v2c agent available yet) - version3 // 2 (IETF working on this version) -}; - -// targets contain the following default properties -enum ASNMP_Defs { - DEF_TIMEOUT = 1, // unit: seconds - DEF_RETRIES = 1, // no retry default - DEF_MAX_SNMP_PACKET = 1430, // maximum pdu len on the wire (eth mtu-ip hdr) - // split bigger pdus (not implemented yet) - DEF_AGENT_PORT = 161, // port # for SNMP agent - DEF_TRAP_PORT = 162, // port # for SNMP trap receiver - DEF_VERSION = version1, // default SNMP version - MAX_COMM_STR_LEN = 255, // max value this impl will accept from client - MAX_TARGET_STRING_REP = 2048 // max value this impl will accept from client -}; - -#define READ_COMM_STR "public" -#define WRITE_COMM_STR "private" - -// Abstract class used to provide a virtual interface into Targets -// -class ACE_Export SnmpTarget - // = TITLE - // Abstract Base class SnmpTarget is used to Collect all transmission - // details to communicate with an SNMP -{ - public: - - virtual ~SnmpTarget(); - // allow destruction of derived classes - - int valid() const; - // return validity of target - - void set_retry( const int r); - // set the retry value - - void set_timeout( const unsigned long t); - // set the object's timeout (in seconds) - - void set_version( const snmp_version v); - // set the instance version - - void set_max_pdu_size(const unsigned long max_pdu_sz); - // all classes constructed will have this write community string - - void set_default_timeout( const unsigned long t); - // change the "class" default default timeout (in seconds) - - void set_default_retry( const int r); - // change the default send retries - - void set_default_max_pdu_size(const unsigned long max_pdu_sz); - // all classes constructed will have this write community string - - void set_default_version( const snmp_version v); - // change class default - - // *** get methods *** - - int get_default_retry() const; - // get the retry value - - unsigned long get_timeout() const; - // get the timeout (seconds) - - unsigned long get_max_pdu_size() const; - // get instance max buffer size - - void get_default_max_pdu_size(const unsigned long max_pdu_sz); - // all classes constructed will have this write community string - - snmp_version get_version() const; - // get the version - - snmp_version get_default_version() const; - - int get_retry() const; - // return send retry number for this instancd - - virtual SnmpTarget *clone() const = 0; - // virtual clone operation for creating a new SnmpTarget from an existing - // SnmpTarget. The caller MUST use the delete operation on the return - // value when done. - - friend int operator==(const SnmpTarget& lhs, const SnmpTarget& rhs); - // manipulate the base part - - SnmpTarget& operator=(const SnmpTarget& lhs); - - protected: - SnmpTarget(); - // SnmpTarget(const SnmpTarget &); - - int validity_; - // used by derived class instances - - unsigned long timeout_; - // instance value xmit timeout in milli secs - - int retries_; - // instance value number of retries - - unsigned max_pdu_size_; - // size of pdu - - snmp_version version_; - // instance value the snmp version - - // class wide default values - static unsigned long default_timeout_; - // xmit timeout in secs - - static int default_retries_; - // number of retries - - static unsigned long default_max_pdu_size_; - static snmp_version default_version_; - // snmp protocol version -}; - -//----[ UdpTarget class ]---------------------------------------------- -// UDP/IP transport using "community string" based agents (targets) -// -class ACE_Export UdpTarget: public SnmpTarget - // = TITLE - // Concrete class UdpTarget contains all Details for communicating - // with a SNMPv1 agent over UDP/IPv4 transport -{ - public: - UdpTarget(); - - UdpTarget( const UdpAddress& udp); - // constructor with only address - // assumes default as public, public - // can be constructed with IP address object - - UdpTarget( ACE_INET_Addr& ace_inet_addr); - // can be constructed with Udp address object TODO: merge addresses - - ~UdpTarget(); - // destructor - - // ** set *** - - void set_read_community( const OctetStr& new_read_community); - // set the read community using an OctetStr - - void set_write_community( const OctetStr& write_community); - // set the write community using an OctetStr - - int set_address( UdpAddress &udp_address); - // set the address - - // ** get *** - - void get_read_community( OctetStr& read_community_oct) const; - // get the read community as an Octet Str object - - void get_write_community( OctetStr &write_community_oct) const; - // get the write community as an OctetStr - - void get_address( UdpAddress& address) const; - // get the address - - void set_default_read_community(const OctetStr& rd_community); - // all classes constructed will have this read community string - - void set_default_write_community(const OctetStr& wr_community); - // all classes constructed will have this write community string - - void get_default_read_community(OctetStr& rd_community) const; - // all classes constructed will have this read community string - - void get_default_write_community(OctetStr& wr_community) const; - // all classes constructed will have this write community string - - UdpTarget& operator=( const UdpTarget& target); - // overloaded assignment - - friend int operator==( const UdpTarget &lhs, const UdpTarget &rhs); - // compare two C targets - - char *to_string(); - // string representation of object - - SnmpTarget *clone() const; - // clone from existing UdpTarget - - protected: - static OctetStr default_rd_community_; - static OctetStr default_wr_community_; - OctetStr read_community_; - OctetStr write_community_; - UdpAddress udp_address_; - snmp_version version_; - - char output_buffer_[MAX_TARGET_STRING_REP]; - // to_string() rep of data -}; - - -#endif //TARGET_ diff --git a/ASNMP/asnmp/timetick.cpp b/ASNMP/asnmp/timetick.cpp deleted file mode 100644 index 06fd025797f..00000000000 --- a/ASNMP/asnmp/timetick.cpp +++ /dev/null @@ -1,142 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// timetick.cpp -// -// = DESCRIPTION -// Class implentation for SMI Timeticks class. -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/timetick.h" // include header file for timetick class - -ACE_RCSID(asnmp, timetick, "$Id$") - -// constructor with a value -TimeTicks::TimeTicks( const unsigned long i):SnmpUInt32(i) -{ - smival.syntax = sNMP_SYNTAX_TIMETICKS; -} - -// copy constructor -TimeTicks::TimeTicks( const TimeTicks &t) -{ - smival.value.uNumber = t.smival.value.uNumber; - smival.syntax = sNMP_SYNTAX_TIMETICKS; -} - -// destructor -TimeTicks::~TimeTicks() -{ -} - -// syntax type -SmiUINT32 TimeTicks::get_syntax() -{ - return sNMP_SYNTAX_TIMETICKS; -} - -// create a new instance of this Value -SnmpSyntax *TimeTicks::clone() const -{ - return (SnmpSyntax *) new TimeTicks(*this); -} - -// overloaded assignement from ulong -TimeTicks& TimeTicks::operator=( const unsigned long int i) -{ - smival.value.uNumber =i; return *this; -} - -// overloaded assignment from TimeTicks -TimeTicks& TimeTicks::operator=( const TimeTicks &uli) -{ - this->smival.value.uNumber = uli.smival.value.uNumber; return *this; -} - -// general assignment from any Value -SnmpSyntax& TimeTicks::operator=( SnmpSyntax &in_val) -{ - if ( this == &in_val ) // handle assignement from itself - return *this; - - valid_flag = 0; // will get set true if really valid - if (in_val.valid()) { - switch (in_val.get_syntax()) { - case sNMP_SYNTAX_UINT32: - // case sNMP_SYNTAX_GAUGE32: .. indistinquishable from UINT32 - case sNMP_SYNTAX_CNTR32: - case sNMP_SYNTAX_TIMETICKS: - case sNMP_SYNTAX_INT32: // implied cast int -> uint - this->smival.value.uNumber = - ((TimeTicks &)in_val).smival.value.uNumber; - valid_flag = 1; - break; - } - } - return *this; -} - -// otherwise, behave like an unsigned long -TimeTicks::operator unsigned long() -{ - return smival.value.uNumber; -} - - -// ASCII format return -char * TimeTicks::to_string() - /* Should do something nicer like days:hours:minutes... */ -{ - unsigned long tt, hseconds, seconds, minutes, hours, days; - tt = this->smival.value.uNumber; - - // days - days = tt / 8640000; - tt %= 8640000; - - // hours - hours = tt / 360000; - tt %= 360000; - - // minutes - minutes = tt / 6000; - tt %= 6000; - - seconds = tt / 100; - tt %= 100; - - hseconds = tt; - - if ( days ==0) - sprintf( output_buffer,"%ld:%02ld:%02ld.%02ld", hours, minutes,seconds,hseconds); - else if ( days==1) - sprintf( output_buffer,"1 day %ld:%02ld:%02ld.%02ld", hours, minutes,seconds,hseconds); - else - sprintf( output_buffer,"%ld days, %ld:%02ld:%02ld.%02ld", days,hours, minutes,seconds,hseconds); - - return output_buffer; -} diff --git a/ASNMP/asnmp/timetick.h b/ASNMP/asnmp/timetick.h deleted file mode 100644 index 8e4609c124b..00000000000 --- a/ASNMP/asnmp/timetick.h +++ /dev/null @@ -1,85 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef TIMETICKS_ -#define TIMETICKS_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// timetick.h -// -// = DESCRIPTION -// Class definition for SMI Timeticks class. -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/integer.h" - -#define TICKOUTBUF 30 // max formatted time string - -//------------[ TimeTicks Class ]----------------------------------- -// The timeticks class allows all the functionality of unsigned -// integers but is recognized as a distinct SMI type. TimeTicks -// objects may be get or set into Vb objects. -// -class ACE_Export TimeTicks: public SnmpUInt32 - // = TITLE - // Define RFC1155 TimeTicks Data object - -{ - - public: - TimeTicks( const unsigned long i = 0); - - TimeTicks( const TimeTicks &t); - // copy constructor - - ~TimeTicks(); - // destructor - - SmiUINT32 get_syntax(); - // syntax type - - char *to_string(); - // get a printable ASCII value - - SnmpSyntax *clone() const; - // create a new instance of this Value - - SnmpSyntax& operator=(SnmpSyntax &val); - // copy an instance of this Value - - TimeTicks& operator=( const TimeTicks &uli); - // overloaded assignment - - TimeTicks& operator=( const unsigned long int i); - // overloaded assignment - - operator unsigned long(); - // otherwise, behave like an unsigned long - - protected: - char output_buffer[TICKOUTBUF]; - // for storing printed form -}; -#endif // TIMETICKS_ diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp deleted file mode 100644 index 8707ee2e797..00000000000 --- a/ASNMP/asnmp/transaction.cpp +++ /dev/null @@ -1,202 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// transaction.cpp -// -// = DESCRIPTION -// implements blocking SNMPv1 API using a simple state machine -// transactions over UDP/IP networks -// -// = AUTHOR -// Michael R MacFaden mrm@cisco.com - remove v2c, async, rework for ACE -// ============================================================================ - -#include "ace/Reactor.h" -#include "asnmp/transaction.h" - -ACE_RCSID(asnmp, transaction, "$Id$") - -// pre: pdu, target report valid() == 1 -// post: pdu sent out over the wire -inline void reset_receive_buffer(iovec& io) -{ - io.iov_base = 0; - io.iov_len = 0; -} - -transaction::transaction(const Pdu& pdu, const UdpTarget& target, - ACE_SOCK_Dgram& io): - result_(0), - wp_(pdu,target), params_(target), session_(io) -{ - // last step, convert address (get ride of this once we have merged address - UdpAddress udp; - target.get_address(udp); - // via string conversion "dotted-quad:port" - ACE_INET_Addr tmp(udp); - addr_ = tmp; - reset_receive_buffer(receive_iovec_); -} - -transaction::~transaction() -{ - ACE_Reactor::instance()->remove_handler(this, READ_MASK | DONT_CALL); - ACE_Reactor::instance()->cancel_timer(this); - - delete [] receive_iovec_.iov_base; -} - -// implement state machine, send, wait (timeout/results) return -int transaction::run() -{ - int rc, done = 0; - int retry_counter = 0; - ACE_Time_Value to(params_.get_timeout(), 0); // seconds - ACE_Reactor *reactor = ACE_Reactor::instance (); - - // 1. register io port for read access - if (reactor->register_handler(session_.get_handle(), this, - ACE_Event_Handler::READ_MASK) == -1) - return SNMP_CLASS_INTERNAL_ERROR; - - // register a time handler and a socket with this - - while (!done) { - - if ((rc = send()) < 0) // send pkt to agent - return rc; - else { - if (retry_counter++ > params_.get_retry()) - return SNMP_CLASS_TIMEOUT; - } - - // 2. wait for events (timeout, returned msg) - if (( rc = reactor->handle_events (to)) == 1) // one handler registered - return 0; - else { - if (rc == 0) { - to.set(params_.get_timeout(), 0); - } - else - return SNMP_CLASS_INTERNAL_ERROR; - } - } - return SNMP_CLASS_INTERNAL_ERROR; -} - -// implement state machine, send, wait (timeout/results) return -int transaction::run(transaction_result * r) -{ - result_ = r; - int rc; - - // 1. register io port for read access - ACE_Reactor * reactor = ACE_Reactor::instance(); - if (reactor->register_handler(session_.get_handle(), - this, - READ_MASK) == -1) - return SNMP_CLASS_INTERNAL_ERROR; - - retry_counter_ = 0; - - // register a time handler and a socket with this - ACE_Time_Value to = params_.get_timeout(); - if (reactor->schedule_timer(this, 0, to, to) < 0) - return SNMP_CLASS_INTERNAL_ERROR; - - if ((rc = send()) < 0) // send pkt to agent - return rc; - return 0; -} - -// got back response from SNMPv1 agent - process it -int transaction::handle_input (ACE_HANDLE) -{ - // OS allocates iovec_.iov_base ptr and len - delete [] receive_iovec_.iov_base; - reset_receive_buffer(receive_iovec_); - int rc = session_.recv(&receive_iovec_, receive_addr_, 0); - if (rc == -1) { - delete [] receive_iovec_.iov_base; - reset_receive_buffer(receive_iovec_); - if (result_) - result_->result(this, SNMP_CLASS_RESOURCE_UNAVAIL); - return SNMP_CLASS_RESOURCE_UNAVAIL; - } - if (result_) - { - result_->result(this, rc); - return 0; - } - return rc; -} - -int transaction::handle_timeout(const ACE_Time_Value &, - const void *) -{ - int rc; - if ((rc = send()) < 0) // send pkt to agent - result_->result(this, 0); - else - if (retry_counter_++ > params_.get_retry()) - result_->result(this, SNMP_CLASS_TIMEOUT); - - return 0; -} - - -const ACE_INET_Addr& transaction::get_from_addr() const -{ - return receive_addr_; -} - - -// return pdu to caller -int transaction::result(Pdu& pdu, char *comm_str, ACE_INET_Addr *from) -{ - // TODO: check to see the sender matches the receiver address.. - - // remove any vbs existing in this pdu - pdu.delete_all_vbs(); - - // any data to return? - if (receive_iovec_.iov_len == 0) - return -1; - - wpdu tmp(receive_iovec_); - - snmp_version ver; - - // return comm str and from address of incomming pdu if requested - int rc = tmp.get_pdu(pdu, ver); - if (comm_str) - ACE_OS::strcpy(comm_str, (char *)tmp.get_community()); - if (from) - *from = receive_addr_; - return rc; -} - -transaction::transaction(ACE_SOCK_Dgram& io) -: result_(0), session_(io) -{ - reset_receive_buffer(receive_iovec_); -} - - -int transaction::send() -{ - iovec io = wp_.get_buffer(); - if (io.iov_len == 0) { - // NO DATA ? - return -1; - } - ssize_t rc = session_.send (io.iov_base, io.iov_len, addr_ , 0); - return rc; -} - -transaction_result::~transaction_result() {} diff --git a/ASNMP/asnmp/transaction.h b/ASNMP/asnmp/transaction.h deleted file mode 100644 index 4ded5f34e1b..00000000000 --- a/ASNMP/asnmp/transaction.h +++ /dev/null @@ -1,80 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef TRANSACTION_ -#define TRANSACTION_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// transaction.h -// -// = DESCRIPTION -// -// = AUTHOR -// Michael R. MacFaden port to ACE / use Reactor pattern -// -// ============================================================================ - -#include "ace/Event_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "asnmp/target.h" -#include "asnmp/pdu.h" -#include "asnmp/transaction_result.h" -#include "asnmp/wpdu.h" // cmu adapter class -#include "ace/SOCK_Dgram.h" - -class ACE_Export transaction : public ACE_Event_Handler - // = TITLE - // Used to manage the details of a particular transaction betwen - // two SNMP agents. Uses SnmpTarget class to implement retry/timeout - -{ - int retry_counter_; - transaction_result * result_; - - public: - transaction(const Pdu& pdu, const UdpTarget& target, ACE_SOCK_Dgram& io); - transaction(ACE_SOCK_Dgram& io); - // constructor - ~transaction(); - // destructor - - int run(); - int run(transaction_result *r); // Async interface, with callback object - // begin polling for values - - int result(Pdu& pdu, char *comm_str = 0, ACE_INET_Addr *from_addr = 0); - // return pdu with result from agent after run() is completed rc = 0 - // optionally get community str - - virtual int handle_input (ACE_HANDLE fd); - // called by reactor when data is ready to be read in from OS memory - virtual int handle_timeout (const ACE_Time_Value &, const void *); - // used for resend in asynchronous run() - - int send(); - // transmit buffer command to network... - - const ACE_INET_Addr& get_from_addr() const; - // pre: handle_input called - // retrieve the sender's from address from the last pkt - - private: - transaction(const transaction&); - // disallow copy construction - - wpdu wp_; // wire pdu - UdpTarget params_; // params - ACE_INET_Addr addr_; // to address - ACE_SOCK_Dgram session_; // io object - iovec receive_iovec_; // receive buffer - ACE_INET_Addr receive_addr_; // from address -}; - -#endif // TRANSACTION_ diff --git a/ASNMP/asnmp/transaction_result.h b/ASNMP/asnmp/transaction_result.h deleted file mode 100644 index 1c0472675ea..00000000000 --- a/ASNMP/asnmp/transaction_result.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef TRANSACTION_RESULT_H_ -#define TRANSACTION_RESULT_H_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// transaction_result.h -// -// = DESCRIPTION -// An object respresenting a request/reply operation between mgr/agent -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ - -class transaction; -class ACE_Export transaction_result -{ - public: - virtual ~transaction_result(); - virtual void result(transaction * trans, int) = 0; -}; - -#endif diff --git a/ASNMP/asnmp/vb.cpp b/ASNMP/asnmp/vb.cpp deleted file mode 100644 index ff9c22bb773..00000000000 --- a/ASNMP/asnmp/vb.cpp +++ /dev/null @@ -1,396 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// vb.h -// -// = DESCRIPTION -// The Vb class is an encapsulation of the snmp variable binding. -// This module contains the class definition for the variable binding (VB) -// class. The VB class is an encapsulation of a SNMP VB. A VB object is -// composed of one SNMP++ Oid and one SMI value. The Vb class utilizes Oid -// objects and thus requires the Oid class. To use this class, -// set oid, value then call valid() to be sure object was constructed correctly. -// -// = AUTHOR -// Peter E Mellquist -// Michael R MacFaden mrm@cisco.com - rework & ACE port -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/oid.h" // include oid class defs -#include "asnmp/vb.h" // include vb class defs -#include "asnmp/snmperrs.h" // error codes - -ACE_RCSID(asnmp, vb, "$Id$") - -//---------------[ Vb::Vb( void) ]-------------------------------------- -// constructor with no arguments -// makes an vb, unitialized -Vb::Vb( void): output_(0), iv_vb_value_(0), - exception_status_(SNMP_CLASS_SUCCESS) -{ -} - -//---------------[ Vb::Vb( const Oid &oid) ]----------------------------- -// constructor to initialize the oid -// makes a vb with oid portion initialized -Vb::Vb( const Oid &oid): output_(0), iv_vb_oid_(oid), iv_vb_value_(0), - exception_status_(SNMP_CLASS_SUCCESS) -{ -} - -//---------------[ Vb::Vb( const Oid &oid, const SmiSyntax &val) ]------- -Vb::Vb( const Oid &oid, const SnmpSyntax &val, const SmiUINT32 status): - output_(0), iv_vb_oid_(oid), iv_vb_value_(0), exception_status_(status) -{ - // iv_vb_value_ = recast_smi_object(val); // allocate and construct object - iv_vb_value_ = val.clone(); -} - -//---------------[ Vb::Vb( const Vb &vb) ]----------------------------- -// copy constructor -Vb::Vb( const Vb &vb): output_(0), iv_vb_value_(0) -{ - *this = vb; -} - -//---------------[ Vb::~Vb() ]------------------------------------------ -// destructor -// if the vb has a oid or an octect string then -// the associated memory needs to be freed -Vb::~Vb() -{ - free_vb(); - delete [] output_; // formatting buffer if it exists -} - - -//--------------[ Vb::valid() ]----------------------------------------- -// returns validity of a Vb object -// must have a valid oid and value -int Vb::valid() const -{ - if ( iv_vb_oid_.valid() && (iv_vb_value_ && iv_vb_value_->valid()) ) - return 1; - else - return 0; -} - - -//---------------[ Vb& Vb::operator=( const Vb &vb) ]-------------------- -// overloaded assignment allows assigning one Vb to another -// this involves deep memory thus target vb needs to be freed -// before assigning source -Vb& Vb::operator=( const Vb &vb) -{ - free_vb(); // free up target to begin with - - //-----[ reassign the Oid portion 1st ] - vb.get_oid( iv_vb_oid_); - - //-----[ next set the vb value portion ] - if (vb.iv_vb_value_ == 0) { - iv_vb_value_ = 0; - } - else { - iv_vb_value_ = vb.iv_vb_value_->clone(); - } - exception_status_ = vb.exception_status_; - - return *this; // return self reference -} - - // set a Vb null, if its not already -void Vb::set_null() -{ - free_vb(); -} - -//---------------[ Vb::set_oid( const Oid oid ) ]----------------------- -// set value oid only with another oid -void Vb::set_oid( const Oid& oid) -{ - iv_vb_oid_ = oid; -} - -//---------------[ Vb::get_oid( Oid &oid) ]----------------------------- -// get oid portion -void Vb::get_oid( Oid &oid) const -{ - oid = iv_vb_oid_; -} - -//----------------[ void Vb::free_vb() ]-------------------------------- -// protected method to free memory -// this methos is used to free memory when assigning new vbs -// or destructing -// in the case of oids and octets, we need to do a deep free -void Vb::free_vb() -{ - if (iv_vb_value_) - delete iv_vb_value_; - exception_status_ = SNMP_CLASS_SUCCESS; - iv_vb_value_ = 0; -} - -void Vb::set_value( const SnmpInt32& i) -{ - free_vb(); - iv_vb_value_ = (SnmpSyntax *)new SnmpInt32(i); -} - -void Vb::set_value( const SnmpUInt32& u) -{ - free_vb(); - iv_vb_value_ = (SnmpSyntax *)new SnmpUInt32(u); -} - -void Vb::set_value( const Gauge32& g) -{ - free_vb(); - iv_vb_value_ = (SnmpSyntax *)new Gauge32(g); -} - -void Vb::set_value( const Counter32& c) -{ - free_vb(); - iv_vb_value_ = (SnmpSyntax *)new Counter32(c); -} - -void Vb::set_value( const Counter64& c) -{ - free_vb(); - iv_vb_value_ = (SnmpSyntax *)new Counter64(c); -} - -void Vb::set_value( const TimeTicks& t) -{ - free_vb(); - iv_vb_value_ = (SnmpSyntax *)new TimeTicks(t); -} - -void Vb::set_value( const OctetStr& s) -{ - free_vb(); - iv_vb_value_ = (SnmpSyntax *)new OctetStr(s); -} - -void Vb::set_value( const Oid& o) -{ - free_vb(); - iv_vb_value_ = (SnmpSyntax *)new Oid(o); -} - -void Vb::set_value ( const SnmpSyntax &val) -{ - free_vb(); - iv_vb_value_ = val.clone(); -} - -int Vb::get_value( SnmpInt32 &i) -{ - if (iv_vb_value_ && - iv_vb_value_->valid() && - (iv_vb_value_->get_syntax() == sNMP_SYNTAX_INT32 )) { - i = *((SnmpInt32 *) iv_vb_value_); - return SNMP_CLASS_SUCCESS; - } - else - return SNMP_CLASS_INVALID; -} - -int Vb::get_value( SnmpUInt32 &u) -{ - if (iv_vb_value_ && iv_vb_value_->valid()) - { - SmiUINT32 syntax = iv_vb_value_->get_syntax(); - if (syntax == sNMP_SYNTAX_GAUGE32 || - syntax == sNMP_SYNTAX_CNTR32 || - syntax == sNMP_SYNTAX_TIMETICKS || - syntax == sNMP_SYNTAX_UINT32) - { - u = *((SnmpUInt32 *) iv_vb_value_); - return SNMP_CLASS_SUCCESS; - } - } - return SNMP_CLASS_INVALID; -} - -/* return a uint or a gauge. this is casting, but no semantic difference - * at this level - */ -int Vb::get_value( Gauge32 &g) -{ - if (iv_vb_value_ && - iv_vb_value_->valid() && - ((iv_vb_value_->get_syntax() == sNMP_SYNTAX_GAUGE32) || - iv_vb_value_->get_syntax() == sNMP_SYNTAX_UINT32) ) { - g = *((Gauge32 *) iv_vb_value_); - return SNMP_CLASS_SUCCESS; - } - else - return SNMP_CLASS_INVALID; -} - -int Vb::get_value( Counter32 &c) -{ - if (iv_vb_value_ && - iv_vb_value_->valid() && - (iv_vb_value_->get_syntax() == sNMP_SYNTAX_CNTR32 )) { - c = *((Counter32 *) iv_vb_value_); - return SNMP_CLASS_SUCCESS; - } - else - return SNMP_CLASS_INVALID; -} - -int Vb::get_value( Counter64 &c) -{ - if (iv_vb_value_ && - iv_vb_value_->valid() && - (iv_vb_value_->get_syntax() == sNMP_SYNTAX_CNTR64 )) { - c = *((Counter32 *) iv_vb_value_); - return SNMP_CLASS_SUCCESS; - } - else - return SNMP_CLASS_INVALID; -} - -int Vb::get_value( TimeTicks &t) -{ - if (iv_vb_value_ && - iv_vb_value_->valid() && - (iv_vb_value_->get_syntax() == sNMP_SYNTAX_TIMETICKS )) { - t = *((TimeTicks *) iv_vb_value_); - return SNMP_CLASS_SUCCESS; - } - else - return SNMP_CLASS_INVALID; -} - -int Vb::get_value( OctetStr &s) -{ - if (iv_vb_value_ && - iv_vb_value_->valid() && - (iv_vb_value_->get_syntax() == sNMP_SYNTAX_OCTETS )) { - s = *((OctetStr *) iv_vb_value_); - return SNMP_CLASS_SUCCESS; - } - else - return SNMP_CLASS_INVALID; -} - -int Vb::get_value( Oid &s) -{ - if (iv_vb_value_ && - iv_vb_value_->valid() && - (iv_vb_value_->get_syntax() == sNMP_SYNTAX_OID )) { - s = *((Oid *) iv_vb_value_); - return SNMP_CLASS_SUCCESS; - } - else - return SNMP_CLASS_INVALID; -} - - -//---------------[ Vb::get_value( Value &val) ]-------- -int Vb::get_value( SnmpSyntax &val) -{ - if (iv_vb_value_) { - val = *iv_vb_value_; - if (val.valid()) - return SNMP_CLASS_SUCCESS; - else - return SNMP_CLASS_INVALID; - } - else - { -//TM: should set val to be invalid - return SNMP_CLASS_INVALID; - } -} - - - -//-----[ misc]-------------------------------------------------------- - -// return the current syntax -// This method violates Object Orientation but may be useful if -// the caller has a vb object and does not know what it is. -// This would be useful in the implementation of a browser. -SmiUINT32 Vb::get_syntax() -{ - if ( exception_status_ != SNMP_CLASS_SUCCESS) - return exception_status_; - else - return ( iv_vb_value_ ? iv_vb_value_->get_syntax() : sNMP_SYNTAX_NULL); -} - -// return the printabel value -char *Vb::to_string_value() -{ - if (iv_vb_value_) - return iv_vb_value_->to_string(); - else - return ""; -} - -// return the printable oid -char *Vb::to_string_oid() -{ - return iv_vb_oid_.to_string(); -} - -// generate string with name/ value format -char *Vb::to_string() -{ - int len = ACE_OS::strlen(iv_vb_oid_.to_string()); - char *ptr = ""; - if (iv_vb_value_) - ptr = iv_vb_value_->to_string(); - len += ACE_OS::strlen(ptr) + 3 + 1; // " / " + null - ACE_NEW_RETURN(output_, char[len], ""); - ACE_OS::sprintf(output_, "%s / %s", iv_vb_oid_.to_string(), ptr); - return output_; -} - -// friend function to set exception status -void set_exception_status( Vb *vb, const SmiUINT32 status) -{ - vb->exception_status_ = status; -} - -// equivlence operator overloaded -// hack, by side effect, compare based on string formatting output_ -int operator==( const Vb &lhs, const Vb &rhs) -{ - if ( lhs.iv_vb_oid_ != rhs.iv_vb_oid_) - return 0; - - if (lhs.iv_vb_value_ != 0 && rhs.iv_vb_value_ != 0) { - int val = strcmp(lhs.iv_vb_value_->to_string(), - rhs.iv_vb_value_->to_string()); - return !val; - } - else - return 0; -} diff --git a/ASNMP/asnmp/vb.h b/ASNMP/asnmp/vb.h deleted file mode 100644 index dca6e7ae985..00000000000 --- a/ASNMP/asnmp/vb.h +++ /dev/null @@ -1,204 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef VB_CLS_ -#define VB_CLS_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// vb.h -// -// = DESCRIPTION -// This module contains the class definition for the variable binding (VB) -// class. The VB class is an encapsulation of a SNMP VB. A VB object is -// composed of one SNMP++ Oid and one SMI value. The Vb class utilizes Oid -// objects and thus requires the Oid class. To use this class, -// set oid, value then call valid() to be sure object was constructed correctly. -// -// = AUTHOR -// Peter E Mellquist -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -//----[ external calls ]---------------------------------------------- -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "asnmp/smival.h" -#include "asnmp/snmperrs.h" // V2c error def -#include "asnmp/oid.h" // oid class def -#include "asnmp/timetick.h" // time ticks -#include "asnmp/counter.h" // counter -#include "asnmp/gauge.h" // gauge class -#include "asnmp/ctr64.h" // 64 bit counters -#include "asnmp/octet.h" // octet class -#include "asnmp/address.h" // address class def -#include "asnmp/integer.h" // integer class - - -//------------[ VB Class Def ]------------------------------------- -// The Vb class is the encapsulation of the SNMP variable binding. -// Variable binding lists in SNMP++ are represented as arrays of -// Vb objects. Vb objects are passed to and from SNMP objects to -// provide getting or setting MIB values. -// The vb class keeps its own memory for objects and does not -// utilize pointers to external data structures. -// -class ACE_Export Vb - // = TITLE - // Implement the concrete Variable Bindings aka Varbind - // composite type. Varbinds hold 1 Oid and 1 Value (Any SMI value) -{ -public: - Vb( void); - // constructor with no arguments - // makes an vb, unitialized (does not make object valid) - - Vb( const Oid &oid); - // constructor to initialize the oid - // makes a vb with oid portion initialized (does not make object valid) - - Vb( const Oid& vb, const SnmpSyntax &val, const SmiUINT32=SNMP_CLASS_SUCCESS); - // constructor to initialize the oid - // makes a vb with oid portion and value portion initialized, (valid) - - Vb( const Vb &vb); - // copy constructor - - ~Vb(); - // destructor - // if the vb has a oid or an octect string then - // the associated memory needs to be freed - - int valid() const; - // return validity of Vb object (both oid and value set return 1 else 0) - - Vb& operator=( const Vb &vb); - // assignment to another Vb object overloaded - - friend int operator==( const Vb &lhs, const Vb &rhs); - // equivlence operator overloaded - - //-----[ set oid / get oid part]------------------------------------------ - - void set_oid( const Oid& oid); - // set value oid only with another oid - - void get_oid( Oid &oid) const; - // get oid portion - - //-----[ set value part]-------------------------------------------------- - - void set_null(); - // set a Vb null, if its not already - - void set_value( const TimeTicks& ticks); - // returns 0 on success and a value - - void set_value( const Oid& oid); - // returns 0 on success and a value - - void set_value( const Counter32& ctr); - // returns 0 on success and a value - - void set_value( const Counter64& ctr); - // returns 0 on success and a value - - void set_value( const Gauge32& ctr); - // returns 0 on success and a value - - void set_value( const SnmpUInt32& ctr); - // returns 0 on success and a value - - void set_value( const SnmpInt32& ctr); - // returns 0 on success and a value - - void set_value( const OctetStr& oct_str); - // get an octet string object - - //----[ get value ]------------------------------------------------ - - int get_value( TimeTicks& ticks); - // returns 0 on success and a value - - int get_value( Oid& oid); - // returns 0 on success and a value - - int get_value( Counter32& ctr); - // returns 0 on success and a value - - int get_value( Counter64& ctr); - // returns 0 on success and a value - - int get_value( Gauge32& ctr); - // returns 0 on success and a value - - int get_value( SnmpUInt32& ctr); - // returns 0 on success and a value - - int get_value( SnmpInt32& ctr); - // returns 0 on success and a value - - int get_value( OctetStr& oct_str); - // get an octet string object - - // escape hatch - void set_value( const SnmpSyntax &val); - // for other derived types that can be casted - - int get_value( SnmpSyntax &val); - // gets a general value - - SmiUINT32 get_syntax(); - // return the current syntax - // Or.. if a V2 VB exception is present then return the exception value - - friend void set_exception_status( Vb *vb, const SmiUINT32 status); - // set the exception status - - char *to_string(); - // return fomatted version of this object - - char *to_string_value(); - // returns a formatted version of the value - - char *to_string_oid(); - // returns a formatted version of the value - -protected: - char *output_; - // display vb as [ oid / value ] - - Oid iv_vb_oid_; - // a vb is made up of a oid - - SnmpSyntax *iv_vb_value_; - // and a value... - - SmiUINT32 exception_status_; - // are there any vb exceptions?? - - void free_vb(); -}; - -#endif // VB_CLS_ - diff --git a/ASNMP/asnmp/wpdu.cpp b/ASNMP/asnmp/wpdu.cpp deleted file mode 100644 index 43c38d9a5e6..00000000000 --- a/ASNMP/asnmp/wpdu.cpp +++ /dev/null @@ -1,520 +0,0 @@ -// $Id$ - -// ============================================================================ -// = LIBRARY -// asnmp -// -// = FILENAME -// wpdu.cpp -// -// = DESCRIPTION -// Adapter class. Converts between raw wire format and Pdu objects -// that can be stuffed out a I/O port or reconstructed -// -// = AUTHOR -// Michael R. MacFaden rework the class api and impl using ACE -// Peter E Mellquist implementation/code from snmp++ snmpmsg class -// -// ============================================================================ - -#include "asnmp/wpdu.h" -#include - -#define DEFINE_TRAP_CONSTANTS_ -#include "asnmp/enttraps.h" - -ACE_RCSID(asnmp, wpdu, "$Id$") - -#define MAX_COMM_STR_LEN 255 -#define V1_COLD_START 0 -#define V1_WARM_START 1 -#define V1_LINK_DOWN 2 -#define V1_LINK_UP 3 -#define V1_AUTH_FAILURE 4 -#define V1_EGP_NEIGHBOR_LOSS 5 -#define V1_ENT_SPECIFIC 6 - -inline -void reset_iov(iovec& iov) -{ - iov.iov_base = 0; - iov.iov_len = 0; -} - -wpdu::wpdu(const Pdu& pdu, const UdpTarget& target): - valid_flag_(SNMP_CLASS_INVALID ), comm_len(MAX_COMM_STR_LEN) -{ - reset_iov(iovec_); - version_ = target.get_version(); - int status; - OctetStr comm_str; - - community_name[0] = 0; - - snmp_pdu *raw_pdu; // create a raw pdu - raw_pdu = cmu_snmp::pdu_create( (int) pdu.get_type()); - if (!raw_pdu) { - valid_flag_ = SNMP_CLASS_RESOURCE_UNAVAIL; - return; - } - - raw_pdu->reqid = pdu.get_request_id(); - raw_pdu->errstat= (unsigned long) pdu.get_error_status(); - raw_pdu->errindex= (unsigned long) pdu.get_error_index(); - - switch (raw_pdu->command) { - case sNMP_PDU_GET: - case sNMP_PDU_GETNEXT: - target.get_read_community(comm_str); - break; - - case sNMP_PDU_SET: - target.get_write_community(comm_str); - break; - - case sNMP_PDU_V1TRAP: - target.get_read_community(comm_str); - if (set_trap_info(raw_pdu, pdu)) // will free raw_pdu - return; - break; - case sNMP_PDU_RESPONSE: - break; - - default: - ACE_ASSERT(0); - return; - } - - if (load_vbs(raw_pdu, pdu)) { - cmu_snmp::free_pdu( raw_pdu); - valid_flag_ = SNMP_CLASS_RESOURCE_UNAVAIL; - return; - } - - // TODO: determine how big raw_pdu serializes out to - iovec_.iov_len = target.get_max_pdu_size(); - ACE_NEW(iovec_.iov_base, char [iovec_.iov_len]); - - // create raw byte stream - status = cmu_snmp::build( raw_pdu, - (unsigned char *)iovec_.iov_base, - (int *) &iovec_.iov_len, - target.get_version(), - comm_str.data(), comm_str.length()); - if ( status != 0) { - valid_flag_ = SNMP_ERROR_WRONG_ENCODING; - cmu_snmp::free_pdu( raw_pdu); - return; - } - - cmu_snmp::free_pdu( raw_pdu); - valid_flag_ = SNMP_CLASS_SUCCESS; -} - -int wpdu::set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const -{ - Oid enterprise; - Oid trapid; // validate caller has set this correctly - pdu.get_notify_id( trapid); - if ( !trapid.valid() || trapid.length() < 2 ) { - cmu_snmp::free_pdu( raw_pdu); - return SNMP_CLASS_INVALID_NOTIFYID; - } - - - raw_pdu->specific_type=0; - - // TODO: object should emit numeric instead of this kind of mess... - if ( trapid == coldStart) - raw_pdu->trap_type = V1_COLD_START; // cold start - else if ( trapid == warmStart) - raw_pdu->trap_type = V1_WARM_START; // warm start - else if( trapid == linkDown) - raw_pdu->trap_type = V1_LINK_DOWN; // link down - else if ( trapid == linkUp) - raw_pdu->trap_type = V1_LINK_UP; // link up - else if ( trapid == authenticationFailure ) - raw_pdu->trap_type = V1_AUTH_FAILURE; // authentication failure - else if ( trapid == egpNeighborLoss) - raw_pdu->trap_type = V1_EGP_NEIGHBOR_LOSS; // egp neighbor loss - else { - raw_pdu->trap_type = V1_ENT_SPECIFIC; // enterprise specific - // last oid subid is the specific value - // if 2nd to last subid is "0", remove it - // enterprise is always the notify oid prefix - raw_pdu->specific_type = (int) trapid[(int) (trapid.length() - 1)]; - trapid.trim(1); - if ( trapid[(int)(trapid.length() - 1)] == 0 ) - trapid.trim(1); - enterprise = trapid; - } - - if ( raw_pdu->trap_type != V1_ENT_SPECIFIC) - pdu.get_notify_enterprise( enterprise); - if ( enterprise.length() > 0) { - // note!! To the contrary, enterprise OID val is - // copied here and raw_pdu->enterprise is freed in free_pdu - // as it should be (HDN) - // these are hooks into an SNMP++ oid - // and therefor the raw_pdu enterprise - // should not free them. null them out!! - SmiLPOID rawOid; - rawOid = enterprise.oidval(); - // HDN - enterprise is a local object, cannot simply assign pointer - //raw_pdu->enterprise = rawOid->ptr; - raw_pdu->enterprise_length = (int) rawOid->len; - ACE_NEW_RETURN(raw_pdu->enterprise, - oid[raw_pdu->enterprise_length],-1); - ACE_OS::memcpy((char *)raw_pdu->enterprise,(char *)rawOid->ptr, - raw_pdu->enterprise_length * sizeof(oid)); - } - - TimeTicks timestamp; - pdu.get_notify_timestamp( timestamp); - raw_pdu->time = ( unsigned long) timestamp; - - // HDN - set agent addr using the local hostname if possible - char localHostName[MAXHOSTNAMELEN]; - Snmp::get_host_name(localHostName, MAXHOSTNAMELEN); - if (ACE_OS::strlen(localHostName) > 0) { - GenAddress addr(localHostName); - OctetStr octet; - addr.to_octet(octet); - ACE_OS::memcpy(&(raw_pdu->agent_addr.sin_addr), - octet.data(), - octet.length()); - } - - return 0; -} - -wpdu::wpdu(const iovec& iov): valid_flag_(0),comm_len(MAX_COMM_STR_LEN) -{ - community_name[0] = 0; - reset_iov(iovec_); - version_ = version1; // TODO: figure where this should come from - ACE_NEW(iovec_.iov_base, char[iov.iov_len]); - if (!iovec_.iov_base) { - valid_flag_ = SNMP_CLASS_RESOURCE_UNAVAIL; - return; - } - - copy_iovec(iovec_, iov); - valid_flag_ = SNMP_CLASS_SUCCESS; -} - -wpdu::wpdu(): valid_flag_(0), comm_len(MAX_COMM_STR_LEN) -{ - community_name[0] = 0; - reset_iov(iovec_); - version_ = version1; // TODO: figure where this should come from -} - -int wpdu::valid() const -{ - return (valid_flag_ == SNMP_CLASS_SUCCESS); -} - -int wpdu::load_vbs(snmp_pdu *raw_pdu, const Pdu& pdu) -{ - int status = 0; - - // load up the payload - // for all Vbs in list, add them to the pdu - int vb_count; - Vb tempvb; - Oid tempoid; - SmiLPOID smioid; - SmiVALUE smival; - - vb_count = pdu.get_vb_count(); - - for (int z = 0; z < vb_count; z++) { - pdu.get_vb( tempvb, z); - tempvb.get_oid( tempoid); - smioid = tempoid.oidval(); - // what are we trying to convert here (vb oid part or value part) - status = convert_vb_to_smival( tempvb, &smival ); - if ( status != SNMP_CLASS_SUCCESS) - return status; - - // add the var to the raw pdu - cmu_snmp::add_var(raw_pdu, smioid->ptr, (int) smioid->len, &smival); - free_smival_descriptor( &smival); - } - - return status; -} - -// supports overlapped copies -// static -void wpdu::copy_iovec(iovec& dest, const iovec& src) -{ - if (&dest == &src) - return; - - ACE_OS:: memmove( dest.iov_base, src.iov_base, src.iov_len); - dest.iov_len = src.iov_len; -} - -int wpdu::convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival ) -{ - smival->syntax = tempvb.get_syntax(); - - switch ( smival->syntax ) { - - case sNMP_SYNTAX_NULL: - break; - - // case sNMP_SYNTAX_INT32: - case sNMP_SYNTAX_INT: - { - SnmpInt32 tmp; - tempvb.get_value(tmp); - smival->value.sNumber = tmp; - } - break; - - // case sNMP_SYNTAX_UINT32: - case sNMP_SYNTAX_GAUGE32: - case sNMP_SYNTAX_CNTR32: - case sNMP_SYNTAX_TIMETICKS: - { - SnmpUInt32 tmp; - tempvb.get_value(tmp); - smival->value.uNumber = tmp; - } - break; - - // case Counter64 - case sNMP_SYNTAX_CNTR64: - { - Counter64 c64; - tempvb.get_value(c64); - smival->value.hNumber.hipart = c64.high(); - smival->value.hNumber.lopart = c64.low(); - } - break; - - // OID syntax - case sNMP_SYNTAX_OID: - { - Oid tmpoid; - tmpoid.oidval(); - tempvb.get_value(tmpoid); - SmiLPOID smi = tmpoid.oidval(); - smival->value.oid.len = tmpoid.length(); - ACE_NEW_RETURN(smival->value.oid.ptr, - SmiUINT32 [smival->value.oid.len], 1); - ACE_OS::memcpy(smival->value.oid.ptr, smi->ptr, - smival->value.oid.len *sizeof(SmiUINT32)); - } - break; - - case sNMP_SYNTAX_BITS: - case sNMP_SYNTAX_OCTETS: - case sNMP_SYNTAX_IPADDR: - { - OctetStr os; - tempvb.get_value(os); - smival->value.string.ptr = 0; - smival->value.string.len = os.length(); - if ( smival->value.string.len > 0 ) { - ACE_NEW_RETURN(smival->value.string.ptr, - SmiBYTE [smival->value.string.len], 1); - if ( smival->value.string.ptr ) { - for (int i=0; i<(int) smival->value.string.len ; i++) - smival->value.string.ptr[i] = os[i]; - } - else { - smival->syntax = sNMP_SYNTAX_NULL; // invalidate the smival - return SNMP_CLASS_RESOURCE_UNAVAIL; - } - } - } - break; - - default: - ACE_DEBUG((LM_DEBUG, "wpdu::convert_vb_to_smival did not convert vb\n")); - // ACE_ASSERT(0); - } // switch - - return 0; -} - -// free a SMI value -void wpdu::free_smival_descriptor( SmiVALUE *smival ) -{ - switch ( smival->syntax ) { - case sNMP_SYNTAX_OCTETS: - case sNMP_SYNTAX_OPAQUE: - case sNMP_SYNTAX_IPADDR: - case sNMP_SYNTAX_BITS: // obsoleted in SNMPv2 Draft Std - delete [] smival->value.string.ptr; - break; - - case sNMP_SYNTAX_OID: - delete [] smival->value.oid.ptr; - break; - } - smival->syntax = sNMP_SYNTAX_NULL; -} - - -wpdu::~wpdu() -{ - delete [] iovec_.iov_base; -} - -const iovec& wpdu::get_buffer() const -{ - return iovec_; -} - -// return a pdu from a buffer -int wpdu::get_pdu(Pdu& pdu, snmp_version& version) -{ - if (iovec_.iov_len == 0) - return -1; // NO DATA - - snmp_pdu *raw_pdu; - raw_pdu = cmu_snmp::pdu_create(0); - if (!raw_pdu) { - return SNMP_CLASS_RESOURCE_UNAVAIL; - } - - // max value a client can send us - TODO: replace this with an - // api to get actual string length - int status = cmu_snmp::parse( raw_pdu, (unsigned char *)iovec_.iov_base, - community_name, comm_len, - version, iovec_.iov_len); - if (status != 0) - return SNMP_CLASS_INTERNAL_ERROR; - - community_name[comm_len] = 0; // set null based on returned length - set_request_id( &pdu, raw_pdu->reqid); - set_error_status( &pdu, (int) raw_pdu->errstat); - set_error_index( &pdu, (int) raw_pdu->errindex); - pdu.set_type( raw_pdu->command); - - if (restore_vbs(pdu, raw_pdu)) { - cmu_snmp::free_pdu(raw_pdu); - return SNMP_CLASS_INTERNAL_ERROR; - } - - cmu_snmp::free_pdu(raw_pdu); - return 0; -} - -int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const -{ - Vb tempvb; - Oid tempoid; - struct variable_list *vp; - - for(vp = raw_pdu->variables; vp; vp = vp->next_variable) { - - // extract the oid portion - tempoid.set_data( (unsigned long *)vp->name, - ( unsigned int) vp->name_length); - tempvb.set_oid( tempoid); - - // extract the value portion - switch(vp->type) { - - // octet string - case sNMP_SYNTAX_OCTETS: - case sNMP_SYNTAX_OPAQUE: - { - OctetStr octets( (char *) vp->val.string, - (long) vp->val_len); - tempvb.set_value( octets); - } - break; - - // object id - case sNMP_SYNTAX_OID: - { - Oid oid( (unsigned long*) vp->val.objid, - (int) vp->val_len); - tempvb.set_value( oid); - } - break; - - // timeticks - case sNMP_SYNTAX_TIMETICKS: - { - TimeTicks timeticks( (unsigned long) *(vp->val.integer)); - tempvb.set_value( timeticks); - } - break; - - // 32 bit counter - case sNMP_SYNTAX_CNTR32: - { - Counter32 counter32( (unsigned long) *(vp->val.integer)); - tempvb.set_value( counter32); - } - break; - - // ip address - case sNMP_SYNTAX_IPADDR: - { - char buffer[20]; - sprintf( buffer,"%d.%d.%d.%d", - vp->val.string[0], - vp->val.string[1], - vp->val.string[2], - vp->val.string[3]); - IpAddress ipaddress( buffer); - tempvb.set_value( ipaddress); - } - break; - - // 32 bit integer - case sNMP_SYNTAX_INT: - { - SnmpInt32 int32( (long) *(vp->val.integer)); - tempvb.set_value( int32); - } - break; - - // 32 bit unsigned integer - case sNMP_SYNTAX_UINT32: - { - SnmpUInt32 uint32( (unsigned long) *(vp->val.integer)); - tempvb.set_value( uint32); - } - break; - - // v2 counter 64's - case sNMP_SYNTAX_CNTR64: - break; - - case sNMP_SYNTAX_NULL: - tempvb.set_null(); - break; - - // v2 vb exceptions - case sNMP_SYNTAX_NOSUCHOBJECT: - case sNMP_SYNTAX_NOSUCHINSTANCE: - case sNMP_SYNTAX_ENDOFMIBVIEW: - set_exception_status( &tempvb, vp->type); - break; - - default: - tempvb.set_null(); - - } // end switch - - // append the vb to the pdu - pdu += tempvb; - } - - return 0; -} - -const unsigned char *wpdu::get_community() const -{ - return community_name; -} diff --git a/ASNMP/asnmp/wpdu.h b/ASNMP/asnmp/wpdu.h deleted file mode 100644 index a4d4bb1d0c1..00000000000 --- a/ASNMP/asnmp/wpdu.h +++ /dev/null @@ -1,85 +0,0 @@ -/* -*-C++-*- */ -// $Id$ -#ifndef WPDU_H_ -#define WPDU_H_ -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// wpdu.h -// -// = DESCRIPTION -// Adapter class. Converts a Pdu and GenTarget into a format -// that can be stuffed out a I/O port -// -// = AUTHOR -// Michael R. MacFaden re-worked api, use ACE API -// Peter E Mellquist wrote original class snmpmsg -// -// ============================================================================ - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "asnmp/asn1.h" -#include "asnmp/pdu.h" -#include "asnmp/target.h" - -// this is an adapter class, it peforms the following transformations -// PDU / Target -> iovec buffer -// iovec buffer -> PDU / Target -struct snmp_pdu; -class ACE_Export wpdu - // = TITLE - // Implement an Adapter pattern between CMU SNMP and HP SNMP++ - // -{ -public: - - wpdu(const Pdu& pdu, const UdpTarget& target); - // construct CMU data from HP SNMP++ objects - wpdu(const iovec& buffer); - // construct HP SNMP++ objects from raw buffer via CMU SNMP datatypes - wpdu(); // same as using iovec? - - ~wpdu(); - - int valid() const; - // constructor completed ok? rc = 1 else 0 - - const iovec& get_buffer() const; - // return raw data stream via CMU code - - int get_pdu(Pdu& pdu, snmp_version& version); - // return HP SNMP++ pdu - - const unsigned char *get_community() const; - // return community strptr - -private: - int convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival ); - int load_vbs(snmp_pdu *raw_pdu, const Pdu& pdu); - int restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const; - void free_smival_descriptor( SmiVALUE *smival ); - static void copy_iovec(iovec& dest, const iovec& src); - int set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const; - - iovec iovec_; - // raw format - - int valid_flag_; - // object construction state - - snmp_version version_; - // snmp version - - unsigned char community_name[MAX_COMM_STR_LEN]; - unsigned long comm_len; // = MAX_COMM_STR_LEN; -}; - -#endif // WPDU_H_ diff --git a/ASNMP/examples/Makefile b/ASNMP/examples/Makefile deleted file mode 100644 index 64ca08c687c..00000000000 --- a/ASNMP/examples/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -#---------------------------------------------------------------------------- -# -# $Id$ -# -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE+SNMP examples directory -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -DIRS = get \ - next \ - set \ - trap \ - walk - -#---------------------------------------------------------------------------- -# macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/ASNMP/examples/get/Makefile b/ASNMP/examples/get/Makefile deleted file mode 100644 index be0a6a633c7..00000000000 --- a/ASNMP/examples/get/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for get application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - - -# ACE+SNMP -BIN = get get_async -CCFLAGS = -I$(ACE_ROOT)/ASNMP/ -LSRC = $(addsuffix .cpp,$(BIN)) -LDLIBS := -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ASNMP/examples/get/get.cpp b/ASNMP/examples/get/get.cpp deleted file mode 100644 index 5c05bd5eac5..00000000000 --- a/ASNMP/examples/get/get.cpp +++ /dev/null @@ -1,195 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// get.cpp -// -// = DESCRIPTION -// Sample application demonstrating synchronous Snmp::get API -// to access an SNMP Version 1 agent. -// -// = AUTHOR -// Peter E. Mellquist original code -// Michael R MacFaden mrm@cisco.com rework API/ACE integration -// -// ============================================================================ - -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/snmp.h" -#include "ace/Get_Opt.h" - -ACE_RCSID(get, get, "$Id$") - -// -// SNMPv1 Get Application -// -class getapp { - public: - getapp(int argc, char **argv); // process command line args - int valid() const; // verify transaction can proceed - int run(); // issue transaction - static void usage(); // operator help message - - private: - getapp(const getapp&); - - UdpAddress address_; - Pdu pdu_; // construct a request Pdu - Oid oid_; - OctetStr community_; - Snmp snmp_; - UdpTarget target_; - int valid_; -}; - - -// main entry point -int main( int argc, char *argv[]) -{ - getapp get(argc, argv); - if (get.valid()) - return get.run(); - else - getapp::usage(); - return 1; -} - -int getapp::valid() const -{ - return valid_; -} -getapp::getapp(int argc, char *argv[]): valid_(0) -{ - Oid req, def_oid("1.3.6.1.2.1.1.1.0"); // default is sysDescr - if ( argc < 2) - return; - - address_ = argv[argc - 1]; - if ( !address_.valid()) { - cout << "ERROR: Invalid IPv4 address or DNS hostname: " \ - << argv[argc] << "\n"; - return; - } - - ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:p:"); - for (int c; (c = get_opt ()) != -1; ) - switch (c) - { - case 'o': - req = get_opt.optarg; - if (req.valid() == 0) - cout << "ERROR: oid value: " <run_event_loop(); - } - return 0; -} - -void getapp::result(Snmp *, int rc) -{ - Vb vb; - if (rc < 0) - { - char *ptr = snmp_.error_string(); - cout << "ASNMP:ERROR: get command failed reason: " << ptr << endl; - } else { - // check to see if there are any errors - if (pdu_.get_error_status()) { - cout << "ERROR: agent replied as follows\n"; - cout << pdu_.agent_error_reason() << endl; - } - else { - VbIter iter(pdu_); - while (iter.next(vb)) { - cout << "\tOid = " << vb.to_string_oid() << "\n"; - cout << "\tValue = " << vb.to_string_value() << "\n"; - } - } - } - cout << "\nASNMP:INFO: command completed normally.\n"<< endl; - ACE_Reactor::instance()->end_event_loop(); -} diff --git a/ASNMP/examples/next/Makefile b/ASNMP/examples/next/Makefile deleted file mode 100644 index 2d1aab308d6..00000000000 --- a/ASNMP/examples/next/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for next sample application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - - -# ACE+SNMP -BIN = next -CCFLAGS = -I$(ACE_ROOT)/ASNMP/ -LSRC = $(addsuffix .cpp,$(BIN)) - -LDLIBS := -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ASNMP/examples/next/next.cpp b/ASNMP/examples/next/next.cpp deleted file mode 100644 index 44322eb0a00..00000000000 --- a/ASNMP/examples/next/next.cpp +++ /dev/null @@ -1,193 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// next.cpp -// -// = DESCRIPTION -// Sample application demonstrating synchronous Snmp::get_next API -// to access an SNMP Version 1 agent. -// -// = AUTHOR -// Peter E. Mellquist original code -// Michael R MacFaden mrm@cisco.com rework API/ACE integration -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/snmp.h" -#include "ace/Get_Opt.h" - -ACE_RCSID(next, next, "$Id$") - -// -// SNMPv1 Get Next Application -// -class nextapp { - public: - nextapp(int argc, char **argv); // process command line args - int valid() const; // verify transaction can proceed - int run(); // issue transaction - static void usage(); // operator help message - - private: - nextapp(const nextapp&); - - UdpAddress address_; - Pdu pdu_; // construct a request Pdu - Oid oid_; - OctetStr community_; - Snmp snmp_; - UdpTarget target_; - int valid_; -}; - - -// main entry point -int main( int argc, char *argv[]) -{ - nextapp get(argc, argv); - if (get.valid()) - return get.run(); - else - nextapp::usage(); - return 1; -} - -int nextapp::valid() const -{ - return valid_; -} -nextapp::nextapp(int argc, char *argv[]): valid_(0) -{ - Oid req, def_oid("1.3.6.1.2.1.1.1.0"); // default is sysDescr - if ( argc < 2) - return; - - address_ = argv[argc - 1]; - if ( !address_.valid()) { - cout << "ERROR: Invalid IPv4 address or DNS hostname: " \ - << argv[argc] << "\n"; - return; - } - - ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:"); - for (int c; (c = get_opt ()) != -1; ) - switch (c) - { - case 'o': - req = get_opt.optarg; - if (req.valid() == 0) - cout << "ERROR: oid value: " < - FIU: file descriptor 1: - FIU: file descriptor 2: - FIU: file descriptor 4: "/etc/.name_service_door", O_RDONLY - File info: ?r--r--r-- 1 root root 0 May 20 1997 - This file descriptor was allocated from: - _libc_open [libc.so.1] - _nsc_trydoorcall [libc.so.1] - _door_gethostbyname_r [gethostby_door.c] - _get_hostserv_inetnetdir_byname [netdir_inet.c] - gethostbyname_r [gethostbyname_r.c] - static ACE_OS::gethostbyname_r(const char*, hostent*, char*, int*) [OS.i:4634] - FIU: file descriptor 5: , O_RDWR - This file descriptor was allocated from: - pipe [rtlib.o] - static ACE_OS::pipe(int*) [OS.i:603] - ACE_Pipe::open(void) [Pipe.cpp:68] - ACE_Select_Reactor_Notify::open(ACE_Select_Reactor*) [Select_Reactor.cpp:648] - ACE_Select_Reactor::open(unsigned int, int, ACE_Sig_Handler*, ACE_Timer_Queue_T, ACE_Recursive_Thread_Mutex>*) [Select_Reactor.cpp:978] - ACE_Select_Reactor::ACE_Select_Reactor(ACE_Sig_Handler*, ACE_Timer_Queue_T, ACE_Recursive_Thread_Mutex>*) [Select_Reactor.cpp:1028] - FIU: file descriptor 6: , O_RDWR - This file descriptor was allocated from: - pipe [rtlib.o] - static ACE_OS::pipe(int*) [OS.i:603] - ACE_Pipe::open(void) [Pipe.cpp:68] - ACE_Select_Reactor_Notify::open(ACE_Select_Reactor*) [Select_Reactor.cpp:648] - ACE_Select_Reactor::open(unsigned int, int, ACE_Sig_Handler*, ACE_Timer_Queue_T, ACE_Recursive_Thread_Mutex>*) [Select_Reactor.cpp:978] - ACE_Select_Reactor::ACE_Select_Reactor(ACE_Sig_Handler*, ACE_Timer_Queue_T, ACE_Recursive_Thread_Mutex>*) [Select_Reactor.cpp:1028] - FIU: file descriptor 26: - FIU: file descriptor 27: - Memory leaked: 0 bytes (0%); potentially leaked: 0 bytes (0%) - Purify Heap Analysis (combining suppressed and unsuppressed blocks) - Blocks Bytes - Leaked 2 12 - Potentially Leaked 0 0 - In-Use 44 2237 - ---------------------------------------- - Total Allocated 46 2249 - Thread Summary : 4 threads in existence - Thread 0 [main thread] - Stack: (0xefe00000 0xf0000000), size = 0x200000 - Thread 1 - Stack: (0xee80fc70 0xee80fde4), size = 0x174 - Thread 2 - Stack: (0xef231a70 0xef231b14), size = 0xa4 - Thread 3 - Stack: (0xee70dba8 0xee70dde4), size = 0x23c - Program exited with status code 0. - * Basic memory usage (including Purify overhead): - 317744 code - 78528 data/bss - 66056 heap (peak use) - 2088 stack - * Shared library memory usage (including Purify overhead): - 356936 libasnmp.so_pure_p3_c0_410_551 (shared code) - 11488 libasnmp.so_pure_p3_c0_410_551 (private data) - 2632304 libACE.so_pure_p3_c0_410_551 (shared code) - 95524 libACE.so_pure_p3_c0_410_551 (private data) - 75058 libsocket.so.1_pure_p3_c0_410_551 (shared code) - 4092 libsocket.so.1_pure_p3_c0_410_551 (private data) - 1216 libdl.so.1_pure_p3_c0_410_551 (shared code) - 0 libdl.so.1_pure_p3_c0_410_551 (private data) - 611922 libnsl.so.1_pure_p3_c0_410_551 (shared code) - 115852 libnsl.so.1_pure_p3_c0_410_551 (private data) - 7628 libposix4.so.1_pure_p3_c0_410_551 (shared code) - 432 libposix4.so.1_pure_p3_c0_410_551 (private data) - 135301 libm.so.1_pure_p3_c0_410_551 (shared code) - 1332 libm.so.1_pure_p3_c0_410_551 (private data) - 278709 libC.so.5_pure_p3_c0_410_551 (shared code) - 59252 libC.so.5_pure_p3_c0_410_551 (private data) - 37893 libw.so.1_pure_p3_c0_410_551 (shared code) - 1628 libw.so.1_pure_p3_c0_410_551 (private data) - 2196 solaris2_threads.so_pure_p3_c0_410_551 (shared code) - 8556 solaris2_threads.so_pure_p3_c0_410_551 (private data) - 124186 libthread.so.1_pure_p3_c0_410_551 (shared code) - 100012 libthread.so.1_pure_p3_c0_410_551 (private data) - 799773 libc.so.1_pure_p3_c0_410_551 (shared code) - 34744 libc.so.1_pure_p3_c0_410_551 (private data) - 9576 libinternal_stubs.so.1 (shared code) - 324 libinternal_stubs.so.1 (private data) - 15117 libintl.so.1_pure_p3_c0_410_551 (shared code) - 1304 libintl.so.1_pure_p3_c0_410_551 (private data) - 16092 libmp.so.1_pure_p3_c0_410_551 (shared code) - 828 libmp.so.1_pure_p3_c0_410_551 (private data) - 14008 libc_psr.so.1_pure_p3_c0_410_551 (shared code) - 72 libc_psr.so.1_pure_p3_c0_410_551 (private data) - * Memory mapped usage: - 1048576 mmap'd at 0xee002000 - 1048576 mmap'd at 0xee104000 - 1048576 mmap'd at 0xee206000 - 1048576 mmap'd at 0xee308000 - 1048576 mmap'd at 0xee40a000 - 1048576 mmap'd at 0xee50c000 - 1048576 mmap'd at 0xee60e000 - 1048576 mmap'd at 0xee710000 - 8192 mmap'd PROT_NONE at 0xee000000 - 8192 mmap'd PROT_NONE at 0xee70e000 - 8192 mmap'd PROT_NONE at 0xee60c000 - 8192 mmap'd PROT_NONE at 0xee50a000 - 8192 mmap'd PROT_NONE at 0xee408000 - 8192 mmap'd PROT_NONE at 0xee306000 - 8192 mmap'd PROT_NONE at 0xee204000 - 8192 mmap'd PROT_NONE at 0xee102000 - diff --git a/ASNMP/examples/trap/trap.cpp b/ASNMP/examples/trap/trap.cpp deleted file mode 100644 index e0609e03485..00000000000 --- a/ASNMP/examples/trap/trap.cpp +++ /dev/null @@ -1,182 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// trap.cpp -// -// = DESCRIPTION -// Sample application demonstrating synchronous Snmp::trap API -// to send to an SNMP Version 1 trap listener app. -// -// = AUTHOR -// Peter E. Mellquist original code -// Michael R MacFaden mrm@cisco.com rework OO, API/ACE integration -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/snmp.h" -#define DEFINE_TRAP_CONSTANTS_ -#include "asnmp/enttraps.h" // enterprise standard traps -#include "ace/Get_Opt.h" - -ACE_RCSID(trap, trap, "$Id$") - -// -// SNMPv1 Trap Application -// -class trapapp { - public: - trapapp(int argc, char **argv); // process command line args - int valid() const; // verify transaction can proceed - int run(); // issue transaction - static void usage(); // operator help message - - private: - trapapp(const trapapp&); - - UdpAddress address_; - Pdu pdu_; // construct a request Pdu - Oid oid_; - OctetStr community_; - Snmp snmp_; - UdpTarget target_; - int valid_; -}; - - -// main entry point -int main( int argc, char *argv[]) -{ - trapapp get(argc, argv); - if (get.valid()) - return get.run(); - else - trapapp::usage(); - return 1; -} - -int trapapp::valid() const -{ - return valid_; -} -trapapp::trapapp(int argc, char *argv[]): valid_(0) -{ - Oid def_ent_oid("1.3.6.1.2.1.1.1.2.0.1"); // def enterprise oid - Oid ent, trap; // user specified values - - if ( argc < 2) // hostname mandatory - return; - - address_ = argv[argc - 1]; - if ( !address_.valid()) { - cout << "ERROR: Invalid IPv4 address or DNS hostname: " \ - << argv[argc] << "\n"; - return; - } - - ACE_Get_Opt get_opt (argc, argv, "c:e:t:"); - for (int c; (c = get_opt ()) != -1; ) - switch (c) - { - case 'c': // community string - community_ = get_opt.optarg; - target_.set_read_community(community_); - break; - - case 'e': // trap oid to send - ent = get_opt.optarg; - break; - - case 't': // trap oid - trap = get_opt.optarg; - break;; - - default: - break; - } - - if (ent.valid()) - pdu_.set_notify_enterprise( ent); // set up the enterprise of the trap - else - pdu_.set_notify_enterprise( def_ent_oid); - - if (trap.valid()) - pdu_.set_notify_id( trap); // set the id of the trap - else - pdu_.set_notify_id( coldStart); // set the id of the trap - - Oid detail_oid("1.3.6.1.4.1.11.2.16.2"); - OctetStr detail_value("SNMP++ Trap Send Test"); - Vb vb(detail_oid, detail_value); - pdu_ += vb; - - pdu_.get_notify_id(oid_); // store for later use - valid_ = 1; -} - -void trapapp::usage() -{ - cout << "Usage:\n"; - cout << "trap [options] dotted-quad | DNSName[:port]\n"; - cout << " -c Community_name, default is 'public' \n"; - cout << " -r N retries default is N = 1 retry\n"; - cout << " -t N timeout in seconds default is 1 second" << endl; - cout << " -e oid enterprise oid default is 1.3.6.1.2.1.1.1.2.0.1\n"; - cout << " -O oid trap id default is coldStart 1.3.6.1.6.3.1.1.5.1\n"; -} - -int trapapp::run() -{ - if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { - cout << "\nASNMP:ERROR:Create session failed: "<< - snmp_.error_string()<< "\n"; - return 1; - } - - if (address_.get_port() == 0) - address_.set_port(DEF_TRAP_PORT); - target_.set_address( address_); // make a target using the address - - //-------[ issue the request, blocked mode ]----------------------------- - cout << "\nASNMP:INFO:SNMP Version " << (target_.get_version()+ 1) << \ - " TRAP GENERATOR SAMPLE PROGRAM \nOID: " << oid_.to_string() << "\n"; - target_.get_address(address_); // target updates port used - int rc; - char *name = address_.resolve_hostname(rc); - if (rc) - name = "<< did not resolve via gethostbyname() >>"; - - cout << "Device: " << address_ << " " << name << "\n"; - cout << "[ Community=" << community_.to_string() << " ]"<< endl; - - if (snmp_.trap( pdu_, target_) == SNMP_CLASS_SUCCESS) { - cout << "Trap was written to network...\n"; - } - else { - char *ptr = snmp_.error_string(); - cout << "ASNMP:ERROR: trap command failed reason: " << ptr << endl; - } - - cout << "ASNMP:INFO:command completed normally.\n"<< endl; - return 0; -} - diff --git a/ASNMP/examples/walk/Makefile b/ASNMP/examples/walk/Makefile deleted file mode 100644 index 3251dcd9036..00000000000 --- a/ASNMP/examples/walk/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for walk sample application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - - -# ACE+SNMP -BIN = walk -CCFLAGS = -I$(ACE_ROOT)/ASNMP/ -LSRC = $(addsuffix .cpp,$(BIN)) - -LDLIBS := -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ASNMP/examples/walk/walk.cpp b/ASNMP/examples/walk/walk.cpp deleted file mode 100644 index 80f719acf26..00000000000 --- a/ASNMP/examples/walk/walk.cpp +++ /dev/null @@ -1,260 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// walk.cpp -// -// = DESCRIPTION -// Sample application demonstrating synchronous Snmp::get, get_next API -// to access an SNMP Version 1 agent. -// -// = AUTHOR -// Peter E. Mellquist original code -// Michael R MacFaden mrm@cisco.com rework API/ACE integration -// -// ============================================================================ -/*=================================================================== - Copyright (c) 1996 - Hewlett-Packard Company - - ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. -=====================================================================*/ - -#include "asnmp/snmp.h" -#include "ace/Get_Opt.h" - -ACE_RCSID(walk, walk, "$Id$") - -// -// SNMPv1 Walk Mib Application -// -class walkapp { - public: - walkapp(int argc, char **argv); // process command line args - int valid() const; // verify transaction can proceed - int run(); // issue transaction - static void usage(); // operator help message - - private: - walkapp(const walkapp&); - - UdpAddress address_; - Pdu pdu_; // construct a request Pdu - Oid oid_; - OctetStr community_; - Snmp snmp_; - UdpTarget target_; - int valid_; -}; - - -// main entry point -int main( int argc, char *argv[]) -{ - walkapp get(argc, argv); - if (get.valid()) - return get.run(); - else - walkapp::usage(); - return 1; -} - -int walkapp::valid() const -{ - return valid_; -} - -walkapp::walkapp(int argc, char *argv[]): valid_(0) -{ - Oid req, def_oid("1.3.6.1.2.1.1.1.0"); // default begin walk with MIBII - if ( argc < 2) - return; - - address_ = argv[argc - 1]; - if ( !address_.valid()) { - cout << "ERROR: Invalid IPv4 address or DNS hostname: " \ - << argv[argc] << "\n"; - return; - } - - ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:"); - for (int c; (c = get_opt ()) != -1; ) - switch (c) - { - case 'o': - req = get_opt.optarg; - if (req.valid() == 0) - cout << "ERROR: oid value: " <get( pdu_, *target_); - first_++; - } - else { - rc = snmp_->get_next( pdu_, *target_); - } - - if (rc != SNMP_CLASS_SUCCESS) { - reason = snmp_->error_string(); - return 0; - } - - // 2. check for problems - if (pdu_.get_error_status()) { - reason = pdu_.agent_error_reason(); - return 0; - } - - // 3. return vb to caller - pdu_.get_vb(vb, 0); - Oid nextoid; - vb.get_oid(nextoid); // and setup next oid to get - Vb nextvb(nextoid); - pdu_.delete_all_vbs(); - pdu_ += nextvb; // can't do set_vb as there are no entries to replace - - return 1; // ok -} - -int walkapp::run() -{ - - //----------[ create a ASNMP session ]----------------------------------- - if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { - cout << "\nASNMP:ERROR:Create session failed: "<< - snmp_.error_string()<< "\n"; - return 1; - } - - //--------[ build up ASNMP object needed ]------------------------------- - if (address_.get_port() == 0) - address_.set_port(DEF_AGENT_PORT); - target_.set_address( address_); // make a target using the address - - //-------[ issue the request, blocked mode ]----------------------------- - cout << "\nASNMP:INFO:SNMP Version " << (target_.get_version()+ 1) << \ - " WALK SAMPLE PROGRAM \nOID: " << oid_.to_string() << "\n"; - target_.get_address(address_); // target updates port used - int rc; - char *name = address_.resolve_hostname(rc); - if (rc) - name = "<< did not resolve via gethostbyname() >>"; - - cout << "Device: " << address_ << " " << name << "\n"; - cout << "[ Retries=" << target_.get_retry() << " \ - Timeout=" << target_.get_timeout() <<" ms " << "Community=" << \ - community_.to_string() << " ]"<< endl; - - MibIter iter(&snmp_, pdu_, &target_); - char *err_str = 0; - Vb vb; - unsigned ctr = 0; - while (iter.next(vb, err_str)) { - cout << "\tOid = " << vb.to_string_oid() << "\n"; - cout << "\tValue = " << vb.to_string_value() << "\n"; - ctr++; - } - - if (!err_str) { - cout << "ERROR: walk: " << err_str << endl; - return 0; - } - - cout << "ASNMP:INFO:command completed normally. ACE Rocks...\n"<< endl; - return 0; -} - diff --git a/ASNMP/mibs/RFC1213-MIB.my b/ASNMP/mibs/RFC1213-MIB.my deleted file mode 100644 index f89f8bf125e..00000000000 --- a/ASNMP/mibs/RFC1213-MIB.my +++ /dev/null @@ -1,2618 +0,0 @@ --- ***************************************************************** --- RFC1213-MIB.my: MIB-II MIB file --- --- April 1994, Jeffrey T. Johnson --- --- Copyright (c) 1994-1996 by cisco Systems, Inc. --- All rights reserved. --- --- ***************************************************************** --- --- This mib was extracted from RFC 1213 --- The following changes have been applied: --- The enumerations unknown(4) and dormant(5) have been added to --- ifOperStatus to reflect a change to the ifTable introduced in --- RFC 1573 --- --- The SYNTAX of ifType has been changed to IANAifType, to reflect the --- change to the ifTable introduced in RFC1573. - - RFC1213-MIB DEFINITIONS ::= BEGIN - - IMPORTS - mgmt, NetworkAddress, IpAddress, Counter, Gauge, - TimeTicks - FROM RFC1155-SMI - OBJECT-TYPE - FROM RFC-1212 - TEXTUAL-CONVENTION - FROM SNMPv2-TC - IANAifType - FROM IANAifType-MIB; - - -- This MIB module uses the extended OBJECT-TYPE macro as - -- defined in [14]; - - - -- MIB-II (same prefix as MIB-I) - - mib-2 OBJECT IDENTIFIER ::= { mgmt 1 } - - -- textual conventions - - DisplayString ::= - OCTET STRING - -- This data type is used to model textual information taken - -- from the NVT ASCII character set. By convention, objects - -- with this syntax are declared as having - -- - -- SIZE (0..255) - - PhysAddress ::= - OCTET STRING - -- This data type is used to model media addresses. For many - -- types of media, this will be in a binary representation. - -- For example, an ethernet address would be represented as - -- a string of 6 octets. - - - -- groups in MIB-II - - system OBJECT IDENTIFIER ::= { mib-2 1 } - - interfaces OBJECT IDENTIFIER ::= { mib-2 2 } - - at OBJECT IDENTIFIER ::= { mib-2 3 } - - ip OBJECT IDENTIFIER ::= { mib-2 4 } - - icmp OBJECT IDENTIFIER ::= { mib-2 5 } - - tcp OBJECT IDENTIFIER ::= { mib-2 6 } - - udp OBJECT IDENTIFIER ::= { mib-2 7 } - - egp OBJECT IDENTIFIER ::= { mib-2 8 } - - -- historical (some say hysterical) - -- cmot OBJECT IDENTIFIER ::= { mib-2 9 } - - transmission OBJECT IDENTIFIER ::= { mib-2 10 } - - snmp OBJECT IDENTIFIER ::= { mib-2 11 } - - - -- the System group - - -- Implementation of the System group is mandatory for all - -- systems. If an agent is not configured to have a value - -- for any of these variables, a string of length 0 is - -- returned. - - sysDescr OBJECT-TYPE - SYNTAX DisplayString (SIZE (0..255)) - ACCESS read-only - STATUS mandatory - DESCRIPTION - "A textual description of the entity. This value - should include the full name and version - identification of the system's hardware type, - software operating-system, and networking - software. It is mandatory that this only contain - printable ASCII characters." - ::= { system 1 } - - sysObjectID OBJECT-TYPE - SYNTAX OBJECT IDENTIFIER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The vendor's authoritative identification of the - network management subsystem contained in the - entity. This value is allocated within the SMI - enterprises subtree (1.3.6.1.4.1) and provides an - easy and unambiguous means for determining `what - kind of box' is being managed. For example, if - vendor `Flintstones, Inc.' was assigned the - subtree 1.3.6.1.4.1.4242, it could assign the - identifier 1.3.6.1.4.1.4242.1.1 to its `Fred - Router'." - ::= { system 2 } - - sysUpTime OBJECT-TYPE - SYNTAX TimeTicks - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The time (in hundredths of a second) since the - network management portion of the system was last - re-initialized." - ::= { system 3 } - - sysContact OBJECT-TYPE - SYNTAX DisplayString (SIZE (0..255)) - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The textual identification of the contact person - for this managed node, together with information - on how to contact this person." - ::= { system 4 } - - sysName OBJECT-TYPE - SYNTAX DisplayString (SIZE (0..255)) - ACCESS read-write - STATUS mandatory - DESCRIPTION - "An administratively-assigned name for this - managed node. By convention, this is the node's - fully-qualified domain name." - ::= { system 5 } - - sysLocation OBJECT-TYPE - SYNTAX DisplayString (SIZE (0..255)) - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The physical location of this node (e.g., - `telephone closet, 3rd floor')." - ::= { system 6 } - - sysServices OBJECT-TYPE - SYNTAX INTEGER (0..127) - ACCESS read-only - STATUS mandatory - DESCRIPTION - "A value which indicates the set of services that - this entity primarily offers. - - The value is a sum. This sum initially takes the - value zero, Then, for each layer, L, in the range - 1 through 7, that this node performs transactions - for, 2 raised to (L - 1) is added to the sum. For - example, a node which performs primarily routing - functions would have a value of 4 (2^(3-1)). In - contrast, a node which is a host offering - application services would have a value of 72 - (2^(4-1) + 2^(7-1)). Note that in the context of - the Internet suite of protocols, values should be - calculated accordingly: - - layer functionality - 1 physical (e.g., repeaters) - 2 datalink/subnetwork (e.g., bridges) - 3 internet (e.g., IP gateways) - 4 end-to-end (e.g., IP hosts) - 7 applications (e.g., mail relays) - - For systems including OSI protocols, layers 5 and - 6 may also be counted." - ::= { system 7 } - - -- the Interfaces group - - -- Implementation of the Interfaces group is mandatory for - -- all systems. - - ifNumber OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of network interfaces (regardless of - their current state) present on this system." - ::= { interfaces 1 } - - - -- the Interfaces table - - -- The Interfaces table contains information on the entity's - -- interfaces. Each interface is thought of as being - -- attached to a `subnetwork'. Note that this term should - -- not be confused with `subnet' which refers to an - -- addressing partitioning scheme used in the Internet suite - -- of protocols. - - ifTable OBJECT-TYPE - SYNTAX SEQUENCE OF IfEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "A list of interface entries. The number of - entries is given by the value of ifNumber." - ::= { interfaces 2 } - - ifEntry OBJECT-TYPE - SYNTAX IfEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "An interface entry containing objects at the - subnetwork layer and below for a particular - interface." - INDEX { ifIndex } - ::= { ifTable 1 } - - IfEntry ::= - SEQUENCE { - ifIndex - INTEGER, - ifDescr - DisplayString, - ifType - IANAifType, - ifMtu - INTEGER, - ifSpeed - Gauge, - ifPhysAddress - PhysAddress, - ifAdminStatus - INTEGER, - ifOperStatus - INTEGER, - ifLastChange - TimeTicks, - ifInOctets - Counter, - ifInUcastPkts - Counter, - ifInNUcastPkts - Counter, - ifInDiscards - Counter, - ifInErrors - Counter, - ifInUnknownProtos - Counter, - ifOutOctets - Counter, - ifOutUcastPkts - Counter, - ifOutNUcastPkts - Counter, - ifOutDiscards - Counter, - ifOutErrors - Counter, - ifOutQLen - Gauge, - ifSpecific - OBJECT IDENTIFIER - } - - ifIndex OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "A unique value for each interface. Its value - ranges between 1 and the value of ifNumber. The - value for each interface must remain constant at - least from one re-initialization of the entity's - network management system to the next re- - initialization." - ::= { ifEntry 1 } - - ifDescr OBJECT-TYPE - SYNTAX DisplayString (SIZE (0..255)) - ACCESS read-only - STATUS mandatory - DESCRIPTION - "A textual string containing information about the - interface. This string should include the name of - the manufacturer, the product name and the version - of the hardware interface." - ::= { ifEntry 2 } - - ifType OBJECT-TYPE - SYNTAX IANAifType - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The type of interface. Additional values for ifType - are assigned by the Internet Assigned Numbers - Authority (IANA), through updating the syntax of the - IANAifType textual convention." - ::= { ifEntry 3 } - - - ifMtu OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The size of the largest datagram which can be - sent/received on the interface, specified in - octets. For interfaces that are used for - transmitting network datagrams, this is the size - of the largest network datagram that can be sent - on the interface." - ::= { ifEntry 4 } - - ifSpeed OBJECT-TYPE - SYNTAX Gauge - ACCESS read-only - STATUS mandatory - DESCRIPTION - "An estimate of the interface's current bandwidth - in bits per second. For interfaces which do not - vary in bandwidth or for those where no accurate - estimation can be made, this object should contain - the nominal bandwidth." - ::= { ifEntry 5 } - - ifPhysAddress OBJECT-TYPE - SYNTAX PhysAddress - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The interface's address at the protocol layer - immediately `below' the network layer in the - protocol stack. For interfaces which do not have - such an address (e.g., a serial line), this object - should contain an octet string of zero length." - ::= { ifEntry 6 } - - ifAdminStatus OBJECT-TYPE - SYNTAX INTEGER { - up(1), -- ready to pass packets - down(2), - testing(3) -- in some test mode - } - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The desired state of the interface. The - testing(3) state indicates that no operational - packets can be passed." - ::= { ifEntry 7 } - - ifOperStatus OBJECT-TYPE - SYNTAX INTEGER { - up(1), -- ready to pass packets - down(2), - testing(3), -- in some test mode - unknown(4), - dormant(5) - } - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The current operational state of the interface. - The testing(3) state indicates that no operational - packets can be passed." - ::= { ifEntry 8 } - - ifLastChange OBJECT-TYPE - SYNTAX TimeTicks - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The value of sysUpTime at the time the interface - entered its current operational state. If the - current state was entered prior to the last re- - initialization of the local network management - subsystem, then this object contains a zero - value." - ::= { ifEntry 9 } - - ifInOctets OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of octets received on the - interface, including framing characters." - ::= { ifEntry 10 } - - ifInUcastPkts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of subnetwork-unicast packets - delivered to a higher-layer protocol." - ::= { ifEntry 11 } - - ifInNUcastPkts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of non-unicast (i.e., subnetwork- - broadcast or subnetwork-multicast) packets - delivered to a higher-layer protocol." - ::= { ifEntry 12 } - - ifInDiscards OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of inbound packets which were chosen - to be discarded even though no errors had been - detected to prevent their being deliverable to a - higher-layer protocol. One possible reason for - discarding such a packet could be to free up - buffer space." - ::= { ifEntry 13 } - - ifInErrors OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of inbound packets that contained - errors preventing them from being deliverable to a - higher-layer protocol." - ::= { ifEntry 14 } - - ifInUnknownProtos OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of packets received via the interface - which were discarded because of an unknown or - unsupported protocol." - ::= { ifEntry 15 } - - ifOutOctets OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of octets transmitted out of the - interface, including framing characters." - ::= { ifEntry 16 } - - ifOutUcastPkts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of packets that higher-level - protocols requested be transmitted to a - subnetwork-unicast address, including those that - were discarded or not sent." - ::= { ifEntry 17 } - - ifOutNUcastPkts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of packets that higher-level - protocols requested be transmitted to a non- - unicast (i.e., a subnetwork-broadcast or - subnetwork-multicast) address, including those - that were discarded or not sent." - ::= { ifEntry 18 } - - ifOutDiscards OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of outbound packets which were chosen - to be discarded even though no errors had been - detected to prevent their being transmitted. One - possible reason for discarding such a packet could - be to free up buffer space." - ::= { ifEntry 19 } - - ifOutErrors OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of outbound packets that could not be - transmitted because of errors." - ::= { ifEntry 20 } - - ifOutQLen OBJECT-TYPE - SYNTAX Gauge - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The length of the output packet queue (in - packets)." - ::= { ifEntry 21 } - - ifSpecific OBJECT-TYPE - SYNTAX OBJECT IDENTIFIER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "A reference to MIB definitions specific to the - particular media being used to realize the - interface. For example, if the interface is - realized by an ethernet, then the value of this - object refers to a document defining objects - specific to ethernet. If this information is not - present, its value should be set to the OBJECT - IDENTIFIER { 0 0 }, which is a syntactically valid - object identifier, and any conformant - implementation of ASN.1 and BER must be able to - generate and recognize this value." - ::= { ifEntry 22 } - - - -- the Address Translation group - - -- Implementation of the Address Translation group is - -- mandatory for all systems. Note however that this group - -- is deprecated by MIB-II. That is, it is being included - -- solely for compatibility with MIB-I nodes, and will most - -- likely be excluded from MIB-III nodes. From MIB-II and - -- onwards, each network protocol group contains its own - -- address translation tables. - - -- The Address Translation group contains one table which is - -- the union across all interfaces of the translation tables - -- for converting a NetworkAddress (e.g., an IP address) into - -- a subnetwork-specific address. For lack of a better term, - -- this document refers to such a subnetwork-specific address - -- as a `physical' address. - - -- Examples of such translation tables are: for broadcast - -- media where ARP is in use, the translation table is - -- equivalent to the ARP cache; or, on an X.25 network where - -- non-algorithmic translation to X.121 addresses is - -- required, the translation table contains the - -- NetworkAddress to X.121 address equivalences. - - atTable OBJECT-TYPE - SYNTAX SEQUENCE OF AtEntry - ACCESS not-accessible - STATUS deprecated - DESCRIPTION - "The Address Translation tables contain the - NetworkAddress to `physical' address equivalences. - Some interfaces do not use translation tables for - determining address equivalences (e.g., DDN-X.25 - has an algorithmic method); if all interfaces are - of this type, then the Address Translation table - is empty, i.e., has zero entries." - ::= { at 1 } - - atEntry OBJECT-TYPE - SYNTAX AtEntry - ACCESS not-accessible - STATUS deprecated - DESCRIPTION - "Each entry contains one NetworkAddress to - `physical' address equivalence." - INDEX { atIfIndex, - atNetAddress } - ::= { atTable 1 } - - AtEntry ::= - SEQUENCE { - atIfIndex - INTEGER, - atPhysAddress - PhysAddress, - atNetAddress - NetworkAddress - } - - atIfIndex OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS deprecated - DESCRIPTION - "The interface on which this entry's equivalence - is effective. The interface identified by a - particular value of this index is the same - interface as identified by the same value of - ifIndex." - ::= { atEntry 1 } - - atPhysAddress OBJECT-TYPE - SYNTAX PhysAddress - ACCESS read-write - STATUS deprecated - DESCRIPTION - "The media-dependent `physical' address. - - Setting this object to a null string (one of zero - length) has the effect of invaliding the - corresponding entry in the atTable object. That - is, it effectively disassociates the interface - identified with said entry from the mapping - identified with said entry. It is an - implementation-specific matter as to whether the - agent removes an invalidated entry from the table. - Accordingly, management stations must be prepared - to receive tabular information from agents that - corresponds to entries not currently in use. - Proper interpretation of such entries requires - examination of the relevant atPhysAddress object." - ::= { atEntry 2 } - - atNetAddress OBJECT-TYPE - SYNTAX NetworkAddress - ACCESS read-write - STATUS deprecated - DESCRIPTION - "The NetworkAddress (e.g., the IP address) - corresponding to the media-dependent `physical' - address." - ::= { atEntry 3 } - - - -- the IP group - - -- Implementation of the IP group is mandatory for all - -- systems. - - ipForwarding OBJECT-TYPE - SYNTAX INTEGER { - forwarding(1), -- acting as a gateway - not-forwarding(2) -- NOT acting as a gateway - } - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The indication of whether this entity is acting - as an IP gateway in respect to the forwarding of - datagrams received by, but not addressed to, this - entity. IP gateways forward datagrams. IP hosts - do not (except those source-routed via the host). - - Note that for some managed nodes, this object may - take on only a subset of the values possible. - Accordingly, it is appropriate for an agent to - return a `badValue' response if a management - station attempts to change this object to an - inappropriate value." - ::= { ip 1 } - - ipDefaultTTL OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The default value inserted into the Time-To-Live - field of the IP header of datagrams originated at - this entity, whenever a TTL value is not supplied - by the transport layer protocol." - ::= { ip 2 } - - ipInReceives OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of input datagrams received from - interfaces, including those received in error." - ::= { ip 3 } - - ipInHdrErrors OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of input datagrams discarded due to - errors in their IP headers, including bad - checksums, version number mismatch, other format - errors, time-to-live exceeded, errors discovered - in processing their IP options, etc." - ::= { ip 4 } - - ipInAddrErrors OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of input datagrams discarded because - the IP address in their IP header's destination - field was not a valid address to be received at - this entity. This count includes invalid - addresses (e.g., 0.0.0.0) and addresses of - unsupported Classes (e.g., Class E). For entities - which are not IP Gateways and therefore do not - forward datagrams, this counter includes datagrams - discarded because the destination address was not - a local address." - ::= { ip 5 } - - ipForwDatagrams OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of input datagrams for which this - entity was not their final IP destination, as a - result of which an attempt was made to find a - route to forward them to that final destination. - In entities which do not act as IP Gateways, this - counter will include only those packets which were - Source-Routed via this entity, and the Source- - Route option processing was successful." - ::= { ip 6 } - - ipInUnknownProtos OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of locally-addressed datagrams - received successfully but discarded because of an - unknown or unsupported protocol." - ::= { ip 7 } - - ipInDiscards OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of input IP datagrams for which no - problems were encountered to prevent their - continued processing, but which were discarded - (e.g., for lack of buffer space). Note that this - counter does not include any datagrams discarded - while awaiting re-assembly." - ::= { ip 8 } - - ipInDelivers OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of input datagrams successfully - delivered to IP user-protocols (including ICMP)." - ::= { ip 9 } - - ipOutRequests OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of IP datagrams which local IP - user-protocols (including ICMP) supplied to IP in - requests for transmission. Note that this counter - does not include any datagrams counted in - ipForwDatagrams." - ::= { ip 10 } - - ipOutDiscards OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of output IP datagrams for which no - problem was encountered to prevent their - transmission to their destination, but which were - discarded (e.g., for lack of buffer space). Note - that this counter would include datagrams counted - in ipForwDatagrams if any such packets met this - (discretionary) discard criterion." - ::= { ip 11 } - - ipOutNoRoutes OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of IP datagrams discarded because no - route could be found to transmit them to their - destination. Note that this counter includes any - packets counted in ipForwDatagrams which meet this - `no-route' criterion. Note that this includes any - datagrams which a host cannot route because all of - its default gateways are down." - ::= { ip 12 } - - ipReasmTimeout OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The maximum number of seconds which received - fragments are held while they are awaiting - reassembly at this entity." - ::= { ip 13 } - - ipReasmReqds OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of IP fragments received which needed - to be reassembled at this entity." - ::= { ip 14 } - - ipReasmOKs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of IP datagrams successfully re- - assembled." - ::= { ip 15 } - - ipReasmFails OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of failures detected by the IP re- - assembly algorithm (for whatever reason: timed - out, errors, etc). Note that this is not - necessarily a count of discarded IP fragments - since some algorithms (notably the algorithm in - RFC 815) can lose track of the number of fragments - by combining them as they are received." - ::= { ip 16 } - - ipFragOKs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of IP datagrams that have been - successfully fragmented at this entity." - ::= { ip 17 } - - ipFragFails OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of IP datagrams that have been - discarded because they needed to be fragmented at - this entity but could not be, e.g., because their - Don't Fragment flag was set." - ::= { ip 18 } - - ipFragCreates OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of IP datagram fragments that have - been generated as a result of fragmentation at - this entity." - ::= { ip 19 } - - - - -- the IP address table - - -- The IP address table contains this entity's IP addressing - -- information. - - ipAddrTable OBJECT-TYPE - SYNTAX SEQUENCE OF IpAddrEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "The table of addressing information relevant to - this entity's IP addresses." - ::= { ip 20 } - - ipAddrEntry OBJECT-TYPE - SYNTAX IpAddrEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "The addressing information for one of this - entity's IP addresses." - INDEX { ipAdEntAddr } - ::= { ipAddrTable 1 } - - IpAddrEntry ::= - SEQUENCE { - ipAdEntAddr - IpAddress, - ipAdEntIfIndex - INTEGER, - ipAdEntNetMask - IpAddress, - ipAdEntBcastAddr - INTEGER, - ipAdEntReasmMaxSize - INTEGER (0..65535) - } - - ipAdEntAddr OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The IP address to which this entry's addressing - information pertains." - ::= { ipAddrEntry 1 } - - - ipAdEntIfIndex OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The index value which uniquely identifies the - interface to which this entry is applicable. The - interface identified by a particular value of this - index is the same interface as identified by the - same value of ifIndex." - ::= { ipAddrEntry 2 } - - ipAdEntNetMask OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The subnet mask associated with the IP address of - this entry. The value of the mask is an IP - address with all the network bits set to 1 and all - the hosts bits set to 0." - ::= { ipAddrEntry 3 } - - ipAdEntBcastAddr OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The value of the least-significant bit in the IP - broadcast address used for sending datagrams on - the (logical) interface associated with the IP - address of this entry. For example, when the - Internet standard all-ones broadcast address is - used, the value will be 1. This value applies to - both the subnet and network broadcasts addresses - used by the entity on this (logical) interface." - ::= { ipAddrEntry 4 } - - ipAdEntReasmMaxSize OBJECT-TYPE - SYNTAX INTEGER (0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The size of the largest IP datagram which this - entity can re-assemble from incoming IP fragmented - datagrams received on this interface." - ::= { ipAddrEntry 5 } - - -- the IP routing table - - -- The IP routing table contains an entry for each route - -- presently known to this entity. - - ipRouteTable OBJECT-TYPE - SYNTAX SEQUENCE OF IpRouteEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "This entity's IP Routing table." - ::= { ip 21 } - - ipRouteEntry OBJECT-TYPE - SYNTAX IpRouteEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "A route to a particular destination." - INDEX { ipRouteDest } - ::= { ipRouteTable 1 } - - IpRouteEntry ::= - SEQUENCE { - ipRouteDest - IpAddress, - ipRouteIfIndex - INTEGER, - ipRouteMetric1 - INTEGER, - ipRouteMetric2 - INTEGER, - ipRouteMetric3 - INTEGER, - ipRouteMetric4 - INTEGER, - ipRouteNextHop - IpAddress, - ipRouteType - INTEGER, - ipRouteProto - INTEGER, - ipRouteAge - INTEGER, - ipRouteMask - IpAddress, - ipRouteMetric5 - INTEGER, - ipRouteInfo - OBJECT IDENTIFIER - } - - ipRouteDest OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The destination IP address of this route. An - entry with a value of 0.0.0.0 is considered a - default route. Multiple routes to a single - destination can appear in the table, but access to - such multiple entries is dependent on the table- - access mechanisms defined by the network - management protocol in use." - ::= { ipRouteEntry 1 } - - ipRouteIfIndex OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The index value which uniquely identifies the - local interface through which the next hop of this - route should be reached. The interface identified - by a particular value of this index is the same - interface as identified by the same value of - ifIndex." - ::= { ipRouteEntry 2 } - - ipRouteMetric1 OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The primary routing metric for this route. The - semantics of this metric are determined by the - routing-protocol specified in the route's - ipRouteProto value. If this metric is not used, - its value should be set to -1." - ::= { ipRouteEntry 3 } - - ipRouteMetric2 OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS mandatory - DESCRIPTION - "An alternate routing metric for this route. The - semantics of this metric are determined by the - routing-protocol specified in the route's - ipRouteProto value. If this metric is not used, - its value should be set to -1." - ::= { ipRouteEntry 4 } - - ipRouteMetric3 OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS mandatory - DESCRIPTION - "An alternate routing metric for this route. The - semantics of this metric are determined by the - routing-protocol specified in the route's - ipRouteProto value. If this metric is not used, - its value should be set to -1." - ::= { ipRouteEntry 5 } - - ipRouteMetric4 OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS mandatory - DESCRIPTION - "An alternate routing metric for this route. The - semantics of this metric are determined by the - routing-protocol specified in the route's - ipRouteProto value. If this metric is not used, - its value should be set to -1." - ::= { ipRouteEntry 6 } - - ipRouteNextHop OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The IP address of the next hop of this route. - (In the case of a route bound to an interface - which is realized via a broadcast media, the value - of this field is the agent's IP address on that - interface.)" - ::= { ipRouteEntry 7 } - - ipRouteType OBJECT-TYPE - SYNTAX INTEGER { - other(1), -- none of the following - - invalid(2), -- an invalidated route - -- route to directly - direct(3), -- connected (sub-)network - - -- route to a non-local - indirect(4) -- host/network/sub-network - } - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The type of route. Note that the values - direct(3) and indirect(4) refer to the notion of - direct and indirect routing in the IP - architecture. - - Setting this object to the value invalid(2) has - the effect of invalidating the corresponding entry - in the ipRouteTable object. That is, it - effectively disassociates the destination - identified with said entry from the route - identified with said entry. It is an - implementation-specific matter as to whether the - agent removes an invalidated entry from the table. - Accordingly, management stations must be prepared - to receive tabular information from agents that - corresponds to entries not currently in use. - Proper interpretation of such entries requires - examination of the relevant ipRouteType object." - ::= { ipRouteEntry 8 } - - ipRouteProto OBJECT-TYPE - SYNTAX INTEGER { - other(1), -- none of the following - - -- non-protocol information, - -- e.g., manually configured - local(2), -- entries - - -- set via a network - netmgmt(3), -- management protocol - - -- obtained via ICMP, - icmp(4), -- e.g., Redirect - - -- the remaining values are - -- all gateway routing - -- protocols - egp(5), - ggp(6), - hello(7), - rip(8), - is-is(9), - es-is(10), - ciscoIgrp(11), - bbnSpfIgp(12), - ospf(13), - bgp(14) - } - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The routing mechanism via which this route was - learned. Inclusion of values for gateway routing - protocols is not intended to imply that hosts - should support those protocols." - ::= { ipRouteEntry 9 } - - ipRouteAge OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The number of seconds since this route was last - updated or otherwise determined to be correct. - Note that no semantics of `too old' can be implied - except through knowledge of the routing protocol - by which the route was learned." - ::= { ipRouteEntry 10 } - - ipRouteMask OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-write - STATUS mandatory - DESCRIPTION - "Indicate the mask to be logical-ANDed with the - destination address before being compared to the - value in the ipRouteDest field. For those systems - that do not support arbitrary subnet masks, an - agent constructs the value of the ipRouteMask by - determining whether the value of the correspondent - ipRouteDest field belong to a class-A, B, or C - network, and then using one of: - - mask network - 255.0.0.0 class-A - 255.255.0.0 class-B - 255.255.255.0 class-C - - If the value of the ipRouteDest is 0.0.0.0 (a - default route), then the mask value is also - 0.0.0.0. It should be noted that all IP routing - subsystems implicitly use this mechanism." - ::= { ipRouteEntry 11 } - - ipRouteMetric5 OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS mandatory - DESCRIPTION - "An alternate routing metric for this route. The - semantics of this metric are determined by the - routing-protocol specified in the route's - ipRouteProto value. If this metric is not used, - its value should be set to -1." - ::= { ipRouteEntry 12 } - - ipRouteInfo OBJECT-TYPE - SYNTAX OBJECT IDENTIFIER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "A reference to MIB definitions specific to the - particular routing protocol which is responsible - for this route, as determined by the value - specified in the route's ipRouteProto value. If - this information is not present, its value should - be set to the OBJECT IDENTIFIER { 0 0 }, which is - a syntactically valid object identifier, and any - conformant implementation of ASN.1 and BER must be - able to generate and recognize this value." - ::= { ipRouteEntry 13 } - - - -- the IP Address Translation table - - -- The IP address translation table contain the IpAddress to - -- `physical' address equivalences. Some interfaces do not - -- use translation tables for determining address - -- equivalences (e.g., DDN-X.25 has an algorithmic method); - -- if all interfaces are of this type, then the Address - -- Translation table is empty, i.e., has zero entries. - - ipNetToMediaTable OBJECT-TYPE - SYNTAX SEQUENCE OF IpNetToMediaEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "The IP Address Translation table used for mapping - from IP addresses to physical addresses." - ::= { ip 22 } - - ipNetToMediaEntry OBJECT-TYPE - SYNTAX IpNetToMediaEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "Each entry contains one IpAddress to `physical' - address equivalence." - INDEX { ipNetToMediaIfIndex, - ipNetToMediaNetAddress } - ::= { ipNetToMediaTable 1 } - - IpNetToMediaEntry ::= - SEQUENCE { - ipNetToMediaIfIndex - INTEGER, - ipNetToMediaPhysAddress - PhysAddress, - ipNetToMediaNetAddress - IpAddress, - ipNetToMediaType - INTEGER - } - - ipNetToMediaIfIndex OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The interface on which this entry's equivalence - is effective. The interface identified by a - particular value of this index is the same - interface as identified by the same value of - ifIndex." - ::= { ipNetToMediaEntry 1 } - - ipNetToMediaPhysAddress OBJECT-TYPE - SYNTAX PhysAddress - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The media-dependent `physical' address." - ::= { ipNetToMediaEntry 2 } - - ipNetToMediaNetAddress OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The IpAddress corresponding to the media- - dependent `physical' address." - ::= { ipNetToMediaEntry 3 } - - ipNetToMediaType OBJECT-TYPE - SYNTAX INTEGER { - other(1), -- none of the following - invalid(2), -- an invalidated mapping - dynamic(3), - static(4) - } - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The type of mapping. - - Setting this object to the value invalid(2) has - the effect of invalidating the corresponding entry - in the ipNetToMediaTable. That is, it effectively - disassociates the interface identified with said - entry from the mapping identified with said entry. - It is an implementation-specific matter as to - whether the agent removes an invalidated entry - from the table. Accordingly, management stations - must be prepared to receive tabular information - from agents that corresponds to entries not - currently in use. Proper interpretation of such - entries requires examination of the relevant - ipNetToMediaType object." - ::= { ipNetToMediaEntry 4 } - - - -- additional IP objects - - ipRoutingDiscards OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of routing entries which were chosen - to be discarded even though they are valid. One - possible reason for discarding such an entry could - be to free-up buffer space for other routing - entries." - ::= { ip 23 } - - - -- the ICMP group - - -- Implementation of the ICMP group is mandatory for all - -- systems. - - icmpInMsgs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of ICMP messages which the - entity received. Note that this counter includes - all those counted by icmpInErrors." - ::= { icmp 1 } - - icmpInErrors OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP messages which the entity - received but determined as having ICMP-specific - errors (bad ICMP checksums, bad length, etc.)." - ::= { icmp 2 } - - icmpInDestUnreachs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Destination Unreachable - messages received." - ::= { icmp 3 } - - icmpInTimeExcds OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Time Exceeded messages - received." - ::= { icmp 4 } - - - icmpInParmProbs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Parameter Problem messages - received." - ::= { icmp 5 } - - icmpInSrcQuenchs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Source Quench messages - received." - ::= { icmp 6 } - - icmpInRedirects OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Redirect messages received." - ::= { icmp 7 } - - icmpInEchos OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Echo (request) messages - received." - ::= { icmp 8 } - - icmpInEchoReps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Echo Reply messages received." - ::= { icmp 9 } - - icmpInTimestamps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Timestamp (request) messages - received." - ::= { icmp 10 } - - icmpInTimestampReps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Timestamp Reply messages - received." - ::= { icmp 11 } - - icmpInAddrMasks OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Address Mask Request messages - received." - ::= { icmp 12 } - - icmpInAddrMaskReps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Address Mask Reply messages - received." - ::= { icmp 13 } - - icmpOutMsgs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of ICMP messages which this - entity attempted to send. Note that this counter - includes all those counted by icmpOutErrors." - ::= { icmp 14 } - - icmpOutErrors OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP messages which this entity did - not send due to problems discovered within ICMP - such as a lack of buffers. This value should not - include errors discovered outside the ICMP layer - such as the inability of IP to route the resultant - datagram. In some implementations there may be no - types of error which contribute to this counter's - value." - ::= { icmp 15 } - - icmpOutDestUnreachs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Destination Unreachable - messages sent." - ::= { icmp 16 } - - icmpOutTimeExcds OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Time Exceeded messages sent." - ::= { icmp 17 } - - icmpOutParmProbs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Parameter Problem messages - sent." - ::= { icmp 18 } - - icmpOutSrcQuenchs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Source Quench messages sent." - ::= { icmp 19 } - - icmpOutRedirects OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Redirect messages sent. For a - host, this object will always be zero, since hosts - do not send redirects." - ::= { icmp 20 } - - icmpOutEchos OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Echo (request) messages sent." - ::= { icmp 21 } - - icmpOutEchoReps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Echo Reply messages sent." - ::= { icmp 22 } - - icmpOutTimestamps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Timestamp (request) messages - sent." - ::= { icmp 23 } - - icmpOutTimestampReps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Timestamp Reply messages - sent." - ::= { icmp 24 } - - icmpOutAddrMasks OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Address Mask Request messages - sent." - ::= { icmp 25 } - - - icmpOutAddrMaskReps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of ICMP Address Mask Reply messages - sent." - ::= { icmp 26 } - - - -- the TCP group - - -- Implementation of the TCP group is mandatory for all - -- systems that implement the TCP. - - -- Note that instances of object types that represent - -- information about a particular TCP connection are - -- transient; they persist only as long as the connection - -- in question. - - tcpRtoAlgorithm OBJECT-TYPE - SYNTAX INTEGER { - other(1), -- none of the following - - constant(2), -- a constant rto - rsre(3), -- MIL-STD-1778, Appendix B - vanj(4) -- Van Jacobson's algorithm [10] - } - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The algorithm used to determine the timeout value - used for retransmitting unacknowledged octets." - ::= { tcp 1 } - - tcpRtoMin OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The minimum value permitted by a TCP - implementation for the retransmission timeout, - measured in milliseconds. More refined semantics - for objects of this type depend upon the algorithm - used to determine the retransmission timeout. In - particular, when the timeout algorithm is rsre(3), - an object of this type has the semantics of the - LBOUND quantity described in RFC 793." - ::= { tcp 2 } - - - tcpRtoMax OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The maximum value permitted by a TCP - implementation for the retransmission timeout, - measured in milliseconds. More refined semantics - for objects of this type depend upon the algorithm - used to determine the retransmission timeout. In - particular, when the timeout algorithm is rsre(3), - an object of this type has the semantics of the - UBOUND quantity described in RFC 793." - ::= { tcp 3 } - - tcpMaxConn OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The limit on the total number of TCP connections - the entity can support. In entities where the - maximum number of connections is dynamic, this - object should contain the value -1." - ::= { tcp 4 } - - tcpActiveOpens OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of times TCP connections have made a - direct transition to the SYN-SENT state from the - CLOSED state." - ::= { tcp 5 } - - tcpPassiveOpens OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of times TCP connections have made a - direct transition to the SYN-RCVD state from the - LISTEN state." - ::= { tcp 6 } - - tcpAttemptFails OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of times TCP connections have made a - direct transition to the CLOSED state from either - the SYN-SENT state or the SYN-RCVD state, plus the - number of times TCP connections have made a direct - transition to the LISTEN state from the SYN-RCVD - state." - ::= { tcp 7 } - - tcpEstabResets OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of times TCP connections have made a - direct transition to the CLOSED state from either - the ESTABLISHED state or the CLOSE-WAIT state." - ::= { tcp 8 } - - tcpCurrEstab OBJECT-TYPE - SYNTAX Gauge - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of TCP connections for which the - current state is either ESTABLISHED or CLOSE- - WAIT." - ::= { tcp 9 } - - tcpInSegs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of segments received, including - those received in error. This count includes - segments received on currently established - connections." - ::= { tcp 10 } - - tcpOutSegs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of segments sent, including - those on current connections but excluding those - containing only retransmitted octets." - ::= { tcp 11 } - - tcpRetransSegs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of segments retransmitted - that - is, the number of TCP segments transmitted - containing one or more previously transmitted - octets." - ::= { tcp 12 } - - - -- the TCP Connection table - - -- The TCP connection table contains information about this - -- entity's existing TCP connections. - - tcpConnTable OBJECT-TYPE - SYNTAX SEQUENCE OF TcpConnEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "A table containing TCP connection-specific - information." - ::= { tcp 13 } - - tcpConnEntry OBJECT-TYPE - SYNTAX TcpConnEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "Information about a particular current TCP - connection. An object of this type is transient, - in that it ceases to exist when (or soon after) - the connection makes the transition to the CLOSED - state." - INDEX { tcpConnLocalAddress, - tcpConnLocalPort, - tcpConnRemAddress, - tcpConnRemPort } - ::= { tcpConnTable 1 } - - TcpConnEntry ::= - SEQUENCE { - tcpConnState - INTEGER, - tcpConnLocalAddress - IpAddress, - tcpConnLocalPort - INTEGER (0..65535), - tcpConnRemAddress - IpAddress, - tcpConnRemPort - INTEGER (0..65535) - } - - tcpConnState OBJECT-TYPE - SYNTAX INTEGER { - closed(1), - listen(2), - synSent(3), - synReceived(4), - established(5), - finWait1(6), - finWait2(7), - closeWait(8), - lastAck(9), - closing(10), - timeWait(11), - deleteTCB(12) - } - ACCESS read-write - STATUS mandatory - DESCRIPTION - "The state of this TCP connection. - - The only value which may be set by a management - station is deleteTCB(12). Accordingly, it is - appropriate for an agent to return a `badValue' - response if a management station attempts to set - this object to any other value. - - If a management station sets this object to the - value deleteTCB(12), then this has the effect of - deleting the TCB (as defined in RFC 793) of the - corresponding connection on the managed node, - resulting in immediate termination of the - connection. - - As an implementation-specific option, a RST - segment may be sent from the managed node to the - other TCP endpoint (note however that RST segments - are not sent reliably)." - ::= { tcpConnEntry 1 } - - tcpConnLocalAddress OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The local IP address for this TCP connection. In - the case of a connection in the listen state which - is willing to accept connections for any IP - interface associated with the node, the value - 0.0.0.0 is used." - ::= { tcpConnEntry 2 } - - tcpConnLocalPort OBJECT-TYPE - SYNTAX INTEGER (0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The local port number for this TCP connection." - ::= { tcpConnEntry 3 } - - tcpConnRemAddress OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The remote IP address for this TCP connection." - ::= { tcpConnEntry 4 } - - tcpConnRemPort OBJECT-TYPE - SYNTAX INTEGER (0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The remote port number for this TCP connection." - ::= { tcpConnEntry 5 } - - - -- additional TCP objects - - tcpInErrs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of segments received in error - (e.g., bad TCP checksums)." - ::= { tcp 14 } - - tcpOutRsts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of TCP segments sent containing the - RST flag." - ::= { tcp 15 } - - - -- the UDP group - - -- Implementation of the UDP group is mandatory for all - -- systems which implement the UDP. - - udpInDatagrams OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of UDP datagrams delivered to - UDP users." - ::= { udp 1 } - - udpNoPorts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of received UDP datagrams for - which there was no application at the destination - port." - ::= { udp 2 } - - udpInErrors OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of received UDP datagrams that could - not be delivered for reasons other than the lack - of an application at the destination port." - ::= { udp 3 } - - udpOutDatagrams OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of UDP datagrams sent from this - entity." - ::= { udp 4 } - - - -- the UDP Listener table - - -- The UDP listener table contains information about this - -- entity's UDP end-points on which a local application is - -- currently accepting datagrams. - - udpTable OBJECT-TYPE - SYNTAX SEQUENCE OF UdpEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "A table containing UDP listener information." - ::= { udp 5 } - - udpEntry OBJECT-TYPE - SYNTAX UdpEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "Information about a particular current UDP - listener." - INDEX { udpLocalAddress, udpLocalPort } - ::= { udpTable 1 } - - UdpEntry ::= - SEQUENCE { - udpLocalAddress - IpAddress, - udpLocalPort - INTEGER (0..65535) - } - - udpLocalAddress OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The local IP address for this UDP listener. In - the case of a UDP listener which is willing to - accept datagrams for any IP interface associated - with the node, the value 0.0.0.0 is used." - ::= { udpEntry 1 } - - udpLocalPort OBJECT-TYPE - SYNTAX INTEGER (0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The local port number for this UDP listener." - ::= { udpEntry 2 } - - - -- the EGP group - - -- Implementation of the EGP group is mandatory for all - -- systems which implement the EGP. - - egpInMsgs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of EGP messages received without - error." - ::= { egp 1 } - - egpInErrors OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of EGP messages received that proved - to be in error." - ::= { egp 2 } - - egpOutMsgs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of locally generated EGP - messages." - ::= { egp 3 } - - egpOutErrors OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of locally generated EGP messages not - sent due to resource limitations within an EGP - entity." - ::= { egp 4 } - - - -- the EGP Neighbor table - - -- The EGP neighbor table contains information about this - -- entity's EGP neighbors. - - egpNeighTable OBJECT-TYPE - SYNTAX SEQUENCE OF EgpNeighEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "The EGP neighbor table." - ::= { egp 5 } - - egpNeighEntry OBJECT-TYPE - SYNTAX EgpNeighEntry - ACCESS not-accessible - STATUS mandatory - DESCRIPTION - "Information about this entity's relationship with - a particular EGP neighbor." - INDEX { egpNeighAddr } - ::= { egpNeighTable 1 } - - EgpNeighEntry ::= - SEQUENCE { - egpNeighState - INTEGER, - egpNeighAddr - IpAddress, - egpNeighAs - INTEGER, - egpNeighInMsgs - Counter, - egpNeighInErrs - Counter, - egpNeighOutMsgs - Counter, - egpNeighOutErrs - Counter, - egpNeighInErrMsgs - Counter, - egpNeighOutErrMsgs - Counter, - egpNeighStateUps - Counter, - egpNeighStateDowns - Counter, - egpNeighIntervalHello - INTEGER, - egpNeighIntervalPoll - INTEGER, - egpNeighMode - INTEGER, - egpNeighEventTrigger - INTEGER - } - - egpNeighState OBJECT-TYPE - SYNTAX INTEGER { - idle(1), - acquisition(2), - down(3), - up(4), - cease(5) - } - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The EGP state of the local system with respect to - this entry's EGP neighbor. Each EGP state is - represented by a value that is one greater than - the numerical value associated with said state in - RFC 904." - ::= { egpNeighEntry 1 } - - egpNeighAddr OBJECT-TYPE - SYNTAX IpAddress - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The IP address of this entry's EGP neighbor." - ::= { egpNeighEntry 2 } - - egpNeighAs OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The autonomous system of this EGP peer. Zero - should be specified if the autonomous system - number of the neighbor is not yet known." - ::= { egpNeighEntry 3 } - - egpNeighInMsgs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of EGP messages received without error - from this EGP peer." - ::= { egpNeighEntry 4 } - - egpNeighInErrs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of EGP messages received from this EGP - peer that proved to be in error (e.g., bad EGP - checksum)." - ::= { egpNeighEntry 5 } - - egpNeighOutMsgs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of locally generated EGP messages to - this EGP peer." - ::= { egpNeighEntry 6 } - - egpNeighOutErrs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of locally generated EGP messages not - sent to this EGP peer due to resource limitations - within an EGP entity." - ::= { egpNeighEntry 7 } - - egpNeighInErrMsgs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of EGP-defined error messages received - from this EGP peer." - ::= { egpNeighEntry 8 } - - egpNeighOutErrMsgs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of EGP-defined error messages sent to - this EGP peer." - ::= { egpNeighEntry 9 } - - egpNeighStateUps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of EGP state transitions to the UP - state with this EGP peer." - ::= { egpNeighEntry 10 } - - egpNeighStateDowns OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The number of EGP state transitions from the UP - state to any other state with this EGP peer." - ::= { egpNeighEntry 11 } - - egpNeighIntervalHello OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The interval between EGP Hello command - retransmissions (in hundredths of a second). This - represents the t1 timer as defined in RFC 904." - ::= { egpNeighEntry 12 } - - egpNeighIntervalPoll OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The interval between EGP poll command - retransmissions (in hundredths of a second). This - represents the t3 timer as defined in RFC 904." - ::= { egpNeighEntry 13 } - - egpNeighMode OBJECT-TYPE - SYNTAX INTEGER { active(1), passive(2) } - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The polling mode of this EGP entity, either - passive or active." - ::= { egpNeighEntry 14 } - - egpNeighEventTrigger OBJECT-TYPE - SYNTAX INTEGER { start(1), stop(2) } - ACCESS read-write - STATUS mandatory - DESCRIPTION - "A control variable used to trigger operator- - initiated Start and Stop events. When read, this - variable always returns the most recent value that - egpNeighEventTrigger was set to. If it has not - been set since the last initialization of the - network management subsystem on the node, it - returns a value of `stop'. - - When set, this variable causes a Start or Stop - event on the specified neighbor, as specified on - pages 8-10 of RFC 904. Briefly, a Start event - causes an Idle peer to begin neighbor acquisition - and a non-Idle peer to reinitiate neighbor - acquisition. A stop event causes a non-Idle peer - to return to the Idle state until a Start event - occurs, either via egpNeighEventTrigger or - otherwise." - ::= { egpNeighEntry 15 } - - - -- additional EGP objects - - egpAs OBJECT-TYPE - SYNTAX INTEGER - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The autonomous system number of this EGP entity." - ::= { egp 6 } - - -- the Transmission group - - -- Based on the transmission media underlying each interface - -- on a system, the corresponding portion of the Transmission - -- group is mandatory for that system. - - -- When Internet-standard definitions for managing - -- transmission media are defined, the transmission group is - -- used to provide a prefix for the names of those objects. - - -- Typically, such definitions reside in the experimental - -- portion of the MIB until they are "proven", then as a - -- part of the Internet standardization process, the - -- definitions are accordingly elevated and a new object - -- identifier, under the transmission group is defined. By - -- convention, the name assigned is: - -- - -- type OBJECT IDENTIFIER ::= { transmission number } - -- - -- where "type" is the symbolic value used for the media in - -- the ifType column of the ifTable object, and "number" is - -- the actual integer value corresponding to the symbol. - - - -- the SNMP group - - -- Implementation of the SNMP group is mandatory for all - -- systems which support an SNMP protocol entity. Some of - -- the objects defined below will be zero-valued in those - -- SNMP implementations that are optimized to support only - -- those functions specific to either a management agent or - -- a management station. In particular, it should be - -- observed that the objects below refer to an SNMP entity, - -- and there may be several SNMP entities residing on a - -- managed node (e.g., if the node is hosting acting as - -- a management station). - - snmpInPkts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of Messages delivered to the - SNMP entity from the transport service." - ::= { snmp 1 } - - snmpOutPkts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Messages which were - passed from the SNMP protocol entity to the - transport service." - ::= { snmp 2 } - - snmpInBadVersions OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Messages which were - delivered to the SNMP protocol entity and were for - an unsupported SNMP version." - ::= { snmp 3 } - - snmpInBadCommunityNames OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Messages delivered to - the SNMP protocol entity which used a SNMP - community name not known to said entity." - ::= { snmp 4 } - - snmpInBadCommunityUses OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Messages delivered to - the SNMP protocol entity which represented an SNMP - operation which was not allowed by the SNMP - community named in the Message." - ::= { snmp 5 } - - snmpInASNParseErrs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of ASN.1 or BER errors - encountered by the SNMP protocol entity when - decoding received SNMP Messages." - ::= { snmp 6 } - - -- { snmp 7 } is not used - - snmpInTooBigs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP PDUs which were - delivered to the SNMP protocol entity and for - which the value of the error-status field is - `tooBig'." - ::= { snmp 8 } - - snmpInNoSuchNames OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP PDUs which were - delivered to the SNMP protocol entity and for - which the value of the error-status field is - `noSuchName'." - ::= { snmp 9 } - - snmpInBadValues OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP PDUs which were - delivered to the SNMP protocol entity and for - which the value of the error-status field is - `badValue'." - ::= { snmp 10 } - - snmpInReadOnlys OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number valid SNMP PDUs which were - delivered to the SNMP protocol entity and for - which the value of the error-status field is - `readOnly'. It should be noted that it is a - protocol error to generate an SNMP PDU which - contains the value `readOnly' in the error-status - field, as such this object is provided as a means - of detecting incorrect implementations of the - SNMP." - ::= { snmp 11 } - - snmpInGenErrs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP PDUs which were - delivered to the SNMP protocol entity and for - which the value of the error-status field is - `genErr'." - ::= { snmp 12 } - - snmpInTotalReqVars OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of MIB objects which have been - retrieved successfully by the SNMP protocol entity - as the result of receiving valid SNMP Get-Request - and Get-Next PDUs." - ::= { snmp 13 } - - snmpInTotalSetVars OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of MIB objects which have been - altered successfully by the SNMP protocol entity - as the result of receiving valid SNMP Set-Request - PDUs." - ::= { snmp 14 } - - snmpInGetRequests OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Get-Request PDUs which - have been accepted and processed by the SNMP - protocol entity." - ::= { snmp 15 } - - snmpInGetNexts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Get-Next PDUs which have - been accepted and processed by the SNMP protocol - entity." - ::= { snmp 16 } - - snmpInSetRequests OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Set-Request PDUs which - have been accepted and processed by the SNMP - protocol entity." - ::= { snmp 17 } - - snmpInGetResponses OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Get-Response PDUs which - have been accepted and processed by the SNMP - protocol entity." - ::= { snmp 18 } - - snmpInTraps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Trap PDUs which have - been accepted and processed by the SNMP protocol - entity." - ::= { snmp 19 } - - snmpOutTooBigs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP PDUs which were - generated by the SNMP protocol entity and for - which the value of the error-status field is - `tooBig.'" - ::= { snmp 20 } - - snmpOutNoSuchNames OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP PDUs which were - generated by the SNMP protocol entity and for - which the value of the error-status is - `noSuchName'." - ::= { snmp 21 } - - snmpOutBadValues OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP PDUs which were - generated by the SNMP protocol entity and for - which the value of the error-status field is - `badValue'." - ::= { snmp 22 } - - -- { snmp 23 } is not used - - snmpOutGenErrs OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP PDUs which were - generated by the SNMP protocol entity and for - which the value of the error-status field is - `genErr'." - ::= { snmp 24 } - - snmpOutGetRequests OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Get-Request PDUs which - have been generated by the SNMP protocol entity." - ::= { snmp 25 } - - snmpOutGetNexts OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Get-Next PDUs which have - been generated by the SNMP protocol entity." - ::= { snmp 26 } - - snmpOutSetRequests OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Set-Request PDUs which - have been generated by the SNMP protocol entity." - ::= { snmp 27 } - - snmpOutGetResponses OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Get-Response PDUs which - have been generated by the SNMP protocol entity." - ::= { snmp 28 } - - snmpOutTraps OBJECT-TYPE - SYNTAX Counter - ACCESS read-only - STATUS mandatory - DESCRIPTION - "The total number of SNMP Trap PDUs which have - been generated by the SNMP protocol entity." - ::= { snmp 29 } - - snmpEnableAuthenTraps OBJECT-TYPE - SYNTAX INTEGER { enabled(1), disabled(2) } - ACCESS read-write - STATUS mandatory - DESCRIPTION - "Indicates whether the SNMP agent process is - permitted to generate authentication-failure - traps. The value of this object overrides any - configuration information; as such, it provides a - means whereby all authentication-failure traps may - be disabled. - - Note that it is strongly recommended that this - object be stored in non-volatile memory so that it - remains constant between re-initializations of the - network management system." - ::= { snmp 30 } - -END diff --git a/ASNMP/tests/Address_Test.cpp b/ASNMP/tests/Address_Test.cpp deleted file mode 100644 index cadca2722dc..00000000000 --- a/ASNMP/tests/Address_Test.cpp +++ /dev/null @@ -1,549 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Address_Test.cpp -// -// = DESCRIPTION -// Test all the member functions of the Address family: -// GenAddress, MacAddress, IpxAddress, IpAddress, UdpAddress -// all which derive from abstract base class Address. -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - -#include "asnmp/address.h" -#include "test_config.h" - -ACE_RCSID(tests, Address_Test, "$Id$") - -// test the GenAddress interface -/* - */ -static void TestGenAddr() -{ - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress: Tests: var(expected) [actual]\n")); - - // the constructors and destructors - GenAddress *ga1 = new GenAddress("1.2.3.4"); // use ipv4 address - ACE_ASSERT(ga1->valid() == 1); - GenAddress ga2(*ga1); // copy constructor; - ACE_ASSERT(ga2.valid() == 1); - GenAddress ga3("localhost"); - ACE_ASSERT(ga3.valid() == 1); - GenAddress ga4; // default constructor - ACE_ASSERT(ga4.valid() == 0); - GenAddress ga5; // default constructor - ACE_ASSERT(ga5.valid() == 0); - GenAddress ga6("127.0.0.1:7"); // udp address - ACE_ASSERT(ga6.valid() == 1); - GenAddress ga7("01234567.89ABcDeF0123"); // ipx address - ACE_ASSERT(ga7.valid() == 1); - IpAddress ip("1.2.3.4"); - ACE_ASSERT(ip.valid() == 1); - GenAddress ga8(ip); // Address conversion - ACE_ASSERT(ga8.valid() == 1); - - const char *ptr = (const char *)ga8; - - ACE_ASSERT(ga1 != 0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga1(\"1.2.3.4\") [%s]\n", - ga1->to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga2(ga1) [%s]\n", - ga2.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga3(\"localhost\") [%s]\n", - ga3.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga4(\"\") [%s]\n", - ga4.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga6(\"127.0.0.1:7\") [%s]\n", - ga6.to_string())); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga7(\"01234567.89ABcDeF0123\") [%s]\n", - ga7.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga8(\"1.2.3.4\") [%s]\n", - ga8.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga8(\"1.2.3.4\") [%s]\n", - ptr)); - - // Test Assignment x = y, y = x - ga5 = ga3; // regular assignment - ga3 = ga3; // self assignment - ACE_ASSERT(ga5 == ga3); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga5=ga3(\"localhost\") [%s]\n", - ga5.to_string())); - - addr_type a = ga2.get_type(); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga2.get_type(\"0\") [%d]\n", - a)); - // udp address string - a = ga6.get_type(); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga2.get_type(\"2\") [%d]\n", - a)); - - // udp address string - a = ga7.get_type(); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) GenAddress:ga2.get_type(\"1\") [%d]\n", - a)); - - delete ga1, ga1 = 0; -} - -/* public methods - IpAddress( const char *inaddr = ""); - IpAddress( const IpAddress &ipaddr); - IpAddress( const GenAddress &genaddr); - ~IpAddress(); - SnmpSyntax& operator=( SnmpSyntax &val); - IpAddress& operator=( const IpAddress &ipaddress); - SnmpSyntax *clone() const; - char *resolve_hostname(int &status); - virtual char *to_string() ; - virtual operator const char *() const; - void mask( const IpAddress& ipaddr); - virtual addr_type get_type() const; - virtual SmiUINT32 get_syntax(); - int is_loopback() const; - int is_multicast() const; - int is_broadcast() const; - int is_arpanet() const; - */ -static void TestIpAddress() -{ - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress: Tests\n")); - - // constructors - GenAddress ga("255.255.255.255"); - IpAddress ia1; - IpAddress ia2("224.2.3.4"); - ACE_ASSERT(ia2.is_multicast()); - ACE_ASSERT(!ia2.is_loopback()); - IpAddress ia3("localhost"); - ACE_ASSERT(ia3.is_loopback()); - ACE_ASSERT(!ia3.is_multicast()); - IpAddress ia4(ia3); - ACE_ASSERT(ia4.is_loopback()); - ACE_ASSERT(!ia4.is_multicast()); - IpAddress ia5(ga); - ACE_ASSERT(ia5.is_broadcast()); - IpAddress ia6 = IpAddress("10.0.0.2"); - ACE_ASSERT(ia6.is_private()); - ACE_ASSERT(!ia6.is_multicast()); - ACE_ASSERT(!ia6.is_loopback()); - - IpAddress ia7("172.16.0.1"); - ACE_ASSERT(ia7.is_private()); - - IpAddress ia8("192.168.0.1"); - ACE_ASSERT(ia8.is_private()); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:ia1(\"\") [%s]\n", - ia1.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:ia2(\"1.2.3.4\") [%s]\n", - ia2.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:ia3(\"127.0.0.1\") [%s]\n", - ia3.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:ia4(\"ia3\") [%s]\n", - ia4.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:ia5(\"255.255.255.255\") [%s]\n", - ia5.to_string())); - - // other routines - int status = 1; - const char *ptr = ia5.resolve_hostname(status); - ACE_ASSERT(status == 0); - ACE_ASSERT(ptr != 0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:ia5.resolve_hostname():(\"\") [%s]\n", - ptr)); - - // now lets try one we setup with a hostname - ptr = ia3.resolve_hostname(status); - ACE_ASSERT(status == 0); - ACE_ASSERT(ptr != 0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:ia3.resolve_hostname()(\"localhost\") [%s]\n", - ptr)); - - ptr = (const char *)ia5; - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:(const char *)(\"255.255.255.255\") [%s]\n", - ptr)); - - ia2 = ia3; - ACE_ASSERT(ia2 == ia3); - - ia4.mask(ia3); // mask with equal value should return same - ACE_ASSERT(ia2 == ia3); - - ACE_ASSERT(ia1.get_type() == type_ip); - ACE_ASSERT(ia1.valid() == 0); - ACE_ASSERT(ia2.get_type() == type_ip); - ACE_ASSERT(ia2.valid() == 1); - ACE_ASSERT(ia3.get_type() == type_ip); - ACE_ASSERT(ia3.valid() == 1); - ACE_ASSERT(ia4.get_type() == type_ip); - ACE_ASSERT(ia4.valid() == 1); - ACE_ASSERT(ia5.get_type() == type_ip); - ACE_ASSERT(ia5.valid() == 1); -} - - -// --------------- Netbios --------------- -/* - NetbiosAddress( const char *inaddr = ""); - NetbiosAddress( const NetbiosAddress& nbaddr); - NetbiosAddress( const GenAddress& genaddr); - ~NetbiosAddress(); - virtual char *to_string(); - NetbiosAddress& operator=( const NetbiosAddress &nbaddr); - nb_service get_service_type() const; - void set_service_type(nb_service nbservice); - virtual operator const char *() const; - virtual SmiUINT32 get_syntax(); - SnmpSyntax& operator=( SnmpSyntax &val); - SnmpSyntax *clone() const; - */ -static void TestNetbiosAddress() -{ - NetbiosAddress n1; - ACE_ASSERT(n1.valid() == 0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) NetbiosAddress:n1(\"\") [%s]\n", - n1.to_string())); - - NetbiosAddress n2(n1); - ACE_ASSERT(n2.valid() == 0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) NetbiosAddress:n2(n1) [%s]\n", - n2.to_string())); - - NetbiosAddress n3("pcname"); - ACE_ASSERT(n3.valid() == 1); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) NetbiosAddress:n3(\"pcname\") [%s]\n", - n3.to_string())); - - NetbiosAddress n4("abcdefghigjklmn"); - n4.set_service_type(nb_workstation); - ACE_ASSERT(n4.valid() == 1); - ACE_ASSERT(n4.get_service_type() == nb_workstation); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) NetbiosAddress:n4(\"abcdefghigjklmn\") [%s]\n", - n4.to_string())); - - NetbiosAddress n5("abcdefghigjklmno0xx"); - ACE_ASSERT(n5.valid() == 0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) NetbiosAddress:n4(\"abcdefghigjklmno0xx\") [%s]\n", - n5.to_string())); - - n1 = n4; - ACE_ASSERT(n1 == n4); - ACE_ASSERT(strcmp((const char *)n1, (const char *)n4) == 0); - - n1.set_service_type(nb_server); - nb_service x = n1.get_service_type(); - ACE_ASSERT(x == nb_server); -} - -// --------------- IPX --------------- -/* - IpxAddress( void); - IpxAddress( const char *inaddr); - IpxAddress( const IpxAddress &ipxaddr); - IpxAddress( const GenAddress &genaddr); - ~IpxAddress(); - virtual SmiUINT32 get_syntax(); - SnmpSyntax& operator=( SnmpSyntax &val); - IpxAddress& operator=( const IpxAddress &ipxaddress); - int get_hostid( MacAddress& mac); - SnmpSyntax *clone() const; - virtual operator const char *() const; - virtual addr_type get_type() const; - -Ipx Address semantics: Total length must be 21 -// Must have a separator in it -// First string length must be 8 -// Second string length must be 12 -// Each char must take on value 0-F -// -// -// Input formats recognized -// -// XXXXXXXX.XXXXXXXXXXXX -// XXXXXXXX:XXXXXXXXXXXX -// XXXXXXXX-XXXXXXXXXXXX -// XXXXXXXX.XXXXXX-XXXXXX -// XXXXXXXX:XXXXXX-XXXXXX -// XXXXXXXX-XXXXXX-XXXXXX - - */ - -static void TestIpxAddress() -{ - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress: Tests\n")); - IpxAddress xa1; - ACE_ASSERT(xa1.valid() == 0); - ACE_ASSERT(xa1.get_type() == type_ipx); - GenAddress gen("01234567.0123456789AB"); - ACE_ASSERT(gen.valid() == 1); - IpxAddress xa2("01234567.0123456789AB"); - ACE_ASSERT(xa2.get_type() == type_ipx); - ACE_ASSERT(xa2.valid() == 1); - IpxAddress xa3("01234567:0123456789AB"); - ACE_ASSERT(xa3.get_type() == type_ipx); - ACE_ASSERT(xa3.valid() == 1); - IpxAddress xa4("01234567-0123456789AB"); - ACE_ASSERT(xa4.get_type() == type_ipx); - ACE_ASSERT(xa4.valid() == 1); - IpxAddress xa5("01234567.012345-6789AB"); - ACE_ASSERT(xa5.get_type() == type_ipx); - ACE_ASSERT(xa5.valid() == 1); - IpxAddress xa6("01234567:012345-6789AB"); - ACE_ASSERT(xa6.get_type() == type_ipx); - ACE_ASSERT(xa6.valid() == 1); - IpxAddress xa7("01234567-012345-6789AB"); - ACE_ASSERT(xa7.get_type() == type_ipx); - ACE_ASSERT(xa7.valid() == 1); - IpxAddress xa8("01234567."); - ACE_ASSERT(xa8.get_type() == type_ipx); - ACE_ASSERT(xa8.valid() == 0); - IpxAddress xa9(gen); - ACE_ASSERT(xa9.valid() == 1); - IpxAddress *xa10 = new IpxAddress(xa9); - ACE_ASSERT(xa10->get_type() == type_ipx); - ACE_ASSERT(xa10->valid() == 1); - delete xa10; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa1(\"\") [%s]\n", - xa1.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa2(\"01234567.0123456789AB\") [%s]\n", - xa2.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa3(\"01234567:0123456789A\") [%s]\n", - xa3.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa4(\"01234567-0123456789AB\") [%s]\n", - xa4.to_string())); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa5(\"01234567.012345-6789AB\") [%s]\n", - xa5.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa6(\"01234567:012345-6789AB\") [%s]\n", - xa6.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa7(\"01234567-012345-6789AB\") [%s]\n", - xa7.to_string())); - - // assignment - xa1 = xa3; - ACE_ASSERT(xa1 == xa3); - MacAddress mac; - ACE_ASSERT(xa4.get_hostid(mac) == 1); - ACE_ASSERT(mac.valid() == 1); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa4:get_hostid(\"01:23:45:67:89:ab\") [%s]\n", mac.to_string())); - - const char *ptr = (const char *)xa7; - ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa7-ptr(\"01234567-012345-6789AB\") [%s]\n", ptr)); - -} - -/* - MacAddress( void); - - MacAddress( const char *inaddr); - MacAddress( const MacAddress &macaddr); - MacAddress( const GenAddress &genaddr); - ~MacAddress(); -* SmiUINT32 get_syntax(); -* SnmpSyntax& operator=( SnmpSyntax &val); - MacAddress& operator=( const MacAddress &macaddress); -* SnmpSyntax *clone() const; - virtual char *to_string(); - virtual operator const char *() const; - virtual addr_type get_type() const; - unsigned int hashFunction() const; - -// MAC address format -// -// MAC ADDRESS -// 01 02 03 04 05 06 -// XX:XX:XX:XX:XX:XX -// Valid input format -// -// XXXXXXXXXXXX -// Total length must be 17 -// Each char must take on value 0-F -// - -*/ - -static void TestMacAddress() -{ - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress: Tests\n")); - - MacAddress ma1; - ACE_ASSERT(ma1.valid() == 0); - ACE_ASSERT(ma1.get_type() == type_mac); - MacAddress ma2("01:23:45:67:89:AB"); - ACE_ASSERT(ma2.valid() == 1); - ACE_ASSERT(ma2.get_type() == type_mac); - MacAddress ma3("0123456789ABCEFGHI"); // invalid string - ACE_ASSERT(ma3.valid() == 0); - ACE_ASSERT(ma3.get_type() == type_mac); - GenAddress ga("01:23:45:67:89:AB"); // mac address - MacAddress ma4(ma2); - ACE_ASSERT(ma4.valid() == 1); - ACE_ASSERT(ma4.get_type() == type_mac); - MacAddress ma5(ga); - ACE_ASSERT(ma5.valid() == 0); - ACE_ASSERT(ma5.get_type() == type_mac); - - ma1 = ma2; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress:ma1(\"01:23:45:67:89:AB\") [%s]\n", - ma1.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress:ma2(\"01:23:45:67:89:AB\") [%s]\n", - ma2.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress:ma3(\"\") [%s]\n", - ma3.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress:ma4(\"01:23:45:67:89:AB\") [%s]\n", - ma4.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress:ma5(\"\") [%s]\n", - ma5.to_string())); - const char * ptr = (const char *)ma5; - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress:ma5(\"\") [%s]\n", - ptr)); - - // hashFunction crashes if not usedwith valid fn - int x = ma2.hashFunction(); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress:ma2.hashFunction(\"483201\") [%d]\n", - x)); -} - -/* - UdpAddress( void); - UdpAddress( const char *inaddr); - UdpAddress( const UdpAddress &udpaddr); - UdpAddress( const GenAddress &genaddr); - UdpAddress( const IpAddress &ipaddr); - ~UdpAddress(); - SmiUINT32 get_syntax(); - SnmpSyntax& operator=( SnmpSyntax &val); - UdpAddress& operator=( const UdpAddress &udpaddr); - SnmpSyntax *clone() const; - virtual char *to_string() ; - virtual operator const char *() const; - void set_port( const unsigned short p); - unsigned short get_port() const; - virtual addr_type get_type() const; - - // look for port info @ the end of the string - // port can be delineated by a ':' or a '/' - // if neither are present then just treat it - // like a normal IpAddress - - */ - -static void TestUdpAddress() -{ - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress: Tests\n")); - - UdpAddress ua1; - ACE_ASSERT(ua1.valid() == 0); - ACE_ASSERT(ua1.get_type() == type_udp); - - // semantics of not setting the port here are bizzare? - UdpAddress ua2("127.0.0.1:161"); - ACE_ASSERT(ua2.valid() == 1); - ACE_ASSERT(ua2.get_type() == type_udp); - - UdpAddress ua3(ua2); - ACE_ASSERT(ua3.valid() == 1); - ACE_ASSERT(ua3.get_type() == type_udp); - - GenAddress ga("localhost"); - UdpAddress ua4(ga); - ACE_ASSERT(ua4.valid() == 1); - ACE_ASSERT(ua4.get_type() == type_udp); - - IpAddress ia("localhost"); - UdpAddress ua5(ga); - ACE_ASSERT(ua5.valid() == 1); - ACE_ASSERT(ua5.get_type() == type_udp); - - UdpAddress *ua6 = new UdpAddress("localhost:161"); - ACE_ASSERT(ua6->valid() == 1); - ACE_ASSERT(ua6->get_type() == type_udp); - - UdpAddress ua7 = UdpAddress("localhost/162"); - ACE_ASSERT(ua7.valid() == 1); - ACE_ASSERT(ua7.get_type() == type_udp); - - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua1(\"\") [%s]\n", - ua1.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua2(\"127.0.0.1:161\") [%s]\n", - ua2.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua3(ua2)(\"127.0.0.1:161\") [%s]\n", - ua3.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua4(GenAddress)(\"127.0.0.1\") [%s]\n", - ua4.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua5(IpAddress)(\"127.0.0.1\") [%s]\n", - ua5.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua6()(\"localhost:161\") [%s]\n", - ua6->to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua7()(\"localhost/162\") [%s]\n", - ua7.to_string())); - - delete ua6; // destructor - - // assignement tests. - ua1 = ua2; - ACE_ASSERT(ua1 == ua2); - ACE_ASSERT(ua1.valid() == 1); - ua1 = ua1; - ACE_ASSERT(ua1 == ua1); - ACE_ASSERT(ua1.valid() == 1); - - // set/get port - ua1.set_port(333); - ACE_ASSERT(ua1.get_port() == 333); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua1.set_port()(\"333\") [%s]\n", - (const char *)ua1)); - -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("Address_Test"); - - TestGenAddr(); - TestIpAddress(); - TestUdpAddress(); - TestMacAddress(); - TestNetbiosAddress(); - TestIpxAddress(); - - ACE_END_TEST; - return 0; -} diff --git a/ASNMP/tests/Counter64_Test.cpp b/ASNMP/tests/Counter64_Test.cpp deleted file mode 100644 index b0f0e172c82..00000000000 --- a/ASNMP/tests/Counter64_Test.cpp +++ /dev/null @@ -1,154 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Counter64_Test.cpp -// -// = DESCRIPTION -// Test all the member functions of the Counter64 class. An Object -// representing an ASN.1 Counter64 SMI 64 bit Integer SYNTAX. -// (SNMPv2c) -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - - -#include "ace/OS.h" -#include "asnmp/ctr64.h" -#include "test_config.h" - -ACE_RCSID(tests, Counter64_Test, "$Id$") - -// TODO: verify this with ACE folks -#if defined(_WIN32) -#define LLONG __int64 -#else -#define LLONG long long -#define ULLONG unsigned long long -#endif - -/* - Counter64( unsigned long long llw = 0); - Counter64( unsigned long hiparm, unsigned long loparm); - Counter64( const Counter64 &ctr64); - ~Counter64(); - SmiUINT32 get_syntax(); - long double to_long_double() const; - Counter64& assign( long double ld); - unsigned long high() const; - unsigned long low() const; - void set_high( const unsigned long h); - void set_low( const unsigned long l); - Counter64& operator=( const unsigned long long rhs); - Counter64& operator=( const Counter64 &rhs); - char *to_string(); - SnmpSyntax *clone() const; - SnmpSyntax& operator=( SnmpSyntax &val); - int valid() const; - operator unsigned long long(); - */ - -static void TestCounter64() -{ - static unsigned long ul = ULONG_MAX; - LLONG ll = (LLONG) 0x7fffffffffffffffLL; - LLONG mll = (LLONG) ((-ll) - 1); - ULLONG ull = (ULLONG) 0xffffffffffffffffULL; - long double ld = (LLONG) ll; - - cerr << "max unsigned long long is " << ull << endl; - cerr << "max long long is " << ll << endl; - cerr << "min long long is " << mll << endl; - - Counter64 c1; - ACE_ASSERT(c1.valid() == 1); - Counter64 c2(ul, ul); - ACE_ASSERT(c2.valid() == 1); - ACE_ASSERT(c2.high() == ul); - ACE_ASSERT(c2.low() == ul); - - Counter64 c3(ul); - ACE_ASSERT(c3.valid() == 1); - ACE_ASSERT(c3.low() == ul); - - Counter64 c4(c2); - ACE_ASSERT(c4.valid() == 1); - ACE_ASSERT(c4.high() == ul); - ACE_ASSERT(c4.low() == ul); - - Counter64 c5(0); - ACE_ASSERT(c5.valid() == 1); - - Counter64 c6; - c6.assign(ld); - ACE_ASSERT(c6.to_long_double() == ld); - - Counter64 c7(ull); - ACE_ASSERT(c7 == ull); - - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c1(\"\") [%s]\n", - c1.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c2(LONG_MAX,LONG_MAX) [%s]\n", - c2.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c3(LONG_MAX) [%s]\n", - c3.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c4(c2) [%s]\n", - c4.to_string())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c5(0) [%s]\n", - c5.to_string())); - - // misc routines - c1.set_low(1); - c1.set_high(2); - ACE_ASSERT(c1.low() == 1); - ACE_ASSERT(c1.high() == 2); - // assignment - c5 = c4; - ACE_ASSERT(c5 == c4); - c4 = c4; - ACE_ASSERT(c5 == c4); - c5 = ll; - ACE_ASSERT(c5 == ll); - // try simple arithmetic (needs more test cases) - c5 = mll; - c5 = c5 + (ULLONG) 10; - ACE_ASSERT(c5 == (mll + 10)); -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("Counter64_Test"); - - TestCounter64(); - - ACE_END_TEST; - return 0; -} diff --git a/ASNMP/tests/Counter_Test.cpp b/ASNMP/tests/Counter_Test.cpp deleted file mode 100644 index 0538261cb8d..00000000000 --- a/ASNMP/tests/Counter_Test.cpp +++ /dev/null @@ -1,136 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Counter_Test.cpp -// -// = DESCRIPTION -// Test all the member functions of the Counter class. An Object -// representing an ASN.1 Counter SMI COUNTER SYNTAX. -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - - -#include "ace/OS.h" -#include "asnmp/counter.h" -#include "test_config.h" - -ACE_RCSID(tests, Counter_Test, "$Id$") - -/* - Counter32( void); - Counter32( const unsigned long i); - Counter32( const Counter32 &c); -* SmiUINT32 get_syntax(); -* SnmpSyntax *clone() const; -* SnmpSyntax& operator=( SnmpSyntax &val); - Counter32& operator=( const Counter32 &uli); - Counter32& operator=( const unsigned long i); - operator unsigned long(); - - -- comments tyis type appears to be a wrapper class and not - a true SNMP counter. Practical for nms side,yet may lead to - some confusion if implementing an agent with this class. - - Per RFC 1155 sec 3.2.3.3 - This application-wide type represents a non-negative integer which - monotonically increases until it reaches a maximum value, when it - wraps around and starts increasing again from zero. This memo - specifies a maximum value of 2^32-1 for counters -*/ - -static void TestCounter() -{ - long l = LONG_MAX, nl = LONG_MIN; // limits.h - unsigned long ul = ULONG_MAX, def = 0; - int i = INT_MAX, ni = INT_MIN; - unsigned int ui = UINT_MAX; - unsigned short us = 10; - short si = 65535; - - // constructors - Counter32 c1; - ACE_ASSERT(c1 == def); - Counter32 c2(l); - ACE_ASSERT(c2 == l); - Counter32 c3(nl); - ACE_ASSERT(c3 == nl); - Counter32 c4(ul); - ACE_ASSERT(c4 == ul); - Counter32 c5(i); - ACE_ASSERT(c5 == i); - Counter32 c6(ni); - ACE_ASSERT(c6 == ni); - Counter32 c7(ui); - ACE_ASSERT(c7 == ui); - Counter32 *c8 = new Counter32(c5); - ACE_ASSERT(c8 != 0); - delete c8; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c1(\"\") [%u]\n", - (unsigned long)c1)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c2(\"%u\") [%u]\n", - l, (unsigned long)c2)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c3(\"%u\") [%u]\n", - nl, (unsigned long)c3)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c4(\"%u\") [%u]\n", - ul, (unsigned long)c4)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c5(\"%u\") [%u]\n", - i, (unsigned long)c5)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c6(\"%u\") [%u]\n", - ni, (unsigned long)c6)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) c7(\"%u\") [%u]\n", - ui, (unsigned long)c7)); - - // assignent - c1 = c2; // obj - ACE_ASSERT(c1 == c2); - c1 = c1; // self - ACE_ASSERT(c1 == c1); - c1 = def; // unsigned long - ACE_ASSERT(c1 == def); - c1 = us; // unsigned short - ACE_ASSERT(c1 == us); - c1 = si; // unsigned short - ACE_ASSERT(c1 == si); - -} - - -int -main (int, char *[]) -{ - ACE_START_TEST ("Counter_Test"); - - TestCounter(); - - ACE_END_TEST; - return 0; -} diff --git a/ASNMP/tests/Gauge_Test.cpp b/ASNMP/tests/Gauge_Test.cpp deleted file mode 100644 index a607d58c1b7..00000000000 --- a/ASNMP/tests/Gauge_Test.cpp +++ /dev/null @@ -1,128 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Guage_Test.cpp -// -// = DESCRIPTION -// Test all the member functions of the Guage class. An Object -// representing an ASN.1 Counter SMI GUAGE SYNTAX. -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - -#include "ace/OS.h" -#include "asnmp/gauge.h" -#include "test_config.h" - -ACE_RCSID(tests, Gauge_Test, "$Id$") - -/* - Gauge32( void); - Gauge32( const unsigned long i); - Gauge32 ( const Gauge32 &g); - ~Gauge32(); - SmiUINT32 get_syntax(); - SnmpSyntax *clone() const; - Gauge32& operator=( const Gauge32 &uli); - Gauge32& operator=( const unsigned long i); - operator unsigned long(); - SnmpSyntax& operator=( SnmpSyntax &val); - --- What is a Gauge? According to RFC 1155 section: 3.2.3.4 - This application-wide type represents a non-negative integer - which may increase or decreae, but which latches at a maximum - value of 2^32-1 (4294967295 dec) for gauges. - */ -static void TestGuage() -{ - long l = LONG_MAX, nl = LONG_MIN; // limits.h - unsigned long ul = ULONG_MAX, def = 0; - int i = INT_MAX, ni = INT_MIN; - unsigned int ui = UINT_MAX; - unsigned short us = 10; - short si = 65535; - - // constructors - Gauge32 g1; - ACE_ASSERT(g1 == def); - Gauge32 g2(l); - ACE_ASSERT(g2 == l); - Gauge32 g3(nl); - ACE_ASSERT(g3 == nl); - Gauge32 g4(ul); - ACE_ASSERT(g4 == ul); - Gauge32 g5(i); - ACE_ASSERT(g5 == i); - Gauge32 g6(ni); - ACE_ASSERT(g6 == ni); - Gauge32 g7(ui); - ACE_ASSERT(g7 == ui); - Gauge32 *g8 = new Gauge32(g5); - ACE_ASSERT(g8 != 0); - delete g8; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) g1(\"\") [%u]\n", - (unsigned long)g1)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) g2(\"%u\") [%u]\n", - l, (unsigned long)g2)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) g3(\"%u\") [%u]\n", - nl, (unsigned long)g3)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) g4(\"%u\") [%u]\n", - ul, (unsigned long)g4)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) g5(\"%u\") [%u]\n", - i, (unsigned long)g5)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) g6(\"%u\") [%u]\n", - ni, (unsigned long)g6)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) g7(\"%u\") [%u]\n", - ui, (unsigned long)g7)); - - // assignent - g1 = g2; // obj - ACE_ASSERT(g1 == g2); - g1 = g1; // self - ACE_ASSERT(g1 == g1); - g1 = def; // unsigned long - ACE_ASSERT(g1 == def); - g1 = us; // unsigned short - ACE_ASSERT(g1 == us); - g1 = si; // unsigned short - ACE_ASSERT(g1 == si); -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("Guage_Test"); - - TestGuage(); - - ACE_END_TEST; - return 0; -} diff --git a/ASNMP/tests/Integer_Test.cpp b/ASNMP/tests/Integer_Test.cpp deleted file mode 100644 index c289425d8ea..00000000000 --- a/ASNMP/tests/Integer_Test.cpp +++ /dev/null @@ -1,194 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Integer_Test.cpp -// -// = DESCRIPTION -// Test all the member functions of the Integer class. An Object -// representing an ASN.1 Integer64 SMI 32 bit Integer SYNTAX. -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - - -#include "ace/OS.h" -#include "asnmp/integer.h" -#include "test_config.h" - -ACE_RCSID(tests, Integer_Test, "$Id$") - -static long l = LONG_MAX, nl = LONG_MIN; // limits.h -static unsigned long ul = ULONG_MAX, def = 0; -static int i = INT_MAX, ni = INT_MIN; -static unsigned int ui = UINT_MAX; -static unsigned short us = 10; -static short si = 65535; - -/* - SnmpInt32( void); - SnmpInt32 (const long i); - SnmpInt32 (const SnmpInt32 &c); - virtual ~SnmpInt32(); - virtual SmiUINT32 get_syntax(); - SnmpInt32& operator=( const long i); - SnmpInt32& operator=( const SnmpInt32 &li); - operator long(); - char *to_string(); - SnmpSyntax *clone() const; - SnmpSyntax& operator=( SnmpSyntax &val); - int valid() const; - */ - -static void TestInteger32() -{ - - // constructors - SnmpInt32 i1; - ACE_ASSERT(i1 == def); - SnmpInt32 i2(l); - ACE_ASSERT(i2 == l); - SnmpInt32 i3(nl); - ACE_ASSERT(i3 == nl); - SnmpInt32 i4(ul); - ACE_ASSERT(i4 == ul); - SnmpInt32 i5(i); - ACE_ASSERT(i5 == i); - SnmpInt32 i6(ni); - ACE_ASSERT(i6 == ni); - SnmpInt32 i7(ui); - ACE_ASSERT(i7 == ui); - SnmpInt32 *i8 = new SnmpInt32(i5); - ACE_ASSERT(i8 != 0); - delete i8; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) i1(\"\") [%u]\n", - (unsigned long)i1)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) i2(\"%u\") [%u]\n", - l, (unsigned long)i2)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) i3(\"%u\") [%u]\n", - nl, (unsigned long)i3)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) i4(\"%u\") [%u]\n", - ul, (unsigned long)i4)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) i5(\"%u\") [%u]\n", - i, (unsigned long)i5)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) i6(\"%u\") [%u]\n", - ni, (unsigned long)i6)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) i7(\"%u\") [%u]\n", - ui, (unsigned long)i7)); - - // assignent - i1 = i2; // obj - ACE_ASSERT(i1 == i2); - i1 = i1; // self - ACE_ASSERT(i1 == i1); - i1 = def; // unsigned long - ACE_ASSERT(i1 == def); - i1 = us; // unsigned short - ACE_ASSERT(i1 == us); - i1 = si; // unsigned short - ACE_ASSERT(i1 == si); -} - -/* - SnmpUInt32( void); - SnmpUInt32 (const unsigned long i); - SnmpUInt32( const SnmpUInt32 &c); - virtual ~SnmpUInt32(); - virtual SmiUINT32 get_syntax(); - SnmpUInt32& operator=( const unsigned long i); - SnmpUInt32& operator=( const SnmpUInt32 &uli); - operator unsigned long(); - virtual char *to_string(); - virtual SnmpSyntax *clone() const; - SnmpSyntax& operator=( SnmpSyntax &val); - int valid() const; - */ -static void TestUnsignedInteger32() -{ - // constructors - SnmpUInt32 u1; - ACE_ASSERT(u1 == def); - SnmpUInt32 u2(l); - ACE_ASSERT(u2 == l); - SnmpUInt32 u3(nl); - ACE_ASSERT(u3 == nl); - SnmpUInt32 u4(ul); - ACE_ASSERT(u4 == ul); - SnmpUInt32 u5(i); - ACE_ASSERT(u5 == i); - SnmpUInt32 u6(ni); - ACE_ASSERT(u6 == ni); - SnmpUInt32 u7(ui); - ACE_ASSERT(u7 == ui); - SnmpUInt32 *u8 = new SnmpUInt32(u5); - ACE_ASSERT(u8 != 0); - delete u8; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) u1(\"\") [%u]\n", - (unsigned long)u1)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) u2(\"%u\") [%u]\n", - l, (unsigned long)u2)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) u3(\"%u\") [%u]\n", - nl, (unsigned long)u3)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) u4(\"%u\") [%u]\n", - ul, (unsigned long)u4)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) u5(\"%u\") [%u]\n", - i, (unsigned long)u5)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) u6(\"%u\") [%u]\n", - ni, (unsigned long)u6)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) u7(\"%u\") [%u]\n", - ui, (unsigned long)u7)); - - // assignent - u1 = u2; // obj - ACE_ASSERT(u1 == u2); - u1 = u1; // self - ACE_ASSERT(u1 == u1); - u1 = def; // unsigned long - ACE_ASSERT(u1 == def); - u1 = us; // unsigned short - ACE_ASSERT(u1 == us); - u1 = si; // unsigned short - ACE_ASSERT(u1 == si); -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("Integer_Test"); - - TestInteger32(); - - TestUnsignedInteger32(); - - ACE_END_TEST; - return 0; -} diff --git a/ASNMP/tests/Makefile b/ASNMP/tests/Makefile deleted file mode 100644 index f6745784cfb..00000000000 --- a/ASNMP/tests/Makefile +++ /dev/null @@ -1,503 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for all the ACE+SNMP ``one-button' tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -# ACE+SNMP before -lACE - -BIN = Oid_Test \ - Counter_Test \ - Counter64_Test \ - Integer_Test \ - Octet_Test \ - Gauge_Test \ - Address_Test \ - Target_Test \ - Varbind_Test - -LSRC = $(addsuffix .cpp,$(BIN)) -LDLIBS := -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -CCFLAGS = -I$(ACE_ROOT)/ASNMP/ -# For make depend: -CPPFLAGS += -I$(ACE_ROOT)/ASNMP - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Oid_Test.o .obj/Oid_Test.so .shobj/Oid_Test.o .shobj/Oid_Test.so: Oid_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ASNMP/asnmp/oid.h \ - $(ACE_ROOT)/ASNMP/asnmp/smival.h \ - $(ACE_ROOT)/ASNMP/asnmp/smi.h \ - test_config.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl - -.obj/Counter_Test.o .obj/Counter_Test.so .shobj/Counter_Test.o .shobj/Counter_Test.so: Counter_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ASNMP/asnmp/counter.h \ - $(ACE_ROOT)/ASNMP/asnmp/smival.h \ - $(ACE_ROOT)/ASNMP/asnmp/smi.h \ - $(ACE_ROOT)/ASNMP/asnmp/integer.h \ - test_config.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl - -.obj/Counter64_Test.o .obj/Counter64_Test.so .shobj/Counter64_Test.o .shobj/Counter64_Test.so: Counter64_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ASNMP/asnmp/ctr64.h \ - $(ACE_ROOT)/ASNMP/asnmp/smival.h \ - $(ACE_ROOT)/ASNMP/asnmp/smi.h \ - test_config.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl - -.obj/Integer_Test.o .obj/Integer_Test.so .shobj/Integer_Test.o .shobj/Integer_Test.so: Integer_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ASNMP/asnmp/integer.h \ - $(ACE_ROOT)/ASNMP/asnmp/smival.h \ - $(ACE_ROOT)/ASNMP/asnmp/smi.h \ - test_config.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl - -.obj/Octet_Test.o .obj/Octet_Test.so .shobj/Octet_Test.o .shobj/Octet_Test.so: Octet_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ASNMP/asnmp/octet.h \ - $(ACE_ROOT)/ASNMP/asnmp/smival.h \ - $(ACE_ROOT)/ASNMP/asnmp/smi.h \ - test_config.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl - -.obj/Gauge_Test.o .obj/Gauge_Test.so .shobj/Gauge_Test.o .shobj/Gauge_Test.so: Gauge_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ASNMP/asnmp/gauge.h \ - $(ACE_ROOT)/ASNMP/asnmp/integer.h \ - $(ACE_ROOT)/ASNMP/asnmp/smival.h \ - $(ACE_ROOT)/ASNMP/asnmp/smi.h \ - test_config.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl - -.obj/Address_Test.o .obj/Address_Test.so .shobj/Address_Test.o .shobj/Address_Test.so: Address_Test.cpp \ - $(ACE_ROOT)/ASNMP/asnmp/address.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ASNMP/asnmp/smival.h \ - $(ACE_ROOT)/ASNMP/asnmp/smi.h \ - $(ACE_ROOT)/ASNMP/asnmp/octet.h \ - test_config.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i - -.obj/Target_Test.o .obj/Target_Test.so .shobj/Target_Test.o .shobj/Target_Test.so: Target_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ASNMP/asnmp/octet.h \ - $(ACE_ROOT)/ASNMP/asnmp/smival.h \ - $(ACE_ROOT)/ASNMP/asnmp/smi.h \ - $(ACE_ROOT)/ASNMP/asnmp/target.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ASNMP/asnmp/address.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ASNMP/asnmp/oid.h \ - test_config.h - -.obj/Varbind_Test.o .obj/Varbind_Test.so .shobj/Varbind_Test.o .shobj/Varbind_Test.so: Varbind_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ASNMP/asnmp/oid.h \ - $(ACE_ROOT)/ASNMP/asnmp/smival.h \ - $(ACE_ROOT)/ASNMP/asnmp/smi.h \ - $(ACE_ROOT)/ASNMP/asnmp/vb.h \ - $(ACE_ROOT)/ASNMP/asnmp/snmperrs.h \ - $(ACE_ROOT)/ASNMP/asnmp/timetick.h \ - $(ACE_ROOT)/ASNMP/asnmp/integer.h \ - $(ACE_ROOT)/ASNMP/asnmp/counter.h \ - $(ACE_ROOT)/ASNMP/asnmp/gauge.h \ - $(ACE_ROOT)/ASNMP/asnmp/ctr64.h \ - $(ACE_ROOT)/ASNMP/asnmp/octet.h \ - $(ACE_ROOT)/ASNMP/asnmp/address.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - test_config.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ASNMP/tests/Octet_Test.cpp b/ASNMP/tests/Octet_Test.cpp deleted file mode 100644 index 7aa032b5223..00000000000 --- a/ASNMP/tests/Octet_Test.cpp +++ /dev/null @@ -1,156 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Octet_Test.cpp -// -// = DESCRIPTION -// Test all the member functions of the OCTET class. An Object -// representing an ASN.1 Integer64 SMI OCTET STRING SYNTAX. -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ - -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - - -#include "ace/OS.h" -#include "asnmp/octet.h" -#include "test_config.h" - -ACE_RCSID(tests, Octet_Test, "$Id$") - -/* - OctetStr( const char *string, long size = -1); - OctetStr ( const OctetStr &octet); - ~OctetStr(); - - SmiUINT32 get_syntax(); - void set_data( const SmiBYTE* string, long int size = -1); - OctetStr& operator=( const char *string); - OctetStr& operator=( const OctetStr &octet); - - int operator==( const OctetStr &lhs, const OctetStr &rhs); - int operator!=( const OctetStr &lhs, const OctetStr &rhs); - int operator<( const OctetStr &lhs, const OctetStr &rhs); - int operator<=( const OctetStr &lhs,const OctetStr &rhs); - int operator>( const OctetStr &lhs, const OctetStr &rhs); - int operator>=( const OctetStr &lhs, const OctetStr &rhs); - int operator==( const OctetStr &lhs,const char *rhs); - int operator!=( const OctetStr &lhs,const char *rhs); - int operator<( const OctetStr &lhs,const char *rhs); - int operator<=( const OctetStr &lhs,char *rhs); - int operator>( const OctetStr &lhs,const char *rhs); - int operator>=( const OctetStr &lhs,const char *rhs); - OctetStr& operator+=( const SmiBYTE *a); - OctetStr& operator+=( const char c); - OctetStr& operator+=( const OctetStr& octetstr); - SmiBYTE& operator[]( int position); - int nCompare( const long n, const OctetStr &o) const; - size_t length() const ; - int valid() const; - SmiBYTE *data() const; - char *to_string(); - char *to_string_hex(); - SnmpSyntax *clone() const; - SnmpSyntax& operator=( SnmpSyntax &val); - */ - -static void TestOctet() -{ - char *str = "A test of octet strings...!@@#$%^&*()_+|~{}:,./<>?"; - OctetStr o1; - ACE_ASSERT(o1.valid() == 1); - ACE_ASSERT(o1.length() == 0); - ACE_ASSERT(o1.data() != (unsigned char *)0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Octet:o1(\"\") [%s]\n", - o1.to_string())); - o1.set_data((SmiBYTE *)str); - ACE_ASSERT(!ACE_OS::strcmp(str, (char *)o1.data())); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Octet:o1(\"str\") [%s]\n", - o1.to_string())); - - OctetStr o2(str); - ACE_ASSERT(o2.valid() == 1); - ACE_ASSERT(o2.data() != (unsigned char *)0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Octet:o2(\"str\") [%s]\n", - o2.to_string())); - - OctetStr o3(str, 4); // test setting less than full string length - ACE_ASSERT(o3.valid() == 1); - ACE_ASSERT(o3.length() == 4); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Octet:o3(\"A te\") [%s]\n", - o3.to_string())); - - OctetStr o4(o3); // test setting less than full string length - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Octet:o4(\"A te\") [%s]\n", - o4.to_string())); - ACE_ASSERT(o4.valid() == 1); - ACE_ASSERT(o4.length() == 4); - - OctetStr o5; - o5 = str; - ACE_ASSERT(o5.valid() == 1); - ACE_ASSERT(o5.length() == ACE_OS::strlen(str)); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Octet:o5(\"str\") [%s]\n", - o5.to_string())); - - OctetStr o6; - o6 = o5; - ACE_ASSERT(o6.valid() == 1); - ACE_ASSERT(o5.length() == o6.length()); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Octet:o6(\"str\") [%s]\n", - o6.to_string())); - - o6 += o3; - o6 = ""; - o6 += str; - o6 += '#'; - ACE_ASSERT(o6[0] == (SmiBYTE) 'A'); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Octet:o6(\"str\") [%s]\n", - o6.to_string())); - - ACE_ASSERT(!(o3 < o3)); - ACE_ASSERT(!(o3 > o3)); - ACE_ASSERT(o3 >= o3); - ACE_ASSERT(o3 <= o3); - ACE_ASSERT(o3 == o3); - ACE_ASSERT(!(o3 != o3)); - -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("Octet_Test"); - - TestOctet(); - ACE_END_TEST; - return 0; -} diff --git a/ASNMP/tests/Oid_Test.cpp b/ASNMP/tests/Oid_Test.cpp deleted file mode 100644 index c195b0a7105..00000000000 --- a/ASNMP/tests/Oid_Test.cpp +++ /dev/null @@ -1,181 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// Oid_Test.cpp -// -// = DESCRIPTION -// Test all the member functions of the Oid class. An Object -// representing an ASN.1 Integer64 SMI OID SYNTAX. -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - -#include "ace/OS.h" -#include "asnmp/oid.h" -#include "test_config.h" - -ACE_RCSID(tests, Oid_Test, "$Id$") - -/* - Oid( const char * dotted_oid_string = "", size_t size = -1); - Oid ( const Oid &oid); - Oid(const unsigned long *raw_oid, size_t oid_len); - ~Oid(); - - SmiUINT32 get_syntax(); - Oid& operator=( const Oid &oid); - int operator==( const Oid &lhs,const Oid &rhs); - int operator!=( const Oid &lhs,const Oid &rhs); - int operator<( const Oid &lhs,const Oid &rhs); - int operator<=( const Oid &lhs,const Oid &rhs); - int operator>( const Oid &lhs,const Oid &rhs); - int operator>=( const Oid &lhs,const Oid &rhs); - Oid& operator+=( const char *a); - Oid& operator+=( const unsigned long i); - Oid& operator+=( const Oid &o); - unsigned long & operator[]( size_t position); - SmiLPOID oidval(); - void set_data( const char *dotted_oid_string); - void set_data( const unsigned long *raw_oid, const size_t oid_len); - size_t length() const; - void trim( const size_t how_many = 1); - int suboid( const size_t start, const size_t end, Oid& new_oid); - int left_comparison( const unsigned long n, const Oid &o) const; - int right_comparison( const unsigned long n, const Oid &o) const; - int valid() const; - char *to_string(); - SnmpSyntax *clone() const; - SnmpSyntax& operator=( SnmpSyntax &val); - */ - -static void OidTest() -{ - Oid d1; - ACE_ASSERT(d1.valid() == 0); - ACE_ASSERT(d1.length() == 0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Oid:d1(\"\") [%s]\n", - d1.to_string())); - - Oid d2("1.2.3"); - ACE_ASSERT(d2.valid() == 1); - ACE_ASSERT(d2.length() == 3); - ACE_ASSERT(d2[0] == (unsigned long) 1); - ACE_ASSERT(d2[1] == (unsigned long) 2); - ACE_ASSERT(d2[2] == (unsigned long) 3); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Oid:d2(\"1.2.3\") [%s]\n", - d2.to_string())); - - Oid d3(d2); - ACE_ASSERT(d3.valid() == 1); - ACE_ASSERT(d3.length() == 3); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Oid:d3(\"d2\") [%s]\n", - d3.to_string())); - - unsigned long t[3] = {2,3,4}; - Oid d4((unsigned long *)&t, sizeof(t)/sizeof(long)); - ACE_ASSERT(d4.valid() == 1); - ACE_ASSERT(d4.length() == 3); - ACE_ASSERT(d4[0] == (unsigned long) 2); - ACE_ASSERT(d4[1] == (unsigned long) 3); - ACE_ASSERT(d4[2] == (unsigned long) 4); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Oid:d4(\"long(2.3.4)\") [%s]\n", - d4.to_string())); - - // suboid - Oid d5; - ACE_ASSERT(d4.suboid(d5, 1,1) == 0); // 2,3,4, 1,1 == 3 - ACE_ASSERT(d5.length() == 1); - ACE_ASSERT(d5.valid() == 1); - ACE_ASSERT(d5[0] == 3); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Oid:d6::suboid(d5,1,1) [%s]\n", - d5.to_string())); - - // trim - Oid d7(d4); - ACE_ASSERT(d7.valid() == 1); - d7.trim(); - ACE_ASSERT(d7.length() == d4.length() -1); - - // compare methods - ACE_ASSERT(d7.left_comparison( d7.length(), d7) == 0); - ACE_ASSERT(d4.right_comparison( d4.length(), d4) == 0); - - // assignment - d1 = d4; - ACE_ASSERT(d1.valid() == 1); - ACE_ASSERT(d1 == d4); - d2 = "5.6.7"; - ACE_ASSERT(d2.valid() == 1); - ACE_ASSERT(d2[2] == (unsigned long) 7); - d1 = "8.9.10"; - ACE_ASSERT(d1.valid() == 1); - - // concat - unsigned long ll = ULONG_MAX; - d1 = ""; - d1 += (unsigned long)0; - d1 += ll; - d1 += ll; - d1 += "0"; - ACE_ASSERT(d1.valid() == 1); - ACE_ASSERT(d1.length() == 4); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Oid:d1(0,max,max,0) [%s]\n", - d1.to_string())); - ACE_ASSERT(d1[0] == (unsigned long)0); - ACE_ASSERT(d1[1] == ll); - ACE_ASSERT(d1[2] == ll); - ACE_ASSERT(d1[3] == (unsigned long)0); - - d2 += d1; - ACE_ASSERT(d2.valid() == 1); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Oid:(5.6.7.8.9.10) [%s]\n", - d2.to_string())); - - // test out max Oid string... - - // relational operators oid,oid - ACE_ASSERT(d2 == d2); - ACE_ASSERT(!(d2 != d2)); - ACE_ASSERT(!(d2 < d2)); - ACE_ASSERT(!(d2 > d2)); - ACE_ASSERT(d2 >= d2); - ACE_ASSERT(d2 <= d2); - -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("Oid_Test"); - OidTest(); - ACE_END_TEST; - return 0; -} diff --git a/ASNMP/tests/Target_Test.cpp b/ASNMP/tests/Target_Test.cpp deleted file mode 100644 index dbbc848e401..00000000000 --- a/ASNMP/tests/Target_Test.cpp +++ /dev/null @@ -1,147 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Target_Test.cpp -// -// = DESCRIPTION -// Test all the member functions of the Target class. -// Not sure if this object is really required or not in the new framework -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ - -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - - -#include "ace/OS.h" -#include "asnmp/octet.h" -#include "asnmp/target.h" -#include "test_config.h" - -ACE_RCSID(tests, Target_Test, "$Id$") - -/* - Percieved Problems with this CTarget aka UdpTarget Interface: - - 1) can't set snmp version during constructor (default value?) - 2) doesn't use ANSI C++ String class (still uses char *) - 3) Makes it easy to mix up read and write comm strs (could be diff types) - 3) so many get/set's, leads one to rethink the design/use of UdpTarget - 4) Use of resolve_to_C smells like a HACK... - 5) No valid() member function returns 1 even if no address given.. - 6) No to_string()?! (Fixed) - 7) can't access retry, timeout parameters... - 8) can't assign or equate two UdpTargets - - UdpTarget( void); - UdpTarget( const Address &address); - UdpTarget( const UdpTarget &target); - UdpTarget( const Address &address, // address - const char *read_community_name, // read community name - const char *write_community_name); // write community name - UdpTarget( const Address &address, // address - const OctetStr &read_community_name, // read community - const OctetStr &write_community_name); // write community - ~UdpTarget(); - - SnmpTarget *clone() const; - void get_readcommunity( OctetStr& read_community_oct); - void set_readcommunity( const OctetStr& read_community); - void get_writecommunity( OctetStr &write_community_oct); - void set_writecommunity( const OctetStr& write_community); - void get_address( UdpAddress & address); - int set_address( Address &address); - snmp_version get_version(); - void set_version( const snmp_version v); - - UdpTarget& operator=( const UdpTarget& target); - friend int operator==( const UdpTarget &lhs, const UdpTarget &rhs); - - */ - -static void TestSnmpTarget() -{ - OctetStr rd("rd_comm"), wr("wr_comm"); - ACE_ASSERT(rd.valid() == 1); - ACE_ASSERT(wr.valid() == 1); - char *crd = "rd_comm", *cwr = "wr_comm"; - - // constructor and get tests - UdpAddress ga; - ACE_ASSERT(ga.valid() == 0); - - UdpTarget c1; - ACE_ASSERT(c1.valid() == 0); - OctetStr a, b("public"), c("private"); - c1.get_read_community(a); - ACE_ASSERT(a == b); - c1.get_write_community(a); - ACE_ASSERT(a == c); - c1.get_address (ga); - ACE_ASSERT(c1.get_version() == version1); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpTarget:c1(\"\") [%s]\n", - c1.to_string())); - - IpAddress ip("127.0.0.1"); - UdpTarget c2(ip); - ACE_ASSERT(c2.valid() == 1); - c2.get_address (ga); - ACE_ASSERT(ga.valid() == 1); - ACE_ASSERT(c2.get_version() == version1); - ACE_ASSERT(ga.valid() == 1); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpTarget:c2(\"\") [%s]\n", - c2.to_string())); - - UdpTarget *c5 = new UdpTarget(c2); - ACE_ASSERT(c5 != 0); - ACE_ASSERT(c5->valid() == 1); - c5->get_address (ga); - ACE_ASSERT(ga.valid() == 1); - ACE_ASSERT(c5->get_version() == version1); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpTarget:c5(\"\") [%s]\n", - c5->to_string())); - delete c5; - -// these are not supported yet -// ACE_ASSERT(c5 == c5); -// c5 = c2; -// ACE_ASSERT(c5 == c2); -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("Target_Test"); - TestSnmpTarget(); - - ACE_END_TEST; - return 0; -} diff --git a/ASNMP/tests/Varbind_Test.cpp b/ASNMP/tests/Varbind_Test.cpp deleted file mode 100644 index 0491543f0e7..00000000000 --- a/ASNMP/tests/Varbind_Test.cpp +++ /dev/null @@ -1,195 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// asnmp -// -// = FILENAME -// Varbind_Test.cpp -// -// = DESCRIPTION -// Test all the member functions of the Varbind class. -// A varbind is a list of { oids and associated values } -// -// = AUTHOR -// Michael R. MacFaden -// -// ============================================================================ - -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -Copyright 1997 Cisco Systems, Inc. - -Permission to use, copy, modify, and distribute this software for any -purpose and without fee is hereby granted, provided that this -copyright and permission notice appear on all copies of the software and -supporting documentation, the name of Cisco Systems, Inc. not be used -in advertising or publicity pertaining to distribution of the -program without specific prior permission, and notice be given -in supporting documentation that modification, copying and distribution is by -permission of Cisco Systems, Inc. - -Cisco Systems, Inc. makes no representations about the suitability of this -software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' -AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT -LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE -LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE -SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL -DAMAGES. --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - - -#include "ace/OS.h" -#include "asnmp/oid.h" -#include "asnmp/vb.h" -#include "test_config.h" - -ACE_RCSID(tests, Varbind_Test, "$Id$") - -/* - Vb( void); - Vb( const Oid &oid); - Vb( const Vb &vb); - Vb( const Oid& vb, const SnmpSyntax &val, const SmiUINT32=SNMP_CLASS_SUCCESS); - ~Vb(); - int valid() const; - Vb& operator=( const Vb &vb); - void set_oid( const Oid& oid); - void get_oid( Oid &oid) const; - void set_null(); - void set_value( const TimeTicks& ticks); - void set_value( const Oid& oid); - void set_value( const Counter32& ctr); - void set_value( const Counter64& ctr); - void set_value( const Gauge32& ctr); - void set_value( const SnmpUInt32& ctr); - void set_value( const SnmpInt32& ctr); - void set_value( const OctetStr& oct_str); - int get_value( TimeTicks& ticks); - int get_value( Oid& oid); - int get_value( Counter32& ctr); - int get_value( Counter64& ctr); - int get_value( Gauge32& ctr); - int get_value( SnmpUInt32& ctr); - int get_value( SnmpInt32& ctr); - int get_value( OctetStr& oct_str); - int get_value( SnmpSyntax &val); - void set_value( const SnmpSyntax &val); - int get_value( const SnmpSyntax &val); - SmiUINT32 get_syntax(); - friend void set_exception_status( Vb *vb, const SmiUINT32 status); - char *to_string(); - char *to_string_value(); - char *to_string_oid(); - */ - -static void VbTest() -{ - Vb v1; - ACE_ASSERT(v1.valid() == 0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) VarBinad:v1(\"/\") [%s]\n", - v1.to_string())); - - // purpose of this routine?? - set_exception_status( &v1, 10); - - Vb v2(v1); - ACE_ASSERT(v2.valid() == 0); - Oid o1("1.2.3"), o2; - v2.set_oid(o1); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) VarBinad:v2(\"1.2.3/\") [%s]\n", - v2.to_string())); - - v2.get_oid(o2); - ACE_ASSERT(o2 == o1); - ACE_ASSERT(v2.valid() == 0); - v2.set_null(); - ACE_ASSERT(v2.valid() == 0); - v2.get_oid(o2); - - Vb v3; - TimeTicks t(0), t1; - v3.set_oid(o1); - v3.set_value(t); - ACE_ASSERT(v3.valid() == 1); - v3.get_value(t1); - ACE_ASSERT(t == t1); - - Vb v4; - v4.set_oid(o1); - v4.set_value(o1); - ACE_ASSERT(v4.valid() == 1); - v4.get_value(o2); - ACE_ASSERT(o1 == o2); - - Vb v5; - Counter32 c1(12), c2; - v5.set_oid(o1); - v5.set_value(c1); - ACE_ASSERT(v5.valid() == 1); - v5.get_value(c2); - ACE_ASSERT(c1 == c2); - - Vb v6; - Counter64 c3(12345678901234ULL), c4; - v6.set_oid(o1); - v6.set_value(c3); - ACE_ASSERT(v6.valid() == 1); - v6.get_value(c4); - ACE_ASSERT(c3 == c4); - - Vb v7; - Gauge32 g1(0123456), g2; - v7.set_oid(o1); - v7.set_value(g1); - ACE_ASSERT(v7.valid() == 1); - v7.get_value(g2); - ACE_ASSERT(g1 == g2); - - Vb v8; - SnmpInt32 i1(0123456), i2; - v8.set_oid(o1); - v8.set_value(i1); - ACE_ASSERT(v8.valid() == 1); - v8.get_value(i2); - ACE_ASSERT(i1 == i2); - - Vb v9; - SnmpUInt32 u1(0123456), u2; - v9.set_oid(o1); - v9.set_value(u1); - ACE_ASSERT(v9.valid() == 1); - v9.get_value(u2); - ACE_ASSERT(u1 == u2); - - Vb v10; - OctetStr s1(" abcdefghighlmnopqrstuvwxyz!@#$%^&*()"), s2; - v10.set_oid(o1); - v10.set_value(s1); - ACE_ASSERT(v10.valid() == 1); - v10.get_value(s2); - ACE_ASSERT(s1 == s2); - ACE_ASSERT(s1.length() == s2.length()); - - // test assignment over all datatypes - v10 = v5; - ACE_ASSERT(v10 == v5); - - - Vb v11(o1, s1, SNMP_CLASS_SUCCESS); - ACE_ASSERT(v11.valid() == 1); - v11.get_oid(o2); - ACE_ASSERT(o1 == o2); - v11.get_value(s2); - ACE_ASSERT(s1 == s2); -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("VbTest"); - VbTest(); - ACE_END_TEST; - return 0; -} diff --git a/ASNMP/tests/run_tests.bat b/ASNMP/tests/run_tests.bat deleted file mode 100644 index 985f88b51db..00000000000 --- a/ASNMP/tests/run_tests.bat +++ /dev/null @@ -1,44 +0,0 @@ -@echo off -rem To use this either give it no arguments to run all the tests or -rem pass it the test name (without the extention) to run only one -rem test - -if not "%1" == "" goto runtest - -call run_tests - -call run_tests Address_Test -call run_tests Counter64_Test -call run_tests Counter_Test -call run_tests Gauge_Test -call run_tests Integer_Test -call run_tests Octet_Test -call run_tests Oid_Test -call run_tests Target_Test -call run_tests Varbind_Test - -goto done - -:runtest - -echo Running %1 -%1.exe -if errorlevel 0 goto fine -echo. -echo %1 has FAILED!!! -echo. -type %temp%\log\%1.log | find /I "assertion failed" -type %temp%\log\%1.log | find /I "not supported" -type %temp%\log\%1.log | find /I "no such file or directory" -type %temp%\log\%1.log | find /I "invalid argument" -type %temp%\log\%1.log | find /I "timeout" -type %temp%\log\%1.log | find /I "bad file number" -echo. - -goto done -:fine - -rem We should check the log files here to make sure the test ended correctly -rem type %temp%\log\%1.log | find "Ending" - -:done diff --git a/ASNMP/tests/run_tests.sh b/ASNMP/tests/run_tests.sh deleted file mode 100755 index c8d911c184c..00000000000 --- a/ASNMP/tests/run_tests.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# This is the UNIX version of the one-button ACE tests. -# Contributed by Michael Rueger -# mrm@cisco.com - Change to for loop script could be more generic if we put -# this in the bin dir and fed it a file to read from - -IFS="|" -tmp=/tmp - -# these patterns should not be included in log file -ERROR_MSGS="assertion failed|not supported|No such file or directory|Invalid argument|timeout|Bad file number" - -# these patterns must be included in log file -SUCCESS_MSGS="starting|Ending" - -run() -{ - echo running $1 - /bin/rm -f core - - ./$1 - status=$? - - if [ $status -ne 0 ]; then - echo \"$1\" FAILED with exit status $status!!!! - fi - - if [ -f core ]; then - echo \"$1\" dumped core!!!! - fi - - for i in $SUCCESS_MSGS; do - grep $i log/$1.log >/dev/null - if [ $? -eq 1 ]; then - echo Error in log file no line with $i - fi - done - - for i in $ERROR_MSGS; do - grep $i log/$1.log - done -} - -echo "Starting tests..." -FILES=`ls *_Test 2>/dev/null` - -if [ -z $FILES ]; then - echo "ERROR: no test programs generated matching pattern *_Test." - echo "ERROR: Try compiling the test programs first." - exit 1 -fi - -for i in *_Test -do - run $i -done - -echo "Tests complete..." - - -# EOF diff --git a/ASNMP/tests/test_config.h b/ASNMP/tests/test_config.h deleted file mode 100644 index 1eba5209a6e..00000000000 --- a/ASNMP/tests/test_config.h +++ /dev/null @@ -1,197 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// = FILENAME -// test_config.h -// -// = AUTHOR -// Prashant Jain , Tim Harrison -// , and David Levine -// -// ============================================================================ - -#ifndef ACE_TEST_CONFIG_H -#define ACE_TEST_CONFIG_H - -#include "ace/ACE.h" -#include "ace/Log_Msg.h" - -#include -#include - -#if !defined (ACE_HAS_TEMPLATE_SPECIALIZATION) -class KEY -// ============================================================================ -// = TITLE -// Define a key for use with the Map_Manager_Test. -// -// = DESCRIPTION -// This class is put into the test_config.h header file to work -// around AIX C++ compiler "features" related to template -// instantiation... It is only used by Map_Manager_Test.cpp -// ============================================================================ -{ -public: - KEY (size_t v = 0): value_ (v) - { } - - size_t hash (void) const { return this->value_; } - operator size_t () const { return this->value_; } - -private: - size_t value_; -}; -#else -typedef size_t KEY; -#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ - -#if defined (ACE_WIN32) - -#define ACE_DEFAULT_TEST_FILE ACE_TEXT ("C:\\temp\\ace_test_file") -#define ACE_TEMP_FILE_NAME ACE_TEXT ("C:\\temp\\ace_temp_file") -#define ACE_LOG_DIRECTORY ACE_TEXT ("C:\\temp\\log\\") -#define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) - -#else - -#define ACE_DEFAULT_TEST_FILE ACE_TEXT ("/tmp/ace_test_file") -#define ACE_TEMP_FILE_NAME ACE_TEXT ("/tmp/ace_temp_file") -#define ACE_LOG_DIRECTORY ACE_TEXT ("log/") -#define MAKE_PIPE_NAME(X) ACE_TEXT (X) - -#endif /* ACE_WIN32 */ - -#define ACE_START_TEST(NAME) \ - const char *program = NAME; \ - ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \ - if (ace_file_stream.set_output (program) != 0) \ - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set_output failed"), -1); \ - ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting %s test at %T\n", program)); - -#define ACE_END_TEST \ - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Ending %s test at %T\n", program)); \ - ace_file_stream.close (); - -#define ACE_NEW_THREAD \ -do {\ - ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ()); \ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); \ - ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); \ -} while (0) - -#define ACE_APPEND_LOG(NAME) \ - const char *program = NAME; \ - ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \ - if (ace_file_stream.set_output (program, 1) != 0) \ - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set_output failed"), -1); \ - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting %s test at %T\n", program)); - -#define ACE_END_LOG \ - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Ending %s test at %T\n\n", program)); \ - ace_file_stream.close (); - -#define ACE_INIT_LOG(NAME) \ - char temp[BUFSIZ]; \ - ACE_OS::sprintf (temp, "%s%s%s", \ - ACE_LOG_DIRECTORY, \ - ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR), \ - ".log"); \ - ACE_DEBUG ((LM_DEBUG, "Deleting old log file %s (if any)\n\n", temp)); \ - ACE_OS::unlink (temp); - - -const int ACE_NS_MAX_ENTRIES = 1000; -const int ACE_MAX_TIMERS = 4; -const int ACE_MAX_THREADS = 4; -const int ACE_MAX_DELAY = 10; -const int ACE_MAX_INTERVAL = 0; -const int ACE_MAX_ITERATIONS = 10; -const int ACE_MAX_PROCESSES = 10; - -char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; - -class ACE_Test_Output -{ -public: - ACE_Test_Output (void); - ~ACE_Test_Output (void); - int set_output (const char *filename, int append = 0); - ofstream *output_file (void); - void close (void); - -private: - ofstream output_file_; -}; - -static ACE_Test_Output ace_file_stream; - -ACE_Test_Output::ACE_Test_Output (void) -{ -} - -ACE_Test_Output::~ACE_Test_Output (void) -{ -} - -int -ACE_Test_Output::set_output (const char *filename, int append) -{ - char temp[BUFSIZ]; - // Ignore the error value since the directory may already exist. - ACE_OS::mkdir (ACE_LOG_DIRECTORY); - ACE_OS::sprintf (temp, "%s%s%s", - ACE_LOG_DIRECTORY, - ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR), - ".log"); - - int flags = ios::out; - if (append) - flags |= ios::app; - - this->output_file_.open (temp, flags); - if (this->output_file_.bad ()) - return -1; - - ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ()); - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); - ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); - - return 0; -} - -ofstream * -ACE_Test_Output::output_file (void) -{ - return &this->output_file_; -} - -void -ACE_Test_Output::close (void) -{ - this->output_file_.flush (); - this->output_file_.close (); -} - -void -randomize (int array[], size_t size) -{ - size_t i; - - for (i = 0; i < size; i++) - array [i] = i; - - ACE_OS::srand (ACE_OS::time (0L)); - - // Generate an array of random numbers from 0 .. size - 1. - - for (i = 0; i < size; i++) - { - int index = ACE_OS::rand() % size--; - int temp = array [index]; - array [index] = array [size]; - array [size] = temp; - } -} - -#endif /* ACE_TEST_CONFIG_H */ diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index b8223e0fa10..00000000000 --- a/AUTHORS +++ /dev/null @@ -1,11 +0,0 @@ -Douglas C. Schmidt -schmidt@uci.edu - -Associate Professor & -Head of the Distributed Object Computing Laboratory - -616E Engineering Tower -Department of Electrical and Computer Engineering -University of California, Irvine -Irvine, CA 92697-2625 - diff --git a/COPYING b/COPYING deleted file mode 100644 index e606f0fb107..00000000000 --- a/COPYING +++ /dev/null @@ -1,90 +0,0 @@ - - _________________________________________________________________ - - Copyright and Licensing Information for ACE(TM) and TAO(TM) - - [1]ACE(TM) and [2]TAO(TM) are copyrighted by [3]Douglas C. Schmidt and - his [4]research group at [5]Washington University, Copyright (c) - 1993-2003, all rights reserved. Since ACE and TAO are [6]open source, - [7]free software, you are free to use, modify, and distribute the ACE - and TAO source code and object code produced from the source, as long - as you include this copyright statement along with code built using - ACE and TAO. - - In particular, you can use ACE and TAO in proprietary software and are - under no obligation to redistribute any of your source code that is - built using ACE and TAO. Note, however, that you may not do anything - to the ACE and TAO code, such as copyrighting it yourself or claiming - authorship of the ACE and TAO code, that will prevent ACE and TAO from - being distributed freely using an open source development model. - - ACE and TAO are provided as is with no warranties of any kind, - including the warranties of design, merchantibility and fitness for a - particular purpose, noninfringement, or arising from a course of - dealing, usage or trade practice. Moreover, ACE and TAO are provided - with no support and without any obligation on the part of Washington - University, its employees, or students to assist in its use, - correction, modification, or enhancement. However, commercial support - for ACE and TAO are available from [8]Riverace and [9]OCI, - respectively. Moreover, both ACE and TAO are Y2K-compliant, as long as - the underlying OS platform is Y2K-compliant. - - Washington University, its employees, and students shall have no - liability with respect to the infringement of copyrights, trade - secrets or any patents by ACE and TAO or any part thereof. Moreover, - in no event will Washington University, its employees, or students be - liable for any lost revenue or profits or other special, indirect and - consequential damages. - - The [10]ACE and [11]TAO web sites are maintained by the [12]Center for - Distributed Object Computing of Washington University for the - development of open source software as part of the [13]open source - software community. By submitting comments, suggestions, code, code - snippets, techniques (including that of usage), and algorithms, - submitters acknowledge that they have the right to do so, that any - such submissions are given freely and unreservedly, and that they - waive any claims to copyright or ownership. In addition, submitters - acknowledge that any such submission might become part of the - copyright maintained on the overall body of code, which comprises the - [14]ACE and [15]TAO software. By making a submission, submitter agree - to these terms. Furthermore, submitters acknowledge that the - incorporation or modification of such submissions is entirely at the - discretion of the moderators of the open source ACE and TAO projects - or their designees. - - The names ACE - (TM), TAO(TM), and Washington University may not be used to endorse or - promote products or services derived from this source without express - written permission from Washington University. Further, products or - services derived from this source may not be called ACE(TM) or - TAO(TM), nor may the name Washington University appear in their names, - without express written permission from Washington University. - - If you have any suggestions, additions, comments, or questions, please - let [16]me know. - - [17]Douglas C. Schmidt - _________________________________________________________________ - - Back to the [18]ACE home page. - -References - - 1. http://www.cs.wustl.edu/~schmidt/ACE.html - 2. http://www.cs.wustl.edu/~schmidt/TAO.html - 3. http://www.cs.wustl.edu/~schmidt/ - 4. http://www.cs.wustl.edu/~schmidt/ACE-members.html - 5. http://www.wustl.edu/ - 6. http://www.opensource.org/ - 7. http://www.gnu.org/ - 8. http://www.riverace.com/ - 9. file://localhost/home/cs/faculty/schmidt/.www-docs/www.ociweb.com - 10. http://www.cs.wustl.edu/~schmidt/ACE.html - 11. http://www.cs.wustl.edu/~schmidt/TAO.html - 12. http://www.cs.wustl.edu/~schmidt/doc-center.html - 13. http://www.opensource.org/ - 14. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html - 15. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html - 16. mailto:schmidt@cs.wustl.edu - 17. http://www.cs.wustl.edu/~schmidt/ - 18. file://localhost/home/cs/faculty/schmidt/.www-docs/ACE.html diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 35336e77814..00000000000 --- a/ChangeLog +++ /dev/null @@ -1,2324 +0,0 @@ -Thu Apr 10 14:14:17 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Allow assignments that are specific to a particular project type. - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Fixed a bug in the template where 'libs' is not used but - 'lit_libs' is. The 'lit_libs' wouldn't show up. - -Thu Apr 10 15:35:00 2003 Gautam Thaker - - * ace/Makefile.ace ace/OS.h ace/SOCK_Connector.cpp: - * ace/SOCK_Connector.h ace/SOCK_SEQPACK_Acceptor.h: - * ace/ace_dll.dsp ace/RMCast/Makefile: - * performance-tests/Makefile tests/Makefile: - * tests/run_test.lst tests/run_tests.bat: - * tests/RMCast/Makefile bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - * include/makeinclude/platform_linux.GNU: - * include/makeinclude/wrapper_macros.GNU: - - Above files modified. - - * ace/Multihomed_INET_Addr.cpp ace/Multihomed_INET_Addr.h: - * ace/Multihomed_INET_Addr.i ace/SOCK_SEQPACK_Acceptor.cpp: - * ace/SOCK_SEQPACK_Acceptor.i ace/SOCK_SEQPACK_Association.cpp: - * ace/SOCK_SEQPACK_Association.h: - * ace/SOCK_SEQPACK_Association.i: - * ace/SOCK_SEQPACK_Connector.cpp ace/SOCK_SEQPACK_Connector.h: - * ace/SOCK_SEQPACK_Connector.i performance-tests/SCTP/Makefile: - * performance-tests/SCTP/Options_Manager.cpp: - * performance-tests/SCTP/Options_Manager.h: - * performance-tests/SCTP/README: - * performance-tests/SCTP/README.SCTP: - * performance-tests/SCTP/README.SCTP_PERF_TEST: - * performance-tests/SCTP/README.SCTP_in_ACE: - * performance-tests/SCTP/SCTP.dsw: - * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp: - * performance-tests/SCTP/SOCK_SEQPACK_clt.dsp: - * performance-tests/SCTP/SOCK_SEQPACK_srv.cpp: - * performance-tests/SCTP/SOCK_SEQPACK_srv.dsp: - * performance-tests/SCTP/SOCK_STREAM_clt.cpp: - * performance-tests/SCTP/SOCK_STREAM_clt.dsp: - * performance-tests/SCTP/SOCK_STREAM_srv.cpp: - * performance-tests/SCTP/SOCK_STREAM_srv.dsp: - * performance-tests/SCTP/THANKS: - * performance-tests/SCTP/hist.cpp: - * performance-tests/SCTP/hist.h: - * performance-tests/SCTP/run_spectrum.config: - * performance-tests/SCTP/run_spectrum.pl: - * performance-tests/SCTP/sample-spectrum.png: - * tests/Multihomed_INET_Addr_Test.cpp: - * tests/Multihomed_INET_Addr_Test.dsp: - * tests/SOCK_SEQPACK_Association_Test.cpp: - * tests/SOCK_SEQPACK_Association_Test.dsp: - - Above files added. - - Jason Cohen : - First SCTP checkin for ACE. The major contrib of this - checkin include the SOCK_SEQPACK classes, Multihomed_INET_Addr, - SCTP performance tests, and READMEs. - -Thu Apr 10 09:41:13 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm: - - Forgot to change the usage of GNUProjectCreator to - GNUACEProjectCreator. - -Thu Apr 10 06:52:41 2003 Chad Elliott - - * bin/MakeProjectCreator/USAGE: - * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm: - * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm: - * bin/mpc.pl: - * bin/mwc.pl: - - Renamed GNU to GNUACE to indicate that the projects will only work - within ACE. - - * bin/MakeProjectCreator/modules/GNUProjectCreator.pm: - * bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm: - - Removed these files in the rename. - -Thu Apr 10 13:02:42 CEST 2003 Oliver Kellogg - - * tests/tests.{dsw,icp}: Added Unbounded_Set_Test_Ex. - - * tests/Unbounded_Set_Test_Ex.{dsp,icc}: New. - - Please bear with me, these changes were made "blindly", i.e. - I don't have access to those build environments. - -Thu Apr 10 09:51:59 2003 Johnny Willemsen - - * include/makeinclude/wrapper_macros.GNU: - Improved Kylix specific rules. For Kylix we strip the -l in from - ACE_SHLIBS and prefix it with lib and postfix with .so. - -Thu Apr 10 08:12:22 2003 Johnny Willemsen - - * include/makeinclude/platform_linux_borland.GNU: - Improved this file for Kylix support. - -Thu Apr 10 07:47:12 2003 Johnny Willemsen - - * examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp: - Fixed compile error with GNU. - -Wed Apr 9 14:10:42 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/templates/make.mpd: - - Added an install target and fixed a bug with nested makefiles. - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Fixed a bug with 'requires' and 'avoids' when building libraries. - -Wed Apr 9 13:39:20 2003 Stuart Jones - - * ace/DLL_Manager.cpp: - - Added check for NULL pointer in close method. The instance - method for the ACE_Framework_Repository class can return - NULL if the Object Manager is starting up, or shutting down - and the singleton hadn't been created. This was causing a - SEGV in a later pthread_mutex_lock (DOC Bug# 1479) - -Wed Apr 9 17:11:12 UTC 2003 Johnny Willemsen and me. Improves VxWorks 5.5, MingW, Cygwin - and Kylix support. - - * ACE-INSTALL.html: - Updated for VxWorks 5.5 and documented how to use BCB with SSL. - - * Makefile.bor: - Removed build variable nightlybuild because we don't need it - anymore. - - * ace/Based_Pointer_Repository.cpp: - * ace/Dynamic.cpp: - For VxWorks also explicit instantiate static template member. This - fixes unresolved externals when using implicit templates. - - * ace/Event_Handler_T.i (get_handle ): - In case of an error, return ACE_INVALID_HANDLE and not -1 because - -1 causes problems with MingW and is not portable. - - * ace/Log_Msg_NT_Event_Log.cpp: - * ace/Log_Msg_NT_Event_Log.h: - * ace/README: - * ace/config-doxygen.h: - * ace/config-win32-common.h: - For the WinNT event log backend added a new define called - ACE_HAS_LOG_MSG_NT_EVENT_LOG. This is set in the doxygen file to - generate documentation for it. This makes it possible to generate - the documentation and to better specify to use the WinNT event log - backend or not. - - * ace/Date_Time.{h,i}: - Added a constructor to initialize an ACE_Date_Time with an - ACE_Time_Value. - - * ace/Module.h: - Improved doxygen documentation. - - * ace/config-win32-mingw.h: - Require win32api version 2.0 or later and removed Win32 API - definitions because older versions of win32api lacked these. - - * apps/drwho/Makefile: - Don't build drwho with MingW and Cygwin. - - * examples/Reactor/Misc/test_event_handler_t.cpp (signal_handler): - Signum should be an int instead of an ACE_HANDLE. - - * examples/Reactor/Ntalker/ntalker.cpp: - Changed argument interface to a_interface because interface is a - macro with MinGW. - - * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp: - * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp: - * examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp: - Modified code so that when SystemV IPC isn't supported this is - printed, else the code is build normally. Fixes Cygwin and MinGW - compile problems. - - * include/makeinclude/platform_cygwin32.GNU: - * include/makeinclude/platform_mingw32.GNU: - Disable auto import warnings. There is a bug in the MinGW/Cygwin - compiler and until that is fixed the warnings are wrong so we - disable. See these files for the link to the MinGW bugentry. - - * include/makeinclude/platform_g++_common.GNU: - Make sure that unrecognized compiler options are not set with - VxWorks 5.5. Fixes bugzilla entry [1452]. Thanks to Thomas Lockhart - for reporting this and sending the - fix. - - * include/makeinclude/platform_linux_borland.GNU: - Improved this file so that we better support the Kylix3 compiler. We - don't support it 100% but we can now build the ACE tests without - problems. Several also run but also several still have problems. - - * include/makeinclude/platform_sunos5_ghs.GNU: - * include/makeinclude/platform_sunos5_kcc.GNU: - Use explicit without double quotes to match other files. - - * include/makeinclude/platform_vxworks5.x_diab.GNU: - Set VSHDIR to $(VDIR) to make it possible to override it. - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - Set VSHDIR to $(VDIR) to make it possible to override it. Moved - include of platform_g++_common.GNU after the place where CXX is set - to resolve compiler problems. Also use explicit with double quotes - to match the other files, the result is that explicit template - instantiation is again the default to use. - - * include/makeinclude/rules.bin.GNU: - * include/makeinclude/rules.lib.GNU: - * include/makeinclude/wrapper_macros.GNU: - Improved and extended Kylix specific rules. For Kylix we strip the - -l in from of each shared library passed to the linker and prefix - with lib and postfix with .so. - - * tests/Time_Value_Test.cpp: - Test assignment operator of ACE_Time_Value. - -Wed Apr 9 15:51:32 UTC 2003 Don Hinton - - * ace/Malloc_Allocator.{i,cpp}: - - Uninlined ACE_New_Allocator::{malloc, calloc, free} () to - avoid the multiple heap problem on systems like Windows. - Thanks to Gonzalo Diethelm - for reporting the problem. This fixes bug [1464]. - -Wed Apr 09 17:04:01 2003 Simon McQueen - - * apps/mkcsregdb/mkcsregdb.dsp: Added missing library in release - configuration. - -Wed Apr 9 08:22:56 2003 Chad Elliott - - * bin/MakeProjectCreator/config/default.rel: - * bin/MakeProjectCreator/config/taoexe.mpb: - * bin/MakeProjectCreator/config/taolib.mpb: - * bin/MakeProjectCreator/config/vcfullmacros.mpt: - * bin/MakeProjectCreator/config/vcpartialmacros.mpt: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/GNUProjectCreator.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateInputReader.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/templates/em3vcpdll.mpt: - * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt: - * bin/MakeProjectCreator/templates/em3vcplib.mpt: - * bin/MakeProjectCreator/templates/em3vcplibexe.mpt: - * bin/MakeProjectCreator/templates/nmakedll.mpt: - * bin/MakeProjectCreator/templates/nmakeexe.mpt: - * bin/MakeProjectCreator/templates/va4icc.mpd: - * bin/MakeProjectCreator/templates/vc6dspdll.mpt: - * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt: - * bin/MakeProjectCreator/templates/vc6dsplib.mpt: - * bin/MakeProjectCreator/templates/vc6dsplibexe.mpt: - * bin/MakeProjectCreator/templates/vc7dll.mpt: - * bin/MakeProjectCreator/templates/vc7exe.mpt: - - Removed as much hard coded ACE and TAO related text and put it in - configuration files. - -Tue Apr 8 15:03:51 2003 Steve Huston - - * tests/tests.mpc: Added Unbounded_Set_Test_Ex. - -Tue Apr 8 13:29:05 2003 Chad Elliott - - * bin/MakeProjectCreator/templates/make.mpd: - - Take into account the possibility of using 'defaultlibs' or - 'lit_libs' without using 'libs'. - -Tue Apr 8 13:12:25 2003 Balachandran Natarajan - - * ace/Min_Max.h: #included config-all.h. This is needed for the - header file to be used succesfully. This fixes [BUG 1485 and - thanks to Paul Marquis for reporting this - problem. - -Tue Apr 08 17:01:02 2003 Simon McQueen - - * apps/mkcsregdb/mkcsregdb.dsp: Changed 'Use run time library' - setting to fix error in Release configuration. - -Tue Apr 8 06:50:38 2003 Chad Elliott - - * bin/MakeProjectCreator/templates/vc7.mpd: - - Removed the ProgramDataBaseFileName section. It seems to cause - build problems. - -Mon Apr 7 16:58:55 2003 Balachandran Natarajan - - * ace/Select_Reactor_Base.cpp (unbind): Fixed a subtle problem - during complete shutdown of the event handler. - - Problem: During the unbind () call we call handle_close () after - which we nullify the event handlers without much checks. This - dangerous if the application during the callback, - ie. handle_close () call registers a new handler with the - reactor. It is quite possible that the map is changed during - registration. - - Solution: We check whether the event handler's pointer in the - map and the one that was cached before calling handle_close () - are the same. - - Thanks to Kobi Cohen-Arazi" for reporting the - problem. - -Mon Apr 7 17:04:20 2003 Steve Huston - - * tests/Unbounded_Set_Test_Ex.cpp: Moved the definition of MyNode - to its own file, Unbounded_Set_Test_Ex.h to allow the - ever-cooperative AIX Visual Age C++ compiler to find the definition - when instantiating templates. Also changed the name of the - recorded log file to match the test name so the autobuild - log analysis can find it. - - * tests/run_test.lst: Added Unbounded_Set_Test_Ex. - -Mon Apr 7 12:27:25 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - If HASH and SCALAR values are mixed in a template foreach, then - remove the SCALAR values. - - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/make.mpd: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Try to make these templates less TAO focused. - - * bin/MakeProjectCreator/templates/em3vcpdll.mpt: - * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt: - * bin/MakeProjectCreator/templates/em3vcplib.mpt: - * bin/MakeProjectCreator/templates/em3vcplibexe.mpt: - * bin/MakeProjectCreator/templates/nmakedll.mpt: - * bin/MakeProjectCreator/templates/nmakeexe.mpt: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc6dspdll.mpt: - * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt: - * bin/MakeProjectCreator/templates/vc6dsplib.mpt: - * bin/MakeProjectCreator/templates/vc6dsplibexe.mpt: - * bin/MakeProjectCreator/templates/vc7dll.mpt: - * bin/MakeProjectCreator/templates/vc7exe.mpt: - - Began adding support for MFC projects. - -Sat Apr 5 11:23:11 2003 John Michael Zorko - - * include/makeinclude/platform_macosx.GNU (CXX): Mac OSX currently - uses 64 bits for long doubles, and Apple's gcc3.1 compiler - outputs a warning if long doubles are used (since they might - change to 96 or 128 bits in the future). In the meantime, the - following patch (also attached) turns off the warning. - -Fri Apr 4 10:49:29 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/StringProcessor.pm: - - Treat single quotes as special characters when creating arrays. - They now work similarly to double quotes. - -Fri Apr 4 09:22:25 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Allow mwc files to have scoped assignments that will only apply to - the mpc files within that scope. - -Thu Apr 03 17:20:32 2003 Pradeep Gore - - * bin/MakeProjectCreator/config/notifytest.mpb: - Changed target to TAO_NotifyTests. - * bin/tao_other_tests.lst: - Added TAO/orbsvcs/tests/Notify/Lanes/run_test.pl and - TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl - or RT_Notification. - -Thu Apr 3 11:24:35 2003 Balachandran Natarajan - - * bin/tao_orb_tests.lst: Added a new test for the daily builds. - -Thu Apr 3 08:20:12 2003 Johnny Willemsen - - * Kokyu/Default_Dispatcher_Impl.h: Fixed doxygen fuzz error - -Wed Apr 2 12:44:58 2003 Chad Elliott - - * include/makeinclude/platform_hpux_aCC.GNU: - * include/makeinclude/rules.lib.GNU: - - Added an AREXTRA macro that allows the user to add arbitrary text - at the end of the ar command. HP-UX aCC defines AR in a way that - causes build errors. AREXTRA is used to fix this build problem - and doesn't affect any other platform. - -Wed Apr 2 10:17:59 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - - Factored the dynamic and static accessors into this class from - WorkspaceCreator.pm. - - * bin/MakeProjectCreator/modules/Options.pm: - - Added a utility function which can be used to determine if an - option has been used. - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Use the factored dynamic and static accessors. - - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Added the functionality to track which projects have been - generated. If multiple workspaces with overlapping projects are - processed within the same process, it is able to skip the - re-generation of the overlapping projects. Also added the ability - to use "mwb" files as base project files. - -Wed Apr 2 08:49:51 2003 Chad Elliott - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Allow libraries to be built only if "requires" and "avoids" are - met. - -Wed Apr 2 11:51:52 CEST 2003 Oliver Kellogg - - * tests/Unbounded_Set_Test.cpp, tests/Unbounded_Set_Test_Ex.cpp: - - Zap extraneous trailing semicolons on #pragma instantiates. - -Wed Apr 2 11:44:41 CEST 2003 Oliver Kellogg - - * tests/Unbounded_Set_Test.cpp, tests/Unbounded_Set_Test_Ex.cpp: - - Add explicit template instantiations. - -Tue Apr 1 17:02:37 2003 Steve Huston - - * tests/Process_Strategy_Test.cpp: Nul-terminate received command - string to ACE_TEXT_CHAR_TO_TCHAR can deal with it; this is needed - to properly log the string in wide-char builds. - -Tue Apr 1 15:52:41 2003 Steve Huston - - * tests/Multicast_Test.cpp: If the platform doesn't support IP - multicast, log an info message, not an error. - -Tue Apr 1 10:06:57 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Driver.pm: - - Fixed a bug with multiple types and an mpc file specified with - a directory. The original file name was not being preserved. - -Tue Apr 1 16:02:30 CEST 2003 Oliver Kellogg - - * ace/Makefile.{am,bor}: Added Unbounded_Set_Ex. - -Tue Apr 1 13:42:37 CEST 2003 Oliver Kellogg - - * tests/Unbounded_Set_Test_Ex.cpp: New. - - This is a replica of Unbounded_Set_Test.cpp but uses the new - ACE_Unbounded_Set_Ex class instead of ACE_Unbounded_Set. - This is for side-by-side comparisons between the two tests. - - * tests/Makefile: Added Unbounded_Set_Test_Ex, updated dependencies. - - * tests/Makefile.{am,bor}: Added Unbounded_Set_Test_Ex. - -Tue Apr 1 12:48:33 CEST 2003 Oliver Kellogg - - * ace/Node.{h,cpp}: - - Added back the deleted_ member. - This sets the stage for the new Ace_Unbounded_Set_Ex class. - - * ace/Unbounded_Set_Ex.{h,inl,cpp}: New. - - This class is a variation on ACE_Unbounded_Set that fixes - Bugzilla bug 1460. - - * ace/Makefile.ace: Add Unbounded_Set_Ex. - -Mon Mar 31 14:04:22 2003 Phil Mesnier - - * ace/CDR_Stream.cpp: - * ace/CDR_Stream.h (ACE_OutputCDR): Provide an accessor method, - ACE_OutputCDR::wchar_maxbytes() for getting the stream size for - wide characters when no translator is involved. - - There was a problem reading wstrings when the maxbytes is less - than the size of a wchar_t. When the maxbytes value was 1, I was - using a static cast from a char to a wchar, which caused sign - propogation. Changing to assignment from an octet solved that. - - * ace/Codeset_Registry_db.cpp: Added entries for common 2 byte and - 4 byte wchar codesets, UTF-16 and UCS-4. - - * ace/Codeset_Registry.cpp: - * ace/Codeset_Registry.h: - * ace/Codeset_Registry.inl: Retyped validation methods to return - int rather than CORBA::Boolean as a result code. - -Mon Mar 31 14:03:35 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Added an 'implicit' assignment to the workspace that will cause - the workspace creator to generate projects in directories where - there are no mpc files. If no valid project can be made, then - that directory is ignored. - -Mon Mar 31 12:32:32 2003 Balachandran Natarajan - - * bin/tao_orb_tests.lst: Added the new collocation tests to the - daily builds. - -Mon Mar 31 08:44:16 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Fixed a bug in the project creator dealing with precompiled header - files. If the pch_header or pch_source is set to "" then we need - to be sure that pch information is not put in the generated - project file. - -Mon Mar 31 08:19:16 2003 Chad Elliott - - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Fixed a bug in the Microsoft related template files where the - installed executable would not be put in the install directory. - It was previously placed in a subdirectory of the install - directory. - -Mon Mar 31 15:51:54 CEST 2003 Oliver Kellogg - - * tests/Unbounded_Set_Test.cpp: - - Verify that a set may be emptied while an iterator on the set is - in-scope but inactive. - - Changed the "Selective deletion of elements" step not to summon - bug 1460. - -Mon Mar 31 14:13:31 2003 Simon McQueen - - * apps/mkcsregdb/mkcsregdb.dsp: Added release configuration custom build step. - -Sun Mar 30 21:46:54 2003 Balachandran Natarajan - - * bin/topinfo_iorsize_stats.sh: Added data collection points for - optimized cases. - -Sun Mar 30 09:12:16 2003 Douglas C. Schmidt - - * ace/Connector.cpp (handle_timeout): Restructured the code so that - if the call to sh->handle_close() deletes the handlers, which in - turn deletes the connector, the decr_ast_refcount() call won't - cause a crash. Thanks to Tomer Amiaz for - reporting this bug and supplying a fix. - -Sat Mar 29 16:34:56 2003 Balachandran Natarajan - - * THANKS: Added Bertin Colpron to the hall of fame. - -Fri Mar 28 10:18:48 2003 Steve Huston - - * bin/PerlACE/Process_Win32.pm: For WinCE, when generating the - Pocket Controller script, put a 60-second sleep between running the - test and grabbing the log file. The script doesn't wait for the - program to exit before continuing. Will take this up with SOTI, - makers of Pocket Controller. - - * ace/Configuration.cpp (ACE_Configuration_Win32Registry::remove_section): - In the non-recursive case, try to delete the key; previously only - tried to delete the key if recursive. - - * tests/Config_Test.cpp: When reporting failed file import, list why - (%p), not the failed return status (-1). Also fixed many ACE_DEBUG - and ACE_ERROR strings by enclosing in ACE_TEXT. - - * tests/Conn_Test.cpp: When displaying a hostname, properly adjust - to the charset width in use. - - * tests/run_test.lst: Added !WinCE to Env_Value_Test. CE doesn't - do environment variables. - -Thu Mar 27 14:20:32 2003 Balachandran Natarajan - - * THANKS: Added Jia Wan to the hall of fame. - -Wed Mar 26 16:45:29 2003 Balachandran Natarajan - - * THANKS: Added Sebastien Lalonde to the hall of fame. - -Wed Mar 26 16:48:31 2003 Steve Huston - - * ace/config-WinCE.h: Let ACE_HAS_WINSOCK2 be conditional on the CE - version; there was a #define ACE_HAS_WINSOCK2 at the end of the - file that shouldn't have been there. - - * ace/config-win32-common.h: For WinCE and ACE_HAS_WINSOCK2, need - to define the errno codes without WSA prefixes. Also, WinCE (at - least at CE 4.0) doesn't have Winsock 2 extensions, so don't pull - in mswsock.h, and set up to link ws2.lib, not ws2_32.lib. - - * ace/Reactor.cpp: Don't use ACE_HAS_WINCE to block out - ACE_WFMO_Reactor; use the more direct tests (Winsock versions) if - needed. - - * ace/SPIPE_Stream.i (send_handle): Don't attempt this on WinCE even - though CE4 has ACE_HAS_WINSOCK2. It doesn't have WSADuplicateSocket. - -Wed Mar 26 16:15:39 2003 Simon McQueen - - * ace/Unbounded_Set.h: - * ace/Unbounded_Set.cpp: - * ace/Unbounded_Set.inl: - * ace/Node.h: - * ace/Node.cpp: - * tests/Makefile: - * tests/Makefile.am: - * tests/Makefile.bor: - - Reverted changes to the above to position before changelog entry: - Mon Mar 24 13:16:29 CET 2003 Oliver Kellog - -Wed Mar 26 16:48:54 CET 2003 Oliver Kellogg - - * tests/Unbounded_Set_Test.cpp: - - Corrected signature of main program and inserted an - ACE_START_TEST/ACE_END_TEST. Thanks to Johnny Willemsen for - suggesting this. - -Wed Mar 26 11:33:15 CET 2003 Oliver Kellogg - - * ace/Unbounded_Set.cpp (ACE_Unbounded_Set::delete_nodes): - - Temporarily commented out the ACE_ASSERT(number_of_iterators_ == - 0) until the iterator usage problem is repaired in TAO. - -Tue Mar 25 21:08:04 2003 Phil Mesnier - - * ace/CDR_Stream.cpp: - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - - Added the value wchar_maxbytes_ to the ACE_OutputCDR which is - used to control the size of the wchar on the wire when no - translator is being used. This is because it is valid to use a - wchar codeset for which the maximum size is smaller than the - size of a wchar_t. - - * ace/OS.h: - - When defining the ACE-specific type WChar, added the existance - of the ACE_HAS_XPG4_MULTIBYTE_CHAR as a condition to allow WChar - to be an alias of wchar_t, rather than of ACE_UINT16. - - * ace/OS.i: - * ace/config-linux-common.h: - - As part of the wchar changes, it was discovered that older linux - platforms lack fgetwc() and ungetwc(), although all other wide - char related functions are supported. Added ACE_LACKS_FGETWC to - guard against this condition. - - * ace/ace_wchar.h: - - Rework the ifdef sieve to ensure that platforms such as solaris - that really do support wchar get initialized properly. - -Tue Mar 25 09:01:00 2003 Ossama Othman - - * ace/Default_Constants.h (ACE_CONNECTOR_HANDLER_MAP_SIZE): - - Changed type of this constant from "size_t" to "unsigned int". - This header does not include system headers that define "size_t" - type. Fixes a syntax error on some platforms. - -Tue Mar 25 17:09:22 CET 2003 Oliver Kellogg - - From Rudolf Weber - * ace/Unbounded_Set.cpp: - Correction to the handling of the deleted_ flag in the iterators. - - * tests/Unbounded_Set_Test.cpp: - Extended towards making it a general test of the ACE_Unbounded_Set. - Added test for the ACE_Unbounded_Set_Const_Iterator. - -Tue Mar 25 10:44:23 CET 2003 Oliver Kellogg - - * ace/Unbounded_Set.{h,cpp}: Removed the `const' at the - ACE_Unbounded_Set::iterator_leave() method declaration. - -Mon Mar 24 22:05:56 2003 Balachandran Natarajan - - * ace/Default_Constants.h: Added a const value for the connector's - map size. - * ace/Connector.cpp: Used the constant value to configure the - internal map. Too large a map doesnt help with run-time - footprint. - -Mon Mar 24 18:06:49 2003 Balachandran Natarajan - - * bin/auto_run_tests.pl: Modified the script to do the following - - - Added an option to run only TAO tests in $TAO_ROOT/tests. - - Instead of reading just one file for all the tests and - examples in our daily builds, we will now use 3 files. One of - the files is for ACE tests, one for tests in TAO and the last - one is for all the other tests and examples in TAO. - - This provides various flexibilities for a poor developer like - yours truly, to just build and run all the tests in TAO/tests - after making changes to the ORB Core. It helps automating some - development work. We could also take this to our daily - builds. We will see more of this over a period of time. - - The changes should be backward compatible and shouldnt break any - of the existing builds. - - * bin/ace_tests.lst: - * bin/tao_orb_tests.lst: - * bin/tao_other_tests.lst: New configuration files for ACE+TAO - tests. We will use only this to add new tests to ACE+TAO. - - * bin/auto_run_tests.lst: Removed this file from the repo. - -Mon Mar 24 10:23:08 2003 Ossama Othman - - * ace/SSL/SSL_Context.h: - - No longer any need to include "ace/Singleton.h" due to the below - change. - - From David Kinder - * ace/SSL/SSL_Context.inl (instance): - * ace/SSL/SSL_Context.cpp (instance): - - Uninlined this method. Fixes a problem found in Win32 "release" - builds where an application could end up with multiple - ACE_SSL_Context singleton instances. [Bug 1475] - -Mon Mar 24 18:03:34 CET 2003 Oliver Kellogg - - * ace/Unbounded_Set.{h,cpp}: - - Added method const_iterator_leave() in class ACE_Unbounded_Set. - The destructor of the ACE_Unbounded_Set_Const_Iterator calls - it. Deleted elements are not cleaned up in that case, but they - probably don't need to, given that we are dealing with a "const" - set. - - Thanks to Jeff Parsons for noticing the problem. - -Mon Mar 24 06:54:55 2003 Douglas C. Schmidt - - * ace/config-linux-common.h: Change the ACE_DEFAULT_BASE_ADDR for - the IA-64 from 0x8 to 0x0 so the Linux kernel can choose the - right value. Thanks to Sergei Pimenov - for reporting this. - -Mon Mar 24 13:16:29 CET 2003 Oliver Kellogg - - * ace/Node.{h,cpp}: - * ace/Unbounded_Set.{h,inl,cpp}: - - Fix for Bugzilla bug 1460 supplied by Rudolf Weber - , adds a `deleted' flag to ACE_Node, and - adds corresponding management methods to ACE_Unbounded_Set. - - * tests/Unbounded_Set_Test.{cpp,icc}: New. - - * tests/Makefile, tests/Makefile.{am,bor}: - Add Unbounded_Set_Test.cpp, a regression test for bug 1460. - -Sat Mar 22 11:58:12 2003 Douglas C. Schmidt - - * ace/Configuration.cpp: When remove_section() was called the - buckets created for the value and section hash map were not - deleted. Added two new lines after - if (index_->unbind (SectionExtId, allocator_)) - return -1; - - as follows: - - value_hash_map->close(); - section_entry->int_id_.section_hash_map_->close(allocator_); - - Thanks to Sandip Patel for reporting - this. - - * ace/Message_Queue_T.cpp: Moved the notify() hook calls within - the protection of the guard lock critical section to prevent - race conditions on cleanup. Thanks to Ron Muck - for this suggestion. - -Fri Mar 21 13:07:09 2003 Chad Elliott - - * bin/MakeProjectCreator/USAGE: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/Options.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Added a -base option to allow a user to specify multiple base - projects to be applied toward all generated project files. - -Fri Mar 21 10:42:41 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Factored assignment processing from ProjectCreator into Creator. - Factored convert_slashes() from ProjectCreator into Parser. - - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/Options.pm: - - Factored option processing from Driver into a new module, Options. - - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Added support for workspace specific assignments. Currently the - only valid assignment is 'cmdline' which allows mwc to apply - command line options to a specific set of mpc files. - -Fri Mar 21 09:48:33 2003 Chad Elliott - - * bin/MakeProjectCreator/USAGE: - * bin/MakeProjectCreator/modules/Driver.pm: - - Added the -static_only option back in to allow generation of - static projects only. - -Thu Mar 20 19:50:36 2003 Steve Huston - - * ace/OS.i (ACE_OS::recursive_mutex_cond_unlock): If on WinCE, don't - do the check for RecursionCount; WinCE's structure doesn't have that - member. Also see: - Sat Mar 15 10:55:01 2003 Douglas C. Schmidt - -Thu Mar 20 17:51:39 2003 Steve Huston - - * bin/MakeProjectCreator/templates/em3vcp.mpd: Only output a linker - /entry option if building a DLL. Let binary programs pick up the - correct entrypoint from the subsystem type. It defaults to windowsce, - requiring WinMainCRTStartup. - -Thu Mar 20 14:11:01 2003 Ossama Othman - - * ace/Codecs.cpp (encode, decode): - - Fixed "comparison is always false due to limited range of data - type" warning by removing those comparisons and accompanying - code. - -Thu Mar 20 14:00:53 2003 Ossama Othman - - * ace/Memory_Pool.cpp (find_seg): - - Fixed overflow in pointer arithmetic on platforms where - sizeof(void*) is greater than sizeof(off_t). This also fixes a - "cast from pointer to integer of different size" warning. - -Thu Mar 20 12:56:26 2003 Ossama Othman - - * tests/Recursive_Condition_Bug_Test.cpp: - - Fixed unused variable warning in single-threaded builds. - -Thu Mar 20 12:35:09 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/templates/bor.mpd: - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/gnu.mpd: - * bin/MakeProjectCreator/templates/make.mpd: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/va4icc.mpd: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Added a new keyword lit_libs that is identical to libs except that - with windows build tools, a library modified (s,d,sd) is not - added to the library name. - -Thu Mar 20 11:23:46 2003 Chad Elliott - - * bin/MakeProjectCreator/README: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Changed the default behavior for naming workspaces and projects. - They now use the name of the mwc and mpc file respectively. - -Thu Mar 20 07:23:48 2003 Chad Elliott - - * bin/MakeProjectCreator/USAGE: - * bin/MakeProjectCreator/modules/Driver.pm: - - Removed -dynamic_only and -static_only options and made "dynamic - only" the default. I added a -static option that will allow the - user to generate static projects in addition to dynamic projects. - -Thu Mar 20 07:09:54 2003 Douglas C. Schmidt - - * ace/Process_Manager.cpp: The wrong remove_handler() method was - being used in the ACE_Process_Manager::close() method. Changed - this to use the remove_handler() that removes the SIGCHLD - handler. Thanks to Carsten Prescher - for this fix. - -Wed Mar 19 18:27:08 2003 Venkita Subramonian - - * Kokyu: - * Kokyu/Default_Dispatcher_Impl.cpp: - * Kokyu/Default_Dispatcher_Impl.h: - * Kokyu/Default_Dispatcher_Impl.i: - * Kokyu/Dispatcher_Impl.cpp: - * Kokyu/Dispatcher_Impl.h: - * Kokyu/Dispatcher_Impl.i: - * Kokyu/Dispatcher_Task.cpp: - * Kokyu/Dispatcher_Task.h: - * Kokyu/Dispatcher_Task.i: - * Kokyu/Kokyu.cpp: - * Kokyu/Kokyu.dsw: - * Kokyu/Kokyu.h: - * Kokyu/Kokyu.i: - * Kokyu/Kokyu.cpp: - * Kokyu/Kokyu.dsw: - * Kokyu/Kokyu.mpc: - * Kokyu/Kokyu_DLL.dsp: - * Kokyu/Kokyu_Static.dsp: - * Kokyu/Makefile: - * Kokyu/kokyu_export.h: - * Kokyu/tests: - * Kokyu/tests/EDF: - * Kokyu/tests/EDF/EDF.dsp: - * Kokyu/tests/EDF/EDF.dsw: - * Kokyu/tests/EDF/Makefile: - * Kokyu/tests/EDF/test.cpp: - * Kokyu/tests/FIFO: - * Kokyu/tests/FIFO/FIFO.dsp: - * Kokyu/tests/FIFO/FIFO.dsw: - * Kokyu/tests/FIFO/Makefile: - * Kokyu/tests/FIFO/test.cpp: - - First Kokyu release. - -Wed Mar 19 12:08:31 2003 Chad Elliott - - * include/makeinclude/platform_irix6.x_sgic++.GNU: - - Suppress warning numbers 1253,3439,1234 and 3506. - -Wed Mar 19 07:27:59 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/templates/nmake.mpd: - - Added depend, idl_stubs and realclean targets. - -Tue Mar 18 07:24:26 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - If files are listed in "Template_Files" and "Source_Files" is - omitted, then "Source_Files" could have duplicated values from - "Template_Files". A new method has been added to correct this - situation. - -Mon Mar 17 17:38:05 2003 Balachandran Natarajan - - * include/makeinclude/platform_linux_icc.GNU: The GNU file can now - work with 64 bit intel compiler in Itanium. Thanks to Lubomir - Bulej and Petr Tuma - for providing the patches. - -Mon Mar 17 19:20:54 UTC 2003 Johnny Willemsen - - * include/makeinclude/platform_cygwin32.GNU: - Set threads to 0 when it is not defined yet. From the Cygwin daily - build we found that threading is just partly enabled with Cygwin. - First tries to enable it completely resulted in a lot of new errors, - so for the time being disable threads by default and then start - working on getting everything working with threading enabled. - Also removed setting of optimized and the --enable-auto-import - because they are not needed. - -Mon Mar 17 09:58:48 2003 Chad Elliott - - * ace/ace.mpc: - - Updated the project to include the correct template, inline and - header files. - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Changed the defaults for precompiled headers. If multiple pch - headers are found, then take the one closest to the project name. - -Sun Mar 16 10:12:12 2003 Johnny Willemsen - - * ace/OS.i (recursive_mutex_cond_unlock): Fixed typo - -Sat Mar 15 13:50:18 2003 Steve Huston - - * tests/tests.mpc: Added Recursive_Condition_Bug_Test. - -Sat Mar 15 12:20:45 2003 Nanbor Wang - - * tests/tests.dsw: - * tests/Recursive_Condition_Bug_Test.dsp: Added a new project file. - -Sat Mar 15 10:55:01 2003 Douglas C. Schmidt - - * tests/Makefile: - * tests/Makefile.bor: - * tests/run_test.lst: Added Recursive_Condition_Bug_Test.cpp to - these files. - - * tests: Added a new Recursive_Condition_Bug_Test.cpp to check - that the fix from Leonid Kvetnyi is correct and doesn't cause - other problems. - - * tests/Recursive_Condition_Test.cpp (ACE_TMAIN): Minor reformatting. - - * ace/OS.i (recursive_mutex_cond_unlock): Added another check for - m->RecursionCount > 1 to fix problems where the test program hangs. - Thanks to Leonid Kvetnyi for this fix. - - * ace/Event_Handler_T.h: Changed - - typedef int (T::*SIG_HANDLER) (ACE_HANDLE, siginfo_t*, ucontext_t*); - - to this - - typedef int (T::*SIG_HANDLER) (int, siginfo_t*, ucontext_t*); - - so that we're consistent across platforms where ACE_HANDLE is a - HANDLE, not an int! Thanks to Johnny Willemsen - for reporting this. - -Fri Mar 14 22:26:56 2003 Nanbor Wang - - * bin/MakeProjectCreator/config/ciao_client.mpb: - * bin/MakeProjectCreator/config/ciao_component.mpb: - * bin/MakeProjectCreator/config/ciao_server.mpb: - * bin/MakeProjectCreator/modules/Driver.pm: Merged in CIAO - specific rules and default environment settings. These changes - help me take advantage of Chad's and other's work without - complicating my workspace. Most of other CIAO stuff are rather - localized. - - These changes have no effect on others whatsoever. - -Fri Mar 14 11:49:27 2003 Steve Huston - - * tests/Cached_Allocator_Test.cpp: Fix access out-of-bounds error. - Thanks to Alexander Libman for this fix. - -Thu Mar 13 16:11:48 2003 Ossama Othman - - * ace/Log_Msg.cpp (log_hexdump): - * tests/Proactor_Test.cpp: - - Use the ACE_SIZE_T_FORMAT_SPECIFIER macro to specify the correct - size_t format specifier. Fixes a warning exhibited on 32-bit - and 64-bit g++ builds. - -Thu Mar 13 17:35:48 2003 Steve Huston - - * examples/C++NPv1/Logging_Handler.cpp (recv_log_record): - * examples/C++NPv2/Logging_Handler.cpp (recv_log_record): Use - ACE_CDR::grow(), not ACE_Message_Block::size(), to resize the - CDR-receiving block. This maintains alignment across the resize. - Thanks to Don Hinton for this fix. - -Thu Mar 13 07:40:05 2003 Chad Elliott - - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Committing Justin Michel's modifications to - the intermediate directory to allow multiple projects within a - single directory that use the same source files. This also has - the side of organizing the generated object files into separate - project directories underneath the main intermediate directory. - -Wed Mar 12 13:31:08 2003 Chad Elliott - - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/em3vcpdll.mpt: - * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt: - * bin/MakeProjectCreator/templates/em3vcplibexe.mpt: - * bin/MakeProjectCreator/templates/nmakedll.mpt: - * bin/MakeProjectCreator/templates/nmakeexe.mpt: - - Fixed output directories for executables and pdb locations as - below. - -Wed Mar 12 12:19:23 2003 Chad Elliott - - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc6dspdll.mpt: - * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt: - * bin/MakeProjectCreator/templates/vc6dsplibexe.mpt: - * bin/MakeProjectCreator/templates/vc7.mpd: - * bin/MakeProjectCreator/templates/vc7dll.mpt: - * bin/MakeProjectCreator/templates/vc7exe.mpt: - - Fixed output directories for executables. Executables of - different configurations now go into different directories. - Also, we need to always generate pdb information for executables. - -Wed Mar 12 08:59:18 2003 Ossama Othman - - * ace/Log_Msg.cpp (log_hexdump): - * tests/Proactor_Test.cpp: - - Another round of format specifier corrections. "%lu" instead of - "%u". Addresses warnings in 64 bit platform builds. - -Wed Mar 12 10:42:40 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - - Fixed a problem with projects that had a slash or back slash in - the name. - - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt: - * bin/MakeProjectCreator/templates/vc7.mpd: - * bin/MakeProjectCreator/templates/vc7dll.mpt: - * bin/MakeProjectCreator/templates/vc7exe.mpt: - - Make sure pdb files get generated for the right types and in the - right locations. - -Wed Mar 12 09:54:51 2003 Chad Elliott - - Committing Paul Calabrese's MPC related - changes. - - * ACEXML/common/ACEXML_Export.h: - * ACEXML/common/common.mpc: - * ACEXML/parser/parser/parser.mpc: - * bin/MakeProjectCreator/config/acexml.mpb: - - Fix problems with ACEXML mpc files on windows. - -Wed Mar 12 08:36:12 2003 Douglas C. Schmidt - - * ace/FILE.cpp: Make the ACE_FILE::close() method check for a - valid handle. Thanks to Paul Marquis for - reporting this. - -Wed Mar 12 08:25:17 2003 Chad Elliott - - * bin/MakeProjectCreator/config/acedefaults.mpb: - * bin/MakeProjectCreator/config/aceexe.mpb: - * bin/MakeProjectCreator/config/acelib.mpb: - * bin/MakeProjectCreator/config/global.mpb: - - Changed the global values to be generic and moved the defaults for - ACE into the acedefaults base project. - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Fixed a bug where header and inline files would be added to a - project even if they were specified to be empty. - -Wed Mar 12 07:03:54 2003 Chad Elliott - - * netsvcs/servers/Makefile.bor: - - Applying Trevor Fields modification. Change - $(OBJDIRS) to $(OBJDIR). - -Tue Mar 11 14:12:46 2003 Chad Elliott - - * bin/MakeProjectCreator/USAGE: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Added a -recurse option and fixed a problem with changing - to non-existent directories. - -Mon Mar 10 18:10:31 2003 Steve Huston - - * ace/ARGV.h: Clarified the behavior of ACE_ARGV's behavior with - respect to environment variable substitution; it only substitutes - when the token is itself an environment variable reference and not - if there's an environment variable reference contained within the - token. e.g. $HOME will subtitute, $HOME/file will not. - -Mon Mar 10 14:03:11 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Factor out code to detect duplicate project names to allow the - WorkspaceCreator to use that same code to detect duplicate - workspace names. - -Mon Mar 10 13:30:30 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - If an mpc file contains projects with duplicate names, MPC will - issue a warning to that effect. - -Mon Mar 10 08:25:30 2003 Ossama Othman - - * ace/Log_Msg.cpp (log_hexdump): - * tests/Proactor_Test.cpp: - - Corrected format specifier for size_t (unsigned integer) - variable, i.e. "%u" instead of "%d". Fixes mismatched format - specifier warnings. - -Mon Mar 10 07:36:59 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - Fixed a bug where multiple uses of a $() variable would not be - handled correctly with the -relative option. Thanks to Nanbor - Wang for reporting this. - -Mon Mar 10 13:47:08 CET 2003 Oliver Kellogg - - * include/makeinclude/platform_g++_common.GNU: - Cannot use CXX to determine compiler version because CXX might be - set to "insure" and insure does not pass the -dumpversion option - to the compiler. - -Sun Mar 9 10:17:16 2003 Edan Ayal - - * tests/Future_Set_Test.cpp: - * tests/Future_Test.cpp: - - Printing order should be 'a,b,c,d,e' instead of 'a,b,c,e,d'. - - First sleep() replaced with - ACE_Thread_Manager::instance()->wait(). - - Final sleep() is redundant, as the spawned threads are already - dead. - - Prime_Scheduler::close() is called twice - once by the user - (asking to close the task) and once by the framework, when the - thread exists. This causes the task_count counter to be - negative. - - Renamed the method to 'shutdown'. Change method declaration and - definition (remove 'virtual' and all the arguments). Change the - call in Method_Request_end::call to shutdown() instead of - close() - - In the future set test, place different name commands in the - name set, just to show that it can be done. - -Sat Mar 8 12:54:18 2003 Steve Huston - - * ace/Get_Opt.h: Clarified the role of the long_only argument for - the ACE_Get_Opt constructor. - -Fri Mar 7 09:58:06 2003 Phil Mesnier - - * apps/mkcsregdb/Makefile: Fixed the install location so the - make succeeds. - -Fri Mar 7 08:51:56 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/StringProcessor.pm: - - Reverted my change from "Fri Mar 7 06:35:09 2003 Chad Elliott" - to Parser.pm and factored out code from that module and Driver - into a new module, StringProcessor.pm. Driver and Parser now - inherit from StringProcessor. - -Fri Mar 7 07:19:46 2003 Chad Elliott - - * ACEXML/apps/svcconf/svcconf.mpc: - * ACEXML/common/common.mpc: - * ACEXML/examples/SAXPrint/SAXPrint.mpc: - * ACEXML/parser/parser/parser.mpc: - * ACEXML/tests/tests.mpc: - - Added mpc files for ACEXML related projects. - - * bin/MakeProjectCreator/config/acexml.mpb: - - Added an acexml base project to provide easy addition of ACEXML - libraries to a project. - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Fixed the code to find the main() in a .cpp. - -Fri Mar 7 06:35:09 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Parser.pm: - - Fixed a bug introduced with the - "Thu Mar 6 08:06:35 2003 Chad Elliott" modification of - Driver.pm. I made $cwd part of the class instead of a static - local. The value wasn't being updated properly since Driver.pm - now "uses" Parser. Thanks to Steve Huston for bringing this to my - attention. - -Thu Mar 6 18:14:21 2003 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: Rather than do the - template closure as part of the AR command, set up PRELIB to do - template closure; this allows static libs to build clean with the - xargs method introduced to rules.lib.GNU. A side-affect of this - is that the separate template closure step is also used for - shared libraries, and thus, +inst_none needed to be added to - SOFLAGS. - Also set AR to /usr/ccs/bin/ar to be sure to pick up the native - HP-supplied ar command. - - * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: Don't - reinterpret_cast on non-Windows. Not needed and aC++ complains. - Also see: - Wed Feb 19 10:41:20 2003 Steve Huston - -Thu Mar 6 14:49:37 2003 Steve Huston - - * apps/mkcsregdb/mkcsregdb.cpp: const_cast pointers that need to be - delete[]-ed sp MSVC 6 doesn't complain. static_cast result of - strtol() to ACE_CDR::UShort when needed. - -Thu Mar 6 11:41:46 2003 Chad Elliott - - * bin/MakeProjectCreator/USAGE: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Added a -notoplevel option to allow processing to occur with no - top level file created. - -Thu Mar 6 10:56:09 2003 Phil Mesnier - - * ace/Makefile.am: Adding codeset files to yet another makefile - variant. - -Thu Mar 6 09:58:41 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/nmakedll.mpt: - * bin/MakeProjectCreator/templates/nmakeexe.mpt: - - Added support for nmake on Win64. To generate nmake files use the - following command line: - - mwc.pl -type nmake -value_template platforms=Win64 - -Thu Mar 6 08:06:35 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Driver.pm: - - Added an environment variable that allows users to set default - command line parameters. The MPC_COMMANDLINE environment variable - is added to the command line parameters. It will not override any - arguments passed in. - -Wed Mar 5 21:45:39 2003 Steve Huston - - * ace/INET_Addr.cpp (get_port_number_from_name): Correct arg name - for ACE_UNUSED_ARG. Suspected cut/paste error. - - * tests/ACE_Test.cpp: const_cast the pointers returned from - ACE::execname() so they can be deleted on MSVC6. - -Wed Mar 5 07:05:11 2003 Phil Mesnier - - * ace/ace-dll.icc: - * ace/ace-lib.icc: - * ace/ace.icc: - * ace/ace_dll64.mak: - * ace/ace_lib64.mak: - Added codeset registry files to more makefiles. - -Wed Mar 5 06:32:40 2003 Phil Mesnier - - * ace/Makefile.bor: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Added codeset registry files and fixed spelling error in - Makefile.bor. - -Wed Mar 5 06:10:48 2003 Phil Mesnier - - * ace/Makefile.bor: - - Added codeset registry files to makefile. - -Tue Mar 04 19:58:29 2003 Nanbor Wang - - * ACEXML/common/FileCharStream.cpp (determine_encoding): Commented - out the annoying debug information. Users should get the - encoding information from this->getEncoding(), instead of - relying on the debug info. - - * ACEXML/common/LocatorImpl.cpp (reset): Remember to reset string - pointers to 0 after deleteing them. Otherwise, a parser may - crash if it is used to parse a second file. - -Tue Mar 4 17:39:31 2003 Steve Huston - - * docs/CE-status.txt: Updated to reflect the ACE 5.3 status of CE. - - * ace/ACE.cpp (execname): Try to locate ".exe" suffix without - case sensitivity. Thanks to Kelly F. Hickel - for reporting this. Also, when appending a suffix, append it to - the name, not after the name's nul terminator. - - * ace/ACE.h: Clarified that the pointer returned, if allocated, is - allocated using new[] and should be freed with delete[]. - - * tests/ACE_Test.cpp: - * tests/ACE_Test.dsp: New test for ACE methods. At this time, it tests - the ACE::execname() method fixed above. - - * tests/Makefile: - * tests/Makefile.bor: - * tests/tests.dsw: - * tests/tests.mpc: - * tests/run_test.lst: Added ACE_Test. - -Tue Mar 4 13:54:52 2003 Phil Mesnier - - * ace/Codeset_Registry.cpp: - * ace/Codeset_Registry.h: - * ace/Codeset_Registry.inl: - - New files added to support the codeset framework. The Codeset - Registry is either a wrapper for dce code and character set - registry functions, if the system supports them, or these - fucntions are emulated. Only the functions necessary to support - TAO's Codeset translation framework are emulated. - - * ace/Codeset_Registry_db.cpp: - - The codeset "database." A minimal list (2 entries) is shipped, see - apps/mkcsregdb to build a new list of supported codesets as needed. - - * ace/CDR_Stream.h: - - Changed the interface on the ACE_[W]Char_Codeset_Translator class for - the read_[w]char_array to take a non-const array as the out parameter. - - * ace/Makefile.ace: - * ace/ace.mpc: - - Added the new codeset files to the makefile. - - * apps/mkcsregdb: - - A new application used to generate custom list of codeset identites. - The description of how to run is in a comment at the top of - ace/Codeset_Registry_db.cpp. - -Tue Jan 24 17:50:32 2003 Gonzalo Diethelm - - * ace/INET_Addr.cpp: - Method string_to_addr() now uses ACE_OS_String::strtol() instead - of the ugly hack using ACE_OS::strspn() and ACE_OS::atoi(). The - two set() methods that receive a const char port_name[] now try - first to parse that port_name as a simple number (like "901"), - and if that fails they try to resolve the port name as a - service. In order to implement this, I added a static helper - function called get_port_number_from_name() (sorry for the awful - name). - -Tue Mar 4 12:53:06 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - If no exe target or lib target is supplied, then search the source - files for a main() and set the exename. - -Tue Mar 4 09:31:01 2003 Jeff Parsons - - * ace/Configuration.cpp: - - For temporary ACE_TStrings used internally, switched to the - non-allocating constructor. Also made cosmetic changes and - changed some ACE_TString assignments to use the nocopy - assignment method added below. - - * ace/String_Base.h: - * ace/String_Base.i: - - Added a nocopy assignment method. - - * ace/ace_dll.dsp: - - Added Unbounded_Queue.h to the project. - -Mon Mar 3 11:39:20 2003 Ossama Othman - - * ace/Strategies_T.h: - - Forward declare ACE_Service_Repository. Fixes a problem exposed - by IBM Visual Age C++ 5 builds about unexpected text. - -Fri Feb 28 17:43:02 2003 Douglas C. Schmidt - - * ace/Service_Manager.h (ACE_Service_Manager): Changed private to - protected. Thanks to Terry Mihm for - suggesting this. - -Fri Feb 28 13:04:56 2003 Ossama Othman - - Changes necessitated by inter-header dependency reductions. - - * examples/Connection/non_blocking/CPP-acceptor.h: - - Include "ace/Svc_Handler.h" to pull in ACE_Svc_Handler template - declaration. - - * examples/Connection/non_blocking/test_lsock_acceptor.cpp: - * examples/Connection/non_blocking/test_tli_acceptor.cpp: - - Include "ace/Service_Config.h" to pull in ACE_Service_Config - class declaration. - -Fri Feb 28 14:12:03 2003 Chad Elliott - - * bin/ChangeLogEditor/ChangeLogEdit.pm: - * bin/ChangeLogEditor/ChangeLogEntry.pm: - * bin/ChangeLogEditor/EmailTranslator.pm: - * bin/ChangeLogEditor/FileLocator.pm: - * bin/cle.pl: - - Added a ChangeLog editor script. It uses CVS to determine which - files have been modified, added or removed and generates a blank - ChangeLog entry in the existing ChangeLog. - -Fri Feb 28 13:18:17 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: - - Fixed a problem with project dependencies. If the project - dependency is not a project within the generated solution, then - omit it. - -Fri Feb 28 07:49:00 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - - Pulled the common code out of Creator and replaced it with a - template method to collect the lines with possible line - continuation. - -Fri Feb 28 12:33:01 UTC 2003 Johnny Willemsen - - * ace/SString.cpp: - Also do the explicit template instantiations - ACE_String_Base::NULL_String_ and - ACE_String_Base::NULL_String_ when using VxWorks. - -Thu Feb 27 10:56:01 2003 Ossama Othman - - * tests/Proactor_Scatter_Gather_Test.cpp (initiate_read_file): - - Explicitly cast return value of ceil() to "size_t". Fixes a - "loss of data" warning. Loss of data isn't an issue in this - case. - -Thu Feb 27 10:53:38 2003 Ossama Othman - - * ace/Atomic_Op.cpp (single_cpu_exchange, multi_cpu_exchange): - - Fixed unused argument warnings. - -Thu Feb 27 10:46:01 2003 Ossama Othman - - Changes necessitated by inter-header dependency reductions. - - * apps/Gateway/Peer/Peer.h: - * examples/ASX/Event_Server/Event_Server/Peer_Router.h: - * examples/Connection/non_blocking/CPP-connector.h: - * netsvcs/lib/Name_Handler.h: - * netsvcs/lib/Server_Logging_Handler_T.h: - * netsvcs/lib/TS_Clerk_Handler.h: - * netsvcs/lib/TS_Server_Handler.h: - - Include "ace/Svc_Handler.h" to pull in ACE_Svc_Handler template - declaration. - - * examples/Connection/non_blocking/test_sock_acceptor.cpp: - * examples/Connection/non_blocking/test_spipe_acceptor.cpp: - - Include "ace/Service_Config.h" to pull in ACE_Service_Config - class declaration. - -Thu Feb 27 11:24:14 2003 Chad Elliott - - * apps/gperf/src/gperf.mpc: - - Change the gperf project name to contain exe to allow the - VC6ProjectCreator to create the correct dependencies. - -Thu Feb 27 10:41:33 2003 Chad Elliott - - * bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm: - - Add a warning if duplicate projects are detected in a generated - workspace. - -Thu Feb 27 10:31:44 2003 Balachandran Natarajan - - * include/makeinclude/platform_linux_icc.GNU: The GNU file can now - work with 64 bit intel compiler in Itanium. Thanks to Lubomir - Bulej and Petr Tuma - for providing the patches. - - * THANKS: Added Lubomir Bulej to the hall of fame. - -Thu Feb 27 10:22:05 2003 Balachandran Natarajan - - * ace/Synch.h: - * ace/Synch.i: Added ACE_Null_Condition::wait (ACE_Null_Mutex &m, - const ACE_Time_Value * = 0) which seems to be missing. - -Wed Feb 26 18:42:33 2003 Christopher Kohlhoff - - * ace/Makefile.bor: - - Removed ACE_LD_DECORATOR_STR definition from CFLAGS, as this - macro is now defined by the common included makefiles. - - * ace/Synch.h: - - Added missing constructor overload and disown member function - to the ACE_Guard template specialization. - - * ace/Atomic_Op.cpp: - * ace/Atomic_Op.h: - * ace/Atomic_Op.i: - * tests/Atomic_Op_Test.cpp: - - Use InterlockedExchange (or the XCHG instruction) to provide - strong memory-ordering when assigning to an atomic integer. - - * bin/MakeProjectCreator/Creator.pm: - - Added support for line continuation using backslash in .mpc files. - -Wed Feb 26 11:55:20 2003 Chad Elliott - - * ace/ace.mpc: - - Added POSIX_CB_Proactor.cpp to the Demux files. - - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - Modification to allow users to name the foreach variable. - -Wed Feb 26 07:39:58 2003 Chad Elliott - - * bin/MakeProjectCreator/README: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Changed the defaulting behavior if neither exename, sharedname or - staticname are defined in an mpc file. - -Tue Feb 25 22:26:30 2003 Krishnakumar B - - * ace/Malloc.h: - * ace/Malloc.cpp: - * ace/Malloc.h: - * ace/Malloc_T.cpp: - * ace/PI_Malloc.cpp: - * ace/PI_Malloc.h: - - Teach ACE_Control_Block and friends to do alignment on 64-bit - platforms. The previous code was buggy and caused a lot of bus - errors on platforms with greater than 4-byte alignment. We no - longer multiply and divide by sizeof (long) and do the alignment - based on sizeof (union ACE_max_align_info). This change also - makes the default alignment to be at 8-byte boundary (which is - ofcourse overridable) and errs in favour of safe code by default - vs optimization for code size. This should get rid of bug - reports on SGI IRIX, Solaris 64-bit etc related to - ACE_*_Allocator and friends. - - Also fixed a couple of rounding errors which result in core - dumps, in ACE_Cached_Allocator and ACE_Dynamic_Cached_Allocator - where we happily traverse memory irrespective of alignment of - the chunk_size. - - Thanks to Dave Mercer for reporting the - problem. - - One of the items from the long list of pending items post-5.3.1. - - * ace/OS_Memory.h: - - Removed the definition of ACE_MALLOC_ALIGN from this file. - ACE_MALLOC_ALIGN is an internal definition of Malloc.h and - should have no business in OS_Memory.h. - - * include/makeinclude/rules.lib.GNU: - - Use echo on VLOBJS instead of find with *.o. This fixes build - problems on lame platforms like MacOS X where ar doesn't - generate an index and need to use ranlib. Probably the right - thing to do even otherwise since there might be more objects in - .{sh,}obj than needed for a library. - -Tue Feb 25 10:00:54 2003 Ossama Othman - - * ace/CDR_Base.h (LongLong): - * ace/CDR_Base.inl: - * ace/CDR_Base.cpp: - - Removed newly added 32-bit assignment and comparison operators. - Comparison is non-trivial in this signed case, and assignment - operators are a potential source of confusion when implicit - conversions are performed. This change basically reverts - ACE_CDR::LongLong to its previous implementation, and also - addresses some build problems on platforms with non-native 64 - bit signed integers (e.g. VxWorks). - -Tue Feb 25 08:09:13 2003 Ossama Othman - - * ace/Atomic_Op_T.h (mutex_): - - Removed "mutable" keyword from this reference member. IBM's - Visual Age C++ considers mutable reference members invalid. - - * ace/Atomic_Op_T.i: - - Go back to casting away the const-ness of the above mutex - reference member in const methods. - -Tue Feb 25 09:57:07 2003 Chad Elliott - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Clean up the generated targets with the GNU Makefiles. - -Tue Feb 25 09:24:06 2003 Douglas C. Schmidt - - * ace/OS.cpp: Added an emulation for localtime_r() for WinCE. Thanks to - Martin Brown for reporting this. - -Tue Feb 25 08:40:12 2003 Chad Elliott - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Always generate a realclean target, but only add idl generated - files if we had idl_files to work with. - -Tue Feb 25 07:56:59 2003 Chad Elliott - - * bin/MakeProjectCreator/USAGE: - - Updated the documentation to reflect the removal of the 3 - character restriction on type names. - - * bin/MakeProjectCreator/config/avstreamsexe.mpb: - - Inherit from namingexe instead of reproducing the same - information. - - * bin/MakeProjectCreator/config/rteventexe.mpb: - - Inherit from server instead of reproducing the same information. - - * bin/MakeProjectCreator/modules/Driver.pm: - - Removed the restriction of a 3 character type. - - * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm: - * bin/MakeProjectCreator/modules/GHSProjectCreator.pm: - * bin/MakeProjectCreator/modules/GNUProjectCreator.pm: - * bin/MakeProjectCreator/modules/NMakeProjectCreator.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VC7ProjectCreator.pm: - - Refactor code into the base class. - - * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Made modifications to these modules to allow an mwc file to have - multiple workspaces defined within it. - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Cosmetic change. - - * bin/MakeProjectCreator/modules/MakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/MakeProjectCreator.pm: - * bin/MakeProjectCreator/templates/make.mpd: - * bin/mpc.pl: - * bin/mwc.pl: - - Added a new project type for generic Makefiles. These are not - suitable for use within ACE or TAO, but may be useful to someone. - -Mon Feb 24 15:37:06 2003 Douglas C. Schmidt - - * ace/TTY_IO.h (ACE_TTY_IO): Added the dtrdisable member to - Serial_Params. This finishes a fix suggested by Ray Limpus - . Thanks to Jeff Parsons for noticing - this. - -Mon Feb 24 08:53:52 2003 Ossama Othman - - * ace/Basic_Types.i (operator++, operator--): - - Fixed incorrect dereferencing of non-pointer return variable. - -Sun Feb 23 12:16:34 2003 Douglas C. Schmidt - - * ace/WIN32_Asynch_IO.cpp (cancel): Added support for cancel() on - MinGW. Thanks to Vince for this fix. - - * examples/Mem_Map/Makefile: Moved the definition of DIRS to - later in the Makefile so we can exclude it from the MinGW - build. Thanks to Vince for reporting this, as well. - - * ace/WIN32_Proactor.cpp (close): Make sure to check whether - GetQueuedQueuedCompletion() returns false. Thanks to Vince - Mounts for reporting this. - -Sat Feb 22 08:16:36 2003 Ossama Othman - - * ace/Basic_Types.h (operator++, operator--): - - Fixed return type mismatch between declaration and definition in - Basic_Types.i. - -Fri Feb 21 22:21:49 2003 Steve Huston - - * ace/OS.i: Removed the #if !defined (ACE_HAS_WINCE) around the - ACE_OS::vsprintf() method. It's available on CE. Thanks to - Emmanuel Thevenot Beaufort - for this fix. - - Also enabled ACE_OS::fgets(), fflush(), thr_getspecific() similarly. - -Fri Feb 21 12:52:00 2003 Ossama Othman - - * ace/Global_Macros.h: - * ace/OS.h: - - Moved ACE_CORBA_{1,2,3} and ACE_NESTED_CLASS macro out of OS.h - and into Global_Macros.h. Helps avoid inclusion of OS.h in some - cases. - -Fri Feb 21 10:05:23 2003 Ossama Othman - - * ace/Local_Name_Space_T.cpp: - - Include "ace/Auto_Ptr.h" once again to pull in the - ACE_Auto_Basic_Array_Ptr class declaration. Fixes compile-time - problems on AIX about unknown template types. - -Fri Feb 21 13:32:43 2003 Edward Scott - - * docs/bugzilla-build-setup.html: - - Removed obsolete documentation file. Thanks to Johnny Willemsen - for reporting the problem. - -Fri Feb 21 06:18:19 2003 Ossama Othman - - * tests/Framework_Component_DLL.cpp: - - Include "ace/Service_Object.h" to pull in ACE_Service_Object - class declaration. Necessitated by inter-header dependency - reductions. - -Thu Feb 20 18:54:03 2003 Ossama Othman - - * apps/Gateway/Gateway/gatewayd.cpp: - - Include "ace/Service_Object.h" to pull in ACE_Service_Object_Ptr - class declaration. Necessitated by inter-header dependency - reductions. - -Thu Feb 20 18:49:37 2003 Ossama Othman - - * examples/Service_Configurator/Misc/Timer_Service.h: - - Include "ace/Service_Object.h" to pull in ACE_Service_Object - class declaration. Necessitated by inter-header dependency - reductions. - -Thu Feb 20 18:45:29 2003 Ossama Othman - - * examples/C++NPv2/Service_Reporter.cpp: - - Include "ace/Service_Types.h" to pull in ACE_Service_Type_Impl - class declaration. Necessitated by inter-header dependency - reductions. - -Thu Feb 20 18:31:10 2003 Ossama Othman - - * ace/Strategies_T.cpp: - - Fixed "lose of const in cast" errors. - -Thu Feb 20 18:20:19 2003 Ossama Othman - - * ace/SSL/SSL_SOCK_Acceptor.h (ACE_SSL_SOCK_Acceptor): - - Reverted the change that made this class inherit privately from - ACE_SSL_SOCK instead of publically. While this isn't strictly - the correct thing to do, IMO, it does correct some compile-time - problems. - - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - - Fixed compile-time error related to violation of a const - qualifier on a pointer to the timeout value. - -Thu Feb 20 19:18:17 2003 Balachandran Natarajan - - * ChangeLogs/ChangeLog-02b: - * ChangeLogs/ChangeLog-03a: New files having all the old ChangeLog - entries till 5.3.1. - * ChangeLog: Shortened the changelog for ease of use. - -Thu Feb 20 10:35:15 2003 Ossama Othman - - * ace/Strategies_T.h: - * ace/Strategies_T.cpp: - - Reverted part of changes that introduced extensive use of - traits since they were forcing the introduction of the - ACE_TYPENAME macro in more places than is desirable at this - point in time. They may be reintroduced in the future. - -Thu Feb 20 09:24:00 2003 Ossama Othman - - * ace/Service_Config.h: - - Forward declare ACE_Service_Object. Necessitated by inter-header - dependency reductions. - -Thu Feb 20 09:23:51 2003 Ossama Othman - - * ace/Acceptor.h: - * ace/Connector.h: - - No need to include "ace/Service_Config.h" and - "ace/Svc_Handler.h". - - Include "ace/Synch_Options.h". Necessitated by inter-header - dependency reductions. - - * ace/Acceptor.cpp: - * ace/Connector.cpp: - - Include "ace/Svc_Handler.h". Necessitated by inter-header - dependency reductions. - - * ace/Atomic_Op.h: - - Fixed doxygen documentation. - - * ace/Atomic_Op.i (operator++, operator--): - - Implement these post{in,de}crement operators in terms of their - corresponding pre{in,de}crement operators to ensure consistent - semantics. - - * ace/Atomic_Op_T.h (mutex_, own_mutex_): - - Improved const-correctness by making these mutex members - mutable. This allows us to avoid casting away the constness. - - * ace/Atomic_Op_T.i (operator==, operator>=, operator>): - (operator<=, operator<, value, operator=): - - Do not cast away the constness of the mutex. That hack is no - longer necessary since the mutex is now mutable. - - * ace/Basic_Types.h: - - Improved doxygen documentation. - - Moved endianness determination macros prior to ACE_U_LongLong - class. - - (operator=): - - Added ACE_ULongLong assignment operator declarations that accept - 32 bit signed and unsigned integers. - - (operator++, operator--): - - Added missing ACE_ULongLong post{in,de}crement operator - declarations. - - (data_): - - Make declaration order of lower and upper 32 bit members (lo_ - and hi_) of this structure dependant on the endianness of the - platform. This mimics what is done for the ACE_LongLong type - in the ACE_CDR classes. - - * ace/Basic_Types.i (operator=): - - Added ACE_ULongLong assignment operator implementation that - accept 32 bit signed and unsigned integers. - - (operator++, operator--): - - Added missing ACE_ULongLong post{in,de}crement operator - implementations. - - * ace/CDR_Base.cpp (mb_align): - - Uninlined this method in order to reduce inter-header - dependencies. - - (operator<, operator<=, operator>, operator>=, operator==): - (operator!=): - - Added these missing operator for the ACE_LongLong type. - - (Float, operator=, operator!=): - - Fixed potential unused argument warnings for the Cray/UNICOS - case. - - * ace/CDR_Base.h: - - Include "ace/OS.h" instead of "ace/Message_Block.h", and forward - declare ACE_Message_Block in order to reduce inter-header - dependencies. - - Changed all uses of typedefs like "u_char" and "u_long" to their - non-typedef counterparts, e.g. "unsigned char" and "unsigned - long". Makes it possible to avoid including headers that - contain those typedefs. - - (operator=): - - Added ACE_LongLong constructors assignment operators that accept - 32-bit integers. - - (operator==, operator!=, operator<=, operator<, operator>=): - (operator>): - - Added these missing ACE_LongLong relation operators. - - * ace/CDR_Base.inl (operator=): - - Added ACE_LongLong constructors assignment operators that accept - 32-bit integers. - - (operator==, operator!=, operator<=, operator<, operator>=): - (operator>): - - Added these missing ACE_LongLong relation operators. - - * ace/CDR_Stream.h: - - Moved definition of the ACE_CDR_BYTE_ORDER macros from OS.h to - this header. Helps with header dependency reduction. - - * ace/Capabilities.h: - - Use ACE_Hash_Map_Manager_Ex instead of ACE_Hash_Map_Manager. - Doing so saves us three template instantiations. - - * ace/Capabilities.i: - - Cosmetic changes. - - * ace/Capabilities.cpp: - - No need to include "ace/Map_Manager.h". - - Added missing ACE_RCSID macro. - - Improved conformance to ACE coding conventions. - - Removed explicit template instantiations for the - ACE_Hash_Map_Manager template. That template is no longer - used. - - (reset_caps): - - Use ACE_Hash_Map_Manager_Ex template traits instead of the - actual template type. Makes for cleaner code. - - * ace/Configuration.cpp: - * ace/Configuration.h: - * ace/Strategies_T.cpp: - * ace/Token_Collection.cpp: - * ace/Token_Collection.h: - * ace/Token_Invariants.cpp: - * ace/Token_Invariants.h: - * ace/Token_Manager.cpp: - * ace/Token_Manager.h: - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Asynch_IO.h: - - Take advantage of template traits to improve clarity of code. - - * ace/Copy_Disabled.h: - - Corrected comment. - - * ace/Default_Constants.h: - - Moved ACE_DEFAULT_CDR_BUFSIZE, ACE_DEFAULT_CDR_EXP_GROWTH_MAX, - ACE_DEFAULT_CDR_LINEAR_GROWTH_CHUNK, - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF macros from OS.h to this - header. Helps with inter-header dependency reduction. - - * ace/Dynamic_Service_Base.cpp: - * ace/Parse_Node.cpp: - * ace/Service_Manager.cpp: - * ace/Service_Repository.cpp: - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: - - Include "ace/Service_Types.h". Necessitated by inter-header - dependency reduction. - - * ace/Filecache.h: - * ace/Filecache.cpp: - * ace/Hash_Map_With_Allocator_T.h: - * ace/Hash_Map_With_Allocator_T.cpp: - * ace/Local_Name_Space_T.h: - * ace/Local_Name_Space.cpp: - - Use ACE_Hash_Map_Manager_Ex instead of ACE_Hash_Map_Manager. - Doing so saves us three template instantiations. - - * ace/Future_Set.h: - * ace/Map_T.h: - - Include "ace/Hash_Map_Manager_T.h" instead of - "ace/Hash_Map_Manager.h". The former is all that is needed, and - the latter already includes the former. - - * ace/Hash_Map_Manager_T.i (operator++, operator--): - * ace/Map_Manager.i: - * ace/RB_Tree.i: - - Implement the post-{in,de}crement operators in terms of their - pre-{in,de}crement operator counterparts to ensure consistency. - - * ace/Local_Name_Space_T.cpp: - - No need to include "ace/Auto_Ptr.h" - - Use template traits to improve code clarity. - - * ace/OS.h: - - Moved ACE_CDR_BYTE_ORDER macro definition to CDR_Stream.h. - Helps with inter-header dependencies. - - Moved ACE_DEFAULT_CDR_BUFSIZE, ACE_DEFAULT_CDR_EXP_GROWTH_MAX, - ACE_DEFAULT_CDR_LINEAR_GROWTH_CHUNK, - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF to Default_Constants.h. Helps - with inter-header dependency reduction. - - * ace/POSIX_Asynch_IO.cpp: - - Added missing ACE_RCSID macro. - - (bytes_transferred): - Use map template traits to improve code clarity. - - * ace/POSIX_Asynch_IO.h: - - Redefined old map typedefs in terms of the map traits. - - * ace/Parse_Node.h: - * ace/Service_Repository.h: - - No need to include "ace/Service_Types.h". A forward declaration - for ACE_Service_Types is enough. - - * ace/Service_Config.h: - - No need to include "ace/Service_Types.h" and "ace/Signal.h". - Forward declaring ACE_Service_Types and ACE_Sig_Adapter is - enough. - - * ace/Strategies_T.h: - - No need to include "ace/Service_Config.h" and - "ace/Synch_Options.h". - - * ace/Synch_Options.h: - - Changed all uses of typedefs like "u_char" and "u_long" to their - non-typedef counterparts, e.g. "unsigned char" and "unsigned - long". Makes it possible to avoid including OS.h. A big win in - compile time reduction. - - Include "ace/Time_Value.h". Necessitated by inter-header - dependency reduction. - - * ace/Synch_Options.cpp: - - Changed all uses of typedefs like "u_char" and "u_long" to their - non-typedef counterparts, e.g. "unsigned char" and "unsigned - long". Makes it possible to avoid including OS.h. A big win in - compile time reduction. - - Include "ace/Trace.h". Necessitated by inter-header - dependency reduction. - - * ace/Template_Instantiations.cpp: - - Removed all ACE_Hash_Map_Manager related template - instantiations. The ones for ACE_Hash_Map_Manager_Ex are all - that are needed. - - * ace/SSL/SSL_SOCK_Acceptor.h (ACE_SSL_SOCK_Acceptor): - - Inherit privately from ACE_SSL_SOCK, instead of publically. - ACE_SSL_SOCK_Acceptor is IMPLEMENTED-IN-TERMS-OF ACE_SSL_SOCK. - It does not satisfy the IS-A relationship. - - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - - Use ACE_Countdown_Time to take into account the time between - each call to select() instead of using the same timeout value in - each loop iteration. [Bug 1110] - - * ace/SSL/SSL_SOCK_Stream.cpp (get_remote_addr): - - Retrieve the remote addr from the parent ACE_SSL_SOCK class, not - ACE_SOCK. Addresses potential inconsistencies in the future. - - * ace/SSL/SSL_SOCK_Stream.h (ACE_SSL_SOCK_Stream): - - Removed friend declarations for the - ACE_SSL_SOCK_{Acceptor,Connector} classes. They are - unnecessary. - -Wed Feb 19 10:41:20 2003 Steve Huston - - * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: - In run_worker(), use ACE_reinterpret_cast, not ACE_static_cast, - to convert an int to an ACE_HANDLE. Thanks to Vince Mounts - for reporting this. - -Tue Feb 11 17:14:56 2003 Douglas C. Schmidt - - * ace/TTY_IO.cpp: Fixed several problems with DTR enabling. Thanks to - Ray Limpus for reporting this. - -Thu Feb 6 16:36:18 2003 Douglas C. Schmidt - - * ace/Bound_Ptr.{h,i}: Made the get() method const. Thanks to - Chris Kohlhoff for reporting this. diff --git a/ChangeLogs/ChangeLog-00a b/ChangeLogs/ChangeLog-00a deleted file mode 100644 index 29d983c12cd..00000000000 --- a/ChangeLogs/ChangeLog-00a +++ /dev/null @@ -1,12664 +0,0 @@ -Tue Oct 10 21:54:52 2000 Nanbor Wang - - * bin/msvc_auto_compile.pl (Build_Core): Updated LIB core build - dsp list. - -Tue Oct 10 18:51:16 2000 Carlos O'Ryan - - * ace/Makefile.bor: - * ace/RMCast/Makefile.bor: - * include/makeinclude/ace_flags.bor: - Add a Borland makefile for the RMCast library. Thanks to Johhny - Willemsen for providing this. - -Tue Oct 10 17:59:09 2000 Carlos O'Ryan - - * ace/RMCast/RMCast.dsp: - Update the project file - -Tue Oct 10 17:25:32 2000 Carlos O'Ryan - - * Finally the Send_File example works correctly. In my tests four - nodes received the same file successfully. - I also tried some features to cleanly terminate receivers and - senders. - However, I still need to work on flow control, and in strategies - to limit the maximum number of messages buffered by the sender - and/or receiver. - - * ace/RMCast/Makefile: - Add the new files to the Makefile - - * ace/RMCast/RMCast.h: - Move the state transition matrix to RMCast_Receiver_Module.h - - * ace/RMCast/RMCast_Ack_Worker.h: - * ace/RMCast/RMCast_Ack_Worker.i: - * ace/RMCast/RMCast_Ack_Worker.cpp: - Move the ACE_RMCast_Ack_Worker class to its own file. Only used - in the Retransmission module. - - * ace/RMCast/RMCast_Fork.h: - * ace/RMCast/RMCast_Fork.i: - * ace/RMCast/RMCast_Fork.cpp: - This class superseeds Control_Splitter. I realized that forking - the control messages to the user layer is a more general and - cleaner solution for this problem. - - * ace/RMCast/RMCast_Control_Splitter.h: - * ace/RMCast/RMCast_Control_Splitter.i: - * ace/RMCast/RMCast_Control_Splitter.cpp: - Removed. - - * ace/RMCast/RMCast_Fragment.cpp: - Fixed bug when computing the length of the message, it should be - total_length() but I was using total_size(). - - * ace/RMCast/RMCast_IO_UDP.cpp: - Destroy proxys that return -1 from receive_message(). - Add multiple debug messages, now commented out. - - * ace/RMCast/RMCast_Membership.h: - * ace/RMCast/RMCast_Membership.cpp: - When a new member joins or leaves the group we need to resend - the ack messages to the upper layer. - The code to compute the correct Ack message is factored out. - Many debug messages, but they are commented out. - New method so clients can know how many members the group has, - it can be used for safe termination of senders. - - * ace/RMCast/RMCast_Module.cpp: - The open() and close() methods propagate through the stack as - any other message. - - * ace/RMCast/RMCast_Reassembly.h: - * ace/RMCast/RMCast_Reassembly.cpp: - Cleanup is performed in the close() operation. - Old messages are dropped from the map immediately, the - Reordering layer is the right place to reject them (if any). - - * ace/RMCast/RMCast_Reliable_Factory.cpp: - Use ACE_RMCast_Receiver_Module to validate and process the - messages in the proxy, for example, Ack messages are a clear - error on the receiver side. - - * ace/RMCast/RMCast_Receiver_Module.h: - * ace/RMCast/RMCast_Receiver_Module.i: - * ace/RMCast/RMCast_Receiver_Module.cpp: - This module implements message validation and state transitions - for a receiver. - It also generates the correct responses for an Ack_Join or Poll - message. - - * ace/RMCast/RMCast_Reordering.h: - * ace/RMCast/RMCast_Reordering.cpp: - Cleanup resources in the close() method - - * ace/RMCast/RMCast_Resend_Worker.h: - * ace/RMCast/RMCast_Resend_Worker.i: - * ace/RMCast/RMCast_Resend_Worker.cpp: - Move the ACE_RMCast_Resend_Worker class to its own file. Only - used in the Retransmission module. - - * ace/RMCast/RMCast_Resend_Handler.cpp: - Resend all the messages after each timeout. - - * ace/RMCast/RMCast_Retransmission.h: - * ace/RMCast/RMCast_Retransmission.cpp: - Worker classes moved to their own files. - - * ace/RMCast/RMCast_Sequencer.h: - * ace/RMCast/RMCast_Sequencer.i: - * ace/RMCast/RMCast_Sequencer.cpp: - Assign unique sequence numbers to each message, used on the - sender side. - - * ace/RMCast/RMCast_UDP_Proxy.cpp: - Incoming message must pass through the proxy before going up the - stack. - The source field was not set in the messages. - - * ace/RMCast/RMCast_UDP_Reliable_Sender.h: - * ace/RMCast/RMCast_UDP_Reliable_Sender.i: - * ace/RMCast/RMCast_UDP_Reliable_Sender.cpp: - Use the new ACE_RMCast_Sequencer module to assign message - sequence numbers. - Use the new ACE_RMCast_Fork class to send incoming control - messages both to the user and the retransmission/membership - modules. - Add method to detect how many members are currently registered - with the membership layer. - - * tests/RMCast/RMCast_Retransmission_Test.cpp: - Assign the sequence numbers before going into the retransmission - layer, as would be done in a normal application. - - * examples/RMCast/Send_File/Makefile: - Update dependencies - - * examples/RMCast/Send_File/Sender.cpp: - Only shutdown once all the members have left the group. - Use long periods to make debugging easier. - - * examples/RMCast/Send_File/Receiver.cpp: - Only shutdown once the Ack_Leave message is received. - Return -1 from the data() method once the complete file is - received, that initiates the termination. - Use long periods to make debugging easier. - -Tue Oct 10 16:34:01 2000 Nanbor Wang - - * ace/config-win32-common.h: Changed ACE_HAS_SVC_DLL to - ACE_SVC_HAS_DLL and commented out its definition. The default - definition of ACE_SVC_HAS_DLL has been moved to - ace/Svc_export.h. The comment-out code here only serves as a - reminder to users. Thanks to Mike Curtis - for pointing this out. - - * netsvcs/lib/Base_Optimizer.cpp: Removed redundant definition of - ACE_BUILD_DLL. - - * ace/ACE_export.h: - * ace/OS_Export.h: - Added a new macro ACE_AS_STATIC_LIBS that controls the default - value of ACE_OS_HAS_DLL and ACE_HAS_DLL so we can build static - ACE library easily. - - * ace/ace_lib.dsp: - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf_lib.dsp: Changed to use ACE_AS_STATIC_LIBS - for static configurations. - -Mon Oct 09 16:45:00 2000 Carlos O'Ryan - - * ace/RMCast/Makefile: - * ace/RMCast/RMCast.dsp: - Add new files to the RMCast project and Makefile. - - * ace/RMCast/RMCast_Control_Splitter.h: - * ace/RMCast/RMCast_Control_Splitter.i: - * ace/RMCast/RMCast_Control_Splitter.cpp: - A module to separate control messages from regular data flow. - - * ace/RMCast/RMCast_Copy_On_Write.h: - * ace/RMCast/RMCast_Copy_On_Write.cpp: - Add accessor to check if the collection is empty. - - * ace/RMCast/RMCast_IO_UDP.h: - * ace/RMCast/RMCast_IO_UDP.i: - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_UDP_Event_Handler.cpp: - Decouple the event handler. - - * ace/RMCast/RMCast_Module.h: - * ace/RMCast/RMCast_Module.i: - * ace/RMCast/RMCast_Module.cpp: - * ace/RMCast/RMCast_UDP_Proxy.h: - Fixed comments. - - * ace/RMCast/RMCast_Module_Factory.h: - No need to pass the IO_UDP to the module factory. - - * ace/RMCast/RMCast_Reliable_Factory.h: - * ace/RMCast/RMCast_Reliable_Factory.i: - * ace/RMCast/RMCast_Reliable_Factory.cpp: - A factory to create the per-proxy stack on the receivers. - - * ace/RMCast/RMCast_Resend_Handler.h: - * ace/RMCast/RMCast_Resend_Handler.i: - * ace/RMCast/RMCast_Resend_Handler.cpp: - An adapter to resend messages on a Reactor scheduled timer. - - * ace/RMCast/RMCast_Retransmission.h: - * ace/RMCast/RMCast_Retransmission.cpp: - Add a method to resend all the messages. - - * ace/RMCast/RMCast_Singleton_Factory.h: - * ace/RMCast/RMCast_Singleton_Factory.i: - * ace/RMCast/RMCast_Singleton_Factory.cpp: - A module factory that "creates" the same object over and over. - - - * ace/RMCast/RMCast_UDP_Reliable_Receiver.h: - * ace/RMCast/RMCast_UDP_Reliable_Receiver.i: - * ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp: - Helper class to simplify the creation and configuration of a UDP - receiver. - - * ace/RMCast/RMCast_UDP_Reliable_Sender.h: - * ace/RMCast/RMCast_UDP_Reliable_Sender.i: - * ace/RMCast/RMCast_UDP_Reliable_Sender.cpp: - Helper class to simplify the creation and configuration of a UDP - sender. - - * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp: - Had to change due to modifications in the I/O UDP layer - interface. - - * examples/RMCast/Makefile: - * examples/RMCast/Send_File/Makefile: - * examples/RMCast/Send_File/Receiver.cpp: - * examples/RMCast/Send_File/Receiver.dsp: - * examples/RMCast/Send_File/Send_File.dsw: - * examples/RMCast/Send_File/Sender.cpp: - * examples/RMCast/Send_File/Sender.dsp: - Add a simple example that sends a file over reliable UDP - multicast. - -Mon Oct 9 14:44:25 2000 Darrell Brunsch - - * bin/generate_export_file.pl: - - Made some minor changes to make a bit more robust. - - * bin/regenerate_exports.pl: (added) - - This script should be able to recurse from the current directory - reupdating the export files. Use at your own risk. - -Mon Oct 09 03:23:22 2000 Nanbor Wang - - * bin/generate_export_file.pl: Changed the script so we can define - a single macro to switch multiple *_HAS_DLL default definitions. - -Sat Oct 7 04:30:00 2000 Douglas C. Schmidt - - * Doug and Sonja got married in St. Louis, surrounded by - their family, friends, and many ACE+TAO developers! - -Sat Oct 7 000:50:02 2000 Darrell Brunsch - - * ace/ACE.cpp: - * ace/ACE.h: - * ace/ACE.i: - * ace/ARGV.cpp: - * ace/ATM_Acceptor.cpp: - * ace/ATM_Acceptor.i: - * ace/ATM_Addr.cpp: - * ace/ATM_Connector.cpp: - * ace/ATM_Connector.i: - * ace/ATM_QoS.cpp: - * ace/ATM_Stream.cpp: - * ace/Acceptor.cpp: - * ace/Activation_Queue.cpp: - * ace/Addr.cpp: - * ace/Arg_Shifter.cpp: - * ace/Asynch_Acceptor.cpp: - * ace/Asynch_IO.cpp: - * ace/Based_Pointer_T.cpp: - * ace/Basic_Types.h: - * ace/CORBA_Handler.cpp: - * ace/Cache_Map_Manager_T.cpp: - * ace/Cached_Connect_Strategy_T.cpp: - * ace/Caching_Strategies_T.i: - * ace/Capabilities.cpp: - * ace/Capabilities.h: - * ace/Configuration.cpp: - * ace/Connector.cpp: - * ace/Containers_T.cpp: - * ace/DEV_Addr.cpp: - * ace/DEV_Connector.i: - * ace/DLL.cpp: - * ace/Dirent.i: - * ace/Dynamic_Service.cpp: - * ace/FIFO.cpp: - * ace/FIFO_Recv.cpp: - * ace/FIFO_Recv_Msg.cpp: - * ace/FIFO_Send.cpp: - * ace/FIFO_Send_Msg.cpp: - * ace/FILE_Addr.cpp: - * ace/FILE_Connector.cpp: - * ace/FILE_Connector.i: - * ace/File_Lock.cpp: - * ace/Filecache.cpp: - * ace/Filecache.h: - * ace/Future.cpp: - * ace/Get_Opt.cpp: - * ace/Handle_Set.cpp: - * ace/Hash_Map_Manager_T.cpp: - * ace/Hash_Map_Manager_T.i: - * ace/High_Res_Timer.cpp: - * ace/High_Res_Timer.h: - * ace/INET_Addr.cpp: - * ace/INET_Addr.h: - * ace/IO_SAP.cpp: - * ace/IPC_SAP.cpp: - * ace/LSOCK.cpp: - * ace/LSOCK_CODgram.cpp: - * ace/LSOCK_Connector.cpp: - * ace/LSOCK_Dgram.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Local_Tokens.cpp: - * ace/Local_Tokens.i: - * ace/Log_Msg.cpp: - * ace/Log_Msg.h: - * ace/Log_Record.cpp: - * ace/Logging_Strategy.cpp: - * ace/MEM_Acceptor.cpp: - * ace/MEM_Addr.cpp: - * ace/MEM_Connector.cpp: - * ace/MEM_SAP.cpp: - * ace/Malloc.cpp: - * ace/Malloc_T.cpp: - * ace/Malloc_T.h: - * ace/Map_Manager.cpp: - * ace/Map_Manager.i: - * ace/Mem_Map.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Block.cpp: - * ace/Message_Queue.cpp: - * ace/Message_Queue_T.cpp: - * ace/Module.cpp: - * ace/Name_Proxy.cpp: - * ace/Name_Request_Reply.cpp: - * ace/Naming_Context.cpp: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/Object_Manager.cpp: - * ace/Obstack.cpp: - * ace/POSIX_Asynch_IO.cpp: - * ace/Parse_Node.cpp: - * ace/Pipe.cpp: - * ace/Proactor.cpp: - * ace/Process.cpp: - * ace/Process_Manager.cpp: - * ace/QoS_Manager.cpp: - * ace/QoS_Session_Factory.cpp: - * ace/QoS_Session_Impl.cpp: - * ace/RB_Tree.cpp: - * ace/RB_Tree.i: - * ace/Read_Buffer.cpp: - * ace/Registry.cpp: - * ace/Registry_Name_Space.cpp: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Tokens.cpp: - * ace/SOCK.cpp: - * ace/SOCK_Acceptor.cpp: - * ace/SOCK_CODgram.cpp: - * ace/SOCK_Connector.cpp: - * ace/SOCK_Dgram.cpp: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Dgram_Mcast.h: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - * ace/SPIPE_Acceptor.cpp: - * ace/SPIPE_Addr.cpp: - * ace/SPIPE_Connector.cpp: - * ace/SV_Message_Queue.cpp: - * ace/SV_Semaphore_Complex.cpp: - * ace/SV_Semaphore_Simple.cpp: - * ace/SV_Shared_Memory.cpp: - * ace/Select_Reactor_Base.cpp: - * ace/Select_Reactor_T.cpp: - * ace/Service_Config.cpp: - * ace/Service_Manager.cpp: - * ace/Service_Repository.cpp: - * ace/Service_Types.cpp: - * ace/Singleton.cpp: - * ace/Stats.cpp: - * ace/Stats.i: - * ace/Strategies_T.cpp: - * ace/Strategies_T.i: - * ace/Stream.cpp: - * ace/Svc_Conf.h: - * ace/Svc_Conf.l: - * ace/Svc_Conf.y: - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: - * ace/Svc_Handler.cpp: - * ace/Synch.cpp: - * ace/Synch.h: - * ace/Synch_T.cpp: - * ace/System_Time.cpp: - * ace/TLI.cpp: - * ace/TLI_Acceptor.cpp: - * ace/TLI_Connector.i: - * ace/TP_Reactor.i: - * ace/Task_T.cpp: - * ace/Thread_Manager.cpp: - * ace/Time_Request_Reply.cpp: - * ace/Timeprobe_T.cpp: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Heap_T.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_Queue_Adapters.cpp: - * ace/Timer_Queue_T.cpp: - * ace/Timer_Wheel_T.cpp: - * ace/Token.cpp: - * ace/Token_Collection.cpp: - * ace/Token_Invariants.cpp: - * ace/Token_Manager.cpp: - * ace/Token_Request_Reply.cpp: - * ace/Token_Request_Reply.i: - * ace/Trace.cpp: - * ace/Trace.h: - * ace/UPIPE_Acceptor.cpp: - * ace/UPIPE_Connector.cpp: - * ace/UPIPE_Connector.i: - * ace/WFMO_Reactor.cpp: - * ace/WFMO_Reactor.i: - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Proactor.cpp: - * ace/XTI_ATM_Mcast.i: - * ace/ace_wchar.h: - * ace/config-WinCE.h: - * ace/config-all.h: - * ace/config-win32-borland.h: - * ace/config-win32-msvc.h: - * ace/config-win32-visualage.h: - - Split several methods into char/wchar_t versions: - - ACE_OS::getenv - - ACE_OS::cuserid - - ACE_Allocator_Adapter constructor - - ACE_Manual_Event constructor - - Split several string macros into char/wchar_t versions: - - ACE_DIRECTORY_SEPARATOR_STR - - ACE_DIRECTORY_SEPARATOR_CHAR - - ACE_PLATFORM - - ACE_PLATFORM_EXE_SUFFIX - - ACE_DEFAULT_LOCALNAME - - ACE_DEFAULT_GLOBALNAME - - ACE_DEFAULT_MUTEX - - Added ACE_DEFAULT_NAMESPACE_DIR back in for ACE_LEGACY_MODE. - -Fri Oct 06 11:34:26 2000 Steve Huston - - * ace/Based_Pointer_T.cpp: - * ace/Select_Reactor_T.cpp: Added #include "ace/Log_Msg.h" else IBM - C++ can't compile the template at instantiation time. - -Wed Oct 04 12:23:34 2000 Carlos O'Ryan - - * ace/RMCast/RMCast_Copy_On_Write.h: - * ace/RMCast/RMCast_Copy_On_Write.i: - * ace/RMCast/RMCast_Copy_On_Write.cpp: - More cleanup, this time for the Read_Guard class - - * ace/RMCast/RMCast_Proxy.h: - * ace/RMCast/RMCast_Proxy.cpp: - * ace/RMCast/RMCast_UDP_Proxy.cpp: - The ACE_RMCast_Proxy class now handles outgoing Ack_Join - messages to update the sequence numbers. - - * ace/RMCast/RMCast_Reordering.cpp: - * ace/RMCast/RMCast_Retransmission.cpp: - Fixed memory management problems. - - * tests/RMCast/RMCast_Retransmission_Test.cpp: - Add tests to verify that the right number of messages is - received by *all* proxies. Also check the Ack_Join messages. - -Wed Oct 4 12:03:07 2000 Ossama Othman - - * configure.in (ACE_HAS_STREAM_PIPES): - - Verify that we can actually set a STREAM option that ACE uses. - This is particularly necessary for platforms that have ioctl - conflicts. For example, the Linux kernel's CDROM ioctls have - the same values as glibc 2.1.94's STREAM ioctls. Attempting to - set a STREAM ioctl actually causes one of the CDROM ioctls to be - set (unsuccessfully)! - - * configure.in: - * m4/ace.m4: - * m4/compiler.m4: - - Changed all uses of "$target" to "$host." "$target" is only - used for compiler tool chains. "$host" is the correct variable - since it refers to the host the application will be run on (as - opposed to the host the application was built on $build). - -Wed Oct 4 09:15:42 2000 Darrell Brunsch - - * ace/RMCast/RMCast.dsp: - - Added new files. - -Tue Oct 3 17:07:37 2000 Carlos O'Ryan - - * ace/RMCast/Makefile: - * ace/RMCast/RMCast_Reordering.h: - * ace/RMCast/RMCast_Reordering.i: - * ace/RMCast/RMCast_Reordering.cpp: - Add re-ordering module, this is the receiver-side module that - acks messages and delivers them in order to the application. - - * ace/RMCast/RMCast.h: - Fixed data type in the Ack_Join message - - * ace/RMCast/RMCast_Copy_On_Write.h: - * ace/RMCast/RMCast_Copy_On_Write.i: - * ace/RMCast/RMCast_Copy_On_Write.cpp: - * ace/RMCast/RMCast_Retransmission.cpp: - Cleanup the Copy_On_Write implementation - - * tests/RMCast/Makefile: - * tests/RMCast/RMCast_Tests.dsw: - * tests/RMCast/RMCast_Reordering_Test.cpp: - * tests/RMCast/RMCast_Reordering_Test.dsp: - Add test for the reordering module. - - * tests/RMCast/RMCast_Retransmission_Test.cpp: - Remove debug messages for the retransmission stuff. - -Tue Oct 3 15:03:42 2000 Darrell Brunsch - - * ace/OS.i: - - In the non-Win32 section of hostname (wchar version) I - forgot to call wchar_rep on the ACE_Ascii_To_Wide temp - class I was using. - - * ace/OS.h: - - ACE_PLATFORM_EXE_SUFFIX was being defined incorrectly. - -Tue Oct 3 14:25:09 2000 Darrell Brunsch - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Expanded TCHAR versions of some string macros to have - both _A and _W versions. Moved many of these - definitions around, since a lot of the same code was - being repeated. The macros changed are: - ACE_DIRECTORY_SEPARATOR_STR, ACE_DIRECTORY_SEPARATOR_CHAR, - ACE_PLATFORM, ACE_PLATFORM_EXE_SUFFIX, - ACE_DEFAULT_LOCALNAME, ACE_DEFAULT_GLOBALNAME and - ACE_DEFAULT_MUTEX. [Bug 674] - - Split TCHAR versions of atoi, hostname, access, - open, and chdir into char and wchar_t versions. - - * ace/Process_Mutex.cpp: - * ace/Process_Mutex.h: - - Changed the ACE_Process_Mutex constructor to take a - char as a argument instead of TCHAR. Also added a - version that takes in wchar_t. - - * ace/Synch.cpp: - * ace/Synch.h: - - Changed the ACE_Auto_Event constructor to take a - char as a argument instead of TCHAR. Just like above, - added a version that takes in wchar_t also. - - * ace/ace_wchar.h: - * ace/ace_wchar.inl: (added) - - Moved the method definitions from inlined in the - class definition to the .inl file. - - Added typedefs for ACE_OS_C/WString to the - ACE_Wide_To_Ascii/Asci_To_Wide classes for legacy - support. [Bug 675] - - Added ACE_TEXT_WCHAR_TO_TCHAR macro that acts similar - to ACE_TEXT_CHAR_TO_WCHAR (except converts wchar_t's) - - Added ACE_TEXT_WIDE macro, which is used to make literal - strings wide. (We were just directly using L"" in most - cases) - -Tue Oct 3 13:27:13 2000 Joe Hoffert - - * ace/OS.i: - * ace/OS.cpp: - Added !ACE_HAS_TSS_EMULATION to the ACE_HAS_PACE - checks when TSS emulation is being used. We want - to let ACE do the emulation instead of moving it - into PACE since this would involve keeping track - of the global TSS state. - -Tue Oct 3 12:25:46 2000 Darrell Brunsch - - * ace/Thread_Exit.cpp: - - Removed default argument in the function definition. - - * ace/Thread_Adapter.cpp: - * ace/Thread_Adapter.h: - - Separated ACE_Thread_Adapter::invoke into invoke and - invoke_i because it uses SEH and James added local vars - with destructors. They don't work together in the same - function. - -Tue Oct 03 12:53:28 2000 Angelo Corsaro - - * bin/run_all_list.pm: - - Disabled Connection Purging test, and enabled Exposed - Policies test. - -Tue Oct 3 10:52:24 2000 Darrell Brunsch - - * performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp: - - Added explicit includes for Process_Mutex and RW_Process_Mutex. - -Tue Oct 3 10:40:04 PDT 2000 James Hu - - * ace/Thread_Adapter.cpp: - * ace/Thread_Exit.cpp: - * ace/Thread_Exit.h: - - Changed this check to creating an ACE_Thread_Exit off the - heap via a smart pointeresque way of the TSS instance - fails to create. - -Tue Oct 3 05:55:01 2000 Douglas C. Schmidt - - * ace/Hash_Map_Manager_T.cpp: Added && (__SUNPRO_CC == 0x420) - to the #elif defined (__SUNPRO_CC) to make things work properly - on the Sun FORTE compiler. Thanks to Russ Noseworthy for - reporting this. - -Mon Oct 2 18:49:06 PDT 2000 James Hu - - * ace/Thread_Adapter.cpp: - - If the TSS instance of the ACE_Thread_Exit class fails to - create, the application will crash. The new code will detect - the failure, wait half a second, and try again. This - solution, while cheesy, corrects a problem Entera - encountered, and avoids the problems my previous attempt - caused with ACE. - -Mon Oct 2 13:38:44 2000 Ossama Othman - - * examples/QOS/QoS_Signal_Handler.cpp: - * examples/QOS/QoS_Util.cpp: - - Include "ace/Log_Msg.h" to pull in definitions of the - ACE_{DEBUG,ERROR} macros. - -Mon Oct 2 11:29:47 2000 Carlos O'Ryan - - * ace/RMCast/RMCast_Retransmission.h: - * ace/RMCast/RMCast_Retransmission.cpp: - Fixed several minor problems in the Retransmission module. - Use Copy_On_Write dispatching for synchronization of the - internal message buffer. - - * ace/RMCast/RMCast_Copy_On_Write.h: - * ace/RMCast/RMCast_Copy_On_Write.i: - * ace/RMCast/RMCast_Copy_On_Write.cpp: - Implement Copy_On_Write semantics for a collection like the - retransmission buffer. This is based on the ESF_Copy_On_Write - strategy developed for the event channel. - We should try to refactor this one in a reusable strategy. - - * ace/RMCast/RMCast_Worker.h: - * ace/RMCast/RMCast_Worker.i: - * ace/RMCast/RMCast_Worker.cpp: - To implement copy-on-write we need the "alternative" form of - iterators. - - * ace/RMCast/RMCast.h: - * ace/RMCast/RMCast_Fragment.h: - * ace/RMCast/RMCast_IO_UDP.h: - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_Membership.h: - * ace/RMCast/RMCast_Membership.i: - * ace/RMCast/RMCast_Membership.cpp: - * ace/RMCast/RMCast_Module.h: - * ace/RMCast/RMCast_Module_Factory.h: - * ace/RMCast/RMCast_Partial_Message.h: - * ace/RMCast/RMCast_Proxy.h: - * ace/RMCast/RMCast_Proxy.i: - * ace/RMCast/RMCast_Proxy.cpp: - * ace/RMCast/RMCast_UDP_Event_Handler.h: - * ace/RMCast/RMCast_UDP_Proxy.cpp: - * tests/RMCast/RMCast_Membership_Test.cpp: - Made the comments more doxygen friendly. - Renamed the highest_in_sequence field to next_expected, the new - name really reflects its semantics, this is the next sequence - number that the peer is expecting. All the previous numbers - have been either received or are simply assumed lost. - - * tests/Makefile: - If the rmcast makefile flag is set to 1 we build the RMCast - subdirectory too. - - * tests/RMCast/Makefile: - * tests/RMCast/RMCast_Tests.dsw: - * tests/RMCast/RMCast_Retransmission_Test.dsp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - New test for the Retransmission module - -Sun Oct 01 15:50:42 2000 Darrell Brunsch - - * bin/auto_run_tests.pl: - - Added support for a sandbox program that can shutdown a test - if it hangs. - -Fri Sep 29 16:32:22 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Added the BE and FE projects for TAO_IDL so the static version - gets built correctly in auto_compiles. - -Fri Sep 29 16:17:34 2000 Steve Huston - - * ace/WFMO_Reactor.cpp (register_handle_i): If a event handle - is created for association with a socket handle, the - auto_ptr which caused the ACE_Auto_Event destruction at function - return usually smashed errno (since it was closing an invalid - handle - see comments in code). Added a ACE_Errno_Guard and - removed the ACE_Auto_Event's handle while in the guard to prevent - errno smashing upon function return. - -Thu Sep 28 22:06:44 2000 Ossama Othman - - * ace/SSL/SSL_SOCK_Connector.h: - * ace/SSL/SSL_SOCK_Connector.cpp (ACE_SSL_SOCK_Connector, - shared_connect_start, shared_connect_finish, connect, complete): - - Made ACE_Time_Value arguments const to match the changes - detailed in: - - Thu Sep 28 15:02:36 2000 Irfan Pyarali - -Fri Sep 29 00:23:59 2000 Irfan Pyarali - - * ace/Log_Msg.h (ACE_RETURN): Fixed minor error. - -Thu Sep 28 22:13:04 2000 Irfan Pyarali - - * ace/Log_Msg: Macros are evil! All the ACE debugging macros were - evaluating the user arguments twice, once in - log_priority_enabled() and the other in log(). The problem was - that set() was making a deep copy of the filename. Hence, this - change: - - Wed May 3 11:43:05 2000 Douglas C. Schmidt - - was made to prevent the deep copy which was unnecessary when the - message was not actually logged. However, this resulted in the - macro evaluating the user arguments twice. Previously, a - statement like this: - - ACE_DEBUG ((LM_DEBUG, - "timeout occured, iterations left %d\n", - --iterations)); - - got reduced by one - now it got reduced by two ;-) - - The solution was to make a shallow copy of the filename in - conditional_set(). Then in log(), if the log priority is - correct, make a deep copy and then continue will log(). The - macros were changed to call conditional_set() instead of set(). - - Also, changed ACE_RETURN to specify all the parameters, - including , , and . Otherwise, the - default parameters of set() will end up losing these parameters - set by the user. - -Thu Sep 28 15:49:00 2000 Douglas C. Schmidt - - * ace/Stream.h (class ACE_Stream): Updated the documentation to clarify - that the ACE_Time_Value's are *absolute* time. Thanks to Pedro - for reporting this. Thanks to Pedro Brandao - for reporting this. - -Thu Sep 28 15:02:36 2000 Irfan Pyarali - - * ace/SOCK_Connector.cpp: ACE_Time_Value args to - ACE_SOCK_Connector could be const. Had to patch functions in - the following files to make it happen: - - ACE.cpp - ACE.h - OS.h - OS.i - SOCK_Connector.cpp - SOCK_Connector.h - - Thanks to Steve Huston for reporting - this. This also fixes bug 673. - -Thu Sep 28 11:14:29 2000 Martin Stack - - * ace/config-freebsd.h: - * ace/config-freebsd-pthread.h: - * ace/config-linux-common.h: - * ace/config-irix6.x-common.h: Added/Renamed to - ACE_USES_NEW_TERMIOS_STRUCT. - - * ace/TTY_IO.h: - * ace/TTY_IO.cpp: The Win32 section was modified to implement a - non-blocking read when read-timeout=0 is set. Also, it was - modified to ensure proper operations when a read_timeout is - required. - - Code was added to enable the DTR line on both Win32 and unix - platforms when the port is opened. - - Several new flags where added to give proper access to the - serial device. - - Relabled macro "ACE_USES_OLD_TERMIOS_STRUCT" to - "ACE_USES_NEW_TERMIOS_STRUCT" to properly indicate its purpose. - -Thu Sep 28 09:01:19 2000 Ossama Othman - - * ace/config-g++-common.h: - - Reverted my g++ 2.95 updates. They work on all platforms but - the cross-compiler used for VxWorks. - -Wed Sep 27 16:17:36 2000 Ossama Othman - - * ace/IOStream.h: - * ace/IOStream_T.h: - - Moved inclusion of `ace/INET_Addr.h' and `ace/Handle_Set.h' to - `IOStream_T.h'. They weren't needed in `IOStream.h'. - - * ace/config-g++-common.h (ACE_LACKS_AUTO_PTR, - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES, - ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS): - - G++ 2.95.x properly support the auto_ptr class, templates with - static data members, and inlined template functions. - -Wed Sep 27 14:02:30 2000 Irfan Pyarali - - * examples/Reactor/WFMO_Reactor/test_abandoned.cpp - (handle_timeout): Moved <--this->iterations_> outside the DEBUG - statement. - -Wed Sep 27 08:46:12 2000 Carlos O'Ryan - - * ace/RMCast/RMCast.dsw: - Add new files to the project - - * tests/RMCast/RMCast_Tests.dsw: - * tests/RMCast/RMCast_Membership_Test.dsp: - Add project file for the new test - - * tests/RMCast/RMCast_Membership_Test.cpp: - Fixed warning under MSVC - -Wed Sep 27 08:23:58 2000 Carlos O'Ryan - - * ace/RMCast/Makefile: - Updated dependencies - - * ace/RMCast/RMCast.h: - * ace/RMCast/RMCast_Module.h: - * ace/RMCast/RMCast_Proxy.cpp: - * ace/RMCast/RMCast_Proxy.h: - * ace/RMCast/RMCast_Reassembly.h: - * ace/RMCast/RMCast_Reassembly.cpp: - * ace/RMCast/RMCast_Retransmission.cpp: - Update comments to be doxygen friendly - - * ace/RMCast/RMCast_Membership.cpp: - Fixed problems in Ack management, we were stopping the useful - Acks, not the ones that just represented repeated information. - - * tests/RMCast/Makefile: - * tests/RMCast/RMCast_Membership_Test.cpp: - Add test for the ACE_RMCast_Membership class. - -Tue Sep 26 22:39:42 2000 Darrell Brunsch - - * examples/Reactor/WFMO_Reactor/test_abandoned.cpp: - - Changed the include of Synch.h to Process_Mutex.h since - Process Mutex was moved there. - -Tue Sep 26 15:06:05 2000 Joe Hoffert - - * ace/config-all.h: - * ace/OS.h: - Removed defining ACE_HAS_POSIX_SEM for ACE using PACE - from OS.h and put it into the config-all.h file. - - * ace/OS.{i,cpp}: - Added appropriate calls to pace_* functions when ACE - is using PACE. - -Tue Sep 26 14:14:17 2000 Steve Huston - - * ace/Cache_Map_Manager_T.h: Added some comments to the find() - methods to say what they do and what they return. - -Tue Sep 26 10:09:32 2000 Carlos O'Ryan - - * bin/auto_compile: - Modified to use the auto_run_tests.lst file to select the list - of tests to run. - Add new -config option to disable one or more tests, this will - allow us select new configurations that disable one or more - tests without requiring changes to the auto_compile script. - - * bin/auto_run_tests.lst: - Disable some tests in STATIC builds and under linux. - - * bin/run_all_list.pm: - This file is no longer used by auto_compile, add comments to - that effect. - -Tue Sep 26 11:51:27 2000 Steve Huston - - * ace/Log_Msg.h: Add #include "ace/config-all.h" to be sure that - ACE_NDEBUG is defined (or not) properly before using it. Thanks - to Edan Ayal for this fix. - -Mon Sep 25 16:00:30 2000 Douglas C. Schmidt - - * ace/Synch.h: Clarify that the ACE_Auto_Event and ACE_Manual_Event - classes only support USYNC_PROCESS on Win32. Thanks to Andreas - Schuelke for motivating this - change. - -Mon Sep 25 23:03:11 2000 Marina Spivak - - * bin/run_all_list.pm: - - Added TAO/tests/RTCORBA/Client_Propagated and - TAO/tests/RTCORBA/Server_Protocol to the list of auto daily - tests. - -Mon Sep 25 16:58:22 2000 Ossama Othman - - * ltcf-c.sh: - * ltcf-cxx.sh: - * ltconfig: - * ltmain.sh: - - Updates from upstream libtool multi-language CVS branch. - -Mon Sep 25 14:24:49 2000 Jeff Parsons - - * Static_performance.dsw: - - Added the modular IDL compiler projects, and set - the dependencies. - -Mon Sep 25 11:45:53 2000 Steve Huston - - * ace/config-win32-common.h: If NDEBUG is set, then also set - ACE_NDEBUG. Thanks to Edan Ayal for noting - that ACE_NDEBUG didn't always get set for Release builds. - -Sat Sep 23 16:55:26 2000 Carlos O'Ryan - - * ace/RMCast/Makefile: - Add new components to the RMCast library. - - * ace/RMCast/RMCast_Proxy.h: - * ace/RMCast/RMCast_Proxy.i: - * ace/RMCast/RMCast_Proxy.cpp: - All proxies must derive from this class, it offers methods to - send back replies directly to the peer. - - * ace/RMCast/RMCast.h: - The Proxy source is propagate among layers. - - * ace/RMCast/RMCast_IO_UDP.cpp: - All proxies are modules. - - * ace/RMCast/RMCast_Membership.h: - * ace/RMCast/RMCast_Membership.i: - * ace/RMCast/RMCast_Membership.cpp: - New module to keep an explicit collection of all the peers, - detecting join and leave messages and computing the messages - successfully received by all the peers using the Ack - information. - - * ace/RMCast/RMCast_Retransmission.h: - * ace/RMCast/RMCast_Retransmission.i: - * ace/RMCast/RMCast_Retransmission.cpp: - Buffer messages to allow retransmission. - - * ace/RMCast/RMCast_UDP_Proxy.h: - * ace/RMCast/RMCast_UDP_Proxy.i: - * ace/RMCast/RMCast_UDP_Proxy.cpp: - Modified to inherit from the new RMCast_Proxy class. - -Fri Sep 22 15:13:46 2000 Darrell Brunsch - - * ace/Atomic_Op.i: - - I was mistaken, inline was being used correctly here, - since on NT this is only included from Atomic_Op.h. - So I reverted the previous change and added a disable - command for fuzz. - -Fri Sep 22 14:49:19 2000 Darrell Brunsch - - * ace/OS.h: - * ace/README: - * ace/Synch.h: - * ace/Thread_Control.cpp: - * ace/Thread_Control.h: - * ace/ace_wchar.h: - * ace/config-all.h: - - Replaced ACE_ONLY_LATEST_AND_GREATEST with ACE_LEGACY_MODE - since we wanted to change our usage of it (and this should - be a bit clearer). - - To enable some legacy code, just define ACE_LEGACY_MODE - in config.h. - -Fri Sep 22 14:24:14 2000 Darrell Brunsch - - * apps/JAWS/remora/app/Remora_Export.h: - * apps/JAWS/remora/app/Remora_Import.h - * apps/JAWS/remora/app/remora.idl: - * apps/JAWS/remora/app/test.cc: - * examples/Web_Crawler/Command_Processor.h: - * tests/Handle_Set_Test.cpp: - - The CVS Id strings were not correctly formatted, so CVS - never recognized them or updated them. Fixed. - -Fri Sep 22 12:27:42 2000 Darrell Brunsch - - * bin/fuzz.pl: - - The checks for TEXT and TCHAR gave too many false positives. - Fixed to be a bit smarter about having these inside other - macro names (such as DEFAULTCHARS). - - Also improved detection of CVS Id strings, since it ends - up that there are several places where the strings are close - (start with $ and Id) but then are missing a colon so they - don't get updated properly. - - * WindozeCE/ACEApp.cpp: - * WindozeCE/WindozeCE.cpp: - * WindozeCE/WindozeCE.h: - * WindozeCE/WindozeCEDlg.cpp: - - Disabled the fuzz tchar check, since these are WinCE only - files and shouldn't have any problems with using the Win32 - specific character macros. - - * WindozeCE/WindozeCE.plg: (removed) - - Shouldn't be in the repository - - * ace/ACE.cpp: - - There were some TEXT's (albeit in comments) that I changed - to ACE_TEXT to make fuzz happy. - - * ace/Atomic_Op.i: - - Changed the inline's to ACE_INLINE to be consistent with the - rest of the file. - - * ace/Handle_Gobbler.i: - * apps/JAWS/remora/app/Remora_Export.i: - * apps/JAWS/remora/app/Remora_Import.i: - * examples/ASX/Event_Server/Event_Server/Options.i: - * examples/ASX/UPIPE_Event_Server/Options.i: - * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.i: - - Disabled the fuzz check for inline in these files, since - they are only included in .h files, so they should be - inline instead of ACE_INLINE. - - * apps/JAWS/clients/WebSTONE/src/bench.c: - * apps/JAWS/clients/WebSTONE/src/genrand.c: - * apps/JAWS/clients/WebSTONE/src/statistics.c: - * apps/JAWS/clients/WebSTONE/src/timefunc.c: - * apps/JAWS/clients/WebSTONE/src/webclient.c: - * apps/JAWS/clients/WebSTONE/src/webmaster.c: - * apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h: - * apps/JAWS/stress_testing/global.h: - - Disabled checks for inline and math.h, since there probably - isn't any problems with them here. - - * performance-tests/TCP/tcp_test.cpp: - * performance-tests/UDP/udp_test.cpp: - - Disabled fuzz math.h include checks. - - Fuzz reports should be pretty clean now, just some Id string - stuff to clean up. [Bug 630] - -Fri Sep 22 12:01:06 2000 Ossama Othman - - * ace/Basic_Types.h (ACE_ULongLong): - - This class does't use the ACE_ALLOC_HOOK_DEFINE macro so there - was no point in using the corresponding ACE_ALLOC_HOOK_DECLARE - macro. Removed ACE_ALLOC_HOOK_DECLARE from the ACE_ULongLong - class. - - * ace/OS.h: - * ace/config-all.h: - - Moved ACE_ALLOC_HOOK* macros to `ace/config-all.h' so that it - isn't necessary to include `ace/OS.h' just to pull in the - definition of those macros. - -Fri Sep 22 13:02:41 2000 Steve Huston - - * ace/config-all.h: Enable ACE_ONLY_LATEST_AND_GREATEST by default. - If config.h sets it to 0, then it gets disabled to allow deprecated - features to be used. Do not rely on them staying there through the - next ACE release however. - -Fri Sep 22 09:27:42 2000 Darrell Brunsch - - * ace/Logging_Strategy.cpp: - - Added ACE_TEXT to a couple of the literal strings. - - * ace/Registry.cpp: - - MSVC 5 has a different signature for RegConnectRegistry where - the first argument (machine name) is not constant. Added a cast - to fix this. [Bug 620] - -Fri Sep 22 08:30:26 2000 Carlos O'Ryan - - * ace/Proactor.cpp: - Fixed small typo for platforms that define ACE_HAS_SIG_C_FUNC - -Thu Sep 21 18:04:53 2000 Ossama Othman - - * examples/IPC_SAP/SSL_SAP/Makefile (LDLIBS): - - `-lssl -lcrypto' is needed for static builds. - -Thu Sep 21 16:54:19 2000 Nanbor Wang - - * ace/OS.cpp: Fixed a typo in . Thanks to Craig - Perras . - -Thu Sep 21 14:40:07 2000 Ossama Othman - - * ace/SSL/SSL_SOCK_Connector.h: - * ace/SSL/SSL_SOCK_Connector.i: - * ace/SSL/SSL_SOCK_Connector.cpp: - - Removed all uses "non_ssl_connect_done_" attribute. It made the - SSL_SOCK_Connector class non-reentrant, and prevented the - SSL_SOCK_Connector from being used to create additional - connections. [Bug 660] - - (connect, complete): - - Do not attempt to set the handle in SSL_SOCK_Stream if it is - already set. Doing so would cause OpenSSL to create another - socket in addition to other internal OpenSSL buffers, which - isn't necessary when reconnecting to the same endpoint. - - (ssl_connect): - - Do not set the SSL connect state if an SSL connection is already - pending. - - * ace/SSL/ACE_SSL.dsp: - - Changed output library location to be `../../bin' (equivalent to - $ACE_ROOT/bin). This change makes this project file consistent - with all other ACE/TAO projects. - - * examples/IPC_SAP/SSL_SAP/SSL-client.dsp: - * examples/IPC_SAP/SSL_SAP/SSL-server.dsp: - - Updated library path to correspond to the location of the - ACE_SSL library. It was still set to the old location. - -Thu Sep 21 11:54:58 2000 Priyanka Gontla - - * ace/Service_Config.h : - * ace/Service_Config.cpp : - - * ace/Proactor.cpp: - * ace/Proactor.h (ACE_Proactor): - - Removed dependency of Service_Config on Proactor by registering - the Proactor singleton with the Object_Manager when it is - instantiated. This way we need not call - ACE_Proactor::close_singleton () in Service_Config implementation. - -Wed Sep 20 17:25:37 2000 Steve Huston - - * performance-tests/UDP/udp_test.cpp: Use ACE_High_Res_Timer instead - of ACE_hrtime_t for calculating elapsed times. ACE_hrtime_t right - from ACE_OS::gethrtime is not always in nanoseconds, particularly on - Win32. - - * performance-tests/UDP/udp_test.{dsw dsp}: New MSVC workspace/project. - -Wed Sep 20 12:57:52 2000 Carlos O'Ryan - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add new files to the MSVC projects - - * ace/Process_Mutex.h: - Under Win32 must include "ace/Synch.h" - - * ace/WFMO_Reactor.h: - Must include "ace/Process_Mutex.h" when - ACE_ONLY_LATEST_AND_GREATEST is defined. - -Wed Sep 20 12:10:41 2000 Ossama Othman - - * ace/Basic_Types.h: - - Made inclusion of conditional on definition of - ACE_LACKS_SYS_TYPES_H macro. - -Wed Sep 20 12:00:42 2000 Carlos O'Ryan - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/ace-dll.icc: - * ace/ace-lib.icc: - * ace/File_Lock.h: - * ace/File_Lock.inl: - * ace/File_Lock.cpp: - * ace/Process_Mutex.h: - * ace/Process_Mutex.inl: - * ace/Process_Mutex.cpp: - * ace/Process_Semaphore.h: - * ace/Process_Semaphore.inl: - * ace/Process_Semaphore.cpp: - * ace/RW_Process_Mutex.h: - * ace/RW_Process_Mutex.inl: - * ace/RW_Process_Mutex.cpp: - * ace/Dynamic.cpp: - * ace/Local_Name_Space.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/MEM_SAP.h: - * ace/Naming_Context.cpp: - * ace/Synch.h: - * ace/Synch.i: - * ace/Synch.cpp: - * ace/Synch_T.h: - * ace/Thread_Exit.cpp: - * ace/Thread_Manager.cpp: - * examples/Shared_Malloc/Malloc.cpp: - * examples/Shared_Malloc/test_multiple_mallocs.cpp: - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - * examples/Threads/process_mutex.cpp: - * examples/Threads/process_semaphore.cpp: - * tests/Conn_Test.cpp: - * tests/MM_Shared_Memory_Test.cpp: - * tests/Malloc_Test.cpp: - * tests/Process_Mutex_Test.cpp: - * tests/Process_Strategy_Test.cpp: - Moved the implementation of ACE_File_Lock, ACE_Process_Mutex, - ACE_Process_Semaphore and ACE_RW_Process_Mutex to their own - files. - This removes some unwanted dependencies in the Synch file. - The ACE_ONLY_GREATEST_AND_LATEST macro was used to preserve - backwards compatibility. - -Wed Sep 20 14:51:27 2000 Steve Huston - - * ace/Basic_Types.h: Added #include after the other - system-type includes to be sure u_long is defined. - doesn't pick it up, at least on Solaris 8. - -Wed Sep 20 11:44:46 2000 Carlos O'Ryan - - * tests/run_test.pl: - * tests/run_test.lst: - Disable the ACE_Init_Test under UNIX, the test only works on NT. - -Wed Sep 20 12:55:16 2000 Steve Huston - - * ace/High_Res_Timer.(h cpp i): Win32's scale factor (from - QueryPerformanceFrequency) is very often too small a number to - convert to ticks/usec - it ends up losing about 20% of the elapsed - time in elapsed calculations. So, on Win32 only, the - global_scale_factor is now in ticks/msec, not ticks/usec. Adjusted - all of the conversions to ACE_Time_Value, nanoseconds, etc. to - account for this. - -Wed Sep 20 08:24:34 2000 Ossama Othman - - * ace/Makefile.am (INLINE_FILES): - - Corrected `CDR_Base.i' to `CDR_Base.inl'. - -Wed Sep 20 08:12:20 2000 Ossama Othman - - * tests/CDR_Test.cpp: - - Included missing `ace/SString.h' header. - -Tue Sep 19 17:12:29 2000 Ossama Othman - - * ace/Basic_Types.h: - - Added missing include of `ace/config-all.h' and - `ace/ACE_export.h'. - - Explicitly include `limits.h', `float.h' and `stdlib.h' to pull - in basic type limits (e.g. UINT_MAX) and typedefs - (e.g. ptr_arith_t). This allows `ace/Basic_Types.h' to be - included as a stand-alone header. Previously, `ace/OS.h' - must have been included at least indirectly before - `ace/Basic_Types.h'. - - * ace/CDR_Base.h: - * ace/CDR_Base.i: - * ace/CDR_Base.cpp: - - Moved base ACE_CDR class to separate set of files. This reduces - inter-header dependencies for sources that only require the CDR - types. - - * ace/CDR_Stream.h: - - Forward declared ACE_CString, and moved inclusion of - `ace/SString.h' to the `.cpp' file to reduce inter-header - dependencies. - - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - - Moved ACE_CString related methods to the `.cpp' file since the - ACE_CString method is now forward declared in the - `ace/CDR_Stream.h' header. - -Tue Sep 19 17:40:04 2000 Douglas C. Schmidt - - * ace/config-win32-common.h, - ace/config-sunos5.4-centerline-2.x.h: Removed the nonsensical - ACE_HAS_SVR5_GETTIMEOFDAY macro. Thanks to Jeff Grief for - reporting this. - -Mon Sep 18 12:39:39 2000 Ossama Othman - - * ace/OS.i (cuserid): - - When using ACE's alternate cuserid() implementation: - - ensure that the maximum length argument is non-zero - since it doesn't make sense to have a zero length user ID. - - Return a static buffer if the buffer argument is zero. This - is not reentrant but nothing else can be done in such a case. - [Bug 619] - -Mon Sep 18 11:22:02 2000 Douglas C. Schmidt - - * ace/SUN_Proactor.cpp (handle_events): Fixed a problem arising - on 64 bit Solaris platforms. Thanks to Ganesh Pai - for reporting this. - -Sun Sep 17 19:17:53 2000 Carlos O'Ryan - - * include/makeinclude/build_example.bor: - Add the IORTable library to the Simple examples. - -Sun Sep 17 17:04:22 2000 Carlos O'Ryan - - * include/makeinclude/ace_flags.bor: - Add support for the IORTable library under Borland C++ - -Sat Sep 16 16:11:39 2000 Carlos O'Ryan - - * tests/CDR_Array_Test.cpp: - Under some circumstances the buffers allocated for marshaling - did not have room for the alignment bytes. The problem was - fixed by a small overallocation. - -Fri Sep 15 16:04:26 2000 Carlos O'Ryan - - * ace/Makefile.bor: - Update the Borland Makefile - -Thu Sep 14 11:59:48 2000 Ossama Othman - - * ace/Local_Name_Space_T.cpp (resolve_i, unbind_i): - * ace/Local_Tokens.cpp (acquire, tryacquire, renew): - * ace/Message_Queue_T.cpp (enqueue_prio, enqueue_head, - enqueue_tail, next): - * ace/Stream.cpp (open): - * ace/Task.cpp (suspend, resume, activate): - * ace/Token_Invariants.cpp (mutex_acquired, reader_acquired, - writer_acquired): - - Fixed g++ "control reaches end of non-void function" warnings. - - * bin/bootstrap (ACE_HTML_MAN_PAGES): - - Fixed sed expression so that all man pages ending with `.3' are - substituted with HTML man pages ending with `.html', not just - the last man page in the list. - -Wed Sep 13 15:21:34 2000 Ossama Othman - - * ace/Synch_T.cpp (ts_init, ts_object): - - Moved code in terminating else block outside of that block, and - removed unnecessary else clauses. This fixes "control reaches - end of non-void function" warnings from GNU C++. - - * bin/autoconf_compile: - - Changed mail subject prefix from "[AUTOCONF_COMPILE]" to - "[AUTO_COMPILE]" so that those monitoring the build logs won't - have to setup an additional mail filter. - -Wed Sep 13 15:05:08 2000 Chad Elliott - - * ace/ACE.cpp - ace/SOCK_Dgram_Bcast.cpp - ace/config-chorus.h - include/makeinclude/platform_chorus4.x_g++.GNU - - Applying changes made by Wei Chiang . - Corrects a problem with recognizing ip interfaces due to dynamic - size of struct ifreq. - - Modified config-chorus.h to correctly set the CHORUS macro to the - correct version and to undefine ACE_HAS_PTHREAD_PROCESS_ENUM if - using Chorus 4.0. - - Added CHORUS_4 to the CPPFLAGS which corrects a problem with make - depend. - - Thanks Wei for finding all of these problems. - -Wed Sep 13 15:05:42 2000 Luther J Baker - - * ace/OS.h: - - ACE_HAS_PACE type redefinitions. L:3180.., L:2250 - - * ace/OS.i: - - ACE over NT implements two different kinds of mutex's. - One is a lighter CRITICAL SECTION which has a distinct - set of associated functions. In ACE_HAS_PACE code, these - functions are calling each other (on POSIX compliant - platforms, these are defined to be the same types) but - NT needs to distinguish the two. This usually means - rearranging the preprocessor code. This is just the beginning. - -Wed Sep 13 14:33:25 2000 Douglas C. Schmidt - - * ace/Service_Config.h (ACE_Service_Config): Made parse_args() - a public method to work around subtle issues with linking - services dynamically using TAO. Thanks to Paul Caffrey - for motivating this and Carlos for suggesting - the fix. - -Wed Sep 13 14:01:57 2000 Luther J Baker - - * ace/OS.i (umask): - - Missing punctuation. - -Tue Sep 12 22:00:31 2000 Steve Huston - - * ace/config-win32-common.h: Added missing 'FD_SETSIZE' to #undef - directive. - -Tue Sep 12 15:15:54 2000 Irfan Pyarali - - * ace/ACE_export.h (ACE_SINGLETON_DECLARATION): Added the new - SINGLETON_DECLARE macros. - - * ace/Timeprobe.h: Used the new macro ACE_SINGLETON_DECLARE - instead of ACE_SINGLETON_DECLARATION. This helps by not - requiring the comma which makes the precompiler think that the - comma is for an extra argument to the macro. - - Thanks to Phil Mesnier for reporting this - problem. - -Tue Sep 12 11:34:03 2000 Steve Huston - - * ace/High_Res_Timer.{h i}: Added a new function, gettimeofday_hr() - which returns the current time in a ACE_Time_Value using the - high-resolution time source. This is intended to be used as the - time retrieval function for the ACE timer queues. Be sure you - call ACE_High_Res_Timer::global_scale_factor() (or instantiate - a ACE_High_Res_Timer object) before using it to correctly - convert the timer count to a ACE_Time_Value. - - * tests/Timer_Queue_Test.cpp: Added a test for using ACE_Timer_Heap - with high-resolution timer as the time source. - - * tests/Reactor_Timer_Test.cpp: Added an option to run the test - using ACE_High_Res_Timer::gettimeofday_hr instead of the - ACE_OS::gettimeofday time retrieval. If any option is given to - the program it uses high-res, otherwise it uses ACE_OS::gettimeofday. - -Mon Sep 11 12:57:31 2000 Steve Huston - - * ace/Synch.{h i cpp} (ACE_Lock, ACE_Adaptive_Lock, ACE_File_Lock, - ACE_Semaphore, ACE_Process_Semaphore, ACE_Null_Semaphore, - ACE_RW_Mutex, ACE_Mutex, ACE_Process_Mutex, ACE_RW_Process_Mutex, - ACE_Null_Mutex, ACE_Thread_Mutex, ACE_Recursive_Thread_Mutex): - Added tryacquire_write_upgrade method. - - * ace/Synch_T.{h i} (ACE_Lock_Adapter, ACE_Reverse_Lock): Added - tryacquire_write_upgrade method. - - * ace/Token.{h i} (ACE_Token): Added tryacquire_write_upgrade - method, which is a NOP. - - Thanks to Joseph Weihs for these suggestions. - -Mon Sep 11 10:08:38 2000 Balachandran Natarajan - - * ace/Service_Manager.cpp (handle_input): Missing semicolon in a - do-while loop. - -Mon Sep 11 08:10:21 2000 Douglas C. Schmidt - - * ace/Service_Manager.cpp: There was a problem with handle_input() - on Win32 due to the default non-blocking mode of sockets. In - particular, if the client was slow/overloaded, the server recv() - would return with -1 and errno == EWOULDBLOCK. Thanks to Sandro - Doro for this fix. - - * tests: Added a new Borland-specific makefile for the ACE tests. - Thanks to Johnny Willemsen for - contributing this. - -Sun Sep 10 14:58:36 2000 Carlos O'Ryan - - * netsvcs/clients/Logger/Makefile.bor: - I left out this file when applying Christopher's patch. - -Sun Sep 10 15:43:23 2000 Douglas C. Schmidt - - * ace/Acceptor.h: Made the suspend() and resume() methods - public. Thanks to Guy Rosen - for suggesting this. - -Fri Sep 8 16:50:52 2000 Carlos O'Ryan - - * ace/OS.h: - * ace/config-all.h: - Had to #include in config-all.h to get the - definition for FUNCPTR. With this change things are happy - (again) on VxWorks. - -Fri Sep 8 13:56:50 2000 Carlos O'Ryan - - * ace/Thread_Exit.cpp: - It was not compiling under Sun/CC 4.2 and 5.0. - The fix was to make the extern "C" cleanup handler simply call - the regular cleanup handler. That solves the access problem and - it is cleaner code anyways. - -Fri Sep 8 11:30:56 2000 Christopher Kohlhoff - - * ace/config-win32-borland.h: - Added ACE_LACKS_INLINE_ASSEMBLY since the inline CDR assembly - does not currently work under BCB. Thanks to - Johnny Willemsen for reporting this. - - * ace/Makefile.bor: - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - * netsvcs/clients/Logger/Makefile.bor: - Added support for both recursion and a build in the one makefile. - - * include/makeinclude/ace_flags.bor: - * include/makeinclude/build_example.bor: - Added new libraries for TAO. - -Thu Sep 07 18:10:00 2000 Darrell Brunsch - - * ace/config-win32-common.h: - - ACE_HAS_WINSOCK2 is turned on by default for all of Win32. - Windows 98 and Windows ME should have Winsock2, and NT/2000 - also does. For Windows 95, this requires that the Winsock 2 - library for Windows 95 is added or ACE_HAS_WINSOCK2 defined to - 0 in config.h before including config-win32.h (overriding it). - - Thanks to Giovanni Zito for inquiring - about this. - -Thu Sep 07 17:21:17 2000 Carlos O'Ryan - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add the new files the ACE projects. - -Thu Sep 7 16:15:24 2000 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.cpp: - Break out the dependency between the ACE_Thread_Manager and the - OS layer. The OS layer used ACE_Thread_Adapter to create - threads, this class depends on ACE_Thread_Manager, but on the - path used by the OS layer the class does not use Thread_Manager - at all. The solution was to create a base class - (ACE_Base_Thread_Adapter) and a specialized version used in the - OS layer (ACE_OS_Thread_Adapter). - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - Update the Makefile and the dependencies. - - * ace/Base_Thread_Adapter.h: - * ace/Base_Thread_Adapter.inl: - * ace/Base_Thread_Adapter.cpp: - Abstract base class for ACE_Thread_Adapter. Applications - continue to use ACE_Thread_Adapter, but the OS layer uses the - base class (or OS_Thread_Adapter). This way we decouple the OS - layer from the ACE_Thread_Manager class. - - * ace/config-all.h: - Move the definition of ACE_THR_FUNC and ACE_THR_C_FUNC out here. - - * ace/OS_Thread_Adapter.h: - * ace/OS_Thread_Adapter.inl: - * ace/OS_Thread_Adapter.cpp: - Implement a version of ACE_Base_Thread_Adapter that does not use - the Thread_Manager at all. - - * ace/Thread_Adapter.h: - * ace/Thread_Adapter.inl: - * ace/Thread_Adapter.cpp: - Removed the common code to Base_Thread_Adapter.* - - * ace/Thread.h: - Include "ace/Thread_Adapter.h" directly because the OS layer - does not include it anymore. - - * ace/Thread_Hook.h: - * ace/Thread_Hook.cpp: - This class does not need to #include Thread_Manager.h - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - Add another hook to make the ACE_OS_Thread_Descriptor available - to the OS layer when running MFC builds. - - * ace/Thread_Exit.cpp: - The is_constructed_ flag is reset in the cleanup function - instead of letting the OS layer do it. - -Thu Sep 7 12:07:14 2000 Ossama Othman - - * bin/autoconf_compile (LOGBASE): - - Create log file with `.txt' extension instead of `.log' to - prevent web browsers from needlessly prompting users which - viewer should be used. - - * m4/acinclude.m4: - - Updated copyright information. - - * m4/platform.m4: - - When setting platform-specific flags, use the "$host" autoconf - variable instead of "$target." The latter is only supposed to - be used when building cross-platform tool chains. - - * m4/threads.m4 (CPPFLAGS): - - Place user provided preprocessor flags after the ones set by the - configure script to allow the user to override automatically - set flags. - -Thu Sep 07 14:30:49 2000 Nanbor Wang - - * bin/auto_compile_win32.pl: Added Portable Server to the project - lists in (DLL Debug/Release). Thanks to Bruce McIntosh - for reporting this - -Thu Sep 07 11:36:51 2000 Ossama Othman - - * ace/SSL/SSL_Context.cpp (set_mode): - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - * ace/SSL/SSL_SOCK_Stream.i (recv, send): - - Do not print OpenSSL error message if ACE_NDEBUG is defined. - -Thu Sep 7 10:52:47 2000 Jeff Parsons - - * tests/CDR_Array_Test.cpp: - - Code intended to allocate and zero and source buffer and - destination buffer was actually zeroing the source buffer - twice. Thanks to Johnny Willemsen - for reporting this bug. - -Thu Sep 07 11:16:36 2000 Steve Huston - - * examples/Reactor/WFMO_Reactor/test_network_events.cpp: Add a - destructor to Network_Listener which will unregister it from the - reactor, and prevent a doomed call to handle_close when the - reactor runs down. Thanks to John Buckman for - reporting this. - -Wed Sep 06 19:06:57 2000 Carlos O'Ryan - - * ACE version 5.1.9 released. - -Tue Sep 05 13:34:26 2000 Steve Huston - - * ace/TP_Reactor.cpp (dispatch_i): Try to correct mis-set size_ - in the any_ready_ handle sets by sync()ing them if the reactor - state has not been changed. This is an attempted workaround to - a symptom of having the handle set say size_ > 0 but there are - no bits set. The underlying cause is not known. - Also, reverse the eval order when checking !found_io && handle_iter - done to avoid doing another iter call when not needed. - -Mon Sep 04 10:25:27 2000 Steve Huston - - * ace/TP_Reactor.cpp (dispatch_i): If a handle's bit is set via - select in any of the masks (wr, ex, rd) and subsequently the - handle is selected for dispatching, clear it in all masks to - prevent possible spinning on a handle that can't be dispatched - because its handler is suspended. - -Sat Sep 2 15:13:59 2000 Carlos O'Ryan - - * ace/CDR_Stream.h: - Fixed typo in macro name. - -Sat Sep 2 12:22:59 2000 Carlos O'Ryan - - * ace/CDR_Stream.h: - Define macros to initialize a LongDouble, this is needed to - avoid warnings in some ORB code. - -Sat Sep 2 07:14:06 2000 Douglas C. Schmidt - - * ace/config-sunos5.5.h: Added ACE_LACKS_PLACEMENT_OPERATOR_DELETE - to fix a bug with SunC++ 4.1. Thanks to Sameer Schabungbam - for reporting this. - -Fri Sep 1 16:50:50 2000 Jeff Parsons - - * ace/Configuration.cpp: - - The method export_section contained a delete of a void*. - Many compilers warn about this. Cast the void* to char*. - -Fri Sep 1 13:25:24 2000 Jeff Parsons - - * ace/Configuration.cpp: - * ace/Configuration.h: - - Checked in some fixes to ACE_Configuration sent in by - Chris Hafey . Chris writes: - - Fixed a handle leak in export_config(). - Thanks to Matthew Adams for reporting the bug. - - Fixed a memory leak in export_section() for binary types. Fixed a - bug in get_binary_data() for the registry version where binary - values > ACE_DEFAULT_BUFSIZE wouldn't be retrieved correctly. For - win32 versions, we now export unrecognized types as BINARY values - rather than fail entirely. Fixed a bug where the size of a new - section name was calculated incorrectly for unicode builds. - Thanks to Vijay Aswadhati for reporting - this. [Bug 649] - -Fri Sep 01 03:08:59 2000 Nanbor Wang - - * ace/Task.h: - * ace/Thread_Manager.h: - * ace/Thread_Manager.cpp: For some reason, the method - that takes a thread_id array did not take the pointer. - If a user "activate"'ed a task and asking for the thread_id's, - these thread would not be marked as these task, which caused - they unaccounted for in subsequent wast_task. Fixed the problem - by adding the argument to and make sure the - task pointer is passed in method. Thanks to Mervyn - Quah for reporting the bug. - [Bug 616] - -Thu Aug 31 15:31:30 2000 Douglas C. Schmidt - - * include/makeinclude/outputdir.bor: Added a comment to explain - how the OBJDIR macro works when the -DPASCAL option is used. - Thanks to Marcel Van Der Weert and - Christopher Kohlhoff for reporting this. - -Thu Aug 31 08:32:11 2000 Albert Wijnja - - * tests/TSS_Test.cpp (ITERATIONS): replaced calculation of - ITERATIONS so that it is now dependent on ACE_MAX_THREADS. - [Bug 657] - -Wed Aug 30 10:20:04 2000 Carlos O'Ryan - - * bin/run_all_list.pm: - Enable the Trading Service tests under Minimum CORBA, since now - they are compiled in that configuration too. - -Tue Aug 29 14:27:37 2000 Chad Elliott - - * include/makeinclude/platform_chorus4.x_g++.GNU - Made an additional modification to use the $(MERGEDIR)/Paths - include file if MERGEDIR is defined. - -Tue Aug 29 12:23:41 2000 Steve Huston - - * ace/TP_Reactor.(h cpp): Added a new dispatch_i_protected method. - This just wraps the call to dispatch_i in ACE_SEH_TRY/EXCEPT. - If/when the reactor is rearranged to pluck one dispatchable event - to call at a time, this can be removed. - - This fixes the removal of SEH from this entry: - Fri Aug 25 16:29:51 2000 Steve Huston - -Tue Aug 29 01:32:28 2000 Carlos O'Ryan - - * ace/Logging_Strategy.h: - Add missing header file (Log_Msg.h) - -Mon Aug 28 20:37:21 2000 Luther J Baker - - * ace/OS.i (rename): - * ace/OS.i (pipe): - - Changed type #if (ACE_HAS_PACE) when all the rest of the - files use #if defined (ACE_HAS_PACE). Changed mainly for - consistency. - -Mon Aug 28 18:04:17 2000 Luther J Baker - - * ace/ace_lib.dsp: - * ace/ace_dll.dsp: - - Added additional #include ../PACE search directories - to project settings. - -Mon Aug 28 17:43:00 2000 Luther J Baker - - * ace/config-win32.h: - - Added support for PACE and win32. - - * ace/OS.h::2283 - - Altered code to support - #define ACE_HAS_PACE && #define WTHREADS. - -Mon Aug 28 15:05:27 2000 Michael Kircher - - * ace/OS_Dirent.cpp: Changed a condition in readdir_emulation () - to query properly for an invalid file handle. Thanks to - Nir Drang for reporting this. - -Mon Aug 28 12:16:27 2000 Ossama Othman - - * ace/Makefile.am (libACE_OS_la_SOURCES, HEADER_FILES, - INLINE_FILES): - - Added new Thread_{Adapter, Control, Exit, Hook} source files to - these make variables. - -Mon Aug 28 11:56:42 2000 Ossama Othman - - * configure.in (ACE_HAS_PENTIUM): - - Only define this macro if the hardware is x86 *and* GNU C++ is - being used since the code enabled by this macro contains - assembler code specific to that compiler. - Reported by Rich Seibel - -Mon Aug 28 11:18:27 2000 Ossama Othman - - * ace/config-irix6.5.x-sgic++.h: - - Configuration header for IRIX 6.5.x contributed by J. Russell - Noseworthy . [Bug 623] - -Mon Aug 28 10:27:45 2000 Chad Elliott - - * include/makeinclude/platform_chorus4.x_g++.GNU - Modified the platform macros file to use the new variable - definitions provide by the "Paths" make include file. Also, - removed the use of the old (3.x) chorus macros file. - -Sat Aug 26 17:39:53 2000 Douglas C. Schmidt - - * ace/config-all.h: Added new ACE_CONST_WHEN_MUTABLE macro. - Thanks to Edan Ayal for contributing this. - - * ace/Logging_Strategy: Added support for more fine-grained - control over logging strategies and priorities. Thanks to - Martin Krumpolec for reporting this. - - * ace: Improved the "const correctness" of many Reactor methods. - Thanks to Edan Ayal for contributing this. - -Sat Aug 26 15:23:54 2000 Carlos O'Ryan - - * ace/OS.cpp: - Commented out another ACE_DEBUG statement, there should be no - printing from the ACE_OS layer. - Fixed use of obsolete ACE_LOG_MSG accessors for the event - handling fields. - -Sat Aug 26 12:00:18 2000 Douglas C. Schmidt - - * ace/Service_Repository.cpp: Modify the remove() method so that - it is "re-entrant" i.e., one can call it from other svc's fini() - called from remove(). Thanks to Martin Krumpolec - for contributing this fix. - -Fri Aug 25 18:09:04 2000 Carlos O'Ryan - - * ace/config-win32.h: - * ace/OS.cpp: - * ace/Thread_Adapter.cpp: - Factor out the definition of ACE_ENDTHREADEX to the - config-win32.h file. - -Fri Aug 25 17:11:25 2000 Carlos O'Ryan - - * ace/Thread_Control.h: - * ace/Thread_Control.cpp: - Fixed problems with the backwards compatible configuration - (i.e. ACE_HAS_ONLY_LATEST_AND_GREATEST not defined). - -Fri Aug 25 16:15:50 2000 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: - * ace/Thread_Adapter.h: - * ace/Thread_Adapter.inl: - * ace/Thread_Adapter.cpp: - * ace/Thread_Control.h: - * ace/Thread_Control.inl: - * ace/Thread_Control.cpp: - * ace/Thread_Exit.h: - * ace/Thread_Exit.cpp: - * ace/Thread_Hook.h: - * ace/Thread_Hook.cpp: - * ace/Thread_Manager.h: - * ace/Thread_Manager.i: - * ace/Thread_Manager.cpp: - Move ACE_Thread_Adapter and its friends to a new directory. - This was important to discover why OS.o depends on - Thread_Manager.o and how we can break that dependency. - I'm commiting the change because it will help the compiler when - linking static libraries and it is easier to maintain this way. - - * ace/OS_String.cpp: - Cosmetic changes. - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/ace.icc: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add all the new files to the system. - - * tests/Task_Test.cpp: - We must #include the Thread_Hook.h file directly - - * */Makefile: - Updated all the dependencies for ace. - -Fri Aug 25 15:15:27 2000 Ossama Othman - - * Makefile.am (EXTRA_DIST): - - Added libtool shell script fragments `ltcf-c.sh' and - `ltcf-cxx.sh' to the list of additional files to be packaged - with the distribution. - - * ace/Makefile (TEMPLATE_FILES): - - Added `Hash_Map_With_Allocator_T' to the list of template - source files. It was missing. - - * ace/Makefile.am: - - Updated to include all newly added source files. - -Fri Aug 25 16:29:51 2000 Steve Huston - - * ace/TP_Reactor.cpp: Temporarily remove the ACE_SEH directives - to get the build working on Win32. Will fix this correctly and put - in a new file soon. - -Fri Aug 25 15:43:28 2000 Steve Huston - - * docs/ACE-guidelines.html: Add the "use this->member" rule when - referring to member functions or variables. Thanks to Edan Ayal - for the reminder to add this rule. - -Fri Aug 25 12:12:40 2000 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - * ace/config-all.h: - I removed the direct cyclic dependency between the OS layer and - Log_Msg. The OS layer does not use Log_Msg anymore, but it does - use parts of ACE_Thread_Manager so there is some work left to - do. - There was a semantic change involved: the Win32 exception - handlers used to be TSS, now they are global. There was not a - real use case for that feature. Users that enable - ACE_HAS_ONLY_LATEST_AND_GREATEST will not get the TSS version of - the functions, I think it is better to make the change visible - than hide it behind a seemingly compatible interface that - actually breaks at run-time. - -Fri Aug 25 14:29:27 2000 Steve Huston - - * ace/Select_Reactor_T.h: Added new method, is_suspended_i (ACE_HANDLE) - to see if the handle is suspended or not. It's used in the TP_Reactor - to avoid dispatching suspended handlers. - - * ace/Select_Reactor_T.cpp: New method, is_suspended_i. - (any_ready_i): Do not clear this->ready_set_ if that's the - set that was scanned for ready bits. TP_Reactor - now uses that set directly, and clearing it - sort of defeats the purpose. - (suspend_i): Fixed function name in ACE_TRACE. - - * ace/TP_Reactor.h: Added dispatch_i function; Removed dispatch_io_set - function and the ACE_EH_Dispatch_Info dispatch_info_ member - - they're not used anymore. - - * ace/TP_Reactor.cpp (handle_events): Does not call handle_events_i - in Select_Reactor_T anymore. New function, dispatch_i, handles - the work that handle_events_i does for ACE_Select_Reactor - does - the wait_for_multiple_events, dispatches timers, signals, and - notifications; then, though, it records one dispatchable I/O - event for return to handle_events (similarly to what dispatch_io_set - used to do when it was called from handle_events_i). All of the - token acquiring and releasing now goes on in this function only. - Also, the return value (number of dispatched events) is now - correct. - - The effect of all this is that TP_Reactor now saves the - ready_set_ bits and the threads running the reactor will dispatch - the handlers one by one until they're gone or the reactor state - changes in a way that forces select to be re-done. - - This set of changes fixes Bugzilla # 567. - -Fri Aug 25 14:23:36 2000 Steve Huston - - * ace/Handle_Set.i (reset): Commented out the #if !defined for - ACE_HAS_BIG_FD_SET; use FD_ZERO to clear the fd bits. This was - previously not being done for Linux (which has ACE_HAS_BIG_FD_SET) - and it caused grief in the reactor when scanning for bits in - sync (). This caused the (new, see above) TP_Reactor to always - think there were many bits set in ready_set_ after each dispatched - I/O and needlessly scan through them all. - -Fri Aug 25 09:22:11 2000 Chad Elliott - - * include/makeinclude/platform_sunos5_sunc++.GNU - Modified check for SunCC 5 to work with 5.0 and 5.1 (Forte). - -Thu Aug 24 09:01:23 2000 JLopez - - * ace/config-tru64.h: #define ACE_LACKS_SYSTIME_H with - DIGITAL_UNIX >= 0x40E, not 0x40F, because that's needed - on Tru64 UNIX 4.0E. Thanks to jlopez@uida.es for - reporting this. - -Mon Aug 21 10:07:39 2000 Carlos O'Ryan - - * ace/RMCast/RMCast_IO_UDP.cpp: - Fixed warnings about unused variables. - - * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp: - Add newline to debug output, it was completely unreadable - otherwise. - - * ace/RMCast/Makefile: - * tests/RMCast/Makefile: - Updated file list and dependencies. - -Mon Aug 21 08:58:19 2000 Carlos O'Ryan - - * Another iteration on the design. This time we use a single - Module to process IO events, the same class can be used on the - receiver and sender sides. The type of proxies is fixed, all - the variation is moved into the Modules, controlled by a module - factory. - - * ace/RMCast/README: - Add a new README file. - - * ace/RMCast/RMCast_Module.h: - * ace/RMCast/RMCast_Module.cpp: - Modules can pass and process control messages as well as data - messages, add new methods for the control messages. - - * ace/RMCast/RMCast_IO_UDP.h: - * ace/RMCast/RMCast_IO_UDP.i: - * ace/RMCast/RMCast_IO_UDP.cpp: - New class to manage all the IO events. - - * ace/RMCast/RMCast_UDP_Event_Handler.h: - * ace/RMCast/RMCast_UDP_Event_Handler.i: - * ace/RMCast/RMCast_UDP_Event_Handler.cpp: - Modified to use the new RMCast_IO_UDP class. - - * ace/RMCast/RMCast_UDP_Proxy.h: - * ace/RMCast/RMCast_UDP_Proxy.i: - * ace/RMCast/RMCast_UDP_Proxy.cpp: - New module used for both the client and server sides. - - * ace/RMCast/RMCast_Module_Factory.h: - * ace/RMCast/RMCast_Module_Factory.i: - * ace/RMCast/RMCast_Module_Factory.cpp: - Create and destroy a module stack. Used by both the receiver - and sender sides to control the type of event processing they - can perform. - - * ace/RMCast/RMCast.h: - Minor changes in the field names and comments. - - * ace/RMCast/RMCast_Fragment.h: - * ace/RMCast/RMCast_Fragment.cpp: - * ace/RMCast/RMCast_Reassembly.h: - * ace/RMCast/RMCast_Reassembly.cpp: - Modified to use the new methods in the Module interface. - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp: - Modified to use the new classes. - - * tests/RMCast/RMCast_Tests.dsw: - * tests/RMCast/RMCast_UDP_Best_Effort_Test.dsp: - Add new project file for the UDP best effort test. - - * ace/RMCast/RMCast.dsp: - Update the project file. - - * ace/RMCast/RMCast_Sender_Proxy.h: - * ace/RMCast/RMCast_Sender_Proxy.i: - * ace/RMCast/RMCast_Sender_Proxy.cpp: - * ace/RMCast/RMCast_Sender_Proxy_Best_Effort.h: - * ace/RMCast/RMCast_Sender_Proxy_Best_Effort.i: - * ace/RMCast/RMCast_Sender_Proxy_Best_Effort.cpp: - * ace/RMCast/RMCast_Sender_Proxy_Factory.h: - * ace/RMCast/RMCast_Sender_Proxy_Factory.i: - * ace/RMCast/RMCast_Sender_Proxy_Factory.cpp: - * ace/RMCast/RMCast_UDP_Receiver.h: - * ace/RMCast/RMCast_UDP_Receiver.i: - * ace/RMCast/RMCast_UDP_Receiver.cpp: - * ace/RMCast/RMCast_UDP_Sender.h: - * ace/RMCast/RMCast_UDP_Sender.i: - * ace/RMCast/RMCast_UDP_Sender.cpp: - Removed. - -Fri Aug 18 12:36:21 2000 Steve Huston - - * ace/SUN_Proactor.cpp (find_completed_aio): Wrapped ACE_GUARD_RETURN - with ACE_MT to build ok single-threaded. - -Thu Aug 17 05:48:51 2000 Douglas C. Schmidt - - * ace/config-win32-common.h: Wrapped the redefinition of FD_SETSIZE - to #undef if it's already set to avoid a compiler/pre-processor - warning. Thanks to Johnny Willemsen - for contributing these. - -Wed Aug 16 06:03:11 2000 Douglas C. Schmidt - - * ace/Select_Reactor_Base.h: Make the notify_queue_lock_ in - ACE_Select_Reactor_Notify an ACE_SYNCH_MUTEX rather than an - ACE_SYNCH_RW_MUTEX to be consistent. Thanks to Ivan Murphy for - reporting this. - -Tue Aug 15 20:54:14 2000 Darrell Brunsch - - * ace/Logging_Strategy.cpp: - * ace/Logging_Strategy.h: - * ace/OS.i: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - * ace/ace_wchar.h: - - Fixed miscellaneous wide character support problems. - Also [Bug 600] - -Mon Aug 14 21:55:54 2000 Joe Hoffert - - * ace/OS.{h,i}: - Added function typedefs for pace_signal for compiling - ACE with PACE for LynxOS. - -Fri Aug 11 17:49:36 2000 Steve Huston - - * ace/TP_Reactor.cpp: Add #include "ace/Thread.h" to pick up the - definition of ACE_Thread::self (). - -Fri Aug 11 16:24:13 2000 Shawn Hannan - - * ace/OS.i: For VXWORKS, changed checks of errno against - S_objLib_OBJ_TIMEOUT to S_objLib_OBJ_UNAVAILABLE after calls - to semTake with timeout parameter set to NO_WAIT (i.e., 0). - semTake will set errno to _UNAVAILABLE, not _TIMEOUT, if - the semaphore is empty and the timeout parameter is 0. - Thanks to Peter Fischer for reporting - this. - -Fri Aug 11 13:20:40 2000 Nanbor Wang - - * apps/gperf/src/gperf_lib.dsp: Changed the format for generated - debug info from C7 to "Program Database" to conform to rest of - the ACE project files. Thanks to Espen Harlinn - for reporting this. - -Fri Aug 11 11:06:30 2000 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU: moved - -hidden /usr/lib/cmplrs/cxx/libcxxstd.a -non_hidden to end - of link line by moving it from SOFLAGS to the end of LIBS. - This allows links to succeed with -D__USE_STD_IOSTREAM. Thanks - to Jorn Jensen for finding this solution to - the link problem, and to Michael Kramer - for verifying that it works. - -Fri Aug 11 07:40:10 2000 Douglas C. Schmidt - - * ace/WFMO_Reactor.cpp (open): Removed an unnecessary ACE_UNUSED_ARG(sh). - Thanks to Pedro Brandao for reporting this. - -Thu Aug 10 12:22:31 2000 Steve Huston - - * ace/Svc_Handler.h (close): Added some comments to help make this - function easier to understand. - -Thu Aug 10 12:15:16 2000 Steve Huston - - * ace/POSIX_Proactor.(h cpp) (ACE_POSIX_AIOCB_Proactor): Surround - definition of mutex_ member in ACE_MT_SAFE; use ACE_MT around - ACE_GUARD_RETURN macros to build clean without threads. - -Thu Aug 10 09:31:51 2000 David L. Levine - - * ace/config-cxx-common.h: with __USE_STD_IOSTREAM, added - #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1. Now, - the ACE library builds with __USE_STD_IOSTREAM, thanks - to Michael Kramer . - - Also, removed duplicate #define ACE_HAS_STANDARD_CPP_LIBRARY 1, - and move the remaining one to inside the if (__DECCXX_VER >= - 60090010) check. I don't know if it is supported on older - versions of cxx. - -Thu Aug 10 04:04:31 2000 John Heitmann - - * ace/OS.cpp: - Added pace version of thr_create and thr_exit. - - * ace/OS.h: - Added pace #define for pthread_cleanup_* - Deleted all ansi cast defines since they were - also redundantly defined in config-all.h - - * ace/OS.i: - Put all pace functions in the global scope. Minor - fixes. - - * examples/Shared_Malloc/Malloc.cpp - Removed template instantiations which are duplicated - in ACE.cpp. - -Wed Aug 9 18:16:26 2000 Carlos O'Ryan - - * ace/RMCast/RMCast.h: - * ace/RMCast/RMCast.i: - * ace/RMCast/RMCast.cpp: - Document the state transitions for the receivers, the message - formats, and the state transitions for the senders. - - * ace/RMCast/RMCast_Module.h: - * ace/RMCast/RMCast_Module.i: - * ace/RMCast/RMCast_Module.cpp: - Instead of using the ACE ASX framework we are using a lighter - weight class hierarchy. The Module interface will contain - explicit calls for all the relevant control messages, making it - easier to implement and debug. - In the future we may move back to the ASX framework, once all - the implementation problems have been nailed down. - - * ace/RMCast/RMCast_Fragment.h: - * ace/RMCast/RMCast_Fragment.i: - * ace/RMCast/RMCast_Fragment.cpp: - Use the RMCast_Module classes instead of ACE_Task. - The header information is propagated in the RMCast::Data - structure and put on a separate iovec entry by the bottom module - in the stack. - - * ace/RMCast/RMCast_Partial_Message.h: - * ace/RMCast/RMCast_Partial_Message.cpp: - Fixed missing #include and corrected a number of problems in the - implementation of the reassembly algorithm. The randomized test - passes cleanly now, even on machines with multiple CPUs. - - * ace/RMCast/RMCast_Reassembly.h: - * ace/RMCast/RMCast_Reassembly.i: - * ace/RMCast/RMCast_Reassembly.cpp: - Use the RMCast_Module classes instead of ACE_Task. - The header information is propagated in the RMCast::Data - structure and obtained from the first bytes in the message - decoded, but all that magic is performed by the Module at the - bottom of the stack. - - * ace/RMCast/RMCast_Sender_Proxy.h: - * ace/RMCast/RMCast_Sender_Proxy.i: - * ace/RMCast/RMCast_Sender_Proxy.cpp: - This class is used in the receiver side to maintain information - about one sender, and to provide an entry point to the - per-sender module stack. - - * ace/RMCast/RMCast_Sender_Proxy_Best_Effort.h: - * ace/RMCast/RMCast_Sender_Proxy_Best_Effort.i: - * ace/RMCast/RMCast_Sender_Proxy_Best_Effort.cpp: - An specialized Sender_Proxy that ignores all the control - messages, essentially working in best effort mode. - - * ace/RMCast/RMCast_Sender_Proxy_Factory.h: - * ace/RMCast/RMCast_Sender_Proxy_Factory.i: - * ace/RMCast/RMCast_Sender_Proxy_Factory.cpp: - Define the interface to create Sender_Proxy instances. The - application provides an instance of this class in the receiver - side to customize the protocol. - - * ace/RMCast/RMCast_UDP_Receiver.h: - * ace/RMCast/RMCast_UDP_Receiver.i: - * ace/RMCast/RMCast_UDP_Receiver.cpp: - Implement a UDP based receiver. - Applications create an instance of this class, customized - through the Sender_Proxy_Factory, to receive messages. - The class can be used in (timed) blocking mode or through the - reactor (using the UDP_Event_Handler helper class). - - * ace/RMCast/RMCast_UDP_Sender.h: - * ace/RMCast/RMCast_UDP_Sender.i: - * ace/RMCast/RMCast_UDP_Sender.cpp: - A Module that sends a single fragment using UDP multicast. - This version does not send or receive any control messages, so - it is best-effort. - - * ace/RMCast/RMCast_UDP_Event_Handler.h: - * ace/RMCast/RMCast_UDP_Event_Handler.i: - * ace/RMCast/RMCast_UDP_Event_Handler.cpp: - Adapter between the Reactor and the UDP_Sender class. - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - Fixed to match the new interfaces - - * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp: - New unit test for the best effort UDP based senders and - receivers. - It creates a sending thread that continuosly send messages to a - single multicast address, meanwhile the main thread receives all - the messages and verifies that they have the expected contents. - It should be expandded to randomize the contents and create - multiple sending threads. - - * tests/RMCast/Makefile: - * ace/RMCast/Makefile: - Add new files, updated dependencies - - * ace/RMCast/RMCast_Header_Size.h: - * ace/RMCast/RMCast_Header_Size.cpp: - Removed - -Wed Aug 9 13:28:20 2000 Douglas C. Schmidt - - * ace/Message_Queue_T.cpp (dequeue_head_i): Make sure to reset - head_ and tail_ to 0 when the cur_count_ drops to 0. Thanks to - Zoran Ivanovic for this fix. - -Wed Aug 09 18:06:40 2000 Pradeep - - * ACE version 5.1.8 released. - -Wed Aug 09 10:10:45 2000 David L. Levine - - * tests/CDR_Array_Test.cpp: disabled LongLong test if - the platform doesn't have native long long support. - ACE's long long emulation doesn't have sufficient - capability to support what the test needs. - Thanks to Peter Kroener - for reporting this. [Bug 632] - - -Tue Aug 08 10:35:04 2000 Rich Seibel - - * ace/config-sunos5.8.h: added. We have compiled successfully - with it on Solaris 8.0 using both gcc 2.95.2 and Sun 5.0 compilers. - It simply includes the 5.7 config.h file. I have noted that there - are some possible efficiencies which autoconfig finds, but this - works. - -Mon Aug 7 21:05:35 2000 Vishal Kachroo - - * examples/QOS/server.dsp: - * examples/QOS/client.dsp: Made changes to add the relative path - for aced.lib. - -Mon Aug 07 07:31:23 2000 Peter Fischer - - * ace/OS.cpp (cond_timedwait): on VxWorks, handle - S_objLib_OBJ_UNAVAILABLE by setting error to ETIME - if msec_timeout is 0. This allows Message_Queue_Test - to succeed. - - * tests/run_tests.vxworks: re-enabled Message_Queue_Test. - -Sun Aug 6 21:40:42 2000 Darrell Brunsch - - * ace/OS.i: - * ace/OS.cpp: - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - * ace/ace_wchar.h: - * ace/config-all.h - * ace/config-linux-common.h: - * ace/config-win32-common.h: - - Fixed up miscellaneous problems with ACE_HAS_WCHAR on Linux. - Highlights are: - - - Added ACE_HAS_VFWPRINTF and ACE_HAS_VFWPRINTF to NOTSUP a - couple of methods, since they don't seem to be available yet. - - Added ACE_LACKS_WCSDUP_PROTOTYPE, and added the prototype. - - Removed an extra copy of itoa_emulation (..wchar_t..). - - Added some static_cast's to remove unsigned/signed comparison - warnings. - - Added ACE-HAS_SAFE_WCSTOK, since the version supplied with MSVC - is the multi-threaded unsafe version (just like strtok). Here - it is similar to strtok_r. - -Sun Aug 6 17:03:29 2000 Ossama Othman - - * include/makeinclude/wrapper_macros.GNU (CPPFLAGS): - - Define ACE_HAS_SSL=1 instead of just defining ACE_HAS_SSL - without an explicit value. - -Sat Aug 5 21:49:12 2000 Darrell Brunsch - - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - * ace/config-win32-borland.h: - - Chris Kohlhoff pointed out to me that Borland does have itoa, - but the signature is slightly different (itoa, not _itoa). - Added it back in for Borland and added some preprocessor - commands that will keep the emulation code from being included - unless it is needed. - -Sat Aug 5 11:19:23 2000 Darrell Brunsch - - * ace/config-win32-common.h: - * ace/config-win32-msvc.h: - - Moved ACE_HAS_ITOA to msvc.h, since it is compiler dependent (and - Borland doesn't have it). - -Sat Aug 05 11:26:08 2000 Ossama Othman - - * bin/generate_export_file.pl: - - Changed "#if !defined (...)" include guard to "#ifndef ..." - since some preprocessors enable "process once" optimizations if - the latter form is used. - -Sat Aug 5 01:13:01 2000 Darrell Brunsch - - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - - Added itoa, which takes in a value, string, and radix. It then - populates the string with the representation of the value in that - radix. - - * ace/config-win32-common.h: - - Turned on ACE_HAS_ITOA. - -Fri Aug 4 15:53:27 2000 Carlos O'Ryan - - * ace/TP_Reactor.h: - * ace/TP_Reactor.cpp: - The owner_ field has no effect in the TP reactor, but setting it - or checking its value wakes up the leader thread. This can - result in performance problems for applications that use both TP - and regular reactors, such as TAO. - Thanks to Brian Wright for detecting the - problem and putting us in the right track to solve it. - -Thu Aug 3 17:50:39 2000 Carlos O'Ryan - - * THANKS: - * ace/config-irix6.x-sgic++-nothreads.h: - * include/makeinclude/platform_irix6.x_sgic++.GNU: - Define ACE_HAS_EXCEPTION in the command line, so we can - configure exceptions in a single spot. - Enabled the -LANG:std option by default. - Detect if -LANG:std is used and enable the corresponding ACE - macros. - Thanks to John Hiltenbrand for detecting - this problem and suggesting the fixes. - -Thu Aug 03 17:40:01 2000 Eric Ding - - * include/makeinclude/platform_linux.GNU - Remove ifeq($(threads),1), xt_reactor=0, fl_reactor=0, - and add -I/usr/X11R6/include, -L/usr/X11R6/include to - platform_GL flags. - Patch supplied by Craig Rodrigues - http://www.gis.net/~craigr - rodrigc@mediaone.net - -Wed Aug 2 17:44:58 2000 Balachandran Natarajan - - * ace/config-win32-borland.h: Suppress all warnings from the - preprocessor so that the IDL compiler does not fail on - TAO/tao/Policy.pidl. - - * ace/SSL/Makefile.bor: - * include/makeinclude/ace_flags.bor: Add makefile support for the - SSL and security libraries in ACE and TAO. - - The above patches were taken from - http://www.tenermerx.com/programming/corba/tao_bcb/patch.html, - which is the site maintained by Chistopher Kohlhoff - . - -Tue Aug 01 11:40:46 2000 Bala - - * ACE version 5.1.7 released. - -Mon Jul 31 22:51:11 2000 Balachandran - - * ACE version 5.1.6 released. - -Sat Jul 29 08:41:48 2000 David L. Levine - - * tests/Makefile: don't build CDR_Array_Test with - ACE_HAS_GNUG_PRE_2_8. Build it on LynxOS >= 3.1.0. - -Fri Jul 28 15:58:37 2000 Joe Hoffert - - * bin/pace_components: - Deleting from CVS since it is being melded into - bin/ace_components. - - * bin/ace_components: - Adding commands for pace. - - * include/makeinclude/wrapper_macros.GNU: - For PACE, modified so that it doesn't include the PACE - library if we are inlining. - -Fri Jul 28 12:46:54 2000 David L. Levine - - * tests/run_tests.lst: disabled SOCK_Send_Recv_Test, - Thread_Pool_Test, Cached_Conn_Test, and Process_Strategy_Test - on LynxOS. The work on LynxOS 3.0.0 x86, but not - on our LynxOS 3.1.0 PPC (maybe because it runs out of - resources?). - -Fri Jul 28 11:12:39 2000 David L. Levine - - * tests/Thread_Mutex_Test.cpp (spawn): use 3 threads instead - of 4 (ACE_MAX_THREADS) on LynxOS, otherwise the test doesn't - seem to terminate. - -Fri Jul 28 10:47:27 2000 David L. Levine - - * bin/ace-install: added this handy build+install script. - Thanks to Eric Mitchell for - initially authoring the script, and to Chad Elliott - for converting it from tcsh to - Bourne sh. - -Fri Jul 28 10:39:17 2000 David L. Levine - - * tests/Reader_Writer_Test.cpp (n_iterations): use - default value of 25 instead of 50 on LynxOS as well - as on VxWorks, so the test runs in a reasonable period - of time (under 1.5 seconds on a 266 MHz PPC). - -Fri Jul 28 10:34:01 2000 David L. Levine - - * test/Semaphore_Test.cpp (ACE_ALLOWED_SLACK): set - to 1100 if ACE isn't using a high resolution timer, - such as on LynxOS/PPC. - -Fri Jul 28 10:23:03 2000 David L. Levine - - * Makefile (DIRS, CLONE, CONTROLLED_FILES, RELEASE_LIB_FILES): - added PACE, so that it will be in ACE 5.1.6. - -Fri Jul 28 07:42:50 2000 David L. Levine - - * tests/Makefile: build CDR_Array_Test, even on LynxOS. - It builds and runs successfully on LynxOS 3.1.0. - -Fri Jul 28 00:23:37 2000 John Heitmann - - * ace/OS.h - Slightly modified semaphore code for pace. - - * ace/OS.i - Updated cond_timedwait in ACE_HAS_PACE to - initialize name_ to null. - - Linux uses native gettimeofday. - - * docs/ACE-SSL.html - Updated with new information about obtaining ACE+SSL. - -Thu Jul 27 18:03:24 2000 Luther J Baker - - * include/makeinclude/platform_linux_lxpthread.GNU: - - Updated to include the current correct platform_linux.GNU. - -Thu Jul 27 18:17:36 2000 Steve Huston - - * ace/Future.h: Added some comments to ACE_Future_Rep<>::set and - ACE_Future<>::set to say they only have an effect on the first - call for that object. Thanks to Andres Kruse , - Douglas C. Schmidt , and - John Tucker for their insight on the - original intentions. - -Thu Jul 27 08:32:58 2000 John Heitmann - - * ace/OS.i - Qualified two pace functions with the correct - pace_ name. Added preliminary pace implementation - for ACE_OS::gettimeofday. See PACE/ChangeLog for - other changes relevant to ACE_OS compiled with pace. - -Wed Jul 26 18:08:11 2000 Andrew G. Gilpin - - * ace/Log_Record.cpp - * ace/ACE.cpp - * ace/Handle_Set.cpp - * ace/Capabilities.{cpp, h} - Cosmetic changes required for split-cpp. - -Wed Jul 26 13:20:00 2000 Kirthika Parameswaran - - * ace/Cached_Connect_Strategy_T.h - (ACE_Bounded_Cached_Connect_Strategy): Added a typedef member - which I assumed wrongly would be inherited from the superclass. - -Tue Jul 25 22:41:53 2000 Steve Huston - - * ace/Log_Msg.cpp (ACE_Log_Msg::log): Replace use of C++ 'true' - value with '1' so old compilers still work. - -Tue Jul 25 22:35:31 2000 Steve Huston - - * ace/Future.cpp (ACE_Future_Rep::set): If two threads compete - to set the value, make sure only one notifies waiters. Thanks to - Joseph Weihs for this fix. - -Tue Jul 25 20:27:26 2000 Andrew G. Gilpin - - * ace/Naming_Context.cpp: - Cosmetic change required for split-cpp. - -Tue Jul 25 18:20:37 2000 John Heitmann - - * include/makeinclude/wrapper_macros.GNU: - Changed pace=1 code to check for inline=1, and - include libPACE correctly. - -Tue Jul 25 16:42:02 2000 Andrew G. Gilpin - - * ace/Logging_Strategy.cpp: - Changed #include "Logging_Strategy.h" to - #include "ace/Logging_Strategy.h" - -Tue Jul 25 16:12:31 2000 Andrew G. Gilpin - - * ace/Log_Msg.h: - More cosmetic changes, similar to previous ChangeLog entry. - -Tue Jul 25 15:58:27 2000 Andrew G. Gilpin - - * ace/Capabilities.{h, cpp}: - * ace/Filecache.cpp: - More fixes to allow to be used by $ACE_ROOT/bin/split-cpp. - These changes are merely cosmetic. - -Tue Jul 25 13:30:00 2000 Kirthika Parameswaran - - * ace/Cached_Connect_Strategy_T.{h, cpp}: Added - ACE_Bounded_Cached_Connect_Strategy which provides a bound on the - cache which is checked before creating new handlers. Thanks to - Edan Ayal for contributing this class and - Susan Liebeskind for brainstorming - about it. - -Tue Jul 25 05:46:29 2000 Douglas C. Schmidt - - * ace/Log_Msg.cpp (log): Optimized the check to make sure that - ACE_Log_Msg isn't too long. Now we can keep it in "non-debug" code! - Thanks to Tomer for this suggestion. - -Mon Jul 24 22:49:09 2000 John Heitmann - - * ace/OS_String.inl - - The emulation functions still need system libraries, - which were not being included when ace was enabled. - -Mon Jul 24 21:22:03 2000 Andrew G. Gilpin - - * ace/Remote_Tokens.cpp: - * ace/Signal.{cpp,h}: - * ace/Priority_Reactor.cpp: - * ace/Object_Manager.{cpp,h}: - * ace/OS.cpp: - * ace/Parse_Node.{cpp,h}: - - The script $ACE_ROOT/bin/split-cpp makes some assumptions about the - source code that it is working with. These changes allow split-cpp - to be used with ACE. These fixes are all mostly code formatting changes. - The functionality should not be changed in any case. - -Mon Jul 24 20:21:47 2000 Andrew G. Gilpin - - * include/makeinclude/wrapper_macros.GNU - * include/makeinclude/rules.local.GNU - * include/makeinclude/rules.lib.GNU - Added support for make split=1 which will use the split-cpp script - when compiling. This should be considered an extremely beta, - use-at-your-own-risk feature for the time being. - -Mon Jul 24 20:13:59 2000 Andrew G. Gilpin - - * bin/split-cpp: - Initial check-in. This script is used to split up C++ source files - into smaller C++ source files, each containing one static data - declaration or one function definition. For more information, see - the comments at the top of the file. - -Mon Jul 24 20:02:03 2000 Douglas C. Schmidt - - * ace/Process_Manager: Replaced ACE_Thread_Mutex with - ACE_Recursive_Thread_Mutex to avoid nasty self-deadlocks! - Thanks to Tom Arbuckle's - for reporting this. - - * ace/Log_Msg.cpp (log): Added a sanity check to make sure that - long messages don't corrupt the memory. Thanks to Tomer - Amiaz for contributing this. - -Mon Jul 24 14:03:59 2000 Chad Elliott - - * include/makeinclude/platform_vxworks5.x_g++.GNU - - Added the PENTIUM and PENTIUMPRO CPU's for x86 VxWorks. - -Mon Jul 24 10:30:35 2000 Michael Kircher - - * OS_Dirent.inl: Added the deletion of the DIR.directory_name_ - and the DIR struct itself for the Win32 emulation. - -Sat Jul 22 22:10:35 2000 Marina Spivak - - * config-win32-common.h - * config-win32-visualage.h: - - By default WIN32 has FD_SETSIZE of 64, which places the limit - between 61 and 64 on the number of clients a server using the - Select Reactor can support at the same time (i.e., 64 - standard - in, out, error). Raised the limit to 1024. - -Fri Jul 21 21:24:09 2000 Douglas C. Schmidt - - * ace/Parse_Node.cpp: Updated the ACE_Object_Name and - ACE_Function_Node constructors to use the new ACE::ldname() - method rather than ACE::strnew(). Thanks to Chris Kohlhoff for - this fix. - - * ace/ACE.cpp: Added a new method called ACE::ldname() so that - dynamic loading performed by the service configurator work the - same with BCB as with other compilers. With BCB, exported - functions from a DLL all have a "_" prepended. Previously you - had to explicitly add the "_" into the svc.conf or when you - called ACE_Service_Config::process_directive. This change - removes that need and makes BCB stuff source/config compatible - with other compilers. This change was prompted by Lothar - Werzinger and was provided by - Christopher Kohlhoff . - -Fri Jul 21 19:22:20 2000 Carlos O'Ryan - - * bin/auto_compile: - Use a .txt extension instead of .log for the log files, that - makes it possible to view them in web browsers without - downloading. - -Fri Jul 21 14:46:37 2000 Vishal Kachroo - - * ace/QoS_Decorator.h: Added ACE_Export for decorator classes for - WinNT. - * ace/QoS_Decorator.cpp: Removed an extra semi-colon. - -Fri Jul 21 09:11:36 2000 Douglas C. Schmidt - - * ace/Process_Manager: Updated the documentation to reflect the recent - change in the notify() implementation. - -Thu Jul 20 23:21:11 2000 Darrell Brunsch - - * examples/IPC_SAP/SSL_SAP/SSL-client.dsp: - * examples/IPC_SAP/SSL_SAP/SSL-server.dsp: - - Fixed up the include paths in these projects. - -Fri Jul 21 00:29:38 2000 Vishal Kachroo - - * examples/QOS/Receiver_QoS_Event_Handler.h: - * examples/QOS/Receiver_QoS_Event_Handler.cpp: Added this event - handler to handle QoS and socket data for the receiver. - - * examples/QOS/Sender_QoS_Event_Handler.h: - * examples/QOS/Sender_QoS_Event_Handler.cpp: Added this event - handler to handle QoS and socket data for the Sender. - - * examples/QOS/QoS_Util.h: - * examples/QOS/QoS_Util.cpp: This class provides utility funtions - like parsing QoS parameters for the QoS enabled applications. - - * examples/QOS/QoS_Signal_Handler.h: - * examples/QOS/QoS_Signal_Handler.cpp: Used to gracefully close - QoS sessions and shutdown RSVP signalling. - - * examples/QOS/FlowSpec_Dbase.h: Provides a name-Flowspec mapping - for the standard QoS flowspecs like g711. Typical QoS flowspecs - required for different video encoding/decoding schemes can be - listed here. - - * examples/QOS/Fill_ACE_QoS.h: - * examples/QOS/Fill_ACE_QoS.cpp: This class helps users to add - new flow specs and provides utility functions for filling up the - flow specs for simplex/duplex sessions. - - * examples/QOS/server.cpp: QoS enabled receiver application. - * examples/QOS/client.cpp: QoS enabled sender application. - - * examples/QOS/Makefile: - * examples/QOS/README - * examples/QOS/QOS.dsw: - * examples/QOS/client.dsp: - * examples/QOS/server.dsp: Updated these files to reflect changes - to the test. The above test demonstrates the use of various - aspects of AQoSA (ACE QoS API). - -Thu Jul 20 23:04:30 2000 John Heitmann - - * ace/Thread_Manager.cpp - * ace/OS_String.inl - Added pace functionality. - -Thu Jul 20 18:28:43 2000 Douglas C. Schmidt - - * ace/SV_Message_Queue: Made the get_id() method const. Thanks - to Mike Winter for suggesting this. - - * ace/Typed_SV_Message_Queue: Added a get_id() accessor. Thanks - to Mike Winter for reporting this. - -Thu Jul 20 14:19:06 2000 Douglas C. Schmidt - - * ace/Thread_Manager.h: Updated the comments on the various *kill*() - methods to clarify what they do and where they are not portable. - Thanks to Steve Huston for motivating this. - -Thu Jul 20 11:00:00 2000 Kirthika Parameswaran - - * ace/Caching_Utility_T.cpp: To get rid of egcs warnings on Linux, - static casted both fields of ACE_MAX in method . - Thanks to David Levine for pointing this - out. Also changed ssize_t to size_t in the cast. - -Thu Jul 20 08:04:13 2000 Douglas C. Schmidt - - * ace/OS.i: Rearranged some code so that the operator *= - and the ACE_Time_Value copy constructor appear in the right - order... Thanks to David for reporting this. - -Wed Jul 19 22:51:42 2000 Steve Huston - - * ace/OS.i (ACE_OS::cond_timedwait): For pSOS, convert absolute - time value to relative, expressed in ticks. Account for pSOS - behavior on timeout - returns with mutex unlocked. Thanks to - Sarmeesha Reddy for this fix. - -Wed Jul 19 19:30:00 2000 Kirthika Parameswaran - - * ace/Caching_Utility_T.cpp: Rectified a typo made in method - . - -Wed Jul 19 17:12:50 2000 John Heitmann - - * ace/OS.h - * ace/OS.i - Wrapped most pace calls with ACE_OSCALL to handle EINTR - correctly, minor corrections and adjustments to pace - functions. - -Wed Jul 19 16:50:00 2000 Kirthika Parameswaran - - * ace/Caching_Utility_T.cpp: Changed the formula to calculate the - as per the contribution by Edan Ayal - . Thanks to Edan for discovering this bug and - contributing the solution for it. - -Wed Jul 19 08:40:10 2000 Douglas C. Schmidt - - * ace/OS.i: Moved the new operator *= so that it's *after* - the inlined sec() and usec() members. - -Tue Jul 18 23:30:59 2000 John Heitmann - - * ace/OS.h - - Modified earlier changes to improve support for LynxOS - signals using pace. - - * ace/ACE.cpp - * ace/OS_Memory.h - - Use pace system calls instead of regular calls - when pace is enabled. - -Tue Jul 18 12:55:55 2000 Joe Hoffert - - * include/makeinclude/platform_lynxos.GNU: - Added PACE_SYSVER assignment to distinguish different - versions of LynxOS in the future. - -Mon Jul 17 23:44:36 2000 Vishal Kachroo - - * ace/Makefile (OTHER_FILES): Moved SOCK_Dgram_Mcast_QoS to the - other files category. It really belongs to a separate category - that I'll create later. - -Mon Jul 17 12:41:25 2000 Andrew G. Gilpin - - * ace/Log_Msg.cpp (LOCAL_EXTERN_PREFIX): - - Changed #define LOCALEXTERN_PREFIX to #define LOCAL_EXTERN_PREFIX - -Mon Jul 17 05:38:15 2000 Douglas C. Schmidt - - * ace/Process_Manager.cpp (open): Zapped a stray register_handler() - call that was mistakenly left around during the recent merge. - Thanks to Darrell Brunsch for reporting this. - -Sun Jul 16 18:53:42 2000 Darrell Brunsch - - * ace/TTY_IO: Removed the #define for ACE_BUILD_DLL, since it - is already defined in the .dsp file. - -Sun Jul 16 19:36:17 2000 Vishal Kachroo - - * ace/QoS_Session.h: - * ace/QoS_Session_Impl.{cpp,h,i}: - * ace/SOCK_Dgram_Mcast_QoS.cpp: Changed these files to accomodate - the new QoS decorator classes. - - * ace/QoS_Decorator.{cpp,h}: Added the QoS decoration for the - ACE_Event_Handler that enables it to catch the RAPI events along - with the usual socket events. - -Sun Jul 16 08:49:44 2000 Douglas C. Schmidt - - * ace/OS: Added multiplication operators to ACE_Time_Value. Thanks - to Tomer Amiaz for contributing these. - - * ace/Process_Manager: To fix deadlocks with the Process_Manager - on UNIX applied the following fixes: - - Use the notify() capability of the reactor from the signal - handler. This allows the signal handler to notify the reactor - (over a pipe) that the signal should be processed. This is done - completely without MT locks. If - ACE_HAS_REACTOR_NOTIFICATION_QUEUE is defined, - ACE_Select_Reactor_Notify::notify_queue_lock_ is now made a - recursive mutex. - - Thanks to Roger Larsson for contribution - these fixes. - - * ace/TTY_IO: Added additional support for the ACE serial line I/O - wrapper facades. Thanks to Martin Stack - for contribution this. - - * ace/Service_Repository.h, - * ace/Service_Object.h, - * ace/Service_Config.h: Added the following aliases: - - #define ACE_Component ACE_Service_Object - #define ACE_Component_Config ACE_Service_Config - #define ACE_Component_Repository ACE_Service_Repository - - to be consistent with the terminology in the POSA2 book. - -Fri Jul 14 19:31:39 2000 Eric Ding - - * ace/config-linux.h - * ace/config-linux-lxpthreads.h - * include/makeinclude/platform_linux.GNU - * include/makeinclude/platform_linux_lxpthreads.GNU - - Changing the default config/platform setting to thread enable on Linux - -Fri Jul 14 19:03:49 2000 John Heitmann - - * include/makeinclude/wrapper_macros.GNU: - Added -DPACE_HAS_ALL_POSIX_FUNCS to the pace flag. - - * ace/OS.h: - Changed typedef of ACE_SignalHandler on LynxOS to - use pace_sig_pf when pace is enabled. Also changed - SIG_IGN accordingly. - -Fri Jul 14 17:25:29 2000 Steve Huston - - * tests/UNIXserver.conf: - * tests/UNIXclerk.conf: - * tests/UNIXtokens.conf: - * tests/Win32server.conf: - * tests/Win32clerk.conf: - * tests/Win32tokens.conf: Look for _make_ACE_Logging_Strategy in - ACE, not netsvcs. It was moved there recently. - -Fri Jul 14 12:00:26 2000 Steve Huston - - * ace/Log_Msg.h (ACE_Log_Msg): Replaced class comments with some new - text submitted by Jerry D. DeMaster - that explain the per-thread and per-process logging enablement - clearly. - -Fri Jul 14 00:28:07 2000 John Heitmann - - * ace/OS.i - - Updates to srand and qsort to eliminate return (for pace). - -Thu Jul 13 20:25:51 2000 Douglas C. Schmidt - - * ACE-INSTALL.html: Updated this file to reflect current reality - wrt Borland C++. Thanks to Christopher Kohlhoff - for reporting this. - -Thu Jul 13 16:34:36 2000 John Heitmann - - * include/makeinclude/wrapper_macros.GNU: - - Added 'pace' flag to use pace as the underpinnings - of ACE_OS. - -Thu Jul 13 14:50:39 2000 Balachandran Natarajan - - * ace/OS.h: Undid the change - Mon Jun 19 17:33:28 2000 Douglas C. Schmidt - - This was creating problems in the IRIX builds. Moreover this - also busted the 'thread-per-connection' strategy in TAO. The - change actually removed a conditional check. I have added that - back. Thanks to Nanbor Wang for guiding me through this. - -Thu Jul 13 14:41:58 2000 John Heitmann - - * ace/OS.i: - - Minor updates to PACE functions which used to use - double parenthesis. - -Thu Jul 13 12:58:26 2000 Ossama Othman - - * ace/SSL/ACE_SSL.dsp: - - Added `SSL_Export.h' to the list of headers. - - * ace/SSL/SSL_Context.cpp: - - Moved preprocessor conditional that checks if ACE_HAS_SSL is - defined after the inclusion of SSL_Context.h. This fixes a link - error that occurs when ACE_HAS_SSL is defined in the config - header instead of on the command line. - -Thu Jul 13 10:55:44 2000 David L. Levine - - * ace/Makefile: changed ssl check from ifneq null to - ifeq 1, to allow ssl = 0. - -Thu Jul 13 10:10:54 2000 David L. Levine - - * ace/Makefile: move ssl check to after include of wrapper_macros.GNU, - so that ssl=1 can be set in platform_macros.GNU. - -Thu Jul 13 09:33:45 2000 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.i (send, recv): - - Fixed typos where size of buffer being sent/received was passed - to the OpenSSL SSL_get_error() function, instead of the return - status of the SSL_write()/SSL_read() call. This will fix - some broken error handling. - Reported by Craig Perras - -Thu Jul 13 07:55:41 2000 David L. Levine - - * docs/ACE-guidelines.html: added general guideline to not - end text lines with spaces, and the .emacs incantation - that removes them. Thanks to Craig Rodrigues - for suggesting this addition, which we already check for - when committing to our CVS repository. - -Wed Jul 12 09:42:21 2000 Giga Giguashvili - - * ace/CDR_Stream.h: added forward declaration of - ACE_InputCDR before ACE_OutputCDR class definition. - -Wed Jul 12 07:26:25 2000 David L. Levine - - * tests/Service_Config_Test.cpp (instance): cast the u_short to - u_long before casting to void *, to avoid KCC warning about - casting to pointer from integer of different size. - -Tue Jul 11 17:20:48 2000 David L. Levine - - * ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): try a reinterpret cast - of ACE_Thread::self () to u_long. We need u_long on Linux. - -Tue Jul 11 16:09:14 2000 David L. Levine - - * bin/auto_run_tests.lst: don't run LongUpcalls test - with minimum CORBA. Thanks to Irfan for reporting - that the test needs AMI to run, and minimum CORBA - doesn't have AMI. - -Tue Jul 11 16:03:58 2000 David L. Levine - - * ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): don't cast result - of ACE_Thread::self (), because it might be a structure. - Thanks to Ossama for reminding me of that. - Changed format specifier to be %u instead of %lu, to avoid - mismatch, at least on some platforms. - -Tue Jul 11 14:47:48 2000 Chris Kohlhoff - - * ace/config-win32-common.h: - Use default value of 0 for ACE_USE_RCSID on Win32 since RCS IDs - should probably not be required on this platform. - - * include/makeinclude/build_core_exe.bor: - * include/makeinclude/build_core_library.bor: - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - * include/makeinclude/make_flags.bor: - * include/makeinclude/outputdir.bor: - * include/makeinclude/recurse.bor: - * include/makeinclude/install.bor: - * ace/Makefile.bor: - Added support for 'make install'. - - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - * include/makeinclude/clean.bor: - Changed clean target so that files generated by the IDL compiler - are removed. - - * ace/ace_wchar.h: - * ace/config-win32-borland.h: - * ace/OS.h: - * ace/OS_String.h: - * ace/OS.i: - Bring certain types and functions into the global namespace. This - is necessary so that the ACE headers will work the same regardless - of any standard C++ headers that may be included beforehand. - -Tue Jul 11 14:21:51 2000 Steve Huston - - * ace/Log_Msg.cpp (ACE_Log_Msg::log): Added an ACE_Errno_Guard to - prevent errors in this function from destroying errno. This function - should be benign, just reporting, and leaving errno alone for - further checks/logging by apps. - -Tue Jul 11 14:20:35 2000 Steve Huston - - * tests/SOCK_Send_Recv_Test.cpp: Added some additional output - to replace an assert - helps track problems quicker. Thanks to - David Levine for this suggestion. - -Tue Jul 11 11:06:45 2000 Craig Rodrigues - - * ace/config-linux-common.h: in glibc 2.2, the function - prototypes for msgsnd() and msgrcv() were changed to be POSIX - compliant. So, ACE_LACKS_SOME_POSIX_PROTOTYPES breaks - compilation. - -Tue Jul 11 11:03:50 2000 David L. Levine - - * bin/make_release: chmod of kits to 664, and chgrp to doc, - after creation. - -Tue Jul 11 10:45:46 2000 David L. Levine - - * bin/generate_man_pages: don't try generate man pages for - RMCast_Reassembly.h, either, because it trips up class2man. - [Bug 608] - -Tue Jul 11 10:40:48 2000 David L. Levine - - * bin/make_release: robustness improvements: - 1) set CVSROOT and ACE_ROOT environment variables, and $logname, - to reasonable default values if they were null. - 2) Always prepend /project/danzon/pkg/gnu/bin to PATH. Before, - -d was first used to check to see if it existed. But, it - might not have been mounted, and -d won't cause it to automount. - -Tue Jul 11 08:24:33 2000 Douglas C. Schmidt - - * ace/POSIX_Asynch_IO.h, - * ace/SUN_Proactor.h: Fixed these files so that class2man - now generates proper manual pages. [Bug 608] - -Tue Jul 11 08:07:23 2000 David L. Levine - - * bin/generate_man_pages: don't try generate man pages for - RMCast_Export.h, because it's a generated file and doesn't - have any man page formatting info. It trips up class2man. - [Bug 608] - -Tue Jul 11 07:42:57 2000 David L. Levine - - * ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): cast result - to ACE_Thread::self () to u_long, to avoid mismatch with - %lu sprintf parameter. - -Tue Jul 11 06:21:35 2000 Douglas C. Schmidt - - * apps/Gateway/Peer/Peer.cpp (transmit): The last two arguments to - Event_Header were reversed! Thanks to Kim Lester - for reporting this. - -Mon Jul 10 20:35:08 2000 Marina Spivak - - * ACE version 5.1.5 released. - -Mon Jul 10 13:15:10 2000 Ossama Othman - - * ace/SSL/Makefile (ACE_SHLIBS): - - Added "-lACE" to the list of libraries that should be linked in - to libACE_SSL, since the ACE SSL wrappers depend on ACE. - -Sun Jul 09 21:38:03 2000 Ossama Othman - - * ace/SSL/ACE_SSL.dsp: - - Fixed library path in "Release" configuration. - -Sun Jul 09 14:20:42 2000 Darrell Brunsch - - * ace/ace_wchar.h: - - Added support for wchar_t on VxWorks. It now compiles, but - unfortunately VxWorks doesn't come with any C library support - beyond conversion to/from multi-byte character strings. - - This will only take effect when ACE_HAS_WCHAR is defined (it - isn't by default). Emulation for the missing str* functions - will be added soon. - -Sun Jul 09 14:00:42 2000 Darrell Brunsch - - * ace/ace_wchar.h: - - Added two macros for straight out conversion of strings: - ACE_TEXT_CHAR_TO_WCHAR and ACE_TEXT_WCHAR_TO_CHAR. - - * ace/adapter/README: (Added) - * ace/adapter/ace/ACE.h: (Added) - * ace/adapter/ace/ARGV.h: (Added) - * ace/adapter/ace/Arg_Shifter.h: (Added) - * ace/adapter/ace/ATM_Addr.h: (Added) - * ace/adapter/ace/DEV_Addr.h: (Added) - * ace/adapter/ace/Dirent.h: (Added) - * ace/adapter/ace/DLL.h: (Added) - * ace/adapter/ace/Dynamic_Service.h: (Added) - * ace/adapter/ace/FIFO.h: (Added) - * ace/adapter/ace/FIFO_Recv.h: (Added) - * ace/adapter/ace/FIFO_Recv_Msg.h: (Added) - * ace/adapter/ace/FIFO_Send.h: (Added) - * ace/adapter/ace/FIFO_Send_Msg.h: (Added) - * ace/adapter/ace/FILE_Addr.h: (Added) - * ace/adapter/ace/Functor.h: (Added) - * ace/adapter/ace/High_Res_Timer.h: (Added) - * ace/adapter/ace/INET_Addr.h: (Added) - * ace/adapter/ace/Malloc_T.h: (Added) - * ace/adapter/ace/Memory_Pool.h: (Added) - * ace/adapter/ace/MEM_Addr.h: (Added) - * ace/adapter/ace/OS_Dirent.h: (Added) - * ace/adapter/ace/OS_String.h: (Added) - * ace/adapter/ace/Service_Config.h: (Added) - * ace/adapter/ace/Service_Object.h: (Added) - * ace/adapter/ace/SOCK_Dgram_Bcast.h: (Added) - * ace/adapter/ace/SOCK_Dgram_Mcast.h: (Added) - * ace/adapter/ace/SPIPE_Addr.h: (Added) - * ace/adapter/ace/System_Time.h: (Added) - * ace/adapter/ace/Task_T.h: (Added) - * ace/adapter/ace/Trace.h: (Added) - - This is a initial shot at the implementation of an adaptation - layer for ACE that provides a Wide character interface with - a character library and vice versa. - - Right now the above files contain classes ending with _W that - correspond to the actual classes (such as ACE_W). This class - will have methods that take in wchar_t instead of char, and - then convert the parameters and return value when calling - the actual char implementation. - - Note, this is an initial implementation that isn't complete - across all interfaces and there are memory management issues that - still must be dealt with. - -Sat Jul 08 14:50:34 2000 David L. Levine - - * all Makefiles: updated dependencies. - -Fri Jul 7 20:24:30 2000 Douglas C. Schmidt - - * examples/Reactor/Multicast/server.cpp: The last character 0x0D in the - message was messing up the display. Thanks to Zoran Ivanovic - for this fix. - -Fri Jul 07 17:17:21 2000 George Reid - - * ace/config-mvs.h: long long support was introduced in os/390 - version 2.6, so only #define ACE_LACKS_LONGLONG_T with - if __COMPILER_VER__ < 0x22060000. - - * ace/config-mvs.h: added #define ACE_LACKS_PLACEMENT_OPERATOR_DELETE, - even though it doesn't seem to have an effect on - ace/Svc_Handler.cpp. - -Fri Jul 7 09:47:36 2000 Douglas C. Schmidt - - * netsvcs/lib/Server_Logging_Handler_T.cpp (open_common): Don't - pass in the length to the ACE_CString constructor -- just let is - copy what's already there. Thanks to Valery Arkhangorodsky - for reporting this. - - * ace/ACE.cpp (timestamp): Make sure to insert a NUL byte at the - end of yeartmp and timetmp. Thanks to David Levine and Purify - for reporting this. - -Fri Jul 07 09:36:05 2000 David L. Levine - - * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (handle_client): - cast result of ACE_OS::getpid () to int, and print as an int, to - avoid compiler warning about mismatched format specifier. - -Thu Jul 6 10:36:46 2000 Douglas C. Schmidt - - * ace/ACE.cpp: Fixed the timestamp() call so that it returns a string - with the date that also contains the year. Thanks to Nicoletta Viale - for reporting this. - -Thu Jul 06 10:59:41 2000 David L. Levine - - * performance-tests/Misc/test_naming (bind,rebind,unbind,find): - changed ACE_ASSERTs to statements that are always executed, - even with ACE_NDEBUG set. Added ACE_ERRORs to report errors. - -Thu Jul 06 10:51:19 2000 David L. Levine - - * examples/Reactor/Misc/test_time_value.cpp (main): added - some ACE_UNUSED_ARGS with ACE_NDEBUG to eliminate warnings - about unused variables with debug=0. - -Wed Jul 5 23:36:12 2000 John Heitmann - - * ace/OS.i: - Added PACE functionality to functions whose counterparts were - recent additions to PACE. - -Wed Jul 5 14:04:50 2000 Douglas C. Schmidt - - * ace/SUN_Proactor: Added yet another handle_events() method to keep - SunC++ from complaining! Thanks to David for reporting this. - -Wed Jul 05 13:19:52 2000 Steve Huston - - * ace/OS.h: Don't typedef pid_t for ACE_PSOS_DIAB_PPC - it's defined - in sys/types.h. - -Wed Jul 05 12:06:17 2000 Steve Huston - - * ace/OS.h: make the pSOS section adapt better to different pSOS - versions which seem to define different sets of errno values. - Also merge in some additions supplied by Matt Emerson - to define needed types based on the - ACE_PSOS_CANT_USE_SYS_TYPES config macro. (I think this macro - may have been added a while back by someone else working on the - pSOS port, but was not noted in this ChangeLog). - -Wed Jul 05 11:24:51 2000 Steve Huston - - * ace/config-psos-diab-ppc.h: Added ACE_HAS_EXCEPTIONS in the - non-g++ section. - -Tue Jul 4 10:12:12 2000 Douglas C. Schmidt - - * ace/SUN_Proactor: Added a new method with the name/signature - - virtual int handle_events (ACE_Time_Value &); - - so that we get the appropriate overloading/overriding behavior. - Thanks to Marina for reporting this. - - * ace/POSIX_Proactor.cpp: Removed unnecessary parens around - aiocb * and ACE_POSIX_Asynch_Result * to make certain compilers - happy. Thanks to Marina for reporting this. - - * ace/SUN_Proactor.cpp (handle_events): Fixed an ACE_ERROR that - should have been ACE_ERROR_RETURN. Thanks to Marina for - reporting this. - (start_aio): Fixed capitalization of "Op" to be "op". - - * ace/POSIX_Proactor.cpp, - * ace/SUN_Proactor.cpp: Fixed improper use of TCHAR to be ACE_TCHAR - and also fixed another stray use of "int result". Thanks to - David Levine for reporting this. - -Mon Jul 3 08:04:00 2000 Douglas C. Schmidt - - * ace/POSIX_Proactor.h (ACE_POSIX_AIOCB_Proactor): Fixed another - syntax error. Thanks to David Levine for reporting it. - -Mon Jul 3 00:22:57 2000 John Heitmann - - * ace/OS.{cpp,h}: - Made changes to support changes made to PACE. All - changes occured inside #ifdef ACE_HAS_PACE. - -Sun Jul 2 17:38:25 2000 Douglas C. Schmidt - - * ace/POSIX_Proactor.cpp, - * ace/POSIX_Asynch_IO.cpp: Fixed some bugs with the integrated code, - in particular, the use of the legacy ASYS_TEXT has been fixed. - -Sat Jul 1 11:33:45 2000 Alex Libman - - * ace/SUN_Proactor: Added new files that specialize the - POSIX_Proactor to use the Sun-specific versions of aioread() and - aiowrite(), which are much faster than the POSIX versions. - - * ace/POSIX_Proactor: Added public virtual method ProactorType get_impl_type () - where enum ProactorType { - PROACTOR_POSIX, // base class type - PROACTOR_AIOCB, - PROACTOR_SIG , - PROACTOR_SUN - }; - - This has been done with purpose not to develop additional - classes ACE_SUN_Asynch_Read/Write_Stream/File and to take into - account differencies in ACE_POSIX_Asynch_Operation::cancel () - method. - - * ace/POSIX_AIOCB_Proactor: The public constructor now defines max - number asynchronous operations which can be started at the same time: - - ACE_POSIX_AIOCB_Proactor ( size_t nMaxOp = 256 ); - - ACE_RTSIG_MAX ( usually 8 ) is too small for real job. - - Also added proctected constructor - - ACE_POSIX_AIOCB_Proactor ( size_t nMaxOp , int Flg); - - This constructor is used by ACE_SUN_Proactor. The difference - between constructors: public constructor calls - create_notify_manager (see 3.) and protected does not. The - reason: it is necessary to create ACE_AIOCB_Notify_Pipe_Manager - instance when the virtual table for derived class is biult. - - Added protected method: - - void create_notify_manager () ; - - The method is called from public ACE_POSIX_AIOCB_Proactor - constructor and ACE_SUN_Proactor constructor - ACE_AIOCB_Notify_Pipe_Manager should be created after - building the virtual table for the final subclass. - - Added protected method: - - void delete_notify_manager () ; - - The method is called from ACE_POSIX_AIOCB_Proactor and - ACE_SUN_Proactor destructors. It is possible to call it twice, - as it deletes ACE_AIOCB_Notify_Pipe_Manager and sets pointer to - zero. - - Replaced the protected method - - int register_aio_with_proactor (ACE_POSIX_Asynch_Result *result) - - with two protected following methods: - - virtual int register_and_start_aio( ACE_POSIX_Asynch_Result *result, - int Op ); - virtual int start_aio (ACE_POSIX_Asynch_Result *result, int Op ); - - where Op means : 0-read, 1- write - - These methods are made both as virtual to overwrite in - ACE_SUN_Proactor. register_and_start_aio shoud be called - instead of old register_aio_with_proactor and it locks access to - aiocb lists. start_aio is called only from register_and_start_aio. - - Added protected method to find and extract the results of the - completed aio operation: - - ACE_POSIX_Asynch_Result * find_completed_aio (int & error_status, - int & return_status ); - - This method is called from int handle_events (unsigned long milli_seconds) - and locks access to aiocb lists. - - Replace the following members : - - aiocb *aiocb_list_ [ACE_RTSIG_MAX]; - ACE_POSIX_Asynch_Result *result_list_ [ACE_RTSIG_MAX]; - - with - - aiocb ** m_pAIOCB_list_ ; - ACE_POSIX_Asynch_Result ** m_pResult_list_ ; - - The listsd are be allocated dynamically. - - Added thread mutex to protect the work with lists. - ACE_Thread_Mutex m_MtxAIOCB ; - - * ace/POSIX_AIOCB_Asynch_Operation: The method - - int register_aio_with_proactor (ACE_POSIX_Asynch_Result *result); - - is replaced by - - int register_and_start_aio (ACE_POSIX_Asynch_Result *result,int Op); - - where Op means operation : 0 - read , 1 - write - - The method - - int cancel (void); - - is modified according to the type of Proactor's implementation. - - The following methods are changed as shown below: - - int ACE_POSIX_AIOCB_Asynch_Read_Stream::shared_read - (ACE_POSIX_Asynch_Read_Stream_Result *result) - { - result->aio_sigevent.sigev_notify = SIGEV_NONE; - return register_and_start_aio ( result , 0 ) ; // read - } - - and - - int ACE_POSIX_AIOCB_Asynch_Read_Stream::shared_write - (ACE_POSIX_Asynch_Read_Stream_Result *result) - { - result->aio_sigevent.sigev_notify = SIGEV_NONE; - return register_and_start_aio ( result , 1 ) ; //write - } - -Sat Jul 01 11:46:23 2000 David L. Levine - - * ace/config-cxx-common.h: moved ACE_HAS_STANDARD_CPP_LIBRARY - and ACE_HAS_CPLUSPLUS_HEADERS defines out of Linux-only - section, to minimize the differences between Linux and Tru64. - Those defines don't hurt on Tru64. - -Fri Jun 30 16:51:48 2000 Steve Huston - - * tests/CDR_Array_Test.cpp: Add template type specifiers to copy - ctor and operator= to satisfy IBM C/C++. - -Fri Jun 30 10:59:23 2000 Joe Hoffert - - * include/makeinclude/platform_lynxos.GNU: - Added PACE_SYSNAME = LynxOS so that PACE can set the - appropriate platform subdirectory when building. - -Fri Jun 30 03:21:58 2000 John Heitmann - - * ace/OS.{h,i}: - * ace/OS_Dirent.{h,inl}: - Added more pace calls. OS.i is now mostly complete. - -Thu Jun 29 18:44:07 2000 John Heitmann - - * ace/OS.{i,cpp,inl}: - * ace/OS_Dirent.{inl,h}: - Began integration of pace with ACE_OS. #define - ACE_HAS_PACE to activate. About 25% is complete. - -Thu Jun 29 15:49:16 2000 Steve Huston - - * ace/INET_Addr.h (ACE_INET_Addr (const ACE_TCHAR [])): - * ace/DEV_Addr.h (ACE_DEV_Addr (const ACE_TCHAR *)): - * ace/Dirent.h (ACE_Dirent (const ACE_TCHAR *)): - * ace/FILE_Addr.h (ACE_FILE_Addr (const ACE_TCHAR *)): - * ace/Local_Tokens.h (ACE_Mutex_Token (const ACE_TCHAR *), - ACE_RW_Token (const ACE_THCAR *)): - * ace/MEM_Addr.h (ACE_MEM_Addr (const ACE_THCAR [])): - * ace/Parse_Node.h (ACE_Parse_Node (const ACE_TCHAR *), - ACE_Static_Function_Node (const ACE_TCHAR *)): Added ACE_EXPLICIT - to prevent unintended conversion of strings to these objects. - Thanks to Joseph Weihs for this correction. - - * ace/OS.h, config-all.h: Move setups for ACE_EXPLICIT and - ACE_MUTABLE macros from OS.h to config-all.h. ACE_EXPLICIT was - needed for the above (Dirent triggered the need to move it) and - ACE_MUTABLE seemed like the same sort of compiler setting thing to - be more properly in config-all.h. - -Wed Jun 28 19:35:23 2000 Jerry D. De Master - - * netsvcs/lib/Client_Logging_Handler.cpp: - Currently, the client logging daemon attempts to connect to a - server logging daemon to which all logging records are - forwarded. In the event that a connection cannot be established - at initialization, or if the connection is lost during daemon - execution, logging output "rolls-over" to STDERR. This seems - like reasonable behavior, however.... - - One interesting use case of the client logging daemon is to use - it to collect all logging output from all clients, on a single - node system. For this use case, there is no need for a server - logging daemon. One could run the client logging daemon without - a server logging daemon and redirect STDERR to a logfile, - however, this methodology does not allow the use of the - ACE_Logging_Strategy class to configure the client daemon's - logging behavior (especially the new -i and -m options). This - problem can be easily fixed by first testing if the client - daemon is already logging to a msg_ostream - if it is, do not - roll-over logging to STDERR upon connection failure. - -Wed Jun 28 11:20:08 2000 Joe Hoffert - - * bin/pace_components: - Modified to make PACE_ROOT $(ACE_ROOT)/PACE rather than the - previous value of $(ACE_ROOT)/pace. - -Wed Jun 28 11:42:53 2000 Steve Huston - - * ace/config-psos-diab-ppc.h: Added ACE_LACKS_PRAGMA_ONCE for the - non-g++ situation. The newer Diab compiler (at least) needs this. - Corrected a '#defined' directive to '#define'. - -Tue Jun 27 13:01:37 2000 Steve Huston - - * tests/CDR_Array_Test.cpp: Moved the 'digits' array inside the - function which used it. With the array at module scope, the template - instantiation didn't find it for debug=0 optimize=1 on Sun C++ 4.2. - -Tue Jun 27 11:11:41 2000 Steve Huston - - * tests/OS_Test.cpp: Remove more output which triggers false fails - in test scripts. Thanks to David Levine for his patience and help - with this. - -Tue Jun 27 09:23:01 2000 Joe Hoffert - - * include/makeinclude/platform_sunos5_g++.GNU: - Changed optimization flag from -O2 to -O3 to get rid of - function declared but not used warnings for PACE. - -Tue Jun 27 08:55:21 2000 Michael Kircher - - * ace/OS_Dirent.cpp: Fixed the algorithm of reading a directory - in the readdir_emulation () method. Thanks to Zoran Ivanovic - for pointing this out. - -Tue Jun 27 08:30:21 2000 Steve Huston - - * netsvcs/servers/main.cpp: Add "ace/" to #include Logging_Strategy.h - to find it in it's new home. - -Tue Jun 27 08:24:49 2000 Steve Huston - - * ace/Makefile: - * netsvcs/lib/Makefile: Updated dependencies. - -Mon Jun 26 18:26:47 2000 Ossama Othman - - * netsvcs/lib/Makefile.am (libnetsvcs_la_SOURCES, noinst_HEADERS): - * netsvcs/lib/Makefile.bor (OBJFILES): - - Removed Logging_Strategy.* from these make variables. The - Logging_Strategy files have been moved to ACE. - -Mon Jun 26 17:42:15 2000 Carlos O'Ryan - - * ace/SSL/ACE_SSL.dsw: - Add a new workspace for the SSL adaptation library. - - * ace/SSL/ACE_SSL.dsp: - Fixed include paths, removed ACE_HAS_SSL from the command line - (it should be in config.h), but still has problems with the link - phase when SSL is not around. - -Mon Jun 26 17:01:35 2000 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++.GNU (CC_VERSION): - use $(CXX) instead of hardcoding CC, in case the user overrides - CXX. Thanks to Alexander Belopolsky - for reporting this. - -Mon Jun 26 13:31:39 2000 Steve Huston - - * tests/OS_Test.cpp: Don't use the word 'fail' when the test - succeeds... the test scripts look for that word to mean test fail. - -Mon Jun 26 12:09:33 2000 David L. Levine - - * ace/config-lynxos.h: use _POSIX_VERSION to detect the - LynxOS version, instead of trying to rely on the g++ - version. Thanks to Chad Elliott - for this suggestion. - -Mon Jun 26 12:01:17 2000 Chad Elliott - - * tests/run_tests.sh - Removed the -p option from the #!/bin/sh line. Tru64's Bourne - Shell doesn't seem to like that option. - -Sat Jun 24 19:58:22 2000 John Heitmann - - * ace/OS.h - * ace/OS.i - * ace/config-macosx.h - * include/makeinclude/platform-macosx.GNU - Added preliminary support for Mac OS X Developer Preview 4. Quite - a bit is still broken, but the core ACE library works great. Grep - for __MACOSX__ in OS* to see the changes. - -Thu Jun 22 17:27:35 2000 Steve Huston - - * ace/Log_Msg.cpp (ACE_Log_Msg_Attributes::inherit_hook): Use a - temporary void * to hold the reference - this keeps Sun C++ 4.2 - from complaining you can't static_cast a void *& to a - ACE_Log_Msg_Attributes*. - -Thu Jun 22 17:58:21 2000 Steve Huston - - * ace/Handle_Set.cpp: Added pSOS-specific changes to deal with pSOS's - ordering of fd_set bits reversed from all other platforms. Thanks - to Matt Emerson for figuring this out. - -Thu Jun 22 15:16:31 2000 Steve Huston - - * ace/OS.cpp: Added pSOS implementation for ACE_OS::uname. - Added pSOS implementation for ACE_OS::inet_ntoa - this one is not - inlined, whereas all other platforms' ACE_OS::inet_ntoa are in - OS.i, inlined (if enabled). Thanks to Matt Emerson - for these. - - * ace/OS.i (ACE_OS::inet_ntoa): Disabled this for pSOS - pSOS's version - is in OS.cpp now. - -Thu Jun 22 14:03:53 2000 Nanbor Wang - - * netsvcs/servers/svc.conf: Changed the library name where the - Logging_Strategy could be found. - - * netsvcs/lib/netsvcs.dsp: Removed Logging_Strategy.* from the - project file. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added Logging_Strategy.*. - - * ace/Logging_Strategy.h: Removed ACE_SVC_BUILD_DLL. It's now - under ACE. Changed ACE_SVC_FACTORY_DECLARE to - ACE_FACTORY_DECLARE. - - * ace/Logging_Strategy.cpp: Changed ACE_SVC_FACTORY_DEFINE to - ACE_FACTORY_DEFINE. - -Thu Jun 22 13:59:26 2000 Nanbor Wang - - * ace/OS.cpp: Removed an extra 'g' from the very beginning of the - file. - -Thu Jun 22 14:11:26 2000 Steve Huston - - * ace/OS.cpp (ACE_OS::thr_keycreate): Add some type cast to compile - clean on pSOS. Thanks to Matt Emerson . - -Thu Jun 22 12:46:43 2000 Douglas C. Schmidt - - * ace: Added Logging_Strategy.{h,cpp} to ACE and the Makefile. - - * netsvcs/lib: Zapped the Logging_Strategy.{h,cpp} - files from netsvcs and moved them into ACE, where they can be - reused more readily. Thanks to Martin Krumpolec - for this suggestion. - -Thu Jun 22 13:29:22 2000 Steve Huston - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): Added cleanup code for - pSOS tasks at the end of the function. The code is from ISI's - documentation. Thanks to Matt Emerson for - pointing out this problem and supplying the fix. - -Thu Jun 22 09:47:56 2000 Chad Elliott - - * ace/OS_Dirent.h - Added include of unistd.h before dirent.h. The lack of the - STATUS typedef was causing a build failure on VxWorks with the - GNU compiler. - -Thu Jun 22 08:28:48 2000 Steve Huston - - * tests/OS_Test.cpp: Fixed unused argv warning for g++. - -Wed Jun 21 14:40:15 2000 Carlos O'Ryan - - * ace/OS.i: - Removed unused arg warnings in ACE_OS::rename() - -Wed Jun 21 13:41:27 2000 Steve Huston - - * tests/OS_Test.cpp: New test for OS things. All it tests now is - ACE_OS::rename. - * tests/OS_Test.dsp: MSVC project file for new test. - * tests/tests.dsw: Added OS_Test.dsp. - * tests/Makefile: Add new OS_Test. - * tests/run_tests.lst: Added OS_Test. - * trests/version_tests/OS_Test.dsp: MSVC project file for new test. - * tests/version_tests.dsp: Added new OS_Test.dsp. - -Wed Jun 21 13:25:41 2000 Steve Huston - - * ace/OS.i (rename): On ACE_HAS_WINNT4 systems (Win NT, 2000), the - rename is accomplished via MoveFileEx, which allows an existing - destination file to be replaced. This makes the behavior in this - case the same on NT/2000 as on *NIX systems (the file is replaced). - -Wed Jun 21 13:23:18 2000 Steve Huston - - * ace/OS.h (rename): Added a 3rd argument (int flags) which defaults - to -1 (meaning to use ACE-default flags inside the function). The - flags are only useful on NT/2000 for supplying values to the - MoveFileEx function's flags argument. - -Wed Jun 21 03:02:37 2000 Nanbor Wang - - * ace/OS.i (set_errno_to_last_error): - * ace/OS.i (set_errno_to_wsa_last_error): The RTL for IBM - VisualAge C++/NT has the same problem as Borland 4. Thanks to - Boris Kaminer for reporting this. - -Wed Jun 21 01:12:59 2000 Irfan Pyarali - - * ace/ACE.cpp: Changed all the timed versions of the "_n_i()" - methods so that they are more optimistic. Previously, these - methods would check with select() before issuing the data - transfer call. There was really no need to do this since the - socket is already in non-blocking mode and will therefore not - block in transferring the data. This change should make these - methods faster in the case when there is no blocking since - select() will not be called. - - As a side effect of this change, checking for EWOULDBLOCK now - happens after the call to send()/recv(). This automatically - fixed bug 594 though I am still not sure why send()/recv() would - EWOULDBLOCK right after select() indicated that the socket was - ready. Either way, thanks to Viatcheslav A. Batenine - for reporting the bug and providing an - example illustrating the bug. - -Tue Jun 20 19:37:53 2000 Carlos O'Ryan - - * ace/CORBA_macros.h: - Fixed the definition of ACE_RE_THROW_EX, there was a space - between the macro name and the ( that starts its arguments. - - * ace/RMCast/Makefile: - * ace/RMCast/RMCast_Header_Size.h: - * ace/RMCast/RMCast_Header_Size.i: - * ace/RMCast/RMCast_Header_Size.cpp: - A simple control message, still unused. - - * ace/RMCast/RMCast_Partial_Message.cpp: - Verify that all fragments report the same total size. - -Tue Jun 20 14:55:26 2000 Nanbor Wang - - * ace/OS.cpp: Applied patches for ACE_BEGINTHREADEX and - ACE_ENDTHREADEX for using IBM VisualAge C++ 4.0 on NT. Thanks - to Boris Kaminer for providing the - patches. - -Tue Jun 20 12:04:24 2000 Ossama Othman - - * ace/Makefile (ssl): - - Reverted change that causes the SSL wrappers to be built when - SSL support isn't explicitly disabled. It caused SSL support to - always be built, which was not the desired effect. - -Tue Jun 20 12:57:12 2000 Nanbor Wang - - * ace/config-freebsd-pthread.h: Undefined ACE_LACKS_SETSCHED if we - are compiling on R4.0 or above. Thanks to Sergey A. Osokin - for reporting this for Nick Logvinov - . - -Tue Jun 20 07:37:18 2000 Douglas C. Schmidt - - * ace/Select_Reactor_T.h, - * ace/Select_Reactor_T.cpp, - * ace/Reactor.h, - * ace/Reactor.i, - * ace/Reactor_Impl.h, - * ace/WFMO_Reactor.h, - * ace/WFMO_Reactor.cpp: - Added a new method to access the Reactor's timer queue. Also - renamed the accessors timer_queue(ACE_Timer_Queue *) and - ACE_Timer_Queue *timer_queue() to be more consistent with ACE - naming conventions. Thanks to Jody Hagins for reporting this. - -Tue Jun 20 02:06:15 2000 Craig Rodrigues - - * include/makeinclude/platform_sunos5_g++.GNU - * include/makeinclude/platform_sunos5_sunc++.GNU - - Updated PLATFORM_X11_CPPFLAGS to include the standard - include path for X11 and Motif headers under Solaris. - -Mon Jun 19 22:14:26 2000 Alex Arulanthu - - * ace/POSIX_Asynch_IO.h: - * ace/POSIX_Asynch_IO.cpp: - * ace/POSIX_Proactor.h: - * ace/POSIX_Proactor.cpp: - * examples/Reactor/Proactor/Makefile - * examples/Reactor/Proactor/test_proactor2.cpp: - - Thanks to Alex Libman , the following - changes have been integrated onto POSIX Proactor. - - - Enabling the completion call backs even if aio_return - fails. We will call the completion call back methods with 0 - transferred data parameter. - - - MT safe'ing AIOCB proactor. It would not improve the - efficiency. - -Mon Jun 19 19:44:05 2000 Ossama Othman - - * ace/Makefile (ssl): - - Fixed conditional so that the SSL wrappers are built when SSL is - not explicitly disabled, i.e. when the "ssl" make variable is - not equal to zero. Note that the default is not to build the - SSL wrappers. - - * ace/OS.i (thr_yield): - - Corrected typo in comment. - - * m4/platform.m4 (ACE_CPPFLAGS): - - Define necessary feature test macros on the command line, not in - the configuration header. This allows ACE applications to - utilize those macro definitions without having to worry about - header inclusion ordering. - - (ACE_DEFAULT_SELECT_REACTOR_SIZE): - - It is no longer necessary to hard-code the default reactor size - for older Linux kernels that had a file descriptor limit less - than FD_SETSIZE since the Select Reactor now falls back on the - run-time file descriptor limit for the given process. - - (ACE_HAS_IRIX62_THREADS): - - Removed redundant definition. Only define - ACE_HAS_IRIX62_THREADS for IRIX 6.2. - -Mon Jun 19 17:33:28 2000 Douglas C. Schmidt - - * ace/OS.h: Removed the special case check for - - # if defined (ACE_HAS_IRIX62_THREADS) - # define THR_SCOPE_SYSTEM 0x00100000 - # else - - and just used this: - - # define THR_SCOPE_SYSTEM THR_BOUND - - Thanks to John Foresteire - for this suggestion. - -Mon Jun 19 12:38:58 2000 Carlos O'Ryan - - * ace/config-all.h: - * ace/OS.h: - * ace/OS.cpp: - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - In Win32 we have to pass the structured exception handlers - around. - -Mon Jun 19 11:43:43 2000 Carlos O'Ryan - - * Decouple the Log_Msg inheritance from the ACE_OS layer: the - Log_Msg class registers hooks with the ACE_OS layer that are - invoked when a new thread is created. - The callback is used to first copy the state from the current - thread to a temporary object and then copy (in the created - thread) the temporary object state to the TSS Log_Msg object. - The temporary holder for the Log_Msg state is allocated in the - heap, and destroyed as soon as we don't need it anymore. - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - New ACE_Log_Msg_Attributes class used as the temporary holder of - the Log_Msg state during thread creation. - - * ace/config-all.h: - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: - Define the new hooks used to inherit the Log_Msg state. - -Mon Jun 19 12:45:45 2000 David L. Levine - - * ace/config-lynxos.h: removed the ACE_LACKS_PTHREAD_SIGMASK, - and added back the pthread_sigmask () declaration. With - extern "C", this time. - - * include/makeinclude/platform_lynxos.GNU: moved our LynxOS - cross development kit to where it belongs, so that - ENV_PREFIX is now the same as with 2.5.0 and 3.0.0. - -Mon Jun 19 11:49:43 2000 David L. Levine - - * include/makeinclude/platform_lynxos.GNU: export environment - variables that are set on the host (for cross-compilation). - The cross-compile g++ needs ENV_PREFIX in order to link - properly. - - * ace/config-lynxos.h: added ACE_LACKS_PTHREAD_SIGMASK with - LynxOS 3.1.0. In addition to not be declared in the system - headers, pthread_sigmask () isn't in the threads libs. - -Mon Jun 19 10:43:27 2000 David L. Levine - - * include/makeinclude/platform_lynxos.GNU: use -mthreads - with LynxOS 3.1.0, as well as with prior versions. - -Mon Jun 19 02:47:12 2000 Nanbor Wang - - * ace/CORBA_macros.h: Fixed misspellings of deprecated. Thanks to - Ossama for pointing this out. - -Sun Jun 18 11:39:48 2000 David L. Levine - - * include/makeinclude/platform_lynxos.GNU: rework environment - variables to better support LynxOS 3.1.0. - -Sun Jun 18 10:54:59 2000 Douglas C. Schmidt - - * ace/INET_Addr: Added operator < to ACE_INET_Addr so that it - can be used in an STL map. Thanks to Tomer Amiaz - for this suggestion. - -Sun Jun 18 03:18:21 2000 Nanbor Wang - - * ace/CORBA_macros.h: The definition of ACE_RETHORW is flawed - because it requires all ACE_RETHROW statements be the last - statement executed within the ACE_CATCH block as this example: - - ACE_CATCH ( /* whatever */ ) - { - // Do something else - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; - - However, if this is not the case, programs may exhibit different - behavior on platforms with/without native C++ exceptions, as - shown in the following example: - - ACE_CATCH ( /* whatever */ ) - { - if (foo == bar) - ACE_RETHROW; - foo = bar; - } - ACE_ENDTRY; - ACE_CHECK; - - Although the problem is easy to fix, unfortunately, I can't find - a way to fix it without changing the macro name because the - program flow may get completely messed up if ACE_TRY and - ACE_TRY_EX are used together. Therefore, I have added two new - macros ACE_RE_THROW and ACE_RE_THROW_EX. - - The old macro is now deprecated. If you are absolutely sure - that you are not using the old ACE_RETHROW macro as mentioned - above, you can define ACE_HAS_DEPRECATED_ACE_RETHROW in your - ace/config.h file and continue to use ACE_RETHROW. However, - you should move to the new macros as soon as possible. - -Sat Jun 17 18:15:00 2000 Kirthika Parameswaran - - * tests/Makefile.DLL: - * tests/Makefile.DLL_Test: - Renamed Makefile.DLL since on NT it appeared as if there was a - dll version of the Makefile. Also did a make depend. Thanks to - James Megquier for reporting this and to - Darrell brunsch for suggesting that the - name be changed. - * tests/Makefile: Updated the Makefile to now have - Makefile.DLL_Test. - -Sat Jun 17 08:03:53 2000 Douglas C. Schmidt - - * docs/tutorials/Chap_5/ex02.html: Fixed a typo where - peer() should have been peer_i(). Thanks to Keo Kelly - for reporting this. - -Sat Jun 17 07:46:44 2000 Chris Kohlhoff - - * include/makeinclude/ace_flags.bor: - - Added support for new LoadBalancing orbsvcs library. - -Fri Jun 16 17:30:18 2000 Carlos O'Ryan - - * ace/RMCast/Makefile: - * ace/RMCast/RMCast.dsp: - * ace/RMCast/RMCast.dsw: - * ace/RMCast/RMCast_Export.h: - In this library we will implement a simple, small scale reliable - multicast protocol for ACE. The library is based on the ASX - classes in ACE (Task, Module and friends). - - * tests/RMCast/Makefile: - * tests/RMCast/RMCast_Tests.dsw: - The unit test directory for the RMCast library components. - - * ace/RMCast/RMCast_Fragment.h: - * ace/RMCast/RMCast_Fragment.i: - * ace/RMCast/RMCast_Fragment.cpp: - The fragmentation task. It divides a message block chain in - small fragments. The fragments are limited by the number of - bytes and the number of entries in the chain (for platforms with - limited IO vectors). - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Fragment_Test.dsp: - Unit test for the fragmentation layer. - - * ace/RMCast/RMCast_Partial_Message.h: - * ace/RMCast/RMCast_Partial_Message.i: - * ace/RMCast/RMCast_Partial_Message.cpp: - A simply class to maintain a partial received messages, keeps - track of the missing bytes and detects when the complete message - has been received. - - * ace/RMCast/RMCast_Reassembly.h: - * ace/RMCast/RMCast_Reassembly.i: - * ace/RMCast/RMCast_Reassembly.cpp: - The reassembly layer. Uses the Partial_Message class to do a - great deal of the work. - - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.dsp: - Unit test for the reassembly layer. - -Fri Jun 16 17:00:03 2000 Carlos O'Ryan - - * include/makeinclude/rules.bin.GNU: - * include/makeinclude/wrapper_macros.GNU: - Joe's change does not work. A *LOT* of makefiles in TAO do not - include the rules.bin.GNU file. - -Fri Jun 16 16:18:21 2000 Ossama Othman - - * ace/Makefile (DIRS): - - Descend into and build the newly added SSL directory if "make - ssl=1" is issued. - - * ace/SSL/ACE_SSL.dsp: - * ace/SSL/Makefile: - * ace/SSL/SSL_Context.cpp: - * ace/SSL/SSL_Context.h: - * ace/SSL/SSL_Export.h: - * ace/SSL/SSL_SOCK.cpp: - * ace/SSL/SSL_SOCK.h: - * ace/SSL/SSL_SOCK_Acceptor.cpp: - * ace/SSL/SSL_SOCK_Acceptor.h: - * ace/SSL/SSL_SOCK_Connector.cpp: - * ace/SSL/SSL_SOCK_Connector.h: - * ace/SSL/SSL_SOCK_Stream.cpp: - * ace/SSL/SSL_SOCK_Stream.h: - - Integrated the ACE SSL wrappers into the ACE mainline - distribution. Enable using "make ssl=1." The library that is - generated is called "libACE_SSL.so" on UNIX, and ACE_SSL{d}.dll on - Win32. - - * examples/IPC_SAP/Makefile: - - Build SSL_SAP example if "make ssl=1" is issued. - - * examples/IPC_SAP/SSL_SAP/SSL_SOCK_SAP.dsw: - * examples/IPC_SAP/SSL_SAP/Makefile: - * examples/IPC_SAP/SSL_SAP/README: - * examples/IPC_SAP/SSL_SAP/SSL-client.dsp: - * examples/IPC_SAP/SSL_SAP/SSL-server.dsp: - * examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-client-simple.h: - * examples/IPC_SAP/SSL_SAP/SSL-client.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-client.h: - * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-server.cpp: - * examples/IPC_SAP/SSL_SAP/dummy.pem: - * examples/IPC_SAP/SSL_SAP/key.pem - * examples/IPC_SAP/SSL_SAP/local_data: - * examples/IPC_SAP/SSL_SAP/summarize: - - Integrated example that demonstratres use of the ACE SSL - wrappers. - - * include/makeinclude/wrapper_macros.GNU (ssl): - - Added make flag to enable compilation of OpenSSL support in - ACE. (e.g. make ssl=1) - -Fri Jun 16 14:40:34 2000 Carlos O'Ryan - - * bin/run_all_list.pm: - * bin/auto_run_tests.lst: - Add the LongUpcalls to the run_test lists. - -Fri Jun 16 16:00:45 2000 Joe Hoffert - - * include/makeinclude/{rules.bin.GNU,wrapper_macros.GNU}: - Moving VLDLIBS definition from wrapper_macros.GNU to rules.bin.GNU - to allow unsetting ACE_LIB. Needed for PACE builds that don't need - the ACE library. - -Fri Jun 16 14:24:36 2000 Steve Huston - - * ace/config-hpux-11.00.h: - * include/makeinclude/platform_hpux_aCC.GNU: Allow user to do make - exceptions=0 to disable exception handling. This is not a safe - thing to do since the C++ runtime throws exceptions, but if you - must, and you know what you're doing, here's the rope. - -Fri Jun 16 08:40:38 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Moved the print statement for a project file from Build_Config - to Build, so it will be executed for the -CORE target. - - This was causing incorrect headers in nightly build reports. - -Fri Jun 16 08:12:37 2000 David L. Levine - - * docs/ACE-guidelines.html: added a section for PACE. - -Thu Jun 15 21:30:37 2000 Ossama Othman - - * ace/Makefile.am (pkgincludedir): - - Corrected value for this variable. It should have been - "$(includedir)/ace" instead of "$(prefix)/include/ace." In any - case, this was more of a consistency change than anything else, - since this variable is actually commented out. - -Thu Jun 15 20:01:35 2000 Steve Huston - - * ace/OS.i (ACE_OS::tempnam): Made the (__IBMCPP__) a 'defined' check - and combined it with defined (ACE_WIN32) so it works right on AIX. - Moved the NOTSUP stuff for ACE_HAS_WINCE to the section with the - other platforms that don't support it. - -Thu Jun 15 16:10:51 2000 Steve Huston - - * include/makeinclude/platform_aix4_cset++.GNU: Force exceptions=1 - because IBM C/C++ doesn't have a way to disable exceptions. - - * ace/config-aix-4.x.h: Add #if !defined around ACE_HAS_EXCEPTIONS - to avoid compile errors if exceptions=1 explicitly stated. - -Thu Jun 15 16:03:11 2000 David L. Levine - - * include/makeinclude/platform_lynxos.GNU: removed - -mthreads from CFLAGS with LynxOS 3.1.0. - -Thu Jun 15 15:56:27 2000 Michael Ravits - - * ace/OS_String.inl (strtoul): removed cast to unsigned - long on Linux. It's no longer needed with current glibc. - -Thu Jun 15 15:18:31 2000 Steve Huston - - * include/makeinclude/platform_aix4_g++.GNU: Add default setting for - exceptions (off by default); added proper handling for turning off - threads. Thanks to Soren Schmidt for these. - -Thu Jun 15 12:49:50 2000 Ossama Othman - - * ace/OS.h: - - Do not define priority range related macros - (ACE_{PROC,THR}_PRI_{FIFO,RR,OTHER}_{MIN,MAX}) to use - sched_get_priority_{min,max}() unless _POSIX_PRIORITY_SCHEDULING - is defined. - - Include prior to using _POSIX_PRIORITY_SCHEDULING - since that macro is supposed to be defined there. - - * ace/Malloc_T.cpp (trybind, bind, find): - * ace/Process_Manager.cpp (register_handler, spawn, remove): - * ace/Service_Repository.cpp (insert, remove): - * ace/Thread_Manager.cpp (spawn, insert_thr, check_state): - - Fixed "control reaches end of non-void function" warnings issued - by g++ 2.95.2. - - * ace/config-linux-lxpthreads.h (PTHREAD_MIN_PRIORITY, - PTHREAD_MAX_PRIORITY): - - Removed definition of these macros. They aren't used, nor - should they be, since priority ranges for each scheduling policy - are determined at run-time when creating a thread by invoking - the sched_get_priority_{min,max}() OS functions. This is only - done when ACE is configured for platforms that support the - Pthreads final standard (ACE_HAS_PTHREADS_STD), which glibc >= - 2.0.x does. - -Thu Jun 15 13:15:06 2000 David L. Levine - - * ace/config-lynxos.h: fixed 3.1.0 support. Rely on the - GNU compiler version instead of __LYNXOS_SDK_VERSION, - because that's not defined with 3.1.0. And added a - declaration of pthread_sigmask (), because that's missing - from the system headers. - - * include/makeinclude/platform_lynxos.GNU: fixed 3.1.0 support. - Removed the extra $(LYNXTARGET) from the PATH, and - added a -I/usr/lynx/$(VERSION)/usr/include (which shouldn't - be necessary, but apparently is). - - * ace/OS.i (thr_sigsetmask): don't call ::pthread_sigmask () - if ACE_LACKS_PTHREAD_SIGMASK is defined. - -Thu Jun 15 10:28:05 2000 Martin Stack - - * ace/TTY_IO.cpp (control): Added - - dcb.fDtrControl = DTR_CONTROL_ENABLE; - - for Win32 so that it will have the same default semantics as - Linux. - -Thu Jun 15 07:35:57 2000 Roger Larsson - - * ace/Process_Manager.cpp: Make sure to grab the lock inside the - terminate() methods and also call remove_proc() rather than - remove(). - -Thu Jun 15 12:41:05 2000 Yamuna Krishnamurthy - - * ACE version 5.1.4 released. - -Wed Jun 14 18:15:43 2000 Ossama Othman - - * configure.in (ACE_HAS_UCONTEXT_T): - - Check if ucontext_t gets defined by including , if the - check in fails. Some platforms define ucontext_t - in , but ACE doesn't explicitly include that - header. However, it is very likely that does, either - directly or indirectly. This should fix a configuration problem - that was occuring on FreeBSD 4.0. - -Wed Jun 14 17:54:18 2000 Ossama Othman - - * Makefile.am: - - Moved generation of aceConf.sh and ace-config.1 to configure - script. There was no reason for them to be generated in the - Makefile. This also fixes a problem where the Solaris sed - command didn't understand a substitution. - - * acconfig.h (PTHREAD_MIN_PRIORITY, PTHREAD_MAX_PRIORITY): - - Removed macros related to these macros. The configure script - will automatically add them. - - * configure.in: - - Generate aceConf.sh and ace-config.1 at configure time, rather - than make time. See above entry for details. - - Fixed tests for PTHREAD_MAX_PRIORITY and PTHREAD_MIN_PRIORITY. - These macros should only be used if the sched_get_priority_max() - and sched_get_priority_min() functions are not available. If - PTHREAD_{MAX,MIN}_PRIORITY isn't available, then check if - PX_PRIO_{MAX,MIN} is available. If so, then define - PTHREAD_{MAX,MIN}_PRIORITY to be those values. These changes - fix some configuration problems experienced IRIX. - - Improved test for ACE_Addr::sap_any support. ACE_Addr:sap_any - is now passed as an argument to the ACE_FILE_Addr constructor. - - * ace/Cached_Connect_Strategy_T.cpp: - - This file was still including a file that was removed from the - distribution, i.e. `ace/Cached_Connect_Strategy_T.i', which - caused compile-time errors to occur when building with inlining - disabled. - -Wed Jun 14 11:55:56 2000 Ossama Othman - - * ace/Cleanup_Strategies_T.cpp: - - This file was still including a file that was removed from the - distribution, i.e. `ace/Cleanup_Strategies_T.i', which caused - compile-time errors to occur when building with inlining - disabled. - -Wed Jun 14 10:24:02 2000 Douglas C. Schmidt - - * netsvcs/lib/Logging_Strategy.cpp (handle_timeout): Removed a - couple of non-referenced parameters. Thanks to David and Yamuna - for reporting this. - -Wed Jun 14 07:43:27 2000 Douglas C. Schmidt - - * netsvcs/lib/Client_Logging_Handler.cpp: Added ACE_TEXT macros - to the appropriate places in this file. - - * netsvcs/lib/Logging_Strategy.cpp: Removed the legacy - ASYS_TEXT and replaced them with ACE_TEXT. - -Wed Jun 14 08:30:53 2000 Carlos O'Ryan - - * */Makefile: - Updated dependencies (again), the last time I had - static_libs_only enabled that broke a number of things. - -Tue Jun 13 17:46:42 2000 Irfan Pyarali - - * ace/Connector.cpp: - - - handle_close(): cleanup_AST() will unbind an entry from the - map. This change of state in the map invalidates any iterators - currently iterating over the map. Therefore, the code in - handle_close() was changed such that a new iterator is created - after every call to cleanup_AST(). - - - cancel(): Cannot use the after cleanup_AST() is called - as cleanup_AST() will unbind the from the map. - - Thanks to Roland Fischer for pointing out this - bug. - -Tue Jun 13 15:31:21 2000 Ossama Othman - - * ltcf-c.sh: - * ltcf-cxx.sh: - * ltconfig: - * ltmain.sh: - - Updated to latest upstream versions. - -Tue Jun 13 15:51:33 2000 Jerry D. De Master - - * netsvcs/lib/Logging_Strategy: Enhanced the Logging Strategy so - it can be used to limit log file size at any logging point - (i.e., application, client logging daemon, or server logging - daemon) by specifying the -i and -m - options for the Logging_Strategy class in a - svc.conf file. - -Tue Jun 13 12:56:36 2000 Carlos O'Ryan - - * */Makefile: - Updated dependencies. - -Tue Jun 13 09:47:25 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Fixed some typos related to the static build core. - -Mon Jun 12 20:45:18 2000 Darrell Brunsch - - * bin/Process_Win32.pm: - - Changed the $newwindow check to check to see if the variable - was defined before comparing it to "yes". This removes a - perl warning. - - * bin/msvc_auto_compile.pl: - - The TAOACE[_static].dsw files were changed, so I altered the - CORE option to use the TAOACE.dsw file with -DLL, and added - some missing dsp files for the -LIB build. - - * bin/create_vt_dsps.pl: - - Changed the runtime library type used in the static versions - and added ACE_OS_HAS_DLL=0. - - * ace/ace_lib.dsp: - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf_lib.dsp: - * examples/IPC_SAP/ATM_SAP/CPP_client.dsp: - * examples/IPC_SAP/ATM_SAP/CPP_server.dsp: - - Miscellaneous fixes to get the static versions working again. - Mainly just adding ACE_OS_HAS_DLL=0. - - * tests/version_tests/CDR_Array_Test.dsp: (added) - * tests/version_tests/Atomic_Op_Test.dsp: - * tests/version_tests/Auto_IncDec_Test.dsp: - * tests/version_tests/Barrier_Test.dsp: - * tests/version_tests/Basic_Types_Test.dsp: - * tests/version_tests/Buffer_Stream_Test.dsp: - * tests/version_tests/CDR_File_Test.dsp: - * tests/version_tests/CDR_Test.dsp: - * tests/version_tests/Cache_Map_Manager_Test.dsp: - * tests/version_tests/Cached_Accept_Conn_Test.dsp: - * tests/version_tests/Cached_Conn_Test.dsp: - * tests/version_tests/Capabilities_Test.dsp: - * tests/version_tests/Collection_Test.dsp: - * tests/version_tests/Conn_Test.dsp: - * tests/version_tests/DLL_Test.dsp: - * tests/version_tests/DLList_Test.dsp: - * tests/version_tests/Dynamic_Priority_Test.dsp: - * tests/version_tests/Enum_Interfaces_Test.dsp: - * tests/version_tests/Env_Value_Test.dsp: - * tests/version_tests/Future_Set_Test.dsp: - * tests/version_tests/Future_Test.dsp: - * tests/version_tests/Handle_Set_Test.dsp: - * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/version_tests/Hash_Map_Manager_Test.dsp: - * tests/version_tests/High_Res_Timer_Test.dsp: - * tests/version_tests/IOStream_Test.dsp: - * tests/version_tests/Lazy_Map_Manager_Test.dsp: - * tests/version_tests/MM_Shared_Memory_Test.dsp: - * tests/version_tests/MT_Reactor_Timer_Test.dsp: - * tests/version_tests/MT_SOCK_Test.dsp: - * tests/version_tests/Malloc_Test.dsp: - * tests/version_tests/Map_Manager_Test.dsp: - * tests/version_tests/Map_Test.dsp: - * tests/version_tests/Mem_Map_Test.dsp: - * tests/version_tests/Message_Block_Test.dsp: - * tests/version_tests/Message_Queue_Notifications_Test.dsp: - * tests/version_tests/Message_Queue_Test.dsp: - * tests/version_tests/Naming_Test.dsp: - * tests/version_tests/New_Fail_Test.dsp: - * tests/version_tests/Notify_Performance_Test.dsp: - * tests/version_tests/Object_Manager_Test.dsp: - * tests/version_tests/OrdMultiSet_Test.dsp: - * tests/version_tests/Pipe_Test.dsp: - * tests/version_tests/Priority_Buffer_Test.dsp: - * tests/version_tests/Priority_Reactor_Test.dsp: - * tests/version_tests/Priority_Task_Test.dsp: - * tests/version_tests/Process_Manager_Test.dsp: - * tests/version_tests/Process_Mutex_Test.dsp: - * tests/version_tests/Process_Strategy_Test.dsp: - * tests/version_tests/RB_Tree_Test.dsp: - * tests/version_tests/Reactor_Exceptions_Test.dsp: - * tests/version_tests/Reactor_Notify_Test.dsp: - * tests/version_tests/Reactor_Performance_Test.dsp: - * tests/version_tests/Reactor_Timer_Test.dsp: - * tests/version_tests/Reactors_Test.dsp: - * tests/version_tests/Reader_Writer_Test.dsp: - * tests/version_tests/Recursive_Mutex_Test.dsp: - * tests/version_tests/Reverse_Lock_Test.dsp: - * tests/version_tests/SOCK_Connector_Test.dsp: - * tests/version_tests/SOCK_Send_Recv_Test.dsp: - * tests/version_tests/SOCK_Test.dsp: - * tests/version_tests/SPIPE_Test.dsp: - * tests/version_tests/SString_Test.dsp: - * tests/version_tests/SV_Shared_Memory_Test.dsp: - * tests/version_tests/Semaphore_Test.dsp: - * tests/version_tests/Service_Config_Test.dsp: - * tests/version_tests/Sigset_Ops_Test.dsp: - * tests/version_tests/Simple_Message_Block_Test.dsp: - * tests/version_tests/Svc_Handler_Test.dsp: - * tests/version_tests/TSS_Test.dsp: - * tests/version_tests/Task_Test.dsp: - * tests/version_tests/Thread_Manager_Test.dsp: - * tests/version_tests/Thread_Mutex_Test.dsp: - * tests/version_tests/Thread_Pool_Reactor_Test.dsp: - * tests/version_tests/Thread_Pool_Test.dsp: - * tests/version_tests/Time_Service_Test.dsp: - * tests/version_tests/Time_Value_Test.dsp: - * tests/version_tests/Timeprobe_Test.dsp: - * tests/version_tests/Timer_Queue_Test.dsp: - * tests/version_tests/Tokens_Test.dsp: - * tests/version_tests/UPIPE_SAP_Test.dsp: - * tests/version_tests/Upgradable_RW_Test.dsp: - * tests/version_tests/version_tests.dsw: - - Regenerated. - -Mon Jun 12 18:17:42 2000 Darrell Brunsch - - * bin/auto_run_tests.lst: (added) - * bin/auto_run_tests.pl: (added) - * tests/run_test.lst: (added) - * tests/run_test.pl: (added) - - New scripts to facilitate the auto_build testing on NT. - -Sun Jun 11 18:12:12 2000 Vishal Kachroo - - * examples/QOS/QoSEvent.h: Removed a warning on Win2K. - -Sat Jun 10 23:34:16 2000 Darrell Brunsch - - * docs/CE-status.txt: - - Updated to reflect my current plans for Windows CE. - Unfortunately, ACE on CE will not be working with the - next beta kit of ACE. :-( Need to get an autobuild - set up for CE sometime... - -Sat Jun 10 20:51:56 2000 Darrell Brunsch - - * ace/config-win32-common.h: - - Changed the "You must link with Multithreaded DLL" error - to make it sound less like it is a problem with the ACE - project file instead of the application project file. - - * docs/ACE-guidelines.html: - - Updated the section on wchar support in ACE. - -Sat Jun 10 17:33:55 2000 Carlos O'Ryan - - * ace/Configuration.cpp: - Fixed warnings under Linux/KCC - - * bin/auto_compile: - Add separators between the different sections of the log. - Darrell script would be able to generate nice color coded - summaries based on that. - - * include/makeinclude/platform_linux_kcc.GNU: - Add support for the math library. - -Fri Jun 09 11:31:24 2000 Nanbor Wang - - * ace/Service_Config.cpp (close_singletons): Applied Tom - Arbuckle's patch so the - Process_Manager singleton is closed before Reactor singleton. - -Fri Jun 9 09:28:18 2000 Carlos O'Ryan - - * include/makeinclude/platform_linux_kcc.GNU: - More fixes to make sure that shared and static libraries are - generated with the right configuration (threads, exceptions, - etc.). - -Fri Jun 9 07:19:10 2000 Toshio Hori - - * ace/Stream.h (class ACE_Stream): Added an updated version an - insert() and replace() that make it possible to replace the - stream head and tail. - -Fri Jun 09 02:34:07 2000 Irfan Pyarali - - * ace/OS.i (floor and ceil): Added new methods. - -Thu Jun 8 20:58:17 2000 Darrell Brunsch - - Patched for IBM VAC++ 4.02 for WinNT applied on behalf of - Boris Kaminer - - * config-win32-visualage.h: - - Remove dupplicate definition of ACE_HAS_TYPENAME_KEYWORD. - - * Auto_Ptr.h: - * Auto_Ptr.i: - - Copy constructors bodies into class declarations from Auto_Ptr.i - to Auto_ptr.h for constructors with ACE_EXPLICIT. (workaround - for explicit bug in VAC++ 4.02) - - * Malloc.cpp: - - Changed ACE_ASSERT (0 == "not implemented!"); to - ACE_ASSERT (!"not implemented!"); - (get over codestore fault) - - * OS.i: (chdir) - - Added !defined (ACE_WIN32) to the check for IBM CPP - - * ace-dll.icc: - - Changed the order of hpp files, and added a define for - _INTEGRAL_MAX_BITS = 64. - -Thu Jun 8 18:35:30 2000 Carlos O'Ryan - - * ace/Date_Time.h: - * ace/Date_Time.i: - Made a bunch of accessors const, thanks to Derek Dominish - for pointing this out. - -Thu Jun 08 14:17:20 2000 Nanbor Wang - - * ace/Process_Manager.{h,cpp} (close_singleton): - * ace/Service_Config.cpp (close_singletons): Applied Tom Arbuckle's - patch to clean up - Process_Manager singleton at program exit. - -Thu Jun 8 13:00:38 2000 Toshio Hori - - * ace/Stream.h (class ACE_Stream): Added support for an insert() - and replace() to make it easier to insert and update the - contents of an ACE_Stream. - -Thu Jun 8 09:52:36 2000 Joe Hoffert - - * bin/pace_components: - Adding this file to handle setup and cleanup of PACE components - just like the ace_components file does for ACE. - -Thu Jun 08 01:53:03 2000 Irfan Pyarali - - * ace/Message_Queue.i (peek_dequeue_head): Fixed typo. - -Wed Jun 7 20:41:33 2000 Douglas C. Schmidt - - * ace/Message_Queue: Added some "no-op" impls for the new - pure virtual methods added to ACE_Message_Queue recently. - Thanks to Darrell for pointing this out. - -Wed Jun 7 13:24:22 2000 Carlos O'Ryan - - * ace/OS.h: - For KCC under linux we have to define ACE_DEFAULT_SHLIB_MODE as - RLTD_LAZY (RTLD_GROUP and RTLD_NODELETE are not defined in that - configuration). - - * ace/OS_Dirent.inl: - Removed unreachable statement. - - * ace/config-linux-common.h: - KCC does not have LLSEEK or LLSEEK64 - - * include/makeinclude/platform_linux_kcc.GNU: - Fixed the configuration file so the default settings for - debugging, optimization and exceptions can be overriden by the - user. - -Wed Jun 7 12:05:23 2000 Darrell Brunsch - - * bin/fuzz.pl: - - Dropped the level for the TCHAR check to 4, so it runs - by default. - - Also added a new test to check for mismatch of ace/pre.h - and ace/post.h in header files (level 4). - - * ace/ace_wchar.h: - - Added a FUZZ: disable for the TCHAR check, since we need - to define the ASYS_TCHAR type macros for backwards - compatiblity here. - -Wed Jun 07 13:22:01 2000 David L. Levine - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (twoway_client_test): - replaced ASYS_TEXT with ACE_TEXT, see - Tue Jun 6 12:39:23 2000 Phil the Build Czar - :-) - -Wed Jun 7 12:09:50 2000 Joe Hoffert - - * include/makeinclude/platform_sunos5_sunc++.GNU: - Changed position-independent-code option from -PIC to -KPIC since - the C++ compiler recognizes either and the C compiler only - recognizes -KPIC. - * include/makeinclude/rules.local.GNU: - Added a compilation rule for C (i.e., .c) files. - -Tue Jun 6 22:32:16 2000 Carlos O'Ryan - - * ace/OS.i: - * ace/OS_TLI.h: - Moved the explicit declaration of t_getname() from OS.i to OS_TLI.h - -Tue Jun 6 20:02:18 2000 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - * ace/OS_TLI.cpp: - * ace/OS_TLI.h: - * ace/OS_TLI.inl: - * ace/config-all.h: - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/ace-dll.icc: - * ace/ace-lib.icc: - * ace/ace.icc: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Moved the TLI wrappers to ACE_OS_TLI. - -Tue Jun 6 17:57:14 2000 Vishal Kachroo - - * examples/QOS/server.cpp: - * examples/QOS/client.cpp: - Changed these to reflect changes to the ACE QoS API. - -Tue Jun 06 15:44:03 2000 David L. Levine - - * ace/config-lynxos.h: added support for LynxOS 3.1.0. - It uses ACE_HAS_PTHREADS_STD instead of ACE_HAS_PTHREADS_DRAFT4 + - ACE_HAS_STDARG_THR_DEST. Thanks to Dorr H. Clark - for reporting this. - -Tue Jun 6 12:39:23 2000 Phil Mesnier - - Ported ACE & TAO to Unixware 7.1, using GNU C++ compiler gcc 2.95.2. - See ACE-INSTALL for specific information on configuring the build - environment. - - * ACE-INSTALL.html - * ace/OS.h - * ace/config-unixware-7.1.0.h - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp - * examples/Threads/tss1.cpp - * include/makeinclude/platform_unixware_g++.GNU - * include/makeinclude/wrapper_macros.GNU - -Tue Jun 6 10:32:51 2000 Edan Ayal - - * ace/Message_Queue.h: Added the following two pure - virtual methods to class 'ACE_Message_Queue_Base': - - virtual ACE_Notification_Strategy *notification_strategy (void) = 0; - virtual void notification_strategy (ACE_Notification_Strategy *s) = 0; - virtual int peek_dequeue_head (ACE_Message_Block *&first_item, - ACE_Time_Value *timeout = 0); - - These methods allow the 'ACE_Message_Queue_Base' to be used as a - base class (without specifying the synch method or templatizing - on it) and access/alter the notification strategy. - -Tue Jun 6 09:42:39 2000 Chris Kohlhoff - - * include/makeinclude/ace_flags.bor: - Added support for new orbsvcs libraries. - -Mon Jun 05 20:59:42 2000 David L. Levine - - * include/makeinclude/wrapper_macros.GNU: protected definitions - of shared_libs and static_libs with ifeq null. Users can still - override the settings in their platform_macros.GNU, because - that's included after these definitions, or in their environment. - But this makes the code look more consistent. Thanks to Jody - Hagins for this suggestion. - -Mon Jun 5 14:54:46 2000 Ossama Othman - - * ace/Select_Reactor_T.cpp (ACE_Select_Reactor_T): - - There is no need to deallocate resources from the previous call - to open() since the open() method deallocates any resources - prior to exiting if an error was encountered. - -Mon Jun 5 14:18:18 2000 Ossama Othman - - * ace/Select_Reactor_T.cpp (ACE_Select_Reactor_T): - - If the Reactor fails to open with the hard-coded default size - then set the Reactor size to be the current run-time limit on - the number of file descriptors available to the process. This - size is not necessarily the maximum limit. On platforms that do - not support run-time evaluation of the current file descriptor - limit, a default value of FD_SETSIZE will be used. This - corrects a problem on Solaris in 32 bit mode, and on any other - platform where the per-process file descriptor limit is less - than FD_SETSIZE. - Reported by Marvin Allen Wolfthal . - - * ace/config-linux-common.h (ACE_DEFAULT_SELECT_REACTOR_SIZE): - - It is no longer necessary to hard-code the default reactor size - for older Linux kernels that had a file descriptor limit less - than FD_SETSIZE since the Select Reactor now falls back on the - run-time file descriptor limit for the given process. - -Mon Jun 5 10:22:22 2000 Darrell Brunsch - - * ace/OS_Memory.h: - - Just like in OS_String.h, added an include for stddef.h to - get the definition of size_t. - -Mon Jun 5 09:55:20 2000 Darrell Brunsch - - * ace/OS_String.h: - * ace/OS_String.inl: - * ace/OS_String.cpp: - - Removed some unnecessary *_emulation methods, and fixed some - other miscellaneous mistakes (like using ACE_OS instead of - ACE_OS_String). - - During my last checkin, it seems like the strncasecmp_emulation - versions were lost, so I resurrected them. - - Also changed the use of u_char in memchr_emulation to unsigned - char, since we shouldn't depend on definitions of u_char (since - on some platforms we don't have a definition of u_char at that - time). Thanks to David Levine for reporting this. - -Sun Jun 4 14:58:37 2000 Darrell Brunsch - - * apps/Orbix-Examples/Event_Comm/include/Event_Comm.hh: - * apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm.hh: - * apps/Orbix-Examples/Logger/logger.hh: - * docs/ACE-categories.html: - * docs/tutorials/guide-tutorials.html: - * docs/tutorials/online-tutorials.html: - * docs/tutorials/templates.html: - * docs/tutorials/Chap_2/ex01.html: - * docs/tutorials/Chap_2/ex02.html: - * docs/tutorials/Chap_2/ex03.html: - * docs/tutorials/Chap_2/ex04.html: - * docs/tutorials/Chap_2/ex05.htm: - * docs/tutorials/Chap_2/ex05.html: - * docs/tutorials/Chap_2/ex06.html: - * docs/tutorials/Chap_3/ex01.html: - * docs/tutorials/Chap_3/ex02.html: - * docs/tutorials/Chap_4/ex01.html: - * docs/tutorials/Chap_4/ex02.html: - * docs/tutorials/Chap_4/ex03.html: - * docs/tutorials/Chap_4/ex04.html: - * docs/tutorials/Chap_4/ex05.html: - * docs/tutorials/Chap_4/ex06.html: - * docs/tutorials/Chap_4/ex07.html: - * docs/tutorials/Chap_4/ex08.html: - * docs/tutorials/Chap_5/ex01.html: - * docs/tutorials/Chap_5/ex02.html: - * docs/tutorials/Chap_5/ex03.html: - * docs/tutorials/Chap_5/ex04.html: - * docs/tutorials/Chap_5/ex05.html: - * docs/tutorials/Chap_6/ex01.html: - * docs/tutorials/Chap_6/ex02.html: - * docs/tutorials/Chap_6/ex03.html: - * docs/tutorials/Chap_6/ex04.html: - * docs/tutorials/Chap_6/ex05.html: - * docs/tutorials/Chap_6/ex06.html: - * docs/tutorials/Chap_6/ex07.html: - * docs/tutorials/Chap_6/ex08.html: - * docs/tutorials/Chap_6/ex09.html: - * docs/tutorials/Chap_6/ex10.html: - * docs/tutorials/Chap_7/ex01.html: - * docs/tutorials/Chap_7/ex02.html: - * docs/tutorials/Chap_7/ex03.html: - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.i: - * os-patches/lynxos-patches.html: - * performance-tests/Synch-Benchmarks/context.c: - * psosim/drv_conf.c: - * rpc++/callback.cc: - * rpc++/request.cc: - * rpc++/service.cc: - * rpc++/stub.cc: - * rpc++/version.h: - * rpc++/xdr++.cc: - * rpc++/StdHdrs/rpc/auth.h: - * rpc++/StdHdrs/rpc/c_types.h: - * rpc++/StdHdrs/rpc/clnt.h: - * rpc++/StdHdrs/rpc/pmap_clnt.h: - * rpc++/StdHdrs/rpc/svc.h: - * rpc++/StdHdrs/rpc/xdr.h: - * rpc++/example/calcsvc.cc: - * rpc++/example/calcsvc.h: - * rpc++/example/client.cc: - * rpc++/example/server.cc: - * rpc++/rpc++/callback.h: - * rpc++/rpc++/request.h: - * rpc++/rpc++/service.h: - * rpc++/rpc++/stub.h: - * rpc++/rpc++/xdr++.h: - - Added missing CVS Id strings. - -Sun Jun 4 14:55:46 2000 Darrell Brunsch - - * bin/fuzz.pl: - - Added html files to the list of files checked for - ending with a newline. - -Sun Jun 4 14:38:43 2000 Darrell Brunsch - - * ace/OS_String.inl: - - Some platforms (like QNX Neutrino) need strings.h to get - the declaration of strcasecmp. - - * ace/config-qnx-neutrino.h: - - Added a definition of ACE_HAS_STRINGS so strings.h will be - included in OS_String.inl. - -Sun Jun 04 09:40:43 2000 David L. Levine - - * ace/config-cxx-common.h: with __USE_STD_IOSTREAM, added - #define ACE_HAS_STANDARD_CPP_LIBRARY 1. Thanks to - Warren Miller for reporting this [Bug 582]. - -Sat Jun 3 21:18:43 2000 Darrell Brunsch - - * ace/OS.h: - * ace/OS.i: - * ace/OS_Memory.cpp: (added) - * ace/OS_Memory.h: (added) - * ace/OS_Memory.inl: (added) - - Another bit of OS split off. Memory contains all the - malloc, calloc, etc. stuff. - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/ace-dll.icc: - * ace/ace-lib.icc: - * ace/ace.icc: - * ace/ace_dll.dsp: - * ace/ace_dll_ce.dsp: - * ace/ace_lib.dsp: - - Needed to add OS_Memory to the makefiles/projects. - - * ace/OS_Dirent.cpp: - * ace/OS_Dirent.h: - * ace/OS_Dirent.inl: - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - - Over the years, the functions in OS.i have gotten way too - large and complicated to make sense being inlined. But the - problem is too many were complicated only on some platforms, - while being really simple (and inline-able) on others. - - So the question is, how to separate two versions of a function - into the .cpp and .inl files. The latest solution is to do - this. For the simple stuff, keep it in the .inl file, but for - complicated versions, add another method to the class (like - foo_emulation for foo) and call that from the .inl file. - - This gives us the best of both worlds, and should be - the easiest to understand of the possible ways of doing - this. - -Sat Jun 3 18:51:46 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Changed the way libraries were detected to remove false - positives when the dsps are in a directory with DLL in - its name. Now it will search for " DLL " or " LIB " - instead of "DLL" or "LIB". - - * bin/fuzz.pl: - - Was giving false positives for TEXT, changed it to search - for "TEXT (" to remove it (so it will not detect "MUTEXTYPE" - like words. - - Also disabled the 80 character check for ACE_RCSID lines, - since they are difficult to reduce in size, since they contain - the CVS ID string. - -Sat Jun 3 17:00:11 2000 Darrell Brunsch - - * bin/fuzz.pl: - - Added two new tests: - - a check to see if a file ends with a newline - - a check to detect use of TCHAR, LPTSTR, LPCTSR, TEXT - ASYS_TEXT, and ASYS_TCHAR - - Changed to look at more files, including those ending with - .cc, .c, .pl, .htm, .html, .hxx, .cxx, .hpp, .idl and .pidl. - - Changed to keep track of the number of errors and warnings - and prints out the totals at the end of the run. Also will - exit with an exit code of 1 if there are any errors. - - Added a new flag, -c, which will tell fuzz.pl to get the list - of files from ARGV instead of from searching or cvs. - - Finally, also added support for the usage of - "FUZZ: disable check_for_xxxx" and - "FUZZ: enable check_for_xxxx" in files so the detection can - be turned off for files where the "offending" usage is needed. - This can be used with: - - check_for_inline - - check_for_math_include - - check_for_tchar - -Fri Jun 02 22:33:32 2000 Irfan Pyarali - - * ace/Priority_Reactor.cpp (init_bucket): Removed extra inline - directive. Thanks to Darrell for pointing this out. - -Fri Jun 2 11:06:33 2000 Darrell Brunsch - - * bin/fuzz.pl: - - Bumped up the levels for the 80 char lines and preprocessor - comment tests. The latter should now not run by default. - -Thu Jun 2 12:30:00 2000 Kirthika Parameswaran - - * ace/Caching_Utility.cpp: Changed the cache entries limit to 0 so - that when the Purge_Percent is 100, all the entries are purged - from the cache. Thanks to Edan Ayal for - reporting this bug and sending in the fix too! - -Thu Jun 1 15:16:26 2000 Ossama Othman - - * ace/config-linux-common.h: - - The change that allowed more than 256 file descriptors to be - opened for non-root processes on Linux only works for more - recent Linux kernels, such as the 2.2.x series. As such, the - default Select Reactor size is now set to 256 for Linux kernels - older than 2.2.0. Thanks to David for pointing out this - limitation. - - * m4/platform.m4 (ACE_DEFAULT_SELECT_REACTOR_SIZE): - - Added test that sets the default Select Reactor size to 256 if - the Linux kernel version is less than 2.2.0. This change is - related to the 256 file descriptor limit described above. - -Thu Jun 01 12:35:00 2000 Nanbor Wang - - * ace/ace_dll.dsp: Fixed typos in ACEMFC configuration. Thanks - to Steve for pointing this out. - -Thu Jun 1 10:08:31 2000 Darrell Brunsch - - * bin/fuzz.pl: - - Was printing out "line test" when doing the preprocessor - comment test. - -Thu Jun 1 08:43:14 2000 Darrell Brunsch - - Fuzz is a script whose purpose is to check through ACE/TAO - files for easy to spot (by a perl script, at least) problems. - - Usage is: - fuzz.pl [-dhm] [-l level] - - -d turn on debugging - -h display this help - -l level set detection level (default = 5) - -m only check locally modified files (uses cvs) - - It currently has checks for these: - - - ACE/ASYS_INLINE in .cpp files (level 2+) - - $ID string in .h/.i/.cpp files (level 2+) - - Bare inline in a .i file (level 2+) - - Inclusion of math.h in a .h/.i/.cpp file (level 3+) - - Check for lines of > 80 chars in .h/.i/.cpp (level 6+) - - Check for use of // in a preprocessor directive (level 3+) - -Wed May 31 16:30:44 2000 Ossama Othman - - * configure.in (AC_REVISION): - - The RCS ID had to be quoted, otherwise the generated configure - script would end up having a mangled version of the RCS ID. - -Wed May 31 16:18:35 2000 Ossama Othman - - * configure.in: - - Fixed the informational message that is displayed when the - configuration integrity check fails so that the shell will no - longer interpret the RCS ID as a variable. This was done by - removing the dollar '$' signs from the RCS ID by using the M4 - translit() built-in. - - (LIBS): - - Removed "-lrt" from the hardcoded list of libraries for OSF/1 - {3,4,5}. The ACE_CHECK_ASYNCH_IO test should be able to detect - this library. - - (AC_REVISION): - - Changed revision string to be the RCS ID. - - (AC_OUTPUT): - - Removed the commented out TAO output files from the list files - the configure script should create. The latest CVS Autoconf - flagged them as problems when generating the configure script. - -Wed May 31 18:08:12 2000 Vishal Kachroo - - * examples/QoS/QosEvent.h: - * examples/QoS/server.cpp: - * examples/QoS/client.cpp: - * examples/QoS/Receiver_QOS_Event_Handler.{cpp,h}: - * examples/QoS/Sender_QOS_Event_Handler.{cpp,h}: - - Fixed the calls to subsribe() and qos () methods that - broke because of changes to ACE QoS API. - -Wed May 31 12:29:12 2000 Darrell Brunsch - - * apps/JAWS2/JAWS/jaws.dsp: - - Added a couple of files that were in the Makefile but not - in this file. - -Wed May 31 14:49:36 2000 Steve Huston - - * ace/Log_Msg.cpp (log): Revert change from Thu May 25 17:39:22 2000. - Add #if !defined (ACE_LACKS_UNIX_SIGNALS) to ACE_Log_Msg_Sig_Guard - ctor which matches a similar check in the dtor. This makes it work - on pSOS same as on other platforms without UNIX-like signals. - - * ace/Signal.i (ACE_Sig_Guard::ACE_Sig_Guard): Added compile-time - check for !defined (ACE_LACKS_UNIX_SIGNALS) to not try to manipulate - the signal mask for platforms that don't do it. Matches an existing - check in the dtor. - -Wed May 31 11:51:46 2000 Darrell Brunsch - - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf_lib.dsp: - - Fixed the output directories to be relative to ".\". Thanks - to Francois Bernier for pointing - this out. - -Wed May 31 10:31:18 2000 Darrell Brunsch - - * examples/ConfigViewer/ConfigurationViewer.dsp: - - Changed the configuration type to "Win32 wxWindows Debug" - instead of "Win32 Debug" (and the same for Release). - This will prevent this project from being picked up by - the msvc_auto_compile.pl, since we do not have wxWindows - installed with the auto builds. - -Wed May 31 10:13:10 2000 Darrell Brunsch - - * examples/Export/export_dll.dsp: - * examples/Export/test.dsp: - - Fixed the relative paths for ace includes and libraries. - -Wed May 31 11:25:34 2000 Irfan Pyarali - - * examples/Reactor/WFMO_Reactor/test_handle_close.cpp: Fixed - signed/unsigned comparison warning. - -Tue May 30 14:23:22 2000 Ossama Othman - - * apps/Gateway/Gateway/gatewayd.cpp: - * examples/ASX/UPIPE_Event_Server/Options.cpp: - * examples/Naming/test_multiple_contexts.cpp: - - Added missing "ace/Log_Msg.h" include. - -Tue May 30 10:41:34 2000 Darrell Brunsch - - * ace/Makefile.bor: - * include/makeinclude/ace_flags.bor: - - ACE_OS_BUILD_DLL and ACE_OS_HAS_DLL were not being set correctly - in Borland. - -Mon May 29 16:49:25 2000 Douglas C. Schmidt - - * ace/OS.i: Changed all 'ACE_Errno_Guard (errno, 0)' to - 'ACE_Errno_Guard (errno)' in the following methods. - - ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv), - ACE_OS::rw_unlock (ACE_rwlock_t *rw), - ACE_OS::rw_trywrlock (ACE_rwlock_t *rw), - ACE_OS::rw_unlock (ACE_rwlock_t *rw) - - Thus, if a critical section of code is guarded using an - ACE_Read_Guard, and errno is set inside, the value is not - overridden with 0 when the section is exited in - ACE_OS::rw_unlock. Thanks to Edan Ayal for - reporting this. - - * ace/Connector.h: Added a new typedef defined as follows: - - typedef ACE_TYPENAME _ACE_PEER_CONNECTOR::PEER_ADDR - ACE_TYPENAME_ACE_PEER_CONNECTOR_PEER_ADDR; - - This fixes some problems on some platforms due to problems with - the typename in a cast expression. Thanks to Ingo Dahm - for reporting this. - - * ace/IO_Cntl_Msg.h: Changed the ACE_IO_Cntl_Cmds enum to be - a typedef u_short so that users could create their own values. - Thanks to vsg@ivl.kiev.ua for this suggestion. - - * ace/ACE.h, - * ace/ACE.h: Make the documentation consistent for both - sockets and "normal" I/O methods! - -Mon May 29 11:36:28 2000 Michael Kircher - - * ace/OS_Dirent.cpp: Fixed the memory allocation in open_dir, - which allocated one char too little. - -Sun May 28 17:26:28 2000 Ossama Othman - - * ace/Timer_Heap_T.cpp: - * ace/Timer_Queue_T.cpp: - * apps/JAWS/server/HTTP_Helpers.cpp: - * apps/JAWS/server/HTTP_Response.cpp: - * apps/drwho/BS_Client.cpp: - * examples/ASX/Event_Server/Event_Server/Options.cpp: - * examples/Logger/simple-server/Logging_Handler.cpp: - * examples/Logger/simple-server/server_loggerd.cpp: - * examples/Mem_Map/IO-tests/test_io.cpp: - * examples/Naming/test_non_existent.cpp: - * examples/Naming/test_writers.cpp: - * examples/Reactor/Dgram/CODgram.cpp: - * examples/Reactor/Dgram/Dgram.cpp: - * examples/Reactor/FIFO/server.cpp: - * examples/Reactor/Misc/pingpong.cpp: - * examples/Reactor/Misc/test_signals_1.cpp: - * examples/Reactor/Misc/test_timer_queue.cpp: - * examples/Reactor/Multicast/server.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h: - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h: - * examples/Service_Configurator/IPC-tests/server/server_test.cpp: - * examples/Service_Configurator/Misc/Timer_Service.cpp: - * examples/Service_Configurator/Misc/main.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp: - * examples/Threads/process_mutex.cpp: - * examples/Threads/process_semaphore.cpp: - * examples/Threads/tss2.cpp: - * netsvcs/clients/Naming/Client/main.cpp: - * netsvcs/clients/Naming/Dump_Restore/main.cpp: - * performance-tests/Misc/test_naming.cpp: - * performance-tests/UDP/udp_test.cpp: - - Added missing "ace/Log_Msg.h" include. This fixes a series of - compile-time errors with Compaq C++. - -Sat May 27 20:55:24 2000 Ossama Othman : - - * tests/test_config.h: - - Added missing include for "ace/Log_Msg.h." This fixes a - compile-time error from Sun C++ 5.0. - -Sat May 27 20:41:14 2000 Ossama Othman - - * ace/Hash_Map_Manager_T.h: - - Added missing include for "ace/Log_Msg.h." This fixes a - compile-time error on Tru64. - -Sat May 27 17:09:03 2000 David L. Levine - - * docs/ACE-guidelines.html: added const to example - accessor declaration. - -Sat May 27 14:17:35 2000 Ossama Othman - - * apps/JAWS2/HTTPU/parse_url.cpp: - * examples/Web_Crawler/URL_Addr.cpp: - * examples/Reactor/Multicast/client.cpp: - * examples/OS/Process/process.cpp: - * examples/IPC_SAP/ATM_SAP/CPP-client.cpp: - * examples/IPC_SAP/ATM_SAP/CPP-server.cpp: - * examples/DLL/Newsweek.cpp: - * examples/DLL/Today.cpp: - * examples/DLL/test_dll.cpp: - * websvcs/tests/Test_URL_Addr.cpp: - - Added missing `ace/Log_Msg.h' include. - - * examples/Web_Crawler/URL_Addr.cpp (ACE_URL_Addr): - - Fixed warning about missing base class initialization in copy - constructor base member initializer list. - - (~ACE_URL_Addr, addr_to_string): - - Changed use of "LPTSTR" to "ACE_TCHAR *". This fixes an error - on UNIX builds. - -Sat May 27 14:59:08 2000 Douglas C. Schmidt - - * tests/Signal_Test.cpp (worker_parent): Yet another fix of this... - Now we add an ACE_static_cast to long, as well as doing the %ld! - Thanks to Yamuna for fixing this! - - * ace/SOCK_Stream.h: Improved the documentation of recv_n() et al. - Thanks to Sami Aario for this - suggestion. - -Sat May 27 01:07:01 2000 Darrell Brunsch - - * ace/config-win32-common.h: - - Added a semicolon to the definitions of - ACE_EXPORT_SINGLETON_DECLARE - ACE_IMPORT_SINGLETON_DECLARE - - Since the default definition for this is nothing, the semicolon is - better off in the definitions themselves. Otherwise, one needs to - add a semicolon after the use of these macros, which can cause - warnings when the macro expands to nothing. - -Fri May 26 20:00:22 2000 Darrell Brunsch - - * ace/OS_String.inl (strcasecmp, strncasecmp): - - I have no idea how this worked before, but in these two functions - we were using _stricmp/_strnicmp for Win32. Borland doesn't define - these by default, instead they use stricmp/strnicmp. So instead - of trying to figure out how this all worked before, I just added - an #elif for __BORLAND__ and called the stricmp/strnicmp. - -Fri May 26 19:26:34 2000 Ossama Othman - - * netsvcs/clients/Logger/direct_logging.cpp: - - Added missing include of `ace/Log_Msg.h'. - -Fri May 26 18:14:47 2000 Darrell Brunsch - - * ace/OS_String.inl: - - Moved the ACE_OS_String::to_lower () methods up in the file, since - they are used in other inlined functions. - -Fri May 26 16:13:08 2000 Darrell Brunsch - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS_String.cpp: - * ace/OS_String.h: - - Moved the strptime back to OS.h, because it is more a time - thing than a string thing. - -Fri May 26 15:58:52 2000 Ossama Othman - - * ace/Select_Reactor_Base.cpp (open): - - Re-enabled the change that added ability to set the handle limit - to a value greater than FD_SETSIZE on platforms that support - this functionality. This was made possible by Steve Huston's - change to the ACE::max_handles() method described several - ChangeLog entries below. - -Fri May 26 14:27:02 2000 Darrell Brunsch - - * ace/OS_String.inl: - - Changed the strncasecmp methods to not use ssize_t inside of - them. This required a reworking of the loop, since it - depended on negative values. This was needed since ssize_t - is more difficult to get defined than size_t, so it seemed - less obtrusive to do it this way. - -Fri May 26 12:30:56 2000 Ossama Othman - - * ace/TLI_Connector.h: - * ace/TLI_Connector.cpp: - - Moved include of ace/Log_Msg.h to the header file. - TLI_Connector.i utilizes some of the ACE_Log_Msg macros. - -Fri May 26 14:25:31 2000 Jeff Parsons - - * ace/ace_dll.dsp: - Added OS_String.h to project for convenience. - -Fri May 26 12:23:55 2000 Ossama Othman - - * ace/TLI_Acceptor.cpp: - * ace/TLI_Connector.cpp: - - *sigh* These files also needed to include "ace/Log_Msg.h." - -Fri May 26 12:13:26 2000 Ossama Othman - - * ace/Singleton.cpp: - * ace/TLI.cpp: - - These files needed to explicitly include "ace/Log_Msg.h," too. - -Fri May 26 12:04:39 2000 Ossama Othman - - * ace/ARGV.cpp: - * ace/Capabilities.cpp: - * ace/Dump.cpp: - * ace/Filecache.cpp: - * ace/Local_Tokens.h: - * ace/Log_Msg.cpp: - * ace/Malloc.h: - * ace/Map_Manager.h: - * ace/Memory_Pool.cpp: - * ace/Name_Proxy.cpp: - * ace/Process.cpp: - * ace/Process_Manager.cpp: - * ace/QoS_Manager.cpp: - * ace/QoS_Session_Factory.cpp: - * ace/QoS_Session_Impl.cpp: - * ace/Remote_Name_Space.cpp: - * ace/SOCK_Acceptor.cpp: - * ace/SOCK_Dgram.cpp: - * ace/Select_Reactor_Base.cpp: - * ace/Service_Repository.cpp: - * ace/Signal.cpp: - * ace/Stats.h: - * ace/Synch.cpp: - * ace/TP_Reactor.h: - * ace/Thread_Manager.h: - * ace/Token.cpp: - - These files needed to explicitly include "ace/Log_Msg.h," too. - -Fri May 26 11:29:44 2000 Ossama Othman - - * ace/ACE.cpp: - * ace/Malloc.h: - - Include "ace/Log_Msg.h" to pull in the appropriate definition of - the ACE llessogging macros. This fixes a problem on Solaris. - -Thu May 25 19:39:59 2000 Ossama Othman - - * configure.in: - - Re-enabled test for ACE_HAS_SIGNAL_SAFE_OS_CALLS. The fixes to - the ACE_OSCALL* macros below make it possible to enable this - feature. - - * ace/config-all.h (ACE_OSCALL, ACE_OSCALL_RETURN): - - Removed call to "ACE_LOG_MSG->restart()" from these macros in - the "ACE_HAS_SIGNAL_SAFE_OS_CALLS" case. - - * ace/OS.h: - - Remove inclusion of "ace/Log_Msg.h" when the - ACE_ONLY_LATEST_AND_GREATEST preprocessor macro is defined. - This reduces the number of extraneous header interdependencies - in much of the ACE source files. - - Added a forward declaration for ACE_Log_Msg to compensate for - the declaration that was initially pulled in by "ace/Log_Msg.h" - It was only needed for "friend" declaration inside the - ACE_OS_Object_Manager class. - - * ace/Addr.cpp: - * ace/Addr.h: - * ace/Auto_Ptr.h: - * ace/DEV_Addr.cpp: - * ace/DEV_Connector.h: - * ace/DEV_Connector.i: - * ace/DEV_IO.cpp: - * ace/DLL.cpp: - * ace/FIFO.cpp: - * ace/FIFO_Recv.cpp: - * ace/FIFO_Recv_Msg.cpp: - * ace/FIFO_Send.cpp: - * ace/FIFO_Send_Msg.cpp: - * ace/FILE_Addr.cpp: - * ace/FILE_Connector.h: - * ace/FILE_IO.cpp: - * ace/Get_Opt.cpp: - * ace/Handle_Set.cpp: - * ace/INET_Addr.cpp: - * ace/IO_SAP.cpp: - * ace/IPC_SAP.cpp: - * ace/LSOCK.cpp: - * ace/LSOCK_Acceptor.cpp: - * ace/LSOCK_CODgram.cpp: - * ace/LSOCK_Connector.cpp: - * ace/LSOCK_Dgram.cpp: - * ace/LSOCK_Stream.cpp: - * ace/Log_Record.cpp: - * ace/MEM_Addr.cpp: - * ace/Makefile: - * ace/Mem_Map.cpp: - * ace/Name_Request_Reply.cpp: - * ace/OS.cpp: - * ace/Pipe.cpp: - * ace/SOCK.cpp: - * ace/SOCK_CODgram.cpp: - * ace/SOCK_Connector.cpp: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - * ace/SPIPE_Acceptor.cpp: - * ace/SPIPE_Connector.cpp: - * ace/SV_Message_Queue.cpp: - * ace/SV_Semaphore_Complex.cpp: - * ace/SV_Semaphore_Simple.cpp: - * ace/SV_Shared_Memory.cpp: - * ace/Time_Request_Reply.cpp: - * ace/Trace.cpp: - * ace/Typed_SV_Message_Queue.cpp: - * ace/UNIX_Addr.h: - * apps/Gateway/Peer/Options.cpp: - * apps/JAWS/server/Parse_Headers.cpp: - * apps/drwho/Binary_Search.cpp: - * apps/drwho/CM_Client.cpp: - * apps/drwho/CM_Server.cpp: - * apps/drwho/Hash_Table.cpp: - * apps/drwho/Multicast_Manager.cpp: - * apps/drwho/Options.cpp: - * apps/drwho/PMC_All.cpp: - * apps/drwho/PMC_Flo.cpp: - * apps/drwho/PMC_Ruser.cpp: - * apps/drwho/PMC_Usr.cpp: - * apps/drwho/PMS_All.cpp: - * apps/drwho/PMS_Flo.cpp: - * apps/drwho/PMS_Ruser.cpp: - * apps/drwho/PMS_Usr.cpp: - * apps/drwho/PM_Client.cpp: - * apps/drwho/Protocol_Manager.cpp: - * apps/drwho/Protocol_Record.cpp: - * apps/drwho/SMR_Client.cpp: - * apps/drwho/SMR_Server.cpp: - * apps/drwho/SM_Client.cpp: - * apps/drwho/SM_Server.cpp: - * apps/drwho/Search_Struct.cpp: - * apps/drwho/Single_Lookup.cpp: - * apps/drwho/client.cpp: - * apps/drwho/server.cpp: - * examples/IOStream/client/iostream_client.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp: - * examples/IPC_SAP/SPIPE_SAP/NPClient.cpp: - * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp: - * examples/IPC_SAP/SPIPE_SAP/producer_read.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-client.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-server.cpp: - * examples/IPC_SAP/TLI_SAP/db-client.cpp: - * examples/IPC_SAP/TLI_SAP/ftp-client.cpp: - * examples/Log_Msg/test_callback.cpp: - * examples/Log_Msg/test_log_msg.cpp: - * examples/Log_Msg/test_ostream.cpp: - * examples/Logger/client/logging_app.cpp: - * examples/Mem_Map/IO-tests/IO_Test.cpp: - * examples/Mem_Map/file-reverse/file-reverse.cpp: - * examples/Misc/test_get_opt.cpp: - * examples/Misc/test_profile_timer.cpp: - * examples/Misc/test_sstring.cpp: - * examples/Reactor/FIFO/client.cpp: - * examples/Reactor/Misc/test_early_timeouts.cpp: - * examples/Reactor/Misc/test_time_value.cpp: - * examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp: - * examples/Shared_Malloc/Options.cpp: - * examples/Shared_Memory/test_MM.cpp: - * examples/Shared_Memory/test_SV.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp: - * netsvcs/clients/Logger/indirect_logging.cpp: - * netsvcs/lib/Logging_Strategy.cpp: - * performance-tests/Misc/basic_perf.cpp: - - Include "ace/Log_Msg.h" to pull in the appropriate definition of - the ACE logging macros. - -Fri May 26 09:16:21 2000 Darrell Brunsch - - * ace/OS_Dirent.cpp: - - I shall not put ACE_INLINE's in a .cpp file. - I shall not put ACE_INLINE's in a .cpp file. - I shall not put ACE_INLINE's in a .cpp file. - I shall not put ACE_INLINE's in a .cpp file. - I shall not put ACE_INLINE's in a .cpp file. - I shall not put ACE_INLINE's in a .cpp file. - I shall not put ACE_INLINE's in a .cpp file. - I shall not put ACE_INLINE's in a .cpp file. - I shall not put ACE_INLINE's in a .cpp file. - I shall not put ACE_INLINE's in a .cpp file. - - :-) - -Thu May 25 20:23:45 2000 Darrell Brunsch - - * bin/Process_Win32.pm: - - The timed_wait wasn't returning the correct value if the - server actually timed out. - -Thu May 25 18:21:41 2000 Steve Huston - - * ace/ACE.cpp (max_handles): If an ACE_LACKS_RLIMIT platform, let - it try sysconf or FD_SETSIZE instead of always getting ENOTSUP. - -Thu May 25 17:39:22 2000 Steve Huston - - * ace/Event_Handler.cpp (register_stdin_handler): On pSOS, do - stdin using another thread (like Win32) because ACE_STDIN is not - a handle that select() can demux on. It only does sockets. - - * ace/Log_Msg.cpp (log): Don't do a ACE_Log_Msg_Sig_Guard on pSOS. - It doesn't have signals to block out anyway. - -Thu May 25 16:57:16 2000 Steve Huston - - * ace/Select_Reactor_T.cpp (handle_error, check_handles): For pSOS, - select() sets errno to EBADS for invalid socket handle. And, we - need to use select() (not fstat) to weed out the bad ones. - -Thu May 25 15:19:14 2000 Darrell Brunsch - - * ace/OS_String.cpp: - - Added an include for stddef.h, since we use size_t here. Also - moved the OS_Export.h include after the #pragma once stuff. - -Thu May 25 12:26:36 2000 Joe Hoffert - - * examples/IPC_SAP/ATM_SAP/Makefile: - Removed libraries that FORE used to need. - -Thu May 25 09:07:16 2000 Carlos O'Ryan - - * ace/OS_String.cpp: - Removed a few ACE_INLINEs. - -Wed May 24 20:27:26 2000 Ossama Othman - - * ace/OS_String.h: - - Changed "u_long" to "unsigned long." The u_long typedef wasn't - being pulled in, so just use the basic type. This avoids having - to pull in a header, and fixes a compile time problem. - -Wed May 24 20:18:59 2000 Ossama Othman - - * ace/Select_Reactor_Base.cpp (open): - - Temporarily backed out change that added ability to set handle - limit to value greater than FD_SETSIZE. It breaks platforms - that don't support getrlimit(). - -Wed May 24 18:56:16 2000 Darrell Brunsch : - - * ace/OS_Export.h: (added) - - In preparation for an eventual splitting up of the ACE DLLs, - I'm starting to split up the Export macros also. OS_Export will - be used for the lowest level OS library. - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/ace-dll.icc: - * ace/ace-lib.icc: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/OS_String.cpp: (added) - * ace/OS_String.h: (added) - * ace/OS_String.inl: (added) - - Moved the string methods of ACE_OS to ACE_OS_String. - - * ace/OS_Dirent.cpp: - * ace/OS_Dirent.h: - * ace/OS_Dirent.inl: - - Separated the Win32 versions of some of the methods into the - cpp file. The Win32 versions were a bit too complicated to make - sense having inlined. - - Also changed to use ACE_OS_Export. - -Wed May 24 10:22:18 2000 Ossama Othman - - * THANKS: - - Added Håkon Innerdal to the list of - contributors. - - * ace/config-linux-common.h (ACE_DEFAULT_SELECT_REACTOR_SIZE): - - Commented out the definition of this macro. Its setting - unnecessarily limited the default size of the Select_Reactor to - 256 file descriptors. `ace/OS.h' correctly sets the default - size to FD_SETSIZE. Thanks to Håkon Innerdal - for pointing this out. - - * ace/Select_Reactor_Base.cpp (open): - - Do not check if the desired size of the repository, i.e. the - maximum number of file descriptors, is greater than FD_SETSIZE. - The same check is effectively done in the call to - ACE::set_handle_limits(). The redundant check also prevented - the Reactor from supporting file descriptors numbering more than - FD_SETSIZE on platforms that support them (e.g. via - setrlimit(RLIMIT_NOFILE, ...)). Thanks to Håkon Innerdal - for reporting the problem, and for providing - a fix. - - * m4/platform.m4 (ACE_DEFAULT_SELECT_REACTOR_SIZE): - - No longer set the default size to 256 file descriptors. - `ace/OS.h' correctly set it to FD_SETSIZE. - -Wed May 24 10:08:37 2000 Joe Hoffert - - * THANKS: - Added Pedro Brandao name for his additions - to support ATM for Linux. - -Wed May 24 10:01:26 2000 Joe Hoffert - - * ace/ATM_Acceptor.{h,i,cpp} - * ace/ATM_Addr.{h,i,cpp} - * ace/ATM_Connector.{h,i,cpp} - * ace/ATM_Params.h - * ace/ATM_QoS.{h,i,cpp} - * ace/ATM_Stream.cpp: - Added support for ATM on Linux. Thanks to Pedro Brandao - for providing this. - - * ace/TLI.{h,i,cpp} - * ace/TLI_Connector.{h,i,cpp} - * ace/TLI_Stream.{h,i,cpp}: - Changed hard-coded "inline" to "ACE_INLINE" - -Wed May 24 08:10:21 2000 Steve Huston - - * ace/WFMO_Reactor.h: Wrapped the !WinSock2 defs in defined(ACE_WIN32) - to prevent compile errors on non-win32 platforms. It may be better to - wrap the whole file in #if defined (ACE_WIN32), but this will solve - the immediate problem. - -Tue May 23 20:13:52 2000 Irfan Pyarali - - * ace/WFMO_Reactor.h: Moved the definition of WSANETWORKEVENTS to - before its use. Thanks to Craig Perras - for reporting this. - -Tue May 23 17:59:06 2000 Luther J Baker - - * ACE_wrappers/pace/pace: - Source files added. - Changes to pace subdirectory will be noted in - ACE_wrappers/pace/ChangeLog. - -Tue May 23 17:55:17 2000 Steve Huston - - * ace/Log_Msg.cpp (log): For %t on MVS, use the old ACE 5.0 cast. - The pthread_t is a struct on MVS. - -Tue May 23 17:21:37 2000 Steve Huston - - * include/makeinclude/platform_psos_diab_ppc.GNU: Add -ei1676 to - CCFLAGS to turn off the gazillion messages about not overriding - pure virtual functions in derived classes. Thanks to Matt Emerson - for this. - -Tue May 23 16:37:27 2000 Luther J Baker - - * ACE_wrappers/pace directories added to ACE_wrappers: - - ACE_wrappers/pace/docs - ACE_wrappers/pace/examples - ACE_wrappers/pace/pace - ACE_wrappers/pace/pace++ - ACE_wrappers/pace/tests - -Mon May 22 15:26:42 2000 Steve Huston - - * ace/Synch.(cpp h i): ACE_Process_Mutex, ACE_Process_Semaphore - - changed to using ACE_Mutex and ACE_Semaphore for the underlying - synch. mechanism (same as Win32 and POSIX semaphores). Process - and thread are the same thing (synch-wise) on pSOS, and the - underlying mechanisms Do The Right Thing. - -Wed May 10 16:47:31 2000 Steve Huston - (actually committed on Tue May 23) - * ace/OS.(h i): pSOS changes: - - Use ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL ()) rather than using - return func() == 0 ? 0 : -1 to avoid losing errno values. - - ACE_OS::thr_getspecific, copy existing code from the TSS-emulated - section to the native TSD-using section. - - Use u_long as ACE_condattr_t and set its flags in - ACE_OS::condattr_init rather than in ACE_OS::cond_init to - avoid strange return errors in other parts of ACE that use - ACE_OS::condattr_init and expect it to work. - -Mon May 22 15:25:33 2000 Nanbor Wang - - * ace/OS.{h,cpp} (ACE_Thread_Exit): - * ace/Thread_Manager.cpp (~ACE_Thread_Exit): Moved the reset of - ACE_Thread_Exit::is_constructed_ from the Thread_Exit's - destructor to ACE_OS_Object_Manager::fini (). Otherwise, the - singleton ACE_Thread_Exit may get created multiple times. - Thanks to Eric Yee for reporting the - problem. - - Notice that ACE 5.1.1, 5.1.2 and 5.1.3 all have the same problem - of creating TSS keys unnecessarily without cleaning them up. - This will most likely cause a long running server process - creating a lot of threads to crash eventually (at least on NT.) - Therefore, you should not use these versions in a production - environment. - -Mon May 22 11:23:19 2000 Pradeep Gore - - * ACE version 5.1.3 released. - -Sun May 21 17:11:12 2000 Darrell Brunsch - - * ace/Configuration.cpp: - - Fixed some ACE_USES_WCHAR problems. - -Sun May 21 12:29:11 2000 Carlos O'Ryan - - * bin/run_all_list.pm: - Removed the Connection_Purging test from the single threaded - builds, the test cannot work in that configuration. - -Sun May 21 11:39:11 2000 Douglas C. Schmidt - - * tests/Signal_Test.cpp (worker_parent): My earlier fix on May 18th, 2000 - was incorrect. The right fix is to make the format specifier be - %ld, rather than cast the pid_t to (int). - -Sat May 20 18:34:05 2000 Ossama Othman - - * configure.in (ACE_HAS_BROKEN_T_ERROR): - - Fixed the test that checks if t_error() correctly accepts a - "const char *" parameter. This should fix a problem that was - occuring on Solaris. - -Sat May 20 19:47:52 2000 Nanbor Wang - - * ace/Memory_Pool.cpp: Added the seh_selector method for - ACE_Pagefile_Memory_Pool so it can be used with ACE_Malloc. - Thanks to Charlie Duke for pointing this - out. - -Fri May 19 16:19:11 2000 Carlos O'Ryan - - * bin/run_all_list.pm: - Removed the InterOp-Naming test from the Minimum CORBA builds. - -Thu May 18 20:40:37 2000 Carlos O'Ryan - - * tests/Makefile: - More tweaking to get CDR_Array_Test *not* to compile on LynxOS - but to compile in other platforms. - -Thu May 18 15:59:10 2000 Carlos O'Ryan - - * tests/CDR_File_Test.cpp: - Fixed so it works on platforms that lack native 64 bit types. - -Thu May 18 13:56:49 2000 Jeff Parsons - - * ace/Configuration.cpp: - Removed an unused variable from import_config(). - -Thu May 18 13:28:41 2000 Carlos O'Ryan - - * tests/Makefile: - More tweaking to disable the CDR_Array_Test on LynxOS, the 3.0 - version of Lynx has a newer g++ compiler, but it is still - broken. - -Thu May 18 12:48:54 2000 Douglas C. Schmidt - - * tests/Signal_Test.cpp (worker_parent): Added a cast of - pid_t to int to make G++ happy. Thanks to David Levine for - reporting this. - -Thu May 18 10:37:30 2000 Darrell Brunsch - - * ace/OS_Dirent.h: - - It looks like LynxOS needed sys/types.h to be included - before dirent.h. - -Thu May 18 10:29:49 2000 Carlos O'Ryan - - * tests/Makefile: - Disable the CDR_Array_Test with older versions of g++ because - the test breaks the templates there. - - * tests/CDR_File_Test.cpp: - Use ULongLong instead of LongLong because the former is better - supported. - -Thu May 18 10:11:20 2000 Darrell Brunsch - - * ace/streams.h: - - For !ACE_HAS_STANDARD_CPP_LIBRARY, iomanip wasn't being included - (except for MSVC). So I moved it outside of the _MSC_VER block - so platforms like IRIX will now include it. - -Thu May 18 09:49:12 2000 Jeff Parsons - - * ace/Configuration.h: - * ace/Configuration.cpp: - Chris Hafey's bug fixes and - enhancements to ACE_Configuration. Set_string_value - and set_integer_value now work when the value already - exists, memory leaks have been plugged, and a new - function added called find_value, which checks for the - existence in a section of a field by name, and returns - the data type stored there if it is found. - -Wed May 17 20:37:49 2000 Carlos O'Ryan - - * tests/Makefile.am: - Add missing CDR_File_Test_SOURCES and CDR_Array_Test_SOURCES - definitions. - -Wed May 17 20:25:21 2000 Darrell Brunsch - - * ace/OS.h: - * ace/config-all.h: - - Needed to move another define from OS.h to config-all - (the ENOSYS to EFAULT define) since Borland doesn't - have ENOSYS defined. - -Wed May 17 20:02:25 2000 Darrell Brunsch - - * ace/Dirent.h: - * ace/Dirent.i: - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/OS.h: - * ace/OS.i: - * ace/OS_Dirent.cpp: (added) - * ace/OS_Dirent.h: (added) - * ace/OS_Dirent.inl: (added) - * ace/ace-dll.icc: - * ace/ace-lib.icc: - * ace/ace.icc: - * ace/ace_dll.dsp: - * ace/ace_dll_ce.dsp: - * ace/ace_lib.dsp: - * ace/config-all.h: - - Ladies and Gentlemen, you are witnessing the beginning of the - end of ACE_OS as we know it. That's right, I am taking on the - bazillion lines of stuff in OS.*, and separating it into bite - size pieces. - - So this is the first step, kind of a test of concept. I took - the dirent methods and separated them out into a separate class - (in its own files), ACE_OS_Dirent. So now if one only wishes - to use the dirent static methods, one only has to include - OS_Dirent.h. - - But what about all the code that thinks it is still in ACE_OS? - Glad you asked, since ACE_OS now inherits from ACE_OS_Dirent, - meaning using ACE_OS::opendir () and family still works. - - So eventually everything will be moved out, and ACE_OS will - just be a shell of a class that inherits from the ACE_OS_* - classes (with maybe an ACE_ONLY_LATEST_AND_GREATEST thrown - in here and there). - - Let's just hope that this works.... - -Wed May 17 19:01:52 2000 Carlos O'Ryan - - * bin/auto_compile: - Fixed minor typos in the -smart_proxies option. - - * bin/run_all_list.pm: - The path for one of the tests (InterOp-Naming) was broken, my - fault. - -Wed May 17 16:20:30 2000 Darrell Brunsch - - * ace/Future.cpp: - * ace/Future.h: - * ace/Future_Set.cpp: - * ace/Future_Set.h: - * ace/LOCK_SOCK_Acceptor.cpp: - * ace/config-pharlap.h: - - While searching for the cause of a warning being undisabled, - I noticed there were several places where we were using - #include /**/ "ace/some-header.h". The #include /**/ is only - for system headers, so it doesn't need to be used with ACE - headers. - - * ace/streams.h: - - If ACE_HAS_STANDARD_CPP_LIBRARY is defined, then we include - the .h-less versions of the header files. This is all fine - and good, except that these headers in MSVC will disable some - warnings with #pragma warning, but then set them back to - default at the end. So if we disabled a warning in the config - file, it would get reenabled because of these headers. - - So I added a #pragma warning(push/pop) pair around the includes - in this file to localize the warning settings. - -Wed May 17 14:32:50 2000 Carlos O'Ryan - - * tests/CDR_Array_Test.cpp: - Fixed warnings in KAI-3.4 (and other EDG based compilers), it - makes no sense to return 'const int' - -Wed May 17 12:03:41 2000 Darrell Brunsch - - * Msg_WFMO_Reactor.cpp: - * Msg_WFMO_Reactor.h: - * Msg_WFMO_Reactor.i: - * ace/README: - * ace/config-WinCE.h: - * ace/config-pharlap.h: - - Added an ACE_LACKS_MSG_WFMO macro that is used when ACE_WIN32 - is defined but MsgWaitForMultipleOjbects isn't. This replaces - the checking for Pharlap and Windows CE. Thanks to David Hauck - for this suggestion. - -Wed May 17 13:34:22 2000 Steve Huston - - * tests/Thread_Pool_Reactor_Test.cpp: Added a little more diagnostic - info that was useful in diagnosing a previous problem in the - ACE_TP_Reactor. - -Wed May 17 12:48:24 2000 Carlos O'Ryan - - * tests/CDR_File_Test.cpp: - More workarounds for compiler bugs, this time egcs-1.1.1 is at - fault. - -Wed May 17 10:58:23 2000 Steve Huston - - * ace/WFMO_Reactor.(cpp h): Changed complex_dispatch_handler() and - upcall() to redo upcall(s) when the handler returns 1. This adds - ACE_WFMO_Reactor functionality equivalent to the ACE_Select_Reactor - family. To do this, the upcall() function's signature was changed - to accept a WSANETWORKEVENTS structure by reference. upcall() - updates the lNetworkEvents flags to indicate which requested a - callback. If the handler is not marked for deletion, the upcall - is done again. To properly support this, the call to - WSAEnumNetworkEvents is done once in complex_dispatch_handler and - the events flags are updated on each call to upcall(). - Thanks to Irfan Pyarali for his guidance - in designing this change. - -Wed May 17 10:54:05 2000 Jeff Parsons - - * examples/ConfigViewer/ConfigTreeCtrl.cpp: - * examples/ConfigViewer/ConfigTreeCtrl.h: - * examples/ConfigViewer/ConfigurationViewer.cpp: - * examples/ConfigViewer/ConfigurationViewer.dsp: - * examples/ConfigViewer/ConfigurationViewer.dsw: - * examples/ConfigViewer/ConfigurationViewer.rc: - * examples/ConfigViewer/MainFrame.cpp: - * examples/ConfigViewer/MainFrame.h: - * examples/ConfigViewer/README: - * examples/ConfigViewer/ValueDlg.cpp: - * examples/ConfigViewer/ValueDlg.h: - * examples/ConfigViewer/ValueListCtrl.cpp: - * examples/ConfigViewer/ValueListCtrl.h: - * examples/ConfigViewer/mondrian.ico: - * examples/ConfigViewer/mondrian.xpm: - * examples/ConfigViewer/stdafx.cpp: - * examples/ConfigViewer/stdafx.h: - Chris Hafey's ACE_Configuration viewer/editor for vxWindows. - For details, see the README file or email Chris at - . - -Wed May 17 09:02:45 2000 Carlos O'Ryan - - * tests/CDR_Array_Test.cpp: - Workaround problems with old versions of g++, in some cases it - gets confused with sizeof(T) inside a template. - -Tue May 16 12:01:56 2000 Darrell Brunsch - - * ace/Msg_WFMO_Reactor.cpp: - * ace/Msg_WFMO_Reactor.h: - - Applied some patches that Bruce Trask - sent for building ACE on Pharlap. - - * ace/OS.cpp: - * ace/OS.h: - * ace/Process.cpp: - * ace/ace_wchar.h: - - GetEnvironmentStrings is the only Windows API function that I've - seen that doesn't follow the same FuncA/FuncW naming that the - rest do. So I added a wrapper in ACE_OS (getenvstrings) and it - does the appropriate magic in the .cpp file to get this to work. - - This only showed up when UNICODE was defined but ACE_USES_WCHAR - wasn't. - - * ace/Process.cpp: - - Removed a comment that stated that the WinCE version of - inherit_environment () was in Process.i. Actually, there isn't - a version for CE at all. - - * tests/CDR_Array_Test.cpp: - - Updated the test so it works with ACE_USES_WCHAR. - -Tue May 16 10:02:33 2000 Carlos O'Ryan - - * tests/CDR_File_Test.cpp: - The test was removing the file even when the user requested not - to do so. - -Tue May 16 09:53:19 2000 Carlos O'Ryan - - * ace/CDR_Stream.i: - Change swap_8 again, this time it compiles with -O2 and -O3, - using the assembly instructions for full performance. - - * tests/CDR_Array_Test.cpp: - Fixed several problems reported during the last night builds. - Mostly template quirks and the ever annoying problems of Sun/CC - 4.2 with static_casts - - * tests/CDR_File_Test.cpp: - Don't use ?: operators when the arguments are of different - types. - -Mon May 15 21:00:31 2000 Carlos O'Ryan - - * ace/CDR_Stream.i: - The swap_8 operator was not working when debugging was - disabled. - -Mon May 15 16:06:01 2000 Priyanka Gontla - - * ace/CORBA_macros.h: - - Added Support for Exception::_downcast () by modifying _narrow - to _downcast (). Thanks to William Horn . - - -Mon May 15 15:49:37 2000 Carlos O'Ryan - - * bin/run_all_list.pm: - Add Connection_Purging to the list. - -Mon May 15 15:23:27 2000 Ossama Othman - - The following are primarily consistency related updates. - - * ace/LSOCK.i (ACE_LSOCK): - - Initialize "aux_handle_" member to ACE_INVALID_HANDLE in the - base member initializer list. - - * ace/Thread_Manager.i (ACE_At_Thread_Exit): - - Initialize "next_" member to 0 in the base member initializer - list. - - (ACE_Thread_Descriptor_Base): - - Initialize "next_" and "prev_" members to 0 in the base member - initializer list. - -Mon May 15 15:14:41 2000 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - Cristian Ferretti has contributed - a number of optimizations to the byte swapping code for CDR - streams. The optimizations include loop unrolling for 32-bit - and 64-bit architectures, use of especial assembly instructions - for x86-based platforms and use of bit operations (instead of - memory manipulation) for other processors. - - * tests/Makefile: - * tests/Makefile.am: - * tests/Makefile.bor: - * tests/run_tests.bat: - * tests/run_tests.lst: - * tests/run_tests.vxworks: - * tests/tests.dsw: - * tests/CDR_Array_Test.cpp: - * tests/CDR_Array_Test.dsp: - * tests/CDR_Array_Test.icc: - New test to verify that the array operations in the CDR classes - actually work, this is specially critical because the new - versions unroll loop, perform assembly instructions that work - best when the alignment is right, etc. - - * tests/CDR_File_Test.cpp: - The test was extended. Now we can save a file in one platform - and load it (manually) in another platform, to verify that byte - swapping actually works. - Both tests were contributed by Cristian Ferretti - , which is good because all this - voodoo programming needs testing. - The changes were tested using PA-RISC, Alphas, Sparcs and - finally Pentiums in various forms and using several compilers. - -Mon May 15 14:01:23 2000 Ossama Othman - - * ace/OS.h: - - QNX Neutrino has the header, so include it. - - * ace/config-qnx-neutrino.h: - - QNX supports the {get,set}rlimit() functions. ACE's autoconf - support detected this support. - -Mon May 15 12:32:05 2000 Ossama Othman - - * ace/Log_Record.cpp (print): - - Added a "%s" format specifier to the fprintf() call. This was - needed to allow strings containing percent signs '%' to be - printed. This problem was inadvertently introduced during some - UNICODE related updates. The "%s" format specifier can handle - UNICODE strings. Thanks to Edan Ayal for - reporting this problem and providing a fix. - -Mon May 15 10:25:38 2000 Darrell Brunsch - - * bin/create_vt_dsps.pl: - - I got tired of creating the version tests for the ACE tests, - so why not script it? - - * tests/version_tests/ACE_Init_Test.dsp: (removed) - - This test is tricky. It uses MFC, which gets complicated when - also using the static version of ACE. Since this is the only - test that does this, I just disabled it in the create_vt_dsps.pl. - - * tests/version_tests/Reactor_Exception_Test.dsp: (removed) - * tests/version_tests/Sigset_Op_Test.dsp: (removed) - - These two were named differently than their parents in - tests/, so they have been renamed. - - * tests/version_tests/Atomic_Op_Test.dsp: - * tests/version_tests/Auto_IncDec_Test.dsp: - * tests/version_tests/Barrier_Test.dsp: - * tests/version_tests/Basic_Types_Test.dsp: - * tests/version_tests/Buffer_Stream_Test.dsp: - * tests/version_tests/CDR_File_Test.dsp: - * tests/version_tests/CDR_Test.dsp: - * tests/version_tests/Cache_Map_Manager_Test.dsp: - * tests/version_tests/Cached_Accept_Conn_Test.dsp: - * tests/version_tests/Cached_Conn_Test.dsp: - * tests/version_tests/Capabilities_Test.dsp: - * tests/version_tests/Collection_Test.dsp: - * tests/version_tests/Conn_Test.dsp: - * tests/version_tests/DLL_Test.dsp: - * tests/version_tests/DLList_Test.dsp: - * tests/version_tests/Dynamic_Priority_Test.dsp: - * tests/version_tests/Enum_Interfaces_Test.dsp: - * tests/version_tests/Env_Value_Test.dsp: - * tests/version_tests/Future_Set_Test.dsp: - * tests/version_tests/Future_Test.dsp: - * tests/version_tests/Handle_Set_Test.dsp: - * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/version_tests/Hash_Map_Manager_Test.dsp: - * tests/version_tests/High_Res_Timer_Test.dsp: - * tests/version_tests/IOStream_Test.dsp: - * tests/version_tests/Lazy_Map_Manager_Test.dsp: - * tests/version_tests/MM_Shared_Memory_Test.dsp: - * tests/version_tests/MT_Reactor_Timer_Test.dsp: - * tests/version_tests/MT_SOCK_Test.dsp: - * tests/version_tests/Malloc_Test.dsp: - * tests/version_tests/Map_Manager_Test.dsp: - * tests/version_tests/Map_Test.dsp: - * tests/version_tests/Mem_Map_Test.dsp: - * tests/version_tests/Message_Block_Test.dsp: - * tests/version_tests/Message_Queue_Notifications_Test.dsp: - * tests/version_tests/Message_Queue_Test.dsp: - * tests/version_tests/Naming_Test.dsp: - * tests/version_tests/New_Fail_Test.dsp: - * tests/version_tests/Notify_Performance_Test.dsp: - * tests/version_tests/Object_Manager_Test.dsp: - * tests/version_tests/OrdMultiSet_Test.dsp: - * tests/version_tests/Pipe_Test.dsp: - * tests/version_tests/Priority_Buffer_Test.dsp: - * tests/version_tests/Priority_Reactor_Test.dsp: - * tests/version_tests/Priority_Task_Test.dsp: - * tests/version_tests/Process_Manager_Test.dsp: - * tests/version_tests/Process_Mutex_Test.dsp: - * tests/version_tests/Process_Strategy_Test.dsp: - * tests/version_tests/RB_Tree_Test.dsp: - * tests/version_tests/Reactor_Notify_Test.dsp: - * tests/version_tests/Reactor_Performance_Test.dsp: - * tests/version_tests/Reactor_Timer_Test.dsp: - * tests/version_tests/Reactors_Test.dsp: - * tests/version_tests/Reader_Writer_Test.dsp: - * tests/version_tests/Recursive_Mutex_Test.dsp: - * tests/version_tests/Reverse_Lock_Test.dsp: - * tests/version_tests/SOCK_Connector_Test.dsp: - * tests/version_tests/SOCK_Send_Recv_Test.dsp: - * tests/version_tests/SOCK_Test.dsp: - * tests/version_tests/SPIPE_Test.dsp: - * tests/version_tests/SString_Test.dsp: - * tests/version_tests/SV_Shared_Memory_Test.dsp: - * tests/version_tests/Semaphore_Test.dsp: - * tests/version_tests/Service_Config_Test.dsp: - * tests/version_tests/Simple_Message_Block_Test.dsp: - * tests/version_tests/Svc_Handler_Test.dsp: - * tests/version_tests/TSS_Test.dsp: - * tests/version_tests/Task_Test.dsp: - * tests/version_tests/Thread_Manager_Test.dsp: - * tests/version_tests/Thread_Mutex_Test.dsp: - * tests/version_tests/Thread_Pool_Reactor_Test.dsp: - * tests/version_tests/Thread_Pool_Test.dsp: - * tests/version_tests/Time_Service_Test.dsp: - * tests/version_tests/Time_Value_Test.dsp: - * tests/version_tests/Timeprobe_Test.dsp: - * tests/version_tests/Timer_Queue_Test.dsp: - * tests/version_tests/Tokens_Test.dsp: - * tests/version_tests/UPIPE_SAP_Test.dsp: - * tests/version_tests/Upgradable_RW_Test.dsp: - * tests/version_tests/version_tests.dsw: - * tests/version_tests/Reactor_Exceptions_Test.dsp: (added) - * tests/version_tests/Sigset_Ops_Test.dsp: (added) - - These files were regenerated. - -Mon May 15 12:28:32 2000 Aviad Eden - - * ace/Object_Manager.h: In the paragraph that describes the - behavior of ::exit function (starting with the words "NOTE - on the use of ::exit --"). The first sentence states that - using ::exit "does not destroy static objects" while it - should be "does not destroy automatic objects". - -Mon May 15 12:25:59 2000 David L. Levine - - * ace/OS.i (thr_join): removed comments about possible - implementation using ::taskSafe ()/::taskUnsafe () on - VxWorks. Join functionality is better implemented - in the Thread_Manager. Thanks to Umar for asking about - this comment. - -Mon May 15 09:09:49 2000 Darrell Brunsch - - * ace/Local_Name_Space_T.cpp: - * ace/Remote_Name_Space.cpp: - * netsvcs/lib/Name_Handler.cpp: - - Changed my use of ACE_Auto_Array_Ptr for ACE_USHORT16 - to ACE_Auto_Basic_Array_Ptr. Thanks to Andy Gokhale for - reporting this. - -Mon May 15 08:31:13 2000 Darrell Brunsch - - * ace/streams.h: - - Undid the commenting out of #include for - ACE_USES_OLD_IOSTREAMS. It had previously been commented - out because of a problem with Qt. A better solution would - be to not include it only when ACE is used with Qt. - - This problem was showing up with Explicit_Event_Loop. - -Sun May 14 12:43:35 2000 Darrell Brunsch - - (On behalf of Christopher Kohlhoff ) - - * ace/Makefile.bor: - * include/makeinclude/ace_flags.bor: - - Added new file, moved ACE_BUILD_DLL macro into ACE library's - makefile. Thanks also to Mogens Hansen . - - * include/makeinclude/recurse.bor: - - Arguments like -i should now be propogated with makefile - recursion - -Sun May 14 12:19:41 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Added a -TAO option to specify that the TAO subdirectory - should be compiled. - -Sat May 13 19:05:23 2000 Darrell Brunsch - - * ace/SString.cpp: - - Forgot to add a base member initialization for the allocator - in the new ACE_USHORT16 constructor for ACE_WString. Thanks - to Chris Kohlhoff for noticing this. - -Sat May 13 19:07:32 2000 Nanbor Wang - - * ace/config-kcc-common.h: Added ACE_HAS_STRING_CLASS. This fixed - the IOStream_Test. - -Sat May 13 13:01:08 2000 Darrell Brunsch - - * tests/SString_Test.cpp: - - So yesterday I changed a type from ACE_USHORT16 to - wchar_t. Rather, it should have been ACE_WSTRING_TYPE. - -Sat May 13 01:06:22 2000 Darrell Brunsch - - * ace/Local_Name_Space_T.cpp: - * ace/Remote_Name_Space.cpp: - - SunCC 5 didn't like the template instantiations in the - Local_Name_Space_T file, so I moved them to - Remote_Name_Space.cpp. - -Fri May 12 17:48:17 2000 Darrell Brunsch - - * bin/generate_export_file.pl: - - Found a new way to write this script using map and a __DATA__ - block. - -Fri May 12 17:52:22 2000 Nanbor Wang - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): Reverted James' - previous change for now. It's causing problem with MSVC. - -Fri May 12 15:04:58 2000 Carlos O'Ryan - - * bin/run_all_list.pm: - * bin/auto_compile_win32.pl: - Updated to include the new TAO test. - -Fri May 12 11:25:10 2000 Darrell Brunsch - - * ace/Basic_Types.h: - - Didn't understand at first why ACE_SIZEOF_WCHAR wasn't - defined to just "sizeof (wchar_t)". So I changed it, but - now I realize that this will not work if ACE_SIZEOF_WCHAR - is used in a #if. Bleh. Since wchar_t is always different, - I just defined it as 2 for WIN32 and 0 for others (so the - tests/Basic_Types_Test will catch it). [Bug 560] - - * ace/ACE.cpp: - - Chris Kohlhoff reported that Borland - didn't like "sizeof wchar_t", but adding parenthesis worked. - Applied this patch, and changed the cast to an ACE_static_cast. - [Bug 560] - - * ace/High_Res_Timer.cpp: - - Borland was giving some warnings here since a const method - was calling this->global_scale_factor (), which is a static - method. Changed it to ACE_High_Res_Timer::global_scale_factor () - and things compiled cleanly. - - * ace/config-win32-borland.h: - * ace/README: - * ace/SString.cpp: - * ace/SString.h: - * ace/Local_Name_Space_T.cpp: - * ace/Remote_Name_Space.cpp: - * netsvcs/lib/Name_Handler.cpp: - - On Borland BCB 5, wchar_t is (correctly) a separate type than - unsigned short, so all the implicit casting between the two in - the ACE Name Space. So added a new macro, - ACE_WSTRING_HAS_USHORT_SUPPORT, that enables another constructor - for ACE_WString. - - Chris Kohlhoff also reported this problem - and a solution, but unfortunately ACE_Name_Space requires that - this type is 2 bytes so we couldn't just use ACE_WSTRING_TYPE - here. Instead I added in both the new constructor and a - ushort_rep method on ACE_WString. I changed the Name Space stuff - to use this instead. BTW, old code shouldn't need to be changed - on MSVC, just if you use BCB. [Bug 561] - - * tests/SString_Test.cpp: - - We were using ACE_USHORT16 as the single character type for - ACE_WString. This has been changed to wchar_t. Thanks to Chris - for this one also. [Bug 561] - -Fri May 12 10:12:05 2000 James Hu - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): - If the TSS instance of the ACE_Thread_Exit class fails to - create, the application will crash. The new code will - detect the failure, and use an instance created off the - stack if it happens. This mimics how ACE does it in - the case of platforms that do not support TSS. - -Thu May 11 18:07:53 2000 Chris Cleeland - - * ace/OS.i (malloc): Bug 566. - * ace/OS.i (realloc): - * ace/OS.i (calloc): - * ace/OS.i (free): Use the new macros (below) instead of directly - calling malloc-like functions, thereby allowing an installation to - substitute an alternate mallocator for the global (see comment for - OS.h below). - - * ace/OS.i (strdup): Changed the emulation of strdup() to use - ACE_OS::malloc() rather than ::malloc(). - - * ace/OS.h: Added the four macros ACE_MALLOC_FUNC, - ACE_CALLOC_FUNC, ACE_REALLOC_FUNC, and ACE_FREE_FUNC which default - to the names of the global ::malloc, ::calloc, ::realloc and - ::free. Using this, a site can define these in their config.h in - order to substitute an alternate malloc-like allocator. - -Thu May 11 17:23:14 2000 Jeff Parsons - - * ace/ace_dll.dsp: - Removed non-existent file Configuration.i from project. - -Thu May 11 15:21:34 2000 Darrell Brunsch - - * ace/OS.i (dlsym): - - I was checking for ACE_HAS_WIN32 instead of ACE_WIN32, - so this wasn't doing what it was supposed to with - ACE_USES_WCHAR turned on. - -Thu May 11 02:04:58 2000 Irfan Pyarali - - * ace/OS.h - * ace/OS.cpp - * ace/SOCK_Stream.h - * ace/SOCK_Stream.i - * ace/TLI_Stream.h - * ace/TLI_Stream.i - * ace/ACE.cpp - * ace/ACE.h - * ace/ACE.i - - In order to make the return values of recv_n() and send_n() - match the return values of recv() and send(), the following - changes were made to the interface: - - old interface: - - static ssize_t recv_n (ACE_HANDLE handle, - void *buf, - size_t len, - const ACE_Time_Value *timeout = 0, - int error_on_eof = 1); - - new interface: - - static ssize_t recv_n (ACE_HANDLE handle, - void *buf, - size_t len, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - - Return value are: - - - On complete transfer, is returned. - - On timeout, -1 is returned, errno == ETIME. - - On error, -1 is returned, errno is set to appropriate error. - - On EOF, 0 is returned, errno is irrelevant. - - On partial transfers, i.e., if any data is transferred before - timeout/error/EOF, will contain the number - of bytes transferred. These return values now closely match the - return values from the non "_n" methods. - - Thanks to Douglas Schmidt, Chris Cleeland, Steve Huston, James - Hu, and Rich Seibel for helping out! - -Thu May 11 01:59:10 2000 Irfan Pyarali - - * ace/Pipe.cpp: Reader and writer handles were being left open - when there was an error in ACE_Pipe::open(). This fixes bug - 549. Thanks to Rick Ohnemus for - reporting this bug and providing patches. - -Wed May 10 18:36:58 2000 Carlos O'Ryan - - * THANKS: - Add a new contributor - - * bin/msvc_auto_compile.pl: - * bin/auto_compile_win32.pl: - Upgraded to use the new libraries in orbsvcs. - -Tue May 9 20:02:41 2000 Darrell Brunsch - - * ace/Asynch_Acceptor.cpp: - - Was still including "Asynch_Acceptor.i" which has been removed. - - * apps/JAWS2/JAWS/Cache_Manager_T.cpp: - - Removed iostream.h include here. This is not good since ACE - already includes it, and ACE might already include , - which is incompatible with . - - * examples/Reactor/WFMO_Reactor/test_talker.cpp: - - Looks like the constructor to Proactor was changed, but this - test didn't get changed also. Removed one of the arguments - being passed to it. - - * websvcs/lib/websvcs_export.h: - - Regenerated it. It seems like I changed the websvcs library - based on what I thought was in this file. This didn't work, - since I was assuming that ACE_WEBSVCS_HAS_DLL was automatically - defined (and older versions of these export files did not do - that). - - * apps/JAWS/server/HTTP_Helpers.cpp: - * examples/Shared_Malloc/test_malloc.cpp: - - Changed empty ;'s in if statements to {} to remove warnings. - - - * bin/msvc_auto_compile.pl: - - Added a -u option that tells the script to pass the /USEENV - flag to msdev when it runs. - - Added a -ACE option that tells the script just to compile the - ACE directories. - - Changed -core to -CORE to be consistent with -ACE (and the - upcoming -TAO). - - * apps/Gateway/Gateway/Gateway.dsp: - * apps/Gateway/Gateway/gatewayd.dsp: - * apps/Gateway/Peer/Peer.dsp: - * apps/Gateway/Peer/peerd.dsp: - * apps/JAWS/clients/Caching/Caching.dsp: - * apps/JAWS/server/jaws.dsp: - * apps/JAWS2/server.dsp: - * apps/JAWS2/HTTPU/HTTPU.DSP: - * apps/JAWS2/HTTPU/HTTPU.DSW: - * apps/JAWS2/JAWS/jaws.dsp: - * examples/ASX/Event_Server/Event_Server/Event_Server.dsp: - * examples/ASX/Event_Server/Transceiver/transceiver.dsp: - * examples/ASX/Message_Queue/Bounded_Buffer.dsp: - * examples/ASX/Message_Queue/Buffer_Stream.dsp: - * examples/ASX/Message_Queue/Priority_Buffer.dsp: - * examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp: - * examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp: - * examples/Configuration/Test.dsp: - * examples/Connection/blocking/SPIPE.dsp: - * examples/Connection/blocking/acceptor.dsp: - * examples/Connection/non_blocking/non_blocking.dsp: - * examples/Connection/non_blocking/server.dsp: - * examples/IPC_SAP/ATM_SAP/CPP_client.dsp: - * examples/IPC_SAP/ATM_SAP/CPP_server.dsp: - * examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp: - * examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp: - * examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp: - * examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp: - * examples/IPC_SAP/SOCK_SAP/C_inserver.dsp: - * examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp: - * examples/Log_Msg/Callback.dsp: - * examples/Log_Msg/Log_Msg.dsp: - * examples/Log_Msg/Ostream.dsp: - * examples/Logger/Acceptor-server/server_loggerd.dsp: - * examples/Mem_Map/file-reverse/file_reverse.dsp: - * examples/Naming/Naming.dsp: - * examples/Naming/multiple_contexts.dsp: - * examples/Naming/non_existent.dsp: - * examples/OS/Process/Process.dsp: - * examples/OS/Process/imore.dsp: - * examples/QOS/client.dsp: - * examples/QOS/server.dsp: - * examples/Reactor/Dgram/CODgram.dsp: - * examples/Reactor/Dgram/Dgram.dsp: - * examples/Reactor/Misc/Misc.dsp: - * examples/Reactor/Misc/demuxing.dsp: - * examples/Reactor/Misc/early_timeouts.dsp: - * examples/Reactor/Misc/notification.dsp: - * examples/Reactor/Misc/reactors.dsp: - * examples/Reactor/Misc/signals_1.dsp: - * examples/Reactor/Misc/signals_2.dsp: - * examples/Reactor/Ntalker/ntalker.dsp: - * examples/Reactor/Proactor/post_completions.dsp: - * examples/Reactor/Proactor/test_cancel.dsp: - * examples/Reactor/Proactor/test_end_event_loop.dsp: - * examples/Reactor/Proactor/test_multiple_loops.dsp: - * examples/Reactor/Proactor/test_proactor.dsp: - * examples/Reactor/Proactor/test_timeout.dsp: - * examples/Reactor/WFMO_Reactor/Handle_Close.dsp: - * examples/Registry/Registry.dsp: - * examples/Registry/update.dsp: - * examples/Service_Configurator/Misc/Timer.dsp: - * examples/Service_Configurator/Misc/main.dsp: - * examples/Shared_Malloc/malloc.dsp: - * examples/Shared_Malloc/multiple_mallocs.dsp: - * examples/Shared_Malloc/persistence.dsp: - * examples/Shared_Malloc/position_independent_malloc.dsp: - * examples/Web_Crawler/Web_Crawler.dsp: - * performance-tests/Misc/basic_perf.dsp: - * performance-tests/Misc/childbirth_time.dsp: - * performance-tests/Misc/context_switch_time.dsp: - * performance-tests/Misc/test_mutex.dsp: - * performance-tests/Misc/test_naming.dsp: - * performance-tests/Misc/test_singleton.dsp: - * performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp: - * performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp: - * performance-tests/TCP/TCP.dsp: - - While testing the -ACE flag in msvc_auto_compile, I found that - there were many dsps that were either creating precompiled - headers, didn't have the correct include paths, or even weren't - in the CRLF format. Fixed them up. - - * apps/JAWS/clients/Caching/testing.dsp: - * performance-tests/Synch-Benchmarks/Synch_Tests.dsp: - - These project files didn't look like they are used anymore, - so I removed them. - -Tue May 9 17:38:47 2000 Carlos O'Ryan - - * bin/auto_compile_win32.pl: - Include the new library used in the RT CORBA tests. - -Tue May 9 09:01:24 2000 Darrell Brunsch - - * examples/Export/README: (added) - * examples/Export/dll.cpp: (added) - * examples/Export/dll.h: (added) - * examples/Export/export_dll.dsp: (added) - * examples/Export/export_test.dsw: (added) - * examples/Export/run_test.pl: (added) - * examples/Export/test.cpp: (added) - * examples/Export/test.dsp: (added) - * examples/Export/test_export.h: (added) - - The export example is an example of how to use the ACE_Export - type macros for DLLs. - -Mon May 8 14:37:32 2000 Douglas C. Schmidt - - * ace/Task.h: Cleaned up the documentation so that it will - work correctly with class2man. Thanks to Charlie Duke - for reporting this. - -Mon May 08 22:56:28 2000 Carlos O'Ryan - - * ACE version 5.1.2 released. - -Mon May 8 11:02:49 2000 Darrell Brunsch - - * docs/CE-status.txt: - - I will not get a chance to update this before the beta, so - I just put in a note mentioning that it is out of date and - will be updated next time. - -Mon May 8 12:30:15 2000 Nanbor Wang - - * include/makeinclude/platform_sunos5_kcc.GNU: Added - "--once_instantiation_per_object" flag for both compiler and - linker to avoid some warnings about duplicate symbol - definitions. - -Sun May 7 19:50:21 2000 Darrell Brunsch - - * include/makeinclude/platform_sunos5_sunc++.GNU: - - Undid Doug's change on "Wed May 3 18:07:16 2000". - The fix wasn't working in our SUNCC 5 builds. - -Sat May 6 17:49:01 2000 Darrell Brunsch - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - - Changed the signature of log_priority_enabled to have both the - char * and wchar_t * versions when using ACE_USES_WCHAR. The - reason why this has to be done is because of ACE_HEX_DUMP. - - ACE_HEX_DUMP calls both log_priority_enabled and log_hexdump, - and it doesn't make sense to change the signature of log_hexdump. - If it were to take in a wchar_t buffer, it should print the - entire wchar_t. But if we have a buffer that is a char *, then - it doesn't make sense to convert it to a wchar_t * buffer, since - it adds all those extra bytes that would show up with hexdump. - - And now that we have 3 versions of this method which do the same - things, I changed the ones that is used by the macros to call - the one that just takes in the priority. An extra function call, - but if that is a problem, then they can be inlined. - -Sat May 6 19:33:49 2000 Nanbor Wang - - * include/makeinclude/platform_freebsd.GNU: Removed definition - BIN_TRUE. It's no longer used. - -Thu May 4 14:53:45 2000 Darrell Brunsch - - * ace/config-all.h: - * ace/config-win32-common.h: - * bin/generate_export_file.pl: - - Changed the ACE_EXPORT_SINGLETON_DECLARE and - ACE_IMPORT_SINGLETON_DECLARE to take in arguments, but - this time it takes in 3, the singleton type, the class, - and then the lock. So we have: - - ACE_EXPORT_SINGLETON_DECLARE (ACE_Singleton, foo, ACE_Null_Mutex); - -Thu May 4 13:59:58 2000 Darrell Brunsch - - * ace/config-all.h: - * ace/config-win32-common.h: - - Added two new macros, ACE_EXPORT_SINGLETON_DECLARE and - ACE_IMPORT_SINGLETON_DECLARE. They do the same thing as the - *_DECLARATION macros except they do not take arguments. - - So instead of - ACE_EXPORT_SINGLETON_DECLARATION (foo); - you use - ACE_EXPORT_SINGLETON_DECLARE foo; - - This was needed since foo may be a template, and if so, the - comma that can be between multiple arguments causes problems. - - * bin/generate_export_file.pl: - - Now creates the above DECLARE macros in addition to the rest. - -Thu May 4 14:47:09 2000 Nanbor Wang - - * include/makeinclude/platform_freebsd.GNU: Defined BIN_TRUE as - /usr/bin/true. - -Wed May 3 19:35:48 2000 Carlos O'Ryan - - * ace/Log_Msg.cpp: - The implementation of the log_priority_enabled function did not - match its declaration. - -Wed May 3 17:21:50 2000 Darrell Brunsch - - * ace/config-win32-common.h: - - After many reports of not having _MT defined (and then not - quite knowing what to do about it), I felt we needed a bit - more descriptive error and comment. - - * docs/ACE-FMM.html: - * docs/ACE-bug-process.html: - * docs/ACE-development-process.html: - * docs/ACE-guidelines.html: - * docs/ACE-lessons.html: - * docs/ACE-porting.html: - * docs/ACE-subsets.html: - * docs/exceptions.html: - * docs/index.html: (added) - * docs/usage-bugzilla.html: - - Added an index for the files in this directory. Added - backlinks to the other files. - -Wed May 3 18:07:16 2000 Douglas C. Schmidt - - * ace/Malloc_T (memory_pool): Found another bug with SunC++ 5.0... - Moved the ACE_Allocator_Adapter::protect() into the Malloc_T.cpp - file. - -Wed May 3 17:16:12 2000 Ossama Othman - - * ace/Log_Msg.h (log_priority_enabled): - - Corrected use of "ASYS_TCHAR." "ACE_TCHAR" should be used - instead. - -Wed May 3 18:07:16 2000 Douglas C. Schmidt - - * ace/Log_Msg: Added the new log_priority_enabled() method. Thanks - to Ossama for reporting this ;-). - - * include/makeinclude/platform_sunos5_sunc++.GNU (CC_VERSION): - The keywords to check if the version if greater than 5 is "C++" - on Solaris, not "Compilers." Thanks to Rick Weisner - for reporting this. - -Wed May 3 15:08:03 2000 Nanbor Wang - - * include/makeinclude/platform_freebsd.GNU: Changed to set - versioned_so only when building on version 2 of FreeBSD. Thanks - to Henrik Kai for pointing this out. - -Wed May 3 12:31:32 2000 Ossama Othman - - * ace/Makefile.am (INLINE_FILES): - - Removed deprecated inline files from the list. - -Wed May 3 11:59:14 2000 Carlos O'Ryan - - * include/makeinclude/macros.GNU: - * include/makeinclude/rules.common.GNU: - * include/makeinclude/rules.local.GNU: - New target that recusively builds all the IDL - generated files. - -Wed May 3 11:43:05 2000 Douglas C. Schmidt - - * ace/Log_Msg.h: Only call set() in the ACE_{ERROR,DEBUG} macros if - the log_priority_enabled() is non-0, which avoids making - unecessary strcpy() calls. Thanks to Ganesh Pai - for reporting this. - - * ace/Timer_Queue_Adapters (schedule): Make sure to pass - the act to the schedule() method. Also, updated the header file - so that it explains that interval timers aren't implemented. - Thanks to Umar Syyid for reporting these. - -Wed May 3 09:49:57 2000 Jeff Parsons - - * ace/Caching_Utility_T.cpp: - * ace/Map.cpp: - * ace/Pair.cpp: - * ace/Svc_Handler.cpp: - * ace/Win32_Asynch_IO.cpp: - * ace/Win32_Proactor.cpp: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Removed inclusion of non-existent .i files from corresponding - .cpp files and from the project files. - -Tue May 2 19:33:57 2000 Douglas C. Schmidt - - * Updated all the dependencies. - - * ace: Removed all the following files because they were empty and - yet were being #included into various other *.h files, which - slowed down compilation unnnecessarily! Thanks to Espen Harlinn - for reporting this. - * ace/Acceptor.i - * ace/WIN32_Proactor.i: - * ace/WIN32_Asynch_IO.i: - * ace/Token_Invariants.i: - * ace/TLI_Acceptor.i: - * ace/Svc_Handler.i: - * ace/Proactor.i: - * ace/Stream_Modules.i: - * ace/Select_Reactor.i: - * ace/Map.i: - * ace/Priority_Reactor.i: - * ace/Pair.i: - * ace/Hash_Map_Manager.i: - * ace/LSOCK_Acceptor.i - * ace/CORBA_Ref.i: - * ace/Configuration.i: - * ace/Connector.i: - * ace/Cleanup_Strategies_T.i; - * ace/SPIPE_Acceptor.i: - * ace/Trace.i: - * ace/Log_Msg.i: - * ace/IO_Cntl_Msg.i: - * ace/Dynamic_Service.i: - * ace/Caching_Utility_T.i: - * ace/Cached_Connect_Strategy_T.i: - * ace/Asynch_IO.i: - * ace/Asynch_Acceptor.i: - - * ace/OS.i (readdir_r): Apparently the GNU compiler on DEC UNIX - defines a macro for readdir_r() that was breaking things. - Therefore, we #ifdef for that! Thanks to Jean-Marc Strauss - for reporting this. - -Tue May 2 12:48:00 2000 Carlos O'Ryan - - * bin/g++dep: - Use `pwd` instead of $PWD to get the currenct directory because - some shell don't get that one right. - -Tue May 02 13:51:21 2000 David L. Levine - - * bin/create_ace_build: updated comments at top to reflect - the fact that dead symlinks are removed when run on an - existing build tree. - -Tue May 2 10:24:10 2000 Darrell Brunsch - - * bin/auto_compile_win32.pl: - - Fixed a couple of release configurations that were out of date. - -Tue May 2 10:05:21 2000 Darrell Brunsch - - * websvcs/lib/URL_Addr.cpp: - * websvcs/lib/URL_Addr.h: - * websvcs/lib/URL_Addr.i: - * websvcs/lib/websvcs.dsp: - - The changes to the new wchar style wasn't completely correct, - and I missed quite a few LPCTSTRs in the .i file. Also corrected - my earlier attempt at doing the export stuff the "right way". - - Also changed the use of the variable passwd to password. passwd - is also used as a structure so it confused MSVC when used in the - FTP class constructor - -Tue May 2 09:34:31 2000 Steve Huston - - * tests/SOCK_Send_Recv_Test.cpp: Fix signed/unsigned warnings. - -Mon May 1 16:51:07 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Now gets the current directory for the default of ACE_ROOT - instead of using ".". Also only tries compiling files ending - with dsp, not just ones with .dsp in their name (like *.dsp.bak). - Finally, added a print_status options (-s) that will output - status messages to STDERR, so you can see how much far it has - progressed when you are redirecting stdout to a file. - -Mon May 01 12:41:39 2000 Irfan Pyarali - - * ace/Hash_Map_Manager_T.cpp (close_i): Restored freeing of the - table memory which had been mistakenly removed. Thanks to David - for pointing this out. - -Mon May 1 10:27:48 2000 Darrell Brunsch - - * bin/auto_compile_win32.pl: - - Some minor changes that should make the Win32 builds clean - ( which I want to see once before bugging Nanbor to switch - to my script :-) ) - -Mon May 01 02:06:02 2000 Nanbor Wang - - * ace/Malloc_T.cpp (avail_chunks): Changed to use do-while loop to - go over all freelist when calculating the avail_chunks to make - sure all nodes in the freelist are accounted for. - doesn't always point to the anchoring Malloc_Header in the - control block. Thanks to Ivan Murphy - for reporting the problem. - - Also we must reduce the header size count by one when - calculating the avail_chunks because each returning allocated - memory chunk takes at least two Malloc_Header's. This change - made the result of more realistic. - - * ace/Malloc.h: Added more documentation explaining how Malloc_T - works. - -Sun Apr 30 23:20:00 2000 Darrell Brunsch - - * ace/SString.h: - - SunCC 5 had problems with ACE_TString when it was typdefed, - but not when it was #defined. - - * ace/ace_wchar.h: - - Noticed I was including tchar.h still, which is no longer - necessary since ACE's use of wchar_t is separate from - tchar.h's. - -Sat Apr 29 20:02:39 2000 Ossama Othman - - * bin/autoconf_compile (BUILD_LIST): - - Remove TAO from the build list. It's autoconf support hasn't - been fully integrated yet. - -Sat Apr 29 19:45:41 2000 Ossama Othman - - * netsvcs/lib/Log_Message_Receiver.cpp (attach, detach): - - Fixed warning that occured when - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES was not defined. - - Use ACE_GUARD{_RETURN} macro instead of naked ACE_Guard. - -Sat Apr 29 19:17:25 2000 Ossama Othman - - * ace-dll.icc: - * ace_dll.dsp: - * ace_lib.dsp: - - These files still referred to the deprecated `inc_user_config.h' - header. The header is now called `config-all.h'. - -Sat Apr 29 19:09:00 2000 Ossama Othman - - * ace/QoS_Manager.h: - - Moved inclusion of one of the ACE headers prior to the check for - ACE_LACKS_PRAGMA_ONCE. The definition of ACE_LACKS_PRAGMA_ONCE - wasn't pulled before the check, so it ended up being defined - twice. - -Sat Apr 29 16:15:29 2000 Ossama Othman - - * bin/autoconf_compile: - * bin/autoconf_compile_wrapper: - - The ACE+autoconf counterparts to the auto_compile* scripts. - These scripts are used to run automatic builds of the ACE's - autoconf support. - -Sat Apr 29 15:59:53 2000 Ossama Othman - - * ace/Makefile.am (HEADER_FILES): - - Removed `inc_user_config.h' from the list of headers. It no - longer exists. - - Added `config-all.h', `ACE_export.h' and `svc_export.h' to the - list of headers. - -Sat Apr 29 17:13:55 2000 Vishal Kachroo - - * ace/Makefile.am: Added the SOCK_Dgram_Mcast_QoS.{cpp,h,i} - -Sat Apr 29 14:49:13 2000 Darrell Brunsch - - * examples/DLL/Newsweek.dsp: - * examples/Threads/barrier1.dsp: - * examples/Threads/barrier2.dsp: - * examples/Threads/cancel.dsp: - * examples/Threads/future1.dsp: - * examples/Threads/future2.dsp: - * examples/Threads/manual_event.dsp: - * examples/Threads/process_mutex.dsp: - * examples/Threads/process_semaphore.dsp: - * examples/Threads/reader_writer.dsp: - * examples/Threads/recursive_mutex.dsp: - * examples/Threads/task_five.dsp: - * examples/Threads/task_four.dsp: - * examples/Threads/task_one.dsp: - * examples/Threads/task_three.dsp: - * examples/Threads/task_two.dsp: - * examples/Threads/test.dsp: - * examples/Threads/thread_manager.dsp: - * examples/Threads/thread_pool.dsp: - * examples/Threads/thread_specific.dsp: - * examples/Threads/token.dsp: - * examples/Threads/tss1.dsp: - * examples/Threads/tss2.dsp: - * examples/Timer_Queue/Async_Timer_Queue_Test.dsp: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp: - * examples/Timer_Queue/Thread_Timer_Queue_Test.dsp: - * examples/Web_Crawler/Web_Crawler.dsp: - * performance-tests/Synch-Benchmarks/synch_driver.dsp: - * performance-tests/Synch-Benchmarks/Base_Test/Base_Test.dsp: - * performance-tests/Synch-Benchmarks/Perf_Test/Perf_Test.dsp: - * performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp: - * websvcs/lib/websvcs.dsp: - * websvcs/tests/Test_URL_Addr.dsp: - - I started to test out my msvc_auto_compile.pl script and after - testing it for the whole thing, found out that I soon ran out - of disk space. By the time I ran out of space, the PCH files - made up 3 GB of disk. So I removed them from these projects. - -Sat Apr 29 14:15:12 2000 Darrell Brunsch - - * bin/clean_dsp.pl: - - Was still some bugs in this script. In general, beware - of using it. There is no guarantess that it does or ever - will work. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Having said that, I went and used it on these project files - anyway. Reduced their size by a good 50%. - - * ace/ace_dll_ce.dsp: - - Made the x86 emulation release configuration build correctly - by ingoring default libraries. Also cleaned this dsp, which - had an improvement of 98%. - -Sat Apr 29 13:20:11 2000 Darrell Brunsch - - * apps/drwho/PMS_All.cpp: - * apps/drwho/PMS_Ruser.cpp: - - Was still using some ACE::strecpy, changed to ACE_OS::strecpy. - -Fri Apr 28 21:30:46 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Fixed the build core logic to work correctly when more than - one configuration is specified. - - * bin/vc_filter.pl: - - Now ignores the LINK4089 warnings. We haven't quite figured - out how to fix them yet. - -Fri Apr 28 21:11:32 2000 Darrell Brunsch - - * bin/clean_dsp.pl: (added) - - This script should clean out excess baggage from DSP files. - -Fri Apr 28 13:11:20 2000 Ossama Othman - - * include/makeinclude/platform_linux_lxpthread.GNU: - * include/makeinclude/platform_linux_lxpthreads.GNU: - - Renamed `platform_linux_lxpthread.GNU' to - platform_linux_lxpthreads.GNU to be consistent with the name of - its corresponding config header `config-linux-lxpthreads.h'. - Thanks to Ken Weinert for reporting this. - - `platform_linux_lxpthread.GNU' now includes the newly renamed - file for backward compatibility. - -Fri Apr 28 11:54:21 2000 Douglas C. Schmidt - - * ace/SString.cpp: Fixed the delimiter_replace() method so that - it actually does what it's comment implies... Thanks to Martin - Krumpolec for reporting this. - -Thu Apr 27 18:19:19 2000 James Hu - - * ace/Dirent.i: Added checks to see if dirp_ is initialized - before calling into ACE_OS. - -Thu Apr 27 16:53:49 2000 Irfan Pyarali - - * ace/Hash_Map_Manager_T.cpp (unbind_all_i): Added new method - unbind_all() for removing all the entries in one shot. Thanks - to Boris Sukholitko for providing this - enhancement. - - * tests/Hash_Map_Manager_Test.cpp: Added test for unbind_all(). - -Thu Apr 27 14:17:52 2000 Darrell Brunsch - - * ace/OS.i: - - isatty (): Messed up on my CE change, so the version that - takes an int was hidden by a ACE_WIN32 block. This has been - moved outside again. - - * ace/OS.cpp: - - Weird, somehow part of a section that should have been removed - with the CE changes was still present. Removed again. - -Thu Apr 27 13:08:00 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Changed the code style and made it consistent. - - Also changed the core build to build all of the orbsvcs and - do the static builds in the right order. - - * ace/OS.cpp: - * ace/OS.i: - - For some reason, I had trouble with the libraries when the - ACE_Cleanup destructor was in the .i file. So I moved it to - the .cpp file instead. - - * ace/ace_dll.dsp: - - Was defining ACE_ACE_HAS_DLL=1, which is #1, not needed and, - #2, the wrong macro name. - - * ace/ace_lib.dsp: - - Changed the static configs to be of type Win32 Static Release/ - Debug instead of Win32 Release/Debug. - - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf_lib.dsp: - - Added Win32 Static Release/Debug configs. - -Thu Apr 27 14:32:45 2000 Douglas C. Schmidt - - * ACE-INSTALL (make): Updated the documentation. Thanks to - Ken Weinert for reporting this. - -Thu Apr 27 12:41:42 2000 James C. Hu - - * ace/OS.i: - * ace/OS.cpp: - * ace/config-freebsd-pthread.h: - * ace/README: - - Removed ACE_HAS_TIME_R in favor of using existing - mechanism of ACE_HAS_REENTRANT_FUNCTIONS, and then - adding ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and - also ACE_LACKS_PWD_REENTRANT_FUNCTIONS. Created a - new lacks called ACE_LACKS_RAND_REENTRANT_FUNCTIONS - to match the previous two. FreeBSD can now use its - native *time_r functions. - -Thu Apr 27 10:55:11 2000 Darrell Brunsch - - These changes bring the Windows CE port up to date. It currently - supports Windows CE 2.11 on the H/PC Pro. I am looking into the 2.11 - P/PC port, but there are other problems with it still. Hopefully - the WinCE 3.0 SDK will be more mature. - - * ace/ace_dll_ce.dsp: (added) - * ace/ace_ce_dll.dsp: (removed) - * ace/ace_ce.dsw: - - Created a new dsp file from scratch from CE to see how the - toolkit sets up the projects. Removed the old one. - - * ace/ACE.cpp: - - format_hexdump (): Changed usage of isprint to ACE_OS::ace_isprint. - - get_ip_interfaces (): Changed use of deprecated ACE_TEXT_STRING to - ACE_TString. Also added an ACE_TEXT_CHAR_TO_TCHAR to a use - of the ACE_INET_Addr constructor. - - * ace/ARGV.cpp: - - create_buf_from_queue (): We were not adjusting the size of a - ACE_TCHAR buffer by sizeof ACE_TCHAR when we did a memcopy. - Thanks to Valery Arkhangorodsky - for reporting this. - - * ace/Memory_Pool.cpp: - - seh_selector (): Changed use of LPEXCEPTION_POINTERS to - EXCEPTION_POINTERS * since it seems like that definition is - missing in some WinCE configs. - - * ace/ace_wchar.h: - - Added deprecated definition of ACE_TEXT_STRING. - - convert (): Changed the conversions from CharToOem to - MultiByteToWideChar, since it is more widely supported in Win32. - Also removed the loading of user32.lib since it was only needed - for CharToOem. - - * ace/config-win32-common.h: - - Changed the _MT check so it doesn't do anything on CE. Some - CE targets do not have the Multithreaded DLL generation option. - - * ace/config-WinCE.h: - - Changed ACE_DEFAULT_LD_SEARCH_PATH to use ACE_TEXT. - - Added a define for ACE_HAS_WCHAR and a check to always define - ACE_USES_WCHAR. - - Commented out the ACE_HAS_MFC check. - - Defined FILE, since it seems to be missing from CE 2.11 H/PC Pro. - - Added a definition for EXCEPTION_ACCESS_VIOLATION that was in - older SDK's. - - Removed some UNDER_CE < 2.11 defines. < 2.11 CE will not be - supported anymore. - - Removed definition of is_print, since it was moved into ACE_OS. - - Added a definition for the operator placement new, which is - missing when MFC isn't used. - - * ace/OS.h: - - Enabled is_atty for Windows CE. Added ace_isprint and made - ace_isspace an ACE_TCHAR method. - - * ace/OS.i: - - chdir (): NOTSUP on CE 2.11 - - tempnam (): Also NOTSUP on CE 2.11 - - abort (): changed ::exit to exit to get it to compile. - - ace_isspace (): Changed to use ACE_TCHAR, but also made it - NOTSUP on CE 2.11. - - ace_isprint (): Added, but NOTSUP on CE 2.11. - - sema_init (): Needed to cast an void *arg to ACE_mutexattr_t. - - dlsym (): Changed the way ACE declares symbolname so it uses the - right one on Win32 (WinNT always uses char *, CE always uses - wchar_t *). The function still takes in ACE_TCHAR * though. - Thanks to Jeff Greif for reporting this. - - Removed a few global function definitions that were just for - CE (like fwrite, fread, getc, etc.). These are either supported - in newer CE's or is disabled in the ACE_OS methods. - - is_atty (): Enabled on CE. - - * ace/OS.cpp: - - Enabled fopen on CE by using _wfopen (but not sure if this will - work correctly, since on other Win32 platforms we have a lot more - stuff. - - Enabled several printf methods on CE. - - open (): Removed the use of FILE_SHARE_DELETE on CE. - - * ace/Service_Config.i: - - initialize (): Added an ACE_TEXT_CHAR_TO_TCHAR and replaced - an ACE_WIDE_STRING with it also. - - * ace/Svc_Conf.h: - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: - - ace_yyerror (): Takes an ACE_TCHAR * instead of char * now. - Thanks to Valery Arkhangorodsky - for also reporting this. - - * ace/Svc_Conf.l: - * ace/Svc_Conf_l.cpp: - - Changed to use ACE_OS::isatty () and ACE_OS::ace_isprint. - -Thu Apr 27 11:49:52 2000 Douglas C. Schmidt - - * ace/OS.i (memchr): Do not cast away constness when emulating - memchr(). Thanks to Rick Ohnemus - for reporting this. - - * ace/Select_Reactor_Base.cpp (open): The notification pipe handlers - created by the ACE_Select_Reactor_Notify::open were being left - open after fork() and exec(). Thanks to Rick Ohnemus - for reporting this. - -Wed Apr 26 23:47:31 2000 Douglas C. Schmidt - - * ace/Process_Manager.cpp (open): Make sure that the dummy I/O - handle is not inherited by child processes. Thanks to Rick - Ohnemus for reporting this. - -Wed Apr 26 20:32:59 2000 James C. Hu - - * ace/OS.cpp: - * ace/OS.i: - * ace/README: - * ace/config-freebsd-pthread.h: - Added a new define ACE_HAS_TIME_R. FreeBSD supports - *time_r() calls, but not gethostbyname_r, so a new feature - specification was needed to get these functions into - ACE_OS. - -Wed Apr 26 12:21:16 2000 Steve Huston - - * ace/ACE.cpp (send_n_i (ACE_HANDLE, const void *, size_t, int) and - send_n_i (ACE_HANDLE, const void *, size_t): If the send fails - with EWOULDBLOCK, wait for the handle to become writeable again - before retrying the send. Thanks to Edan Ayal - for reporting this. - - * tests/SOCK_Send_Recv_Test.cpp: Added test 3 for send_n to verify - fix for writing to nonblocking handle. - -Wed Apr 26 08:43:21 2000 Darrell Brunsch - - * apps/drwho/PMC_Flo.cpp: - * apps/drwho/PMC_Usr.cpp: - * apps/drwho/PMS_All.cpp: - * apps/drwho/PMS_Flo.cpp: - * apps/drwho/PMS_Ruser.cpp: - * apps/drwho/PMS_Usr.cpp: - - Was still using ACE::strecpy, changed to ACE_OS::strecpy. - -Tue Apr 25 15:11:41 2000 Carlos O'Ryan - - * THANKS: - Add new member to the list. - -Tue Apr 25 11:35:07 2000 Darrell Brunsch - - * ace/Local_Name_Space.cpp: - - The hash function was using the wrong length of the USHORT16 - string representation. The len_ actually is the length in bytes, - not characters. - -Tue Apr 25 08:57:59 2000 Darrell Brunsch - - * ASNMP/tests/test_config.h: - - Was using XXX_A and XXX_W macros which really do not make sense - anymore. Removed them and replaced with just the XXX macro which - uses ACE_TEXT. - - * examples/Naming/test_multiple_contexts.cpp: - * examples/Naming/test_non_existent.cpp: - * examples/Naming/test_writers.cpp: - * performance-tests/Misc/test_naming.cpp: - * tests/Naming_Test.cpp: - * tests/SString_Test.cpp: - - All of these were still being disabled when ACE_HAS_WCHAR wasn't - defined. Since the naming stuff was changed to work without - ACE_HAS_WCHAR, these were reenabled. - -Tue Apr 25 00:02:08 2000 Douglas C. Schmidt - - * ace/Log_Msg.h (ACE_Log_Msg): Split msg_ostream() into two functions, - one of which allows the delete_ostream_ flag to be reset and the - other that doesn't. Thanks to Boris Sukholitko - for reporting this. - - * ace/Message_Block.i (replace_data_block): If a data block is replaced - with a NULL pointer then don't bother doing certain operations! - Thanks to Boris Sukholitko for - reporting this. - - * ace/OS.i (dlerror): Changed sizeof buf to sizeof buf / sizeof buf[0] - to avoid over-allocating a buffer in the - ACE_TEXT_FormateMessage() function. Thanks to Valery - Arkhangorodsky for reporting this. - - * ace/Service_Repository.cpp: The fini() method was claiming - it was the close() method. Likewise, changed the close() method - so that it keeps decrementing the current_size each time through - the look to allow checking the respository size or doing other - work from inside the fini() call. Thanks to Valery - Arkhangorodsky for reporting this. - -Mon Apr 24 17:44:21 2000 Darrell Brunsch - - * ace/Object_Manager.cpp: - - Ai Carumba! I disabled some stuff here a while back when - I first disabled the Naming Service, but forgot to enable - it again once I fixed that. - -Mon Apr 24 16:44:22 2000 Darrell Brunsch - - * ace/SString.i: - - A couple of compilers were having problems with some - casting I was doing in a const hash method. Changed the - types of casts to hopefully make the compilers happy. - -Mon Apr 24 10:04:51 2000 Darrell Brunsch - - * ace/OS.cpp: - - Another problem with a missing parenthesis. - -Mon Apr 24 09:15:03 2000 Darrell Brunsch - - * ace/OS.i: - - Forgot a couple of ')'s that showed up on Lynx builds. - - Also, ACE_const_char doesn't exist, ACE_const_cast does. - -Sun Apr 23 19:51:41 2000 Darrell Brunsch - - * ace/ACE.cpp: - * ace/Naming_Context.cpp: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - - Just tried the ACE_USES_WCHAR build and there were a couple - of things that needed updating. Mainly some missing ACE_TEXT's - or char's used instead of ACE_TCHAR's. - - * tests/Process_Mutex_Test.cpp: - - Was still using an old ACE_DEFAULT_MUTEX_A macro (updated to - ACE_DEFAULT_MUTEX). - - * ace/ace_lib.dsp: - - Added "static" to the config names (Win32 Debug => Win32 Static - Debug) so it is easier for the msvc_auto_compile.pl script to - figure out which is which. - -Sun Apr 23 18:14:33 2000 Darrell Brunsch - - * ace/ace_wchar.h: - - Added compatibility for all the old ASYS_* macros by default. - But no part of ACE/TAO should still use them anymore. This - compatibility can be turned off by defining - ACE_ONLY_LATEST_AND_GREATEST. - - * ace/SString.cpp: - * ace/SString.h: - * ace/SString.i: - * ace/Local_Name_Space.cpp: - * ace/Local_Name_Space.h: - * ace/Local_Name_Space_T.h: - * ace/Name_Space.cpp: - * ace/Name_Space.h: - * ace/Naming_Context.cpp: - * ace/Naming_Context.h: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Name_Space.h: - - Found a better way of support for the ACE_Name_Space classes when - there isn't a wchar_t. We now define the ACE_WString to internally - use a type called ACE_WSTRING_TYPE, which is defined to wchar_t - unless ACE_USES_WCHAR is not defined (in which case it is defined - to ACE_USHORT16). - -Sun Apr 23 14:27:11 2000 Darrell Brunsch - - * ace/CLASSIX/CLASSIX_Port.cpp: - * tests/IOStream_Test.cpp: - * tests/SOCK_Connector_Test.cpp: - - Found some old ASYS macros still hanging around in code that wasn't - enabled on NT. - -Sat Apr 22 22:01:15 2000 Darrell Brunsch - - * ace/Local_Name_Space_T.cpp: - * ace/Naming_Context.cpp: - - Fixed some wchar related changes. - -Sat Apr 22 20:53:11 2000 Darrell Brunsch - - This is my first checkin of my Unicode changes. They should be - mostly harmless, since most platforms and build do not use Unicode - stuff, in which these changes *should* result in the exact same - behavior as before. - - But, if Unicode was being used, then chances are it is not going - to work without a few changes. A summary of the changes are: - - - Standardized wide char support to the following macros: - - ACE_HAS_WCHAR - if not defined, ACE will not use the type wchar_t - or provide any of the functions that use it. - ACE_USES_WCHAR - if defined, ACE will use wchar_t instead of char - for its strings (but not its buffers). - - This support has been mostly completed, but there are still some - loose ends that need to be cleaned up. - - Note also that even if ACE_USES_WCHAR is defined or not, both - wide and narrow versions of the string operations will be - available. - - - Removed all the ASYS_* macros (besides ASYS_INLINE). So all code - using ASYS_TEXT and ASYS_TCHAR should now use ACE_TEXT and - ACE_TCHAR. And unlike their predecessers, these *will* turn into - wide character versions when ACE_USES_WCHAR is defined. - - - Removed the macros ACE_HAS_WCHAR_TYPEDEFS_USHORT and - ACE_HAS_WCHAR_TYPEDEFS_CHAR since ACE will not depend on what - wchar_t defaults to. - - - Messed around with Windows CE support, most likely it broke it - even more. I've halted my work on Windows CE until after this - change, so I'll be fixing it up in upcoming checkins. - - - Since ACE_WString was changed, everything using it will now - not be available when ACE_HAS_WCHAR is not defined. - - The motivation for this change was that the Unicode support was - a mess and was very unintuitive. Since I was given the job of - maintaining it (since I'm doing Windows CE stuff now), I decided - to fix it instead of try to figure out what was currently - happening. A consistent design is much easier to explain and - maintain. - - * ace/ACE.h: - * ace/ACE.i: - * ace/ACE.cpp: - * ace/ARGV.cpp: - - Removed ACE's strecpy since all it did was call ACE_OS's strecpy. - - * ace/ace_wchar.h: (added) - - Moved all the unicode specific stuff here. - - * ace/SString.cpp: - * ace/SString.h: - * ace/SString.i: - - ACE_WString used to use ACE_USHORT16 instead of wchar_t. I - changed it so it does, since it will be more useful and intuitive - this way. - - * ace/Log_Record.cpp: - - We were using ACE_OS::fwrite to print the string. This didn't work - when the string was wchar_t, so this was changed to ACE_OS::fprintf - instead. - - * TODO: - * acconfig.h: - * configure.in: - * ace/ACE.cpp: - * ace/ACE.h: - * ace/ACE.i: - * ace/ARGV.cpp: - * ace/ARGV.h: - * ace/ARGV.i: - * ace/ATM_Addr.cpp: - * ace/ATM_Addr.h: - * ace/ATM_Connector.i: - * ace/ATM_QoS.cpp: - * ace/Acceptor.cpp: - * ace/Acceptor.h: - * ace/Activation_Queue.cpp: - * ace/Addr.cpp: - * ace/Arg_Shifter.cpp: - * ace/Arg_Shifter.h: - * ace/Asynch_Acceptor.cpp: - * ace/Asynch_IO.cpp: - * ace/Based_Pointer_T.cpp: - * ace/Basic_Types.h: - * ace/CORBA_Handler.cpp: - * ace/Cache_Map_Manager_T.cpp: - * ace/Cached_Connect_Strategy_T.cpp: - * ace/Caching_Strategies_T.i: - * ace/Capabilities.cpp: - * ace/Capabilities.h: - * ace/Capabilities.i: - * ace/Configuration.cpp: - * ace/Configuration.h: - * ace/Connector.cpp: - * ace/Connector.h: - * ace/Containers_T.cpp: - * ace/DEV_Addr.cpp: - * ace/DEV_Addr.h: - * ace/DEV_Addr.i: - * ace/DEV_Connector.i: - * ace/DLL.cpp: - * ace/DLL.h: - * ace/Dirent.h: - * ace/Dirent.i: - * ace/Dynamic_Service.cpp: - * ace/Dynamic_Service.h: - * ace/Env_Value_T.h: - * ace/Env_Value_T.i: - * ace/FIFO.cpp: - * ace/FIFO.h: - * ace/FIFO.i: - * ace/FIFO_Recv.cpp: - * ace/FIFO_Recv.h: - * ace/FIFO_Recv_Msg.cpp: - * ace/FIFO_Recv_Msg.h: - * ace/FIFO_Send.cpp: - * ace/FIFO_Send.h: - * ace/FIFO_Send_Msg.cpp: - * ace/FIFO_Send_Msg.h: - * ace/FILE_Addr.cpp: - * ace/FILE_Addr.h: - * ace/FILE_Addr.i: - * ace/FILE_Connector.cpp: - * ace/FILE_Connector.i: - * ace/Filecache.cpp: - * ace/Filecache.h: - * ace/Functor.h: - * ace/Functor.i: - * ace/Future.cpp: - * ace/Get_Opt.cpp: - * ace/Get_Opt.h: - * ace/Handle_Set.cpp: - * ace/Hash_Map_Manager_T.cpp: - * ace/Hash_Map_Manager_T.i: - * ace/High_Res_Timer.cpp: - * ace/High_Res_Timer.h: - * ace/INET_Addr.cpp: - * ace/INET_Addr.h: - * ace/INET_Addr.i: - * ace/IO_SAP.cpp: - * ace/IPC_SAP.cpp: - * ace/LSOCK.cpp: - * ace/LSOCK_CODgram.cpp: - * ace/LSOCK_Connector.cpp: - * ace/LSOCK_Dgram.cpp: - * ace/Local_Name_Space.cpp: - * ace/Local_Name_Space.h: - * ace/Local_Name_Space_T.cpp: - * ace/Local_Name_Space_T.h: - * ace/Local_Tokens.cpp: - * ace/Local_Tokens.h: - * ace/Local_Tokens.i: - * ace/Log_Msg.cpp: - * ace/Log_Msg.h: - * ace/Log_Record.cpp: - * ace/Log_Record.h: - * ace/Log_Record.i: - * ace/MEM_Acceptor.cpp: - * ace/MEM_Acceptor.h: - * ace/MEM_Acceptor.i: - * ace/MEM_Addr.cpp: - * ace/MEM_Addr.h: - * ace/MEM_Addr.i: - * ace/MEM_Connector.cpp: - * ace/MEM_SAP.cpp: - * ace/MEM_SAP.h: - * ace/Malloc.cpp: - * ace/Malloc_T.cpp: - * ace/Malloc_T.h: - * ace/Malloc_T.i: - * ace/Map_Manager.cpp: - * ace/Map_Manager.i: - * ace/Mem_Map.cpp: - * ace/Mem_Map.h: - * ace/Mem_Map.i: - * ace/Memory_Pool.cpp: - * ace/Memory_Pool.h: - * ace/Message_Block.cpp: - * ace/Message_Queue.cpp: - * ace/Message_Queue_T.cpp: - * ace/Module.cpp: - * ace/Module.h: - * ace/Module.i: - * ace/NT_Service.cpp: - * ace/NT_Service.h: - * ace/NT_Service.i: - * ace/Name_Proxy.cpp: - * ace/Name_Request_Reply.cpp: - * ace/Name_Space.cpp: - * ace/Name_Space.h: - * ace/Naming_Context.cpp: - * ace/Naming_Context.h: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/Object_Manager.cpp: - * ace/Obstack.cpp: - * ace/Obstack.h: - * ace/POSIX_Asynch_IO.cpp: - * ace/Parse_Node.cpp: - * ace/Parse_Node.h: - * ace/Pipe.cpp: - * ace/Proactor.cpp: - * ace/Process.cpp: - * ace/Process.h: - * ace/Process.i: - * ace/Process_Manager.cpp: - * ace/QoS_Manager.cpp: - * ace/QoS_Session_Factory.cpp: - * ace/QoS_Session_Impl.cpp: - * ace/RB_Tree.cpp: - * ace/RB_Tree.i: - * ace/README: - * ace/Read_Buffer.cpp: - * ace/Registry.cpp: - * ace/Registry.h: - * ace/Registry_Name_Space.cpp: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Name_Space.h: - * ace/Remote_Tokens.cpp: - * ace/Remote_Tokens.h: - * ace/Remote_Tokens.i: - * ace/SOCK.cpp: - * ace/SOCK_Acceptor.cpp: - * ace/SOCK_CODgram.cpp: - * ace/SOCK_Connector.cpp: - * ace/SOCK_Dgram.cpp: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/SOCK_Dgram_Bcast.h: - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Dgram_Mcast.h: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - * ace/SOCK_Dgram_Mcast_QoS.h: - * ace/SPIPE_Acceptor.cpp: - * ace/SPIPE_Addr.cpp: - * ace/SPIPE_Addr.h: - * ace/SPIPE_Addr.i: - * ace/SPIPE_Connector.cpp: - * ace/SString.cpp: - * ace/SString.h: - * ace/SString.i: - * ace/SV_Message_Queue.cpp: - * ace/SV_Semaphore_Complex.cpp: - * ace/SV_Semaphore_Simple.cpp: - * ace/SV_Shared_Memory.cpp: - * ace/Select_Reactor_Base.cpp: - * ace/Select_Reactor_T.cpp: - * ace/Service_Config.cpp: - * ace/Service_Config.h: - * ace/Service_Config.i: - * ace/Service_Manager.cpp: - * ace/Service_Manager.h: - * ace/Service_Object.cpp: - * ace/Service_Object.h: - * ace/Service_Object.i: - * ace/Service_Repository.cpp: - * ace/Service_Repository.h: - * ace/Service_Types.cpp: - * ace/Service_Types.h: - * ace/Service_Types.i: - * ace/Shared_Memory_MM.cpp: - * ace/Shared_Memory_MM.h: - * ace/Shared_Memory_MM.i: - * ace/Shared_Object.cpp: - * ace/Shared_Object.h: - * ace/Singleton.cpp: - * ace/Stats.cpp: - * ace/Stats.h: - * ace/Stats.i: - * ace/Strategies_T.cpp: - * ace/Strategies_T.i: - * ace/Stream.cpp: - * ace/Stream.h: - * ace/Stream_Modules.cpp: - * ace/Stream_Modules.h: - * ace/Svc_Conf.h: - * ace/Svc_Conf.l: - * ace/Svc_Conf.y: - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: - * ace/Svc_Handler.cpp: - * ace/Svc_Handler.h: - * ace/Synch.cpp: - * ace/Synch.h: - * ace/Synch.i: - * ace/Synch_T.cpp: - * ace/Synch_T.h: - * ace/Synch_T.i: - * ace/System_Time.cpp: - * ace/System_Time.h: - * ace/TLI.cpp: - * ace/TLI_Acceptor.cpp: - * ace/TLI_Connector.i: - * ace/TP_Reactor.cpp: - * ace/TP_Reactor.i: - * ace/Task_T.cpp: - * ace/Task_T.h: - * ace/Template_Instantiations.cpp: - * ace/Thread_Manager.cpp: - * ace/Time_Request_Reply.cpp: - * ace/Timeprobe_T.cpp: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Heap_T.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_Queue_Adapters.cpp: - * ace/Timer_Queue_T.cpp: - * ace/Timer_Wheel_T.cpp: - * ace/Token.cpp: - * ace/Token.h: - * ace/Token_Collection.cpp: - * ace/Token_Collection.h: - * ace/Token_Collection.i: - * ace/Token_Invariants.cpp: - * ace/Token_Invariants.h: - * ace/Token_Manager.cpp: - * ace/Token_Manager.h: - * ace/Token_Request_Reply.cpp: - * ace/Token_Request_Reply.h: - * ace/Token_Request_Reply.i: - * ace/Trace.cpp: - * ace/Trace.h: - * ace/UPIPE_Acceptor.cpp: - * ace/UPIPE_Connector.cpp: - * ace/UPIPE_Connector.i: - * ace/WFMO_Reactor.cpp: - * ace/WFMO_Reactor.i: - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Proactor.cpp: - * ace/XTI_ATM_Mcast.i: - * ace/config-WinCE.h: - * ace/config-all.h: - * ace/config-ghs-common.h: - * ace/config-tandem.h: - * ace/config-win32-borland.h: - * ace/config-win32-common.h: - * ace/config-win32-msvc.h: - * ace/config-win32-visualage.h: - * ace/CLASSIX/CLASSIX_CLD_Connector.cpp: - * ace/CLASSIX/CLASSIX_CO_Acceptor.cpp: - * ace/CLASSIX/CLASSIX_Port.cpp: - * ace/CLASSIX/CLASSIX_Port.h: - * ace/CLASSIX/CLASSIX_Select_Reactor.cpp: - * apps/Gateway/Gateway/Options.cpp: - * apps/JAWS/PROTOTYPE/JAWS/JAWS.h: - * bin/envinfo.cpp: - * docs/ACE-guidelines.html: - * docs/tutorials/Chap_3/mm.cpp: - * examples/Connection/blocking/SPIPE-acceptor.cpp: - * examples/Connection/blocking/SPIPE-acceptor.h: - * examples/Connection/blocking/SPIPE-connector.cpp: - * examples/Connection/blocking/SPIPE-connector.h: - * examples/Connection/non_blocking/test_lsock_acceptor.cpp: - * examples/Connection/non_blocking/test_lsock_connector.cpp: - * examples/IPC_SAP/ATM_SAP/CPP-client.cpp: - * examples/IPC_SAP/ATM_SAP/CPP-server.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: - * examples/IPC_SAP/UPIPE_SAP/ex3.cpp: - * examples/Naming/test_multiple_contexts.cpp: - * examples/Naming/test_non_existent.cpp: - * examples/Naming/test_writers.cpp: - * examples/Reactor/WFMO_Reactor/test_console_input.cpp: - * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp: - * examples/Reactor/WFMO_Reactor/test_handle_close.cpp: - * examples/Reactor/WFMO_Reactor/test_registry_changes.cpp: - * examples/Registry/test_registry_iterator.cpp: - * examples/Service_Configurator/Misc/Timer_Service.cpp: - * examples/Service_Configurator/Misc/Timer_Service.h: - * examples/Service_Configurator/Misc/main.cpp: - * examples/Service_Configurator/Misc/main.dsp: - * examples/Web_Crawler/Options.cpp: - * examples/Web_Crawler/Options.h: - * examples/Web_Crawler/URL_Addr.cpp: - * examples/Web_Crawler/URL_Addr.h: - * netsvcs/clients/Logger/indirect_logging.cpp: - * netsvcs/clients/Naming/Client/main.cpp: - * netsvcs/lib/Logging_Strategy.cpp: - * netsvcs/lib/TS_Clerk_Handler.cpp: - * netsvcs/lib/TS_Clerk_Handler.h: - * performance-tests/Misc/test_naming.cpp: - * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp: - * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp: - * performance-tests/TCP/tcp_test.cpp: - * tests/ACE_Init_Test.dsp: - * tests/ARGV_Test.cpp: - * tests/Atomic_Op_Test.cpp: - * tests/Auto_IncDec_Test.cpp: - * tests/Barrier_Test.cpp: - * tests/Basic_Types_Test.cpp: - * tests/Buffer_Stream_Test.cpp: - * tests/CDR_File_Test.cpp: - * tests/CDR_Test.cpp: - * tests/Cache_Map_Manager_Test.cpp: - * tests/Cached_Accept_Conn_Test.cpp: - * tests/Cached_Conn_Test.cpp: - * tests/Capabilities_Test.cpp: - * tests/Collection_Test.cpp: - * tests/Conn_Test.cpp: - * tests/DLL_Test.cpp: - * tests/DLL_Test.h: - * tests/DLList_Test.cpp: - * tests/Dynamic_Priority_Test.cpp: - * tests/Enum_Interfaces_Test.cpp: - * tests/Env_Value_Test.cpp: - * tests/FlReactor_Test.cpp: - * tests/Future_Set_Test.cpp: - * tests/Future_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/Hash_Map_Bucket_Iterator_Test.cpp: - * tests/Hash_Map_Manager_Test.cpp: - * tests/High_Res_Timer_Test.cpp: - * tests/IOStream_Test.cpp: - * tests/Lazy_Map_Manager_Test.cpp: - * tests/Log_Msg_Test.cpp: - * tests/MM_Shared_Memory_Test.cpp: - * tests/MT_Reactor_Timer_Test.cpp: - * tests/MT_SOCK_Test.cpp: - * tests/Malloc_Test.cpp: - * tests/Map_Manager_Test.cpp: - * tests/Map_Test.cpp: - * tests/Mem_Map_Test.cpp: - * tests/Message_Block_Test.cpp: - * tests/Message_Queue_Notifications_Test.cpp: - * tests/Message_Queue_Test.cpp: - * tests/Naming_Test.cpp: - * tests/New_Fail_Test.cpp: - * tests/Notify_Performance_Test.cpp: - * tests/Object_Manager_Test.cpp: - * tests/OrdMultiSet_Test.cpp: - * tests/Pipe_Test.cpp: - * tests/Priority_Buffer_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Priority_Task_Test.cpp: - * tests/Process_Manager_Test.cpp: - * tests/Process_Mutex_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/Process_Strategy_Test.h: - * tests/RB_Tree_Test.cpp: - * tests/Reactor_Exceptions_Test.cpp: - * tests/Reactor_Notify_Test.cpp: - * tests/Reactor_Performance_Test.cpp: - * tests/Reactor_Timer_Test.cpp: - * tests/Reactors_Test.cpp: - * tests/Reader_Writer_Test.cpp: - * tests/Recursive_Mutex_Test.cpp: - * tests/Reverse_Lock_Test.cpp: - * tests/SOCK_Connector_Test.cpp: - * tests/SOCK_Send_Recv_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/SString_Test.cpp: - * tests/SV_Shared_Memory_Test.cpp: - * tests/Semaphore_Test.cpp: - * tests/Service_Config_Test.cpp: - * tests/Signal_Test.cpp: - * tests/Sigset_Ops_Test.cpp: - * tests/Simple_Message_Block_Test.cpp: - * tests/Svc_Handler_Test.cpp: - * tests/TSS_Test.cpp: - * tests/Task_Test.cpp: - * tests/Thread_Manager_Test.cpp: - * tests/Thread_Mutex_Test.cpp: - * tests/Thread_Pool_Reactor_Test.cpp: - * tests/Thread_Pool_Test.cpp: - * tests/Time_Service_Test.cpp: - * tests/Time_Value_Test.cpp: - * tests/Timeprobe_Test.cpp: - * tests/Timer_Queue_Test.cpp: - * tests/TkReactor_Test.cpp: - * tests/Tokens_Test.cpp: - * tests/UPIPE_SAP_Test.cpp: - * tests/Upgradable_RW_Test.cpp: - * tests/XtReactor_Test.cpp: - * tests/test_config.h: - * websvcs/lib/URL_Addr.cpp: - * websvcs/lib/URL_Addr.h: - * websvcs/lib/URL_Addr.i: - * websvcs/tests/Test_URL_Addr.cpp: - - Made all the appropriate changes to support the new wide char - policy. Most changes were macro changes, changing ASYS_* to - ACE_*, changing char's to ACE_TCHAR's, adding in ACE_TEXT ()'s - when necessary, etc. - -Sat Apr 22 18:41:06 2000 Vishal Kachroo - - * ace/SOCK_Dgram_Mcast.h: - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Dgram_Mcast.i: Removed the QoS enabled overloaded - methods. - - * ace/SOCK_Dgram_Mcast_QoS.h: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - * ace/SOCK_Dgram_Mcast_QoS.i: Added this new class that derives from - ACE_SOCK_Dgram_Mcast and handles all the QoS functionality that - was being done by the latter. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added the ace/SOCK_Dgram_Mcast_QoS.{cpp,i,h} - -Fri Apr 21 10:23:19 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Removed all chdir's and fixed a bug with specifying multiple -dir's. - -Fri Apr 21 09:13:20 2000 Carlos O'Ryan - - * websvcs/lib/URL_Addr.cpp: - The URL schemes are supposed to be case insensitive, thanks to - Paul Carreiro for pointing this out. - -Thu Apr 20 21:05:42 2000 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Added a -core for only the core libraries. Also fixed a problem - with specifying incorrect directories and the -DLL/-Debug/etc. - macros. - -Thu Apr 20 18:11:48 2000 Darrell Brunsch - - * examples/DLL/Main.dsp: - * examples/DLL/Newsweek.dsp: - * examples/DLL/Today.dsp - * examples/Configuration/Configuration.dsw: - * examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp: - * examples/Configuration/Test.dsp: - * examples/IPC_SAP/ATM_SAP/ATM_SAP.dsw: - * examples/IPC_SAP/ATM_SAP/CPP_client.dsp: - * examples/IPC_SAP/ATM_SAP/CPP_server.dsp: - * examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp: - * examples/Mem_Map/file-reverse/file_reverse.dsp: - * examples/NT_Service/NT_Service.dsp: - * examples/NT_Service/NT_Service.dsw: - * examples/OS/Process/Process.dsp: - * examples/OS/Process/imore.dsp: - * examples/QOS/client.dsp: - * examples/QOS/server.dsp: - * examples/Reactor/Misc/demuxing.dsp: - * examples/Reactor/Multicast/client.dsp: - * examples/Reactor/Multicast/server.dsp: - * examples/Service_Configurator/Misc/Timer.dsp: - * examples/Service_Configurator/Misc/main.dsp: - * examples/Timer_Queue/Async_Timer_Queue_Test.dsp: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp: - * examples/Timer_Queue/Thread_Timer_Queue_Test.dsp: - * examples/Timer_Queue/Timer_Queue.dsw: - * examples/Web_Crawler/Web_Crawler.dsp: - - Fixed miscellaneous problems with these projects and workspaces. - Some projects were missing from workspaces or listed incorrectly. - Many project didn't have the correct include paths or definitions. - - * examples/Reactor/Proactor/post_completion.dsp: (removed) - - There was already a post_completions.dsp that was being used. - - * examples/OS/Process/imore.cpp: - * examples/OS/Process/process.cpp: - - Changed the type of the variables used with Process::wait from - int to ACE_exitcode. - - * examples/Reactor/WFMO_Reactor/test_abandoned.cpp: - * examples/Reactor/WFMO_Reactor/test_apc.cpp: - - Missing parentheses. - - * Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp: - - Changed the name of the project so win32_auto_compile.pl works - with it properly. - - * bin/msvc_auto_compile.pl: (added) - - This is a new script for autocompiling with MSVC 6. - Eventually this should replace auto_compile_win32.pl. It still - needs more directories added to it and tested before we put it - into production - - * bin/vc_filter.pl: - - Updated to properly color code output from msvc_auto_compile.pl - also. - -Thu Apr 20 09:50:49 2000 Carlos O'Ryan - - * ace/RB_Tree.h: - * ace/RB_Tree.i: - Fixed implementation of the end() method. It should return a - singular iterator that is different from all valid iterator, not - an iterator pointing to the last element in the collection. - -Thu Apr 20 08:53:31 2000 Carlos O'Ryan - - * ace/CDR_Stream.i: - Fixed problem in the align_write_ptr() method. It was optimized - for the case where there was enough room in the current buffer, - but the optimization broke with a previous fix from Feb 29. - -Thu Apr 20 08:40:00 2000 Chris Gill - - * examples/Bounded_Packet_Relay/BPR_Drivers_T.h, - examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp: - Fixed warnings from g++ - -Wed Apr 19 21:53:52 2000 Douglas C. Schmidt - - * examples/Bounded_Packet_Relay: Added some missing template - instantiations and other assorted problems. Thanks to Aoxiang - Xu for reporting these. - -Wed Apr 19 07:04:13 2000 Douglas C. Schmidt - - * ace/Containers_T.cpp (copy_nodes): insert_head() should have - been insert_tail(). Thanks to Umar Syyid for clarifying this. - Also, added some comments to explain what's going on in - insert_tail() since the code was somewhat non-intuitive ;-). - -Wed Apr 19 15:00:44 2000 Carlos O'Ryan - - * apps/Makefile: - * apps/drwho/Makefile: - * performance-tests/Makefile: - * performance-tests/Server_Concurrency/Leader_Follower/Makefile: - * performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile: - More Makefiles that were not in the default compilation path, - added them and update dependencies. - - * bin/Makefile: - * examples/Bounded_Packet_Relay/Makefile: - * examples/QOS/Makefile: - * performance-tests/RPC/Makefile: - * performance-tests/Synch-Benchmarks/Base_Test/Makefile: - * performance-tests/Synch-Benchmarks/Perf_Test/Makefile: - * performance-tests/Synch-Benchmarks/Synch_Lib/Makefile: - * ASNMP/asnmp/Makefile: - * ASNMP/examples/get/Makefile: - * ASNMP/examples/next/Makefile: - * ASNMP/examples/set/Makefile: - * ASNMP/examples/trap/Makefile: - * ASNMP/examples/walk/Makefile: - * ASNMP/tests/Makefile: - Just updated dependencies. More fixes are needed to put them in - the normal compilation path. - - * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp: - * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp: - They wouldn't compile on platforms that lack context switch - counters in rusage. Conditionally compile that code to avoid - the problem. - -Wed Apr 19 14:09:29 2000 Darrell Brunsch - - * etc/Svc_Conf_l.cpp.diff: Fixed the diff so it generates - the correct Svc_Conf_l.cpp. - -Wed Apr 19 12:48:21 2000 Balachandran Natarajan - - * ace/ACE.cpp: Added a missing pointer in the signature of - ACE::t_rcv_n_i (). - -Wed Apr 19 10:11:23 2000 Darrell Brunsch - - * tests/Atomic_Op_Test.dsp: - * tests/Auto_IncDec_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Basic_Types_Test.dsp: - * tests/Buffer_Stream_Test.dsp: - * tests/CDR_File_Test.dsp: - * tests/CDR_Test.dsp: - * tests/Cache_Map_Manager_Test.dsp: - * tests/Cached_Accept_Conn_Test.dsp: - * tests/Cached_Conn_Test.dsp: - * tests/Capabilities_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Conn_Test.dsp: - * tests/DLList_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/Enum_Interfaces_Test.dsp: - * tests/Env_Value_Test.dsp: - * tests/Future_Set_Test.dsp: - * tests/Future_Test.dsp: - * tests/Handle_Set_Test.dsp: - * tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/Hash_Map_Manager_Test.dsp: - * tests/High_Res_Timer_Test.dsp: - * tests/IOStream_Test.dsp: - * tests/Lazy_Map_Manager_Test.dsp: - * tests/MM_Shared_Memory_Test.dsp: - * tests/MT_Reactor_Timer_Test.dsp: - * tests/MT_SOCK_Test.dsp: - * tests/Malloc_Test.dsp: - * tests/Map_Manager_Test.dsp: - * tests/Map_Test.dsp: - * tests/Mem_Map_Test.dsp: - * tests/Message_Block_Test.dsp: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/Message_Queue_Test.dsp: - * tests/Naming_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Notify_Performance_Test.dsp: - * tests/Object_Manager_Test.dsp: - * tests/OrdMultiSet_Test.dsp: - * tests/Pipe_Test.dsp: - * tests/Priority_Buffer_Test.dsp: - * tests/Priority_Reactor_Test.dsp: - * tests/Priority_Task_Test.dsp: - * tests/Process_Manager_Test.dsp: - * tests/Process_Mutex_Test.dsp: - * tests/Process_Strategy_Test.dsp: - * tests/RB_Tree_Test.dsp: - * tests/Reactor_Exceptions_Test.dsp: - * tests/Reactor_Notify_Test.dsp: - * tests/Reactor_Performance_Test.dsp: - * tests/Reactor_Timer_Test.dsp: - * tests/Reactors_Test.dsp: - * tests/Reader_Writer_Test.dsp: - * tests/Recursive_Mutex_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/SOCK_Test.dsp: - * tests/SPIPE_Test.dsp: - * tests/SString_Test.dsp: - * tests/SV_Shared_Memory_Test.dsp: - * tests/Semaphore_Test.dsp: - * tests/Service_Config_Test.dsp: - * tests/Sigset_Ops_Test.dsp: - * tests/Simple_Message_Block_Test.dsp: - * tests/Svc_Handler_Test.dsp: - * tests/TSS_Test.dsp: - * tests/Task_Test.dsp: - * tests/Thread_Manager_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Thread_Pool_Reactor_Test.dsp: - * tests/Thread_Pool_Test.dsp: - * tests/Time_Service_Test.dsp: - * tests/Time_Value_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Timer_Queue_Test.dsp: - * tests/Tokens_Test.dsp: - * tests/UPIPE_SAP_Test.dsp: - * tests/Upgradable_RW_Test.dsp: - * tests/pharlap/Atomic_Op_Test.dsp: (added) - * tests/pharlap/Auto_IncDec_Test.dsp: (added) - * tests/pharlap/Barrier_Test.dsp: (added) - * tests/pharlap/Basic_Types_Test.dsp: (added) - * tests/pharlap/Buffer_Stream_Test.dsp: (added) - * tests/pharlap/CDR_File_Test.dsp: (added) - * tests/pharlap/CDR_Test.dsp: (added) - * tests/pharlap/Cache_Map_Manager_Test.dsp: (added) - * tests/pharlap/Cached_Accept_Conn_Test.dsp: (added) - * tests/pharlap/Cached_Conn_Test.dsp: (added) - * tests/pharlap/Capabilities_Test.dsp: (added) - * tests/pharlap/Collection_Test.dsp: (added) - * tests/pharlap/Conn_Test.dsp: (added) - * tests/pharlap/DLList_Test.dsp: (added) - * tests/pharlap/Dynamic_Priority_Test.dsp: (added) - * tests/pharlap/Enum_Interfaces_Test.dsp: (added) - * tests/pharlap/Env_Value_Test.dsp: (added) - * tests/pharlap/Future_Set_Test.dsp: (added) - * tests/pharlap/Future_Test.dsp: (added) - * tests/pharlap/Handle_Set_Test.dsp: (added) - * tests/pharlap/Hash_Map_Bucket_Iterator_Test.dsp: (added) - * tests/pharlap/Hash_Map_Manager_Test.dsp: (added) - * tests/pharlap/High_Res_Timer_Test.dsp: (added) - * tests/pharlap/IOStream_Test.dsp: (added) - * tests/pharlap/Lazy_Map_Manager_Test.dsp: (added) - * tests/pharlap/MM_Shared_Memory_Test.dsp: (added) - * tests/pharlap/MT_Reactor_Timer_Test.dsp: (added) - * tests/pharlap/MT_SOCK_Test.dsp: (added) - * tests/pharlap/Malloc_Test.dsp: (added) - * tests/pharlap/Map_Manager_Test.dsp: (added) - * tests/pharlap/Map_Test.dsp: (added) - * tests/pharlap/Mem_Map_Test.dsp: (added) - * tests/pharlap/Message_Block_Test.dsp: (added) - * tests/pharlap/Message_Queue_Notifications_Test.dsp: (added) - * tests/pharlap/Message_Queue_Test.dsp: (added) - * tests/pharlap/Naming_Test.dsp: (added) - * tests/pharlap/New_Fail_Test.dsp: (added) - * tests/pharlap/Notify_Performance_Test.dsp: (added) - * tests/pharlap/Object_Manager_Test.dsp: (added) - * tests/pharlap/OrdMultiSet_Test.dsp: (added) - * tests/pharlap/Pipe_Test.dsp: (added) - * tests/pharlap/Priority_Buffer_Test.dsp: (added) - * tests/pharlap/Priority_Reactor_Test.dsp: (added) - * tests/pharlap/Priority_Task_Test.dsp: (added) - * tests/pharlap/Process_Manager_Test.dsp: (added) - * tests/pharlap/Process_Mutex_Test.dsp: (added) - * tests/pharlap/Process_Strategy_Test.dsp: (added) - * tests/pharlap/RB_Tree_Test.dsp: (added) - * tests/pharlap/Reactor_Exceptions_Test.dsp: (added) - * tests/pharlap/Reactor_Notify_Test.dsp: (added) - * tests/pharlap/Reactor_Performance_Test.dsp: (added) - * tests/pharlap/Reactor_Timer_Test.dsp: (added) - * tests/pharlap/Reactors_Test.dsp: (added) - * tests/pharlap/Reader_Writer_Test.dsp: (added) - * tests/pharlap/Recursive_Mutex_Test.dsp: (added) - * tests/pharlap/Reverse_Lock_Test.dsp: (added) - * tests/pharlap/SOCK_Connector_Test.dsp: (added) - * tests/pharlap/SOCK_Send_Recv_Test.dsp: (added) - * tests/pharlap/SOCK_Test.dsp: (added) - * tests/pharlap/SPIPE_Test.dsp: (added) - * tests/pharlap/SString_Test.dsp: (added) - * tests/pharlap/SV_Shared_Memory_Test.dsp: (added) - * tests/pharlap/Semaphore_Test.dsp: (added) - * tests/pharlap/Service_Config_Test.dsp: (added) - * tests/pharlap/Sigset_Ops_Test.dsp: (added) - * tests/pharlap/Simple_Message_Block_Test.dsp: (added) - * tests/pharlap/Svc_Handler_Test.dsp: (added) - * tests/pharlap/TSS_Test.dsp: (added) - * tests/pharlap/Task_Test.dsp: (added) - * tests/pharlap/Thread_Manager_Test.dsp: (added) - * tests/pharlap/Thread_Mutex_Test.dsp: (added) - * tests/pharlap/Thread_Pool_Reactor_Test.dsp: (added) - * tests/pharlap/Thread_Pool_Test.dsp: (added) - * tests/pharlap/Time_Service_Test.dsp: (added) - * tests/pharlap/Time_Value_Test.dsp: (added) - * tests/pharlap/Timeprobe_Test.dsp: (added) - * tests/pharlap/Timer_Queue_Test.dsp: (added) - * tests/pharlap/Tokens_Test.dsp: (added) - * tests/pharlap/UPIPE_SAP_Test.dsp: (added) - * tests/pharlap/Upgradable_RW_Test.dsp: (added) - * tests/pharlap/pharlap_tests.dsw: (added) - - Moved all the pharlap configurations to their own dsp files in - their own subdirectory. This was done so those of us who don't - have pharlap can load tests.dsw and do a select all in the Build - All window and only get the relavant builds. - - * tests/run_pharlap_tests.bat: (removed) - * tests/pharlap/run_pharlap_tests.bat: (added) - - Moved this file to the pharlap directory also. - -Wed Apr 19 10:03:10 2000 Carlos O'Ryan - - * ace/SOCK_Stream.i: - The new flag was present but not used in several - methods, just forward them to the ACE::xxx() operation. - -Wed Apr 19 08:18:30 2000 Carlos O'Ryan - - * */Makefile: - Updated all the dependencies - -Wed Apr 19 09:44:14 2000 Jeff Parsons - - * ace/Log_Msg.cpp: - Changed the signature of a (WIN32-specific) call to - send_n, to resolve a function overload ambiguity on NT. - -Wed Apr 19 00:00:29 2000 Irfan Pyarali - - * ace: There are two general use cases of the _n() methods: - - (1) The method keeps looping, until all the data has been - transmitted, or until timeout occurs, or until the handle is - closed. This use case occurs when one does not know how much - data is coming across in the case of a recv(), or one wants to - know exactly how much data was sent in the case of a send(). - And one don't want to treat a premature eof as an error but - wants to know the exact number of bytes that have been - transferred so far. - - (2) In other cases when one knows exactly how much data is - coming across in the case of recv(), or how much data needs to - be transmitted in the case of a send(). Premature closing of the - handle is usually an error. - - By adding an additional parameter to all the _n() - methods, the above two use cases can be distinguished. The - following files were modified: - - - OS - - ACE - - SOCK_Stream - - TLI_Stream - - The other IO classes such as FIFO, MEM_IO, PIPE, etc., should - also include this change. However, they should first get fixed - with respect to timeouts. If comes before - timeouts, ordering of the parameters will get messed up. - - Thanks to Steffen Winther Sorensen for - reporting this second use of the _n() methods. - - * ace/OS.h: t_snd() interface was fixed. The buffer parameter - should be const. - - * ace/ACE: Added support for TLI I/O functions to the ACE class. - -Tue Apr 18 19:08:37 2000 Darrell Brunsch - - * ace/config-all.h: (added) - * ace/inc_user_config.h: (removed) - * ace/Codeset_IBM1047.h: - * ace/NT_Service.h: - * ace/config-win32-common.h: - * ace/OS.h: - - Started moving several of the macros from OS.h to config-all.h. - The plan is to eventually split up OS.h, and config-all is a - place where the macros (which are not specific to any part of - ACE_OS) can go. config-all.h also ate inc_user_config.h. - - * ASNMP/agent/main.cpp: - * ace/iosfwd.h: - * ace/streams.h: - * apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.cpp: - * tests/OrdMultiSet_Test.cpp: - * tests/Time_Value_Test.cpp: - * tests/test_config.h: - - Since inc_user_config.h was eaten, needed to change includes of - it to config-all.h. - - * bin/generate_export_file.pl: (added) - * bin/GenExportH.BAT: (removed) - - Replaced the batch file with a perl file so - - people can generate on other platforms - - it can generate Word_export and WORD_BUILD_DLL - (the batch file couldn't change the case of the key) - - * ace/ACE_export.h: (added) - * ace/svc_export.h: (added) - - Took the existing ACE_Export and ACE_Svc_Export macro and - moved them to separate files. Also tested out the new - generate_export_file.pl. - - * ace/ACE.cpp: - * ace/ARGV.cpp: - * ace/ATM_Acceptor.cpp: - * ace/ATM_Addr.cpp: - * ace/ATM_Connector.cpp: - * ace/ATM_Params.cpp: - * ace/ATM_QoS.cpp: - * ace/ATM_Stream.cpp: - * ace/Acceptor.cpp: - * ace/Activation_Queue.cpp: - * ace/Active_Map_Manager.cpp: - * ace/Addr.cpp: - * ace/Arg_Shifter.cpp: - * ace/Asynch_Acceptor.cpp: - * ace/Asynch_IO.cpp: - * ace/Asynch_IO_Impl.cpp: - * ace/Auto_IncDec_T.cpp: - * ace/Auto_Ptr.cpp: - * ace/Based_Pointer_Repository.cpp: - * ace/Based_Pointer_T.cpp: - * ace/Basic_Types.cpp: - * ace/CDR_Stream.cpp: - * ace/CORBA_Handler.cpp: - * ace/CORBA_Ref.cpp: - * ace/Cache_Map_Manager_T.cpp: - * ace/Cached_Connect_Strategy_T.cpp: - * ace/Capabilities.cpp: - * ace/Cleanup_Strategies_T.cpp: - * ace/Configuration.cpp: - * ace/Connector.cpp: - * ace/Containers.cpp: - * ace/Containers_T.cpp: - * ace/DEV.cpp: - * ace/DEV_Addr.cpp: - * ace/DEV_Connector.cpp: - * ace/DEV_IO.cpp: - * ace/DLL.cpp: - * ace/Date_Time.cpp: - * ace/Dirent.cpp: - * ace/Dump.cpp: - * ace/Dynamic.cpp: - * ace/Dynamic_Service.cpp: - * ace/Event_Handler.cpp: - * ace/Event_Handler_T.cpp: - * ace/FIFO.cpp: - * ace/FIFO_Recv.cpp: - * ace/FIFO_Recv_Msg.cpp: - * ace/FIFO_Send.cpp: - * ace/FIFO_Send_Msg.cpp: - * ace/FILE.cpp: - * ace/FILE_Addr.cpp: - * ace/FILE_Connector.cpp: - * ace/FILE_IO.cpp: - * ace/Filecache.cpp: - * ace/FlReactor.cpp: - * ace/Functor.cpp: - * ace/Functor_T.cpp: - * ace/Future.cpp: - * ace/Future_Set.cpp: - * ace/Get_Opt.cpp: - * ace/Handle_Set.cpp: - * ace/Hash_Cache_Map_Manager_T.cpp: - * ace/Hash_Map_Manager.cpp: - * ace/High_Res_Timer.cpp: - * ace/INET_Addr.cpp: - * ace/IOStream.cpp: - * ace/IOStream_T.cpp: - * ace/IO_SAP.cpp: - * ace/IPC_SAP.cpp: - * ace/LSOCK.cpp: - * ace/LSOCK_Acceptor.cpp: - * ace/LSOCK_CODgram.cpp: - * ace/LSOCK_Connector.cpp: - * ace/LSOCK_Dgram.cpp: - * ace/LSOCK_Stream.cpp: - * ace/Local_Name_Space.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Local_Tokens.cpp: - * ace/Log_Msg.cpp: - * ace/Log_Record.cpp: - * ace/MEM_Acceptor.cpp: - * ace/MEM_Addr.cpp: - * ace/MEM_Connector.cpp: - * ace/MEM_IO.cpp: - * ace/MEM_SAP.cpp: - * ace/MEM_Stream.cpp: - * ace/Malloc.cpp: - * ace/Malloc_T.cpp: - * ace/Managed_Object.cpp: - * ace/Map.cpp: - * ace/Map_Manager.cpp: - * ace/Mem_Map.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Block.cpp: - * ace/Message_Block_T.cpp: - * ace/Message_Queue.cpp: - * ace/Message_Queue_T.cpp: - * ace/Method_Request.cpp: - * ace/Module.cpp: - * ace/Msg_WFMO_Reactor.cpp: - * ace/Multiplexor.cpp: - * ace/NT_Service.cpp: - * ace/Name_Proxy.cpp: - * ace/Name_Request_Reply.cpp: - * ace/Name_Space.cpp: - * ace/Naming_Context.cpp: - * ace/OS.cpp: - * ace/Object_Manager.cpp: - * ace/Obstack.cpp: - * ace/POSIX_Proactor.cpp: - * ace/Pair.cpp: - * ace/Parse_Node.cpp: - * ace/Pipe.cpp: - * ace/Priority_Reactor.cpp: - * ace/Proactor.cpp: - * ace/Process.cpp: - * ace/Process_Manager.cpp: - * ace/Profile_Timer.cpp: - * ace/QoS_Manager.cpp: - * ace/QoS_Session_Factory.cpp: - * ace/QoS_Session_Impl.cpp: - * ace/Reactor.cpp: - * ace/Read_Buffer.cpp: - * ace/Registry.cpp: - * ace/Registry_Name_Space.cpp: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Tokens.cpp: - * ace/SOCK.cpp: - * ace/SOCK_Acceptor.cpp: - * ace/SOCK_CODgram.cpp: - * ace/SOCK_Connector.cpp: - * ace/SOCK_Dgram.cpp: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_IO.cpp: - * ace/SOCK_Stream.cpp: - * ace/SPIPE.cpp: - * ace/SPIPE_Acceptor.cpp: - * ace/SPIPE_Addr.cpp: - * ace/SPIPE_Connector.cpp: - * ace/SPIPE_Stream.cpp: - * ace/SString.cpp: - * ace/SV_Message.cpp: - * ace/SV_Message_Queue.cpp: - * ace/SV_Semaphore_Complex.cpp: - * ace/SV_Semaphore_Simple.cpp: - * ace/SV_Shared_Memory.cpp: - * ace/Sched_Params.cpp: - * ace/Select_Reactor.cpp: - * ace/Select_Reactor_Base.cpp: - * ace/Select_Reactor_T.cpp: - * ace/Service_Config.cpp: - * ace/Service_Manager.cpp: - * ace/Service_Object.cpp: - * ace/Service_Repository.cpp: - * ace/Service_Types.cpp: - * ace/Shared_Memory.cpp: - * ace/Shared_Memory_MM.cpp: - * ace/Shared_Memory_SV.cpp: - * ace/Shared_Object.cpp: - * ace/Signal.cpp: - * ace/Singleton.cpp: - * ace/Stats.cpp: - * ace/Strategies.cpp: - * ace/Strategies_T.cpp: - * ace/Stream.cpp: - * ace/Stream_Modules.cpp: - * ace/Svc_Conf.y: - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: - * ace/Svc_Handler.cpp: - * ace/Synch.cpp: - * ace/Synch_Options.cpp: - * ace/Synch_T.cpp: - * ace/System_Time.cpp: - * ace/TLI.cpp: - * ace/TLI_Acceptor.cpp: - * ace/TLI_Connector.cpp: - * ace/TLI_Stream.cpp: - * ace/TP_Reactor.cpp: - * ace/TTY_IO.cpp: - * ace/Task.cpp: - * ace/Task_T.cpp: - * ace/Thread.cpp: - * ace/Thread_Manager.cpp: - * ace/Time_Request_Reply.cpp: - * ace/Timeprobe.cpp: - * ace/Timer_Hash.cpp: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Heap.cpp: - * ace/Timer_Heap_T.cpp: - * ace/Timer_List.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_Queue.cpp: - * ace/Timer_Queue_Adapters.cpp: - * ace/Timer_Queue_T.cpp: - * ace/Timer_Wheel.cpp: - * ace/Timer_Wheel_T.cpp: - * ace/TkReactor.cpp: - * ace/Token.cpp: - * ace/Token_Collection.cpp: - * ace/Token_Invariants.cpp: - * ace/Token_Manager.cpp: - * ace/Token_Request_Reply.cpp: - * ace/Trace.cpp: - * ace/Typed_SV_Message.cpp: - * ace/Typed_SV_Message_Queue.cpp: - * ace/UNIX_Addr.cpp: - * ace/UPIPE_Acceptor.cpp: - * ace/UPIPE_Connector.cpp: - * ace/UPIPE_Stream.cpp: - * ace/WFMO_Reactor.cpp: - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Proactor.cpp: - * ace/XTI_ATM_Mcast.cpp: - * ace/XtReactor.cpp: - * include/makeinclude/ace_flags.bor: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - The definition of ACE_BUILD_DLL was moved from the .cpp files - to the project files - so it is now handled like most of the - other libraries in ACE and TAO. - -Tue Apr 18 21:32:21 2000 Douglas C. Schmidt - - * ace/OS.i (sema_init): Fixed another problem that required - a cast to ACE_mutexattr_t *. Thanks to Priyanka for - reporting this. - -Tue Apr 18 19:39:41 2000 Douglas C. Schmidt - - * ace/Synch.cpp, - * ace/OS.cpp: Added a cast to ACE_mutexattr_t *. Thanks to - Darrell for pointing this out. - -Tue Apr 18 15:18:53 2000 Douglas C. Schmidt - - * ace/OS.h, - * ace/OS.i, - * ace/Synch.h, - * ace/Synch.cpp: Updated the ACE_OS::*mutex_init() methods (and the - corresponding ACE_Thread_Mutex, ACE_Mutex, and - ACE_Recursive_Thread_Mutex classes) so that they now take an - optional ACE_mutexattr_t * rather than just a void *. This is - nice because it makes it possible to pass in special attributes, - such as the mutex prioceiling attribute, to the underlying - pthreads mutex (assuming we're running on pthreads, of course). - Thanks to lafortg@res.raytheon.com for motivating this. - - * ace/Containers_T.cpp (copy_nodes): Added a call to the - allocator->malloc() rather than new. Thanks to Umar Syyid - for reporting this. - -Tue Apr 18 14:06:32 2000 Jeff Parsons - - * ace/CDR_Stream.cpp: - Patch to ACE_CDR::consolidate() sent in by Carlos, that - fixes a bug reported by Harald Finster , - and an added check for 0 value of the 'length' arg in - read_array() and write_array(), that fixes [Bug 540], - reported by Mathew Samuel . - -Tue Apr 18 11:47:57 2000 Ossama Othman - - * ace/SOCK_Connector.cpp: - - Removed inclusion of `ace/Handle_Set.h'. The ACE_SOCK_Connector - doesn't directly use an ACE_Handle_Set. - - * ace/Makefile: - - Updated dependencies. - -Tue Apr 18 08:54:04 2000 Darrell Brunsch - - * bin/vc_filter.pl: - - Brand spankin' new filter script for Win32 auto build results. - -Sun Apr 16 22:24:34 2000 Douglas C. Schmidt - - * ACE-INSTALL.html: Updated the link for GNU make to be more - specific. Thanks to Xiaojun Wu for - reporting this. BTW, Xiaojun was the 900th contributor to - ACE+TAO, so he gets a free copy of ACE+TAO! - -Mon Apr 17 20:10:18 2000 Vishal - - * ACE version 5.1.1 released. - -Mon Apr 17 16:33:17 2000 Ossama Othman - - * acconfig.h (ACE_LACKS_ACE_OTHER, ACE_LACKS_ACE_SVCCONF, - ACE_LACKS_ACE_TOKEN): - - Added support for these macros. They are used when enabling - subsetting. - - * configure.in: - - lseek64() and llseek() test has been moved to - `m4/acinclude.m4'. - - Include `sys/types.h' when running the TLI/XTI tests. Some - platforms use typedefs such as "ulong" but such typedefs may not - be defined in the TLI/XTI headers. - - (ACE_HAS_BROKEN_T_ERROR): - - Corrected test for broken t_error(). A variable, "errmsg" was - being passed to the t_error() call in the test, but the variable - was declared as "ace_errmsg." Thanks to Roland Gigler - for pointing this out. - - (ACE_MAJOR, ACE_MINOR, ACE_BETA): - - If any of these variables is evaluates to the empty string, then - set it to zero. This fixes a problem that was occuring when the - the ACE version contained no beta number (e.g. "5.1" instead - "5.1.0"). Libtool didn't like the fact that one of the numbers - was an empty string. - - * ace/Makefile.am (libACE_IPC_la_SOURCES, libACE_Other_la_SOURCES, - HEADER_FILES, INLINE_FILES): - - Synchronized the sources associated with these Makefile - variables with those in the classical ACE Makefile. - - * m4/acinclude.m4 (ACE_CHECK_LSEEK64): - - Moved checks for lseek64() and llseek() from configure.in to - this file. The beginnings of a test for a 64 bit offset type - have also been added, but that test is currently not in use. - - * m4/ace.m4 (ACE_COMPILATION_OPTIONS): - - Removed check for exception support in C compiler. It didn't - make too much sense to check for exception support in a C - compiler. - - Since exception support is disabled by default, make sure - "-fno-exceptions" is set when using g++ with the default ACE - exception configuration value. - - * m4/compiler.m4 (ACE_SET_COMPILER_FLAGS): - - Fixed typos where "$GXX" was used instead of "$CXX." "$GXX" is - set to yes when GNU C++ is being used, and "$CXX" is set to the - compiler being used (e.g. "c++"). Thanks to Rich Seibel - for pointing this out. - - This also fixes a problem where "-fcheck-new" wasn't being added - to the C++ flags ($CXXFLAGS). - - * m4/subsets.m4 (ACE_LACKS_ACE_OTHER, ACE_LACKS_ACE_SVCCONF, - ACE_LACKS_ACE_TOKEN): - - When disabling the "Other," "SvcConf" and/or the "Token" subset, - then define the corresponding preprocessor macro. - -Sat Apr 15 21:49:04 2000 Darrell Brunsch - - * ace/ACE.cpp: - * apps/Gateway/Gateway/Options.cpp: - - Nick Pratt reported two cases where - we were using sizeof some_string to figure out its length. This - of course doesn't work when the string is a wide string, so they - have been changed to account for the character size. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf_lib.dsp: - - Changed around the order of the configurations so that in the - default case (such as out of the box) the regular Debug version - will be the current configuration. - -Sat Apr 15 19:35:57 2000 Darrell Brunsch - - (On behalf of Christopher Kohlhoff ) - - * ace/Makefile.bor: - - Added new file QoS_Manager.cpp. - - * ace/Basic_Types.h: - * ace/Timer_Queue_Adapters.h: - - Added missing pre/post includes. - - * include/makeinclude/ace_flags.bor: - * include/makeinclude/build_example.bor: - - Updated for new orbsvcs libraries. - -Sat Apr 15 18:17:02 2000 Douglas C. Schmidt - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp: - Fixed the handle_output() function so that it does the "Right - Thing"[TM] on Windows NT. Win32 Winsock doesn't trigger - multiple "You can write now" signals, so we have to assume that - we can continue to write until we get another EWOULDBLOCK. - Thanks to Nick Pratt - -Thu Apr 13 16:30:01 2000 David L. Levine - - * ace/config-sunos5.7.h: added #undef ACE_NEEDS_LWP_PRIO_SET. - SunOS 5.7 no longer needs it, as shown by - performance-tests/Misc/preempt (run as superuser). Thanks - to John Foresteire - for reporting this. - -Tue Apr 11 21:41:20 2000 Nanbor Wang - - * bin/auto_compile_win32.pl: Updated the lists of - workspaces/projects to build. - -Tue Apr 11 16:15:31 2000 David L. Levine - - * ace/OS.cpp: moved ACE_Thread_Exit::is_constructed_ - definition so that it's seen on all platforms, not just - those that are ACE_MT_SAFE. Fixes: - Mon Apr 10 07:30:22 2000 John Rodgers - Thanks to Vishal for reporting it. - -Tue Apr 11 13:57:11 2000 Douglas C. Schmidt - - * ace/Synch_T.cpp: Make sure to cast the "type" argument to - "short" to avoid overload confusions by certain compilers. - Thanks to Charles Taurines for reporting - this. - -Tue Apr 11 12:52:04 2000 Vishal Kachroo - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): Removed the #ifdef - for template instantiation. - -Tue Apr 11 11:32:03 2000 Chad Elliott - * bin/ACEutils.pm - - Refactored duplicate test code into ACEutils.pm - -Mon Apr 10 19:45:32 2000 Vishal Kachroo - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): Added a #ifdef to - get past a g++ error. I am looking into the right way to - do this. - -Mon Apr 10 17:37:53 2000 Nanbor Wang - - * ace/config-freebsd-pthread.h: Addplied John Aughey - 's patch for FreeBSD 4.0. - -Mon Apr 10 07:30:22 2000 John Rodgers - - * ace/OS.{h,cpp},Thread_Manager.cpp (instance,~ACE_Thread_Exit): - added a state variable, is_constructed_, to ACE_Thread_Exit. - instance () sets it, ~ACE_Thread_Exit () clears it. This - allows ACE::init () to be called after ACE::fini (), because - a new ACE_Thread_Exit instance will be created. [Bug 526] - -Sun Apr 9 14:16:23 2000 James CE Johnson - - * docs/tutorials/015/page01.html : Thanks to Conrad Hughes for - pointing out that a real implementation would compress before - encrypting since encrypted data shouldn't really be compressible - anyway. - - * docs/tutorials/015/Protocol_Stream.cpp (open): Reorder the - module pushing so that encryption happens before compression. - - * docs/tutorials/015/Crypt.cpp : - * docs/tutorials/015/Compressor.cpp : - Add a few extra bytes when creating the new message blocks. A - real implementation would probably need that. - -Sun Apr 09 00:04:25 2000 Nanbor Wang - - * ace/Malloc_T.cpp (remove): Removed invocation of destructor to - . It is a member of Control_Block and does not - require explicit initialization/destruction. This was causing - ACE not to compile when ACE_HAS_MALLOC_STATS was defined. - Thanks to John Smyder for reporting the - problem. - - * ace/Malloc_T.cpp (open): Removed invocation of contructor to - for the same reason. - -Fri Apr 07 23:32:16 2000 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added QoS_Manager.* into project files. - -Thu Apr 6 07:29:48 2000 Douglas C. Schmidt - - * ace/Token.h (ACE_Token): Clarified the recursive semantics of - ACE_Token. Thanks to Antti Valtokari - for reporting this. - -Wed Apr 5 22:59:58 2000 Douglas C. Schmidt - - * ace/config-sunos5.5.h: Moved the ACE_HAS_USING_KEYWORD into - the part of this header file that's enabled when - __SUNPRO_CC_COMPAT >= 5 is defined. Thanks to Susan Liebeskind - for reporting this. - -Tue Apr 4 23:50:02 2000 Douglas C. Schmidt - - * ace/ACE.cpp (sock_error): Changed "int error" to "ssize_t error" - to be consistent... - -Tue Apr 4 20:19:36 2000 - - * ace/Acceptor.cpp: Modified the implementation of - ACE_Acceptor::open() and ACE_Acceptor::accept_svc_handler() so - that the peer acceptor's handle is set into non-blocking mode. - This is a safe-guard against the race condition that can - otherwise occur between the time when indicates - that a passive-mode socket handle is "ready" and when we call - . During this interval, the client can shutdown the - connection, in which case, the call can hang! Thanks - to Irfan for pointing this out. - -Fri Jun 1 13:04:31 2001 Douglas C. Schmidt - - * ace/Makefile: - Removed the moc compiler path definition from ace/Makefile - since it is now in include/makeinclude/wrapper_macros.GNU - Thanks to Hans Utz for - reporting this. - - * include/makeinclude/wrapper_macros.GNU (YACC): Added the moc - compiler path definition to include/makeinclude/wrapper_macros.GNU - Thanks to Hans Utz for - reporting this. - - * ace/Timer_Wheel_T.cpp: Removed check to see if Timer_Wheel was - empty from earliest_time(). - - * ace/Timer_List_T.h, - * ace/Timer_Hash_T.h, - * ace/Timer_Heap_T.h, - * ace/Timer_Queue_T.h, - * ace/Timer_Wheel_T.h: - Added a comment to point out that earliest_time() can only be - called on a non-empty queue. Thanks to Gil Rapaport - for reporting this. - -Tue May 29 17:38:15 2001 Douglas C. Schmidt - - * ace/OS.h: Moved the VMIN and VMAX macros to the right place. - Thanks to Hans Utz for - reporting this. - -Fri Jun 1 16:11:42 2001 Balachandran Natarajan - - * ace/Acceptor.cpp (open): Enabled the socket to be non-blocking - mode in the ACE_Strategy_Acceptor::open () call. Thanks to Singh - Kirat , for reporting this through a problem - in TAO. - -Thu May 31 17:29:33 2001 Ossama Othman - - * tests/Refcounted_Auto_Ptr_Test.cpp: - - Removed duplicate template instantiation. Fixes a build error. - -Thu May 31 15:25:19 2001 Steve Huston - - * ace/Refcounted_Auto_Ptr.i (ACE_Refcounted_Auto_Ptr_Rep::detach): - If the object needs to be deleted, release the guard first to - avoid later unlocking a lock residing in memory that had been - freed and potentially reallocated. Thanks to Steve Witten - for noticing this bug, and Purify for making - it relatively easy to track down. - - * tests/Refcounted_Auto_Ptr_Test.cpp: Rearranged to verify things - which should happen, and improve the logging and thread rundown - sequence. - - * THANKS: Added Steve Witten to the Hall of Fame. - - * ACE-INSTALL.html: Fixed the section about how to build on AIX - to account for the new ace.icc file, and Visual Age C++ 5. - -Thu May 31 08:59:00 2001 Craig Rodrigues - - * ace/config-g++-common.h: - - Only define ACE_LACKS_AUTO_PTR for gcc versions <= 2.91 - -Wed May 30 23:54:27 2001 Yamuna Krishnamurthy - - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: - - Fixed the subscribe method so things worked even when no qos - was specified. - -Wed May 30 11:13:16 2001 Ossama Othman - - * ace/Singleton.cpp (instance): - - Integrated David's suggested changes that deal with potential - problems related to registering Singletons in the presence of - multiple ACE_Object_Manager instances. - -Wed May 30 00:37:57 2001 Ossama Othman - - * ace/Singleton.cpp (instance): - - Fixed memory leak that occured due to the singleton instance not - being registered with the ACE_Object_Manager when built without - thread support. Thanks to Kitty and David for helping with - this problem. - -Tue May 29 15:06:48 2001 Ossama Othman - - * include/makeinclude/platform_linux.GNU (CFLAGS, CPPFLAGS): - - Do not set preprocessor flags in the "CFLAGS" variable. They - should instead be set in the CPPFLAGS variable. The - preprocessor need not be the same as the compiler! - -Mon May 28 18:11:20 2001 Douglas C. Schmidt - - * ace/OS.i (mutex_init): Using pthreads and passing attributes - into mutex_init(), the function will always fail because the - local variable result is initialized to -1 and then tested - against 0. Thanks to Brodie Thiesfield - for this fix. - -Tue May 29 13:08:33 2001 Phil Mesnier - - * ace/Process.i (handle_inheritence): - * ace/Process.h: - - Exposed the interface for handle_inheritence to non-win32 builds to - allow it to be used as part of the solution to bug 902. Since this is - a win32 only feature, the method will invoke the NOTSUP macro to - document its use, but failure is benign, returning 0. This is part 3 - of the 3 part solution to bug 902. - -Mon May 28 18:43:51 2001 Steve Huston - - * tests/Thread_Pool_Reactor_Resume_Test.icc: Visual Age C++ config - for this new test. - - * tests/tests.icp: Added Thread_Pool_Reactor_Resume_Test.icc. - - * include/makeinclude/platform_aix_ibm.GNU: Added $(ACELIB) to - LIBS to get netsvcs stuff to build clean. Thanks to Erik - Toubro Nielsen for this fix. - - * THANKS: Added Erik Nielsen. - -Mon May 28 14:44:29 2001 Steve Huston - - * ace/Timer_Heap_T.{h cpp}: Add new member, cur_limbo_ to keep track - of timer entries removed from the heap, but not reclaimed (caller - must call either reschedule() or free_node() to finish up the - work). - - * ace/Timer_Queue_T.cpp (expire): When expiring a ACE_Timer_Node, - either reschedule it or free it prior to doing the upcall. - This necessitates having a copy of the TYPE element, not a - reference. In the vast majority of cases, this is an - ACE_Event_Handler pointer, and should make no difference in - performance. - -Sat May 27 10:40:27 2001 Yamuna Krishnamurthy - - * ace/QoS/QoS_Session_Impl.cpp: - - Added an adhoc fix for propagating the right service type when - a PATH message is received. - -Sat May 26 16:36:27 2001 Krishnakumar B - - * bin/auto_run_tests.lst: - - Switched off TAO/examples/PluggableUDP/tests/Basic/run_test.pl - from the Single Threaded builds. Added - TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl - instead to run on all the builds. - -Fri May 25 20:51:33 2001 Christopher Kohlhoff - - * netsvcs/build.bor: - Changed contents of file back to its original state. - -Fri May 25 13:38:21 2001 Douglas C. Schmidt - - * ace/Message_Block.h: Added a better explanation of what "crunch()" - does. Thanks to Masaoud T. Moonim for - motivating this. - -Fri May 25 19:06:51 2001 Irfan Pyarali - - * ace/Map_T.i (create_key): Added a new method to the maps. This - method allows the user to create a key without binding to the - map. For the linear and hash maps, this call simply forwards to - the key generators. This method is not supported by the active - map since the key encodes the slot position which cannot come - without occupying a slot in the map. - -Fri May 25 08:37:37 2001 Jeff Parsons - - * ace/Message_Block.cpp: - - Fixed an error in ACE_Data_Block::clone, where ACE_NEW_RETURN - is used without a constructor as one of the arguments. Besides, - it is a mistake to allocate, because the call to clone_nocopy - has already done an allocation. All we need to do is check for - a 0 return from clone_nocopy. - -Fri May 25 05:42:39 2001 Douglas C. Schmidt - - * ace/Message_Block.cpp (clone): Make sure to check for memory failure - and return 0 in this case. Thanks to Airat A. Sadreev - for reporting this. - -Thu May 24 22:06:45 2001 Sharath R. Cholleti - - * tests/CDR_Test.cpp: Changed the initialization of WChar variable, to - remove the warning "integer conversion resulted in a change of sign" - by some compilers. - -Thu May 24 20:26:39 2001 Steve Huston - - * ace/Timer_Heap_T.{h cpp}: Fixed some problems in managing the - free timer ID list. - - * ace/Timer_Hash_T.cpp (expire): Changed this to peek at the first - timer node from each table, do reschedule iterative timers, and - do the upcall, then _cancel_ the original, rather than try to - manage a remove_first()/reschedule-or-free sequence. The ID - assigned by the underlying table is not important, since its not - seen by the ACE_Timer_Hash_T caller anyway, and that's the main - impetus for using remove_first/reschedule (or free_node). - - * tests/Timer_Queue_Test.cpp (test_functionality): Added a test - to verify empty timer queue after adding/removing two timers - right at the start. - -Thu May 24 12:15:35 2001 Douglas C. Schmidt - - * ace/OS.h: Added #defines for RTLD_LAZY, RTLD_NOW, RTLD_GLOBAL. - Thanks to Kobi Cohen-Arazi for suggesting - this. - - * ace/OS.h: Updated the ACE_Time_Value class to point out that the - values are in secs and usecs. Thanks to Israel Illescas Gomez - for motivating this. - -Thu May 24 18:08:27 2001 Steve Huston - - * tests/run_test.lst: Re-enable MT_Reactor_Timer_Test. - -Thu May 24 15:34:48 2001 Nanbor Wang - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: Changed to - to avoid warnings on some platforms. is not safe - to use. - -Thu May 24 15:28:19 2001 Krishnakumar B - - * bin/auto_run_tests.lst: - - Removed this test from being run on single-threaded configurations - since this test uses the ACE_Thread_Manager. - -Thu May 24 15:12:16 2001 Krishnakumar B - - * ace/config-tru64.h: - - Added ACE_HAS_NONSTATIC_OBJECT_MANAGER to the default builds to - work around hangs in some of the tests which load a dynamic - library. This fixes some more of the problems reported in Bug Id - 912. - -Thu May 24 13:42:24 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst: We dont have Red Hat 7.0 - anymore. So changed it as Red Hat 7.1. - -Thu May 24 10:51:45 2001 Balachandran Natarajan - - * tests/Thread_Pool_Reactor_Resume_Test.dsp: - * tests/tests.dsw: Files for Win32. - -Thu May 24 10:35:45 2001 Balachandran Natarajan - - * tests/Thread_Pool_Reactor_Resume_Test.cpp - * tests/Thread_Pool_Reactor_Resume_Test.h: A new test that tests - the resumption of handler at the application level. This test is - an adaptation of the famous Thread_Pool_Reactor_Test. - - * tests/Makefile: Added the test for compilation. - * tests/run_test.lst: Added the above test for the nightly - builds. - -Thu May 24 10:26:35 2001 Balachandran Natarajan - - * tao/Event_Handler.cpp: - * tao/Event_Handler.h: A starter for bug #575. Please see the - documentation of bug 575 for details of this change. In short - the Event Handler class has an extra method called - resume_handler (). Applications that use the TP_Reactor and - would like to take control of resuming the handler can overload - this method in their implementation and return a value other - than zero. - - * tao/TP_Reactor.cpp: Added a check by calling the resume_handler - () on the event handler object before resuming the handler. - -Wed May 23 16:35:15 2001 Douglas C. Schmidt - - * ace/Sock_Connect.h, - * ace/Flag_Manip.h, - * ace/config-all.h: Make sure that all ACE include file have a - "ace/" prefix. Thanks to John Lindal for - reporting this. - - * ace/config-win32-common.h: Fixed a problem where FD_SETSIZE wasn't - getting reset properly. Thanks to Roger Tragin - for reporting this. - -Wed May 23 17:37:30 2001 Krishnakumar B - - * bin/auto_run_tests.lst: - * tests/run_test.lst: - - Removed some tests from being run on Single Threaded - Configuration as they were spawning threads. The tests removed - are: - - TAO/performance-tests/AMI_Latency/run_test.pl - TAO/tests/AMI_Timeouts/run_test.pl - and - tests/Logging_Strategy_Test - - This is related to Bug Id 912. - -Wed May 23 17:33:59 2001 Krishnakumar B - - * bin/make_pretty.pl: - - Seems to have missed my previous update. Add the code to remove - the bogus warning associated with SunCC5. Check the ChangeLog - tag Mon May 21 16:37:18 2001 Krishnakumar B - for more. - -Wed May 23 18:22:41 2001 Steve Huston - - * ace/Reactor.cpp (run_reactor_event_loop (ACE_Time_Value&, eh)): - It is possible for rounding/conversion fudges in calculating - the WFMO/select wait time to cause the wait to time out, but the - timer queue be not quite ready to expire the next timer. In this - case, the ACE_Time_Value won't have been reduced to 0, so the - handle_events call is repeated. Fixes Bugzilla # 153. - -Wed May 23 15:55:21 2001 Steve Huston - - * ace/Containers_T.h: Fixed comment directing reader to include - ace/Unbounded_Queue.h (rather than _Set.h) for ACE_Unbounded_Queue. - - * ace/Timer_Heap_T.{cpp h}: Changed the free IDs list from a stack - to a round-robin list. Newly-allocated IDs keep increasing til - there aren't any more, then wrap around to the lowest numbered - free ID and start again. This is a ease-of-use improvement to - help applications catch their timer-related errors easier, - which is apparantly important, especially in multi-threaded - applications. - Also, when remove_first() is called, remove the ACE_Timer_Node - from the heap, but do not release its ID back to the free list. - remove_first() must be followed by a call to reschedule() or - remove(). The latter just reinserts the timer node in the heap, - and the latter cleans up the timer ID. - -Wed May 23 14:41:00 2001 Balachandran Natarajan - - * netsvcs/ACE-netsvcs.html: - * netsvcs/Makefile: - * netsvcs/Makefile.am: - * netsvcs/Makefile.bor: - * netsvcs/README: - * netsvcs/build.bor: Resurrected the files from the repo. - -Wed May 23 11:13:00 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Removed TAO/performance-tests/Latency from the nightly builds. - This test has been superseeded by Single_Threaded_Latency and - friends. In fact it is no longer used to generate performance - results. - This is part of the fixes for [BUGID:324] - -Tue May 23 11:53:24 2001 Paul Calabrese - - * docs/exceptions.html: Fix bad reference to OCI devguide: - the link was broken and the chapter # was incorrect. - -Wed May 23 8:23:20 2001 Yamuna Krishnamurthy - - * ace/QoS/QoS_Session.h: - * ace/QoS/QoS_Session_Impl.h: - * ace/QoS/QoS_Session_Impl.cpp: - - Added a method to propagate the rsvp event type to the application. - -Wed May 23 06:52:44 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst: Moved the FORTE builds to ace. - -Tue May 22 21:57:46 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst: Added NO_AMI_MESSAGING to the - builds. - -Mon May 21 18:34:52 2001 Douglas C. Schmidt - - * include/makeinclude/platform_linux.GNU: Added default macros for: - - PLATFORM_QT_LIBS - PLATFORM_QT_LDFLAGS - PLATFORM_QT_LDFLAGS - - Thanks to Hans Utz for - contributing this. - - * performance-tests/Misc/Makefile (LDLIBS): Added back - -lPerf. Thanks to Hans Utz for - reporting this. - -Mon May 21 16:37:18 2001 Krishnakumar B - - * ace/OS.h: - * ace/Timer_Queue_Adapters.cpp: - * bin/make_pretty.pl: - - Changed the make_pretty script to remove the false warning on - SunCC5. Added documentation in the affected files. This fixes - Bug Id 879. - -Sun May 20 08:48:59 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst: Added FORTE 6.1 to the list. - -Sun May 20 07:37:26 2001 Balachandran Natarajan - - * ace/POSIX_Proactor.cpp: Fixed a compile error with g++. - -Sun May 20 01:38:59 2001 Nanbor Wang - - * ace/config-freebsd-pthread.h: - * ace/POSIX_Proactor.cpp: Applied patches from Russell L. Carter - that introduce FreeBSD 4.3 to AIO - (compiling at least). [Bug 917] - -Sat May 19 10:28:56 2001 Balachandran Natarajan - - * bin/make_pretty.pl: Ignore the mktemp () messages on Linux. - -Fri May 18 20:58:59 2001 Ossama Othman - - * bin/auto_run_tests.lst: - - Added TAO's security tests to the list of tests to run in the - nightly builds. They will only be run on platforms that support - the "SSL" build configuration. - -Fri May 18 14:39:31 2001 Steve Huston - - * ace/config-aix-4.x.h: Removed ACE_LACKS_SETSCHED for AIX 4.3. - Fixes Bugzilla # 47. - - * ace/OS.h: AIX's ACE_THR_PRI_*_{MIN MAX} values are 1 and 127, - respectively. PRIORITY_{MIN MAX} are process priorities, - and the range is not legal for pthread_attr_setschedparam. - - * ace/Makefile.vac: - * tests/Makefile.vac: Use -sev=w instead of -severity=warning - to avoid tripping the scoreboard error detector unnecessarily. - -Fri May 18 10:50:55 2001 Jeff Parsons - - * Configuration.cpp: - - Reverted a change made to the validate_name() function that - added '/' as an illegal character. This breaks the Interface - Repository completely. - -Fri May 18 06:11:49 2001 Douglas C. Schmidt - - * ace/config-cxx-common.h: Changed - # if defined (DIGITAL_UNIX) && DIGITAL_UNIX >= 0x40F - to: - # if defined (DIGITAL_UNIX) && DIGITAL_UNIX >= 0x40D - This gets rid of a very annoying informational message. Thanks - to Steve Vranyes for reporting this - - * ace/config-tru64.h: Changed 0x40E to 0x40D in the check for - DIGITAL_UNIX to disable the use of systime.h. Thanks to - Steve Vranyes for reporting this - and for David Levine for suggesting the fix. - -Thu May 17 23:36:18 2001 Ossama Othman - - * bin/auto_run_tests.lst: - - Added TAO's Request_Interceptor_Flow test to the list of tests - to run in the nightly builds. - -Fri May 18 01:31:47 2001 Irfan Pyarali - - * ace/Timeprobe.h: Reordered the include files: Timeprobe_T.h - should come after Synch.h. Thanks to Bruce McIntosh - for reporting this - problem. - -Fri May 18 00:36:35 2001 Irfan Pyarali - - * ace/Map_Manager.cpp (unbind_all): Added a new method that - unbinds all entries in the map. Also, refactored out some code - into unbind_slot(). - - BTW, this functionality is somewhat redundant since one can also - do the following: - - // Unbind one at a time. - MAP_MANAGER::iterator end = map.end (); - while (1) - { - MAP_MANAGER::iterator iter = map.begin (); - if (iter == end) - break; - map.unbind ((*iter).ext_id_); - } - - However, the following should be much faster: - - // Unbind in one swoop. - map.unbind_all (); - - Another reason to add the unbind_all() is that the method is - available on the other map_managers and that it is now easier to - convert a hash map to a normal map and back without changing any - real code. - - * tests/Map_Manager_Test.cpp (test_map_manager): Added test for - unbind. - - Thanks to Johnny Willemsen for - suggesting this. - -Thu May 17 21:34:28 2001 Douglas C. Schmidt - - * ace/POSIX_Asynch_IO.cpp: Added an ACE_UNUSED_ARG to keep G++ - happy. - -Thu May 17 16:52:17 2001 Priyanka Gontla - - * tests/CDR_File_Test.cpp (run_test): - Modified ACE_OutputCDR instantiation to follow the new modified - constructor. - -Thu May 17 17:01:11 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst: Re-enabled Core and Full builds on - RedHat 7.1. - -Thu May 17 14:36:57 2001 Douglas C. Schmidt - - * ace/Asynch_IO.cpp - ace/Asynch_IO.h - ace/Asynch_IO_Impl.cpp - ace/Asynch_IO_Impl.h - ace/Asynch_IO_Impl.i - ace/POSIX_Asynch_IO.cpp - ace/POSIX_Asynch_IO.h - ace/POSIX_Asynch_IO.i - ace/POSIX_Proactor.cpp - ace/POSIX_Proactor.h - ace/POSIX_Proactor.i - ace/Proactor.cpp - ace/Proactor.h - ace/Proactor_Impl.h - ace/WIN32_Asynch_IO.cpp - ace/WIN32_Asynch_IO.h - ace/WIN32_Proactor.cpp - ace/WIN32_Proactor.h: Added more fixes and improved comments - from Roger Tragin . - - * ace/SString.cpp: Fixed a bug in the check_allocate() method. - Thanks to Wayne Erchak for reporting this. - -Thu May 17 12:16:57 2001 Priyanka Gontla - - * ace/CDR_Stream.h (ACE_InputCDR): - * ace/CDR_Stream.cpp: - Modified so that even the Message_Block_Allocators are also - allocated from TSS memory. The constructor of ACE_OutputCDR - changes. - -Thu May 17 11:51:03 2001 Carlos O'Ryan - - * include/makeinclude/rules.local.GNU: - Removed misuse of CC_OUTPUT_FLAG in the middle of an 'if' shell - statement. Chances are that this was the result of a global - search and replace. Thanks to Cristian Ferretti - for pointing this out. - -Thu May 17 12:43:26 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst: Removed the beguine builds for - some time till we get Redhat machine in place. - -Thu May 17 11:36:02 2001 Douglas C. Schmidt - - * ace/Configuration.cpp: Fixed an inconsistency in the - enumerate_sections() method so that - ACE_Configuration_Win32Registry and ACE_Configuration_Heap will - behave the same. ACE_Configuration_Win32Registry was returning - -2 upon no more sections to enumerate, rather than 1. This is - because it is not checking for a return of ERROR_NO_MORE_ITEMS - from ACE_TEXT_RegEnumKeyEx. Thanks to Kevin Burge - for reporting this. - -Thu May 17 10:46:31 2001 Chad Elliott - - * bin/nightlybuilds/builds.lst: - - Adding the HP-UX 11.00 build back to the list. - -Thu May 17 10:16:03 2001 Douglas C. Schmidt - - * ace/POSIX_Asynch_IO.{h,cpp}: There are some weird inconsistencies - between the declaration and definition of the recv() methods in - ACE_POSIX_SIG_Asynch_Read_Dgram and - ACE_POSIX_AIOCB_Asynch_Read_Dgram. I've made a fix that - compiles, but we need feedback from Roger Tragin to really fix - this... - -Thu May 17 10:00:59 2001 Frank Hunleth - - * ace/Proactor_Impl.h: - Added interfaces for create_asynch_read_dgram_result and - create_asynch_write_dgram_result. - -Thu May 17 06:23:59 2001 Douglas C. Schmidt - - * ace/Proactor_Impl.h: Added two missing factory methods to - ACE_Proactor_Impl. Thanks to Bala for reporting this. - - * ace/WIN32_Proactor.h (ACE_WIN32_Proactor): The signal_number - parameter was missing. Thanks to Andy Gokhale for reporting this. - -Thu May 17 06:23:59 2001 Douglas C. Schmidt - - * ace/Asynch_IO.cpp - ace/Asynch_IO.h - ace/Asynch_IO_Impl.cpp - ace/Asynch_IO_Impl.h - ace/Asynch_IO_Impl.i - ace/POSIX_Asynch_IO.cpp - ace/POSIX_Asynch_IO.h - ace/POSIX_Asynch_IO.i - ace/POSIX_Proactor.cpp - ace/POSIX_Proactor.h - ace/POSIX_Proactor.i - ace/Proactor.cpp - ace/Proactor.h - ace/WIN32_Asynch_IO.cpp - ace/WIN32_Asynch_IO.h - ace/WIN32_Proactor.cpp - ace/WIN32_Proactor.h: Added Async IO support for UDP dgrams - on NT so they can be used via the Proactor. Thanks to - Roger Tragin for contributing this. - -Wed May 16 22:43:19 2001 Steve Huston - - * ace/Synch.i (ACE_Mutex::remove): Properly clean up the shared - memory object and file backing for interprocess mutex. - - * tests/run_test.lst: Added Config_Test so run_test.pl runs it. - -Wed May 16 18:30:42 2001 Steve Huston - - * tests/Config_Test.cpp: Added a test to verify the ability to set - a new integer value. - -Wed May 16 17:05:29 2001 Sharath R. Cholleti - - * ace/CDR_Stream.cpp: - - In ACE_OutputCDR::write_wchar(), casting int to ACE_CDR::Octet and - passing the pointer to that to write_1() instead of casting the - pointers - to avoid little Endian and big Endian issues. Thanks to - Krishnakumar B in tracking this. - - * tests/CDR_Test.cpp: - - Added test for writing and reading ACE_CDR::WChar. - -Wed May 16 14:51:37 2001 Douglas C. Schmidt - - * tests/Config_Test.cpp: Updated this test to include Chris - Hafey's improvements. - - * ace/Configuration.{h,cpp}, - * ace/Configuration_Import_Export.cpp: Added a number of fixes from - Chris Hafey and Jonathan Reis that had been lost when Jerry - Odenwelder added his changes. - -Wed May 16 09:49:29 2001 Steve Huston - - * ace/ACE.cpp (handle_timed_complete): On Win32, interpret exception - handle bit set as failure, regardless of what getsockopt says about - an error. NT always reports 0 for error. - - * tests/SOCK_Connector_Test.cpp: Changed some LM_DEBUG to LM_ERROR and - LM_WARNING to more easily interpret the log file. - -Wed May 16 02:40:00 2001 Michael Kircher - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - - Added the PPC 403 CPU to the list of supported CPUs. - -Tue May 15 20:37:31 2001 Steve Huston - - * ace/Process_Mutex.{h cpp inl}: (Follow up to Thu May 10 change - later reverted on Mon May 14). Changed the preprocessor macros - that select use of ACE_SV_Semaphore_Complex over ACE_Mutex - as the underlying mechanism for ACE_Process_Mutex. If - ACE_HAS_SYSV_IPC is set in config.h, ACE_SV_Semaphore_Complex - is used, unless the new macro ACE_USES_MUTEX_FOR_PROCESS_MUTEX - is also set. If ACE_HAS_SYSV_IPC is not enabled, ACE_Mutex - is used, regardless of any other setting. - Also, doxygen-ized the member function comments. - - * ace/Malloc.h: If ACE_Process_Mutex is to be used with - ACE_HAS_MALLOC_STATS, include ace/Process_Mutex.h, not Synch_T.h. - - * tests/libDLL_Test.icc: Changed this to correctly generate shr.o, - not libDLL_Test.o, for insertion into libDLL_Test.a. This lets - it get picked up correctly from DLL_Test. - -Tue May 15 18:00:49 2001 Steve Huston - - * ace/config-win32-common.h: Added support for a new config macro, - ACE_NO_WIN32_LEAN_AND_MEAN. If this is set, WIN32_LEAN_AND_MEAN - will not be defined before including windows.h. This is needed - when code makes use of non-lean things like COM, which get - included only when WIN32_LEAN_AND_MEAN is not defined. - - * ace/README: Added description of ACE_NO_WIN32_LEAN_AND_MEAN. - - * bin/make_pretty.pl (is_error): Don't report AIX's ld message to - please check the -bloadmap as an error. It gets generated when - there are multiple defines, which we filter out, so we don't - want to see this follow-up message either. - -Tue May 15 10:14:56 2001 Balachandran Natarajan - - * ace/OS.i (mmap): Added an extra check for an empty - string. Thanks to Edan Ayal for reporting - this problem and suggesting an easy fix. - -Mon May 14 22:38:06 2001 Balachandran - - * ACE version 5.1.16 released. - -Mon May 14 14:45:57 2001 Balachandran Natarajan - - * ace/CDR_Stream.h (ACE_InputCDR): Somehow the removed - steal_data () got back into the header file. Removed the - method. - -Mon May 14 11:02:20 2001 Balachandran Natarajan - - * ace/Strategies_T.i: Removed the ACE_ERROR statement from the - destructor of ACE_Accept_Strategy. This created problems when - the destructor was called during shutdown if the object was - statically allocated. Thanks to Jonathan Reis - for reporting this problem. - -Mon May 14 07:48:16 2001 Balachandran Natarajan - - * ace/Process_Mutex.{h,cpp,inl}: Reverted the change "Thu May 10 - 18:37:41 2001 Steve Huston ". The change - was breaking SHMIOP in TAO. - -Fri May 11 10:25:00 2001 Douglas C. Schmidt - - * ace/OS_Dirent.h (ACE_OS_Dirent): Missed a conversion of "DIR" to - "ACE_DIR". - - * ace/Synch.cpp (get_nesting_level): Added better protection for the - case where ACE_HAS_RECURSIVE_MUTEXES -- only return - RecursionCount if ACE_WIN32 is defined. Thanks to Corey Trager - for reporting this. - - * ace/OS.cpp: Reformatted all the ACE_reinterpret_cast() macros so their - arguments are on the same line to avoid tickling a bug with - SunC++'s preprocessor. Thanks to Corey Trager - for reporting this. - -Fri May 11 07:14:50 2001 Balachandran Natarajan - - * tests/CDR_Test.cpp: Reverted this change "Wed May 9 23:19:30 - 2001 Sharath R. Cholleti " - -Fri May 11 06:47:33 2001 Balachandran Natarajan - - * tests/ARGV_Test.cpp: One of those extra ")". - -Fri May 11 06:14:58 2001 Douglas C. Schmidt - - * ace/Dirent.h (ACE_Dirent), - * ace/OS.cpp (uname), - * ace/OS.h (ACE_OS), - * ace/OS.i (hostname), - * ace/OS_Dirent.cpp (readdir_emulation), - * ace/OS_Dirent.h (ACE_OS_Dirent), - * ace/OS_Dirent.inl (ACE_OS_Dirent), - * ace/config-win32-common.h (ACE_LACKS_STRUCT_DIR), - * apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.cpp (Notification_Receiver_Handler), - * apps/Orbix-Examples/Logger/Logger.cpp (Logger), - * bin/envinfo.cpp (main), - * examples/Reactor/Multicast/Log_Wrapper.cpp (open), - * performance-tests/Misc/basic_perf.cpp (main), - * tests/Dirent_Test.cpp (main), - * tests/Enum_Interfaces_Test.cpp (main), - * tests/SOCK_Connector_Test.cpp (find_another_host): - Updated all of ACE and its tests to use ACE_DIR rather than DIR - to avoid conflicts with other programs (like Perl) that also - define an enumation with DIR. Thanks to Gonzo Diethelm - for contributing these fixes. - - The following fixes are all thanks to Ingo Dahm - - * ace/config-sunos5.6.h: Added support for SunC++ 5.2. - * ace/IOStream.h: Added support for SunC++ 5.2. - * ace/config-sunos5.8.h: Added Solaris 8 support for native - POSIX RW locks. - * include/makeinclude/platform_sunos5_sunc++.GNU: Added support - for Sun C++ 5.2. - -Thu May 10 19:33:03 2001 Carlos O'Ryan - - * tests/ARGV_Test.cpp: - Fixed argv, it should be an ACE_TCHAR, add missing ACE_TEXT() - and removed superfluous one. - -Thu May 10 18:19:09 2001 Carlos O'Ryan - - * ACE-INSTALL.html: - Add documentation for the mingw support, thanks Cristian Ferretti - for providing this info. - -Thu May 10 16:55:20 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Add the new Latency and Throughput tests to the nightly - regression testsuite. - -Thu May 10 18:37:41 2001 Steve Huston - - * ace/POSIX_Asynch_IO.cpp (ACE_POSIX_Asynch_Result ctor): Added - initializers for bytes_transferred_ and error_. Thanks to - Itzhak Briskman for this fix. - - * THANKS: Added Itzhak Briskman to the Hall of Fame. - Updated David Brock's email address. - - * ace/SString.cpp (ACE_CString::substring): If requesting a substring - longer than the string is, return only what's left. Thanks to - David Brock for reporting this. - - * tests/SString_Test.cpp: Add a substring extraction test to catch - the above problem (returning a substring with more than is left - in the original string). - - * ace/Process_Mutex.{h cpp inl}: Changed the "uses mutex" vs - "uses SV_Semaphore_Complex" decision to make use of a private - macro defined in Process_Mutex.h. Further, the platforms that - use mutexes are now Win32, PSOS, Pthreads, Sthreads. - - * ace/config-sunos5.6.h: - * ace/config-hpux-11.00.h: Added ACE_HAS_SHM_OPEN since these - platforms support shm_open, and ACE_Mutex wants to use it for - cross-process mutexes. - - * ace/Proactor.h: Updated handle_events comments to note that the - ACE_Time_Value is relative and is updated before return. - - * ace/Synch.(h cpp) (ACE_Mutex): Added ACE_HAS_PTHREADS and - ACE_HAS_STHREADS to the platforms which handle inter-process mutex - by allocating it in shared memory. - - * tests/Process_Mutex_Test.cpp: Made the child process create an - exclusive access file after acquiring the mutex and delete it - before releasing. If the file can't be created, it means the - mutex is acquired twice, and that's a no-no. - When the parent is checking child process exit, also check the - status - if the child exited with something other than 0 status, - note that so the test procedure will see a LM_ERROR in the log - and flag it. - - * tests/MEM_Stream_Test.cpp: Changed some debug text to match the - function it is in. - - * ace/Parse_Node.{h cpp}: Handle dynamic libraries using ACE_DLL, - not ACE_OS::dlopen, etc. and handles. This is a proper refactoring - of the code (ACE_DLL didn't exist when this was first written) - and is needed to properly support dynamic services on AIX. - - * ace/DLL.cpp (open): (AIX only) If the dlopen fails and we're - trying to open an archive lib, tack on "(shr.o)" and retry - with the RTLD_MEMBER option set in the mode. This is to - properly support AIX shared libraries which get built as - .o files and loaded into an archive. - -Thu May 10 16:12:02 2001 Douglas C. Schmidt - - * ace/ACE.cpp (timestamp): The abbreviation of thursday should be - "Thu" not "Thr". Thanks to Munagala Ramanath - for pointing this out. - -Thu May 10 10:06:57 2001 Carlos O'Ryan - - * tests/tests.dsw: - * tests/ARGV_Test.dsp: - Add project file for ARGV_Test, thanks to Cristian Ferretti - for pointing this out. - -Thu May 10 06:36:08 2001 Balachandran Natarajan - - * tests/CDR_File_Test.cpp: Fixed a compile error with g++. - -Thu May 10 08:13:12 2001 Johnny Willemsen - - * tests/Makefile.bor - * tests/Misc/Makefile.bor - * tests/Naming/Makefile.bor - * tests/Reactor/Makefile.bor - * tests/Reactor/Dgram/Makefile.bor - * tests/Reactor/Ntalker/Makefile.bor - * tests/Registry/Makefile.bor - * tests/Synch/Makefile.bor - - Added or updated the above BCB makefiles so that the tests are - build with BCB - -Wed May 9 23:19:30 2001 Sharath R. Cholleti - - * ace/CDR_Streams.h: - * ace/CDR_Streams.cpp: - * ace/CDR_Streams.i: - * ace/CDR_Base.h: Changed the WChar implementation to suit GIOP - 1.2. - - * tests/CDR_Test.cpp:Added test for wchar. - - Thanks to Bala (bala@cs.wustl.edu) for helping me out. - -Wed May 9 16:06:34 2001 Balachandran Natarajan - - * ace/TTY_IO.cpp (control): - * ace/OS.h: Corrected this change "Wed May 9 14:03:01 2001 - Douglas C. Schmidt". The problem was with the definition of the - macro ACE_VTIME. Looks more like a cut and paste error. - -Wed May 9 16:00:22 2001 Balachandran Natarajan - - * ace/OS.h: - * ace/TTY_IO.cpp: Reverted this change "Wed May 9 14:03:01 2001 - Douglas C. Schmidt". - -Wed May 9 14:03:01 2001 Douglas C. Schmidt - - * ace/TTY_IO.cpp (control): Use the new ACE_VMIN and ACE_VTIME - macros. Thanks to Hans Utz for - suggesting this. - - * ace/OS.h: Added support for the new ACE_VMIN and ACE_VTIME - macros. Thanks to Hans Utz - for suggesting this. - -Wed May 9 14:25:35 2001 Balachandran Natarajan - - * THANKS: Added Darren Griffith - to the hall of fame. - -Wed May 9 11:40:06 2001 Carlos O'Ryan - - * ace/OS.i: - Don't use OpenFileMapping for WindowsCE. - - * ace/OS.i: - * ace/config-win32-mingw.h: - Use the /**/ trick for #includes with angle brackets, otherwise - the Embedded C++ compiler gets angry. - -Wed May 09 10:02:10 2001 Balachandran - - * ACE version 5.1.15 released. - -Mon May 7 07:14:08 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Commented out OctetSeq test from running - in static configurations. - -Mon May 7 06:40:44 2001 Douglas C. Schmidt - - * examples/Shared_Memory/test_SV.cpp: Cast SHM_KEY to (key_t) to - make BCB happy. Thanks to Johnny Willemsen for this. - -Sat May 5 15:30:40 2001 Douglas C. Schmidt - - * THANKS: Just added the 1,200th contributor to the ACE+TAO. - Thanks to Alexandre Cervieri - for helping us hit a new milestone! - -Sat May 5 08:51:23 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst: Just commented the HP_UX - builds. OCI seems to be having problems with their HP - machine. We will get it online once the builds start running. - -Sat May 5 08:01:30 2001 Douglas C. Schmidt - - * tests/Thread_Mutex_Test.cpp: Added a series of tests that exercise - the new functionality of the ACE_Guard. Thanks to Christopher - Kohlhoff for providing the enhancements. - -Fri May 4 15:42:20 2001 Craig Rodrigues - - * ace/OS.h - Changed ACE_SERVICETYPE_CONTROLLEDLOAD from 2 to 1 - This is necessary to work with RAPI. - -Fri May 4 06:28:19 2001 Douglas C. Schmidt - - * ace/OS.h: Changed the typedefs of uid_t, gid_t, and mode_t to - match those in standard POSIX. Thanks to Gonzalo Diethelm - for reporting this. - -Fri May 4 06:28:19 2001 Douglas C. Schmidt - - * ace/ace_wchar.h: Add a new macro (ACE_USES_L_PREFIX) that allows - users to control whether wide character strings use the "L" - prefix via their config.h files. Thanks to Albert Wijnja for - this fix. - - * examples/Misc/test_read_buffer.cpp (main): Changed to - so this will work properly on Win32 platforms. - Thanks to Johnny Willemsen for reporting the problem. - - * examples/Misc/test_XtReactor2.cpp (main): Fixed a stray ')'. - Thanks to Johnny Willemsen for reporting the problem. - -Thu May 3 17:33:45 2001 Douglas C. Schmidt - - * ace/OS.h: Fixed a mistake in the setsockopt() comment. Thanks - to Craig Rodrigues for reporting this. - -Thu May 3 17:43:33 2001 Balachandran Natarajan - - * ace/Acceptor.cpp (ACE_Acceptor): Fixed a warning in g++ builds. - -Thu May 3 16:00:15 2001 Nanbor Wang - - * ace/Malloc.h: - * ace/PI_Malloc.h: Fixed the [PI_]Control_Block size estimation - macros. I added a new member to control block. - -Thu May 3 14:52:33 2001 Balachandran Natarajan - - * ace/CDR_Stream.h (ACE_InputCDR): - * ace/CDR_Stream.cpp: Removed the method steal_data () as it did - not serve the purpose. Added a new method exchange_data_blocks - (). This method exchanges data_blocks between two CDR - streams. The write and read pointers are also exchanged. This - method performs no allocation and no releases and is lock free. - -Thu May 3 06:58:29 2001 Douglas C. Schmidt - - * ace/Acceptor.{h,cpp}, - * ace/SOCK_Acceptor.{h,cpp}: When the number of clients - connecting to a server exceeds the process handle limit the - server would busy loop. The Acceptor accept_svc_handler() - method is called which (1) constructs a handler and (2) attempts - to accept the connection, which fails (because there is no - available handle). The handler is destructed, but the connect - request is still queued and so the acceptor gets called back - again.... and so on until one of the client which is already - connected disconnects and frees up a descriptor. Changed the - Acceptor the close and reopen the connection when accept() - fails. A check is done to make sure address reuse is set. So - this fix will only work in case where it is set. Thanks to - Dominic Hughes for this fix. - - * ace/Unbounded_Queue.h: The comment was incorrect for - ~ACE_Unbounded_Queue. Thanks to Johnny Willemsen for - reporting this. - -Thu May 3 08:00:56 2001 Balachandran Natarajan - - * examples/ASX/Event_Server/Event_Server/Options.cpp: - * examples/ASX/UPIPE_Event_Server/Options.cpp: Warning fixes that - missed my earlier fix. This warning will appear only in the - evening SUNOS EGCS build result. Just a proactive fix. :) - -Thu May 3 07:42:01 2001 Balachandran Natarajan - - * examples/IPC_SAP/FILE_SAP/client.cpp: Fixed a warning with Linux - builds. - -Wed May 2 22:55:25 2001 Balachandran Natarajan - - * examples/ASX/Event_Server/Event_Server/Options.cpp: - * examples/ASX/UPIPE_Event_Server/Options.cpp: - * examples/IPC_SAP/FILE_SAP/client.cpp: - * examples/Naming/test_open.cpp: - * examples/Naming/test_writers.cpp: Fixed warnings in g++ builds. - -Wed May 2 18:36:29 2001 Douglas C. Schmidt - - * tests/README: Clarified that the shared memory tests now - work fine on Win9x! Thanks to Cristian Ferritti for reminding - me to do this. - -Wed May 2 15:10:28 2001 Balachandran Natarajan - - * ace/CDR_Stream.h (ACE_InputCDR): - * ace/CDR_Stream.cpp: Added a new constructor for ACE_inputCDR - class. This constructor would take the data block with a - pre-determined read and write pointer positions. This is helpful - when an application would like to create a CDR stream with a - smei-processed data block. - -Wed May 2 11:10:59 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added a colon to seperate the - run_test.pl specification from "!" that is used to indicate - where the scripts shouldn't be run. - -Wed May 02 05:40:47 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Use Queued_Message_Test/run_test.pl - -Wed May 2 06:31:46 2001 Douglas C. Schmidt - - * ace/Makefile: Make it possible to set where the QTDIR is located. - Thanks to Thomas Groth for this - enhancement. - -Tue May 1 21:38:00 2001 Balachandran Natarajan - - * ace/Process.cpp (spawn): When an application running with user - ID=0 (i.e. root) spawns a new process using - ACE_Process_Manager::spawn(), which in turn calls - ACE_Process::spawn() and tries to set a user ID and a group ID - for the new process different from root/other, the call to - setreuid() succeedes but the call to setregid() made thereafter - fails, because the process has no longer UID=0 and thus it - cannot change to a different group. To fix this, it was - necessary to swap the order of the calls to setreuid() and - setregid(). Thanks to Ramiro Penataro for - reporting this. - -Tue May 1 11:05:48 2001 Ossama Othman - - * tests/MEM_Stream_Test.cpp (handle_input): - - Fixed syntax error. "ACE_TCHAR," not "ACE_CHAR." - -Tue May 1 09:57:30 2001 Douglas C. Schmidt - - * ace/Activation_Queue.cpp (enqueue): Clarified the behavior - of passing sizeof (*mr). Thanks to Guy Bolton King - - -Tue May 1 07:13:59 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst : Sun CC 5.1 cannot work with - Simple_Naming test. Made sure that this test does not run with - Sun CC 5.1. - -Tue May 1 06:15:26 2001 Douglas C. Schmidt - - * ace/Hash_Map_Manager_T.h (class ACE_Hash_Map_Manager_Ex): Fixed - an erroneous comment. Thanks to Mark Drijver - for finding this. - - * ace/Local_Name_Space_T.cpp (create_manager_i): It's now valid - to use fixed mmap addresses on Win9x. Thanks to Cristian Ferretti - for these fixes. - - * ace/Mem_Map.{h,i}, - * ace/ace_wchar.h, - * ace/OS.{h,i}: Added support to the ACE_OS::mmap() function and - ACE_Mem_Map class so they work properly on Win9x. Thanks to - Cristian Ferretti for these fixes. - - * tests/Malloc_Test.cpp (main): Updated this test so that it - doesn't try to do any remapping or alternative child address - ranges on Win9x. Thanks to Cristian Ferretti - for pointing this out. - - * tests/MEM_Stream_Test.cpp (handle_input): Make sure to multiple - MAXPATHLEN * sizeof (ACE_CHAR) to handle Unicode properly. - Thanks to Cristian Ferretti for - pointing this out. - -Mon Apr 30 12:56:03 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst : Removed RAPI of the scoreboard. - -Sun Apr 29 15:20:00 2001 Michael Kircher - - * bin/auto_run_tests.lst: - - Added a flag to the Pluggable UDP test, so that it does not - get run in environments using only statically linked libraries. - -Sun Apr 29 11:44:26 2001 Douglas C. Schmidt - - * ace/ace_wchar.h: Reverted the following change - - Tue Apr 24 06:28:00 2001 Douglas C. Schmidt - * ace/ace_wchar.h: Fixed some code for VxWorks. Thanks to - Albert Wijnja for reporting this. - - This change is confusing since it's inconsistent with other - platforms that enable ACE_TEXT_WIDE. - -Thu Apr 26 20:14:48 2001 Balachandran Natarajan - - * ace/CDR_Stream.h (ACE_InputCDR): - * ace/CDR_Stream.cpp: Added a new method steal_data () which - replaces data blocks from one InputCDR stream to another. This - is a slightly modified form of steal_from () which basically - creates a new data block for the source stream. Creating a new - data block incurs the unwanted malloc overhead. - -Thu Apr 26 12:37:45 2001 Nanbor Wang - - * tests/README: Updated the list of tests that do not work on - windows 9x/ME for their limited shared memory support. Thanks - to Cristian Ferretti for pointing - them out. - -Thu Apr 26 12:30:19 2001 Nanbor Wang - - * ace/Containers_T.h Updated documentation for - ACE_DLList_*Iterator's on the use of method - . Users are responsible for release - (free'ing) the returned element. Thanks to Rachel G. Smith - for motivating the change. - -Thu Apr 26 07:58:56 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Prevented the BiDirectional tests from - running in the Minimum nightly builds. - -Thu Apr 26 07:48:30 2001 Balachandran Natarajan - - * ace/MEM_IO.h (ACE_MEM_IO): Some cosmetic fixes. - -Thu Apr 26 07:38:01 2001 Balachandran Natarajan - - * examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp: Fixed a compile - error. The ACE_MEM_IO::fini () was taking an integer - value. There was no method with a signature fini (int). Removed - the integer argument. - -Wed Apr 25 23:24:25 2001 Nanbor Wang - - * tests/MEM_Stream_Test.cpp: Changed the error message on SysV - semaphores to LM_WARNING and moved it up before executing the MT - test. - - * ace/MEM_IO.cpp: - * ace/MEM_IO.h: - * ace/MEM_IO.i: Do not compile MT signaling code if only SysV - semaphores are available. - - * ace/MEM_Acceptor.cpp: - * ace/MEM_Connector.cpp: Force the other party to use Reactive - signaling if we don't support MT signaling. - -Wed Apr 25 19:48:48 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Remove the tests/Oneway_Buffering/run_timeout.pl test from the - list. It is giving spurious errors, but fixing them would take - me too long. - -Wed Apr 25 20:23:44 2001 Nanbor Wang - - * ace/config-linux-common.h: Revert my previous change: - - Wed Apr 25 03:45:55 2001 Nanbor Wang - - Linux's POSIX semaphores is broken. Thanks to Ossama for - noticing this. - -Wed Apr 25 18:32:54 2001 Douglas C. Schmidt - - * ACE-INSTALL.html: Make sure to mention that ACE (and TAO) run - on Solaris 8. Thanks to Richard Hardgrave - for motivating this. - - * include/makeinclude: Zapped the platform_sunos5_egcs.GNU - file. Thanks to Craig Rodrigues for the suggestion. - -Wed Apr 25 15:30:18 2001 Nanbor Wang - - * tests/Malloc_Test.cpp: The reference counter needs to be release - if we want it to work. - -Wed Apr 25 03:45:55 2001 Nanbor Wang - - * tests/MEM_Stream_Test.cpp: Temporarily changed the informational - message about the use SYSV semaphores to LM_ERROR so we can find - those platforms out quicker. Many of them may actually support - POSIX semaphores. We need to enable them in that case. - - * ace/config-linux-common.h: Added ACE_HAS_POSIX_SEM and - ACE_LACKS_NAMED_POSIX_SEM. Linux actually support them. I'm - not sure if there are any version of linux that don't. - -Wed Apr 25 03:15:34 2001 Nanbor Wang - - * ace/Malloc.h: Added new variables to reference counting the - Malloc. - - * ace/PI_Malloc.h: Added new variables to reference counting the - Malloc and removed a ton of duplicated code that had already - been defined in Malloc.h. - - * ace/Malloc_T.cpp: - * ace/Malloc_T.h: - * ace/Malloc_T.i: Added 2 new methods to query the reference - counter and to release the reference counter. The reference - counter is created with 1 when the malloc first use a new - backing store. Later malloc that attaches to the same backing - store will increase the reference counter. It's the user's - responsibility to invoke release when the malloc is no longer - needed. The reference counter provides a way to indication it's - safe to clean up the backing store without upsetting other - malloc that might still need it. Note, however, the malloc will - not cleanup the backing store automatically when the reference - counter drops to 0 because we may want to attach another malloc - to it in some later point. - - * ace/MEM_IO.cpp: - * ace/MEM_IO.h: - * ace/MEM_SAP.cpp: - * ace/MEM_SAP.h: Use the aforementioned reference counter to - cleanup the backing store automagically. - - * ace/MEM_Stream.h: - * ace/MEM_Stream.i: Removed cleanup method as it is no longer - needed with the previous changes. Removed unnecesary - argument from fini () method. - - * ace/MEM_Stream.cpp: Simply calling fini () without worrying - about cleaning up the backing store. - - * tests/MEM_Stream_Test.cpp: No longer need to hint for cleanup. - - * tests/Malloc_Test.cpp: Added ACE_ASSERT to check for proper - operation of reference counter. - -Tue Apr 24 17:54:00 2001 Carlos O'Ryan - - * ace/Makefile: - Add 'Timer' to the default list of ACE components, without many - a test, application or example do not compile. - -Tue Apr 24 16:39:29 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Add Reliable_Oneways, Blocking_Sync_None, Oneway_Buffering, - Big_Oneways, Big_Twoways, Big_Request_Muxing and - Queued_Message_Test to the nightly builds. Most of these tests - are part of the 132 regression test suite. - -Tue Apr 24 06:28:00 2001 Douglas C. Schmidt - - * ace/Makefile: Refactored some stuff to improve the - ACE subsetting as follows: - - . Moved Malloc_Instantiations.cpp from libACEUtils to the - component libACE_Memory. - - . Moved Handle_Set.* to libACE_Utils to satisfy ACE.* - - . Moved Dynamic_Service_Base to libACE_Svcconf - - . Build a new component libACE_Timer with : - Timer_Wheel.*,Timer_Queue.*,Timer_List.*,Timer_Heap.*,Timer_Hash.* - Timeprobe.* Time_Request_Reply.* System_Time.* Profile_Timer.* - High_Res_Timer.* - - Thanks to Thomas Groth for these - suggestions. - - * docs/ACE-guidelines.html: Updated the discussion of using - open() rather than constructors. Thanks to Stan Pinte - for motivating this. - -Sat Apr 14 10:51:39 2001 Carlos O'Ryan - - * ace/Log_Msg.h: - Document the lock related functions in a separate Doxygen - section. - -Mon Apr 23 17:18:35 2001 Steve Huston - - * ace/ACE.cpp (ACE::handle_timed_complete): Set need_to_check for - any non-success result, or on a system where you can't tell (AIX). - Also, to check, use getsockopt to retrieve the status/error if - SOL_SOCKET and SO_ERROR are defined; else use the old recv method. - This gets you a real error code on a failed connect, if the platform - supports it. - - * tests/SOCK_Connector_Test.cpp: For an expected success, allow test - to pass if socket gets a reset but not if it says ENOTCONN. If there - are platforms that can't do SOL_SOCKET/SO_ERROR (above) then this - other code may need to be re-enabled. - -Mon Apr 23 13:36:27 2001 Steve Huston - - * ace/ACE.cpp (ACE::handle_timed_complete): Winsock (ACE_WIN32) sets - the exception bit (not the read bit) for a failed async connect. - So on fail, don't bother to do the recv trick to see if the socket - really did fail. - - * ace/Connector.cpp (ACE_Connector::handle_output): - * ace/SOCK_Connector.cpp (complete): Apparantly, Win2000 has - fixed the problem where a connection succeeds but can't be used - for a time. So, the sleep workaround is restructured for ACE_WIN32 - to try the new socket first, and only do the sleep if it fails. - Don't try to do this check (e.g. building on Win2000) at compile - time, since we want to be able to build on NT and run on Win2000. - - * ace/README: - * ace/config-win32-common.h: Removed the macro, - ACE_HAS_BROKEN_NONBLOCKING_CONNECTS. It was only used in the two - cases above, and is not needed any longer. - -Mon Apr 23 07:08:09 2001 Douglas C. Schmidt - - * ace/Based_Pointer_T.h: Updated the documentation to - explain how ACE_Based_Pointer (NULL) behaves. Thanks to Tom - Moog for motivating this. - -Sun Apr 22 14:26:56 2001 Carlos O'Ryan - - * ace/OS.h: - Some warnings are automatically disabled, but the pragmas only - make sense for MSVC. - - * ace/streams.h: - Fixed problems for Sun/CC-4.2, the trick is to include - strstream.h on MINGW32 *and* unix-like platforms, while - strstrea.h is included for all other WinXX-based compilers. - -Sat Apr 21 19:02:27 2001 Nanbor Wang - - * netsvcs/clients/Naming/Dump_Restore/Makefile: - * netsvcs/clients/Naming/Client/Makefile: Removed duplicated ACE - library. I thought I removed them all. - -Sat Apr 21 15:31:27 2001 Carlos O'Ryan - - * ace/ACE.cpp: - * ace/Basic_Types.h: - * ace/Configuration.cpp: - * ace/Handle_Gobbler.i: - * ace/Lib_Find.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Log_Msg.cpp: - * ace/Makefile: - * ace/Mem_Map.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Queue.i: - * ace/NT_Service.cpp: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/OS_String.cpp: - * ace/Process.cpp: - * ace/Process_Manager.cpp: - * ace/Registry.cpp: - * ace/SOCK_Connector.i: - * ace/Sock_Connect.cpp: - * ace/TTY_IO.cpp: - * ace/WFMO_Reactor.cpp: - * ace/WFMO_Reactor.i: - * ace/WIN32_Asynch_IO.cpp: - * ace/config-cygwin32-common.h: - * ace/config-g++-common.h: - * ace/config-win32-common.h: - * ace/config-win32-mingw.h: - * ace/config-win32.h: - * ace/streams.h: - * examples/NT_Service/Makefile: - * examples/NT_Service/main.cpp: - * examples/NT_Service/ntsvc.cpp: - * include/makeinclude/platform_cygwin32.GNU: - * include/makeinclude/platform_gnuwin32_common.GNU: - * include/makeinclude/platform_mingw32.GNU: - * include/makeinclude/rules.local.GNU: - * include/makeinclude/wrapper_macros.GNU: - * tests/CDR_File_Test.cpp: - * tests/Cached_Accept_Conn_Test.cpp: - * tests/Cached_Conn_Test.cpp: - * tests/Conn_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/MEM_Stream_Test.h: - * tests/MM_Shared_Memory_Test.cpp: - * tests/MT_SOCK_Test.cpp: - * tests/Malloc_Test.cpp: - * tests/Mem_Map_Test.cpp: - * tests/OS_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/Reactor_Exceptions_Test.cpp: - * tests/Reactor_Notify_Test.cpp: - * tests/SOCK_Send_Recv_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/Svc_Handler_Test.cpp: - * tests/run_tests.bat: - * tests/run_tests.sh: - * tests/RMCast/RMCast_Fragment_Test.cpp: - Add support for mingw (www.mingw.org) and partial support for - cygwin (http://cygwin.com/). Many thanks to Cristian Ferretti - - -Fri Apr 20 18:21:41 2001 Carlos O'Ryan - - * ace/CDR_Stream.i (align_write_ptr): - Don't use grow_and_adjust() here because it forces an - allocation, using simply adjust() is better. - -Fri Apr 20 19:37:53 2001 Douglas C. Schmidt - - * ace/Get_Opt.h: Updated the documentation to match the constructor - arguments for ACE_Get_Opt. Thanks to Benot Desmeules - for reporting this. - - * ace/TP_Reactor.cpp: Added a workaround for compiling ACE on - Linux for the OS/390 OS. Thanks to James Dorsey - for reporting this. - -Fri Apr 20 00:57:24 2001 Douglas C. Schmidt - - * ace/Containers_T.cpp (operator=): Added a missing assignment to - this->size_ = s.size_. Thanks to Juan Jose Comellas - for reporting this. - - * ace/SOCK_Dgram: One of the send() methods was lacking a "const" - in front of the ACE_Addr &. This has been fixed. Thanks to - Victor Poznyak for reporting this. - -Thu Apr 19 16:18:33 2001 Steve Huston - - * ace/Log_Msg.h: Doxygen-ized some function arguments; other - minor doc cleanups. - -Thu Apr 19 11:08:15 2001 Douglas C. Schmidt - - * ACE-INSTALL.html: Point out that ACE supports Solaris 8. - Thanks to Logan Modahala for motivating - this. - -Wed Apr 18 13:57:40 2001 Chad Elliott - - * ace/ACE.cpp: - - Modification to check errno for ENOBUFS (in addition to - EWOULDBLOCK) after writing to a file descriptor. This will happen - on VxWorks when a client sends data faster than the server can - receive it. This modification causes this to be a retry situation - instead of an error. [Bug 866] - -Wed Apr 18 11:33:07 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the BiDirectional tests to the - nightly builds. There is no reason why it did not go in so far. - -Wed Apr 18 10:25:03 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Changed the name of the -config option - for SUNCC5.1. Removed the dot and replaced it with a '_'. - -Wed Apr 18 05:23:53 2001 Douglas C. Schmidt - - * tests/Config_Test.cpp: Fixed several warnings related to - not using ACE_TEXT for wide-strings. Thanks to Bala for - reporting this. - -Wed Apr 18 02:08:16 2001 Nanbor Wang - - * examples/Synch/proc_sema.dsp: Fixed release build settings. - -Tue Apr 17 12:33:49 2001 Steve Huston - - * ace/Service_Config.cpp (open_i): If the caller supplies a - logger key, enable the ACE_Log_Msg::LOGGER bit when opening - the ACE_Log_Msg instance, else the logger key is ignored. - -Tue Apr 17 06:15:00 2001 Michael Kircher - - * bin/auto_run_tests.lst: - - Added the UDP Pluggable Protocol test to the list of executed tests. - -Mon Apr 16 20:42:46 2001 Carlos O'Ryan - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Remove obsolete comments and raise the optimization level from - -O2 to -O3, the latter disables a huge number of warnings for - PACE. - -Mon Apr 16 22:15:28 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Commented out some tests that are - failing on SUNCC 5.1. The failure is because of a compiler - bug. The problem is that the compiler seems to have difficulty - in calling the virtual method in a class hierarchy which is - built with multiple inheritance. - -Mon Apr 16 20:24:11 2001 Douglas C. Schmidt - - * tests/Config_Test.cpp (main): Remoted the test_io() function. - Thanks to Jerry Odenwelder for - confirming this. - -Mon Apr 16 16:18:57 2001 Carlos O'Ryan - - * ace/config-qnx-rtp.h: - Add support for gperf under QNX - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - The -fexceptions flag has no place in the CPPFLAGS macros, it - should go in CCFLAGS (though I could be convinced to put it in - CFLAGS) - -Mon Apr 16 16:13:29 2001 Steve Huston - - * ace/Configuration.h (ACE_Configuration::root_section): Made this - method 'const'; makes today's changes easier to deal with. - - * ace/Configuration_Import_Export.cpp (string_has_white_space): - * ace/Configuration.cpp (operator==): Replaced 'true' with 1 and - 'false' with 0; replace const_cast<> with ACE_const_cast (), - per docs/ACE-guidelines.html, and IBM C++ :-) Also, use two - non-const local variables instead of const_casting 'this' and - 'rhs' on every use. - Made ACE_Configuration::root_section (void) const. - - * ace/ace.icc: This was an early hack attempt to use library or DLL - build for Visual Age C++ 4. It is now the Visual Age C++ 5 - configuration for building ACE on AIX. The ace-dll.icc and - ace-lib.icc are still around for Visual Age C++ 4 users, but may - not work and will be removed in a future ACE release. This - config is for Visual Age C++ 5 only and can/will be extended to - do subset builds as well as debug/optimize/etc variants. - - * bin/make_pretty.pl: Pick out AIX ld errors correctly. - - * include/makeinclude/platform_hpux_aCC.GNU: Note HP problem report - number and disposition for inability to use -AA and +noeh together. - -Mon Apr 16 12:32:48 2001 Nanbor Wang - - * tests/MEM_Stream_Test.cpp: Limited the concurrent connections - used in the multithreaded test on platforms without POSIX or - Win32 semaphores. In this case, SysV semaphores are used and - a user can only instantiate very limited number of them. The - test will also print out an INFO in this case as it implies - there can only be one "multithreaded" connection in one host at - any instance. This fixed the test on some obsolete UNIX - platforms. - -Mon Apr 16 09:58:23 2001 Balachandran Natarajan - - * tests/Config_Test.cpp: Fixed a warning with g++ builds. The - warning was because of an unused function. - -Sun Apr 15 21:27:19 2001 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added new Configuration_Import_Export.{h,cpp} - files. - -Sun Apr 15 19:33:19 2001 Douglas C. Schmidt - - * ace/Configuration.cpp, - * ace/Configuration_Import_Export.cpp: Fixed some warnings - that show up with G++. Thanks to Carlos for reporting this. - -Sun Apr 15 17:13:40 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Disabled TAO/tests/Client_Leaks on all configurations, it is - failing systematically because it cannot create processes fast - enough. - -Sat Apr 14 18:08:16 2001 Carlos O'Ryan - - * ace/Configuration_Import_Export.h: - Fixed small typo in the @file comment for - Configuration_Import_Export.h - -Sat Apr 14 18:31:15 2001 Douglas C. Schmidt - - * ace/Makefile.bor: Added new Configuration_Import_Export.obj file. - - * tests/Config_Test.cpp: Added tests for the new ACE_Configuration* - stuff. Thanks to Jerry Odenwelder for - contributing these. - - * ace/Configuration_Import_Export.{h,cpp}: Added two new files that - do the following: - - 1. Remove the import and export functionality from the - ACE_Configuration object. - 2. Provide two new classes to import/export ACE_Configuration - objects: - - * ACE_Registry_ImpExp import and exports in the Win32 - Registry format - this was the old import/export routine on - ACE_Configuration. - * ACE_Ini_ImpExp imports and exports in an INI format. The - import part of this was called import_config_as_strings in - the old ACE_Configuration object. While this object will - export any ACE_Configuration object, it can only import data as - strings. This is due to the inability to distinguish type - in the INI format. - 3. Added operator== to ACE_Configuration. This is to compare - contents not type. - 4. Test programs were modified to exercise this new functionality. - - Thanks to Jerry Odenwelder for - contributing these. - -Sat Apr 14 12:44:17 2001 Carlos O'Ryan - - * ace/MEM_IO.i: - Reorder operations to eliminate warnings on Tru64/CXX - -Sat Apr 14 11:12:26 2001 Steve Huston - - * tests/CLASSIX_Addr_Test.icc: - * tests/CLASSIX_CLD_Connector_Test.icc: - * tests/CLASSIX_Con_Acc_Test.icc: - * tests/CLASSIX_Group_Test.icc: - * tests/CLASSIX_Notify_Test.icc: - * tests/CLASSIX_OS_Test.icc: - * tests/CLASSIX_Reactor_Test.icc: - * tests/CLASSIX_Select_Reactor_Test.icc: - * tests/CLASSIX_Stream_Test.icc: - Removed these files. They were moved/copied to tests/CLASSIX some - time back and don't belong here. - - * tests/t.icc: Removed. This is not used for anything. - - * tests/Makefile.vac: Corrected 'realclean' actions. - -Sat Apr 14 09:17:32 2001 Steve Huston - - * examples/QOS/Change_Sender_TSpec/sender.dsp: Added extra level of - directory for include and lib - missed this one in yesterday's - set of changes. - -Sat Apr 14 09:08:33 2001 Steve Huston - - * ace/Array_Base.h: Added forward declaration for ACE_Allocator. - * ace/Array_Base.cpp: Added #include "Malloc_Base.h" so IBM C++ - can find ACE_Allocator when instantiating templates. - - * ace/config-hpux-10.x-hpc++.h: When using standard C++ lib, - set the value of ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB to 1. - - * netsvcs/clients/Naming/Dump_Restore/Makefile: - * netsvcs/clients/Naming/Client/Makefile: Add ACELIB to LIBS. This - allows IBM C++ compilers to build the library clean. - - * tests/Makefile.vac: Don't try to use vacbld_r on the entire - project. It can take so long that make gives up and kills - off the build, making a real mess of the .ics files and leaving - random numbers of tests unbuilt. Instead, run vacbld_r on - each .icc file in the directory. Similarly for clean, don't - reply on vacbld_r on the project file - run through all the - ics files and executables based on existing .icc files. - -Fri Apr 13 12:44:21 2001 Steve Huston - - * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record): - If logging to STDERR is not enabled, don't dump the log record - there either. - -Fri Apr 13 12:21:01 2001 Nanbor Wang - - * ace/Malloc_T.h: Added an explanation on the requirement about - sizeof (TYPE)link of ACE_Cached_Allocator and a link to - ACE_Cached_Mem_Pool_Node where this stuff was explained. Thanks - to Rachel G. Smith for motivating - the change. - -Fri Apr 13 12:05:38 2001 Nanbor Wang - - * tests/MEM_Stream_Test.h: - * tests/MEM_Stream_Test.cpp: Borland C++ has problem cleaning up - the static Atomic_Op object in Echo_Handler in the right order. - Made that an ACE_Singleton and re-organized the test a big. - Thanks to Chris Kohlhoff for reporting and - suggesting the fix. [Bug 862] - -Fri Apr 13 11:58:58 2001 Carlos O'Ryan - - * ace/OS.i (gethrtime): - Add support for the the clock tick register as a high resolution - timer under KCC/Linux. Thanks to David Levine for help on this. - -Fri Apr 13 05:30:04 2001 Douglas C. Schmidt - - * ace/OS.i: Make sure that the PTHREADS version of ACE_OS::thr_yield() - gets top priority over the STHREADS version. Thanks to Munagala - Ramanath for reporting this. - - * ace/Malloc_T.{h,i}: Added support for one of the calloc() methods - to ACE_Cached_Allocator. Thanks to Rachel G Smith - for motivating this change. - - * ace/Malloc_Allocator.h: Updated the comments for ACE_New_Allocator - to indicate that the calloc() methods are also supported. - Thanks to Rachel G Smith for - motivating this change. - - * docs/ACE-bug-process.html: Updated this document to explain how - bugs pertaining to OCI's TAO releases should be handled. Thanks - to Georg Lohrer for motivating this. - -Thu Apr 12 20:36:30 2001 Douglas C. Schmidt - - * ace/OS.i (thr_getspecific): Reorder the way in which we check - the flags so that ACE_HAS_PTHREADS takes precedence over - ACE_HAS_STHREADS. Thanks to Munagala Ramanath - for reporting this. - -Thu Apr 12 21:18:44 2001 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: Added - -D_RWSTD_MULTI_THREAD -D_REENTRANT to CCFLAGS for stdlibcpp build. - Makes execution clean, no core dump on program init. - -Thu Apr 12 17:31:36 2001 Steve Huston - - * examples/IOStream/server/iostream_server.h: Wrap the guts of this - in #if !defined (ACE_LACKS_ACE_IOSTREAM) to build clean on platforms - that can't handle ACE_IOStream. - -Thu Apr 12 17:02:41 2001 Steve Huston - - * examples/QOS/Change_Sender_TSpec/sender.dsp: - * examples/QOS/Change_Sender_TSpec/receiver.dsp: - * examples/QOS/Change_Receiver_FlowSpec/sender.dsp: - * examples/QOS/Change_Receiver_FlowSpec/receiver.dsp: - * examples/QOS/Simple/sender.dsp: - * examples/QOS/Simple/receiver.dsp: Changed project names from 002 - and 003 to sender and receiver. Corrected relative paths for include - and library lookup (add another ..). - - * examples/QOS/QOS.dsw: Change project names from 002/003 to sender - and receiver. - -Thu Apr 12 15:48:22 2001 Joe Hoffert - - * ace/CDR_Stream.i (length): - Moved definition of length method above any of the methods - that call into it. Was producing warnings on Tru64 platform. - -Thu Apr 12 13:06:27 2001 Joel Sherrill - - * include/makeinclude/Makefile.rtems: Replaced debug version - with real version that queries RTEMS application Makefile - infrastructure. - - * include/makeinclude/platform_rtems.x_g++.GNU: Added - --no-print-directory option to all invocations of recursive - make to determine information from Makefile.rtems. This - avoids getting the "entering/exiting directory" messages - included in the results. - - * ACE-RTEMS.README: Added requirement to configure C++ - support in RTEMS. Updated to reflect also compiling for mc68360 - target. - -Wed Apr 11 20:36:36 2001 Nanbor Wang - - * examples/Synch/proc_sema.cpp (main): Fixd an assigning string - literal to char* warning. - -Wed Apr 11 18:04:33 2001 Steve Huston - - * include/makeinclude/rules.bin.GNU: Change the Visual Age C++ - incremental build command to use vacbld_r, the thread-enabled - variant of vacbld. - -Wed Apr 11 11:00:50 2001 Douglas C. Schmidt - - * ACE-INSTALL.html: Added a section illustrating how to build - ACE+TAO for RTEMS. Thanks to Joel Sherrill - for this build procedure. - -Wed Apr 11 11:38:37 2001 Steve Huston - - * ace/IOStream.h: Reverted change from - Tue Apr 10 18:35:22 2001 Steve Huston - and replaced it with a section that sets ACE_LACKS_ACE_IOSTREAM - if ACE_HAS_STANDARD_CPP_LIBRARY is set and ACE_USES_OLD_IOSTREAMS - is not. This restriction is noted and tracked in Bugzilla # 857. - - * ace/IOStream.cpp: - * tests/IOStream_Test.cpp: Reverted change from - Tue Apr 10 18:35:22 2001 Steve Huston - -Wed Apr 11 09:44:32 2001 Chad Elliott - - * examples/Misc/test_trace.cpp: - - Fixed a strange compiler error with Tornado II. - My_Task::recursive was inline which caused an internal compiler - error. - -Wed Apr 11 08:04:21 2001 Douglas C. Schmidt - - * include/makeinclude/platform_linux.GNU: By default, we build - ACE+TAO with exceptions enabled on Linux. Thanks to Craig - Rodrigues for motivating this change. - - * ace/SString.i (operator+): Fixed an "inlined before use" warning. - Thanks to Bala for reporting this. - -Tue Apr 10 16:58:54 2001 Ossama Othman - - * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS): - - Changed the default values on UNIX from 0666 and 0777 to 0644 - and 0755, i.e. removed global write permissions. This addresses - some security issues. Now, only the owner has write permissions - by default. - -Tue Apr 10 18:35:22 2001 Steve Huston - - * include/makeinclude/platform_sunos5_sunc++.GNU: Added a new - build option, stdcpplib, which defaults to 1. If set to 1, - Sun Workshop 5 and Forte 6 compilers will use the standard - C++ library, including standard iostreams. Set to 0 to - use the old, classic iostreams. - - * include/makeinclude/platform_hpux_aCC.GNU: Added support for - the stdcpplib build option. It defaults to 1 if using aC++ - x.27, or 0 if not. Thanks very much to Istvan Buki - for these changes. - - * ace/config-aix-4.x.h: For Visual Age C++ 5, turn on - ACE_HAS_STANDARD_CPP_LIBRARY and - ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. - - * ace/config-sunos5.5.h: For Sun Workshop 5 and Forte 6 compilers, - take the ACE_USES_OLD_IOSTREAMS setting from the platform_macros.GNU - file; don't set it here. - - * ace/config-hpux-11.00.h: - * ace/config-hpux-10.x-hpc++.h: If the stdcpplib=1 option was used, - then turn on ACE_HAS_STANDARD_CPP_LIB and - ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. Else turn on - ACE_USES_OLD_IOSTREAMS. - - * ace/IOStream.{h cpp}: Only try to build this stuff if - ACE_LACKS_ACE_IOSTREAM is not defined and ACE_USES_OLD_IOSTREAMS - _is_ defined. The check on ACE_USES_OLD_IOSTREAMS can be removed - when ACE_IOStream gets ported to standard iostreams. - - * tests/IOStream_Test.cpp: Only try this if ACE_USES_OLD_IOSTREAMS - is defined. Remove this if/when ACE_IOStream is ported to new - iostreams. - -Tue Apr 10 17:51:25 2001 Pradeep Gore - - * bin/auto_run_tests.lst: - Added TAO/tests/OctetSeq/run_test1{2}.pl to auto testing. - -Tue Apr 10 16:33:42 2001 Joe Hoffert - - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - Added sanity checks for sizes of strings and arrays. - -Tue Apr 10 15:14:52 2001 Chad Elliott - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - - Added missing else/endif from previous support addition. - -Tue Apr 10 11:48:51 2001 Douglas C. Schmidt - - * include/makeinclude/platform_vxworks5.x_g++.GNU: Added support - for the M68k line of CPUs. Thanks to Albert Pariante - for reporting this. - -Tue Apr 10 02:14:55 2001 Nanbor Wang - - * bin/PerlACE/Run_Test.pm (check_n_cleanup_files): Added a new - PerlACE function that checks for unwanted files and spits out a - warning before removing the file. It makes sure that we not - only clean up resource leaks but also notice their existence. - - * tests/run_test.pl (delete_temp_files): Used the new - to remove the temp files for - MEM_Stream_Test, if there are any. - -Tue Apr 10 1:44:02 2001 Yamuna Krishnamurthy - - * examples/QOS/Change_Sender_TSpec/receiver.cpp: - * examples/QOS/Change_Sender_TSpec/receiver.dsp: - * examples/QOS/Change_Sender_TSpec/sender.cpp: - * examples/QOS/Change_Sender_TSpec/sender.dsp: - * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h: - * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h: - * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/QoS_Util.h: - * examples/QOS/Change_Sender_TSpec/QoS_Util.cpp: - * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h: - * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/FlowSpec_Dbase.h: - * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h: - * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp: - * examples/QOS/Change_Sender_TSpec/README: - * examples/QOS/Change_Sender_TSpec/Makefile: - - Added a test to dynamically change the Sender flow spec in - order to continuously change the PATH messages. - - * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp: - * examples/QOS/Change_Receiver_FlowSpec/receiver.dsp: - * examples/QOS/Change_Receiver_FlowSpec/sender.cpp: - * examples/QOS/Change_Receiver_FlowSpec/sender.dsp: - * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h: - * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h: - * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/FlowSpec_Dbase.h: - * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h: - * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp: - * examples/QOS/Change_Receiver_FlowSpec/README: - * examples/QOS/Change_Receiver_FlowSpec/Makefile: - - Added a test to dynamically change the Receiver flow spec in - order to continuously change the RESV messages. - - * examples/QOS/Simple/receiver.cpp: - * examples/QOS/Simple/receiver.dsp: - * examples/QOS/Simple/sender.cpp: - * examples/QOS/Simple/sender.dsp: - * examples/QOS/Simple/Sender_QoS_Event_Handler.h: - * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Simple/Receiver_QoS_Event_Handler.h: - * examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Simple/QoS_Util.h: - * examples/QOS/Simple/QoS_Util.cpp: - * examples/QOS/Simple/QoS_Signal_Handler.h: - * examples/QOS/Simple/QoS_Signal_Handler.cpp: - * examples/QOS/Simple/FlowSpec_Dbase.h: - * examples/QOS/Simple/Fill_ACE_QoS.h: - * examples/QOS/Simple/Fill_ACE_QoS.cpp: - * examples/QOS/Simple/README: - * examples/QOS/Simple/Makefile: - - Moved the original QOS example to Simple. - - * examples/QOS/Makefile: - * examples/QOS/QOS.dsw: - - Updated the Makefile to compile the constituent tests. - -Mon Apr 9 18:48:02 2001 Douglas C. Schmidt - - * include/makeinclude/Makefile.rtems: Zapped - - export RTEMS_MAKEFILE_PATH=/opt/rtems/sparc-rtems/erc32/ - - so that the environment variable is obtained from the users - environment. Thanks to Joel Sherrill for - this fix. - - * ace/Log_Msg.h: Only define the ACE_ASSERT macro if it's not - already defined. This make it easy for developers to override - this macro in their config.h file. Thanks to Nathalie D'Amours - for motivating this change. - -Mon Apr 9 15:36:04 2001 Carlos O'Ryan - - * ace/High_Res_Timer.cpp: - Use the 'cpu MHz' line from /proc/cpuinfo in favor of the - 'bogomips' line, because the latter gives the wrong number on - multi-CPU boxes. - -Mon Apr 9 14:37:30 2001 Chad Elliott - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: - - Removed extraneous template instantiations. - -Mon Apr 09 09:19:37 2001 Carlos O'Ryan - - * ace/SString.cpp: - Fixed Fuzz error - -Mon Apr 9 08:28:47 2001 Douglas C. Schmidt - - * ace/SString.{h,i,cpp}: Added improved support for ACE_WString: - . The magic number 32 has been changed to ACE_DEFAULT_GROWSIZE. - . ACE_WString only allocates memory when it is needed. - . The grow strategy can be modified by setting the ACE_GROW_LINEAR define. - the string does not double the memory then, but increases the memory by - ACE_DEFAULT_GROWSIZE. - Thanks to Eric Zuur for contributing these - enhancements. - - * ace/High_Res_Timer.cpp (get_cpuinfo): Added support for the Pentium - III and IV. Thanks to Stephane Pion - for contributing this fix. - -Mon Apr 9 07:50:08 2001 Chad Elliott - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: - * examples/IPC_SAP/SOCK_SAP/Makefile: - Fixed a typo in the Makefile and added "CPP-inclient.h" include to - CPP-memclient.cpp. - -Mon Apr 9 07:42:29 2001 Chad Elliott - - * ace/Basic_Types.cpp: - Changed format flags from ios::fmtflags to unsigned long. - This typedef is not supported by all platforms. Thanks Carlos - for suggesting this change. - -Mon Apr 09 08:08:11 2001 Johnny Willemsen - - * ace/Timer_Queue_T.h - Declared private copy constructor and assignment operator - for class ACE_Event_Handler_Handle_Timeout_Upcall - -Sun Apr 08 18:55:58 2001 Carlos O'Ryan - - * tests/DLL_Test.cpp: - Use ACE::ldname() instead of keeping a local function to - decorate the name. - Use the "d" suffix only on MSVC debug builds. - - * tests/Makefile.bor: - * tests/DLL_Test.bor: - New Borland Makefile for the shared library in DLL_Test. Thanks - to Christopher Kohlhoff for providing the - patches. - - * tests/run_test.pl: - Add ExeSubDir to the path, required in Borland builds to find - the shared libraries created locally. - -Sun Apr 8 13:12:54 2001 Douglas C. Schmidt - - * ace/SString.cpp: Reordered various constructor initializers so - G++ doesn't complain. Thanks to Bala for reporting this. - - * ace/SString.{h,i,cpp}: Added various optimizations to ACE_WString - so it will perform certain operations as efficiently as - ACE_CString. Thanks to Eric Zuur for - contributing these enhancements. - -Sun Apr 08 12:10:30 2001 Nanbor Wang - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp: - * examples/IPC_SAP/SOCK_SAP/Makefile: Updated obsolete - shared-memory transport functions. - -Sun Apr 8 09:49:26 2001 Douglas C. Schmidt - - * bin: Added a new shell script called "make-components" that enables - each ACE component to be built in a simple manner using the - following change from Arturo. - - * ace/Makefile: Generalized the libACE.a and libACE.$(SOEXT) targets - to simplify subsettings. Thanks to Arturo Montes - for reporting this. - -Sat Apr 7 16:00:48 2001 Douglas C. Schmidt - - * tests: Added a new rtems_init.c file. Thanks to Joel Sherrill - for contributing this port. - - * include/makeinclude: Added the new platform_rtems.x_g++.GNU file. - * ace: Added the new config-rtems.h file. - - * ace/OS.cpp: Added support for RTEMS, which is an open-source - real-time operating system that can be downloaded from - ftp://ftp.oarcorp.com/pub/rtems. Thanks to Joel Sherrill - for contributing this port. - - * ace/OS.cpp: The return type for ACE_OS::readv_emulation() - should have been ssize_t, not int, to be consistent with its - definition in the header file. Thanks to Joel Sherrill - for reporting this. - -Sat Apr 7 21:16:49 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Add the new Crash_On_Write and MT_Timeout tests to the nightly - builds. - -Fri Apr 6 21:02:05 2001 Carlos O'Ryan - - * examples/Synch/proc_sema.cpp: - Add missing #include for "ace/Log_Msg.h", on platforms that - define ACE_TEMPLATES_REQUIRE_SOURCE this include is magically - obtained, but this is not the case for SunCC 4.2, and - True64/CXX. - -Fri Apr 06 16:22:24 2001 Nanbor Wang - - * ace/SString.h (ACE_Tokenizer): Updated documentation and added - some examples. Thanks to Jody Hagins for - providing the original example. - -Fri Apr 6 17:11:34 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the Single_Read test to the - nightly build list. - -Fri Apr 6 14:45:52 2001 Chad Elliott - - * ace/Basic_Types.h: - * ace/Basic_Types.cpp: - Changed the as_string() method to avoid using floor() which - required math.h and ACE_CString which caused unnecessary coupling. - -Fri Apr 6 08:34:15 2001 Carlos O'Ryan - - * bin/make_pretty.pl: - Do no give out warnings for the 'nocompatwarnings' option in - HP-UX. - -Fri Apr 6 08:23:02 2001 Chad Elliott - - * ace/Basic_Types.cpp: - * ace/Basic_Types.h: - * tests/Process_Strategy_Test.cpp: - * examples/Connection/misc/Connection_Handler.cpp: - Remove build warnings for platforms that don't support unsigned - long long types and have unsigned char's. - -Fri Apr 6 02:02:01 2001 Nanbor Wang - - * ace/OS.h: - * ace/OS.i: The implementation for process semaphore on platforms - lacking named POSIX semaphores was broken. On these platforms, - semaphores are allocated in MMAP file so they should never be - deleted. Added a flag to remember if a semaphore - can be deleted (USYNC_THREAD) or not (USYNC_PROCESS). - - * ace/config-sunos5.6.h: According to the man pages, SunOS started - supporting POSIX semaphores from 5.6. Defined ACE_HAS_POSIX_SEM - and ACE_LACKS_NAMED_POSIX_SEM. - -Thu Apr 5 11:23:05 2001 Carlos O'Ryan - - * html/index.html: - Add link to the new QoS library documentation. - -Thu Apr 05 03:26:13 2001 Nanbor Wang - - * examples/Makefile: - * examples/Synch/Makefile: - * examples/Synch/README: - * examples/Synch/Synch.dsw: - * examples/Synch/proc_sema.cpp: - * examples/Synch/proc_sema.dsp: Added a new example to play with - process semaphores. - -Thu Apr 05 02:48:51 2001 Nanbor Wang - - * ace/MEM_IO.cpp (write): My earlier change was causing the test - to crash. - - * ace/MEM_Stream.h: - * ace/MEM_Stream.i: - * ace/MEM_Stream.cpp: Added a new method to inform the stream to - clean up its resources when closing down. - - * tests/MEM_Stream_Test.cpp (handle_close): Handle_close should - only inform it's peer to destroy the mmap file instead of - removing the file itself. - -Wed Apr 4 16:21:13 2001 Darrell Brunsch - - * bin/auto_run_tests.lst: - - Added the ImplRepo tests. - -Wed Apr 4 12:13:52 2001 Nanbor Wang - - * ace/MEM_IO.h: Declared ACE_INLINE_FOR_GNUC for - ACE_MT_MEM_IO::Simple_Queue's constructor to eliminate a bogus - warning reported by vxworks' gcc compiler. - -Wed Apr 04 07:47:48 2001 Craig Rodrigues - - * etc/ace_qos.doxygen: - * bin/generate_doxygen.pl: - Generate doxygen documentation for ACE QoS API - -Tue Apr 03 19:55:26 2001 Steve Huston - - * bin/auto_compile: Added a -make_type option - the argument to - the option is the suffix of Makefile to use. Example: - -make_type vac would use Makefile.vac instead of Makefile - when building. - - * bin/make_pretty.pl: Corrected tests for AIX errors/warnings. - - * ace/ace.icp: (new) Visual Age C++ 5 project file for libACE. - - * ace/ace.icc: (new) Visual Age C++ 5 configuration file for - libACE. Replaces ace-dll.icc. It will eventually have the - stuff added to make debug/optimize as well as subsets. - - * ace/ace_vacpp_options.icc: Visual Age C++ file for setting ACE - build options. - - * ace/Makefile.vac: Makefile to build libACE using the Visual - Age C++ 5 incremental compiler. It only has "all" and "realclean" - targets, and uses vacbld_r to do the build. - - * tests/tests.icp: Visual Age C++ 5 Project file for making all the - tests. - - * tests/Makefile.vac: Makefile to drive vacbld_r for Visual Age C++. - - * tests/Config_Test.icc: - * tests/Dirent_Test.icc: - * tests/Logging_Strategy_Test.icc: - * tests/MEM_Stream_Test.icc: - * tests/Message_Queue_Test_Ex.icc: - * tests/OS_Test.icc: - New files for building tests with Visual Age C++. - - * tests/libDLL_Test.icc: Changed to use up-to-date source file. - -Tue Apr 03 13:45:02 2001 Nanbor Wang - - * ace/MEM_IO.cpp: Fixed mismatched ACE_TRACE messages. Thanks to - the all mighty fuzzmasterd for reporting this. - -Tue Apr 3 11:40:42 2001 Priyanka Gontla - - * examples/IPC_SAP/SSL_SAP/dummy.pem: - * examples/IPC_SAP/SSL_SAP/key.pem: - The previous certificates expired. So, generated them - again. - -Tue Apr 03 09:30:10 2001 Nanbor Wang - - * ace/MEM_IO.cpp (write): Fixed a compilation error for Borland - compiler. Thanks to Johnny Willensen for reporting this. - -Mon Apr 02 23:41:34 2001 Nanbor Wang - - * ace/MEM_SAP.cpp: - * ace/MEM_SAP.h: - * ace/MEM_SAP.i: - Generalized the ACE_MEM_SAP class to allocate memory in the new - memory wrapper class ACE_MEM_SAP_Node. - - * ace/MEM_IO.cpp: - * ace/MEM_IO.h: - * ace/MEM_IO.i: - Separated the different signaling mechanisms into a different - class in ACE_MEM_IO so it can determine the "right" signaling - strategy allowed. Currently, we implement the Reactive strategy - (ACE_Reactive_MEM_IO) which uses sockets for signaling and - multithreaded strategy (ACE_MT_MEM_IO) which uses semaphores for - signaling. - - * ace/MEM_Stream.cpp: - Sending an empty buffer over to wake up the "other" end when we - are closing down. - - * ace/MEM_Acceptor.cpp: - * ace/MEM_Acceptor.h: - * ace/MEM_Acceptor.i: - * ace/MEM_Connector.cpp: - * ace/MEM_Connector.h: - * ace/MEM_Connector.i: Added facility to specify the "preferred" - signaling strategy so the acceptor and connector can negociate - and agree on the best signaling mechanism to use. - - * ace/MEM_Stream_Test.h: - * ace/MEM_Stream_Test.cpp: - Added the test for the new MT signaling MEM_Stream transfer. - This part of the test seems to be failing on system that depends - on SysV semaphores (because we need more semaphore than the - system can provide.) - -Mon Apr 2 15:17:13 2001 Chad Elliott - - * ace/config-chorus.h: - - Chorus 4.x supports unsigned long long's. - -Mon Apr 2 14:23:31 2001 Craig Rodrigues - - * ace/Makefile: - only build QoS directory under UNIX if rapi is installed - * ace/QoS/README: - add installation instructions and GQOS/RAPI information - -Mon Apr 2 09:57:31 2001 Darrell Brunsch - - * bin/PerlACE/MSProject.pm: - - Made a change to the tao_idl depencency checking. - It was only checking for tao_idl and $(InputName) where - some places we use $(InputPath) instead. - - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - - Disabled the Inheritance by Dominance informational - warning that MSVC gives. We have cases of this all over - the place, and normally we just disable the warning on - a file by file basis, but now we just do a blanket disable. - -Mon Apr 2 08:45:24 2001 Carlos O'Ryan - - * bin/nightlybuilds/builds.lst: - Renamed the Debian_Full_WU build, its most important feature is - not that it is at WashU nor that it enables most components. It - is the fact that interceptors are disabled on its configuration. - -Sun Apr 1 17:20:22 2001 Darrell Brunsch - - * ace/INET_Addr.h: - - Added /**/ around for the inclusion of inetLib.h, since some - MS compilers pick this up in dependency generation. - - * bin/PerlACE/MSProject.pm: - - Used \Q\E around the library names when matching, otherwise - the backslashes were interpreted as escaping, and weird - unicode errors popped up. - - * bin/pippen.pl: - - Pippen was being case sensitive, so tao.lib was different - than TAO.lib. Changes to store only lowercase. - -Sat Mar 31 10:16:01 2001 Carlos O'Ryan - - * ACE-INSTALL.html: - Removed broken link, the web page does not exist anymore. Thanks - to John R. Ashmun for pointing this out. - This fixes [BUGID:833] - -Fri Mar 30 14:08:18 2001 Douglas C. Schmidt - - * performance-tests/TTCP/C/new-ttcp.cpp: - * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: - Zapped the gettimeofday() method since it didn't seem to be - used. Also, #include "ace/Log_Msg.h". Thanks to Thomas Groth - for reporting this. - - * ace/OS.h: Changed all the ACE_DEFAULT_* default ports of the - various services to start with 200xx rather than 100xx to avoid - conflicts on AIX, which apparently hijacks port 10002 for - various things. Thanks to David Sperry - for reporting this. - -Sat Mar 31 02:06:09 2001 Christopher Kohlhoff - - * ace/config-win32-borland.h: - * include/makeinclude/ace_flags.bor: - Fixed up use of inline functions in DEBUG build. - - * include/makeinclude/ace_flags.bor: - Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory - libraries. - -Fri Mar 30 11:17:39 2001 Carlos O'Ryan - - * bin/fuzz.pl: - Add a couple of TODO entries - - * html/index.html: - Add the Audio/Video Streaming service to the index file. - -Fri Mar 30 11:12:53 2001 Carlos O'Ryan - - * ace/*/Makefile: - * apps/*/Makefile: - * docs/*/Makefile: - * examples/*/Makefile: - * netsvcs/*/Makefile: - * performance-tests/*/Makefile: - * tests/*/Makefile: - * websvcs/*/Makefile: - * ASNMP/*/Makefile: - Regenerate dependencies. - -Fri Mar 30 08:15:26 2001 Carlos O'Ryan - - * ace/QoS/QoS_Session.h: - Add #include for ACE_QoS_Export - -Fri Mar 30 07:31:54 2001 Carlos O'Ryan - - * ace/QoS/QoS_Session.h: - Fixed export macro - -Thu Mar 29 20:14:00 2001 Craig Rodrigues - - * ace/SOCK.h: - Remove include of QoS_Session.h, since it is not used here. - -Thu Mar 29 19:48:00 2001 Craig Rodrigues - - * ace/QoS_Session.h: - * ace/QoS/QoS_Manager.h: - * ace/QoS/QoS_Session_Impl.h: - * ace/QoS/QoS_Session_Factory.h: - * examples/QOS/QoS_Signal_Handler.h: - * examples/QOS/Receiver_QoS_Event_Handler.h: - * examples/QOS/client.cpp: - * examples/QOS/QoS_Util.h: - * examples/QOS/Sender_QoS_Event_Handler.h: - * examples/QOS/server.cpp: - * examples/QOS/Makefile: - - Move QoS_Session.h to the ace/QoS directory. - -Thu Mar 29 19:12:38 2001 Steve Huston - - * include/makeinclude/rules.lib.GNU: AIX-specific changes to - build shared libraries by making a shared shr.o file and putting - that into an archive. Seems weird, but that's the way AIX does - things. This makes ACE consistent with other AIX software. - - * include/makeinclude/platform_aix4_cset++.GNU: Made some changes - to attempt to work with the new scheme for shared lib creation on - AIX. Did not test it, and don't plan to. The CSet++ compiler is not - supported by IBM any longer, and Riverace is not supporting ACE - with it. If someone out there sends patches for this, I'll put - them in, but this file is going away after ACE 5.2 is released. - All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++ - in batch mode) should be with the platform_aix_ibm.GNU file. - -Thu Mar 29 16:16:07 2001 Douglas C. Schmidt - - * ace/Token.cpp (renew): A conditional expression used an && rather - and ||, which was causing problems with ACE_Token. Thanks to - Carsten Madsen for reporting this. - - * ace/Message_Queue_T.cpp: If any of the various ACE_Message_Queue_Ex - enqueue*() methods fail then make sure to release the message - blocks! Thanks to Boris Kolpackov for reporting - this. - -Wed Mar 28 21:39:26 2001 Darrell Brunsch - - * ace/NT_Service.h: - - Changed the ACE_NT_SERVICE macros to use ACE_TEXT_* API - calls for those that can take in unicode strings. - - * examples/NT_Service/main.cpp: - - Fixed use of ACE_NT_SERVICE to work with ACE_USES_WCHAR. - - * examples/OS/Process/process.cpp: - * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp: - - Changed some Win32 API calls to use ACE_TEXT_* equivalents. - - * ace/ace_wchar.h: - - Added all the ACE_TEXT_* API macros needed above. - - Thanks to Nick Pratt for - reporting the first of these errors. - -Wed Mar 28 22:07:03 2001 Nanbor Wang - - * tests/tests.dsw: Fixed project dependencies between DLL_Test and - DLL_Test_Impl. Thanks to Alain Decamps - for reporting this. - -Wed Mar 28 20:33:28 2001 Douglas C. Schmidt - - * ace/ACE.cpp: Further improved the implementation of - handle_ready() by simply calling poll() with the timeout - pointer. Thanks to Przemyslaw Marciniak - for reporting this. - -Wed Mar 28 17:45:22 2001 Steve Huston - - * bin/make_pretty.pl: Adjust the error detector for IBM C/C++ 3.6.6. - - * ace/Containers_T.cpp: Add #include "ace/Log_Msg.h" so IBM C/C++ - can see ACE_DEBUG when compiling template instantiations. - -Wed Mar 28 16:40:24 2001 Luther Baker - - * ace/config-all.h - - Removed ACE_WIN32 support for ACE_HAS_POSIX_SEM just because - ACE_HAS_PACE. This can be defined for ACE_WIN32 after we - write more WIN32 emulation. - - * ace/OS.h - * ace/OS.i - * ace/OS.cpp - - PACE updates. - -Wed Mar 28 11:37:09 2001 Fuzz Master D - - * bin/fuzz.pl: - - There are several instances where fuzz gives false - positives, and the code is impossible to fix without - creating compiler warnings. Example: - - void function (CORBA::Environment &ACE_TRY_ENV) - { - #if FOO - some_other_function (ACE_TRY_ENV); - ACE_CHECK; - #else - ACE_UNUSED_ARG (ACE_TRY_ENV); - #endif - } - - So normally ACE_UNUSED_ARG errors can be fixed by keeping - the CORBA::ENvironment unnamed and removing the ACE_UNUSED_ARG, - but in this case it isn't possible. So fuzz now accepts - an ignore command for single line use. The above can be fixed - by changing to: - - void function (CORBA::Environment &ACE_TRY_ENV) - { - #if FOO - some_other_function (ACE_TRY_ENV); - ACE_CHECK; - #else - ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check - #endif - } - -Tue Mar 28 13:03:07 2001 Chad Elliott - - * bin/make_pretty.pl: - Modification to recognize HP's future errors as warnings. - -Wed Mar 28 11:34:54 2001 Frank Hunleth - - * ace/CDR_Base.inl: - Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY == - 1, since it was causing some TAO unit tests to break (in - particular, the Portable_Interceptors/Service_Context_Manipulation - test). After running Cubit and a few other tests, Purify didn't - notice any more uninitialized memory accesses. Fixes bug #828. - -Wed Mar 28 11:55:39 2001 Steve Huston - - * include/makeinclude/platform_aix_ibm.GNU: New file, replaces - platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces - use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6. - So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6 - and Visual Age C++ 5) use this file. If you want to try to keep - using CSet++ 3.4 or earlier, you can keep using - platform_aix4_cset++.GNU, but it's not tested any longer and - will disappear at the next ACE version. If you want to use - Visual Age C++ 4, you should reconsider, and upgrade to version 5. - - * include/makeinclude/platform_aix_vacpp.GNU: Deleted. - - * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h" - to be after #include "ace/SOCK_Connector.h" to fix compile error - on AIX, Visual Age C++ 5. - - * ace/config-aix-4.x.h: Clarified comments that this file is for - Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what - is now generated from platform_aix_ibm.GNU. - - * bin/auto_compile: - * bin/make_pretty.pl: Add detection of compile/link warnings and - errors for AIX using the IBM compilers' code. Ignores the multiply - defined symbol warnings from ld if it's an ACE symbol. - - * docs/ACE-development-process.html: Changed to link to Bugzilla so - it works from anywhere. - -Wed Mar 28 10:13:16 2001 Steve Huston - - * ace/Makefile.bor: Don't try to build the SSL directory if - SSL_ROOT is not set. - -Wed Mar 28 08:39:26 2001 Carlos O'Ryan - - * etc/tao_av.doxygen: - New configuration file for the AV streaming service. Many - thanks to Craig Rodrigues for converting that - directory. - - * bin/generate_doxygen.pl: - Add the new configuration file. - -Tue Mar 27 19:54:11 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Disable POA/On_Demand_Loading and POA/Loader for Linux/KCC - builds, because that compiler has problems with destructors - after dynamic loading. - Also add the new Hello test to the nightly regression tests. - -Tue Mar 27 19:43:39 2001 Carlos O'Ryan - - * include/makeinclude/platform_linux.GNU: - Add support for Insure++ - - * include/makeinclude/rules.local.GNU: - Add new macro to let developers change the default destination - for the dependencies. - - * include/makeinclude/wrapper_macros.GNU: - Let the user override the default VDIR directory, and define the - default values for the IDL generated code extensions. - - Thanks to Jody Hagins for all these - improvements. - -Tue Mar 27 19:15:36 2001 Carlos O'Ryan - - * ace/Unbounded_Queue.h: - Add required #include for Chorus builds. - -Tue Mar 27 15:28:56 2001 Douglas C. Schmidt - - * ace/ACE.cpp (handle_ready): Don't try to dereference through - a NULL timeout pointer! Thanks to Przemyslaw Marciniak - for reporting this. - -Tue Mar 27 10:08:44 2001 Carlos O'Ryan - - * ace/Select_Reactor_Base.h: - Add missing #include for builds that define - ACE_HAS_REACTOR_NOTIFICATION_QUEUE. - -Tue Mar 27 05:35:38 2001 Christopher Kohlhoff - - * include/makeinclude/make_flags.bor: - Prevent PASCAL build by default with BCB5 since it is not - required. Since both VCL and non-VCL applications share a common - run-time library you can simply link your VCL code with a - non-PASCAL build of the ACE+TAO libraries. This behaviour can be - overridden by defining the FORCE_PASCAL flag. - - * include/makeinclude/build_core_exe.bor: - * include/makeinclude/build_core_library.bor: - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - * include/makeinclude/clean.bor: - Build all executables into a directory below the source directory. - Core executables are then copied to the common bin directory. This - is to allow the test scripts to assume all executables can be - found relative to the source directory. - - * include/makeinclude/recurse.bor: - Removed definition of OBJFILES since Borland make doesn't seem to - support recursive macro expansion. - - * ace/config-win32-borland.h: - * include/makeinclude/ace_flags.bor: - Always explicitly define __ACE_INLINE__, with it defaulting to 1. - This change will allow the same compiler flags to be used in user - applications regardless of whether a debug or non-debug build of - ACE is being used. - -Tue Mar 27 09:48:33 2001 Johnny Willemsen - - * include/makeinclude/ace_flags.bor - Corrected the smartproxies_cflags - - * examples/IPC_SAP - Added new BCB makefiles for these examples - - * ace/Timer_Hash_T.cpp - * ace/Timer_Hash_T.h - * ace/Timer_Heap_T.cpp - * ace/Timer_Heap_T.h - * ace/Timer_List_T.cpp - * ace/Timer_List_T.h - * ace/Timer_Wheel_T.cpp - * ace/Timer_Wheel_T.h - Made the isdone method on the iterator classes constant - - * ace/Timer_Queue_T.h - * ace/Timer_Queue_T.i - Several get methods are now const - Argument of set_timer_value and set_interval is now passed by const reference - - * ace/Unbounded_Set.h - * ace/Unbounded_Set.cpp - * tests/Collection_Test.cpp - Added the ACE_Unbounded_Set_Const_Iterator which can be used - to iterate over an const set - -Mon Mar 26 21:02:24 2001 Darrell Brunsch - - * ace/Log_Msg_NT_Event_Log.cpp: - - Fixed a compilation problem with RegSetValueEx when - ACE_USES_WCHAR and UNICODE were defined. Thanks to Nick - Pratt for reporting this. - - * ace/ace_dll.dsp: - - Unchecked the "separate types" option for debug linking. - Thanks to Nick Pratt for this suggestion also. - -Mon Mar 26 13:00:37 2001 Carlos O'Ryan - - * ace/Node.h: - * ace/Node.cpp: - * ace/Array_Base.h: - * ace/Array_Base.inl: - * ace/Array_Base.cpp: - * ace/Unbounded_Queue.h: - * ace/Unbounded_Queue.inl: - * ace/Unbounded_Queue.cpp: - * ace/Unbounded_Set.h: - * ace/Unbounded_Set.inl: - * ace/Unbounded_Set.cpp: - * ace/Containers_T.h: - * ace/Containers_T.i: - * ace/Containers_T.cpp: - Move several containers to their own file. This reduces the - amount of code that needs to be parsed, improving compilation - time (not to mention the fact that the code becomes more - readable.) - For backwards compatibility the Containers file still includes - the new smaller files. - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - Add new files to the install rules. - Since they are templates they do not need to be compiled on MSVC - so no changes to the project files are required. - - * ace/ARGV.h: - * ace/ARGV.cpp: - * ace/Future.h: - * ace/Handle_Gobbler.h: - * ace/Local_Name_Space.h: - * ace/Malloc_Base.h: - * ace/Memory_Pool.h: - * ace/Name_Space.h: - * ace/Priority_Reactor.h: - * ace/Remote_Name_Space.h: - * ace/Service_Config.h: - * ace/Signal.cpp: - * ace/Signal.h: - * ace/Stats.h: - * ace/Thread_Manager.h: - * ace/Timeprobe_T.h: - * ace/Timer_Heap_T.h: - * ace/Timer_Queue_Adapters.h: - * ace/TkReactor.cpp: - To reduce compilation and recompilation times we only include - the header file that includes the container used in each case, - instead of the full containers class. - -Fri Mar 23 12:40:34 2001 Douglas C. Schmidt - - * apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp: Make sure - to delete the Consumer_Dispatch_Set * that we get back from - unbind(). Thanks to the ever vigilant Mike Winter - for reporting this. - -Thu Mar 22 10:18:24 2001 Douglas C. Schmidt - - * ace/SString.h: Make the various data members protected - rather than private so subclasses can access them. Thanks to - Martin Krumpolec for this suggestion. - - * tests/README: Clarified some things about the tests. - Thanks to Eric Desamore for - motivating this. - -Mon Mar 26 11:03:22 2001 Balachandran - - * ACE version 5.1.14 released. - -Sat Mar 24 07:02:35 2001 Chris Cleeland - - * ace/INET_Addr.i (get_host_addr): Added a const_cast to the - VxWorks-only arm that casts away const on the this ptr so that - inet_ntoa_b can access and fill in the buffer data member that's - used to hold the result from inet_ntoa_b. Thanks to Erik Johannes - for point this out. - -Fri Mar 23 18:01:05 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Some of the tests cannot be run in - Single threaded configurations. Prevented such tests from - running in the nightly builds. - -Fri Mar 23 16:25:18 2001 Balachandran Natarajan - - * tests/New_Fail_Test.cpp: Reverted the change from "Fri Mar 23 - 06:34:33 2001 Balachandran Natarajan ". The - change fails to comipile when exceptions are on. - -Fri Mar 23 08:47:29 2001 Carlos O'Ryan - - * apps/Gateway/Gateway/Options.cpp: - Explicitly #include Log_Msg.h, on platforms that do not define - ACE_TEMPLATES_REQUIRE_SOURCE the header file is not implicitly - included. This should fix compilation problems on Tru64/CXX and - SunCC/4.2 - -Fri Mar 23 06:34:33 2001 Balachandran Natarajan - - * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++, - No_AMI_Messaging builds. Surprising that it showed up only in - this build. - -Thu Mar 22 21:33:37 2001 Chris Cleeland - - * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most - others, and our use was causing memory leaks. VxWorks prefers - that you use its own inet_ntoa_b, which takes the buffer to fill - as an argument. Thus, for VxWorks, added a data member char buf - of the appropriate length so that get_host_addr can use - inet_ntoa_b to fill that in. - - * ace/INET_Addr.i (get_host_addr): For VxWorks only, changed this - to use the preferred inet_ntoa_b. This eliminate memory leaks - under VxWorks. Thanks to Erik Johannes for - the suggested fix. - -Wed Mar 21 19:20:02 2001 Balachandran Natarajan - - * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error - in g++. - -Wed Mar 21 17:28:26 2001 Steve Huston - - * ace/Message_Queue.h: - * ace/Message_Queue_T.h: Moved definition of typedef for - ACE_DEFAULT_MESSAGE_QUEUE_TYPE from Message_Queue.h to - Message_Queue_T.h, just after defining ACE_Message_Queue<>. - Fixes the case where Message_Queue_T.h is included first, - it includes Message_Queue.h before ACE_Message_Queue<> is - defined, and that breaks the compile. IBM C/C++ hit this. - -Wed Mar 21 16:42:19 2001 Steve Huston - - * bin/auto_compile: Added an option: -notao to ignore the TAO aspects - of the non-configurable things, like looking at the TAO/ChangeLog. - Also, now looks for auto_run_tests.lst in the $BUILD/bin directory, - not the $MODULE/bin directory - this allows some builds to specify - their own lists. - -Wed Mar 21 16:00:56 2001 Nanbor Wang - - The followings are contributions from Scott Snyder - to make ACE happy on Digital UNIX with KCC - 3.4d. - - * include/makeinclude/platform_tru64_kcc.GNU: - * include/makeinclude/platform_osf1_4.0_kcc.GNU: Added KCCOPTS and - support for tru64 unix. - - * ace/OS.h: On this platform, we ran into problems with sigwait - being a macro. The fix that had been added for this was keyed - on __DECCXX_VER, so it isn't picked up on this platform. - - * ace/Sock_Connect.cpp: Enum_Interface_Test failed on this - platform. The code in Socket_Connect.cpp that implements this - is conditional on `__unix' being defined. However, with this - compiler, we get `unix' and `__unix__' defined, but not - `__unix'. Fixed by testing for `__unix__' too. - - * ace/ACE.cpp: Cache_Conn_Test was failing. It looks like the - code in ACE::out_of_handles doesn't have a case to handle osf1. - -Wed Mar 21 12:08:35 2001 Nanbor Wang - - The followings are contributions from Scott Snyder - to make ACE happy on IRIX 6.x with KCC 3.4d. - - * include/makeinclude/platform_irix6.x_kcc.GNU: - Disable the following warings and separate common options into - $(KCCOPTS). - - 280: declaration of a member with the same name as its class Get - this from . - - 608: this pragma must immediately precede a declaration or - statement Get this from . - - * ace/OS.h: Changed to only request RTLD_GROUP and RTLD_NODELETE - if they are actually available. - - * ace/config-irix6.x-kcc.h: Undefined - ACE_LACKS_PLACEMENT_OPERATOR_DELETE since KCC actually supports it. - - Config_Test was failing because with the default setup, ace - tries to locate the shared memory pool at 0x04000000. But it - turns out that this is the same address at which irix likes to - load the KCC shared library, libKCC.so. So the memory pool ends - up blowing away all the library code. Fixed by shifting the - default base address to 0x05000000 for this configuration. - - OS_Test was failing because on irix, kcc 4.0d miscompiles - memchr_emulation if +K3 optimization is used. I worked around - this by just using the library version of memchr instead: - - * ace/ACE.cpp: Cached_Conn_Test was failing because the code in - ACE::out_of_handles doesn't have a case to handle irix. - - * tests/DLL_Test.cpp: It died trying to run object dtors. Fixed by - turning off the close-on-destruction flag for this test. - -Wed Mar 21 13:33:58 2001 Ossama Othman - - * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: - - Patched this file so that the example actually works. It now - correctly interacts with the SSL client in this example. Thanks - to Defang Zhou for contributing the - patch/changes necessary to make it work. - -Wed Mar 21 07:23:15 2001 Douglas C. Schmidt - - * tests/SOCK_Connector_Test.cpp (find_another_host): Make the - test a bit more resilent against errors with gethostbyname(). - Thanks to Lu Yunhai for this fix. - -Tue Mar 20 17:31:21 2001 Carlos O'Ryan - - * tests/run_test.lst: - The Logging_Strategy_Test dynamically loads the Logger service - (from netsvcs), therefore it does not work on static builds. - -Tue Mar 20 18:17:24 2001 Douglas C. Schmidt - - * ace/OS.i: Fixed the USYNC_PROCESS arm of CreateMutex() in - ACE_OS::mutex_init() so that it calls - ACE_OS::set_errno_to_last_error(). Thanks to Ram Ben-Yakir - for reporting this. - -Tue Mar 20 01:33:24 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - * ace/SSL/SSL_SOCK_Stream.i (send, close): - - Wrap the underlying OpenSSL calls in a do-while(SSL_pending()) - loop. I decided to wrap the SSL_write() calls just in case. - This should fix the last of the non-blocking IO issues in ACE's - SSL wrappers. [Bug 393] - -Tue Mar 20 00:40:43 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.i (recv): - - Fixed non-blocking IO support for this method. It was necessary - to ensure that a full SSL record was read before returning - control to the caller. Note that the send() method doesn't need - modification since OpenSSL always writes a full record before - returning. [Bug 393] - -Mon Mar 19 19:53:34 2001 Carlos O'Ryan - - * include/makeinclude/ace_flags.bor: - Define macros for the RT Event Service test library - -Mon Mar 19 16:57:43 2001 Irfan Pyarali - - * ace/TP_Reactor.cpp (handle_events): Return value from - handle_events() after the Reactor has been deactivated should be - -1. We just need to remember that as illustrated in - ACE_Reactor::run_reactor_event_loop(), this is not an error: - - if (result == -1 && this->implementation_->deactivated ()) - return 0; - - * tests/Thread_Pool_Reactor_Test.cpp (svr_worker): Changed this - function to call ACE_Reactor::run_reactor_event_loop() instead - of ACE_Reactor::handle_events(). In the previous revision, we - were not handling return values from - ACE_Reactor::handle_events() correctly when - ACE_Reactor::deactivated() had been called. - -Mon Mar 19 09:14:12 2001 Chad Elliott - - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Added an output option to the link command. Linking would fail - in cases where the output was specified in another directory. - -Sun Mar 18 22:12:16 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.i (close): - - Commented out debugging output that was inadvertently committed - to the repository. - - Don't bother invalidating the handle. Doing so can potentially - cause some side-effects in the underlying OpenSSL - implementation since setting the handle in the SSL_SOCK_Stream - also causes the OpenSSL SSL_set_fd() function to be called. - - Fixed a socket leak caused by the fact that the handle was - invalidated before the underlying ACE_SOCK_Stream was closed. - -Sun Mar 18 09:46:47 2001 Balachandran Natarajan - - * tests/New_Fail_Test.cpp: Fixed warnings in g++. - -Sun Mar 18 08:31:34 2001 Douglas C. Schmidt - - * apps/Gateway/Gateway, - * apps/Gateway/Peer: Added a number of fixes to the Gateway and Peer - applications. Thanks to Lu Yunhai for - contributing these. - -Sun Mar 18 08:31:34 2001 Douglas C. Schmidt - - * examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of - casts so that the arguments passed to printf() will match the - format specifier types. - -Sat Mar 17 18:02:28 2001 Steve Huston - - * ace/config-aix-4.x.h: Fixed settings for exceptions and - placement delete to be ok for Visual Age C++ 5. - - * include/makeinclude/platform_aix_vacpp.GNU: Basically new, - works with the Visual Age C++ 5 batch mode build on AIX. - - * include/makeinclude/rules.lib.GNU: Added aix_build piece to - the section for linking a shared library. It uses the linker - to generate a shr.o (shared) file, then inserts that into - the library that's being built. This new section is only - used with platform_aix_vacpp.GNU at this point. - -Fri Mar 16 15:07:23 2001 Ossama Othman - - * ace/SSL/SSL_Context.h (set_mode): - - Changed the default mode from SSLv3 to SSLv23, i.e. support - SSLv2 and SSLv3 by default. This fixes interoperability - with applications that use Sun's JSSE, which only supports - SSLv2. Thanks to Max Khon for providing the - patch. - -Thu Mar 15 17:47:28 2001 Balachandran Natarajan - - * tests/Log_Msg_Test.cpp: Changed a ERROR message as a DEBUG - message. If it is an error message the scripts that run the - build gets confused. - -Thu Mar 15 17:42:54 2001 Balachandran Natarajan - - * tests/Logging_Strategy_Test.cpp: Changed the "-s" option in the - test to write the output in to the output generated in the "log" - directory. This is just a hack to make the scoreboard clean. - -Thu Mar 15 15:55:37 2001 Steve Huston - - * ace/Message_Queue_T.h: Add #include "ace/Message_Queue.h" so - IBM Visual Age C++ sees ACE_Message_Queue_Base when instantiating - templates. - - * ace/ace-dll.icc: Fixed after being munged in a previous commit. - Also, corrected libACE.a generation and cleanup, and incorporated - fixes from Steve Ige and Jerry - Odenwelder . - - * THANKS: Added Steve Ige to the Hall of Fame. - -Thu Mar 15 11:26:35 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Acceptor.i (ACE_SSL_SOCK_Acceptor): - - Make sure the handle is set for the ACE_SSL_SOCK_Acceptor, after - initializing the underlying ACE_SOCK_Acceptor. This ensures - that OpenSSL has the proper handle. Thanks to Greg McCain - for suggesting this fix. - - * THANKS: - Added Greg to the hall of the fame. - -Thu Mar 15 05:46:59 2001 Douglas C. Schmidt - - * ace/FILE_Addr.cpp (ACE_FILE_Addr): Make sure to divide the size of - the filename_ by the sizeof (ACE_TCHAR) to handle unicode - correctly. Thanks to the ever vigilant Ivan Murphy for catching - this! - -Wed Mar 14 01:47:10 2001 Nanbor Wang - - * apps/Gateway/Gateway/Makefile: - * apps/Gateway/Peer/Makefile: - * apps/JAWS/server/Makefile: - * apps/gperf/tests/Makefile: - * examples/ASX/CCM_App/Makefile: - * examples/Service_Configurator/IPC-tests/server/Makefile: - * examples/Service_Configurator/Misc/Makefile: - * examples/Timer_Queue/Makefile: - * netsvcs/clients/Naming/Client/Makefile: - * netsvcs/clients/Naming/Dump_Restore/Makefile: Removed - unnecessary 'LIBS += $(ACELIB)'. They were causing link problem - for the latest KCC. compiner. - -Tue Mar 13 20:56:10 2001 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (remove_to_be_added_handler_i): - * ace/WFMO_Reactor.cpp (remove_suspended_handler_i): - * ace/WFMO_Reactor.cpp (remove_handler_i): - - If a user tried to (a) remove a "to be suspended handle" from - either the current info set or the to be added set, the handle - was correctly removed but the "to be suspended handle" count was - not reduced; (b) remove a "to be resumed handle" from the - suspended set, the handle was correctly removed but the "to be - resumed handle" count was not reduced. Since the "to be resumed - handle" and the "to be suspended handle" were not adjusted - properly, the reactor kept waking up thinking that changes were - required. Thanks to Lu Yunhai for - reporting this problem. - - * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp: Added - an extensive example for regression testing the above use cases. - -Tue Mar 13 15:23:04 2001 Nanbor Wang - - * ace/Service_Manager.cpp (list_services): Fixed Unicode bugs. - -Tue Mar 13 15:13:48 2001 Nanbor Wang - - * tests/Logging_Strategy_Test.cpp: Fixed Unicode related bugs. - -Tue Mar 13 10:04:06 2001 Carlos O'Ryan - - * performance-tests/TCP/run_test.pl: - Fixed the path to the $ACE_ROOT/bin directory, now the script - runs again. - -Tue Mar 13 06:04:03 2001 Douglas C. Schmidt - - * ace/Service_Manager.cpp (list_services): Add an indication of whether - a service is active or paused. Thanks to Mike Curtis for this - improvement. - - * ace/Reactor.h: Clarified that the remove_handler (handle, mask) - method also removes the event handle. Thanks to Pierre Fayolle - for reporting this. - - * tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat - with ACE_stat. Thanks to Johnny Willemsen for reporting this. - -Tue Mar 13 00:35:35 2001 Irfan Pyarali - - * ace/Select_Reactor_T.i (deactivated): Reverted this change - regarding Select_Reactor_T::deactivated(): - - Thu Feb 22 12:28:15 2001 Irfan Pyarali - - Though my change improved correctness of access and change to - the variable, it had a negative consequence: the - event loop calls Select_Reactor_T::deactivated() before calling - Select_Reactor_T::handle_events() to make sure that the reactor - is not closed yet. Unfortunately, if - Select_Reactor_T::deactivated() has a guard, it will send a null - event waking up the current leader and thus lead to unnecessary - thrashing. For now, I have removed the guard from the - Select_Reactor_T::deactivated() methods. We should revisit this - issue some time again. This fixes bug 816. - -Mon Mar 12 16:30:32 2001 Balachandran Natarajan - - * tests/Logging_Strategy_Test.cpp (main): Fixed the rest of the - warnings in VxWorks builds. - -Mon Mar 12 16:21:42 2001 Balachandran Natarajan - - * tests/Logging_Strategy_Test.cpp (main): Fixed a couple of - warnings in VxWorks build. Couple of more warnings are left. - -Mon Mar 12 14:16:03 2001 Balachandran Natarajan - - * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed a compile - error on Win32 Unicode platforms. - -Mon Mar 12 12:12:36 2001 Nanbor Wang - - * ACE-INSTALL.html: Also mentioned Windows 2000 explicitly in the - document. Thanks to Rahul Shukla for - raising the question. - -Mon Mar 12 00:49:24 2001 Nanbor Wang - - * tests/tests.dsw: - * tests/Logging_Strategy_Test.dsp: Added a new dsp file. - -Sun Mar 11 21:00:16 2001 Carlos O'Ryan - - * bin/auto_compile: - Print out the config.h and platform_macros.GNU files, this is - useful when debugging builds. - -Sun Mar 11 18:41:08 2001 Douglas C. Schmidt - - * ace/CDR_Stream.h: Updated a comment to clarify that the buffer() - method just returns a pointer to the first block in the chain. - Thanks to Johnny Willemsen for pointing this out. - -Sun Mar 11 17:46:45 2001 Balachandran Natarajan - - * ace/Local_Name_Space_T.cpp: Fixed a compiler error on Win32 - Unicode platforms. - -Sun Mar 11 17:28:40 2001 Irfan Pyarali - - * ace/QoS/QoS_Session_Impl.cpp (rsvp_callback): was unused. - -Sun Mar 11 08:31:05 2001 Douglas C. Schmidt - - * tests/Makefile.bor (NAMES): Added Logging_Strategy_Test. - -Sun Mar 11 07:32:18 2001 Balachandran Natarajan - - * tests/Logging_Strategy_Test.cpp (order): Fixed a warning in g++ - builds. - -Sat Mar 10 23:15:10 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Fixed name of Crashed_Callback test - -Sat Mar 10 19:28:30 PST 2001 Mayur Deshpande - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Fixes to enable debugging on QNX without ACE crashing. - Thanks to Andy Olson for the suggestions. - -Sat Mar 10 19:05:38 2001 Darrell Brunsch - - * ace/config-win32.h: - - Include config-win32-common.h even on Windows CE. - - * ace/config-win32-msvc-6.h: - - If ACE_ENDTHREADEX is already defined, don't define it. - - * ace/OS_Dirent.h: - - Changed the use of ACE_WINCE to ACE_HAS_WINCE. - - * ace/Service_Manager.cpp: - - Fixed a couple of ACE_TCHAR/ACE_LIB_TEXT problems. - - * ace/ace_wchar.h: - - On Windows CE, #include wtypes.h. - - * ace/ace_dll.vcp: - * ace/ace_os_dll.vcp: - - Redid the output files and directories. Now intermediate - files go into Release/PLATFORM and Debug/PLATFORM (where - PLATFORM = MIPS/ARM/X86EM/SH3/SH4). The *.lib files go - into ../Lib/PLATFORM and the *.dll into ../bin/PLATFORM. - Also, the DLL's were renamed from ace_dll.dll and - ace_os_dll.dll to ace[d].dll and ace_os[d].dll. - - * bin/pippen.pl: - - Changed the environment variables from DEFAULT_COMPILER and - DEFAULT_CONFIGS to PIPPEN_COMPILER and PIPPEN_CONFIGS. Also - used \Q\E for the configs because some of the Windows CE - configs confused the script because they use parentheses. - -Sat Mar 10 16:59:51 2001 Carlos O'Ryan - - * ACE-INSTALL.html: - Remove references to the now obsolete config-linux-lxpthreads.h - and platform_linux_lxpthread.GNU - -Sat Mar 10 16:38:22 2001 Carlos O'Ryan - - * tests/run_test.lst: - Running the Recursive_Mutex_Test on single-threaded builds makes - very little sense. - -Sat Mar 10 16:35:19 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Add new tests: Muxing, Crashed_Callback, Client_Leaks and - Server_Leaks to the nightly runs. - -Sat Mar 10 17:55:53 2001 Douglas C. Schmidt - - * include/makeinclude: Zapped the platform_linux_pthread.GNU, - platform_linux_lxpthread.GNU, and platform_linux_lxpthreads.GNU - files since they are confusing and shouldn't not be used in - favor of platform_linux.GNU. - - * ace: Zapped the config-linux.pthread.h and config-linux-lxpthreads.h - file since they are confusing and shouldn't not be used in favor - of config-linux.h. Thanks to Craig Rodrigues for this - suggestion. - -Sat Mar 10 12:39:16 2001 Craig Rodrigues - - * ace/Reactor.h: - * ace/WFMO_Reactor.h: - * ace/Select_Reactor_T.h: - * ace/Reactor_Impl.h: - Cleaned up comment for schedule_timer() - -Sat Mar 10 07:05:16 2001 Douglas C. Schmidt - - * tests: Added Logging_Strategy_Test.cpp. Thanks to Orlando - Ribeiro for contributing this. - - * tests/Makefile (BIN): Added Logging_Strategy_Test. - - * tests/run_test.lst: Added Log_Msg_Test and - the new Logging_Strategy_Test. - - * tests/Log_Msg_Test.cpp: Added ACE_TEXT macros to all the ACE_DEBUG and - ACE_ERROR calls. - - * ace/Service_Manager.{h,cpp}: Refactored the request processing - code so that it's in a single place. Also, added support to - enable remote reconfiguration. Thanks to Mike Curtis - for contributing this. - - * ace/Logging_Strategy.cpp (parse_args): Fixed a mistaken - re-initialization of the thread_priority_mask_ and the - process_priority_mask_. Thanks to Martin Krumpolec - for reporting this. - - * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed this code so that - it doesn't fail if run on a directory that doesn't support locks - (like some NFS mounts). Thanks to scott snyder - for reporting this. - - * tests/SOCK_Connector_Test.cpp: Split up a loop so that the test - doesn't hang on RedHat Linux 7.0. Thanks to Michael Searles - for this fix. - -Fri Mar 9 22:39:28 2001 Carlos O'Ryan - - * ace/Svc_Conf.h: - * ace/Service_Config.h: - * ace/Service_Config.cpp: - Add new method to the Service Configurator to add static - services into the repository, this factors out common code used - in the ORB and ACE. In general it fixes the hacks done this - past Feb 20th - -Fri Mar 9 16:47:15 2001 Priyanka Gontla - - * bin/nightlybuilds/builds.lst (LIST): - Added HPUX to the scoreboard. - -Fri Mar 9 14:34:34 2001 Chad Elliott - - * PACE/Makefile: - * apps/drwho/Makefile: - * bin/PerlACE/Process_Unix.pm: - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Modifications to make things build and run correctly with - Chorus 4.0.1. - -Thu Mar 8 08:38:01 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - The Single_Threaded_POA test cannot run with minimum CORBA or - (isn't this ironic) on single threaded configurations. - -Wed Mar 07 20:25:51 2001 Carlos O'Ryan - - * bin/nightlybuilds/builds.lst: - Add QNX to the configurations in the scoreboard. - -Wed Mar 7 12:41:05 2001 Douglas C. Schmidt - - * ace/Select_Reactor_T.h, - * ace/Reactor_Impl.h, - * ace/WFMO_Reactor.h, - * ace/Reactor.h: Updated the comments to be more accurate. Thanks - to Craig Rodrigues for reporting this. - -Wed Mar 7 08:57:42 2001 Darrell Brunsch - - * ace/Asynch_IO.h: - Changed use of ACE_UNIMPLEMENTED_FUNC to just defining the - assignment operators outright. The point here is to just - provide any implementation, since the default one is flagged as - causing infinite recursion. - - Thanks to David Levine for pointing out this incorrect usage of - the macro. - - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - - @file comments were mismatched. - - * ace/config-win32.h: - - Changed config-win32-wince.h to config-WinCE.h. - - * ace/ace_wchar.h: - * ace/Log_Msg_NT_Event_Log.cpp: - - Changed several system calls to ACE_TEXT_* (and needed to - add some to ace_wchar.h) since they need the ACE_TEXT - treatment. - -Wed Mar 7 08:20:01 2001 Chad Elliott - - * ace/ARGV.cpp: - - Removed a warning about possible use of uninitialized variable. - - * bin/ace_ld: - - Added new functionality to filter out the harmless symbol size - change warnings for VxWorks 5.4. - - * examples/Shared_Malloc/test_multiple_mallocs.cpp: - * examples/Shared_Malloc/test_persistence.cpp: - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - - Renamed the typedef MALLOC to TEST_MALLOC. A MALLOC macro is - defined by a VxWorks system header. - -Wed Mar 7 06:11:52 2001 Douglas C. Schmidt - - * ace/Asynch_IO.h: Removed the unnecessary/improper ';' at the - end of the line. Thanks to Johnny Willemsen and Chris Kohlhoff - for reporting/fixing this. - - * ace/*_Connector.h: Clarified in the comments that the - ACE_Time_Value *timeout represents the *maximum* amount of time - to wait. If the server is not running, however, connect() can - return much sooner. Thanks to Dipti Jain - for motivating this. - -Tue Mar 6 14:14:06 2001 Darrell Brunsch - - Here are some fixes for MSVC 7 beta. Note that no project files - are checked in. Right now they will have to be generated from - the MSVC 5/6 files (The devenv.exe will do this automatically). - When MSVC 7 becomes released, we'll probably have to deal with - including their files (even if only for nightly builds). - - * ace/OS.h: - * ace/config-win32-msvc.h: - - Moved the inclusion of the crtdbg.h file to where it is being - used. This is mainly to alleviate some excessive inclusions. - - * ace/config-WinCE.h: - * ace/config-win32.h: - * ace/config-win32-msvc-5.h: (added) - * ace/config-win32-msvc-6.h: (added) - * ace/config-win32-msvc-7.h: (added) - * ace/config-win32-borland.h: - * ace/config-win32-common.h: - * ace/config-win32-ghs.h: - * ace/config-win32-msvc.h: - * ace/config-win32-visualage.h: - - Added a new config-win32-msvc-7.h with some new settings. While - doing this I also rearranged the files a bit. Everything now - goes through config-win32.h (and an error will occur if you - include the others directly). - - * ace/config-hpux-10.x-hpc++.h: - * ace/config-hpux-11.00.h: - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - * ace/README: - - Removed ACE_HAS_ONE_DEFINITION_RULE. Could not find this - actually used anywhere so I'm assuming it can be safely - removed. - - * ace/Asynch_IO.h: - - Added some dummy assignment operators. It seems that the default - ones produce infinite recursion (at least with MSVC 6 SP5 and - MSVC 7 beta) - - * ace/Future.h: - - Future_Holder needs to be ACE_Export-ed. - -Tue Mar 6 16:58:17 2001 Balachandran Natarajan - - * ace/ACE.cpp (format_hexdump): The format_hexdump () was missing - a space if the remaining message that needs dumping was less - than 16 bytes. Thansk to Johnny Willemsen" - for giving this fix. - -Tue Mar 6 11:25:53 2001 Carlos O'Ryan - - * bin/PerlACE/Process_Unix.pm: - Ignore SIGABRT too, because it is used by abort() and we call - that function to test the ORB under fault conditions. - -Tue Mar 6 12:25:34 2001 Chad Elliott - - * configure.in: - - The configure script was broken on major releases (i.e. those with - no beta numbers). A test for an empty string should have double - quotes around the variable. - -Tue Mar 6 10:16:31 2001 Darrell Brunsch - - * ace/config-win32-common.h: - Removed old comment about ACE_HAS_WINSOCK2 being related to - ACE_HAS_WINNT4. Thanks to Johnny Willemsen - for pointing this out. - -Tue Mar 6 10:13:03 2001 Carlos O'Ryan - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Membership_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Reordering_Test.cpp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - Use ACE_OS::time(0) to initialize the pseudo-random numbers - seed. It is good enough for our purposes, and it works on - platforms without 64-bit integer support. - -Mon Mar 5 13:56:33 2001 Douglas C. Schmidt - - * ace/Synch_T.{h,i}: Further simplified the new ACE_Guard constructor. - Thanks to Chris Kohlhoff for contributing - this. - -Mon Mar 5 19:20:45 2001 Fuzz Master D - - * bin/fuzz.pl: - As Ossama pointed out, the ACE_CHECK test was seeing - problems in the tao_idl files since it has uses of ACE_TRY_ENV - inside quotes. Made sure not to detect problems in this case. - -Mon Mar 5 18:58:32 2001 Fuzz Master D - - * bin/fuzz.pl: - Fixed some false positives in the resolve_initial_reference - test and also added an ACE_CHECK test by Carlos's request. - -Mon Mar 5 18:54:42 2001 Darrell Brunsch - - * bin/PerlACE/Process_Unix.pm: - Updated the signal detection to not pay attention to TERM and - KILL. Will print out better output when signals cause a process - to exit during most calls like Kill () or TerminateWaitKill (). - -Mon Mar 5 13:56:33 2001 Douglas C. Schmidt - - * ace/Synch_T.{h,i}: Added a new ACE_Guard constructor that - allows the caller to select whether the guard owns/acquires the - lock or not. Thanks to Chris Kohlhoff for - contributing this. - - * ace/Synch_T.{h,i}: Added a disown() method that relinquishes - ownership of the lock so that it is not released implicitly in - the destructor. Thanks to Chris Kohlhoff - for contributing this. - - * ace/Event_Handler.h: Updated the comment on handle_close() so that - it more accurately reflects what is going on. Thanks to Defang - Zhou for suggesting this. - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.{h,cpp}: Added - handle_close() operations to solve problems with certain - concurrency models. Thanks to Defang Zhou - for reporting this. - -Mon Mar 5 11:29:36 2001 Carlos O'Ryan - - * docs/ACE-categories.html: - Fixed links to the doxygen files. - - * ace/Pipe.cpp: - Fixed what looks like a typo, we want to *disable* the stream - pipes under QNX, not to enable them just on that platform. - -Mon Mar 5 08:20:21 2001 Carlos O'Ryan - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - Undo Doug's changes. They broke the test. - -Mon Mar 5 07:52:52 2001 Douglas C. Schmidt - - * ace/Log_Record.cpp (priority): Clarified the behavior of the - priority() set/get methods. Thanks to Christian Schuhegger - for reporting this. - - * tests/RMCast/RMCast_Fragment_Test.cpp, - * tests/RMCast/RMCast_Reassembly_Test.cpp, - * tests/Dynamic_Priority_Test.cpp, - * tests/Thread_Pool_Test.cpp: Make sure to write into the - wr_ptr() rather than the rd_ptr(). Thanks to Gonzalo Diethelm - for reporting this. - -Mon Mar 5 08:00:23 2001 Chad Elliott - - * bin/nightlybuilds/builds.lst: - - Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds. - -Mon Mar 05 00:10:15 2001 Ossama Othman - - * bin/fuzz.pl: - - Updated to detect missing ACE_TRY_ENV parameters in - ORB::resolve_initial_references() calls when emulated exceptions - are used. Thanks to Darrell for providing this update. - -Mon Mar 5 07:57:07 2001 Johnny Willemsen - - * tests/Makefile.bor: - - Added missing Refcounted_Auto_Ptr_Test to the build - -Sun Mar 4 19:31:16 2001 Darrell Brunsch - - * bin/auto_run_tests.lst: - - Added the run_test_mt.pl for Leader_Follers. - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - Added a destructor to detect if a process wasn't explicitly - killed before the object went out of scope. Will print out - an error and kill it. - - * bin/PerlACE/Run_Test.pm: - - Turned on autoflush for all scripts. - - * docs/run_test.txt: - - Updated run_test.pl instructions to fit all the changes I - just made. - - * examples/Export/run_test.pl: - * performance-tests/RPC/run_test.pl: - * performance-tests/TCP/run_test.pl: - * performance-tests/UDP/run_test.pl: - - Updated to use PerlACE::Run_Test; - - * tests/Atomic_Op_Test.dsp: - * tests/Auto_IncDec_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Basic_Types_Test.dsp: - * tests/Buffer_Stream_Test.dsp: - * tests/CDR_Array_Test.dsp: - * tests/CDR_File_Test.dsp: - * tests/CDR_Test.dsp: - * tests/Cache_Map_Manager_Test.dsp: - * tests/Cached_Accept_Conn_Test.dsp: - * tests/Cached_Conn_Test.dsp: - * tests/Capabilities_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Config_Test.dsp: - * tests/Conn_Test.dsp: - * tests/DLL_Test.dsp: - * tests/DLList_Test.dsp: - * tests/Dirent_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/Enum_Interfaces_Test.dsp: - * tests/Env_Value_Test.dsp: - * tests/Future_Set_Test.dsp: - * tests/Future_Test.dsp: - * tests/Handle_Set_Test.dsp: - * tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/Hash_Map_Manager_Test.dsp: - * tests/High_Res_Timer_Test.dsp: - * tests/IOStream_Test.dsp: - * tests/Lazy_Map_Manager_Test.dsp: - * tests/Log_Msg_Test.dsp: - * tests/MEM_Stream_Test.dsp: - * tests/MM_Shared_Memory_Test.dsp: - * tests/MT_Reactor_Timer_Test.dsp: - * tests/MT_SOCK_Test.dsp: - * tests/Malloc_Test.dsp: - * tests/Map_Manager_Test.dsp: - * tests/Map_Test.dsp: - * tests/Mem_Map_Test.dsp: - * tests/Message_Block_Test.dsp: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/Message_Queue_Test.dsp: - * tests/Message_Queue_Test_Ex.dsp: - * tests/Naming_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Notify_Performance_Test.dsp: - * tests/OS_Test.dsp: - * tests/Object_Manager_Test.dsp: - * tests/OrdMultiSet_Test.dsp: - * tests/Pipe_Test.dsp: - * tests/Priority_Buffer_Test.dsp: - * tests/Priority_Reactor_Test.dsp: - * tests/Priority_Task_Test.dsp: - * tests/Process_Manager_Test.dsp: - * tests/Process_Mutex_Test.dsp: - * tests/Process_Strategy_Test.dsp: - * tests/RB_Tree_Test.dsp: - * tests/Reactor_Exceptions_Test.dsp: - * tests/Reactor_Notify_Test.dsp: - * tests/Reactor_Performance_Test.dsp: - * tests/Reactor_Timer_Test.dsp: - * tests/Reactors_Test.dsp: - * tests/Reader_Writer_Test.dsp: - * tests/Recursive_Mutex_Test.dsp: - * tests/Refcounted_Auto_Ptr_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/SOCK_Test.dsp: - * tests/SPIPE_Test.dsp: - * tests/SString_Test.dsp: - * tests/SV_Shared_Memory_Test.dsp: - * tests/Semaphore_Test.dsp: - * tests/Service_Config_Test.dsp: - * tests/Sigset_Ops_Test.dsp: - * tests/Simple_Message_Block_Test.dsp: - * tests/Svc_Handler_Test.dsp: - * tests/TSS_Test.dsp: - * tests/Task_Test.dsp: - * tests/Thread_Manager_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Thread_Pool_Reactor_Test.dsp: - * tests/Thread_Pool_Test.dsp: - * tests/Time_Service_Test.dsp: - * tests/Time_Value_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Timer_Queue_Test.dsp: - * tests/Tokens_Test.dsp: - * tests/UPIPE_SAP_Test.dsp: - * tests/Upgradable_RW_Test.dsp: - * tests/version_tests/Atomic_Op_Test.dsp: (removed) - * tests/version_tests/Auto_IncDec_Test.dsp: (removed) - * tests/version_tests/Barrier_Test.dsp: (removed) - * tests/version_tests/Basic_Types_Test.dsp: (removed) - * tests/version_tests/Buffer_Stream_Test.dsp: (removed) - * tests/version_tests/CDR_Array_Test.dsp: (removed) - * tests/version_tests/CDR_File_Test.dsp: (removed) - * tests/version_tests/CDR_Test.dsp: (removed) - * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed) - * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed) - * tests/version_tests/Cached_Conn_Test.dsp: (removed) - * tests/version_tests/Capabilities_Test.dsp: (removed) - * tests/version_tests/Collection_Test.dsp: (removed) - * tests/version_tests/Config_Test.dsp: (removed) - * tests/version_tests/Conn_Test.dsp: (removed) - * tests/version_tests/DLL_Test.dsp: (removed) - * tests/version_tests/DLList_Test.dsp: (removed) - * tests/version_tests/Dirent_Test.dsp: (removed) - * tests/version_tests/Dynamic_Priority_Test.dsp: (removed) - * tests/version_tests/Enum_Interfaces_Test.dsp: (removed) - * tests/version_tests/Env_Value_Test.dsp: (removed) - * tests/version_tests/Future_Set_Test.dsp: (removed) - * tests/version_tests/Future_Test.dsp: (removed) - * tests/version_tests/Handle_Set_Test.dsp: (removed) - * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed) - * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed) - * tests/version_tests/High_Res_Timer_Test.dsp: (removed) - * tests/version_tests/IOStream_Test.dsp: (removed) - * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed) - * tests/version_tests/Log_Msg_Test.dsp: (removed) - * tests/version_tests/MEM_Stream_Test.dsp: (removed) - * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed) - * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed) - * tests/version_tests/MT_SOCK_Test.dsp: (removed) - * tests/version_tests/Malloc_Test.dsp: (removed) - * tests/version_tests/Map_Manager_Test.dsp: (removed) - * tests/version_tests/Map_Test.dsp: (removed) - * tests/version_tests/Mem_Map_Test.dsp: (removed) - * tests/version_tests/Message_Block_Test.dsp: (removed) - * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed) - * tests/version_tests/Message_Queue_Test.dsp: (removed) - * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed) - * tests/version_tests/Naming_Test.dsp: (removed) - * tests/version_tests/New_Fail_Test.dsp: (removed) - * tests/version_tests/Notify_Performance_Test.dsp: (removed) - * tests/version_tests/OS_Test.dsp: (removed) - * tests/version_tests/Object_Manager_Test.dsp: (removed) - * tests/version_tests/OrdMultiSet_Test.dsp: (removed) - * tests/version_tests/Pipe_Test.dsp: (removed) - * tests/version_tests/Priority_Buffer_Test.dsp: (removed) - * tests/version_tests/Priority_Reactor_Test.dsp: (removed) - * tests/version_tests/Priority_Task_Test.dsp: (removed) - * tests/version_tests/Process_Manager_Test.dsp: (removed) - * tests/version_tests/Process_Mutex_Test.dsp: (removed) - * tests/version_tests/Process_Strategy_Test.dsp: (removed) - * tests/version_tests/RB_Tree_Test.dsp: (removed) - * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed) - * tests/version_tests/Reactor_Notify_Test.dsp: (removed) - * tests/version_tests/Reactor_Performance_Test.dsp: (removed) - * tests/version_tests/Reactor_Timer_Test.dsp: (removed) - * tests/version_tests/Reactors_Test.dsp: (removed) - * tests/version_tests/Reader_Writer_Test.dsp: (removed) - * tests/version_tests/Recursive_Mutex_Test.dsp: (removed) - * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed) - * tests/version_tests/Reverse_Lock_Test.dsp: (removed) - * tests/version_tests/SOCK_Connector_Test.dsp: (removed) - * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed) - * tests/version_tests/SOCK_Test.dsp: (removed) - * tests/version_tests/SPIPE_Test.dsp: (removed) - * tests/version_tests/SString_Test.dsp: (removed) - * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed) - * tests/version_tests/Semaphore_Test.dsp: (removed) - * tests/version_tests/Service_Config_Test.dsp: (removed) - * tests/version_tests/Sigset_Ops_Test.dsp: (removed) - * tests/version_tests/Simple_Message_Block_Test.dsp: (removed) - * tests/version_tests/Svc_Handler_Test.dsp: (removed) - * tests/version_tests/TSS_Test.dsp: (removed) - * tests/version_tests/Task_Test.dsp: (removed) - * tests/version_tests/Thread_Manager_Test.dsp: (removed) - * tests/version_tests/Thread_Mutex_Test.dsp: (removed) - * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed) - * tests/version_tests/Thread_Pool_Test.dsp: (removed) - * tests/version_tests/Time_Service_Test.dsp: (removed) - * tests/version_tests/Time_Value_Test.dsp: (removed) - * tests/version_tests/Timeprobe_Test.dsp: (removed) - * tests/version_tests/Timer_Queue_Test.dsp: (removed) - * tests/version_tests/Tokens_Test.dsp: (removed) - * tests/version_tests/UPIPE_SAP_Test.dsp: (removed) - * tests/version_tests/Upgradable_RW_Test.dsp: (removed) - * tests/version_tests/run_all_tests.bat: (removed) - * tests/version_tests/version_tests.dsw: (removed) - - Moved the version_tests back into the tests/*.dsp files. The - reason they were originally moved is because it was easier to - select all the debug versions during a batch build. But now we - have pippen.pl and msvc_auto_compile.pl, so this is no longer an - issue, while this strange setup would compilicate the nightly - builds. Thus, it was standardized back. - - * bin/create_vt_dsps.pl: (removed) - - No need for this anymore. - -Sun Mar 4 19:27:42 2001 Darrell Brunsch - - * ace/Log_Msg.cpp: - * ace/Log_Msg_NT_Event_Log.h: - * ace/OS.cpp: - - Disabled Log_Msg_NT_Event_Log on Windows CE. - -Sun Mar 04 13:19:35 2001 Carlos O'Ryan - - * etc/tao.doxygen: - Add .txt files, so we can add web pages to the basic TAO - documentation. - -Sun Mar 04 10:58:08 2001 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT - project files. - -Sun Mar 4 10:41:57 2001 Douglas C. Schmidt - - * ace/Log_Msg.cpp, - ace/Log_Msg.h, - ace/Logging_Strategy.cpp, - ace/Makefile.bor, - ace/OS.cpp, - ace/OS.h, - ace/OS.i, - ace/ace.rc: Added support for the new NT event logging capability. - Thanks to Chris Kohlhoff for contributing this. - - * ace/Log_Msg_NT_Event_Log.cpp - ace/Log_Msg_NT_Event_Log.h - ace/ace_message_table.bin: Added these files to support the new - NT event logging capability. - Thanks to Chris Kohlhoff for contributing - this. - -Sun Mar 4 04:46:44 2001 Darrell Brunsch - - * bin/nightlybuilds/builds.lst: - - Added new Windows CE nightly build. - -Sun Mar 04 03:12:17 2001 Nanbor Wang - - * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly - typed in as ACE_STATIC_LIBS. - - * ace/svc_export.h: - * ace/RMCast/RMCast_Export.h: - * ace/SSL/SSL_Export.h: - * websvcs/lib/websvcs_export.h: These files didn't check for - ACE_AS_STATIC_LIBS to determine if they should define their - export macros for static build. Thanks to Chris Kohlhoff - for reporting this. [Bug 813] - -Sat Mar 3 19:07:31 2001 Pradeep Gore - - * ace/QoS/QoS_Session_Impl.cpp: - * ace/QoS/QoS_Session_Impl.i: - * examples/QOS/Fill_ACE_QoS.cpp: - * examples/QOS/Fill_ACE_QoS.h: - * examples/QOS/Makefile: - * examples/QOS/QoS_Util.cpp: - * examples/QOS/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Sender_QoS_Event_Handler.cpp: - Fixed various compile warnings when compiling with rapi=1 on - Redhat Linux 6.2 - -Sat Mar 3 16:47:53 2001 Darrell Brunsch - - * bin/fuzz.pl: - - Changed the detection pattern a bit to pick up - stuff like: - - void - operator < (...) - - better. - - * ace/Auto_Ptr.i: - * ace/Base_Thread_Adapter.cpp: - * ace/Based_Pointer_T.i: - * ace/Connector.cpp: - * ace/Containers_T.cpp: - * ace/DEV_Addr.i: - * ace/Dynamic.i: - * ace/FILE.cpp: - * ace/Flag_Manip.i: - * ace/Handle_Set.i: - * ace/Hash_Map_Manager_T.cpp: - * ace/Lib_Find.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Local_Tokens.cpp: - * ace/MEM_Addr.i: - * ace/Malloc.cpp: - * ace/Malloc_Allocator.cpp: - * ace/Malloc_T.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Block.cpp: - * ace/Message_Block.i: - * ace/Message_Block_T.cpp: - * ace/Message_Queue.i: - * ace/Message_Queue_T.cpp: - * ace/Message_Queue_T.i: - * ace/Naming_Context.cpp: - * ace/OS.cpp: - * ace/OS.i: - * ace/PI_Malloc.cpp: - * ace/POSIX_Asynch_IO.cpp: - * ace/Process_Manager.cpp: - * ace/QtReactor.cpp: - * ace/RB_Tree.i: - * ace/RW_Process_Mutex.cpp: - * ace/Reactor.cpp: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Tokens.cpp: - * ace/SOCK_Dgram.i: - * ace/SString.cpp: - * ace/SUN_Proactor.cpp: - * ace/Select_Reactor_Base.cpp: - * ace/Select_Reactor_T.cpp: - * ace/Service_Object.i: - * ace/Service_Repository.cpp: - * ace/Signal.cpp: - * ace/Signal.i: - * ace/Svc_Handler.cpp: - * ace/Synch.cpp: - * ace/Synch_T.cpp: - * ace/Thread_Adapter.cpp: - * ace/Thread_Manager.cpp: - * ace/Timer_Heap_T.cpp: - * ace/TkReactor.cpp: - * ace/Token.cpp: - * ace/Token_Manager.cpp: - * ace/CLASSIX/CLASSIX_CO_Acceptor.i: - * ace/CLASSIX/CLASSIX_Select_Reactor.cpp: - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: - * netsvcs/ACE-netsvcs.html: - * netsvcs/lib/Server_Logging_Handler_T.cpp: - * netsvcs/lib/Token_Handler.cpp: - - Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors) - - * docs/ACE-categories.html: - * docs/ACE-porting.html: - * docs/ACE-subsets.html: - * docs/tutorials/new-tutorials.html: - - Changed references to - http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to - relative paths instead (Fixes the last of the fuzz errors). - -Fri Mar 2 20:08 Angelo Corsaro - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Added macros tha expand to multiple libraries - on QNX RTP to fix most of the link problems. - -Fri Mar 2 16:35:58 2001 Darrell Brunsch - - * ace/config-win32-borland.h: - - Added /**/ to #include so it isn't picked up by - MSVC-based dependency generators. - -Fri Mar 02 19:36:22 2001 Steve Huston - - * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and - errno is EAGAIN, change it to EWOULDBLOCK. Improve portability - for platforms where EAGAIN and EWOULDBLOCK are different values - and both used, like HP-UX. Thanks to Michael Grove - for reporting this problem. - - * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX. - This makes it pick up the EAGAIN->EWOULDBLOCK change. - - * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where - ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless - ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree - will get ENOTSUP anyway. - -Fri Mar 02 17:50:40 2001 Sharath R. Cholleti - - * ace/QtReactor.cpp: - Thanks to Stefan Scherer for reporting - and fixing the problem - crashing of TAO/tests/QtTests/ client - example after moving the slider. - -Fri Mar 02 15:35:40 2001 Nanbor Wang - - * ace/MEM_Acceptor.cpp: - * ace/MEM_Acceptor.h: - * ace/MEM_Addr.cpp: - * ace/MEM_Addr.h: - * ace/MEM_Connector.cpp: - * ace/MEM_Connector.h: - * ace/MEM_IO.cpp: - * ace/MEM_IO.h: - * ace/MEM_SAP.cpp: - * ace/MEM_SAP.h: - * ace/MEM_Stream.cpp: - * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses - not to support position independent pointers. - -Fri Mar 02 13:17:36 2001 Steve Huston - - * examples/IOStream/server/iostream_server.cpp (main): Removed the - call to register peer_acceptor with the reactor. The - acceptor::open call already registers for ACCEPT_MASK. Prevents - leaving a hanging READ_MASK registered after the acceptor is - destroyed when main() returns. This fixes Bugzilla # 801. Thanks - to Pim Philipse for reporting this. - - * THANKS: Added Pim Philipse to the Hall of Fame. - -Fri Mar 02 12:24:27 2001 Steve Huston - - * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions - (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set - ACE_NEW_THROWS_EXCEPTIONS either). - - * ace/Thread_Manager.cpp (join_thr): Moved the code for - ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here to - ACE_OS::thr_join (which this function calls) so that - ACE_Thread::join also causes a pthread_detach. This is needed on - Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread - storage and avoid leaking memory. Thanks to Vladimir Kondratiev - for reporting this and providing - excellent test cases to help resolve it quickly. - - * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from - ACE_Thread_Manager::join_thr, above. - - * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard - around purge_pending_notifications to prevent against an ENOTSUP - from purge_pending_notifications. - -Thu Mar 1 17:02:10 2001 Darrell Brunsch - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - Fixed up the Spawn code to use the Executable () instead of - {EXECUTABLE}, since that's how we get the adjusted name (with - .exe and stuff). And also skipped the file existance with - IgnoreExeSubDir, since IgnoreExeSubDir is often used when you - need to find the program in the path. - -Thu Mar 1 15:48:10 2001 Darrell Brunsch - - * bin/fuzz.pl: - - Fuzz was being a bit to eager with the class matching in the - TRACE test. It was having problems with something like: - - char *foo::bar () - - since it thought the class was "char *foo" instead of just - "foo". - - But it is feeling muuuuuuch better now. - -Thu Mar 1 13:18:07 2001 Darrell Brunsch - - * bin/fuzz.pl: - - Added two new tests: - - - absolute ACE_wrappers test: - - Check for ~schmidt/ACE_wrappers in html files. These should - be relative links since these html files already exist in - their own ACE_wrappers tree. - - - TRACE test: - - Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually - refers to the function/method it is in. - - And expanded the checks in the bad run_test test (level 6) - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - - Added checks for file existence before running. - - Added IgnoreExeSubDir option. - - Added TerminateWaitKill method. - - * bin/pippen.pl: (added) - * bin/PerlACE/MSProject.pm: (added) - * bin/PerlACE/MSProject/DSP.pm: (added) - * bin/PerlACE/MSProject/VCP.pm: (added) - - There is nothing to see here...please be on your way. - - It isn't like this is a super top secret project to - replace msvc_auto_compile.pl with something that works - better and also has a cool code-name that is shorter - than "msvc_auto_compile.pl". - - But remember, you didn't hear that from me. - -Thu Mar 1 10:54:23 2001 Ossama Othman - - * bin/auto_run_tests.lst: - - Added the TAO Codec to the list of tests to run. - - * include/makeinclude/wrapper_macros.GNU: - - Fixed all incorrect uses of CFLAGS and CCFLAGS where - preprocessor macros were defined. Preprocessor macros should be - defined in the CPPFLAGS variable. - - Define ACE_USE_RCSID in non-debug builds (i.e. debug=0). - -Thu Mar 01 07:29:58 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Fixed typos in the Service_Context_Manipulation test. It was - running in platforms where it shouldn't. - -Thu Mar 01 07:07:03 2001 Christopher Kohlhoff - - * include/makeinclude/recurse.bor: - Added support for makefiles which contain multiple targets. - - * examples/IPC_SAP/SOCK_SAP/Makefile.bor: - * examples/Log_Msg/Makefile.bor: - * examples/Map_Manager/Makefile.bor: - * examples/Mem_Map/file-reverse/Makefile.bor: - * examples/RMCast/Send_File/Makefile.bor: - * examples/Service_Configurator/IPC-tests/client/Makefile.bor: - * examples/Threads/Makefile.bor: - * netsvcs/clients/Logger/Makefile.bor: - * tests/Makefile.bor: - * tests/RMCast/Makefile.bor: - Updated to work with new multi-target makefile support. - -Wed Feb 28 22:58:50 2001 Carlos O'Ryan - - * html/index.html: - Reference */index.html directly, instead of assuming that the - web browser will use index.html as the default file, this also - works better when browsing locally. Thanks to Alain Decamps - for pointing this out. - -Wed Feb 28 16:41:42 2001 Darrell Brunsch - - * docs/bugzilla-build-setup.html: - - Updated the section about the scoreboard and added a - placeholder for Win32 nightly build information. - -Wed Feb 28 16:04:14 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and - Messaging support disabled for the nightly builds. - -Wed Feb 28 15:35:59 2001 Joe Hoffert - - * docs/bugzilla-build-setup.html: - Added html file outlining steps for adding a bugzilla nightly - build. - -Wed Feb 28 00:25:42 2001 Darrell Brunsch - - * bin/auto_run_tests.lst: - - The examples/POA/Adapter_Activator/run_test.pl test was being - run twice. In fairness to all the other tests that only get to - run once, I removed the second instance. - -Tue Feb 27 17:31:48 2001 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for - the threads=0 build - this enables the reentrant functions which - are present, threads or not. It does not turn on threads, which - are instead enabled by -D_POSIX_C_SOURCE=199506L. - - * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - - * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to - the POSIX.1c-conformant version of rand_r. Allows clean compile - on HP-UX 11 without thread support. Also lined up some - misaligned #if/else/endif lines to make it easier to find one's - way through. - - * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the - ways to get the POSIX.1c-conformant version of readdir_r. Allows - clean compile on HP-UX 11 without thread support. - -Tue Feb 27 11:38:38 2001 Douglas C. Schmidt - - * performance-tests/TCP/tcp_test.cpp (main): Zapped the - non-existent '-f' option. Thanks to Mike Curtis for reporting - this. - - * performance-tests/TCP/tcp_test.cpp (main): Check for improper - bufsz. Thanks to Mike Curtis for reporting this. - - * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t' - option, which specifies the number of threads. - - * performance-tests/TCP/README: Fixed a typo. Thanks to - Mike Curtis for reporting this. - -Tue Feb 27 10:51:18 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the AMI tests to the daily - builds. - -Tue Feb 27 10:23:20 2001 Balachandran Natarajan - - * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES - to ChangeLog*. This should help us to avoid missing ChangeLog - entries in the beta distribution, just about every time we split - and add a ChangeLog. - -Mon Feb 27 07:39:16 2001 Chad Elliott - - * include/makeinclude/platform_hpux_aCC.GNU: - - Removed suppression of Future Error 129. - Removed the use of CFLAGS. - - * ace/OS.h: - * ace/config-hpux-11.00.h: - Modification to remove system header macro definition conflicts. - This change does not suppress the conflicts, but does an undef - of the two conflicting macros before includeing tcp.h. Thanks - to Sam Chong for reporting this problem. - -Mon Feb 26 19:01:16 2001 Douglas C. Schmidt - - * ace/Logging_Strategy.{h,cpp}: Added a new -k option to - set the logging key via the ACE_Logging_Strategy. Thanks to - Chris Kohlhoff for contributing this. - -Mon Feb 26 18:18:38 2001 Steve Huston - - * ace/SString.i - (ACE_CString::find (const char *s, int pos) const): - (ACE_CString::find (char c, int pos) const): - (ACE_SString::find (const char *s, int pos) const): - (ACE_SString::find (char c, int pos) const): - (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const): - If match is found, return index from start of string, not from - 'pos'. Matches the C++ string standard, which was the model for - these classes. Thanks to Glen Osterhout - for this fix. - - * ace/SString.h: Clarified comments on return value for above - functions. - - * tests/SString_Test.cpp: Changed to look for the correct return - from the npos tests of the functions above. - - * THANKS: Added Glen Osterhout to the Hall of Fame. - -Mon Feb 26 15:01:55 2001 Darrell Brunsch - - * tests/DLL_Test_Impl.dsp: - * tests/version_tests/DLL_Test_Impl.dsp: (removed) - Me thinks that the Release and Static configurations should - also compile, and me thinks that it is now fixed. - -Mon Feb 26 12:29:45 2001 Douglas C. Schmidt - - * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) - method assumes ownership of , rather than copying it. - Thanks to Steve Hespelt for reporting this. - Fixes [Bug 807]. - - The generated version_tests dsp didn't work (since DLL_Test_Impl - creates a library). Manually created the configurations in the - tests/DLL_Test_Impl.dsp version instead. - -Mon Feb 26 15:54:33 2001 Phil Mesnier - - Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b) - - * docs/tutorials/013/message_queue.cpp: - * tests/Malloc_Test.cpp: - - Fixed errors in #pragma instiate lines including removal of ';', - mispellings - - * ace/config-all.h: - - Added definition of Unixware UDK for definition of ACE_NOTREACHED() - - * ace/config-unixware-7.1.0.udk.h: - * include/makeinclude/platform_unixware_udk.GNU: - - New configuration files for building on Unixware 7 with UDK CC. - -Mon Feb 26 12:29:45 2001 Douglas C. Schmidt - - * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) - method assumes ownership of , rather than copying it. - Thanks to Steve Hespelt for reporting this. - Fixes [Bug 807]. - -Mon Feb 26 12:27:46 2001 Jeff Parsons - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - Added method to reset the byte order in class OuputCDR. This - will be used by a gateway to set the byte order of a reply to a - reqest it has handled to one different than the gateway's own - byte order, if necessary. It should be called while the stream - is still empty, that is, before any part of the reply, including - the header, has been marshaled. - -Mon Feb 26 12:07:00 2001 Nanbor Wang - - * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before - setting the MAP_FIXED flag. Thanks to for - reporting this. [Bug 752] - -Mon Feb 26 09:29:36 2001 Carlos O'Ryan - - * ace/RB_Tree.h: - Fully qualified enum name. This fixes problems on gcc-272 builds. - -Mon Feb 26 00:19:28 2001 Darrell Brunsch - - Time to do some spring cleaning... - - * tests/version_tests/Config_Test.dsp: (added) - * tests/version_tests/DLL_Test_Impl.dsp: (added) - * tests/version_tests/Log_Msg_Test.dsp: (added) - * tests/version_tests/Message_Queue_Test_Ex.dsp: (added) - * tests/version_tests/version_tests.dsw: - - Updated the version_tests dir with create_vt_dsps.pl. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * netsvcs/lib/netsvcs.dsp: - * netsvcs/servers/servers.dsp: - * tests/ACE_Init_Test.dsp: - * tests/Atomic_Op_Test.dsp: - * tests/Auto_IncDec_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Basic_Types_Test.dsp: - * tests/Buffer_Stream_Test.dsp: - * tests/CDR_Array_Test.dsp: - * tests/CDR_File_Test.dsp: - * tests/CDR_Test.dsp: - * tests/Cache_Map_Manager_Test.dsp: - * tests/Cached_Accept_Conn_Test.dsp: - * tests/Cached_Conn_Test.dsp: - * tests/Capabilities_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Config_Test.dsp: - * tests/Conn_Test.dsp: - * tests/DLL_Test.dsp: - * tests/DLList_Test.dsp: - * tests/Dirent_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/Enum_Interfaces_Test.dsp: - * tests/Env_Value_Test.dsp: - * tests/Future_Set_Test.dsp: - * tests/Future_Test.dsp: - * tests/Handle_Set_Test.dsp: - * tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/Hash_Map_Manager_Test.dsp: - * tests/High_Res_Timer_Test.dsp: - * tests/IOStream_Test.dsp: - * tests/Lazy_Map_Manager_Test.dsp: - * tests/Log_Msg_Test.dsp: - * tests/MEM_Stream_Test.dsp: - * tests/MM_Shared_Memory_Test.dsp: - * tests/MT_Reactor_Timer_Test.dsp: - * tests/MT_SOCK_Test.dsp: - * tests/Malloc_Test.dsp: - * tests/Map_Manager_Test.dsp: - * tests/Map_Test.dsp: - * tests/Mem_Map_Test.dsp: - * tests/Message_Block_Test.dsp: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/Message_Queue_Test.dsp: - * tests/Message_Queue_Test_Ex.dsp: - * tests/Naming_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Notify_Performance_Test.dsp: - * tests/OS_Test.dsp: - * tests/Object_Manager_Test.dsp: - * tests/OrdMultiSet_Test.dsp: - * tests/Pipe_Test.dsp: - * tests/Priority_Buffer_Test.dsp: - * tests/Priority_Reactor_Test.dsp: - * tests/Priority_Task_Test.dsp: - * tests/Process_Manager_Test.dsp: - * tests/Process_Mutex_Test.dsp: - * tests/Process_Strategy_Test.dsp: - * tests/RB_Tree_Test.dsp: - * tests/Reactor_Exceptions_Test.dsp: - * tests/Reactor_Notify_Test.dsp: - * tests/Reactor_Performance_Test.dsp: - * tests/Reactor_Timer_Test.dsp: - * tests/Reactors_Test.dsp: - * tests/Reader_Writer_Test.dsp: - * tests/Recursive_Mutex_Test.dsp: - * tests/Refcounted_Auto_Ptr_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/SOCK_Test.dsp: - * tests/SPIPE_Test.dsp: - * tests/SString_Test.dsp: - * tests/SV_Shared_Memory_Test.dsp: - * tests/Semaphore_Test.dsp: - * tests/Service_Config_Test.dsp: - * tests/Sigset_Ops_Test.dsp: - * tests/Simple_Message_Block_Test.dsp: - * tests/Svc_Handler_Test.dsp: - * tests/TSS_Test.dsp: - * tests/Task_Test.dsp: - * tests/Thread_Manager_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Thread_Pool_Reactor_Test.dsp: - * tests/Thread_Pool_Test.dsp: - * tests/Time_Service_Test.dsp: - * tests/Time_Value_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Timer_Queue_Test.dsp: - * tests/Tokens_Test.dsp: - * tests/UPIPE_SAP_Test.dsp: - * tests/Upgradable_RW_Test.dsp: - - Removed the Alpha configurations. I don't think we've actually - looked at these for over a year, and they are missing from a lot - of projects. Thankfully, they are easy to recreate if they are - needed. - - * ACE-INSTALL.html: - - Changed the Windows NT Alpha section to mention that we no - longer have configurations out of the box for Win32/Alpha, they - must be recreated if needed. - - * WindozeCE/ACEApp.cpp: (removed) - * WindozeCE/ACEApp.h: (removed) - * WindozeCE/README: (removed) - * WindozeCE/StdAfx.cpp: (removed) - * WindozeCE/StdAfx.h: (removed) - * WindozeCE/WindozeCE.aps: (removed) - * WindozeCE/WindozeCE.clw: (removed) - * WindozeCE/WindozeCE.cpp: (removed) - * WindozeCE/WindozeCE.dsp: (removed) - * WindozeCE/WindozeCE.h: (removed) - * WindozeCE/WindozeCE.rc: (removed) - * WindozeCE/WindozeCEDlg.cpp: (removed) - * WindozeCE/WindozeCEDlg.h: (removed) - * WindozeCE/resource.h: (removed) - * WindozeCE/res/WindozeCE.ico: (removed) - * WindozeCE/res/WindozeCE.rc2: (removed) - - No longer used. - - * Makefile: - - Removed WindozeCE from CONTROLLED_FILES. - - * tests/WinCE/Atomic_Op_Test.dsp: (removed) - * tests/WinCE/Barrier_Test.dsp: (removed) - * tests/WinCE/Basic_Types_Test.dsp: (removed) - * tests/WinCE/Buffer_Stream_Test.dsp: (removed) - * tests/WinCE/Conn_Test.dsp: (removed) - * tests/WinCE/DLL_Test.dsp: (removed) - * tests/WinCE/Enum_Interfaces_Test.dsp: (removed) - * tests/WinCE/Future_Test.dsp: (removed) - * tests/WinCE/Handle_Set_Test.dsp: (removed) - * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed) - * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed) - * tests/WinCE/MT_SOCK_Test.dsp: (removed) - * tests/WinCE/Map_Manager_Test.dsp: (removed) - * tests/WinCE/Mem_Map_Test.dsp: (removed) - * tests/WinCE/Message_Block_Test.dsp: (removed) - * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed) - * tests/WinCE/Message_Queue_Test.dsp: (removed) - * tests/WinCE/Notify_Performance_Test.dsp: (removed) - * tests/WinCE/OrdMultiSet_Test.dsp: (removed) - * tests/WinCE/Priority_Buffer_Test.dsp: (removed) - * tests/WinCE/Priority_Task_Test.dsp: (removed) - * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed) - * tests/WinCE/Reactor_Notify_Test.dsp: (removed) - * tests/WinCE/Reactor_Performance_Test.dsp: (removed) - * tests/WinCE/Reactor_Timer_Test.dsp: (removed) - * tests/WinCE/Reactors_Test.dsp: (removed) - * tests/WinCE/Reader_Writer_Test.dsp: (removed) - * tests/WinCE/Recursive_Mutex_Test.dsp: (removed) - * tests/WinCE/SOCK_Connector_Test.dsp: (removed) - * tests/WinCE/SOCK_Test.dsp: (removed) - * tests/WinCE/SString_Test.dsp: (removed) - * tests/WinCE/Semaphore_Test.dsp: (removed) - * tests/WinCE/Sigset_Ops_Test.dsp: (removed) - * tests/WinCE/Simple_Message_Block_Test.dsp: (removed) - * tests/WinCE/TSS_Test.dsp: (removed) - * tests/WinCE/Task_Test.dsp: (removed) - * tests/WinCE/Thread_Manager_Test.dsp: (removed) - * tests/WinCE/Thread_Mutex_Test.dsp: (removed) - * tests/WinCE/Thread_Pool_Test.dsp: (removed) - * tests/WinCE/Time_Value_Test.dsp: (removed) - * tests/WinCE/Timer_Queue_Test.dsp: (removed) - * tests/WinCE/ce_tests.dsw: (removed) - - Removed these Windows CE Toolkit for Visual C++ files. - -Mon Feb 26 00:15:42 2001 Darrell Brunsch - - * tests/DLL_Test_Impl.dsp: - - Made sure the Code Generation settings were correct. - -Sun Feb 25 19:40:11 2001 Carlos O'Ryan - - * bin/ACEutils.pm (CheckForConfig): - This routine was not removing all the -Config options from the - command-line, causing problems in some of the tests. - -Sun Feb 25 16:33:26 2001 Darrell Brunsch - - * tests/DLL_Test.cpp: - - Left the DLL end with a d in debug mode, but changed - the test to add the d when _DEBUG and ACE_WIN32 is - defined. Test should now work again on Win2000_Debug. - -Sun Feb 25 11:28:06 2001 Darrell Brunsch - - * tests/run_test.pl: - - When there are errors in the log, print out the entire - log. This should make it much easier to understand - problems in the nightly build logs. - -Sun Feb 25 09:04:43 2001 Carlos O'Ryan - - * tests/DLL_Test.cpp: - Accidentally left the 'd' suffix in the name of the DLL. - -Sat Feb 24 22:58:42 2001 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - * TAO/TAOACE.dsw: - * TAO/TAOACE_Static.dsw: - * Static_Performance.dsw: - - Removed references to gperf_lib.dsp - - * TAO/version_tests.dsw: (removed) - - This was still referring to orbsvcs.dsp, which shows that - it is way out of date (and not used). Zapped. - -Sat Feb 24 20:59:42 2001 Darrell Brunsch - - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf.dsw: - * apps/gperf/src/gperf_lib.dsp: (removed) - - Merged gperf into one project. This will bring the - structure in line with the Makefiles. - -Sat Feb 24 19:28:42 2001 Darrell Brunsch - - * ace/OS.i: - - Fixed my recent changes to ACE_OS::dlsym () to work on - Windows CE. - -Sat Feb 24 17:50:38 2001 Darrell Brunsch - - * tests/DLL_Test.cpp: - - OBJ_PREFIX was being created by attaching a char string to - a ACE_TCHAR string. Needed to add ACE_TEXT to the first - string for compilation on ACE_USES_WCHAR. - - * tests/DLL_Test_Impl.dsp: - - Changed the internal name to "DLL_Test DLL" to make sure - this gets compiled in the first pass by msvc_auto_compile.pl. - - * tests/run_test.pl: - - Added a check for LM_WARNINGs in log files. Let's see if - there have been any hidden (DLL_Test actually was producing - a warning on Windows, but Carlos's fix already got rid of it, - Yay!). - -Sat Feb 24 15:44:58 2001 Carlos O'Ryan - - * tests/tests.dsw: - * tests/DLL_Test_Impl.dsp: - Add new project file for the shared library used in the test. - - * tests/DLL_Test.cpp: - * tests/DLL_Test_Impl.cpp: - Change the Win32 version to load a shared library instead of the - exe. - -Sat Feb 24 14:07:11 2001 Darrell Brunsch - - * tests/Thread_Pool_Reactor_Test.cpp: - - Did a careful study of what this test was doing in regards to - sending wide-character strings, and made it consistent. The - most troublesome aspect was the fact that the length is encoded - in the shutdown string ("\011shutdown") which meant that I had - to send the length in characters, not in bytes. This should - really fix [Bug 537]. - -Sat Feb 24 14:37:00 2001 Craig Rodrigues - - * ace/config-g++-common.h - gcc 2.97 and higher require the use of the std namespace for - iostrams - -Sat Feb 24 10:27:04 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Disable the interceptor tests when the ORB is compiled without - interceptor support. - - * tests/run_test.lst: - Disable the Reactor_Notify_Test on single threaded builds, it - uses threads. - - * bin/nightlybuilds/scoreboard_update.pl: - Fixed usage message. - -Sat Feb 24 09:45:18 2001 Carlos O'Ryan - - * tests/run_test.lst: - Disable the DLL_Test on KCC/Linux builds. The test runs - normally, but crashes on shutdown(), it appears as if the - run-time system is invoking the destructors after the library is - unloaded. - - * tests/Makefile: - * tests/Makefile.DLL_Test: - * tests/DLL_Test.h: - * tests/DLL_Test.cpp: - * tests/DLL_Test_Impl.h: - * tests/DLL_Test_Impl.cpp: - Cleanup code, and truly separate the shared library code to a - completely new separate file. - -Sat Feb 24 09:51:45 2001 Carlos O'Ryan - - * bin/auto_compile: - Pass the -Config options to each script, this helps the - $ACE_ROOT/bin/run_test.pl script that needs to disable some - tests in certain configurations. - -Sat Feb 24 08:21:48 2001 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - added -fno-implicit-templates on Tornado II for Intel 386 - family targets. Thanks to Albert Wijnja - for reporting that static template data members weren't really on - VxWorks/386, and to Greg Holtmeyer - for confirming that -fno-implicit-templates should work with - the Tornado II g++. [Bug 658] - -Thu Feb 22 15:59:04 2001 Douglas C. Schmidt - - * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the - function as "localtime". This is now fixed. Thanks to Mason - Deaver for reporting this. - -Fri Feb 23 19:44:36 2001 Krishnakumar B - - * ACE version 5.1.13 released. - -Thu Feb 22 12:28:15 2001 Irfan Pyarali - - * ace/TP_Reactor.cpp (handle_events): Here is the description of - how things were working and where the problem was: In the - TP_Reactor there is one leader thread waiting in select() and - the others waiting on the token. During deactivation(), the - flag is set on the reactor, signal_all_threads() - is called on the token, and an empty notification is send to the - current leader thread. signal_all_threads() sets the - flag on the Token when there are waiters - on the Token (does nothing if there are no waiters). This - scheme worked fine when there were leader and follower threads - waiting. When a new leader is chosen, it returns the magic - number 2 from token.acquire_read() and hence exits gracefully - from the handle_events(). However, the problem was that when - some (or all) of the TP threads are busy running upcalls, - signal_all_threads() was a no-op and the magic number 2 was not - returned from token.acquire_read() and hence the exit from - handle_events() was flagged as an error. - - The fix is as described below: - - (1) ACE_Token::signal_all_threads() does not make sense. The - token is a mutex, not a condition variable. Therefore, it does - not make sense to have a signal_all_threads() methods. Plus I - believe that the method does not do as advertised. Therefore, I - removed this method from the token class. - - (2) There is no need to signal all the threads in the - TP_Reactor. Marking the Reactor as closed and signaling the - leader thread is enough. The leader thread will wake up to - handle the empty event, the next leader will see that the - Reactor is closed and exit gracefully. This will continue until - all the waiters are drained. - - (3) With the above change, there is no need to check for an - magic returns from token.acquire_read(). When a thread gets the - token, it checks the deactivation flag before proceeding. If - the Reactor is closed, it gracefully exits. Otherwise, it - continues as leader. - - (4) Since there is no need to call token.signal_all_threads(), - ACE_TP_Reactor::wakeup_all_threads() can be removed since it is - now the same as ACE_Select_Reactor_T::wakeup_all_threads(). - - Note that this change should help with making - Thread_Pool_Reactor_Test run without shutdown errors. - - * ace/Select_Reactor_T.i (deactivate): The setting of the - flag and waking up of all the threads should be - atomic. I am being picky about this one but I think am I right. - Also added the guard to the accessor. - -Thu Feb 22 08:51:42 2001 Darrell Brunsch - - * ace/OS.i: - - Bleh. Changed an && to || to make sure we get a symbolname - variable for non-Unicode Win32. - - "He who lives without committing any folly is not so - wise as he thinks" - La Rochefoucauld - -Thu Feb 22 08:43:30 2001 Carlos O'Ryan - - * include/makeinclude/rules.local.GNU: - Add SunWS_cache and ir.out to the list of files removed by - the realclean pseudo-target. This directory is used by Sun/CC - 5.0 (and Forte), if not removed the information there can become - stale, and break the builds. - This should fix the Sun/CC 5.0 nightly builds. - -Thu Feb 22 07:51:36 2001 Balachandran Natarajan - - * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001 - Krishnakumar B ". - -Thu Feb 22 03:31:06 2001 Krishnakumar B - - * ace/OS.i (dlsym): - Hopefully fixed the Win32 builds. Removed a extra ! in the - #ifdef. - -Thu Feb 22 02:58:36 2001 Krishnakumar B - - * VERSION: - * PROBLEM-REPORT-FORM: - * ace/Version.h: - Reverted the changes and restored the old versions of - these files as the beta build script was killed. Pain :-( - -Wed Feb 21 20:10:42 2001 Darrell Brunsch - - * ace/OS.i: - * tests/DLL_Test.cpp: - * tests/Thread_Pool_Reactor_Test.cpp: - - Fixed the remaining problems with the Win2000_Unicode tests. - [Bug 537] - -Tue Feb 20 21:19:39 2001 Carlos O'Ryan - - * ace/Svc_Conf.h: - Add ACE_Export macro for ace_create_service_type() it is used - outside the library now. - -Tue Feb 20 06:34:26 2001 Douglas C. Schmidt - - * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly - set ACE_HAS_GNUG_PRE_2_8. Thanks to Christian von Mueffling - for reporting this. - - * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in - the ACE_TRACE macro. Thanks to Mike Curtis for reporting this. - -Mon Feb 19 16:38:08 2001 Krishnakumar B - - * ace/Asynch_Acceptor.{h,cpp}: - Added method void handle (ACE_HANDLE) and made it call the base - class's handle(ACE_HANDLE) method to remove warning about - partial overloading. Fix suggested by Irfan. - -Sun Feb 18 21:55:16 2001 Krishnakumar B - - * ace/OS.h: - Added an extern "C" void ace_mutex_lock_cleanup_adapter before - the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on - SunCC 5.x. - -Sun Feb 18 17:16:41 2001 Douglas C. Schmidt - - * netsvcs/clients/Tokens/manual/manual.cpp (main), - * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the - ACE_HAS_TOKENS_LIBRARY stuff. Thanks to Kitty for reporting - this. - -Sun Feb 18 16:28:45 2001 Chris Gill - - * ace/RB_Tree.h: Changed order of method declarations to (hopefully) - dodge an internal compiler error on VxWorks. - -Sun Feb 18 09:59:18 2001 Douglas C. Schmidt - - * netsvcs/clients/Tokens: - * netsvcs/servers/main.cpp (main): - * netsvcs/servers/svc.conf: - * netsvcs/lib/Token_Handler: Only compile this stuff if the - ACE_HAS_TOKENS_LIBRARY macro is enabled. Thanks to Carlos - for reporting this. - - * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY - so we can skip initializing certain things if that macro is - undefined. - - * ace/Token_Collection.*: - * ace/Token_Invariants.*: - * ace/Token_Manager.*: - * ace/Local_Tokens.*: - * ace/Remote_Tokens.*: - * ace/Token_Request_Reply.*: - Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled - since this functionality does not appear to be widely used and - yet it takes up space. - - * tests/Tokens_Test.cpp (main): Only run this test if - ACE_HAS_TOKENS_LIBRARY is defined. - -Sat Feb 17 17:23:46 2001 Darrell Brunsch - - * ace/SOCK_Dgram_Mcast.cpp: - - Integrated a fix from Keith Nicewarner - In effect, this reverts the multicast code changed on - Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... - for all platforms except linux. - -Sat Feb 17 15:52:09 2001 Carlos O'Ryan - - * bin/run_all_list.pm: - * tests/run_tests.pl: - Remove obsolete scripts. - -Sat Feb 17 13:26:17 2001 Douglas C. Schmidt - - * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast - -1 to void * since that's the signature of the method. Thanks - to Bala for reporting this. - - * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused - result local variable and also changed the logic to bailout if - handle_events() returns -1. This fixes a warning reported by - KCC. - -Fri Feb 16 17:39:16 2001 Mayur Deshpande - - * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER. - Thanks to Andrew Olson for the suggestion. - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to - CCFLAGS and 'exceptions=1' at end of file. - Thanks to Andrew Olson for the suggestion. - -Fri Feb 16 05:37:47 2001 Douglas C. Schmidt - - * ace/Logging_Strategy.h: Updated the documentation to explain what - the various options mean. - - * tests/Log_Msg_Test.cpp (test_log_msg_features): Added - ACE_Log_Msg::PROCESS to a couple of priority_mask() calls to - make the test work correctly. Thanks to Kitty for reporting - this. - -Thu Feb 15 17:53:31 2001 Frank Hunleth - - * ace/Thread_Manager.i: Simplified casting in - ACE_Thread_Descriptor::get_next per suggestion from Carlos. - -Thu Feb 15 14:57:59 2001 Frank Hunleth - - * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next. - -Thu Feb 15 11:33:55 2001 Douglas C. Schmidt - - * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0) - to make sure that this test terminates... - - * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to - make certain compilers happy. - - * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32. - -Thu Feb 15 08:49:44 2001 Carlos O'Ryan - - * bin/nightlybuilds/builds.lst: - Rename WashU builds so all the Debian builds appear together. - -Thu Feb 15 07:15:39 2001 Douglas C. Schmidt - - * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple - log files, rather than just two. Thanks to Orlando Ribeiro - for this fix. - -Thu Feb 15 03:36:46 2001 Krishnakumar B - - * bin/nightlybuilds/builds.lst (WEB): - Added a new build with TAO_MINIMUM linked statically. - -Wed Feb 14 05:28:59 2001 Douglas C. Schmidt - - * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(), - task(), get_next(), and self(). Thanks to Johnny Willemsen - for reporting this. - -Tue Feb 13 17:51:47 2001 Douglas C. Schmidt - - * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS. - Thanks to Mike Curtis for reporting this. - - * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run. - Thanks to Mike Curtis for reporting this. - -Wed Feb 14 12:08:10 2001 Frank Hunleth - - * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read. - If record was a multiple of BUFSIZ and the record was - terminated with an EOF instead of a "term" character, - rec_read would return 0 instead of the actual data read in. - The problem was that the partial buffer fill size was being - checked instead of the total number of bytes read in. This - issue was noticed when trying to read in an IOR file in TAO - that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long. - -Tue Feb 13 14:44:28 2001 Nanbor Wang - - * ace/ace_wchar.inl: Changed several variable from type - to type as on 64-bit whistler, size_t and int are not the - same size which confuses 64-bit compiler. (Per Kitty's - request.) - -Tue Feb 13 10:23:31 2001 Steve Huston - - * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of - handle () method and handle_ member to ACE_Handler). Moved the - handle_ member to the JAWS_Synch_IO class - it needs it, and - JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left - the handle () methods in JAWS_IO, but made them pure virtual, - implemented in JAWS_Synch_IO (implementation moved from JAWS_IO) - and in JAWS_Asynch_IO, where they forward up to ACE_Handler's - handle () methods. - -Mon Feb 12 18:18:05 2001 Frank Hunleth - - * tests/Thread_Mutex_Test.cpp: - Modified test to use process mutexes for Win32 platforms - so that timed mutexes could be tested. - -Sun Feb 11 15:33:39 2001 Darrell Brunsch - - * ace/QoS/ACE_QoS_Export.h: - - Added ACE_AS_STATIC_LIBS support. - - * ace/QoS/ACE_QoS.dsp: - * ace/QoS/ACE_QoS_Lib.dsp: - - Fixed to comply with ACE standards. - -Sun Feb 11 10:50:10 2001 Douglas C. Schmidt - - * include/makeinclude/platform_sunos5_g++.GNU (exceptions): - Only set the -fno-exceptions option if we're *not* using GCC - 2.7.2! Thanks to Pradeep for explaining how to do this. - -Sun Feb 11 10:15:08 2001 Johnny Willemsen - - * ace/Makefile.bor: - * ace/QoS/Makefile.bor: - * include/makeinclude/ace_flags.bor: - Added build support for QoS library with Borland compiler. - -Sat Feb 10 15:29:08 2001 Carlos O'Ryan - - * ace/Message_Block.h: - Improved documentation for the lenth(), size() and space() - methods. - -Sat Feb 10 07:19:37 2001 Christopher Kohlhoff - - * include/makeinclude/outputdir.bor: - Removed the now out-of-date comment about pascal/non-pascal - build directories. - - * ace/config-win32-borland.h: - Added support for new ACE_HAS_VCL define to enable inclusion - of VCL header files. - -Fri Feb 9 16:47:44 2001 Pradeep Gore - - * ace/Makefile.am: - Removed references to the AQoSA files. - -Fri Feb 9 16:42:10 2001 Pradeep Gore - - * examples/QOS/client.dsp: - * examples/QOS/server.dsp: - Updated the corrected project files. - Thanks to Darrell for pointing this out. - -Thu Feb 8 19:25:03 2001 Carlos O'Ryan - - * performance-tests/RPC/run_test.pl: - * performance-tests/TCP/run_test.pl: - * performance-tests/UDP/run_test.pl: - Add driver strings - -Thu Feb 08 19:18:36 2001 Angelo Corsaro - - * bin/auto_run_tests.lst: - - Removed comment from Exposed Policies test. The test has been fixed. - -Thu Feb 8 14:11:36 2001 Darrell Brunsch - - * ace/ws2tcpip.h: [Removed] - - I don't see any reason to have this file in ace; it is a system - header file. And from [Bug 722], our version is out of date anyway. - - * ace/OS.h: - - Changed to include system version of ws2tcpip.h - - * ace/Makefile.am: - * ace/ace-dll.icc: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Removed references to ws2tcpip.h. - - * ace/SOCK_Connect.cpp: - - Changed get_ip_interfaces to remove a memory error. Thanks to - Viatcheslav Batenine for helping out with - this. - - * ace/SOCK_Dgram_Mcast.cpp: - - It looks like the change made on: - - Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... - - doesn't work on Win32. Reverted back to the old scheme for Win32 - only. - -Thu Feb 8 00:34:57 2001 Douglas C. Schmidt - - * include/makeinclude/platform_sunos5_g++.GNU: Added support for - -fno-exception when exceptions=0 is given to the Makefile. - Thanks to Christian v. Mueffling for reporting - this. - -Wed Feb 7 23:02:46 2001 Douglas C. Schmidt - - * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a - new overridden cancel_aio() method. Thanks to Alexander Libman - for contributing this. - -Thu Feb 8 02:09:05 2001 Pradeep Gore - - * examples/QOS/Makefile: - * examples/QOS/client.dsp: - * examples/QOS/server.dsp: - Modified to use the ACE_QoS lib. - * Receiver_QoS_Event_Handler.cpp: - * Sender_QoS_Event_Handler.cpp: - Added missing Log_Msg.h for ACE_DEBUG. - Other files were modified to reflect changed directory location - of AQosA imclude files. - -Thu Feb 8 00:17:43 2001 Pradeep Gore - - * ace/QoS_Decorator.cpp: - * ace/QoS_Session_Factory.cpp: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - * ace/QoS_Decorator.h: - * ace/QoS_Session_Factory.h: - * ace/SOCK_Dgram_Mcast_QoS.h: - * ace/QoS_Manager.cpp: - * ace/QoS_Session_Impl.cpp: - * ace/SOCK_Dgram_Mcast_QoS.i: - * ace/QoS_Manager.h: - * ace/QoS_Session_Impl.h: - * ace/QoS_Session_Impl.i: - Moved the AQoSA classes to ace/QoS directory. - - * ace/Makefile: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Removed the QoS related files, added QoS directory to build. - - * ace/Qos/Makefile - * ace/QoS/ACE_QoS.dsw: - * ace/QoS/ACE_QoS.dsp: - * ace/QoS/ACE_QoS_Lib.dsp: - * ace/QoS/ACE_QoS_Export.h: - Added Makefile and MSVC project files. - Thanks to Craig Rodrigues for suggesting this - change and providing the patch. - -Wed Feb 7 11:34:56 2001 Carlos O'Ryan - - * tests/Message_Queue_Test_Ex.cpp: - Fix build problems for single threaded environments. - -Wed Feb 7 09:03:22 2001 Douglas C. Schmidt - - * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed - incorrect if/else branching. Thanks to Lu Yunhai - for reporting this. - -Tue Feb 6 23:43:49 2001 Douglas C. Schmidt - - * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of - %s to be %*s since the string may not be nul terminated! Thanks - to Lu Yunhai for reporting this. - -Tue Feb 6 20:11:28 2001 Krishnakumar B - - * include/makeinclude/platform_sunos5_sunc++.GNU: - - Remove double inclusion of $(CFLAGS) for Sun CC 5.0. - -Tue Feb 6 19:30:26 2001 Krishnakumar B - - * ace/Malloc_T.cpp (shared_malloc): - Added a #ifdef to remove the warnings from Digital Tru64 cxx. This - is a temporary workaround. TODO: Change ACE_SEH_* macros so that such - hacks are unnecessary. - -Tue Feb 6 19:23:16 2001 Krishnakumar B - - * include/makeinclude/platform_sunos5_sunc++.GNU: - Complete reverting the changes made by Irfan on Sat Jan 27 - 01:06:09 2001. This file was missed in the last revert done by me. - -Tue Feb 06 19:03:35 2001 Steve Huston - - * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure - to add CFLAGS into CCFLAGS, even if no other options are added. Else - things get built without -mt. - -Tue Feb 06 18:37:41 2001 Steve Huston - - * tests/Thread_Mutex_Test.cpp: Changed wording of the message for - "timed acquire" not supported so as not to trip the error catcher - in run_tests.pl. - -Tue Feb 06 17:55:28 2001 Steve Huston - - * examples/Reactor/Proactor/post_completions.cpp: Allow this to - run with AIOCB_Proactor. - - * ace/Asynch_IO.{h cpp}: Added ACE_Handler::handle (ACE_HANDLE) - function to set the handle; changed ACE_HANDLE ACE_Handler::handle - to return the actual value. - - * ace/Asynch_Acceptor.cpp (handle_accept): Call ACE_Handler::handle - to set the handle value for the new handler before calling its - open() method. - -Tue Feb 06 17:16:43 2001 Steve Huston - - * tests/MEM_Stream_Test.cpp: - * tests/MEM_Stream_Test.h: New file; moved definition of Echo_Handler - from MEM_Stream_Test.cpp to this file to make it visible to AIX - C++ 3.6.6 at template instantiation time. - -Mon Feb 5 16:19:20 2001 Douglas C. Schmidt - - * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname"). - Thanks to Lu Yunhai for reporting this. - - * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN - macros to use the form 0x0123 rather than 0123X. Thanks to - Craig Rodrigues for helping find this - problem. - -Mon Feb 5 18:20:11 2001 Krishnakumar B - - * ace/config-sunos5.5.h (ACE_USES_OLD_IOSTREAMS): - - Reverted the change to config-sunos5.5.h and turned on - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, - ACE_TEMPLLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the - SunCC 5.0 compiler. - -Mon Feb 5 16:19:20 2001 Douglas C. Schmidt - - * examples/RMCast/Send_File/Receiver.cpp (init): Replaced - a hard-coded file permission of 0644 with - ACE_DEFAULT_FILE_PERMS. Thanks to Chris Kohlhoff - for reporting this. - -Mon Feb 5 13:00:17 2001 Krishnakumar B - - * tests/Thread_Mutex_Test.cpp: (reported_notsup) - Removed a warning about defined but not used. - -Sat Feb 3 14:41:17 2001 Darrell Brunsch - - * ace/OS.h: - * ace/config-win32-msvc.h: - - Fixed problems with LLSEEK and ACE_stat on Windows CE. - -Sat Feb 3 14:12:36 2001 Darrell Brunsch - - * tests/Config_Test.cpp: - * tests/Config_Test.h: - * tests/Log_Msg_Test.cpp: - - Fixed ACE_USES_WCHAR problems. - -Fri Feb 02 18:36:42 2001 Steve Huston - - * ace/config-linux-common.h: Added #define ACE_POSIX_AIOCB_PROACTOR - unless the user #defines ACE_POSIX_SIG_PROACTOR before including - config-linux.h. (At least prior to 2.4 kernels) queueing signals - across threads does not work - it fails silently, which breaks - basic functionality of the async model - like asynchronously - accepting TCP connections - and pretty much prevents multi-threaded - work with timers and probably other async operations. - - * examples/Reactor/Proactor/test_proactor.cpp: Disabled the ACE_DEBUG - calls that display message buffers - they're often too large and - overrun the ACE_Log_Msg buffers and crash the program. - -Fri Feb 2 08:38:37 2001 Douglas C. Schmidt - - * ace/WFMO_Reactor.cpp (handler): Set the existing_masks variable to 0 - to avoid warnings from static analysis tools. Thanks to Ivan - Murphy for reporting this. - -Thu Feb 01 22:00:17 2001 Sharath R. Cholleti - - * tests/Message_Queue_Test_Ex.cpp - - Fixed the bugs which were giving runtime error on - Win32 - removed "queue_type" from single_thread_performance_test - and performance_test functions. Now these funtions dont - have args. - - * tests/tests.dsw - - Just an update of the workspace. - -Thu Feb 1 21:00:57 2001 Frank Hunleth - - * bin/auto_compile_win32.pl: - * bin/run_all_list.pm: - - Added TAO RT Mutex unit tests to auto build and test - lists. - -Thu Feb 01 18:52:27 2001 Angelo Corsaro - - * RTJava: - Added Directory for RTJava related research. Check the - ChangeLog included in the newly directory for more info. - -Thu Feb 01 18:23:17 2001 Sharath R. Cholleti - - * tests/Log_Msg_Test.dsp: - * tests/Config_Test.dsp: - - Added these files. - * tests/tests.dsw: - - Added the above two projects to the workspace. - -Thu Feb 1 18:01:26 2001 Luther J Baker - - * ace/OS.i (mutex_init): - - Removed call into PACE. - -Thu Feb 01 18:21:15 2001 Steve Huston - - * tests/Thread_Mutex_Test.cpp: Only report "operation not supported" - once for a failed ACE_Thread_Mutex::acquire (ACE_Time_Value &). - Also, if it reports ENOTSUP while ACE_HAS_MUTEX_TIMEOUT is - defined, warns the user that it's probably the wrong setting. - -Thu Feb 01 17:36:28 2001 Steve Huston - - * examples/Reactor/Proactor/test_proactor3.cpp: Fixed a non-constant - array dimension and some output formatting. - -Thu Feb 01 17:07:35 2001 Steve Huston - - * examples/Reactor/Proactor/post_completions.cpp: Removed extraneous - 'd' from the 'count' display. - -Thu Feb 01 15:33:26 2001 Steve Huston - - * ace/Reactor.h (purge_pending_notifications): - * ace/WFMO_Reactor.h (purge_pending_notifications): - * ace/Select_Reactor_Base.h (purge_pending_notifications): - Removed the default argument value - callers must now explicitly - specify a 0 ACE_Event_Handler* to remove all handler notifications. - Thanks to Edan Ayal for arguing this point. - -Thu Feb 1 09:57:41 2001 Jeff Parsons - - * ace/SString.i: - - Changed behavior of ACE_WString::rep to be the same - as ACE_CString::rep, that is, to return an empty - (w)string rather than a null (w)string when the length - is 0. Thanks to Johnny Willemsen - for pointing out this discrepancy. - -Thu Feb 1 09:42:41 2001 Chad Elliott - - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Modification to allow building for Chorus 4.x on x86. CPU will be - set to x86, but CLX_TYPE will be set to i486-elf-sysv4. - -Thu Feb 01 10:29:31 2001 Steve Huston - - * ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed - the arg name to fix "unused argument" warning from g++. - -Wed Jan 31 22:01:00 2001 Rick Stille - * ace/OS.cpp(operator FILETIME): Corrected an error in the Jan 26 GHS - revision. The term "ACE_Time_Value::FILETIME_to_timval_skew" had been - omitted from the calculation. - -Wed Jan 31 18:43:26 2001 Krishnakumar B - - * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): - Removed the warning about queue_type using ACE_UNUSED_ARG. - -Wed Jan 31 17:27:35 2001 Steve Huston - - * ace/Acceptor.cpp (ACE_Oneshot_Acceptor::handle_input): Unregister - the acceptor from the reactor before doing the shared_accept call - to guard against the use-case where the acceptor is destroyed during - the service handler activation sequence. - -Wed Jan 31 15:55:23 2001 Frank Hunleth - - * ace/Synch.i: - Added ACE_Null_Mutex::acquire (ACE_Time_Value &tv) - to fix link error. - -Wed Jan 31 15:12:00 2001 Jeff Parsons - - * ace/CDR_Stream.h: - - Made method do_byte_swap() public. If ACE_ENABLE_SWAP_ON_WRITE - is defined, TAO_GIOP_Message_Base::format_message() and - TAO_GIOP_Message_Lite::format_message() both call this method. - Thanks to Paul Rubel for reporting this bug. - -Wed Jan 31 12:19:51 2001 Steve Huston - - * docs/tutorials/Chap_2/ex03.html, ex04.html: Fixed these example - programs to 1) send the Nul terminators with the strings, - 2) allow enough space on the recv to get it all, 3) return a - value from main. - - * docs/tutorials/Chap_2/Chap_2.zip: Updated the above examples. - -Wed Jan 31 06:43:27 2001 Douglas C. Schmidt - - * ace/Message_Queue_T.cpp: Make sure that dequeue_head() returns - the number of items still on the queue. Thanks to Johnny - Willemsen for reporting this. - -Tue Jan 30 21:39:15 2001 Sharath R. Cholleti - - * tests/Log_Msg_Test.cpp: In funtion test_ostream(), removed the - if condition to check if ACE_OS::unlink() succeeds. Also set - the ostream to NULL before calling ACE_ERROR_RETURN(). Thanks - to Mike Curtis for pointing out problem - caused when ACE_OS::unlink() fails. Thanks to Doug in helping - fix the problem. - -Tue Jan 30 18:04:08 2001 Douglas C. Schmidt - - * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): - Zap the Win32 and VxWorks-specific code from this function. - Thanks to Sharath for reporting this. - -Tue Jan 30 11:34:26 2001 Steve Huston - - * examples/Reactor/Proactor/test_aiosig_ace.cpp: Fixed a bunch - of mis-coded ACE_ERROR_RETURNs; added a explicit queued completion, - and disabled the display of buffers that may overrun ACE_Log_Msg's - internal buffers to prevent spurious crashes. - -Tue Jan 30 11:26:42 2001 Steve Huston - - * examples/Reactor/Proactor/post_completions.cpp: Added a count - to be sure that all expected completions are delivered, and - print error message if not. - -Tue Jan 30 10:47:52 2001 Steve Huston - - * ace/Select_Reactor_Base.cpp - (ACE_Select_Reactor_Notify::purge_pending_notifications): - * ace/WFMO_Reactor.cpp - (ACE_WFMO_Reactor_Notify::purge_pending_notifications): Changed - to not purge notifications destined for the reactor only - (notification buffer with 0 handler value). Thanks to Edan - Ayal for this fix. - -Tue Jan 30 01:05:51 2001 Douglas C. Schmidt - - * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): - Add cases for VxWorks and NT. Thanks to Sharath for reporting - this. - - * ace/OS.h: #define _SC_AIO_MAX to 1 if it's not set by default. - Thanks to Jean-Francois Daune for reporting this - fix for VxWorks. - -Mon Jan 20 18:36:41 2001 Steve Huston - - * ace/Message_Queue_T.h (ACE_Message_Queue_Ex): Use _USE - rather than _DECL to define the ACE_Message_Queue - fixes - compile error. - -Mon Jan 29 17:29:31 2001 Steve Huston - - * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references - to Message_Queue_Ex's queue_ member to use . rather than -> - and removed the ACE_NEW to allocate it (follow-ups from Doug's - Sun Jan 28 08:32:07 2001 change). Fixed other compile - errors to allow tests/Message_Queue_Test_Ex.cpp to build. - FYI... whomever added this, it probably should have been named - Message_Queue_Ex_Test to conform. - -Mon Jan 29 15:30:27 2001 Steve Huston - - * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't - mask/block all signals, just the one(s) being used for this - sig proactor instance. Blocking everything can break other - things, such as debuggers and the ability to kill a program. - Also, don't setup a handler for the signals being blocked/waited - as this is a combination whose behavior is undefined. - -Sun Jan 28 08:39:17 2001 Carlos O'Ryan - - * tests/Thread_Mutex_Test.cpp: - Fixed use of ACE_TEXT and string concatenation. - -Sun Jan 28 08:03:08 2001 Carlos O'Ryan - - * tests/tests.dsw: - * tests/Message_Queue_Test_Ex.dsp: - Add NT project files for the new test - -Sun Jan 28 08:32:07 2001 Douglas C. Schmidt - - * netsvcs/lib/Client_Logging_Handler.cpp: Fixed the order in which - the iostream messages are logged so that we don't bomb out when - the VERBOSE option is enabled. Thanks to Craig Rodrigues - for helping find this problem. - - * ace/Message_Queue_T.h: Make sure the lock() forwarding method - forwards to queue_.lock(). - - * ace/Message_Queue_T.{h,i,cpp}: There's no reason to dynamically - allocate the implementation of ACE_Message_Queue_Ex -- instead - it can be simply an instance of ACE_Message_Queue. - - * ace/Message_Queue_T.h: Make sure that the methods on - ACE_Message_Queue_Ex are properly virtual. Thanks to Kitty for - pointing this out. - -Sat Jan 27 19:40:36 2001 Ossama Othman - - * bin/auto_run_tests.lst: - - Added TAO's Portable Interceptor "Service_Context_Manipulation" - test to the list of tests to run. - -Sat Jan 27 19:34:20 2001 Douglas C. Schmidt - - * tests/Config_Test.{h,cpp}: Fixed the use of "bool," which is - not supported on older compilers. Thanks to Kitty for reporting - this. - -Sat Jan 27 15:22:03 2001 Ossama Othman - - * tests/Thread_Mutex_Test.cpp (test): - - Added code that tests mutex timeout functionality. - -Sat Jan 27 15:16:33 2001 Douglas C. Schmidt - - * ace/POSIX_Proactor.h: Replace ACE_Thread_Mutex with ACE_SYNCH_MUTEX - to avoid the need for conditional compilation. - - * ace/SUN_Proactor.h: Don't use ACE_Condition - but instead use the ACE_SYNCH_CONDITION, which also avoids the - need to conditionally compile for threaded platforms. - -Sat Jan 27 13:29:51 2001 Ossama Othman - - * ace/config-linux.h: - - Declare the pthread_mutex_timedlock() prototype as an - 'extern "C"' function. This fixes an "unresolved symbol" link - error. - -Sat Jan 27 10:39:28 2001 Carlos O'Ryan - - * bin/nightlybuilds/builds.lst: - Apparently the blank in 'RedHat 7.0' breaks the scoreboard. - -Sat Jan 27 01:06:09 2001 Irfan Pyarali - - * include/makeinclude/platform_sunos5_sunc++.GNU: SPRO 5.0 - compiler should be able to support automatic template - instantiation. Also, standard C++ library should be ok. -g was - added to DCCFLAGS. - - * ace/config-sunos5.5.h: Turned off - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, - ACE_TEMPLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the - SPRO 5.0 compiler. - - Thanks to J. Russell Noseworthy - for contributing the above patches. - -Sat Jan 27 00:37:26 2001 Irfan Pyarali - - * ace/OS.i: - - - (mutex_lock): Windows code must use relative time since that - is what WaitForSingleObject() expects. Also, fixed extra - "return" before ACE_NOTSUP_RETURN. - - - (thread_mutex_lock): Made thread_mutex_lock() with timeout - close to the thread_mutex_lock() without timeouts. - -Fri Jan 26 21:53:45 2001 Ossama Othman - - * ace/OS.h: - * ace/OS.i (thread_mutex_lock): - - Added an overloaded version of this method that accepts a - timeout argument. It delegates to the standard - ACE_OS::mutex_lock() method on non-Windows platforms. - Otherwise, it returns with an ENOTSUP. - - The addition of this method was necessary to fix a compile - problem related to the ACE_Thread_Mutex class. - - * ace/Synch.i (acquire): - - In ACE_Thread_Mutex::acquire() that accepts a timeout argument, - call the corresponding ACE_OS::thread_mutex_lock() method. This - fixes compile-time error on MS Windows builds due to the fact - that ACE_mutex_t and ACE_thread_mutex_t are different types on - that platform. - -Fri Jan 26 17:31:26 2001 Ossama Othman - - * ace/OS.i (mutex_lock): - - Fixed unused argument warnings that occured when compiling for - the single threaded case. - -Fri Jan 26 16:58:03 2001 Ossama Othman - - * ace/config-linux.h: - - glibc 2.1.x doesn't have the (very useful) __GLIBC_PREREQ - macro. Use a preprocessor test that doesn't rely on it. - -Fri Jan 26 16:48:06 2001 Ossama Othman - - * ace/config-qnx-neutrino.h (ACE_HAS_MUTEX_TIMEOUTS): - * ace/config-qnx-rtp.h (ACE_HAS_MUTEX_TIMEOUTS): - - QNX supports pthread_mutex_timedlock(). Yes! - -Fri Jan 26 17:50:38 2001 Douglas C. Schmidt - - * ace/config-win32-common.h: - ace/config-vxworks-5.x.h: Added ACE_HAS_MUTEX_TIMEOUTS macro. - - * ace/OS.i: Added timed mutex operations for Win32, VxWorks, and - pSoS. - -Fri Jan 26 16:31:15 2001 Ossama Othman - - * ace/OS.h (mutex_lock): - - Updated documentation for the version of this method that - accepts a timeout value. - - * ace/OS.i (mutex_lock): - - If the platform does not support timed mutexes, then return with - an ENOTSUP. - - * ace/Process_Mutex.h: - * ace/Process_Mutex.inl (acquire): - - Added version of this method that accepts a timeout value. - -Fri Jan 26 17:50:38 2001 Douglas C. Schmidt - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp (report_stats): - Fixed some unintentional tabs. Thanks to Mike Curtis for - reporting this! - -Fri Jan 26 15:34:01 2001 Ossama Othman - - * ace/OS.h: - * ace/OS.i (mutex_timedlock, mutex_lock): - * ace/Synch.i (acquire): - - Renamed the ACE_OS::mutex_timedlock() to the overloaded - ACE_OS::mutex_lock(). - -Fri Jan 26 14:13:32 2001 Ossama Othman - - * ace/OS.h: - * ace/OS.i (mutex_timedlock): - - Wrapped the pthread_mutex_timedlock() function. It times out if - a lock hasn't been acquired by the given absolute time. - - * ace/Synch.h: - * ace/Synch.i (acquire): - - Added versions of this method that accept an ACE_Time_Value. - They are used to prevent blocking definitely while waiting for a - given mutex to become available. - - * ace/config-linux.h (ACE_HAS_MUTEX_TIMEOUTS): - - glibc 2.2.x supports the pthread_mutex_timedlock() function. - - * ace/config-linux-common.h: - - Undefine ACE_LACKS_{LLSEEK,LSEEK64}_PROTOTYPE prior to include - the KCC configuration file. Thanks to Jeff Greif - for reporting this. - - * ace/README: - - Added ACE_HAS_MUTEX_TIMEOUTS to the list of ACE macros. - -Fri Jan 26 11:18:15 2001 Douglas C. Schmidt - - * ace/Log_Msg.cpp (dump): Fixed some unintentional tabs. Thanks - to Mike Curtis for reporting this! - - * ace/SOCK_Dgram_Mcast.cpp (open): Modified the call to - ACE_SOCK_Dgram::shared_open() to just pass in this->mcast_ - rather than making a local copy that just contained the port - number. Thanks to Keith Nicewarner for - reporting this. - - * tests/Makefile.bor (TESTS): Added Message_Queue_Test_Ex.cpp. - -Fri Jan 26 13:37:30 2001 Luther J Baker - - * ace/OS.h: - - If using PACE, ACE_stat typedefs to pace_stat_s. - -Fri Jan 26 11:18:15 2001 Douglas C. Schmidt - - * tests/Message_Queue_Test_Ex.cpp: Fixed some ASYS_* macros with - ACE_* stuff. Thanks to Darrell for reporting this. - - * ace/Message_Queue_T.h, - * ace/Message_Queue_T.i, - * ace/Message_Queue_T.cpp: - Added the ACE_Message_Queue_Ex, which provides a message queue - abstraction whose type is templatized. Thanks to Michael Vitalo - for contributing this. - - * tests/run_tests.lst: - * tests/run_test.lst: - * tests: Added support for the new Message_Queue_Test_Ex.cpp file. - Thanks to Michael Vitalo for contributing - this. - -Fri Jan 26 09:33:20 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Add TAO/tests/Object_Loader to the list - - * include/makeinclude/rules.lib.GNU: - Allow both .cpp and .c files in the LSRC macro. This should - let the PACE guys use the real name for their files, and - generate proper dependencies. - -Fri Jan 26 02:16:42 2001 Darrell Brunsch - - * tests/OS_Test.cpp: - - Changed a use of struct stat to ACE_stat. - -Thu Jan 25 19:16:48 2001 Ossama Othman - - * ace/config-linux.h: - - Only define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and - ACE_LACKS_THREAD_STACK_SIZE for glibc < 2.1. glibc 2.1+ has the - netdb reentrant functions (albeit with funky signatures), and it - has pthread_attr_setstacksize(). - - * ace/OS.h: - - Removed trailing whitespace. - - * ace/OS.i (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, - gethostbyname_r, getservbyname_r): - - Added glibc-specific calls to these functions. This allows us - to avoid grabbing a lock! Thanks to Ben Strong - for providing the patch. - - * THANKS: - - Added Ben Strong to list of contributors. - -Thu Jan 25 20:10:24 2001 Irfan Pyarali - - * include/makeinclude/platform_irix6.x_sgic++.GNU: - * include/makeinclude/platform_irix5.3_sgic++.GNU: - - Removed -rpath "$(ACE_ROOT)/ace" from LDFLAGS. - - * ace/Message_Queue_T.{h,i}: Moved code from .i to .h to work - around a compiler bug. The Sun Forte 6 (CC 5.1) compiler is - only happy if this is in the header file. - - * ace/Message_Block_T.cpp: Fixed template parameter name mismatch - between declaration and definition. - - Thanks to J. Russell Noseworthy - for contributing the above patches. - -Thu Jan 25 10:50:35 2001 Steve Huston - - * ace/Reactor.h: Add comments to schedule_wakeup/cancel_wakeup that - they don't cause an immediate re-examination of the masks like - register_handler does. Thanks to Oscar Rodriquez - for prompting this clarification. - - * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor_Notify::handle_signal): - The call to ACE_Message_Queue::dequeue_head may change the - ACE_Time_Value passed to it, so don't override ACE_Time_Value::zero's - const-ness, lest ACE_Time_Value::zero take on some strange new value. - Thanks to Edan Ayal for this fix. - -Thu Jan 25 05:34:58 2001 Douglas C. Schmidt - - * ace/Connector.cpp (connector): Added an ACE_const_cast() to - get rid of the const for the accessor method! - - * ace/Acceptor.cpp (acceptor): Added an ACE_const_cast() to - get rid of the const for the accessor method! - - * ace/Log_Msg.{h,cpp}, - * ace/Trace.{h,cpp}: The Log_Msg -I flag now uses the current - ACE_Trace nesting level rather than always using 1. Thanks to - Mike Curtis for providing this. - -Wed Jan 24 19:43:24 2001 Nanbor Wang - - * ace/OS.i (lstat,stat): Separated win32 cases out. - -Wed Jan 24 18:15:59 2001 Nanbor Wang - - * ace/OS.i (fstat): Oops, wrong version of this function was - modified. - -Wed Jan 24 14:44:12 2001 Nanbor Wang - - * ace/FILE.cpp: - * ace/Filecache.cpp: - * ace/Filecache.h: - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: Changed the signature of , , and - to use ACE_stat instead of "struct stat". Also changed - to use _fstat and _stat on win32 instead of and - directly. Also replaced several use of "struct stat" to - ACE_stat. Thanks to Mike Anderson for - reporting this. [Bug 762] - -Wed Jan 24 16:13:10 2001 Douglas C. Schmidt - - * ace/OS_Dirent.cpp: Fixed a bug in the readdir_emulation() method. - Thanks to Yung Trinh for reporting this. - - * ace/Connector.{h,cpp}: Added a new connector() accessor to - return the underlying ACE_PEER_CONNECTOR. Thanks to Pedro - Brandao for suggesting this. - -Wed Jan 24 10:17:03 2001 Carlos O'Ryan - - * ace/Makefile: - Add dependencies (again). They were lost is a previous commit. - - * */Makefile: - Update dependencies (yet another time). - -Wed Jan 24 09:41:54 2001 Carlos O'Ryan - - * ace/Configuration.cpp: - Fixed warning under gcc. Also made the for() loop more - ACE-like, not better, but at least consistent. - -Wed Jan 24 08:56:16 2001 Carlos O'Ryan - - * ace/OS.h: - The changed to document the ACE_SVC_* macros were accidentally - lost, fixed. - - * ace/Service_Config.cpp: - New debug message when processing an explicit directive, useful - to find out when and why TAO invokes - ACE_Service_Config::process_directive() directly. - As with all other debug messages in this file it only shows up - if ACE::debug() returns non-zero. - -Wed Jan 24 01:44:47 2001 Douglas C. Schmidt - - * ace/Configuration.cpp (expand_path): Fixed a bug with assignment to - temp in the loop. Thanks to Jonathan Reis for reporting this! - -Tue Jan 23 17:02:42 2001 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Removed PACE until we figure out how to handle it in the - DLL builds. - -Tue Jan 23 16:50:35 2001 Darrell Brunsch - - * tests/Dirent_Test.dsp: - - Updated to make consistent with the rest of the dsps in - this directory in regards to output directories and non-use - of ACE_ROOT. - - * tests/Dirent_Test.cpp: - - Updated wide character compatibility and removed the use - of ACE_ROOT (now looks at ../tests", which should give - the same results). - - * tests/run_test.lst: - - Added the Dirent_Test to the list - - * tests/version_tests/Dirent_Test.dsp: (added) - * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (added) - * tests/version_tests/version_tests.dsw: - - Used the create_vt_dsps.pl script to update this directory. - -Tue Jan 23 18:03:26 2001 Jeff Parsons - - * ace/CDR_Stream.cpp: - - Added patches to read_8 and write_8 sent in by - Keith Nicewarner to deal - with the ARM byte format for doubles - -Tue Jan 23 15:06:18 2001 Darrell Brunsch - - * ace/Configuration.cpp: - * ace/OS_Dirent.cpp: - - Updated wide character compatibility. - - * ace/ace_dll.dsp: - - Removed unneeded verbose library option. - -Tue Jan 23 10:54:14 2001 Jeff Parsons - - * ace/config-doxygen.h: - * bin/autoconf_compile: - - Removed all occurrences of 'smart_proxies' and 'interface_repo'. - These are no longer necessary. - - * include/makeinclude/ace_flags.bor: - - Added necessary variables to go along with the Borland - makefiles for the new libraries tao/Domain and - tao/IFR_Client. - -Mon Jan 22 17:01:17 2001 Darrell Brunsch - - * ace/OS_String.cpp: - * ace/OS_String.inl: - * ace/ace_wchar.inl: - * ace/config-qnx-rtp.h: - - ACE_HAS_WCHAR fixes. Support is really bad on QNX RTP - so we just end up emulating most everything. As far as - I could tell, there isn't even a way to convert between - the two types of strings. - - * ace/OS_Dirent.cpp: - - Rewrote a paragraph to remove the use of "/*" in a larger - /*...*/ comment, since gcc complains about it. - - * tests/Message_Queue_Test.cpp: - - Backed out some changes to it on Jan 21, since it had - problems and I couldn't find any ChangeLog entry for the - changes (mistakenly checked in?). - -Mon Jan 22 13:51:11 2001 Phil Mesnier - - * ace/OS_Dirent.cpp (opendir_emulation): Added code to make the - emmulation work properly on Win32. Thanks to Edwin Wrench - for finding this. - - * tests/Dirent_Test.cpp: - tests/Makefile: - tests/run_tests.bat: - tests/run_tests.lst: Added test to verify correctness of above - fix. This test attempts to scan $ACE_ROOT/tests and will fail if - the number of entries is 0 or 1. - -Mon Jan 22 10:21:20 2001 Douglas C. Schmidt - - * ace/Map_Manager.h: Clarify that find() returns 0, rather than - saying "a non-negative number". Thanks to Albert Wijna - for clarifying this. - -Mon Jan 22 15:38:12 2001 Johnny Willemsen - - * ace/Containers_T.h: - ace/Containers_T.cpp: - Added operator* to the ACE_Ordered_Multiset_Iterator class - - * tests/Ordmultiset_test.cpp - Expanded test for the new operator* of the ACE_Ordered_Multiset_ - Iterator class - -Sat Jan 20 14:53:07 2001 Douglas C. Schmidt - - * ace/Configuration.{h,cpp}: Fixed some problems with const char * - that was busting the compilation. Thanks to Carlos for pointing - this out. - - * ace/Configuration.{h,cpp}: Added several fixes for - mistakes with memory management and other minor problems. - Thanks to Jonathan Reis for contributing - these fixes! - -Sat Jan 20 10:49:05 2001 Carlos O'Ryan - - * docs/ACE-guidelines.html: - Update the guidelines to point people to the Doxygen - documentation, instead of the now abandoned OSE tools. - -Sat Jan 20 10:21:08 2001 Carlos O'Ryan - - * ace/OS.cpp: - Another pass fixing problems with ACE_BEGINTHREADEX() under - Win32, this time Win32 is working fine. - -Sat Jan 20 10:20:50 2001 Douglas C. Schmidt - - * doc/tutorials: Integrated the new Service Configurator tutorial - into the main tutorials page. - -Fri Jan 19 16:57:43 2001 Douglas C. Schmidt - - * ace/Svc_Handler.h: Updated the comments to explain why - operator new is overloaded. Thanks to Kirill Kuolechov - for reporting this. - -Fri Jan 19 15:39:43 2001 Carlos O'Ryan - - * ace/OS.cpp: - QNX/RTP has the same problem that LynxOS has, after fork() is - invoked trying to destroy the preallocated objects in - ACE_OS_Object_Manager fails. - Factor out this variation in a new macro: - ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK - - * ace/config-lynxos.h: - * ace/config-qnx-rtp.h: - Define the new macro for the two relevant platforms. - - * ace/README: - Document the macro. - -Fri Jan 19 15:08:37 2001 Carlos O'Ryan - - * ace/OS.cpp: - I disabled too much in the commit at 10:50am... Now it seems to - be OK. - - * ace/Makefile: - Remove extra -v - -Fri Jan 19 13:16:49 2001 Priyanka Gontla - - * include/makeinclude/platform_hpux_aCC.GNU: - Added new options to the CCFLAGS so that the known future errors - arising because of HPUX are suppressed. - -Fri Jan 19 13:01:13 2001 Priyanka Gontla - - * ace/SSL/Makefile: - Put a check for defining ACE_SHLIBS to get it compiled on HPUX. - - * ace/RMCast/Makefile: - * ace/Makefile : - Updated dependencies - - * ace/config-all.h - Fix a build problem on HP-UX 11.00 with aCC A.03.25. The macro - used to determine the use of the std namespace changed from - RWSTD_NO_NAMESPACE to _NAMESPACE_STD. NOTE: I did preserve the - check for RWSTD_NO_NAMESPACE with aCC versions less than A.03.25. - - Thanks to Chad Elliott for making this fix. - -Fri Jan 19 11:22:42 2001 Priyanka Gontla - - * docs/tutorials/022/client_handler.cpp : - * docs/tutorials/022/client_hander.h : - * docs/tutorials/022/Acceptor_Service.cpp : - * docs/tutorials/022/Acceptor_Service.h : - * docs/tutorials/022/server.cpp : - * docs/tutorials/022/Makefile : - - * docs/tutorials/022/client/Makefile: - * docs/tutorials/022/client/client.cpp: - - * docs/tutorials/022/page01.html: - * docs/tutorials/022/page02.html: - * docs/tutorials/022/page03.html: - * docs/tutorials/022/page04.html: - * docs/tutorials/022/page05.html: - - Developed a new tutorial for the ACE_Service_Configurator. - Based on the ACE tutorial 005. - -Fri Jan 19 10:50:11 2001 Carlos O'Ryan - - * ace/OS.cpp: - Use the Green Hills specific tricks *only* if we are compiling - under Green Hills, and only for the platform where they make - sense (in this case Win32). - -Thu Jan 18 23:21:53 2001 Carlos O'Ryan - - * ace/OS.h: - Document the infamous ACE_STATIC_SVC macros. - -Thu Jan 18 23:50:35 2001 Rick Stille - - The Green Hills(GHS) Native x86 compiler does not provide support - for 64-bit integers, structural exceptions, or DLL's. Thus the - keywords __int64, __try, __dllimport, etc., are not defined. In - addition, exceptions do not work in a multi-threaded environment. - The following changes were made to address these shortcomings. - - * ace/Basic_Types.h: Because the GHS compiler has both - ACE_LACKS_LONGLONG_T and ACE_WIN32 defined, the - ACE_LACKS_LONGLONG_T macro must appear first, so the order of - these two macros has been reversed in the defines of both - ACE_UINT64_LITERAL(n) and ACE_UINT64_DBLCAST_ADAPTER(n). - - * ace/config-win32-common.h: The typedef of ACE_UINT64 as an - unsigned __int64 and the define of ACE_HAS_LLSEEK are blocked - out for ghs. - - * ace/config-win32-ghs.h: This is the new configuration file for - Green Hills/Win32. - - * ace/Configuration.cpp(resolve_key): The "return 0" at the end of - this function has been blocked out for ghs to eliminate an - "unreachable code" warning. - - * ace/Event_Handler_T.h(handle_signal): The type of the "signum" - parameter has been changed to "int" so that it matches the type - in the Event_Handler class. - - * ace/Event_Handler_T.i(handle_signal): The type of the "signum" - parameter has been changed to "int" so that it matches the type - in the Event_Handler class. - - * ace/High_Res_Timer.cpp(global_scale_factor): The Native x86 - compiler defines "QuadPart" in the LARGE_INTEGER union as a - "double," so it cannot be used in the calculation of - "global_scale_factor." Instead, for GHS, the low and high parts - of the LARGE_INTEGER structure are copied into an ACE_UINT64 - structure (which is actually an ACE_U_LongLong) and the - ACE_U_LongLong operators are used. The code segment if - (ACE_High_Res_Timer::global_scale_factor_ == 1u) // Failed to - retrieve CPU speed from system, so calculate it. - ACE_High_Res_Timer::calibrate (); is unreachable hen ACE_WIN32 - is defined, so it has been blocked out for Win32 platforms to - silence the Green Hills "unreachable code" warning. - - * ace/High_Res_Timer.i(hrtime_to_tv): There is no assignment - operator that converts an ACE_U_LongLong to a "long," so an - intermediate ACE_U_LongLong variable "usec64" has been - introduced. The type of "msec" and "usec" have been changed from - "long" to ACE_UINT32, as have been the casts. The conversion is - then carried out by using the lower part of "usec64." - - * ace/Local_Name_Space_T.cpp(remap): The "DWORD" cast has been - removed from both EXCEPTION_CONTINUE_SEARCH and - EXCEPTION_CONTINUE_EXECUTION beause the function return value is - of type "int" and the cast was causing an "integer conversion - resulted in a change of sign" warning. - - * ace/Memory_Pool.cpp(map): Removed references to the "mem_offset" - variable because it was not being used and the compiler was - issuing a warning to this effect. - - * ace/NT_Service.cpp(startup): This function was returning "-1" - when svc_sc_handle() failed, and returning a "0" when - QueryServiceConfig() failed. Since the return type of this - function is "DWORD," the compiler was issuing an "integer - conversion resulted in a change of sign" warning for the "-1" - value. Upon investigation of this issue, it was discovered that - "0" is a valid service type value, and thus the use of "0" to - indicate failure is a bug. The return value for svc_sc_handle() - failure has been changed to "MAXDWORD - 1," which is the DWORD - equivalent of "-2," and the return value for failure of - QueryServiceConfig() has been changed to "MAXDWORD," which is - the DWORD equivalent of -1. - - * ace/OS.cpp: The compiler cannot handle a 64-bit literal, so the - literal passed to FILETIME_to_timval_skew has been created as - ACE_U_LongLong(0xd53e8000, 0x19db1de). - - * ace/OS.cpp(set): The Native x86 compiler defines "QuadPart" in - the LARGE_INTEGER union as a "double," so it cannot be used in - the calculations of tv_sec and tv_usec. Instead, the low and - high parts of the LARGE_INTEGER structure are copied into an - ACE_U_LongLong structure, and the ACE_U_LongLong operators are - used. - - * ace/OS.cpp(operator FILETIME): The Native x86 compiler defines - "QuadPart" in the LARGE_INTEGER union as a "double," so it - cannot be used in the calculation of file_time. Instead, tv_sec - and tv_usec are converted iinto ACE_U_LongLong structures and - the ACE_U_LongLong operators are used. - - * ace/OS.cpp(uname): The Native x86 compiler names both the union - and the structure within the SYSTEM_INFO structure, so the - "wProcessorArchitecture" member within the "s" structure, which - is itself within the "u" union, must be accessed by using - ".u.s." - - * ace/OS.cpp(ACE_BEGINTHREADEX): Green Hills compiler gets - confused when __stdcall is imbedded in parameter list, so the - type ACE_WIN32THRFUNC_T has been defined, then used within the - parameter list of ::_beginthreadex(). - - * ace/OS.h(ACE_Time_Value): The Native x86 compiler defines - "DWORDLONG" as type "double," so FILETIME_to_timval_skew is - instead defined as type ACE_U_LongLong. - - * ace/OS.h: The pragmas "#pragma warning( disable : ... " are - unknown to the Native x86 compiler, so it produces warnings to - this effect. These pragma have been blocked out for ghs. - - * ace/OS.h: Because the Native x86 compiler does not support the - __int64 keyword, the typedef of ACE_hrtime_t has been changed - from "unsigned __int64" to "ACE_UINT64" for ghs. Because no - usage of "ACE_QWORD" could be foound, its definition has been - blocked out for ghs. - - * ace/OS.i(gettimeofday):The code at the end of this function is - not reachable if either ACE_HAS_WINCE or ACE_WIN32 is - defined. In order to quiet the Green Hills compiler warnings - about unreachable code, this code has been blocked out for - ACE_HAS_WINCE and ACE_WIN32. With this code blocked out, - however, the variables "tv" and "result" are not used, and the - compiler warns about about variables defined, but never used. In - order to quiet these warnings, the definitions of these two - variables have been blocked out for ACE_HAS_WINCE and ACE_WIN32. - - * ace/OS.i(gethrtime): The ACE_gethrtime() function is not meant - to be used by a Win32 platform, but because both "ghs" and - "ACE_HAS_PENTIUM" are defined for the Native x86 platform, a - call to ACE_gethrtime() was included in the code. This problem - has been solved by adding "&& !defined(ACE_WIN32)" to the two - "... defined (ghs) && defined (ACE_HAS_PENTIUM)" statements - which block out references to ACE_gethrtime(). - - The Native x86 compiler defines "QuadPart" in the LARGE_INTEGER - union as a "double," so it cannot be used as the return - value. Instead, because the return type is "ACE_hrtime_t," which - is type "ACE_UINT64," the low and high parts of the - LARGE_INTEGER structure are copied into an ACE_UINT64, which is - then returned. - - * ace/Process_Manager.cpp(wait): The "result >= WAIT_OBJECT_0" - test within the ACE_ASSERT statement causes the Native x86 - compiler to produce a pointless comparison of unsigned - integer with zero warning because "result" is of type - "DWORD," which is defined by the Native x86 compiler as type - "unsigned int." This test has been blocked out for ghs. - - * ace/Profile_Timer.cpp(elapsed_time): Because the "__int64" - keyword is not defined by the Native x86 compiler, it cannot be - used to cast the value of "delta_t" in the calculation of - "real_time." But "delta_t" is of type "ACE_hrtime_t," and - ACE_hrtime_t is typedefed as ACE_U_LongLong, so the division - operator defined for in the ACE_U_LongLong class can be used - directly with a divisor of type "double." Thus the "__int64" - cast has been removed for ghs. - - * ace/Sock_Connect.cpp(get_reg_value): This function is used - within the function get_ip_interfaces() function only when - either ACE_HAS_WINSOCK2 is not defined or when ACE_HAS_WINSOCK2 - is defined as "0." Because ACE_HAS_WINSOCK2 is defined on the - Native x86 platform, the compiler was issuing a defined, but - never used warning. This warning has been eliminated by - blocking out the definition of get_reg_value() when - ACE_HAS_WINSOCK2 is defined as a value other than "0." - - * ace/Stats.cpp(accumulate): The comparison "rhs.samples_count () - == 0" was producing a warning because rhs.samples_count() - returns an ACE_UINT32, but is being compared to the signed - literal "0." The "0" has been changed to "0u." - - * ace/WFMO_Reactor.cpp(ok_to_wait): The comparison of the "switch" - statement parameter "result" to "DWORD" values in the case - statements elicited an "integer conversion resulted in a change - of sign" warning from the compiler, so the type of "result" has - been changed to "DWORD." - - * ace/WFMO_Reactor.cpp(dispatch): The comparison of the "switch" - statement parameter "wait_status" to "DWORD" values in the case - statements elicited an "integer conversion resulted in a change - of sign" warning from the compiler, so the type of "wait_status" - has been cast to "DWORD." - - * ace/WFMO_Reactor.cpp(dispatch_handles): The "wait_status >= - WAIT_OBJECT_0" comparison was producing a pointless - comparison of unsigned integer with zero warning because - "wait_status" is an unsigned integer. This was a known problem - with Borland, so the blocking out of this comparison has been - extende to ghs. - - * tests/Basic_Types_Test.cpp(main): Because both the - ACE_LACKS_LONGLONG_T and ACE_WIN32 macros are defined, the - ACE_LACKS_LONGLONG_T macro must appear first, so the order of - these two macros has been reversed. - - * tests/Cached_Accept_Conn_Test.cpp: The template class - ACE_Node must be explicitly instantiated for this - platform. - - * tests/Cached_Conn_Test.cpp: The template class - ACE_Node must be explicitly instantiated for this - platform. - - * tests/Handle_Set_Test.cpp: The template class - ACE_Node must be explicitly instantiated for this - platform. This was already being done for the _CRAYMPP, so it - has been extended to ghs. - - * tests/Malloc_Test.cpp: Because the Native x86 compiler does not - support structural exceptions, it cannot support the "remap" - function, so the blocking of the ACE_TEST_REMAP_ON_FAULT macro - definition, which was already in effect for linux, has been - extended to ghs. - -Thu Jan 18 12:49:53 2001 Douglas C. Schmidt - - * ace/SUN_Proactor.cpp: Added support for cancel_aiocb(). Thanks - to Alexander Libman for contributing - this. - - * tests/Makefile.bor (TESTS): Added Config_Test so that this test - runs on Borland. - - * tests: Moved the config_test stuff (which tests ACE_Configuration* - classes) from the examples/Configuration/ directory to the - tests/ directory and made it a one-button test. - - * ace/Future.h: Changed the order of the thread mutex and the condition - variable to avoid confusion in the future regarding "order of - initialization." Thanks to Edan Ayal for - reporting this. - - * examples/Configuration: Updated this example to include the new - test for the ACE_Configuration_Heap methods. Thanks to Michael - Searles for contributing this. - -Thu Jan 18 18:55:37 2001 Carlos O'Ryan - - * bin/nightlybuilds/builds.lst: - Add the RedHat_Implicit_Templates build. - -Thu Jan 18 18:48:33 2001 Carlos O'Ryan - - * ace/Log_Msg.cpp: - Declare sys_nerr as const int under QNX/RTP (and NTO). - - * ace/Pipe.cpp: - Use pipe() under QNX because it lacks both socketpair() and it - cannot open a socket to itself. - - * ace/config-qnx-rtp.h: - Remove ACE_NTRACE hacks. - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Do not enable the repo by default it breaks QNX. - Instead of removing the definition of DCFLAGS by default we - set debug=0 all the time, that seems like a cleaner way to - disable debugging. - -Thu Jan 18 09:34:35 2001 Carlos O'Ryan - - * include/makeinclude/platform_linux.GNU: - The -fno-implicit-templates flag was hardcoded, but this gave - the users no recourse to remove should they want to use - -fimplicit-templates. - The macro IMPLICIT_TEMPLATES_FLAG is used to set the flag now, - unless the user provides a value for the macro the makefiles - continue to work as they did before this change, i.e., adding - -fno-implicit-templates to CCFLAGS. - Notice that this functionality was available in - platform_linux_lxpthreads.GNU, but dissapeared when everything - was rolled into platform_linux.GNU. - -Thu Jan 18 06:26:42 2001 Douglas C. Schmidt - - * ace/Configuration.{h,cpp}: Added functionality to read in all - values in a config file without requiring a type prefix on each - value, skips whitespace and allows comments on the end of lines. - Thanks to Michael Searles for contributing - this. - -Wed Jan 17 11:48:42 2001 Darrell Brunsch - - * bin/msvc_auto_compile.pl: - - Added PACE to the list of ACE directories so PACE is - compiled in full auto builds. - -Wed Jan 17 10:00:42 2001 Darrell Brunsch - - * ace/Handle_Ops.cpp: (handle_timed_open) - - Removed the use of ACE_NONBLOCK on Win32. This use - didn't function as expected, since ACE_NONBLOCK would - be interpreted as O_WRONLY. Also, the CreateFile API - call doesn't support any nonblocking option, so - redefining ACE_NONBLOCK would not seem to fix anything. - - Thanks to Matthias Wittig for reporting - a problem report form about this. - - * bin/PerlACE/Process_Unix.pm: - - Fixed up the use of the RUNNING state, so wait and kill - work properly. Also made Kill automatically use waitpid - (since I can't think of any time we'd kill without wanting to - clean up the resources). - -Wed Jan 17 07:44:29 2001 Douglas C. Schmidt - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to - EWOULDBLOCK if n < len so that the caller will initiate a - handle_output()-driven reply. Thanks to Klaus H. Wolf - for reporting this. - - * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message - is stored in TSS. Thanks to Pierre Oberson - for pointing out the need for this - clarification. - - * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by - adding ACE_Log_Msg::PROCESS so that the messages do not print - out (which is the correct behavior for this test). Thanks to - Mike Curtis for reporting this. - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to - EWOULDBLOCK if n < len so that the caller will initiate a - handle_output()-driven reply. Thanks to Klaus H. Wolf - for reporting this. - - * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message - is stored in TSS. Thanks to Pierre Oberson - for pointing out the need for this - clarification. - - * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by - adding ACE_Log_Msg::PROCESS so that the messages do not print - out (which is the correct behavior for this test). Thanks to - Mike Curtis for reporting this. - -Tue Jan 16 15:28:22 2001 Carlos O'Ryan - - * netsvcs/lib/Server_Logging_Handler_T.cpp: - The formal parameter names must match in the .h and .cpp file - to make Sun/CC 6.0 happy. - -Tue Jan 16 11:25:32 2001 Douglas C. Schmidt - - * ace/Log_Msg.cpp (log): Convert strerror() text string to a - TCHAR so that this call will work correctly with Unicode. - Thanks to Matthias Wittig for reporting - this. - -Tue Jan 16 09:58:20 2001 Darrell Brunsch - - * ace/ace_wchar.inl: - - Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to - preserve null pointers. - - Thanks to Matthias Wittig for - reporting this and suggesting a fix. - -Tue Jan 16 10:47:33 2001 Frank Hunleth - - * ace/config-win32-common.h: - * ace/config-win32-msvc.h: - Moved #define ACE_HAS_LLSEEK from config-win32-common.h to - config-win32-msvc.h, since _lseeki64 isn't defined for - Borland. Also implicitly removed ACE_HAS_LLSEEK for the - VisualAge compiler - it might have worked (didn't know, - couldn't test) - -Mon Jan 15 15:22:42 2001 Douglas C. Schmidt - - * ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read() - method's "bytes_to_read" parameter to "num_bytes_to_read" to - workaround a weird problem with some compilers. Thanks to Chris - Kohlhoff for this fix. - - * examples/Service_Configurator/IPC-tests/README: Updated this - file so that it's now up-to-date and also explains how to - reconfigure a server if SIGHUP isn't supported. Thanks to Mike - Curtis for reporting this. - -Mon Jan 15 12:13:48 2001 Darrell Brunsch - - * bin/nightlybuilds/builds.lst: [Added] - * bin/nightlybuilds/scoreboard_update.pl: [Added] - - Moved the scoreboard stuff from the internal cvs repos - to this one, so it is easier for people to edit the - list. - -Mon Jan 15 12:29:53 2001 Douglas C. Schmidt - - * ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME - is spelled correctly. Thanks to Mike Curtis - for reporting this. - - * ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions - with ACE_OS::strcpy() functions. Thanks to Ron Hashimshony - for reporting this. - -Mon Jan 15 09:44:16 2001 Carlos O'Ryan - - * ace/RMCast/Makefile: - Fixed Makefile to link the ACE library, otherwise we get - undefined symbols under certain platforms (AIX). Thanks to - Scott Bolin for pointing this out. - -Mon Jan 15 09:11:12 2001 Douglas C. Schmidt - - * ace/config-win32-common.h: Added support for ACE_HAS_LLSEEK, though - this should probably be changed to be compiled only on some - Win32 platforms. - - * ace/OS.{h,i}: Added support for ACE_OS::llseek() on Win32. Thanks - to Nick Lin for contributing this. - - * ace/Log_Priority.h: Clarified the fact that we only use 12 bits - for ACE_Log_Priority. Thus, the remaining bits are available - for application use. Thanks to David Singer - for motivating this comment. - -Sun Jan 14 16:53:11 2001 Douglas C. Schmidt - - * ace/Configuration.{h,cpp}: Fixed a memory leak that occurred - with transient heaps. Also added a list of current limitations - to import/export routine. Thanks to Chris Hafey - for contributing this stuff. - -Fri Jan 12 20:46:05 2001 Angelo Corsaro - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Platform macros needed to run ACE on QNX RTP. - - * ace/config-qnx-rtp.h: - Configuration file needed to run ACE on QNX RTP. - - * ACE-INSTALL.html: - Added documentation on how to install ACE on QNX RTP, - and the issue with the current version of QNX RTP. - - -Fri Jan 12 14:59:15 2001 Carlos O'Ryan - - * tests/RMCast/RMCast_Fragment_Test.cpp: - Fixed conversion from 64-bit ulong to 32-bit ulong under some - VxWorks compilers where 64 bits are emulated. Thanks to Edwin - McKay for pointing this out. - -Fri Jan 12 07:18:16 2001 Douglas C. Schmidt - - * ace/OS.{h,i}: Moved some "using std::*" definitions from OS.i to - OS.h. Thanks to Mike Curtis for reporting - this and to Christopher Kohlhoff for - suggesting the fix. - -Fri Jan 12 15:34:28 2001 Steve Huston - - * ace/Managed_Object.h: Added to the unimplemented operator= - declaration. Fixes compile w/ IBM C/C++ 3.6 on AIX. - -Fri Jan 12 07:59:19 2001 Joe Hoffert - - * Makefile: - Add the PACE directory back into the build. PACE should - not generate any build failures for the platforms - currently supported. - -Wed Jan 10 23:30:21 2001 Douglas C. Schmidt - - * ace/FILE_Addr.cpp (set): Replace (sizeof this->filename_) - with (sizeof this->filename_ / sizeof (ACE_TCHAR)). Thanks to - Matthias Wittig for reporting this. - -Tue Jan 9 07:27:19 2001 Douglas C. Schmidt - - * ace/Containers_T.h: Clarified that the ACE_Ordered_Multiset class - allows duplicates. Thanks to Albert Wijna - for clarifying this. - -Sat Jan 6 10:20:55 2001 Douglas C. Schmidt - - * ace/File_Lock.{h,inl}: Made the get_handle() method const. - Thanks to Johnny Willemsen for - reporting this. - - * ace/TP_Reactor.h: - * ace/Get_Opt.h: - * ace/Caching_Utility_T.h: Added "ACE_UNIMPLEMENTED_FUNC" macros - for all copy constructors and assignment operators. Thanks to - Johnny Willemsen for reporting this. - -Fri Jan 5 01:09:28 2001 Douglas C. Schmidt - - * performance-tests/Misc/context_switch_time.cpp (get_options), - * performance-tests/Misc/preempt.cpp (open), - * examples/Reactor/Misc/pingpong.cpp (run_svc), - * examples/Reactor/Misc/notification.cpp (main), - * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp (main), - * examples/Shared_Malloc/Options.cpp (print_usage_and_die), - * examples/Service_Configurator/IPC-tests/client/: Updated all - these programs so that don't abort via %a, but instead call - ACE_OS::exit(). Thanks to Mike Curtis for - suggesting this. - - * apps/Gateway/Peer/Options.cpp (print_usage_and_die): Make sure to - actually *die* when we're done with this function! Thanks to - Mike Curtis for suggesting this. - -Thu Jan 4 00:10:26 2001 Douglas C. Schmidt - - * ace/Select_Reactor_T.i: The cancel_timer() method should return the - number of events canceled, rather than 0 or 1. Thanks to Joe - Guan for reporting this and providing - the fix. - - * ace/Synch.h: Added an acquire (ACE_Time_Value &) method to ACE_Null_Mutex - so that this will work properly when - ACE_HAS_OPTIMIZED_MESSAGE_QUEUE is enabled. Thanks to Yuriy - Zaporozhets for reporting this. - -Wed Jan 3 23:00:52 2001 Douglas C. Schmidt - - * ace/Lib_Find.cpp (ldfind), - * ace/Makefile.bor (CFLAGS), - * include/makeinclude/outputdir.bor (OBJDIR), - * ace/config-win32-msvc.h: Added support for the new ACE_LD_DECORATOR_STR - macro which is used to work around the fact that Borland - attaches a so-called "decorator suffix" to all library names. - Thanks to Chris Kohlhoff for reporting - this. - - * ace/Lib_Find.h: Fixed a typo where ACE_LIB_FIND_H was misspelled. - Thanks to Chris Kohlhoff for reporting - this. - - * ace/SOCK_Stream.i, - ace/MEM_Stream.i: Updated the calls to ACE_OS::shutdown() to use - the new macros described below! - - * ace/OS.h: Added better support for the ACE_OS::shutdown() second - parmeter in the form of new macros ACE_SHUTDOWN_READ, - ACE_SHUTDOWN_WRITE, and ACE_SHUTDOWN_BOTH. Thanks to Mike - Curtis for suggesting this. - - * ace/SOCK_Stream.h: Clarified the role of the timeout parameters in - the various methods. Thanks to Allen Broadman - for motivating this. - -Thu Jan 11 17:24:30 2001 Carlos O'Ryan - - * Makefile: - Add new target 'Core' to quickly compile the basic ACE+TAO - components. - -Thu Jan 11 09:56:43 2001 Frank - - * ACE version 5.1.12 released. - -Thu Jan 11 05:38:24 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp: Reverted the change that was made for SPRO - 5.1 compilers. The change that was reverted is this - - Thu Jan 4 17:14:33 2001 Balachandran Natarajan - - - * ace/Handle_Set.cpp: Changed the macro - - ACE_DIV_BY_WORDSIZE(x) ((x) >> (ACE_Handle_Set::WORDSIZE)) to - - ACE_DIV_BY_WORDSIZE(x) ((x) >> ((int) - ACE_Handle_Set::WORDSIZE)). This seems to be a better - fix. Thanks to David Allen for suggesting - this. - -Tue Jan 9 09:53:53 2001 Carlos O'Ryan - - * tests/MEM_Stream_Test.cpp: - Run the event loop for at most 1 minute. After that we know - that something is amiss with the client threads, and we should - exit. This fixes the deadlock problems we were seeing in the - nightly builds. - The real cause of the problem is something broken with the way - MEM_Addr objects compare local addresses, sometimes they fail to - compare equal. In the test this results in failed connections. - -Mon Jan 8 18:53:39 2001 Sharath R. Cholleti - - * examples/Map_Manager/test_hash_map_manager.cpp: - Removed template instantiations for - ACE_Guard, - ACE_Read_Guard, and - ACE_Write_Guard to fix linker - errors under Lynx_I386. - -Mon Jan 8 10:44:57 2001 Darrell Brunsch - - * ace/OS.h: - - Added some more protection (!VXWORKS) around the cuserid - inline statement since VXWORKS doesn't have cuserid. - -Mon Jan 08 10:04:55 2001 Nanbor Wang - - * ace/Thread_Manager.cpp (terminate): Reordered some statements so - we get the thread descriptor's log_msg pointer before we delete - the thread descriptor. Thanks to Tomer Amiaz - for reporting this. - -Sun Jan 7 16:51:42 2001 Darrell Brunsch - - * ace/ace_dll.dsp: - - Removed the PACE libraries from linking. We are going to come - up with a different solution for pace. - - * docs/run_test.txt: - - Changed the instructions a little to use PerlACE::LocalFile - for the server's IOR file. - -Sun Jan 7 08:59:09 2001 Balachandran Natarajan - - * tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement. - * tests/run_test.lst: Disabled MEM_Stream_Test in Linux. - -Thu Jan 4 17:14:33 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp (dispatch_i): Eliminate a portion of the - code from SunCC5 builds. This piece of code was trying to set - things right when it sees all the masks clear and the - greater than zero. This seems to be creating problems with SunCC - 5 builds alone. Commenting out this piece for SunCC5 helps. This - should also be a work around for the bug #750 in bugzilla. - -Thu Jan 04 17:07:48 2001 Luther Baker - - * ace/ace_dll.dsp - - Consistent typography (win32 specific backslash). - -Thu Jan 4 15:34:14 2001 Luther J Baker - - * ace/ace_dll.dsp - - Added PACE library to the ACE DLL project file. - (also changed the library search path) - -Wed Jan 3 17:24:11 2001 Darrell Brunsch - - * ace/OS.h: - - Mistakenly changed the ace_timezone () method to use - timezone () instead of timezone. Changed back. - -Wed Jan 3 16:00:22 2001 Darrell Brunsch - - * ace/ACE.cpp - - Changed the types of day_of_week_name and month_name in - ACE::timestamp to ACE_TCHAR (since that was the data - being assigned to it and the type that is later expected). - This fixed errors in Win32's Unicode build. - -Wed Jan 3 15:44:31 2001 Darrell Brunsch - - * ace/OS.i: - - Removed ACE_TIMEZONE since we found another workaround for - platforms that define timezone () as a macro. - - * ace/OS.h: - * ace/OS.i: - - Moved much of the code from ACE_OS::timezone and - ACE_OS::difftime into ace_timezone and ace_difftime. Since - some platforms don't have timezone or difftime, we needed - to do something here so those methods aren't used. Instead - of figuring out what larger #if !... should be, it is easier - (and less error prone) to just move the code here. - -Wed Jan 3 13:10:39 2001 Darrell Brunsch - - * apps/JAWS/server/HTTP_Helpers.cpp: - - Added ACE_MT around an ACE_Guard to remove an unused var - warning in the single threaded builds. - -Wed Jan 3 12:56:13 2001 Darrell Brunsch - - * ace/Timer_Wheel_T.cpp: - * ace/Timer_Wheel_T.h: - - Doug noticed some redundant code in expire while making his - change on the 21st. I checked and he was right, it looks like - I was moving around the loop termination conditionals and left - some around. Removed them and also added some better comments - and made it more doxygen complient. - -Wed Jan 3 12:06:20 2001 Darrell Brunsch - - * tests/Refcounted_Auto_Ptr_Test.dsw: - - Projects are listed in tests.dsw, so this is unneeded. - - * tests/tests.dsw: - - Added Refcounted_Auto_Ptr_Test.dsp. - -Tue Jan 3 10:30:42 2001 Darrell Brunsch - - * docs/msvc_notes.txt: - - Added this file explaining some issues or explanations on how - ACE/TAO are set up for use with MSVC. Mainly I'm thinking of - this as a place to put random stuff about ACE and TAO on MSVC. - - Plus I think we need more nifty doxygen documents. ;-) A tip of - the hat goes to Letha Etzkorn and - Shivakumar Patil for bringing up - questions that led to the dump of info to this file. - - * ACE-INSTALL.html: - - Added a reference to msvc_notes.txt. - -Wed Jan 3 09:15:24 2001 Jeff Parsons - - * ace/ACE.cpp: - - Replaced these lines - - SYSTEMTIME local; - ::GetLocalTime (&local); - - in the timestamp() method. - They were removed the last time this file was - modified, breaking the Win32 builds. - -Wed Jan 03 05:49:11 2001 Carlos O'Ryan - - * ace/OS.h: - The ace_cuserid() helper cannot be defined in Win32 - -Wed Jan 03 05:42:20 2001 Carlos O'Ryan - - * ace/OS.h: - Remove broken #include of unistd.h, it was a debug statement - that sneaked through the commit. - -Tue Jan 2 18:33:03 2001 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - Workaround platforms that define timezone, difftime or cuserid - as macros. Instead of just dropping support for the ACE_OS::XXX - method we create an inline ace_XXX() function, that uses the - original macro expansion, then we #undef the offending macro, - and use the inline function in the code. - - * ace/config-tru64.h: - Enable cuserid() again, with the new workaround it should work - without problems. - This fix should remove some of the redness in the TRU64_CXX - builds. - -Tue Jan 2 14:22:21 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Add the DII version of Param_Test to the nightly builds. - -Tue Jan 2 10:25:30 2001 Balachandran Natarajan - - * ace/Cached_Connect_Strategy_T.cpp: Added the patch provided by - Edan Ayal for - ACE_Bounded_Cached_Connect_Strategy::find_or_create_svc_handler_i (). - -Tue Jan 2 09:03:18 2001 Douglas C. Schmidt - - * ace/Asynch_Acceptor.{h,cpp}, - ace/POSIX_Async_IO.{h,cpp}, - ace/POSIX_Proactor.{h,cpp}, - ace/SUN_Proactor.{h,cpp}: Added enhanced versions of ACE_POSIX_Proactor - and ACE_SUN_Proactor to fix various problems uncovered and fixed by - Alexander Libman . - - * ace/ACE.{h,cpp}: Fixed the timestamp() method so that it works - identically on Win32 and on UNIX. Also provided a new option - that'll make it possible to return a pointer to the beginning of - the time portion of "date and time." Thanks to Michael Searles - for contributing these fixes. - -Mon Jan 01 16:35:00 2001 Michael Kircher - - * tests/Reader_Writer_Test.cpp: Added a #ifdef to check for native - RW lock support. If the platform supports native RW locks we should - not report a failure on upgrading, because native RW locks do not - support upgrading, only our RW lock emulation does this. - Thanks to Frank and Doug for pointing out this failure. diff --git a/ChangeLogs/ChangeLog-01b b/ChangeLogs/ChangeLog-01b deleted file mode 100644 index 504c875d72b..00000000000 --- a/ChangeLogs/ChangeLog-01b +++ /dev/null @@ -1,8242 +0,0 @@ -Mon Dec 31 09:32:59 2001 Douglas C. Schmidt - - * ace/Hash_Map_Manager_T.h: Added ACE_UNIMPLEMENTED_FUNC() for the - assignment operator and copy constructor of class - ACE_Hash_Map_Manager_Ex. Thanks to Johnny Willemsen for - reporting this. - -Mon Dec 31 16:33:17 2001 Johnny Willemsen - - * ace/OS.{h,i}: - Added ACE_OS::freopen. This method reassigns an existing - stream with a new stream. This is not supported on WinCE - -Mon Dec 31 15:09:12 2001 Johnny Willemsen - - * apps/drwho/BM_Server.cpp: - * apps/drwho/Options.cpp: - * apps/drwho/PM_Client.cpp: - * apps/drwho/PMC_Ruser.cpp: - * apps/drwho/PMC_Ruser.cpp: - * apps/gperf/src/Options.cpp: - * docs/tutorials/010/message_queue.cpp: - * docs/tutorials/011/message_queue.cpp: - * docs/tutorials/012/message_queue.cpp: - * docs/tutorials/013/message_queue.cpp: - * examples/IOStream/server/iostream_server.cpp: - * examples/Reactor/WFMO_Reactor/test_multithreading.cpp: - * netsvcs/clients/Logger/direct_logging.cpp: - * tests/Pipe_Test.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i: - Changed occurences of atoi with ACE_OS::atoi because the normal - atoi gives problems when compiling with ACE_USES_WCHAR defined - -Mon Dec 31 14:40:12 2001 Johnny Willemsen - - * ace/Get_Opt.cpp: - Replaced ACE_TEXT by ACE_LIB_TEXT because ACE_LIB_TEXT must be used - within the ACE library instead of ACE_TEXT - -Sun Dec 30 16:54:18 2001 Douglas C. Schmidt - - * ace/Parse_Node.cpp: Now that ACE::strnew() checks for a NULL - parameter, we can remove the checks in the ACE code. - - * ace/ACE.i (strnew): Check to see if the pointer passed to - ACE::strnew() is non-NULL. Thanks to Don Hinton for reporting - this. - -Sat Dec 29 18:36:13 2001 Douglas C. Schmidt - - * ace/OS.i (putenv): Fixed a typo. Thanks to Venkita for - reporting this. - - * ace/OS.i (getenv): Return ACE_NOTSUP_RETURN(0) if we're - compiling on a platform that lacks getenv(), e.g., WinCE. - Thanks to Venkita for reporting this. - -Sat Dec 29 16:14:41 2001 Balachandran Natarajan - - * ace/OS.h: - * ace/Default_Constants.h: Moved some constants from this file to - OS.h as it needed includes in OS.h. Need to take a better look - before any other dissection can be performed. - -Sat Dec 29 12:08:40 2001 Balachandran Natarajan - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added new header files into the project. - -Sat Dec 29 11:57:40 2001 Balachandran Natarajan - - * ace/Default_Constants.h: A new header file that houses some of - the constants that are used widely by ACE and applications based - on ACE. The motivation for this one is the same as that of - creating Global_Macros.h. - - * ace/Global_Macros.h: Moved some constant definitions from this - file to Default_Constants.h. - - * ace/OS.h: Moved some constant definitions out of this - file. There are some more that needs moving and will be done - over a period of time hopefully. - -Sat Dec 29 06:31:50 2001 Douglas C. Schmidt - - * tests/MEM_Stream_Test.cpp (test_concurrent): Added an - ACE_UNUSED_ARG(connect_client) to silence complaints on certain - compilers about unused arguments. - -Sat Dec 29 12:54:45 2001 Johnny Willemsen - - * examples/IPC_SAP/SOCK_SAP/C-inclient.cpp: - * examples/IPC_SAP/SOCK_SAP/C-inserver.cpp: - * examples/Mem_Map/file-reverse/file-reverse.cpp: - * examples/Reactor/Multicast/Log_Wrapper.cpp: - * examples/Reactor/Multicast/server.cpp: - Made these files compiling when ACE_USES_WCHAR is set - - * examples/Map_Manager/test_hash_map_manager.cpp: - Made this file partly compiling when ACE_USES_WCHAR is set - -Sat Dec 29 10:42:12 2001 Johnny Willemsen - - * tests/SSL/Makefile.bor: - Added SSL_LIB to lib files - -Sat Dec 29 02:55:24 2001 Venkita Subramonian - - * ace/OS.i: - Fixed problem with idl compiler segmentation fault. - replaced - # if !defined ACE_LACKS_ENV - with - # if defined ACE_LACKS_ENV - in ACE_OS::strenvdup. - -Fri Dec 28 16:01:58 2001 Balachandran Natarajan - - * ace/Global_Macros.h: Fixed a fuzz error. - -Fri Dec 28 15:15:42 2002 Steve Huston - - * ace/Select_Reactor_T.h: Improved Doxygenization of some comments. - -Fri Dec 28 13:41:23 2001 Douglas C. Schmidt - - * ace/OS.{h,i,cpp} (putenv,getenv,strenvdup,getenvstrings): - * ace/Get_Opt.cpp (ACE_Get_Opt): Removed the #ifndef (ACE_LACKS_ENV) - from Get_Opt.cpp and move this into OS.i where it belongs! - Thanks to Venkita and Don Hinton for reporting this. - -Fri Dec 28 19:56:12 2001 Johnny Willemsen - - * performance-tests/Misc/test_naming.cpp: - * performance-tests/Server_Concurrency/Latency_Stats.h: - * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp: - * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp: - * performance-tests/TCP/tcp_test.cpp: - * performance-tests/UDP/udp_test.cpp: - Made these files compiling when ACE_USES_WCHAR is set - - * Makefile.bor: - Added the performance-tests directory to this BCB makefile. All files - in this directory now compile when ACE_USES_WCHAR is set - -Fri Dec 28 10:45:33 2001 Steve Huston - - * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: Make the string - arguments to ACE_SSL_Context char * - don't use any ACE_* - macros. Fixes build problems on Borland Unicode builds. Thanks - to Johnny Willemsen for this fix. - -Fri Dec 28 06:31:46 2001 Venkita Subramonian - - * ace/Get_Opt.cpp: Changed #ifndef check to ACE_LACKS_ENV - instead of ACE_LACKS_GETENV. - -Fri Dec 28 05:20:29 2001 Douglas C. Schmidt - - * ace/Get_Opt.cpp (ACE_Get_Opt): Protect the call to ACE_OS::getenv() - with a #ifndef (ACE_LACKS_GETENV). Thanks to Bala and Venkita - for reporting this! - -Fri Dec 28 10:52:12 2001 Johnny Willemsen - - * tests/SSL/Makefile.bor: - Added ACE_SSL_LIB to fix linker errors in BCB build - -Thu Dec 27 22:14:30 2001 Balachandran Natarajan - - * ace/Global_Macros.h: A new file that will house the macros used - by ACE and applications. Have moved a very few macros from OS.h - to this file. The real need for this was the need to include - OS.h even if one wants to use a simple macro like - ACE_UNIMPLEMENTED_FUNC or something as simple as that. Over a - period of time we need to move more macros into this file so - that applications can use this instead of OS.h. It would be nice - to split this file into pieces having macros for every specific - functionality. That was getting too tedious and error - prone. Thought that this could be a first step to move further. - - * ace/OS.h: Moved a few macros into Global_Macros.h file. Also - included the file in OS.h The need for inclusion comes from the - fact that there are dependencies that exist between the macros - moved and the stuff that exist in OS.h. - -Thu Dec 27 20:43:43 2001 Nanbor Wang - - * ace/Configuration_Import_Export.cpp: The .ini reader didn't - handle equal signs in values even if they are quoted. Changed - the strrchr in import_config() to strchr. Thanks to Glen - Coakley for reporting and submitting - the patch. - -Thu Dec 27 15:47:22 2001 Steve Huston - - * examples/OS/Process/imore.cpp: Fixed typo in optind -> opt_ind() - conversion. - -Thu Dec 27 09:52:56 2001 Douglas C. Schmidt - - * tests/Get_Opt_Test.cpp: Added ACE_TEXT macros to the various - strings so they will compile on Unicode builds. Thanks to - Venkita for noticing this! - -Thu Dec 27 14:53:49 2001 Steve Huston - - * ace/SSL/SSL_SOCK_Acceptor.(h cpp): - * ace/SSL/SSL_SOCK_Connector.(h cpp): Removed #include "ace/Reactor.h" - from the .h files and added #include "ace/Handle_Set.h" to the - .cpp files. Reactor is no longer needed for the class, but - ACE_Handle_Set is used in the implementation. - - * ace/SSL/Makefile: Removed Reactor*.* from dependencies. - -Thu Dec 27 12:56:31 2001 Steve Huston - - * ace/SSL/SSL_SOCK_Stream.i (close): Reverted this change: - Fri Dec 7 10:22:25 2001 Ossama Othman - The reactor is not used, so no workaround for it is needed. - If the ACE_SSL_SOCK_Stream is closed, the handle is invalidated. - -Thu Dec 27 11:39:48 2001 Steve Huston - - * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: Changed ACE_TEXT to - ACE_TEXT_ALWAYS_CHAR for the file names passed to ACE_SSL_Context. - The underlying SSL calls want a char *, so it appears pointless - to change ACE_SSL_Context to accept wide chars. - -Thu Dec 27 09:38:24 2001 Balachandran Natarajan - - * examples/Reactor/Proactor/test_timeout.cpp: - * examples/Reactor/Proactor/test_multiple_loops.cpp: - * examples/Reactor/Proactor/post_completions.cpp: - * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h: - - Added #includes to prevent compilation errors on Win32. Thanks - to Venkita for pointing this out. - -Thu Dec 27 06:41:24 2001 Douglas C. Schmidt - - * tests/Proactor_Timer_Test.cpp: Added #ifndefs to guard against - trying to compile this test on platforms that don't support the - Proactor! Thanks to Venkita for noticing this. - -Wed Dec 26 15:51:28 2001 Venkita Subramonian - - * ace/Get_Opt.h: - ace/Get_Opt.cpp: - Fixed compiler warnings. Changed order of member variable - initialization. - -Wed Dec 26 11:18:31 2001 Douglas C. Schmidt - - * ace/Get_Opt.cpp (permute): Add ACE_TEXT() around the - "--" string to make things work properly on Unicode builds. - Thanks to Johnny Willemsen and Don Hinton for contributing this - fix! - -Wed Dec 26 09:07:45 2001 Douglas C. Schmidt - - * tests/*.cpp: Replaced all uses of getopt.optarg with - getopt.opt_arg() and all uses of getopt.optind with - getopt.opt_ind(). - - * ace/Logging_Strategy.cpp - ace/Naming_Context.cpp - ace/Service_Config.cpp - ace/Service_Manager.cpp - performance-tests/Misc/basic_perf.cpp - performance-tests/Misc/childbirth_time.cpp - performance-tests/Misc/context_switch_time.cpp - performance-tests/Misc/preempt.cpp - performance-tests/Misc/test_guard.cpp - performance-tests/RPC/client.cpp - performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp - performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp - performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp - performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp - performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp - performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp - performance-tests/TCP/tcp_test.cpp - performance-tests/UDP/udp_test.cpp - apps/Gateway/ - gperf/Options.cpp - drwho/Options.cpp - netsvcs/clients/Tokens/collection/collection.cpp - netsvcs/clients/Tokens/collection/rw_locks.cpp - netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp - netsvcs/clients/Tokens/manual/manual.cpp - netsvcs/clients/Tokens/mutex/test_mutex.cpp - netsvcs/clients/Tokens/rw_lock/rw_locks.cpp - netsvcs/lib/Client_Logging_Handler.cpp - netsvcs/lib/Name_Handler.cpp - netsvcs/lib/TS_Server_Handler.cpp - netsvcs/lib/Server_Logging_Handler_T.cpp - netsvcs/lib/TS_Clerk_Handler.cpp - netsvcs/lib/Token_Handler.cpp - examples/ASX/Event_Server/Event_Server/Options.cpp - examples/ASX/Event_Server/Transceiver/transceiver.cpp - examples/ASX/UPIPE_Event_Server/Options.cpp - examples/ASX/UPIPE_Event_Server/Peer_Router.cpp - examples/Connection/blocking/SPIPE-connector.cpp - examples/Connection/blocking/SPIPE-acceptor.cpp - examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp - examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp - examples/IPC_SAP/SSL_SAP/SSL-client.cpp - examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp - examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp - examples/Logger/Acceptor-server/server_loggerd.cpp - examples/Logger/simple-server/server_loggerd.cpp - examples/Mem_Map/IO-tests/test_io.cpp - examples/Misc/test_get_opt.cpp - examples/NT_Service/main.cpp - examples/OS/Process/process.cpp - examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp - examples/QOS/Change_Sender_TSpec/QoS_Util.cpp - examples/QOS/Simple/QoS_Util.cpp - examples/Reactor/Multicast/client.cpp - examples/Reactor/Ntalker/ntalker.cpp - examples/Reactor/Proactor/simple_test_proactor.cpp - examples/Reactor/Proactor/test_cancel.cpp - examples/Reactor/Proactor/test_proactor.cpp - examples/Reactor/Proactor/test_proactor2.cpp - examples/Reactor/Proactor/test_proactor3.cpp - examples/Reactor/Proactor/test_udp_proactor.cpp - examples/Reactor/WFMO_Reactor/test_multithreading.cpp - examples/Reactor/WFMO_Reactor/test_talker.cpp - examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp - examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp - examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp - examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp - examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp - examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp - examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp - examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp - examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp - examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp - examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i - examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i - examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i - examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i - examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i - examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i - examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i - examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i - examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i - examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp - examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i - examples/Shared_Malloc/Options.cpp - examples/Shared_Malloc/test_position_independent_malloc.cpp - examples/Synch/proc_sema.cpp - examples/Threads/process_manager.cpp - examples/Threads/reader_writer.cpp - examples/Threads/recursive_mutex.cpp - examples/Web_Crawler/Options.cpp: Replaced all uses of getopt.optarg - with getopt.opt_arg(). - - * examples/Misc/test_get_opt.cpp (main): - * examples/OS/Process/imore.cpp (parse_args): - * examples/NT_Service/main.cpp (parse_args): Replaced all uses - of getopt.optind with getopt.opt_ind (). - - * ace/Get_Opt.h: Made the optind, optarg, opterr, argv_, and argc_ - data members public rather than private to avoid breaking - existing code. Also removed the new optind and optarg macros to - avoid breaking existing code that used those names as - identifiers! - -Wed Dec 26 06:19:32 2001 Douglas C. Schmidt - - * ace/Proactor.cpp: - * ace/Proactor.h: The #include "ace/Proactor.i" must come inside - of the #ifdefs that determine if the Proactor will be available - on a particular platform. - - * examples/Reactor/Misc/test_reactors.cpp: Removed a duplicate - ACE_Atomic_Op_Ex instantiation. - -Tue Dec 25 19:43:34 2001 Balachandran Natarajan - - * Updated dependencies that were left behind from the last one. - -Tue Dec 25 09:30:14 2001 Douglas C. Schmidt - - * tests/Makefile: - * tests/Makefile.bor: Added the new Proactor_Timer_Test. - - * tests/run_test.lst: Added the new Proactor_Timer_Test. - - * tests: Added the new Proactor_Timer_Test.cpp and - Proactor_Timer_Test.dsp to exercise the new high-resolution - support in the ACE_Proactor. Thanks to Miljenko Norsic for - contributing this. - - * ace/Proactor.cpp: Added support for high-resolution timers to - the proactor. Thanks to Miljenko Norsic for contributing this. - - * ace/OS.{h,i}: Changed the ACE_OS::event_timedwait() method to - allow callers to specify either relative or absolute time. - Thanks to Miljenko Norsic for - contributing this. - - * ace/Synch.{h,cpp}: Changed the timed wait() method on ACE_Event so - allow callers to specify either relative or absolute time. - Thanks to Miljenko Norsic for - contributing this. - -Tue Dec 25 12:55:56 2001 Carlos O'Ryan - - * Updated all dependencies. - -Tue Dec 25 09:30:14 2001 Douglas C. Schmidt - - * tests/Get_Opt_Test.cpp: Make the "test_args" parameter to - parse_args() a *const* ACE_TCHAR rather than just an ACE_TCHAR. - - * tests/Get_Opt_Test.cpp (main): Added an ACE_UNUSED_ARG(argv) and - replaced the name of the test so the log file stuff will work - properly. - - * ace/Get_Opt.{h,i}: Changed the return type of opt_ind() from - int to int& so that optind++ will work correctly! Thanks - to Don Hinton for this fix. - -Tue Dec 25 09:07:07 2001 Balachandran Natarajan - - * examples/Threads/tss2.cpp: - * examples/Threads/TSS_Task.h: - * examples/Threads/task_two.cpp: - * examples/Threads/reader_writer.cpp: - * examples/Threads/manual_event.cpp: - * examples/Threads/future2.cpp: - * examples/Threads/future1.cpp: - * examples/Reactors/Misc/teste_reactors.cpp: - * netsvcs/lib/Server_Logging_T.cpp: - * netsvcs/lib/Server_Logging.cpp: Added #include of - Atomic_Op.h. Added template instantiations for ACE_Atomic_Op_Ex - in places that was required. - - * netsvcs/lib/Makefile: - * netsvcs/servers/makefile: Updated dependencies. - -Mon Dec 25 01:05:43 2001 Balachandran Natarajan - - * ace/Atomic_Op.h: Added a #include to get it compiling on win32 - platforms. - -Mon Dec 25 00:18:43 2001 Balachandran Natarajan - - * Merry Christmas to the members of the doc_group and to all the - users the world over. - - * ace/ace_lib.dsp: - * ace/ace_dll.dsp: Added Atomic_Op.{h,cpp} to the project files. - -Mon Dec 24 23:52:43 2001 Balachandran Natarajan - - * ace/Synch_T.cpp: - * ace/Synch_T.h: Removed ACE_Atomic_Op to a new file. - - * ace/Atomic_Op.h: - * ace/Atomic_Op.i: - * ace/Atomic_Op.cpp: The class ACE_Atomic_Op is in this file now. - - * ace/Functor.h: - * ace/Functor.i: Added template specializations for some base - types like ACE_UINT16. Thanks to Joe Hoffert for giving the - patches. - - * ace/RMCast/RMCast_Reassembly.cpp: Removed a template - instantation for ACE_Equal_To. - - * tests/Atomic_Op_Test.cpp: - * tests/Auto_IncDec_Test.cpp: - * tests/Cache_Map_Manager_Test.cpp: - * tests/Future_Set_Test.cpp: - * tests/Future_Test.cpp: - * tests/Hash_Map_Bucket_Iterator_Test.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/Map_Manager_Test.cpp: - * tests/Message_Queue_Notifications_Test.cpp: - * tests/Notify_Performance_Test.cpp: - * tests/Reactors_Test.cpp: - * tests/Reader_Writer_Test.cpp: - * tests/Upgradable_RW_Test.cpp: Added #include of Atomic_Op.h in - all the above files. - -Mon Dec 24 20:12:05 2001 Balachandran Natarajan - - * ace/Synch_T.h: - * ace/Synch_T.cpp: Changed a copy constructor in ACE_Atomic_Op to - take ACE_Atomic_Op as an argument instead of - ACE_Atomic_Op_Ex. This should fix compile errors in g++. - - * ace/Atomic_Op.i: Made a cosmetic change. - - -Mon Dec 24 08:08:40 2001 Douglas C. Schmidt - - * ace/Atomic_Op.i: Make sure to initialize the mutex_ reference in the - ACE_Atomic_Op_Ex copy constructor. - - * ace/OS.cpp (pwrite): The lseek() call must use SEEK_CUR rather - than SEEK_SET. Thanks to Duane Binder - for reporting this. This fixes bugid - 1095. - - * ace/Proactor.i (run_event_loop): Refactored the code to - use the new ACE_Proactor::check_reconfiguration() static method, - just like the Reactor! - - * ace/Proactor.h: Added the check_reconfiguration() static method - to ACE_Proactor, a la the Reactor! - - * tests/Thread_Pool_Reactor_Resume_Test.cpp, - * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp, - * tests/Thread_Pool_Reactor_Test.cpp: Changed the signature of the - reactor_event_hook() method to conform to the minor - modifications outlined below. - - * ace/Reactor.h: Changed the signature of - ACE_Reactor::check_reconfiguration() to reflect the following - change. - - * ace/Reactor.h: Changed the REACTOR_EVENT_HOOK typedef to take a pointer - to the ACE_Reactor. Thanks to Alex Libman for suggesting this. - - * performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp: - * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp: - * examples/Threads/tss2.cpp: - * examples/Reactor/Misc/test_reactors.cpp: - * examples/Reactor/Proactor/post_completions.cpp: - * examples/Reactor/Proactor/test_timeout.cpp: - * examples/Threads/manual_event.cpp: - * examples/Threads/future1.cpp: - * examples/Threads/future2.cpp: - * examples/Threads/reader_writer.cpp: - * examples/Threads/task_two.cpp: - * tests/Atomic_Op_Test.cpp: - * tests/Auto_IncDec_Test.cpp: - * tests/Future_Set_Test.cpp: - * tests/Future_Test.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/Message_Queue_Notifications_Test.cpp: - * tests/Notify_Performance_Test.cpp: - * tests/Reactors_Test.cpp: - * tests/Upgradable_RW_Test.cpp: - * tests/Reader_Writer_Test.cpp: - Added explicit template instantiation for ACE_Atomic_Op_Ex<>. - - * ace/Malloc_Allocator.cpp: Added explicit template instantiation - for ACE_Atomic_Op_Ex. - - * ace/Atomic_Op.i, - * ace/Synch_T.{h,cpp}: Factored out some of the structure/logic - from ACE_Atomic_Op into a new base class called - ACE_Atomic_Op_Ex. ACE_Atomic_Op_Ex uses extra parameter - - reference to ACE_LOCK to allow several ACE_Atomic_Op_Ex share - the same lock. ACE_Atomic_Op is derived from ACE_Atomic_Op_Ex - and its interface is the same as it was. It has only - constructors implementation and operators =. All other methods - are inherited from ACE_Atomic_Op_Ex. Templates instantiation - for ACE_Atomic_Op_Ex should be added to all files that have - templates instantiation for ACE_Atomic_Op. Thanks to Alex - Libman for contributing this. - - * ace/Service_Config.cpp (close_singletons): Add support to close - the Proactor singleton, just like the Reactor singleton. Thanks - to Alex Libman for contributing this. - - * ace/WIN32_Proactor.cpp: Make sure to remove all the pending - results from the I/O completion port queue when we close down to - avoid memory leaks. Thanks to Alex Libman - for contribuging this. - - * ace/Proactor.{h,i,cpp}: Added Alex Libman's - enhancements that make the ACE_Proactor behave more like the - ACE_Reactor with respect to singletons etc. In particular: - - 1. For each static ACE_Proactor method XXX_event_loop there is - the non-static proactor_XXX_event_loop method. - 2. There is a new method proactor_post_wakeup_completions which - is called from static post_wakeup_completions. - 3. The end_event_loop_ and event_loop_thread_count_ are now - instance members, not globals! - 4. The proactor instance has its own mutex to protect work with - end_event_loop_ and event_loop_thread_count_. - 5. Method ACE_Proactor::instance() now has a second parameter - delete_proactor (default value 0 means don't delete). It - returns the pointer to the previous global instance of - Proactor. The caller now is responsible for deletion of this - previous instance. - 6. Method ACE_Proactor::cleanup() is removed since the behavior - of singleton is simular to Reactor singleton. - 7. Methods ACE_Proactor::proactor_run_event_loop (....) - have now an extra parameter: (PROACTOR_EVENT_HOOK = 0), - where the PROACTOR event hook is defined as - typedef int (*PROACTOR_EVENT_HOOK)(ACE_Proactor *); - - * ace/Logging_Strategy.cpp - * ace/Naming_Context.cpp - * ace/Service_Manager.cpp: Removed the explicit template instantiations - for ACE_Array_Base<> to avoid problems with multiply defined - symbols. - - * ace/Service_Config.cpp: Added explicit template instantiations - for template class ACE_Array. - - * docs/tutorials/014/page02.html, - * docs/tutorials/014/page03.html, - * docs/tutorials/014/page04.html, - * docs/tutorials/014/page05.html, - * docs/tutorials/014/stream.cpp, - * docs/tutorials/014/Task.{h,cpp}: Fixed the tutorial so that it - uses the correct synchronization mechanism for the message - blocks. Thanks to Ulrich Voigt for - reporting this. - - * ace/Log_Msg.cpp: Moved the call to ACE_Log_Msg_Manager::close() - to first in the ACE_Log_Msg::close() method to avoid memory - leaks. Fixes BugId 1103. Thanks to Ahmed Riza - for reporting this. - -Sun Dec 23 23:02:17 2001 Carlos O'Ryan - - * examples/QOS/Diffserv/Diffserv.dsw: - * examples/QOS/Diffserv/diffserv_test.dsp: - * examples/QOS/Diffserv/server.dsp: - * examples/Reactor/FIFO/FIFO.dsw: - * examples/Reactor/FIFO/client.dsp: - * examples/Reactor/FIFO/server.dsp: - * examples/Shared_Memory/Shared_Memory.dsw: - * examples/Shared_Memory/test_MM.dsp: - * examples/Shared_Memory/test_SV.dsp: - Add more missing project files and workspaces. - -Mon Dec 24 00:48:34 2001 Nanbor Wang - - * tests/tests.dsw: - * tests/Get_Opt_Test.dsp: Added this new project file. - -Sun Dec 23 12:25:55 2001 Don Hinton - - * ace/Logging_Strategy.cpp - * ace/Naming_Context.cpp - * ace/Service_Config.cpp - * ace/Service_Manager.cpp - * ace/Get_Opt{h,i,cpp}: - - Added long option support to ACE_Get_Opt that closely minimics - getopt_long(3c) functionality as follows: made all member - variables private; added accessor functions and macros wrappers to - transparently provide backward compatibility; added new function, - long_option(), that can be used to add long options with/without - corresponding short options. - - * tests/Makefile - * tests/Makefile.bor - * tests/run_test.lst - * tests/Get_Opt_Test.cpp: - - Added a new one-button test for ACE_Get_Opt that tests new long option - support and demonstrates its use. - -Sat Dec 22 23:12:33 2001 Carlos O'Ryan - - * examples/Misc/Misc.dsw: - * examples/Misc/test_XtReactor1.dsp: - * examples/Misc/test_XtReactor2.dsp: - * examples/Misc/test_dump.dsp: - * examples/Misc/test_get_opt.dsp: - * examples/Misc/test_profile_timer.dsp: - * examples/Misc/test_read_buffer.dsp: - * examples/Misc/test_set.dsp: - * examples/Misc/test_sstring.dsp: - * examples/Misc/test_trace.dsp: - * examples/IPC_SAP/DEV_SAP/reader/reader.dsp: - * examples/IPC_SAP/DEV_SAP/reader/reader.dsw: - * examples/IPC_SAP/DEV_SAP/writer/writer.dsp: - * examples/IPC_SAP/DEV_SAP/writer/writer.dsw: - * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.dsp: - * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.dsp: - * examples/IPC_SAP/FIFO_SAP/FIFO-client.dsp: - * examples/IPC_SAP/FIFO_SAP/FIFO-server.dsp: - * examples/IPC_SAP/FIFO_SAP/FIFO-test.dsp: - * examples/IPC_SAP/FIFO_SAP/FIFO_SAP.dsw: - * examples/IPC_SAP/SPIPE_SAP/NPClient.dsp: - * examples/IPC_SAP/SPIPE_SAP/NPServer.dsp: - * examples/IPC_SAP/SPIPE_SAP/SPIPE_SAP.dsw: - * examples/IPC_SAP/SPIPE_SAP/client.dsp: - * examples/IPC_SAP/SPIPE_SAP/consumer_msg.dsp: - * examples/IPC_SAP/SPIPE_SAP/consumer_read.dsp: - * examples/IPC_SAP/SPIPE_SAP/producer_msg.dsp: - * examples/IPC_SAP/SPIPE_SAP/producer_read.dsp: - * examples/IPC_SAP/SPIPE_SAP/server.dsp: - * examples/IPC_SAP/TLI_SAP/CPP-ATM-client.dsp: - * examples/IPC_SAP/TLI_SAP/CPP-ATM-server.dsp: - * examples/IPC_SAP/TLI_SAP/CPP-client.dsp: - * examples/IPC_SAP/TLI_SAP/CPP-server.dsp: - * examples/IPC_SAP/TLI_SAP/TLI_SAP.dsw: - * examples/IPC_SAP/TLI_SAP/db-client.dsp: - * examples/IPC_SAP/TLI_SAP/db-server.dsp: - * examples/IPC_SAP/TLI_SAP/ftp-client.dsp: - * examples/IPC_SAP/TLI_SAP/ftp-server.dsp: - * examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.dsw: - * examples/IPC_SAP/UPIPE_SAP/ex1.dsp: - * examples/IPC_SAP/UPIPE_SAP/ex2.dsp: - * examples/IPC_SAP/UPIPE_SAP/ex3.dsp: - Add yet more missing project files. - - * examples/IPC_SAP/SPIPE_SAP/NPClient.cpp: - * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp: - Fixed minor syntax errors for Win32 builds. - -Sat Dec 22 11:27:11 2001 Carlos O'Ryan - - * bin/auto_compile: - Add missing -i flags for make_pretty.pl. - -Sat Dec 22 11:24:53 2001 Carlos O'Ryan - - * examples/Service_Configurator/IPC-tests/client/client.dsw: - * examples/Service_Configurator/IPC-tests/client/broadcast_client_test.dsp: - * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.dsp: - * examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.dsp: - * examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.dsp: - * examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.dsp: - * examples/Service_Configurator/IPC-tests/client/local_stream_client_test.dsp: - * examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.dsp: - * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.dsp: - * examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.dsp: - * examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.dsp: - * examples/Service_Configurator/IPC-tests/server/server.dsw: - * examples/Service_Configurator/IPC-tests/server/Server.dsp: - * examples/Service_Configurator/IPC-tests/server/Server_static.dsp: - * examples/Service_Configurator/IPC-tests/server/server_test.dsp: - Add missing project files and workspaces. - - * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h: - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h: - Add export directives for Win32 builds. - -Fri Dec 21 14:39:57 2001 Carlos O'Ryan - - * examples/Map_Manager/Map_Manager.dsw: - * examples/Map_Manager/test_hash_map_manager.dsp: - * examples/ASX/CCM_App/CCM_App.dsp: - * examples/ASX/CCM_App/CCM_App.dsw: - * examples/ASX/CCM_App/CCM_App_static.dsp: - * examples/ASX/CCM_App/SC_Client.dsp: - * examples/ASX/CCM_App/SC_Server.dsp: - * examples/Connection/misc/Connection_Handler.dsp: - * examples/Connection/misc/misc.dsw: - * examples/Connection/misc/test_upipe.dsp: - * examples/IOStream/client/client.dsw: - * examples/IOStream/client/iostream_client.dsp: - * examples/IOStream/server/server.dsw: - * examples/IOStream/server/iostream_server.dsp: - * examples/Smart_Pointers/Smart_Pointers.dsw: - * examples/Smart_Pointers/gadget_test.dsp: - * examples/Smart_Pointers/widget_test.dsp: - Add missing project files and workspaces. - -Fri Dec 21 16:22:39 2001 Steve Huston - - * ace/ace.icc: Corrected entries for String_Base_Const.(h cpp). - -Fri Dec 21 16:00:00 2001 Steve Huston - - * tests/SSL/Makefile.bor: Add $(SSL_CFLAGS) $(ACE_SSL_CFLAGS) to - CFLAGS to pick up the SSL include dirs, etc. - -Fri Dec 21 11:30:01 2001 Carlos O'Ryan - - * examples/Shared_Malloc/multiple_mallocs.dsp: - Add Malloc.cpp and Options.cpp to this project. Though not - strictly required for Win32 the files are used in Unix builds. - Having the .dsp and Makefile consistent is helpful for samwise. - -Fri Dec 21 14:14:51 2001 Steve Huston - - * ace/SSL/Makefile: Removed SSL_Accept_Handler.* and - SSL_Connect_Handler.* from the dependencies. - - * tests/Makefile: Only build SSL tests if ssl eq 1. - -Fri Dec 21 16:13:54 2001 Balachandran Natarajan - - * Makefile: Added Makefile.bor to the list of controlled files for - the release. - -Thu Dec 20 18:20:51 2001 Douglas C. Schmidt - - * ace/RB_Tree.cpp: Added checks in the RB_tree_predecessor() and - RB_tree_successor() methods to guard against indirections via a - NULL pointer. Thanks to Craig Ching for - reporting this fix. - -Thu Dec 20 18:05:32 2001 Steve Huston - - * examples/Shared_Malloc/test_persistence.cpp: Added a nothrow - variant of operator new to work with ACE_HAS_NEW_NOTHROW platforms. - -Thu Dec 20 15:04:52 2001 Steve Huston - - * ace/SSL/SSL_SOCK_Acceptor.h: Improved documentation. Changed - "protocol_family" argument defaults from PF_INET to PF_UNSPEC - to work correctly with IPv6 support. - -Thu Dec 20 13:53:48 2001 Steve Huston - - * ace/SSL/SSL_SOCK_Acceptor.cpp: - * ace/SSL/SSL_SOCK_Connector.cpp: Fixed compile errors on Win32. - -Thu Dec 20 13:37:42 2001 Steve Huston - - * ace/config-all.h: Restructured the section for - ACE_NEW_THROWS_EXCEPTIONS so that if ACE_HAS_NEW_NOTHROW is defined, - the new(nothrow) version is used rather than setting up a try/catch. - (Previously, this was only done for HP aC++). Also, check for - __BORLANDC__ and set up the ACE_bad_alloc exception value properly. - Thanks to Johnny Willemsen for reporting - this problem. - -Thu Dec 20 11:43:29 2001 Steve Huston - - * tests/SSL: New directory for ACE_SSL tests. - - * tests/SSL/dummy.pem: - * tests/SSL/key.pem: - * tests/SSL/Makefile: - * tests/SSL/Makefile.bor: Structure support for new tests. - - * tests/Thread_Pool_Reactor_SSL_Test.(h cpp): Tests the ACE_TP_Reactor - with ACE_SSL wrappers. Thank you to Robert Handl - for contributing this test. - - * tests/Makefile: - * tests/Makefile.bor: Add SSL to build dirs if building with SSL. - - * THANKS: Added Robert Handl to the Hall of Fame. - -Thu Dec 20 11:34:51 2001 Steve Huston - - * ace/SSL/SSL_SOCK_Acceptor.(h cpp i): - * ace/SSL/SSL_SOCK_Connector.(h cpp i): Series of changes: - - Does not use an ACE_Reactor any longer. Waiting for socket - I/O possibility is done using ACE::select. It's simpler and - doesn't suffer on Win32. - - The basic socket acceptance is referred to ACE_SOCK_Acceptor, - so the shared_accept_start and shared_accept_finish methods - are gone (in SSL_SOCK_Acceptor.*; no affect on Connector). - - The timed and non-timed versions of ssl_accept/connect are - now combined into one function. The timeout value passed to - the ACE_SSL_SOCK_Acceptor::accept() method is used, and it - correctly drives ACE::accept. - - * ace/SSL/SSL_Connector_Handler.(cpp h): - * ace/SSL/SSL_Accept_Handler.(cpp h): These are no longer needed. - since all of the accept handshaking activity is paced by - ACE::accept, not a reactor. - - * ace/SSL/Makefile: - * ace/SSL/Makefile.bor: - * ace/SSL/ACE_SSL.dsp: - * ace/SSL/ACE_SSL_LIB.dsp: Removed SSL_Accept_Handler and - SSL_Connect_Handler. - -Thu Dec 20 09:03:12 2001 Johnny Willemsen - - * Makefile.bor: - Only build ace and its tests because the rest is not fully - unicode compliant - -Wed Dec 19 22:28:00 2001 Ossama Othman - - * ace/WFMO_Reactor.cpp (upcall): Corrected syntax error. - -Wed Dec 19 21:54:29 2001 Steve Huston - - * ace/config-hpux-10.x-hpc++.h: Added ACE_HAS_NEW_NOTHROW when - exceptions are enabled. - -Wed Dec 19 11:10:35 2001 Douglas C. Schmidt - - * ace/WFMO_Reactor.cpp: Use the ACE_BIT_ENABLED macro - rather than the '&' operator directly. - -2001-12-18 Douglas C. Schmidt - - * Both Irfan Pyarali and Chris Gill are now *Dr.* Pyarali and - *Dr.* Gill. Congrats to both on a job well done! - -Wed Dec 19 10:02:53 2001 Venkita Subramonian - - * Makefile.bor: - Made changes for Borland ace-only builds as per - Johnny Willemsen . - -Wed Dec 19 09:39:03 2001 Venkita Subramonian - - * tests/Message_Queue_Test_Ex.cpp: - - Fixed compiler warning. Deleted an unused variable declaration. - -Wed Dec 19 10:31:12 2001 Johnny Willemsen - - * tests/Makefile.bor: - Added INET_Addr_Test - - * tests/INET_Addr_Test.cpp: - Changed type of argv from char to ACE_TCHAR to solve link errors - in the Unicode builds - -Tue Dec 18 19:15:42 2001 Steve Huston - - * tests/INET_Addr_Test.dsp: New test project for INET_Addr_Test. - - * tests/tests.dsw: Added INET_Addr_Test project. - -Tue Dec 18 18:50:29 2001 Steve Huston - - * ace/README: Added entry for new macro, ACE_HAS_NEW_NOTHROW. - This setting should be enabled if the compiler offers - new (nothrow). It enables nothrow variants of operator new - where that operator is defined on ACE classes. - - * ace/config-hpux-11.00.h: Added ACE_HAS_NEW_NOTHROW for aCC. - - * ace/config-all.h: Changed ACE_NEW[_RETURN] for HP aC++ to use - new(nothrow) rather than trying to catch exceptions, which - works particularly poorly when exceptions are disabled. Even - if they're disabled at compiler time, the run-time will still - throw an exception if allocation fails. - Fix decision making for how to do this correctly for both - HP-UX 10.20 and 11.x. - Correct ACE_throw_bad_alloc to compile correctly. - - * ace/Configuration.cpp (create_index_helper, value_open_helper, - section_open_helper): - * ace/Local_Name_Space_T.cpp (create_manager_i): - * ace/Malloc_Allocator.cpp (ACE_Allocator::instance): - Use naked placement new rather than ACE_NEW_RETURN. Placement - new does not work with new(nothrow) and a placement new won't - throw an exception that the ACE_NEW_* macros would catch anyway. - - * ace/Svc_Handler.(h cpp): Added a nothrow version of operator - new if ACE_HAS_NEW_NOTHROW is defined. - - * ace/config-hpux-11.x-hpc++.h: As promised before ACE 5.1, this - file is removed. config-hpux-11.00.h is the HP-UX 11.x config. - - * ace/config-aix-3.2.5.h: - * ace/config-hpux-9.x.h: Removed. These are hopelessly out of date - and the compilers don't support them any longer. - -Tue Dec 18 17:47:44 2001 Steve Huston - - * ace/Caching_Utility_T.cpp: Added #include "ace/Recyclable.h" - to pick up def for ACE_RECYCLABLE_IDLE_AND_PURGABLE. - - * tests/INET_Addr_Test.cpp: ACEified. - - * tests/run_test.lst: Added INET_Addr_Test. - -Tue Dec 18 14:43:02 2001 Carlos O'Ryan - - * ace/Sock_Connect.cpp: - * ace/config-cygwin32-common.h: - Use the #include /**/ trick to shut up the WinCE warnings. - -Tue Dec 18 22:05:04 2001 Balachandran Natarajan - - * bin/make_release: Added comment to indicate the problem in - producing diffs when a beta after a major or minor release is - cut. This needs fixing. Will get to this when the other pending - changes go in. - -Tue Dec 18 16:01:59 2001 Douglas C. Schmidt - - * ace/OS_Dirent.cpp (readdir_emulation): Fixed an "off-by-one" - memory allocation error. Thanks to Kyle Brost - for reporting this. - -Mon Dec 17 09:04:28 2001 Douglas C. Schmidt - - * ace/OS.i (ctime_r): Replaced ACE_OS::strsncpy() with - ACE_OS::strncpy() to fix a bug on Linux. Thanks to Vlado - Chovanec for reporting this. - This fixes BugID 1101. - -Tue Dec 18 13:04:07 2001 Carlos O'Ryan - - * bin/make_pretty.pl: - Incorporate numerous pending changes and improvements. - -Tue Dec 18 12:45:45 2001 Carlos O'Ryan - - * bin/nightlybuilds/builds.lst: - Updated to use the new build standard. - - * bin/nightlybuilds/scoreboard_update.pl: - Incorporate changes to support multiple "groups" (for external - builds), to print out the last reported status of each build - (such as "COMPILING"), and to adjust the build timeouts on a - per-build basis. - -Tue Dec 18 11:11:29 2001 Steve Huston - - * ace/SPIPE.h: Improved comments for Doxygen processing. - -Mon Dec 17 18:30:41 2001 Steve Huston - - * ace/SPIPE_Acceptor.(h cpp): For Windows, use the event handle - instead of the pipe handle for the handle value stored in the - ACE_IPC_SAP class. The pipe handle is pretty useless for doing - anything like detecting when the pipe connect is done - the - event handle is what's really useful there, and it stays - consistent across accepts, while the pipe handle changes. This - change allows the get_handle() value to be registered with the - reactor, albeit for signal, not input. - -Mon Dec 17 00:13:47 2001 Nanbor Wang - - * ace/String_Base_Const.h: - * ace/String_Base_Const.cpp: Added a new base class for - ACE_String_Base extracting out the static member data to - circumvent a SunCC compilation problem which only happen when - debug=0 is defined. - - * ace/String_Base.h: - * ace/String_Base.cpp: Removed the offending static member sata. - - * ace/Makefile: - * ace/Makefile.bor: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * ace/ace.icc: - * ace/ace-lib.icc: - * ace/ace-dll.icc: Added String_Base_Const.* to various project files. - -Sun Dec 16 10:33:17 2001 Douglas C. Schmidt - - * ace/Select_Reactor_T.h: Improve the documentation of the - ACE_Select_Reactor_T() constructor to clarify the mask_signals - and disable_notify_pipe parameters. Thanks to Bob Jolliffe - for motivating this. - -Sun Dec 16 16:42:12 2001 Johnny Willemsen - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.{h,cpp}: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.{h,cpp}: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp: - * examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp: - * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp: - * examples/IPC_SAP/FILE_SAP/client.cpp: - * examples/IPC_SAP/UPIPE_SAP/ex1.cpp: - * examples/IPC_SAP/UPIPE_SAP/ex2.cpp: - * examples/IPC_SAP/UPIPE_SAP/ex3.cpp: - * examples/Log_Msg/test_callback.cpp: - * examples/Log_Msg/test_log_msg.cpp: - * examples/Log_Msg/test_ostream.cpp: - - Made these examples compile when ACE_USES_WCHAR is set - -Sun Dec 16 08:04:23 2001 Venkita Subramonian - - * tests/Message_Queue_Test_Ex.cpp : fixed a compiler error - -Sat Dec 15 09:30:31 2001 Douglas C. Schmidt - - * tests/Message_Queue_Test_Ex.cpp (main): Fixed a minor bug - by removing the size-hint from the call to User_Class. Thanks - to Venkita Subramonian for reporting - this. - - * ace/config-win32-mingw.h. Added #define ACE_HAS_BROKEN_SAP_ANY - so that it'll compile on MinGW32. Thanks to Ben Flight - for reporting this. - - * tests/Logging_Strategy_Test.cpp: include ace/Logging_Strategy.h - rather than ace/Logging_Strategy.cpp. Thanks to Mike Connors - for reporting this. - -Sat Dec 15 16:20:28 2001 Balachandran Natarajan - - * ace/ace_os_dll.vcp: Added the files OS_QoS.{h,cpp}. - -Sat Dec 15 09:52:14 2001 Carlos O'Ryan - - * examples/Misc/test_set.cpp: - Add missing #include for Tru64/DU/CXX, probably implicitly - included on other platforms due to the - ACE_TEMPLATES_REQUIRE_SOURCE. - -Sat Dec 15 09:30:31 2001 Douglas C. Schmidt - - * tests/Message_Queue_Test_Ex.cpp: Improved the example to use - a user-defined class parameter for ACE_Message_Queue_Ex rather - than ACE_Message_Block. Thanks to Bill Fulton - for reporting this. - - * ace/Configuration.cpp: Make the return code of enumerate_values() - consistent with enumerate_sections(). Thanks to Kevin Burge - for reporting this. - -Fri Dec 14 21:36:29 2001 Steve Huston - - * ace/ace.icc: Adjusted file list as a result of split-apart - Strategies.* files (Mon Dec 10 15:39:22 2001 Balachandran Natarajan) - - * ace/Connection_Recycling_Strategy.cpp: - * ace/Hashable.cpp: - * ace/Recyclable.cpp: - * ace/Refcountable.cpp: Changed the ACE_RCSID to reflect the correct - module name (they all still were named Strategies, from whence - they came. - -Fri Dec 14 14:05:09 2001 Carlos O'Ryan - - * ace/svc_export.h: - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp: - Found a better way to deal with the inconsistencies in the - ACE_Svc_Export macro. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp: - Fixed project file for static library. - -Fri Dec 14 11:35:01 2001 Craig Rodrigues - - * ace/SSL/SSL_SOCK_Acceptor.h: - * ace/SSL/SSL_SOCK_Connector.h: - * examples/QOS/Simple/Fill_ACE_QoS.h: - * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h: - * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h: - Add #include "ace/OS_QoS.h". - -Thu Dec 13 22:16:02 2001 Carlos O'Ryan - - * ace/svc_export.h: - Support ACE_Svc_BUILD_DLL also, to be consistent with all the - other export macros. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h: - Add missing ACE_Svc_Export to the class. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsw: - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.dsp: - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore_static.dsp: - * netsvcs/clients/Naming/Dump_Restore/main.dsp: - Add missing project files and a workspace. - -Fri Dec 14 00:08:57 2001 Craig Rodrigues - - * ace/OS.h: Move around definitions of ACE_SOCK_GROUP - and ACE_OVERLAPPED_COMPLETION_FUNCTION_FUNC to fix - Win32 builds. - - * ace/OS.cpp: Add #include "ace/OS_QoS.h" to fix Win32 - builds. - -Thu Dec 13 22:21:52 2001 Balachandran Natarajan - - * Updated dependencies of many Makefile's. - -Thu Dec 13 21:36:15 2001 Craig Rodrigues - - * ace/OS.cpp: Remove ACE_INLINE from join_leaf(). - * ace/OS_QoS.cpp: Remove ACE_INLINE. - * ace/OS_QoS.h: Add include for pre.h. - -Thu Dec 13 16:53:00 2001 Ossama Othman - - * bin/auto_run_tests.lst: - - Added TAO/orbsvcs/tests/Security/Callback test to the list of - tests to run in our automated regression test suite. - -Thu Dec 13 18:11:00 2001 Craig Rodrigues - - * ace/OS.h: Move QoS data structures to OS_QoS.h. Forward - declare QoS data structures now contained in OS_QoS.h and - OS_QoS.cpp. - - * ace/OS.i: - * ace/OS.cpp: Move QoS enabled socket API functions from OS.i to - OS.cpp. - - * ace/OS_QoS.h (added): - * ace/OS_QoS.cpp (added): OS specific QoS data structures go here. - - * ace/MEM_Acceptor.h: - * ace/SOCK_Acceptor.cpp: - * ace/SOCK_Connector.cpp: - * ace/QoS/QoS_Session.h: Add #include "ace/OS_QoS.h". - - * ace/QoS/QoS_Session_Impl.cpp: Add u_long casts to eliminate - compiler warnings. - - * ace/Makefile: Add rule for OS_QoS. - * ace/Makefile.bor: Same. - * ace/ace_dll.dsp: Same. - * ace/ace_lib.dsp: Same. - -Thu Dec 13 14:58:43 2001 Ossama Othman - - * THANKS: - - Added Greg Burley to our Hall of Fame. - -Thu Dec 13 14:11:26 2001 Carlos O'Ryan - - * ace/ace_dll.vcp: - Remove Strategies.* from the WinCE project - files, and add the new files that replace it. - -Thu Dec 13 16:41:39 2001 Steve Huston - - * examples/Reactor/WFMO_Reactor/test_multithreading.cpp: Changed - call to ACE_Service_Config::close_singletons () to call - ACE_Reactor::close_singleton() instead. Recent changes made - it necessary to include "ace/Service_Config.h" here to use - the former, and it seemed better to call the only needed singleton - destroyer necessary in this case. - - * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp: - * examples/Reactor/WFMO_Reactor/test_window_messages.cpp: - * examples/Bounded_Packet_Relay/BPR_Drivers.h: - Added #include "ace/Reactor.h" - recent changes necessitate this. - - * examples/Reactor/WFMO_Reactor/test_talker.cpp: Added - #include "ace/Reactor_Notification_Strategy.h" - recent changes - necessitate this. - -Wed Dec 12 16:29:17 2001 Greg Burley - - * ace/SSL/SSL_Context.h: - * ace/SSL/SSL_Context.inl: - * ace/SSL/SSL_Context.cpp: - - Made it possible to specify certificate authority locations - after the verification mode has been set. - -Wed Dec 12 12:38:16 2001 Ossama Othman - - * ace/SSL/SSL_Accept_Handler.cpp: - * ace/SSL/SSL_Connect_Handler.cpp: - - Added missing "ace/Reactor.h" include. ACE_Reactor is only - forward declared otherwise. - -Wed Dec 12 12:21:11 2001 Vladimir Chovanec - - * ace/SSL/SSL_Accept_Handler.cpp (handle_input, handle_output): - - On Win32 platforms, cancel any previously scheduled "wakeup" - before attempting to perform IO. If necessary, a "wakeup" will - be scheduled if the IO call would block. - - (ssl_accept): - - On Win32 platforms, it is necessary to schedule a "wakeup" in - the Reactor if an IO call would block. This is necessary since - Windows events are only notified once. Hence, event handlers - must be rescheduled. - - * ace/SSL/SSL_Connect_Handler.cpp (handle_input, handle_output, - ssl_connect): - - Likewise. - -Wed Dec 12 06:56:46 2001 Balachandran Natarajan - - * THANKS: Added Petr Tuma to the hall of fame. - -Wed Dec 12 07:29:12 2001 Johnny Willemsen - - * ace/Makefile.bor: - Added Recycable - -Tue Dec 11 12:17:45 2001 Ossama Othman - - * ace/SSL/SSL_Accept_Handler.h (ACE_SSL_Accept_Handler): - * ace/SSL/SSL_Connect_Handler.h (ACE_SSL_Connect_Handler): - - Accept a reference to the flag that causes the calling thread's - event loop to stop on error. See below for details. - - * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): - * ace/SSL/SSL_Connect_Handler.cpp (ssl_connect): - - Return 1 if errno == EWOULDBLOCK and SSL_pending() return a - value greater than zero. The event handler should be called - back before waiting for more in events in the reactor. This - change causes the behavior for this case to match that of the - SSL_ERROR_WANT_{READ,WRITE} cases. Thanks to Vladimir Chovanec - for providing this fix. - - (handle_close): - - Set the "handler_closed" flag to one. This will notify the - event loop in the SSL_SOCK_{Acceptor,Connector} that it should - stop handling events in the event of an error. - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - - Pass a flag by reference to the event handler responsible for - completing the non-blocking SSL connection. The event handler - will set the flag to 1 in order to cause the event loop in this - method to stop if the event handler is closed on error. - - Stop the event loop if a timeout occurs, i.e. handle_events() - returns 0. In conjunction with the above change, this fixes an - infinite loop that would occur in such a timeout situation. - -Tue Dec 11 07:59:12 2001 Johnny Willemsen - - * ace/Makefile.bor: - Updated BCB makefile with the changes of the changelog entry - Mon Dec 10 15:39:22 2001 Balachandran Natarajan - - * tests/MEM_Stream_Test.cpp: - Removed wrong ; after an if statement in this test. This should fix - the warning in the MSVC builds - -Mon Dec 10 19:10:22 2001 Balachandran Natarajan - - * ace/Refcountable.h: - * ace/Recyclable.h: - * ace/Hashable.h: - * ace/Hashable.inl: - * ace/Notification_Strategy.inl: - * ace/Reactor_Notification_Strategy.inl: Fixed fuzz errors. - -Mon Dec 10 18:54:22 2001 Balachandran Natarajan - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added the new files and removed old ones. - -Mon Dec 10 15:39:22 2001 Balachandran Natarajan - - Merged from my branch. This checkin actually splits classes in - Strategies.h to multiple files. We also remove Strategies.* files - from the repo. - - Tue Nov 27 12:29:09 2001 Balachandran Natarajan - - * ace/Refcountable.h: Added a #define for the inlined file. - - * examples/Reactor/Misc/test_demuxing.cpp: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.h: - * examples/Timer_Queue/main_reactor.cpp: Added #includes - - * examples/*/Makefile: - * tests/Makefile: Updated dependencies - - Wed Nov 21 10:44:33 2001 Balachandran Natarajan - - * tests/Cached_Accept_Conn_Test.h: - * tests/Cached_Conn_Test.cpp: - * tests/Conn_Test.cpp: - * tests/Message_Queue_Notifications_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Reactors_Test.cpp: - * tests/Service_Config_DLL.cpp: - * tests/RMCast/Makefile: Fixed compilation errors. - - Wed Nov 21 10:42:13 2001 Balachandran Natarajan - - * ace/Svc_Handler.cpp: - * ace/Connector.h: - * ace/Strategies_T.h: - * ace/Acceptor.h: - * ace/Svc_Handler.h: Fixed compilation errors. - - Tue Nov 20 12:48:39 2001 Balachandran Natarajan - - * ace/Strategies.h: - * ace/Strategies.cpp: - * ace/Strategies.i: Removed from the repo as the files are being - replaced with multiple files, with one class per file. Please - see below for details. The conglomeration of all the classes in - the same file made very less sense. - - * ace/Connection_Recycling_Strategy.h: - * ace/Connection_Recycling_Strategy.cpp: Added a new file for the - class ACE_Connection_Recycling_Strategy - - * ace/Hashable.h: - * ace/Hashable.cpp: - * ace/Hashable.inl: New file for the class ACE_Hashable - - * ace/Notification_Strategy.h: - * ace/Notification_Strategy.cpp: - * ace/Notification_Strategy.inl: New file for the class - ACE_Notification_Strategy. - - * ace/Reactor_Notification_Strategy.h: - * ace/Reactor_Notification_Strategy.cpp: - * ace/Reactor_Notification_Strategy.inl: New file for the class - ACE_Reactor_Notification_Strategy - - * ace/Recyclable.h: - * ace/Recyclable.cpp: - * ace/Recyclable.inl: New file for the class ACE_Recyclable - - * ace/Refcountable.h: - * ace/Refcountable.cpp: - * ace/Refcountable.inl: New file for the class ACE_Refcountable. - - * ace/OS.h: Moved the enum ACE_Recyclable_State to Recyclable.h - - * ace/Acceptor.h: - * ace/Caching_Utility_T.cpp: - * ace/Message_Queue.h: - * ace/Message_Queue_T.cpp: - * ace/Strategies_T.h: - * ace/Svc_Handler.cpp: Removed inclusion of Strategies.h. - - * ace/Procator.cpp: #included Service_Config.h - - * ace/Makefile: Added new file and generated dependencies - - * ace/SSL/Makefile: - * ace/RMCast/Makefile: Generated dependencies. - -Mon Dec 10 14:10:00 2001 Nanbor Wang - - * Makefile.bor: Added an ace_only target for Borland_wchar nightly - build. - -Sun Dec 9 08:54:38 2001 Douglas C. Schmidt - - * ace/Activation_Queue.cpp (enqueue): Fixed a leak where the - dynamically allocated ACE_Message_Block wasn't being released if - enqueue_prio() failed. Thanks to Dan Gilboa - for reporting this. - - * tests/Logging_Strategy_Test.cpp (run_reactor): Fixed a warning. - - * tests/MEM_Stream_Test.cpp: Added a call to ACE_Thread_Manager::wait() - to ensure the test shuts down in the right order. Thanks to - Michael Searles for reporting this. - - * ace/Message_Queue_T.i (dequeue): Call dequeue_head() rather than - queue_.dequeue() to get the proper type enforcement. Thanks to - Bill Fulton for contributing this fix. - -Sat Dec 8 17:07:01 2001 Ossama Othman - - * bin/fuzz.pl (check_for_missing_rir_env): - - Check for TAO_ENV_ARG_PARAMETER instead of ACE_TRY_ENV. TAO now - uses the former instead of the latter. - -Sat Dec 8 09:39:48 2001 Douglas C. Schmidt - - * ace/OS.cpp (string_to_argv): Improved the support for quoted strings. - Thanks to Kevin Burge for reporting - this. - - * ace/Profile_Timer.cpp, - ace/OS.i, - ace/OS.h, - ace/OS.cpp, - ace/High_Res_Timer.i, - ace/High_Res_Timer.cpp, - ace/config-win32-ghs.h, - ace/config-win32-common.h: Added improved support for ACE_LACKS_LONGLONG_T. - Thanks to Alain Decamps for contributing this. - -Fri Dec 7 07:57:12 2001 Douglas C. Schmidt - - * ace/OS.cpp (cond_timedwait): Fixed a bug in the WinCE semaphore - simulation version of ACE_OS::cond_timedwait(). Thanks to - Michael Graf for helping to find this. - -Fri Dec 07 14:28:33 2001 Carlos O'Ryan - - * tests/ACE_Init_Test.cpp: - * tests/ACE_Init_TestDlg.cpp: - Fix order of #includes to work under unicode builds. - -Fri Dec 07 15:42:44 2001 Nanbor Wang - - * ace/Registry_Name_Space.cpp: Changed to conditionally use - char_rep for binding/unbinding/resolving name bindings. This is - because ACE_CString and ACE_WString no longer allow - initialization with different string type. - -Fri Dec 7 10:22:25 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.i (close): - - Do not invalidate the handle when closing the - ACE_SSL_SOCK_Stream. Doing so causes subtle side-effects when a - reactor invokes an event handler that uses a shutdown - ACE_SSL_SOCK_Stream. For example, if an SSL handshake fails - then the stream andle will be invalidated. This prevents the - ACE_SSL_Accept_Handler from being removed from the reactor. - Later when handle_events() is called the reactor will attempt - to call the ACE_SSL_Accept_Handler with the shutdown - ACE_SSL_SOCK_Stream, which appears to cause an access violation - on Windows, and a "hang" on Unix platforms. Thanks to Vladimir - Chovanec for tracking down this - problem. - -Thu Dec 6 18:48:07 2001 Douglas C. Schmidt - - * ace/Lib_Find.cpp: Fixed the ldfind() method so that it - does a case-insensitive comparison on Windows platforms. Thanks - to Kevin Burge for reporting this. - -Thu Dec 6 09:02:06 2001 Douglas C. Schmidt - - * ace/Sock_Connect.cpp: Added MACOSX support. Thanks to - John Michael Zorko for contributing this. - - * tests/Logging_Strategy_Test.cpp: Add a "wait()" at the - end of the main function to avoid problems when the main thread - exits before the reactor thread. Thanks to Michael Searles - for reporting this. - -Thu Dec 06 20:28:02 2001 Nanbor Wang - - * ace/SString.cpp (ACE_NS_WString): Char string constructor only - initialized the buffer length but not the string length. This - was causing string comparisons to fail. - -Thu Dec 6 18:51:39 2001 Steve Huston - - * include/makeinclude/platform_sunos5_sunc++.GNU: Re this change: - Wed Dec 5 12:37:56 2001 Carlos O'Ryan - more than the Orbix stuff was removed... restored the setting - of required link libraries and handling for the distrib option. - -Thu Dec 06 14:06:22 2001 Nanbor Wang - - * tests/Config_Test.cpp: The string literals used to initialize - ACE_TString need to be enclosed in an ACE_TEXT macro. - - * ace/Registry_Name_Space.h: - * ace/Registry_Name_Space.cpp: Changed ACE_WString to - ACE_NS_WString. I missed these last time. - - * ace/SString.i: Added an ACE_NS_WString constructor that I - missed. - -Thu Dec 6 11:19:18 2001 Venkita Subramonian - - * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h: - * performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h: - Fixed warnings in gcc 3.0.2 - -Thu Dec 6 11:15:28 2001 Balachandran Natarajan - - * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h: - * performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h: - Fixed Fuzz errors in these files. - -Thu Dec 6 07:39:07 2001 Chad Elliott - - * Added two new static functions for VxWorks only. spae() and - spaef() which are similar to spa(), but allow more than 10 - arguments with the help of double quoted strings. spaef() is - similar to spae() except that a new task is not spawned to run - the main function of the program. Thanks to Albert Wijnja - for the idea and supplying the original - code. - -Thu Dec 06 00:06:52 2001 Nanbor Wang - - * performance-tests/Misc/test_naming.cpp: Replaced the use of - ACE_WString with ACE_NS_WString as ACE_WString no longer support - initization using char string. - -Wed Dec 05 17:13:15 2001 Nanbor Wang - - * ace/SString.h: The concatenation oeprator needed to be - exported. - -Wed Dec 5 19:58:42 2001 Steve Huston - - * ace/Logging_Strategy.cpp: Set the logger_key_ member to 0 (no key) - unless/until the LOGGER flag is specified (and then the default - key is set) or the -k option is given, which specifies a new key. - Always passing a logger_key, even when there's no logger to be - used, makes for some odd names in the syslog and NT Event Logs - after the change:Sat Dec 1 19:39:22 2001 Steve Huston - Thanks to Chris Kohlhoff for pointing this out. - -Wed Dec 5 15:35:20 2001 Carlos O'Ryan - - * apps/Makefile.am: - * docs/ACE-categories.html: - Removed left over references to Orbix handler. - - * apps/JAWS/remora/app/Makefile: - * apps/JAWS/remora/app/stdmk: - * apps/JAWS/remora/app/test.cc: - * apps/JAWS/remora/app/remora.idl: - * apps/JAWS/remora/app/Remora_Export.h: - * apps/JAWS/remora/app/Remora_Export.i: - * apps/JAWS/remora/app/Remora_Export.cc: - * apps/JAWS/remora/app/Remora_Import.h: - * apps/JAWS/remora/app/Remora_Import.i: - * apps/JAWS/remora/app/Remora_Import.cc: - Another directory that could only compile if ORBeline was still - available. - -Wed Dec 05 14:47:32 2001 Carlos O'Ryan - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Removed CORBA_Handler.* and CORBA_Ref.* classes from the project - files. - -Wed Dec 5 16:38:31 2001 Nanbor Wang - - * tests/SString_Test.cpp: - * examples/Misc/test_sstring.cpp (main): Changed from ACE_WString - to ACE_NS_WString so we can still initialize the test string - from char strings. We can no longer initialize ACE_WString's - with char strings. ACE_NS_WString maintains the old behavior, - however. - - * ace/SString.h: - * ace/SString.i: Added string contatenation operator - ACE_NS_WString::operator+. - -Wed Dec 5 12:37:56 2001 Carlos O'Ryan - - * Removed all code to support Orbix and any references to it in - the documentation (at least all references that I found). - We haven't tested this code in ages, so it was probably broken, - furthermore, IONA does not sell Orbix-2.X nor Orbix-3.X (the - versions our code was based on), and will probably stop - supporting old versions of Orbix before ACE-5.3 (or 6.0) come - out. - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/ace-dll.icc: - * ace/ace-lib.icc: - * ace/ace.icc: - * ace/CORBA_Handler.h: - * ace/CORBA_Handler.i: - * ace/CORBA_Handler.cpp: - * ace/CORBA_Ref.h: - * ace/CORBA_Ref.cpp: - * ace/config-hpux-9.x-orbix.h: - * ace/config-sunos4-sun4.x-orbix.h: - * ace/config-sunos5.4-sunc++-4.x-orbix.h: - * ace/config-sunos5.x-sunc++-4.x-orbix.h: - * apps/Makefile: - * apps/Makefile.am: - * apps/Orbix-Examples/Makefile: - * apps/Orbix-Examples/Event_Comm/Makefile: - * apps/Orbix-Examples/Event_Comm/README: - * apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.cpp: - * apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.h: - * apps/Orbix-Examples/Event_Comm/Consumer/Makefile: - * apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.cpp: - * apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.h: - * apps/Orbix-Examples/Event_Comm/Consumer/consumer.cpp: - * apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.cpp: - * apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.h: - * apps/Orbix-Examples/Event_Comm/Supplier/Makefile: - * apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.cpp: - * apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.h: - * apps/Orbix-Examples/Event_Comm/Supplier/supplier.cpp: - * apps/Orbix-Examples/Event_Comm/include/Event_Comm.hh: - * apps/Orbix-Examples/Event_Comm/include/Event_Comm_i.h: - * apps/Orbix-Examples/Event_Comm/include/Notification_Receiver_i.h: - * apps/Orbix-Examples/Event_Comm/include/Notifier_i.h: - * apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm.hh: - * apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm.idl: - * apps/Orbix-Examples/Event_Comm/libsrc/Event_CommC.cpp: - * apps/Orbix-Examples/Event_Comm/libsrc/Event_CommS.cpp: - * apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm_i.h: - * apps/Orbix-Examples/Event_Comm/libsrc/Makefile: - * apps/Orbix-Examples/Event_Comm/libsrc/Notification.idl: - * apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver.idl: - * apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.cpp: - * apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.h: - * apps/Orbix-Examples/Event_Comm/libsrc/Notifier.idl: - * apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.cpp: - * apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.h: - * apps/Orbix-Examples/Logger/Logger.cpp: - * apps/Orbix-Examples/Logger/Logger.h: - * apps/Orbix-Examples/Logger/Makefile: - * apps/Orbix-Examples/Logger/Orbix.hostgroups: - * apps/Orbix-Examples/Logger/Orbix.hosts: - * apps/Orbix-Examples/Logger/README: - * apps/Orbix-Examples/Logger/a1.tex: - * apps/Orbix-Examples/Logger/client.cpp: - * apps/Orbix-Examples/Logger/logger.hh: - * apps/Orbix-Examples/Logger/logger.idl: - * apps/Orbix-Examples/Logger/loggerS.cpp: - * apps/Orbix-Examples/Logger/logger_i.cpp: - * apps/Orbix-Examples/Logger/logger_i.h: - * apps/Orbix-Examples/Logger/server.cpp: - * examples/CORBA/Makefile: - * examples/CORBA/Test.idl: - * examples/CORBA/Test_i.cpp: - * examples/CORBA/Test_i.h: - * examples/CORBA/client.cpp: - * examples/CORBA/server.cpp: - * include/makeinclude/platform_hpux_orbix.GNU: - * include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU: - * include/makeinclude/platform_sunos5_centerline_orbix.GNU: - * include/makeinclude/platform_sunos5_sunc++_orbix.GNU: - Removed examples and classes to support orbix with ACE. - - * ACE-INSTALL.html: - * FAQ: - * README: - * TODO: - * acconfig.h: - * ace/README: - * ace/config-win32-common.h: - * apps/README: - * ace/config-tandem.h: - * docs/ACE-configuration.txt: - * include/makeinclude/platform_aix4_cset++.GNU: - * include/makeinclude/platform_dgux4_epc.GNU: - * include/makeinclude/platform_m88k.GNU: - * include/makeinclude/platform_sunos4_g++.GNU: - * include/makeinclude/platform_sunos5_g++.GNU: - * include/makeinclude/platform_sunos5_kcc.GNU: - * include/makeinclude/platform_sunos5_sunc++.GNU: - * include/makeinclude/platform_unixware_g++.GNU: - * include/makeinclude/platform_unixware_udk.GNU: - * include/makeinclude/rules.local.GNU: - * include/makeinclude/wrapper_macros.GNU: - * m4/ace.m4: - * performance-tests/README: - * performance-tests/TTCP/C/README: - Files that referenced Orbix support or documented how to use - it. - - * examples/Reactor/Multicast/Log_Wrapper.h: - * examples/Reactor/Multicast/Log_Wrapper.cpp: - Fixed documentation, it was referencing Orbix but actually it - uses UDP multicast, looks like a cut&paste error to me. - -Wed Dec 5 12:15:36 2001 Carlos O'Ryan - - * ace/SString.cpp: - Add missing template instantiations, only a problem when - inlining was disabled. - - * tests/Hash_Map_Manager_Test.cpp: - Rename global variable 'alloc' to 'ace_test_allocator', the - former conflicts with STL symbols under Linux. - - * tests/Map_Test.cpp: - Rename the value_type and expanded_value global typedefs to have - an ace_ prefix. Though only used in this test they conflict - with some STL symbols by the same name. - - * tests/DLList_Test.cpp: - Remove unused global variable 'alloc' looks like a cut&paste - carry-over. - -Wed Dec 05 10:08:56 2001 Carlos O'Ryan - - * rpc++/*: - Removed, this directory was not distributed with ACE and having - it around just made the administration harder. - -Wed Dec 5 12:10:42 2001 Chad Elliott - - * bin/nightlybuilds/builds.lst: - - Temporarily disable the OCI nightly builds. - -Wed Dec 5 09:55:28 2001 Steve Huston - - * tests/INET_Addr_Test.cpp: Made the ipv4_addresses array const char *. - -Wed Dec 5 15:41:08 2001 Johnny Willemsen - - * ace/OS.h: - Corrected doxygen docu of ACE_Countdown_Time::max_wait_time_ - -Wed Dec 5 14:14:32 2001 Johnny Willemsen - - * ace/String_Base.h: - Corrected the description of the rep() method - -Wed Dec 5 09:21:12 2001 Johnny Willemsen - - * ace/SString.cpp: - Fixed compile error and warning that appeared in BCB build - -Tue Dec 4 22:26:28 2001 Nanbor Wang - - * ace/OS_String.h: - * ace/OS_String.i: - * ace/OS_String.cpp (strncpy, wcsncat_emulation): One more - string function that needs to be available. (See next entry.) - -Tue Dec 04 22:12:04 2001 Nanbor Wang - - * ace/OS_String.h: - * ace/OS_String.cpp (strsncpy): Made the wchar_t version of this - function available on all platforms and changed it to use type - ACE_WCHAR_T. - -Tue Dec 04 20:08:49 2001 Nanbor Wang - - Merged in the new String_Base template class. - - * ace/Makefile: Added String_Base into the list of template - files. - - * ace/Basic_Types.h: Added definitions of ACE_WCHAR_T and - ACE_WINT_T which are defined to wchat_t and wint_t when - ACE_HAS_WCHAR are defined, and ACE_USHORT16 otherwise. They are - needed to support various "wide character" string operations - that we need to support the templatized ACE_WString, which uses - ACE_USHORT16 as the wide char type when wchar_t is not - supported. - - * ace/OS_String.h: - * ace/OS_String.inl: - * ace/OS_String.cpp: Made several wchar version string functions - available no matter ACE_HAS_WCHAR is defined or not. There are - more functions (the ones that have *_emulation helpers - available) that can be made availabe at all time, but I just - fixed the ones that ACE_WString needed for now. We can add more - later. - - * ace/SString.h: Changed the definition of ACE_WSTRING_TYPE to - ACE_WCHAR_T. ACE_WCHAR_T is defined in the same fashion as - ACE_WSTRING_TYPE was originally defined. - - * ace/Local_Name_Space.cpp: ACE_NS_WString::char_rep works just - fine. We don't need to use ACE_Wide_To_Ascii::convert - explicitly since it is not available when ACE_HAS_WCHAR isn't - defined. - - * ace/SString.cpp (operator<<): Avoided the problem of printing - wchar strings temporarily. Using ACE_Wide_To_Ascii didn't work - on platforms that don't support wchar. Thanks to Keith Hamburg - for pointing this out. - - * ace/String_Base.cpp: Fixed incorrect RCSID name. Thanks to - Keith Hamburg for reporting it. - - * ace/SString.cpp: - * ace/SString.h: - * ace/SString.i: Changed ACE_WString to be a typedef of - ACE_String_Base and added a subclass of it - called ACE_NS_WString to maintain backward compatibility. - - * tests/Naming_Test.cpp: - * ace/Local_Name_Space.cpp: - * ace/Local_Name_Space.h: - * ace/Local_Name_Space_T.cpp: - * ace/Local_Name_Space_T.h: - * ace/Name_Space.cpp: - * ace/Name_Space.h: - * ace/Naming_Context.cpp: - * ace/Naming_Context.h: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Name_Space.h: - * netsvcs/clients/Naming/Client/Client_Test.cpp: - * netsvcs/lib/Name_Handler.cpp: - * netsvcs/lib/Name_Handler.h: Changed the use of ACE_WString to - ACE_NS_WString. - - * tests/SString_Test.cpp: Added ACE_TEXT_WIDE to convert char - strings to wchar strings for initializing ACE_WString as you can - no longer initialize a ACE_WString with a char string. - - * ace/String_Base.h: - * ace/String_Base.i: - * ace/String_Base.cpp: Abstracted out ACE_CString and ACE_WString - into a templatized String_Base. - - * ace/CDR_Stream.h: Removed forward declarating ACE_CString and - added inclusion of . - - * ace/SString.h: - * ace/SString.i: - * ace/SString.cpp: Changed ACE_CString to be a typedef of - ACE_String_Base. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added String_Base.* to appropriate folders. - -Tue Dec 4 20:57:09 2001 Balachandran Natarajan - - * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp: - * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h: - - Added a outgoing queue to the test. This should more or less - represent a simple CORBA invocation. Reduced a call to new to by - using a shared data block with a lock. - -Tue Dec 4 19:10:22 2001 Steve Huston - - * ace/config-sunos5.6.h: Removed the setting of _POSIX_C_SOURCE to - 199309L and __EXTENSIONS__. They aren't needed to pick up shm_open - as previously believed, and they interfere with availability of - some Solaris/C9x functions. - -Tue Dec 4 14:47:39 2001 Steve Huston - - * ace/OS.i (gethostbyaddr): Moved this up before getipnodebyaddr() - to avoid a call to gethostbyaddr() before it's been seen - inlined. Thanks to Bala for reporting this. - -Tue Dec 4 13:52:44 2001 Steve Huston - - * tests/Date_Time_Test.cpp: Add a test for the microseconds part. - -Tue Dec 4 09:27:21 2001 Ossama Othman - - * ace/OS.h: - - Reverted the change that added group write permissions to the - default file and directory permissions. Doug correctly points - out that this introduces a security hole. Users who need less - restrictive permissions can redefine these macros in their - config.h header. - -Tue Dec 4 10:07:31 2001 Steve Huston - - * bin/auto_compile: Add an optional 6th command line arg that is - the module to check out from CVS. Defaults to ACE_wrappers so - it works the same as it used to without the argument. - -Tue Dec 4 06:59:09 2001 Balachandran Natarajan - - * performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp: - * performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h: - * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h: - * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp: - - New tests for measuring the throughput of two different server - concurrency architectures. The idea is to make it simpler than - what is already there and hence the tests. The old tests were a - bit confusing and very complicated. The old tests have been - retained. The tests are for getting some ball-park figures for - RT_CORBA and for TAO in general. - -Tue Dec 4 10:00:04 2001 Johnny Willemsen - - * examples/Reactor/Multicast/client.cpp: - * examples/Naming/test_non_existent.cpp: - * examples/Naming/test_open.cpp: - * examples/Naming/test_writers.cpp: - Made these files compiling when ACE_USES_WCHAR is set - -Mon Dec 3 18:19:11 2001 Ossama Othman - - * bin/fuzz.pl (check_for_id_string): - - Corrected capitalization of "\$Id\$" in output message. - -Mon Dec 3 16:30:07 2001 Ossama Othman - - * ace/OS.h: - - Added group write permissions to the default file and directory - permission macros supplied by ACE. Allows the ACE_Process_Mutex - to be used with process from different user in the same group. - Thanks to Michael Brinkmann for - providing a fix. - -Mon Dec 3 16:22:56 2001 Ossama Othman - - * ace/Process_Mutex.h: - - Corrected Doxygen documentation. - -Mon Dec 03 14:22:57 2001 Carlos O'Ryan - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add UNIX-only files. Though strictly not required to compile - ACE under NT, putting them in the project makes this directory - more amenable for samwise. - - * ace/POSIX_Proactor.cpp: - Remove duplicate ACE_BUILD_DLL macro, when needed this is - defined via options in the project file. - -Mon Dec 3 13:59:06 2001 Ossama Othman - - * ace/README: - - The ACE_HAS_IP6 macro has been superceded by the ACE_HAS_IPV6 - macro. Also added description of the - ACE_USES_IPV4_IPV6_MIGRATION macro based on Steve's description - below. - -Mon Dec 3 15:50:42 2001 Steve Huston - - * IPv6 changes done by John Aughey and myself. To enable IPv6 - support for a build, put this in your config.h file: - #define ACE_HAS_IPV6 - If your build with IPv6 enabled must also run on systems where - the IPv6 support in the kernel is not actually turned on (for - example, Redhat Linux 7 by default), also add this to your - config.h file: - #define ACE_USES_IPV4_IPV6_MIGRATION - - * ace/ACE.cpp (format_hexdump): Add \n to last part of a dump line. - - * ace/INET_Addr.(h i cpp): If IPv6 is enabled, the inet_addr_ - member is now a union of sockaddr_in and sockaddr_in6. Which - one is legit is noted in ACE_Addr::type as well as the family - member of either of the union members. The host name lookup - functions can look up ipv6 as well as ipv4 names, and the - caller can force one or the other by using the address_family - argument to set(). - - * ace/OS.(h i): Removed ACE_OS::gethostbyname2; replaced it with - the more correctly-named and more flexible ACE_OS::getipnodebyname. - Also added ACE_OS::getipnodebyaddr. These are the IPv6-capable - functions analogous to gethostbyname and gethostbyaddr. - - * ace/SOCK.cpp (get_remote_addr, get_local_addr): Set up the - ACE_Addr's type properly to account for ipv4/6 possibilities. - - * ace/SOCK_Acceptor.(h cpp): Allow accepting on ipv4 and ipv6 sockets. - - * ace/SOCK_CODgram.h: - * ace/SOCK_Connector.(cpp h ): - * ace/SOCK_Dgram.(cpp h ): Change default protocol family from - PF_INET to vary and take advantage of IPv6 if available. - - * ace/Sock_Connect.(cpp h): Added ACE_Sock_Connect::ipv6_enabled() - method - it checks to see if the running kernel can do IPv6 - sockets or not. - - * ace/Sock_Connect.cpp (get_ip_interfaces): Removed a #if 0'd - block that had possible specializations for MSVC 4.2. It's - been a number of years, and it's obviously not needed. - - * ace/MEM_Addr.cpp (same_host): Don't try to compare binary - addresses directly... get ACE_INET_Addr objects, clear the port - numbers, and compare them. - - * ace/MEM_Connector.cpp (connect): Print error text with message. - - * ace/Asynch_Acceptor.cpp (open): For the new socket, use the - protocol family from the listen address, not PF_INET. - - * tests/INET_Addr_Test.cpp: New test. - - * tests/Makefile: Added INET_Addr_Test. - -Mon Dec 3 10:54:34 2001 Carlos O'Ryan - - * ace/OS.h: - Document CDR default buffer sizes and control macros - using Doxygen. - Document memory alignment macros in Doxygen form. - - * ace/Sample_History.h: - * ace/Sample_History.inl: - Add accessor to get the samples saved on the history. - - * ace/RMCast/RMCast_Singleton_Factory.h: - Document constructor in more detail. - -Mon Dec 03 07:54:04 2001 Johnny Willemsen - - * ace/Unbounded_Queue.{h,cpp}: - Added const iterator for this container class - -Sun Dec 02 15:13:30 2001 Carlos O'Ryan - - * ace/OS.cpp: - Fixed Fuzz problems, the ACE_TRACE calls in operator++/-- - definitions had less whitespace than the actual operators. - -Sun Dec 02 15:17:47 2001 Nanbor Wang - - * ace/Thread_Manager.cpp (join): This method mistakenly used the - local copy of Thread_Descriptor to change the thread status when - it found a thread to join from the . This prevented - the status of the original Thread_Descriptor to be updated - correctly and the same descriptor got put into the - again, which caused the same thread to be - waiting on in some cases. Changed to manipulate the descriptor - directly to avoid the problem. Thanks to Eyal Lubetzky - for reporting the problem and providing a - nice example to showcase it. - -Sun Dec 2 12:44:58 2001 Carlos O'Ryan - - * tests/ACE_Init_Test.cpp: - * tests/ACE_Init_TestDlg.cpp: - Protect this test against compilation on non-Win32 platforms, - that makes it easier to compile using samwise. - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Membership_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Reordering_Test.cpp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp: - Change #include "test_config.h" to #include "../test_config.h", - it is easier to generate makefiles and projects files with - samwise if we do that. - -Sun Dec 02 12:15:25 2001 Carlos O'Ryan - - * ace/OS.cpp: - Fixed typos in ACE_Time_Value::operator++ implementations. - Also moved the implementation outside the #ifdef ACE_WIN32 - section. - -Sun Dec 2 12:17:09 2001 Balachandran Natarajan - - * ace/Reactor.i: Fixed a warning in TRU 64. Thanks to - which reminded me of the fix in one of my - workspaces. This shows up only in V6.3-013 (cxx) of the - compiler. - -Sat Dec 1 19:39:22 2001 Steve Huston - - * ace/Date_Time.i (update): Use ACE_OS::gettimeofday for the time - source. This gets both the seconds-since-epoch value from which - the date and time are calculated and the microseconds value. - Thanks to Jim Connelly for reporting this. - - * THANKS: Added Jim Connelly to the Hall of Fame. - - * ace/Log_Msg_NT_Event_Log.{cpp h} (open): - * ace/Log_Msg_UNIX_Syslog.{cpp h} (open): - If the caller passes a prog_name (logger_key) argument, use it - for the Source field in the event log entries (or ident in the - syslog entries). If not, use the program name (previous behavior). - Added comments to define this behavior. - - * ace/Log_Msg.cpp (open): Don't refuse to open a backend if the - arg is 0 and the SYSLOG bit is enabled. The SYSLOG - backends, both UNIX and NT Event Log, work perfectly fine with - a 0 logger_key. Thanks to Steve Witten for - reporting this. - -Sat Dec 1 18:03:51 2001 Douglas C. Schmidt - - * ace/config-macosx.h: - * include/makeinclude/platform_macosx.GNU: - Added support so that ACE will build and run on Mac OS X 10.1. - Thanks to John Michael Zorko for contributing - this. - -Fri Nov 30 19:08:19 2001 Douglas C. Schmidt - - * ace/ARGV.cpp (dump): Fixed a bug with dump() so that it - works properly even if argv_ changes. Thanks to Kyle Brost - for this fix. - -Thu Nov 29 16:31:57 2001 Douglas C. Schmidt - - * ace/OS.{h,i,cpp}: Changed the return value of - ACE_Time_Value::operator+= and operator -= to be ACE_Time_Value - & rather than void. Also, added overloaded operator++ and - operator--. This is all to make this stuff work better with - ACE_Atomic_Op. Thanks to Kelly F. Hickel - for suggesting this. - - * ace/Asynch_Acceptor.cpp (parse_address): Changed - the "message_block.size () - 2 * this->address_size ()" argument - to "bytes_to_read_" to work properly on Win32. Thanks to Kelly - F. Hickel for reporting this. - -Wed Nov 28 17:44:26 2001 Douglas C. Schmidt - - * ace/OS_Dirent.cpp (readdir_emulation): Fixed a memory leak - in the dirent emulation. Thanks to Olivier Brunet - for reporting this. - - * ace/SPIPE_Acceptor.h (ACE_SPIPE_Acceptor): Clarified the - return value of open(). Thanks to Garth Watney - for motivating this. - - * ace/OS.h: Added a workaround to the Borland bug for - ACE_OS::stat(). Thanks to Christopher Kohlhoff - and Chris Able for - reporting/fixing this. - -Sat Dec 01 09:26:27 2001 Balachandran - - * ACE version 5.2.1 released. - -Wed Nov 28 09:28:09 2001 Johnny Willemsen - - * ace/examples/IPC_SAP/SOCK_SAP/* - * ace/examples/IPC_SAP/SPIPE_SAP/* - * ace/examples/Misc/* - * ace/examples/Naming/* - * ace/examples/RMCast/Send_File/* - * ace/examples/Reactor/DGram/* - * ace/examples/Reactor/Ntalker/* - * ace/examples/Registry/* - * ace/examples/Threads/* - * ace/examples/Service_Configurator/IPC_tests/client/* - Made these examples compiling when ACE_USES_WCHAR is set - -Mon Nov 26 16:07:57 2001 Balachandran Natarajan - - * bin/make_release: The distribution will be available in bzip2 - compressed format too. Made modifications to the release scripts - to put out the beta in bzip2 compressed format. - -Sat Nov 24 10:23:00 2001 Douglas C. Schmidt - - * ace/Unbounded_Set.h (class ACE_Unbounded_Set): Moved the - insert_tail() method from the private part of the class to the - public part since it's needed by the examples/Misc/test_set.cpp - file. - - * examples/Misc/test_set.cpp (main): Somehow the contents of this file - got lost. Thanks to Johnny Willemsen for reporting this! - -Fri Nov 23 08:40:33 2001 Douglas C. Schmidt - - * tests/Refcounted_Auto_Ptr_Test.cpp: Added some ACE_DEBUGs to - print out the reference count. - - * ace/Refcounted_Auto_Ptr.h: Added a count() accessor method to - return the reference count. Thanks to Andrea Bernicchia - for contributing this. - -Thu Nov 22 05:24:51 2001 Craig Rodrigues - - * examples/QOS/Diffserv: Added a simple example to illustrate - how to set Diffserv Codepoints on an ACE_SOCK_CODgram. - * examples/QOS/Makefile: Updated. - -Wed Nov 21 11:35:50 2001 Michael Kircher - - * ace/Bound_Ptr.h - * ace/Bound_Ptr.i - * ace/Future.cpp - * ace/Future.h - * ace/Refcounted_Auto_Ptr.h - * ace/Refcounted_Auto_Ptr.i - - Made the memory allocation failure behavior consistent - to the behavior prior to the change on Sun Oct 28 13:15:00 2001. - Thanks to Christopher Kohlhoff who prepared - this change. - The problem was that with the above mentioned change failed - allocations would return 0 in either case, if exceptions were - enabled by the platform or not. This was incosistent to the - behavior before, as new threw bad_alloc on allocation failure - when exceptions were supported by the platform. - - To fix this we faced the following forces: - - Not to introduce yet another macro - - Minimize impact of changes, localize the problem - - Keep the new calls wrapped by a ACE_NEW macro to allow - users to eventually redefine the macro (using e.g. new (nothrow) - - As the ACE_NEW macros are quite restrictive in their supported - semantics, e.g. you can only return on error, we decided to introduce - a new method (as inline) internal_create which does the allocation. - internal_create is called by create which does the differentiation - between the exception-supported and exception-not-supported case. - -Wed Nov 21 09:07:37 2001 Douglas C. Schmidt - - * ace/OS.h: Updated the ACE_GUARD_ACTION macro and added a new - ACE_GUARD_REACTION macro. Then, reimplemented the ACE_GUARD and - ACE_GUARD_RETURN macros in terms of these new macros. Thanks to - Don Hinton for contributing these. - - * ace/Log_Msg_Callback.h: Improved the comments to explain why - ACE_Log_Msg_Callback isn't inherited. Thanks to - Alexey Chalimov for motivating this. - -Tue Nov 20 15:36:52 2001 Douglas C. Schmidt - - * ACE-INSTALL.html: Pointed out that on Solaris with g++ you may - need to use GNU as instead of /usr/ccs/bin/as, if you want - -gstabs+ and -pipe support. Thanks to C Chan - for reporting this. - -Mon Nov 19 07:24:05 2001 Douglas C. Schmidt - - * examples/Synch/proc_sema.cpp: Added the ACE_TEXT macro so that - ACE_Get_Opt works correctly. Thanks to Johnny Willemsen for - contributing this. - - * tests/Aio_Platform_Test.cpp (main): Fixed the code so that it - compiles when ACE_USES_WCHAR. Thanks to Johnny Willemsen for - reporting this. - - * docs/ACE-categories.html: Updated the Doxygen URLs to use the - new format. Thanks to Peter J. Mason - for reporting the problem. - -Fri Nov 16 10:39:52 2001 Douglas C. Schmidt - - * docs: Moved minimumTAO.html from $TAO_ROOT/docs/ to - $ACE_ROOT/docs. - - * ace/OS.h: Added two new macros ACE_GUARD_ACTION and - ACE_GUARD_ACTION_RETURN. Thanks to Boris Kaminer - for suggesting these. - - * ace/NT_Service.cpp (state): Fixed a bug where calling - ACE_NT_Service::state(x,x) while the service is stopped was - causing the internal status variables of ACE_NT_Service to - become corrupt. If the control_mask is set to - SERVICE_ACCEPT_STOP in the constructor, the call to state will - cause this mask to be reset (if the service is not running). - This ultimately results in an NT Service that can be started but - not stopped. Thanks to Kyle Brost for - providing this fix. - -Wed Nov 21 10:00:20 2001 Chad Elliott - - * ace/config-irix6.x-common.h: - - Changed the size of a long double from 16 to 8 for the GNU - compiler. - - * include/makeinclude/platform_irix6.x_sgic++.GNU: - - Add buildbits macro to allow 32 and 64 bit builds on IRIX. - -Wed Nov 21 12:49:08 2001 Johnny Willemsen - - * performance-tests/Misc/basic_perf.cpp - * performance-tests/Misc/childbirth_time.cpp - * performance-tests/Misc/context_switch_time.cpp - * performance-tests/Misc/preempt.cpp - * performance-tests/Misc/test_mutex.cpp - * performance-tests/Misc/test_singleton.cpp - Made these tests compiling when ACE_USES_WCHAR is set - -Wed Nov 21 08:49:12 2001 Johnny Willemsen - - * ace/OS.h - Added ACE_LIB_TEXT around ACE_DEFAULT_RENDEZVOUS to make a unicode - constant when ACE_USES_WCHAR is defined - - * tests/FlReactor_Test.cpp - * tests/TkReactor_Test.cpp - * tests/XtReactor_Test.cpp - Changed type of argv argument of main from char to ACE_TCHAR so that - these tests compile without problems when ACE_USES_WCHAR is defined - - * examples/IPC_SAP/ATM_SAP/CPP-client.cpp - * examples/IPC_SAP/ATM_SAP/CPP-server.cpp - * examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp - * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp - * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp - * examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp - Made these example compiling when ACE_USES_WCHAR is set - -Tue Nov 20 12:02:16 2001 Ossama Othman - - * configure.in: - - Removed this file from the distribution. Some folks insist on - attempting to build ACE/TAO with the configure script and - reporting problems despite the fact we've explicitly disabled - it. - -Tue Nov 20 13:30:36 2001 Balachandran Natarajan - - * ace/Strategies.h: - * ace/Strategies.cpp: - * ace/Strategies.i: Re-added files back into the main trunk. Got - accidentally removed from the main when I was doing some work on - a branch. - -Mon Nov 19 20:35:44 2001 Jaiganesh Balasubramanian - - * ace/SOCK_Dgram_Mcast.cpp: - This class allow application to subscribe a single socket to - many multicast groups. However, the unsubscribe operation - failed to work with more than one group. For some strange - reason it was storing the first multicast group subscription in - a class member and using that member in all the paths for the - unsubscribe methods. - - We have changed the unsubscribe(const ACE_INET_Addr&,...) method - to work as adversited, i.e. unsubscribe the *given* multicast - address, not the stored one, as an added benefit the method is - now re-entrant. The unsubscribe(void) method works as before. - The code has been re-factored to minimize duplication. - -Mon Nov 19 11:03:07 2001 Ossama Othman - - * ACE-INSTALL.html: - - Added missing build instructions for the ACE_SSL library, and - updated the list of "make" flags recognized by ACE's Makefile - scheme. - -Mon Nov 19 00:53:54 2001 Krishnakumar B - - * ace/Svc_Conf_y.cpp: - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_Tokens.h: - - Fixed some bugs introduced by my previous checkin because of - patch confusion. Replaced all the standard C system calls with - ACE_OS calls. Made it more wchar friendly. - - * ace/Makefile: - - Removed the dependency on /pkg/gnu/bin/flex. It was broken. We - now use $(LEX) and $(YACC) defined in - $ACE_ROOT/include/makeinclude/wrapper_macros.GNU. - - * include/makeinclude/wrapper_macros.GNU: - - Changed the definition of YACC to bison (by default). If people - want to change this, it can be overridden by a variable in the - Makefile. But things are most likely to break if you use yacc. - - * etc/Svc_Conf_l.cpp.diff: - * etc/Svc_Conf_y.cpp.diff: - - Regenerated the diffs. - - *Sigh* This patching business is ugly. - -Fri Nov 16 07:22:19 2001 Balachandran Natarajan - - * bin/make_release: Updated the script to copy the beta to a - different location. Have tested this by creating a dummy - repository and a dummy export directory. Things worked - fine. Hopefully the beta should go through without any hassle. - - The script is tied to its usage on ace.cs. Needs to be - changed. Will do that after this beta goes out. Having too many - changes at the same time may not be good. - -Thu Nov 15 20:44:40 2001 Craig Rodrigues - - * etc/Svc_Conf_l.cpp.diff: Updated. Thanks to Kitty for reporting it. - * etc/Svc_Conf_y.cpp.diff: Added. We need it for uses of ACE_LIB_TEXT. - * ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp. - -Thu Nov 15 08:26:57 2001 Douglas C. Schmidt - - * ace/*.cpp: Changed all remaining uses of ACE_TEXT to ACE_LIB_TEXT - to be consistent... Thanks to Johnny Willemsen for reporting - the inconsistencies and for Darrell Brunsch for clarifying what - the right behavior should be. - -Wed Nov 14 07:43:20 2001 Douglas C. Schmidt - - * docs/ACE-guidelines.html: Updated the guidelines to explain - the use of ACE_TCHAR for the argv parameter to main(). Thanks - to Johnny Willemsen for reporting this. - - * ace/OS_Dirent.inl (opendir): Replace char * const cast with - ACE_TCHAR * const cast. Thanks to Nick Pratt for reporting - this. - - * tests/Upgradable_RW_Test.cpp (main): Fixed the test to avoid - dividing by 0 and also initialized all pointers to NULL. Thanks - to Johnny Willemsen for reporting this. Thanks fixes BudID 650. - -Tue Nov 13 15:25:04 2001 Douglas C. Schmidt - - * ace/ACE.h (ACE): Clarified what the time_len parameter is used for. - Thanks to Tompa for reporting this. - -Sun Nov 11 09:50:52 2001 Douglas C. Schmidt - - * ace/Naming_Context.cpp (info): Added an ACE_UNUSED_ARG to - silence warning about "length" parameter and changed buf from - char to ACE_TCHAR. Thanks to Johnny Willemsen for reporting - this. - - * tests/Aio_Platform_Test.cpp: The argv parameter of main() should - be ACE_TCHAR rather than char. Thanks to Johnny Willemsen for - reporting this. - -Thu Nov 15 15:43:20 2001 Craig Rodrigues - - * ace/Naming_Context.cpp (info): Wrapped sprintf() arguments with - ACE_LIB_TEXT. Fix supplied by Johnny Willemsen. - -Thu Nov 15 12:43:31 2001 Nanbor Wang - - * docs/wchar.txt: Added a writeup for ACE_LIB_TEXT and ACE_TEXT - from "the authority." - -Wed Nov 14 21:36:42 2001 Ossama Othman - - * docs/usage-bugzilla.html: - - Corrected link to the DOC Center's bugzilla site. - -Wed Nov 14 23:11:59 2001 Craig Rodrigues - - * ace/Naming_Context.cpp (info): Fixed Unicode build problems - by consistently using ACE_TCHAR instead of char, and by - using Unicode aware string functions in ACE_OS_String - instead of ACE_OS. - - * ace/Svc_Conf_l.cpp: Default intialized ace_yy_c_buf_p to ACE_TCHAR - instead of char. Default initialized ace_yy_cp, ace_yy_bp to 0. - - * ace/Svc_Conf_y.cpp: Wrap string literals passed to ace_yyerror - with ACE_LIB_TEXT(). - -Wed Nov 14 06:38:41 2001 Balachandran Natarajan - - * docs/ACE-bug-process.html (HREF): Changed references from ace.cs - to deuce.doc. Thanks to Johnny Willemsen for reporting this. - -Tue Nov 13 15:04:15 2001 Carlos O'Ryan - - * html/Stats/index.shtml: - * html/Stats/detailed_performance.shtml: - Improved documentation about the test location, ORB, and network - configuration used. Thanks to David Yongqiang Wang - for pointing out the problems. - -Tue Nov 13 11:46:11 2001 Chris Cleeland - - * tests/Collection_Test.cpp (iterate_const): Fixed ACE_DEBUG print - statements that were accessing the element of the unbounded set - as an int rather than an UglyThing. Thanks to Ossama for - pointing this out. - -Mon Nov 12 11:41:35 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.cpp (send, recv): - - In the va_arg versions of these methods, do not use - send/recv_n() to as the underlying send/recv() method. It - forces unnecessary blocking. - - Corrected return value semantics in versions of these methods - that use loop to send/receive multiple buffers. If data was - sent or received than do not return -1 on error. Instead return - the amount of bytes sent/received. This is necessary to allow - the caller to keep track of sent or received data. [Bug 882] - -Sun Nov 11 23:50:00 2001 Craig Rodrigues - - * tests/Date_Time_Test.cpp: Remove argv variable from - main() to eliminate unused variable compiler warning. - * tests/Arg_Shifter_Test.cpp: Same. - -Sun Nov 11 10:00:56 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.h (ACE_SSL_SOCK_Stream): - - Removed unused class members. - - * ace/SSL/SSL_SOCK_Stream.cpp (sendv): - - If an error occurs but data was sent on a previous loop - iteration then return the amount of bytes sent, not the error. - This extends previous check for EWOULDBLOCK and ETIME. All - errors are now caught. The caller must always know if any data - was successfully sent. [Bug 882] - - Do not continue on to the next loop iteration if the amount of - data sent was less than the amount data given. This avoids a - subtle problem where "holes" in the data stream would occur if - partial sends of a given buffer in the iovec array occured. - [Bug 882] - -Sun Nov 11 07:58:07 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.cpp (sendv): - - Fixed unused variable warnings. - -Sat Nov 10 23:25:50 2001 Ossama Othman - - * bin/auto_run_tests.lst: - - Added new SSLIOP "Big_Request" test to the list of regression - tests to automatically run during the nightly builds. - -Sat Nov 10 22:13:54 2001 Krishnakumar B - - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: - * ace/Svc_Conf_Tokens.h: - - Regenerated the files after fixing the warnings that showed up - under Sun CC Forte Update. They were caused because Sun CC's - preprocessor doesn't like the #line statements generated by flex - and bison. Since these files are not modified on a daily basis, - people debugging the lexer can turn it on by removing the flags - '-l' and '-L' to bison and flex respectively in the Makefile. - For now, this removes a lot of noise. - - * ace/Makefile: - - Added flags '-l' to bison and '-L' to flex. - - * etc/Svc_Conf_l.cpp.diff: - - Regenerated the diff to match the current version. - - * etc/Svc_Conf_y.cpp.diff: - - This file held the stuff which have been obsoleted by the move - to use bison. So removed this file to avoid causing confusion in - the future. Thanks to Ossama for pointing this out. - - Let's see some green :-) - -Sat Nov 10 19:27:36 2001 Ossama Othman - - * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): - * ace/SSL/SSL_Connect_Handler.cpp (ssl_connect): - - If data is still buffered within OpenSSL's internal buffer, then - force the Reactor to invoke the event handler (with - the appropriate mask) before waiting for more events - (e.g. blocking on select()) by returning a value greater than - one. All pending data must be processed before waiting for more - events to come in on the SSL handle. - - * ace/SSL/SSL_SOCK_Stream.h (reactor, handler, notify): - - These methods are no longer needed. Removed them. - - (sendv): - - Added missing timeout parameter. - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - * ace/SSL/SSL_SOCK_Stream.i (notify, recv_i, send_i, close): - - Reverted code that notify()ed the Reactor if data was still - pending in OpenSSL's internal buffers. The idea was to force - the reactor to call the appropriate event handler before polling - for events (e.g. blocking on select()). However, notifications - are not dispatched until after events are polled which meant - that there is no point in notify()ing the Reactor. - - * ace/SSL/SSL_SOCK_Stream.cpp (reactor, handler): - - These methods are no longer needed. Removed them. - - (sendv): - - Fixed/improved the writev() semantics and emulation in this - method. Previously, if an iov_base buffer was successfully - sent, that success was not reported to the caller if subsequent - sends in the emulation loop failed. The caller would end up - thinking that no part of the message was sent. The improved - semantics are now the following if the underlying send() call - returns with an EWOULDBLOCK or ETIME error condition: - - - If no data was sent, then return -1. - - If some data was sent on a previous loop iteration then - return the number of bytes successfully sent. - - In both cases, errno is unchanged. [Bug 882] - - Incidentally, this fixes a problem in TAO's SSLIOP pluggable - protocol when sending very large requests. Thanks to Andrew - Finnell for providing an - example that exhibited the problem. - - Lastly, the missing timeout support has been added. The timeout - is decremented on each loop iteration. - -Sat Nov 10 17:16:59 2001 Nanbor Wang - - * ace/OS.cpp (fopen): Removed redundant parentheses. - -Sat Nov 10 09:29:48 2001 Douglas C. Schmidt - - * ace/OS.i (pipe): Replaced the _pipe() call on Win32 with the - CreatePipe() call. Thanks to Bo Balders - for reporting this. - - * ace/Log_Msg.cpp (log): The "format" string was omitted. Thanks - to Martin Krumpolec for noticing this. - -Sat Nov 10 08:48:24 2001 Douglas C. Schmidt - - * ace/Arg_Shifter.{h,cpp}: Added a new constructor to ACE_Arg_Shifter - so that it can handle both const char ** and char ** arguments. - -Fri Nov 9 07:42:41 2001 Douglas C. Schmidt - - * ace/Arg_Shifter.cpp: Made the argv parameter to ACE_Arg_Shifter - a "const" ACE_CHAR **. - - * tests/Arg_Shifter_Test.cpp (main): Added "const" to the - args local variable to remove a warning from SunC++. - -Fri Nov 9 11:23:01 2001 Chris Cleeland - - * tests/Collection_Test.cpp: Fixed up things that caused problems - on several platforms. Added the ARRAY tests back in. - -Thu Nov 8 14:52:39 2001 Steve Huston - - * ace/Log_Msg.h: Added a new 'M' option to print out the name of - the log priority. Thanks to Vladimir Chovanec - for reporting this. - -Thu Nov 8 10:41:44 2001 Douglas C. Schmidt - - * ace/OS_String.h: Enhanced the documentation so that it explains - the differences between ACE_OS::strsncpy() and ACE_OS::strcpy() - more precisely. Thanks to Alain Decamps for contributing this. - - * ace/Naming_Context.{h,cpp}: The info() method should have - ACE_TCHAR ** rather than char **. Thanks to Johnny Willemsen - for reporting this. - - * ace/OS.cpp: Added support for Borland's idiosyncratic _wfdopen() - method. Thanks to Johnny Willemsen for reporting this. - -Wed Nov 7 05:17:03 2001 Douglas C. Schmidt - - * ace/Message_Queue_T.{h,cpp}: Changed the typo DEFUALT_PRIORITY - to DEFAULT_PRIORITY. - - * ace/OS.i: In BCB the _wtempnam() has the following signature: - wchar_t *_wtempnam(wchar_t *dir, wchar_t *prefix) - - This means that the arguments must be made non-const by a cast. The - fix is to add some defines so that with BCB and no wchar the - _tempnam is used (with the casts) and with BCB and wchar then - the _wtempnam is used with the casts. Thanks to Johnny - Willemsen for this fix. - -Thu Nov 8 14:52:39 2001 Steve Huston - - * ace/Arg_Shifter.h: Doxygen-ized some comments. - - * ace/Date_Time.i (update): Add 1900 to years value to convert from - localtime's years-since-1900 value to now. Add 1 to the month - to convert localtime's 0-11 range to 1-12. Thanks to Syed - Wasim Ali for reporting this. - - * tests/Date_Time_Test.(cpp dsp icc): New test for ACE_Date_Time. - - * tests/tests.dsw: - * tests/tests.icp: - * tests/Makefile[.bor]: Added Date_Time_Test. - - * tests/run_test.lst: Added Arg_Shifter_Test and Date_Time_Test. - -Thu Nov 8 11:53:00 2001 Steve Huston - - * tests/Arg_Shifter_Test.(cpp dsp icc): New test for ACE_Arg_Shifter. - - * tests/tests.dsw: - * tests/tests.icp: - * tests/Makefile[.bor]: Added Arg_Shifter_Test. - -Thu Nov 8 13:05:12 2001 Chad Elliott - - * include/makeinclude/platform_irix6.x_sgic++.GNU: - - Added an option to suppress warnings about #pragma pack. - -Thu Nov 8 10:43:22 2001 Chad Elliott - - * ace/OS.cpp: - - Correct a build problem for GHS on Win32. - -Wed Nov 07 13:50:39 2001 Nanbor Wang - - * ace/Task_T.h (ACE_Task): Decorated ACE_Task with ACE_Export to - avoid VC7's internal compiler error. Thanks to Darrell for - submitting the change. - -Wed Nov 7 10:59:00 2001 Craig Rodrigues - - * include/makeinclude/platform_sunos5_g++.GNU: Append -D_REENTRANT - to CPPFLAGS if threads=1 - -Wed Nov 7 08:09:20 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst: Changed the name CC5 build as - CC51. It uses version 5.1 of the compiler anyway. - -Tue Nov 6 14:39:28 2001 Douglas C. Schmidt - - * ace/SString.i (find), - * ace/Local_Name_Space_T.cpp (resolve_i): Fixed "off-by-one" - bugs with ACE_OS::strscpy(). Thanks to Alain Decamps - for contributing this. - -Tue Nov 6 13:25:40 2001 Chris Cleeland - - * tests/Collection_Test.cpp: Committed an old change that uses an - actual class as the element in the Unbounded_Set rather than an - int. I wrote this to get a better understanding of how the - iterator and accessors on the iterator worked. - - * tests/SString_Test.cpp (main): Added a test for the rep() method - that insures that the char array returned is equivalent to the - string in the ACE_CString from which it's obtained. - -Mon Nov 5 10:12:01 2001 Douglas C. Schmidt - - * ace/OS.cpp, - * ace/Local_Name_Space_T.cpp, - * ace/FILE_Addr.cpp, - * ace/Acceptor.cpp, - * ace/ACE.cpp: Changed uses of strncpy() to ACE_OS::strsncpy(). - Thanks to Alain Decamps for these fixes. - -Sun Nov 4 12:11:31 2001 Douglas C. Schmidt - - * ace/Reactor.cpp: Enhanced all the Reactor's event loop methods - to first check and see if the Reactor's been deactivated and to - bailout immediately in this case. Thanks to Don Hinton for - suggesting this. - - * ace/Reactor.i: Moved the reactor_event_loop_done() method from - the *.cpp file into the *.i file and made inlineable. - - * ace/Select_Reactor_T.cpp: Be more careful about error handling in the - dispatch_notification_handlers() method. If a failure occurs, - when dispatch_notifications() is called, return -1, rather than - erroneously "incrementing" the count of the number of handlers - dispatched. Thanks to Don Hinton for reporting this. - -Sat Nov 3 11:15:43 2001 Douglas C. Schmidt - - * The following fixes are from Joachim Achtzehnter : - - In ace/config-pharlap.h we had to explicitly #undef - ACE_HAS_WCHAR after the #include "ace/config-win32.h" - directive. Without this change the resulting DLL depended on - several wide character versions of Win32 system functions, such - as _CreateMutexW. At least some of these dependencies were - caused by ace/OS.i. - - In ace/Log_Msg.cpp we had to add !defined(ACE_HAS_PHARLAP) to a - few more places in addition to the ones Bruce Trask had posted - to avoid reference to the NT Eventlog functionality. - - At the top of ace/Log_Msg_NT_Event_Log.h and - ace/Log_Msg_NT_Event_Log.cpp we added !defined(ACE_HAS_PHARLAP) - to completely bypass the contents of these two files. - - * ace/DEV_Addr.i (addr_to_string): - * ace/Local_Tokens.i (name): - * ace/Module.i (name): - * ace/OS.i (asctime_r): - * ace/SPIPE_Addr.i (addr_to_string): - * ace/UNIX_Addr.i (addr_to_string): - * ace/SString.i (rep): Changed uses of strncpy() to ACE_OS::strsncpy(). - Thanks to Alain Decamps for these fixes. - -Fri Nov 2 14:38:49 2001 Douglas C. Schmidt - - * ace/Task.h (ACE_Task_Base): Clarify the meaning of the put() - hook method. Thanks to Tommy Svensson - for motivating this. - -Mon Nov 5 14:23:12 2001 Chad Elliott - - * ace/ACE.cpp: - - Remove a build warning for gcc 2.95.3 on SunOS 5.6. - -Mon Nov 5 14:21:30 2001 Chad Elliott - - * bin/nightlybuilds/builds.lst: - - Added the HP-UX nightly build back to the list. - -Mon Nov 5 13:31:15 2001 Chad Elliott - - * ace/ACE.cpp: - - Fix a build warning for 64-bit HP-UX. - - * ace/Active_Map_Manager_T.i: - - Cast the free list id to ACE_UINT32 to match up with the - slot_index () type. On 64-bit HP-UX, the free list id type - (size_t) is a 64 bit number and must be cast down to 32 bits. - Otherwise, the slot_index is cast up to 64 bits and does not give - the correct results. - - * include/makeinclude/platform_hpux_aCC.GNU: - - Add a -L./ to allow the 64-bit HP-UX builds to link properly. - -Mon Nov 5 11:17:20 2001 Carlos O'Ryan - - * bin/auto_compile: - Add support for the new status.txt file in the scoreboard. - -Mon Nov 5 13:02:50 2001 Chad Elliott - - * ace/config-hpux-11.00.h: - - Added #define of ACE_HAS_CHARPTR_DL. This corresponds with the - declaration of dlopen(char*,unsigned int). - - * ace/OS.cpp: - - Changed the default thread scope to system (similar to Linux). - Process thread scope is not supported in HP-UX. - -Sun Nov 04 11:18:31 2001 Nanbor Wang - - * ace/OS.cpp (fopen): Changed to forward call to fopen instead of - _fopen on non-borland compilers when not using UNICODE. This - change allows the code to compile on Win98. Thanks to Jstwo - for submitting the fix. - -Thu Nov 1 16:21:51 2001 Chris Cleeland - - * bin/auto_run_tests.pl: Added snippet of code that puts the - current directory ('.') in the PATH environment variable since - auto_run_tests.pl depends on the current directory being there. - -Thu Nov 1 15:49:04 Balachandran Natarajan - - * include/makeinclude/platform_osf1_4.x_cxx.GNU: Moved the - CXX_VERSION definition to the global scope. - - * include/makeinclude/platform_tru64_cxx.GNU: Added - -D_PTHREAD_ENV_DECCXX flag to the CPPFLAGS. This is done only - for v5.1, 1885. The pthreads.h in 1885 is messed up. The - conditional include of c_asm.h is busted for DECCXX and - v1885. Hence the change. We need to do this to protect ACE and - TAO applications on this platform and compiler - combinations. Thanks to Don Hinton for - reporting the problem. - -Thu Nov 1 14:25:52 2001 Jeff Parsons - - * ace/config-win32-borland.h: - - Added fix sent in by Chris Kohlhoff - to ACE_CC_PREPROCESSOR_ARGS to enable the recognition of a - filename to which the preprocessor output is to be directed. - There is also a corresponding fix in TAO_IDL/driver/drv_preproc.cpp - that carries out the redirection. - -Thu Nov 1 10:27:21 2001 Ossama Othman - - * ace/Select_Reactor_Base.h (open): - * ace/Select_Reactor_T.h (ACE_Select_Reactor_T, open): - - Added a note about the "size" of the Select_Reactor on Unix - platforms. On Unix platforms, the size parameter should be as - large as the maximum number of file descriptors allowed for a - given process. This is necessary since a file descriptor is - used to directly index the array of event handlers maintained by - the Reactor's handler repository. Direct indexing is used for - efficiency reasons. - -Thu Nov 1 06:38:30 2001 Douglas C. Schmidt - - * ace/ACE.cpp: Fixed some minor formatting problems so that - format_hexdump() works properly. Thanks to Kyle Brost - for reporting this. - - * ace/config-win32.h: Include the config-cygwin32.h file when - __CYGWIN32__ is enabled. Thanks to Johnny Willemsen for - reporting this. - - * ace/Synch.i (remove): Added some casts to make certain compilers - happy? Thanks to Guillaume Renaud - for reporting this. - - * ace/OS.i: Updated the Win32 version of ACE_OS::llseek(). Thanks to - Doron Rajwan for reporting this. - -Wed Oct 31 11:25:40 2001 Douglas C. Schmidt - - * ace/OS.h: The ACE_OS::llseek() method must be static! Thanks to - Doron Rajwan for reporting this. - -Tue Oct 30 08:30:16 2001 Douglas C. Schmidt - - * ace/RB_Tree.cpp (operator=): Make sure to check for self-assignment - in the operator=. Thanks to Johnny Willemsen for reporting - this. - -Mon Oct 29 05:23:56 2001 Douglas C. Schmidt - - * ace/Naming_Context.{h,cpp}: Moved ACE_STATIC_SVC_REQUIRE from the - .h file to the .cpp file to avoid multiple definitions. Thanks to - Boris Kaminer for reporting this. - -Sun Oct 28 10:05:32 2001 Douglas C. Schmidt - - * ace/config-macosx.h: - * include/makeincludes/platform_macosx.GNU - Added new fixes to get this to work on MacOS X. Thanks to John - Michael Zorko and Fikri Pribadi - for contributing this. - -Wed Oct 24 23:59:13 2001 Douglas C. Schmidt - - * ace/Configuration_Import_Export.cpp: Fixed a bug where a - check of a pointer was made rather than the character pointed to - by the pointer. Thanks to Juan Jose Comellas - for reporting this. - -Wed Oct 31 16:45:07 2001 Ossama Othman - - * ace/OS.h (llseek): - - Made ACE_OS::llseek() a static method, as it was originally - intended to be. Thanks to Doron Rajwan for - pointing out the problem. - -Tue Oct 30 22:53:57 2001 Ossama Othman - - * ace/Svc_Conf_l.cpp: - - Fixed incorrect #line preprocessor directives. - - * etc/Svc_Conf_l.cpp.diff: - - Regenerated this diff so that it includes recent updates. - -Mon Oct 29 20:12:40 2001 Ossama Othman - - * tests/run_test.lst: - - Added the Proactor test to the list of one-button tests to run. - -Mon Oct 29 20:04:40 2001 Ossama Othman - - * tests/Proactor_Test.cpp: - - More patches from Alexander Libman. The Proactor_Test appears - to finally work on Linux. - -Mon Oct 29 17:49:21 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp: Added some error checks at places where - token where acquired. - -Mon Oct 29 16:59:58 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp (acquire_token): The acquire_token () called - acquire with a sleep hook. It was wrong. It should just unblock - the thread by sending notify. A bad cut and paste error - :(. Thanks to Graeme Clark for reporting - this. This closes [BUGID 1077]. - -Sun Oct 28 20:36:56 2001 Ossama Othman - - * ace/Map_T.i (clone): - - Fixed syntax errors. - - * ace/Svc_Handler.cpp (new): - - Reverted Michael's change. It incorrectly altered the semantics - of the new operator, particularly when compiling with native - exception support enabled. Fixes a warning. - -Sun Oct 28 16:44:20 2001 Ossama Othman - - * ace/Timer_Hash_T.cpp (ACE_Timer_Hash_T): - - Corrected syntax error that was introduced in the changes - described below by removing extraneous trailing bracket. - -Sun Oct 28 13:15:00 2001 Michael Kircher - - * ace/ACE.i: - * ace/Activation_Queue.cpp: - * ace/Bound_Ptr.i: - * ace/Configuration.cpp: - * ace/Configuration_Import_Export.cpp: - * ace/Containers_T.cpp: - * ace/Future.cpp: - * ace/Handle_Gobbler.h: - * ace/Local_Tokens.i: - * ace/MEM_SAP.i: - * ace/Map_T.i: - * ace/Message_Block.cpp: - * ace/OS_Errno.cpp: - * ace/Object_Manager.cpp: - * ace/Obstack_T.cpp: - * ace/Refcounted_Auto_Ptr.i: - * ace/Remote_Tokens.i: - * ace/Strategies_T.cpp: - * ace/Stream.cpp: - * ace/Svc_Handler.cpp: - * ace/Synch_T.cpp: - * ace/TLI.cpp: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Queue_T.cpp: - * ace/Unbounded_Queue.cpp: - * ace/Unbounded_Set.cpp: - - Changed almost all direct usages of operator new in ACE to use - ACE_NEW_RETURN (Exceptions is Dump_T.h). In one case in - Stream.cpp the semantics changed slightly if operator new would - have been overloaded, see the "@@ Michael" comment. - - When new got used with placement most of the usages got - replaced with ACE_NEW_MALLOC_RETURN. In some cases as in - Malloc_T.cpp, Map_Manager.cpp, PI_Malloc.i, Array_Base.cpp - special cases exist, where the macros would have incurred - different semantics and performance penalties. - -Fri Oct 26 07:37:43 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Quoter example will not run in - minimum_corba builds. - -Wed Oct 24 08:04:36 2001 Balachandran Natarajan - - * ace/Reactor.h: Improved the documentation of the - end_reactor_event_loop (). - -Tue Oct 23 10:04:25 2001 Ossama Othman - - * tests/Proactor_Test.cpp: - - Replaced uses of a static global lock with the - ACE_Static_Object_Lock singleton. - - Fixed incorrect uses of the "%l" format specifier. "%d" is the - expected format specifier. - - (Acceptor): - - Initialize the "sessions_" member in the base member initializer - list. Corrects a problem where the session number initially - contained a "garbage" value. - -Mon Oct 22 17:55:00 2001 Craig Rodrigues - - * ace/Svc_Conf_l.cpp: Remove include of stdlib.h, fix g++/Solaris - build. - -Mon Oct 22 15:54:29 2001 Steve Huston - - * ace/config-hpux-10.x-hpc++.h: Remove hard-coded setting of - ACE_HAS_EXCEPTIONS. It is controlled by platform_hpux_aCC.GNU. - -Mon Oct 22 15:50:35 2001 Balachandran Natarajan - - * THANKS: Added Chris Hughes name to the Hall of Fame - -Sun Oct 21 16:44:41 2001 Ossama Othman - - * tests/Proactor_Test.cpp (disable_signal): - - Fixed warnings regarding a method that "hid" virtual function - with the same name, in addition to unused argument warnings. - -Sun Oct 21 15:22:57 2001 Ossama Othman - - * tests/Proactor_Test.cpp: - - Fixed warning about deprecated conversion of "const char *" to - "char *" exhibited by GCC 3.0.x builds. - -Sun Oct 21 12:50:39 2001 Douglas C. Schmidt - - * ace/LSOCK.cpp: The ACE_LSOCK::recv_handle() was returning success - without setting the I/O handle. Thanks to Rick Ohnemus - for reporting this. - - * ace/config-freebsd-pthread.h: Changed - #if (__FreeBSD_version > 430000) to - #if (__FreeBSD_version > 440000) to get ACE to work with FreeBSD 4.4. - Thanks to Gu Song for reporting this. - -Fri Oct 19 06:44:17 2001 Douglas C. Schmidt - - * examples/Reactor/WFMO_Reactor/test_window_messages.cpp: - Don't use a global Event_Handler object since this violates the - design rules for the ACE_Reactor. - -Sun Oct 21 13:39:27 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the Quoter example in - $TAO_ROOT/examples to the list of tests in the daily builds. - -Thu Oct 18 20:56:53 2001 Ossama Othman - - * tests/Proactor_Test.cpp: - - Added no-op main() function for platforms that do not support - asynchronous IO. - -Thu Oct 18 22:46:09 2001 Balachandran Natarajan - - * ace/TP_Reactor.h: - * ace/TP_Reactor.cpp: Fixed warnings in Sun CC and TRU 64 builds. - -Thu Oct 18 20:42:55 2001 Ossama Othman - - * tests/Proactor_Test.cpp: - - Fixed Unicode build errors. - -Thu Oct 18 19:52:44 2001 Craig Rodrigues - - * ace/SString.h: clarify example in comments to ACE_Tokenize - so that constant strings are not passed in its constructor. - - * examples/OS/Process/process.cpp: do not pass constant strings - to ACE_Tokenize constructor. Thanks to - Werner Buchert and - Don Hinton . - -Wed Oct 17 23:56:45 2001 Ossama Othman - - * tests/Proactor_Test.cpp: - * tests/Proactor_Test.dsp: - - Proactor test contributed by Alexander Libman - . - - * tests/tests.dsw: - - Added Proactor_Test project to the tests workspace. - -Wed Oct 17 18:59:53 2001 Christopher Kohlhoff - - * include/makeinclude/install.bor: - Borland makefile fix to ensure that, when doing the install - target, core executables are built correctly if they don't - already exist. - -Wed Oct 17 09:15:10 2001 Douglas C. Schmidt - - * ace/config-linux-common.h: Clarified that this file should - not be included directly! Thanks to Suresh N - for reporting this. - -Wed Oct 17 16:00:19 2001 Balachandran Natarajan - - * THANKS: Added Graeme Clark to the Hall of Fame. - -Wed Oct 17 15:49:20 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp: - * ace/TP_Reactor.h: Added remove_handler () calls to the - TP_Reactor. Before this, the call on the reactor used to be - handled by the Select_Reactor's implementation. The - implementation has a problem. It tries to call handle_close () - (an upcall) as one of the calls after holding the token. This - was asking for trouble. This could lead to deadlocks as - mentioned in [BUG ID 1055]. - - The method in the TP_Reactor now calls remove_handler () on the - Select_Reactor (its base class) with a DONT_CALL flag. Then it - calls handle_close () on the Event_Handler if the user did not - pass in the DONT_CALL mask. This two step process would get - around the problem that was mentioned before. Thanks to Graeme - Clark for reporting the problem and - testing this fix. - - This should close [BUG ID 1055]. - -Wed Oct 17 10:40:17 2001 Ossama Othman - - * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): - * ace/SSL/SSL_Connect_Handler.cpp (ssl_connect): - - If errno is set to EWOULDBLOCK for the SSL_ERROR_SYSCALL case, - then continue the connection establishment loop. Do not return - right away. Fixes non-blocking connection establishment on AIX. - Thanks to Vladimir Chovanec for - providing this fix. - - * ace/SSL/SSL_SOCK_Stream.h (notify): - - Made this method protected. It isn't intended to be used - internally by the ACE_SSL_SOCK_Stream class. - -Wed Oct 17 12:15:15 2001 Chris Cleeland - - * ace/Select_Reactor_T.cpp (handle_error, check_handles): Add - vxworks to the ever-growing list of OSs which return - unpredictable values in errno when there's a bad file descriptor - in a select mask. [Bug 1058]. - - Thanks to Dave Arndt , Tad Hetke - , and Erik Johannes - for tracking down and providing this fix. - -Tue Oct 16 23:08:27 2001 Ossama Othman - - * ace/Svc_Conf.h (ACE_Svc_Conf_Param): - - Added a new ACE_Obstack attribute that is passed down to the - parser and scanner. This obviates the need for the global - pointer to the ACE_Obstack that was formally used, which in turn - avoids a race condition. - - (ace_obstack): - - No longer a need to maintain a global pointer to the ACE_Obstack - instance used during parsing/scanning. - - * ace/Svc_Conf.y: - * ace/Svc_Conf.l: - - Retrieve the Obstack from the parameter passed down to yyparse() - and yylex() instead of using the (now non-existent) global - instance. This is part of a race condition fix. - - * ace/Svc_Conf_y.cpp: - * ace/Svc_Conf_l.cpp: - - Updated to pull in the changes made to the source files from - which these files were generated. - - * ace/Service_Config.cpp (process_directives_i): - - The global ACE_Obstack pointer used during each Service - Configurator parse has been removed. An ACE_Obstack instance is - now passed down to the parser and scanner in a - reentrant/thread-safe manner via the new ACE_Svc_Conf_Param - parameter. As such, there is no longer any need to maintain a - global pointer to the ACE_Obstack instance in use, nor is it - necessary to store/restore the previous value when performing - nested or parallel Service Configurator directive processing. - This fixes a race condition that was causing some memory - corruption when parsing Service Configurator directives in - parallel. - - Note that the ACE_Obstack is now instantiated on the stack - rather than the heap, thus improving Service Configurator - directive processing performance. - -Mon Oct 15 23:16:55 2001 Ossama Othman - - * ace/Service_Config.h (process_directives_i): - - Updated the signature of this method to accept a parameter that - will eventually passed to the parser and the scanner. - - * ace/Service_Config.cpp: - - No need to include "ace/Svc_Conf_Lexer_Guard.h" and - "ace/Object_Manager.h". - - (process_directives_i): - - Updated the signature of this method to accept a parameter that - will eventually passed to the parser and the scanner. - - Pass the "ACE_Svc_Conf_Param" parameter to the yyparse() call. - This is reentrant/thread-safe. - - Check the error count found in the "ACE_Svc_Conf_Param" object. - It's count is incremented in a thread-safe/reentrant manner. - - (process_directive, process_directives): - - The ACE_Svc_Conf_Lexer_Guard and its accompanying - synchronization has been moved to the generated scanner code. - This makes locking finer grained. Specifically, instead of - holding a lock for the duration of the scope within which - service configurator directive parsing and scanning is - performed (e.g. for the duration of the yyparse() call), the - lock is only held for the duration of the scope where service - configurator directive scanning occurs (i.e. the entire yylex() - call is synchronized). This is part of the core fix that - corrects a deadlock that occurred when activating an ACE_Task, - in conjunction with the singleton instance of the - ACE_Thread_Manager, during Service Object initialization. - [Bug 1036] - - * ace/Service_Config.i: - - Cosmetic update. - - * ace/Svc_Conf.h: - - Added declaration and method definitions for the - ACE_Svc_Conf_Param class. Instances of this class contain the - state used when parsing/scanning a given service configurator - file or service configurator directive. - - (ACE_SERVICE_DIRECTIVE_STACK_DEPTH): - - There is no longer any hard-coded limit on the maximum depth - nested service configurator directives may be processed. Only - process resource limits limit the maximum nesting depth. - - (ace_yyparse, ace_yylex): - - Updated the parser and lexer entry points to accept an - additional parameter, i.e. a pointer to an ACE_Svc_Conf_Param - object. - - (ace_yy_push_buffer, ace_yy_pop_buffer): - - Pass a pointer to the buffer that will be "switched" in our out - when processing nested service configurator directives those - that are processed in parallel. - - * ace/Svc_Conf.l: - - Removed array that implemented the service configurator - directive stack. The "stack" is now implemented using the - function call stack itself. Hence there is no hard-coded limit - to the stack size. - - Removed all references to ACE_{LPAREN, RPAREN, LBRACE, RBRACE, - COLON, STAR}. Just return their corresponding symbolic integer - constants (e.g. ACE_COLON --> ':'). - - Increment error and line count in the ACE_Svc_Conf_Param object - passed to the yylex() function from yyparse(). This improves - reentrance/thread-safety when tracking error counts. - - (yy_push_buffer, yy_pop_buffer): - - Pass a pointer to the buffer that will be "switched" in our out - when processing nested service configurator directives those - that are processed in parallel. - - * ace/Svc_Conf.y: - - Removed all references to ACE_{LPAREN, RPAREN, LBRACE, RBRACE, - COLON, STAR}. Just use their corresponding symbolic integer - constants (e.g. ACE_COLON --> ':'). - - Increment error and line count in the ACE_Svc_Conf_Param object - passed to the yylex() function from yyparse(). This improves - reentrance/thread-safety when tracking error counts. - - * ace/Svc_Conf_Lexer_Guard.h: - - Store a pointer the lexer buffer currently being scanned. - - * ace/Svc_Conf_Lexer_Guard.cpp: - - Updated constructor to accept a pointer to an ACE_Svc_Conf_Param - object. If the buffer in that object is zero, it will be - initialized. - - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: - * ace/Svc_Conf_Tokens.h: - - Regenerated these files in order to pull in the updates made to - their corresponding source files (i.e. Svc_Conf.{l,y}). - -Mon Oct 15 11:26:39 2001 Steve Huston - - * examples/C++NPv2: New directory for examples in "C++ Network - Programming, Volume 2: Systematic Reuse with ACE and Frameworks" - Moved these changes to the new directory, and reverted the - C++NPv1 files to their ACE 5.2 state: - Sun Oct 14 17:05:14 2001 Douglas C. Schmidt - Tue Oct 9 07:46:20 2001 Douglas C. Schmidt - -Sun Oct 14 17:05:14 2001 Douglas C. Schmidt - - * examples/C++NPv1/Logging_Handler.{h,cpp}: Changed log_file_ from - a reference to a pointer so that it can be initialized - correctly. Thanks to Kitty for reporting this. - -Fri Oct 12 14:54:58 2001 Craig Rodrigues - - * ace/OS.i: - Remove extraneous check for macro ACE_HAS_WINSOCK2_GQOS, - which was breaking various builds under Windows. - Thanks to Jeff McNiel for pointing it out. - -Fri Oct 12 12:15:22 2001 Carlos O'Ryan - - * bin/nightlybuilds/builds.lst: - The QNX machine is no longer running that OS, plus attempts to - bring it back to life failed. The build is removed until - further notice. - -Thu Oct 11 17:52:32 2001 Priyanka Gontla - - * ace/SOCK_Dgram_Mcast.cpp: - Somehow the file didnt get committed yesterday. So, committing - the following change now. - - Wed Oct 10 16:56:18 2001 Priyanka Gontla - -Thu Oct 11 10:57:58 2001 Carlos O'Ryan - - * ace/RB_Tree.h: - * ace/RB_Tree.i: - * ace/RB_Tree.cpp: - Reverted to the 5.2 release state. The proposed changes were - breaking some builds, and they were not bug fixes in any case. - -Wed Oct 10 16:56:18 2001 Priyanka Gontla - - * ace/SOCK_Dgram_Mcast.cpp: - Reverted the following change as it ended up with some problems - for multicast services. - - Fri Oct 5 14:40:03 2001 Balachandran Natarajan - -Wed Oct 10 06:16:52 2001 Douglas C. Schmidt - - * ace/Activation_Queue.{h,cpp}: Added support for two ACE_Allocator that - will control how the message blocks and data blocks are - allocated. Thanks to Gil Rapaport - for contributing this. - - * examples/Reactor/WFMO_Reactor/test_apc.cpp (main): - * examples/Reactor/WFMO_Reactor/test_abandoned.cpp (main): Don't - use a global Event_Handler since this violates the design rules - for the ACE_Reactor. Thanks to Heping He - and Hartmut Quast - for reporting this and to Irfan for - suggesting where the problem arose. - -Tue Oct 9 07:46:20 2001 Douglas C. Schmidt - - * examples/C++NPv1/Logging_Handler.h: Added a new constructor to - class Logging_Handler that just takes an ACE_SOCK_Stream. We - need to use this in C++NPv2. - - * ace/Message_Queue_T.cpp (wait_not_full_cond): Thanks to Leo Kov - for reporting this. - - * ace/TTY_IO.cpp (control): Inserted some useful - ACE_OS::set_errno_to_last_error() calls. Also, for Win32 made - readtimeoutmsec == 0 cause no timeout, whereas readtimeoutmsec - == MAXDWORD causes infinite timeout. Thanks to Lars Steubesand - for reporting this. - -Mon Oct 8 20:19:44 2001 Nanbor Wang - - * examples/DLL/test_dll.cpp: There's no need to specify - ACE_DLL_SUFFIX as it prevent ACE_Lib_Find to figure out the - correct DLL name. - - The ACE_ERROR_RETURN macro store and reset the errno so there's - no need to use dll.error() with it. Changed to use "%p" to - display the error. - - Thanks to Heping He for reporting - the problem. - -Mon Oct 8 11:15:21 2001 Angelo Corsaro - - * ace/RB_Tree.h (class ACE_RB_Tree_Node): - * ace/RB_Tree.i: - - Changed access privilege on the operator new/delete to be - public, and added assertion in those method implementation to - make sure that wrong use of these method are promptly notified. - This changes should fix the problem that some compiling were - still having with RB_Trees. - -Sat Oct 06 23:06:41 2001 Ossama Othman - - * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): - * ace/SSL/SSL_Connect_Handler.cpp (ssl_connect): - * ace/SSL/SSL_SOCK_Stream.i (send_i, recv_i, close): - - Removed the do/while(SSL_pending()) loop. Its introduction into - the code was a bit misguided. There is no need to flush the SSL - buffer before returning to the Reactor's event loop since the - code now sends a notification to the Reactor to force the - Reactor to invoke the event handler before waiting in the event - loop. This fixes some SSL protocol errors that manifested - during multithreaded SSL communication. [Bug 943] - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - - It is no longer necessary to call SSL_accept()/connect() to - flush the SSL buffer before running the Reactor's event loop - since the Reactor is notified that it should call the - appropriate event handler before blocking on select() for - WaitForMultipleObjects(), for example. - - * ace/SSL/SSL_SOCK_Stream.cpp (reactor, handler): - - New methods to set the Reactor and event handler associated with - the ACE_SSL_SOCK_Stream. If each of these is set, then the - Reactor will be notified if data is still pending in the SSL - buffer. - - (~ACE_SSL_SOCK_Stream): - - Uninlined the destructor. There is no need for it to be - inlined, and doing so only caused unnecessary code bloat. - - * ace/SSL/SSL_SOCK_Stream.h (notify, reactor, handler): - - Added these new method declarations, in addition to the - corresponding attributes. - - Updated documentation. - - * ace/SSL/SSL_SOCK_Stream.i (notify): - - Method that pushes the event handler on to the Reactor's - notification pipe when necessary. Invoked by recv_i() and - send_i(). - - * ace/SSL/SSL_SOCK_Acceptor.h: - * ace/SSL/SSL_SOCK_Connector.h: - * ace/SSL/SSL_Accept_Handler.h: - * ace/SSL/SSL_Connect_Handler.h: - - Updated documentation. - -Sat Oct 6 16:04:29 2001 Angelo Corsaro - - * ace/RB_Tree.h: - * ace/RB_Tree.i: - - The operator new and delete were declared to be No-Op but were - not implemented as such. This was breaking some builds. Now the - operator are declared as private and they also have a no-op - implementation. This should solve some linking error that were - occurring. - -Sat Oct 6 11:17:22 2001 Balachandran Natarajan - - * THANKS: Added Adrian Mercieca to the hallf of fame. - -Fri Oct 05 18:30:59 2001 Irfan Pyarali - - * ace/RW_Process_Mutex.cpp: Added inclusion ACE.h and fixed member - initialization. - -Fri Oct 5 18:16:53 2001 Balachandran Natarajan - - * ace/SString.h: - * ace/SString.cpp: Changes the usage of ostream to - ACE_OSTREAM_TYPE. Thanks to Russ Noseworthy for letting us - know. - -Thu Oct 4 07:10:01 2001 Douglas C. Schmidt - - * ace/RB_Tree.*: Added support for using the "ACE_Allocator" parameters - to manage memory. Thanks to Airat A. Sadreev - for reporting contributing this. - -Wed Oct 3 07:20:06 2001 Douglas C. Schmidt - - * ace/RW_Process_Mutex.{h,cpp}: Added the ability to create a - unique name if the user doesn't supply one. Thanks to Tom - Wagner for suggesting this. - - * ace/Synch.h: Clarified that the timed wait capabilities of - ACE_Semaphore only work on Solaris if ACE_HAS_PTHREAD is enabled - *and* ACE_HAS_POSIX_SEM/ACE_HAS_STHREAD are disabled. Thanks to - Bonifides Bautista for reporting this. - -Fri Oct 5 12:48:48 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.i (close): - - Reset the SSL object to allow another connection to be made - using the existing ACE_SSL_SOCK_Stream instance. This prevents - the previous SSL session state from being associated with the - new SSL session/connection. Thanks to Vladimir Chovanec - for pointing out this problem and - suggesting a course of action. - -Fri Oct 5 14:40:03 2001 Balachandran Natarajan - - * ace/SOCK_Dgram_Mcast.cpp (open): Removed the #if defined (linux) - from the code. Looks like this had to be removed to get it - working for RTI under Linux. The other ChangeLog entries that - this change is concerned with are "Sat Feb 17 17:23:46 2001 - Darrell Brunsch " and "Fri Jan 26 11:18:15 2001 - Douglas C. Schmidt". Looks like the patch provided by Keith - Nicewarner is being reverted. I remember - a communication from Keith which seemed to hint that this may - not be required. - - Thanks to Russ Noseworthy for suggesting this. - -Fri Oct 5 14:04:39 2001 Balachandran Natarajan - - * THANKS: Added Hagen Ulrich to the Hall of Fame. - -Fri Oct 5 13:55:02 2001 Balachandran Natarajan - - * ace/Makefile: Removed the SUPPRESS_DASH_G option. Not really - sure where it is used. Further, added a tab to the place where - rules for CHORUS are set. This should fix BUGID 1049. Thanks to - Hagen Ulrich and Dr.David Levine for - reporting and verifying the fix. - -Fri Oct 05 05:56:50 2001 Balachandran - - * ACE version 5.2 released. - -Thu Oct 4 17:38:21 2001 Steve Huston - - * ace/Synch.h: Added some comments to explain the rationale for - the different return values from the blocking and timed - versions of ACE_Null_Semaphore::acquire(). Thanks to Doug - Schmidt for explaining this. - -Thu Oct 4 17:27:39 2001 Steve Huston - - * examples/C++NPv1/Logging_Handler.cpp (recv_log_record): Insure that - the payload message block is properly aligned for any CDR - extraction. Many thanks to Bala for noticing this problem and - sending code for the fix. - -Thu Oct 4 17:08:39 2001 Steve Huston - - * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: - In prepare(), call ACE_Process_Options::command_line() rather - than ACE_Process_Options::process_name() to set the program - path for the child process. - -Thu Oct 4 13:18:37 2001 Steve Huston - - * examples/C++NPv1/Logging_Handler.cpp: Use a ACE_Message_Block, - rather than hijacking a CDR block, to read the payload into. - -Thu Oct 4 10:14:34 2001 Balachandran Natarajan - - * THANKS: Added Donald Acton to the Hall of Fame. - -Thu Oct 4 06:39:20 2001 Balachandran Natarajan - - * ace/config-sunos5.5.h: Added ACE_LACKS_MKSTEMP as SunOS 5.5 does - not support mkstemp (). - - * ace/config-sunos5.6.h: Undefined ACE_LACKS_MKSTEMP as Sun 5.6 - and above support it. - - Thanks to Don Hinton for reporting this - problem and Chad Elliott for testing this out on a Sun OS 5.5 - box. - -Wed Oct 3 16:37:41 2001 Balachandran Natarajan - - * ace/CDR_Stream.cpp (read_1): Reverted this change "Wed Oct 3 - 15:05:43 2001 Jeff Parsons ". This - change is alone not enough to fix the problem that Brad - reported. The sample program for the text needs to be fixed to - get it working right. - -Wed Oct 3 15:05:43 2001 Jeff Parsons - - * ace/CDR_Stream.cpp (read_1); - - Reverted changed made in - - Fri Aug 17 16:56:16 2001 Jeff Parsons - - to read_1(). A similar change made in several other methods is - ok, but in this case bytes can be copied into the input CDR - stream without changing wr_ptr, so the check will fail - unnecessarily. Thanks to Brad Hoskins - for pointing this out. - -Wed Oct 2 12:18:37 2001 Steve Huston - - * examples/C++NPv1/Logging_Server.cpp: Fixed spelling error. - * examples/C++NPv1/Logging_Handler.cpp: Comment length adjustment. - -Tue Oct 2 21:52:31 2001 Steve Huston - - * examples/C++NPv1/Logging_Client.cpp: Reverted this: - Mon Oct 1 18:27:41 2001 Steve Huston - -Tue Oct 2 19:52:57 2001 Balachandran Natarajan - - * Makefile: Removed some of the files that no longer exist in the - repository. The inclusion of these files in the Makefile added - noise during the beta cutting process. - -Tue Oct 02 15:34:49 2001 Carlos O'Ryan - - * etc/tao_cosevent.doxygen: - * etc/tao_cosnotification.doxygen: - Fixed typos in the tag file names. - -Tue Oct 2 15:52:27 2001 Balachandran Natarajan - - * THANKS: Added Sunny Leung to the Hall of Fame. - -Tue Oct 2 15:33:36 2001 Balachandran Natarajan - - * THANKS: Removed one instance of Peter Phillips - from the Hall of Fame. - -Tue Oct 2 15:00:37 2001 Balachandran Natarajan - - * ace/CDR_Stream.cpp (clone_from): Copied the GIOP major and minor - versions from the incoming CDR stream. Thanks to Sunny Leung - for reporting this. This closes bugzilla - #1043. - -Tue Oct 2 09:45:39 2001 Steve Huston - - * tests/libDLL_Test.icc: - * tests/libService_Config_DLL.icc: Add link(exportAll) to the link - options to export the entrypoints needed for the tests. - -Mon Oct 1 20:04:14 2001 Priyanka Gontla - - * THANKS: - Added Tushar Nair to the THANKS file. - -Mon Oct 1 18:06:48 2001 Priyanka Gontla - - * ace/Object_Manager.cpp (ACE_UnhandledExceptionFilter): - Removed the un-needed #if 0's. Left them before as a safety - measure (in case something doesnt work) and forgot to remove - them later. - - * ace/Log_Msg.cpp (instance): - Fixed the seg faults that are raised when ace is compiled with - ACE_NTRACE=0 on SunOS. Added a check before locking and - releasing a lock. - - Thanks to Tushar Nair for reporting the - problem and for providing a fix. - -Mon Oct 1 18:27:41 2001 Steve Huston - - * examples/C++NPv1/Logging_Client.cpp: Remove the third (optional) - arg from getline(). Using a char literal without further - qualification causes confusion in Unicode builds. - -Mon Oct 1 14:44:13 2001 Ossama Othman - - * ace/SSL/SSL_Context.cpp (ssl_library_init): - - Initialize the locking callbacks in the crypto library before - initializing the OpenSSL library. OpenSSL may require the - locking callbacks to be initialized before its own - initialization. - - * ace/SSL/SSL_Context.cpp (ssl_library_fini): - - Perform crypto library resource cleanup before reclaiming the - locks used by the locking callbacks. Crypto library resource - cleanup makes use of the locking callbacks. - -Mon Oct 1 15:19:11 2001 Douglas C. Schmidt - - * examples/C++NPv1/README: Added a section that illustrates the - mapping of chapters onto files in the directory. - -Mon Oct 1 12:58:57 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp (handle_socket_events): A fix for the problem - that started showing up this time is like this. One of the - threads was dispatching an upcall. In the intermediate time the - Reactor woke up another thread to close the handler, remember - that this is possible with the TP_Reactor if the application - resumes the handles (the way TAO does that). Now when the thread - that that dispatched the upcall returned it tries to invoke a - method on the already closed handle. To prevent that from - happening we make an extra check to see whether the handle - associated with the handler is still available in the internal - map of the Reactor. As this check is done in the return path of - the thread this should have less performance impact. This is - another reason why we should have #1031 in place ASAP. - -Mon Oct 1 12:23:57 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst (WEB): Changed the name of the - Sun's EGCS build. We have not been using EGCS but 2.95.x for a - long time now. - -Mon Oct 1 10:46:15 2001 Balachandran Natarajan - - * bin/PerlACE/Run_Test.pm (check_n_cleanup_files): Removed the - word "ERROR" when files are left behind. This was creating noise - in the daily builds. We have captured the problem in the - bugzilla with id #1014. After 1.2 goes out, if someone is - looking at this problem again we need to add this back so that - our daily builds can pick them up. - -Sun Sep 30 17:25:33 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.i (send_i, recv_i): - - Reset errno to prevent previous values (e.g. EWOULDBLOCK) from - being associated with a fatal SSL error (e.g. an alert). - -Sun Sep 30 16:52:22 2001 Ossama Othman - - * ace/SSL/SSL_Asynch_Stream.cpp (do_SSL_shutdown): - - Return the "retval" variable instead of always returning -1. - The actual return value may not always be -1. Thanks to Alain - Totouom for providing this fix. - - * THANKS: - - Added Alain to the list of contributors. - -Sun Sep 30 09:13:04 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - - Made reactor mask constant to emphasize the fact that it is - indeed a constant. - -Sat Sep 29 08:07:07 2001 Douglas C. Schmidt - - * ace/Configuration.{h,cpp}: Changed "allocator" to "alloc" to - avoid bugs with MSVC++ 5.0. Thanks to Munagala Ramanath - for reporting this. - - * ACE-INSTALL.html: Yet more improvements courtesy of Chris - Kohloff. - -Fri Sep 28 23:38:07 2001 Ossama Othman - - * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): - - Cleaned up the code. - - Do not attempt to verify the X.509 certificate. Only the - application knows how best to do that. - - * ace/SSL/SSL_Context.cpp (ssl_library_init): - - Fixed some Unicode problems. Wrap strings within an ACE_TEXT - macro. - - * ace/SSL/SSL_Connect_Handler.cpp (ssl_connect): - * ace/SSL/SSL_SOCK_Stream.i: - - Corrected some comments. - - * ace/SSL/SSL_SOCK_Stream.h (send_n, recv_n): - - Added a "bytes transferred" pointer parameter. This allows the - amount of bytes transferred to returned via this parameter, thus - matching the semantics of their ACE_SOCK_Stream counterparts. - - * ace/SSL/SSL_SOCK_Stream.cpp (send): - - Do not block attempt a timed send() if data is available in - OpenSSL's internal buffer. This prevents a condition where - needlessly blocking on select() would occur. A similar fix for - recv() was made earlier. See Fri Aug 24 16:54:02 2001 Ossama - Othman for details. - - (send_n, recv_n): - - If the "bytes transferred" pointer parameter is non-zero then - return the amounts of bytes transferred through it. This makes - these methods better match the semantics of their - ACE_SOCK_Stream counterparts. - -Fri Sep 28 19:24:51 2001 Steve Huston - - * ace/config-hpux-11.00.h: Moved the definitions for ACE_HAS_WCHAR - and ACE_HAS_XPG4_MULTIBYTE_CHAR from the compiler-independent - section to the aC++ section. (at least) gcc 3.0 distributed from - HP can't handle compiling wide char stuff... it refers to - wctype.h, only available in aC++. - -Fri Sep 28 12:46:25 2001 Ossama Othman - - * ace/SSL/SSL_Context.cpp (report_error): - - Don't bother displaying an error message if the error code is - zero (i.e. no error). - -Fri Sep 28 12:31:39 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - - Transfer ownership of the Reactor to the previous owner for the - SSL_ERROR_ZERO_RETURN case. Thanks to Vladimir Chovanec - for pointing out this problem. - - Remove the SSL event handler from the reactor for the - SSL_ERROR_ZERO_RETURN case. Previously, this method returned - without removing it, resulting in a seg fault. - - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - - Ported the updates made to the ssl_accept() counterpart to this - method. - - * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): - * ace/SSL/SSL_Connect_Handler.cpp (ssl_connect): - * ace/SSL/SSL_SOCK_Stream.i (send_i): - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - - In the event a SSL_ERROR_SYSCALL error condition occurs, call - ACE_OS::set_errno_to_last_error() to make sure errno is updated - appropriately since OpenSSL does not do that. Fixes some - "misbehaving" Reactor interactions. Thanks to Andrew Finnell - for tracking down the problem - and suggesting these fixes. - -Fri Sep 28 09:37:28 2001 Ossama Othman - - * ace/SSL/SSL_Context.h (report_error): - * ace/SSL/SSL_Context.cpp (report_error): - - New SSL error reporting functions that use the ACE_Log_Msg - facilities to dump error information. - - * ace/SSL/SSL_Context.cpp (set_mode): - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Stream.i (send_i, recv_i): - * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): - * ace/SSL/SSL_Connect_Handler.cpp (ssl_connect): - - Use the new report_error() static method to display error - information instead of OpenSSL's ERR_print_error_fp(). - - * ace/SSL/SSL_SOCK_Connector.cpp: - - Include 'ace/Log_Msg.h' to pull ACE_ERROR macro definitions. - Fixes compile-time problems on Tru64. Thanks to Martin - Krumpolec for providing this fix. [Bug 1034] - - (ACE_SSL_SOCK_Connector): - - Wrap format specifier string in ACE_ERROR call with ACE_TEXT. - Fixes mismatched Unicode/non-unicode strings. - -Fri Sep 28 06:17:27 2001 Douglas C. Schmidt - - * ace/SPIPE_Acceptor.{h,cpp}: Fixed the use of "char" for - "already_connected_" to be "int". Thanks to Johnny Willemsen - for reporting this. - - * ACE-INSTALL.html: Improved the installation instructions for BCB 4/5. - Thanks to Chris Kohloff for contributing this and to - Jan Kalin for motivating this. - - * ace/TTY_IO.cpp: Fixed numerous bugs in the control() method. - Thanks to Airat A. Sadreev for reporting this. - - * ace/TTY_IO.h: Add a new field for Win32. Thanks to - Airat A. Sadreev for reporting this. - -Thu Sep 27 06:12:21 2001 Douglas C. Schmidt - - * ace/config-win32.h: Added a special-case for Borland C++ Builder, - which must include vcl.h before windows.h. Thanks to Chris - Kohloff for reporting this. This fixes Bug ID 899 for the time - being. - - * ace/Module.cpp (ACE_Module): The line - - this->name (""); - - was be replaced with - - this->name (ACE_TEXT("")); - - Thanks to Airat A. Sadreev for - reporting this. This fixes bug id 1041. - -Thu Sep 27 13:09:19 2001 Bala - - * ACE version 5.1.21 released. - -Tue Sep 25 16:12:14 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.i (recv_i): - - Use ACE_OS::set_errno_to_last_error() set errno instead of doing - so manually to get around broken compilers that reset the last - error when assigning to errno. Thanks to Chris Kohloff for - pointing out the problem and suggesting this fix. - -Tue Sep 25 13:00:37 2001 Nanbor Wang - - * ace/Obstack.h: Fixed a typo when declaring ACE_Obstack - exportable. I mistakenly used the underlying - ACE_EXPORT_SINGLETON_DECLARATION macro directly. - ACE_SINGLETON_DECLARATION is the right macro to use here. - Thanks to Martin Krumpolec for reporting - the bug. - -Tue Sep 25 09:12:28 2001 Andrew Finnell - - * ace/SSL/SSL_SOCK_Stream.i (recv_i): - - On MS Windows, OpenSSL does not store the last error in errno so - explicitly do so. This corrects problems where a server is - unaware that a client has forcefully disconnected. - -Tue Sep 25 00:01:59 2001 Irfan Pyarali - - * ace/Service_Repository.cpp (instance): There are three stages of - the Object Manager: (a) starting up; (b) running; (c) shutdown. - ACE_Service_Repository::instance() was not creating a new - instance in (a) and (c). It was changed to allow creation (a). - -Mon Sep 24 01:55:29 2001 Ossama Othman - - * bin/auto_run_tests.lst: - - Added TAO's PICurrent test to the list of automated regression - tests. - -Sun Sep 23 19:28:06 2001 Nanbor Wang - - * ace/Reactor.h (ACE_Reactor): Fixed comments for - and . Both - methods work on an instance of reactor, not the global singleton - reactor. Thanks to Doug for noticing this. - -Sun Sep 23 10:02:59 2001 Balachandran Natarajan - - * ace/High_Res_Timer.h: Removed a question mark "?", in a line - which read "or sometimes 3.579 Mhz??". This seems to remove the - warning in VXWORKS builds. I have no clue about the problem that - VXWORKS compiler sees. It took only more than an hour to figure - this out. :(. - -Sat Sep 22 08:59:24 2001 Douglas C. Schmidt - - * ace/Service_Manager.cpp (handle_input): Added some logic to - strip off newlines and carriage returns for Windows platforms. - Thanks to Kyle Brost for contributing - this. - -Sat Sep 22 12:28:21 2001 Ossama Othman - - * ace/SSL/ACE_SSL_LIB.dsp: - - Corrected code generation settings to use the multi-threaded DLL - version of the run-time library. Corrects "legacy" build - problems. - -Sat Sep 22 08:59:24 2001 Douglas C. Schmidt - - * ace/High_Res_Timer.{h,i,cpp}: Added comments to explain how - to configure the timers properly on various platforms. Thanks - to Alain Decamps for reporting this. - - * ace/OS.i (ACE_Flow_Spec): Added a check for ACE_HAS_WINSOCK2_GQOS - so that things will compile properly on MinGW32. Thanks to Jeff - McNiel for reporting this. - -Fri Sep 21 15:54:55 2001 Douglas C. Schmidt - - * ace/OS_Dirent.cpp: Fixed all the allocations so they work properly - when used with ACE_TCHAR! Thanks to Olof Lindfors - . - -Tue Sep 18 06:25:22 2001 Douglas C. Schmidt - - * ace/*Reactor*: Changed all uses of "delta_time" to "delay_time". - Thanks to Johnny Willemsen for reporting this. - -Sun Sep 16 11:53:38 2001 Douglas C. Schmidt - - * ace/Connector.cpp (handle_output): Fixed the comment to be - ACE_WIN32. Thanks to Kobi Cohen-Arazi for - reporting this. - -Fri Sep 21 17:11:52 2001 Balachandran Natarajan - - * ace/Message_Block.h: Tried rewording some comments in the - ACE_Message_Block. Thanks to Tom Wagner for - suggesting this. - - * THANKS: Added Tom Wagner to the Hall of - Fame. - -Fri Sep 21 22:11:53 2001 Ossama Othman - - * ace/SSL/ACE_SSL_LIB.dsp: - - Removed hardcoded user-specific include paths, and user-specific - preprocessor macro definitions. - -Thu Sep 20 18:15:49 2001 Steve Huston - - * tests/Config_Test.cpp: Added some more tests to verify correct - string value reset and enumerate values/sections. - -Thu Sep 20 12:29:09 2001 Ossama Othman - - * ace/SSL/ACE_SSL_LIB.dsp: - * ace/SSL/ACE_SSL_LIB.dsw: - - New static build MSVC++ project and workspace files for the - ACE_SSL library contributed by Jonathan Reis . - [Bug 1032] - -Thu Sep 20 12:16:13 2001 Ossama Othman - - * ace/SSL/SSL_SOCK.cpp (enable, disable): - - Removed unreachable "return" statements. [Bug 1033] - - * ace/SSL/SSL_SOCK_Stream.i (ACE_SSL_SOCK_Stream): - * ace/SSL/SSL_SOCK_Stream.cpp: - - Moved constructor to the ".cpp" file since to prevent inclusion - of `ace/Log_Msg.h' in `SSL_SOCK_Stream.h'. This fixes problems - with some platforms needing the Log_Msg include to pull in the - ACE_ERROR macros without needlessly increasing inter-header - dependencies and inclusions. [Bug 1034] - -Thu Sep 20 14:44:29 2001 Steve Huston - - * ace/Process.cpp (ACE_Process_Options): Moved avoid_zombies_ - initialization outside the !Win32 section. Thanks to Johnny - Willemsen for this fix. - -Thu Sep 20 06:28:50 2001 Chad Elliott - - * ace/config-hpux-11.00.h: - - Reverting the change from "Wed Aug 29 15:32:10 2001 Douglas C. - Schmidt ". HP-UX 11.00 does - not actually support pread/pwrite. - -Wed Sep 19 16:56:02 2001 Irfan Pyarali - - * ace/OS.h (THR_SCOPE_PROCESS and THR_SCOPE_SYSTEM): Added - definitions for THR_SCOPE_PROCESS and THR_SCOPE_SYSTEM on - platforms that do not support threads. - -Wed Sep 19 16:54:04 2001 Jeff Parsons - - * ace/Containers_T.cpp: - - In copy constructor for ACE_Double_Linked_List, added line to - copy the size of the rhs to the lhs. The new list was ending - up with a garbage value for its size. - -Wed Sep 19 14:15:08 2001 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Enabled generation of debug info even for - release configurations. Thanks to Jonathan Reis - for suggesting this. - -Wed Sep 19 10:23:06 2001 Carlos O'Ryan - - * html/index.html: - Add couple of missing links to the RT-CORBA components - -Wed Sep 19 12:00:04 2001 Johnny Willemsen - - * ACE-INSTALL.html: - Added BCB5 to some places as supported/used compiler - - * ace/Future.h: - * ace/Test_and_Set.h: - Removed the ACE_EXPORT from the templates ACE_Future_Holder and - ACE_Test_and_Set - - * ace/Service_Config.{h,cpp}: - Changed the type of the members be_a_daemon_ and no_static_svcs_ - from char to int - -Tue Sep 18 13:57:36 2001 Carlos O'Ryan - - * */Makefile: - * */Makefile.*: - Updated dependencies, some of the paths were absolute leading to - ambiguities in parallel builds. - -Tue Sep 18 12:18:26 2001 Carlos O'Ryan - - * bin/footprint_stats.sh: - Fixed bug in footprint charts generation. - -Tue Sep 18 10:50:15 2001 Carlos O'Ryan - - * html/index.html: - Add COS Event and COS Notification services to the index. - -Mon Sep 17 19:00:00 2001 Irfan Pyarali - - * ace/OS.h: - - - THR_SCOPE_PROCESS and THR_SCOPE_SYSTEM were not defined - for NT. Added them. - - - Moved the following definitions of VxWorks around such - that these defines are available even when PACE is not - used. - - THR_INHERIT_SCHED - THR_EXPLICIT_SCHED - THR_SCHED_IO - THR_SCOPE_SYSTEM - THR_SCOPE_PROCESS - - * ace/OS.cpp: LinuxThreads do not have support for - PTHREAD_SCOPE_PROCESS; only PTHREAD_SCOPE_SYSTEM is supported. - Therefore, PTHREAD_SCOPE_PROCESS is ignored when setting the - thread scheduling scope. - - * ace/Sample_History.cpp: Added accessors for and - . - - * bin/auto_run_tests.lst: Added new RTCORBA tests. Removed - Minimum CORBA dependency on these tests. - -Mon Sep 17 13:49:07 2001 Carlos O'Ryan - - * etc/tao_cosevent.doxygen: - * etc/tao_cosnotification.doxygen: - Add new Doxygen files for the Notification and COS Event - Services - - * bin/generate_doxygen.pl: - Add new doxygen files to the automatically generated - documentation. - -Mon Sep 17 11:36:54 2001 Balachandran Natarajan - - * tests/run_tests.lst: This is the script used by the shell - script in that directory. As the name is confusing this is being - moved as a new file. - - * tests/run_tests_remote.lst: Renamed the run_tests.lst as - run_tests_shell.lst. This is invoked by run_tests.sh - - * tests/run_tests.sh: Renamed as a new file. - - * tests/run_tests_remote.sh: Renamed the file run_tests.sh as this - one. This script can be used to run tests remotely on a - CHORUS/ClassiX/MVME targets. Further this can also be used to - run tests on platforms that dont support perl or do not have - perl. - -Sun Sep 16 11:19:01 2001 Balachandran - - * ACE version 5.1.20 released. - -Sat Sep 15 16:58:08 2001 Balachandran Natarajan - - * tests/High_Res_Timer_Test.cpp: Fixed compile problem with Sun CC - 4.2. - -Fri Sep 14 05:28:13 2001 Douglas C. Schmidt - - * THANKS: We now have over 1,300 contributors to ACE+TAO! - - * ace/Basic_Types.{h,i}: Added "const" to various operators and - methods. Thanks to Alain Decamps for reporting this. - -Thu Sep 13 11:02:41 2001 Douglas C. Schmidt - - * ace/Singleton.cpp: If we're not compiling with threading enabled, - don't call the get_singleton_lock() code. Thanks to Charles - Frasch for contributing this. - -Tue Sep 11 06:23:08 2001 Douglas C. Schmidt - - * ace/Array_Base.h: Changed current_ from u_int to size_t. Thanks - to Johnny Willemsen for reporting this. - -Fri Sep 14 17:18:37 2001 Steve Huston - - * tests/High_Res_Timer_Test.cpp (check_micro_nano): If the - nanointerval is 0, change it to 1 to prevent divide-by-zero. - -Fri Sep 14 17:02:39 2001 Steve Huston - - * tests/High_Res_Timer_Test.cpp: Replaced some (u_int) casts with - ACE_U64_TO_U32, which is correct. Thanks to Alain Decamps, yet - again!, for this fix. - -Fri Sep 14 11:39:03 2001 Balachandran Natarajan - - * THANKS: Added Mahesh Varadarajan and Kevin Clien to the Hall of - Fame. - -Thu Sep 13 22:43:34 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the new Cache_Growth_Test to the - daily tests. - -Thu Sep 13 20:38:44 2001 Nanbor Wang - - * ace/Thread_Manager.h (ACE_Thread_Manager): Changed the default - argument for the constructor from 0 to - ACE_DEFAULT_THREAD_MANAGER_PREALLOC. Thanks to Doug for - pointing this out. - - Added better documentation to explain the purpose of each - argument in ACE_Thread_Manager's constructor. Thanks to Nick - Pratt for motivating the change. - -Thu Sep 13 13:38:41 2001 Steve Huston - - * ace/High_Res_Timer.cpp (elapsed_time (ACE_hrtime_t&nanoseconds), - elapsed_time_incr (ACE_hrtime_t&nanoseconds): Instead of using - "nanoseconds >>= 10", use "nanoseconds = nanoseconds >> 10" to - work around a Borland C++Builder bug. Thanks very much to - Johnny Willemsen, Christopher Kohlhoff, and Alain Decamps - for solving this problem. - -Thu Sep 13 13:33:29 2001 Steve Huston - - * tests/Service_Config_Test.cpp: Added #include "ace/Log_Msg.h". - This was probably to get AIX to build clean, but it's been a - while. - -Thu Sep 13 12:04:04 2001 Balachandran Natarajan - - * THANKS: Added Werner Buchert to the Hall of Fame. - -Wed Sep 12 15:10:41 2001 Steve Huston - - * ace/High_Res_Timer.cpp (elapsed_time (ACE_hrtime_t&nanoseconds), - elapsed_time_incr (ACE_hrtime_t&nanoseconds): Changes to account - for very fast clocks (> 1GHz). Thank you to Derek Dominish - and Alain Decamps - for identifying the problem and coming - up with a good solution. This fixes Bugzilla #1024 (how - appropriate! ;-) - - * ace/High_Res_Timer.i (elapsed_microseconds (ACE_hrtime_t &usecs): - More adjustment to the Win32 scale factor adjusting. Thanks (again!) - to Alain Decamps for identifying and - supplying a fix for this. This fixes Bugzilla #948 (again). - -Wed Sep 12 14:33:29 2001 Steve Huston - - * tests/High_Res_Timer_Test.cpp: Incorporated some additional tests - for usec/nsec sanity checks on the calculated ACE_High_Res_Timer - values. Thank you very much to Alain Decamps - for this test. - -Tue Sep 11 12:40:01 2001 Balachandran Natarajan - - * Terror unleashed. The World Trade Center and the Pentagon - attacked today. Looks like there could be lots of loss to - precious lives. This is too horrible. We convey our condolences - to the bereaved families. God save this world. - -Tue Sep 11 06:41:31 2001 Balachandran Natarajan - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp: Fixed a - typo. This should fix most of the errors in the scoreboard. - -Mon Sep 10 18:59:24 2001 Douglas C. Schmidt - - * apps/Gateway/Peer/Peer.cpp (nonblk_put): - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (nonblk_put): - Reverted Bala's changes below since the original code was - correct. Also, added comments to clarify things to prevent - confusion in the future. - -Mon Sep 10 17:31:11 2001 Balachandran Natarajan - - * ACE-INSTALL.html: Added a new platform to the list. - -Mon Sep 10 12:54:28 2001 Balachandran Natarajan - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp: - Changed the condition that checks for EWOULDBLOCK after a - send. It was erroneously written. Thanks to Nick Pratt - for pointing this out. - -Mon Sep 10 12:36:07 2001 Balachandran Natarajan - - * apps/Gateway/Peer/Peer.cpp (nonblk_put): Changed the condition - that checks for EWOULDBLOCK after a send. It was erroneously - written. Thanks to Nick Pratt for - pointing this out. - -Mon Sep 10 08:17:08 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Will not run the File_IO test in the - Minimum CORBA configuration. - -Mon Sep 10 08:05:39 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Prevented the DLL_ORB test from running - in static builds. - -Sun Sep 9 10:20:59 2001 Balachandran Natarajan - - * */Makefile: Updated dependencies. - -Sun Sep 9 08:43:02 2001 Balachandran Natarajan - - * ace/Handle_Set.i: Added a check in set_bit () and clr_bit () for - ACE_INVALID_HANDLE. If we pass a ACE_INVALID_HANDLE we were - crashing which is not good and hence the fix. - -Sun Sep 9 08:28:52 2001 Balachandran Natarajan - - * ace/Reactor_Impl.h: - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor_Base.cpp (is_dispatchable): Added a new - method. This method, just figures out whether the buffer has any - dispatchable info or not. - - * ace/WFMO_Reactor.h: - * ace/WFMO_Reactor.cpp: Added the above method in the WFMO - Reactor. - - * ace/TP_Reactor.cpp: The handle_notify_events () method now - checks whether the buffer it has read is dispatchable or not. If - it is then it gives up the token to make an upcall. Else, it - just sits around to remove messages of the pipe, till it find - one with a dispatchable info. The fix was necessary so that - wake-up calls that are unanswered are removed of the - pipe. Unanswered wakeup calls were filling up the pipe and they - were blocking some application from writing further to the - pipe. This should be in all probability be the final fix to the - Reactor. - -Sat Sep 8 09:34:52 2001 Balachandran Natarajan - - * tests/Logging_Strategy_Test.cpp: Fixed a typo that was giving - compile errors in VXWORKS builds. - -Fri Sep 7 16:40:37 2001 Priyanka Gontla - - * ace/OS.h: - Added an if-def case for IP_MULTICAST_TTL too. - -Fri Sep 7 17:09:04 2001 Balachandran Natarajan - - * tests/Thread_Pool_Reactor_Resume_Test.cpp: Initialised the lock - to null in the constrcutor before allocating memory for - it. This was done to remove the ABW errors in - purify. This should remove the problem that we see with this - test in our daily builds with SunCC 4.2. - -Fri Sep 7 15:51:48 2001 Balachandran Natarajan - - * tests/Logging_Strategy_Test.cpp: Included Auto_Ptr.h. - -Fri Sep 07 15:29:37 2001 Yamuna Krishnamurthy - - * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp:: - * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp: - - * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp:: - * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp: - - * examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Simple/Fill_ACE_QoS.cpp: - - Fixed compile errors. - -Fri Sep 7 14:17:41 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp: Do not clear the notify handle bit when - trying to dispatch notify calls. This shoudl fix the long - pending problems with TRU 64 builds. - -Fri Sep 07 12:12:39 2001 Steve Huston - - * examples/C++NPv1/Iterative_Logging_Server.dsp: - * examples/C++NPv1/Logging_Client.dsp: - * examples/C++NPv1/Process_Per_Connection_Logging_Server.dsp: - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.dsp: - * examples/C++NPv1/Reactive_Logging_Server.dsp: - * examples/C++NPv1/Reactive_Logging_Server_Ex.dsp: - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.dsp: - Use relative paths to include and library files rather than - $(ACE_ROOT). Makes it easier to use in place regardless of - ACE version. - - * examples/C++NPv1/Logging_Client.cpp: Fixed scoping of the getline() - method call. - -Thu Sep 6 21:14:05 2001 Balachandran Natarajan - - * tests/Logging_Strategy_Test.cpp: Changed the usage of auto_ptr - <> to ACE_Auto_Basic_Ptr<>. Thanks to Carlos O'Ryan for this - suggestion. - -Thu Sep 06 18:42:39 2001 Steve Huston - - * examples/C++NPv1: New directory that contains all of the example - code for Doug/my book, C++ Network Programming, Vol 1. - -Thu Sep 6 12:01:15 2001 Priyanka Gontla - - * ace/OS.h: - Added a if-def case for IP_MULTICAST_IF. Seems like it is not - defined in some of the OS versions. - -Thu Sep 06 12:36:43 2001 Yamuna Krishnamurthy - - * ace/OS.h: - * ace/OS.i: - * ace/QoS/QoS_Session_Impl.cpp: - * ace/QoS/QoS_Session.h: - - Fixed compile errors. - -Thu Sep 6 10:24:15 2001 Ossama Othman - - * ace/Acceptor.cpp (accept_svc_handler): - * ace/Strategies_T.cpp (accept_svc_handler): - - Do not close and reopen the peer acceptor on failed attempts to - accept a connection. Several problems were fixed by removing - this code: - - - A race condition existed where another thread or process - could acquire the port that the peer acceptor was - listening on before it was closed. Note that it is not - enough to attempt to synchronize this code with a lock - since an external process could still acquire the port. - - - If the port in the peer acceptor (assuming it is an - ACE_INET_Addr based one) is the wildcard port (zero), then - there is no guarantee that the acceptor will be opened on - the same port upon which it is was previously listening. - In such a case, IORs generated by TAO (for example) can be - rendered invalid since the addressing information embedded - in those IORs will no longer contain the actual port to - connect to when making invocations. [Bug 962] - - - The above two problems actually introduced a - denial-of-service attack vulnerability (now closed by this - fix) since it was relatively easy to force a failed - connection attempt, which would then cause the peer - acceptor to be reopened on potentially a different port, - or to shutdown completely if reopening failed. - - * ace/SSL/SSL_SOCK_Acceptor.i (close): - - Invalidate the handle stored within the ACE_SSL_SOCK_Acceptor - instance. Corrects problems arising from attempts to use a - listening socket that has been shut down. - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - - Perform an OpenSSL SSL_accept() in case OpenSSL buffered data - that must be handled before entering the Reactor event loop used - to complete a non-blocking SSL passive connection. - - If the OpenSSL error status is SSL_ERROR_ZERO_RETURN shut down - the partially initialized SSL stream/session since the peer has - itself shut down. - -Thu Sep 6 11:00:46 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp: The timer events are not included as a part - of number of active handles from wait_for_multiple_events - (). The check for event_count > 0 before processing timer events - was wrong. Removed the check. Thanks to Chad Elliott for - pointing this out. - - Further did some cosmetic changes like adding comments, removing - comments that was not valid etc. - -Thu Sep 6 07:50:56 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: The AMI buffering test should not be run - Single threaded builds. - -Thu Sep 6 02:30:14 2001 Christopher Kohlhoff - - * examples/Export/Makefile.bor: - * examples/Export/export_dll.bor: - * examples/Export/test.bor: - * examples/Export/dll.h: - Added makefiles for this example and fixed a template problem with - Borland C++. Thanks to Charles Frasch for - contributing this. - -Wed Sep 5 19:48:34 2001 Priyanka Gontla - - * ace/SOCK_Dgram.cpp (set_nic): - Fixed the errors that raised in Win. - -Wed Sep 5 20:38:10 2001 Balachandran Natarajan - - * ace/OS.h: - * ace/OS.i: - * ace/QoS/QoS_Session_Impl.cpp: - * ace/QoS/QoS_Session.h: Reverted the change "Wed Sep 5 18:58:00 - 2001 Yamuna Krishnamurthy ". The change - broke builds. Further there was no reason why the QoS - information should come inside OS.* files. Talk about increasing - foot print. - -Wed Sep 5 18:58:00 2001 Yamuna Krishnamurthy - - * ace/QoS/QoS_Session.h: - * ace/QoS/QoS_Session_Impl.h: - * ace/QoS/QoS_Session_Impl.cpp: - - Added rapi_sender and rapi_reserve calls with null tspec and - flow spec respectively to facilitate the tearing down of PATH - and RESV messages. - - * ace/OS.h: - * ace/OS.i: - - Changed the sending_flowspec_ and receiving_flowspec_ members of - the ACE_QoS class to pointers so they can be initialized to null - flow specs. - -Wed Sep 5 16:50:03 2001 Balachandran Natarajan - - * THANKS: Added Peter Phillips to the Hall - of Fame. - - * ace/OS_String.cpp: Fixed a warning in TRU64 builds. - -Wed Sep 5 11:29:59 2001 Priyanka Gontla - - * ace/SOCK_Dgram.h: - * ace/SOCK_Dgram.cpp: - - Added a new method to set the NIC address in the socket. - -Wed Sep 05 12:00:42 2001 Steve Huston - - * include/makeinclude/platform_aix4_g++.GNU: Sets ACE_AIX_VERS rather - than separate major/minor; see entry below for further info. - -Wed Sep 05 11:52:39 2001 Steve Huston - - * ace/config-aix5.1.h: New config file for AIX 5L, version 5.1, - using Visual Age C++ 5. - - * ace/config-aix-4.1.x.h: - * ace/config-aix-4.2.x.h: - * ace/config-aix-4.3.x.h: - * ace/config-aix-4.x.h: Use ACE_AIX_VERS (which has both major and - minor version) rather than ACE_AIX_MAJOR_VERS and ACE_AIX_MINOR_VERS. - - * include/makeinclude/platform_aix_ibm.GNU: Rather than making - separate major/minor OS version variables, use one that incorporates - both to make it easier for config.h files to set upwardly-compatible - feature flags. - -Wed Sep 5 06:55:44 2001 Chad Elliott - - * tests/Log_Msg_Test.cpp: - - Add ACE_TEXT() around the default program name for the Windows - WChar Unicode build. - -Tue Sep 4 18:48:00 2001 Balachandran Natarajan - - * ace/Select_Reactor_Base.cpp: Changed the value returned from - ACE_Select_Reactor_Notify_Handler::handle_input (). This now - returns a 0 if we did not dispatch any handles or the number of - handles dispatched. We were returning a -1 if we did not - dispatch any handles, after reading the notification from the - pipe. This should fix the Reactor_Notify_Test in the Implicit - templates build. - -Tue Sep 4 12:46:50 2001 Balachandran Natarajan - - * ace/ACE.cpp: Reverted this change "Tue Sep 4 07:37:17 2001 - Balachandran Natarajan ". Thanks to Irfan - for pointing that this change, changes the semantics of the - methods. - -Tue Sep 4 09:14:36 2001 Chad Elliott - - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - - Work around a compiler bug in the latest Green Hills Multi200. - Casting a float to an ACE_CDR::ULong* caused internal compiler - errors if the code was inlined. - - * ace/config-vxworks5.x.h: - * include/makeinclude/platform_vxworks5.x_ghs.GNU: - - Updated support for Green Hills Multi2000. - -Tue Sep 4 07:41:42 2001 Balachandran Natarajan - - * THANKS: Added Eyal Neuman to the Hall of - Fame. - -Tue Sep 4 07:37:17 2001 Balachandran Natarajan - - * ace/ACE.cpp: Fixed a bug with recv_n_i (). The problem was form - returning the exact number of bytes from the for loop. If the - loop had executed once and if we get 0 in the next recv_i () - call, then we should be returning the number of bytes read in - the previous iteration and not 0. Thanks to Eyal Neuman - for this fix. This closes bug 1015. - -Tue Sep 4 07:08:30 2001 Balachandran Natarajan - - * ace/ACE.cpp: Fixed a unicode error in teh Win32 builds. Acted as - a dumbo when I made this change yesterday:( - -Mon Sep 3 20:08:25 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp: Fixed a warning in TRU 64 builds. - -Mon Sep 3 09:58:32 2001 Balachandran Natarajan - - * */Makefile: Updated dependencies - -Mon Sep 3 09:44:46 2001 Balachandran Natarajan - - * ace/Select_Reactor_Base.cpp: Fixed a warning in Implicit - template builds. - -Mon Sep 3 08:21:36 2001 Balachandran Natarajan - - * ace/ACE.cpp: Replaced L with ACE_TEXT_WIDE. - -Mon Sep 3 07:54:32 2001 Balachandran Natarajan - - * ace/OS_String.cpp: Fixed compile errors in win32 builds. Thanks - to Johnny Willemsen for sending in patches for replacing L with - ACE_TEXT_WIDE. - -Sun Sep 2 19:33:07 2001 Balachandran Natarajan - - * ace/Select_Reactor_Base.cpp: Fixed a small problem with the - select reactor's notify () handling mechanism. This was more of - a problem with me not checking the while () loop condition - properly. This should fix most of the reactor problems seen in - the daily builds. - -Sat Sep 1 14:10:08 2001 Douglas C. Schmidt - - * ace/System_Time.cpp, - * ace/Stream_Modules.cpp, - * ace/Service_Types.cpp, - * ace/Service_Manager.cpp, - * ace/SPIPE_Addr.cpp, - * ace/OS.cpp, - * ace/Memory_Pool.cpp, - * ace/Mem_Map.cpp, - * ace/Local_Name_Space_T.cpp, - * ace/FILE_Addr.cpp, - * ace/FIFO.cpp, - * ace/Connector.cpp, - * ace/Acceptor.cpp, - * ace/Token_Collection.cpp, - * ace/Name_Request_Reply.cpp, - * ace/Local_Tokens.cpp, - * ace/ACE.cpp, - * ace/Log_Record.cpp, - * ace/Log_Msg.cpp: Added the use of the new ACE_OS::strsncpy() - method. Thanks to Alain for reporting this. - - * ace/OS_String.{h,cpp}: Added a "safe" c string copy method: - strsncpy(dst,src,maxlen). Changing an occurence off strncpy() - to strsncpy() is less errorprone, but could break somebody's - code if he/she is using the fact that the strncpy's where - nul-padding the destination, but this is extremely - unlikely. Using strsncpy() is also almost always (a lot) faster - than strncpy(). Thanks to Alain Decamps - for this method. - -Sat Sep 1 09:54:55 2001 Balachandran Natarajan - - * tests/Bound_Ptr_Test.cpp: Added a patch from Chris Kohlhoff that - fixes the problem with VXWORKS builds. The old gcc compiler - seems to have problems with forward declared types as template - parameters. Chris solves the problem by defining a ABC properly - and making the offending class inherit from it. This should fix - our daily VXWORKS builds. - -Sat Sep 1 08:07:51 2001 Balachandran Natarajan - - * ace/Select_Reactor_Base.cpp: Fixed a compilation error in the - Notification queue portion of the code. Thanks to our daily - builds for helping me with this testing. - -Fri Aug 31 22:12:26 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp: - * ace/Select_Reactor_Base.cpp: Fixed fuzz errors. - -Fri Aug 31 22:07:57 2001 Balachandran Natarajan - - * ace/WFMO_Reactor.h: - * ace/WFMO_Reactor.cpp: Added the method read_notify_pipe () to - the WFMO_Notify_Handler. - -Fri Aug 31 19:14:52 2001 Balachandran Natarajan - - * ace/Reactor_Impl.h: Added a new method by name read_notify_pipe - (). Also changed the dispatch_notify () to take in a - Notification buffer instead of a ACE_HANDLE. - - * ace/Select_Reactor_Base.cpp: - * ace/Select_Reactor_Base.h: Made the following changes - - - Implemented read_notify_pipe (). Will read just one message from - the notify pipe or one message from the notification queue. - - - Reimplemented dispatch_notify (). This method would just - dispatch the upcall using the information in the notification - buffer. - - - The handle_input () now uses the read_notify_pipe () and - dispatch_notify () to achieve what it was doing before. - - - The notify () call now sends one notify message on the pipe - for every message in the notification queue. - - * ace/TP_Reactor.cpp (handle_socket_events): - * ace/TP_Reactor.h: - * ace/TP_Reactor.i: We had a race condition. The race condition - was because two threads were trying to read from the notify_pipe - at the same instance. This race condition was fixed by adding a - call to read_notify_pipe () with the lock held and then calling - dispatch_notify () with the buffer read after releasing the - lock. Did the following minor modifications - - - Changed dispatch_socket_events () as dispatch_socket_event () - as we were dispatching only one event. - - - We dont grab the token in the constructor of the token. We - have to make a call specfically to grab_token () to get the - token. - - The above checkins should fix the correctness of the reactor - problems that we have been seeing. - -Fri Aug 31 18:30:28 2001 Krishnakumar B - - * bin/auto_run_tests.lst: - - Added Blocking_Sync_None to the list of tests to be run on - Tru64. - - * ACE-INSTALL.html: - - Added Linux/IA64 to the list of platforms supported. - -Fri Aug 31 15:27:09 2001 Balachandran Natarajan - - * ace/Bound_Ptr.i: Fixed a problem with Sun CC42 builds. Used 1 - instead of true. - -Fri Aug 31 14:57:42 2001 Steve Huston - - * tests/MEM_Stream_Test.cpp: Fixed usage of ACE_SYNCH meta-class - to work correctly with templates. - -Fri Aug 31 11:53:05 2001 Krishnakumar B - - * ace/OS.h: - * ace/Timer_Queue_T.h: - * ace/Timer_Queue_T.h: - * ace/config-hpux-11.00.h: - * ace/config-hpux11.h: - * ace/config-irix6.x-common.h: - * ace/config-linux-common.h: - * ace/config-lynxos.h: - * ace/config-osf1-4.0.h: - * ace/config-pharlap.h: - * ace/config-sunos4-g++.h: - * ace/config-sunos4-lucid3.2.h: - * ace/config-sunos4-sun3.x.h: - * ace/config-sunos4-sun4.1.4.h: - * ace/config-sunos4-sun4.x-orbix.h: - * ace/config-sunos5.4-centerline-2.x.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos5.4-sunc++-4.x-orbix.h: - * ace/config-sunos5.4-sunc++-4.x.h: - * ace/config-sunos5.5.h: - * ace/config-tandem.h: - - Fixed up documentation of ACE_TIMER_SKEW. Fixed bogus values in - all the above files. Should help in removing some of the errors - in TAO tests. Any test in ACE/TAO which breaks because of this - change is broken and should be fixed. - -Fri Aug 31 12:00:00 2001 Steve Huston - - * tests/Bound_Ptr_Test.icc: New Visual Age C++ config for this test. - * tests/tests.icp: Added Bound_Ptr_Test.icc, Service_Config_Test.icc, - and libService_Config_DLL.icc. - -Fri Aug 31 11:40:31 2001 Steve Huston - - * tests/MEM_Stream_Test.(cpp h): Fixed single-threaded builds. - -Fri Aug 31 08:13:26 2001 Chad Elliott - - * bin/perltest2cpp.pl: - - Added a -t option to set the timeout factor. - -Thu Aug 30 18:08:32 2001 Krishnakumar B - - * ace/config-linux-common.h: - - Added some more missing stuff which might break compilations. - The previous change also removed the existing definition for - ACE_TIMER_SKEW so add it back till the new version is checked in. - -Thu Aug 30 17:54:40 2001 Krishnakumar B - - * ace/config-linux-common.h: - - This file was checked in inadvertently when checking in fixes - for ACE_NEEDS_HUGE_THREAD_STACKSIZE. - -Thu Aug 30 13:04:38 2001 Steve Huston - - * tests/run_test.lst: Added Bound_Ptr_Test. - -Thu Aug 30 11:40:39 2001 Steve Huston - - * tests/run_test.pl (run_program): Fixed the 'unlink' to get - all of a test's log files; prevents seeing previous sub-logs - from a test such as MEM_Stream_Test and falsely reporting errors. - -Thu Aug 30 10:46:51 2001 Steve Huston - - * ace/High_Res_Timer.cpp (global_scale_factor ()): When checking for - a high-res timer mechanism, don't set the global_scale_factor_status_ - away from 0 until _after_ getting the scale factor, to avoid - a second parallel thread from using a bogus value. Thanks very much - to Alain Decamps for this fix. - -Thu Aug 30 09:30:19 2001 Chad Elliott - - * tests/Log_Msg_Test.cpp: - - Fix for VxWorks when ace_main() is called with argc == 0. - - * tests/run_test.lst: - - Update the list of tests that run on VxWorks. - - * tests/Makefile: - * tests/run_test.pl: - - Update the script to output VxWorks commands to a file. - -Thu Aug 30 09:58:38 2001 Steve Huston - - * ace/High_Res_Timer.i (elapsed_microseconds): For Win32, isolate the - msec modulus before converting it up to usecs. Thanks to Francois - Rioux for reporting this. - -Thu Aug 30 00:42:41 2001 Christopher Kohlhoff - - * ace/Service_Config.cpp: - Service_Object instances are now inserted into the Service_Repository - only after they have been successfully initialised, to provide better - support for recursive use of the service configurator. With this - change, a service loaded from 'inside' another services's init() will - be inserted into the repository first and unloaded last. This ensures - that any recursively loaded services on which the original service - depends still exist when the original service's fini() function is - called. - -Thu Aug 30 00:27:05 2001 Krishnakumar B - - * ChangeLog: - - Removed bogus files from the previous entry. I should not play - around with a lot of tasks at once. - -Wed Aug 29 19:57:29 2001 Krishnakumar B - - * ace/config-osf1-4.0.h: - - Remove definition of ACE_NEEDS_HUGE_THREAD_STACKSIZE. The - default value seems to be good enough. - - * ace/config-vxworks5.x.h: - * ace/config-lynxos.h: - * ace/config-qnx-neutrino.h: - * ace/config-rtems.h: - - Standardized the values to 64KB on these platforms. Don't know - if these platforms need it. But I don't have access to any of - these so playing it safe. - - -Wed Aug 29 18:52:12 2001 Christopher Kohlhoff - - * tests/Bound_Ptr_Test.cpp: - Removed a stray asterisk that was causing compilation failures. - -Wed Aug 29 17:54:52 2001 Steve Huston - - * tests/libDLL_Test.icc: - * tests/libService_Config_DLL.icc: Fixed the "run after" directives - to correctly build the lib*.a files. Also, fixed the cleanup - directives to properly clean up both .a and shr.o files. - -Wed Aug 29 15:32:10 2001 Douglas C. Schmidt - - * ace/config-aix-4.x.h: - * ace/config-hpux-11.00.h: - * ace/config-osf1-4.0.h: Added better support for pread()/pwrite(). - Thanks to Steve Vranyes for these fixes. - -Wed Aug 29 15:47:33 2001 Steve Huston - - * tests/run_test.lst: Re-enabled MEM_Stream_Test. - -Wed Aug 29 12:15:01 2001 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added Bound_Ptr.* to the projects. - - * tests/tests.dsw: - * tests/Bound_Ptr_Test.dsp: Added a new project for - Bound_Ptr_Test. - -Wed Aug 29 11:01:22 2001 Steve Huston - - * tests/MEM_Stream_Test.cpp: Fixed a cut/paste error and now runs the - proper number of threads/processes for the MT case, avoiding a - hang. - -Wed Aug 29 07:08:23 2001 Douglas C. Schmidt - - * tests/run_tests.lst: - * tests/Makefile - * tests/Makefile.bor - * ace/Makefile - * ace/Bound_Ptr.{h,i} - * tests/Bound_Ptr_Test.cpp - * examples/Smart_Pointer: Added a pair of new smart pointer classes, - ACE_Strong_Bound_Ptr and ACE_Weak_Bound_Ptr. Thanks to - Christopher Kohlhoff for contributing - these. - -Tue Aug 28 17:51:19 2001 Steve Huston - - * tests/run_test.pl: If a test has log files associated with the - main log of the form -.log, e.g. MEM_Stream_Test-331.log - the check_log function will scan those for errors/warnings too. - -Tue Aug 28 16:48:23 2001 Balachandran Natarajan - - * ace/TP_Reactor.i: We (the current thread) should not release the - token unless we own it. This simple mistake just took 3 days to - figure out. An 'if' condition was mixing and have added - it. Shows how a small problem at lower levels can take days to - fix. - -Tue Aug 28 17:45:22 2001 Steve Huston - - * tests/MEM_Stream_Test.cpp: Fixed compile warning on gcc. - -Tue Aug 28 13:16:31 2001 Chad Elliott - - * bin/vxworks_modify.pl: - * bin/perltest2cpp.pl: - - Generated c++ files now pass the fuzz check. - -Tue Aug 28 11:02:08 2001 Ossama Othman - - * bin/nightlybuilds/builds.lst: - - Renamed the GCC 3.0 build to "Debian_GCC_3.0.1." since we're - actually compiling with GCC 3.0.1, not GCC 3.0. The latter has - bugs that prevent it from compiling ACE/TAO at the "-O3" - optimization level. - -Tue Aug 28 10:19:18 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.i (recv_i): - - Corrected Borland warning using a more efficient fix (i.e. less - function calls). - -Tue Aug 28 10:36:10 2001 Chad Elliott - - * bin/vxworks_modify.pl: - * bin/perltest2cpp.pl: - - Added these scripts for use with VxWorks and the newly added TAO - TestUtils. These scripts modify c++ and perl to generate - "one-button" modules for TAO testing on VxWorks. - -Tue Aug 28 11:07:26 2001 Steve Huston - - * tests/MEM_Stream_Test.cpp: Be sure to close the stream from the - client end. - -Mon Aug 27 20:16:38 2001 Balachandran Natarajan - - * tests/run_test.lst: Removed the MEM_Stream_Test from the daily - builds as they were hanging. This was causing the builds to - choke. I will keep Steve Huston informed on this so that he can - reenable them once he has fixed the test. - -Mon Aug 27 18:33:59 2001 Krishnakumar B - - * bin/nightlybuilds/builds.lst (WEB): - - Removed the stray yoda part of LIST which is causing the wrong - results to show up. - -Mon Aug 27 18:14:38 2001 Krishnakumar B - - * bin/nightlybuilds/builds.lst (WEB): - - Added the IA-64 builds back again. We now have a faster machine - running a better version of Linux. - -Mon Aug 27 09:39:33 2001 Balachandran Natarajan - - * ace/Timer_Queue_T.i (get_dispatch_info): - * ace/Timer_Queue_T.h: Fixed the compile problem in VXWORKS - builds. How could I forget that there are a few compilers which - cannot grok traits? - -Mon Aug 27 09:39:12 2001 Johnny Willemsen - - * examples/Makefile.bor: - * examples/NT_Service/Makefile.bor - Added BCB makefile for this example - -Sun Aug 26 22:08:32 2001 Balachandran Natarajan - - * ace/TP_Reactor.i: Reordered methods to fix warnings in TRU 64 - builds. - -Sun Aug 26 20:50:22 2001 Balachandran Natarajan - - * ace/SSL/SSL_SOCK_Stream.i: Fixed a warning (hopefully) in - Borland builds. The warning was because a temporary variable was - created. - -Sun Aug 26 20:45:24 2001 Balachandran Natarajan - - * tests/MEM_Stream_Test.cpp: Fixed a unused variable warning in - Borland. - -Sun Aug 26 08:13:12 2001 Douglas C. Schmidt - - * tests/test_config.h: Added a new ACE_CLOSE_TEST_LOG macro. Thanks to - Edan for this. - -Sun Aug 26 09:07:32 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp: Fixed a compile error with SunCC4.2 - -Sun Aug 26 08:28:09 2001 Balachandran Natarajan - - * ace/Timer_Queue_T.cpp: Fixed a warning from an unused variable - reported by KCC compilers. - -Sun Aug 26 08:13:12 2001 Douglas C. Schmidt - - * tests/Logging_Strategy_Test.cpp: Applied the following fixes from - Edan: - - - Included ace/Logging_Strategy.h - - Addition of -w switch to enable initial wipeout of logfile - - Removal of the redundant ACE_LOG_MSG->open() - - Explicitly close the previous log before applying the changes to the - ACE_LOG_MSG - - Moved remove_files() call higher, just before logfile close - - * ace/Logging_Strategy.{h,cpp}: Added the following fixes from - Edan Ayal: - - - Logging_Strategy now supports any ACE_Log_Msg, not just the - ACE_LOG_MSG singleton. - - Added a check for success (ios::goodbit) of new ofstream - creation. - - Changed default values for max_size and interval. Now the - default interval is 10 minutes (instead of 0) and the default - log file size is 0 (was 16K). The timer is now activated only - if both are non-zero. - - Added a mutator to set the ACE_Log_Msg to work with, and a - member variable - - Added definition for ACE_DEFAULT_LOGFILE_POLL_INTERVAL - - Removed definition of ACE_DEFAULT_MAX_LOGFILE_SIZE - - * ace/Log_Record.{h,cpp}: Enhanced this implementation to (1) - be consistent with recent changes to Log_Msg.h and (2) to - replace problematic use of strncpy(). Thanks to Alain - Decamps for these fixes. - -Sat Aug 25 20:58:22 2001 Nanbor Wang - - * ace/FILE_IO.i (send_n): Changed to use ACE::write_n to send the - chain of Message_Blocks. The originally used ACE::send_n was - causing problem on NT because send_n was restricted for sockets - I/O on NT. Thanks to Doug for pointing this out. - -Sat Aug 25 10:16:21 2001 Douglas C. Schmidt - - * tests/Svc_Handler_Test.cpp (main): The destructor of svc_handler - will close file_io, so we don't need to do it explicitly! - - * ace/Log_Msg.cpp (log): Changed range check from - - this->msg_ + ACE_Log_Record::MAXLOGMSGLEN - - to - - this->msg_ + sizeof this->msg_ - - to correspond to the change below. - - * ace/Log_Msg.h (ACE_Log_Msg): Increased the size of the buffer - used to store log records to account for the NUL-terminator. - - * tests/Svc_Handler_Test.cpp (main): Changed the buffer size - and NUL-terminated the buffer so that things print correctly. - Thanks to Nanbor for finding this. - -Sat Aug 25 09:00:28 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp: - * ace/TP_Reactor.h (ACE_TP_Reactor): Fixed a warning in KCC - builds. - -Sat Aug 25 08:42:57 2001 Balachandran Natarajan - - * ace/Configuration_Import_Export.cpp: Fixed warnings with g++. I - am not sure how this fix will be accepted on different - compilers. Things are always dicy when you want to delete a - void *. - -Fri Aug 24 23:29:09 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added File_IO test to our daily builds. - -Fri Aug 24 23:12:15 2001 Balachandran Natarajan - - * ace/WFMO_Reactor.h: - * ace/WFMO_Reactor.cpp (dispatch_notify): Fixed a compile error on - MSVC. - -Fri Aug 24 23:07:42 2001 Balachandran Natarajan - - * ace/Configuration_Import_Export.cpp: Fixed a compile error with - g++. - -Fri Aug 24 21:55:00 2001 Craig Rodrigues - - * ace/QoS/QoS_Session_Impl.cpp: - Check for null parameters in rsvp_callback(). - Thanks to Yamuna Krishnamurthy . - -Fri Aug 24 20:32:39 2001 Steve Huston - - * tests/MEM_Stream_Test.cpp: Changed this test to use multiple - processes on any platform without ACE_LACKS_FORK. It actually - could be broader than this if desired. This is motivated by the - fact that HP-UX can't mmap() (the call underlying ACE_MEM_IO) - the same file more than once in the same process. With this, - MEM_Stream_Test goes a lot better on HP-UX, though not perfectly - yet. - -Fri Aug 24 16:54:02 2001 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.h (recv_i): - - Added a timeout parameter. See below for details. - - * ace/SSL/SSL_SOCK_Stream.i (recv_i): - - Perform an SSL_read() before attempting to block on select() - with a timeout. OpenSSL may buffer more data than requested - since it is a record-oriented protocol. Fixes a problem where - subsequent calls to ACE_SSL_SOCK_Stream::recv() could timeout - when needlessly blocking on select() because the expected data - has already been buffered by OpenSSL. Thanks to Martin - Krumpolec for reporting and diagnosing the - problem. [Bug 1006] - - * ace/SSL/SSL_SOCK_Stream.cpp (recv): - - Moved the timed recv() code to the lower level recv_i() method - since timeout support must now be more tightly integrated with - do/while(SSL_pending()) SSL_read() loop. - -Fri Aug 24 18:33:09 2001 Douglas C. Schmidt - - * ace/Parse_Node.cpp (ACE_Function_Node): Make sure to dynamically - allocate the pathname_ so we can delete it! Thanks to - Don Hinton for reporting this. - - * ace/Configuration_Import_Export.cpp: Changed a couple of - delete (char *) buf to delete (char *) [] buf. Thanks to - Don Hinton for reporting this. - -Fri Aug 24 16:10:20 2001 Balachandran Natarajan - - Merged in changes from the reactor_deadlock branch. This set of - changes actually fixes a long standing problem with the - TP_Reactor. The TP_Reactor was holding the token too long and - this created all sorts of problems for TAO. The changes have been - merged from the branch and here are the relevant - ChangeLog entries. - - Fri Aug 24 14:59:52 2001 Balachandran Natarajan - - * ace/TP_Reactor.cpp (dispatch_socket_events): Cosmetic changes. - - Fri Aug 24 14:19:02 2001 Balachandran Natarajan - - * ace/Timer_Queue_T.i: - * ace/Timer_Queue_T.h:Removed the default constructor and - destructor for ACE_Timer_Node_Dispatch_Info_T allowing the - compiler to do the job. - - Fri Aug 24 12:05:25 2001 Balachandran Natarajan - - * ace/Timer_Queue_T.cpp: Removed some vague debug statements. - - Fri Aug 24 11:34:11 2001 Balachandran Natarajan - - * ace/Timer_Queue_T.h: - * ace/Timer_Queue_T.cpp: - * ace/Timer_Queue_T.i: Added a new class - ACE_Timer_Node_Dispatch_Info_T that has the dispatch information - needed to make the upcall. Added methods, dispatch_info () and - dispatch_info_i () in ACE_Timer_Queue_T. These methods return - the dispatch information if there is a node in the queue whose - timer value <= current time. Changed the expire () method to use - this method to get dispatch information. - - * ace/Timer_Queue.h: Added a template specialisation for - ACE_Timer_Node_Dispatch_Info_T. - - * ace/Timer_Queue.cpp: Added template instantiations for the - specialisation. - - * ace/TP_Reactor.h: - * ace/TP_Reactor.cpp: Added a new method handle_timer_events () - that would handles timer events. - - Thu Aug 23 11:50:18 2001 Balachandran Natarajan - - * ace/Reactor_Impl.h: Added two new methods notify_handle () and - dispatch_notify () to the ACE_Reactor_Impl class. - - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor_Base.cpp: Implemented the above two - methods in the ACE_Select_Reactor_Notify class. The - notify_handle () method returns the handle of the pipe on which - it is listening. The dispatch_notify () call does a dispatch of - just one notify () call in the notify pipe. The handle_input () - call that used to process all the notify calls now calls the - dispatch_notify () in a loop. The change essentially allows - some extrenal client of this class to just process one notify at - a time if needed. - - * ace/TP_Reactor.h: - * ace/TP_Reactor.i: - * ace/TP_Reactor.cpp (handle_events): Fixed a bug with - handle_events (ACE_Time_Value &). This should be calling the - handle_events () of the TP_Reactor and not the select reactor. - - Added a whole slew of new methods that basically allows us to do - this - - handle one event at a time - - - once the thread knows the event that needs handling it should - release the token before dispatching the events - - The new methods that have been added are - - - handle_signals (), which handle signals that interrupted the - select (). The implementation of this method is busted. The - implementation has been copied from the existing setup - - - handle_notify_events (), which handles one notify on the - notify_pipe at a time - - - handle_socket_events (), which handles socket events. - - Quite a few helper methods have also been added. They are - get_notify_handle (), get_socket_event_info (), and - dispatch_socket_events (). Removed the methods dispatch_i (), - dispatch_i_protected () and notify_handle (). This checkin fixes - the problem in 1002. But we still have to add handling timeouts - into the TP_Reactor. - - - Tue Aug 21 17:21:07 2001 Balachandran Natarajan - - * ace/TP_Reactor.i: - * ace/TP_Reactor.h: - * ace/TP_Reactor.cpp: Made lots of changes which havent been - compiled yet. Added a new class ACE_TP_Token_Guard that helps - in obtaining and releasing tokens. Moved the grab_token () from - the ACE_TP_Reactor class to the TP_Token_Guard class. Added a - new method for handling signals. They havent been compiled yet - and this checkin is to put files from work to my home box. - - Tue Aug 21 07:58:42 2001 Balachandran Natarajan - - * ace/TP_Reactor.i: - * ace/TP_Reactor.h: - * ace/TP_Reactor.cpp (handle_events): Started refactoring some of - the code to help with this bug. This change has not been - compiled. This is just being done to transfer files from home - to work. - -Fri Aug 24 14:25:31 2001 Balachandran Natarajan - - * THANKS: Added Massimo Pichini to the - Hall of Fame. - -Fri Aug 24 13:40:01 2001 Balachandran Natarajan - - * bin/nightlybuilds/builds.lst: Removed HPUX and AIX_VAC for the - timebeing. Looks like OCI is running different versions of the - OS for their internal use. - -Fri Aug 24 10:17:00 2001 Balachandran Natarajan - - * ace/Log_Msg.cpp (log_hexdump): Added a patch provided by Massimo - Pichini . This prevents overflows with - long strings that are used in printing hexdumps. Previously we - had a buffer of 80 bytes on the stack. - -Fri Aug 24 10:03:29 2001 Steve Huston - - * ace/INET_Addr.(h cpp): Applied changes submitted by - Alain Decamps to insure that - get_host_name (char hostname[], size_t len) const always - nul-terminates the hostname string. If the host lookup is - successful, but the supplied buffer is too short, the function - returns -1, errno == ENOSPC. - -Thu Aug 23 22:01:11 2001 Balachandran Natarajan - - * tests/Logging_Strategy_Test.cpp: Reverted this change "Thu Aug - 23 05:24:57 2001 Douglas C. Schmidt" as this was giving - warnings with MSVC 6.0 - -Thu Aug 23 11:49:15 2001 Paul Calabrese - - * bin/msvc_auto_compile.pl: - - Revert changes from Mon Aug 20 15:48:30 2001. - Thanks to Darrell to showing me the error in my ways. - -Thu Aug 23 09:17:25 2001 Balachandran Natarajan - - * ace/Log_Msg.cpp (file): Reduced the number of bytes copied in - ACE_Log_Msg::file () and ACE_Log_Msg::msg () by one. Thanks to - Alain Decamps for pointing this out. - -Thu Aug 23 08:11:22 2001 Steve Huston - - * ace/Configuration_Import_Export.cpp (process_previous_line_format): - Prepend ACE_OS:: to atoi to work with both narrow and wide chars. - -Thu Aug 23 08:03:00 2001 Craig Rodrigues - - * ace/QoS/QoS_Session_Impl.cpp: - Improve debugging messages. Return -1 inside rsvp_callback() - if flowspec type is unknown. - -Thu Aug 23 05:24:57 2001 Douglas C. Schmidt - - * tests/Logging_Strategy_Test.cpp: Added new and improved test that - it better documented and fixes some minor bugs. Thanks to - Edan Ayal for this. - -Wed Aug 22 19:04:57 2001 Douglas C. Schmidt - - * tests/Logging_Strategy_Test.cpp: Enable this test to work - on platforms that don't support DLLs. Thanks to Edan Ayal - for suggestion this and providing the code. - - * tests/Logging_Strategy_Test.cpp (parse_args): Changed 'n' for 'N' - since that controls the max number of log files. Thanks to Edan - Ayal for reporting this. - -Thu Aug 23 07:30:12 2001 Johnny Willemsen - - * ace/SString.{h,i}: Added clear() method to the ACE_CString and - ACE_WString so that it is possible to clear a string in just one - call - * tests/SString_Test.cpp: Extended to test clear() method - -Wed Aug 22 15:30:05 2001 Carlos O'Ryan - - * bin/auto_compile: - Use the print_config.pl script to print out the configuration. - -Wed Aug 22 17:33:29 2001 Steve Huston - - Applied fixes submitted by Jerry D. Odenwelder, to fix - Bugzilla #953: - - * ace/Configuration.cpp (import_config, export_config): Changed - from using a ACE_Ini_ImpExp object to an ACE_Registry_ImpExp - to preserve type information in the import/export files, and - retain the ability to read an ACE 5.1-format file (with the - changes next...) - - * ace/Configuration_Import_Export.(h cpp): Added a new - ACE_Registry_ImpExp::process_previous_line_format() method that - knows how to read an ACE 5.1-format config line. If - ACE_Registry_ImpExp::import_config finds a line that does not - begin with one of <"[#;> it calls process_previous_line_format - to try to convert it using ACE 5.1-format rules. - Note that the auto conversion works on import. If the - object is subsequently exported, the new registry format - will be used to write the file, effectively updating it - from old to new format. - -Wed Aug 22 12:04:04 2001 Douglas C. Schmidt - - * ace/WFMO_Reactor.h (ACE_WFMO_Reactor): Clarified that the - work_pending() method isn't implemented and suggest what to do - for a workaround. Thanks to Michelangelo Riccobene - (michelangelo.riccobene@marconi.com) for reporting this. - -Wed Aug 22 10:38:08 2001 Carlos O'Ryan - - * bin/nightlybuilds/print_config.pl: - Add new perl script to print out the build configuration, the - script will be shared by the Unix and Win32 builds. - -Wed Aug 22 11:30:13 2001 Joe Hoffert - - * ace/OS_Memory.h: - Removed include of pace/stddef.h. PACE does not have this - file. There are no POSIX functions that typically reside - in this header. Maybe PACE will need this later but it - doesn't now. - - * ace/OS.h (ACE_cond_t): - Modified #if guard to include ACE_cond_t class if we're - on Win32. If we're using PACE then we don't want this method - (since PACE takes care of it) unless we're on Windows. Win32 - mutexes, semaphores, and condition variables are not yet - supported in PACE. - - * ace/OS.cpp (ACE_OS::cond_destroy): - Modified #if guard to include ACE_cond_t::cond_destroy - if we're on Win32. If we're using PACE then we don't want - this method (since PACE takes care of it) unless we're on - Windows. Win32 mutexes, semaphores, and condition variables - are not yet supported in PACE. - - * ace/OS.i (ACE_OS::waiters): - Modified #if guard to include ACE_cond_t::waiters if - we're not on Win32. If we're using PACE then we want - this method (since PACE defines cond_t) unless we're - on Windows. Win32 mutexes, semaphores, and condition - variables are not yet supported in PACE. - -Tue Aug 21 08:26:30 2001 David L. Levine - - * docs/ACE-guidelines.html: changed the example referenced - in: - Sun Aug 19 08:17:14 2001 David L. Levine - to be a bit more realistic. - -Tue Aug 21 06:58:49 2001 Balachandran Natarajan - - * ace/Log_Msg.cpp: Fixed problematic uses of strncpy. Thanks to - Alain Decamps for giving this patch. - -Tue Aug 21 10:40:12 2001 Johnny Willemsen - - * ace/Map.i: Made the return value of ACE_Incremental_Key_Generator - getCurrentValue() const - - * ace/Map_Manager.*: Added a const iterator for the - ACE_Map_Manager - -Mon Aug 20 18:20:51 2001 Steve Huston - - * ace/Process.cpp (pass_handle): Only try to compile the - DuplicateHandle stuff when !ACE_HAS_WINCE... I think it's - right this time... - -Mon Aug 20 15:54:46 2001 Douglas C. Schmidt - - * ace/SUN_Proactor.cpp: Removed the instantiation of - ACE_Condition. Thanks to David Trusty - for reporting this. - -Mon Aug 20 15:48:30 2001 Paul Calabrese - - * bin/msvc_auto_compile.pl: - - Modify script to print config.h contents. - -Mon Aug 20 13:14:00 2001 Carlos O'Ryan - - * bin/auto_compile: - Fixed chdir commands for the auto_compile scripts. - -Mon Aug 20 14:33:31 2001 Douglas C. Schmidt - - * ace/Message_Queue_T.cpp: If we timeout in the semaphore implementation - of the message queue in wait_not_full_cond() or - wait_not_empty_cond() make sure to decrement the "waiters" count - accordingly! Thanks to Patrick Rabau - for noticing this in the C++NPv1 book version! - -Mon Aug 20 07:01:31 2001 Douglas C. Schmidt - - * ace/Synch_T.i (release): If owner_ == -1 then return - -1. Thanks to Don Hinton for suggesting this. - -Mon Aug 20 13:18:51 2001 Steve Huston - - * ace/SOCK.h: Corrected comment on ACE_SOCK ctor being protected, - not private. Thanks to Don Hinton for - pointing this out. - - * THANKS: Added Don Hinton to the Hall of Fame. - -Mon Aug 20 11:00:50 2001 Chad Elliott - - * ace/OS.h: - - Set the ACE_DEFAULT_FILE_PERMS to the correct value for VxWorks. - - * tests/run_test.lst: - - Removed tests for VxWorks for which the platform has no support. - - * tests/CDR_File_Test.cpp: - * tests/Svc_Handler_Test.cpp: - - Add VxWorks to the list of platforms that can't unlink the file - in advance of the test completing. - -Mon Aug 20 01:49:12 2001 Christopher Kohlhoff - - * include/makeinclude/build_dll.bor: - Build non-core DLLs into the common bin directory. This is necessary - so that the tests can find all the DLLs they need on the path. - - * tests/run_test.pl: - Removed the append of the ExeSubDir to the path, since it is no - longer needed and never really worked properly anyway. - -Mon Aug 20 00:01:29 2001 Steve Huston - - * ace/SOCK_Connector.h: Clarify the conditions under which errno - will be ETIME (caller-specified timeout expires w/o connect) - vs. ETIMEDOUT (protocol layer timed out the connect). - - * ace/SOCK_Connector.cpp: Add "|| errno == ETIME" to a couple - places where an ACE_ERROR is _not_ done for certain conditions. - - * ace/ACE.cpp (handle_timed_complete): If the user-specified timeout - expires before the connect is resolved one way or the other, - set errno to ETIME, not ETIMEDOUT. This makes it match the - documented behavior in the ACE_SOCK_Connector man page. - -Sun Aug 19 20:33:39 2001 Carlos O'Ryan - - * bin/nightlybuilds/builds.lst: - Update build list - -Sun Aug 19 15:36:23 2001 Carlos O'Ryan - - * bin/auto_compile: - Add new 'Config' section at the end of the build, useful for the - next generation scoreboard. - -Sun Aug 19 13:25:51 2001 Carlos O'Ryan - - * bin/footprint_stats.sh: - * bin/performance_stats.sh: - * bin/generate_footprint_chart.sh: - * bin/generate_performance_chart.sh: - * html/Stats/Stats.css: - * html/Stats/configuration.shtml: - * html/Stats/detailed_footprint.shtml: - * html/Stats/detailed_performance.shtml: - * html/Stats/footer.html: - * html/Stats/index.shtml: - * html/Stats/navigation.html: - Put the scripts and HTML documents used to generate the Stats - pages under CVS control. Now it is easier for people to add - their own libraries and tests, as well as let our user community - examine the way the pages are generated. - - * bin/auto_run_tests.lst: - Remove TAO/tests/LongUpcalls/run_ami_test.pl, the tests have - been incorporated into the run_test.pl script. - - * bin/sandbox.cpp: - Minor changes to the sandbox script, actually not very useful, - the ACE classes to create processes start a new process group by - default, therefore there is no simple way to kill all the - subprocesses if a test fails. - -Sun Aug 19 08:17:14 2001 David L. Levine - - * docs/ACE-guidelines.html: replaced function call in - ASSERT with simple comparison of a variable value. Thanks - to Tino Schwarze - for suggesting this. - -Sat Aug 18 18:26:24 2001 Balachandran Natarajan - - * ace/ACE.cpp: Removed the ASYS_INLINE macro from the definition - of write_n (). - -Sat Aug 18 13:18:10 2001 Douglas C. Schmidt - - * ace/ACE.{h,cpp}: Added a new write_n(...ACE_Message_Block *...) - for file transfers that's the dual of - send_n(...ACE_Message_Block *...). This helps out the C++NPv1 - book symmetry. Thanks to Alain Decamps - for motivating this. - -Fri Aug 17 18:17:38 2001 Douglas C. Schmidt - - * bin/clone.cpp: Only use extern char *sys_errlist[] if we're not - compiling on Linux. Thanks to Thomas Groth - for reporting this. - -Fri Aug 17 19:04:31 2001 Steve Huston - - * ace/Process.cpp (ACE_Process_Options::pass_handle): For WinCE, - just do ACE_NOTSUP_RETURN (-1). It can't dup a handle. - -Fri Aug 17 16:56:16 2001 Jeff Parsons - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - - Added wr_ptr() accessor method to ACE_InputCDR, and added its - use to adjust(), align_read_ptr(), read_1(), skip_string() and - skip_bytes() instead of end(). Also added reset of good_bit_ - to 0 upon failure in read_string() and read_wstring(). Thanks to - Peter Phillips for reporting this bug, - which was causing excessive memory allocation is some cases. - [Bug 591, 944, 983] - -Fri Aug 17 13:31:45 2001 Chad Elliott - - * tests/run_test.pl: - - Added the ability to generate windsh commands to load and run - the ace tests. - - * tests/Makefile: - - Added a rule to generate run_test.vxworks, using run_test.pl, - which can be used to run the tests selected for the VxWorks OS. - - * tests/run_test.lst: - - Update this list to take into account the limitations of VxWorks. - - * tests/test_config.h: - - Change the permissions of the log file open (for VxWorks only) to - use the symbolic permission names instead of 0x644. The - permissions differ from the standard UNIX modes. - - * tests/run_tests.vxworks: - - This file was out of date and no longer needs to be maintained. - So, it has been removed. - -Fri Aug 17 09:44:49 2001 Balachandran Natarajan - - * ace/Map_T.{h,i}: Reverted this change "Fri Aug 17 08:07:12 2001 - Johnny Willemsen " as this was giving too - much of warnings in the builds. - -Fri Aug 17 09:30:34 2001 Balachandran Natarajan - - * gperf/apps/tests/Makefile: Fixed the problem that was causing - the builds to fail. - -Fri Aug 17 08:07:12 2001 Johnny Willemsen - - * ace/Map_T.(h i): made the return value of - ACE_Incremental_Key_Generator::current_value const T& instead - of T&. Added uppercase traits to the ACE_Map class. - -Thu Aug 16 19:27:29 2001 Steve Huston - - * ace/Process.cpp (ACE_Process_Options::pass_handle): Add - "::" to front of "DuplicateHandle" so the WinCE compiler - sees the right function. - Also added ctor/dtor for ACE_Managed_Process to try and fix the - can't find vtable error on Linux. - - * ace/Process.h: Added a constructor for ACE_Managed_Process - to fix "can't find vtable" error on Linux. - - * ace/Process.i: Moved ACE_Managed_Process dtor to .cpp file. - -Thu Aug 16 15:10:42 2001 Steve Huston - - * ace/Process.h (pass_handle): Clarify comments for this method. - - * ace/Process_Manager.cpp: - * ace/Process.(h i): Moved the ACE_Managed_Process class out - of Process_Manager.cpp, exposing it for general use. - -Thu Aug 16 10:34:20 2001 Douglas C. Schmidt - - * ace/POSIX_Proactor.cpp (allocate_aio_slot): Added a fix so that - the POSIX Proactor compiles with FreeBSD 4.4. Thanks to Yev - Omenzel for reporting this and to Craig - Rodrigues for fixing it and to - John E Hein for fixing the fix ;-) - -Thu Aug 16 08:09:53 2001 Chad Elliott - - * tests/run_test.lst: - - Added the OTHER requirement to the Thread_Pool_Reactor_Test and - the Thread_Pool_Reactor_Resume_Test. These are only built if - OTHER is part of the ACE components list. - - -Wed Aug 15 15:50:38 2001 Douglas C. Schmidt - - * ace/WFMO_Reactor.cpp: Don't try to purge the notifications if - notify_handler_ is 0. Thanks to Edan Ayal - for reporting this. - -Wed Aug 15 11:33:26 2001 Carlos O'Ryan - - * bin/nightlybuilds/builds.lst: - Remove one build from the list, the machine is being retargeted - for performance testing. - -Wed Aug 15 11:10:22 2001 Balachandran Natarajan - - * include/makeinclude/wrapper_macros.GNU: Added $(VDIR) for - OBJDIRS. This prevents hardcoding the value of OBJDIRS. This has - been tested for a dynamic and a static library on Linux. If - there are other platforms that gives problems, please feel free - to revert the changes to the version 4.114 of the file. - -Wed Aug 15 09:35:19 2001 Chad Elliott - - * ace/Dirent_Test.cpp: - - Added #define's for VXWORKS that allow this test to function - properly. Avoid hard-coded relative paths that may not exist on - VxWorks. - -Wed Aug 15 09:08:40 2001 Chad Elliott - - * ace/Sock_Connect.cpp: - - Added an implementation to ACE_Sock_Connect::get_ip_interfaces(). - With this, the Enum_Interfaces_Test works correctly. - -Wed Aug 15 07:54:49 2001 Balachandran Natarajan - - * include/makeinclude/wrapper_macros.GNU: Unravelled the mystery a - bit. The patch that was applied to remove the hard coding of - OBJDIRS seems to be the problem. The OBJDIRS has been hardcoded - again. This should fix the problems that we have been seeing in - the builds. If at all we need to remove hardcoding the OBJDIRS, - we either need to put the value of VDIR or VSHDIR. If we put - both we are going to end up with duplicate targets. Now the - killer, what do we add to the OBJDIRS? Me thinks it is VDIR. I - have test that out else I would be breaking builds again. - -Wed Aug 15 07:30:00 2001 Balachandran Natarajan - - * include/makeinclude/wrapper_macros.GNU: Reverted the change "Tue - Aug 14 21:42:24 2001 Balachandran Natarajan". Thought that was a - typo. But looks like it is not. - -Wed Aug 15 06:39:50 2001 Balachandran Natarajan - - * ace/Process.cpp: Fixed a warning with g++. - -Tue Aug 14 23:57:42 2001 Steve Huston - - * A set of changes to encapsulate passing handles to spawned - processes. Thanks very much to Eamonn Saunders - for suggesting that this could work - and pointing out the Win32 details! - - * THANKS: Added Eamonn Saunders to the Hall of Fame - - * ace/Handle_Set.h: Replace include ace/ACE.h with ace/OS.h. This - class is part of the OS subset. - - * ace/Process.h: Added the following methods: - - ACE_Process_Options::pass_handle (ACE_HANDLE). Cause the specified - handle to be passed to a child process when it's spawned. Has - meaning mainly for Win32. The handle value will be included - in the spawned process's command line as +H . The passed - handle value will be duplicated if on Win32 less than NT4. - - - ACE_Process_Options::dup_handles (ACE_Handle_Set set) const - Get a copy of the handles the ACE_Process_Options duplicated - for the spawned process. - - - ACE_Process_Options::passed_handles (ACE_Handle_Set set) const - Get a copy of the handles passed to the spawned process. This - will be the set of handles previously passed to pass_handle(). - - - ACE_Process::close_dup_handles (). Close all the handles in - the set obtained from ACE_Process_Options::dup_handles. - - - ACE_Process::close_passed_handles (). Close all the handles in - the set obtained from ACE_Process_Options::passed_handles. - - Also moved the avoid_zombies() functions and flag out of the - non-Win32 section - it can safely be ignored, maintain the - intended semantics, and help apps stay portable. - - * Process.cpp: Implement the above new methods. Also, after spawning - a process, the parent will call the above dup_handles/passed_handles - methods to get any passed handles. The close_*_handles() methods - can then close them. Also, the destructor will call close_dup_handles - to be sure that no handles leak on Win32 less than NT4. - - * Process.i (command_line_buf ()): Added a new arg to receive the - maximum length of the buffer pointed to on return. To maintain - backward compatibility, the arg defaults to 0 (don't return - the max length). - - * ace/Makefile: Moved Handle_Set from the UTILS group to the OS group. - - * ace/ace.icc: Moved Handle_Set from DEMUX to OS. - - * docs/ACE-subsets.html: Move Handle_Set from DEMUX to OS. - -Tue Aug 14 21:42:24 2001 Balachandran Natarajan - - * include/makeinclude/wrapper_macros.GNU: Fixed a typo. - -Tue Aug 14 21:30:04 2001 Balachandran Natarajan - - * apps/Makefile: Removed JAWS2 and JAWS from the Makefile. There - are several reasons for reverting. This breaks the builds. The - Makefiles in the recursed directories are all messed up. The - library dependencies doesnt seem trivial. Nobody may have time - to fix this. Further, our daily builds return too quickly and we - just needed more files to compile :-). - -Tue Aug 14 14:19:49 2001 Steve Huston - - * ace/Memory_Pool.i (ACE_Local_Memory_Pool dtor): Call release() - here to free up the blocks allocated by the pool, else they're - stranded and can't be freed. - - * ace/Memory_Pool.cpp (ACE_Local_Memory_Pool::release): After - freeing up the blocks, reset the allocated_chunks_ set to be - sure they are also freed, and the chunks can't be freed again. - -Tue Aug 14 14:19:37 2001 Balachandran Natarajan - - * ace/Log_Msg.cpp: Applied the patches sent by Tibor Kiss - for ACE_Log_Msg::close () - -Tue Aug 14 13:55:42 2001 Balachandran Natarajan - - * include/makeinclude/platform_macosx.GNU: Added a patch from John - Michael Zorko . - -Tue Aug 14 10:21:39 2001 Steve Huston - - * ace/Log_Msg.h: Clarified the defaults for the per-process and - per-instance default priority masks. - -Mon Aug 13 14:01:35 2001 Douglas C. Schmidt - - * include/makeinclude/wrapper_macros.GNU: Fixed some hard-coded - uses of .shobj and .obj. Thanks to Shashi Bhushan - for contributing these. - - * ace/CDR_Stream.h: Added comments warning about the deletarious - effects of not aligning buffers to ACE_InputCDR and - ACE_OutputCDR properly. Thanks to Alain Decamps - for reporting this. - -Sun Aug 12 14:46:07 2001 Douglas C. Schmidt - - * ace/OS.cpp (sched_params): Make sure to set errno for Win32 so - that callers can figure out what's going wrong in a consistent - way. - - * ace/Select_Reactor_Base.i (purge_pending_notifications): Don't - try to purge the notifications if notify_handler_ is 0. thanks - to Steve Rahn for reporting this. - -Mon Aug 13 20:09:04 2001 Balachandran - - * ACE version 5.1.19 released. - -Sun Aug 12 02:17:01 2001 Nanbor Wang - - * ace/MEM_Acceptor.cpp: - * ace/MEM_Connector.cpp: On non-Win32 platforms, disable - multithreaded MEM_IO if _ACE_USE_SV_SEM is defined. - -Sun Aug 12 01:27:51 2001 Steve Huston - - * tests/Log_Msg_Test.cpp: Correct const-ness of a pointer - retrieved from ACE_Log_Record::msg_data(). - -Sun Aug 12 00:34:42 2001 Steve Huston - - * ace/Log_Record.h: - * ace/Log_Record.i (msg_data()): Changed ACE_TCHAR *msg_data() - to: const ACE_TCHAR *msg_data (void) const. Makes it safer, - and conforms to all current usage inside ACE. Also makes - C++ Network Programming examples simpler :-) - -Sat Aug 11 09:01:11 2001 Douglas C. Schmidt - - * ace/Thread.h: - * ace/Task.h: Added a list of other flags that can be passed to - activate(). - -Fri Aug 10 19:39:48 2001 Krishnakumar B - - * bin/auto_run_tests.lst: - - Disabled the Blocking_Sync_None test from running under Tru64. - Also changed the config parameter passed to the auto_compile - script from TRU_64 to Tru64 in - ~bugzilla/bin/auto_compile_tru64_cxx. - - This is so that the test is disabled only for the WashU builds. - The reason being that Bala was not too happy with changing the - default values for all the platforms and we also wanted to avoid - more #ifdefs in the code. Other builds might have better values - and the test might succeed. Have to confirm this though. - -Fri Aug 10 17:59:47 2001 Nanbor Wang - - * ace/Svc_Conf_y.cpp: - * ace/OS.h: Added /**/ between #include and and - to avoid warning from CE compiler. - - * ace/ace_dll.vcp: Added Svc_Conf_Lexer_Guard.* to the project. - -Fri Aug 10 13:40:46 2001 Chad Elliott - - * bin/nightlybuilds/builds.lst: - - I didn't realize the LIST definition was needed. I have - added it for the Tru64 4.0f Compaq C++ 6.3-10 build. - -Fri Aug 10 11:45:03 2001 Chad Elliott - - * bin/nightlybuilds/builds.lst: - - Added the Tru64 4.0f Compaq C++ 6.3-10 build. - -Fri Aug 10 11:06:23 2001 Chad Elliott - - * apps/drwho/CM_Client.cpp: - * apps/drwho/CM_Server.cpp: - * apps/drwho/server.cpp: - - Changes to avoid warnings on HP-UX with aCC. - -Thu Aug 9 16:56:05 2001 Balachandran Natarajan - - * ace/Hash_Map_Manager_T.i: - * ace/Hash_Map_Manager_T.cpp: We seem to be re-inventing wheels - again and again. A few months back we had a show stopper in a - beta which was caused by usage of static cast. The cast was not - to the liking of SunCC 4.2. Looks like we had to change a bunch - of static cast sprayed in these two files to a C style cast as - 4.2 doesnt like them. Compilers like Borland handle these - better, but not 4.2. - -Thu Aug 9 11:51:10 2001 Balachandran Natarajan - - * include/makeinclude/platform_hpux_aCC.GNU: On popular mandate we - have the -w flag removed from CCFLAGS in the above file. Looks - like the -w disables lots of warnings that may be useful. - -Thu Aug 9 11:41:01 2001 Balachandran Natarajan - - * ace/CDR_Stream.h (ACE_OutputCDR): Fixed the ambigous constructor - problem. The InputCDR class had two constructors which were - similar if the default values for the arguments were - exercised. Thanks to Torbjorn Backstrom - for reporting this. - -Thu Aug 9 12:31:21 2001 Douglas C. Schmidt - - * ace/OS_String.cpp (strtok_r_emulation): Make sure to check - for a NULL return from strtok() before calling strlen()! Thanks - to Boris Sukholitko for reporting this. - -Wed Aug 08 21:27:50 2001 Ossama Othman - - * bin/nightlybuilds/builds.lst (Debian_Wchar, Debian_GCC_3.0): - - The host these nightly builds were built on is now called - "rumba" (previously "valinor"). Updated the build list - accordingly. - -Wed Aug 08 21:19:09 2001 Ossama Othman - - * tests/Service_Config_Test.UTF-16.conf: - - Removed extraneous characters from this file that were causing - the Service Configurator's underlying lexer to "choke." - -Wed Aug 8 16:23:31 2001 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Add the AMI_Buffering tests to the nightly regression testsuite. - -Wed Aug 8 16:07:26 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: The GIOP lite tests will not work in the - static builds. It was adding more complications to the test - than what is already there to get it working for the static - builds. - -Wed Aug 8 14:06:36 2001 Krishnakumar B - - * ace/config-tru64.h: - - Define ACE_HAS_NONSTATIC_OBJECT_MANAGER for all DEC Unix 4.x - versions. - - * ace/config-cxx-common.h: - - Define ACE_AUTO_PTR_LACKS_RESET if __DECCXX_VER == 60190027. - Thanks to Robert Burke for reporting - this. - - * include/makeinclude/platform_osf1_3.2.GNU: - * include/makeinclude/platform_osf1_4.0.GNU: - * include/makeinclude/platform_osf1_4.0_g++.GNU: - * include/makeinclude/platform_osf1_4.0_kcc.GNU: - * include/makeinclude/platform_osf1_4.0_rcc.GNU: - - Removed the following files. - - * include/makeinclude/platform_osf1_3.2_cxx.GNU: - * include/makeinclude/platform_osf1_4.x_cxx.GNU: - * include/makeinclude/platform_osf1_4.x_g++.GNU: - * include/makeinclude/platform_osf1_4.x_kcc.GNU: - * include/makeinclude/platform_osf1_4.x_rcc.GNU: - - Added new versions of the removed files. - - * include/makeinclude/platform_tru64_pre.GNU: - * include/makeinclude/platform_tru64_post.GNU: - - Moved a lot of duplicated code into these new files. - - * include/makeinclude/platform_tru64_cxx.GNU: - * include/makeinclude/platform_tru64_g++.GNU: - * include/makeinclude/platform_tru64_kcc.GNU: - - Removed a lot of old *cruft* like setting up compilation with - cxx when gcc was asked for etc. etc. Somebody went overboard - with cut'n paste and copied David's changes blindly. Still not - completely satisfied. But it works and is better than before. - This also fixes Bug Id 989. - -Wed Aug 08 11:30:26 2001 Ossama Othman - - * tests/Service_Config_Test.cpp (run_test): - - Don't check if "ACE_USES_WCHAR == 1" since some configurations - neglect to set it an integer value. Instead, just check if it - is defined. - -Wed Aug 8 12:31:51 2001 Balachandran Natarajan - - * tests/MEM_Stream_Test.cpp: Changed a ACE_DEBUG statment with an - LM_WARNING to an LM_DEBUG. - -Wed Aug 08 11:59:45 2001 Nanbor Wang - - * ace/OS.h: Do not redefine ACE_IOV_MAX if it has already been - defined. - -Wed Aug 8 06:21:24 2001 Douglas C. Schmidt - - * ace/Makefile: Moved Message_Block from STREAMS_FILES to - UTILS_FILES. - - * ace/OS_Dirent.inl (closedir): Changed delete d->directory_name_ to - delete [] d->directory_name_. Thanks to Olivier Brunet - for reporting this. - -Tue Aug 7 21:59:42 2001 Douglas C. Schmidt - - * tests/Svc_Handler_Test.cpp: Modified the test to dump the contents - of the temporary file to the log file. - -Tue Aug 7 19:14:24 2001 Douglas C. Schmidt - - * ace/CDR_Stream.i: - * ace/SOCK_Stream.h: Fixed incorrect comments. - Thanks to Alain Decamps for reporting - these. - -Tue Aug 7 15:19:38 2001 Douglas C. Schmidt - - * ace: Changed all uses of IOV_MAX to use the new ACE_IOV_MAX. - * ace/OS.h: Added a new ACE_IOV_MAX that makes it clear this is - an ACE-level #define. We use this in C++NP v1. - -Tue Aug 7 14:16:57 2001 Douglas C. Schmidt - - * ace/Svc_Handler.cpp: Reimplemented the flush() method to use - the new send_n() method on the various ACE I/O classes. - - * ace/SOCK_Stream.{h,i}: - * ace/FILE_IO.{h,i}: Added a new send_n() method that sends all - the s chained through their and - pointers using the underlying OS gather-write operation to - reduce the domain-crossing penalty. - -Tue Aug 7 17:27:16 2001 Balachandran Natarajan - - * tests/Collection_test.cpp: Fixed a compile error with g++. This - is a patch that Johnny Willemsen sent as a part of his last - checkin. - -Tue Aug 07 11:25:36 2001 Nanbor Wang - - * ace/config-freebsd-pthread.h: Made the following definition - valid only for pre-4.2-RELEASE. - - #define ACE_LACKS_GETPGID - #define ACE_LACKS_SETPGID - #define ACE_LACKS_SETREGID - #define ACE_LACKS_SETREUID - - Thanks to Robert Burke for reporting - this. - -Tue Aug 07 16:40:12 2001 Johnny Willemsen - - * ace/Hash_Map_Manager_T.*: - Added const_iterator to the Hash_Map_Manager so that it is - possible to iterate over a hash map in a const method - - The operator= of the iterator now check the value of this to - check that the iterator instance is assigned to itself - - * tests/Hash_Map_Manager_Test.cpp - Extended this test to test the new const_iterator capabilities - of the hash map - - * ace/Unbounded_Set.cpp: - Implemented missing operator* for the const iterator - - * tests/Collection_test.cpp: - Extended test to test the operator* of the - Unbounded_Set_Const_Iterator - -Mon Aug 6 19:58:48 2001 Douglas C. Schmidt - - * ace/config-hpux-11.00.h: Added #define for ACE_HAS_TERM_IOCTLS. - Thanks to Torbjorn Backstrom - for reporting this. - - * ace/OS.h: Added a #include for for HP/UX. Thanks - to Torbjorn Backstrom for - reporting this. - -Mon Aug 6 12:51:35 2001 Douglas C. Schmidt - - * ace/Synch.h (ACE_Null_Mutex>): Fixed a cut&paste error - where acquire_write() should be acquire_read(). Thanks to - Russell Mora for fixing this. - -Mon Aug 06 17:17:33 2001 Ossama Othman - - * ace/Service_Config.cpp: - - Fixed some debugging messages that were not wrapped within an - ACE_LIB_TEXT macro. - - * tests/Service_Config_Test.UTF-16.conf: - - Interim UTF-16 encoded version of the UTF-8 encoded - Service_Config_Test.conf. It was generated on a little-endian - host. Its current purpose is simply to keep our Unicode - regression testing happy until the on-the-fly generation is - implemented. Once we start generating this file on-the-fly - this file should disappear. - - * tests/Service_Config_Test.cpp (run_test): - - When using full Unicode support, use the version of the Service - Configurator file that is UTF-16 encoded (as described above). - -Mon Aug 06 11:10:24 2001 Ossama Othman - - * ace/Svc_Conf_l.cpp: - - More Unicode fixes. Flex's allocation function uses malloc() as - its underlying allocator. Since it only accepts the size in - bytes, allocate "size * sizeof (ACE_TCHAR)" when allocating - string buffers. This should clear up some strange looking text - "unknown character" messages emanating from the Service - Configurator's underlying text scanner. - - Note that these changes do not fix the cause of the "unknown - character." Those fixes should soon follow. - -Mon Aug 06 09:04:04 2001 Ossama Othman - - * ace/Svc_Conf.l: - - Unicode updates. Wrap debugging text within an ACE_LIB_TEXT - macro. - -Sun Aug 5 14:31:10 2001 Balachandran Natarajan - - * tests/run_tests.lst: Ossama suggested that we dont run the - Service_Config_Test in static builds. - -Fri Aug 04 3:33:31 2001 Yamuna Krishnamurthy - - * ace/QoS/SOCK_Dgram_Mcast_QoS.h: - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: - - Made the open method public so we can open UDP sockets for - non-multicast addresses. - -Fri Aug 03 22:19:31 2001 Steve Huston - - * ace/config-hpux-11.00.h: Added ACE_HAS_WCHAR to build in the - wide char handling since Darrell so nicely straightened all - the muck out throughout ACE. Thanks Darrell! - -Fri Aug 03 22:15:51 2001 Steve Huston - - * ace/Log_Msg.cpp (log): For 'W' and 'w' on HP-UX, the 'ls' and - 'lc' forms are not allowed; HP-UX requires 'S' and 'C'. - -Fri Aug 3 13:10:59 2001 Ossama Othman - - * ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER, - ACE_SSIZE_T_FORMAT_SPECIFIER, ACE_SIZE_T_FORMAT_SPECIFIER): - - Removed unnecessary and some incorrect format specifiers for the - 32-bit platform case. In particular, the format specifier for - an unsigned 64-bit integer was incorrectly set to "%Lu." "%L" - is the format specifier for a "long double," not a "long long" - integer on 32-bit platforms. "%llu" is the correct format - specifier which `ace/Basic_Types.h' already defines. - -Fri Aug 3 09:55:38 2001 Ossama Othman - - * bin/auto_run_tests.lst: - - Added the new TAO "DLL_ORB" test to the list of tests to run. - -Fri Aug 3 08:26:45 2001 Balachandran Natarajan - - * ace/RW_Process_Mutex.cpp: Added a missing comma in the - constructor. This should fix Win32 compile errors. - -Fri Aug 3 08:07:45 2001 Balachandran Natarajan - - * ace/CDR_Base.cpp: Added a check for a memory allocation failure - in grow (). Thanks to Francis Paul for - pointing this out. - -Thu Aug 2 18:37:23 2001 Douglas C. Schmidt - - * ace/RW_Process_Mutex.cpp: Added ACE_DEFAULT_OPEN_PERMS - to the constructor call to ACE_RW_Process_Mutex so that it does - the right thing on Win32. Thanks to Wayne Erchak - for reporting this. This fixes - bugid 996. - -Thu Aug 02 13:04:19 2001 Steve Huston - - * ace/ace.icc: Added Intrusive_List.cpp to the TEMPLATE_FILES - section. - -Thu Aug 02 06:59:39 2001 Steve Huston - - * ace/Basic_Types.h (ACE_SIZEOF_WCHAR): If ACE_HAS_XPG4_MULTIBYTE_CHAR - is defined, use sizeof(wchar_t) to set ACE_SIZEOF_WCHAR. - -Wed Aug 1 16:05:49 2001 Carlos O'Ryan - - * Merged changes from the fix_886 branch - - Tue Jul 31 09:17:49 2001 Carlos O'Ryan - - * ace/Intrusive_List.h: - * ace/Intrusive_List.inl: - Add new methods to access the head and tail of the list. - - * ace/Intrusive_List.cpp: - Fixed the implementation of remove(), if the element to be - removed was the last on the list it wasn't removed at all. - Left some code to check invariants, have to find a way to keep - that code around with some optional compilation flags. - - Thu Jul 26 16:50:54 2001 Carlos O'Ryan - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/Intrusive_List.h: - * ace/Intrusive_List.inl: - * ace/Intrusive_List.cpp: - Add new template to implement intrusive lists, i.e. lists that - assume their elements implement the next() and prev() methods. - - * ace/Intrusive_List_Node.h: - * ace/Intrusive_List_Node.inl: - * ace/Intrusive_List_Node.cpp: - Helper class to add the requirements of ACE_Intrusive_List to - any other class, simply do: - class Foo : public ACE_Intrusive_List_Node - -Wed Aug 1 15:57:35 2001 Ossama Othman - - * ace/Message_Block.cpp (release, release_i): - - Obtain the pointer to the allocator from the object that will be - destroyed before calling ACE_DES_FREE on the object. Previously - we were obtaining the allocator after the object was destroyed, - due to the way the ACE_DES_FREE macro works. Thanks to Hyman - Rosen for reporting the problem, and to - Carlos for suggesting a fix. [Bug 992] - -Wed Aug 1 15:00:21 2001 Douglas C. Schmidt - - * ace/Log_Record.{h,i}: Changed msg_data_len() from a "setter" - to a "getter" method, which makes more sense. Thanks to Patrick - Rabau for reporting this. - -Wed Aug 1 12:43:57 2001 Ossama Othman - - * ace/Svc_Conf_l.cpp: - - Reintegreated Nanbor's change (Wed Jun 13 10:22:10 2001 Nanbor - Wang ) that enables proper handling of - UNICODE Service Configurator directives. - -Wed Aug 1 07:14:42 2001 Douglas C. Schmidt - - * include/makeinclude/platform_vxworks5.x_g++.GNU: Checked in a new - version of this file, which includes support for the Hitachi - chip. Thanks to Frank Wolf for this. - - * ace/Log_Record.cpp (format_msg): Added a cast to fix a warning. - Thanks to Bala for reporting this. - -Tue Jul 31 22:53:26 2001 Ossama Othman - - * tests/libService_Config_DLL.icc: - - New Visual Age project file for the libService_Config_DLL - library. - - * tests/Makefile.am: - - Added build targets/dependencies for the libService_Config_DLL - library. - -Tue Jul 31 22:46:33 2001 Ossama Othman - - * tests/Service_Config_DLL.dsp: - * tests/Service_Config_Test.dsp: - - Removed the static library configurations. The - Service_Config_Test currently requires dynamically loadable - objects. Fixes Win32 "LIB" build failures. - -Tue Jul 31 22:10:48 2001 Ossama Othman - - * tests/Service_Config_Test.cpp (run_test): - - Wrap strings passed to ACE_ARGV::add() within an ACE_TEXT - macro. Fixes Unicode conversion problems. - -Tue Jul 31 16:53:57 2001 Ossama Othman - - * ace/Svc_Conf.h (ace_yyrestart, ace_yy_delete_parse_buffer, - ace_yydirective): - - Remove these global function and variable declarations. They - are no longer used. - -Tue Jul 31 16:43:33 2001 Ossama Othman - - * ace/Basic_Types.h: - - If "__LITTLE_ENDIAN__" is defined then assume that the - architecture is little endian. Some compilers/platforms define - that macro. Suggested by Frank Wolf" . - - * ace/Svc_Conf.h (yy_push_buffer): - * ace/Svc_Conf.l (yy_push_buffer): - * ace/Svc_Conf_l.cpp (ace_yy_push_buffer): - * ace/Svc_Conf_Lexer_Guard.cpp (ACE_Svc_Conf_Lexer_Guard): - * ace/Svc_Conf_Lexer_Guard.h (ACE_Svc_Conf_Lexer_Guard): - - The Service Configurator directive is an "ACE_TCHAR *" not a - "char *". Updated these method/function parameters to accept - the former. Fixes a compile-time problem on "wchar/Unicode" - builds. - -Tue Jul 31 05:34:48 2001 Douglas C. Schmidt - - * ace/OS.h: Removed a spurious WNOHANG definition. Thanks to - Christina Junru for reporting this. - -Mon Jul 30 15:31:42 2001 Douglas C. Schmidt - - * ace/Log_Msg.{h,i,cpp}: Fixed this class so that all of its fields - are ACE_UINT32 or ACE_INT32 internally so that it'll always be - the same on all platforms. Thanks to Fabris - for reporting this. - -Tue Jul 31 10:22:38 2001 Ossama Othman - - * tests/Makefile: - - Only build the Service_Config_Test if shared libraries are - enabled, since it attempts to dynamically load a shared - library. - -Tue Jul 31 10:16:31 2001 Steve Huston - - * ace/Dump.h: Clarified the use of ACE_NDEBUG for turning this - feature off, not on. Thanks to Don Hinton - for noticing this. - -Mon Jul 30 13:41:00 2001 Nanbor Wang - - * ace/OS.cpp (ACE_Time_Value::FILETIME_to_timval_skew): Updated - docuementation to better explain the meaning of this constant. - Thanks to Mike Vitalo for motivating the - change. - -Mon Jul 30 09:43:06 2001 Douglas C. Schmidt - - * ace/OS.i (mutex_lock): Missing an argument to the ACE_OSCALL macro. - Thanks to Bala for reporting this. - -Mon Jul 30 05:43:23 2001 Douglas C. Schmidt - - * ace/Synch.h (ACE_Semaphore): Corrected the comment on - how to get POSIX Pthreads "implementation" of semaphores (which - supports the timed acquire() option). Thanks to Grzegorz - Sikora for reporting this. - -Sun Jul 29 19:03:56 2001 Douglas C. Schmidt - - * tests/Thread_Mutex_Test.cpp (test): Fixed this test to be - consistent wrt the errno for the timed acquire(), which should - now always be set to ETIME rather than ETIMEDOUT and EBUSY. - - * ace/Message_Queue_T.cpp (wait_not_full_cond, - wait_not_empty_cond): Fixed a nasty bug with the semaphore - version of ACE_Message_Queue that would have reared it's ugly - head if ACE_NULL_SYNCH were used when - ACE_HAS_OPTIMIZED_MESSAGE_QUEUE was enabled. Fixing this bug - also triggered the following changes. - - * ace/OS.{h,i}: Added support for ACE_OS::sema_wait(), - ACE_OS::mutex_lock(), ACE_OS::thread_mutex_lock() that take - ACE_Time_Value *. - - * ace/OS.i: For some odd reason the timeouts for the timed version - of mutex_lock() were returning a random smattering of errnos. - I've changed them to all be consistent with the - ACE_Condition_Thread_Mutex::wait() errno, which is ETIME. - - * ace/Synch.h: Updated the documentation of all the timed - acquire() methods to explain what the various return values - mean. - -Sun Jul 29 22:10:40 2001 Ossama Othman - - * tests/Service_Config_DLL.cpp: - * tests/Service_Config_DLL.h: - * tests/Service_Config_DLL.dsp: - * tests/Service_Config_DLL_Export.h: - * tests/Service_Config_Test.conf: - - New files associated with the existing Service_Config_Test. - They are used when testing the reentrance/thread-safety of the - Service Configurator, in addition to testing the Service - Configurator's ability to handle nested processing of Service - Configurator directives. - - * tests/Service_Config_Test.cpp (run_test): - - Add arguments to the Service Configurator argument vector to - make it process the newly added `Service_Config_Test.conf' - file. - - (main): - - Make the ACE_Thread_Manager wait for all running threads before - exiting the test. Processing the `Service_Config_Test.conf' - file causes some threads to be spawned. - -Sun Jul 29 19:19:20 2001 Ossama Othman - - * ace/Service_Config.cpp (process_directive, process_directives): - - Wrap the ACE_GUARD_RETURN macro within an ACE_MT block. The - ACE_Static_Object_Lock declaration is only visible if - ACE_HAS_THREADS is defined. This truly fixes the - single-threaded build problems. - -Sun Jul 29 19:06:11 2001 Ossama Othman - - * ace/Svc_Conf.y (ace_obstack): - * ace/Svc_Conf_y.cpp: - * ace/Svc_Conf_l.cpp: - - UNICODE updates and fixes. - -Sun Jul 29 10:50:45 2001 Ossama Othman - - * ace/Svc_Conf_Lexer_Guard.cpp: - - There is no longer any need to include "ace/Object_Manager.h" - - * ace/Service_Config.cpp: - - Include "ace/Object_Manager.h" to pull in the definition of - ACE_Static_Object_Lock. Fixes a problem found in Sun builds and - single-threaded builds. - -Sat Jul 28 23:03:24 2001 Ossama Othman - - The following are changes that make the Service Configurator - reentrant and thread-safe. - - * ace/Svc_Conf.y: - - Generate a pure (reentrant) parser using Bison. BYACC doesn't - support generation of reentrant parsers. - - * ace/Svc_Conf.l: - - Implemented "buffer stack" support. This feature makes it - possible to process Service Configurator directives within a - Service Object's init() method, i.e. support nested directive - processing. - - (ace_yyerrno): - - Moved declaration of ace_yyerrno from this file to - `Svc_Conf.y'. ace_yyerrno was not used in the generated - scanner. It was only used in the generated parser. - - (yy_delete_parse_buffer): - - There is no longer any need for this function. The lexer buffer - stack implementation handles memory management of lexer buffers. - - (yywrap): - - Do not call yy_delete_parse_buffer(). It is no longer necessary - to do so, in addition to the fact that that function was - removed (as described above). - - (<>): - - Do not call ACE_YY_NEW_FILE in this rule. The new buffer stack - implementation handles the buffer switching that ACE_YY_NEW_FILE - did, and more. - - * ace/Svc_Conf_Tokens.h: - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: - - Regenerated these files using updated Bison/YACC and FLEX input - files to pull in support for reentrant parsing and nested - processing of Service Configurator directives. - - * ace/Svc_Conf.h (ace_yy_push_buffer, ace_yy_pop_buffer): - - Added function prototypes for the newly implemented lexer buffer - stack manipulation functions. - - (ace_yylex): - - Added ACE_YYSTYPE parameter to this functions signature, as - required by the new reentrant parser support. - - (ACE_SERVICE_DIRECTIVE_STACK_DEPTH): - - New symbolic constant that defines the maximum supported depth - for nested Service Configurator processing. The current default - is 8. - - (ACE_YY_INPUT): - - No longer any need to redefine this macro to support scanning of - Service Configurator directive strings. The new lexer buffer - stack implementation provides support for lexer buffer scanning - from a string instead of a pointer to "FILE." - - (ace_yydirective): - - This global variable is no longer needed due to the fact that - the new buffer stack implementation handles directives read from - both a string and a file. - - * ace/Service_Config.cpp: - - (process_directive, process_directives): - - Obtain a recursive lock before manipulating the lexer buffer - stack, and invoking the parser and scanner. This makes - invocation of the scanner thread-safe. - - The new lexer buffer stack implemenation obviates the need to - call yyrestart() since buffer switching is handled by the stack - implementation. - - (open_i, close): - - No need to deallocate the lexer buffer since the buffer stack - implementation handles that. - - * ace/Svc_Conf_Lexer_Guard.h: - * ace/Svc_Conf_Lexer_Guard.cpp: - - New "guard" class that makes lexer buffer stack pushing and - popping exception-safe. - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/ace.icc: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Added Svc_Conf_Lexer_Guard.* sources to these Makefiles and - project files. - -Sat Jul 28 14:58:30 2001 Douglas C. Schmidt - - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: Reran BYACC and FLEX on the Svc_Conf.l and - Svc_Conf.y files to regenerate them. Thanks to Bala for - motivating this. - - * netsvcs/clients/Tokens/collection/Makefile, - netsvcs/clients/Tokens/deadlock/Makefile, - netsvcs/clients/Tokens/invariant/Makefile, - netsvcs/clients/Tokens/mutex/Makefile, - netsvcs/clients/Tokens/rw_lock/Makefile, - examples/ASX/CCM_App/Makefile, - examples/Logger/Acceptor-server/Makefile, - examples/Reactor/Multicast/Makefile, - examples/Reactor/Ntalker/Makefile, - examples/Shared_Malloc/Makefile, - performance-tests/TCP/Makefile, - performance-tests/UDP/Makefile: Removed the line - include $(ACE_ROOT)/include/makeinclude/rules.LIB.GNU - so that these projects will build correctly on VxWorks with - Make 3.79.1. Thanks to Frank Wolf for reporting this. - -Fri Jul 27 11:24:50 2001 Douglas C. Schmidt - - * ace/Svc_Conf.y: Allow quoted strings as the pathname. Thanks - to Kevin Burge for suggesting this - and providing the fix. - - * ace/Svc_Conf.l: Added support for "~" in pathnames to support - Win32isms. Thanks to Kevin Burge - for suggesting this and providing the fix. - - * ace/Refcounted_Auto_Ptr.i (assign): Fixed the code to avoid a - race condition. Thanks to Charlie Duke for this fix. - -Thu Jul 26 08:15:36 2001 Douglas C. Schmidt - - * include/makeinclude/platform_vxworks5.x_g++.GNU: Changed - $PATH to $(PATH). Thanks to Frank Wolf for reporting this. - -Wed Jul 25 17:46:58 2001 Douglas C. Schmidt - - * ace/Asynch_Acceptor.{h,cpp}: Added an asynch_accept() accessor - method. Thanks to Craig L. Ching for - reporting this. - -Wed Jul 25 17:36:09 2001 Douglas C. Schmidt - - * ace/Refcounted_Auto_Ptr.i: Added a lock for the reference count - to the assign() method. Thanks to Charlie Duke - for reporting this. - -Fri Jul 27 23:17:31 2001 Steve Huston - - * ace/ace_wchar.h: If ACE_HAS_XPG4_MULTIBYTE_CHAR is set, then - also set up definitions for functions that are not present - (ACE_LACKS_ITOW, ACE_LACKS_WCSICMP, ACE_LACKS_WCSNICMP, - ACE_LACKS_WCSDUP). - - * ace/ace_wchar.inl: If not ACE_WIN32, include to see - strlen(). - - * ace/OS_String.inl (strstr): The XPG4 multibyte version of - strstr() is wcswcs(), whereas the ANSI C / UNIX98 version is - wcsstr(). So if ACE_HAS_XPG4_MULTIBYTE_CHAR is defined, use - wcswcs. - -Fri Jul 27 21:52:48 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the IDL_Cubut test with GIOP Lite - script, to our daily builds. - -Fri Jul 27 16:50:49 2001 Steve Huston - - * tests/Log_Msg_Test.cpp: Silence a compile warning in g++. - -Fri Jul 27 12:18:49 2001 Steve Huston - - * ace/Log_Msg.cpp (log): Fixed compile error - missing "" around - 's' for the %S case. - -Fri Jul 27 11:07:26 2001 Chad Elliott - - * ace/OS.h: - - After conversation with Steve Huston, I am reverting his change - pertaining to HPUX from "Tue Jul 10 18:15:39 2001 Steve Huston - ". - -Fri Jul 27 10:57:24 2001 Chad Elliott - - * ace/SOCK_Dgram_Bcast.cpp: - - Fix the ACE_SOCK_Dgram_Bcast::mk_broadcast() which was completely - broken on AIX. The broadcast_client in docs/tutorials/008 now - works with the help of this change. - -Thu Jul 26 22:09:19 2001 Steve Huston - - * ace/Log_Msg.cpp (log): Extend behavior so that all printf - formatting conversion specifiers can be used with all legal - ACE_Log_Msg format characters. This allows the caller to line - up columns on any field, like line number or program name, or - thread ID. Thanks to Paul Caffrey for - motivating this extension. - - * tests/Log_Msg_Test.cpp: Added a new function, test_format_specs, - that verifies the formatting. Right now it does not detect the - correctness of the strings produced - they have to be examined - in the log file to check. This needs to be fixed still. - -Thu Jul 26 11:48:16 2001 Carlos O'Ryan - - * bin/count_lines: - Add a few new file types. - -Wed Jul 25 23:49:43 2001 Krishnakumar B - - * include/makeinclude/platform_tru64_g++.GNU: - - Fixed some missing defines in the Makefile for DEC Unix versions - 4.0D, 4.0E. We don't support or suggest this combination. Hence - the oversight in missing the needed defines. - - Thanks to Martin Krumpolec for reporting this. - -Wed Jul 25 23:49:00 2001 Craig Rodrigues - - * include/makeinclude/wrapper_macros.GNU: - - Remove extraneous rapi = 0. - -Wed Jul 25 18:53:18 2001 Ossama Othman - - * html/index.html: - - Added CORBA Security Service main page link to the list of - documentation. - -Wed Jul 25 17:41:43 2001 Ossama Othman - - * ltcf-c.sh: - * ltcf-cxx.sh: - * ltconfig: - - Removed these libtool related files. New versions of libtool - (GNU libtool >= 1.4b) no longer use them. - - * config.guess: - * config.sub: - * ltmain.sh: - - Removed these files. We no longer need to keep custom copies - lieing around since libtool 1.4b includes all of our local - changes (i.e. our changes have been folded into the upstream - libtool sources). - - * install-sh: - * missing: - * mkinstalldirs: - - Removed these files. Automake will automatically add these when - necessary. - -Wed Jul 25 16:29:48 2001 Steve Huston - - * tests/Max_Default_Port_Test.cpp: ACE-ified the code and fixed - a number of ACE_DEBUG %p directives without a corresponding - string. Also, closed a 2 handle-per-try handle leak, which - may have affected test results on some platforms. - * tests/Max_Default_Port_Test.h: Added a destructor to the - test class - it's used to close the acceptor handle down. - -Wed Jul 25 15:21:22 2001 Krishnakumar B - - * ace/OS.h: - - Fixed the _XOPEN_SOURCE checking to _XOPEN_SOURCE < 500 to fix - incorrect declaration of prototype. This fixes the warnings when - compiling with gcc-3.0. Thanks to Ossama for suggesting the fix. - -Wed Jul 25 08:05:45 2001 Balachandran Natarajan - - * tests/Thread_Pool_Reactor_Resume_Test.h: - * tests/Thread_Pool_Reactor_Resume_Test.cpp: Fixed a subtle race - condition. This hardly showed up in many of our daily - builds. The race condition had to be fixed to show the users of - the cautious approach that one needs to take if they are - resuming the handle in the application itself. - -Tue Jul 24 16:41:57 2001 Joe Hoffert - - * ace/Thread_Manager.cpp : - Added "&& ! defined (ACE_HAS_PACE)" ifdefs to already existing - #if defined (VXWORKS) sections of code to get ACE_HAS_PACE to - compile on VxWorks. - - * ace/OS.i : - * ace/OS.cpp: - Fixed formatting of some comments and added needed PACE - calls for ACE_HAS_PACE on VxWorks. - - * ace/OS.h : - Put #if !defined guards around the ACE_THR_PRI* macros - so that we can define them in the config*.h files if - they need to be corrected. For instance, ACE_THR_PRI_OTHER_MIN - has a different value on SunOS 5.8 than it does on SunOS 5.7, - i.e., -20 vs. 0 respectively. - - Also, added some needed typedefs and #define for ACE_HAS_PACE - on VxWorks and updated some comments concerning ACE_OS::thr_create - flags. - - * ace/Sched_Params.cpp (priority_min, priority_max): - Changed to return correct thread priority min/max for - Solaris threads. We now use the ACE_PRI_THR* macros - for these values while still calling ACE_OS::priority_control - for process and LWP priorities. - - * ace/config-sunos5.8.h: - Added setting of ACE_THR_PRI_OTHER_MIN to be correct - for SunOS 5.8. - -Tue Jul 24 13:47:32 2001 Balachandran Natarajan - - * ace/SSL/SSL_Asynch_Stream.h (ACE_SSL_Asynch_Stream): - * ace/SSL/SSL_Asynch_Stream.cpp: Added a open () method that - matches the signature of ACE_Service_Handler. This should fix - the warnings in Borland builds that complain about hiding - the virtual functions. - -Tue Jul 24 10:56:04 2001 Ossama Othman - - * bin/generate_doxygen.pl (TAO_DOCS): - - Added "tao_security" and "tao_ssliop" Doxygen configurations to - the list of documentation to generate. - -Tue Jul 24 07:45:03 2001 Douglas C. Schmidt - - * ace/Containers_T: Fixed some problems with the lack of - const for the ACE_DLList and ACE_Double_Linked_List classes. - Thanks to Michael Kircher for reporting this. - - * ace/config-cygwin32-common.h: Removed the ACE_LACKS_FORK - macro since this is apparently working on Cygwin. Thanks tj - Stefan Kluehspies for reporting - this. - - * ace/config-cygwin32.h: Removed the #define _CLOCKID_T - macro, which should now be handled by the following change. - - * ace/OS.h: Added a #defined for _CLOCKID_T_. Thanks to - Stefan Kluehspies for - reporting this. - -Tue Jul 24 11:10:59 2001 Krishnakumar B - - * ace/OS.h: - - Fix the compile errors seen on gcc-3.0 with -pedantic and - -Wno-long-long. This should fix all the errors. - -Tue Jul 24 10:07:31 2001 Chad Elliott - - * include/makeinclude/platform_sunos5_g++.GNU: - - Add an optimize override to 0 for g++ 3.0. The compiler breaks on - a tremendous amount of files, even with -O. - -Tue Jul 24 10:04:52 2001 Chad Elliott - - * ace/INET_Addr.cpp: - - Corrected a run-time error on Tru64 with gcc. Any executable - that called ACE_INET_Addr::get_host_name() would core dump. - This was caused by the call to ACE_OS::gethostbyaddr_r(). - -Tue Jul 24 08:20:02 2001 Chad Elliott - - * include/makeinclude/platform_aix_ibm.GNU: - - Change -O2 to -O. The optimizer seems to be a tiny - bit broken, which is demonstrated by a few TAO and orbsvcs - tests. - -Mon Jul 23 17:38:46 2001 Ossama Othman - - * etc/tao_security.doxygen: - * etc/tao_ssliop.doxygen: - - New Doxygen files for TAO's CORBA security libraries. - -Mon Jul 23 13:48:26 2001 Ossama Othman - - * ace/MEM_Connector.cpp (connect): - - Disable non-blocking on the stream after its handle has been - set. Previously, non-blocking was disabled on an uninitialized - MEM_Stream, after which the handle was set (i.e. initializing - the stream). In order to properly disable non-blocking on a - stream, its handle must be set first since ioctl() operations - are typically performed on the underlying stream handle. - -Mon Jul 23 13:06:39 2001 Steve Huston - - * ace/WFMO_Reactor.cpp (event_handling): Corrected the loop check - to account for a zero ACE_Time_Value *, avoiding a crash in - tests/Reactor_Timer_Test, as well as any other program that - called ACE_Reactor::handle_events with a zero timer pointer. - -Mon Jul 23 10:39:55 2001 Nanbor Wang - - * ace/OS.h: Added /**/ between #include and to - avoid warning from CE compiler. - - * ace/ace_dll.vcp: Added Obchunk.cpp to the project. - -Sun Jul 22 08:19:43 2001 Douglas C. Schmidt - - * ace/config-cygwin32.h: ADded a #define for_CLOCKID_T. Thanks to - Christophe Galerne for - reporting this. - - * ace/Log_Record.cpp (priority_names_): Added commas after the - 'ACE_LIB_TEXT ("LM_UNK(04000)")' lines. Thanks to Steve Harris - for reporting this. - -Sat Jul 21 19:56:08 2001 Douglas C. Schmidt - - * ace/Map_T.{h,i}: Made current_value() a const member function. - Thanks to Johnny Willemsen for reporting this. - -Fri Jul 20 10:16:46 2001 Douglas C. Schmidt - - * ace/Connector.cpp (create_AST): Replaced some calls to - sh->get_handle () with a cached value of handle. This fixes a - bug with gcc 2.96 on Tornado 2.1/VxWorks for SuperH. Thanks to - Frank Wolf for reporting this. - - * examples/Connection/non_blocking/CPP-acceptor.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - * examples/Connection/non_blocking/CPP-connector.cpp: Changed the - SH macro to SVH to avoid clashes with a macro in VxWorks. - Thanks to Frank Wolf for reporting this. - -Thu Jul 19 06:55:07 2001 Douglas C. Schmidt - - * ace/config-g++-common.h: Version 2.96 of g++ on VxWorks - is missing auto_ptr, so let's add the ACE_LACK_AUTO_PTR flag - there. Thanks to Frank Wolf for suggesting this. - -Fri Jul 20 09:47:38 2001 Nanbor Wang - - * ace/Log_Msg.cpp: Fixed WinCE errors. CE does not support - UNIX_Syslog. - -Thu Jul 19 22:39:32 2001 Nanbor Wang - - * tests/MEM_Stream_Test.cpp: - * ace/MEM_IO.h: - * ace/MEM_IO.i: - * ace/MEM_IO.cpp: On non-Win32 platforms, disable multithreaded - MEM_IO if _ACE_USE_SV_SEM is defined. - -Thu Jul 19 15:25:11 2001 Paul Calabrese - - * ace/MEM_Acceptor.i (mmap_prefix): - - Fix case where a null pointer is passed in. - -Thu Jul 19 06:55:07 2001 Douglas C. Schmidt - - * ace/Connector.cpp (connect_svc_handler): Missed one change... - Thanks to Bala for reporting this! - - * include/makeinclude/platform_vxworks5.x_g++.GNU (HOST_DIR): Added - support for the SH7700 and SH7700LE. Thanks to Frank Wolf - for reporting this. - - * ace/OS.i (truncate): Make sure to close the handle that we - opens. Thanks to Lothar for reporting this. - - * ace/Connector.cpp: Changed the SH macro to SVH to avoid clashes - with a macro in VxWorks. Thanks to Frank Wolf - for reporting this. - -Wed Jul 18 13:15:06 2001 Douglas C. Schmidt - - * ace/OS_Dirent.cpp (scandir_emulation): Removed the calls to the - ACE_ERROR_RETURN macros to avoid dependencies on ACE_Log_Msg - from within the ACE_OS layer. Thanks to Bala for pointing this - out! - - * ace/ACE.{h,cpp}: Added a new wrapper method for ACE_OS::select() - that uses ACE_Handle_Set *'s rather than fd_set *'s. This is - motivated by work Steve Huston and I are doing on our new book - "C++ Network Programming: Resolving Complexity with ACE and - Patterns." - - * ace/Malloc_T.i (release): Removed an unnecessary "else" to - make gcc 2.96 happy. Thanks to Frank Wolf for - reporting this. - - * Happy birthday to me and Angelo Corsaro! - -Tue Jul 17 00:34:40 2001 Douglas C. Schmidt - - * ace/SString.h (ACE_Tokenizer): Make sure that the data members - are protected, not private... Thanks to Martin Krumpolec for - reporting this (again)! - -Wed Jul 18 16:40:56 2001 Irfan Pyarali - - * ace/Log_Msg.cpp (program_name): Undid the following changes: - - ChangeLogTag:Tue Jul 10 11:32:26 2001 Tibor Kiss - - Tibor will be looking into this further since this change - currently causes shutdown problems on Win2000. - -Wed Jul 18 15:59:03 2001 Krishnakumar B - - * ace/config-tru64.h: - - Removed _LIBC_POLLUTION_H. It seems that this macro is causing - problems for some users. Thanks to Pierre Oberson - for prompting this fix. - -Tue Jul 17 13:00:11 2001 Balachandran Natarajan - - * tests/run_test.lst: Enabled the MEM_Stream test on Linux. - -Mon Jul 16 14:59:32 2001 Douglas C. Schmidt - - * ace/Memory_Pool.h (ACE_Shared_Memory_Pool): Added a comment - that discourages developer from using the ACE_Shared_Memory_Pool - and points them to the ACE_MMAP_Memory_Pool instead. Thanks to - Johnny Chen for motivating this. - - * ace/OS_Dirent.cpp (readdir_emulation): Fixed a handle leak - in the event that errors occur. Thanks to Kevin Burge - for reporting this. - - * ace/Log_Msg_UNIX_Syslog.cpp (open): Add an ACE_const_cast() - to the program name for platforms like LynxOS whose openlog() - method is char * rather than const char *. Thanks to Bala for - reporting this. - -Sun Jul 15 11:06:33 2001 Douglas C. Schmidt - - * ace/Log_Msg_NT_Event_Log.cpp: Fixed the implementation so that - it's consistent with the new program_name() features. Thanks to - Chris Kohloff for this fix. - -Sun Jul 15 11:04:26 2001 Carlos O'Ryan - - * ace/SSL/ACE_SSL.dsp: - Removed references to $OPENSSL_ROOT, the user should configure - those in the Tools -> Option -> Directories tab. - -Fri Jul 13 23:02:46 2001 Ossama Othman - - * ace/SSL/SSL_Asynch_Stream.h: - * ace/SSL/SSL_Asynch_Stream.cpp: - * ace/SSL/SSL_Asynch_BIO.h: - * ace/SSL/SSL_Asynch_BIO.cpp: - - Only support asynchronous SSL streams when using OpenSSL > - 0.9.5a. The BIO method signatures changed in OpenSSL 0.9.6. - -Fri Jul 13 22:48:56 2001 Ossama Othman - - * ace/SSL/SSL_Asynch_BIO.cpp (methods_ACE): - - Removed excess element in aggregate initializer. - -Fri Jul 13 22:29:01 2001 Ossama Othman - - * ace/SSL/SSL_Asynch_Stream.cpp (print_error): - - The OpenSSL ERR_error_string_n() function is only supported in - OpenSSL 0.9.6 or better. - -Fri Jul 13 14:59:18 2001 Alexander Libman - - * ace/WIN32_Asynch_IO.h (ACE_WIN32_Asynch_Result): - * ace/WIN32_Asynch_IO.cpp (set_error, set_bytes_transferred): - - Added new methods set_error() and set_bytes_transferred(). - Needed for below changes and new asynchronous SSL stream - implementation. - - * ace/WIN32_Proactor.cpp (handle_events): - - Fixed error handling semantics so that it is consistent with the - POSIX Proactor error handling semantics. - - (post_completion): - - Pass the amount of bytes transferred and the completion key to - the Win32 PostQueuedCompletionStatus() function. The error, if - any, will later be extracted in the handle_events() method. - -Fri Jul 13 15:59:45 2001 Douglas C. Schmidt - - * netsvcs/servers/main.cpp (main): The server was always outputing - LM_DEBUG information, even when the program was not run with the - -d command line argument. Therefore, changed the following - lines from: - - if (ACE::debug () == 0) - ACE_Log_Msg::disable_debug_messages (); - - to: - - if (ACE::debug () == 0) - ACE_LOG_MSG->priority_mask (~LM_DEBUG, ACE_Log_Msg::PROCESS); - - Thanks to Jerry D. De Master for - reporting this fix. - -Fri Jul 13 12:16:03 2001 Ossama Othman - - * ace/SSL/SSL_Asynch_BIO.h: - * ace/SSL/SSL_Asynch_BIO.cpp: - * ace/SSL/SSL_Asynch_Stream.h: - * ace/SSL/SSL_Asynch_Stream.cpp: - - New asynchrounous SSL stream implementation contributed by - Alexander Libman . - - * ace/SSL/ACE_SSL.dsp: - * ace/SSL/Makefile: - * ace/SSL/Makefile.bor: - - Added new asynchronous SSL stream source files to these - Makefiles and project files. - -Fri Jul 13 09:40:08 2001 Jerry D. De Master - - * ace/Log_Msg.*, - ace/Logging_Strategy.*, - ace/Log_Msg_UNIX_Syslog.*: - Applied patches to ACE_Log_Msg, ACE_Logging_Strategy, and - ACE_Log_Msg_UNIX_Syslog that are required to add the program - name logging strategy option ('n') and to initialize the UNIX - syslog facility with the program name. Also included are Boris - Kolpackov patches for ACE_LACKS_IOSTREAM_TOTALLY - to ACE_Logging_Strategy. - -Thu Jul 12 19:54:27 2001 Ossama Othman - - * examples/Registry/test_registry_update.cpp (main): - - Fixed unused argument warning. - -Thu Jul 12 19:57:12 2001 Frank Hunleth - - * bin/auto_run_tests.lst: - - Added TAO/tests/RTCORBA/ORB_init to the auto run list. - -Thu Jul 12 17:11:35 2001 Krishnakumar B - - * bin/nightlybuilds/builds.lst (WEB): - - Temporarily removed the IA-64 build till some issues get sorted - out. - -Thu Jul 12 06:01:03 2001 John Michael Zorko - - * netsvcs/lib/Server_Logging_Handler.cpp: - Added an an additional #define in config-macosx.h called - ACE_HAS_MACOSX_DYLIB, and checked to see if this was _not_ - defined before instantiating the offending template in - Server_Logging_Handler.cpp. OS X has this thing about .dylibs - (OS X version of .so) where they can't have any duplicate - symbols, which is why libnetsvcs wasn't building on OS X - earlier. This fixes that. - - * include/makeincludes/platform-macosx.GNU: Added -lACE to the - LIBS line, which fixed the majority of the build problems. - - * ace/config-macosx.h: Added the ACE_HAS_MACOSX_DYLIB #define - mentioned above. - -Thu Jul 12 06:01:03 2001 Douglas C. Schmidt - - * ace/TLI_Connector.cpp (complete): Changed ACE_OS::t_rcvconnect() - to simply t_rcvconnect(). Thansk to Andreas Geisler for - reporting this. - -Thu Jul 12 09:43:36 2001 Ossama Othman - - * ace/FILE_Connector.h (ACE_FILE_Connector, connect): - - Removed the default O_EXCL flag I added a few days ago. It is - mostly useful for preventing symbolic link attacks in a - directory with global write permissions. Pass the - responsibility of using the O_EXCL flag when necessary on to the - application developer. - -Wed Jul 11 22:31:50 2001 Krishnakumar B - - * include/makeinclude/rules.local.GNU (clean.local): - - Added ti_files to remove the template cache generated by KCC. - - * ace/TLI_Acceptor.cpp(open_new_endpoint): - - Fixed a small typo causing compilation errors under Tru64. - -Wed Jul 11 13:06:33 2001 Steve Huston - - * tests/Log_Msg_Test.cpp: Changed the ostream test to close the - under-test ostream file before trying to open it and read the - contents. Avoids the "already open" error now that - ACE_FILE_Connector includes O_EXCL by default, and avoids any - potential file buffering issues reading an already-open file. - -Wed Jul 11 08:31:02 2001 Jeff Parsons - - * tests/Dirent_Test.cpp: - - Wrapped a string literal with ACE_TEXT, to get rid of a Win2000 - WChar build error. - -Wed Jul 11 06:41:43 2001 Douglas C. Schmidt - - * ace/TLI_Stream.cpp, - * ace/TLI_Connector.cpp, - * ace/TLI_Acceptor.cpp: Added enhancements so that the code would - work on Win32. Thanks to Andreas Geisler - for reporting this. - -Tue Jul 10 19:26:15 2001 Ossama Othman - - * ace/ace_dll.dsp: - - Disabled generation of source browse information. It was - causing problems on some existing builds that didn't use it. - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - - Removed certificate verification code. It is up to the - application, not the ACE_SSL library, to perform proper - certificate verification. - -Tue Jul 10 23:02:00 2001 Craig Rodrigues - - * tests/Log_Msg_Test.cpp: - Fix test so it doesn't open output file to write to twice. - Thanks to Ossama for finding it. - -Tue Jul 10 19:10:19 2001 Steve Huston - - * ace/ace.icc: Corrected the mis-applied patch for ace.icc in - Mon Jul 09 19:12:42 2001 Steve Huston - -Tue Jul 10 16:01:52 2001 Ossama Othman - - * THANKS: - - Added Sangeetha Ramadurai to - the hall of fame. - -Tue Jul 10 18:15:39 2001 Steve Huston - - * ace/WFMO_Reactor.cpp (event_handling): Move the logic for - noticing that the wait timed out, but did not expire any - timers, into this function. Will remove it from Reactor.cpp, - to properly move the fix into handle_events() rather than - needing to call run_reactor_event_loop to get it right. - * ace/Select_Reactor_T.cpp - still need to add similar logic here. - - * ace/config-sunos5.6.h: Re the following: - Mon Jul 2 15:26:32 2001 Nanbor Wang - Replaced ACE_HAS_POSIX_SEM, and left ACE_LACKS_NAMED_POSIX_SEM out. - Solaris does indeed have POSIX semaphores in 2.6 and later, but - requires the changes to OS.i below to work right. - - * ace/OS.h: For ACE_PROC_PRI_OTHER_MIN (and MAX), on HP-UX, - convert the HP-UX priority value to the POSIX range. - - * ace/OS.i (ACE_OS::sema_init, named POSIX semaphore): On Solaris - and HP-UX, the name of a POSIX semaphore needs to start with - a slash (further restricted on Solaris). Enforce that here by - prepending a slash, or by chopping off parts of the name. - -Tue Jul 10 16:08:04 2001 Krishnakumar B - - * include/makeinclude/platform_osf1_4.0.GNU: - - Fixed the default flags so that it enables the user to override - settings. Now that the long pending fix to wrapper_macros.GNU is - through, this should work fine now. - -Tue Jul 10 13:37:31 2001 Jeff Parsons - - * ace/OS_Dirent.cpp (readdir_emulation): - - Removed the hard cast to char* of one of the two arguments in - a call to strcpy. In the WChar win32 build, this cast was - causing the source and target strings to be of different widths. - -Tue Jul 10 11:32:26 2001 Tibor Kiss - - * ace/Log_Msg.cpp: - Completed the ACE_Log_Msg::close method with the - ACE_Thread::keyfree (log_msg_tss_key_) and key_created_ = 0; to - ensure restartability by multiple successive ACE::init and - ACE::fini calls. This fix prevent leaks from occurring when - ACE::init() and ACE::fini() are called multiple times. - -Tue Jul 10 11:12:00 2001 Chris Gill - - * ace/OS_Dirent.{h, inl}: refactored XDIR, dirent usage for pSOS - - user is no longer responsible for buffer deallocation after each - readdir call, only for passing the pointer returned from opendir - into closedir when all done. ACE_DIR structure is now used - consistently for all pSOS dirent calls. - -Tue Jul 10 06:06:07 2001 Douglas C. Schmidt - - * ace/Service_Repository.h: Updated the insert() comment to - clarify the return values. Thanks to Johnny Willemsen for - suggesting this. - - * ace/Service_Repository.{h,i}: Made the current_size() and - total_size() methods const. Thanks to Johnny Willemsen for - suggesting this. - - * ace/Service_Repository.h: Fixed a typo in the comments. Thanks - to Johnny Willemsen for reporting this. - -Tue Jul 10 08:39:04 2001 Chad Elliott - - * ace/config-vxworks5.x.h: - - Added the macro ACE_LACKS_UNIX_SYSLOG. - -Tue Jul 10 08:26:57 2001 Chad Elliott - - * ace/Log_Msg_UNIX_Syslog.cpp: - - Added a macro, ACE_LACKS_SETLOGMASK, for platforms that have - syslog, but don't have setlogmask(). - - * ace/config-chorus.h: - - ChorusOS 4.0.1 happens to be one of them. - -Tue Jul 10 09:00:12 2001 Johnny Willemsen - - * ace/OS_Dirent.h - Made the member 'd_name' of the 'dirent' struct non-const, because - BCB had problems with it - -Mon Jul 09 22:41:43 2001 Ossama Othman - - * include/makeinclude/wrapper_macros.GNU (exceptions): - - Include platform_macros.GNU before the default for "exceptions" - is set. This fixes a problem where the default native - exceptions setting in platform_linux.GNU was not set due to the - fact that it was previously set in wrapper_macros.GNU. Thanks - to Hans Utz for tracking down - the problem. - -Mon Jul 9 16:40:02 2001 Ossama Othman - - * ace/Dirent_Selector.cpp (ACE_Dirent_Selector): - - Correct order of initialization of members to match order of - declaration. Fixes a warning issued from GCC. - - * ace/Dirent_Selector.inl: - - Added missing RCS ID keyword. Fuzz was whining about the lack - of it. - - * ace/Dirent_Selector.h: - - Corrected some Doxygen comments. - -Mon Jul 09 19:12:42 2001 Steve Huston - - * ace/ace.icc: Added Log_Msg_UNIX_Syslog and Log_Msg_NT_Event_Log - modules to the LOGGING component. Added Dirent_Selector to the - UTILS component. - -Mon Jul 9 15:59:56 2001 Joe Hoffert - - * ace/config-lynxos.h: - Added ACE_LACKS_MKSTEMP since LynxOS doesn't seem to have - this. - -Mon Jul 9 15:28:29 2001 Jeff Parsons - - * ace/Dirent_Selector.cpp: - * ace/Dirent_Selector.h: - - Added ACE_INLINE guards around inclusion of Dirent_Selector.inl. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Added Dirent_Selector.{h,i,cpp} to these projects. - -Mon Jul 9 06:52:09 2001 Douglas C. Schmidt - - * ace/Makefile.bor (OBJFILES): Added the Dirent_Selector.obj file. - - * tests/Dirent_Test.cpp: Integrated a new test for the - ACE_Dirent_Selector class. - - * ace/Makefile (UTILS_FILES), - * ace/Dirent_Selector.h, - * ace/Dirent_Selector.inl, - * ace/Dirent_Selector.cpp: Added support for a C++ wrapper facade that - encapsulates ACE_OS_Dirent::scandir(). Thanks to Rich Newman for - contributing this, as well. - - * ace/OS_Dirent.h, - * ace/OS_Dirent.inl, - * ace/OS_Dirent.cpp: Added support for the scandir() feature, which - makes it possible to selectively pick which files in a directory - to iterate over. Also fixed a bug in the emulation of dirent. - Thanks to Rich Newman for contributing - these fixes. - -Mon Jul 09 14:39:50 2001 Irfan Pyarali - - * ace/OS.i (thr_getprio and thr_setprio): Changed these two - function such that if we are on Solaris and we have pthreads - enabled, we should use the pthread calls rather than the native - Solaris calls. The reasons for choosing the pthread calls is - due to following problems with the native calls: - - - thr_getprio() is evil because on Solaris 5.8, a thread with - priority -20 (SCHED_OTHER) is reported to have priority 80. - - - thr_setprio() is evil because it cannot set the negative - priorities on Solaris 5.8. - - - Also, thr_setprio() cannot change the priority of a thread - with negative priority to a positive priority on Solaris 5.8 - (even though there is no error reported and thr_getprio() shows - that the change happened but pthread_getschedparam() shows that - no change happened). - - - In addition, suppose a thread of policy SCHED_RR or SCHED_FIFO - uses thr_setprio() to reset its priority, the priority will be - reset but the scheduling policy will be dropped to SCHED_OTHER. - This happens with both Solaris 5.7 and Solaris 5.8. - -Mon Jul 9 13:33:43 2001 Joe Hoffert - - * include/makeinclude/wrapper_macros.GNU: - Change PACE path to start at $PACE_ROOT rather than $ACE_ROOT/PACE - since the latter is not as flexible. Defined PACE_ROOT if not - already defined. Also, added inclusion of PACE library for VxWorks - even when inlining since not all the PACE functions should be - inlined. - -Mon Jul 09 10:59:22 2001 Ossama Othman - - * THANKS: - - Added Mouna Seri to the hall of fame. - -Mon Jul 9 11:10:44 2001 Jeff Parsons - - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - - Added conditional definitions for ACE_LD_DECORATOR_STR - "mfc" and "mfcd" so that the MFC release and debug versions - of libraries can be dynamically loaded in the same way that - the non-MFC release and debug versions are. Thanks to - Francois Bernier for suggesting - this enhancement. - -Mon Jul 09 11:31:12 2001 Johnny Willemsen - - * ace/pre.h - * include/makeinclude/compiler.bor - - Removed the disabling of the compiler warning 'parameter never - used'. Unused parameters are handled by ACE_UNUSED_ARG macro. - A missing ACE_UNUSED_ARG is now shown as warning in the BCB build - log. - -Sun Jul 08 11:26:23 2001 Ossama Othman - - * ace/OS.h (mkstemp): - * ace/OS.i (mkstemp): - - New mkstemp() wrapper. It is assumed to be available on the - given platform, unless ACE_LACKS_MKSTEMP is defined. - - * ace/FILE_Connector.h: - - Added O_EXCL to the default flags. This is a security hole - fix. - - * ace/FILE_Connector.cpp (connect): - - If mkstemp() is available, then use it to create a temporary - file rather than mktemp() (via ACE_FILE_Addr) since mktemp() is - susceptible to a denial-of-service attack. - - * ace/config-win32-common.h: - * ace/config-vxworks5.x.h: - - mkstemp() is not supported on MS Windows and VxWorks. Define - ACE_LACKS_MKSTEMP in these headers. - -Sun Jul 8 08:13:12 2001 Douglas C. Schmidt - - * ace/Select_Reactor_Base.h: Added a comment explaining what - the ACE_HAS_REACTOR_NOTIFICATION_QUEUE macro means. Thanks to - Kobi Cohen-Arazi for motivating this. - -Sat Jul 7 18:53:49 2001 Krishnakumar B - - * include/makeinclude/platform_osf1_4.0.GNU: - - Revert the changes made to this file. Please see the file for a - lengthy description. - -Fri Jul 06 21:53:26 2001 Christopher Kohlhoff - - * ace/config-win32-borland.h: - Reverted addition of ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION. - -Fri Jul 6 19:55:23 2001 Douglas C. Schmidt - - * examples/Reactor/Multicast: Adding the support for UNIX Syslog - broke this example because LOG_DEBUG was suddenly defined as a - macro (it's in syslog.h). I've fixed this by renaming the LOG_ - enums to LM_ instead. Thanks to Bala for reporting this. - -Fri Jul 06 20:23:41 2001 Steve Huston - - * ace/Refcoutned_Auto_Ptr.i (null): Change const_cast<> to - ACE_const_cast() to build on older compilers, like IBM C/C++ 3.6.6. - -Fri Jul 06 20:13:29 2001 Steve Huston - - * netsvcs/lib/Name_Handler.cpp: - * netsvcs/lib/Server_Logging_Handler_T.cpp: - * netsvcs/lib/Token_Handler.cpp: - - More ACE_DEBUG disables. - -Fri Jul 6 15:55:54 2001 Ossama Othman - - * ace/OS.h (ACE_FD_SETSIZE): - - Integrated patch from Jody Hagins . Set the - default reactor file descriptor set size to be an integer - constant rather than a preprocessor constant. Some third party - software #undef FD_SETSIZE in their header files, causing build - problems in ACE. - -Fri Jul 06 18:20:39 2001 Steve Huston - - * netsvcs/lib/Client_Logging_Handler.cpp: #if 0'd out a bunch of - ACE_DEBUG statements that aren't appropriate for use in commercial - logging. These can be #if 1'd if there's some doubt while debugging - this stuff, but they aren't useful once debugged, and are - distracting since they're interespersed with application records. - -Fri Jul 6 13:40:20 2001 Balachandran Natarajan - - * ace/Log_Msg_UNIX_Syslog.cpp: Fixed a warning in g++. - -Fri Jul 06 11:39:41 2001 Steve Huston - - * ace/INET_Addr.h: Clarified (and improved doxygenation) of - constructor and set() methods regarding byte orders. - - * tests/Max_Default_Port_Test.icc: New file for this test. - * tests/tests.icp: Added Max_Default_Port_Test - -Fri Jul 6 08:36:20 2001 Chad Elliott - - * netsvcs/Makefile: Don't build this if ACE_COMPONENTS does not - contain Other. The netsvcs library requires Naming_Context. - -Fri Jul 6 05:44:13 2001 Douglas C. Schmidt - - * ace/Makefile (LOGGING_FILES): Added support for - Log_Msg_UNIX_Syslog. - - * ace/Log_Msg_UNIX_Syslog.{h,cpp}: - * ace/Log_Msg.cpp, - * ace/OS.h: Added support for a new UNIX syslog backend for the - ACE_Log_Msg class. Thanks to Jerry D. De Master - and Robert Davidson - . - - * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method - comments. Thanks to Alain Decamps for - reporting this. - - * ace/config-macosx.h: Added a new file courtesy of John - Zorko so that things will work on MacOSX. - -Thu Jul 5 23:22:21 2001 Balachandran Natarajan - - Fixes that were required for fixing bug 575. Merged in from - branch bug_575_stage_2. - -Thu Jul 5 23:09:29 2001 Balachandran Natarajan - - * ace/CDR_Stream.cpp (ACE_InputCDR): Fixed a long standing bug in - the branch. This caused the DSI_Gateway test to fail. The - problem was from setting the write pointer to a wrong position - during the construction. - -Thu Jul 5 14:39:45 2001 Balachandran Natarajan - - * Merged with the main trunk and moved it to a new branch by name - bug_575_stage_2. - -Thu Jun 28 15:25:07 2001 Balachandran Natarajan - - * ace/Reactor.h (ACE_Reactor): - * ace/Reactor.cpp: Added a new method resumable_handler () to the - reactor interface. This would indicate whether the application - can take advantage by resuming the handlers themselves or - not. Not all reactors can allow this feature. - - * ace/Reactor_Impl.h: - * ace/Reactor_Impl.cpp: Added a pure virtual function so that all - the implementations can decide whether the handlers are - resumable or not. - - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor_Base.cpp: - * ace/TP_Reactor.h: - * ace/TP_Reactor.cpp: - * ace/WFMO_Reactor.h: - * ace/WFMO_Reactor.cpp:Implemented resumable_handlers (). - -Sun Jun 24 11:25:07 2001 Balachandran Natarajan - - * Created this file. Got the whole stuff in ace to a new branch by - name bug_575_stage_1. This ChangeLog file will be in branch - bug_575. - -Fri Jun 22 16:52:13 2001 Balachandran Natarajan - - * ace/CDR_Stream.cpp: Changed the copy constructor for the - ACE_InputCDR's. Instead of duplicating the ACE_Data_Block we - now use the new copy constructor in the ACE_Message_Block. - - * ace/Message_Block.h: - * ace/Message_Block.cpp: Added a new copy constructor to the - ACE_Message_Block. This copy constructor does a deep copy from - the data block if the data block of the incoming message block - is on the stack or does a shallow copy of the data block (by - incrementing the ref count) if it is on the heap. - - END of entries from bug_575_stage_2. - -Thu Jul 5 22:07:33 2001 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the new perl script in LongUpcalls - in the daily builds. - -Thu Jul 5 20:36:00 2001 Craig Rodrigues - - * ace/config-win32-borland.h - define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - * tests/Token_Test.cpp - Fix template instantiation problem. - -Wed Jul 4 15:35:47 2001 Joe Hoffert - - * tests/run_tests.vxworks: - Removed invocation of CDR_Array_Test. According to the ace - config files the compiler we are using is pre 2.8 (i.e., - ACE_HAS_GNUG_PRE_2_8 is defined). Therefore don't run - CDR_Array_Test since the Makefile doesn't build it (due to - the ACE_HAS_GNUG_PRE_2_8 macro). - -Wed Jul 04 14:26:10 2001 Irfan Pyarali - - * ace/Synch_T.h (class ACE_Acquire_Method): Moved the enums from - the Reverse Lock class into ACE_Acquire_Method, a non-template - class. These enums should have been inside the reverse lock - class, but some lame compilers cannot handle enums inside - template classes. - -Wed Jul 04 12:43:22 2001 Irfan Pyarali - - * ace/Synch_T.i (ACE_Reverse_Lock): Fully specified the - ACE_ACQUIRE_METHOD type. - -Tue Jul 3 15:43:25 2001 Balachandran Natarajan - - * ace/Select_Reactor_Base.cpp: Fixed a warning in g++. - -Tue Jul 3 14:44:00 2001 Craig Rodrigues - - * ace/config-win32-common.h: Borland C++ apparently - does not support the "extern template class" Microsoft VC++ - proprietary extension. Thanks to Chris Kohloff - for the fix. - -Tue Jul 03 12:26:33 2001 Irfan Pyarali - - * ace/Synch_T.h (class ACE_Reverse_Lock): Added a parameter to the - constructor of the reverse lock. The ACE_ACQUIRE_METHOD - parameter is used to indicate which acquire() method will be - called on the real lock when the release() method is called on - the reverse lock. REGULAR indicated the acquire() method, READ - indicates the acquire_read() method, and WRITE indicates the - acquire_write() method. Note that the try_*() methods are not - represented here because we have to make sure that the release() - method on the reverse lock acquires a lock on the real lock. - - Thanks to Edan Ayal for suggesting this. - -Tue Jul 3 06:20:13 2001 Douglas C. Schmidt - - * ace/Reactor.h, - * ace/Reactor_Impl.h, - * ace/Select_Reactor_Base.cpp, - * ace/Select_Reactor_Base.i, - * ace/Select_Reactor_Base.h, - * ace/WFMO_Reactor.cpp, - * ace/WFMO_Reactor.h: Added an enhancement that allows the - Reactor to selectively purge event handlers from its - notification queue according to their Reactor_Mask type. Thanks - to Edan Ayal for contributing this. - - * tests/Reactor_Notify_Test.cpp (run_notify_purge_test): - Added a new set of tests for the new selective notification - purging features of the Reactor. Thanks to Edan Ayal - for contributing this. - - * ace/WIN32_Asynch_IO.cpp: Removed the - ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, - signal_number), initializer since we no longer use virtual - inheritance. Thanks to Alexander Libman - for reporting this. - - * ace/WIN32_Asynch_IO.h: Removed the virtual inheritance from - ACE_WIN32_Asynch_Result for the ACE_Asynch_Read_Stream_Result - and ACE_Asynch_Read_Dgram_Result classes. Thanks to Alexander - Libman for reporting this. - - * ace/Refcounted_Auto_Ptr.h: Made the destructor of - ACE_Refcounted_Auto_Ptr virtual so that users can override it - locally. Thanks to Jenny Kowald for - reporting this. - -Tue Jul 3 09:40:59 2001 Chad Elliott - - * include/makeinclude/platform_osf1_4.0.GNU: - * include/makeinclude/platform_osf1_4.0_g++.GNU: - - Allow users to set options like debug, exceptions, ... without - using override. - -Tue Jul 3 08:38:47 2001 Jeff Parsons - - * examples/Reactor/Proactor/test_dup_proactor.dsp: - - Fixed a mistake in the link to the ACE library. - -Mon Jul 2 16:23:04 2001 Jeff Parsons - - * examples/Reactor/Proactor/test_multiple_loops.dsp: - * examples/Reactor/Proactor/test_proactor.dsp: - * examples/Reactor/Proactor/test_proactor.dsw: - * examples/Reactor/Proactor/test_timeout.dsp: - * examples/Reactor/Proactor/test_udp_proactor.dsp: - - Fixed settings on release version of test_udp_proactor.dsp, - added it to the workspace, and removed unused file folders - from the FileViews of the other projects. - -Mon Jul 2 15:26:32 2001 Nanbor Wang - - * ace/config-sunos5.6.h: Removed ACE_HAS_POSIX_SEM and - ACE_LACKS_NAMED_POSIX_SEM. Thanks to Glenn Popelka - for helping track this down. - -Mon Jul 02 11:45:57 2001 Ossama Othman - - * bin/make_release: - - Disabled bootstrapping of ACE's autoconf support. It isn't - ready for general use. Doing so reduces the amount of - confusion. Thanks to Holger P. Krekel for - motivating this change. - -Mon Jul 2 13:18:14 2001 Douglas C. Schmidt - - * Moved ACE-configurations.txt into the docs directory. Also - removed the hopelessly out of date BIBLIOGRAPHY file. - - * Moved all the ChangeLog-* files into the new ChangeLogs - directory. Thanks to Holger P. Krekel for - this suggestion. - -Mon Jul 02 11:20:52 2001 Ossama Othman - - * config.guess: - * config.sub: - - Updated to the latest versions from the GNU FTP site. - -Mon Jul 02 11:30:20 2001 Irfan Pyarali - - * ace/Synch_T.i: Since the release() method on the reverse lock - calls the simple acquire() method on the real lock, it is - assumed that it is a simple acquire/release protocol with the - real lock. Therefore, I think all the other methods on the - reverse lock tryacquire(), acquire_read(), acquire_write(), - tryacquire_read(), tryacquire_write(), and - tryacquire_write_upgrade() should not be allowed. This falls in - line with the original concept of using reverse locks with - regular guards. - - Thanks to Edan Ayal for pointing this out. - -Mon Jul 2 11:17:37 2001 Chad Elliott - - * ace/Profile_Timer.cpp: - - Cleaned up the conditional macros. Added method bodies for - ACE_Profile_Timer::get_rusage() and - ACE_Profile_Timer::elapsed_rusage() when neither ACE_HAS_PRUSAGE_T - nor ACE_HAS_GETRUSAGE is defined. - - * Reverted the reverted changes in this entry. - "Fri Jun 29 22:31:56 2001 Balachandran Natarajan - ". These changes are ok, I just - needed to fix the bug in Profile_Timer.cpp. - -Mon Jul 2 09:40:45 2001 Chad Elliott - - * include/makeinclude/platform_aix_ibm.GNU: - - Add the output filter to the linker to avoid the duplicate symbol - warnings on AIX. - -Mon Jul 2 05:40:54 2001 Douglas C. Schmidt - - * ace/Logging_Strategy.cpp: Enhanced the code so that it works with - ACE_LACKS_IOSTREAM_TOTALLY. Thanks to Nir Drang - and Edan Ayal for reporting this. - - * ace/SPIPE_Addr.cpp (set): Added a "+ 1" to the computation of - the size of the SPIPE_Addr to account for the trailing NUL. - Thanks to Oren Zeev-Ben-Mordehai for - reporting this. - - * ace/Refcounted_Auto_Ptr.{h,i}: Added support for a "null()" - method to check if a refcounted auto ptr is NULL. Thanks to - Jenny Kowald for reporting this. - - * ace/config-macosx.h, - * ace/platform_macosx.GNU: Enhanced these files to support MacOSX. - Thanks to John Zorko for contributing this. - - * ace/Synch.h: Fixed the Doxygen documentation for all the - removed_ fields, which where somehow messed up. Thanks to - Johnny Willemsen for reporting this. - -Sun Jul 1 11:49:13 2001 Alexander Libman - - * ace: Enhanced the POSIX and Sun Proactor implementations as - follows: - - . POSIX_SIG_Proactor is now based on POSIX_AIOCB_Proactor - - . All classes ACE_POSIX_SIG_Asynch_XXXX are removed. - POSIX_SIG_Proactor uses the ACE_POSIX_AIOCB_Asynch_XXXX - classes now. - - . ACE_POSIX_AIOCB_Proactor::register_and_start_aio (...) - now calls a new virtual method: int - ACE_POSIX_AIOCB_Proactor::allocate_aio_slot - (ACE_POSIX_Asynch_Result *result). - - . The strategy of free slot allocation in SIG_Proactor is - a bit different from AIOCB and SUN Proactors. The - allocate_aio_slot() method is responsible for setting - notification information for aio request - (SIGEV_NONE/SIGEV_SIGNAL). For SIG_Proactor, the field - aio_sigevent.sigev_value.sival_int now contains index of aiocb - in the aiocb_list_, not a pointer. - - . The ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status, - int &return_status, size_t - &index, size_t &count) - parameter index defines initial slot to scan and the new - parameter count tells us maximum number slots to scan. On - return: index contains value to start scan next time, count - contains remained number of slots. Scanning is performed in - "wheel" style to allow all requests be handled with equal - priorities. - - . ACE_POSIX_AIOCB_Proactor::check_max_aio_num () checks for - max_number_files to open and tries to setup max_number_files - equal to aiocb_max_size_. if we failed than cut off - aiocb_max_size_ value to existing max_number_files. - - . POSIX_Proactor added member int os_id_ and constructor sets up - os_id_ (compilation time + run_time function) to know - OS(Sun/HP/Linux/...) and version. We need such info for - POSIX_SIG_Proactors to take into account the behavior of - different OS. - - . Delivery of simulated/"post_completed" Asynch_Results - (Timers, AsynchAccept,Wakeup ...). As both Proactors have no - reliable mechanizm for delivery "post_completed" results, so - the reliable queue of "post_completed" results was - implemented. The new member of AIOCB Proactor - ACE_Unbounded_Queue result_queue_ - has been added. Also added protected methods to the - ACE_POSIX_AIOCB_Proactor. - - . We had an error in all previous versions (from major ACE 5.1): - post_completion (int how_many) does not guarantee that all - completions will be delivered to the different threads running - event_loop (sometimes several completions could be delivered - to the one thread, in another thread performs during long time - application_spesific_code ()). Moreover, you can run now - Proactor event_loop in any number of threads (more than - SIGQUEMAX). - -Sun Jul 1 11:49:13 2001 Douglas C. Schmidt - - * examples/Reactor/Proactor: Integrated a test that exercises the - support for asynchronous UDP operations. Thanks to Roger Tragin - for contributing this. - - * ace/Synch_T.i: Changed the implementations of all the - acquire*() method to call release(). Thanks to Edan Ayal - for reporting this. - -Sat Jun 30 12:44:11 2001 Douglas C. Schmidt - - * examples/Connection/blocking/SPIPE-acceptor.cpp: Added better - support for shutting down the server when a signal occurs. - Thanks to Rich Newman for this - enhancement. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a deleted file mode 100644 index 870ec350d6e..00000000000 --- a/ChangeLogs/ChangeLog-02a +++ /dev/null @@ -1,9018 +0,0 @@ -Fri Jul 5 10:30:44 2002 Douglas C. Schmidt - - * ace/Array_Base.cpp: Swapped the order of includes so that - Array_Base.h comes after Malloc_Base.h. Thanks to Al Pariante - for reporting this. - -Thu Jul 4 11:27:05 2002 Douglas C. Schmidt - - * Happy 226th Birthday USA! - -Sat Jul 06 19:32:40 2002 Balachandran Natarajan - - * ace/Time_Value.h (ACE_Time_Value): Fix for [BUGID 1240]. Some of - the operators were missing explicit declarations in the header - file (they were anyway defined in the inlined files) which - created problems in builds where inlining was diabled. Please - see - - http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1240 for - more details. Thanks to Marina Spivak for - reporting this. - -Fri Jul 5 18:44:39 2002 Steve Huston - - * ace/ACE.cpp: Corrected undeclared 'select_width' errors and - signed/unsigned mismatch warnings. - -Fri Jul 5 16:14:51 2002 Steve Huston - - * ace/OS.{h i} (send, sendto, recv, recvfrom): Change 'len' argument - from int to size_t. - Removed conditional typedef of ssize_t; it's done in Basic_Types.h. - - * ace/ACE.h (recv): Filled in documentation for varargs variant. - * ace/ACE.cpp (send, recv): Properly convert size_t 'count' arg to int - iovec count for call to ACE_OS::sendv/recvv(). - (handle_timed_accept, handle_timed_complete, handle_ready): Use - an int select_width for ACE_OS::select() calls to get the types - correct. This arg is ignored on Windows anyway. - - * ace/Basic_Types.h: If ACE_HAS_SSIZE_T not defined, and Win64, - typedef SSIZE_T ssize_t; else use the existing int typedef. - - * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: - Change thread function to return ACE_THR_FUNC_RETURN, not void *. - -Tue Jul 02 21:43:53 2002 Nanbor Wang - - * ACEXML/common/XMLFilterImpl.h: One more pre/post mismatch. - -Tue Jul 2 16:58:55 2002 Krishnakumar B - - * ACEXML/common/XML_Types.h: - - Removed unnecessary includes and fixed a typo. - -Tue Jul 02 16:35:19 2002 Nanbor Wang - - * ACEXML/common/Attributes.h: - * ACEXML/common/Locator.h: Fixed mismatched pre/post inclusions. - - * ACEXML/parser/parser/Parser.cpp: Fixed compilation errors. - -Tue Jul 2 11:53:29 2002 Steve Huston - - * ace/config-all.h: Changed definition of ACE_THR_FUNC to incorporate - the platform's thread function return type (DWORD on Windows, - void * on most others). Uses a new typedef ACE_THR_FUNC_RETURN - to specify the platform's thread function return type. - - * ace/OS.{h i cpp} (thr_exit, thr_join): The status arg is now - a ACE_THR_FUNC_RETURN *. - Also moved remaining thread function definition type things to - config-all.h with the rest of them. - - * ace/Base_Thread_Adapter.{h cpp} (invoke(), ace_thread_adapter()): - * ace/OS_Thread_Adapter.{h cpp} - * ace/Thread_Adapter.{h cpp} (invoke(), invoke_i()): - Return type changed from void * to ACE_THR_FUNC_RETURN. - - * ace/Event_Handler.{cpp h} (read_adapter): Change return value from - void* to ACE_THR_FUNC_RETURN. - - * ace/Thread_Hook.{h cpp}: ACE_Thread_Hook::start () returns - ACE_THR_FUNC_RETURN, not void *. - - * ace/Thread.{h i} (exit, join): 'status' arg is now - ACE_THR_FUNC_RETURN *, not void *. - - * ace/Thread_Control.{h inl cpp} (status, exit): - * ace/Thread_Manager.{h cpp} (exit, join): Thread exit status - type changed from void * to ACE_THR_FUNC_RETURN. - - * ace/Task.{h cpp} (ACE_Task_Base): Return type from svc_run now - ACE_THR_FUNC_RETURN. - - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.{cpp, h}: - * examples/C++NPv2/Select_Reactor_Logging_Server.cpp: - * examples/C++NPv2/Server_Shutdown.cpp: - * examples/C++NPv2/TP_Reactor_Logging_Server.cpp: - * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp: - * examples/C++NPv2/Client_Logging_Daemon.cpp: - * examples/Connection/blocking/SPIPE-acceptor.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-server.cpp: - * examples/Reactor/WFMO_Reactor/Abandoned.cpp: - * performance-tests/TCP/tcp_test.cpp: - * tests/ACE_Init_Test.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/Service_Config_DLL.cpp: - * tests/Task_Test.cpp: - * tests/Thread_Pool_Reactor_Resume_Test.cpp: - * tests/Thread_Pool_Reactor_Test.cpp: - Change thread function to return ACE_THR_FUNC_RETURN, not void *. - - * examples/C++NPv2/TP_Logging_Server.cpp (handle_input, svc): - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp (open): - * examples/C++NPv2/display_logfile.cpp (svc): Change - ACE_reinterpret_cast to ACE_static_cast. Thanks to Doug Schmidt - for finding this. - - * examples/C++NPv2/TP_Logging_Server.h: - * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp: Corrected use - of ACE_NEW_RETURN. - -Mon Jul 1 23:16:47 2002 Jeff Parsons - - * */Makefile: - - Updated dependencies. - -Mon Jul 1 21:59:44 2002 Krishnakumar B - - * ACEXML/common/Attributes.h: - * ACEXML/common/AttributesImpl.h: - * ACEXML/common/Attributes_Def_Builder.h: - * ACEXML/common/CharStream.h: - * ACEXML/common/ContentHandler.h: - * ACEXML/common/DTDHandler.h: - * ACEXML/common/DTD_Manager.h: - * ACEXML/common/DefaultHandler.h: - * ACEXML/common/Element_Def_Builder.h: - * ACEXML/common/EntityResolver.h: - * ACEXML/common/Env.h: - * ACEXML/common/ErrorHandler.h: - * ACEXML/common/Exception.h: - * ACEXML/common/FileCharStream.h: - * ACEXML/common/HttpCharStream.h: - * ACEXML/common/InputSource.h: - * ACEXML/common/Locator.h: - * ACEXML/common/LocatorImpl.h: - * ACEXML/common/Mem_Map_Stream.h: - * ACEXML/common/NamespaceSupport.h: - * ACEXML/common/SAXExceptions.h: - * ACEXML/common/StrCharStream.h: - * ACEXML/common/Transcode.h: - * ACEXML/common/URL_Addr.h: - * ACEXML/common/Validator.h: - * ACEXML/common/XMLFilter.h: - * ACEXML/common/XMLFilterImpl.h: - * ACEXML/common/XMLReader.h: - * ACEXML/common/XML_Codecs.h: - * ACEXML/common/XML_Types.h: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.h: - * ACEXML/parser/debug_validator/Debug_DTD_Manager.h: - * ACEXML/parser/debug_validator/Debug_Element_Builder.h: - * ACEXML/parser/debug_validator/Element_Tree.h: - * ACEXML/parser/parser/Entity_Manager.h: - * ACEXML/parser/parser/Parser.cpp: - * ACEXML/parser/parser/Parser.h: - - ACE_LACKS_PRAGMA_ONCE fixes. - -Mon Jul 1 06:21:00 2002 Douglas C. Schmidt - - * ace/Sock_Connect.cpp (count_interfaces): Added a MacOSX-specific - value for OSIOCGIFCONF. Thanks to John Zorko - for this fix. - -Sun Jun 30 22:22:05 2002 Irfan Pyarali - - * ace/MEM_Addr.cpp (same_host): This method was unnecessarily - creating and copying both the local and remote addresses. I - changed it so that we only compare the IP addresses. - - * ace/MEM_Connector.cpp (connect): Changed debugging statement to - provide additional information. - -Sun Jun 30 15:32:47 2002 Douglas C. Schmidt - - * ace/Based_Pointer_Repository.h: - * ace/Array_Base.h: Added #include "ace/OS.h" to get the - definition of size_t on MacOS. Thanks to John Zorko - for this fix. - - * ace/Synch.cpp: Fixed the ACE_recursive_mutex_state::reset() method - so that it sets m.LockCount to 0. Thanks to Davide Pasetto - for reporting this. - - * ace/Synch.cpp: Fixed the implementation of - ACE_Condition so that it works - properly on Windows, where the recursive mutex count is - incremented by the OS. Thanks to Davide Pasetto - for reporting this. - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: - * examples/C++NPv2/Client_Logging_Daemon.cpp: Changed "blocks" - parameter to "chunk" to be consistent with the terminology in - the book. - - * examples/C++NPv2/TP_Logging_Server.h: - * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp: Added some - new code to safely allocate an array. - -Sun Jun 30 08:55:18 2002 Douglas C. Schmidt - - * tests/Enum_Interfaces_Test.cpp (ACE_TMAIN): Fixed this to use - ACE_Sock_Connect::get_ip_interfaces() rather than ACE::get_ip_interfaces(). - Thanks to for reporting this. - -Sun Jun 30 12:22:12 2002 Johnny Willemsen - - * etc/tao_portablegroup.doxygen: - Added this file that configures the doxygen configuration of the TAO - PortableGroup library. - - * html/index.html: - * bin/generate_doxygen.pl: - Updated these files so that the new PortableGroup doxygen - documentation is generated and listed in the index page. - -Fri Jun 28 08:07:12 2002 Douglas C. Schmidt - - * ace/Logging_Strategy.cpp: Added the ability to toggle - the LM_STARTUP and LM_SHUTDOWN messages. Thanks to - Adee Ran for the patch. - -Fri Jun 28 07:37:12 2002 Johnny Willemsen - - * ACEXML/common/URL_Addr.cpp: - Fixed BCB Unicode build error. - -Thu Jun 27 16:50:19 2002 Balachandran Natarajan - - * ace/TP_Reactor.cpp: - * ace/TP_Reactor.h: - * ace/TP_Reactor.i: Moved common code in get_socket_event_info () - to a new method clear_handle_read_set () and simplified the code - in get_notify_handle () so that it improves readability. - -Thu Jun 27 20:26:33 UTC 2002 Craig Rodrigues - - * tests/DLL_Test.cpp: Define retval before preprocessor checks to - fix Lynx build problem. - -Thu Jun 27 14:32:50 2002 Nanbor Wang - - * bin/nightlybuilds/builds.lst: Moved Fuzz, DLL_Core, DLL_Debug - builds to the new scoreboard also. - -Thu Jun 27 07:47:12 2002 Johnny Willemsen - - * ACEXML/tests/HttpCharStream_Test.cpp: - Fixed BCB Unicode build errors. - - * ACEXML/common/URL_Addr.h: - Documentation update. - -Wed Jun 26 09:56:38 2002 Nanbor Wang - - * bin/msvc_auto_compile.pl: Changed the list of XML related - directory name from XML to ACEXML. - -Wed Jun 26 13:55:01 UTC 2002 Craig Rodrigues - - * examples/Reactor/Multicast/Log_Wrappers.cpp: - * examples/Reactor/Ntalker/Log_Wrappers.cpp: - Remove references to SOCK_Dgram_Mcast_T. - -Tue Jun 25 15:13:49 2002 Steve Huston - - * ace/Basic_Types.h: Added ACE_WIN64 versions of - ACE_SSIZE_T_FORMAT_SPECIFIER and ACE_SIZE_T_FORMAT_SPECIFIER. - -Tue Jun 25 23:22:09 UTC 2002 Craig Rodrigues - - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Dgram_Mcast.h: - * ace/SOCK_Dgram_Mcast.i: - * ace/SOCK_Dgram_Mcast_T.cpp: Removed. - * ace/SOCK_Dgram_Mcast_T.h: Removed. - * ace/SOCK_Dgram_Mcast_T.i: Removed. - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: - * ace/QoS/SOCK_Dgram_Mcast_QoS.h: - Reverted these files to before June 9. Existing code in QoS and - AVStreams were broken do to the changes. - -Tue Jun 25 14:45:31 2002 Steve Huston - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Comment out - declarations for info(), suspend(), and resume() - they're left - as exercises for the reader. - - * examples/C++NPv2/AC_CLD.dsp: Added SSL link libraries. - -Tue Jun 25 12:13:39 2002 Steve Huston - - * examples/C++NPv2/AC_CLD.dsp: - * examples/C++NPv2/examples.dsw: Added project for the - Acceptor-Connector Client Logging Daemon in chapter 7. - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Use the ACE - traits macros instead of relying on traits class support to - help the aged MSVC 6 compiler along. - -Mon Jun 24 20:55:45 2002 Irfan Pyarali - - * ace/ACE.cpp (select): Fixed typo. - -Mon Jun 24 17:39:31 2002 Steve Huston - - * ace/ace_dll64.mak: - * ace/ace_lib64.mak: NMAKE files for building ACE on 64-bit Windows - XP with the Platform SDK compiler. At some point, hopefully, - MSVC will allow 64-bit builds via the regular project files, - but for now, must use NMAKE. - - * ace/config-win32-common.h: #define ACE_WIN64 if doing a 64-bit build. - - * ace/ACE.cpp (select): Don't sync() the handles after select() on - Win64. The cast is illegitmate, and the call is a no-op on Windows. - -Mon Jun 24 17:55:58 2002 Krishnakumar B - - * include/makeinclude/wrapper_macros.GNU (ACE_BETA_VERSION): - - Grab the version information from Version.h rather than VERSION - as VERSION is not likely to installed when doing a make install. - Thanks to Bala for the suggestion. - - * ACEXML/parser/parser/Parser.cpp: - * ACEXML/parser/parser/Parser.h: - - Get the prefix right in case of a default namespace being - present. Previously we were using a URI a get to the prefix, - which doesn't work when the URI is the same as URI for another - namespace prefix. - -Mon Jun 24 19:54:34 UTC 2002 Craig Rodrigues - - * ace/config-g++-common.h: Define - ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION for gcc 2.95 and higher. - -Mon Jun 24 07:26:41 2002 Douglas C. Schmidt - - * ace/Timer_Queue_Adapters.cpp: - * ace/Timer_Queue_Adapters.h: Changed uses of ACE_Recursive_Thread_Mutex - to ACE_RECURSIVE_SYNCH_MUTEX so things will work properly on - single-threaded configurations. Thanks to Craig Rodrigues for - reporting this. - -Mon Jun 24 12:07:00 UTC 2002 Craig Rodrigues - - * ace/RMCast/RMCast_IO_UDP.cpp: Remove ACE_SOCK_Dgram_Ex template instantiation. - -Mon Jun 24 03:26:10 2002 Krishnakumar B - - * ACEXML/common/AttributesImpl.cpp(isDuplicate): - - New function isDuplicate() to check duplicate attributes. Merged - support for duplicate attribute checking in setAttribute(). - - * ACEXML/common/AttributesImpl.h: - - Fixed documentation for a bunch of functions which had set/get - roles reversed. - - * ACEXML/common/AttributesImpl.i: - - Fixed more memory leaks. - - * ACEXML/common/NamespaceSupport.cpp(processName): - - Added support for processing attributes. - - * ACEXML/parser/parser/Parser.cpp: - * ACEXML/parser/parser/Parser.h: - - Implement XML Namespace (http://www.w3.org/TR/REC-xml-names) - support. ACEXML parser supports the SAX 2.0 XML API. Parser has - two user tunable features available: namespaces (defaults to - true) and namespace_prefixes (defaults to false). - - * ACEXML/examples/SAXPrint/Print_Handler.cpp: - * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: - - Changed to reflect more event callbacks available now due to - above added support. - - * ACEXML/examples/SAXPrint/ns.svc.conf.xml: - - Changed to include a default namespace to test more code paths. - Found a bug in the process :-) Will fix tomorrow. - - The only remaining feature in ACEXML parser needed for CCM is - validator. Next target.... - - * ace/Message_Block.h: - - Fixed typo in documentation (ceases to exist and not seizes to - exist). - -Sun Jun 23 21:06:28 UTC 2002 Craig Rodrigues - Bill Fulton - - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Dgram_Mcast.h: - * ace/SOCK_Dgram_Mcast_T.cpp: - * ace/SOCK_Dgram_Mcast_T.h: - * ace/SOCK_Dgram_Mcast_T.i: - More SOCK_Dgram fixes supplied by Bill Fulton with modifications - by Craig Rodrigues. - - Remove proprietary typedefs for ACE mutex classes - - Make default mutex strategy for SOCK_Dgram_Mcast ACE_SYNCH_MUTEX - - (subscribe_ifs) fix check when determining if subscribed address - is the same as the bound address - -Sun Jun 23 14:51:48 2002 Douglas C. Schmidt - - * ace/Synch.h: Put the class ACE_recursive_mutex_state inside - the section ACE_HAS_THREADS. Thanks to Craig Rodrigues - for noticing the need for this. - -Sun Jun 23 14:05:12 2002 Johnny Willemsen - - * ACEXML/common/HttpCharStream.cpp: - Fixed BCB Unicode compile errors. - -Fri Jun 21 19:18:05 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move to IA64_Linux_GCC_3.1 and - Tru64_CXX builds to new scoreboard. - -Fri Jun 21 14:34:51 2002 Steve Huston - - * ace/config-sunos5.5.h: Enable - ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION for Forte 6 Update 1. - -Fri Jun 21 14:06:33 2002 Steve Huston - - * ace/Timer_Queue_Adapters.cpp (ACE_Thread_Timer_Queue_Adapter): - Changed ACE_GUARD_RETURN uses of command_mutex_ from - ACE_Recursive_Condition_Mutex to ACE_SYNCH_MUTEX to match - its definition. - -Fri Jun 21 06:21:33 2002 Christopher Kohlhoff - - * ace/config-win32-borland.h: - Re-enable ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION for all - versions of Borland C++. - -Thu Jun 20 20:50:51 2002 Steve Huston - - * ace/config-sunos5.5.h: Re-enable - ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION for Forte 6 Update 2. - - * ace/Functor.i: - * ace/Synch.cpp: Commented out all the uses of - ACE_TEMPLATE_METHOD_SPECIALIZATION. The class specialization was - already declared such, and doing it on the methods is not right. - But they're only commented out for now, just in case... - -Thu Jun 20 20:29:31 2002 Steve Huston - - * ace/Codecs.h (ACE_Base64): Added "friend class ace_dewarn_gplusplus" - to silence g++ warnings about private ctors and no friends. - -Thu Jun 20 20:21:39 2002 Steve Huston - - * tests/Recursive_Condition_Test.icc: Visual Age C++ configuration - for this new test. - * tests/tests.icp: Added Recusrive_Condition_Test.icc. - -Fri Jun 21 00:21:48 UTC 2002 Craig Rodrigues - - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp (dump): - Switch from ACE_SYNCH_MUTEX to ACE_SYNCH_RECURSIVE_MUTEX. - -Thu Jun 20 14:32:03 2002 Douglas C. Schmidt - - * ace/Synch.cpp (ACE_recursive_mutex_state): Replaced the - ACE_OS::mutex_lock/unlock calls with - ACE_OS::thread_mutex_lock/unlock so things will work on NT. - Thanks to Jeff Parsons for reporting this. - - * ace/Synch.{h,cpp}: Only compile the new - ACE_Condition template - specialization if ACE_HAS_THREADS. Thanks to Craig Rodrigues - for motivating this. - - * include/makeinclude/platform_sunos5_sunc++.GNU (CC_VERSION): Added - additional cases for SunC++ 5.2 and 5.3. Thanks to Carsten - Tonsberg Nielsen for reporting this. - - * ace/ATM_Stream.cpp (get_peer_name): - * ace/Log_Msg_UNIX_Syslog.cpp (log): - * ace/Logging_Strategy.cpp: Replaced the use of ACE_OS::strtok() with - ACE_OS::strtok_r(). Thanks to Eugene Alterman - for motivating this. - -Thu Jun 20 16:02:22 2002 Steve Huston - - * ace/config-sunos5.5.h: Commented out the below addition for now. - -Thu Jun 20 15:49:39 2002 Steve Huston - - * ace/config-sunos5.5.h: For Forte 6, Update 2 and up, add - #define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION. - Earlier Forte 6 versions may also support this, but I don't have - one to test on. - Fixes compile warning on Filecache.cpp. - -Thu Jun 20 13:37:55 2002 Douglas C. Schmidt - - * examples/C++NPv2/README: Updated the README file to map the - filenames to the chapters in C++NPv2. - -Wed Jun 19 21:30:05 UTC 2002 Craig Rodrigues - Bill Fulton - - * ace/SOCK_Dgram_Mcast_T.cpp: Fix Win32 wchar build problems. - Thanks to Bill Fulton for supplying these fixes. - -Wed Jun 19 16:16:32 2002 Nanbor Wang - - * tests/tests.dsw: - * tests/Recursive_Condition_Test.dsp: Added a new project file. - -Wed Jun 19 06:50:54 2002 Douglas C. Schmidt - - * tests/run_test.lst: - * tests/Makefile.bor: - * tests/Makefile: Added the new Recursive_Condition_Test. - - * ACE/Timer_Queue_Adapters.{h,cpp}: Enhanced - ACE_Thread_Timer_Queue_Adapter so it uses the new - ACE_Condition. Thanks to - Stephen Howard for - suggesting this. - - * ace/Synch_T.h: Added a new RECURSIVE_CONDITION trait in - ACE_NULL_SYNCH and ACE_MT_SYNCH. - - * ace/Synch_T.h: Added a #define for ACE_SYNCH_RECURSIVE_CONDITION - so that we can parameterize it based on threads vs. non-threads. - - * docs/exceptions.html: Updated document to use ACE_RE_THROW - instead of the deprecated ACE_RETHROW macro. Thanks to - Andy Ling for reporting this. - - * ace/Timer_Queue_Adapters.h: Changed the order in which - the condition variable and mutex are defined to ensure the - mutex is initialized before we pass it to condition_'s - constructor. - - * ace/Filecache.cpp: - * ace/Synch.cpp: - * ace/Atomic_Op.i: Replaced ACE_TEMPLATE_SPECIALIZATION with - ACE_TEMPLATE_METHOD_SPECIALIZATION so this will compile correctly - on certain (broken) compilers, such as SunC++ 6.1. - -Wed Jun 19 14:25:52 2002 Balachandran Natarajan - - * ace/TP_Reactor.cpp (handle_socket_events): Couple of small - fixes. The fixes are for - - 1. Bug http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1231 - and it is self-explanatory - - 2. The find () operation after dispatch was not holding the lock - and chances of race are high. This is documented as #2 in - bug http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1233 - - Added some comments in the code explaining what is going - on. Thanks to Carlos for identifying the problem. - - * ace/Event_Handler.h: Added a enum to indicate the two states - returnable by the call resume_handler (). - - * ace/Event_Handler.cpp (resume_handler): Instead of returning 0, - we return ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER. - -Wed Jun 19 13:42:16 2002 Balachandran Natarajan - - * tests/tests.dsw (Project): Added TP_Reactor_Test.dsp to the - workspace. - -Wed Jun 19 11:57:02 2002 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Disable TAO/tests/Nested_Upcall_Crash on minimum_corba builds. - -Tue Jun 18 14:29:26 2002 Douglas C. Schmidt - - * ace/Synch.{h,i}: Added a new template specialization of ACE_Condition<> - that supports recursive mutexes used in conjunction with ACE - condition variables. Thanks to Michael Lindner - and Mike Vitalo for - contributing this. - - * ace/SOCK_Dgram_Mcast.cpp: Reverted the file to the previous version - since somehow things got messed up... - -Tue Jun 18 12:44:54 2002 Douglas C. Schmidt - - * ace/OS.{h,i}: Added a new method called stopped() that - returns 1 if the timer has already been stopped. Thanks to - Giovanni Zito for this suggestion. - -Tue Jun 18 12:17:58 2002 Jaiganesh Balasubramanian - - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: - Added the RCS ID symbol. - -Tue Jun 18 12:41:15 2002 Balachandran Natarajan - - * ace/CDR_Stream.i (adjust): Added a check for pointer overflow - befor setting the write pointer. thanks to Rich Siebel and Byron - Harris for pointing this out. - -Tue Jun 18 07:50:14 2002 Ossama Othman - - * ace/Env_Value_T.h: - - Include "ace/OS.h". It is required for some types and function - calls made in this header. Thanks to Michael Kircher for - pointing this out. - -Mon Jun 17 17:36:52 2002 Steve Huston - - * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: Changed call - to ACE_Asynch_Connector::open() to take advantage of new - defaults, made on: - Sat Jun 15 20:30:41 2002 Steve Huston - -Mon Jun 17 17:21:38 2002 Steve Huston - - * ace/SUN_Proactor.cpp (handle_events): Remove the now-deleted - success argument from call to application_specific_code(). - -Mon Jun 17 13:40:24 2002 Balachandran Natarajan - - * include/makeinclude/platform_osf1_4.x_cxx.GNU: Removed the hard - override of LDFLAGS. Thanks to Martin Krumpolec - . - -Mon Jun 17 06:20:55 2002 Christopher Kohlhoff - - * ace/Object_Manager.cpp: - * ace/Service_Config.h: - * ace/Service_Config.cpp: - - Some components registered with the framework repository have - dependencies on the ACE_Log_Msg or ACE_Thread_Manager singletons. - Reorganised the ACE_Object_Manager::fini function so that the - framework repository is cleaned up before these objects. Thanks to - Don Hinton for assistance in tracking this down. - - * ace/Reactor.cpp: - - Prevent the reactor from being erroneously registered with the - framework repository a second time, as happened when the reactor - instance pointer was explicitly set. - -Sun Jun 16 20:38:27 2002 Krishnakumar B - - * ace/DLL_Manager.cpp (ACE_DLL_Handle): - * ace/DLL.cpp: - - More mismatched delete/delete[] errors. I am fixing the easier - ones. There may be more. - -Sun Jun 16 20:22:28 2002 Krishnakumar B - - * ACEXML/common/AttributesImpl.i (qName): - - Fixed memory leaks caused by mismatched delete/delete[]. Caught - by Valgrind. - - * ACEXML/examples/SAXPrint/main.cpp: - - Give useful usage messages. - - -Sat Jun 15 20:56:29 2002 Steve Huston - - * tests/tests.dsw: Added Proactor_Timer_Test.dsp. - -Sat Jun 15 20:30:41 2002 Steve Huston - - * ace/Asynch_Acceptor.{h cpp}: Added a new template method, - virtual int validate_connection - (const ACE_Asynch_Connect::Result& result, - const ACE_INET_Addr &remote, - const ACE_INET_Addr& local) - It replaces the old validate_new_connection() method, which is - now marked deprecated. Semantics are the same (return -1 to - ask framework to abort the connection before activating a - service). However, more information is available, including - the socket handle. - - * ace/Asynch_Connector.{h cpp}: Replaced validate_new_connection() - method with: - virtual int validate_connection - (const ACE_Asynch_Connect::Result& result, - const ACE_INET_Addr &remote, - const ACE_INET_Addr& local) - Examining the result argument is the only way to find out if - the asynchronous connect attempt succeeded or not. - The connect completion calls validate_connection() on either - success or failure as long as the validate_new_connection - flag is set on open(). The default value was changed from - 0 (don't call) to 1 (call) since this is the only way to learn - about connection success/failure. - - * ace/POSIX_Proactor.{h cpp} (application_specific_code): - * ace/WIN32_Proactor.{h cpp} (application_specific_code): Removed the - 'int success' argument. Success/fail is determined by the error - value now (0 == success). Simplifies the code, and makes the - result.success() call return 1 iff the operation succeeded. - - Thanks very much to Alex Libman for these ideas and for working - to improve these classes for ACE and C++NPv2! - -Sat Jun 15 12:01:38 2002 Steve Huston - - * ace/Obstack_T.cpp (request): Don't lose an initial set of characters - if the requested length won't fit. Thanks to Christopher W. Midgley - for this report and fix. - - * tests/Obstack_Test.{cpp dsp icc}: New test for the above, and - its MSVC and Visual Age C++ files. - - * tests/Makefile: - * tests/Makefile.bor: - * tests/run_test.lst: - * tests/tests.dsw: - * tests/tests.icp: Added new Obstack_Test. - - * THANKS: Added Christopher W. Midgley. - -Sat Jun 15 12:41:07 Frank Hunleth - - * THANKS: Added Nick Cross to the hall of fame. - -Fri Jun 14 14:39:33 2002 Nanbor Wang - - * ace/Filecache.cpp: Removed excessive ACE_DEBUG statements. - Thanks to Charles F. Frasch for - reporting them. - -Fri Jun 14 12:04:17 2002 Jaiganesh Balasubramanian - - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: - * ace/QoS/SOCK_Dgram_Mcast_QoS.h: - Removed build errors for QoS library, due to dependencies to the - old SOCK_Dgram_Mcast class. Thanks to Bill Fulton for this fix. - -Fri Jun 14 14:17:49 2002 Carlos O'Ryan - - * bin/auto_run_tests.pl: - Fixed wrong application name in Usage message. - - * bin/auto_run_tests.lst: - Add the Nested_Upcall_Crash test. - -Fri Jun 14 09:34:41 2002 Ossama Othman - - * ace/OS.i (ctime): - - For the ACE_HAS_WINCE, pass a statically allocated buffer to - ctime_r() since ctime_r() will return that same buffer as the - return value of ctime(). Fixes memory access violations. - Thanks to Michael Searles for pointing out - the problem. - -Thu Jun 13 21:26:49 2002 Steve Huston - - * ace/Configuration_Import_Export.cpp (squish): Replaced use - of naked isspace() with ACE_OS_String::ace_isspace() to work - with wide chars also. - -Thu Jun 13 21:09:33 2002 Steve Huston - - * tests/Config_Test.cpp (run_tests): Added a test for importing - a previously-existing ini file and verifying its contents. - - * tests/Config_Test_Import_1.ini: File for the above test. - -Thu Jun 13 19:05:57 2002 Krishnakumar B - - * include/makeinclude/rules.local.GNU: - - Added a rule to install a symlink to libfoo.so.3 under - $(ACE_ROOT)/ace. This should fix all the build errors. ld.so - needs libfoo.so.3 to be in LD_LIBRARY_PATH. libfoo.so doesn't - do. Thanks to Marvin Wolfthal for reporting the - problem. - - * bin/make_release: - - Changes to ensure that all major releases are named - ACE-[0-9]+.0.0 and all minor releases are named - ACE-[0-9]+.[0-9]+.0. PLEASE TAG THE REPOSITORY AS ACE_5_3_0 and - TAO_1_3_0 or ACE_6_0_0 and TAO_2_0_0 WHEN MAKING A MINOR OR A - MAJOR RELEASE. Pointers to add this to somewhere more prominent - are welcome. - -Thu Jun 13 14:45:13 2002 Douglas C. Schmidt - - * ace/SOCK_Dgram_Mcast_T.cpp: Added wchar support - remove - warnings in MSVC when #define ACE_USES_WCHAR used in config.h. - Thanks to Bill Fulton for this fix. - -Wed Jun 12 21:28:29 2002 Steve Huston - - * tests/Framework_Component_DLL.cpp (Server_T): Add template - parameter name to class template arg to get aC++ to eat it. - -Wed Jun 12 18:29:11 2002 Krishnakumar B - - * include/makeinclude/rules.lib.GNU: - * include/makeinclude/rules.local.GNU: - * include/makeinclude/wrapper_macros.GNU: - * TAO/rules.tao.GNU: - * include/makeinclude/platform_g++_common.GNU: - - Added support for shared library versioning. Libraries built - with GNU ld will be versioned by default. - - * include/makeinclude/platform_aix4_cset++.GNU: - * include/makeinclude/platform_aix4_g++.GNU: - * include/makeinclude/platform_aix_g++.GNU: - * include/makeinclude/platform_aix_ibm.GNU: - * include/makeinclude/platform_hpux.GNU: - * include/makeinclude/platform_hpux_aCC.GNU: - * include/makeinclude/platform_hpux_gcc.GNU: - * include/makeinclude/platform_hpux_kcc.GNU: - - Added null SONAME and SOVERSION for disabling shared library - versioning. - - * include/makeinclude/platform_dgux4_epc.GNU: - * include/makeinclude/platform_freebsd.GNU: - * include/makeinclude/platform_gnuwin32_common.GNU: - * include/makeinclude/platform_irix5.3_g++.GNU: - * include/makeinclude/platform_irix5.3_sgic++.GNU: - * include/makeinclude/platform_irix6.x_g++.GNU: - * include/makeinclude/platform_irix6.x_kcc.GNU: - * include/makeinclude/platform_irix6.x_sgic++.GNU: - * include/makeinclude/platform_linux.GNU: - * include/makeinclude/platform_linux_cxx.GNU: - * include/makeinclude/platform_linux_icc.GNU: - * include/makeinclude/platform_linux_kcc.GNU: - * include/makeinclude/platform_m88k.GNU: - * include/makeinclude/platform_macosx.GNU: - * include/makeinclude/platform_mvs.GNU: - * include/makeinclude/platform_netbsd.GNU: - * include/makeinclude/platform_osf1_3.2_cxx.GNU: - * include/makeinclude/platform_osf1_4.x_cxx.GNU: - * include/makeinclude/platform_osf1_4.x_g++.GNU: - * include/makeinclude/platform_osf1_4.x_kcc.GNU: - * include/makeinclude/platform_osf1_4.x_rcc.GNU: - * include/makeinclude/platform_psosim_g++.GNU: - * include/makeinclude/platform_qnx_neutrino.GNU: - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - * include/makeinclude/platform_sco-nothread.GNU: - * include/makeinclude/platform_sco5.0.0-CC-fsu-pthread.GNU: - * include/makeinclude/platform_sco5.0.0-mit-pthread.GNU: - * include/makeinclude/platform_sco5.0.0-nothread.GNU: - * include/makeinclude/platform_sunos4_g++.GNU: - * include/makeinclude/platform_sunos4_lucid.GNU: - * include/makeinclude/platform_sunos4_sunc++3.x.GNU: - * include/makeinclude/platform_sunos4_sunc++4.x.GNU: - * include/makeinclude/platform_sunos5_centerline.GNU: - * include/makeinclude/platform_sunos5_g++.GNU: - * include/makeinclude/platform_sunos5_ghs.GNU: - * include/makeinclude/platform_sunos5_kcc.GNU: - * include/makeinclude/platform_sunos5_sunc++.GNU: - * include/makeinclude/platform_tandem.GNU: - * include/makeinclude/platform_unixware_g++.GNU: - * include/makeinclude/platform_unixware_udk.GNU: - - Changed SOFLAGS = to SOFLAGS += to avoid dealing with order of - includes of various Makefile rules. - -Wed Jun 12 11:25:22 2002 Douglas C. Schmidt - - * tests/Config_Test.cpp (test): Removed what appeared to be - an unnecessary and unused called to - const ACE_Configuration_Section_Key &root = config->root_section (); - - * ace/Configuration.cpp (open_section): Fixed a warning in the - loop expression. - -Wed Jun 12 11:49:33 2002 Steve Huston - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Changed to - match book. - - * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp (init): - Use ACE_Auto_Array_Ptr to be cleaner about allocated char ptr - array. Coincides with book change. - -Tue Jun 11 10:23:03 2002 Stephen Torri - - * ace/String_Base.h: Updated comments/documentation on the String_Base - class. - - * ace/String_Base.{i,cpp}: Added brackets to if/else statements for - better structure/readability. Changed "(cond) ? true : false" to - better "if/else" structure. - -Tue Jun 11 19:05:39 2002 Douglas C. Schmidt - - * ace/SOCK_Dgram_Mcast.h: Added a default constructor for - ACE_SOCK_Dgram_Mcast. - - * tests/Config_Test.cpp (test): Added tests for the following capability. - Thanks to Eugene Alterman for - contributing these tests. - - * ace/Configuration.{h,cpp}: - ACE_Configuration_Heap::open_section() now accepts path - separators in section name, so that it is consistent with the - updated version of - ACE_Configuration_Win32Registry::open_section(). Thanks to - Eugene Alterman for contributing this - patch. - -Tue Jun 11 20:02:39 2002 Steve Huston - - * ace/DLL_Manager.cpp (ACE_DLL_Handle::error()): Change to a - different form of auto_ptr initialization that Visual Age C++ - likes better. - -Tue Jun 11 13:17:29 2002 Douglas C. Schmidt - - * ace/Cache_Map_Manager_T.h: - * ace/Caching_Utility_T.h: - * ace/Env_Value_T.h: Added #include "ace/Global_Macros.h". - Thanks to Ty Tenait for reporting this. - - * ace/Dirent_Selector.h: Added #include "ace/ACE_export.h". - Thanks to Ty Tenait for reporting this. - -Tue Jun 11 09:42:06 2002 Ossama Othman - - * ace/SOCK_Dgram_Mcast_T.cpp (make_multicast_ifaddr): - - Use ACE_HTONL instead of htonl(). The latter causes the - assembler to choke on some Linux installations. - -Mon Jun 10 14:50:46 2002 Nanbor Wang - - * examples/DLL/Dll.dsw: - * examples/ASX/CCM_App/CCM_App.dsw: Updated project dependencies. - -Mon Jun 10 14:23:28 2002 Douglas C. Schmidt - - * ace/Reactor.h (ACE_Reactor): Added a comment explaining that - the mask passed to notify() can only be READ_MASK, WRITE_MASK, - or EXCEPT_MASK. Thanks to Cary Steinmetz - for motivating this comment. - - * ace/OS_String.cpp: Make sure to check whether src == dst and - avoid doing any copies in this case. Thanks to Michael Searles - for reporting this. - -Sun Jun 9 20:01:00 2002 Douglas C. Schmidt - - * ace/Makefile: Something is wrong with my ACE_ROOT environment - variable, which caused problems with the dependency generation. - This is now fixed. - -Sun Jun 9 19:31:04 2002 Douglas C. Schmidt - - * ace/SOCK_Dgram_Mcast.h: Added ACE_Export to ACE_SOCK_Dgram_Mcast. - -Sun Jun 9 18:57:07 2002 Douglas C. Schmidt - - * examples/Reactor/Ntalker/ntalker.cpp: - * examples/Reactor/Multicast/Log_Wrapper.cpp: Added template - instantiations for the new ACE_SOCK_Dgram_Mcast_Ex<> template. - -Sun Jun 9 18:47:22 2002 Douglas C. Schmidt - - * tests/Config_Test.cpp (run_tests): Added code to exercise the - new subkey path feature contributed by Eugene Alterman. - - * ace/Configuration.{h,cpp}: Added support for the path separator - ('\\') in key names. Thanks to Eugene Alterman - for contributing this patch. - - * ace/Date_Time.{h,i}: Added support for weekday. Thanks to - Eyal Lubetzky for reporting this. - -Sun Jun 9 18:11:02 2002 Douglas C. Schmidt - - * ace/SOCK_Dgram_Mcast.cpp: Removed the explicit inclusion of - "ace/SOCK_Dgram_Mcast_T.cpp" since this is #included appropriately - by SOCK_Dgram_Mcast.h. - - * ace/SOCK_Dgram_Mcast.cpp: Removed the ';' from the end of the - #pragma instantiates. - - * ace/Makefile: Added SOCK_Dgram_Mcast_T. - - * ace/SOCK_Dgram_Mcast_T.cpp - ace/SOCK_Dgram_Mcast_T.i - ace/SOCK_Dgram_Mcast_T.h: - Minor changes to conform to ACE coding conventions. - -Sun Jun 9 17:50:37 2002 Bill Fulton - - * ace/SOCK_Dgram_Mcast.cpp - ace/SOCK_Dgram_Mcast.h - ace/SOCK_Dgram_Mcast_T.cpp - ace/SOCK_Dgram_Mcast_T.i - ace/SOCK_Dgram_Mcast_T.h - - Somewhat massive changes to the (already very useful) - ACE_SOCK_Dgram_Mcast class; some fixes to existing functionality, - some new functionality, and a different way of controlling optional - (per-instance) functionality. The intent was to preserve existing - interface and functionality (when correct), including environment- - specific functionality. - - Fixes to Existing Functionality: - - - For ::unsubscribe(void); unsubscribes from all active subscriptions. - Previous version unsubscribed only from the most recently - subscribed group/net_if. - * This could change execution behavior of existing code. - - - Enhanced support for a passed port# of '0'. - The ephemeral port# assigned by the system when the socket is - bound is used for all local ::send methods. - - - Validation of non-zero port# and, optionally, the address passed - to the ::subscribe method, if the socket has been bound. - On second and subsequent ::subscribe invocations, the previous - version allowed passed parameters that were inconsistent with the - bound socket parameters. This could result in a confusing - condition; you would not receive messages sent to the port and/or - address passed to ::subscribe. - * This could change execution behavior of existing code. - - Added Functionality: - - - Support specification of the (multicast) address and interface to - be used by all local ::send methods, independent of the receive - address and interface. The same port# is used for all base class - ::recv methods and all local class ::send methods. The send - interface applies to all local and all base class ::send methods. - - - Enhanced ::dump method, to show the dynamic list of subscriptions, - the bound address/port#, the send address/interface, and the state - of optional functionality. Also did some output reformatting. - - Optional Functionality via Template Parameters and Ctor Args: - - In the previous implementation, some aspects of class functionality - were transparently configured based on the OS it was compiled - under. This has been changed so that all optional functionality is - explicitly specified, using (a baroque set of) optional - constructor arguments. In addition, new optional functionality - was added and is specified with template parameters and optional - constructor arguments. For backward compatibility, there is an - explicit specialization called ACE_SOCK_Dgram_Mcast - this should - have the same functionality, including OS-specific functionality, - as the previous class implementation, and can still be used for - most normal (if there is such a thing with multicast) apps. - Overview of new template parameter: - ACE_SDM_LOCK_* - - Strategized locking (very limited MT-safety - see below). - Overview of new, optional ctor arguments (enumerations): - opt_bindaddr_* - - Whether to bind the address as well as the port#. - opt_nulliface_* - - Defines semantics of passing net_if parameter of NULL; - i.e. use all or only one iface. - opt_dtorunsub_* - - Whether destructor explicitly unsubscribes from all - groups. - See SOCK_Dgram_Mcast_T.h for a full description. Environment- - specific default values are explicitly declared, for use by app - code. - - Changes to Previous Class (public) Interface & Functionality: - - - Added a public (overloaded) ::open method. - This allows explicit specification of the port# and the multicast - address (if opt_bindaddr_yes is used) that is bound to this - socket. This also allows specification of the address and the - network interface to be used by local ::send methods (and the - network interface used by super-class and sub-class ::send - methods). There is only one address parameter; the same parameter - is used for both the send address/port# and the bound - address/port#. The port# in the address may be 0 (to use a - system-assigned ephemeral port# for sending and receiving). - - NOTE: Use of this method is optional and, if used, must be - invoked _before_ any ::subscribe method is invoked - otherwise it - is _ignored_, and the (first) ::subscribe parameters will be used - to bind the socket and set the send parameters (as in the previous - code). Note that ::subscribe need not be invoked at all, now; if - only ::open is used, you can send but not receive multicast - messages, and you can specify the interface used for sending. - - - Validation of ::subscribe parameters is now strict. - Once the port# is bound (by ::open or the first ::subscribe), the - port# passed to every ::subscribe call must either be '0' or match - the bound port#. Additionally; if opt_bindaddr_yes is used, the - address passed must match the bound address. If these conditions - are not met, an error is returned (with errno=ENXIO). Note that - such subscriptions would have no (useful) effect, since messages - could never be received for the given port#/address, due to IP - stack filtering. This condition was ignored in the previous - version; it is now an error condition. This may break some - existing code - but note that it flushes out a (silent) logical - error condition. - The port# in ::unsubscribe(addr,...) is _not_ checked, though; - this is not logically consistent, but ... a mistaken port# here - seems less potentially dangerous and/or confusing. - - - The previous ::subscribe and ::unsubscribe methods had a special - return code (1) to indicate that (previously Win32-specific) - multiple-interface subscription/unsubscription had been done. This - seemed to be useful only internally, but was visible to the - caller. The new methods will always return '0' for success (even - if opt_nulliface_all is used). - - - The dynamic subscription list housekeeping adds slight processing - overhead, and even more overhead is added if locking is enabled. - This should not be noticeable, except in MT thrashing conditions - and/or if doing very frequent subscribes/unsubscribes. - - Known Restrictions: - - - Interaction/Integration with other ACE multicast-oriented classes - and library code is _undefined_, i.e.: - + ACE_SOCK_Dgram_Mcast_QoS: Presumably works ok, but inherits - legacy class; can't specify optional functionality. - + ACE_RMCast: Presumably works ok, but uses legacy class; - can't specify optional functionality. - + ACE_XTI_ATM_Mcast: I presume there's no integration desirable. - I've re-built vers. 5.2 ACE under Solaris and Windows with the - modified files, and it builds ok. Since the original functionality - is (basically) unchanged, it is _assumed_ that any other ACE lib - code that references the ACE_SOCK_Dgram_Mcast class signature - still functions ok. But ... things like adding templated code - could introduce problems! Also note that these classes use (now) - deprecated interface methods; e.g. RMCast passes protocol options - to ::subscribe that are now ignored. - - - Environment-specific notes/restrictions on use of options: - + The opt_nulliface_all option should be used only in environments - for which the ACE_Sock_Connect::get_ip_interfaces call is - correctly implemented (currently only Windows). In other - environments, using this option will _always_ return an error - from ::subscribe/::unsubscribe. - + The opt_dtorunsub_yes option allows finer control of multicast - group "leave" effects for environments that do not automatically - unsubscribe when the socket is closed, or in situations where - the underlying handle has been duplicated (e.g. via fork()), - but will not be used. All in all, this option is useful only - under special, controlled circumstances. - + The effect of using opt_bindaddr_yes is very environment- - specific; it may not do what you expect (or may do what you - don't expect :-) - The default option values are defined with these notes in mind. - - - Options enumeration weaknesses. - + The options enumeration list was put in the global namespace. - It seems like a pain for user code to have to prefix the option - values with the templated class name. - + All option values use the same enumeration; this could allow - option values to be used for the "wrong" option in the ctor - options list. This was a trade-off; I didn't want to add too - many things to the global namespace. (Note that more options - might be added to the list, in the future.) All new code - compares against explicit enum values (instead of 0), for safety. - - - The ::open parameter list may be too "dense" - it tries to do too - many different things with the passed parameters. This is an - artifact of its heritage. (Note that ::subscribe can also invoke - ::open behavior). In particular, it would be nice to separate - bound addr/iface from send addr/iface. - - - Does not explicitly check for duplicate active subscriptions (i.e. - subscription to the same address and interface while a previous - subscription is still active). (Subscription to the same address - but different interface is not a duplicate and is fully - supported.) Note that, for most IP stacks, a subscription attempt - for a duplicate addr/iface will fail (and a duplicate entry will - not be created). If it is allowed by the IP stack and you create - duplicate internal subscription list entries, you must call - ::unsubscribe(addr) for _each_ duplicate subscription (or - ::unsubscribe(void)) - until this is done, you will continue to - recv messages for this subscription. - - - This implementation carries forward (for backward compatibility) - certain environment-specific hacks, i.e.: - + A Win32 hack such that the default opt_nulliface_defopt value - for Win32 is different from all other environments. - + A Linux hack such that the full address is unconditionally bound. - These would seem likely to lead to unexpected behavior for the - "casual user", but changing the default would break existing code. - - - The SDM_OPT_LOCK parameter only controls locking of the dynamic - subscription list; and the need/use for this is debatable. It was - added as a fail-safe, in case one class instance is shared by - multiple threads. Note that a given instance can _not_ (reliably) - be shared by multiple threads; there are logical race conditions - (e.g. calling ::open) - but the logical race conditions should - cause only unpredictable operation, not corruption. However; the - subscription list could be corrupted if one instance is shared by - multiple threads, which could lead to undefined behavior/crashes. - - - The class interface is probably too "busy"; there are a _lot_ of - side-effects that may not be evident. - - - Currently only built and tested under Solaris w/ Forte-C++ and - Windows NT and 2000 w/ MSVC 6. - - Implementation Changes: - - - Now implemented as a templated class (ACE_SOCK_Dgram_Ex), via the - new SOCK_Dgram_Mcast_Ex.* files. The (remaining) SOCK_Dgram_Mcast.* - files are vestigial; they remain due to the build rules and - documentation conventions, and because existing user code - references the ace/SOCK_Dgram_Mcast.h file. Note that this - differs from most other *_Ex.* template source files in ACE, where - there is still at least some function implemented in the - non-templated source files; here there is none. - An explicit specialization is declared that matches the old class - signature. - - - The constructor now has optional arguments (to specify per-instance - optional functionality. A default ctor can still be used; the - legacy default environment-specific functionality will be declared. - - - I've tried to generalize code that was previously overly - environment-dependent and/or macro-driven. The intent was to make - future enhancements easier (there's still much desirable work to - be done ... speaking of which ...) - - Suggested Future Work: - - - Expose the SOCK_Dgram::send methods; i.e. allow specification of an - arbitrary dest address/port# with the ::send call. (Must check for - port# of '0' in the send address and set port# to the bound port#). - This would allow the specification of the network interface for - arbitrary multicast transmissions from one instance, and should - work as expected if the address specified is unicast. This seems - useful; currently, if you want to send multicast messages with - interface control, you would either have to create one instance of - this class for each send address, or force access to the inherited - ACE_SOCK_Dgram instance (which works ... "but it would be wrong"). - I'm not sure why access to these was disabled in the original - design. (Is there a good reason not to do this?) - - - Mark the current ::subscribe and ::unsubscribe interfaces as - deprecated and add new interfaces that remove all unnecessary - parameters. - + Remove the (optional) protocol* parameters from the ::subscribe - and ::unsubscribe methods - they don't do anything. I (really) - wanted to do this now, but it could break existing app code (but - you can't really specify anything other than the default values, - anyway!) - + Remove the (optional) reuse_addr parameter from the ::subscribe - method - it is only useful if ::open has not been previously - invoked. Problem: This will require that the ::open method be - explicitly invoked before invoking ::subscribe, which makes the - interface more clumsy. - Problem: Hard to get a unique signature for the new methods, - especially for ::unsubscribe. - - - It seems that an ACE_SOCK_Dgram_Mcast_Manager class could be a - useful "layered" addition, e.g.: - - Trap ::subscribe invocations using different port numbers, and - create separate instances/sockets for each unique port#. - - Implement software loopback filtering for environments that do - not implement loopback disabling in the IP stack (e.g. older - Windows). Also implement per-interface filters for environments - (like Win/NT) that don't do this right. - - Implement multicast group "sets" to support easy and atomic - joins/leaves of a user-defined list of group/interface - combinations. Include enhanced failure condition handling, such - as subscription "roll-back"; all-or-none of the set's members - are joined. - Actually; all of these could be done in the current class - but - there are too many options in this class already, and the function - seems (to me) more appropriate to a higher-level "manager". - - - Allow the send interface (and default send addr) to be changed, - after initial setting. (OS-specific support needed - most stacks - allow the interface to be changed once set, but I presume that not - all do.) - In general; might be worth splitting out the send from the - ::open/::subscribe methods - e.g. ::send_parameters. Might add - optional TTL and loopback parameters to this, too. - - - Add explicit methods to set common multicast socket options, e.g. - TTL, loopback. (So you don't have to remember the macro names and - to make these macros/actions more portable!). - - - Tighten up the parameter semantics and/or validation, e.g.: - + Verify that all addresses passed are multicast addresses. - For example, ::open does not check the send address. (It should - still work as expected - sending unicast on the route-derived - interface - but that's not the intended use.) - + The reuse_addr parameter in ::open is used for both REUSEADDR - and REUSEPORT (if implemented) option setting; should these be - distinct parameters? (They do different things!) - - - Enhanced integration with other ACE multicast classes, as needed - or desirable (see Restrictions section). - - - (?) For ::subscribe and ::unsubscribe - if successful, return the - (positive) number of subscribes/unsubscribes done (instead of '0'). - Possibly useful, as a way for the app to sense multi-interface - subs/unsubs (e.g. code that is passed an instance and does not - know what options were used when the instance was created). - - - (?) Add method ::unsubscribe(int n) to unsubscribe from most - recent n subscription(s) (including opt_nulliface_all option - support.) The implementation of group sets might obviate the - usefulness of this. - - - (?) Enhanced MT-safety and exception handling. - Don't know if any particular problems; but haven't tested - extensively. Also; might be able to make it more efficient. - In particular; if one instance is intended to be shared by multiple - threads, there is _much_ work to be done. - - - (??) Track subscription list state; i.e. recognize the state when - any ::unsubscribe emptys the subscription list. This state might - be used to re-define some parameters (especially the network - interface for sends) set with ::open and for other changes ... but - utility vs. added complexity ratio seems low. (Note that closing - the socket and reopening another can cause nasty side-effects, so - probably can't change the bound parameters, anyway.) - -Sun Jun 9 16:26:00 2002 Douglas C. Schmidt - - * ace/ATM_Acceptor.cpp: - * ace/ATM_Addr.cpp: - * ace/ATM_Connector.i: - * ace/ATM_QoS.cpp: - * ace/ATM_Stream.cpp: - * ace/CE_Screen_Output.cpp: - * ace/Configuration.cpp: - * ace/Handle_Set.i: - * ace/IOStream.cpp: - * ace/Lib_Find.cpp: - * ace/Log_Msg.cpp: - * ace/Log_Record.cpp: - * ace/MEM_Addr.cpp: - * ace/Malloc_T.i: - * ace/Memory_Pool.cpp: - * ace/Message_Queue.cpp: - * ace/Msg_WFMO_Reactor.cpp: - * ace/OS.cpp: - * ace/OS.i: - * ace/OS_String.cpp: - * ace/Process.cpp: - * ace/SOCK_Connector.i: - * ace/SPIPE_Connector.cpp: - * ace/Sock_Connect.cpp: - * ace/Synch_T.cpp: - * ace/ace_wchar.inl: Changed improper use of NULL to - 0. - -Sun Jun 9 15:33:05 2002 Jeff Parsons - - * ace/Date_Time.i: - - Fixed some typos that caused build errors. - -Sat Jun 8 14:46:19 2002 Douglas C. Schmidt - - * ace/Array_Base.h: Replaced - - #include "Global_Macros.h" - - with - - #include "ace/Global_Macros.h" - - Thanks to Bill Fulton for reporting - this. - -Fri Jun 7 19:00:31 2002 Steve Huston - - * ace/OS_String.inl (strstr): Also see: - Thu May 30 16:45:10 UTC 2002 Craig Rodrigues - - HP-UX 11.00 doesn't supply wcsstr(), only wcswcs (), so - special-case that one with #if defined (HPUX). - -Fri Jun 7 16:42:29 2002 Steve Huston - - * ace/Date_Time.i (update): Use ACE_OS::localtime_r rather than - ACE_OS::localtime to avoid MT time confusion. Thanks to Kelly - Hickel for reporting this. - -Fri Jun 7 16:29:21 2002 Steve Huston - - * ace/Acceptor.{h cpp}: - (ACE_Strategy_Acceptor) Added an open () method with signature - that matches ACE_Acceptor::open to avoid hiding the one in - ACE_Acceptor, according to Forte 6. In the new open(), however, - the ACE_Reactor* arg is required, to make it distinguishable from - the existing open(). The new open forwards everything - to the previously-existing, more full-featured open(). - - Constructors and full-featured open(), added optional reuse_addr - arg - it's passed down to the ACE_Accept_Strategy::open method. - - Removed the service_port_ member - it's not used. - - (ACE_Acceptor::open): If the reactor registration fails, close - the peer_acceptor_ object. - - * netsvcs/TS_Server_Handler.cpp (ACE_TS_Server_Acceptor::parse_args): - * netsvcs/Name_Handler.cpp (ACE_Name_Acceptor::parse_args): - * netsvcs/Server_Logging_Handler_T.cpp (ACE_Server_Logging_Acceptor_T): - Use a local variable for the -p port option; server_port_ is gone. - -Fri Jun 7 14:30:22 2002 Steve Huston - - * ace/Message_Queue.{h cpp} (ACE_Message_Queue_NT): Change - deactivate (int pulse) to deactive() and pulse() - forgot this - one in "Thu Jun 6 18:10:45 2002 Steve Huston" set of changes. - Also, corrected the way the completion routine checks state - of the queue. enqueue() will always pass ACTIVATED as the - queue state to be sure that blocks are seen when dequeued. - -Thu Jun 6 17:41:24 2002 Krishnakumar B - - * ACEXML/common/Mem_Map_Stream.h: - * ACEXML/common/Mem_Map_Stream.cpp: - * ACEXML/common/HttpCharStream.h: - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/common/URL_Addr.cpp: - - Fixed the explicit template instantiation problems on Solaris. - -Thu Jun 6 18:35:49 2002 Steve Huston - - * ace/Acceptor.h (ACE_Strategy_Acceptor): Made open() virtual - since its parent class (ACE_Acceptor) ope() is also virtual. - Resolves warning from Forte 6 that open() hides its parent - class's open(). - -Thu Jun 6 18:10:45 2002 Steve Huston - - * ace/README: Removed ACE_HAS_OPTIMIZED_MESSAGE_QUEUE. No configs - use it, and it's functionality doesn't really support the - message queue deactivation/pulse semantics. - - * ace/Message_Queue.h: - * ace/Message_Queue_T.{h cpp i}: Removed the "int pulse" argument - from deactivate() and add a pulse() method. States stay the - same. - Took out all the ACE_HAS_OPTIMIZED_MESSAGE_QUEUE stuff. It's - not used any longer. - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Use the pulse() - method instead of deactivate (1). - - * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: Removed answered - questions. Removed reimplemented handle_connect() method - because the needed things are now available via the framework. - - * ace/Asynch_Acceptor.{h cpp}: - * ace/Asynch_Connector.{h cpp}: Added new hook method, - int validate_connection (const ACE_Asynch_Accept::Result&result, - const ACE_INET_Addr& remote_addr, const ACE_INET_Addr& local_addr) - that allows access to success/fail, handle, and addresses. The - validate_new_connection (const ACE_INET_Addr&) method is now - deprecated. - - * ace/WFMO_Reactor.{h cpp} (ACE_WFMO_Reactor_Notify): Add an - optional argument to ACE_WFMO_Reactor_Notify constructor. - size_t max_notifies is used to specify a limit for how many - notifications can be queued. The value is used to calculate - new high and low watermarks to the message_queue_. Default 1024. - - * ace/Activation_Queue.cpp: - * ace/Message_Block.cpp: - * ace/Message_Queue_T.cpp: Added #include "ace/Log_Msg.h" to get - the ACE_DEBUG, etc. definitions. - - * ace/Read_Buffer.cpp: Added #include for ace/Log_Msg.h and - ace/Malloc_Base.h (for ACE_Allocator). - - * ace/Log_Msg.cpp (log (ACE_Log_Record&)): If there's a - ACE_Log_Msg_Callback, do it before sending the log record - to any other logging sinks. Allows the callback to munge - the data. - -Thu Jun 06 10:50:37 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.cpp (cancel_timer): - - Fixed race condition by adding an ACE_GUARD. Basically the same - fix that Doug made to the Select_Reactor below. - -Thu Jun 6 12:28:20 2002 Douglas C. Schmidt - - * ace/Select_Reactor_T.cpp: Moved the cancel_timer() methods - from the Select_Reactor_T.i file and added ACE_GUARD's around - them to ensure we're serialized correctly. Thanks to Johnny - Chen for motivating this. - -Thu Jun 6 08:24:43 2002 Jeff Parsons - - * ace/Malloc_T.h: - - Removed extra comment closer */. - -Thu Jun 6 07:11:15 2002 Douglas C. Schmidt - - * THANKS: Just added our 1,500th ACE+TAO contributor!!!!! - - * ace/Malloc_T.cpp: Clarify that the memory backing store must - reside in a directory with the appropriate visibility and - permissions. Thanks to Frank O. Flemisch - for reporting this. - -Wed Jun 5 23:06:11 UTC 2002 Don Hinton - - * ace/DLL_Manager.h: Fixed compile error. Thanks to Jai - Balasubramanian for pointing this out. - -Wed Jun 5 16:58:41 2002 Krishnakumar B - - * ACEXML/common/Mem_Map_Stream.cpp: - - Instantiate the templates needed when explicit templates are - defined. Thanks to Carlos for pointing this out. - - * ACEXML/common/HttpCharStream.cpp: - - Peek means "get the next character", not "get the character - after next". The previous change to the test caught this bug. - -Wed Jun 5 16:42:43 2002 Krishnakumar B - - * ACEXML/examples/SAXPrint/main.cpp (ACE_TMAIN): - - Modified the example to test fetching and parsing an XML URL. - This actually tests most of the functions of the new stream - class and is better than the lame test that I wrote the other - day. - -Wed Jun 5 13:54:03 UTC 2002 Don Hinton - - * ace/DLL_Manager.{h,cpp}: - * ace/Framework_Component.cpp: - - Made ACE_DLL_Manager a true singleton instead of using the - ACE_*Singleton templates, thus avoiding a problem with multiple - instantiations by broken compilers. Thanks to Chris Kohlhoff - for this suggestion. - -Wed Jun 5 08:33:25 2002 Douglas C. Schmidt - - * ace/Timer_Queue_T.h (class ACE_Timer_Queue_T): Clarify that the - second calculate_timeout() method doesn't use a lock. Thanks to - Johnny Chen for motivating this. - - * ace/Process_Manager.cpp (handle_signal): Added a check for - i == -1. Thanks to Dimitrije Jankovic - for reporting this and providing a fix! - -Tue Jun 04 16:47:27 2002 Ossama Othman - - * ace/Service_Config.h: - - No need to include "ace/DLL.h". Forward declaring ACE_DLL is - enough. - - * ace/Service_Config.cpp: - - Include "ace/DLL.h" to pull in ACE_DLL class declaration. - -Tue Jun 04 16:34:18 2002 Ossama Othman - - * ace/Service_Config.cpp: - - Removed duplicate "ace/Auto_Ptr.h" include. - - * ace/Svc_Conf_Lexer_Guard.cpp: - - Moved Svc_Conf.h include within the ACE_USES_CLASSIC_SVC_CONF - preprocessor block. It isn't needed for the XML-based Service - Configurator. - -Tue Jun 04 16:02:11 2002 Krishnakumar B - - * ACEXML/common/HttpCharStream.h: - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/common/Filecharstream.h: - * ACEXML/common/Filecharstream.cpp: - - Removed the constructor which accepted a string containing - either a filename or a URL from these files. Problem was it was - relying on calling open to do the work, but if open fails there - was no way to report the error without throwing exceptions. So - don't allow people to use this constructor and always insist on - using open. - - * ACEXML/common/Mem_Map_Stream.cpp: - * ACEXML/common/URL_Addr.h: - * ACEXML/common/URL_Addr.cpp: - * ACEXML/common/XML_Codecs.cpp: - * tests/Codecs_Test.cpp: - - Other miscellaneous fixes including using - ACE_Auto_Basic_Array_Ptr instead of ACE_Auto_Array_Ptr. - - * ACEXML/common/Makefile.bor: - * ACEXML/tests/Makefile.bor: - - Added new files. - - * ACEXML/tests/HttpCharStream_Test.cpp: - - Cosmetic fixes. - -Tue Jun 04 14:18:56 2002 Nanbor Wang - - * ACEXML/tests/HttpCharStream_Test.dsp: - * ACEXML/tests/Tests.dsw: Added a new test project. - -Tue Jun 04 13:45:39 2002 Nanbor Wang - - * ACEXML/common/Mem_Map_Stream.h: Fixed typedefs of template - classes. - - * ACEXML/common/XML_Common.dsp: Added new files to project files. - -Tue Jun 4 12:35:12 2002 Jeff Parsons - - * ace/Message_Queue*: Moved the state_ member and the accessor method - to the non-template base class to get rid of the Win32 build - bustage, since ACE_Message_Queue_NT is not a template class, and does - not inherit from ACE_Message_Queue<>. - -Tue Jun 4 10:03:19 2002 Douglas C. Schmidt - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Reverted the thr_count() - stuff since we need to reactivate the queue now. - - * ace/Message_Queue*: Changed all the message queue implementations to - use the new ACTIVATED/DEACTIVATED/PULSED implementation of - deactivate()/activate(). - -Tue Jun 4 09:48:34 2002 Jeff Parsons - - * ace/Message_Queue.h: - * ace/Message_Queue_T.h: - - Fixed the signatures of deactivate and deactivate_i to make the - appearance of the default parameter 'int pulse' consistent. - -Tue Jun 4 06:46:27 2002 Douglas C. Schmidt - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Added the - "1" parameter to the call to deactivate() method to simply - "pulse" the queue. Also, changed the AC_Output_Handler::open() - method to check if thr_count() == 0 when determining if to - activate the service handler. - - * ace/Message_Queue_T.h: Added new pulse parameter to - ACE_Message_Queue::deactivate() so that callers can decide - whether to change the state of the queue to be "deactivated" or - just to pulse waiting threads to wake up and continue their - processing. This simplies one of the examples in C++NPv2. - -Mon Jun 3 16:11:12 2002 Krishnakumar B - - * ACEXML/common/FileCharStream.cpp: - - Fixed a memory leak. - - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/common/HttpCharStream.h: - * ACEXML/common/Makefile: - * ACEXML/common/Mem_Map_Stream.cpp: - * ACEXML/common/Mem_Map_Stream.h: - * ACEXML/common/URL_Addr.cpp: - * ACEXML/common/URL_Addr.h: - - Functionality needed by the parser to fetch URI's (DTDs etc) - from the web. This is a simple http_get implementation and - doesn't work for https URLs (which can be fixed easily provided - there is interest). - - * ACEXML/common/Parser.cpp: - - Fixed a typo. - - * ACEXML/tests/HttpCharStream_Test.cpp: - * ACEXML/tests/Makefile: - - New regression test to test fetching of URI's from the web by - the parser. - - -Mon Jun 3 06:21:57 2002 Douglas C. Schmidt - - * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: Removed - unnecessary 'return;' calls. - -Mon Jun 3 07:23:56 UTC 2002 Don Hinton - - * Framework_Component_DLL.bor: Fixed typo. - -Sun Jun 2 22:52:23 UTC 2002 Craig Rodrigues - - [Bug 1208] - * ace/README: Document new ACE_HAS_3_PARAM_WCSTOK macro. - * ace/OS_String.inl (strtok_r): Check ACE_HAS_3_PARAM_WCSTOK macro. - - * ace/config-aix-4.x.h: - * ace/config-linux-common.h: - * ace/config-sunos5.7.h: - Define ACE_HAS_3_PARAM_WCSTOK on these platforms after doing - the appropriate checks. - -Sun Jun 2 15:34:41 UTC 2002 Don Hinton - - * ace/DLL.cpp: - - Test for null dll_name_ before calling open() in the copy ctor, since - open would flag it as an error. Improved error messages. - - * ace/DLL_Manager.{h,cpp}: - * ace/Framework_Component.cpp: - - Changed ACE_DLL_Manager to use ACE_Unmanaged_Singleton so that it can be - explicitely closed by ACE_Framework_Repository after ACE_Service_Config - is closed. Improved error messages. Thanks to Steve Huston for finding - this. - -Sun Jun 2 09:03:06 2002 Douglas C. Schmidt - - * ace/Select_Reactor_Base.cpp: Delete temp buffers - if enqueue_head() fails in the ACE_Select_Reactor_Notify open() - and notify() methods. Thanks to Chris Uzdavinis - for reporting this. - -Sat Jun 1 22:42:17 2002 Steve Huston - - * examples/C++NPv2/AC_CLD.mak: - * examples/C++NPv2/TPCLS.mak: Added "ssl=1" to properly include - the SSL stuff in the build; these examples use SSL. - - * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: - * examples/C++NPv2/AIO_CLD_export.h: - * examples/C++NPv2/AIO_CLD.mak: Asynch I/O example from Chapter 8. - -Sat Jun 1 15:38:40 2002 Steve Huston - - * ace/Asynch_Acceptor.cpp (open): bind_port is in ACE_Sock_Connect, - not ACE. - Added #include "ace/SOCK_Stream.h" that class is also used, and - #include "ace/Log_Msg.h" to get the ACE_ERROR macros. - - * ace/Asynch_Connector.cpp (handle_connect): clr_flags() is in - ACE_Flag_Manip, not ACE. - Added #include "ace/Log_Msg.h" to get ACE_ERROR macros. - -Fri May 31 13:35:41 2002 Steve Huston - - * examples/C++NPv2/TPC_Logging_Server.{h cpp}: - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: - Primarily formatting changes to match the book. - - * examples/C++NPv2/SLDex.mak: Removed Logging_Acceptor_Ex from - files list; it's only a header file. - -Fri May 31 11:07:25 2002 Douglas C. Schmidt - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Modified this - so use pointers rather than references to simplify things in - the book. - -Thu May 30 23:03:38 2002 Steve Huston - - * examples/C++NPv2/SR_Configurable_Logging_Server.{cpp mak}: - * examples/C++NPv2/Makefile: Added new ACE_Select_Reactor-based - configurable logging server. - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Code changes - to match book and fix reconnect problems. - -Thu May 30 18:02:35 2002 Douglas C. Schmidt - - * ace/OS.h: Changed EACESS to EACCES to be POSIX compliant. Thanks - to Eric Eide for (re)reporting this! - -Thu May 30 10:01:12 2002 Ossama Othman - - * ace/UPIPE_Stream.h (ACE_UPIPE_Stream): - - Added missing PEER_ADDR trait. - -Thu May 30 16:45:10 UTC 2002 Craig Rodrigues - - [Bug 1208] - * ace/OS_String.inl (strstr): Remove wcswcs(), use wcsstr() - instead. - -Thu May 30 9:15:19 2002 Douglas C. Schmidt - - Thanks to Edan Ayal and Alex Libman - for the following fixes. - - * ACE_WIN32_Asynch_Read_Stream_Result::complete () - ACE_WIN32_Asynch_Write_Stream_Result::complete () - ACE_WIN32_Asynch_Write_Dgram_Result::complete - ACE_WIN32_Asynch_Read_Dgram_Result::complete improved - readability and logic - - * ACE_WIN32_Asynch_Read_File_Result::complete () - ACE_WIN32_Asynch_Write_File_Result::complete () fixed - errors,improved readability and logic - - * ACE_WIN32_Asynch_Read_Stream::read () - ACE_WIN32_Asynch_Read_File::read () - ACE_POSIX_Asynch_Read_Stream::read () - ACE_POSIX_Asynch_Read_File::read () - Added check for enough space in message block - bytes_to_read <= mb->space() - - * ACE_WIN32_Asynch_Write_Stream::write () - ACE_WIN32_Asynch_Write_File::write () - ACE_POSIX_Asynch_Write_Stream::write () - ACE_POSIX_Asynch_Write_File::write () - Added check for correct length of message block - bytes_to_write <= mb->length() - - * ACE_WIN32_Asynch_Read_Stream::readv () - ACE_WIN32_Asynch_Read_File::readv () - ACE_WIN32_Asynch_Read_Dgram::recv Added checks for: never read - more bytes_to_read bytes; correct using of buffers - message - blocks - - * ACE_POSIX_Asynch_Write_Stream::writev () - ACE_POSIX_Asynch_Write_File::writev () - ACE_WIN32_Asynch_Write_Dgram::send Added checks for: never write - more bytes_to_write bytes; correct using of buffers - message - blocks improved readability and logic - -Thu May 30 08:48:19 2002 Douglas C. Schmidt - - * ace/Configuration_Import_Export.cpp (squish): - Replaced (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp - == '\r')) with isspace (*cp). Thanks to Gonzalo A. Diethelm - and Dave Steele - for this suggestion. - -Thu May 30 11:53:05 UTC 2002 Don Hinton - - * ace/DLL_Manager.cpp: Fixed Fuzz errors. Thanks to Johnny - Willemsen for pointing this out. - -Thu May 30 11:40:45 UTC 2002 Don Hinton - - * tests/Framework_Component_DLL.bor: - - Fixed cut-n-paste error that caused the symbols not to be - exported. Should fix the Borland builds. - -Thu May 30 10:18:27 UTC 2002 Don Hinton - - * tests/Framework_Component_Test.cpp: - - Modified test to use the new macro definitions and method names. - - * tests/Framework_Component_DLL.cpp: - - Added ACE_DLL_UNLOAD_POLICY declaration specifying LAZY unloading. - Changed an errant ACE_LIB_TEXT macro to ACE_TEXT. - - * ace/config-all.h: - - Added the dll unloading policies mentioned below as well as an - ACE_DLL_UNLOAD_POLICY macro dlls can use to set/export their own - policy. If no policy is exported, the current per-process policy - is used. - - * ace/DLL_Manager.{h,cpp}: - - Renamed unload_strategy to unload_policy and moved the policy - definitions to config-all.h so that they can be used without - including DLL_Manager.h (which includes OS.h, etc...). - - Refactored the unloading policies and implemented the per-dll - case by probing the dll for a "_get_dll_unload_policy" function - that returns the dll specific policy--if the dll chose to - implement it. - - Added missing template instantiations. - - * ace/DLL.{h,cpp} (symbol): - * ace/DLL_Manager.{h,cpp} (symbol): - - Added additional default parameter, ignore_errors, so the dll - can be probed for symbols without sending error messages to - the log. - -Thu May 30 08:53:12 2002 Johnny Willemsen - - * tests/Codecs_Test.cpp: - Removed not needed ; after the ACE_RCSID. This will fix a warning in - the Tru64 build - - * tests/Framework_Component_DLL.cpp: - Corrected playing of ;. This will fix a warning in the Tru64 build. - -Thu May 30 02:27:29 2002 Steve Huston - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: - * examples/C++NPv2/AC_CLD_export.h: - * examples/C++NPv2/AC_CLD.mak: - * examples/C++NPv2/Makefile: Added remaining Chapter 7 example. - -Thu May 30 08:04:12 2002 Johnny Willemsen in comment to \ because the

    is a commend - that is recognized by doxygen. - -Thu May 30 07:46:12 2002 Johnny Willemsen - - * ace/Acceptor.h (ACE_Acceptor, ACE_Oneshot_Acceptor): - * ace/Connector.h (ACE_Connector): - - Use ACE_TYPENAME where appropriate in newly added traits to - correct build problems in g++ 2.95.x or better builds. - -Wed May 29 22:13:19 2002 Ossama Othman - - * ace/Acceptor.h (ACE_Acceptor, ACE_Oneshot_Acceptor): - * ace/Connector.h (ACE_Connector): - * ace/Svc_Handler.h (ACE_Svc_Handler): - - Added STL-style traits that may be useful when subclassing these - classes. - -Wed May 29 21:55:49 2002 Steve Huston - - * examples/C++NPv2/TPC_Logging_Server.{h cpp}: - * examples/C++NPv2/TPCLS_export.h: - * examples/C++NPv2/TPCLS.mak: - * examples/C++NPv2/Makefile: Added Chapter 7 examples. - - * ace/Acceptor.h (ACE_Acceptor::open): Made open() virtual. - -Thu May 30 01:38:51 UTC 2002 Craig Rodrigues - - * ace/OS_String.inl: Revert: - Wed May 29 09:38:53 2002 Ossama Othman - The intended fix is satisfactorily addressed by: - Tue May 28 18:35:46 UTC 2002 Craig Rodrigues - -Wed May 29 16:36:42 2002 Ossama Othman - - * ace/CDR_Stream.cpp (write_wchar, read_wchar, skip_wchar): - * ace/CDR_Stream.i (write_wchar_array, read_wchar_array): - - Take into account the actual size of the ACE_CDR::WChar type - instead of assuming that it is always 16 bits long. - -Wed May 29 20:16:48 UTC 2002 Don Hinton - - * tests/Framework_Component_Test.cpp: - - Changed ACE_Service_Config::open() to call the - ignore_default_svc_conf_file flag since all the directives - are passed directly without using a config file anyway. - - * ACEXML/apps/svcconf/Svcconf_Handler.{h,cpp}: - - Removed handle_ member variable and pass the local svc_dll - object instead of handle_ to ACE_Service_Config::create_service_type() - in accordance with changes below to ACE_DLL. - -Wed May 29 12:35:21 2002 Ossama Othman - - * ace/OS.h: - - If ACE_HAS_WCHAR is defined define the ACE_OS::WChar type to be - of type wchar_t. Otherwise, define it to be ACE_UINT16 (the - previous default). Addresses some wide character CDR and CORBA - C++ mapping issues. Thanks to David Smith - for reporting this. - -Wed May 29 09:46:56 2002 Ossama Othman - - * ace/Message_Queue.h: - - Include "ace/Synch.h" to pull in ACE_Thread_Mutex class - declaration. Thanks to Marek Maleta - for reporting the problem. - - * THANKS: - - Added Marek to the Hall of Fame. - -Wed May 29 09:38:53 2002 Ossama Othman - - * ace/OS_String.inl (strstr): - - Only use wcswcs() if _XOPEN_SOURCE is defined. In any case, the - Single UNIX Specification version 2 strongly encourages use of - wcsstr(). Fixes a compile-time error on glibc 2.x platforms. - - (strtok_r): - - Glibc has the 3 argument version of wcstok(). Use it instead. - Fixes a compile-time error on glibc 2.x platforms. - -Wed May 29 15:52:52 UTC 2002 Don Hinton - - * ace/DLL_Manager.{h,cpp}: - - Cleaned some problems with auto_ptr usage and added symbol - name to the debug message if the symbol isn't found--not - all systems seem to give you the name of the unfound symbol. - -Wed May 29 15:06:32 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move Debian_NoInterceptors to new - scoreboard. - -Wed May 29 10:29:10 2002 Steve Huston - - * examples/C++NPv2/Client_Logging_Daemon.cpp: Use a safer scheme - to clean up sent blocks; compile the INET_Addr stuff clean. - -Wed May 29 12:54:23 2002 Johnny Willemsen - - * ace/DLL_Manager.cpp: - * ace/Framework_Component.cpp: - Fixed msvc wchar compile errors - -Wed May 29 08:41:12 2002 Johnny Willemsen - - * ace/Codecs.h: - Removed the ; after the ACE_UNIMPLEMENTED_FUNC, the BCB compiler has - problems with it. - - * tests/Makefile.bor: - Added the new Codecs_Test. - -Tue May 28 19:40:44 2002 Steve Huston - - * examples/C++NPv2/Client_Logging_Daemon.cpp: - * examples/C++NPv2/CLD_export.h: - * examples/C++NPv2/CLD.mak: - * examples/C++NPv2/TP_Logging_Server.{h cpp}: - * examples/C++NPv2/TPLS_export.h: - * examples/C++NPv2/TPLS.mak: - * examples/C++NPv2/Makefile: Added new client logging daemon - and thread pool logging server examples from chapter 6. - -Wed May 29 02:09:32 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move RedHat_7.1_Full and - RedHat_7.1_NO_AMI_Messaging builds to new scoreboard. - -Tue May 28 19:20:58 2002 Krishnakumar B - - * ace/Read_Buffer.cpp (rec_read): - - It seems that my changes trash the files written by test - programs. I need to write a test to check out what's happening - before changing the CVS head. Reverting my change of Tue May 28 - 17:00:21 2002 Krishnakumar B . - -Tue May 28 23:13:45 UTC 2002 Don Hinton - - * tests/Framework_Component_DLL.cpp: - - Added missing ";" to end of template instantiation statements. - -Tue May 28 22:34:03 UTC 2002 Don Hinton - - * ace/DLL.cpp: Added missing ACE_const_cast(). - -Tue May 28 17:00:21 2002 Krishnakumar B - - * ace/Read_Buffer.cpp (rec_read): - - Fixed stupid thinko when decrementing slot. Tell myself to think - twice to about using ?:. My previous change also ate the - character when only one character is in a file. ACE_Read_Buffer - is crying for a test under $ACE_ROOT/tests which tests variable - sized buffers with sizes of 1, < BUFSIZ, BUFSIZ, > BUFSIZ - instead of under examples/misc/test_tead_buffer.cpp. Will try to - get in one. - - * docs/ACE-guidelines.html: - - Update guidelines to be careful about using ?: in some - situations. Thanks to Doug for suggesting this. - -Tue May 28 21:54:44 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move Debian_NoInline and - Debian_GCC_3.0.4 builds to new scoreboard. - -Tue May 28 21:32:42 UTC 2002 Don Hinton - - * ace/DLL.cpp: - * ace/DLL_Manager.cpp: - * ace/Framework_Component.cpp: - * ace/Framework_Component_T.cpp: - - Fixed Fuzz errors. - -Tue May 28 18:35:46 UTC 2002 Craig Rodrigues - - [Bug 1208] - * ace/OS_String.cpp (strok_r_emulation): Call ACE_OS_String::strtok - instead of ::wcstok. - * ace/OS_String.inl (strtok): If ACE_HAS_XPG4_MULTIBYTE_CHAR is defined, - call 3 parameter version of wcstok, else call 2 parameter version. - * ace/config-linux-common.h: Only define ACE_LACKS_WCSTOK and - ACE_LACKS_WCSDUP_PROTOTYPE for glibc versions less than 2. Define - ACE_HAS_XPG4_MULTIBYTE_CHAR for glibc 2 and higher. - * tests/OS_Test.cpp: Add test for wchar_t version of strtok. - -Tue May 28 15:02:01 UTC 2002 Don Hinton - - * tests/tests.dsw: - * tests/Framework_Component_DLL.dsp: Added new dsp. - -Tue May 28 09:35:17 2002 Jeff Parsons - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Added DLL_Manager.* to these projects. - -Tue May 28 10:47:50 UTC 2002 Don Hinton - - * tests/Logging_Strategy_Test.cpp: - - Fixed typo, ACE_AS_* > ACE_HAS_*. - - * tests/Makefile.Framework_Component_DLL: - * tests/Makefile: - * tests/Makefile.bor: - - Added/modified Makefiles to add new test file, and updated - dependancies. - - * tests/Framework_Component_Test.{h,cpp}: - * tests/Framework_Component_DLL.{h,cpp}: Added. - * tests/Framework_Component_DLL_export.h: Added. - - Modified to test to exercise the new ACE_DLL_Singleton and - ACE_DLL* classed in concert with the Service Config framework - and new Framework Component mechanisms. - - * tests/DLL_Test.{h,cpp}: - - Modified test to fully test all the features of the new - ACE_DLL, ACE_DLL_Handle, and ACE_DLL_Manager classes. - - * ace/Makefile: - * ace/Makefile.bor: - - Added DLL_Manager and updated dependancies. - - * bin/generate_export_file.pl: - - Added generation of library specific TRACE macros in - terms of the new ACE_TRACE_IMPL macro below. - - * ace/Global_Macros.h: - - Added new macro, ACE_TRACE_IMPL and implemented ACE_TRACE - in terms of it if tracing is enabled. This allows you - to turn tracing on for a particular cpp by just undef'ing - ACE_TRACE and redefining it as ACE_TRACE_IMPL. - - * ace/Parse_Node.{h,cpp}: - - Removed handle() method and added a dll() method. Also, - since ACE_DLL_Handle::symbol() calls ACE::ldname() internally, - changed the ACE::ldname() calls in the ctors for - ACE_Object_node and ACE_Function_Node to ACE::strnew(). - - * ace/Svc_Conf_y.cpp: - - Changed call to ACE_Location_Node::handle() to ACE_Location_Node::dll() - in ACE_Service_Type::ctor. - - * ace/Service_Object.{h,cpp,i}: - - Modified ACE_Service_Type to maintain an ACE_DLL member variable - instead of an ACE_SHLIB_HANDLE, and changed ctor accordingly. - Removed call to ACE_OS::dlclose() from dtor. Removed handle() - methods. - - * ace/Object_Manager.cpp: - * ace/Service_Config.cpp: - - The Object Manager is now always responsible for cleaning up - the ACE_Framework_Repository, but only after the Service - Config framework has been cleanup. ACE_Service_Config no longer - knows anything about ACE_Framework_Repository. - - * ace/Service_Config.cpp: - - Changed create_service_type() to take an ACE_DLL& instead of - an ACE_SHLIB_HANDLE. Removed unneeded call to ACE::ldname(). - - * ace/DLL_Manager.{h,cpp}: Added. - * ace/DLL.{h,cpp}: - - Added new classes, ACE_DLL_Manager_Ex and ACE_DLL_Handle, and - and moved all functionalility from ACE_DLL to the new classes. - ACE_DLL maintains the same interface and semantics but defers - all calls to the new classes. ACE_DLL_Manager is a singleton - that manages the lifetimes of instances of refcounted - ACE_DLL_Handle objects that represent the actual dlls. The - following unloading strategies are available: per-process/dll, - eager/lazy. - - Added copy ctor to ACE_DLL so that the get/set_handle() methods - aren't needed--there use in the Service Config framework can - complicate orderly destruction of singletons based on - ACE_DLL_Singleton. - - Added call to ACE::ldname() to the symbol() method so that - the caller no longer needs to do it themselves. - - * ace/Singleton.{h,cpp,i}: - - Added new singleton template, ACE_DLL_Singleton, that registers - itself with the ACE_Framework_Repository so that it can be - destroyed when the dll with which it is associated is unloaded. - - - * ace/Proactor.{h,cpp}: - * ace/Reactor.{h,cpp}: - - Added name() method as needed by changes below, and implemented - dll_name() method to return "ACE". - - * ace/Framework_Component.{h,cpp,inl}: - * ace/Framework_Component_T.{h,cpp}: - - Enhanced the Framework Component "framework" ;-) to allow the - removal of registered components, either individually by name or - as a group, based on the dll that registered them. - -Mon May 27 15:59:17 2002 Nanbor Wang - - * ACEXML/common/XML_Codecs.h: - * ACEXML/common/XML_Codecs.cpp: Fixed VC warnings. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added Codecs.*. - - * tests/tests.dsw: - * tests/Codecs_Test.dsp: Added a new test. - - * ACEXML/common/XML_Common.dsp: Added XML_Codecs.*. - -Mon May 27 15:47:44 2002 Steve Huston - - * ace/OS.h: Add new service-related macro, ACE_Local_Service_Export. - This is intended for use in the ACE_FACTORY_DEFINE macro, for - static services whose factory functions need not be exported. - To use this when defining a factory function, do - ACE_FACTORY_DEFINE(ACE_Local_Service, StaticSvcClass) - - * examples/C++NPv2/Service_Reporter.cpp: Use ACE_Local_Service - in the ACE_FACTORY_DEFINE for the Service_Reporter service. - -Mon May 27 15:21:57 2002 Krishnakumar B - - * ace/Codecs.h: - * ace/Codecs.cpp: - - New files meant to hold all encoding/decoding classes/functions. - Currently implements Base 64 encoding. - - * ACEXML/common/XML_Codecs.h: - * ACEXML/common/XML_Codecs.cpp: - * ACEXML/common/Makeile: - - Same guy under a different hood. - - * ace/Basic_Types.h: - - Added definition of ACE_Byte. - - * tests/Codecs_Test.cpp: - * tests/run_test.lst: - - Regression test which tests the encoding/decoding functionality - added above. - - * tests/Makefile: - * tests/RMCast/Makefile: - * ace/Makefile: - * ace/RMCast/Makefile: - - Updated dependencies. - - * ace/Read_Buffer.cpp: - - Decrement the extra increment of slot. This is not completely - correct, as we should abstract the handling of end-of-line across - Unix and Windows and then use it here and all the places which - read stuff from files. See Fri May 24 10:42:25 2002 Douglas C. - Schmidt for another manifestation - of the same bug. - - * include/makeinclude/rules.local.GNU: - - Remove files named core.[0-9]+. Newer kernels dump a core file - associated with each process separately. - -Mon May 27 15:04:31 2002 Steve Huston - - * ace/OS.h (ACE_FACTORY_DEFINE): Add the export declaration to - the generated factory, removing the need to also use the - ACE_FACTORY_DECLARE in simple (most common) situations. - - * examples/C++NPv2/SLD.cpp: - * examples/C++NPv2/SLDex.cpp: - * examples/C++NPv2/Server_Shutdown.cpp: Remove ACE_FACTORY_DECLARE. - It's not needed in these situations. - -Mon May 27 07:39:41 2002 Douglas C. Schmidt - - * ace/Configuration_Import_Export.cpp (squish): Added a - check for '\r' to ensure that empty lines are handled properly. - Thanks to Vladimir Chovanec for - reporting this. - -Mon May 27 09:20:12 2002 Johnny Willemsen - - * bin/generate_doxygen.pl: - Added tao_costime to the list of doxygen files that must be run - - * etc/tao_costime.doxygen: - Created doxygen config file for this TAO service - - * html/index.html: - Added link for the TAO CosTime service doxygen documentation - -Mon May 27 08:18:12 2002 Johnny Willemsen - - * ACEXML/common/Attributes_Def_Builder.h: - * ACEXML/common/DTD_Manager.h: - * ACEXML/common/Element_Def_Builder.h: - * ACEXML/common/Validator.h: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.h: - * ACEXML/parser/debug_validator/Debug_Element_Builder.h: - * ACEXML/parser/debug_validator/Element_Tree.h: - Corrected doxygen commands, no space between @ and the command is - allowed. - - * ace/Active_Map_Manager.h: - * ace/Arg_Shifter.h: - * ace/Based_Pointer_Repository.cpp: - * ace/CDR_Stream.h: - * ace/Caching_Utility_T.h: - * ace/Configuration.h: - * ace/DEV_IO.h: - * ace/Dev_Poll_Reactor.h: - * ace/Dirent_Selector.h: - * ace/Env_Value_T.h: - * ace/FILE.h: - * ace/Get_Opt.h: - * ace/Hashable.h: - * ace/IO_Cntl_Msg.cpp: - * ace/Init_ACE.h: - * ace/Local_Tokens.h: - * ace/Log_Msg.cpp: - * ace/Log_Msg.h: - * ace/Memory_Pool.h: - * ace/Message_Block.h: - * ace/OS.cpp: - * ace/OS.h: - * ace/Object_Manager.cpp: - * ace/POSIX_Asynch_IO.cpp: - * ace/POSIX_Asynch_IO.h: - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Proactor.h: - * ace/Pair_T.h: - * ace/Proactor.cpp: - * ace/Process.h: - * ace/Reactor_Impl.h: - * ace/Remote_Tokens.h: - * ace/SV_Message.h: - * ace/Select_Reactor_T.h: - * ace/Svc_Conf.h: - * ace/System_Time.h: - * ace/TLI_Stream.h: - * ace/TP_Reactor.cpp: - * ace/TP_Reactor.h: - * ace/Task.h: - * ace/Task_T.h: - * ace/Thread.h: - * ace/Timer_Wheel_T.cpp: - * ace/Token.h: - * ace/Token_Manager.h: - * ace/WIN32_Proactor.cpp: - Improved the doxygen documenation by converting old style documentation - to doxygen style. Also corrected small typing errors, start sentences with - capital letters and corrected incorrected doxygen commands. - - * ace/POSIX_Proactor.cpp: - Corrected the signature of handle_events from unsigned long to u_long to - match the declaration of this method. This was found using the warning file - of the doxygen generation. - - * ace/Future.h: - Corrected brief documentation. Brief documentation ends when a dot is found - followed by a space of a newline. We had "i.e. " in the brief documenation - and now this documentation ended after the second dot, changed it to - "i.e.,". This fixed [Bug 892]. - - * ace/config-doxygen.h: - Added ACE_HAS_TOKENS_LIBRARY to generate ACE token library documentation - - * bin/generate_doxygen.pl: - Added tao_cosnaming to the list of doxygen files that must be run - - * etc/tao_cosnaming.doxygen: - Created doxygen config file for this TAO service - - * etc/tao_cosnotification.doxygen: - Corrected tagfile name and directory that is generated - - * html/index.html: - Added link for the TAO Naming service doxygen documentation - -Sun May 26 21:48:49 2002 Steve Huston - - * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp: Added - include guard. - - * examples/C++NPv2/SLD.dsp: Define SLD_BUILD_DLL, not ACE_BUILD_DLL, - to set up the export stuff correctly. - - * examples/C++NPv2/SLDex.dsp: - * examples/C++NPV2/examples.dsw: Add new project for second part - of chap 5 example. - - * examples/C++NPv2/SLD.cpp: - * examples/C++NPv2/SLDex.cpp: - * examples/C++NPv2/Server_Shutdown.cpp: Add ACE_FACTORY_DECLARE to - get correct export declaration for factory. - -Sun May 26 13:20:15 2002 Douglas C. Schmidt - - * ace/config-macosx.h: Added #define ACE_LACKS_SYSTIME_H. - Thanks to Dennis C. De Mars for - recommending this. - -Sat May 25 17:45:21 2002 Nanbor Wang - - * tests/Proactor_Scatter_Gather_Test.dsp: - * tests/tests.dsw: Added Proactor_Scatter_Gather_Test. - -Sat May 25 16:42:46 2002 Douglas C. Schmidt - - * tests/run_test.lst, - * tests/Makefile.bor, - * tests/Makefile: Added Proactor_Scatter_Gather_Test. - -Sat May 25 16:30:00 2002 Edan Ayal - - * tests/Proactor_Scatter_Gather_Test.cpp: - Added a new test for the asynch scatter/gather I/O - functionality. It is currently supported (as the feature itself) - only under Win32 - actually NT4 SP2 and above. The test runs in - a single thread, and involves a single Sender, two Receivers and - a single Writer. The Sender async-reads (scattered) from a file - into chunks of . It async-sends (gathered) the odd - chunks to the first receiver over a stream, and the even chunks - to the second receiver over a different stream. The receivers - async-read (scattered) from the socket streams into chunks in - size of , and convey the data to the Writer. The - Writer reconstructs the file using async-write - (gathered). Finally, the reconstructed file is compared to the - original file to determine test success. The test therefore - covers both async scatter/gather stream I/O and async - scatter/gather file I/O. - -Sat May 25 14:52:06 2002 Douglas C. Schmidt - - * ace/Strategies_T.cpp (make_svc_handler): Fixed a typo where - dll_name_ was misspelled as shared_library_. Thanks to Nathan - Krasney for reporting this. - -Fri May 24 10:42:25 2002 Douglas C. Schmidt - - * ace/Configuration_Import_Export.cpp (squish): Added a - check for '\n' to ensure that empty lines are handled properly. - Thanks to Vladimir Chovanec for - reporting this. - -Sat May 25 15:09:42 2002 Steve Huston - - * examples/C++NPv2/SLDex.{cpp mak}: - * examples/C++NPv2/Server_Shutdown.cpp: - * examples/C++NPv2/SLDEX_export.h: - * examples/C++NPv2/Makefile: Add new dll for second part of - Chapter 5 dynamic (re)config example. - -Sat May 25 11:47:33 2002 Steve Huston - - * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp (init): - Add wide->narrow char conversion to get ACE_TCHAR into - a char-based method. - -Sat May 25 01:15:02 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move Debian_Minimum bulid to - new scoreboard. - -Fri May 24 23:52:39 2002 Steve Huston - - * examples/C++NPv2/Configurable_Logging_Server.dsp: - * examples/C++NPv2/SLD.dsp: - * examples/C++NPv2/examples.dsw: Added new projects for chapter - 5's configurable logging server. - -Fri May 24 20:51:25 2002 Christopher Kohlhoff - - * ace/Log_Msg_NT_Event_Log.cpp (open): - Need to use logger_key, when it is supplied, to register the - event source with the system. - - * ace/Log_Msg_NT_Event_Log.cpp (log): - Replace all newlines in the message with the CR-LF character - sequence so that line breaks are correctly displayed in the - event viewer. - -Fri May 24 20:18:41 2002 Steve Huston - - * examples/C++NPv2/Reactor_Logging_Server.cpp: - * examples/C++NPv2/Reactor_Logging_Server_T.cpp: Move all the - method implementations for Reactor_Logging_Server<> into - Reactor_Logging_Server_T.cpp so they're reuseable in a - shared library. - - * examples/C++NPv2/Reactor_Logging_Server.h: Add template - implementation reference plumbing for compilers. - - * examples/C++NPv2/Select_Reactor_Logging_Server.cpp: - * examples/C++NPv2/TP_Reactor_Logging_Server.cpp: - * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp: Remove the - (duplicate) definitions of Reactor_Logging_Server<>; the - compiler now generates this using the code in - Reactor_Logging_Server_T.cpp. - - * examples/C++NPv2/svc.conf: - * examples/C++NPv2/SLD.cpp: - * examples/C++NPv2/SLD_export.h: - * examples/C++NPv2/SLD.mak: Code and Makefile for the dynamic - logging service in chapter 5. - - * examples/C++NPv2/Makefile: Added SLD.mak. - - * examples/C++NPv2/Logging_Acceptor.h: Added a PEER_ADDR trait. - The Reactor_Logging_Server_Adapter's use of Logging_Acceptor - needs the trait. - - * examples/C++NPv2/Service_Reporter.h: Make ctor public so - the service factory can instantiate this class. - -Sat May 25 00:20:50 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move Debian_WChar to new scoreboard. - -Fri May 24 10:18:39 2002 Steve Huston - - * bin/auto_compile: Don't bail out if the only CVS conflict is - in ChangeLog or THANKS. - - * ace/CDR_Stream.h (ACE_InputCDR): Added comments clarifying - the behavior of the ctor that takes a const ACE_Message_Block *. - Thanks to Alexander Maack for motivating this. - - * examples/C++NPv2/display_logfile.cpp (svc): Fix memory leak - (thanks to Alexander Maack for reporting this) and don't lose - the host name in the data if demarshaling has to be aborted to - go read more data from the file. - - * examples/C++NPv2/Logging_Acceptor_Ex.h: - * examples/C++NPv2/Logging_Event_Handler_Ex.h: Remove trailing ';' - on inlined methods; Changed to match book. - - * examples/C++NPv2/Select_Reactor_Logging_Server.cpp: Changed to - match book. - - * examples/C++NPv2/Reactor_Logging_Server_Adapter.{h cpp}: - * examples/C++NPv2/Service_Reporter.{h cpp}: - * examples/C++NPv2/Configurable_Logging_Server.{cpp mak}: - Example code from Chapter 5 of C++NPv2 (Service Configurator). - - * examples/C++NPv2/Makefile: Added new examples. - - * THANKS: Added Alexander Maack to the Hall of Fame. - - * ace/Reactor.h: Mark run[_alertable]_event_loop, end_event_loop, - event_loop_done, and reset_event_loop static methods deprecated - in favor of calling the non-static methods on - ACE_Reactor::instance(). Thanks to Don Hinton for motivating this. - - * ace/String_Base.h (rep): Added note that directs the caller to free - the returned memory. - -Mon May 13 19:15:49 2002 Steve Huston - - * ace/Service_Config.h: Doxygen-ized comments for open(), and - added a note on -b that files are evaluated relative to "/". - - * netsvcs/servers/main.cpp: Move the reactor/signal initialization - to be after the service loading. If the user specifies -b (be a - daemon) it closes all handles, including the reactor - notification pipe. Also added ACE_TEXT decorator to the string - literals. - -Fri May 24 13:29:05 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move Debian_Full and - Debian_Minimum_Static builds to new scoreboard. - -Thu May 23 20:35:22 2002 Steve Huston - - * ace/RB_Tree.h: Clarified that iterator is valid after changes to - container only if the iterated-over element is not removed. Thanks - to Craig Ching for noticing this. - - * ace/Module.cpp (close): Fixed to only use the passed-in flags if - the task delete policy was not set explicitly. Thanks to Doug - Schmidt for this fix! - - * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp: Use new technique - for detecting "quit" command. Unified with book content. - -Thu May 23 20:36:46 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move Lynx_PPC build to new scoreboard. - -Thu May 23 14:04:52 2002 Krishnakumar B - - * ACEXML/common/LocatorImpl.cpp: - * ACEXML/common/LocatorImpl.h: - * ACEXML/common/LocatorImpl.i: - * ACEXML/parser/parser/Parser.cpp: - * ACEXML/parser/parser/Parser.h: - * ACEXML/parser/parser/Parser.i: - - Implemented the Locator for the XML parser. - - * ACEXML/common/CharStream.h: - * ACEXML/common/DTDHandler.h: - * ACEXML/common/Env.h: - * ACEXML/common/Exception.h: - * ACEXML/common/FileCharStream.h: - * ACEXML/common/InputSource.cpp: - * ACEXML/common/SAXExceptions.cpp: - * ACEXML/common/SAXExceptions.h: - * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: - * ACEXML/examples/SAXPrint/SAXPrint_Handler.h: - - Cosmetic fixes including some fixing some memory leaks. - - * ACEXML/examples/SAXPrint/Print_Handler.cpp: - * ACEXML/examples/SAXPrint/Print_Handler.h: - * ACEXML/examples/SAXPrint/main.cpp: - - Add support for printing out errors which uses the Locator. This - will print out errors only if there is an error in the XML file. - - -Thu May 23 07:53:37 2002 Douglas C. Schmidt - - * examples/Misc/test_read_buffer.cpp (ACE_TMAIN): Use ACE_STDIN - rather than 0. Thanks to Soeren Gerlach - for motivating this. - -Tue May 21 06:13:50 2002 Douglas C. Schmidt - - * ace/Hash_Map_Manager_T.h (class ACE_Hash_Map_Manager_Ex): Made - shared_find() protected rather than private. Thanks to - Ganesh Pai for reporting this. - -Wed May 22 23:18:26 2002 Priyanka - - * ACE version 5.2.3 released. - -Sat May 18 09:32:58 2002 Ossama Othman - - * ace/SSL/SSL_SOCK_Stream.cpp (get_remote_addr): - - Set errno to ENOTCONN if the SSL connection hasn't been - completed yet, and errno to EBADF if the file descriptor hasn't - been set yet. This emulates the getpeername() errno semantics. - -Sat May 18 08:19:48 2002 Ossama Othman - - * ace/SSL/SSL_Connector.h: - * ace/SSL/SSL_Connector.cpp: - - Temporarily removed these files since there are still some - thread-safefy issues to be addressed in the implementation. - Better to wait until after the forthcoming beta to ship them. - -Fri May 17 07:32:49 2002 Douglas C. Schmidt - - * ace/Log_Msg.cpp: Replaced ACE_NEW_RETURN_I with ACE_NEW_RETURN. - Thanks to Johnny Willemsen for reporting this. - -Thu May 16 20:15:36 2002 Douglas C. Schmidt - - * ace/OS.i: Added ACE_HAS_ISASTREAM_PROTO guard around the - extern "C" int isastream() method. Thanks to Oleg Terletsky - for reporting this. - - * ace/ARGV.h: Added a comment that points out the "add()" method - doesn't handle memory management. Thanks to Kyle Brost - and Don Hinton for clarifying this. - -Thu May 16 17:05:19 2002 Ossama Othman - - * ace/SSL/SSL_Connector.cpp (handle_input, handle_output): - - Qualify the AST type with its appropriate scope. g++ requires - it. - -Thu May 16 15:28:24 2002 Ossama Othman - - * ace/SSL/SSL_Connector.h: - * ace/SSL/SSL_Connector.cpp: - - New ACE_SSL-specific subclasses of the standard - ACE_{Strategy_}Connector classes. The standard ACE_Connector - class assumes that a connection is established once the stream - handle becomes writable. However, that only holds for protocols - with a single handshake, such as TCP. Protocols with multiple - handshakes, such as SSL, require special handling to prevent the - connection from being considered completed once the stream - handle becomes writable. The subclasses simply override the - handle_input() and handle_output() methods for each of base - classes that were subclassed. If possible, these changes will - be generalized and merged into ACE proper. When that occurs, - these classes will be deprecated. As such, these classes are - only intended to be an interim solution. - - * ace/SSL/SSL_SOCK_Connector.cpp (connect): - - Fixed bug where the handle in the SSL_SOCK_Stream was not set if - a connection is in progress. In that case, the handle must also - be set in the SSL_SOCK_Stream so that the correct handle is - returned from SSL_SOCK_Stream::get_handle() when performing - non-blocking connect()s via the SSL_SOCK_Connector. - - (complete): - - No need to set the handle in SSL_SOCK_Stream since it is - already set in the connect() method. - - Only attempt to complete the TCP connection if that hasn't - already been done. - - * ace/SSL/SSL_SOCK_Stream.h (peer): - - Made this method public so that it can be called by the new - SSL_{Strategy_}Connector classes. - - * ace/SSL/SSL_SOCK_Stream.cpp (get_remote_addr): - - Overrode the base class implementations of this method. Some - applications use get_remote_addr() as a way of determining - whether or not a connection has been established. In SSL's - case, the remote addr will be available once the TCP handshake - has been complete. Despite that fact, the SSL connection may - not have been completed. In such a case, a successful return - from get_remote_addr() would be misleading. - -Thu May 16 13:34:19 2002 Nanbor Wang - - * ACEXML/examples/SAXPrint/main.cpp: Added constness to - . This fixed a GCC 3.0 warning. - -Wed May 15 17:47:24 UTC 2002 Don Hinton - - * ace/DLL.cpp: Fixed compile error in an AIX ifdef'd - section of code I missed before. - -Wed May 15 17:18:58 UTC 2002 Don Hinton - - * ace/DLL.cpp (open): - - Removed unreferenced return value. Thanks to Nanbor - for noticing this. - -Wed May 15 16:44:27 UTC 2002 Don Hinton - - * ace/DLL.cpp (save_last_error): - - Use ACE::strnew to make a copy of the saved string. - -Wed May 15 15:58:07 UTC 2002 Don Hinton - - * tests/DLL_Test.cpp: - - Modified test to make calles to ACE_DLL::error () in order to test - changes below. - - * ace/DLL.{h,cpp}: - - Removed the return in open() after an ACE_Lib_Find error, so that - dlopen() will be called and the appropriate error stored. - - Added new static flag, open_called_, to keep track of whether or not - a library function (specifically dlopen) has been called. This is - used internally to make sure that dlerror() isn't called unless the - library has been initialized with a call to dlopen first. Otherwise - it seg-faults on Linux (and perhaps others). - - Also added a last_error_ variable and save_last_error() method and - placed a call to save_last_error() after each library call. Then - changed error() so it just returns last_erro_. This solves a few - problems, since open() made calls to error() which returned the - appropriate error but cleared the value for the next call. So for - instance, when the ctor failed and tried to call error() to report - the error, it didn't return anything since open() had already called - it. Also, if open() failed, and the called tried to call error() to - find out why, they got a blank error message since error() had - already been called by open(). - -Tue May 14 19:40:11 2002 Priyanka Gontla - - * tests/Proactor_Test.cpp (initiate_write_stream): - Applied the Patch Johnny Willemsen sent to fix the test for the - unicode builds. - -Tue May 14 19:14:11 2002 Priyanka Gontla - - * tests/TP_Reactor_Test.cpp (Connector): - Fixed the warnings by removing the check condition - 'size_t index_ >= 0' which is always going to be true. - - * tests/Proactor_Test.cpp: - Integrated the changes sent by Alex Libman - to fix the test on - linux and other platforms that has a weak AIO implementation. - -Mon May 13 16:43:34 2002 Krishnakumar B - - * ACEXML/parser/parser/Parser.cpp (parse_xml_prolog): - - I meant to change "standalong" to "standalone" not "encoding" to - "encodine". Brain damage... - -Mon May 13 16:31:33 2002 Krishnakumar B - - * ACEXML/parser/parser/Parser.cpp (parse_xml_prolog): - - Fixed a small typo. We should parse "standalone" not - "standalong". - -Mon May 13 10:19:48 2002 Nanbor Wang - - * ace/Message_Block.cpp: Fixed a fuzz warning. - -Mon May 13 08:36:38 2002 Alex Libman - - * tests/Proactor_Test.cpp: - - Improved flow-control in full-duplex mode by increasing the - window size, total_send - total_recv to achieve max performance - from TCP/IP - - Improved static info which includes the number of bytes - sent/recv and the number of read/write operations. This allows - to see distribution of I/O operations between handlers. Would be - useful for Proactor's future improvements. - - Impoved scatter/gather branch under Win32. Instead of splitting - one message into 3 small blocks we now send them as a - chain. This helps to improve performance. - -Mon May 13 07:33:43 2002 Chad Elliott - - * ACEXML/examples/SAXPrint/main.cpp: - - Fix the Debian build by using ACEXML_Char instead of ACE_TCHAR. - -Sun May 12 23:20:06 2002 Alex Libman - - * tests/TP_Reactor_Test.{h,cpp}: - Improved flow-control in full-duplex mode by increasing the - window size, total_send - total_recv to achieve max performance - from TCP/IP - - Improved static info which includes the number of bytes - sent/recv and the number of read/write operations. This allows - to see distribution of I/O operations between handlers. Would be - useful for TP_Reactor's future improvements. - -Sun May 12 10:11:07 2002 Douglas C. Schmidt - - * ace/Message_Queue_T.cpp: Updated all the enqueue*() and - dequeue*() methods so that they use the new - total_size_and_length() method, which is more efficient. - - * ace/Message_Block.h (ACE_Message_Block): Added new - total_size_and_length() method to speed up calculation of these - values by putting them into one loop. - -Sun May 12 11:12:00 2002 Nanbor Wang - - * Makefile: Moved ACEXML directory up so it would be compile right - after ACE. We will need them when XML-based Service - Configurator becomes the default. Thank to Kitty for pointing - this out. - -Sat May 11 13:04:49 2002 Douglas C. Schmidt - - * ace/Synch.h: Updated the documentation explaining - what an ACE_Barrier does. Thanks to Timothy Culp - for motivating this. - -Sun May 12 09:45:37 2002 Edan Ayal - - * ace/WIN32_Asynch_IO.cpp: Fixed check for ACE_IOV_MAX - limitation in the following methods: - - ACE_WIN32_Asynch_Read_Dgram::recv - - ACE_WIN32_Asynch_Write_Dgram::send - - ACE_WIN32_Asynch_Read_Stream::readv - - ACE_WIN32_Asynch_Write_Stream::writev - - ACE_WIN32_Asynch_Read_File::readv - - ACE_WIN32_Asynch_Write_File::writev. - -Fri May 10 18:29:48 2002 Krishnakumar B - - * ace/config-icc-common.h (ACE_HAS_ANSI_CASTS): - * include/makeinclude/platform_linux_icc.GNU: - - Fixed the config file to ensure compilation with Intel C++ - Compiler version 6.0. - -Fri May 10 18:16:50 2002 Irfan Pyarali - - * ace/Connector.cpp (handle_output): Removed unnecessary debug - statement. - -Thu May 9 20:02:10 2002 Douglas C. Schmidt - - * docs/ACE-bug-process.html: Fixed a typo in the hostname of - the TAO FAQ. Thanks to Jeff Adams - for reporting this. - -Thu May 9 16:26:48 2002 Nanbor Wang - - * ACEXML/examples/SAXPrint/main.cpp: Added missing include file. - - * ace/Service_Config.cpp: - * ace/Service_Config.h: - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: Consolidated ace_create_service_type into - ACE_Service_Config::create_service_type_impl. - - -Thu May 9 14:35:24 2002 Nanbor Wang - - * ace/XML_Svc_Conf.h: Changed to include ACE_export.h instead of - config-all.h and added #pragma once macros. - -Thu May 09 12:12:59 2002 Nanbor Wang - - * ACEXML/apps/svcconf/Svcconf.h: - * ACEXML/apps/svcconf/Svcconf.cpp: - * ACEXML/apps/svcconf/Svcconf_Handler.h: - * ACEXML/apps/svcconf/Svcconf_Handler.cpp: Commented out the code - if XML-based Service Configurator is not used. - - * ACEXML/apps/svcconf/Makefile: - * ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: Removed ACEXML from - the list of include path to be consistent with other projects. - -Thu May 09 10:53:51 2002 Nanbor Wang - - * ACEXML/common/XML_Common.dsp: One more mis-merged project file. - -Thu May 09 10:39:17 2002 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Fixed link error on win32. I forgot to merge - these project files differently (they can not be merged.) - -Thu May 9 01:07:56 2002 Nanbor Wang - - * ACEXML/common/StrCharStream.h: - * ACEXML/common/StrCharStream.cpp: Fixed Linux compilation - errors. - -Thu May 09 00:38:22 2002 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (event_handling): Added a fix for bug - 1161. The problem was described aptly and the fix was applied - exactly as suggested by Lyn Headley : - - Problem: "The do-while loop in this function is problematic, - because active threads is incremented once prior to executing - the loop, and then decremented on every iteration of the loop - inside safe dispatch(). Thus on the second iteration of the - loop active threads is decremented to 2^32, which causes the - thread to block on waiting to change state inside update - state(), which is never signaled (because there are no other - active threads)." - - Solution: "Moving the do clause of the loop up a few statements - to include the increment of active threads (and the acquisition - of the lock) would probably fix the larger bug." - - Also, thanks to Lyn Headley and Paxton Mason - at Wolverine, and Kobi Cohen Arazi - , Mike Winter (mwinter@sonic.net), - who have all suggested fimilar problems - and fixes. - -Thu May 09 00:06:47 2002 Irfan Pyarali - - * examples/Reactor/WFMO_Reactor: Added the "Static Debug", "Static - Release", and "Release" build configurations to the "Debug" - configuration for all the 16 dsp files in this directory. - -Wed May 8 23:57:32 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move Redhat 7.1 Core build to new scoreboard. - -Wed May 8 15:15:41 2002 Nanbor Wang - - Merged in the XML-based Service Configurator framework. The - XML-based Service Configruator is *not* enabled by default and - the merge should not affect existing applications. We will make - the XML-based Service Configurator the defualt one at some point - in the future. So you might want to try it out before that - time. :) To switch current ACE to use XML Service Configurtor, - Add - - #define ACE_HAS_XML_SVC_CONF - - in your . You can use the - $(ACE_ROOT)/bin/svcconf_convert.pl to convert your existing - svc.conf files to svc.conf.xml. - - * ace/OS.h: - * ace/Parse_Node.cpp: - * ace/Parse_Node.h: - * ace/Service_Config.cpp: - * ace/Service_Config.h: - * ace/Svc_Conf.h: - * ace/Svc_Conf_Lexer_Guard.cpp: - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: - * tests/Service_Config_DLL.cpp: Simplified the macro check. - - - * ace/Service_Config.h: - * ACEXML/apps/svcconf/Svcconf.cpp: Fixed Linux compilation warnings. - - * ACEXML/apps/svcconf/Svcconf_Handler.cpp: - * ace/Service_Config.cpp: Added more comprehensive error messages. - - * ACEXML/Makefile: - * ACEXML/Makefile.bor: - * ACEXML/apps/Makefile: - * ACEXML/apps/Makefile.bor: - * ACEXML/apps/svcconf/Makefile: - * ACEXML/apps/svcconf/Makefile.bor: - * ACEXML/parser/parser/Makefile: - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/ace.icc: - * examples/ASX/CCM_App/Makefile: - * examples/ASX/CCM_App/Makefile.CCM_App: Added or Updated Makefiles. - - - * bin/svcconf-convert.pl: Added more debugging info printout. - Fixed incorrect mapping on initializer path/path and - state/params. - - * ace/Service_Object.h: Added enum definition to differentiate - ACE_Service_Type_Impl. The enum values are taken from - "ace/Svc_Conf_Toekns.h" so that the same service can work with - both classic and XML service configurator frameworks. - - - * ace/Service_Config.h: - * ace/Service_Config.cpp: Added and - methods to ensure objects are - allocated in consistent DLL. - - * ACEXML/parser/parser/Parser.cpp: Made the exception messages - more comprehensive so it's easier to determine the origins of - parse errors. - - * ACEXML/apps/svcconf/Svcconf_Handler.h: - * ACEXML/apps/svcconf/Svcconf_Handler.i: - * ACEXML/apps/svcconf/Svcconf_Handler.cpp: Added more implementation. - - * examples/ASX/CCM_App/svc.conf.xml: - * netsvcs/servers/svc.conf.xml: - * tests/Service_Config_Test.conf.xml: Added new XML-based svc.conf files. - - * tests/Service_Config_DLL.cpp: Added xml-based inline svc.conf directives. - - - * ACEXML/apps/XML_Apps.dsw: Added new workspace for XML - applications. This should contains all projects under this - subdirectory. - - * ACEXML/apps/svcconf/README: - * ACEXML/apps/svcconf/Svcconf.cpp: - * ACEXML/apps/svcconf/Svcconf.h: - * ACEXML/apps/svcconf/Svcconf_Handler.cpp: - * ACEXML/apps/svcconf/Svcconf_Handler.h: - * ACEXML/apps/svcconf/Svcconf_Handler.i: - * ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: Added new files - that implement the parser for XML-based Service Configurator. - - * bin/svcconf-convert.pl: Updated the help message. - - * ace/config-all.h: Added ACE_DEFAULT_SVC_CONF_EXT to define the - default file extention name for svc.conf files. It is ".conf" - when using classic Service Configurator and ".conf.xml" when - using XML Service Configurator. - - * tests/Service_Config_Test.cpp: Changed to use different file - extension with different Service Configurator. - - * tests/Service_Config_Test.conf.xml: Added the converted XML - based svc.conf file. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * ace/XML_Svc_Conf.h: - * ace/XML_Svc_Conf.cpp: Added abstract interface definition for - DLL based XML parser. - - * ace/OS.h: Defined ACE_DEFAULT_SVC_CONF_FILE to "svc.conf.xml" if - ACE_USES_CLASSIC_SVC_CONF is not defined. - - * ace/Service_Config.cpp: Adapt Service_Config to use XML parser - to process an svc.conf.xml file. - - - * bin/generate_export_file.pl: Added code to record the flags used - to generate an export file. - - - * XML/examples/svcconf/Svcconf_Handler.h: - * XML/examples/svcconf/Svcconf_Handler.i: - * XML/examples/svcconf/Svcconf_Handler.cpp: Added Svcconf handling - simulation. - - * XML/examples/test_docs/svcconf.dtd: Revised Svcconf DTD. - - - * XML/examples/test_docs/svcconf.dtd: Updated the DTD again. - The tag also needed an "id" attribute. - - * XML/examples/SAXPrint/main.cpp: - * XML/examples/SAXPrint/svc.conf.xml: Modified the sample XML to - conform to the updated svcconf.dtd. - - * XML/examples/svcconf/README: - * XML/examples/svcconf/Svcconf.dsp: - * XML/examples/svcconf/Svcconf.dsw: - * XML/examples/svcconf/Svcconf_Handler.cpp: - * XML/examples/svcconf/Svcconf_Handler.h: - * XML/examples/svcconf/Svcconf_Handler.i: - * XML/examples/svcconf/main.cpp: New example to test out - svc.conf.xml parsing. Not finished. - - - * XML/examples/test_docs/svcconf.dtd: Simplied the svc.conf.dtd by - removing the tags and making it an attribute for - and tags. - - - * ace/Parse_Node.cpp: - * ace/Parse_Node.h: - * ace/Service_Config.cpp: - * ace/Service_Config.h: - * ace/Svc_Conf.h: - * ace/Svc_Conf.y: - * ace/Svc_Conf_Lexer_Guard.cpp: - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: Decoupled old Service_Config parser from ACE. - - - * XML/examples/SAXPrint/main.cpp: Added a new test to try the new - StrCharStream and switch to use ACE_Get_Opt to support more - robust command line arguments. - - * XML/common/StrCharStream.h: - * XML/common/StrCharStream.cpp: Added new CharStream class that - take a null-terminated ACEXML_Char string as an input source. - - * XML/common/FileCharStream.h: Removed unnecessary inclusion of - "ace/streams.h". - - * XML/common/Makefile: - * XML/common/Makefile.bor: - * XML/common/XML_Common.dsp: Added StrCharStream.*. - -Wed May 8 16:29:05 2002 Krishnakumar B - - * bin/nightlybuilds/builds.lst (STATUS): - - Added more information about the build on toutatis. - -Wed May 8 13:57:58 2002 Chad Elliott - - * ace/OS_Dirent.h: - * ace/OS_Dirent.cpp: - - Fixed the Dirent_Test under wide character builds with Visual C++ - 6.0. The d_name member of the dirent struct is normally a one - element ACE_TCHAR array that is used as an ACE_TCHAR pointer. - This doesn't work properly under wide character builds with VC6. - Note: because of this change, memcpy on a 'struct dirent' no - longer works on Windows as it would on UNIX. - -Wed May 8 11:02:44 2002 Balachandran Natarajan - - * tests/TP_Reactor_Test.cpp: Turned off full traces, only the - error messages will goto the log. - -Wed May 8 10:58:15 2002 Alex Libman - - * tests/Proactor_Test.cpp: Fixed the test to work right on - Linux. Turned off full traces, only the error messages and - statistics will go to the log. - -Wed May 8 06:14:08 2002 Douglas C. Schmidt - - * ace/Proactor.h (ACE_Proactor): Fixed a comment that said - "ACE_Reactor" rather than "ACE_Proactor" (cut+paste error ;-)). - Thanks to Don Hinton for reporting this. - - * ace/Filecache.cpp (R_MASK): Allow file sharing by default. - Thanks to Peter Kullmann" for reporting - this. - -Tue May 07 21:03:01 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.cpp: - - Removed vestigial debugging code. - -Tue May 07 17:42:16 2002 Irfan Pyarali - - * ace/OS.i: Added missing "\". - -Tue May 7 16:45:13 2002 Krishnakumar B - - * ace/ACE.cpp (handle_timed_complete): - - Check for the return value from ACE_OS::getsockopt(). Return - ACE_INVALID_HANDLE if return value is -1. Thanks to Jonathan - Wackley for reporting this. - - * ace/OS.i (ACE_LACKS_SETREUID_PROTOTYPE): - - Check if we are compiling with gcc in addition to checking for - _XOPEN_SOURCE. GCC unconditionally turns on _XOPEN_SOURCE, but - it is not defined in Solaris 2.5.1. So this hack to expose the - missing prototypes of setreuid() and setregid(). Thanks to - Jonathan Wackley for reporting this. - - * include/makeinclude/platform_sunos5_sunc++.GNU: - - Cosmetic fixes. - -Tue May 07 15:44:41 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Reverted the change "Tue May 07 15:15:30 - 2002 Balachandran Natarajan ". Got an idea - waht was going wrong with the test and fixed that. - -Tue May 07 15:15:30 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Removed No_Server_MT_Connect_Test from - the daily builds. The testing methodology needs to be - rethought. Thanks to Ru for ppointing out that the test is - failing on a few paltforms. - -Tue May 7 12:59:24 2002 Balachandran Natarajan - - * tests/Proactor_Test.cpp (handle_write_stream): Tried to fix - warnings and errors in Borland builds. Thanks to Ru for pointing - it out. - -Tue May 7 10:31:24 2002 Alex Libman - - * tests/TP_Reactor_Test.cpp: - * tests/TP_Reactor_Test.h: Fixed the tests to work fine on all - platforms. - - * tests/run_test.lst (TP_Reactor_Test): Enabled the test for the - daily runs. - -Mon May 06 16:31:14 2002 Irfan Pyarali - - * examples/Reactor/WFMO_Reactor/Abandoned.cpp (handle_timeout): - * examples/Reactor/WFMO_Reactor/APC.cpp (handle_signal): - - Make sure to remove handlers from the reactor if they are not - going to be around when the reactor closes down. - - * examples/Reactor/WFMO_Reactor/Handle_Close.cpp: Reactor creation - was buggy and the wrong reactor's event loop was being run. - - * examples/Reactor/WFMO_Reactor/Talker.cpp: STDIN handler was not - getting cleaned up properly. Also, Proactor was not getting - removed properly from the Reactor. - - * examples/Reactor/WFMO_Reactor/Network_Events.cpp: Network - listener was not getting cleaned up properly. - - * examples/Reactor/WFMO_Reactor/Multithreading.cpp (Task_Handler): - Fixed an "out of bounds" error where a "for" loop that was going - from 1 to n rather than from 0 to n-1. Also, added a debug - statement. - - * examples/Reactor/WFMO_Reactor/run_test.pl: Redirected some of - the output from STDERR to STDOUT. - -Mon May 06 15:45:35 2002 Nanbor Wang - - * ACEXML/parser/debug_validator/Debug_Validator.dsp: Fixed - rum-time library options to avoid compilation errors when MFC is - enabled. - -Mon May 6 14:26:52 2002 Balachandran Natarajan - - * tests/Proactor_Test.cpp: Fixed unused variable warnings in - non-win32 builds. - -Mon May 6 13:37:45 2002 Balachandran Natarajan - - * bin/generate_performance_chart.sh: Changed the range of the y - range for the plots. - -Mon May 6 07:39:22 2002 Douglas C. Schmidt - - * ace/Message_Queue_T.cpp (notify): Moved int queue_count definition - to outside the scope. Thanks to Chad Elliot for reporting this. - -Sun May 5 19:14:34 2002 Douglas C. Schmidt - - * ace/Message_Queue_T.cpp: Modified all the enqueue*() methods so that - their calls to notify() occur *outside* of the monitor lock. - This change prevents deadlock from occurring when a reactor's - notification pipe is full. Thanks to Sasha Agranov - for reporting this. - -Mon May 6 10:24:12 2002 Johnny Willemsen - - * apps/gperf/src/Makefile: - Removed INSBIN because this didn't work before my change of - Fri May 03 2002, but now it works and it causes error in all - builds. - -Sun May 5 22:23:00 2002 Edan Ayal - - * tests/Proactor_Test.cpp (Sender): - - Totally removed the message content mem-copies by having the - message blocks assume ownership without copying, by - pre-allocating space for the ending '\0' (needed for the - printouts), and by using an additional complete message content - string for the non-scatter/gather case. - - - Added missing message blocks releases when the write - operations fail. - - - Added a missing message block rd_ptr adjustment at the message - content printout in the non-scatter/gather case. - -Fri May 03 20:29:12 UTC 2002 Johnny Willemsen - - * include/makeinclude/wrapper_macros.GNU: - Only set INSBIN, INSLIB, INSMAN and INSINC when they are not set - yet. This way these can be overruled in a makefile. - -Fri May 03 08:38:27 2002 Ossama Othman - - * ace/SSL/SSL_Context.cpp (ssl_library_init): - - Removed extraneous "SSL_library_init()" call. - SSLeay_add_ssl_algorithms(), which is an alias for - SSL_library_init(), is already called. - -Thu May 02 16:33:05 2002 Nanbor Wang - - * ace/OS.i (mmap): On Win32, check for both ERROR_INVALID_NAME and - ERROR_FILE_NOT_FOUND to account for difference when running it - on WINNT but with ACE_HAS_WINNT4 = 0. Thanks to Ram Ben-Yakir - for figuring this out. - -Fri May 3 07:21:20 2002 Ossama Othman - - * tests/Dev_Poll_Reactor_Test.cpp: - - Uncommented ACE_START/END_TEST macros and removed extraneous - debugging statements. - -Fri May 3 08:00:55 2002 Chad Elliott - - * docs/tutorials/012/work.h: - - Include ace/Log_Msg.h to get the definition of ACE_DEBUG and - related macros. - -Fri May 3 07:07:31 2002 Chad Elliott - - * tests/Proactor_Test.cpp: - - Put ACE_TEXT around bare char strings. - -Fri May 3 06:57:13 2002 Chad Elliott - - * tests/Proactor_Test.cpp: - - Add a conditional to avoid building this test if threads are not - enabled. - -Fri May 3 06:47:23 2002 Chad Elliott - - * tests/Dev_Poll_Reactor_Test.cpp: - - Add a conditional main for when ACE_HAS_DEV_POLL and - ACE_HAS_EVENT_POLL are not defined. - -Fri May 3 06:41:10 2002 Chad Elliott - - * ace/Token.h: - - Remove parameter name to avoid a warning from g++. - -Thu May 02 15:54:48 2002 Ossama Othman - - * ace/Select_Reactor_T.cpp (work_pending): - - Check if any timers are pending. If so, override any timeout - from the select() call. Corrects a problem where the decision - that no work was pending despite the fact that timers were - pending. - -Thu May 02 15:53:39 2002 Ossama Othman - - * tests/Dev_Poll_Reactor_Test.cpp: - - Added some comments that briefly describe the test. - -Thu May 2 15:45:34 2002 Ossama Othman - - * tests/Dev_Poll_Reactor_Test.cpp: - - New one-button test for the Dev_Poll_Reactor. Currently it is - fairly simple. Improvements to be added soon. - -Thu May 2 15:22:36 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.h (work_pending_i): - * ace/Dev_Poll_Reactor.cpp (work_pending_i): - - Accept a pointer to ACE_Time_Value instead of a reference. - - Corrected the logic for the test for pending timers. - -Thu May 02 14:38:53 2002 Ossama Othman - - * examples/Reactor/Misc/pingpong.cpp: - - Include "ACE.h" to pull in methods in the ACE class/namespace. - -Thu May 2 14:02:20 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.cpp (work_pending_i): - - Take into account pending timers when deciding if there is work - to be done. - -Thu May 02 13:34:08 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.cpp: - - Include "ACE.h" to pull in methods in the ACE class/namespace. - -Thu May 2 13:28:01 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.h: - - Updated some documentation. - - * ace/Dev_Poll_Reactor.inl (upcall): - - New method containing common upcall operations for all types of - IO events. - - * ace/Dev_Poll_Reactor.cpp: - - Commented out "ready set" code since the upcall will simply loop - until the event handler no longer desires callbacks. This is - okay since multiple threads may dispatch event handlers (similar - to what the TP_Reactor does). - - (close): - - Cleaned up memory and resource leaks. - - (handle_events_i, work_pending_i): - - Moved "event polling" code to the new work_pending_i() method. - handle_events_i() now calls that method to determine if any - events must be dispatched. - - If the underlying ioctl() call was interrupted (e.g. via the - INTR signal), i.e. returns -1 with errno set to EINTR, then - automatically restart the event loop if so desired by the user. - - (work_pending): - - Implemented this method. It simply grabs the reactor lock and - calls the new work_pending_i() method. - - (dispatch_io_events): - - Call the remove_handler() method that acquires the lock instead - of the one doesn't. The lock must be reacquired since reactor - state will potentially change during an upcall and since the - lock was released prior to dispatching the upcall. Fixes a race - condition. - - Directly use pollfd pointers as the loop variables instead of an - integer. No need for the additional indirection. - - Since the underlying event demultiplexing mechansim (`/dev/poll' - or '/dev/epoll') is stateful, and since only one result buffer - is used, all pending events (i.e. those retrieved from a - previous poll) must be dispatched before any additional event - can be polled. As such, the Dev_Poll_Reactor keeps track of the - progress of events that have been dispatched. - - The semantics of the event loop in the presence of multiple - threads is non-trivial. The "start point" of the loop will be - incremented each time an event handler is dispatched, which may - be done across multiple threads. Multiple threads may change - the loop variables. Care must be taken to only change those - variables with the reactor lock held. - - (dispatch_timer_handlers): - - Release the reactor lock during the upcall. Fixes a potential - deadlock. - -Thu May 2 10:35:25 2002 Phil Mesnier - - * ace/Log_Msg.cpp: ACE_Log_Msg::open() did not properly initialize a - custom backend due to improper evaluation of result code. - -Thu May 02 07:15:31 2002 Ossama Othman - - * ace/IO_Cntl_Msg.h: - - Include OS.h to pull in size_t typedef. - -Thu May 2 07:50:29 2002 Chad Elliott - - * examples/Web_Crawler/URL_Addr.h: - - Include ace/ACE.h to avoid compilation error due to missing - method (ACE::hash_pjw) in inline method ACE_URL_Addr::hash(). - -Thu May 2 07:46:59 2002 Chad Elliott - - * websvcs/lib/URL_Addr.h: - - Include ace/ACE.h to avoid compilation error due to missing - method (ACE::hash_pjw) in inline method ACE_URL_Addr::hash(). - -Thu May 2 07:34:59 2002 Chad Elliott - - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: - - Switch ACE::get_ip_interfaces() to - ACE_Sock_Connect::get_ip_interfaces() and include - ace/Sock_Connect.h. This only applies to Win32. - -Thu May 2 00:39:32 2002 Irfan Pyarali - - * ace/Dynamic.i: Uncommented ACE_TRACE calls. - -Thu May 2 00:29:34 2002 Irfan Pyarali - - * ace/TLI_Stream: Uninlined a methods that needed access to the - ACE class. - - * ace/Service_Object: Uninlined ACE_Service_Type::name(). - - * ace/Malloc_T.cpp: - * ace/Process_Mutex.cpp: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/TLI_Acceptor.cpp: - * ace/TLI_Connector.cpp: - * ace/TLI_Stream.cpp: - - Added #include "ace/ACE.h". - -Wed May 1 21:07:23 2002 Ossama Othman - - * ace/config-win32-msvc-6.h: - - Moved library "decorator" related macros to - config-win32-msvc.h. - - * ace/config-win32-msvc.h: - - Support "decorated" library names for MSVC 6 or better. Fixes - run-time library search problems in MS Visual Studio .NET - builds. - - * ace/ATM_Addr.h: - * ace/ATM_Params.h: - * ace/MEM_Addr.h: - * ace/Module.h: - * ace/Name_Space.h: - * ace/Naming_Context.h: - * ace/Remote_Name_Space.h: - - Include "ACE_export.h" instead of "ACE.h." The latter is - overkill. - - * ace/PI_Malloc.h: - - Include "ACE_export.h" instead of "ACE.h." The latter is - overkill. - - No need to include "ace/Malloc_T.h" and "ace/Memory_Pool.h" - - * ace/Date_Time.h: - * ace/Event_Handler.h: - * ace/High_Res_Timer.h: - * ace/Malloc.h: - * ace/Malloc_Allocator.h: - * ace/Malloc_T.h: - * ace/Mem_Map.h: - * ace/Pipe.h: - * ace/Profile_Timer.h: - * ace/Read_Buffer.h: - * ace/Shared_Memory.h: - * ace/Shared_Object.h: - * ace/SOCK.h: - * ace/SPIPE_Addr.h: - * ace/Stats.h: - * ace/SV_Message.h: - * ace/SV_Semaphore_Simple.h: - * ace/SV_Shared_Memory.h: - * ace/Synch.h: - * ace/Synch_Options.h: - * ace/Thread.h: - * ace/Typed_SV_Message.h: - - Include "OS.h" and "ACE_export.h" instead of "ACE.h." The - latter is overkill. - - * ace/Configuration.h: - * ace/DEV_Addr.h: - * ace/FIFO.h: - * ace/Get_Opt.h: - * ace/Vector_T.h: - - No need to include "ACE.h." - - * ace/Dynamic.h: - - No need to include "ACE.h", "Synch_T.h" and "Singleton.h." - "ACE_export.h" is enough. - - * ace/INET_Addr.h: - - Include "Sock_Connect.h" instead of "ACE.h". The latter is - overkill. - - * ace/Message_Block.h: - - Include "ace/OS.h" and "ace/ACE_export.h" instead "ace/ACE.h". - The latter is overkill. - - No need to include "Malloc.h" - - * ace/IO_Cntl_Msg.h: - * ace/Sock_Connect.h: - - Include "ACE_export.h" to pull in ACE_Export macro definition. - - * ace/Activation_Queue.cpp: - * ace/Message_Block.cpp: - - Include "ace/Malloc_Base.h" to pull in ACE_Allocator class - declaration. - - * ace/DEV_IO.h: - * ace/FIFO_Recv.h: - * ace/FIFO_Send.h: - * ace/NT_Service.h: - * ace/SOCK_Dgram.cpp: - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_IO.h: - * ace/SPIPE_Stream.h: - * ace/SV_Semaphore_Simple.cpp: - * ace/Service_Types.h: - * tests/test_config.h: - - Include "ace/ACE.h" pull in methods in the "ACE" - class/namespace. - - * ace/Stream.h: - * ace/SV_Message_Queue.h: - - Include "config-all.h" instead of "ACE.h." The latter is - overkill. - - * ace/OS_Memory.h: - * ace/config-all.h: - - Moved default definition of the - ACE_HAS_POSITION_INDEPENDENT_POINTERS macro to - "ace/config-all.h". Allows for additional reductions in - inter-header dependencies. - - * ace/PI_Malloc.cpp: - - Moved non-essential includes within the - "ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1" block. No need to - include them if the implementation won't be compiled. - - * ace/Select_Reactor_T.cpp: - - Include "ace/ACE.h" pull in methods in the "ACE" - class/namespace. - - (handle_events): - - Moved ACE_Countdown_Time declaration within the ACE_MT_SAFE - block. It is only used for the multi-threaded case. - - (work_pending): - - As part of the timeout take into account the time taken to - acquire the lock. - - Copy the timeout value. Do not ignore the interface by casting - away the const-ness. - - Do not bother continuing if the reactor has been deactivated. - -Wed May 1 15:49:33 2002 Steve Huston - - * tests/DLL_Test_Impl.{h cpp}: Add a nothrow variant of operator new - for platforms with ACE_HAS_NEW_NOTHROW (like HP-UX, aC++). - -Tue Apr 30 14:54:02 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added $TAO_ROOT/tests/Connection_Timeout - to the daily build list. - -Tue Apr 30 14:42:06 2002 Chad Elliott - - * ace/Synch.h: - * ace/Synch.i: - - Change the Null wait condition wait() method to take a const - ACE_Time_Value* like the Mutex wait condtion. - -Mon Apr 29 20:28:49 UTC 2002 Craig Rodrigues - - * bin/nightlybuild/builds.lst: Move SunOS_SunCC51, SunOS_GCC_2_95, - Solaris8_FORTE_UP_1 to new scoreboard. - -Sun Apr 28 18:03:50 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the new tests to our daily list of - tests that needs to be run. - -Sun Apr 28 11:50:17 2002 Edan Ayal - - * ace/WIN32_Asynch_IO.cpp: - ACE_WIN32_Asynch_Read/Write_Stream/File_Result::complete - - corrected the updates to the chained message blocks (rd_ptr and - wr_ptr) in case of scatter-gather IO. This was apparently a - cut-n-paste bug. - -Sun Apr 28 08:19:37 2002 Balachandran Natarajan - - * tests/Proactor_Test.cpp: Added code to test async scatter-gather - IO on Win32. Thanks Edan Ayal for donating - this. - -Sun Apr 28 12:27:12 2002 Johnny Willemsen - - * include/makeinclude/ace_flags.bor: - Added cflags and lib for new TAO IFRService library - -Sat Apr 27 20:00:27 2002 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Exclude template files Atomic_Op.cpp and - Framework_Component_T.cpp from compilation. - -Sat Apr 27 18:10:37 2002 Balachandran Natarajan - - * ace/Message_Queue_T.cpp (flush): Fixed fuzz error. - -Sat Apr 27 17:13:16 2002 Balachandran Natarajan - - * ace/Svc_Handler.cpp: Added a closing '}' for the method - ACE_Buffered_Svc_Handler::dump () const. This should fix the - compile errors with g++ that will start showing up shortly in - the Scoreboard. - - * ace/*makefile: Updated dependencies. - -Sat Apr 27 11:16:03 2002 Douglas C. Schmidt - - Thanks to Boris Temkin for motivating the - following fixes: - - * ace/Svc_Handler.cpp: Updated the flush_i() method to call the - message queue's flush_i() method to avoid deadlocks on platforms - that lack recursive mutexes. - - * ace/Message_Queue_T.{h,cpp}: Added the flush() and flush_i() - methods to the ACE_Message_Queue in order to remove messages - without deactivating the queue. Also refactored the close() - method to use flush_i(). - -Sat Apr 27 09:26:43 2002 Edan Ayal - - Added support (currently under win32 only) for asynchronous - scattered read and asynchronous gathered write with socket streams - and with files. - - * ace/Asynch_IO.{h cpp}: Added methods 'readv' to - ACE_Asynch_Read_Stream/File, and 'writev' to - ACE_Asynch_Write_Stream/File, for win32 only. The methods just - delegate to the implementation. - - * ace/Asynch_IO_Impl.h: Added pure virtual methods - 'readv' to ACE_Asynch_Read_Stream/File_Impl, and 'writev' to - ACE_Asynch_Write_Stream/File_Impl, for win32 only. - - * ace/WIN32_Asynch_IO.{h cpp}: Implemented the 'readv' - for ACE_WIN32_Asynch_Read_Stream/File and 'writev' for - ACE_WIN32_Asynch_Write_Stream/File. Modified the 'complete' - method and the ctor of ACE_WIN32_Asynch_Read_Stream/File_Result - and ACE_WIN32_Asynch_Write_Stream/File_Result. - -Sat Apr 27 16:07:12 UTC 2002 Johnny Willemsen - - * examples/Reactor/Proactor/test_udp_proactor.cpp: - Fixed BCB warning about hides virtual function by renaming open - to open_addr - - * ace/Asynch_IO.h: - Minor comment update - -Sat Apr 27 08:59:56 2002 Douglas C. Schmidt - - * ace/Process.i: If getpid() is ACE_INVALID_HANDLE, don't call - ACE::terminate_process() or ACE_OS::kill() since - ACE_INVALID_HANDLE is -1 on UNIX, which causes all sorts of - problems due to the fact that -1 terminates the whole session - group! Thanks to Olivier Brunet for - reporting this. - -Sat Apr 27 15:28:12 UTC 2002 Johnny Willemsen - - * examples/Reactor/Proactor/test_proactor.cpp: - * examples/Reactor/WFMO_Reactor/Talker.cpp: - Fixed MSVC6 compile errors - -Fri Apr 26 17:00:23 2002 Dante J. Cannarozzi - - * ace/Containers_T.h - * ace/Unbounded_Set.h - * ace/Hash_Map_Manager.h - * ace/RB_Tree.h - * ace/Vector_T.h - * ace/Unbounded_Queue.h - : with the help of Matt Hampton updated - doxygen to contain a consistent html list that summarizes the - each container (like internal structure, duplicates allowed, etc.) - at the request of Steve Huston. - -Fri Apr 26 16:36:52 2002 Steve Huston - - * netsvcs/lib/Server_Logging_Handler_T.cpp: Added #include - "ace/Log_Record.h" to pick up ACE_Log_Record declaration. - Fixes compile error on HP-UX. - -Fri Apr 26 15:10:21 2002 Steve Huston - - * ace/ACE.cpp: - * ace/Sock_Connect.cpp: Moved ACE_Auto_Array_Ptr<> and - ACE_Auto_Basic_Array_Ptr<> instantiations from ACE.cpp to - Sock_Connect where they are now used. Also added MACOSX to the - platforms that get them instantiated. - Added include of OS.h in Sock_Connect.cpp to pick up the ifreq - stuff portably. - - * ace.icc: Added Time_Value, Copy_Disabled, Argv_Type_Converter, - Dev_Poll_Reactor, POSIX_CB_Proactor, WIN32_Proactor, - WIN32_Asynch_IO, Obstack, Vector_T. - Added the new group TIMER_FILES (and TIMER_INCLUDES) to parallel - the TIMER_FILES in ace/Makefile. - -Fri Apr 26 14:05:49 2002 Chad Elliott - - * ace/OS.i: - - Modify the ACE_OS::fflush() method to not call the system - implementation on VxWorks if the FILE* is 0. This causes - problems for the OS. Thanks to Michael Kirher - for reporting and providing - a fix for this. - - * ace/Svc_Conf.l: - * ace/Svc_Conf_l.cpp: - - Use ACE_OS::fflush() instead of fflush(). - -Fri Apr 26 13:22:18 2002 Douglas C. Schmidt - - * ace/Svc_Handler.{h,cpp}: Applied the Thread-safe Interface pattern - by factoring out the flush logic into a flush_i() method (that - doesn't hold a lock) and call this method from the put() and - flush() methods (that do hold locks). Thanks to Boris Temkin - for reporting this problem. - -Fri Apr 26 14:45:28 2002 Steve Huston - - * tests/Proactor_Test.cpp: Replace CALLBACK with CB. Apparantly, - CALLBACK is a macro with MSVC. - -Fri Apr 26 14:39:37 2002 Steve Huston - - * tests/Proactor_Test.cpp: Use default proactor type for platform - if no specific proactor type for platform is chosen. - -Fri Apr 26 11:39:22 2002 Steve Huston - - * examples/C++NPv2/examples.dsw: - * examples/C++NPv2/display_logfile.dsp: - * examples/C++NPv2/Reactor_Logging_Server.dsp: - * examples/C++NPv2/Select_Reactor_Logging_Server.dsp: - * examples/C++NPv2/TP_Reactor_Logging_Server.dsp: - * examples/C++NPv2/WFMO_Reactor_Logging_Server.dsp: - New project/workspace for the examples here so far. - - * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp: Make dtor - public - this object is created on the stack. - Added constructor that accepts a ACE_Reactor * and passes it up - the inheritance chain. - - * examples/C++NPv2/Select_Reactor_Logging_Server.cpp: - * examples/C++NPv2/TP_Reactor_Logging_Server.cpp: Add preprocessor - check to be sure that the correct C++ library is enabled on Windows. - Qualify "getline" call with "std::". - -Fri Apr 26 07:42:12 2002 Johnny Willemsen - - * tests/IOStream_Test.cpp: - Corrected the debug output string of server received so that - the formatting is the same as client received. Thanks to - Soeren Gerlach for reporting this. - - * examples/Reactor/WFMO_Reactor/Talker.cpp: - * examples/Reactor/Proactor/test_proactor.cpp: - * examples/Reactor/Proactor/test_proactor2.cpp: - Fixed BCB compile warnings - -Thu Apr 25 17:34:31 2002 Steve Huston - - * bin/auto_compile: When doing 'realclean', do them in reverse - order of the builds, else ace/ACE_COMPONENTS.list gets wiped - out first, preventing things that examine the components list - (like netsvcs) from getting cleaned. - -Thu Apr 25 16:20:33 2002 Steve Huston - - * examples/C++NPv2/TP_Reactor_Logging_Server.{cpp mak}: - * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp: - New source and makefiles for C++NPv2 chapter 4 examples. - - * examples/C++NPv2/Makefile: Added TP_Reactor_Logging_Server. - -Thu Apr 25 15:46:39 2002 Steve Huston - - POSIX asynch I/O improvements/corrections submitted by Alex - Libman : - - * ace/POSIX_CB_Proactor.{h i cpp}: New POSIX Proactor implementation - that makes use of the AIO facility's callback feature. This has - only been tested on SGI Irix. - - * ace/Makefile: Added POSIX_CB_Proactor. - - * ace/POSIX_Proactor.{h cpp}: Refactored some code and added better - cancellation/cleanup handling. Added hooks for the new - ACE_POSIX_CB_Proactor class and refactored methods - close(), get_result_status(), create_result_aiocb_list(), and - delete_result_aiocb_list(). - - * ace/SUN_Proactor.{h cpp}: Add the new get_result_status() method - and refactored the old results code into the new method. Also, - make good use of the new aiocb create/delete methods. Improvements - to operation status detection based on input from Sun. - - * tests/Proactor_Test.cpp: Add support for new ACE_POSIX_CB_Proactor. - Added a log lock to be sure all messages from one transaction are - logged together. Also, sets up full duplex I/O for Windows and - Solaris; half duplex for all others due to general weakness in - AIO subsystems. If further testing reveals that more can be set - to full duplex, this can be expanded. - -Thu Apr 25 14:02:38 2002 Steve Huston - - * tests/MT_Reactor_Upcall_Test.cpp: Fixed compile errors by using - sizeof (type) instead of sizeof type. - -Thu Apr 25 06:51:58 2002 Douglas C. Schmidt - - * ace/OS.h (ACE_FACTORY_DEFINE): Replaced an ACE_reinterpret_cast() - with an ACE_static_cast() since the latter works correctly with - multiple inheritance. Thanks to Chris Uzdavinis - for reporting this. - - * ace/CDR_Base.h (ACE_CDR): Improved the documentation of the - consolidate() method. Thanks to Alain Decamps for helping with this. - -Thu Apr 25 03:34:43 2002 Irfan Pyarali - - * tests/MT_Reactor_Upcall_Test.cpp: Changed the test such that the - end of the test is indicated by a shutdown message rather than - an explicit message count. - -Wed Apr 24 23:39:00 2002 Irfan Pyarali - - * examples/Reactor/WFMO_Reactor: Updated file names to match - executable names. - -Thu Apr 25 07:34:12 UTC 2002 Johnny Willemsen - - * ace/Log_Msg.h: - Doxygen-ized some of the comments - -Wed Apr 24 18:53:56 2002 Balachandran Natarajan - - * include/makeinclude/rules.local.GNU (clean.local): Reverted the - change "Wed Apr 24 16:08:30 2002 Balachandran Natarajan - " since it is bogus. - -Wed Apr 24 16:08:30 2002 Balachandran Natarajan - - * include/makeinclude/rules.local.GNU: Added a rule to clean up - Sunws_cache properly. Should help SunCC5_1 builds. - -Wed Apr 24 11:07:15 2002 Douglas C. Schmidt - - * ace/RMCast/Makefile (FILES): Removed a stray "\". Thanks to - Amir Kunst for reporting this. Also reordered - the files so they would be in alphabetical order. - -Wed Apr 24 11:17:31 2002 Steve Huston - - * PROBLEM-REPORT-FORM: Always ask for config.h and - platform_macros.GNU; not just on compilation issues. - -Wed Apr 24 07:56:12 UTC 2002 Johnny Willemsen - - * ace/Future_Set.h: - Converted a comment to javadoc style because it is very long for - the brief documentation. - - * ace/DEV_IO.h: - * ace/TTY_IO.h: - Removed not needed includes - -Wed Apr 24 03:14:11 UTC 2002 Craig Rodrigues - - * tests/MT_Reactor_Upcall_Test.cpp: Fix warnings on threads=0 - build. - -Tue Apr 23 18:45:31 2002 Steve Huston - - * examples/C++NPv2/Logging_Event_Handler.h (get_handle): Cast - away const-ness of logging_handler_ member to call it's - peer() method, but use that in a const method call. Keeps - the interface contract intact. This example now works. - - * examples/C++NPv2/display_logfile.mak: Makefile for the - display_logfile example (chapter 9). - - * examples/C++NPv2/Select_Reactor_Logging_Server.{cpp mak}: New - example for the ACE_Select_Reactor section in chapter 4. - - * examples/C++NPv2/Makefile: Added Select_Reactor_Logging_Server. - -Tue Apr 23 16:01:47 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Prevented the Miop/McastHello test from - running in SUNCC51 builds. SUNCC51 is too broken. Time to remove - the build of the scoreboard. - -Tue Apr 23 11:31:43 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.inl (ACE_Dev_Poll_Handler_Guard): - (~ACE_Dev_Poll_Handler_Guard): - - Added "todo" comments about suspending and resuming the event - handler before and after the upcall, respectively. - -Tue Apr 23 11:38:40 2002 Steve Huston - - * examples/C++NPv2/Makefile: Rearranged to build all the examples. - -Tue Apr 23 13:32:12 UTC 2002 Johnny Willemsen - - * examples/Reactor/Makefile.bor: - Added Proactor directory - - * examples/Reactor/Proactor/Makefile.bor: - Added this BCB makefile - - * examples/Reactor/Proactor/*.cpp - Made all files compiling when doing a wchar build. - -Tue Apr 23 10:03:12 UTC 2002 Johnny Willemsen - - * examples/Reactor/Makefile.bor: - Added WFMO_Reactor directory - - * examples/Reactor/WFMO_Reactor/Makefile.bor: - Added this BCB makefile - - * examples/Reactor/WFMO_Reactor/*.cpp - Fixed several unused argument warnings that appeared with bcb. - Made all files compiling when doing a wchar build. - -Tue Apr 23 07:35:12 UTC 2002 Johnny Willemsen - - * ace/Base_Thread_Adapter.h: - * ace/Future.h: - * ace/Naming_Context.h: - * ace/Malloc.h: - * ace/Malloc_Base.h: - * ace/Malloc_T.h: - * ace/NT_Service.h: - * ace/Notification_Strategy.h: - * ace/Object_Manager.h: - * ace/OS_Thread_Adapter.h: - * ace/WIN32_Asynch_IO.h: - Doxygen-ized some of the comments - - * ace/OS.h: - Added ACE_ALLOCATOR_NORETURN and ACE_NEW_MALLOC_NORETURN, these - macro's set errno to ENOMEM incase of an memory error but don't - call return but guarantee that the pointer is 0. - - * ace/QoS/QoS_Manager.h: - * ace/QoS/QoS_Session_Impl.h: - Doxygen-ized some of the comments - - * ace/config-doxygen.h: - Added define ACE_YY_USES_PROTOS to parse ace/Svc_Conf_l.cpp correctly - - * tests/MT_Reactor_Upcall_Test.cpp: - Fixed unicode and single threaded build errors/warnings - -Mon Apr 22 20:40:41 2002 Steve Huston - - * examples/C++NPv2/Logging_Event_Handler.{cpp h}: - Moved LOGFILE_SUFFIX to open() method. Changed get_handle() to be - const to match the signature inherited from ACE_Event_Handler. - - * examples/C++NPv2/Logging_Event_Handler_Ex.h: Moved MAX_CLIENT_TIMEOUT - into class declaration as an enum. - - * examples/Logging_Handler.h: Added terminating ';' to inlined - methods. - -Mon Apr 22 18:33:20 2002 Irfan Pyarali - - * examples/Reactor/WFMO_Reactor/run_test.pl: This file will allow - us to run these tests nightly. Note that Console_Input, - Network_Events, and Talker are not included since they are - interactive tests. - - * bin/auto_run_tests.lst: Added new test script. - - * examples/Reactor/WFMO_Reactor/test_handle_close.cpp: - * examples/Reactor/WFMO_Reactor/test_multithreading.cpp: - * examples/Reactor/WFMO_Reactor/test_network_events.cpp: - Fixed several memory management and shutdown issues. - - * examples/Reactor/WFMO_Reactor/WFMO_Reactor.dsw: - Changed "Abondoned" to "Abandoned" - - * examples/Reactor/WFMO_Reactor/test_window_messages.cpp: - Fixed debug message formatting. - - * examples/Reactor/WFMO_Reactor/test_network_events.cpp: - Fixed documentation to says that ACE_DEFAULT_SERVER_PORT - defaults to 10002; correct value is 20002. - -Mon Apr 22 17:24:39 2002 Steve Huston - - * examples/C++NPv2/Reactor_Logging_Server.mak: - * examples/C++NPv2/Logging_Acceptor.{cpp h}: - * examples/C++NPv2/Logging_Acceptor_Ex.h: - * examples/C++NPv2/Logging_Event_Handler.{cpp h}: - * examples/C++NPv2/Logging_Event_Handler_Ex.{cpp h}: - * examples/C++NPv2/Reactor_Logging_Server.{cpp h}: - New files for examples in C++NPv2, chapter 3. - -Mon Apr 22 15:43:15 2002 Nanbor Wang - - * examples/DLL/Today.h: - * examples/DLL/Today.cpp: - * examples/DLL/Newsweek.h: - * examples/DLL/Newsweek.cpp: Added overloaded new/delete opertors - and updated magazine messages. - -Mon Apr 22 15:20:02 2002 Nanbor Wang - - * tests/DLL_Test.h: - * tests/DLL_Test.cpp: Removed the destroy method as it didn't help - ensuring allocating/deallocating the DLL object with consistent - heap. Instead, we reverted back to use auto_ptr and relied on - the overloaded new/delete operators. - - * tests/DLL_Test_Impl.h: - * tests/DLL_Test_Impl.cpp: Added the aforementioned overloaded - new/delete operator implementations. - -Mon Apr 22 12:33:30 2002 Irfan Pyarali - - * tests/MT_Reactor_Upcall_Test: This is a test that shows how to - handle upcalls from the TP_Reactor and the WFMO_Reactor when the - event loop is being run by multiple threads. - - The following files were updated to include the new test: - - - tests/Makefile - - tests/Makefile.am - - tests/Makefile.bor - - tests/Reactor_Dispatch_Order_Test.dsp - - tests/Reactor_Dispatch_Order_Test.icc - - tests/icc.bat - - tests/run_test.lst - - tests/run_tests.bat - - tests/run_tests.psosim - - tests/run_tests_remote.lst - - tests/tests.dsw - - tests/tests.icp - - tests/MT_Reactor_Upcall_Test_WinCE.vcp - - tests/tests_WinCE.vcw - -Mon Apr 22 15:27:12 UTC 2002 Johnny Willemsen - - * docs/tutorials/021/page01.html - Corrected incorrect link - -Mon Apr 22 11:20:12 UTC 2002 Johnny Willemsen - - * ace/Svc_Conf_y.cpp: - Removed some strange characters from this file - - * ace/config-doxygen.h: - Added define of __cplusplus so that the file Svc_Conf_y.cpp and - Svc_Conf_l.cpp are correctly parsed. We parsed the c-code and - we got the following defines which we don't want: - #define const - Also there was a global variable 'int size' which cluttered other - documentation. - -Mon Apr 22 08:55:12 UTC 2002 Johnny Willemsen - - * ace/Timer_Queue_T.h: - Doxygen-ized some of the comments - - * etc/*.doxygen: - Added the following to all doxygen config files - DISTRIBUTE_GROUP_DOC = YES - When a doxygen group is used (starts with //@{ and ends with - //@}) and if there is only one description for all group members than - this description is used for all the members separately. If a member - has its own description than that description is used. - -Mon Apr 22 01:34:32 2002 Nanbor Wang - - * ace/Task.h: Enhanced the comment for method to make it - clear that it will not wait for detached thread. Thanks to - Alain Decamps for suggesting this. - -Sun Apr 21 21:23:59 2002 Krishnakumar B - - * include/makeinclude/platform_osf1_4.x_cxx.GNU (SOFLAGS): - - Re-enable -use_ld_input in SOFLAGS. Seems that this flag is used - to identify Digital Unix in some Makefiles which resort to all - kinds of hackery to get some files to link. - -Sun Apr 21 20:59:26 2002 Krishnakumar B - - * include/makeinclude/platform_osf1_4.x_cxx.GNU (OCFLAGS): - * include/makeinclude/platform_osf1_4.x_g++.GNU (OCFLAGS): - - Set the optimization to level -O3. That way we will might just - get two builds in a day. This is also the recommended level in - the manual. - -Sun Apr 21 15:02:52 UTC 2002 Craig Rodrigues - - * ace/TP_Reactor_Test.cpp: Add checks for ACE_AS_THREADS. - -Sun Apr 21 09:42:05 2002 Douglas C. Schmidt - - * ace/config-win32-common.h: Changed the value of ACE_IOV_MAX to - be 64 rather than 1024. Thanks to Alain Decamps for motivating - this. - -Sat Apr 20 19:57:55 2002 Craig Rodrigues - - * ace/Asynch_Pseudo_Task.cpp (stop): Wrap ace_mon in ACE_MT() to eliminate - errors on builds which are configured single-threaded. - -Fri Apr 19 12:05:42 2002 Ossama Othman - - * examples/Bounded_Packet_Relay/bpr_thread.cpp: - * examples/Timer_Queue/main_async.cpp: - * examples/Timer_Queue/main_reactor.cpp: - * examples/Timer_Queue/main_thread.cpp: - - The recent "ace/OS.h" inclusion reductions prevented a pragma - that disables a MSVC 6 warning about an overly long debugging - symbol from occurring. Explicitly disable that warning in this - file to silence the warning. - -Fri Apr 19 11:41:12 UTC 2002 Johnny Willemsen - - * ace/Typed_SV_Message_Queue.h: - * ace/Strategies_T.h: - * ace/OS.h: - * ace/MEM_SAP.h: - * ace/Asynch_IO.h: - Doxygen-ized some of the comments - -Thu Apr 18 15:58:49 2002 Steve Huston - - * ace/Asynch_Connector.{h cpp}: Removed static member inet_addr_any_. - It doesn't work for all compilers (static in a template). Replaced - default arg for ACE_Asynch_Connector::connect with - ACE_INET_Addr ((u_short)0) to get the equivalent effect, i.e., let - the OS pick an unused port. - - * ace/Asynch_Acceptor.cpp (parse_address): Use the ACE_SOCK support - for dealing with addresses, else the ability to deal with both - IPv4 and IPv6 is lost. - Also get rid of a lot of debugging output; use ACE_TRACE instead. - - * tests/Proactor_Test.cpp: Fixed log file name. Corrected formatting - per ACE guidelines. - - * tests/run_test.lst: Enabled Proactor_Test and Proactor_Timer_Test - everywhere except Chorus, VxWorks, LynxOS. - -Thu Apr 18 11:34:12 UTC 2002 Johnny Willemsen - - * ace/Asynch_IO.h: - * ace/ATM_Params.h: - * ace/ATM_Stream.h: - * ace/Caching_Strategies_T.h: - * ace/Event_Handler.h: - * ace/MEM_Acceptor.h: - * ace/MEM_Connector.h: - * ace/MEM_SAP.h: - * ace/Memory_Pool.h: - * ace/Message_Block.h: - * ace/Message_Queue_T.h: - * ace/Pair_T.h: - * ace/Parse_Node.h: - * ace/Select_Reactor_Base.h: - * ace/Thread_Adapter.h: - * ace/Thread_Adapter.h: - * ace/Thread_Manager.h: - * ace/WIN32_Asynch_IO.h: - * ace/WIN32_Proactor.h: - Doxygen-ized some of the comments - -Tue Apr 18 07:39:12 UTC 2002 Johnny Willemsen - - * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h: - * performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h: - * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h: - Added include of svc_export.h. - -Wed Apr 17 18:41:30 2002 Steve Huston - - * ace/Activation_Queue.h: - * ace/Method_Request.h: Doxygen-ize and improve some documentation. - -Wed Apr 17 15:24:36 2002 Ossama Othman - - * bin/auto_run_tests.lst: - - Added ORT test to the list of tests to run. - -Wed Apr 17 14:30:29 2002 Steve Huston - - * examples/C++NPv2/display_logfile.cpp (Logrec_Module ctor): Change - name from ACE_TCHAR * to const ACE_TCHAR *. - -Wed Apr 17 10:39:24 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.cpp (open): - - Corrected a potential resource (file descriptor) leak for the - "ACE_HAS_DEV_POLL" case. - - Fixed a warning. Use "ACE_NEW_RETURN" instead of "ACE_NEW." - -Wed Apr 17 10:29:14 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.cpp (ACE_HAS_DEV_POLL): - - Added missing "#endif" for this configuration. - -Wed Apr 17 12:47:41 2002 Steve Huston - - * ace/WIN32_Asynch_IO.cpp (set_handle, handle_close): Fixed - "unused argument" warnings from C++Builder. - -Wed Apr 17 14:30:12 UTC 2002 Johnny Willemsen - - * ace/config-doxygen.h: - Added define UNICODE to generate ACE_Registry_Name_Space - - * ace/Proactor.h: - * ace/Proactor_Impl.h: - * ace/RB_Tree.h: - * ace/Reactor_Notification_Strategy.h: - * ace/Recyclable.h: - * ace/Registry.h: - * ace/Service_Types.h: - * ace/Signal.h: - * ace/Token_Request_Reply.h: - * ace/Typed_SV_Message.h: - Doxygen-ized some of the comments - -Wed Apr 17 12:27:23 UTC 2002 Johnny Willemsen - - * etc/ace.doxygen: - * etc/ace_man.doxygen: - Removed ACE_COMPILE_TIMEPROBES as PREDEFINED because it should be - defined in Config-doxygen.h - - * ace/Config-doxygen.h - Added ACE_COMPILE_TIMEPROBES as define to generate timeprobe - documentation. This config file is automatically included when doing - a doxygen generation. - - * ace/Intrusive_List.h: - * ace/Synch.h: - Doxygen-ized some of the comments - - * ace/Message_Queue.h: - Fixed typo - -Wed Apr 17 07:28:12 UTC 2002 Johnny Willemsen - - * examples/DLL/Newsweek.cpp: - * examples/DLL/Today.cpp: - Added include of svc_export.h. - - * tests/Proactor_Test.cpp: - Fixed fuzz and unicode error - - * ace/Asynch_Acceptor.h: - * ace/Functor.h: - * ace/Message_Queue.h: - * ace/Module.h: - * ace/Thread_Manager.h: - Doxygen-ized some of the comments - -Tue Apr 16 23:32:49 2002 Steve Huston - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added Asynch_Connector.{h cpp} and - Asynch_Pseudo_Task.{h cpp}. - -Tue Apr 16 16:39:07 2002 Ossama Othman - - * ace/POSIX_Asynch_IO.cpp (set_handle, handle_close): - - Fixed unused argument warnings. - -Tue Apr 16 19:25:47 2002 Steve Huston - - * ace/Makefile.bor: - * ace/ace.icc: Added new Asynch_Connector and Asynch_Pseudo_Task files. - -Tue Apr 16 19:07:22 2002 Steve Huston - - * tests/Proactor_Test.cpp: Basically replaced; new version also - tests new ACE_Asynch_Connector facility. - -Tue Apr 16 18:42:39 2002 Steve Huston - - New feature, ACE_Asynch_Connect, contributed by Alex Libman - . Allows asynchronous connect using the - ACE Proactor framework. The new classes follow the same arrangement - as the existing ACE_Asynch_Accept framework. - - * ace/Asynch_Connector.{h cpp}: New files - - * ace/Asynch_IO.{h cpp}: Added new ACE_Asynch_Connect class and - its result. Added new method, ACE_Handler::handle_connect(), to - handle completion of asynch connect operations. - - * ace/Asynch_IO_Impl.{h i cpp}: Added new classes - ACE_Asynch_Connect_Impl and ACE_Asynch_Connect_Result_Impl. - - * ace/Asynch_Pseudo_Task.{h cpp}: Generalized task that handles - asynch emulation where needed, for example, asynch accept/connect. - Replaces the ACE_Asynch_Accept_Task and used for both accept/connect. - - * ace/POSIX_Asynch_IO.{h cpp}: Removed ACE_POSIX_Asynch_Accept_Task - (subsumed by ACE_Asynch_Pseudo_Task, above) and add the - ACE_POSIX_Asynch_Connect and its Result class. - - * ace/POSIX_Proactor.{h cpp}: Added asynch connect plumbing. - - * ace/Proactor.{h cpp}: Added asynch connect support methods. - - * ace/Proactor_Impl.h: Added create_asynch_connect[_result] methods. - - * ace/SUN_Proactor.cpp: Change from asynch_accept_task to - asynch_pseudo_task. - - * ace/WIN32_Asynch_IO.{h cpp}: Add new ACE_WIN32_Asynch_Connect and - _Result. - - * ace/WIN32_Proactor.{h cpp}: Added new create_asynch_connect() and - create_asynch_connect_result() methods. - - * ace/Makefile: Added Asynch_Connector, Asynch_Pseudo_Task - -Tue Apr 16 11:49:00 2002 Ossama Othman - - * ace/Service_Templates.cpp: - * ace/Thread_Manager.cpp: - - Only instantiate ACE_Auto_Basic_Ptr templates if - ACE_LACKS_AUTO_PTR is defined or if ACE_HAS_STANDARD_CPP_LIBRARY - is not defined. In the above cases, they are only used as - base classes for ACE's implementation of the standard auto_ptr - template. When using the auto_ptr implementation provided by - the standard C++ library in use, the ACE_Auto_Basic_Ptr template - instances aren't needed. Reduces footprint in cases where the - standard C++ library implementation is used, and explicit - template instantation is required. - -Tue Apr 16 14:38:12 UTC 2002 Johnny Willemsen - - * etc/ace.doxygen: - * etc/ace_man.doxygen: - Set ACE_COMPILE_TIMEPROBES as PREDEFINED so that timeprobe doxygen - documentation is generated - - * ace/Dump.h: - * ace/Message_Block.h: - * ace/Task.h: - * ace/Task_T.h: - * ace/Thread_Manager.h: - * ace/TLI_Stream.h: - Doxygen-ized some of the comments - -Tue Apr 16 11:04:12 UTC 2002 Johnny Willemsen - - * ace/Event_Handler.h: - * ace/Log_Msg.h: - * ace/Message_Block.h: - * ace/Timer_Hash_T.h: - Doxygen-ized some of the comments - -Mon Apr 15 22:25:28 2002 Balachandran Natarajan - - * THANKS: Added Andrew Guy to the hallf of fame. - -Mon Apr 15 21:43:44 2002 Krishnakumar B - - * ace/Log_Msg.cpp (log): - * ace/Log_Msg.h: - - Added new option '@' to ACE_Log_Msg to print out pointers in - hexadecimal format. This is equivalent to the "%p" option of the - standard C library printf. - -Mon Apr 15 14:04:28 2002 Ossama Othman - - * ace/Dev_Poll_Reactor.h: - * ace/Dev_Poll_Reactor.inl: - * ace/Dev_Poll_Reactor.cpp: - - Experimental implementation of a /dev/poll (or Linux /dev/epoll) - based Reactor. Refinements will be committed to the - implementation very soon. - -Mon Apr 15 11:29:49 2002 Ossama Othman - - * ace/config-win32-msvc-7.h (ACE_NEEDS_FUNC_DEFINITIONS): - - MSVC 7 requires "hidden" functions/methods to be defined. A - declaration is not enough. Fixes link-time "unresolved symbol" - errors when using the ACE_UNIMPLEMENTED_FUNC macro in exported - templates. - -Mon Apr 15 16:20:12 UTC 2002 Johnny Willemsen - - * ace/Timer_Queue_Adapters.{h,i,cpp}: - Made several additions to the ACE_Thread_Timer_Queue_Adapter - - Make it possible to pass a timer queue instance to the - ACE_Thread_Timer_Queue_Adapter instance using the constructor - - Make it possible to get/set the timer queue based on pointers, the - get method with a & is still available, but is marked as deprecated - - Make the thr_id method const - - When the timer queue is created by the - ACE_Thread_Timer_Queue_Adapter then it is also deleted, if it is - passed or set afterwards it isn't deleted by - ACE_Thread_Timer_Queue_Adapter (just like in the ACE_Reactor). - -Mon Apr 15 10:22:12 UTC 2002 Johnny Willemsen - - * ace/Containers_T.h: - Doxygen-ized some of the comments - -Mon Apr 15 08:49:23 UTC 2002 Johnny Willemsen - - * examples/Makefile.bor: - * examples/Timer_Queue/Makefile.bor: - * exmaples/Timer_Queue/Async_Timer_Queue_Test.bor: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.bor: - * examples/Timer_Queue/Thread_Timer_Queue_Test.bor: - Added BCB makefiles - - * examples/Timer_Queue/main_async.cpp: - * examples/Timer_Queue/main_reactor.cpp: - * examples/Timer_Queue/main_thread.cpp: - Made the example compiling in an unicode build - -Mon Apr 15 07:39:12 UTC 2002 Johnny Willemsen - - * examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp: - * examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp: - * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp: - Added include of OS.h to get ACE_TMAIN macro - - * apps/JAWS/server/HTTP_Server.h: - Added include of svc_export.h. - -Sun Apr 14 20:33:12 UTC 2002 Johnny Willemsen - - * ace/Connector.h: - * ace/Process.h: - Doxygen-ized some of the comments - -Sun Apr 14 19:25:12 UTC 2002 Johnny Willemsen - - * ace/Future.h: - Fixed small typing errors in comments - -Sun Apr 14 17:56:33 UTC 2002 Johnny Willemsen - - * ace/SOCK_Dgram_Bcast.h: - * ace/SV_Message.h: - * ace/SV_Message_Queue.h: - Doxygen-ized some of the comments - -Sun Apr 14 11:59:12 UTC 2002 Johnny Willemsen - - * ace/SPIPE_Addr.h: - * ace/Filecache.h: - * ace/Time_Request_Reply.h: - * ace/TLI.h: - Doxygen-ized some of the comments - -Sat Apr 13 19:28:40 UTC 2002 Don Hinton - - * ace/Basic_Types.h: Added include of pthread.h to pick - up typedef of pthread_key_t. - -Sat Apr 13 17:16:10 UTC 2002 Don Hinton - - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h: - * examples/ASX/CCM_App/CCM_App.cpp: - - Added include of svc_export.h. - -Sat Apr 13 15:42:03 UTC 2002 Don Hinton - - * tests/DLL_Test.{h,cpp}: - * tests/DLL_Test_Impl.{h,cpp}: Added methods to test the - the malloc/free and strnew/strdelete methods below. Also - removed use auto_ptr and added a destroy method to delete - the object within the dll/heap it was allocated. - - * ace/OS_Memory.{inl,cpp}: Changed malloc(), calloc() - realloc(), and free() to be non-inlined to avoid the heap - problem on Windows. - - * ace/ACE.{h,i,cpp}: Changed strnew() to be non-inlined and - added strdelete() for the same reason. - -Sat Apr 13 14:33:12 2002 Johnny Willemsen - - * ace/Configuration.h: - * ace/Containers_T.h: - * ace/High_Res_Timer.h: - * ace/Object_Manager.h: - * ace/Reactor.h: - * ace/Reactor_Impl.h: - * ace/Select_Reactor_T.h: - * ace/WFMO_Reactor.h: - Improved doxygen comments. Added @deprecated to methods that - are deprecated so that in the doxygen description this is also - clearly list. - -Sat Apr 13 03:32:52 2002 Krishnakumar B - - * ace/Proactor.h: - - Moved OS.h and ACE_export.h outside the #ifdef ACE_WIN32. - ACE_export.h beacuse the #else part uses it and OS.h because - sig_atomic_t is used in one of the dummy class's signatures. If - others have other opinions, please fix the case for the #else - part also. Fixes Tru64 bustage. - -Fri Apr 12 19:15:39 2002 Steve Huston - - * ace/Asynch_Acceptor.cpp (parse_address): Set the entire address - (address and port) instead of just the IP address part. - Thanks to Alex Libman for this fix. - -Fri Apr 12 18:00:41 UTC 2002 Don Hinton - - * ace/Log_Msg.h: Added missing includes. - - * ace/Basic_Types.h: Removed erroneous ENOMEM definition. - -Fri Apr 12 10:02:58 2002 Priyanka Gontla - - * ace/Based_Pointer_T.h: - Included ace/Trace.h to fix the compilation errors about - undeclared ACE_TRACE. - -Fri Apr 12 08:56:46 2002 Priyanka Gontla - - * tests/DLL_Test_Impl.cpp: - Included OS_Errno.h to fix the compilation error about - undeclared errno. - -Fri Apr 12 15:03:12 2002 Johnny Willemsen - - * etc/*.doxygen: - Set JAVADOC_AUTOBRIEF to YES. From now on, when there is only - javadoc style comments, there first line until the first '.' is - used as brief comment. In the brief class description a lof of more - methods will have a description. - - * Timer_Heap_T.h: - Change the comment style for method remove_first from doxygen style - to javadoc style - -Fri Apr 12 13:32:12 2002 Johnny Willemsen - - * ace/WFMO_Reactor.h: - * ace/Timer_List_T.h: - * ace/Timer_Heap_T.h: - * ace/Timer_Hash_T.h: - * ace/Timeprobe_T.h: - Minor improvements doxygen comments - - * ace/POSIX_Asynch_IO.h: - Doxygen-ized some of the comments - -Fri Apr 12 00:15:32 2002 Krishnakumar B - - * include/makeinclude/platform_sunos5_sunc++.GNU: - * ace/config-sunos5.5.h: - - Reverted to status quo. If and when things go fine, I will - re-enable them. Too many things breaking currently. - -Thu Apr 11 20:37:53 2002 Krishnakumar B - - * ace/OS.i (ftell): - * ace/OS.h: - - Added new wrappers for ftell, fgetpos & fsetpos. - - * ACEXML/common/FileCharStream.cpp: - * ACEXML/common/FileCharStream.h: - - Implemented the previously unavailable available() call. - -Thu Apr 11 20:06:41 2002 Steve Huston - - * examples/C++NPv2/display_logfile.cpp: Spacing/line length - changes so it fits on the book pages. - -Thu Apr 11 18:29:27 2002 Steve Huston - - * examples/C++NPv2/Makefile: New Makefile to build display_logfile. - - * examples/C++NPv2/display_logfile.cpp: Finished and debugged on Linux. - -Thu Apr 11 22:07:40 UTC 2002 Don Hinton - - * netsvcs/lib/Client_Logging_Handler.cpp: Added missing - Log_Record.h include. - - * tests/Svc_Handler_Test.cpp: - Changed ACE_Log_Record::MAXLOGMSGLEN to ACE_MAXLOGMSGLEN. - -Thu Apr 11 20:04:22 UTC 2002 Don Hinton - - * ace/ARGV.h: Rolled back the change and readded ACE.h. - Too many error down the line to fix. - - * ace/Sample_History.cpp: Added include of OS.h. - - * apps/apps/gperf/src/Options.h: Added include of OS.h. - -Thu Apr 11 14:37:09 2002 Nanbor Wang - - * ace/config-win32-common.h: Added ACE_LACKS_PARAM_H. - -Thu Apr 11 18:21:25 UTC 2002 Don Hinton - - * ace/Basic_Types.h: Added include of - to pickup MAXPATHLEN if available and get rid of warning. - -Thu Apr 11 17:37:20 UTC 2002 Don Hinton - - * ace/Basic_Types.h: Added missing typedefs for pid_t and - ssize-t for WIN32 builds needed for my Log_Msg changes - below. - -Thu Apr 11 14:42:32 UTC 2002 Don Hinton - - * ace/ARGV.h: Replaced include of ACE.h with config-all.h. - - * ace/Addr.cpp: - * ace/OS_Dirent.cpp: - * ace/Trace.cpp: - - Added include of OS.h. - - * apps/gperf/src/Bool_Array.cpp: Changed ACE_OS::memset() to - ACE_OS_String::memset() and added include of OS_String.h. - - * tests/Log_Msg_Test.cpp: - * examples/Logger/Acceptor-server.cpp: - * examples/Logger/simple-server/Logging_Handler.cpp: - * examples/Log_Msg/test_callback.cpp: - - Added includes of Log_Record.h. - - * ace/Log_Msg.{h,cpp}: - - Added new method, last_error_adapter(), and changed the - ACE_DEBUG, et al, macros to use new method instead of - ACE_OS::last_error(). Removed includes of OS.h and - Log_Record. Changed ACE_Log_Record::MAXLOGMSGLEN to - ACE_MAXLOGMSGLEN. Removed ACE_OS::cleanup_tss friend. - - * ace/Basic_Types.h: Added definition of MAXPATHLEN and - typedef of ACE_thread_t to prevent need to include OS.h - in Log_Msg.h above. - - * ace/Default_Constants.h: - * ace/OS.h: - - Moved definitions of ACE_MAXLOGMSGLEN, ACE_MAXTOKENNAMELEN, - and ACE_MAXCLIENTIDLEN here from OS.h. - -Thu Apr 11 14:26:12 2002 Johnny Willemsen - - * Timer_Hash_T.h: - * Timer_Heap_T.h: - * Timer_List_T.h: - * Timer_Wheel_T.cpp: - * Timer_Wheel_T.h: - The timer queue classes schedule timers using absolute time. The - describtion in the implementaton files correctly described this, - but the header file comment and the argument name where describing - that the queues work on delta timers, so corrected this. - - * Timer_Queue_Adapters.cpp: - * Timer_Queue_Adapters.h: - Updated the describtion that the schedule method expects an absolute - time. - -Thu Apr 11 13:29:12 2002 Johnny Willemsen - - * ace/String_Base.h: - Fixed some small typo in comment - -Thu Apr 11 08:30:11 UTC 2002 Don Hinton - - * ace/OS_String.inl (strnlen): - Fixed compile error. - -Thu Apr 11 08:16:12 2002 Johnny Willemsen - - * ace/Timer_Queue_T.cpp: - Reverted my change of yesterday. Already the copy constructor is called - - * ace/Task.h: - * ace/Timer_Queue_Adapters.h: - Fixed some small typos in comment - - * ace/Capabilities.h: - Placed right comment with right method - -Wed Apr 10 20:00:57 2002 Ossama Othman - - * ace/Proactor.h: - - Include "ace/ACE_export.h" to pull in definition of ACE_Export - macro. - -Wed Apr 10 19:53:01 2002 Ossama Othman - - * ace/Argv_Type_Converter.cpp: - - Include "ace/OS_Errno.h" to pull in ENOMEM definition. - - (align_char_with_wchar): - - Fixed remaining ACE_OS::strcmp() to be ACE_OS_String::strcmp(). - -Wed Apr 10 19:37:58 2002 Ossama Othman - - * apps/gperf/src/Bool_Array.h: - * apps/gperf/src/Iterator.h: - * apps/gperf/src/List_Node.h: - - No need to include "ace/OS.h". "ace/config-all.h" is enough. - -Wed Apr 10 19:25:39 2002 Ossama Othman - - * apps/Gateway/Gateway/Config_Files.cpp (read_entry): - - Use "unsigned short" instead of the "u_short" typedef to avoid - including "ace/OS.h". - - * apps/Gateway/Gateway/Gateway.h: - * apps/Gateway/Gateway/Event_Channel.h: - * apps/Gateway/Gateway/Options.h: - * apps/Gateway/Peer/Options.h: - * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h: - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h: - * examples/Service_Configurator/Misc/Timer_Service.h: - * netsvcs/clients/Naming/Client/Client_Test.h: - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h: - * tests/DLL_Test_Impl.cpp: - - Include "ace/svc_export.h" to pull in ACE_Svc_Export macro. - -Wed Apr 10 18:57:11 2002 Ossama Othman - - * netsvcs/lib/Client_Logging_Handler.h: - * netsvcs/lib/Name_Handler.h: - * netsvcs/lib/Server_Logging_Handler.h: - * netsvcs/lib/TS_Clerk_Handler.h: - * netsvcs/lib/TS_Server_Handler.h: - - Include "ace/svc_export.h" to pull in ACE_Svc_Export macro. - -Wed Apr 10 19:37:12 2002 Krishnakumar B - - * ace/config-g++-common.h: - - Fixed a missing #define. This should fix the Lynx PPC build. - -Wed Apr 10 17:23:09 2002 Ossama Othman - - * ace/Auto_IncDec_T.h: - - Include "ace/Global_Macros.h" to pull ACE_UNIMPLEMENTED_FUNC - macro definition. - -Wed Apr 10 19:28:27 2002 Steve Huston - - * examples/C++NPv2/display_logfile.cpp: First cut at the C++NPv2 - Streams chapter code for displaying a logfile written from any - C++NPv1 or C++NPv2 logging daemon. - -Wed Apr 10 17:38:31 2002 Steve Huston - - * ace/README: New config macros ACE_HAS_STRNLEN and ACE_HAS_WCSNLEN. - - * ace/OS_String.{h inl}: New method ACE_OS_String::strnlen finds the - length of a string with a specified maximum length. Mimicks the - GNU strnlen(3) and wcsnlen(3) functions. - - * ace/config-linux-common.h: Added ACE_HAS_STRNLEN and ACE_HAS_WCSNLEN - if _GNU_SOURCE is defined, else glibc headers doesn't declare them. - -Wed Apr 10 11:16:57 2002 Ossama Othman - - * ace/Addr.h (hash): - * ace/Addr.i (hash): - - Use "unsigned long" instead of the "u_long" typedef to avoid - including "ace/OS.h". - -Wed Apr 10 11:07:42 2002 Ossama Othman - - * ace/Method_Request.h: - - Fixed remaining "u_long" to "unsigned long" change. - -Wed Apr 10 11:04:56 2002 Ossama Othman - - * ace/Array_Base.h: - - Include "ace/Global_Macros.h" to pull in the ACE_DES_* macros - that required by the inlined ACE_Array_Base destructor. - -Wed Apr 10 11:01:56 2002 Ossama Othman - - * ace/Global_Macros.h: - * ace/OS.h: - - Moved ACE_DES_* macros to Global_Macros.h. This allows some - sources to avoid including ace/OS.h. - -Wed Apr 10 10:54:58 2002 Ossama Othman - - * ace/OS.h: - * ace/Time_Value.h: - - Moved "time" related includes from OS.h to Time_Value.h. Fixes - build problems on Unix platforms. - -Wed Apr 10 10:40:36 2002 Ossama Othman - - Inter-header dependency reductions: - - * ace/Auto_IncDec_T.h: - * ace/Auto_Ptr.h: - * ace/Based_Pointer_T.h: - * ace/Bound_Ptr.h: - * ace/Cached_Connect_Strategy_T.h: - * ace/Cache_Map_Manager_T.h: - * ace/Caching_Strategies_T.h: - * ace/Caching_Utility_T.h: - * ace/Capabilities.h: - * ace/Cleanup_Strategies_T.h: - * ace/Containers_T.h: - * ace/CORBA_macros.h: - * ace/Dynamic_Service.h: - * ace/Env_Value_T.h: - * ace/Managed_Object.h: - * ace/Map.h: - * ace/Map_Manager.h: - - No need to include "ace/OS.h". "ace/config-all.h" is enough. - - * ace/Asynch_Acceptor.h: - - No need to include "ace/OS.h". "ace/Default_Constants.h" is - enough. - - * ace/Addr.h: - * ace/Arg_Shifter.h: - * ace/Argv_Type_Converter.h: - * ace/Based_Pointer_Repository.h: - * ace/Containers.h: - * ace/Containers.cpp: - * ace/Init_ACE.h: - * ace/Trace.h: - - No need to include "ace/OS.h". "ace/ACE_export.h" is enough. - - * ace/RB_Tree.h: - - No need to include "ace/OS.h". "ace/Global_Macros.h" is - enough. - - * ace/Global_Macros.h: - - Moved ACE_GUARD macros to this file, meaning that it is no - longer necessary to include "ace/OS.h" just to get those - macros. This should save on pre-processing times for some - sources. - - Include "ace/OS_Export.h" to pull in the ACE_OS_Export macro - definitions. - - * ace/Arg_Shifter.cpp: - * ace/Argv_Type_Converter.cpp: - - Include "ace/OS_String.h" to pull in static string manipulation - methods. - - Changed all ACE_OS string method calls to ACE_OS_String. - - * ace/Trace.cpp: - - Minor include file cosmetic tweaks. - - * ace/Time_Value.h: - * ace/Time_Value.inl: - * ace/Time_Value.cpp: - - Moved ACE_Time_Value class and related macros/constants to these - files. Files that only need the ACE_Time_Value class - declaration need only include this header instead of "ace/OS.h", - thus reducing pre-processing times. - - * ace/OS.h: - - Moved ACE_Time_Value class and ACE_GUARD macros out of this - header. - - * ace/OS.i: - * ace/OS.cpp: - - Moved ACE_Time_Value methods out of the files into the new - Time_Value.* files. - - * ace/Init_ACE.cpp: - - Use "unsigned int" instead of the "u_int" typedef to avoid - including "ace/OS.h". - - * ace/Hashable.h: - * ace/Hashable.cpp: - * ace/Method_Request.h: - * ace/Method_Request.cpp: - - No need to include "ace/OS.h". "ace/ACE_export.h" is enough. - - Use "unsigned long" instead of the "u_long" typedef to avoid - including "ace/OS.h". - - * ace/Proactor.h: - - No need to include "ace/OS.h" to pull in ACE_Time_Value class - declaration. A forward declaration is enough. - - * ace/Argv_Type_Converter.inl: - * ace/CE_Screen_Output.h: - - Cosmetic changes to improve conformance to our coding - style/guidelines. - - * ace/config-all.h: - - No need to include "ace/ACE_export.h" and "ace/svc_export.h". - They should only be included by headers that need them. - - Do not include "ace/OS_Errno.h". Fixes a circular dependency. - - * ace/Copy_Disabled.h: - * ace/Dirent.h: - * ace/Log_Msg_Backend.h: - * ace/Refcountable.h: - * ace/Recyclable.h: - * ace/String_Base_Const.h: - * ace/Thread_Adapter.h: - - Include "ace/ACE_export.h" to pull in definition of ACE_Export - macro. - - * ace/OS_Export.h: - - Include "ace/config.h" instead of "ace/config-all.h" to fix a - circular include. - - * ace/OS_Errno.h: - - No need to include "ace/config.h". It is already included - indirectly by "ace/OS_Export.h". - - * ace/OS_Dirent.h: - - Include "ace/OS_Errno.h" to pull in errno definitions. - - * ace/Handle_Ops.h: - - Include "ace/ACE_export.h" to pull in ACE_Export macro - definition. - - Added missing "#pragma once". - - * ace/Makefile: - * ace/Makefile.bor: - - Added new Time_Value.* sources to these Makefiles. - -Wed Apr 10 13:32:15 2002 Johnny Willemsen - - * ace/Token.h: - * ace/Timer_Queue_T.h: - Doxygen-ized some of the comments - - * ace/Select_Reactor_T.cpp: - Fixed typo in comment - -Wed Apr 10 07:44:12 2002 Johnny Willemsen - - * ace/Timer_Queue_T.cpp: - Instead of creating a ACE_Time_Value with the default constructor - and immediatly filling it with the assignment operator, create the - ACE_Time_Value with the copy constructor - - * examples/Logger/simple-server/Logging_Acceptor.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h: - * examples/Reactor/Misc/test_signals_2.cpp: - Added missing includes of Log_Msg.h. These where caused by the - compilation speedup of Don Hinton on April 5th. - - * ace/Name_Request_Reply.h: - -Tue Apr 9 22:59:20 2002 Krishnakumar B - - * ace/config-sunos5.5.h: - - Added ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES to fix errors. - - * ace/config-sunos5.6.h: - - Removed definition of ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION as - we turn it on on the command line. - -Tue Apr 9 19:48:15 2002 Krishnakumar B - - * include/makeinclude/platform_osf1_4.x_cxx.GNU (LDFLAGS): - - Moved the -hidden and -non_hidden from LIBS to LDFLAGS. The - linker doesn't like it seeing at the end. This fixes the - problems with Tru64. - -Tue Apr 9 12:43:04 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added POA_BiDir to the list of tests to - be run and prevented MT_BiDir from running in minimum_corba - builds. - -Tue Apr 9 11:46:52 2002 Steve Huston - - * ace/Message_Block.h: Doxygen tweaks to block type enum. - -Tue Apr 9 11:20:19 2002 Steve Huston - - * netsvcs/Server_Logging_Handler_T.cpp (handle_logging_record): - Moved variable 'count' inside the #if 0 block so it's not flagged - as unused. - -Tue Apr 9 15:02:12 2002 Johnny Willemsen - - * ace/Containers_T.h: - Fixed two small typos - - * ace/Thread_Manager.h: - Doxygen-ized some of the comments - -Tue Apr 9 03:04:19 2002 Krishnakumar B - - * include/makeinclude/rules.lib.GNU (VLIB): - - Ensure that templates in the repository get added to the static - library during creation. This build now uses a new variable - called TMPINCDIR which points to the template repository from - which the templates should be pulled in. - - * include/makeinclude/platform_osf1_4.x_cxx.GNU: - - Added support for different template instantiations. - - * include/makeinclude/platform_tru64_cxx.GNU: - - Removed some repeated flags from the command line. - - * ace/config-cxx-common.h: - - Added ACE_TEMPLATES_REQUIRE_SOURCE to pull in the template - definitions to ensure proper template instantiation. - -Tue Apr 9 00:52:42 2002 Krishnakumar B - - * ace/config-sunos5.5.h (ACE_TEMPLATES_REQUIRE_SOURCE): - - Moved this from within a guard to enable it unconditionally. - - * ace/Obstack_T.cpp: - - Added guards to make it consistent with other usage of _T.cpp - files. - - * tests/test_config.h: - - Reverted the change Sun Apr 7 18:04:56 2002 Krishnakumar B - . The original code was right. - - * include/makeinclude/platform_g++_common.GNU: - - Cosmetic fixes. Explicitly check for egcs. It dumps out version - information in a non-standard format confusing the make - conditionals. Should fix the RedHat Static build. - - * include/makeinclude/platform_sunos5_sunc++.GNU: - - Cosmetic fixes to fix build bustage. - -Tue Apr 9 00:05:37 2002 Douglas C. Schmidt - - * ace/Logging_Strategy.h (ACE_Logging_Strategy): Changed "private" to - "protected" so subclasses can access the implementation. Thanks - to Martin Krumpolec for reporting this. This - fixes bugid 1182. - -Mon Apr 8 13:18:12 2002 Johnny Willemsen - - * ace/Activation_Queue.h: - Corrected location of doxygen comments so that the right comment - is placed below the right method - -Sun Apr 7 18:04:56 2002 Krishnakumar B - - * tests/test_config.h (randomize): - - Wrapped the initialization of singleton_ within a - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES guard. This should fix - the problems on FreeBSD and under RedHat static. Thanks to Craig - Rodrigues for reporting this. - -Sun Apr 7 06:02:26 2002 Krishnakumar B - - * include/makeinclude/platform_lynxos.GNU: - * include/makeinclude/platform_macosx.GNU: - - Didn't know that these platforms used g++. Fixing them. - -Sun Apr 7 05:27:35 2002 Krishnakumar B - - * include/makeinclude/platform_g++_common.GNU: - - Fixed a comment from the previous checkin. - - * include/makeinclude/platform_sunos5_sunc++.GNU: - * include/makeinclude/platform_sunos5_ghs.GNU: - * include/makeinclude/platform_sunos5_kcc.GNU: - - Changed these files to the new template instantiation mechanism. - - * tests/test_config.h: - - Added missing definition for the template member. - -Sun Apr 7 04:22:19 2002 Krishnakumar B - - * include/makeinclude/wrapper_macros.GNU(templates): - - Added option templates which can be used to specify the - instantiation policy desired. Allowed values are explicit, - automatic and used. Added flag TEMPLATE_FLAGS which should be - set to the proper value in each of the platform config files. - - * include/makeinclude/platform_g++_common.GNU: - - New file which holds the parsing and setting logic for GNU C++. - - * include/makeinclude/platform_aix4_g++.GNU(templates): - * include/makeinclude/platform_aix_g++.GNU: - * include/makeinclude/platform_chorus4.x_g++.GNU: - * include/makeinclude/platform_freebsd.GNU: - * include/makeinclude/platform_gnuwin32_common.GNU: - * include/makeinclude/platform_hpux_gcc.GNU: - * include/makeinclude/platform_irix5.3_g++.GNU: - * include/makeinclude/platform_irix6.x_g++.GNU: - * include/makeinclude/platform_linux.GNU: - * include/makeinclude/platform_osf1_4.x_g++.GNU: - * include/makeinclude/platform_psosim_g++.GNU: - * include/makeinclude/platform_rtems.x_g++.GNU: - * include/makeinclude/platform_sco5.0.0-mit-pthread.GNU: - * include/makeinclude/platform_sco5.0.0-nothread.GNU: - * include/makeinclude/platform_sunos4_g++.GNU: - * include/makeinclude/platform_sunos5_g++.GNU: - * include/makeinclude/platform_unixware_g++.GNU: - - For all of the platforms above, when using g++ versions 2.95.x, - 2.96, 3.0.x or 3.x or later, the instantiation policy is set to - automatic. - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - - Only exception to the above. The kind of parsing that is done in - this file scares me. So I explicitly set it to "explicit". - - Thanks to Alex Libman for motivating - this. - - If people with any of the above platforms can test if this works - for them, it would be great. If suddenly your files don't link, - just set templates="explicit" in platform_macros.GNU and all - will be fine. This one was easy :-) Next round of changes is for - the above platforms with different compilers. - -Sun Apr 7 04:02:23 2002 Krishnakumar B - - * ace/config-g++-common.h (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES): - - Moved common definitions for egcs into a single block. Wrapped - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES inside appropriate - compiler checks. - - * ace/config-all.h: - - Added a negation before check for - ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS. - - * ace/config-sunos5.5.h: - - Enabled ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION and - ACE_TEMPLATES_REQUIRE_SOURCE only if Sun CC version <= 5.0. - -Sun Apr 07 10:25:12 2002 Johnny Willemsen - - * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp: - * examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp: - Added include of Log_Msg.h to fix build errors in BCB - -Fri Apr 05 21:17:44 2002 Balachandran Natarajan - - * ace/CDR_Stream.cpp: Initialized a null wstring properly. - - * tests/CDR_Test.cpp (test_get): Added a test case for a - marshalling and unmarshalling a zero length wstring. - - The above changes fix [Bug 1169]. Thanks to Duane Binder - for suggesting these fixes. - -Fri Apr 5 19:20:39 2002 Steve Huston - - * ace/Proactor.h: Add #include "ace/OS.h" in the "non-AIO" section - to get the ACE_Time_Value class needed for the stubbed-out class. - - * ace/config-aix-4.x.h: Add some commentary about ACE_HAS_AIO_CALLS. - - * ace/Service_Manager.cpp: Added #include "ace/Log_Msg.h" to fix a - compile problem on AIX. - -Fri Apr 5 11:30:00 2002 Justin Michel - - * ace/OS.i: - * ace/config-win32-common.h: - - SO_REUSEADDR fix brought over from 1.2a - FD_SETSIZE fix brought over from 1.2a - Thanks to Juergen Pfreundt for - motivating this. - -Fri Apr 5 07:45:54 2002 Balachandran Natarajan - - * ace/Local_Tokens.cpp: Fixed a compile error. - -Fri Apr 5 12:51:11 UTC 2002 Don Hinton - - * ace/ACE.i (strnew): Added null pointer check to - the wchar_t version so its behavior matches the char - version. - -Fri Apr 5 11:40:00 UTC 2002 Don Hinton - - * ace/ATM_Acceptor.h - * ace/ATM_Addr.cpp - * ace/ATM_Addr.h - * ace/ATM_Connector.cpp - * ace/ATM_Connector.h - * ace/ATM_Params.h - * ace/ATM_QoS.h - * ace/ATM_Stream.h - * ace/Asynch_Acceptor.h - * ace/Asynch_IO.h - * ace/Asynch_IO_Impl.cpp - * ace/Asynch_IO_Impl.h - * ace/CE_Screen_Output.cpp - * ace/CE_Screen_Output.h - * ace/FlReactor.cpp - * ace/FlReactor.h - * ace/IOStream.h - * ace/LSOCK.cpp - * ace/LSOCK.h - * ace/LSOCK_Acceptor.cpp - * ace/LSOCK_Acceptor.h - * ace/LSOCK_CODgram.cpp - * ace/LSOCK_CODgram.h - * ace/LSOCK_Connector.cpp - * ace/LSOCK_Connector.h - * ace/LSOCK_Dgram.cpp - * ace/LSOCK_Dgram.h - * ace/LSOCK_Stream.cpp - * ace/LSOCK_Stream.h - * ace/Local_Tokens.cpp - * ace/Local_Tokens. - * ace/Msg_WFMO_Reactor.h - * ace/POSIX_Asynch_IO.h - * ace/POSIX_Proactor.h - * ace/Proactor.cpp - * ace/Proactor.h - * ace/Proactor_Impl.h - * ace/QtReactor.h - * ace/Reactor.cpp - * ace/SUN_Proactor.h - * ace/TkReactor.cpp - * ace/TkReactor.h - * ace/UNIX_Addr.cpp - * ace/UNIX_Addr.h - * ace/WFMO_Reactor.cpp - * ace/WFMO_Reactor.h - * ace/WIN32_Asynch_IO.h - * ace/WIN32_Proactor.h - * ace/XTI_ATM_Mcast.h - * ace/XtReactor.cpp - * ace/XtReactor.h - Moved all includes inside the platform- or feature-specific - macro guards and added config-all.h to the headers in order - to speed up compiles when the guard isn't defined. - -Fri Apr 5 08:51:12 2002 Johnny Willemsen - - * apps/Gateway/Peer/Peer.h: - Added missing explicit template instantion exports for msvc7. - Thanks to Tom Phan for reporting this - -Thu Apr 4 21:01:11 2002 Carlos O'Ryan - - * ace/SOCK_Dgram.cpp: - I accidentally left out some code in my last change, without it - platforms that lack IPV6 support will probably break. Whoopsie. - -Thu Apr 4 20:39:51 2002 Carlos O'Ryan - - * bin/g++dep: - Remove bogus path(s) to find gcc, they were site-specific, - host-specific and version-specific, and then outdated at - that. The developer better has a decent version of gcc in her - PATH already, or the 'make depend' commands simply won't work. - -Thu Apr 4 13:17:52 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added a new test to the list of tests - that need to be run. - -Thu Apr 4 11:52:45 2002 Carlos O'Ryan - - * ace/SOCK_Dgram.cpp: - Add support for anonymous PF_LOCAL/SOCK_DGRAM (aka - PF_UNIX/SOCK_DGRAM) sockets. As the class stood before these - changes it was impossible to create such sockets, forcing people - to choose a binding address even for sockets that are used only - to send messages. For PF_INET this is not a big deal, because - the OS (or ACE::bind_port) can choose a port for the - application. But there is no such luck for PF_LOCAL sockets, - where the application has to choose a filename for the socket, - functions like ACE_OS::tempnam() or ACE_OS::mktemp() are more - trouble than they are worth, as they open a security can of - worms. - This fixes bug 1179. - -Thu Apr 4 10:30:54 2002 Balachandran Natarajan - - * ace/RMCast/Makefile: - * ace/SSL/Makefile: - * ace/Makefile: Updated dependency. Other directories need this - too. Will get to them before the beta. - -Thu Apr 4 11:05:48 2002 Carlos O'Ryan - - * ace/Select_Reactor_Base.cpp: - Apply proposed patch for bug 1175, i.e. a possible deadlock - condition when ACE_HAS_REACTOR_NOTIFICATION_QUEUE is defined. - -Thu Apr 4 08:32:26 UTC 2002 Don Hinton - - * ace/CDR_Stream.cpp (ctor): - Modified default ctor to always add ACE_CDR::MAX_ALIGNMENT to - the size parameter since it is always required since the - subsequent call to ACE_CDR::mb_align() might advance the - (rd|wr)_ptr's up to ACE_CDR::MAX_ALIGNMENT-1 bytes. - -Wed Apr 3 18:01:33 2002 Steve Huston - - * ace/SOCK_Dgram.cpp (shared_open): Add PF_INET6 to the test for - need to bind an unused port if ACE_HAS_IPV6 is defined. - -Wed Apr 3 11:04:37 2002 Steve Huston - - * ace/Handle_Ops.{h, cpp} (handle_timed_open): - * ace/SPIPE_Connector.{h cpp} (ctor, connect): Added optional - LPSECURITY_ATTRIBTUES arg, defaults to 0. Allows Windows users - to set security for the new file/pipe open. - - * ace/SPIPE_Acceptor.{h cpp} (ctor, open): Added optional - LPSECURITY_ATTRIBUTES arg, defaults to 0, same as above. - Also added a LPSECURITY_ATTRIBUTES member for NT4 and up. - The LPSECURITY_ATTRIBUTES passed in is remembered across - named pipe instances, and is used to create each new instance. - Doxygen-ized the comments. - -Wed Apr 3 10:15:00 2002 Si Mong Park - - * tests/Atomic_Op_Test_WinCE.vcp: - * tests/Auto_IncDec_Test_WinCE.vcp: - * tests/Barrier_Test_WinCE.vcp: - * tests/Basic_Types_Test_WinCE.vcp: - * tests/Bound_Ptr_Test_WinCE.vcp: - * tests/Buffer_Stream_Test_WinCE.vcp: - * tests/Cached_Accept_Conn_Test_WinCE.vcp: - * tests/Cached_Conn_Test_WinCE.vcp: - * tests/Cache_Map_Manager_Test_WinCE.vcp: - * tests/Capabilities_Test_WinCE.vcp: - * tests/CDR_Array_Test_WinCE.vcp: - * tests/CDR_File_Test_WinCE.vcp: - * tests/CDR_Test_WinCE.vcp: - * tests/Collection_Test_WinCE.vcp: - * tests/Conn_Test_WinCE.vcp: - * tests/DLList_Test_WinCE.vcp: - * tests/DLL_Test_WinCE.vcp: - * tests/Dynamic_Priority_Test_WinCE.vcp: - * tests/Enum_Interfaces_Test_WinCE.vcp: - * tests/Future_Set_Test_WinCE.vcp: - * tests/Future_Test_WinCE.vcp: - * tests/Handle_Set_Test_WinCE.vcp: - * tests/Hash_Map_Bucket_Iterator_Test_WinCE.vcp: - * tests/Hash_Map_Manager_Test_WinCE.vcp: - * tests/High_Res_Timer_Test_WinCE.vcp: - * tests/Lazy_Map_Manager_Test_WinCE.vcp: - * tests/Logging_Strategy_Test_WinCE.vcp: - * tests/Log_Msg_Test_WinCE.vcp: - * tests/Malloc_Test_WinCE.vcp: - * tests/Map_Manager_Test_WinCE.vcp: - * tests/Map_Test_WinCE.vcp: - * tests/Max_Default_Port_Test_WinCE.vcp: - * tests/Mem_Map_Test_WinCE.vcp: - * tests/MEM_Stream_Test_WinCE.vcp: - * tests/Message_Block_Test_WinCE.vcp: - * tests/Message_Queue_Notifications_Test_WinCE.vcp: - * tests/Message_Queue_Test_Ex_WinCE.vcp: - * tests/Message_Queue_Test_WinCE.vcp: - * tests/MM_Shared_Memory_Test_WinCE.vcp: - * tests/MT_Reactor_Timer_Test_WinCE.vcp: - * tests/MT_SOCK_Test_WinCE.vcp: - * tests/Naming_Test_WinCE.vcp: - * tests/New_Fail_Test_WinCE.vcp: - * tests/Notify_Performance_Test_WinCE.vcp: - * tests/Object_Manager_Test_WinCE.vcp: - * tests/OrdMultiSet_Test_WinCE.vcp: - * tests/OS_Test_WinCE.vcp: - * tests/Priority_Buffer_Test_WinCE.vcp: - * tests/Priority_Reactor_Test_WinCE.vcp: - * tests/Priority_Task_Test_WinCE.vcp: - * tests/Process_Manager_Test_WinCE.vcp: - * tests/RB_Tree_Test_WinCE.vcp: - * tests/Reactors_Test_WinCE.vcp: - * tests/Reactor_Exceptions_Test_WinCE.vcp: - * tests/Reactor_Notify_Test_WinCE.vcp: - * tests/Reactor_Performance_Test_WinCE.vcp: - * tests/Reactor_Timer_Test_WinCE.vcp: - * tests/Reader_Writer_Test_WinCE.vcp: - * tests/Recursive_Mutex_Test_WinCE.vcp: - * tests/Refcounted_Auto_Ptr_Test_WinCE.vcp: - * tests/Reverse_Lock_Test_WinCE.vcp: - * tests/Semaphore_Test_WinCE.vcp: - * tests/Service_Config_Test_WinCE.vcp: - * tests/Sigset_Ops_Test_WinCE.vcp: - * tests/Simple_Message_Block_Test_WinCE.vcp: - * tests/SOCK_Connector_Test_WinCE.vcp: - * tests/SOCK_Send_Recv_Test_WinCE.vcp: - * tests/SOCK_Test_WinCE.vcp: - * tests/SPIPE_Test_WinCE.vcp: - * tests/SString_Test_WinCE.vcp: - * tests/Svc_Handler_Test_WinCE.vcp: - * tests/Task_Test_WinCE.vcp: - * tests/Thread_Manager_Test_WinCE.vcp: - * tests/Thread_Mutex_Test_WinCE.vcp: - * tests/Thread_Pool_Reactor_Resume_Test_WinCE.vcp: - * tests/Thread_Pool_Reactor_Test_WinCE.vcp: - * tests/Thread_Pool_Test_WinCE.vcp: - * tests/Timeprobe_Test_WinCE.vcp: - * tests/Timer_Queue_Test_WinCE.vcp: - * tests/Time_Service_Test_WinCE.vcp: - * tests/Time_Value_Test_WinCE.vcp: - * tests/Tokens_Test_WinCE.vcp: - * tests/TSS_Test_WinCE.vcp: - * tests/Upgradable_RW_Test_WinCE.vcp: - Added aygshell.lib to the link option. - -Wed Apr 3 00:03:05 2002 Krishnakumar B - - * include/makeinclude/platform_sunos5_g++.GNU (exceptions): - * include/makeinclude/platform_qnx_neutrino.GNU: - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - - Removed redefinitions of ACE_HAS_GNUG_PRE_2_8 as they were - unnecessary. Some more files also seem to be abusing this flag. - But I don't have access to those exotic platforms. - -Tue Apr 2 19:36:31 2002 Steve Huston - - * ace/OS_String.inl (strtok_r): Another variant of wcstok()... - Linux/glibc uses the 3-arg version of wcstok(), and says it's - from UNIX98 and ISO/ANSI C. - -Tue Apr 2 16:21:39 2002 Steve Huston - - * ace/Get_Opt.h: Doxygen-ized the comments. - -Tue Apr 02 15:12:10 2002 Nanbor Wang - - * bin/nightlybuilds/builds.lst: Removed KCC builds from the list. - -Tue Apr 2 14:02:06 2002 Chris Cleeland - - * ace/SSL/SSL_Context.cpp (dh_params): Changed this to use the - OpenSSL 'BIO' abstraction for file i/o rather than file pointers. - Using file pointers caused problems on Win32 platforms, and BIOs - don't. So, despite the fact that it's ugly and pollutes ACE code - with an OpenSSL abstraction, at least it works. We'll have to - figure out a more palatable way of dealing with this eventually. - -Tue Apr 2 12:53:00 2002 Si Mong Park - - * ace/Argv_Type_Converter.cpp: - Fixed possible memory leak in the Dtor with incorrect counter of - argv. Thanks to Don Hinton for finding this bug. - -Mon Apr 1 18:27:46 2002 Steve Huston - - * ace/OS_String.inl (strtok_r): Corrected decision to call - wcstok() or wcstok_r(). This fixes builds on HP-UX 11. -Mon Apr 1 16:35:29 2002 Steve Huston - - * ace/Containers_T.h (ACE_Array): Added performance characteristics - and requirements table. - -Mon Apr 1 11:56:55 2002 Steve Totten - - * ace/Process.h: - * ace/Process.cpp: - - Applied change from Rich Seibel to add a - reset for the command_line_calculated_ flag (three places) and - rewrote the description of command_line_buf(). - -Mon Apr 1 12:38:44 2002 Steve Huston - - * ace/Asynch_Acceptor.h: Corrected @arg to be @a for Doxygen. - -Sun Mar 31 22:44:00 2002 Si Mong Park - - * apps/FaCE/FaCE_OS.h: - * apps/FaCE/FaCE.cpp: - * apps/FaCE/Main.cpp: - Changed 'LPWSTR' to 'ACE_TCHAR*' and 'LPCTSTR' to 'const ACE_TCHAR*'. - Also removed fuzz no-checking header to enable fuzz again. - -Sun Mar 31 22:08:00 2002 Si Mong Park - - * ChangeLog: - Fixed incorrect path for FaCE related files on prior change log - items. - -Sat Mar 30 08:58:57 2002 Douglas C. Schmidt - - * ace/Asynch_Acceptor.cpp: (handle_accept): Removed a stray - ACE_DEBUG() call. - Thanks to Edan Ayal for reporting this. - -Sun Mar 31 01:18:00 2002 Si Mong Park - - * apps/FaCE/FaCE_OS.h: - * apps/FaCE/FaCE.cpp: - * apps/FaCE/Main.cpp: - Added "// FUZZ: disable check_for_tchar" as the code is only and - specifically for the WinCE. Thanks to Nanbor Wang for help. - - * apps/CE_ARGV.H: - * apps/CE_ARGV.CPP: - Minor lower/upper case change in the include statement. - -Sat Mar 30 22:19:00 2002 Si Mong Park - - * ace/OS.h: - Removed FaCE_MAIN definition originally added during WinCE port - and moved to FaCE_OS.h in the FaCE package since it is FaCE - specific macro. - - * apps/FaCE/Face_OS.h: - Contains FaCE_MAIN macro definition to set entry point on WinCE. - - * apps/FaCE/ReadMe.txt: - Updated installation part for FacE_OS.h. - -Fri Mar 29 17:35:39 2002 Steve Huston - - * ace/Proactor.h: Doxygen-ize some comments; correct the - close() comment (no I/O completion port is known at this level). - -Fri Mar 29 13:40:00 2002 Si Mong Park - - * ace/OS.h: - Minor fix for WinCE IDC name. - - * apps/FaCE/ACE.ico: - * apps/FaCE/ACE_Racer.bmp: - * apps/FaCE/CE_ARGV.CPP - * apps/FaCE/CE_ARGV.H - * apps/FaCE/CE_Screen_Output.cpp: - * apps/FaCE/CE_Screen_Output.h: - * apps/FaCE/FaCE.cpp: - * apps/FaCE/FaCE.h: - * apps/FaCE/FACE.ico: - * apps/FaCE/FaCE.rc: - * apps/FaCE/FaCE.vcp: - * apps/FaCE/FaCE.vcw: - * apps/FaCE/FaCENOACE.vcp: - * apps/FaCE/FaCENOACE.vcw: - * apps/FaCE/License.txt: - * apps/FaCE/Main.cpp: - * apps/FaCE/newres.h: - * apps/FaCE/ReadMe.txt: - * apps/FaCE/resource.h - * apps/FaCE/TAO.BMP: - A new front-end framework utility/plug-in for ACE on WinCE. - -Fri Mar 29 11:33:00 2002 Si Mong Park - - * ace/ace_dll.vcp: - * tests/Refcounted_Auto_Ptr_Test_WinCE.vcp: - * tests/Service_Config_DLL_WinCE.vcp: - Added few files into project. - - * tests/CE_fostream.h: - * tests/CE_fostream.cpp: - A class that simulates fostream on WinCE for CDR File test. - - * tests/Bound_Ptr_Test.cpp: - * tests/CDR_File_Test.cpp: - * tests/Log_Msg_Test.cpp: - * tests/Logging_Strategy_Test.cpp: - * tests/Malloc_Test.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/MM_Shared_Memory_Test.cpp: - * tests/MT_SOCK_Test.cpp: - * tests/Priority_Task_Test.cpp: - * tests/Refcounted_Auto_Ptr_Test.cpp: - * tests/SOCK_Send_Recv_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/Svc_Handler_Test.cpp: - * tests/Thread_Pool_Test.cpp: - Minor updates for WinCE build. - -Fri Mar 29 11:08:29 2002 Steve Huston - - * ace/Asynch_Acceptor.h: Doxygen-ized the method comments. - -Fri Mar 29 02:50:33 2002 Craig Rodrigues - - * examples/QOS/Diffserv/README: Update links to RFC's for - Expedited Forwarding. - -Fri Mar 29 08:32:12 2002 Johnny Willemsen - - * tests/Makefile.bor: - Added new Cached_Allocator_Test - - * tests/Cached_Allocator_Test.cpp: - Fixed unicode build errors - -Thu Mar 28 23:47:00 2002 Si Mong Park - - * ace/OS.h: - * ace/OS.cpp: - Fixed WinCE entry point definitions, and factored out Unicode format - checking parts as a separate function for both WinCE and Unicode builds. - - * ace/config-WinCE.h: - Commented out the part that 'forces' WinCE to use DLL only. The - 'commented out' part has been left for possible future reference. - - * tests/test_config.h: - Changed path settings for WinCE file system as CE only supports absolute- - path and does not have concept of './'. - - * tests/tests_WinCE.vcw: - * tests/ARGV_Test_WinCE.vcp: - * tests/Atomic_Op_Test_WinCE.vcp: - * tests/Auto_IncDec_Test_WinCE.vcp: - * tests/Barrier_Test_WinCE.vcp: - * tests/Basic_Types_Test_WinCE.vcp: - * tests/Bound_Ptr_Test_WinCE.vcp: - * tests/Buffer_Stream_Test_WinCE.vcp: - * tests/Cached_Accept_Conn_Test_WinCE.vcp: - * tests/Cached_Conn_Test_WinCE.vcp: - * tests/Cache_Map_Manager_Test_WinCE.vcp: - * tests/Capabilities_Test_WinCE.vcp: - * tests/CDR_Array_Test_WinCE.vcp: - * tests/CDR_File_Test_WinCE.vcp: - * tests/CDR_Test_WinCE.vcp: - * tests/Collection_Test_WinCE.vcp: - * tests/Conn_Test_WinCE.vcp: - * tests/DLList_Test_WinCE.vcp: - * tests/DLL_Test_DLL_WinCE.vcp: - * tests/DLL_Test_WinCE.vcp: - * tests/Dynamic_Priority_Test_WinCE.vcp: - * tests/Enum_Interfaces_Test_WinCE.vcp: - * tests/Future_Set_Test_WinCE.vcp: - * tests/Future_Test_WinCE.vcp: - * tests/Handle_Set_Test_WinCE.vcp: - * tests/Hash_Map_Bucket_Iterator_Test_WinCE.vcp: - * tests/Hash_Map_Manager_Test_WinCE.vcp: - * tests/High_Res_Timer_Test_WinCE.vcp: - * tests/Lazy_Map_Manager_Test_WinCE.vcp: - * tests/Logging_Strategy_Test_WinCE.vcp: - * tests/Log_Msg_Test_WinCE.vcp: - * tests/Malloc_Test_WinCE.vcp: - * tests/Map_Manager_Test_WinCE.vcp: - * tests/Map_Test_WinCE.vcp: - * tests/Max_Default_Port_Test_WinCE.vcp: - * tests/Mem_Map_Test_WinCE.vcp: - * tests/MEM_Stream_Test_WinCE.vcp: - * tests/Message_Block_Test_WinCE.vcp: - * tests/Message_Queue_Notifications_Test_WinCE.vcp: - * tests/Message_Queue_Test_Ex_WinCE.vcp: - * tests/Message_Queue_Test_WinCE.vcp: - * tests/MM_Shared_Memory_Test_WinCE.vcp: - * tests/MT_Reactor_Timer_Test_WinCE.vcp: - * tests/MT_SOCK_Test_WinCE.vcp: - * tests/Naming_Test_WinCE.vcp: - * tests/New_Fail_Test_WinCE.vcp: - * tests/Notify_Performance_Test_WinCE.vcp: - * tests/Object_Manager_Test_WinCE.vcp: - * tests/OrdMultiSet_Test_WinCE.vcp: - * tests/OS_Test_WinCE.vcp: - * tests/Priority_Buffer_Test_WinCE.vcp: - * tests/Priority_Reactor_Test_WinCE.vcp: - * tests/Priority_Task_Test_WinCE.vcp: - * tests/Process_Manager_Test_WinCE.vcp: - * tests/RB_Tree_Test_WinCE.vcp: - * tests/Reactors_Test_WinCE.vcp: - * tests/Reactor_Exceptions_Test_WinCE.vcp: - * tests/Reactor_Notify_Test_WinCE.vcp: - * tests/Reactor_Performance_Test_WinCE.vcp: - * tests/Reactor_Timer_Test_WinCE.vcp: - * tests/Reader_Writer_Test_WinCE.vcp: - * tests/Recursive_Mutex_Test_WinCE.vcp: - * tests/Refcounted_Auto_Ptr_Test_WinCE.vcp: - * tests/Reverse_Lock_Test_WinCE.vcp: - * tests/Semaphore_Test_WinCE.vcp: - * tests/Service_Config_DLL_WinCE.vcp: - * tests/Service_Config_Test_WinCE.vcp: - * tests/Sigset_Ops_Test_WinCE.vcp: - * tests/Simple_Message_Block_Test_WinCE.vcp: - * tests/SOCK_Connector_Test_WinCE.vcp: - * tests/SOCK_Send_Recv_Test_WinCE.vcp: - * tests/SOCK_Test_WinCE.vcp: - * tests/SPIPE_Test_WinCE.vcp: - * tests/SString_Test_WinCE.vcp: - * tests/Svc_Handler_Test_WinCE.vcp: - * tests/Task_Test_WinCE.vcp: - * tests/Thread_Manager_Test_WinCE.vcp: - * tests/Thread_Mutex_Test_WinCE.vcp: - * tests/Thread_Pool_Reactor_Resume_Test_WinCE.vcp: - * tests/Thread_Pool_Reactor_Test_WinCE.vcp: - * tests/Thread_Pool_Test_WinCE.vcp: - * tests/Timeprobe_Test_WinCE.vcp: - * tests/Timer_Queue_Test_WinCE.vcp: - * tests/Time_Service_Test_WinCE.vcp: - * tests/Time_Value_Test_WinCE.vcp: - * tests/Tokens_Test_WinCE.vcp: - * tests/TSS_Test_WinCE.vcp: - * tests/Upgradable_RW_Test_WinCE.vcp: - Project files for WinCE build on eMbedded Visual C++ 3.0. - Note that some tests run fine under emulator but not on the real - machine, and some tests run okay on WinCE 3.0 but not on Pocket PC 2002. - The missing tests are mostly not supported by WinCE 3.0/PPC 2002. - For example, WinCE does not have 'fork' or environment variables. - Also, WinCE supports memory mapped file; however, the method is so different - to other Windows platforms that it is really hard to make it work correctly - on current ACE mem-map function structure. - -Thu Mar 28 16:15:17 2002 Douglas C. Schmidt - - * ace/TTY_IO.h: Added the ACE_Export macro to the Serial_Params - struct. Thanks to Pavel Repin for reporting - this. - -Thu Mar 28 13:31:19 2002 Priyanka Gontla - - * ace/POSIX_Asynch_IO.cpp (handle_close): - Fixed the warnings on Debian_Core build that were caused by the - changes earlier today. - -Thu Mar 28 16:14:39 2002 Steve Huston - - * ace/OS.h (ACE_Time_Value::dump): Added comments that'll go to - the man page to explain why this is a no-op. - -Thu Mar 28 14:26:19 2002 Douglas C. Schmidt - - * tests/Cached_Allocator_Test.cpp: Added a missing template - instantiation. - -Thu Mar 28 10:45:16 2002 Nanbor Wang - - * tests/tests.dsw: - * tests/Cached_Allocator_Test.dsp: Added this new MSVC project. - -Thu Mar 28 10:12:13 2002 Douglas C. Schmidt - - * ace/Malloc_T.{h,i,cpp}: Added support for - ACE_Dynamic_Cached_Allocator. - Thanks to Jaroslaw Nozderko for - contributing this. - - * tests: Added Cached_Allocator_Test.cpp. Thanks to - Jaroslaw Nozderko for contributing this. - - * tests/Makefile (BIN): - * tests/run_test.lst: Added Cached_Allocator_Test. - -Thu Mar 28 06:15:22 2002 Alex Libman - - * ace/POSIX_Asynch_IO.cpp, - ace/POSIX_Asynch_IO.h: - ACE_POSIX_AOICB_Asynch_Operation and ACE_POSIX_Asynch_Operation - merged in one class ACE_POSIX_Asynch_Operation - - Since POSIX_SIG_Proactor and SUN_Proactor are based on - POSIX_AIOCB_Proactor and both of them use - ACE_POSIX_AOICB_Asynch_Operation, there is no necessity to - support extra class tree. - - * ace/POSIX_Asynch_IO.cpp, - ace/POSIX_Asynch_IO.h: - ACE_POSIX_AOICB_Transmit_Handler and ACE_POSIX_Transmit_Handler - merged in ACE_POSIX_Transmit_Handler for same reason as previous - change. - - * ace/POSIX_Asynch_IO.cpp, - ace/POSIX_Asynch_IO.h: ACE_POSIX_Asynch_Accept merged with - ACE_POSIX_Asynch_Accept_Hanlder and redesigned and added - new class ACE_POSIX_Asynch_Accept_Task. - - POSIX_AIOCB_Proactor has new member - ACE_POSIX_Asynch_Accept_Task asynch_accept_task_. - - Task activation should be done from the most derived - constructors , when the final table of virtual functions is - built (simular case with notify_manager). - - // start asynch accept task - this->get_asynch_accept_task.start (); - - All POSIX_Proactors implementations ( AIOCB,SIG,SUN ) should - stop ACE_POSIX_Asynch_Accept_Task in their destructors to avoid - post_completions from based classes - - // stop asynch accept task - this->get_asynch_accept_task.stop (); - -Thu Mar 28 06:14:22 2002 Douglas C. Schmidt - - * ace/TTY_IO.cpp (Serial_Params): Zero out the values in the - Serial_Params constructor. Thanks to Pavel Repin - for reporting this. - -Wed Mar 27 20:00:31 2002 Douglas C. Schmidt - - * include/makeinclude/platform_linux.GNU: Fixed a typo where - PLATFORM_XT_LDFLAGS was spelled incorrectly. Thanks to Eric - Eide and Ansgar Konermann - for reporting this. - -Wed Mar 27 18:36:14 2002 Krishnakumar B - - * include/makeinclude/platform_linux.GNU (CXX_VERSION): - - Reorganised the switches a bit for handling the implicit - templates. - - * include/makeinclude/wrapper_macros.GNU (ACE_HAS_GNUG_PRE_2_8): - - If the compiler has g++ or any mutations of g++, test whether - the version is less than 2.8. If so set ACE_HAS_GNUG_PRE_2_8 - to 1 else set it to 0. Thanks to James Haiar - for reporting this. - -Wed Mar 27 16:32:55 2002 Irfan Pyarali - - * tests/Reactor_Dispatch_Order_Test.cpp: Minor compilation fixes. - -Wed Mar 27 15:10:27 2002 Irfan Pyarali - - * tests/Reactor_Dispatch_Order_Test: Added a new test to check the - order of dispatching of ACE Reactors. Order should be: timeout, - output, and then input. Currently, Select and WFMO Reactors are - tested. - - The following files we updated to include the new test: - - - tests/Makefile - - tests/Makefile.am - - tests/Makefile.bor - - tests/Reactor_Dispatch_Order_Test.dsp - - tests/Reactor_Dispatch_Order_Test.icc - - tests/icc.bat - - tests/run_test.lst - - tests/run_tests.bat - - tests/run_tests.psosim - - tests/run_tests_remote.lst - - tests/tests.dsw - - tests/tests.icp - - * ace/WFMO_Reactor.cpp (upcall): Changed the dispatch order to - match the Select_Reactor's dispatch order. The order now is: - - FD_WRITE - FD_CONNECT - FD_OOB - FD_READ - FD_CLOSE - FD_ACCEPT - FD_QOS - FD_GROUP_QOS - - Thanks to Steve Huston for pointing this - out. - - * tests/icc.bat: Removed duplicates. - -Wed Mar 27 10:25:12 2002 Johnny Willemsen - - * ace/High_Res_Timer.{h,cpp}: - Fixed a few small typing errors in comments - -Tue Mar 26 13:55:19 2002 Douglas C. Schmidt - - * ace/OS.i (operator *=): Explicitly promote sec() to double before - multiplying it to prevent problems with overflow. Thanks to - Eric Page for reporting this. This - fixes BugId [1174]. - -Tue Mar 26 06:50:58 2002 Douglas C. Schmidt - - * ace/Synch.h (ACE_Null_Mutex): Added a dummy "lock_" variable - to make ACE_Condition work properly. Thanks to - Ido Yellin for reporting this. - -Wed Mar 21 08:11:15 2002 Boris Kolpackov - - * THANKS: Added Frank Rybak to the Hall of fame. - -Wed Mar 20 11:23:38 2002 Priyanka Gontla - - * ace/Service_Manager.cpp (handle_input): - Moved the declaration of 'error' outside the do-while loop to - fix the 'error (undeclared)' error. - -Wed Mar 20 09:51:47 2002 Douglas C. Schmidt - - * ace/Acceptor.cpp (handle_input): Updated the comments to point out that - svc_handler->close() is called in accept_svc_handler() and - activate_svc_handler() if a failure occurs. Thanks to Rainer - Lucas for motivating this. - -Wed Mar 20 06:44:02 2002 Douglas C. Schmidt - - * ace/Service_Manager.cpp (handle_input): Fixed a bug that prevents - an infinite loop. Thanks to Sandro Doro - for reporting this. - - * include/makeinclude/platform_vxworks5.x_g++.GNU (HOST_DIR): Fixed - a typo where -mlongcal should be -mlongcall. Thanks to Erik - Johannes for reporting this. - -Wed Mar 20 14:26:12 2002 Johnny Willemsen - - * docs/usage-bugzilla.html: - Updated the link to the Bugzilla project - -Tue Mar 19 15:17:25 2002 Dante J. Cannarozzi - - * ace/Containers_T.h: with the help of Matt Hampton - updated doxygen comments for container classes - with more details at the request of Steve Huston. - -Tue Mar 19 02:40:00 2002 Si Mong Park - - * ace/OS_String.h: - * ace/OS_String.inl: - * ace/OS_String.cpp: - Corrected proper ACE_HAS_REENTRANT_FUNCTIONS macro checking location - for the strtok_r_emulation functions. Debian compilation error was - because ACE_HAS_REENTRANT_FUNCTIONS was not defined in the configuration. - If ACE_HAS_REENTRANT_FUNCTIONS is defined, then emulation functions - should not be visible. - -Mon Mar 19 08:32:34 2002 Boris Kolpackov - * THANKS: Added Chen Jian to the Hall of fame. - -Sun Mar 17 18:22:12 2002 Craig Rodrigues - - * include/makeinclude/platform_freebsd.GNU: Copy lines from - platform_linux.GNU. exceptions=1 is now the default, - unless overridden by the user, just like for Linux. - -Sun Mar 17 11:53:12 2002 Johnny Willemsen - - * include/makeinclude/compiler.bor: - When doing a wchar build don't automatically define UNICODE and _UNICODE. - -Fri Mar 15 18:08:28 2002 Steve Huston - - * ace/config-aix-4.x.h: Removed the optional setting of - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION for Visual Age C++ - 5 without __TEMPINC__ set. This was an experiment to try and - rid the build of all the "duplicate symbol" warnings, and it - broke the incremental builds. - -Fri Mar 15 12:19:58 2002 Chad Elliott - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: - - Added support for building with exceptions enabled. - -Fri Mar 15 05:59:45 2002 Douglas C. Schmidt - - * ace/SPIPE_Acceptor.cpp: Removed the ACE_ASSERT (result == FALSE) - macro call. Thanks to Oleg Burlachenko - for reporting this. - -Fri Mar 15 00:16:06 2002 Craig Rodrigues - - * include/makeinclude/platform_freebsd.GNU: - * include/makeinclude/platform_netbsd.GNU: - Make -fno-implicit-templates conditional, instead of default. - Thanks to Denis Otchenashko for motivating - me to look into this and fix this. - -Thu Mar 14 12:50:00 2002 Si Mong Park - - * ace/OS_String.h: - * ace/OS_String.inl: - * ace/OS_String.cpp: - Fixed a skipping strtok_r_emulation definition when ACE_HAS_WCHAR is - defined. - -Thu Mar 14 11:26:41 2002 Nanbor Wang - - * performance-tests/Misc/context_switch_time.cpp: Renamed the - internally used macro, DEBUG, to ACE_DEBUG_CST to avoid clashing - with the compiler defined macro. Thanks to Allan S Iverson - for motivating the fix. - -Thu Mar 14 09:17:55 2002 Douglas C. Schmidt - - * ace/Strategies_T.cpp (activate_svc_handler): Added a call to - destroy() the svc_handler if ACE::fork() fails. Thanks to - Rainer Lucas for reporting this. - - * ace/Configuration.cpp (remove_section): Made the code consistent - for all versions of Windows. Thanks to Jon Lambert - for the fix. - - * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp (ACE_TMAIN): Added - '\n' to the end of command strings so that the client won't hang. Thanks to - Marc M Adkins for this fix. - -Wed Mar 13 15:55:54 2002 Douglas C. Schmidt - - * ace/OS.h: EACCESS was misspelled! Thanks to Eric Eide - for reporting this. - -Wed Mar 13 20:50:00 2002 Si Mong Park - - * ace/OS.i: - Minor change to resolve signed/unsigned comparison warning. - - * ace/OS_String.h: - * ace/OS_String.inl: - * ace/OS_String.cpp: - Added wide-char version of strtok_r and strtok_r_emulation. - - * ace/Functor.h: - * ace/Functor.i: - Added hash related templates for ACE_ANTI_TCHAR type - when ACE_USES_WCHAR is defined. - - * ace/ace_dll.vcp: - * ace/ace_os_dll.vcp: Added missing files. - -Wed Mar 13 11:57:41 2002 Steve Huston - - * ace/Configuration_Import_Export.cpp: Replace ACE_ASSERTs with - validity checks that set errno and return -1. ACE_ASSERT is - a little too drastic for a simple error, and the ACE_ASSERT - check is removed altogether when building with ACE_NDEBUG. - -Wed Mar 13 10:36:02 2002 Craig Rodrigues - - * ace/config-freebsd-pthread.h: Fix test for POSIX RT signals. - Thanks to Denis Otchenashko for reporting - these problems. - -Wed Mar 13 10:21:49 2002 Steve Huston - - * ace/Configuration_Import_Export.cpp (ACE_Ini_ImpExp::import_config): - Remove the "else value = ACE_LIB_TEXT("")" for zero-length - values - value is already a zero-length string. - -Wed Mar 13 09:40:12 2002 Johnny Willemsen - - * ace/Registry_Name_Space.cpp: - Fixed warnings about unused variables in BCB Unicode build - -Tue Mar 12 18:37:49 2002 Steve Huston - - * ace/Configuration_Import_Export.{h cpp} (ACE_Ini_ImpExp): - Changed behavior of ACE_Ini_ImpExp::import_config() to take - the entire string, with or without whitespace, without requiring - quotes around the string. This puts functionality on par with - regular Windows INI files. - - Also, on ACE_Ini_ImpExp::export_config(), don't add quotes to - string values that are exported. import_config() will still read - files exported previously (which have quotes around strings) - but when re-exported, the quotes will not be added. - -Tue Mar 12 17:43:32 2002 Balachandran Natarajan - - * ace/CDR_Base.cpp (consolidate): If the incoming message block - does not have a chain of message blocks, there is no need to do - a deep copy, a refcount increment on the incoming datablock - would do. Thanks to Lothar Werzinger - for the patches. - -Tue Mar 12 15:32:46 2002 Balachandran Natarajan - - * PROBLEM-REPORT-FORM (Subject): Added a request for the version - of winsock on Windows based OS's. - -Tue Mar 12 15:22:29 2002 Balachandran Natarajan - - * ace/OS.i (sendv): When using winsock1, we transfer data by - sending one iovec at a time. If transfer of a buffer isnt - complete because the socket buffers got full, we need to drop - out of the loop that sends data. Thanks to Stephan Gudmundson - for providing this patch. - - * THANKS: Added Stephan Gudmundson to the Hall of fame. - -Mon Feb 25 14:06:45 2002 Chad Elliott - - * ace/config-hpux-11.00.h: - - Do not define __HP_aCC if using KCC. - - * include/makeinclude/platform_hpux_kcc.GNU: - - Add the --one-instantiation-per-object parameter to avoid - build problems with KCC. - - * tests/Dirent_Test.cpp: - - Modify this test to work with Chorus (as it does with VxWorks). - - * ace/config-aix-4.x.h: - - Defined ACE_HAS_USING_KEYWORD for AIX 4.x with Visual Age 5 or - later. This change came from Yan Dai - -Tue Mar 12 11:53:53 2002 Chad Elliott - - * bin/perltest2cpp.pl: - - Corrected the code for array assignments. - - * bin/vxworks_modify.pl: - - Use ACE_ENV_* instead of TAO_ENV_*. - -Tue Mar 12 10:45:00 2002 Justin Michel - - * ace/OS.i: - - Added call to ACE_OS::set_errno_to_last_error() in two places - where Winsock WSARecvFrom or WSASendTo were called. - -Tue Mar 12 09:06:00 2002 Si Mong Park - - * etc/Svc_Conf_l.cpp.diff: - Incorrect file had been checked in on prior commit. - This is the correct file. - - * tests/Config_Test.cpp: - Fixed incorrect delete statement. - -Tue Mar 12 08:54:00 2002 Si Mong Park - - * etc/Svc_Conf_l.cpp.diff: - Fixed CR/LF (DOS format) problem: no content changed. - -Tue Mar 12 13:52:12 2002 Johnny Willemsen - - * THANKS : Added Oleg Kraynov - -Mon Mar 11 21:05:26 2002 Krishnakumar B - - * ACEXML/parser/parser/Parser.cpp (parse): - - Added comment on the order of processing that should be done by - the parser. - -Mon Mar 11 20:21:38 2002 Steve Huston - - * ace/config-all.h: Fixed ACE_NEW section to work with HP-UX 10.20, - aC++ A.01.27 with -AA option. - -Mon Mar 11 18:48:41 2002 Steve Huston - - * examples/C++NPv1/Logging_Client.cpp: Added a compile-time check - for Win32 to be sure ACE_HAS_STANDARD_CPP_LIBRARY is set, else - trying to use the new getline() method with an old cin won't work. - -Mon Mar 11 17:43:00 2002 Si Mong Park - - * ace/Svc_Conf_l.cpp: - Minor comment change to make diff file. - - * etc/Svc_Conf_l.cpp.diff: - Updated diff file for Svc_Conf_l.cpp. - -Mon Mar 11 16:59:42 2002 Steve Huston - - * tests/TP_Reactor_Test.h (new file): - * tests/TP_Reactor_Test.cpp: Moved declarations for Receiver, - Acceptor, Sender, and Connector classes to the new file - TP_Reactor_Test.h so Visual Age C++ can find them when - instantiating templates. - -Mon Mar 11 16:38:49 2002 Steve Huston - - * tests/Reactor_Notify_Test.cpp: Added missing #include "ace/Reactor.h" - to fix Visual Age C++ compile error. - -Mon Mar 11 16:27:59 2002 Steve Huston - - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: - Added missing #include "ace/Auto_Ptr.h" to fix compile problem - for platforms w/o native auto_ptr (like MSVC). - -Mon Mar 11 14:23:00 2002 Si Mong Park - - * tests/Config_Test.cpp: - Removed one of the delete statement that deletes twice and thus - causing an invalid access violation. - -Mon Mar 11 10:28:45 2002 Chad Elliott - - * bin/vxworks_modify.pl: - - Update this script to work correctly with the new CORBA - Environment style. - -Mon Mar 11 12:17:12 2002 Johnny Willemsen - - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - * include/makeinclude/compiler.bor: - * include/makeinclude/decorator.bor: - * include/makeinclude/make_flags.bor: - * include/makeinclude/outputdir.bor: - Added support for a real unicode build with BCB builder. A real - unicode build can for example be done with: - make -f makefile.bor -DUNICODE - Doing a real unicode build means that the defines ACE_USES_WCHAR, - UNICODE and _UNICODE are set, diffent BCB object files are used - to link with and the compiler gets the extra compiler option -WU. - The dll names have a 'u' added so that unicode dll's are separated - from the non-unicode dll's. Also the output files are build in a - separate subdirectory. - - * ACE-INSTALL.html: - Explained the BCB make options that can be used with ACE - -Mon Mar 11 11:35:12 2002 Johnny Willemsen - - * ace/Registry_Name_Space.cpp: - Changed ACE_USHORT16 to ACE_WSTRING_TYPE because the underlying type - of ACE_WString is ACE_USHORT16 with MSVC and with BCB it is - wchar_t. The define ACE_WSTRING_TYPE hides these differences. When - UNICODE and ACE_USES_WCHAR are defined BCB gave a compile error. - -Sun Mar 10 18:53:48 2002 Si Mong Park - - * ace/Svc_Conf_l.cpp: - Commented out 'break' line to resolve unreachable statement warning. - -Sun Mar 10 05:54:30 2002 Balachandran Natarajan - - * THANKS : Added Val Dumitrescu to the - Hal of Fame. - * bin/auto_run_tests.lst: Added a new test to the daily builds. - -Sat Mar 9 21:22:51 2002 Balachandran Natarajan - - * ace/CDR_Stream.cpp: - * ace/CDR_Stream.i: - * ace/CDR_Stream.h: Added accessor methods for GIOP versions of - Input and Output CDR streams. - -Sat Mar 9 07:52:45 2002 Douglas C. Schmidt - - * ace/SPIPE_Addr.cpp (set): Changed a strcpy() to a strcat() to - fix the code. Thanks to Robert Laferriere - for reporting this. - -Fri Mar 8 22:29:36 2002 Si Mong Park - - * ace/Argv_Type_Converter.cpp: - * ace/Argv_Type_Converter.h: - * ace/Argv_Type_Converter.inl: - new class to convert command line parameter type between char - and wchar_t. - - * ace/Basic_Types.h: - Set the endian type to 'little endian' for ARM processor - - Pocket PC 2002 platform. - - * ace/Log_Record.cpp: - * ace/Log_Record.h: - Removed print method that uses ACE_CE_Bridge since CE_Bridge is - no longer supported by ACE CE port. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Added Argv_Type_Converter class to the project. - - * ace/WFMO_Reactor.cpp: - * ace/WFMO_Reactor.h: - * ace/WFMO_Reactor.i: - Updated to support WinCE. - - * ace/Process.cpp: - Fixed incorrect call to CreateProcess for WinCE. - - * ace/config-WinCE.h: - Updated for WinCE Pocket PC 2002. - - * ace/ace.vcw: - * ace/ace_dll.vcp: - * ace/ace_os_dll.vcp: - New ACE project file for WinCE Pocket PC 2002 build on eMbedded - Visual C++ 3.0. - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - Added Argv_Type_Converter file. - - * ace/Configuration.cpp: - * ace/Memory_Pool.cpp: - Updated for the WinCE port. - - * ace/Read_Buffer.cpp: - * ace/Read_Buffer.h: - Disabled Ctor with ACE_HANDLE on WinCE since ACE_HANDLE is same - as FILE* on WinCE. - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - Updated for WinCE port. Changes includes removal of CE Bridge - added CE argv process class, enabled many file IO functions - that formerly disabled on CE, bypassing QoS parts for CE, and - other CE specific declarations. - - * ace/Dynamic_Service.h: - * ace/Dynamic_Service.i: - Added 'instance' method uses ACE_ANTI_TCHAR type name for when - ACE_TCHAR is wchar_t. - - * ace/CE_Screen_Output.cpp: - * ace/CE_Screen_Output.h: - screen output helper class only for WinCE platform - should - not be used on any other platform. - - * ace/OS_Memory.h: - * ace/OS_String.h: - Changed to skip including stddef.h for WinCE. - - * ace/MEM_Acceptor.h: - * ace/MEM_Acceptor.i: - * ace/SOCK_Acceptor.cpp: - * ace/SOCK_Acceptor.h: - * ace/SOCK_Connector.cpp: - * ace/SOCK_Connector.h: - * ace/SOCK_Dgram_Mcast.h: - Updated to skip QoS part on WinCE. - - * ace/Svc_Conf.l: - * ace/Svc_Conf_l.cpp: - Fixed a problem giving a parse error on reading carriage return - token on Unicode formatted svc conf file. - - * ace/Registry.cpp: - Changed connect function for WinCE to return -1 because CE does - not allow direct registry connection. - - * ace/Sock_Connect.cpp: - Changed to use Iphlpapi library (standard on WinCE) on WinCE to - find IP address instead of searching registry since CE has so - many variations on registry settings. - - * ace/Log_Msg.cpp: - Minor change for WinCE on stderr. - -Fri Mar 8 19:45:31 2002 Steve Huston - - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: - Use auto_ptr<> to manage dynamically-allocated Thread_Args. - Thanks to Chris Uzdavinis for this suggestion. - -Thu Mar 7 16:10:02 2002 Douglas C. Schmidt - - * include/makeincludes/platform_linux_icc.GNU, - * ace/config-icc-common.h, - * ace/config-linux-common.h: Added support for the Intel C++ compiler - (icc). Thanks to Roger Tragins for contributing this. - -Thu Mar 7 11:17:12 2002 Johnny Willemsen - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Membership_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Reordering_Test.cpp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp: - * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: - Replaced main with ACE_TMAIN. - -Wed Mar 6 21:48:15 2002 Krishnakumar B - - * include/makeinclude/platform_linux_kcc.GNU (CCFLAGS): - - Moved --one_instantiation_per_object flag as a common flag. - Otherwise building with debugging enabled doesn't work with - libraries built without debug information. - -Wed Mar 6 21:42:37 2002 Krishnakumar B - - * bin/ace-install: - - Make sure that the .inl files are also installed. Thanks to - Carsten Prescher for reporting this. - -Wed Mar 6 18:30:49 2002 Steve Huston - - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.h: - Reimplemented the Logging_Server::run method. Because the - handle_connections() method spawns a new thread to run the - logging session, and it calls handle_data(), the call to - handle_data() from Logging_Server::run() is incorrect. Thanks - to Raghuram Shetty for reporting - this issue. - - * examples/C++NPv1/Reactive_Logging_Server.h: - Fix wait_for_multiple_events() to correctly check error return - from select(). Also, in handle_connections(), sync the code - with the book to clear acceptor handles from the active_handles_ - after accepting all ready connections. - - * examples/C++NPv1/Reactive_Logging_Server_Ex.h (handle_connections): - Clear acceptor's handle from active_read_handles_ to keep from - dispatching it as a data handle. See, this is why you should use - the Reactor framework - so be sure to buy vol 2 ;-) - - * THANKS: Added Raghuram Shetty to the Hall of Fame. - -Wed Mar 06 17:06:43 2002 Nanbor Wang - - * tests/Cached_Accept_Conn_Test.cpp: - * tests/Cached_Conn_Test.cpp: Replaced main with ACE_TMAIN. - -Wed Mar 6 14:43:34 2002 Nanbor Wang - - * ace/OS.h: Reverted my previous "fix" to the argv argument type. - - Mon Jan 21 23:27:03 2002 Nanbor Wang - - A program entry poing main can take any of the - three forms: - - int main (int argc, char *argv[]) - int wmain (int argc, wchar_t *argv[]) - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - Of them, the entry point main always gives you - the command line arguemnt in char strings form. The entry - point wmain currently can only be used under - Win32 and it returns the command line arguments in wchar - strings format. Defining the ACE_TMAIN as the - program entry point is the more portable form. The command - line arguments are given in char strings in most cases, - or wchar strings when ACE_USES_WCHAR is defined. - See $ACE_ROOT/docs/wchar.txt for more information - on ACE support on wchar. - - * docs/ACE-guidelines.html: Added a new guideline explaining which - main entry point to use, as above. - - * bin/main2TMAIN.pl: Script to replace entry points of the form - - main (int, ACE_TCHAR *[]) - - to - - ACE_TMAIN (int, ACE_TCHAR *[]) - - * *.cpp: Changed to use the new ACE_TMAIN. - -Tue Mar 06 14:30:12 2002 Johnny Willemsen - - * tests/MEM_Stream_Test.cpp: - Fixed the shutdown of this test. When _TEST_USES_THREADS is defined - we must do a wait() on the thread manager, else on the process - manager. - -Tue Mar 05 20:34:22 2002 Ossama Othman - - * ace/OS_Thread_Adapter.cpp (invoke): - * ace/Thread_Adapter.cpp (invoke_i): - - Fixed "jump out of __finally block" warning emanating from - MSVC 7. - -Tue Mar 05 15:46:15 2002 Nanbor Wang - - * ace/Memory_Pool.h: - * ace/Memory_Pool.i: Added a base_addr () method for all memroy - pool classes. For memory pools that don't have a base_addr and - will never remap the pool to a different area, this method - always return 0. - - * ace/Malloc_T.cpp: Reset this->cb_ptr_ after acquiring new memory - to memory_pool's base_addr (if base_addr != 0). This makes sure - the cb_ptr_ points to the right memory after a remap. Thanks to - Ariel Peltz for pointing this out. - -Tue Mar 5 12:20:26 2002 Ossama Othman - - * ace/INET_Addr.cpp (get_host_name_i, set): - - h_errno -> h_error. h_errno conflicts with a declaration in - Microsoft's Winsock headers. Thanks to Nanbor for pointing out - the problem. - -Tue Mar 05 09:26:46 2002 Ossama Othman - - * ace/INET_Addr.cpp (get_host_name_i, set): - - Do not clobber errno with the h_errno value returned from - gethostbyaddr_r(). They are two distinct types of errors. - - Renamed "error" to "h_errno" where appropriate to make it - more obvious that errno should not be set to the value of - h_errno. Thanks to Felix Wyss for - reporting this. - -Tue Mar 5 05:51:44 2002 Douglas C. Schmidt - - * ace/Process.cpp (spawn): If fork()/exec() fail, call ACE_OS::_exit() - rather than ACE_OS::exit() to avoid destructors being called - that will yield hang problems. Thanks to Renjie Tang - , Max V. Zinal , and - Michael Hornok for this suggestion. - This fixes BugID 1147. - -Tue Mar 5 12:24:12 2002 Johnny Willemsen - - * ace/Auto_IncDec_T.h: - Corrected typing error in comment - -Mon Mar 4 19:59:31 2002 Steve Huston - - * tests/Process_Strategy_Test.h: Added #include "ace/Strategies_T.h" - so Visual Age C++ can find ACE_Process_Strategy when instantiating - templates. - -Mon Mar 4 19:52:27 2002 Steve Huston - - * tests/Message_Queue_Test_Ex.h (new file): - * tests/Message_Queue_Test_Ex.cpp: Moved declaration of - User_Class to .h file so Visual Age C++ can find it when - instantiating templates. - -Mon Mar 4 19:43:51 2002 Steve Huston - - * tests/Framework_Component_Test.h (new file): - * tests/Framework_Component_Test.cpp: Moved declaration of - My_Singleton to .h file so Visual Age C++ can find it when - instantiating templates. - -Mon Mar 04 11:20:45 2002 Carlos O'Ryan - - * ace/Copy_Disabled.h: - * ace/Copy_Disabled.cpp: - Add new helper class to disable copy constructors and assignment - operators. I simply got sick of writing this repetitive code: - - // private & undefined - Foo (const Foo &); - Foo &operator= (const Foo&); - - The new class makes life *much* easier, simply say: - - class Foo : private ACE_Copy_Disabled - - Isn't that cool? - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add new file to the project files and Makefiles. - -Mon Mar 4 07:36:12 2002 Johnny Willemsen - - * tests/Token_Strategy_Test.cpp: - Fixed MSVC6 unicode build errors. - -Sun Mar 3 15:56:23 2002 Craig Rodrigues - - * tests/Token_Strategy_Test.cpp: - Add template instantiations for ACE_Array, ACE_Array_Base, - ACE_Array_Iterator. - -Sun Mar 3 16:23:12 2002 Johnny Willemsen - - * tests/Token_Strategy_Test.cpp: - Fixed MSVC6 unicode build errors. - -Sun Mar 3 11:00:12 2002 Johnny Willemsen - - * tests/Token_Strategy_Test.dsp: - Added MSVC project for this test - - * tests/Token_Strategy_Test.cpp: - Corrected small typing errors in comment - - * tests/tests.dsw: - Added new Token_Strategy_Test.dsp - -Sat Mar 2 09:17:45 2002 Douglas C. Schmidt - - * ace/INET_Addr.cpp (set): Change errno = EINVAL to errno = error if - the call to ACE_OS::gethostbyname_r() fails since errno should - already have been set! Thanks to Felix Wyss - for reporting this. - -Fri Mar 01 08:03:12 2002 Johnny Willemsen - - * ace/Makefile.bor: - Added Swap.cpp to the list of installable files - - * ace/SSL/SSL_Context.cpp: - Added ACE_TEXT_CHAR_TO_TCHAR around first argument of ACE_OS::fopen - call to convert char to ACE_TCHAR to fix compile errors in unicode - build - - * include/makeinclude/ace_flags.bor: - Corrected typing error for new tao messaging library - -Wed Feb 27 13:50:20 2002 Jaiganesh Balasubramanian - - * ace/INET_Addr.cpp: - Pull back changes from last night. - -Wed Feb 27 06:00:37 2002 Douglas C. Schmidt - - * ace/Synch.h: Clarified that ACE_Auto_Event, ACE_Manual_Event, and - ACE_Event all support process-scope locking, but only Win32 - supports global naming and system-scope locking. Thanks to - Kobi Cohen Arazi for motivating this change. - -Wed Feb 27 09:24:30 2002 Carlos O'Ryan - - * include/makeinclude/platform_linux.GNU: - Pull back Jai's change from last night. It looks like an - accident to me, and it is breaking all the builds. - -Wed Feb 27 12:09:12 2002 Johnny Willemsen - - * ACE-INSTALL.html: - Added description about setting environment variable BCBVER to - the Borland building instructions - -Wed Feb 27 10:47:12 2002 Johnny Willemsen - - * include/makeinclude/ace_flags.bor: - Added lines for new TAO_Messaging library - -Wed Feb 27 01:12:32 2002 Carlos O'Ryan - - * ace/Swap.h: - * ace/Swap.inl: - * ace/Swap.cpp: - Add helper template to swap variables, very useful when - implementing exception neutral/safe classes. - -Wed Feb 26 00:38:50 2002 UTC Don Hinton - - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor.cpp: - * ace/Select_Reactor_T.cpp: - - Removed ACE_SELECT_REACTOR_HAS_DEADLOCK_DETECTION since - it isn't used. - -Tue Feb 26 22:54:50 2002 UTC Don Hinton - - * ace/Synch.i (ACE_Noop_Token::queueing_strategy): - - Removed ACE_UNUSED_ARG and commented out the parameter - instead. Thanks to Ossama and Craig for pointing this out. - -Tue Feb 26 16:17:45 2002 Nanbor Wang - - * ace/Thread_Manager.h (ACE_Thread_Manager): Fixed a typo in - doxygen document tag. Thanks to Brad Hoskins - for reporting this. - -Tue Feb 26 10:22:39 2002 Steve Huston - - * include/makeinclude/platform_sunos5_sunc++.GNU: Added the ability - to enable RTTI in the compat=4 case. Removed the explicit - inclusion of an installation-specific path to -L for compat=4. - Installation-specific adidtions/changes should go in the - installation's platform_macros.GNU file. - -Tue Feb 26 09:48:24 2002 Craig Rodrigues - - * apps/drwho/Protocol_Manager.cpp: Replace #include "new.h" - with #include "ace/config.h" to eliminate gcc 3.1 warning - about deprecated header. - -Tue Feb 25 10:16:12 2002 Johnny Willemsen - - * tests/Token_Strategy_Test.cpp: - Fixed unicode compile error - -Mon Feb 25 19:30:54 2002 Steve Huston - - * tests/Collection_Test.cpp: Moved the declaration of UglyThing - to a new file, Collection_Test.h. Visual Age C++ needs it in - a separate file to do auto template instantiation. - * tests/Collection_Test.h: New file. - -Mon Feb 25 19:27:41 2002 Steve Huston - - * ace/Log_Msg.cpp (log): In handling for %t, fixed the feature - test that changes behavior for AIX 4.2 and earlier. This - section missed my long-time-ago change to the AIX OS - version constants, and ended up being used for all AIX versions - which is wrong. Thanks to Yan Dai for - reporting this problem. - - * THANKS: Added Yan Dai to the Hall of Fame. - -Mon Feb 25 19:16:12 2002 Johnny Willemsen - - * docs/tutorials/007/thread_pool.{h|cpp}: - * docs/tutorials/007/page07.html: - * docs/tutorials/007/page08.html: - * docs/tutorials/013/mld.h: - * docs/tutorials/013/page03.html: - * docs/tutorials/017/Barrier_i.h: - * docs/tutorials/017/page03.html: - * docs/tutorials/018/page03.html: - Added missing include of 'ace/Atomic_Op.h' - -Mon Feb 25 18:51:37 2002 Johnny Willemsen - - * tests/Makefile.bor: - Added new Token_Strategy_Test - - * tests/Token_Strategy_Test.cpp: - Fixed small compile error that appeared with the BCB compiler - -Mon Feb 25 17:17:37 2002 UTC Don Hinton - - * ace/Select_Reactor.h: - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor_T.h: Added a new typedef, ACE_SELECT_TOKEN, - to Select_Reactor_Base.h so that the choice of TOKEN type can be - made prior to typedefing the class. This allows the use of the - TOKEN type within the paramaterized class, i.e., - ACE_Select_Reactor_Token_T and ACE_Select_Reactor_T. Otherwise - you get an error on some compilers, e.g., M$VC, that complain - about generic types. - -Mon Feb 25 15:53:56 2002 UTC Don Hinton - - * ace/Synch.i (queueing_strategy): Added ACE_UNUSED_ARG for unused - queueing_strategy parameter, thanks to Craig Rodrigues - for pointing this out. - -Mon Feb 25 09:17:39 2002 Chris Cleeland - - * ace/SSL/SSL_Context.cpp (dh_params): Wrapped the second argument - to ACE_OS::fopen with ACE_TEXT so that it behaves properly on - wide character platforms. Thanks to Craig Rodrigues for - pointing this out and Ossama Othman for explaining the - difference btw. ACE_TEXT and ACE_LIB_TEXT. - -Mon Feb 25 13:50:43 2002 UTC Don Hinton - - * ace/Token.{h|i|cpp}: Added the ability to chose the queueing - strategy, FIFO or LIFO, by using the queueing_strategy() - methods. The default is FIFO, which was the previous behavior. - Now ACE_Token_Queue::insert_entry() is always called with the - queueing_strategy in order to determine where the thread should - requeue itself. - - * ace/Synch.{h|i}: Added queueing strategy methods to - ACE_Noop_Token. - - * ace/Select_Reactor_T.{h|cpp}: - * ace/TP_Reactor.{h|cpp}: Added QUEUEING_STRATEGY parameter to - ACE_Select_Reactor_Token_T, ACE_Select_Reactor_T, and - ACE_TP_Reactor ctors with FIFO default. - - * tests/Token_Strategy_Test.cpp : - * tests/Makefile : - * tests/run_test.lst: Added new Token_Strategy_Test.cpp to test - the FIFO/LIFO strategies. - -Mon Feb 25 13:44:12 2002 Johnny Willemsen - - * docs/tutorials/018/Test_T.h: - Added missing include of Atomic_Op.h - -Fri Feb 22 15:54:32 2002 Craig Rodrigues - - * ace/Refcounted_Auto_Ptr.h: Fix comment, thanks to - Serge Kolgan . - -Fri Feb 22 09:31:35 2002 Craig Rodrigues - - * ace/QoS/QoS_Session_Factory.h (ACE_QoS_Session_Type): - Change "const static" to "static const" to remove gcc 3.1 - warning. - -Fri Feb 22 08:07:12 2002 Johnny Willemsen - - * ace/Makefile.bor: Added String_Base.cpp and Atomic_op.cpp to the - list of files that must be installed when doing a make install. - Thanks to Cyrille Chépélov for reporting that - these files missed. - -Thu Feb 21 16:33:11 2002 Douglas C. Schmidt - - * docs/tutorials/007: Rename Thread_Pool::open() to - Thread_Pool::start() and Thread_Pool::close() to - Thread_Pool::stop() and fixed all the usages. Also removed the - unneeded parameter from stop() and removed the unneeded - re-definition of close() (since we are not shadowing it any - more). Thanks to Peter Heitman for - reporting this. - -Thu Feb 21 13:12:44 2002 Chris Cleeland - - * ace/SSL/SSL_Context.* (ACE_SSL_Context): Added new methods to - specify Diffie-Hellman parameters. These parameters are - required when using DSA certificates/keys. The new methods are - dh_params, dh_params_file_name, and dh_params_file_type. - -Thu Feb 21 09:32:56 2002 Douglas C. Schmidt - - * ace/TTY_IO.cpp (control): Use the appropriate B* macros to set - all the baudrate cases. Thanks to Olli Savia for - contributing this. - - * ace/Signal.cpp (dispatch): Added a cast of (ACE_SignalHandler) - to the SIG_DFL parameter so things will work on IRIX 6.5 with - GCC 3.0.1. Thanks to Dan Green for - reporting this. - -Thu Feb 21 13:09:13 2002 Craig Rodrigues - - * ace/streams.h: strstream was deprecated in the 1998 ISO C++ - standard [D.7 depr.str.strstreams], and has been replaced by - sstream. Including or causes annoying - warnings with gcc 3.1. Since strstream and sstream are not used - internally within ACE or TAO, remove includes for strstream, and - let the developer include them in their own code. - -Wed Feb 20 15:26:43 2002 Phil Mesnier - - * apps/soreduce/Library.cpp: - * apps/soreduce/Library.h: - * apps/soreduce/Makefile: - * apps/soreduce/Obj_Module.cpp: - * apps/soreduce/Obj_Module.h: - * apps/soreduce/README: - * apps/soreduce/SO_Group.cpp: - * apps/soreduce/SO_Group.h: - * apps/soreduce/Sig_List.cpp: - * apps/soreduce/Sig_List.h: - * apps/soreduce/Signature.cpp: - * apps/soreduce/Signature.h: - * apps/soreduce/soreduce.cpp: - New application to assist in production of reduced footprint - shared libraries for specific collections of applications. For - more details see the enclosed README. - -Wed Feb 20 14:18:14 2002 Phil Mesnier - - * ace/Process.cpp: - * ace/Process.h: Added a new method - ACE_Process_Options::release_handles() to fix the trouble of - using a pipe as stdout, where the pipe closes completely when - the child terminates. This method replaces some functionality in - the Process options destructor. - -Wed Feb 20 13:01:25 2002 Douglas C. Schmidt - - * ace/Atomic_Op.i: Fix the return value of the ACE_GUARD_RETURN - macros so that if the lock fails, the comparison also fails. - Thanks to Ivan Pia for reporting this. - -Wed Feb 20 17:00:34 2002 Balachandran Natarajan - - * include/makeinclude/platform_sunos5_sunc++.GNU: Users who use - 5.2 and above could use native exceptions with inlining turned - on. Thanks to Ken O'Brien for reporting - this problem. - - * THANKS: Added Ken O'Brien to the hall of - fame. - -Mon Feb 18 23:17:08 2002 Christopher Kohlhoff - - * ACEXML/parser/parser/Makefile.bor: - Changed library name for the Borland build to be consistent with the - UNIX build. - - * include/makeinclude/ace_flags.bor: - Added macros for the ACEXML Parser library. - - * ACEXML/examples/Makefile.bor: - * ACEXML/examples/SAXPrint/Makefile.bor: - Added Borland makefiles for the SAXPrint example. - -Mon Feb 18 20:16:27 2002 Douglas C. Schmidt - - * ace/Acceptor.cpp (make_svc_handler): - * ace/Connector.cpp (make_svc_handler): There doesn't seem to be - anypoint in *conditionally* assigning the Acceptor/Connector's - reactor to the Svc_Handler, so we'll just assign it... - -Mon Feb 18 18:41:33 2002 Steve Huston - - Integrated the following from the ACE 5.2 stream: - - Wed Feb 13 15:37:41 2002 Steve Huston - - * ace/Hash_Cache_Map_Manager_T.h: Added #include "ace/Synch.h" to - pick up ACE_Null_Mutex. - - * tests/Process_Manager_Test.cpp: Added #include "ace/Thread.h" to - pick up ACE_Thread::self (). - - * tests/Refcounted_Auto_Ptr_Test.h (new file): - * tests/Refcounted_Auto_Ptr_Test.cpp: Moved definition of Printer - from .cpp to .h so Visual Age C++ can find it when instantiating - templates. Also removes the compile warning where the compiler - warns that the test won't work... - - Tue Feb 12 21:59:42 2002 Steve Huston - - * include/makeinclude/platform_aix_ibm.GNU: Added -qstaticinline - to CCFLAGS to tell compiler to generate inlined functions with - static scope instead of extern scope (how stupid is this?). - Removed error suppression options which should be unnecessary now. - - Sat Feb 9 18:34:59 2002 Steve Huston - - * examples/C++NPv1/Reactive_Logging_Server_Ex.h: Removed an extra - master_handle_set_.set_bit call. Thanks to Craig Perras - for reporting this. - - Sat Feb 9 13:49:44 2002 Steve Huston - - * ace/Hash_Map_With_Allocator_T.h: Added #include "ace/Synch.h" to - see the definition of ACE_Null_Mutex. - - * ace/config-all.h (ACE_RCSID): Make generated function static to - keep Visual Age C++ from complaining about the multiple definitions. - - Fri Feb 8 16:20:51 2002 Steve Huston - - * ace/config-aix-4.x.h: Removed #define ACE_TEMPLATES_REQUIRE_SOURCE - for Visual Age C++ 5. As it turns out, wherever the compiler sees - source and a template is referenced, it generates the template - class functions used. This is very bad for size as well as for - situations counting on only one such as ACE_Singleton. - - Also added support for explicit template instantiation with Visual - Age C++. If the preprocessor define __TEMPINC__ is not defined, - explicit instantiation is turned on. - - Mon Feb 4 17:21:39 2002 Steve Huston - - * ace/Singleton.h (ACE_TSS_Singleton): Added ACE_UNIMPLEMENTED_FUNCS - for assignment and copy ctor methods. This is necessary to allow - the *_SINGLETON_DECLARE macro, that explicitly instantiates a - template class on Win32, to compile clean when instantiating an - ACE_TSS_Singleton class. Thanks very much to Nanbor Wang for - direction on solving this problem. - - * ace/config-win32-msvc-6.h: Added ACE_NEEDS_FUNC_DEFINITIONS. This - avoids warnings when explicitly instantiating an entire class, as - with ACE_TSS_Singleton and *_SINGLETON_DECLARE, above. - - -Mon Feb 18 18:23:49 2002 Steve Huston - - * ace/Reactor.h: Clarified behavior with respect to remaining - queued notifications when end_reactor_event_loop() is called - or when the reactor instance is closed/deleted. - -Mon Feb 18 19:28:12 2002 Johnny Willemsen - - * ace/README: - * ace/Proactor.cpp: - * ace/SString.h: - * ace/Task_T.h: - * ace/Timer_Queue_Adapters.h: - * ace/config-win32-msvc-7.h: - * netsvcs/lib/Client_Logging_Handler.h: - * netsvcs/lib/Name_Handler.h: - * netsvcs/lib/TS_Clerk_Handler.h: - * netsvcs/lib/TS_Server_Handler.h: - - Made ACE compiling with the Microsoft Visual C++ 7 compiler. - Template classes cannot be exported when doing a dynamic build, so - removed some export macro's from template definitions. When a class - is derived from a class template then the class template must be - explicit instantiated and be exported. To make sure that we only do - this when a compiler supports this we introduced the new define - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT. Also vc++ 7 generates - now a warning when a class is exported is derived from a class that - is not exported. - - The following info was given by Microsoft on this: - The reason that a template can't be exported anymore is that it is - unlikely that anyone wants to export all specializations of a - class template. When B is a template and D is a class, the - construction 'class ACE_Export D : public B' should - give no problems, but unfornately there is a bug in the vc++ - compiler. - - That's why we now explicit export the template instantations in ace. - -Mon Feb 18 11:00:17 2002 Nanbor Wang - - * html/index.html: Added an entry for ACEXML document. - - * ace/OS.h: Removed the extern "C" link designator from the - typedef of ACE_Service_Object_Exterminator and the definition of - gobbler functions in ACE_FACTORY_DEFINE. They are not used - outside of a DLL so it's okay to have a mangled gobbler name. - Thanks to Doug for noticing this. - -Mon Feb 18 11:12:39 2002 Steve Huston - - * ace/Refcounted_Auto_Ptr.h: Improved Doxygenation of some comments. - -Mon Feb 18 10:45:00 2002 Craig Rodrigues - - * ace/QoS/QoS_Session_Factory.h: - Add new constant - ACE_QoS_Session_Factory::ACE_DEFAULT_QOS_SESSION. Give - ACE_QoS_Session_Factory::create_session() a default argument of - ACE_DEFAULT_QOS_SESSION. - - * ace/QoS/QoS_Session_Factory.cpp: - Set the value of ACE_DEFAULT_QOS_SESSION to ACE_RAPI_SESSION on - platforms with RAPI RSVP support. Set it to - ACE_GQOS_SESSION on Win32 platforms with GQoS support. - Otherwise, issue a compilation error, since these are the only - two QoS types supported currently. - - * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp: - * examples/QOS/Change_Receiver_FlowSpec/sender.cpp: - * examples/QOS/Change_Sender_TSpec/receiver.cpp: - * examples/QOS/Change_Sender_TSpec/sender.cpp: - * examples/QOS/Simple/receiver.cpp: - * examples/QOS/Simple/sender.cpp: - Remove reference to ACE_RAPI_SESSION from invocations of - create_session(), leave it empty and choose default argument - instead. This will allow the examples to compile and run on - Win32. - -Mon Feb 18 08:07:59 2002 Douglas C. Schmidt - - * ace/String_Base.{h,i}: Added two new overloaded operators that - work on characters. Thanks to Martin Krumpolec - for contributing these patches. - -Mon Feb 18 13:05:12 2002 Johnny Willemsen - - * ace/config-all.h: - Added ACE_NEW_NORETURN macro. This macro is the same as ACE_NEW - but doesn't do a return when an out of memory error occured so that - the caller can do extra handling. - - * tests/New_fail_test.cpp: - Extended this test to test the new ACE_NEW_NORETURN macro. - -Mon Feb 18 01:45:07 2002 Christopher Kohlhoff - - * include/makeinclude/compiler.bor: - * include/makeinclude/make_flags.bor: - Added support for Borland C++Builder 6. - -Sun Feb 17 16:32:01 2002 Venkita - - * ACE version 5.2.2 released. - -Sun Feb 17 16:03:03 2002 Nanbor Wang - - * etc/acexml.doxygen: Fixed the output directory name for ACEXML. - -Fri Feb 15 10:50:26 2002 Venkita Subramonian - - * ace/Dynamic_Service.h: - Fixed compile error. Added forward declaration for - ACE_Service_Object. - -Thu Feb 14 19:10:04 2002 Douglas C. Schmidt - - * ace/Refcounted_Auto_Ptr.h: Make the rep_ protected rather - than private. Rodney Morris for - motivating this. - -Thu Feb 14 15:26:06 2002 Douglas C. Schmidt - - * ace/Dynamic_Service.i (instance): Fixed instance to use an - ACE_dynamic_cast() so that the vptr is set correctly. Thanks to - Bill Dyer for suggesting this. - -Thu Feb 14 16:15:50 2002 Balachandran Natarajan - - * COPYING: Updated copyright years. - -Thu Feb 14 11:25:39 2002 Nanbor Wang - - * ACEXML/docs/bugs.txt: - * ACEXML/docs/guidelines.txt: Updated document. - -Thu Feb 14 08:17:40 2002 Douglas C. Schmidt - - * ace/config-all.h: There was a subtle difference between the - ACE_NEW based on try/catch and a 0 pointer. The version based on - the fact that new can return 0 always sets the pointer to 0 when - a memory error occured. The version that is based on try/catch - the pointer wasn't set to 0. If the pointer had a different - value, the pointer stays at the old value and wasn't set to 0. - This is now fixed. Thanks to Peter van Merkerk - for noticing this and to Johnny - Willemsen for reporting it. - - * ace/Strategies_T.h: - * ace/Strategies_T.i: Allow the reactor of the Svc Handler to be - set to the reactor passed to the Creation Strategy. Thanks to - David Smith for motivating this. - -Thu Feb 14 01:14:40 2002 Nanbor Wang - - * include/makeinclude/ace_flags.bor: Updated ACE_XML_CFLAGS. - Thanks to Johnny Willemsen for reminding this. - -Thu Feb 14 01:01:10 2002 Nanbor Wang - - * ACEXML/ACEXML.dsw: - * ACEXML/common/XML_Common.dsp: - * ACEXML/examples/SAXPrint/SAXPrint.dsp: - * ACEXML/parser/debug_validator/Debug_Validator.dsp: - * ACEXML/parser/parser/Parser.dsp: - * ACEXML/tests/NamespaceSupport_Test.dsp: - * ACEXML/tests/Transcoder_Test.dsp: Updated base include directories. - -Thu Feb 14 00:20:39 2002 Nanbor Wang - - * Makefile: - * Makefile.bor: - * ACEXML/common/Attributes.h: - * ACEXML/common/AttributesImpl.cpp: - * ACEXML/common/AttributesImpl.h: - * ACEXML/common/Attributes_Def_Builder.cpp: - * ACEXML/common/Attributes_Def_Builder.h: - * ACEXML/common/CharStream.cpp: - * ACEXML/common/CharStream.h: - * ACEXML/common/ContentHandler.h: - * ACEXML/common/DTDHandler.h: - * ACEXML/common/DTD_Manager.cpp: - * ACEXML/common/DTD_Manager.h: - * ACEXML/common/DefaultHandler.cpp: - * ACEXML/common/DefaultHandler.h: - * ACEXML/common/Element_Def_Builder.cpp: - * ACEXML/common/Element_Def_Builder.h: - * ACEXML/common/EntityResolver.h: - * ACEXML/common/Env.cpp: - * ACEXML/common/Env.h: - * ACEXML/common/ErrorHandler.h: - * ACEXML/common/Exception.cpp: - * ACEXML/common/Exception.h: - * ACEXML/common/FileCharStream.cpp: - * ACEXML/common/FileCharStream.h: - * ACEXML/common/InputSource.cpp: - * ACEXML/common/InputSource.h: - * ACEXML/common/Locator.h: - * ACEXML/common/LocatorImpl.cpp: - * ACEXML/common/LocatorImpl.h: - * ACEXML/common/Makefile: - * ACEXML/common/NamespaceSupport.cpp: - * ACEXML/common/NamespaceSupport.h: - * ACEXML/common/SAXExceptions.cpp: - * ACEXML/common/SAXExceptions.h: - * ACEXML/common/Transcode.cpp: - * ACEXML/common/Transcode.h: - * ACEXML/common/Validator.cpp: - * ACEXML/common/Validator.h: - * ACEXML/common/XMLFilter.h: - * ACEXML/common/XMLFilterImpl.cpp: - * ACEXML/common/XMLFilterImpl.h: - * ACEXML/common/XMLReader.h: - * ACEXML/common/XML_Types.h: - * ACEXML/examples/SAXPrint/Makefile: - * ACEXML/examples/SAXPrint/Print_Handler.h: - * ACEXML/examples/SAXPrint/SAXPrint_Handler.h: - * ACEXML/examples/SAXPrint/main.cpp: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.h: - * ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp: - * ACEXML/parser/debug_validator/Debug_DTD_Manager.h: - * ACEXML/parser/debug_validator/Debug_Element_Builder.cpp: - * ACEXML/parser/debug_validator/Debug_Element_Builder.h: - * ACEXML/parser/debug_validator/Element_Tree.cpp: - * ACEXML/parser/debug_validator/Element_Tree.h: - * ACEXML/parser/parser/Entity_Manager.cpp: - * ACEXML/parser/parser/Entity_Manager.h: - * ACEXML/parser/parser/Makefile: - * ACEXML/parser/parser/Parser.cpp: - * ACEXML/parser/parser/Parser.h: - * ACEXML/tests/Makefile: - * ACEXML/tests/NamespaceSupport_Test.cpp: - * ACEXML/tests/Transcoder_Test.cpp: - * etc/acexml.doxygen: Renamed directory XML to ACEXML and moved the - base directory to include XML related files to $(ACE_ROOT). - Thanks to Johnny Tucker for the - suggestion. - -Wed Feb 13 17:42:32 2002 Balachandran Natarajan - - * ace/Configuration.cpp (operator=): Fixed a warning in g++ - builds. Stupid mistake on my part :(. - -Wed Feb 13 12:45:06 2002 Balachandran Natarajan - - * ace/Configuration.cpp: - * tests/Config_Test.cpp (iniCompare): Fixed memory leaks. Thanks - to Johnny willemson for providing the patches. - -Wed Feb 13 11:46:54 2002 Nanbor Wang - - * XML/parser/parser/Makefile: Added a library (-lACEXML) to link - to. Thanks to John Michael Zorko for - reporting this. - -Tue Feb 12 20:30:53 2002 Douglas C. Schmidt - - * ace/WIN32_Proactor.cpp (handle_events): When the proactor - was called by the reactor in handle_signal() this method should - loop till all events are done. But the loop never got executed - twice because handle_events returned 1 on success and the loop - exits. To catch more than one notifications handle_events - should be called again. Even if the loop is executed twice and - no more events are outstanding handle_events should return 0 and - not -1 when calling with timeout 0. Calling - GetQueuedCompletionStatus with timeout value 0 returns FALSE and - errno "ERROR_SUCCESS". This check has to be added to - handle_events and 0 has to be returned. Thanks to Hartmut Quast - for reporting this. - -Tue Feb 12 16:18:59 2002 Ossama Othman - - * tests/Proactor_Test.cpp (logflag): - * tests/TP_Reactor_Test.cpp (logflag): - - Removed these unused global variables. Fixes an unused variable - warning. - -Tue Feb 12 11:50:18 2002 Nanbor Wang - - * bin/pippen.pl: Applied a patch from "the source" to fix a - problem in determining project dependencies. - -Tue Feb 12 09:37:56 2002 Ossama Othman - - * ACE-INSTALL.html: - - Corrected EGCS documentation. Native exception support is now - the default. [Bug 1149] - - G++ 2.7.x is no longer supported. Updated accordingly. - -Mon Feb 11 16:31:04 2002 Ossama Othman - - * bin/make_pretty.pl (is_warning): - - Do not flag Fuzz's "#pragma warning(push)/(pop)" test title as a - warning. - -Mon Feb 11 13:49:35 2002 Ossama Othman - - * bin/fuzz.pl (check_for_push_and_pop): - - New test that verifies the number of #pragma warning(push) - pragmas matches the number of #pragma warning(pop) pragmas. - - * examples/IPC_SAP/SSL_SAP/SSL-client.cpp (shared_client_test): - * examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp - (shared_client_test): - - Do not convert the buffer length to network byte order when - allocating the buffer. Fixes excessive memory allocation. This - was apparently a cut-n-paste bug. Thanks to M Schulze - . - - * THANKS: - - Added M Schulze to the Hall of Fame. - -Mon Feb 11 05:42:02 2002 Balachandran Natarajan - - * ace/Connector.h: Fixed a typo in the coments. Thanks to Miljenko - Norsic (ETK) for reporting - this. - -Sun Feb 10 16:28:30 2002 Douglas C. Schmidt - - * ace/config-macosx.h - * ace/config-freebsd.h - * ace/config-freebsd-pthread.h - * ace/TTY_IO.cpp: - * TODO: Removed the ACE_USES_HIGH_BAUD_RATES macro since it no longer - seems to be necessary. Thanks to Olli Savia for - reporting this. - - * ace/TTY_IO.cpp: Replaced the two strcmp() calls with one - strcasecmp(). Thanks to Olli Savia for reporting - this. - -Sat Feb 9 15:17:45 2002 Balachandran Natarajan - - * bin/make_release: Changed the path of gv as a new version of GV - was installed on deuce.doc. The old version had less colors and - it started mapping them to a smaller range. The graphs looked - very ugly. The new version fixes the problem and hence a change - in path. - -Fri Feb 8 22:56:29 2002 Balachandran Natarajan - - * ace/Log_Msg.cpp (log): Fixed a warning in TRU 64 builds. - -Fri Feb 8 14:54:21 2002 Douglas C. Schmidt - - * apps/JAWS2/Makefile (LDFLAGS): - * apps/JAWS2/HTTPU/Makefile (LDFLAGS): Fixed some makefile bugs so - that this stuff compiles on AIX. Thanks to Steve Ige - for reporting this. - -Thu Feb 7 18:13:03 2002 Douglas C. Schmidt - - * tests/ACE_Init_Test.cpp (wait_and_kill_dialog): Replaced the call - to EndDialog() with EndModalLoop() to fix a race condition. - Thanks to Petru Marginean for reporting this. - -Fri Feb 8 14:02:06 2002 Balachandran Natarajan - - * THANKS: Added Marco Kranawetter - to the hall of fame. - -Fri Feb 08 11:24:36 2002 Nanbor Wang - - * ace/String_Base.h: - * ace/Task_T.h: Removed the ACE_Export decl from ACE_Task and - ACE_String_Base. They were added as work-aronds for a VC7's - internal compiler bug but didn't seem to solve the problem. - Thanks to Patrick Bennett , Johnny, and - Christian Veleba for reporting - this. - -Thu Feb 7 16:19:39 2002 Steve Huston - - * ace/config-all.h: Define new macros, ACE_nothrow and ACE_nothrow_t, - to decide which variety of nothrow is used in new (nothrow). At - this point, HP aC++ is the only platform defined to use this - feature, so that's the only section that defines it. - - * ace/Svc_Handler.(cpp h): - * examples/Shared_Malloc/test_persistence.cpp: Use the new - ACE_nothrow[_t] macros in overridden operator new. - -Thu Feb 7 14:11:31 2002 Douglas C. Schmidt - - * ace/Singleton.cpp (close): Fixed the implementation so that the - ACE_Unmanaged_Singleton's internal singleton point is reset to 0 - after cleanup to avoid double-deletion. Thanks to Marc Walrave - for this fix. - -Thu Feb 7 07:52:47 2002 Douglas C. Schmidt - - * ace/Activation_Queue.{h,i}: Added get/set methods to access/update - the underlying ACE_Message_Queue so users can call methods on - the queue directly if necessary. Thanks to Timothy Kilbourn - for reporting this. - -Tue Feb 5 07:25:49 2002 Douglas C. Schmidt - - * tests/TP_Reactor_Test.cpp: Improved the comments to clarify the - differences between this test and the Thread_Pool_Reactor_Test.cpp. - Thanks to Alex Libman for explaining this. - -Thu Feb 7 08:16:24 2002 Oliver Kellogg - - * ACE-INSTALL.html: Document the include_env=1 make switch. - - * docs/exceptions.html: Replaced the "Transition from TAO_TRY - to ACE_TRY" section with "Transition from ACE_TRY_ENV usage - to ACE_ENV_ARG". - -Wed Feb 6 06:57:35 2002 Balachandran Natarajan - - * tests/run_test.lst: Disabled TP_Reactor_Test as the test is - hanging. - -Tue Feb 5 11:59:00 2002 Craig Rodrigues - - * tests/TP_Reactor_Test.cpp (disable_signal): Eliminate unused - arguments warning on Win32 platforms. - -Mon Feb 4 16:22:20 2002 Craig Rodrigues - - * ace/OS.h: Include instead of if - ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB is defined. - -Mon Feb 4 19:58:03 2002 Boris Kolpackov - - * ace/Log_Msg.cpp: - - Fixed minor bug in what's just commited before. - Thanks to Craig Rodrigues - for pointing it out. - -Mon Feb 4 14:11:14 2002 Boris Kolpackov - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - - Added ability to install custom backend which is a - per-process entity as opposite to callback which is - a per-thread not-inheritable entity. - -Sun Feb 3 17:59:36 2002 Krishnakumar B - - * ace/config-sunos5.5.h (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION): - - Explicitly defined the above macro as this is needed for SunOS - gcc to work. This was inside a __SUNPRO_CC #ifdef. I missed that - in my previous change. This should fix the builds under SunOS - gcc. - -Sun Feb 3 18:32:29 2002 Craig Rodrigues - - * tests/TP_Reactor_Test.cpp: Use size_t instead of long - and int for index_ and sessions_ in order to eliminate - more compiler warnings. - -Sun Feb 3 09:20:04 2002 Douglas C. Schmidt - - * tests/TP_Reactor_Test.cpp: Fixed a bunch of warnings. Thanks - to Venkita for reporting this. - -Sun Feb 3 08:22:28 2002 Venkita Subramonian - - * tests/Makefile: - Regenerated makefile to create dependencies for TP_Reactor_Test. - -Sun Feb 3 08:05:12 2002 Venkita Subramonian - - * tests/TP_Reactor_Test.dsp (RSC): - Regenerated the file in MSVC++. - -Sun Feb 3 11:16:12 2002 Johnny Willemsen - - * tests/TP_Reactor_Test.cpp: - Fixed compile error in BCB unicode build - -Sat Feb 2 07:45:51 2002 Douglas C. Schmidt - - * tests/run_test.lst: - * tests/TP_Reactor_Test.dsp: - * tests/Makefile.bor: - * tests/Makefile: Added the TP_Reactor_Test. - - * tests/TP_Reactor_Test.cpp: Added another test of the ACE_TP_Reactor. - Thanks to Alex Libman for contributing this. - - * ace/config-irix6.x-common.h: IRIX 6.5 supports AIO, so we'll - enable these features. Thanks to Alex Libman for validating - this. - - * ace/Select_Reactor_T.cpp: Fixed work_pending() so that it takes - into account pending timers that need to be expired. Thanks to - Russ Noseworthy for reporting this. - - * ace/Select_Reactor_T.cpp: Simplified the logic for calculating - timeouts in wait_for_multiple_events(). - - * ace/Process.{h,i,cpp}: When using ACE_Process_Options with the - inherit_environment set to off, i.e., ACE_Process_Options opts - (0), ACE_Process::spawn() was improperly setting the environment - in the child's process after fork (), before exec (). Changed - ACE_Process::spawn to check for the inherit_environment flag, - and to use the execve () call instead of execvp () if - inherit_environment is false. Thanks to James Risinger - for contributing this fix. - - * ace/Process.{h,i}: Added "const" to the various accessor methods. - -Sat Feb 2 00:01:36 2002 Venkita Subramonian - - * ace/config-sunos5.6.h: - Added missing #endif. - -Fri Feb 1 23:42:03 2002 Venkita Subramonian - - * ace/config-all.h: - Removed extra ). - -Fri Feb 1 21:08:37 2002 Steve Huston - - * tests/Framework_Component_Test.icc: - * tests/Vector_Test.icc: New Visual Age C++ test configurations. - - * tests/tests.icp: Add new test configurations to the project. - -Fri Jan 1 19:33:49 2002 Steve Huston - - * ace/Vector.(h i cpp): Removed 'const' from the 2nd template - argument (size_T DEFAULT_SIZE). A size_t is always const, - and having const there causes errors from HP aC++. I'm not sure - if they're completely legit, but Stroustrup 3rd Ed says the - template argument is const anyway... if this is a problem, - please let me know. - -Fri Feb 1 18:53:44 2002 Steve Huston - - * ace/ace.icc: Added Framework_Component.(h cpp) to the files list. - -Fri Feb 1 10:19:46 2002 Jeff Parsons - - * Thread_Manager.h: - - Removed extra '*/'. - -Fri Feb 01 00:00:12 2002 Nanbor Wang - - * ace/Task.h: - * ace/Thread_Manager.h: Added more explanation on how to use the - argument. Thanks to Petr Shelomovsky - for motivating the change. - -Thu Jan 31 19:18:37 2002 Steve Huston - - * ace/NT_Service.{h cpp}: To avoid race condition at shutdown time, - moved the call to report_status(SERVICE_STOPPED, 0) from the - open() method to a new override of the fini() method. Setting - status to SERVICE_STOPPED frees up Windows to do its own shutdown - for the service, and that can't be allowed to commence until all - ACE_NT_Service things are done. Thanks to Zoran Cetusic - , Patrick Bennett and Felix Wyss from - Interactive Intelligence, Inc. for diagnosing this problem and - sending in a fix. - - * THANKS: Added Zoran Cetusic, Patrick Bennett, and Felix Wyss to - the Hall of Fame. - -Thu Jan 31 17:00:52 2002 Balachandran Natarajan - - * ace/config-all.h: Need to include with all versions of - SunCC compiler and not just CC 5.0, when the compiler is using - compat mode 4. - * ace/config-sunos5.6.h: Need to define ACE_LACKS_ACE_IOSTREAM - when higher versions of CC are used with compat mode 4 and - such. - - Thanks to Tim Rydell for the fixes. - - * THANKS: Added Tim Rydell to the hall of fame. - -Thu Jan 31 17:21:49 2002 Steve Huston - - * ace/Trace.cpp (constructor and destructor): Do not attempt - trace output if ACE has not been initialized. There is too - much not set up yet to bother trying. If you are on a platform - with ACE_HAS_NONSTATIC_OBJECT_MANAGER (such as Windows) and you - really, really need tracing in static objects, you should - try #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0 in your config.h - along with #define ACE_NTRACE 0. Beware, though, there are - crocodiles lurking there - platforms defined to use non-static - object manager are that way for good reason. - - Thank you to Shmulik Regev for reporting this. - -Thu Jan 31 13:32:07 2002 Nanbor Wang - - * XML/common/XML_Common.dsp: Fixed the LIB path to use relative - path. - -Thu Jan 31 19:18:16 2002 Oliver Kellogg - - * include/makeinclude/wrapper_macros.GNU: - Corrected placement of the include_env switch. - include_env=1 is only sensible in combination with - exceptions=1. NB: The include_env switch is only - intended to facilitate transition to the ACE_ENV_ARG - macros and should not be used for new applications. - There will be unused-variable warnings when using this - build configuration. - -Thu Jan 31 11:57:07 2002 Nanbor Wang - - * XML/parser/debug_validator/Debug_Attributes_Builder.cpp: - * XML/parser/debug_validator/Debug_Element_Builder.cpp: - Temporarily removed unused arguments. - - * XML/common/FileCharStream.cpp (get): Made sure the character - read from the input file was converted to ACEXML_Char type - correctly. Casted the read XML_Char before comparing it to - 'EOF'. - -Thu Jan 31 13:06:12 2002 Boris Kolpackov - - * THANKS: - - Added Koushik Banerjee to the hall of fame. - -Wed Jan 30 22:41:39 2002 Krishnakumar B - - * include/makeinclude/platform_linux.GNU (CXX_VERSION): - - Made it work when someone wants to turn off the implicit - template instantiation. Care should be taken to #define - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION in config.h also. - Surprisingly the code compiles without that also... - -Wed Jan 30 17:22:49 2002 Steve Huston - - * ace/Process.cpp (wait (const ACE_Time_Value&, ACE_exitcode *)): - * ace/Process_Manager.cpp (wait (pid_t, const ACE_Time_Value&, - ACE_exitcode *)): - The mechanism for waiting up to a specified time for a child - process to exit has been replaced. Replaces the fix from: - Fri Jan 25 19:58:41 2002 Steve Huston - and makes unnecessary any further work from: - Sat Jan 26 21:41:39 2002 Steve Huston - - Both classes now do a timed wait for a child by doing an - ACE_OS::sleep, counting on being interrupted if a SIGCHLD - is delivered. In ACE_Process_Manager when a reactor hasn't - been specified, and always in ACE_Process, a temporary - SIGCHLD handler is installed for the duration of the wait. - This is necessary because the default SIGCHLD action on - POSIX (and holds true for most non-Win32) is SIG_IGN, and - SIGCHLD is not generated when a child process exits. - Therefore, a handler is installed to force the SIGCHLD. - It's not needed in ACE_Process_Manager when a reactor is in - place because the reactor already has a handler for SIGCHLD. - -Wed Jan 30 15:11:49 2002 Krishnakumar B - - * include/makeinclude/platform_linux.GNU (CXX_VERSION): - * ace/config-g++-common.h: - - Turned off explicit template instantiation with gcc under Linux. - The specific versions are 2.95.x, 2.96, 3.0.x (3.x). Added a - flag implicit_templates to tweak the behaviour from the - platform_macros.GNU file. - - The combination of the compiler and binutils seems to give a - nice reduction in the footprint. - -Wed Jan 30 16:00:39 2002 Steve Huston - - * ace/Process_Manager.cpp (register_handler): Replaced ECHILD with - EINVAL if the pid is not found. Probably a more accurate - assessment of the situation, and should compile clean on WinCE. - -Wed Jan 30 13:50:17 2002 Douglas C. Schmidt - - * docs/index.html: Fixed the ACE-inheritance.pdf document so - it isn't gzipped. Thanks to Michael Searles - for reporting this. - -Wed Jan 30 09:28:12 2002 Johnny Willemsen - - * XML/parser/debug_validator/Debug_Attributes_Builder.cpp: - * XML/parser/debug_validator/Debug_DTD_Manager.cpp: - * XML/parser/debug_validator/Debug_Element_Builder.cpp: - * XML/parser/debug_validator/Element_Tree.cpp: - Added missing ACE_LIB_TEXT. This fixes the BCB unicode build errors - -Tue Jan 29 20:11:21 2002 Balachandran Natarajan - - * etc/*.doxygen (EXPAND_AS_DEFINED): Added ACE_CACHE_MAP_MANAGER - to the list in EXPAND_AS_DEFINED. Thanks to Don Hinton - for the suggestion. - -Tue Jan 29 19:36:24 2002 Balachandran Natarajan - - * bin/make_release: The whole release process has been moved to - Linux box. This is because the sun machines at WashU were having - problems and they are not dependable. The following are the list - of changes made - - - All the path related stuff have been changed ie. instead of - using /pkg/gnu tools, we use native tools on Linux now. - - - The gnu suffixes to many of the tools have been removed. - - - Most of the path to the tools have been hardcoded in the PATH - environment variabe. - - - Tools that were missing have been loaded on 3 main Linux boxes - at WashU including Graphviz and doxygen. - - - A beta cannot be cut from a sun box. - - - The script will recommend cutting a beta from deuce.doc. - - The script has been tested with a dummy release. - -Tue Jan 29 16:01:54 2002 Ossama Othman - - * bin/fuzz.pl (check_for_missing_rir_env): - - Check for ACE_ENV_ARG_PARAMETER instead of - TAO_ENV_ARG_PARAMETER. The latter is deprecated. - -Tue Jan 29 20:47:24 2002 Oliver Kellogg - - * docs/exceptions.html: Document the new ACE_ENV_ macros. - - * bin/subst_env.pl: Transform to ACE_ENV_ instead of TAO_ENV_. - -Tue Jan 29 08:39:24 2002 Oliver Kellogg - - * ace/CORBA_macros.h: - Added ACE_ENV_ARG macros to replace the TAO_ENV_ARG macros - defined in TAO/tao/orbconf.h. All exception related macros - are now defined in ace/CORBA_macros.h, and the TAO_ENV_ARG - macros will soon be deprecated. - - * include/makeinclude/wrapper_macros.GNU: - Added the include_env switch for compatibility with the - exception handling use before TAO 1.2.2. - -Tue Jan 29 08:17:12 2002 Johnny Willemsen - - * include/makeinclude/ace_flags.bor: - Added compiler flags for new cosevent orbsvcs test library CECTEST - Added compiler flags for new notify orbsvcs test library NotifyTests - -Mon Jan 28 17:44:51 2002 Steve Huston - - * ace/Process_Manager.cpp (wait): When waiting for a non-specific - process, specify -1 pid for waitpid(). This is necessary because - of Fri Jan 25 19:58:41 2002 Steve Huston - change to not alter the process group ID when ACE_Process_Manager - spawns a process. - Timed waits for a process still don't work on non-Win32, but - this fix corrects the failed wait with errno == ECHILD. - -Mon Jan 28 12:16:28 2002 Carlos O'Ryan - - * bin/auto_run_tests.lst: - Removed EC_Basic and Event_Latency tests from nightly builds, I - left them there by mistake when I took them out of the - repository (around December, 25th 2001) - -Mon Jan 28 13:20:32 2002 Nanbor Wang - - * XML/common/AttributesImpl.cpp: Removed a bunch of inline - designators. - -Sun Jan 27 22:18:50 2002 Nanbor Wang - - * bin/msvc_auto_compile.pl: Projects in XML subdirectory are - interdependent. List out the order they should be built - explicitly. - -Sun Jan 27 12:48:48 2002 Ossama Othman - - * bin/auto_run_tests.lst - * bin/performance_stats.sh: - - Updated in accordance with the new TAO "Latency" performance - test organization. - -Sun Jan 27 12:08:45 2002 Nanbor Wang - - * XML/common/Transcode.h (ACEXML_Transcoder): Improved the - documentation. - - The followings fixed the Tru64 warnings/errors. - - * XML/common/AttributesImpl.i (operator): - * XML/common/Env.i: Reordered inline functions. - - * XML/tests/Transcoder_Test.cpp: Removed an unused argument. - - * XML/common/Attributes_Def_Builder.h: Added inclusion of - "ace/Auto_Ptr.h". - - * XML/examples/SAXPrint/SAXPrint_Handler.cpp: - * XML/examples/SAXPrint/Print_Handler.cpp: Added inclusion of - "ace/Log_Msg.h". - -Sun Jan 27 15:03:12 2002 Johnny Willemsen - - * Makefile.bor: - Build the XML library with BCB - - * XML/parser/Makefile.bor: - Added debug_validator - - * XML/parser/debug_validator/Makefile.bor: - Added BCB makefile - -Sat Jan 26 19:02:49 2002 Ossama Othman - - * ace/Process_Manager.cpp (register_handler): - - Corrected code that always returned -1. Code that should only - have been run on error was always run since it was outside of an - "if block." Curly braces are a good thing (they were missing). - -Sat Jan 26 21:41:39 2002 Steve Huston - - * ace/Process_Manager.cpp (wait): Fixed compiler warning on - Linux about unused wait_until. This fix removes the ability - to spin around the 'for' loop waiting for signals multiple - times with the timeout decreasing to account for wait time. - Will have to come back to restore this functionality later. - -Sat Jan 26 14:40:12 2002 Johnny Willemsen - - * include/makeinclude/ace_flags.bor: - Added compiler and linker flags for new XML library - - * XML/common/Makefile.bor: - * XML/parser/parser.Makefile.bor: - * XML/Makefile.bor: - * XML/parser/Makefile.bor: - * XML/tests/Makefile.bor: - Added BCB makefiles for the new XML library. - -Fri Jan 25 19:58:41 2002 Steve Huston - - * ace/Process_Manager.cpp (wait(pid_t, const ACE_Time_Value &, - ACE_exitcode *status)): If platform offers sigtimedwait, use it - instead of setting ualarm and then doing sigwait. Once ualarm - is set, it will fire, even if this method has returned. This - causes Solaris processes to die on SIGALRM. - - Also, do not play with the process group ID by default. It's - not needed for doing normal signal management by most processes. - If processes really have a need to change or set a new process - group, they need to do it explicitly by using ACE_OS::setpgid() - or by setting a process group ID in an ACE_Process_Options object - when spawning processes. - - * tests/Process_Manager_Test.cpp: Added a bit more diagnostic info. - -Fri Jan 25 18:29:37 2002 Steve Huston - - * ace/config-aix-4.x.h: Removed ACE_HAS_SIGTIMEDWAIT. It compiles, - but returns ENOSYS at run time. - - * ace/config-aix5.1.h: Added ACE_HAS_SIGTIMEDWAIT. - -Fri Jan 25 15:36:40 2002 Nanbor Wang - - * ace/ace_dll.dsp: Removed /version flags from the project since - they have been taken care of by ace.rc file. Thanks to Ossama - for pointing it out. - -Fri Jan 25 14:45:00 2002 Venkita Subramonian - - * bin/auto_run_tests.lst: - Added Two_Objects test to the list. - -Fri Jan 25 14:40:15 2002 Nanbor Wang - - * XML/common/Exception.cpp: - * XML/common/NamespaceSupport.cpp: - * XML/common/SAXExceptions.cpp: - * XML/parser/parser/Parser.cpp: Moved the initialization of static - members before the inclusion of inline files to avoid - compilation erros on Borland compiler. Thanks to Johnny - Willemsen for figuring this out. - -Fri Jan 25 14:31:06 2002 Nanbor Wang - - * XML/common/NamespaceSupport.cpp: - * XML/parser/parser/Parser.cpp: Fixed several KCC warnings. - -Fri Jan 25 12:01:14 2002 Nanbor Wang - - The following changes fixed SunCC5.1 compilation errors. - - * XML/common/Makefile: - * XML/parser/parser/Makefile: - * XML/tests/Makefile: - * XML/examples/SAXPrint/Makefile: Removed extra spaces for -I - flags. - - * XML/common/Attributes_Def_Builder.h: Removed a redundant comma. - - * XML/common/NamespaceSupport.i: Changed - ACE_TEMPLATE_METHOD_SPECIALIZATION to - ACE_TEMPLATE_SPECIALIZATION. - - * XML/tests/NamespaceSupport_Test.cpp: String literals needed to - be assigned to const char *. - -Fri Jan 25 09:42:12 2002 Ossama Othman - - * ace/ace_dll.dsp: - - Corrected inconsistency in the DLL minor version. The correct - minor version for the ACE 5.2 series is "2," not "1." - -Fri Jan 25 11:21:28 2002 Nanbor Wang - - * bin/msvc_auto_compile.pl: Added XML into the list of auto build - targets. - -Fri Jan 25 00:37:00 2002 Douglas C. Schmidt - - * We now have 1,400 contributors to the ACE+TAO software. Yow! - -Thu Jan 24 17:49:46 2002 Balachandran Natarajan - - * ace/CDR_Stream.i: Fixed the check for the length within - ACE_InputCDR::read_*_array (). The method was checking just for - length passed in, which happens to be the number of elements in - the array, instead of the number of bytes necessary for the - elements. Thanks to William R Volz for - reporting this. - - * THANKS: Added William Volz to the hall of fame. - -Thu Jan 24 18:31:49 2002 Steve Huston - - * tests/Process_Manager_Test.cpp: Better diagnostics added. - -Thu Jan 24 15:14:52 2002 Nanbor Wang - - * ace/Lib_Find.cpp (ldfind): Restored previously removed Win32 - code and re-organized macros so we wouldn't upset CE builds. - -Thu Jan 24 14:53:38 2002 Nanbor Wang - - * bin/generate_doxygen.pl: - * etc/acexml.doxygen: Added the doxygen config file for XML - subdirectory. - - * Makefile: Added XML subdirectory into the lists to be compiled - and be included in the release. - - * XML/*: Merged in the XML parser code. - -Thu Jan 24 10:14:47 2002 Nanbor Wang - - * ace/ace_wchar.h: Added the definition for ACE_TEXT_SearchPath. - - * ace/Lib_Find.cpp (ldfind): Fixed UNICODE and Fuzz builds - errors. Thanks to Johnny Willemsen for - the fix. - -Wed Jan 23 16:48:54 2002 Nanbor Wang - - * ace/Lib_Find.h: - * ace/Lib_Find.cpp (ldfind): Change to use Win32 API SearchPath to - search for the target DLL and updated the document for ldfind in - header file. Thanks to Eugene Alterman - for submitting the patch. - -Wed Jan 23 14:01:32 2002 Ossama Othman - - * ace/config-lynxos.h (ACE_LACKS_INET_ATON): - - LynxOS does not implement the inet_aton() function. - -Wed Jan 23 16:37:52 2002 Steve Huston - - * ace/NT_Service.cpp (insert): If the CreateService call fails, - be sure to save the error value before making another Win32 call - that will smash it. Thanks to Kelly Hickel - for reporting this. - Also ACE-ified the source better. - - * examples/NT_Service/main.cpp: Added some ACE_ERROR output if - operations requested from the command line fail. - -Wed Jan 23 16:14:43 2002 Boris Kolpackov - - * include/makeinclude/platform_sunos5_sunc++.GNU - - Added work around for famous Sun CC "pure virtual function called" - bug. Unfortunately this involves introduction of yet another #define. - See TAO/tao/ValueBase.h for more information. - -Tue Jan 22 21:27:25 2002 Balachandran Natarajan - - * ace/ace_dll.vcp: Add Frameork_Component.* to the builds. Thanks - to Venkita for pointing it out. - -Tue Jan 22 17:42:39 2002 Steve Huston - - * ace/NT_Service.(h cpp): Added two new methods: - void capture_log_msg_attributes (void): Grabs a copy of the - calling thread's ACE_OS_Log_Msg_Attributes to facilitate - inheritance of the logging attributes in the service thread. - void inherit_log_msg_attributes (void): Called in a service - thread, inherits the main thread's logging attributes. - Modified the ACE_NT_SERVICE_RUN macro to capture the main - thread's logging attributes before starting the service control - dispatcher. Modified the ACE_NT_SERVICE_DEFINE macro to call - inherit_log_msg_attributes if the ACE_NT_Service object for - the service was set up before the thread started. - Fixes Bugzilla # 82. - - * examples/NT_Service/main.cpp: - * examples/NT_Service/ntsvc.cpp: Now writes a log file in the current - working directory which should have messages from both main and - service threads in it. - -Tue Jan 22 15:19:29 2002 Nanbor Wang - - * ace/DLL.cpp: Changed to invoke this->open() in the - constructor. Thanks to Eugene Alterman - for motivating this. - -Mon Jan 21 23:27:03 2002 Nanbor Wang - - * ace/OS.h: Reordered main redefinition macros so that it actually - passed wchar argv to main when UNICODE is defined. - -Mon Jan 21 10:01:34 2002 Frank Hunleth - - * bin/auto_run_tests.lst: - Added MIOP unit tests. - -Mon Jan 21 03:00:14 2002 Ossama Othman - - * ace/Framework_Component.cpp (register_component): - - Removed debugging statements that always printed text. - -Mon Jan 21 07:45:12 2002 Johnny Willemsen - - * ace/Framework_Component.cpp: - Fixed fuzz error - -Mon Jan 21 00:13:42 2002 Christopher Kohlhoff - - * ace/streams.h: - Workaround for Borland C++ 5.5.1 bug we have now just hit. - -Sun Jan 20 21:42:53 2002 Balachandran Natarajan - - * ace/Framework_Component.cpp: - * ace/Framework_Component_T.cpp: Fixed fuzz errors. - -2002-01-20 Oliver Kellogg - - * bin/subst_env.pl: New script to ease the transition to the - TAO_ENV_ARG macros defined in TAO/tao/orbconf.h. - -Sun Jan 20 12:38:28 2002 Balachandran Natarajan - - * tests/Framework_Component_Test.dsp: New dsp file for the test. - * tests/tests.dsw: Added the above test to the workspace. - -Sun Jan 20 12:25:28 2002 Balachandran Natarajan - - * ace/Framework_Component.h: Removed the definition of the - default constructor (in ACE_UNIMPLEMENTED_FUNC definition). The - other private constructor with a default argument tends towards - a default constructor and VC++ signals a multiple definition - error. Not sure how g++ didnt signal this one. - - * ace/Framework_Component_T.h: #include'd Framework_Component.h - * ace/Framework_Component_T.cpp: Added a #ifndef around the file. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added the Framwork_Component* files to the - project file. - -Sun Jan 20 10:40:28 2002 Nanbor Wang - - * tests/Vector_Test.dsp: - * tests/tests.dsw: Added a new project for Vector_Test. - -Sun Jan 20 16:25:12 2002 Johnny Willemsen - - * ace/Makefile.bor: - Added new Framework_Component - - * tests/Makefile.bor: - Added new Framework_Component_Test - -Sun Jan 20 00:00:30 2002 UTC Don Hinton - - * ace/Vector_T.cpp (dump): Commented out the contents of this - function for the time being. It assumed that the element - was an object with a dump() method, which won't always be - the case. - - * tests/Vector_Test.cpp: Changed a few data types from signed - to unsigned, size_t, to get rid of compiler warnings. - -Sat Jan 19 17:29:50 2002 Douglas C. Schmidt - - * ace/Vector_T.cpp (dump): Fixed problems with this method. Thanks - to Don Hinton for reporting this. - - * tests/Vector_Test.cpp: Changed the typedef of DATA from int to - size_t to avoid "type mismatch" compiler warnings. Thanks to - Don Hinton for reporting this. - -Sat Jan 19 22:30:26 UTC 2002 Don Hinton - - * apps/JAWS2/JAWS/Hash_Bucket_T.h: - * apps/JAWS2/JAWS/Assoc_Array.h: Added missing keyword "class" to - friend declarations. - - * ace/SString.cpp: Removed unneeded include of Service_Config.h. - - * ace/Service_Config.{h|cpp}: - * examples/Connection/misc/Connection_Handler.cpp: - - Removed static methods from ACE_Service_Config that delegated to - ACE_Reactor::instance(), and fixed a few instances where they were - still called. - - * ace/Object_Manager.cpp: - * ace/Service_Config.cpp: - * ace/Proactor.cpp: - * ace/Reactor.cpp: - - Added call to instance() methods that registers the singleton with - the new ACE_Framework_Repository so it can handle destruction, and - replaced explicit references to ACE_Reactor and ACE_Proactor with - calls to ACE_Framework_Repository. - - * ace/Framework_Component.{h|inl|cpp}: - * ace/Framework_Component_T.{h|inl|cpp}: - * ace/Makefile: - * tests/Framework_Component_Test.cpp: - * tests/Makefile: - * tests/run_test.lst: - - Added ACE_Framework_Repository to manage ACE_Framework_Component's, - e.g., singletons like ACE_Reactor or ACE_Proactor. It uses - External Polymorphism obviating any interface changes. The - components register themselves with repository in their instance - methods. This allows the Object_Manager and Service_Config to - manage these components without having to know about them a priori. - - This was needed to reduce footprint for applications like TAO that - don't need to use all the available components, e.g., ACE_Proactor. - -Sat Jan 19 10:23:39 2002 Douglas C. Schmidt - - * ace/Makefile (TEMPLATE_FILES): - * tests/Makefile.bor: - * tests/Makefile: - * tests/run_test.lst: - * ace/Vector_T.{h,i,cpp}: - * tests/Vector_Test.cpp: Added support for the new ACE_Vector to - the appropriate places. This vector behaves like the STL - vector. Thanks to Gonzo and Craig Ching for contributing this. - - * ace/Future_Set.h: Updated the documentation to explain how - various features work better. Thanks to Johnny Tucker for - contributing this. - -Fri Jan 18 19:09:41 2002 Steve Huston - - * tests/run_test.lst: Re-enabled Process_Manager_Test for all but - Chorus and VxWorks. Could not find a reason it was disabled. - Also enabled Process_Mutex_Test on Win32. - -Fri Jan 18 16:44:29 2002 Steve Huston - - * ace/ace.icc: Added Reactor_Notification_Strategy.(h cpp) sources. - - * ace/Reactor_Notification_Strategy.cpp: Fixed ACE_RCSID to refer to - Reactor_Notification_Strategy, not Strategies. - - * tests/Get_Opt_Test.icc: - * tests/INET_Addr_Test.icc: New Visual Age C++ configs for these tests. - - * tests/tests.icp: Added Get_Opt_Test.icc and INET_Addr_Test.icc - -Fri Jan 18 12:56:36 2002 Douglas C. Schmidt - - * ace/Log_Msg.cpp (init_backend): Added support for SysLog on platforms - that don't lack it. Thanks to Alexei I. Adamovich - for reporting this fix. - -Fri Jan 18 10:29:06 2002 Ossama Othman - - * ace/Service_Config.h (process_file): - * ace/Service_Config.cpp (process_directives, process_file): - - Factored out code that processes a svc.conf file into the new - static process_file() method. This allows svc.conf files to be - explicitly parsed by the application at any arbitrary point in - time instead of Service Configuration initialization time alone. - -Thu Jan 17 18:51:09 2002 Douglas C. Schmidt - - * ace/Name_Space.cpp (operator =): Fixed a memory leak. Thanks - to Ian Cahoon for reporting this. - -Thu Jan 17 12:13:51 2002 Ossama Othman - - * ace/SSL/SSL_Context.h (private_key, verify_private_key): - - Added new documentation. These methods should only be called - after a certificate has been set since key verification is - performed against the certificate, among other things. - -Thu Jan 17 13:11:27 2002 Chad Elliott - - * ace/Message_Queue.h: - * ace/Message_Queue.cpp: - * ace/Message_Queue_T.h: - * ace/Message_Queue_T.cpp: - - Provide the ability to enqueue based on the message deadline and - to dequeue based on priority, deadline and from the end. - -Wed Jan 16 11:24:52 2002 Priyanka Gontla - - * THANKS: - Updated to add Gerhard Voss . - -Wed Jan 16 06:19:01 2002 Douglas C. Schmidt - - * ace/OS.i: Replaced "set" with "sset" in sigtimedwait() and sigwait() - to avoid STL symbol clashes with MSVC++ 6.0. Thanks to Shmulik - Regev for reporting this. - -Wed Jan 16 09:01:12 2002 Johnny Willemsen - - * ace/Containers_T.{h,cpp}: - Added ACE_Fixed_Set_Const_Iterator to make it possible to - iterate through a const ACE_Fixed_Set instance - -Wed Jan 16 07:53:12 2002 Johnny Willemsen - - * include/makeinclude/ace_flags.bor: - Added new flags for the new TAO ETCL orbsvcs library - -Tue Jan 15 17:24:53 2002 Steve Huston - - * ace/SSL/SSL_Context.cpp (report_error()): Set ACE_OS::last_error() - to ERR_get_error() so the caller can get the error code later. - - * ace/SSL/SSL_SOCK_Connector.cpp: If the SSL handshake phase of a - connection attempt fails, close the underlying socket. - -Tue Jan 15 15:35:41 2002 Steve Huston - - * ace/SOCK_Connector.(h cpp): - * ace/LSOCK_Connector.(h i cpp): - * ace/MEM_Connector.(h cpp): - * ace/SSL/SSL_SOCK_Connector.(h cpp): - Improved the Doxygenation and removed the protocol_family and - protocol arguments from the ctors and connect() methods. The - protocol family is always taken from the ACE_Addr remote_sap - argument since it can now be either PF_INET or PF_INET6 (for - SOCK_Connector objects) and should be PF_UNIX for LSOCKs. - It is pointless to allow the user to request something that - is impossible to do correctly. - -Tue Jan 15 10:52:12 2002 Johnny Willemsen - - * include/makeinclude/ace_flags.bor: - Added new flags for the new TAO PortableGroup library - -Mon Jan 14 14:40:25 2002 Carlos O'Ryan - - * bin/g++dep: - Fixed small problems in the dependency generation: - - The script did not properly handle files with '+' in their - names. - - In some cases the script generated escaped blanks, i.e. lines - containing a blank preceded by a backslash. Such blanks are - interpreted as part of a dependency name and break havoc with - the builds. - -Mon Jan 14 16:49:37 2002 Steve Huston - - * ace/OS.h (ACE_STATIC_SVC_DEFINE): Corrected the documentation to - say the service-implementing class must be derived from - ACE_Service_Object, not ACE_Service_Config. - -Mon Jan 14 07:40:16 2002 Douglas C. Schmidt - - * ace/OS.i (mmap): There was a typo that prevented the ACE Memory Map - stuff from working properly on Win9x. Thanks to Edan Ayal - for reporting this. - -Sun Jan 13 18:59:37 2002 Douglas C. Schmidt - - * ace/Memory_Pool.{h,cpp}: Added a new option that makes is possible - to control whether or not a fixed address will be used when - remapping a memory-mapped file. Thanks to Jonathan Reis - for this enhancement. - -Mon Jan 14 11:02:12 2002 Johnny Willemsen - - * include/makeinclude/ace_flags.bor: - Added flags for new TAO FT_ORB library - -Sun Jan 13 08:20:05 2002 Craig Rodrigues - - * ace/config-all.h: Make sure that ACE_bad_alloc - is defined as std::bad_alloc if - ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB macro is set. - Fixes gcc 3.0.3 compilation problem. - -Fri Jan 11 22:54:22 2002 Balachandran Natarajan - - * ace/config-lynxos.h: Added #define ACE_HAS_USING_KEYWORD to teh - file. The compiler supports namespaces. According to the new - rules at the doc_group, we dont use any compilers that dont - support namespaces. The above macro is itself a waste. But we - cannot remove it overnight as it has far reaching - consequences. Working around that for the timebeing. - -Thu Jan 10 18:35:41 2002 Steve Huston - - * ace/Profile_Timer.h: Clarified that elapsed_time() calculates time - from start() to stop(). Improved Doxygenation. - -Thu Jan 10 16:53:41 2002 Nanbor Wang - - * examples/Service_Configurator/IPC-tests/server/server.dsp: The - Release version of the library needs to link in ADVAPI32.LIB as - GetUserName is used in ACE's inline code. - -Wed Jan 9 22:07:50 2002 Douglas C. Schmidt - - * ace/Logging_Strategy.cpp (fini): Make sure to cancel the - timer if interval_ and max_size_ are > 0. Thanks to Yaniv Ben - Ari for reporting this. - -Wed Jan 9 11:38:58 2002 Ossama Othman - - * tests/SSL/Makefile (LDLIBS): - - Added missing SSL and crypto libraries. Fixed link errors. - Thanks to Marvin Wolfthal for reporting the - error and suggesting a fix. - -Wed Jan 9 12:24:39 2002 Steve Huston - - * ace/Process.cpp (spawn): Don't attempt ACE_OS::setpgid if - ACE_LACKS_SETPGID is defined. Thanks to Victor Terber - for reporting this. - -Wed Jan 09 11:19:07 2002 Nanbor Wang - - * ace/OS.h: Updated the comment for ACE_CE_Bridge to indicate that - it's obsolete and will be removed in the future. - -Wed Jan 9 00:48:48 2002 Don Hinton - - * ace/Get_Opt.cpp: Make sure to cast away constness - before deleting an ACE_TCHAR array. Thanks to - Bala for reporting this. - -Tue Jan 8 17:29:33 2002 Steve Huston - - * ace/SSL/SSL_SOCK_Connector.cpp: Don't try to dereference a 0 - timeout pointer. Gack. Thanks to Ossama for pointing this out. - -Tue Jan 8 15:51:06 2002 Don Hinton - - * ace/Get_Opt.cpp - * ace/Service_Config.cpp: - - Moved the template instantiations from Service_Config.cpp to - Get_Opt.cpp where they belong. - - * ace/Get_Opt.{h.cpp}: Replaced ACE_TString with ACE_TCHAR for - type of member variable ACE_Get_Opt_Long_Option since it - wasn't really needed and took up space. - -Tue Jan 8 10:43:48 2002 Ossama Othman - - * ace/config-sunos5.5.h (ACE_LACKS_INET_ATON): - - Solaris does indeed implement the inet_aton() function, but it - is found in `libresolv.*'. It doesn't seem worth it to link - another library just for that function. Just use the emulation - in ACE that has been used for years. - -Tue Jan 8 11:31:22 2002 Steve Huston - - * tests/Makefile: When doing realclean, use the DLL_Test and - Service_Config_DLL Makefiles to clean their files up. - -Tue Jan 8 08:36:33 2002 Steve Huston - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): Corrected order - of operations checking EWOULDBLOCK, and fixed compile errors. - Thanks to Vlado Chovanec for this fix. - -Mon Jan 7 19:55:39 2002 Steve Huston - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): Added extra check - for SSL_accept/connect status failure to avoid looping on a bad - socket if the socket closes during handshake. Thanks to Vlado - Chovanec for this fix. - - Also added timeout countdown support for SSL_SOCK_Connector, same - as in: Sun Jan 6 09:37:02 2002 Ossama Othman - -Mon Jan 7 15:55:26 2002 Ossama Othman - - * ace/INET_Addr.cpp (set): - - Pass a pointer to a "struct in_addr" to inet_aton(), i.e. the - proper type, instead of a forcibly casted ACE_UINT32. Also - updated existing code to use the in_addr::s_addr member instead - of the previous ACE_UINT32 variable. - -Mon Jan 7 15:13:09 2002 Mayur Deshpande - - * performance-tests/Misc/context_switch_time.cpp (main): - Since the Yield_test does seem to work on VxWorks now (see - ChangeLog below), the 'ifdefs' for bypassing VxWorks for the - Yield-Test have now been removed. - -Mon Jan 7 15:08:25 2002 Mayur Deshpande - - * ace/OS.i (thr_yield): - Changed ::taskDelay (1) to ::taskDelay (0) for VxWorks in - thr_yield (). The change with (0), now does seem to perform - the yield correctly as reflected in the Yield-Test of - context_switch_time. Thanks to Charlie Grames - for this tip. - -Mon Jan 7 15:16:10 2002 Ossama Othman - - * ace/OS.h (INADDR_NONE): - - If the platform does not define this constant, then define it. - - * ace/OS.cpp (inet_aton): - - For some reason we were emulating inet_aton() on all platforms - using the now deprecated inet_addr() function. Use the native - inet_aton() function unless ACE_LACKS_INET_ATON is defined. - - Instead of performing a memcpy() of the IPv4 32-bit address into - the in_addr data structure, simply assign it to the s_addr field - of that data structure. It's not clear why we didn't do this in - the first place. - - (inet_ntoa): - - Fixed PSoS emulation of this method. The result is supposed to - be stored in a statically allocated string, not a dynamically - allocated one. Fixes a memory leak. Note that this change - makes the implementation non-reentrant. However, inet_ntoa() - was not designed to be reentrant to begin with. - - * ace/OS.i (inet_addr): - - On error, inet_addr() is supposed to return INADDR_NONE. - - The return value should be a 32 bit unsigned integer, not a - signed one. - - * ace/config-win32-common.h: - - MS Windows does not support the inet_aton() function. Define - ACE_LACKS_INET_ATON. - -Mon Jan 7 12:20:26 2002 Ossama Othman - - * bin/auto_run_tests.lst: - - Added the MT_SSLIOP test to the regression test suite list. - -Sun Jan 6 21:19:10 2002 John Aughey - - * tests/run_test.lst: Uncommented out Conn_Test from daily builds. - -Sun Jan 6 21:09:10 2002 John Aughey - - * ace/INET_Addr.cpp: - * ace/INET_Addr.h: - - Reverted to January 1 version until I have time to put the - set_host_name() method in correctly. - -Sun Jan 6 20:01:10 2002 Balachandran Natarajan - - * tests/run_test.lst: Commented out Conn_Test from the daily - builds. This test seems to hang blocking build progress. Have - sent a mail to John Aughey on this. - -Sun Jan 6 09:37:02 2002 Ossama Othman - - * ace/SSL/SSL_SOCK_Acceptor.cpp (accept, ssl_accept): - - Take into account the time to complete the basic TCP handshake - and the SSL handshake. Specifically, ACE_Countdown_Time is used - to reduce the timeout value after each IO operation - (e.g. accept(), SSL_accept()) used during SSL passive connection - establishment. [Bug 1110] - - Commented out debugging statements. - -Sat Jan 5 20:57:36 2002 Venkita Subramonian - - * ace/Future.cpp (get): Added another ACE_const_cast in addition - to Doug's changes to fix compile errors. See below. - -Sat Jan 5 14:57:36 2002 Craig Rodrigues - - * ace/OS_QoS.h: Fix comments, put in doxygen format. - -Sat Jan 5 08:59:41 2002 Douglas C. Schmidt - - * ace/Future.cpp (get): Added an ACE_const_cast() to silence certain - C++ compilers. Thanks to Venkita for reporting this. - -Fri Jan 5 15:17:12 2002 Johnny Willemsen - - * ace/OS.{h,cpp}: - Added ACE_TSS_Emulation::release_key() method to release a - thread_key within the TSS_Emulation when a thread is stopped. - Added ACE_TSS_Emulation::tss_keys_used_ member to administrate which - thread_keys are used and which not. - Added ACE_TSS_Keys::is_set() method to test whether a specific - thread_key is marked as used. - Changed ACE_TSS_Emulation::next_key() method to return a thread_key - that is not used yet, this key is then marked as used at the same - time. - Changed ACE_OS::thr_keyfree() method to release the key in the - TSS_Emulation when ACE_HAS_TSS_EMULATION is defined. - - These changes fix the bugzilla bugs 223 and 657. The ACE_TSS_Emulation - now recycles keys that are released earlier. - -Fri Jan 4 19:59:03 2002 John Aughey - - * ace/INET_Addr.cpp: Fixed the new set_host_name method - -Fri Jan 4 18:59:27 2002 Balachandran Natarajan - - * ChangeLogs/ChangeLog-01b: Added a new file. Trimmed this file - to have entries only in 2002. - -Fri Jan 4 15:50:42 2002 Steve Huston - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - On ACE::select-reported timeout or failure, set status to return - a -1 to caller, not 0. Thanks to Vladimir Chovanec - for reporting this and sending a fix. - -Fri Jan 4 08:31:49 2002 Douglas C. Schmidt - - * tests/Thread_Manager_Test.cpp (test_task_record_keeping): Fixed - a typo in an expression on line 226. Thanks to Harvinder - Sawhney for reporting this. - -Fri Jan 4 05:51:22 2002 Douglas C. Schmidt - - * ace/Future.{h,cpp}: Made the get() and ready() methods const. - Thanks to Ran Kohavi for reporting this. - -Fri Jan 4 15:06:31 2002 Steve Huston - - * ace/String_Base.h (operator=): Add to ACE_String_Base - return type. Fixes compile error on IBM C/C++. - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - If SSL_get_error() returns SSL_ERROR_SYSCALL and it's EWOULDBLOCK, - don't blindly set both read and write handles for select. Check - if SSL is indicating SSL_want_write() and set the proper handle. - Also, don't ACE_ASSERT SSL_pending before return... if there's - an SSL handshake screw-up (like someone trying to break in) - just report the failure, don't abort/crash. - -Wed Jan 02 13:27:09 2002 Nanbor Wang - - * ace/INET_Addr.h: - * ace/INET_Addr.cpp: Removed tabs and trailing whitespaces. - -Wed Jan 2 08:19:18 2002 Douglas C. Schmidt - - * ace/FILE_Connector.h, - * ace/OS.h (ACE_OS): Clarified the weak semantics of O_APPEND - on Win32. Thanks to Eugene Alterman for - reporting this. - -Wed Jan 2 12:43:00 2002 John Aughey - - * ace/INET_Addr.h - * ace/INET_Addr.cpp : Added set_host_name method and moved - relevant code into this method. Changed signature of - set_address method to take a void pointer rather than a - char *. - -Wed Jan 2 12:30:01 2002 Chris Gill - - * ace/RB_Tree.i - * tests/RB_Tree_Test.cpp : added check for valid current node to - forward_i and reverse_i methods of iterator base class. Thanks to - Craig L. Ching for reporting this! - -Wed Jan 2 08:19:18 2002 Douglas C. Schmidt - - * tests/README: Clarify that run_test.pl should be used rather - the run_tests.sh. - - * tests/run_tests.bat: Clarify that run_test.pl should be used - on Win9x. Thanks to Edward A Thompson - for prompting this. - -Wed Jan 2 07:37:01 2002 Balachandran Natarajan - - * ace/Handle_Set.h: - * ace/Handle_Set.cpp: Added a method reset_state () to the - ACE_Handle_Set_Iterator class. - -Tue Jan 2 11:39:12 2002 Johnny Willemsen - - * ace/OS.i: - Added missing ACE_UNUSED_ARG in ACE_OS::event_timedwait - -Tue Jan 1 15:36:39 2002 Steve Huston - - * include/makeinclude/platform_sunos5_sunc++.GNU: Added support - for the buildbits=64 make option. - -Tue Jan 1 20:05:12 2002 Johnny Willemsen - - * ace/Name_Request_Reply.{h,cpp}: - Changed type of 3 constructor arguments from size_t to ACE_UINT32 - because the members in which these arguments are stored are also - of type ACE_UINT32 - - * ace/OS.i - In ACE_OS::umask method, changed the type in the ACE_OSCALL_RETURN - macro from int to mode_t because that is the return type of the - method - -Tue Jan 1 08:47:25 2002 Douglas C. Schmidt - - * ace/Thread.h: Clarify how the ACE_Thread_Adapter is deleted - when spawn() is called. Thanks to Preston Elder - for reporting this confusion. - -Tue Jan 1 14:09:26 2002 Johnny Willemsen - - * examples/Map_Manager/test_hash_map_manager.cpp: - Made this example compiling when ACE_USES_WCHAR is set - - * Makefile.bor: - Added examples directory because all examples for which there are - BCB makefiles now build when ACE_USES_WCHAR is set - -Tue Jan 1 00:02:12 2002 Nanbor Wang - - * ace/ace_dll.vcp: Added String_Base_Const.*. diff --git a/ChangeLogs/ChangeLog-02b b/ChangeLogs/ChangeLog-02b deleted file mode 100644 index c13db37e19f..00000000000 --- a/ChangeLogs/ChangeLog-02b +++ /dev/null @@ -1,7227 +0,0 @@ -Tue Dec 31 21:21:26 2002 Balachandran Natarajan - - * bin/generate_topinfo_charts.sh: - * bin/topinfo_stats.sh: Scripts to track the memory usage and plot - them. At present it works only for the simple test in - $TAO_ROOT/performance-tests/Memory/Single_Threaded. - -Tue Dec 31 17:57:19 2002 Steve Huston - - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h: - Add #include "ace/Svc_Handler.h" - -Tue Dec 31 17:50:39 2002 Steve Huston - - * ace/OS.h: For WinCE 4 (.NET) and up, include rather than - typedef-ing ptrdiff_t. - -Tue Dec 31 17:26:41 2002 Steve Huston - - * tests/tests.mpc (DLL Test Lib): Add dllflags = ACE_BUILD_SVC_DLL to - add the correct /D option. The source uses ACE_Svc_Export to flag - dll import/export correctly. - - * tests/CE_fostream.h: #include "ace/config-all.h" before checking for - #if defined (ACE_HAS_WINCE). - -Tue Dec 31 15:05:42 2002 Steve Huston - - * ACEXML/apps/svcconf/Svcconf.cpp: Changed the condition for when - a dummy entrypoint is needed from AIX 4.3 to AIX and Visual Age C++ - version 5. Thanks for Jon Wackley for this adjustment. Also see: - Fri Dec 27 19:46:31 2002 Steve Huston - - * netsvcs/clients/Naming/Client/Makefile: If building this stuff, - reset OBJDIRS to $(VDIR) and $(VSHDIR) to clean up both. - -Mon Dec 30 21:30:41 2002 Steve Huston - - * include/makeinclude/platform_hpux_gcc.GNU: Removed the SOVERSION= - line to allow versions libraries to be set up properly. - - * ace/Based_Pointer_Repository.cpp: - * ace/Dynamic.cpp: - * ace/SString.cpp: - * tests/Framework_Component_DLL.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/Timeprobe_Test.cpp: - * apps/drwho/File_Manager.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: - * examples/Logger/Acceptor-server/server_loggerd.cpp: - * examples/Logger/simple-server/server_loggerd.cpp: - * examples/Threads/auto_event.cpp: - * examples/Threads/tss2.cpp: - Add __hpux to the conditions needed to instantiate - static template members. Also see - Sat Nov 23 18:12:37 2002 Steve Huston - -Mon Dec 30 19:32:18 2002 Steve Huston - - * tests/Codecs_Test.cpp: Add explicit template instantiation for - ACE_Auto_Basic_Array_Ptr. - -Mon Dec 30 18:44:20 Steve Huston - - * examples/C++NPv2/TP_Logging_Server.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: - * examples/Logger/Acceptor-server/server_loggerd.cpp: - * examples/Logger/simple-server/server_loggerd.cpp: - * examples/Threads/auto_event.cpp: - * examples/Threads/tss2.cpp: - * performance-tests/Misc/test_singleton.cpp: - More singleton_ instantiations for g++ on AIX. - -Mon Dec 30 18:11:39 2002 Steve Huston - - * apps/drwho/File_Manager.cpp: Add explicit instantiation of - ACE_Singleton::singleton_. - Similar to those done for: - Tue Dec 3 20:47:39 2002 Steve Huston - -Mon Dec 30 17:38:31 2002 Steve Huston - - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - For Visual Age C++ 5 and up on AIX, explicitly instantiate the - CLI_Stream<> constructor. The compiler misses this one when - instantiating templates. Thank you very much to Jonathan - Wackley for diagnosing this problem and - leading to a workaround. - -Mon Dec 30 15:25:26 2002 Nanbor Wang - - * ACEXML/common/StrCharStream.cpp (open): - * ACEXML/common/FileCharStream.cpp (open): Changed to allow open - to succeed if automatic determination of encoding fails. This - allows the "Simple parsing" feature of ACEXML to work. Thanks - to Michael F"olsl for reporting the - problem. - - * ACEXML/examples/SAXPrint/main.cpp: Added a new option to test - out ACEXML's simpling parsing feature. - - * ACEXML/examples/SAXPrint/simple.svcconf.xml: Added this new - "simple" XML document to test out the "Simple" parsing feature - in ACEXML. - -Mon Dec 30 12:21:33 2002 Balachandran Natarajan - - * bin/MakeProjectCreator/config/taoversion.mpb: Fixed the version - information. This should automatically get updated during the - next beta/release. - -Sun Dec 29 18:27:38 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Prevented BiDirGIOP tests from running - in GIOP 10 builds. - -Sun Dec 29 16:43:03 2002 Nanbor Wang - - * ACEXML/common/FileCharStream.cpp (close): Changed to reset the - file pointer, filename_ and encoding_ strings after they are - release. Thanks to Andrew Marlow for - suggesting the change. - -Sun Dec 29 00:47:58 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Security tests using SSLIOP will not be - run in static builds. - -Sat Dec 28 23:05:51 2002 Steve Huston - - * bin/make_release: Use -relative to replace ACE_ROOT with a relative - path in generated makefiles. - -Sat Dec 28 13:16:24 2002 Nanbor Wang - - * ace/MEM_IO.cpp (recv_buf): Reverted my previous hack in: - - Fri Dec 27 08:38:29 2002 Nanbor Wang - - and make the connection close handling more robust. - - * tests/MEM_Stream_Test.cpp: Reverted my previous change in: - - Sat Dec 28 11:04:38 2002 Nanbor Wang - - It was not necessary. Added debug information for close - connection. - -Sat Dec 28 11:04:38 2002 Nanbor Wang - - * tests/MEM_Stream_Test.cpp: Made sure this test ignore the EIO - error from the following change when a connection was closed. - - Fri Dec 27 08:38:29 2002 Nanbor Wang - -Fri Dec 27 20:06:39 2002 Nanbor Wang - - * ace/Malloc_T.h: - * ace/Malloc_T.i: - * ace/Malloc_T.cpp: Added a new ACE_Malloc_T::bad () method to - query whether a Malloc_T object was constructed successfully. - This approach, IMO, is sub-optimal compared to using an explicit - init method approach. The existing constructor signatures, - however, prevent us from doing so without breaking backward - compatibility. - - * ace/MEM_SAP.cpp: Now that there's a way to check whether the - underlying Malloc is functioning or not. Changed MEM_SAP to - check for proper initialization of underlying Malloc object and - clean up OS resources if the Malloc object is defected. This - change makes MEM_Stream transport mechanism more robust. - -Fri Dec 27 19:46:31 2002 Steve Huston - - * ACEXML/apps/svcconf/Svcconf.cpp: Add a dummy entrypoint when - ACE_USES_CLASS_SVC_CONF == 0 on AIX 4.3. Else the AIX 4.3 linker - complains there are no csects or exported symbols saved at link - time. Thanks to Jon Wackley for reporting - this problem. - -Fri Dec 27 17:43:29 2002 Steve Huston - - * ace/OS.h: For WinCE, only typedef ptrdiff_t for _WIN32_WCE < 400. - eMbedded Visual C++ 4 (Win CE.NET) defines this type. - - * bin/MakeProjectCreator/templates/em3vcp.mpd: Removed /M$(CECrtMT) - from the CPP options. Neither evc3 nor 4 support any /M options to - set the C run-time like MSVC does. It's controlled via the _DEBUG - macro only. This also allows the generated vcp file to be used - with either evc3 or evc4 (Windows CE .NET). evc3 ignored the option, - but evc4 flags it as unknown. - -Fri Dec 27 08:38:29 2002 Nanbor Wang - - * ace/MEM_IO.cpp (recv_buf): Changed to return error (-1) and set - the errno to EIO when we receive 0 byte off the signaling socket - as this should never happen under normal circumstance. However, - on Win32 and Solaris, when one end of a connection closes the - socket while the other end is still reading the socket, the - active end will continuously receive several 0 bytes messages. - This confuses the hack of the MEM_IO mechanism and causes the - memory management routine to fall into a tight spinning - deadlock. - -Fri Dec 27 07:49:28 2002 Craig Rodrigues - - * ace/config-macosx.h: Remove temporary hacks for buggy - gcc 3.1 compiler. Thanks to John Zorko for reminding me about - this. - - * examples/Service_Configurator/IPC-tests/server/Makefile: - * examples/Service_Configurator/Misc/Makefile: - * examples/Timer_Queue/Makefile: - Add ACELIBS to ACE_SHLIBS to fix MacOS X linking problem. - -Thu Dec 26 17:11:54 2002 Balachandran Natarajan - - * bin/make_release: Fixed the following problems in the release - script which caused problems during the beta cutting process: - - - cvs commits of TAO/Changelog TAO/VERSION etc. failed. The - failure was because we were also commiting taoversion.mpb but - from $TAO_ROOT as "cvs commit ChangeLog VERSION - other_files ../bin/Makeyada". Using ../ to indicate files in - higher directories is an unpardonable mistake for cvs - 1.10.x. It used to work 1.9.x. But with 1.10* versions the - protocol changed disallowing the ../ - - - we didnt set the file permissions on the generated files - properly - - - the generated files from mpc were not added to the list of - files for which LF->CRLF conversions are supposed to be - masked during zip! - -Thu Dec 26 16:17:41 2002 Steve Huston - - * tests/tests.mpc: For DLL Test Lib, the source is DLL_Test_Impl.cpp, - not DLL_Test.cpp. - -Thu Dec 26 09:14:38 2002 Balachandran Natarajan - - * Makefile: Removed configure.in from the list of controlled files. - -Thu Dec 26 07:36:10 2002 Balachandran Natarajan - - * include/makeinclude/platform_freebsd_pthread.GNU: Removed for - sure now. This should have been removed in this "Thu Nov 14 - 22:47:45 UTC 2002 Craig Rodrigues " - checkin. Again, thanks to Craig for catching this. - -Thu Dec 26 07:31:42 2002 Balachandran Natarajan - - * apps/Gateway/Gateway/Makefile: Fixed a ttypo. Thanks to Craig - Rodrigues for catching this. - -Wed Dec 25 17:47:12 2002 Bala - - * ACE version 5.2.8 released. - -Wed Dec 25 17:39:05 2002 Balachandran Natarajan - - * bin/make_release: Fixed problems with generation of vcproj etc. - -Wed Dec 25 06:14:17 2002 Douglas C. Schmidt - - * Merry Christmas to all. May we have peace and justice for all in 2003. - -Tue Dec 24 17:29:11 2002 Balachandran Natarajan - - * docs/ACE-subsets.html: Documented the compiler options that - Steve Vranyes experimented and tested with to get a good - footprint reduction on Solaris. - -Tue Dec 24 07:31:54 2002 Balachandran Natarajan - - * ace/Argv_Type_Converter.h: - * ace/Argv_Type_Converter.cpp: Reverted the following changes "Mon - Dec 23 17:26:42 2002 Steve Huston " and - "Mon Dec 23 22:57:18 2002 Balachandran Natarajan - ". The argument parsing in - TAO gets busted due to these changes and most of tests in our - daily builds fail. - -Mon Dec 23 22:57:18 2002 Balachandran Natarajan - - * ace/Argv_Type_Converter.h: Changed saved_argc_ to be of type int - as opposed to int &. This seems to be necessitated by the change - "Mon Dec 23 17:26:42 2002 Steve Huston " - which gives compile errors on all platforms. - -Mon Dec 23 21:07:20 2002 Steve Huston - - * bin/MakeProjectCreator/templates/em3vcpdll.mpt: Changed the Debug - define from DEBUG to _DEBUG, matching all others, and what the - ACE files expect. Fixes mismatch inlines in ACE tests. - - * tests/tests.mpc: Added CE_fostream.cpp to the CDR_File_Test inputs. - - * tests/CE_fostream.{cpp h}: Added #if defined (ACE_HAS_WINCE) to - prevent trying to compile this on non-CE systems. - -Mon Dec 23 17:26:42 2002 Steve Huston - - * ace/OS.h (main): For WinCE, eVC can't grok the #include within the - 'main' macro expansion, so #include "ace/Argv_Type_Converter.h" is - moved outside the macro definition. - - * ace/Argv_Type_Converter.{h cpp} (ctor): Change argc from int& to - int, else it can't be used in the way it's already coded into use - in the 'main' definition (above, OS.h). - - * tests/Dev_Poll_Reactor_Test.cpp: - * tests/Proactor_Test.cpp: - * tests/Proactor_Scatter_Gather_Test.cpp: Changed main() to - ACE_TMAIN(). - - * tests/FlReactor_Test.cpp: - * tests/XtReactor_Test.cpp: Add /**/ between #include and filename - to silence MS warnings about missing files during dependency updates. - -Mon Dec 23 16:16:05 2002 Boris S Kolpackov - - * bin/auto_run_tests.lst: Added - TAO/orbsvcs/tests/Security/Crash_Test to the list of tests. - -Mon Dec 23 17:08:17 2002 Balachandran Natarajan - - * THANKS: Changed Boris's information in the Hall of Fame. - -Mon Dec 23 12:13:51 2002 Steve Huston - - * examples/C++NPv1/Process_Per_Connection_Logging_Server.h: Add - 'public' keyword to Process_Per_Connection_Logging_Server's - inheritance from Logging_Server. - - * examples/C++NPv2/Makefile: Add a $(RM) -rf tempinc after each - mkfile make to clean up template instantiations for Visual Age C++ - on AIX. - - * examples/C++NPv2/Makefile.SLD: Add Logging_Handler to the files - comprising this service. - - * examples/C++NPv2/Makefile.SLDex: Added Logging_Acceptor, - Logging_Event_Handler, and Logging_Handler to the files for this - service. Removed the TEMPINC trick for Visual Age C++ to keep the - templates from each compile around for the link stage where they're - needed. - - * examples/C++NPv2/Makefile.CLD: Added Logging_Handler to files. Remove - TEMPINC destruction from each compile. - - * examples/C++NPv2/Makefile.TPLS: Add Logging_Handler to files. Remove - TEMPINC destruction from each compile. - -Mon Dec 23 14:05:21 UTC 2002 Johnny Willemsen - - * ace/config-cygwin32-common.h: - When ACE_IOV_MAX is not defined, define it is 64. The Cygwin header - files define IOV_MAX as MAX_INT-1 and ACE_IOV_MAX is defined as - IOV_MAX by default. Allocating an array of this size on the stack - results in compile errors, so we define ACE_IOV_MAX to a smaller and - more realistic number. - -Mon Dec 23 12:16:33 UTC 2002 Johnny Willemsen - - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_Fragment.cpp: - Use ACE_IOV_MAX instead of IOV_MAX. - -Mon Dec 23 12:02:33 UTC 2002 Johnny Willemsen - - * bin/ace_ld: - Extended this perl script so that the location of the __ctordtor.o - can be passed as -o command line option. The location is dependent - on the $VDIR in the vxworks make files. - - * include/makeinclude/platform_vxworks5.x_diab.GNU: - * include/makeinclude/platform_vxworks5.x_g++.GNU: - When calling the ace_ld perl script, pass the $VDIR as command line option - -o to the script. - -Sun Dec 22 11:41:56 2002 Balachandran Natarajan - - * ace/Connector.cpp: Fixed fuzz errors. - -Sun Dec 22 11:37:44 2002 Balachandran Natarajan - - * THANKS: Added Daniel White to the hall of fame! - -Sun Dec 22 11:31:53 2002 Craig Rodrigues - - * apps/Gateway/Gateway/Makefile: - * apps/Gateway/Peer/Makefile: Add $(ACELIB) to $(ACE_SHLIBS) so - that -lACE is added to the linkline when a shared library is - built. Solves linking problem MacOS X. Thanks to John Zorko and - Daniel white for pointing this out. - -Sun Dec 22 10:25:35 2002 Balachandran Natarajan - - * ace/Connector.cpp: Fixed a warning with g++. - -Sun Dec 22 09:18:00 2002 Balachandran Natarajan - - * ace/Connector.cpp: - * ace/Connector.h: Added a lock to the ACE_Connector class to - make the following atomic - - . Registration of AST with the handler_map_ - . Registration of the ACE_Connector with the Reactor - . and the registration of timers with the Reactor's timer - queue. - - If they are not atomic, it throws open race conditions such as - the ones documented in BUG 1405. This is not complete fix for - BUG 1405, since it taxes applications using only one thread with a - lock. This is a short-term fix to prevent the race condition - from occuring. - - Other relevant changes include - - . the AST is now refcounted - . the AST cannot be deleted directly. The lifetime of the AST - can only be manipulated using the refcount on the AST. - -Sat Dec 21 18:27:42 2002 Steve Huston - - * ace/ace_dll.vcp: - * ace/ace_os_dll.vcp: - * ace/ace.vcw: eMbedded Visual C++ workspace/projects deleted. These - need to be generated from ace.mpc when needed. The make_release - script now generates them for each source kit. When needed on a - CVS workspace build, use mwc/mpc. The autobuild system has commands - generate_workspace and generate_makefile that accomplish this. - See autobuild configs in the riverace directory for examples. - - * tests/tests_WinCE.vcw: - * tests/ARGV_Test_WinCE.vcp: - * tests/Atomic_Op_Test_WinCE.vcp: - * tests/Auto_IncDec_Test_WinCE.vcp: - * tests/Barrier_Test_WinCE.vcp: - * tests/Basic_Types_Test_WinCE.vcp: - * tests/Bound_Ptr_Test_WinCE.vcp: - * tests/Buffer_Stream_Test_WinCE.vcp: - * tests/Cached_Accept_Conn_Test_WinCE.vcp: - * tests/Cached_Conn_Test_WinCE.vcp: - * tests/Cache_Map_Manager_Test_WinCE.vcp: - * tests/Capabilities_Test_WinCE.vcp: - * tests/CDR_Array_Test_WinCE.vcp: - * tests/CDR_File_Test_WinCE.vcp: - * tests/CDR_Test_WinCE.vcp: - * tests/Collection_Test_WinCE.vcp: - * tests/Conn_Test_WinCE.vcp: - * tests/DLList_Test_WinCE.vcp: - * tests/DLL_Test_DLL_WinCE.vcp: - * tests/DLL_Test_WinCE.vcp: - * tests/Dynamic_Priority_Test_WinCE.vcp: - * tests/Enum_Interfaces_Test_WinCE.vcp: - * tests/Future_Set_Test_WinCE.vcp: - * tests/Future_Test_WinCE.vcp: - * tests/Handle_Set_Test_WinCE.vcp: - * tests/Hash_Map_Bucket_Iterator_Test_WinCE.vcp: - * tests/Hash_Map_Manager_Test_WinCE.vcp: - * tests/High_Res_Timer_Test_WinCE.vcp: - * tests/Lazy_Map_Manager_Test_WinCE.vcp: - * tests/Logging_Strategy_Test_WinCE.vcp: - * tests/Log_Msg_Test_WinCE.vcp: - * tests/Malloc_Test_WinCE.vcp: - * tests/Map_Manager_Test_WinCE.vcp: - * tests/Map_Test_WinCE.vcp: - * tests/Max_Default_Port_Test_WinCE.vcp: - * tests/Mem_Map_Test_WinCE.vcp: - * tests/MEM_Stream_Test_WinCE.vcp: - * tests/Message_Block_Test_WinCE.vcp: - * tests/Message_Queue_Notifications_Test_WinCE.vcp: - * tests/Message_Queue_Test_Ex_WinCE.vcp: - * tests/Message_Queue_Test_WinCE.vcp: - * tests/MM_Shared_Memory_Test_WinCE.vcp: - * tests/MT_Reactor_Timer_Test_WinCE.vcp: - * tests/MT_Reactor_Upcall_Test_WinCE.vcp: - * tests/MT_SOCK_Test_WinCE.vcp: - * tests/Naming_Test_WinCE.vcp: - * tests/New_Fail_Test_WinCE.vcp: - * tests/Notify_Performance_Test_WinCE.vcp: - * tests/Object_Manager_Test_WinCE.vcp: - * tests/OrdMultiSet_Test_WinCE.vcp: - * tests/OS_Test_WinCE.vcp: - * tests/Priority_Buffer_Test_WinCE.vcp: - * tests/Priority_Reactor_Test_WinCE.vcp: - * tests/Priority_Task_Test_WinCE.vcp: - * tests/Process_Manager_Test_WinCE.vcp: - * tests/RB_Tree_Test_WinCE.vcp: - * tests/Reactors_Test_WinCE.vcp: - * tests/Reactor_Exceptions_Test_WinCE.vcp: - * tests/Reactor_Notify_Test_WinCE.vcp: - * tests/Reactor_Performance_Test_WinCE.vcp: - * tests/Reactor_Timer_Test_WinCE.vcp: - * tests/Reader_Writer_Test_WinCE.vcp: - * tests/Recursive_Mutex_Test_WinCE.vcp: - * tests/Refcounted_Auto_Ptr_Test_WinCE.vcp: - * tests/Reverse_Lock_Test_WinCE.vcp: - * tests/Semaphore_Test_WinCE.vcp: - * tests/Service_Config_DLL_WinCE.vcp: - * tests/Service_Config_Test_WinCE.vcp: - * tests/Sigset_Ops_Test_WinCE.vcp: - * tests/Simple_Message_Block_Test_WinCE.vcp: - * tests/SOCK_Connector_Test_WinCE.vcp: - * tests/SOCK_Send_Recv_Test_WinCE.vcp: - * tests/SOCK_Test_WinCE.vcp: - * tests/SPIPE_Test_WinCE.vcp: - * tests/SString_Test_WinCE.vcp: - * tests/Svc_Handler_Test_WinCE.vcp: - * tests/Task_Test_WinCE.vcp: - * tests/Thread_Manager_Test_WinCE.vcp: - * tests/Thread_Mutex_Test_WinCE.vcp: - * tests/Thread_Pool_Reactor_Resume_Test_WinCE.vcp: - * tests/Thread_Pool_Reactor_Test_WinCE.vcp: - * tests/Thread_Pool_Test_WinCE.vcp: - * tests/Timeprobe_Test_WinCE.vcp: - * tests/Timer_Queue_Test_WinCE.vcp: - * tests/Time_Service_Test_WinCE.vcp: - * tests/Time_Value_Test_WinCE.vcp: - * tests/Tokens_Test_WinCE.vcp: - * tests/TSS_Test_WinCE.vcp: - * tests/Upgradable_RW_Test_WinCE.vcp: eMbedded Visual C++ - workspace/projects deleted. These need to be generated from - tests.mpc when needed. The make_release script now generates - them for each source kit. When needed on a CVS workspace build, - use mwc/mpc. The autobuild system has commands - generate_workspace and generate_makefile that accomplish this. - See autobuild configs in the riverace directory for examples. - - * tests/tests.mpc: Added New_Fail_Test. - - * ace/config-WinCE.h: Add #define ACE_LACKS_ACE_IOSTREAM. If it has - ACE_LACKS_IOSTREAM_TOTALLY, it can't possibly do ACE_IOStream<>. - - * ace/ATM_Acceptor.{h cpp}: - * ace/ATM_Addr.{h cpp}: - * ace/ATM_Params.h: - * ace/ATM_QoS.h: - * ace/Dev_Poll_Reactor.cpp: - * ace/FlReactor.cpp: - * ace/POSIX_Proactor.cpp: - * ace/QtReactor.h: - * ace/SUN_Proactor.h: - * ace/TkReactor.h: Add /**/ between #include and filename to silence - MS warnings about missing files during dependency updates. - - * ace/OS.i: Fixed typo for ACE_HAS_WINCE. - - * ace/OS.{h cpp}: Enabled ACE_OS::mktime() for ACE_HAS_WINCE. To do - this, define struct tm similarly to the way it is in the standard - C library. When called, converts the struct tm to a SYSTEMTIME, - then to a FILETIME, then inserts that into an ACE_Time_Value and - pulls out the sec() value. - In OS.h, add the ACE_HAS_WINCE section for the ace_timezone() - function. - - * ace/Filecache.cpp (ACE_Filecache_Object::update): For ACE_HAS_WINCE, - return status to indicate every file has changed since cached. - There's probably a way to do this correctly on WinCE, but there's - no time to figure it out right now. - - * ace/Logging_Strategy.cpp: In calls to ACE_OS::fopen(), added - ACE_LIB_TEXT around naked char strings to build clean with Unicode. - - * ace/NT_Service.{h cpp}: Add ACE_HAS_WINCE to the platforms that - don't attempt to build this class. - - * ace/SPIPE_Connector.cpp (connect): Pretty much disabled this for CE. - - * bin/MakeProjectCreator/templates/em3vcp.mpd: When generating - CPU-based /D options, just do /D, not /D=1. If =1 is need - for something, add it to the .mpt file. - - * bin/MakeProjectCreator/templates/em3vcpdll.mpt: - * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt: - * bin/MakeProjectCreator/templates/em3vcplibexe.mpt: Remove /GX, /Gm, - /GR, /Gy, and /Md[d] options - embedded VC++ doesn't do these or the - previous near-working .vcp files didn't use them and no value is - seen in enabling something not previously used. - Insured that the options are consistent, for example, all Release - builds use /Ob2 (high level of inlining). - * bin/MakeProjectCreator/templates/em3vcplib.mpt: In addition to the - above removals, remove /G5 (optimize for Pentium) from Debug build. - -Sat Dec 21 12:38:41 2002 Steve Huston - - * ace/OS.cpp (snprintf): Win32 doesn't 0-terminate the string if - the maxlen is exceed, so terminate the string in that case. - -Sat Dec 21 14:36:43 UTC 2002 Johnny Willemsen - - * include/makeinclude/platform_cygwin32.GNU: - Enabled threads and removed the setting that only static libs are - build. Also set SONAME and SOVERSION to nothing because the - Cygwin linker can't handle a dll name where the version is added - after .dll. - -Fri Dec 20 20:02:41 2002 Steve Huston - - * bin/make_release: When updating version files, also update - bin/MakeProjectCreator/config/aceversion.mpb and taoversion.mpb. - Added a new subroutine, generate_makefiles() that's called just - before create_kit. It generates the workspace and project files - for ACE_wrappers/ace and ACE_wrappers/tests. If any of these are - desired for TAO, someone knowledgeable on TAO should add to the - place in generate_makefiles() for the TAO stuff. - -Fri Dec 20 16:12:33 2002 Johnny Willemsen - - * ace/ACE.h: - The math.h delived with the Cygwin32 compiler already defines - log2 as macro so added a define acelog2 as log2 to handle this - already defined macro. - -Thu Dec 19 18:47:29 2002 Steve Huston - - * tests/tests.mpc: Added Obstack_Test and Recursive_Condition_Test. - -Thu Dec 19 16:47:17 2002 Douglas C. Schmidt - - * ace/SOCK_Dgram.h: - ace/SOCK_CODgram.h: Added metatype information for - ACE_SOCK_Dgram and ACE_SOCK_CODgram. Thanks to Sankaranarayanan - K V for reporting this. - -Thu Dec 19 10:02:56 2002 Rich Seibel - - * tests/MM_Shared_Memory_Test.cpp - - removed extraneous line that made the test appear to fail - -Thu Dec 19 06:47:07 2002 Chad Elliott - - * bin/MakeProjectCreator/config/aceversion.mpb: - * bin/MakeProjectCreator/config/taoversion.mpb: - - Updated the version to reflect the current release version. - - * bin/MakeProjectCreator/modules/Driver.pm: - - Moved the Cwd::getcwd() outside the loop to avoid calling it - multiple times. - - * bin/MakeProjectCreator/templates/vc7.mpd: - - Modified the ProgramDatabaseFile to use the intermediate_dir as - the output location. Thanks to Steve Huston - for reporting it. - -Wed Dec 18 20:52:41 2002 Steve Huston - - * ace/SOCK_Dgram_Mcast.cpp (open_i): Call shared_open using the - protocol family from the specified address, not PF_INET. Allows - working with IPv6. - - * tests/Multicast_Test.cpp: If join fails, log the error reason. - -Wed Dec 18 19:57:51 2002 Steve Huston - - * ace/config-sunos5.7.h: Added ACE_HAS_SNPRINTF. I have verified - that it's available from Solaris 7 on. If someone can determine - it's available earlier, please move the definition to one of the - earlier-version config-sunos5.*.h files. - -Wed Dec 18 18:59:41 2002 Steve Huston - - * ace/ace.mpc: - * tests/tests.mpc: Back out the below changes... jumped the gun. - -Wed Dec 18 18:55:31 2002 Steve Huston - - * ace/ace.mpc: Added new Hash_Map_Manager_RT[_T].cpp files. - - * tests/tests.mpc: Added new Hash_Map_Manager_RT_Test.cpp project. - -Wed Dec 18 15:03:03 2002 Nanbor Wang - - * ace/Get_Opt.cpp (long_option): For MSVC 7.x compiler, we need to - make sure that the argument passed to "isalnum" is legal, i.e., - between 0 and 0xff, otherwise, it will crash the process. Added - a special case for MSVC 7.x and above to prevent this. - -Wed Dec 18 13:36:49 2002 Steve Huston - - * ace/ace.mwc: Workspace definition file for ACE and it's immediate - subordinates, RMCast. - - * tests/tests.mwc: Workspace definition for tests and tests/RMCast. - - * bin/MakeProjectCreator/modules/Driver.pm (run): When processing - specified input files, chdir to the directory containing the file - so the files are read and written properly when referred to using - relative paths. - -Wed Dec 18 11:38:39 2002 Nanbor Wang - - * ace/config-win32-msvc-7.h: Added pragma prefix to disable - warning of using Microsoft extension. - - * ace/Timeprobe.h: Removed MSVC specific disabling and re-enabling - of warning of using Microsoft entension. We already do this - through all the MSVC config files and there's no point of doing - this again here. - -Mon Dec 16 16:34:23 2002 Nanbor Wang - - * ace/OS.i: Applied the following patch from Eugene Alterman - . - - It appears that Win32 mmap() emulation implements MAP_FIXED - semantic under the wrong assumption about MapViewOfFileEx() - behavior. In fact if a non-null base address is supplied to - MapViewOfFileEx() it behaves like mmap() with MAP_FIXED set - it - maps at that address or fails if it unable to do it. If a null - base address is supplied it behaves like mmap() with MAP_FIXED - not set. - - This means that if MAP_FIXED is not set the emulation should set - the base address argument to 0, and it should fail if MAP_FIXED - is set and is 0. - - Besides, it makes sense for WinCE emulation to fail whenever - MAP_FIXED is set since WinCE does not support MAP_FIXED - semantic. - -Wed Dec 18 08:29:04 2002 Rich Seibel - - * ace/Synch.cpp: Added code to generate a unique name if a - platform lacks unnamed semaphores (MACOSX 10.2). - - * ace/Sock_Connect.cpp: Added a conditional include for - ifaddrs.h (MACOSX 10.2). - - * tests/Priority_Task_Test.cpp: Changed test to notify - if platform does not implement getprio instead of fail. - (MACOSX 10.2) - - * tests/MM_Shared_Memory_Test.cpp: Changed compile time test to - pick up the right implementation on platform that have - POSIX semaphores but not SYSV semaphores (MACOSX 10.2). - - * ace/Lib_Find.cpp - ace/config-macosx.h: - - Gave the builder a choice of where to get the dlcompat package. - - * ace/OS.i - ace/config-macosx.h: - - Added a switch to eliminate an error message since the dlcompat - provided APPLE dynamic linkage does not support unloading thus - complains on the use of dlclose. - -Wed Dec 18 08:29:04 2002 Rich Seibel - - * ace/Timer_Wheel_T.cpp: - - Changed types from int to long to match the return - for timer ids. - -Wed Dec 18 05:42:52 2002 Douglas C. Schmidt - - * ace/High_Res_Timer.cpp (global_scale_factor): The INTEL compiler - can also set the global scale factor. Thanks to Chris Kohlhoff - for reporting this. - -Tue Dec 17 11:22:31 2002 Phil Mesnier - - * ace/Codeset_IBM1047.h: - * ace/Codeset_IBM1047.cpp: - - Added implementations of ncs and tcs methods to return the proper - values as defined by the OSF's code and character set registry. - - * ace/CDR_Stream.cpp: - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - - Stripped out the reference counting on translator objects to avoid - build problems. - -Tue Dec 17 11:30:31 2002 Balachandran Natarajan - - * ACE-INSTALL.html: Fixed fuzz errors. - -Tue Dec 17 08:20:22 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - - Fixed a problem with generated Makefiles where CFG is defaulted. - - * bin/MakeProjectCreator/templates/nmake.mpd: - - Modified the dependencies file name. - -Tue Dec 17 07:03:40 2002 Chad Elliott - - * ace/Array_Base.h: - * ace/Atomic_Op_T.cpp: - * ace/Message_Queue.cpp: - * ace/OS.h: - - Added #include's for various files for the Green Hills compiler - for VxWorks. - - * ace/OS.cpp: - - Added a call to ::inet_aton() with a non-const char* for VxWorks. - - * ace/Thread_Adapter.cpp: - - Changed the pointer type from ACE_THR_FUNC_INTERNAL to - ACE_THR_FUNC. - - * ace/config-vxworks5.x.h: - - Added a #define for ACE_LACKS_CLEARERR for the Green Hills - compiler. - -Mon Dec 16 12:28:05 2002 Douglas C. Schmidt - - * ACE-INSTALL.html: Fixed some broken links. Thanks to - Jonathan Wackley for reporting this. - -Sat Dec 14 13:06:09 2002 Douglas C. Schmidt - - * docs/ACE-categories.html: Removed all mention of the - ACE_Multiplexor class. Thanks to Marc Tardif - for reporting this. - -Tue Dec 17 07:37:40 2002 Balachandran Natarajan - - * tests/README: Fixed typos. - -Mon Dec 16 23:31:25 2002 Balachandran Natarajan - - * THANKS: Added Guan Joe to the hall of fame. - -Mon Dec 16 18:11:03 2002 Balachandran Natarajan - - * ace/CDR_Stream.h: Moved the destructor of - ACE_Char_Codeset_Translator to be public. - -Mon Dec 16 13:14:34 2002 Phil Mesnier - - * ace/CDR_Stream.cpp: - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - Preparing for codeset negotiation. The ACE input/output CDR - streams' support for wide character IO is enhanced by adding a - flag to allow or disallow wchar i/o regardless of whether a - translator is present. There are times when wchar is not - allowed, such as GIOP 1.0, or when a native codeset for wchar - was not specified. In CORBA, a native wchar codeset must be - specified, it may not be defaulted. Within the ACE CDR streams, - wchar i/o is allowed by default, to ensure backwards - compatibility. - - I fixed a few of the reading and writing methods to ensure that - the good_bit_ flag is cleared if an error occurs. This was not - happening in all cases, leading to errors elsewhere. - - I have extended the definition of the - ACE_[W]Char_Codeset_Translator classes to make them reference - counted objects. There are some codesets that support shifting - and may be stateful. By using reference counting, the CDR - streams don't have to worry about ownership of stateful - translators. - - Finally, the translators now have pure virtual methods that - return the native and translated codeset ID values. These values - refer to entries in the DCE Code and Character Set Registry, - which is the reference for CORBA codeset ids. Anyone - implementing a char or wchar codeset will have to supply a - numeric value for the native codeset (ncs) and the translated - codeset (tcs). NCS refers to the codeset of the text on the - application side of the stream, and TCS refers to the codset of - the text on the "wire" side of the stream. - - These changes are not everything that is required to support - codeset negotiation, but it is all the changes required to the - CDR streams. - -Sat Dec 14 08:56:23 2002 Douglas C. Schmidt - - * ace/Timer_Queue_T.cpp (timeout): Commented out the change below - until we figure out how to break the dependencies on the - Reactor. Thanks to Bala for reporting this. - -Fri Dec 13 16:05:05 2002 Douglas C. Schmidt - - * ace/Timer_Queue_T.cpp (timeout): Optimize Steve's patch below - for the case where the upcall is coming from a reactor. Thanks - to Irfan for pointing this out. - -Fri Dec 13 21:12:29 2002 Steve Huston - - * ace/test_config.h: Add __hpux to the conditions needed to instantiate - ACE_Singleton::singleton_. Also see - Sat Nov 23 18:12:37 2002 Steve Huston - -Fri Dec 13 18:25:42 2002 Steve Huston - - * ace/config-aix-4.x.h: Set ACE_HAS_THREADS to 1 or 0 based on the - compiler's predefined macros. This lets users build easier without - having to worry about what ACE expects - they just have to invoke - the compiler correctly. Add #include "ace/config-posix.h" to pick - the detectable POSIX-ish settings. - - * ace/config-posix.h: If ACE_HAS_THREADS is defined as 0 on entry, - undef it and don't pick up the POSIX threads settings. Allows - single-threaded builds using this very handy config. - -Fri Dec 13 18:10:31 2002 Steve Huston - - * ace/OS.cpp (wchar snprintf, sprintf): Change the selection for - ability to use vswprintf from ACE_HAS_XPG4_MULTIBYTE_CHAR to - _XOPEN_SOURCE >= 500. vswprintf came in at XPG5 (and C99). - - * ace/config-hpux-11.00.h: Enable ACE_HAS_SNPRINTF if - _INCLUDE_HPUX_SOURCE is set after including stdsyms.h. - - * ace/config-posix.h: Set ACE_HAS_SNPRINTF if _XOPEN_SOURCE >= 500. - -Thu Dec 12 20:11:39 2002 Steve Huston - - * ace/Timer_Heap_T.cpp (cancel): Release the queue lock before - upcalling to handle_close. Fixed Bugzilla #1387. - -Thu Dec 12 12:50:34 2002 Douglas C. Schmidt - - * ace/OS.cpp: Changed a cast of unique_name to &unique_name to - fix a bug on pSoS. Thanks to Dieter Knueppel - for reporting this. - -Thu Dec 12 12:55:41 2002 Steve Huston - - * ace/OS.h: Add missing snprintf() method declaration for ACE_HAS_WCHAR - -Thu Dec 12 08:49:31 2002 Balachandran Natarajan - - * ace/Log_Msg.cpp: Fixed a warning in LynxOS builds. - -Thu Dec 12 06:18:02 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/Parser.pm: - - Fixed a bug with setting and retrieving the current working - directory. Thanks to Steve Huston for - reporting this. - -Thu Dec 12 00:01:37 2002 Balachandran Natarajan - - * netsvcs/clients/Naming/Client/Makefile: Fixed a small problem in - static builds. Hopefully they should be fine in the next round - of builds. - -Wed Dec 11 23:11:09 2002 Balachandran Natarajan - - * bin/clean_sems.sh: A shell script to remove - semaphores. Integrating the script that Ossama used to the - daily build system. - -Wed Dec 11 21:05:49 2002 Steve Huston - - * ace/Message_Block_T.cpp: - * examples/ASX/Message_Queue/priority_buffer.cpp: - * examples/Misc/test_read_buffer.cpp: - * examples/Threads/TSS_Obj.h: Added missing - #include "ace/Malloc_Base.h" to build clean on AIX, Visual Age C++ 6. - - * examples/C++NPv1/Logging_Client.cpp: - * examples/C++NPv2/Reactor_Logging_Server.cpp: - * examples/C++NPv2/Service_Reporter.cpp: - * examples/C++NPv2/SLD.cpp: - * examples/C++NPv2/SLDex.cpp: Add missing #include - "ace/Log_Msg.h" to pick up ACE_ERROR_RETURN for AIX Visual Age C++ 6. - - * examples/C++NPv2/Makefile.SLD: Remove the tempinc-bashing - redefinition of COMPILE.cc... that only works if there's a single - source file for each program. - -Wed Dec 11 19:33:19 2002 Steve Huston - - * ace/config-hpux-10.x-hpc++.h: - * ace/config-hpux-10.x.h: Picked up these changes from the 11.x config: - - Sat Nov 23 17:54:18 2002 Steve Huston - - * ace/config-hpux-11.00.h: Control the ACE_HAS_STANDARD_CPP_LIBRARY - and ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB settings by compiler- - defined macro _HP_NAMESPACE_STD, not passing them through from - platform_hpux_aCC.GNU. Similarly with ACE_HAS_EXCEPTIONS (define - it unless __HPACC_NOEH is set). This breaks a coupling from the - platform_hpux_aCC.GNU file, and will make autoconf easier as well - as making it easier for users to write makefiles without following - the ties through and trying to duplicate them. - Also, include config-posix.h to let it pick up system-supplied - settings. - - * ace/Time_Value.h: For HP-UX 10, need to typedef timespec_t because - the OS doesn't define it. - -Wed Dec 11 17:05:28 2002 Balachandran Natarajan - - * examples/Reactor/WFMO_Reactor/Talker.cpp: Fixed a warning in - Borland builds. - -Wed Dec 11 17:00:21 2002 Balachandran Natarajan - - * ace/WIN32_Asynch_IO.cpp: Fixed a warning in Borland builds. - -Tue Dec 10 19:42:29 2002 Steve Huston - - * ace/OS.{h cpp}: Added new method, ACE_OS::snprintf() that wraps - native snprintf() if available (ACE_HAS_SNPRINTF for char, - ACE_HAS_XPG4_MULTIBYTE or ACE_WIN32 for wide char); else returns - -1, ENOTSUP. - - * ace/config-linux-common.h: Add detection for ACE_HAS_SNPRINTF. - - * ace/config-win32-common.h: Removed #define ACE_HAS_VSWPRINTF. - vswprintf() on Windows is not the standard way, and this setting - was only used for Win32. See comments in OS.cpp, sprintf(wchar_t...) - for more info. Added ACE_HAS_SNPRINTF in its place. - - * ace/Log_Msg.cpp (log): Don't overrun the msg_ buffer while - building the logged message. Silently stops logging characters - when the limit is reached. - Also, on %a aborts, don't just do a "while (1);" on WinCE. - Forcing the user to cycle power is not a good idea. - - * tests/Log_Msg_Test.cpp: Add a test case for logging a string - that can't possibly fit in the logging buffers. - -Tue Dec 10 18:10:41 2002 Steve Huston - - * tests/Proactor_Test.cpp: Changed the default proactor type to - DEFAULT. If a specific proactor implementation type is desired, that - must be specified now. This matches ACE's behavior that users will - get unless they specifically change it. Also, changed loglevel to - be 0 (only highlights and errors), 1 (more progress information), - and 2 (all operation parameters and result information). The default - is 0, allowing for increased load on this test without creating - gigantic log files. All platforms now use the same test parameters - (clients, byte counts, threads, etc.) except that if the SUN - proactor is selected, the test will run with one thread regardless - of user selection. The ACE_SUN_Proactor's completion detector - (aiowait) is not multithread safe. - -Tue Dec 10 17:19:06 2002 Balachandran Natarajan - - * tests/OS_Test.cpp (ACE_TMAIN): Integrated the latest tests from - Alain for string_strsncpy_test (). The test is more robust and - tests things better. It also has comments on what it is testing - :-). - -Tue Dec 10 16:53:29 2002 Steve Huston - - * tests/OS_Test.cpp: Add missing '=' signs to fix compile error on - wide-char builds. - -Tue Dec 10 16:05:37 2002 Balachandran Natarajan - - * Makefile: Added a target 'reverseclean' - * bin/reverse_clean: Added a small perl script that does a - realclean in the reverse order on the directories passed to - it. - - The motivation for this is that some of our builds dont clean up - properly due to the dependencies. The reason for this is that - ace/ACE_COMPONENTS.list gets wiped out first, preventing things - that examine the components list (like netsvcs) from getting - cleaned. Hence we need to do a 'realclean' in reverse order of - the builds. - -Tue Dec 10 13:23:37 2002 Nanbor Wang - - * bin/PerlACE/Process.pm: - * bin/PerlACE/Process_Win32.pm: - * bin/PerlACE/Process_Unix.pm: Changed WAIT_DELAY_FACTORY from a - data member in Process_Win32 to a global data in - PerlACE::Process. You can now define an environment variable - "ACE_RUNTEST_DELAY" on both Win32 and UNIX to multiply the wait - time with the number. The same trick that I added last time - into Process_Win32 to invoke tests with purify should also work - with valgrind. - - * bin/PerlACE/Run_Test.pm (waitforfile): Changed to multiply the - wait time with the PerlACE::Process::WAIT_DELAY_FACTOR . - -Tue Dec 10 10:20:35 2002 Balachandran Natarajan - - * ace/Synch.cpp: Commented out the dump () call on ACE_cond_t, - which caused build errors from the checkin "Mon Dec 9 18:54:09 - 2002 Douglas C. Schmidt ". There is - no dump method on ACE_cond_t. - - Fixed the return type of the implementation to match the - declaration. - -Mon Dec 9 18:54:09 2002 Douglas C. Schmidt - - * ace/Synch.{h,cpp}: Added a dump() method to the template - specialization of ACE_Condition. - Thanks to Mathias Waack for reporting - this. - - * ace/Get_Opt.{h,i} Added a new argc() accessor. Thanks to - Volker Boerchers for contributing this. - -Mon Dec 9 17:58:31 2002 Steve Huston - - * tests/Multicast_Test.cpp: Added missing template instantiation for - Sun Workshop 5 compiler. - -Mon Dec 9 17:27:49 2002 Steve Huston - - * tests/Recursive_Condition_Test.cpp: In test_4, wait for the - waiter thread to wake up and exit itself before checking the - mutex recursion count. Else, the waiter may have the mutex while - the main thread is checking the count and detect a false fail. - -Mon Dec 9 17:02:41 2002 Steve Huston - - * include/makeinclude/platform_aix_ibm.GNU: Change from using - -qtemplateregistry to use -qtempinc for Visual Age C++ 6 template - handling. -qtemplateregistry is a nice idea, but generates too - many errors from missing templates. Using -qtempinc still generates - gobs of multiple-instantiation warnings, but the build is correct - and the tests run. - - * bin/aix_shr: Add the error number patterns for VA 6's multiple - template instantiation warnings to the filter-out pattern. - -Mon Dec 9 15:42:39 UTC 2002 Don Hinton - - * examples/C++NPv1/Reactive_Logging_Server_Ex.cpp: Removed - duplicate template specialization for ACE_Hash on - Windows that's no longer needed. - -Mon Dec 9 07:41:39 2002 Balachandran Natarajan - - * tests/OS_Test.cpp: - * ace/OS_String.cpp (strsncpy): Fixed a cut and paste error. - -Mon Dec 9 00:09:55 2002 Balachandran Natarajan - - * ace/INET_Addr.cpp (get_host_addr): Changed the usage of strncpy - () to strsncpy (). Thanks to Alain Decamps for donating this patch. - -Sun Dec 8 23:56:09 2002 Balachandran Natarajan - - * ace/OS_String.cpp: Applied patches from Alain Decamps to make - strsncpy () more robust. If dst == src, the return string will - have utmost 'maxlen'. - - * tests/OS_Test.cpp: Added a test case for strsncpy (). Thanks to - Alain Decamps for donating the patch. - -Sun Dec 08 22:44:07 2002 Balachandran Natarajan - - * ace/Functor.h (void *): - * ace/Functor.i: Added a template specialization for ACE_Hash . - -Sun Dec 08 09:45:34 UTC 2002 Johnny Willemsen - - * ace/Map_Manager.h: - * ace/SString.h: - * ace/Unbounded_Queue.h: - Improved doxygen documentation - -Sun Dec 08 09:37:12 UTC 2002 Johnny Willemsen - - * etc/*.doxygen: - Set JAVADOC_AUTOBRIEF to NO in all doxygen config files. When - only javadoc style documentation is used, only detailed documentation - is generated. - -Sun Dec 08 01:17:26 2002 Nanbor Wang - - * ace/Event_Handler.cpp: Fixed a typo. - -Thu Dec 5 20:30:56 2002 Douglas C. Schmidt - - * ace/Event_Handler.cpp: Updated the implementation of - ACE_Event_Handler::read_adapter() so that the code is consistent - with the stated semantics. Thanks to Ron Muck - for the fix. - - * ace/OS_Dirent.inl (readdir_r): Enhanced the - ACE_OS_Directn::readdir_r() wrapper facade so that it returns 1 - (i.e., "done") when an error occurs. Thanks to Abhay Kulkarni - for reporting this. - -Sat Dec 7 19:54:12 2002 Steve Huston - - * ace/OS.h: For WinCE, define S_IFDIR and S_IFREG file mode masks. - Also, added define for ENXIO if not supplied (like on WinCE). - -Sat Dec 07 14:29:47 2002 Nanbor Wang - - * ace/ACE.cpp (format_hexdump): This change fixed the problem that - a character is missing when the last line has less than 16 bytes - or less to display. Thanks to Terry Lao for - submitting the patch, and Johnny Willemsen - for reviewing the change. - -Fri Dec 6 23:58:47 2002 Balachandran Natarajan - - * ace/CDR_Stream.cpp: - * ace/CDR_Stream.i: Set good_bit_ to zero whenever the sanity - check for remaining length in the stream fails. Thanks to Jerry - D. De Master for pointing out the - problem. - - * ace/CDR_Array_Test.cpp: Extended the test to include test for - checking the value of good_bit () by forcing an erroneous read. - -Fri Dec 6 16:26:49 2002 Krishnakumar B - - * ace/FILE_Addr.cpp (set): Windows appends ASCII 'a' - 'z' and - 'A' - 'Z' to generate unique filenames and gives up if the - character in the template is a non-alphabetic character. In such - cases, it returns a NULL. Make sure that we supply a template - with a alphabetic character before XXXXXX as well as check for a - NULL return value. - -Thu Dec 5 22:19:41 2002 Steve Huston - - * ace/OS.{h i}: Added ACE_OS::sigwaitinfo() wrapper. - - * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Clean up some - spelling and formatting in documentation comments. Clean up the - signal calls, and substitue ACE_OS calls for naked API calls. - Unless we have specific evidence to the contrary, trust what the - OS says with signal information. Otherwise, if we run through - all the aiocbs on every signal, we could get into a situation - where deferred I/O operations are never restarted. - - * ace/POSIX_CB_Proactor.h: Changed the comments to say this is a - callback-based proactor, not an SGI IRIX one. The callback - paradigm is part of newer POSIXes and available on more than - SGI... HP-UX, for instance. - -Thu Dec 5 20:33:18 2002 Steve Huston - - * ace/config-aix-4.x.h: Removed ACE_NEEDS_DEV_IO_CONVERSION. This - seems like a ludicrous workaround to some old, buggy compiler. - -Thu Dec 5 14:35:50 2002 Balachandran Natarajan - - * netsvcs/clients/Naming/Client/Makefile: Do not build in static - builds. - -Thu Dec 5 09:45:25 2002 Douglas C. Schmidt - - * examples/Synch/proc_sema.cpp: Fixed some typos. Thanks to - Andy King for reporting this. - -Thu Dec 5 07:39:45 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Removed Bug_1020_Regression from the - nightly regression test on Win32. - -Thu Dec 5 09:58:45 UTC 2002 Don Hinton - - * ace/config-openbsd-pthread.h: Added - ACE_LACKS_PERFECT_MULTICAST_FILTERING 1. This should - fix the errors in the test/Multicast_Test in the - nightly autobuilds. - -Wed Dec 4 21:53:28 2002 Steve Huston - - * ace/OS.h: Include for __hpux platform. - * ace/OS.cpp (num_processors_online): Try the syscall for this - on HP-UX if __hpux is defined, not hpux (only set for g++). - -Wed Dec 4 21:18:31 2002 Steve Huston - - * ace/Proactor_Timer_Test.cpp: Fix incorrect use of pointer-integer - casting. Log pointers with %@, not %x. - -Wed Dec 4 21:11:41 2002 Steve Huston - - * tests/Proactor_Test.cpp: Set all the default options and values - before parsing command line options to make it easy to predictably - vary things by hand. Also, rather than run for a determined number - of seconds, run a specific number of bytes around the loop. This - limits the size of the log, especially nice for fast processors. - Thanks to Johnny Willemsen for this idea. - -Wed Dec 4 18:37:10 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added a Server_Connection_Purging to the - nightly regression tests. - -Wed Dec 4 17:47:49 2002 Steve Huston - - * tests/Proactor_Test.cpp: On Sender read complete, start another - read if either in full duplex mode OR writing has been stopped. - We want to catch the Receiver closing the socket (read 0 bytes). - -Wed Dec 4 11:41:15 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added a Bug_1020_Regression to the - nightly regression test on Win32. - -Tue Dec 3 20:47:39 2002 Steve Huston - - * ace/SSL/SSL_Context.cpp: Add explicit instantiation of - ACE_Singleton::singleton_. - * netsvcs/lib/Name_Handler.cpp: Add explicit instantiation of - ACE_Singleton::singleton_. - * netsvcs/lib/Server_Logging_Handler.cpp: Add explicit instantiation of - ACE_Server_Logging_Handler_T::request_count_; - * tests/Framework_Component_DLL.cpp: Add explicit instantiation of - ACE_DLL_Singleton_T, - ACE_SYNCH_MUTEX>::singleton_. - * tests/MEM_Stream_Test.cpp: Add explicit instantiation of - ACE_Singleton, - ACE_SYNCH_RECURSIVE_MUTEX>::singleton_. - * tests/Process_Strategy_Test.cpp: Add explicit instantiation of - ACE_Singleton::singleton_. - * tests/Timeprobe_Test.cpp: Add explicit instantiation of - ACE_Singleton::singleton_. - - These are similar to those done in: - Sat Nov 23 18:12:37 2002 Steve Huston - - * netsvcs/clients/Naming/Client/Makefile: - * netsvcs/clients/Naming/Dump_Restore/Makefile: Add ACELIB to LIBS - to include -lACE for building the shared libs. rules.lib.GNU - doesn't add VLDLIBS when linking a shared lib, but rules.bin.GNU - adds it for binaries. This should probably be changed, but it's a - quagmire to wade into at this point, and autoconf is coming. - This fix is needed now to get this stuff building with g++ on AIX. - -Mon Dec 2 20:09:29 2002 Steve Huston - - * examples/C++NPv1/Reactive_Logging_Server_Ex.cpp: - * ACEXML/common/Mem_Map_Stream.cpp: - * ACEXML/common/URL_Addr.cpp: - * ACEXML/common/XML_Codecs.cpp: Added missing explicit template - instantiations to build clean on Sun Workshop 5. - -Mon Dec 2 19:41:27 2002 Steve Huston - - * tests/Proactor_Test.cpp: Rather than close connections outright - when beginning to shut down test, just shut down the write side. - This is an effort to make the receiving closes cleaner. - -Mon Dec 2 17:58:06 2002 Balachandran Natarajan - - * ace/ACE.cpp: Fixed a compile error with g++. - -Sat Nov 30 09:18:51 2002 Douglas C. Schmidt - - * ace/ACE.{h,cpp}: Added a new crc32() method that works on - an iovec. Thanks to Tufan Oruk for contributing - this. - - * THANKS: Just added our 1,600 contributor to ACE+TAO! - -Mon Dec 02 18:59:33 UTC 2002 Johnny Willemsen - - * ace/DLL.h: - * ace/Dirent.h: - * ace/Future_Set.h: - * ace/UPIPE_Connector.h: - * ace/UPIPE_Acceptor.h: - * ace/UNIX_Addr.h: - * ace/Configuration_Import_Export.h: - Improved doxygen documentation. - -Mon Dec 02 18:47:32 UTC 2002 Johnny Willemsen - - * THANKS: Added Tim Smith - -Sun Dec 01 10:16:45 2002 Balachandran - - * ACE version 5.2.7 released. - -Sat Nov 30 22:46:00 2002 Balachandran Natarajan - - * THANKS: Added Christophe Vedel to the hall of fame. - -Fri Nov 29 12:23:14 2002 Nanbor Wang - - * ace/Thread_Manager.h (ACE_Thread_Manager): Changed all the - accessors to the Thread_Descriptor to be protected. - - * ace/Thread_Manager.i: Removed assertion test for null - Thread_Descriptor pointer. This can happen when calling - thread_desc_self() from a thread not spawned by the - Thread_Manager, e.g., the main thread. - - Added checks in all ACE_Thread_Manager::at_exit for null - thread_desc_self to avoid crash. - - Thanks to Mathias Waack for reporting - the bug. - -Thu Nov 28 06:36:04 2002 Douglas C. Schmidt - - * apps/soreduce/Makefile: Changed INSBIN from $ACE_ROOT/bin/soreduce/ - to $ACE_ROOT/bin/. Thanks to Jaroslaw Nozderko - for reporting this. - -Thu Nov 28 07:54:28 2002 Craig Rodrigues - - * docs/tutorials/022/Acceptor_Service.h: Add include of svc_export.h - to fix compilation errors. Thanks to Viktor Ransmayr - for reporting the problem. Not - sure whether this example would still compile fine. - -Thu Nov 28 09:04:12 UTC 2002 Johnny Willemsen - - * ace/FILE.h: - * ace/Default_Constants.h: - Improved usage of doxygen commands. - -Thu Nov 28 07:23:12 UTC 2002 Johnny Willemsen - - * ace/Typed_SV_Message_Queue.h: - * ace/Strategies_T.h: - * ace/Framework_Component.h: - Improved doxygen documentation. - - * ace/TLI_Connector.i: - Made method definition and implementation the same. - -Wed Nov 27 22:38:15 2002 Balachandran Natarajan - - * ace/Connector.h: - * ace/Connector.cpp: Fix for BUG 1361. Please see - http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1361 for - more details on the problem. - - The fix is based on the assumption that ACE_Connector need not - be resumed by the TP_Reactor when used for asynch connects. - The supporting reason for this assumption is that during - connection completion or connection closure, the handler - ie. the ACE_Connector in this case is removed from the - Reactor. Hence this fix, which essentially implements the - virtual function resume_handler () and prevents itself from - being resumed. Thaks to Irfan for reviewing the fix. - -Wed Nov 27 20:35:49 2002 Steve Huston - - * include/makeinclude/platform_aix_ibm.GNU: Add Visual Age C++ 6 to - the list of compiler versions it knows about. For VA 6, use the - new -qtemplateregistry build option to try to be more efficient - about template compilation. It's still lamer than most though, and - Visual Age C++ 6 needs the aixshr filter to weed out the Duplicate - Symbol warnings. - - * include/makeinclude/rules.local.GNU: Add templateregistry to the - files/directories removed on clean. It's used by Visual Age C++ 6. - -Wed Nov 27 19:42:51 2002 Steve Huston - - * tests/MT_Reactor_Upcall_Test.cpp: Send and receive each message - field specifically; don't rely on the type and size fields being - adjacent in memory. On 64-bit Solaris w/ Forte 7 and on 64-bit - Windows XP, they aren't. - -Wed Nov 27 15:47:41 2002 Steve Huston - - * ace/config-aix5.1.h: Add #define ACE_HAS_AIO_CALLS, but commented - out. AIX did things differently enough here to be a real problem. - It should be possible to get AIO working on AIX 5, but it will - take some real work. - - * ace/POSIX_Proactor.cpp: Add #include "ace/ACE.h" - - * ace/Sock_Connect.cpp: Visual Age C++ 6 still needs to hack to - get the templates built correctly :-( Changed the compile-time check - to an alleged Visual Age C++ 7 to see if they get it right then. - - * ACEXML/common/Env.i: Add missing #include "ace/Log_Msg.h" to pick - up ACE_ASSERT. - - * ACEXML/common/FileCharStream.cpp: - * ACEXML/common/StrCharStream.cpp: Add missing #include "ace/Log_Msg.h" - - * ACEXML/common/NamespaceSupport.h: - * ACEXML/parser/parser/Entity_Manager.h: Add missing #include - "ace/Synch.h" - -Wed Nov 27 07:23:30 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Two new tests cannot run in single - threaded builds. - -Wed Nov 27 09:30:33 UTC 2002 Johnny Willemsen - - * ace/DLL.h: - * ace/Singleton.h: - Improved doxygen documentation. - -Tue Nov 26 20:04:38 2002 Steve Huston - - * tests/Proactor_Test.cpp: Added checks for condition where a read or - write fails to initiate because the socket was closed. For Windows, - this is a ERROR_NETNAME_DELETED error on the ReadFile/WriteFile call - under ACE_WIN32_Asynch_Read/Write_Stream. The test now checks for - this and doesn't report an error, but this is a departure from - what one would expect from a socket. It might be better if the - underlying call was changed to WSARecv/WSASend for Winsock2-enabled - systems. - -Tue Nov 26 16:08:22 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added two new tests to our daily builds. - -Tue Nov 26 15:10:57 2002 Balachandran Natarajan - - * ACE-INSTALL.html: Updated the file to have the right GNU make - version. Our make's dont work well with 3.78 and lower. - -Mon Nov 25 23:49:38 2002 Craig Rodrigues - - * ace/config-macosx.h: Updates for pthread configuration, provided - by John Zorko and Rich Seibel - . - - * ace/OS.i: - * ace/Sock_Connect.cpp: Remove unnecessary __MACOSX__ macros. - See: Thu Oct 17 19:18:02 UTC 2002 Craig Rodrigues - - -Mon Nov 25 18:20:41 2002 Steve Huston - - * ace/config-hpux-11.00.h: Added #define ACE_SIZEOF_WCHAR _WCHAR_T - to get ACEXML to compile. ACEXML's usage of ACE_SIZEOF_WCHAR breaks - the previous allowance for ACE_SIZEOF_WCHAR to be sizeof (wchar_t) - because it uses ACE_SIZEOF_WCHAR in a math expression. - - * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp: Added - #include "ace/INET_Addr.h" to build clean on HP-UX. - -Mon Nov 25 20:32:02 UTC 2002 Don Hinton - - * ace/README: Added ACE_LACKS_PERFECT_MULTICAST_FILTERING. - -Mon Nov 25 18:58:33 2002 Johnny Willemsen - - * ace/Local_Name_Space_T.cpp: - * ace/Process.h: - * ace/Local_Name_Space_T.h: - * ace/ATM_Params.h: - * ace/Timer_Queue_Adapters.h: - Improved documentation for doxygen generation. - - * ace/Svc_Handler.cpp: - Made method definition and implementation arguments match. - -Sat Nov 23 20:01:36 2002 Balachandran Natarajan - - * apps/*/Makefile: Updated dependecies. Thanks to Erwin Rol for - pointing out the problem. - -Sat Nov 23 18:12:37 2002 Steve Huston - - * ace/SString.cpp: Add explicit instantiation of - ACE_String_Base::NULL_String_ and - ACE_String_Base::NULL_String. - * ace/Based_Pointer_Repository.cpp: Add explicit instantiation of - ACE_Singleton:: - singleton_. - * ace/Dynamic.cpp: Add explicit instantiation of - ACE_TSS_Singleton::singleton_. - * tests/test_config.h: Added explicit instantiation of - ACE_Singleton::singleton_. - - The above are only done when using automatic template instantiation - on AIX with g++. Without this, the compiler and linker don't get - things done right and static data members in templates don't get - instantiated correctly. Thanks to Max F. Bilyk - for reporting this problem. - - * ace/SSL/Makefile: Set LIBS = $(ACELIB). Else it won't link on - AIX, g++. - - * include/makeinclude/platform_aix4_g++.GNU: Removed. Use - platform_aix_g++.GNU instead. They were similar, though not equal, - and confusing each other. - - * include/makeinclude/platform_aix_g++.GNU: Fixed to work correctly - and is now the one to use for AIX 4 and 5 with g++. - -Sat Nov 23 18:03:41 2002 Steve Huston - - * ace/String_Base.i (compare): Fix a size_t/int mismatch. - -Sat Nov 23 17:54:18 2002 Steve Huston - - * ace/POSIX_CB_Proactor.{h cpp}: Changes to align with recent - ACE_POSIX_AIOCB_Proactor changes: changed handle_events (ulong) to - handle_events_i() and made nonvirtual. Removed get_result_status(), - cancel_aiocb(), and cancel_aio() since they simply forwarded to - ACE_POSIX_AIOCB_Proactor. Remove most of allocate_aio_slot(); call - up to ACE_POSIX_AIOCB_Proactor::allocate_aio_slot then tweak the - aiocb fields for the callback. - - * ace/config-hpux-11.00.h: Control the ACE_HAS_STANDARD_CPP_LIBRARY - and ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB settings by compiler- - defined macro _HP_NAMESPACE_STD, not passing them through from - platform_hpux_aCC.GNU. Similarly with ACE_HAS_EXCEPTIONS (define - it unless __HPACC_NOEH is set). This breaks a coupling from the - platform_hpux_aCC.GNU file, and will make autoconf easier as well - as making it easier for users to write makefiles without following - the ties through and trying to duplicate them. - Also, include config-posix.h to let it pick up system-supplied - settings. - - * ace/OS_Memory.h: In the HP aCC section, remove the checks for - aCC version > 32500 and _HP_NAMESPACE_STD... just use the - ACE_HAS_STANDARD_CPP_LIBRARY setting from config-hpux-11.00.h. - - * ace/Proactor.cpp (ctor): When no implementation is supplied, be - sure to make one up, even w/o presence of realtime signals. - - * include/makeinclude/platform_hpux_aCC.GNU: If stdcpplib is not - specified by user, set it to 1 always, unless the compiler is - a .2x version and not .27 (03.27 (01.27 on 10.20) is the first - version that can do -AA); makes it unnecessary to update this every - time HP releases a new compiler version. Also rearranged the - thread-related compiler option settings to be simpler and easier - to match with what the documentation says to set. Removed the - ACE_HAS_STANDARD_CPP_LIBRARY settings; they're defined in - ace/config-hpux-11.00.h when proper (see above). - Also, added +W930 to CCLFAGS when -AA to stop a spurious warning - about placement operator delete on aC++ 03.37, 03.39. - -Sat Nov 23 17:43:29 2002 Steve Huston - - * ace/ACE.cpp (send_n): Properly update byte count for each message - block in the chain to send. Thanks to Venkita Subramonian - for reporting this and sending a fix. - -Sat Nov 23 16:55:39 2002 Steve Huston - - * tests/MEM_Stream_Test.cpp: - * tests/Notify_Performance_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Process_Manager_Test.cpp: - * tests/Reactor_Performance_Test.cpp: Replaced calls to the - deprecated ACE_Reactor::run_event_loop() and end_event_loop() - with run_reactor_event_loop() and end_reactor_event_loop(). - - * tests/Proactor_Test.cpp: Add missing \n in an ACE_DEBUG message. - -Sat Nov 23 00:16:59 2002 Craig Rodrigues - - * ace/config-posix.h: Define ACE_HAS_PTHREADS_STD - if platform defines _POSIX_THREADS. - -Fri Nov 22 13:48:39 2002 Nanbor Wang - - * ace/Containers_T.cpp (init_head): Broke up the cascading pointer - assignments to avoid a problem when using position independent - pointer. Thanks to Eugene Alterman for - reporting this. - - * ace/Svc_Conf.l: - * ace/Svc_Conf_l.cpp: Changed to always remove the matching quote - character (' or ") instead of first search for double quote, - then single quote. Thanks to Johnny Willemsen - for sumitting the patch. - -Fri Nov 22 04:52:16 2002 Bala - - * ACE version 5.2.6 released. - -Tue Nov 19 22:36:38 2002 Ossama Othman - - * ace/Time_Value.h (sec, usec, msec): - - Documentation updates/clarifications. - - * ace/Time_Value.cpp (operator++, operator--): - - Fixed postfix increment and decrement operators. Previously - they had the same implementation as their prefix increment and - decrement operator counterparts. A copy of the ACE_Time_Value - is now done prior to in/decrementing it via the corresponding - prefix operator. That copy is returned. A copy is only - performed for the postfix case. - -Tue Nov 19 18:14:10 2002 Pradeep Gore - - * bin/auto_run_tests.lst: - Modified Notify configurations. - - * bin/auto_run_tests.pl: - Checkin on behalf of Irfan - Changed logic so that it checks for - the existence of the executable and not of the parameters passed - to the executable. - -Tue Nov 19 07:09:15 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Tests not runnable in minimum - configuration were being run. Hence prevented them from - running. - -Mon Nov 18 20:49:33 2002 Nanbor Wang - - * examples/IPC_SAP/FILE_SAP/client.cpp (ACE_TMAIN): Changed to use - predefined ACE_DEFAULT_FILE_PERMS instead of the non-portable 0666. - -Mon Nov 18 12:27:46 2002 Balachandran Natarajan - - * ace/Dev_Poll_Reactor.cpp (handler): - * ace/WFMO_Reactor.i (handler): - * ace/Select_Reactor_Base_T.cpp (handler_i): The methods that - returns a signal handler associated with a certain type of - signal, does restrictive sanity checks. One of the checks that - it performs is to see whether a pointer to an event_handler is 0 - just before assigning a new event handler pointer. This check - was not required at all and hence it is now removed. Thanks to - Edan Ayal for reporting this. - -Sat Nov 16 09:38:38 2002 Balachandran Natarajan - - * ace/*/Makefile: - * tests/Makefile: - * examples/*/Makefile: - * performance-tests/*/Makefile: - * ACEXML/*/Makefile: Updated dependencies. - -Fri Nov 15 20:33:02 UTC 2002 Don Hinton - - * ace/SOCK_Dgram_Mcast.h: - * ace/config-all.h: Added new macro for platforms that don't yet - implement the new IGMPv3, perfect multicast filtering, and - replaced the #ifdef linux in the ACE_SOCK_Dgram_Mcast::ctor - with the new macro, since this isn't just a linux thing. - - * ace/config-aix-4.x.h: - * ace/config-freebsd.h: - * ace/config-linux-common.h: - * ace/config-netbsd.h: - * ace/config-openbsd.h: - Defined ACE_LACKS_PERFECT_MULTICAST_FILTERING for these platforms. - - * ace/SOCK_Dgram_Mcast.cpp (open_i): Removed redundant call to - ACE_SOCK::set_option() to set SO_REUSEADDR, since it's set in - the call to ACE_SOCK::open(). This fixes [bug 1111]. - - * tests/Multicast_Test.cpp: Enhanced test by adding new options - control the wait time when running test as a CONSUMER only, - and contol the TTL so the test could be used over routers. - Also cleaned up the code a bit to make it more readable. Thanks - to Bill Fulton for motivating these enhancements. - -Fri Nov 15 14:16:10 2002 Nanbor Wang - - * ace/Thread_Exit.h: - * ace/Thread_Exit.cpp (cleanup): Changed the type of the argument - takes to the generic (void*) and avoid including - in Thread_Exit.h. This eliminated the circular header - dependencies when ACE_LEGACY_MODE is define. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Removed some template files from the build - lists and make sure all template files are not being built. - -Fri Nov 15 13:22:41 2002 Steve Huston - - * tests/Proactor_Test.cpp: On Win32, check for canceled I/O using - ERROR_OPERATION_ABORTED instead of ECANCELED. - -Fri Nov 15 16:51:11 UTC 2002 Craig Rodrigues - - * ace/POSIX_CB_Proactor.h: - * ace/POSIX_CB_Proactor.cpp: - Do not build on Lynx. - -Fri Nov 15 14:14:39 UTC 2002 Craig Rodrigues - - * ace/POSIX_CB_Proactor.h: - * ace/POSIX_CB_Proactor.cpp: - Do not build on Sun. - -Fri Nov 15 14:08:11 UTC 2002 Craig Rodrigues - - * include/makeinclude/platform_linux.GNU: - Linux glibc has aio_ and pthread_ calls in librt.so. - Add fix so that librt.so is linked in if threads=0. - -Fri Nov 15 07:48:37 2002 Balachandran Natarajan - - * tests/OS_Test.cpp: Added the test cases for itoa from - Joseph Sarbak . - -Fri Nov 15 07:08:46 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Fixed a few minor problems that showed - up in the daily builds. - -Thu Nov 14 22:08:49 2002 Steve Huston - - * tests/Proactor_Test.cpp: Make this test behave better: - - At the end of running time, close all the Senders. This should - cancel all the Sender outstanding operations and trip all the - Receivers into finishing their receives and closing themselves. - - Change the default Sender/Receiver count from 20 to 10. This - shrinks the log a bit without sacrificing test quality. - - Change the "inferior platforms" default Sender/Receiver count - from 1 to 3. With Proactor improvements made so far, let's give - these platforms some more exercise and see what happens. - -Thu Nov 14 23:10:32 UTC 2002 Craig Rodrigues - - * ace/POSIX_CB_Proactor.cpp: - * ace/POSIX_CB_Proactor.h: - * ace/POSIX_CB_Proactor.i: - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Proactor.h: - * ace/POSIX_Proactor.i: - * ace/Proactor.cpp: - * tests/Proactor_Test.cpp: - Fixed Proactor so that on platforms that support POSIX IO, - but not POSIX RT signals, it will compile. Use the new - ACE_HAS_POSIX_REALTIME_SIGNALS macro. - -Thu Nov 14 22:47:45 UTC 2002 Craig Rodrigues - - * include/makeinclude/platform_freebsd.GNU: Merged with the - pthread version of this file. To compile without threads, - set, do make threads=0, or set threads=0 in this file. - * include/makeinclude/platform_freebsd_pthread.GNU: Removed. - * ace/config-freebsd.h: Merge with pthread version of this file. - * ace/config-freebsd-pthread.h: Removed. - * ace/OS.h: Use new ACE_HAS_POSIX_REALTIME_SIGNALS macro for - POSIX RT signals stuff, instead of ACE_HAS_AIO_CALLS. - FreeBSD has POSIX AIO, but not POSIX RT signals. - * ace/config-sunos5.6.h: Define ACE_HAS_POSIX_REALTIME_SIGNALS, - ACE_HAS_POSIX_MESSAGE_PASSING. - * ace/config-linux-common.h: Define ACE_HAS_POSIX_REALTIME_SIGNALS, - ACE_HAS_AIO_CALLS. - -Thu Nov 14 16:19:57 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added two tests, Bug_1269_Regression and - Bug_1270_Regression into the daily regression suite. They will - not run on Win32. - -Thu Nov 14 13:35:44 2002 Nanbor Wang - - * ace/Containers_T.cpp: Changed to deallocate internal nodes in - ACE_Double_Linked_List with the allocator. Thanks to Eugene - Alterman for reporting the problem. - -Thu Nov 14 10:57:47 2002 Carlos O'Ryan - - * ace/OS.h (ace_timezone): - - Fixed broken implementation for Linux. Call tzset() and then - return the global "timezone" variable instead. [Bug 1359] - -Thu Nov 14 12:19:51 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - - Modify the way projects are created on windows. If using - cygwin perl then use \n instead of \r\n. - - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: - - Sort the list of projects to make the generated solution file more - similar to actual solution files. - -Thu Nov 14 06:16:51 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/Parser.pm: - - Take into account relative directories in the cd() method. - The original optimization overlooked this. - -Thu Nov 14 06:59:12 UTC 2002 Johnny Willemsen - - * ace/Date_Time.{h,i}: - Added update() method with which it is possible to set the values - in ACE_Date_Time based on a passed ACE_Time_Value. - - * ace/Time_Request_Reply.{h,cpp}: - Made the argument of the timeout method const&. Updated doxygen - documentation and marked init() as deprecated because it is a no-op. - -Wed Nov 13 18:28:39 2002 Steve Huston - - * tests/FIFO_Test.cpp: Changed to both clarify the usage of - ACE_FIFO_(Send|Recv)_Msg with and without ACE_HAS_STREAM_PIPES - and test that usage. - -Wed Nov 13 17:39:41 2002 Steve Huston - - * ace/POSIX_Proactor.{h cpp}: - * ace/SUN_Proactor.{h cpp}: Leave two handle_events() methods - available; one with a timeout, one without. Each proactor's - implementations calls an internal handle_events_i() method - that does the right thing. - (start_aio): This is a virtual method used to start an asynch I/O - request from outside the proactor (such as from an asynch read - stream). When the actual operation is to start, start_aio calls - start_aio_i(), implemented differently for the different proactors. - Similar arrangement for cancel_aio(). - - * tests/Proactor_Test.cpp: Cancel all outstanding operations before - trying to abruptly stop everything. - -Wed Nov 13 17:29:31 2002 Steve Huston - - * ace/WIN32_Asynch_IO.h (cancel_uncompleted): Filled in - description of the 'set' parameter. Thanks to Craig - Rodrigues for noticing its omission. - -Wed Nov 13 16:52:04 UTC 2002 Craig Rodrigues - - * ace/Lib_Find.cpp (ldname): MacOS X prepends an underscore to - symbols in shared libaries. - - * ace/config-macosx.h: - * include/makeinclude/platform_macosx.GNU: - - - add support for dlcompat, a third party package which provides - dlopen(), dlsym(), dlcose() functions - - - Define ACE_LD_SEARCH_PATH to DYLD_LIBRARY_PATH and - ACE_LD_SUFFIX to .dylib - -Tue Nov 12 14:12:59 2002 Balachandran Natarajan - - This is a hackish fix for BUG 1361. Please see - http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1361 - for details of this problem - - * ace/TP_Reactor.cpp (handle_socket_events): A hack to prevent - BUG 1361 from surfacing for applications like TAO, using the - TP_Reactor. This fix basically ensures that resume_i () is - not called naively. - - * ace/Event_Handler.h: Added a enum type which could be could be - used by the TP_Reactor. - -Tue Nov 12 11:53:29 2002 Steve Huston - - * tests/run_test.lst: Change FIFO_Test from !MSVC to !Win32 to - prevent it from running with Borland on Windows. Thanks to - Johnny Willemsen for pointing this out. - -Tue Nov 12 14:11:33 UTC 2002 Johnny Willemsen - - * ace/Time_Value.h: - Doxygen documentation improvements. - -Tue Nov 12 13:15:12 UTC 2002 Johnny Willemsen - - * ace/Message_Queue_T.h: - Doxygen documentation improvements. - -Mon Nov 11 20:37:18 2002 Ossama Othman - - * bin/auto_run_tests.lst: - - Added Jai's application-controlled membership load balancing - test to the list of regression tests to be run. - -Mon Nov 11 17:57:12 2002 Ossama Othman - - * bin/auto_run_tests.lst: - - Added Carlos' new PortableInterceptor AMI test to the list of - regression tests to be run. - -Mon Nov 11 16:17:59 2002 Nanbor Wang - - * bin/MakeProjectCreator/modules/TemplateParser.pm (relative): - Changed to invoke slash_to_backslash from $self. The original - code only runs on some specific version of perl. - -Mon Nov 11 13:35:53 2002 Douglas C. Schmidt - - * ace/Hash_Map_Manager_T.h: Updated - comments on the class ACE_Hash_Map_Bucket_Iterator. Thanks to - Kitty and Irfan for helping with this. - -Mon Nov 11 12:52:41 2002 Steve Huston - - * docs/ACE-subsets.html: Added the Timer component to the list of - buildable pieces. Thanks to Jason Pasion - for reporting this problem. - - * THANKS: Added Jason Pasion to the Hall of Fame. - -Mon Nov 11 12:39:18 2002 Steve Huston - - * ace/FIFO_Send_Msg.cpp (send): When setting iovec length, - static_cast the int length to size_t; the target is not an - int (as the strbuf length is). When returning the sent byte - count, don't include any additional bytes added internally - for record framing. - - * tests/FIFO_Test.cpp: New test to exercise basic and overflow - message-based FIFO I/O. - - * tests/Makefile: - * tests/run_test.lst: Added FIFO_Test. Disabled on MSVC builds - since Windows doesn't have FIFOs. - -Mon Nov 11 09:58:13 2002 Douglas C. Schmidt - - * ace/CDR_Stream.{i,cpp} Add casts to ACE_CDR::Octet and - ACE_CDR::Boolean to prevent warnings when run with MSVC++ level - 4 warnings. Thanks to Lukas Gruetzmacher - for motivating this fix. - - * ace/OS_String.cpp (itoa_emulation): Updated the code so that it'll - work correctly with negative numbers. Thanks to Joseph Sarbak - for reporting this and providing a fix. - -Sun Nov 10 19:38:45 2002 Balachandran Natarajan - - * ace/Message_Block.cpp(copy): The copy () methods were copying - data till the end_ pointer. This is a wrong assumption, - especially in places where the alloted bytes are less than the - allocated bytes. Now we use the space () method to find out the - amount of space available in the data block for copying. Thanks - to Edan Ayal for finding this and providing a patch. - - * ace/Simple_Message_Block_Test.cpp: Added a test which tests - copying in a case where the alloted space is less than the - allocated space. Thanks to Edan Ayal for this test case. - -Sat Nov 9 12:37:54 2002 Douglas C. Schmidt - - * docs/ACE-guidelines.html: Updated the ACE guidelines to - refer to the correct Doxygen links. Thanks to - Johnny Willemsen for reporting this. - -Sat Nov 9 21:48:31 2002 Steve Huston - - * tests/Proactor_Test.cpp: When disabling Nagle's, use IPPROTO_TCP, - not SOL_SOCKET, for the setsockopt level. Fixes set_option errors - in this test log. - -Sat Nov 9 18:49:11 2002 Steve Huston - - * ace/POSIX_Proactor.{h cpp i} (create_asynch_read_stream, - create_asynch_write_stream, create_asynch_read_dgram, - create_asynch_write_dgram, create_asynch_read_file, - create_asynch_write_file, create_asynch_accept, - create_asynch_connect, create_asynch_transmit_file): - Refactored all the factory creation methods from - ACE_POSIX_AIOCB_Proactor to ACE_POSIX_Proactor. - Moved the pseudo task from ACE_POSIX_AIOCB_Proactor to - ACE_POSIX_Proactor as well. - - (handle_events, cancel_aio): - Added these methods to ACE_POSIX_Proactor as pure virtual, - forcing their definition in the specific implementations. - - (start_aio): This is now a pure virtual function that all - more specific proactors need to implement. The old start_aio() - is now start_aio_i(). What used to be ACE_POSIX_AIOCB_Proactor:: - register_and_start_aio() is now ACE_POSIX_AIOCB_Proactor::start_aio. - Which type of I/O to start is now defined by an enum Opcode - that's passed to start_aio(). - - * ace/POSIX_Asynch_IO.{h cpp} (ACE_POSIX_Asynch_Operation): - Replace references to ACE_POSIX_AIOCB_Proactor with - ACE_POSIX_Proactor. Refactoring things out of specific proactor - types. - (ACE_POSIX_Asynch_Read_Stream, ACE_POSIX_Write_Stream, - ACE_POSIX_Asynch_Read_File, ACE_POSIX_Asynch_Write_File, - ACE_POSIX_Asynch_Accept, ACE_POSIX_Asynch_Connect, - ACE_POSIX_Asynch_Transmit_File, ACE_POSIX_Asynch_Transmit_Handler, - ACE_POSIX_Asynch_Read_Dgram, ACE_POSIX_Asynch_Write_Dgram): - Replace args of type ACE_POSIX_AIOCB_Proactor with - ACE_POSIX_Proactor. Matches POSIX_Proactor.* changes above. - Removed all the methods that said they were only there to kill - dominance warnings. These are not needed. - - These things all simplify the proactor framework code. Thanks to - Alex Libman for these ideas. - -Sat Nov 9 13:16:50 2002 Balachandran Natarajan - - * THANKS: Added Simon McQueen to the hall of fame. - -Fri Nov 8 13:04:10 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Fixed a bug in MPC where the idl file name could cause - an error on Windows if it had a slash in it. It would be - converted to a back slash and then interpreted inside a - regular expression which would cause MPC to abort. - -Fri Nov 8 13:00:56 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm: - * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/EM3ProjectCreator.pm: - * bin/MakeProjectCreator/modules/EM3WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GHSProjectCreator.pm: - * bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GNUProjectCreator.pm: - * bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GUID.pm: - * bin/MakeProjectCreator/modules/NMakeProjectCreator.pm: - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateInputReader.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/modules/VA4ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VA4WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC6ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC7ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Performed various optimization which dramatically decreased the - amount of time to generate projects for the entire ACE tree. In - tests, the time went from 2 minutes to 1 minute. - -Fri Nov 8 12:57:57 2002 Chad Elliott - - * bin/MakeProjectCreator/README: - - Added documentation for the new verbatim keyword. - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - Added functionality to place test verbatim into a generated - project file. - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Added verbatim markers top, macros, local and bottom. - -Fri Nov 8 12:52:16 2002 Chad Elliott - - * bin/MakeProjectCreator/README: - - Added documentation about the new idlgendir keyword. - - * bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: - - Modified flag_overrides to work with both idlflags and idlgendir. - - * bin/MakeProjectCreator/templates/bor.mpd: - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/gnu.mpd: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Modified all templates that deal with idl files to utilize the - idlgendir keyword. - -Fri Nov 8 04:03:29 UTC 2002 Don Hinton - - * tests/Multicast_Test.cpp: Cleaned up error messages and - error handling and insure that errors are returned. Added - 2 second timeout to call to ACE_Thread_Manager::wait() so - that lost messages won't cause test to hang. - -Wed Nov 6 18:55:22 2002 Steve Huston - - * ace/OS.{h i} (recursive_mutex_cond_unlock, - recursive_mutex_cond_relock): For Windows, don't try to save/restore - CRITICAL_SECTION members individually - there are undocumented - details at work there. Instead, release and acquire the mutex - one fewer times than the recursion count, letting Windows take - care of its internals. Fixes the hung Recursive_Condition_Test on - Windows. This also neatly removes the WinCE conditional code in - this area. - - * tests/Recursive_Condition_Test.cpp: Fix a const error that gcc - pointed out. - -Wed Nov 6 11:12:28 2002 Steve Huston - - * tests/Recursive_Condition_Test.cpp: Replaced ACE_TRACE with - ACE_DEBUG so the log gets all the info. Re-enabled the timer queue - part of the test and added a check to be sure "enough" expirations - are recorded. Added a piece of data protected by the mutex/condition - to be sure threads aren't released too early. - -Tue Nov 5 21:54:40 2002 Balachandran Natarajan - - * tests/run_tests.lst: - * tests/run_tests_remote.lst: Removed these files, since they - served no purpose other than adding to the noise. - -Tue Nov 5 15:51:29 2002 Steve Huston - - * ace/INET_Addr.cpp (set_addr): Add missing ';' in the IPv6 case. - -Tue Nov 5 20:26:33 UTC 2002 Don Hinton - - * tests/tests.mpc: Added Multicast_Test entry. - - * tests/README: Upadate instructions for adding new tests. - -Tue Nov 5 12:12:05 2002 Balachandran Natarajan - - * tests/Multicast_Test.cpp: Fixed compile errors in single threaded - builds. - -Tue Nov 5 11:24:03 2002 Nanbor Wang - - * ace/Process.h: - * ace/Process.i: Added a new method which returns - the actual value returned or 'ed by the child process. - The accessor returns the raw exit status returned by - the system APIs and the value is OS dependent. Changed the - mutator to be a proctected method and declare - ACE_Process_Manager a fried of ACE_Process as - mutator should only be used by ACE_Process_Manager. - - Thanks to Stephen Blake for reporting the - problem. - -Tue Nov 5 05:12:16 2002 Ossama Othman - - * ace/Acceptor.h: - * ace/Connector.h: - * ace/Strategies_T.h: - - Added missing STL-style template traits found in C++NPv2 - including the following: - - addr_type - acceptor_type - connector_type - handler_type - stream_type - base_type - accept_strategy_type - connect_strategy_type - creation_strategy_type - concurrency_strategy_type - recycling_strategy_type - scheduling_strategy_type - - where applicable. The old traits are still available and remain - unchanged. - -Tue Nov 5 05:54:16 UTC 2002 Don Hinton - - * tests/Multicast_Test.cpp: Fixed typo in pragma instantiation, - and replaced an instance of char* with ACE_TCHAR* to fix unicode - builds. Added #ifdef for ACE_HAS_THREADS, since it uses - ACE_Task as an active object. - - * tests/run_test.lst: Turned off Multicast_Test and - Token_Stategy_Test for single threaded builds. - -Mon Nov 4 18:01:25 UTC 2002 Don Hinton - - * tests/Makefile.bor: Added new Multicast_Test. Thanks to - Johnny Willemsen for noticing this. - -Mon Nov 4 16:14:21 UTC 2002 Don Hinton - - * tests/Multicast_Test.cpp (get_handle): Made return type of - definition ACE_HANDLE to match the declaration. Thanks to - Ed Skees for reporting this. - - * tests/Multicast_Test.dsp: - * tests/tests.dsw: Added new dsp. Thanks again to Ed Skees - for providing this. - - * THANKS: Added Ed Skees to hall of fame... - -Mon Nov 4 09:28:34 UTC 2002 Don Hinton - - * ace/SOCK_Dgram.cpp (recv): Corrected method signature in .cpp to - match the one in the .h. The .h version specified iovec*, but - the .cpp had iovec[] which confused doxygen. This fixes bug [1353]. - -Sun Nov 3 19:41:30 UTC 2002 Don Hinton - - * tests/Multicast_Test.cpp: - * tests/Makefile: - * tests/run_test.lst: Added a new test to exercise some of the new - functionality of ACE_SOCK_Dgram_Mcast. - -Sun Nov 3 10:36:50 2002 Balachandran Natarajan - - * tests/run_test.lst: Prevented SV_Shared_Memory test from running - in RH_7.1 configurations. Please see BUGID 1351 for details. - -Sat Nov 2 17:44:00 2002 Balachandran Natarajan - - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor_Base.cpp: Fixed a subtle bug in the - Select_Reactor. The following were performed during the bind () - operation, which binds a handle with interested mask to an - event_handler, - - - The new masks were added to the existing wait_set - - and the new masks were also removed from the suspend_set. - - Though the above steps were fine, there exists a possibility - when the reactor could land up with a state when the handle - could be both in the wait_set and suspend_set. If suppose a - handle is initially registered for READ and EXCEPTION with the - reactor and then suspended. If the user calls register_handler - () to register the same handle for READ and WRITE, things could - go totally bizzare. - - The present fix does the following - - - If the handle is suspended, the masks are added to the - suspend_set - - else the masks are added to the wait_set and the flag that - indicates state changes within the reactor is set to 1. - - A pure virtual call is_suspended_i () was added to the - ACE_Select_Reactor_Base class to make the check for a suspended - handle possible within the bind () call. Thanks to Irfan - Pyarali who reported this problem. This - should fix the problem reported in [BUG 1305]. - -Fri Nov 1 07:35:10 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the new - MProfile_Connection_Timeout test to the daily regression tests. - -Thu Oct 31 19:15:49 2002 Nanbor Wang - - * ACEXML/common/Attributes.h: Added the missing inclusion of - ACEXML_Export.h and the #pragma once directive. Thanks to Paul - Marquis for reporting this. - -Thu Oct 31 12:57:10 2002 Nanbor Wang - - * ace/OS.i (fstat): Added check for FILE_ATTRIBUTE_DIRECTORY on - Win32 to set the file type in the st_mode so one can determine - if it's a file or a directory. Thanks to Paul Marquis - for submitting the patch. - -Wed Oct 30 13:47:14 2002 Steve Huston - - * ace/Thread_Exit.cpp: Add #include "ace/Managed_Object.h" to get - the definition of ACE_Managed_Object. - -Wed Oct 30 11:38:36 2002 Irfan Pyarali - - * ace/Timeprobe.h: Fixed formatting of comments that somehow got - messed up in: - - http://cvs.doc.wustl.edu/viewcvs.cgi/ace/Timeprobe.h.diff?r1=4.29&r2=4.30 - -Tue Oct 29 22:27:24 2002 Frank Hunleth - - * apps/gperf/src/Key_List.cpp: Added cast to int on UCHAR_MAX and - USHRT_MAX to remove warnings of comparing signed and unsigned - values under OpenBSD. - - * ace/config-openbsd.h: - * ace/config-openbsd-pthread.h: Added ACE_HAS_MKSTEMP since - OpenBSD has the mkstemp() function, and it helps clear up - linker warnings. Also added ACE_HAS_ALT_CUSERID to clear - up errors due to _cuserid(). Thanks to Craig Rodrigues - for the latter patch. - -Tue Oct 29 15:45:06 2002 Nanbor Wang - - * ace/Thread_Exit.h: - * ace/Thread_Exit.cpp: - * ace/Thread_Manager.h: - * ace/Thread_Manager.cpp: Changed to use ACE_Thread_Manager to - clean up the global TSS ACE_Thread_Exit object instead of - depending on the more general ACE_Object_Manager::at_exit method - so we can better control the order of destruction. The change - makes sure the global TSS ACE_Thread_Exit object will only get - deleted *after* ACE_Thread_Manager has cleaned up all threads - and destroyed itself. - - Thanks to Patrick McNerthney and - Daniel Bell for reporting - the problem. - -Tue Oct 29 16:19:54 UTC 2002 Craig Rodrigues - - * ace/INET_Addr.cpp: - * ace/INET_Addr.i: - * ace/INET_Addr.h: - - Added a reset() method to initialize the underlying sockaddr_in - or sockaddr_in6 structure, and set the address family. Changed - all constructors to use this reset() method. [Bug 1342] - - (INET_Addr::set_addr) the port number was not being set, - so set it. [Bug 1329] - * tests/INET_Addr_Test.cpp: Add test to verify that address family - is being set. - * THANKS: Added Thomas Devanneaux who provided - these fixes. - -Mon Oct 28 20:46:33 2002 Steve Huston - - * ace/SOCK_Dgram_Mcast.cpp (ACE_SDM_helpers::addr_to_string): Use - the "" string in place rather than try to declare it a static. - gcc reports the original usage won't do what you think (keep one - copy for the method) but will duplicate it in each generated - method. Use it as a literal and let the compiler try to place a - single copy in a read-only section. - -Mon Oct 28 20:38:27 2002 Steve Huston - - * ace/Asynch_IO.cpp (ACE_Service_Handler::addresses()): Don't - print addresses from here. It's inappropriate for a framework - to be printing things out without being asked to. - - * ace/POSIX_Asynch_IO.cpp (ACE_POSIX_Asynch_Read_Stream::read): - * ace/WIN32_Asynch_IO.cpp (ACE_WIN32_Asynch_Read_Stream::read): - Don't print a message for a 0-byte/no space read - set errno to - ENOSPC so the caller can figure out what's going on. - - * ace/SUN_Proactor.{h cpp}: - * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_AIOCB_Proactor):Change - 'return_status' arg to get_result_status(), find_completed_aio() - from int to size_t and rename transfer_count; get_result_status() - takes care of sensing -1 count and changing to 0. Passing back - a size_t smooths the path from here through to the result object. - Removed application_specific_code() - reuse the one from - ACE_POSIX_Proactor - this one called it; remove the middle-man. - - * tests/Proactor_Test.cpp: Added addresses() method implementations - to print address with session IDs; helps to match Sender/Receiver - pairs in the log. Also added some logging of basic send/recv info - to help try to track down why this facility doesn't work well. - Added a check for comparable sends/receives when a session ends. - Added a warning if there are outstanding I/O when the session - ends. This probably should be an error, but I haven't thought - through it enough to go that far. For the SUN Proactor, use one - thread by default (not 3) - aiosuspend() is not MT safe. - -Mon Oct 28 12:48:14 2002 Nanbor Wang - - * bin/PerlACE/Process_Unix.pm (Spawn): Return 0 when the function - complete successfully. Thanks to Charles F. Frasch - for reporting and suggesting the fix. - -Sun Oct 27 07:44:32 2002 John Aughey - - * ace/INET_Addr.cpp: Changed the default constructor to only - set the address family rather than doing a full set. This - should exhibit the same behavior without additional overhead. - -Sat Oct 26 21:49:15 2002 Nanbor Wang - - * ace/Process.cpp (wait): - * ace/Process.i (wait): Changed to always update this->exit_code_ - when waiting on a child process to allow method to - function properly. Removed the use of the macro - ACE_OSCALL_RETURN on ACE_OS::waitpid since ACE_OS::waitpid is - already signal safe. - - * ace/Process.h: Changed the type of this->exit_code_ from int to - ACE_exitcode. Updated documentation for mutator method - to better reflect the intention for using this - method. - - Thanks to Artashes Ghazaryan , Jaroslaw Nozderko - , and Stephen Blake - for reporting the problem. - -Sat Oct 26 11:42:04 UTC 2002 John Aughey - - * ace/INET_Addr.cpp: Changed default behavior to set 0 - port and INADDR_ANY address. - -Sat Oct 26 09:45:12 UTC 2002 Johnny Willemsen - - * ace/Timer_Heap_T.h: - Doxygen documentation fix - - * ace/OS.h: - The BCB4 header files don't define ENOTEMPTY, so define this when - detecting the BCB4 compiler. Thanks to Mike Curtis - for reporting this. - - * examples/Reactor/Proactor/test_proactor2.cpp: - Removed not needed return. Fixes a BCB4 build error - - * THANKS: Added Mike Curtis - -Wed Oct 23 16:37:15 2002 Balachandran Natarajan - - * THANKS: Added Sandeep to the Hall of Fame. - -Wed Oct 23 17:20:18 UTC 2002 Don Hinton - - * ace/Service_Object.{h,cpp} (suspend, resume, fini): - Changed return value from void to int so that the - return value of the contained ACE_Service_Type could be - propagated. - - * ace/Service_Repository.cpp (suspend, resume, fini): - Changed to propagate the return value from the - ACE_Service_Type instead of always 0. - -Tue Oct 22 16:26:56 2002 Rich Seibel - - * ace/Basic_Types.h: - Added a test for _BYTE_ORDER, same as BYTE_ORDER and - __BYTE_ORDER. VxWorks defines this. Also note, compilers - that previously automatically looked for _BYTE_ORDER when - only BYTE_ORDER was specified will likely not do so in the - future. This will proactively fix them also. - - * ace/config-all.h: - Moved the use of FUNCPTR until after the include that defines - it. Only affects VxWorks. - -Tue Oct 22 13:11:42 2002 Nanbor Wang - - * ace/OS.cpp (DllMain): Added code to invoke - DisableThreadLibraryCalls during PROCESS_ATTACH when - ACE_DISABLES_THREAD_LIBRARY_CALLS is defined to 1 as described - below. This should enhance performance of applications that - spawn a lot of threads. Thanks to Patrick McNerthney - for suggesting the change. - - We should probably apply the same optimization for the core TAO - libraries. - - * ace/config-win32-common.h: Defined a Win32-only new macros - ACE_DISABLES_THREAD_LIBRARY_CALLS which is default to 0 if not - defined by users. - -Mon Oct 21 17:26:15 2002 Douglas C. Schmidt - - * ace/SPIPE_Acceptor.cpp: Modified - SPIPE_Acceptor::create_new_instance to manually signal the event - used in the ConnectNamedPipe call when an ERROR_PIPE_CONNECTED - status is returned. Also added the handling of the status of - ERROR_NO_DATA to the same logic as ERROR_PIPE_CONNECTED. Thanks - to Patrick J. McNerthney for contributing - this. - -Tue Oct 22 10:20:41 2002 Balachandran Natarajan - - * examples/C++NPv2/Reactor_Logging_Server_T.cpp: Fixed a typo that - broke the builds. My bad :( - -Mon Oct 21 20:13:27 2002 Balachandran Natarajan - - * examples/C++NPv2/Reactor_Logging_Server_T.cpp: - * examples/C++NPv1/Logging_Server.cpp: - * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp: - Fix for compile errors on Lynx platform. Thanks to Craig - Rodrigues for supplying the patches. - -Tue Oct 22 12:36:12 UTC 2002 Johnny Willemsen - - * ace/Basic_Stats.h: - * ace/Dirent_Selector.h: - * ace/Service_Config.h: - * ace/Timer_Heap_T.h: - Improved doxygen documentation. - -Mon Oct 21 22:30:51 2002 Balachandran Natarajan - - * tests/SString_Test.cpp (ACE_TMAIN): Fixed a warning in Win32 builds. - -Mon Oct 21 20:04:12 2002 Balachandran Natarajan - - * ace/WIN32_Asynch_IO.h: - * ace/WIN32_Asynch_IO.cpp: Integrated the latest patches from Eric - Frias . - -Mon Oct 21 06:54:12 2002 Balachandran Natarajan - - * tests/Recursive_Condition_Test.cpp (test_4): - * tests/RB_Tree_Test.cpp: Fixed compile errors arising out of M$ - quirks. The scoping rules for 'for' loops are busted and hence - these fixes. These fixes basically change the variable names for - the different for loops inside the same scope. - -Sun Oct 20 21:40:13 2002 Krishnakumar B - - * ACEXML/common/HttpCharStream.cpp: Handle all the error paths - gracefully and don't leak memory/sockets. - -Sun Oct 20 14:06:36 2002 Krishnakumar B - - * ACEXML/common/FileCharStream.cpp (peek_i): Fixed more - compilation errors in Borland WCHAR builds. MSVC sucks... - -Sun Oct 20 11:36:34 2002 Balachandran Natarajan - - * ACEXML/common/FileCharStream.cpp: Fixed a compile error in - Borland builds. The compile error is due to strict enforcement - of scoping rules in a for loop by Borland compiler. - -Sun Oct 20 11:31:45 2002 Balachandran Natarajan - - * ACEXML/common/Makefile.bor: Added Encoding.obj to the list of - object files. Thanks to Johnny for pointing this out. - -Sun Oct 20 11:30:04 2002 Balachandran Natarajan - - * tests/SPIPE_Test.cpp: Fixed compile errors in Borland builds. - -Sun Oct 20 10:16:23 2002 Balachandran Natarajan - - * examples/C++NPv2/display_logfile.cpp: Fix for single threaded - builds. - -Sun Oct 20 10:12:42 2002 Balachandran Natarajan - - * tests/Recursive_Condition_Test.cpp: Fix for single threaded - builds. The ACE_HAS_THREADS were improperly placed. - -Sun Oct 20 09:26:58 2002 Balachandran Natarajan - - * examples/C++NPv1/Makefile: Added changes from "Fri Oct 18 - 21:01:25 UTC 2002 Craig Rodrigues " back - since the changes are fine. Thanks to Craig for pointing that - out. - -Sun Oct 20 13:34:45 UTC 2002 Craig Rodrigues - - * examples/C++NPv2/Makefile: Replace with recursive Makefile which - does not use for loops. Add .NOTPARALLEL target to fix - build errors on parallel builds. - -Sun Oct 20 08:10:43 2002 Balachandran Natarajan - - * tests/Recursive_Condition_Test.cpp: Fixed a unused variable warning. - -Sun Oct 20 00:27:02 2002 Balachandran Natarajan - - * tests/Recursive_Condition_Test.cpp: Fixed a fuzz error. - -Sun Oct 20 00:14:32 2002 Balachandran Natarajan - - * examples/C++NPv1/Makefile: Reverted the change "Fri Oct 18 - 21:01:25 UTC 2002 Craig Rodrigues " since - this opens up some problems. Craig will look into it later and - provide a clean fix. Till then.. - -Sat Oct 19 20:00:00 2002 Stephen Torri - - * tests/Recursive_Condition_Test.cpp: - - Added test to check nesting_level after requiring a Recursive - Condition Mutex multiple times. Also after releasing for the - same number of times. - - * tests/SString_Test.cpp: - * ace/String_Base.i: - - Bug 1323 (Reported by Wayne Erchak ): Fixed. - In the effort to protect from memory problems with non-null - terminated strings the operators '<' and '>' where - rendered useless. Now the comparions use memcmp instead of - strncmp. A series of tests have been added to SString_Test.cpp - to ensure this does not happen again. - -Sat Oct 19 21:58:00 2002 Krishnakumar B - - * ace/Argv_Type_Converter.cpp: - * ace/Argv_Type_Converter.h: - * ace/Argv_Type_Converter.inl: - * ace/Codecs.cpp: - * ace/Codecs.h: - * ace/OS.cpp: - * ace/Vector_T.cpp: - * ace/Vector_T.h: - * ace/WFMO_Reactor.cpp: - * tests/Proactor_Scatter_Gather_Test.cpp: Convert bool to use int. - - * ace/SString.cpp: Removed a redundant initialization to 0. - - * tests/Makefile: Add DIRS_PARALLEL=1 to allow building in - parallel in $ACE_ROOT/tests. - -Sat Oct 19 11:40:22 2002 Steve Huston - - * ace/OS.h: Added a ptrdiff_t typedef for ACE_HAS_WINCE. eVC3, - PocketPC2002 don't define this type. - - * ace/OS.i (recursive_mutex_cond_unlock, recursive_mutex_cond_relock): - PocketPC 2002 doesn't have the RecursionCount member in the - CRITICAL_SECTION. - - * ace/OS.cpp: ACE-ified the ACE_CE_ARGV class. - - * ace/OS_Errno.cpp: Add #include "ace/OS_Memory.h" to get ACE_NEW. - - * ace/ace_os_dll.vcp: Added files Time_Value.{h cpp inl}. Changed - preprocessor file locations from $ACE_ROOT to ".." to allow - working with more than one ACE version/build. - - * ace/ace_dll.vcp: Added files DLL_Manager.{h cpp}. - Changed preprocessor file locations from $ACE_ROOT to ".." to - allow working with more than one ACE version/build. - - * ace/config-win32-common.h: Set ACE_HAS_WIN32_TRYLOCK for WinCE - in addition to ACE_HAS_WINNT4. Also ACE_HAS_INTERLOCKED_EXCHANGEADD, - but only for PPC. - - * ace/Atomic_Op.h: Only set ACE_HAS_BUILTIN_ATOMIC_OP without - ACE_HAS_INTERLOCKED_EXCHANGEADD for MSVC on x86. It's not available - for eVC, CE on other than PPC. - - * tests/ARGV_Test_WinCE.vcp - * tests/Atomic_Op_Test_WinCE.vcp - * tests/Auto_IncDec_Test_WinCE.vcp - * tests/Barrier_Test_WinCE.vcp - * tests/Basic_Types_Test_WinCE.vcp - * tests/Bound_Ptr_Test_WinCE.vcp - * tests/Buffer_Stream_Test_WinCE.vcp - * tests/Cached_Accept_Conn_Test_WinCE.vcp - * tests/Cached_Conn_Test_WinCE.vcp - * tests/Cache_Map_Manager_Test_WinCE.vcp - * tests/Capabilities_Test_WinCE.vcp - * tests/CDR_Array_Test_WinCE.vcp - * tests/CDR_File_Test_WinCE.vcp - * tests/CDR_Test_WinCE.vcp - * tests/Collection_Test_WinCE.vcp - * tests/Conn_Test_WinCE.vcp - * tests/DLList_Test_WinCE.vcp - * tests/DLL_Test_DLL_WinCE.vcp - * tests/DLL_Test_WinCE.vcp - * tests/Dynamic_Priority_Test_WinCE.vcp - * tests/Enum_Interfaces_Test_WinCE.vcp - * tests/Future_Set_Test_WinCE.vcp - * tests/Future_Test_WinCE.vcp - * tests/Handle_Set_Test_WinCE.vcp - * tests/Hash_Map_Bucket_Iterator_Test_WinCE.vcp - * tests/Hash_Map_Manager_Test_WinCE.vcp - * tests/High_Res_Timer_Test_WinCE.vcpL - * tests/Lazy_Map_Manager_Test_WinCE.vcp - * tests/Logging_Strategy_Test_WinCE.vcp - * tests/Log_Msg_Test_WinCE.vcp - * tests/Malloc_Test_WinCE.vcp - * tests/Map_Manager_Test_WinCE.vcp - * tests/Map_Test_WinCE.vcp - * tests/Max_Default_Port_Test_WinCE.vcp - * tests/Mem_Map_Test_WinCE.vcp - * tests/MEM_Stream_Test_WinCE.vcp - * tests/Message_Block_Test_WinCE.vcp - * tests/Message_Queue_Notifications_Test_WinCE.vcp - * tests/Message_Queue_Test_Ex_WinCE.vcp - * tests/Message_Queue_Test_WinCE.vcp - * tests/MM_Shared_Memory_Test_WinCE.vcp - * tests/MT_Reactor_Timer_Test_WinCE.vcp - * tests/MT_Reactor_Upcall_Test_WinCE.vcp - * tests/MT_SOCK_Test_WinCE.vcp - * tests/Naming_Test_WinCE.vcp - * tests/New_Fail_Test_WinCE.vcp - * tests/Notify_Performance_Test_WinCE.vcp - * tests/Object_Manager_Test_WinCE.vcp - * tests/OrdMultiSet_Test_WinCE.vcp - * tests/OS_Test_WinCE.vcp - * tests/Priority_Buffer_Test_WinCE.vcp - * tests/Priority_Reactor_Test_WinCE.vcp - * tests/Priority_Task_Test_WinCE.vcp - * tests/Process_Manager_Test_WinCE.vcp - * tests/RB_Tree_Test_WinCE.vcp - * tests/Reactors_Test_WinCE.vcp - * tests/Reactor_Exceptions_Test_WinCE.vcp - * tests/Reactor_Notify_Test_WinCE.vcp - * tests/Reactor_Performance_Test_WinCE.vcp - * tests/Reactor_Timer_Test_WinCE.vcp - * tests/Reader_Writer_Test_WinCE.vcp - * tests/Recursive_Mutex_Test_WinCE.vcp - * tests/Refcounted_Auto_Ptr_Test_WinCE.vcp - * tests/Reverse_Lock_Test_WinCE.vcp - * tests/Semaphore_Test_WinCE.vcp - * tests/Service_Config_DLL_WinCE.vcp - * tests/Service_Config_Test_WinCE.vcp - * tests/Sigset_Ops_Test_WinCE.vcp - * tests/Simple_Message_Block_Test_WinCE.vcp - * tests/SOCK_Connector_Test_WinCE.vcp - * tests/SOCK_Send_Recv_Test_WinCE.vcp - * tests/SOCK_Test_WinCE.vcp - * tests/SPIPE_Test_WinCE.vcp - * tests/SString_Test_WinCE.vcpS - * tests/Svc_Handler_Test_WinCE.vcp - * tests/Task_Test_WinCE.vcp - * tests/Thread_Manager_Test_WinCE.vcp - * tests/Thread_Mutex_Test_WinCE.vcp - * tests/Thread_Pool_Reactor_Resume_Test_WinCE.vcp - * tests/Thread_Pool_Reactor_Test_WinCE.vcp - * tests/Thread_Pool_Test_WinCE.vcp - * tests/Timeprobe_Test_WinCE.vcp - * tests/Timer_Queue_Test_WinCE.vcp - * tests/Time_Service_Test_WinCE.vcp - * tests/Time_Value_Test_WinCE.vcp - * tests/Tokens_Test_WinCE.vcp - * tests/TSS_Test_WinCE.vcp - * tests/Upgradable_RW_Test_WinCE.vcp - Changed include file path from $ACE_ROOT to .. to allow building - multiple versions. Added aced.lib to CE ARM Debug builds. - -Sat Oct 19 16:57:44 UTC 2002 Johnny Willemsen - - * etc/tao_*.doxygen: - Disabled the doxygen warnings. The warnings about not documented - members are still on. The warnings are not disabled in the ace - libraries because we could fix them there, but we can't fix them - in TAO because of the environment macro's that cause the method - definition arguments to be different than the implementation - arguments. - -Sat Oct 19 16:47:12 UTC 2002 Johnny Willemsen - - * ace/ace_wchar.h: - Added ACE_TEXT_WaitNamedPipe to the list of Windows functions we use - and for which there is an ascii and unicode version. - - * ace/SPIPE_Connector.cpp: - Used ACE_TEXT_WaitNamedPipe instead of ::WaitNamedPipe. This fixes - the problems in the BCB Unicode build. - -Sat Oct 19 10:09:38 2002 Balachandran Natarajan - - * examples/C++NPv2/Makefile: Reverted the change "Fri Oct 18 - 21:01:25 UTC 2002 Craig Rodrigues " since - this opens up some problems. Craig will look into it later and - provide a clean fix. Till then.. - -Sat Oct 19 09:25:52 2002 Douglas C. Schmidt - - * examples/Reactor/Misc/test_timer_queue.cpp, - * tests/Timer_Queue_Test.cpp: Fixed warnings with G++. - Thanks to Bala for reporting this. - -Fri Oct 18 22:07:31 2002 Steve Huston - - * ace/config-aix-4.x.h: Only define ACE_HAS_ALLOCA for IBM - compilers. They do it via "builtin" trickery and g++ doesn't - know that trick. - - * include/makeinclude/platform_aix4_g++.GNU: Set with_ld to aix - to avoid trying to do an soname - AIX's ld doesn't do that. - - * include/makeinclude/platform_g++_common.GNU: If with_ld is aix, - don't try to add to soname option to the linker. - -Fri Oct 18 20:13:29 2002 Steve Huston - - * include/makeinclude/platform_hpux_gcc.GNU: Added an optional - build parameter, with_ld, whose default value is hpux. This - says which ld is used with g++. - - * include/makeinclude/platform_g++_common.GNU: When setting the - SOFLAGS for setting SONAME, if with_ld is hpux, use +h, not -h. - -h means "hide symbol" in HP-UX ld. - -Fri Oct 18 17:12:03 2002 Balachandran Natarajan - - * examples/C++NPv2/display_logfile.cpp: - * examples/C++NPv2/Client_Logging_Daemon.cpp: - * examples/C++NPv2/TP_Logging_Server.h: - * examples/C++NPv2/TP_Logging_Server.cpp: Fixed compile errors in - single threaded builds. All they needed was the usage of the - right macros like ACE_SYNCH instead of ACE_MT_SYNCH and - ACE_SYNCH_MUTEX instead of ACE_Thread_Mutex. - -Fri Oct 18 16:25:09 2002 Yuanfang Zhang - - * tests/RB_Tree_Test.h: - * tests/RB_Tree_Test.cpp: - - add a new method to test forward and reverse partial tree traversal. - -Fri Oct 18 21:01:25 UTC 2002 Craig Rodrigues - - * examples/C++NPv1/Makefile: Fix comment. - * examples/C++NPv1/Makefile: Replace with recursive Makefile which - does not use for loops. - -Fri Oct 18 15:44:19 2002 Priyanka Gontla - - * THANKS: - Added Christian Barheine to the hall - of fame. - -Fri Oct 18 19:37:20 GMT 2002 Craig Rodrigues - - * ace/config-macosx.h: Define ACE_HAS_NONSTATIC_OBJECT_MANAGER - for gperf. - -Fri Oct 18 14:52:37 2002 Steve Huston - - * examples/C++NPv2/Reactor_Logging_Server.cpp: - * examples/C++NPv2/Select_Reactor_Logging_Server.cpp: - * examples/C++NPv2/TP_Reactor_Logging_Server.cpp: - * examples/C++NPv2/display_logfile.cpp: Added necessary explicit - template instantiations. - -Fri Oct 18 13:21:05 2002 Douglas C. Schmidt - - * tests/Timer_Queue_Test.cpp, - * examples/Reactor/Misc/test_timer_queue.cpp: - Fixed these tests so that it passes dynamically allocated memory - rather that values via the "act" parameter to - ACE_Timer_Queue::schedule(). This ensures the test will work - properly on strange OS platforms, such as Win64 where pointers - and longs/ints are different sizes. Thanks to Cristian - Ungureanu for motivating this. - -Fri Oct 18 17:20:02 UTC 2002 Don Hinton - - * ace/SOCK_Dgram_Mcast.{h,cpp}: - - Factored out common code to an open_i() method that open() - can call at this level and in inherited classes. - - * ace/QoS/SOCK_Dgram_Mcast_QoS.{h.cpp}: - - Modified ctor to take same default param as base class and - invoke the base class ctor. - - Removed duplicate code in open() and have it call base::open_i() - after opening the socket with QoS. Changed 1st parameter from - ACE_Addr to ACE_INET_Addr to match base classes. - - Removed duplicate code from subscribe by having it call base - class methods. - -Fri Oct 18 11:51:44 2002 Nanbor Wang - - * bin/PerlACE/Run_Test.pm: Created a new variable - $PerlACE::svcconf_ext which defines the canonical - svc.conf file extention used by various run_test scripts. By - default, this is defined to ".conf". It can be overwritten - using the environment variable ACE_RUNTEST_SVCCONF_EXT. For - example, you can define ACE_RUNTEST_SVCCONF_EXT to ".conf.xml" - if you have built your ACE with XML-based service configurator. - -Fri Oct 18 11:55:33 2002 Steve Huston - - * ace/POSIX_CB_Proactor.cpp: Removed unneeded argument to - application_specific_code(). Thanks to Tommy Persson - for contributing this fix. - - Fixes Bugzilla #1325. - - * THANKS: Added Tommy Persson to the Hall of Fame. - -Fri Oct 18 11:39:29 2002 Steve Huston - - * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp: - Put the sigterm_handler function in an unnamed namespace - to avoid issues with g++ not liking 'static' and 'extern "C"' - together. - -Fri Oct 18 03:55:51 UTC 2002 Don Hinton - Bill Fulton - - * ace/SOCK_Dgram_Mcast.{h,i,cpp}: - - Enhanced support for join()'ing multiple multicast groups. Ctor - now offers finer control over a bind()'ing to an address or - interface. Appropriate default behavior has been specified, - but note that due to issues on Linux, portable code should not - join() more than one multicast group per instance. - - An open() method has been added/exposed. If not explicitely - called, it will be implicitely called by the first join(), and - will bind() the address if the OPT_BINDADDR_YES options was - specified in the ctor. - - Error handling has also been enhanced. For instance, if - OPT_BINDADDR_YES has been specified (the default on Linux), - additional join()'s will fail since the socket gets bound on - the first call to open() or join(). Previously, subsequent - calls to join() would silently fail, i.e., the call succeeded - but only datagrams sent to the first, bound address where - actually delivered. - - If ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined, a list of all - subscribed groups is maintained and can be dump()'ed, although - access to this list is not public. - - Added new join()/leave() methods that remove unused, deprecated - protocol_family and protocol arguments. These values can be - determined on the fly. The old subscribe()/unsubscribe() - methods have been deprecated and are now implemented in terms - of join()/leave() respectively. - - The unsubscribe(void) method has also been deprecated. It was - designed to allow the caller to unsubscribe/leave() all - groups at once, but since a list was never kept (and still - isn't unless ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined) only - the last group join()'ed was ever left. A better way would - be to either keep track of you own groups and call leave() - for each, or let the dtor close() the socket which automatically - unsubscribes from all groups. - - Some IPv6 support has been added either directly or by removing - the need for the caller to handle it (see join()/leave() above), - although the internal calls to setsockopt() are still hard wired - for IPv4. - -Fri Oct 18 06:51:07 2002 Douglas C. Schmidt - - * ace/String_Base.{i,cpp}: Fixed the formatting in these files... - -Thu Oct 17 20:02:39 2002 Steve Huston - - * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp: - Add extern "C" to the signal handler function declaration to conform - strictly to its definition. - When explicitly instantiating auto_ptr<>, fully specify the - Thread_Args type else modern compilers (Forte 7) can't see it. - -Thu Oct 17 17:32:39 2002 Krishnakumar B - - * ACEXML/examples/svcconf/Svcconf_Handler.cpp: - * ACEXML/examples/svcconf/Svcconf_Handler.h: - * ACEXML/examples/svcconf/main.cpp: - - Fixed compilation errors under Windows. - -Thu Oct 17 19:18:02 UTC 2002 Craig Rodrigues - - * ace/config-macosx.h: - - Remove define of __MACOSX__, and use constant __APPLE__ - instead defined by Apple's gcc. - - Removed definitions: - ACE_HAS_MACOSX_DYLIB, ACE_LACKS_SEMBUF_T - - Added definitions: - ACE_HAS_SEMUN, ACE_HAS_SIGINFO_T, ACE_LACKS_SIGINFO_H, - ACE_HAS_UCONTEXT_T, ACE_HAS_GETIFADDRS, - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - - Defined ACE_HAS_POSITION_INDEPENDENT_POINTERS to 0 for temporary - Apple gcc bug workaround. - - * ace/Log_Msg.cpp (ACE_Log_Msg::log): Add check for __APPLE__ to catch - right prototype for sys_errlist. - - * ace/OS.h: Remove unnecessary __MACOSX__ check. - - * include/makeinclude/platform_macosx.GNU: Minor cleanups. - -Thu Oct 17 13:47:39 2002 Steve Huston - - * ace/OS.h: Added typedef for ACE_recursive_mutex_state for - !defined (ACE_HAS_THREADS) section. - -Thu Oct 17 16:28:05 UTC 2002 Don Hinton - - * THANKS: Added Jon Franklin - to the hall of fame. - -Thu Oct 17 10:26:59 2002 Balachandran Natarajan - - * examples/C++NPv2/display_logfile.cpp (ACE_MT_SYNCH>): Fixed a - uninitialized member usage warning. - -Thu Oct 17 00:26:13 2002 Nanbor Wang - - * ace/Malloc_T.i (release): Instead of releasing the memory_pool_ - explicitly, changed to use remove () to make sure all resources - are removed properly. - -Wed Oct 16 20:23:09 2002 Krishnakumar B - - * ACEXML/common/FileCharStream.cpp (getchar_i): - * ACEXML/common/FileCharStream.h: - - Borland defines getchar() as a macro. Rename it as getchar_i to - resolve the clash and fix compilation errors in the build. - - -Wed Oct 16 18:47:44 2002 Stephen Torri - - * examples/C++NPv1/Makefile: - - Replaced Makefile with non-for-loop version provided by - Craig Rodrigues. - -Wed Oct 16 16:52:52 2002 Nanbor Wang - - * ace/MEM_SAP.cpp (close_shm_malloc): Fixed a memory leak that I - added last time when I fixed a race condition in removing mmap - file. - -Wed Oct 16 15:35:22 2002 Steve Huston - - * tests/SPIPE_Test.cpp: Fixed compile error. - -Wed Oct 16 14:02:27 2002 Yuanfang Zhang - - * ace/RB_Tree.cpp: - * ace/RB_Tree.h: - - forward and reverse partial tree traversal. - Changed the find_i method by adding a parameter "find_Exact". - -Wed Oct 16 12:18:03 2002 Stephen Torri - - * examples/C++v1/Makefile: - * examples/C++NPv1/Makefile.Iterative_Logging_Server: - * examples/C++NPv1/Makefile.Logging_Client: - * examples/C++NPv1/Makefile.Reactive_Logging_Server: - * examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex: - * examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server: - * examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server: - * examples/C++NPv1/Makefile.wProcess_Per_Connection_Logging_Server: - - Renamed from *.mak to Makefile.* to avoid looking like an - exported MSVC project NMAKE file. (Following Steve Huston's - change to examples/C++v2). - - Fixed Make error that make realclean was not in Makefile. - - * tests/Recursive_Condition_Test.cpp: - - Changed function call of signal() to broadcast() to awaken - multiple threads waiting on a shared condition variable. - -Oct 16 11:44:27 2002 Nanbor Wang - - * ace/Thread_Manager.cpp (check_state): Changed to return 0 if - the thread id is not managed by the Thread_Manager. - - * ace/Thread_Manager.h: Updated documentation for testcancel(), - testsuspend(), and testresume (). They all return false now if - the you try to test the status of a tid that is not managed by - the Thread_Manager. - - Thanks to Giovanni Zito for reporting it. - -Wed Oct 16 12:41:29 2002 Steve Huston - - * examples/Makefile: Add C++NPv1 and C++NPv2 to the DIRS list. - - * examples/C++NPv2/Makefile: Only build the SSL-using examples - (AC_CLD, AIO_CLD, TPCLS) is ssl=1 is set. - - * examples/C++NPv2/Makefile.AC_CLD: - * examples/C++NPv2/Makefile.AIO_CLD: - * examples/C++NPv2/Makefile.TPCLS: - Set up the SSL build params correctly and warn if ssl=1 not used. - -Wed Oct 16 12:08:21 2002 Steve Huston - - * examples/C++NPv2/AC_CLD.mak: - * examples/C++NPv2/AIO_CLD.mak - * examples/C++NPv2/CLD.mak: - * examples/C++NPv2/Configurable_Logging_Server.mak: - * examples/C++NPv2/display_logfile.mak: - * examples/C++NPv2/Reactor_Logging_Server.mak: - * examples/C++NPv2/Select_Reactor_Logging_Server.mak: - * examples/C++NPv2/SLDex.mak: - * examples/C++NPv2/SLD.mak: - * examples/C++NPv2/SR_Configurable_Logging_Server.mak: - * examples/C++NPv2/TPCLS.mak: - * examples/C++NPv2/TPLS.mak: - * examples/C++NPv2/TP_Reactor_Logging_Server.mak: - Renamed from *.mak to Makefile.* to avoid looking like an - exported MSVC project NMAKE file. - - * examples/C++NPv2/Makefile: Changed to process new Makefile names. - -Wed Oct 16 11:02:41 2002 Douglas C. Schmidt - - * ace/High_Res_Timer.cpp (get_cpuinfo): Removed the recalibration of - the scale factor every time the application is launched. Thanks - to Bo Balder for reporting this. - -Wed Oct 16 10:55:11 2002 Balachandran Natarajan - - * ace/config-linux-common.h: Added support for ACE_CC_NAME, - ACE_CC_MAJOR_VERSION and ACE_CC_MINOR_VERSION for linux. Thanks - to Jaroslaw Nozderko for - suggesting this. - -Wed Oct 16 10:55:44 2002 Balachandran Natarajan - - * ace/config-win32-msvc.h (ACE_HAS_ALLOCA): Enabled alloca support - for MSVC. Thanks to Pat McNertney for - providing the patch. - -Tue Oct 15 18:49:25 2002 Stephen Torri - - * tests/Recursive_Condition_Test.cpp: - - Added two tests. - Test 2: repeat of test 1 but with a 2 second delay - after main thread signals the waiting thread. (Works) - Test 3: repeat of test 1 but with 4 threads waiting - on the condition variable. (Broken - no threads - awaken). - -Tue Oct 15 17:27:34 2002 Krishnakumar B - - * ACEXML/docs/bugs.txt: - * ACEXML/docs/TODO.txt: - - Updated to reflect the current status. - -Tue Oct 15 17:23:43 2002 Krishnakumar B - - * tests/Service_Config_Test.UTF-16.conf.xml: New file added which - is used in Service_Config_Test when ACE_HAS_XML_SVC_CONF and - ACE_USES_WCHAR is enabled. - -Tue Oct 15 17:17:44 2002 Krishnakumar B - - * ACEXML/common/Encoding.cpp: - * ACEXML/common/Encoding.h: - - New files which handle the automatic detection of encoding in - XML files. - - * ACEXML/apps/svcconf/Makefile: - * ACEXML/common/CharStream.h: - * ACEXML/common/Exception.cpp: - * ACEXML/common/FileCharStream.cpp: - * ACEXML/common/FileCharStream.h: - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/common/HttpCharStream.h: - * ACEXML/common/InputSource.cpp: - * ACEXML/common/Makefile: - * ACEXML/common/Mem_Map_Stream.cpp: - * ACEXML/common/Mem_Map_Stream.h: - * ACEXML/common/StrCharStream.cpp: - * ACEXML/common/StrCharStream.h: - * ACEXML/common/XML_Common.dsp: - * ACEXML/examples/SAXPrint/Makefile: - * ACEXML/parser/parser/Makefile: - * ACEXML/parser/parser/Parser.cpp: - - Handle the automatic detection of encoding in XML files. - -Tue Oct 15 17:15:41 2002 Steve Huston - - Fixes for Bugzilla #1319: - - * ace/OS.i (ctime_r): For the 2-param ctime_r platforms, restrict - buflen to at least 26, just as 3-param platforms do. If less than - 26, return 0 and errno = ERANGE. - - * ace/OS.cpp (ctime_r): The WinCE implementation of ctime_r already - had the 26-char minimum check, but didn't set errno to ERANGE. - Now it does. - - * tests/OS_Test.cpp (ctime_r_test): Make sure that ctime_r with length - less than 26 fails and doesn't scribble on the buffer. - -Tue Oct 15 11:43:27 2002 Balachandran Natarajan - - * ace/SPIPE_Connector.cpp (connect): Convert the first argument in - the ::WaitNamedPipe () call to char * always using the macro - defined. This shold fix compilation errors in WCHAR builds. - -Tue Oct 15 16:19:33 UTC 2002 Craig Rodrigues - - [Bug 1090] - * ace/config-freebsd-pthread.h: Add ACE_HAS_GETIFADDRS. This fixes - Bugzilla bug 1090. - -Tue Oct 15 10:47:20 2002 Balachandran Natarajan - - * ace/SPIPE_Connector.cpp: Fixed a unused variable warning. - -Tue Oct 15 06:56:18 2002 Patrick J. McNerthney - - * tests/SPIPE_Test.cpp: Added support for testing the new Windows - bytestream mode. - -Mon Oct 14 20:47:21 2002 Douglas C. Schmidt - - * ace/SPIPE_Acceptor.cpp (open): Changed "mode" to "pipe_mode", - which is the name of the parameter. Thanks to Don Hinton for - reporting this. - -Mon Oct 14 19:20:35 2002 Frank Hunleth - - * ACE-INSTALL.html: Added installation notes for the OpenBSD port. - - * ace/config-openbsd.h: - * ace/config-openbsd-pthread.h: - * include/makeinclude/platform_openbsd.GNU: - * include/makeinclude/platform_openbsd_pthread.GNU: Configuration - files for OpenBSD. - - * ace/ACE.cpp: Added OpenBSD-specific error code to ACE::out_of_handles - - * ace/OS.h: Added #define for OpenBSD-specific path to siginfo.h and - ACE_LACKS_CLEARERR guards around clearerr() for OpenBSD. - - * ace/OS.i: Added support for getifaddrs() with ACE_HAS_GETIFADDRS - and fix for segfault when calling dlsym with a null handle. Added - guards on clearerr using ACE_LACKS_CLEARERR. (All only affect - OpenBSD.) - - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Proactor.h: Added SystemType family for OpenBSD. - - * ace/README: Added new ACE #defines to support OpenBSD. These include: - ACE_HAS_GETIFADDRS - for support of the getifaddrs() system call - ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE - add check to dlsym call - to protect against NULL. OpenBSD 3.1 needs this. - ACE_LACKS_CLEARERR - #define to remove clearerr definition due - to bogus syntax error on OpenBSD. - - * ace/Sock_Connect.cpp: Added code to get_ip_interfaces to use - getifaddrs() if it is supported. OpenBSD is the only platform to - use this currently. Under OpenBSD, the code to parse the return - values from the corresponding ioctl calls gets confused when IPv6 - interfaces are present. - - * tests/Malloc_Test.cpp: Added OpenBSD to the list of platforms that - can't handle the remap of fault part of the test. - - * tests/Reactor_Dispatch_Order_Test.cpp: Added code for OpenBSD to - clear the write mask after handle_output is called, since OpenBSD - calls handle_output more than once before the data is received - over the pipe. - -Mon Oct 14 18:21:40 2002 Patrick J. McNerthney - - * ace/OS.h: Added FILE_FLAG_WRITE_THROUGH defines for - non-supporting operating systems and added various PIPE_* - defines for non-supporting operating systems. - - * ace/SPIPE_Connector.{h,cpp}: Added support to enable the - selection of whether bytestream or message mode is used on - Windows. Also added support for both blocking and timeout - connections on Windows, only non-blocking connections where - support before. - - * ace/SPIPE_Acceptor.{h.cpp}: Added support to enable the - selection of whether bytestream or message mode is used on - Windows. - -Mon Oct 14 20:19:51 2002 Steve Huston - - * ChangeLog: Removed a large chunk of duplicated dates from Oct 11 - back to July. - - * ace/OS.{h i}: Removed the owning_thread_ member from - ACE_recursive_mutex_state on Windows. This isn't needed since the - OS mutex restores the owner properly - it was in to do a sanity - check ACE_ASSERT, but can't do that from ACE_OS. - - * ace/WFMO_Reactor.h: Expanded and clarified the class comments - to resolve Bugzilla #772. - -Mon Oct 14 17:23:43 2002 Balachandran Natarajan - - * ace/CDR_Base.cpp (consolidate): Reverted the optimization - performed in "Tue Mar 12 17:43:32 2002 Balachandran Natarajan - ". This optimizations created problems for - CORBA::Any implementation which assumes that the data is totally - contained within the Any. Using the optimization created problems - for Any's that are copied between different threads. Thanks to - Jian Chen for reporting this problem. - -Mon Oct 14 10:12:31 2002 Steve Huston - - Fix for Bugzilla # 1316: - - * ace/Synch.h: - * ace/OS.h: Moved the ACE_recursive_mutex_state from Synch.h - to OS.h. The recursive mutex methods need to handle this stuff - internally to properly synchronize releasing and reacquiring - the mutex around condition variable waits. - - * ace/OS.i: Added ACE_OS::recursive_mutex_cond_unlock() and - ACE_OS::recursive_mutex_cond_relock() methods to support - recursive mutex handling around waiting on a condition variable. - - * ace/Synch.cpp (ACE_Condition): - Removed the guards from the broadcast() and signal() methods. - Removed the ACE_recursive_mutex_state class methods - this - functionality is now in the ACE_OS space; see above. - Reimplemented the wait() method to make use of the new ACE_OS - methods (above), enabling proper reclaiming of the recursive - mutex after cond_wait, and avoiding deadlock. - -Mon Oct 14 00:12:48 2002 Krishnakumar B - - * ACEXML/docs/bugs.txt: Updated to match the current status of - ACEXML parser. - -Sun Oct 13 19:38:35 2002 Krishnakumar B - - * ace/Exception_Macros.h: - - Consolidated the checking of exceptions preprocessor hacking - into this file. - - * ACEXML/common/XML_Macros.h: - - Include the above file and get rid of redundant and broken - checking for exceptions. - - * ace/CORBA_macros.h: - - Moved over the stuff from Exception_Macros.h to where it was - originally. This should fix all the build breakage. Thanks to - Bala for pointing out the errors in the build. - -Sun Oct 13 18:50:53 2002 Douglas C. Schmidt - - * ace/SPIPE_Stream.h: Enhanced the documentation of ACE_SPIPE_Stream. - Thanks to Pat McNerthney for motivating - this. - -Sun Oct 13 15:57:04 2002 Balachandran Natarajan - - * ace/Asynch_IO.cpp: - * ace/Asynch_IO.h: Protected ACE_Asynch_Read_File::readv () and - ACE_Asynch_Write_File::writev () from being called when - ACE_HAS_WINNT4 == 0. - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Asynch_IO.h: Protected - ACE_WIN32_Asynch_Read_File::readv () and - ACE_WIN32_Asynch_Write_File::writev () from being called when - ACE_HAS_WINNT4 == 0. - - Thanks to Eric Frias for reporting the - problem and Alex Libman for suggesting the fix. - - * THANKS: Added Eric Frias to the hall of - fame. - -Sun Oct 13 15:54:59 2002 Krishnakumar B - - * ACEXML/apps/svcconf/Svcconf_Handler.cpp: Fixed a couple of - warnings related to the exception argument handling. - -Sun Oct 13 00:55:27 2002 Krishnakumar B - - * ACEXML/common/XML_Common.dsp: - - Added XML_Macros.h to the project file. - - * ACEXML/examples/SAXPrint/svc.conf.xml: - - Reverted a mistaken change used for testing. - - * ACEXML/apps/svcconf/Svcconf_Handler.cpp: - * ACEXML/common/SAXExceptions.cpp: - * ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp: - - Added ACE_TEXT around strings so that WCHAR build is happy. - -Sat Oct 12 23:01:29 2002 Krishnakumar B - - * ACEXML/apps/svcconf/Svcconf.h (ACEXML_Svcconf_Parser): Removed - the unused member env_. - -Sat Oct 12 22:50:02 2002 Krishnakumar B - - * ACEXML/common/XML_Macros.h: - - New file which contains the macros needed to enable support for - Exceptions in ACEXML. - - * ACEXML/apps/svcconf/Makefile: - * ACEXML/common/Makefile: - * ACEXML/examples/SAXPrint/Makefile: - * ACEXML/parser/parser/Makefile: - * ACEXML/tests/Makefile: - - Regenerate dependencies. - - * ACEXML/common/Env.cpp: - * ACEXML/common/Env.h: - * ACEXML/common/Env.i: - * ACEXML/common/Exception.cpp: - * ACEXML/common/Exception.h: - * ACEXML/common/Exception.i: - - Enable support for Native Exceptions. - - * ACEXML/apps/svcconf/Svcconf.cpp: - * ACEXML/apps/svcconf/Svcconf.h: - * ACEXML/apps/svcconf/Svcconf_Handler.cpp: - * ACEXML/apps/svcconf/Svcconf_Handler.h: - * ACEXML/common/Attributes_Def_Builder.h: - * ACEXML/common/ContentHandler.h: - * ACEXML/common/DTDHandler.h: - * ACEXML/common/DTD_Manager.h: - * ACEXML/common/DefaultHandler.cpp: - * ACEXML/common/DefaultHandler.h: - * ACEXML/common/Element_Def_Builder.h: - * ACEXML/common/EntityResolver.h: - * ACEXML/common/ErrorHandler.h: - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/common/SAXExceptions.cpp: - * ACEXML/common/SAXExceptions.h: - * ACEXML/common/SAXExceptions.i: - * ACEXML/common/Validator.h: - * ACEXML/common/XMLFilterImpl.cpp: - * ACEXML/common/XMLFilterImpl.h: - * ACEXML/common/XMLReader.h: - * ACEXML/examples/SAXPrint/Print_Handler.cpp: - * ACEXML/examples/SAXPrint/Print_Handler.h: - * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: - * ACEXML/examples/SAXPrint/SAXPrint_Handler.h: - * ACEXML/examples/SAXPrint/main.cpp: - * ACEXML/examples/SAXPrint/svc.conf.xml: - * ACEXML/examples/svcconf/Svcconf_Handler.cpp: - * ACEXML/examples/svcconf/Svcconf_Handler.h: - * ACEXML/examples/svcconf/main.cpp: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.h: - * ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp: - * ACEXML/parser/debug_validator/Debug_DTD_Manager.h: - * ACEXML/parser/debug_validator/Debug_Element_Builder.cpp: - * ACEXML/parser/debug_validator/Debug_Element_Builder.h: - - Switch over the files to support Native Exceptions. - - * ACEXML/parser/parser/Parser.cpp: - * ACEXML/parser/parser/Parser.h: - - Use the obstack unwind to unwind the stack and reuse memory. - Currently not done throughout the parser. That will come later. - - * ace/Makefile.ace: - - Added Codecs to ACE_COMPONENTS when building FOR_TAO. Thanks to - Don Hinton for suggesting this. - - * include/makeinclude/rules.local.GNU: - - Clean up the old symlinks under $ACE_ROOT/ace when building a - new version of the libraries. - - * tests/Makefile: - - Cleanup the Codecs_Test when $ACE_ROOT/ace has been realcleaned - previously. - -Fri Oct 11 12:44:58 UTC 2002 Craig Rodrigues - - * RTJava/*: Removed. Angelo Corsaro - keeps RTJperf related files in another CVS repository. - - * ace/config-freebsd-pthread.h: Improved check of - _POSIX_REALTIME_SIGNALS preprocessor constant. - -Thu Oct 10 16:02:20 2002 Ossama Othman - - * ACE version 5.2.5 released. - -Thu Oct 10 13:56:35 2002 Ossama Othman - - * bin/make_release (check_workspace): - - Ignore platform_macros.GNU and config.h files. They are - needed when cutting the beta/release. This isn't a problem - since the ACE/TAO kits are created from a "cvs export"ed - workspace that doesn't include those files. - -Thu Oct 10 15:11:07 2002 Balachandran Natarajan - - * bin/make_release: A pattern matching issue. The cvs server now - gives a message starting with "cvs server:.." instead of "cvs - checkout:..". This created problems for Ossama when he was - trying to cut the beta. - -Wed Oct 9 23:43:51 2002 Steve Huston - - * ace/WIN32_Asynch_IO.cpp (ACE_Asynch_Read_Stream::readv, - ACE_Asynch_Write_Stream::writev, ACE_Asynch_Read_Dgram::recv, - ACE_Asynch_Write_Dgram::send): Don't double-increment iovcnt - while checking for the need for multiple iov per message block. - Fixes bug introduced in: - Fri Oct 4 20:22:41 2002 Steve Huston - -Wed Oct 9 23:08:19 2002 Steve Huston - - * include/makeinclude/rules.lib.GNU: For the funky AIX shr.o/lib*.a - machination, declare shr.o as .INTERMEDIATE to avoid rebuilding it - all the time for nothing. Thanks to Craig L. Ching for motivating - this. - -Wed Oct 09 12:19:40 2002 Nanbor Wang - - * bin/PerlACE/Process_Win32.pm: Added hack to purify a process. - This will allow us to purify all the examples, tests much - easier. It is, however, tightly coupled to Purify 6.0. The - script automaticaly switch to purifying the process if the - ACE_RUN_PURIFY_CMD environment variable is defined. See the - comments in this file for more details. - -Tue Oct 8 21:06:23 2002 Steve Huston - - * ace/config-sunos5.6.h: Undef ACE_HAS_TEMPLATE_TYPEDEFS for the - Forte 7 compiler (C++ 5.4). It should work, but Malloc_T doesn't - compile correctly with it enabled. Thanks to Serge Kolgan - for this fix. - - * ace/config-sunos5.9.h: New config.h file for Solaris 9. Right now, - it just includes config-sunos5.8.h, but Solaris 9 has some new things - to play with as time goes on. - -Tue Oct 8 09:22:41 2002 Steve Huston - - * ace/SOCK_Dgram_Bcast.cpp (send): Use next_ to find next - ACE_Bcast_Node in if_list_ rather than incrementing pointer. - Thanks to for this fix. - -Mon Oct 7 17:29:14 2002 Ossama Othman - - * tests/Proactor_Scatter_Gather_Test.cpp (initiate_read_file): - - Cast one of the operands in a subtraction operation to a size_t - to address a problem exhibited by Borland C++ where the ACE_MIN - template expects two parameters of the same type, but was - getting two parameter of different types. This problem occurred - on platforms where "unsigned int" and "unsigned long" are - different types. - -Mon Oct 07 15:21:44 2002 Nanbor Wang - - * ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: - * ACEXML/common/XML_Common.dsp: - * ACEXML/parser/debug_validator/Debug_Validator.dsp: - * ACEXML/parser/parser/Parser.dsp: - * ACEXML/tests/HttpCharStream_Test.dsp: - * ACEXML/tests/NamespaceSupport_Test.dsp: - * ACEXML/tests/Transcoder_Test.dsp: - * apps/JAWS2/server.dsp: - * examples/Export/test.dsp: - * examples/IPC_SAP/FILE_SAP/client.dsp: - * examples/Logger/client/client.dsp: - * examples/Logger/simple-server/server_loggerd.dsp: - * examples/QOS/Simple/receiver.dsp: - * examples/QOS/Simple/sender.dsp: - * examples/Reactor/Multicast/client.dsp: - * examples/Reactor/Multicast/server.dsp: - * examples/Reactor/Proactor/test_udp_proactor.dsp: - * examples/Synch/proc_sema.dsp: - * tests/DLL_Test_Impl.dsp: - * tests/Framework_Component_DLL.dsp: Disabled the generation - of precompiled headers. They were taking up too much disk space - on the nightly build machines. Thanks to Ossama for noticing - this. - -Sun Oct 6 09:03:28 2002 Ossama Othman - - * ace/UPIPE_Stream.cpp (send): - - Silenced a signed/unsigned conversion warning using a - static_cast<> until a better solution presents itself. - -Sat Oct 5 17:04:38 2002 Steve Huston - - * ace/Memory_Pool.cpp (ACE_Pagefile_Memory_Pool::acquire): Remove - casts on comparisons, allowing size_t values to compare directly. - - * apps/JAWS/server/IO.cpp (JAWS_Synch_IO::transmit_file): Remove - cast from send_n() return value to avoid signed/unsigned compare. - -Sat Oct 5 12:30:49 2002 Steve Huston - - * ace/Service_Manager.cpp (list_services): Remove extra right paren. - - * tests/Proactor_Timer_Test.cpp: Fixed signed/unsigned mismatch. - -Fri Oct 04 22:24:23 2002 Krishnakumar B - - * ACEXML/common/URL_Addr.cpp (string_to_addr): Added a new wrapper - which matches the signature in ACE_INET_Addr, and delegates the - work to the ACEXML_Char function to work around Borland BCB - warning about hidden virtual function. - -Fri Oct 4 21:32:51 2002 Steve Huston - - * ace/Service_Manager.cpp (list_services): Correct compiler - warning about sign/unsigned comparison. Don't bother for checking - transfer count != requested, since send_n always reports - an error (0 or -1) if there was a fail before the whole 'n' sent. - -Fri Oct 4 20:22:41 2002 Steve Huston - - * ace/ace_dll64.mak: Removed the /wd4267 to re-enable the - conversion size_t to int warning. - Added Atomic_Op.obj to the files to compile directly. - - * ace/ACE.cpp (recv, send): Extract int, not size_t, from implicit - char */int pairs. - (send_n, recv_n with ACE_Message_Blocks): Message block length - is a size_t but iov_len is u_long, so make as many iovs as needed - to fit the entire requested length. - - * ace/Asynch_Acceptor.cpp: Added casts to fix size_t->DWORD warnings. - - * ace/Asynch_IO.cpp (transmit_buffers): Cast lengths to DWORD for - Win64. - - * ace/Configuration.{h cpp} (set_binary_value, get_binary_value): - Change length arg from u_int to size_t. - - * ace/Configuration_Import_Export.cpp: Align use of u_int, size_t. - - * ace/Containers_T.cpp (ACE_Fixed_Set::insert): Use ssize_t, not int, - to track free slot since max size is a size_t. - - * ace/FIFO_Recv_Msg.i (recv): - * ace/FIFO_Send_Msg.i (send): Squeeze size_t max_len down to an int - because this gets run through the ACE_Str_Buf variant of recv/send. - If this restriction is too much, the code will need to be - refactored. - - * ace/FILE_Addr.cpp (set): Cast size_t back to int for base_set(). - - * ace/FILE_IO.cpp (recv): Count iov tuples as an int to match what's - expected at the ACE_OS::readv level. - - * ace/Filecache.h (ACE_File_Object): Change size_ from size_t to off_t. - It's a better match for what it's used for (checking against - stat.st_size, which is an off_t also). - - * ace/Functor_T.i (ACE_Pointer_Hash): Add #pragmas for Win64 to - shut up the compiler warnings about casting a pointer to u_long. - - * ace/INET_Addr.{h i} (ip_addr_size): Return an int, not size_t. This - value is just passed on to other methods (like host db functions) - that are expecting an int. Also, being the size of a IP addressing - structure, all the values are well within range of an int. - - * ace/Lib_Find.cpp (ldfind, get_temp_dir): Cast path length value to - DWORD for calls to SearchPath and GetTempPath on Windows. - - * ace/Local_Name_Space.{h cpp} (ACE_NS_String::strstr): Cast return - value from size_t to int. (hash): Change return type from size_t - to u_long to match what's expected from ACE_Hash<>, which this is - an adapter for. - - * ace/Log_Msg_NT_Event_Log.cpp (open): Cast msg_file length to - DWORD for use in Windows API. Use size_t for reg key string length - since it need not be passed to a Windows API. - - * ace/Log_Record.cpp (round_up): Do all the rounding math in size_t - terms, since all factors are size_t, but cast it back to ACE_UINT32 - since the ACE_Log_Record length_ field is ACE_UINT32 and should - stay that way due to the need to send it over the network as a - known-length field. - (print): Cast verbose_msg string length to int so it can be compared - to fprintf return value. - - * ace/MEM_Acceptor.cpp (accept): Cast string length to ACE_UINT16. - - * ace/MEM_SAP.h: - * ace/MEM_IO.{h cpp} (ACE_Reactive_MEM_IO, ACE_MT_MEM_IO): Changed - return type of send_buf and recv_buf from int to ssize_t. This - is consistent with other ACE sock-type send methods, and matches - the range of sizes allowed to request sending of and the return - type expected by ACE_MEM_IO::send() and recv(). - - * ace/Mem_Map.i (advise): Get a size_t length as expected by - ACE_OS::madvise(). - - * ace/Mem_Map.cpp (map_it): Use off_t instead of size_t to calculate - null_byte_positition when extending the file. This is the type - that ACE_OS::pwrite() expects. - - * ace/Memory_Pool.h (ACE_Pagefile_Memory_Pool::Shared_Control_Block): - Changed mapped_size_ from int to size_t to match the sizes it can - take (max_size_)and what's expected in the Win32/64 API calls. - Changed free_offset_ from int to ptrdiff_t to represent the full - range of mapped address range. Changed free_size_ from int to - size_t to match max_size_ and the range of mappable sizes. - Changed 'append' arg to map() from int to size_t, also to represent - full range of mappable size. - - * ace/Memory_Pool.i (round_up): Cast nbytes to off_t for call to - ACE::round_to_page_size(). - - * ace/Memory_Pool.cpp: Adjust usage of size_t/off_t, usually with - casts where needed. - (map): For Win64, allow full 64-bit range of file mapping size. - - * ace/Message_Queue.{h i cpp} (ACE_Message_Queue_NT): Changed - max_threads arg (ctor and open()) and max_cthrs_/cur_thrs_ from - size_t to DWORD, as expected by the underlying API (this class - is not portable, or compilable outside of ACE_WIN32). - - * ace/Msg_WFMO_Reactor.{h cpp} (poll_remaining_handles()): Changed - argument from size_t to DWORD - matches similar changes to - WFMO_Reactor, below. - - * ace/Name_Request_Reply.cpp (ctor): Cast length to ACE_UINT32. - - * ace/Naming_Context.cpp (info): Cast info string length to int. - - * ace/OS.{h i cpp}: (sema_post): Changed count from size_t to u_int, - to match both the value range for initializing (sema_init) and - the underlying OS calls on all platforms. - (getipnodebyaddr): For IPv4 case, cast len to int. - (recvfrom): size_t->int casting for Windows. - (read, write, pread, pwrite): Reduce byte count to DWORD range - for Windows. - (getcwd): Windows offers an int len for getcwd(), as opposed to - size_t everywhere else... so special-case the Windows need to - cast the length down. - (thr_create): Cast stack_size to u_int for beginthreadex(). - Other miscellaneous int/size_t casts to get Win64 to build clean. - (iovec): Changed iov_len field from size_t to u_long to match - WSABUF, as comment says to. - - * ace/OS_String.cpp (strtok_r_emulation): Change string lengths from - int to size_t, matching that returned from strlen(). - - * ace/Process.{h cpp} (setenv_i): Change len arg from int to size_t. - Matches string lengths in general, and the expectations of both - callers and callees with this information. - Changed environment_buf_index_ and environment_buf_len_ from int - to size_t as well, matching available range. - - * ace/Process_Manager.cpp: size_t to DWORD casting for current_count_. - - * ace/Registry.cpp (make_name): Use ssize_t instead of int for string - positions - matches interface for ACE_TString, which this method - accepts and uses. - - * ace/Remote_Name_Space.cpp (bind, rebind, resolve, list_names, - list_values, list_types, list_name_entries, list_value_entries, - list_type_entries): Cast length values to ACE_UINT32 as - ACE_Name_Request expects. - - * ace/Select_Reactor_Base.cpp (ACE_Select_Reactor_Handler_Repository): - In open(), cast size to int for call to ACE::set_handle_limit(). - - * ace/Service_Config.cpp (ctor): Cast size value to int for passing to - ACE_Service_Repository::instance(). The ACE_Service_Repository - size should probably be changed to size_t for consistency. - - * ace/Service_Manager.cpp (info): Cast return string length to int. - - * ace/Service_Types.cpp (info): Cast return string length to int. - - * ace/Shared_Memory_MM.i (get_segment_size): - * ace/Shared_Memory_SV.i (get_segment_size): Cast shared_memory_ size - to int. Legit since the open() call's size is an int; otherwise - this should be changed to return a size_t. - - * ace/SOCK_Connector.cpp (shared_connect_start): Align use of - int/size_t. - - * ace/SOCK_Dgram.{h cpp} (recv, send): - * ace/SOCK_Dgram_Bcast.{h cpp} (recv, send): - * ace/SOCK_Sgram_Mcast.{h i} (send, recv): Change iovcnt from - size_t to int to match the args used by other iovcnt-accepting - methods in ACE. - - * ace/SOCK_Dgram_Bcast.i (send): Align use of int/size_t. - - * ace/SOCK_IO.cpp (recv (size_t, ...), send(size_t, ...)): The - comments say the pairs are char*, int, but the code extracted - ssize_t values instead of int. Changed to extract ints as the - comment says. The values are put in iovecs which accept - unsigned long, not ssize_t. - - * ace/SPIPE_Addr.cpp (set): Align use of int/size_t. - - * ace/SPIPE_Stream.cpp (send, recv): Align use of int/size_t. - - * ace/SString.i (ACE_NS_WString): Add missing arg for ACE_WString - ctor initialization. - (ACE_SString::rfind): Cast string len to int for searching... note - this limits the string to 'int' range, though the other size - arguments/parameters are size_t. There are crocodiles lurking - here... hopefully this class is on its way out. - - * ace/SV_Shared_Memory.{h i} (get_segment_size, round_up): Changed - return type from int to size_t, matching it's argument type. - Also changed class's size_ member from int to size_t, matching - the arg from which it's set. - - * ace/Synch.{h i} (ACE_Semaphore::release): Change release count from - size_t to u_int - also see corresponding change to OS.h, above. - - * ace/Thread.{h cpp} (spawn_n): Change return value from int to size_t, - matching the range available via the 'n' argument. - - * ace/Thread_Manager.{h i cpp}: - (count_threads): Change return value from int to size_t. Matches - the requestable number of threads in spawn_n, as well as - underlying container size return. - (find_task): Change slot argument from int to size_t... matches - range of available slots. The default changed from -1 to 0, but - should make no difference since first check is for 0 >= . - (thread_all_list, task_all_list, task_list, thread_list, - hthread_list, thread_grp_list, hthread_grp_list): Changed - return value from int to ssize_t, to match argument. - - * ace/Timer_Hash_T.{h cpp}: This timer queue generates timer IDs - by casting a pointer to a dynamically-allocated structure to - a long. This, of course, is invalid on Win64. On Win64, the ID - is obtained by masking off the lower 32 bits of the pointer, - and saving the upper 32 bits. This adds an assumption that all - the Hash_Tokens allocated will have the same upper 32 bits in - the pointer value. Note that the original pointer value is used - as the ACT value in the timer scheduled within this class. The - timer ID must only be reconverted to cancel a timer by ID, or - to explicitly reschedule it. Expiration and cancel-by-handler - are all handled by reconverting the ACT to the dynamically-allocated - memory area (Hash_Token). - Also changed hash starter from time.usec() to time.sec(). usec() - isn't usually anything of value. - - * ace/Timer_Wheel_T.cpp: Added #pragma to disable compile warnings. - We know of the issue and deliberately used the fields this way. - - * ace/UPIPE_Stream.{h cpp} (send, recv): Changed return value from - int to ssize_t, consistent with other IPC streams in ACE. - - * ace/WFMO_Reactor.{h cpp} (ACE_WFMO_Reactor_Handler_Repository): - Changed max_handlep1_ and max_handlep1 () from size_t to DWORD. - Matches what they're used for (input to WaitForMultipleObjects). - (ACE_WFMO_Reactor): Changed wait_for_multiple_events() to return - DWORD, not int - matches what WaitForMultipleObjects returns. - Changed wait_status and slot args to dispatch(), safe_dispatch(), - dispatch_handles (), dispatch_handler (), simple_dispatch_handler (), - complex_dispatch_handler (), and poll_remaining_handles () to also - be DWORD, not int, as they're working directly (or close to it) - with the same WFMO return value. - - * ace/WIN32_Asynch_IO.cpp (ACE_WIN32_Asynch_Read_Stream::readv, - ACE_WIN32_Write_Stream::writev, ACE_WIN32_Asynch_Read_Dgram::recv, - ACE_WIN32_Asynch_Write_Dgram::send): - Make multiple iovecs if needed to transfer all data requested. - (ACE_WIN32_Asynch_Read_Stream::shared_read, - ACE_WIN32_Asynch_Write_Stream::shared_write, - ACE_WIN32_Asynch_Read_File::readv, - ACE_WIN32_Asynch_Write_File::writev, - ACE_WIN32_Asynch_Accept::accept, - ACE_WIN32_Asynch_Transmit_File::transmit_file): Limit requested - bytes to MAXDWORD. Return -1, ERANGE if over. - - * ace/WIN32_Proactor.{h cpp}: Changed number_of_threads_ member from - size_t to DWORD, matching the API calls it's passed to. - (post_completion): Cast transfer count from size_t back to DWORD - for posting. The cast is ok since the original requested transfer - counts (in WIN32_Asynch_IO) were limited to DWORD range. - - * tests/Config_Test.cpp: - * tests/Proactor_Scatter_Gather_Test.cpp: - * tests/Proactor_Test.cpp: - * tests/Proactor_Timer_Test.cpp: - * tests/Reactor_Timer_Test.cpp: - * tests/Semaphore_Test.cpp: - * tests/TP_Reactor_Test.cpp: size_t/int fixes. - -Fri Oct 4 18:39:19 2002 Steve Huston - - * tests/Recursive_Condition_Test.cpp: Added a deactivate/wait - on the timer queue to make sure the queue shuts down. This - reveals a bug in the recursive condition... it's stuck. - Also added a much simpler wait/signal test that shows the issue - without the additional stuff to trudge through while looking for - the problem. Thanks to Philippe Haussy - for reporting this and sending a nice, concise test case. - - * THANKS: Added Philippe Haussy to the Hall of Fame. - -Thu Oct 3 17:29:36 2002 Douglas C. Schmidt - - * ace/OS_Dirent.cpp (readdir_emulation): Don't do a FindNextFile() - right after FindFirstFile() to avoid overwriting the existing - data! Thanks to Dmitry Botcharnikov for - reporting this. - -Wed Oct 2 20:44:19 2002 Steve Huston - - * tests/Proactor_Scatter_Gather_Test.cpp: Added some more diagnostic - info and removed ACE_ASSERT on file not compared correctly - just - note the error and return. When about to writev a chain of blocks, - update the odd/even chains before writing in case the write fails; - fixes a crash on NT4... test still fails, but doesn't crash. - -Wed Oct 2 10:50:49 2002 Ossama Othman - - * ace/Basic_Types.h: - * ace/Basic_Types.cpp: - - Do not rely on the u_int and u_long typedefs. They are not - always defined in system headers. Addresses a compile-time - issue when _XOPEN_SOURCE is explicitly set to 600 on Glibc - platforms, such as Linux. - - * ace/OS.h: - - Explicitly define the u_{char,short,int,long} typedefs on Glibc - platforms when _BSD_SOURCE is not defined. Addresses a - compile-time issue when _BSD_SOURCE is not defined. - - * ace/config-linux.h: - - If ACE_HAS_PTHREADS_UNIX98_EXT is not defined, do not define - ACE_LACKS_RWLOCK_T. Addresses a compile-time issue when - _XOPEN_SOURCE is not set to a value >= 600. - - * ace/config-linux-common.h: - - Reverted change that explicitly defined _XOPEN_SOURCE to 600. - Explicitly defining _XOPEN_SOURCE to 600 causes many - compile-time errors and warnings to occur. - - Moved the check for (_XOPEN_SOURCE >= 600) after the - include. That header may define _XOPEN_SOURCE when - other macros, such as _GNU_SOURCE, are defined. - -Wed Oct 2 01:08:51 2002 Krishnakumar B - - * ace/SString.cpp (ACE_NS_WString): Fix the silly off-by-one error - causing heap corruption and core dumps in $ACE_ROOT/Naming_Test. - Thanks to Vladislav for reporting the - problem. - -Tue Oct 1 20:46:35 2002 Christopher Kohlhoff - - * ace/Atomic_Op.cpp: - Added explicit instantiations for ACE_Atomic_Op - and ACE_Atomic_Op_Ex. Programs using ACE should - no longer explicitly instantiate these classes. This change eliminates - the complexity of having to test for the ACE_HAS_BUILTIN_ATOMIC_OP - define when doing explicit instantiations. - - * tests/Atomic_Op_Test.cpp: - * tests/Notify_Performance_Test.cpp: - Removed ACE_Atomic_Op explicit instantiations that are now made in the - ACE library itself. - -Tue Oct 1 19:49:36 2002 Krishnakumar B - - * ace/Exception_Macros.h: - - Fixed some documentation for using the Exception macros. - - * ace/OS.i: - * ace/config-aix-4.x.h: - * ace/config-hpux-11.00.h: - * ace/config-linux-common.h: - * ace/config-linux.h: - - Enable support for using native rwlocks on Linux. - -Tue Oct 1 05:06:18 2002 Balachandran Natarajan - - * ace/WIN32_Asynch_IO.cpp: Minor cosmetic changes. - -Mon Sep 30 12:21:32 2002 Ossama Othman - - From Christophe Juniet - * ace/Sock_Connect.cpp (get_bcast_addr, get_ip_interfaces) - (count_interfaces): - - The ifr_addr.sa_len field was not taken into account when - incrementing the ifreq pointer on FreeBSD. Addresses network - interface enumeration problems in FreeBSD builds. - -Mon Sep 30 09:33:42 2002 Christopher Kohlhoff - - * bin/MakeProjectCreator/templates/bor.mpd: - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - * include/makeinclude/clean.bor: - * include/makeinclude/outputdir.bor: - Add support for the 'install', 'dllout' and 'libpaths' - MakeProjectCreator settings in generated Borland makefiles. - -Mon Sep 30 13:25:12 2002 Johnny Willemsen - - * include/makeinclude/platform_linux_borland.GNU: - Now it is possible to create shared libraries, but no executables - yet with Kylix3. - -Mon Sep 30 11:33:12 2002 Johnny Willemsen - - * include/makeinclude/platform_linux_borland.GNU: - Extended Kylix3 GNU file. - -Mon Sep 30 11:13:33 2002 Johnny Willemsen - - * ace/config-borland-common.h: - * ace/config-win32-common.h: - Moved the dll export stuff for the Borland compiler from the win32 - file to the borland file because the Kylix compiler also supports - the dll export stuff for shared objects. - -Mon Sep 30 10:19:33 UTC 2002 Johnny Willemsen - - * include/makeinclude/rules.bin.GNU: - Added special part for Kylix. The Kylix linker expects that the - object files and the name of the executable are separated using - a comma. - -Sun Sep 29 08:19:09 2002 Nanbor Wang - - * ACEXML/examples/SAXPrint/Makefile: Removed inclusion of - rules.lib.GNU to allow mingw compilation to proceed. Thanks to - Vince Mounts for reporting this. - - * ace/SString.h: Moved the ACE_INLINE before ACE_Export in - declaration of operator+ to resolved a mingw warning. Thanks to - Vince Mounts for reporting this. - -Fri Sep 27 12:49:33 2002 Johnny Willemsen - - * include/makeinclude/rules.lib.GNU: - Added special part for Kylix - -Thu Sep 26 21:52:05 2002 Balachandran Natarajan - - * THANKS: Added Erich Hochmuth" to - the hall of fame. - -Thu Sep 26 13:48:26 2002 Balachandran Natarajan - - * ace/TP_Reactor.cpp (remove_handler): Make a check for the return - value from the remove_handler_i () call before calling - handle_close (). Thanks to Eric Malenfant - for suggesting this. - - Eric mentions that doesnt show up the BUG 1020 problem. But - local testing here doesnt tell so. I still see some core dumps - with a test, albeit slowly! The patch cannot do any harm and - hence this is checked in. - -Thu Sep 26 07:16:56 2002 Douglas C. Schmidt - - * ace/Local_Name_Space.h (ACE_NS_String): Removed the comment - about ACE_NS_String not having a destructor since this seems to - have been overtaken by events. Thanks to Vladislav Zverev - for reporting this inconsistency. - -Thu Sep 26 09:18:55 UTC 2002 Johnny Willemsen - - * ace/Logging_Strategy.h: - Improved doxygen documentation. - -Thu Sep 26 05:42:33 UTC 2002 Johnny Willemsen - - * include/makeinclude/platform_gnuwin32_common.GNU: - Since mingw can now handle exceptions across dll boundries - removed that restriction. Thanks for Vince Mounts - for reporting this. - -Wed Sep 25 17:58:43 UTC 2002 Johnny Willemsen - - * ace/Basic_Stats.h: - * ace/Connector.h: - * ace/INET_Addr.h: - * ace/OS.h: - * ace/OS.i: - * ace/Service_Config.h: - * ace/Stats.h: - * ace/Timer_Queue_T.cpp: - * ace/TLI_Connector.cpp: - * ace/XTI_ATM_Mcast.i: - * ace/RMCast/RMCast_Reliable_Factory.h: - Small fixes in method argument names, types, comments to fix doxygen - warnings and improve the generated documentation. - -Wed Sep 25 08:44:13 2002 Ossama Othman - - * tests/Notify_Performance_Test.cpp: - - Do not explicitly instantiate an ACE_Atomic_Op template if ACE_HAS_BUILTIN_ATOMIC_OP is defined. - Defining it causes template specialization with the same - parameters to be declared. Fixes a compile-time problem in - explicit template instantiation builds. - -Wed Sep 25 14:49:12 UTC 2002 Johnny Willemsen - - * bin/fuzz.pl: - Extended the types of files that are tested in the doxygen - @file with the files_idl. Some of the idl files are parsed to - generate doxygen documentation and when then a @file tag - exists the filename must be correct. - -Tue Sep 24 20:17:50 UTC 2002 Don Hinton - - * tests/Process_Manager_Test.cpp: Removed the ACE_HAS_THREADS - requirement and the unneeded call to - ACE_Reactor::instance ()->owner () so that it would run cleanly - on single threaded builds. Thanks to Steve Huston for this - suggestion. - - * tests/run_test.lst: Added !STATIC to Framework_Component_Test since - it must load a shared library as part of the test. - -Tue Sep 24 16:07:21 2002 Steve Huston - - * examples/C++NPv1/Logging_Client.cpp: - * examples/C++NPv2/Select_Reactor_Logging_Server.cpp: - * examples/C++NPv2/Server_Shutdown.cpp: - * examples/C++NPv2/TP_Reactor_Logging_Server.cpp: - For Windows builds without ACE_HAS_STANDARD_CPP_LIBRARY, use - gets() and a char[] instead of the standard string and getline - functions. We don't want to be going this way for ACE in general, - but this fixes the legacy-mode builds. - -Tue Sep 24 06:30:31 UTC 2002 Johnny Willemsen - - * ace/ACE.h: - * ace/Acceptor.h: - * ace/Activation_Queue.h: - * ace/Asynch_Acceptor.h: - * ace/Asynch_Connector.h: - * ace/Arg_Shifter.h: - * ace/Get_Opt.h: - * ace/Local_Tokens.h: - * ace/Method_Request.h: - * ace/Thread_Manager.h: - * ace/WIN32_Asynch_IO.h: - * ace/INET_Addr.h: - Corrected doxygen tags. - - * ace/CDR_Stream.cpp (write_string): - * ace/Map_T.i (find, unbind): - * ace/Timer_Hash_T.cpp: - Made arguments in method definition and implementation the - same. - - * ace/Future.h: - Improved doxygen documentation. - - * ace/POSIX_CB_Proactor.i: - Added same ifdef as in the header file around the code in this - file, so that doxygen doesn't parse it. - -Mon Sep 23 13:43:11 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Fixed a bug with the per-project workspaces. - -Mon Sep 23 13:00:13 2002 Douglas C. Schmidt - - * ace/Log_Msg_NT_Event_Log.{h,cpp}: Made the #ifdefs consistent - in both the *.h and *.cpp files. Thanks to Johnny Willemsen for - reporting this. - -Mon Sep 23 13:14:28 2002 Steve Huston - - * ace/Task.h (wait()): - * ace/Thread_Manager.h (wait_task()): Improved documentation, also - clarifying that the waited-for threads have been joined upon return. - -Mon Sep 23 12:05:38 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - For GNU, NMake and Borland projects, create a workspace per - project file. - - * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - Remove trailing whitespace. - -Sun Sep 22 08:49:41 2002 Douglas C. Schmidt - - * ace/Svc_Handler.cpp (flush_i): Don't flush the queued messages - if the connection fails. Thanks to Andrew Finnell - for this fix. - -Sat Sep 21 23:05:56 2002 Balachandran Natarajan - - * bin/subst_env.pl: Improved conversion to different coding - styles. Thanks to Oliver Kellog for suggesting this. - -Fri Sep 20 13:52:23 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/NMakeProjectCreator.pm: - - Fixed a problem with implicit idl dependencies. - - * bin/MakeProjectCreator/README: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/templates/bor.mpd: - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/gnu.mpd: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Added the ability to override or modify idlflags on a per file - group basis. - -Thu Sep 19 22:13:13 2002 Krishnakumar B - - * ACEXML/common/HttpCharStream.cpp: Added license for the FSM in - HttpCharStream.cpp. It is a shortened BSD license which is - compatible with ACE/TAO licensing. - -Wed Sep 18 12:26:22 2002 Douglas C. Schmidt - - * examples/Misc/test_trace.cpp: The call to activate() was - being invoked with the parameters in the wrong order. Thanks to - Jeff W for reporting this. - -Tue Sep 17 17:26:40 2002 Ossama Othman - - * ace/Basic_Types.cpp: - - Cosmetic changes to clarify some preprocessor blocks. - - * ace/CDR_Base.h: - - Corrected placement of '#' character in preprocessor - directives. It belongs in the first column, not arbitrary - ones. - -Tue Sep 17 01:35:54 UTC 2002 Don Hinton - - * ace/OS.h: Remove redundant MAXPATHLEN definition when - building VxWorks. Thanks to Rob Andzik - for pointing this out. - -Mon Sep 16 17:36:33 UTC 2002 Johnny Willemsen - - * ace/Hash_Cache_Map_Manager_T.cpp: - Use typedefs from header file. - - * ace/Process.i (setreugid): - Made method implementation same as definition - -Mon Sep 16 15:26:56 UTC 2002 Johnny Willemsen - - * ace/config-doxygen.h: - Added define ACE_HAS_TEMPLATE_TYPEDEFS to generate - ACE_Event_Handler_T documentation. - -Mon Sep 16 07:35:12 UTC 2002 Johnny Willemsen - - * ace/config-doxygen.h: - Added define ACE_HAS_EVENT_POLL to generate Dev_Poll reactor - documentation - - * ace/Acceptor.h: - * ace/Containers_T.{h,cpp}: - * ace/Dev_Poll_Reactor.h: - * ace/Sample_History.h: - * ace/Service_Config.h: - Improved doxygen documentation. - -Sat Sep 14 10:34:34 2002 Douglas C. Schmidt - - * ace/config-freebsd-pthread.h: Added - #undef ACE_LACKS_UCONTEXT_H if we're compiling for FreeBSD - version > 4. Thanks to Christophe Juniet - for reporting this. - -Fri Sep 13 08:37:09 2002 Ossama Othman - - * ace/Time_Value.h: - * ace/Time_Value.inl: - - Removed copy constructor. The default compiler-generated copy - constructor will do fine since ACE_Time_Value is a POD class. - This may also avoid potential confusion due to a missing - explicit assignment operator. The compiler-generated assignment - operator will suffice in this case, too. - - From Gonzalo Diethelm - * bin/.cvsignore: - * tests/.cvsignore: - * tests/log/.cvsignore: - - Files to silence annoying CVS messages regarding generated files - it doesn't know about. - -Fri Sep 13 08:57:03 2002 Chad Elliott - - * bin/MakeProjectCreator/USAGE: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - * bin/MakeProjectCreator/templates/bor.mpd: - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/gnu.mpd: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Added the ability to modify template and project variable - assignments from the command line. Also added rules to process - idl files and place the output in the directory relative to the - specified idl file. - - Modified to not add duplicates to file lists. - -Thu Sep 12 17:18:43 2002 Douglas C. Schmidt - - * ace/Synch.{h,cpp}: Only define the recursive condition support if - we're running on Win32. Hopefully, this will be generalized for - VxWorks at some point. Thanks to Rob Andzik - for reporting this. - -Thu Sep 12 19:29:41 2002 Steve Huston - - * ace/Atomic_Op_T.i (dump): Don't try to return a value from a - 'void' method. - -Thu Sep 12 17:38:10 2002 Nanbor Wang - - * ace/Malloc_T.h: - * ace/Malloc_T.i (release): Added an extra argument (with default - value) to release so that we could decrease the refcount and - release the backing store if needed atomically (while holding the - lock.) This was causing a race condition when removing mmap - files used by MEM_Stream's. - - * ace/Memory_Pool.h: - * ace/Memory_Pool.i: - * ace/Memory_Pool.cpp: Changed the release method to take an extra - argument so that we can control whether we want to perform - cleanup on backing store or not. - - * ace/MEM_SAP.cpp (close_shm_malloc): Changed to use the extended - release method to remove the shared_memory. - - * ace/MEM_IO.cpp: When sending/receiving data reactively, make - sure we don't even try if the socket is not valid. - -Thu Sep 12 08:39:46 2002 Douglas C. Schmidt - - * ace/Synch.h (class ACE_recursive_mutex_state): Changed "HANDLE" to - "ACE_HANDLE" to avoid problems with VxWorks. Thanks to Rob - Andzik and Don Hinton - for reporting this. - -Thu Sep 12 17:36:36 UTC 2002 Craig Rodrigues - - * include/makeinclude/wrapper_macros.GNU: Use awk instead of - perl to determine the ACE major, minor, and beta versions. - -Thu Sep 12 12:02:31 2002 Steve Huston - - * tests/TSS_Test.cpp: Pass iteration count to worker() as a pointer - to int, not an int cast to a pointer and back. - -Wed Sep 11 08:44:28 2002 Douglas C. Schmidt - - * Our thoughts and prayers go out to the victims of 9/11/01 on the - anniversary of this terrible tragedy. - -Wed Sep 11 13:03:48 2002 Carlos O'Ryan - - * ace/Select_Reactor_Base.cpp: - Check the suspend mask before completely forgetting about a - handle, otherwise things do not work correctly with TP_Reactors - and multiply-registered handlers. This fixes: - http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1306 - -Tue Sep 10 17:46:51 2002 Steve Huston - - * ace/Malloc_T.{h i cpp} (ACE_Malloc_T): Changed the lock_ member from - an ACE_LOCK to an ACE_LOCK *. Also added another constructor that - accepts an ACE_LOCK pointer instead of a ACE_TCHAR *lock_name. - This allows someone to form an ACE_LOCK externally and supply - it to the ACE_Malloc_T object. This is useful if special - permissions need to be set on the lock, such as the mode_t for - ACE_Process_Mutex. - -Tue Sep 10 14:06:02 2002 Krishnakumar B - - * ace/Obstack_T.cpp: - * ace/Obstack_T.h: - - Obstack is no longer restricted to fixed-size chunks. Chunk size - is increased by a power of two if we run out of memory in a - chunk. Added implementation of unwind operations. Stack can be - unwound by giving the address of an object on the stack. Fixed a - couple of bugs in the existing implementation when used with - WCHAR. We were incrementing the pointers by sizeof (CHAR) as - well as multiplying by sizeof (CHAR) to get the number of bytes - to be copied. This improvement doesn't deal with the alignment - issues as it requires a change in Obchunk which is postponed - till after ACE 5.3 is released. - - * tests/Obstack_Test.cpp: - - New, improved test which exercises all the code paths in the - implementation unlike the previous test. - -Tue Sep 10 12:32:33 2002 Carlos O'Ryan - - * ace/Connector.cpp: - Be more informative in error messages, at least report in what - library, class and function was the error detected. This fixes: - http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1304 - -Tue Sep 10 12:28:41 2002 Carlos O'Ryan - - * ace/Connector.cpp: - Be more paranoid about using AST's returned from cleanup_AST() - and always check the return value of that function. This fixes: - http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1303 - -Mon Sep 9 16:44:00 2002 Balachandran Natarajan - - * THANKS: Surprise, surprise, Gautam Thaker'ss name was not there - in the THANKS file. So added it. - -Mon Sep 9 16:57:41 2002 Steve Huston - - * ace/POSIX_Asynch_IO.cpp (cancel): Don't sanity-check the - proactor type - just call cancel_aio and let the proactor impl - figure it out. - - * examples/Reactor/Proactor/test_aiocb.cpp: Fixes to not crash. - -Mon Sep 09 11:37:13 2002 Nanbor Wang - - * ace/OS.cpp (cond_timedwait): Changed to pass absolute time when - using emulated semaphore on WinCE. Thanks to Herbert Wang - for reporting this. - - * ace/Thread_Manager.cpp (join): This function was not cropping - the thread return status when a thread had already exited when - we called and its Thread_Descriptor had been moved to - terminated_thr_list_. Thanks to Roger Weeks - for reporting the problem. - -Mon Sep 9 00:12:04 UTC 2002 Craig Rodrigues - - * ace/Makefile.dirs: - * examples/Makefile: - * tests/Makefile: - Remove references to obsolete ACE_HAS_GNUG_PRE_2_8 make - variable. - -Sat Sep 7 23:22:20 2002 Balachandran Natarajan - - * bin/make_release: The tar ball that is put out during the - release, is copied now to the the previous_versions directory - with the appopriate version information. This should work right - since this was tested against a local repo. - - Thanks to Preston A. Elder for motivating - this change. - -Sat Sep 7 18:03:21 2002 Steve Huston - - * ace/Proactor.cpp: Removed some ACE_Proactor:: prefixes on member - variable access, replacing with this-> to clarify what's happening. - - * ace/SUN_Proactor.cpp (handle_events): No need to cast a pointer to - long to check for 0. - Re-enabled some "should never happen" ACE_DEBUG lines until we - find out what's going wrong with this stuff. - -Thu Sep 5 12:13:51 2002 Steve Huston - - * ACEXML/common/URL_Addr.inl: Removed ACE_RCSID - it's in URL_Addr.cpp. - -Wed Sep 4 16:31:29 2002 Douglas C. Schmidt - - * Kelly Clarkson wins "American Idol." Go Kelly!! - -Wed Sep 4 17:50:27 2002 Steve Huston - - * tests/run_test.pl: Change run time limit from 300 to 400 seconds. - Some tests are timing out, and when run by hand, they run just over - 5 minutes, so give them a little more time. - -Wed Sep 4 17:31:24 2002 Steve Huston - - * tests/Cached_Conn_Test.cpp: ACE_DEBUG %@ for pointers, not %d. - -Wed Sep 4 20:59:40 UTC 2002 Craig Rodrigues - - * include/makeinclude/platform_irix5.2.GNU: - * include/makeinclude/platform_m88k.GNU: - * include/makeinclude/platform_netbsd.GNU: - * include/makeinclude/platform_qnx_neutrino.GNU: - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - * include/makeinclude/platform_sco-nothread.GNU: - Instead of setting -fno-implicit-templates, - use $(TEMPLATES_FLAG). Include platform_g++.GNU to get the - correct value of $(TEMPLATES_FLAG). - -Wed Sep 4 16:31:29 2002 Steve Huston - - * ace/Timer_Wheel_T.cpp: Formatting tweaks for ACE coding style. - -Wed Sep 4 20:08:54 UTC 2002 Don Hinton - - * ace/Framework_Component.cpp (close): - - Delete each component explicitely instead of calling - close_singleton () to avoid a memory leak. The dtor calls - close_singleton () anyway. Thanks Vladimir Chovanec - for reporting the leak and - suggesting the fix. - -Tue Sep 03 22:59:27 2002 Krishnakumar B - - * ACEXML/common/XML_Common.dsp: - - Added URL_Addr.inl to common. - -Tue Sep 03 22:40:22 2002 Krishnakumar B - - * ACEXML/common/HttpCharStream.cpp: - - Handle WCHAR properly when getting data from URLs. - - * ACEXML/common/URL_Addr.cpp: - * ACEXML/common/URL_Addr.h: - * ACEXML/common/URL_Addr.inl: - - Fixes for proper parsing of URLs when URLs are WCHARs. - - * ACEXML/examples/SAXPrint/main.cpp: - - Use int in GetOpt instead of char or ACEXML_Char. - -Tue Sep 3 17:12:59 2002 Ossama Othman - - * ace/OS.cpp (num_processors_online): - - Fixed ACE_TRACE macro. - -Tue Sep 3 16:38:47 2002 Ossama Othman - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Atomic_Op.cpp is no longer a template source file. Moved it to - the "Source Files" folder. - - * ace/Synch.cpp (ACE_Mutex): - - Fixed "unused 'mode' argument" warning. - -Tue Sep 3 15:54:33 2002 Christopher Kohlhoff - - * ace/OS.h: - * ace/OS.cpp: - - Added new functions ACE_OS::num_processors() and - ACE_OS::num_processors_online() for determining the number of CPUs - available on a system. - - * ace/Atomic_Op.cpp: - * ace/Atomic_Op.h: - * ace/Atomic_Op.i: - * ace/Atomic_Op_T.cpp: - * ace/Atomic_Op_T.h: - * ace/Atomic_Op_T.i: - * ace/Object_Manager.cpp: - * ace/Makefile.bor: - * ace/Makefile.ace: - * ace/ace.mpc: - * tests/Atomic_Op_Test.cpp: - - Added a new fast, lightweight ACE_Atomic_Op template specialization - for x86 platforms that uses the architecture's atomic integer - primitives. It currently supports Win32 using MSVC6 or BCB, and g++ - for (in theory) all x86 operating systems. It selects the - appropriate implementation for single- or multi-CPU systems at - runtime, based on the return value of the ACE_OS::num_processors - function added above. - - Note that Atomic_Op.cpp is now a real .cpp file and not a template - file, and so project files need to be updated accordingly. The - template definitions have been moved to the new Atomic_Op_T.* files. - - Note also that the ACE_Atomic_Op::mutex() operation has been - deprecated (and is not supported for the new specialization). If - you need this functionality, consider using the ACE_Atomic_Op_Ex - template instead. - -Tue Sep 3 15:40:39 2002 Ossama Othman - - * tests/XtReactor_Test.cpp (sock_callback): - - Removed this unused static function. - - * tests/TkReactor_Test.cpp (sock_callback): - - Likewise. - - (ACE_TMAIN): - - Fixed "deprecated conversion from string constant to char *" - warning. - -Tue Sep 3 15:16:03 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Fixed a typo! - -Mon Sep 2 16:48:29 2002 Steve Huston - - * tests/OS_Test.cpp (ctime_r_test): Corrected ACE_Log_Msg to use - %P, not %p, to list process ID. - -Mon Sep 2 13:17:26 2002 Steve Huston - - * ace/Memory_Pool.{h cpp}: - (ACE_MMAP_Memory_Pool_Options): Added optional file_mode arg - to set the protection mode on the mapped file, if it is - created; defaults to ACE_DEFAULT_FILE_PERMS. - (ACE_MMAP_Memory_Pool): Added file_mode_ member that can be set - by the ACE_MMAP_Memory_Pool_Options. Defaults to - ACE_DEFAULT_FILE_PERMS. It's used for call to ACE_Mem_Map::open() - and ACE_Mem_Map::map(). - - * ace/Process_Mutex.{h cpp}: ACE_Process_Mutex ctor takes an optional - mode_t arg to set the backing store mode (for ACE_Mutex use) or the - mode for the System V semaphore, when it's used. - - * ace/Synch.{h cpp} (ACE_Mutex): Constructor takes an optional mode - to set backing store protection for Pthreads process mutex case, - where memory must be allocated to hold the mutex. - - These are laying the groundwork for fixing Bugzilla #1219. - -Mon Sep 2 14:07:12 2002 Krishnakumar B - - * ace/Exception_Macros.h: - - New file which holds the exception macros previously present in - CORBA_macros.h. This file also makes the macros a bit generic so - that they can be used in other modules than TAO. - - * ace/CORBA_macros.h: - - Include only the definitions needed for TAO/CORBA. This file can - be placed under $TAO_ROOT now. Leaving it for compatibility - reasons. - - * ace/OS.i: - - Changed the definition of ctime_buf_size to const so that gcc - doesn't complain about using variable-sized array which is - non-ISO C++. - -Mon Sep 2 10:00:40 2002 Balachandran Natarajan - - * ace/Timer_List_T.cpp (get_first_i): Fixes fuzz errors. - -Sun Sep 01 08:18:37 UTC 2002 Johnny Willemsen - - * ace/Task.cpp (svc_run): - The latest version of the Borland compiler doesn't like the - static cast, so only do the static cast when the compiler - version is smaller than 0x570 - - * ace/Handle_Set.cpp: - When using Borland on Linux, we don't have fds_bits, but we have - __fds_bits. - -Sun Sep 01 07:57:12 UTC 2002 Johnny Willemsen - - * ace/config-win32-borland.h: - * ace/config-borland-common.h: - Improved Borland config files for Kylix support. - -Sun Sep 01 07:25:12 UTC 2002 Johnny Willemsen - - * include/makeinclude/platform_linux_borland.GNU: - Added first version of platform .GNU file for the Borland Kylix - compiler. Thanks to Newton Aird for - providing this first version. - - * THANKS: Added Newton Aird - -Sat Aug 31 14:57:53 2002 Balachandran Natarajan - - * THANKS: Added Cemal Yilmaz to the hall of - fame. - -Sat Aug 31 13:55:52 2002 Balachandran Natarajan - - * ace/OS.i (ctime_r): This fixes a problem on Linux for the call - to ::ctime_r where the pointer returned (result) is the same as - the pointer (buf) passed in, causing the buffer to get clobbed - if strsncpy is used subsequently to move the result back to the - caller's buffer. - - * tests/OS_Test.cpp: Added a test for ACE_OS::ctime_r (). - - Thanks to Michael Searles for providing - this patch. - -Sat Aug 31 17:45:12 UTC 2002 Johnny Willemsen - - * ace/config-borland-common.h: - Created a new config file for the Borland compiler. This will be - used on the Win32 platform and the Kylix3 compiler on Linux - - * ace/config-linux-common.h: - When the Borland compiler is detected, include the - config-borland-common.h file - - * ace/config-win32-borland.h: - Moved most of the contents to the config-borland-common.h file, - only the lines that are Win32 specific stay here. - -Sat Aug 31 10:32:38 2002 Douglas C. Schmidt - - * ace/Future.cpp (set): Removed a stray reference to "iterator" - and replaced the for loop with a while loop. Thanks to Craig - Rodrigues for reporting this. - -Sat Aug 31 01:20:09 UTC 2002 Craig Rodrigues - Gary Duzan - - * include/makeinclude/rules.nested.GNU: Rewritten by Gary Duzan. - If a list of directories is specified with DIRS= for a recursive - make, make will halt immediately and propagate a non-zero - return code to the shell if an error is encountered in a - subdirectory. The present behavior does not propagate any - errors to make if there is an error in a subdirectory. If make -k - is specified, make will keep on going even if it encounters an - error in a subdirectory, but it will also propagate a non-zero - return code to make when the make finishes. The current behavior - is to keep on going if an error is encountered in a subdirectory, - but NOT propagate a non-zero return code upon termination of make. - - * ace/Makefile.dirs: (Added) Specifies the DIRS= list of directories - to invoke recursive makes on. - - * ace/Makefile.ace: (Added). This builds libACE, like the old Makefile - did. - - * ace/Makefile: Invoke Makefile.ace first, then Makefile,dirs. It - was necessary to split apart the DIRS= rule from the part of the - Makefile which builds libACE in order to have parallel makes (-j 2) - work on recursive makes. - -Fri Aug 30 17:34:00 2002 Justin Michel - - * ace/Timer_List_T.cpp: - * ace/Timer_List_T.h: - * ace/Timer_Wheel_T.cpp: - * tests/Timer_Queue_Test.cpp: - - Reimplemented timer list to be compatible with Itanium. It no longer - uses a Node* as the timer_id, so the cancel operation is now much - more expensive. On the plus side I was able to make a few optimizations - that improve the speed of the schedule operations. - I also made a small optimization to the timer wheel, and updated - the test slightly. - -Fri Aug 30 15:53:18 2002 Steve Huston - - * tests/SSL/Makefile: Move the addition of SSL options/flags up to - before the hackery of the compile command for AIX. - -Fri Aug 30 05:48:12 UTC 2002 Johnny Willemsen - - * ace/OS.i (tempnam): - Changed defines because special things only happen on Win32 - -Thu Aug 29 22:01:27 2002 Steve Huston - - * include/makeinclude/platform_hpux_gcc.GNU: Make the build options - settable by the command line (and/or platform_macros.GNU), and - fix the threads and soname options, as well we remove the - -fstrict-prototype option from the compile options - it was needed - for an older g++ (nothing prior to g++ 3 works right on HP-UX - anyway) and is not valid for g++ 3.2 and later. Thanks to - Ville Lehtiniemi for reporting these - issues and sending fixes. - -Thu Aug 29 15:18:31 2002 Steve Huston - - * ace/Get_Opt.{h i cpp} (long_option): Only print error messages for - long message addition problems if opterr is set. Also added - ACE_LIB_TEXT to naked strings for ACE_ERROR. - - Added opt_opt() method to return the most recently matched - short option character. Thanks to Rich (Mr. POSIX) Seibel - for the idea and POSIX spec info for this new method. - - * ace/Object_Manager.cpp (init): When finishing up initialization of - the object manager, call ACE_Trace::start_tracing() to reenable - trace in cases where a user does init/fini/init. - - * tests/Get_Opt_Test.cpp: Added usage of ACE_Get_Opt::opt_opt(). - -Thu Aug 29 15:03:23 2002 Ossama Othman - - * ace/README: - - Documented ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS macro. - - * ace/config-win32-msvc-6.h - (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS): - - MSVC++ 6 does not correctly handle exceptions thrown from - functions/methods that do not list them in the exception - specification. In particular, the unexpected exception handler - is not invoked. - -Thu Aug 29 06:12:56 2002 Douglas C. Schmidt - - * ace/Future.cpp (set): Fixed the loop code so it's possible for - the observer object to be deleted or detached in its update() - operation. Thanks to Tomer Amiaz for this - fix. - -Thu Aug 29 09:40:20 2002 Nanbor Wang - - * ACEXML/common/Transcode.h: - * ACEXML/parser/parser/Parser.h: Fixed incorrect usage of Doxygen - tag. Thanks to Johnny for pointing this out. - -Thu Aug 29 12:20:17 UTC 2002 Johnny Willemsen - - * ace/config-win32-borland.h: - Removed the 1 after 2 defines, so that they are like the defines - in other files. - -Thu Aug 29 05:53:12 UTC 2002 Johnny Willemsen - - * examples/Reactor/Proactor/post_completions.cpp: - Fixed compile error. - - * ace/OS_Dirent.h: - * ace/OS_Errno.cpp: - * ace/Time_Value.h: - * ace/Time_Value.inl: - Made method signature the same in definition and implementation. - - * ace/TkReactor.cpp: - * ace/TkReactor.h: - Made method argument names the same as in the base so that doxygen - can generate the documentation. - -Wed Aug 28 23:30:31 2002 Steve Huston - - * include/makeinclude/wrapper_macros.GNU: Remove addition of SSL - compile/link options so that not all parts of ACE, needing SSL or - not, get these options. - - * ace/SSL/Makefile: - * tests/SSL/Makefile: Added the SSL compile/link options from - wrapper_macros.GNU to these files, where they're needed. - - * ace/POSIX_Proactor.cpp (post_wakeup_completions): Use int - to count completions, not ssize_t - match the passed-in arg type. - Post the completion directly via the proactor, not via the - wakeup completion; the dynamic_cast in ACE_POSIX_Asynch_IO::post_ - completion loses the subclass of ACE_POSIX_AIOCB_Proactor and - when using any other subtype of proactor, the notification is - queued incorrectly. - - (POSIX_SIG_Proactor::notify_completion()) - always queue the signal. - Not doing so leaves a window where MT proactors can lose a signal. - - * tests/Proactor_Test.cpp: Use ACE_Proactor::close_singleton() to - delete proactor instance. Just to be sure we try it. - - * ace/SSL/SSL_Asynch_Stream.{h cpp}: u_long->size_t changes. - -Wed Aug 28 22:42:41 2002 Steve Huston - - * examples/Service_Configurator/Misc/main.cpp: - * netsvcs/clients/Naming/Client/main.cpp: - * tests/ARGV_Test.cpp: - * tests/Get_Opt_Test.cpp: Change size_t to int as a side-affect of: - Tue Aug 27 13:28:17 2002 Steve Huston - * ace/ARGV.{h i cpp}: Changed argc() value from size_t to int. It - needs to get passed to many places that expect int (argc, argv). - - * tests/Semaphore_Test.cpp: - * tests/TP_Reactor_Test.{cpp h}: - * tests/Upgradable_RW_Test.cpp: Further int/size_t corrections. - -Wed Aug 28 19:56:16 2002 Douglas C. Schmidt - - * docs/ACE-subsets.html: Updated the document to point to the - soreduce tool and to remove the discussion of PACE. Thanks to - Chumsu Kim for motivating this. - -Wed Aug 28 14:24:36 2002 Steve Huston - - * ace/Log_Msg.h: Fixed Doxygenation of ACE_Log_Msg. Thanks to - Philip Miller for reporting this. - -Wed Aug 28 11:21:04 2002 Chad Elliott - - * bin/MakeProjectCreator/templates/em3vcpdll.mpt: - * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt: - * bin/MakeProjectCreator/templates/em3vcplib.mpt: - * bin/MakeProjectCreator/templates/em3vcplibexe.mpt: - * bin/MakeProjectCreator/templates/nmakedll.mpt: - * bin/MakeProjectCreator/templates/nmakeexe.mpt: - * bin/MakeProjectCreator/templates/vc6dspdll.mpt: - * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt: - * bin/MakeProjectCreator/templates/vc6dsplib.mpt: - * bin/MakeProjectCreator/templates/vc6dsplibexe.mpt: - - Enabled RTTI for all VC based template input files. - -Wed Aug 28 06:18:35 2002 Douglas C. Schmidt - - * ace: Removed the config-sunos5.8-sunc++-5.4.h file since these - changes should go in the config-sunos5.8.h file rather than - a special file. Thanks to Steve Huston for noticing this. - - * include/makeincludes: Removed the platform_sunos5_sunc++5.4.GNU - file since it's no different from the platform_sunos5_sunc++.GNU - file. Thanks to Steve Huston for noticing this. - -Wed Aug 28 06:12:12 UTC 2002 Johnny Willemsen - - * etc/tao.doxygen: - Removed Services.h of the list of not to parse files - - * etc/tao_rtportableserver.doxygen: - Added TAO_NAMESPACE to list of to expanded macros - - * tests/Timer_Queue_Test.cpp: - Fixed unicode build error - - * ace/Timer_Wheel_T.cpp: - Fixed doxygen tags. - -Tue Aug 27 19:09:17 2002 Steve Huston - - * ace/Get_Opt.h: Documentation improvements. - -Tue Aug 27 17:00:20 2002 Douglas C. Schmidt - - * ace/Signal.cpp: Fixed the ACE_Sig_Action constructors so that - it doesn't break out of the loop just because a signal handler - failed. Thanks to Marcel Loose for reporting - this. - -Tue Aug 27 19:03:05 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added $TAO_ROOT/tests/ORB_shutdown test - to the daily builds. - -Tue Aug 27 18:52:59 2002 Balachandran Natarajan - - * ace/Select_Reactor_T.cpp (wait_for_multiple_events): Normally, - select() will reset the bits in dispatch_set so that only those - filed descriptors that are ready will have bits set. However, - when an error occurs, the bit set remains as it was when the - select call was first made. Thus, we now have a dispatch_set - that has every file descriptor that was originally waited for, - which is not correct. We must clear all the bit sets because we - have no idea if any of the file descriptors is ready. - - Thanks to Jody Hagins and Carlos O'Ryan - for reporting this problem and proving the - patches. - -Tue Aug 27 15:56:10 2002 Ossama Othman - - * ace/config-sunos5.8-sunc++-5.4.h: - * include/makeinclude/platform_sunos5_sunc++5.4.GNU: - - Solaris 8 + SunC++ SPRO 5.4 platform configuration files. - Thanks to Serge Kolgan for - contributing these files. - -Tue Aug 27 17:25:39 2002 Steve Huston - - * ace/WIN32_Proactor.{h cpp}: More u_long->size_t corrections. - -Tue Aug 27 16:50:41 2002 Steve Huston - - * tests/Proactor_Test.cpp: Fixed mismatched printf formats for - size_t arguments. - -Tue Aug 27 16:32:18 2002 Steve Huston - - * ace/Proactor_Impl.h: Fixed some u_long->size_t changes missed - on POSIX platforms. - -Tue Aug 27 14:44:00 2002 Justin Michel - - * ace/Timer_Wheel_T.cpp: - - Fixed problem with incorrect name in ACE_TRACE macro. - -Tue Aug 27 13:28:17 2002 Steve Huston - - * ace/config-win32-common.h: Added #define ACE_MALLOC_ALIGN 8 for - Win64. - - * ace/Malloc_T.cpp (ACE_Cached_Allocator): When dividing up the - allocated space, maintain the platform's alignment requirements. - - * ace/ace_dll64.mak: Removed references to Hash_Map_Manager_rt.*. - - * ace/Stream_Modules.cpp (info): Cast string length back to int. - - * ace/ARGV.{h i cpp}: Changed argc() value from size_t to int. It - needs to get passed to many places that expect int (argc, argv). - - * ace/OS.{h cpp} (ACE_OS::string_to_argv): argc changed from size_t& - to int& to match the change above. - - * ace/FILE_IO.{h i cpp}: - * ace/SPIPE_Stream.{h i}: Follow-up to ACE_SOCK_Stream change in: - Mon Jul 22 16:39:21 2002 Steve Huston - (sendv_n, recvv_n, sendv, send, recv) - change iov count from - size_t to int. - - * ace/Functor_T.i (ACE_Pointer_Hash::operator()): Use reinterpret_cast - to go from pointer to u_long. - - * ace/config-win32-msvc-7.h: Define ACE_AUTO_PTR_LACKS_RESET for - Win64 SDK compiler. - - * ace/Strategies_T.{h i cpp} (ACE_Thread_Strategy): Changed n_threads - parameter (and n_threads_ member) from size_t to int - matches - what's expected by ACE_Task::activate(), which is where this - value is passed. - - * ace/Asynch_Acceptor.{h cpp}: - * ace/Asynch_IO.{h cpp}: - * ace/Asynch_IO_Impl.h: - * ace/POSIX_Asynch_IO.{h cpp}: - * ace/POSIX_Proactor.{h cpp}: - * ace/WIN32_Asynch_IO.{h cpp}: - * ace/WIN32_Proactor.{h cpp}: All byte-count arguments and members - in all classes changed from u_long to size_t. Some already were... - - * ace/SOCK_Dgram.i (send): address length is an int, not size_t. - - * tests/Cache_Map_Manager_Test.h (Hash_Key::operator()): Cast the - size_t argument to u_long for return. - - * tests/Cache_Map_Manager_Test.cpp: Cast arg for ACE_OS::srand to - u_int (matches ACE_OS signature), not size_t. - - * tests/CDR_Array_Test.cpp (zero): Change len arg to size_t, and - also the values passed to it. Also, correct length args to - ACE_InputCDR and ACE_OutputCDR - they're size_t, not int. - - * tests/Handle_Set_Test.cpp: Disable the conversion warnings - initializing the array of ACE_HANDLE values on Win64. They're fine. - - * tests/Mem_Map_Test.cpp (reverse_file): Changed size arg from int - to size_t. - - * tests/Buffer_Stream_Test.cpp: - * tests/CDR_Test.cpp: - * tests/Message_Block_Test.cpp: - * tests/Message_Queue_Notifications_Test.cpp: - * tests/Priority_Buffer_Test.cpp: - * tests/Proactor_Scatter_Gather_Test.cpp: - * tests/Proactor_Test.cpp: - * tests/Semaphore_Test.cpp: - * tests/Thread_Pool_Test.cpp: - * tests/TP_Reactor_Test.{h cpp}: - * tests/Upgradable_RW_Test.cpp: Align size_t/int usage. - - * tests/Message_Queue_Notifications_Test.cpp (Watermark_Test::producer) - Change hwm from size_t to ssize_t so it can go less than zero and - break the 'for' loop properly. - - * tests/MT_SOCK_Test.cpp: - * tests/SOCK_Test.cpp: Use an int to pass to select(), always 0 - for Win64. - - * tests/SOCK_Send_Recv_Test.cpp: - * tests/Thread_Pool_Reactor_Resume_Test.cpp: - * tests/Thread_Pool_Reactor_Test.cpp: - * tests/TSS_TEst.cpp: Add missing type cast. - -Tue Aug 27 11:08:54 2002 Douglas C. Schmidt - - * ace/Pair_T.{h,i}: Added support for operator== to the ACE_Pair - can be used in maps, etc. Thanks to Gonzalo Diethelm - for this addition. - -Tue Aug 27 06:45:58 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Fixed a problem where .i and .h files would be added even if they - didn't exist. - -Tue Aug 27 10:09:12 UTC 2002 Johnny Willemsen - - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtcorba.doxygen : - Added TAO_NAMESPACE to the list of defines to expand. - -Mon Aug 26 17:33:54 2002 Ossama Othman - - * bin/msvc_auto_compile.pl (Build_Core): - - Build the Messaging, PortableGroup and CosLoadBalancing - libraries in a specific order. CosLoadBalancing depends on the - first two. Fixes automated Win32 static builds. - -Mon Aug 26 17:14:20 2002 Ossama Othman - - * tests/TkReactor_Test.cpp: - - Fixed a number of warnings. - -Mon Aug 26 18:21:34 UTC 2002 Justin Michel - - * ace/Timer_Wheel_T.cpp: - * ace/Timer_Wheel_T.h: - * tests/Timer_Queue_Test.cpp: - - New and improved timer wheel implementation. - -Mon Aug 26 09:51:12 UTC 2002 Johnny Willemsen - - * ace/FlReactor.{h,cpp}: - * ace/TkReactor.{h,cpp}: - * ace/QtReactor.{h,cpp}: - Made the names of the arguments of the schedule_timer() method the - same as in the base class. That way doxygen generates the same - documentation for this overruled method as in the base. - - * ace/TLI_Connector.i: - * ace/XTI_ATM_MCast.i: - Made argument names the same as in the header file. - -Mon Aug 26 08:29:12 UTC 2002 Johnny Willemsen - - * ace/Connector.cpp: - Replaced all short defines with the original ones. Doxygen can't - generate the documentation because of the short defines. - -Sun Aug 25 14:15:12 UTC 2002 Johnny Willemsen - - * ace/config-win32-borland.h: - Certain defines should only be defined without a value. - -Sun Aug 25 12:45:12 UTC 2002 Johnny Willemsen - - * etc/tao.doxygen: - Added TAO_NAMESPACE to the list of macro's that must be expanded - when generating doxygen documentation. - -Sat Aug 24 22:47:22 2002 Christopher Kohlhoff - - * include/makeinclude/ace_flags.bor: - * include/makeinclude/clean.bor: - * include/makeinclude/compiler.bor: - - Updated to support MakeProjectCreator. - - * bin/MakeProjectCreator/config/core.mpb: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm: - * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm: - * bin/MakeProjectCreator/templates/bor.mpd: - - Fixed support for Borland makefile generation. - - New "core" config for projects that would typically be installed - on production system, i.e. pretty much everything except examples - and tests. - - New "include_dir" project attribute used to specify a directory - path where header files for the project should be installed. - - * ace/ace.mpc: - * ace/QoS/qos.mpc: - * ace/RMCast/rmcast.mpc: - * ace/SSL/ssl.mpc: - - Added "core" as a base project and added "include_dir" value. - - * apps/gperf/src/gperf.mpc: - - Added "core" as a base project. - -Sat Aug 24 16:41:36 2002 Krishnakumar B - - * ACEXML/common/FileCharStream.cpp (get): - - Remove :: in front of the macro feof. VC is hopelessly confused. - - * ace/Argv_Type_Converter.h: - - Added #include "ace/OS_Memory.h" to get ACE_NEW. I needed to - touch this to test my changes. - -Sat Aug 24 12:01:54 2002 Douglas C. Schmidt - - * ace/OS.h: #undef the atop macro so that it won't break the new - ACE_OS::atop() method on FreeBSD. Thanks to Russell Carter - and Christophe Juniet - for this report. - - * ace/config-lynxos.h: Added some #defines for LynxOS 4.0. We'll - leave these comments out for now until we figure out how to add - them without breaking earlier versions of LynxOS. Thanks to - Umberto Mascia for reporting this. - - * docs/tutorials/015/Protocol_Stream.h (class Protocol_Stream): - Changed a comment to say "server-side applications" rather than - "client-side applications." Thanks to Mark Xu - for reporting this. - -Fri Aug 23 18:20:31 2002 Steve Huston - - * ace/config-all.h: - * ace/OS_Memory.h: Moved the ACE_NEW macros from config-all.h to - OS_Memory.h - - * ace/Log_Msg.h: Removed #include "ace/Basic_Types.h" (not needed) - and replaced "ace/OS_Errno.h" with "ace/OS.h" since thread defs - are necessary. - - * ace/Basic_Types.h: Don't make thread definitions here - they belong - in ace/OS.h. - - * ace/Cache_Map_Manager_T.h: Added #include "ace/Default_Constants.h" - to get ACE_DEFAULT_MAP_SIZE when instantiating templates on AIX - with Visual Age C++. - - * ace/Caching_Utility_T.cpp: #include "ace/Min_Max.h" and - "ace/OS_Memory.h" so Visual Age C++ can see ACE_MAX and ACE_NEW - when instantiating templates. - - * ace/Arg_Shifter.cpp: Added #include "ace/OS_Memory.h" to get ACE_NEW. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: Added - #include "ace/Malloc_Base.h" to pick up ACE_Allocator. - - * tests/Cached_Allocator_Test.cpp: Changed default speed tests loops - from 100,000,000 to 10,000,000. run_test.pl times it out on - non-nuclear processors ;-) - -Fri Aug 23 16:59:51 2002 Nanbor Wang - - * bin/svcconf-convert.pl: Fixed regex to handle empty option - strings in static/dynamic entries correctly. - -Fri Aug 23 16:25:47 2002 Krishnakumar B - - * ace/OS.i: - * ace/OS.h: - - Removed the wrappers for functions that are known to be - overloaded by macros. #undef will break user code for these - functions. This includes feof(), ferror() and ungetc(). The - other functions seem to only have a function implementation. - - * ACEXML/common/FileCharStream.cpp: - - Removed the use of ACE_OS wrappers for the above functions. - -Fri Aug 23 08:40:38 2002 Douglas C. Schmidt - - * ace/config-qnx-rtp.h: Added some new #defines so ACE will - compile on QNX 6.2. Thanks to Leen Van Kampen - for reporting this. - - * ace/Task.cpp (svc_run): Added a #ifdef for _MSC_VER <= 1200 - since there are complaints about reinterpret_cast from int to - unsigned long. Thanks to Espen Harlinn - for this fix. - -Fri Aug 23 13:04:34 2002 Nanbor Wang - - * ace/Service_Config.cpp: Some minor cosmetic changes. - -Fri Aug 23 07:16:13 2002 Chad Elliott - - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - - Fixed a problem where the pch header files is not in the list of - header files. - -Fri Aug 23 06:07:38 2002 Krishnakumar B - - * ace/OS.h (ACE_OS): - - ungetc() is a macro under Borland. Undefine it to make Borland - compiler happy. - -Thu Aug 22 21:27:56 2002 Nanbor Wang - - * ace/OS_String.cpp (strtok_r_emulation): Applied the patch Frank - Kuhlman submitted in [Bug 1272] which - resolved an overrun error. - -Thu Aug 22 21:20:01 2002 Krishnakumar B - - * include/makeinclude/rules.local.GNU (realclean.local): - - Remove older cruft when doing a realclean. Note this is a - sledgehammer (libfoo.so*). Don't blame me if you shoot yourself - in the feet, which technically shouldn't happen as long as you - have the sources to the libraries that you built. Thanks to - Ossama for pointing out that cruft was left behind. - -Thu Aug 22 19:14:44 2002 Ossama Othman - - * ace/OS.i (fgetwc, ungetwc): - - These functions are supposed to return WEOF on error, not -1 as - their ACE_OS wrappers were doing. Corrects a warning about - initialization of a negative value to "wint_t", which is an - unsigned integer on some platforms (e.g. GNU libc). - -Thu Aug 15 10:43:51 2002 Steve Huston - - * ace/Message_Queue_T.cpp (enqueue_tail): Moved notify() call outside - lock scope, as Sun May 5 19:14:34 2002 Douglas C. Schmidt - suggested. - -Wed Aug 14 18:14:57 2002 Steve Huston - - * ace/OS.cpp (ACE_TSS_Cleanup::remove()): Always mark the key no - longer in use, instead of simply decrementing the reference count. - Shouldn't call remove() until there are no more references to - the key. - (ACE_TSS_Cleanup::detach()): Decrement the reference count when - detaching. Previously, the count could never get to 0 and the - remove() method would never be called until object manager shutdown. - This resolves a problem where a service using - ACE_Unmanaged_TSS_Singleton would do its cleanup(), but there would - still be a reference to the key... if the destructor (in an unloaded - service DLL) was called at process shutdown, it would crash. - Thanks to Craig L. Ching for pointing this - problem area out. - -Fri Aug 9 16:11:39 2002 Steve Huston - - * ace/Message_Block.cpp: - (ACE_Data_Block::ACE_Data_Block): If the data allocation fails, - reset the cur_size_ and max_size_ to 0 to reflect the fact that - there is no legitimate memory allocated. - (ACE_Message_Block::init_i): If the data block size() that results - from allocating a new ACE_Data_Block is not what was requested, - return -1 to indicate the failure. - - * ace/Malloc_T.i (ACE_Cached_Allocator::free): Don't attempt to - return a 0 pointer to the free_list_. Thanks to Laxmikant - Bopalkar for this fix. - - * THANKS: Added Laxmikant Bopalkar to the Hall of Fame. - -Thu Aug 22 17:34:18 2002 Steve Huston - - * ace/FIFO_Recv_Msg.{h i}: Fixed recv() in the non- - ACE_HAS_STREAM_PIPES case to throw away the part of a - message longer than the max number of bytes requested by - the caller. Filled out the doxygen comments in the header - to explain the behavior, and the differences when (not) - using ACE_HAS_STREAM_PIPES. - -Wed Aug 21 17:48:29 2002 Steve Huston - - * examples/C++NPv2/TP_Logging_Server.cpp (TP_Logging_Task): - * examples/C++NPv2/display_logfile.cpp (svc): - Must use reinterpret_cast, not static_cast, to cast between - unrelated types (char *, class *). - - * examples/C++NPv2/Makefile: Added AIO_CLD to top-level build. - -Thu Aug 22 18:10:46 UTC 2002 Craig Rodrigues - - * bin/nightlybuilds/builds.lst: Move RedHat_Static build - to new scoreboard. - -Thu Aug 22 01:32:46 2002 Krishnakumar B - - * ACEXML/common/StreamFactory.cpp: - - Use ACE_TEXT for literals. Add destructor to avoid linker - problems. - - * ACEXML/parser/parser/Parser.cpp: - - Use ACEXML_Char instead of char* to fix compilation with WCHAR. - - * ACEXML/common/XML_Common.dsp: - - Add files StreamFactory.{h,cpp} to the project files. - -Thu Aug 22 01:16:16 2002 Krishnakumar B - - * ace/OS.h: - - Fixed compilation error under Windows by undefining the macros. - -Wed Aug 21 22:22:42 2002 Ossama Othman - - * bin/msvc_auto_compile.pl (Build_Core): - - Removed "LoadBalancing_Static.dsp" from the list of static - library projects to build. That MSVC++ project was for the old - load balancer, and no longer exists. - -Thu Aug 22 03:50:02 UTC 2002 Craig Rodrigues - - * bin/performance_stats.sh: - * bin/footprint_stats.sh: Calculate value of DATE - inside these scripts instead of passing it in as the - third parameter. This will make it easier to make - an autobuild script around this. - -Wed Aug 21 20:40:20 2002 Krishnakumar B - - * ace/OS.h: - * ace/OS.i: - - Added wrappers for fgetc, fgetwc, ferror, clearerr, feof, - ungetc, ungetwc. All these are guaranteed to not be macros. - - * ACEXML/apps/svcconf/Svcconf_Handler.cpp: - * ACEXML/apps/svcconf/Svcconf_Handler.h: - - Fixed compilation errors. - - * ACEXML/common/FileCharStream.cpp: - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/common/XMLFilterImpl.cpp: - * ACEXML/examples/SAXPrint/Print_Handler.cpp: - * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: - * ACEXML/examples/SAXPrint/main.cpp: - * ACEXML/examples/svcconf/Svcconf_Handler.cpp: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp: - * ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp: - * ACEXML/parser/debug_validator/Debug_Element_Builder.cpp: - * ACEXML/parser/debug_validator/Element_Tree.cpp: - * ACEXML/parser/parser/Parser.cpp: - - Use ACE_TEXT instead of ACE_LIB_TEXT. It results in reducing - vertical space and the wchar.txt document also encourages it. - -Wed Aug 21 17:02:44 2002 Nanbor Wang - - * ace/OS_String.cpp: Changed to enabled wchar version of - strtok_r_emulation when both ACE_HAS_WCHAR and ACE_LACKS_WCSTOK - are both defined (instead of ACE_HAS_REENTRANT_FUNCTIONS.) - Thanks to Brian Appel for reporting this. - -Wed Aug 21 12:41:51 2002 Chad Elliott - - * bin/MakeProjectCreator/config/notifytest.mpb: - * tests/SSL/tests.mpc: - - Fixed a few problems with some of the mpc files. - - * nightly.mwc: - - Added an initial nightly build workspace file. - -Wed Aug 21 11:57:37 2002 Nanbor Wang - - * bin/msvc_auto_compile.pl: Added ACEXML/apps to the list of - compiled ACE directories. - -Wed Aug 21 11:15:11 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/templates/nmake.mpd: - - Fixed a problem dealing with Windows, NMake and idl files. - -Wed Aug 21 11:04:09 2002 Nanbor Wang - - * ace/Object_Manager.cpp (init): Changed to return failure (-1) if - ACE_Object_Manager fail to acquire the TSS ACE_Log_Msg instance - for whatever reason. Thanks to Jeremy Altavilla - for suggesting the fix. - -Wed Aug 21 07:43:12 2002 Johnny Willemsen - - * ace/ATM_Addr.{h,i}: - Made the signature definition and implementation of set_selector() - and get_selector() the same. - - * ace/CDR_Stream.cpp: - Made the read_string() signature the same as in the definition - - * ace/config-doxygen.h: - Added ACE_HAS_XTI_ATM to the list of defines that must be set - when generating the doxygen documentation - - * ace/config-win32-mingw.h: - Added extern "C" around the win32api methods ace uses but which - are not defined in the mingw win32api. - - * ace/Lib_Find.cpp: - Made signature of ldfind method the same as in the definition - - * ace/Log_Record.cpp: - Made signature of print method the same as in the definition - - * ace/Multiplexor.i: - Added #ifdef 0/#endif around the contents of this file, because the - header and cpp file also do this. Doxygen parses now this .i file - and gives a lot of warnings about this file because it cannot find - the definition of the methods in this file. - - * ace/Configuration.h: - * ace/Containers_T.cpp: - * ace/Lib_Find.h: - * ace/OS.h: - * ace/RMCast/RMCast_Reliable_Factory.h: - * ace/RMCast/RMCast_UDP_Proxy.h: - Small improvements for doxygen documentation. - - * include/makeinclude/ace_flags.bor: - Added cflags and lib for TAO PSDL library - - * include/makeinclude/platform_mingw32.GNU: - MingW doesn't support the adding of the version number after - the .dll, so set SONAME and SOVERSION to empty. - - * examples/Connection/non_blocking/test_lsock_acceptor.cpp: - * examples/Connection/non_blocking/test_lsock_connector.cpp: - Added include of Log_Msg to fix compile errors with MingW - -Tue Aug 20 14:19:55 2002 Jaiganesh@doc - - * ACE version 5.2.4 released. - -Fri Aug 16 10:25:07 2002 Ossama Othman - - * include/makeinclude/ace_flags.bor: - - Corrected CosLoadBalancing library related variables. They - were still setup for use with the old load balancer prototype. - -Fri Aug 16 11:15:49 2002 Douglas C. Schmidt - - * examples/Reactor/Proactor/test_aiosig_ace.cpp: Added - #include "ace/Log_Msg.h" so things will compile. Thanks to - Victor Poznyak for reporting this and - Alexander Libman for suggesting the fix. - -Thu Aug 15 15:22:49 2002 Nanbor Wang - - * tests/tests.dsw: Re-added Thread_Manager_Test.dsp into this - workspace. It got accidentally removed when someone merged a - branch into the main trunk. Thanks to Ronald Berger - for noticing this. - -Mon Aug 12 10:17:55 2002 Douglas C. Schmidt - - * ace/Thread_Manager.h (ACE_Thread_Manager): Fixed a type where - "manipulated" was spelled "maniputated". Thanks to - Eric Newton for reporting this. - - * PROBLEM-REPORT-FORM: Fixed a typo where "ASCII text" was spelled - "ASCII test". Thanks to Eric Newton for - reporting this. - -Fri Aug 9 12:13:21 2002 Jaiganesh Balasubramanian - - * bin/nightlybuilds/builds.1st: - Moved the Debian_Core builds to the new scoreboard. - Thanks to CRaig Rodrigues for the fix. - -Fri Aug 9 09:24:08 2002 Douglas C. Schmidt - - * ace/Time_Value.{inl,cpp}: Make sure to normalize the set() methods... - Thanks to Francois for reporting this. This - fixes BugID 1275. - -Thu Aug 8 23:11:30 2002 Balachandran Natarajan - - * include/makeinclude/rules.nested.GNU: Reverted this change "Thu - Aug 8 18:28:34 UTC 2002 Craig Rodrigues " - since it would break our daily builds. - -Thu Aug 8 18:28:34 UTC 2002 Craig Rodrigues - - * include/makeinclude/rules.nested.GNU: If we fail during a recursive - make, exit with error code 1. This makes it easier to detect errors - in automated builds. Thanks to Gary Duzan for showing - inspiring the fix. - -Wed Aug 7 12:39:31 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/Driver.pm: - - Speed up execution by changing the include path order. - - * bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm: - - Don't generate a for loop if there is only one project. - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Fixed a bug with the global assignments overwriting project - assignments. - -Sun Aug 4 16:47:29 2002 Balachandran Natarajan - - * tests/Framework_Component_DLL.cpp: Added a missing template - instantiation. It was caught only in SunCC53 builds. - -Sun Aug 4 16:01:28 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Do not the Stack_Recursion tests in - single threaded builds. - -Sat Aug 03 17:57:33 2002 Balachandran Natarajan - - * ace/ace_dll.dsp: Removed the Hash_Map_Manager_rt.cpp from the - project file. - -Sat Aug 03 15:42:49 2002 Balachandran Natarajan - - * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.dsp: Made sure that it - builds only in MFC debug builds. - -Sat Aug 3 14:56:23 2002 Krishnakumar B - - * ACEXML/common/HttpCharStream.cpp: - - Fixed a conversion error from char to wchar_t. Thanks to Johnny - for pointing this out. - - * ACEXML/parser/parser/Parser.cpp: - - Fixed an unreachable statement warning. Thanks to Bala for - pointing this out. - -Sat Aug 3 19:53:12 UTC 2002 Johnny Willemsen - - * ACEXML/common/XML_Codecs.h: - * ACEXML/parser/parser/Parser.h: - * ace/Registry.h: - * ace/String_Base.h: - * ace/QoS/QoS_Session_Factory.h: - Fixed doxygen commands. - -Sat Aug 3 12:36:55 2002 Balachandran Natarajan - - * ace/Hash_Map_Manager_rt.h: - * ace/Hash_Map_Manager_rt.cpp: - * ace/Hash_Map_Manager_rt.i: Removed these files from the main - trunk. They shouldnt have been there in the first place. - -Fri Aug 2 22:00:26 UTC 2002 Craig Rodrigues - - * examples/Log_Msg/Log_Msg_MFC/*: Added example to show how - to send ACE_DEBUG output to the Microsoft Visual Studio debugger console. - Thanks to Don Hinton and - Chris Hafey for help with this. - -Fri Aug 2 13:10:05 2002 Krishnakumar B - - * ACEXML/examples/SAXPrint/main.cpp (ACE_TMAIN): - * ACEXML/common/InputSource.cpp: - - Reverted the previous check-in with respect to the delete - statement. Memory is getting leaked somewhere down in ACE. - -Fri Aug 2 12:31:34 2002 Krishnakumar B - - * ACEXML/common/ContentHandler.h: - * ACEXML/parser/parser/Entity_Manager.cpp: - * ACEXML/common/NamespaceSupport.cpp: - - Fixed minor typos in the comments. - - * ACEXML/common/InputSource.cpp: - - Removed an erroneous delete statement. Not sure if this is a - implementation bug or a thinko. - - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/common/Mem_Map_Stream.cpp: - * ACEXML/common/Mem_Map_Stream.h: - - Use char* when sending data on the network. Technically it - should be byte. - - * ACEXML/examples/SAXPrint/Print_Handler.cpp: - * ACEXML/examples/SAXPrint/main.cpp: - - Fixed a bug with getopt() when WCHAR is enabled. Since EOF is - -1, never use a WCHAR in the while loop. - - * ACEXML/parser/parser/Parser.cpp: - * ACEXML/parser/parser/Parser.h: - - Improved Namespace support. Modularized functions in the parser. - - * ACEXML/docs/TODO.txt: - * ACEXML/docs/bugs.txt: - * ACEXML/docs/guidelines.txt: - * ACEXML/docs/parser_features.txt: - - Updated to reflect the current status. People were reading these - old docs and assuming a lot of the features aren't implemented. - -Fri Aug 2 16:06:12 UTC 2002 Johnny Willemsen - - * ace/config-doxygen.h: - Added ACE_HAS_ATM define to also generate the doxygen documentation - of the ACE ATM classes. This is one of the last parts of ACE that - are missing in the doxygen documentation. - -Fri Aug 2 07:54:24 2002 Balachandran Natarajan - - * ace/Malloc.cpp: Rearranged member initialization list in the - constructor of ACE_Malloc_Stats, to fix warnings with explicit - template builds. - -Thu Aug 01 13:40:59 2002 Balachandran Natarajan - - * tests/Malloc_Test.cpp: Changed the usage of ASYS_TEXT to - ACE_TEXT. Should fix most of the compile errors with g++. - -Thu Aug 1 12:14:21 2002 Chad Elliott - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Added $(ACELIB) to the list of ACE_SHLIBS. - -Thu Aug 1 11:13:20 2002 Balachandran Natarajan - - * ace/Malloc_Allocator.h: - * ace/Malloc_Allocator.cpp: Removed the declaration and definition - of ACE_Malloc_Stats since they are not needed in this - translation unit. - - * ace/Malloc.h: - * ace/Malloc.cpp: Retained the definition if ACE_Malloc_Stats here - (yes, there were two declarations) and added the definition and - template instantiation for ACE_Atomic_Op used by - ACE_Alloc_Stats. This should fix the erros showing up on the - scoreboard explicit template builds which has - ACE_HAS_MALLOC_STATS turned on. - -Thu Aug 1 09:08:36 2002 Douglas C. Schmidt - - * ace/Message_Block.h: Made the non-static duplicate() and release() - methods virtual so they can be overridden by subclasses. Thanks - to Brian Raven for this suggestion. - -Thu Aug 01 15:24:32 UTC 2002 Johnny Willemsen - - * ace/OS_Thread_Adapter.h: - Fixed incorrected doxygen @file command. - -Thu Aug 01 14:52:44 UTC 2002 Johnny Willemsen - - * bin/fuzz.pl: - Improved the check for the @file doxygen command. Incomplete file - names where not detected as error. - -Thu Aug 1 07:03:05 2002 Chad Elliott - - * bin/MakeProjectCreator/README: - - Added a bit of background on the tool before plunging into the - details. - -Thu Aug 01 07:59:12 UTC 2002 Johnny Willemsen - - * ace/Asynch_Acceptor.h: - * ace/XtReactor.cpp: - * ace/XtReactor.h: - Corrected argument names to fix doxygen warnings. - -Thu Aug 01 07:34:12 UTC 2002 Johnny Willemsen - - * ace/config-win32-mingw.h: - Made the definition of the missing parts of the Win32api of MingW - dependent on the version of the w32api instead of our own defines. - This way we automically define the missing things when needed. Thanks - to Craig for suggesting this. - -Wed Jul 31 23:39:27 UTC 2002 Craig Rodrigues - - * etc/*.doxygen: Change DOT_PATH from /usr/local/bin/ to - empty, forcing doxygen to look for the dot program in PATH. - This eliminates warnings in the Doxygen nightly build. - -Wed Jul 31 12:23:47 2002 Steve Huston - - * ace/Malloc.cpp: - * ace/Malloc_T.cpp: - * tests/Malloc_Test.cpp: Changed logging of pointers to %@ - - * tests/Mem_Map_Test.cpp: Fixed loop bound error. - -Wed Jul 31 11:34:58 2002 Nanbor Wang - - * docs/index.html: Added a link to ACEXML document. - -Wed Jul 31 10:47:54 2002 Chad Elliott - - * include/makeinclude/rules.local.GNU: - - Added a gnu macro (DEPEND_CMD_ARGS) to the g++dep line to allow - pasing arguments (such as -R) to g++dep when running "make depend" - -Wed Jul 31 08:41:12 UTC 2002 Johnny Willemsen - - * ace/config-win32-mingw.h: - For the compilation of Win32_Asynch_IO we now need to have - FILE_SEGMENT_ELEMENT from winnt.h and ReadFileScatter and - WriteFileScatter from winbase.h. - These are not in the header files of the MingW w32api 1.4/1.5 - release. That's why we do these union/defines also in this header - file. By adding the defines ACE_MINGW_LACKS_READWRITE_FILESCATTER - and ACE_MINGW_LACKS_FILE_SEGMENT_ELEMENT to your config.h file - these defines/union are done by ACE for MingW32 so that everything - will compile. - -Wed Jul 31 08:11:12 UTC 2002 Johnny Willemsen - - * etc/Task.cpp: - Also the MinGW32 GCC3.1 compiler has problems with the - reinterpret_cast in the svc_run method. Use the static_cast instead. - -Wed Jul 31 07:40:12 UTC 2002 Johnny Willemsen - - * etc/*.doxygen: - Enabled warnings to get them in the doxygen scoreboard. - - * ace/Configuration.cpp: - Fixed method argument names to fix doxygen warnings. - -Tue Jul 30 15:45:23 2002 Douglas C. Schmidt - - * ace/SOCK_Dgram.h: Fixed the comment for send(), which had a - cut and paste error. Thanks to Jeff Wilson - for reporting this. - -Tue Jul 30 14:09:35 2002 Chad Elliott - - * tests/tests.mpc: - - Update the mpc file to include the libraries. - -Tue Jul 30 09:07:29 2002 Ossama Othman - - * ace/Parse_Node.h: - * ace/Parse_Node.cpp: - - Unexported all classes in this file. They are only meant for - internal use by ACE's Service Configurator. Updated Doxygen - comments accordingly. - - (apply, symbol, open_dll): - - These methods now accept a "yyerrno" reference argument to allow - for modification of the error count in a reentrant manner. - - * ace/Svc_Conf.h: - - Removed "ace_yyerrno" and "ace_yylineno" global variables. - Local ones are now used. - - Altered signature of ace_yyerror() function to accept two - additional parameters, yyerrno and yylineno. Addresses a race - condition. - - * ace/Svc_Conf.y: - - Removed all remnants of the global "yyerrno" and "yylineno" - variables. Only the reentrant versions are used now. - - Pass the "yyerrno" variable as a parameter to all functions that - read or modify the parse error count. Addresses several race - conditions. - - Fixed call to ACE_Location_Node::handle(). This method no - longer exists. The correct call is ACE_Location_Node::dll(). - For some reason, Svc_Conf_y.cpp (a generated file!!!) was - "fixed" but the parser grammar file was never fixed. - - * ace/Svc_Conf.l: - - Removed all remnants of the global "yylineno" variable. Only - the reentrant version is used now. - - * ace/Service_Config.cpp (process_directives_i): - - Removed initialization of "ace_yyerrno" and "ace_yylineno" - global variables. They no longer exist. Poof! - - Reverted my previous change. The above changes obviate the need - to take into account the global parse error count. - - * ace/Makefile: - - Tweaked Svc_Conf_y.cpp and Svc_Conf_l.cpp generation rules so - that yyerrno and yylineno are not prepended with an "ace_". - That is no longer needed. - - * etc/Svc_Conf_y.cpp.diff: - - Regenerated this patch against parsers generated by the latest - GNU Bison (1.35). - - * etc/Svc_Conf_l.cpp.diff: - - Regenerated this patch to pull in new changes to Svc_Conf_l.cpp. - -Tue Jul 30 10:06:04 2002 Douglas C. Schmidt - - * ace/Thread_Manager.cpp: Moved a stray colon until *after* - the #if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) check. Thanks - to Alan Tanga for reporting this. - - * ace/POSIX_Proactor.cpp (delete_result_aiocb_list): Moved - the definition of size_t ai out of the for loops to avoid - problems on older C++ compilers. Thanks to George Varsamis - for reporting this. - -Tue Jul 30 08:14:34 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - - Added an error check for invalid inheritance syntax. - - * bin/MakeProjectCreator/modules/Driver.pm: - - Changed the progress indicator to allow for cleaner output - when an error occurs. - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Remove duplicate libs, libpaths and includes when addition or - subtraction is involved. - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Cleaned up the template to make generated Makefiles a little more - consistent. - -Tue Jul 30 06:50:26 2002 Douglas C. Schmidt - - * ace/Dynamic_Service.cpp: Moved ACE_Dynamic_Service::instance() - from the .i file into the .cpp file and added a #include of - "ace/Service_Object.h" to the .cpp file so the complete type of - ACE_Service_Object would be available to the HP/UX C++ compiler. - Thanks to Torsten Kuepper for - reporting this. - -Tue Jul 30 07:51:12 UTC 2002 Johnny Willemsen - - * etc/ace.doxygen: - Enabled warnings and undocument warnings to get these warnings - into the doxygen scoreboard. When this works I will enable the - warnings in all other .doxygen files later. - -Mon Jul 29 14:47:46 2002 Ossama Othman - - * ace/Service_Config.cpp (process_directives_i): - - In addition to the thread-safe yyerrno variable, check the - global ace_yyerrno variable when determining if errors have - occurred when processing Service Configurator directives. - Thanks to Doug for tracking down the problem and suggesting a - fix and to Denginere for reporting this. - -Mon Jul 29 17:30:27 2002 Steve Huston - - * ace/Get_Opt.h (ctor): Changed documented name of the skip_argv0 - argument to skip_args to better reflect that it's not just - argv[0] that can be skipped. - -Mon Jul 29 07:45:12 2002 Johnny Willemsen - - * ace/OS.cpp (uname): Only check for PROCESSOR_ARCHITECTURE_IA64 - when this is defined. The MingW w32api doesn't define this constant. - -Sun Jul 28 17:17:50 2002 Douglas C. Schmidt - - * docs/ACE-subsets.html: Updated the breakdown of files to - each subset component so it's consistent with the - $ACE_ROOT/Makefile. Thanks to Ruslan Zasukhin - for reporting this. - -Sun Jul 28 10:31:12 2002 Johnny Willemsen - - * include/makeinclude/platform_gnuwin32_common.GNU: - Use -mcpu=$(TCPU) instead of -m$(TCPU), because MingW GCC 3.1 - now gives warnings that -m is deprecated. Thanks to Craig Rodrigues - for confirming that -m was already deprecated in GCC 2.95.3 - -Sat Jul 27 17:35:06 2002 Krishnakumar B - - * include/makeinclude/platform_g++_common.GNU (SOFLAGS): - - Allow building of shared libraries with gcc and Solaris ld. - There wasn't any reason that it wouldn't work. - - * Changelog: Remove >>>>> left out by merge conflicts. People - should be more careful about checking for conflicts. - -Sat Jul 27 16:20:19 2002 Douglas C. Schmidt - - * examples/Service_Configurator/Misc/main.cpp (ACE_TMAIN): Changed - the code to be more resilient against errors that occur during - parsing of the svc.conf file. Thanks to Denginere - for motivating this change. - -Sat Jul 27 15:50:12 2002 Johnny Willemsen - - * ACEXML/examples/svcconf/main.cpp: - Made this file compiling with BCB and Unicode - - * ACEXML/examples/svcconf/Svcconf_Handler.h: - Made includes like the other examples so that we can build it with - BCB - - * ACEXML/examples/svcconf/Svcconf_Handler.cpp: - Fixed unused argument warnings - - * ACEXML/examples/svcconf/Makefile.bor: - Added this BCB makefile - - * ACEXML/examples/Makefile.bor - Added svcconf directory - -Fri Jul 26 21:00:32 2002 Balachandran Natarajan - - * ace/TP_Reactor.cpp: Fixed a unused variable warning in g++ - builds. - -Fri Jul 26 20:08:41 2002 Steve Huston - - * include/makeinclude/platform_aix4_g++.GNU: Corrected option for - using threads from -mthreads to -pthread. This may not work with - pre-gcc 3 compilers, but those compilers are busted on AIX anyway. - Added support for buildbits=32 and buildbits=64. Moved in the new - AIX library-building setup from platform_aix_ibm.GNU. - -Fri Jul 26 15:52:12 2002 Balachandran Natarajan - - * ace/TP_Reactor.cpp: Fixed a problem with handle_event - (ACE_Time_Value &). It should be calling the TP_Reactor's - handle_event () instead of Select_Reactor's. This should fix - [BUGID 1257]. - -Fri Jul 26 10:11:41 2002 Chad Elliott - - * bin/MakeProjectCreator/config/messaging.mpb: - * bin/MakeProjectCreator/config/messaging_only.mpb: - - Set up a new base project that just contains information about - the Messaging library. - - * bin/MakeProjectCreator/modules/GNUProjectCreator.pm: - * bin/MakeProjectCreator/templates/gnu.mpd: - - Allow the file lists to contain names of files that correspond - to relative directories. - -Fri Jul 26 06:40:12 2002 Douglas C. Schmidt - - * ace/OS_String.inl: Added casts of the input parameter to - (unsigned char) for the ace_isprint() and ace_isspace() methods - on ACE_OS_String to prevent problems with MSVC++ 7.0. Thanks to - Colin Weaver for suggesting this - fix. - -Fri Jul 26 10:37:12 2002 Johnny Willemsen - - * etc/tao_pss.doxygen: - Added doxygen config file to generate the new TAO PSS. - - * bin/generate_doxygen_pl: - Added tao_pss.doxygen to the list of files to generate. - - * htlm/index.html: - Added link for the new PPS doxygen documentation. - -Thu Jul 25 22:58:24 2002 Balachandran Natarajan - - * ace/Synch.cpp: Removed explicit instantiation of - ACE_Condition since a template - specialization exists. This was causing a compile error when - explicit template instantiations were used with - g++-2.95.3. - -Thu Jul 25 11:32:41 2002 Chad Elliott - - * bin/MakeProjectCreator/README: - - Added a little more detail about what the depends keyword refers - to. - - * bin/MakeProjectCreator/USAGE: - * bin/MakeProjectCreator/modules/Driver.pm: - - Changed the code to show the default type in the usage message. - - * bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm: - - Change the workspace to use a for loop when building on UNIX. - - * tests/RMCast/tests.mpc: - * tests/SSL/tests.mpc: - - Fixed the case on the dependencies lines. - -Wed Jul 24 13:38:40 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - - Added a progress indicator (for those big workspaces). - -Wed Jul 24 13:10:19 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Add README and readme to the default documentation - files. - - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/GUID.pm: - * bin/MakeProjectCreator/modules/VC7ProjectCreator.pm: - - Change the GUID generation code to be deterministic (but still - unique) to allow for multiple solution files to contain the same - project files without having to regenerate the solutions. - -Wed Jul 24 13:42:37 2002 Steve Huston - - * ace/OS.cpp (uname): Added case for PROCESSOR_ARCHITECTURE_IA64 - when decoding processor type. - -Wed Jul 24 10:58:22 2002 Steve Huston - - * ace/Acceptor.cpp (ACE_Acceptor::handle_input): When calling select(), - use a int value instead of casting a ACE_HANDLE to an int. - - * tests/Cached_Accept_Conn_Test.cpp: Use %@ instead of %d when - logging pointers. - - * tests/MT_Reactor_Upcall_Test.cpp: Added ACE_TEXT to char strings - where needed. Changed the send to send fixed header, then the - variable-size string. Sending all at once doesn't work if the - string doesn't immediately follow the size_ member in memory, - which happened on Win64. - -Wed Jul 24 10:07:24 2002 Chad Elliott - - * bin/MakeProjectCreator/README: - * bin/MakeProjectCreator/USAGE: - - Update the documentation to reflect the current state. - -Wed Jul 24 08:13:48 2002 Christopher Kohlhoff - - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - * include/makeinclude/make_flags.bor: - Improve debugging support with Borland C++Builder by invoking the - compiler with a full path to each source file. This can be disabled - by setting a NO_FULL_PATH environment variable to 1 or by passing - -DNO_FULL_PATH when running make, which may be necessary when doing - a debug build on Win9x. - -Wed Jul 24 07:45:43 2002 Chad Elliott - - * THANKS: Added Tim Bradley to the hall of fame. - -Tue Jul 23 21:46:54 2002 Nanbor Wang - - * ace/Process_Mutex.h: - * ace/Process_Mutex.cpp: Disallowed anonymous Process_Mutex by - invoking this->unique_name() to create a temporary name if - there's no mutex name passed to the constructor. Thanks John - Michael Zorko for reporting this problem on - Mac OSX and submitting the patch. - -Tue Jul 23 13:08:27 2002 Steve Huston - - * ace/Log_Msg.{h cpp} (log_hexdump): - * ace/ACE.{h cpp} (format_hexdump): Change size arguments from int - to size_t. Change format_hexdump()'s return from int to size_t. - -Tue Jul 23 09:48:15 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/Driver.pm: - - Always add the default include paths. - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - - Make sure that idl generated source files go at the front of the - file list in auto-generates source lists. - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Only add LIB and SHLIB assignments if we are generating a Makefile - for libraries. - -Mon Jul 22 22:30:53 2002 Nanbor Wang - - * ACEXML/common/XML_Common.dsp: Added the macro definition - ACEXML_HAS_DLL=1 to the release configuration to resolve a - nightly biuld problem. - -Mon Jul 22 18:28:48 2002 Steve Huston - - * ace/Configuration.h: Doxygen fixes. - -Mon Jul 22 16:57:19 2002 Chris Cleeland - - * bin/g++dep: Added a -R option that allows you to specify a - variable which should be used to generate relative paths if it's - defined. - -Mon Jul 22 17:45:48 2002 Steve Huston - - * ace/Get_Opt.h: Doxygen fixes. - -Mon Jul 22 16:39:21 2002 Steve Huston - - * ace/Acceptor.cpp (info): - * ace/Connector.cpp (info): Cast return val to int. - - * ace/Message_Queue.h (message_count): - * ace/Message_Queue_T.{h cpp i} (message_count): Change return value - from size_t to int. Changed cur_count_ member (and accessors that - return it) from size_t to int. This is a compromise to unify the - length of arguments without changing the return types of all - methods that return a message count (all the enqueue/dequeue methods, - as well as a few others). - Changed a number of @arg to @param for doxygen. - - * ace/SOCK_IO.{h i} (recvv, sendv): - * ace/SOCK_Stream.{h i}(recvv_n, sendv_n): Changed iovcnt arg from - size_t to int. int, though sort of odd as a choice, is the - UNIX98 standard and more commonly implemented. Removes an arg - size mismatch between the SOCK_IO and ACE layers, restricting the - iovcnt range at the SOCK_IO layers to match the layer below. - Changed the recv and send iov-enabled, deprecated methods to cast - their size_t iovcnt args to int... these deprecated methods should - be removed after 5.3 is out. - - * tests/Conn_Test.cpp: Replaced %d with %@ when logging pointers. - Added missing string arg for a ACE_ERROR %p directive. Use a - int select_width instead of casting ACE_HANDLE for Win64. - -Mon Jul 22 15:13:38 2002 Carlos O'Ryan - - * ace/Atomic_Op.h: - * ace/Atomic_Op.i: - Fixed bug 1253, add missing copy constructor. - -Mon Jul 22 13:25:29 2002 Stephen Torri - - * ace/streams.h: Fixed _MSC_VER compiler warning messages stating - concern about using MSC_VER without assurance that the macro - was defined. - -Mon Jul 22 12:20:21 2002 Krishnakumar B - - * THANKS: Added Sean Ogle to the hall of fame. - -Mon Jul 22 09:19:34 2002 Balachandran Natarajan - - * THANKS: Aded Kew Whitney and Colin Weaver to the hall of fame. - -Sat Jul 20 08:53:05 2002 Douglas C. Schmidt - - * ace/SOCK_Dgram.cpp (set_nic): Moved the #endif for - ACE_WIN32 *ahead* of the set_options() call. Thanks to Joe - Hayes for reporting this. - -Fri Jul 19 14:42:37 2002 Steve Huston - - * ace/WFMO_Reactor.cpp (make_changes_in_suspension_infos, - make_changes_in_current_infos): - Fixed bug resulting from: Wed Jul 17 11:34:28 2002 Steve Huston - -Thu Jul 18 15:48:29 2002 Steve Huston - - * ace/Future.h: Doxygenation improvements. - -Thu Jul 18 08:39:08 2002 Chad Elliott - - * bin/MakeProjectCreator/README: - - Update the documentation to reflect the additions to the grammar. - - * bin/MakeProjectCreator/config/avstreamsexe.mpb: - * bin/MakeProjectCreator/config/corba_messaging.mpb: - * bin/MakeProjectCreator/config/minimum_corba.mpb: - * bin/MakeProjectCreator/config/namingexe.mpb: - * bin/MakeProjectCreator/config/notify.mpb: - * bin/MakeProjectCreator/config/orbsvcsexe.mpb: - * bin/MakeProjectCreator/config/orbsvcslib.mpb: - * bin/MakeProjectCreator/config/rt_client.mpb: - * bin/MakeProjectCreator/config/rt_server.mpb: - * bin/MakeProjectCreator/config/rteventexe.mpb: - - Add the GNU specific info for generating conditional target - Makefiles. - - * bin/MakeProjectCreator/modules/GNUProjectCreator.pm: - - Added code to generate the conditional sections of the GNU - Makefiles. - - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - Fix some minor problems with generated project files. - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Added template info for conditional targets. - - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Removed the tie class idl targets. - - * bin/ace_components: - - Added a new append option that will be used by the generated GNU - Makefiles. - -Thu Jul 18 06:17:19 2002 Douglas C. Schmidt - - * Doug turns 40 today. Fortunately, 40 Octal is only 32 Decimal ;-). - -Wed Jul 17 15:18:31 2002 Steve Huston - - * ace/Configuration.h: Doxygen improvements. - - * ace/Configuration.cpp: All error cases where a return - (-2, -3, -4, -5) occurred now return -1 with errno set. - - * ace/OS.{i cpp}: Follow-up to Wed Jul 17 11:34:28 2002 Steve Huston - Only make ACE_WIN64 use intptr_t - must have a new SDK to get - intptr_t, and not all have it.... so use it only for ACE_WIN64 - since the compiler comes in the newer SDK... Win32 does - fine with long, which is what an intrptr_t is on Win32. - - Also fixed the PACE-busted conditional compiles around siginfo_t - to match the declaration in OS.h. Win32 needs this stuff. - -Wed Jul 17 14:25:39 2002 Steve Huston - - * include/makeinclude/platform_aix_ibm.GNU: Added -qfuncsect to the - compile options. Allows for smaller executables/libraries, and - gets rid of most of the multiple definition warnings for templates. - Unfortunately, there are still a few stragglers so the aix_shr - post-processing script is still required. - - * ace/Sock_Connect.cpp: Added a hack to get Visual Age C++ on AIX - build running clean. Have to include a template instantiation we - don't need to get the compiler to pull the proper header files - at template compilation time. - -Wed Jul 17 11:34:28 2002 Steve Huston - - * ace/OS.{i cpp}: Windows, in calls to _open_osfhandle(), cast - handle to long for C++Builder. Only MSVC has the intptr_t type. - - * ace/WFMO_Reactor.cpp (make_changes_in_current_infos, - make_changes_in_suspension_infos): Run the index from 0 to - last_valid_slot rather than valid slot down to 0 to allow - correct use of size_t index. - - * ace/WIN32_Proactor.cpp (register_handle, post_completion): Use - a reinterpret_cast, not static_cast to cast void* to ULONG for - non-Win64. - -Wed Jul 17 03:50:56 UTC 2002 Don Hinton - - * ace/ACE.cpp: - * ace/OS.{h,i,cpp}: - * ace/OS_Dirent.inl: - * ace/OS_Memory.h - * ace/OS_String.inl: - * ace/Thread_Manager.cpp: - * ace/WFMO_Reactor.cpp: - * ace/config-all.h: - * ace/config-win32-borland.h: - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - * include/makeinclude/wrapper_macros.GNU: - - Removed PACE. - -Tue Jul 16 14:19:37 2002 Steve Huston - - * ace/DLL_Manager.cpp: - * ace/Parse_Node.cpp: (also see Fri Jul 12 12:37:42 2002 Steve Huston) - Always use the ptrdiff_t trick to cast a void* to a func ptr. - Nanbor was right ;-) Thanks to Carlos O'Ryan - for clarifying this issue, including C++ chapter and verse. - (It's in ISO C++ section 5.2.10 for those interested). - - * tests/DLL_Test.cpp: Use ptrdiff_t as a mediary to cast a void * - to a func ptr, not a long. - -Mon Jul 15 21:23:47 2002 Balachandran Natarajan - - * ace/Message_Block.i (base): Fixed a warning in TRU 64 builds. - -Mon Jul 15 18:56:47 2002 Douglas C. Schmidt - - * ace/String_Base.cpp (substring): Changed "nil" to "nill" to - avoid conflicts with a Mac OS X macro. Thanks to Ruslan - Zasukhin for reporting this. - -Mon Jul 15 15:18:33 2002 Steve Huston - - * ace/Configuration.{h cpp}: Changed ACE_Configuration_Value_IntId - data_ member to be a union with both pointer and u_int members. - Also, the length_ member is now size_t, not u_int. - - * ace/Memory_Pool.cpp (ACE_Pagefile_Memory_Pool::map): Use - INVALID_HANDLE_VALUE instead of a literal 0xFFFFFFFF for call to - CreateFileMapping. - - * ace/OS.{h i}: New method, void *atop(const char *s) converts a - string to void *. - - * ace/OS.i (fdopen): Don't cast arg to _open_osfhandle - Microsoft - changed the type to something sensible. - (isatty): open a C run-time handle for the ACE_HANDLE. - - * ace/OS.cpp (fopen): Don't cast arg to _open_osfhandle - Microsoft - changed the type to something sensible. - (unique_name): Use sprintf %p for pointer rather than casting - to an int. - - * ace/Naming_Context.cpp (ACE_Name_Options::parse_args): Use - ACE_OS::atop instead of ACE_OS::atoi for converting an argument - to a pointer. - - * ace/SOCK_Dgram.cpp (recv, send): - * ace/SOCK_IO.cpp (recvv): Use an int select_width - to pass width to select() so it can be ignored on ACE_WIN64. - - * ace/SV_Semaphore_Simple.cpp (name_2_key): Disable the type cast - conversion warning casting ACE::crc32() to key_t... it's fine. - - * ace/WIN32_Proactor.cpp (register_handle, post_completion): The - I/O completion port's completionKey argument is a ULONG in - "older" compiler/SDK versions, but was changed to a - ULONG_PTR (new type in newer SDK/compiler) for 64-bit - transition. The new type is used conditionally based on whether or - not we're building a 64-bit version. - -Mon Jul 15 09:26:17 2002 Douglas C. Schmidt - - * ace/SString.cpp (substring): Changed "nil" to "nill" to - avoid conflicts with a Mac OS X macro. Thanks to Ruslan - Zasukhin for reporting this. - -Mon Jul 15 10:14:44 2002 Carlos O'Ryan - - * bin/MakeProjectCreator/README: - Fixed typo - -Sun Jul 14 20:14:16 2002 Douglas C. Schmidt - - * FAQ: Fixed the use of "*.ps.gz" files. Thanks to - Carol Hunsicker for pointing this - out. - -Sun Jul 14 01:55:03 2002 Balachandran Natarajan - - * ace/Message_Block.i (reset_allocators): Reset the allocators in - the chain if the message block is chained. - -Sun Jul 14 01:43:32 2002 Balachandran Natarajan - - * ace/Message_Block.h: - * ace/Message_Block.i: Added two methods viz. reset_allocators () - and access_allocators () to ACE_Message_Block. - -Sat Jul 13 17:29:35 2002 Balachandran Natarajan - - * bin/fuzz.pl: Removed the word "warning" from a print statement, - since our scoreboard scripts seems to catch that as a warning. - -Sat Jul 13 13:31:54 2002 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added the Stack_Recursion test to the - daily builds. - -Fri Jul 12 20:28:52 2002 Krishnakumar B - - * ACEXML/common/URL_Addr.cpp (string_to_addr): - - Fixed confusion in handling normal and wchar strings. It should - compile now without problems. - - * ACEXML/apps/svcconf/Svcconf_Handler.cpp: - * ACEXML/apps/svcconf/Svcconf_Handler.i: - - Fixed memory leaks, some typos and used the locator to print - out error messages. - -Fri Jul 12 17:55:08 2002 Carlos O'Ryan - - * ace/String_Base.i: - Fixed rfind() to check for pos == npos also, that solved the - regression test failures. - -Fri Jul 12 16:03:22 2002 Steve Huston - - * ace/Basic_Types.h: Itanium is little-endian, like x86. Although - the Itanium architecture allows big-endian operation, Windows - doesn't use it. - - * tests/test_config.h (randomize): Fixed some int/size_t mix-ups. - -Fri Jul 12 13:02:51 2002 Steve Huston - - * ace/String_Base.{h i} (rfind): Changed pos argument from size_t to - ssize_t to make proper use of npos and avoid compile error for - g++ 2.95.2. - -Fri Jul 12 12:37:42 2002 Steve Huston - - * ace/DLL_Manager.cpp: - * ace/Parse_Node.cpp: g++ complains that ISO C++ won't allow cast - from void * to func ptr... so cast void * to ptrdiff_t, then to - func ptr. - -Fri Jul 12 12:26:27 2002 Steve Huston - - * ace/Timer_Heap_T.cpp (ctor): Alloc timer_ids_ as ssize_t[], - not long[]. - - * examples/C++NPv2/TPCLS.dsp: Added SSL libraries to link input. - - * examples/C++NPv2/TPLS.dsp: Added Logging_Handler.{h cpp} to project. - -Fri Jul 12 12:15:49 2002 Steve Huston - - * ace/Timer_Heap_T.cpp (grow_heap): Fix compile warning. - -Thu Jul 11 21:09:36 2002 Nanbor Wang - - * Makefile.bor: Added a new BUILD target called "nightlybuild" to - simplify nightlybuild script. - -Thu Jul 11 20:42:52 2002 Nanbor Wang - - * ace/OS.i (creat): The Win32 implementation of this function was - broken. Thanks to Marvin Greenberg - for submitting the fix. - -Thu Jul 11 18:37:35 2002 Krishnakumar B - - * ACEXML/common/URL_Addr.cpp (string_to_addr): - * ACEXML/common/URL_Addr.h: - - Change the argument to match the base class INET_Addr so that - warnings under Borland BCB is eliminated. - - * ACEXML/common/HttpCharStream.cpp: - - Use ACE_TEXT_ALWAYS_CHAR to convert an Unicode URL to char* - before converting it to an address. Thanks to Nanbor for - pointing this out. - - * ACEXML/common/Makefile: - * ACEXML/common/StreamFactory.h: - * ACEXML/common/StreamFactory.cpp: - - New class to create appropriate streams based on the URI. This - is needed for handling the parameter entities. - - * ACEXML/examples/SAXPrint/main.cpp: - - Move common error message to a new usage function. - -Thu Jul 11 16:28:24 2002 Steve Huston - - * tests/Proactor_Scatter_Gather_Test.cpp: Changed Writer to derive - from ACE_Handler, not ACE_Service_Handler. It's not the target of - an asynch connection factory, and declares an open() method that - hides the one in ACE_Service_Handler. - -Thu Jul 11 16:15:49 2002 Steve Huston - - * examples/C++NPv2/SR_Configurable_Logging_Server.dsp: - * examples/TPCLS.dsp: - * examples/TPLS.dsp: - * examples/C++NPv2/examples.dsw: Added SR_Configurable_Logging_Server, - TPCLS, and TPLS projects. - - * examples/C++NPv2/TPC_Logging_Server.h: Use ACE traits macros to - allow build on Win32. - * examples/C++NPv2/TPC_Logging_Server.cpp: Fix build problems on - Win32. - - * examples/TP_Logging_Server.h (init): Added #include "ace/Auto_Ptr.h" - and corrected use of ACE_NEW_NORETURN; use ACE_Auto_Ptr::get() to get - the argv pointer. - -Thu Jul 11 15:03:47 2002 Steve Huston - - * ace/ace_dll64.mak: TEMPORARILY added /wd4267 to disable the - conversion size_t to int warning. - - * ace/Activation_Queue.{h i} (method_count): Change return type - from int to size_t. - - * ace/Arg_Shifter.cpp (cur_arg_strncasecmp): Change flag_length var - to size_t to match string function signatures. If returning a - 'remaining' length, cast back to int. - - * ace/ARGV.cpp (ctor): Build string length using size_t, not int. - - * ace/CDR_Base.cpp (ACE_CDR::consolidate): Use ptrdiff_t, not the - nonstandard ptr_arith_t. - - * ace/CDR_Stream.cpp (grow_and_adjust): Use ptrdiff_t, notptr_arith_t. - (write_string): Cast ACE_SString:length result to ACE_CDR::ULong. - A number of other size_t<->ACE_CDR::ULong casts. - - * ace/CDR_Stream.i (write_string, operator<<): Use a ACE_CDR::ULong - len, can't directly use the return from strlen(), a size_t. - - * ace/Codecs.cpp: size_t conversions. - - * ace/DEV_Addr.i (set): Cast strlen result to int for base_set. - - * ace/DEV_IO.{i cpp} (send, recv): Cast iovec count from size_t to - int for call to ACE_OS level. - - * ace/Hash_Map_Manager_T.{h, i, cpp} (shared_find): Change loc argument - from u_long to size_t. Better match for its use. - - * ace/OS.h (ACE_align_binary, ACE_ptr_align_binary): Change from - using ptr_arith_t to the standard ptrdiff_t. - - * ace/DLL_Manager.cpp: - * ace/Parse_Node.cpp: Avoid casting a void * to a long then back to a - function pointer. Cast using proper calling signature. - - * ace/Reactor_Impl.h (ACE_Reactor_Notify::notify): - * ace/Select_Reactor_Base.{h cpp} (ACE_Select_Reactor_Notify::notify): - Change return type from ssize_t to int to match advertised return - type from ACE_Reactor. - - * ace/Select_Reactor_T.cpp (check_handles): Use an int select_width - to pass width to select() so it can be ignored on ACE_WIN64. - - * ace/String_Base_Const.{h cpp}: Changed npos from int to ssize_t. - - * ace/String_Base.{h i}: (operator[]) changed slot arg from int - to size_t. (strstr(), find(), rfind()) changed return type from - int to ssize_t; change pos arg from int to size_t. - - * ace/Timer_Heap_T.{h cpp}: Change 'slot' arg from int to size_t. - Also changed timer_ids_ to use ssize_t rather than long to - avoid length mismatches between the max size and the timer - queue (a size_t) and the arrays. - - * ace/WFMO_Reactor.h (ACE_WFMO_Reactor_Notify): Change return type - from ssize_to to int to match corresponding change in - ACE_Reactor_Notify, above. The implementation already was returning - int. - - * ace/WFMO_Reactor.cpp (make_changes_in_current_infos, - make_changes_in_suspension_infos): Align use of size_t. - (wait_for_multiple_events)...........Should maybe make the - sizes in this class DWORD????? - - * ace/WIN32_Proactor.cpp (close, handle_events): completion_key - needs to be a different on Win64 than on Win32. - -Thu Jul 11 08:34:22 2002 Chad Elliott - - * bin/MakeProjectCreator/USAGE: - * bin/MakeProjectCreator/modules/Driver.pm: - - Added new options and documentation dealing with generation of - relative paths in projects. - -Wed Jul 10 11:46:02 2002 Mayur Deshpande - - * bin/auto_run_tests.lst: - - Added tests/AMH_Exception and examples/AMH/Sink_Server as tests - for AMH - -Wed Jul 10 13:31:49 2002 Steve Huston - - * examples/C++NPv2/CLD.dsp: - * examples/C++NPv2/examples.dsw: Added CLD project. - - * examples/Client_Logging_Daemon.cpp: Disable the info, suspend, and - resume methods - these are left as an exercise for the reader. - -Wed Jul 10 11:24:39 2002 Steve Huston - - * examples/C++NPv2/AIO_CLD.dsp: - * examples/C++NPv2/examples.dsw: Added AIO_CLD project. - - * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: Fix Win32 compile - problems. - -Wed Jul 10 07:22:24 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - If the project creator needs the slashes converted, then - do so when generating relative paths. - -Tue Jul 9 23:24:44 2002 Krishnakumar B - - * include/makeinclude/rules.local.GNU: - - Print out more explanative messages. - - * include/makeinclude/platform_osf1_4.x_cxx.GNU: - * include/makeinclude/platform_sunos5_sunc++.GNU: - - Turn on symbol versioning for these platforms with the - proprietary compilers that ships with these systems viz, Sun CC - and cxx. - - -Tue Jul 9 16:24:46 2002 Douglas C. Schmidt - - * ace/Containers_T.cpp: Fixed inconsistent initializer order for - ACE_Fixed_Stack and ACE_Bounded_Stack. Thanks to Michael - Searles for reporting this. - -Tue Jul 9 11:10:38 2002 Steve Huston - - * apps/Gateway/Peer/Peer.{h cpp}: Renamed Peer_Acceptor::open() - to Peer_Acceptor::start() to avoid clashes with virtual - ACE_Acceptor::open. - -Tue Jul 9 09:01:14 2002 Chad Elliott - - * bin/MakeProjectCreator/config/taolib_with_idl.mpb: - - Change the default tao_idl option from -Gs to -Sc. - -Tue Jul 9 08:07:20 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - When using Cygwin Perl, we need to convert the cwd to a windows - path to match up with environment variables that are usable - outside of Cygwin. - -Tue Jul 9 07:46:57 2002 Chad Elliott - - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - Fix up the relative value matching code to work correctly - on Windows. - -Tue Jul 9 07:31:48 2002 Chad Elliott - - * ace/ace.mpc: - * ace/QoS/qos.mpc: - * ace/RMCast/rmcast.mpc: - * ace/SSL/ssl.mpc: - * apps/gperf/src/gperf.mpc: - * tests/tests.mpc: - * tests/RMCast/tests.mpc: - * tests/SSL/tests.mpc: - - Input files for the Make Project Creator for just the basic - libraries, exe's and tests. - -Tue Jul 9 07:24:06 2002 Chad Elliott - - * bin/mpc.pl: - * bin/mwc.pl: - - The starting point for creating workspaces and projects. - - * bin/MakeProjectCreator/README: - * bin/MakeProjectCreator/USAGE: - - A bit of lite documentation on the Make Project Creator. - - * bin/MakeProjectCreator/config/aceexe.mpb: - * bin/MakeProjectCreator/config/acelib.mpb: - * bin/MakeProjectCreator/config/aceversion.mpb: - * bin/MakeProjectCreator/config/avstreamsexe.mpb: - * bin/MakeProjectCreator/config/client.mpb: - * bin/MakeProjectCreator/config/global.mpb: - * bin/MakeProjectCreator/config/messaging.mpb: - * bin/MakeProjectCreator/config/namingexe.mpb: - * bin/MakeProjectCreator/config/notify.mpb: - * bin/MakeProjectCreator/config/notifytest.mpb: - * bin/MakeProjectCreator/config/orbsvcsexe.mpb: - * bin/MakeProjectCreator/config/orbsvcslib.mpb: - * bin/MakeProjectCreator/config/rt_client.mpb: - * bin/MakeProjectCreator/config/rt_server.mpb: - * bin/MakeProjectCreator/config/rteventexe.mpb: - * bin/MakeProjectCreator/config/server.mpb: - * bin/MakeProjectCreator/config/strategies.mpb: - * bin/MakeProjectCreator/config/taoexe.mpb: - * bin/MakeProjectCreator/config/taolib.mpb: - * bin/MakeProjectCreator/config/taolib_with_idl.mpb: - * bin/MakeProjectCreator/config/taoversion.mpb: - - Base projects for most of ACE and TAO. - - - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GUID.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateInputReader.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - - The main modules of the Make Project Creator which provide most of - the functionalty. - - * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm: - * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/EM3ProjectCreator.pm: - * bin/MakeProjectCreator/modules/EM3WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GHSProjectCreator.pm: - * bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GNUProjectCreator.pm: - * bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/NMakeProjectCreator.pm: - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VA4ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VA4WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC6ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC7ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: - - Subclassed workspace and project creators. - - * bin/MakeProjectCreator/templates/bor.mpd: - * bin/MakeProjectCreator/templates/bordll.mpt: - * bin/MakeProjectCreator/templates/borexe.mpt: - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/em3vcpdll.mpt: - * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt: - * bin/MakeProjectCreator/templates/em3vcplib.mpt: - * bin/MakeProjectCreator/templates/em3vcplibexe.mpt: - * bin/MakeProjectCreator/templates/ghs.mpd: - * bin/MakeProjectCreator/templates/gnu.mpd: - * bin/MakeProjectCreator/templates/gnudll.mpt: - * bin/MakeProjectCreator/templates/gnuexe.mpt: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/nmakedll.mpt: - * bin/MakeProjectCreator/templates/nmakeexe.mpt: - * bin/MakeProjectCreator/templates/va4icc.mpd: - * bin/MakeProjectCreator/templates/va4iccdll.mpt: - * bin/MakeProjectCreator/templates/va4iccdllexe.mpt: - * bin/MakeProjectCreator/templates/va4icclib.mpt: - * bin/MakeProjectCreator/templates/va4icclibexe.mpt: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc6dspdll.mpt: - * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt: - * bin/MakeProjectCreator/templates/vc6dsplib.mpt: - * bin/MakeProjectCreator/templates/vc6dsplibexe.mpt: - * bin/MakeProjectCreator/templates/vc7.mpd: - * bin/MakeProjectCreator/templates/vc7dll.mpt: - * bin/MakeProjectCreator/templates/vc7exe.mpt: - - Template and template input files for all of the different project - creators. - -Tue Jul 9 07:21:29 2002 Chad Elliott - - * ace/Map_T.h: - * ace/Map.cpp: - * ace/Pair_T.h: - * ace/Pair.cpp: - - Remove the use of Map.h and Pair.h. - - * ace/gethrtime.cpp: - - Only compile the contents of this file if using GHS and are - building for the x86. - -Mon Jul 8 17:26:51 2002 Steve Huston - - * ace/Task.cpp (svc_run): Borland complains about reinterpret_cast from - int to unsigned long, so change the cast to ACE_THR_FUNC_RETURN to - a static_cast for that compiler. Thanks to Johnny Willemsen - for this fix. - -Fri Jul 5 10:30:44 2002 Douglas C. Schmidt - - * ace/Array_Base.cpp: Swapped the order of includes so that - Array_Base.h comes after Malloc_Base.h. Thanks to Al Pariante - for reporting this. - -Thu Jul 4 11:27:05 2002 Douglas C. Schmidt - - * Happy 226th Birthday USA! - -Sat Jul 06 19:32:40 2002 Balachandran Natarajan - - * ace/Time_Value.h (ACE_Time_Value): Fix for [BUGID 1240]. Some of - the operators were missing explicit declarations in the header - file (they were anyway defined in the inlined files) which - created problems in builds where inlining was diabled. Please - see - - http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1240 for - more details. Thanks to Marina Spivak for - reporting this. - -Fri Jul 5 18:44:39 2002 Steve Huston - - * ace/ACE.cpp: Corrected undeclared 'select_width' errors and - signed/unsigned mismatch warnings. - -Fri Jul 5 16:14:51 2002 Steve Huston - - * ace/OS.{h i} (send, sendto, recv, recvfrom): Change 'len' argument - from int to size_t. - Removed conditional typedef of ssize_t; it's done in Basic_Types.h. - - * ace/ACE.h (recv): Filled in documentation for varargs variant. - * ace/ACE.cpp (send, recv): Properly convert size_t 'count' arg to int - iovec count for call to ACE_OS::sendv/recvv(). - (handle_timed_accept, handle_timed_complete, handle_ready): Use - an int select_width for ACE_OS::select() calls to get the types - correct. This arg is ignored on Windows anyway. - - * ace/Basic_Types.h: If ACE_HAS_SSIZE_T not defined, and Win64, - typedef SSIZE_T ssize_t; else use the existing int typedef. - -Wed Jul 3 11:09:31 2002 Steve Huston - - * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: - Change thread function to return ACE_THR_FUNC_RETURN, not void *. - -Tue Jul 02 21:43:53 2002 Nanbor Wang - - * ACEXML/common/XMLFilterImpl.h: One more pre/post mismatch. - -Tue Jul 2 16:58:55 2002 Krishnakumar B - - * ACEXML/common/XML_Types.h: - - Removed unnecessary includes and fixed a typo. - -Tue Jul 02 16:35:19 2002 Nanbor Wang - - * ACEXML/common/Attributes.h: - * ACEXML/common/Locator.h: Fixed mismatched pre/post inclusions. - - * ACEXML/parser/parser/Parser.cpp: Fixed compilation errors. - -Tue Jul 2 11:53:29 2002 Steve Huston - - * ace/config-all.h: Changed definition of ACE_THR_FUNC to incorporate - the platform's thread function return type (DWORD on Windows, - void * on most others). Uses a new typedef ACE_THR_FUNC_RETURN - to specify the platform's thread function return type. - - * ace/OS.{h i cpp} (thr_exit, thr_join): The status arg is now - a ACE_THR_FUNC_RETURN *. - Also moved remaining thread function definition type things to - config-all.h with the rest of them. - - * ace/Base_Thread_Adapter.{h cpp} (invoke(), ace_thread_adapter()): - * ace/OS_Thread_Adapter.{h cpp} - * ace/Thread_Adapter.{h cpp} (invoke(), invoke_i()): - Return type changed from void * to ACE_THR_FUNC_RETURN. - - * ace/Event_Handler.{cpp h} (read_adapter): Change return value from - void* to ACE_THR_FUNC_RETURN. - - * ace/Thread_Hook.{h cpp}: ACE_Thread_Hook::start () returns - ACE_THR_FUNC_RETURN, not void *. - - * ace/Thread.{h i} (exit, join): 'status' arg is now - ACE_THR_FUNC_RETURN *, not void *. - - * ace/Thread_Control.{h inl cpp} (status, exit): - * ace/Thread_Manager.{h cpp} (exit, join): Thread exit status - type changed from void * to ACE_THR_FUNC_RETURN. - - * ace/Task.{h cpp} (ACE_Task_Base): Return type from svc_run now - ACE_THR_FUNC_RETURN. - - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.{cpp, h}: - * examples/C++NPv2/Select_Reactor_Logging_Server.cpp: - * examples/C++NPv2/Server_Shutdown.cpp: - * examples/C++NPv2/TP_Reactor_Logging_Server.cpp: - * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp: - * examples/C++NPv2/Client_Logging_Daemon.cpp: - * examples/Connection/blocking/SPIPE-acceptor.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-server.cpp: - * examples/Reactor/WFMO_Reactor/Abandoned.cpp: - * performance-tests/TCP/tcp_test.cpp: - * tests/ACE_Init_Test.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/Service_Config_DLL.cpp: - * tests/Task_Test.cpp: - * tests/Thread_Pool_Reactor_Resume_Test.cpp: - * tests/Thread_Pool_Reactor_Test.cpp: - Change thread function to return ACE_THR_FUNC_RETURN, not void *. - - * examples/C++NPv2/TP_Logging_Server.cpp (handle_input, svc): - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp (open): - * examples/C++NPv2/display_logfile.cpp (svc): Change - ACE_reinterpret_cast to ACE_static_cast. Thanks to Doug Schmidt - for finding this. - - * examples/C++NPv2/TP_Logging_Server.h: - * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp: Corrected use - of ACE_NEW_RETURN. - -Mon Jul 1 23:16:47 2002 Jeff Parsons - - * */Makefile: - - Updated dependencies. - -Mon Jul 1 21:59:44 2002 Krishnakumar B - - * ACEXML/common/Attributes.h: - * ACEXML/common/AttributesImpl.h: - * ACEXML/common/Attributes_Def_Builder.h: - * ACEXML/common/CharStream.h: - * ACEXML/common/ContentHandler.h: - * ACEXML/common/DTDHandler.h: - * ACEXML/common/DTD_Manager.h: - * ACEXML/common/DefaultHandler.h: - * ACEXML/common/Element_Def_Builder.h: - * ACEXML/common/EntityResolver.h: - * ACEXML/common/Env.h: - * ACEXML/common/ErrorHandler.h: - * ACEXML/common/Exception.h: - * ACEXML/common/FileCharStream.h: - * ACEXML/common/HttpCharStream.h: - * ACEXML/common/InputSource.h: - * ACEXML/common/Locator.h: - * ACEXML/common/LocatorImpl.h: - * ACEXML/common/Mem_Map_Stream.h: - * ACEXML/common/NamespaceSupport.h: - * ACEXML/common/SAXExceptions.h: - * ACEXML/common/StrCharStream.h: - * ACEXML/common/Transcode.h: - * ACEXML/common/URL_Addr.h: - * ACEXML/common/Validator.h: - * ACEXML/common/XMLFilter.h: - * ACEXML/common/XMLFilterImpl.h: - * ACEXML/common/XMLReader.h: - * ACEXML/common/XML_Codecs.h: - * ACEXML/common/XML_Types.h: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp: - * ACEXML/parser/debug_validator/Debug_Attributes_Builder.h: - * ACEXML/parser/debug_validator/Debug_DTD_Manager.h: - * ACEXML/parser/debug_validator/Debug_Element_Builder.h: - * ACEXML/parser/debug_validator/Element_Tree.h: - * ACEXML/parser/parser/Entity_Manager.h: - * ACEXML/parser/parser/Parser.cpp: - * ACEXML/parser/parser/Parser.h: - - ACE_LACKS_PRAGMA_ONCE fixes. - -Mon Jul 1 06:21:00 2002 Douglas C. Schmidt - - * ace/Sock_Connect.cpp (count_interfaces): Added a MacOSX-specific - value for OSIOCGIFCONF. Thanks to John Zorko - for this fix. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a deleted file mode 100644 index 482898cd2f2..00000000000 --- a/ChangeLogs/ChangeLog-03a +++ /dev/null @@ -1,1338 +0,0 @@ -Thu Feb 20 19:18:17 2003 Balachandran Natarajan - - * ChangeLogs/ChangeLog-02b: - * ChangeLogs/ChangeLog-03a: New files having all the old ChangeLog - entries till 5.3.1. - * ChangeLog: Shortened the changelog for ease of use. - -Thu Feb 20 10:35:15 2003 Ossama Othman - - * ace/Strategies_T.h: - * ace/Strategies_T.cpp: - - Reverted part of changes that introduced extensive use of - traits since they were forcing the introduction of the - ACE_TYPENAME macro in more places than is desirable at this - point in time. They may be reintroduced in the future. - -Thu Feb 20 09:24:00 2003 Ossama Othman - - * ace/Service_Config.h: - - Forward declare ACE_Service_Object. Necessitated by inter-header - dependency reductions. - -Thu Feb 20 09:23:51 2003 Ossama Othman - - * ace/Acceptor.h: - * ace/Connector.h: - - No need to include "ace/Service_Config.h" and - "ace/Svc_Handler.h". - - Include "ace/Synch_Options.h". Necessitated by inter-header - dependency reductions. - - * ace/Acceptor.cpp: - * ace/Connector.cpp: - - Include "ace/Svc_Handler.h". Necessitated by inter-header - dependency reductions. - - * ace/Atomic_Op.h: - - Fixed doxygen documentation. - - * ace/Atomic_Op.i (operator++, operator--): - - Implement these post{in,de}crement operators in terms of their - corresponding pre{in,de}crement operators to ensure consistent - semantics. - - * ace/Atomic_Op_T.h (mutex_, own_mutex_): - - Improved const-correctness by making these mutex members - mutable. This allows us to avoid casting away the constness. - - * ace/Atomic_Op_T.i (operator==, operator>=, operator>): - (operator<=, operator<, value, operator=): - - Do not cast away the constness of the mutex. That hack is no - longer necessary since the mutex is now mutable. - - * ace/Basic_Types.h: - - Improved doxygen documentation. - - Moved endianness determination macros prior to ACE_U_LongLong - class. - - (operator=): - - Added ACE_ULongLong assignment operator declarations that accept - 32 bit signed and unsigned integers. - - (operator++, operator--): - - Added missing ACE_ULongLong post{in,de}crement operator - declarations. - - (data_): - - Make declaration order of lower and upper 32 bit members (lo_ - and hi_) of this structure dependant on the endianness of the - platform. This mimics what is done for the ACE_LongLong type - in the ACE_CDR classes. - - * ace/Basic_Types.i (operator=): - - Added ACE_ULongLong assignment operator implementation that - accept 32 bit signed and unsigned integers. - - (operator++, operator--): - - Added missing ACE_ULongLong post{in,de}crement operator - implementations. - - * ace/CDR_Base.cpp (mb_align): - - Uninlined this method in order to reduce inter-header - dependencies. - - (operator<, operator<=, operator>, operator>=, operator==): - (operator!=): - - Added these missing operator for the ACE_LongLong type. - - (Float, operator=, operator!=): - - Fixed potential unused argument warnings for the Cray/UNICOS - case. - - * ace/CDR_Base.h: - - Include "ace/OS.h" instead of "ace/Message_Block.h", and forward - declare ACE_Message_Block in order to reduce inter-header - dependencies. - - Changed all uses of typedefs like "u_char" and "u_long" to their - non-typedef counterparts, e.g. "unsigned char" and "unsigned - long". Makes it possible to avoid including headers that - contain those typedefs. - - (operator=): - - Added ACE_LongLong constructors assignment operators that accept - 32-bit integers. - - (operator==, operator!=, operator<=, operator<, operator>=): - (operator>): - - Added these missing ACE_LongLong relation operators. - - * ace/CDR_Base.inl (operator=): - - Added ACE_LongLong constructors assignment operators that accept - 32-bit integers. - - (operator==, operator!=, operator<=, operator<, operator>=): - (operator>): - - Added these missing ACE_LongLong relation operators. - - * ace/CDR_Stream.h: - - Moved definition of the ACE_CDR_BYTE_ORDER macros from OS.h to - this header. Helps with header dependency reduction. - - * ace/Capabilities.h: - - Use ACE_Hash_Map_Manager_Ex instead of ACE_Hash_Map_Manager. - Doing so saves us three template instantiations. - - * ace/Capabilities.i: - - Cosmetic changes. - - * ace/Capabilities.cpp: - - No need to include "ace/Map_Manager.h". - - Added missing ACE_RCSID macro. - - Improved conformance to ACE coding conventions. - - Removed explicit template instantiations for the - ACE_Hash_Map_Manager template. That template is no longer - used. - - (reset_caps): - - Use ACE_Hash_Map_Manager_Ex template traits instead of the - actual template type. Makes for cleaner code. - - * ace/Configuration.cpp: - * ace/Configuration.h: - * ace/Strategies_T.cpp: - * ace/Token_Collection.cpp: - * ace/Token_Collection.h: - * ace/Token_Invariants.cpp: - * ace/Token_Invariants.h: - * ace/Token_Manager.cpp: - * ace/Token_Manager.h: - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Asynch_IO.h: - - Take advantage of template traits to improve clarity of code. - - * ace/Copy_Disabled.h: - - Corrected comment. - - * ace/Default_Constants.h: - - Moved ACE_DEFAULT_CDR_BUFSIZE, ACE_DEFAULT_CDR_EXP_GROWTH_MAX, - ACE_DEFAULT_CDR_LINEAR_GROWTH_CHUNK, - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF macros from OS.h to this - header. Helps with inter-header dependency reduction. - - * ace/Dynamic_Service_Base.cpp: - * ace/Parse_Node.cpp: - * ace/Service_Manager.cpp: - * ace/Service_Repository.cpp: - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: - - Include "ace/Service_Types.h". Necessitated by inter-header - dependency reduction. - - * ace/Filecache.h: - * ace/Filecache.cpp: - * ace/Hash_Map_With_Allocator_T.h: - * ace/Hash_Map_With_Allocator_T.cpp: - * ace/Local_Name_Space_T.h: - * ace/Local_Name_Space.cpp: - - Use ACE_Hash_Map_Manager_Ex instead of ACE_Hash_Map_Manager. - Doing so saves us three template instantiations. - - * ace/Future_Set.h: - * ace/Map_T.h: - - Include "ace/Hash_Map_Manager_T.h" instead of - "ace/Hash_Map_Manager.h". The former is all that is needed, and - the latter already includes the former. - - * ace/Hash_Map_Manager_T.i (operator++, operator--): - * ace/Map_Manager.i: - * ace/RB_Tree.i: - - Implement the post-{in,de}crement operators in terms of their - pre-{in,de}crement operator counterparts to ensure consistency. - - * ace/Local_Name_Space_T.cpp: - - No need to include "ace/Auto_Ptr.h" - - Use template traits to improve code clarity. - - * ace/OS.h: - - Moved ACE_CDR_BYTE_ORDER macro definition to CDR_Stream.h. - Helps with inter-header dependencies. - - Moved ACE_DEFAULT_CDR_BUFSIZE, ACE_DEFAULT_CDR_EXP_GROWTH_MAX, - ACE_DEFAULT_CDR_LINEAR_GROWTH_CHUNK, - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF to Default_Constants.h. Helps - with inter-header dependency reduction. - - * ace/POSIX_Asynch_IO.cpp: - - Added missing ACE_RCSID macro. - - (bytes_transferred): - Use map template traits to improve code clarity. - - * ace/POSIX_Asynch_IO.h: - - Redefined old map typedefs in terms of the map traits. - - * ace/Parse_Node.h: - * ace/Service_Repository.h: - - No need to include "ace/Service_Types.h". A forward declaration - for ACE_Service_Types is enough. - - * ace/Service_Config.h: - - No need to include "ace/Service_Types.h" and "ace/Signal.h". - Forward declaring ACE_Service_Types and ACE_Sig_Adapter is - enough. - - * ace/Strategies_T.h: - - No need to include "ace/Service_Config.h" and - "ace/Synch_Options.h". - - * ace/Synch_Options.h: - - Changed all uses of typedefs like "u_char" and "u_long" to their - non-typedef counterparts, e.g. "unsigned char" and "unsigned - long". Makes it possible to avoid including OS.h. A big win in - compile time reduction. - - Include "ace/Time_Value.h". Necessitated by inter-header - dependency reduction. - - * ace/Synch_Options.cpp: - - Changed all uses of typedefs like "u_char" and "u_long" to their - non-typedef counterparts, e.g. "unsigned char" and "unsigned - long". Makes it possible to avoid including OS.h. A big win in - compile time reduction. - - Include "ace/Trace.h". Necessitated by inter-header - dependency reduction. - - * ace/Template_Instantiations.cpp: - - Removed all ACE_Hash_Map_Manager related template - instantiations. The ones for ACE_Hash_Map_Manager_Ex are all - that are needed. - - * ace/SSL/SSL_SOCK_Acceptor.h (ACE_SSL_SOCK_Acceptor): - - Inherit privately from ACE_SSL_SOCK, instead of publically. - ACE_SSL_SOCK_Acceptor is IMPLEMENTED-IN-TERMS-OF ACE_SSL_SOCK. - It does not satisfy the IS-A relationship. - - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - - Use ACE_Countdown_Time to take into account the time between - each call to select() instead of using the same timeout value in - each loop iteration. - - * ace/SSL/SSL_SOCK_Stream.cpp (get_remote_addr): - - Retrieve the remote addr from the parent ACE_SSL_SOCK class, not - ACE_SOCK. Addresses potential inconsistencies in the future. - - * ace/SSL/SSL_SOCK_Stream.h (ACE_SSL_SOCK_Stream): - - Removed friend declarations for the - ACE_SSL_SOCK_{Acceptor,Connector} classes. They are - unnecessary. - -Wed Feb 19 12:50:58 2003 Heather Drury - - * ACE version 5.3.1 released. - -Mon Feb 17 15:21:18 2003 Balachandran Natarajan - - * bin/auto_run_tests.lst: The Server_Protocol and the ORB_init - test in RTCORBA will not run in ST builds since the operations - ACE_OS::thr_getprio () are not supported. - -Fri Feb 14 09:53:43 2003 Rich Seibel - - * ace/config-osf1-4.0.h: Tru64 lacks the clearerr - function when built without threads (thread=0). - Thanks to Abhay Kulkarni - for reporting the problem. - -Thu Feb 13 17:50:07 2003 Krishnakumar B - - * include/makeinclude/rules.lib.GNU: Build static libraries - using xargs with the list of all the object files instead of - using them directly on the command line. This works around - brokenness of systems that have a small limit on the length of - the command-line arguments. Thanks to Abhay Kulkarni - for reporting the problem. - -Thu Feb 13 12:43:27 2003 Pradeep Gore - - * bin/auto_run_tests.lst: - Added TAO/examples/RTCORBA/Activity/run_test.pl to this list. - -Thu Feb 13 07:36:40 2003 Balachandran Natarajan - - * THANKS: Added Dmitri Belogaj to the hall of fame. - -Wed Feb 12 12:40:21 2003 Balachandran Natarajan - - * bin/auto_run_tests.lst: Prevented a few RTCORBA tests to be run - in our daily builds since changing priorities requires root - access. - -Wed Feb 12 12:06:05 2003 Balachandran Natarajan - - * ace/Strategies.h: Added this file for backward - compatibility. Backward compatibility was broken with the - following checkin - - "Tue Nov 20 12:48:39 2001 Balachandran Natarajan - ". Thanks to Dmitri Belogaj - for reporting this problem. - -Wed Feb 12 10:18:21 2003 Nanbor Wang - - * bin/MakeProjectCreator/templates/vc7.mpd: Checked in Chad's - missing ssl_libs fix. - -Wed Feb 12 08:59:12 UTC 2003 Johnny Willemsen - - * ace/UPIPE_Addr.h: - Removed ACE_UPIPE_Addr class which isn't used, typedef ACE_UPIPE_Addr - still is there. - -Tue Feb 11 22:19:39 2003 Krishnakumar B - - * examples/DLL/Makefile.Today (SHLIB): - * examples/DLL/Makefile.Newsweek (SHLIB): - - Removed extra space at the end which caused compilation to - break. Thanks to Bill Cassanova for - reporting the problem. - -Wed Feb 12 00:00:12 UTC 2003 Craig Rodrigues - - * ace/OS.h: - * ace/OS.i (thr_setprio): Add a new default thr_policy parameter which - allows us to explicitly set the policy in pthread_setschedparam(). - Introduced to eliminate a bug discovered in RT-CORBA implementation. - -Tue Feb 11 14:01:21 2003 Nanbor Wang - - * vc7_nightly.mwc: Added a temporary file specifying core nightly - build targets. Notice this file includes both ACE and TAO. - - * ace/ace.mpc: Added XML_Svc_Conf.cpp. - - * ace/SSL/ssl.mpc: Fixed dllflags setting. - -Mon Feb 10 18:08:12 2003 Balachandran Natarajan - - * THANKS: Added Otis Nyandoro to the hall of fame. - -Mon Feb 10 18:02:41 2003 Steve Huston - - * ace/OS.h: Don't special-case SEH support on ACE_HAS_WINCE. First, - CE can do SEH; second, the switching of this on/off can and should - be done in the config file. - - * ace/config-win32-common.h: Enable ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS - for WinCE. - - Thanks to Emmanuel Thevenot Beaufort - for this fix. - - * ace/Handle_Set.{h i}: Remove the ACE_Handle_Set destructor for - ACE_HAS_WINCE. The need for this predates the supported vc 3 and 4 - compilers, and having it in there triggers an SEH warning. - - * ace/SPIPE_Stream.i: Follow-up to: - Mon Feb 10 09:22:04 2003 Phil Mesnier - Added the need for ACE_HAS_WINSOCK2 to enable this code. The calls - and structures used aren't available in Winsock1. - - * ace/config-wince.h: Disable Winsock2 for CE versions less than 4.0. - -Mon Feb 10 12:14:35 2003 Jeffrey Graham - - * bin/ace-install: - - Fixed problem where all TAO executables were not installed. - - Fixed installed file permission problem. Files that should have - global access didn't have it. - - Fixed problem where the script did not easily flatten the - install directory, requires the ACE_ARCH subdirectory trees be - built. - - Fixed problem where all binaries were not filtered out. - -Mon Feb 10 19:42:12 UTC 2003 Johnny Willemsen - - * ace/ATM_Acceptor.h: - Converted old style documentation to doxygen style - - * ace/Arg_Shifter.h: - Added private declaration of copy constructor and assignment - operator. Instances of these class can not be copied using the - default ones. Also fixes a MSVC6 level 4 warning. - - * ace/Configuration.cpp: - Removed not needed MingW ifdef, the normal code also compiles with - MingW - - * ace/config-win32.h: - Removed cygwin from this file. For cygwin the config-cygwin32.h - must be included directly in config.h - - * ace/Notification_Strategy.h: - * ace/Notification_Strategy.inl: - Made mask() method const - - * include/makeinclude/ace_flags.bor: - If TAO_ROOT isn't defined, define it as $(ACE_ROOT)/TAO - - * bin/MakeProjectCreator/templates/bor.mpd: - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - Thanks for Christopher Kohlhoff for providing - a fix for the singleton template with Borland. The problem is that - with a singleton template the code is implicitly generated into - every object file that references it. The linker then strips out - all but a single copy of the code. When linking an exe that refers - to a singleton template in a dll, the linker would choose one - of the template code instances in the exe's .obj files, and - completely ignore the instance that was exported by the dll. - - The key to the solution is that it appears that the borland linker - chooses the first instance of the template symbols that it sees. The - linker will let you list the .lib files in the place normally used - for object files. By listing the library files before any of the - object files, it resolves the template code against the dll exports. - - * examples/Service_Configurator/Misc/Makefile: - * examples/Service_Configurator/Misc/Makefile.Timer: - * examples/Service_Configurator/Misc/Makefile.main: - Splitted the original GNU makefile in multiple files, one for the - shared library and one for the exe and one to trigger the other - two. This fixes the compile errors with this example with Cygwin - and MingW. Thanks for Vince Mounts for making - these makefiles. - -Mon Feb 10 09:22:04 2003 Phil Mesnier - - * ace/SPIPE_Stream.i: Added a special case for win32 platforms to - ACE_SPIPE_Stream::send_handle() and recv_handle() to allow handle - passing. The extension is necessary since the receiving side must - open the duplicate handle before the sending side closes it. - -Fri Feb 7 17:22:39 2003 Steve Huston - - * ace/OS.cpp (ACE_OS::thr_create): Moved the pthread_setstack() call - (and the check for whether it's available) from inside the - Pthreads draft 4/6 section to the Pthreads standard section - and corrected the condition it's used (defined - ACE_HAS_PTHREAD_SETSTACK, not !defined ACE_HAS_PTHREAD_SETSTACK). - - Also see: - Thu Jan 16 19:06:19 2003 Stephen Torri - -Fri Feb 7 16:55:58 2003 Heather Drury - - * ace/config-aix-4.x.h: Reverted change to aix config file: - - Fri Feb 7 15:27:40 2003 Heather Drury - -Fri Feb 7 15:37:19 2003 Steve Huston - - * include/makeinclude/platform_aix_ibm.GNU: Define DCCFLAGS with the - debugging options for xlC_r; Change DCFLAGS to just -g (for the C - compiler). Thanks to Trevor Fields for - reporting this problem. - -Fri Feb 7 15:27:40 2003 Heather Drury - - * ace/config-aix-4.x.h: Restored the defining of - ACE_TEMPLATES_REQUIRE_SOURCE for AIX VisualAge 5, - which is needed for building TAO. Thanks to Trevor - Fields for this fix. - -Fri Feb 7 13:04:51 2003 Steve Huston - - * ace/ace_wchar.h: Added a new macro, ACE_TEXT_ALWAYS_WCHAR(STRING). - It's the inverse of ACE_TEXT_ALWAYS_CHAR - whatever STRING is, - the macro produces a wide-char string. Thanks to - Emmanuel Thevenot Beaufort - for this macro. - -Thu Feb 6 19:30:18 2003 Steve Huston - - * tests/SString_Test.cpp: Added a test for wide-string compares of - equal-length strings that differ in the last character. - - * ace/String_Base.i (compare): When memcmp()-ing to compare, take - the size of CHAR into account when calculating byte length. Thanks - to Emmanuel Thevenot Beaufort - for this fix. - -Thu Feb 6 16:06:29 2003 Rich Seibel - - * ace/config-tru64.h: Added a guard around the - ACE_HAS_SNPRINTF as versions earlier than 5.0 do not seem - have this function. - -Thu Feb 6 15:03:04 2003 Krishnakumar B - - * include/makeinclude/rules.local.GNU: Make the removal of IDL - generated files in realclean target dependent upon the - definition of IDL_FILES. MingW make crashes on empty "rm -f " - commands. - -Thu Feb 6 15:19:28 2003 Heather Drury - - * ace/Refcounted_Auto_Ptr.h: - * ace/Refcounted_Auto_Ptr.i: Made the other get() method const. See - previous ChangeLog entry. - -Thu Feb 6 07:13:06 2003 Douglas C. Schmidt - - * ace/Refcounted_Auto_Ptr.{h,i} (get): Made the get() method const. - Thanks to Jenny Kowald for suggesting this. - -Wed Feb 5 20:48:47 2003 Krishnakumar B - - * include/makeinclude/rules.local.GNU: Added rules to generate - object files from C++ file extensions .cxx, .C and .cc, in - addition to .cpp. - -Wed Feb 5 20:15:18 2003 Krishnakumar B - - * include/makeinclude/rules.lib.GNU: Removed the conditional - setting of VSHOBJS and VSHOBJS1 based on PRELIB. There is too - much bogosity here. This should fix HP-UX and AIX breakage. - -Sat Feb 1 08:43:53 2003 Douglas C. Schmidt - - * ace/Stream_Modules.cpp (put): Return 0 rather than -1 to be consistent - wrt the put() semantics elsewhere in ACE. Thanks to Jody Hagins - for help with this. - - * tests/FIFO_Test.cpp (server): Only compile this on platforms - that aren't Win32 since FIFO's don't work there. Thanks to Carl - Halvorson for reporting this. - -Wed Feb 5 09:45:12 UTC 2003 Johnny Willemsen - - * include/makeinclude/platform_mingw32.GNU: - Removed desciption to MINGW_BASE. - -Tue Feb 4 13:13:08 2003 Krishnakumar B - - * include/makeinclude/rules.lib.GNU: - * include/makeinclude/rules.bin.GNU: - - Generalized the creation of objects from source files by - removing the dependency that the source files be named *.cpp. - Also removed a lot of junk. - - * include/makeinclude/wrapper_macros.GNU: Removed some more - accumulated cruft. - - * include/makeinclude/rules.nested.GNU: Fix recursive make so - that users can name the makefiles in sub-directories as - something other than Makefile by introducing a new variable - SUBDIR_MAKEFILE. - - * ace/Makefile: Fix the Makefile to use the above extension when - recursing into directories. - - * include/makeinclude/rules.local.GNU: Add a new local target - clean_idl_stubs.local which cleans all the IDL generated files. - This target is linked to realclean so the IDL generated files - will only be cleaned with realclean. - - Thanks to James Mansion for - reporting the bugs and suggesting some fixes. - -Tue Feb 4 11:21:13 MST 2003 Rob Andzik - - * ACE_wrappers/include/makeinclude/platform_vxworks5.x_g++.GNU - - Added three new variables - GCC_VERSION (defaults to gcc-2.96) - VXWORKS_VERSION_FLAG (defaults to -DACE_VXWORKS=0x542) - VXWORKS_STDINC_FLAG (defaults to ) - - - Modified all sets of GCCLIB_DIR to use GCC_VERSION - - Modified all references to ACE_VXWORKS to use VXWORKS_VERSION_FLAG - - replaced -nostdinc with VXWORKS_STDINC_FLAG - - * ACE_wrappers/ace/config-vxworks5.x.h - - Added define ACE_LACKS_CLEARERR (wrapped in ACE_VXWORKS check) - - * ACE_wrappers/ace/OS.i - - Added ACE_UNUSED_ARG where warnings occurred. - -Mon Feb 3 16:33:02 2003 Heather Drury - - * ace/config-freebsd.h: msgsnd() with const parameter was recently - added to FreeBSD-CURRENT. Thanks to Craig Rodrigues' for this change. - -Sat Feb 1 09:34:45 2003 Ossama Othman - - * bin/auto_run_tests.lst: - - Disable TAO's IORInterceptor test for the GIOP 1.0 build - configuration. The test requires IOR tagged components that are - not supported in GIOP 1.0. Fixes a false positive in our - scoreboard. - -Sat Feb 1 07:50 2003 Douglas C. Schmidt - - * Our deepest sympathies to the families and friends of the crew of - the US Space Shuttle Columbia, which was lost over Texas this - morning. - - "We shall never forget them nor the last time we saw them, as - they prepared for their mission and waved good-bye and slipped - the surly bonds of Earth to touch the face of God." - - - President Reagan (addressing NASA employees following the - tragic loss of the Challenger 7 crew on STS-51L.) - - Ad astra per aspera. - -Sat Feb 1 09:00:00 2003 Steve Huston - - * Space Shuttle Columbia breaks up at 200,000ft altitude at - 12,500mph. 7 astronauts killed; the US and Israel mourn their loss. - -Fri Jan 31 12:55:26 2003 Frank Hunleth - - * tests/Reactor_Exceptions_Test.cpp (worker): Added #if defined - (ACE_HAS_THREADS) guard around worker () function to remove a - compiler warning on single threaded configurations that have - exceptions enabled. - -Thu Jan 30 21:57:58 2003 Frank Hunleth - - * examples/Threads/thread_specific.cpp (worker): Added __OpenBSD__ - to the list of OS/compilers that can check printf arguments. - This removes a compilation warning. - -Thu Jan 30 21:50:27 2003 Frank Hunleth - - * ace/config-openbsd.h: Added ACE_LACKS_SETSCHED, since it turns - out that sched_setscheduler hasn't been implemented on OpenBSD. - - * bin/auto_run_tests.lst: Disabled the MT_Cubit test for OpenBSD, - since it fails completely when sched_params returns an error. - -Thu Jan 30 10:34:02 2003 Ossama Othman - - From Olivier Brunet - * ace/SSL/SSL_Context.cpp (report_error): - - Corrected format specifier for wide string case. - -Wed Jan 29 12:31:51 2003 Frank Hunleth - - * ace/config-openbsd.h: - * ace/config-openbsd-pthreads.h: Merged config files together and - removed config-openbsd-pthreads.h like what was done for - FreeBSD. - - * include/makeinclude/platform_openbsd.GNU: - * include/makeinclude/platform_openbsd_pthreads.GNU: Merged files - together and removed platform_openbsd_pthreads.GNU like - FreeBSD. Also removed gratuitous link of -lstdc++. g++ already - does that for us. Thanks to Craig Rodrigues' changelog entry. - -Wed Jan 29 11:47:29 2003 Steve Huston - - * ACEXML/tests/ContentHandler_Test.cpp: Fixed compile errors by - adding/correcting use of the ACEXML exception macros. - -Wed Jan 29 08:30:12 UTC 2003 Johnny Willemsen - - * ace/Vector_T.cpp: - Fixed bug in resize() method, of the original vector, the last - item was lost during resize(). Thanks to Denis Parnaland - for reporting this. - - * tests/Vector_Test.cpp: - Extended this test to test the resize() method of ACE_Vector. - - * THANKS: Added Denis Parnaland. - -Tue Jan 28 18:46:41 2003 Steve Huston - - * ACEXML/parser/parser/Parser.cpp (parse_element): When converting - an escape sequence, add its length, don't lose the length of - already-parsed content. Thanks to Emmanuel Thevenot Beaufort - for this fix. - - * ACEXML/tests/ContentHandler_Test.{cpp dsp}: New test that - illustrates the problem above and validates the fix. - - * ACEXML/tests/Tests.dsw: - * ACEXML/Makefile: - * ACEXML/Makefile.bor: Added ContentHandler_Test. - - * THANKS: Added Emmanuel Thevenot Beaufort to the Hall of Fame. - -Tue Jan 28 15:47:29 2003 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: For distrib builds, - changed the +h option to not specify the whole path; put the path - in the path search option (+b). - -Mon Jan 27 14:28:16 2003 Heather Drury - - * include/makeinclude/wrapper_macros.GNU: Remove unnecessary use - of GNU make basename command. Supplied by Ganesh Pai . - -Sun Jan 26 16:42:23 UTC 2003 Johnny Willemsen - - * include/makeinclude/platform_linux_borland.GNU: - When AIO support is found, set the right define but also add the - library liblrt to the lists to link with. Only when building with - threading support link with the pthread library. - -Sun Jan 26 16:42:23 UTC 2003 Johnny Willemsen - - * include/makeinclude/platform_linux_borland.GNU: - Don't set any BUILD_DLL defines in this file, the BUILD_DLL defines - are set in the specific makefiles. - -Sat Jan 25 20:31:56 2003 Frank Hunleth - - * ace/config-openbsd.h: - * ace/config-openbsd-pthread.h: Added ACE_HAS_SNPRINTF since - OpenBSD has snprintf() and to fix buffer overflow tested for by - tests/Log_Msg_Test. - -Sat Jan 25 18:15:48 2003 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added a new test to the daily builds. - -Sat Jan 25 13:39:23 UTC 2003 Johnny Willemsen - - * ACE-INSTALL.html: - * include/makeinclude/platform_mingw32.GNU: - * include/makeinclude/platform_gnuwin32_common.GNU: - Removed the usage of MINGW_BASE. This is not needed for using MingW. - Thankx to Viktor Ransmayr for - confirming that this is not needed. - -Fri Jan 24 07:54:12 UTC 2003 Johnny Willemsen - - * ace/OS.h: - VxWorks 5.4 lacks some ANSI prototypes. These are defined by - VxWorks 5.5 so we only define these ANSI prototypes when defined - ACE_VXWORKS and this is equal or smaller 0x540. Else we just - include apra/inet.h. - -Thu Jan 23 17:57:05 2003 Heather Drury - - * ace/README: Deleted non-ascii characters around ACE_HAS_PTHREAD_SETSTACK. - -Thu Jan 23 17:44:38 UTC 2003 Craig Rodrigues - - * include/makeinclude/platform_freebsd.GNU: Remove gratuitous link - of -lstdc++. g++ already does that for us. - -Wed Jan 22 21:08:48 2003 Steve Huston - - * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp (Quit_Handler): - Sync with code in the book. - -Wed Jan 22 18:12:41 2003 Steve Huston - - * examples/C++NPv2/Service_Reporter.cpp: - * examples/C++NPv2/Configurable_Logging_Server.cpp: Change the - name of the static service descriptor from Reporter to - Reporter_Descriptor. This is more descriptive and matches - the book. - -Wed Jan 22 18:08:27 UTC 2003 Craig Rodrigues - - * ace/config-freebsd.h: Add ACE_HAS_SNPRINTF. Fixes Log_Msg_Test. - -Wed Jan 22 18:03:35 UTC 2003 Craig Rodrigues - - * include/makeinclude/platform_linux.GNU: - * include/makeinclude/platform_linux_icc.GNU: - * include/makeinclude/platform_linux_kcc.GNU: - Remove defines of _POSIX_THREADS and _POSIX_THREAD_SAFE_FUNCTIONS. - These POSIX constants are not meant to be defined by - the user. The user must include and *check* - the value of these constants. On Linux glibc systems, - after including , the header - will be eventually be included...these constants are - defined by the glibc implementation in that header. - -Wed Jan 22 10:55:39 2003 Steve Huston - - * ace/config-tru64.h: Added ACE_HAS_SNPRINTF. Thanks to Vladimir - Chovanec for this fix. - -Wed Jan 22 01:24:51 2003 Douglas C. Schmidt - - * ace/Message_Queue_T.h: Corrected the documentation for - ACE_Message_Block_Ex so it says ACE_MESSAGE_TYPE rather than - ACE_Message_Block. - -Tue Jan 21 21:44:04 2003 Nanbor Wang - - * ACEXML/examples/SAXPrint/broken.xml: Added a new broken XML file - to make sure we handle this case properly. - - * ACEXML/parser/parser/Parser.i (get): Added a check for - successful operation from the input CharStream to avoid - out of the infinite loop when reading broken XML files. Thanks - to Volodymyr Orlenko for reporting this - and submitting the patch. - -Mon Jan 20 20:32:55 2003 Douglas C. Schmidt - - * ace/Log_Msg.cpp (log): Added a '}' at line 1531 to fix a - nasty compiler bug on Digital UNIX. Thanks to Igor Pisarenko - for reporting this. - -Tue Jan 21 19:29:04 2003 Heather Drury - - * bin/auto_run_tests.lst: Disabled orbsvcs/Test/EC_MT_MCast on - static builds. - -Tue Jan 21 08:43:24 2003 Balachandran Natarajan - - * bin/generate_doxygen.pl: Fixed a cut and paste error. - -Mon Jan 20 16:22:43 2003 Heather Drury - - * ace/NT_Service.cpp: Modified return statement as the - wait_for_service_state function is declared as void and it was - returning an int. - -Mon Jan 20 15:48:35 2003 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added a TAO test to the daily builds. - -Mon Jan 20 13:58:25 2003 Rich Seibel - - * ace/config-macosx.h: Added ACE_HAS_SNPRINTF as well as - ACE_LACKS_PERFECT_MULTICAST_FILTERING to make the ACE - Mac OSX 10.2.x build pass the Log_Msg_Test and the - Multicast_Test. Thanks to John Michael Zorko - for providing this patch. - -Mon Jan 20 18:59:12 UTC 2003 Johnny Willemsen - - * examples/C++NPv2/Makefile.CLD: - * examples/C++NPv2/Makefile.SLD: - * examples/C++NPv2/Makefile.SLDex: - * examples/C++NPv2/Makefile.TPCLS: - * examples/C++NPv2/Makefile.TPLS: - * ace/RMCast/Makefile: - Set the correct x_BUILD_DLL defines. These are needed for the - Cygwin/MingW and Kylix compiler. Thanks to Vince Mounts - for providing the patches. - -Mon Jan 20 11:58:00 2003 Balachandran Natarajan - - * bin/generate_doxygen.pl: Fixed the spaces in the file names - of generated man pages. Thanks to Olver Kellogg for providing - this patch. - -Sun Jan 19 11:40:10 2003 Douglas C. Schmidt - - * ace/NT_Service.{h,cpp}: Enhanced the wait_For_service_state() so - that it actually uses the wait_time parameter. Thanks to Theo - Landman for contributing this. - - * ace/Process_Manager.cpp (spawn): Cleanup dynamically allocated - memory if the spawn() fails. Thanks to Kobi Cohen-Arazi - for this fix. - -Sun Jan 19 15:03:13 UTC 2003 Johnny Willemsen - - * websvcs/lib/Makefile: - Set the correct x_BUILD_DLL defines. These are needed for the - Cygwin/MingW and Kylix compiler. - -Sat Jan 18 17:49:20 2003 Steve Huston - - * Makefile: Removed PACE references. - -Sat Jan 18 17:11:21 2003 Balachandran Natarajan - - * bin/make_release: Use doxygen 1.2.18 as opposed to doxygen - 1.2.13.1. - -Fri Jan 17 09:00:17 2003 Douglas C. Schmidt - - * ACE-INSTALL.html (make): Removed all claims that we support - SunC++ 4.2. Thanks to Kirat Singh for - reporting this. - -Sat Jan 18 09:07:12 UTC 2003 Johnny Willemsen - - * tests/Makefile.DLL_Test: - * tests/Makefile.Framework_Component_DLL: - * tests/Makefile.Service_Config_DLL: - * examples/Service_Configurator/IPC-tests/server/Makefile: - Set the correct x_BUILD_DLL defines. These are needed for the - Cygwin/MingW and Kylix compiler. - -Fri Jan 17 12:34:51 2003 Steve Huston - - * ACE-INSTALL.html: Updated platform and compiler information. - -Thu Jan 16 19:06:19 2003 Stephen Torri - - * ace/OS.cpp: - * ace/config-linux-common.h: - * ace/config-freebsd.h: - * ace/README: - - Added a new macro called ACE_HAS_PTHREAD_SETSTACK for systems - that use the newer glibc (2.3+). Eliminates linker warning about - not using the pthread function called pthread_setstack. - -Thu Jan 16 16:25:45 2003 Balachandran Natarajan - - * bin/auto_run_tests.lst: Added a TAO/orbsvcs/tests/EC_MT_Mcast - test to the daily builds. - -Thu Jan 16 12:27:24 2003 Balachandran Natarajan - - * COPYING: Extended the validity of the copyright notice from 2002 - to 2003. Should have been done yesterday, anyway, better late - than never. - -Wed Jan 15 18:02:01 2003 Bala - - * ACE version 5.3 released. - -Wed Jan 15 10:48:11 2003 Balachandran Natarajan - - * bin/make_release: Did the following enhancements - - - If it is a minor release do not append the beta version. Looks - like somone broke this and the script started writing out - things as x.3.0, whcih is bad BTW. - - - We now POSIX.1 tar, instead of old tar format with the -H - option in cpio. This helps to tar files deep in the hierarchy - tree to be properly zipped. We were loosing this in many - betas. - - - Fixes for the generated filenames copied into the - previous_versions directory. - - - Fix to get the right Version.h file in TAO. - - -Tue Jan 14 18:51:49 2003 Steve Huston - - * ace/Auto_Ptr.h: Added pragma to disable warning 4284 for Microsoft - compilers. The warned-of behavior is exactly what is intended. - - * bin/MakeProjectCreator/templates/em3vcpdll.mpt: - * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt: - * bin/MakeProjectCreator/templates/em3vcplib.mpt: - * bin/MakeProjectCreator/templates/em3vcplibexe.mpt: - Added a "WCE emulator" configuration section. This allows builds - for the WinCE emulator, necessary for working with the WinCE.NET - Standard SDK emulator. - -Tue Jan 14 14:56:12 2003 Steve Huston - - * ace/config-win32-common.h: For WinCE, don't include wce.h unless - building with MFC. wce.h is an MFC file. - - * ace/config-WinCE.h: Add pragmas to link _with_ corelibc.lib and - _without_ oldnames.lib. These weren't needed with WinCE 3/PocketPC - (but they don't hurt) and are needed for WinCE .NET. The ATL headers - do these pragmas, but we don't want to add a dependency on ATL. - -Tue Jan 14 11:07:06 2003 Balachandran Natarajan - - * bin/generate_export_file.pl: Added a patch from - Gonzalo Diethelm which generates - an empty CVS Id string. - -Mon Jan 13 12:53:12 UTC 2003 Johnny Willemsen - - * ace/config-win32-common.h: - The MingW compiler can handle the export/import macros. - - * ace/config-cygwin32.h: - Corrected the guards around this header file. - -Sat Jan 11 09:37:24 2003 Douglas C. Schmidt - - * ace/OS_String.cpp (wcslen_emulation): Fixed a nasty formatting - glitch that made the code hard to read. Thanks to Ruslan - Zasukhin for reporting this. - -Fri Jan 3 21:46:00 2003 John Michael Zorko - - * netsvcs/clients/Naming/Client/Makefile: Added $(ACELIB) to - ACE_SHLIBS to fix multple -lACE problem. This wasn't an - issue on Mac OS X 10.2, but could be on other platforms. - - * examples/ASX/CCM_App/Makefile: same as above - * netsvcs/clients/Naming/Dump_Restore/Makefile: same as above - -Wed Jan 8 19:27:49 2003 Steve Huston - - * ace/Message_Block.h: Doxygenized comments for release() and copy(). - - * ace/UPIPE_Stream.{h cpp}: Removed the remaining_ member; use the - ACE_Message_BLock::length() member function to find the amount - of remaining data. - -Wed Jan 8 12:17:10 2003 Balachandran Natarajan - - * bin/ace-install: Fixed the improper usage of "or" in the "find " - command used to find the inlined files with extensions .i and - .inl. Thanks to Oliver Kellog for providing the patch. - -Tue Jan 7 13:08:12 UTC 2003 Johnny Willemsen - - * ACEXML/common/Makefile: - Set ACEXML_BUILD_DLL when building the shared lib. - -Mon Jan 6 18:31:09 2003 Balachandran Natarajan - - * bin/generate_topinfo_charts.sh: Removed the range for the - Y-AXIS, for the graphs to auto-adjust while plotting. - -Mon Jan 6 16:56:04 2003 Balachandran Natarajan - - * bin/topinfo_iorsize_stats.sh: Scripts for capturing the size of - the server and client when shipping large IOR's - - * bin/topinfo_stats.sh: Renamed to topinfo_simple_stats.sh. This - is a better to show that we capture the sizes of a simple server - and client. - - * bin/topinfo_simple_stats.sh: New file. We need to do some code - sharing between these two scripts. Just postponing that for the - timebeing. - -Mon Jan 6 11:23:12 UTC 2003 Johnny Willemsen - - * include/makeinclude/platform_gnuwin32_common.GNU: - Removed setting ACE_OS_HAS_DLL to 1, this should be done more - specific in the makefiles - -Sat Jan 4 18:46:19 2003 Steve Huston - - * ace/config-aix5.1.h: Add a #define ACE_AIX_VERS 501 if ACE_AIX_VERS - isn't already defined. Helps to build with Visual Age C++ incremental - mode. Support for incremental mode is going away after ACE 5.3, but - this crutch can be used for now. - - * ace/Makefile.ace: Remove SOCK_Dgram_Mcast_T from TEMPLATE_FILES. See - Tue Jun 25 23:22:09 UTC 2002 Craig Rodrigues - - * ace/ace.icc: Corrected the list of source files to build ACE with. - In addition to updating the source list, if building with Visual - Age C++ 5, add the TEMPLATE_FILES to the sources that get compiled. - Visual Age C++ 5 incremental needs to see them all. - - * examples/C++NPv1/Makefile: Add .NOTPARALLEL since some of the - sub-makes share object files and they can get confused. - - * tests/makeicc.pl: Add additional template-getting stuff for - Visual Age C++ 5. - - * tests/ARGV_Test.icc: - * tests/Aio_Platform_Test.icc: - * tests/Arg_Shifter_Test.icc: - * tests/Atomic_Op_Test.icc: - * tests/Auto_IncDec_Test.icc: - * tests/Barrier_Test.icc: - * tests/Basic_Types_Test.icc: - * tests/Bound_Ptr_Test.icc: - * tests/Buffer_Stream_Test.icc: - * tests/CDR_Array_Test.icc: - * tests/CDR_File_Test.icc: - * tests/CDR_Test.icc: - * tests/Cache_Map_Manager_Test.icc: - * tests/Cached_Accept_Conn_Test.icc: - * tests/Cached_Allocator_Test.icc: - * tests/Cached_Conn_Test.icc: - * tests/Capabilities_Test.icc: - * tests/Codecs_Test.icc: - * tests/Collection_Test.icc: - * tests/Config_Test.icc: - * tests/Conn_Test.icc: - * tests/DLL_Test.icc: - * tests/DLL_Test_Impl.icc: - * tests/DLList_Test.icc: - * tests/Date_Time_Test.icc: - * tests/Dev_Poll_Reactor_Test.icc: - * tests/Dirent_Test.icc: - * tests/Dynamic_Priority_Test.icc: - * tests/Enum_Interfaces_Test.icc: - * tests/Env_Value_Test.icc: - * tests/FIFO_Test.icc: - * tests/FlReactor_Test.icc: - * tests/Framework_Component_DLL.icc: - * tests/Framework_Component_Test.icc: - * tests/Future_Set_Test.icc: - * tests/Future_Test.icc: - * tests/Get_Opt_Test.icc: - * tests/Handle_Set_Test.icc: - * tests/Hash_Map_Bucket_Iterator_Test.icc: - * tests/Hash_Map_Manager_Test.icc: - * tests/High_Res_Timer_Test.icc: - * tests/INET_Addr_Test.icc: - * tests/IOStream_Test.icc: - * tests/Lazy_Map_Manager_Test.icc: - * tests/Log_Msg_Test.icc: - * tests/Logging_Strategy_Test.icc: - * tests/MEM_Stream_Test.icc: - * tests/MM_Shared_Memory_Test.icc: - * tests/MT_Reactor_Timer_Test.icc: - * tests/MT_Reactor_Upcall_Test.icc: - * tests/MT_SOCK_Test.icc: - * tests/Malloc_Test.icc: - * tests/Map_Manager_Test.icc: - * tests/Map_Test.icc: - * tests/Max_Default_Port_Test.icc: - * tests/Mem_Map_Test.icc: - * tests/Message_Block_Test.icc: - * tests/Message_Queue_Notifications_Test.icc: - * tests/Message_Queue_Test.icc: - * tests/Message_Queue_Test_Ex.icc: - * tests/Multicast_Test.icc: - * tests/Naming_Test.icc: - * tests/New_Fail_Test.icc: - * tests/Notify_Performance_Test.icc: - * tests/OS_Test.icc: - * tests/Object_Manager_Test.icc: - * tests/Obstack_Test.icc: - * tests/OrdMultiSet_Test.icc: - * tests/Pipe_Test.icc: - * tests/Priority_Buffer_Test.icc: - * tests/Priority_Reactor_Test.icc: - * tests/Priority_Task_Test.icc: - * tests/Proactor_Scatter_Gather_Test.icc: - * tests/Proactor_Test.icc: - * tests/Proactor_Timer_Test.icc: - * tests/Process_Manager_Test.icc: - * tests/Process_Mutex_Test.icc: - * tests/Process_Strategy_Test.icc: - * tests/RB_Tree_Test.icc: - * tests/Reactor_Dispatch_Order_Test.icc: - * tests/Reactor_Exceptions_Test.icc: - * tests/Reactor_Notify_Test.icc: - * tests/Reactor_Performance_Test.icc: - * tests/Reactor_Timer_Test.icc: - * tests/Reactors_Test.icc: - * tests/Reader_Writer_Test.icc: - * tests/Recursive_Condition_Test.icc: - * tests/Recursive_Mutex_Test.icc: - * tests/Refcounted_Auto_Ptr_Test.icc: - * tests/Reverse_Lock_Test.icc: - * tests/SOCK_Connector_Test.icc: - * tests/SOCK_Send_Recv_Test.icc: - * tests/SOCK_Test.icc: - * tests/SPIPE_Test.icc: - * tests/SString_Test.icc: - * tests/SV_Shared_Memory_Test.icc: - * tests/Semaphore_Test.icc: - * tests/Service_Config_DLL.icc: - * tests/Service_Config_Test.icc: - * tests/Signal_Test.icc: - * tests/Sigset_Ops_Test.icc: - * tests/Simple_Message_Block_Test.icc: - * tests/Svc_Handler_Test.icc: - * tests/TP_Reactor_Test.icc: - * tests/TSS_Test.icc: - * tests/Task_Test.icc: - * tests/Thread_Manager_Test.icc: - * tests/Thread_Mutex_Test.icc: - * tests/Thread_Pool_Reactor_Resume_Test.icc: - * tests/Thread_Pool_Reactor_Test.icc: - * tests/Thread_Pool_Test.icc: - * tests/Time_Service_Test.icc: - * tests/Time_Value_Test.icc: - * tests/Timeprobe_Test.icc: - * tests/Timer_Queue_Test.icc: - * tests/TkReactor_Test.icc: - * tests/Token_Strategy_Test.icc: - * tests/Tokens_Test.icc: - * tests/UPIPE_SAP_Test.icc: - * tests/Upgradable_RW_Test.icc: - * tests/Vector_Test.icc: - * tests/XtReactor_Test.icc: Mostly updated to build with Visual Age - C++ 5 in incremental mode. Most of the tests that use templates - don't build. They require explicitly including the needed template - source files names in the .icc file. I don't have time to add them - all now - if anyone uses this compiler, please contact me. No wonder - IBM ditched this piece of junk. - -Fri Jan 3 17:58:21 2003 Steve Huston - - * ace/SSL/SSL_Context.cpp: - * netsvcs/lib/Name_Handler.cpp: - * netsvcs/lib/Server_Logging_Handler.cpp: Add __hpux to condition - where template members are explicitly instantiated. Also see: - Tue Dec 3 20:47:39 2002 Steve Huston - -Fri Jan 3 17:45:29 2003 Steve Huston - - * include/makeinclude/platform_hpux_gcc.GNU: Use HP's /usr/bin/ar - instead of GNU ar (which may be picked up first in PATH). GNU ar - crashes - missing libfl.sl. - - * performance-tests/Misc/test_singleton.cpp: Add __hpux to conditions - for explicitly instantiating ACE_Singleton::singleton_. - -Fri Jan 3 07:49:09 2003 Chad Elliott - - * bin/aix_shr: - - Changed the name of the AIX template instantiation macro and - commented on why it's needed. - -Thu Jan 2 17:44:29 2003 Balachandran Natarajan - - * ace/config-cygwin32-common.h: Set the custom export - macro's. These will be used when building dynamically with the - cygwin compiler. - - * bin/MakeProjectCreator/templates/gnu.mpd: Generate dllflags and - libflags into the GNU makefiles. These are important for the - Cygwin/MingW and Kylix compiler. - -Thu Jan 2 16:11:38 2003 Balachandran Natarajan - - * ace/config-freebsd.h: Fix use of macros for FreeBSD 4.6: - ACE_LACKS_RWLOCK_T, ACE_LACKS_READDIR_R, ACE_LACKS_SETSCHED, - ACE_LACKS_PTHREAD_THR_SIGSETMASK. Do not define SCHED_RR, - SCHED_IO, SCHED_FIFO, SCHED_OTHER for FreeBSD >= 4.0, since they - are defined in sched.h. Thanks to Craig Rodrigues for providng - the patch. - -Thu Jan 2 13:33:01 2003 Chad Elliott - - * ace/Refcounted_Auto_Ptr.i: - - Added #include of ace/Log_Msg.h for ACE_ASSERT. - - * bin/aix_shr: - - Added -DTAO_INSTANTIATING_TEMPLATES to the link command line. - -Thu Jan 2 12:38:55 2003 Johnny Willemsen - - * ace/Makefile.ace: Set the dllflags in Makefile. This makes it - possible to do __declspec (dllexport) for the symbols in the - dll. This is needed for the Cygwin/MingW and Kylix compiler. - - Thid change takes care of the static and dynamic library cases. - -Thu Jan 2 08:57:26 2003 Johnny Willemsen - - * include/makeinclude/platform_cygwin32.GNU: Add - --enable-auto-import to the linker flags. This will result in - the linker doing auto-import without giving warnings about - it. - -Wed Jan 1 14:26:09 2003 Balachandran Natarajan - - * bin/topinfo_stats.sh: Forgot that we run this scripts in cron - environment. Set the path and other details that would help to - ease things. - diff --git a/ChangeLogs/ChangeLog-93 b/ChangeLogs/ChangeLog-93 deleted file mode 100644 index 0beb8e6321f..00000000000 --- a/ChangeLogs/ChangeLog-93 +++ /dev/null @@ -1,52 +0,0 @@ -Wed Dec 15 16:47:19 1993 Douglas C. Schmidt (schmidt@net4.ics.uci.edu) - - * Added a new parameter to the constructor and open() member - functions in the SOCK_Listener and LSOCK_Listener classes. This - parameter indicates that the SO_REUSEADDR option needs to be - applied before attempting to bind an address. - -Sun Nov 21 14:46:18 1993 Douglas C. Schmidt (schmidt@net4.ics.uci.edu) - - * Added a new file called "testconfig.h" in the include directory. - This file gives defaults for the hostname and server port - numbers used in the ./tests directory. - -Wed Nov 3 18:41:14 1993 Douglas C. Schmidt (schmidt@cupid.ics.uci.edu) - - * Released version 2.12. - - * Included Olaf Kruger's fix for templates/shared libs on Sun OS - 4. This solves a bunch of weird problems. Now, most of the - tests compile and run correctly on Sun OS 4! - -Mon Nov 1 17:47:30 1993 Douglas C. Schmidt (schmidt@cupid.ics.uci.edu) - - * Split the release into two parts: (1) the documentation and - papers and (2) the library source code and test examples. - - * Renamed and lightly redesigned the IPC_SAP* hierarchy. Now the - overall C++ wrapper abstraction for local and remote IPC is - called IPC_SAP. The specific wrappers for sockets, TLI, named - pipes, and STREAM pipes are called SOCK_SAP, TLI_SAP, FIFO_SAP, - and SPIPE_SAP, respectively. This cleans up the interfaces, - shares more code, and is much easier to explain. - - In addition, the Server_Daemon framework has been renamed the - Service Configurator framework, and the Server_Daemon class has - been renamed Service_Config. The documentation is being updated - to reflect these changes, as well. - - Note, the easiest way to upgrade existing apps is simply to use - perl as follows: - - % perl -p -i -e 's/Local_IPC/LSOCK/g;' *.[Chi] % perl -p -i -e - 's/IPC_SAP_FIFO/FIFO/g;' *.[Chi] % perl -p -i -e - 's/IPC_SAP_SPIPE/SPIPE/g;' *.[Chi] % perl -p -i -e - 's/IPC_SAP/SOCK_SAP/g;' *.[Chi] % perl -p -i -e 's/SAP_//g;' - *.[Chi] % perl -p -i -e 's/Server_Daemon/Service_Config/g;' - *.[Chi] - - etc. Note that the order in which you do this is important! In - addition, you need to check out your Makefiles, to be sure that - -lIPC_SAP linker lines are changed to include the appropriate - components. diff --git a/ChangeLogs/ChangeLog-94 b/ChangeLogs/ChangeLog-94 deleted file mode 100644 index 09465ce823f..00000000000 --- a/ChangeLogs/ChangeLog-94 +++ /dev/null @@ -1,1027 +0,0 @@ -Fri Dec 23 01:50:50 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/ASX: Changed the behavior of Map_Manager::Map_Manager() - to allocate a default-sized buffer. - - * libsrc/Reactor/Reactor.C (dispatch): Made the poll-based Reactor - smarter about detecting POLLERR error conditions. When POLLERR - is detected, the Reactor now shutdown down that fd... - -Wed Dec 21 18:29:15 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/IPC_SAP/SPIPE_SAP: Changed the name of class SPIPE_Msg to - SPIPE_IO to reflect the fact that I/O over named pipes need not - be message-oriented... - - * Changed all occurrences of {SOCK,TLI,SPIPE}_Listener to - {SOCK,TLI,SPIPE}_Acceptor. This is a more accurate name for the - function these classes perform. In addition, it is easier to - explain in the context of the Acceptor and Connector patterns. - Note that the *.h files are also changed, as well. - - * Changed the implementation of {SOCK,TLI,SPIPE}_SAP so that there - is now a *_Connector class to go along with the *_Acceptor - class. The *_Connector is a factory that produces *_Stream - objects *actively*, in a similar way to how the *_Acceptor is a - factory that produces *_Stream objects *passively*. This makes - everything much more orthogonal, though it will break existing - code... The easiest way to fix existing code is to do the - following: - - 1. Find places in the code that define objects of - type SOCK_Stream, LSOCK_Stream, TLI_Stream, - or SPIPE_Msg (now called SPIPE_IO). - - 2. Replace #include "SOCK_Stream.h" with - #include "SOCK_Connector.h" (or whatever - C++ wrapper you have). - - 3. Replace definitions of the form: - - INET_Addr addr (port, host); - SOCK_Stream foo (addr); - - with - - INET_Addr addr (port, host); - SOCK_Stream foo; - SOCK_Connector con (foo, addr); - - If you don't want to have an extra variable named "con", - you can replace this with: - - INET_Addr addr (port, host); - SOCK_Stream foo; - SOCK_Connector (foo, addr); // Calls the constructor. - -Tue Dec 20 21:34:10 1994 Douglas C. Schmidt (schmidt@tango) - - * Renamed the ./{libsrc,tests}/{Semaphores,Message_Queues} - directories to SV_Semaphores and SV_Message_Queues to better - reflect their true behavior and in order to prevent clashes with - the new ASX names. - - * libsrc/ASX: Renamed Queue to Task to better reflect its true - functionality. In addition, renamed Message_List to - Message_Queue. - -Mon Dec 19 23:04:52 1994 Douglas C. Schmidt (schmidt@tango) - - * Changed "private" to "protected" in ASX/Message_List.h at the - request of Troy Warner (tnw1@core01.osi.com). - -Mon Dec 12 23:47:01 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/IPC_SAP/SOCK_SAP: changed the name of the global utility - function "bind_port()" to ace_bind_port() to avoid polluting the - global symbol namespace. - - * Fixed a descriptor leak in SOCK_Dgram::shared_open() and - SOCK_CODgram::shared_open(). The original version didn't - automatically close down the socket descriptor if bind failed. - The new version does close the descriptor down. - -Sat Dec 10 00:53:20 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Reactor/Reactor.C (mask_ops): Fixed a stupid bug... The - test should have been - - if (this->invalid_handle (handle) || - this->poll_handles_[handle].fd == -1) - - rather than: - - if (this->invalid_handle (handle) || - this->poll_handles_[handle].fd != -1) - - * libsrc/Reactor/Reactor: Modified the semantics of - Reactor::remove_handler() such that calling it with a value of - Event_Handler::DONT_CALL or'd into the Reactor_Mask instructs - the Reactor to remove the handler *without* calling the object's - handle_close() method! - -Fri Dec 9 12:53:31 1994 Douglas C. Schmidt (schmidt@tango) - - * include/Synch: some C++ compilers (e.g., Centerline) barf when - the see the following in an inline function: - - if (foo == bar) - { - errno = result; - return -1; - } - result result; - - I fixed this by doing the following: - - if (foo == bar) - { - errno = result; - result = -1; - } - result result; - -Wed Dec 7 22:23:47 1994 Douglas C. Schmidt (schmidt@tango) - - * include/Synch.h: Added additional methods in the Null_Mutex - class in order to be consistent with the RW_Mutex interfaces... - - * libsrc/ASX/Message_List: Added new a set of methods called - "try_enqueue_head" and "try_enqueue_tail" that will only insert - a message into the queue if it is not already full. If it is - full, return EWOULDBLOCK. - -Tue Dec 6 13:58:28 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Reactor/Event_Handler: added default values of -1 to the - handle_input(), handle_output(), and handle_exception() methods. - -Mon Dec 5 23:30:28 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/ASX/Message_List: Added a new method called set_length to - Message_Block. This method sets the length of the "active" - portion of the message. This is defined as the offset from - RD_PTR to WR_PTR. - -Sat Dec 3 20:40:53 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Threads/Synch: Added two new class called Write_Guard and - Read_Guard, which provide functionality a la the Guard class, - only that they acquire and release readers/writer locks. - - * libsrc/Threads/Synch: For interface uniformity with other - synchronization wrappers I added an acquire() method. This is - implemented as a write-lock to be on the safe-side... - -Fri Dec 2 13:33:39 1994 Douglas C. Schmidt (schmidt@tango) - - * include/Synch.i (Mutex::tryacquire): Modified the behavior of - Mutex::tryacquire so that it will return -1 and set errno to the - appropriate return value of tryacquire(3T) if various types of - "problems" occur (such as the Mutex already being held). - - * include/Message_List.i: Rearranged the order of the - Message_Block::get_rd_ptr and Message_Block::set_wr_ptr methods - to deal with inlining problems that some cfront-based C++ - compilers have... - - * libsrc/Reactor/Signal.[hi]: Changed set_handler/get_handler to - "handler" to avoid a collision with Rogue Wave libraries. This - new version is more consistent with other usage in ACE anyhow... - - * Modified the behavior of Service_Config::Service_Config() so - that it makes the initialize size of the Reactor be the same - size as the Service_Repository. This was done at the suggestion - of Bob Sayle and Steve Warwick at ARINC Research. - -Sun Nov 20 00:59:06 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/ASX/Message_List: Added two new methods - (is_full() and is_empty()) to the public interface - of Message_List. These methods check whether the queue is full - or empty *while holding the lock*. - - * libsrc/ASX/Queue.h: Made the svc() method a pure virtual - function. This is much cleaner than not doing it, particularly - when we've already got to define open(), close(), and put()... - - * Added a new method to the IPC_SAP/Addr inheritance hierarchy. - The method is called addr_to_string() and it converts the - address of a subclass (e.g., either UNIX domain or Internet - domain) into a string. This functionality is particularly - useful in parameterized types (such as Acceptor), which should - be oblivious of the type of communication domain they are - using... - - * Reorganized the ./apps/Logger/Service_Configurator_Logger - directory in order to reuse more code. Now, all the Acceptor - pattern classes have been moved to a new subdirectory called - ./libsrc/Acceptor. In addition, this code has been generalized - to work with the ASX framework! - -Sat Nov 19 15:19:19 1994 Douglas C. Schmidt (schmidt@tango) - - * Released version 2.15.5 (added a couple of minor fixes and some - additional software to the release. In particular, I've added - the RPC++ C++ wrappers for Sun RPC. See the README file for - more info on this. - - * apps/Synch-Benchmarks: Reorganized all the synchronization tests - so that they would be easier to understand and extend. - - * include/sysincludes.h (ACE_NONBLOCK): Fixed a stupid typo in the - ./include/makeinclude/wrapper_macros.GNU file that accidentally - used ACE_NONBLOCKING instead of ACE_NONBLOCK... Jaysus - - * Fixed up the Service_Config.[Chi] source so that it no longer - allocates statically linked services via static variables. - Stacy Mahlon (mcs@contour.mayo.edu) recommended this change to - workaround bugs in compilers that fail to initialize static - objects appropriately. - -Tue Nov 15 11:55:03 1994 Douglas C. Schmidt (schmidt@tango) - - * Fixed a portability problem in the ./libsrc/Service_Configurator - that was caused by certain compilers failing to initialize - global variables correctly. In particular, the Obstack object - ace_obstack is now a pointer that is allocated dynamically by - Service_Config.process_directive(). Thanks to Stacy Mahlon - (mcs@contour.mayo.edu) for noticing this! - -Mon Nov 14 12:16:14 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Threads/Thread.h: added C++ wrappers for - thr_getconcurrency() and thr_setconcurrency(). - - * Fixed a dumb typo in ./tests/IPC_SAP/SOCK_SAP/CPP-nbclient.C - that failed to conditionally compile for different variants of - siginfo... - - * Added some test programs that benchmark the performance of - Solaris synchronization mechanisms. See ./apps/Synch-Benchmarks - for details... - - * Extended the methods of the Queue class to take advantage of the - new Message_List methods that perform timed waits! This - involves changing many of the existing methods in this class to - add an extra parameter of type timestruc_t *, which defaults to - 0. - - * Added some new comments in the - ./include/makeinclude/wrapper_macros.GNU file that indicate what - the various macros defined by the Makefile scheme actually mean. - This should help people who are porting to a new system... - - * Fixed a dumb bug in ./tests/Shared_Memory that directly included - system header files. Everything in ACE should include - "sysincludes.h" instead... Thanks to Stacy Mahlon - (mcs@contour.mayo.edu) for noticing this! - - * include/Memory_Pool.i (round_up): Fixed a typo where PAGESIZE - should have been ACE_PAGE_SIZE. - -Sat Nov 12 01:32:52 1994 Douglas C. Schmidt (schmidt@tango) - - * Generalized the Shared_Memory_Pool class for Malloc so that it - doesn't require the base addresses for multiple processes to all - start at the same location. - - * libsrc/Service_Configurator/Thread_Spawn.i (Thread_Spawn): - - Fixed a stupid bug in the constructor. Note that we should - be checking if this->tm_ == 0, rather than != 0... - -Fri Nov 11 00:11:41 1994 Douglas C. Schmidt (schmidt@tango) - - * Released version 2.15.4 (added a couple of minor fixes). - - * Added a new test program in the ./tests/ASX/Message_List - directory. This program illustrates how thread-safe - Message_Lists work using ASX. - - * libsrc/Threads/Thr_Manager.i: Added a new method called - insert_thr() to Thr_Manager that is used in conjunction with - Thr_Cntl::Thr_Cntl to make sure that a thread is added to the - Thr_Manager's table correctly. - -Thu Nov 10 20:14:11 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Log_Msg/Log_Record.C (print): Fixed the following very - subtle (and very stupid) bug: - - return ::fprintf (fp, this->msg_data_); - - if this->msg_data_ contains '%', then this call will - fail since fprintf tries to treat the percent sign as - a format code. The obvious fix is: - - return ::fprintf (fp, "%s", this->msg_data_); - - * libsrc/ASX/Message_List.i (is_empty): Fixed a braino that failed - to check if there was a 0-sized buffer in the list. It is now - possible to enqueue a 0-sized buffer, which is helpful for - things like signaling end of transmission by a producer. - - * libsrc/ASX/Message_List.C: Improved the robustness of the - Message_List abstraction by detecting the case where the newly - inserted Message_Block is a NULL pointer. Before, this would - crash the program, where now it returns -1 from the - enqueue_head() or enqueue_tail() methods. - - * libsrc/Threads/Synch.h: added timedwait_signal() and timedwait() - methods to class Condition. These are wrappers around the - cond_t cond_timedwait() function. - - * Improved the documentation of the class interfaces in the - Synch.h C++ wrapper for Solaris 2.x threads mechanisms. - - * Changed the name of class Condition methods wait_signal() and - timedwait_signal() to wait_alert() and timedwait_alert() to - remove confusion with UNIX signals and the regular condition - variable signal. - -Wed Nov 9 23:49:24 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/IPC_SAP/Addr/UNIX_Addr.i (UNIX_Addr): Fixed another - couple brainos in UNIX_Addr.i (thanks for Irfan - (ip1@cs.wustl.edu) for noticing this). - - * libsrc/IPC_SAP/SOCK_SAP/SOCK.i (get_local_addr): Fixed a braino - that didn't reset the Addr size after a call to getsockname(). - -Tue Nov 8 00:25:02 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Service_Configurator/Svc_Conf.y (create_service_type): - Fixed a bug on lines 323 and 324, and 330 and 331. The "#if - defined" needs to be INSIDE the "case" statements. Thanks to - mcs@contour.mayo.edu for finding this! - - * Improved the interfaces for all the synchronization wrappers so - that they can be given all the parameters for the underlying - SunOS 5.x *_init calls. Default values are given to keep the - normal usage concise... - -Mon Nov 7 21:41:13 1994 Douglas C. Schmidt (schmidt@tango) - - * Changed all occurrences of Mutex_Rec to Recursive_Lock. This is - much more descriptive since by using templates, the recursive - logic applies to a number of synchronization mechanisms (e.g., - Semaphores, RW_Mutex, Mutex, Null_Mutex, etc.) rather than just - the Mutex class. - - * Changed all occurrences of Mutex_Block to Guard. This is more - standard terminology and reflects Booch's terms more closely, as - well. - -Sun Nov 6 14:31:44 1994 Douglas C. Schmidt (schmidt@tango) - - * Majorly improved the modularity and structure of the Reactor - class. Much duplicate code has been coalesced and several new - features have been added. - - * Changed the name of the Reactor method set_ready() to - ready_ops(). Added a new method called mask_ops(). These - methods make it possible to manipulate the "dispatch masks" and - the "ready masks" (e.g., READ_MASK, WRITE_MASK, etc.) at a much - finer level of granularity without loss of efficiency or - correctness. - -Sat Nov 5 16:48:55 1994 Douglas C. Schmidt (schmidt@tango) - - * Changed the name of three methods in the Semaphore class to - mirror the terms used for Mutex and RW_Mutex. This will help - support the use of semaphores along with templates (e.g., - Rec_Lock) much better... The old names were "wait", "trywait", - and "signal". The new names are "acquire", "tryacquire", and - "release." - - * Added a new class called Signal_Block in Signal.[hiC] This class - operates similar to Mutex_Block, in that it holds a set of - signals over the duration of a C++ statement block. The - constructor masks out the signals and the destructor restores - the signals. - - * Changed the name of files Signal_Handler.[hiC] to Signal.[hiC] - to reflect a broadening of the functionality of the ACE wrappers - for Signals. For example, the new C++ classes wrap the sigset_t - API, as well as the struct sigaction structure. - -Fri Nov 4 00:41:48 1994 Douglas C. Schmidt (schmidt@tango) - - * Yow, got the new Shared_Malloc/Malloc class to work correctly on - SunOS 4.x, as well as SunOS 5.x. It's a bit more clunky on - SunOS 4.x since we have to use System V semaphores rather than - Solaris synchronization mechanisms. However, it now seems to - function correctly! - - * Added a new method called "tryacquire" to Semaphore_Complex and - Semaphore_Simple. This method provides the same "non-blocking" - semantics as it does in the Mutex, Semaphore, and RW_Mutex - classes. - - * Added a new method called "remove()" to all the C++ wrappers in - the Synch.[hi] file. This improves the symmetry with the System - V semaphore wrappers, and also gets around a nasty bug with - cfront 3.x and its handling of templates and explicitly called - destructors... - - * Added a new C++ wrapper class for Threads (Thread.h). The - eventual purpose of this class is to hide the differences - between POSIX pthreads and Solaris threads. - - * Added new parameters to Thr_Manager::spawn to enable the stack - and stack_size to be passed in. - - * Modified the Synch.h file so that the Null_Mutex and Mutex_Block - classes will both be compiled, even if we are building ACE on a - platform that doesn't support threads! - - * Added a timed event-loop method to the public interface of the - Service_Config class. This basically forwards the request to - the underlying Reactor->handle_events method. Thanks to Brad - Needham (bneedham@arinc.com) of ARINC research for the - suggestion! - -Wed Nov 2 14:47:25 1994 Douglas C. Schmidt (schmidt@tango) - - * Changed the interface for one of the Reactor's - {register,remove}_handler methods. These methods - had previously taken a sigset_t &, but for some reason the Sun - C++ 3.0 compiler can't seem to recognize that this is different - from an int! Therefore, I changed the interface to take a - sigset_t *. - - * Fixed some portability bugs that crept into the SunOS 4 version - of ACE, particularly with the siginfo_t extended signal handler - stuff. - -Tue Nov 1 21:46:07 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Log_Msg/Log_Msg.C (log): Fixed a braino on line 175. - "int sig" was undefined outside the conditional (duhhh ;-)). - -Thu Oct 27 17:23:37 1994 Douglas C. Schmidt (schmidt@tango) - - * Fixed up some problems with Semaphore_Complex and - Semaphore_Simple. The new design should be more functional, - particularly for Semaphore_Complex, which now generalizes to - arrays of semaphores. - -Wed Oct 26 16:38:42 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Shared_Malloc/: Created a .i file for Malloc and - Memory_Pool to handle inlines. - - * Fixed a fence-post error in Mem_Map::map_it(). The new version - should correctly set the length of the file *and* also do the - appropriate memory mapping. - - * bin/clone.C: Fixed the clone program so that it now compiles - with the C++ compiler rather than the C compiler. - -Tue Oct 11 20:01:16 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Reactor/Reactor.h (Reactor): Changed the order of the - arguments to the Reactor's register_handler() method used to - register signal handler objects. The new order puts both "new" - components first, and any - (optional) old components following this. This is - a more natural set of default values... - - * libsrc/Shared_Malloc: split out the Local and Shared memory - pools for class Malloc into the Memory_Pool.[hC] files. - -Mon Oct 10 22:54:53 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Threads/Synch.i: Reworked the Thread_Mutex and - Process_Mutex classes to inherit their interface and - implementation code from Mutex... Thanks to Irfan Payrali for - the suggestion! - -Wed Sep 28 11:26:34 1994 Douglas C. Schmidt (schmidt@tango) - - * Moved some of the tests directories around to better reflect - precisely which ACE components are being tested. In particular, - the {client,server} directories that were originally under the - ./tests/Reactor subtree are now located in the - ./tests/Service_Configurator subtree. - -Tue Sep 27 23:05:32 1994 Douglas C. Schmidt (schmidt@tango) - - * Added a bunch of constructors/destructors for - ./tests/Reactor/server to make g++ happy. - - * libsrc/Service_Configurator/Service_Object.[ih] - (Service_Object): Added a constructor and destructor to - Service_Object to make g++ happy. Also, removed the #if for - broken versions of g++ 2.5.8. - - * include/Reactor: Added a constructor and destructor for - Null_Callback to make G++ happy... - - * libsrc/Message_Queues/: Added support for G++ templates. - - * Changed the handling of _sys_siglist in the sysincludes.h file - to try and handle the weird SunOS 4 header file problems... - - * libsrc/IPC_SAP/SOCK_SAP/SOCK_Dgram_Brdcast.C (mk_broadcast): - Removed the "struct" from new struct ifnode in order to - compile... - -Tue Sep 20 11:17:23 1994 Douglas C. Schmidt (schmidt@tango) - - * Fixed a couple of minor typos in the Windows NT C++ wrappers for - sockets. - - * Released version 2.15.2 so that Mark Frutig could have access to - the latest source in order to write man pages! - -Thu Sep 15 20:47:36 1994 Douglas C. Schmidt (schmidt@tango) - - * Extended the Event_Handler interface to support the additional - siginfo_t-style parameters for extended SVR4 signal handling. - Note that for backwards compatibility, this new interface only - enabled if the -DACE_HAS_SIGINFO flag is set in the - wrapper_macros.GNU config file. Making this change affected - several of the existing ACE classes such as Service_Config and - Signal_Handler. - -Mon Sep 12 17:07:10 1994 Douglas C. Schmidt (schmidt@tango) - - * Improved the modularity of the Reactor by creating a new class - called Signal_Handler. This new class basically encapsulates - the signal handling mechanism provided by UNIX within a nice OO - abstraction. The new arrangement is particularly useful since - the Signal_Handler class may be used in applications - (e.g., the Malloc class abstraction) that do not require the - other features of the Reactor. - -Sun Sep 11 14:40:06 1994 Douglas C. Schmidt (schmidt@tango) - - * Changed the default value for Semaphore_Simple and - Semaphore_Complex from OPEN to CREATE. This is more closely - related to how SunOS thread synchronization variables work. - - * Changed the methods of the Semaphore_Simple class to be - syntactically equivalent to the Process_Mutex and Thread_Mutex - classes. This makes it easier to write code that uses - parameterized types to instantiate the appropriate type of - synchronization primitive. - - * include/makeinclude/rules.local.GNU (OBJDIRS): Fixed the - "depend" target so that it generates the correct dependencies - for remaking .so files after they are changed. - - * Added a new pair of methods to the Reactor so that it is now - possible to register/remove a sigset_t of signals in one - operation. - -Sat Sep 10 03:11:34 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Mem_Map/Mem_Map.i (map_it): Fixed a few minor bugs with - how the Mem_Map::map() method handles lseek()'s. - - * Changed the name of the Mem_Map::open() methods to - Mem_Map::map(). This seems like a more reasonable name! Also, - removed the close() method. This is trivial to implement via - ::close (mmap.get_fd ()); - -Fri Sep 9 22:04:25 1994 Douglas C. Schmidt (schmidt@tango) - - * Provided a new implementation of a flexible memory allocation - scheme (Shared_Malloc/Malloc.[HiC]). This memory allocation can - be parameterized by the following: - - 1. The pool from which memory is allocated (e.g., - local memory vs. shared memory). - - 2. The type of synchronization used when allocating - the memory (e.g., no synchronization, thread-based - synchronization, process-based synchronization). - - * libsrc/Threads/Synch.i (Proc_Mutex): Added new classes to the - Synchronization library. These classes are wrappers around the - USYNC_PROCESS and USYNC_THREAD flags to mutex_init(). - -Wed Sep 7 20:29:00 1994 Douglas C. Schmidt (schmidt@tango) - - * include/sysincludes.h (MT): Added check to see if _REENTRANT was - already defined, and if so, avoid redefining it! - -Sun Sep 4 16:23:17 1994 Douglas C. Schmidt (schmidt@tango) - - * Released version 2.15.1 to the world... - - * Added support for the Windows NT version of SOCK_SAP. - - * Fixed a few minor bugs involved with the order of linking - libraries. - - * Fixed an oversight in ./testsReactor/server/server_test.C where - I was still including the "Server_Test.h" file (ugh). - -Wed Aug 31 13:27:10 1994 Douglas C. Schmidt (schmidt@tango) - - * libsrc/IPC_SAP/SOCK_SAP/SOCK_Stream.C (open): Fixed a bug - whereby the I/O descriptor wasn't being closed if connect() - failed. Thanks to Charles Eads - (eads@synoptics.com) for reporting this. - - - * Recompiled everything on SunOS 4.x using SunC++ 3.x and SunOS - 5.x using SunC++ 3.x and 4.x. Everything seems to compile fine - now. - - * Released version 2.15 - -Mon Aug 29 00:14:04 1994 Douglas C. Schmidt (schmidt@tango) - - * Finished up a preliminary set of tests for ASX. See the - $WRAPPER_ROOT/tests/ASX/Event_Server directory for more details. - - * wrapper_macros.GNU (CC): Removed the ARCHFLAG from the CCFLAGS - macro in the Makefile system. Henceforth, all conditional - compilation should be performed on a "per-feature" basis, rather - than a "per-platform" basis... - - * libsrc/IPC_SAP/SOCK_SAP/SOCK_Dgram_Brdcast.C (send): - Automatically convert the port number to htons format before - using it to initialize the sin_port field of the addressing - structure. This is consistent with the behavior of other parts - of IPC_SAP (particularly INET_Addr::set()). - -Sun Aug 28 00:02:53 1994 Douglas C. Schmidt (schmidt@tango) - - * Changed version number of 2.15 to reflect all the major - modifications to the structure of ACE. - - * include/sysincludes.h: Started to fix up the conditional - compilation scheme to be much smarter about the features that - are available from both the compiler and the OS environment. - - * Added a fix suggested by Leslee Xu (lxu@ics.uci.edu) to better - handle the normalization of Timer_Values. - - * Continued to make ACE coding conventions more consistent by - removing get_/set_ prefix from all the accessor/manipulator - methods. Also, added an underbar at the end of all class and - object instance variables. - -Sat Aug 27 20:28:13 1994 Douglas C. Schmidt (schmidt@tango) - - * Continued to improve error handling by replacing all uses of - perror with the Log_Msg macros. - - * include/sysincludes.h: Continued to improve the namespace - utilization in ACE by prefixing stand-along Misc functions with - ace_. - - * include/FD_Set.h: Changed the name FD_Set_Iter to - FD_Set_Iterator. - - * typedef'd int to HANDLE in Event_Handler.h in preparation for - merging in the Windows NT support along with the regular ACE - package. I need to update all the other code in the entire - release to be consist with this! - -Thu Aug 25 19:49:57 1994 Douglas C. Schmidt (schmidt@tango) - - * Fixed a bug with Thr_Manager.i that occurred if a thread created - by ::thr_create() exits prior to the acquisition of the lock and - the subsequent bookkeeping. - -Wed Aug 24 17:34:49 1994 Douglas C. Schmidt (schmidt@tango) - - * Updated SOCK_Dgram_Brdcast to return the average number of bytes - sent. This isn't necessarily the most useful info, but it - doesn't hurt either. Thanks to Mark Frutig (mfrutig@fnbc.com) - for the suggestion. - -Mon Aug 22 01:18:14 1994 Douglas C. Schmidt (schmidt@tango) - - * Added a new test for the Service Configurator framework. This - test illustrates the dynamic configuration of an entire stream - of Modules. - -Sun Aug 21 03:16:00 1994 Douglas C. Schmidt (schmidt@tango) - - * Cleaned up the ./tests/Reactor/server example to be more robust. - In particular, it doesn't really make sense to have the same - object be configured both statically and dynamically *at the - same time*! This was causing problems since each constructor - was getting called twice for the same object -- once when it was - created statically, and again when it was linked in - dynamically... Things work much better now. - -Sat Aug 20 01:07:24 1994 Douglas C. Schmidt (schmidt@tango) - - * Heavily revised the structure of the ./apps/Logger - subdirectories to test out the new Makefile scheme. Everything - is working fine on Solaris! - - * Updated all the ./apps/Logger subdirectories to use the Acceptor - name rather than the Client_Listener name. This is consistent - with recent papers... - - * Fixed all the Makefiles to utilize the new simplified build - strategy. The Makefiles are *far* more automated now! - - * Added support to all the libsrc Makefiles to produce both shared - libraries (*.so) and traditional archives - (*.a). - -Fri Aug 19 16:13:42 1994 Douglas C. Schmidt (schmidt@tango) - - * Majorly improved the Makefile support for building shared - objects that will be dynamically linked explicitly. No longer - will we have to do the horrible hack of compiling all the source - code using -pic. Instead, only that code that will be linked - dynamically must be compiled with -pic! Note that this only - works if the shared object is entirely self contained (i.e., it - does *not* reference any statically linked symbols that are not - defined in itself)! - - * Started to add changes to the source code to make its - configation driven by features rather than by OS. This should - make everything much more portable soon! - - * Fixed IPC_SAP.h so that the constructor is protected (prevents - accidental definition of an instance of this class). - -Thu Aug 11 08:31:33 1994 Douglas C. Schmidt (schmidt at valentine.ics.uci.edu) - - * Fixed Reactor::schedule_timer() so that it will unblock the - Reactor if it is currently blocked. This is necessary so that - the Reactor will recompute the amount of time that it needs to - wait before dispatching timer-based events. Thanks to Todd Hoff - for noticing this... - - * Fixed a stupid bug in the handle_input() method of - Client_Listener in both the Reactor and Service_Configurator - version of the Server Logging Daemon. This routine was not - explicitly returning 0 when it worked..., which might cause the - Reactor to deregister the listener handler! - - * Added casts to the ::select() call in the Reactor to ensure that - the FD_Set * -> fd_set * conversion operators are properly - involved. Thanks to Todd Hoff for this fix (thm@ictv.com). - Todd noticed that the DCE pthreads implementation on AIX was - confusing the compiler... - -Mon Aug 8 18:11:03 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Added a new constructor for the FD_Set class that will convert - an fd_set into an FD_Set. - - * Removed the default value for the Service_Repository constructor - since this was ambiguous with the default constructor. - -Tue Aug 2 18:25:28 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Fixed a bunch of minor "warning-causing" nits that were caused - by #endif __INLINE__ in certain header files... - - * Added a new set of interfaces to the Reactor to retrieve a - registered handler. These interfaces are also useful for - checking whether a handler is registered at a particular fd. - -Sun Jul 10 17:43:19 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Improved the implementation of the Profile_Timer and - High_Res_Timer classes. In particular, the High_Res_Timer class - now works quite nicely using SunC++ 4.0. - -Mon Jul 4 12:49:14 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Changed the order of the base class inheritance list for the - Service_Object class as a workaround for a bug in SunC++ 4.0's - handling of pointers to member functions (ugh). - -Sun Jul 3 18:07:16 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Added a bunch of changes (courtesy of - george@truffula.fp.trw.com). These changes fix minor - portability problems with the new SunC++ 4.0 compiler. - -Fri Jun 24 08:59:02 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Removed operator() from all the IPC_SAP listener classes. - Defining this operator was causing more trouble than it is worth - since C++ doesn't allow operator() to have default arguments - (ugh). The "right" thing to do is to simply use the accept() - method in those classes instead of operator(). - -Wed Jun 22 16:54:05 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Fixed some problems with TLI_Listener that involved lax scoping - of nested classes with cfront 3.x-based C++ compilers. - -Tue Jun 14 11:56:56 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Added a bunch of changes to get portions of ACE up and running - on SCO UNIX, on HP-UX, and on OSF/1. - -Tue Jun 7 14:32:50 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Added support for FLEX's <> symbol to properly cleanup when - a configuration file has been parsed by the Service - Configurator's lexer/parser. - -Sun May 22 10:37:14 1994 Douglas C. Schmidt (schmidt at valentine.ics.uci.edu) - - * Modified the semantics of explicit dynamic linking on SunOS 4.x. - Now, if there is no _init or _fini function defined in a shared - library, it isn't an error (we simply don't call the function!). - -Mon May 9 07:58:35 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Included more fixes for GNU G++ courtesy of Aniruddha Gokhale - . - -Thu May 5 16:47:25 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Reimplemented the ./apps/Logger/Reactor_Logger to provide an - illustration of how the Reactor works. - - * Added finishing touches to the new version of the Service - Configurator framework. This framework now permits completely - automated configuration and reconfiguration of Service_Objects - and Streams. The next step is to add some more complete - examples that illustrate how these features are used... - -Tue May 3 10:17:12 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Fixed a bug in the Service Repository that would cause an - extraneous dlclose on a shared library handle under some - circumstances... - -Mon May 2 11:07:52 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Modified the semantics of Service_Object_Type in the Service - Configurator framework so that it does not automagically - register the service object with the instance of the Reactor. - The original behavior involved too much "over-specification" of - the behavior of Service Objects. Moreover, I can finally omit - the crazy semantics of DONT_REGISTER_SVC and REGISTER_SVC! - - * Fixed some subtle bugs involved with pop'ing a remove'ing a - Module from a Stream. Note that we need to use Module::link - rather than Module::set_next in order to ensure that all the - necessary pointers get rearranged.... - - * Fixed a couple of minor problems with deleting const objects in - the Service_Repository.i file. These were caught by G++, but - not caught by SunC++! - -Sun May 1 11:43:52 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Fixed subtle bug in Server_Config::run_event_loop(). This bug - prevented reconfiguration from occurring under certain - circumstances. - - * Added a new feature to the Service_Manager class in the Service - Configurator framework. This new feature enables the Service - Configurator to be reconfigured remotely by clients. - - * Fixed a bug in Service_Manager that caused the Service - Configurator to crash if SIGPIPE occurred if a client closed - down ungracefully while retrieving information on active - services. - - * Added a new argument to the Reactor::register_handler() method - that is used to register signal handling Event_Handlers. This - new argument returns the current Event_Handler (if any) that is - registered for this signal. - - * Fixed a potential bug in Service_Config::process_directives that - behaved improperly when there was no svc.conf file present in a - directory. - -Wed Apr 27 12:55:46 1994 Douglas C. Schmidt (schmidt at mabillon.ics.uci.edu) - - * Changed the name of Service_Directory to Service_Manager to - reflect its intended functionality - -Mon Apr 25 10:53:01 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Updated the Service Configurator framework to use the new signal - handling facilities provided by the Reactor. This cleans up a - lot of the code in Service_Config.i and removes the need for - ugly non-reentrant static class variables. - - * Released version 2.14 - -Sat Apr 23 14:29:11 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Changed the representation of the select()-based Reactor to be - more similar with the poll()-based Reactor. In particular, - there is only one array of Event_Handlers rather than three... - -Sun Mar 13 16:49:59 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Fixed a bug with the select-based version of the Reactor. This - bug caused problems when dispatching the handle_output() member - function. - - * Fixed a bug with the select-based version of the Reactor. This - bug resulted in a failure to call the handle_close() member - function on the write_fds and except_fds. - - * Changed the interface for Event_Handler::handle_close() so that - the second parameter is a Reactor_Mask. This allows the - call-back routine to determine which side of a connection (i.e., - read-side vs. write-side or both) to close down. Be careful - since this change may break existing code that used the original - 1 argument handle_close() member function. - - * Changed the location of the Reactor_Mask. It was originally an - enum in Reactor.h. It is now a typedef in Event_Handler. This - change will break existing code but it easily spotted since the - compiler will give an error! - -Sat Mar 12 15:16:59 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Continued to modify the grammar of the svc.conf file language. - The latest version (illustrated in configuration files in the - ./tests/Reactor/server and - ./apps/Logger/Service_Configurator_Logger file) is both easier - to read and to parse automatically. - -Tue Mar 8 10:19:40 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Changed the behavior of the Get_Opt class so that it will - perform option processing starting from argv[0] rather than - argv[1] if the SKIP argument to the constructor is set to 0. - Note that the default value is 1, so the behavior is the same - for backwards compatibility. Incidentally, this new change is - necessary to support the Service Configurator stuff... - - * Changed the names of some of the Service_Record member functions - to conform to the new idiom for naming get/set-style of member - function accessors... - -Sun Mar 6 12:47:03 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Removed libGet_Opt.a and merged it in with libMisc.a - -Sat Mar 5 18:37:43 1994 Douglas C. Schmidt (schmidt at tango.ics.uci.edu) - - * Updated the Service_Config class to use a flex/yacc based parser - rather than an ad hoc parser and lexer. This is useful since - the new syntax for configuring a complete Stream into a Service - Configurator-based application is more complicated... - - * Made a small change to the syntax of a svc.conf file. Now any - parameters that are passed to the Service_Object::init() member - function of a dynamically linked service must be enclosed inside - of double quotes. In other words, service config entries such - as - - dynamic ./dev_adapter.so:_alloc () Device_Adapter -p 3000 - - now become - - dynamic ./dev_adapter.so:_alloc () Device_Adapter "-p 3000" - - This change makes it easier to parse the input using flex/yacc. - -Sat Feb 12 18:53:14 1994 Douglas C. Schmidt (schmidt@net4.ics.uci.edu) - - * Modified the Reactor so that it now also demultiplexes signals, - as well as timer events and I/O events. This required making a - few sections of the Reactor code signal-safe, as well as - thread-safe. - - * Changing the Reactor to handle signals also required a slight - change to its interface. For example, it is now mandatory to - give the Event_Handler::{READ_MASK,WRITE_MASK,EXCEPT_MASK} when - registering a handler... - -Sat Feb 5 12:10:53 1994 Douglas C. Schmidt (schmidt@net4.ics.uci.edu) - - * Changed the Condition and Monitor classes to use templates that - parameterize them with the appropriate type of Mutex (i.e., - either Mutex or Mutex_Rec). This greatly cleans up the code... - Made a number of changes in other files - (such as the Reactor) to account for the changes. - - * Added a new class called Mutex_Rec which implements a recursive - Mutex abstraction on SunOS 5.x. Recursive Mutexes may be - acquired multiple times from a single thread. Basically, this - supports an efficient and clean way of handling nested locking - conditions. - -Thu Feb 3 12:37:34 1994 Douglas C. Schmidt (schmidt@net4.ics.uci.edu) - - * Fixed a bug in Service_Config.i that was causing SIGHUP-driven - reconfiguration not to work correctly. - - * Added a set of new member functions to the Reactor class to - suspend() and resume() an event handler. Also added suspend() - and resume() member functions to the Server_Object class to take - advantage of these new facilities automagically... - -Mon Jan 31 09:47:06 1994 Douglas C. Schmidt (schmidt@net4.ics.uci.edu) - - * Modified the no-args constructor for the Reactor to initialize - it to the DEFAULT_SIZE. The prior behavior was *not* to - initialize it at all, which seems rather dumb in retrospect... - - * Improved the Reactor's support for multi-threading by adding a - pipe() call that is used to force the Reactor to reconfigure - itself everytime a new handler is registered or removed. - Previously, any new changes wouldn't take place until the - Reactor was triggered by some external event. This old behavior - was too non-deterministic... - -Sun Jan 2 12:35:39 1994 Douglas C. Schmidt (schmidt@net4.ics.uci.edu) - - * Modified the inheritance hierarchy for Service_Object so that it - derives from both Shared_Object and Event_Handler. - Shared_Object is a new abstract base class the provides an - interface for dynamic linking of objects. When RTTI is widely - available for C++ the Service Configurator will be much more - functional since we can automatically figure out whether an - object is a Service_Object or just a Shared_Object and do the - right thing with it! - diff --git a/ChangeLogs/ChangeLog-95 b/ChangeLogs/ChangeLog-95 deleted file mode 100644 index 429e5681fdc..00000000000 --- a/ChangeLogs/ChangeLog-95 +++ /dev/null @@ -1,4179 +0,0 @@ -Sun Dec 31 01:02:01 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS (mmap): Added a new parameter to the argument list for - mmap(). This parameter is an ACE_HANDLE * and is used in the - Win32 implementation, which requires CreateFileMapping to open a - new HANDLE. This handle is passed back to the caller, which is - then responsible for freeing it... I'll probably need to modify - the ACE_Mem_Map class to manage this new handle for the WIN32 - version. - - * ace: Updated all the SPIPE files in preparation to porting them - to Windows NT, where they will be implemented using Win32 Named - Pipes! - - * ace/Typed_SV_Message: Fixed a mysterious braino where the method - definitions for Typed_SV_Message were actually within - Typed_SV_Message_Queue.cpp. I'm not sure why this happened, but - it's clearly been this way for eons... Also, changed the name - of the method "max" to "max_size" to avoid conflicts with macros - on Windows NT... - - * ace: Added a new config symbol: ACE_HAS_SYSV_IPC. If this is - *not* set (e.g., Win32) then don't try to compile any of the - System V IPC mechanisms (e.g., shared memory, message queues, - semaphores). - - * ace/Malloc: Reimplemented the Malloc-family to factor out common - code. Also added a new method called "trybind" which atomically - tries to bind a new void *pointer to a char *name. If there is - no name with the same value, the bind succeeds. Otherwise, the - bind "fails", but returns the existing pointer. - - * ace/Map_Manager: Reimplemented the Map_Manager to factor out - common code. Also added a new method called "trybind" which - atomically tries to bind a new int_id to an ext_id. If there is - no ext_id with the same name, the bind succeeds. Otherwise, the - bind "fails", but returns the existing int_id. - - * ace/Memory_Pool.cpp: Commented out all the diagnostic messages - in the various ACE_*_Memory_Pools. Now that we're actually - using this within ACE, they were distracting. - - * ace/CORBA_Handler.cpp (ACE_ST_CORBA_Handler): Gave iterations_ - an initial value of "5" for backwards compatibility. Thanks to - Irfan for doing this. - - * ace/Map_Manager.cpp (ACE_Map_Manager): Fixed some more braino in - the constructors of Map_Manager. During the recent changes I'd - forgotten to initialize the Map_Manager's instance variables to - 0. Thanks to Irfan for finding this out the hard way... ;-) - - * ace/OS.i (gettimeofday): Added a WIN32 implementation of - gettimeofday. This is pretty nasty, but it should centralize - all of this processing in one place in ACE! - -Sat Dec 30 00:50:20 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Timer_Queue: Removed the current_time() method from the - Timer_Queue class. All uses will be replaced with calls to - ACE_OS::gettimeofday(). Not only does this factor out more - code, but it is also reentrant! - - * ace/ACE.cpp (handle_timed_accept): Consolidated code so that - select() is always used, rather than poll(). - - * ace: Generalized the ACE file locking wrappers (both at the - Synch-level and the ACE_OS class level) to enable them to lock - arbitrary regions (aka "records") of a file. Before, they could - only lock the entire file (which remains the default behavior). - This new behavior works for both NT and UNIX. - - * ace/Synch: Removed the definition and use of the - ACE_SYNCH_ERROR_RETURN macro from all the ACE Synch* methods. - This behavior has been integrated into the ACE_OS class instead - since it cleans up lots of code that would otherwise have been - hard to write. - - * ace/INET_Addr.cpp (get_host_name): Fixed a bug that arose by - trying to use the reentrant version of gethostbyaddr all the - time. In order to fix this, I've added a new get_host_name() - method that allows the caller to supply a buffer for the - hostname. - - * ace: Cleaned up all the POSIX_TIMER junk that permeated ACE. - Now all platforms will have the POSIX timer structures (e.g., - timestruc_t and timespec), though only those that actually - support nano-second timing will be able to do anything useful - with this... As part of this cleanup, the poll, select, and - cond_timedwait method in ACE_OS now take ACE_Time_Value * rather - than int, timeval *, and timestruc_t, respectively. This - *greatly* cleans up the clutter throughout the rest of ACE. - - * ace/ACE: Added two new methods called tv2msec and msec2tv that - converts ACE_Time_Value format into millisecond format and vice - versa. This will make it easier to port code between NT and - UNIX. - - * ace/Reactor: Removed the code in the Reactor that previously - allowed it to be resized after it had been initialized. This - code no longer was used due to the recent enhancements that - ensure the Reactor is only initialized once per-process. - - * ace/Reactor: Modified the Reactor so that it now compiles on NT. - It doesn't work yet, but at least it compiles! - - * ace/Reactor: Moved the "max3" method from the Reactor to OS.h, - where it has become a template function usable throughout ACE. - - * ace/OS.cpp: Added extern "C" before the NT implementations of - readv() and writev(). - - * ace/OS.i: Fixed the declaration of ::readv() and ::writev() for - cases where the OS doesn't provide them natively. - - * ace/Event_Handler: Modified handle_signal() to take an int - rather than an ACE_HANDLE. The old way broke under NT... - - * ace: Made lots of minor changes to resolve signed int - vs. unsigned int mismatches. Thanks to the MSVC++ 4.0 compiler - for pointing these out. At least it's good for - something... ;-). - -Fri Dec 29 15:01:10 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/ACE.cpp (handle_timed_accept): Reimplemented the core - select() loop to make the code portable to Win32. - - * ace/Map_Manager.cpp (ACE_Map_Manager): Fixed a minor bug caused - by recent changes (forgot to initialize max_size_ in the - constructor...). - - * Updated all the manual pages to reflect the latest changes. - - * ace/ACE.cpp: Fixed up the ACE class so that all of the methods - should compile on both Windows NT and UNIX! - - * ace/OS: Moved the get_file_size() method from class ACE and put - it into class ACE_OS, where it's been renamed to filesize(). - This is really more of an "OS" function, e.g., it's supported on - Win32 directly. - - * ace/OS.cpp: added readv() and writev() implementations for those - platforms (e.g., Windows NT) that require them. - - * ace/Makefile: Added a new regex to the Svc_Conf_l.cpp target - that will substitute for . This should solve a - portability problem with Windows NT... - - * ace/Malloc: Modified the sync() and protect() methods to use - void * rather than char *. This is now consistent with the OS - classes. - - * ace/OS: Changed things so that all the mmap() related OS - wrappers use void * in their external interface. Any - discrepancies between platforms are now dealt with internally, - in the implementation of the methods. Thanks to Chris Lahey - (clahey@ix.netcom.com) for suggesting this. - - * ace/Local_Name_Space: Modified how ACE_NS_String is used to - instantiate ACE_Map_Manager in order to work around problems - with AIX C++. Thanks to Chris Lahey (clahey@ix.netcom.com) for - reporting this. - - * ace/Synch.i: Added a definition for ACE_RW_Mutex::acquire(). - -Fri Dec 29 00:34:16 1995 Chris Lahey (clahey@ix.netcom.com) - - * ace/OS.h: Changed the #ifdef for ACE_HAS_COMPLEX_LOCKS to - ACE_HAS_COMPLEX_LOCK. - - Changed prototypes for ACE_OS:mprotect(), msync(), and munmap() - to accept ACE_MMAP_TYPE for their first arg. The AIX versions - of these calls all expect void * for their pointer variable. - Note that madvise() takes a caddr_t for its 1st arg and - therefore does not need to be altered. (See related changes in - OS.i and Mem_Map.i) - - Changed prototype for ACE_OS::getsockname(), arg3 to int * (See - related change in OS.i) - - Changed prototype for ACE_OS::setsockopt(), arg4 to const char * - and arg 5 to int (See related change in OS.i) - - * ace/OS.i: Changed function definition for ACE_OS::mprotect(), - msync(), and munmap() to accept ACE_MMAP_TYPE as their 1st arg. - - The following changes relate to the inconsistencies in the - sockets calls on AIX. I thought it would make more sense to - leave the public interfaces alone and then handle the - differences internally. That way it won't break any exisiting - code. - - Changed function definition for ACE_OS::getsockname() to accept - arg3 as int *. Made similar changes in ACE_OS::setsockopt() - - change definition to accept const char * for arg4 and int for - arg5. Add the following code at the start of the function: - Also made changes to ACE_OS::recvfrom() - change arg 6 back so it is - int *. - - * ace/Mem_Map.i: In ACE_Mem_Map::advise(), cast 1st arg to - ACE_OS:madvise() to (caddr_t). - - * ace/Memory_Pool.cpp: In ACE_MMAP_Memory_Pool::acquire(), make - cast to char * in the return statement. In - ACE_MMAP_Memory_Pool::handle_signal(), also make same cast in - the ACE_DEBUG statement near the top of the function. - - * ace/Reactor.cpp and ace/Reactor.h: ACE_Reactor::handler_i() - doesn't return properly if *eh != 0. Remove last "else" so - function always returns 0 if handler != 0. - - In ACE_Reactor::owner(), we need to change signature since - thread_t is not an integer. This has been changed to int - ACE_Reactor::owner(thread_t *t_id); The last two lines have been - changed to: *t_id = this->owner_; return 0; - - * ace/Synch.cpp: In ACE_Condition_Mutex::wait(), the call to - cond_timedwait() does not exist, but ACE_OS::cond_timedwait() - does exist. It takes the same arguments. - - * ace/Synch.h and ace/Synch_T.h: At the end of both files, before - the #define INLINE check for this define's existence to avoid - causing compilers to choke. - - * ace/Mem_Map.i: In ACE_Mem_Map::operator(), the return statement - looked very odd. In the assignment to addr, why is the ", 0" in - the statement? - -Fri Dec 29 00:34:16 1995 Douglas C. Schmidt (schmidt@lambada.cs.wustl.edu) - - * ace: Fixed up many minor problems with the various types of - Shared_Memory wrappers. This mostly entailed changing from char - * to void * to be more consistent with the other parts of ACE. - In addition, I now only include the *.i files if __INLINE__ is - enabled. - - * ace/Memory_Pool.cpp (map_file): Fixed a minor bug by enabling - MAP_FIXED if we're trying to map a file using a fixed address. - -Thu Dec 28 18:39:16 1995 Douglas C. Schmidt (schmidt@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp: Finished implementing changes to the - ACE_Malloc stuff and the Local_Name_Space that Irfan had begun - last semester. - - * ace/SString.cpp: Added new optimizations to the assignment - operators of the ACE_[WCS]String classes to avoid - freeing/allocating memory if the current size is large enough. - - * ace/SString: Added copy constructors... - - * ace/Local_Name_Space.cpp: Modified the implementation of bind() - to avoid a race condition. - - * ace/Map_Manager.cpp (bind): Changed the semantics of bind() so - that callers can control whether or not INT_IDs are reassigned. - Also changed things so that callers can get back the existing - value if they choose not to reassign. - - * ace/SString.cpp: Removed the "P" (persistent) versions of all - these classes and merged them into the default versions. The - persistence is now determined by the type of allocator passed in - as a parameter to the constructor (or by using the "default" - allocator that is accessible via - ACE_Service_Config::allocator()). - - * ace/Map_Manager.cpp: Removed the "P" (persistent) versions of - all these classes and merged them into the default versions. - The persistence is now determined by the type of allocator - passed in as a parameter to the constructor (or by using the - "default" allocator that is accessible via - ACE_Service_Config::allocator()). - - * ace/Malloc_T: Modified the bind() algorithm so that it will - allow the caller to determine whether duplicates are allowed or - not... Also changed things so that callers can get back the - existing value if they choose not to allow duplicates. Irfan - questions the sanity of this... ;-) - - * ace/Synch: To be consistent, added acquire_write and - acquire_read methods to ACE_Mutex. These are useful for cases - where we are going to be parameterizing classes like ACE_Malloc - with some type of mutex wrapper (e.g., ACE_RW_Mutex, ACE_Mutex). - - * ace/Malloc_T.cpp (calloc): Added a new method called "calloc" - that will not only allocate the memory dynamically, but will - also give it an initial value (e.g., '\0'). - -Thu Dec 28 01:10:43 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i: Modified the implementation of the TLI methods so that - they are conditionally compiled away if the platform doesn't - support TLI... Thanks to Neil Cohen for pointing out the need - for this... - - * ace/OS.i: Modified the implementation of dlopen() and dlsym() to - account for limitations with SunOS 4.x... - - * ace/Service_Repository.cpp: Modified this class to use the - ACE_OS::dlclose method. - - * ace/Parse_Node.cpp: Modified this class to use the - ACE_OS::dlopen and ACE_OS::dlsym methods. - -Wed Dec 27 23:25:03 1995 Jesper S. M|ller (stophph@diku.dk) - - * Added appropriate flags in OS.h for successful inclusion of - several header files, such as Malloc.h and friends. Also added - mprotect to ACE_OS for Win32 to avoid linker errors. - - * Added a return value (from map_file) to - ACE_MMAP_Memory_Pool::handle_signal. The compiler was - complaining. Likewise on - ACE_MMAP_Memory_Pool::commit_backing_store (there 0 seemed like - the correct off-the-end return value). - - * Removed include of some SV semaphore file, if not needed in - Malloc.h. Worse for Memory_Pool.h, since the SV_Semaphore - wrappers consistently differ completely from the other - synchronization routines. I guess we'll need some variant of - ACE_Process_Semaphore that takes an integer as a key instead of - a string, and does not perform automatic init/destroy. - - * Also upgraded fd's from int to ACE_HANDLEs and changes -1 to - ACE_INVALID_HANDLE where appropriate. - - * By help of aggresive preprocessor conditionals, made Handle_Set - work with Win32. There is a fd_set abstraction with appropriate - FD_xxx macros for WinSock, and it requires no sync'ing. The - Handle_Set_Iterator should also work. The good looks of - Handle_Set was impaired, though. Right now, the trigger is the - ACE_WIN32 flag, although it should be something like - ACE_FD_SET_USES_BITS for the unix approach, or like - ACE_FD_SET_USES_VECTOR for the WinSock approach. - - * Reactor almost compiles now, but not quite: Handlers are - addressed by fd, this is no longer possible - what a mess - we - need to step through the handle indices somehow. This will - likely get into some nasty quadratic complexities when iterating - the handles to find the event_handler for each file - handle. Mabye we can circumvent this with a hash table lookup - for those opaque handles. - - * There was a problem with the Svc_Conf.l.cpp and the - Svc_Conf.y.cpp and the extremely lame MSVC++ 2.0. I had to - rename them to Svc_Conf_y.cpp, etc. Awful! - - * Added code to inquire the 'host' name for Win32 in the ACE_Client_Id - class. Another candidate for ACE_OS. - - * About 60 or so ACE .cpp files compile now, which reminds me that - I'll be working on some precompiled header scheme soon, since it - takes for ever and ever, even on my 32meg system with pretty - good SCSI drives. Mabye it's because I'm only running a 66MHz - i486 DX2 (yawn). - - * Dozens of other changes have been made to various files, all - pertaining to int vs. ACE_HANDLE. In Service_Manager.h, a signal - number was an ACE_HANDLE, but just close by, some fd's were - ints. Fixed that, too. - -Sat Dec 23 14:15:16 1995 Jesper S. M|ller (stophph@diku.dk) - - * I've also grouped the .i and .cpp functions by class, - and #if'ed the sbrk and SysV pools out, since - Win32 cannot support those. - - * Added 'inline' to day accessor functions in Date_Time. - - * Two things that missed me in Trace.cpp: - 1) The inclusion order was so that I couldn't - build Trace.o, since it didn't know the MALLOC_HOOK thing. - I moved the #include of Trace.h down below that of ACE.h. - 2) The declaration and definition of the ACE_Trace constructor - differed by a const, which I added. - 3) When linking, multiple symbols were found for some - OS calls like mutex_init, corresponding to the larger - OS Win32 functions. I has ACE_INLINED_OS_CALLS off, - so sometimes the OS functions were inlined, sometimes - not. - I disabled the inline hack in Trace.cpp for WIN32 for now. - This seemed to resolve matters. - - * There was a major problem in OS.i, where Synch.h was needed for - mutex support (in conjunction with TSS info linked list). I - chose to make thr_keycreate and some others non-inlined. - - * More 'is-it-a-handle-or-success' confusion in SOCK*.* Changed - ACE_SOCK_Dgram to use int status. Changed ACE_SOCK_CODgram to - use int status. Changed ACE_LSOCK to use int status. Also - changed a few derived classes - -Fri Dec 22 14:03:15 1995 Douglas C. Schmidt (schmidt@lambada.cs.wustl.edu) - - * ace/OS.h: Added a new type for rwlock_t for platforms that don't - support threading... Thanks to Neil Cohen for reporting this. - - * ace: Merged in all of Jesper's changes for NT and Chris Lahey's - changes for AIX. - - * ace: Merged tli.h into OS.h to avoid name conflicts on Win32. - - * Fixed duplicated names where case is the only difference. - ace/thread.cpp - ace/Thread.cpp - ace/TLI.h - ace/tli.h - apps/Token_Server/mutex_example/simple_token_client.cpp - apps/Token_Server/mutex_example/Simple_Token_Client.cpp - apps/Token_Server/script_example/scripting_token_client.cpp - apps/Token_Server/script_example/Scripting_Token_Client.cpp - tests/IPC_SAP/SOCK_SAP/FD-client.cpp - tests/IPC_SAP/SOCK_SAP/fd-client.cpp - tests/IPC_SAP/SOCK_SAP/FD-server.cpp - tests/IPC_SAP/SOCK_SAP/fd-server.cpp - -Wed Dec 20 22:26:24 1995 Jesper S. M|ller (stophph@diku.dk) - - * FIFO.cpp: One last comparison of 'open' return status where and - ACE_INVALID_HANDLE should be changed to -1. - - * One more last wrong comparison in FIFO_Recv_Msg.cpp. - (Never say never again!) - - * Put an appropriate conditional around the inclusion of - Handle_Set.h for ACE_WIN32 (for now). - - * Introduced a few backslashes in the macros of Dump.h that were - somehow left out... Had to add a really stupid constructor for - struct Tuple. I haven't a clue why MSVC++ wants this! Replaced - 'return ACE_ODB;' with 'return ACE_ODB::instance_;' in the - Singleton access function. - - * Added a constructor for ACE_ODB. It may be private, but it still - needs to be defined... - - * Stack and Set compiles fine for Win32 (not surprisingly) - - * If'ed out the guts of ACE_IPC_SAP enable/disable calls for - Win32, since async IO doesn't work that way on there. - - * Event_Handler now uses ACE_INVALID_HANDLE for default args. - - * SOCK compiles except for the ACE_SOCKET <> ACE_HANDLE - problem. Refer to issue #3 above. - - * We're swamping the ace directory with .mak files. I used the - winntace.mak file, which is compilable and linkable. - -Thu Dec 21 15:37:42 1995 Douglas C. Schmidt (schmidt@merengue.cs.wustl.edu) - - * ace: Greatly simplified the include files so that (1) compilers - are faster and (2) the ACE_Trace mechanism works correctly. - - * ace/Trace: Modified the ACE_Trace_TSS class so that it is no - longer a template. This was overkill since we know the type - head of time (i.e., ACE_Trace_State). - - * ace: Added a number of new changes to ACE to make things work on - AIX. Thanks to Chris Lahey for these - changes. - - * ace/Thread_Manager.cpp: Removed the get_max_thr_id() method - since it was not portable to NT or POSIX pthreads. Nothing in - ACE depended on it anyway... - - * ace/OS: Added a new static data member called NULL_thread that - is a "zero'd" out thread id. This is necessary to deal with the - POSIX pthread implementation of a thread id, which is not always - implemented as a number... By using this new approach, all the - special-case code in Synch.cpp disappears... - - * ace/OS: Added a new method to class ACE_OS called thr_equal() - that masks the differences between comparing thread ids using - the threading libraries. This simplifies the code in Synch.cpp - and Reactor.cpp. - - * ace: Updated all uses of mmap() to use the new ACE_MMAP_TYPE - typedef. This deals with the fact that different versions of - UNIX define mmap() inconsistently (e.g., some use void * and - some use char *...). - - * ace: Removed testconfig.h and merged all of those #defines into - OS.h. This centralizes changes in one place and also eliminates - the need for ./apps and ./tests to include extraneous files... - - * ace/testconfig.h: Changed all uses of 0666 to ACE_DEFAULT_PERMS. - Also, removed all PERMS enums and substituted ACE_DEFAULT_PERMS - instead. - -Wed Dec 20 17:29:55 1995 Tim H. Harrison (harrison@merengue.cs.wustl.edu) - - * Rewrote the Token deadlock detection algorithm. It now performs - "best-effort" detection of deadlock for remote acquires and - complete deadlock detection for local acquires. - -Wed Dec 20 02:37:39 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.h: The select() system call has its own include file on - AIX: . We can wrap the #include with a variable - #if defined (ACE_HAS_SELECT_H). - - * include/makeinclude/platform_aix.GNU: Added new support for AIX. - Thanks to Chris Lahey for these changes. - Added a number of other minor changes, as well. - - * ace: Made a bunch of minor changes to get ACE to compile on - SunOS4.x, Linux, and SGI. - - * ace/config-linux.h: added ACE_HAS_MSG (thanks to Neil Cohen - for this). - - * ace/OS.h: Conditionally compile for ACE_HAS_UTIME for - . - - * Released an alpha version of ACE containing the new Windows NT - port. - - * Integrated and tested all the new Windows NT changes in class - ACE_OS, as well as the Synch* and Threads* classes. We're now - able to build Jesper's win32_test.cpp file in ./ace! A complete - NT port should be just around the corner... - -Tue Dec 19 17:59:04 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Move the remaining contents of sysincludes.h into ACE.h. - There is no more sysincludes.h (at long last!). - - * ace: Rearranged things so that the OS.[hi] files contain all the - OS-specific #defines and #includes that were previously in - sysincludes.h. - - * ace: Renamed the ACE_Misc class to class ACE, which is more - representative of what it does. - - * INSTALL: updated the installation instructions to explain how - the new directory structure works. Thanks to Neil Cohen for - pointing out the discrepancy beteen the source and the - documentation ;-). - - * Reorganized (by flattening) the ACE library directory structure - to make it work for both Windows NT and UNIX. Note that Windows - NT does not have symbolic links, so the old way of doing things - didn't port... The consequences of these changes is there is - now a single directory called $WRAPPER_ROOT/ace that contains - the *.[hi] and *.cpp source files. This is also where the - libACE.a and libACE.so libraries are built by default. Also, - note that the suffix used by ACE has been changed from *.C to - *.cpp to deal with the lame Visual C++ compiler... - -Tue Dec 19 01:26:54 1995 Douglas C. Schmidt (schmidt@merengue.cs.wustl.edu) - - * tests/ASX/Event_Server/Event_Server/Supplier_Router.cpp (put): - Fixed up a problem with the Event_Server. Somewhere along the - way it stopped being concurrent! The new version fixes this. - Thanks to Alex V Maclinvosky for - noticing this... - - * Added a billion new changes to class OS to integrate the Windows - NT port with the rest of ACE. We are getting very close... - -Mon Dec 18 12:45:13 1995 Jesper S. Møller (stophph@diku.dk) - - * Major problems in the IPC_SAP. First, I detected that some open - calls returned handles, some returned -1 or 0. For instance - ACE_SOCK has a constructor, that calls this->open and expects a - handle (which it even sets as the current handle - value!). Unfortunately, the return from open is either 0 or -1, - depending on how well the open went. ACE_HANDLE being - typedef'ed to a void* really reveals some problems! I have - solved the problem for the FIFO*.* family and for SOCK.* - -Mon Dec 18 12:43:46 1995 Douglas C. Schmidt (schmidt@merengue.cs.wustl.edu) - - * tests/Reactor/CODgram/CODgram.C (main): Fixed a bug in main() - caused by initializing the Reactor twice. Thanks to Aurelio - Nocerino for reporting - this. - - * libsrc/Service_Configurator/Service_Config.C Added a new - constructor to ACE_Service_Config that can be used to initialize - internal variables without performing a full configuration. - -Mon Dec 18 01:22:22 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Service_Config: renamed tokens.h to sc_tokens.h to avoid - file name collision on Win32. Thanks to Jesper S. M|ller - for reporting this. - - * tests/Mem_Map/IO_Test: renamed io_test.C to test_io.C to avoid - file name collision on Win32. Thanks to Jesper S. M|ller - for reporting this. - - * libsrc/Misc/OS: Implemented condition variables for Windows NT. - -Sun Dec 17 21:23:32 1995 Douglas C. Schmidt (schmidt@merengue.cs.wustl.edu) - - * libsrc/Misc/Trace: Fixed up the ACE_Trace class so that it - doesn't include any calls that will improperly trigger infinite - recursion! This allows the ACE library to be traced completely. - -Sat Dec 16 19:12:37 1995 Jesper S. Møller (stophph@diku.dk) - - * Changes to OS.*: - * Added conditionals to the OS.h for Win32, for the special ACE/Win32 - thr_destroy_tss(), which is automatic for Solaris. - * Changed declarations of thr_create, thr_suspend, thr_continue, - thr_join and thr_[gs]etprio to use hthread_t instead of thread_t. - * Changed return type of OS::open from int to ACE_HANDLE. - * Provided non-obtrusive handling of thr_handle in OS::thr_create - for non-Win32. - * Copied ACE::writev to OS::writev for Win32. Something similar - should happen for other systems... - - * Changes to Thread.*: - * Changed join, suspend and continue to take handles. - * Added thread handle return address to spawn. - - * Changes to Thread_Manager.*: - * Added thread handles to the Thread_Descriptor structure. - * Modified insert_thr and append_thr functions to also take - handles. - * Made ACE_Thread_Descriptor::Thread_State (a enum) public - so Thread_Manager::append_thr could use it as a formal - parameter (I suspect this is a bug in MSVC++). - * Changes the various flavours of suspend, continue, etc. to - use handles instead of id's. Keep in mind that none of this - is destructive for Unix, but vital for Win32. - * There is still a problem with ACE_Thread_Control registering - itself with the Thread_Manager - the thread does not have means - of finding it's own handle. In this particular case, we could - have the thread duplicate it's pseudohandle into a real one, - and pass that one along. I'd really, really, really rather not - have to maintain a thread id->handle mapping myself; It would - slow down thread manipulation and give some troublesome memory - overhead. - - * Changes to Log_Msg.*: - * OS::getpid instead of ::getpid. - - * Changes to Misc.*: - * Sections inappropriate for Win32 #if'd out... - * Provided naive timestamp function (No date) for Win32. - - * Changes to IPC_SAP.*: - * Uses OS::ioctl instead of ::ioctl - * Uses ACE_INVALID_HANDLE instead of ACE::INVALID_HANDLE - - * Changes to FIFO.*, : - * Uses ACE_INVALID_HANDLE instead of ACE::INVALID_HANDLE - - * Changes to FIFO_Send.*: - * open now returns an int insted of an ACE_HANDLE. - * Uses ACE_INVALID_HANDLE instead of ACE::INVALID_HANDLE - - * Changes to FIFO_Send_Msg.*: - * open now returns an int insted of an ACE_HANDLE. - * Uses ACE_INVALID_HANDLE instead of ACE::INVALID_HANDLE - * Uses OS::writev instead of ::writev - - * Changes to FIFO_Recv.*: - * open now returns an int insted of an ACE_HANDLE. - * Uses ACE_INVALID_HANDLE instead of ACE::INVALID_HANDLE - - * Changes to FIFO_Recv_Msg.*: - * open now returns an int insted of an ACE_HANDLE. - * Uses ACE_INVALID_HANDLE instead of ACE::INVALID_HANDLE - - * Changes to sysincludes.h: - * Uses ACE_INVALID_HANDLE instead of ACE::INVALID_HANDLE - -Sat Dec 16 12:29:06 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/Addr/INET_Addr.C: Changed the implementation so - that the reentrant versions of the library calls are always used - (class OS sorts this all out). This reduces the amount of - clutter in the code. - - * libsrc/Threads/Synch: Added a new implementation of - "readers/writer" locks for both Windows NT and POSIX pthreads. - By default, these threads packages don't have this feature. - - * libsrc/Threads/Synch: Added a new macro called - ACE_SYNCH_ERROR_RETURN that greatly simplifies the definition of - the synchronization wrappers. - - * include/ace/sysincludes.h: Removed the pthreads_map.h file and - integrated this into sysincludes.h. - -Fri Dec 15 02:39:25 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Misc/OS.i: Finished updating class OS so that it will - compile correctly for OS platforms that don't support threads, - as well as platforms that support POSIX Pthreads vs. Solaris - threads, etc. - - * libsrc/Misc/OS: integrated Jesper S. M|ller - support for POSIX regular expressions (e.g., compile() and - step()) and sysinfo() into ACE. - - * Integrated and tested all of Irfan's changes to ACE to support - the new persistence Name_Server. This added some new classes in - various places that use the ACE_Allocator. - -Thu Dec 14 00:23:43 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/ASX/Event_Server/Event_Server: Fixed an "off by 1" bug in - the declaration of char *argv[3] in the open() methods of - Supplier_Router.C and Consumer_Router.C. Thanks to the "ever - dissatisfied" Alex V Maclinvosky - for reporting this. - - * libsrc/Service_Configurator/Service_Config: Added a new - "Singleton" access point for the global ACE_Allocator. - - * libsrc/Naming/Name_Options.C (parse_args): Made it possible to - change the name of the process on the command line via the -P - option. The default is still to use argv[0] as the process - name. - - * include/ace/testconfig.h (ACE_DEFAULT_GLOBALNAME): Changed the - value from "/localnames" to "/globalnames" to avoid a conflict. - - * libsrc/Misc/SString.C: Added Irfan's new "persistent" string - mechanisms that use the ACE_Allocator_Manager. We may - eventually update the existing SS* stuff to use this. - - * Merged in Jesper S. M|ller updates for Windows - NT. - - * include/ace/Malloc.h: Added a forward declaration for - ACE_Malloc_Iterator right before ACE_Malloc. Thanks to Antonio - Tortorici for reporting it. - - * libsrc/Threads/Synch_T.h: Fixed a small typo in - ACE_Null_Condition. Thanks to Antonio Tortorici - for reporting it. - - * include: Added new config-linux.h and platform_macros.GNU config - files for Linux. Thanks to Timothy Newell - <910430n@dragon.acadiau.ca> for this stuff. - -Wed Dec 13 23:08:11 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/Addr/INET_Addr.C (set): Fixed a small typo in the - ACE_INET_Addr::set (const char port_name[], ACE_UINT32 - inet_address) method where the test should be != rather than == - 0. Thanks to Bill Lear (rael@anarchy.cybercom.net) for - reporting this. - -Sun Dec 10 12:23:54 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Service_Configurator/Service_Record.C (init): Fixed a - small problem where a NULL pointer was being returned if a user - passes a non-existent config file (using the -f option) to - ACE_Service_Config::open(). Thanks to Dieter Quehl - (quehl@erlh.siemens.de) for noticing this. - - * libsrc/Log_Msg/Log_Msg.C (log): added a new option (%T) that - causes the current timestamp to be inserted into the log msg. - Thanks to Dieter Quehl (quehl@erlh.siemens.de) for suggesting - this. - - * libsrc/Misc/Misc: Added a new timestamp() method that returns - the current timestamp in the form - "hour:minute:second:microsecond." The month, day, and year are - also stored in the beginning of the date_and_time array. - - * tests/Shared_Malloc: Added Irfan Pyarali new - test program that exercises the new features of ACE_Malloc that - are described in the following bullet. - - * libsrc/Shared_Malloc: Added Irfan Pyarali - cool new versions of ACE_Malloc and ACE_MMAP_Memory_Pool. These - new versions provide the following enhancements: - - 1. Persistence -- via the sync() method - 2. Protection -- via the prot() method - 3. Named malloc chunks -- via bind(), find(), unbind(). - 4. Named iteration -- via ACE_Malloc_Iterator - -Thu Dec 7 00:31:26 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Signal.C: Replaced ACE_Guard with ACE_TSS_Guard - to ensure that locks are correctly released even if - Event_Handler::handle_signal() callbacks invoke - ACE_Thread::exit(). Thanks to Detlef Becker - (beckerd@erlh.siemens.de) for suggesting this. - - * libsrc/Threads/Synch_T: Used inheritance to factor out the - shared code between ACE_Guard, ACE_Read_Guard, and - ACE_Write_Guard in order to reduce unnecessary duplication. - - * libsrc/Threads/Synch_T: Changed the implementation of ACE_Guard - to keep a pointer to the LOCK rather than a reference. This - makes the code more flexible and aids in factorization. - - * libsrc/Threads/Synch_T: Changed the implementation of ACE_Guard - to incorporate ACE_Try_Guard semantics. This reduces the amount - of classes and duplicate code in ACE. - -Wed Dec 6 21:36:02 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/ace/Trace: Changed the type of the string passed into - ACE_Trace from char * to const char *. - - * libsrc/Reactor/Reactor.C: Had forgotten to initialize the - initialized_ and requeue_position_ members appropriately in the - constructor of the ACE_Reactor if ACE_MT_SAFE is *disabled*. - Thanks to Mark Zusman for pointing - this out. - - * libsrc/Threads/Synch_T.C: changed the order of some methods so - they would be properly defined if ACE_HAS_THREADS and - ACE_HAS_THREAD_SPECIFIC are *not* enabled. This should fix - remaining problems with ACE on SunOS 4 and SGI. Thanks to - Aniruddha Gokhale for noticing this. - -Tue Dec 5 01:06:14 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Changed things around so that the Name_Server and Token_Server - client interfaces are include in libACE. - - * libsrc/Shared_Malloc: added a const char *pool_name to - ACE_Malloc::ACE_Malloc. This is passed into the constructor of - the MEMORY_POOL to make it easier to dynamically name memory - pools. - -Mon Dec 4 21:20:28 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Synch_T: Modified the place that the - ACE_Thread_Specific methods are defined so that they will be - compiled correctly for platforms without threads or - thread-specific storage. - -Sun Dec 3 23:04:41 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/ASX/Message_Block: Modified clone() so that it takes an - extra parameter that specifies which flags SHOULD NOT BE - TRANSFERED to the clone. This defaults to - ACE_Message_Block::DONT_DELETE. Thanks to Alex V Maclinvosky - for suggesting this. - -Sun Dec 3 17:43:11 1995 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * The number of files in the Token library has been reduced. As a - result, many of the files have been renamed. Also, the .i files - have been purged of relatively large methods (these have been - moved to the .C files.) Lastly, most uses of dynamic memory - allocation have been removed from the library. This was - important to reduce the amount of serialization in threaded - applications caused by the dynamic allocation. - -Sun Dec 3 17:29:54 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Synch: Modified all the synchronization classes - so that they disallow assignment and initialization! - - * libsrc/Threads/Synch: Moved the ACE_Thread_Specific class from - its own files into the Threads/Synch.[Chi] files. This should - eliminate a set of horrible interdependencies among files. - -Sat Dec 2 16:07:40 1995 Douglas C. Schmidt (schmidt@mambo.cs.wustl.edu) - - * libsrc/Misc/SString.C (ACE_CString): Added a destructor to - CString. Thanks to Tim for noticing this... - -Tue Nov 28 17:25:02 1995 Prashant Jain (pjain@tango.cs.wustl.edu) - - * apps/Name_Server/client/lib/Name_Proxy: Changed Name_Proxy to - inherit from ACE_Service_Object rather than ACE_Event_Handler. - This will allow a Name_Proxy to be dynamically linked into an - application via the svc.conf file. - - * apps/Name_Server/client/lib/Name_Proxy: Added new methods - init, fini, and info. - -Tue Nov 28 00:56:52 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/Threads/test_thread_specific.C: Added code to test the new - ACE_TSS_Guard class... - - * libsrc/Threads/Synch_T: Added the new ACE_TSS_Guard class. This - class is similar to the existing ACE_Guard, except that it uses - thread-specific storage to ensure locks are released even if a - thread exits via thr_exit()! - -Mon Nov 27 20:39:58 1995 Prashant Jain (pjain@tango.cs.wustl.edu) - - * apps/Name_Server/{client,server}/tests: Added new tests to - exercise the key features of the name server. - - * apps/Name_Server/client/lib: Simplified access to the nameserver - database. For example, all the network-byte ordering code was - moved out of the Local and Remote Name_Spaces. This code is no - longer necessary since we'll be providing a different means to - get portable name service repositories via a tool that extracts - the "key/value/type" tuples and stores them in a - machine-independent format. The result of this change is that - the Name_Server code is much easier to understand and modify. - - * apps/Name_Server/client/lib: Split local and remote name spaces - into two classes to simplify usage. This approach uses the - Bridge pattern to have a baseclass called Binding and then have - subclasses called Local_Name_Space and Remote_Name_Space. The - constructor of Naming_Context then allocates the right one - (i.e., it serves as a factory). This approach remove all the - switch statements in the code and makes it much easier to use - and extend. - - * apps/Name_Server: updated all the Name_Server components to - use ACE naming conventions. - - * apps/Name_Server/client/lib: Changed ACE_Name_Options to use the - Singleton pattern rather than the global variable... - -Mon Nov 27 00:47:32 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Shared_Malloc/Malloc.h: Named the previously anonymous - struct inside of ACE_Malloc_Header to be - ACE_Malloc_Control_Block in order to keep the OSE tools working. - Thanks to Karlheinz for reporting this. - - * libsrc/Threads/Synch: Fixed a major bug in the ACE_Semaphore - wrappers. Apparently, these had slipped between the cracks and - were not correctly mapping onto the ACE return value scheme - where -1 corresponds to an error with errno set to indicate the - type of error. - - * tests: Cleaned up some files that mistakenly were defining - LSOCK* objects even for platforms (i.e., Linux) that don't - support them. Thanks to Timothy Newell - <910430n@dragon.acadiau.ca> for noticing this. - -Sun Nov 26 12:42:51 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Shared_Malloc/Malloc: Added a new accessor method - (memory_pool) that returns a reference to the MEMORY_POOL object - used to configure ACE_Malloc. - - * libsrc/Shared_Malloc/Malloc: Changed the constructor of - ACE_Malloc to take advantage of the new init_release method on - all the ACE_*_Memory_Pools. - - * libsrc/Shared_Malloc/Memory_Pool: Added a new method to all the - ACE_*_Memory_Pool classes called "init_release". This is called - when ACE_Malloc finishes initializing the dynamic memory - manager. This method is necessary in order to initialize the - ACE_MMAP_Memory_Pool correctly if there are multiple processes - that try to initialize ACE_Malloc simultaneously. In addition, - also added an ACE_SV_Semaphore_Complex to the - ACE_MMAP_Memory_Pool in order to serialize initialization - correctly. - - * libsrc/Shared_Malloc/Memory_Pool: Added sync() and protect() - methods to all of the ACE_*_Memory_Pool classes in order to - support a uniform interface for use with the "robust memory" - mechanism we're building. - - * libsrc/Mem_Map/Mem_Map: Added two new "protect" methods to - ACE_Map_Manager in order to allow clients to change the - protection of memory-mapped regions. - - * libsrc/ASX/Map_Manager: Changed Map_Manager methods to use - "const" for EXT_ID and INT_ID at request of Prashant Jain - (pjain@cs.wustl.edu). - - * libsrc/Shared_Malloc/Memory_Pool: Revised the - ACE_Shared_Memory_Pool so that it would actually work - correctly... This code hadn't been reviewed carefully before - and there were some bugs... - - * libsrc/Shared_Malloc/Malloc: added "INLINE" to the - ACE_Allocator_Adapter components. - - * libsrc/Shared_Malloc/Memory_Pool: Greatly simplified and - consolidated the mmap(2) code for ACE_MMAP_Memory_Pool. - - * libsrc/Shared_Malloc/Memory_Pool.i (release): Removed the - vestigal this->mmap_.remove() call in release(), but added the - appropriate code to close the fd and unmap the region. Thanks - to Irfan Pyarali for noticing this. - -Sat Nov 25 18:12:55 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/CORBA/CORBA_Handler.C (activate_service): - Modified activate_service so that - - if (service_name != 0 - && this->register_service (service_name, marker_name, - service_location) == -1) - return -1; - - is changed to - - if (service_name != 0 && service_location != 0 - && this->register_service (service_name, marker_name, - service_location) == -1) - return -1; - - Irfan Pyarali requested this. - -Sat Nov 25 16:41:15 1995 Douglas C. Schmidt (schmidt@lambada.cs.wustl.edu) - - * libsrc/Misc/Set: Changed all the find() and size() methods to - be const member functions. Thanks to Irfan Pyarali - (ip1@cec.wustl.edu) for requesting this. - -Fri Nov 24 02:51:59 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Reactor.C: Fixed the Reactor so that if we're - compiling with DEADLOCK_DETECTION enabled it will create a - uniquely named mutex by stringifying "this". - -Thu Nov 23 21:45:43 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP: Changed - - * libsrc/Service_Configurator/Service_Config: Added three new - methods to allow programmers to set the process-wide Singletons - for Reactor, Service_Repository, and Thread_Manager. - -Tue Nov 21 01:59:06 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Mem_Map/Mem_Map.C: Fixed a stupid typo in map_it() that - was causing problems due to unsigned arithmetic semantics... - This should make the file_reverse.C Mem_Map tests work correctly - now... Thanks to Bill Lear for - noticing the problem. - - * tests/Mem_Map/IO-tests/io_test.C (parse_args): Fixed a - classic C/C++ braino in io_test.C: - - The for loop in parse_args() - - for (int c; (c = get_opt () != -1); ) - - should be - - for (int c; ((c = get_opt ()) != -1); ) - - How embarrassing. Maybe Bertrand Meyer is right -- C++ is too - dangerous for its own good... ;-). Thanks to Bill Lear - for finding this! - - * Removed all traces of ACE_Condition from the library. - This should make life much easier for compilers (like G++) that - can't grok templates very well... - - * libsrc/Threads/Thread_Specific.C (ts_object): Added a new method - that allows you to simultaneously "test and set" thread-specific - data! This is used to support a neat new trick that ensures - locks are released even if a thr_exit() is called! - - * libsrc/Service_Configurator/Service_Repository: Removed the - Recursive_Mutex from Service_Repository and replaced it with a - regular (non-recursive) mutex. Had to rewrite the code a bit so - that it wouldn't try to call internal methods that acquired the - mutex (this leads to instant deadlock!) - -Mon Nov 20 01:05:47 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Synch: Finally gave in and accepted the fact that - GNU G++ is a horrible, horrible blight on mankind... Changed - the internals of Synch.[Chi] to completely remove any - dependencies on templates. I hope this fixes some portability - problems deep in the libraries... Added several new classes to - reflect this change: ACE_Mutex_Guard, ACE_Mutex_Condition, and - ACE_Recursive_Mutex. - - * libsrc/IPC_SAP/UPIPE_SAP/UPIPE_Acceptor.C (ACE_UPIPE_Acceptor): - Fixed a stupid typo that was causing the constructor of - UPIPE_Acceptor to become inlined!!! - - * apps/Gateway/Gateway: Fixed up the Makefile so that the gatewayd - executable would compile with G++. - - * include/ace/config-irix5.3-sgic++.h: Changed the SGI config.h - file so that it uses select() rather than poll() by default. - The select() version of the Reactor is implemented more - efficiently in ACE... - - * include: Added config files for AIX courtesy of Byron Walton - . - - * libsrc/Reactor/Signal.C: #ifdef'd out some code in Signal.[hC] - that was causing problems for the HPUX C++ compiler. What a - *horrible* compiler! - - * libsrc/Reactor/Event_Handler.h: Added two new methods to - ACE_Event_Handler: get_priority() and set_priority(). These - will be used to control the behavior of the ACE_Reactor's - dispatching. This also required added a new data member to - ACE_Event_Handler that stores the priority (which defaults to - MIN_PRIORITY). - - * libsrc/Misc/Stack.C (enqueue): Added a new class called - ACE_Unbounded_Queue. This is required for Tim's Token_Server - connection repository stuff... - - * libsrc/CORBA/CORBA_Handler.C: Added new support to both the - single-threaded and multi-threaded versions of CORBA_Handler so - that it will now suspend/resume the services associated with a - CORBA_Handler. - - * libsrc/CORBA/CORBA_Handler.C (ACE_MT_CORBA_Handler): Updated the - constructor to use the associated Thread_Manager to spawn a new - thread. This will allow the suspend() and resume() methods to - atomically resume and suspend the daemon thread and its event - handler. - - * libsrc/Threads/Synch.h: Fixed up the order of #includes to solve - problems with circular header dependencies! - - * Had to add zillions of little changes to avoid problems with - circular includes for G++... - - * tests/ASX/Event_Server/Event_Server/Peer_Router.C (bind_peer): - Fixed a typo that had been dormant for ages due to C++'s very - late binding of templates... G++ picked this right up! - -Sun Nov 19 11:55:02 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Signal: Replaced the static HANDLER_SET stuff - withing ACE_Sig_Handlers with a different implementation using - ACE_Fixed_Set. This should fix nasty problems with static - variables on HP/UX... - - * Fixed the entire library so that all occurrences of ace_log_msg - are changed to use the ACE_LOG_MSG macro. This macro has magic - properties that should greatly simplify the effort required to - compile ACE robustly on platforms with lame C++ compilers... - - * libsrc/Log_Msg/Log_Msg: Finally got my act together with respect - to thread-specific data and the ACE_Log_Msg class. The new - version can be conditionally compiled such that it won't use the - ACE_Thread_Specific smart-pointer wrapper mechanism unless the - platform supports thread-specific storage and threads. This - will make life much easier for lame C++ compilers that can't - handle static data member templates correctly... - - * apps/Name_Server/{client,server}/lib/Makefile (LIBS): Added a - reference to -lACE in the Makefiles of the ./lib directories in - order to get GCC to work correctly... - - * Added a bunch of fixes courtesy of Bill Lear - to make ACE compile more cleanly - with GNU GCC 2.7.x. - -Sat Nov 18 11:27:40 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Misc/Trace.C: Fixed up the ACE_Trace class so that it - will compile better on platforms that don't support - thread-specific storage. The trick was to make a new Singleton - called ACE_Nest_Depth and then conditionally compile it - according to whether the platform supports thread-specific data - or not! - - * include/makeinclude/platform_sunos5_g++.GNU: Added the new - config file that should allow ACE to build correctly with GCC - 2.7.x. Todd L. Montgomery deserves a big - round of applause for getting this stuff to work! If I had a - budget, I'd give him a raise ;-) - - * libsrc/Misc/Set.C (remove): Tightened up the semantics of all - the *Set::remove() methods so that they return 1 if they - succeed, 0 if the item isn't in the set, and -1 if they fail. - Thanks to Tim Harrison for noticing the inconsistencies. - -Fri Nov 17 01:34:51 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Logger/Reactor_Logger: Fixed up this example app so that it - would compile with GNU G++ correctly. There was a problem with - the order of include files! Thanks to Todd L. Montgomery - for reporting this. - - * libsrc/ASX/Module.C (writer): Fixed ACE_READER so that it is - properly qualified with ACE_Task_Flags::ACE_READER. Thanks to - Neil Cohen (nbc@metsci.com) for finding this! - - * apps/Gateway/Gateway/Routing_Entry: Replaced ACE_Fixed_Set with - ACE_Unbounded_Set to get around the seemingly endless problems - with HP/UX... - - * libsrc/Misc/Set: Fixed a braino in ACE_Unbounded_Set, where I'd - forgotten to define cur_size_. Thanks to Todd L. Montgomery - for reporting this. - - * libsrc/Connection/Acceptor.C: Change the #undefs of the - shorthand names PA_AC_1, PA_AC_2, and PA_AD in - libsrc/Connection/Acceptor.C to PR_AC_1, PR_AC_2, and PR_AD - (same as in Connector.C and Strategies.C). Thanks to - Dieter Quehl for reporting this. - -Thu Nov 16 02:14:22 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Misc/Trace: Fixed the ACE_Trace stuff by making the - "nesting_indent_" a static data member. This will undoubtedly - break some lame C++ compilers, but it's easy enough to remove - this stuff via conditional compilation using the ACE_NTRACE - #define in ./include/ace/config.h. - - * libsrc/Threads/Thread_Specific.C (cleanup): Under no - circumstances should ACE_Thread_Specific be allowed to - called ACE_Trace. Otherwise, chaos will result! - - * apps/Name_Server/{client,server}/tests/Makefile: Switched the - order of the -lACE and -lName* so that -lACE came *afterwards* - in order for the SGI linker to pick up the symbols correctly. - - * libsrc/Reactor/Signal: I'd accidentally put the "dump" methods - in the *.i file rather than the *.C file. This was causing - problems for G++. - - * libsrc/ASX/Task: Changed all "Q_" prefixes to "ACE_" prefixes in - order to work around a bug with HP/UX... - - * Recompiled everything on SunOS 4.x with SunC++ 4.0.1. It seems - to work! - -Thu Nov 16 18:05:03 1995 Tim H. Harrison (harrison@tango.cs.wustl.edu) - - * I moved around some class declarations so that g++ can properly - instantiate templates for ACE_Token_Collection and - ACE_Token_Manager. - -Wed Nov 15 00:26:40 1995 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * The token library should now compile on platforms which do not - support threads. All token components will be compiled into the - library, but use null mutexes and condition variables. The - remote mutex library shall run properly on single-threaded - platforms, so it compiles as usual. - -Wed Nov 15 01:05:38 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Fixed a bunch of minor problems with the SGI port. Things - should work now on IRIX 5.3! - - * man/man3: Completely regenerated all the manual pages to - reflect all the recent updates. - - * libsrc: Added ACE_TRACE macros to every single method in ACE! - This will help with debugging... - -Wed Nov 15 00:26:40 1995 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * The token library should now compile on platforms which do not - support threads. All token components will be compiled into the - library, but use null mutexes and condition variables. The - remote mutex library shall run properly on single-threaded - platforms, so it compiles as usual. - -Tue Nov 14 01:58:47 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/CORBA: Added a new test to illustrate the - ACE_MT_CORBA_Handler. - - * libsrc/ASX/Task.C (ACE_Task_Exit): Fixed a niggling problem with - ACE_Task_Exit. Originally, if a thread exited via an implicit - ACE_Thread::exit() (i.e., "falling off the end of the - ACE_Task::svc_run function) then the ACE_Thread_Control on the - thread stack would automatically unregister the thread from the - ACE_Thread_Manager. However, this did *not* occur if a thread - explicitly called ACE_Thread::exit() since in that case the - destructor for ACE_Thread_Control never got called. The - solution to this is a trivial change to ACE_Task_Exit, which now - maintains an instance of ACE_Thread_Control internally, which - will automatically be released when the thread-specific - thread-exit-hook destructor gets called to cleanup upon thread - exit. Since this happens regardless of whether the thread - terminates implicitly or explicitly the ACE_Thread_Manager will - always be able to clean up it's internal resources (unless the - process exit()s, which is a whole different issue... ;-)). - - * Changed all occurrences of ACE_CORBA_Handler to - ACE_ST_CORBA_Handler. Now we've got two types of - CORBA_Handlers: single-threaded (ST) and multi-threaded (MT). - Take a look at ./apps/Orbix-examples/Event_Comm/{Supplier,Consumer} - for an example of how to leverage this in a portable manner! - - * libsrc/CORBA/CORBA_Handler: Totally redesigned the ACE - CORBA_Handler stuff so that it now uses the Singleton pattern - explicitly, rather than using the half-baked static method - version... Changed the test code to reflect this update! - - * libsrc/CORBA/CORBA_Handler.C (activate_service): Changed the - check so that if == 0 then we don't try to do a - putit (previously, this check used , which is less - useful...). - - * libsrc/CORBA/CORBA_Handler.C (activate_service): Removed the - flag from the constructor so that we can - make the CORBA_Handler and the MT_CORBA_Handler equivalent. - - * include/ace/sysincludes.h: Added a new macro called - ACE_THREAD_EXIT_HOOK that enables application threads - (including the main thread) to register a Task * who's - close method will automatically be called when the thread - exits, either implicitly (by falling off the end) or explicitly - (by a thread calling ACE_Thread::exit ()). - - * libsrc/ASX/Task: Moved ACE_Task_Exit into the interface part of - ACE_Task so that Irfan can maybe use this in his stuff ;-). - - * libsrc/Misc: Incorporated the ACE_Date_Time class into the - release. This is an *interface* for a system independent - representation of date and time. Implementation will follow... - - * libsrc/CORBA: Added a new MT_CORBA_Handler, which makes it - very straightforward to integrate the ACE_Reactor with - multi-threaded (MT) Orbix. - - * libsrc/Threads/Token.C: Yow, fixed a dumb problem in Tokens.C - where I was failing to include the *.i file if we weren't - compiling with inlining on!!!! - -Mon Nov 13 01:13:37 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/ASX/Message_Block: Added several new methods to - Message_Block to allow users to access and set various flags. - Thanks to Alex V Maclinvosky for - suggesting this and providing a prototype implementation. - - * include/ace/sysincludes.h: Added a new macro called ACE_NDEBUG - that can be used to toggle support for "live object dumping". - If this macro is enabled then - - * libsrc/Misc/Dump.h: Added support for "live object dumping" into - ACE. This technique is implemented with the "External - Polymorphism" pattern described in a paper available at - http://www.cs.wustl.edu/~schmidt/EuroPLoP-96.ps.Z. - - * libsrc/Threads: Added new classes called *_Process_* and - *_Thread_* for ACE_RW_Mutex, ACE_Barrier, ACE_Condition, and - ACE_Semphaore. This will allow programmers explicitly state the - scope of their locks more explicitly and will also facilitate - portability to Windows NT... - - * libsrc/Threads: Updated the constructors of all the Synch and - Synch_T classes to take an option const char * called "name." - At the moment, this doesn't do anything, but when we port to - Window NT it will be used to ensure that we can name our - process-global synchronization objects. - - * libsrc/Threads/Synch: Added a new tryacquire method to - ACE_RW_Mutex to be consistent with acquire and release... - - * libsrc/Threads/Synch.C (ACE_Mutex): Added a new "name" parameter - to an ACE_Mutex in order to support process-semantics on NT... - - * include/ace/sysincludes.h: Added a #define for EDEADLK in case - some systems don't support it (this is needed by the new - ACE_*_Token stuff). - -Sun Nov 12 14:17:01 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Name_Server: Modified the client and server test programs - so that they can both be linked statically and/or dynamically. - If svc.conf is present then dynamic linking is used, otherwise - static linking is used. This makes it much easier to test!!! - - * apps/Name_Server/client/lib/Naming_Context.C (local): Changed - things a bit so that if our server host name is "localhost" then - we assume we are local no matter what... - - * apps/Name_Server: Moved directories around a bit so that all the - tests and libs for the client/server portions of the - ACE_Name_Server build correctly... - - * apps/Name_Server/server: Replaced the ad hoc Name_Acceptor and - Name_Handler to use the official ACE_Acceptor and - ACE_Svc_Handler... This cleans up the code considerably... - - * libsrc/Threads/Synch: Added a new wrapper for the the UNIX file - locking mechanism called ACE_File_Lock. This has the same - interface as the other locking mechanisms (e.g., ACE_Mutex and - ACE_Semaphore). Therefore, it can be used in the ACE_Guard - class! - -Sat Nov 11 13:53:48 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Shared_Malloc/Memory_Pool: Improved MMAP_Memory_Pool so - that it will be smarter about remapping the file if we aren't - trying to force a fixed addr to be used for the mapping. In - particular, if we *aren't* forcing a particular address, the new - solution will be more flexible and allow the OS to determine - where to remap the memory should we need to grow the backing - store and the mapping range... - - * libsrc/Misc/Set: Implemented a simple version of the - Unbounded_Set class and its iterator. - - * libsrc/Misc/SString: Changed all the implementations of methods - in SString classes to use new/delete rather than - strdup()/free(). - - * apps/Name_Server/client/Name_Proxy: Changed rcv_reply() to - recv_reply(). - - * apps/Name_Server/client/Name_Proxy: Modified ACE_Name_Proxy so - that the constructor and open take an ACE_Synch_Options. - - * apps/Name_Server/client/Name_Options.C (ACE_Name_Options): Added - a default for the Name_Space directory called - (ACE_DEFAULT_NAMESPACE_DIR) to the testconfig.h file... - -Sat Nov 11 00:24:37 1995 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * tests/Tokens/test_token_manager/test_token_manager.C: The token - manager has a working deadlock detection algorithm. - ACE_Local_Mutex uses this to report deadlock situations. - Changes were made to ACE_Local_Mutex to fix a couple bugs which - were causing deadlock. Also, a new test application has been - added to test deadlock detection using the local mutex. - -Fri Nov 10 17:16:06 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Mem_Map/Mem_Map.h: Changed the type of from - long to size_t. - - * tests/Threads/test_thread_manager.C (main): Added a main() for - the case when there's - - * tests/ASX/UPIPE_Event_Server/event_server.C (main): Fixed a - typo that was causing problems on SunOS 4.x. - - * tests/Service_Configurator/IPC-tests/client/local_spipe_client_test.C: - added #include "ace/Log_Msg.h" (why was this working?!). - - * include/makeinclude/rules.lib.GNU: Changed the order of operations - in rules.lib.GNU from - - $(AR) $(ARFLAGS) $@ $? - -$(RANLIB) $@ - -chmod a+r $@ - - to - - $(AR) $(ARFLAGS) $@ $? - -chmod a+r $@ - -$(RANLIB) $@ - - to keep ranlib happy on SunOS 4.x. - - * apps/Time_Server: Added a Makefile - - * include/ace/sysincludes.h: Removed the include - since it was causing major problems on SunOS 4.x... - - * apps/Name_Server/Naming_Context.C: Fixed up a couple of problems - with casts. Thanks to Jack Erickson for - pointing this out. - -Thu Nov 9 15:49:40 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Synch_T: moved Atomic_Op from ./Misc to ./Threads - and merged it into the Synch_T files. This makes more sense as - a place to put it... - - * libsrc/Misc/SString.C (operator +=): Fixed a typo that would - have caused mistakes when memcpy() was used. Thanks to Prashant - Jain for noticing this. - -Wed Nov 8 22:36:51 1995 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * libsrc/Reactor/Reactor.C (TOKEN_GUARD): The reactor now uses the - TOKEN_GUARD macro. The Reactor can now be conditionally - compiled with ACE_REACTOR_HAS_DEADLOCK_DETECTION to use the new - ACE_Local_Mutex in conjunction with the ACE_Token_Manager to - detect deadlock. The deadlock detection algorithm has not yet - been implemented, but the hooks are now in place. - - * libsrc/Tokens: This subdir includes ACE's new Token library. - Check out libsrc/Tokens/README for more info. - - * tests/Tokens: There are a couple test applications for the new - Token library. See tests/Tokens/README for more info. - - * apps/Token_Server: This directory contains some new client - interfaces to the old ACE TokenServer, now Token_Server. There - are also some example use cases included in this directory. As - always, see apps/Token_Server/README for more info. - -Wed Nov 8 00:14:55 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/IO_SAP: Added the new classes for IO_SAP from - Gerhard Lenzer (lenzer@csaserv.erlh.siemens.de). This - eliminates UNIX I/O-specific features from ACE. - - * libsrc/Misc/Set: Added a new find() method to each of the - ACE_*_Set classes... - - * include/ace/sysincludes.h (ACE_ALLOC_HOOK_DECLARE): Changed - enum __Ace { __ACE } to struct __ACE {}. I think this - will cause less problems with M.I... - - * libsrc/ASX/Message_Block: Added a new "allocator" parameter to a - Message_Block. This allows the memory stored by a Message_Block - to come from someplace besides the normal heap (e.g., a shared - memory segment!). - - * libsrc/ASX/Message_Block.C (ACE_Message_Block): Yow, fixed a bug - in the destructor where ACE_BIT_ENABLED was being used in place - of ACE_BIT_DISABLED! I think this was causing a memory leak... - - * libsrc/Reactor/Reactor: added a pair of methods that allow a - thread to set/get the notion of who "owns" the event loop. Only - the owner of the loop can do a handle_events() call. Also - changed things so that the requeue_position() are available for - both threaded and non-threaded implementations (just to have a - uniform interface...). - - * libsrc/ASX/Message_Block: added a new constructor and a new - init() method that just assume ownership of a char * passed - as the parameter. Note that this does *not* set any other - fields in the Message_Block and is only used to ferry around - totally opaque data in the Message Block! - -Tue Nov 7 00:52:15 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/Log_Msg/test_log_msg.C (main): Added some new tests to - make sure that op_status() and errnum() work on ace_log_msg. - Thanks to Tim Harrison for these tests. - -Mon Nov 6 12:55:46 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Thread_Specific: Changed a couple of places in - the Thread_Specific code so that key_ is initialized to 0 and - the ts_obj * is initialized to 0. If these *aren't* 0 then - weird bugs happen on Solaris... Thanks to Tim Harrison for - noticing this and suggesting the fix! - - * libsrc/Threads/Synch_T: Added an accessor method to obtain - the underlying mutex within ACE_Condition. - - * libsrc/Threads/Synch.C (ACE_Process_Mutex): Added a dummy - argument of type const char * to ACE_Process_Mutex. This is in - anticipation of the info required in Windows NT to support a - named process-wide Mutex. On UNIX, this argument is ignored... - -Fri Nov 3 19:02:54 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/SOCK_SAP: Back from C++ World... Fixed a couple - of typos in SOCK_Dgram_Bcast and SOCK_CODgram that included the - *.i files multiple times... Thanks to Alex V Maclinvosky - for reporting this. - -Tue Oct 31 02:12:13 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Reactor: Modifed the MT_SAFE Reactor so that the - its open() method keeps track of which thread originally created - it. This thread is then considered the "owner" of the Reactor. - If a different thread tries to run the handle_events() method - then an error is returned. - - * libsrc/ASX/Task.C: Added a "group id" field to the ACE_Task. - This can be used to suspend and resume a group of tasks - atomically. Also added default suspend() and resume() methods - that do just that! - - * libsrc/Reactor/Reactor: Made the open() method - thread-safe. Thanks to Detlef Becker (beckerd@erlh.siemens.de) - for pointing out the need for this. - -Mon Oct 30 00:02:53 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Shared_Malloc/Memory_Pool.C (ACE_MMAP_Memory_Pool): - Made it possible to configure the ACE_MMAP_Memory_Pool with a - (backing_store_) file name so that it is possible for multiple - processes to share one wellknown file, as well as to have - multiple pools per process. Check out the - ./tests/Shared_Malloc/test_malloc.C file for an example of how - this works (try the -p -e -L10000 -t3 options). - - * libsrc/Reactor/Reactor: Moved handler_i into the *.C file to - avoid problems with inline functions on HP/UX. - - * libsrc/Misc/SString: Added a new class called ACE_CString. This - class is similar to ACE_WString (which has "wide character" - size), though CString has regular "char" size. Note that both - of these classes are "true" string classes, unlike ACE_SString, - which is a very simple string class that is only to be used for - very specific purposes... - - * libsrc/Shared_Malloc/Memory_Pool.C (acquire): Fixed an - "off-by-one" error in ACE_MMAP_Memory_Pool::acquire() that was - causing an extra byte to be written to the backing store file... - This was causing the ./tests/Shared_Malloc/test_malloc.C program - to fail when -p was given. After this fix the test works - again... (thank God!). - -Sun Oct 29 22:43:25 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Shared_Malloc/Malloc: Added two new classes: - ACE_Allocator and ACE_Allocator_Adapter. ACE_Allocator uses - inheritance and dynamic binding to provide extensible mechanisms - for allocating and deallocating memory. ACE_Allocator_Adapter - implements the Adapter pattern to enable ACE_Allocator to be - used with instantiations of the ACE_Malloc<> template class. - -Sat Oct 28 13:51:07 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/ASX/Event_Server: Added a new directory called - UPIPE_Event_Server, which tests a version of the Event_Server - that is instantiated with ACE_UPIPE_* IPC mechanisms, - rather than by the ACE_SOCK_* mechanisms. - - * libsrc/IPC_SAP/Addr: Created a new file called UPIPE_Addr.h. - This file contains a typedef of ACE_SPIPE_Addr to - ACE_UPIPE_Addr. The purpose of doing this is to "logically" - decouple the ACE_UPIPE* classes from the ACE_SPIPE* classes - (even though they share the same *physical* representation at - this point...). - - * libsrc/IPC_SAP: Fixed a small bug in TLI_Connector.connect() and - SOCK_Connector.connect() that failed to set the - new_stream::handle_ to ACE::INVALID_HANDLE when the connection - failed. Thanks to the ever-astute Mark Patton - (mark_patton@tx72.mot.com) for noticing this. - -Thu Oct 26 15:08:22 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/Threads: created a new test program called - test_thread_manager.C that tests the new semantics for managing - groups of threads. - - * libsrc/Reactor/Signal.C (ACE_Sig_Action): Added a new method - that allows me to create a Sig_Action object that contains both - the handler and the signal to register for. This handler is - register to handle the signal in the constructor of the - object... - - * libsrc/Threads/Thread_Manager: enhanced the Thread_Manager to - add support for operations (i.e., suspend, resume, kill) on a - group of threads. - - * libsrc/Threads/Thread_Manager: Added a new method that allows - the Thread_Manager to resize itself automatically when it's - internal table gets full. - - * libsrc/Threads/Thread_Manager: Updated the return value of - Thread_Manager::spawn() and Thread_Manager::spawn_n() so that - they return -1 on failure *and the group id* on success. - Originally, they returned 0 on success, but this new return - value is more useful since it can be used to control groups of - threads atomically. - -Wed Oct 25 01:03:32 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Name_Server: Began integrating the newly donated name - server into ACE. There are a number of dependencies on - RogueWave that must be removed, but things are looking good so - far. - - * libsrc/Misc/Set: Changed the name of ACE_Unordered_Set to - ACE_Fixed_Set to be consistent with the ACE Stack classes... - - * libsrc/Misc/Set: Added new ACE classes called ACE_Unbounded_Set, - ACE_Bounded_Set, ACE_Unbounded_Set_Iterator, and - ACE_Bounded_Set_Iterator to deal with ACE name service - stuff. - - * libsrc/Misc/SString: Added a new class called ACE_WString that - gives a very simple "wide-character" string representation for - ACE. This is needed for the ACE name service stuff. - - * libsrc/Misc/SString.C (operator =): Fixed this so that ::strdup - is matched up with ::free, rather than with delete... - - * libsrc/Log_Msg/Log_Msg.C (log): Updated the ACE_Log_Msg class to - store an ostream * in thread-specific storage. This can be used - in conjunction with the dump() method on each ACE class, as well - as with the ACE_ERROR and ACE_DEBUG logging macros. - -Tue Oct 24 00:19:13 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added a definition of the dump() method to every class in ACE in - anticipation of the changes requested for Siemens. - - * Changed all occurrences of ACE_Signal_* to ACE_Sig_* to make the - ACE naming of signal handling wrappers consistent. - - * libsrc/Threads/Thread: Fixed some obscure bugs with the way that - ACE_Thread was compiling on platforms that don't support - threads. - - * include/ace/config-irix*.h: Removed all TLI support from the SGI - platform. It seems to be totally screwed up from the tests that - I've run and there's no sense in bending over backwards to - support an IPC API that is brain-damaged to begin with... - - * apps/Logger/Service_Configurator_Logger/Thr_Server_Logger: Fixed - up the code so that the Thr_Logging_Server stuff will compile - correctly even for platforms that lack threads! - - * libsrc/Connection/Strategies: Added new strategies that provide - Singleton creation and Process concurrency policies. - - * libsrc/Connection/Connector.C (handle_close): Make sure that all - pending timer objects are removed from the Reactor's timer queue - when a Connector shuts down. In addition, make sure to remove - and delete all dynamically allocated ASTs, as well. Thanks to - Karl-Heinz Dorn (kdorn@erlh.siemens.de) for suggesting this. - - * libsrc/Threads/Thread_Manager.C (wait): Modified wait() so that - it now takes an ACE_Time_Value *, which can be used to wait - until all threads terminate or a timeout occurs... - - * libsrc/Threads/Thread_Manager: Moved Thr_Descriptor from within - the ACE_Thread_Manager class to become ACE_Thr_Descriptor at - file scope. This is in anticipation of the cool new thread - manager stuff on the way... - - * libsrc: Updated every class in ACE to include a "dump" method - with the signature "void dump (void);" This method soon will be - tied into the ACE_Dump mechanism to allow all live objects in - ACE to have their state dumped automagically on-demand. This is - useful for debugging and tracing etc. - - * libsrc: Updated every class in ACE to include a "Alloc hook." - This hook will enable all ACE classes to be allocated from a - particular memory pool. - - * include/makeinclude/rules.local.GNU: fixed the clean target to - delete the *.rpo files (else gcc -frepo can get some crazy - errors) and combines all rm-commands for the target realclean - into one command (in some cases the last two lines do not have - any files to delete, in which case rm produces an usage - message). Thanks to John Huchinson (hutchiso@epi.syr.ge.com) - for the patch. - - * libsrc/IPC_SAP/Addr/INET_Addr: Fixed all the uses of gethost* - and getserv* to use the reentrant get*_r functions if - ACE_HAS_REENTRANT_FUNCTIONS is set and ACE_MT_SAFE is set. - Thanks to Bill Tang for suggesting this. - - * libsrc/Misc/OS: Started adding support for the POSIX *_r - functions to the OS class. - - * include/ace: Added a new #define called - ACE_HAS_REENTRANT_FUNCTIONS. This indicates that the platform - supports reentrant functions (i.e., all the POSIX *_r functions - like gethostbyname_r). - -Mon Oct 23 21:15:50 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/makeinclude/platform_irix5.3.GNU (LIBS): Removed the - link of the nsl lib since it seems not to be present on this - platform. Thanks to Karel Zuiderveld - for noticing this. - - * libsrc/IPC_SAP/Addr/INET_Addr.i (operator ==): Enhanced the - semantics of comparison to check both the port number and IP - address. Thanks to Mark Patton (mark_patton@tx72.mot.com) for - suggesting this. - -Thu Oct 19 00:10:28 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/Addr/INET_Addr.C (set): Fixed a stupid bug that - failed to set errno appropriately if things go wrong with this - method. Thanks to Mark Patton (mark_patton@tx72.mot.com) for - noticing this! - -Sat Oct 14 12:07:16 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Thread_Manager: Modified the Thread_Manager so - that even in the case where we are compiling for non-MT systems - the Thread_Manager still has the same method interface (all of - which are no-ops). - -Wed Oct 11 00:12:57 1995 Douglas C. Schmidt (schmidt@mambo.cs.wustl.edu) - - * Finished commenting all the classes in ACE. Updated all manual - pages accordingly. - -Fri Oct 6 14:17:17 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/ASX/Event_Server/Event_Server: Changed - - ACE_SOCK_Acceptor &sa = (ACE_SOCK_Acceptor &) *this->acceptor_; - - to - - ACE_SOCK_Acceptor &sa = this->acceptor_->acceptor(); - - Thanks to Dieter Quehl (quehl@erlh.siemens.de) for suggesting - this. - -Thu Oct 5 00:22:56 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/ASX/Map_Manager: Added a new find() method to the - Map_Manager. This method only checks for the existence of an - EXTERNAL_ID, and doesn't return the INTERNAL_ID. - - * Introduced the new "trait"-based *_Connector, *_Acceptor, and - *_Stream interfaces for all the IPC_SAP classes. Basically, for - each class like - {SOCK,TLI,SPIPE,etc,}_{Acceptor,Connector,Stream}, there's now a - typedef for the appropriate type of ACE_*_Addr subclass and the - appropriate type of ACE_*_Stream class. For example, here's - what's in ACE_SOCK_Acceptor (same goes for ACE_SOCK_Connector): - - class ACE_SOCK_Acceptor - { - public: - // ... - - // = Traits. - typedef ACE_INET_Addr PEER_ADDR; - typedef ACE_SOCK_Stream PEER_STREAM; - }; - - Once C++ compilers can grok template typedefs correct, this new - approach will allow much greater simplification of code, so that - template classes like - - template - class ACE_Acceptor { /* ... */ - virtual int open (const PEER_ADDR &); - }; - - that are currently used like this: - - ACE_Acceptor acc; - - can be replaced with - - template - class ACE_Acceptor { /* ... */ - virtual int open (const PEER_ACCEPTOR::PEER_ADDR &); - }; - - that are used like this: - - ACE_Acceptor acc; - - i.e., the ACE_SOCK_Acceptor maintains a "trait" that the - ACE_Acceptor uses to determine the appropriate addr. This is - more concise and less error-prone than the current scheme that - requires you to pass into the ACE_INET_Addr separately (ugh). - - Note that the trick to making all this work is to typedef the - PEER_ADDR trait into the ACE_SOCK_Acceptor class, as follows: - - class ACE_SOCK_Acceptor { - public: - typedef ACE_INET_Addr PEER_ADDR; // Trait... - }; - - Unfortunately, none of the C++ compilers (e.g., SunC++ 4.0.1, - G++ 2.7.0) support this stuff yet... Therefore, I've added - a set of macros that that will toggle back and forth between - whichever approach works, depending on the setting of - ACE_HAS_TEMPLATE_TYPEDEFS. Hopefully, over time compilers will - support this stuff correctly and life will become easier. - - * libsrc/ASX/Message_Queue: Changed all occurrences of the S_MUTEX - and S_CONDITION macros to ACE_SYNCH_MUTEX and - ACE_SYNCH_CONDITION in order to conform to the new ACE namespace - control conventions. - - * libsrc/Connection/Acceptor: Modified the Acceptor class to split - it into two classes: ACE_Acceptor (which implements a very - simple, very concise version of the Acceptor pattern, without - all the extra strategy mechanisms, etc.). These strategies have - now been factored out into a new class called - ACE_Strategy_Acceptor. The point of these changes is to "keep - simple things simple, but enable powerful extensions when - necessary." All the test programs that utilized the earlier - strategy version of the Acceptor have been updated to the the - Strategy_Acceptor instead. - - * libsrc/Connection/Connector: added two new protected methods, - connect_svc_handler() and activate_svc_handler(). These methods - allow subclasses to override the Connector's strategies for - connection establishment and concurrency. In addition, it makes - the pattern much easier to explain via the Connector pattern and - also is more similar to the Acceptor. - -Wed Oct 4 18:45:58 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Orbix-Examples/Event_Comm: Fixed the examples in this - directory so that they compile with the new ACE. - -Tue Oct 3 17:33:46 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/makeinclude/rules.nested.GNU: Added support so that - ACE can now be built in parallel using the -jN option of GNU - make. To accomplish this, just type - - % make MAKEFLAGS=-j2 - - on the command line and the "-j2" flag will be passed through to - the make hierarchy. Once the SunC++ compiler supports parallel - makes correctly (Template.DB causes problems) this will allow me - to tke advantage of my new dual-CPU SPARCstation 20!!! - -Mon Oct 2 13:34:14 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection: Cleaned up some of the code related to - Time_Values * by adding a new method call time_value() to the - ACE_Synch_Options class. - - * libsrc/Service_Config/Service_Record: Changed things a bit so - that we don't have to include "ace/Stream.h" in - Service_Record.h, but instead use forward decls of the - appropriate types. This breaks a circular dependency that was - causing problems for GNU C++. Thanks to John Hutchinson - (hutchiso@epi.syr.ge.com) for finding this problem. - -Sat Sep 30 13:45:08 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Changed all uses of typedef PARENT to inherited, which is less - obtrusive. - -Fri Sep 29 01:33:54 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Misc: Completed the new OS class, which will be used - shortly to remove all direct UNIX system calls in ACE. - - * libsrc: Completed redocumented the header files for almost all - of ACE. The goal was to document all the methods in all the - classes. This has most been achieved (only a few minor changes - remain). The result is *much* better manual page entires in - ./man/man3, as well as much more consistent header files and - overall documentation for ACE. - - * libsrc/Reactor/Reactor: Changed all uses of get() to - handler_i(). Also changed the check_connections() method to - check_handles(). Note that all these changes are invisible to - apps... - -Thu Sep 28 01:22:36 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/Addr/SPIPE_Addr: Changed all occurrences of - {get,set}_user_id() and {get,set}_group_id() to user_id() and - group_id() in order to be more consistent with other parts of - ACE. - - * libsrc/ASX/Task.C (module): Modified the implementation of - several Task helper methods (e.g., sibling()) so that they don't - crash if there is not Module associated with the Task. - - * libsrc/ASX/Stream: Removed the sync_ data member from the - private part of Stream since it didn't seem to be used for - anything. - - * libsrc/ASX/Map_Manager.C (bind): Changed the type of the INT_ID - to bind() from INT_ID to const INT_ID &. - - * libsrc/IPC_SAP/Addr/Addr: Moved some methods around in the *.i - file to the *.C file in order to be smarter about inlining. - - * libsrc/Misc/Auto_Ptr.h: Added a new pair of classes called - "auto_ptr" and "auto_array_ptr". These implement the ANSI/ISO - C++ standard auto_ptr mechanism, which helps to write - exception-safe code. The code is based on material from Jack - Reeves (jack@fx.com) and Dr. Harald M. Mueller - (mueller@garwein.hai.siemens.co.at). - - * libsrc/Threads/Synch_T.h (ACE_Null_Condition): Changed the - behavior of Null_Condition::{signal,broadcast} so that they - return 0 rather than setting errno = ETIME and returning -1. - -Wed Sep 27 00:16:01 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Synch: Fixed a bug with class ACE_Barrier: count_ - wasn't being set properly. - - * tests/Threads/test_barrier.C (main): Fixed a stupid bug - in the ACE_Barrier -- the main function was exiting, thereby - destroying the barrier! - - * tests/IPC_SAP/{SOCK,TLI}_SAP: Added test cases to exercise the - new reuse_addr feature of SOCK_Connector and TLI_Connector. - - * libsrc/IPC_SAP/{SOCK,TLI}_SAP/{SOCK,TLI}_Connector: Implemented - the new behavior for reusing a local address. Also fixed a few - error cases that would have lead to descriptor leaks. - - * libsrc/IPC_SAP/SOCK_SAP/SOCK.C (open): Modified a few return - values and comparisons to ease the transition to WIN32. - - * libsrc/ASX/Task.C (ACE_Task): Changed the behavior of - Task::activate() so that it uses the - ACE_Service_Config::thr_mgr() Singleton if no thread manager has - been associated with a Task when it becomes an active object. - - * libsrc/Service_Configurator/Service_Config: Added a new static - method to class Service_Config called thr_mgr(). This static - method behaves as a "Singleton" and provides a convenient - default thread manager that is available to all threads - throughout a process. - - * libsrc/IPC_SAP: Changed all the IPC_SAP/*_SAP/*_Connector.[hiC] - files and the Connection/Connector.[Chi] class in order to add - "reuse_addr" behavior consistent with the Reactor. This enables - the client to specify that the "local_addr" should be reused - (e.g., via SOCKREUSEADDR), even if its "2 minute wait" time - hasn't elapsed yet. The libsrc/Connection/Connector.[Chi] files - were also changed to support this new interface. - - * libsrc/Log_Msg/Log_Msg.C (log): Fixed a mistake in Log_Record - caused by the new thread-safe storage enhancement. The data - being logged was being rounded up incorrectly. Thanks to Daniel - Proulx (daproulx@qc.bell.ca) for reporting this. - - * libsrc/Reactor/Signal.i (operator): Made a minor change to the - definition of operator struct sigaction * to work around a bug - with the HP/UX C++ compiler (lame, lame, lame)... - - * libsrc/Service_Config: Changed all occurrences of - ACE_Service_Config::reactor (which was originally a globally - accessible public method of class ACE_Service_Config) to - ACE_Service_Config::reactor () (i.e., made the reactor a - Singleton implemented by a static method). This was long - overdue and will fix all sorts of niggling problems with order - of initialization since the reactor() method can do "lazy - creation" of Reactors now, i.e., create one the first time it is - referenced. In addition, changed the - ACE_Service_Config::svc_rep to ACE_Service_Config::svc_rep () in - the same manner. - - * Changed all occurrences of the form: - - *_Stream stream; - *_Connector con (stream, remote_addr); - - if (stream.get_handle () == ACE::INVALID_HANDLE) - ... - - To - - *_Stream stream; - *_Connector con; - - if (con.connect (stream, remote_addr) == -1) - ... - - which is cleaner and less error prone with respect to - UPIPE_Stream (which doesn't have a valid handle once it's - connected). - - * Changed all occurrences of get_handle () == -1 to get_handle () - == ACE::INVALID_HANDLE to help smooth the move to WIN32... - - * libsrc: Created a new directory called Shared_Memory and moved - the Shared_Malloc_MM and Shared_Malloc_SV classes from the - ./Shared_Malloc directory to here, where they are now called - Shared_Memory_MM and Shared_Memory_SV. This is a better - name/place for them since they never really had anything to do - with malloc in the first place! What remains the Shared_Malloc - is the Malloc.* and Memory_Pool.* classes, which are typically - used for truly shared malloc/free. - - * apps/Gateway/Gateway: added new logic to the Gateway to enable - it to specify which local port to bind() to. - -Tue Sep 26 21:17:29 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection/Strategies.C (open): Added a return 0; at the - end of the ACE_Thread_Strategy::open method. - - * tests/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.C: - Made CLI_Stream a template so that we don't have to worry about - multiple includes of classes... - -Mon Sep 25 01:41:27 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP: Revised the close() method of TLI_SAP and - SOCK_SAP so that they don't try to close down a handle that == - ACE::INVALID_HANDLE. - - * Changed all uses of ::free ((char *) ...) to ::free - (ACE_MALLOC_T (...)) to work around inconsistent prototype - problems with some compilers. - - * include/ace/sysincludes.h: Changed ACE_MALLOC_TYPE to - ACE_MALLOC_T which is a bit less verbose... - - * libsrc/Service_Configurator/Makefile (BUILD): Fixed the argument - to sed from -s (which is invalid) to -e (which is valid). - Thanks to Doug Ritter (dougr@guilder.datalytics.com) for - noticing this. Also used sed to do a more elegant fix on the - age-old problem of inconsistent prototypes for free() and - realloc()... - - * libsrc/IPC_SAP/UPIPE_SAP: Rewrote all the UPIPE_* classes to - remove any dependencies on class UPIPE. This class appears to - be unnecessary since it mimics the behavior of class SPIPE. To - simplify the behavior of the UPIPE_* classes, they now inherit - from the SPIPE_* classes where appropriate. - - * libsrc/IPC_SAP/UPIPE_SAP: Changed the semantics of the - UPIPE_Connector and UPIPE_Acceptor connection methods so that - they close down the SPIPE_Stream after a connection is - established successfully. This is important to conserve - descriptors. - - * libsrc/Misc: Created a new class called OS, which encapsulates - *all* of the UNIX system calls and library routines within a - single class. The rest of ACE will program only to the methods - in this interface, which will make it much easier to port to - other versions of UNIX (and WIN32!). - -Sun Sep 24 11:49:47 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/SOCK_SAP: Conditionally compile the LSOCK_* stuff - if the OS platform (e.g., Linux) doesn't support it. - - * Changed all occurrences of ACE_HAS_NO_... to ACE_LACKS_... in - all the config*.h files and the headers/source. This reads - better... - - * Changed all uses of (1) Acceptor::peer_acceptor_ to - Acceptor::acceptor(), (2) Svc_Handler::peer_ to - Svc_Handler::peer(), and (3) Connector::peer_connector_ to - Connector::connector() to make the code more abstract and - resilient to future changes. - - * include/ace/sysincludes.h: Added a new macro called - ACE_NEW_RETURN that provides a useful abstraction for - expressions involving operator new since we can change memory - allocation error handling policies (e.g., depending on whether - ANSI/ISO exception handling semantics are being used). - - * libsrc/Threads/Thread.C: Changed things a bit so that if - ACE_MT_SAFE == 0 then Thread::self() returns 1, regardless of - whether the platform supports threads. - - * Went through the entire library and (hopefully) made sure that - all calls to global system calls and library routines are - prefixed with "::". - - * libsrc/Misc/Get_Opt.C: Changed this class to use the Log_Msg - logging mechanism rather than stderr... - - * tests/Misc: Added a new test program to test the Profile_Timer. - - * tests/Reactor/misc: Added a new test program to test the - Handle_Set. - - * libsrc/Service_Configurator: Changed the error messages in - Svc_Conf.y and Svc_Conf.l to go to the ACE Log_Msg logging - mechanism rather than stderr... - - * libsrc/Connection/Acceptor: Modified the Acceptor and - Oneshot_Acceptor classes so that they take advantage of the new - ACE_Creation_Strategy, ACE_Accept_Strategy, and - ACE_Concurrency_Strategy components. This will make is easy to - define Acceptors that can be flexibly configured to use various - creation strategies (e.g., dynamic linking, singletons, dynamic - memory creation, etc.) for making Svc_Handlers. - - * libsrc/Connection/Svc_Handler: Added several new classes -- - ACE_Creation_Strategy, ACE_Accept_Strategy, and - ACE_Concurrency_Strategy -- that form the heart of the new - ACE_Acceptor implementation. These classes define the creation, - passive connection acceptance, and concurrency strategies - employed by the Acceptor factory when it receives a connection - from a client. - - * libsrc/Connection/Acceptor: Modified the implementation of the - Acceptor and the Oneshot_Acceptor. These classes are no longer - related by inheritance since they behave in fundamentally - different ways and sharing code was making it hard to write and - use these classes correctly. - - * libsrc/Misc/Misc: Moved the enum INVALID_HANDLE from IPC_SAP.h - to Misc.h since this is actually more general than just the - sockets stuff and we need to be portable to WIN32... Therefore, - any code that originally said ACE_IPC_SAP::INVALID_HANDLE should - now be ACE::INVALID_HANDLE. - - * Removed the ACE_OMIT_SERVICE_CONFIGURATOR flags. These are - annoying -- anyone who wants to subset ACE should be responsible - for doing this stuff. - -Fri Sep 22 22:36:33 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Thread_Spawn.C: Greatly simplified the - implementation of Thread_Spawn by leveraging the new class Task - semantics for activate(). Now, all the concurrency activation - mechanisms necessary to create active objects are associated - with a Task and all the Thread_Spawn needs to do is to define a - new make_svc_handler() Factory Method to create a SVC_HANDLER - and activate it! - - * libsrc/ASX/Task.C: Tightened up the semantics of Task::activate - (which turns a passive object into an active object, i.e., one - with its own thread). Now, if an object is activated more than - once it ignores the other requests, unless the force_active - parameter is enabled. Moreover, activate() now takes a - parameter that indicates the number of threads to allocate for - the Task. This makes it simple to have a "thread pool" - associated with a Task. - -Thu Sep 21 00:49:55 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/Connection: Updated the CPP-acceptor and CPP-connector to - use the underlying Acceptor and Connector patterns more - robustly. Also added new hooks to include a Service_Config - component so that integrating this with the ACE dynamic linking - scheme will be a snap! - - * libsrc/Connection/Acceptor.C: Revised the Oneshot_Acceptor to be - robust in situations where it isn't given a Reactor *... - - * apps/Logger: Fixed a couple of minor problems with *.i files - being included when __INLINE__ is set. This should help G++ - compiler ACE better... - - * libsrc/Reactor/Reactor: Enhanced the Reactor::notify() method so - that it takes both an Event_Hander * and a Reactor_Mask, which - it passes to the Reactor's main event loop thread via the pipe. - The event loop thread uses this mask to determine which method - to invoke. This new feature is due to the insight of Karl-Heinz - Dorn (kdorn@erlh.siemens.de). - - * libsrc/Connection/Connector: Fixed a braino in - Connector::handle_output, which was using ::getpeername() to - check whether a connection has been established with a peer. - Naturally, this only works for sockets, and doesn't work at all - for TLI or SPIPEs... - - * libsrc/IPC_SAP/Addr/SPIPE_Addr.C (set): Changed the return type - of this method to "int" in order to conform to the types - expected by the Acceptor/Connector patterns. - - * Removed all uses of the global scope "::" for all variables and - methods that are not UNIX system calls or library calls in - preparation to change over to the new OS class (requested by - Siemens). - -Wed Sep 20 14:39:08 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/SPIPE_SAP: Renamed the SPIPE_IO classes to - SPIPE_Stream to be consistent with the other parts of the ACE - library. Updated all parts of the library to reflect this - change. - - * tests/Service_Configurator: Moved the current contents of this - directory into a new directory called IPC-tests. Created a new - directory called Connection-tests where the dynamic linking - examples for Siemens will go. - - * libsrc/Reactor/Signal: Made a bunch of minor changes to support - signal handling on SunOS 4.x platforms. Thanks to Aniruddha - Gokhale for help with this. - - * libsrc/Threads/Synch.h: Modified the #ifdefs a bit so that - Synch_T.h gets included regardless of whether ACE_HAS_THREADS. - - * libsrc/Threads/Synch_Options: Added a new set() method to make - it possible to initialize the Synch_Options from outside the - constructor. - - * libsrc/Connection/Svc_Handler.C: Added checks within the - ACE_Svc_Handler so that if we are given a NULL Reactor we don't - crash! - - * libsrc/Mem_Map: Tidied up this class and added comments to the - header so that the class2man has something to generate manual - pages from! - - * libsrc/Misc/Misc: Added a new method called "round_to_pagesize", - which was previously in Mem_Map. This is a better place for it - since other parts of ACE (e.g., Shared_Memory) use it. - - * libsrc/Misc/Misc: Added a new method called "get_file_size", - which was previously in Mem_Map. This is a better place for it - since other parts of ACE might want to use it. - -Tue Sep 19 00:24:41 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released a beta version of ACE 3.3.1 for G++ testing. - - * libsrc/IPC_SAP/SOCK_SAP/SOCK_Dgram.C: Removed a stray INLINE - that was causing problems for G++. Thanks to E. Jason Scheck - for reporting this. - - * libsrc/IPC_SAP/Addr/INET_Addr: Improved the documentation for - this class and also added new semantics to the constructor and - set() method so that a "ip_addr:port_number" tuple can be given - as a single string (e.g., "1234:tango.cs.wustl.edu" or - "1234:128.252.166.57"). This is useful since it gives a uniform - interface for addressing for Internet domain, UNIX domain, and - SPIPE domain addresses... Updated the ./tests/Connection tests - to use this form (which is nice since now they are all very - orthogonal!) - - * tests/Connection: Created a whole new suite of tests that - exercise the connection patterns for all of the relevant IPC - mechanisms (e.g., SOCK_SAP, TLI_SAP, SPIPE_SAP, and UPIPE_SAP). - - * bin/clone.C: fixed the first #include so that it uses #include - "ace/sysincludes.h". Thanks to Alex V Maclinvosky - for noticing this. - -Mon Sep 18 01:52:07 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/ASX/Message_Queue.C (close): Fixed yet another problem - with variables being defined in for loops. G++ is good for - detecting this ;-). - - * libsrc/Threads: Moved all the template classes from Synch.* into - Synch_T.* in order to make it possible to compile templates with - G++. Thanks to E. Jason Scheck for suggesting - this. - - * libsrc/IPC_SAP/UPIPE_SAP: Make a number of changes to ensure - that all the UPIPE_SAP classes conform to the same interface as - all the other ACE IPC classes. - - * Changed all occurrences of THR_FUNC to ACE_THR_FUNC to protect - the global namespace better. - -Sun Sep 17 13:36:23 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/ASX/Message_Queue: Fixed a typo in these test programs - that caused a segfault since a vararg parameter was omitted on a - call to the Log_Msg::log() method. Maybe iostreams isn't so bad - after all... ;-) - - * apps/Logger/Service_Configurator_Logger/Thr_Server_Logger: fixed - a stupid error that was caused by some mods I made after ECOOP - to update the threaded logging server. When I changed the - Thr_Logging_Acceptor so that it no longer inherited from the - Logging_Acceptor I forgot to redefine the init() method... - - * man: Totally regenerated the ACE manual pages using the new - versions of the OSE tools provided by Karl-Heinz Dorn - (kdorn@erlh.siemens.de). - - * Changed all occurrences of MT_SYNCH and NULL_SYNCH to - ACE_MT_SYNCH and ACE_NULL_SYNCH, respectively. This is - consistent with the ACE naming conventions and had been an - oversight when I renamed everything earlier. - - * Fully built and tested ACE with the __INLINE__ flag enabled. - This will generate code with many small methods in the library - inlined. Had to fix a bunch of minor things to allow this to - work without compilation-order dependency problems. - - * libsrc: Made a bunch of changes to the way that header files are - included internally to ACE in order to break compilation-order - dependencies. This is necessary to support GNU G++'s lame - handling of templates. None of this stuff should affect - application code. - - * tests: Added a whole new slew of tests for the remaining parts - of ACE that weren't currently included in ./tests. This stuff - exercises ACE components like the Log_Msg logger and factors all - the #if defined (DEBUGGING) code out of the ./libsrc directory - tree and puts it in the ./tests directory tree, where it - belongs. - - * Changed all uses of the error macros LM_* to ACE_* in order to - avoid name collisions with other libraries, frameworks, and - toolkits. In addition, changed all uses of the error enumerals - LOG_ to LM_ in order to avoid a conflict with system #defines in - . - - In order to change these automatically, I used the following - UNIX command sequence: - - % find . -type f -print | xargs perl -p -i -e 's/LM_/ACE_/g' - % find . -type f -print | xargs perl -p -i -e 's/LOG_/LM_/g' - -Sat Sep 16 11:55:18 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/Threads: Added a new test for Thread_Specific storage. - - * Added a new platform/compiler configuration flag called - ACE_TEMPLATES_REQUIRE_SOURCE that must be set for compilers - (e.g., GNU G++) whose template mechanism must be able to - see the source code (i.e., the *.C files). Changed *lots* of - header files to enable this... Also had to change the - corresponding *.C files so that they wouldn't get included - twice... - - * libsrc/Connection: redid the implementation of Acceptor, - Connector, and Svc_Handler to get more control over the scope of - #defines like #define SH SVC_HANDLER, etc. - - * libsrc/Threads/Thread_Spawn: Totally redid the implementation of - Thread_Spawn to use the Acceptor class template. This greatly - reduces the amount of code to implement the Thread_Spawn! - - * libsrc/Threads/Thread_Spawn: Moved the Thread_Spawn - implementation into the ./libsrc/Threads directory rather than - in the ./libsrc/Service_Configurator directory since it deals - with threading and thus belongs in the other place. - -Fri Sep 15 00:25:51 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Token.i (tryacquire): Added a cast to fix passing - a const pointer to a function that was expecting a non-const. - Thanks to E. Jason Scheck for reporting this. - - * libsrc: Added a bunch of changes to enable G++ to compile ACE. - A lot of this involves moving around info in header files so - that templates can be dealt with using the relatively lame GNU - C++ repository scheme. Thanks to E. Jason Scheck - for all his help in this. - - * libsrc/Synch: created Synch_Options.C out of Svc_Handler.C, so - that Svc_Handler.C could be "template pure"; all the other files - were already separated. Thanks to E. Jason Scheck - for recommending this. - - * Makefile (clone): Added a tiny fix that solves a weird problem - that arises with symbolic links on HP/UX. Thanks to Jam Hamidi - (jh1@osi.com) for tips on how to fix this. - -Thu Sep 14 10:55:30 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Gateway/Gateway/Channel.C (route_message): Updated the main - routing code to check for whether a channel is_active() - (i.e., is actually connected) before trying to send messages - to it. This was originally done in the Set class iterator, but - I revised that to make it more reuseable and to workaround bugs - in the HP/UX compiler so I had to update the main code... - - * libsrc/Threads/Thread_Specific: Added a new method to called - ts_object () to class ACE_Thread_Specific that get the - thread-specific object for the key associated with this object. - Returns 0 if the data has never been initialized, otherwise - returns a pointer to the data. This is useful since now you can - query a thread-specific storage mechanism to see if there's ever - been a thread-specific object created *without* having to - actually create one if one hasn't been created yet! Thanks to - Detlef Becker (beckerd@erlh.siemens.de) for pointing this out. - - * include/makeinclude/platform_sunos5_sunc++_orbix.GNU (LIBS): - Changed the default compilation strategy for SunOS 5.x machines - to use -mt. This seems to be necessary to build robust - libraries that are thread-safe. Thanks to Phil Mesnier - and Chris Cleeland - for hounding me until I changed the - existing solution. If you *don't* want this behavior you need - to remove -mt from the platform_macros.GNU file and and remove - the ACE_HAS_THREADS and ACE_MT_SAFE flags, etc. from the - config-sunos5.*.h files. - - * libsrc/Shared_Malloc/Memory_Pool.C (ACE_MMAP_Memory_Pool): Added - a new parameter to the constructor called write_each_page that - if enabled forces a write to each page to ensure that space is - allocated from the file system (otherwise, we can end up failing - due to optimisitic resource allocation...). Thanks to Phil - Brooks for detecting this issue and - implementing a solution. - - * include/ace/sysincludes.h: Added #ifdef support for HP/UX, which - fails to properly wrap with an extern "C" block. - -Mon Sep 11 01:39:35 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection/Connector.C (handle_input): Changed the call - to Svc_Handler::close() to accept the default value of 0 rather - than -1... Thanks to Mark Seaborn - for noticing this. - - * libsrc/Connection: Changed all uses of ADDR to PEER_ADDR to - avoid a name clash in Linux... Thanks to James Morris - for finding this. - -Sun Sep 10 03:56:18 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Synch: Added support for "barrier - synchronization" to ACE in the form of ACE_Barrier. Thanks to - Bruce Worden (bruce@betsy.gps.caltech.edu) for suggesting this - and pointing me in the right direction. - - * tests/Threads: Added a test for the new barrier synchronization - mechanism. - -Sat Sep 9 11:58:16 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Reactor: Changed Reactor::max to Reactor::max3 to - avoid problems with conflicting names of macros in Sun header - files! - -Mon Sep 4 14:34:52 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Signal: The new ACE_Signal_Handlers mechanism - appears to be working! There's a test in ./tests/Reactor/misc - called test-signal.C that illustrates how all this works. - - * libsrc/Reactor/Signal: Added several new methods to - ACE_Sig_Action to make life easier to implement the new - ACE_Signal_Handler code... - - * libsrc/Reactor/Signal.C (ACE_Sig_Action): Changed the order of - the arguments to the ACE_Sig_Action constructor. It's almost - always the case that you want to vary the SignalHandler, but - only rarely do you want to vary the mask or flags. By - reordering this, it's easier to get the correct default values - without adding extra junk... - -Mon Sep 4 01:11:29 1995 Tim Harrison (harrison@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/SOCK_SAP/SOCK_Dgram_Multicast: added support to - allow a port to be reused for multicast sockets. This is useful - if you are multicasting to multiple processes, some of which are - on the same host! - - * libsrc/ASX/Map_Manager: Fixed an odd bug that must have gone - undetected for a long time somehow. Basically, the "is_free_" - field of the ACE_Search_Structure struct was never being set to - it's correct initial value of 1. I don't know how this didn't - surface before... At any rate, it is fixed now... - - * include/ace/sysincludes.h: Changed the inline methods for - SET'ing and CLR'ing bits to be macros in order to get cheap - polymorphic behavior... Also changed them to use the prefix - "ACE_" to avoid namespace pollution. Changed all dependencies - in the source code (only a few...). - - * libsrc/Reactor/Signal: Added a new class called - ACE_Signal_Handlers, which subclasses from ACE_Signal_Handler. - This new class implements the semantics required for Siemens. - For example, this class allows multiple signal handlers to be - registered for the same signal. It also makes SA_RESTART the - default mode. Note that by default, the Reactor uses the - original ACE_Signal_Handler semantics. If you want the new - semantics, simply pass the Reactor a pointer to - ACE_Signal_Handlers. - - * include/ace/sysincludes.h: Removed the automatic inclusion of - ./libsrc/Misc/Misc.h from sysincludes.h since this was causing - problems with include file ordering. - -Sun Sep 3 00:22:11 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Signal.C (remove_handler): Moved a definition of - ACE_Sig_Action out of an inner block to avoid portability - problems. - - * libsrc/ASX/Map_Manager: Improved the documentation of this class - and fixed up a couple of problems with the scope of loop - indexes. - - * libsrc/Misc/{Stack,Set}: Added this new file that contains a set - of Stack and Unordered Set implementations. The Unordered Set - is used in various places in ACE (e.g., libsrc/Reactor/Signal - and apps/Gateway/Gateway/Routing_Entry). - - * libsrc/Log_Msg/Log_Msg: Moved the definition and declaration of - Thread_Specific ace_log_msg from this directory to - ./libsrc/Misc/Misc.h in order to cleanup the namespace and also - to help make this work on DEC platforms... - - * libsrc/Reactor/Signal: Changed ACE_Signal_Handler from a static - class to a non-static class in order to allow subclassing. This - is necessary to support the Siemens requirements. - - * libsrc/Shared_Malloc/Memory_Pool: Modified ACE_MMAP_Memory_Pool - so that it no longer stores the name of the backing store in a - static character array (which made it impossible to have more - than one of these at a time...). The new version stores the - name in each ACE_MMAP_Memory_Pool object. It also selects a - name that won't conflict with other names by using ::mktemp. - - * tests/Shared_Malloc/test_malloc.C (parse_args): Fixed two stupid - omissions of "break" when parsing command-line arguments. Isn't - C++ great?! (NOT)... - - * apps/Synch-Benchmarks: Came up with a killer solution to the - nagging problem of POSIX Pthread's lack of an integral thread id - (a la Solaris threads thr_self()). The solution leverages off - of our new ACE_Thread_Specific wrapper to provide the necessary - functionality. Thanks to Reginald S. Perry (perry@zso.dec.com) - for triggering the thoughts that lead to this solution... - -Sat Sep 2 17:00:46 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/TLI_SAP/TLI_Acceptor: Changed the implementation - of ACE_TLI_Acceptor so that ACE_TLI_Request is defined inside - the TLI_Acceptor.C file (this is the so-called "Cheshire Cat" - technique). This clean up the code and the global namespace a - bit. - -Fri Sep 1 00:53:47 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released new version of ACE 3.3 - - * libsrc/IPC_SAP/UPIPE_SAP/UPIPE.C: Fixed a small problem with - failing to #ifdef this file correctly if we don't have - threads... Thanks to John Morey (jmorey@hitel.com) for - reporting this. - - * tests/ASX/CCM_App/svc.conf: Fixed the svc.conf file so that it - looked in the .shobj directory rather than the .obj directory. - - * Released new version of ACE 3.2.9... - - * libsrc/Log_Msg/Log_Msg: Added a new field called "restart_" to - the thread-specific storage. This will be used to control - whether system calls are restarted when interrupted. - - * Changed inheritance syntax from - - class xxx - : public yyyy - { - }; - - to - - class xxx : public yyyy - { - }; - - so that the OSE tools would work correctly. - -Thu Aug 31 00:12:40 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/UPIPE_SAP: Changed all uses of UPIPE_Addr to - SPIPE_Addr since they were the same thing. This also allows - much reuse of code... - - * libsrc/IPC_SAP/{TLI_SAP,SOCK_SAP,SPIPE_SAP}: fixed the - "complete" method for these classes so that it uses the new - ACE::handle_timed_complete() method in libsrc/Misc. This cleans - up the code by merging common logic. - - * libsrc/IPC_SAP/{DEV_SAP,FILE_SAP,SPIPE_SAP}: fixed the "connect" - method for these classes to conform to the API used by the - SOCK_SAP and TLI_SAP wrappers. In addition, cleaned up the code - so that common logic was pushed into a new method in libsrc/Misc - called ACE::handle_timed_connect(). - -Wed Aug 30 00:20:18 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection/Acceptor.C (open): Fixed this method so that - it returns a value on all paths through the code... - - * libsrc/IPC_SAP/TLI_SAP/TLI.C (ACE_TLI): Moved the option - allocation code from the TLI::open() method into the TLI - constructor in order to make sure it is always called! - - * libsrc/IPC_SAP/DEV_SAP/DEV_Connector: Changed the signature of - the DEV_Connector::connect method to allow users to specify - flags, permissions, and timeouts (this is now consistent with - other parts of ACE). - - * libsrc/IPC_SAP/FILE_SAP/FILE_Connector: Changed the signature of - the FILE_Connector::connect method to allow users to specify - flags, permissions, and timeouts (this is now consistent with - other parts of ACE). - - * tests/IPC_SAP/TLI_SAP: Updated the test code to check the new - timer support for connection establishment. - - * libsrc/IPC_SAP/TLI_SAP: Updated the code to make it conform to - the interfaces provided by SOCK_SAP. This primarily affected - the TLI_Acceptor and TLI_Connector classes in order to add - support for timed connects and accepts. - - * libsrc/Reactor/Signal.C: Modified Signal_Handler::dispatch so - that it saves/restores errno to prevent it from being corrupted - by the handle_signal callback. Thanks to Detlef for suggesting - this. - - * libsrc/Shared_Malloc/Memory_Pool: Changed the name of - ACE_Local_Memory_Pool to ACE_Sbrk_Memory_Pool. Then added a new - version of ACE_Local_Memory_Pool that uses the C++ operator new - to acquire chunks of memory. This enables the ACE Malloc class - to integrate with existing programs that use new/delete. Thanks - to Karlheinz for suggesting this. - - * libsrc/IPC_SAP: Added the UPIPE mechanism donated by SIEMENS. - This provides an intra-process IPC mechanism that has the same - API as the interprocess and network mechanisms. - - * Reran catman on ./man/windex. Thanks to Dieter Quehl - (quehl@csaserv.erlh.siemens.de) for reporting the need for this. - - * Released new version of ACE 3.2.9... - - * tests: Fixed a bunch of minor problems that occurred when - building on HP/UX. Thanks to John Morey - (jmorey@hitel.com) for reporting these. - - * apps/Gateway/Gateway/Peer_Message.h: Changed the default values - of the parameters to Peer_Addr so they aren't trying to assign - negative values to unsigned chars! Thanks to John Morey - (jmorey@hitel.com) for noticing this... - -Tue Aug 29 18:52:17 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Thread/Thread_Specific: Changed the constructor so - that it will take an initial TYPE *, which will be used to - initialize the thread-specific object. This is necessary to - support the changes to ACE_Task described in the following - bullet. - - * libsrc/ASX/Task: Added a new class called ACE_Task_Exit to - Task.C. This class is used in conjunction with - ACE_Thread_Specific to keep exit information for a Task in - thread-specific storage. This ensures that the Task::close() - method will get called no matter how the thread exits (e.g., via - Thread::exit() or by "falling off the end of Task::svc_run"). - -Mon Aug 28 09:54:35 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released new version of ACE 3.2.9... - - * libsrc/Reactor/Handle_Set.C: changed the type of MSB_MASK from - u_long to ACE_UINT32 to handle problems with the Alpha's 64 bit - longs... - - * libsrc/Threads/Thread_Specific: Continued to try and get this - class to build correctly on other platforms... I think I've - just about got it working right now... - - * libsrc/IPC_SAP/IO_SAP/IO_SAP: Added installation flags that - indicate whether the platform has terminal ioctl flags like - TCGETS and TCSETS. I know that SunOS 5.x has these, but I'm not - sure about other platforms... - -Sat Aug 26 13:55:45 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released new version of ACE 3.2.9... - -Fri Aug 25 09:05:09 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Thread_Specific.h: Fixed a typo that was causing - this file to fail on HP/UX. Thanks to Neil Cohen - (nbc@metsci.com) for finding this! - - * libsrc/IPC_SAP/DEV_SAP/DEV_IO: Added conditional support for - getmsg/putmsg calls in the DEV_IO class. This will make things - work correctly for platforms that don't support SVR4 STREAM - pipes. - - * libsrc/IPC_SAP/FILE_SAP/FILE_IO: Added the same fixes to FILE_IO - that I added to DEV_IO... - - * include/ace/sysincludes.h (MAXNAMELEN): Fixed a typo in - sysincludes.h that caused problems for the G++ compiler. - - * libsrc/Connection/Acceptor.C (handle_close): Removed a - diagnostic message that was getting printed if a - Oneshot_Acceptor had already been removed from the reactor (it's - ok for this call to fail). Thanks to Irfan Pyarali - (ip1@cec.wustl.edu) for noticing this! - - * libsrc/ASX/Task.C (ACE_Task): Fixed a bug in the constructor - that prevented a Message_Queue from being allocated - automagically. - -Thu Aug 24 16:47:14 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/ace/sysincludes.h: added support for 64 bit machines so - that Internet addresses are 32 bits, as they must be! - - * libsrc/Shared_Malloc/Malloc: Changed things so that MALLOC_STATS - is now *off* by default... (also changed the name to - ACE_MALLOC_STATS). - -Wed Aug 23 15:21:25 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/ace/config-osf1.h: Added support for thread-specific - storage. Please let me know if this breaks on OSF/1! - - * libsrc/Threads/Thread: Added support for the thread-specific - storage wrappers for both Pthreads and Solaris threads. Also, - rearranged some of the code to emphasize similarities between - Pthreads and Solaris threads. - - * libsrc/Threads/Thread_Specific: Updated this to remove "static" - from all the data members in this class since those should be - specific to an *instance* rather than to an instantiation of the - particular template class. Tim claims this works... - - * libsrc/Threads/Token.C: Fixed a couple of typos that misspelled - "assert" (jaysus...). Thanks to David Trumble - (trumble@cvg.enet.dec.com) for noticing this. - - * libsrc/Threads/Token.C (release): Fixed a very stupid bug that - was causing the Token never to become "unused"... No excuses - for this, except that Pthreads is partly responsible ;-) - -Tue Aug 22 11:36:58 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/ASX/Task: Changed the behavior of task so that it doesn't - try to delete the Message_Queue or Thread_Manager if it didn't - allocate them! Thanks to Karl-Heinz Dorn - (kdorn@erlh.siemens.de) for suggesting this fix. - - * libsrc/ASX/Message_Block: Changed the semantics for - Message_Block::end() so that it returns a pointer to 1 past the - end of the data. This is more consistent with toolkits like - STL. Also changed the behavior of Message_Block::copy() so that - it checks to make sure the data will fit in its buffer. - - * tests and apps: Revised a bunch of files to add #ifdef so that - TLI tests and apps are not compiled if the platform doesn't - support it... - - * Fixed a bunch of minor problems for HP/UX (which lacks TLI and - other common OS features). Thanks to Mark Seaborn - (mseaborn@itthp1.comm.mot.com) for noticing these. - -Mon Aug 21 00:19:29 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Misc: Changed the name of the class Argument_Vector to - ACE_ARGV. This is a bit more concise... UNIX programmer will - know precisely what argv is... - - * Updated all of ACE to use the new naming scheme, which prepends - all ACE classes with "ACE_". This is an important change since - it prevents ACE from polluting the namespace of applications - (unless they also prefix "ACE_" in front of their classes, which - is not very likely!). - - Since this change basically affects every single file in the - entire release, as well as all existing user code I've written a - perl script called "rename-ace.pl" to automate all of this. - This script is in $WRAPPER_ROOT/bin. To use it, simply type: - - % find . -type f -print | egrep '[Chi]$' | xargs rename-ace.pl - - Note that you will need to change the first line of - rename-ace.pl to point it to whereever perl is located on your - system. - - I've tested this on the entire ACE source code base and it seems - to work fine. Please be careful using it on your code, however, - since it may conflict with names that you use. When in doubt, - remove the '-pi' from the first line of the rename-ace.pl perl - script and replace it with '-p' (which is non-destructive). - Then run the commands above and check the output carefully. - When you're convinced that everything is ok, add the '-pi' back - again. Let me know immediately if you find any problems with - this scheme! - - * libsrc/Connection/Acceptor.C: Added a virtual destructor to the - Oneshot_Acceptor to make sure that descriptors are closed down - correctly. Thanks to Irfan (irfan@wuerl.wustl.edu) for - suggesting this. - - * libsrc: Change all occurrences of Shared_Memory to - SV_Shared_Memory to firmly indicate the origins of this - wrapper... - -Sun Aug 20 23:12:03 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP: added the IO_SAP, DEV_SAP, and FILE_SAP - components donated by SIEMENS to the ACE release. - - * libsrc/ASX: Split the Message_Queue.* files into Message_Block.* - and Message_Queue.* in anticipation of the Windows NT port... - -Fri Aug 18 13:54:09 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Thread_Specific: Move the operator->() - method back into the *.C file in order to make HP/UX - happy... - - * apps/Gateway/Peer: Removed the Options.* files since they - weren't being used and they were causing problems on OSF/1... - - * libsrc/Misc/Profile_Timer: Factored common code together by - making a new typedef called Rusage that defaults to either - struct rusage or prusage_t, depending on installation flags. - Fixed a couple places in the code that were depending on the - prusage_t type (which is now the Profile_Timer::Rusage type...). - -Thu Aug 17 14:31:11 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection/Connector.h: Changed some typedefs in order to - keep the Centerline compiler from crapping out. I can't - *believe* how screwed up that compiler is when it comes to - templates... - - * Released new version of ACE 3.2.9... - - * libsrc/Threads/Synch: Fixed a bunch of typos that showed up - on OSF/1. Also tried to fix some other problems by removing - "const" from all the methods... - -Wed Aug 16 22:26:24 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Thread_Specific.h: Fixed another stupid bug - caused by a braino that failed to unconditionally include - Thread_Specific.i. Stuart Powell found this also... (thanks!). - - * libsrc/Threads/Thread_Specific.h: In Thread_Specific.h the - inlining macros were only included if threads were used. This - obviously didn't work for people without threads... I - moved the #endif for ACE_HAS_THREADS... back before the #ifdef - __INLINE__ stuff (e.g. to line 71). Thanks to Stuart Powell - (stuartp@ot.com.au) for suggesting this. - - * libsrc/Threads/Synch.h: Fixed a typo that manifested itself for - pthreads: Condition count_nonzero_ should obviously be - Condition count_nonzero_. Thanks to Rob Clairmont - (rclairmo@bnr.ca) for reporting this. - -Tue Aug 15 00:31:44 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Log_Msg/Log_Msg.C (log): Fixed a stupid typo (*format++ - should have been format++...). - - * libsrc/Misc/Trace.h: Move the class TSS_Int from within class - Trace to file scope and changed the name to ACE_TSS_Int to - handle problems with the HP/UX compiler. - - * include/ace/sysincludes.h: Added the word "struct" in front - of rusage to make things work on HP/UX. Thanks to Neil Cohen - (nbc@metsci.com) for reporting this fix. - - * apps/TokenServer/server/TokenMap.C: Fixed yet another problem - with scope of variables defined in for loops... - - * Released new version of ACE 3.2.9... - - * libsrc/Connector: Fixed a braino whereby I didn't use consistent - naming for my #defines (PA should have been PRC). Thanks to - Alex (alexey@ace.elektra.ru) for noticing this. - -Mon Aug 14 18:13:46 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/SPIPE_Acceptor: Modified the interface of open() - and accept() so they would conform to the SOCK_Acceptor and - TLI_Acceptor. This makes it possible to use SPIPE_Acceptor in - similar situations (e.g., Acceptor and Connector patterns). - - * libsrc/ASX/Stream: Fix a bug that occurred when trying to dump() - a linked Stream. - - * libsrc/Connection/Acceptor: Moved the body of the init() method - out of this class since it was unnecessarily dependent on the - INET_Addr domain addressing types. This required changes to the - ./apps and ./tests directory in order to add the init() method - to classes that used the default behavior. - - * libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Acceptor.C: Fixed close() so that - it will call fdetach(2) *before* closing down the descriptor. I - hope this will fix a problem noticed by people at SIEMENS. - - * tests/ASX/Event_Server/Event_Server/Options: Fixed a problem - with the default port numbers (they weren't using the values - from ./include/ace/testconfig.h). - - * include/ace/sysincludes.h (MAXNAMELEN): If MAXNAMELEN is not - defined by a platform then ACE sets it to be FILENAME_MAX, - which should be defined in stdio.h. Thanks to Todd Blanchard - (tblancha@evolving.com) for this suggestion. - -Sun Aug 13 17:02:57 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Service_Configurator/Parse_Node: Changed the name of - Function_Node::symbol (const void *) so that it won't give - those annoying warnings anymore... - - * libsrc/Reactor/Handle_Set: Moved the definition of MSB_MASK from - the header file into a static const within the .C file in order - to avoid overflow problems on certain compilers. - - * libsrc/Threads/Synch: Implemented bare-bones versions of - Semaphore and RW_Mutex for the POSIX Pthreads wrappers so that - they'll be more compatible with the Solaris threads wrappers. - The semaphore implementation uses a Condition object and a - Mutex, which should be a reasonable solution. The RW_Mutex is a - cop-out for now and just uses a Mutex (i.e., no extra - parallelism for readers...). If anyone has a good - implementation of RW_Mutex that they'd like to share please let - me know. - - * libsrc/Threads/Thread_Specific: Fixed the prototypes for copy - constructor and operator=, which were broken... Thanks to Alex - (alexey@ace.elektra.ru) for noticing this. - - * libsrc/Shared_Malloc/Memory_Pool.C: Added some casts to - MAP_FAILED to handle OSF/1. Thanks to Alex - (alexey@ace.elektra.ru) for noticing this. - - * libsrc/Threads/Token: Fixed things so that threads waiting for a - token wouldn't get screwed up by signals that occur... - - * include/ace/sysincludes.h: Changed the #ifdef - ACE_SELECT_USES_LONG to ACE_SELECT_USES_INT for HP/UX since - believe it or not, it really does use int, not long! - - * libsrc/SV_Semaphores: Fixed some weird problems that the HP/UX - compiler was having when trying to inline methods in this class. - As a consequence, I've rearranged the class to avoid inlining - non-trivial methods. Thanks to John Morey (jmorey@hitel.com) - for reporting these problems. - -Wed Aug 9 01:29:16 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Token: Added a tryacquire() method to become - interface compliant with other LOCK mechanisms. - -Sat Aug 5 09:18:29 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection: Fixed a couple of bugs when using - the Acceptor and Svc_Handler when ACE_OMIT_SERVICE_CONFIGURATOR - is enabled. Thanks to Stuart Powell (stuartp@ot.com.au) for - bringing this to my attention. - - * include/ace/sysincludes.h: Added a #ifdef for MAXNAMELEN to - handle systems (like HP/UX) that don't support it. - -Thu Aug 3 22:59:13 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released new version of ACE 3.2.9... - - * libsrc/Reactor/Time_Value.i (normalize): Added new code to - perform normalization of Time_Values. Thanks to Hans Rohnert - (Hans.Rohnert@zfe.siemens.de) of SIEMENS for the suggestion. - -Tue Aug 1 00:19:00 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Changed all code that used Log_Msg::log() directly to use - LM_ERROR or LM_DEBUG. This will ensure that logging will work - with the new thread-specific storage implementation. - - * libsrc/Threads/Thread_Manager.i (open): Fixed this method so - that it is thread-safe when a Thread_Manager is resized. - - * libsrc/ASX/Map_Manager.i (open): Fixed this method so that it is - thread-safe when a Map_Manager is resized. - -Mon Jul 31 12:56:17 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Misc/Trace: Reimplemented the ACE Trace class to use the - new thread-specific storage wrapper. - - * libsrc/Log_Msg: Reimplemented the Log_Msg class to use the new - thread-specific storage wrapper. This shouldn't affect any - existing code that was careful to only use the LM* macros... - - * libsrc/Threads: Added a new class called Thread_Specific which - implements a C++ wrapper for SunOS 5.x thread-specific data - (this will also work for POSIX pthreads I believe). Thanks to - Tim Harrison (harrison@cs.wustl.edu) for coming up with the idea - for using C++ "smart pointers" to implement this. - - * libsrc/Reactor/Timer_Queue.h: Moved Timer_Node from within - Timer_Queue to outside Timer_Queue and renamed it to - ACE_Timer_Node. Unfortunately, some compilers still don't like - nested classes (ugh)... - - * Changed ACE_Synch_Options to be simply Synch_Options since it - is *not* an ACE private class... - -Sun Jul 30 00:07:28 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/makeinclude/README: Added a new #define called - ACE_HAS_THREAD_SPECIFIC_STORAGE, which does exactly what it - sounds like! So far, I know that Solaris defines this. I'm not - sure which other platforms do (perhaps OSF/1 does?). - -Fri Jul 28 14:53:45 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Fixed a bunch more problems with loop variables that were - uncovered with GCC 2.7. Thanks to Matt Stevens - (mstevens@ent.mrj.com) for noticing this. - - * apps/Logger/Service_Configurator_Logger: Added a new flag called - ACE_HAS_NO_STATIC_DATA_MEMBER_TEMPLATES which is necessary to - workaround bugs with GNU G++... Thanks to Matt Stevens - (mstevens@ent.mrj.com) for noticing this. - - * libsrc/Connection/Connector.C (cleanup_AST): Changed the - parameter list just a tad to try and fix a problem with - G++ (which doesn't seem to like unscoped typedefs in - argument lists or return values. - - * libsrc/Misc/Profile_Timer.i: Changed ::getrusage to be getrusage - to avoid problems with macros and scope operators... - - * include/ace/testconfig.h (ACE_DEFAULT_RENDEZVOUS): Changed the - value from /tmp/foo to /tmp/fifo.ace. Thanks to Neil B. Cohen - (nbc@metsci.com) for suggesting this. - -Thu Jul 27 12:30:06 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/TokenServer/server/TokenHandler.C (abandon): Fixed a minor - bug that caused assert() to fail when a client abandoned a - Token. - - * libsrc/Reactor: Fixed a bug with the design of the Reactor's - Timer_Queue cancellation mechanism. The new mechanism is much - more robust since it ensures that timer_ids (used to cancel - pending timers) are unique up to values of greater than 2 - billion timers! As long as timers don't stay around longer than - this there should be no problems with accidentally deleting the - wrong timer. Thanks to Bill Sears (wsears@world.std.com) for - noticing this problem. - - One nice consequence to this change is that legacy code that - would have broken with the previous change is now 100% - compatible! - - * Provided a definition of ACE_Synch_Options::arg(const void *), - which I'd forgotten to define before (darn templates...). - Thanks to Tim Harrison (harrison@cs.wustl.edu) for finding this! - - * include/ace/sysincludes.h: Added a total hack to get HP/UX to - understand getrusage(). The trick is to use the following - undocumented syscall: - - #define getrusage(a, b) syscall(SYS_GETRUSAGE, a, b); - - What a hack (but it works...). - -Tue Jul 25 13:20:58 1995 Douglas C. Schmidt (schmidt@kavita.cs.wustl.edu) - - * libsrc/Misc/Profile_Timer: Fixed a typo in Profile_Timer.h - (ACE_HAS_RUSAGE_T should have been ACE_HAS_GETRUSAGE). Thanks - to George Reynolds (george@dvcorp.com) for noticing this. - - * Changed all uses of ::getopt() to use the ACE class Get_Opt - get_opt. Also changed all uses of optarg to get_opt.optarg. - Thanks to Bob Vistica (robertv@ims.com) for detecting and - reporting some inconsistencies in my previous changes... - -Mon Jul 24 19:03:03 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include: I've added config and platform support for SGI IRIX5.3 - for use with the SGI C++ compiler. Thanks to Stuart Powell - (stuartp@ot.com.au) for these config files. - - * libsrc/Connection/Acceptor.C (handle_input): Added the - Event_Handler::DONT_CALL flag when removing the Oneshot_Acceptor - from the Reactor so that we don't set it's peer_acceptor_ to -1. - -Mon Jul 24 12:46:10 1995 Douglas C. Schmidt (schmidt@kavita.cs.wustl.edu) - - * libsrc/Misc/Profile_Timer: Fixed problems stemming from the fact - that HP/UX doesn't seem to support getrusage() (how odd). - - * tests/Connection: a new test directory to test out the Connector - and Acceptor pattern implementations. - -Sun Jul 23 12:26:37 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection/Acceptor.C: Fixed a minor bug with the - Oneshot_Acceptor constructor. Thanks to John Morey - (jmorey@hitel.com) for noticing this and the one below. - - * libsrc/Reactor/Timer_Queue: Moved the static method current_time - from the Timer_Queue.i file to the Timer_Queue.C file. This - avoids a bug with HP/UX C++. - -Sat Jul 22 15:54:27 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released beta version 3.2.9. Once this compiles on all major - platforms then it's time to move to version 3.3. - - * Added a number of miscellaneous changes for OSF/1 courtesy of - David Trumble (trumble@cvg.enet.dec.com). One of these changes - involved changing all uses of Reactor::{ADD,SET,CLR,GET} to - Reactor::{ADD,SET,CLR,GET}_MASK in order to avoid a class with - some symbols in OSF/1. - -Fri Jul 21 00:21:02 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Finally was able to test ACE on the SunOS 4.x platform (using - the SunC++ 4.0.1 compiler). The entire release compiled - correctly! This is a great relief after fighting with this - stuff for months... If you are building ACE on SunOS 4.x I'd - *strongly* recommend you get SunC++ 4.0.1 since it is the only - compiler that seems to be able to grok the weirdness of SunOS - 4.x... - - * Finished updating all the ./tests and ./apps code so that it - works correctly with the new Acceptor/Connector modifications. - To see examples of these changes check out - ./tests/IPC_SAP/SOCK_SAP/CPP-{nbclient,inserver}.C. - - * libsrc/Misc/Profile_Timer: Merged in the new Profile_Timer - implementation from David Trumble (trumble@cvg.enet.dec.com). - This will work with basically the same interface as the current - scheme even if the OS platform doesn't support the prusage_t - type... - -Thu Jul 20 01:07:23 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection: Added a new class called ACE_Synch_Options - which is used in both the Acceptor and Connector classes to - consolidate options related to synchronous and asynchronous - behavior. - - * libsrc/Connection: Added a new class called Oneshot_Acceptor. - This class inherits from the Acceptor but it only accepts one - connection at a time (i.e., it doesn't keep itself registered - with the Reactor). Several examples in the tests/SOCK_SAP - directory have been added to illustrate how all this works. - - * libsrc/Connection/Connector: completely redid the Connector and - Acceptor class interfaces to incorporate the new changes for - asynchronous and synchronous behavior. The new scheme should be - much more general (and correct...). Thanks to Tim and Irfan for - helping out with this. - - * libsrc/Threads/Synch: Fixed the implementation of Recursive_Lock - so that it won't have race conditions when testing the thread id - and nesting level in parallel threads. - -Wed Jul 19 13:15:05 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Timer_Queue: Added new support for cancellation - of individual Event_Handlers in the Reactor. In addition, it is - now possible to cancel all Event_Handlers with a single call to - Timer_Queue::cancel(). Note that this new scheme will break - existing code since Timer_Queue::schedule() (and - Reactor::schedule_timer()) now return ACE_Timer_Node *'s rather - than ints... - - * libsrc/Service_Configurator/Service_Config: Fixed a problem - where the "-s" option didn't work since it was parsed when - "Service_Config::open" was called - (it sets Service_Config::signum_). However, previously the - signal handler was already setup by the constructor. By moving - this registration to the open() method the problem was solved. - Thanks to Bob Vistica (robertv@ims.com) for noticing this. - - * libsrc/Service_Configurator/Service_Manager: Changed the - Service_Manager::reconfigure_services to use this->signum_ - rather than to hard code SIGHUP. Thanks to Bob Vistica - (robertv@ims.com) for this insight. - -Mon Jul 17 12:08:08 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Threads/Token.C (renew): Fixed a typo so that we compare - this->head_ == 0 rather than this->head_->next_ == 0. - - * libsrc/Reactor/Reactor.h: Changed the Reactor to use the - Reactor_Token rather than the pure Token to make sure that the - sleep_hook() is called to unblock the Reactor. - -Fri Jul 14 14:12:07 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection: Changed the default behavior of the Connector - and Acceptor classes such that they pass a -1 to - svc_handler_->close() when things go wrong. This is useful as a - flag to close() (e.g., if it needs to figure out what to do if - is shuts down prematurely). - - * libsrc/Connection/Svc_Handler.C: Added a default definition of - the put() method, which is defined as a pure virtual method in - class Task. - -Thu Jul 13 23:10:35 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/ace/sysincludes.h: Added support for the SGI IRIX 5.3 - OS. More screwy gettimeofday() hacks (what a pain...). Thanks - to Matt Stevens (mstevens@kirk.softeng.infonautics.com) for - these fixes. - - * include/makeinclude/platform_sunos5_centerline.GNU: Fixed a - vexing problem that was causing the Centerline C++ compiler to - puke when compiling ACE. Thanks to Chandra Venkatapathy - (cvenkat@develop.bsis.com) for finding a solution! - -Tue Jul 11 00:01:15 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 3.2.6 for use by Karl and Detlef. - -Mon Jul 10 00:28:51 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/TTCP: Added support for benchmarking the performance of - Orbix, ORBeline, ACE SOCK_SAP, and C sockets. These results are - available at URL http://www.cs.wustl.edu/~schmidt/COOTS-95.ps.Z - - * libsrc/Service_Configurator/Makefile: Added new commands to the - Service Configurator Makefile so that all automatically - generated flex and yacc symbols (i.e., the "yy" stuff) is - renamed "ace_yy". The purpose is to avoid conflicts with other - uses of flex/yacc lexers/parsers with ACE. Thanks to Steve - Ritter (ritter@titan.com) for this suggestion and code. - - * libsrc/IPC_SAP/TLI: Changed the TLI files so they are - conditionally compiled only if the platform supports TLI... - - * libsrc/Connection: Changed the inlining strategy of Connector, - Acceptor, and Svc_Handler so that very short methods are always - inlined, but anything larger is never inlined... - -Sun Jul 9 14:07:02 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/ace/testconfig.h: Changed all occurrences of DEFAULT_* - to ACE_DEFAULT_ to prevent namespace collision. - - * libsrc/Connection/Connector: Massively improved the Connector - class so that its connect() method supports the following - behavior (tv == "timeout value" and ur == "use Reactor"): - - Parameters | Description - | - tv | ur | - -----|----------|------------------------------- - | | - NULL | yes | infinite timeout (using Reactor) - | | - time | yes | try asynch transaction for - | | the specified time (using Reactor) - | | - 0,0 | yes | poll; try, if EWOULDBLOCK, - | | then return immediately - | | (using Reactor) - | | - NULL | no | block forever (don't use Reactor) - | | - time | no | do a blocking transaction - | | for the specified time - | | (don't use Reactor) - | | - 0,0 | no | poll; but do not initiate a - | | nonblocking transaction - | | (don't use Reactor) - - * libsrc/IPC_SAP/SOCK_SAP/SOCK_Connector: Changed the behavior of - the SOCK_Connector::connect() method so that it uses Time_Values - rather than a simple flag that indicates whether or not to use - non-blocking connectors. The new scheme is an improvement since - it allows greater control over synchronous and asynchronous - timeouts for connection establishment. This behavior parallels - that of SOCK_Acceptor, as well! If this works well then I'll - update the TLI_Connector and SPIPE_Connector to match this - interface. - - * libsrc: Continued to improve ACE's use of the global name space - by prefixing all "helper" classes with "ACE_" - - * Updated SPIPE_Acceptor so that it would have the same basic - interface as the SOCK_Acceptor and TLI_Acceptor. - - * libsrc/IPC_SAP: Consolidated the handle_timed_wait() methods - used by the TLI, socket, and STREAM pipe wrappers so that they - share the new ACE::handle_timed_accept() method, which is in - libsrc/Misc. - - * libsrc/Misc: Modified the structure of Misc.[Ch]. Originally, - this file contained a bunch of stand-alone C functions with the - prefix "ace_" to keep them from conflicting with user's code. - I've modified things now so that all the miscellaneous functions - are now static methods in class ACE. This provides better scope - control... - - * libsrc/Log_Msg/Log_Msg: Replaced the use of a Mutex in class - Log_Msg with a Recursive_Lock. This is necessary to - handle signals correctly... - - * libsrc/Reactor/Reactor: Modified the behavior of - Reactor::notify() so that writers will block if the pipe is - full. This solves some nasty flow-control problems. - - * libsrc/Reactor/Handle_Set: changed all uses of fd_set to - ACE_FD_SET_TYPE * so that HP_UX would work correctly... - - * include/ace/config-hpux.h: Removed the ACE_HAS_XLI flag until I - get a better idea which HP systems this is installed on. - - * libsrc/Threads/Thread: Added a new static method called - spawn_n() that spawns "n" threads all running the same function. - -Sat Jul 8 14:14:34 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Service_Configurator: Made some miscellaneous changes to - "const" methods and parameters in order to handle the new - Reactor changes (C++ can be such a pain about this - sometimes...). - - * libsrc/Threads: Added "yield" and "sigsetmask" methods to class - Thread. How did I manage to omit these before?! - - * libsrc/Reactor: Updated the Reactor to use the new Token class - described below. This greatly simplies the structure of the - multi-thread support in the Reactor code. In addition, it - should improve performance because it cuts the number of context - switches compared with the old scheme. Many thanks to - Karl-Heinz and Detlef for encouraging me to redo the Reactor - implementation. - - * libsrc/Threads: Added a new class called Token that provides a - flexible and efficient recursive mutex scheme. Thanks to - Karl-Heinz Dorn (kdorn@erlh.siemens.de) and Detlef Becker - (beckerd@erlh.siemens.de) for sharing their original code for this. - -Thu Jul 6 10:37:45 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Event_Handler_T: Conditionally compiled this so - that it will only compile if the compiler supports template - typedefs (e.g., G++ doesn't seem to like this...). - - * Started to make changes in ACE to deal with the new ANSI C++ - semantics in the scope of variables defined within for loops. - Thanks to Aniruddha Gokhale (gokhale@cs.wustl.edu) for noticing - this in G++ 2.7... - -Wed Jul 5 21:50:39 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection/Svc_Handler: Fixed the behavior of the - Svc_Handler class so that it can be configured with a Reactor - other than Service_Config::reactor, just like the Acceptor and - Connector. Thanks to Karl-Heinz Dorn (kdorn@erlh.siemens.de) - for suggesting this! - -Tue Jul 4 00:21:31 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added some new changes for Linux courtesy of Charles Rennolet - (clr@thurse.mn.org). - - * libsrc/Reactor/Reactor.C (bit_ops): Fixed a dumb error in - bit_ops that was caused by checking "else if (Reactor::SET)" - rather than "else if (ops == Reactor::SET)". Thanks to Mark - Patton (mark_patton@tx72.mot.com) for finding this bug and - reporting it along with the fix. - - * include/ace/sysincludes.h: Added new fixes for M_SYNC and - ENOTSUP on SunOS 4. - - * libsrc/Reactor: Added new support for integrating X and the - Reactor. These files are called XtReactor.* and XReactor.*. - Thanks to Eric Vaughan (evaughan@arinc.com) for providing this - stuff... - -Mon Jul 3 19:44:07 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added support for SunOS 5.5 on i86 PC. Thanks to Bin Mu - (mubin@wfg.com) for the config files and fixes. - - * libsrc/Misc/Profile_Timer: Added new support for versions of - UNIX that don't support prusage_t. The new version of - Profile_Timer will use gettimeofday() and getrusage() of - prusage_t and /procfs isn't available... This code hasn't been - tested yet (since I don't have SunOS 4.x) so I don't know if it - works. - - * Hopefully fixed the SunOS4 prototype for gettimeofday(). Thanks - to Andrew McGowan (ajm@se09.wg2.waii.com) for the suggested fix. - - * include/makeinclude/platform_hpux.GNU (CC): Added new support - for building ACE and shared libraries on HP/UX. Thanks to Jam - Hamidi (jh1@osi.com) for this code. - - * libsrc/Reactor/Handle_Set: Fixed Handle_Set_Iterator::operator++ - to check for index to be greater or equal than NUM_WORDS instead - of just equal. This is better for sanity, although it may not be - needed. Thanks to Carlos Garcia Braschi (cgarcia@caramba.tid.es) - for suggesting this fix. - -Wed Jun 14 11:16:40 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/TLI_Acceptor: modified TLI_Acceptor so that it's - public constructor/open() and accept() methods are more similar - to the SOCK_Acceptor. In particular, added support for - "SO_REUSEADDR" in TLI_Acceptor and time values for accept(). - Thanks to John P. Hearn (jph@ccrl.nj.nec.com), TLI_SAP now does - the right thing for socket options. - - * libsrc/IPC_SAP: Fixed up the SOCK_Acceptor and TLI_Acceptor in - order to add better support for "timed accepts." The new scheme - uses Time_Values, which is more consistent with other parts of - ACE. In addition, the Time_Value was moved from the - constructor/open() to the accept() method, which allows more - fine grained control over this behavior. Thanks to Irfan - (ip1@cs.wustl.edu) for suggesting this. - - * libsrc/IPC_SAP: Cleaned up the SOCK_Acceptor::open and - TLI_Acceptor::open routine. In addition to being more compact - and robust, this routine now also let's open() determine which - local port to bind to (if you pass in Addr::sap_any as the - local_addr). Thanks to Irfan (ip1@cs.wustl.edu) for suggesting - this. - -Tue Jun 13 16:09:13 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Timer_Queue: Fixed an odd problem with the - Timer_Queue on Solaris. Apparently the select() call will - return slightly earlier than the timeout dictates due to lack of - granularity with the system clock. This was causing problems - where the Reactor wasn't correctly dispatching the - handle_timeout() method of Event_Handlers. The fix was to add a - 10 Millisec "fudge factor" when calling the - Timer_Queue::expire() method. Please let me know if this causes - any problems. Thanks to Giang Hoang Nguyen - (yang@titan.com) to noticing this problem. - - * libsrc/Connection/Acceptor: Enhanced the Acceptor class so that - it is possible to accept a new SVC_HANDLER synchronously, rather - than always driving this acceptance out of the Reactor's event - loop. Thanks to Irfan (ip1@cs.wustl.edu) for suggesting this. - - * libsrc/IPC_SAP/Addr: Changed all occurrences of ace_sap_any to - Addr::sap_any (i.e., sap_any is now a static data member in - class Addr). This is an improvement since it helps to limit the - scope of what would otherwise be global variables... - -Wed Jun 7 17:26:31 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Logger/Reactor_Logger/Client_Acceptor.i (handle_input): - Fixed a braino that omitted an important block of code! Thanks - to Ken Konecki (kenk@wfg.com) for finding this. - -Fri Jun 2 13:59:07 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/Addr/INET_Addr.i (set): Removed the special case - for INADDR_ANY. This should just fall right out... - -Thu Jun 1 19:45:21 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/SOCK_SAP/SOCK_Connector: Added support to - SOCK_Connector so that it is possible to bind the local TCP port - number prior to establishing the connection. Also fixed the - TLI_Connector to be consistent with this approach. Thanks to - Mark Patton (mark_patton@tx72.mot.com) for this idea. - - * Fixed a problem with Mem_Map that was caused by the fact that - some versions of Unix (e.g., SunOS 4.x) don't support MS_SYNC... - Thanks to Andy McGowan (mcgowan@wg2.waii.com) for noticing this. - - * Fixed a very stupid bug in ./libsrc/Synch.h that accidentally - omitted this->lock_.acquire() from the Guard class constructor. - Thanks to Bin Mu (mubin@wfg.com) for noticing this! - -Fri May 26 13:20:38 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Connection/Acceptor: Added a new method called - make_svc_handler() that generalizes the dynamic creation of a - SVC_HANDLER by the Acceptor's Template Method handle_input(). - This scheme is completely backwardly compatible with the - original approach, but now allows transparent extension too! - - * libsrc/Connection/Acceptor: cleaned up the Template Method logic - in Acceptor::handle_input. No longer do we set the listener - socket into non-blocking mode and then rely on a -1 with - EWOULDBLOCK to indicate there are no more connections to - establish. This was causing problems for singleton Svc_Handlers - since the Acceptor was setting their peer_stream_ to -1... The - new approach should complete solve this problem. - -Mon May 22 15:10:27 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 3.2.3 so that Bill Sears can test the new - #include "ace/" features. - - * Modified all the ACE source, tests, and apps so that all - #includes of its headers are refixed by ace/, e.g.: - - #include - - There are two reasons for have the include files be of - this form: - - First, you can tell at a glance by looking at the caller where - the library is coming from. - - Secondly, you can build an include tree of the form: - - /include/lib1 - /include/lib2 - /include/lib3 - /include/ace - - which then links to WRAPPER_ROOT. Now, all you have to do - when you build a make file is point to the include root, and - put links in the include root. This is especially helpful - if there are multiple versions. - - This means just one less thing that has to be modified in the - Makefile. Thanks to Bill Sears (wsears@world.std.com) for - recommending this change. - -Sat May 20 17:12:35 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * config-irix5.3-sgic++.h: Added new configuration support for SGI - IRIX5.3 courtesy of Stuart Powell (stuartp@ot.com.au). - -Sat May 13 20:44:06 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Generalized the SOCK_Connector::complete method so that it takes - a Time_Value timeout. This allows applications to wait upto a - certain limit before giving up on a non-blocking connection. - Updated the tests in ./tests/IPC_SAP/SOCK_SAP/CPP-inclient.C to - illustrate how this is used. - - * Added some interesting new tests to ./tests/Mem_Map that can be - used to benchmark the performance of various strategies (e.g., - stdio, read/write, mmap, etc.) for copying files. - -Fri May 12 19:09:10 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Mem_Map/Mem_Map: Added two new overloaded methods called - sync() that are wrappers around the msync(3c) system call. Also - added a new unmap() method that gives access to the full - behavior of munmap(3c). - -Wed May 10 14:16:16 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Tried yet another fix for the gettimeofday() botch that both - Centerline and SunOS 5.4 screw up in different ways. Thanks to - Medhi Tabatabai (Mehdi.Tabatabai@ed.nce.sita.int) for the latest - fixes. - -Tue May 9 19:05:58 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Handle_Set.C: Fixed some "off-by-one" errors that - were occurring in the Handle_Set::sync() and set_max() methods. - Thanks to Nigel Hooke (n.hooke@trl.oz.au) for finding and fixing - these. - -Mon May 8 02:01:54 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Reactor.C: Moved the Null_Callback class from - being nested within the Reactor class to outside the Reactor - class. This fixes a problem with the SIG compiler. - - * Released version 3.2.2. - - * libsrc/Reactor/Signal.C: Made the Signal_Handler class - thread-safe as well as signal-safe. - - * libsrc/Reactor/Reactor.C: Modified the new Reactor - implementation slightly to handle signals correctly. - - * libsrc/Threads/Synch.h: Added a new conversion operator to - Recursive_Lock that returns the underlying LOCK in case we need - it for something (e.g., to initialize a Condition object). - -Sun May 7 04:17:46 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Reactor.C: Finished what I hope will be the last - set of changes to make the Reactor robust in multi-threaded - programs in situations where separate threads are used to - register and remove handlers. The final solution is elegant in - that it does not significantly penalize the performance of - programs that do not use separate threads to register and remove - handlers. Moreover, if you compile without the ACE_MT_SAFE flag - the Reactor will not include additional state information - related to the multi-threaded implementation. - - * libsrc/Threads/Synch.h: Subclassed the Guard class to make a new - class Try_Guard that uses tryacquire() to obtain a LOCK. - -Fri May 5 18:43:50 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 3.2.1 - -Thu May 4 19:43:01 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/TLI_SAP/TLI_Connector.C (connect): Fixed a - problem whereby a t_bind() was being done twice. Since I didn't - write this code I don't know if my fix will work generically on - all platforms supporting TLI. Please let me know if there are - any problems. - -Tue May 2 17:21:53 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor: Added a new notification feature that allows - multiple threads of control to enqueue Event_Handler * to the - main Reactor thread via the pipe used to wake up the main - Reactor thread. The Reactor will call the handle_exception() - method on Event_Handler with a HANDLE == -1 to notify the - handler. This feature is very useful if you need to have - certain operations (such as handler termination) performed in - the main thread. - -Tue Apr 25 00:34:18 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor: Fixed a stupid pair of typos in the Reactor that - failed to cast arguments to the pipe to char *. - - * libsrc/Connection: Fixed a portability problem with the - Connector: we can't use RW_Mutex for synchronization since not - all platforms support threads. The quick fix is to use - Null_Mutex, but a better long term approach is on the way! - - * Released version 3.2. - - * Added richer support for the TLI_Connector to make it work - better with protocols other than TCP/IP. Thanks to Mats - Sundvall (sundvall@perrier.embnet.se) for these enhancements. - -Mon Apr 24 02:26:04 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Changed the SOCK_Dgram_Brdcast class name to SOCK_Dgram_Bcast - and the SOCK_Mcast to SOCK_Dgram_Mcast to be more consistent. - - * Massively improved the Reactor's support for multi-threading. - There was actually a major problem in previous versions of ACE - that used poll() as the underlying event demultiplexor. Poll() - produced incorrect results when the Reactor::handle_events() - method was run in one thread, but another thread came along and - registered or removed an Event_Handler. The new version fixes - this problem so that the Reactor will now work correctly in - multi-threaded programs. - - One consequence of this change is that sysincludes.h and the - SunOS 5.x configuration files have been changed so that poll() - is no longer used as the default demultiplexor. The reason is - that poll() doesn't work as efficiently when used in - multi-threaded programs (ugh). See the Reactor code for - examples of how this all works now. Basically, the trick is to - use the select()-style implementation for most of the code, and - transform to poll()-style implementation only when necessary. - -Sat Apr 22 03:35:51 1995 Douglas C. Schmidt (schmidt@lambada.cs.wustl.edu) - - * libsrc/ASX/Message_Queue: Added a new method to the - Message_Queue class called unblock(). This method allows one - thread to release all other threads that are waiting for - messages to be enqueued or dequeued on a Message_Queue. - Modified the return value of methods like enqueue_head() and - dequeue_head() so that if a thread unblocks() then these methods - return -1 with errno == ESHUTDOWN. Also changed the name of - some of the internal methods so that they would be more - consistent. - - * libsrc/Connection/Connector: Fixed a stupid bug caused by - failing to have a destructor for Connector. Thus, there are - cases where unconnected Svc_Handlers are left around in the - handler_map_. This causes problems for dynamic linking in - conjunction with the Reactor, so now the destructor iterates - through all the unconnected Svc_Handlers and removes them from - the Reactor. - -Fri Apr 21 15:28:46 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Signal: Changed Sig_Set::addset() and - Sig_Set::delset() to the more appropriately named sig_add() and - sig_del(). Also added '_' in the Sig_Set method names to be - more consistent... - - * Removed the ./libsrc/IPC_SAP/SOCK_SAP/misc.[hC] file and merged - the one function in that file (ace_bind_port) into - ./libsrc/Misc/Misc.[hC]. - - * Added a bunch of fixes from various people to make ACE compile - better on SGI, SunOS 4, and HP/UX. Thanks for all the fixes! - - * libsrc/IPC_SAP/Addr: Changed sap_any to ace_sap_any to avoid - problems with the namespace. - - * Added a new portability flag that only compiles the SOCK_Mcast.* - stuff if the platform supports multicast! - - * ./libsrc/Shared_Malloc: Fixed some portability bugs with - Memory_Pool.C and added new support for SunOS 4.x running SunC++ - 4.x. Thanks to Steve Warwick (swarwick@arinc.com) for this - strategic help. - -Wed Apr 19 09:05:43 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Fixed up the ./libsrc/CORBA_Handler so that it will correctly - compile on platforms that don't have Orbix... - - * libsrc/Misc: added a new "Simple String" class called SString. - This is not really meant to be used by end-user applications. - It is used by certain portions of ACE that need to have - operator== and operator!= defined on a string (e.g., the - Token_Server and the Orbix Event_Comm components that use the - Map_Manager). - -Tue Apr 18 00:09:31 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/ASX: Fixed a stupid bug in Task::activate() that didn't - spawn a thread if the Thread_Manager was NULL... - -Sat Apr 15 19:39:30 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor: Added a new class to the Reactor called - Event_Handler_T.[hi]. This class makes it easy to integrate - existing classes into the Reactor framework without requiring - them to inherit from Event_Handler directly. This technique is - a superset of the DEF_TIE approach used by IONA in Orbix as one - of the ways to combine an existing class (that doesn't know - anything about CORBA) with a CORBA interface. Thanks to Greg - Lavender - (g.lavender@isode.com) for the suggestion. - -Fri Apr 14 14:41:49 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Run catman on the ./man directory so that it now has a windex - file. This facilitates "man -k". - -Thu Apr 13 23:39:22 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor: Made the Reactor be a stand-alone component that - does not require any other ACE libraries. - - * Added two new methods to the Reactor so that you can now - register or remove a set of HANDLEs in a single call. Thanks to - Bill Sears - (wsears@world.std.com) for this suggestion. Basically, now you - can register or deregister a set of n HANDLEs with one operation - (rather than doing n register_handler () or n remove_handler - ()). - - * include/sysincludes.h: Changed the name of the macro MT to - ACE_MT and DB to ACE_DB to avoid polluting the namespace. - -Wed Apr 12 11:14:46 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Reactor.C (close): Added code to close down the - pipe handles when the Reactor is shut down. Thanks to Mark - Patton (mark_patton@tx72.mot.com) for this info. - -Fri Apr 7 18:33:30 1995 Douglas C. Schmidt (schmidt@siesta.cs.wustl.edu) - - * Added a new method to CORBA_Handler so that handlers don't need - to subclass from CORBA_Handler, but rather can call the - CORBA_Handler::register_service() method (which is static). - Thanks to Chris Tarr (ctarr@objectspace.co) for this suggestion. - -Mon Apr 3 13:09:45 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added a new static method to Service_Config.[hC] called - end_event_loop(). This can be used to stop the run_event_loop() - method of the Service_Config. In addition, all the methods in - Service_Config were changed to be static to emphasize the fact - that the Service Configurator is a singleton... - - * include/Trace.h (ACE_TRACE): Changed the macro T to ACE_TRACE. - This will prevent namespace pollution. - - * Added support for the Orbix CORBA implementation. If you don't - have Orbix, you'll need to remove this flag from the - config-sunos5-sunc++.4.x.h file if you are compiling on SunOS - 5.x. - -Sun Apr 2 01:12:19 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added new support for C++ wrappers around the IP multicasting. - There are three new files in ./libsrc/IPC_SAP/SOCK_SAP called - SOCK_Mcast.[hiC] and a new test directory in - ./tests/Reactor/multicast and ./tests/Reactor/ntalker to - illustrate how to use this stuff. Thanks to Tim Harrison - (harrison@cs.wustl.edu) for this code. - -Sat Apr 1 18:48:40 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added support to the libsrc/Shared_Malloc/Memory_Pool.[hC] class - for System V shared memory, as well as for mmap(2) and sbrk(2) - memory. Please note that this has not been extensively tested - yet, so use with caution... - -Thu Mar 30 21:50:00 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Misc/Atomic_Op: Added the postfix versions of the ++ and - -- operators. This stops the Sun CC compiler from griping about - the "anachronistic" usage when using a++ rather than ++a. - Thanks to Bruce Worden for the - suggestion. - -Wed Mar 29 22:26:37 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Handle_Set: Fixed a weird problem where I was - using NOFILE as the max number of descriptors rather than - FD_SETSIZE. I don't know why I was doing this. - - * Also fixed up a problem with Handle_Set that was causing the - iterator to go nuts when it got a strange initial value of - fd_set in Handle_Set. Orbix triggers this kind of nonsense in - some cases... - -Tue Mar 28 21:01:36 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/Reactor/Reactor.C: swapped the order of dispatching so - that handle_exception methods are dispatched before handle_input - methods to improve response time for exceptions (e.g., OOB - data). Thanks to Detlef Becker - (beckerd@erlh.siemens.de) for suggesting this. - - * Fixed a bug in ./ASX/Stream.i that caused problems when a Module - was popped off a Stream. Thanks to Paul Stephenson for noticing - this and sending me the fix. - - * Changed the Reactor::dispatch methods so that they dispatch the - timers *before* dispatching the I/O-based event handlers. This - is helpful for systems that are time-delay sensitive. - - * libsrc/Reactor/Time_Value: Added new += and -= operators to - Time_Value. Thanks to Alex V. Maclinovsky - (garyh@teleng1.tait.co.nz) for this suggestion. - -Thu Mar 23 15:38:23 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/Addr/SPIPE_Addr.i (set): Fixed a problem that the - HP/UX compiler had with complex arithmetic expressions. - - * libsrc/Service_Configurator: fixed up the Service_Configurator - source code so that it will compile correctly on HP/UX - platforms. - -Tue Mar 21 00:28:25 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * libsrc/IPC_SAP/SOCK_SAP/LSOCK_Connector.h: Fixed an amazingly - stupid bug with LSOCK_Connector, where I was passing in a - default argument of PF_INET instead of PF_UNIX... Arrgh! - -Mon Mar 20 20:24:29 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Fixed up the $WRAPPER_ROOT/include/makeinclude/ directory to - define a new set of platform-specific configuration files. This - should greatly improve the portability of ACE to different - OS/compiler platforms. - - * Added a bunch of changes to allow ACE to build with Lucid C++ on - SunOs 4.x. This should also fix some other problems we've been - having with SunOS 4.x. Thanks to Lee Baker (baker@ctis.af.mil) - for these changes. - -Sun Mar 19 00:34:30 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added manual pages for all of the ./libsrc libraries. These - manual pages are all generated automagically from the libsrc - header files. - -Sat Mar 18 10:48:46 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Finally broke down and fixed the Makefile scheme so that there - is just one shared library (libACE.so) and one archive library - (libACE.a). This should massively simplify the application - development process, though it may require a bit of fixing of - Makefiles to remove all the -lReactor -lIPC_SAP stuff that was - in there before. - - * libsrc/IPC_SAP/TLI_SAP/: Fixed a stupid bug that was causing - core dumps since the TLI option pointers weren't initialized to - 0 in the TLI::TLI constructor. Thanks to Ed Brown for noticing - this (eebrown@netcom.com). - -Wed Mar 15 00:08:19 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added some new fixes to get ACE to run on OSF1 and Linux. - -Tue Mar 14 13:36:31 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added several changes to the source code and config-hpux.h - configuration file based on comments from Alex Ranous - (ranous@nsa.hp.com). In particular, changed ACE_HAS_NO_FDSET to - ACE_SELECT_USES_LONG. - -Mon Mar 13 09:23:58 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Improved the Makefile scheme so that the use of PTDIRS is no - longer required. The trick was to link the appropriate template - *.C files into the WRAPPER_ROOT/include directory. This enables - the compiler to find them in one single place. - -Sun Mar 12 22:35:50 1995 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added a new mechanism to clean up the insane number of -D's in - the Makefile. This new mechanism requires a bit more work at - installation time, but should greatly reduce the effort during - normal software development - (once ACE is installed...). See the INSTALL file - for more details. - -Fri Mar 10 17:29:02 1995 Douglas Schmidt - - * Fixed a stupid bug in Map_Manager.i which wasn't correctly - setting default values for fields in one of the Map_Manager - constructors. - -Fri Mar 10 08:54:42 1995 Doug Schmidt - - * /libsrc/Connection/Acceptor.i: Fixed a potential memory leak in - handle_input(). - -Thu Mar 9 11:59:54 1995 Doug Schmidt - - * Changed the Map_Manager::find() method to use class Read_Guard - so that multiple finds may proceed in parallel on a multiple - threaded application. Likewise, changed the implementation of - bind() and unbind() to use class Write_Guard so that destructive - operations will be serialized correctly. One consequence of - this is that RW_Mutex must be used instead of Mutex... - - * Added a new overloaded Map_Manager::unbind() method with an - INT_ID parameter. This parameter that passes back a reference - to the internal id being unbound. This allows the caller to - clean up any dynamic memory associated with the INT_ID. - -Tue Mar 7 13:32:17 1995 Doug Schmidt - - * Changed a bunch more things to get ACE to compile with - Centerline C++. This should also make ACE more portable to - other cfront-based compilers. - - * Had to change the ASX source in ACE to work around a stupid - problem with templates in cfront-based C++ compilers. - Fortunately, it was possible to mask most of the problems using - the C++ preprocessor. - - * There seem to be some problems with cfront-based compilers (such - as centerline). They don't like the new SYNCH::MUTEX usage in - the Message_Queue. - - * Removed several unused local variables in the INET_Addr::set() - method. - -Wed Mar 1 00:35:11 1995 Douglas C. Schmidt (schmidt@tango) - - * Added a major performance boost on high-speed networks. It - turns out that send(3) and revc(3) are slower than write(2) and - read(2) (since the latter are system calls, and the former are - library calls. Therefore, I added new overloaded methods to - SOCK_IO so that write(2) and read(2) are available to the user! - -Tue Feb 28 10:13:09 1995 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Reactor/Reactor.C: Fixed the implementation of the - Reactor::open and Reactor::Reactor constructor so that it is now - possible to resize the size of the Reactor *after* the - constructor has run (by calling open()) *without* having to shut - down the Reactor first. - - * Modified the Reactor::attach() method so that it will ADD the - new bits to the bitmask rather than SET them. Thanks to Mark - Patton for recommending this - (mark_patton@tx72.mot.com). - -Sat Feb 25 15:08:04 1995 Douglas C. Schmidt (schmidt@tango) - - * Released version 3.0.5. - -Fri Feb 24 17:57:01 1995 Douglas C. Schmidt (schmidt@tango) - - * Used the OSE class2man scripts to generate UNIX manual pages for - IPC_SAP, Thread, Connection, and Reactor. Other manual pages - will be forthcoming... - - * libsrc/IPC_SAP/Addr/INET_Addr.i: Fixed a bug in one of the - INET_Addr::set() methods that caused a segmentation fault if - host_name was NULL. In addition, greatly cleaned up the code so - that all the "set" methods share a common basis of code. - -Tue Feb 21 19:32:28 1995 Douglas C. Schmidt (schmidt@tango) - - * Updated the entire release to use the new SYNCH template - interface for Task, Module, Stream, and Message_Queue. This is - *much* cleaner, though it reveals some bugs with the Sun C++ - templates facility. - -Mon Feb 20 22:46:14 1995 Douglas C. Schmidt (schmidt@tango) - - * Changed the SPIPE_SAP, SOCK_SAP, and TLI_SAP *Connector class - methods from open() to connect(). This is a more accurate name - and it also fits in nicely with the Acceptor::accept() method. - - * Started integrating new versions of various header files that - include hooks to automatically generate documentation. - -Tue Feb 14 20:52:13 1995 Douglas C. Schmidt (schmidt@tango) - - * Changed the order in which the Reactor dispatches descriptors. - Originally, it dispatched the "read" descriptors *before* the - "write" descriptors. Now, it dispatches the "write" descriptors - first. This was necessary to handle weird behavior of sockets - over TCP/IP when data is piggy-backed with the final ACK on a - non-blocking connection. - -Mon Feb 13 15:49:21 1995 Douglas C. Schmidt (schmidt@tango) - - * Changed the name of Event_Handler::get_fd() to - Event_Handler::get_handle() to be more consistent with other - usage in ACE. - -Sat Feb 4 22:47:34 1995 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Service_Configurator/Service_Object: changed the - destructor to be virtual (thanks to Steffen Winther Sorensen - for noticing this). - -Sat Jan 28 16:29:49 1995 Douglas C. Schmidt (schmidt@tango) - - * Changed the name of class Map_Manager's Search_Structure struct - to Map_Entry. This is more specific to what that data structure - really does. - - * Began adding support for Linux, courtesy of sts@dad.stibo.dk. - -Sun Jan 22 23:15:38 1995 Douglas C. Schmidt (schmidt@tango) - - * Changed the name of the ./libsrc/Connector-Acceptor directory to - ./libsrc/Connection. Also changed the name of libConn_Acc.so to - libConnection.so to be more consistent. - -Sat Jan 21 13:59:18 1995 Douglas C. Schmidt (schmidt@tango) - - * libsrc/IPC_SAP: Fixed the *Acceptor classes for SOCK_SAP and - SPIPE_SAP so they behave just like FIFO_SAP and contain a method - called remove(). This method closes the underlying descriptor - and also unlinks the local address from the file system. - - * libsrc/ASX/Message_Queue.i (copy): Fixed this code so that it - correctly stores starting at the wr_ptr rather than the rd_ptr. - Thanks to Chris Cleeland - (chris@milo.st-louis.mo.us) for pointing this out - to me. - -Wed Jan 11 13:07:19 1995 Douglas C. Schmidt (schmidt@tango) - - * Changed all uses of class Thr_Manager to class Thread_Manager - and class Thr_Cntl to Thread_Control. This is more readable and - is now consistent with the documentation... - -Tue Jan 10 13:49:31 1995 Douglas C. Schmidt (schmidt@tango) - - * Modified the makefile scheme so that only the *.so files are - built by default. If you want to build both *.a and *.so files, - uncomment out the lines described in - $WRAPPER_ROOT/include/makeinclude/rules.lib.GNU. Note that this - will require you to run make on the ./libsrc directories twice - in order to properly build and install both the *.a and *.so - libraries. - -Mon Jan 9 22:57:29 1995 Douglas C. Schmidt (schmidt@tango) - - * libsrc/Reactor/Signal.h: Changed the name of the Signal_Block - class to the Signal_Guard class to be more consistent with the - Guard class in Synch.h. - -Sat Jan 7 19:49:46 1995 Douglas C. Schmidt (schmidt@tango) - - * tests/ASX/Event_Server/Event_Server: Revised the Event Server - test example to use the Acceptor pattern components. - -Fri Jan 6 23:38:21 1995 Douglas C. Schmidt (schmidt@tango) - - * Added a new method to class Task that turns a task into an - active object (i.e., associates a thread of control with the - task). This is useful since it replaces all the places in - application code that original said "this->thr_mgr_.spawn - (THR_FUNC - (&this->svc_run))", etc... - -Thu Jan 5 21:05:15 1995 Douglas C. Schmidt (schmidt@tango) - - * libsrc/ASX: Changed the capitalization of class STREAM to class - Stream. This seems more reasonable since I don't see any - particular reason to shout about Streams! - - * libsrc/ASX/Task: Changed name of method qreply() to reply() to - reflect the fact that the name of the class is no longer Queue! - - * libsrc/ASX: Made both Task and Message_Queue into parameterized - types. This greatly improves the ability to parameterized - synchronization into an application. - - * Changed all occurrences of timestruc_t to use Time_Value - instead. This helps to improve portability and reduce the - "impedence mismatch" caused by mixing both C and C++ types in - the ACE interfaces. Note that one drawback of this is that we - lose nano-second timing accuracy. However, I don't know of any - real OS platforms that support that degree of precision anyway! - - * libsrc/Reactor: Moved the static "zero" data member from the - Timer_Queue class to the Time_Value class. Also added a new - static data member called "zerop," which is a pointer to "zero". - - * libsrc/Threads/Synch: Changed the interface of class Condition - so that it no longer has both wait() and a timedwait() methods. - Since C++ has default values, these two methods were redundant. - Now, there is only a single method called wait(). By default, - it's argument is 0, which defaults to the original wait() - semantics. If the argument is non-zero then the timewait - semantics apply. - - * libsrc/Threads/Synch: Added a new class called Null_Condition. - This is similar to the Null_Mutex class in the sense that it has - the same interface as class Condition, but it's methods are all - no-ops - (however, wait() and signal() both set errno = ETIME - before returning...). This class is useful for - parameterizing synchronization into an application. - diff --git a/ChangeLogs/ChangeLog-96a b/ChangeLogs/ChangeLog-96a deleted file mode 100644 index 5aa3c9b69fc..00000000000 --- a/ChangeLogs/ChangeLog-96a +++ /dev/null @@ -1,3889 +0,0 @@ -Sun Jun 30 15:28:43 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i (cond_timedwait): Fixed the implementation of the - ACE_OS::cond_timedwait() wrapper such that if the - caller-specified timeout elapses without the condition variable - being signaled that errno is always set to ETIME. This fixes - some inconsistencies that occurred with POSIX pthreads and Win32 - threads. Thanks to Ross Dargahi for pointing - this out. - - * ace/SOCK.cpp: Changed SOCK::close() to use the new - ACE_OS::closesocket() call. This should fix some weird bugs - that have been lurking in the code for some time now! - - * ace/OS: Added a new method to ACE_OS called closesocket(). This - handles the differences between Win32 and UNIX in their - treatment of sockets (e.g., NT requires the use of - closesocket(), whereas UNIX requires the use of close(). Thanks - to Irfan, Prashant, and Tim for figuring this one out! - -Sat Jun 29 21:23:04 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/SPIPE_Acceptor.cpp (create_new_instance): Added the flag - (FILE_FLAG_OVERLAPPED) in call to CreateNamedPipe. - -Fri Jun 28 01:31:24 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Svc_Handler.cpp (open): Fixed a small typo that caused a - compile error if the DEBUGGING macro was enabled. Thanks to - Irfan for finding this. - -Wed Jun 26 03:19:27 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Synch_T.cpp (ts_get): The tss object allocated off the heap - should be released if setspecific fails. Thanks to John Lu - for reporting this. - - * ace/CORBA_Handler.cpp (handle_input): changed ACE_OS::send and - ACE_OS::recv to ACE::send and ACE::recv respectively in - CORBA_Handler.cpp. Thanks to Irfan for pointing this out. - - * ace/Service_Config: slightly modified the Service_Config.[h,cpp] - in order to make it possible to create an ACE_Service_Config - with an external ACE_Reactor as a parameter. On creation I was - handling this partly correct (i.e., not creating a new reactor). - However, there was no flag for remembering this for a later - deletion. Thus, on deletion I was doing a delete on the Reactor - regardless of who created it. This is now fixed. Thanks to - Karlheinz for pointing this out. - - * examples/ASX/CCM_App/CCM_App.cpp: Changed all uses of init (int, - char **) to init (int, char *[]) to work around a "feature" with - MSVC++ 4.x... Thanks to Karlheinz for pointing this out. - - * ace/OS.h: Added a new typedef of TCHAR to be compatible with - Win32 UNICODE type names... - - * ace/{Mem_Map,DEV_Addr,SPIPE_Addr,FILE_Addr}: Added UNICODE - support for Win32 to all interfaces that require filenames. - - * ace/{SPIPE_Stream,SOCK_IO,FILE_IO,DEV_IO}: Added a new pair of - send()/recv() methods that take ACE_OVERLAPPED pointers in order - to make it possible to integrate seamlessly with Win32 - overlapped I/O. Naturally, these methods are simply - "callthroughs" to the ACE_OS versions... - - * ace/OS: Added a new pair of send()/recv() methods that take - ACE_OVERLAPPED pointers in order to make it possible to - integrate seamlessly with Win32 overlapped I/O. - - * ace/SPIPE_Acceptor: Factored out common code in the Win32 - implementation of ACE SPIPES (which uses Win32 Named Pipes, of - course ;-)). - - * ace/SPIPE_Acceptor.h: Removed a vestige of the past -- - ACE_SPIPE_LISTENER_H should be ACE_SPIPE_ACCEPTOR_H... - -Wed Jun 19 19:35:12 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/SPIPE_{Acceptor,Connector}: Modified SPIPE_Acceptor and - SPIPE_Connector to implement Named Pipes on NT. The public - interface remains the same. - -Sun Jun 16 00:45:41 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Service_Config: Provided public accessor methods for the - following data memebers of the ACE_Service_Config: - - reconfig_occurred_ - end_event_loop_ - - Thanks to Steve Warwick for suggesting this. - - * ace/Synch*: Added UNICODE support for the ACE synchronization - classes (e.g., ACE_Mutex, ACE_RW_Mutex, ACE_Semaphore, etc.). - - * ace/OS: Added UNICODE support for the ACE_OS::dl_open() - function, as well as the ACE_OS synchronization functions. - - * ace/CORBA_Handler: Added Seth's changes for Orbix 2.0. - -Sat Jun 1 13:30:55 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Memory_Pool.cpp (remap): Fixed a bug in - ACE_MMAP_Memory_Pool::remap (). The test for whether or not the - addr falls within the range had a '!' (not) missing, that is, it - was failing when it should be succeeding and vice versa. - -Sun Jun 9 00:01:44 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.24 for testing. - - * ace: Changed all uses of ACE_Guard m (lock_) to ACE_GUARD - (LOCK, lock_), which is a macro that is defined as follows: - - ACE_Guard ace_mon (LOCK); \ - if (m.locked () == 0) return; - - The reason we need this is (1) detect locking failures, rather - than have things fail silently and (2) to automatically detect - deadlock in the Reactor. In addition, I also added - ACE_GUARD_RETURN, which is similar to ACE_GUARD, except that it - returns a "failure" status when the lock is not acquired. - Thanks to Karlheinz for suggesting this. - - * ace/Log_Msg: Added the new thr_state() accessors to Log_Msg. - - * ace/Thread_Manager.cpp: factored out some common code by having - the public interfaces (like resume() and suspend()) utilize the - protected interfaces (like resume_thr() and suspend_thr()). - - * ace/Thread_Manager.cpp: Added sanity checks for suspend(), - resume(), cancel(), etc. so that we don't blow up if someone - tries to perform an operation on an invalid thread id. - - * ace/Thread_Manager: Added a suite of new methods for - (1) cooperatively "canceling" threads and (2) testing if threads - are cancelled (also added similar checks to test if threads are - suspended or resumed). The cooperative cancellation mechanism - is based on a design fleshed out with Detlef and Karlheinz. - It's essentially a compromise between the powerful mechanisms - available via POSIX pthreads vs. the totally lame mechanisms - available in Win32. - - Here's how it all works: - - 1. Added several new methods to ACE_Thread_Manager: - - cancel(thr_id); -- cancels thr_id - cancel_all(); -- cancels all the threads in a Thread_Manager - cancel_grp(grp_id); -- cancels a group of threads in a Thread_Manager - testcancel(thr_id); -- returns "true" if thr_id has been cancelled - - 2. Updated ACE_Log_Msg to maintain the current state of a thread - in thread-specific-storage (TSS). Actually, it's more clever - than that since I really keep a *pointer* to the state of a - thread in TSS. This pointer actually points *back* to the - ACE_Thread_State field in the ACE_Thread_Manager! I use it - as a cache as follows: - - ACE_Thread_Manager::testcancel (thread_t t_id) - { - ACE_MT (ACE_Thread_Mutex_Guard m (this->lock_)); - - // Try to get the cached value out of TSS to avoid lookup. - ACE_Thread_State *thr_state = ACE_LOG_MSG->thr_state (); - - if (thr_state == 0) - { // We need to init the cache. - int i = this->find (t_id); - if (i == -1) return -1; - // Update the TSS cache. - ACE_LOG_MSG->thr_state (thr_state = &this->thr_table_[i].thr_state_); - } - return *thr_state == ACE_THR_CANCELLED; - } - - Note that this allows me to avoid searching the - Thread_Manager on every Thread_Manager::cancel() access - except the first one! - - 3. I've updated the examples/Threads/test_thread_manager.cpp - test file to exercise the new cooperative thread cancellation - scheme. It basically spawns a bunch of threads that go into - their own event loops doing - - if (thr_mgr ()->testcancel (ACE_Thread::self ()) != 0) - break; - - every so often. Naturally, the main thread cancels them by saying - - thr_mgr ()->cancel_grp (grp_id); - - when it wants to inform them to shut down. - - * ace/Thread_Manager: Moved the Thread_State enum from the - ACE_Thread_Descriptor class to OS.h and renamed it to be - ACE_Thread_State. This will make it easier to integrate the - state of a thread in thread-specific storage... - -Sat Jun 8 13:35:17 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i (sema_post): revised the implementation of the POSIX - Pthreads semaphore implementation just a bit in order to make it - slightly more efficient (it now releases the mutex before - signaling the condition variable). - - * ace/OS.i and config-aix.4.1.h: added a fix that separates the - decision about whether optlen is a pointer from the decision of - the type of optlen. This fixes a problem on AIX. Thanks to Bob - Olson for this fix. - - * ace/Proactor.h: Fixed a small glitch that was causing some - compilers to break due to the fact that they can't grok fully - qualified destructor syntax in the class definition. Thanks to - Alfred Keller for reporting this. - - * ace/OS.h: Added some Win32 macros (e.g., GENERIC_READ) to the - UNIX side of the house in order to compile the Proactor on Win32 - and UNIX. - -Fri Jun 7 19:36:27 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added a new Bourne shell script called ACE-install.sh that will - automatically download and install on UNIX machines. Thanks to - Ajit Sagar for contributing this. - -Thu Jun 6 00:37:02 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.23 for testing. - - * ace/Local_Tokens: Updated the *.cpp and *.i files to remove - warnings and generally improve the conformance to the ACE coding - guidelines. - - * examples: Moved the Proactor directory into the Reactor - directory since the Proactor and Reactor are really two - implementations of the same basic pattern. - - * ace/Memory_Pool.cpp: Fixed an inconsistency caused by not - updating __INLINE__ to __ACE_INLINE__. Thanks to Neil Cohen for - finding this. - - * ace: Added support for the Florida State PTHREADS package. - Thanks to Gary Salsbery and - Eric Beser for helping with this. - - * ace: Added support for the m88k OS. Thanks to Gary Salsbery - and Eric Beser - for helping with this. - - * ace/OS.h: Added a default value of NULL to the sigwait() OS - wrapper method to simplify the usecase in certain cases. - - * ace/Memory_Pool.cpp (commit_backing_store): Fixed what is - hopefully the last typo related to the ACE_DEFAULT_BASE_ADDR - macro. Thanks to Neil B. Cohen for reporting - this. - -Thu Jun 6 15:31:40 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * ace/CORBA_Handler.h: This version of the CORBA_Handler works - with Orbix 2.0. Most of the changes involve the use of C++ - Exception Handling (the removal of IT_X), and the location of - some CORBA system exception classes. - - * ace/Event_Handler.h: Added handle_*_complete methods for the - Proactor. The Proactor now takes Event_Handlers and calls back - the **_complete methods when overlapped I/O operations have - completed. - - * ace/Service_Config.h: Added static accessors for the Proactor to - the Service_Config object. Similar to the Reactor accessors, - applications can now use the Service_Config object as the global - access point to the Proactor event demultiplexor. - -Wed Jun 5 22:40:28 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i (t_free): Added a check to avoid deleting a NULL ptr. - This was causing problems for the TLI_Acceptor. Thanks to Ajit - Sagar for reporting this. - - * ace/Makefile: Changed things back so that both static and - dynamic libs are built by default... Thanks to Brad Brown - for pointing this out... - -Sat Jun 1 13:49:51 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.22 for testing. - - * Added Tim Harrison's latest tests for Proactor. - -Sat Jun 1 13:30:55 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Memory_Pool.cpp (remap): Fixed a bug in - ACE_MMAP_Memory_Pool::remap (). The test for whether or not the - addr falls within the range had a '!' (not) missing, that is, it - was failing when it should be succeeding and vice versa. - -Fri May 31 16:31:13 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Rereleased version 4.0.21 for testing. - - * Copied over new versions of the Proactor -- there was a small - problem with the UNIX version that caused it not to compile... - -Fri May 31 00:03:41 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * examples/Proactor/test_proactor.cpp: Added a test program for - the Proactor. Check examples/Proactor/README for more details - on this test example. - - * ace/Proactor.cpp: Added first pass at the Proactor for win32. - The Proactor is a Reactor-like abstraction that uses - asynchronous I/O, rather than synchronous I/O. On Windows NT we - implement the Proactor using overlapped I/O. We'll soon be - porting the Proactor to Solaris using POSIX 4.x aio_* API for - real-time programming. - - Unfortunately, the Proactor has not yet been integrated with - Windows NT WaitForMultipleObjects since it appears that I/O - Completion ports are not "waitable" objects on Windows NT. Does - anyone know if this has been fixed in release 4.0? - -Thu May 30 05:51:23 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Synch.i: Reordered the definitions of several methods in - Synch.i to avoid warnings from G++. Thanks to Marco Sommerau - for noticing - this. - - * ace/Log_Msg.cpp: There was a problem having to do with the order - in which static objects by G++. In particular, G++ was calling - the constructor of the lock_ mutex in Log_Msg.cpp *after* it was - being used for the first time. The right solution is to make - lock_ be a pointer and allocate it once in the instance() - method. Thanks to Marco Sommerau - for finding this - problem. - - * ace/TLI_Acceptor.cpp (close): Make sure to only close down the - TLI_Request_Queue if queue_ is non-NULL! Thanks to Ajit Sagar - for spotting this. - - * ace: Changed all the enums in the various SysV wrappers from - things like CREATE and OPEN to ACE_CREATE and ACE_OPEN to avoid - name clashes with other systems. In addition, also changed - NONBLOCK to ACE_NOWAIT to avoid clashes with the existing - ACE_NONBLOCK macro! Thanks to Steve Warwick - for suggesting this. - - * ChangeLog: Changed all usages of the INLINE macro to ACE_INLINE. - This avoids name clashes with other systems. Thanks to - Chris Eich for - suggesting this. - -Mon May 27 13:03:58 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Map_Manager.cpp (trybind): The function trybind() doesn't - return a value as it should. A return was missing from the last - line of the function. Thanks to Stuart Powell - for finding this problem. - - * ace/Acceptor.cpp (dump): The debug print referred to - "scheduling_strategy_" which doesn't exist in the relevant - class. Replacing it with "concurrency_strategy_" fixes the - problem. Thanks to Stuart Powell for - finding this problem. - - * ace/Mem_Map.i: Make sure to close down the file mapping - correctly when we upmap the view! - - * ace/OS.h: Changed the default shared memory address from 16 M to - 64 M in order to work around problems with AIX. - - * ace/Memory_Pool: Moved and renamed the enums in - ACE_Shared_Memory_Pool so that they'd be in OS.h. This makes it - easier to remember to change them if they are incorrect. Thanks - to Lionel Mommeja for suggesting this. - - * ace/Stream.cpp: Removed #if defined (ACE_HAS_THREADS) - - * ace/OS.cpp (svc_run): Added a Win32 try/except block to - Spawn_Args::svc_run so that we catch all Win32 structured - exceptions in order to make sure that we clean up correctly when - the thread exits. - -Sun May 26 11:37:08 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp: Used the new Win32 exception - integration in order to ensure that the Name Server will - transparently work correctly when the backing store is extended - by other processes on the same machine. - - * ace/Memory_Pool.cpp: Revised the ACE_MMAP_Memory_Pool to export - the mechanism for extending the virtual memory mapping. This - can now be called by other programs (e.g., in order to integrate - with Win32 Structure Exception Handling). - - * ace/Memory_Pool.cpp: Changed the use of ACE_OS::lseek() to - ACE_OS::filesize() in order to determine the current offset when - we're remapping the address space. - -Wed May 22 13:08:44 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/OS.h (ACE_DEFAULT_TIME_SERVER_STR): Added a new entry for - ACE_DEFAULT_TIME_SERVER_STR. - - * ace/Malloc_T.cpp (advance): Fixed two small bugs. In - ACE_Malloc::try_bind(), if we have a match we need to set - pointer to node->pointer_ and not node->name_. - Ina ACE_Malloc_Iterator::advance(), the continue in the for loop - should be for strcmp != 0 instead of == 0. - -Sun May 19 12:03:11 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.20 for testing. - - * ace/Service_Record.cpp (remove): Fixed a very mysterious bug - that was caused by deleteing an object and then trying to access - it's next_ pointer. This worked on UNIX, but fortunately the - MSVC++ compiler does special things to deleted memory and the - bug was revealed! At long last, MSVC++ does something right - ;-). - - * ace/Module.cpp: Revised the code a bit to use the ACE_SET_BITS - and ACE_CLR_BITS macros to improve readability. - - * ace/SV_Semaphore_Complex.cpp (open): Fixed a race condition - where we weren't correctly checking for EIDRM. Thanks to - Michael Fortinsky for reporting this. - -Sat May 18 10:49:04 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Added a new ace.mak and ace.mdp file for Win32. - - * ace/Service_Record.cpp: Rewrote some code to work around a bug - with MSVC++. This bug was causing problems since the - ACE_Shared_Object methods were getting called, rather than the - Test_Task methods used in the examples/ASX/CCM_App.cpp file. - Thanks to Tom Leith for pointing out this problem! - - * ace/OS.h: Added a new #define for ACE_DEFAULT_SVC_CONF to deal - with differences between NT and UNIX pathnames. - - * ace/Time_Value.h: Moved the definition of the INLINE macro from - OS.h to Time_Value.h so that it will be in scope for - Time_Value.i. Thanks to Neil Cohen for reporting this. - - * examples/Reactor/Misc/signal_tester.cpp: There was a typo in - signal_test.cpp. It had mean to use handle_input() rather than - handle_output() to exercise the asynchronous signal handling - capabilities. This is fixed now. - - * apps/Synch-Benchmarks/Benchmark.cpp (thr_id): Added a new #if - define (ACE_HAS_DCETHREADS) to make this work on AIX. Thanks to - Greg Wilson for reporting this. - - * ace/Local_Name_Space: Moved ACE_NS_String and ACE_NS_Internal - from the *.cpp file to the *.h file to work around a "feature" - of the AIX C++ compiler. Thanks to Greg Wilson - for reporting this. - - * ace/Reactor.h (ACE_Handler_Repository): Changed the type of - cur_size_ from size_t to ssize_t to avoid type mismatches. - - * ace/Name_Request_Reply.cpp (decode): Fixed some inconsistencies - between signed and unsigned loop counters... - - * ace/OS.h: Changed the typedef of pid_t on Win32 from - DWORD to long to be consistent with UNIX. - -Thu May 16 18:49:14 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.19 for testing. - - * build/SunOS5.4/ace/ACE.cpp (ldfind): Fixed a bug in ldfind() - that caused a segfault if we didn't resolve the filename in the - LD_SEARCH_PATH. - - * ace/Reactor and Timer_Queue: Changed the interface of cancel() - to include a const void **arg. If arg is non-NULL then it will - be set to point to the ``magic cookie'' argument passed in when - the Event_Handler was registered. This makes it possible to - free up the memory and avoid memory leaks. - - * ace/Service_Record: Removed the #ifdefs that checked if - ACE_HAS_THREADS because we ought to be able to build all of this - stuff now that we've got the ACE_OS wrappers. - - * ace/Svc_Conf.y: Removed the #ifdefs that checked if - ACE_HAS_THREADS because we ought to be able to build all of this - stuff now that we've got the ACE_OS wrappers. - - * ace/OS.h (ACE_DEFAULT_BACKING_STORE): Made a different - ACE_DEFAULT_BACKING_STORE for NT and for UNIX to handle the - differences in directory separator characters... - -Wed May 15 18:45:48 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * examples/ASX/CCM_App/CCM_App.cpp: Fixed up the test application - so that it should support dynamic linking on Win32. Thanks to - Tom Leith for reporting this. - - * ace: Added the ACE_Export macro to class ACE and the various - "helper" classes related to ACE_Malloc in order to have this - work properly when use with ACE_Malloc outside of the ACE DLL. - - * ace/Svc_Conf.l: Added support for '\' and ':' in the regular - expression for an ACE pathname in order to support Win32 - filenames (e.g., "C:\foobar\"). Thanks to Tom Leith - for reporting this. - - * ace/Malloc_T.cpp (ACE_Allocator_Adapter): Moved the constructor - from the *.i file to the *.cpp file and added a new constructor - that takes both a pool_name *and* a lock_name. This is - necessary because the ACE Malloc now has this API, as well. - - * examples/Threads/test_barrier.cpp (main): Fixed a bug that was - caused by the main() thread exiting before all the other worker - threads had finished "waiting" on their Barrier. The fix is to - use ACE_Thread_Manager to control the thread exits... - -Mon May 13 00:03:09 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * examples/Connection/non_blocking/CPP-acceptor.cpp: Modified the - implementation of the Svc_Handler::open() method so that it will - truly behave as an iterative server (as advertised...). - Currently, it behaves as a half-iterative server (i.e., the - Oneshot_Acceptor is iterative, but the Svc_Handler is - "concurrently"), which is causing problems because we're wiping - out the values of Svc_Handler each time through the main event - loop. Thanks to Gerolf Wendland for noticing this problem. - - * ace/Log_Msg: Added an alternative logging mechanism that makes - it possible to integrate variable argument lists from other - logging mechanisms into the ACE mechanism. Thanks to Chris - Lahey for proposing this. - - * ace/Synch.h: Moved ACE_Process_Mutex so that it appears *after* - ACE_Mutex (since it depends on ACE_Mutex). Thanks to Dieter - Quehl for finding this. - - * Released version 4.0.18 for testing. - - * ace/Name_Space.cpp: Added the ACE_BUILD_DLL macro at the - beginning of this file so that it will build as a DLL on NT - correctly. - - * ace/Name_Space.cpp: Added a default constructor for - ACE_Name_Binding so that it will compile when used as a template - argument for ACE_Unbounded_Set. - -Sun May 12 14:23:44 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Map_Manager: Totally reworked the Map Manager so that it can - be more flexible with respect to where the allocator comes from. - This is necessary for certain parts of ACE (e.g., - Local_Name_Space) that must be very careful about which - allocator is used to manage memory. - - * ace/Synch: Moved ACE_Process_Mutex and ACE_RW_Process_Mutex - *outside* of the ACE_HAS_THREADS #ifdef since these are now - always defined on all platforms (because the Process_Mutex stuff - uses SV Semaphores, which are portable even if we don't have - threads!). - - * ace/Naming_Context.cpp (parse_args): Removed an unnecessary call - to strdup(). This was detected by Purify! - -Sun May 12 14:26:20 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp (shared_bind): Fixed a small bug. In - computing type_len in shared_bind(), we needed to add 1 to - account for the NUL character. - - * ace/Local_Name_Space.cpp: (list_types): Fixed some potential - memory leaks. In list_types() as well as list_type_entries() - calling pattern.char_rep() was allocating memory which was never - getting deleted. Similarly, in list_names() and list_values, - call to char_rep was also allocating memory that was not getting - deleted. - -Sat May 11 16:19:51 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Log_Msg.cpp (local_host): added a static member to - ACE_Log_Msg that maintains the local host name. Now, instead of - always displaying "", we can insert the actual local - name into the object and then it will be automatically printed - when VERBOSE mode is enabled. Thanks to Chris Lahey for - suggesting this. - - * ace/Local_Name_Space.cpp: Used the new ACE_Name_Binding class to - simplify the implementation of all the list_* methods in - ACE_Local_Name_Space. - - * ace/Name_Space.cpp: Made a number of changes to the - ACE_Name_Binding class in order to make it work more efficiently - and concisely (e.g., reduce the amount of copying and eliminate - the need for converting the type field back and forth to/from - ACE_WStrings). - - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp: - Fixed a typo where #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) - was *before* the #include of the header file that defines this - macro! Thanks to Nigel for pointing this out, as well. - - * ace: Added a number of fixes to make ACE compile on SCO UNIX - 3.2.4 using gcc 2.7.2. Thanks to Nigel Lowe for - helping with this. - - * netsvcs/lib/Name_Handler.cpp: operation_ needs to be declared as - just LIST_OP and not ACE_Name_Handler::LIST_OP. For some strange - reason NT complains otherwise. Thanks to Prashant for finding - this. - -Fri May 10 01:09:17 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Added new versions of ace.mak and ace.mdp to fix a couple - of minor typos. - - * ace/Malloc_T.cpp (ACE_Malloc): Added a new constructor that - takes both the pool_name and the lock_name explicitly. This is - more flexible. Thanks to Ramesh Nagabushnam - for suggesting this. - - * ace/Malloc_T: Modified the constructor of ACE_Malloc so that by - default the name of the memory pool (which is also used as the - name of the lock...) is ACE_DEFAULT_MUTEX. - - * Released version 4.0.17 for testing. - - * ace/Connector.cpp (create_AST): Must reset errno = EWOULDBLOCK - to avoid making caller's think that something else has gone - awry... Thanks to Steve Warwick for chasing - this down! - - * ace/ACE.cpp (handle_timed_complete): If you issue a non-blocking - connect on a socket, you will have back a failure with errno = - EINPROGRESS. Then, if for some reason, the connection could not - be established, the select (which you have to issue to know - about the completion of connection) will return you the fd set - both in the read mask and in the write mask (infact select - returns 2 in this case). The behaviour above affects the method - ACE::handle_time_complete, so I changed the last part of the - above method, this way: - - if (n <= 0) - { - ... - ... - } - else if (rd_handles.is_set(h)) - { - char dummy; - // The following recv() won't block provided that the - // ACE_NONBLOCK flag has not been turned off . - - if (ACE::recv (h, &dummy, 1, MSG_PEEK) <= 0) - return ACE_INVALID_HANDLE; - } - - // 1. The HANDLE is ready for writing or 2. recv() returned that - // there are data to be read thus the connection was successfully - // established. - return h; - - That is, I reversed the sense of the tests so that the - rd_handles() is checked first for failure along with the recv(). - Thanks to Antonio Tortorici for - suggesting this. - - * examples/Threads/test_thread_manager.cpp (main): Changed argv[1] - to argv[2]. Thanks to Andres Kruse for finding - this problem. - - * examples/Connection/non-blocking: Fixed some nasty bugs that - caused the non-blocking connector and acceptor test programs to - crash and burn. Thanks to Steve Warwick and Gerolf Wendland for - finding this problem. - - * ace/SV_Semaphore_Simple.cpp (open): Check for - ACE_INVALID_SEM_KEY and return -1 in this case. - - * ace/Synch.h: Removed the default value of 0 for the name of the - ACE_Process_Mutex and the ACE_RW_Process_Mutex and replaced it - with a new macro called ACE_DEFAULT_MUTEX. Using 0 didn't make - any sense on either NT or UNIX because process-wide Mutexes - should be named! - - * ace/SV_Semaphore_Simple.cpp (name_2_key): Added a check for name - == 0 and bail out of that's the case rather than crash! - - * ace/Reactor.cpp (wait_for_multiple_events): In the Reactor's - wait_for_multiple_events method, the do {} while () around the - select/poll system call is trying to wait until some "good" - event occurs, with handle_error() taking care of unexpected - problems. In the case of a bad file descriptor, however, - handle_error() returns 0. This was exiting the loop because the - loop exit condition was: - - do { /* ... */ } while (nfound == -1 && this->handle_error () > 0); - - which eventually causes ACE_Service_Config::run_event_loop() to - exit. Since the offending file descriptor is handled by - handle_error(), the loop should continue. Therefore, I've - changed the while to read: - - while (nfound == -1 && this->handle_error () >= 0); - - Thanks to Eric C. Newton for providing this fix. - - * ace/INET_Addr.cpp (string_to_addr): Changed the order of the - parameters so that the form is now "ip-address:port". This - should (finally) be consistent for both string_to_addr() and - addr_to_string()... - - * ace/Log_Msg: Changed the char * parameter of the log() method to - const char *. Thanks to Chris for suggesting this! - - * ace/Synch_T.cpp: Moved the #if defined (ACE_HAS_THREADS) down to - the right part of the file... Thanks to Alex Karev - for finding this. - - * ace/Malloc.h: Added a very important #else... Thanks to Alex - Karev for finding this. - - * ace/Signal.i (ACE_Sig_Guard): Changed the sense of the #ifdef - tests in the ACE_Sig_Guard constructor and destructor from #if - !defined (ACE_MT_SAFE) to #if 0 // !defined (ACE_MT_SAFE) in - order to get the right semantics for signals (which should be - blocked "process wide"). - - * ace/Synch_T.h: put the frigging copy constructor in the public - section of ACE_Atomic_Op because it was causing trouble for - NT... - -Mon May 6 00:11:37 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.16 for testing. - - * ace/Log_Msg.cpp: Was defining ACE_Recursive_Thread_Mutex in the - wrong place (i.e., outside of the #if defined (ACE_MT_SAFE). - This was screwing up HP/UX. Thanks to Neil Cohen for pointing - this out! - - * Incorported new versions of ace.mdp and ace.mak for Win32. - -Sun May 5 16:18:43 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * netsvcs/lib/Server_Logging_Handler.cpp (handle_input): Fixed a - bug whereby handle_input() was returning the number of bytes - read by handle_logging_record() rather than 0 or -1. This was - causing problems for the logger since it was hanging in read()! - - * ace/Synch_T.cpp: Fixed some minor problems with the use of const - in ACE_Atomic_Op that was causing warnings. - -Sat May 4 16:31:46 1996 Douglas C. Schmidt (schmidt@mambo.cs.wustl.edu) - - * ace/SOCK_Dgram_Bcast: Reimplemented most of the ACE socket - broadcast mechanism to (1) clean up the code and have it use - other parts of ACE and (2) make it work for Windows NT. Thanks - to Steve Weismuller for the basic - ideas here. - - * ace/INET_Addr: Added a new method to set the port number without - changing the host address. This is useful in the broadcast - class. - - * ace/Log_Record.cpp (print): Changed the hack of replacing the - newline with a call to flush() instead. This seems like a - better fix. Thanks to Alex for suggesting it. - - * ace/Log_Msg.cpp (log): Moved the order of the print operations - so that the ostream one goes last. This avoids a nasty problem - due to the fact that it replaces the newline (if any). Thanks - to Alex for pointing this out too! - - * ace/Log_Msg.cpp (log): Don't auto-increment bp at the end of - the log() method, instead just terminate it: - - *bp = '\0'; // Terminate bp. - - This makes the length computation correct... Thanks to the - ever-vigilent Alexandre Karev for - reporting this. - - * examples/Shared_Malloc/test_malloc.cpp: Fixed a bug where a void - * that was really an int was being cast incorrectly. Thanks to - Raj for pointing this out. - -Sat May 4 12:51:25 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Reactor.cpp (find): Modified the ACE_Handler_Repository so - that it doesn't crash when it isn't initialized properly. - Thanks to Darrin for pointing this out. - - * ace/Synch_T.cpp (wait): Changed the call wait(ACE_Time_Value *) - to wait(const ACE_Time_Value *) since wait() will not change the - time value object. - - * ace/Thread_Manager.cpp (wait): Changed the call - wait(ACE_Time_Value *) to wait(const ACE_Time_Value *) since - wait() will not change the time value object. Thanks to Chris - Lahey for suggesting this. - - * ace/Synch.h: Added a (const char * = 0) argument to - ACE_Null_Mutex so that it would work correctly with - ACE_Thread_Mutex and ACE_Process_Mutex... - -Fri May 3 17:26:07 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * netsvcs/lib/Name_Handler.cpp (lists_entries): Used '_' with - name/value/type in ACE_Name_Binding to be consistent with the - notation. - -Fri May 3 02:24:19 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Synch: Updated ACE_Process_Mutex to use SV_Semaphore_Complex - as the UNIX implementation. This seems like the only portable - and robust way to get the same semantics on UNIX and on NT! - - * ace/Malloc_T: It turned out there was a subtle bug with - ACE_Malloc on NT when used with the ACE_Process_Mutex - concurrency policy. On NT, we were storing the *HANDLE* of a - mutex in shared memory. Naturally, this didn't make any sense - since each HANDLE is relative to only one process!!! (duh ;-)). - This worked fine on UNIX because mutex_t's created with - USYNC_PROC mode can be stored in shared memory and accessed - directly... - - We fixed this by changing ACE_Malloc so that the - LOCK is allocated in non-shared memory. We then - fixed ACE_Process_Mutex so that on UNIX it is - implemented with SV_Semaphore_Complex. This is - (a) portable and (b) it gives the right semantics. - - As a result, we were able to totally eliminate the storage of - the lock in shared memory. Therefore, it doesn't matter of the - host crashes anymore! In addition, we were able to totally - remove the ugly "init_finished" lock that was previously stored - in shared memory by ACE_MMAP_Memory_Pool. This is *much* - cleaner!! - - Thanks to Karlheinz et al for pointing this problem out in the - first place! - - * ace: Removed a stray file called Svc_Conf_tokens.h. This was - causing problems on Win32 due to name clashes... Thanks to Adam - Miller for pointing this out. - - * ace/SString.cpp (strstr): there were some for (size_t j; ...) {} - if (j == x) constructs in the code that have as of recently - become non-standard. Thanks to Darrin - for reporting this. - -Tue Apr 30 00:18:46 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Thread.i (self): Commented out the ACE_Trace call in the - ACE_Thread::self() methods to avoid infinite recursion problems - on Win32. - - * ace/Token.cpp (ACE_Token): Commented out the ACE_Trace call in - the constructor of ACE_Token to avoid infinite recursion - problems on Win32. - - * ace/Log_Msg.cpp (instance): Moved the definition of the static - variable keylock_ into the static instance() method in order to - avoid "order of initialization" problems on Win32. Thanks - to Tim for figuring this out! - -Sun Apr 28 17:07:58 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * netsvcs: Rearranged and renamed the subdirectories so that they - are now called ./netsvcs/{lib,clients,servers}. In addition, - moved the Logger, Naming, and Tokens examples from ./examples - into the ./netsvcs/clients directory in order to make the - relationships more clear. - -Sat Apr 27 14:23:43 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Name_Space.cpp (operator ==): Created a new file - Name_Space.cpp and moved the definitions for - ACE_Name_Binding::operator== and ~ACE_Name_Space in it. Also - modified code to use '_' at the end of name/value/type in - ACE_Name_Binding. - -Sat Apr 27 16:00:03 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/INET_Addr.i (get_host_addr): There was an error where - sprintf(s,"%d:%s" ...) should have been %s:%d. Thanks to - Raj for pointing this out. - -Mon Apr 22 01:24:45 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Dump_T.h: #included "ace/Dump.h" so that this file will - compile on HP/UX. Thanks to Neil Cohen for reporting this - problem. - - * Released version 4.0.15 for testing. - - * ace/Synch_T: Added the appropriate "const" qualifiers to certain - operators in ACE_Atomic_Op. - -Sun Apr 21 12:54:18 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Fixed a problem that Dieter was having with the Name Server - when toggling between Naming_Contexts. Basically, what I've - done is - - 1. Moved the unmap() call into the ACE_Mem_Map::close() method - (this ensures that the region is correctly unmapped when the - Mem_Map is deleted). - - 2. I've removed the call to this->allocator_->remove () within - ~ACE_Local_Name_Space. This ensures that we don't remove the - backing store file. - - * ace/Mem_Map.cpp: Modified the ACE_Mem_Map::remove method to call - ACE_Mem_Map::close() in order to share code. - - * ace/Mem_Map.cpp: Modified the ACE_Mem_Map::close() method so - that it unmaps the mapped region before closing down the backing - store. This prevents "dangling mapping." - - * ace/Local_Name_Space.cpp (ACE_Local_Name_Space): Initialized all - the pointers to NULL. - - * ace/Synch_T.cpp (ACE_Atomic_Op): Enhanced the Atomic_Op - implementation by adding an assignment operator and disallowing - the copy constructor (forcing objects of ACE_Atomic_Op to be - passed by reference). - - * examples/Naming/Client/Client_Test: Reorganized the code for - Client_Test so that it will run correctly as a Win32 netsvc - (e.g., added the ACE_Svc_Export macro). - -Sun Apr 21 20:23:40 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Naming_Context.cpp (close): Added a new method to - Naming_Context called close() that deletes the instance of - name_space_. - - * ace/Local_Name_Space.cpp (ACE_Local_Name_Space): Added stuff to - the destructor of Local_Name_Space so that it calls remove on - the allocator_ to ensure we unmap the file. Also, we delete the - allocator_. - - * examples/Naming/Client/Client_Test.cpp (set_proc_local): Changed - set_proc_local (), set_node_local() and set_host() so that - before we change name space, we do a close() on - Naming_Context. The close ensures that we unmap the file as well - as delete the instance of the name space. - -Sat Apr 20 12:39:20 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Removed the Name_Options.* files and merged the - ACE_Name_Options class into Naming_Context.*. This simplifies - some order of include problems... - - * ace/Naming_Context.cpp (init): Switched the code so that rather - than always opening with ACE_Naming_Context::PROC_LOCAL, we use - ACE_Name_Options::context(), which can be overridden by using - the new -c command-line option (e.g., -c NODE_LOCAL). Thanks to - Dieter for suggesting this. - - * ace/OS.i: Modified the Win32 implementation of all the - ACE_OS::flock_*lock() methods so that they'd have the same - behavior as the UNIX ones with respect to a length of 0 meaning - "lock the entire length of the file." This works, of course, by - having each method check if len == 0, and if so, calling - GetFileSize() to set the size of the file. - - * ace/Synch.h: Changed the default len value for all the - File_Lock::*acquire* methods to 1 rather than 0 to work around a - problem with Win32. Thanks to Detlef for reporting this. - - * ace/ACE.cpp (ldfind): Added a strdup() of the LD_SEARCH_PATH - returned by getenv() so that we don't overwrite the environment - variable by using strtok(). Thanks very much to Prashant for - figuring this out! - -Thu Apr 18 22:13:43 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * examples/Naming/Client/Client_Test.cpp (list_value_entries): - Added check in list_name_entries and list_value_entries to see - if type actually exists before trying to print it out. - -Wed Apr 17 16:40:42 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.14 for testing. - - * Added Tim Harrison's new instructions for building and using ACE - as a DLL and SLL on Win32. - - * ace/Svc_Conf.h: Due to the new changes to the yacc code, I had - to move the definition of YYSTYPE into the Svc_Conf.h file - rather than have it in the Svc_Conf.y file. This solves a - variety of multiple-inclusion problems... - - * ace: Modified all the yacc token symbols so that they will be - prefixed with ACE_. This avoids namespace pollution problems. - - * Added the ACE_STATIC_SVC* macro support to a number of files so - that the static versions of all the ACE services will be - registered with the ACE Service Repository correctly. Thanks to - Jesper for pointing this out! - - * ace/OS.h: the first occurence of - - typedef thread_t tid_t; - - in the OS.h file should read - - typedef pthread_t tid_t; - - Thanks to Jan Rychter for reporting this. - - * ace/Read_Buffer.cpp: Fixed rec_read() so that it will fail - correctly when new fails! - -Wed Apr 17 19:05:42 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * netsvcs/lib/Name_Handler.cpp (type_request): Here is a brief - description of the changes made to ACE_Name_Handler to simplify - the dispatch method and make it more elegant: - - 1) I created a table called op_table_. It contains pointers to - member functions of ACE_Name_Handler. This table can be - indexed using the msg_type. However, I went one step further - to have all the list methods be grouped under two - methods. That is, requests for list_names, list_values, and - list_types are handled by one method called lists() and - similarly, requests for list_name_entries, - list_value_entries, and list_type_entries are handled by - another method called lists_entries(). A MASK is used to have - the op_table_ index to the same method for these requests. - - 2) I also created another table called list_table_. This is - primarily used by lists() to keep track of a couple of things: - + pointers to member functions of Name_Handler that - handle the actual request. - + pointers to member functions of Name_Handler that act - as factories to create the appropriate request to - send back. - + description of the message type. - - A different MASK is used to index into the list_table_ to - invoke the appropriate method or get the appropriate description. - - 3) Within the method lists_entries(), I once again make use of - the pointers to member functions technique. This time, - however, I use pointers to member functions of Naming_Context - which I assign in the switch statement. - -Tue Apr 16 13:03:49 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.13 for testing. - - * ace/INET_Addr.i: moved the get_port_number routine up to the top - of the file so it gets defined before it is used. Linux did not - like it where it was... Thanks to Neil Cohen for reporting - this. - - * ace: Split the Dump.* files into Dump_T.* files. This is - necessary to support the template policies of various C++ - compilers. - - * ace/Malloc_T.cpp (dump): Fixed an erroneous use of -> since - guard_ is a non-pointer... Thanks to Neil Cohen for reporting - this. - - * ace/Log_Record.cpp (print): Finally figured out how to do - extensible ostream logging so that it will seamlessly work with - ACE_Log_Msg. This required one change to ACE_Log_Record, - however. In Log_Record.cpp: - - In ACE_Log_Record::print(char *, int, ostream, size_t len), added - - char *t = this->msg_data_[len - 1]; - - if (t == '\n') - *t = '\0'; - - s << this->msg_data_ << endl; - - This is required because the virtual function overflow() in - streambuf does not get called until endl is called to flush the - buffer. Note that (at least on AIX), '\n' is treated separately - from endl and will not cause the overflow() function to be - called. Thanks to Chris Lahey for this idea. - - * ace/OS: Added a new wrapper for strrchr(). - - * ace/Token_Collection.cpp (renew): Added a cast of - (const char *) to token_name so that the conversion operator - will get called correctly. Thanks to Gonzalo Diethelm - for reporting this. - -Tue Apr 16 13:29:32 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Name_Request_Reply.cpp (decode): Fixed a small bug in encode() - and decode() of ACE_Name_Request. When doing ntohs and htons, we - only ought to do it for the name and value part of data. type - needed to be left alone since it is not a short. - -Mon Apr 15 02:31:00 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/makeinclude/platform_hpux_orbix.GNU: Added - David.L.Sames.1@gsfc.nasa.gov (David Sames) config*.h file and - platform_*.GNU file for HP/UX 9.x using Orbix. - - * ace/OS.i: Fixed all uses of pthread_cleanup_{pop,push} so that - they will work correctly if (1) the OS implements the as macros - and (2) if these macros must obey strict nesting rules... - Thanks to Reginald S. Perry for pointing out - how to do this effectively. - - * ace/Thread_Manager.h: Fixed a typo where the typedef - - typedef (ACE_Thread_Manager::*THR_FUNC)(int, int); - - was lacking a return value. Thanks to Reginald S. Perry - for reporting this. - - * netsvcs/bin/main.cpp (main): Fixed the main program so that it - passes the options correctly for the statically linked service - invocations. Thanks to Jesper for reporting this. - - * examples/Naming/Client/Client_Test: Updated the client test - program so that it will work on Window NT, where it's not valid - to select() on non-socket HANDLEs (ugh). Thanks to Jesper for - pointing this out... - - * Released version 4.0.11 for testing. - -Mon Apr 15 00:20:02 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp (strstr): Fixed ACE_NS_String::strstr - to function properly. It was assuming that length of the pattern - as well as the string was in units of ACE_USHORT16 when in - reality the length is number of bytes. - - * ace/Local_Name_Space.cpp (value_): Modified ACE_NS_Internal so - that instead of taking an ACE_NS_String for type, it now take a - char*. It therefore keeps type around as a char*. This should - help solve some problems we were encountering with byte ordering - when sending data between NT machines and Sun. - - * netsvcs/lib/Name_Handler.cpp: Cleaned up lists_entries by making - use of pointer to member functions. A single call to the - appropriate list method takes care of everything. - -Sun Apr 14 16:21:32 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/INET_Addr.i (addr_to_string): Swapped the order that the - hostname and port number are printed to make this consistent - with the way that ACE_INET_Addr::string_to_addr works. Thanks - to Ashish Singhai for pointing - this out. - - * ace/TLI_Acceptor: Changed the methods to take an ACE_Addr rather - than an ACE_INET_Addr. This allows other address families (such - as DECnet) to be used with the TLI wrappers. Thanks to Ajit - Sagar for suggesting this. - - * ace/Local_Name_Space.cpp (list_types): Removed the use of - regular expression matching for the name and value types of the - name server and replaced these with substring matching instead. - This is necessary since we're working with wide characters here, - and it doesn't make any sense to perform regular expressions on - these puppies... - - * ace/Local_Name_Space.cpp: Added a new strstr() method on all the - ACE_NS_String class so that we can compare substrings for wide - character types. - - * ace/SString: Added a new strstr() method on all the - ACE_[WSC]String classes so that we can compare substrings, - even for wide character types! - - * apps/gperf: Incorporated the GNU gperf program from the FSF. - We're going to make some improvements to this for a subsequent - paper. - -Sun Apr 14 15:30:05 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Name_Request_Reply.h: Changed the enum values for the - Constants such as BIND, REBIND, etc. The new values allow us to - do bitwise operations using MASK to be able to dispatch the same - method for all the list operations. For use case of this, please - see Name_Handler::dispatch(). - - * netsvcs/lib/Name_Handler.cpp (dispatch): Completely changed - dispatch() so that now it uses a table of pointer to member - functions to call the appropriate method when a request - arrives. In addition, requests for LIST_NAMES, LIST_VALUES, and - LIST_ENTRIES are now handled by one method called lists() in which - I factored out a lot of common code. Similarly, requests for - LIST_NAME_ENTRIES, LIST_VALUE_ENTRIES, and LIST_TYPE_ENTRIES are - handled by lists_entries(). This has really cleaned up the code. - -Sat Apr 13 15:26:51 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Name_Request_Reply.cpp: Made changes so that all - byte-ordering computations take place in encode and decode - methods of ACE_Name_Request_Reply and ACE_Name_Reply - only. Previously some of these computations were taking place in - Get/Set methods such as name_len() which was highly error prone. - (init): Added new methods called init() to both ACE_Name_Request - and ACE_Name_Reply that initialize length to size of transfer_. This - is needed since the length gets set only once in the constructor - and after that each call to encode() switches the byte ordering - causing problems. - -Sat Apr 13 11:44:16 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.10 for testing. - - * ace: Removed the ACE_HAS_THREAD_T macro from various places. - This was unnecessary given the new scheme for dealing with - threading. - - * ace/config-linux-pthread.h: Fixed a typo that was preventing - compilation from working. Thanks to Jan Rychter - for finding this. - -Fri Apr 12 13:17:47 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Gateway/Gateway: The gateway application appears to - be working again! - - * ace/OS.cpp (thr_create): Based on conversations with Chris - Lahey, modified the pthreads ACE_OS::thr_create implementation - so that it doesn't try to assign the hthread_t thr_handle since - this is meaningless in pthreads... - - * apps/Gateway/Gateway/Gateway.cpp: Fixed a typo that was causing - the system to go into an infinite loop when the config file was - empty! - - * apps/Gateway/Gateway/Gateway.cpp: I was forgetting to set the - line_number to 0 before calling read_entry()... - - * ace/Parse_Node.cpp: Fixed a dumb error that arose because I - forgot that you can't call dlerror() twice and get the same - result (it returns NULL the second time). As usual, RTFM. - - * ace: Removed ACE_HAS_TLI from all the SunOS 4.x config*.h files - and platform_*.GNU files. There are just too many bugs with TLI - on SunOS 4.x to support it by default... - - * examples: Made some minor fixes to make the examples all compile - with GCC. - - * apps/Gateway/Gateway/Gateway: Reimplemented the Gateway - application as to be an ACE network service. This should make - life much easier on platforms with broken C++ templates... - - * apps/Gateway/Gateway: Revised the Config_Parser.* files so that - templates would be split from the non-templates. This avoids - bugs with some C++ compilers... - - * ChangeLog: added the ACE_TEMPLATES_REQUIRE_SPECIALIZATION flag - to the config-linux-pthreads.h file. Thanks to - Jean-Francois.Ripouteau@netsurf.org for reporting this, and also - for archiving the ACE mailing list. - -Thu Apr 11 01:37:25 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.9 for testing. - - * ace: regenerated all the manual pages and html pages. - - * Built ACE successfully on SGI IRIX 5.3 using GNU G++ 2.7.2. - - * ace/Thread_Manager: renamed the descriptor() accessor methods to - hthread_descriptor() and thread_descriptor() to avoid - ambiguities due to the fact that hthread_t and thread_t can now - be the same type. - - * ace/Thread_Manager: revised the hthread_t so that it is always - large enough to hold valid thread ids. - - * ace: Moved the config-osf1.h file to be named config-osf1-3.2.h - in anticipation of OSF/1 4.0... - - * ace: Changed all occurrences of wchar_t to ACE_USHORT16, which - is a more portable way of representing wchar_t's so that we can - pass them across the network... Unfortunately, wchar_t tends to - be different sizes on different machines, so we can't use the - binary form!!! - - * ace: Added many, many small changes to get ACE to compile on - OSF/1 3.2D using DEC C++ 5.3. Thanks to Tom Marrs - <0002104588@mcimail.com> for slogging through all of this stuff! - - * ace/Thread_Manager.h: Fixed a stupid oversight where I forgot to - add a -1 to the trailing argument of spawn*. Thanks to Neil - Cohen for spotting this. - - * ace: Added a new ACE config file for AIX 3.2.5 courtesy of Bob - Olson . In addition, I changed the name of the - config-aix.h file to be config-aix-4.1.x.h and called the new - file config-aix-3.2.5.h. - - * apps/Synch-Benchmarks/Benchmark.cpp: Added template - specializations for ACE_TSS and ACE_Atomic_Op. Thanks to Matt - Stevens for pointing out the need for this. - - * ace/CORBA_Handler: Added a number of fixes to get the ACE - CORBA_Handler to compile on Win32 with Orbix 2.0. Thanks to - Rich Ryan for these fixes. - - * ace/OS.cpp (thr_create): Fixed a small bug in the pthreads - thr_create() code by dereferencing p_thr before casting it - to hthread_t and assigning it to *thr_handle. - - * ace/OS.i: Backed out the previous changes of pthread_cleanup*. - It turns out that on SunOS 5.5 these macros force a certain - style of programming this is hard to integrate with the existing - implementations of other ACE wrapper methods. Fortunately, none - of this affects existing ACE code since we just use the default - solaris threads API in this case... - - * ace/OS.i: Modified the order of #ifdefs in various ACE_OS::thr_* - methods to take advantage of the pthreads features on Solaris - 2.5. - - * ace: Removed the last few typos that prevented ACE from building - on SunOS 4.x with G++... - - * ace/Thread_Manager: Changed spawn() and spawn_n() so that - they optionally take a group parameter and automatically add - this to an existing thread group. That way we don't need to - spawn the thread(s) and then reassign them after the fact. - The new API automatically assigns the thread(s) to the group - you specify. Thanks to Chris Lahey for this idea. - - * ace: Fully integrated POSIX pthreads into the ACE build for - Solaris 2.5. - - * netsvcs/lib/Server_Logging_Handler.cpp: Rearranged the Server - Logging files so that things will compile and link correctly - using stock GNU G++. - - * ace/Log_Msg.cpp (ACE_Log_Msg): Forgot to initialize the ostream - * to 0. This was causing problems for Win32... - - * ace: *Finally* got the static and dynamic ACE libraries to - compile on SunOS 4.x using stock G++! - - * ace/Synch_T.h: Added a new macro called ACE_SYNCH that will - be ACE_NULL_SYNCH if !ACE_HAS_THREADS and ACE_MT_SYNCH if - ACE_HAS_THREADS. - - * ace/Service_Record.cpp: Changed this to use ACE_SYNCH. This - will fix template problems with G++ on SunOS 4.x. - - * build/SunOS5.5/ace/OS.i (sema_wait): Changed all uses of - ::pthread_cleanup_{push,pop} to pthread_cleanup_{push,pop} since - these are implemented as macros on Solaris.... - -Thu Apr 11 19:43:33 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * examples/Naming/Dump_Restore/Dump_Restore.cpp (init): Modified - Dump_Restore in order to work correctly without having - Name_Options around as a Singleton. - - * examples/Naming/Client/Client_Test.cpp (set_host): Modified - Client_Test in order to work correctly without having - Name_Options around as a Singleton. It simply uses the accessor - provided by Naming_Context to get to Name_Options. - - * ace/Name_Options.cpp: Changed Name_Options so that it is no - longer a Singleton. As a result, now there is an instance of - Name_Options per Naming_Context. Note that for an application to - change Name_Options, it can use the accessor function provided - in Naming_Context. As a consequence of all these changes, we can - now have multiple Naming_Contexts per application. - -Wed Apr 10 20:19:50 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.h: Incorporated a mapping for Solaris 2.5 pthreads so - that it fits in nicely with the earlier ACE pthreads support. - From now on, the pthreads API will be the default threading - scheme for ACE on Solaris 2.5... - - * ace: Added the file name to every *.cpp and *.i file in ACE. - This makes it easier to figure out what's what when looking at - the source code. Thanks to Chris Lahey for suggesting this. - - * ace/CORBA_Handler.cpp (ACE_CORBA_Handler): Added bodies for - the copy constructor and assignment operator of ACE_CORBA_Handler - (which are private) since some compilers generate link errors - for these! Thanks to Rich Ryan for - pointing this out. - - * ace/Synch_T.cpp (ts_get): at line 270 (within - ACE_TSS::ts_get (void) const) there was a keycreate() call - that did not have an instance pointer pass in with it. The - symptom has been that if the last active task has been finished - all active tasks being created afterwards won't get the close() - hook invoked. I've fixed this in order to solve a mysterious - bug with ACE_TSS. Thanks to the ever-vigilant Detlef for - reporting this bug and fix. - -Wed Apr 10 01:56:52 1996 Douglas C. Schmidt (schmidt@mambo.cs.wustl.edu) - - * ace: Added the ACE_TEMPLATES_REQUIRE_SPECIALIZATION to - config-sunos5.5-g++.h file. This should allow ACE to build - correctly. Thanks to Adam Miller for - pointing this out. - - * ace: Installed SunOS 5.5, so now we can finally test pthreads! - - * ace/OS: Modified the implementation of mutex_t for Win32 so that - it automatically selects the CRITICAL_SECTION or the HANDLE form - of Mutex depending on whether the type argument is USYNC_THREAD - or USYNC_PROCESS, respectively. This now means that all the - existing ACE code that used ACE_Condition will - continue to work correctly on Win32 and UNIX! - -Tue Apr 9 23:04:30 1996 Douglas C. Schmidt (schmidt@mambo.cs.wustl.edu) - - * ace/Synch: Somehow, the definitions for ACE_Thread_Semaphore and - ACE_Process_Semaphore were MIA. I've added the implementations. - Thanks to Bruce Worden for - noticing this... - -Tue Apr 9 02:16:02 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Service_Config.cpp: reordered the #includes in this file so - that it works correctly on Win32. Thanks to Rich Ryan - for help with this. - - * ace/Auto_Ptr.cpp (remove): added the implementations of the - auto_ptr::remove() and auto_array_ptr::remove() static methods. - Thanks to Chris Lahey for noticing their absence... - - * ace/Auto_Ptr: Added the #pragma implementation ("Auto_Ptr.cpp") - statement if defined ACE_TEMPLATES_REQUIRE_PRAGMA to work on - AIX. Thanks to Chris Lahey for this. - - * ace/Makefile: Moved Auto_Ptr from FILES to TEMPLATE_FILES to - work on AIX. Thanks to Chris Lahey for pointing this out. - - * Modified a bunch of the apps and example Makefiles so that - things will build better using G++. - - * ace/Name_Options.cpp (parse_args): Made the "database" name the - same as the process name by default... - - * ace/Reactor.h: Changed the type of current_ in - ACE_Handler_Repository_Iterator from size_t to ssize_t so that - this can handle negative numbers. Thanks to Mark Zusman - for reporting this. - -Mon Apr 8 23:33:15 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * netsvcs/lib/Name_Handler.cpp (recv_request): Fixed a small - bug. In recv_request() ntohl was being called again on length - which was causing problems since the length was already in host - byte order. The ACE Name Server should now be working on NT. - -Mon Apr 8 02:14:30 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Fixed a number of minor problems that caused duplicate - symbols when linking ACE with G++ (no-repo) on SunOS 5.x and - SunOS 4.x. Thanks to Andy Gokhale for help with this. - - * ace: Added Jan Rychter very nice contribution - of pthreads and DCE threads to ACE. This should make life - easier for Linux users and users of other pthreads packages. - - * ace/Service_Config.cpp (process_directives): Changed the code to - use an auto_ptr to make sure that we always release the - ace_obstack memory, regardless of how we exit. - - * ace/OS.i (strerror): Changed sys_errlist to _sys_errlist to work - around bugs with SunOS 4.x. This will undoubted break some - other twisted UNIX system. - - * ace/Local_Tokens.cpp (acquire): Added a return 0 at the very - end... Thanks to Chris Lahey for reporting this (yet - again... ;-)). - - * ace/Parse_Node: Made a bunch of small changes to deal with the - fact that there's no dlerror() equivalent on NT... - - * ace/Task.h: The static function instance() should return - ACE_Task_Exit* (or ), not - ACE_Task_Exit *. Thanks to Chris Lahey for spotting this. - - * ace/Thread_Manager.cpp: added an argument to the exit() method - that allows applications to exit without calling thr_exit. This - would allow the method to be called from within a pthread - cancellation cleanup routine, without calling thr_exit a 2nd - time. Thanks to Chris Lahey for suggesting this. - - * ace/Log_Record.cpp (operator <<): Changed the verbose option so - that it is an attribute, this will allow the ostream to print - verbose information if necessary. Thanks to Chris Lahey for - suggesting this change. - - * ace/config-win32-msvc*.h: Added the - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES flag since it appears - that this causes problem with some versions of MSVC++ 4.0... - - * Released version 4.0.6 for testing. - - * netsvcs/lib/Server_Logging_Handler.h: #included the - Svc_Handler.h file, that absence of which was causing problems - for HP/UX. Thanks to Richard Orr - for reporting this. - - * Made a few minor changes to the source to make sure that it - compiles correctly on SunOS 5.x with G++. - - * ace/Thread_Manager.h: Added the insert() method for the non-MT - version of Thread_Manager. Thanks to Alexandre Karev - for reporting this. - - * ace/Task: Renamed the static double-check lock_ to - ace_task_lock_ to avoid a name conflict with the existing - this->lock_ instance in each class. Thanks to Prashant for - tracking this down... - -Sun Apr 7 14:40:05 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - Rolled back a change that replaced #defines with typedefs. It - turned out the #defines were there for a reason... Thanks Neil - B. Cohen for pointing this out... - - * ace/OS.h: Added a new check to deal with the fact that many - versions of Pthreads don't support tid_t (which seems to be an - AIXism...). - -Thu Apr 4 01:19:19 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Officially released version 4.0.5... - - * ace/OS.h (ACE_TSS_TYPE): Somehow the ACE_TSS_TYPE macros ended - up *before* the inclusion of Time_Value.h, which meant that - these macros weren't being expanded properly. This may help - explain odd behavior with ACE TSS. - - * ace/Thread_Manager.cpp (insert): Added a new method that allows - us to insert a thread into an ACE_Thread_Control after it's been - constructed. - - * ace/Message_Block: Fixed a typo in the init() method. Thanks to - Ross Dargahi for noticing this. - - * ChangeLog: Finally got all of ACE built on SunOS 5.x and SunOS - 4.x using only the stock GNU GCC compiler (i.e., no template - repository...). This should make it easier to port to other - versions of G++. - - * ace/Task: Modified the ACE_Task and ACE_Task_Exit implemenation - so that it only uses 1 TSS key per ACE_Task template - instantation, rather than 1 TSS key per ACE_Task instance. This - works around horrible limitations with Win32... - - * ace/Thread_Manager: Added new methods to set and get the - Thread_Manager used in a Thread_Control. - - * ace/Pipe.cpp (open): Fixed a bug in where ACE_Pipe::open did not - set this->handles_, thus a garbage handle gets registered. - Inserted the following two lines at line 53 of Pipe.cpp: - - this->handles_[0] = reader.get_handle (); - this->handles_[1] = writer.get_handle (); - - Thanks to Kirk Sinnard for this fix. - - * ace/OS.h: Added a couple of fixes for the SCO port. Thanks - again to Matt Newhook - - * ace/OS.cpp: Integrated Detlef's clever scheme for freeing up - thread-specific storage correctly on Win32... - - * ace/Task.cpp (ACE_Task): Made sure to initialize the - next_-pointer of ACE_TASK and Message_Queue point to NULL. - This fixes a problem on NT. Thanks to Karlheinz for - noticing this... - - * include/makeinclude/rules.lib.GNU (VLIB): Fixed up the ACE - makefiles so that we can now build on SunOS 4.x correctly - without using the template repositories... - - * ace/Service_Config.cpp: Added a bunch of template - specializations so that GNU G++ can be used to compile ACE on - SunOS 4.x *without* requiring the template repository hacks... - Thanks to Mark Zusman for helping with this. - -Wed Apr 3 00:55:12 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * examples/Reactor/Misc/test_reactors.cpp: Added a new torture - test of the ACE_Reactor and ACE_Task. Thanks to Detlef for - contributing this... - - * netsvcs/bin/Makefile: Removed a stray -lACE_svcs from the - Makefile. Thanks to Matt Stevens for reporting this. - - * ace/Synch.cpp: Fixed two mistakes related to keeping INLINE on - the get_thread_id() and get_nesting_level() when I moved them - into the *.cpp file... Thanks to Matt Stevens for finding this. - - * ace/Reactor.cpp (owner): modified owner() so that it returns - the original owner when setting a new owner. This makes it - possible to write code like this: - - thread_t t; - - reactor->owner (ACE_Thread::self (), &t); - reactor->handle_events (); - reactor->owner (t); - - * ace/SOCK_Connector.cpp (connect): Added an additional check for - errno == EWOULDBLOCK for non-blocking connects due to screwy - semantics of Win32 non-blocking sockets... - - * netsvcs/lib/Client_Logging_Handler: Fixed a very obscure bug - that arose due to the way that UNIX select() interacts with - SVR4 MSG_BAND data. It turns out that you must use the - ACE_Event_Handler::EXCEPT_MASK to get this to work properly - (gag). This stuff is much easier with SVR4 poll(). - -Tue Apr 2 13:57:05 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i: Fixed an error compiling the new Log_Msg.cpp because - when it inlined OS.i, there were references to - ACE_OS::thread_mutex_*() before the functions were declared - inline. The references were assumed to be external, and then - when the linkage was actually declared as inline, the compiler - choked. To fix this, in OS.i, all the thread_mutex_* calls - where moved above the first reference, which was in - ACE_OS::cond_broadcast(). Also moved the mutex*() calls since - they are referenced by the thread_mutex calls. So the order is - mutex*(), then thread_mutex*(), and then cond*(). Thanks to - Chris Lahey for reporting this. - - * netsvcs/lib/Client_Logging_Handler.cpp: Added missing return - values in some of the methods. Thanks to Tim Harrison for - spotting this... - - * ace/Map_Manager.cpp (shared_unbind): It was possible that INT_ID - could be assigned a value from a previously unbound map entry. - The shared_unbind matches the ext_id, but does not see if the - entry had previously been unbound. This causes a problem if the - INT_ID type is a pointer type, and the user of the map deletes - objects as a result of the unbind returning a 0. The correct - solution is to include a test for is_free in the shared_unbind - before checking the equality of the ext_id. Thanks to Phil - Mesnier for reporting this. - - * ace/Reactor.cpp (next): Fixed a bug that prevented the - iterator's next() method from detecting the end of the - iteration. Thanks to Mark Zusman - for reporting this. - - * ace/Reactor.cpp (advance): Fixed a bug that prevented the - iterator from advancing. Thanks to Mark Zusman - for reporting this. - - * ace/Log_Msg.cpp (open): Added a check for logger_key being NULL, - in which case we log to STDERR rather than segfault... - - * netsvcs/lib/Server_Logging_Handler.h: Fixed a typo in - the declaration of - - ACE_SVC_FACTORY_DECLARE (ACE_Server_Logging_Acceptor) - - Thanks to Neil Cohen for finding this. - -Mon Apr 1 00:17:21 1996 Douglas C. Schmidt (schmidt@mambo.cs.wustl.edu) - - * ace/Time_Value.i: Fixed two stupid bugs in the Time_Value - relational operators. Thanks to Mathew Newhook - for pointing this out. - - * ace/OS.h: Added an extern "C" block around the netdb, net/if.h, - netinet/in.h, arpa/inet.h to work around problems with SCO. - Thanks to Mathew Newhook for this. - - * ace/Reactor: Merged the ACE_Pipe into the Reactor - implementation. This cleans up some nasty OS-specific code in a - clean way. - - * ace/CORBA_Handler.cpp (ACE_MT_CORBA_Handler): Fixed some typos - that arose during the transition to the ACE_Pipe. - - * ace/Pipe: Added a new open() method that doesn't return the - handles, it just stashes them away for safe keeping. This is - useful for places like the Reactor. - - * ace/Local_Name_Space.h: Added ACE_Export to the front of - ACE_NS_String. Thanks to Detlef for suggesting this. - - * From now on, I'll be numbering each new release of ACE with a - different minor number. However, the latest version of ACE will - also always be available at - - http://www.cs.wustl.edu/~schmidt/ACE.tar.gz - - This is useful if you just want to get the latest one without - having to bother with keeping track of minor numbers. For - instance, that way you can still keep that reference in my - bookmark list and you don't have to remodify it with every - release. Thanks to the ever-vigilant Chris Lahey for suggesting - this. - - * ace: added new a ACE project file (ace.mdp) and Makefile - (ace.mak) to create ACE as a DLL on Win32. This should greatly - simplify the Win32 build process... - - * INSTALL: Added new INSTALL file explaining how to build for - Win32. - - * ace/Thread_Manager.cpp: Fixed a horrible bug with Win32. On - reasonable systems ACE_Thread::exit() should not return. - However, due to horrible semantics with Win32 thread-specific - storage this call can return (don't ask...). Therefore, we need - to reacquire the mutex so that we don't get burned when the - Guard automatically releases it when this method returns. Thanks - to Tim for helping me figure this out. - - * ace: Fixed some problems with errno in Remote_Tokens and - Local_Tokens. - - * ace/Reactor.cpp: Fixed an annoying preponderance of useless - ACE_MT_SAFE #ifdefs in the Reactor implementation. Thanks to - Gerolf Wendland for pointing this - out! - -Sun Mar 31 13:09:27 1996 Douglas C. Schmidt (schmidt@mambo.cs.wustl.edu) - - * ace/OS: Changed the implementation of cond_t and rwlock_t for - Win32 to use thread_mutex_t (i.e., CRITICAL_SECTIONS) rather - than mutex_t (i.e., Win32 Mutexes). This should improve - performance without sacrificing generality (of which there is - none at the moment since we don't have process-wide condition - variables or readers/writer locks on Win32 anyway.. - - * ace/Thread_Manager.cpp (remove_thr): Fixed bugs in the - ACE_Thread_Manager class. The wait() member grabbed the - Thread_Mutex lock_, then (if the current_count is not zero) - grabs the Condition lock zero_cond_. Doing so, however - implicitly released lock_, which meant that another thread could - get into wait(), and wait on zero_cond_. zero_cond_ was only - signaled from ACE_Thread_Manager::remove_thr() when the - current_count_ is zero, but it signaled with - ACE_Condition_Thread_Mutex::signal(), which only releases one - thread that is waiting on the Mutex. Thus, any other threads - waiting on zero_cond_ would never be resumed. The fix was to - use ACE_Condition_Thread_Mutex::broadcast() rather than - ACE_Condition_Thread_Mutex::signal() in - ACE_Thread_Manager::remove_thr(). This fix is only reliable - since remove_thr() is called only when ACE_Thread_Manager::lock_ - is held by the calling thread. Thank to Bruce Worden - for reporting problem and - suggesting this fix. - - * ace/Token: Modified this class so that it only works with - ACE_Thread_Mutex (which is more precise than what was going on - before...). - - * ace/Synch.h: Modified ACE_RW_Process_Mutex so that on Win32 it - uses ACE_Process_Mutex until we've got a working - RW_Process_Mutex for Win32... - - * ace/Synch: Removed the ACE_Process_Barrier until we get a - working implementation... - - * ace/Synch: Changed the ACE_Barrier so that it only tries to work - within a single process. - - * ace: Changed all uses of ACE_Condition_Mutex to - ACE_Condition_Thread_Mutex to reflect what's really going on - here... - - * Changed all uses of ACE_Mutex to ACE_Thread_Mutex throughout - ACE. This is *much* more meaningful and makes it possible to do - some great optimizations on Win32! - - * ace: Changed all uses of ACE_Mutex_Guard to - ACE_Thread_Mutex_Guard. This is a more accurate name for how - this is used in ACE. - - * netsvcs/lib/Client_Logging_Server: Reengineered the ACE - Client_Logging service so that fits into the ACE network service - format. This version is particularly interesting since it - illustrates a "Connector-driven" service. In contrast, all the - other ACE network services are "Acceptor-driven" services. - - * netsvcs: Merged the implementation of all the ACE network - services into a single ./netsvcs/lib directory. Each of these - is now a fully dynamically linkable service. Created a single - main.cpp program in the ./netsvcs/bin directory. This main - illustrates how to dynamically link an or all of the ACE network - services to form complete applications. Thanks to Prashant for - help with this. - - * ace/OS.cpp: Changed readv() and writev() so that they will once - again compile for Win32. Note, however, that if you try to - readv() and writev() on the same descriptor you will lose since - they are not atomic! However, this stuff is stuff useful if - you're *not* reading/writing to a common descriptor... - - * ace/Synch_T.cpp: Removed the ACE_Null_Condition<> template. - This didn't really make any sense... - - * ace/OS: Changed the test of lock_.get_nesting_level() in - ACE_TSS_Cleanup::exit () to account for the fact that a - ACE_Recursive_Thread_Mutex now starts out with a nesting level - of 1 when it is first acquired. - - * ace/Synch_T: Removed the implementation of ACE_Recursive_Lock. - It just doesn't generalize correctly to other types of - synchronization mechanisms... - - * ace/Synch: Reimplemented ACE_Recursive_Thread_Mutex using Dave - Butenhof's strategy. This fixes some - latent race conditions in the original implementation. - - * ace: Changed the name of ACE_Recursive_Mutex to - ACE_Recursive_Thread_Mutex since the current implementation - really only works for Thread_Mutexes or Thread_RW_Mutexes... - - * ace: Removed the "Assert.h" file and moved its functionality - into Log_Msg.h. This is more consistent with the rest of the - error reporting and logging in ACE and also avoids some nasty - circular include problems. - - * ace/Local_Tokens.cpp: Changed the use of ACE_RETURN so that it - passes in errno. - - * ace/Log_Msg: Changed the arguments to the ACE_RETURN macro so - that errno can be returned explicitly. - -Sun Mar 31 15:52:58 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp (create_manager): Added three new - methods -- list_name_entries, list_name_values, and - list_name_types. They work similar to list_names, list_values, - and list_types (respectively) except they return the entire - tuple associated with a name binding. - -Sat Mar 30 16:46:32 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/SPIPE_Stream.i (send_handle): There was a typo -- the - parameter shouldn't be "const ACE_HANDLE handle", it should - just be ACE_HANDLE handle. - -Sat Mar 30 16:09:25 1996 Douglas C. Schmidt (schmidt@mambo.cs.wustl.edu) - - * INSTALL: Added new Win32 installation instructions to build - ACE as a DLL. - -Sat Mar 30 14:42:02 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Carefully tested ACE on SGI and SunOS 5.x using G++ and CC. - Everything seems to work now... Released version 4.0.2. - - * ace/Acceptor.cpp (ACE_Strategy_Acceptor): Added default - initializations of NULL for service_name_ and - service_description_ in the ACE_Strategy_Acceptor's default - constructor. - - * ace: Fixed a slew of warnings for HP/UX. Thanks to John Morey - for reporting these. - - * ace/FILE.h (ACE_FILE_Info): Changed the type of field size_ from - size_t to off_t to avoid warnings from C++ compilers... - - * ace/OS.cpp (ftruncate): Added a new function for platforms like - SCO that lack ftruncate(). Thanks to Matthew Newhook - for contributing this. - -Sat Mar 30 12:41:16 1996 Douglas C. Schmidt - - * ace: Removed the ACE_svcs library for the time being and merged - everything back into libACE. There were two reasons for this - change: - - 1. There is a subtle dependency between the ACE_Reactor and the - ACE_Local_Tokens* stuff when deadlock detection is enabled. - This was causing problems. - - 2. This was driving GNU G++ nuts because of the need to - do the "prelink." - - Sooo, for the time being, there's just one ACE library. If - anyone wants to take the time to split everything up so that it - works for all different platforms and send me the fixes I'll be - glad to include this in ACE. - - * ace/Thread.i: Made the ACE_Thread::thr_self() methods call - down to the ACE_OS::thr_self() methods for the case where - the platform doesn't support threads. This means that we - only have to set the default thread id in one place... - -Sat Mar 30 11:53:31 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * bin/class2info.awk: Modified the handleClass() AWK function so - that it can correctly deal with the new ACE_Export and - ACE_Svc_Export tags needed to build ACE DLLs... Here's the - trick: - - sub( "^[\t ]*class[\t ]+(ACE_[.]*Export[\t ]+)?", "", $0 ) - - completely intuitive, eh? ;-) - - * apps/Gateway: Reimplemented the Gateway prototype so that it - uses the new Reactor cancel_wakeup() and schedule_wakeup() - methods instead of mask_ops(). - - * ace/Reactor: Added new high-level "scheduling" - operations called schedule_wakeup() and cancel_wakeup(). These - methods utilize the lower-level Reactor mask_ops() methods to - schedule and cancel Event_Handlers for subsequent dispatching by - the Reactor. I added these new interfaces because they are more - intuitive than calling mask_ops(), which is a non-descriptive - name unless you understand the Reactor implementation... - - * ace/config-irix5.*.h: It turns out that on IRIX 5.x the - bi-directional SVR4 pipe semantics are *disabled* by default. - Therefore, I've changed the config-irix4.*.h files to comment - out ACE_HAS_STREAM_PIPES. - -Fri Mar 29 08:25:33 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/ACE.cpp (ldfind): Changed the character given to strtok() to - account for the differences in UNIX and Win32 described in the - follow bullet. - - * ace/OS.h: UNIX and Win32 use different characters to separate - pathnames in their runtime LD search path (':' and ';' - respectively). Therefore, I've added new macros to ACE OS to - account for this stuff portably. - - * ace/OS.i: Changed the behavior of the ACE_OS::thr_self() methods - so that they always return 1 if ACE_HAS_THREADS is *not* - enabled. This makes application code work correctly across - threaded and non-threaded platforms. - - * ace/OS.i: Changed the return value of the Win32 arm of the - ACE_OS::dlopen() and ACE_OS::dlsym() functions so that they are - now identical to the way that UNIX behaves. - - * ace/Svc_Conf.y: added a #define for ACE_BUILD_DLL to make Win32 - happy... - - * ace/Synch.i: Fixed a number of bugs in the ACE_Mutex and - ACE_Thread_Mutex tryacquire_read() and tryacquire_write() - methods. I was calling mutex_lock() rather than - mutex_trylock()! Thanks to Prashant for finding this. - - * ace/OS.cpp (exit): Fixed a bug caused by the fact that the test - for the nesting level of the recursive mutex should have been - for > 0 rather than > 1. Thanks to Kirk Sinnard - <1764@mn.lawson.lawson.com> for tracking this down! - - * ace/Log_Msg: Enhanced ACE_Log_Msg so that it automatically - caches the process id. This makes it more robust even if users - don't call open()! - - * examples/Connection/non_blocking/CPP-connector.cpp Fixed a bunch - of typos that caused templates to fail on HP/UX. Thanks to Neil - Cohen for spotting this. - - * ace/Shared_Memory_SV: Change all uses of "int id" to "key_t id" - to reflect the new use of key_t in the Memory_Pool. - - * ace/Memory_Pool.cpp (ACE_MMAP_Memory_Pool): Fixed a potential - but in the construction of an MMAP memory pool. Because NT uses - strings rather than integers to name its semaphores we were - passing in junk to the NT Process_Mutex initializer. Arrgh! I - fixed this problem by typedef'ing key_t to be char * on Win32 - and then updating the ACE_DEFAULT_SEM_KEY to be - "C:\\temp\ace.sem" rather than 1234.... Also added a new macro - called ACE_INVALID_SEM_KEY, which is NULL on NT and -1 on UNIX. - - * ace/Log_Msg.cpp (instance): Fixed a typo for HP/UX and - other non-threaded platforms! - - * ace/Synch_T.cpp (ACE_TSS_Guard): Added another small fix - to ACE_TSS_Guard to make sure we free up the key when we - go away. - -Thu Mar 28 15:28:44 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.h: changed the names of macros ACE_DYNAMIC_SVC* to new - names that reflect their new, more general nature now that we've - got the ACE_Static_Svcs stuff... - - * ace/Service_Config.cpp (load_defaults): Added a very nice - mechanism that generalizes the configuration of statically - linked services. This makes it possible to insert statically - linked services into a program without changing any of the - existing ACE_Service_Config code. These static services can - then be enabled via the svc.conf file using the "static" - directive. Thanks to Matthew Newhook for - suggesting this and for doing the bulk of the implementation. - - * ace: Commented out the ACE_TRACE calls in ACE_Unbounded_Set, - ACE_OS, and all the ACE synchronization wrappers to work around - some horrible dependencies with Win32 and thread-specific - storage... The moral here is that you have to be careful what - you trace because circualar dependencies abound... My new - policy is that low-level routines are not automatically traced - because they can cause infinite recursion. - - * ace/Synch_T.cpp: Fixed a nasty bug with ACE_TSS_Guard. This was - causing programs that uses ACE_TSS_Guard to segfault... Thanks - to Kirk Sinnard for reporting this. - - * ace/Synch: Added "lock()" methods to all the ACE synchronization - wrappers to return the underlying C level object... This is - necessary at some points in ACE. - - * ace/Synch: Fixed a horrible bug in ACE_Recursive_Mutex and - ACE_Recursive_Lock that was causing instant deadlock because the - non-recursive Solaris/Pthread mutex was being acquired too - eagerly... - -Thu Mar 28 12:14:57 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Map_Manager.cpp (rebind): Added a new method called resize() - which increases the size of the map. Both open() and - shared_bind() make use of this method to dynamically increase - the size of the map. - - * ace/Local_Name_Space.cpp (shared_bind): Modified shared_bind() - in accordance to the changes to Map_Manager. shared_bind() no - longer has to check if the map runs out of room since - Map_Manager dynamically grows the map. - - * ace/Map_Manager.cpp (shared_bind): Changed shared_bind() so that - when the map reaches max_size_, we grow the map by DEFAULT_SIZE - by making a call to open(). - -Wed Mar 27 20:00:47 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp (shared_bind): Fixed a bug which was - allocating memory for a name binding which would fail on a bind - since there already existed a binding. This was causing the - mapped-file to grow even when binds would fail. - -Tue Mar 26 13:49:24 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/INET_Addr.i (addr_to_string): Moved the order of - get_host_addr() so that it comes before addr_to_string(). - Thanks to Neil Cohen for finding this. - - * ace/Synch: Added a new implementation of ACE_Thread_Mutex that - takes advantage of the new ACE_OS::thread_mutex_* mechanisms. - - * ace/OS: Added a new set of ACE_OS::thread_mutex_* mechanisms - that map efficiently to either Win32 CRITICAL_SECTIONs or UNIX - mutex_t's with type set to USYNC_THREAD. This allows ACE to - take advantage of the lightweight Win32 synchronization - mechanisms. When Windows NT 4.0 comes out, we'll at last have a - perfect mapping since WinNT 4.0 supports - TryEnterCriticalSection! - -Tue Mar 26 17:35:31 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Map_Manager.cpp: Added two new methods -- total_size() and - current_size() which return the max_size and current_size of the - map respectively. - -Mon Mar 25 20:22:25 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Service_Config.cpp (initialize): Updated the use of ACE_ARGV - to use the new method names. - - * ace/ARGV.cpp (ACE_ARGV): Changed the name of the two main - methods of ACE_ARGC from count() and operator&() to argc() and - argv(). This seems much more consistent with UNIX and C/C++ - naming conventions. - - * ace/ARGV.cpp (ACE_ARGV): Added environment variable substitution - to the ACE_ARGV class using the new ACE::strenvdup() method. - This is transparently available to the ACE Service Configurator - now, which enables the svc.conf file to include things like - this: - - dynamic Name_Service Service_Object * - name_svc.so:make_Name_Service() "-p $PORT -h $HOST" - - * ace/ACE: Added a new function called strenvdup() that returns a - dynamically allocated duplicate of its argument, - substituting the environment variable if str[0] == '$'. - - * ace/Naming_Context: Modified this class so that it now inherits - from ACE_Service_Config. This enables application programmers - to dynamically link instances of ACE_Naming_Context into their - applications via the svc.conf file. - - * ace/OS.i (access): Added a new wrapper for the access() method. - - * ace/Local_Name_Space.cpp: Fixed an error in each list_xxx - methods. If there's an error in the for-loop we must still call - ACE_OS::free() to release resources. Thanks to the - ever-vigilant Karlheinz Dorn for spotting this. - - * ace/Strategies: added virtual methods with name dump() to - ACE_Scheduling_Strategy, ACE_Schedule_All_Reactive_Strategy, and - ACE_Schedule_All_Threaded_Strategy. These methods are - referenced in ACE_Strategy_Acceptor::dump() method - (Acceptor.cpp). Thanks to Alexandre Karev for reporting this. - - * include/makeinclude: Added a number of changes to allow ACE to - build shared libraries correctly on AIX. Thanks to Chris Lahey - for these fixes. - - * ace/Makefile: added tempinc to the list of directories to delete - for "clean". Also, between the call to the two sub make files, - added a $(RM) -rf tempinc. Since we make both libs from the - same directory, we need to delete the tempinc directory to be - sure we don't get the templates generated for libACE included in - libACE_svcs. - - * ace/OS.i: Improved the mapping between ACE Win32 GetLastError() - values and POSIX-like errnos. This is now centralized in the - ACE_FAIL_RETURN macro. - - * examples/Threads/test_thread_specific.cpp: Added many new tests - to exercise the ACE thread-specific storage mechanisms on Win32 - and UNIX. - -Mon Mar 25 4:00:01 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Name_Options.cpp (parse_args): Added a new data variable - called database_ that keeps the name of the name server - database. Also added accessor methods for this. - - * ace/Local_Name_Space.cpp (create_manager): Changed - create_manager() to use ACE_Name_Options::instance ()->database - () instead of ACE_Name_Options::instance ()->process_name(). - - * ace/ACE.cpp (ldopen): Added a new method called ldopen that - finds a file either using absolute path or using - LD_LIBRARY_PATH. If the file is found, it opens the file and - returns a pointer to the file. - - * ace/Parse_Node.cpp: used the new ACE::ldfind() method to locate - the shared object file. This makes it possible to put - "relative" names into svc.conf files and then allow ACE to - locate the appropriate shared object DLL. - - * ace/ACE: added new methods called ldopen() and ldfind() that - find the file either using absolute path or using - LD_LIBRARY_PATH. If found, ldopen() opens the file and returns - a pointer to the file. - -Sun Mar 24 10:41:12 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Compiled ACE successfully on Windows '95. - - * ace/OS: Totally redid the ACE thread-specific storage cleanup - mechanism in OS.cpp to avoid bugs with the previous - implementation. - - * ace/Synch_T: Modified ACE_TSS_Guard so that it will call - ACE_OS::thr_keyfree () when it's finished. This should help to - eliminate the unbounded use of thread-specific storage slots - within a thread. - - * ace/Thread: added a new method keyfree() that calls down to the - ACE_OS::thr_keyfree (). - - * ace/Thread_Manager.cpp: Modified the semantics of - ACE_Thread_Manager::exit () so that it "always" calls - ACE_Thread::exit () even if the user hasn't registered this - thread with the thread manager. This avoids some subtle - problems that arise typically when I forget to put an - ACE_Thread_Control around the main() function. - - * examples/Threads/test_thread_specific.cpp: Added new tests to - ensure that the Win32 TSS cleanup logic is working correctly! - - * ace/Log_Msg: Moved the definition of the ACE_FIFO_Send_Msg queue - from the Log_Msg.h file to the Log_Msg.cpp file. The MSVC++ - compiler was having problems with this when building a DLL. - Besides, this needs to be replaced with Sockets for Win32 - anyway... - - * ace/OS.cpp: Put a safe guard in the readv() and writev() - emulations so that they return ACE_NOTSUP_RETURN if - ACE_HAS_THREADS is enabled. This is necessary because the - readv() and writev() emulations are *not* atomic if multiple - threads are used. If someone can provide an atomic - implementation I'll enhance the code to remove the existing - restrictions. - - * ace/OS: Created a new macro called ACE_SYSCALL_FAILED, which is - mapped to 0xFFFFFFFF on Win32 and -1 on UNIX. - - * ace/Synch and Synch_T: cleaned up the implementation of the - Recursive_Lock and Recursive_Mutex to use the ACE_Guard classes. - This simplifies the code. - -Sat Mar 23 16:53:14 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace: Updated all ACE classes to use the new ACE_Export macro. - This will enable them to transparently be used to create a Win32 - DLL. Also added ACE_BUILD_DLL to all the *.cpp files. - - * tests/CPP-inserver.cpp (main): Modified CPP-inclient.cpp and - CPP-inserver.cpp to use non-blocking I/O. In particular, - CPP-inserver times out on select and then checks to see if any - connections have arrived. Both applications are also working on - NT. - -Sat Mar 23 15:02:47 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Local_Tokens.cpp (proxy_): Modified the print statement for - local tokens to account for the fact that thread ids can be - unsigned on some platforms. - - * ace/Log_Msg.cpp (log): Modified the output format of the %t - directive to ACE_Log_Msg::log() so that it prints values in - unsigned form rather than signed form. This fixes a bug with - Win32 on Windows '95. - - * ace/ACE: Added two new methods ACE::read_n() and ACE::write_n(). - These are now necessary since Win32 distinguishes between - operations on SOCKETs and operations on other forms of HANDLEs. - - * ace/ACE: Changed all uses of ACE::set_fl() and ACE::clr_fl() to - ACE::set_flags() and ACE::clr_flags(). - - * ace/ACE: Changed the name of ACE function handle_timed_connect() - to handle_timed_open() since this is reall what it does... - -Fri Mar 22 00:11:19 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Stack: Added a "Node of last resort" to the - ACE_Unbounded_Stack. This ensures we are graceful in the face - of memory failures. - - * ace/OS.i (sleep): Fixed a bug with the Win32 ACE_OS::sleep - mapping. This should have had an "ACE_OSCALL_RETURN" in it... - - * ace/ACE.h: Had forgotten to put "static" in front of "basename". - Thanks to Neil Cohen for reporting this... - - * ace/Name_Options.cpp (process_name): Changed char * to const - char * to avoid compile error. Thanks to Neil Cohen for this... - - * ace/IPC_SAP: Implemented the enable()/disable() methods to work - with non-blocking I/O for SOCKETs on Windows NT. - - * ace/OS.i: Modified ioctl() to support the ioctlsocket() call on - Windows NT. - - * ace/Log_Msg.cpp (log): Fixed a bug that was caused by not - NUL-terminating the logging string properly when a %a is given. - Thanks to Tim Harrison for finding this. - - * ace/OS: Added a new overloaded "ACE_OS::sleep" method that takes - an ACE_Time_Value rather than a u_int. This is much more useful - for fine-grained timers than the horrible UNIX sleep() call. - - * ace/OS.h: #included "sys\timeb.h" in the Win32 version of ACE. - -Thu Mar 21 22:18:50 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps: Fixed all incorrect usages of ACE_HANDLE = -1 to use - ACE_HANDLE = ACE_INVALID_HANDLE in order to work with Win32... - - * ace/OS.i (gettimeofday): Replaced the existing implementation of - gettimeofday with a new version that is shorter, more efficient, - and most importantly, correct... Thanks to Todd Montgomery. and - Mike Flinn for this stuff. - - * ace/ACE: added a new method called basename() that returns the - filename portion of a pathname. - -Thu Mar 21 21:51:48 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/OS.h (ACE_DEFAULT_GLOBALNAME): Added some new #defines for - NT: ACE_DEFAULT_NAMESPACE_DIR, ACE_DEFAULT_LOCALNAME, and - ACE_DEFAULT_GLOBALNAME. - - * ace/Local_Name_Space.cpp (ACE_Local_Name_Space): Fixed a subtle - bug. Instead of doing a new char [xxx], I was doing a new char - (xxx). Also, added some #if defined (ACE_WIN32) to support - special cases for NT (for example determining the context file - name). - -Wed Mar 20 02:03:39 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Log_Msg.cpp (log): If we're writing to stdout or to an - iostream make sure the lock is help to avoid race conditions and - scrambled output. - -Tue Mar 19 00:12:25 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Thread_Manager.h: Added new default values to spawn() and - spawn_n(). - - * ace/OS.i (sigaction): Added support for signals to the ACE NT - mapping. - - * ace/ACE: Added 4 new methods to class ACE: send(), send(), - recv(), recv(). These calls mask some differences between UNIX - and Win32 IPC mechanisms. Then, reimplemented the Reactor's - notification mechanism to use this. - - * ace/OS.i (ACE_OSCALL_RETURN): fixed zillions of warnings on - HP/UX by making a small change to line 151 of the OS.i file. - Thanks to Neil Cohen for reporting this. - - * ace/Reactor.cpp: Rewrote the Reactor::notify() mechanism to - avoid using readv() and writev(). These work fine on UNIX, but - don't work correctly on Windows NT due to race conditions. - Basically, we need to reimplement this stuff on Win32 to avoid - the problem. - - * ace/OS.h: Added SIGQUIT, SIG_BLOCK, SIG_UNBLOCK, and SIG_SETMASK - definitions to NT. - - * ace/Time_Value: added a new set() method to be consistent with - the ACE_Time_Value (long, long) constructor. - - * ace/Service_Config.cpp (open): Fixed a bug where the - ACE_Service_Repository and ACE_Reactor weren't being initialized - correctly if the ACE_Service_Config::ACE_Service_Config (const - char *) method was called. - - * ace/Service_Config.cpp: Changed the constructor for - Service_Config so that it doesn't barf if the svc.conf file - isn't found. - -Mon Mar 18 00:34:45 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Reactor.h: Hid the inclusion of the Local_Tokens.h file in - the Reactor so that by default there will be no dependency - between libACE and libACE_svcs. This should prevent compilation - problems on some platforms. - - * bin: Included the html-windex shell script from Vincent Pommier - . - - * man: Included a shell script to automatically generate an - acewindex.html file. This file is useful just after running - man2html. Thanks to Vincent Pommier - for contributing this. - - * man/html: I've just used the man2html programs to generate the - html documentation from the man3 directory. It seems to work - pretty well. - - * ace/Assert.h: Added a forward declaration for class ACE_Log_Msg - to fix problems NuMega preprocessing. Thanks to Mike Flinn - for finding this. - - * ace: Implemented about 1/3rd of the "dump" methods for the - various ACE classes. - - * ace/Acceptor.cpp (info): Fixed a bug -- should use PR_AD rather - than ACE_INET_Addr since this is used for SPIPEs as well... - - * ace/Synch_T.cpp (ACE_TSS): If ACE_Thread::keycreate () fails - then we do an fprintf() and return at the moment. It doesn't do - any good to do an ACE_Log_Msg operation since those all require - thread-specific storage and this will just cause a recursive - problem... - - * ace/OS.cpp: Removed a memory leak in ACE_OS::thr_destory_tss() - that was caused by forgetting to delete each ACE_TSS_Key_Info - object when we no longer needed it. Thanks to Mike Flinn - for finding this. - - * ace/OS.cpp: Added a new method to class ACE_OS called - thr_keyfree(). This enables us to free up a thread-specific - storage key on Win32 (it isn't implemented on the UNIX - platforms). - - * ace/ACE.cpp (timestamp): In order to get ACE_OS::timestamp to - work on Win32, the wMonth, wDay, wYear structure members were - added to the sprintf statement. Thanks to Mike Flinn - for this fix. - - * examples: Changed all uses of ACE::send_n (1, ...) to - ACE_OS::write (ACE_STDOUT, ...) to avoid problems with NT's - hacked support for sockets and HANDLEs. Thanks to Bernd Hofner - for noticing this. - -Sun Mar 17 00:43:14 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/CORBA_Handler.cpp (handle_input): Fixed the CORBA_Handler to - use send()/recv() rather than read()/write(). - - * ace/Process_Manager: put the hooks in for the forthcoming ACE - Process Manager, which will provide a service similar to the - ACE_Thread_Manager, except that it will work for processes, not - threads. - - * netsvcs: all the ACE network services appear to be working - again... - - * man: Completely regenerated all the manual pages to reflect all - the most recent changes. - - * ace/OS.h: Created a new macro called ACE_DEFAULT_REACTOR_SIZE. - This is useful for two reasons (1) it centralizes this value in - one place in ACE and (2) removes a horrible circular dependency - between the Service_Config.h and Reactor.h... - - * ace/Strategies: Added new strategies to handle "scheduling" of - Svc_Handlers launched by a Strategy_Acceptor. In this context, - scheduling refers to "suspending" and "resuming" Svc_Handlers. - There are several alternative strategies ranging from (1) - suspending/resuming a single handler, (2) suspending/resuming - all the handlers in a Reactor, and (3) suspending/resuming all - handlers controlled by a Thread_Manager. This very powerful - feature makes it simple to write ACE_Network_Services that can - control all their handlers in one fell swoop... - - * ace/Task: Added new accessors/mutators to get/set the - Thread_Manager and the Message_Queue associated with a Task. - This makes life easier and more abstract in subclasses and - elsewhere. - - * ace/Reactor: added an iterator to the ACE_Handler_Repository. - This makes it possible to implement the suspend_handlers() and - resume_handlers() very efficiently on both UNIX and Windows NT. - - * ace/Reactor: Added two new methods called suspend_handlers() and - resume_handlers(). These methods suspend and resume all the - active Event_Handlers in the Reactor in one fell swoop. - - * ace/Reactor.i (suspend_handler): Fixed a bug in the Reactor - where we were not factoring out the code for suspend_handler() - appropriately with respect to locking. - - * netsvcs/Logging/Server_Daemon/Thr_Logging_Handler: Enhanced the - threaded logging service so that all active threads can be - automatically suspended and resumed via the ACE_Service_Config - svc.conf file. - - * netsvcs/Logging/Server_Daemon/Logging_Handler.cpp: Rewrote the - ACE Logging service to use the new ACE_Strategy_Acceptor - implementation. This greatly reduced duplicate code. There's - almost nothing left in this directory save the actual service - itself! - - * netsvcs/Tokens: Rewrote the ACE Token service to use the new - ACE_Strategy_Acceptor implementation. This greatly reduced - duplicate code. There's almost nothing left in this directory - save the actual service itself! - - * netsvcs/Naming: Rewrote the ACE Naming service to use the new - ACE_Strategy_Acceptor implementation. This greatly reduced - duplicate code. There's almost nothing left in this directory - save the actual service itself! - -Sat Mar 16 20:02:08 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * netsvcs: Created a new subdirectory off of $WRAPPER_ROOT and put - all the ACE network services (e.g., Time, Logging, Naming, and - Tokens) into that directory. These services all instantiate the - new ACE_Strategy_Acceptor implementation, which greatly - simplifies their behavior and code. - - * ace/Acceptor: Made some enhancements to the - ACE_Strategy_Acceptor in order to make it more suitable for use - as a generic "Service" launcher. This class now defines common - behavior for all the ACE network services (e.g., Time, Logging, - Naming, and Tokens). - - * apps/Token_Server: Made the main Token_Server application be - dynamically linked if there's a valid svc.conf file. - - * apps/Name_Server/Name_Server: Made the Server_Test a - "well-behaved" service. Previously, it block in a private event - loop within Name_Server::run(), which was called by - Server_Test::init() when the service was linked dynamically. - This obviously doesn't work correctly since it means that we - can't dynamically link any other services after this one! The - new version is "event-loop" friendly since it uses the main - Service_Config::run_event_loop() method. - - * ACE-categories: Added a new emacs "outline" file that - illustrates how the filenames in $WRAPPER_ROOT/ace cluster into - class categories. Thanks to Chris Eich - and Alex V. Maclinovsky - for helping create this. - - * ace: Split ACE into two libraries: libACE and libACE_svcs. - libACE contains the "core" ACE components. libACE_svcs contains - the client-side layered services (e.g., naming service, token - service, etc.). There are two reasons for doing this: - - 1. It reduces the size of ACE for many common usecases (i.e., - most people aren't using the naming service or the token - service). Any future layered services in ACE will be placed - into the libACE_svcs library rather than libACE. - - 2. It works around annoying compiler bugs with lame compilers - like HP/UX C++. Now, if those compiles can't compile the - token service (which is very template intensive) it won't - affect the core ACE library components. This improves the - portability of ACE. - - * Added -lACE_svcs to the ./apps/{Token_Server,Name_Server} and - ./examples/{Tokens,Naming} Makefiles to account for the new - libraries. Note that no source code changes are required... - -Fri Mar 15 00:03:48 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Name_Server/server/Name_Handler.cpp (recv_request): Fixed - the same problem as occurred in Token_Handler (these both come - from the same source...). - - * apps/Token_Server/Token_Handler.cpp (recv_request): There was a - subtle bug in the Token_Handler that stems from my old code. - The line - - n = this->peer_.recv ((void *) (((char *) &this->token_request_) - + sizeof (ACE_UINT32)), - length); - - This should actually be: - - n = this->peer_.recv ((void *) (((char *) &this->token_request_) - + sizeof (ACE_UINT32)), - length - sizeof (ACE_UINT32)); - - since length was read already. The old way tried to read 4 - bytes too much. Thanks to Jesper for noticing this. - - * ace/Connector.cpp (connect_svc_handler): Modified the connector - so that it automatically calls the close () method of the - Svc_Handler when the connection fails abortively. This makes - the semantics the same for synchronous and asynchronous - connection invocation modes. Thanks to Irfan for insisting on - this! - - * apps/Token_Server/Token_Acceptor.cpp (handle_input): Changed - return type from int to ACE_HANDLE for NT compatibility. Thanks - to Jesper for this insight. - - * ace/OS.h: The defines for ACE_LACKS_MODE_MASKS (OS.h) were only defined - when !ACE_WIN32. This has been fixed. Thanks to Irfan for - spotting this too. - - * ace/OS.i (mmap): made a small change to ACE_OS::mmap to fix NT - portability problem (new variable added:nt_flags). Thanks to - Irfan for spotting this. - - * ace/Local_Tokens.h: Added #include "ace/Map_Manager.h" after - line 41 in Local_Tokens.h to allow ACE to compile correctly with - the horrid HP/UX compiler. Thanks to Neil Cohen for figuring - this out (what a trooper!). - - * ace/Local_Tokens.cpp (ACE_TPQ_Entry *): Replace - - return ACE_TSS::operator ACE_TPQ_Entry *(); - - with - - return (ACE_TPQ_Entry *) (*((ACE_TSS *) this)); - - to work around problems with MSVC++ 4.0 when the browse option - is enabled. Thanks to Kirk Sinnard <1764@mn.lawson.lawson.com> - for this fix. - - * ace/config-sunx86-sunc++-4.x.h: Swapped the lines - - // Compiler/platform supports SVR4 signal typedef. - //#define ACE_HAS_SVR4_SIGNAL_T - #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - - to - - // Compiler/platform supports SVR4 signal typedef. - #define ACE_HAS_SVR4_SIGNAL_T - //#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - - to avoid an error using ProWorks C++ 4.0.1 (w/ patches) which - blow up in the Signal.x stuff with a prototyping error. Thanks - to John P. Hearn for this recommendation. - - * ace/Shared_Memory.h: The conditional compilation wrapper was out - of date, so I renamed it. Thanks to Alex V Maclinovsky - for reporting this. - -Thu Mar 14 23:18:59 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Thread.h: There was a bug in the ACE_Thread class. I - attempted to make the class uninstantiable by making the - constructor private. However, the statement was: - - private: - Thread (void); - - which is not the definition of the ctor! The code compiled - since it thinks Thread is a member function. As a result, you - could instantiate a object of ACE_Thread class, but no longer... - Also added this to the !defined (ACE_HAS_THREADS) arm of the - conditional compilation. Thank to Sandeep Joshi - for noticing this. - - * ace/Log_Record.i (decode): Fixed a stupid typo where htonl - (this->length_) should have been htohl (this->length_)... - Thanks to Audun Tornquist for - noticing this. - -Tue Mar 12 14:51:39 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Name_Request_Reply.cpp (decode): Added ntohl and htonl calls - wherever data was being exchanged. - -Sat Mar 9 17:49:51 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * ace/OS.i (cond_wait): Updated the Win32 implementation to - correspond precisely with the UNIX semantics where the mutex is - always reacquired even when errors occur. - -Mon Mar 4 23:03:37 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * INSTALL: updated the win32 to describe building test - applications. - -Mon Mar 4 16:17:05 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp (resolve): Fixed a small bug. The type - field in resolve was copying extraneous stuff (because of being - kept around as a wchar_t). So I added a new method to the class - ACE_NS_String called len() which simply returns len_. Using this - I can now do a strncpy of len bytes for type (instead of a - simple strcpy) and then null-terminate the string to remove the - garbage. - -Thu Feb 29 23:41:04 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * ace/Token_Request_Reply.cpp: Fixed a byte-order bug which was - showing up on intel platforms. - - * ace/Remote_Tokens.cpp: Fixed a race condition in - ACE_TSS_Connection which was munging mt token server clients. - - * examples/Tokens/mutex/*: The Token Server example applications - now use ACE_Thread_Manager, which should make them portable to - Win32. - - * apps/Token_Server/Token_Server.cpp: The Token Server is now a - Service_Object which can be dynamically linked. - - * ace/OS.i: Win32 ACE_OS:: signal methods now return 0 instead of - -1. So, calls to signal code succeed, but do nothing useful. - -Thu Feb 29 20:38:32 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Logger/Server_Daemon/Server_Logger.cpp - (handle_logging_record): There was a typo where - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES was incorrectly spelled. - This caused problems on HP/UX. Thanks to Neil Cohen for - finding this. - -Wed Feb 28 11:41:49 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Mem_Map.cpp: Fixed a nasty bug with Win32 memory mapping... - It turns out we need to be very careful when remapping a - previously mapped region if the MapViewOfFile we're trying to - establish *grows* beyond what was originally mapped with - CreateFileMapping(). The new scheme seems to work correctly - with both UNIX and Win32. - - * ace/OS.h: apparently when using MFC library functions it - is not possible to include windows.h. Instead, users - must include AFX.h. Therefore, I've modified OS.h to - include the following: - - #if !defined (__AFX_H__) - #include - #endif /* __AFX_H__ */ - - Thanks to Patty Genualdi (genualdp@agcs.com) for pointing this - out. - - * ace/Memory_Pool.cpp: Modified init_acquire() so that it calls - ACE_Mem_Map::open() rather than ACE_Mem_Map::map() the first - time. This ensures that the file is mapped correctly. - - * ace/Mem_Map: Added a new method called open() that creates/opens - a file without actually mapping it. - - * ace/SOCK_Dgram_Mcast.cpp (make_multicast_address): Added - new support for Windows NT. - - * ace/Memory_Pool: reimplemented ACE_MMAP_Memory_Pool so that uses - ACE_Mem_Map. This ensures that we can leverage all the work - that went into making ACE_Mem_Map work on Win32. - - * ace/Memory_Pool.cpp (map_file): Modified the code so that we - always unmap the file before trying to remap it. This avoids - problems with Win32... - - * ace/Mem_Map: Modified the implementation of ACE_Mem_Map so that - it takes advantage of the improved features in ACE_OS::mmap. - Also added new a method that returns the memory-mapped addr more - easily. - - * ace/OS: Modified the ACE_OS::mmap() method so that it is more - efficient for remapping files on Win32. - - * ace/OS.h: renamed the type QWORD to ACE_QWORD to avoid namespace - pollution. Thanks to Patty Genualdi (genualdp@agcs.com) for - pointing this out. - - * ace/OS.h: Changed the value of the SIGPIPE emulation for Win32 - to match the UNIX value in order to avoid problems. Thanks to - Jesper for noticing this. - - * apps/Token_Server: Fixed misuse of int for ACE_HANDLE in various - places. Thanks to Jesper for noticing this. - - * Renamed the ./tests directory to ./examples to make way for the - new ACE regression tests. These tests will go into the new - ./tests directory. - - * ace/Mem_Map.cpp: Added a destructor and a close() method that - closes down the file HANDLE if we allocated it. This is useful - to prevent descriptor leaks. Thanks to Irfan for suggesting - this. - - * ace: Made a number of changes to remove unreferenced parameters - from ACE methods. This eliminates zillions of warning from the - HP/UX compiler. Thanks to Neil Cohen for reporting this. - - * ace/Local_Name_Space.cpp (resolve): revised some code to work - around bugs with the HP/UX compiler... Thanks to Neil Cohen for - this workaround. - -Tue Feb 27 21:06:09 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i: The Win32 CreateFile does not handle the return you - would expect when the file exists. You would expect EEXISTS (17 - in UNIX) but the GetLastError is set to 80 - (ERROR_FILE_EXISTS). Therefore, I changed ACE_OS::open to map - ERROR_FILE_EXISTS onto EEXIST. This is only a partial solution, - however. There must be a better way to handle this! - - * ace/Mem_Map.cpp (ACE_Mem_Map): Fixed a bug with one of the - ACE_Mem_Map destructors that was causing problems due to the - fact that base_addr_ wasn't being initialized to 0. Thanks to - Karlheinz for noticing this. - - * ace/Signal.i: signals on AIX cannot use sigprocmask() in any - multithreaded programs. Instead, the call - ACE_OS::thr_sigsetmask() should be used since it is used to - update the thread signal mask. This comes up only in the - Sig_Guard constructor and destructor. Therefore, I #ifdef the - call under the ACE_MT_SAFE macro, using sigprocmask() in the - #else case. Thanks to Chris Lahey for reporting this. - - * tests: removed all uses of ACE_OS::join (0, ....) in ACE and - replaced them with ACE_Thread_Manager::wait() calls. This - ensures that the ACE code is portable to Win32 and POSIX - pthreads! - - * ace/Dynamic_Service.cpp: Added a #include of - "ace/Service_Config.h" to work around problems with HP/UX. - Thanks to John Morey for reporting this. - -Sun Feb 25 12:10:38 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * apps/Token_Server: changed the name token_server.cpp to main.cpp - to avoid a name clash on Win32... - - * man/man3: updated all the ACE manual pages to reflect the - most recent changes. - - * ace/OS.i: Implemented the cond_timedwait() method correctly in - ACE_OS. This method should now do the right thing with respect - to blocking, polling, and timewaits for Win32. - - * ace/OS.i: Modified the Win32 implementation of all the - socket-related wrappers in ACE_OS. The new implementation very - cleverly sets errno to the result of WSAGetLastError() if a - socket-related call fails. Since all of the WinSock errors are - mapped into their equivalent UNIX errno values this enables - socket applications to work portably for UNIX and Win32. - - * ace/Malloc_T.cpp (ACE_Malloc): Improved error reporting for - cases where the Memory_Pool::init_acquire() fails (e.g., if the - backing store was already created by another user and we don't - have permission to access it...). - - * ace/Task: modified Task.h so that it is no longer necessary to - write #include "ace/Synch_T.h" in order to use ACE_MT_SYNCH, - etc. - - * ace/SOCK.cpp (DllMain): Added a clever "Schwartz counter" to - make sure that the WinSock library is correctly initialized, - even if we're not using ACE as a DLL!!! - - * tests/Mem_Map/file-reverse: got the file reverse test program - working. The ACE_Mem_Map class should now be ported to Win32... - - * ace/OS.i (open): Changed how the O_CREAT flag was handled - to give it UNIX semantics... - -Sat Feb 24 12:55:27 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/UPIPE_Stream.cpp (recv): Fixed a signed/unsigned mismatch. - There should be no more mismatches in ACE... - - * ace/Name_Proxy.cpp (recv_reply): Fixed a signed/unsigned - mismatch. - - * ace/Message_Block.cpp (copy): Fixed a signed/unsigned mismatch. - - * ace/INET_Addr.cpp (get_host_name): Changed the type of the - hostnamelen parameter from int to size_t to be more "abstract." - This will also prevent a warning from the MSVC++ compiler. - - * apps/Logger/Client_Daemon/Client_Logger.i: Fixed a braino with - network byteoder that was causing Client_Logger::send() to fail - on INTEL boxes. Thanks to Bryon G. Rigg - for finding this. - -Fri Feb 23 01:59:34 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i: Enhanced mmap() to give the same semantics as UNIX - mmap() by using MapViewOfFileEx(). Also greatly improved the - UNIX emulation capabilities so that mmap() now has the same API - for UNIX and Win32. - - * ace/Time_Value: Added functions to constructor and conversion - from/to Win32 FILETIME. This enables us to reuse those 100ns - conversions in ACE_Profile_Timer. - - * ace/Time_Value: Fixed a problem with these: - - // True if tv1 < tv2. - - INLINE int - operator < (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2) - { - ACE_TRACE ("operator <"); - return tv2 > tv1; - } - - This should be "tv2 >= tv1". Same problem was fixed with - operator <=. - - * ace/Profile_Timer.i, fixed the following: - - this->end_time_ = ACE_OS::gettimeofday (); - this->last_time_ = this->end_time_; - this->last_usage_ = this->end_usage_; - ACE_OS::getrusage (RUSAGE_SELF, &this->end_usage_); - - This will overwrite end_time before it is saved to - last_time... - - * tests/Threads: Added Jesper's test for readers/writers locks. - The test adds a number of reader and writer threads. When - active, writers modify a shared variable and verify that only - one writer and no readers are active. When active, readers - check that no writers are active and that the shared data is - never changed. The test passes for different ratios of - readers/writers, and debug output shows that several readers are - allowed simultaneously. Or, in other words, we have an - indication that it should work. - - * ace/OS.i: Added Win32 implementations of getpid(), fork(), - lseek(), dup(), cond_timedwait (), getrusage () - - * ace/OS.i: Modified all the ACE_OS::str* routines so that they no - longer do an ACE_OSCALL_RETURN. This can lead to weird bugs... - Thanks to Jesper for noticing this. - - * ace/config-sunos4-sun4.1.4.h: Added a new config file that - should work with SunOS 4.x... Also added support for SunOS - 4.1.4. Thanks to Mick Adams (eeimas@eei.ericsson.se) for help - with this. - -Thu Feb 22 18:58:36 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * tests/Naming/Client/Name_Service.h (ACE_Service_Object): - Modified test application to make use of ACE_Dynamic_Service. - - * ace/Dynamic_Service.h: Added a new class called Dynamic_Service - which provides a general interface to add and retrieve arbitrary - things into the ACE service repository. - - * apps/Name_Server/README: Rearranged files so that Name_Server - and Name_Handler are now contained in the server directory under - apps and are no longer under /ace. Also, the Dump_Restore - directory has been moved under /tests/Naming. - -Thu Feb 22 01:56:46 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/INET_Addr.cpp (set): Fixed a byteorder bug in ACE_INET_Addr - that was causing problems when ACE was used on Win32 running on - Intel platforms... - - * ace/Mem_Map.cpp (map_it): Fixed ACE_Mem_Map so that it will work - correctly on Win32. - - * ace/SOCK_Stream.i: Changed the implementation of the Win32 - versions of send() and recv() so that they will never use the - read() and write() calls. This works around limitations with - Win32, which can't do a ReadFile() or WriteFile() - *synchronously* with a SOCKET. - - * Changed all occurrences of read (0, ...) to read (ACE_STDIN, - ...) and all occurrences of write (1, ...) to write - (ACE_STDOUT, ...) in order to be compatible across UNIX and - Win32. - - * tests/ASX/Event_Server: Fixed up all the socket I/O calls so - that they use the WinSock send()/recv() methods rather than - ReadFile and WriteFile... - - * ace/OS.i: Updated open() to correctly emulated UNIX open() - semantics on Win32. - - * ace/OS.cpp (thr_exit): Added support to the NT port so that - thr_exit() doesn't endup doing multiple deletions of the same - object. Thanks to Karlheinz for this fix. - - * ace/OS.h: Moved the location of ACE_MAXCLIENTIDLEN so that - MAXHOSTNAMELEN would be correctly visible for NT. - - * ace/Reactor.cpp: Added a temporary fix for the fact that - writev() and readv() don't work correctly yet on NT. The - solution is to replace write() with two writes() and readv() - with two reads() for the Reactor's notification scheme. A - better solution should be forthcoming. - - * ace/Reactor.cpp: Made sure to initialize the timer_queue_ to 0 - in the constructors so that the Reactor's destructor can avoid - crashing horribly if the constructor fails. Thanks to Karlheinz - for pointing out the need for this. - - * ace/SOCK.cpp: Added support for WSAStartup for using WinSock - within the ACE_SOCK class. - -Wed Feb 21 21:05:55 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/ACE.cpp (bind_port): Made a quick fix to work around the - fact that NT doesn't set errno... - - * ace/OS.i (mmap): Fixed a bug in mmap for the NT port. It should - return MAP_FAILED on error rather than 0 to be equivalent to the - UNIX version. Thanks to Irfan for spotting this. - -Mon Feb 19 00:31:42 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Typed_SV_Message.i (ACE_Typed_SV_Message): Modified the - constructor calls so that length_ and max_size_ are correctly - set when created. Thanks to Alexandre Karev - for reporting this. - - * ace/SV_Message_Queue.i (remove): fixed bug in - ACE_SV_Message_Queue::remove method where `internal_id_' member - was modified *BEFORE* it was used the last time in - ACE_SV_Message_Queue::control. Thanks to Alexandre Karev - for reporting this. - - * ace/Typed_SV_Message.i (length): Fixed a minor typo that caused - a bigger bug ;-). Thanks to Alexandre Karev - for reporting this. - - * ace/OS.h: Added new macros that allow programs to portably - access stdin, stdout, and stderr HANDLEs on Win32 and UNIX as - follows: - - #if defined (ACE_WIN32) - #define ACE_STDIN GetStdHandle (STD_INPUT_HANDLE) - #define ACE_STDOUT GetStdHandle (STD_OUTPUT_HANDLE) - #define ACE_STDERR GetStdHandle (STD_ERROR_HANDLE) - #else - #define ACE_STDIN 0 - #define ACE_STDOUT 1 - #define ACE_STDERR 2 - #endif /* ACE_WIN32 */ - - * ace/INET_Addr.i: modified the return value of get_port_number so - that it returns the value in host byte order. This has actually - been a latent bug in ACE for years, but it only surfaced - recently after porting to NT on the Intel instruction set (which - is "little-endian"). - - * tests/ASX/Event_Server: Merged in the latest changes to the - Event_Server tests, which enable it to compile on Windows NT. - Now, I just need to get it working on NT... - - * Updated all of ACE to use the new ACE_ASSERT rather than assert. - - * ace/Assert.h: Added a new file and a new macro called - ACE_ASSERT. This uses the ACE_Log_Msg Singleton to provide a - more consistent means to do assertions. Thanks to Alexandre - Karev for suggesting this. - - * ace/Log_Msg.cpp (log): added for method ACE_Log_Msg::log lines - to skip the `sprintf' part for %N - file name and %l - line - number format specifiers. Thanks to Alexandre Karev - for reporting this. - - * Remote_Name_Space: Removed an initalizer to ACE_WString that was - driving the HP/UX compiler nuts. - -Sun Feb 18 18:11:22 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Synch.h (ACE_Null_Condition_Mutex): Added a missing body to - the wait() method. Thanks to Byron Riggs for noticing this. - -Sat Feb 17 19:10:06 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * tests/Naming/README (client): Added description for new - features, including support for list_values and list_types. Also - added a small description about test programs using DLL. - - * ace/Name_Request_Reply.cpp (decode): Fixed a small bug in - ACE_Name_Request::decode. type_ was not null terminated causing - some garbage to be returned. - -Thu Feb 15 14:57:06 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Remote_Name_Space.cpp: Changed names of some parameters to - comply with ACE syntax. - -Wed Feb 14 13:36:31 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp (resolve): Type support has been added - to Name_Server. A new class called ACE_NS_Internal was created to - keep value and type information. - -Fri Feb 9 17:12:00 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * "Officially" released ACE 4.0 - - * ace/OS.i (sema_post): Fixed a bug in the NT port. - - #elif defined (ACE_HAS_WTHREADS) - return ::ReleaseSemaphore (*s, 1, 0); - #endif /* ACE_HAS_STHREADS */ - - This returns 1 for success, and disturbs cond_broadcast... - This was replaced by: - - #elif defined (ACE_HAS_WTHREADS) - return ::ReleaseSemaphore (*s, 1, 0) ? 0 : -1; - #endif /* ACE_HAS_STHREADS */ - - Thanks to Jesper S. M|ller (stophph@diku.dk) for this. - - * ace/OS.i (cond_init): Fixed a bug in the NT condition synch - code, as the initial count of the semaphore was 1. This gives an - inconsistent condition: The first waiter went straight through... - Change in ACE_OS::cond_init: - - if (ACE_OS::sema_init (&cv->sema_, 0, type, name, arg) != 0) - return -1; - - Thanks to Jesper S. M|ller (stophph@diku.dk) for this. - - * ace/Singleton.cpp: Fixed a stupid bug that was caused by failure - to #include "ace/Synch_T.h"... Thanks to Neil Cohen and Byron - Riggs for giving me insights on what the problem was. ACE now - compiles on HP/UX. - -Fri Feb 9 11:07:04 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * tests/Naming/server/Server_Test.cpp (init): Modified server - tests to dynamically link Naming Services. Both client and - server tests now make use of the ACE dynamic linking mechanisms. - - * ace/Local_Name_Space.cpp: Added list_values() to Name - Server. The functionality is very similar to list_names (returns - list of values that match a pattern). - - * tests/Naming/client/Client_Test.cpp (bind): Replaced all uses of - cerr and cout with ACE_ERROR, ACE_ERROR_RETURN, and ACE_DEBUG. - Split the file Client_Test.cpp into two files -- Client_Test.cpp - and Name_Service.cpp (similarly .h file) each containing the - corresponding class. Modified svc.conf to work with the changes. - -Thu Feb 8 02:05:26 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Log_Msg.cpp (log): Enhanced the Log_Msg class so that it - supports "nested" calls via %r. If SILENT mode enabled, nested - outputs will enclosed in {..} brackets in thread-specific - storage. Thanks to Alexandre Karev for - suggesting this. - - * ace/Synch: Added a new class called ACE_Null_Condition_Mutex. - This is necessary to fix bugs with stupid compilers... Thanks - to Zusman Mark for reporting this. - - * tests/Naming/client: made a first pass implementation of a - client application that dynamically links in a Naming_Context - based on information provided by the svc.conf file. - - * ace/Name_Options: Fixed yet more problems with dynamic memory - management. The old version didn't make a copy of the strings - it was passed and this caused major problems. - - * ace: Fixed a whole slew of problems with the ACE Name Server - stuff that arose from inconsistent use of const char * vs. char - *... - -Wed Feb 7 00:58:45 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/CORBA_Handler.cpp (ACE_MT_CORBA_Handler): Added new - enhancements to ACE_MT_CORBA_Handler to make it work correctly - with Windows NT. Thanks to Irfan for making these changes. - - * ace/Connector.cpp (fini): Make another workaround for bugs with - MSVC++ 2.0... - - * ace/SPIPE_Connector.cpp (connect): Added a call to ACE_CLR_BITS - (flags, O_CREAT) to make darn sure that the O_CREAT flag is not - set. Thanks to Chris Cleeland for suggesting this. - -Tue Feb 6 01:40:29 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.h: added a new prototype to OS.h that should help with - portability to nasty platforms with broken rand_r() definitions. - Thanks to Aurelio Nocerino - for suggesting this. - - * Local_Tokens: Changed all uses of enumerals MAXTOKENNAMELEN and - MAXCLIENTIDLEN to symbol #defines ACE_MAXTOKENNAMELEN and - ACE_MAXCLIENTIDLEN. This works around bugs with HP/UX. - Thanks to Neil Cohen for reporting this problem. - - * ChangeLog: split the ChangeLog files into 4 separate files -- - one for '96, '95, '94', and '93. Hard to believe I've been - working on this stuff for so long! - - * ace/OS: Fixed the use of ::memset to replace sizeof buffer with - sizeof (ACE_SERVENT_DATA) and sizeof (ACE_HOSTENT_DATA). This - fixes bugs that surfaced on AIX. Thanks to Chris Lahey for - finding these. - - * ace/SPIPE_Addr.cpp (ACE_SPIPE_Addr): Fixed a bug in - SPIPE_Addr::SPIPE_Addr(const SPIPE_Addr&). What happens is that - when the size is calculated it does not take into account the - required zero byte at the end of the rendezvous_ member. Thanks - to Chris Cleeland for reporting this. - - * ace/Local_Tokens: Had to move all ACE_Token_Proxy methods from - Local_Tokens.i to Local_Tokens.cpp and remove INLINE - otherwise - gcc reported them as undefined methods during linkage stage. - Thanks to Zusman Mark for - reporting this. - - * ace: Changed ACE_Name_Request_Reply::LAST to - ACE_Name_Request_Reply::MAX_ENUM to avoid problems with name - conflicts on OSF/1. Thanks to Eshel Liran - for suggesting this. - - * ace/Synch_T: Fix all definitions of ACE_Atomic_Ops so that they - compile correctly on platforms that lack threads! Thanks to - Alexandre Karev for noticing this. - - * include/makeinclude: Added a new config file from Bryon G. Rigg - , which should allow ACE to build on - Linux. - - * ace/Remote_Tokens.cpp: Moved ACE_TSS_Connection to - Remote_Tokens.h to avoid problems with AIX. Thanks to the - ever-vigilant Chris Lahey for reporting this. - -Mon Feb 5 23:34:42 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * Added CORBA_Ref.h which contains the new class ACE_CORBA_Ref. - This class provides a nice wrapper for making the use of Orbix - object references more transparent. This is done by automating - the release and duplicate calls. - -Mon Feb 5 15:43:17 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: added Prashant's latest changes to the Name_Handler*, - Naming_Context*, and Remote_Name_Space*. These changes make it - possible to retrieve lists of values based on a pattern, which - can be a regular expression. - - * Moved the apps/Name_Server/Client-Server tests into tests/Naming - and most of the apps/Token_Server/* tests into tests/Tokens to - conform to Karlheinz's testing style. - - * ace: Modified a number of files in ACE to make it compile - correctly with MSVC++ 2.0. - -Sun Feb 4 23:58:43 1996 Douglas C. Schmidt (schmidt@mambo.cs.wustl.edu) - - * ace/Reactor: Generalized ACE_Null_Callback to work correctly - with Windows NT (which lacks pipes). The new design uses the - ACE socket wrappers for NT. It requires very few changes to the - code to handle NT now! Also changed the name to - ACE_Notification_Handler, which is more descriptive. - -Sun Feb 4 14:47:50 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Remote_Tokens.cpp: Reworked ACE_Singleton to avoid - portability problems on compilers like GCC. - -Thu Feb 1 12:47:46 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Remote_Tokens.cpp: Generalized the parameters passed into - ACE_Singleton so they would compile on HP/UX and other platforms - that lack threads. Thanks to Neil Cohen for noticing the - problem. - -Wed Jan 31 22:49:13 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Modified a number of minor things in ACE to get it to - compile successfully with Windows NT MSVC++ 4.0. Updated the - INSTALL file to explain this process better... - -Tue Jan 30 01:12:07 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/CORBA_Handler.cpp: changed things so that no diagonistic - messages are printed. - - * Regenerated all the ACE manual pages to bring them up to date - with the recent changes. - - * ace/Malloc.h: Modified the ACE_Malloc header file so that it - works correctly when ACE_MALLOC_STATS is enabled. Thanks to - Alexandre Karev for reporting this. - - * ace/OS.cpp (mutex_lock_cleanup): removed the leading & before - p_lock. Thanks to Chris Lahey for noticing this. - - * ace: Added the new ACE_Singleton class. This class uses the - Adapter pattern to turn ordinary classes into Singletons - optimized with the Double-Check pattern. - - * Added Tim's latest Token Server changes (which include support - for local and remote mutexes and readers/writer locks) and - Prashant's latest Name Server changes (which allows the contents - of a Name Server to be dumped and restored to/from an ASCII - file). - -Mon Jan 29 02:22:23 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Handle_Set: Changed MAX_SIZE and WORD_SIZE to MAXSIZE and - WORDSIZE to avoid name collisions with HP/UX. Thanks to Byron - Rigg for suggesting this. - - * ace/Time_Value.h: Added a new config symbol ACE_HAS_SVR4_TIME to - differentiate between UNIX platforms that support "POSIX_TIME" - (i.e., timespec_t) and those that support "SVR4_TIME" (i.e., - timestruc_t). This is necessary to work around HP/UX... Thanks - to Byron Rigg for suggesting - this. - - * ace/config-hpux-10.x.h: config-hpux.h has now been renamed to - config-hpux-10.x.h and config-hpux-9.x.h. Thanks to Byron Rigg - for suggesting this. - - * ace/Synch_T: Added a new method called ts_get() and made both - the operator-> and operator TYPE * call this. I hope this will - fix a bug with HP/UX reported by Neil Cohen... - - * ace/OS.i (dlclose): Added Win32 support for dlclose(). Thanks - to Todd L. Montgomery for pointing the way - here... - - * ace: Split off the old class ACE_Dynamically_Allocated, renamed - it ACE_Dynamic, put it in a separate file called Dynamic.*. - This is necessary to solve nasty multiple definition problems - with compilers that require the source of template. - - * ace/Synch_T: moved - - template TYPE * - ACE_TSS::make_TSS_TYPE (void) const - { - return new TYPE; - } - - out from condition compilation block - - #if (defined (ACE_HAS_THREADS) && defined(ACE_HAS_THREAD_SPECIFIC_STORAGE)) - - in file Synch_T.cpp. This class member called in many other - places regardless ACE_HAS_THREADS and - ACE_HAS_THREAD_SPECIFIC_STORAGE defined or not... - - * ace/Name_Handler.cpp: Changed the use of the "inherited" typedef - to fully expand to ACE_Svc_Handler. This is necessary to workaround bugs with AIX. - Thanks to Chris Lahey for reporting this. - - * tests and apps: Fixed an odd problem that only surfaced recently - with GNU G++. Apparently, it doesn't like function-style casts - of the form ACE_SignalHandler (foo), but will accept - (ACE_SignalHandler) foo. Since both approaches are equally good - for what I'm doing, I've updated all the code in ACE to be more - portable. - -Sun Jan 28 12:24:58 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * tests/Shared_Malloc/test_malloc.cpp (spawn): when forming - argv[] for execv, moved - - argv[ ... ] = Options::instance ()->debug () ? "-d" : ""; - - to the end of the vector just before terminator. This will - allow to pass rest of arguments to exec if -d switch not - specified. Thanks to Alexandre Karev - for reporting this. - - * tests/Shared_Malloc/Malloc.cpp: To avoid conflict with - ACE_DEFAULT_SEM_KEY in OS.h changed SEMA_KEY value in - tests/Shared_Malloc/Malloc.cpp to ACE_DEFAULT_SEM_KEY + 1. - Thanks to Alexandre Karev for reporting - this. - - * ace/SV_Semaphore_Complex.i: Changed all arguments in calls like - - this->acquire( n+2 ) - and - this->tryacquire( n+2 ) - to - this->acquire( n ) - and - this->tryacquire( n ) - . - Since the semaphore number is incremented by 2 in - SV_Semaphore_Complex::acquire - and - SV_Semaphore_Complex::tryacquire - - when SV_Semaphore_Simple::(acquire/tryacquire) is called. - Thanks to Alexandre Karev for pointing - this out. - -Sat Jan 27 16:14:27 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Read_Buffer: Added a new component that efficiently reads in - an artibrarily large buffer from a file up to an including a - termination character. Also performs search/replace on single - occurrences a character in the buffer using the priniciples of - Integrated Layer Processing. - -Fri Jan 26 12:01:06 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Thread_Manager: Made a small change to workaround the use of - a struct type for thread_t and hthread_t in HP/UX. Thanks to - Bryon Rigg for noticing this. - -Thu Jan 25 19:54:01 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Svc_Handler: Added some minor changes to account for - limitations with GNU G++. I think the new implementation will - be portable across all C++ platforms. - - * ace/SV_Semaphore_*: Widened the interface of SV_Semaphore* - classes to include a flags parameter. This can be used to pass - in SEM_UNDO, which is important in many applications. Thanks to - Andrew Gilbert for suggesting this. - - * ace/Synch_T.cpp: We are forced to "cast away const" inside of of - the ACE_TSS const methods in order to make the ACE_Guard work. - The right thing to do would be to make the lock "mutable" but - that's hopelessly non-portable. - -Thu Jan 25 14:34:12 1996 Douglas C. Schmidt (schmidt@merengue.cs.wustl.edu) - - * ace/Log_Msg: Fixed a minor bug in ACE_Log_Msg that kept - resetting the restart and iostream value no matter what we'd set - it to before. Thanks to Prashant for finding this. - - * bin: Fixed up the Makefile process for the clone program. Now - it builds without having to depend on ACE. Thanks to Brad Brown - (bbrown@rdxsunhost.aud.alcatel.com) for suggesting this. - - * ace/Synch: Modified ACE_Condition*.remove so that cond_destroy() - is called in a loop if the condition variable is BUSY. This - avoids a condition where a condition is signaled and because of - some timing problem, the thread that is to be signaled has - called the cond_wait routine after the signal call. Since the - condition signal is not queued in any way, deadlock occurs - unless this loop is used. Thanks to Chris Lahey for pointing - this out. - - * ace/CORBA_Handler: Made all the methods in ACE_CORBA_Handler - private to make sure that users don't inherit from this class! - Instead, the ACE_MT_CORBA_HAndler and ACE_ST_CORBA_Handler - should be used as Singletons. - - * ace/CORBA_Handler: Added new support for Orbix on Windows - NT. This requires clever use of macros in order to handle - inherent differences between generated code. - - * ace/Svc_Handler: Added a clever idiom that transparently checks - if we were allocated dynamically. This information is used by - the method to decide if we need to delete ... - The idiom is based on a paper by Michael van Rooyen - (mrooyen@cellnet.co.uk) that appeared in the April '96 issue of - the C++ Report. We've spruced it up to work correctly in - multi-threaded programs by using our ACE_TSS class. - - * ace/config-win32-msvc4.0.h (ACE_LACKS_RECVMSG): Fixed a typo - in the MSVC++ config files. - -Thu Jan 25 02:59:22 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Finally got the frigging library built on SGI. This was a chore - due to compiler bugs, but at least it's another datapoint for - successful cross-platform building... - -Wed Jan 24 00:10:29 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Time_Value.cpp (operator-=): Changed operator += and - operator -= to use const ACE_Time_Value & rather than - ACE_Time_Value &. Thanks to Alex V Maclinvosky for noticing - this. In addition, also changed *all* ACE_Time_Value parameters - to be const ACE_Time_Value &. This should reduce the number of - excess constructors called... - - * ace/OS: Added Chris Lahey's latest changes that introduce POSIX - pthread cancellation cleanup handlers. Also added an herror() - function that is comparable to perror(). - - * ace/OS: (thr_join): Added a new version of thr_join() which - works for Windows NT. Windows NT requires a HANDLE, which is - fundamentally incompatible with other things... - - * ace/Thread_Manager: added two new methods that return the - ACE_Thread_Descriptor corresponding to either a thr_id or a - thr_handle. - - * ace/Thread_Manager: Made the spawn() interface compatible with - the other spawn() interfaces in ACE_OS and ACE_Thread by adding - the hthread_t type. - - * ace/Log_Msg.cpp (log): Fixed things up so that we can now print - out the thread id for all versions of threads! - - * ace/OS: Added a new overloaded version of ACE_OS::thr_self() - that returns the "kernel" thread id. This is necessary on - systems like NT and AIX, which separate kernel thread ids from - user thread ids. Thanks to Chris Lahey for suggesting this. - -Tue Jan 23 01:17:23 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i (sigwait): Changed the parameter of sigwait() from - const sigset * to sigset *. Thanks to Neil Cohen for chasing - this down on SunOS 5.5.... - - * ace/Malloc_T.cpp: Fixed a typo in bind() whereby - the test if (duplicates == 0 || this->shared_find (name) != 0) - should be if (duplicates == 0 && this->shared_find (name) != 0). - Thanks to the ever vigilant Alexandre Karev - for reporting this. - - * tests: Fixed all test programs that previously used the "execl" - family of system calls to use the "execv" family instead. - - * ace/OS: Added support for the "execv" family of exec() system - calls. Unlike the "execl" family, these calls are easy to - support since they don't require variadic arguments. I've added - the hooks for the "execl" family, as well, but haven't actually - implemented them yet. - - * ace/Memory_Pool.cpp (ACE_Shared_Memory_Pool): Fixed a bug that - was tickled when pool_name == 0. Thanks to Alexandre Karev - for reporting this. - - * ace/OS.h: removed FD_SETSIZE from the ACE_WIN32 stuff since this - is defined in winsock.h. - - * ace/OS.cpp (ACE_Spawn_Args): Added "f" to the parameter list. - - * ace/CORBA_Handler: Added a new macro called CORBA_T that masks - the incompatibilities between the version of Orbix on NT and on - Solaris. - - * ace/OS.h: Added support for compilers (like NT) that don't - support "mode masks" (these are used to give symbolic names for - file creation modes passed to open() and creat(). - - * ace/SString.cpp: Added Tim's new copy constructor code for - SString.cpp. This doesn't appear to be strictly necessary , but - it is more explicit and therefore it useful. - - * ace/Map_Manager.cpp: Fixed a bug in Map_Manager that was failing - to call the placement new operator for every element in the map - that was dynamically created by the allocator(). - - * ace/Synch_T: Added Tim's new ACE_TSS implementation. This - version is more flexible than the old one. - -Mon Jan 22 00:03:24 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Time_Value.h: changed a few minor things to get this - compiling again on NT. Thanks to Irfan for helping with this. - - * ace/Synch_Options: Changed all the "accessor" methods to be - const member functions at the request of Irfan. I just know - this is going to cause const cancer... ;-) - - * ace/Acceptor and Connector: Changed all parameters that take - ACE_Synch_Options & to take const ACE_Synch_Options & at the - request of Irfan. - - * ace/OS.i (uname): Added rudimentary support for the uname() - function for Windows NT. If anyone has suggestions on how to - fill in all these fields portably please let me know! - - * ace/Connector.h: Changed a stray -1 to ACE_INVALID_HANDLE. - Thanks to Irfan for noticing this. - - * ace/Profile_Timer.h: Added the keyword "public" to handle one - arm of the conditional compilation that is only exercised on - NT... Thanks to Irfan for noticing this. - - * ace/OS.i (mutex_init): Removed the call to - pthread_mutexattr_setkind_np() it isn't in the final POSIX - standard. - - * ace/Reactor.cpp (unbind): Removed the ACE_MAX3 template function - from OS.h and inlined its only use in the Reactor. This was - causing problems with some C++ compilers. Thanks to Mark Zusman - for reporting this. - - * ace/OS.i: Fixed a number of omitted return results in - gettimeofday() and ctime_r() that were masked by the - ACE_OSCALL_RETURN macros. Thanks to Mark Zusman - for reporting these. - - * ace/config-linux.h: Added new symbolic constants to handle the - fact that Linux seems to lack recvmsg(), sendmsg(), msync(), and - madvise(). Thanks to Neil Cohen for noticing this. - - * include/makeinclude: Fixed all the *-orbix.GNU files to use - $(ORBIX_ROOT)/lib rather than $(ORBIX_ROOT)/ace. Thanks to - Pramod Kumar Singh for reporting - this. - - * ace/config*.h: Changed all typos of the form ACE_HAS_SVSV_IPC to - ACE_HAS_SYSV_IPC. Thanks to Alexandre Karev - for reporting this! - - * ace/OS: Changed the order of parameters passed to thr_create() - to be consistent with all the spawn() and spawn_n() usages in - ACE. Thanks to Chris Lahey for pointing this out. - -Sun Jan 21 15:06:15 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Added a new "priority" parameter to the spawn() and - spawn_n() methods in ACE_Thread and ACE_Thread_Manager. This - allows us to pass the priority on down to thr_create(). Thanks - to Chris Lahey for pointing this out. Note that this change - required reordering the parameters so that the stack and - stack_size parameters now come last for these methods. Since - those are not likely to change much this is a good place to put - them (i.e., at the end). - - * ace/Thread.i (spawn_n): Added a new overloaded spawn_n() method - that accepts an array of thread_t's to be filled in. This is - useful if you want to know the thread IDs of any threads - created. - - * Changed ACE_OS::signal() to ACE_Sig_Action across all of ACE to - be portable to pthreads implementations. Thanks to Chris Lahey - for pointing this out. - - * ace/OS: Added a new set of OS C++ wrappers for POSIX pthread - cancellation routines. Thanks to Chris Lahey for these. - - * ace/Thread: Added a new set of ACE C++ wrappers for POSIX - pthread cancellation routines. Thanks to Chris Lahey for - these. - - * ace/Map_Manager: Revised the Map_Manager::bind method. This has - now been split into bind() and rebind() methods. The bind() - method is very simple -- if you try to bind() to something that - already exists you fail. The rebind() method allows you to - atomically update existing values in a map. It also gives you - back the existing values so that you can delete them if - necessary. The Local_Name_Space::bind() and rebind() methods - have been updated to use this new interface. - - * ace/Malloc_T.cpp (find): Fixed a typo -- find() should have set - its pointer parameter to node->pointer_, rather than - node->name_! This bug was revealed during testing of the ACE - Name Server. - - * ace/Local_Name_Space.cpp: Fixed bugs with computation of the - size of ACE_NS_Strings -- they needed to count the wchar_t's - correctly, along with several other minor fixes. These were - revealed during testing of the ACE Name Server. - - * ace/SString.cpp: Fixed several bugs that prevented the - assignment operators from working correctly. These were - revealed during testing of the ACE Name Server. - -Sat Jan 20 08:33:54 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Local_Name_Space.cpp (shared_bind): The args to to the - NS_String constructors were not in the correct order: - - wchar_t *value_rep = (wchar_t *) (ptr); - wchar_t *name_rep = (wchar_t *) (ptr + name_len); - ACE_NS_String ext_id (name.fast_rep (), name_rep, name_len); - ACE_NS_String int_id (value.fast_rep (), value_rep, value_len); - - They should be: - - ACE_NS_String ext_id (name_rep, name.fast_rep (), name_len); - ACE_NS_String int_id (value_rep, value.fast_rep (), value_len); - - Thanks to Irfan for noticing this. - - * ace/OS.h: defined the following in ACE_OS: - - #define MS_ASYNC 0 - #define MS_SYNC 0 - #define MS_INVALIDATE 0 - - under NT so that calls to mmap will port transparently. Thanks - to Irfan for suggesting this. - -Thu Jan 18 16:25:16 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Added a new symbol that indicates if the platform supports - the new BSD sin_len field of inet_addr. - - * ace/OS: added new support for AIX gethostbyaddr_r(), - gethostbyname_r(), and getservbyname_r(). This fixes some - problems caused by improper choice of buffer size. Also changed - the INET_Addr.cpp file to use these new changes. Thanks to - Chris Lahey for recommending these changes. - -Wed Jan 17 01:10:48 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i (printf): the ACE_OS::printf() function did not work. - Needed to call vprintf() internally, not printf. Thanks to - Chris Lahey for pointing this out. - - * Released version 4.0. - - * include/makeinclude: added the -lgen library to all the - platform_sunos5.*.GNU files. - - * ace/Memory_Pool.cpp: removed the INLINE macros in Memory_Pool.cpp. - Thanks to Alexandre Karev (karev@vxcern.cern.ch) for noticing - this! - - * ace/Malloc_T.cpp: moved the comment "Ce n'est pas une catst" - outside of the macro ACE_NEW_RETURN. The prepocessor truncates - the macro expansion when it encounters the comment. Thanks to - Greg Baker for pointing - this out. - - * ace/Reactor.cpp (close): added "return 0" at the end of the - close member function. The function is prototyped to return an - int and the compiler expects a return outside of the if clause. - Thanks to Greg Baker for - pointing this out. - - * ace/Stack.cpp (free_all_nodes): Removed a spurious ACE_OS that - was stuck on the front of ::delete. Thanks to Greg Baker - for pointing this out. - - * ace/OS.i: Added extern "C" to the prototype for syscall in OS.i. - Without it, you get unresolved symbols at link time. Thanks to - Greg Baker for pointing - this out. - - * ace/Message_Queue.cpp: Changed the return values for - enqueue_head(), enqueue_tail(), dequeue_head(), and - peek_dequeue_head() to return the number of messages that are - still on the queue. This helps some algorithms perform better - and avoid blocking unnecessarily. Thanks to Alex V Maclinvosky - for suggesting this... - - * ace/Synch_T.cpp (ACE_Condition): Fixed a bug in - ~ACE_Recursive_Lock and ~ACE_Recursive_Mutex that was causing - the destructor to be called twice (once implicitly and once - explicitly). Thanks to Chris Lahey for pointing this out. - -Mon Jan 15 12:44:29 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Created a new config symbol called ACE_HAS_ALLOCA_H. This - is required to differentiate between AIX and other versions of - UNIX. Thanks to Chris Lahey for pointing this out. - - * ace: moved config-hpux.h to config-hpux-9.x.h in anticipation of - the changes required to handle HP/UX 10.0! - -Sun Jan 14 23:38:23 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.h (ACE_MAX3): Fixed the definition of ACE_MAX3 (it needed - a return value of template type T). Thanks to Mark Zusman - for noticing this. - - * ace: Added a new section to all the template files called - ACE_TEMPLATES_REQUIRE_SPECIALIZATION to deal with the screwy GNU - G++ semantics that are required if you *don't* have the template - repository patches. Thanks to Mark Zusman - for this. - -Fri Jan 12 00:47:57 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Time_Value.h: #included to the Time_Value.h - class so that it would be the first file included. This fixes a - problem with AIX. Thanks to Chris Lahey for reporting this and - suggesting the fix. - - * ace: Fixed a braino with the #ifdefs in SPIPE_Stream and - SPIPE_Acceptor. These were checking for ACE_WIN32 rather than - ACE_HAS_STREAM_PIPES. Naturally, that failed on versions of - UNIX (e.g., Linux) that lack STREAM pipes! Thanks to Neil Cohen - for taking time out of fighting blizzards to report this! - - * ace/Svc_Handler: Added a new method for handle_timeout, which - shuts things down by default. Thanks to Irfan for suggesting - this. - - * Fixed a minor problem caused when Tim added the Double-Check - pattern to ACE_ODB... - -Thu Jan 11 01:48:02 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Integrated AIX fixes from Chris Lahey . - These should allow ACE to build correctly using the AIX compiler - and it's screwy template mechanisms! - - * ace: Fixed some minor bugs that caused problems when compiling - with G++. - -Wed Jan 10 00:17:05 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Trace.cpp: Fixed a typo that was causing problems when using - ACE_TRACE (we were ending up with recursive tracing in the - ACE_Trace class!). Thanks to Detlef for noticing this. - - * ace/ACE.cpp: Moved methods from ACE.i to ACE.cpp and removed the - INLINE macro to deal with order of include problems with GNU - G++. - -Tue Jan 9 19:00:41 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Task.i (flush): Added a check to make sure that msg_queue_ - != 0 before trying to close() the queue. This solves a problem - if the queue has already been closed. Thanks to Alex V - Maclinvosky for reporting this... - - * tests/ASX/Event_Server/Event_Server: Fixed minor bugs in - Supplier_Router.cpp and Consumer_Router.cpp -- I was checking - for this->getq (mb) > 0 rather than this->getq (mb) >= 0. - Thanks to Alex V Maclinvosky for - noticing this... - - * ace/Synch_T.h: Commented out the ACE_ALLOC_HOOK stuff. This is - causing order-of-include problems on HP/UX. Also moved the - ACE_Null_Condition::wait() method to Synch_T.i to avoid the same - problem. Thanks to Greg Baker - for pointing this out. - -Sun Jan 7 18:57:49 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Makefile: Added the Dump file to ACE. Thanks to Tim for - fixing this up to make it ready for prime time. - - * Thanks to Craig Rodrigues for sending - me a new version of psnup that *finally* fixes the nasty - problems with "4-up" printing of postscript! This makes it much - easier to distribute ACE documentation... - -Sun Jan 7 18:31:07 1996 Tim H. Harrison (harrison@merengue.cs.wustl.edu) - - * ace: Used the "Double-Check" pattern to eliminate potential race - conditions when using Singletons in multi-threaded programs. - Classes affected included ACE_[MS]T_CORBA_Handler, Name_Options, - Trace, and ACE_ODB. - -Fri Jan 5 00:03:29 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i: Added the following to OS.i: - - #if defined (ACE_LACKS_SYSCALL) - int syscall (int, ACE_HANDLE, struct rusage *); - #endif /* ACE_LACKS_SYSCALL */ - - This should fix some problems with HP/UX. Thanks to Walt Akers - (akers@cebaf.gov) for pointing out the problem. - - * ace/Handle_Set: Fixed the Handle_Set conversion operator so that - it returns fd_set * rather than ACE_FD_SET_TYPE *. Thanks to - Walt Akers (akers@cebaf.gov) for pointing out the problem. - - * ace/Time_Value.h: I think I've fixed the problem with the order - of #includes with respect to POSIX and SVR4 time. The trick was - to put this test in ace/Time_Value.h and then to make sure that - the ace/config.h file was included at this point! Also changed - the symbol from ACE_HAS_POSIX_TIMERS to ACE_HAS_POSIX_TIME to be - more accurate. - -Thu Jan 4 23:16:59 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/OS.i (gettimeofday): Changed the implementation of - gettimeofday() to use the ::_ftime call rather than the more - complex ::GetSystemTime(), ::SystemTimeToFileTime() duo. - -Thu Jan 4 9:32:38 1996 Chris Lahey (clahey@ix.netcom.com) - - * ace/config-aix.h: added #define ACE_TEMPLATES_REQUIRE_SOURCE - to make ACE work with AIX C++ compiler. - - * include/makeinclude/platform_aix.GNU: - - Added -qtempinc to the CPPFLAGS - Removed the PIC= definition completely - - * ace/Task.h: ACE_Task::svc() should not be declared as a pure - virtual, removed = 0. - - * ace/Map_Manager.cpp: in trybind() member function, the line - int_id = ss.int_id_; - should be: - int_id = search_structure[index].int_id_; - -Thu Jan 4 01:23:38 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Map_Manager.cpp: Fixed a braino in Map_Manager -- didn't - need the parameter to shared_bind(). Thanks to Tim for - finding this! - - * ace/Log_Msg.cpp (instance): Tim Harrison did a noble service to - humanity by fixing a potential race condition in the instance() - Singleton of ACE_Log_Msg. - -Wed Jan 3 00:49:57 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Made some minor changes to fix portability problems with - SGI. Fortunately, this should also fix some other problems with - HP/UX another other non-thread platforms. - - * ace/ACE.cpp (format_hexdump): Added Todd Montgomery's amazing - "format_hexdump" method to class ACE. - -Tue Jan 2 20:47:57 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/SV_Semaphore*: updated the interface of the _Simple and - _Complex System V semaphore wrappers to include the _read() and - _write() forms of acquire() and tryacquire(). Note that I've - implemented these as calls to acquire() and tryacquire(), so - they don't add any extra behavior. This is needed for interface - conformance with other forms of ACE synchronization mechanisms. - - * ace/Time_Value.h: Changed the header to #include - in order to work around nasty "order of include" problems. - - * tests: Created a new directory called Win32. This contains test - programs that This directory contains test programs that have - been compiled and tested successfully under Windows NT. As we - get further along, we'll move this stuff into the general ACE - $WRAPPER_ROOT/tests directory (since of course all ACE programs - will run without any problems under Win32, right? ;-)). See - the ./tests/Win32/README file for instructions on how to build - these tests. - - * ace/Reactor.h: Moved the ACE_Handler_Repository out of the - ACE_MT_SAFE section of the code. This was a "typo." Thanks to - Walt Akers for reporting this. - -Mon Jan 1 01:18:12 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/ACE.i: Moved the recv_n() and send_n() methods from ACE.cpp - into ACE.i and set things so that if __INLINE__ is set then - we'll inline those too! - - * ace: Irfan and I got the first major part of the Win32 to work - finally! We made two socket programs (client and server) that - talked to each other and to UNIX. Things are really starting to - take shape! diff --git a/ChangeLogs/ChangeLog-96b b/ChangeLogs/ChangeLog-96b deleted file mode 100644 index 5dd7b809a42..00000000000 --- a/ChangeLogs/ChangeLog-96b +++ /dev/null @@ -1,5878 +0,0 @@ -Tue Dec 31 18:27:50 1996 Douglas C. Schmidt - - * ace/Log_Msg.cpp (log): Added a test so that if we're - (1) not printing to stderr and (2) aborting the program we still - print a message to stderr. - - * ace/Message_Block: Added synchronization support to - ACE_Message_Block. This is necessary now that we've got - reference counting to ensure that we don't have race conditions - when incrementing and decrementing the reference count in - separate threads. The approach is very clean and uses the new - ACE_Lock mechanism to conditionally acquire()/release() the - locking strategy if concurrency control is necessary. - - * ace/Synch_T: Created a new set of ACE_Lock and - ACE_Lock_Adapter<> classes which are similar in spirit to the - ACE_Allocator and ACE_Allocator_Adapter<> classes. These make - it possible to treat polymorphically synchronization mechanisms - in ACE polymorphically, *without* creating an entire new - parallel hierarchy of locking mechanisms. - - * ace/Synch: Added the full suite of acquire_{read|write}() and - tryacquire_{read|write}() methods to ACE_Semaphore and - ACE_Process_Semaphore so they will be consist with the other - synchronization APIs. - -Tue Dec 31 00:11:56 1996 Douglas C. Schmidt - - * Changed all uses of ACE_Event_Handler::RWE_MASK to - ACE_Event_Handler::ALL_EVENTS_MASK to reflect the fact that - we will soon have more than READ, WRITE, and EXCEPT events. - However, I've kept RWE_MASK around for backwards - compatibility. - - * examples/ASX/Message_Queue: Changed the tests so that they use - the new ACE_Message_Block::release() method rather than calling - delete explicitly. - - * apps/Gateway: Revised the implementation of the Gateway and Peer - applications to take advantage of the new ACE_Message_Block - reference counting scheme. - -Tue Dec 31 15:06:51 1996 David L. Levine - - * ace/Task.cpp: added comments that try to explain interaction - between ACE_Task_Base::svc_run () and ACE_Task_Exit instance - - * ace/Hi_Res_Timer.h: added comment to print_total () saying it - should only be used for incremental timings; added defaults to - a few print_ave/print_total args - - * ace/Hi_Res_Timer.{i,cpp}: inlined the constructor; trimmed output - if count is 1; rounded instead of truncated usecs portion of time - -Mon Dec 30 15:24:59 1996 Douglas C. Schmidt - - * ace/Message_Block: Added reference counting to ACE_Message_Block - so that we no longer have to clone() messages when we want to - pass them around "by reference." - - * apps/Gateway/Peer/Peer.cpp (init): The Peer_Acceptor had gotten - out of date wrt newer ACE features, so I updated it. - -Mon Dec 30 15:24:59 1996 Douglas C. Schmidt - - * ace/OS.h: Added a special case for ACE_UNUSED_ARG that works - with G++. Thanks to David Levine for this. - -Mon Dec 30 16:05:11 1996 David L. Levine - - * ace/OS.cpp (ace_thread_adapter): Updated ACE_TRACE arg - names (even though they're currently commented out). - - * ace/Task.cpp (svc_run): If TSS isn't supported, and on - Linux, for now, create the ACE_Task_Exit exit_hook instance - on the stack so that it's destructor will be called when - svc_run () completes. - -Sun Dec 29 18:38:03 1996 Douglas C. Schmidt - - * apps/Gateway/Gateway/File_Parser.h: Removed the endofline() - method declaration -- it doesn't seem to be defined anywhere. - - * ace/OS.h: Added an ACE_INT32 to complement the ACE_UINT32. - - * netsvcs/lib: Cleaned up all the ACE network services by removing - their SIGINT signal handler. This was interferring with the - main event loop's ability to shutdown... - - * apps/Gateway/Gateway: Once again changed the name of - *IO_Handler* to *Proxy_Handler* since these things are really - proxies, in the COS sense! - - * ace/Service_Record.cpp: Tidied up the implementation of - ACE_Module_Type::fini() so that it doesn't try to call fini() on - NULL pointers. Also, rather than explicitly deleting the reader - and writer Tasks, we call ACE_Module<>::close(), which knows how - to take care of all this stuff. - - * ace/Module.cpp: Added an extra parameter to close_i() so that we - can correctly pass the value of "flags" from close() in order to - prevent deleting tasks when we don't want to do this. - - * ace/Module.cpp: There was a bug in the open() method - since we were potentially deleting reader_q and writer_q twice - if memory allocation failed. - -Sat Dec 28 19:02:13 1996 Douglas C. Schmidt - - * ace/ACE.cpp: Changed the implementation of ldfind() so that it - doesn't try to add the DLL prefix (e.g., "lib") unless it - doesn't match filename. This is necessary to keep lots - of existing svc.conf files from breaking. - - * ace/Event_Handler.h: Added a new ACCEPT_MASK for use with the - new asynchronous accept() operation support for Win32. - - * ace: Added a new config file for WinNT 4.0 called - config-winnt-4.0-msvc4.x.h. This file contains #defines for new - features in WinNT 4.0 such as non-blocking acquire for - CRITICALSECTIONs (TryEnterCriticalSection()), - SignalObjectAndWait(), and CancelIO(). Oddly enough, these - functions seem to be missing from the MSVC++ 4.2 #include files, - so I added them to the config file. - - * ace: Changed the name of config-win32-msvc4.0.h to - config-win32-msvc4.x.h since this config file works for MSVC++ - 4.0, 4.1, and 4.2. - - * ace/Proactor: Added a new "cancel_io" method on the Proactor. - This makes it possible to cancel all I/O that is outstanding on - a thread. Thanks to Tim for help with this. - -Sat Dec 28 23:49:09 1996 Tim H. Harrison - - * ace/ReactorEx.h: Fixed some bugs with ACE_ReactorEx::dispatch. - For instance, the index should only be incremented when handlers - are dispatched. - - * ace/OS.i: Fixed some typos regarding the ACE_cond_t for NT. - - * examples/Reactor/Proactor/test_proactor.cpp: Dr. Schmidt and I - hacked this to be way cool. In particular, we no longer - have to know the size of the files to be transferred in - advance. This scheme uses a clever protocol that shuts down - the Peer Handler when (1) all input from the file has arrived, - (2) all output to the remote peer handler has been sent, and (3) - all input from the remote peer handler has been received. - The Peer Handler now uses calls close_writer on the stream - to notify the remote peer when its done writing. The Input - File Handler sends an mb==0 to tell the Peer Handler when - it's done reading from the file. The Peer Handle uses a - state variable to OR in all the different conditions for - exiting. It works. - -Fri Dec 27 23:39:19 1996 Douglas C. Schmidt - - * ace/Stream.cpp (pop): Modified the code so that we don't delete - the Module we are popping unless the flags request this. - - * ace/Service_Record.cpp (fini): Always make sure to first fini() - each Module, then remove() (and delete) them. - - * ace/Stream.cpp (remove): Updated the code so that we don't - delete the Module unless the flags request this. - -Thu Dec 26 18:51:22 1996 David L. Levine - - * ace/config-linux-lxpthreads.h: Has James CE Johnson's - latest adjustments to this config file. - -Tue Dec 24 10:55:20 1996 Douglas C. Schmidt - - * ace/OS.cpp (ace_thread_adapter): Changed the message that is - printed if we exit the thread. Thanks to Luca for this - suggestion. - -Tue Dec 24 15:38:43 1996 David L. Levine - - * ace/OS.i (cond_destroy): added call to event_destroy () - for waiters_done_ on WTHREADS platforms - - * ace/Future.cpp: added specialization of - template class ACE_Atomic_Op; - so that libACE is self-contained with respect to template - instantiations (with g++, for example) - - * ace/Malloc.cpp: added specialization of - template class ACE_Atomic_Op; - so that libACE is self-contained with respect to template - instantiations (with g++, for example) - - * examples/Reactor/Misc/test_reactors.cpp, - examples/Threads/future1.cpp, examples/Threads/future2.cpp, - examples/Threads/manual_event.cpp, examples/Threads/task_two.cpp, - performance-tests/Synch-Benchmarks/Benchmark.cpp, - tests/Future_Test.cpp, tests/Reactors_Test.cpp: instantiate - ACE_Atomic_Op with int instead of u_long so that it can use - the specialization in libACE - -Tue Dec 24 12:49:21 1996 David L. Levine - - * ace/OS.h (struct siginfo_t): added declaration of - siginfo_t (ACE_HANDLE *handles) to match definition in - OS.cpp. Thanks to James Johnson for pointing this out. - - * ace/OS.cpp (thr_create): fixed position of - #endif /* !ACE_LACKS_THREAD_STACK_SIZE */ directive, it - needed to be before the closing '}' of the block. Thanks to - James Johnson for pointing this out, also. - - * ace/OS.cpp: don't include ace/ARGV.h except on WIN32 because - it's only needed there, and don't compile ACE_Thread_Adapter on - VxWorks to save space - - * apps/Gateway/Peer/Gateway_Handler.h: changed #include "Event.h" - to be #include "Peer_Message.h" so that Peer_Header::ROUTING_ID - can be referenced in the class declaration. This subproject - still doesn't build, though; I think that Event.h is needed. - - * ace/OS.h (struct ACE_cond_t): declare waiters_done_ as - ACE_sema_t on VxWorks only, to avoid recursive struct - definition with ACE_event_t - - * ace/OS.i (ACE_OS::cond_*): on VxWorks only, use sema - operations on ACE_cond_t::waiters_done_ instead of event ops - -Tue Dec 24 10:55:20 1996 Douglas C. Schmidt - - * examples/Threads/task_three.cpp (main): Changed the use of - new-style C++ casts for ACE_Sig_Action to old-style C casts so - that more picky compilers like GCC won't complain. Thanks to - Sandro Doro for reporting this. - - * examples/Threads/task_two.cpp: Fixed a typo where int should be - used as the type for ACE_Atomic_Op rather than u_long. Thanks - to David Levine for noticing this. - - * ace/OS.i: Generalized the implementation of ACE_OS::cond_wait() - so that it will work with Win32 and VxWorks. Thanks to David - Levine for pointing this out. - - * ace/Synch_T.cpp: Removed ACE_Process_Condition since it isn't - really feasible to implement this as a template. At some point, - it should be reimplemnted as a non-template that is only - guaranteed to work on Solaris and some POSIX pthreads platforms. - -Sun Dec 22 21:23:57 1996 David L. Levine - - * ace/Acceptor.cpp: replaced two statements that looked like this: - "ptr && ptr->foo ()" with "if (ptr) ptr-> foo()" to prevent - compiler warnings about computed values that aren't used - - * netsvcs/clients/Tokens/manual/manual.cpp: added explicit "int" - return type to declaration of handle_exception (ACE_HANDLE) so - that compilers don't complain about no type - - * ASX/Event_Server/Event_Server/Options.cpp, - ASX/UPIPE_Event_Server/Options.cpp: rearranged initializers - in Options ctor to match declaration order - -Sun Dec 22 21:16:23 1996 Douglas C. Schmidt - - * ace/OS.cpp (thr_create): added a new ACE_HAS_PTHREADS_XAVIER to - deal with the sparam.sched_priority features of the Linux - pthreads implementation. Thanks to James Johnson for this. - - * ace/OS.i (thr_setprio): I forgot to define int policy = 0; - - * ace/SV_Semaphore_Simple.i: Removed the frigging LUSED macro and - updated the ACE_SV_Semaphore_Simple::name_2_key() method to - consider *all* the characters in the name. This will help avoid - nasty bugs when different lock names have a common prefix. - - * ace/Local_Name_Space_T.cpp (ACE_Local_Name_Space): Added a call - to "delete this->lock_" since we now allocate it dynamically. - - * apps/Gateway/Gateway/gatewayd.cpp: Changed call to - ACE_SVC_INVOKE from ACE_Gateway to Gateway. - - * ace/OS.i: In function thr_sigsetmask changed the line: - - #if defined (ACE_HAS_IRIX62_THREADS) - - to - - #if defined (ACE_HAS_IRIX62_THREADS) || defined (ACE_HAS_PTHREADS_XAVIER) - - Thanks to James CE Johnson for this. - - * ace/config-linux-[lx]pthreads.h: Added a #define for the - ACE_HAS_THREAD_SPECIFIC_STORAGE symbol. Thanks to James CE - Johnson for this. - - * ace: created a new config file called config-linux-lxpthreads.h. - This contains the ACE #defines necessary to use L. Xavier's - threading package on Linux. Thanks to James CE Johnson - for this. - - * build/gcc/ace/Synch: Moved the definition of the ACE_*Event - classes *outside* of ACE_HAS_THREADS so that the Proactor will - compile correctly even when there's no threading defined. - - * ace/config-linux-pthread.h: Added #define ACE_MT_SAFE, which - seems to have been missing. Thanks to James Johnson for - suggesting this. - - * tests/TSS_Test.cpp: Now that we've got Chris Lahey's fixes for - AIX we can run this test on AIX. - - * ace/OS.cpp (thr_create): Added a #ifdef for - pthread_attr_setstacksize() for Linux pthreads, which doesn't - seem to support this. Thanks to James CE Johnson - for this fix. - - * ace/OS.i: Added DCE pthreads fixes for OSF/1 3.2. Thanks to - Harry Gunnarsson for these. - -Sat Dec 21 13:54:45 1996 Douglas C. Schmidt - - * ace/Synch_T: Integrated a solution that will allow MVS to use - ACE_TSS. The problem is that the MVS C++ compiler requires an - extern "C" destructor function for pthread_key_delete and the - ACE_TSS stuff uses a paramatized C++ destructor function - (ACE_TSS::cleanup). To solve this, a new class - (ACE_TSS_Adapter) was created that encapsulates a thread - specific object and it's associated C++ destructor. The ACE_TSS - methods were then modified so that they provide access to the - thread specific object through the ACE_TSS_Adapter. Also added - a generic extern "C" cleanup routine that takes an - ACE_TSS_Adapter as an argument. It then calls the adapters - cleanup method passing it the saved address of the thread - specific object. Thanks to Chuck Gehr - for all of this. - - * ace/OS: Updated the code so that it will work with MFC and - AfxBeginThread(). Thanks to Detlef for these changes. - - * ace/README: Added two new #defines for ACE_LACKS_COND_T and - ACE_LACKS_RWLOCK_T to make it possible to define these in a - fine-grained manner for various platforms. - - * ace/OS.h: Restructured the ACE_HAS_THREADS section so that we - factor out the code for ACE_cond_t and ACE_rwlock_t so that it - is only defined if we don't support these features natively. - - * ace/ReactorEx: Added a new "alertable" parameter to the - handle_events() method. If alertable is true, then - WaitForMultipleObjectsEx is used as the demultiplexing call, - otherwise WaitForMultipleObjects is used. - - * ace/Signal.cpp: Had to move a few things around so that the code - would compile for HP/UX. Thanks to Neil B. Cohen - for reporting this. - - * ace/Acceptor.cpp: Updated the handle_close() method so that the - Acceptor shuts down the listen socket and prevents handle leaks. - Thanks to Irfan for reporting this. - -Thu Dec 19th 03:48:26 1996 Irfan Pyarali - - * ace/Local_Name_Space_T.cpp: Made sure that the mutexes are - getting named properly (both the mutex owned by the - Local_Name_space and the lock owned by the backing - store). For the time being I named these two to be the - extensions of the backing store file name. - - * ace/Local_Name_Space_T.cpp: Replaced the create_manager code - such that we use the double check pattern. This is simpiler - and easy to understand compared to the current code. - - * ace/Naming_Context.cpp: Gave the database name a default value. - - * ace/Malloc_T.cpp: The lock_name should never be 0. This will - cause all instances of the same pool to get different - mutexes. - -Sat Dec 21 09:43:35 1996 David L. Levine - - * ace/OS.{h,i}: fixes for VxWorks introduced in 4.1, and for - inlining: moved #include of OS.i after #defines but before - other ace #includes - -Thu Dec 19 15:58:09 1996 David L. Levine - - * ace/config-vxworks*.h, include/makeinclude/platform_vxworks*.GNU: - enable inlining on VxWorks by default - -Wed Dec 18 16:44:47 1996 Tim H. Harrison - - * ace/Proactor.cpp (dispatch): Changed this method to take an - int error parameter to set errno just before dispatching. - This allows us to better propagate overlapped I/O errors to the - handlers. - -Wed Dec 18 16:21:36 1996 David L. Levine - - * ace/OS.{h,i} and ace/INET_Addr.cpp: more VxWorks - gethostbyname () tweaks - -Wed Dec 18 15:24:13 1996 Tim H. Harrison - - * ace/Proactor.cpp (ACE_Proactor): Initialize completion_port_ to - 0. This is the only way that CreateIoCompletionPort works - first time in. ACE_INVALID_HANDLE makes it break. - - * (ACE_Proactor): Added a call to CreateIoCompletionPort in the - constructor so that GetQueuedCompletionStatus can be called - before ACE_Proactor::initiate is called. This is necessary if - an application is using the Proactor as a timer mechanism only. - -Tue Dec 18 7:58:07 1996 Tim H. Harrison - - * ace/Proactor.i (get_handle): Changed this to return - ACE_INVALID_HANDLE on non Win32 platforms. Also changed - shared_event_ from an ACE_Manual_Event to an ACE_Auto_Event. - This allows us to remove the call to reset from handle_signal. - - * examples/Reactor/Proactor/test_timeout.cpp: Added a new example - application to the Proactor example suite. Check the README for - more details. - - * examples/Reactor/ReactorEx/test_timeout.cpp: Added a new example - application to the ReactorEx example suite. Check the README for - more details. - - * ace/Service_Config.cpp: Fixed a bug in run_reactorEx_event_loop - (ACE_Time_Value &) so that it doesn't return on timeout. - -Tue Dec 18 7:06:32 1996 - - * ace/Proactor.cpp (handle_events): Once again removed the - timer_skew_ code. Changed the ACE_HANDLE global_handle_ to - ACE_Manual_Event shared_event_. Added a constructor that takes - an ACE_Timer_Queue *. Changed the implementation to use an - ACE_OS::sleep if only timers are registered. We need to figure - out a better approach than the sleep. - - * ace/Service_Config.cpp (run_proactor_event_loop): Changed this - to only return when an error occurs. If handle_events returns a - 0, then a timeout occurred, and we can continue to dispatch - events. We only return when all of the time has expired. - - * ace/Registry_Name_Space.h (ACE_Registry_Name_Space): Moved the - include statements below the ACE_WIN32 and UNICODE directives. - - * ace/OS.h (siginfo_t): Added siginfo_t (ACE_HANDLE *handle) - constructor prototype. - -Wed Dec 18 06:37:22 1996 Douglas C. Schmidt - - * ace/OS.i (cond_wait): Added the new algorithm for condition - variable emulation on Win32. (and VxWorks). This should fix the - nasty problems we had with earlier version (which weren't - "fair"). Thanks to James Mansion, Karlheinz, Detlef, and Irfan - for helping with this. - - * ace/Registry.h: Removed the "ACE_TURN_NOMINMAX_OFF" stuff - in order to simplify the code. Thanks to Irfan for this. - - * ace/OS.i (sema_post): Added a new overloaded version of - ACE_OS::sema_post(), which takes a "release count." This is the - number of times to release the semaphore. Note that Win32 - supports this natively, whereas on POSIX we need to loop... - - * ace/Proactor.cpp (handle_events): Changed the Proactor logic so - that it will correctly propagate any errors that occur to the - handle_{input,output}_complete callback. - -Tue Dec 17 20:56:56 1996 David L. Levine - - * ace/OS.{h,i}: on VxWorks: implemented ACE_OS::gethostbyname (), - and fixed inet_ntoa () to return -1 on failure - - * ace/OS.cpp: in ::spa () for VxWorks, zero out unused argv[] - slots to overwrite args from previous invocations OS.cpp - -Tue Dec 17 04:27:07 1996 Douglas C. Schmidt - - * ace/ReactorEx: Added a new feature to the ReactorEx. If we - enable the wait_all flag when calling - ACE_ReactorEx::handle_events() *and* we give an - ACE_Event_Handler (this is a new final param to the call) then - the handle_signal() call will be invoked on this - "wait_all_callback" object when all the handles become signaled. - Moreover, we pass in the array of signaled handled to through - the siginfo_t parameter (see the following ChangeLog entry for - details). If there is no wait_all_callback param, then all the - handle_signal() methods are invoked on all the handles. - - * ace/OS.h (siginfo_t): Augmented the siginfo_t interface so that - we can pass an array of signaled Win32 HANDLEs, in addition to - just a single HANDLE. This is used in the ReactorEx. - - * examples/Reactor/ReactorEx/test_reactorEx.cpp: Added a number of - enhancements to this test program based on discussions with - Irfan, Karlheinz, Dieter, and Detlef. - - * ace/Task_T.i (msg_queue): If we override the existing definition - of the Message_Queue in an ACE_Task then we need to delete the - existing Message_queue (if necessary and mark the Message_Queue - as no longer being a candidate for deletion (since we have - supplied our own definition). Irfan had added this earlier, but - it seemed to get lost... - - * examples/Reactor/Proactor/test_proactor.cpp: The class called - STDIN_HANDLEr is misnamed since we don't read from stdin, we - read from a file. Therefore, I've changed this to be - Input_File_Handler. - - * examples/Reactor/ReactorEx/test_{proactor,reactorEx}.cpp: - Changed misspellings of transfered to transferred. - - * ace/Memory_Pool.cpp (ACE_MMAP_Memory_Pool): Since NT doesn't support - SIGSEGV thre's no point in even trying to register for this - signal! - - * ace/OS.i: Reverted some lost UNICODE fixes -- thanks to Irfan - for finding these. - - * ace/Local_Name_Space_T.cpp (create_manager_i): Removed a - debug statement since it may be causing problems with printing - UNICODE. - -Mon Dec 16 11:25:55 1996 Douglas C. Schmidt - - * ace/OS.i (cuserid): Fixed the definition to ACE_OS::cuserid() so - that it uses LPTSTR. Thanks to Irfan for this fix. - - * ace/Task.cpp (activate): In ACE_Task::activate() there is a possibility to actually - "reactivate" the task using the flag. The following - illustrates that ability: - - if (this->thr_count_ > 0 && force_active == 0) - return 1; // Already active. - else - this->thr_count_ = n_threads; - - The thing is that, when the task is running and we reactivate it - (actually we add threads) the command should be: - - this->thr_count_ += n_threads; - - rather than - - this->thr_count_ = n_threads; - - That way thr_count_> holds the new number of threads currently - associated with the task. Thanks to Hamual for this fix. - - * ace/OS.i (inet_aton): Placed the return 1 within the curly - braces to make the HP/UX compiler happy. Thanks to Kenny Want - for reporting this. - -Mon Dec 16 12:56:43 1996 David L. Levine - - * ace/OS.i: removed spurious "*/" after an #endif. Thanks to - Harry Gunnarsson for reporting this. - - * ace/Svc_Conf_l.cpp: #ifdef'ed out ace_yyunput () and - ace_yy_{push,pop,top}_state () because they're not used, - and commented out a few "break"s after "return"s in switch - statements to prevent compiler warnings. - - * ace/Typed_SV_Message.i: reordered initializations in ctor to - match declaration order. - - * examples/Threads/Makefile, performance-tests/Misc/Makefile, - tests/Makefile: - Removed "LIBS += -lm" from these Makefiles because it doesn't - appear to be necessary, and not all platforms have a libm. - - * include/makeinclude/platform_sunos4_g++.GNU, platform_sunos5_g++.GNU, - platform_sunos5_x86_g++.GNU, platform_unixware_g++.GNU: - added -lm to LIBS because it was removed from the Makefiles, and - it's needed with g++. - - * netsvcs/lib/Makefile: removed /pkg/gnu/lib dependencies. Thanks - to Per Andersson for pointing - this out. - - * netsvcs/servers/svc.conf: changed _make_ACE_Logger() to - _make_ACE_Logging_Strategy() svc.conf. Thanks to Per Andersson - for reporting this. - -Sun Dec 15 13:01:17 1996 David L. Levine - - * ace/Naming_Context.cpp: reordered initializations in default ctor - to match declaration order. - - * ace/Svc_Conf_y.cpp: added parens to a couple of combined - assignments/conditionals to avoid compiler warnings. - - * include/makeinclude/platform_sunos5_sunc++*.GNU: reverted - SOLINK step back to creating real .so files, because it - seems to be necessary, sometimes, for template instantiation. - - * netsvcs/lib/Server_Logging_Handler.cpp: removed ACE_INLINE's. - - * tests/MM_Shared_Memory_Test.cpp: declare shm_key as char[] - instead of char *, so that the string gets put into the data - segment rather than the text segment. The string gets modified, - which causes a core dump with the g++/SunOS5.5 build if the string - is in the text segment. - -Sun Dec 15 10:29:20 1996 Douglas C. Schmidt - - * netsvcs/servers/svc.conf: Removed the "lib" prefix for the - netsvcs DLL. This is now added automatically by the - ACE::ldfind() operation. - - * ace/SString.cpp (ACE_CString): Removed the #pragmas for Win32. - They aren't necessary since we should replace the ACE_USHORT16 - cast with a char cast. Thanks to Amos Shapira - for reporting this. - -Sat Dec 14 14:25:38 1996 Douglas C. Schmidt - - * build/SunOS5.5/tests/UPIPE_SAP_Test.cpp (main): Fixed several - minor bugs with UPIPE_SAP_Test.cpp. - - * ace/OS.i (thr_join): Added implementations for Solaris threads - and most versions of POSIX pthreads where ACE_hthread_t and - ACE_thread_t are the same type! - - * ace/OS: Began adding hooks so that we can eventually move away - from the current split between ACE_thread_t and ACE_hthread_t - and unify them via ACE_Thread_ID. - - * ace/{OS,Thread}.h: Changed the interface of thr_getprio() so - that it takes an int & rather than an int *. - - * ace/OS.i (thr_getprio): Fixed a minor bug for Win32 where we - weren't depositing the thread priority into the return value! - - * Makefile: Changed the order in which things are built so that - netsvcs are built right after libACE, followed by the tests. - -Sat Dec 14 11:54:22 1996 Douglas C. Schmidt - - * apps/Gateway/Gateway/Consumer_Map: Change the Consumer_Map class - so that it was no longer templatized. There isn't any point in - doing this since we aren't going to be changing these types for - this application. - - * apps/Gateway/Gateway: Factored out the code for selecting the - concurrency strategy into a separate *.h file called - Concurrency_Strategy.h. - - * apps/Gateway/Gateway: Began revising the Gateway application to - use the new ACE Event Channel. - - * ace/Svc_Handler: Now that we've got put() and svc() with no-op - defaults in class ACE_Task_Base, we don't need them in - ACE_Svc_Handler anymore, so I removed them! - - * ace/Task: Finally got sick of having to provide no-op - open()/put()/close() routines in all ACE_Task subclasses, so I - changed these methods from pure virtual to virtual with default - no-op behavior. Updated all the tests, as well. - -Sat Dec 14 11:39:15 1996 David L. Levine - - * ace/{Module,Stream,Svc_Handler,Synch_T,Task_T}.cpp and Synch_T.i: - removed ACE_INLINE qualifier from functions in .cpp files; in - the case of Synch_T, moved ACE_INLINE functions from .cpp to .i file - - * apps/Gateway/Gateway/Routing_Table.cpp, - examples/ASX/Event_Server/Event_Server/Peer_Router.cpp, - examples/ASX/UPIPE_Event_Server/Peer_Router.cpp: - removed ACE_INLINEs from .cpp files - - * ace/CORBA_Handler.h and ace/Token_Collection.{h,cpp}: - changed __INLINE__ to __ACE_INLINE__ - - * ace/Svc_Conf_y.cpp: commented out unused arguments to - suppress compiler complaints - -Fri Dec 13 22:07:11 1996 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++*.GNU: replaced - SOLINK step in build of shared objects for SunOS5 with SunC++ - with symlink from .so to .o file. - - * ace/config-vxworks*.h: added ACE_NEEDS_SYSTIME_H to VxWorks - configs because it's needed with inlining - - * include/makeinclude/platform_vxworks*.GNU: cleaned up VxWorks - config files - -Fri Dec 13 00:53:34 1996 Douglas C. Schmidt - - * ace: Replaced all uses of - - #if defined (.....) // .... - - with - - #if defined (.....) /* ... */ - - so that broken C++ compilers won't complain. Thanks to - John Cosby for reporting this. - - * ace/Thread.i: Updated the signature of getprio() and setprio() - so that they take ACE_hthread_t. Thanks to Wayne Vucenic - for finding this. - - * Reran all the tests on NT and Solaris. Everything seems to - work. Therefore, incremented the version number to 4.1 and put - it out for ftp and http. - -Thu Dec 12 18:51:04 1996 Douglas C. Schmidt - - * tests/Priority_Task_Test.cpp (svc): Added a new test to exercise - the new "priority" feature of ACE_OS::thr_create() - (which is also available to ACE_Task). - - * ace/Thread: Added getprio() and setprio() methods to ACE_Thread. - -Fri Dec 13 13:44:12 1996 David L. Levine - - * ace/config-vxworks*.h: added ACE_NEEDS_SYSTIME_H to VxWorks - configs because it's needed with inlining - - * include/makeinclude/platform_vxworks*.GNU: cleaned up VxWorks - config files - -Thu Dec 12 18:51:04 1996 Douglas C. Schmidt - - * ace: Added a new macro called ACE_UNUSED_ARG() to keep - the compiler from outputting warnings about unused - arguments. So far, this is mostly done for Win32, but it - should be easy to do it for other compilers. Thanks - to Matthias for these changes. - - * ace/OS.cpp: Added support so that thread priorities will - automatically be set when we spawn threads using - ACE_OS::thr_create(). - - * ace/OS.cpp: Simplified the logic for handling NULL thr_handles - and thr_ids. Now, we set all this stuff in one place at the - beginning of the function, rather than recomputing it all over - the place. - - * ace/config-aix-{3.2.5,4.1.x}.h: Added the - ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS flag. - - * ace/Thread_Manager.cpp (ACE_Thread_Control): Conditionally - compiled the logic for calling this->exit() in the destructor - for ACE_Thread_Control so that we only make this call if - ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS is *not* set. This will - prevent infinite recursion on platforms like AIX. Thanks to - Chris Lahey for reporting this. - - * apps/Gateway/Gateway/Channel.cpp (recv_peer): Added the logic - that makes sure we don't get screwed up by partial headers. - Thanks to Chris Cleeland for this. - -Thu Dec 12 20:55:02 1996 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++*.GNU: removed - SOLINK step in build of shared objects for SunOS5 with SunC++: - it's not necessary. - -Thu Dec 12 03:48:26 1996 Irfan Pyarali - - * ace/Naming_Context: Modified ACE_Naming such that on Win32, you - can use ACE_Registry_Name_Space. - - * ace/Registry_Name_Space: ACE_Registry_Name_Space is a Name_Space - which uses ACE_Registry as the persistence mechanism. Win32 - clients of ACE_Naming can now start using (the more robust and - reliable) Registry persistence without any major code changes. - - * tests/Naming_Test.cpp: Added the use of Registry_Name_Space to - the test if we are on Win32 and UNICODE is turned on. - - * examples/Registry: Fixed UNICODE behavior of the tests - -Wed Dec 11 20:33:28 1996 Douglas C. Schmidt - - * ace/Synch_T.h: Added a warning that indicates why it isn't - possible to use ACE_Process_Condition on - Win32... - - * tests/TSS_Test.cpp: Moved the Errno class to a file - TSS_Test_Errno.h and replaced the Errno class with the #include - "TSS_Test_Errno.h" to work around "features" with AIX C++'s - template instantiation scheme. - - * ace/OS.i (inet_aton): Replaced the use of ((ACE_UINT32) -1) with - ((ACE_UINT32) ~0). I expect this is more portable... - - * tests/run_tests.bat: Added "Service_Config_Test" to the - run_tests.bat file. - -Tue Dec 10 22:59:26 1996 Irfan Pyarali - - * tests: Added Service_Config_Test to Win32 makefiles. - - * ace/OS.i (inet_aton): We need to cast htonl to (long) - - * tests: Added/Fixed UNICODE behavior of the following: - - MM_Shared_Memory_Test.cpp - Mem_Map_Test.cpp - Mutex_Test.cpp - Naming_Test.cpp - Process_Mutex_Test.cpp - SPIPE_Test.cpp - Time_Service_Test.cpp - Tokens_Test.cpp - UPIPE_SAP_Test.cpp - - * netsvcs/lib: Added/Fixed UNICODE behavior of the following: - ACE_TS_Clerk_Processor::poolname_ - -Tue Dec 10 00:33:08 1996 Douglas C. Schmidt - - * tests/Service_Config_Test.cpp (main): Added a new method called - run_test() to ensure that ACE_Service_Config daemon is destroyed - before we try to end the test. - - * ace/OS.i (inet_aton): We need to cast -1 to (ACE_UINT32). - - * tests/Process_Mutex_Test.cpp (main): Added a minor change to - make gcc happy by moving the definition of int i *outside* the - loop. Thanks to Thilo Kielmann - for reporting this. - - * ace/OS.h: gcc complains about memcmp, memcpy, strcmp, and strcpy - (from ACE_OS::) being used before defined inline. This is due - to the include of SString.h at the end of OS.h. So I reordered - things in accordance to the changes from Thilo Kielmann - . - - * build/SunOS5.5/examples/Shared_Malloc/test_multiple_mallocs.cpp: - Changed the definition of char *base_addr to void *base_addr. - - * ace/Memory_Pool.cpp (ACE_MMAP_Memory_Pool_Options): Changed the - definition of char *base_addr to void *base_addr. - - * Put out what is hopefully the final beta release of 4.0.33. - - * ace/Message_Queue: Added the enqueue() method again to maintain - backwards compatibility. Thanks to Karlheinz for pointing out - the need for this. - - * ace/Service_Config.h: The svc.conf factory functions were - begin defined as extern "C", but the function pointer defined in - the ACE_Static_Svc_Descriptor struct is not declared as extern - "C", therefore, there was a mismatch. Here's how to fix this: - - In Service_Config.h, before the struct ACE_Static_Svc_Descriptor - add: - - extern "C" { - typedef ACE_Service_Object *(*ACE_SERVICE_ALLOCATOR)(void); - } - - Then in the struct alloc_ field was changed as follows: - - from: ACE_Service_Object *(*alloc_)(void); - to: ACE_SERVICE_ALLOCATOR alloc_; - - Thanks to Chuck Gehr for this. - - * ace/Memory_Pool.cpp (commit_backing_store_name): Changed uses of - "counter" from int to size_t to remove warnings. - - * ace/ACE.cpp: Reimplemented the ACE::daemonize() method to - conform to the latest version in Richard Steven's new UNP book. - - * ace/INET_Addr.cpp (set): Replaced the use of ACE_OS::inet_addr() - with ACE_OS::inet_aton(). Thanks to W. Richard Stevens for this - idea ;-). - - * ace/OS: Added a new function called inet_aton(), which is based - on a new POSIX socket addressing function that is non-ambiguous - in its return value (unlike inet_addr). - - * tests: Added a new Service_Config_Test.cpp to make sure that the - timeout features mentioned below work. - - * ace/Service_Config.cpp: Changed the implementation of - run_{reactor,proactor,reactorEx}_event_loop so that it returns - if the corresponding handle_events() method times out. - Thanks to Phil Logan for reporting - this. - - * ace/LSOCK_Stream: Moved get_remote_addr() from the private part - of the class and implemented it using get_local_addr(). This - fixes problems that previously occurred when using the - ACE_Connector with ACE_LSOCK_Stream. Thanks to Stuart Powell - for this suggestion. - -Mon Dec 9 22:03:30 1996 Douglas C. Schmidt - - * examples/Threads: Updated the test.mak and test.mdp files to - reflect the new name changes. Thanks to Matthias for this. - - * ace/ACE.cpp (ldfind): Added new code that will work if the - "base" part of the filename to look for is the same on both UNIX - and NT. The library name will be made up of three parts - [ACE_DLL_PREFIX]base part[ACE_DLL_SUFFIX], where prefix is "lib" - on UNIX and nothing on NT and suffix is ".dll" on NT and ".so" - on UNIX. If either prefix or suffix are missing from the - filename you supply to ldfind they will be added - automagically. This all will work independent from the pathname, - which will be treated completely separately from the filename - and can contain either UNIX style or NT style separators. - - Examples: - Source NT UNIX - =============================================================== - netsvc netsvc.dll libnetsvc.so - (PATH will be evaluated) (LD_LIBRARY_PATH evaluated) - - libnetsvc.dll libnetsvc.dll libnetsvc.dll + warning - netsvc.so netsvc.so + warning libnetsvc.so - - ..\../libs/netsvc ..\..\libs\netsvc.dll ../../libs/libnetsvc.so - (absolute path used) (absolute path used) - - The first and the last of these 4 examples is the way the new - functionality is supposed to be used. You simple supply the - pathname and the base part of the filename and ldfind will - figure everything out. - - Thanks to Tilo Chris for this code. - - * ace/OS.h: Added a new macro called ACE_DLL_PREFIX, which is - defined to "" on Win32 and "lib" on UNIX. Thanks to Tilo for - this. - - * ace/Reactor.cpp (detach): After further thought, I - have commented out the - - eh->reactor (0); - - call since I don't think we really need it. - - * ace/Reactor.cpp (detach): There was a problem with - ACE_Reactor::detach(). - - The following lines: - - // Reinitialize the Reactor pointer to 0. - eh->reactor (0); - - should be moved before: - - eh->handle_close (handle, mask); - - This will render the reactor handle not available in the - handle_close method but at least handle_close can delete itself. - Thanks to Luca for reporting this. - - * examples/Reactor/Ntalker: Replaced the use of ACE_OS::getopt() - with the ACE_Get_Opt iterator. Thanks to Alexandre Karev - for suggesting this. - - * ace/OS.h: Moved the #endif /* ACE_HAS_DCETHREADS || - ACE_HAS_PTHREADS */ once again in order to make sure that the - right things happen when #if defined (ACE_HAS_THREADS) is - *false*. Thanks to Robert Lyng - for reporting this. - -Mon Dec 9 02:06:48 1996 Irfan Pyarali - - * ace/SString: Made accessors return const references. - - * ace/OS.h: Added macro ACE_WIDE_STRING which allows the - conversion of char* to wchar_t* when UNICODE is turned on. - - * ace: Added/Fixed UNICODE behavior of the following: - - /* Local_Name_Space */ - ACE_Local_Name_Space_T::context_file_ - - /* ACE */ - ACE::basename - - /* Token */ - ACE_Token::ACE_Token - - /* Synch */ - ACE_File_Lock::ACE_File_Lock - - /* SPIPE_Addr */ - ACE_SPIPE_Addr::addr_to_string - ACE_SPIPE_Addr::set - - /* FILE_Addr */ - ACE_FILE_Addr::addr_to_string - - /* DEV_Addr */ - ACE_DEV_Addr::addr_to_string - - /* Addr */ - ACE_Addr::addr_to_string - ACE_Addr::string_to_addr - Note: These two were removed from the base class since they are - not common to all Address classes. - - /* Malloc */ - ACE_Allocator_Adapter::ACE_Allocator_Adapter - ACE_Malloc::ACE_Malloc - - /* Process */ - ACE_Process::start - - /* Shared_Memory_MM */ - ACE_Shared_Memory_MM::ACE_Shared_Memory_MM - ACE_Shared_Memory_MM::open - - /* Proactor */ - ACE_Overlapped_File::ACE_Overlapped_File - ACE_Overlapped_File::open - - /* Log_msg */ - ACE_Log_Msg::open - - /* Naming_Context */ - ACE_Name_Options::namespace_dir - ACE_Name_Options::process_dir - ACE_Name_Options::database - - /* Registry */ - ACE_Predefined_Naming_Contexts::connect - ACE_Predefined_Naming_Contexts::is_local_host - - /* SString */ - ACE_CString::ACE_CString - - /* Mem_Map */ - ACE_Mem_Map::ACE_Mem_Map - ACE_Mem_Map::map - - /* Service_Config */ - ACE_Service_Config::logger_key_ - - /* System_Time */ - ACE_System_Time::ACE_System_Time - - /* Memory_Pool */ - ACE_Sbrk_Memory_Pool::ACE_Sbrk_Memory_Pool - ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool - ACE_Local_Memory_Pool::ACE_Local_Memory_Pool - ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool - ACE_Lite_MMAP_Memory_Pool::ACE_Lite_MMAP_Memory_Pool - - /* OS */ - ACE_OS::strstr - ACE_OS::strdup - ACE_OS::hostname - ACE_OS::open - ACE_OS::unlink - ACE_OS::dlopen - ACE_OS::dlsym - ACE_OS::cuserid - ACE_OS::fork_exec - ACE_OS::sprintf - ACE_OS::access - ACE_OS::fopen - ACE_OS::getenv - ACE_OS::system - ACE_OS::mkdir - ACE_OS::mktemp - -Sun Dec 8 19:00:45 1996 Tim H. Harrison - - * ace/Reactor.cpp (handle_events): Updated this method to use the - ACE_Countdown_Time::update method after the mutex has been - acquired. - - * ace/Time_Value.cpp (update): Added an ACE_Countdown_Time::update - method that calls stop and start. This is useful for methods - such as ACE_Reactor::handle_events that need to update timeout - values after acquiring locks, but before waiting on the - demultiplexing mechanism (e.g. select). - - * ace/ReactorEx.cpp (handle_events): Modularized the - implementation of handle_events. Now it uses helper functions - to significantly simplify the implementation. Also updated the - header file documentation. - - * ace/Timer_Queue: Added a timer_skew_ data member and accessor - methods to ACE_Timer_Queue. Also added an expire method that - calls gettimeofday and adds the timer_skew_ for you. These - changes will help simplify Reactor, Proactor, and ReactorEx - code. - - * ace/Reactor : Removed timer_skew_. This code now just calles - timer_queue->expire () with no parameters. Very clean. - - * ace/ReactorEx : Removed timer_skew_ code. - - * ace/Proactor : Removed timer_skew_ code. - - * examples/Proactor/test_proactor.cpp: Fixed this application so - that it exits when all the data has been sent and received. - Previously, it used a cool timeout mechanism to "guess" when all - the data had been received. Ahh, but we can't have too much - fun, or people start to get nervous. - - * ace/Service_Config.cpp (run_reactorEx_event_loop (Time_Value)): - Fixed the implementation of this method. It now handles - reactorEx events until end_reactorEx_event_loop is called, or - the specified time value expires. Also fixed the - run_proactor_event_loop (Time_Value) method. - - * examples/ReactorEx/test_timeout.cpp: Added a new example - application that shows how to use - Service_Config::run_reactorEx_event_loop with timeouts. Check - the examples/ReactorEx/README file for more details. - - * examples/Proactor/test_timeout.cpp: Added a new example - application that shows how to use - Service_Config::run_proactor_event_loop with timeouts. Yes, this - screams for common dispatcher interfaces for Reactor, Proactor, - and ReactorEx. - -Sun Dec 8 10:27:19 1996 Douglas C. Schmidt - - * ace/Service_Manager.cpp (init): Changed all uses of "int port" - to "u_short port" to be consistent with socket types. - - * ace/ACE.cpp (bind_port): Changed all uses of "int port" to - "u_short port" to be consistent with socket types. - - * ace/Remote_Name_Space.cpp: Changed all uses of "int port" to - "u_short port" to be consistent with socket types. - - * ace/SV_Semaphore_{Simple,Complex}: Changed all uses of "int n" - to "u_short n" to be consistent with the SYSV types! - - * ace/OS.h: Moved the location of the ACE_HAS_USING_KEYWORD macros - until *after* we #include "ace/Time_Value.h". Thanks to - Matthias for this. - - * ace/Signal.cpp: Finished implementing the - ace_signal_handlers_dispatching logic, which wasn't done - entirely earlier. Thanks to Alexandre Karev - for reporting this. - - * netsvcs/servers/main.cpp (main): Fixed several small bugs in the - netsvcs main test program. Thanks to Alexandre Karev - for finding this. - - * ace/Reactor: Removed the timer_skew_ data member from the - ACE_Reactor since this is now covered by the - ACE_Timer_Queue. - - * ace/Reactor.cpp (handle_events): Added the new version of the - ACE_Countdown_Time to simplify the code. - - * ace/Time_Value: Added a new class called ACE_Countdown_Time, - which is used by the Reactor, ReactorEx, and Proactor to keep - track of how much time elapsed. - - * ace/config-win32-msvc4.0.h: Added a change that forces the MSVC - compiler to reference the proper Winsock - lib during linking of - ACE. This change is necessary because a) in the release version - the link to the winsock.lib was completly missing and b) only - wsock32.lib has been included (which is wrong when WinSock2 is - used). Thanks to Matthias for this. - - * ace/Module.cpp (ACE_Module): Added code to zero-out the - q_pair_[2] pointers. Thanks to Matthias for this. - - * tests: Removed the argv name from most main() functions so that - we don't get warnings... - - * examples/Threads: Fixed some errors in the threads examples - directory, most of which are ambigious overloads. Also included - a (MSVC 4.1) makefile for all tests in this directory. Thanks - to Matthias for this. - - * examples/Threads: Renamed all the files by removing the word - "test_" at the beginning. This is redundant! - - * tests/TSS_Test.cpp: If we are running AIX (i.e., if - ACE_TEMPLATES_REQUIRE_PRAGMA), then conditionally avoid - compiling this test program because it doesn't work unless we - split off class Errno due to AIX's rules for generating - templates. This is too much work to get right... - - * ace/OS.i (thr_self): Updated the conditional compilation tests - so that we check for ACE_HAS_THREAD_SELF first. Thanks to Chris - Lahey for this. - - * ace/{config-osf1-3.2.h,config-aix-4.1.x.h}: Updated this file so - that is has the new ACE_HAS_THREAD_SELF macro, which indicates - that the platform uses thread_self() rather than pthread_self(). - - * ace/config-aix-4.1.x.h: According to Chris Lahey - , AIX 4.1.x should have ACE_HAS_PTHREADS - rather than ACE_HAS_DCETHREADS. - - * ace/Thread_Manager: Removed the thread_descriptor_i() methods - and replaced them by generalizing the find() method to become - find_thread() and find_hthread(). Thanks to Hamutal Yanay - for suggesting this. - -Sun Dec 8 14:39:53 1996 Tim H. Harrison - - * ace/Timer_Queue: Added a timer_skew_ data member and accessor - methods to ACE_Timer_Queue. Also added an expire method - that calls gettimeofday and adds the timer_skew_ for you. These - changes will help simplify Reactor, Proactor, and ReactorEx - code. - -Sat Dec 7 01:14:04 1996 Irfan Pyarali - - * tests/Process_Mutex_Test.cpp: Added new test which checks the - functionality of a ACE_Process_Mutex. Abandoned mutexes can be - created by selecting the correct command-line arguments. - - * examples/Reactor/ReactorEx/test_reactorEx.cpp: Reverted back to - old scheme which does not utilize traits. - - * ace/Task_T.h: Removed the synchronization trait in Task. This is - because template typedefs are only supported by a few - platforms. Sigh ;-) - -Sat Dec 7 16:55:37 1996 Douglas C. Schmidt - - * ace/Thread_Manager.cpp: Because thread_descriptor_i() only returns - 0 or -1 on failure the code for - ACE_Thread_Manager::thr_self(ACE_hthread_t &) should read: - - if (-1 == this->thread_descriptor_i (id, td)) - return -1; - handle = &td.thr_handle_; - - Thanks to Matthias for reporting this. - - * ace/OS: Added a new static instance of ACE_thread_key_t to work - around the pthreads implementation on MVS (which doesn't store - TSS keys as ints!). Thanks to Chuck Gehr for reporting this. - - * ace/config-mvs.h: Added #define ACE_TEMPLATES_REQUIRE_SOURCE for - MVS C++. Thanks to Chuck Gehr for reporting this. - - * ace/Signal.cpp: ace_dispatcher was being set to - ace_signal_handlers_dispatch() which calls - ACE_Sig_Handlers::dispatch (when ACE_HAS_SIC_C_FUNC is defined), - whereas it was set to ACE_SigHanlder::dispatch (no s) if not - defined. I intended to set this to ace_signal_handler_dispatch - (no s). Thanks to Chuck Gehr for reporting this. - - * ace/Makefile: Fixed a small typo where I wasn't matching char - *getenv in the sed regular expression. - - * ace/{OS,Synch}: Moved various classes around so that things will - compile correctly when ACE_WIN32 is defined but ACE_HAS_THREADS - is *not* defined. Thanks to Robert Lyng - for reporting this. - -Sat Dec 7 16:55:37 1996 Matthias Kerkhoff - - * ace/Module: Added some values to the enum so Module clients - can decide whether the reader, the writer or both should be - automatically deleted. - - * ace/{Stream,Module,Task}: Changed some function arguments - from u_long to int (because enums are represented as ints). - - * ace/Task: Added a new virtual function to ACE_Task_Base - (module_closed), which by default calls - ACE_Task_Base::close(1). Please note the changed flags - argument. This allows clients to differ between calls - originated from a Module and/or Stream from those which - result from ~ACE_Task_Exit(). ~ACE_Task_Exit() calls - ACE_Task_Base::close(0). This may be or not be a problem to - existing applications. It may (hopefully not) - be neccessary to change ACE_Task_Base::module_close back to - calling ACE_Task_Base::close(0). - -Fri Dec 06 14:44:20 1996 David L. Levine - - * ace/OS.cpp: added ::spa () function to allow command line args - to be passed to programs in VxWorks - - * ace/OS.i: (ACE_OS::gettimeofday): VxWorks returns nsec instead - of usec, so convert - -Fri Dec 6 01:21:48 1996 Irfan Pyarali - - * examples/Reactor/ReactorEx/test_reactorEx.cpp: Rewrote the - example such that the test now uses the new Notification - Strategy scheme in ACE. This allows a message queue consumer to - wait in ReactorEx without spawning a new thread, or creating - extra Win32 events. This make the example smaller and much - cleaner. - - * ace/Task_T.h: Added synchronization trait to Task. - - * ace/Task_T.i (msg_queue): Added a check to delete the old - message_queue if we had created it. - - * ace/ReactorEx.cpp (remove_handler): Removed the call to set - reactorEx of the event handler to zero becauses the event - handler may no longer be there after the handle_close() - completes. - -Thu Dec 05 21:18:49 1996 David L. Levine - - * ace/OS.cpp (thr_create): Oops, needed to add another check if - thr_id == 0 before assigning *thr_handle = *thr_id, for systems - such as Solaris 2.4 that don't have PTHREADS. - -Wed Dec 4 09:09:56 1996 David L. Levine - - * ace/Log_Msg.cpp (log): added printout to stderr before call - to exit(). Silent calls to exit() are bad :-} - - * performance-tests/Synch-Benchmarks/Options.cpp (print_results): - only use rusage if ACE_HAS_PRUSAGE_T is #defined - - * examples/IPC_SAP/SOCK_SAP/CPP-in{client,server}.cpp: - use blocking connect on VxWorks - - * ace/config-vxworks*.h: added ACE_LACKS_MPROTECT and - ACE_HAS_STRERROR - - * include/makeinclude/platform_vxworks*: removed INCLDIRS and - added indlib.o to GreenHills LIBS - - * Makefile (cleanrelease and release): changed "rm -r" of - ACE.tar.gz to "rm -f", that's probably what was meant - -Wed Dec 4 00:27:07 1996 Irfan Pyarali - - * ace/config-win32-msvc*.0.h: Added NOMINMAX. - - * ace/Registry: Removed NOMINMAX and - VC_PLUS_PLUS_NESTED_CLASS_PROBLEM flags from the header file. - The VC_PLUS_PLUS_NESTED_CLASS_PROBLEM flag is no longer needed - and NOMINMAX is defined at the project level. Thanks to - Matthias Kerkhoff for suggesting this. - -Mon Dec 2 14:13:44 1996 Douglas C. Schmidt - - * ace: Changed all occurrences of ACE_Event_Handler - reactorex() to reactorEx() to be consistent. Thanks to - Matthias for suggesting this. - - * ace/Message_Queue.cpp (close): We didn't allocate the memory for - the notification_strategy_, so we darn well can't delete it! - Thanks to Matthias for finding this. - - * ace/Log_Msg.cpp (ACE_TSS_cleanup): Made the ACE_TSS_cleanup - function extern "C" for MVS C++ and compilers like it... Thanks - to Chuck Gehr for reporting this. - - * tests/Naming_Test.cpp (main): Added delete ns_context to close - things down and free up the semaphores. Thanks to David Levine - for suggesting this. - - * examples/Reactor/Misc/test_demuxing.cpp (handle_input): Fixed a - "typo" where we were accessing mb->msg_priority() *after* - deleting it! Thanks to Matthias for finding this. - -Mon Dec 2 09:57:15 1996 David L. Levine - - * tests/run_tests.*: updated lists of tests to be run - - * tests/*.cpp: removed trailing .cpp from argument to - ACE_START_TEST because it would appear in the log file name - -Mon Dec 2 00:08:51 1996 Douglas C. Schmidt - - * ace/Log_Record.cpp (dump): There was an error on line 19 of - Log_Record.cpp: - - ACE_DEBUG ((LM_DEBUG, "\npid_ = %s\n", this->pid_)); - - should be changed to: - - ACE_DEBUG ((LM_DEBUG, "\npid_ = %d\n", this->pid_)); - - Thanks to Sandro Doro for reporting - this. - - * examples/Reactor/Misc/test_handle_set.cpp: Updated the test to - remove a warning caused by sloppy nesting of loop counters. - -Mon Dec 2 00:23:23 1996 Irfan Pyarali - - * ace/Strategies.{h,cpp}: Update the base-class and added - documentation. - - * tests/test_config.h: Added ACE_INIT_LOG, ACE_APPEND_LOG and - ACE_APPEND_LOG to facilitate the appending of log messages to a - file. Also changed Pipe_Test to use this new mechanism. - - * test/Naming_Test: Changed test to use "lite" implementation to - speed things up. - - * netsvcs/lib: Fixed multiple type mismatch warnings. - - * ace/ReactorEx: Fixed syntax errors in recently modified - ReactorEx.* files - - * ace/ace.{mdp.mak}: Added Strategies.cpp to VC++ makefile. - -Sun Dec 1 19:19:02 1996 Douglas C. Schmidt - - * ace/Service_Config: Moved the #inclusion of ace/Proactor.h and - ace/ReactorEx.h from the *.h file to the *.cpp file to avoid - problems with circular dependencies. - - * ace/Reactor: Added a new parameter to the Reactor's - initialization methods so that we can install a subclass of - ACE_Timer_Queue. This is in anticipation of Tim's new - "real-time" implementation of a timer queue. - - * ace/Reactor: Changed the internal Reactor name - ACE_Notification_Handler to ACE_Reactor_Notify to be consistent - with the ACE_ReactorEx_Notify class. - - * examples/Reactor/Misc/test_demuxing.cpp: Revised this test so - that it now illustrates the new notification mechanism of the - ACE_Message_Queue class. - - * examples/Reactor/Misc: Changed the name of the signal_tester.cpp - file to test_demuxing.cpp, which is really what this does. - - * ace/{Strategies,Message_Queue}: Created a suite of - "Notification Strategies" that are used with the new - ACE_Message_Queue notification scheme. This works as - follows: - - 1. There's a new virtual hook method on ACE_Message_Queue - called notify(). Whenever a new Message_Block is - enqueued the notify() hook is called. By default, this - does nothing. - - 2. If you want to do something with the notify() hook, you - have two choices: - - a. You can subclass from ACE_Message_Queue and - override this method. This is an example of the - "Template Method" pattern. - - b. You can configure an ACE_Notification_Strategy * - into an ACE_Message_Queue. An - ACE_Notification_Strategy is the vehicle for - extending the behavior of ACE_Message_Queue wrt - notification *without subclassing*. Thus, it's an - example of the Bridge/Strategy patterns. - - 3. ACE_Notification_Strategy is defined in - ace/Strategies.{h,cpp}. There are two pre-defined - subclasses: - - a. ACE_Reactor_Notification_Strategy -- integrates the - ACE_Message_Queue notification into the - ACE_Reactor::notify() method. - - b. ACE_ReactorEx_Notification_Strategy -- integrates - the ACE_Message_Queue notification into the - ACE_ReactorEx::notify() method. - - Both of these can be used almost identically in order to - seamlessly integrate multiple threads of control, inserting - ACE_Message_Blocks in one or more ACE_Message_Queues, with - the various ACE event demultiplexors (i.e., ACE_Reactor - and ACE_ReactorEx). - - * ace: Created a new pair of files called Strategies_T.cpp and - Strategies_T.h and move the template ACE_*Strategies classes - into those files. This was necessary since there are now new - non-template notification strategies in Strategies.{h,cpp}. - - * ace/Message_Queue: Created a new "notification hook" mechanism - that makes it possible for event demuxers (like ACE_Reactor and - ACE_ReactorEx) to be informed automatically when a Message_Block - is inserted into the Message_Queue. This is useful for - sitations where you'd like to integrate multiple threads (each - of which is pumping data into an ACE_Message_Queue) with an - ACE_Reactor or an ACE_ReactorEx. Thanks to Matthias Kerkhoff - and Luca for suggesting this. - - * ace/Synch.h: Modified the implementation of - ACE_Null_Condition_Mutex::wait() so that it always returns -1 - and sets errno to ETIME. This reflects the fact that if you'll - never be awakened if you "sleep" on a Null_Condition... - - * ace/ReactorEx: Generalized the ACE_ReactorEx so that its - notify() method now behaves like the ACE_Reactor, i.e., it can - queue up ACE_Event_Handlers that are dispatched in the ReactorEx - thread of control. - - * tests: Renamed the Shared_Memory_MM_Test.cpp to - MM_Shared_Memory_Test.cpp and remove the - Shared_Memory_SV_Test.cpp since it was redundant to the - SV_Shared_Memory_Test.cpp. - - * tests/SV_Shared_Memory_Test.cpp (main): Revised the SVSV IPC - shared memory test to be more robust. - - * ace/SV_Semaphore_Simple.cpp (open): If the char *name == 0 then - use ACE_DEFAULT_SEM_KEY instead. - - * ace/Memory_Pool: Generalized the ACE_Shared_Memory_Pool so that - there can be more than 1 shared memory pool active at a time - (similar to what we did for ACE_MMAP_Memory_Pool). - - * ace/Memory_Pool.h: There was an unnecessary - ACE_SV_Semaphore_Complex in ACE_Shared_Memory_Pool that was left - over from earlier days. I've removed this. - - * ace/Memory_Pool.cpp (ACE_Shared_Memory_Pool): Revised - the constructor so that if we get a NULL pool_name we'll - initialize the - - * examples/Makefile: Added the System_V_IPC and Shared_Memory - directories. - - * ace/Message_Queue.h: Added a virtual destructor to - ACE_Message_Queue so that it can be destroyed appropriately, - even if subclassed. - - * ace/Message_Queue.h: Renamed enqueue() to enqueue_prio() to be - consistent with the other names (e.g., enqueue_head() and - enqueue_tail(). Updated the test programs to reflect this. - -Sun Dec 1 12:06:46 1996 David L. Levine - - * ace/config-vxworks*.h: Removed #define ACE_HAS_STRBUF_T: - copy and paste error - -Sun Dec 1 00:15:45 1996 Irfan Pyarali - - * ace/OS.h: ACE_NEW_RETURN and ACE_NEW were reverted back to the - old implementation. This is temporary till the infinite loop - problem with ACE_ERROR, ACE_DEBUG and ACE_TRACE being called - from ACE_Log_Msg::instance() is fixed. - - * ace/Synch.h: Repositioned ACE_Semaphore such that there are no - problems in compiling ACE_Process_Semaphore under Win32. - - * ace/config-win32-msvc4.0.h: Changed ACE_HAS_STL to - ACE_HAS_STANDARD_CPP_LIBRARY which is more descriptive (and what - is expected by stdcpp.h). - - * ace/Registry.h: Added the setting of NOMINMAX and - VC_PLUS_PLUS_NESTED_CLASS_PROBLEM flags so that STL behaves - properly. - - * ace/Log_Msg.cpp (open): Fixed a small bug such that msg_ostream - is only set this to cerr if it hasn't already been set. - - * STL: Updated the STL directory will latest code from - http://www.rahul.net/terris/ and also added the original - readme2.stl file. Created ACE_Changes which has the list of - changes made to the STL distribution. - -Sat Nov 30 12:02:00 1996 Douglas C. Schmidt - - * ace/OS.h: Added a new pragma that disables warning #4097 in - MSVC++ (typedef-name used as synonym for class-name). This - keeps Win32 clients from getting warning on Win32. Thanks to - Matthias Kerkhoff for this. - - * ace/Log_Msg.cpp: Created a new macro called ACE_NEW_RETURN_I, - which is used withing ACE_Log_Msg::instance(). We can't afford - to call ACE_LOG_MSG->instance() from within - ACE_Log_Msg::instance() or else we will recurse infinitely! - Thanks to Irfan for finding this. - - * ace/OS.i (mprotect): Added a #if !defined (ACE_LACKS_MPROTECT) - conditional compilation directive to support the EPLX real time - OS from CDC (based on LYNX). Thanks to Alexandre Karev - for reporting this. - -Sat Nov 20 12:23:45 1996 Prashant Jain - - * tests/Naming_Test.cpp (main): Added code that creates a unique - backing store name and removes the backing store every time - the test is run. - -Fri Nov 29 12:54:12 1996 Douglas C. Schmidt - - * ace/Stream.cpp (open): Changed tail->close() and head->close() - to delete tail and delete head now that we've got our new - changes. - - * ace/Module: Moved the destructor from the private part of the - class to the public part and changed things so that close() no - longer "deletes this." This is too confusing and error-prone. - In addition, changed the Module destructor so that it will try - to call close() only if close hasn't already been called. - - * ace/Synch.h: Moved ACE_Process_Semaphore out of the - ACE_HAS_THREADS section since this is available on platforms - that don't have threads. - - * Now that Log_Msg.h is being #included in OS.h, I removed all - other #includes of Log_Msg.h throughout the rest of ACE. - - * ace/OS.h: Rearranged the definition of the ACE_NEW and - ACE_NEW_RETURN macros so that they come at the end of OS.h. - This enables us to #include "ace/Log_Msg.h" here, as well, so - that we can make use of the ACE_LOG_MSG macro in the definition - of ACE_NEW and ACE_NEW_RETURN. - - * ace/Singleton.cpp (instance): Updated the ACE_Singleton - implementation to use the new ACE_NEW and ACE_NEW_RETURN macros. - - * ace/OS.h: Revised the ACE_NEW and ACE_NEW_RETURN macros so that - they check to see if the constructor of the newly allocated - object failed (i.e., by checking the ACE_LOG_MSG->op_status() - value). - - * tests/Reactors_Test.cpp: Added an ACE_ASSERT() after each - Reactor we create in order to make sure it worked. - - * tests/Reactors_Test.cpp: Added an ACE_Service_Config daemon - instance within main() in order to ensure that the Reactor is - cleaned up appropriately. This avoids problems with NT 4.0, - where there seems to be a bug if you don't shut down sockets - explicitly when the process exits. - - * tests/Pipe_Test.cpp (main): Improved the pipe test so that it - automatically iterates multiple times in order to test whether - there are problems with rapidly opening and closing NT socket - handles... - -Thu Nov 28 03:07:48 1996 Irfan Pyarali - - * netsvcs: netsvcs.mak and netsvcs.mdp were changed such that - it becomes easier to find ace.lib while compiling netsvcs.lib. - - * tests/Pipe_Test.cpp: Add more instances of ACE_Pipes to the test - and also added an option to close down the pipe. - -Thu Nov 28 00:53:16 1996 Douglas C. Schmidt - - * ace/config-sunos4-g++.h: This config file contained two - exclusive definitions - - #define ACE_HAS_SVR4_SIGNAL_T - - and - - #define ACE_HAS_SUNOS4_SIGNAL_T - - The first one was moved out. Thanks to Alexandre Karev - for reporting this. - - * ace/OS.h: - - #elif defined (ACE_HAS_SUNOS4_SIGNAL_T) - - was changed from - - typedef void (*ACE_SignalHandler)(void); - typedef void (*ACE_SignalHandlerV)(void); - - to - - typedef void (*ACE_SignalHandler)(...); - typedef void (*ACE_SignalHandlerV)(...); - - to make gcc happy. The first one was moved out. Thanks to - Alexandre Karev for reporting this. - - * ace/Pipe.cpp (close): Arrgh! Fixed a total braino where we - weren't using ACE_OS::closesocket() to close down the Win32 - ACE_Pipe implementation, which uses sockets... Thanks to Irfan - and Tilo for helping me figure this one out! - - * tests/CPP_Test.cpp: Completely reworked this test so that it - should run correctly on Win32 and UNIX. - -Wed Nov 27 16:50:17 1996 Douglas C. Schmidt - - * Put out a new beta of ACE 4.0.33. - - * tests/Mutex_Test.cpp (test): Fixed the test() function so that - it doesn't use the ACE_Thread_Control unless we explicitly want - to use threads. - - * tests/test_config.h: Added addition information about the - process id and thread id of the main thread. - - * ace/Synch.h: Speed things up a bit by conditionally #including - "ace/SV_Semaphore_Complex.h" only if we are compiling on a - non-Win32 platform or a POSIX platform. Thanks to Matthias - Kerkhoff for this. - - * ace/SV_Semaphore_Complex.h: Incorporated the new ACE_USING - macro, which is useful if you have - - class b { - a() - }; - - class d : private b { - b::a() // still works, but depriciated - using b::a() // should be used instead - }; - - Thanks to Matthias Kerkhoff for this. - - * ace/OS.h: Added a new macro called ACE_USING, which is used to - distinguish between platforms that support namespace "using" - semantics and those that don't. Thanks to Matthias Kerkhoff - for this. - - * examples/Misc/test_XtReactor[12].cpp: Had to add the infamous - #define String XtString before including Xm/PushB.h. Also, there - were some references to XtReactor when the class is now - ACE_XtReactor. Thanks to Gonzalo Diethelm - for reporting this. - - * ace/XtReactor.cpp (ACE_XtReactor): timeout_ was not being - initialized on the constructor, and that caused a core dump. - Thanks to Gonzalo Diethelm for reporting - this. - - * ace/SOCK.h: Put the open() call in the protected part of the - class since we generally don't want clients to call this - directly. Thanks to Eric Newton for pointing - this out. - - * ace/ACE.cpp: Fixed a bug where sin.sin_family was being set - rather than sin.sin_len. Thanks to Chuck Gehr - for reporting this. - - * ace/ACE.cpp: Enhanced the ACE::{send_n,recv_n} methods so that - they check to see if errno == EWOULDBLOCK when ACE_OS::send() or - ACE_OS::recv() returns -1. If that's the case, then they keep - iterating. - - Thanks to Mehdi TABATABAI for - this suggestion. - - * ace/Log_Msg.h: Fixed ACE_RETURN so that it only has 1 parameter - if ACE_NLOGGING is enabled. Thanks to Antonio Tortorici - for reporting this. - - * ace/config-vxworks*.h: Added ACE_NTRACE macros so that - tracing doesn't magically turn on! - - * ace/Task.cpp (activate): the &ACE_Task_Base::svc_run() argument - needs a cast to ACE_THR_FUNC, because that's what - ACE_Thread_Manager::spawn_n() requires. On VxWorks, - ACE_THR_FUNC functions return an int, while svc_run() returns - void *. Thanks to David Levine for this. - - * ace/Thread_Manager.cpp (kill_thr): I was mistakenly passing in - the thr_handle_ where I should have been passing in the thr_id_. - In addition, made sure we don't set errno to the wrong value... - Thanks to Ross Dargahi for reporting this. - - * ace/{Synch_T,Synch}.h: If we don't actually own the lock - anymore, don't try to do a release. Thanks to Jonathan Biggar - for reporting this bug. - - * ace/ACE.cpp (handle_timed_complete): Added an ex_handles mask so - that non-blocking connects will work correctly on Win32. Thanks - to Antonio Tortorici for - reporting this fix. - - * ace/Message_Queue.h: Updated the documentation to stress the - fact that the timeouts are specified in *absolute* time, rather - than in relative time. Thanks to Bob Dunmire - for reporting this. - - * tests/test_config.h: Modified the ACE_END_TEST macro so that the - log file is closed. This works around a problem on VxWorks - where destructors of static objects don't get closed - automatically. Thanks to David Levine for this fix. - - * ace/OS.i (rand_r): Added a fix for Digital UNIX so that rand_r - works correctly in MT settings. Thanks to Thilo Kielmann - for this. - -Wed Nov 27 16:12:00 1996 Tim H. Harrison - - * ace/Stream.cpp: Fixed a bug in ACE_Stream::open to - allow applications to specify a tail or a head without - having to specify both. This was needed by the ACE_Pipeline - application since it only needs a Pipeline-specific tail - (not a head). - -Tue Nov 26 18:00:25 1996 Douglas C. Schmidt - - * ace: Functions should not be declared with ACE_INLINE in a - .cpp file. Fixed this problem in the following files: - - SPIPE_Acceptor.cpp:116:ACE_INLINE - TLI_Acceptor.cpp:145:ACE_INLINE int - TLI_Acceptor.cpp:192:ACE_INLINE - Task.cpp:121:ACE_INLINE int - Task.cpp:130:ACE_INLINE void - - * ace/{OS,Thread}: Added Chuck Gehr's suggested change for the - pthread_keycreate() routine, which must take extern "C" - functions on MVC C++. This fix isn't perfect, but it should - allow the ACE library to build... - - * man: Updated all of the manual pages and HTML files. - - * ace/Signal.cpp: Updated the code so that we don't try to - register a static C++ dispatch method if ACE_HAS_SIG_C_FUNC is - defined. This fixes problems with the MVS C++ compiler... - Thanks to Chuck Gehr for this suggestion. - - * ace/OS.h: Added extern "C" { } wrappers around the signal - handling mechanisms if ACE_HAS_SIG_C_FUNC is defined. This - fixes problems with the MVS C++ compiler... Thanks to Chuck - Gehr for this suggestion. - - * ace/Reactor.cpp (open): Moved the initialization of the - ACE_Timer_Queue field to *before* the handler_rep_.open() call. - We do this first in case the handler_rep_ call fails (which it - sometimes does on Win32 when we restart applications quickly due - to the use of sockets as a notification mechanism). At least - this way the timer_queue_ isn't 0, so we can still use the - Reactor as a timer... Thanks to Tilo Christ for motivating - me to fix this. - - * ace/OS.i: Apparently, DIGITAL_UNIX gethostbyname() returns - thread-specific storage, so we can use this for - gethostbyname_r(). - - * ace/OS.i: Need to add: - - #else - - after line 3268: return (size_t) ACE_OS::sysconf (_SC_THREAD_STACK_MIN); - - otherwise we get a compile error: - - line 3296.1: CBC1331(W) Return value of type "unsigned int" is expected - - This is because no code ends up getting generated. Thanks to Chuck - Gehr for this fix. - - * ace/OS.i (ACE_PTHREAD_CLEANUP_PUSH): Removed an extraneous set - of parens. Thanks to Chuck Gehr for this fix. - - * ace/OS.cpp (thr_create): Oops, needed to add a check if thr_id - == 0 before assigning *thr_handle = *thr_id! Thanks to Prashant - for finding this. - -Tue Nov 26 21:06:13 1996 Irfan Pyarali - - * ace/Pipe.cpp (open): This change relates to Win32 code only. - Removed the reuse_addr flag to acceptor.open() so that we don't - try to reuse the acceptor socket immediately. Apparently, this - causes no end of trouble on Win32 as the following connect() - call fails (randomly). Now it should be possible to create - multiple ACE_Pipes in one process and hence create multiple - Reactors also without any problems. - - * tests/Pipe_Test.cpp: Added a ACE_Pipe test to check for the - creation of multiple pipes in a process. Also changed the - relevant makefiles and scripts. - -Tue Nov 26 11:27:33 1996 David L. Levine - - * tests/{CPP_Test,Mutex_Test,Shared_Memory_MM_Test,SPIPE_Test}.cpp: - added VXWORKS support for these tests by spawning a new thread - instead of forking a new process (the same as on Win32) - - * netsvcs/clients/Naming/Client/Client_Test.cpp (open): Added a - return 0 for success. - - * ace/Singleton.h: Modified the use of the ACE_NEW_RETURN macro so - we not only check if new has failed, but also check that the - constructor has succeeded. If it hasn't, we bail out... Thanks - to Luca for this suggestion. - - * ace/Log_Msg: Added a 4th parameter to log_hexdump() in order to - print out a comment. Thanks to Luca for this. - - * ace/ACE.cpp (ldfind): Changed the implementation to look for - ACE_DLL_SUFFIX rather than '.' since '.' might exist in the - pathname already... - - * Removed all the NT-specific svc.conf files and updated the other - files to use the new "auto-dll-suffix" feature in ACE. - - * ace/Synch_T.cpp (ts_get): Fixed a nasty bug introduced by recent - changes to ACE_TSS<>::ts_get(). The ACE_Mutex should be - ACE_Thread_Mutex. This should fix lots of nasty run-time bugs - seen with recent versions of the ACE 0.33 beta... - -Tue Nov 26 14:40:00 1996 David L. Levine - - * Log_Msg.cpp: fake out TSS on VxWorks in Log_Msg::instance() - by using a spare field in the task control block - - * tests/{CPP_Test,Mutex_Test,Shared_Memory_MM_Test,SPIPE_Test}.cpp: - added VXWORKS support for these tests by spawning a new - thread instead of forking a new process (the same as on - Win32) - - * OS.h: VxWorks can't handle the ACE_THR_FUNC typedef if - it's in the extern "C" block, so I moved it back out. - Also, the horrible GreenHills hack is no longer required. - - * OS.i: there's an ACE_OS_CALL_RETURN before a ::strncpy() call, - I changed it to ACE_OS_CALL. - - * OS.i: Added call to VxWorks ::mkdir() - - * Pipe.cpp: VxWorks doesn't know about TCP_NODELAY. - - * INET_Addr.cpp: get_host_name() is missing a return - statement, on VxWorks only - - * Thread_Manager.i: in ACE_Thread_Control::thr_mgr(), there - were two consecutive return statements, removed the first - one. - - * Time_Request_Reply.{h,cpp}: GreenHills warns that "type - qualifiers are meaningless" for declaration of const - ACE_UINT32 time(), so I removed them. - - * UPIPE_Stream.cpp, line 95: warning: integer conversion - resulted in a change of sign, so we cast n to int. - - * Map_Manager.cpp: in ACE_Map_Manager::resize_i(), variable - foo is unnecessary, so we omitted it. - - * tests/CPP_Test.cpp (and a few others) have references to - argv[0]: - -Tue Nov 26 03:15:22 1996 Irfan Pyarali - - * tests: Added Map_Manager_Test and Message_Queue_Test to - makefiles (NT and UNIX) and one-button scripts. - - * tests: (Barrier_Test.cpp Buffer_Stream_Test.cpp Mutex_Test.cpp - Priority_Buffer_Test.cpp Recursive_Mutex_Test.cpp - Shared_Memory_MM_Test.cpp) Fixed typos mainly and other small - changes. Also fixed logging file problems so to make logging - of tests more accurate. - -Mon Nov 25 00:23:40 1996 Douglas C. Schmidt - - * performance-tests/Synch-Benchmarks/Options.cpp (Options): - Reordered the initialization of data members to keep G++ from - complaining. - - * performance-tests/Synch-Benchmarks/pipe_thr_test.cpp: Changed - some types so that we don't get warnings. - - * tests/Mutex_Test.cpp (test): Added a "return 0". Thanks to - David Levine for reporting this. - - * ace/TTY_IO.cpp: Rearranged some definitions so that we don't get - "unused variable" warnings from g++. - - * ace/SOCK_Dgram.cpp (recv): Rearranged some definitions so that - we don't get "unused variable" warnings from g++. - - * tests/Priority_Buffer_Test.cpp (consumer): Fixed a typo -- I was - missing a *... Thanks to David Levine for reporting this. - - * ace/OS.h (ACE_SVC_FACTORY_DECLARE): Changed the macro so that it - defines a function with `extern "C"' linkage in order to be - consistent. - - * ace/OS.cpp (thr_create): Moved the conditional compilation test - for ACE_HAS_THR_C_FUNC outside of ACE_HAS_SETKIND_NP since MVS - doesn't have this! Thanks to Chuck Gehr for this info. - - * ace/OS.i (thr_sigsetmask): Replaced the tests for - ACE_HAS_DCETHREADS and ACE_HAS_SETKIND_NP with - ACE_LACKS_PTHREAD_THR_SIGSETMASK, which is more appropriate. - - * ace/OS.cpp (ace_mutex_lock_cleanup_adapter): Changed the - signature so that it returns "void" rather than "void *". - Thanks to Chuck Gehr for this. - - * ace/OS.h: Removed #include to avoid problems on - MVS. Thanks to Chuck Gehr for this. - - * ace/config-sunos5.5-sunc++-4.1.h: It looks like SunC++ 4.1 still - doesn't fix their template typedefs bugs. So I've commented - this out in the config file. Thanks to Fred LaBar - for reporting this. - - * ace/ACE.cpp (ldfind): Added support for a new feature that will - append the default suffix (e.g., ".dll" or ".so") for a shared - library on the current platform to the name of the file if it - cannot find an suffix. It will also check that a provided - suffix will match the default suffix for that platform and if it - doesn't it will produce a log entry with a warning. This change - will allow unified svc.conf-files for both UNIX and WinNT. - Thanks to Tilo Christ for this. - - * ace/OS.cpp (thr_create): Came up with a remarkably clever scheme - that should make it possible to utilize the ACE library *without - change* on MVS, where the frigging C++ compiler requires all - functions passed to pthread_create() have an extern "C" linkage. - The trick was to generalize the thread adapter mechanism used - for Win32. - - * ace/OS: Added a new macro called ACE_PTHREAD_CLEANUP_PUSH that - selects the right mechanism (e.g., ace_spawn_adapter or not) for - passing functions to pthread_cleanup_push(). - - * ace/config-mvs.h: Added a new macro called ACE_HAS_THR_C_FUNC - which expresses the fact that the MVS C++ compiler *must* have - an extern "C" function passed to pthread_create(). - - * ace/OS.h: Modified all uses of ACE_OS::mutex_lock_cleanup() to - use the extern "C" ace_spawn_adapter() on platforms MVS like MVS - that can't deal with non-C functions to pthread_create. Thanks - to Chuck Gehr for reporting this. - - * ace/OS.cpp (thr_create): Added Chuck Gehr's patches for MVS. - -Sun Nov 24 12:30:45 1996 Douglas C. Schmidt - - * ace: Added Chuck Gehr's config-mvs.h - file! - - * ace: Began adding support for WinSock 2.0. Thanks to Luca for - this. - - * ace/UPIPE_{Acceptor,Connector,Stream}: Updated the UPIPE - components so that they keep a reference count that keeps track - of the number of "owners" (which should always be 2 -- one for - the connector-side and one for the acceptor-side). By keeping - this count, we can ensure that we don't close down the - underlying ACE_Stream until both sides have called close(). - This will remove a nasty bug that was lurking in some of the - tests. - - * ace/Message_Block.h: Added a new copy() method that assumes the - buf passed in is a NUL-terminated string. - - * tests/UPIPE_SAP_Test.cpp: Modified this test so that threads - exit in a well-defined order. This should prevent problems on - Win32. - - * ace/OS.i: Changed SIGNAL_SAFE_OS_CALLS to - ACE_HAS_SIGNAL_SAFE_OS_CALLS to be consistent... - - * ace/config-vxworks*.h: Removed the SIGNAL_SAFE_OS_CALLS #define - from the VxWorks config files. There's no need to use this by - default. - - * ace/Event_Handler: Moved all the default implementations of the - virtual methods in ACE_Event_Handler from the *.i file to the - *.cpp and made them no longer be inlines. This will fix some - problems with some compilers (e.g., MSVC++ 4.1) and is also more - reasonable since there's really no purpose for inlining these - virtual functions since they are rarely called. Thanks to James - Michael Dwyer for reporting this problem. - -Sat Nov 23 12:39:03 1996 Douglas C. Schmidt - - * ace/Svc_Conf.y: Changed the parser so that it accepts DLL - pathnames that lack *.dll or *.so suffixes. This is necessary - so that we can automatically append the correct suffix depending - on the platform. Thanks to Tilo Christ - for suggesting this. - - * ace/Makefile: Updated the Makefile so that it will automatically - insert the appropriate so that conditions for include of - ace/OS.h can be checked correctly. - -Fri Nov 22 18:12:49 1996 Douglas C. Schmidt - - * ace/OS.i (thr_sigsetmask): DCE threads (at least as implemented - by Digital) have no means for setting the signal mask on a - per-thread basis. Therefore, modified the code so that it - correctly returns ACE_NOTSUP_RETURN(-1) for DCEthreads. Thanks - to Thilo Kielmann for - chasing this down. - - * performance-tests/Synch-Benchmarks/synch_driver.cpp (run_test): - Fixed this implementation so that it will shut down correctly - when a signal occurs or a timeout occurs (whichever comes - first). - -Fri Nov 22 08:02:39 1996 Irfan Pyarali - - * ace.{mdp,mak}: Changed ace.mak so that it links with the - non-debug version of Microsoft's multithreaded dll when compiled - with the release option - -Thu Nov 21 10:37:40 1996 Douglas C. Schmidt - - * ace/Service_Config: Changed the implementation of the - Service_Config class so that it no longer inherits from - ACE_Event_Handler. This was causing problems because the new - reactor() method in the ACE_Event_Handler was conflicting with - the static reactor() method on ACE_Service_Config. - - * ace/OS.cpp (detach): Since we no longer use an - ACE_Recursive_Thread_Mutex, we can remove the line - - else if (ACE_TSS_Cleanup::lock_.get_nesting_level () > 1) - // ... - - Thanks to Matthias Kerkhoff for - reporting this. - - * ace/Thread_Manager.cpp (spawn_n): Replaced int i with size_t i - to avoid warnings between signed and unsigned values. - - * ace: There is an easy way to speed up the "Update dependencies" - in MSVC. Just keep the the compiler from complaining about - missing header by inserting a comment like below in the - #include-directives which are not used in Win32. - - Therefore, instead of - - #include - - we use - - #include /**/ - - Please let me know if this causes problems for any - pre-processors. Thanks to Matthias Kerkhoff - for this suggestion! - - * ace/OS.cpp: Added support for AfxBeginThread in - ACE_OS::thr_create() and ACE_OS::exit(). Now ACE should work - with MFC when you give the THR_USE_AFX flag to - ACE_OS::thr_create()! Thanks to Matthias Kerkhoff - for this! - - * ace/Malloc_T.cpp (avail_chunks): Changed the return value to - ssize_t so we can return -1 if we can't get the lock. Thanks to - Tilo for reporting this. - - * ace/config-sunos4-sun3.x.h: Added new #ifdefs for Sun C++ 3.0.1 - on SunOS 4.1.3. Thanks to Eric Parker - for these fixes. - - * ace/Stack.h: Added a new method called peek() to the - ACE_Unbounded_Queue classes so that the first element can be - retrieved without removing it. Thanks to Luca for this - suggestion. - - * ace/SString.cpp (ACE_CString): Changed ACE_CString so that it - uses memcpy() rather than str(n)cpy() so that we can store any - structure into it. Thanks to Luca for this suggestion. - - * ace/Acceptor: Since we moved the reactor() accessors to - ACE_Event_Handler we can omit these from the Acceptor and - Svc_Handler. - - * ace: Updated the ACE_Reactor and ACE_ReactorEx so that they - automatically sets the pointers in ACE_Event_Handlers. Thanks - to Luca for this suggestion. - - * ace/Event_Handler: Added pointers to all the ACE demultiplexors - (e.g., ACE_Reactor, ACE_ReactorEx, and ACE_Proactor) to - ACE_Event_Handler, along with set/get accessor methods. This - supports a very common use-case where an event handler keeps - track of its demultiplexor. Thanks to Luca for this suggestion. - - * ace/OS.cpp: Since we do not use the recursion count from the - Recursive Mutex any more in ACE_TSS_Cleanup::exit() we can - replace the Recursive Mutex by a regular ACE_Thread_Mutex that - is recursive on NT natively and more efficient. Thanks to - Detlef for suggesting this. - - * ace/OS.cpp: Since we do not use the recursion count from the - Recursive Mutex any more in ACE_TSS_Cleanup::exit() we can - replace the Recursive Mutex by a regular ACE_Thread_Mutex that - is recursive on NT natively and more efficient. Thanks to - Detlef for suggesting this. - - * ace: Backed out all of Detlef's changes to ACE_OS and - ACE_TSS::ts_get(). It turns out that this is unnecessary since - he reimplemented ACE_TSS_Cleanup so that it no longer needs to - hold the lock when callbacks are made. Once again, Detlef - proves that he's a macho man, not a boy ;-) - -Thu Nov 21 08:12:51 1996 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++_4.1.GNU: - put back the LD definition - - * include/makeinclude/platform_osf1_4.0_g++.GNU: - added LD definition to work with latest wrapper_macros.GNU - -Wed Nov 20 10:32:52 1996 Irfan Pyarali - - * tests: Mutex_Test.cpp Priority_Buffer_Test.cpp - Reader_Writer_Test.cpp Thread_Pool_Test.cpp were changed - slightly to remove some compile time warnings. - -Wed Nov 20 21:35:28 1996 David L. Levine - - * ace/Svc_Conf_l.cpp: added #include of ace/config.h so that - conditions for include of ace/OS.h can be checked. - -Wed Nov 20 02:38:40 1996 Douglas C. Schmidt - - * ace/Service_Config.cpp: Moved the definition of logger_key_ to - OS.h and changed it to a macro (ACE_LOGGER_KEY) so that it will - be portable to Win32 and UNIX. Thanks to Tilo for reporting - this. - - * ace/OS: Changed the return value of ACE_OS::getgid() from uid_t - to gid_t to be POSIX compliant. - - * ace/OS.cpp (thr_create): Fixed a typo where we were assigning - stacksize rather than size. Thanks Thilo. - - * ace/OS.cpp (thr_create): Added a new piece of code for - ACE_NEEDS_HUGE_THREAD_STACKSIZE, which is necessary to create a - larger per-thread stack size in order to run ACE_Log_Msg::log. - Thanks to Thilo for this. - - * tests/TSS_Test.cpp: Changed the name of the static variable - "lock" to "cout_lock" to avoid a potential namespace clash on - Digital UNIX. Thanks to Thilo Kielmann for reporting this. - - * ace/SOCK_Dgram.cpp (recv): Added a cast (char *) - io_vec->iov_base so that this would work correctly on platforms - where iov_base is a void * (e.g., AIX and HP/UX). Thanks to - Alan Stewart for the change. - - * ace/OS.h: Added a few new changes for Digital UNIX 4.0a. These - should fix problems with ctime_r() and asctime_r(). Thanks to - Dave Trumble for the fixes. - - * tests/UPIPE_SAP_Test.cpp: Disabled this test if we don't have - threads and (STREAM Pipes or Win32). Thanks to Thilo Kielmann's - for this info. - -Tue Nov 19 23:09:08 1996 Tim H. Harrison - - * ace/Log_Record.cpp (print): Added a call to ACE_OS::fflush - before returning. This change was suggested by Luca in order to - help prevent messages from getting lost when applications exit. - We're unsure of the affects this will have on performance, so we - may change this back in the future. - -Tue Nov 19 00:06:57 1996 Douglas C. Schmidt - - * Released a beta version of ACE 4.0.33 for testing. - - * ace/TTY_IO.h: Added the ACE_Export macro before the ACE_TTY_IO - class to make things work correctly for Win32 DLLs. Thanks - to William L. Gerecke for fixing this. - - * ace/OS.h: Improved the support for RLIMIT_NOFILE. Thanks to - Alan Stewart for reporting this. - - * ace/OS.h: Removed the following code from OS.h because - it is causing problems on some platforms: - - #if (!defined (timespec) && !defined (m88k)) - #define timestruc_t struct timespec - #endif /* timespec */ - - Thanks to Fred LeBar for reporting this. - - * ace/OS.cpp (thr_create): Needed to create an - ACE_OS::NULL_hthread so that we can assign the "NULL thread - handle" on POSIX platforms. Thanks to Alan Stewart - for reporting this. - - * ace/OS.i: The HP/UX C++ compiler is unable to grok inline - functions with multiple returns. So I recoded the - ACE_OS::event* methods to avoid this. Thanks to Alan Stewart - for reporting this. - - * ace/OS.h: Moved the "undef" of t_errno until after the inclusion - of mman.h and dlfcn.h to prevent problems with DU4.0a. Thanks - to David Trumble for reporting - this. - - * ace/Pipe.cpp (open): Fixed a typo where - this->ACE_SOCK::set_option() was being used instead of - writer.set_option(). Thanks to Tilo Christ - for reporting this. - - * ace/Message_Queue.h: Fixed a bug where - - ACE_Message_Queue &queue_; - - should be: - - ACE_Message_Queue &queue_; - - Thanks to Rick Orr for - reporting this. - - * apps/Makefile: Updated the Makefile so that it no longer tries - to look for Synch-Benchmarks. Thanks to Amos Shapira - for reporting this. - - * ace/Activation_Queue.cpp (dequeue): Added a sanity check to make - sure that we actually deleted the first element in the queue. - Thanks to Andres Kruse for reporting - this. - - * include/makeinclude/platform_sunos5_sunc++_4.1.GNU: Added a - minor change to remove the libACE.a archive prior to creating a - new one. This works around bugs with the SunOS 4.x C++ - compiler. Thanks to Andres Kruse for - reporting this. - - * ace/Malloc_T.cpp (avail_chunks): Added Fred LeBar's code and - comments for computing the available chunks. - - * tests/Mutex_Test.cpp: Rewrote the Mutex_Test so that it behaves - correctly on UNIX and Win32. Thanks to Irfan for reporting the - problem. - - * ace/Log_Msg.cpp (sync): Somehow, the statement that updated the - pid_ after sync() is called following a fork() got removed, so I - put it back in. - - * ace/config-sunos5.*-g++.h: Added the - -D_REENTRANT flag to the config files for the G++ version of - ACE. This fixes a nasty problem that otherwise arises when - compiling on SunOS 5.x. Thanks to Hanan Herzog - for reporting this. - -Tue Nov 19 21:14:15 1996 David L. Levine - - * performance-tests/Synch-Benchmarks/Benchmark.{h,cpp}: - use thread ID class for VxWorks as well as Pthreads. - - * OS.i, config-{osf1-4.0,sunos5.[45]}-g++.h: Moved GNU - #include out of config files and into OS.i. - - * ace/Svc_Conf_l.cpp: added #include of ace/OS.h for HPUX and - VxWorks. - - * ace/Token.cpp: reordered initializations in Ace_Queue_Entry - ctor to match declaration order. - -Mon Nov 18 00:47:27 1996 Douglas C. Schmidt - - * ace/OS.h: Added a new #define called ACE_HAS_BROKEN_CONVERSIONS - to workaround problems with the HP/UX C++ compiler, which - doesn't seem to be able to grok foo->operator T *(). Thanks to - Alan Stewart for reporting this bug and the fix. - Also updated the config-hpux*.h files with this define. - - * examples/Misc: Added a new test (test_get_opt.cpp) which - exercises the ACE_Get_Opt class. - -Sun Nov 17 13:00:02 1996 Douglas C. Schmidt - - * ace/Get_Opt: Replaced the GNU-based implementation of class - ACE_Get_Opt with an implementation based on BSD UNIX. The - advantage here is that the BSD version is not encumbered by the - GNU GPL. Thus, ACE has no more dependencies on GNU GPL. Thanks - to James Hu for finding the BSD code. - -Mon Nov 18 00:13:25 1996 Tim H. Harrison - - * ace/stdcpp.h: Added this file to ACE. This file contains the - portability ugliness for the Standard C++ Library. As - implementations of the "standard" emerge, this file will need to - be updated. Although not very useful now, we are gearing up for - a support for STL on UNIX and NT. - - * ace/OS.h: Added an include "ace/stdcpp.h". - - * ace/Log_Record.h (ACE_Log_Record): Removed the iostream include - mess that got accidentally committed to the release. - -Sun Nov 17 00:13:25 1996 Tim H. Harrison - - * For some totally evil reason, MSVC++ will not allow any use of - the "allocator" symbol. It's an STL thing. As a result, I've - had to change all of the following files to rename allocator to - alloc: Local_Name_Space_T.cpp, Map_Manager.cpp, Malloc_T.cpp, - Message_Block.cpp, Read_Buffer.cpp, SString.cpp. The root - of the problem can be seen by compiling the code below: - - template - class foo {}; - - int foo; // compile error because of the foo<> class. - - int main () { return 0; } - - * Service_Config.{h,cpp}: We have to change the allocator - accessors to alloc. This is probably going to break - many things. If necessary, we can conditionally compile in the - old accessors for platforms that are not using STL and MSVC++. - - * ace/Task.h: Added ACE_Export macros to the class definitions. - -Sun Nov 17 13:00:02 1996 Douglas C. Schmidt - - * ace: Added Thilo Kielmann's - patches for OSF/1 4.0a. - - * ace/OS: Revised the implementation of ACE_OS::asctime_r() and - ACE_OS::ctime_r() to simplify common cases. However, this may - have broken some code on OSF/1 4.0a. Can someone please check - this? - - * tests/SPIPE_Test.cpp: Conditionally compiled this file so that - we only build the SPIPE test if (1) we're running on Win32 or - (2) ACE_HAS_STREAM_PIPES. Thanks to David Levine for this - suggestion. - - * ace/OS.i (ctime_r): Fixed a typo that was caused by a misplaced - #endif. Thanks to Eshel Liran for - reporting this. - - * ace/Time_Value: Disabled ACE_TRACE within these method in order - to prevent infinite recursion. - - * ace/Log_Record: Originally, when verbose mode was enabled you - can get the date and time down to the seconds. However, it is - useful for performance testings to have milliseconds displayed - in the log. To accomplish this, I changed ACE_Log_Msg and - ACE_Log_Record to they also keep track of and print the microsec - time, as well. Thanks to Luca for suggesting this. - - * ace/Map_Manager.cpp: updated all the ACE_Map_Manager methods so - their read and write Guards use the ACE_*_GUARD macros. - - * ace/Malloc_T.cpp: Updated all the ACE_Malloc methods so their - read and write Guards use the ACE_*_GUARD macros. - - * ace/OS.cpp (svc_run): Added an ACE_DEBUG announcing that an - exception has propagated beyond the outermost svc_run() - function. Thanks to Luca for this suggestion. - - * tests/test_config.h: VxWorks passes in a NULL argv (arrghhh...). - Therefore, to work around this in the ./tests directory, I changed - the ACE_START_TEST macro to take a NAME parameter, and then I - added the following local variable: - - const char *program = argv ? argv[0] : NAME; - - Thanks to David Levine for this fix. - -Sat Nov 16 12:01:08 1996 Douglas C. Schmidt - - * examples/Threads/test_tss2.cpp: Added Detlef's new test for - ACE_TSS. - - * ace/Synch_T.cpp (ts_get): Added Detlef's changes to fix deadlock - problems with ACE_TSS on NT. - -Fri Nov 15 18:01:26 1996 Douglas C. Schmidt - - * ace/ACE_SOCK_Stream.cpp: NT will signal an abortive close - to the opposite party if a socket is closed before all of its - data has been sent out. According to the NT SDK-docs, you should - do a shutdown before the closesocket() in order to prepare a - graceful close. Thus, I've placed an - ACE_SOCK_Stream::close_writer() method just before the call to - ACE_SOCK::close() in the new close() of the ACE_SOCK_Stream - class. Thanks to Tilo Christ for - this suggestion. - - * ace/INET_Addr.cpp: The function ACE_INET_Addr::addr_to_string - was a virtual function that is also inline and defined in the .i - file. Some compilers have a problem with this, so I moved it - into the *.cpp file. In addition, its sister function was also - virtual and is defined as: - - ACE_INLINE int - ACE_INET_Addr::string_to_addr (const char s[]) - - in the .cpp file. I removed the ACE_INLINE directive. Thanks - to Fred LaBar for reporting this. - -Thu Nov 14 16:20:20 1996 Douglas C. Schmidt - - * ace/Malloc_T.cpp: Added a new method to ACE_Malloc that will - return the number of chunks available on the free list. Thanks - to Fred Labar for this. - -Wed Nov 13 01:22:16 1996 Douglas C. Schmidt - - * ace/ReactorEx.cpp (handle_events): I've changed siginfo_t on - Win32 (which was previously typedef'd to int) so that it has the - following structure: - - struct siginfo_t - { - siginfo_t (ACE_HANDLE handle); - - ACE_HANDLE si_handle_; - // Win32 HANDLE that has become signaled. - }; - - Then, I've changed the ACE_ReactorEx::handle_events() method to - look like this: - - // Assign the ``signaled'' HANDLE so that callers can get - // it. - siginfo_t sig (relative_handles[relative_index]); - - if (relative_handlers[relative_index]->handle_signal - (0, &sig) == -1) - - Thus, you can refer to the signaled handle as - - si_handle_ - - within the handle_signal() call back. Thanks to Matthias - Kerkhoff for suggesting this. - - * ace/System_Time.h: Made ACE_System_Time::get_local_time() a - static member function. Thanks to Matthias Kerkhoff - for suggesting this. - - * ace/Message_Queue.h: The internal variables for counting the - bytes stored in the queue were declared as of type int (in - Message_Queue.h). But they are set (e.g. with - ACE_Message_Queue::ACE_Message_Queue) with values of size_t. - - When running tests/Priority_Buffer_Test, the high_water_mark_ is - preset with the value LONG_MAX. While assigning this value from - size_t to int, this becomes -1 and the queue is always believed - to be full :-( The fix is to change the internal data structures - in Message_Queue.h from int to size_t. Thanks to Thilo Kielmann - for reporting this. - - * tests: Fixed problems with the following three tests: - - Priority_Buffer_Test.cpp - Reader_Writer_Test.cpp - UPIPE_SAP_Test.cpp - - When these are compiled with gcc on Digital UNIX 4.0a the static - ACE_Thread_Manager thr_mgr; was never getting initialized due to - gcc compiler bugs. The fix is to replace the static thread - manager with the ACE_Service_Config::thr_mgr() singleton. - Thanks to Thilo Kielmann for - reporting this. - -Tue Nov 12 19:43:12 1996 Douglas C. Schmidt - - * ace/Thread_Manager.cpp (spawn_n): Was missing a 0 after ?. - Thanks to Thilo Kielmann for - reporting this. - - * ace/Log_Msg.h: Created a new macro call ACE_ERROR_BREAK(X) { - ACE_ERROR(X); break;} for use within switch and loop statements. - Thanks to Luca for this idea. - - * ace/Pipe.cpp: Enabled the "reuse addr" flag for accepting and - connecting the Win32 version of ACE_Pipe. Thanks to Luca for - reporting this problem. - - * ace/OS.i (thr_join): ACE_Thread::join () has a default second - parameter (the status) set to 0. This is not handled in - ACE_OS::thr_join(). To avoid getting a system error in NT we - handle this as we did with ACE_OS::thr_create() and the - thr_handle parameter. - - * ace/config-irix6.2-sgic++.h: Updated the set of patches required - for IRIX 6.2. Thanks to Amos Shapira for reporting this. - -Sun Nov 10 15:40:17 1996 Tim H. Harrison - - * ace/Token_Invariants.cpp: Moved static data - declarations out of ACE_Token_Invariant_Manager::instance and - into the header file. This is supposed to help with a g++ - problem on VxWorks. - -Sun Nov 10 13:22:03 1996 Douglas C. Schmidt - - * ace/Pipe.cpp (open): Set the loopback socket into TCP_NODELAY - mode so that we don't block for 200 ms... Thanks to Luca - Priorelli . - - * ace/Thread_Manager: Created a new version of spawn_n() that - gives parameters for stack, stack_size, and also for the - assigned ACE_hthread_t's. Thanks to Thilo Kielmann - for suggesting this. - -Sun Nov 10 13:56:38 1996 Prashant Jain - - * tests/Reactors_Test.cpp (main): Fixed the test so that the - output of the test goes to a log file instead of STDOUT. - -Sat Nov 9 11:23:13 1996 Douglas C. Schmidt - - * ace/Synch.i: Fixed a bug in ACE_Thread_Mutex_Guard. - The call: - - this->owner_ == block ? this->lock_.acquire () : this->lock_.tryacquire (); - - should be - - this->owner_ = block ? this->lock_.acquire () : this->lock_.tryacquire (); - - Thanks to Alexander Smundak for reporting - this. - -Sat Nov 9 01:44:15 1996 Irfan Pyarali - - * ace/Message_Queue: Added forward and reverse iterators to - Message_Queue. Also, added typedefs to Message_Queue for - ITERATOR, and REVERSE_ITERATOR. This makes the Queue like an STL - collection and also makes it easier to use since you don't have - to define types for the iterators. Please see - test/Message_Queue_Test.cpp for an example. - - * ace/Map_Manager: Added reverse iterator to Map_Manager. Also, - added typedefs to Map_Manager for ENTRY, ITERATOR, and - REVERSE_ITERATOR. This makes the Map more like an STL collection - and also makes it easier to use since you don't have to define - types for the iterators and the entry. Please see - test/Map_Manager_Test.cpp for an example. Note that the new - typedefs does not break existing code. - -Fri Nov 8 20:04:26 1996 Douglas C. Schmidt - - * ace/Malloc.h: Fixed a typo on line 176 that reads: - - #include "ace/Sync_T.h" - - It should read: - - #include "ace/Synch_T.h" - - Thanks to Todd Barkalow for - reporting this. - -Wed Nov 6 00:38:02 1996 Douglas C. Schmidt - - * ace/Pipe: Added the const qualifier to the following methods: - - ACE_HANDLE ACE_Pipe::read_handle (void) const; - ACE_HANDLE ACE_Pipe::write_handle (void) const; - - Thanks to Luca for reporting this. - - * ace/config-win32-msvc4.0.h: Redefined - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES since it looks like - MSVC++ 4.0 still doesn't work. Maybe this is fixed in 4.2? - -Tue Nov 5 03:09:44 1996 Douglas C. Schmidt - - * ace/Strategies.cpp: I'd forgotten to update one of the - accept(*svc_handler) calls to use the new - accept(svc_handler->peer()) syntax. - - * netsvcs/lib/Server_Logging_Handler.cpp: Added a cast to - (COUNTER) 0 when initializing ::request_count_ to avoid problems - on Win32. Thanks to Luca for pointing this out. - - * ace/Thread_Manager: Added a new thr_self() method that return - the unique ID of the thread. This is not strictly necessary - (because a thread can always just call ). - However, we put it here to be complete. Thanks to Hamutal Yanay - for suggesting this. - - * ace/OS.cpp (thr_create): I was accidentally closing down - ::CloseHandle (thr_handle) (where thr_handle is a HANDLE *) when - I should have been doing a ::CloseHandle (handle) instead. - Thanks to Luca for finding this! - -Tue Nov 5 14:26:32 1996 David Levine - - * include/makeinclude/wrapper_macros.GNU: Changed LINK.{c,cc} - commands to use LD instead of CXX. Changed all platform macros - files (except for g++ on VxWorks) to correspond. - - * tests/run_tests.sh: changed -e test to -f for portability and - reordered tests. Thanks to Michael Michael Rueger - for originally creating run_tests.sh, and - for maintaining it, and to Alan Stewart for - suggesting fixes/enhancements. - - * tests/Time_Service_Test.cpp and Tokens_Test.cpp: changed to - return 0 on success instead of 42 - -Fri Nov 1 03:53:39 1996 Irfan Pyarali - - * STL: Added STL files to $WRAPPER_ROOT/STL. This code is a - modified version (changes for VC++ compiler) of the publicly - available implementation of STL from HP. Currently, - ACE_Registry uses these STL classes. - -Fri Nov 1 00:25:01 1996 Douglas C. Schmidt - - * ace/CORBA_Handler.cpp (process_events): There was a very subtle - race condition in the ACE_MT_CORBA_Handler. process_events() - accessed the singleton directly without taking the mutex. At - startup the process_event thread is kicked off from the - constructor and the instance_ is set. Hence the race. The - solution is to attempt to take the mutex before accessing the - instance. Thanks to David Artus for - reporting the problem and providing the fix. - - * ace/Log_Msg.cpp (log): Improved the performance of the Log_Msg - mechanism by not doing any parsing of the format string if the - user has disabled this priority. - - * ace/Reactor.cpp: Added a chance for the open() method of the - Notification_Pipe failing. Thanks to Luca for pointing this - out. - - * ace/Reactor.cpp (handle_events): Added a change to the semantics - of the ACE_Reactor so that it doesn't fall out of the event loop - when signals arrive that it handles. Thanks to Stuart Powell - for this fix. - - * ace/Service_Repository.cpp (remove): Fixed a bug with - Service_Record::remove() that was failing if there were only two - records and we are removing the first one. Thanks to Alex - Villazon for reporting this. - - * ace: Recompiled everything on Solaris with G++ and CC and it - seems to work fine. - - * ace/Module: Replaced the use of char * with const char * for - assigning the Module a name. - - * ace: Split the Task.{cpp,i.h} file into Task_T.{cpp,i,h} in - order to factor out the new non-template ACE_Task_Base and - ACE_Task_Exit classes. This is required for GCC-based compilers - that include the *.cpp files... - -Thu Oct 31 00:36:38 1996 Douglas C. Schmidt - - * ace/Malloc_T.h: Made the destructor of ACE_Allocator_Adapter - virtual. - - * ace/Thread: Reorganized the ACE_Thread so that the - ACE_HAS_THREADS #ifdef is no longer required... - - * ace/Strategies.h: Changed all the destructors to be virtual so - that G++ will stop complaining... - - * ace/Thread_Manager: Reorganized the ACE_Thread_Manager so that - the ACE_HAS_THREADS #ifdef is no longer required... - - * ace/config-win32-msvc4.0.h: Added Dieter Quehl's great hack to - get ACE to compile correctly on Win32 with MFC! - - * ace/Task: I've rearranged the implementation of ACE_Task<> - in the following way: - - 1. Defined a non-template class ACE_Task_Base from which the - ACE_Task<...> inherits (instead of inheriting from - Ace_Service_Object, which ACE_Task_Base now inherits from. - - 2. Move all methods that don't depend on the or - modifers from the ACE_Task template to - ACE_Task_Base. - - There are two motivations for making this change: - - 1. It reduces ``template bloat'' by factoring out common - code that can be shared between ACE_Task - and ACE_Task. - - 2. It makes it possible for the Thread_Manager to use - ACE_Task_Base *'s for managing groups of ACE_Tasks - in a fully polymorphic manner. - - Note that the new changes don't break any existing code that - uses ACE_Task. Thanks to Hamutal Yanay - and Ari Erev's - for suggesting these changes. - - * ace/Thread_Manager: Changed the use of ACE_Task to - ACE_Service_Object because this avoids nasty problems with - template type conflicts. The right solution is probably to - create a new non-template base class for ACE_Task called - ACE_Task_Base and move all the ACE_Task operations into there - that don't involve the Message_Queue directly. I'll need to - think more about this... - - * ace/SOCK_Stream: Added new timed send_n() and recv_n() methods, - which use the underlying timed ACE::send() and ACE::recv() - calls. - - * ace/ACE.cpp: Added new timed send_n() and recv_n() methods, - which use the underlying timed ACE::send() and ACE::recv() - calls. - -Wed Oct 30 00:27:21 1996 Douglas C. Schmidt - - * ace/OS.h: Changed MAXHOSTNAMELEN on Win32 from - (MAX_COMPUTERNAME_LENGTH+1) (which is around 16 or so) to 256. - Thanks to Tilo Christ for this - suggestion. - - * ace: Made #define STRICT a compile time option if the - ACE_HAS_STRICT flag is enabled. This prevents ACE from breaking - existing application (i.e., non-ACE) code. Thanks to Karlheinz - for pointing this out! - - * ace/Synch_T.cpp: Fixed a typo in ACE_Condition::wait - (void). - - return ACE_OS::cond_wait (&this->cond_, this->mutex_.lock_); - - should read - - return ACE_OS::cond_wait (&this->cond_, &this->mutex_.lock_); - - Thanks to Dieter Quehl for - reporting this! - - * ace/Svc_Handler.h: Removed the operator ACE_PEER_STREAM &() from - the ACE_Svc_Handler class since we don't need it anymore due to - the changes below. - - * ace/{Acceptor,Connector}.cpp: Removed the use of operator - ACE_PEER_STREAM &() in the Acceptor::accept() and - Connector::connect() code and replaced it with - svc_handler->peer(). This works much better and is more - intuitive. - -Wed Oct 30 00:30:00 1996 Irfan Pyarali - - * Registry: Added a Name Service implementation to ACE based on - Win32 Registry. The ACE_Registry interface is inspired by the - interface specified in the CORBA Naming Service Specification. - The implementation is done through Win32 Reg*() functions. - Other than providing an OO wrapper for the Win32 Reg*() - functions, ACE_Registry provides an abstraction for iteration - over the elements of the Registry. This only works on Win32 - platforms (unless you are brave enough to reimplement the - Win32 Registry API on UNIX and link it in underneath ACE!). - - * ace/Local_Name_Space_T.cpp: Moved SEH out of methods of - Name_Space_Map to the methods of Local_Name_Space. Some of - the calls to Local_Name_Space methods used the allocator to - either malloc or find or free shared memory. Adding SEH to these - methods ensured that any exception raised due to remapping would - be caught and handled appropriately. - - Also, to fool the stupid MFC compiler, we added _i methods - so that it stopped bitching about destructors not getting called - correctly. - - * Added three new tests to /examples/Naming. Thanks to Lothar for - providing these tests. - -Tue Oct 29 18:10:09 1996 Douglas C. Schmidt - - * ace/ACE.cpp (send): Integrated a new and simpler version of - timed ACE::send(). Thanks to Vital Aza for - coming up with this. - - * ace/XtReactor.cpp: When the ACE_Reactor is constructed it - creates the notify pipe and registers it with the attach() - method. The XtReactor overloads this method BUT because the - attach occurs when constructing the base class ACE_Reactor, the - ACE_Reactor attach() is called not the XtReactor attach(). This - means that the notify pipe is registered with the ACE_Reactor - event handling code not the XtReactor and so notfications don't - work. To get around this we simply close and re-opened the - notification handler in the constructor of the XtReactor. - Thanks to Rodney Skinner for this fix. - - * ace/XtReactor.cpp (schedule_timer): The ACE_Reactor returns a - timer_id from it's equivalent call but the XtReactor always - returns 0. To fix this we simply replaced the "return 0;" in - the function with "return result;" Thanks to Rodney Skinner - for reporting this. - -Tue Oct 29 00:02:44 1996 Douglas C. Schmidt - - * ace/config-win32-msvc4.0.h: Defined the STRICT symbol based on a - suggestion from Luca. STRICT type checking in WINDOWS.H - enhances type safety for Windows programs by using distinct - types to represent all the different HANDLES in Windows. So for - example, STRICT prevents you from mistakenly passing an HPEN to - a routine expecting an HBITMAP. Note that if you have STRICT - type checking enabled in one file, but not in another, the C++ - compiler will generate different external link symbols for a - single function. This will result in link-time errors If you are - mixing STRICT and non-STRICT code, you must be aware of linkage - inconsistencies. In general, all MFC programming and all C++ - should be done with STRICT. If you have legacy C code, then not - using STRICT is acceptable - - * ace/OS.cpp (thr_create): Added a special check for the situation - where we have both ACE_HAS_PTHREADS and ACE_HAS_STHREADS - defined. In this case, we are running on Solaris, where - ACE_thread_t and ACE_hthread_t are the same. Therefore, we can - copy the value of the *thr_id into the *thr_handle. This - ensures that the ACE_Thread_Manager behaves correctly with - respect to suspending and resuming threads and ACE_Tasks. - - * ace/Trace.cpp (ACE_Trace): Changed the use of LM_DEBUG to - LM_TRACE in the constructor and destructor. Thanks to Luca for - this! - - * ace/OS.i: Added a cast to of (HMODULE) handle so that the STRICT - macro would work correctly for Win32. Thanks to Luca for this. - - * ace/config-win32-msvc4.0.h: According to Luca, ACE compiles file - with ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES undefined on NT. So - I undefined it! If there are any problems with this, please let - me know. - - * ace/SOCK_Dgram: Added Luca Priorelli - implementation of recv() for SOCK Dgrams that allows clients to - read from a socket without having to provide a buffer to read. - - * examples/Threads/test_task_four.cpp: This is a new test - program to test the new interfaces. Thanks to Hamutal Yanay - & Ari Erev for this. - - * tests/test_config.h: Added a call to the new ACE_OS::mkdir() - wrapper to create the log directory if one doesn't already - exist. This should solve some nasty problems with NT reported - by Tilo Christ . - - * ace/OS.h: Added a new macro ACE_DEFAULT_DIR_PERMS and changed - the spelling of the existing ACE_DEFAULT_PERMS to - ACE_DEFAULT_FILE_PERMS, which is more accurate. - -Mon Oct 28 21:35:12 1996 Douglas C. Schmidt - - * ace/OS.h: Added a wrapper for the mkdir() system call. We need - it for some of the tests. - - * ace/Task: Changed the name of ACE_Task_Exit<>::set_this() to - ACE_Task_Exit<>::set_task(). Thanks to Hamutal Yanay & Ari Erev - for suggesting this. - - * ace/{Task,Thread_Manager}: Integrated Hamutal - Yanay & Ari Erev's - enhancements to add ACE_Task support - to the ACE_Thread_Manager. This allows the ACE_Thread_Manager to - know about ACE_Tasks directly, rather than knowing - indirectly via their lower-level thread IDs. The changes - are described below: - - - Added a parameter to the activate() method. It is used to - pass an ACE_Task* to spawn_n(). - - - Modified suspend() and resume() to call - thrMgr->suspend_task() and thrMgr->resume_task() instead of - thrMgr->suspend_grp() and thrMgr->resume_grp(). - - - Added an ACE_Task * parameter to spawn_n(). - - - Added an ACE_Task * parameter to append_thr(). - - - append_thr() uses the ACE_Task * input parameter to - initialize the thread descriptor. - - - Added the following methods: - apply_task() - suspend_task() - resume_task() - kill_task() - resume_task() - cancel_task() - find_task() - - num_tasks_in_group() - num_threads_in_tasks() - - task_list() - thread_list() - hthread_list() - - set_grp() Like the current set_grp() but gets an ACE_Task * - as input. - get_grp() Like the current set_grp() but outputs an - ACE_Task *. - - wait_task() - wait_group() - -Sun Oct 27 11:25:00 1996 Douglas C. Schmidt - - * ace/OS: modified the ACE_OSCALL_RETURN macro so that we'll - no longer have zillions of warnings about _result not - used... - - * ace/Synch_T: Changed the use of ACE_Mutex for ACE_TSS to - ACE_Thread_Mutex. - - * ace: Added the necessary template specializations to get ACE - compiled correctly with G++. - - * ace/Log_Msg.h: There were some places in the ACE_{DEBUG,ERROR} - macros that should have been using __ace_error but there still - using errno (which is wrong since this might be changed due to - side-effects of calling ACE_Log_Msg::instance()). I found this - problem due to the use of -Wall with G++! As a result of this - fix, ACE now compiles much more cleanly with gcc -Wall. - - * ace/Strategy: Improved the scheme used to define the PEER_ADDR - type of the ACE_Accept_Strategy so that it will work correctly - on platforms whose C++ compilers aren't quite up to handling all - variants of template typedefs. In particular, many platforms - don't support the use of template typedefs in parameter names... - - * ace/OS: HP/UX omitted the const in the prototype of - const_timewait(). Therefore, I added a new typedef to handle - this and updated all the HP/UX config*.h files. - - * ace: Added a new config file (config-sunos5.5-sunc++-4.1.h) - which reflects the fact that SunC++ 4.1 fixes template bugs that - prevented earlier versions from supporting template typedefs - correctly. The new config file #defines - ACE_HAS_TEMPLATE_TYPEDEFS. - -Sat Oct 26 02:22:25 1996 Douglas C. Schmidt - - * ace: On the advice of David Levine, I compiled ACE with gcc - -Wall and started to fix lots of minor warnings (e.g., - misordered data member initializations). - - * ace/Local_Tokens.h: Changed the destructors of ACE_Mutex_Token, - ACE_RW_Token, ACE_Token_Proxy, and ACE_RW_Token to be virtual. - - * ace/Synch_T.h: Changed the destructor of ACE_TSS to be virtual. - - * ace/OS: Changed the prototype of ACE_OS::select() so that it - uses const ACE_Time_Value *. - - * Updated all uses of ACE_Malloc to use the new ACE_*_MEMORY_POOL - #defines. This makes it possible to use the ACE_Malloc<> scheme - with lame C++ compilers. - - * ace/ACE: Changed the interface of the new timed send/recv calls - to use ACE_Time_Value *, which makes it easier to determine - the blocking semantics at runtime. Thanks to Bill Fulton - for suggesting this. - -Sat Oct 26 15:55:02 1996 Irfan Pyarali - - * ace/OS.h: We determined that MSVC++ is capable of supporting - template typedefs. Therefore, we can enable the - ACE_HAS_TEMPLATE_TYPEDEFS flag, which makes life much easier for - end users! - -Fri Oct 25 23:16:16 1996 Irfan Pyarali - - * examples/Shared_Malloc/test_multiple_mallocs.cpp: Added a new - test that demonstrates the new ability of ACE_Malloc<> to to - handle multiple mallocs rooted at different base addresses. - - * ace/Memory_Pool: Fixed this stuff so that it works even when C++ - compilers can't grok template typedefs. - - * ace: Put all the macros that handle the fact that many C++ - compilers have broken template implementations into one place - (OS.h), rather than having this spread out in many files. - - * In ACE_MMAP_Memory_Pool::init_acquire (), we reset errno to 0 in - the case where the file already exists (and errno == EEXIST). - - * Added an ACE_*_Memory_Pool_Options class to each Memory Pool - class. The Options class allows detailed parameters to be passed - to the constructor of the Memory Pool class. Since a typedef'd - Options class was added to every Memory Pool class, this gave us - the ability to use traits in ACE_Malloc and - ACE_Allocator_Adapter to construct generic Memory Pools that can - be initialized uniquely for each instance of ACE_Malloc. Note - that this new feature only works for C++ compilers that support - template typedefs correctly (e.g., MSVC++ 4.x, SunC++ 4.1, - and the AIX C++ compiler). - - * Added additional constructors to ACE_Malloc and - ACE_Allocator_Adapter to allow Options to be passed in to Memory - Pool. - - * Added an extra field in ACE_Name_Options which allows - specification of the base address of the memory pool. This is - now used by ACE_Local_Name_Space::create_manager() to create an - ACE_Allocator_Adapter. This now allows us to have multiple - ACE_Naming_Context simultaneously in the same process address - space. - - * Also added error checking for constructors (in - ACE_Local_Name_Space and ACE_Malloc) by checking errno - values. This is a "hack" since we currently do not use exception - handling. - -Thu Oct 24 02:43:11 1996 Douglas C. Schmidt - - * examples/Connection/misc/Makefile: The Makefile in - ACE_wrappers/examples/Connection/misc seems to have been - truncated. I replaced it. Thanks to Alan Stewart - for reporting this. - - * examples/IPC_SAP/SOCK_SAP/CPP-{inclient,inserver}.cpp: Updated - these examples to use the new timed send()/recv() operations. - - * ace/SOCK_IO: Added timed send()/recv() methods, using the base - level implementations in class ACE. - - * ace/ACE: Added timed send()/recv() methods. - -Wed Oct 23 19:56:45 1996 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (main): Changed the - behavior of the test program so that it doesn't take a - local_addr, but rather will use the default (this prevents a - common problem that happens when users run the test without - reading the README file). - - * ace/ACE.cpp: Added a new method (get_flags) that returns the - current setting of flags associated with handle. - - * Start of a brave new world: ACE is now under CVS version - control... Thanks to David Levine and Chris Cleeland - for making this happen. - -Sat Oct 19 12:33:56 1996 David L. Levine - - * added ACE threads mappings to VxWorks 5.2 tasks in OS.*. - NOTE: this is _untested_ at this point, but only affects - VxWorks code - - * changed name of first argument of ACE_OS::sigprocmask() and - ACE_OS::thr_sigsetmask() from "signum" to "how" to better - represent what it really is. - -Wed Oct 16 01:59:40 1996 Douglas C. Schmidt - - * ace/Log_Record.cpp (print): added Luca's suggestion for checking - if host_name == 0 for the ostream version of print(), as well. - - * Released version of ACE 4.0.32 for testing. - - * ace/Synch.h: Added many small fixes for HP/UX 10.x. Thanks to - Alan Stewart for providing these. - - * ace/OS.h: Added many new ACE_LACKS* and ACE_HAS* macros to - support the MVS port. Thanks to Chuck Gehr - for these. - -Tue Oct 15 11:56:59 1996 Douglas C. Schmidt - - * ace/OS.h: in a continuing effort to protect the ACE namespace, - I've changed ace/OS.h around lines 127-137 so that "SYNCH" and - "SYNCH_MUTEX", etc. are prefixed with "ACE_". Thanks to Alan - Stewart for suggesting this. - - * ace/Local_Tokens.h: Removed an unnecessary parameter name - that was unused. Thanks to Stuart Powell - for reporting this. - -Tue Oct 15 17:03:37 1996 Tim H. Harrison - - * ace/ReactorEx.cpp (handle_events): Fixed a bug in handle_events - so that the correct handlers get called when multiple handles - become signaled simultaneously. Thanks to Ari Erev - for pointing out this bug. I also took - this opportunity to fix a bug when handlers are removed during - handle_events. - - * examples/Reactor/ReactorEx/test_remove_handler.cpp: Added a new - application that tests how the ReactorEx services simultaneous - events and removes handlers. This example also illustrates the - use of the new ACE_Events wrapper. Check - examples/Reactor/ReactorEx/README for more details. - -Mon Oct 14 11:43:18 1996 Douglas C. Schmidt - - * tests: Added a new version of run_tests.sh, which was - contributed by Michael Rueger . - - * examples/Logger/simple-server/Logging_Handler.cpp (handle_input) - and examples/Logger/Acceptor-server/server_loggerd.cpp - (handle_input): Changed from stderr to cerr to work around bugs - with the C run-time libraries on Win32. Thanks to Tilo Christ - for suggesting this. - -Mon Oct 14 11:09:42 1996 Prashant Jain - - * ace/Local_Name_Space_T.cpp (remap): Added processor specific - stuff to remap(). The code was taken from the book "Win32 - Network Programming" by Ralph Davis (p.18) and takes care of - cases specific to the 80x86 processor. The code ensures that the - registers are set properly when we continue execution after an - exception. - -Sun Oct 13 21:18:38 1996 Douglas C. Schmidt - - * ace/Log_Record.cpp (print): Added a test to make sure that the - value returned from ctime_r != 0 (e.g., if time_stamp_ == -1) in - order to avoid crashes. - - * examples/Logger/client/logging_app.cpp (main): Moved the - construction of the ACE_Log_Record log_record object into the - loop so that it will be recreated each time through. If this - isn't done, then we'll be continually "encoding" values into - network byte order that have already been encoded and screwing - things up on little-endian machines (such as Intel). Thanks to - Irfan and Tilo Christ for pointing - me in the right direction on this. - - * ace/Log_Record.cpp: Changed the default constructor so that it - gives default initializations to the data members. - - * examples/Logger/Acceptor-server/server_loggerd.cpp (handle_input): - Fixed a couple of typos where - - Logging_Handler::handle_input (int) - - should be: - - Logging_Handler::handle_input (ACE_HANDLE) - - and - - size_t len; - - should be: - - ssize_t len; - - Thanks to Irfan for finding these. - -Sat Oct 12 08:48:23 1996 Douglas C. Schmidt - - * Released a beta version of ACE 4.0.32 for testing. - - * ace/Log_Record.cpp: rewrote the code a bit to try and avoid - problems on NT when host_name == 0. - - * ace/Log_Record.cpp: Changed the use of ACE_OS::ctime() to - ACE_OS::ctime_r() to avoid problems that might arise when - ACE_Log_Record::print() is called from multiple threads. - - * ace/Log_Record.cpp: Commented out calls to ACE_TRACE to avoid - weird problems with circular dependencies. Thanks to Luca - Priorelli for suggesting this. - - * build/SunOS5.5/examples/Makefile: Added the Logger directory to - the list of targets that are build automatically by Make. - -Fri Oct 11 17:13:03 1996 Douglas C. Schmidt - - * ace: Fixed lots of small warnings revealed when using the - Greenhills compiler on VxWorks. Thanks to David Levine for - this. - - * ace/Pipe.h: In Pipe.h, the return value of ACE_Pipe::close() - isn't explicitly declared, so some compilers gag. Thanks to - David Levine for this. - -Thu Oct 10 12:05:55 1996 Douglas C. Schmidt - - * ace/Thread.cpp: Correctly wrapped the methods in the *.cpp file - so that they are ignored if threads *aren't* supported. - - * ace/Service_Repository.cpp (remove): Added the ACE_MT in front - of all the ACE_GUARD* macros that utilize ACE_Thread* locks in - order to ensure that ACE compiles correctly on all non-MT - platforms. - - * examples/Shared_Malloc/Malloc.cpp: Removed the special purpose - class for PROCESS_MUTEX since ACE_Process_Mutex will now work - for non-MT platforms. - - * examples/Misc/test_dump.cpp: Changed all occurrences of - - cerr << "string " << this << endl; - - to - - cerr << "string " << (u_long) this << endl; - - to work around problems with IRIX 5.3. Thanks to Tilo Christ - for reporting this. - - * ace/config-linux.h: Added a // in front of a stray comment line. - Thanks to Neil Cohen for pointing this out. - - * ace/config-hpux-10.x-g++.h: Added a new config file for HP/UX - 10.x which should fix some problems with templates by using the - G++ compiler. Thanks to for - contributing this. - -Wed Oct 9 14:34:19 1996 Douglas C. Schmidt - - * ace/OS: Changed the logic of socket initialization, which has - been moved out of ACE_SOCK and into ACE_OS. This makes it - possible to program more fully at the ACE_OS API (if such a - crazy thing is really necessary ;-)). - - * examples/IPC_SAP/SOCK_SAP/C-in{client,server}.cpp: Fixed up the - client and server apps so they will work on NT - (i.e., replaced the use of int with ACE_HANDLE). Thanks to Joe - DeAngelis for suggesting this. - - * ace/Synch.h: Now that we've got support for POSIX semaphores on - Solaris, then we'll use them (when they are supported...) as the - implementation of ACE_Process_Semaphore rather than using the - slower ACE_SV_Semaphore_Complex stuff... - - * ace/OS.{h,i}: Added David Levine's support for named POSIX - semaphores. If ACE_HAS_POSIX_SEM is defined, then ACE_Semaphore - will construct a named POSIX semaphore if passed a non-null - name, or an unamed POSIX semaphore if passed a null name. This - is a great addition because POSIX semaphores are more powerful - and useful than the Solaris UI semaphores. Unfortunately, - Solaris 2.5 doesn't support them (yet). - -Tue Oct 8 16:00:00 1996 Irfan Pyarali - - * ace/OS: Integrated Irfan's encapsulation/emulation for Win32 - Events at the ACE_OS level. A new structure ACE_event_t was - created to support Events on non-WIN32 platforms. On WIN32 - platforms ACE_event_t is just a HANDLE. On non-WIN32 platforms, - ACE_event_t uses a combination of mutexes, condition variables, - and counters to emulate Events. Both auto-reset and manual-reset - events are supported. - - * ace/Synch: Integrated Irfan's encapsulation/emulation for Win32 - Events at the C++ wrappers level. There are three wrappers that - were created: ACE_Event, ACE_Auto_Event, and ACE_Manual_Event. - ACE_Event is a wrapper for the ACE_event_t structure. It - provides functionality for signal, wait, pulse, and reset on an - event. ACE_Event supports both auto-reset and manual-reset - events. However, specializations of ACE_Event were created - (ACE_Manual_Event and ACE_Auto_Event) to make it easier to use - Events. - - * examples/Threads/test_manual_event.cpp: A test for manual-reset - events. The test involves the creation and use of a barrier - which uses an ACE_Manual_Event. - - * examples/Threads/test_auto_event.cpp: A test for auto-reset - events. The test involves the use of an ACE_Auto_Event for - signaling threads. - -Tue Oct 8 15:45:01 1996 Douglas C. Schmidt - - * ace/DEV.cpp (ACE_DEV): Removed a stray call to - ACE_IO_SAP::dump(). Thanks to Brad Flood - for this fix. - - * ace/OS.i: Added ACE_HAS_CHARPTR_SOCKOPT for VxWorks. Thanks to - David Levine for this. - - * ace/Dump.cpp (instance): Added an ACE_MT() macro around the - ACE_GUARD_RETURN macro so that this will compile correctly on - non-threaded platforms. Thanks to David Levine for this. - - * ace/OS.h: the declaration of ACE_OS::msgctl needs "struct - msqid_ds" instead of just "msqid_ds" to compile with the - Greenhills C++ compiler. Thanks to David Levine for this... - - * ace/Local_Name_Space_T.h: Added #include "ace/Local_Name_Space.h" - to avoid a problem during template generation. Thanks to - Chris Lahey for this fix. - - * ace/OS.i (getprotobynumber_r): Added a pair of fixes from Chris - Lahey to get the ACE wrappers for the getprotoby*_r() methods to - compile on AIX. - - * examples/Threads: Added two new examples (test_auto_event.cpp - and test_manual_event.cpp) that exercise the new ACE_Event - mechanisms. - - * ace/Synch: Integrated Irfan's encapsulation/emulation for Win32 - Events at the C++ wrappers level. - - * ace/OS: Integrated Irfan's encapsulation/emulation for Win32 - Events at the ACE_OS level. - -Fri Oct 4 08:32:47 1996 Douglas C. Schmidt - - * ace/OS.i: Added David Levine's new ACE_OS::mktemp() implementation. - -Wed Oct 2 13:26:20 1996 Douglas C. Schmidt - - * ace/SV_Message_Queue.i: Changed the casts of (msgbuf *) to - (void *). - - * ace/OS.i: Added David Levine's implementation of inet_addr() for - VxWorks. - - * ace/OS.i: Continued to merge together various parts of Win32 and - UNIX to reduce redundancies. - -Tue Oct 1 15:03:42 1996 Douglas C. Schmidt - - * ace/OS.i: Added Chuck Gehr's new changes to ACE_OS::mutex_init() - and ACE_OS::cond_init() to handle the MVS Pthreads madness. - - * ace/OS.i: Added zillions of #ifdefs for VXWORKS. It's amazing - these guys call themselves POSIX compliant -- lots of stuff is - missing. Thanks to David Levine for doing this! - - * ace/OS.cpp: Added David Levine's implementation of mktemp() - for platforms that don't support it. - - * ace/OS.h: Added a bunch of minor changes for VXWORKS. In - addition, started to factor out common #ifdefs to make the code - easier to maintain. - - * ace/OS.h: Added a new macro for ACE_LACKS_UTSNAME, and factored - this out for both VxWorks and Win32. - - * ace/Time_Value.h: Added support for 2 VXWORKSisms: (1) we need - to #include sys/times.h rather than the standard UNIX sys/time.h - and (2) we need to change const timeval & to const struct - timeval & to keep the Greenhills compiler happy. Thanks to - David Levine for this. - - * ace/INET_Addr.cpp: Added support for the insane VXWORKS - hostGetByName() function. Yikes! Thanks to David Levine for - this. - - * ace/Memory_Pool.cpp: Added a new #define called ACE_LACKS_SBRK - and ACE_LACKS_SYSV_SHMEM, which is enabled on Win32 and VxWorks. - Thanks to David Levine for reporting this. - - * ace/OS.h: Added new macros that #define ETIME for platforms like - VxWorks that don't support it, but do support ETIMEDOUT. - - * ace/OS.h: Added placeholder #defines for USYNC_PROCESS and - USYNC_THREAD when !defined (ACE_HAS_THREADS). Thanks to Neil - Cohen for reporting this. - -Tue Oct 1 00:42:35 1996 Douglas C. Schmidt - - * ace/Message_Block.cpp (size): Member base_ of ACE_Message_Block - was being set to the new memory pointer before the old contents - are saved in method size. So the line - - this->base_ = buf; - - was moved to a place some lines below. Thanks to Marco Sommerau - for detecting this. - - * ace/Message_Queue.cpp: Changed the implementation of the - enqueue_i() method so that FIFO order is maintained when - messages of the same priority are inserted consecutively. - Thanks to Jay Denkberg for - suggesting this. - -Mon Sep 30 22:59:38 1996 Douglas C. Schmidt - - * ace/OS.i (thr_yield): Added a new macro ACE_HAS_YIELD_VOID_PTR - to make pthread_yield work on MVS. Thanks to Chuck Gehr - for this fix. - - * ace/OS: Added a new macro called ACE_HAS_TIMEZONE_GETTIMEOFDAY - that handles problems on MVS. Thanks to Chuck Gehr - for this fix. - -Mon Sep 30 13:45:10 1996 Tim H. Harrison - - * ace/Local_Tokens.h: Updated some documentation in all the Token - files. - -Mon Sep 30 18:01:12 1996 Prashant Jain - - * netsvcs/lib/: Renamed files Logger.{h,cpp} to - Logging_Strategy.{h,cpp} to avoid confusion with Server_Logging - and Client_Logging stuff. In addition, I modified the affected - files, including Makefile, README, and the config files in the - tests directory. - -Sun Sep 29 12:47:37 1996 Douglas C. Schmidt - - * ace/OS.h: Added Chuck Gehr fixes for - MVS to enable signals to work correctly. - - * ace/Time_Value.h: Added an extern "C" { } block around #include - to solve a problem with Linux. Thanks to Padhu - Ramalingam for reporting this. - - * netsvcs/lib/Server_Logging_Handler.cpp: Changed the - initialization of a static template object from ::request_count_ - (0L) to ::request_count_ = 0L. Thanks to Gonzalo Diethelm - for reporting this. - - * ace/Remote_Tokens.h: Moved the inclusion of "Singleton.h" from - Remote_Tokens.cpp to Remote_Tokens.h. This should avoid - template instantiation problems on some platforms (e.g., Irix - 6.2). - - * ace/config-irix6.2-sgic++.h: Changed ACE_HAS_SIGINFO to - ACE_HAS_SIGINFO_T and added ACE_HAS_UCONTEXT_T. Thanks to - Gonzalo Diethelm for reporting this. - - * ace/Token_Invariants.h: The ctor/dtor were private and the - compiler would not allow a template of the class to be created. - I switched them to public, but I wish there was a better way... - Thanks to Gonzalo Diethelm for reporting - this. - - * ace/Synch_T.h: #include'd "ace/Event_Handler.h". Thanks to - Gonzalo Diethelm for reporting this. - - * ace/Synch.h: The parameter name gives warnings when - instantiating templates. Thanks to Gonzalo Diethelm - for reporting this. - - * ace/Process: Changed the definition of the get_pid() method to - getpid() to avoid a conflict with Irix. Thanks to Gonzalo - Diethelm for reporting this. - - * ace/Log_Msg.cpp (log): Added another #elif !defined (ACE_WIN32) - to handle logging for OS platforms that (1) aren't Win32 and (2) - are versions of UNIX that don't support STREAM pipes. Thanks to - Gonzalo Diethelm for reporting this. - - * ace/Acceptor.cpp (handle_signal): Erased the signum parameter - name to avoid a nasty warning about arguments not used when - instantiating templates. Thanks to Gonzalo Diethelm - for reporting this. - - * ace/OS.h: Added the ACE_Export symbol to the definition of - ACE_Str_Buf. This makes it compile and link on NT. Thanks to - Prashant for noticing this (our favorite Win32ism...). - - * ace/Thread.h (ACE_Thread): Removed a default argument for one of - the ACE_Thread::join() wrappers so this won't be ambiguous with - the other join() wrapper. - - * ace/OS: Added a new wrapper for strtok_r(). - -Sun Sep 29 16:12:01 1996 Prashant Jain - - * netsvcs/lib/: Renamed the project file for Win32 from lib.mdp to - netsvcs.mdp. Also the original project file did not include some - files such as Naming_Handler.cpp and Server_Logging_Handler.cpp - and I fixed that. Finally removed two files System_Time.{h,cpp} - which are already present in ace/. - -Sat Sep 28 16:34:56 1996 Douglas C. Schmidt - - * ace/OS: Added a new overloaded select() method that takes a - const ACE_Time_Value &. This is useful for situations where you - are passing in ACE_Time_Value::zero. - -Fri Sep 27 16:20:46 1996 Douglas C. Schmidt - - * ace/ACE: Added a fix for the fact that VxWork's write() call - doesn't take a const char *. - - * ace: Started adding support for VxWorks and GreenHills compiler, - e.g., added the config-vxwork-ghs-1.8.h file. Thanks to David - Levine for getting this rolling! - -Thu Sep 26 00:15:46 1996 Douglas C. Schmidt - - * ace/Timer_Queue: Changed the public interface methods to be - virtual in order to make it possible to override them in - subclasses. This makes it feasible to implement different types - of Timers. - - * ace/OS: Added a wrapper for the strspn() string call. Thanks to - Irfan for noticing this omission. - - * ace/Synch_T.cpp (wait): Changed the line: - - return ACE_OS::cond_wait (&this->cond_, this->mutex_); - - to - - return ACE_OS::cond_wait (&this->cond_, &this->mutex_.lock_); - - Thanks to Dieter Quehl - for noticing this. - - * ace/config-sunos5.4-g++.h: Removed the #define for - ACE_HAS_BROKEN_RANDR and replaced the ACE_HAS_SVR4_SIGNAL_T with - ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES since it looks like the - latest gcc release (2.7.2) fixes this in their own header files. - -Sat Sep 21 10:45:43 1996 Douglas C. Schmidt - - * ace/OS.h: Added a new #define called ACE_HAS_BROKEN_MSG_H to the - config-osf1-3.2.h file and used it in OS.h to work around - problems with prototypes on that platform. - -Fri Sep 20 00:15:29 1996 Douglas C. Schmidt - - * Released version 4.0.31 for testing. - - * ace/Pipe.cpp: Initialize handles_ to ACE_INVALID_HANDLE in - default constructor. Thanks to Tim Harrison for pointing this - out. - - * ace: Copied in new versions of ace.{mak,mdp} for Win32. - - * ace: Added TTY_IO.cpp to the Makefile. - - * ace/config-win32-msvc[24].0.h: Updated the config file so that - it *doesn't* #define ACE_HAS_STRBUF_T since this type clearly - isn't available on Win32! - - * ace: Modified all of OS.i and config-*.h files so that they - would be consisten with respect to handling the size_t and int - differences in socket implementations. Thanks to Chuck Gehr - for helping with this for AIX. - - * ace/ACE.h (ACE): Added a new method called max_handles() that - returns the maximum number of open handles currently supported - by the process. - - * examples/Reactor/Misc/signal_tester.cpp: Revised the test to - utilize the new idioms for programming with signals. - - * ace/OS.h: added a new #define called ACE_DEV_NULL that defaults - to "/dev/null" on UNIX and "nul" on NT. Thanks to David Trumble - for reporting this fix. - - * ace/Log_Msg.cpp: Added some checks to make sure that we don't - try to strdup() if we are passed a NULL pointer. Thanks to Luca - for suggesting this. - - * ace/OS: Move ACE_Str_Buf into OS.{h,i} and remove the Str_Buf.h - file. - - * Makefile: Added the "performance-tests" directory to the list of - directories we build when making ACE. - - * ace: Moved the definition of strbuf from Str_Buf.h into OS.h. - Thanks to Irfan for recommending this. - - * ace/Makefile: Added some additional sed magic on the - Svc_Conf_y.cpp file in order to remove the very last warnings - from MSVC++! - -Thu Sep 19 00:00:17 1996 Douglas C. Schmidt - - * ace/Service_Config.cpp (open): Only initialize the logger to use - STDERR if the user hasn't already set the ACE_Log_Msg::flags(). - Thanks to Tom Leith for suggesting this. - - * ace/OS: Removed all traces of the ACE_HAS_INT_SOCKNAME and - ACE_HAS_LENPTR_SOCKOPT since Chris Lahey's new fixes for AIX - obviate the need for these. - - * ace/OS.i: Only #include if the platform has RPC! - Thanks to Chuck Gehr for suggesting - this. - - * ace: Removed all uses of ACE_HAS_SETOWN and replaced them with - explicit tests for F_SETOWN and FASYNC. This is more portable. - Thanks to Chuck Gehr for suggesting - this. - - * ace/OS: Added a new #define called ACE_HAS_SIZET_SOCKET_LEN to - handle platforms where the length parameter of bind(), - connect(), accept(), etc. uses size_t rather than int. This - helps to get ACE working on MVS. Thanks to Chuck Gehr - for suggesting this. - - * ace/OS: Added Chris Lahey's fixes that make the - getprotoby{name,number}_r() functions work for AIX. - - * ace: Changed the ACE_HAS_STRUCT_HOSTENT_DATA to - ACE_HAS_STRUCT_NETDB_DATA because we use a single symbol to - refer to all of the odd netdb.h stuff that AIX has... - - * ace: Changed all uses of: - - iovec *iovp = (iovec *) alloca (total_tuples * sizeof *iovp); - - to - - iovec *iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); - - to keep the AIX compiler from complaining (falsely) about using - iovp before it is initialized. Thanks to Chris Lahey for - reporting this. - - * ace/OS.h: Added Chris Lahey's changes that handle AIX's - _XOPEN_EXTENDED_SOURCE features without polluting all the socket - implementations! - - * ace/Thread.cpp (spawn_n): Removed an unreferenced local variable - so that the Win32 compiler doesn't complain. - - * ace/OS.h: Added the definition for strbuf{} for NT. - - * ace: Removed the msg_hack.h file since it had OSF and DEC - copyright info in it. Replaced this with Antonio Tortorici's - clever use of _KERNEL and the - new ACE_LACKS_SYSV_MSQ_PROTOS. - - * ace/INET_Addr.h: Updated the documentation to indicate more - clearly the use of getservbyname(). - - * ace/OS.cpp (thr_create): Added basic hooks to support the use of - AfxBeginThread on Win32. This is necessary to allow ACE to work - seemlessly with MFC applications. Added an THR_USE_AFX flag - that can be "or'd" in with the other thread flags in calls to - ACE_OS::thr_create(). If this flag is enabled *and* if we are - compiling with ACE_HAS_MFC enabled, then AfxBeginThread() is - called rather than _beginthreadex(). - - * ace/INET_Addr.h (set): Fixed a typo in the documentation for - set() (the order of "host:port" was backwards...). Thanks to - Brad Flood for reporting this. - -Wed Sep 18 00:36:01 1996 Douglas C. Schmidt - - * ace/SOCK_IO.cpp: Added a new recv() method that allows a client - to read from a socket without having to provide a buffer to - read. This method determines how much data is in the socket, - allocates a buffer of this size, reads in the data, and returns - the number of bytes read. The caller is responsible for - deleting the memory. Thanks to Luca Priorelli - for suggesting this. - - * ace/OS.h: Added a special #ifdef for IRIX 6.2 threads so that - THR_BOUND and THR_SCOPE_SYSTEM are different. Thanks to Gonzalo - Diethelm for reporting this. - - * ace/Message_Block.i (msg_class): Added a new "class" of messages - to ACE_Message_Block: MB_USER. This is useful for writing - extensible applications a la Microslush Windows MSG stuff... - -Tue Sep 17 16:38:44 1996 Douglas C. Schmidt - - * ace/Message_Block: Changed the signature of the - ACE_Message_Block constructors (and init()) so that they take - const char * rather than char *. In addition, changed the - definition of one of the constructors (and init()) so that it - takes a size field in addition to the buffer. - - * ace/Message_Block.cpp (size): Fixed a bug in the - ACE_Message_Block::size() method -- we were failing to deal with - allocators and ownership correctly during a resize. Thanks to - Amos Shapira for reporting - this. - - * ace/Naming_Context.cpp: Removed the source of yet another - warning about "inconsistent dll linkage. dllexport assumed." - - * ace/Mem_Map.cpp (map_it): Added a cast to size_t (file_len) - because by this time we know that file_len >= 0. This avoids - yet another warning on WinNT! - - * ace/Reactor.h: Fixed the remaining warnings about - "signed/unsigned mismatch" in Win32 by changing the type of - cur_size_ from size_t to ssize_t. - - * ace/Log_Msg.cpp: Modified the code so that on NT we use - ACE_SPIPE_Msg rather than ACE_FIFO_Send_Msg. Thanks to Luca - Priorelli for suggesting this. - - * ace/OS.i: Implemented the and put[p]msg() wrappers by being - smart about allocating and copying data. - - * ace/TTY_IO.cpp (control): There was one too many end parentheses - on line 192 of TTY_IO.cpp. Thanks to Dave Trumble - for reporting this fix. - - * ace/Log_Msg.cpp (local_host): Fixed the use of program_name_ and - local_host_ so that they strdup() the values passed by the - users, rather than copying pointers. This avoids problems if - the user doesn't pass in static memory. Thanks to Luca - Priorelli for reporting this. Somehow - this change got lost and I've reapplied it... - - * ace/Log_Record.cpp (round_up): Added an extra + 1 to the length - since otherwise the final '\0' gets lots if len is a multiple of - 8. Thanks to Luca Priorelli for reporting - this. Somehow this change got lost and I've reapplied it. - - * ace/Memory_Pool.h: removed #if defined (ACE_HAS_SIGINFO_T) logic - from both handle_signal() definitions (ACE_Shared_Memory_Pool - and ACE_MMAP_Memory_Pool). Thanks to Chris Lahey for fixing - this. - - * ace/OS.h: Moved the define of SA_RESTART below the #include for - signal.h. Otherwise SA_RESTART will always be defined by OS.h, - since SA_RESTART is defined on AIX in signal.h. Thanks to Chris - Lahey for fixing this. - - * ace/OS.h: Added some new #pragmas to suppress harmless warnings - for the MSVC++ compiler. - -Tue Sep 17 13:20:53 1996 Prashant Jain - - * ace/Local_Name_Space_T.cpp: Modified ACE_Local_Name_Space:: - create_manager () so that all three naming scopes use the - database variable defined in Name Options. This allows us to - specify different names for databases for all three naming - contexts. However, it is imporant to note that this can lead to - potential problems where, for example, a process may use the - same name for PROC_LOCAL database as an already existing - NET_LOCAL database. - -Mon Sep 16 01:31:21 1996 Douglas C. Schmidt - - * examples/Logger/simple-server/Logging_Handler: get_handle(), - handle_input(), and handle_close() want the right types - (ACE_HANDLE instead of int). Thanks to Luca Priorelli - for reporting these. - - * examples/Logger/simple-server/Logging_Acceptor.cpp: Fixed a typo - (Log_Mskg.h should be Log_Msg.h of course...). In addition, - changed the use of -1 to ACE_INVALID_HANDLE. Thanks to Luca - Priorelli for reporting these. - - - * ace: Changed all uses of ACE_HAS_ACE_INLINED_OSCALLS to - ACE_HAS_INLINED_OSCALLS. This was a vestiage of a global - replace gone amok. Thanks to Alan Stweart for - reporting this! - - * ace/Log_Msg.cpp (open): Added a check for the OSTREAM flag in - the ACE logger. Thanks to Rick Orr - for noticing this. - - * Released version 4.0.30 for testing. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp - (Dump_Restore): Deleted an extra "return 0;" within a - constructor (duh...). - - * examples/Threads/test_process_{semaphore,mutex}.cpp (main): - Fixed some annoying G++ compiler bug related problems. We need - to use old-style C casts to prevent ambiguous parsing. - - * examples/ASX/Event_Server/Transceiver/transceiver: Rewrote this - example to illustrate how to use the ACE_Connector and - ACE_Svc_Handler. - - * examples/ASX/Event_Server/Transceiver/transceiver: Finally clued - in and realized that it is just not suitable to implement the - event server transceiver with separate threads for input and - output. It is simply to non-portable to get these shut down - gracefully. I think John Ousterhout was right -- threads are - evil! - - * examples/ASX/Event_Server: Merged the Consumer/Supplier - directories into a single Transceiver directory to reflect the - fact that the Consumer and Supplier were completely symmetrical! - - * ace/Module.cpp (close): Don't delete the Tasks in a Module if - there are still threads running in them. Otherwise we'll end up - with a big mess. - -Mon Sep 16 15:50:45 1996 Prashant Jain - - * performance-tests/Misc/test_naming.cpp: Added a new test to the - performance-tests directory called test_naming which simply does - performance testing on Naming Service. The test runs both the - SYNC and the NO-SYNC version of Naming Service. - -Mon Sep 16 15:22:52 1996 Tim H. Harrison - - * ace/Proactor.cpp (initiate): Added a check for - ERROR_NETNAME_DELETED after ReadFile/WriteFile. Now the - initiating handler is immediately dispatched for EOF *and* - closed connections. Thanks to Luca Priorelli - for suggesting this change. - -Sun Sep 15 00:55:59 1996 Douglas C. Schmidt - - * Fixed all uses of ACE_Service_Config::end_event_loop() and - ACE_Service_Config::run_event_loop() to be - ACE_Service_Config::end_reactor_event_loop() and - ACE_Service_Config::run_reactor_event_loop() since we now have - to consider the other event loops (e.g., Proactor and ReactorEx) - and it doesn't seem right to relegate those to 2nd class status. - - * ace: Finally got fed up with all the #ifdefs required to deal - with extended signals and just changed the - ACE_Event_Handler::handle_signal() method to always use the - extended signal interface. Fortunately, we can use default - values to hid this from callers (though you may need to change - your class definitions if you were assuming the - handle_signal(int) interface. - - * ace/Memory_Pool.h: Changed all the methods of the various - Memory_Pool classes to be virtual so that subclasses can - selectively override them. This shouldn't affect performance - since all existing use cases work directly with the "derived" - classes themselves, so there shouldn't be any overhead since the - compiler can use direct calls rather than virtual function - calls. - - * ace/OS.cpp (thr_create): Changed the call to CreateThread() to - _beginthreadex() and the call to ExitThread() to _endthreadex() - for Win32 in order to make ACE threads work correctly with - Win32. Thanks to James Mansion for - recommending this. - - * ace/ACE: Added two new static functions: read_adapter() and - register_stdin_handler(). These are useful when writing code - that must demultiplexing ACE_STDIN on both Win32 and UNIX. This - works around Win32 limitations that don't allow us to select() - on non-sockets (such as ACE_STDIN). - - * examples/ASX/CCM_App/SC_Server.cpp: Updated this - test so that it should now work correctly on Win32, where it - isn't possible to select() on STDIN... - - * ace/Synch_T: Added a new class to ACE called "ACE_Test_and_Set." - As this name implies, this class implements an atomic ``test and - set'' abstraction. This has all sorts of useful implications, - particularly because it is a template that can be paramaterized - by the type of LOCK (e.g., ACE_Null_Mutex, ACE_Thread_Mutex, - etc.) and the type of TYPE (e.g., int, double, sig_atomic_t, - etc.). In addition, because this "is-a" ACE_Event_Handler it - instances can be registered with the Reactor and used to shut - down event hoops gracefully upon receipt of certain signals - (e.g., SIGINT). In fact, I've redone many of the example - applications (e.g., ./examples/Logger/server/server_loggerd.cpp) - to illustrate how this works. - -Sun Sep 15 20:40:17 1996 Tim H. Harrison - - * ace/ReactorEx.cpp (notify): I've redesigned this code. - Previously, ReactorEx was explicitly managing a handle that it - kept in handles_[0]. handles_[0] was used to implement - ReactorEx::notify, which allowed other threads to wake up the - thread waiting in ReactorEx::handle_events. Now ReactorEx has - an Event_Handler (ReactorEx_Notify) that is registered in the - constructor of ReactorEx. This allows us to treat events from - handles_[0] just like every other event (i.e. by dispatching to - handles_[0]->handle_signal). One of the results of this change - is that code in remove_handler() is simplified a bit. - -Sun Sep 15 17:56:52 1996 Prashant Jain - - * ace/Naming_Context.cpp: Added a new flag to the constructor and - open() method of ACE_Naming_Context that allows us to specify - which Memory_Pool to use when creating ACE_Local_Name_Space - (that is choose between ACE_MMap_Memory_Pool and - ACE_Lite_MMap_Memory_Pool). - - * ace/Memory_Pool.cpp: Added a new class called - ACE_Lite_MMap_Memory_Pool which subclasses ACE_MMap_Memory_Pool - and overrides the sync method so that it is a no-op. - - * ace/Local_Name_Space.cpp: Made some siginificant changes in - ACE_Local_Name_Space. Here is what the problem was: - ACE_Name_Space_Map (which is an ACE_Map_Manager) used an - ACE_RW_Process_Mutex for synchronization. However, since the Map - was kept in shared memory and was shared by all the processes, - it got instantiated only by the first process which came - along. Therefore, only the first process got around to creating - and initializing the lock. - - In fixing the problem, we made some other changes to - ACE_Local_Name_Space and ACE_Name_Space_Map. Both classes are - now template classes. ACE_Local_Name_Space needs to be - parameterized with a Memory_Pool (thus giving us a hook to - implement the NO-SYNC option) as well as a LOCK. - ACE_Name_Space_Map needs to be parameterized by an ALLOCATOR - which is created by ACE_Local_Name_Space. Note that the reason - we need to parameterize ACE_Name_Space_Map is so that we can - pass an ACE_Allocator_Adapter (which subclasses from - ACE_Allocator) with every method. It is not possible to pass an - ACE_Allocator since the ::remap() method relies on an - allocator() method defined on the ALLOCATOR that is passed in - (and ACE_Allocator does not define an allocator() method). - - The purpose of the class ACE_Name_Space_Map still remains the - same. It IS_A Map_Manager and provides the hook to set the - allocator to the process specific one. However, none of its - methods acquire any locks. For that reason, the Map_Manager is - parameterized with the Null_Mutex. All synchronization takes - place inside ACE_Local_Name_Space. ACE_Naming_Context - instantiates ACE_Local_Name_Space (depending upon the scope) and - by default parameterizes it with ACE_MMap_Memory_Pool and - ACE_RW_Process_Mutex. - - Also made some more fixes to ACE_Local_Name_Space. In - create_manager(), after we create the allocator, we now check to - see if the backing store was created successfully and if not, we - return -1. - -Sat Sep 14 00:00:31 1996 Douglas C. Schmidt - - * examples/Logger: Renamed the original server directory to - "simple-server" and added a new directory called - "Acceptor-server" which implements the Logger using the - ACE_Acceptor. Note that almost all of the implementation code - disappears! - - * ace/Local_Name_Server_T.cpp: Removed the name_server_map_ array - and replaced it with the ACE_NAME_SERVER_MAP #define, which is - now contained in OS.h. - - * ace/Malloc.h: Added "virtual ... = 0" to the bind() and - trybind() methods of the ACE_Allocator since they should be pure - virtual functions... - - * ace/Synch{_T}: Separated out the wait (ACE_Time_Value *) and - wait (void) methods in order to optimize the call sequence for - the common case when there is no timeout. - - * ace/Synch: Added a new wait(ACE_Thread_Mutex &) method to - ACE_Condition_Thread_Mutex so that we are consistent with the - templated ACE_Condition_Mutex. - - * include/makeinclude: Changed uses of -pic to -PIC because ACE is - now creating more than 2082 symbols. It's probably time to - split up the library... - - * ace/DEV_IO: Moved the ACE_DEV_Addr instance from ACE_DEV_IO into - ACE_DEV so that it will be available for the ACE_DEV_Connector. - This fixes a bug that prevented us from using the ACE_Connector - in conjunction with the ACE_DEV_* classes. Thanks to Karlheinz - for clarifying what had to occur. - -Fri Sep 13 00:16:32 1996 Douglas C. Schmidt - - * ace/OS.h: Changed the order of #includes so that - comes before . This fixes some bugs with the - Siemens SVR4 C++. Thanks to Antonio Tortorici - for this fix - - * ace/ACE.cpp (handle_timed_complete): Added yet another weird - hack to deal with the insanity that is TLI... - - * ace/Synch.cpp: Replaced all uses of ACE_Thread_Mutex_Guard with - ACE_GUARD macros in order to avoid problems when mutexes fail. - - * ace/OS.h: Changed the definition of the ACE_*GUARD macros so - that they are always enabled, even when we turn off ACE_MT_SAFE. - This avoids a nasty semantic problem for components that use - ACE_Process_Mutex. Thanks to Avraham Nash - for reporting this problem. - - * ace/OS: Removed ACE_OS::fork_exec() since its functionality has - been subsumed by ACE_Process. - - * ace/Thread_Manager: Added a new thread_descriptor_i() method - that *doesn't* grab the lock in order to avoid deadlocks. - - * include/makeinclude/platform_sunos5_sunc++.GNU (CXX): had to add - the -pta option so that we achieve template closure in ACE. - - * include/makeinclude: Added -lthread to the - platform_sunos5_sunc++.GNU file. I don't know how this slipped - through the cracks! - - * ace/{DEV_IO,FILE_IO,SOCK_IO,SPIPE_Stream}: Fixed a braino with - alloca where I was failing to multiply by sizeof (iovec). Isn't - C great? ... Thanks to Chuck Gehr for - reporting this. - - * ace/SOCK_Dgram_Mcast.cpp: Added two changes to the ACE multicast - code in order to get it to work on Win32. The first change is - to put the IP_ADD_MEMBERSHIP setsockopt() call *after* the - bind() (in shared_open()). The second is to convert the - ACE_INET_Addr::get_ip_address() from host byte order into - network byte order. Thanks to Todd L. Montgomery - and Steve Weismuller - for helping with this. - - * examples/Threads/test_barrier2.cpp: Incorporated Karlheinz's - new ACE_Barrier test program. - - * ace/Synch.h: Added Karlheinz's ACE_Null_Barrier class. - -Fri Sep 13 00:30:50 1996 Tim H. Harrison - - * tests/{Tokens_Test,Time_Service_Test}.cpp: Updated tests to use - ACE_Process instead of ACE_OS::fork_exec. - - * ace/Process.cpp: Added a new ACE_Process abstraction that is a - Portable encapsulation for creating new processes. It allows - assignment of STDIN, STDOUT, and STDERR of the new process. On - UNIX, ACE_Process uses fork and exec. On Win32, it uses - CreateProcess. Since we can set the standard handles, we can - mimic UNIX pipes on Win32 by building chains of processes. This - class should be used instead ACE_OS::fork_exec. - - * examples/OS/Process/process.cpp (main): Added new example - application to show how to use ACE_Process. - -Thu Sep 12 00:55:25 1996 Douglas C. Schmidt - - * ace/DEV_IO: Added methods get_local_addr() and get_remote_addr() - so that ACE_Connector will work correctly. Thanks to Brad Flood - for reporting this. - - * ace/Thread_Manager.cpp (thr_self): Added a fix to solve the - problem that Win32 GetCurrentThread() returns a pseudo-handle - rather than a real handle. Now, we just look things up using - the thread id rather than the thread handle. Thanks to Luca - Priorelli" for clarifying this. - - * ace/Proactor.cpp (initiate): Fixed an incorrect set of return - values -- they were reversed. Thanks to Brad Flood - for reporting this. - - * ace/OS.i (thr_cmp): Added a check for - !defined(ACE_HAS_SETKIND_NP) to avoid a problem with OSF/1. - Thanks to Martin Schoeckle for - reporting this. - - * examples/IPC_SAP/DEV_SAP: Updated these examples to use the new - ACE_TTY_IO classes. - - * ace: Moved the TTY_IO code from the - examples/IPC_SAP/DEV_SAP/{reader,writer} directories into the - files TTY_IO.{h,cpp} in the main part of ACE and integrated Brad - Flood's changes for Win32. - - * ace/DEV_IO.i: Changed the mapping of send_n() and recv_n() - methods to use write_n() and read_n() respectively so they will - work on NT. Thanks to Brad Flood for - reporting this. - - * ace/Thread_Manager.h: Implemented a non-synchronized version of - the lookup function for the . This version - assumes that the lock is help. We need this to avoid - intra-class method deadlock on systems (such as Solaris) that - lack recursive mutexes. - - * ace/Log_Msg.cpp (ACE_Log_Msg): made sure to initialize - ACE_Log_Msg::thr_handle_ to 0. I'm not sure how this got - changed... Thanks to Luca Priorelli for - reporting this. - - * examples/Reactor/ReactorEx/test_reactorEx.cpp - (register_thread_exit_hook): Changed hthread_t to ACE_hthread_t. - Thanks to Luca Priorelli for reporting - this. - - * apps/Gateway/Gateway/Channel.h: Due to inconsistencies between - the semantics of sockets and TLI with respect to establishing - non-blocking connections it's not a good idea to use TLI in - conjunction with select(). Therefore, I've #if 0'd out the use - of TLI in the Gateway application. - -Wed Sep 11 00:25:38 1996 Douglas C. Schmidt - - * ace/ACE.cpp (handle_timed_complete): Fixed a typo that was - failing to set n = ACE::recv(...). In addition, rethought how - we figure out if a connection completes for the nth time... - - * ace/TLI.cpp (open): Modified the implementation of open() so - that if oflag == 0 it is given an initial value of O_RDWR. - Otherwise we'll get a "badflags" t_errno. - - * ace/Connector.h (connect): Modified connect() so that the - default value of the flags parameter is O_RDWR. This is - necessary to make TLI_Connector::connect() work correctly by - default. - - * examples/Logger: Updated the example logger client and server to - illustrate more clearly how things like the Singleton Reactor - and the ACE_Reactor timer mechanism work. Thanks to Joe - DeAngelis for suggesting this. - - * ace/Pipe: Added a new constructor that makes it possible to - initialize the from the and handles. - Thanks to Stevan Warwick (sjw@aesthetic.com) for suggesting - this. - - * config-irix5.3-sgic++.h: Added #define for ACE_NEEDS_SYSTIME_H. - Thanks to Stevan Warwick (sjw@aesthetic.com) for reporting this. - - * examples/Logger/server/Client_Acceptor: Fixed some stray - mis-uses of int that should have been ACE_HANDLE. Thanks to - Luca Priorelli" for reporting this. - - * ace/{ACE,Log_Msg}.cpp: Added fixes for hexdump(). Thanks to - Luca Priorelli" for supplying these. - - * ace/Reactor.cpp (ACE_Reactor): Fixed a typo: "this->max_handlep1 - ()" should be "this->handler_rep_.max_handlep1 ()". Thanks to - Scott Shupe for reporting this. - - * apps/Orbix-Examples/Event_Comm: Added a bunch of changes to make - this application compile with Orbix 2.0. Thanks to Mike - O'Malley for the fixes. - - * ace/OS.cpp (thr_create): Added yet another fix for the IRIX 6.2 - pthreads implementation. Thanks to Gonzalo Diethelm - for reporting this. - - * ace/config-irix6.2-sgic++.h: Changed ACE_HAS_IRIX53_GETTIMEOFDAY - to ACE_HAS_IRIX_GETTIMEOFDAY because this also seems to be the - case for IRIX 6.2... Thanks to Gonzalo Diethelm - for reporting this. - - * ace/TLI_{Connector,Acceptor}.cpp: Added tests against NULL - pointers to avoid segmentation faults when the TLI - implementation doesn't allocate memory for the udata and opt - fields of netbuf structures. - - * ace/Mem_Map.i (ACE_Mem_Map): Added an accessor so that callers - can get the name of the filename that is being used as the - backing store. Thanks to the James Mansion - for recommending this. - -Tue Sep 10 00:26:52 1996 Douglas C. Schmidt - - * ace/OS.cpp (thr_create): Modified the thr_create() - implementation for Win32 so that if the caller doesn't care - about this value we can avoid a HANDLE leak. Thanks to the - James Mansion for recommending this. - - * ace/Thread.cpp (ACE_Thread): Moved both definitions of spawn_n() - into the Thread.cpp since they have loops and don't benefit from - being inlined. - - * ace/Svc_Handler.h: Moved operator delete() into the public part - of the class in order to make various compilers happy... - - * ace/OS.i (ACE_OS): Fixed the #define that selects the (union - wait *) alternative of wait(). This original was protected by - ACE_LACKS_POSIX_PROTO, but it should be ACE_HAS_UNION_WAIT. - - * performance-tests: Created a new directory that will contain all - of the ACE performance tests. Move the Synch-Benchmarks and the - TTCP tests from ./apps into here, and also moved the - test_mutex.cpp and test_singleton.cpp files from - ./examples/{Threads,Misc}, respectively. Thanks to Tim Harrison - for this suggestion. - - * ace/OS.i (ACE_OS): in WIN32 closesocket() returns 0 if call is - OK, so I changed the return value to be the other way around. - Thanks to Luca Priorelli for reporting - this. - - * ace: Changed the ACE_NO_POSIX_PROTO #define to something more - meaningful: ACE_LACKS_POSIX_PROTO. Thanks to Jonathan Biggar - for suggesting this. - - * ace/config-sunos4-g++.h: Added the #define ACE_NEEDS_SYSTIME_H. - Thanks to Alexandre Karev for reporting - this. - - * ace/OS: Fixed a bunch of pthreads portability problems that - showed up on OSF/1 4.0. Also added support for asctime_r() and - ctime_r() for OSF/1 4.0. Thanks to Dave Trumble - for reporting these fixes. - - * ace/Synch_T.cpp (ACE_TSS_Read_Guard): Removed a stray "new" that - was causing problems for the ACE_NEW macro. Thanks to Dave - Trumble for reporting this. - - * ace/Local_Tokens.h: Fixed a broken use of "friend", which was - missing the keyword "class." Thanks to Dave Trumble - for reporting this. - - * ace/config-osf1-4.0.h: Included Dave Trumble's - config file for OSF/1 4.0. - - * include/makeinclude/platform_osf1_4.0.GNU: Included Dave - Trumble's platform macros file for - OSF/1 4.0. Also renamed platform_osf1.GNU to - platform_osf1_3.2.GNU to deal with the new version. - - * ace/Proactor: There wasn't a way to destroy an - ACE_Overlapped_File object without closing the ACE_HANDLE - attached to it. Therefore, I added a flag that keeps track of - whether we have to delete this or not. Thanks to Amos Shapira - for suggesting this. - - * examples/Threads/test_future[12].cpp: Updated the tests to use - the new call() semantics in order to shut down the Scheduler's - event loop gracefully. - - * ace/Method_Object.cpp: Added a return value to the call() - routine. This can be used to indicate to the caller that it is - necessary to shut down the event loop. - -Mon Sep 9 02:07:08 1996 Douglas C. Schmidt - - * ace/Service_Config.cpp (ACE_Service_Config): #ifdef's out the - registration of signal handling to control reconfiguration on - Win32 since it doesn't really handle signals very well. Thanks - to John Morey for bringing this to my - attention. - - * ace/CORBA_Handler: Replaced CORBA_[123] with ACE_CORBA_[123]. - - * examples/CORBA: Updated the test programs to work portably - across different versions of Orbix. - - * ace/OS: Added a new wrapper for the getcwd() call. - - * examples/Threads/test_recursive_mutex.cpp: Added the use of - ACE_Guard<> to illustrate how these work with the - ACE_Recursive_Thread_Mutex. Thanks to Gonzalo Diethelm - for motivating me to do this. - - * examples/Threads/test_process_{mutex,semaphore}: Added two new - tests to illustrate how the ACE_Process_Mutex and - ACE_Process_Semaphore work, respectively. - - * ace/Synch: Replaced the implementation of ACE_Process_Semaphore - to use SV_Semaphore_Complex on UNIX platforms in order to get - the same semantics for Win32 and for UNIX. Thanks to the James - Mansion for recommending this. - - * ace/OS.h: Added some parens around the ACE BIT* macros so that - the precedence levels would be dealt with correctly and we don't - get any nasty surprises... - - * ace/{Synch_T,Synch}: Modified the implementation of all the - *acquire()/release() methods so they keep track of whether they - own the mutex. Thus, if a code path needs to give up the mutex - within the lifetime of the mutex, and it calls mutex_.release(), - then the destructor will not call it again. Thanks to the James - Mansion for recommending this. - - * ace/{Synch_T,Synch}: Changed the name of the field result_ to - owner_ for the ACE_Thread_Muetx_Guard and ACE_Guard. This is - more representative of the true purpose of this field. - - * ace/Synch: Updated ACE_Thread_Mutex_Guard so that it has the - same interface and semantics of ACE_Guard. Thanks to the - ever-vigilant James Mansion for - noticing this. - - * examples/Log_Msg/test_log_msg.cpp (main): Added a test of the - new ACE_Log_Msg::priority_mask() functionality. - - * ace/Log_Msg.cpp: Added a new method called priority_mask(), - which updates the new thread-specific priority_mask_ data member - with the new mask and returns the old mask. This is useful for - applications written using ACE_Log_Msg. Often, these have log() - calls with low priority such as LM_DEBUG that don't need to be - printed, but for which the logging code should not be removed. - The priority_mask() scheme makes it possible to selective enable - printing of certain priorities. Thanks to Rochi Febo Dommarco - for suggesting this. - - * netsvcs/clients/Logger/indirect_logging.cpp (main): Modified the - test program so that it randomly selects logging priorities that - are powers of two. - - * ace/Log_Priority.h: Renumbered the LM_* logging flags so that - they are all powers of two. This makes it easy to implement a - scheme for selectively printing only certain logging values. - -Sun Sep 8 10:46:40 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Proactor.cpp: Fixed up the error handling in ACE_Proactor so - that it returns an error both in case of "bad errors," as well - as when ACE_WIN32 isn't defined. Thanks to Amos Shapira - for reporting this. - -Sun Sep 8 14:11:08 1996 Tim H. Harrison - - * examples/Reactor/Proactor/README: Updated the test_proactor.cpp - and README files to clarify the relationship between the - Proactor and ReactorEx. This example uses the Proactor as the - main event loop (not the Reactor or ReactorEx). Thus, this - application can only do overlapped I/O and timers - asynchronously. To be able to react to other Win32 events, see - the ACE_ReactorEx and the examples/Reactor/ReactorEx/ test. - Thanks to Amos Shapira for - pointing out the ambiguity. - -Sat Sep 7 14:09:21 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Task.cpp: Enhanced the activate() method so that the caller - can set the priority and the thread group id. Thanks to - Karlheinz for this suggestion. - - * ace/OS.h: Added default values of 0 for the trailing arguments - for the {mutex,sema,cond}_init() methods. - - * examples/Threads/test_mutex.cpp: Added a new test program that - illustrates the difference between implementations of thread - mutex wrappers that use inheritance and dynamic binding vs. the - ACE approach (which doesn't use inheritance and dynamic - binding). The results I got on my SPARCstation 20 model 712 is - included in the source file. Thanks to James Mansion - for motivating me to write this. - - * examples/Misc/test_singleton.cpp: Added a new test program that - illustrates the performance of using the Double-Checked Locking - pattern compared with the standard "Mutex::acquire()/release()" - approach. Thanks to Jim Coplien - for encouraging me to get these performance numbers. - -Tue Sep 3 00:38:47 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/XtReactor: Added minor fixes to XtReactor to fix complaints - about "bool" not being defined and the destructor - ~ACE_XtReactor() has already having a body. Thanks to Andres - Kruse for these fixes. - - * ace/Mem_Map.cpp: Make sure that this->length_ is initialized to - 0 in ACE_Mem_Map::map (). Thanks to James Mansion - for pointing this out. - - * ace/Thread.i (spawn_n): In ACE_Thread::spawn_n the sense of the - following check is wrong: - - for (i = 0; i < n; i++) - // Bail out if error occurs. - if (ACE_OS::thr_create (func, arg, flags, &t_id, 0, priority, - stack == 0 ? 0 : stack[i], - stack_size == 0 ? 0 : stack_size[i]) != 0) - thread_ids[i] = t_id; - else - break; - - The '!=' should be '=='. Thanks to James Mansion - for pointing this out. - - * include/makeinclude/rules.local.GNU (MAKEFILE): Changed the - $WRAPPER_ROOT/include/makeinclude/rules.local.GNU line that - says: - - sed -e "s:$(WRAPPER_ROOT);$$(WRAPPER_ROOT);g" \ - - so that the double dollar is now "\$$" (prefixed the first - dollar sign with a backslash). If not, my shell will try to - execute WRAPPER_ROOT for some reason. With "\$$" it works as it - should. Thanks to Marius Kjeldahl for - reporting this. - - * Released version 4.0.29 for testing. - - * ace/OS.i (thr_getspecific): Added a new case for OSF/1. Thanks - to Martin Schoeckle for - reporting this. - - * ace/Thread_Manager.cpp (spawn_i): Removed an invalid - initialization of ACE_hthread_t = 0, which doesn't work on all - pthreads platforms because pthreads uses a struct in some - implementations. Thanks to Martin Schoeckle - for reporting this. - - * man: Updated all the nroff and html documentation to conform to - the latest version of ACE. - - * netsvcs/lib/{Name_Handler,TS_Server_Handler}.cpp: Fixed - some mistakes in the ACE_TEMPLATES_REQUIRE_SPECIALIZATION - code so that all the services can be linked together without - multiply defined symbols. - - * netsvcs/lib/Name_Handler.cpp: Fixed a spot where we weren't - passing in an lvalue to send_request(). Why this wasn't showing - up earlier I don't know, but GCC caught it! - -Mon Sep 2 00:47:00 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Thread_Manager.cpp: Updated all comparisons of ACE_thread_t - and ACE_hthread_t so that they use the ACE_OS::thr_equal() and - ACE_OS::thr_cmp() methods, respectively. Thanks very much to - Martin Schoeckle for identify - the need for this. - - * ace/OS: Added a new method called thr_cmp() which compares two - ACE_hthread_t values for equality. Unfortunately, we can't just - compare these directly via == because on some platforms they are - implemented as structs. Right now, I'm assuming that if - ACE_HAS_TID_T is enabled that we can compare tid_t's using ==. - If this turns out to be incorrect (e.g., if tid_t's are also - implemented as structs, please let me know). - - * ace/Future: Changed the overloaded result() method to a pair of - get()/set() methods. - - * tests/test_config.h: Fixed a bug in the reset() routine. This - was originally deleting the global static ace_file_stream. - However, this was causing segmentation faults if destructors for - objects local to main() were trying to write to the output file. - Therefore, instead of deleting the ostream, we simply flush() - it! - - In addition, also renamed the various functions in test_config.h - to make sure they don't conflict with any other names by - prefixing them with ace_test_... - - * ace: Added many small fixes for IRIX 6.2. Thanks to Gonzalo - Diethelm for reporting all of these! - - * ace/OS: Added a wrapper for the UNIX syscon() system call. - - * ace/LSOCK.cpp (recv_handle): Rearranged the casts so that things - work correctly on platforms with odd definitions ot struct - iovec. Thanks to Gonzalo Diethelm for - reporting this. - - * ace/Task.cpp (ACE_Task_Exit): Rearranged the order in which we - shut down a Task via the Task_Exit hook so that we first - decrement the count of the threads in the task and *then* call - its close() hook. This guards against cases where the close() - hook does something crazy like "delete this". - - * ace/XtReactor.h: Changed #include "X11/Intrinsic.h" to #include - . Thanks to Gonzalo Diethelm - for suggesting this. - - * ace/Future.cpp (ACE_Future): Added some strategic "consts" to - the assignment operator and copy constructor for ACE_Future and - ACE_Future_Rep. - - * examples/Threads/test_task_three.cpp (main): Revised the test so - that it will shut itself down automatically when all the threads - have finished. - - * examples/Threads/test_task_two.cpp (main): Revised this test so - that it doesn't run forever, but only runs either 1000 times or - as many times as the user specifies on the command line. Thanks - to Gonzalo Diethelm for suggesting this. - - * ace/OS.i: Added an extra #else for thr_sigsetmask(), - thr_min_stack(), and thr_kill() for weirdo platforms that don't - conform to the other threading APIs... - -Sun Sep 1 20:15:28 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * examples/ASX/Message_Queue: Changed the use of read(0, ...) and - write(1, ...) to ACE_OS::read(ACE_STDIN, ...) and - ACE_OS::write(ACE_STDOUT, ...) in buffer_stream.cpp and - bounded_buffer.cpp. - - * ace/OS.i: Fixed the errno mapping of the cond_timedwait() - functions so that they set errno to ETIME rather than EBUSY when - timeouts occur. This is necessary to support Solaris and POSIX - pthreads semantics on Win32. - - * build/SunOS5.5/examples/ASX/Message_Queue/buffer_stream.cpp: - Modified the example somewhat so that it uses the Singleton - thr_mgr() method from ACE_Service_Config. - -Sun Sep 1 17:29:58 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * ace/ACE.cpp (map_errno): Added a new static method to the ACE - class. This method allows us to map troublesome win32 errno - values (e.g. WSAEWOULDBLOCK) to values that standard C strerr - function understands. Thank you Microsoft. - - * ace/Log_Msg.cpp (log): Added a call to ACE::map_errno to the %p - option. Now the ACE logger can begin to map Win32 error values - into meaningful strings. - - * netsvcs/lib/lib.mdp: Added a project file for the netsvcs - library. This builds a dll into ace/netsvcs.dll (not into the - netsvcs/lib directory). This reduces the number of paths needed - in %PATH%. - - * examples/Tokens: Renamed this directory netsvsc/clients/Tokens. - - * ace/ace.mdp: Removed wsock32.lib from the ace files listing. - The problem is that we can't assume where MSDEV is installed. I - added wsock32.lib and advapi32.lib to the - build/settings/link/library_modules line. - - * ace/config-win32-msvc4.0.h: Disabled the "C4355: 'this' : used - in base member initializer list" warning. Thanks to Amos - Shapira for figuring this out for us. Although "this" is - unneeded for win32, it is required for compilers on other - platforms (e.g., AIX). - - * ace/Message_Queue.cpp (dequeue_head_i): Andres Kruse pointed out - that we weren't doing head_->prev (0), when dequeuing! - -Tue Aug 27 21:00:25 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * include/makeinclude/platform_sunos5_sunc++_4.1.GNU (CXX): Added - Andres Kruse's changes for SunC+ 4.1. - - * ace: Fixed line # 12 of ace/config-sunos4-sun4.1.4.h, - which read: - - "#define ACE_HAS_SVSV_IPC" (ACE_HAS_ ess vee ess vee _IPC) - - to - - "#define ACE_HAS_SYSV_IPC" (ACE_HAS_ ess wye ess vee _IPC) - - Fix another problem: - - #define ACE_LACKS_THREAD_STACK_ADDR (OS.cpp) - - was inconsistently defined in: - - #define ACE_LACKS_THREAD_STACK_ADDRESS (config-aix-4.1.x.h) - - Thanks to Alan Stweart for reporting - this! - -Mon Aug 26 00:34:05 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Updated all of ACE such that the ACE_GUARD* macros now all take - the name of the ACE_*Guard* that they will use as the scoped - locking object. This is important for several reasons: - - 1. It make it more clear what is going on in the code, rather - than hiding behind the macros! - - 2. It is now possible to have multiple ACE_GUARD* macros in the - same scope by calling each scoped locking object a different - name. This is used in the Local_Tokens.cpp file. - - * ace/Synch.h (ACE_Null_Mutex_Guard): Added the locked() method so - that this signature will conform to the one expected of - ACE_Guard. - - * tests: Added a new file Test_Future.cpp, which tests the new ACE - Futures mechanism using Active Obejcts. Thanks to Andres Kruse - for contributing this test. - - * ace: Added three new files: Future.{h,cpp}, - Method_Object.{h,cpp}, and Activation_Queue.{h,cpp}, which - implement Polymorphic Futures. Thanks to Andres Kruse - for contributing these. - - * ace/Stream.cpp (dump): Replaced LM_INFO with LM_DEBUG. - -Sun Aug 25 21:57:57 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace: Rather than using operator new directly, most of ACE now - uses the ACE_NEW and ACE_NEW_RETURN macros. For instance, - rather than writing: - - if (token_manager_ == 0) - token_manager_ = new ACE_Token_Manager; - - we should write: - - if (token_manager_ == 0) - ACE_NEW_RETURN (token_manager_, ACE_Token_Manager, 0); - - The reason for this is that it makes it much easier to ensure - that all dynamic memory allocation errors are treated uniformly. - I've updated the entire ACE library code tonight to make this - usage consistent whenever possible. - -Sat Aug 24 11:51:38 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Time_Value.h: Simplified various things so that the nasty - macros necessary to build DLLs on Win32 will be simplier. In - addition, I will only #include for those platforms - that don't already do this in (i.e., if - ACE_NEEDS_SYSTIME_H is defined in config.h). Please let me know - if you run across any platforms like this. - - * ace/TLI_{Connector,Acceptor}: Added two additional parameters at - the end of the connect() and accept() methods, respectively, so - that the ACE TLI wrappers can be used with X.25. Thanks to Ajit - Sagar for suggesting this fix. - - * ace: Integrated Eric Newton's XtReactor into the Makefile. If - you want to include this into ACE, make sure to define - ACE_HAS_XT in the config.h file. - - * examples/Misc: Integrated the XtReactor tests. - - * ace/OS.i (getservbyname,gethostby*): Fixed a suble omission -- - any calls to socket function should be wrapped by the - ACE_SOCKCALL_RETURN macro in order to make the errnos work - correctly on Win32. - - * ace/OS: Added support for the getprotoby{name,number} wrappers. - Thanks to Joe DeAngelis for suggesting this. - - * ace/Connector.cpp: Fixed a subtle bug in the ACE_Connector. - The problem centered around the following line in - cleanup_AST(): - - if (this->handler_map_.find (handle, ast) == -1) - - This lookup always failed because the key, the handle of the - service handler, was always -1. The service handler's handle is - not set until a successful connection is made and connector - transfers ownership of the handle to the service handler. The - fix for this is to store the ACE_HANDLE in the ACE_Svc_Tuple - *separately* from the ACE_Svc_Handler. Thanks to Bill Gerecke - for being so persistent in tracking this - down. - - * ace/ARGV.cpp (ACE_ARGV): Added a nifty new constructor that - converts argv-style vectors of strings into a single string - (this is the reverse of what the original constructor does!). - - * ace/ACE: Added a new utility method called strecpy(), which - copies to , returning a pointer to the end of the copied - region (rather than the beginning, a la . - -Thu Aug 22 15:43:58 1996 - - * ace/OS.h: Changed the interface of ACE_OS::fork_exec (char - *const argv[]). (There is no longer a separate const char *path - parameter. Now, argv[0] must be the full path name to the - executable. - - * tests/Time_Service_Test.cpp: Updated the Time Service - one-button test to use the new ACE_OS::fork_exec. I didn't - event break it. - - * tests/Tokens_Test.cpp: Updated the Tokens one-button test to - use the new ACE_OS::fork_exec. It actually works now. - - * tests/test_config.h: Added some more #defines to help simplify - path differences between NT and UNIX. Perhaps these should be - moved into OS.h? - -Thu Aug 22 13:46:58 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Thread_Manager.cpp (ACE_Thread_Control): The status_ member - in ACE_Thread_Control() was not being initialized! This caused - Purify to complain loudly about invalid memory accesses. I have - added an initialiser to ACE_Thread_Control::ACE_Thread_Control - to set status_ to 0. Thanks to Ross Dargahi - for reporting this. - - * ChangeLog: The ACE configuration files "config-irix*.h" defined - 'ACE_HAS_SIGINFO' to indicate that IRIX supports SVR4 extended - signals. This should be 'ACE_HAS_SIGINFO_T' instead. Thanks to - Craig Johnston for reporting - this. - -Wed Aug 21 21:09:01 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Time_Value.h: Added an extra condition, #if defined - (ACE_BUILD_DLL) so that ACE_Svc_Export evaluates to - something. Previously, it was evaluating to nothing in some - files such as Naming_Context.cpp where we were doing #define - ACE_BUILD_DLL and not #define ACE_BUILD_SVC_DLL. - -Wed Aug 21 00:33:17 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/ACE.cpp (format_hexdump): Fixed a minor bug in - format_hexdump(). If the buffer to dump is a multiple of 16 it - prints an extra blank line. ALso fixed the code to use spaces - rather than tabs and put an extra space between the first 8 HEX - bytes and the second. Thanks to Luca Priorelli - for this code. - - * ace/Log_Msg.h (ACE_HEX_DUMP): Added a new logging macro: - - #define ACE_HEX_DUMP(X) \ - do { int __ace_error = errno; \ - ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ - ace___->set (__FILE__, __LINE__, 0, errno, ace___->restart (), - ace___->msg_ostream ()); \ ace___->log_hexdump X; \ - } while (0) - - which makes it possible to dump info in HEX. Thanks to Luca - Priorelli for suggesting this. - - * ace/config-win32-msvc4.0.h: Added - - #define _WINSOCKAPI_ - - To avoid multiple inclusions. Thanks to Luca Priorelli - for suggesting this. - - * ace/OS.h: enclosed the #define of WIN32_LEAN_AND_MEAN macro - definition between #ifndef ... #endif to avoid compiler - warnings. Thanks to Luca Priorelli for - suggesting this. - - * ace/SOCK.cpp (win32_fini): Fixed a potential problem in ACE - where any code of the form: - - ACE_DEBUG ((LM_DEBUG, "%d", GetLastError())); - - will reset errno a couple of times before GetLastError() gets - called. So the result is always 0. The fix is to say: - - int ret = GetLastError(); - ACE_DEBUG ((LM_DEBUG, "%d", ret)); - - Thanks to Luca Priorelli for noticing - this. - - * ace/Connector.cpp (create_AST): Was missing a return 0; if we - successfully register a cancellation id. Thanks to William - L. Gerecke for reporting this bug. - - * ace/Module.h: Added a non-existent friend class to get ACE - to stop complaining - - private: - friend class ACE_Shutup_GPlusPlus; // Turn off g++ warning - ~ACE_Module (void); - // *Must* use dynamic allocation. - - Thanks to Eric Newton for the suggestion. - - * ace/Svc_Conf.y (ace_create_service_type): Removed some stray - calls to ACE_ERROR that were left over from earlier - configurations of ACE. Thanks to Gonzalo Diethelm - for reporting this. - - * ace/Log_Msg.cpp (instance): Fixed the #ifdefs so that - ACE_MT_SAFE implies ACE_HAS_THREAD_SPECIFIC_STORAGE. Thanks to - Gonzalo Diethelm for reporting the need for - this. - -Tue Aug 20 13:09:55 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * INET_Addr.cpp, line 84: Irix's C++ is not able to determine - whether to use the set(u_short,ACE_UINT32,int) or the - set(u_short,const char [],int), since on Irix, INADDR_ANY is 0. - I cast the value so that the call would read set(port, - ACE_UINT32(INADDR_ANY)) and everything went fine. Thanks to - Gonzalo Diethelm for reporting this. - - * ace/Synch[_T]: Added a new wait() method that takes a first - parameter which is the mutex used to serialize access to the - condition. This is useful if you want to store the - ACE_Condition object in shared memory (in which case, the use of - a reference to mutex_t doesn't work!). Thanks to Mark Patton - for recommending this approach. - - * ace/Task.h: Added a forward template declaration for - ACE_Task_Exit so that it will compile on HP/UX. Thanks to Tim - Ottinger for pointing this out. - - * ace: changed line 19 of ace/Str_Buf.h from - - #include "OS.h" - - to: - - #include "ace/OS.h" - - Fixed similar problems with OS.h at line 1154 and Dump.h at line - 150. Thanks to Alan Stewart for reporting this. - -Tue Aug 20 20:18:49 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * tests/TSS_Test.cpp (main): Fixed a small typo. I was referencing - the wrong variable but didn't catch it since it was in the #if - !defined (ACE_HAS_THREADS) section. Fixed the typo and also - renamed the variable called big_count to iterations. Thanks to - Tim Ottinger for pointing this out. - -Mon Aug 19 19:25:50 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * {examples,apps,tests}: Removed the use of zerop from these - files, as well... - - * ace/{Acceptor.cpp,Name_Proxy.cpp,Token.i}: Removed the use of - zerop from these files, as well... - - * ace/Connector.cpp (connect_svc_handler): It looks like our good - friend ACE_Time_Value::zerop isn't getting initialized correctly - on Win32. Therefore, I've replaced it with a direct use of - &ACE_Time_Value::zero. - - * ace/Time_Value.cpp: Removed the static pointer variable "zerop" - since there was no guarantee it was getting intialized before it - is used! Instead of using ACE_Time_Value::zerop, use - &ACE_Time_Value::zero. Thanks to William L. Gerecke - for reporting this problem. - - * ace/OS: Added zillions of changes to make ACE compile with OSF/1 - and its DCE threads implementation. Thanks to Martin Schoeckle - for sending these. - - * ace/config-osf1-3.2.h: Updated this file with fixes for OSF/1 by - Martin Schoeckle . - - * ace/ACE.cpp (handle_timed_complete): Added new logic to - ACE::handle_timed_complete() so that it sets errno to - ECONNREFUSED if the connection is refused by the server. When - you issue an asynchronous connect request, to complete it, you - will use complete() with a timeout. However, complete can fail, - and then it will deallocate any resource, (i.e. close down the - socket handle), also for timeout expiration. So, a user - interested in retrying to complete a connection while the - timeout expires will not use complete(); but rather will use - handle_timed_complete(). In fact, using handle_timed_complete() - the user could detect the reason of a failure (by examining - errno) and decide how to proceed. In the old ACE version the - problem was that, if handle_timed_complete() failed because of - the recv() returning 0, errno remained unchanged and so its - value could be quite misleading with respect to the reasons of - the failure. Thanks to Antonio Tortorici - for this fix and the explanation - above. - - * ace/OS.h: Added support for Borland 5.0's uint64. Thanks to - Hani Yakan for suggesting the strategy to - accomplish this. - -Mon Aug 19 15:52:07 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * tests: Added new macros to the test_config.h file in order to - simplify the testing. - -Mon Aug 19 00:21:22 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Re-released version 4.0.28 for testing (will change the version - number after Tim gives me the new Token stuff). - - * {netsvcs/lib,tests/test_config.h}: Removed spurious dependencies - on fstream.h and iostream.h. Thanks to Alan Stewart - for reporting this. - -Sat Aug 17 17:25:49 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Reactor: Removed the use of "inline" in the Reactor.cpp - files because this was causing problems with some - compilers/linkers. Thanks to Gonzalo Diethelm - for recommending this. - - * examples/Misc/test_XtReactor1.cpp: Added a new test of the - XtReactor, courtesy of Eric Newton . - - * ace/config-hpux-10.x.h: According to Eugene K. Plaude - , HP-UX 10.01 supports user-level threads - based on the pthreads interface specified by POSIX in 1003.4a, - Draft 4 (which is basically DCE threads). Therefore, I've - enabled the ACE_HAS_DCETHREADS symbol in the config-hpux-10.x.h - configuration file. If this isn't correct, please let me know. - -Sat Aug 17 02:18:39 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * examples/Tokens/manual/README: Added a new Token example - application. The manual test gives users a text-based - interactive interface to local or remote tokens. This is - extremely useful for manually testing the token server and - setting up deadlock scenarios. See the README file for more - details. - - * examples/Tokens/deadlock/README: Updated the deadlock example - application to test the new deadlock detection algorithm for - readers/writer locks. I also added the use of Token Invariants - to ensure correctness of the mutexes and readers/writer locks. - See the README file for more details. - -Fri Aug 16 22:16:05 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * ace/Token_Manager.cpp: Updated all Token code to use - ACE_OS::last_error instead of errno. - -Fri Aug 16 00:03:24 1996 Douglas C. Schmidt - - * After a long hiatus, released version 4.0.28 for testing. - -Thu Aug 15 21:04:35 1996 Douglas C. Schmidt - - * man: Updated all the ACE manual pages and html pages to reflect - recent changes. - - * netsvcs/lib/Server_Logging_Handler.cpp: Fixed an omitted - "ACE_BUILD_SVC_DLL" that was causing linker errors on NT. - Thanks to Luca Priorelli for reporting - this. - - * examples/Log_Msg/test_log_msg.cpp: Added a test for the new - log_hexdump() function. - - * ace/Log_Msg.cpp (log_hexdump): Integrated the log_hexdump() code - into the ACE Log_Msg abstraction. Thanks to Luca Priorelli - for fixing this and for Todd Montgomery - for originally supplying the code. - - * ace/Signal.cpp (ACE_Sig_Handlers): Moved the #endif /* HPUX */ - down to the end of the file so that it works correctly on HPUX. - Thanks to Eric C. Newton for report this bug. - - * ace/OS.i: Updated the behavior of thr_join() so that it will do - a ::CloseHandle after getting the exit status. Thanks to the - ever vigilant James Mansion - (mansionj@lonnds.ml.com) for noticing this. - - * examples: Finally added Tim and Prashant's examles/OS directory, - which contains a test that illustrates a "portable" means to - spawn processes on NT and UNIX. - - * ace/Malloc_T.cpp (next): Added an overloaded next() method that - returns the name that is bound to the pointer in the - Malloc_Iterator. This is useful in order to differentiate - entries in the pool based on their name. Thanks to Kim Gillies - for suggesting this. - - * ace: Changed all uses of thread_t, thread_key_t, mutex_t, - rwlock_t, sema_t, cond_t, etc. to ACE_* in order to avoid - polluting the name space. Also switched from using macros to - using typedefs whereever possible. Thanks to Gonzalo Diethelm - for recommending this. - - * ace/System_Time.cpp: Added template specializations for - templates used in the ACE_System_Time class. This should solve - some nasty undefined templates problems with GCC... Thanks to - Joseph DeAngelis for pointing out the - problem. - - * ace/Name_Space.cpp: Fixed the file Name_Space.cpp as follows: - - // Name_Space.cpp - #define ACE_BUILD_DLL - //#include "Name_Space.h" - #include "ace/Name_Space.h" - - Thanks to Eugene K. Plaude for fixing this! - - * ace/config-hpux-10.x.h: Added support for TLI since according to - Eugene K. Plaude this should work. If not, - please let me know. - -Wed Aug 14 21:29:46 1996 Douglas C. Schmidt - - * examples/Reactor/Logger: rearranged the Logger directory so it - would be more clear what the client and server programs did and - how to run them. - - * examples: Merged the contents of the SVR4 examples directory - into the IPC_SAP/SOCK_SAP directory so that we can remove the - SVR4 directory altogether (it wasn't contributing much...). - - * examples: Removed the vestigal Win32 tests since ACE now runs on - Win32 and we don't need a separate test directory. - - * netsvcs/client: Renamed the file remaining file in this - directory to logging_app.cpp since I moved the other file to the - examples/Reactor/Logger directory. - - * ace/Reactor.cpp (check_handles): If eh->get_handle() returns -1 - the select() code will index the [-1] element of an array. To - fix this, I've added a check of the value returned from - eh->get_handle(). Thanks to Eric C. Newton for - reporting this. - - * ace/OS.i (sema_wait): Fixed a subtle bug in the Pthreads - wrappers that surfaced on the SGI IRIX 6.2 port. There was some - code that looked like this: - - pthread_cleanup_push(); - int result = 0; - ... - pthread_cleanup_pop(); - return result; - - However, on Irix 6.2, the push introduces a new scope that is - closed by the pop, so result goes out of scope before returning. - Thanks to Gonzalo Diethelm for pointing this - out. - - * ace/OS.h: Changed the definition of pthread_mutex_t and - pthread_cond_t to mutex_t and cond_t to be consistent with other - usage in ACE. Thanks to Gonzalo Diethelm for - pointing this out. - -Wed Aug 14 01:25:47 1996 - - * ace/SPIPE_Acceptor.cpp: Added the PIPE_TYPE_MESSAGE | - PIPE_READMODE_MESSAGE flags to CreateNamedPipe pipe options so - that data is received in messages rather than as a stream. This - is consistent with the behavior of the SPIPE_Connector. When we - have time, we need to extend the interface so that stream pipes - are also supported, as well. - - * SPIPE_Acceptor.cpp: Made the ACE SPIPE in and out buffer sizes - 10 k. The previous size was just 512 bytes. This larger buffer - size helps decrease flow control. - -Tue Aug 13 23:21:46 1996 - - * examples/Connection/blocking: Updated the blocking SPIPE example - application to use a pool of threads in the proactor to handle - incoming client messages. The SPIPE-acceptor example - illustrates how named pipes are used on NT. Once the server - establishes a connection to a single client, it spawns a thread - pool to handle incoming requests via the proactor event - loop. That is, a separate thread from the pool is used to - process each message sent by a client. The size of the thread - pool can be specified by command-line arguments. This example - leverages the queueing performed by the NT kernel to trivially - implement a thread pool architecture. See - examples/Connection/blocking/README for more details. - - * Service_Config.h: Added a parameter (with a default - size of 0) to the proactor accessor method. This allows - applications to specify the size of the thread pool that can - block on Proactor::handle_events. - -Tue Aug 13 02:30:58 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Task: Added a new public interface called thr_count(). This - returns a count of the number of threads running within a Task. - If the value returned is 0, then the Task is a Passive Object. - If the value returns is > 0 the task is an Active Object, and - the value is a count of the number of threads running within the - object at this snapshot of time. - - * ace/OS: I implemented Karlheinz's suggested optimizations for - the ACE condition variable implementation under Win32. Here's - the deal... The original implementation used an internal_mutex - to ensure that access to the count of the number of waiters was - serialized between the waiter and signaler threads. The new - implementation is designed so that only the waiter threads - access the waiter count. Therefore, we can utilize the - external_mutex to serialize access to this, thus eliminating the - need for the internal_mutex. However, this means that code - *must* be written using the standard condition variable idiom, - i.e., - - int resources () - { - external_mutex.acquire (); - - // ... - - cond.signal (); - external_mutex.release (); - } - - Rather than like this: - - int resources () - { - external_mutex.acquire (); - - // ... - - external_mutex.release (); - cond.signal (); - } - - which is what some thread programming books recommend as an - optimization. However, you should be careful not to use this - form since it can lead to "lost wakeup" bugs caused by the fact - that the implementation of ACE_OS::cond_signal will test if the - waiter count > 0 *without holding any locks*!!! - - Fortunately, ensuring this shouldn't be a problem since most ACE - code uses the following idiom: - - int resources () - { - ACE_Guard mon (external_mutex); - - // ... - - cond.signal (); - // Destructor of mon releases external_mutex. - } - - Clearly, there are subtle tradeoffs between performance and - programmability here... - - * ace/Synch: Updated all of the ACE semaphore wrappers to take the - new "max" value as their final constructor argument. - - * ace/OS: Added a new default argument to the end of the - sema_init() method. This allows us to specify the maximum value - of the semaphore (this is only important on NT). Currently, it - is hard-coded to 0x7fffffff in uses. The new approach makes it - possible to set the max to a different value. Thanks to - Karlheinz for requesting this. - - * ace/Message_Queue.cpp: Added an implementation of the dump(). - Thanks Karlheinz. - - * ace/Synch.cpp: Added an implementation of the dump() method. - Thanks Karlheinz. - - * ace: Updated all usage of ACE_Thread_Mutex_Guard so that it now - uses the ACE_GUARD* macros correctly. Thanks to Chris Eich - for pointing out the - need for this. - - * examples/Threads: Added Karlheinz's new test_barrier2.cpp test - program that makes sure that the ACE_Message_Queues are working - correctly when accessed by multiple threads. - - * netsvcs/lib/Server_Logging_Handler.cpp (handle_logging_record): - Fixed an errant use of ACE_Guard, which wasn't properly checking - of the Guard acquired the lock. Thanks to Chris Eich - for pointing this out. - - * ace/OS.h (ACE_GUARD): Added default "ace_mon" implementations of - type ACE_Null_Mutex even in cases where there's no threading - defined so that code accessing ace_mon.release() and - ace_mon.acquire() will compile correctly. - - * apps/Gateway/Gateway/Channel.h: Fixed the code so - that we don't try to use TLI if the platform doesn't support it - (instead, we'll use sockets). Thanks to Marius Kjeldahl - for reporting this problem. - - * examples/ASX/Event_Server/{Supplier,Consumer}: Fixed the code so - that we don't try to use TLI if the platform doesn't support it - (instead, we'll use sockets). Thanks to Marius Kjeldahl - for reporting this problem. - -Mon Aug 12 14:50:47 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * examples/Misc: Added Eric Newton's test case for - his XtReactor integration. - - * ace: Included Eric Newton's code that integrates - ACE with the Xt event loop. This still needs a bit of work - (e.g., making it thread-safe and incorporating signal support), so - I haven't added it to the Makefile yet. If someone can take the - time to fix it up, I'll be happy to integrate it into ACE. - - * ace/Message_Queue.cpp (dequeue_head): Fixed the mother of all - bugs in the ACE_Message_Queue implementation... The problem was - that I was trying to be too clever by optimizing the number of - Condition::signal() calls by only calling signal() when the - queue changed state from empty to non-empty (or full to - non-full). It turns out that this optimization works fine for a - single producer/consumer case, but fails when there are multiple - consumers. The fix was just to call signal() every time. This - should be ok because the underlying Condition variable - implementation will perform the optimization in the correct - fashion. Thanks to the omniscient Karlheinz for detecting this - problem and reporting it. - -Sun Aug 11 15:52:07 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * tests: Made minor changes to test_config.h, SPIPE_Test.cpp, and - UPIPE_SAP_Test.cpp to accomodate the change made to SPIPE_Addr. - SPIPE_Addr now accepts a string of the form [host:]port and then - creates the rendezvous point. Originally, SPIPE_Addr would - assume that the string being passed in was the actual rendezvous - point. - -Sat Aug 10 18:41:21 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * netsvcs/lib/Logger.cpp (init): Added a new service to netsvcs - called ACE_Logger which allows us to control the output of all - the services. The ACE_Logger service can be invoked with - different flags (such as STDERR|OSTREAM) which in turn sets - ACE_Log_Msg to direct the output of all the services to the - appropriate stream(s). Note that if a service needs to stay - unaffected from ACE_Logger, it should be invoked before - ACE_Logger gets invoked. Also note that like other services in - netsvcs, ACE_Logger can also be dynamically linked in. - -Sat Aug 10 14:23:07 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added Steve Huston's patches to get ACE - to compile on UnixWare 2.01. This mostly involved changes to - the internal types used by the socket wrappers. Thanks Steve! - -Fri Aug 9 01:34:19 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * examples/ASX/UPIPE_Event_Server/Options.cpp (print_results): - Added a typedef to avoid problems if a platform doesn't support - prusage_t. Thanks to Marius Kjeldahl for - reporting this. - - * include/makeinclude/platform_linux_pthread.GNU. The line that - say: - - LIBS = -lpthreads -lstdc++ - - was modified to say: - - LIBS += -lpthreads -lstdc++ - - Thanks to Marius Kjeldahl for reporting - this. - -Fri Aug 9 18:26:16 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp (reset): Fixed a subtle (yet very - annoying bug). In switching contexts a test program would hang - after a certain number of switches. Having gone through the code - thoroughly and with the aid of Purify, the bug was narrowed down - to an extraneous delete taking place in - ACE_Name_Space::reset(). Essentially, we do not need to delete - ACE_Name_Space_Map::instance() which is actually the - SHARED_MALLOC since it gets deleted in the destructor of - ACE_Local_Name_Space. - -Thu Aug 8 17:55:20 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/SPIPE_Addr.cpp (set): Implemented - ACE_SPIPE_Addr::string_to_addr(). Modified ACE_SPIPE_Addr::set() - using code provided by Brad Flood to create the rendezvous - point. Note that originally ACE_SPIPE_Addr constructor and set() - would take the actual rendezvous point but now they rely on - being passed a string which is of the format "[host]:port" - (where host is optional). The rendezvous point is then created - by extracting from the string the hostname (if any) and also - using the port number as the unique pipe name. Note that this - approach works on both UNIX and Win32. - -Mon Aug 5 20:15:59 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/OS.i (last_error): Fixed a typo. In the set and get methods - last_error(), there should be a check for "if defined - (ACE_WIN32)" and not "if defined (ACE_HAS_WIN32)" - -Wed Aug 7 00:21:42 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Log_Msg.h: Replaced all uses of errno *following calls to - ACE_Log_Msg::instance()* so that we first cache errno in a local - variable called __ace_errno. We need to do this because - ACE_Log_Msg::instance() can reset errno == 0. Thanks to - Tim for pointing this out. - -Mon Aug 5 20:15:59 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/OS.i (last_error): Fixed a typo. In the set and get methods - last_error(), there should be a check for - "if defined (ACE_WIN32)" and not "if defined (ACE_HAS_WIN32)" - -Sat Aug 3 14:52:32 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * examples/Win32/win32_client.cpp: Changed ACE_GUARD_RETURN to - ACE_GUARD in the method Errno::flags since the return type is - void. - - * examples/Connection/non_blocking/CPP-connector.cpp: Made some - minor changes to get things compiling on Win32. The call to - handle_close now takes zero as the first argument (which is - never used). Also the arguments to ACE_SERVER_ADDRESS are now - swapped (hostname followed by port number) to be consistent with - the change made to the macro. Thanks to Brad Flood for - suggesting these changes. - - * examples/Connection/non_blocking/CPP-acceptor.cpp: Made minor - changes to some of the methods to make sure all control paths - return a value. Also changed the default port number to - ACE_DEFAULT_SERVER_PORT_STR to match what the connector tries to - connect to. Thanks to Brad Flood for - suggesting these changes. - - * ace/OS.h (ACE_SERVER_ADDRESS): Modified the macro - ACE_SERVER_ADDRESS so that it creates a string of a server - address with a "host:port" format. Previously the order was - reversed. Thanks to Brad Flood for suggesting this change. - -Sat Aug 3 00:07:26 1996 Douglas C. Schmidt (schmidt@lambada.cs.wustl.edu) - - * ace: Fixed problems with recursive tracing of ACE_TRACE by - commenting out certain constructors in IPC_SAP.cpp, - FIFO_Send_Msg.cpp, FIFO_Send.cpp, and FIFO.cpp. Thanks to - Karlheinz for finding and reporting these fixes. - -Fri Aug 2 22:19:05 1996 Douglas C. Schmidt (schmidt@lambada.cs.wustl.edu) - - * ace/ACE.cpp (format_hexdump): Fixed an infamous "off by one" bug - that was causing this to fail on Win32 (time to switch to Java? ;-)). - Thanks to lucapri@mbox.vol.it for finding this. - -Thu Aug 1 14:08:30 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/CORBA_Handler.cpp (activate_service): Fixed a typo caused by - an omitted ENDTRY. Thanks to Garrett Conaty - for noticing this. - -Mon Jul 29 10:03:16 1996 Douglas C. Schmidt (schmidt@lambada.cs.wustl.edu) - - * examples/Win32/win32_client.cpp: There was a typo in one of the - ACE_GUARD macros. Thanks to Tim Ottinger - for pointing this out. - -Mon Jul 22 12:41:22 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Local_Name_Space.cpp (reset): Added a new method - ACE_Name_Space_Map::reset() which deletes the instance of - ACE_Name_Space_Map. This forces instance() to create a new - instance using a new context file in the case of the context - having changed. I make use of this in - ACE_Local_Name_Space::create_manager(). - -Fri Jul 19 12:28:07 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/System_Time.cpp (get_master_system_time): Modified - ACE_System_Time::get_master_system_time() so that if an entry - for the time is not found in shared memory (indicating that no - Clerk is running), then we should just return the local time of - the host. - - * netsvcs/lib/TS_Clerk_Handler.cpp (update_time): Modified - ACE_TS_Clerk_Handler::update_time() so that if the Clerk is not - connected to any servers, is sets the delta time to zero - allowing clients to then use the local time of the host. - -Wed Jul 17 22:19:53 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/UPIPE_Connector.cpp (connect): Added an #ifdef around the - check of ACE_OS::isastream (handle) in - ACE_UPIPE_Connector::connect() since the call is not supported - on NT. - -Thu Jul 11 22:22:57 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * ace/OS.i (kill): Modified ACE_OS::kill so that it works on NT. - It takes a process ID, creates a handle for the associated - process, and calls TerminateProcess on the handle. This is - actually pretty dangerous according to the NT documentation. - Can majorly confuse DLLs. Does the same old thing on UNIX. - - * ace/OS.cpp (fork_exec): Added a fork_exec operation to ACE_OS. - This works on UNIX and NT. It combines the forking and exec'ing - into one call. This has to be combined since Win32 - CreateProcess only starts applications from scratch (unlike UNIX - fork). - - * examples/OS/test_os.cpp: Added a new example application to test - the new ACE_OS::fork_exec and ACE_OS::kill operations. - -Tue Jul 9 13:04:14 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Service_Manager.cpp (reconfigure_services): To improve - portability on Win32 and UNIX I replaced the use of a signal to - trigger reconfiguration to instead make a call to the new - ACE_service_Config::reconfig_occurred() method. This should - actually perform the same as the original approach, since all - the signal handler ever did was to set this flag! Thanks to - Karlheinz for pointing out the need for this. - - * ace/Service_Config.h: Added a new static public method called - reconfig_occurred(sig_atomic_t) to set if a reconfiguration - should take place the next time through the event loop. - -Mon Jul 8 14:20:01 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Time_Value.h: Added "ACE_Export" before all global operators - to allow them to be dll-exportable on NT. - -Mon Jul 8 13:12:05 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/{Message_Block,DEV_IO,SPIPE_Stream}.cpp: Fixed several more - cases of delete array that should have been delete [] array. - Thanks to Tom Leith for pointing out some of these. I can hear - the ghost of James Mansion coming closer... ;-) - - * INSTALL: Added tips on how to install ACE on a Win32 platform - that lacks a network card. - - * ChangeLog: Split ChangeLog-96 into two files (ChangeLog-96a and - ChangeLog-96b) since it was becoming quite large! Thanks to - Chris Lahey for pointing this out. - - * ace/Stream.cpp: Was missing a "return 0;" at the end of the - close() method. Thanks to Tom Leith for - finding this. - -Mon Jul 8 14:20:01 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Time_Value.h: Added "ACE_Export" before all global operators - to allow them to be exportable from Win32 DLLs. - -Sun Jul 7 10:34:48 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.27 for testing. - - * config-sunos5.5*.h: Removed all uses of ACE_HAS_SVR4_SIGNAL_T in - the config files since Solaris 2.5 has consistent signal and - sigaction types (at last!). - - * Installed and compiled ACE successfully with the new SunC++ 4.1 - compiler on Solaris 2.5. However, there seems to be major - problems with the interaction of the SunC++ exception handling - runtime system and the Solaris multi-threading mechanisms. This - is causing the ACE multi-threading tests to bomb with - segmentation faults inside of the _ex_unwind() library function. - If you read the /opt/SUNWspro_3.1/READMEs/c++ file you'll see - why this problem is occurring (apparently due to bugs in the - Solaris libC.so.5 C++ runtime library). - - There seem to be two fixes for this problem: - - 1. Add the following to *all* threads (including main): - - #include - - void *my_thread_entry_point (void *) { - set_terminate (abort); - set_unexpected (abort); - - // Do real work... - } - - This is the approach recommended by the README file in - SUNWspro_3.1. However, it is *clearly* a horrible hack and - very non-portable (therefore, I deem it worthy of Microsoft - ;-)). - - 2. Compile ACE (and applications?) with -noex in order to avoid - this bug. This is clearly not desirable either since it - precludes the use of exception handling with C++ and threads - on Solaris... - - Since ACE doesn't use exceptions internally on Solaris option 2 - seems like the best approach for the time being. When Sun gets - it act together and releases a bug-free library and C++ - software, I'll fix ACE accordingly. - - * tests: Integrated the latest of Prashant's "one-button" tests - into the main ACE release. These will run on both UNIX and - Win32 now. - - * ace/UPIPE_Stream.cpp (recv): Changed the semantics of the - ACE_UPIPE_Stream::recv (char *, size_t, ACE_Time_Value *) - method. Currently, the behavior is to block until *exactly* N - bytes are read. However, this is incorrect for 2 reasons: - - 1. It makes it hard to write a server that doesn't know - precisely how big the messages are from the client. In - particular, if the receiver doesn't know how big the buffer - messages are from the client it will block indefinitely! - - 2. It is redundant with respect to the - ACE_UPIPE_Stream::recv_n(), which also blocks until all N - bytes are received. - - Therefore, I've made the new UPIPE_Stream::recv() method block - only until it's received the first block of data that allows it - to fulfill its size request, or anything that is smaller than - that size. - - * ace/OS.cpp (thr_create): Since POSIX pthreads doesn't provide an - equivalent of THR_NEW_LWP in the pthreads_attr_* functions, I've - added an emulation that should work for Solaris. Basically, if - THR_NEW_LWP is set when ACE_OS::thr_create() is called, we use - the ACE_OS::thr_{get,set}concurrency methods to increase the - number of LWPs by one. - - * ace/Message_Block: Changed the default high water mark for an - ACE_Message_Queue from 4K to 16K. This is useful since it - allows applications to buffer more information before blocking. - - * ace/Log_Msg: Added a pair of operations that allow applications - to acquire and release the synchronization lock used internally - by the ACE_Log_Msg implementation. This allows applications to - hold the lock atomically over a number of calls to ACE_Log_Msg, - which is useful for composite operations like the following: - - // Make sure the following operations are run atomically! - ACE_LOG_MSG->acquire (); - - while (c != '!') - { - if (c_stream.recv (&c, 1) == -1) - ACE_DEBUG ((LM_DEBUG, - "(%t) buffer recv from supplier failed\n")); - else - ACE_DEBUG ((LM_DEBUG, "%c", c)); - } - - ACE_LOG_MSG->release (); - - * examples/IPC_SAP/UPIPE_SAP: Revised all of the UPIPE_Stream - tests to make them more consistent and correct with respect to - the new changes. - - * ace/Stream.cpp (link_i): There was a bug in the link_i() logic - because we weren't also linking the other stream back to our - stream. - - * ace/UPIPE_{Acceptor,Connector}: Modified both of these classes - so that they don't - - * ace/Stream.cpp (close): Modified close() so that it now detects - "double-closes" and ignores anything but the first one. - - * ace/UPIPE_Stream: Updated this class so that it no longer - inherits from ACE_Stream (previously ACE_UPIPE_Stream had - inherited from *both* ACE_Stream *and* ACE_SPIPE). There are - several reasons we shouldn't inherit from ACE_Stream: - - 1. There are operations on ACE_Stream that don't make any sense - on ACE_UPIPE_Stream (e.g., link(), unlink()). - - 2. ACE_Stream isn't really designed to be subclassed (e.g., - it doesn't have virtual methods). - - 3. Not inheriting makes the interface cleaner, e.g., we now use - send() and recv() methods consistently, rather than - send_msg()/put() and recv_msg()/get(). - - 4. The return values from the I/O methods are now more - consistent than they were before. - - * ace/Message_Block: The signature for the copy() method was - incorrect. It should have been copy (const char *, .....) - rather than copy (char *, ....). - - * examples/IPC_SAP/UPIPE_SAP: Together with Prashant, fixed up the - ACE_UPIPE_Stream tests so they more cleverly - (and correctly) utilize and illustrate various ACE concurrency - features. - -Sat Jul 6 18:28:55 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Stream.cpp: Fixed some obscure bugs with Stream::unlink() - and Stream::link(). These bugs were triggered by the - ACE_UPIPE_Stream tests. We need to make sure that we don't have - race conditions in the order in which ACE_UPIPE_Stream close() - down. Prashant and I fixed this problem by (1) adding a lock to - unlink() and link() and then creating unlink_i() and link_i() to - perform the work and (2) being more careful about trying to - unlink our side and the other side of a linked Stream. - - * ace/config-linux.h: According to Istvan Buki - , Linux now supports the - send_msg()/recv_msg() system calls, as well as UNIX domain - sockets. Therefore, I've updated the config-linux*.h file to - remove the existing restrictions. If this turns out not to be - the case, please let me know. - - * ace/LSOCK.cpp (recv_handle): Added a change to some casts to - make ACE compile with Linux. Thanks to Istvan Buki - for reporting this. - - * apps/Gateway/Gateway/File_Parser.cpp (readword): Removed - yet another use of: - - for (int x; foo(x); ) - { - } - - x = 10; - - Which is now a deprecated feature of C++. - - * include/makeinclude: added the -lw library to the GNU G++ - platform*.GNU file in order to pick up the wide-character string - functions. - -Fri Jul 5 18:11:44 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Re-released version 4.0.26 for testing. - - * ace/CORBA_Handler.cpp (activate_service): Revised the code to - use the Orbix macros for TRY/CATCH rather than try/catch. We - need this to make legacy code work! Thanks to Irfan for - pointing this out. - - * ace/Thread_Manager: Fixed a bunch of typos that grelims snuck - in. Thanks to Jack Erickson for reporting this. - - * examples/IPC_SAP/TLI_SAP/ftp-server.cpp: Fixed some typos that - were causing problems on AIX. Thanks to Greg Wilson - for reporting this. - - * examples/Reactor/Misc/test_time_value.cpp (operator<<): Added a - "const" in front of the ACE_Time_Value & in order to make things - work correctly on AIX. Thanks to Greg Wilson - for reporting this. - - * ace/SPIPE_Acceptor: Fixed some missing "returns" that had sprung - up in the #else arm of the SPIPE code. Thanks to Greg Wilson - for reporting this. - - * apps/Synch-Benchmarks/Benchmark: Fixed a typo that was causing - the application to fail to compile on AIX. Thanks to Greg - Wilson for reporting this. - - * Changed all uses of virtual int init (int, char **) to virtual - int init (int, char *[]) to workaround bugs with MSVC++... - - * ace/OS.h: for POSIX pthreads, changed the definition of the - THR_SCOPE_SYSTEM macro so that it has the same value as - THR_BOUND. If this isn't done, then things don't quite work - right when we implement the ACE_OS::thr_create() wrapper. - -Thu Jul 4 13:17:35 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Thread_Manager: Added a new method called thr_self() that - *does* return a real handle that can be used by - WaitForMultipleObjects, etc. Note that this new approach - cleverly caches this handle in TSS in order to cut down on - search time. Thanks to Jesper for pointing this technique out. - - * ace/OS.i (thr_self): After receiving comments from Jesper, undid - the earlier change today that was returning a duplicated handle - for ACE_OS::thr_self(). It turns out this is a bad idea because - the handle most typically doesn't get released, which leads to - handle leaks. - - * ace/Thread_Manager: Added a new private method called - check_state(). This method extends existing code to be smarter - about how we check to see what "state" (e.g., suspended, - cancelled, etc.) a thread is in. The original code - (which was a macro called ACE_CHECK_STATE) didn't behave - correctly if we asked about the state of a thread that was - different from ourselves! - - * ace/Thread: Modified the public interface to - ACE_Thread::spawn_n() so that it now takes a void *stack[] and - size_t stack_size[]. If stack != 0 it is assumed to be an array - of n pointers to the base of the stacks to use for the threads - being spawned. Likewise, if stack_size != 0 it is assumed to be - an array of n values indicating how big each of the - corresponding stacks are. This is useful since now we can spawn - a group of threads each of which has its own custom stack and/or - stack size. Thanks to Ashish Singhai - for pointing out the need for - this. - - * apps/Synch-Benchmarks: Updated the Synch benchmarks so that most - of them work again. The trick is *not* to use ACE_OS::sleep () - (which doesn't seem to be thread-friendly...) but instead to use - ACE_OS::select() as a timer. - - * man: updated the manual pages and html pages to reflect all the - recent changes. - - * ace/Malloc_T.cpp (open): Added a check to make sure that if - init_acquire() fails we don't let this go by undetected... - Thanks to Karlheinz for pointing out the need for this. - - * ace/OS.i (thr_getconcurrency): Fixed a subtle bug with the - ACE_OS::thr_getconcurrency() function. I was mistakenly using - ACE_ADAPT_RETVAL for the result of ::thr_getconcurrency(), which - is clearly wrong! - - * ace/Service_Record.cpp (remove): Fixed a typo that was causing - the removals of Modules in a dynamically configured Stream to go - into infinite loops. - - * ace/OS.i (thr_self): Modified the ACE_OS::thr_self (hthread_t &) - function so that it will return a *duplicate* of the current - thread's pseudo-handle returned by GetCurrentThread(). This - change is necessary because the pseudo-handle returned by - GetCurrentThread() is pretty useless (e.g., it can't be used by - any other thread to "wait" for this thread to exit). This new - behavior is used in the examples/Reactor/ReactorEx test program. - - * ace/Service_Config.cpp: I'd forgotten to assign the - delete_svc_rep_ flag when dynamically allocating the svc_rep_. - This is fixed now. - -Wed Jul 3 20:09:44 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Added a new subdirectory called $WRAPPER_ROOT/tests that - contains the first phase of the ACE regression tests. - - * ace/Reactor.cpp (check_handles): Fixed an earlier fix with the - ACE_Reactor::wait_for_multiple_events() method. The earlier fix - had changed the exit condition of do/while loop to be - - while (nfound == -1 && this->handle_error () >= 0); - - However, this was causing signal handling to break... - Therefore, the right fix is to keep the exit test as: - - while (nfound == -1 && this->handle_error () > 0); - - and instead fix handle_errors() so that it returns 1 if we're - able to fix a bad handle... Thanks to Prashant and Irfan for - tracking this down. - - * ace/OS: Finally broken down and added a new pair of ACE_OS - functions called "last_error()". These basically call - SetLastError/GetLastError on Win32 or they set/get errno on - UNIX. - - * ace/config-linux.h: Fixed an annoying problem with - struct msghdr in Linux by adding - - #define msg_accrights msg_control - #define msg_accrightslen msg_controllen - - to the config-linux*.h files. Thanks to Michael R"uger - for suggesting this. - - * ace/SOCK_IO.cpp (recv): Fixed a "bug" where - ACE_SOCK_IO::{send,recv} allocates with: - - iovec *iovp = new iovec[total_tuples]; - - But deletes with: - - delete iovp; - - Thanks to the ever vigilant James Mansion - (mansionj@lonnds.ml.com) for noticing this. - -Tue Jul 2 23:48:38 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * ace/Service_Config.h: Added ReactorEx to the singleton resources - that the Service_Configurator holds. This includes accessors, - destruction hooks, and event loop methods. - - * examples/Reactor/ReactorEx/README: There is a new example - application for the ReactorEx. Please check out - examples/Reactor/ReactorEx/README for details. - -Tue Jul 2 18:43:12 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * Released version 4.0.25 for testing. - - * examples/ASX/Message_Queue/priority_buffer.cpp: Added a new test - program that illustrates the use of the new Message_Queue - priority scheme. - - * ace/Message_Queue: Added new support for prioritized message - enqueueing into the ACE_Message_Queue. Now, when an application - uses ACE_Message_Queue::enqueue() the new Message_Block is - inserted into the queue according to its msg_priority(). When - dequeue_head() is used the item retrieved will then be the item - of "highest priority" (priorities range from 0 to MAX_LONG). - Note that the semantics of the existing enqueue methods, - enqueue_head() and enqueue_tail(), remain unchanged. - - * ace/Message_Block: Changed the type of the priority in a message - block to u_long rather than u_char. This gives us a much - greater range of priorities! - -Mon Jul 1 01:12:08 1996 Douglas C. Schmidt (schmidt@tango.cs.wustl.edu) - - * ace/Thread.h: Changed a couple of mistyped comments. Thanks - to the eagle eyes of Andres Kruse for noticing this. - - * ace/OS: added more comprehensive support for UNICODE to - both the Win32 and UNIX OS adaptation layer. This new - support automagically selects the appropriate implementation - (i.e., either char * or wchar_t *) for the string comparison - routines (which are used in places like ACE_Mem_Map). - - * ace/Service_Config: Split up the ACE_Service_Config::close() - method into two parts: close_svcs() and close_singletons(). - This makes it possible to remove svc.conf services without - destroying Singletons like the Proactor, Reactor, etc. Thanks - to Karlheinz for recommending this. - - * ace/Service_Config: Added flags for remembering who created the - Singleton Proactor, Allocator, Thread_Manager, and - Service_Repository (in addition to the Reactor, which I did last - week). If we created these Singletons, then we are responsible - for freeing them up. Thanks to Karlheinz for pointing out the - need for this. - -Mon Jul 1 16:26:27 1996 Prashant Jain (pjain@merengue.cs.wustl.edu) - - * ace/Connector.cpp: Added two new arguments to connect () namely, - "int flags" and "int perms". The Connector can now pass these - two arguments to its template arguments (e.g., SOCK_Connector, - SPIPE_Connector, etc.) when calling their connect() method. A - consequence of doing this was that we had to modify the - signature of the connect() method on some of the IPC_SAP classes - (e.g., TLI_Connector, SOCK_Connector, and LSOCK_Connector). - Note that these changes may break some existing code, - particularly with TLI_Connector (see below), so beware... - - * ace/TLI_Connector.cpp: Changed the order of the connect() - arguments to be more consistent with the rest of the IPC_SAP - classes used with the Connector. Please note that existing - examples which use TLI_Connector may need to be modified as a - result of this change. - - * ace/OS.i (open): Modified ACE_OS::open() to use the argument - perms to turn the flag FILE_FLAG_OVERLAPPED on and off for - Win32. - - * ace/Service_Config.cpp (end_proactor_event_loop): Added new - methods run_proactor_event_loop() and end_proactor_event_loop() - which call handle_events on the Proactor. - -Mon Jul 1 02:15:34 1996 Tim H. Harrison (harrison@lambada.cs.wustl.edu) - - * ace/Proactor.h: Made ACE_Proactor an ACE_Event_Handler so that - it can be registered with the ACE_ReactorEx. ACE_Proactor - associates the same global HANDLE with every overlapped I/O - operation. This global HANDLE can be registered with the - ACE_ReactorEx. Therefore, by using the - ACE_Proactor::handle_signal method as an adapter, we can now - dispatch overlapped I/O and other "waitable" objects from a one - ACE_ReactorEx running in a single thread of control. Thanks to - James Mansion for setting us on the - right path! - - * ace/ReactorEx.h: Added a ACE_ReactorEx to encapsulate Win32 - WaitForMultipleObjects(). The ACE_ReactorEx handle_events() - method calls ACE_Event_Handler::handle_signal when the - corresponding Win32 HANDLE becomes signaled. This gives us a - uniform abstraction for dispatching all "waitable" objects on - Win32, including events related to I/O completion ports and - events related to other forms of NT synchronization (such as - mutexes, semaphores, threads, etc.). - - * ace/Timer_Queue.h (calculate_timeout): Added a calculate_timeout - method to ACE_Timer_Queue. Also removed the same method from - ACE_Reactor. This is so Reactor, ReactorEx, and Proactor can - all reuse the calculations required by the Timer_Queue without - duplicating code. diff --git a/ChangeLogs/ChangeLog-97a b/ChangeLogs/ChangeLog-97a deleted file mode 100644 index 161d4746d2d..00000000000 --- a/ChangeLogs/ChangeLog-97a +++ /dev/null @@ -1,9203 +0,0 @@ -Thu Jul 3 20:36:19 1997 Nanbor Wang - - * performance-tests/Misc/childbirth_time.cpp: Changed the - parameter type of "Profiler" from int to size_t to make g++ - happy. - -Thu Jul 03 20:03:18 1997 David L. Levine - - * ace/Reactor.cpp (remove_handler): added ACE_UNUSED_ARG - when NSIG != 0. - -Wed Jul 2 23:41:43 1997 Nanbor Wang - - * performance-tests/Misc/childbirth_time.cpp: Fixed some typos. - -Wed Jul 2 23:13:10 1997 Douglas C. Schmidt - - * performance-tests/Misc/childbirth_time.cpp: Revised the - code to use ACE programming style. - -Wed Jul 02 23:02:24 1997 Douglas C. Schmidt - - * ACE version 4.2.15, released Wed Jul 02 23:02:24 1997. - -Wed Jul 2 22:23:49 1997 Douglas C. Schmidt - - * ace/Service_Config.cpp: Used the new ACE_LACKS_UNIX_SIGNALS - macro to reduce the #ifdef complexity somewhat. - - * ace/config-{chorus,win32-common}.h: Added #define for - ACE_LACKS_UNIX_SIGNALS. - - * ace/OS.h: If a platform (e.g., Chorus) doesn't support signals - then #define NSIG 0. - - * ace/Reactor.cpp: Chorus does not support signals. Make the call - to register/remove_handler(sig_set, evnet_handler) return - succesfully so that some of the examples and test programs do - not need to be changed. Thanks to Wei Chiang for this. - - * ace/config-chorus.h: Added a new macro for - ACE_LACKS_NAMED_POSIX_SEM to handle Chorus. Thanks to Wei - Chiang for this. - - * ace/OS.i: Define macros ACE_PTHREAD_CLEANUP_* so that the - related code does not need to be surrounded with #ifdefs. - Thanks to Wei Chiang for this. - - * ace/OS.i: Chorus does not support named semaphores. The code - that to do with names in sema_init() and sema_destory() is - therefore disabled. Thanks to Wei Chiang for this. - - * ace/config-chorus.h: Added support for ACE_LACKS_PTHREAD_CLEANUP - and ACE_HAS_POSIX_SEM to the Chorus port. Thanks to Wei Chiang - for this. - -Wed Jul 2 17:37:09 1997 Douglas C. Schmidt - - * ace/Hash_Map_Manager.cpp: Clarified the behavior of close_i() a - bit more. - -Wed Jul 2 09:54:36 1997 Douglas C. Schmidt - - * ace/Hash_Map_Manager.cpp: Fixed a couple more size_t->u_long - conversions for ACE_Hash_Map_Manager::hash(). This didn't harm - anything but it's good to be consistent. - -Wed Jul 2 16:46:59 1997 Nanbor Wang - - * performance-tests/Misc/childbirth_time.cpp: Added this program - to measure child process/thread creation mechanisms on various - platforms. Native thread creation test only supports Solaris - and NT threads so far. But you can still use ACE_OS::thr_create - method on your platform if not supported. - -Wed Jul 2 15:59:53 1997 Darrell Brunsch - - * ace/High_Res_Timer.cpp: Created a function get_registry_scale_factor - that finds out the speed of the processor using the NT registry (in - megahertz). This means that ACE_High_Res_Timers should automatically - get the correct scale factor. - - * tests/Timer_Queue_Test.cpp: Removed the call to - get_env_global_scale_factor(). - -Wed Jul 2 15:39:33 1997 Tim H. Harrison - - * ace/Process.cpp: Modified spawn to check for the NO_EXEC - flag after forking on UNIX. If it's set, spawn returns the - child pid without exec'ing. Updated the NT version to - always return the child pid on success. - -Wed Jul 02 10:55:23 1997 David L. Levine - - * tests/SPIPE_Test.cpp,UPIPE_SAP_Test.cpp: tweaked the static - functions a bit to avoid warnings about unused statics on VxWorks. - -Wed Jul 02 00:16:07 1997 Douglas C. Schmidt - - * ACE version 4.2.14, released Wed Jul 02 00:16:07 1997. - -Tue Jul 1 22:49:58 1997 Douglas C. Schmidt - - * ace/Strategies_T.h: Changed the return value of all the hash() - methods to be u_long. - - * tests/Map_Manager_Test.cpp (hash): Changed the return value of - all the hash() methods to be u_long. - - * ace/SString.cpp: Changed the return value of all the hash() - methods to be u_long. - - * ace/Hash_Map_Manager: Changed the return value of hash() - to return a u_long in order to (1) be consistent with - the return value of hash_pjw() and (2) give the maximal - range for the hash function. Thanks to Marina Spivak - for reporting this. - -Tue Jul 01 14:47:22 1997 David L. Levine - - * ace/High_Res_Timer.{h,i} (gettime): use gettime () static function - to wrap all calls to ACE_OS::gethrtime (). On ACE_WIN32, if the - global scale factor has not been set, then gettime () uses - ACE_OS::gettimeofday () instead of ACE_OS::gethrtime (), because - gettimeofday doesn't need the scale factor. - -Mon Jun 30 17:28:53 1997 Douglas C. Schmidt - - * Makefile (RELEASE_FILES): Removed the rpc++ directory from the - main release since this doesn't seem to be widely used and the - GPL copyleft confuses people. - -Mon Jun 30 15:08:04 1997 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: added -lgcc - to LDFLAGS. - -Mon Jun 30 12:00:02 1997 Douglas C. Schmidt - - * ACE version 4.2.13, released Mon Jun 30 12:00:02 1997. - -Sat Jun 28 08:27:27 1997 David L. Levine - - * ace/OS.h: added definitions of ACE_SHLIB_HANDLE and - ACE_DEFAULT_SHLIB_MODE on platforms other than - ACE_HAS_SVR4_DYNAMIC_LINKING and hpux. - - * ace/OS.i: split definitions of ACE_OS::cond_* member - functions into two: for ACE_WIN32/VXWORKS and all others. - That allows us to break the circular dependencies between - those functions and the ACE_OS::sema_* member functions. - - * ace/Svc_Conf_y.cpp: commented out unused args and wrapped - assignments in "if" conditionals with parenthesis to avoid - g++ warnings. - - * ace/{ACE,INET_Addr,OS}.cpp (VxWorks only): added ACE_UNUSED_ARG - calls. - - * ace/Parse_Node.cpp (ACE_Stream_Node,ACE_Dynamic_Node,ACE_Dummy_Node - constructors): reordered initializers to match declaration order. - - * ace/Profile_Timer.h (elapsed_time): commented out unused arg "et". - - * ace/Read_Buffer.cpp (rec_read): initialized local variable "c" to - make sure that it is always defined before use. - - * ace/SPIPE_Acceptor.cpp (remove): don't declare local variable - "result" if ! ACE_HAS_STREAM_PIPES, because it's not used in - that case. - - * ace/config-vxworks5.x-g++.h: added ACE_LACKS_IOSTREAM_FX, - ACE_LACKS_LINEBUFFERED_STREAMBUF, and ACE_LACKS_SIGNED_CHAR. - - * ace/IOStream_T.h (ipfx): comment out unused variable "need". - - * platform_vxworks5.2_g++.GNU: added -Wall now that the ACE library - builds cleanly with it. - - * platform_vxworks5.x_g{++,hs}.GNU: renamed 5.x instead of 5.2. - - * netsvcs/lib/Token_Handler.cpp: reordered initializers to match - declaration order. - - * tests/SV_Shared_Memory_Test.cpp: moved template specializations - so that they're not done on platforms that don't support SV IPC. - - * examples/IOStream/client/iostream_client.cpp, - examples/IOStream/server/iostream_server.cpp: - use ACE_HAS_STRING_CLASS rather than __GNUC__ to determine whether - the platform has a String class. - -Fri Jun 27 13:10:46 1997 Douglas C. Schmidt - - * ace: Changed the name of config-vxworks5.2-g++.h to - config-vxworks5.x-g++.h since it works with 5.2 and 5.3. - - * examples/Mem_Map/IO-tests/IO_Test.cpp: Fixed some bugs that were - preventing this from running correctly. - -Fri Jun 27 13:37:37 1997 Steve Huston - - * ace/Svc_Conf.y: Finished the sanity checks started below. - -Fri Jun 27 11:55:13 1997 Darrell Brunsch - - * ace/Timer_Queue_T.cpp: added a check for an empty queue in expire - -Fri Jun 27 07:53:58 1997 David L. Levine - - * tests/Message_Queue_Notifications_Test.cpp (handle_output, - handle_exception,main): added ACE_UNUSED_ARG (fd) to avoid - compilation warnings about unused arguments. - -Fri Jun 27 01:08:54 1997 Douglas C. Schmidt - - * ace/Connector.cpp (create_AST): Replaced the gratuitous #ifdef - for ACE_WIN32 and EXCEPT_MASK with the new CONNECT_MASK. This - is much cleaner! - - * ace/Event_Handler.h: Added a new CONNECT_MASK that defaults to - READ_MASK | WRITE_MASK (with | EXCEPT_MASK thrown in for Win32). - Thanks to Irfan for this suggestion. - -Thu Jun 26 19:53:11 1997 Nanbor Wang - - * ace/OS.i (strtok_r): Added check on a null string so we won't go - past the end of a string. - - * performance-tests/Misc/context_switch_time.cpp (main): Added - get_env_gloval_scale_factor() at the very beginning so that high - resolution timer can return correct time in millisecond. - -Thu Jun 26 15:29:55 1997 Darrell Brunsch - - * tests/Timer_Queue_Test.cpp: Changed the random scheduling to use - past times instead of future time. This should fix some unusual - behavior of this test. Thanks to Gonzalo A. Diethelm - for reporting this. - -Thu Jun 26 12:38:16 1997 Douglas C. Schmidt - - * ACE version 4.2.12, released Thu Jun 26 12:38:16 1997. - -Thu Jun 26 01:11:10 1997 Douglas C. Schmidt - - * ace/Svc_Conf.y: Added some sanity checks to make sure we don't - segfault when things go wrong during the svc.conf file parsing. - Thanks to Steve Huston for this suggestion. - -Thu Jun 26 08:36:37 1997 David L. Levine - - * Makefile: fix UPTODATE check (for release target) by not - running it in a sub-shell. Also, added ACE-lessons.html - to RELEASE_FILES. - - * performance-tests/Misc/context_switch_time.cpp: use same priority - values on Win32 platforms as on Solaris, because thread priority - increases with increasing priority values on both of those platforms. - -Thu Jun 26 01:34:46 1997 Nanbor Wang - - * performance-tests/Misc/misc.{mak,mdp}: Added makefile for NT. - - * ace/{FILE,DEV}.{h,i}: Added the disable(int signum) function to - prevent NT from disabling a FILE/DEV using socket calls. - -Wed Jun 25 12:59:00 1997 - - * ace/Synch_T.h (ACE_SYNCH_PROCESS_MUTEX and - ACE_SYNCH_NULL_MUTEX): Added new template typedef to the list. - - * tests/Message_Queue_Notifications_Test.cpp: New test for - demonstrating notification qualities of Message_Queue. - - * ace/Strategies.h: Added accessors to these classes to make them - more usable. - -Wed Jun 25 10:47:34 1997 Steve Huston - - * ace/Parse_Node.cpp: Insure that ACE_Object_Node::symbol(void) - returns 0 if the underlying shared library can't be loaded. - - * ace/OS.h: Added a new type, ACE_SHLIB_HANDLE to allow dynamic - linking using correct types on all platforms that support it. - Also added a const ACE_SHLIB_DEFAULT_MODE for the 'mode' argument - when doing a dlopen-like operation. - Moved the ACE_OSCALL_* macros to this file from OS.i - - * ace/OS.i: Moved ACE_OSCALL_* macros out of here and into OS.h. - Added support for dlopen/close/sym/error on HP-UX. Note - the - Service_Configurator tests do not run yet on HP - I'm working on - that. - - * ace/Service_Record.{h, i, cpp}: Use new ACE_SHLIB_HANDLE type for - dynamic loading operations. - - * ace/Parse_Node.{h, cpp}: Use new ACE_SHLIB_HANDLE where appropriate. - - * ace/Strategies_T.cpp: Use new ACE_SHLIB_HANDLE type. - -Wed Jun 25 02:36:05 1997 Nanbor Wang - - * ace/OS.i (gmtime_r): Modified the implementation of gmtime_r - when OS doesn't provide one. Notice that the implementation - only simulate the semantic and is not thread-safe. - - * ace/OS.h: Moved definition of ACE_SHLIB_HANDLE typedef and - ACE_DEFAULT_SHLIB_MODE global variable for Win32 to where it - belongs. - - * ace/OS.i: Changed the return type of dlopen() when ACE_HAS_UNICODE to - ACE_SHLIB_HANDLE. - - * ace/OS.{h,i}: Moved ACE_OSCALL and ACE_OSCALL_RETURN for WIN32 - from OS.i to OS.h. - -Wed Jun 25 01:23:58 1997 Nanbor Wang - - * ace/OS.i (strtok_r): Modified the implementation when OS does - not provide reentrant strtok_r so that our imp. comforms with - the semantic of strtok_r (). - -Wed Jun 25 00:37:56 1997 Douglas C. Schmidt - - * ACE version 4.2.11, released Wed Jun 25 00:37:56 1997. - -Tue Jun 24 21:30:53 1997 David L. Levine - - * ace/Svc_Conf_y.cpp: commented out unused args and wrapped - assignments in "if" conditionals with parenthesis to avoid - g++ warnings. - -Tue Jun 24 18:15:46 1997 Nanbor Wang - - * ace/Reactor.cpp (wait_for_multiple_events): Modified the way to - manipulate timeout value so that we can differentiate when there - are timeout events to be handle from no timer and we want to - wait indefinitely. - -Tue Jun 24 16:52:22 1997 David L. Levine - - * ace/OS.h: reverted ACE_hrtime_t to unsigned __int64 with VC++. - This might break something, but we need to know what. - -Tue Jun 24 16:38:52 1997 Darrell Brunsch - - * Added Visual C++ 5.0 specific workspace (.dsw) and project (.dsp) - files to both the ace and tests subdirectory. ACE.DSW in the root - directory contains all the project files, so a batch build should - be able to build all the project files. - -Tue Jun 24 14:27:47 1997 Darrell Brunsch - - * ace/Timer_{Hash,Heap,List,Wheel}_T.cpp: Changed cancel (type..) - to call cancellation() even if there are no timers to cancel. - This causes the correct behavior of calling handle_close () - during expire when handle_timeout() returns -1. Thanks to - Hamutal Yanay for - pointing this out. - - * tests/Timer_Queue_Test.cpp: Updated to correctly test this. - -Tue Jun 24 13:02:51 1997 David L. Levine - - * ace/SString.h (ACE_SString ctor): changed "allocator" to "alloc". - Thanks to Brian Mendel for reporting this. - -Tue Jun 24 12:58:28 1997 James C Hu - - * include/makeinclude/platform_irix6.4*: Shuts up useless warnings - about multiply defined template instances. - -Tue Jun 24 12:50:52 1997 Douglas C. Schmidt - - * ACE version 4.2.10, released Tue Jun 24 12:50:52 1997. - -Tue Jun 24 00:44:30 1997 Nanbor Wang - - * ace/SPIPE.{h,i}: Added the disable(int signum) function to - prevent NT from disabling an SPIPE using socket calls. - -Mon Jun 23 22:14:39 1997 Douglas C. Schmidt - - * ace/Svc_Conf*: Changed the name of the YYSTYPE field - ACE_Static_Node_ to static_node_ to be consistent with the other - fields. - -Mon Jun 23 18:28:55 1997 David L. Levine - - * ace/ACE.cpp: added auto_basic_array_ptr specialization. - - * ace/Service_Config.cpp, tests/Future_Test.cpp, - examples/Threads/future[12].cpp: added auto_basic_ptr - specializations. - - * include/makeinclude/platform_vxworks5.2_g++.GNU: - reworked to supported different targets, instead of only PowerPC. - -Mon Jun 23 16:06:35 1997 James C. Hu - - * ace/OS.i: Moved definition of sema_* methods to follow cond_* - methods to remove compiler warnings on SGI. - -Mon Jun 23 09:42:08 1997 Darrell Brunsch - - * tests/Timer_Queue_Test.cpp: added testing for cancellation - during expire (when of handle_timeout() in an event handler - returning -1). - -Mon Jun 23 09:18:39 1997 David L. Levine - - * Makefile: added up-to-date check for "make release" from - /project/adaptive/ACE_wrappers. Also, "make release" now - adds release entry to latest ChangeLog. - - * ace/Makefile: build shared library before static library. - This appears to fix a problem with Sun C++ 4.{1,2} possibly - related to its template instantiation scheme. If the - static library is built first, then .shobj/Reactor.so - and .shobj/Timer_Hash.so (and possibly others) fail to - build due to ACE_TimeValue::normalize () "relocations remain - against allocatable but non-writable sections". - Thanks to Steve Huston and - Satoshi Ueno for reporting this, and - to Satoshi for verifying the fix. - - * ace/ACE.cpp (terminate_process): removed used of - ACE_OSCALL_RETURN macro because its defined in OS.i, and so - not available if inlining is disabled. - - * ace/Auto_Ptr.{h,i}: made "p_" protected instead of private - so that it can be accessed with the new class arrangement. - Also, made the auto_array_ptr operator-> const. - - * ace/Sched_Params.cpp (previous_priority, VxWorks only): - removed ACE_UNUSED_ARG (policy) because policy is used in - this function. - - * netsvcs/lib/TS_Clerk_Handler.cpp (parse_args): wrapped TCHAR - argument to sizeof in parenthesis. - -Mon Jun 23 09:12:04 1997 Nanbor Wang - - * ace/Auto_Ptr.i (auto_array_ptr): Fixed a typo. - -Mon Jun 23 08:03:46 1997 Darrell Brunsch - - * ace/Auto_Ptr.h: changed inheritance of auto_basic_array_ptr in - auto_array_ptr to include the template parameter X. - - * ace/IOStream_T.i: removed default parameter in the definition - of ACE_Streambut_T::recv_n() and ACE_SOCK_Dgram_SC::recv_n() - -Mon Jun 23 01:13:15 1997 - - * ace/OS.cpp (fork_exec): Fixed the usage of ACE_WIDE_STRING. - - * test_registry_iterator.cpp (main): Fixed the usage of - ACE_WIDE_STRING. - - * netsvcs/lib/TS_Clerk_Handler.cpp (parse_args): Fixed the usage - of ACE_WIDE_STRING. - - * ace/Auto_Ptr.h: Added support for basic types by seperating the - auto_ptr classes into two. One that requires the -> operator - support and the other that does not. The former inherits from - the latter. - - * ace/{FILE,DEV,SPIPE}_Addr.h: Added support for multibyte and - wide character addr_to_string and string_to_addr functionality. - - * ace/Connector.cpp && ace/Acceptor.cpp (info): Fixed sizeof bug. - - * examples/Connection/blocking/SPIPE: Added UNICODE support for - this example. - - * ace/OS.h: Added new macro ACE_MULTIBYTE_STRING. - - * ace/ACE.cpp (terminate_process): Fixed unused args errors. - -Sun Jun 22 09:58:36 1997 Douglas C. Schmidt - - * Released version 4.2.9 for testing. - - * ace/Log_Msg.cpp (open): Changed the use of ACE_LOG_MSG-> within - the open() method to use this-> in order to avoid deadlocks. - Thanks to Per Andersson for reporting this. - - * ace/ACE.cpp: Changed the use of __SVR4 and __unix to sparc and - unix to work better with various UNIX environments. Thanks to - Michael R. MacFaden for these changes. - - * ace/Handle_Set.cpp (count_bits): Added special code to handle - the case where fdmask is typedef'd as a long rather than an int. - Thanks to Eric Newton and James Johnson for - reporting this. - - * ace/IOStream.h: Changed the name of QuotedString to - ACE_Quoted_String to be consistent with the ACE naming scheme. - Thanks to James Johnson for suggesting this. - - * ace/IOStream_T.i: Added this new file to split off the inlined - code from the header file. - - * ace/ACE.cpp (terminate_process): Remove the - ACE_UNUSED_ARG(signum) from terminate_process(). Thanks to Wei - Chiang for reporting this. - -Sun Jun 22 17:19:18 1997 David L. Levine - - * examples/Threads/process_manager.cpp (main): replaced call to - kill with terminate. - -Sat Jun 21 10:48:34 1997 Douglas C. Schmidt - - * examples/Reactor/FIFO: Added a new example that illustrates - how the Reactor and the FIFO wrappers work together. Thanks - to Johannes Gutleber for sending - this. - - * tests/Time_Service_Test.cpp (main): Replaced the kill() call - with the terminate() call since kill() isn't portable across - platforms. - - * ace/Process: The kill() method on this class was being used - incorrectly. I've created a new method called terminate() that - terminates the process. - - * ace/Process_Manager: Renamed the kill() method to terminate() - and updated the implementation to use the new - ACE::terminate_process() call. - - * ace/ACE: Moved the incorrect Win32 and Chorus implementations of - ACE_OS::kill() and put them in a new static method called - ACE::terminate_process(). - - * ace/ACE: Changed the name of the is_process_active() to the - more concise process_active(). - - * ace/OS.i: Added an implementation of ACE_OS::kill() for Chorus. - Note that this doesn't behave as UNIX does -- it kills the - process id rather than sending a signal! Thanks to Wei Chiang - for these fixes. - - * examples/Reactor/Misc/notification.cpp: Added patches to run - this example under Chorus. Thanks to Wei Chiang - for these fixes. - - * ace/Connector.cpp (create_AST): Changed the order of some - instructions in Connector::create_AST method to make it more - safer to use in multi-thread environment. Thank to Paul Han - for reporting the problem and the fix. - - * ace/Connector.cpp (create_AST): Make sure to pass in the "mask" - when calling remove_handler() so that we get the right set of - bits removed from the Reactor. - - * tests/Reactor_Timer_Test.cpp (class Time_Handler): Changed int - to long to avoid type conversion problems on 64 bit SGI. Thanks - to Fred LaBar for reporting this. - - * examples/Reactor/FIFO: Added a test program to illustrate the - interaction of the ACE Reactor with the FIFO IPC mechanism. - Thanks to Johannes Gutleber for this - test. - - * examples/Reactor/Misc/pingpong.cpp: Added support for Chorus. - Thanks to Wei Chiang for this. - - * ace: Added a number of minor changes to signal assignment - code so that ACE will compile with Tandem NonStop. Thanks - to Jan Perman for these fixes. - - * ace/config-tandem.h: Added a new config file for the - Tandem NonStop-UX 4.2MP platform. Thanks to Jan Perman - for contributing this. - - * include/makeinclude/platform_tandem.GNU: Added a new platform - file for the Tandem NonStop-UX 4.2MP platform. Thanks to - Jan Perman for contributing this. - - * ace/config-unixware-2.1.2-g++.h: Added a new config file for - UNIXWARE 2.1.2. Thanks to Ganesh Pai (gpai@voicetek.com) for - contributing this. - - * include/makeinclude/platform_unixware_g++.GNU: Updated the - UNIXWARE platform config file to work for version 2.1.2. Thanks - to Ganesh Pai (gpai@voicetek.com) for contributing this. - - * ace/Handle_Set.cpp (count_bits): Added another 0xff mask to - prevent problems with sign extension on machines with 32 bit - ints and 64 bit longs. Thanks to James Johnson for reporting - this. - - * ace/OS.h: Updated all of the ACE_DEFAULT* macros in OS.h so that - they can be overridden by #defines in the config.h file. Thanks - to Chuck Gehr for suggesting this. - -Thu Jun 19 22:20:20 1997 David L. Levine - - * ace/OS.h (VxWorks/g++ only): added horrible hack to work around - mismatch of memcmp, etc., prototypes in . - - * ace/OS.i: reordered many function definitions to avoid use - before definition. Building with g++ 2.7.2 on VxWorks 5.3.1 - revealed them. - - * ace/config-vxworks5.2-g++.h: removed ACE_HAS_STRING_CLASS and - ACE_HAS_GNU_CSTRING_H, because those aren't distributed with - Tornado 1.0.1. - -Thu Jun 19 15:31:53 1997 Darrell Brunsch - - * ace/Timer_Wheel_T.cpp: Fixed problem with expire () not - expiring timers with a timeout of the current time. This was - causing problems with Timer_Queue_Test when high profile - timers were disabled (such as Windows NT when the - environment variable ACE_SCALE_FACTOR was undefined) - -Wed Jun 18 19:43:35 1997 David L. Levine - - * ace/Signal.cpp: 'removed "const" from #define of - ACE_MAX_SIGNAL_HANDLERS because it broke Irix 6.2 build. Thanks - to Gonzalo A. Diethelm for reporting this. - - * examples/Threads/task_four.cpp (Invoker_Task::svc): fixed typo, - n_tasks instead of ntasks. - -Wed Jun 18 11:25:14 1997 Nanbor Wang - - * examples/Threads/{task_four,token}.cpp: Changed the use of - cerr/cout to ACE_DEBUG macro. Thanks to Chuck Gehr - for pointing these out. - -Tue Jun 17 15:11:09 1997 David L. Levine - - * ace/config-sunos5.5-sunc++-4.x.h, - include/makeinclude/platform_sunos5_sunc++.GNU: support enabling of - exception handling via "exceptions=1" make flag. Exception handling - does seem to work with Sun C++ 4.2, even on MP machines, if patch - 104631-02 "C++ 4.2: Jumbo Patch for C++ 4.2 on Solaris SPARC" - is applied. Please beware that enabling of exception handling can - adversely affect peformance, even if the program doesn't use it. - So, we haven't enabled it by default. Thanks to Chris Cleeland - for suggesting not to enable it by default. - - * ace/IOStream.h: added #include of "ace/config.h" so that - ACE_LACKS_ACE_IOSTREAM can be checked. Thanks to Ganesh Pai - for reporting this problem. - - * ace/ACE.cpp (get_handle): use /dev/udp instead of /dev/ip on - SVR4 machines because it has other read permission by default - (on Solaris 2.x). - - * ace/ACE.cpp (get_ip_interfaces): use auto_array_ptr instead of - auto_ptr so that the array gets deleted properly, and zero it - out to avoid unitialized memory read reports from Purify. - - * ace/Timer_Hash_T.cpp (cancel): added "[]" to delete of timer_ids - array. Purify rules. - - * Timer_Queue_Test.cppc (test_performance): added "[]" to delete of - times array. Purify rules. - -Tue Jun 17 15:31:01 1997 Steve Huston - - * ace/ACE.cpp: Fixed get_ip_interfaces (and count_interfaces) to - work properly on HP-UX (and probably other similar UNIXes). Needed - to work with non-IP interfaces present, and fixed to copy the - IP address without the fudge factor being applied. - -Tue Jun 17 14:02:01 1997 Nanbor Wang - - * ace/{Free_List.h,Free_List.cpp,Timer_Queue_T.h}: Added #include - "ace/Synch_T.h" to Free_List.h and removed related inclusion - from Free_List.cpp and Timer_Queue_T.h. Thanks to - Jack Erickson for reporting this problem. - -Tue Jun 17 09:41:48 1997 David L. Levine - - * tests/Enum_Interfaces_Test.cpp: changed name of log file to match - the program name, so that the one-button test can easily find it. - -Tue Jun 17 04:58:38 1997 Nanbor Wang - - * ace/Timer_Queue_T.h: Added include file "ace/Synch_T.h" to avoid - compilation errors in SC 4.1. We didn't notice this because - most of us have moved to SC 4.2. Don't know why this didn't - cause any problem in SC 4.2. Thanks to Jack Erickson - for reporting this bug. - -Mon Jun 16 22:25:18 1997 Steve Huston - - * ace/ACE.cpp: Fixed conditional compiles to compile the - interface counting code for HP - it reports 0 interfaces, - so it needs more debugging still. - - * include/makeinclude/platform_hpux_aCC.GNU: added -g to link - command for building shared library. - - * tests/Buffer_Stream_Test.cpp: fixes to execute correctly and only - fail assertions on real failures. - -Mon Jun 16 19:05:13 1997 Steve Huston - - * ace/Free_List.cpp: added #include ace/Synch.h, needed by - Free_List.i. Fixes compile errors on HP-UX. - -Mon Jun 16 10:59:55 1997 Darrell Brunsch - - * ace/Timer_Wheel_T.cpp: Changed expire () so it doesn't - access past the end of an array when it finds nothing to - expire. Thanks to Norbert Rapp - for catching this. - -Sun Jun 15 03:44:21 1997 Nanbor Wang - - * examples/Threads/thread_specific.cpp (worker): Changed the - output of diagnostics from using cout to using printf. Also - corrected several portability problems. Thanks for Chuck Gehr - for pointing these out. - - * ace/OS.i (thread_mutex_trylock): Corrected the code for NT. Now - this function returns 0 if lock is obtained and -1 otherwise. - Thanks to Robert V. Head for noticing this. - - * performance-tests/Synch-Benchmarks/Synch_Tests.{mdp.mak}: - Added project workspace and makefile for NT to this directory. - - * performance-tests/Synch-Benchmarks/svc.conf: - * performance-tests/Synch-Benchmarks/{Options,Benchmark}.h: - * performance-tests/Synch-Benchmarks/*.cpp: Reworked these - files to have them compiled on NT. - -Sat Jun 14 03:53:13 1997 Nanbor Wang - - * performance-tests/Synch-Benchmarks/pipe_proc_test.cpp (class - Pipe_Proc_Test): Changed the type of pipe_handles[] from int to - ACE_HANDLE. - - * performance-tests/Synch-Benchmarks/sysvsema_test.cpp: When - creating the semaphore, explicitly cast the key value to (key_t) - since NT couldn't handle the conversion. - -Fri Jun 13 19:32:03 1997 Steve Huston - - * ace/ACE.cpp: Fixed count_interfaces to compile on non-SVR4 - systems such as HP-UX. Not tested yet. - - * ace/OS.i: Fixed mis-arranged conditional compile for HP-UX in - asctime_r. - -Fri Jun 13 03:13:51 1997 Nanbor Wang - - * ace/config-win32-common.h: Added a "pragma comment" directive to - direct MSVC to link in mswsock.lib automatically. Thanks to - Bill Tang for reminding this. - - * ace/ace.{mak,mdp}: Removed explicit inclusion of mswsock.lib. - Thanks to Bill Tang for reminding this. - - * examples/OS/Process/Process.{mdp,mak}: For some reasons, I got - an "unknown link error, please refer to documentation for - appropriate technical supports" when building this example on NT - (didn't help much, did it?) Reassigning the linked library - solved the problem. - - * examples/OS/Process/process.cpp: Updated class name - ACE_ProcessEX to ACE_Process because ACE_ProcessEX no longer - exists. Also, all exec'ed programs' absolute names have been - changed and let the environment variable "path" to decide which - program(s) to exec. - -Thu Jun 12 15:48:16 1997 Chris Cleeland - - * ace/ACE.cpp (get_ip_interfaces): Corrected code in the BSDish - section so that it at least compiles on Linux. I haven't tested - this AT ALL. - - * ace/Timer_Queue_T.cpp (calculate_timeout): When this was called - with the default argument from handle_events(), max_timeout was - passed as zero, which would cause a SEGV when attempts were made - to deref it. Added protection to simply return a zero ptr in that - case. - -Thu Jun 12 13:18:03 1997 Steve Huston - - * ace/OS.{h,i,cpp}: Changes for HP-UX 10 primarily. Threads - support for DCE Draft 4 threads (bundled with HP-UX 10). - Correct usage of reentrant C library functions for HP-UX. - - * ace/OS.i: Changed timeout argument to 2nd select function to - allow the compiler to pick a conversion operator. As it was, - HP compiler would not compile it. - - * ace/Service_Object.cpp: When deleting the service memory pointed - to by a void *, use "operator delete" rather than deleting a void, - which is prohibited by the current ANSI C++ draft. - - * ace/config-hpux-10.x.h: This is now a compiler-independent header - file, and is included by config-hpux-10.x-hpc++.h. This file - contains all correct settings for HP-UX 10.x, and compiler-specific - config files should use this - see config-hpux-10.x-hpc++.h. - - * ace/config-hpux-10.x-hpc++.h: New config file for either of the HP - compilers (HP C++ or HP aC++). It figures it out internally, and - uses config-hpux-10.x.h for OS details. - - * include/makeinclude/rules.lib.GNU: Allow for doing a PRELIB step - when building a shared library, and not using .shobj/*.so files. - This allows HP aC++ to close all template instantiations for the - entire library at once, rather than separately, reducing the - size of the resultant library significantly. - - * include/makeinclude/platform_hpux-aCC.GNU: build libraries with - templates instantiated all at once. Compile with flags for using - the reentrant versions of C library functions. - -Wed Jun 11 15:20:15 1997 Nanbor Wang - - * ace/Timer_Queue_T.{h,cpp} (calculate_timeout): Changed the - second parameter the_timeout from a ref. to a ptr. to a ptr in - order to avoid compilation warning. Since the pointer itself is - not modified within the function, it's ok to change this. - - * ace/Reactor.cpp (wait_for_multiple_events): Added ACE_Time_Value - the_timeout as a place holder for timeout value when - max_wait_time is NULL. Otherwise, - Timer_Queue::calculate_timeout won't process the timer queue - even it's not empty. - -Wed Jun 11 11:14:29 1997 James C Hu - - * include/makeinclude/platform_mvs.GNU (RANLIB): Requested change - from Check Gehr (gehr@sweng.stortek.com), RANLIB = echo - -Wed Jun 11 04:47:52 1997 Nanbor Wang - - * ACE.cpp (count_interfaces): Two bugs were corrected here. Both - were typo. - - * tests/Timer_Queue_Test.cpp: Added include file ace/Timer_Queue.h - -Tue Jun 10 16:02:52 1997 Darrell Brunsch - - * ace/SString.{h,cpp}: Changed the parameters in CString::substring() - and WString::substring(). Removed const and changed length to a - ssize_t because of signed/unsigned comparison warnings. - - * ace/ACE.cpp: Changed a loop variable in get_ip_interfaces() to - a size_t because of a signed/unsigned comparison warning. - -Tue Jun 10 12:47:49 1997 - - * ace/SString.cpp (operator = and operator +=): There were two - bugs here. operator= forgot to tack on the NULL terminator - after the memcpy() and operator+= appended the second string - incorrectly. Thanks to Michael R. MacFaden for - pointing these out. - -Tue Jun 10 12:16:04 1997 Darrell Brunsch - - * ace/Makefile: Updated to reflect newly added files - - * ace/Proactor.cpp: Removed template specializations. - - * ace/Reactor.cpp: Removed some template specializations. - - * ace/Timer_Hash.h: Added an include for Timer_Heap. - - * ace/Timer_Hash_T.cpp: Changed a reference to ACE_Timer_Node - to ACE_Timer_Node_T - - * ace/Timer_{Hash,Heap,List,Wheel}_T.h: Changed #include - "ace/Timer_{...}.h" to "ace/Timer_{...}_T.h". - - * ace/Timer_Queue.cpp: Removed some template specializations. - - * ace/Timer_Queue.h: Removed the including of Timer_Queue.cpp - since there are no templates to warrant it. - - * ace/Timer_{Hash,Heap,List,Wheel}.cpp: Added these and put the - appropriate template specializations here. - -Tue Jun 10 02:08:25 1997 Nanbor Wang - - * examples/Log_Msg/README: Revised. - - * examples/Log_Msg/test_log_msg.cpp: Revised program output so - that it's clearer to explain. - -Mon Jun 09 15:46:41 1997 - - * OS.i (mutex_lock): When WaitForSingleObject returns - WAIT_ABANDONED, the lock is held by the calling thread. - Therefore we must return 0 from the method. I have added a new - mutex_lock() method that takes an extra "abandoned" parameter. - This is set wehen the mutex is abandoned. Thanks to Dieter - Quehl for pointing this out. - -Mon Jun 9 02:31:36 1997 Nanbor Wang - - * tests/Sigset_Ops_Test.cpp (main): Comment out testing of invalid - sigset checking for most platforms don't seem to support it. - Perhaps the ACE's sigset* functions should remove this check for - compatibility. - -Sun Jun 8 11:39:06 1997 Douglas C. Schmidt - - * ace/OS.i (set): There was a typo here where - - ((long) (d - (double) l)) * 1000000 - - should be - - (long) ((d - (double) l) * 1000000) - - since otherwise the values are always 0. Thanks to Jim Crossley - for reporting this. - - * tests/Enum_Interfaces_Test.cpp (main): Changed ACE_UINT32 to - size_t to be consistent with the class definition. Thanks to - Nanbor Wang for reporting this. - - * ace/Token.h: Added some no-op method for ACE_Token so that it - will still compile even if ACE_HAS_THREADS isn't defined. - -Sun Jun 8 01:37:52 1997 Nanbor Wang - - * examples/Log_Msg/README: Added a README file. - - * tests/Sigset_Ops_Test.cpp (main): bug fixed. - - -Sat Jun 7 16:40:22 1997 Douglas C. Schmidt - - * ace/SString.h (string.): Added a substring() member function to - ACE_*String classes. Thanks to Michael MacFaden - for contributing this. - - * ace/ACE: Added a new method called - - int get_ip_interfaces(count, address_array) - - which will query the OS kernel for the IP addresses for each network - interface found and return a count and array of ACE_INET_Addr objects. - The reason for adding this method is that most client apps - assume gethostbyname(uname|gethostname)) will work. If the - nameservices is misconfigured/broken or the machine is multi-homed, - the client apps have alot of coding to do to figure out if an inteface - represents a local address or not. On UNIX, this includes - the loopback addr. On NT, the loopback addr is not added - (but may change the impl if others think this useful). - Thanks to Michael MacFaden for contributing - this. - - * ace/Synch[_T]: Changed all the classes so that internal instance - variables are now protected rather than private. This allows - greater flexibility if there's a need to subclass - (which shouldn't occur very much...). Thanks to - Reza Roodsari for suggesting this. - -Fri Jun 06 21:30:57 1997 David L. Levine - - * ace/Timer_{Hash,Wheel}_T.cpp: added #includes of - ace/High_Res_Timer.h. Also, in Timer_Wheel_T.cpp (cancel), - moved the declaration of "i" out of the loop because it's - used in two different loops. - -Fri Jun 06 17:11:13 1997 - - * OS.i (sleep): If ACE_POLL_IS_BROKEN is defined, use select() to - do micro second sleeps. - - * ace/CORBA_Handler.h (ACE_CORBA_*): The new version of Orbix - (2.2C01) on NT finally supports namespaces. So now the macros - ACE_CORBA_n need to be defined using the "::" and not the "_" - for NT if the new Orbix is being used. Thanks to John Morey - (jmorey@tbi.com) for the changes. - -Fri Jun 06 02:16:08 1997 - - * Sigset_Ops_Test.cpp: Added to test correct implementation of - sigset manipulating functions. - - * run_tests.{sh,bat}, Makefile: Added Sigset_Ops_Test. - -Thu Jun 05 20:32:39 1997 David L. Levine - - * tests/Timer_Queue_Test.cpp (randomize_array): removed static - qualifier now that it's a template function. It caused a warning - with Sun C++. - -Thu Jun 05 18:28:36 1997 - - * ace/Asynch_Acceptor.cpp (open): The Proactor was beening passed - implicitly. I have made this explicit by making this a parameter - to open. Thanks to MehulM@spa-marketing.com (Mehul Mahimtura) - for this. - -Thu Jun 5 12:06:45 1997 Chris Cleeland - - * ace/Timer_Queue_T.h (ACE_Timer_Queue_T): Overloaded - calculate_timeout with a version that accepts a pointer to - storage for the ACE_Time_Value as an argument. This has a small - performance win over the other b/c it does not take a lock. - The change was made after examining Quantify output for TAO - and observing that this lock caused - Reactor::wait_for_multiple_events() to consume a substantial - percentage of processing time. - - * ace/Reactor.cpp (wait_for_multiple_events): This now uses a - different version of calculate_timeout() that doesn't require - taking a lock. - -Thu Jun 05 08:48:49 1997 David L. Levine - - * ace/Reactor.cpp: added template specializations. - - * ace/Timer_Queue_T.cpp (ACE_Timer_Queue_T ctor): rearranged - initializers to match declaration order. - -Thu Jun 5 06:08:06 1997 Nanbor Wang - - * ace/OS.i (sigaddset, sigdelset, sigismember): NSIG itself is - invalid and must be excluded. - -Wed Jun 04 21:24:35 1997 David L. Levine - - * ace/config-sunos5.5-g++.h: fixed typo: #define instead of - #defined ACE_HAS_CLOCK_GETTIME. - - * ace/config-sunos5.5-sunc++*.h: Combined - config-sunos5.5-sunc++-4.x.h and config-sunos5.5-sunc++-4.1.h, - and removed the latter. The Orbix config file now #includes - config-sunos5.5-sunc++-4.x.h and adds its differences. - - * include/makeinclude/platform_sunos5_sunc++*.GNU: Combined - platform_sunos5_sunc++.GNU and platform_sunos5_sunc++-4.1.GNU, - and removed the latter. platform_sunos5_sunc++_orbix.GNU now - includes the non-orbix file and adds its differences. Also, - added optional CC -fast support. To enable, just add "fast=1" - to your "make" invocation. - -Wed Jun 04 12:21:41 1997 - - * tests: Made the following config files consistent: - UNIXclerk.conf UNIXtokens.conf Win32clerk.conf Win32server.conf - Win32tokens.conf - - * ace/OS.h: Made sure that some #defines were guarded for - redefinition specially for the Bristol (that provides Win32 API - on AIX) headers. Thanks to Rich Christy (rchristy@cccis.com) for - suggesting these changes. - - * ace/Handle_Set.h: Changed the type of handle_index from int to - u_int on Win32. Thanks to Jack Erickson (jack@cibc.com) for - suggesting this. - - * ace/FILE.h (ACE_FILE_STREAM): Fixed this #define from - ACE_FILE_Stream to ACE_FILE_IO. - -Tue Jun 3 21:23:48 1997 Douglas C. Schmidt - - * ace/Timer_{Queue,Hash}: Fixed some uses of template typedefs - since GCC is too lame to handle them correctly. Therefore, I - had to expand TIMER_QUEUE into the ugly fully expanded name. - - * ace/Timer_Queue_T.cpp: Moved the implementation of - ACE_Event_Handler_Handle_Timeout_Upcall from Timer_Queue.* into - Timer_Queue_T.* since only template classes should go into *_T.* - files. - -Tue Jun 3 18:16:02 1997 Darrell Brunsch - - * ace/Timer_Queue.*: - - Templatized ACE_Event_Handler_Handle_Timeout_Upcall with LOCK - - Added deletion() to Upcall Functors. This gets called if there - are any nodes in a queue and the queue's destructor is called - - * ace/Timer_Queue_T.*: - - Changed iterator accessor to public - - Removed two template parameters from ACE_Timer_Node_T so only - EVENT is left. Added accessors instead of using friendships, - and deleted the constructor (use set() instead) - - Changed iterator into a general iterator (with first(), next(), - isdone() and item () methods) - - Added remove_first () method that removes and returns the - earliest timer in the queue - - Added ACE_Free_List support - - * ace/Timer_Heap*: - - Added upcall functor deletion() support - - Added remove_first () method that removes and returns the - earliest timer in the queue - - * ace/Timer_List*: - - Changed to double-linked circular list and changed the timer_id - to be a pointer to the node (like it is in Timer Wheel and Timer - Hash) - - Added upcall functor deletion() support - - Added remove_first () method that removes and returns the - earliest timer in the queue - - Added check for timer_id of -1 so we don't try to delete the - error code if it is passed into cancel - - Changed Timer_List_Iterator_T constructor parameter from list to - listParm to resolve a conflict with STL. Thanks to Todd - Barkalow for this fix - - * ace/Timer_Wheel*: - Added HighRes timer support - - Added upcall functor deletion() support - - Added earliest_pos_ variable to keep track of the list with - the earliest node - - Created an expire that is specialized for ACE_Timer_Wheel - - Added remove_first () method that removes and returns the - earliest timer in the queue - - Added check for timer_id of -1 so we don't try to delete the - error code if it is passed into cancel - - * ace/Timer_Hash*: - - Added Timer Hash Queue - This is a class that can take another - timer queue type (Timer List, Timer Heap...) as a template - parameter (BUCKET) and then do an intermediate hash of a timer - to determine which queue among a table of timer queues to put - the timer into. ACE_Timer_Hash is typedefed to the Timer List - version and ACE_Timer_Hash_Heap is typedefed to the Timer Heap - version - - Added HighRes timer support - - Added upcall functor deletion() support - - Created an expire that is specialized for ACE_Timer_Hash - - Added remove_first () method that removes and returns the - earliest timer in the queue - - Added check for timer_id of -1 so we don't try to delete the - error code if it is passed into cancel - - * ace/Free_List.* - - Added ACE_Free_List and ACE_Locked_Free_List. These - are used to maintain free lists of nodes. ACE_Free_List is a - abstract class where ACE_Locked_Free_List is a concrete one that - has a mutex parameter (LOCK). - - * ace/OS.h: - - Added ACE_DEFAULT_TIMER_HASH_TABLE_SIZE constant - - Added ACE_DEFAULT_FREE_LIST_* constants - - * ace/Proactor.*: - - Added deletion() to Upcall Functors. This gets called if there - are any nodes in a queue and the queue's destructor is called. - - * tests/Timer_Queue_Test.cpp: - - Added HighRes timer support - - Changed the array of timer queues into a list (to more easily - add/remove/comment out an entry) - - Added some more performance tests with randomization - -Tue Jun 3 00:26:06 1997 Douglas C. Schmidt - - * ace/OS.h: Changed the access protection for ACE_cond_t, - ACE_sema_t, ACE_event_t, and ACE_rwlock_t so that it is - protected rather than private. In addition, added ACE_Export to - all of these classes so that they are visible outside of a DLL. - Thanks to Ivan Murphy for these suggestions. - - * ace/OS.h: Changed the value of ACE_MAX_DEFAULT_PORT on Win32 to - 0 in order to work around a nasty NTism... Thanks to Jon Biggar - for reporting this. - -Mon Jun 2 16:29:48 1997 James C Hu - - * ace/Process.*: - - Fixed ACE_Process::spawn to close descriptors after having - been duped. - - Fixed ACE_Process::spawn to exit () after an error is - encountered in the child process, rather than returning. - - Fixed ACE_Process_Options::set_handles to duplicate handles - that are passed in, and then to close them in the destructor. - -Sun Jun 01 22:21:28 1997 David L. Levine - - * examples/Threads/tss1.cpp: made some globals non-static or - const so that tss1 will link with Sun C++ 4.2 -O3. I don't - know what the problem is; it only shows up with optimization - enabled. These fixes work around it. - -Sun Jun 01 20:29:20 1997 James CE Johnson - - * ace/IOStream*: - - removed the old 4/5/97 comments - - made operator>>, << on QuotedString a template - - This last makes QuotedString much more functional. As - templated functions, the QuotedString can now be used on - other iostream-type objects. The previous method of - defining the function only for the type of ACE_IOStream - being created was didn't provide this flexibility. - -Sat May 31 07:01:22 1997 Douglas C. Schmidt - - * ace/Log_Msg.cpp (open): To avoid handle leaks, we need to - shutdown the message_queue before trying to reopen it. Thanks - to Per Andersson for this suggestion. - - * include/makeinclude/platform_osf1_4.0.GNU: Added a new platform - config file. Thanks to James Johnson for this. - -Fri May 30 16:25:25 1997 - - * CPP-inclient.cpp (main): Properly compare to the "quit" - string. Thanks to "Andre Arpin" for - reporting this. - - * tests/UPIPE_SAP_Test.cpp (connector): Changed the eof marker in - the strings. - -Fri May 30 14:04:44 1997 James C Hu - - * include/makeinclude/platform_irix6.4_sgic++.GNU: added to make - things compile on latest SGI machines. Removed +pp and -woff... - flags from the CCFLAGS variable. Added new -woff flags to hide - other warnings. - - * ace/config-irix6.4-sgic++*.h: copied corresponding configs from - irix6.2 and removed ACE_HAS_SVR4_TIME, since this seems to be no - longer true of irix6.4. - -Fri May 30 02:39:39 1997 - - * ace/Connector.cpp - - (create_AST): On Win32, added the except mask when registering - with the Reactor to find out when asynchronous connects - complete. - - (Svc_Tuple): Made sure that the default value for the timer_id - in AST is not 0. 0 is a valid timer_id. I have changed this to - be -1. - - (handle_exception): Added this method. On - Win32, the except mask must also be set for asynchronous - connects. - -Thu May 29 21:28:25 1997 - - * Process.*: Removed the ACE_Process_Old class. - - * Local_Tokens_T.*: Removed all these files. They have not been - used by the token library for some time. They were mistakenly - put in the release. - -Thu May 29 02:00:14 1997 - - * ACE.cpp (is_process_active): Added this method which checks if a - process is still alive. Thanks to Chris (CLahey@cccis.com) for - this code. - - * ace/OS.i (kill): Changed PROCESS_ALL_ACCESS to - PROCESS_TERMINATE. - - * ace/ACE.cpp (bind_port): Changed the implementation of this - method such that a recently used port is not used again in the - next call to this method on Win32, i.e., upper limit is - decreased even in the successful case. This fixes the problem on - Win32 where binding to a recently used port works but the - following connect fails. - - * ace/Acceptor.cpp (close): Added a close method that allows us - to shutdown the Acceptor (without having to destroy it). - - * ace/Connector.cpp (close): Added a close method that allows us - to shutdown the Connector (without having to destroy it). - - * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp - - (handle_close): Removed this method. This code seemed to be - duplicating the code in the handle_close of the proxies. - - (initiate_connection): Removed the code that did - rescheduling. The proxies are responsible for this. - - * apps/Gateway/Gateway/Event_Channel.cpp - - (initiate_proxy_connection): Must *always* use the correct synch - options while connecting. - - (reinitiate_proxy_connection): Always register for timeouts if - we are not disconnecting. This allows us to remove duplicated - logic in Proxy_Handler_Connector. - - The new logic of close() allows us to remove the code that use - to remove the proxy from the map to prevent double deletes. - - (close): Changed the shutdown logic to: Tell everyone that the - spaceship is here (behind the comet), close down the connector, - close down the acceptor, tell everyone that it is now time to - commit suicide. - - * apps/Gateway/Gateway/Proxy_Handler.cpp (handle_timeout): Must - return 0, or else the timer queue will cancel the handler and - *all* its timeouts. - - * apps/Gateway/Peer/svc.conf,Makefile: We now generate a Peer - shared library (instead of just an .so). The svc.conf was - changed to reflect this. - - * tests/UPIPE_SAP_Test.cpp: Fixed output message. - - * Handle_Set.i (operator): Fixed typo. - -Thu May 29 11:09:52 1997 David L. Levine - - * include/makeinclude/rules.local.GNU: check for directory - write permission before attempting to install. This helps - support shared ACE workspaces. There are two easy ways - to not install "private" libraries in the shared workspace: - 1) remove write permission from $WRAPPER_ROOT/ace, or - 2) add "INSTALL=" to invocations of "make". - -Thu May 29 06:07:18 1997 Douglas C. Schmidt - - * ace/OS.i (thr_join): Revised some code in the #ifdef'd out - version of ACE_OS::thr_join() so that it will compile correctly. - Note that this code isn't currently used, but someday it will - be. Thanks to Hamutal Yanay for reporting this. - -Wed May 28 16:37:57 1997 David L. Levine - - * ace/OS.{h,i} (ACE_Time_Value): added default constructor, - which does not call normalize (). ACE_Time_Value::normalize () - was showing up as a relatively minor, but signficant hot - spot in Event Channel latency tests. - -Wed May 28 16:02:53 1997 James C Hu - - * ace/OS.i: Changes to strdup and getpid for CHORUS, as per Wei - Chiang's suggestions. - -Tue May 27 18:26:51 1997 Douglas C. Schmidt - - * ace/config-hpux-10.x-decthreads.h: Added support for HP/UX 10.10 - with DCE threads. Thanks to Shankar Krishnamoorthy - for these fixes. - - * ace/Local_Tokens_T.h: #if def'd out all of this file since it - doesn't seem to be used anymore. Thanks to Shankar - Krishnamoorthy for reporting this. - - * ace/Makefile (TEMPLATE_FILES): Removed Local_Tokens_T since it - doesn't appear to be used anywhere. - -Tue May 27 18:47:34 1997 James C Hu - - * tests/*.cpp: Various changes for EBCIDIC compatibility. - Thanks to Chuck Gehr for pointing out the need for this! - - * tests/test_config.h: Added ACE_ALPHABET to aid a-z sending and - comparing. - -Tue May 27 15:03:25 1997 David L. Levine - - * tests/Future_Test.cpp: added ACE_Future{_Rep} template - specializations. - -Tue May 27 07:49:03 1997 Douglas C. Schmidt - - * ace/Future.cpp: Made a few minor reformatting changes to Per's - new Future enhancements. - -Tue May 27 14:19:14 1997 Per Andersson - - * ace/Future: Fixed self assignment bug in ACE_Future<>::operator=(). - Fixed bug in ACE_Future<>::set(). It is now possible to do a - ACE_Future<>::set() followed by a ACE_Future<>::get() without - hanging forever. - - Moved all handling of the ACE_Future_Rep<> reference count - into three new static ACE_Future_Rep<> member functions, - create, attach, assign and detach. - - Removed one mutex from ACE_Future_Rep<> by changing the - reference count from an ACE_Atomic_Op into a plain - int. The ACE_Future_Rep<>::value_ready_mutex_ mutex is - instead used for serializing changes to the reference count. - (ACE_Future_Rep<>::attach, ACE_Future_Rep<>::detach()) - - Removed mutex from ACE_Future<> the serialization is - performed by the ACE_Future_Rep<>::attach, - ACE_Future_Rep<>::detach() and ACE_Future_Rep<>::assign() - functions. - - Changed the ACE_Future<> default constructor to always - create a ACE_Future_Rep<> - - * tests/Future_Test.cpp: Added test case for - ACE_Future<>::set() followed by ACE_Future<>::get(). Added - test for working ACE_Future::operator=(). The test is not - fool proof but it crashes or hangs the test process with the - old ACE_Future<> implementation. - -Mon May 26 14:19:14 1997 James C Hu - - * ace/OS.{h,i}: Fixed difftime implementation for cases where - systems implement it as a macro. Fixed tempnam by adding - ACE_LACKS_TEMPNAM. - -Sun May 25 11:36:22 1997 Douglas C. Schmidt - - * examples/Reactor/Misc: Removed test_handle_set.cpp since it - is now completed subsumed by tests/Handle_Set_Test.cpp. - - * tests/Handle_Set_Test.cpp: Updated the test of - the ACE_Handle_Set so that it shows how fast the iterator works. - - * ace/Reactor.cpp: Updated the Reactor to use the new - ACE_Handle_Set_Iterator (whic no longer requires calling - operator++ to advance the iterator). - - * ace/Handle_Set: Rewrote the ACE_Handle_Set_Iterator to speed it up. - The result seems to be about 15% faster than the original. - - * ace/OS.h: Changed the MSB_MASK static constant into a macro and - moved it from Handle_Set.cpp into OS.h, changing its name to - ACE_MSB_MASK. - - * ace/Sched_Params.cpp (priority_max): Added another #ifdef for - Chorus. Thanks to Wei Chiang for reporting this. - - * include/makeinclude/platform_sunos5_sunc++_orbix.GNU: added -l - in front of orbixmt. Thanks to Wei Chiang for pointing this - out. - - * ace/ACE.cpp: Changed the default port for NT so that it starts - at 65279 rather than 65535. Hopefully, this will fix that - annoying bug that has been plaguing us on NT 4.0 for months. - Thanks to Goran Lowkrantz - for reporting this. - -Sat May 24 23:42:32 1997 David L. Levine - - * performance-tests/Misc/test_naming.cpp (do_testing): replaced - strlen () calls in character array size with constant expression. - -Sat May 24 12:07:48 1997 Douglas C. Schmidt - - * Released version 4.2.1 for testing. - - * ace/Reactor.cpp (bind): Fixed a stupid typo where I was using - the ACE_REACTOR_EVENT_HANDLER macro instead of the - ACE_REACTOR_HANDLE macro. Thanks to Detlef for reporting this. - - * ace/OS.i: Added a new macro called ACE_HAS_THR_MINSTACK to deal - with weirdo mangling of names by Tandem. Thanks to Jan Perman - for reporting this. - - * ace/OS.h: Added a new macro ACE_LACKS_PRI_T for those platforms - using STHREADS (e.g., Tandem NonStop OS) that don't have pri_t - defined. Thanks to Jan Perman for - reporting this. - - * ace/Connector.cpp (connect): Make sure to save/restore errno - since svc_handler->close() may change it. Thanks to Michael - Hartman for reporting this. - - * include/makeinclude/platform_chorus.GNU: Added a new platform - macros file for Chorus. Thanks to Wei Chang for this. - - * ace/OS.cpp (sched_params): Reordered the #ifdefs so that Chorus - comes first. - - * ace/OS.i (sleep): If the platform defines ACE_HAS_CLOCK_GETTIME - then we'll use the nanosleep() method rather than sleep(). - - * ace/OS.h: disabled THR_NEW_LWP for Chorus. Thanks to Wei Chang - for reporting this. - - * ace/Sched_Params.cpp: ACE_SCHED_OTHER and ACE_SCHED_RR have the - same value on Chorus. Thanks to Wei Chang for reporting this. - -Sat May 24 09:21:08 1997 David L. Levine - - * netsvcs/lib/Server_Logging_Handler.cpp: protected second - ACE_Svc_Handler specialization for case that ACE_HAS_THREADS, - when ACE_HAS_TLI. It had gotten lost in the last pass of - that module. Thanks to Sandro Doro - for reporting this problem. - -Sat May 24 03:19:38 1997 Nanbor Wang - - * ace/OS.i (sigaddset, sigdelset, sigemptyset, sigfillset, - sigismember): Modified the implementation of these function so - as to conform with POSIX standard. Basically all functions do - the same things they did but more conservative protections are - added. The modified semantic becomes, - - sigemptyset, sigfillset, sigaddset, sigdelset: return 0 if - succeed, -1 otherwise. - sigismember: returns 0 if signum is not in the set, 1 if signum - is in the set, and -1 if error occurs. - - If error occured, errno will be set to one of the following - value: - EFAULT: sigset is not a valid address. - EINVAL: signum is not a valid signal number. - - Notice that, so far, this is for NT only. - -Sat May 24 01:53:22 1997 James C Hu - - * performance-tests/Misc/test_naming.cpp (do_testing): Thanks to - Sandro Doro, squashed a bug where we were trying to concatenate - onto a string constant. - -Fri May 23 01:01:01 1997 Douglas C. Schmidt - - * ace/config-hpux-9.x.h: Added - - #define ACE_HAS_BROKEN_ENUMS - #define ACE_HAS_IP_MULTICAST - #define ACE_LACKS_GETPGID - - Thanks to Neil Cohen for reporting these. - - * ace/Thread_Manager.h: Made the private methods and data members - protected so that subclasses can extend it. Thanks to Hamutal - Yanay for this suggestion. - -Fri May 23 21:27:05 1997 David L. Levine - - * ace/Process.{h,cpp} (env_argv): added "const" to char * type in - return type, for argument compatibility in call to ACE_OS::execve (). - - * ace/Process.cpp (spawn): removed unreachable return statement at - end of function. - - Thanks to Dave Mayerhoefer for - reporting the above two problems. - - * ace/{IOStream*,Makefile}: Split out templates into - ace/IOStream_T.{h,cpp} files. This way, automatic template - instantiation systems that require templates to be in separate - files, such as on Irix 6.2, will be able to build IOStream_Test - and the ACE_IOStream examples without warnings. (The - ACE_IOSTREAM_BUILDING_TEMPLATE macro that did this only worked - if ACE_TEMPLATES_REQUIRE_SOURCE was defined. It's no longer - needed with the separate template files.) - - * tests/IOStream_Test.cpp, - examples/IOStream/client/iostream_client.cpp, - examples/IOStream/server/iostream_server.cpp: - swapped ACE_Streambuf and ACE_Streambuf_T class names so that - the template class has the "_T". And renamed ACE_IOStream_T - for consistency. - - * ace/{IOStream.*,README}, - tests/IOStream_Test.cpp, - examples/IOStream/client/iostream_client.cpp, - examples/IOStream/server/iostream_server.cpp, - config-hpux-9.x*.h: - Added ACE_LACKS_ACE_IOSTREAM protection - so that these can easily be built on platforms that have - trouble with ACE_IOStream. - - * Priority_Task_Test.cpp: removed close () because it didn't really - close the Task, and added printout to main () after all tasks have - been spawned to help debug non-termination. - - * ace/OS.cpp: (thr_create, with STHREADS only): *thr_handle was - used but *thr_id had been set by ::thr_create, so threads never - got activated. Fixed by using *thr_id instead of *thr_handle - in the calls to ACE_OS::thr_setprio and ACE_OS::continue. - Thanks to Jan Perman for reporting - this problem. - -Fri May 23 20:12:33 1997 James C Hu - - * tests/SV_Shared_Memory_Test.cpp: Thanks to Chuck Gehr, fixed - ASCII dependent code in the parent and child routines. - -Fri May 23 02:58:28 1997 Nanbor Wang - - * ace/OS.i (dlsym): Added ACE_USES_ASM_SYMBOL_IN_DLSYM, support - for platforms (FreeBSD) which use assembly symbols instead of C - symbols in dlsym (). - - * ace/config-freebsd[-pthread].h: Added flag ACE_HAS_CHARPTR_DL - and ACE_USES_ASM_SYMBOL_IN_DLSYM. - -Thu May 22 08:14:21 1997 David L. Levine - - * tests/Tokens_Test.cpp: added deletes to avoid memory leaks. - -Wed May 21 16:15:48 1997 David L. Levine - - * ace/{config-irix6.2*.h,README}: removed ACE_LACKS_IOSTREAM_SETGET - because tests won't build with it. Also, added - ACE_LACKS_SIGNED_CHAR. - - * ace/IOStream.h: removed "const" from PUT_PROT of - u_char * and void *. This should allow the IOStream test - and examples to build and run on Irix platforms. Thanks - to Torbjorn Lindgren and Amos Shapira - for reporting this, and to James Hu for - helping fix it. - - * ace/{OS.cpp,Sched_Params.cp} (Solaris only): use 0 min priority - again, with workaround in ACE_OS::thr_create to not use - ::pthread_attr_setschedparam () if the priority is 0. Instead, - the priority of the newly created thread is set to 0 (if it - wasn't created with 0) after the thread is created, with - ::pthread_setschedparam (). - -Wed May 21 15:23:37 1997 Chris Cleeland - - * ace/Strategies_T.* (ACE_Hash_Addr): Eliminated the ADDR_T - template parameter as a base class. It is now a wholly-contained - member of the ACE_Hash_Addr<> with conversion operators. - This caused problems on certain compilers, notably HP-UX. - -Wed May 21 14:13:36 1997 James C Hu - - * ace/OS.{h,i} (difftime): Added implementation to ACE_OS. I - don't expect any problems since it is in ANSI. - - * ace/OS.{h,i} (tempnam): Added implementation to ACE_OS. - -Wed May 21 01:17:40 1997 Douglas C. Schmidt - - * Released version 4.2. - - * ace/Acceptor.cpp (activate_svc_handler ): Removed an unnecessary - return 0. Thanks to Amos Shapira for reporting - this. - - * ace/Message_Block.cpp (release): I believe that - ACE_Message_Block::release() should return something other than - 0, i.e., it should return the result of release_i(). Thanks to - Amos Shapira for reporting this. - -Wed May 21 01:17:40 1997 Per Andersson - - * Moved most code from netsvcs/lib/Server_Logging_Handler.* to - Server_Logging_Handler_T.*. Made template out of - ACE_Server_Logging_Handler and ACE_Server_Logging_Acceptor. - Factorised out as much as possible to reduce code - duplication. The log record processing was moved from - ACE_Server_Logging_Handler it should now be handled by the - Log_Message_Receiver class. It is now possible to change - how log records processed without changing code in - Server_Logging_Handler* and it is possible to have several - Server_Logging_Handlers that processes log records - in different ways without duplicating all the server code. - All that is needed is to write a new/change - Log_Message_Receiver and instantiate a couple of templates. - - * netsvcs/lib/Server_Logging_Handler.h added lots of typedefs - for making template instantiations easier. - - * netsvcs/lib/Server_Logging_Handler.h addad lots template - instatiations, there are now 58 all together. - - * Added netsvc/lib/Log_Message_Receiver.{h,cpp}, implementstwo - simple log message receivers that prints the log record to - stderr. - -Tue May 20 13:50:17 1997 Douglas C. Schmidt - - * ace/config-hpux-9.x.h: Added a #define for ACE_HAS_BROKEN_ENUM, - ACE_HAS_IP_MULTICAST, and ACE_LACKS_GETPGID. Thanks to Neil - Cohen for reporting this. - - * include/makeinclude/platform_sunos5_sunc++_orbix.GNU: Replaced - the use of -lITsrv with -lorbixmt. Thanks to Wei Chiang for - this. - - * include/makeinclude/platform_osf1_3.2.GNU: Make sure that all - the template repositories are in the same directory to work - around problems with the C++ compiler. Also added -lrt to get - the apps and tests to run. Thanks to Tom Dobridge for this - help. - -Tue May 20 17:13:15 1997 Carlos O'Ryan - - * ace/config-hpux-10.x-nothread.h: - * ace/config-hpux-10.x-aCC.h: - * ace/Stream_Modules.cpp: - ACE_LACKS_STREAM_MODULES is no longer needed, moving the inclusion - of "ace/Task.h" to the beginning of "ace/Stream_Modules.h" solved - the problem nicely. - - * ace/config-hpux-10.x.h: - * ace/config-hpux-10.x-aCC.h: - ACE_HAS_BROKEN_HPUX_TEMPLATES is not needed on newer HP/CXX - compilers; further, old ones will not compile ACE even if the - macro is defined. - - * ace/Timer_List_T.h: - * ace/Timer_Queue_T.i: - I moved the definition of ACE_Timer_Queue_T::lock() from the .i - file to the .h file, HP/CXX gets completely confused otherwise. - I also added a number of ACE_INLINE missing in the .i file. - - * ace/Stream_Modules.h: - * ace/Stream_Modules.cpp: - I had to move the inclusion of "ace/Task.h" outside of the - protections against multiple inclusion for Stream_Modules.h. - That seems to solve the ciclyc dependancy for - Task->Module->Stream_Module->Task. - BTW, the same thing was already done in "ace/Log_Record.h". - I'll try to remove the ACE_LACKS_STREAM_MODULES macro, it seems - that the last change makes it redundant. - - * ace/Signal.cpp: - HP/CXX compiler will not close the library unless - ACE_MAX_SIGNAL_HANDLERS is defined as "const size_t". The previous - definition ("size_t") did compile tough. - - * ace/Log_Record.h: - We need to include "ace/ACE.h" before "ace/Log_Priority.h". - - * ace/Log_Priority.h: - HP/CXX compiler seems to reserve a few bits in enums, so the - ENSURE_32_BITS trick would result in a compile time error. - Since HP enums are always 32 bits we could skip the definition for - ENSURE_32_BITS altogether, but I prefer to keep a consistent - namespace across plaforms, I have found a value for ENSURE_32_BITS - that seems to work. - - * include/makeinclude/platform_hpux.GNU: - Some options to improve compile time, since we use explicit - template instantiation there is no need for a ptcomp o ptlink - phase. - -Tue May 20 09:10:18 1997 Nanbor Wang - - * ace/config-freebsd-pthread.h: - * ace/config-freebsd.h: Removed "FreeBSD" directive because gcc on - FreeBSD defines __FreeBSD__ automatically. - - * ace/OS.i (sigaddset, sigdelset, sigismember): Added range - checking to these functions in order to avoid disasters. Sig - number should be between 1 and NSIG. - (sigwait): Changed ifdef (FreeBSD) to ifdef (__FreeBSD__) since - compiler does it for us. - -Tue May 20 08:41:11 1997 David L. Levine - - * examples/Threads/tss2.cpp: added #include of ace/Thread.h - because Sun C++ 4.1 needs it. - -Mon May 19 16:04:32 1997 David L. Levine - - * bin/create_ace_build: changed startup line for compatibility - with bash. This startup line lets the script run without - hard-coding the full path to the perl executable, as long as - perl is on the user's PATH. - -Mon May 19 12:45:21 1997 Douglas C. Schmidt - - * examples/Threads/reader_writer.cpp: Changed the code so that we - don't try to treat thread ids as ints! Thanks to Chuck Gehr for - reporting this. - -Sun May 18 21:57:54 1997 David L. Levine - - * examples/Threads/tss2.cpp: added second parameter to - ACE_TSS_Singleton template specialization. - -Sun May 18 09:20:15 1997 Douglas C. Schmidt - - * examples/Threads/TSS_Data.h: Added the second parameter for - ACE_SYNCH_MUTEX since Rich and Chris updated ACE_TSS_Singleton. - - * ace/Singleton.cpp: Added the updated version of - ACE_TSS_Singleton that implements the Double-Checked Locking - pattern. Thanks to Rich Christy and Chris Lahey for this. - - * ace/Strategies_T.cpp (activate_svc_handler): Fixed the logic so - that a value is always returned. Thanks to David Levine for - noticing this. - -Sun May 18 07:25:11 1997 David L. Levine - - * netsvcs/lib/Server_Logging_Handler.cpp: removed second - ACE_Svc_Handler specialization for non-threaded, has-TLI case. - That's because it is the same as the first; the only difference - was that one specialized with ACE_SYNCH and the other with - ACE_NULL_SYNCH. Without threads, those macros expand to the - same thing. Thanks Sandro Doro for - reporting this. - - * examples/Threads/tss2.cpp: added ACE_TSS template - specialization. - -Sat May 17 23:24:34 1997 Nanbor Wang - - * ace/OS.i (sigismember): Corrected the code when - ACE_LACKS_SIGSET. - -Sat May 17 00:06:04 1997 - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp - (Event_Transceiver): Corrected signal registration for Win32. - - * apps/Gateway/Gateway/Gateway.cpp (parse_args): Since the - Connector is now fixed, non-blocking is now working fine. - - * ace/Connector.cpp (handle_close,create_AST): Made sure we close - down the svc_handler on error. - - * ace/{Acceptor.cpp,Connector.cpp} (activate_svc_handler): The - if statement logic in these methods was incorrect. - - * ace/SOCK_Connector.cpp (connect): Just like in complete(), we - start out with non-blocking disabled on the . - - * ace/OS.h: When ACE_LACKS_SIGSET is defined, changed the - definition of sigset_t from void * to unsigned int. - -Sat May 17 12:25:22 1997 Douglas C. Schmidt - - * ace/{Acceptor,Connector,Strategies_T}: Make sure to either - enable or disable ACE_NONBLOCK (depending on the flags). This - ensures that we always start with the I/O mode set to a - deterministic state. Thanks to Irfan for suggesting this. - - * ace/Connector: Added a new "flags" parameter to the - ACE_Connector and ACE_Strategy_Connector which keeps track of - flags that control how Svc_Handler are initialized prior to - being activated. - - * ace/Strategies_T.cpp (activate_svc_handler): Make sure to set - the peer's handle into non-blocking mode *before* calling the - Svc_Handler's open() method. This ensures that things are set - up correctly when this hook is called. - -Sat May 17 02:19:27 1997 Nanbor Wang - - * ace/config-freebsd.h (ACE_HAS_BROKEN_TIMESPEC_MEMBERS): - - * ace/OS.i (set, timestruct_t, nanosleep): - - * ace/High_Res_Timer.cpp (elapsed_time): - - * ace/README: Added ACE_HAS_BROKEN_TIMESPEC_MEMBERS so that we can - fix that problem FreeBSD 2.1.x brings by defining timespec as { - time_t ts_sec ; long ts_nsec }. Notice: This is highly - non-portable. Please refer to ACE code and see how to write - portable. Fortunately, only older versions of FreeBSD have - this. Yesterday's hack didn't work, so, it's removed. Thanks - to Satoshi Ueno for reporting and helping - debug on his FreeBSD 2.1.7R box. - -Sat May 17 00:06:04 1997 - - * apps/Gateway/Gateway/Proxy_Handler.cpp (open): Turn on - non-blocking I/O only after the Channel is done sending the id - to the Peer. - - * apps/Gateway/Gateway/Gateway.cpp: - - - Added necessary DLL build macros. - - - Removed error checking for Reactor::remove_handler() for STDIN - as STDIN is never registered with the Reactor on Win32. - - - Fixed the registration of SIGINT. - - - blocking_semantics_ should be 1 when blocking is on and not 0. - - - Since the Connector is currently broken with respect to - non-blocking connects, I have put a temporary fix such that - only blocking connects are done. Revert this after the - Connector is fixed. - - * apps/Gateway/Gateway/Event_Channel.cpp: - - - Only if socket_queue_size > 0, do we set a new value. - - - In reinitiate_proxy_connection(), we must unbind the proxy - from the proxy_map_ as we are no longer responsible for - this. The Connector should now be responsible for this. - - * apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp: Added - necessary DLL build macros. - - * apps/Gateway/Peer/Peer.cpp: - - - Added include file and necessary DLL build macros. - - - Removed error checking for Reactor::remove_handler() for STDIN - as STDIN is never registered with the Reactor on Win32. - - - Fixed the registration of SIGINT. - - * apps/Gateway/{Peer,Gateway}: Added Win32 makefiles. - - * ace/ACE.cpp (read_adapter): Handle for the read_adapter should - always be STDIN. - -Fri May 16 18:43:17 1997 Nanbor Wang - - * ace/config-freebsd.h: Minor modification for working on FreeBSD - 2.1.x platform. Added includion of and - . Defined ACE_HAS_POSIX_TIME for 2.1.x. Redefine - timespec to timeval to hack around a bug on 2.1.x. Thanks to - Satoshi Ueno for reporting this. - -Fri May 16 12:25:32 1997 Douglas C. Schmidt - - * netsvcs/lib: Reverted back to the original Server_Logging_Handler - behavior since the new version is breaking GCC's templates. - - * ace/Log_Record.h: need to #include "ace/ACE.h" before - "ace/Log_Priority.h" so that "Log_Priority.h" sees the - configuration stuff (otherwise the following fix won't work). - - * ace/Log_Priority.h: Added a workaround for lame C++ compilers - like the one on HP/UX that can't support large enums. Thanks to - Robert Head for reporting this. - - * ace/Singleton: Added the new ACE_TSS_Singleton, which stores - Singletons in thread-specific storage. Thanks to Chris Lahey - and Rich Christy for this. - - * ace/OS.h: Removed the ACE_Singleton_Strategy since we don't need - it anymore. - - * netsvcs/lib: Added the new Server_Logging_Handler_T.* and - Log_Message_Receiver.* netsvcs. Thanks to Per Andersson for - contributing these. - - * examples/Misc/Makefile: Removed the XtReactor tests from the - Makefile until we figure out a good way to get them integrated - with the appropriate libraries. - - * ace/config-irix6.2-sgic++-nothread.h: Added the following: - - ACE_LACKS_LINEBUFFERED_STREAMBUF - ACE_HAS_SETOWN - ACE_HAS_SYSENT_H - ACE_HAS_SYSINFO - - Thanks to Torbjorn Lindgren for reporting - this. - - * ace/Proactor.cpp: Changed the use of lock() to mutex() since we - changed the name in Timer_Queue. - - * ace/Timer_Queue_T.i: Changed the name of the lock() method to - mutex() to work around compile problems with HP/UX. Thanks to - Robert Head for reporting this - workaround. - - * ace/config-irix5.3-sgic++.h: Made a few changes to get ACE to - work on IRIX 5.3. Thanks to Eugene R. Somdahl - for these fixes. - - * ace/OS: Added calloc() implementation. I don't know how - this managed to fall through the cracks! - - * include/makeinclude/platform_osf1_4.0.GNU: Added a few more - tweaks courtesy of James Johnson. - - * include/makeinclude/platform_osf1_3.2.GNU: Added a few more - tweaks courtesy of Tom Dobridge. - - * include/makeinclude/platform_osf1_4.0.GNU (DLD): Added -shared - -expect_unresolved '*' so that calls to the linker via cxx will - work correctly. Thanks to Thilo for this. - - * include/makeinclude/platform_chorus.GNU: Removed CLASSIXDIR = - /usr/home/chiang/chorus/merge/extended-i386at, added the - nostdinc flag, and removed extra whitespace. Thanks to Wei - Chiang for reporting this. - -Fri May 16 00:02:33 1997 - - * ace/ReactorEx: Even though changes to the owner field are very - well synchronized within the class code, the owner() - accessor is public and can be called from out side the - class. Therefore, I have added a owner_i() that does not do - locking. All internal calls to check the owner will use the - new accessor, whereas application code outside the class can - still use the old synchronized accessor. - -Fri May 16 11:39:51 1997 Nanbor Wang - - * ace/OS.i (sigaddset, sigdelset, sigemptyset, sigfillset, - sigismember): Added implementation when ACE_LACKS_SIGSET so that - platforms (NT?) without these functions can still manipulate - sigset_t variables. - -Thu May 15 22:19:59 1997 Douglas C. Schmidt - - * examples/ASX/Event_Server/Event_Server: Removed the THR_DETACHED - flag from options so that we can wait on the threads - correctly. - - * ace/Stream_Modules.cpp: Changed the logic for determining when - to compile the Stream_Modules.cpp code. Now, we compile it - unless ACE_LACKS_STREAM_MODULES is defined (i.e., we're on HP/UX - 10.x using aCC). - - * netsvcs/lib/Server_Logging_Handler.cpp (handle_input): Fixed - a bug in handle_input() where we need to return the result, not - just 0 or 1. Thanks to Per Andersson for reporting this. - - * ace/Log_Priority.h: Changed the values of the enums in - ACE_Log_Priority so that they can be dealt with via bitwise - operations. Thanks to Per Andersson for this. - - * include/makeinclude/platform_osf1_4.0.GNU: Added support for - templates. Thanks to Steve Huston and James Johnson for - verifying this. - - * include/makeinclude/platform_osf1_3.2.GNU: Got rid of all - unresolved symbol warnings using cxx 5.5 on DEC/OSF v3.2 by - using the linker flag "-expect_unresolved '*'." In addition, I - added -threads to the DCFLAGS macro. Thanks to Tom Dobridge - for this. - - * ace/Strategies_T: Added a minor ACE_Reactive_Strategy extension - to enable non-blocking I/O in active_svc_handler(). Thanks to - Arturo Montes for contributing this. - - * ace/config-osf1-4.0[-g++].h: Added a #define for - ACE_POLL_IS_BROKEN since DEC UNIX's poll() doesn't seem to work - correctly as a highres timer. Thanks to James Johnson and Thilo - for reporting this. - - * examples/Threads/thread_specific.cpp (worker): Changes - size_t i back to int i to avoid a signed/unsigned complaint. - Thanks to David Levine for reporting this. - - * ace/config-chorus.h: Added ACE_LACKS_MPROTECT, - ACE_HAS_IP_MULTICAST, and ACE_LACKS_SOCKETPAIR to the Chorus - port. Thanks to Wei Chiang for - reporting this. - - * ace/OS.i: Added ACE_LACKS_ACCESS to the Chorus config file - and VxWorks config file, as well as to OS.i. - -: * ace/OS.i: Added ACE_LACKS_GETSERVBYNAME to the Chorus config - file and VxWorks config file, as well as to OS.i. - - * ace/OS.i: Added ACE_LACKS_SBRK to the Chorus config file, as - well as to the definition of the ACE_OS::sbrk() function. - - * ace/OS.h: Removed #include /**/ from the Chorus-specific - part of OS.h since it's already included elsewhere. Thanks to - Wei Chiang for reporting this. - - * ace/Reactor: Added a typedef for ACE_Reactor_Token to - ACE_Null_Mutex for situations where ACE_MT_SAFE is *disabled*. - This makes the code more consistent. - - * ace/Reactor: Added an interface that makes it possible to - acquire a reference to the that is used to - serialize the internal Reactor's processing logic. This can be - useful for situations where you need to avoid deadlock - efficiently when are used in multiple - threads. Thanks to Detlef for pointing out the utility of this. - -Thu May 15 23:34:30 1997 Tim H. Harrison - - * ace/Process_Manager.cpp (spawn_n): Changed - ACE_Process_Manager::start_n to ACE_Process_Manager::spawn_n. - -Thu May 15 15:39:13 1997 Carlos O'Ryan - - * include/makeinclude/platform_hpux.GNU: - * ace/config-hpux-10.x.h: - * ace/config-hpux-10.x-nothread.h: - HP/CXX cannot achieve template closure, not even using the - dummy exec trick: apparently the repository gets a bit - corrupted. HP/CXX (version 10.24) support explicit template - instantiation, I believe this to be a superior method for - ensuring library closure (and it works). - - * ace/Task_T.cpp: - * ace/Stream_Modules.cpp: - I have changed the hack to compile under HP-UX, - "ace/Module.h" is once more included in ace/Task_T.cpp, but - "ace/Stream_Modules.cpp" is protected: it will be empty - under HP-UX unless included from the - "ace/Stream_Modules.h". I still believe that there is a - problem in the cyclic dependancy Task -> Module -> Thru_Task - -> Task; but it seems that the current hack works better. - - * ace/OS.h: - Defining ACE_UNUSED_ARG as (a) for HP/CXX does not work so I - moved it to the SGI and GCC definition. - - * ace/OS.i: - More unused args. - - * ace/Handle_Set.h: - Removed the extra qualification for ACE_Handle_Set::NBITS, - HP/CXX sends a lot of warnings with that. - - * ace/IOStream.h: - It included "IOStream.cpp" I think that "ace/IOStream.cpp" - is better. - - * ace/Local_Name_Space_T.h: - Ditto for "Local_Name_Space.h" - -Thu May 15 17:40:06 1997 - - * ace/ReactorEx.i (owner): Since changes to the owner field are - very well synchronized, we do not need to synchronize this - accessor. - - * ace/IOStream.h: Added /**/ after #include directives. - - * ace: Update Win32 makefiles to include UNICODE make option. - -Thu May 15 08:54:53 1997 David L. Levine - - * Makefile (release, cleanrelease): use -prune option to "find" - instead of filtering its output. Thanks to Chris Cleeland for - suggesting this. - -Wed May 14 21:52:22 1997 Douglas C. Schmidt - - * ace/UPIPE_Stream.cpp (control): We need to "cast away const" so - that this method can call the Stream's control() method - (which is non-const). Thanks to David Levine for locating this. - - * ace/Singleton.cpp: Finished re-implementing ACE_Singleton. - - * examples/ASX/Message_Queue/buffer_stream.cpp: Updated this - example to illustrate (1) how filters work in an ACE_Stream and - (2) to make sure that resizing buffers work. - - * ace/UPIPE_Stream.h: Changed the signature of control() - to take an int so that it will match the base class - signature. - - * ace/Singleton.h: The new ACE_SingletonEx isn't working yet. - I've #ifdef'd it out until it works. - - * examples/Threads/tss2.cpp: Updated this test program to - illustrate the use of the new ACE_SingletonEx class. - - * ace/Singleton.h: Added a new instance() method to the ACE - Singleton that can be used to set the Singleton. This is useful - for situations where the type being used as the Singleton - doesn't have a default constructor. Thanks to Arturo Montes - for this suggestion. - - * ace/Singleton: Factored out common code in the Singleton and - SingletonEx implementations so they will be cleaner and more - portable. - - * ace/Local_Name_Space_T.h, - ace/Map_Manager.h, - ace/Hash_Map_Manager.h, - ace/SString.h, - ace/Hash_Map_Manager.cpp: - - Changed all uses of the identifier "allocator" to "alloc" to - avoid conflicts with MSVC++ STL 5.0. Thanks to William - L. Gerecke for reporting this. - - * ace/config-aix-4.[12].x.h: Replaces - ACE_LACKS_PTHREAD_THR_SIGSETMASK with ACE_HAS_SIGTHREADMASK. - Thanks to Chris Lahey for this. - - * ace/OS.i (thr_sigsetmask): Added the ACE_HAS_SIGTHREADMASK - support for AIX. Thanks to Chris Lahey for this. - - * ace/Singleton: Added the new ACE_SingletonEx, which supports - both heap-based and thread-specific storage-based Singletons. - Thanks to Chris Lahey for this. - - * ace/OS.h: Added the new ACE_Singleton_Strategy to OS.h. Thanks - to Chris Lahey for this. - -Wed May 14 16:32:57 1997 David L. Levine - - * Makefile: use cpio instead of tar to allow easy filtering - of CVS files from the release. - -Wed May 14 15:00:58 1997 - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (main): Fixed code. - - * examples/Naming: Replaced multiple makefiles with one makefile. - - * ace/OS.h: Added UNICODE support for some #defines. - - * OS.i (vsprintf): Added support for this in ACE_OS. - - * OS.cpp (socket_init && socket_fini): It is ok to print out cout - and cerr messages from here (as the C runtime library is still - attached) but it is *not* ok to print out ACE_DEBUG - messages. God only knows the state of the thread specific LogMsg - instance when the process reaches this piece of code. - - Also added a (handy) sprintf that has the following prototype: - - sprintf (wchar_t *buf, const char *format, ...) - - * ace/Process: UNICODE fixes. - - * tests: Fixed the following such that they work with UNICODE: - - Pipe_Test.cpp - Process_Mutex_Test.cpp - Process_Strategy_Test.cpp - Time_Service_Test.cpp - Tokens_Test.cpp - - * Time_Service_Test.cpp (main): Fixed typo in the svc.conf - filename for the clerk. - -Tue May 13 18:56:27 1997 Douglas C. Schmidt - - * ace/IOStream.h: To make C++ compilers happy I added - the following changes by modifying - - ACE_IOStream & operator>>( ACE_Time_Value *& tv ); - - to be - - ACE_IOStream & operator>>( ACE_Time_Value *& tv ); - - Thanks to Chuck Gehr for this fix. - -Tue May 13 21:32:12 1997 David L. Levine - - * ace/Process.cpp (~ACE_Process_Options): delete - command_line_buf_ was missing the []. - - * examples/Threads/process_manager.cpp (main): avoid compiler - warning due to implicit creation of temporary by explicitly - creating an ACE_Process_Options instance. It gets passed to - ACE_Process_Manager::spawn (ACE_Process_Options &), which - takes a non-const reference. - -Tue May 13 18:08:32 1997 - - * examples/ASX/UPIPE_Event_Server: Made enough fixes for this to - compile on Win32 but more work need to be done for this to - work on Win32. - - * ace/OS.i (kill): The error result for ::OpenProcess() is null - and *not* invalid handle. - - * ace/Process.i (kill): Changed the implementation to remove the - ACE_OS::kill() code from ACE_Process::kill() for Win32. This - allows us to avoid calling ::OpenProcess() unnecessarily. - - * tests: For Win32, added Reactor_Exceptions_Test and - Priority_Tasks_Tests. Files changes include run_tests.bat, - tests.mak, and tests.mdp. - - * tests/Future_Test.cpp (main): Fixed memory leaks in main() and - in name_i(). - - * tests/Thread_Pool_Test.cpp (open): The loop was messed up - causing memory leaks. I fixed it. - - * ace/UPIPE_Stream.cpp (close): I am not sure why the stream was - closed with M_DELETE_NONE. This indicates that close() should - not delete any Tasks. This caused a memory leak as the Tasks in - the Tail and Head modules were not deleted. I have removed this - to fix the memory leak. - - Also added a destructor such that mb_last_ is released if it is - still around. - -Tue May 13 16:48:18 1997 James C Hu - - * ace/Process.cpp: Added implementations to new interfaces - to ACE_Process_Options::setenv (char *envp[]), and - ACE_Process_Options::command_line (char *argv[]). - - * apps/JAWS/server/HTTP_Response.cpp: Required changes so that CGI - processing will work with the new ACE_Process class. - - * apps/JAWS/stress_testing/benchd.cpp: Requried changes due to - changes in the ACE_Process interface. - -Tue May 13 15:22:01 1997 Tim H. Harrison - - * ace/Process_Manager.h: Changed ACE_Process_Manager::start to - ACE_Process_Manager::spawn. - - * ace/Process.cpp (spawn): The check for a null environment argv - was incorrect. Thanks to Nanbor for finding this. - -Mon May 12 18:59:39 1997 David L. Levine - - * ace/config-mvs.h: conditionally use ACE_HAS_UCONTEXT_T or - ACE_LACKS_UCONTEXT_H depending on __COMPILER_VER__. Thanks to - Chuck Gehr for this fix. - - * OS.h, OS.cpp (thr_create), Task.h, Thread.h, Thread_Manager.h: - use ACE_DEFAULT_THREAD_PRIORITY instead of -1, because -1 is a - valid priority on Win32. Thanks to Irfan for discovering this - problem with Priority_Task_Test. - - * ace/Thread_Manager.cpp (wait_grp,wait_task): changed type of loop - index "i" from size_t to int to avoid signed/unsigned comparison. - -Mon May 12 18:41:19 1997 Nanbor Wang - - * ace/config-freebsd-pthread.h: - * ace/config-freebsd.h: Added ACE_LACKS_RWLOCK_T to FreeBSD config - files. Thanks to Amancio Hasty for - noticing this. - -Mon May 12 17:11:50 1997 Tim H. Harrison - - * ace/Process.h: Changed ACE_Process::start to - ACE_Process::spawn. Added new argv-style methods for - ACE_Process::setenv and ACE_Process::command_line. These new - argv-style methods do not have implementations yet. - -Mon May 12 15:27:41 1997 Douglas C. Schmidt - - * ace/config-aix-4.[12].x.h: Added ACE_HAS_EXCEPTIONS to - the AIX 4.* config files. Thanks to Chris Lahey for this. - -Mon May 12 13:49:54 1997 - - * ace/Thread_Manager.cpp (wait): We have to make sure that while - we wait for these threads to exit, we do not have the - lock. Therefore we make a copy of all interesting entries and - let go of the lock. We then do the join(). - - * ace/Task.cpp (wait): Removed the extra locking in wait(). The - Thread Manager will handle this correctly. - - * ace/ACE.cpp (register_stdin_handler): Changed the options such - that the Thread Manager used for the adapter is passed along to - the method executed by the new thread. We can then notify the - thread manager when this adapter thread exits. - - * examples/ASX/Event_Server/Event_Server: Changed the way the - reference count was being kept on the context. Now, the - reference count starts with zero and every instance and every - active Task increments it. This works well as Task::close() is - called one from the module being deleted and from the active - thread going away. - -Mon May 12 11:11:51 1997 - - * ace/Process.*: Removed the old ACE_Process and replaced it with - what was ACE_ProcessEx. - - * ace/Process_Manager.{i,cpp}: Updated to use the new ACE_Process - API. - -Mon May 12 08:16:38 1997 David L. Levine - - * ace/config-freebsd*.h: added support for FreeBSD 2.1.7R. - Thanks to Satoshi Ueno for figuring - out the differences and to Nanbor Wang - for updating the config files. - -Sun May 11 17:36:59 1997 - - * tests/{Pipe_Test.cpp, Process_Mutex_Test.cpp, - Time_Service_Test.cpp, Token_Service_Test.cpp}: Updated these - files to use the new ACE_Process API. - -Sun May 11 14:40:51 1997 David L. Levine - - * ace/config-osf1-4.0.h: put back ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS. - - * ace/ACE_Process.cpp (ACE_Process_Options ctor): reordered - initializers to match declaration order. - -Sat May 10 19:44:28 1997 - - * Process.h: ACE_ProcessEx now works on Solaris and NT. There - have been some changes to the API. ACE_ProcessEx::cl_options - and ACE_ProcessEx::path have been combined into - ACE_ProcessEx::command_line. ACE_ProcessEx::command_line must - be used to specify path and command-line arguments. There is - also a second ACE_ProcessEx::setenv method that allows - applications to set environment variables in a "VAR=VALUE" - format. - -Sat May 10 10:51:11 1997 Douglas C. Schmidt - - * ace/config-osf1-3.2.h: Added three new flags to the config file - for OSF/1 3.2: - - #define ACE_LACKS_SETSCHED - #define ACE_LACKS_RWLOCK_T - #define ACE_LACKS_GETPGID - - Thanks to Tom Dobridge for reporting - this. - -Fri May 09 16:37:48 1997 David L. Levine - - * ace/config-osf1-4.0.h: added DEC_CXX. - - * ace/config-osf1-4.0-g++.h: removed commented-out - ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS. - - Thanks to Thilo Kielmann for - patches for the above two OSF config files. - - * ace/Sched_Params.cpp (priority_min): On Solaris (with STHREADS), - don't return priority of 0 because ::pthread_attr_setschedparam () - will refuse to use it (with EINVAL). So, bump priority of 0 up to 1. - - * tests/Priority_Task_Test.cpp: retry the task activation with - priority 0 if it fails with non-zero priority. This lets the - test run on platforms such as Linux that only let the superuser - set non-zero priority. - - * ace/ACE_Process.cpp (ACE_Process_Options ctor): reordered - initializers to match declaration order. - - * examples/Connection/non_blocking/test_lsock_acceptor.cpp: fixed - typo in template specializations: ACE_LSOCK_ACCEPTOR instead of - ACE_SOCK_LACCEPTOR. - -Fri May 9 13:07:20 1997 Douglas C. Schmidt - - * ace/UNIX_Addr: Changed the return values of all the set() - methods so that they conform to the signature used by the - INET_Addrs. - - * examples/Connection/non-blocking: Added two new test programs, - test_lsock_{connector,acceptor}.cpp that - - - * ace/LSOCK_Stream.cpp: Revised the get_remote_addr() method so - that it uses the underlying ACE_SOCK::get_remote_addr() method - rather than the get_local_addr() method. Hopefully, this will - fix an ACE bug with UNIX domain sockets. Thanks to Paul Han - for reporting the problem and the fix. - - * include/makeinclude/platform_aix4.2.GNU (LLIBS): Changed - - LLIBS = -lC_r -lC -lpthreads -lbsd -ltli_r -ldl -lc_r -lm -lc $(ACELIB) - - to - - LLIBS = -ltli_r -ldl $(ACELIB) - - MakeC++SharedLib_r includes all the other libs automatically in - the search. - - * apps/Gateway/Gateway/Proxy_Handler.h: Moved the handle_close() - method into the public section since the Connector now calls it. - - * ace/Containers.cpp: Updated all the operator= methods so - that they no longer try to return *this. Thanks to Chris Lahey - for reporting this. - - * ace/IOStream.h: Replaced __alpha with DIGITAL_UNIX && DEC_CXX. - Thanks to Thilo for reporting this. - - * build/gcc/tests/Simple_Message_Block_Test.cpp (main): Changed - the use of ACE_Mutex to ACE_SYNCH_MUTEX so that everything will - build correctly on non-MT platforms. - - * ace/Timer_{Heap,List}_T.cpp: To ensure backwards compatibility - with the old "int" return value of Timer_*::schedule() we must - cast the long value to int before returning it. Thanks to Thilo - Kielmann for reporting this. - - * ace/Acceptor.cpp, - ace/Connector.cpp: - If an active or passive connection times out and the Connector - or Acceptor calls the handle_timeout() method of the - Svc_Handler, we now keep track of whether the handle_timeout() - method returns -1. If so, we call handle_close() on the - Svc_Handler automatically. Thanks to Michael Hartman - for suggesting this. - - * tests/IOStream_Test.cpp: Fixed this test so that it runs on - non-MT platforms. - - * ace/Module.cpp: Changed the implementation of the close_i() - method so that it will wait for all active threads in a Task to - exit before deleting the task. - - * ace/Task: Added a wait() method on an ACE_Task that will use the - new ACE_Thread_Manager::wait_task() method to block until all - threads have shutdown in a Task. - - * ace/Thread_Manager: Finally implemented the wait_task() and - wait_grp() interfaces on ACE_Thread_Manager. - - * ace/SOCK_Dgram.cpp: Added a timed recv() operation. Thanks - to Hongbo Xu for contributing this. - - * ace/Timer_Queue_T.cpp: Added #include "ace/Synch.h" to keep the - DEC C++ compiler happy. Thanks to James CE Johnson - for this. - - * ace/Containers.i (size): Changed to so that this - compiles on the Alpha. Thanks to James CE Johnson - for this. - - * ace/IOStream.h: Include the std_macros header on the Alpha. - Thanks to James CE Johnson for this. - - * include/makeinclude/platform_osf1_4.0.GNU (SOBUILD): Removed - -lACE from the link line. Thanks to James CE Johnson - for this. - - * tests/Timer_Queue_Test.cpp: Changed all the int timer ids to - long so that the test will work on DEC ALPHAs. Thanks to Thilo - Kielmann for reporting this. - - * ace/Process: Fixed a number of compile problems for UNIX. - - * ace/Process.h: Changed the methods named stdin/stdout/stderr to - std_in/std_out/std_err to avoid name clashes with the standard C - library. - - * ace/OS: Changed the use of ACE_Unbounded_Set to - ACE_Unbounded_Stack in order to get the appropriate semantics - for TSS cleanup on NT. - - * ace/Containers: Enhanced the ACE_Unbounded_Stack class so - that it supports insert()/remove()/find() methods. These - rather unorthodox methods are useful for implementing the - TSS semantics required by OS.cpp. - - * ace/Containers: Revised all the interfaces for the various - containers so that they all have the same "look and feel." - -Fri May 9 00:00:21 1997 James C Hu - - * apps/JAWS/server/HTTP_Request.{h,cpp}: Added a uritopath - translation method, so that CGI location can be computed as it - is searched. Added methods to access the parsed headers. - - * apps/JAWS/server/HTTP_Response.{h,cpp}: Flushed out the - implementation of cgi_response () method. If all goes well, it - should be able to execute a CGI program. I don't set the IO - handles to point at the socket handle yet. - - * apps/JAWS/server/README: Updated description of JAWS behavior. - -Thu May 8 18:04:14 1997 Irfan Pyarali - - * ace/Containers: Made the return values of Container methods - more consistant with other components of ACE (i.e., 0 for - success, -1 for failure). - - * ace/Containers (ACE_Unbounded_Stack::delete_all_nodes): - Fixed subtle bug in delete_all_nodes. - - * ace/OS.cpp (ACE_TSS_Cleanup::exit): Changed because of - return value changes in ACE containers. - - * Containers: Added size methods to stack containers and - consolidated friendship between ACE_Unbounded_Stack_Iterator and - ACE_Unbounded_Stack - - * tests/Message_Block_Test.cpp: I was incorrect about each data - block having its own lock. Since *many* data blocks can share - the same lock, for the case of message block chains, we would - like to optimize locking. - - Therefore, the first guy in the chain grabs the lock and passes - it to the continuation chain. When each guy in the chain gets - it, it compares the passed lock to its own locking strategy. If - it is the same lock, no need to acquire the lock again. If our - lock is different, then we do our own locking. - - * tests/Simple_Message_Block_Test.cpp: This test program is a - torture test that illustrates how ACE_Message_Block reference - counting works, how and when locks are used, how memory is - managed, and how continuation chains of message blocks are - made. Ideally used with purify :-) - - * tests: Added new test. Following changed: - Makefile run_tests.bat run_tests.sh tests.mak tests.mdp - -Thu May 8 18:04:14 1997 James C Hu - - * include/makeinclude/platform_irix6.2_sgic++.GNU: Moved SGI C++ - options out of CPPFLAGS into CCFLAGS so that gcc won't emit - diagnostics during a make depend. - -Thu May 8 11:52:41 1997 Chris Cleeland - - * ace/{Task,Thread}.h: Added documentation describing - thread priority determination to methods where priority - is an [optional] argument. Note that if you want to inspect - the REAL documentation, you should look at the code for - ACE_OS::thr_create(). But that's convoluted and touchy. - - * ace/Strategies_T.h (ACE_Cached_Connection_Strategy): Added - documentation for this class. - -Thu May 08 00:10:00 1997 - - * ace/Process.*: This is the first pass at the new ACE_Process - class. It is now called ACE_ProcessEx. When it is completely - ported to Solaris, we'll replace the current ACE_Process with - ACE_ProcessEx. - - * examples/OS/Process/process.cpp: Added some examples for the - new ACE_ProcessEx. - -Wed May 07 21:58:29 1997 - - * ace/Message_Block.h: ACE_Data_Block calling delete on the - ACE_Message_Block was incorrect. This was a hack to simplify - the locking issues! However this optimization leaded to - incorrect code. Therefore I have taken this behavior out. The - new implementation will lock and unlock multiple times in the - case when there are message_blocks in the continuation field, - all of which point to same data block. However, this is a - strange case that can be optimized later. For now correct code - is more important. - - Also, the continuation message blocks are only deleted in the - release() method and not in the destructor. This will ensure - that if message blocks of the stack are chained together, we - will not call release on message blocks of the stack. - - Also note that release() should only be called on message blocks - that have been dynamically allocated. Message blocks of the - stack will clean up properly when the activation record of the - method completes. Dynamically allocated messages blocks should - *never* be chained with message blocks allocated of the stack. - - * examples/ASX/Event_Server/Event_Server/Peer_Router.h: Removed - empty definitions of assignment operator and copy constructor. - - * examples/ASX/Event_Server/Event_Server/event_server.cpp - (handle_input): Added code here will make sure we actually wait - for the user to type something. On platforms like Win32, - handle_input() is called prematurely (even when there is no - data). - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Changed - a log message. - -Wed May 7 22:55:00 1997 James C Hu - - * JAWS/server/*: Debugging changes! GET and HEAD both work - now. As well as changes to make it compile cleanly on - VXWORKS, as reported by David. - -Wed May 07 16:05:39 1997 David L. Levine - - * ace/Makefile: added Timer_Wheel to FILES. Thanks to Thilo - Kielmann for reporting this. - - * include/makeinclude/platform_irix6.2_sgic++.GNU: enabled CPPFLAGS - to instantiate all templates so that gatewayd will build. - Thanks to Nathan N. Vuong for reporting - this problem and Eric Dean Russell - for supplying and the fix. - - * ace/Map_Manager.h: updated comments to indicate that find - functions return a non-negative integer if the item is found. - - * ace/Map_Manager.cpp (find_i (const EXT_ID &, INT_ID &)): return - index instead of 0 if the item is found, to be consistent with - find_i (const EXT_ID &). - - * ace/IOStream.cpp (ACE_Streambuf_T ctor): added initializations of - eback_saved_ and pbase_saved_ to avoid unitialized memory read - reports from Purify. - -Tue May 6 07:39:25 1997 Douglas C. Schmidt - - * ace/Service_Config.cpp (open): Make sure to perform the - daemonization logic first so that we get a new process created - before initializing reactors, etc. Thanks to Adrian Salt - for reporting this. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp (main): - Changed ACE::INVALID_HANDLE to ACE_INVALID_HANDLE. - Thanks to Dani Flexer for - reporting this. - - * tests/Conn_Test.cpp (compare_i): Changed the comparison from - a1 == a2 to a1 != a2 since this appears to be what is needed. - We need to improve the comments here! - - * tests/Conn_Test.cpp: Split the definition of the Svc_Handler - template into its own Conn_Test.h file to work around "features" - with AIX C++. Thanks to Chris Lahey for reporting this. - - * ace/Containers.cpp: Fixed a bug in the set() method for - ACE_Unbounded_Queue. Again, thank goodness for cs242! - - * ace/Containers.cpp: Fixed a bug in the enqueue_head() logic for - ACE_Unbounded_Queue. Thank goodness for cs242 ;-). - - * ace/Containers.cpp: Added a destructor for ACE_Node to keep the - compilers happy. - -Tue May 06 11:31:49 1997 David L. Levine - - * netsvcs/lib/*.cpp: removed break statements after - ACE_RETURNs to avoid unreachable statement warnings from - GHS. - - * ace/OS.cpp (mktime): added time_t cast of -1 (error) return - to avoid compiler warning. - - * ace/config-vxworks-ghs-1.8.h: added ACE_LACKS_SIGNED_CHAR. - - * ace/Containers.cpp (dequeue_head): fixed typos in variable names. - - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - removed #ifdef ACE_HAS_TLI around some template specializations so - that this subproject will build on platforms non-TLI platforms such - as Linux. - -Tue May 6 17:02:54 1997 James C Hu - - * ace/OS.{h,i}: Added strftime (). Also, enhanced strcasecmp - implementation to account for lexicographical ordering for - mismatches. - - * apps/JAWS/server/Parse_Headers.{h,cpp} (class Headers_Map): - Changed signature of casting operator to return a pointer - rather than a reference to a constant pointer, to fix - anachronism warning Doug found. - - * apps/JAWS/server/HTTP_Config.{h,cpp}: Added class - HTTP_Config to be a container for HTTP server options - such as locations of directories, port, etc. - - * apps/JAWS/server/HTTP_Helpers.{h,cpp}: Added code to enhance - support for CGI scripts: - - Added HTTP_decode_string to HTTP_Helper class, to deal - with percent codes. - - * apps/JAWS/server/HTTP_Request.{h,cpp}: Added code to enhance - support for CGI scripts: - - Added cgi_, cgi_env_, and cgi_args_ data members to - and corresponding accessors. - - Added nice accessors to the important data members to - simplify other parts of the code. - - Added method to parse URI to determine the name of the CGI - executable if present. - - * apps/JAWS/server/HTTP_Response.{h,cpp}: Added code to - enhance support for CGI scripts: - - Hooks are now present to make the appropriate calls - to activate a CGI program. - - * apps/JAWS/server/*.{h,cpp} - Various changes from the ACE mailing list incorporated. - Cosmetic changes for ACE coding style. - - SGI fixes. - -Tue May 6 00:00:54 1997 Chris Cleeland - - * ace/Message_Block.cpp: Added template specialization for - ACE_Guard<> that prevented ACE from compiling under Linux. - -Mon May 5 22:17:15 1997 Sumedh Mungee - - * apps/JAWS/stress_testing: Removed the usleep definition from - global.h, it was unused by the program. - -Mon May 05 21:01:42 1997 David L. Levine - - * ace/config-linux*.h: added ACE_HAS_STRING_CLASS. Thanks to - Luis Lopes for reporting this. - -Mon May 05 19:58:16 1997 - - * ace/ace.{mak,mdp}: Readded IOStream.cpp to the makefile. - - * ace/Synch_T.h: Added ACE_SYNCH_RECURSIVE_MUTEX. - - * ace/Timer_Queue: Added an extra template parameter to - Timer_Queues that specifies the type of locking to be used - inside of the timer queue. - - Also changed the functor callback routines so that they are more - descriptive compared to operator (). - -Mon May 5 21:37:01 1997 Douglas C. Schmidt - - * ace/Message_Block: Revised the release() logic for - ACE_Message_Block and ACE_Data_Block so that we will delete both - within the same block of code in order to hold the lock. This - should prevent nasty race conditions in multi-threaded programs. - Thanks to Craig Perras for - reporting this problem. - - * ace/Message_Block.cpp: Replaced an explicit acquire()/release() - of ACE_Lock::locking_strategy_ with a call to an ACE_Guard. - - * ace/Containers.cpp (set): Optimized for the common case where - we're increasing the size of the set by 1. - - * ace/Containers: Merged the ACE_Set_Node, ACE_Stack_Node, and - ACE_Set_Node into a single "ACE_Node" class. This tidies up the - code quite a bit. - - * ace: Removed the Set.* and Stack.* files and replaced them with - the Containers.* files. This file contains the ACE_*Stack, - ACE_*Queue, and ACE_*Set classes. If this revised file scheme - breaks existing code please let me know and I'll provide - backwards compatibility. - - * ace/Stack: Changed the name of ACE_Unbounded_Queue::enqueue() to - ACE_Unbounded_Queue::enqueue_tail() and also added - ACE_Unbounded_Queue::enqueue_head(). - - * ace/OS: Changed the names of the parameters of the ACE_OS::mem* - methods from ACE_OS::mem* (void *s, const void *t) to - ACE_OS::mem* (void *t, const void *s) since "t" should stand for - "target" and "s" for "source." Thanks to Andres Kruse - for pointing this out. - - * ace/Stack: Removed the peek() method from ACE_Unbounded_Queue. - This functionality is now subsumed by the get(..., 0) method. - If this breaks any existing code please let me know. - - * ace/Stack.h: Moved all the functionality from ACE_Unbounded_Set - into ACE_Unbounded_Queue. That's really where this belonged in - the first place. Thanks to David Levine for noticing this. - - * ace/Set.h: Moved ACE_Set_Node from the *.cpp file into the *.cpp - file in anticipation of AIX C++ compiler bugs ;-). - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: - Rearranged the location where we register to receive standard - input so that the socket handle will not be initialized at this - point. Thanks to craig perras for - reporting this. - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp - (Event_Transceiver): Make sure to #ifdef around SIGQUIT for - WIN32 since it lacks this signal. Thanks to craig perras - for reporting this. - - * ace/config-osf1-4.0-g++.h: Removed the ACE_LACKS_SIGNED_CHAR - since this seems to be compiler specific. Thanks to Thilo for - this insight. - - * ace/Strategies_T: Added a number of fixes and enhancements to - the new Hash_Addr and ACE_Cached_Connect_Strategy classes. - - * ace/Strategies_T.h: Added #include for "Hash_Map_Manager.h". - Thanks to Amos Shapira for reporting this. - - * ace/config-hpux-10.*.h: Applied a number of patches courtesy of - Carlos O'Ryan. - - * ace/Dump.cpp: Changed a cast from - - delete (ACE_Dumpable_Ptr *) this->dumper_; - - to - - delete (ACE_Dumpable *) this->dumper_; - - This fixes a potential bug. Thanks to Carlos O'Ryan for this - bug report. - - * ace/DEV_IO.h, - * ace/SPIPE_Stream.h: Removed the = 0 default value for one send() - method to avoid ambiguity with the other send() method. Thanks - to Carlos O'Ryan for this bug report. - - * ace/Map_Manager.cpp (advance): Removed a cast to size_t since - that is always true. Thanks to David Levine for pointing this - out. - - * ace/XtReactor: Moved the remove_handler_i() and - register_handler_i() methods into the protected portion - of the class. Since these should never be called by the - client I've moved them into protected portion to ensure this - is the case. - - * ace/XtReactor: Changed the implementation of the XtReactor to - use long for dealing with timers. Thanks to Stuart Powell - for reporting this. - -Mon May 5 17:16:41 1997 Carlos O'Ryan - - * ace/config-hpux-10.x.h, config-hpux-10.x-nothread.h: - Some patches are needed to compile ACE under HP-UX (using HP/C++), - I documented those patches. - -Mon May 05 11:50:39 1997 David L. Levine - - * netsvcs/lib/Server_Logging_Handler.cpp: fixed ACE_Svc_Handler - specializations, yet again, for Linux w/LXPthreads. Thanks to - Luis Lopes for reporting this - problem with sufficient detail for us to track it down. - - * ace/Stack.* (ACE_Unbounded_Queue): - - 1) made peek () const. - 2) added another peek (u_int index = 0) function that can peek - at any queue item, not just the first. It returns a pointer - to the item (or 0 if not found), to avoid copying. - 3) changed return type of size () from int to size_t. - 4) inlined size (). - - * ace/Strategies_T.cpp (connect_svc_handler, operator==): - added return type. - - * netsvcs/lib/Server_Logging_Handler.cpp: fixed template - specializations for platforms that have neither THREADS nor - TLI. Thanks to Nanbor Wang for reporting this. - -Sun May 4 12:34:09 1997 Douglas C. Schmidt - - * ace/OS.cpp: If ACE_HAS_THREADS isn't defined then we'll just - use mktime() without the locking. - - * ace/Set: Removed the get() methods from the ACE_Fixed_Set and - ACE_Bounded_Set since they don't make much sense on these - abstractions. - - * ace/Set: Changed the new "find" method to be called "get" to - correspond to the new "set" method I'm adding. - - * ace/SString.cpp: Added a operator << for ACE_CString in - order to print it with iostreams. - - * ace/Set.cpp: Added a reset method to the ACE_Unbounded_Set to - remove all the nodes without completely destroying the set. - - * ace/SString: Added friend operator+ to both ACE_CString and - ACE_WString in order to provide a concatenation operator. - - * ace/SString: Added a compare() method to all the ACE String - classes. This behaves just like the Standard C library strcmp() - function. - - * ace/Message_Queue.i: Oddly, there were a bunch of methods - defined in this *.i file that didn't have ACE_INLINE in front of - them. I'm surprised this didn't give compile errors on some - platforms. I've fixed this by moving these methods into the - *.cpp file. - - * ace/Stream, - ace/Service_Repository, - ace/Reactor, - ace/Message_Queue, - ace/Map_Manager, - ace/Malloc_T, - ace/Hash_Map_Manager, - ace/Set: Added a done() method on all the iterators so that - we can check within the iteration itself to see if there are any - remaining elements. In addition, updated the return value of - advance() on all iterators so that it returns 1 if we're not - done and 0 if we're done. - -Sun May 04 07:22:49 1997 David L. Levine - - * ace/Timer_Heap_T.cpp: changed some more int declarations to longs. - -Sat May 3 17:38:19 1997 Douglas C. Schmidt - - * Changed all uses of Reactor::{scheduler_timer,cancel}() and - Timer_{Queue,List,Heap,Wheel}::{schedule,cancel}() to use - long rather than int. This is important since it ensures that - we can make the Timing Wheels trick of casting the - Timer_Node * to long work correctly on machines that have 64 - bit pointers, 64 bit longs, and 32 bit ints (e.g,. DEC - ALPHA). Thanks to Thilo Kielmann - for pointing this out, - even though he finds this solution distasteful ;-). - - * netsvcs/lib/TS_Clerk_Handler.cpp (initiate_connection): I - believe there was also a bug here -- if schedule_timer() returns - 0 that's not an error! - - * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp - (initiate_connection): I believe there was a bug here -- if - schedule_timer() returns 0 that's not an error! - - * tests/IOStream_Test.cpp: Added some minor changes for DEC UNIX. - Thanks to James CE Johnson for reporting - this. - - * ace/IOStream: Added a number of minor changes for DEC UNIX. - Thanks to James CE Johnson for reporting - this. - - * ace/config-osf1-4.0.h: Added - ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS to the config.h file. - Thanks to James CE Johnson for reporting - this. - - * ace/SString: Made the ace_string_null_string_ a static data - member rather than an external constant. This should control - the name space a bit better. - - * ace/SString.cpp: Fixed the ACE_CString::operator += so that it - won't screw up if this->rep_ initially points to the - ACE_String_null_string_. - - * examples/Misc: Added a new test_set.cpp program that exercises - the ACE_*_Set classes. - -Sat May 03 06:56:10 1997 David L. Levine - - * ace/Map_Manager.cpp (dtor): removed void return (typo). - - * ace/Set.cpp (ACE_Fixed_Set::operator =): typo: fs instead of bs. - - * ace/Set.cpp (ACE_Fixed_Set::find): typo: index instead of i. - - * ace/IOStream.cpp: fixed typo: "#if defined" instead of just "#if". - - * tests/Conn_Test.cpp, - netsvcs/lib/{Client_Logging_Handler,TS_Clerk_Handler}.cpp, - netsvcs/clients/Tokens/manual/manual.cpp, - apps/Gateway/Gateway/Event_Channel.cpp,: - apps/JAWS/client/Blob.cpp, - examples/ASX/Event_Server/Event_Server/Peer_Router.cpp, - examples/ASX/Event_Server/Transceiver/transceiver.cpp, - examples/ASX/UPIPE_Event_Server/{Consumer,Supplier}_Router.cpp, - examples/Connection/misc/test_upipe.cpp, - examples/Connection/non_blocking/test_*_connector.cpp: added - ACE_Map_Entry template specialization. It's needed now that the - destructor is explicit. - -Fri May 2 14:57:56 1997 Douglas C. Schmidt - - * ace/Map_Manager.cpp: Added a no-op destructor to ACE_Map_Entry - just to keep some compilers happy. Thanks to Chuck Gehr for - reporting this. - - * ace/config-osf1-4.0.h: Added - - #define ACE_LACKS_IOSTREAM_FX - #define ACE_LACKS_LINEBUFFERED_STREAMBUF - #define ACE_LACKS_SIGNED_CHAR - - Thanks to James CE Johnson for reporting - this. - - * ace/Timer_{Wheel,Heap,List}_T.h: Fixed a typo in all these - classes that was failing to put the keyword "class" after - "friend." Also, replaced the use of the typedef with the - expanded name of the class to work around problems with DEC - C++. Thanks to James CE Johnson for - reporting this. - - * ace/Set: Added a find() method that will return the "ith" - element in the set. - - * ace/Set: Added copy constructors and assignment operators to all - the ACE_*_Set classes. - - * ace/Set.cpp: Changed the implementation of ACE_Unbounded_Set to - use a dummy node and a circular list. This improves performance - and also makes it possible to implement "queue" semantics for - inserting at the tail of the set. - - * ace/config-osf1-4.0.h: Added the ACE_HAS_STRING_CLASS macro. - Thanks to James CE Johnson for this. - - * ace/IOStream: Added the ACE_HAS_STRING_CLASS macro to - replace the nasty #ifdefs we had previously. Thanks to - James CE Johnson for this. - - * ace/config*.g++: Added ACE_HAS_STRING_CLASS for all the GNU - compilers and Win32. - - * ace/config-mvs.h: Added a new version that contains support for - IBM OS/390 r2. Thanks to Chuck Gehr for this. - -Fri May 02 08:14:30 1997 David L. Levine - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: removed - specializations of ACE Guards because they're in libGateway. - Thanks to Joey Zhu for reporting this problem. - - * examples/ASX/Event_Server/Transceiver/{Makefile,transceiver.cpp}: - added template specializations to transceiver.cpp so that it no - longer needs to be linked with libGateway. - - * examples/ASX/Event_Server/Event_Server/{Makefile,Peer_Router.cpp}: - added template specialization to Peer_Router.cpp so that event_server - no longer needs to be linked with libGateway. - - Thanks to Joey Zhu for reporting the above - link problems. - - * apps/Gateway/Peer/{Makefile,Peer.cpp}: added template - specialization to Peer.cpp so that peerd no longer needs to - be linked with libGateway. - - * Log_Msg.cpp (VxWorks only): fixed used of ::taskDeleteHookAdd (it - should only be called once for all Log_Msg instances) and added call - to ::taskDeleteHookDelete to clean up when the last task exits. - Thanks to Dave Mayerhoefer for - reporting this. - - * tests/Conn_Test.cpp: changed some fprintf print specifiers to avoid - g++ warnings about printing pointer values. - -Thu May 01 00:05:59 1997 - - * tests/Time_Service_Test.cpp (main): Made sure that the backing - store is not there at the start of the program. We need to make - sure because this test kills the Time Clerk and on some - platforms the Clerk is not allowed to do a graceful shutdown. By - cleaning the backing store here, we are sure that we get a fresh - start and no garbage data from a possible aborted run. - - The old code deleting the backing store at the end of the test - is still there but does not work on Win32 as unlink fails with - ERROR_ACCESS_DENIED. I am not sure why this is happening! For - now the unlink at the start of the program will do. - - Also added a wait for the clerk before deleting the backing - store. This way we are sure that we do not delete the backing - store before the clerk is done with it. - - * netsvcs/lib/TS_Clerk_Handler.cpp: Fixed an obscure bug with - ACE_TS_Clerk_Processor. ACE_TS_Clerk_Processor (which is an - ACE_Connector) and all its pending connection objects are still - registered with the Reactor when the process exits and the - Service_Object is deleted. After this the destructor of the - Reactor then calls handle_close on ACE_TS_Clerk_Processor - (which does not exist anymore), causing a seg fault. The - solution is to call ACE_Connector::fini from - ACE_TS_Clerk_Processor::fini. ACE_Connector::fini will - unregister ACE_TS_Clerk_Processor and all pending connects from - the Reactor. - -Wed Apr 30 17:47:11 1997 Douglas C. Schmidt - - * ace/OS.i (getpwnam_r): Changed the expression to check if - getpwnam_r() returns -1 for AIX. Thanks to Chris Lahey for - this. - - * ace/Timer_Wheel_T.h: changed - - // = Don't allow these operations for now. - ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T &); - void operator= (const ACE_Timer_Wheel_T &); - - to: - - // = Don't allow these operations for now. - ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T &); - void operator= (const ACE_Timer_Wheel_T &); - - Thanks to Chuck Gehr for reporting this. - - * ace/OS.cpp: Made mktime() thread-safe. If any platforms support - multi-thread safe versions of mktime() please let me know so we - can set the ACE_HAS_MT_SAFE_MKTIME macro for that config file. - - * ace/OS.i: Added a new special case for getpwnam_r() on AIX. - Thanks to Chris Lahey for reporting this. - -Wed Apr 30 16:01:04 1997 James C Hu - - * ace/OS.i, ace/OS.h: added mktime(). - -Wed Apr 30 14:17:34 1997 David L. Levine - - * ace/config-vxworks*.h: added ACE_LACKS_PWD_FUNCTIONS. Thanks - to Dave Mayerhoefer for reporting - this. - - * ace/OS.i: cleaned up ACE_LACKS_PWD_FUNCTIONS comments a bit. - - * ace/Array.{h,i}: added const operator []. - - * ace/Array.cpp (ctors): reordered initializers to match declaration - order. - - * netsvcs/lib/Server_Logging_Handler.cpp: protect against multiple - inclusion. Thanks to Kevin Martindale - for reporting this problem. - -Wed Apr 30 08:42:55 1997 Douglas C. Schmidt - - * ace: Added a new generic Array class, which we'll use until - STL becomes more widely portable. - - * ace: Added a new macro ACE_LACKS_GETPGID to clean up the code - in ACE_OS::getpgid(). - - * ace: Added new config*.h files and platform*.GNU files for - FreeBSD. Thanks to Nanbor Wang for these. - -Wed Apr 30 07:44:36 1997 David L. Levine - - * ace/config-osf1-4.0*.h: removed ACE_HAS_SIGWAIT. - - * ace/OS.{h,i}: applied Thilo's patch for sigwait on Digital - Unix 4.0, which defines sigwait as a macro. Thanks to - Thilo Kielmann for - this and the above config file patches. - - * ace/IOStream.{h,cpp}: James CE Johnson updated - the IOStream class; see comments in IOStream.h. - - * examples/Logger/client/logging_app.cpp (main), - performance-tests/Misc/test_naming.cpp (*): replaced sprintf - with ACE_OS::sprintf. Thanks to Thilo Kielmann - for reporting these. - -Tue Apr 29 20:03:38 1997 - - * apps/JAWS/stress_testing/http_tester.cpp : Removed usage - of pow (), and changed method of calculating throughput/latency - to use straight multiplication instead of pow (). Updated - Makefile to not link -lm. - -Tue Apr 29 19:57:52 1997 - - * config-win32-common.h (ACE_HAS_TEMPLATE_SPECIALIZATION): Win32 - supports this option. Added to config file. - - * ace: Removed tracing for the following to make things work with - tracing on: - - ACE::timestamp - ACE_FIFO_Send_Msg::send - ACE_SPIPE_Stream::send - ACE_Sig_Guard::ACE_Sig_Guard - ACE_Sig_Guard::~ACE_Sig_Guard - - * netsvcs/servers/main.cpp (main): Added special code for Win32 - such that only SIGINT is being registered with the Signal - Handler. SIGQUIT is not supported on Win32. - - * netsvcs/lib/Token_Handler.cpp (init): Removed the registration - of the Acceptor for SIGINTs. - - * netsvcs/lib/TS_Server_Handler.cpp (init): Same as above. - - * netsvcs/lib/Client_Logging_Handler.cpp (open): Removed the - registration of SIGPIPE for Win32. Win32 does not support - SIGPIPE. - - * tests/Process_Strategy_Test.cpp (server): The new thread must - become owner before it can call Reactor::handle_events. Also - fixed #define typo. - - * ace/OS.cpp (socket_fini): Remove the ACE error message as the IO - Stream objects are already gone by this point in the program. - - * examples/Registry/Registry.mak: Replaced the old makefiles with - this one. Also added _AFXDLL as a preprocessor define, forcing - the correct inclusion of header files that give a consistent - definition of HKEY. This is a hack till we have a better - solution. - - * ace/Event_Handler: Removed the old Proactor callback methods. - -Tue Apr 29 17:39:40 1997 Douglas C. Schmidt - - * ace/config-mvs.h: Added #define ACE_LACKS_LINEBUFFERED_STREAMBUF - for MVS. Thanks to Chuck Gehr for - reporting this. - - * ace: Commented out ACE_TRACE calls in constructors in - several ACE classes in order to avoid problems with circular - initialization dependencies related to mutexes that are - breaking code on WinNT when ACE_NTRACE is set to 0. Thanks - to Lothar Hermann for - reporting these. - - * ace/Reactor.cpp: It looks as if Windows NT isn't returning - the number of bytes requested by a WinSock recv() used in - the ACE_Reactor::notify() in some situations. This is - causing problems for test programs under heavy load. The - fix appears to be to add an additional ACE::recv() to obtain - the remaining bytes. Thanks to Karlheinz for reporting this - and to Irfan for helping to fix it. - - * ace/OS.i: Fixed a very subtle bug with ACE_OS::cond_wait() and - ACE_OS::cond_signal() that only manifests itself when - ACE_HAS_SIGNAL_OBJECT_AND_WAIT is enabled (which isn't the - default). The problem stemmed from the fact that we were - assuming that if we used condition variables it implied that the - external mutex had USYNC_PROCESS scope. In fact, the external - mutexes typically have USYNC_THREAD scope, so - SignalObjectAndWait() was hanging indefinitely. Fortunately, - the fix was easy -- just add a run-time check for the type of - the external mutex and take the appropriate action. Thanks to - Irfan for noticing this. - - * tests/Reader_Writer_Test.cpp: Added a parse_args() function that - allows us to override the default number of reader/writer - threads + the number of iterations. - - * ace/OS: Added patches for Digital UNIX to handle the - getpwnam_r() name. Thanks to Thilo Kielmann - for these patches. - -Tue Apr 29 14:27:19 1997 - - * OS.h: Added ACE_HAS_SVC_DLL. If you write a library and - want it to use ACE_Svc_Export, this will cause those macros - to build dlls. If you want your ACE service to be a static - library, comment out this line. As far as I know, the only - reason to have a library be an ACE "service" is to leverage - the ACE_Svc_Export macros. It's just as easy to define your - own export macros. - -Tue Apr 29 07:25:25 1997 David L. Levine - - * apps/JAWS/server/HTTP_Request.h (HTTP_Request): added destructor - declaration. - - * apps/JAWS/server/Parse_Headers.cpp (parse_header_line): assign local - "value" to value_ field of map_[header]. - - * apps/JAWS/server/HTTP_Request.cpp (HTTP_fix_path): commented this - static function out because it's not used, and g++ warns about that. - - * apps/JAWS: added CVS header to all .h, .i, and .cpp files. - -Tue Apr 29 00:33:46 1997 - - * examples/Reactor/Misc/notification.cpp: Add this test to the - Win32 makefile. - - * ace: Removed config-win32-msvc2.0.h, config-win32-msvc4.0.h - config-win32-msvc4.x.h, and config-winnt-4.0-msvc.h from the - repository. These files have been replaced by config-win32.h - and config-win32-common.h. - - * IOStream_Test.cpp (main): Added return 0 at the end of main(). - - * examples/Reactor/Proactor/test_proactor.mak: Added wsock32.lib - to the link line. I am not sure why we have to do this again - since ace.lib already includes it. Without this library in the - link line, GetAcceptExSockaddr is not defined. Go figure! - - * apps/JAWS/server/jaws.mak: Same as above. - - * ace/ace.{mak,mdp}: Fixed the generation of the release version - of ace.dll such that wsock32.lib is automatically included. - -Tue Apr 29 00:16:27 1997 James C Hu - - * JAWS: Changes to support CGI scripts - - Changed the following files -- - HTTP_Handler.cpp HTTP_Handler.h HTTP_Helpers.cpp - HTTP_Helpers.h HTTP_Request.cpp HTTP_Request.h IO.cpp IO.h - - Added the following files -- - HTTP_Response.cpp HTTP_Response.h Parse_Headers.cpp - Parse_Headers.h - - Removed the file -- - JXH_String.h - - * JAWS/stress_testing: Changed the Makefile to link in the math - library (-lm). - - * ace/OS.h and ace/OS.i: Added support for memmove(). - -Mon Apr 28 21:35:35 1997 Douglas C. Schmidt - - * ace/IOStream.h: Added a new macro called - ACE_LACKS_IOSTREAM_SETGET, which works around bugs with SGI C++ - on IRIX 6.2. Thanks to Torbjorn Lindgren for - reporting this. - - * ace/Timer_List_T.h: Replaced the use of - ITERATOR with ACE_Timer_Queue_Iterator_T to - work around problems with SGI C++. Thanks to - Torbjorn Lindgren for reporting this. - - * ace/Timer_List_T.cpp: Removed the use of NODE * and replaced it - with ACE_Timer_Node_T in order to work around - bugs with certain C++ compilers (i.e., SGI). Thanks to Torbjorn - Lindgren for reporting this. - - * tests/Conn_Test.cpp: Removed some extraneous template - specializations. Thanks to Nanbor Wang for - reporting these. - - * apps/JAWS/client/Blob.cpp: Rearranged some of the template - specializations in the hope of fixing a linker problem with - SunC++ 4.2. - - * ace/config-irix-6.2*.h. It appears that SGI IRIX 6.2 supports - pread() and pwrite() so I enabled the ACE_HAS_P_READ_WRITE macro - in the IRIX 6.2 config file. - - * ace/OS.cpp: Implemented ACE_OS::pread() and ACE_OS::pwrite() for - systems that lack this feature. The implementation uses the new - ACE_Thread_Mutex monitor lock in order to ensure atomicity - between the lseek() and the read()/write(). - - * ace/OS.cpp: Finally broke down and added a ACE_Thread_Mutex - monitor lock to the ACE_OS implementation file. This is useful - for situations where we need to serialize certain ACE_OS - emulation calls (e.g., ACE_OS::{pwrite,pread}). - -Mon Apr 28 15:42:48 1997 David L. Levine - - * apps/JAWS/client/blobby.cpp: updated template specializations. - - * apps/JAWS/stress_testing/global.h: removed #includes of system - headers because ace/OS.h takes care of them. They were causing - warnings with g++ (because they were #included before OS.h). - - * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: fixed - typos in template specializations. - - * tests/Conn_Test.cpp,Message_{Block,Queue}_Test.cpp, - Process_Strategy_Test.cpp: fixed template specializations - for platforms without threads. Thanks to Nanbor Wang - for pointing out this problem. - - * ace/Connector.h: use ACE_SYNCH_RW_MUTEX in Map typedefs - instead of old ACE_RW_Mutex (which should have been - ACE_Thread_RW_Mutex) and ACE_Null_Mutex (depending on - whether the platform has threads). - - * ace/Service_Record.cpp: added ACE_NULL_SYNCH template - specializations with threads, because they're still needed even - with threads. This way, individual programs don't have to - specialize these. - - * ace/Task.cpp: added ACE_TSS and - ACE_TSS template specializations, if the platform - has threads and TSS. This way, individual programs don't have - to specialize them. - - * apps/Gateway/Gateway/Event_Channel.cpp, - Proxy_Handler{,_Connector}.cpp,apps/JAWS/server/HTTP_Server.cpp, - examples/ASX/Event_Server/Transceiver/transceiver.cpp, - examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp, - examples/Connection/blocking/SPIPE-connector.cpp, - examples/Connection/misc/{Connection_Handler,test_upipe}.cpp, - examples/Connection/non_blocking/test_*.cpp, - examples/IOStream/server/iostream_server.cpp, - examples/Logger/Acceptor-server/server_loggerd.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp, - netsvcs/lib/Client_Logging_Handler.cpp, - netsvcs/lib/TS_{Clerk,Server}_Handler.cpp: - removed template instantiations that are now in - ace/Service_Record.cpp and ace/Task.cpp. This should help - on platforms without threads. - - * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: fixed - typos in template specializations. - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: protected - the ACE_*Guard template instantiations with #ifdef ACE_HAS_THREADS. - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: protected - the ACE_*Guard template instantiations with #ifdef ACE_HAS_THREADS. - - * apps/JAWS/stress_testing/benchd.cpp (serve): added return -1 if - the strcmp () fails so that the function always returns a value. - -Mon Apr 28 18:53:58 1997 Darrell Brunsch - - * ace/OS.h: Added ACE_DEFAULT_TIMER_WHEEL_SIZE and - ACE_DEFAULT_TIMER_WHEEL_RESOLUTION constants. - - * ace/Timer_Wheel_T.h: switched to use these constants - - * tests/Timer_Queue_Test.cpp: switched to use these constants - - * ace/Timer_Wheel: added a new strategy for Timer Queues, one - based on a hash table of ordered lists. - - These files were added: - - - ace/Timer_Wheel.h - - ace/Timer_Wheel_T.h - - ace/Timer_Wheel_T.cpp - - These files were also changed to accomodate Timer Wheel - - - ace/Timer_Queue.cpp - - ace/Timer_Queue_T.h - - ace/Timer_Queue_T.cpp - - tests/Timer_Queue_Test.cpp - -Mon Apr 28 17:32:04 1997 Chris Cleeland - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Added - template specializations. - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: Added - template specializations. - - * ace/OS.cpp (thr_create): Hopefully resolved tension - btw. priority determination algorithms for IRIX, LinuxThreads, and - DEC UNIX 4.0. Thanks to Thilo for information that lead to this. - -Mon Apr 28 00:25:17 1997 - - * apps/JAWS/client: Removed ACE_Export macro from class - declarations. Fixed buffer size bug in - ACE_Blob_Reader::receive_reply (). - -Sun Apr 27 22:22:14 1997 - - * ace/Proactor: The Proactor can now be registered with ReactorEx - and both of them can be run from ReactorEx's event loop. Added a - flag to Proactor's constructor that indicates whether the - Proactor will be used in conjunction with ReactorEx event - loop. Only if this flag is set will the event in the Proactor be - used by the Asynch IO components. This will help with - performance. - - * examples/Reactor/Proactor/test_multiple_loops.cpp: Added a new - test that shows the integration of the event loops of Proactor - and ReactorEx. - - * ace/Asynch_IO: Added an ACE_EVENT parameter to the constructors - of classes that inherit from the OVERLAPPED structure. This way - the Proactor's event_ can be set in the OVERLAPPED structure. - - Also changed the open methods on the Asynch IO classes to take a - Proactor as an extra parameter. - - Changed ACE_Handler's handle_timeout() to handle_time_out() in - ACE_Handler. This is temporary till we decide on the argument - about mixing the interface of ACE_Event_Handler and - ACE_Handler. This change allows user to inherit from ACE_Handler - and ACE_Event_Handler and use the different handle_timeout() - method, one of which returns void and the other return an int. - - * examples/Reactor/Proactor/test_timeout.cpp: This file got - affected by the above change. - -Sun Apr 27 17:44:28 1997 Douglas C. Schmidt - - * ace/OS.h: Added a new #define called ACE_DEFAULT_HTTP_SERVER_PORT. - Naturally, this defaults to 80... - - * apps/JAWS/client/blobby.cpp: Cleaned up the blobby example so - that it conforms more closely to the ACE style guide. - - * examples/IPC_SAP/SOCK_SAP/CPP-in{server,client}.cpp: Took out - the VxWorks-specific #ifdefs. I believe this is fixed in ACE_OS - now. If not, the burden of proof is on the VxWorks testers to - prove me wrong ;-). - - * ace/Synch_T.h: Added a new macro ACE_SYNCH_RW_MUTEX to - complement the existing ACE_SYNCH_MUTEX and ACE_SYNCH_CONDITION - macros. This will clean up lots of code in various test - programs. - - * ace/Synch_T.h: Added two new macros, ACE_SYNCH_MUTEX and - ACE_SYNCH_CONDITION. These default to ACE_MT_SYNCH::MUTEX and - ACE_MT_SYNCH::MUTEX if template typedefs are supported and - ACE_HAS_THREADS is enabled. If template typedefs *aren't* - supported but ACE_HAS_THREADS is enabled these macros turn into - ACE_Thread_Mutex and ACE_Thread_Condition. Finally, if - ACE_HAS_THREADS is disabled these macros turn into - ACE_Null_Mutex and ACE_Null_Condition. These macros make it - possible to write code that is more portable across platforms - and configurations. Thanks to Carlos O'Ryan for this - suggestion. - - * ace/OS.h: Replaced all uses of ACE_SYNCH_MUTEX and - ACE_SYNCH_CONDITION with ACE_SYNCH_MUTEX_T and - ACE_SYNCH_CONDITION_T since (1) this usage relates to templates - and (2) it frees up the namespace for the new ACE_SYNCH_MUTEX - and ACE_SYNCH_CONDITION macros. - - * ace/Timer_Queue.cpp: Added yet more template specializations for - the benefit of GCC (ugh). - - * ace/Timer_Wheel_T.cpp: Had to revise things just a bit to - compile with GCC and it's lame template mechanism. This - required changing NODE * to ACE_Timer_Node_T * in - several method definitions. - - * apps/JAWS/server/HTTP_Server.h: Changed the use of ACE_WIN32 to - ACE_HAS_THREAD_SAFE_ACCEPT since this is a more precise way to - determine if the platform allows multiple threads to call - accept() on the same port. If other platforms support this - feature please make sure to add it to their config*.h files. - - * ace/config-win32-common.h: Defined ACE_HAS_THREAD_SAFE_ACCEPT, - since Win32 allows multiple threads to call accept() on the same - port. - - * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: The mutex - should be ACE_RW_Mutex, not ACE_Null_Mutex... - -Sun Apr 27 18:13:24 1997 Irfan Pyarali - - * ace/Proactor.h: Added Timer_Wheel support. - -Sun Apr 27 18:13:24 1997 Sumedh Mungee - - * apps/JAWS/client: Removed blobby.h, and replaced it with - blobby_options.{h,cpp}. - - * apps/JAWS/stress-testing: Removed unused argument warnings - etc. - -Sun Apr 27 07:41:44 1997 David L. Levine - - * ace/Timer_Queue.cpp: added #includes for template specializations, - and removed some unused specializations. - - * ace/Timer_Wheel_T.cpp: added newline at end of file. - - * ace/Timer_Wheel_T.cpp (ACE_Timer_Wheel_T ctor): reordered - initializers to match declaration order. - - * ace/Log_Msg.cpp (log): added support for indenting output according - to the current nesting level by adding a new format specifier, I, - which indents the output according to the current trace_depth_. - If a width is also specified it is taken as multiplier (so that - the indentation is n*trace_depth_). Thanks to Matthias Kerkhoff - for providing the code for this feature! - - * examples/Reactor/Misc/test_timer_queue.cpp: fixed typos in - #includes, and added #include of ace/Timer_Heap.h. - -Sat Apr 26 17:19:56 1997 Irfan Pyarali - - * ace/Timer_Queue.cpp: The correct Timer_Queue.cpp file was not - checked in. Also the necessary #include was missing. - - * ace/Proactor.h: Proactor need all three Timer include files. - - * ace/ace.{mdp,mak}: Updated for changes to Timer files. - - * ace: Updated the following files to include /**/ before an - include file directive: OS.h, config-win32-common.h, - bstring.h. Thanks to Matthias Kerkhoff - for reporting this. - -Sat Apr 26 13:41:15 1997 Douglas C. Schmidt - - * ace/config-sco-5.0.0-mit-pthread.h: Added - ACE_LACKS_PTHREAD_CANCEL. Thanks to Arturo Montes - for reporting this. - - * ace: Came up with a scheme that allowed us to remove the - ace/Timers.{h,i,cpp} files by adding - ACE_Timer_{Queue,Heap,List}_T.{h,i,cpp} files instead. Thus, no - existing code should break. - -Fri Apr 25 17:17:06 1997 Chris Cleeland - - * ace/OS.cpp (thr_create): Fixed the fix from Thilo so that it - compiled properly on Linux. Hopefully I didn't break his, and I - should have detected the problem earlier. Mea culpa. - -Fri Apr 25 12:45:23 1997 Douglas C. Schmidt - - * ace/OS.h: Added a new macro called ACE_HAS_SIG_MACROS for the - case where the frigging OS defines things like sigismember and - sigfillset as macros (ugh). - - * ace/FILE_IO.h: Removed a trailing default initializer from the - send() method since it was ambiguous. Thanks to Carlos O'Ryan - for reporting this bug. - - * ace/OS.i (select): Unfortunately the (operator timeval*) defined - for ACE_Time_Value was not used in ACE_OS::select (int width, - fd_set *rfds, fd_set *wfds, fd_set *efds, const ACE_Time_Value - *timeout) because the operator cannot be applied for a - ACE_Time_Value*. Therefore, I fixed this as follows: - - ACE_SOCKCALL_RETURN (::select (width, - (ACE_FD_SET_TYPE *) rfds, - (ACE_FD_SET_TYPE *) wfds, - (ACE_FD_SET_TYPE *) efds, - timeout == 0 ? 0 : (timeval *) *timeout) , int, -1); - - Thanks to Carlos O'Ryan for reporting this bug. - - * ace: Applied a slew of patches from Carlos O'Ryan in order to - get ACE to compile on HP/UX 10.x with the aCC compiler. - - * ace/Shared_Memory_MM: Export the filename in - ACE_Shared_Memory_MM class in order to aid debugging. Thanks to - Ashish Singhai for reporting - this. - -Fri Apr 25 14:58:38 1997 Irfan Pyarali - - * ace/Timers: Updated the following files to make it compile on - g++. The following files were updated: - - Proactor.cpp Timer_Heap.cpp Timer_List.cpp Timer_Queue.cpp - Timers.cpp - -Thu Apr 24 21:13:51 1997 - - * ace/Timer_Queue: Decoupled the Timer Queue from - ACE_Event_Handler and the callback routines in the handler - (handle_timeout and handle_close). The new Timer Queue is - parameterized by the type of data to store and a FUNCTOR on - which methods are invoked by the Timer Queue when timeouts and - cancellations occur. - - No changes occured to the algorithms of the different - implementations of the Timer Queues (Timer List and Timer - Heap). Timer Queues, Timer List, and Timer Heap were all renamed - as _T. However, typedef were added such that there is now - an ACE_Timer_Queue, ACE_Timer_Heap, and ACE_Timer_List, each - being an instantiation of the respective template classes. The - instantiation is done with ACE_Event_Handler as the type of data - to be stored in Timer Queue and - ACE_Event_Handler_Handle_Timeout_Upcall as the FUNCTOR that does - the appropriate upcall to ACE_Event_Handler. - - Due to these typedefs, 99.9% of existing code should not - break. However, the following two will cause problems: - - (a) Forward declarations of Timer_Queue will not work! This is - because Timer_Queue is now a typedef and not a class. - - (b) #include "ace/Timer_Queue.h" will not be enough to get the - ACE_Timer_Queue typedef. The new typedefs are in a new file - called Timers.h. This file also has typedefs for ACE_Timer_Heap - and ACE_Timer_List. - - Currently Proactor is the only class that uses a different - instantiation of the Timer Queue class. Proactor's Timer Queue - class is instantiated with ACE_Handler as the type of data to be - stored in Timer Queue and ACE_Proactor_Handle_Timeout_Upcall as - the FUNCTOR that does the appropriate posting to the Proactor's - completion port. - - The Upcall Strategy is not needed any more cause it is replaced - by the FUNCTORs. Thus this is removed. - - Small modifications were made to the following files - because of the changes to Timer_Queue. - - - examples/Reactor/Misc/test_timer_queue.cpp - - examples/Reactor/Proactor/test_timeout.cpp - - tests/Timer_Queue_Test.cpp - - ace/Makefile (both UNIX and Win32) - - ace/Connector.h - - ace/Reactor.h - - ace/ReactorEx.h - - ace/Proactor.h - - * ace/Proactor: Proactor now uses the new timer queues. Proactor's - Timer Queue class is instantiated with ACE_Handler as the type - of data to be stored in Timer Queue and - ACE_Proactor_Handle_Timeout_Upcall as the FUNCTOR that does the - appropriate posting to the Proactor's completion port. This will - help reduce the overhead of creating new act for each - timer. This also enables the cancellation of entire - ACE_Handlers. - - * examples/Reactor/Misc: Added Win32 makefiles. - - * ace/Shared_Memory_MM.i: Fixed typo. - - * ace/SOCK_Connector.cpp: Fixed typo. - -Thu Apr 24 13:56:28 1997 Douglas C. Schmidt - - * ace/SOCK_Dgram.cpp: Added support for FreeBSD (i.e., BSD 4.4) - features for passing file descriptors between processes. Thanks - to Nanbor Wang for reporting this. - - * ace/LSOCK_Stream.cpp: Added support for FreeBSD (i.e., BSD 4.4) - features for passing file descriptors between processes. Thanks - to Nanbor Wang for reporting this. - - * ace/LSOCK.cpp: Added support for FreeBSD (i.e., BSD 4.4) - features for passing file descriptors between processes. Thanks - to Nanbor Wang for reporting this. - - * ace/SOCK_Connector.cpp (complete): There's a bug in WinNT that - causes non-blocking connects to fail. The workaround is to - sleep for 1 millisecond. Thanks to Steve Huston - for reporting this. - - * ace/Connector.cpp (handle_output): There's a bug in WinNT that - causes non-blocking connects to fail. The workaround is to - sleep for 1 millisecond. Thanks to Steve Huston - for reporting this. - - * tests/Conn_Test.cpp: Changed from operator != to operator == to - be consistent with what is required by the ACE_Hash_Map_Manager. - - * ace/Hash_Map_Manager: Factored out the equality comparison into - an equal() method in order to facilitate template - specialization. In addition, rather than using the != operator - we now default to using the operator== operator and negating the - result. This is consistent with the behavior of the - ACE_Map_Manager. - - * ace/Map_Manager: Factored out the equality comparison into an - equal() method in order to facilitate template specialization. - - * ace/OS.i: Added a new #ifdef called ACE_LACKS_PTHREAD_CANCEL. - I'm not sure which platforms should set this, but it fixes - a bug with ACE_OS::thr_cancel(). Thanks to Eric Dean - Russell for reporting this. - - * tests/Process_Strategy_Test.cpp (handle_input): We were - comparing EOF to a char, which gets complaints on platforms - where char is unsigned by default. I added a cast of EOF to - char to fix this. Thanks to Amos Shapira for - reporting this. - - * apps/JAWS/server/HTTP_Helpers.cpp (instance): Changed the - return type from const char * to const char **. Thanks to - Amos Shapira for reporting this. - - * ace/OS.i (getpwnam_r): Added a missing #else. Thanks to - Amos Shapira for reporting this. - - * ace/Timer_Heap: Made many minor enhancements to ACE_Timer_Heap - in an effort to figure out why we're getting memory leaks. - -Thu Apr 24 09:33:53 1997 David L. Levine - - * Makefile: modified the TIMESTAMP macro to update the third - component, if there is one, of the version number in the VERSION - file. This assumes that alpha/beta releases are numbered with - three components, and that final releases are not. So, if the - version number is, e.g., 4.2, it will not be modified because it - is assumed to be for a final release. Manual switching between - alpha/beta and final release "modes" is therefore still required. - - * ace/Timer_Heap.cpp (copy): added cast of max_size_ to int to avoid - signed/unsigned comparison. - - * ace/config-sunos5.4-g++.h: removed - ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES because it caused compile - warnings about conversion from `(int)' to `(...)' at Signal.i:113. - (And the other sunos5.4 config files don't have it.) - Thanks to Joey Zhu for reporting this. - - * tests/Timer_Queue_Test.cpp (main): added delete of timer_ids array - to avoid memory leak. - -Wed Apr 23 22:56:57 1997 Sumedh Mungee - - * apps/JAWS/client/*: Fixed warnings due to size_t - * apps/JAWS/client/Blob_Handler: Fixed error by passing - pointer to base class ACE_Blob_Handler instead - of pointing to ACE_Blob_Reader, in call to connect - -Wed Apr 23 20:57:35 1997 James C Hu - - * ace/OS.i and ace/OS.h: added methods for getpwnam and - getpwnam_r, with hooks for NT. - - * ace/config-irix6.2.*: added ACE_LACKS_PWD_REENTRANT_FUNCTIONS. - -Wed Apr 23 14:27:48 1997 David L. Levine - - * ace/Timer_Queue.cpp (ACE_Timer_Queue ctor): reordered initializers - to match declaration order. - - * tests/Process_Strategy_Test.cpp: added ACE_Singleton template - specialization. In function client (), null terminated "buf" - before call to ACE_OS::strrchr () to avoid uninitialized memory - read. Also, fixed typo in test name (argument to ACE_START_TEST). - - * examples/Service_Configurator/Misc/Timer_Service.cpp (init): changed - type of loop index to int to avoid signed/unsigned comparison, and - initialized "interval" so that it has a value even if one isn't - specified on the command line. - -Wed Apr 23 10:52:45 1997 Chris Cleeland - - * ace/OS.cpp (thr_create): Removed errant preprocessor conditional - for determining the scheduling priority. Thanks to Thilo Kielmann - for reporting this. - -Wed Apr 23 09:06:52 1997 Douglas C. Schmidt - - * tests/Process_Strategy_Test.cpp: Finished updating this program - so that it is an automated test. - - * ace/Acceptor.h: Moved get_handle() into the public portion of - the Acceptor. - - * include/makeinclude/platform_irix6.2_sgic++.GNU (SOBUILD): There - was an extra @ in $@@. Thanks to Amos Shapira - for reporting this. - - * apps/JAWS/client/Blob[_Handler].cpp: Added casts for free ((void - *) filename_);. Thanks to Amos Shapira for - reporting this. - - * apps/JAWS/server/HTTP_Helpers.h (class HTTP_Status_Code): - Removed an extraneous const * from the definition of instance(). - Thanks to Amos Shapira for reporting this. - -Wed Apr 23 03:15:11 1997 James C Hu - - * apps/JAWS/server/README: Updated to add some clarity and more - useful information. - -Tue Apr 22 20:17:00 1997 Douglas C. Schmidt - - * ace/Synch.cpp: Added a new method called open() to ACE_File_Lock - so that we don't have to initialize it solely in the - constructor. - - * tests/Process_Strategy_Test.cpp: Added new test code that - exercises the ACE_Process_Strategy, ACE_Thread_Strategy, and - ACE_Reactive_Strategy classes. - - * ace/Strategies_T: Added a new class called - ACE_Reactive_Strategy, which inherits from - ACE_Concurrency_Strategy and registers new Svc_Handlers with the - Reactor. - - * ace/Strategies_T.cpp (ACE_Thread_Strategy): Added a check for - failed open() methods and call ACE_ERROR. - - * tests/Map_Manager_Test.cpp: Added a template specialization for - the ACE_Hash_Map_Manager::hash() method, which is enabled if the - compiler supports template specializations. - - * ace/Hash_Map_Manager.h (pool): Moved the ext_id.hash() call into - a separate method so that we can perform template specialization - of it more easily. - - * ace/README: Added a new #define called - ACE_HAS_TEMPLATE_SPECIALIZATION so that we can work around funky - compilers that don't support this advanced template feature. - - * ace: Added Nanbor Wang's port to FreeBSD. The port is done - at FreeBSD 3.0-current as of 2/9/97, which is the - latest stable system before Lite2 merge. Since the merge is - current under testing and changes are introduced in a daily - basis, I don't recommend using -current after the date. You - can specified the date in your "supfile", run CVSup to get the entire - source tree and do a 'make world' to update (or reverse) your - system. - - Pthread library is provided by John Birrell. There is a - bug fix at mid April so you may want to CVSup the latest libc_r - library and re-make the pthreaded library. - - A shared library must be name as lib.so. (e.g. libACE.4.1.0). I would recommend adding a - post-compile hook in the Makefile so we FreeBSDers can - rename the shared library to it's proper name with correct - major and minor version number attached. (which is a trick - BSD library makefiles use.) - - * examples/OS/Process/process.cpp (main): Replaced the use of - "/bin/cat" with "cat" since we are now using execvp(). Thanks - to Nanbor Wang for reporting this. - - * ace/Process.cpp (start): Changed the use of execv() to execvp() - in order to avoid having to pass in the full pathname. - - * ace/OS.i (sigwait): Added an #ifdef for FreeBSD so that we - return ACE_NOTSUP_RETURN(-1) for ACE_OS::sigwait(). Thanks to - Nanbor Wang for reporting this. - -Tue Apr 22 17:46:30 1997 - - * Process.cpp (start): We must pass in 0 instead of "" to - CreateProcess for the current working directory. - -Tue Apr 22 01:38:14 1997 - - * ace/Timer_Queue: Added ACE_Upcall_Strategy as a parameter to the - constructor. will call upcall> if - is not 0. Else it will call - on the . Thus ACE_Upcall_Strategy becomes a - vehicle for extending the behavior of ACE_Timer_Queue wrt the - upcall (callback) *without subclassing*. Hence, it's an example - of the Bridge/Strategy patterns. - - This also affected ACE_Timer_List and ACE_Timer_Heap - - * ace/Strategies: Added ACE_Upcall_Strategy. - - * ace/Proactor: Added timing support to the calls. - - * ace/Asynch_IO: ACE_Handler now supports handle_timeout. - - * ace/Proactor: Added timer support for the new Proactor. This - new scheme allows any of the threads in the "thread pool" - waiting on the completion port of the Proactor to execute the - callback routine of the handler. - - The implementation included adding ACE_Proactor_Timer_Handler - class that has a thread that will wait on the earliest time in a - timer queue and an event. When a timer expires, the thread will - post a completion event on the port and go back to waiting on - the timer queue and event. If the event is signaled, the thread - will refresh the time it is currently waiting on (in case the - earliest time has changed). - - The ACE_Proactor::Asynch_Timer class is posted to the completion - port when a timer expires. When the method of this - object is called, the 's handle_timeout method will be - called. - - * examples/Reactor/Proactor/test_timeout: This example illustrates - the new timer features in the Proactor - - * examples/Reactor/Proactor/test_proactor.{mdp,mak}: Added new - example. - -Mon Apr 21 18:14:32 1997 Irfan Pyarali - - * ace/config-win32-common.h: Added checks around _AFXDLL before - defining it. Thanks to Bruce Meyer for - pointing this out. - -Mon Apr 21 11:31:16 1997 Chris Cleeland - - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - Removed some unnecessary explicit template instantiations. - - * examples/Threads/barrier1.cpp (main): Explicitly converted - n_threads to int. - -Sun Apr 20 23:08:37 1997 Irfan Pyarali - - * ace/{Local,Remote}_Tokens.h: Added a private declarations of the - copy constructor and assignment operator for classes that - inherit from ACE_TSS. This is necessary since the compiler will - auto generate these two operations that will end up using the - non-existent copy constructor and assignment operator from the - TSS class and cause linker errors. - -Sun Apr 20 20:47:34 1997 Sumedh Mungee - - * apps/JAWS/client: Reworked the ACE_Blob* classes to work - with the new Connector behavior. Added README for this - directory. Added comments. - - * apps/JAWS/stress-testing: Added README file - -Sun Apr 20 13:11:25 1997 Douglas C. Schmidt - - * apps/Makefile: By default, we now compile JAWS along with the - rest of ACE. I've also added some README files that explain - what JAWS is all about. - - * examples/Service_Configurator/Misc/Timer_Service: Improved the - Timer_Service test so that it makes more sense and is better - documented. - -Sat Apr 19 11:56:35 1997 Douglas C. Schmidt - - * include/makeinclude: Removed the platform_irix6.2_sgiCC.GNU - from the release. Thanks to Torbjorn Lindgren - for these fixes. - - * include/makeinclude/platform_irix6.2_sgic++.GNU: Updated the SGI - C++ platform config file. Thanks to Torbjorn Lindgren - for these fixes. - - * ace/Log_Msg.cpp (log_hexdump): The char * arguments should be - const char *'s. Thanks to Matthias Kerkhoff - for reporting this. - -Sat Apr 19 18:52:44 1997 David L. Levine - - * (format_hexdump): changed type of first arg to const char * - for compatibility with Log_Msg::log_hexdump (). - -Thu Apr 17 08:25:06 1997 Douglas C. Schmidt - - * ace/Memory_Pool.h: Fixed a couple of typos in Memory_Pool - classes. Thanks to Neil B. Cohen for reporting - this. - - * netsvcs/lib/Name_Handler.h: Arrgh, there was still one more - missing #include that I forgot to move into the *.h file. - Thanks to David Levine for noticing this. - - * ace/Synch.cpp (wait): There was a bug in - ACE_Condition::wait(MUTEX& mutex, const ACE_Time_Value - *abstime.) Basically when abstime is zero, it ignores the - parameter "mutex" that has been passed to it and instead goes on - to call "ACE_Condition::wait()" which uses "this->mutex_" - as the mutex to be released and not the mutex that the caller - has given. The fix is to change the call "this->wait()" in the - if-clause to: - - return ACE_OS::cond_wait (&this->cond_, &mutex_.lock_); - - Thanks to Ashish Singhai for reporting - this. - -Thu Apr 17 16:33:21 1997 David L. Levine - - * ace/Memory_Pool.cpp: fixed typos in ACE_MMAP_Memory_Pool_Options - constructor declaration and initializer list. In init_acquire, - added cast of minimum_bytes_ to size_t to avoid signed/unsigned - comparison. - - * include/makeinclude/{platform*,wrapper_macros}.GNU: - moved -g out of wrapper_macros.GNU and into each platform - file so that -gstabs can be used on SCO. Thanks to - Ganesh Pai for reporting that problem. - - (The real change was getting rid of the CFLAGS += DCFLAGS - default. We could have left DCFLAGS=-g in wrapper_macros.GNU - and overridden for SCO. But the way I changed things, the - C/CFLAGS pieces are together in each platform file, so they're - easier to find.) - -Wed Apr 16 17:05:55 1997 Douglas C. Schmidt - - * ace/Memory_Pool.cpp (acquire): Added code to enable a minimum - bytes field with the Shared_Memory_Pool. Thanks to Fred LaBar - for these enhancements. - - * tests/Process_Strategy_Test.cpp: Only compile this test if - ACE_LACKS_EXEC is *not* defined since ACE_Process_Strategy - requires fork(). Thanks to Irfan for pointing this out! - - * netsvcs/lib: Fixed a couple o' typos that had escaped detection - last night. Thanks to David Levine for reporting this. - - * ace/Synch[_T].h: removed the use of {} rather than ; for - the private copy constructors and assignment operators. - Hopefully this won't break code on older C++ compilers. Thanks - to Berni Merkle for suggesting this. - - * Added a whole slew of minor fixes for unused variables in - the tests and examples. Thanks to Torbjorn Lindgren - for reporing these. - - * ace/Handle_Set.cpp (ACE_Handle_Set_Iterator): The order of - the clause - - this->handles_.mask_.fds_bits[this->index_] == 0 - && this->num_ < ACE_Handle_Set::MAXSIZE - - was backwards. It should be: - - this->index_ < ACE_Handle_Set::NUM_WORDS - && this->handles_.mask_.fds_bits[this->index_] == 0 - - Thanks to Michael Newton for - reporting this. - -Wed Apr 16 21:34:53 1997 David L. Levine - - * tests/Process_Strategy_Test.cpp: added template specializations. - -Wed Apr 16 15:46:58 1997 - - * tests/Process_Strategy_Test: Added test to batch files and - MSVC++ Makefiles. - - * tests/Process_Strategy_Test.cpp (open): Added UNICODE support. - - * ace/OS.h: Added SIGCHLD to Win32 section. - - * ace/config-win32-common.h: UNICODE should not be automatically - defined if ACE_HAS_UNICODE is defined. ACE_HAS_UNICODE signifies - that the OS has UNICODE support. It does not mean that your code - must be UNICODE. UNICODE must be defined at the project level. - -Wed Apr 16 16:55:47 1997 David L. Levine - - * ace/SString.{h,cpp}: Modified CString to not allocate 1 byte for - a 0 length string. Instead, set the internal representation to - the address of static class character null_string_. - -Wed Apr 16 11:47:35 1997 Chris Cleeland - - * ace/Map_Manager.cpp (free_search_structure): Added the loop - variable back in that must have been inadvertently deleted in the - previous entry. - -Wed Apr 16 09:35:39 1997 David L. Levine - - * ace/Map_Manager.cpp (free_search_structure): changed type of - loop index to size_t to avoid signed/unsigned mismatch. - -Wed Apr 16 04:07:50 1997 Douglas C. Schmidt - - * ace/Strategies_T: Widened the constructor interface for - ACE_Process_Strategy based on the feedback I got from - implementing the Process_Strategy_Test.cpp program. - - * tests/Process_Strategy_Test.cpp: Added an interesting new test - that illustrates the use of the ACE_Process_Strategy and the - ACE_File_Lock. To exercise this program, you can telnet to it - and type "read" and "inc" to query and change the count of - the numbers in the file, respectively. - - * ace/Connector.cpp (create_AST): I fixed a couple of things - in Connector.cpp: - - - In create_AST, it needs to save and restore errno, else it - gets wiped on Win32 and other platforms. - - - On Win32 when a non-blocking connect completes and handle_output is - called, it tries to get the peer address. If done too quickly, it - fails. I put in a Sleep(0) call. I think this is not a great - solution, but I don't have a better one yet. - - Thanks to Steve Huston for fixing - these bugs. - -Tue Apr 15 17:09:33 1997 Douglas C. Schmidt - - * ace/SOCK_Stream.cpp (close): Removed the call to close_writer() - on UNIX since that doesn't do the correct thing in many - cases since it causes a protocol transmission which isn't - what we want if we're using fork(). - - * ace/Strategies_T.cpp (activate_svc_handler): Added a call to - svc_handler->destroy() in the parent since we don't need it and - we're leaking descriptors and memory otherwise... Thanks to - Kevin Boyle for reporting this. - - * ace/OS.i (thr_sigsetmask): Replaced the use of - PTHREADS_1003_DOT_1C with ACE_HAS_PTHREAD_SIGMASK. Thanks to - Arturo Montes for suggesting this. - - * ace: Changed all uses of ACE_HAS_PTHREADS_XAVIER to - ACE_HAS_PTHREAD_SIGMASK, which is more descriptive. Thanks to - Arturo Montes for suggesting this. - - * ace/config-aix-4.2.x.h: Added #define ACE_LACKS_RWLOCK_T to make - things compile with AIX 4.2. Thanks to Jeremy Buch - for reporting this. - - * ace/XtReactor.cpp (register_handler_i): Added "[]" to delete - this->ids_ since it is an array. Thanks to Jean-Marc Strauss - for reporting this. - - * netsvcs/lib: Moved all the class definitions into the *.h files - to avoid complaints from the IBM C++ compiler. - - * ace/OS.h: Added a #define for WNOHANG since this is missing on - NT. Thanks to Brian Mendel for reporting - this. - - * examples/Connection/non_blocking/test_sock_connector.cpp: Added - a typedef for ACE_RW_Mutex so that the code compiles on non-MT - platforms. Thanks to Ganesh Pai for - reporting this. - - * examples/Connection/non_blocking/test_tli_connector.cpp: Added a - typedef for ACE_RW_Mutex so that the code compiles on non-MT - platforms. Thanks to Ganesh Pai for - reporting this. - - * examples/Connection/misc/test_upipe.cpp: Added a typedef for - ACE_RW_Mutex so that the code compiles on non-MT platforms. - Thanks to Ganesh Pai for reporting this. - - * performance-tests/Synch-Benchmarks/Options.cpp: Added a #ifdef - for ACE_Thread_Mutex so that the code compiles on non-MT - platforms. Thanks to Ganesh Pai for - reporting this. - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: Added a - typedef for ACE_RW_Mutex so that the code compiles on non-MT - platforms. Thanks to Ganesh Pai for - reporting this. - - * examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp: Added a - typedef for ACE_RW_Mutex so that the code compiles on non-MT - platforms. Thanks to Ganesh Pai for - reporting this. - - * examples/ASX/Event_Server/Event_Server/Options.cpp - (print_results): Although rusage struct is defined on SCO, there - is no getrusage(), rusage is used only by wait() - etc. internally. Therefore, we had to move some #ifdefs around. - Thanks to Ganesh Pai for reporting this. - - * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp: Added a - typedef for ACE_RW_Mutex so that the code compiles on non-MT - platforms. Thanks to Ganesh Pai for - reporting this. - - * tests/Conn_Test.cpp: Added a typedef for ACE_RW_Mutex so that - the code compiles on non-MT platforms. Thanks to Ganesh Pai - for reporting this. - - * tests/SPIPE_Test.cpp (main): Removed the VXWORKS arm of the - #ifdef, which is not correct since this stuff only works if - we're working with a version of VxWorks that has STREAM pipes. - - * include/makeinclude/platform_sco5.0.0-nothread.GNU: Changed - - LIBS = -lsocket -lnsl -ldl - - to - - LIBS += -lsocket -lnsl -ldl - - Thanks to Ganesh Pai for reporting this. - - * netsvcs/lib/Client_Logging_Handler.cpp: Added a typedef for - ACE_RW_Mutex so that the code compiles on non-MT platforms. - Thanks to Ganesh Pai for reporting this. - - * netsvcs/lib/TS_Clerk_Handler.cpp: Added a typedef for - ACE_RW_Mutex so that the code compiles on non-MT platforms. - Thanks to Ganesh Pai for reporting this. - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Added a - typedef for ACE_RW_Mutex so that the code compiles on non-MT - platforms. Thanks to Ganesh Pai for - reporting this. - -Tue Apr 15 23:16:43 1997 - - * ace/[Hash_]Map_Manager.cpp: The [Hash_]Map_Manager now - explicitly calls the destructors of Map_Entry objects before - freeing up the space. Not sure why we were not doing this - before... - -Tue Apr 15 17:09:33 1997 Irfan Pyarali - - * examples/Logger: Added MSVC++ makefile to Acceptor-server - and client. - -Tue Apr 15 21:51:45 1997 James C Hu - - * apps/JAWS/server/IO.cpp: Added a template instance for - ACE_Singleton so it would link using GCC. Removed GCC - warnings. - - * apps/JAWS/server/HTTP_Server.cpp: Added template instances for - LOCK_SOCK_Acceptor, ACE_Task, ACE_Thru_Task, ACE_Message_Queue, - ACE_Module so it would link using GCC. Removed GCC warnings. - - * apps/JAWS/server/HTTP_Server_T.cpp: Removed template instance of - LOCK_SOCK_Acceptor, since it was not really being compiled. - -Tue Apr 15 21:51:45 1997 James C Hu - - * apps/JAWS/server/IO.cpp: Added a template instance for - ACE_Singleton so it would link using GCC. Removed GCC - warnings. - - * apps/JAWS/server/HTTP_Server.cpp: Added template instances for - LOCK_SOCK_Acceptor, ACE_Task, ACE_Thru_Task, - ACE_Message_Queue, ACE_Module so it would link using GCC. - Removed GCC warnings. - - * apps/JAWS/server/HTTP_Server_T.cpp: Removed template - instance of LOCK_SOCK_Acceptor, since it was not really - being compiled. - - * apps/JAWS/server/HTTP_Handler.cpp: Removed GCC warnings. - -Tue Apr 15 13:01:13 1997 David L. Levine - - * ace/Token_Request_Reply.cpp (ctor): added initialization of - transfer_.data_ to avoid unitialized memory read. - - * tests/test_config.h: removed "static" qualifier from - randomize () to avoid warning from g++ when it's not called - in a test. - - * examples/IPC_SAP/SPIPE_SAP/server.cpp (main): moved - declaration of local variable "handle" up before its first - use. - -Tue Apr 15 17:09:33 1997 Irfan Pyarali - - * examples/Connection/blocking/Makefile: Removed the Makefile - for this test. This example is only suppose to work on WIN32 - and therefore the Makefile is not necessary. I have replace - this file with a MSVC++ make file. - -Mon Apr 14 23:08:27 1997 - - * INSTALL: Updated install files for Win32. - - * ace/SPIPE_Stream: Changed the use of ACE::send_n to ACE::write_n - and ACE::recv_n to ACE::read_n. - - * ace/OS.h (WNOHANG): Added WNOHANG to OS.h for Win32. - - * ace/OS.i (getpgid): Fixed extra return. - - * examples/Connection/blocking/SPIPE-acceptor: Updated the code to - use the new Proactor and the new asynchronous IO. - -Mon Apr 14 21:32:24 1997 David L. Levine - - * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (handle_client): - ACE_OS::sprintf instead of sprintf. - - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp - (svc): declare "t" as time_t instead of long. - - Thanks to Thilo Kielmann for - reporting both of these. - -Mon Apr 14 00:02:39 1997 Douglas C. Schmidt - - * ace/OS.i (getpgid): Removed the extraneous return in front of - ACE_NOTSUP_RETURN. Thanks to Mike Bernat for - reporting this. - - * ace/Process.cpp: Replaced the use of ACE_OS::fork(void) with - ACE_OS::fork(const char *) so that we can pass in the name of - the process we're exec'ing. - - * examples/Threads/process_manager.cpp: Added a test program that - exercises the features of the new ACE_Process_Manager. - - * ace/Process_Manager: Finished a rudimentary implementation of - ACE_Process_Manager. There's still plenty of work to be done on - this, however... - - * ace/Thread_Manager.cpp (dump): Added dump() methods for - ACE_Thread_Descriptor and ACE_Thread_Manager. - -Sun Apr 13 11:40:26 1997 Douglas C. Schmidt - - * ace/OS: Added a getpgid() call to ACE_OS. - - * ace/Thread_Manager: Changed the 'int n' of spawn_n() to size_t n - since this is more appropriate because we can't spawn a negative - number of threads... - - * ace/Thread_Manager.cpp (close): Make sure to lock the calls to - close() in case things get amiss. - - * ace/Process.cpp (start): Updated ACE_Process::start() to that it - doesn't try to exec() a program if argv == 0. This allows us to - use ACE_Process to fork() a process without exec'ing. - - * tests/Timer_Queue_Test.cpp (randomize_array): Added a new - "randomization" test that determines the performance of randomly - canceling items in the array. Thanks to Darrell Brunsch - for this enhancement. - - * tests/test_config.h: Moved the randomize() function from - Naming_Test.cpp to test_config.h so that we can use it in other - tests (e.g., the new Timer_Queue_Test.cpp that Darrell is - working on). - - * ace/OS: Added a new #define called ACE_HAS_NONCONST_MSGSND which - can be used for platforms (e.g., SCO) that don't have a const - parameter for msgsend(). Thanks to Arturo Montes - for reporting this. - - * ace/config-sco-5.0.0-mit-pthread.h: Added some fixes to make - this work on SCO. Thanks to Arturo Montes - for reporting this. - - * ace/OS.i (cond_timedwait): There is a *small* chance for a - context switch before ACE_OS::cond_timedwait() is reached. In - this case, the current time *may* advance by some milliseconds. - The code in ACE_OS::cond_timedwait() then converts the given - absolute time to a relative time. In the described situation - this will be a very, very long t ime (0xfffffffn). Therefore, I - added a check to avoid the "negative timespan" case. Thanks to - Matthias Kerkhoff for suggesting this. - - * ace/Set: Moved all the size() methods out of the *.i file and - into the *.cpp file to avoid problems with quirky compilers - (e.g., SGI) that can't handle this. Thanks to Torbjorn Lindgren - for pointing this out. - - * examples/Threads/process_semaphore.cpp (main): Removed a stray - ^M that was causing the SGI C++ compiler some grief. Thanks to - Torbjorn Lindgren for pointing this out. - - * ace/OS.i (gettimeofday): Rearranged the code a bit to return - errors correctly if they occur (which should be *very* - unlikely). Thanks to Torbjorn Lindgren for - pointing this out. - - * netsvcs/lib/Server_Logging_Handler.cpp: Replaced the use of - ACE_TLI* with LOGGING_PEER*. Thanks to Tom Wright - for reporting this. - - * ace/Connector.cpp: Made sure to initialize all of the instance - variables for the ACE_Strategy_Connector and ACE_Connector. - Thanks to David Levine for pointing this out. - - * ace/Synch.h: Changed protected: to private: so that we can - ensure that we never copy classes like ACE_File_Lock, etc. - Thanks to Berni Merkle for reporting - this. - - * examples/Shared_Malloc/test_malloc.cpp (malloc_recurse): Added - the print_stats() call back into the test since Sandro's fixes - should now support this. - - * ace/Malloc[_T]: Added patches to enable ACE_Allocator's to print - malloc statistics. Thanks to Sandro Doro - for these fixes. - -Sat Apr 12 20:42:11 1997 David L. Levine - - * tests/Priority_Task_Test.cpp (open): only use THR_SCHED_FIFO - if it is defined. (It isn't on Solaris without PTHREADS.) - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp - (make_svc_handler): added return statement. - -Sat Apr 12 11:53:49 1997 Douglas C. Schmidt - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp (main): - The first argument to connect () is now a SVC_HANDLER *&. - Therefore, we can no longer allows us to pass the address of a - SVC_HANDLER on the stack (or in the data segment). - Fortunately, the fix is easy, as shown below: - - Event_Transceiver transceiver, *tp = &transceiver; - - connector.connect (tp, ACE_INET_Addr (port_number, host_name)); - - Thanks to David Levine for reporting this problem. - -Fri Apr 11 15:14:59 1997 David L. Levine - - * tests/Conn_Test.cpp: moved declaration of "result" out of - loop because it's used after the loop. Thanks to - Thilo Kielmann for - reporting this. Also, removed a few unnecessary template - specializations. - - * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp: fixed template - specializations for no-thread platforms. Thanks to Ganesh Pai - for reporting this. - - * performance-tests/Misc/context_switch_time.cpp (main): - removed call to ACE_High_Res_Timer::supported (). - -Fri Apr 11 14:31:42 1997 Chris Cleeland - - * tests/Conn_Test.cpp: Added several explicit template - instantiations. - -Fri Apr 11 13:49:04 1997 David L. Levine - - * ace/OS.h: VxWorks changes only: added taskHookLib.h. Thanks - to Dave Mayerhoefer for reporting - that. Also rearranged the VxWorks #includes and such a bit. - - * ace/Log_Msg.cpp (atexit): VxWorks changes only: added cast - of spare1 to ACE_Log_Msg *. Thanks to Dave Mayerhoefer - for reporting that. Also, - in exists () and instance (), replaced double indirection - of the ACE_Log_Msg instance with indirection through a pointer - reference. - - * ace/High_Res_Timer.{h,i}: removed supported () because - ACE_OS::gettimeofday () is used if a high-res timer isn't available. - - * ace/OS.i (thr_sigsetmask),config-sunos5.4-*.h: swapped order of - #ifdefs to that ACE_LACKS_PTHREAD_THR_SIGSETMASK is checked before - ACE_HAS_STHREADS. Added that #define to all SunOS 5.4 configs. - Thanks to Joey Zhu for reporting this. - - * ace/Token_Request_Reply.cpp (ctor): added a initializations to 0 - of requeue_position_, notify_, and arg_. With this change, all - of the ACE tests run without any Purify access anomalies! - (There are still some memory leaks, though.) - - * include/makeinclude/rules.local.GNU: added -DMAKEDEPEND to - invocation of g++dep. This allows users to get proper - dependencies if they have conditional #includes in their code. - They can added #if defined (MAKEDEPEND) as necessary to make - sure that all headers are seen by g++dep. - -Fri Apr 11 10:46:56 1997 Chris Cleeland - - * config-linux*.h: Added ACE_HAS_IP_MULTICAST as the default for - all Linux configurations. If you're a 1.x user, or you didn't - config that into your 2.x kernel, you'll have to remove this from - your version of the file. - -Thu Apr 10 00:34:10 1997 Douglas C. Schmidt - - * examples/Logger/simple-server/Logging_Acceptor.cpp - (handle_input): We need to call svc_handler->close() if accept() - or open() fails. Thanks to Ganesh Pai for - reporting this. - - * ace/Service_Config.cpp (close): Moved the call to - ACE_Service_Config::close_singletons() to outside the check for - ACE_Service_Config::svc_rep_ since the Singletons can be used - independently of the services. Thanks to Matthias Kerkhoff - for suggesting this. - -Wed Apr 9 21:11:38 1997 Douglas C. Schmidt - - * apps/Gateway/Gateway/Gateway.cpp (handle_signal): Evil demons - added bugs to my code that were causing segfaults when signals - shutdown the gateway. This is now fixed. - - * apps/Gateway/Gateway/Proxy_Handler.h: Changed ACE_Event_Channel - & to ACE_Event_Channel * to keep the compiler happy. - - * examples/Connection/non_blocking/CPP-connector.h: Added a - do-nothing default constructor to keep ACE_Connector happy. - - * examples/Connection/misc/test_upipe.cpp: Added a do-nothing - default constructor to keep ACE_Connector happy. - - * examples/Connection/blocking/SPIPE-connector.h: Added a - do-nothing default constructor to keep ACE_Connector happy. - - * apps/Gateway/Gateway/Proxy_Handler: Added a do-nothing default - constructor to keep ACE_Connector happy. - - * netsvcs/lib: Added some default arguments to - TS_Clerk_Handler.cpp and Client_Logger_Handler.cpp to keep the - compiler from complaining about the new ACE_Connector features. - Thanks to David Levine for reporting this. - - * ace/Timer_Heap.cpp (reheap_down): Fixed a *very* subtle bug in - reheap_down() where parent was starting off at 0 whereas it - should have been starting off at child_index / 2. - - * examples/Logger/simple-server/Logging_Handler: Removed the use - of the operator ACE_SOCK_Stream &() and replaced it with the - more intuitive peer() approach used in ACE_Svc_Handler et al. - Thanks to Ganesh Pai for reporting this. - - * ace: Added a bunch of changes to improve ACE support on SCO 5.0. - Thanks to Ganesh Pai for these fixes. - - * tests/Conn_Test.cpp: Completely reworked this test so that it - illustrates how to use the ACE_Strategy_Connector, which is - customized with a special Caching_Connect_Strategy that recycles - connections. - - * ace/Connector: Finished implementing the new - ACE_Strategy_Connector. This is similar in design to the - ACE_Strategy_Acceptor. - - * ace: Changed the signature of all the make_svc_handler() methods - so that they return int (rather than SVC_HANDLER *) and they - pass back a SVC_HANDLER * by reference. This makes it possible - to totally control the creation of svc handlers (which is useful - for the new ACE_Strategy_Connector). - - * ace/Connector.cpp: Factored out the active_svc_handler() call - from the connect_svc_handler() method into the connect() method - so that it would behave correctly as a Template Method and - Strategy. - - * ace/Connector: Removed the explicit use of the Reactor data - member from the ACE_Connector since it's inherited from the - ACE_Service_Object. - - * ace/Log_Msg.cpp: The MVS compiler doesn't like the call to - atexit() in ACE_Log_Msg::instance() because atexit() requires an - a function pointer of type extern "C" for its parameter. I've - fixed this via an adapter. Thanks to Chuck Gehr - for reporting this. - - * ace/Strategies_T: Added a new ACE_Connect_Strategy that - complements the ACE_Strategy_Connector in the same manner that - the ACE_Accept_Strategy complements the ACE_Strategy_Acceptor. - - * ace/Connector.h: The destructor for ACE_Connector should have - been virtual. Now it is. - - * ace/Connector: Added a new factory method called - make_svc_handler(). This behaves similiarly to the - ACE_Acceptor::make_svc_handler(). However, for the - ACE_Connector we only use this when the SVC_HANDLER * is NULL. - - * ace/Connector: Changed the signature for connect() to take a & - to a SVC_HANDLER * in anticipation of our new - ACE_Strategy_Connector. This new connector will make it easy to - implement cached connections. - - * ace/config-win32-common.h: Added a new #include for , - which contains the declarations for TransmitFile() data - structures. They are in WINSOCK.H if you do not use - ACE_HAS_WINSOCK2. Thanks to Norbert Rapp - for reporting this. - - * ace/OS.i: Fixed a typo in the new condition variable - implementation for Win32. Thanks to Norbert Rapp - for reporting this. - -Wed Apr 09 22:06:23 1997 - - * Memory_Pool.h: Modified ACE_MMAP_Memory_Pool and - ACE_MMAP_Memory_Pool_Options to include the new guess_on_fault - option. This is only for platforms that can not report which - address caused a segmentation fault (via signal or exception). - When guess_on_fault is set (via ACE_MMAP_Memory_Pool_Options), - ACE_MMAP_Memory_Pool::handle_signal calls - ACE_MMAP_Memory_Pool::remap "guessing" that the segmentation - fault was caused by an access to memory not yet mapped. - -Wed Apr 09 16:46:16 1997 David L. Levine - - * ace/OS.{h,i}: fixed readPPCTimeBase declaration and return - value (for now: it really needs to return a 64 bit quantity). - Thanks to Dave Mayerhoefer for - reporting these. - -Wed Apr 9 03:12:24 1997 Irfan Pyarali - - * ace/config-win32-common.h: Defining _WIN32_WINNT as 0x0400 - implies ACE_HAS_WINSOCK2. - - * ace/Asynch_IO: The implementation of ACE_Asynch_Transmit_File - and ACE_Asynch_Accept are only supported if ACE_HAS_WINSOCK2 is - defined or you are on WinNT 4.0 or higher. Therefore, added - appropriate #defines. Thanks to Matthias Kerkhoff - for suggesting this. - -Tue Apr 8 22:45:28 1997 Prashant Jain - - * java/src/SOCKStream.java (SOCKStream): Made two small changes to - the two send(). Instead of doing a println, I now do a - print. This was really a bug! - -Tue Apr 08 22:08:12 1997 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++_4.1.GNU: removed - "rm -f $@" from AR command so that archive won't be removed - during incremental updates. Thanks to Chuck Gehr - for reporting this. - -Tue Apr 8 00:04:22 1997 Douglas C. Schmidt - - * ace/Task_T.cpp: Added a hack to work around the new weird HP/UX - aCC template semantics. Thanks to Neil B. Cohen - for reporting this. - - * ace/config-hpux-10.x[-g++].h: Added #define - ACE_HAS_CLOCK_GETTIME. Thanks to Neil B. Cohen - for reporting this. - - * ace/config-hpux-10.x[-g++].h: Added ACE_HAS_IP_MULTICAST and removed - ACE_LACKS_STRRECVFD. Thanks to Neil B. Cohen - for reporting this. - - * ace/config-hpux-10.x.h: Apparently some HP/UX 10.x C++ compilers - don't support volatile, so I #defined it away as a macro. - Thanks to Neil B. Cohen for reporting this. - - * ace/Log_Msg.cpp: Put a #if defined (ACE_MT_SAFE) around the - entire Log_Msg destructor. Thanks to Neil B. Cohen - for reporting this. - - * ace/config-hpux-10.x[-g++].h: Added #define ACE_HAS_STREAMS on - the recommendation of Neil B. Cohen . - -Mon Apr 07 12:08:21 1997 - - * ace/Set.cpp: For some reason, VC++ 5.0 doesn't like to have the - constructors X::X(X&) and X::X(X*). We can change the X::X(X*) - constructor to take in an extra argument with a default value. - This seems to have sufficiently satisfied the VC++ 5.0 for the - time being. There were no changes necessary to other Set.cpp - code (as the extra argument has a default value). - -Mon Apr 07 08:05:03 1997 David L. Levine - - * ace/config-win32.h: enabled ACE_HAS_UNICODE by default. - Thanks to Matthias Kerkhoff for - suggesting this. - - * ace/config-sunos5.4-g++.h: enabled ACE_HAS_BROKEN_RANDR and - disabled ACE_HAS_SVR4_SIGNAL_T. Thanks to Joey Zhu - for reporting these problems and testing - the fix. - - * ace/Proactor.h (ACE_Proactor): commented out unused arguments - in non-WIN32 version. - -Sun Apr 06 22:51:02 1997 - - * ace/Proactor: Complete rewrite of Proactor that pushes all the - differences in asynchronous I/O to the edges of the framework - - i.e., into the new Asynch_IO classes. This allows the Proactor - to easily support new asynchronous operations. - - Currently, the new Proactor supports minimal functionality. In - the future, we will complete this. - - The Proactor is used in conjunction with the new Asynch_IO - classes. There is a different class for each operation. Please - see Asynch_IO.h for details. - - There is also a new ACE_Asynch_Acceptor that uses AcceptEx. - - Example is in: - ACE_wrappers/examples/Reactor/Proactor/test_proactor.cpp. - - This example illustrates how the ACE_Proactor can be used to - implement an application that does various asynchronous - operations. - - * apps/JAWS/server: Complete rewrite of JAWS. The new JAWS has - support for Asynch-Thread-Pool (on WIN32), Synch-Thread-Pool, - and Thread-per-Request. Different models can be configured using - the svc.conf file. The server now supports both GET and PUT - commands. - - The HTTP_Handler class is a state based implementation of the - HTTP protocol. Therefore, it can be used synchronously and - asynchronously. It uses an abstract IO class to move between - different HTTP protocol states. It is up to the IO class to - decide on synchronous or asynchronous I/O. - - * apps/JAWS/client: This is an example of the implementation of - BlobStreaming in ACE. This version of BlobStreaming uses HTTP as - a transport protocol. - - Blobby :-) is a simple application written using the ACE_Blob - class, which is capable of doing both file uploads and - downloads. If a file is downloaded, the downloaded data is sent - to standard output, so that it can be piped as necessary. - - * ace/Mem_Map.cpp (map_it): This method now uses ACE_OS::pwrite - (if ACE_HAD_P_READ_WRITE is defined) instead of - ACE_OS::lseek/ACE_OS::write to write the end-of-file byte. The - old scheme does not work if the file is in OVERLAPPED mode. - - * ace/OS: Added pread and pwrite to the OS class (if - ACE_HAD_P_READ_WRITE is defined). On Win32, these functions use - the OVERLAPPED structure to specify the offset. This - implementation will block until the write/read completes (even - if the file is in OVERLAPPED mode). - - * ace/config: Added ACE_HAS_P_READ_WRITE to the following - platforms that support pread() and pwrite() calls: - config-sunos4-g++.h - config-sunos4-lucid3.2.h - config-sunos4-sun3.x.h - config-sunos4-sun4.1.4.h - config-sunos4-sun4.x-orbix.h - config-sunos4-sun4.x.h - config-sunos5.4-centerline-2.x.h - config-sunos5.4-g++.h - config-sunos5.4-sunc++-4.x-orbix.h - config-sunos5.4-sunc++-4.x.h - config-sunos5.5-g++.h - config-sunos5.5-sunc++-4.1.h - config-sunos5.5-sunc++-4.x-orbix.h - config-sunos5.5-sunc++-4.x.h - config-sunx86-sunc++-4.x.h - config-win32-common.h - -Sun Apr 6 14:16:18 1997 Douglas C. Schmidt - - * tests/Timer_Queue_Test.cpp: Added tests to make sure that the - new ACE_Timer_Queue::cancel() logic is working correctly. So - far, it seems to be fine. - - * ace/Timer_{Heap,List}.cpp (cancel): Changed the comparison for - dont_call_handle_close to be correct. - - * ace/OS.cpp: Deleted a useless return. Thanks to Gonzalo - A. Diethelm for reporting this. - - * ace/config-irix6.2-sgic++.h: Added the following definitions: - - + ACE_LACKS_PTHREAD_THR_SIGSETMASK - + ACE_HAS_PTHREAD_EQUAL - + ACE_HAS_PTHREAD_T - + ACE_HAS_SYSENT_H - + ACE_HAS_SYSINFO - + ACE_HAS_TEMPLATE_TYPEDEFS - - Deleted the following definitions: - - + #define ACE_HAS_SYS_SIGLIST (Irix's compiler only has a - _sys_siglist array when compiling their own internal - functions). - - Thanks to Gonzalo A. Diethelm for this. - - * ace/Process: Added new support for setting the environment - variable and the current working directory. Thanks to Gonzalo - A. Diethelm for this enhancement. - - * ace/OS.h: "sys/stat.h" was being included more than once, so I - fixed this. Thanks to Gonzalo A. Diethelm - for reporting this. - - * ace/XtReactor.cpp: Added the register_handler_i() method, which - just delegates to the one defined in the Reactor. This is - necessary to adjust to the C++ type system rules. Thanks to - Gonzalo A. Diethelm for reporting this. - - * ace/Service_Config.cpp: Added the Double-Checked Locking - Optimization pattern to all the ACE_Service_Config Singletons - (e.g., thr_mgr(), reactor(), etc.) so that they behave correctly - in multi-threaded programs. Thanks to Matthias Kerkhoff - for insisting on this. - - * ace/OS.i (nanosleep): If the nanosleep() system call isn't - supported by the OS platform we'll just use ACE_OS::sleep(const - ACE_Time_Value &) instead. - - * ace/Log_Msg.cpp: Changed the logic of - ACE_Log_Msg_Manager::remove() so that it returns the number of - remaining registered instances. When this goes to 0 we'll - cleanup. - - * ace/OS.i: Enhanced the ACE_OS::cond_[timed_]wait() methods so - that they use SignalObjectAndWait() whenever possible to avoid - potential problems with unfairness. See - http://www.cs.wustl.edu/~schmidt/editorial-15.html for more - details. Thanks to David Holmes for - pointing out this subtlety. - -Sun Apr 06 20:01:57 1997 David L. Levine - - * include/makeinclude/wrapper_macros.GNU: added "purify" and - "quantify" make command options. To build Purified versions - of all executables in the current direction, for example: - - % make clean; make purify=1 - - These options assume that purify or quantify are in your PATH. - - * ace/Task.{h,cpp}: removed ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - from ACE_Task_Exit declaration and ACE_Task_Exit::instance (). - ACE_Task_Exit is no longer a template class, so we don't need that. - - * ace/Task_T.h: added missing "*/" at end of comment after #endif. - - * tests/IOStream.cpp (server): added check for 0 strlen of - "buf" to avoid out-of-bound array reference. - - * ace/Svc_Conf_l.cpp, Makefile: added #define ACE_BUILD_DLL. - Thanks to Matthias Kerkhoff for - reporting this. - - * ace/Set.cpp(ACE_Set_Node ctor): commented out unused arg MS_SUCKS. - -Sat Apr 5 14:21:29 1997 Prashant Jain - - * java/: Changed package name from ACE to JACE across all directories. - -Sat Apr 5 13:12:37 1997 Douglas C. Schmidt - - * tests/MM_Shared_Memory_Test.cpp: Removed the use of dynamic - memory allocation to avoid memory leaks. - - * ace/Service_Config: Changed _defaults to _static_svcs since this - more accurately reflects what they do. - - * examples/Shared_Malloc/test_malloc.cpp: Removed the - print_stats() call since it doesn't work via this API. Thanks - to Sandro Doro for reporting this. - - * ACE-install.sh: Tweeked the install script by changing the - "gunzip; tar; gzip" sequence into "gunzip -c | tar xvf -" to - speed it up a little. Thanks to Per Andersson - for this fix. - - * examples/Threads/future1.cpp: Make sure to delete the char *name - that is retrieved from the future in order to avoid a memory - leak. Thanks to Matthias Kerkhoff for - figuring this out. - - * examples/Threads/future1.cpp: Make sure to delete this->name_ in - the Scheduler destructor to avoid a memory leak. - - * examples/Threads/task_four.cpp (close): Enhanced the close() - method so that it will actually delete the memory for the - Worker_Task. - - * ace/XtReactor.cpp (register_handler_i): Added the - - if (mask & ACE_Event_Handler::ACCEPT_MASK) - ACE_SET_BITS (condition, XtInputReadMask); - - Thanks to Jean-Marc Strauss for - reporting this. - - * ace/Timer_Queue.cpp (expire): This is the only method that calls - ACE_Timer_Queue::cancel() with dont_call_handle_close set to 0. - - * ace/Reactor: Modified the cancel_timer() methods so that they - also take a dont_call_handle_close parameter and pass it on to - the Timer_Queue::cancel() method. - - * ace/Timer_{List,Heap}.cpp: Modified all the cancel() methods so - that they will not call handle_close() unless the new parameter - dont_call_handle_close is 0 (it is 1 by default). This will - avoid nasty problems with recursion. Thanks to Paul Han - for suggesting this. - - * ace/Timer_{List,Heap}.cpp (schedule): If a user tried to - schedule a NULL ACE_Event_Handler then we return -1 with errno - set to EINVAL. - - * ace/Message_Block.cpp: Somehow the file got screwed up and was - reverted back to an earlier incarnation where we didn't use - ACE_Service_Config::alloc()... Thanks to Matthias Kerkhoff - for figuring this out. - -Sat Apr 5 19:11:46 1997 Tim H. Harrison - - * ace/Signal.i (ACE_Sig_Guard): Changed the constructor of - ACE_Sig_Guard so that it doesn't call ACE_OS::sigprocmask for - Win32. This keeps errno from being set to ENOSYS at random - times. - -Sat Apr 05 17:27:02 1997 - - * Registry.cpp (resolve): Type and size of the object is only set - if RegQueryValueEx() returns success. Thanks to Alan - (Alan_Cabrera@fp.cibc.com) for reporting this. - -Sat Apr 05 13:11:04 1997 David L. Levine - - * ace/Log_Msg.cpp (instance): Added another ACE_NO_HEAP_CHECK. - Matthias provided the fix. - - * ace/config-win32.h: Disable ACE_HAS_STRICT by default, because - it will break existing application code. - - * ace/OS.{h,cpp},Log_Msg.{h,cpp}: fixes from Matthias Kerkhoff - to avoid memory-leak reports when MFC - or (the CrtHeapXXX()-functions of the Win32 runtime library) - are used. - - The problem is, that MFC (and so may other Win32 applications - do) allocates a thread specific storage slot for each running - thread which contains various control and debug informations. - Part of this information is an object, which when constructed - makes a snapshop of the heap. When this object is destroyed, - the snapshot is compared to the actual heap. All object still - existing on the heap are reported as memory leaks (which - is in most situations correct). Because the object is deleted - when the thread (or programs main) is left and this happens - before atexit is called, some leak reports are false (because, - e.g., all these ACE_Log_Msg's will be deleted in atexit). - - The fix for ACE_Log_Msg consists of three changes (two only - relevant for Win32, one relevant for all platforms.) - Description of changes: - - a) Introduced a new macro ACE_NO_HEAP_CHECK, which turns - off the built in heap checking until the current code block - is left. (defined for all platforms, but only does something - for Win32). This changes os.h and config-win32-common.h. - - b) Added a static member function to ACE_Log_Msg. The function - (exists) returns 0 if the calling thread don't have an ACE_Log_Msg - and non-null if an ACE_Log_Msg exists. This changes Log_Msg.h - and Log_Msg.cpp. - - c) Changed ACE_Thread_Adapter in a way that creating a new - thread does not automatically create an ACE_Log_Msg for the - calling thread. This happened until now, because the new - thread inherited the log settings of the calling thread. - This behaviour makes no sense, if the calling thread does - not have an ACE_Log_Msg, so i use ACE_Log_Msg::exists() (see - above) to prevent the implicit creation of an ACE_Log_Msg - for the calling thread. - - Thanks, Matthias! - - * ace/config-win32.h and config-win32-common.h: new, consolidated - Win32 config files. Thanks, again, Matthias! - - * ace/OS.h (ACE_UNUSED_ARG): determine whether we're building - on an Irix platform by looking for ACE_HAS_IRIX_GETTIMEOFDAY - instead of ACE_HAS_IRIX62_THREADS. - - * ace/Log_Msg.cpp: VxWorks (only!) change: no longer strdups - program_name and local_host to avoid memory leaks. Instead, - the addresses of these are copied by ACE_Log_Msg. So, only - strings in the text segment should be passed to its functions! - Again, this change is for VxWorks only. - - * ace/Sched_Params.cpp: moved memsets of pcinfo so that entire - pcinfo structure is zeroed out, to _really_ avoid Purify warnings. - -Fri Apr 04 12:28:40 1997 David L. Levine - - * ace/config-mvs.h: removed ACE_HAS_IP_MULTICAST because MVS - doesn't define ip_mreq. Thanks to Chuck Gehr - for reporting this. - - * ace/OS.i (mutex_init): fixed the extra braces once and for all. - Thanks to Chuck Gehr for reporting it. - - * ace/OS.i, config-sco-5.0.0*.h: fixed for SCO so that it uses - single-argument gettimeofday () prototype, but calls two-arg - (SVR4) version in ACE_OS::gettimeofday (). Thanks to Ganesh - Ganesh Pai for solving this problem. - - * ace/Log_Msg.{h,cpp}: added ACE_Log_Msg destructor. In - instance (), added call to ::atexit () (::taskDeleteHookAdd () - on VxWorks) to register cleanup handler. Each new instance - of an ACE_Log_Msg is inserted into an ACE_Unbounded_Set; the - cleanup handler iterates over the Set and deletes the - ACE_Log_Msgs at program exit. - - Also, the two strings that are allocated get cleaned up after - the last ACE_Log_Msg instance is deleted. Many thanks to - Matthias Kerkhoff for figuring this out - and cranking out the code. - - It works differently on VxWorks, because it doesn't have - ::atexit (). VxWorks has ::taskDeleteHookAdd (), which is - called when each task exits. So, the Set isn't used. Instead, - the cleanup hook is called for each task when it exits, passing - the task control block (TCB) of the exiting task. A pointer to - the ACE_Log_Msg instance is contained in one of the spare fields - of the TCB, so the cleanup handler simply deletes it. - - * ace/IOStream.h: specify template parameter (ACE_IOStream) - to ACE_OPERATOR{G,P}_SET macros. Thanks to Chuck Gehr - for providing this fix. - -Thu Apr 3 22:17:53 1997 Irfan Pyarali - - * ace/Registry.cpp: Changed STRING_SEPARATOR from Istring to - LPCTSTR. Thanks to Matthias Kerkhoff for - suggesting this. - -Thu Apr 3 21:39:45 1997 Chris Cleeland - - * ace/OS.i (mutex_init): Removed errant open-brace ('{'). Thanks - to Chuck Gehr (gehr@sweng.stortek.com) for the fix! - -Thu Apr 03 08:52:34 1997 David L. Levine - - * ace/OS.h,OS.cpp,Sched_Params.cpp: added /**/ to some #include - directives. Thanks to Matthias Kerkhoff - for reporting these. - - * ace/OS.cpp (writev, readv): changed type of local variable "i" - from size_t to int to avoid signed/unsigned mismatch. Thanks - to Matthias Kerkhoff for reporting this. - - * ace/OS.cpp (readv), SOCK_Dgram.cpp (recv): added casts of - iov_len and copyn because iov_len is int on some platforms and - size_t on others. This avoids compiler (MSVC 4.1) warnings. - Thanks to Matthias Kerkhoff for reporting - this. - - * include/makeinclude/platform_sco5.0.0-nothread.GNU: - updated CCFLAGS and added LD=$(CXX). Thanks to - Ganesh Pai for these fixes. - - * ace/OS.h: added #include of for SCO only. - Thanks to Ganesh Pai for this fix. - - * ace/config-sco-5.0.0*.h: added #define ACE_HAS_IP_MULTICAST. - Thanks to Ganesh Pai for this fix. - - * ace/config-{chorus,linux*,sco*}.h: removed #define of - ACE_HAS_INLINED_OSCALLS because it's no longer needed in the - config files: it's #defined in OS.h if needed. - -Thu Apr 3 01:48:01 1997 Tim H. Harrison - - * ace/Malloc.i (malloc): ACE_New_Allocator::malloc only calls new - if nbytes is > 0. Purify was complaining that 0 bytes were - allocated but never deleted. Go figure. - -Wed Apr 2 22:24:48 1997 Douglas C. Schmidt - - * ace/OS.cpp: Moved the ACE_OS::inet_aton() method into the *.cpp - file and made it non-inline to work around a bug with HP/UX C++. - Thanks to Neil Cohen for this fix. - -Wed Apr 02 10:09:37 1997 David L. Levine - - * ace/config-sunos5.5-sunc++-4.1.h: added template specialization - with Sun C++ 4.2. - - * include/makeinclude/platform_sunos5_sunc++_4.1.GNU: removed +w - and added comments about Sun C++ 4.2 support. - - * include/makeinclude/platform_chorus.GNU, platform_hpux_gcc.GNU, - platform_irix5.{2,3_g++}.GNU, platform_linux{_,pthread}.GNU, - platform_m88k.GNU,platform_osf1_4.0_g++.GNU, - platform_sco-nothread.GNU,platform_sco5.0.0-*.GNU, - platform_sunos{4,5}_g++.GNU, platform_sunos5_x86_g++.GNU, - platform_unixware_g++.GNU, platform_vxworks5.2_g++.GNU: - added -fno-implicit-templates to CCFLAGS. See INSTALL file - for discussion of the g++ option. Also, added -O2 because - it dramatically reduces object file sizes. - - * netsvcs/clients/Tokens/manual/manual.cpp: made - STDIN_Token::TID typedef public so that template - specialization (w/ Sun C++ 4.2) can access it. - -Wed Apr 2 10:02:47 1997 Chris Cleeland - - * ace/OS.h: Added definitions for THREAD- and PROCESS-LEVEL - priorities because some implementations define these while - others don't. These are now - ACE_{THR,PROC}_{FIFO,RR,OTHER}_{MIN,MAX,DEF}. The only really - NEW concept is the *_DEF, which is a default value assigned by - ACE_OS::thr_create() if one isn't given. Of special note is that - we don't redefine a default values if it's already been - defined, which allows individual programs to have their - own ACE-wide "default". - - * ace/OS.cpp (thr_create): Uses ACE_{THR,PROC}_* macros - rather than the PRI_* macros. - - * ace/Sched_Params.cpp (priority_min,priority_max): These now - use ACE_{THR,PROC}_* macros to ignore OS-specific priority - assignments. - - * ace/config-linux-lxpthreads.h: Removed definitions of - PRI_{FIFO,RR,OTHER}_{MIN,MAX}. - - * include/makeinclude/platform_linux*.GNU (CCFLAGS): Added - -fno-implicit-templates now that it's supported. This - eliminates messages of the sort 'ld: Warning size of - change from xx to yy' - when linking libACE.so. Thanks to David Levine for making - this possible! - -Tue Apr 1 15:27:28 1997 Douglas C. Schmidt - - * bin/g++dep: Removed the "/bin" prefix so that this won't fail on - platforms that don't have sed in /bin. Thanks to Sandro Doro - for this fix. - -Tue Apr 01 09:55:07 1997 David L. Levine - - * ace/OS.h: protected definition of struct flock on VxWorks, - because it defines that type in sys/fcntlcom.h. (It doesn't - appear to support flock (), though.) Thanks to Dave - Mayerhoefer for reporting this. - - * ace/OS.h: define ACE_hrtime_t as u_longlong_t gcc, because - its long long types are only 4 bytes long. Its longlong_t - types are 8 bytes. Also made ACE_hrtime_t unsigned for - other than gcc on Unix platforms. - - * ace/OS.* (gethrtime), config-vxworks-ghs-1.8.h: added support - for PowerPC with Green Hills compiler. Thanks to Dave - Mayerhoefer for providing the - readPPCTimeBase assembler routine. - - * ace/config-vxworks*.h: removed #include of vxWorks.h because - its no longer necessary with the TimeValue.h merged into OS.h. - - * ace/High_Res_Timer.cpp (elapsed_time): added cast to - initialization of nseconds to avoid compiler warning from - MSVC 4.1 about narrowing from unsigned __int64. - Thanks to Matthias Kerkhoff for - reporting this. - -Mon Mar 31 18:18:35 1997 Carlos O'Ryan - - * ace/config-hpux-10.x-g++.h: - It was tuned to HP-UX 10.10 (and further) using g++ 2.7.2 without - DCE/Threads. - - * ace/Task_T.cpp: - Another iteration on the Module.h file, this time it is not - included *only* under HPUX and when using HP/aCC. Still IMHO - problems will arise as template sintax checking becomes more - popular. - - * ace/Local_Name_Space_T.h: - * ace/Local_Name_Space_T.cpp: - Replaced MAXNAMELEN with MAXPATHLEN since some platforms - (e.g., HP/UX) have a very low value (e.g., 14 bytes) for - MAXNAMELEN. - - * ace/config-hpux-10.x-aCC.h: - The comment did not make clear what was compiler/platform - target. It also included some remarks that only applied to - HP/C++. - - * tests/Future_Test.cpp: - * tests/Message_Block_Test.cpp: - * tests/Thread_Pool_Test.cpp: - Will not compile if ACE_HAS_THREADS was not defined and - ACE_TEMPLATES_REQUIRE_SPECIALIZATION was: they tried to - instantiate templates that were only defined when ACE_HAS_THREADS. - - * ace/config-hpux-10.x-aCC.h: - More fine tuning: ACE_HAS_EXCEPTIONS, - ACE_LACKS_LINEBUFFERED_STREAMBUF, - ACE_HAS_STREAM_PIPES. - - * ace/TLI_Stream.h: - * ace/TLI_Acceptor.h: - No "Meta-type info" was defined (the PEER_ADDR and PEER_STREAM - typedefs). - - * ace/Signal.h: - * ace/Signal.cpp: - With HP/aCC we can enable ACE_Sig_Handlers. - -Mon Mar 31 22:36:55 1997 Douglas C. Schmidt - - * ace/Service_Config.cpp (process_directives): Return -1 if - ace_yyerrno > 0. Thanks to Alan Cabrera - for reporting this. - -Mon Mar 31 17:38:08 1997 Chris Cleeland - - * ace/OS.cpp (thr_create): Moved priority determination after - policy determination because it's possible for setting of the - priority to fail if it's not a valid priority for the [default] - policy. - -Mon Mar 31 09:00:54 1997 David L. Levine - - * performance-tests/Misc/context_switch_time.cpp: this test no - longer worked. So, reverted to revision 4.5, plus minimum - changes necessary to support build on platforms without threads. - - * examples/Threads/Makefile, performance-tests/Misc/Makefile: - moved context_switch_time.cpp from examples/Threads to - performance-tests/Misc. - - * examples/Logger/Acceptor-server/server_loggerd.cpp, - examples/Reactor/Misc/pingpong.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp, - examples/Shared_Malloc/Malloc.cpp: - added template specializations. - - * include/makeinclude/platform_sunos5_g++.GNU: removed dependency - of CCFLAGS on CFLAGS to avoid duplicate -g in build command. - Also, added -fno-implicit-templates in comment. - -Sun Mar 30 12:52:58 1997 Douglas C. Schmidt - - * ace/Malloc.h: The block begining with: - #if defined (ACE_MALLOC_STATS) - and ending with end of struct ACE_Malloc_Stats - must be moved (up) after line 107 - - Thanks to Sandro Doro for pointing - this out. - - * ace/Malloc_T.cpp: The line - this->malloc_stats_.dump (); - must be changed in: - this->cb_ptr_->malloc_stats_.dump (); - - Thanks to Sandro Doro for pointing - this out. - - * ace/Malloc_T.cpp: the line - this->cb_ptr_->malloc_stats_.print (); // print not exists - may be changed in: - this->cb_ptr_->malloc_stats_.dump (); - - Thanks to Sandro Doro for pointing - this out. - - * ace/Malloc_T.h: Added "virtual" to the ACE_New_Allocator methods - to reinforce the fact that they are indeed virtual. Thanks to - Sandro Doro for pointing this out. - - * ace/Malloc.h: Added "virtual" to the ACE_New_Allocator methods - to reinforce the fact that they are indeed virtual. - -Sat Mar 29 20:26:54 1997 David L. Levine - - * ace/OS.h: moved #defin of RTLD_LAZY after #include of dlfcn.h. - Thanks to Chris Lahey for this fix. - - * ace/Task_T.h: replaced #include of "ace/Module.h" because some - Task_T methods use ACE_Module methods. - - * examples/Connection/non_blocking/test_{sock,spipe,tli}_{acceptor, - connector}.cpp, - examples/System_V_IPC/SV_Semaphores/Semaphores_{1,2}.cpp: - added template specializations. - -Sat Mar 29 17:08:33 1997 Douglas C. Schmidt - - * ace/OS.cpp: Added many new ACE_UNUSED_ARGS macros to eliminate - warnings when we are compiling without threads. - -Fri Mar 28 11:34:38 1997 David L. Levine - - * ace/Task.{h,cpp},Thread_Manager.h: changed remaining - priority types to long and defaults to -1. - - * ace/Thread_Manager.cpp (spawn_i): don't clobber errno! - ACE_OS::thr_create () sets errno and returns -1. So, - its return value should not be used to set errno. - - * ace/OS.cpp (thr_create): fixed PTHREADS_1003_DOT_1C thread - priority logic. Thanks to Thilo Kielmann - for the patch. - - * ace/config-sunos5.5*.h,README,OS.cpp (thr_create): added - ACE_HAS_ONLY_SCHED_OTHER to indicate that platform (Solaris 2.5) - only supports POSIX SCHED_OTHER scheduling policy. - - * tests/Priority_Task_Test.cpp (open): added THR_SCHED_FIFO flag. - Thanks to Thilo Kielmann for - for this suggestion. - - * examples/ASX/Event_Server/Event_Server/Makefile, - Transceiver/Makefile: - added -lGateway to LIBS to pick up its template - instantiations during links. - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp, - Transceiver/transceiver.cpp, - Connection/blocking/SPIPE-{acceptor,connector}.cpp, - misc/Connection_Handler.cpp,test_upipe.cpp, - Logger/simple-server/server_loggerd.cpp, - UPIPE_Event_Server/{Consumer,Supplier}_Router.cpp, - performance-tests/Synch-Benchmarks/Options.cpp: - added template specializations. - -Thu Mar 27 21:10:59 1997 David L. Levine - - * ace/IOStream.h: only use built-in ipfx{0,1} () with __GNUC__, - because that's the only compiler we know of that has them. - Thanks to Carlos O'Ryan for pointing this - out, and to James CE Johnson for providing the fix. - - * ace/OS.i: rearranged order of ACE_Time_Value functions (moved - set ()'s up, moved arithmetic operators down) so that they are - defined before use. - - * ace/Task_T.cpp: removed ACE_TEMPLATES_REQUIRE_SOURCE around - #include of "ace/Module.h" so that it will build with Sun C++ 4.1. - - * apps/Gateway/Peer/Makefile: added -lGateway to LIBS to - pick up its template instantiations during links. - - * apps/Gateway/Peer/Peer.cpp: added template instantations. - -Thu Mar 27 14:10:39 1997 Douglas C. Schmidt - - * ace/OS.h: Added two new accessors to ACE_Time_Value: - - operator timeval *() const; - // Returns a pointer to the object as a timeval. - - const operator timeval *() const; - // Returns a pointer to the object as a timeval. - - Thanks to Carlos O'Ryan for this suggestion. - - * ace/OS.i (ACE_Time_Value): Inlined many of the ACE_Time_Value - accessors. - - * ace/OS.h: Reimplemented ACE_Str_Buf at - - struct ACE_Export ACE_Str_Buf : public strbuf - { - // = Initialization method - ACE_Str_Buf(void* b = 0, int l = 0, int max = 0); - // Constructor. - }; - - this makes the casting from ACE_Str_Buf* to strbuf* a "safe" - cast and makes it more portable (say on platforms where the - fields in strbuf are not in the right order). Thanks to Carlos - O'Ryan for this fix. - - * ace/OS.h: Moved the definition of imr_multiaddr to just before - class ACE_OS so that it picks everything up appropriately. - Thanks to Hakan Kallberg for reporting this. - - * ace/config-aix-4.[12].x.h and config-mvs.h: Fixed the - ACE_HAS_MULTICAST macros, which should have said - ACE_HAS_IP_MULTICAST. Thanks to Daniel Montalibet - for reporting this. - -Thu Mar 27 15:54:10 1997 Chris Cleeland - - * ace/{Thread,Thread_Manager}.{h,i,cpp} (ACE_Thread): Changed - type for priority arg to spawn*() from u_int to long to - support changes in thr_create indicated below. Thanks to - Thilo Kielmann for these - changes. - - * ace/OS.cpp: Ensure that whenever either a priority of a - scheduling policy is set explicitly, with POSIX threads, the - other argument and the flag THR_EXPLICIT_SCHED is set - automatically. A range check for priority values for POSIX - 1003.1c is also included. Thanks to Thilo Kielmann - for these changes. - - * ace/OS.h: Changed type and default value of priority arg to - thr_create from u_int to long and 0 to -1. Thanks to Thilo - Kielmann for these - changes. Also added ACE_MAX and ACE_MIN macros. - -Thu Mar 27 11:25:38 1997 David L. Levine - - * netsvcs/servers/Makefile: removed SHOBJ so that main.so is not - built, because it wasn't needed. Thanks to Sandro Doro - for this fix. - - * ace/config-aix-4.[12].x.h,config-mvs.h: changed - ACE_HAS_MULTICAST to ACE_HAS_IP_MULTICAST. Thanks to Daniel - Montalibet for reporting - this. - - * include/makeinclude/platform_sunos5_g++.GNU, - platform_sunos5_x86_g++.GNU, - platform_unixware_g++.GNU: - removed "-L$(WRAPPER_ROOT)/ace -L./" from LDFLAGS because it - is added to LDFLAGS in include/makeinclude/wrapper_macros.GNU. - - * apps/Gateway/Gateway/{Event_Channel.cpp,Gateway.cpp, - Proxy_Handler.cpp,Proxy_Handler_Acceptor.cpp, - Proxy_Handler_Connector.cpp, - examples/IPC_SAP/UPIPE_SAP/ex{2,3}.cpp, - netsvcs/clients/Naming/Client/Client_Test.cpp, - netsvcs/clients/Tokens/manual/manual.cpp: - added template specializations. - -Thu Mar 27 10:05:59 1997 Prashant Jain - - * netsvcs/lib/TS_Clerk_Handler.cpp: Fixed two things: - 1) In TS_Clerk_Processor::parse_args() changed - "%n:\n[-p hostname:port] [-t timeout] [-p poolname]\n%a", 1), - to - "%n:\n[-h hostname:port] [-t timeout] [-p poolname]\n%a", 1), - - 2) In TS_Clerk_Processor::alloc() changed - void *temp = 0; - // Only create the state if it doesn't already exist. - if (this->shmem_->find (ACE_DEFAULT_TIME_SERVER_STR, temp) == -1) - { - // Allocate the space out of shared memory for the system time entry - temp = this->shmem_->malloc (sizeof (this->system_time_)); - - to: - - // Only create the state if it doesn't already exist. - if (this->shmem_->find (ACE_DEFAULT_TIME_SERVER_STR) == -1) - { - // Allocate the space out of shared memory for the system time entry - void *temp = this->shmem_->malloc (sizeof (this->system_time_)); - - Thanks to Sandro Doro (alex@aureus.sublink.org) for suggesting these changes. - -Thu Mar 27 01:00:18 1997 Douglas C. Schmidt - - * include/makeinclude/platform_irix6.2_sgiCC.GNU: Added a new - platform config file for SGI Irix 6.2 using the CC compiler (not - NCC nor the MipsProcompiler). Thanks to Eric Dean Russell - for these changes. - - * ace/OS.h: Moved the ACE_LACKS_UTSNAME_T block into the right - part of the code. Thanks to Jonathan Biggar for - this fix. - - * ace/Malloc.h: Added an enhancement so that the new alignment - features will work regardless of the size of ACE_MALLOC_ALIGN. - Thanks to Fred LaBar for this fix. - - * ace/Synch_Options.cpp: We now automatically set the USE_TIMEOUT - flag if a non-0 timeout value is supplied. Thanks to Tim - Liddelow for this suggestion. - -Wed Mar 26 08:47:24 1997 David L. Levine - - * ace/{ACE.cpp,Log_Msg.cppOS.cpp}, - tests/{Message_Queue_Test.cpp,Naming_Test.cpp}: - Changed ::sprintf calls to ACE_OS::sprintf. Thanks to - Thilo Kielmann for - reporting this. - - * netsvcs/lib/{Client_Logging_Handler.cpp,Name_Handler.cpp, - Server_Logging_Handler.cpp,TS_Service_Handler.cpp, - Token_Handler.cpp}: added template specializations. - -Tue Mar 25 06:47:14 1997 Douglas C. Schmidt - - * ace/OS.h: Moved config.h to the top of OS.h so that we don't - have to worry about not defining things in the right place. - Thanks to Matthias Kerkhoff for pointing - this out. - -Tue Mar 25 22:54:49 1997 Irfan Pyarali - - * ace/OS.i: Added UNICODE support for ACE_OS::chdir(). Thanks to - Ivan Murphy for the code. - -Tue Mar 25 21:26:10 1997 David L. Levine - - * ace/TTY_IO.{h,cpp},README, and these config files: - config-aix-*.h, config-hpux-*.h, config-irix5.*.h, - config-mvs.h, config-osf1-*.h, config-sun*.h (except for g++ - and config-sunos5.5-sunc++-4.1.h), config-win*.h: - Added ACE_NEEDS_DEV_IO_CONVERSION to conditionally compile the - ACE_DEV_IO & conversion operator for ACE_TTY_IO, which is a - subclass of ACE_DEV_IO. Thanks to Fred LaBar - and Gonzalo Diethelm - for reporting warnings without this on - Irix 6.2 with the mipsPro compiler. - - * ace/OS.cpp (thr_create): on VxWorks, always pass 0 as first arg to - ::taskSpawn () so that VxWorks will generate the task ID. - Thanks to Dave Mayerhoefer - for providing this fix, without which random task names would - be assigned. - - * ace/ACE.cpp (get_bcast_addr): added return 0 at end of non-WIN32 - code to avoid compile warning from g++. - - * tests/IOStream_Test.cpp: removed extra "(%P|%t)" from output. - I couldn't get ACE_ERROR_RETURN to work on g++: it complained - about mismatched return types when returning an int from a - function that returns a void *, and about mismatched arguments - to an ACE_Log_Msg function if I cast the int to a void *. So, - I used ACE_ERROR instead. - Added ACE_UNUNSED_ARG (arg). Removed unused variables - error_at_server and error_at_client. - - * netsvcs/lib/TS_Clerk_Handler.cpp: added another template - specialization. - - * examples/Reactor/Multicast/client.cpp: Log_Wrapper::LOG_DEBUG - instead of LM_DEBUG. - - * examples/Threads/context_switch_time.cpp: use ACE_Sched_Params - to get platform-dependent thread priorities. Also, moved #includes - so that config.h is read before testing for ACE_HAS_THREADS. - - * examples/Threads/{auto_event.cpp,barrier2.cpp,future1.cpp, - future2.cpp,reader_writer.cpp,tss1.cpp,tss2.cpp}: - added template specializations. - -Tue Mar 25 10:01:05 1997 Chris Cleeland - - * config-linux.h: Added - ACE_HAS_{SVR4_DYNAMIC_LINKING,AUTOMATIC_INIT_FINI}. Thanks to - alex@aureus.sublink.org (Sandro Doro) for the change. - - * platform_linux.GNU: Added -ldl to LIBS. Thanks to - alex@aureus.sublink.org (Sandro Doro) for the change. - -Tue Mar 25 16:01:34 1997 Carlos O'Ryan - - * ace/Svc_Handler.cpp: - I forgot to comment this: "operator delete" used to call ::delete - on a void*, on ANSI/C++ this is not allowed. Since "operator new" - calls ::new for a char[] I do a casting to char* and call - ::delete[] on the char pointer. - - * ace/config-hpux-10.x-aCC.h: - HP-UX 10.10 supports CLOCK_GETTIME, my guess is that it should - work with g++ and HP/C++, but I won't mess with those files yet. - - * ace/Connector.h: - The default address parameter for "connect" is a bit tricky, from - the comments in the file: - // - // If the compiler supports 'typename' we cannot use - // - // PEER_CONNECTOR::PEER_ADDR::sap_any - // - // because PEER_CONNECTOR::PEER_ADDR is not considered a - // type. But: - // - // typename PEER_CONNECTOR::PEER_ADDR::sap_any - // - // will not work either, because now we are declaring sap_any a - // type, further: - // - // (typename PEER_CONNECTOR::PEER_ADDR)::sap_any - // - // is considered a casting expression. All I can think of is - // using a typedef, I tried PEER_ADDR but that was a source of - // trouble on some platforms. I will try: - // - typedef ACE_PEER_CONNECTOR_ADDR ACE_PEER_ADDR_TYPEDEF; - - * ace/OS.h: - The stock HP C++ compiler (cfront based) gives lots of warnings in - . I used to define volatile to avoid this warnings. Now - I think I'll rather like to see them. - - * ace/SPIPE_Stream.h: - * ace/SPIPE_Connector.h: - There was no meta-type info (PEER_ADDR) for SPIPE_Stream and - SPIPE_Connector. - - * ace/Stream_Modules.h: - * ace/Stream_Modules.cpp: - Fixed a "bug" introduced in my last change: a couple of - ACE_ALLOC_HOOK_* were commented but shouldn't. - - * examples/Connection/non-blocking/CPP-acceptor.cpp (open): - PR_AD cannot be used in this context, it expands to - _ACE_PEER_ACCEPTOR::PEER_ADDR (via ACE_PEER_ACCEPTOR_ADDR), but - the template parameter is _ACE_PEER_STREAM (aka PR_ST_1, aka - ACE_PEER_STREAM_1). - The right macro was ACE_PEER_STREAM_ADDR. - - * ace/Connector.h: - * ace/Connector.cpp: - The typedef trick I used (PEER_ADDR) did not work on every - platform. - I also broke some examples since ACE_PEER_CONNECTOR_ADDR did not - include ACE_TYPENAME on its definition. Hopefully this new trick - will work everywhere. - - * I finally sorted out the mistery of including "ace/Module.h" - into "ace/Task_T.cpp": when compiling "ace/Stream_Modules.cpp" you - get the following include sequence: - Stream_Modules.cpp - Stream_Modules.h - Task.h - Task.i - Task_T.h - Message_Queue.h (descendants removed) - Synch_T.h (descendants removed) - Task.h (already included). - Task_T.i - Task_T.cpp - Module.h - ACE.h (descendants removed) - Task.h (already included). - Module.i - Module.cpp - - At this point Module.cpp uses ACE_Thru_Task declared on - Stream_Modules.h, but after the #include "ace/Task.h"; - in fact Module.cpp tries to #include "ace/Stream_Modules.cpp" but - that second #include expands to nothing due to the canonical - protection on Stream_Modules.h. - That explains the removal of Module.h in Task_T.cpp. - If you are wondering why so long an explanation for this change - the answer is simple: just because I was curious on now it worked. - -Mon Mar 24 14:08:48 1997 Douglas C. Schmidt - - * ace/SOCK_Dgram_Bcast.cpp (mk_broadcast): Cleaned up the code a - bit. - - * ace/ACE: Added a new method called get_bcast_addr() which will - get the broadcast address for a host. Thanks to Paul Han - for suggesting this. - - * ace/UNIX_Addr: Added another set method in UNIX_Addr class: - - void set (const ACE_UNIX_Addr &sa); - // Creates an ACE_UNIX_Addr from another . - - Thanks to Paul Han for this. - - * ace/SOCK_Dgram: Removed the #if defined (ACE_HAS_IP_MULTICAST) - since this is now handled at the ACE_OS level. - - * ace/OS.h: Added support for IP multicast macros and structs even - on platforms that don't support it so that the tests will - compile without having lots of #ifdefs. - - * tests/Future_Test.cpp: Added a check for platforms that lack - threads. Thanks to Hakan Kallberg - for reporting this. - - * netsvcs/lib/Server_Logging_Handler.cpp: Added a check for - platforms that lack threads. Thanks to Hakan Kallberg - for reporting this. - - * examples/Threads/context_switch_time.cpp: Added an #ifdef for - ACE_HAS_THREADS to this test so that it will compile on - platforms that don't have threading. Thanks to Scott Halstead - for reporting this. - - * tests/IOStream_Test.cpp: Fixed up this test so that it works - correctly on platforms that lack multi-threading. Thanks to - Scott Halstead for reporting this. - - * netsvcs/lib/Makefile: Reincluded the LIB target so that we'll - build a static library. Thanks to Scott Halstead - for reporting this. - - * ace/SOCK_Dgram.cpp (recv): Added a check to make sure that we - don't try to copy more into the recv buffer than we've really - got. Thanks to Alan_Cabrera@fp.cibc.com for this fix. - - * ace/OS.cpp (readv): Added a check to make sure that we don't try - to copy more into the recv buffer than we've really got. Thanks - to Alan_Cabrera@fp.cibc.com for this fix. - - * ace/Malloc.h: Modified the alignment strategy to define - ACE_MALLOC_ALIGN to a number of bytes. (it gets rounded to a - number of long's). This makes it easier to work with more - complex buffer alignment strategies (e.g., DMA). Thanks to Fred - LaBar for this. - - * ace/OS.cpp (readv): Added several more changes for the readv() - emulation. Thanks to Alan Cabrera - and Adam Porter for these fixes. - -Mon Mar 24 14:22:17 1997 David L. Levine - - * ace/OS.cpp (thr_create): For VxWorks, fixed call to ::taskSpawn (). - ACE's arguments are in an array, not individual arguments. - Also, set flags to VX_FP_TASK if it's 0, to match behavior - of ::sp (). Thanks to Dave Mayerhoefer - for reporting these and providing - the fix. - - * ace/High_Res_Timer.cpp (elapsed_time (struct timespec &): - fixed, using same approach as in elapsed_time - (ACE_hrtime_t &nanoseconds), to get nanosecond resolution. - - * netsvcs/lib/TS_Clerk_Handler.cpp (handle_close): added - ACE_UNUSED_ARG (mask). Also, added template specializations. - - * examples/Reactor/Multicast/server.cpp (Server_Events ctor): - rearranged initializers to match declaration order. - - * examples/IOStream/server/iostream_server.cpp, - client/iostream_client.cpp: - added template specializations. - -Mon Mar 24 13:21:31 1997 Tim H. Harrison - - * ace/High_Res_Timer.cpp (elapsed_time): Added an - ACE_High_Res_Timer::elapsed_time (ACE_hrtime_t &nanosecond) - method that returns the number of elapsed nanoseconds. This is - accomplished even with the scale factors converting to - microseconds. It also does not use floating point - calculations. - -Sun Mar 23 13:25:39 1997 Tim H. Harrison - - * ace/High_Res_Timer.h: Removed from the - constructor of High_Res_Timer. All High_Res_Timers now use - global_scale_factor_ directly. Hopefully, this will not break - any existing code! - -Sat Mar 22 12:06:22 1997 Douglas C. Schmidt - - * ace/OS.h: The include statement for config.h was too low. Some - defines for key_t, needed for NT, didn't work. Thanks to Alan - Cabrera for these fixes. - - * examples/Reactor/Multicast: Improved the multicast client and - server programs to work better. - - * ace/Connector.cpp: Modified the ACE_Connector::handle_close() - method to prevent recursive calls to itself. Thanks to Paul Han - for reporting this. - - * ace/Svc_Handler.cpp: Put the check (closing_ == 0) in the - destructor as well as in the destroy() method. This prevents a - possible core dump when the timer exists. The instruction - reactor::remove_handler in the shutdown method currently will be - called twice when ACE_Svc_Handler object is being deleted. Core - dump occurs when it tries to execute ACE_Reactor::remove_handler - method the second time because the ACE_Svc_Handler object - pointer has already been deleted by the previous instruction - ACE_Reactor::cancel_timer. Thanks to Paul Han - for reporting this. - - * ace/OS.cpp: Added new thread-safe implementations of writev() - and readv() for platforms that lack these functions. - - * ace/SOCK_Dgram.cpp: Added new implementations of - ACE_SOCK_Dgram::{send,recv} that define methods for - send(iovec[], ...) and recv(iovec[], ...) for systems that - don't have sendmsg() and recvmsg(). Thanks to Alan Cabrera - for these fixes. - - * apps/jaws/HTTP_Handler.cpp: Removed some problematic template - specializations that were left over from an earlier version of - JAWS. Thanks to Adam Porter for reporting - this. - - * examples/Logger/Acceptor-server/server_loggerd.cpp: Revised the - code to use the new ACE_Svc_Handler logic that checks to ensure - that we don't recurse infinitely in handle_close(). - Thanks to Jean-Marc Strauss for - reporting this problem. - - * examples/Logger/simple-server/Logging_Handler.cpp - (handle_close): Added a check to make sure we don't end up - recursively calling handle_close(). This will prevent - a segfault. - -Sat Mar 22 07:30:49 1997 David L. Levine - - * ace/High_Res_Timer.*: Changed scale factor to convert - platform-dependent clock units to microseconds instead of - nanoseconds. That way, it should be greater than 1 for - all supported platforms. So, it's now an unsigned long - instead of a double. - - * ace/OS.h: Changed ACE_hrtime_t to unsigned __int64 with - _MSC_VER. Also, fixed typo: "uint64" instead of "unit64" - without _MSC_VER. - -Fri Mar 21 08:37:34 1997 Carlos O'Ryan - - * makeinclude/rules.lib.GNU: - I use the macro SOEXT to support HP non-standard extension for - shared library names (.sl instead of .so). - I also changed the rule to build shared libraries: under HP-UX you - cannot pass extra libraries (-lXXX options) when building a shared - lib. Before HP-UX 10.10 it wasn't a problem because no library was - needed with ACE, but to support XLI the '-lxti' flag must be used - on binaries (but not on shared libs). - - * include/makeinclude/platform_hpux.GNU: - The PIC option (+Z) was used always, clearly not intended. - - * include/makeinclude/platform_hpux_gcc.GNU: - Added a config file for g++ under HP-UX. - - * include/makeinclude/platform_hpux_aCC.GNU: - Added a config file for HP/aCC compiler under HP-UX. - - * ace/Makefile: - * netsvcs/lib/Makefile: - Changed to support the SOEXT macro. - - * config-hpux-10.x.h: - * config-hpux-10.x-aCC.h: - * config-hpux-10.x-g++.h: - I updated the files to HP-UX 10.10, AFAIK since that version HP-UX - uses fd_set instead of int in select(2) (so ACE_SELECT_USES_INT is - not needed) and the OS supports siginfo_t and ucontext_t so - ACE_HAS_SIGINFO_T and ACE_HAS_UCONTEXT_T are defined. - I *do not* have threads at my site nor the infamous PHSS_6246 - patch so I couldn't test the threaded version nor the HP cfront - based one. - ACE compiled fine with g++ and HP/aCC though. - - * ace/OS.h: - * ace/Malloc_T.h: - HP/aCC supports the typename keyword. I added a new config macro - 'ACE_HAS_TYPENAME_KEYWORD', when it is defined ACE_TYPENAME - expands to 'typename' when not it expands to nothing. - On the cases where HP/aCC requires the usage of 'typename' I added - a 'ACE_TYPENAME'. - - * ace/OS.i: - * ace/OS.cpp: - ACE_OS::inet_aton cannot be inlined under HP-UX. - - * ace/Connector.h: - * ace/Connector.cpp: - I have decided to use a typedef (PEER_ADDR) instead of - ACE_PEER_CONNECTOR_ADDR, mainly because the second form - requires a ACE_TYPENAME before each usage. - - * ace/Event_Handler_T.i: - Much to my surprize ACE_TYPENAME is required when using a template - typedef as a return value. - - * ace/Local_Name_Space_T.h: - HP/aCC does not like the usage of a private typedef from another - class. - - * ace/Strategies_T.h: - * ace/Strategies_T.cpp: - ACE_Process_Strategy declared two defaults constructors: - ACE_Process_Strategy(void) and ACE_Process_Strategy(int = 1). - The constructor code was wrong, it called open() with parameters: - open(thr_mgr, thr_flags, n_threads) - none of which were defined, worse, open() receives just one - parameter (the number of processes) just as the constructor, I - believe that C-w programming is lurking here. - - * ace/Signal.cpp: - Though the header file does not declare ACE_Sig_Handlers under - HP-UX (and the code is not defined too) some auxiliary functions - that use ACE_Sig_Handlers were defined. I removed their - definition. - Some day I'll try to take a look at the code, trying to find out - was wrong with them. - - * ace/Stream_Modules.h: - * ace/Stream_Modules.cpp: - By mistake I commented out the ACE_ALLOC_HOOK_* macros; have to - fix it *real soon*. - - * ace/Task_T.cpp: - No need to include "ace/Module.h" since only the template - declaration is used. When ACE_TEMPLATES_REQUIRE_SOURCE is defined - you end up using ACE_Thru_Task before it gets defined. - This is no problem unless your compiler checks template sintax - before instantiation as the HP/aCC compiler do. - - * examples/Reactor/Misc/test_demuxing.cpp: - ACE_MT_SYNCH was used, but it is only defined if ACE_HAS_THREADS, - I used ACE_SYNCH instead, which is defined as ACE_MT_SYNCH if - ACE_HAS_THREADS and as ACE_NULL_SYNCH if not. - Maybe the semantics are wrong, but the thing compiles. - -Fri Mar 21 15:10:59 1997 Douglas C. Schmidt - - * ace/Makefile (FILES): Moved Log_Msg to the beginning of the - source list in the ace Makefile. This is nice because it forces - the compilation of OS.i and that, obviously, is where you get - the complaints for the port. It's nice to have it at the - beginning so you catch the errors very early on before you've - compiled 30 or 40 files. Thanks to Scott Halstead - for this suggestion. - - * ace/Memory_Pool.cpp: Added #if !defined - (ACE_LACKS_SYSV_SHMEM) to handle systems like Chorus that - lack this feature. - -Thu Mar 20 18:58:50 1997 Douglas C. Schmidt - - * ace/Svc_Handler.cpp (destroy): Added a state variable to keep - track of when we are closing down the Svc_Handler. This is - necessary to prevent endless recursive calls to handle_close() - due to the recent enhancements to ACE_Timer_{List,Heap}. Thanks - to Bert Craytor for reporting - this. - - * tests/Conn_Test.cpp: Added a new test that makes sure the - Acceptor, Connector, and Svc_Handler are working correctly. - - * ace: Added some more changes for Chorus. Thanks to Wei Chiang - for these changes. - - * ace/OS.h: Added #define for SIGSEGV for platforms that lack it - (e.g., Chorus). - - * ace: Made a bunch of minor changes to support SunOS 4.x better. - Thanks to Scott Halstead for reporting - these problems. - - * tests/Conn_Test.cpp: Added ACE_TEMPLATES_REQUIRE_SPECIALIZATION - for the various templates used in this test. Thanks to Thilo - Kielmann for reporting this. - - * ace/Connector.cpp (connector): Fixed some minor bugs that - prevented the ACE_Connector from compiling. Thanks to David - Levine for noticing this. - - * ace/OS.h: Moved the ACE_LACKS_SIGACTION block so that it will - work on Win32. Thanks to Matthias Kerkhoff - for pointing this out. - -Thu Mar 20 22:38:27 1997 David L. Levine - - * ace/Timer_Heap.cpp: added template specializations. - - * netsvcs/lib/Client_Logging_Handler.cpp, - Name_Handler.cpp - Server_Logging_Handler.cpp - TS_Clerk_Handler.cpp - TS_Server_Handler.cpp - Token_Handler.cpp: added template specializations. - There are still many missing from libnetsvcs. - - * tests/Conn_Test.cpp, - Future_Test.cpp - IOStream_Test.cpp - Map_Manager_Test.cpp - Message_Block_Test.cpp - Message_Queue_Test.cpp - Reader_Writer_Test.cpp - SV_Shared_Memory_Test.cpp - Thread_Pool_Test.cpp}: added template specializations. - Thanks to Thilo Kielmann - for providing these. - - * ace/Log_Msg.cpp: removed commented-out template specialization. - - * include/makeinclude/platform_{chorus,hpux,hpux_gcc}.GNU: - split out CFLAGS and CCFLAGS from CC and CXX. - - * ace/config-aix-4.[12].x.h: added back ACE_HAS_THREAD_SELF and - and ACE_HAS_SVR4_DYNAMIC_LINKING; removed ACE_HAS_PTHREAD_T. - Thanks to Chris Lahey for figuring these out. - -Thu Mar 20 12:25:30 1997 - - * ace/ace.{mak,mdp}: Build->Settings->Code Generation->Processor is - now set to "Pentium" instead of "Blend*" for Debug and Release - builds. - - * ace/config-win32-msvc4.x.h: - * ace/config-win32-msvc2.0.h: - * ace/config-winnt-4.0-msvc4.x.h: Only define ACE_HAS_PENTIUM when - _M_IX86 == 500. Projects must specify Pentium in - Build->Settings->Code Generation->Processor to use the RDTSC - instruction in ACE_OS::gethrtime. - - * ace/High_Res_Timer.{cpp,i}: By default, High_Res_Timer is - constructed with a scale_factor == 1. This allowed me to remove - all the checks for scale_factor == 0 in the code. - - * ace/High_Res_Timer.h (static gettimeofday): If - global_scale_factor_ is not set, and we're on a platform that - requires global_scale_factor_ (e.g., Win32), - ACE_OS::gettimeofday will be used instead of ACE_OS::gethrtime. - This allows the scale_factor of 1 to still result in correct - values. - -Wed Mar 19 15:02:09 1997 Douglas C. Schmidt - - * ace: Added zillions of minor changes so that ACE will compile on - the new aCC compiler for HPUX. Thanks to Gonzalo A. Diethelm - and Carlos O'Ryan for - help with this. - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): In addition to the - SO_REUSEADDR option, Irix has a SO_REUSEPORT option that must - also be set to allow multiple sockets to bind to the same - multicast address. Thanks to Robert V. Head for - reporting this. - - * ace: Added a slew of changes to support CHORUS. Thanks to - Wei Chiang for these changes. - - * ace/config-sunos4.*.h: Added #define ACE_HAS_UNION_WAIT based - on the recommendation of Kumar Neelakantan - . - - * ace/Log_Msg.cpp (log_hexdump): Replaced the use of ::sprintf() - with ACE_OS::sprintf() so that the return value would be correct - on SunOS 4.x! - - * ace/OS: Added ACE_HAS_CHARPTR_SPRINTF and ACE_SPRINTF_ADAPTER - to ACE_OS::sprintf() for SunOS 4.x platforms. Thanks to Kumar - Neelakantan for reporting this. - - * ace/Handle_Set.cpp (ACE_Handle_Set_Iterator): If the bound was - reached in the following loop, we should set this->num_ = - this->handles_.max_handle_ + 1 rather than go into the 2nd loop. - Thanks to Michael Newton for reporting - this. - - * ace/Handle_Set.cpp (ACE_Handle_Set_Iterator): - ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator did not work - properly if called with a zero handleset, as there was no bounds - check on the first loop therein. Thanks to Michael Newton - for reporting this. - -Wed Mar 19 16:06:32 1997 David L. Levine - - * ace/OS.h,README: added ACE_HAS_AIX_BROKEN_SOCKET_HEADER to wrap - #include of sys/socket.h with #undef/#define of __cplusplus. - - * ace/config-aix-4.[12].x.h: added ACE_HAS_AIX_BROKEN_SOCKET_HEADER, - ACE_HAS_PTHREAD_T, ACE_LACKS_TCP_H, and ACE_LACKS_SETSCHED. - Removed ACE_HAS_SVR4_DYNAMIC_LINKING and ACE_HAS_THREAD_SELF. - - Thanks to Daniel Montalibet for - both of the above modifications. - - * platform_{dgux4_epc,irix5.3_g++,linux*,m88k,osf1_3.2,sco*, - sunos4_g++,sunos5_centerline*,sunos5_g++,sunos5_sunc++*, - unixware_g++,vxworks5.2_g++}.GNU: split out CFLAGS and CCFLAGS. - Also, removed -lstdc++/-lm from g++ versions, because we now set - CXX to g++ instead of gcc, so those libraries are picked up. - - * include/makeinclude/platform_osf1_4.0{,_g++}.GNU: - added -lrt to support ACE_Sched_Params. Thanks to - Thilo Kielmann for - suggesting this. Also, split out CFLAGS and CCFLAGS. - - * ace/OS.h: removed SVR4_DYNAMIC_LINKING protection around - #define of RTLD_LAZY because it's used in ace/Parse_Node.cpp. - Thanks to Matthias Kerkhoff for pointing - this out. - - * ace/OS.i (thr_setcanceltype): added ACE_UNUSED_ARGS for STHREADS - case. Thanks to Chuck Gehr for - providing this fix. - -Tue Mar 18 21:53:03 1997 Douglas C. Schmidt - - * ace/SOCK_Dgram_Bcast.cpp (mk_broadcast): Modified the - SOCK_Dgram_Bcast class by adding a const char *host_name to the - contructor, and open, and mk_broadcast methods. If the user - passes in the host_name, then only the broadcast address of an - interface that has a matching ip address with the host will be - added to the if_list_. Otherwise, nothing changes. Thanks to - Paul for this feature. - -Tue Mar 18 13:20:59 1997 Irfan Pyarali - - * ace/ace.mdp: Reverted the change for DllMain as the entry point - to ace.dll. This is causing problems in multi-threaded - applications. - - * netsvcs/lib/Client_Logging_Handler.cpp: Added a check in fini() - to make sure we have a valid handler. If the connect attempt - failed, this->handler_ will be set to 0. - - * tests/Mem_Map_Test.cpp: Added code that removes all temporary - files created by the test. - - * tests/Time_Service_Test.cpp: Made sure we remove the backing - store file left behind by a aborted clerk process. - - * examples/Reactor/Ntalker/ntalker.cpp: The ntalker now uses - ACE::register_stdin_handler to register the STDIN. This function - allows for portability. - -Tue Mar 18 08:12:22 1997 David L. Levine - - * ace/Svc_Conf_y.cpp,Makefile: replaced "y.tab.c" string with - "Svc_Conf_y.cpp" to ease debugging. Thanks to Luca Priorelli - for suggesting this. - - * ace/IOStream.cpp (close): replaced call to - ACE_SOCK_Stream::close () with one to generic STREAM::close (). - Thanks to Kumar Neelakantan for - reporting this problem. - - * ace/OS.h,README,config-*.h: removed ACE_HAS_RTLD_LAZY_V, and - replaced with #define of RTLD_LAZY macro only if it's not - already defined (and if ACE_HAS_SVR4_DYNAMIC_LINKING is defined). - Thanks to Chris Lahey for providing this fix. - - * ace/OS.i (thr_setcancelstate, thr_setcanceltype, thr_cancel): - added ACE_UNUSED_ARG calls to avoid compiler warnings. Thanks - to Chuck Gehr for suggesting them. - - * ace/Local_Name_Space_T.h: moved #include of Local_Name_Space.h up - because this file needs declaration of ACE_NS_String. There - _shouldn't_ be a circular include problem because the #includes are - protected. Thanks to Daniel Montalibet - for reporting this problem and - providing the fix. - - * ace/Local_Name_Space.h: removed #include of ace/Service_Config.h. - - * include/makeinclude/wrapper_macros.GNU: put -I. before - -I$(WRAPPER_ROOT) instead of after. - - * tests/IOStream_test.cpp: added checks for receipt of proper values. - -Tue Mar 18 01:38:14 1997 Irfan Pyarali - - * ace/ace.mdp: Add DllMain as the entry point of ace.dll. This - allows us to call WSAStartup when ace.dll is loaded in and - WSACleanup when ace.dll is unloaded. People using ace as a - static library are still out in the cold with respect of getting - WSACleanup called before the process exits. - - I am not sure of two cases: (1) What happens when an application - crashes and was not able to call WSACleanup and (2) if the - application wants to continue using sockets when ace.dll is - unloaded. I hope this solves more problems than it creates ;-) - -Tue Mar 18 01:38:14 1997 Irfan Pyarali - - * ace/Parse_Node.cpp: Added END_OF_LINE characters to some - ACE_ERRORs. - - * netsvcs/{lib,servers}: Fixed the project files to produce and - use the dll in the correct place (which is netsvcs/lib). - - * ace/Log_Record.cpp: Corrected format string for fprintf(). - - * examples/Threads/test.mdp: Added context_switch_time.cpp to the - project. - - All of the above bugs were reported by Luca Priorelli - . Thanks for the contribution. - -Mon Mar 17 12:59:56 1997 David L. Levine - - * ace/OS.{h,i}: added nanosleep (), currently supported only - on POSIX platforms (if ACE_HAS_CLOCK_GETTIME is defined). - - * examples/Mem_Map/IO-tests/{IO_Test.cpp,test_io.cpp): - LM_ERROR instead of ACE_ERROR, and fixed call to ACE::basename (). - - * ace/OS.cpp (sched_params): return -1 if not supported, - instead of ENOTSUP. - - * ace/OS.cpp (fork): added ACE_UNUSED_ARG (program_name) for WIN32 - and VxWorks. - - * ace/Sched_Params.cpp (priority_min, priority_max, next_priority, - previous_priority): not supported on MVS, via ACE_LACKS_SETSCHED. - Thanks to Chuck Gehr for figuring this - out and providing the fix. - - * tests/Timer_Queue_Test.cpp (test_performance): changed type of - local variable "i" to (signed) int to avoid signed/unsigned - comparison, and eventual seg fault because a loop would never - terminate. - -Sun Mar 16 11:31:46 1997 Douglas C. Schmidt - - * ace/Timer_{List,Queue,Heap}.h: Defined copy constructors and - assignment operators in the private part of the class so that - users won't accidentally make mistakes. - -Sat Mar 15 21:44:45 1997 Douglas C. Schmidt - - * ace/Timer_{Queue,List}.cpp (cancel): handle_close() should be - called only once (especially when handle_close() implements - "delete this;" ). Since it is possible that the EH will be - registered more than once, I changed the code to do the - following: - - if (number_of_cancellations == 1) - // Call the close hook. - curr->handler_->handle_close (ACE_INVALID_HANDLE, - ACE_Event_Handler::TIMER_MASK); - - Thanks to Hamutal Yanay for - suggesting this. - - * examples/Mem_Map/IO-tests/test_io.cpp (run_tests): Removed all - uses of ::perror and replaced them with calls to ACE_ERROR - macros. - - * ace/Mem_Map.i (unmap): The ACE_Mem_Map::close method does not - work properly if the value of file_mapping_ is equal to - ACE_INVALID_HANDLE. In this case the method calls a useless - close (-1). Therefore, I changed: - - if (this->file_mapping_ != this->handle_) - ACE_OS::close (this->file_mapping_); - - in: - - if (this->file_mapping_ != this->handle_ && - this->file_mapping_ != ACE_INVALID_HANDLE) - ACE_OS::close (this->file_mapping_); - - Thanks to Sandro Doro for reporting - this. - -Thu Mar 13 18:21:15 1997 Irfan Pyarali - - * ace/ReactorEx.h: Change protection of methods/variables of - ReactorEx from private to protected. Thanks to Matthias Kerkhoff - for suggesting this. - -Thu Mar 13 16:31:54 1997 David L. Levine - - * ace/OS.i (thr_getprio): Added missing ACE_NOTSUP_RETURN - for the case of pthreads && !defined (ACE_LACKS_SETSCHED). - Thanks to Chuck Gehr for - reporting this. - -Thu Mar 13 00:12:15 1997 Irfan Pyarali - - * ace/Local_Name_Space_T.cpp (dump): Added ACE_UNUSED_ARG around - fake_this to stop the compiler from complaining about unused - variables. - - * ace/Message_Block.cpp (ACE_Data_Block::size): Moved the copying - of the old base before freeing it up. Thanks to Dieter Quehl - (dietrich.quehl@med.siemens.de) for pointing this out. - - * ace/Local_Name_Space_T.cpp: Added code to the list methods such - that structured exceptions are handled correctly. Thanks to - Karlheinz Dorn (karlheinz.dorn@med.siemens.de) for reporting - this. - -Wed Mar 12 21:31:51 1997 Irfan Pyarali - - * examples/Reactor/Ntalker/ntalker.cpp: Made changes to the - program which allows it to run under Win32. - - * ace/SOCK_Dgram_Mcast.cpp: Made changes to the setting of the - interface address so that it works correctly under Win32. - Thanks to Todd L. Montgomery (tmont@cs.wvu.edu), Anton van - Straaten (anton@appsolutions.com), Ole O. Johnsen - (Ole.Johnsen@gpi.telemax.no), Mike Flinn - (mike.flinn@smtpgate.aws.waii.com), Steve Weismuller - (spweismu@rsoc.rockwell.com) and others who helped out. - -Wed Mar 12 17:05:52 1997 Chris Cleeland - - * ace/config-linux-lxpthreads.h: Added ACE_HAS_IP_MULTICAST. - -Wed Mar 12 16:07:07 1997 David L. Levine - - * ace/OS.i (gethrtime): Added support for VxWorks and - other platforms that support ACE_HAS_CLOCK_GETTIME. - -Tue Mar 11 21:38:42 1997 Irfan Pyarali - - * ace/OS.i (open): Improved support for passing flags through to - CreateFile (). - -Tue Mar 11 14:30:12 1997 David L. Levine - - * ace/config-vxworks-ghs-1.8.h: added ACE_LACKS_SYS_NERR. - Thanks to Dave Mayerhoefer for - reporting this. - - * ace/OS.{i,cpp} (uname, hostname): added VxWorks support. - Thanks to Dave Mayerhoefer for - providing this. (Also, uninlined ACE_OS::uname on WIN32 - and VxWorks because it contains string literals.) - - * ace/High_Res_Timer.{i,cpp}: fixed interpretation of units: - ACE_hrtime_t is in nanoseconds, so it should be divided by - 1000000000 to get seconds. Fixed divs/mods to first divide - by 1000, then div/mod. Thanks to Luca Priorelli - for identifying this problem. - - Also, removed some casts that are no longer necessary, and - added some casts of ACE_hrtime_t values to longs to avoid - compiler warnings. Thanks to Matthias Kerkhoff - for pointing this out. - - * ace/Reactor.cpp (unbind): cast "index" to int to avoid - signed/unsigned comparison. Thanks to Matthias Kerkhoff - for pointing this out. - - * ace/ReactorEx.cpp (bind): changed type of "current_size" to - size_t to avoid signed/unsigned comparison. Thanks to Matthias - Kerkhoff for pointing this out. - - * ace/Timer_Heap.cpp (ctor, grow_heap): cast unsigned value - (i + 1) to int before negating to avoid compiler warning. - Thanks to Matthias Kerkhoff for pointing - this out. - - * examples/Threads/context_switch_time.cpp (main): added - ACE_SCOPE_PROCESS param to ACE_Sched_Params instances so - that the test works on WIN32. Thanks to Luca Priorelli - for identifying this problem. - - * ace/Registry.{h,cpp},Registry_Name_Space.{h,cpp},Svc_Conf_Tokens.h, - Svc_Conf_{l,y}.cpp,Timer_{Heap,List}.cpp,config-aix-4.2.x.h, - config-dgux-4.11-epc.h,config-mvs.h,config-sco-5.0.0-fsu-pthread.h, - config-sco-5.0.0-mit-pthread.h,config-sco-5.0.0-nothread.h: - added CVS header (Id wrapped in $). - - * netsvcs/clients/Logger/indirect_logging.cpp (main): declare loop - index as signed int to avoid signed/unsigned comparison. - -Tue Mar 11 07:34:04 1997 Douglas C. Schmidt - - * tests/Timer_Queue_Test.cpp: Added some code to illustrate how - the new handle_close() hook for ACE_Timer_{Heap,List} work. - - * ace/Timer_Heap.cpp (cancel): Modified the Timer_Heap and - Timer_Queue so that it will call the handle_close() hook when - Event_Handler's are cancelled. This is necessary to reclaim - resources. Thanks to Hamutal Yanay - for suggesting this. - - * ace/Event_Handler.h (signal): Added a TIMER_MASK, which is - passed to handle_close() when a timer is cancelled. - - * ace/Log_Msg.cpp (log): Fixed a bug by setting LPTSTR lpMsgBuf = - 0 on line 524. Thanks to Mark Wright for - reporting this. - -Sun Mar 10 13:06:04 1997 Douglas C. Schmidt - - * examples/Mem_Map/IO-tests: Fixed a small bug in "IO_Test.cpp" - file. In the "int Mmap1_Test::run_test" method I inserted an - lseek to rewind the output file. With this correction the speed - go up due to IO cache. Thanks to Sandro Doro - for reporting this. - -Sun Mar 9 18:24:37 1997 Prashant Jain - - * java/src/IOCntlMsg.java (IOCntlMsg): Added two new - classes/files, namely IOCntlCmds and IOCntlMsg. - - * java/src/Task.java: Added accessors to get/set the flags of the - Task. - -Sun Mar 9 13:06:04 1997 Douglas C. Schmidt - - * ace/Reactor: Fixed an evil bug where the expression - - if (handle >= 0 || handle < this->max_handlep1_) - - should be - - if (handle >= 0 && handle < this->max_handlep1_) - - Thanks to Mark Wright for reporting this. - -Sun Mar 9 13:06:04 1997 Douglas C. Schmidt - - * apps/Gateway: Updated the Peer and Gateway applications so that - they don't try to register ACE_STDIN with the Reactor on Win32. - - * apps/Gateway: Changed a bunch of calls to - ACE_Reactor::remove_handler() so that it no longer tries to - remove descriptor 0, but instead uses ACE_STDIN. Naturally, - this doesn't work due to the way that Win32 implements select() - but at least it compiles... Thanks to Elliot Lau - for reporting this. - - * apps/Gateway/Gateway/File_Parser: Changed the enumerated type - ERROR to PARSE_ERROR to avoid a name clash with a symbol - reserved by Win32 (barf). Thanks to Elliot Lau - for reporting this. - -Sat Mar 8 12:37:44 1997 Douglas C. Schmidt - - * ace/Log_Msg.cpp: Changed the implementation of ACE_Log_Msg so - that all accesses to the lock_ are now through a Singleton. - This makes it possible to define multiple instances of - ACE_Log_Msg within the same thread. Thanks to Jeff Morgan - for helping track this down. - - * Added support for SCO 5.0. Thanks to Auturo - for these patches. - -Thu Mar 06 13:24:04 1997 David L. Levine - - * ace/OS.i (gettimeofday): moved declaration of "result" so - that it's not declared on VxWorks, where it's not needed; - (stat): added cast of file arg to char * for VxWorks; - (thr_getprio): added missing "#else" before ACE_NOTSUP_RETURN (-1). - Thanks to Dave Mayerhoefer for - reporting these. - - * ace/OS.cpp (sched_param): with STHREADS, map ACE_SCOPE_THREAD - to ACE_SCOPE_PROCESS'. - - * ace/Svc_Conf_l.cpp: commented out YY_BREAK after ace_yyterminate () - to avoid GHS compiler warning about unreachable statement. - Thanks to Dave Mayerhoefer for - reporting this. - - * ace/ace.mak: removed Thread_Priority and renamed Scheduling_Params - to Sched_Param. - - * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (handle_client): - added "l" qualifier for sprintf of ACE_OS::getpid (). - - * tests/Priority_Task_Test.cpp, - examples/Threads/{context_switch_time.cpp,Makefile}: - adapted to new thread priority/ACE_Sched_Params. - -Wed Mar 5 14:33:04 1997 Douglas C. Schmidt - - * ace/UNIX_Addr.cpp: Enhanced the implementation of set() so - that it works correctly on MVS, which has a different definition - of struct sockaddr_un: - - struct sockaddr_un { - unsigned char sun_len; - unsigned char sun_family; - char sun_path[108]; - }; - - Thanks to Chuck Gehr for reporting - this. - -Wed Mar 05 14:47:14 1997 David L. Levine - - * ace/OS.{h,cpp},Makefile; also, renamed Scheduling_Params.* to - Sched_Params.* and removed Thread_Priority.*: - - Major change in scheduling parameters interface: - The key change is that there is no longer a special thread priority - enum. Thread_Priority was changed to int, so applications can do - whatever they want. The ACE_Sched_Params class has some static - functions to help do this portably. - - Here are the changes from the ACE 4.1.3: - - 1) ACE_Thread_Priority: removed this class. - - It contained "priority class" and "thread priority". - "Priority class" is platform-specific and doesn't - need to be visible in ACE; it is subsumed by scheduling policy, - see below. "Thread priority" is replaced by the global - ACE_Sched_Priority typedef in ace/OS.h, see next change. - - 2) ace/OS.h: added ACE_Sched_Priority typedef (to int) - and ACE_SCOPE_THREAD. - - 3) ace/OS.h: added scheduling policy #defines: ACE_SCHED_OTHER, - ACE_SCHED_FIFO, and ACE_SCHED_RR. There's an ACE_Sched_Params:: - Policy typedef that can take one of these values. - - 4) ACE_Sched_Params: added priority_min (), priority_max (), - next_priority (), and previous_priority () functions. All - require an ACE_Sched_Params::Policy argument and take an - optional scope argument (to support the distinct thread - and process priorities on DEC UNIX). - - min_priority () and max_priority () have platform-specific - and policy-specific values, and direction (the min value may - be higher than the max value). The increment and decrement - operations allow applications to iterate over them, etc., - without explicitly specifying the direction of the priority - (0 for high or low priority). - - 5) The only way to apply ACE_Sched_Params is through - ACE_OS::sched_params (const ACE_Sched_Params &). - (This is not really a change, except for the name change from - ACE_OS::set_sched_params (). - - It sets both policy and priority of current thread or - process (depending on the scope in ACE_Sched_Params). - Not all combinations of policy, priority, and scope are - legal on all platforms. Unfortunately, I see no way around - this, because the intersection of legal ranges - on our supported platforms is empty. If an illegal request - is made, ACE_OS::sched_params () sets errno to EINVAL and - returns -1. - - 6) added ACE_OS::thr_setprio (const ACE_Sched_Priority prio) - to set the current thread's priority, only. - - Many thanks to Thilo Kielmann - for his careful review of this class design, thoughtful comments, - and assistance with implementation, especially for PTHREADS - platforms. - -Wed Mar 5 14:36:59 1997 Irfan Pyarali - - * SString.cpp: Fixed ACE*String initialization bugs. Thanks to - jmorey@tbi.com (John Morey) for reporting this. - -Wed Mar 5 14:33:04 1997 Douglas C. Schmidt - - * ace/OS.i: Fixed a bug in gethrtime - - const ACE_Time_Value now = ACE_OS::gettimeofday (void); - - which should be - - const ACE_Time_Value now = ACE_OS::gettimeofday (); - - Thanks to Chuck Gehr for reporting - this. - -Tue Mar 4 16:37:26 1997 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp (main): Make life - easier by doing an unlink(rendezvous) before reopening the - UNIX-domain socket. Thanks to Jeff Morgan - for suggesting this. - -Sun Mar 02 19:58:00 1997 David L. Levine - - * ace/config*.h: removed #define of ACE_HAS_INLINED_OSCALLS - because it's no longer needed in the config files: it's - #defined in OS.h if needed. - -Sun Mar 2 17:14:29 1997 Douglas C. Schmidt - - * include/makeinclude: Updated all the platform-*g++.GNU files so - that they no longer -D__ACE_INLINE__ (since this is handled in - the the config-*g++.h files). - - * ace: Updated all the config-*g++.h files so that they now - #define __ACE_INLINE__ rather than having this set in the - platform_*.GNU file. This makes ACE easier to build and - integrate with other software packages. - -Fri Feb 28 02:22:33 1997 Douglas C. Schmidt - - * ace/SOCK_*: There were problems starting UDP broadcast servers - (all using the same well known port number) multiple times on - one machine (this is very useful test distributed applications - on one single machine). Setting the SO_REUSEADDR option for the - broadcast socket allows binding of a socket that is already in - use and thus allows us to start more than one broadcast servers - in parallel on one machine. Thanks to Dieter Quehl - for this fix. - - Therefore, I patched ACE_SOCK_Dgram_Bcast, ACE_SOCK_Dgram and - ACE_SOCK to include this feature. In addition, I also changed - ACE_SOCK_Connector/ACE_SOCK_Acceptor to use this feature instead - of calling setsockopt() there explicitly. - - * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp (main): Fixed up the - use of ACE_OS::fork() here to use the new "named" version. - - * ace/OS.h: Added a clever new wrapper function called fork (const - char *program_name), which calls fork() and then automatically - calls ACE_LOG_MSG->sync (program_name) to sync up the program - name. This eliminates a common source of error when forking - children and using ACE_Log_Msg::log(). - - * examples/IPC_SAP/SOCK_SAP/FD-un{client,server}.cpp: Updated the - FD client and FD server programs so that it is now a concurrent - server. - - * ace/config-mvs.h: Added #define ACE_LACKS_TCP_H for MVS. Thanks - to Chuck Gehr for pointing this out. - - * ace/OS.h: Added a new #define ACE_LACKS_TCP_H that skips the - inclusion of the netinet/tcp.h file if it isn't on the platform. - - * ace/OS.i (thr_cancel): Changed the line - - ACE_UNUSED_ARG (t_id); - - to - - ACE_UNUSED_ARG (thr_id); - - Thanks to Chuck Gehr for reporting - this. - - * ace/SString.cpp: Fixed up all the ACE_[CSW]String code so that - always allocates a rep_ even in the null constructor. This - saves us from having to handle odd special cases later on... - Thanks to John Morey for reporting this. - - * ace/Service_Repository.cpp (close): Changed the order in which - services are destroyed when the Service Configurator is closed. - Currently, services are destroyed in the order in which they are - created according to the svc.conf file. Now, we shut them down - in reverse order. This makes more sense when services are - related, i.e., one service has to be started before another. - Thanks to Karlheinz for this suggestion. - -Fri Feb 28 12:13:09 1997 David L. Levine - - * ace/OS.h: fixed definition of ACE_TIMER_SKEW. Thanks - to Chuck Gehr for pointing this out. - -Thu Feb 27 21:36:28 1997 David L. Levine - - * ace/OS.{i,cpp} (gethrtime): support on all platforms by - using ACE_OS::gettimeofday () if there is no native high - resolution timer. Moved ACE_OS::getimeofday () definition - toward top of OS.i so that it is always defined before - being called. Finally, expanded gethrtime () support from - linux to __GNUC__ with ACE_HAS_PENTIUM; it should work on - platforms such as VxWorks with gcc on Pentiums. - - * ace/config-osf1-4.0-{,g++}.h: added ACE_HAS_CLOCK_GETTIME. - Thanks to Thilo Kielmann - for pointing this out. - -Thu Feb 27 17:06:12 1997 - - * ace/High_Res_Timer.h (get_env_global_scale_factor): This static - method will set the global_scale_factor to the value in an - environment variable (ACE_SCALE_FACTOR by default). - - * ace/High_Res_Timer.*: Changed all calculations to divide by - scale_factor before doing / and %. This must be done before the - mod for correctness. - - * ace/Profile_Timer.i (start): Changed start and stop methods to - call ACE_High_Res_Timer::gettimeofday. This should allow - greater timing accurracy. - - * ace/High_Res_Timer.h (global_scale_factor): Added a static - global_scale_factor that allows applications to set one scale - factor for all high res timers. This is important for platforms - like intel where the scale factor will vary based on the - processor clock speed. - - * ace/High_Res_Timer.i (gettimeofday): This static method calls - ACE_OS::gethrtime and converts to an ACE_Time_Value based on the - global_static_factor. - -Wed Feb 26 18:28:35 1997 Douglas C. Schmidt - - * ACE-install.sh: Added some fixes for the ACE-install.sh script. - Thanks to Eugene R. Somdahl for reporting these. - - * ace/Connector.cpp (handle_close): Added a test to see if the - reactor_ is NULL and if it is, don't bother trying to use it to - clean up. Thanks to Paul Han for this - suggestion. - -Tue Feb 25 21:19:57 1997 David L. Levine - - * ace/OS.h,config-sunos*.h: default ACE_TIMER_SKEW to 0, - and override to 10 ms in all Solaris config files. - - * ace/Svc_Conf_l.cpp,Makefile: #undef ACE_HAS_TERM_IOCTLS - so that /usr/include/sys/termios.h won't be included; it - #defines ECHO, and Svc_Conf_l.cpp has an ECHO symbol. - - * ace/ACE.cpp (sock_error): added ACE_UNUSED_ARG (error);. - - * ace/Timer_Queue.cpp (ctor): rearranged initializers to - match declaration order. - -Tue Feb 25 19:57:54 1997 - - * ace/Timer_Queue.cpp (gettimeofday): Added gettimeofday accessors - on the Timer_Queue. The default implementation calls - ACE_OS::gettimeofday. Applications can specify, via pointers to - functions, that a timer queue use an alternate gettimeofday - implementation (e.g., a high resolution timer). - - * ace/Reactor.cpp (schedule_timer): The Reactor no longer calls - ACE_OS::gettimeofday. Instead, it calls - Timer_Queue::gettimeofday. - - * ace/ReactorEx.cpp (schedule_timer): The ReactorEx no longer calls - ACE_OS::gettimeofday. Instead, it calls - Timer_Queue::gettimeofday. - -Tue Feb 25 17:40:57 1997 Douglas C. Schmidt - - * ace/Log_Msg.cpp: Updated the 'p' option of the log() method to - use the new ACE::sock_error() method for cases where - FormatMessage() fails. - - * ace/ACE: Added a new sock_error() method to class ACE which - returns the appropriate message for each WinSock error code. - This makes up for an apparent oversight in Win32. Thanks to - Michael R. MacFaden" for this. - -Tue Feb 25 01:33:06 1997 Douglas C. Schmidt - - * ace/OS.h: Moved outside of the VXWORKS #ifdef - since it seems to be available on other platforms (e.g., - Solaris). If people find this not to be the case on all - platforms please let me know and I'll #ifdef it. Thanks to - Sumedh Mungee for reporting this. - -Tue Feb 25 16:20:29 1997 Irfan Pyarali - - * examples/Connection/non_blocking/CPP-acceptor.cpp: Added a - specific checl for timeouts. Also, changed - ACE_PEER_ACCEPTOR_ADDR to ACE_PEER_STREAM_ADDR - - * examples/Connection/non_blocking/non-blocking.{mak,mdp}: New - project files for Win32. - - * ace/Log_Msg.cpp: Minor changes. - -Mon Feb 24 17:16:06 1997 Douglas C. Schmidt - - * ace/Log_Msg.cpp (ACE_Log_Msg): Enable the thread-specific - tracing flag by default. This ensures that tracing will work - "out of the box." - - * ace/config-sunos5.[45]-g++.h: Added a #define for - ACE_HAS_TERM_IOCTLS. Thanks to Joey Zhu for - reporting this. - - * ace/Synch.cpp (acquire): Simplified the recursive mutex logic - for acquire(). Thanks to Arthur J. Lewis" - for reporting this. - - * examples/Connection/non_blocking/CPP-acceptor.cpp (init): Added - a #ifdef for ACE_WIN32 so that we don't register the signal - handler for SIGPIPE since it's not supported on Win32. Thanks - to Ivan Murphy for reporting this - problem. - - * examples/Connection/non_blocking: The SPIPE examples in - (test_spipe_{acceptor,connector}.cpp) aren't ported to Win32 - yet. They currently don't work because ACE_SPIPE*'s can't be - registered with the ACE_Reactor (which only works with sockets). - I've #ifdef'd these examples so that they don't get compiled on - Win32. Thanks to Ivan Murphy for - reporting this problem. - -Mon Feb 24 20:28:10 1997 David L. Levine - - * ace/OS.h: use signed __int64 for ACE_hrtime_t because VC++ - won't convert unsigned __int64 to double. Thanks to Irfan - for reporting this. - - * include/makeinclude/platform_{irix5.3_g++,linux*,m88k, - osf1_4.0_g++,sco-nothread,sunos*g++,unixware_g++}.GNU: - changed C++ compiler (CXX) from gcc to g++ so that libg++ - will be linked in. Thanks to James CE Johnson - for suggesting this. - - * examples/IOStream/{client,server}/Makefile,tests/Makefile: - removed -lg++, when gcc is the compiler, because it's no - longer needed with g++ as the compiler. - -Sat Feb 22 23:03:45 1997 David L. Levine - - * ace/OS.i: restored version 4.89 and 4.90 changes that - were lost in version 4.91. - - * ace/OS.{i,cpp},config-linux*.h: added ACE_OS::gethrtime () - support for Linux on Pentiums. - - * ace/High_Res_Timer.*: changed scale_factor type from - u_long to double so that it can be less than 1. - - * ace/Thread_Priority.cpp: "linux" instead of "LINUX". - - * tests/Priority_Task_Test.cpp (open): set this->priority_ because - an assertion uses it. Also, use ACE_NORMAL_PRIORITY_CLASS so that - root doesn't have to run the test on Solaris. - -Sat Feb 22 22:07:35 1997 Chris Cleeland - - * tests/Priority_Task_Test.cpp (open): Now use - ACE_Thread_Priority while setting the priority of the new - thread. - - * ace/Thread_Priority.cpp (convert_to_os_priority): Changed - return type for this to 'int' from 'long' on Linux. Thanks - to James CE Johnson for pointing this - out! - - * ace/OS.i (thr_cancel): Corrected erroneous macro argument. - Thanks to James CE Johnson for pointing - this out! - -Sat Feb 22 17:00:59 1997 - - * ace/OS.i (gethrtime): Added support for intel's RDTSC - instruction for pentium architectures. - -Sat Feb 22 10:57:47 1997 Douglas C. Schmidt - - * ace/Stream.cpp (open): Make sure that if we allocate the Tasks - in the Stream head and the Stream tail that we set the M_DELETE - flag so that the close() method will clean up the memory. - Thanks to David Levine and Purify for noticing this problem. - -Fri Feb 21 08:06:41 1997 Douglas C. Schmidt - - * ace/OS.i: Yikes, it looks like the Solaris and the POSIX version - of sigwait() are different! The Solaris version returns the - signal number, whereas the POSIX version returns 0 on success, - errno on failure, and sets a parameter with the signal on - success. I've fixed the ACE_OS C++ wrapper so that the right - thing happens, i.e., errno is always set to the error (if - sigwait() returns -1) and the signum is always returned as the - argument and the return value on success ... Thanks to Harry - Gunnarsson for reporting this. - -Fri Feb 21 11:01:22 1997 David L. Levine - - * ace/Thread_Priority.cpp: fixed return type of - convert_to_os_priority () for Linux. Thanks to - James CE Johnson for pointing this out. - - * examples/Shared_Malloc/test_malloc.cpp, - examples/System_V_IPC/SV_Message_Queues/{T,}MQ_Server.cpp (main): - added ACE_UNUSED_ARG (sa);. - -Fri Feb 21 04:12:31 1997 - - * ace/OS.h: Added ACE_SEH_FINALLY. - - * ace/ReactorEx.h: Added ACE_ReactorEx_Test as a friend class. I - think we should have one such friend class for all classes in - ACE. - - * examples/Reactor/ReactorEx/test_exceptions.cpp: New test which - checks how ReactorEx deals with structured exceptions thrown by - user code - - * ace/ReactorEx.cpp (safe_dispatch): Added protection against - structured exceptions caused by user code when dispatching - handles - -Thu Feb 20 17:32:54 1997 Douglas C. Schmidt - - * apps/Gateway: Added a new -v flag to the peerd and gatewayd - applications so that they will print out the strings that are - passed to them. This makes it easier to debug and see what's - happening. - -Wed Feb 19 19:39:06 1997 Douglas C. Schmidt - - * apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp (recv): Removed - the VERBOSE #ifdefs since they weren't used and were causing - compile errors. Thanks to Bert Craytor - for reporting this. - -Wed Feb 19 00:39:50 1997 Douglas C. Schmidt - - * examples/ASX/Event_Server: Updated the README file a bit to - clarify some loose ends. The documentation now explains - precisely how to start up the transceivers correctly. Thanks to - Patty Genuald for suggesting this. - - * include/makeinclude: Removed the default symlink for - platform_macros.GNU since it is "Solaris-biased" ;-). Thanks to - Amos Shapira for reporting this. - -Wed Feb 19 14:41:18 1997 Tim H. Harrison - - * ace/Reactor.cpp: Modified to use timer_queue_->gettimeofday(). - - * ace/Proactor.cpp: Modified to use timer_queue_->gettimeofday(). - - * ace/ReactorEx.cpp: Modified to use - timer_queue_->gettimeofday(). Also had to modify the - ReactorEx_Notify mechanism to use the ReactorEx's timer queue to - call gettimeofday. - - * ace/Timer_Queue.h: Added a gettimeofday method. This allows - applications to replace the timer mechanism used by the - Reactors. The default implementation returns - ACE_OS::gettimeofday. However, a real-time application can - inherit from Timer_Queue and override gettimeofday to return a - value from a high resolution timer. - - * STL/bool.h: Changed the defines for type bool. First, bool is no - longer defined for WIN32 since yvals.h typedefs it already. - Also, I moved the defines out the namespace. I'm not sure if - that's the right thing to do. - -Tue Feb 18 16:41:02 1997 Douglas C. Schmidt - - * include/makeinclude: Added minor enhancements to rules.local.GNU - and wrapper_macros.GNU so that it works with MVS. Thanks to - Chuck Gehr for this. - - * include/makeinclude: Added a new platform_mvs.GNU file that - supports builds on MVS! Thanks to Chuck Gehr - for this. - - * tests/TSS_Test.cpp (worker): To get TSS_Test.cpp to compile on - MVS we changed line 69 from: - - ACE_thread_key_t key = 0; - - to: - - ACE_thread_key_t key = ACE_OS::NULL_key; - - and line 122 from: - - key = 0; - - to: - - key = ACE_OS::NULL_key; - - Thanks to Chuck Gehr for reporting - this. - - * ace/Reactor.cpp (dispatch): Fixed the dispatching logic so that - we bail out as soon as we discover that our state has changed. - Thus, we'll recompute the fd_sets used for select(). - -Tue Feb 18 19:02:53 1997 - - * ace/ReactorEx: - - (a) Made wakeup_all_threads() public. Thanks to Hamutal Yanay - for suggesting this. - - (b) Change closed_for_business_ to open_for_business_. Also made - sure that open and close can potentially be called multiple - times from multiple threads. - - (c) Changed unbind and unbind_all such that they iterate through - all the handles. - - (d) Added a check to see if the handle has been scheduled for - deletion before dispatching it. - -Tue Feb 18 21:24:57 1997 David L. Levine - - * ace/IOStream.h,README: replaced ACE_WIN32 conditional with - ACE_LACKS_IOSTREAM_FX. - - * ace/config-{mvs,win*}.h: added #define ACE_LACKS_IOSTREAM_FX. - Thanks to Chuck Gehr for pointing - out the need for this support for MVS. - - * examples/Reactor/Misc/test_demuxing.cpp: removed unused - variable "done". - - * examples/Reactor/Misc/test_signals_1.cpp (main), - examples/Reactor/Ntalker/ntalker.cpp (main): - added ACE_UNUSED_ARG (sig);. - -Tue Feb 18 17:15:24 1997 Tim H. Harrison - - * ace/ace.mdp, ace/mak: Modified release configuration to build - acer.dll. - -Tue Feb 18 11:43:04 1997 David L. Levine - - * ace/Log_Msg.cpp: removed destructor because it's not declared - and it's empty. - - * ace/OS.i (thr_setprio): added another case (that is NOTSUP) - for platforms with Pthreads and with LACK_SETSCHED. Thanks to - Chuck Gehr for pointing this out. - - * tests/Reactor_Notify_Test.cpp (main): added shutdown flag so - that normal termination reaches ACE_END_TEST. - - * tests/Reactors_Test.cpp (worker): changed "timeout" message to - "Reactor shutdown" because that indicates normal termination, - and won't fool the one-button test. - - * examples/Mem_Map/IO-tests/test_io.cpp (main): added - ACE_UNUSED_ARG (sa);. - - * examples/Misc/test_trace.cpp (main): added ACE_UNUSED_ARG - for sig1 and sig2. - -Tue Feb 18 03:50:10 1997 Irfan Pyarali - - * ace/ReactorEx: - - (a) Added a closed_for_business_ flag so that handle_events() - cannot be called after the ReactorEx has been closed down. - - (b) Transfer of ownership of the ReactorEx to a new owner has - changed. The transfer will not complete until all threads - are ready for it (just like the handle set). - ReactorEx->update_state() now looks out for changes in - ownership. - - * examples/Reactor/ReactorEx/test_MT.cpp: - - (a) The test now terminates and number of iterations can be - specified on the command line. - - (b) Graceful shutdown of ReactorEx is now exercised in the - test. This is a change for the earlier infinite loop. This - also shows how to gracefully close ReactorEx which is being - shared by multiple threads. - - (c) Timers were added to the test. - - * ace/config{win32}: Added flag ACE_LACKS_LINEBUFFERED_STREAMBUF. - -Mon Feb 17 22:37:35 1997 Tim H. Harrison - - * ace/Log_Msg.h (ACE_RETURN): Modified all ACE_RETURN macros to - use ACE_OS::last_error instead of errno. This makes these more - portable to Win32. - - * ace/Log_Msg.cpp (log): Modified Win32 version to use - FormatMessage if errnum is greater than sys_nerr. - - * ace/OS.i (last_error): Modified Win32 version to return - GetLastError if errno == 0. - -Mon Feb 17 18:32:29 1997 Douglas C. Schmidt - - * ace/OS.h: Protected the #ifdef for CLOCK_REALTIME so that it - won't conflict with an existing macro in AIX. Thanks to Chris - Lahey for this. - - * ace/Local_Name_Space_T.h: Added Local_Name_Space.h to - Local_Name_Space_T.h so that templates will work correctly on - AIX. Thanks to Chris Lahey for this. - - * tests: Added a new test, Reactor_Notify_Test.cpp, which tests - out the new max_notify_iterations() method on the Reactor. - - * ace/Reactor: Finished rewriting and testing the new dispatching - logic of the Reactor. The new implementation guards against - pathological cases where ACE_Event_Handler::handle_*() methods - remove registered ACE_Event_Handler objects whose handles are - pending in the dispatch_set. Previously there was no good way - to guard against this. Now, it should be handled automatically. - - * ace: Added many minor fixes to remove warnings with the SGI C++ - compiler. Thanks to Gonzalo Diethelm for - suggesting this. - - * include/makeinclude/platform_irix6.2_sgic++.GNU: Turned on all - the warnings for the SGI C++ compiler. Thanks to Gonzalo - Diethelm for suggesting this. - -Mon Feb 17 20:59:47 1997 David L. Levine - - * ace/IOStream.h: added null ipfx (), etc., methods for ACE_WIN32 - because its iostream class doesn't have them. - - * ace/OS.h: added #include of on VxWorks. - - * ace/Pipe.cpp (open): enabled TCP_NODELAY on VxWorks now that - OS.h #includes . - - * ace/ReactorEx.h: made ACE_ReactorEx_Handler_Repository destructor - virtual because the class has other virtual functions. - - * tests/IOStream_Test.cpp: removed ACE_WIN32 #ifndef, and - removed q_char bool conversion operator because it shouldn't - be needed. - - * examples/Reactor/Misc/pingpong.cpp (handle_input): cast buf_len - to ssize_t to avoid signed/unsigned comparison. - - * examples/Service_Configurator/IPC-tests/client/\ - remote_dgram_client_test.cpp (main): cast mmap.size () to - ssize_t to avoid signed/unsigned comparison. - -Mon Feb 17 09:25:08 1997 Chris Cleeland - - * ace/config-linux-lxpthreads.h: Bumped the Linux kernel version - number assigned to the symbol LINUX. Also added conditional - defines for PTHREAD_{MAX,MIN}_PRIORITY when using Xavier Leroy's - LinuxThreads. - - * ace/Thread_Priority.cpp: Added convert_to_os_priority() for Linux. - -Mon Feb 17 03:15:48 1997 Irfan Pyarali - - * tests/SOCK_Test.cpp (server): Changed recv_n() to recv(). - - * tests/tests.{mak,mdp}: Added two new tests: IOStream and - Reactor_Notify. - - * ace/Reactor: Removed all special checks for setting - ACE_Reactor::max_notify_iterations_ on WIN32 to be 1. This was - made possible after we figured out that the errno was being - reset after the recv() call in handle_input(). This allows - ACE_Reactor_Notify::handle_input() to serve upto - ACE_Reactor::max_notify_iterations_ notifications in one shot - rather than just 1 on WIN32. This should speed up the Reactor on - WIN32 platforms. - -Sun Feb 16 12:23:23 1997 Douglas C. Schmidt - - * ace/Reactor.cpp: Totally rewrote the ACE_Reactor's dispatching - mechanism so that it now keeps track of whether the state of the - wait_set_ has changed during a dispatch (i.e., whenever - register_handler_i() or remove_handler_i() is called). If the - wait_set_ state *has* changed, then we bail out and rerun - select() in order to get the latest changes. - - * ace/Reactor.cpp: Changed the implementation of the - ACE_Reactor_Notify class so that (1) it short-circuits a trip - through the ACE_Reactor::notify_handle() method (after all, it's - just going to call its own handle_input() method back) and (2) - the ACE_Reactor_Notify::handle_input() method now returns a - count of the number of handlers that it dispatched. - - * ace/Log_Msg.h: Added a (%P|%t) so that we now print out the - process id and thread number for failed ACE_ASSERT() calls. - - * tests: Removed the unnecessary template specializations of - ACE_Atomic_Op since this is already done - in libACE. - - * ace/Reactor.cpp: Removed the #ifdef preventing the enabling of - non-blocking mode for the recv() side of the Reactor's - notification pipe (socket) for Win32. I believe that with the - new max_notify_iterations scheme we should be all set. - - * ace/ReactorEx.cpp: Added an identical API for bounding the - max_notify_iterations() for ReactorEx. - - * ace/Reactor.cpp: Enhanced the Reactor's notify() mechanism so - that it is now possible to set the max_notify_iterations(), - which limits the number of times that the - ACE_Reactor_Notify::handle_input() method will iterate and - dispatch the ACE_Event_Handlers that are passed in via the - notify pipe before breaking out of its recv() loop. This is - necessary to keep from starving out other Event_Handlers. - Thanks to Rod Skinner for pointing out the - need for this. - - * ace/Reactor.cpp: Fixed a bug in the WIN32 - ACE_Reactor_Notify::handle_input() logic. We were calling - requeue_position(0) when we should have been calling renew(). - -Sat Feb 15 11:46:39 1997 Douglas C. Schmidt - - * ace/ACE.cpp: It appears that VxWorks doesn't support fcntl(). - However, it does seem to support ioctl(). Therefore, that's how - we'll set the descriptors into non-blocking mode. Thanks to - Dave Mayerhoefer for reporting this. - - * ace/SOCK_Stream.h: Corrected the documentation for - ACE_SOCK_Stream::recv_n (void *buf, size_t len, int flags, const - ACE_Time_Value *timeout). Thanks to Paul Roman - for reporting this. - - * ace/SOCK_Stream.i (recv_n): Fixed a minor bug in the - SOCK_Stream.i line 38: - - ACE_TRACE ("ACE_SOCK_Stream::send_n"); - - should be - - ACE_TRACE ("ACE_SOCK_Stream::recv_n"); - - Thanks to Paul Roman for reporting this. - -Fri Feb 14 00:40:14 1997 Douglas C. Schmidt - - * ace/TTY_IO.cpp (control): Moved the drop out timer value from - the ACE struct to the WinNT struct. Thanks to Brad Flood - for this fix. - -Thu Feb 13 21:24:17 1997 - - * ace/OS.i (event_wait): Fixed the missing check for success. - - * ace/Synch: Fixed problems with multiple removal of - resources. Thanks to Bert (Bcraytor@aol.com) for pointing this - out. - - * examples/Threads/test.{mdp,mak}: Reorganized project so that it - is easier to use. - - * examples/Threads: Small changes to make tests run faster. - -Thu Feb 13 01:49:38 1997 Irfan Pyarali - - * ace/OS.i (stat): Added stat() to ACE_OS. - - * apps/jaws: The ACE web server has now been ported to Win32. - - * ace/ReactorEx: Add a new version of remove_handler(). - - * examples/Reactor/ReactorEx/test_MT.cpp: Fixed stuff so that only - are activated. - -Wed Feb 12 22:58:15 1997 Douglas C. Schmidt - - * ace/ReactorEx: Made minor changes to the ReactorEx. - - * examples/Reactor/ReactorEx/test_MT.cpp: Updated Irfan's new - ReactorEx test to use ACE_Tasks. - -Wed Feb 12 00:08:42 1997 Irfan Pyarali - - * ace/ReactorEx: Finished a complete rewrite of - ReactorEx. The new version allows multiple threads of - control to wait simultaneously in - ::WaitForMultipleObjects(). This was difficult because the - set of ACE_HANDLEs used in ReactorEx->handle_events() is - shared between all threads. We devised a clever protocol - that ensures all changes to the handle set are - serialized. This serialization was achieved by using - multiple (auto and manual) events and mutexes and by taking - advantage of the "waitAll" semantics of - WaitForMultipleObjects(). - - Concept of "owner" thread is introduced in ReactorEx. We - need to keep track of the "owner" because we don't want - multiple threads to try to expire timers. Therefore the - "owner" thread is the only one allowed to expire - timers. Also, the owner thread is the only thread which - waits on the internal notify handle (which is used to - dispatch explicit calls to - ACE_ReactorEx::notify(). Initially, the creator thread of - ReactorEx becomes the "owner" thread. Ownership can later be - transferred among threads, just as with the standard - ACE_Reactor. - - We also updated the Handler Repository since it now - keeps track of tuples to be added - and deleted from the current handle set at the appropriate - time (i.e., when all threads are out of - WaitForMultipleObjects() and have completed all necessary - dispatching). The Handler_Repository implements the update - protocol that is used to serialize changes to its internal - state. - - Two slots were added to the parameter in the - constructor and open methods of ReactorEx that will store - handles used for internal management. Therefore, users can add - upto MAXIMUM_WAIT_OBJECTS - 2 handles into ReactorEx. On - current WinNT platforms (e.g., 3.51 and 4.0) - MAXIMUM_WAIT_OBJECTS is 64. - - Note that the interface to ReactorEx did not change in this - process. Your existing code should work without changes. - Moreover, we've optimized the implementation so that if only - 1 thread calls ACE_ReactorEx::handle_events() the code is - very efficient. Moreover, you can dynamically add or remove - threads without having to register them with the ReactorEx. - - * examples/Reactor/ReactorEx/test_MT.cpp: This application tests - multiple threads simultaneously calling - ReactorEx->handle_events(). It also shows how different threads - can update the state of ReactorEx. - -Wed Feb 12 00:08:42 1997 Douglas C. Schmidt - - * ace/Synch: Added a remove() call to ~ACE_Thread_Mutex so that it - will be removed (and resources cleaned up) automatically when an - ACE_Thread_Mutex object goes out of scope. Thanks to Jay - Denkberg for reporting this. - - * ace: Added a new config file (config-irix6.2-sgic++-nothreads.h) - that works for non-Pthread versions of SGI 6.2. Thanks to Fred - LaBar for this. - - * ace/XtReactor: Fixed a bunch of minor bugs that crept into the - ACE_XtReactor. Thanks to Fred LaBar - for reporting this. - - * ace/OS.i (thr_getprio): Fixed a typo in the #ifdefs so that we - return ACE_NOTSUP_RETURN(-1) if threading isn't enabled. Thanks - to Fred LaBar for reporting this. - -Tue Feb 11 11:26:03 1997 David L. Levine - - * ace/OS.{h,i},config-vxworks*.h,README: added ACE_HAS_CLOCK_GETTIME, - and only support ACE_OS::clock_gettime if that's defined. - It can be supported on Solaris 2.5, but -lposix4 is then required. - - * ace/Thread_Priority.*: added increment () and decrement () - operations. - - * include/makeinclude/platform_sunos5_sunc++_4.1.GNU: - added -pta back to avoid link problems with template classes - that have virtual functions that are all inline, if inlining - is disabled. Though we don't see the problem, other 4.1 users do. - Thanks to mscallinan@CCGATE.HAC.COM for reporting this. - - * examples/Logger/simple-server/Logging_Handler.cpp (handle_input): - cast "len" to ssize_t to prevent mixed signed/unsigned comparison. - - * examples/Logger/simple-server/server_loggerd.cpp (main): - added ACE_UNUSED_ARG (sa);. - - * examples/Reactor/Misc/notification.cpp (Thread_Handler ctor): - changed type of n_threads argument from int to size_t to avoid - signed/unsigned comparison. - -Mon Feb 10 15:27:02 1997 Douglas C. Schmidt - - * ace/Timer_Queue: Added a virtual destructor so that subclasses - deleted via ACE_Timer_Queue *'s will call the right destructor. - Thanks to Stuart Powell for reporting - this. - - * ace/Timer_Heap.cpp: Added support for automatically growing - ACE_Timer_Heaps. This allows heaps to grow automatically as new - ACE_Event_Handlers are added dynamically. Thanks to Stuart - Powell for this enhancement. - - * ace/Memory_Pool: Added support that allows flags to be passed in - to the MMAP_Memory_Pool. This can be used to set the - appropriate type of backing store semantics (e.g., MAP_PRIVATE - and MAP_SHARED). Thanks to Fred LaBar - for providing this. - -Sun Feb 9 11:56:37 1997 Douglas C. Schmidt - - * ace/Map_Manager.cpp (bind_i): A recent change to Map_Manager - broke the Connector since errno was getting set to ENOENT rather - than EWOULDBLOCK. Thanks to Mark Rabotnikov - for finding this. - -Sun Feb 09 21:44:34 1997 David L. Levine - - * ace/ACE.{h,cpp}: added static u_long is_prime (). - - * ace/{OS.cpp,Thread_Priority.cpp}: added comment about thread - priorities only being tested for 1003.1C version of Pthreads. - Thanks to Thilo Kielmann - for suggesting this. - - * ace/OS.{h,i}: added ACE_OS::clock_gettime (). It allows - applications to get high-resolution time on POSIX systems. - - * ace/Future.cpp (dump): cast ref_count_ to an int because - g++ doesn't figure it out (it's an ACE_Atomic_Op, which does have an int conversion operator). - - * ace/Timer_List.cpp (constructor): added initializer for - timer_id_ to prevent unitialized memory read report from Purify. - - * tests/IOStream_Test.cpp,Makefile: added IOStream_Test, - complements of James CE Johnson . Very cool! - - * tests/Future_Test.cpp: replaced call to ::sin () - with one to ACE::is_prime () to remove dependency on libm. - - * examples/IPC_SAP/UPIPE_SAP/ex1.cpp (peer1, peer2): removed - unused variables c_addr and serv_addr: they were replaced by - a global. - - * examples/Threads/future{1,2}.cpp: replaced call to ::sin () - with one to ACE::is_prime () to remove dependency on libm. - - * netsvcs/clients/Naming/Dump_Restore/createfile.cpp: removed - #include of math.h, it wasn't needed. - -Sat Feb 08 15:19:50 1997 David L. Levine - - * ace/ReactorEx.h: commented out ACE_ReactorEx_Notify::message_queue_ - declaration if not ACE_WIN32 because Sun C++ chokes on it. - - * examples/IPC_SAP/{FILE,SPIPE}_SAP/client.cpp: declare "len" as - ssize_t to avoid signed/unsigned comparison. - -Fri Feb 7 01:13:05 1997 Douglas C. Schmidt - - * ace/OS.i (select): Simplified Chris' fixes for the weird - Linux select() semantics. - - * ace/OS: Added a new accessor method called waiters() in - ACE_cond_t that returns the number of waiters on the condition - variable. Thanks to Karlheinz for suggesting this. - - * ace/OS: Changed all the ACE_cont_t, ACE_rwlock_t, etc. so that - their fields are private, but made class ACE_OS a friend. - Applications should not be mucking with these fields since they - may change. - - * ace/OS.h: Fixed a minor typo where friend class ACE_rwlock_t - should be friend class ACE_OS. Thanks to Thilo Kielmann - for reporting this. - - * ace/Log_Msg.cpp: Added a destructor to ACE_Log_Msg and changed - ACE_TSS_cleanup so that it calls delete (ACE_Log_Msg *) ptr. - Thanks to Per Anderson for - reporting this. - - * tests/Map_Manager_Test.cpp: Create a file Map_Manager_Test_Key.h - and move the class Key into the include file. Include this *.h - file in Map_Manager_Test.cpp. This is needed for template - generation on AIX. Thanks to Chris Lahey for - pointing this out. - -Fri Feb 7 17:29:40 1997 Chris Cleeland - - * ace/OS.cpp (set_sched_params): added support for POSIX - threads. Thanks to Thilo Kielmann - for figuring it out and - for providing the code. - - * tests/Naming_Test.cpp (test_find): Changed final delete[] to - not try to delete a static buffer. :-( - - * tests/SOCK_Test.cpp (server): Added assertion test for - modified select timeval. - -Fri Feb 07 13:56:24 1997 David L. Levine - - * ace/{OS.cpp,Thread_Priority.cpp}: added ACE_Thread_Priority - support for Digital Unix. Thanks to Thilo Kielmann - for figuring the priorities - and priority classes out and for providing the code. - - * ace/High_Res_Timer.{h,cpp},config-linux*.h,README: - use struct timespec instead of timespec_t, because not all - platforms have the timespec_t typedef. Thanks to - Marius Kjeldahl for reporting this on Linux - and Chris Lahey for reporting it on AIX. - - * ace/IOStream.h: use "ssize_t send (...)", etc., instead of exact - function prototypes. - - * examples/IPC_SAP/TLI_SAP/db-server.cpp: declare struct member as - const char * instead of const char [] because it's not static and - the struct doesn't have constructors. - - * examples/Reactor/Multicast/server.cpp (Server_Events ctor): - reordered initializers to match declaration order. - -Fri Feb 07 05:08:51 1997 - - * ace/Synch.cpp (dump): Fixed access error. - - * ace/OS.h: Fixed ACE_rwlock_t friend declaration. - - * ace/OS.i: Moved ACE_cond_t::waiters() such that it is now - visiable to NT. Also fixed ACE_OS::cond_timed_wait by returning - the correct return value on a TIMEOUT. Also fixed typo in - ACE_OS::sema_wait. - -Thu Feb 6 20:25:13 1997 Chris Cleeland - - * ace/OS.i (select): Adapted ACE_OS::select methods for use on - platforms (such as Linux) that allow select(2) to modify its - struct timeval arg. New behavior is triggered by the define - ACE_HAS_NONCONST_SELECT_TIMEVAL. Thanks to Jorn Jensen - for reporting this! - -Thu Feb 06 09:48:43 1997 David L. Levine - - * ace/config-sunos-sun*.h,README: added - ACE_LACKS_LINEBUFFERED_STREAMBUF and ACE_LACKS_SIGNED_CHAR. - - * ace/IOStream.{h,cpp}: support - ACE_LACKS_LINEBUFFERED_STREAMBUF and ACE_LACKS_SIGNED_CHAR - so that this builds with SunC++. - - * examples/IOStream/client/iostream_client.cpp: - reordered args and fixed argv indexes. - - * examples/IOStream/server/iostream_server.cpp: - use ACE_DEFAULT_SERVER_PORT for default port. - - * tests/Naming_Test.cpp (randomize): changed type of "size" arg to - size_t to avoid compiler warnings about signed/unsigned comparison. - -Thu Feb 06 09:40:47 1997 Chris Cleeland - - * ace/config-linux*.h: added typedef of timespec_t. - -Wed Feb 5 01:45:03 1997 Douglas C. Schmidt - - * ace/OS.i: Changed the Win32 implementation of all methods that call - WaitForMultipleObjects() so that errno is set to - WAIT_ABANDONED if the mutex is abandoned. This makes it - possible for users to understand why ACE_OS methods that use - synchronization operations fail. Thanks to Ivan Murphy - for reporting this problem. - - * ace/IOStream.cpp (ACE_Streambuf): Moved the const initialization - from the header file to the constructor since this is the only - portable way to do this. Thanks to Michael Maxie - for reporting this. - - * ace/OS.i: Updated the call to thr_setprio() for pthreads so that - it first determines the existing scheduling parameters and then - updates the priority. Thanks to Thilo Kielmann - for help with this. - - * ace/config-osf1-4.0*.h: Updated ACE_NEEDS_HUGE_THREAD_STACKSIZE - to be 1 mega to minimize porting surprises. Thanks to Thilo - Kielmann for help with this. - - * tests/Naming_Test.cpp: Cleaned up a few minor things related to - int i = 0 vs. size_t i = 0. - - * ace/SOCK_Dgram.cpp: Added a new macro called - ACE_HAS_SOCKADDR_MSG_NAME, which is used on platforms (e.g., - DG/UX) that require a cast to (struct sockaddr *) for the - msg_name field of struct msghdr. - -Wed Feb 05 10:45:41 1997 David L. Levine - - * ace/IOStream.h: replaced __*manip with expanded types, because - Sun C++ doesn't have those typedefs; and added complete prototypes - for send, recv, send_n, and recv_n. - - * ace/IOStream.cpp: fixed "#define ACE_IOSTREAM_C" to keep g++ sane. - - * ace/Hash_Map_Manager.{h,cpp},Map_Manager.{h,cpp}: replaced - DEFAULT_SIZE with ACE_DEFAULT_MAP_SIZE so that Naming_Test runs - on SunC++ 4.1. - - * ace/High_Res_Timer.*: added optional scale factor. - - * examples/IOStream/{client,server}/Makefile: addd -g++ if building - with gcc. - - * tests/Naming_Test.cpp: moved declaration of "i" out of for loop - because it is used after the loop. - - * examples/ASX/UPIPE_Event_server/{Consumer,Supplier}_Router.cpp - (open): return 1 if init () succeeds. There's a commented-out - call to activate the objects that would (should?) return a value. - - * examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp (main): declare n - as ssize_t instead of size_t to avoid compiler warning about - signed/unsigned comparison. - -Tue Feb 4 19:06:52 1997 Douglas C. Schmidt - - * ace/Signal.cpp: Fixed all the ACE_Sig_Handler[s] methods so that - they now use ACE_Guard, rather than ACE_TSS_Guard, *unless* they - are actually performing callbacks to user-code. Not only is - this faster, but it also avoids thread-specific storage key - leaks on platforms like Solaris! - - * ace/OS.cpp (thr_keyfree): Added a new #ifdef for - ACE_HAS_THR_KEYDELETE, which is defined for UNIXWARE. This - fixes a nasty problem with leaking thread-specific keys. Thanks - to Nigel Owen for reporting this. - - * ace/Message_Block.cpp: Added a #include for - "ace/Service_Config.h". - - * ace/Malloc.i: Fixed a few warnings by removing the names of - unused parameters. - - * ace: Added many minor changes to ACE so that it will work on - DG/UX. Thanks to Michael Maxie for all these. - - * ace/LSOCK_Stream.cpp: Applied the same fix as to LSOCK.cpp. - - * ace/LSOCK.cpp: Removed the cast of 0 to (char *) for msg_name - since some platforms use (struct sockaddr *). By omitting the - cast the compiler will figure it out correctly. Thanks to - Michael Maxie for this. - - * ace/IOStream: Added a new template adapter for creating an - iostream-like object using an ACE IPC Stream for the actual I/O. - Thanks to James CE Johnson for this. - - * examples/Misc/test_iostreams.cpp: Added a test that illustrates - how the new ACE_iostreams mechanism works. Thanks to James CE - Johnson for this. - - * ace/Message_Block: Updated the ACE_Message_Block implementation - to use ACE_Service_Config::alloc() if the user doesn't supply a - customize version. This also means that we never delete the - allocator_strategy_, so we can remove this flag and reduce the - amount of storage by 4 bytes. Thanks to Irfan for noticing that - we can do this. - - * ace/platform_dgux4_epc.h: Added a new platform config file - for DG/UX. Thanks to Michael Maxie for - this. - - * ace/config-dgux-4.11-epc.h: Added a new config file for DG/UX. - Thanks to Michael Maxie for this. - -Tue Feb 04 18:26:01 1997 - - * ace/Service_Config.cpp (alloc): The implementation now creates a - ACE_New_Allocator rather than a ACE_Allocator_Adaptor. If - you still want the old behavior, simply provide your own - custom allocator singleton for ACE_Service_Config. - - * ace/OS.i (mktemp): Added the missing ACE_INLINE directive. - - * ace/OS.h: ACE_HAS_INLINED_OSCALLS is now automatically defined - when __ACE_INLINE__ is defined. This avoids mysterious linking - problems that occur otherwise. - - * ace/Malloc: Added a virtual destructor to ACE_Allocator. Also - added a new class ACE_New_Allocator which is a sub-class of - ACE_Allocator. This class uses the new/delete operators to - allocate and free up memory. Please note that the only methods - that are supported are malloc() and free(). All other - methods are no-ops. If you require more functionality, please use: - ACE_Allocator_Adapter > This will allow you to use the added functionality of - bind/find/etc. while using the new/delete operators. - -Mon Feb 3 15:35:24 1997 Douglas C. Schmidt - - * ace/config-aix-*.h: Added a (char *) cast to - ACE_DEFAULT_BASE_ADDR. Thanks to John Cosby - for reporting this. - - * ace/OS.cpp: Added a new set() method that sets the Time_Value - from a double. Thanks to Brad Flood for this suggestion. - - * ace/OS: Changed ACE_OS::flock_t to ACE_OS::ace_flock_t to avoid - a name clash on DG/UX. Thanks to Michael Maxie - for reporting this. - -Tue Feb 4 03:02:52 1997 Irfan Pyarali - - * tests/Naming_Test.cpp: Added timing and made debug print outs - optional. Also added randomization of the test data. - - * ace/OS.h: Fixed prototype for gethrtime () - -Mon Feb 03 21:00:56 1997 David L. Levine - - * ace/OS.h: define ACE_SCOPE_PROCESS and ACE_SCOPE_THREAD - even if ACE_HAS_THREADS is not defined. Thanks to - Michael Maxie for pointing this out. - - * examples/Threads/{process_mutex.cpp,process_semaphore.cpp, - task_three.cpp,thread_manager.cpp,thread_specific.cpp} (main): - added ACE_UNUSED_ARG (sa);. - - * examples/Threads/reader_writer.cpp: fixed declaration of - "shared_data" to be "static volatile" instead of "volatile - static", and removed unused variable "n". - - * examples/Threads/thread_pool.cpp: removed unused variable "result". - -Sun Feb 02 21:24:02 1997 David L. Levine - - * ace/OS.h: changed hrtime_t to ACE_hrtime_t. - - * ace/{config-win*.h,README}: added #define ACE_HAS_PENTIUM to - enable gethrtime () support. - - * ace/High_Res_Time.{h,i,cpp}: removed platform-specific #ifdef's, - instead added "unsupported ()" static member function; changed - changed signature of elapsed_time to take time reference as - argument instead of return value; added elapsed_time - (ACE_Time_Value &) and elapsed_time_incr (ACE_Time_Value &). - - * examples/Thread/context_switch.cpp: use ACE_High_Res_Timer - instead of the old Timer adapter. - - * ace/config-aix-4.1.x.h: fixed typo: #defind ACE_HAS_LONGLONG_T. - - * ace/config-aix-4.2.x.h: added #define ACE_HAS_LONGLONG_T. - - * ace/Thread_Priority.{h,cpp}: moved #include of OS.h from .cpp - to .h file. - -Sun Feb 02 10:30:29 1997 David L. Levine - - * ace/Local_Name_Space.cpp: removed ACE_Map_Manager, ACE_Map_Iterator, - and ACE_Map_Entry: they don't appear to be used and, without - including their headers, this file won't compile. - - * ace/Hash_Map_Manager.cpp (Hash_Map_Manager (ACE_Allocator *)): - reordered initializers to match declaration order. - -Sat Feb 1 15:11:28 1997 Douglas C. Schmidt - - * include/makeinclude/platform_aix4.2.GNU (LD): Removed the -qnoro - flag since it is no longer needed. Thanks to Rob Jordan - for reporting this. - -Sat Feb 1 03:25:21 1997 Irfan Pyarali - - * ace/SString.cpp: Added two methods to the wide string - implementation for high-performance. Even though these methods - are somewhat ugly and not the "OO" way of doing things, - performance was at stake here. - - * ace/Registry_Name_Space.cpp (resolve): Fixed the implementation - by correctly figuring out the size of the value in the - Registry. This allows us to dynamically allocated the correct - amount of memory. - - * ace/Registry: Fixed the constant MAX_CONTEXT_NAME_SIZE to be the - maximum path length. - - * ace/Naming_Context.cpp: Fixed various memory leaks. - - * ace/Local_Name_Space_T.h: Replaced the simple-minded Map_Manager - with the new (improved) Hash_Map_Manager. - - * ace/Local_Name_Space.cpp: Added new methods operator!= and hash - required by the map. - - * ace/Hash_Map_Manager.cpp (ACE_Hash_Map_Manager): Added an extra - constructor. - - * tests/Naming_Test.cpp: Removed memory leaks. - -Fri Jan 31 19:39:48 1997 David L. Levine - - * ace/Hash_Map_Manager.cpp (ctor): reordered initializers - to match declaration order. - - * tests/Time_Value_Test.cpp: cast double argument to long - because there no longer is a constructor that takes a double. - - * ace/Hash_Map_Manager.{h,cpp}: removed #include of - ace/Hash_Map_Manager.i because it doesn't exist. - Protected .cpp file against multiple includes. Moved - #include of "ace/Malloc.h" from .h to .cpp file. - - * ace/Map_Manager.cpp (current_size, total_size): cast -1 to - size_t to avoid warning about signed-to-unsigned conversion. - - * ace/OS.h: moved hrtime_t typedef for ACE_WIN32 so it doesn't - get defined twice. - - * ace/OS.i (getservbyname): one last ACE_HAS_NONCONST_GETBY change: - missed "lproto" to "proto". - - * bin/create_ace_build: added checks for existing symlinks, so - now the script can be re-run safely at any time on a build - tree to update it. - -Fri Jan 31 02:16:30 1997 Douglas C. Schmidt - - * ace/config-aix-*.h: Made the default value for - ACE_DEFAULT_BASE_ADDR 0x80000000 to work around restrictions - with AIX. Thanks to Rob Jordan for - this. - - * examples/Map_Manager: Added a new example of the - Hash_Map_Manager. - - * tests/Map_Manager: Integrated the Hash_Map_Manager into the - Map_Manager test and greatly improved the test (e.g., by adding - timing). - - * ace: Added a new implementation of the Map_Manager called - Hash_Map_Manager. This, of course, uses hashing rather than - linear search. The result should be a much faster - implementation for many types of applications. - -Thu Jan 30 13:55:08 1997 Douglas C. Schmidt - - * ace/Map_Manager: Changed the return type of total_size() and - current_size() to size_t. - - * ace/OS: Had to remove the ACE_Time_Value (double) constructor - since it caused ambiguities with ACE_Time_Value (long). Thanks - to Per Andersson for figuring this out. - - * include/makeinclude/platform_linux_lxpthread.GNU (CXX): Added - -D_REENTRANT to make things work correctly in MT programs. - Thanks to Marius for this fix. - - * ace/OS.h: Added several extra constructors for ACE_Time_Value so - that it won't cause problems with the new ACE_Time_Value - (double) constructor. - - * ace/Log_Record.cpp (ACE_Log_Record): Added an "L" to the 0 - initial value used for time_stamp_. Thanks to Marius for - reporting this. - - * ace: Added the new config-aix-4.2.x.h file, which supports the - AIX4.2 platform. Thanks to Rob Jordan - for this. - - * include/makeinclude/platform_aix4.2.GNU: Added support for the - new AIX4.2 platform. Thanks to Rob Jordan - for this. - - * ace/OS.h: It's now possible to override ACE_DEFAULT_BASE_ADDR in - a config.h file. This is important for platforms that need to - put shared memory segments at particular address ranges. Thanks - to Rob Jordan for suggesting this. - -Thu Jan 30 16:01:37 1997 David L. Levine - - * ace/{config-aix-4.1.x.h,README}: added ACE_HAS_AIX_HIRES_TIMER, - see change to gettimeofday in OS.i below; and ACE_HAS_LONGLONG_T. - - * ace/OS.i (gettimeofday, gethrtime): use read_real_time () if - ACE_HAS_AIX_HIRES_TIMER. Thanks to Bob Olson - for this suggestion. - - * ace/OS.h: define hrtime_t as long long if ACE_HAS_AIX_HIRES_TIMER. - - * ace/OS.{i,cpp}: uninlined ACE_OS::gethostbyname (), - and ACE_OS::inet_ntoa () on VxWorks, because they have - static char arrays. - - * ace/OS.i (gethostbyaddr, getservbyname, gethostbyaddr, - gethostbyname, getservbyname_r): with ACE_HAS_NONCONST_GETBY, - instead of copying the const argument, just cast it to (char *). - Thanks to Michael Maxie for pointing out the - problem with the nonstatic char arrays with sizes determined at - runtime. - - * ace/High_Res_Timer.*: added ACE_HAS_AIX_HIRES_TIMER support. - Also, renamed get_time () to elapsed_microseconds (). - - * examples/Threads/{Timer.h,context_switch_time.cpp}: - ACE_High_Res_Timer::elapsed_microseconds () instead of - ACE_High_Res_Timer::get_time (). - - * bin/create_ace_build: added this script: it creates an ACE build - tree in directory "build/" below the current - directory, which must be a ACE "top level" directory (such as - $WRAPPER_ROOT). The build tree directory structure mirrors that - of the ACE top level directory structure, except that instead of - containing any plain files, it contains only symlinks to the files - in the ACE top level structure. - -Thu Jan 30 06:57:50 1997 David L. Levine - - * ace/Thread_Priority.cpp (convert_to_os_priority): changed - switch (priority_class) to switch (priority_class_). - Thanks to Chris Lahey for pointing this out. - Also, return -1 on other than Solaris, Win32, and VxWorks. - -Wed Jan 29 22:05:01 1997 Douglas C. Schmidt - - * tests/Naming_Test.cpp: Added the prefix "test_" to the bind(), - find(), rebind(), and unbind() functions. This avoids name - clashes with the bind() call from the socket API. Thanks to - Marius for this info. - - * ace/OS.cpp (ACE_Time_Value): Added a new constructor that makes - it possible to construct an ACE_Time_Value from a double. - Thanks to Brad Flood for this. - - * ace/OS.i (thr_join): If ACE_HAS_THREADS is defined, but none of - the threading APIs match (e.g., AIX) then we'll return - ACE_NOTSUP_RETURN(-1). Thanks to Chris Lahey for help with - this. - - * include/makeinclude/platform_aix.GNU: Made some changes to the - type of dynamic linker and libraries used by AIX 4.1. Thanks to - Chris Lahey for help with this. - - * ace/config-aix-4.1.x.h: Changed from BSD 4.3 to 4.4. Thanks - to Chris Lahey for help with this. - -Wed Jan 29 09:03:48 1997 David L. Levine - - * ace/OS.h: moved ACE_id_t and ACE_pri_t typedefs out of the - ACE_HAS_THREADS section. - - * ace/OS.cpp: fixed ACE_OS::set_sched_params on Win32 and VxWorks. - - * ace/Scheduling_Parameters.*, ace/Thread_Priority.*: updated - comments. - - * examples/Threads/{context_switch_time.cpp,Timer.h,Makefile}: - added context switch timing test. Currently only works on - Suns because that's the only platform for which ACE has a - high-resolution timer. - - * Makefile: added chmod of VERSION file in TIMESTAMP macro. - -Wed Jan 29 00:59:12 1997 Douglas C. Schmidt - - * include/makeinclude/platform_linux_lxpthread.GNU (CXX): Removed - the -D_MIT_POSIX_PTHREADS symbol since we're using Xavier's - threads instead. Thanks to Marius Kjeldahl for reporting this. - - * ace/config-linux-lxpthreads.h: Removed the _MIT_POSIX_PTHREADS - symbol since we're using Xavier's threads instead. Thanks to - Marius Kjeldahl for reporting - this. - -Tue Jan 28 23:32:58 1997 Douglas C. Schmidt - - * ace/SString: Added hash() methods to each ACE String class so - that we can use this with the new ACE_Hash_Set implementation of - ACE_Map_Manager. - - * ace/ACE.h (ACE): Added a UNICODE version of hash_pjw() so that - we can use it to hash ACE_WString. - - * ace/OS.i (thr_setprio): Fixed a typo that was left over from a - previous change. Thanks to Fred LaBar - for reporting this. - - * apps/Gateway/Gateway/{proxy_config,consumer_config}: Added - comments to these config files so they are easier to understand. - Thanks to Chuck Gehr for motivating this. - - * apps/Gateway/Peer/Peer.cpp: Changed the name from connection_id_ - to proxy_id_, which is more accurate. - - * apps/Gateway/Peer/Peer.cpp: Added a destructor to Peer_Handler - so that it can clean itself up properly when shutdown with a - signal. This fixes a nasty bug. - - * ace/config-win32-msvc4.x.h (ACE_HAS_MFC): By default, ACE now - enables ACE_HAS_MFC. This makes it possible to use - AfxBeginThread() with the ACE_THR_AFX flag. - - * ace/OS.cpp: Fixed a typo in the call to ::AfxBeginThread() - function. Thanks to Karlheinz for reporting this. - - * apps/Gateway/Peer/Peer.cpp: Removed all uses of the Map_Manager - from the Peer. There's only ever one connection from a Gateway - per-Peer, so what was this doing here anyway?! It was causing - problems due to multiple deletions, so removing it improves - robustness of the tests. - - * ace/OS.i: Commented out the "extern char **_sys_siglist" - definition since this was conflicting with the definition in - Solaris. If some platforms needs this, we'll need to add a - specific #ifdef. - -Tue Jan 28 21:57:45 1997 David L. Levine - - * ace/OS.{h,cpp}: added ACE_OS::set_sched_params (). It permits - platform-independent setting of thread priorities and - priority classes. It is currently supported on Solaris, - Win32, and VxWorks. - - * ace/Scheduling_Parameters.{h,i,cpp}, - ace/Thread_Priority.{h,i,cpp}, ace/Makefile: - Added these two classes to support ACE_OS::set_sched_params (). - -Tue Jan 28 12:42:39 1997 Irfan Pyarali - - * ace/ace.mdp: Added the "Using MFC in a Shared DLL" flags. - - * tests/test_config.h (ACE_INIT_LOG): Made this UNICODE safe. - - * tests/Pipe_Test.cpp (main): Added an iteration count to control - the number of children created by the main process. - - * ace/Memory_Pool.cpp (init_acquire): cast this->minimum_bytes_ to - size_t to avoid compiler warning if size_t is unsigned. - - * ace/OS.h: Added strncat to the OS class. - -Tue Jan 28 09:13:00 1997 David L. Levine - - * ace/ACE.cpp (ACE::ldfind), - ace/Local_Name_Space_T.cpp, - ace/Local_Token.cpp (ACE_TPQ_Entry::ACE_TPQ_Entry), - ace/Log_Msg.cpp (ACE_Log_Msg::msg, ACE_Log_Msg::find), - Memory_Pool.cpp (ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool), - ace/Naming_Context.cpp (ACE_Naming_Context::open), - ace/Parse_Node.cpp (ACE_Location_Node::open_handle), - ace/Registry.cpp (ACE_Predefined_Naming_Contexts::is_local_host, - ACE_Registry::Binding_Iterator::Object_Iteration::next_n, - ACE_Registry::Binding_Iterator::Context_Iteration::next_n), - tests/UPIPE_SAP_Test.cpp: - changed "sizeof char" to "sizeof (char)" because g++ and Sun C++ - (properly) choked on it. - - * ace/Local_Name_Space_T.cpp (create_manager_i): - -- ::strncat () instead of ACE_OS::strcat () - -- "lock_name_for_backing_store" instead of - "lock_name_for_local_name_space" - - * ace/Naming_Context.cpp (both constructors): reordered - initializers to match declaration order. - - * include/makeinclude/platform_sunos5_g++.GNU: removed - -fno-strict-prototypes because it's not needed with SunOS 5.5.1. - -Mon Jan 27 21:33:00 1997 Irfan Pyarali - - * tests/Naming_Test.cpp (main): Made modifications to the test to - make it more dynamic. Also made it work with UNICODE and - ACE_Naming_Context. - - * ace/Local_Name_Space_T.cpp (create_manager_i): Added a better - naming scheme for the locks. - - * ace: Changed the calculations of string lengths such that the - size of the character type is carefully considered. - - The following were affected: - - ACE.cpp (ACE::ldfind) - Local_Token.cpp (ACE_TPQ_Entry::ACE_TPQ_Entry) - Log_Msg.cpp (ACE_Log_Msg::msg, ACE_Log_Msg::find) - Memory_Pool.cpp (ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool) - Naming_Context.cpp (ACE_Naming_Context::open) - Parse_Node.cpp (ACE_Location_Node::open_handle) - Registry.cpp (ACE_Predefined_Naming_Contexts::is_local_host, - ACE_Registry::Binding_Iterator::Object_Iteration::next_n, - ACE_Registry::Binding_Iterator::Context_Iteration::next_n) - - * ace/OS.h: Added UNICODE support for ACE_DEFAULT_LOCALNAME. - - * ace/Proactor.cpp: Redid "lost" changes to add UNICODE support to: - - /* Proactor */ - ACE_Overlapped_File::ACE_Overlapped_File - ACE_Overlapped_File::open - - * ace/Registry_Name_Space.h: Changed the order of #include and - #define as that the correct set of MACROS are defined for the - include files. - - * tests/MM_Shared_Memory_Test.cpp: Added UNICODE support. - -Mon Jan 27 09:16:03 1997 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++.GNU, - include/makeinclude/platform_sunos5_sunc++_orbix.GNU, - ace/config-sunos5.5-sunc++-4.x-orbix.h - ace/config-sunos5.5-sunc++-4.x.h: - disabled exception handling by commenting out ACE_HAS_EXCEPTIONS - in the config files and adding -noex to the platform files, - because it causes trouble, at least on MP machines. - -Mon Jan 27 14:54:31 1997 Douglas C. Schmidt - - * ace/Memory_Pool.h: Added code to ACE_MMAP_Memory_Pool_Options to - take a minimum_bytes parameter. This is needed to prevent mmap - remapping when a large segment is requested. Thanks to Fred - LaBar for this. - -Sun Jan 26 13:39:13 1997 Douglas C. Schmidt - - * ace/OS.i: Changed the typo sis_siglist to sys_siglist. Also, - changed the logic from #if !defined (ACE_HAS_SYS_SIGLIST) to - #if defined (ACE_HAS_SYS_SIGLIST) since this makes more sense... - Thanks to Nanbor Wang for noticing this. - -Sat Jan 25 20:30:23 1997 David L. Levine - - * ace/config-sunos5.5-sunc++-4.1.h: commented out ACE_HAS_EXCEPTIONS - #define because -noex is required with it, and that causes core - dump during thread exit on multiprocessor UltraSparcs. - - * include/makeinclude/platform_sunos5_sunc++_4.1.GNU: added -noex - back because of core dump during thread exit on - multiprocessor UltraSparcs. - - * examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp, - examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp (control): - added "default" case to switch statement to eliminate compiler - warnings about enumeration values not being handled in switch. - - * examples/ASX/UPIPE_Event_Server/event_server.cpp (consumer): - removed unused variable "iter". - -Sat Jan 25 12:50:24 1997 Douglas C. Schmidt - - * ace/OS.i: Updated all the cond_timedwait() and cond_wait() - methods so that they decrement the count of waiters by one even - when errors occur. Thanks to Irfan for finding this. - - * ace/Map_Manager.cpp: Updated the ACE_Map_Iterator code so that - it no longer crashes if the Map has been closed. Thanks to - Slawomir Kuzniar for reporting this. - -Sat Jan 25 11:34:56 1997 Irfan Pyarali - - * ace/SOCK_Connector.cpp (complete): Added a sleep of zero seconds - which allows non-blocking connects to work properly on NT. - - * ace/config-winnt-4.0-msvc4.x.h and config-win32-msvc4.x.h: - Added ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS. - - * ace/OS.i: Moved out all code for Time_Value from #if region. It - is common to all. - - * ace/Reactor: Added helper routines to stop the VC++ compiler from - bitching about destructors in exception handling code. - - * ace/ace.{mak,mdp}: Removed Time_Value.cpp from project. - - * tests/tests.{mak,mdp}: Corrected the creation of SOCK_Test and - Message_Blob_Test executables and temporary files. - -Fri Jan 24 09:01:50 1997 David L. Levine - - * examples/Connection/misc/Connection_Handler.cpp: added - specialization of ACE_Svc_Handler - so that subproject will build with g++ without optimization. - - * apps/Gateway/Gateway/Proxy_Handler.cpp: added specializations - of ACE_Svc_Handler and - ACE_Svc_Handler - so that subproject will build with g++ without optimization. - - * tests/Reactor_Exceptions_Test.cpp (main): added ACE_UNUSED_ARG - for argc and argv when ACE_HAS_EXCEPTIONS is not defined. - - * performance-tests/Misc/test_mutex.cpp: made destructor of - Thread_Mutex_Derived virtual because the class has other virtual - functions. - -Thu Jan 23 11:51:45 1997 David L. Levine - - * ace/config-sunos5.5-g++.h: commented out ACE_HAS_EXCEPTIONS because - -fhandle-exceptions is broken in g++ 2.7.2 (and is required in order - to use exception handling); also, added ACE_HAS_INLINED_OSCALLS, if - __ACE_INLINE__ is #defined. - - * ace/config-sunos5.5-sunc++-4.1.h: added ACE_HAS_INLINED_OSCALLS, - if __ACE_INLINE__ is #defined. - -Wed Jan 22 15:04:47 1997 Douglas C. Schmidt - - * ace/OS.h: Moved the ACE_TIMER_SKEW macro to below the #inclusion - of config.h and updated it so that it can be overridden in the - config.h file if necessary. Thanks to Bob Olson - for motivating this. - - * ace/OS.cpp: Fixed the implementation of - ACE_Thread_ID::operator== so that it works correctly when thread - ids and thread handles aren't ints. Thanks to Chuck Gehr for - reporting this. - - * ace/OS.i (thr_getprio): Moved a stray #else into the right - place. Thanks to Chuck Gehr for reporting this. - - * ace/OS.i (sema_post): this->count_++ should have been - s->count_++. Thanks to Chuck Gehr for reporting this. - - * ace/Synch_T.cpp: Added an extern "C" definition for - ACE_TSS_C_cleanup(). Thanks to Chuck Gehr for reporting this. - - * ace: Added a new #define called ACE_LACKS_SYS_NERR to the - config files for MVS and VxWorks. This is used in OS.cpp - as follows: - - #if defined (ACE_LACKS_SYS_NERR) - int sys_nerr = ERRMAX + 1; - #endif /* ACE_LACKS_SYS_NERR */ - - Thanks to Chuck Gehr for reporting this. - - * Removed all #inclusions of "ace/Time_Value.h." This file - no longer contains anything besides a #include "ace/OS.h" - and is only kept around due to backwards compatibility. - - * ace: Moved the contents of Time_Value.h into OS.h to reduce the - confusion that arises from the #inclusion of "config.h" in - Time_Value.h. Also merged the contents of Time_Value.{i,cpp} - into OS.{i,cpp}. Thanks to the MDA guys for motivating this. - - * tests/Reactor_Exceptions_Test.cpp: Added a new test that - exercises the Reactor with C++ exceptions. Thanks to Luca for - the test. - - * ace/Reactor.cpp (handle_events): Added Win32 structured - exception handling support to the ACE_Reactor::handle_events() - method so that it correctly releases the token lock when Win32 - SEH occur in callback routines. Thanks to Luca for reporting - this problem. - - * ace: Added a new macro called ACE_HAS_EXCEPTIONS, which - indicates that the compiler supports C++ exception handling. - - * include/makeinclude/platform_sunos5_sunc++*.GNU: Commented out - the -noex flag for now. Hopefully, things will work correctly - now. - - * ace/Thread_Manager.cpp (exit): Removed the final acquire() on - ace_mon, which is no longer necessary since the Guard classes - now keep track of whether they are "owned". Thanks to Karlheinz - and Detlef for this fix. - -Wed Jan 22 09:05:31 1997 David L. Levine - - * Makefile,VERSION: modified top-level Makefile (and VERSION) - to add a timestamp to the VERSION file if creating a release - from the /project/adaptive/ACE_wrappers directory. If it - causes problems, this will disable it: - % make TIMESTAMP= release. - - * ace/Local_Tokens.cpp (dump): replaced "ACE_TSS" - with "ACE_TPQ_ENTRY" so that ACE_NO_TSS_TOKENS is supported. - - * ace/Synch.h: fixed typo in comment header for ACE_Thread_Semaphore - - * ace/config-vxworks-ghs-1.8.h,config-vxworks5.2-g++.h, - config-unixware-2.01-g++.h: - protect ACE_HAS_INLINED_OSCALLS #defined with - #if defined (__ACE_INLINE__). - - * apps/Gateway/Gateway/Event_Channel.cpp (open): added - ACE_UNUSED_ARG (sig);. - - * examples/ASX/Event_Server/Event_Server/Peer_Router.h: - declared a friend of class Peer_Router_Context because it - has a private destructor, to eliminate compiler warning - about not having any friends. - - * examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp - (open): added return 0 in "true" branch of if statement so - that the function always returns a value. - -Tue Jan 21 09:19:44 1997 David L. Levine - - * tests/Reader_Writer_Test.cpp (reader): commented out unused - variable "n"; also, commented out unused function - print_usage_and_die. - - * tests/TSS_Test.cpp, Thread_Manager_Test.cpp (main): added - ACE_UNUSED_ARG (sa);. - - * tests/Thread_Pool_Test.cpp (open): added return 0 at end. - -Tue Jan 21 11:00:12 1997 Douglas C. Schmidt - - * apps/Gateway/Gateway/Gateway.cpp (parse_args): There was a small - bug in parse_args (latest beta), it mixed proxy and consumer - conf files. Thanks to Per Andersson - for reporting this. - -Mon Jan 20 13:29:28 1997 David L. Levine - - * ace/OS.i, ace/Task.h, and ace/Thread_Manager.h: changed a few - occurrences of NULL to 0 (for other than Win32 platforms), - primarily to avoid compiler warnings on VxWorks if ACE.h isn't - #included before stddef.h. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp - (handle_input): replaced %d format with %hu for u_short arg. - - * netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp - (run_writer): initialized variable "t" to avoid compiler warning. - - * examples/Connection/misc/Connection_Handler.cpp (handle_timeout): - added ACE_UNUSED_ARG (tv); also, added explicit int return type - to definition of Connection_Handler::close (u_long). - - * examples/Threads/task_four.cpp (Invoker_Task::svc): - moved declaration of "task" out of for loop because it is - also used after the for loop. - - * netsvcs/lib/Name_Handler.cpp, Server_Logging_Handler.cpp, - TS_Clerk_Handler.cpp, TS_Server_Handler.cpp, Token_Handler.cpp: - added ACE_UNUSED_ARG (sig);. - -Sun Jan 19 11:10:49 1997 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++.GNU, - platform_sunos5_sunc++_4.1.GNU: - added comment about compiler warnings with +w option. - Also, added +w to platform_sunos5_sunc++_4.1.GNU. With the - other changes in this ChangeLog entry, there no longer should - be significant warnings from Sun C++ when building ACE. - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp - (Peer_Handler::put): added ACE_UNUSED_ARG (tv);. - - * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp (main), - netsvcs/clients/Tokens/invariant/invariant.cpp (main): - commented out argc and argv. - - * examples/Mem_Map/file-reverse/file-reverse.cpp (main): - removed unused variable "cp". - - * netsvcs/clients/Tokens/manual/manual.cpp (handle_input, - handle_exception): added ACE_UNUSED_ARG (fd); and - (create_proxy): added return statement at end: even - though it should never be reached, it eliminates a - compiler warning. - - * examples/OS/Process/process.cpp, - examples/Reactor/Misc/test_reactors.cpp, - netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp, - netsvcs/clients/Tokens/mutex/test_mutex.cpp, - netsvcs/clients/Tokens/rw_lock/rw_locks.cpp, - performance-tests/TTCP/ORBeline/ttcp_i.cpp, - performance-tests/TTCP/Orbix/ttcp_i.cpp (main): - return 0 instead of 42. - -Sat Jan 18 10:54:25 1997 Prashant Jain - - * java/src/README: Updated the README file to indicate how - documentation for Java ACE cab be automatically generated. - -Fri Jan 17 11:47:10 1997 Douglas C. Schmidt - - * ace/OS.h: Added an equivalent set of - ACE_LSOCK_{STREAM,ACCEPTOR,CONNECTOR} macros to complement the - ones for ACE_SOCK_*. Thanks to Gonzalo Diethelm - for suggesting this. - - * ace/OS.cpp (ACE_Thread_Adapter): Added a new feature that allows - logging features to be inherited by threads. It works with - those OSs (e.g., Win32) that use ACE_Thread_Adapter class. At - some point, we might do this for all the OSs. Thanks to Luca - for this. - - * examples/Connection/misc/Connection_Handler.cpp: Added a - new example that illustrates how to use the Acceptor pattern - to create multiple threads, each running its own Reactor. - - * ace/Log_Msg.cpp (dump): Some of the variables in the dump() - method have the wrong format specification type. These are: - restart_ (%d), flags_ (%x), priority_mask_ (%d). They are now - fixed, thanks to Luca. - - * tests/Priority_Task_Test.cpp (open): Add an ACE_ASSERT to make - sure that the tasks activate() correctly. Thanks to David for - finding this. - - * ace/config-linux-lxpthreads.h: Added #defines for - ACE_HAS_AUTOMATIC_INIT_FINI and ACE_HAS_SVR4_DYNAMIC_LINKING. - Thanks to Marius for this. - - * ace/Malloc.h: Changed the typedef of ACE_Malloc_Align to a macro - called ACE_MALLOC_ALIGN to allow users to override this value in - their config.h file. This is necessary for platforms that don't - have "long" word alignments. Thanks to Fred LaBar - for this suggestion. - - * ace/OS.h: Added an #ifdef check for ACE_HAS_IRIX62_THREADS and - if so, we'll use the if (&a) /* null */; } form of the - ACE_UNUSED_ARG macro to avoid unnecessary warnings. Thanks to - Fred LaBar for testing this out. - -Fri Jan 17 16:33:25 1997 David L. Levine - - * ace/High_Res_Timer.*: added elapsed_time () and get_time (). - - * netsvcs/clients/Tokens/collection/collection.cpp, rw_locks.cpp: - commented out unused variables to avoid compiler warnings; and - return 0 from main (). - - * include/makeinclude/rules.local.GNU, - netsvcs/lib/Makefile, - examples/Service_Configurator/IPC-tests/server/Makefile: - fixed ESOBUILD mechanism to work on all platforms, not just Linux. - Thanks to Marius Kjeldahl for this fix. - - * ace/OS.i and OS.cpp: uninlined functions that use varargs, because - they usually won't get inlined anyways. - - * ace/OS.cpp (thr_create): added #else clause to be sure that - always sparam.sched_priority always get set to the priority argument. - - * netsvcs/clients/Naming/Client/Client_Test.cpp: commented out - unused parameters and wrapped combined assignments/conditional - values to avoid compiler (g++) warnings. - - * tests/Priority_Task_Test.cpp: added check for successful thread - spawn, and ACE_NEW_THREAD to svc () so that messages get logged. - -Thu Jan 16 17:03:47 1997 Douglas C. Schmidt - - * include/makeinclude: Added support for shared object files - on Linux. Thanks to Marius Kjeldahl for his help with this. - - * ace: Merged in the IRIX support, mainly the missing netdb - reentrant functions. Thanks to Gonzalo Diethelm - and Carlos O'Ryan for - their help. - - * ace/Timer_{List,Heap,Queue}: Changed iterator() to iter() to - avoid name clashes with STL (ugh). - - * ace/Timer_{Heap,List}.cpp: Added ACE_BUILD_DLL so that things - will link. Thanks to John Morey for reporting this. - - * ace/Synch_T.h: Fixed: class ACE_Write_Guard: method: - tryacquire_write so that it will call - ...->lock_->tryacquire_write() and not - ...->lock_->acquire_write(). Thanks to Alexandre Karev - for this fix. - -Thu Jan 16 15:51:16 1997 David L. Levine - - * Dump.cpp (register_object): initialized "slot" so that g++ doesn't - complain about uninitialized use. - - * Reactor.cpp (initialized): use ACE_GUARD_RETURN instead of - ACE_GUARD because the function returns a value; - (find): initialize "i" if handle is out of range so that g++ - doesn't complain about uninitialized use. - - * Service_Repository.cpp (remove): removed unused variable "handle". - - * Thread_Manager.h: made destructor virtual now that spawn_i () is - virtual. - - * Timer_Heap.cpp: changed some int loop indicies to size_t to - make sure that comparisons are consistently signed or unsigned. - - * OS.h, config-vxworks*.h: removed ACE_HAS_GREENHILLS_SOCKETS - ACE macro because the code it wrapped applies to all VxWorks - compilers, not just GreenHills. - -Wed Jan 15 02:06:21 1997 Douglas C. Schmidt - - * ace/ACE.cpp (round_to_pagesize): If _SC_PAGESIZE is enabled then - we set the ACE::pagesize_ variable using sysconf(2). Thanks to - James Mansion for this suggestion. - -Wed Jan 15 02:06:21 1997 Douglas C. Schmidt - - * ace/Timer_Queue.cpp (expire): Changed a line of code from - - ACE_Timer_Queue_Iterator &iterator (this->iterator ()); - - to - - ACE_Timer_Queue_Iterator &iterator = this->iterator (); - - so that the Visual C++ compiler can grok it. Thanks to John - Morey for reporting this. - - * ace/Reactor.cpp: Modified the close() method so that it can be - called multiple times with no bad side-effects. - - * ace/Pipe.cpp: Modified the close() method so that it can be - called multiple times with no bad side-effects. - - * ace/Reactor: Added an initialized() method that indicates - whether the Reactor was successfully initialized. Also - rearranged the code in ACE_Reactor::open() so that initialized_ - is only set at the end of the method when everything succeeds. - If things *don't* succeed, we call close() on the way out. - Thanks to Luca for these suggestions. - - * ace/Reactor.cpp (close): When closing down the ACE_Reactor, we - now set initialized_ back to 0 so that it can be reopened again - later. - - * tests/Reader_Writer_Test.cpp: There were some problems with this - test due to the fact that on many pthreads platforms pthread_t - isn't an int (it's a struct). Thanks to Chuck Gehr - for the fix. - - * ace/OS.i (exit): In WIN32 when the process exits through an - ExitProcess() call, some process resources (e.g., file handles) - are freed before the static variable destructors are - called. This results in an application error when tracing is - enabled. Removing the ACE_TRACE call in ~ACE_Event_Handler - seems to fix this. Thanks to Luca for this fix. - - * ace/OS: Fixed the implementation of semaphores for the POSIX - port (POSIX lacks semaphores). The trick was to add a "waiters" - field, along with the semaphore count. Thanks to John Bossom - for reporting this. - - * examples/Threads/wfmo.cpp: Added a new test program that seems - to indicate that the Win32 WaitForMultipleObjects() function can - be called in multiple threads, all of which wait on the same set - of HANDLEs. Note that the dispatching of the threads is - relatively "fair" (i.e., everyone gets a chance to process the - various HANDLEs as they become active). Thanks to Ari Erev - for suggesting this and providing the - initial code. - - * ace/Thread_Manager.h: Made the spawn_i() method virtual and - moved it into the protected section of the class so that it can - be over-ridden by subclasses. Thanks to Tim Harrison for - suggesting this. - -Tue Jan 14 15:57:55 1997 Douglas C. Schmidt - - * ace/OS.h: Changed the default size of ACE_DEFAULT_TIMERS to - _SC_TIMER_MAX (which is typically around 40 or so). - Thanks to Stuart Powell for - suggesting this. - - * tests/Timer_Queue_Test.cpp (main): Added some additional logic - so that we can test the performance of the preallocated and - non-preallocated ACE_Timer_Heap. - - * ace/Timer_Heap: Added a new "preallocate nodes" mechanism to the - ACE_Timer_Heap. If this is enabled by the constructor, then we - preallocate as many ACE_Timer_Nodes as there are slots in the - heap. This allows us to completely remove the need for dynamic - memory allocation, which is important for real-time systems. - - * ace/Thread_Manager.cpp (remove_thr): Optimized the code just a - tad by decrementing the current_count_ *first*. Thanks to Per - Andersson for suggesting this. - - * ace/ReactorEx: Updated the implementation so that the - handle_events() method now in fact *does* return the number of - event handler's dispatched (i.e., the implementation matches the - documentation...). Thanks to Hamutal Yanay - for reporting this. - - * ace/Service_Repository.cpp (remove): Removed an extra call to - ACE_OS::dlclose(). This is already being called in the - destructor of ACE_Service_Record. Thanks to Karlheinz for - reporting this. - - * man: Updated all the nroff and html documentation. - - * ace/Timer_Heap: Implemented the spiffy new timer cancellation - algorithm that requires only O(log N) time to remove a timer - from the ACE_Timer_Heap. This is about 50 to 100 times faster - than using the ACE_Timer_List implementation. - -Tue Jan 14 21:01:36 1997 David L. Levine - - * ace/OS.h: Replace "Linux" preprocessor symbol with "linux". - -Mon Jan 13 17:57:50 1997 Douglas C. Schmidt - - * ace/Synch: Added lock() accessor methods to both - ACE_Process_Semaphore and ACE_Process_Mutex. Thanks to Hamutal - Yanay for suggesting this. - - * ace/config-mvs.h: Added a #define for ACE_HAS_GETPAGESIZE. - Thanks to Chuck Gehr for this information. - - * ace/LSOCK_Stream.h: Added a new typedef for PEER_ADDR that is - associated with ACE_UNIX_Addr. Thanks to Mark Rabotnikov - for suggesting this. - -Mon Jan 13 22:24:09 1997 David L. Levine - - * ace/OS.h: Added #undefs of sigemptyset and sigfillset on Linux - when __OPTIMIZE__ is enabled. Yes, the system header on Linux - really #defines them when optimizing! Thanks to an anonymous - ACE user for pointing this out. - - * tests/tests_config.h: Dropped ACE_MAX_ITERATIONS back to 10. - -Sun Jan 12 16:59:52 1997 Douglas C. Schmidt - - * ace/Timer_List.cpp (schedule): Cleanup the code so that (1) - timer_id never == -1 (in order to distinguish it from error - return values and (2) so that we avoid an unnecessary check for - operator new failure. - - * ace/OS.h: Added a new #define called ACE_DEFAULT_MAX_TIMERS, - which specifies the maximum number of ACE_Event_Handlers - supported by ACE_Timer_Heap. - - * ace/Proactor.cpp (ACE_Proactor): Updated the allocation of - ACE_Timer_Queue so that it really points to an ACE_Timer_List by - default. Naturally, this can be overridden by users. - - * ace/ReactorEx.cpp (open): Updated the allocation of - ACE_Timer_Queue so that it really points to an ACE_Timer_List by - default. Naturally, this can be overridden by users. - - * ace/Reactor.cpp (open): Updated the allocation of - ACE_Timer_Queue so that it really points to an ACE_Timer_List by - default. Naturally, this can be overridden by users. - - * ace: Added two new classes called ACE_Timer_List and - ACE_Timer_Heap, which derive from ACE_Timer_Queue. - ACE_Timer_List is essentially the old behavior of - ACE_Timer_Queue, i.e., it uses an implementation of a linked - list of ACE_Timer_Nodes. ACE_Timer_Heap, on the other hand, - uses a heap-based callout queue, which is more appropriate for - certain real-time applications. - - * ace/Timer_Queue: Revised the ACE_Timer_Queue implementation so - that it's now an abstract base class with most of the - implementation details pushed into the ACE_Timer_List and - ACE_Timer_Heap subclasses. - - * ace/Timer_Queue.h: Made all the ACE_Timer_Queue methods public - so that we can override them in a subclass (e.g., the new - ACE_Timer_Heap). - - * examples/Logger/Acceptor-server/server_loggerd.cpp: Fixed this - example application so that it only uses a single Reactor (the - REACTOR::instance()) rather than two Reactors. Thanks to Sandro - Doro for reporting this. - - * netsvcs/lib/Logging_Strategy.cpp: Fixed the #include of - fstream.h and iostream.h to use the '<' '>' notation rather than - the '"' and '"' notation. This avoids problems with running - "make depend". Thanks to Rino Simioni for - reporting this fix. - -Sun Jan 12 18:20:49 1997 David L. Levine - - * ace/ACE.cpp (round_to_pagesize): fixed typo in reference to - ACE::pagesize_. - - * ace/ACE.cpp: initialize ACE::pagesize_ to 0. - - * ace/config-irix*.h and config-win*.h: removed ACE_PAGE_SIZE - definition because these platforms no longer use it. - - * tests/UNIX*.conf and Win32server.conf: replaced net_svcs - with netsvcs. - -Sat Jan 11 15:11:28 1997 Douglas C. Schmidt - - * ace/OS.i (thr_setprio): The POSIX implementation of - ACE_OS:thr_setprio did not set the priority. It calls: - - pthread_setschedparam( thr_id, &policy, ¶m ) - - and then does - - prio = param.sched_priority. - - instead of - - param.sched_priority = prio; - - This is now fixed. Thanks to John Bossom - for reporting this. - - * ace/config-irix*.h: Modified all the IRIX config files to - use the new ACE_HAS_GETPAGESIZE feature since this is necessary - to differentiate between IRIX and IRIX64. - Thanks to Fred LaBar for - reporting this. - - * ace/ACE.cpp: Modified the round_to_pagesize() so that if - a config.h file enables ACE_HAS_GETPAGESIZE then we use - that function in preference to the value in config.h. - Thanks to Fred LaBar for - suggesting this. - - * ace/ACE.cpp: Modified the round_to_pagesize() so that on - platforms that allow the page size to be obtained dynamically - we'll get that rather than replying on what it set in the - config.h file. We'll cache this value in a static variable - to speedup searches. Thanks to James Mansion for suggesting - this. - - * apps/Gateway/Gateway: Finished adding support for thread-safe - reference counting to the uses of ACE_Message_Block. - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: Replaced - the use of ACE_MT_SYNCH with ACE_SYNCH so that this will compile - correctly on non-MT platforms. - -Fri Jan 10 12:38:42 1997 Douglas C. Schmidt - - * Added a COPYING file that explicitly states the copyright status - of ACE. - - * ace/config-win32-msvc4.x.h and ace/config-winnt-4.0-msvc4.x.h: - By default, we'll revert to *not* enabling - ACE_HAS_TEMPLATE_TYPEDEFS for MSVC++ 4.2, even though this is - well-support by the compiler since it breaks some application - code that expects to use 3 template parameters for - ACE_Svc_Handler<>. The "fix" is to use the ACE_SOCK_STREAM - macros (rather than using the "ACE_SOCK_Stream, ACE_INET_Addr" - tuple) in order to achieve portability in either case. Thanks - to Karlheinz for pointing out the need for backwards - compatibility. - -Wed Jan 8 01:00:05 1997 Douglas C. Schmidt - - * tests/Message_Block_Test.cpp: Enhanced the torture test of the - ACE_Message_Block so that it stresses the reference counting - implementation in a multi-threaded environment. - -Wed Jan 08 10:26:45 1997 David L. Levine - - * ace/Message_Block.cpp (~ACE_Data_Block): assigned 0 to - allocator_strategry_ after deleting it; fixed template - specializations (for g++) by using macros instead of class names; - commented out template specializations because Service_Record.cpp - already has them, and they should only appear once in the library - in order to avoid link clashes - - * ace/Service_Object.cpp (ACE_Service_Object): reordered - initializations in constructor - - * ace/Service_Record.cpp (ACE_Service_Record): reordered - initializations in constructor - - * ace/config-linux-lxpthreads.h: added - ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS, thanks to - James CE Johnson for tracking down this - problem and testing the fix. - -Tue Jan 7 13:03:25 1997 Douglas C. Schmidt - - * ace/Message_Block: Continued to improve the - ACE_Message_Block/ACE_Data_Block implementation. - - * ace/Message_Block: Added a new constructor to ACE_Message_Block - that takes an ACE_Data_Block * and "owns" it. Thanks to Tim for - this idea. - - * ace/Log_Msg.cpp: Now that we've prevented signal handlers from - occurring within critical sections of ACE_Log_Msg::log() we - don't need to use the ACE_Recursive_Thread_Mutex anymore. - Instead, we just need ACE_Thread_Mutex. - - * ace/Log_Msg.cpp (log): Added an ACE_Sig_Guard to the block in - ACE_Log_Msg::log() that acquires the mutex that serializes - output. This prevents nasty problems with recursive to - ACE_Log_Msg::log() from within signal handlers. - - * ace/Service_Config.cpp (end_reactor_event_loop): Added a timeout - of ACE_Time_Value::zero to the ACE_Reactor::notify() method when - called in the ACE_Service_Config::end_reactor_event_loop(). - This prevents the Reactor from blocking indefinitely if there's - no longer a thread to receive from the notification pipe. - - * netsvcs/clients/Naming/Dump_Restore: Removed the vestigal - nametest.cpp and nametest.h files. I'm not sure why they were - still there, but they shouldn't have been! - - * ace/Synch.i (remove): this->owner_ should be set to -1 before - calling this->release(). Thanks to Per Andersson - for suggesting this. - - * ace/Thread_Manager.cpp (exit): Added a flag called "do_thr_exit" - to the ACE_Thread_Control::exit() method. This controls whether - we call ACE_OS::thr_exit() after removing the thread from the - Thread Manager's internal table. This is necessary to work - around pthread bugs on certain platforms (e.g., AIX and Linux). - - * ace/Synch.h: Removed the - ACE_Recursive_Thread_Mutex::set_nesting() method since this - isn't being used and is potentially dangerous. Thanks to Per - Andersson for suggesting this. - - * ace/XtReactor: Updated the XtReactor so that it uses the next - internal Reactor implementation. Thanks to Mark Rabotnikov - for reporting this. - - * ace/Task.i: Updated the grp_id(int) method to cache the group id - in the task and then set it in the Thread_Manager, if there is - one. Thanks to Hamutal Yanay - for suggesting this. - - * ace/Log_Record.h: Updated the ACE_Log_Record class to use the - new ACE_MAXLOGMSGLEN macro. - - * ace/OS.h: Added a new #define called ACE_MAXLOGMSGLEN. By - default this is 4k. However, you can reset it in the config.h - file if you'd like to increase or decrease the size. Thanks to - Anthony McConnell for suggesting this. - - * examples/Threads/tss[12].cpp: Tidied up the tss1.cpp and - tss2.cpp examples and improved the comments. Thanks to Luca for - suggesting this. - - * ace/Service_Object.cpp (fini): Added the "virtual" keyword to - the new destructor of ACE_Service_Type. Thanks to David for - reporting this. - - * ace/Message_Block.i: Rearranged the order of the ACE_Data_Block - and ACE_Message_Block locking_strategy() methods so that they'd - be defined as inline before being used. Thanks to David for - reporting this. - -Mon Jan 6 16:46:06 1997 Douglas C. Schmidt - - * ace/Service_Manager.cpp (fini): Only try to remove the - ACE_Service_Manager from the Reactor if it's actually been - registered in the first place (i.e., if it's get_handle() method - does not return ACE_INVALID_HANDLE). - - * netsvcs/servers/svc.conf: Changed the name of the net services - .so file from libnet_svcs to netsvcs so that it will work - correctly with our new "cross-platform" svc.conf ACE::ldfind() - strategy. Thanks to Marius Kjeldahl for - reporting this. - - * ace/Reactor.cpp (find): Added a strategic break and a check for - handle_in_range(). Thanks to Tim for this help! - - * netsvcs/clients/Naming/Client/svc.conf: Removed the "lib" part - from the executable shared object file names in the svc.conf - file so that it will work with the new "cross-platform" svc.conf - ACE::ldfind() strategy. Thanks to Marius Kjeldahl - for reporting this. - - * ace/Service_Record.cpp (fini): Added an extra assignment to a - temporary const void *obj to avoid problems with MSVC++ and it's - cast mechanism. - - * ace/ReactorEx.h: Added a default parameter to - ACE_ReactorEx::notify(). Thanks to Tim for noticing this. - -Sun Jan 5 10:48:23 1997 Douglas C. Schmidt - - * tests: Added a new test for ACE_Message_Block, which is called - Message_Block_Test.cpp (no surprise there ;-)). This test - exercises the reference counting mechanisms. - - * ace/Message_Block.h: Made the destructors for ACE_Message_Block - and ACE_Data_Block virtual, so that these classes can be - subclassed and ACE_Message_Blocks can delete these - subclasses (either via release() or delete). Thanks to Tilo - Christ for suggesting this. - - * ace/Message_Block.cpp: Modified the implementation - of ACE_Message_Block/ACE_Data_Block so that we always create - an allocator_strategy_. By default, this strategy will be - ACE_Allocator_Adapter >; - This greatly simplifies the code. - - * ace/Message_Block.h: It's now possible to assign a - Message_Block's priority when you create it. - - * ace/Reactor: Sped things up some more by merging the Reactor's - any_ready() and fill_in_ready() methods together. This reduces - redundant computations. - - * ace/Reactor: Changed the name of ACE_Reactor::detach() to - ACE_Reactor::remove_handler_i() and changed the name of - ACE_Reactor::attach() to ACE_Reactor::register_handler_i(). - This is more consistent with the other naming schemes. - - * ace/Reactor.cpp: Reworked the implementation of the Handler - Repository's unbind() method in order to simplfy the logic. - Also merged in all the Reactor's detach() functionality into the - unbind() method in order to localize all the handler removal - processing. - - * ace/Reactor[Ex].cpp: Added more descriptive errno entries for - failed operations in the handler repository. - - * ace/Reactor.cpp: Modified the implementation of the Handler - Repository's bind() method so that it reports an error if you - try to register an Event_Handler for an invalid HANDLE. - - * ace/Reactor.cpp: Reimplemented the internals of the Reactor to - prepare for the upcoming merge of the Reactor and ReactorEx to - use a single code base. - - * ace/Timer_Queue.cpp: Modified the behavior of the expire() - methods so that they return the number of ACE_Event_Handlers - whose handle_timeout() method was called. - -Sat Jan 4 11:47:05 1997 Douglas C. Schmidt - - * ace/Reactor.h: Removed the #ifdefs for ACE_HAS_POLL. This will - be recast as a strategy in subsequent implementations. - - * ace/Reactor.cpp: Added a new call, - ACE_Handler_Repository::handle_in_range(), which checks to make - sure that the HANDLE is within the range of 0 .. max_handlep1_. - This factors out some redundant code. - - * ace/Reactor.cpp: Sped up the performance of the Reactor by - removing redundant calls to - ACE_Handler_Repository::invalid_handle() and - ACE_Handler_Repository::find(). - - * tests/Reactors_Test.cpp: Added a test for - the new Reactor::notify() method with timeouts. - - * examples/Reactor/Misc/notification.cpp (svc): Added a test for - the new Reactor::notify() method with timeouts. - - * ace/Reactor[Ex]: Modified the Reactor and ReactorEx so that they - use timed send() operations for their notify() methods. This - makes it possible for users to bound the amount of time they're - willing to wait to try and notify the Reactor. This is mostly - useful to avoid infinite blocking if there is congestion in the - Reactor's notification mechanism. - - * ace/ACE.cpp: Added a new timed send() method that uses the - write() system call on UNIX and the socket send() call on Win32. - This new method is used in the new ACE_Reactor::notify() method, - which now supported timed notifications. - - * ace/Reactor.cpp (ACE_Handler_Repository): To simplify the code - and reduce unnecessary #ifdefs, I've merged the max_handlep1_ - and cur_size_ fields (which are now called max_handlep1_). - -Fri Jan 3 10:47:15 1997 Douglas C. Schmidt - - * ace: Replaced all uses of "delete mb" with mb->release (); - - * ace/Stream_Modules.cpp: Replaced the use of explicit bit - twiddling with the ACE_BIT* macros. - - * ace/Message_Block.cpp: Make sure that we use the - allocator_strategy_ to create the memory for the reference count - since this may need to go into shared memory if that's the - memory pool where the Message_Block allocations are coming from. - - * ace/OS.h: Added two new macros, ACE_ALLOCATOR_RETURN and - ACE_ALLOCATOR, which are similar to ACE_NEW_RETURN and ACE_NEW, - except that these - - * ace/Message_Block.cpp (release): Make sure to "delete this" - outside the scope of the locking_strategy_. - - * ace/Service_Object.cpp: Added a destructor to ACE_Service_Type. - Thanks to Per.Andersson@hfera.ericsson.se (Per Andersson) for - suggesting this. - - * ace/Service_Object.i: Be smarter about how we reassign the name_ - pointer, i.e., delete the old one and make a copy. Thanks to - Per.Andersson@hfera.ericsson.se (Per Andersson) for reporting - this. - - * ace/Module.cpp (open): Rearranged the assignments to - reader_q->mod_ and writer_q->mod_ so that we don't try to - initialize through NULL pointers. Thanks to - Per.Andersson@hfera.ericsson.se (Per Andersson) for reporting - this. - - * ace/Service_Record.cpp (ACE_Service_Record): Initialized name_ - to NULL so that the following change works correctly now. - Thanks to Per.Andersson@hfera.ericsson.se (Per Andersson) for - reporting this. - - * ace/Service_Record.i (name): Make sure to delete [] (char *) - this->name_ before allocating a new one. Thanks to - Per.Andersson@hfera.ericsson.se (Per Andersson) for reporting - this. - - * ace/Message_Block: Reworked the reference counting implemention - so that reference counts are shared correctly amongst their - various owners. This requires making a deep copy the "header" - portion, but a shallow copy of the "data." - - * ace/Message_Block.cpp (ACE_Message_Block): Updated all three - ACE_Message_Block constructors so that they all call the init() - method. This centralizes all the initialization logic in one - place. - -Thu Jan 2 00:42:21 1997 Douglas C. Schmidt - - * ace/Message_Block.cpp (ACE_Message_Block): Make sure to set the - cont_ field to 0 after "releasing" it so that we don't - mistakenly think it's still around later on. This problem arose - in the ACE_Message_Queue::close() method, which was trying to - count the number of bytes being freed. - - * ace/Message_Queue.cpp (close): Fixed a subtle bug where we - weren't actually deleting messages from the - ACE_Message_Queue::close() routine. This should work now... - - * ace/Message_Queue.cpp (close): Replaced the use of "delete mb" - with "mb->release()" since the Message_Blocks are now reference - counted. - - * ace/Message_Block: Enhanced the reference counting scheme so - that you can increment and decrement the count by an arbitrary - amount. This is particular useful when you know you'll be - sending the same Message_Block to N consumers. - - * ace/Singleton: The dump() must be used same as instance() - (without supplying an object) so it must be declarated *static*, - i.e., - - static void dump (void); - - Thanks to Sandro Doro for reporting - this. - - * examples/ASX/Event_Server: Completely rewrote and retested the - ACE Event Server example. The new code is *much* easier to - understand, has many more comments, is more robust, and compiles - much faster since I removed many of the templates. - - * examples/ASX/Event_Server/Tranceiver/tranceiver.cpp: Fixed the - tranceiver so that it shuts down correctly when the Event_Server - exits. - - * examples/Connection/non_blocking/CPP-connector.cpp: Fixed a - problem where we were trying to select() on ACE_STDIN on Win32. - Naturally, this doesn't work, so we used the - ACE::register_stdin_handler() to fix this. Thanks to - Samuel_Bercovici - for reporting this. - - * examples/ASX/Event_Server/Event_Server/Options: Changed the - Options class to be a Singleton... - - * ace/Task.h: Added "const" method qualifier to accessor methods - like is_reader() and is_writer(). - -Wed Jan 1 00:10:47 1997 Douglas C. Schmidt - - * ace/Message_Block: Added a new static release() method that - behaves like the non-static method release(), except that it - checks if is 0. This is similar to CORBA::release(), which - is useful if you want to eliminate lots of checks for NULL - pointers before calling release() on them. - - * Updated all places in ACE where we use - ACE_Event_Handler::READ_MASK when we should be using - ACE_Event_Handler::ACCEPT_MASK. - - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - Changed the name of the acceptor class from Handle_Thr_Stream to - Handle_Thr_Acceptor, which is more accurate. - - * ace/Reactor: Since we've now got an - ACE_Event_Handler::ACCEPT_MASK (intended primarily to accept - connections asynchronously using Win32 overlapped I/O) we can - now use this with the ACE_Reactor, as well. In particular, any - time that we are registering a "passive-mode" socket acceptor we - can now specify ACE_Event_Handler::ACCEPT_MASK. This is much - more intuitive than using the READ_MASK (which never made any - sense...). The ACE_Reactor now treats the ACCEPT_MASK as a - READ_MASK internally, so you can still use READ_MASK if you'd - like (i.e., this change doesn't break any existing code). - - * ace/Event_Handler: Changed "get_priority" and "set_priority" to - simply "priority(void)" and "priority(int)" to be more - consistent with other parts of ACE. - - * apps/Gateway/Gateway: Updated the Gateway so that the - concurrency strategies can now be specified on the - command-line (or in the svc.conf file), rather than being - determined at compile-time. This is much more flexible. - See the ./apps/Gateway/Gateway/README file for details. - - * apps/Gateway/Gateway: Verified that all the multi-threading - strategies still work. - - * ace/Message_Block.cpp (ACE_Message_Block): Make sure that we - "release" the continuation field, rather than delete it, since - its reference count may be > 1. - - * ace/Log_Msg.cpp (log): Change the abort_prog logic a bit so that - we always print a message to stderr if we're exiting, - regardless... Thanks to David Levine for pointing this out. - - * apps/Gateway/Gateway: Moved all of the configuration file - parsing logic *outside* of the Event_Channel into the Gateway - class so that we wouldn't have unnecessary dependencies. - - * apps/Gateway/Gateway: Redesigned the Gateway so that the - Proxy_Handlers (i.e., the Consumer_Proxy and Supplier_Proxy) - most of their work to the Event_Channel. This "lightweight - proxy" design is an improvement since it is now possible to - emulate the COS Event Channel semantics within the Event_Channel - "kernel." - - * Happy new year! Let's start a new ChangeLog to celebrate the - new year. diff --git a/ChangeLogs/ChangeLog-97b b/ChangeLogs/ChangeLog-97b deleted file mode 100644 index da7e8bf2f84..00000000000 --- a/ChangeLogs/ChangeLog-97b +++ /dev/null @@ -1,9182 +0,0 @@ -Tue Nov 25 16:18:49 1997 David L. Levine - - * ACE version 4.4, released Tue Nov 25 16:18:49 1997. - -Tue Nov 25 16:03:09 1997 David L. Levine - - * Makefile: fixed Version.h generation to work properly when - $$beta is undefined. - -Mon Nov 24 10:33:34 1997 Douglas C. Schmidt - - * ACE version 4.3.56, released Mon Nov 24 10:33:34 1997. - -Sun Nov 23 13:32:02 1997 David L. Levine - - * ace/IOStream.h: removed DIGITAL_UNIX from #include decision, - so now it just depends on DEC_CXX and its version. Thanks to - Dani Flexer for this fix. - - * netsvcs/lib/Server_Logging_Handler.cpp: updated template - instantiations to match recent change to Server_Logging_Handler_T.h. - -Sat Nov 22 19:16:35 1997 - - * tests/Process_Strategy_Test.cpp: - - main: Removed signal handling code. It is unnecessary since we - do not use kill() anymore. - - Process_Strategy: This subclass of ACE_Process_Strategy - overwrites the process creation method to include connection - counting. - - connection_completed: Made sure that the Reactor is woken up - after all the connections have completed. - - * ace/Priority_Reactor.cpp (init_bucket): Removed extra code. - - * ace/Acceptor.cpp (activate_svc_handler): open svc_handler only - if result is 0. Also removed extra tracing code. - - * ace/Handle_Set.i (reset): Purify is reporting a UMR - (uninitialized memory copy) when copying a Handle_Set. This - comes from the mask fd_set not being memset to 0 by FD_ZERO. - This is therefore a harmless error. - - * tests/Priority_Reactor_Test.cpp (main): The ordering of - auto_ptrs is very subtle.... "auto_ptr reactor" - should come before "auto_ptr impl", i.e., - the implementation should be destroyed *before* the forwarding - class. This is apparent when the implementation class is - removing registered event handlers that hold a pointer to the - forwarding class. - -Sat Nov 22 16:04:07 1997 Carlos O'Ryan - - * ace/Message_Queue.cpp: - Fixed some formating problems in the ACE_Message_Queue::dump - method, thanks to Arturo Montes for - finding this one. - -Sat Nov 22 14:38:22 1997 Steve Huston - - * ace/config-aix-4.2.x.h: Added ACE_TLI_TCP_DEVICE "/dev/xti/tcp". - This fixes Riverace problem ID P32; AIX now joins HP-UX in - supporting XTI/TLI, but not everything (problem P27). - - * ace/UPIPE_Connector.h: - * ace/TLI_Connector.h: Added meta-type information PEER_ADDR and - PEER_STREAM. Fixes Riverace problem ID P37. - - * apps/JAWS/server/HTTP_Server.cpp: Added 'const' to "char *prog". - Fixes Riverace problem P36. - - * examples/Connection/misc/test_upipe.cpp: - * examples/Connection/non_blocking/CPP-connector.cpp: - * examples/Threads/process_mutex.cpp: - * examples/Threads/process_semaphore.cpp: - Added 'const' to "char *" - can't initialize a char * with - a const string. Fixes Riverace problem ID P38, P40. - - * examples/Threads/thread_specific.cpp, tss1.cpp: Moved the Errno - class out to a new file, thread_specific.h. AIX xlC needs to have - the class in a .h file for template generation. Fixes Riverace - problem P42. - * examples/Threads/Makefile: Make sure that, on AIX, the tempinc - directory is cleared before building each new program. - - * performance-tests/Synch-Benchmarks/Makefile: Changed SHLIB to use - $(SOEXT) rather than .so. Fixes Riverace problem ID P41. - - * tests/Thread_Pool_Test.cpp: Moved 'this->getq(mb)' out of an - ACE_ASSERT. Thanks to Arturo Montes - for finding this. - -Sat Nov 22 05:44:10 1997 Nanbor Wang - - * tests/Process_Strategy_Test.cpp (main): Shuffled things around - in fork() block. This is fun. - - * ace/Strategies_T.cpp (activate_svc_handler): Added an - ACE_UNUSED_ARG macro to muffle g++. - - * tests/Process_Strategy_Test.cpp (handle_close): Added a return - type specifier. Without it, g++ laments. - - * ace/Acceptor.cpp (activate_svc_handler): Should be if (open (...) == - -1) then error, not if (open (...) != -1) then error. - - * ace/ACE.cpp (set_handle_limit): Removed a duplicated ACE_TRACE - macro. - -Sat Nov 22 00:26:11 1997 Nanbor Wang - - * ace/Thread_Manager.cpp (close): Activated automatic wait on - close functionality. I think I get it right this time. - -Fri Nov 21 19:59:37 1997 Carlos O'Ryan - - * ace/IPC_SAP.cpp: - Added a couple of ACE_NOTREACHED protections. Thanks to Brian - Mendel for reporting this. - -Fri Nov 21 17:12:48 1997 - - * ace/Thread_Manager.cpp (close): Deactivated automatic wait on - close for now. It doesn't seem to work on Solaris. - - * ace/Thread_Manager.{h,cpp} (wait): Added codes to remove detached - threads. This function can be activated selectively. I added - this so we can ignore detached threads when closing down the - default thread manager. - - (close): Activated the code to wait (join) all threads managed - by the thread manager. It will ask wait function to remove all - detached thread first (and so they won't be counted into threads - we are waiting for.) - -Fri Nov 21 13:22:25 1997 Douglas C. Schmidt - - * ACE version 4.3.55, released Fri Nov 21 13:22:25 1997. - -Fri Nov 21 12:18:28 1997 Douglas C. Schmidt - - * ace/Acceptor.cpp,Strategy_T.cpp: Removed the use of gotos. See - Dijkstra '67 for motivation... - - * tests/Process_Strategy_Test.cpp (open): Make sure that we set - the Reactor of the Svc_Handler to 0 if we're running the - threading test. - - * tests/Reactor_Notify_Test.cpp: Added back THR_BOUND to - make things work on Solaris. - -Fri Nov 21 02:23:47 1997 - - * tests/Process_Strategy_Test.cpp: - - - The event loop execution was based on a fragile timeout - mechanism. This was changed to a more robust mechanism that - counts the connections. - - - The unlinking of the file was moved from the server to the - client. This is necessary since there maybe multiple server - processes that cannot really coordinate when the file should - be removed. - - * ace/Strategies_T.cpp (ACE_Concurrency_Strategy): - ACE_Concurrency_Strategy and all three of the subclasses - (ACE_Reactive_Strategy, ACE_Process_Strategy, and - ACE_Thread_Strategy) were messed up. Only ACE_Reactive_Strategy - was (trying) to set the correct blocking mode of the socket. - Therefore, moved the socket mode setting code to the base class, - ACE_Concurrency_Strategy, so that all the classes can share it. - - This did create one problem though. If the implementation of - the reactor uses event associations (i.e., WFMO_Reactor), we - cannot try to set the socket mode since the registration of the - svc_handler caused an event association to be created for the - socket and by default (thanks Microslush) the socket is set to - non-blocking mode. If the user is excepting to have a socket in - blocking mode, he is in for a surprise. Maybe we should return - a failure if the user is expecting a socket in blocking mode. - This is probably too harsh for now. - - * tests/Future_Test.cpp (open): Added THR_DETACHED since we don't - wait for this thread. - - * tests/Reactor_Notify_Test.cpp (open): Changed THR_BOUND to - THR_DETACHED since we don't wait for this thread. - - * tests/IOStream_Test.cpp (server): Make sure to close the socket - in ACE_SOCK_Acceptor and ACE_SOCK_IOStream. - - * ace/WFMO_Reactor.cpp (open): When I changed open() last, I - ignored the order of the registeration of notify_handler_ and - wakeup_all_threads_handler_. Unfortunately, the order of the - two registrations is very important since the optimization for - owner thread takes advantage of this ordering. Therefore, - revert the order of registertion to notify_handler_ followed by - wakeup_all_threads_handler_. - - * tests/version_tests/run_all_tests.bat: Added new bat file to - make the running of all the different configurations easier. - - * tests/version_tests/version_tests.{mak,mdp}: Added a mammoth - testing scheme that is used to test all 8 configurations of the - tests under Win32. These 8 configurations are: - - DLL Debug - DLL Release - DLL Unicode Debug - DLL Unicode Release - static Debug - static Release - static Unicode Debug - static Unicode Release - - run_tests.bat from the test directory can then be used to run - these various configurations. run_tests.bat was also extended - to allow the user to purify the tests. Simply execute - run_tests.bat with the purify command line option. - -Thu Nov 20 17:43:15 1997 - - * ace/Thread_Manager.cpp (kill_thr): Changed to prevent thread - manager from "discard" a thread when a certain operation is not - supported by the operation system. Removed the mechanism that - preserves errno during "thread removal." We no longer remove - thread right after an error occured. - -Thu Nov 20 17:53:35 1997 Douglas C. Schmidt - - * examples/Shared_Malloc/test_multiple_mallocs.cpp (main): Make - sure make sure that the semaphores created by the program are - released as well as the storage files deleted. Thanks to Tom - Arbuckle for reporting - this. - - * ace: Added a new version of config-osf1-3.2.h. Thanks to Dani - Flexer for updating this. - -Thu Nov 20 18:22:24 1997 Steve Huston - - * ace/README - ace/TLI.h - ace/TLI_Acceptor.h - ace/TLI_Connector.h - Changed from using hardcoded "/dev/tcp" as the XTI device name to - a new config-related define, ACE_TLI_TCP_DEVICE. If the config - doesn't set one, it defaults to "/dev/tcp". Thanks to Steve Coy - for zeroing in on this problem in HP-UX. - - ace/config-hpux-10.x.h: ACE_TLI_TCP_DEVICE is "/dev/inet_cots". - Note that XTI won't work 100% well on HP still - this is Riverace - problem ID P27. - - * netsvcs/lib/Server_Logging_Handler_T.h: Hardcoded to always use - ACE_SOCK_Stream (and friends) rather than ACE_TLI_Stream and friends. - XTI doesn't work real well on some platforms (particularly HP-UX - and AIX). When they're fixed, this can be undone (Riverace problem - ID P28). - - * examples/IPC_SAP/TLI_SAP/CPP-client.cpp: Changed 'char *host' to - 'const char *host' so it can be initialized from a const char string. - -Thu Nov 20 14:19:57 1997 Carlos O'Ryan - - * tests/Priority_Reactor_Test.h: - * tests/Priority_Reactor_Test.cpp: - The test has a limited execution time now, and only reports a - warning if runs out of time. This may be due to some failed - connections, but it is hard to avoid that. On the other hand - the default time should be large enough, in our machines the - test only takes 14 seconds, so 60 seconds should be enough. - NOTE: this problem reveals a problem *only* in the test itself - not in ACE_Priority_Reactor. - -Thu Nov 20 11:29:51 1997 David L. Levine - - * ace/Timer_{Heap,List}_T.{h,cpp}: added - ACE_Timer_{Heap,List}::get_first () accessors. Thanks to - Stephen Henry for this suggestion. - -Thu Nov 20 11:27:44 1997 Douglas C. Schmidt - - * ACE version 4.3.54, released Thu Nov 20 11:27:44 1997. - -Thu Nov 20 10:45:08 1997 - - * tests/MT_SOCK_Test.cpp: Uncommented socket close call. - - * ace/WFMO_Reactor.cpp (open): Open the notification handler - *after* the timer queue has been created. - - * ace/ACE.cpp (get_ip_interfaces): Changed rep() to fast_rep() to - prevent memory leak. - - * ace/Reactor.cpp (ACE_Reactor): Fixed error of not creating any - Reactors on UNIX. - -Thu Nov 20 08:36:54 1997 Nanbor Wang - - * ace/Thread_Manager.{h,cpp}: Added a dummy argument to internal - thread functions. Without them, MSVC wrongly optimizes codes - and the stack were all clobbered when entering these functions. - -Wed Nov 19 23:24:03 1997 - - * ace/Reactor.cpp: Rearragned macros so we use Select_Reactor as - default if we don't have Winsock2. Irfan did it, not me. - -Wed Nov 19 22:11:20 1997 Douglas C. Schmidt - - * ACE version 4.3.53, released Wed Nov 19 22:11:20 1997. - -Wed Nov 19 15:55:52 1997 Sumedh Mungee - - * config-netbsd.h: NetBSD 1.3alpha has a better MSYNC. Commented out - ACE_HAS_BROKEN_NETBSD_MSYNC - -Wed Nov 19 14:26:36 1997 Nanbor Wang - - * stdcpp.h, OS.h: Changed ACE_CONFIG_H to ACE_USER_CONFIG_H. It - conflicts with the macro in various configuration files. - -Wed Nov 19 15:55:45 1997 Douglas C. Schmidt - - * ace/config-sunos5.*.h: Replaced all uses of ACE_HAS_UNICODE with - ACE_HAS_XPG4_MULTIBYTE_CHAR. At this point, I think only NT has - the UNICODE macro now. Thanks to Steve Huston for validating - this. - - * STL/bstring.h: Added a special-case for BorlandC++. However, I - think this can be generalized for all compilers. Thanks to - Valik Solorzano Barboza for reporting this. - - * ace/OS: Fixed strpbrk() to handle the const char * and char * - cases of ANSI C++. Thanks to Valik Solorzano Barboza - for reporting this. - - * ace/OS.h: Added a special case for _MSC_VER since BC++ doesn't - have wchar.h! Thanks to Valik Solorzano Barboza - for reporting this. - -Wed Nov 19 13:43:33 1997 Darrell Brunsch - - * Merged the purify testing into run_tests. Just use - - "run_tests purify ..." - - to purify instead of running the tests. If you thought this - batch file looked bad before.... - -Wed Nov 19 12:17:50 1997 Nanbor Wang - - * ace/{OS,stdcpp}.h (ACE_CONFIG_H): Added this macro to protect - config.h from getting included multiple times. - - * ace/stdcpp.h: Reverted include OS.h back to config.h. - -Wed Nov 19 09:20:05 1997 Douglas C. Schmidt - - * ACE version 4.3.52, released Wed Nov 19 09:20:05 1997. - -Wed Nov 19 07:54:44 1997 Douglas C. Schmidt - - * ace/ACE.cpp (crc32): Reverted the COMPUTE macro back to its - original value. For some reason, the version given by Valik was - failing. - - * ace/SV_Semaphore_Complex.cpp (open): Make sure initialize the - sem_number_ data member, though this isn't actually used for - anything. - - * ace/ACE.cpp: Added a #ifdef for __unix since this is the only - case where we'll actually have the ifreq autoptr. Thanks to - Valik Solorzano Barboza for reporting this. - - * ace/Log_Record.cpp (print): Added a work around for a really - lame bug with BORLANDC. Thanks to Valik Solorzano Barboza - for reporting this. - -Wed Nov 19 04:22:38 1997 Douglas C. Schmidt - - * ACE version 4.3.51, released Wed Nov 19 04:22:38 1997. - -Wed Nov 19 04:02:09 1997 Douglas C. Schmidt - - * include/makeinclude/rules.local.GNU (show_uninit): It seems - there was a missing '@' at the beginning of the line. Thanks to - Hans Rohnert for reporting this. - - * tests/Process_Strategy_Test.cpp (handle_input): Fixed Irfan's - code, which keeps breaking ACE ;-). - -Wed Nov 19 01:55:06 1997 - - * ace/WFMO_Reactor.cpp (resume_handler_i, suspend_handler_i, - unbind_i): Since things don't happen immediately in the - WFMO_Reactor world, we must make sure that this request is not a - duplicate. If so we must ignore it. - - * ace/Asynch_Acceptor.cpp (open): Fixed addr type mismatch problem. - - * tests/UPIPE_SAP_Test.cpp (main): Make sure to close the socket - in ACE_UPIPE_Acceptor. - - * tests/SPIPE_Test.cpp (server): Make sure to close the socket in - ACE_SPIPE_Acceptor. - - * tests/SOCK_Test.cpp (spawn): Make sure to close the socket in - ACE_SOCK_Acceptor. - - * tests/Reactor_Notify_Test.cpp (Supplier_Task): Make sure to - close the pipe down. - - * tests/Process_Strategy_Test.cpp (handle_input): Fixed ACE_DEBUG - statement to pass the correct number of arguments. - - * tests/MT_SOCK_Test.cpp (spawn): Make sure to close the socket in - ACE_SOCK_Acceptor. - - * tests/Reactor_Exceptions_Test.cpp (main): Make sure to close the - socket in ACE_SOCK_Dgram. - - * tests/run_purify_tests.bat: Added "mkdir purify_results". - - * tests/run_tests.bat, run_purify_tests.bat: Changed explicit name - of bat file (e.g., run_tests, run_purify_tests) to %0. This - will allow the bat file to be used from other directories. - - * ace/config-win32-common.h: Removed extraneous define of - ACE_HAS_TEMPLATE_INSTANTIATION. - -Wed Nov 19 00:37:22 1997 - - * ace/stdcpp.h: Changed to use "ace/OS.h" instead of using - "ace/config.h" directly to avoid redefinition of user defined - macros. - - * ace/Log_Msg.cpp (close): Disable Win32 to delete - ACE_Log_Msg::instance (). On Win32, this should be done by - ACE_TSS_Cleanup. - - * ace/OS.cpp (cleanup_tss): Enabled Win32 to call - ACE_Log_Msg::close. This is required to properly release - resourses held by ACE_Log_Msg_Manager. - -Tue Nov 18 19:28:36 1997 Douglas C. Schmidt - - * ace/Select_Reactor.cpp (unbind), - ace/WFMO_Reactor.cpp (handle_signal): Fixed a large number of - bugs with non-portable "scope of the for loop counter"... - Thanks to Valik Solorzano Barboza for - reporting this. - - * ace/Thread_Manager: Added == and != operators for - ACE_Thread_Descriptor to fix things with BORLANDC's template - mechanism. Thanks to Valik Solorzano Barboza - for reporting this. - - * ace/Select_Reactor: Added == and != operators for - ACE_Event_Tuple to fix things with BORLANDC's template - mechanism. Thanks to Valik Solorzano Barboza - for reporting this. - - * ace/OS.i (tempnam): Fixed a typo -- WIN32 should be ACE_WIN32. - Thanks to Valik Solorzano Barboza for - reporting this. - - * ace/OS.h: Reordered the ACE_SEH_* macros so they work correctly - with BORLANDC. Thanks to Valik Solorzano Barboza - for reporting this. - - * ace/OS: Added operator== and operator!= for ACE_Cleanup_Info so - that it will work correctly with BORLANDC's template mechanism. - Thanks to Valik Solorzano Barboza for - reporting this. - - * ace/config-win32-common.h: Added - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION for BORLANDC. Thanks to - Valik Solorzano Barboza for reporting this. - - * ace/Filecache.cpp: Fixed a bug with BORLANDC. Thanks to Valik - Solorzano Barboza for reporting this. - - * ace/ACE.cpp (crc32): Added some parens to the COMPUTE macro to - make it easier to grok. Thanks to Valik Solorzano Barboza - for reporting this. - -Tue Nov 18 16:27:32 1997 - - * ace/Log_Msg.cpp (log): Added a %D option to Log_Msg for - "month/day/year hour:minute:second:microsecond". Thanks to John - Mulhern <9107@MN3.LAWSON.lawson.com> for suggesting this. - - * ace/config-win32-common.h: If __ACE_INLINE__ is defined to be 0, - we will undefine it. - -Tue Nov 18 15:59:37 1997 Steve Huston - - * ace/IOStream.cpp: In underflow() and overflow(), use base() to - check for buffer in use in every case - not just without - ACE_HAS_STANDARD_CPP_LIBRARY==1. Thanks to James CE Johnson - (jcej@lads.com) for this fix. - - * tests/MT_SOCK_Test.cpp: Allow the test to run even if not all of - the proceses can be forked. - -Tue Nov 18 15:27:37 1997 Nanbor Wang - - * ace/Timer_Queue_Adapters.cpp: Reordered include files. Thanks - to Torbjorn Lindgren for noticing the problem. - -Tue Nov 18 11:40:18 1997 Steve Huston - - * ace/IOStream.(cpp h): Added: &&(ACE_HAS_STANDARD_CPP_LIBRARY != 0) - to the #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) lines to only use - the new iostreams things if that's been selected by the config file. - In ACE_Streambuf::overflow(), changed: - if (!eback()) to if (!pbase()) - -Tue Nov 18 08:23:53 1997 Douglas C. Schmidt - - * tests/Thread_Pool_Test.cpp (open): Moved the activate() method - from the Thread_Pool constructor to the open() hook since the - Thread_Pool class invoked ACE_Task::activate, indirectly invokes - Thread_Pool::svc. There existed a miniscule probability this - code would have crashed since on extremely broken C++ compilers - the virtual member function Thread_Pool::svc may not correctly - initialized in Thread_Pool constructor (i.e., it might point to - ACE_Task_Base::svc() at this point). The chance of this - happening is incredibly remote, but it's still a good ideal to - put the call in the open() method so we can check the return - value in the application. Thanks to Arturo for pointing this - out. - -Tue Nov 18 05:40:53 1997 David L. Levine - - * ace/OS.cpp (inet_aton): on Chorus only, use the native - ::inet_aton (). Thanks to Wei for pointing this out. - - * ace/OS.cpp (gethostby{addr,name}): on VxWorks only, don't htonl - the input address because it already should be in network byte - order. Store the output address in network byte order. Thanks - to Wei for noticing this error. - - * include/makeinclude/wrapper_macros.GNU: add -DACE_PURIFY to - CFLAGS if purify make flag is set, and -DACE_QUANTIFY if - quantify is set. Thanks to Chris Cleeland for this suggestion. - - * ace/Memory_Pool.cpp (ACE_Shared_Memory_Pool): reordered - initializers to match declaration order. - - * etc/purify.solaris2: added suppression of pthread_setcanceltype - BSW. - -Tue Nov 18 00:11:26 1997 Douglas C. Schmidt - - * ACE version 4.3.50, released Tue Nov 18 00:11:26 1997. - -Mon Nov 17 22:35:22 1997 Douglas C. Schmidt - - * examples/Shared_Malloc/test_malloc.cpp: Added some additional - calls to Malloc::instance ()->remove () to cleanup all the - semaphore locks. Thanks to Tom Arbuckle - for reporting this. - - * ace/Memory_Pool.cpp (init_acquire): Fixed a problem caused by - failing to initialize the minimum_bytes_ field in the - ACE_Shared_Memory_Pool class. Thanks to Tom Arbuckle - for reporting this. - - * examples/Shared_Malloc/test_malloc.cpp: Updated the Shared - Malloc test program to use the Singleton Thread Manager. - -Mon Nov 17 18:09:06 1997 - - * All eight different configurations of ACE passed all tests on - our Alpha/NT. - -Mon Nov 17 15:37:52 1997 David L. Levine - - * ace/INET_Addr.cpp (get_host_name): on VxWorks only, moved - ::hostGetByAddr code block to _after_ the check for the - address being INADDR_ANY. Without that check, get_host_name () - never returns the caller's own hostname. - - * netsvcs/lib/Makefile: the first line of the Local Target - (Server_Logging_Handler.*) override mysteriously disappeared. - -Mon Nov 17 02:09:57 1997 Douglas C. Schmidt - - * ACE version 4.3.49, released Mon Nov 17 02:09:57 1997. - -Mon Nov 17 02:03:21 1997 Douglas C. Schmidt - - * ace/IOStream_T.cpp: Added a few more fixes for KCC C++ and its - standard C++ library support. - -Mon Nov 17 01:34:34 1997 - - * netsvcs/servers/main.cpp (main): Removed daemon and changed to - use the singleton service configurator. Thanks to John Mulhern - and Stephen Coy for tracing this down and Irfan for coming out - with the fix. - -Sun Nov 16 21:58:51 1997 Darrell Brunsch - - * tests/*.dsp, ace/*.dsp: Added Release, Unicode Debug, and - Unicode Release versions for each of the tests. - - Also found out that precompiled headers take up insane - amounts of disk space when used with ACE and also slows - the compilation down. I turned it off for the tests and - for the ace libraries - -Sun Nov 16 13:34:29 1997 Douglas C. Schmidt - - * tests/SOCK_Connector_Test.cpp (fail_no_listener_nonblocking): - Changed the line - - status = con.complete (sock); - - to - - if (sock.get_handle () != ACE_INVALID_HANDLE) - status = con.complete (sock); - - The change worksaround a core dump due the the following - conditions: - - - the find_another_host function in SOCK_Connector_Test comes - up with the entry for an NT machine. - - - the ACE_OS::connect call at line 64 of SOCK_Connector.cpp - "successfully" fails returning -1 but in this case - errno is set to ECONNREFUSED. - - - Since errno is not EINPROGRESS or EWOULDBLOCK the - ACE_SOCK_Stream 'new_stream' close member function is called - which, besides closing the "handle", also sets it to - ACE_INVALID_HANDLE. - - - Since the errno was ECONNREFUSED the 'if' test at line 97 of - SOCK_Connector_Test.cpp is true and the next statement - - status = con.complete (sock); - - is called causing a core dump since sock.get_handle() is - ACE_INVALID_HANDLE (-1 on Solaris). - - Thanks to Jack Erickson for reporting this. - - * ace/OS: Cast away the constness of the parameters to _tempnam() - for Borland C++. Thanks to Valik Solrzano Barboza - for this. - - * ace/config-unixware-2.1.2-g++.h: Changed - ACE_HAS_OSF1_GETTIMEOFDAY to ACE_HAS_SVR4_GETTIMEOFDAY. Thanks - to John Connett for reporting this. - - * ace/SPIPE_Addr.cpp (set): Fixed a problem where we were - potentially writing into character constants. Thanks to Darrell - Brunsch for finding this. - - * ace/Get_Opt.cpp (operator): We need to make sure that all uses - of ACE_OS::strchr() are consistent with respect to const - correctness. Thanks to Darrell Brunsch for finding this. - - * ace/config-win32-common.h: Added a few minor changes for Borland - C++. Thanks to Valik Solrzano Barboza for - this. - - * ace/Log_Record.cpp (print): Changed the formal parameter from - "const char host_name[]" to "const char *hostname" so that we - can assign this in the function if necessary. Thanks to Valik - Solrzano Barboza for this. - - * ace/OS.cpp: Moved the constructor for ACE_Cleanup_Info into the - OS.cpp since it doesn't really need to be inline. - - * ace/WFMO_Reactor.cpp (notify): Replaced a "sizeof - ACE_Notification_Buffer" with "sizeof - (ACE_Notification_Buffer)". It's odd that the first approach - (which is incorrect) isn't flagged by MSVC++... Thanks to Valik - Solrzano Barboza for this. - - * ace/OS.i (sema_init): Added an ACE_ALLOCATOR_RETURN in the - appropriate spot. - - * ace/ACE.cpp: Moved the implementation of strsplit_r() into the - ACE.cpp file since it's rather long... - - * ace/OS: To be more conformant to the standard C++ library, - I've added a pair of methods for strstr(), strchr(), strrchr(), - etc. e.g., the function signature strstr(const char*, const - char*) is replaced by the two declarations: - - const char *strstr (const char* s1, const char* s2); - char *strstr (char* s1, const char* s2);" - - Thanks to Valik Solrzano Barboza for this. - - * ace: Added "ace.idl", which is a config file for Borland C++ - 5.x. Thanks to Valik Solrzano Barboza for - this. - - * include/makeinclude/platform_linux_kcc.GNU (SOFLAGS): Improved - this file a bit to work better with NULL pointers. Thanks to - Ben Eng for reporting this. - - * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp (main): - Changed allocator to alloc to avoid conflicts with STL. Thanks - to Ben Eng for reporting this. - - * ace/config-linux-kcc.h: Added some fixes for the KCC compiler. - Thanks to Ben Eng for reporting this. - - * ace/IOStream: Added fixes for the standard C++ library. Thanks - to Ben Eng for reporting this. - -Sat Nov 15 17:31:58 1997 Douglas C. Schmidt - - * Ran "make depend" on all of ACE. - -Sat Nov 15 15:55:52 1997 Steve Huston - - * tests/Priority_Reactor_Test.cpp: Removed the writer->peer().close() - call from client() that I added yesterday. ACE_Svc_Handler::destroy - will end up doing the close - thanks to Irfan for pointing this out. - -Sat Nov 15 01:31:58 1997 Douglas C. Schmidt - - * ACE version 4.3.48, released Sat Nov 15 01:31:58 1997. - -Fri Nov 14 23:36:12 1997 Chris Cleeland - - * ace/{OS,ACE}.{h,i} (strsplit_r): Moved strsplit_r from ACE_OS to - ACE, which is where it should go. - - * ace/ACE.cpp (ldfind): Changed uses of strsplit_r to be scoped - under ACE rather than ACE_OS. - -Fri Nov 14 22:57:04 1997 David L. Levine - - * ace/config-vxworks*.h: added ACE_LACKS_NETDB_REENTRANT_FUNCTIONS. - This is necessary for the gethostby{addr,name}_r support added - yesterday. - -Fri Nov 14 18:42:23 1997 Steve Huston - - * tests/Priority_Reactor_Test.cpp: Fixed client to close its socket - before exiting from the thread/process. - -Fri Nov 14 17:41:40 1997 Douglas C. Schmidt - - * ace/OS.i: Fixed some typos in strsplit_r(). - - * ace/OS.h: Moved the ACE_ALLOCATOR* stuff from Malloc_T.h to - OS.h, which is where it belongs. - - * examples/Reactor/Dgram: Reformatted some of the example - code to make it more readable. - -Fri Nov 14 17:08:00 1997 Chris Cleeland - - * ace/OS.i (strsplit_r): Added fixes so that this properly returns - the last piece. Thanks to Scott Herscher for - submitting this! Also beefed up the comments. - - * ace/OS.h: Added definitions to work around VxWorks' lack of - proper ANSI C/C++ prototypes for the functions found in - . The definitions were taken from Solaris 2.5.1, but - appear to work just fine. For now this is only in effect when - compiling with the Green Hills (ghs) environment, but it should - probably be used for others (such as g++) as well. - -Fri Nov 14 01:10:33 1997 Douglas C. Schmidt - - * ACE version 4.3.47, released Fri Nov 14 01:10:33 1997. - -Fri Nov 14 00:14:21 1997 David L. Levine - - * ace/OS.* (gethostbyaddr_r,gethostbyname_r): added VxWorks - support. - -Thu Nov 13 20:29:18 1997 Douglas C. Schmidt - - * ACE version 4.3.46, released Thu Nov 13 20:29:18 1997. - -Thu Nov 13 19:11:36 1997 Douglas C. Schmidt - - * ace/config-sunos5.4.*: Solaris 2.4 doesn't support the ualarm() - call unless you use the (broken) /usr/ucb/cc compiler. Here's a - patch for $ACE_ROOT/ace/config-sunos5.4-sunc++-4.x.h to fix the - problem. Thanks to Caleb Epstein - for reporting this. - -Thu Nov 13 19:25:50 1997 Carlos O'Ryan - - * include/makeinclude/platform_irix6.x-sgic++.GNU: - Updated comment on when should the user disable the use of - -lpthread - -Thu Nov 13 18:18:16 1997 Steve Huston - - * ace/Containers.h, Containers.cpp, Hash_Map_Manager.cpp, Malloc_T.h: - Removed the conditional code for the macro - ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR. The workaround for - this compiler bug is to remove "this->" from the object pointer - used in the ACE_DES_FREE_TEMPLATE macro invocation. This compiler - bug is HP case SR5003396259 for future reference. - - * ace/config-hpux-10.x-hpc++.h: Added ACE_HAS_ANSI_CASTS; removed - ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR (both for aC++ only). - - * ace/README: Removed ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR, as - it is no longer used. - -Thu Nov 13 16:51:40 1997 - - * ace/OS.h: Added two new macros ACE_FACTORY_DECLARE and - ACE_FACTORY_DEFINE. Changed definitions of - ACE_SVC_FACTORY_DECLARE AND ACE_SVC_FACTORY_DEFINE to use these - two macros. Refer to changes of the ACE_Export related macros - below, you can now declare/define your service factories as, - - ACE_FACTORY_DECLARE (FOOBAR, fac_class); - ACE_FACTORY_DEFINE (FOOBAR, fac_class); - - This will ensure they get define properly and proper decoration - will be added. - -Thu Nov 13 16:52:31 1997 Nanbor Wang - - * ace/Thread_Manager.cpp: Removed all ! defined - (ACE_HAS_FSU_PTHREAD). Thanks to ARTURO MONTES - for reporting this. - - * ace/config-gcc-2.7.2.h: Added ACE_HAS_TEMPLATE_SPECIALIZATION. - Thanks to ARTURO MONTES for reporting - this. - - * ace/config-fsu-pthread.h: added ACE_LACKS_THREAD_PROCESS_SCOPING. - Thanks to ARTURO MONTES for reporting - this. - - * ace/OS.h: Separate definition of proper export flag for - platforms from setting these flags for building/not building - DLL. I keep ACE_Export and ACE_Svc_Export to remain backward - compatibality but now, they are defined using the new "common" - definition. This changes is made in hope that it will simplify - codes generated by TAO_IDL compiler. - - Several new directives are added to these file. These common - directives will be set to proper values (macros) according to - the platform we use. They are: - - ACE_Proper_Export_Flag - ACE_Proper_Import_Flag - ACE_EXPORT_SINGLETON_DECLATATION(T) - ACE_IMPORT_SINGLETON_DECLARATION(T) - ACE_PROPER_SINGLETON_INSTANTIATION(T) - - I use them to define ACE_Export and ACE_Svc_Export. I hope it - is easier to define your own export decoration flag now. Here - is an example. Say you want to define an export flag for your - DLL file : foobar.dll. First, you need to add the following to - a common header file: - - // Here are definition for FOO_BAR library. - #if defined (FOOBAR_HAS_DLL) && (FOOBAR_HAS_DLL == 1) - # if defined (FOOBAR_BUILD_DLL) - # define FOOBAR_Export ACE_Proper_Export_Flag - # define FOOBAR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) - # define FOOBAR_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T) - # else - # define FOOBAR_Export ACE_Proper_Import_Flag - # define FOOBAR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) - # define FOOBAR_SINGLETON_INSTANTIATION(T) - # endif /* FOOBAR_BUILD_DLL */ - #else /* ! FOOBAR_HAS_DLL */ - # define FOOBAR_Export - # define FOOBAR_SINGLETON_DECLARATION(T) - # define FOOBAR_SINGLETON_INSTANTIATION(T) - #endif /* FOOBAR_HAS_DLL */ - - Be sure to include "ace/OS.h" before these definitions so that - the macros they use will be properly initialized. After you've - done this, on Win32, define "FOOBAR_HAS_DLL=1" if you want to - build DLL, define it as "FOOBAR_HAS_DLL=0" if you want to build - static library. In your library project file, you must define - the directives FOOBAR_BUILD_DLL and decorate classes/objects you - want to export with FOOBAR_Export so that they can be declared - automatically according whether you are building/linking with - static library or dynamic library. - -Thu Nov 13 05:47:42 1997 David L. Levine - - * ace/Thread_Manager.cpp: added ACE_TSS_Singleton instantiation, for the recent Svc_Handler - change. - - * ace/Object_Manager.h (default_mask): moved out of ACE_MT_SAFE - protection. - - * ace/OS.{h,i},config-vxworks-ghs-1.8.h,README (strlen,strcpy): - protect declarations of wchar versions with - ACE_HAS_WCHAR_TYPEDEFS_CHAR. GreenHills typedefs wchar to char. - - * ace/Singleton.cpp: register ACE_TSS_Singletons for cleanup with - Object_Manager. - - * ace/OS.{i,cpp} (gethostbyaddr): added VxWorks support. - -Thu Nov 13 02:06:58 1997 Chris Cleeland - - * ace/Signal.i: Changed to use new Object Manager member. - - * ace/Object_Manager.cpp: Added a new member to the Object - Manager--default_mask. This is the default signal mask employed - by ACE_Sig_Set. Moving the object into the OM saves cycles b/c we - only construct it once and just re-use every time. - - * ace/Handle_Set.cpp: Added two new macros--ACE_DIV_BY_WORDSIZE and - ACE_MULT_BY_WORDSIZE--which either divide or multiply the argument - by ACE_Handle_Set::WORDSIZE. The manner in which this is - accomplished is governed by the #define - ACE_USE_SHIFT_FOR_EFFICIENCY--when defined, ACE tries to use - shifts to implement multiplication and division rather than actual - multiply and divide operations. Currently this is disabled. - -Wed Nov 12 19:13:05 1997 - - * ace/Svc_Handler: Changed hand written tss singleton to - ACE_TSS_Singleton. Lot of (unnecessary) code disappeared. - Thanks to David Levine for suggesting this. - - * ace/Object_Manager: Removed ACE_SVC_HANDLER_LOCK. - -Wed Nov 12 16:29:15 1997 Sumedh Mungee - - * platform_netbsd.GNU: added /usr/lib/c++rtO.o to SOBUILD to - insure that static objects' ctors are called. - -Wed Nov 12 00:20:38 1997 David L. Levine - - * ace/OS.{i,cpp} (inet_ntoa): use VxWorks' native inet_ntoa. It's - not documented but it works. - - * ace/OS.cpp (gethostbyname): on VxWorks, load static first_addr on - every call, not just the first. - - * include/makeinclude/rules.local.GNU: removed extra "fi" in - install operation. - - * include/makeinclude/platform_sunos5_sunc++.GNU: removed +w from - CFLAGS because it generates too many spurious warnings. - - * ace/TTY_IO.cpp (control): commented out unused local variable - c_line. Thanks to Amos Shapira for - reporting this. - - * ace/OS.{h,i} (hostname): added Chorus support. Thanks to Wei - for the patches. - -Tue Nov 11 23:44:17 1997 Douglas C. Schmidt - - * ACE version 4.3.45, released Tue Nov 11 23:44:17 1997. - -Tue Nov 11 21:26:36 1997 Douglas C. Schmidt - - * platform_sunos5_sunc++.GNU, platform_irix6.x-sgic++.GNU, rules.local.GNU: - Added some minor fixes. - -Tue Nov 11 20:18:27 1997 Douglas C. Schmidt - - * Makefile: Added the tests and netsvcs directory to - RELEASE_LIB_FILES since this is pretty important to determine - whether ACE works. Thanks to Chuck Gehr and Steve Coy for this - suggestion. - - * tests/UNIXclerk.conf: Changed "merengue" to "localhost." - Thanks to Steve Coy for this suggestion. - - * ace/config-lynxos.h (getopt): Missing 't' from const => see - getopt prototype parameter list. Thanks to Manojkumar Acharya - . - -Tue Nov 11 08:09:16 1997 David L. Levine - - * ace/OS.cpp (inet_aton): declare local ip_addr as an ACE_UINT32 - instead of a long. Real programmers have 64-bit longs. - - * ace/INET_Addr.cpp (get_host_name): added ACE_UNUSED_ARG (len); - for VxWorks only. - -Tue Nov 11 13:19:46 1997 Torbjorn Lindgren - - * include/makeinclude/rules.local.GNU: Fixed so that the ACE - makefiles doesn't create circular symlinks (happens if - something fails when building libACE.* with "make -k", or when - doing parallel builds). It's now possible to do parallel - builds of libACE.* without having to clean up a mess afterwards. - - * include/makeinclude/platform_irix6.x-sgic++.GNU: Removed - .so build with links instead (ace/apps/examples/tests and my own - programs all work well with this, and the manual seems to suggest - that it hasn't ever been necessary on this platform) - - * ace/config-irix6.x-sgic++-nothreads.h: Added - ACE_HAS_XPG4_MULTIBYTE_CHAR for SGI IRIX 6.[2-5]. - -Tue Nov 11 04:50:06 1997 Nanbor Wang - - * examples/Reactor/Multicast/server.cpp (handle_timeout): Fixed a - typo. Thanks to Sandro Doro for - reporting this. - -Tue Nov 11 04:20:09 1997 Douglas C. Schmidt - - * ACE version 4.3.44, released Tue Nov 11 04:20:09 1997. - -Tue Nov 11 01:44:39 1997 - - * examples/Naming/test_open.cpp (main): Added a new naming test - that binds to the net_local server and tries to bind entries to - it. - - * netsvcs/lib/Name_Handler.cpp: Added a new class called - Naming_Context. This helper class adds the correct default - constructor to the ACE_Naming_Context class so that we can use - it in ACE_Singleton. - - Previously, each Name_Handler was getting its own - Naming_Context. This is obviously incorrect as the mapping - address in already occupied by the first Name_Handler. - Therefore, the Naming_Context was changed into a Singleton - accessable by all Name_Handlers. - - * ace/WFMO_Reactor.cpp (handle_additions && handle_deletions): - Changed code to make sure that we should not make the upcall - until all the internal data structures have been updated. This - is to protect against upcalls that try to deregister again. - -Tue Nov 11 01:28:50 1997 Douglas C. Schmidt - - * ACE version 4.3.43, released Tue Nov 11 01:28:50 1997. - -Mon Nov 10 21:30:04 1997 Aniruddha Gokhale - - * INET_Addr.cpp: In the ACE_INET_Addr::get_host_name (char - hostname[], size_t len) method, an unnecessary local variable - called "name" was being used and the actual parameter "hostname" - was never getting updated. The local variable is now removed and - we use the actual parameter everywhere. - -Mon Nov 10 20:44:43 1997 James C Hu - - * etc/ACE-guidelines.html: Added a section for ACE Design Rules, - and added a design rule about sentinels. - -Mon Nov 10 18:11:05 1997 Sumedh Mungee - - * ace/Singleton.h (ACE_TSS_Singleton): Changed ACE_TSS to - ACE_TSS_TYPE (TYPE), so that the ACE_TSS_TYPE macro (defined in - OS.h) gets used. (Irfan's suggestion.) - -Mon Nov 10 17:02:40 1997 Douglas C. Schmidt - - * ace/OS.h: Reformatted the #ifdef structure of the - ACE_HAS_XPG4_MULTIBYTE_CHAR to conform to ACE usage. - - * ace/Service_Repository.cpp: The close() method needed a '\n' in - one of the debug messages. Thanks to Steve Coy for reporting - this. - -Mon Nov 10 14:09:24 1997 Steve Huston - - * ace/OS.h, OS.i, README: Added new macro, ACE_HAS_XPG4_MULTIBYTE_CHAR - for platforms which supply wchar.h and wide character functions. - Added the use if it in OS.h, and use the functions in OS.i, - strlen and strcpy with wchar_t arguments. - - * ace/config-hpux-10.x.h, config-aix-4.2.x.h, config-mvs.h, - config-sunos5.5-sunc++-4.x.h: Added ACE_HAS_XPG4_MULTIBYTE_CHAR. - -Mon Nov 10 13:33:02 1997 - - * ace/OS.h (ACE_WRITE_GUARD): Added macros for ACE_WRITE_GUARD and - ACE_READ_GUARD. Thanks to Brian Raven - for suggesting this. - - * tests/Thread_Mutex_Test.cpp: Modified version of Mutex_Test that - exclusively works on a Thread_Mutex. - - * tests/Mutex_Test.cpp: Removed this test. It have been - superseded by Thread_Mutex_Test and Process_Mutex_Test. - - * ace/OS.i (thread_mutex_trylock): Fixed the return value and - errno for this system call such that it is consistent with other - trylock calls. - -Mon Nov 10 10:21:55 1997 David L. Levine - - * ace/INET_Addr.cpp: updated gethostbyname/addr support for - Chorus. Thanks to Wei Chiang for - the patches for this fix. - - * ace/config-chorus.h: disabled ACE_LACKS_SOCKETPAIR. Thanks - to Wei for this fix, also. - - * tests/Thread_Mutex_Test.cpp (test): don't compile this function - if ACE_HAS_THREADS is not defined. - - * tests/IOStream_Test.cpp (main): removed extra % at end of - ACE_ERROR_RETURN message. - - * etc/ace_ld,include/makeinclude/platform_vxworks5.x_g++.GNU: - added ace_ld, a drop-in replacement for ld that supports munching. - We need to munch for VxWorks/g++. - - * ACE-INSTALL.html: updated VxWorks info to mention requirement - for perl with VxWorks/g++. And, LD_LIBRARY_PATH must be set - to find the ACE libraries on the host if using TAO. - -Sun Nov 09 23:29:43 1997 Douglas C. Schmidt - - * ACE version 4.3.42, released Sun Nov 09 23:29:43 1997. - -Sun Nov 09 22:18:30 1997 - - * ace/config-win32-common.h (ACE_HAS_ANSI_CASTS): VC++ compilers - support ANSI style casts. - - * ace/OS.h (ACE_static_cast): Added ANSI style cast macros to ACE. - Thanks to Stephen Coy for suggesting this. - -Sun Nov 9 21:34:16 1997 Douglas C. Schmidt - - * ace/OS: Enhanced ACE_OS so that it *always* defines - implementations for the wchar_t versions of strlen() and - strcpy(), even if the platform doesn't explicitly support - UNICODE. This is necessary since TAO needs these functions. - - * ace/OS.h: Added a typedef for wchar_t to handle the case where - the OS doesn't support UNICODE. - - * ace/ACE.cpp: Added hex character routines from TAO since they - are generally useful. - - * ace/OS.h: Moved the TAO-specific #defines into TAO, where they - belong. Thanks to David Levine and Chris Cleeland for insisting - on this... - -Sun Nov 09 17:55:50 1997 - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp (open): - Removed codes that reset a socket's non-blocking flag. This has - been taken care of by ACE_Acceptor::activate_svc_handler now and - resetting this flag twice on NT caused us grief. Thanks to - Georges Ata for reporting - the bug. - - * ace/ACE.i (hex2byte,nibble2hex): Replaced ACE_INLINE to inline - for these two functions. Functions in this file are always - inlined. - - * ace/config-win32-common.h (ACE_LACKS_RLIMIT): Added this flags - so we don't need to treat ACE_WIN32 specially. - - * ace/OS.i (getrlimit,setrlimit): Removed unnecessary conditional - flag ACE_WIN32. - - * ace/Thread_Manager.cpp (wait): Merged the two blocks within this - function so that we can avoid relase/acquire lock - unnecessarily. Thanks to Doug for his careful scrutiny. - -Sun Nov 09 09:27:24 1997 David L. Levine - - * ace/Thread_manager.cpp (wait): removed unused local, - threads_waited_on. - -Sat Nov 08 23:20:50 1997 Douglas C. Schmidt - - * ACE version 4.3.41, released Sat Nov 08 23:20:50 1997. - -Sat Nov 8 15:46:30 1997 Douglas C. Schmidt - - * ace/INET_Addr.cpp: Enhanced the get_host_name() functions so - that if the sin_addr.s_addr == INADDR_ANY we assume that we're a - server, and we return our "hostname". - - * Added a number of minor fixes for UNIXWARE with G++. Thanks to - Michael Rueger for reporting these. - - * ace/Thread_Manager.h: Both Irix5 and VxWorks have problems with - local typedefs with GCC. Thanks to Laura Paterno - for reporting this. - - * ace/Timer_Queue_Adapters.cpp: Changed some errant uses of lock_ - to mutex_. Thanks to David Levine for reporting this. - - * ace/ACE.cpp: set_handle_limit() was buggy because it never - increased the handle limit. With this change we do not need - special code in ACE_Select_Reactor with ACE_LACKS_RLIMIT because - this is managed in ACE::set_handle_limit. Thanks to Arturo for - this fix. - - * ace/Select_Reactor.cpp (open): We no longer need to - conditionally compile for ACE::set_handle_limit(). Thanks to - Arturo for this fix. - -Fri Nov 7 18:53:13 1997 Sumedh Mungee - - * ace/config-netbsd.h: Added file for NetBSD 1.2G. - - * tests/SOCK_Connector_Test.cpp (fail_no_listener_nonblocking): - Added ECONNREFUSED as a "valid failure", alongwith EWOULDBLOCK. - - * ace/OS.i (msync): msync on NetBSD takes only two parameters as - opposed to the usual three. (It doesnt have the "flags" - parameter.) The ACE_HAS_BROKEN_NETBSD_MSYNC flag works around - that. - -Fri Nov 7 16:04:35 1997 Douglas C. Schmidt - - * ace/Thread_Manager.cpp: Added a missing '>' for one of the - template specializations. Thanks to Torbjorn Lindgren - for reporting this. - - * ace/OS.cpp: ACE_OS::ACE_OS is defined in OS.cpp, which causes - the compiler to complain about multiple definitions. Other - ACE_CLASS_IS_NAMESPACE doesn't have constructors, which is why - they work. Thanks to Torbjorn Lindgren for - reporting this. - -Fri Nov 07 15:14:51 1997 David L. Levine - - * examples/Threads/tss1.cpp: replaced ACE_SYNCH_1 and _2 with - _DECL and _USE. - - * ace/config-linux{,-common}.h: created config-linux-common.h - and moved alpha-specific defines to it. - - * ace/FILE_Addr.cpp (set): explicitly declare int return type. - - * performance-tests/Misc/preempt.cpp (get_options): DEC CXX didn't - like conversion of -1 to u_int, so changed return type to int and - all ACE_ERROR_RETURNs to return -1. - -Fri Nov 07 10:05:12 1997 Douglas C. Schmidt - - * ACE version 4.3.40, released Fri Nov 07 10:05:12 1997. - -Fri Nov 7 09:58:09 1997 Douglas C. Schmidt - - * ace/Connector.cpp (fini): Added a call to - ACE_Map_Manager::close() in fini() since the destructor may not - be called. Thanks to Eric C. Newton for - reporting this. - - * ace/{FILE,SPIPE}_Addr.cpp (set): Added a return value. Thanks - to Marios Zikos for reporting this. - -Fri Nov 07 02:45:55 1997 Douglas C. Schmidt - - * ACE version 4.3.39, released Fri Nov 07 02:45:55 1997. - -Fri Nov 7 01:06:08 1997 Douglas C. Schmidt - - * ace/Message_Queue: Added a new method called deactivated(), - which returns true if the queue has been deactivated. Thanks to - Wei Chiang for reporting this. - - * ace/{config-chorus.h,OS.cpp}: Added a new macro called - ACE_CHORUS_DEFAULT_MIN_STACK_SIZE. Thanks to Wei Chiang - for reporting this. - - * ace/DEV_Addr.cpp, - ace/FILE_Addr.cpp, - ace/SPIPE_Addr.cpp, - ace/INET_Addr.cpp, - ace/UNIX_Addr.cpp: Fixed the set(const Foo &) method so that - it correctly detects cases where we're passed in a - ACE_Addr::sap_any. This is a total hack... - - * ace/{OS.h,Addr.cpp}: Added a new AF_ANY flag, which is set to -1. - -Thu Nov 6 23:05:14 1997 Douglas C. Schmidt - - * Changed the obtusely named ACE_SYNCH_1 and ACE_SYNCH_2 macros to - ACE_SYNCH_DECL and ACE_SYNCH_USE, respectively. Thanks to Mike - Kamrad for suggesting this. - - * ace/Select_Reactor.cpp, ace/ACE.cpp: Broaded the comparison so - that we only try to use {set|get}rlimit() if ACE_LACKS_RLIMIT is - *false*. Thanks to Arturo Montes for - reporting this. - - * ace/Object_Manager: Added support for - get_singleton_lock(ACE_Mutex *). Thanks to Arturo Montes - for reporting this. - - * ace/Connector.cpp: If connect_n() fails make sure to return -1. - Thanks to Stephen Coy for pointing out the - problem. - - * ace/config-sco-5.0.0.h: Removed the ACE_LACKS_RLIMIT flag. - Thanks to Arturo Montes for reporting - this. - - * tests: Changed all uses of "localhost" to - ACE_DEFAULT_SERVER_HOST. This solves some problems with MVS. - Thanks to Chuck Gehr for reporting - this. - - * examples/Timer_Queue: Changed COMMAND to CMD so it won't - conflict with the HP/YUX compiler. Thanks to Sandro Doro - for reporting this. - -Thu Nov 06 22:13:01 1997 - - * examples/Connection/blocking/SPIPE-connector.cpp (init): Fixed - odd looking typecast. - - * ace: Changed the comparison &local_sap == &ACE_Addr::sap_any to - local_sap == ACE_Addr::sap_any. Thanks to Steve Coy - for pointing out that the default - parameter const ACE_Addr &local_sap = ACE_Addr::sap_any will - cause a copy of sap_any to be made and passed to the method, - invalidating the memory address comparison. - - The following files were effected: - - Asynch_Acceptor.cpp - SOCK_Acceptor.cpp - SOCK_CODgram.cpp - SOCK_Dgram.cpp - TLI_Acceptor.cpp - TLI_Connector.cpp - - * ace/Addr.cpp: Made sure that the type and size of - ACE_Addr::sap_any does not match the type and size of any other - Addr type. This is necessary for local_addr==ACE_Addr::sap_any - to return 0 when local_addr is anything other than - ACE_Addr::sap_any. - - * ace/Synch_T.h: Fixed all the ACE_SYNCH_* defines. Thanks to - Matthias Kerkhoff for pointing the - problems. - -Thu Nov 06 18:30:42 1997 Steve Huston - - * ace/Addr.(h i), DEV_Addr.(h i), FILE_Addr.(h i), INET_Addr.(h - cpp), SPIPE_Addr.(h i), UNIX_Addr.(h i): Changed the operators - == and != to be non-virtual, and to accept the 'sap' argument as - its own type (not ACE_Addr for all of them). The - implementations of the operators compare type-specific data - without having to check the inherited type member. Thanks to - Steve Coy and Irfan and Nanbor for a huge - amount of work on these changes. *** NOTE - there is still some - SOCK_Connector problems related to these changes on HP-UX. The - hunt continues. - - * ace/Connector.cpp (connect_n): return -1 if any of the connect - attempts fail. - - * tests/Reactor_Performance_Test.cpp: Don't crash if any of the - client's connect attempts fail. - - * ace/Reactor.h: Added #include "ace/Handle_Set.h" - AIX needs the - class definition when generating templates in programs. - - * tests/Map_Manager_Test.cpp: Don't even try if the compiler doesn't - have template specialization working correctly. - - * tests/Priority_Reactor_Test.h: Added #include "ace/SOCK_Stream.h" - so AIX could generate template code correctly. - - * tests/Reactor_Performance_Test.cpp: Moved class definitions out to - Reactor_Performance_Test.h (new file) to allow AIX to generate - templates. - - * tests/SOCK_Connector_Test.cpp: Added a couple more checks to make - sure the local host is not the test target, and changed from using - port 4242 to 42000 (there is actually a program on AIX which listens - at port 4242). - - * tests/Thread_Manager_Test.cpp: Moved a class definition out to - Thread_Manager_Test.h (new file) to allow AIX to use it in template - generation. - - * tests/Timer_Queue_Test.cpp: Limit the number of iterations to 2000. - -Thu Nov 6 16:51:36 1997 Sumedh Mungee - - * tests/SOCK_Connector_Test.cpp (find_another_host): Added - ACE_NETBSD to the #if define around gethostent. - -Thu Nov 06 00:08:01 1997 Douglas C. Schmidt - - * ACE version 4.3.38, released Thu Nov 06 00:08:01 1997. - -Wed Nov 5 21:32:36 1997 Douglas C. Schmidt - - * ace/Service_Repository.cpp (close): Looking in the - Service_Repository while shutting it down does really bad - things. Some careful changes to the loop in - Service_Repository::close() fixed this. Thanks to Eric - C. Newton for reporting this. - - * Added new support for SCO UNIX with no threads. Thanks to - Arturo Montes for reporting this. - -Wed Nov 05 20:31:36 1997 - - * ace/Connector.cpp (close): Added an explicit close() method for - the Strategy_Connector. This closes down all Strategy_Connector - specific things and then calls close() on the base class. Also - modified the destructor to call this routine. - -Wed Nov 5 17:09:05 1997 Nanbor Wang - - * ace/OS.cpp (cleanup_tss): Rearranged how TSS'es get cleanup on - Win32. This was causing a tiny memory leak on NT. - -Wed Nov 5 15:03:31 1997 Nanbor Wang - - * ace/Thread_Manager.{h,cpp}: Changed the data type of - terminated_thr_queue_ back to - ACE_Unbounded_Queue. - -Wed Nov 05 14:16:27 1997 Steve Huston - - * ace/OS.i (mutex_trylock): Fixed code for ACE_HAS_DCE_DRAFT4_THREADS - (HP-UX) to process the returned status correctly. Thanks to - Robert Head for reporting this. - -Wed Nov 05 13:01:49 1997 David L. Levine - - * ace/ACE.cpp (daemonize): added ACE_UNUSED_ARG (close_all_handles) - if ACE_LACKS_FORK. - -Wed Nov 05 01:06:53 1997 Douglas C. Schmidt - - * ACE version 4.3.37, released Wed Nov 05 01:06:53 1997. - -Tue Nov 04 23:11:41 1997 - - * ace/Thread_Manager.h: Added an ACE_Unbounded_Queue to - collect threads that need to be removed. We can no longer - remove thread descriptors directly from because that - would clobber the integrity of the double-linked list. Changed - the data type of from - ACE_Unbounded_Queue to - ACE_Unbounded_Queue to reduce the codes - generated. - - * ace/Thread_Manager.cpp: Reordered several thread operations so they - won't remove thread descriptor directly while traversing the - . Removed #ifdef from template - instantiation section because now VxWorks needs it too. - - * ace/Container.{h,cpp}: Added more check on validities of passed in - node to ACE_Double_Linked_List::remove_element. Also changed - the function to reset a node's and to prevent - double removal of a node, which messes up the list structure. - - * ace/ace_{dll,lib}.dsp: Excluded Acceptor.cpp from make - explicitly. Moving this file to "template file folder" was not - enough. - -Tue Nov 4 18:03:51 1997 Douglas C. Schmidt - - * ace/config-sco*.h: Added #define ACE_DEFAULT_CLOSE_ALL_FILES 0 - to the SCO Unix config files. - - * ace/ACE.cpp: Added a new macro called - ACE_DEFAULT_CLOSE_ALL_FILES to workaround a bug with SCO Unix. - Thanks to Arturo Montes for reporting - this. - - * The ACE developer's drinking song: - - 100 little bugs in the code, - 100 bugs in the code, - fix one bug, compile it again, - 101 little bugs in the code. - 101 little bugs in the code..... - - Thanks to Steve Huston for appreciating the humor in this ;-). - - * ace/Containers.cpp (insert_head): Added some minor stylistic - fixes. - - * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptor): - Changed - - if (ACE_Reactor::instance ()->register_handler - (&this->acceptor_, ACE_Event_Handler::ACCEPT_MASK) == -1) - - to: - - if (this->acceptor_.open(this->options ().acceptor_port_, - ACE_Reactor::instance (), this->options ().blocking_semantics_) == -1) - - Thanks to Ganesh Pai for reporting this. - - * apps/Gateway/Gateway/Gateway.cpp (parse_args): Changed - - ACE_Get_Opt get_opt (argc, argv, "abC:cdP:pq:t:vw:", 0); - - to: - - ACE_Get_Opt get_opt (argc, argv, "abC:cdP:p:q:t:vw:", 0); - - Thanks to Ganesh Pai for reporting this. - -Tue Nov 4 18:13:52 1997 Sergio Flores - - * examples/Timer_Queue/Async_Timer_Queue_Test.cpp (cancel): - Initialized act pointer variable to 0, which was causing - core dump in linux. In general, all pointers should be - initialized. This should have been warned by the compiler. - Thanks to Sandro Doro for - pointing this out. - -Tue Nov 4 11:14:35 1997 Nanbor Wang - - * ace/Containers.cpp: Fixed some stylistic ambiguities. - -Tue Nov 04 10:12:21 1997 David L. Levine - - * include/makeinclude/platform_hpux.GNU: added +a1 to CFLAGS - to select ANSI C, instead of the default K+R C. This is - required with the current ace/Object_Manager.cpp, because - it initialized autos using aggregates (via the - ACE_STATIC_SVC_DEFINE macro). Thanks to Neil B. Cohen - for helping to sort this out. - - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: changed - another lock () to mutex (). - - * tests/run_tests.vxworks: added MT_SOCK_Test. - -Tue Nov 04 04:13:23 1997 Douglas C. Schmidt - - * ACE version 4.3.36, released Tue Nov 04 04:13:23 1997. - -Tue Nov 04 03:50:57 1997 - - * ace/Addr.i (operator == && operator !=): Comparison of - sap.addr_type_ should be with this->addr_type_ and not with 0. - -Mon Nov 3 23:18:33 1997 Sergio Flores - - * ace/Synch_T.cpp (dump): change the field lock_ to mutex_. - -Mon Nov 3 22:37:58 1997 Nanbor Wang - - * ace/Timer_Wheel_T.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_Hash_T.cpp: Changed the use of lock_ to mutex_. - - * ace/OS.cpp (cleanup_tss): Added TSS cleanup codes for Win32 when - non-main threads are exiting. Without them, Thread_Manager won't - cleanup its thread table correctly. - - * ace/SV_Semaphore_Complex.cpp (close): Changed to return 0 - only when this->key_ == -1 instead of <= -1. This was causing - semaphore leaks on Solaris. - - * ace/UNIX_Addr.i (operator ==): - * ace/SPIPE_Addr.i (operator ==): - * ace/FILE_Addr.i (operator ==): - * ace/DEV_Addr.i (operator ==): - * ace/INET_Addr.cpp (operator ==): Added checking for the same - Addr types for addresses under comparison. Thanks to Stephen - Coy for pointing out the problem. - -Mon Nov 03 18:32:42 1997 Carlos O'Ryan - - * ace/Proactor.cpp: - * ace/Timer_Queue_T.h: - * ace/Timer_Queue_T.cpp: - * ace/Timer_Heap_T.cpp: - * ace/Synch_T.h: - * ace/Synch_T.cpp: - * ace/Atomic_Op.i: - Changed the method name from lock() to mutex(), otherwise the - lame HP/C++ compiler gets completely confused. Also changed the - field from lock_ to mutex_ - -Mon Nov 3 17:15:17 1997 Steve Huston - - * ace/OS.h: Removed "class ace_dewarn_gplusplus;" from the - ACE_CLASS_IS_NAMESPACE macro. Produces warnings on AIX and - shouldn't be needed. - -Mon Nov 3 15:49:18 1997 Chris Cleeland - - * ace/Connector.cpp (connect): "Fixed" so that the service handler - pointer passed in by the caller doesn't change until the connect - completes without errors. - -Mon Nov 03 08:15:21 1997 David L. Levine - - * ace/Managed_Object.[hi] (get_preallocated_{object,array}): - inlined function definitions into the class header so that - it compiles on AIX 4.1 w/ xlC 3.01. Thanks to Bob Lyng - for reporting this problem, - at to Steve H. for testing the fix. - - * include/makeinclude/{platform_linux*.GNU,wrapper_macros.GNU}, - netsvcs/lib/Makefile: suppress -g when compiling ace/Timer_Hash.cpp - and netsvcs/lib/Server_Logging_Handler.cpp on Linux only. - (It really only needs to be suppressed on Linux/Alpha.) - - * apps/Gateway/Gateway: protect instantiation of - ACE_Svc_Handler - with ACE_HAS_THREADS. - - * ace/{Naming_Context.cpp,Service_Config.cpp,Object_Manager.cpp}: - moved ACE_Naming_Service and ACE_Service_Manager static service - objects to ACE_Object_Manager. - - With this change, the ACE library no longer has any static - objects that require destruction. - - * ace/Object_Manager.h: added documenation of - ACE_HAS_NONSTATIC_OBJECT_MANAGER config #define. - - * performance-tests/Misc/preempt.cpp: cleaned up cleanup so that - it compiles cleanly. - -Sun Nov 02 18:09:14 1997 Douglas C. Schmidt - - * ACE version 4.3.35, released Sun Nov 02 18:09:14 1997. - -Sun Nov 2 15:31:45 1997 Douglas C. Schmidt - - * ace/Select_Reactor.i (cancel_timer): Make sure that we don't try - to call cancel() through a NULL this->timer_queue_. Thanks to - Stephen Coy for reporting this. - - * ace/ACE.cpp (set_handle_limit): Fixed a subtle bug that occurs - if the OS doesn't like non-initialized rlimit structs. Thanks - to Stephen Coy for reporting this. - - * examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp (main): - Renamed allocator to my_alloc to work around wonderful STL and - GCC problems... Thanks to Ben Eng for - reporting this. - - * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp: Removed - unused constant SHMSZ. Thanks to Ben Eng for - reporting this. - - * examples/Reactor/Misc/test_time_value.cpp (operator<<): Removed - the "dec" stream manipulator since it isn't portable. Thanks to - Ben Eng for reporting this. - - * performance-tests/Misc/preempt.cpp (main): Cleaned up this test - so it compiles on non-threaded platforms. Thanks to Ben Eng - for reporting this. - - * examples/Timer_Queue/main_*.cpp (main): std::auto_ptr does not - have an operator= that accepts a raw pointer. Therefore, we - must assign raw pointers to an auto_ptr via the constructor. - Thanks to Ben Eng for reporting this. - - * apps/Gateway/Gateway/Proxy_Handler.cpp: Make sure we distinguish - between ACE_NULL_SYNCH and ACE_MT_SYNCH since these will be - different on all platforms, whereas ACE_SYNCH will be the same - as ACE_NULL_SYNCH on platforms without threads. Thanks to Ben - Eng for reporting this. - - * ace: Removed lots of uses of NULL and replaced them with 0. - This works around bugs with lame C++ compilers that treat NULL - as (void *). Thanks to Ben Eng for reporting - this. - - * ace/Thread.i (spawn): Replaced "stack" with "thr_stack" to work - around bugs with lame C++ compilers and STL. Thanks to Evgeny - Beskrovny for reporting this. - -Sat Nov 1 11:55:05 1997 Douglas C. Schmidt - - * ace/config-irix5.3-g++.h, - ace/config-irix5.3-sgic++.h: Removed the ACE_HAS_SYS_SIGLIST - macro since it doesn't seem to be working. Thanks to Laura - Paterno for reporting this. - - * include/makeinclude/platform_chorus.GNU: Tidied up - platform_chorus.GNU a bit. Thanks to Wei Chiang - for this. - -Fri Oct 31 14:35:37 1997 David L. Levine - - * ace/OS.cpp (thr_create): on Chorus, double the stack size to - avoid bad problems. Thanks to Wei Chang - for diagnosting this. - - * ace/Hash_Map_Manager.cpp (unbind_i): set the int_id - reference argument instead of ignoring it. Thanks to - Wei Chang for providing the patch. - - * ace/OS.h,README: wrapped #include of dlfcn.h with - ACE_HAS_DLFCN_H_BROKEN_EXTERN_C to support RedHat 4.2 - Linux 2.0.30/Alpha. - - * ace/OS.i,README: added ACE_HAS_GETRUSAGE_PROTO support, for - platforms that have a getrusage () prototype that is - different from the one in OS.i. - - * ace/config-linux.h: added added some #defines to enable - builds on RedHat 4.2/Linux 2.0.30/Alpha. - - * include/makeinclude/platform-linux.GNU: added -pipe and - bumped optimization level up to -O3. - - * ace/Thread_Manager.cpp (wait_task): no-op if thr_list_ - size is 0. wait_task () can be called under that condition - (after Thread_Manager::wait () has returned) from an - ACE_Stream destructor, through ACE_Module::close () and - ACE_Task_Base.wait (). Without this change, wait_task () - allocated a copy_table array of size 0. Sun C++ leaked - that array, according to Purify. - - * ace/Service_Config.*,Object_Manager.cpp: moved static - ACE_Service_Config::signal_handler_ to Object_Manager. - - * include/makeinclude/rules.local.GNU (show_statics,show_uninit): - added $(TOOLENV) to allow specification of full path to nm. - Thanks to Wei Chiang for this suggestion. - - * include/makeinclude/platform_chorus.GNU: added trailing "/" - to TOOLENV definition, so that it can be empty when not used. - - * ACE-INSTALL.html,include/makeinclude/wrapper_macros.GNU: - added documentation for ACE show_statics and show_uninit targets. - These are only supported with g++. - -Fri Oct 31 00:53:52 1997 - - * The following five changes were suggested by Stephen Coy - . Thanks Stephen. - - * ace/OS.h (ACE_CLASS_IS_NAMESPACE): Changed friend - ace_dewarn_gplusplus to friend class ace_dewarn_gplusplus. - - * ace/Malloc_T.h: Move the #include files to just after the - declaration of the macros, otherwise Containers.cpp will be - #included before the definition of the various allocator macros - (such as ACE_ALLOCATOR_RETURN) have been seen (when - ACE_TEMPLATES_REQUIRE_SOURCE is defined). - - * ace/Hash_Map_Manager.cpp (close_i): Changed &table[i] to - &table_[i]. - - * ace/Containers.h: The ACE_Node destructor needs to be publicly - accessible in order to support the - ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR fix. Unfortunately, - making the template function - ACE_Destructor_Template_For_HPUX_aCC_Only a friend does not seem - to work (although it should). - - * ace/ACE.cpp (ldfind): Changed path_entry from char* to - const char*. - - * tests/Priority_Reactor_Test.cpp (main): Fixed auto_ptr usage. - Thanks to Jack Erickson (jack@pinion.com) for pointing this out. - - * ace/OS.h (ACE_CLASS_IS_NAMESPACE): Changed the macro to not - include the destructor. This causes undefined destructor - problems on Win32. Also added ACE_UNIMPLEMENTED_FUNC macros - around the remain functions. - -Thu Oct 30 21:22:47 1997 David L. Levine - - * ace/Makefile: added auto Svc_Conf_[ly].cpp patches. - - * etc/Svc_Conf_[ly].cpp.diff,README: the ace/Svc_Conf_[ly].cpp - patches, and instructions for updating them. - -Thu Oct 30 19:54:50 1997 Douglas C. Schmidt - - * ACE version 4.3.34, released Thu Oct 30 19:54:50 1997. - -Thu Oct 30 17:49:56 1997 Douglas C. Schmidt - - * tests/Priority_Task_Test.cpp (main): Moved "int status" out of - the #if defined (ACE_HAS_THREADS) so that it will compile when - the platform *doesn't* have threads. - - * ace/Synch_T.i (ACE_TSS): Added a missing ':' that was causing - problems on platforms that lack threads. Thanks to Laura - Paterno for helping to track this - down. - - * ace/Signal.cpp (register_handler): Make sure not to use - SA_SIGINFO if we're running on LynxOS. At some point, we'll - want to generalize this, once enough OS platforms support POSIX - real-time signals. Thanks to Kirill.Rybaltchenko - for reporting this. - - * include/makeinclude/platform_chorus.GNU (CXX): Replaced - DCFLAGS += -g with DCFLAGS += -gstabs+. Thanks to - Wei Chiang for this. - - * ace/OS.cpp: It's not valid to set the NULL_key to anything other - than implicit initialization. In particular, if we set it to -1 - it breaks on pthreads systems... Thanks to Check Gehr for - reporting this. - - * ace/config-irix5.3*++.h: Added ACE_NEEDS_SYSTIME_H. Thanks to - Laura Paterno for reporting the - problem. - - * ace/OS.h: Moved the unistd.h files back down to where - they originally were defined since this was unnecessary. - - * include/makeinclude/platform_chorus.GNU (CXX): Replaced - DCFLAGS += -g with DCFLAGS += -gstabs+. Thanks to - Wei Chiang for this. - -Thu Oct 30 17:41:19 1997 James C Hu - - * ace/OS.h: Stray semi-colon removed from ACE_CLASS_IS_NAMESPACE - macro. - -Thu Oct 30 17:04:52 1997 - - * ace/OS.h (ACE_CLASS_IS_NAMESPACE): Changed the macro to not - include the destructor. This causes undefined destructor - problems on Win32. Also added ACE_UNIMPLEMENTED_FUNC macros - around the remain functions. - -Thu Oct 30 10:50:21 1997 Chris Cleeland - - * ace/OS.h: Added new macro--ACE_CLASS_IS_NAMESPACE ()--to - designate that a class is being used as a pseudo-namespace. It - declares private CTOR, Copy CTOR, and DTOR, as well as a friend - declaration in order to de-warn on g++. Typical usage would be - something like: - - class FooBarNamespace - { - ACE_CLASS_IS_NAMESPACE (FooBarNamespace); - - public: - static ... - }; - - The ACE_OS class has been updated to use this. - - * ace/ACE.h: Updated class ACE to use the new - ACE_CLASS_IS_NAMESPACE (). - - * ace/OS.i (getopt): Changed ACE_LACKS_SOME_POSIX_PROTOTYPES back - to ACE_LACKS_POSIX_PROTOTYPES so that a clean build on Linux is - achievable now. - (msgsnd): Corrected errant spelling from - ACE_LACKS_POSIX_SOME_PROTOTYPES to - ACE_LACKS_SOME_POSIX_PROTOTYPES. - -Thu Oct 30 06:14:58 1997 David L. Levine - - * Makefile,ACE-INSTALL: removed ACE-INSTALL from CVS control. - It will only be created when a release is made in - /project/adaptive/ACE_wrappers, and not put under CVS control. - - * ace/Manager_Object.h: added ACE_INLINE specifier to - get_preallocated_object/array declarations. Thanks to - Torbjorn Lindgren for reporting this. - - * ace/Synch.cpp: removed duplicate - ACE_Write_Guard instantiation. Thanks to - Torbjorn Lindgren for reporting this. - - * tests/Conn_Test.cpp: fixed template instantiation pragmas. - Thanks to Torbjorn Lindgren , again. - - * tests/SPIPE_Test.cpp: replaced ACE_UNUSED_ARG of client and server - with conditional compilation of those functions. Thanks to - Torbjorn Lindgren for snagging this. - - * ace/OS.{h,cpp},Object_Manager.cpp (tss_open,tss_close): removed - tss_open () dynamic allocation option because it wasn't used. - Removed tss_close() because it was a no-op without tss_open () - dynamic allocation. - - * ace/OS.cpp (tss_open): On VxWorks, don't check for 0 tss_base (). - It's not always 0 on program startup, especially if a program - has been previously run by the shell directly, without spawning - a new task to run it. - - * ace/OS.*: added ACE_TSS_EMULATION support for non-scalar - ACE_thread_key_t. Thanks to Chuck Gehr - for motivating this. - - * ace/config-mvs.h: added ACE_HAS_NONSCALAR_THREAD_KEY_T. It - is only used with ACE_HAS_TSS_EMULATION, which currently is - not supported on MVS. - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): cleaned up this function. - -Thu Oct 30 03:25:13 1997 Nanbor Wang - - * ace/Hash_Map_Manager.cpp (close_i): Can't use ACE_DES* - template. Have I been here before? - -Thu Oct 30 03:03:41 1997 Nanbor Wang - - * ace/Hash_Map_Manager.cpp (close_i): Changed to use ACE_DES* macros. - - * ace/OS.h: Moved ACE_Allocator related macros to Malloc_T.h - - * ace/Malloc_T.h: Moved ACE_Allocator related macros from OS.h. - Added two macros ACE_DES_NOFREE and ACE_DES_NOFREE_TEMPLATE to - call objects' destructors explicitly. This is required to - take care of some "broken" compilers. Thanks to Stephen Coy - for providing the fix for HP-UX aCC. - - * ace/README: - * ace/config-hpux-10.x-hpc++.h: Added flag - ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR. - -Thu Oct 30 02:56:25 1997 Douglas C. Schmidt - - * ACE version 4.3.33, released Thu Oct 30 02:56:25 1997. - -Thu Oct 30 01:03:21 1997 Douglas C. Schmidt - - * ace/LOCK_SOCK_Acceptor.cpp: Added a #include of "ace/Synch.h" so - that the Conn_Test.cpp will compile on HP/UX. Thanks to Stephen - Coy for reporting this. - -Wed Oct 29 22:55:15 1997 Nanbor Wang - - * ace/config-vxworks5.x-g++.h: - * ace/config-unixware-2.1.2-g++.h: - * ace/config-unixware-2.01-g++.h: - * ace/config-sunos5.5-g++.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos4-g++.h: - * ace/config-osf1-4.0.h: - * ace/config-osf1-4.0-g++.h: - * ace/config-linux.h: - * ace/config-linux-pthread.h: - * ace/config-linux-lxpthreads.h: - * ace/config-irix6.x-g++.h: - * ace/config-irix5.3-g++.h: - * ace/config-hpux-10.x-g++.h: - * ace/config-gcc-2.7.2.h: - * ace/config-freebsd.h: - * ace/config-freebsd-pthread.h: - * ace/config-chorus.h: - * ace/config-aix-4.1.x.h: - * ace/README: Removed ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR. - It is no longer in use. - -Wed Oct 29 21:12:55 1997 Douglas C. Schmidt - - * ace/README: Added a new macro called ACE_LACKS_SOCKET_BUFSIZ, - which is enabled on VxWorks. - - * ace/OS.h: Added a new macro called - ACE_DEFAULT_MAX_SOCKET_BUFSIZ, which is set to 65536. - - * ace/OS: Changed the tolower() method to to_lower() so that it - won't conflict if there's a macro with the same name. - - * ace/OS.h: #include before ACE_Time_Value as long as - ACE_LACKS_UNISTD_H is false. Added this flag to the VxWorks and - Win32 config.h files. - - * ace/OS.h: Added a special #define for IRIX5, which seems to put - timeval in a strange file... Also, moved this #include to - *before* ACE_Time_Value. Thanks to Carlos O'Ryan for suggesting - this and to Laura Paterno for - reporting the problem in the first place. - - * ace: Changes all uses of the overly long - ACE_LACKS_POSIX_PROTOTYPES_FOR_SOME_FUNCS to - ACE_LACKS_SOME_POSIX_PROTOTYPES. However, I'm not really sure - how this relates to the ACE_LACKS_POSIX_PROTOTYPES macro. I - suspect we probably only need one of these... - - * ace/OS.h: Added a new ACE_HAS_STDARG_THR_DEST to handle - weirdness with LynxOS. Thanks to Kirill.Rybaltchenko - for reporting this. - - * ace: OS.h,config-lynxos.h: Added a new ACE_LACKS_GETOPT_PROTO - for LynxOS. Thanks to Kirill.Rybaltchenko - for reporting this. - - * ace/config-lynxos.h: Replaced - ACE_LACKS_POSIX_PROTO_FOR_SOME_FUNCS with - ACE_LACKS_POSIX_PROTOTYPES_FOR_SOME_FUNCTIONS. Thanks to - Kirill.Rybaltchenko for reporting - this. - -Wed Oct 29 22:17:03 1997 Nanbor Wang - - * ace/config-hpux-10.x-hpc++.h (ACE_HAS_TEMPLATE_SPECIALIZATION): - Moved to C++ section. Restored ACE_TEMPLATE_REQUIRE_SOURCE in - C++ section. Thanks to Stephen Coy for - providing the fix (patiently.) - -Wed Oct 29 20:30:55 1997 James C Hu - - * ace/OS.i (strlen): Moved it earlier so that it would be declared - inline before use. - - * ace/OS.i (strcasecmp): Removed spurious semi-colons (how did - they get in there?). - -Wed Oct 29 18:51:12 1997 Darrell Brunsch - - * ace/OS.{h,i}: Added strcasecmp functionality for NT - -Wed Oct 29 15:56:01 1997 David L. Levine - - * ace/OS.cpp: replaced ACE_TSS_REF_TABLE with a reference count to - remove dynamic allocation from ACE_TSS_Info. Also, enabled call - of ACE_Task close hook before calling TSS destructors. - - * ace/OS.cpp: changed a few TSS 0 keys to ACE_OS::NULL_key. - - * ace/Thread_Manager.cpp (ace_thread_manager_adapter): with - TSS_EMULATION, moved the call of tss_close () from here to - ACE_Thread_Adapter::invoke () so that it can be called after - the task's close hook, if any. - - * ace/{OS.h,Log_Msg.h,Object_Manager.cpp} (cleanup_tss): added - an argument to indicate whether the main thread is calling or not. - - * ace/OS.i (ACE_TSS_Emulation::next_key): start key values at - 0 instead of 1, because it's easier to deal with arrays of - keys then. That also corresponds with the starting key value - on Windows NT. - - * ace/IOStream.h: DEC_CXX #includes now depend on compiler version. - Thanks to James Johnson for providing the fix. - -Wed Oct 29 10:32:16 1997 David L. Levine - - * ace/config-lynxos.h: fixed ACE_LACKS_POSIX_PROTOTYPES_FOR_SOME_FUNCS - and added getopt () declaration. - - * include/makeinclude/platform_lynxos.GNU: updated LIBS. - - Thanks to Kirill Rybaltchenko for - the above fixes. - - * etc/purify.solaris2: added another _thrp_exit UMR. - - * include/makeinclude/wrapper_macros.GNU: added login (LOGNAME) - and compiler (CXX) to Purify/Quantify cache names. - -Wed Oct 29 08:40:38 1997 Douglas C. Schmidt - - * ACE version 4.3.32, released Wed Oct 29 08:40:38 1997. - -Wed Oct 29 07:39:38 1997 Douglas C. Schmidt - - * ace/Synch.cpp: Added an explicit template instantiations for - ACE_Guard. - - * ace/LOCK_SOCK_Acceptor.h: Removed the typedef of - ACE_SOCK_Acceptor with a full expansion of the name to fix a G++ - bug. - - * tests/Conn_Test.cpp: Fixed a template instantiation problem. - - * ACE-INSTALL.html: Pointed out that ACE is ported to LynxOS and - Chorus. - - * ACE-INSTALL.html: Added information about cloning that explains - how you must to build a config.h and platform_macros.GNU in - cloned directory. Thanks to Arturo for this. - - * bin/Makefile: Added - $(ACE_ROOT)/include/makeinclude/platform_macros.GNU to Makefile - so we can compile clone on any ACE platform. Thanks to Arturo - for this. - - * include/makefiles: Added new platform file for SCO UNIX with - nothreads. Thanks to Arturo for this. - - * ace: Added new config files for SCO UNIX with nothreads. - Thanks to Arturo for this. - - * apps/JAWS/server/HTTP_Server.cpp: Fixed the typedef for - ACE_LOCK_SOCK_Acceptor. Thanks to Hans Rohnert for reporting - this. - - * tests/Conn_Test.cpp: Changed template instantiations from - SOCK_ACCEPTOR to LOCK_SOCK_ACCEPTOR. Thanks to Han Rohnert for - reporting this. - -Wed Oct 29 02:10:37 1997 Douglas C. Schmidt - - * ACE version 4.3.31, released Wed Oct 29 02:10:37 1997. - -Wed Oct 29 01:25:54 1997 Douglas C. Schmidt - - * tests/Conn_Test.cpp: Modified Conn_Test to fully integrate - Irfan's new LOCK_SOCK_Acceptor. This new implementation is - truly the "mother of all Conn_Tests" ;-). - - * ace/LOCK_SOCK_Acceptor.cpp (lock): Added a lock() accessor - method to the new ACE_LOCK_SOCK_Acceptor so that we can remove - the lock (somehow). - -Wed Oct 29 00:29:52 1997 - - * apps/JAWS/server: Fixed Win32 related compilation errors. - - * ace/OS.h (SIGUSR1 and SIGUSR2): Added new defines for these two - signals. - - * ace/LOCK_SOCK_Acceptor: New class added to ACE (it was - originally a class in JAWS). It specialize ACE_SOCK_Acceptor to - lock around . This class is particular useful if you - want to have multiple threads accepting on the same endpoint and - the system does not support have thread safe accept. Thanks to - James Hu who initially wrote this class for JAWS. Thanks also - to Johannes Gutleber who decided to - use this in the Conn_Test. - - * tests/Conn_Test.cpp: Updated to use the new LOCK_SOCK_Acceptor. - - * apps/JAWS/server/HTTP_Server.h: Updated to use the new - LOCK_SOCK_Acceptor. - - * apps/JAWS/server/HTTP_Server_T.*: These files are no longer - necessary since this class has been absorbed into ACE. - - * tests: Fixed auto_ptr use in: - - Notify_Performance_Test.cpp - Priority_Reactor_Test.cpp - Reactor_Performance_Test.cpp - - Thanks to Jack Erickson (jack@pinion.com) for pointing this out. - -Tue Oct 28 11:26:39 1997 Nanbor Wang - - * ace/ace_{dll,lib}.dsp: Moved Acceptor.cpp from Source file - folders to Template file folders. Thanks to Satheesh Kumar - for pointing this out. - -Tue Oct 28 05:44:56 1997 David L. Levine - - * ace/OS.cpp (thr_create): use pthread_attr_setprio instead of - *_setsched with DCETHREADS, and check return values of - ACE_OS::thr_[gs]etconcurrency (). Thanks to Stephen Coy - for tracking these problems down. - - * tests/Priority_Task_Test.cpp (svc): removed ACE_ASSERT and - replaced with setting of error flag. This allows the test - to continue and gather more possibly useful information. - - * tests/Conn_Test.cpp: 1) Added template instantiations. - 2) Re-enabled with DEC_CXX. 3) Removed THR_DETACHED flags. - - * include/makeinclude/platform_osf1_4.0.GNU: suppress warnings - about unreachable statments. - - * ACE-INSTALL.html: Conn_Test now runs with DEC_CXX 6.0. - -Tue Oct 28 00:38:58 1997 - - * ace/Strategies_T: - - ACE_Recycling_Strategy - Added new class ACE_Recycling_Strategy. - It defines the interface (and default implementation) for - specifying a recycling strategy for a SVC_HANDLER. This - strategy acts as a consular to the Svc_Handler, preparing it for - the tough times ahead when the Svc_Handler will be recycled. - - ACE_NOOP_Concurrency_Strategy - Added new class - ACE_NOOP_Concurrency_Strategy. It implements a no-op activation - strategy in order to avoid calling open on a recycled - svc_handler multiple times. - - ACE_Cached_Connect_Strategy - Added a ACE_Creation_Strategy, - ACE_Concurrency_Strategy, and ACE_Recycling_Strategy to the - cached connector. This gives it more flexibility than by simply - providing template methods. This is similar to the Strategy - Connector. - - ACE_Cached_Connect_Strategy - Added new template methods for - certain key occasions in the cached connector: make_svc_handler, - activate_svc_handler, assign_recycler, and - prepare_for_recycling. - - * tests/Conn_Test.cpp (client): Updated the tests such that it - uses a null activation strategy. - -Mon Oct 27 22:17:54 1997 Aniruddha Gokhale - - * OS.h: Added the ACE_NESTED_CLASS macro to deal with those - compilers that do not allow a fully scoped type name appearing - inside a scope in which it was defined. - -Mon Oct 27 22:17:32 1997 David L. Levine - - * ace/Thread_Manager.cpp (exit): don't use the cache when finding - the thread ID. The cache is in the ACE_Log_Msg instance, and - it might have been deleted already. - -Mon Oct 27 20:33:07 1997 Douglas C. Schmidt - - * ACE version 4.3.30, released Mon Oct 27 20:33:07 1997. - -Mon Oct 27 18:03:06 1997 Nanbor Wang - - * ACE-INSTALL.html (HREF): Added NT/Alpha to supporting platforms - list. Added hyperlink to ACE newsgroup. Added hyperlink to - FreeBSD homepage. Minor changes to Win32 intstallation guide. - -Mon Oct 27 17:50:16 1997 Douglas C. Schmidt - - * include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU (PRELIB): - Changed PRELIB in platform_sco5.0.0-mit-pthread.GNU, - platform_sco5.0.0-fsu-pthread.GNU to @true, so we can generate - the TAO_IDL compiler. Thanks to Arturo Montes - for reporting this. - -Mon Oct 27 14:26:10 1997 - - * ace/Synch_T (ACE_TSS): When ACE does not have thread specific - storage, ACE_TSS will be a simple pointer holder. Previously, it - had a instance as a member, now it has a pointer to an instance. - - * ace/WFMO_Reactor.cpp (update_state): Fixed a bug in the - WFMO_Reactor. wakeup_all_threads() used to be an internal - method that was called when changes were made to the state of - the reactor. When wakeup_all_threads() became public, there was - no code in place to handle explicit user wakeups. In - particular, the wakeup_all_threads event was never reset. - Thanks to Evgeny Beskrovny for - pointing out this bug. - - * ace/OS.i (ACE_FAIL_RETURN): Added mapping from - ERROR_PATH_NOT_FOUND to ENOENT. Thanks to David Brackman - for suggesting this. - -Mon Oct 27 11:36:39 1997 David L. Levine - - * ace/OS.cpp (exit_cleanup_i): removed protection against recursive - calls. This protection no longer is necessary, because - ACE_TSS_Cleanup () is only called by ACE_Thread_Adapter::invoke (). - It was problematic because it used the ACE_Allocator instance. - - * ace/config-vxworks*.h,README: added ACE_LACKS_FCNTL. - - * ace/OS.i,ACE.cpp: replaced #ifdef VXWORKS with #ifdef - ACE_LACKS_FCNTL. - - * ace/ACE.i (get_flags): return 0 if ACE_LACKS_FCNTL. It would - be better to store ACE's notion of the flags associated with - the handle so that they could be returned, but this works for now. - - * tests/run_tests.vxworks: re-enabled Reactors_Test, because it - works with the ACE_LACKS_FCNTL mods. - - * include/makeinclude/platform_osf1_4.0.GNU: -pthread instead of - -lpthread in LIBS. Thanks to James Johnson for - pointing this out. - - * ACE-INSTALL.html: added info on bin/create_ace_build. - -Mon Oct 27 11:11:33 1997 Nanbor Wang - - * netsvcs/servers/servers.dsp - * netsvcs/lib/netsvcs.dsp: - * tests/*.dsp: - * ace/ace_{dll,lib}.dsp: Added project configurations for Alpha - machines. Configurations are named by adding "Alpha" in front - of the original config names, e.g., "Win32 Alpha Unicode Debug. - -Mon Oct 27 06:40:18 1997 Douglas C. Schmidt - - * include/makeinclude/rules.local.GNU (show_uninit): Added a - missing semi-colon for one of the install rules. Thanks to - Manojkumar Acharya for reporting this. - - * ace/Synch_T.h: Make sure that ACE_Guard::remove() calls - this->lock_->remove() rather than this->lock_->release(). - Thanks to Johannes Gutleber for - reporting this. - -Mon Oct 27 00:20:13 1997 Nanbor Wang - - * ace/config-hpux-10.x-hpc++.h: Added directive - ACE_HAS_TEMPLATE_SPECIALIZATION. Thanks to Stephen Coy - for reporting this. - -Sun Oct 26 22:17:57 1997 Douglas C. Schmidt - - * ACE version 4.3.29, released Sun Oct 26 22:17:57 1997. - -Sun Oct 26 20:03:57 1997 Douglas C. Schmidt - - * ace/IPC_SAP.cpp, - ace/IO_SAP.cpp: Make sure that we don't use fcntl() when - we're compiling on VXWORKS since it's not defined... - - * examples/Connection/non_blocking/CPP-connector.cpp: Changed the - method named idle() to uninitialized() since idle() is now - defined on ACE_Svc_Handler. - - * ace/OS.h: Added the TAO_DEFAULT_SERVER_PORT to OS.h. - - * tests/Conn_Test.cpp (cached_connect): Added a new variable - called "n_client_iterations" to control how many times each - client thread tries to connect with the Cached_Connector. - -Sun Oct 26 16:56:32 1997 Chris Cleeland - - * include/makeinclude/platform_linux_lxpthread.GNU (CFLAGS): Added - -pipe to the compile options. - -Sun Oct 26 11:04:21 1997 David L. Levine - - * ace/Hash_Map_Manager.cpp (unbind): added ACE_UNUSED_ARG (int_id). - - * tests/Conn_Test.cpp (server): added ACE_UNUSED_ARG (options). - And, added template instantations. - - * tests/Conn_Test.cpp (cached_connect): changed type of loop index i - to int to avoid signed/unsigned comparison. - - * ace/Strategies_T.h: added #include of ace/Strategies.h. Thanks to - James Johnson for reporting this. - -Sun Oct 26 10:01:01 1997 Nanbor Wang - - * ace/Connector.cpp (open): The original fix failed to replace - strategies under some circumstances. - - * ace/OS.{h,cpp} (sprintf): Removed ACE_OS::sprintf (wchat_t, char). - It didn't ever work. - - * ace/Connector.cpp (open): Added check if we had previously - allocated various strategies and deleted these objects before - allocating new objects. The original codes caused memory leaks - and possible segmentation faults if it got called twice. We - probably need a do-nothing constructor (the current constructor - calls open.) However, this may break other codes. - -Sun Oct 26 01:00:07 1997 Douglas C. Schmidt - - * ACE version 4.3.28, released Sun Oct 26 01:00:07 1997. - -Sun Oct 26 00:50:00 1997 Douglas C. Schmidt - - * tests/Conn_Test.cpp (close): Since the connect() method on - ACE_Connector closes the svc_handler if failure occurs, we - shouldn't do that again unless we succeed in connecting. - - * ace/OS.h: Moved the CORBA portability macros from - CORBA_Handler.h into OS.h so they will be accessible from TAO. - - * ace/Filecache.cpp (finish): Replaced filename_ with filename() - so that "const correctness" would work with template - specialization. Go figure! - - * TAO/tests/IDL_Cubit/Makefile: Enhanced the "realclean" target to - remove the generated IDL stubs and skeletons. - - * ace/OS.cpp (ace_sysconf_dump): Made a minor change to OS.cpp - to fix some typos. Thanks to Wei Chiang - for reporting this. - -Sun Oct 26 00:06:17 1997 - - * ace/Strategies_T.cpp (~ACE_Cached_Connect_Strategy): Must set - recycler to 0 before calling close, else the svc_handler will - try to purge itself from the cache. - - * tests/Conn_Test.cpp (client): Updated to use the new connection - recycling scheme. - - * ace/Hash_Map_Manager: - - - ACE_Hash_Map_Reverse_Iterator: Added reverse iterator. - - - ACE_Hash_Map_Entry: Added a prev pointer to the entry. Thus - changing the bucket chains into doubly linked lists. Because of - this, it was necessary to change the way the list was being - managed. Sentinels were created for each bucket. - - This also changed (a) the way the iterators worked, (b) made it - easy to delete entries when you have one (this scheme allows the - entries to be easily used as ACTs). - - - New methods (bind, trybind, rebind, find): These methods allow - the users to get access to ACE_Hash_Map_Entry of the node in - question. This allows the user to treat the entry as an ACT and - get access to the key (in case the user is interested in - changing the key). These methods are only valid since the - implementation of Hash_Map_Manager uses linked lists where nodes - are never copied. These methods cannot be added to Map_Manager - since it uses an array of nodes, where the your data may get - copied to another node when the size of the Map_Manager changes. - - * ace/Strategies (ACE_Connection_Recycling_Strategy): Added a new - abstract strategy for recycling connections. - - * ace/Strategies_T: - - - ACE_Cached_Connect_Strategy: ACE_Cached_Connect_Strategy now - implements the ACE_Connection_Recycling_Strategy interface. - This allows Svc_Handlers to cache themselves with - ACE_Cached_Connect_Strategy when they become idle. It also - allows them to purge themselves from the connection cache when - the Svc_Handlers close down. - - Also added ~ACE_Cached_Connect_Strategy that will cleanup up the - connection cache. - - - ACE_Hash_Addr: ACE_Hash_Addr is the key for the hash map used by - ACE_Cached_Connect_Strategy. Previously it kept the Svc_Handler - pointer in the key in order to find out if it was busy or not. - Now the flag has been moved from the Svc_Handler into - the key. The also saves the Hash_Addr from requiring - Svc_Handler as a template parameter. - - Also updated ACE_Hash_Addr::operator== such that if the - Svc_Handler is busy, it does not bother to check compare the - addresses but simply returns false. - - * ace/Svc_Handler.cpp: Added the ability for a Svc_Handler to - recycle itself. idle() can be called when the Svc_Handler is - done serving a particular connection and can how be recycled. - The Svc_Handler now also has a pointer to a recycler that is - responsible for managing the connections. The recycler is - usually a Cached_Connector. - - * ace/Filecache.cpp (ACE_Hash_Map_Entry): Added a new constructor - specialization as the ACE_Hash_Map_Entry now has two - constructors. - - * tests/Hash_Map_Manager_Test.cpp (ACE_Hash_Map_Entry): Added a - new constructor specialization as the ACE_Hash_Map_Entry now has - two constructors. - - * tests/Reactor_Exceptions_Test.cpp (class My_Reactor): Added the - other handle_events method. Thanks to Stephen Coy - (coys@mail.ns.wsa.com.au) for pointing this out. - - * ace/Strategies_T.cpp (hash_i): This default routine is no good. - It uses a complicated scheme that calculate a hash value. - Unfortunately, there is no guarantee that this hash algorithm - will produce the same hash value for the same address. - Therefore, it is better just to return a consistent hash value - rather than an erroneous one. I have choosen 0 of the return - value. Even though this will cause all the entries to be hashed - to the 0 bucket, atleast they will be found. Users should - override this to provide better hashing. - - (compare_i): Memcmp is not the correct default action. - !(b1==b2) is the correct comparison, though this will assume - that the addresses will have a comparison operation. - - * ace/Mem_Map.cpp (close and close_handle): close() is doing too - much. It is closing the handle and unmapping the file. - Changing this method might effect code that depends on this - behavior. Therefore, we create a seperated method - close_handle() that only closes down the handle, and does not - unmap the file. Thanks to Jeff Richards (jrichard@OhioEE.com) - for pointing this out. - - * ace/Strategies_T.cpp (connect_svc_handler): If connect() failed - because of timeouts, we have to reject the connection entirely. - This is necessary since currently there is no way for the - non-blocking connects to complete and for the to - notify the cache of the completion of connect(). Therefore if - errno is EWOULDBLOCK, it is changed to ENOTSUP and -1 is - returned. - -Sat Oct 25 17:41:57 1997 Sergio Flores - - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: - * examples/Timer_Queue/Async_Timer_Queue_Test.cpp: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp: - * examples/Timer_Queue/main_async.cpp: - * examples/Timer_Queue/main_reactor.cpp: - * examples/Timer_Queue/main_thread.cpp: - Added "#pragma instantiate" for template instantiations on - platforms that use pragmas instead, like SGI. - -Sat Oct 25 4:44:00 1997 Carlos O'Ryan - - * Today at 06:44 hours (Santiago, 04:44 St. Louis) Fernanda O'Ryan - has joined the ACE family. She was born 3040 gr in weight and - 50 cm length. She has absolutely no experience in CORBA, C++ or - programming in general. Therefore, she is the ultimate Java - programmer. - -Sat Oct 25 10:13:56 1997 David L. Levine - - * ace/Singleton.h: added comment about best ACE_LOCK types to use. - - * Makefile (TIMESTAMP): replace tab with spaces in ChangeLog entry. - - * tests/Conn_Test.cpp (main): fixed typo, spawn_threads instead of - spawn_thread. Also, protected definitions of spawn_processes () - and spawn_threads () to avoid compiler warnings about unused static - functions. - -Sat Oct 25 01:02:34 1997 Douglas C. Schmidt - - * ACE version 4.3.27, released Sat Oct 25 01:02:34 1997. - -Fri Oct 24 17:39:08 1997 Douglas C. Schmidt - - * ace/ACE.cpp: Changed all the ACE_BIT_ENABLED () == 0 macros to - ACE_BIT_DISABLED() since the logic is clearer. - - * ace/SOCK_Acceptor.cpp (shared_accept): Improved the handling of - timed accepts. The original implementation was prone to race - conditions if there were multiple processes all doing timed - connects on the *same acceptor socket*! That's because select() - and accept() are not performed atomically. Now, we're smarted - about handling this... - - * tests/Conn_Test.cpp: Simplified the shutdown logic, which - appeared to have race conditions. - - * tests/Conn_Test.cpp: Modified this test to spawn off a number of - server processes, all of which will listen for connections on - the same acceptor port. This demonstrates a useful idiom for - writing connection-oriented concurrent server pools. - - * netsvcs/lib/Server_Logging_Handler_T: Fixed this code so that if - we're on an HP/UX that has broken templates we don't use the - Base_Optimizer. Thanks to Per Andersson for providing this fix. - - * ace/Thread_Manager: Added a destructor for ACE_Thread_Descriptor - to keep some compilers happy. Thanks to Chuck Gehr - for reporting this. - - * ace/Task.cpp (ACE_Task_Base_cleanup): Changed - ACE_Task_Base::cleanup (object); - - to: - - ACE_Task_Base::cleanup (object, 0); - - Thanks to Chuck Gehr for reporting - this. - - * ace/Thread_Manager.cpp (find_thread): Fixed another problem with - == being used to compare threads rather than - ACE_OS::thr_equal(). Thanks to Chuck Gehr - for reporting this. - -Fri Oct 24 17:11:14 1997 Sergio Flores - - * Thread_Timer_Queue_Test.cpp (shutdown_timer): added logic to - cancel preemptively or voluntarily, the dispatching thread, - depending on whether the platoform supports pthread_cancel(). - - * Timer_Queue_Adapters.cpp (ACE_Thread_Timer_Queue_Adapter): Added - initialization of flag to 1, active mode. We assume - we start in active mode. Added an internal variable - that stores the thread id of the currently running thread. The - motivation behind this is to be able to cancel this thread - whenever we are shutting down. It is initialized to - ACE_OS::NULL_thread. - - * Timer_Queue_Adapters.cpp (svc): Assign the with the - current running thread ID, using ACE_Thread::self (). - - * Timer_Queue_Adapters.h (ACE_Thread_Timer_Queue_Adapter): Added - default to be - ACE_Thread_Manager::instance() - - * Timer_Queue_Adapters.h (activate): Override the default - method to be able to enforce one thread of execution - per timer queue. Does make much sense to have more than one - managing the timer queue, and like Doug said too many weird - things can happen... - - * Timer_Queue_Adapters.i (thr_id): Added this method to access the - thread ID of this task. - - * Timer_Queue_Adapters.i (activate): Call - ACE_Task_Base::activate() with n_threads = 1 to ensure that a - single thread is spawned. - -Fri Oct 24 10:00:02 1997 Nanbor Wang - - * ace/Thread_Manager.cpp (wait_grp): Fixed a bug. Should wait on - threads with same grp_id, not task. - -Fri Oct 24 09:24:14 1997 David L. Levine - - * ace/Select_Reactor.cpp (open): cast return value of - ACE_::max_handles () to size_t to avoid signed/unsigned comparison. - - * ace/Singleton.cpp,Object_Manager.{h,cpp}: (get_singleton_lock): - dynamically allocate ACE_Thread_Mutex and ACE_RW_Thread_Mutex locks, - so we end up with one lock per ACE_Singleton instantiation. - - * ace/OS.cpp (ACE_TSS_Info, Win32 and VxWorks only): changed type - of ACE_TSS_TABLE from ACE_Unbounded_Stack to fixed-size ACE_Array. - With this change, we avoid some use of ACE_Allocator when - destroying TSS objects. There are two more changes required to - completely remove the ACE_Allocator use. - - * tests/TSS_Test.cpp (worker): added printout of iteration count. - -Fri Oct 24 01:53:58 1997 Douglas C. Schmidt - - * ACE version 4.3.26, released Fri Oct 24 01:53:58 1997. - -Thu Oct 23 19:05:08 1997 Douglas C. Schmidt - - * netsvcs/clients/Naming/Client/Makefile - netsvcs/clients/Naming/Dump_Restore/Makefile - - The lines: - - SHLIB = libClient_Test.so - SHLIB = libDump_Restore.so - - need to be - - SHLIB = libClient_Test.$(SOEXT) - SHLIB = libDump_Restore.$(SOEXT) - - Thanks to Stephen Coy for reporting this. - - * ace/Thread_Manager.cpp (find_hthread): Replaced the call - - if (iter.next ()->thr_handle_ == h_id) - - to - - if (ACE_OS::thr_equal (iter.next ()->thr_handle_, h_id)) - - since the other one isn't portable to Pthreads. Thanks to - Stephen Coy for reporting this. - - * ace/Hash_Map_Manager.cpp: Removed the sentinel in the - Hash_Map_Manager. Sentinels are evil since they require us to - hold write locks, even when we're doing finds! - - * ace/ACE.cpp (max_handles): By default, we now try to use the - getrlimit() function before sysconf() since sysconf() doesn't - work "correctly" for NO _SC_OPEN_MAX (i.e., it just returns the - original value, which might have been changed by setrlimit(). - What a pain... - - * ace/ACE.cpp (max_handles): If FD_SETSIZE is enabled return - this as the number of handles. This isn't perfect, but it's - probably better than returning -1. - - * ace/Select_Reactor.cpp (open): Added a call to - ACE::set_handle_limit() if the requested size for the Reactor is - greater than the current max number of descriptors in the - process. Also check to make sure that the user isn't ask for - more than the FD_SETSIZE. Thanks to Neil Lavelle - for motivating this. - - * ace/Thread_Manager: Changed the name THR_FUNC to - ACE_THR_MEMBER_FUNC since it's now a global typedef on VxWorks - and we don't have to have clashes with other names. - - * ace/Thread_Manager.h: There are mutually incompatible bugs with - VxWorks and MVS. Therefore, we have to conditionally compile - the THR_FUNC differently for these two platforms. Thanks to - Chuck Gehr for reporting this. - - * ace/OS.cpp (thr_create): Added a fix to set the Chorus stack - size correctly. Thanks to Wei Chiang for - reporting this. - - * ace/OS.cpp: Added a new method ace_sysconf_dump() to dump the - state of the configuration. Thanks to Wei Chiang - for reporting this. - - * ace/Singleton.cpp (dump): There was a typo in the dump() method - for ACE_TSS_Singleton, it should be - ACE_TSS_Singleton::instance_i(). I've fixed this. - -Thu Oct 23 23:19:24 1997 James C Hu - - * ace/Filecache.cpp: Removed template method specialization of - shared_find. No longer needed since Hash_Map_Manager has been - changed to no longer rely on sentinel_. - - * ace/Thread_Manager.cpp (various): - Hacked 'til it compiled. (Chased down syntax errors.) - -Thu Oct 23 22:52:17 1997 Sergio Flores - - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp (shutdown_timer): - Added a line to call the cancel method on the timer queue task - when we are shutting down; this is wrapped around #if's to only - include this only when the platformm supports pthread_cancel(). - - * ace/Timer_Queue_Adapters.cpp (svc): Added some POSIX thread - cancellation points to make sure the mutex that the condition - variable uses is unlocked before the thread is cancelled. - - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp (list_timer): - Deleted unnecessary cancellation points. Since we are not - blocking on a condition variable, we don't need to guard the - code. - -Thu Oct 23 22:07:03 1997 Nanbor Wang - - * ace/Thread_Manager.cpp (wait_task,wait_grp): We should also - check for thread creation flags when collection information for - threads belong to this group and don't try to join those threads - created with THR_DETACHED or THR_DAEMON. - -Thu Oct 23 21:22:16 1997 Darrell Brunsch - - * ACE-INSTALL.html: Copied some documentation about makefile flags - from include/makeinclude/wrapper_macros.GNU and added a section - for this. - -Thu Oct 23 20:37:44 1997 David L. Levine - - * ace/Array.*: added ACE_Array_Iterator. - -Thu Oct 23 17:28:11 1997 Chris Cleeland - - * ace/Mem_Map.i (close_filemapping_handle): Moved this above its - uses in the file so that g++ would de-warn. - -Thu Oct 23 15:30:17 1997 Steve Huston - - * ace/Timer_Hash_T.h, Timer_Hash.cpp, Timer_Heap_T.h, Timer_Heap.cpp, - Timer_List_T.h, Timer_List.cpp, Timer_Queue_T.h, Timer_Queue.cpp, - Timer_Wheel_T.h, Timer_Wheel.cpp: Replaced all occurences of - ACE_HPUX_BROKEN_TEMPLATES with ACE_HAS_BROKEN_HPUX_TEMPLATES. - -Wed Oct 22 23:23:29 1997 Nanbor Wang - - * ace/ACE_Library.*, ace_lib.dsp: Made naming convention uniform - for some less used ACE library. They are called: aced.dll, - ace.dll, aceud.dll, aceu.dll, acesd.lib, aces.lib, aceusd.lib - and aceus.lib. If you are using ACE on NT, you know what they - mean. ;-) - -Wed Oct 22 21:22:35 1997 David L. Levine - - * ace/Object_Manager.{h,cpp}: Added support for ACE_RW_Thread_Mutex - ACE_Singleton lock type. Thanks to Nanbor for suggesting this, - because TAO needs it. - - Also, removed at_exit registration of dynamically allocated - ACE_Static_Object_Lock because Object_Manager instance isn't - available for registration when it's created. Instead, handle - this lock as a special case in the Object_Manager destructor. - - * ace/Singleton.cpp,Object_Manager.cpp: check for shutting_down () - as well as starting_up () when deciding whether to use a - preallocated lock. Preallocated locks are not available at those - times. - - * tests/Reactor_Performance_Test.cpp (client): removed declaration - of loop index "i" because it shadowed a local. Also, the loop - index declaration caused a signed/unsigned comparison. - - * ace/Singleton.cpp: temporarily disabled ACE_Guards until - the lock acquistion is fixed. - -Wed Oct 22 17:53:26 1997 Steve Huston - - * ace/SOCK_Connector.cpp: In connect(), changed the - (local != ACE_Addr::sap_any) to be value comparison, - not pointer comparison. Works on compilers which construct - temporaries when a const reference is passed (like HP aC++), and - also when a user passes an ACE_Addr which they construct to look - just like an ACE_Addr::sap_any. Thanks to Stephen Coy - for finding this. - -Wed Oct 22 16:43:25 1997 Chris Cleeland - - * tests/Reactor_Performance_Test.cpp (client): Corrected some code - that wasn't logical (but compiled!) in the connect_n() test. - -Wed Oct 22 13:27:47 1997 Douglas C. Schmidt - - * tests/Reactor_Performance_Test.cpp (client): Revised the - connection portion of this test to use the newly revised - connect_n() method on Connector. - - * ace/Connector.cpp (connect_n): Revised the connect_n() method so - that it keeps track of which connections succeeded and which - failed. - -Wed Oct 22 07:23:21 1997 David L. Levine - - * ace/OS.i (getpgid): fixed (commented) ACE_TRACE identifer. - Thanks to Eric Newton for reporting this. - - * ace/Singleton.{h,cpp},Object_Manager.{h,cpp}: moved - ace_singleton_lock_ to Object_Manager. ace_singleton_lock_ - was a static data member: in addition to the usual troubles - associated with being a static, it was a static member of a - template class. g++ can't handle those, so we used a local - static; initialization of that static was not thread safe. - - The fix relies on knowledge from the Object_Manager about - whether the program is in static construction phase or not. - A critical assumption is that construction of static objects - does not spawn threads. With that assumption, we know that - there is only one (main) thread in the program prior to the - Object_Manager instance being constructed. At that time, - locking is not needed. The ACE_{TSS_}Singleton::instance () - methods rely on the state of the Object_Manager: if it has - not been constructed yet, then they don't guard allocation - of their singleton instance. - - The Object_Manager constructs four locks (of types ACE_Null_Mutex, - ACE_Thread_Mutex, ACE_Recursive_Thread_Mutex, and - ACE_RW_Thread_Mutex) for use only by ACE_Singleton classes. - After the Object_Manager has been constructed, ACE_{TSS_}Singleton - instantiations use one of those locks to guard their allocation of - a new instance, via double-checked locking. - - This change has one impact, then: - ACE_{TSS_}Singleton users are limited to the following types - for their ACE_LOCK instantiation parameters: ACE_Null_Mutex, - ACE_Thread_Mutex, ACE_Recursive_Thread_Mutex, and - ACE_RW_Thread_Mutex. If another type is needed, it can be - easily added to the ACE_Object_Manager: another overloaded - get_singleton_lock () function and preallocated lock would - have to be added. - - As noted in Singleton.h, the best types of ACE_LOCKs to use - for instantiating ACE_Singleton are ACE_Recursive_Thread_Mutex - and ACE_Null_Mutex. - - In addition to the above change, I made these two other - changes: - 1) ACE_Static_Object_Lock::instance (): dynamically allocate - a lock if the Object_Manager has not been constructed yet. - This approach replaces the static lock that was necessary - to allow the static services to be constructed. - - 2) Consolidated the singleton_ access in ACE_TSS_Singleton - via a singleton_i () internal accessor function. Now, - ACE_TSS_Singleton looks just like ACE_Singleton. - - * ACE-INSTALL.html: updated DEC CXX 6.0 build/test status. - - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i - (handle_timeout): convert arg to long if ACE_HAS_64BIT_LONGS. - - * examples/Shared_Malloc/test_malloc.cpp (worker): convert arg to - long if ACE_HAS_64BIT_LONGS. - - * examples/Timer_Queue/Driver.cpp (run_test,parse_commands): - added ACE_NOTREACHED. - - * examples/Logger/simple-server/Logging_Handler.cpp (handle_close): - removed declaration of unused arg "mask". - - * include/makeinclude/rules.local.GNU: added show_statics and - show_uninit targets. They show the statics (that have static - destructor calls) and uninitialized data in the object files - in the current directory. They work best (or at all) on object - files compiled by g++. - -Wed Oct 22 05:04:07 1997 Douglas C. Schmidt - - * ACE version 4.3.25, released Wed Oct 22 05:04:07 1997. - -Tue Oct 21 22:55:36 1997 - - * ace/WFMO_Reactor: Removed ACE_Event_Handler::CLOSE_MASK and the - explicit registration for the closing of sockets from - WFMO_Reactor. This is essentially for compatibility with UNIX - programs. UNIX does not have a CLOSE_MASK and the notification - of the closing of a socket is implicit in the socket becoming - read ready. Therefore when you register for - ACE_Event_Handler::READ_MASK with WFMO_Reactor, you will - register for FD_READ and FD_CLOSE. When FD_CLOSE is triggered, - handle_input() will be called on the Event_Handler. As on UNIX, - read() will return 0 and the programmer will be able to tell - that the socket has actually closed down. - - Arguably, this is lame for Win32 programmers as they have the - explicit close notification, but portability and existing code - base wins in this case. - - One other change. When an event_handler returns -1 from the - callback, unbind() is called with ALL_EVENTS_MASK rather than - the NULL_MASK. - - The upcall routine still needs to threat the two masks - separately. (FD_CLOSE | FD_READ) will not work as both maybe - simultaneously enabled. Therefore handle_input() maybe be called - twice (once for FD_READ and once for FD_CLOSE) unless the user - returns -1 from the first callback. - - * ace/Event_Handler: Removed the CLOSE_MASK. - - * examples/Logger/simple-server/Logging_Handler.cpp: Minor fixes. - - * examples/Logger/Acceptor-server/server_loggerd.cpp: Minor - changes. No need to register the acceptor with the - Reactor. Acceptor::open() does that. - - * examples/Reactor/ReactorEx/test_network_events: Removed the use - of CLOSE_MASK. - - * tests/Reactor_Performance_Test: Removed the use of CLOSE_MASK. - -Tue Oct 21 21:48:54 1997 David L. Levine - - * ace/OS.[hi]: moved ACE_PTHREAD_CLEANUP_PUSH/POP definitions from - OS.i to OS.h. Also, added #ifdef ACE_HAS_PTHREADS protection - before ! defined ACE_LACKS_PTHREAD_CLEANUP so that only PThreads - platforms need add ACE_LACS_PTHREAD_CLEANUP. - - * tests/Notify_Performance_Test.cpp: added #include of - ace/Thread_Manager.h. It's needed on OSF-1. - -Tue Oct 21 21:09:35 1997 Nanbor Wang - - * ace/Memory_Pool.cpp (ACE_MMAP_Memory_Pool): Oops. Souldn't - access options when it is 0. - -Tue Oct 21 12:58:30 1997 Nanbor Wang - - * ace/Log_Msg.{h,cpp}: (thr_desc): Modified the method so it take - an extra argument of type ACE_Thread_Manager* and uses it to - block execution until thread manager release its lock. - - * ace/Thread_Manager.{h,cpp} (acquire_release): Added this new - method whose only function is to grab the thread manager's - lock. This function ensure that a newly spawned thread won't - try to access its thread descriptor before it is fully built. - - * ace/OS.cpp (inherit_log_msg): Modified to cache the thread - descriptor of spawned thread in TSS Log_Msg after it has been - created and block the execution of new thread until thread - manager releases the lock (i.e., fills in all the information.) - - * ace/OS.h (ACE_Thread_Adapter): Added one more argument of type - ACE_Thread_Descriptor* to the constructor with default value 0. - - * ace/OS.cpp (invoke): If the thread descriptor ptr is not zero - in thread arguemnt, then, we'll wait till the thread manger - fills in the formation and cache the value in TSS Log_Meg. - - * ace/Thread_Manager (spawn_i): Changed to pass in the thread - descriptor of the newly spawned thread to thread adapter so it - can cache it in TSS Log_Msg. This must be created before - spawning the thread. If all goes well, we'll need to append the - thread descriptor into the double-linked list in the thread - manager. - (append_thr): Added a new argument of type Thread_Descriptor* - with default value 0. If we pass in a thread descriptor, - append_thr won't try to create on itself. - -Tue Oct 21 21:34:35 1997 Douglas C. Schmidt - - * ACE version 4.3.24, released Tue Oct 21 21:34:35 1997. - -Tue Oct 21 14:14:33 1997 Carlos O'Ryan - - * examples/Timer_Queue/Thread_Timer_Queue_Test.h: - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: - Use the typedef for Upcall to define the base Timer_Queue. - Input_Task inherits from ACE_Task_Base, no need for ACE_Task<> - here. - -Tue Oct 21 13:45:53 1997 Douglas C. Schmidt - - * ace/config-irix6.x-sgic++-nothreads.h: Added ACE_HAS_TERM_IOCTLS - for SGI. Thanks to Jeffrey Peterson - for reporting htis. - - * TAO/tests/Thruput_test/server.cpp (main): Changed BOA_init() - to POA_init(). - -Tue Oct 21 12:58:30 1997 - - * ace/OS.h (ACE_SINGLETON_DECLARATION): - (ACE_SINGLETON_INSTANTIATION): - (ACE_SVC_SINGLETON_DECLARATION): - (ACE_SVC_SINGLETON_INSTANTIATION): Added these new macros. Each - of them takes one argument which is the ACE_Singleton class. - All these craps are needed because MSVCs very kindly instantiate - the template codes for you. This ends up producing two - ACE_Singleton objects, one in DLL and one in user program. What - these macros do is to supress the template code instantiation in - user program and force compilers to instantiate these codes in - DLL. On other platforms, these macros simply expand to empty - strings. Here is a simple use case. Say we have a class - called which we want to make it a singleton using - ACE_Singleton template in our own DLL. In file , add - a line like this, - - ACE_SVC_SINGLETON_DECLARATION (ACE_Singleton); - - and it will be expanded to suitabe code to export the class or - supress another template instantiation outside DLL depending on - whether ACE_BUILD_SVC_DLL is defined or not. In file - , add a line, - - ACE_SVC_SINGLETON_INSTANTIATION (ACE_Singleton); - - at the end of the file to instantiate the template object in - DLL. Notice that there is a bug in MSVC 4.2 and you'll have to - write up a DEF file to export the template interface - explicitly. - - These macros should be integrated with the case when - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION but because of the VC - 4.2's bug, it will cause too much trouble to export all these - symbols for external access. Therefore, I'll leave them as they - are now. - - BTW, these is no templatized singleton object within ACE that - needs to be exported at this moment. - -Tue Oct 21 07:14:24 1997 David L. Levine - - * ace/Svc_Conf_l.cpp: fixed compile warnings on g++. - - * ace/Timer_{Heap,List,Wheel}_T.cpp: replaced NULL with 0 because - some compilers, such as GHS, define NULL as (void *) 0. So, it - sometimes needs to be cast to be used. Thanks to Brian Mendel - for reporting this. - - * ace/Thread_Manager.cpp (wait): removed thr_yield () hack because - it's not needed with Nanbor's Thread_Manager fix. - - * tests/test_config.h (ACE_END_TEST): removed sleep hack with - threading because it's not needed with Nanbor's Thread_Manager fix. - - * include/makeinclude/platform_vxworks*.GNU: added VXWORKS=1 macro, - for use by individual Makefiles to suppress VxWorks builds. - - * examples/System_V_IPC: suppress VxWorks builds because the builds - fail, and the examples wouldn't run anyways. - - * netsvcs/lib/TS_Server_Handler.cpp: only instantiate - ACE_Svc_Handler if ! ACE_HAS_TLI - because without TLI, the instantiation is in - Client_Logging_Handler.cpp. - - * examples/Shared_Malloc/test_persistence.cpp: added #include of - iostream.h with ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. - - * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: removed - instantiation of ACE_TSS because it is in - ace/Thread_Manager.cpp. - -Tue Oct 21 02:23:26 1997 Douglas C. Schmidt - - * ACE version 4.3.23, released Tue Oct 21 02:23:26 1997. - -Tue Oct 21 02:18:56 1997 Douglas C. Schmidt - - * examples/Makefile: Things are happier now, so we've added back - the Timer_Queue directory to the Makefile. - - * examples/Timer_Queue: Added lots of annoying template - specializations so that the timer queue tests now work with GCC. - - * ace/Svc_Conf.l: Changed the regular expression for a - {string} so that it maches the null string (i.e., ""). - -Tue Oct 21 01:07:58 1997 Sergio Flores - - * examples/Timer_Queue: - Added documentation and fixed some warnings from the unused - arguments in some member functions. Cleaned up some .h files of - unnecessary template instantiations. - -Tue Oct 21 01:01:12 1997 Nanbor Wang - - * ace/Thread_Manager.h: Added more comments. - - * ace/Thread_Manager.{h,cpp}: Added a parameter to - Thread_Manager's constructor with default value 0. This - parameter is currently unused and put in for backward - compatibility. - (open): Putting back this method for backward compatibility. - This is currently a no-op. Thanks to David for reporting this. - Also modify some mis-inform comments. - -Mon Oct 20 22:34:46 1997 - - * ace/OS.i (open): Moved Win32 specific errno mappings from open() - to ACE_FAIL_RETURN. Also updated the wide-character version of - open(). - -Mon Oct 20 14:07:37 1997 Douglas C. Schmidt - - * ace/config-hpux-10.x.h: Added #define ACE_DEFAULT_BASE_ADDR - ((char *) 0x80000000) so that the various mmap() tests - will work on HP/UX. Thanks to Stephen Coy - for reporting this. - - * ace/OS.i: Fixed the implementation of ACE_OS::cond_timedwait() - so that it will work on VxWorks. Thanks to David Levine for - chasing this down and doing most of the changes. - - * ace/OS.h: Added a new special case for _KCC so that its - ACE_UNUSED_ARG will work properly. Thanks to Torbjorn Lindgren - for reporting this. - -Mon Oct 20 22:23:42 1997 Nanbor Wang - - * tests/Sigset_Ops_Test.cpp (main): It is not legal too for - sigismember to return 0 if we pass an invalid signal to it. - Thanks to Stephen Coy for fixing this. - - * Thread_Manager.*: Replace the thr_table_ with a double-linked - list thr_list_. With this change, we can cache the thread - descriptor entries in TSS area. Then, when accessing thread - descriptor from a spawned thread's context, we don't have to - search thru the whole list in order to find the corresponding - thread descriptor. Double-linked list and caching also make - adding/removing thread descriptor entries very fast. At this - moment, we need to do a linear search when we try to access the - cached pointer the first time. This overhead is expected to - removed shortly. The will be some memory leaks at this moment - because I haven't implemented the code to clean up the list when - a thread manager gets deleted. Will fix it soon. - - * Log_Msg.{h,cpp}: Removed thr_state methods, variable, and thr_id - methods and variable and replace them with thr_desc which cache - the pointer to the thread descriptor structure. - - * Containers.*: Added two new template classes - ACE_Double_Linked_List and ACE_Double_Linked_List_Iterator. - These two classes implement the very fundamental data structure - of double-linked list. Although this is not actually a - container class, I couldn't find a better place to put these - classes. - - * ace/Filecache.* - * ace/FIFO.* - * ace/FIFO_Send.* - * ace/FIFO_Recv.* - * ace/FIFO_Send_Msg.* - * ace/FIFO_Recv_Msg.* - * ace/Memory_Pool.* (ACE_MMAP_Memory_Pool_Options, - ACE_MMAP_Memory_Pool): Added one member variable to these class - so users can specify the LPSECURITY_ATTRIBUTES object they want - to use with them. - (map_file, init_inquire): Pass the security attribute to - underlying memory map object. - - * ace/Mem_Map.* (ACE_Mem_Map, map, open, map_it): Added a new - function parameter LPSECURITY_ATTRIBUTES. It will be passed - down to ACE_OS::mmap or ACE_OS::open. This is only used on - Win32. - -Mon Oct 20 08:48:28 1997 Steve Huston - - * ace/OS.h, config-hpux-10.x.h: Added a new definition, - ACE_HAS_TIUSER_H_BROKEN_EXTERN_C - HP-UX's tiuser.h has - def for t_errno/_terrno() outside of an extern "C" block, - so in this case, wrap #include in our own - extern "C" block. HP support call W3711856. - -Mon Oct 20 07:49:54 1997 David L. Levine - - * Makefile (TIMESTAMP): moved chmod after cvs commit. - - * include/makeinclude/platform_sunos{4,5}_sunc++*.GNU: don't - create Templates.DB/Modules.DB, because that should have been - Module.DB, and it's not needed anyways. - - * ace/config-vxworks-ghs-1.8.h: removed ACE_HAS_VERBOSE_NOTSUP. - - * tests/run_tests.vxworks: re-enabled Buffer_Stream_Test now that - ACE_OS::cond_timedwait () is supported on VxWorks. - - * examples/IPC_SAP/TLI_SAP/ftp-server.cpp (main): removed call - to ACE_Thread_Manager::open () because it no longer is available. - -Mon Oct 20 02:04:19 1997 Douglas C. Schmidt - - * ACE version 4.3.22, released Mon Oct 20 02:04:19 1997. - -Mon Oct 20 02:01:43 1997 Douglas C. Schmidt - - * examples/Makefile: Removed the Timer_Queue directory from the - Makefile until Sergio has fixed all the examples for GCC. - -Sun Oct 19 21:15:10 1997 Sergio Flores - - * examples/Timer_Queue: Added a new testing framework for - various types of ACE_Time_Queue usecases, e.g., threaded, - reactive, and asynchronous. - The new classes are: - which factors out the common code for - different type of Timer queue implementations, for example the parsing, - the input reading, and leaves the implementation of display_menu() for - example, to subclasses. - the asynchronous version of the timer - queue, uses signals. - implements the reactive timer queue - test driver using - the threaded implementation of the - timer queue. - this class is used to specify operations on the timer queue - independently of their implementation. Thsi allows different - implementations of the timer queue to have different ways of - doing the operations without the base class having to know that. - See the Command pattern. - Added some helper functions into the class. - - -Sun Oct 19 18:07:31 1997 Douglas C. Schmidt - - * ace: Added new config files for SCO OpenServer with a new initial scheme - to make config files: - - - The config to SCO OpenServer has been changed to separate OS - specific flags, threads and compiler flags. - - - For SCO OpenServer the base config file is config-sco-5.0.0.h - - - Pthreads base files are config-fsu-pthread.h and - config-mit-pthread for FSU and MIT pthreads. - - - The compiler file has been named config-gcc-2.7.2.h, this is - base config file for GNU gcc 2.7.2 - - To build a config file for SCO using GNU gcc 2.7.2 would be: - - #include "ace/config-gcc-2.7.2.h" - #include "ace/config-sco-5.0.0.h" - - We would obtain ACE config file for SCO OpenServer with GNU gcc - 2.7.2 with no threads. To build a config file for SCO using GNU - gcc 2.7.2 with FSU pthread would be: - - #include "ace/config-gcc-2.7.2.h" - #include "ace/config-sco-5.0.0.h" - #include "ace/config-fsu-pthread.h" - - Thanks to Arturo Montes for these - changes. - - * ace/OS.i (open): Modified ACE_OS::open() so that it sets errno - to EACCES when the requested file is in use. Thanks to Edan - Ayal for reporting this. - -Sun Oct 19 17:55:34 1997 David L. Levine - - * etc/purify.solaris2: the contents of my ~/.purify file - for Solaris 2.x. The ACE tests purify cleanly with it. - -Sun Oct 19 13:49:17 1997 Carlos O'Ryan - - * ace/Proactor.cpp: - The mutex vs lock name change strikes back, this time under NT. - - * tests/Conn_Test.h: - * tests/Conn_Test.cpp: - The Svc_Handler was cached, but it had the default - handle_close() method, which destroys the object. The new - version leaks a bit of memory, but it seems that it never - crashes. - -Sat Oct 18 09:13:29 1997 Douglas C. Schmidt - - * ace/Synch_T.cpp (lock): Moved the frigging lock method of - Atomic_Op into the *.cpp file to work around bugs with earlier - versions of the horribleHP/UX C++ compiler. Thanks to Neil - Cohen for reporting this. - -Sat Oct 18 07:43:29 1997 David L. Levine - - * Makefile (release): oops, removed "echo" that was used to - disable CVS commit, for testing. - - * ace/Thread_Manager.{h,cpp},Object_Manager.{h,cpp}: moved - ace_thread_exit_lock_ to Object_Manager. - - * include/makeinclude/rules.local.GNU: added $(TEMPLATE_REPOSITORY) - to OBJDIRS, so that individual platforms can add template - repository directories for creation. - - * include/makeinclude/platform_sunos{4,5}_sunc++*.GNU: added - TEMPLATE_REPOSITORY with Templates.DB and Templates.DB/Modules.DB. - We can build without any warnings with Sun C++ now. - -Sat Oct 18 00:17:26 1997 Douglas C. Schmidt - - * ACE version 4.3.21, released Sat Oct 18 00:17:26 1997. - -Fri Oct 17 22:51:46 1997 Carlos O'Ryan - - * ace/Timer_Queue_Adapters.h: - * ace/Timer_Queue_Adapters.i: - * ace/Timer_Queue_Adapters.cpp: - * ace/Timer_Queue_T.h: - * ace/Timer_Queue_T.i: - * ace/Timer_Queue_T.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_Wheel_T.cpp: - * ace/Timer_Hash_T.cpp: - Changed the accessor name for the lock_ field from mutex() to - lock(), we know this can cause trouble on HP-UX, but only if the - function is inline; so it was moved to the .cpp file. - - * ace/Timer_Queue_Adapters.h: - * ace/Timer_Queue_Adapters.i: - Changed the method name from lock() to mutex(), this should - workaround a bug in the HP/C++ compiler. - - * ace/Timer_Hash.cpp: - * ace/Timer_Hash_T.h: - * ace/Timer_Heap.cpp: - * ace/Timer_Heap_T.h: - * ace/Timer_List.cpp: - * ace/Timer_List_T.h: - * ace/Timer_Queue.cpp: - * ace/Timer_Queue_T.h: - * ace/Timer_Wheel.cpp: - * ace/Timer_Wheel_T.h: - Workaround HP/C++ compiler bug, we cannot include the .cpp file - from the header file, but it must be included in the point of - instantiation. - -Fri Oct 17 18:34:00 1997 Douglas C. Schmidt - - * ace/Atomic_Op.i (lock): Added an accessor to ACE_Atomic_Op to - return a reference to the underlying lock. Thanks to Janusz - Stopa for suggesting this. - -Fri Oct 17 15:36:26 1997 - - * ACE/config-win32-common.h: Added a directive to disable warning - of using Microsoft template instantiation control extension. - -Fri Oct 17 06:31:20 1997 David L. Levine - - * ace/Atomic_Op.i (operator=): rsh.value () instead of just rhs. - - * Makefile (release): added ACE_VERSION string to ace/Version.h. - The MS Resource-Compiler doesn't implement the preprocessor - # operator, so ACE_VERSION supplies the concatenated version - string. Thanks to Matthias for suggesting this. - - * ace/Svc_Handler.{h,cpp},Object_Manager.{h,cpp}: moved - ace_svc_handler_lock_ to Object_Manager. This lock was - created once per Svc_Handler instantiation. It has been - replaced by a single lock for all instantiations. That - shouldn't be a problem because there are so few Svc_Handler - instantiations, and the lock is only used for singleton - creation using double-checked locking. - -Fri Oct 17 01:19:35 1997 Douglas C. Schmidt - - * ACE version 4.3.20, released Fri Oct 17 01:19:35 1997. - -Fri Oct 17 00:05:55 1997 - - * ace/OS: Added ACE_Export to declarations to: - ace_mutex_lock_cleanup_adapter, ftruncate, ace_thread_adapter - - * ace/OS.cpp (readv, writev): Moved ACE_Export directive from - OS.cpp to OS.i. - - * ace/Atomic_Op (operator TYPE): operator TYPE() of Atomic_Op has - been deprecated and removed. Because both user-defined - conversions and user-defined operators were defined on - Atomic_Op, it was possible to get ambiguities between the - user-defined operators and the built-in operators. Therefore, - operator TYPE() has been removed and explicit accessor value() - has been added. Thanks to Stephen Coy for - suggesting this. - - * ace/Atomic_Op (operator!=): Add new operator. - - * tests/Atomic_Op_Test.cpp: Previously we had foo.operator== (5). - It was necessary to resolve the ambiguities between the - user-defined operators and the built-in operators. Since we have - removed the automagic type conversion, we can go back to writing - foo == 5. - - * ACE: Atomic Op related minor changes: - - ace/Malloc.cpp (dump): - tests/Future_Test.cpp (main): - tests/Reactors_Test.cpp (handle_input): - example/Threads/{future1.cpp future2.cpp manual_event.cpp task_two.cpp tss2.cpp}: - examples/Reactor/Misc/test_reactors.cpp: - - * tests/Notify_Performance_Test.cpp: - * tests/Reactor_Performance_Test.cpp: - - Moved explicit template instantiation code to ACE_HAS_THREADS - part for the test. Thanks to Stephen Coy - for pointing this out. - -Thu Oct 16 20:44:40 1997 James C Hu - - * ace/Message_Block.cpp: Changed how continuations are released in - the Message_Block::release_i() method to use an iteration rather - than recursion. This is to avoid a stack overflow problem - encountered by Janusz Stopa. - - * ace/OS.cpp: Added ACE_Export to the declarations of ::writev and - ::readv. These are emulation implementations for systems that - don't support them natively. Was not being resolved correctly - on NT. Hopefully this will fix it. Fix suggested by Rob Head - (rhead@virtc.com). - -Thu Oct 16 14:21:34 1997 Nanbor Wang - - * ace/Proactor.cpp: Replaced #include "ace/Servie_Config.h" with - #include "ace/Object_Manager.h" for declaration of - ACE_Static_Object_Lock. - -Thu Oct 16 10:22:48 1997 Carlos O'Ryan - - * ace/Timer_Heap_T.h: - Fixed comment on the Heap_Iterator, it said "Iterates over an - "). - -Thu Oct 16 08:43:50 1997 David L. Levine - - * ace/OS.i (sema_trywait): on VxWorks only, fixed to set errno to - EBUSY if the semaphore couldn't be taken. Thanks to Doug for - suggesting this fix. - - * performance-tests/Misc/preempt.cpp (main): fixed program name. - - * include/makeinclude/platform_osf1_4.0.GNU: OCFLAGS instead of OFLAGS. - - * tests/test_config.h (VxWorks): restored the removal of the log - file, because it again appears to be necessary. - - * tests/run_tests.vxworks: updated VxWorks tests status. - - * ace/OS.cpp,Token_Invariants.{h,cpp},Object_Manager.{h,cpp}: - moved ace_os_monitor_lock and ACE_Token_Invariants_Creation_Lock - to Object_Manager. - -Thu Oct 16 02:26:12 1997 Douglas C. Schmidt - - * ACE version 4.3.19, released Thu Oct 16 02:26:12 1997. - -Thu Oct 16 02:07:54 1997 Douglas C. Schmidt - - * tests/Priority_Reactor_Test.cpp: Added a "max_retries" flag to - keep the test from hanging forever... Thanks to Stephen Coy - for motivating this. - - * tests/Priority_Reactor_Test.h: Changed - - class Read_Handler : public ACE_Svc_Handler< - - to - - class Read_Handler : public ACE_Svc_Handler< - - and the same for the Write_Handler. Thanks to the ever vigilant - Stephen Coy for reporting this. - -Thu Oct 16 01:18:48 1997 Nanbor Wang - - * ace/OS.cpp (socket_init): Changed to use ACE_UNUSED_ARG. - - * ace/SV_Semaphore_Simple.cpp (name_2_key): Explicitly cast the - return value to (key_t). It was causing problem on Win32. - -Wed Oct 15 22:47:30 1997 Carlos O'Ryan - - * ace/ACE.h: - * ace/ACE.cpp: - Added an implementation of the ISO 8802-3 standard 32 bits CRC, - but for strings only. The implementation was taken from the - FreeBSD code. - - * ace/SV_Semaphore_Simple.cpp: Improved the hashing algorithm to - assign a "unique" key for semaphore keys using an string. This - solves a problem detected by Mark L. Boriack - (Mark.L.Boriack@cpmx.saic.com): under OSF/1 the were too many - collitions with the default arguments for ACE_Process_Mutex. - Note that this is only a problem if no name is given to it. - - * ace/Log_Msg.cpp: ACE_Log_Msg_message_queue_ was not initialized - in platforms without threads. - - * ace/Containers.h: Added a duplicate ACE_Ubounded_Stack_Iterator - to the NANBOR_EXP_CHANGES block. - - * ace/OS.h (ACE_DES_FREE_TEMPLATE): Removed unneeded concatenation - that was getting the HP/aCC compiler a bit confused. Thanks to - Stephen Coy for pointing out the problem - and then reminding me of actually adding the solution to ACE. - -Wed Oct 15 11:07:47 1997 Douglas C. Schmidt - - * ace/OS.i: Fixed the flock_trywrlock() and flock_tryrdlock() so - that they both set errno = EBUSY if they lock is already held. - - * ace/OS.i (mutex_trylock): Make the VxWorks version consistent - with the other versions by returning -1 and setting errno to - EBUSY. Thanks to David Levine for reporting this. - - * ace/Synch.h: Updated the documentation to clarify what the - return value is from the tryacquire() methods. - - * ace/OS.i (mutex_trylock): On NT, if we try to acquire a mutex - that's already locked we'll return -1 and set errno to EBUSY - rather than ETIME to be consistent with Pthreads. Please see - the following entry to understand why this doesn't break - existing code ;-). - - * ace/OS.h: Added a #define for EBUSY on NT. We'll make it the - same as ETIME to avoid breaking existing code! - - * tests/Process_Strategy_Test.cpp (main): Ignore SIGCHLD in the - child. - -Wed Oct 15 14:59:41 1997 - - * tests/run_tests.bat: Added Reactor_Performance_Test and - Notify_Performance_Test to one button test script. - - * tests/tests.dsw: Added Reactor_Performance_Test.dsp and - Notify_Performance_Test.dsp. - -Wed Oct 15 07:21:05 1997 David L. Levine - - * ace/ACE.{h,i},Version.h: added ACE version macros, and static - functions to access them in class ACE. - - * Makefile (release): updates ace/Version.h based on contents of - VERSION. - - * tests/Time_Value_Test.cpp: added test of ACE version accessors. - - * ace/OS.cpp,Object_Manager.cpp: changed ACE_TSS_CLEANUP_LOCK - from an ACE_Thread_Mutex to an ACE_Recursive_Thread_Mutex. - - * ace/OS.h: define ACE_NOTREACHED as empty on DEC_CXX (and - on ghs instead of VXWORKS). - - * tests/TSS_Test.cpp (worker): convert void *c to long if - ACE_HAS_64BIT_LONGS to avoid DEC cxx compiler warning. - - * examples/Threads/thread_specific.cpp (worker): convert void *c - to long if ACE_HAS_64BIT_LONGS. Changed name of "lock" to - "printf_lock" to avoid collision with lock () in DEC cxx - iostream.hxx. - - * examples/threads/tss1.cpp: removed unused static "lock". - - * examples/IPC_SAP/TLI_SAP/ftp-server.cpp (read_file): convert - void *fd to long if ACE_HAS_64BIT_LONGS. And, put "n" in - ACE_UNUSED_ARG. (main): put "return 0" in ACE_NOTREACHED. - - * include/makeinclude/platform_osf1_4.0.GNU: minor cleanup, incl. - addition of -use_ld_input to SOFLAGS. - - * include/makeinclude/platform_osf1_4.0_g++.GNU: added "c" to - ARFLAGS. - - * tests/Future_Test.cpp,examples/Threads/future[12].cpp - (Method_Object_Name): removed extraneous ";" after function - definition. - - * netsvcs/lib/Base_Optimizer.h: adding missing, default "public" - access specifier. - - * apps/JAWS/Server/HTTP_Config.h: added "class" to friend HTTP_Config - declaration in HTTP_Config_Info. - - * examples/IPC_SAP/TLI_SAP/ftp-client.cpp: removed unused variable - "MAXLINE". - - * examples/IPC_SAP/TLI_SAP/db-server.cpp (main): wrapped "return 0" - with ACE_NOTREACHED. - - * examples/Reactor/Misc/test_timer_queue.cpp (handle_timeout): - convert void *arg to long if ACE_HAS_64BIT_LONGS. - - * examples/Service_Configurator/IPC-tests/client/ - local_fifo_client_test.cpp: removed unused variable BUF_LEN. - - * examples/Shared_Malloc/test_persistence.cpp: - removed unused Employee ostream << operator. - - * tests/Conn_Test.cpp: neutered Conn_Test on DEC_CXX. It - doesn't build on DEC cxx 5.5 due to apparent template - instantiation problems. Thanks to James Johnson for - reporting that. And it doesn't terminate when built with - DEC cxx (beta) 6.0. - - * ace/Thread_Manager.h: removed parens from (???) because - g++ got upset about encountering a trigraph. - - * tests/{Notify,Reactor}_Performance_Test.cpp: added - ACE_UNUSED_ARG (handle). - - * tests/Makefile,run_tests.sh: added Reactor_Performance_Test and - Notify_Performance_Test. - - * tests/run_tests.vxworks: added test status of - Reactor_Performance_Test (doesn't appear to do anything, - but doesn't return) and Notify_Performance_Test (fcntl - not supported). - -Wed Oct 15 01:48:36 1997 Nanbor Wang - - * ace/Containers.{h,i,cpp}: - * ace/Thread_Manager.{h,i,cpp}: Start modifying these files. - Will work on them for a day or two. You guys shouldn't worry - about these changes affecting anything because I surround my - changes with #ifdef (NANBOR_EXP_CHANGES) my changes #else - original codes #endif. More details change log will be added - once I get them all working. - -Tue Oct 14 23:54:21 1997 Douglas C. Schmidt - - * ACE version 4.3.18, released Tue Oct 14 23:54:21 1997. - -Tue Oct 14 20:27:28 1997 Carlos O'Ryan - - * tests/Priority_Reactor_Test.cpp: - Added a debug message to find out who terminates the reactor - thread. - - * tests/Priority_Reactor_Test.cpp: - The children could not connect sometimes, this will cause the - test to hang, waiting for those failed connections. - I added a simple exponential backoff strategy to retry - connections until they succeed. - -Tue Oct 14 17:48:28 1997 Steve Huston - - * ace/config-hpux-10.x-hpc++.h: Set ACE_LACKS_SIGNED_CHAR for - both C++ and aC++, not just C++. Thanks to Stephen Coy and - David Levine for finding this. - -Tue Oct 14 03:26:17 1997 Douglas C. Schmidt - - * ace/OS.h: Moved to earlier in the file so that - u_int will be defined. Thanks to Neil B. Cohen - for reporting this. - - * ace/OS.cpp (uname): Added a workaround for the fact that - Chorus doesn't support uname(). Thanks to Wei Chiang for - this fix. - -Tue Oct 14 08:02:20 1997 David L. Levine - - * ace/Managed_Object.{h,cpp} (ACE_Cleanup_Adapter): added virtual - destructor, needed by some compilers for vtable placement. - Thanks to Stephen Coy for this patch. - - * ace/Svc_Conf_y.cpp: commented out unused args and wrapped - assignments in "if" conditionals to avoid g++ warnings. - - * ace/Object_Manager.{h,cpp},Synch.{h,cpp}: moved - ACE_Static_Object_Lock from Synch.{h,cpp} to Object_Manager.{h,cpp}. - This allows it to be absorbed into the ACE_Object_Manager's - preallocated locks. The ACE_Static_Object_Lock interface - isn't really needed any more, but has been kept for backward - compatibility. - - * ace/Object_Manager.cpp: use a static ACE_Static_Object_Lock, - temporarily, because the ACE static services needs it. - - * ace/Malloc.cpp,Reactor.cpp,Service_Repository.cpp: added - #include "ace/Object_Manager.h" for ACE_Static_Object_Lock. - - * ace/Thread_Manager.h: moved ACE_Thread_Manager::THR_FUNC typedef - outside the class declaration to avoid compilation problems on - g++/VxWorks/i960 with -g. THR_FUNC is only used by protected - ACE_Thread_Manager methods so this doesn't widen the public - interface. Thanks to Aaron Valdivia for - reporting this and verifying the fix. - - * tests/IOStream_Test.cpp (client): multiply floats by 1.0 instead - of 1 to avoid bad code generation on g++/VxWorks/i960. Thanks to - Aaron Valdivia for reporting this. - - * tests/Buffer_Stream_Test.cpp: removed unused static thread_manager. - It caused core dump during destruction of static objects with - ACE_HAS_NONSTATIC_OBJECT_MANAGER. - - * examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp (handle_timeout): - removed declaration of unused arg "tv". - - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp (main): - removed declarations of unused args "argc" and "argv". And, - updated template instantiations. - - * ace/OS.h: use "complex" ACE_UNUSED_ARG for DEC_CXX. - - * ace/Reactor.i (implementation): moved definition to top of - file to prevent use before definition. - - * ace/ARGV.cpp (ACE_ARGV): removed extraneous ; function definition. - - * ace/config-osf1-4.0.h: removed ACE_NEEDS_DEV_IO_CONVERSION. - - * tests/Time_Value_Test.cpp: ACE_HAS_64BIT_LONGS instead of - ACE_HAS_64BIT_LONG. - -Tue Oct 14 03:13:38 1997 Douglas C. Schmidt - - * ACE version 4.3.17, released Tue Oct 14 03:13:38 1997. - -Tue Oct 14 03:10:00 1997 Douglas C. Schmidt - - * ace/Service_Types.cpp (fini): Backed out the following change - until we figure out how to keep existing Svc_Handler code from - dying... Thanks to Nanbor for reporting this. - - * ace/Service_Types.cpp: Changed the implementation so that we - bypass the default cleanup originally done in - ACE_Service_Type_Impl::fini() and instead perform the cleanup in - ACE_Service_Object_Type::fini (void). Thanks to Alex Chan - for reporting this. - - * ace/Svc_Conf.y: Make sure that the Module has the same name as - the Module_Type object from the svc.conf file. We need to do - this because the Stream_Type::fini() method removes each module - by the name given in the configuration file (stored in the - Module_Type object). But the Stream::remove() method compares - this name against the name stored in the Module. So the object - is deleted, but never removed from the list. Another traversal - of the list causes a crash... Thanks to Eric Newton for - suggesting this fix. - - * ace/OS.cpp (invoke): Added call to AfxEndThread insides - ACE_TSS_Cleanup::exit() such that the same cleanup would not be - executed again when threads exit in ace_thread_adapter() in - OS.cpp. Thanks to Alex Chan for - reporting this. - - * ace/Service_Config.cpp (process_directives): Avoid reporting - lex/yacc leakage since there is nothing we could do about it. - Thanks to Alex Chan for reporting this. - - * ace/Svc_Conf.y: Removed duplicate call to symbol() to avoid the - problem that dynamic service objects are created twice. Thanks - to Alex Chan for reporting this. - - * examples/Reactor/FIFO/client.cpp (main): Fixed the call to - fifo_sender.send () so that it passes msg rather than &msg. - Thanks to Sandro Doro for reporting this. - -Tue Oct 14 02:49:02 1997 - - * tests/Notify_Performance_Test.cpp: New performance test. This - test is used to time the notification mechanisms of the - ACE_Reactors. Both the WFMO_Reactor and Select_Reactor can be - tested. The notify() mechanism can also be tested with or - without data. - - * tests/Reactor_Performance_Test.cpp: New performance test. This - test is used to time the dispatching mechanisms of the - ACE_Reactors. Both the WFMO_Reactor and Select_Reactor can be - tested. - - * ace/Svc_Handler.cpp (shutdown): Change READ_MASK | WRITE_MASK to - ALL_EVENTS_MASK. - - * ace/Atomic_Op (value): Added an explicit value accessor. - -Mon Oct 13 23:07:15 1997 Douglas C. Schmidt - - * tests/Process_Strategy_Test.cpp (handle_signal): Removed the - ACE_DEBUG calls in the child reader signal handler. This was - causing all sorts of random problems due to the asynchronous - nature of signals. Thanks to David Levine for pointing this - out. - -Mon Oct 13 16:27:46 1997 Carlos O'Ryan - - * tests/Priority_Reactor_Test.h: - * tests/Priority_Reactor_Test.cpp: - Fixed wrong header file, thanks to Irfan (irfan@cs.wustl.edu) - - * examples/Shared_Malloc/test_persistence.cpp: - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: - Added a couple of ACE_NOTREACHED, thanks to Torbjorn Lindgren - for pointing out this one. - - * ace/Priority_Reactor.cpp: - Added some more template specializations. - - * tests/Priority_Reactor_Test.cpp: - Fixed a number of bugs: hostname not initialized when creating - the server address. - The Svc_Handler base class should be instantiated using the - ACE_*_STREAM macros. - The code for non-threaded platforms was broken. - Thanks to Irfan - - * tests/Priority_Task_Test.cpp: - We use the new ACE_Sched_Priority_Iterator. - - * include/makeinclude/platform_irix6.x-32_sgic++.GNU: - * include/makeinclude/platform_irix6.x-n32_sgic++.GNU: - Removed this old config files, they have been superseeded by - platform_irix6.x_sgic++.GNU. - -Mon Oct 13 15:41:32 1997 Steve Huston - - * ace/Select_Reactor.i, Priority_Reactor.i: Moved code for the - ACE_Event_Tuple struct from Priority_Reactor.i to Select_Reactor.i. - - * ace/Priority_Reactor.cpp: added #include Malloc_T.h to build on AIX. - - * ace/Synch_T.h, Timer_Queue_Adapters.h - added a template argument - to the non-ACE_HAS_TEMPLATE_TYPEDEFS, multi-threaded version of - the ACE_SYNCH_CONDITION macro - of the 3 possibilities for its - definition, this is the only case which requires a template - argument. Timer_Queue_Adapters.h is the only user of the definition, - and it was changed to not supply the template argument. - - * tests/Conn_Test.h: - * tests/Process_Strategy_Test.h: Added #include "ace/SOCK_Stream.h" - -Mon Oct 13 13:42:05 1997 Nanbor Wang - - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp (svc): - Added a macro to define L_cuserid on Win32. - -Mon Oct 13 13:44:40 1997 - - * ace/Priority_Reactor: Fixed a gross violation of ACE coding - standard. Changed bucket to bucket_. - -Mon Oct 13 12:58:01 1997 David L. Levine - - * ace/OS.i: moved ACE_OS::strcasecmp () definition after - ACE_OS::strlen () to prevent use before definition. - - * ace/Priority_Reactor.i: reordered initializers to match - declaration order. - - * ace/Sched_Params.i: reordered function definitions to prevent - uses before definitions. - - * ace/Thread_Manager.cpp (ACE_Thread_Descriptor ctor): reordered - initializers to match declaration order. (spawn_i): added - ACE_UNUSED_ARG (t_handle) without WTHREADS. - - * ace/Thread_Manager.cpp (wait): moved all of the "join" block - inside the #ifndef VXWORKS so that it compiles on VxWorks. - - * ace/Strategies_T.cpp (ACE_NOOP_Creation_Strategy:: - make_svc_handler): removed unused arg declaration to avoid - compiler warning. - - * ace/Svc_Conf_y.cpp: commented out unused args and wrapped - assignments in "if" conditionals to avoid g++ warnings. - - * tests/Priority_Reactor_Test.cpp (handle_input): added - ACE_UNUSED_ARG (h). - - * examples/Connection/non_blocking/CPP-connector.cpp (handle_signal): - added ACE_UNUSED_ARG (signum). - -Mon Oct 13 03:25:45 1997 Douglas C. Schmidt - - * ACE version 4.3.16, released Mon Oct 13 03:25:45 1997. - -Mon Oct 13 03:18:33 1997 Douglas C. Schmidt - - * ace/Thread_Manager.h: Removed the following code from - ACE_Thread_Control: - - #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - static ACE_Thread_Mutex ace_thread_lock_; - // Lock the creation of the Singleton. - #endif /* defined (ACE_MT_SAFE) */ - - What on earth was this doing here?! Thanks to Stephen Coy - for reporting this. - -Mon Oct 13 00:10:00 1997 - - * tests/Atomic_Op_Test.cpp (main): Changed "foo == 5L" to - "foo.operator== (5L)" because the former was breaking some - compilers (e.g., HP/UX aCC). - - * ace/Connector.h (open): Removed the defaults arguments since - some compilers complain about the two open()s being - indistinguishable. - -Sun Oct 12 23:51:57 1997 Douglas C. Schmidt - - * ace/{Synch_T,Atomic_Op}: All the relational operators should - return int (really return bool) rather than TYPE. - -Sun Oct 12 18:41:01 1997 Carlos O'Ryan - - * tests/Priority_Reactor_Test.cpp: - Added several missing template specializations. - - * ace/Priority_Reactor.cpp: - Fixed typo (#pragme for #pragma). - Added several missing template instantiation. - - * ace/Timer_Queue_Adapters.cpp: - The includes were missing and there was a minor syntax error. - -Sun Oct 12 16:16:15 1997 Nanbor Wang - - * ace/ace_{dll,lib}.dsp: Added Timer_Queue_Adapters.cpp into - project files. - - * tests: Added a new test Priority_Reactor_Test. - - * ace/Timer_Queue_Adapters.{h,i}: Added or moved the line that - instructs edit mode to use on emace to the first line. Also - added ACE_Export to classes in this file. - - * ace/Timer_Queue_Adapters.cpp: Added proper inclusion of the - header file. Corrected a syntax error. - - * examples/Timer_Queue/Timer_Queue.dsw: Added a new project - Thread_Timer_Queue_Test.dsp. - - * tests/run_tests.{bat,sh}: Added MT_SOCK_Test and - Priority_Reactor_Test into one-buttoned test set. - -Sun Oct 12 16:53:32 1997 Douglas C. Schmidt - - * ace/examples/Service_Configurator/IPC-tests/server: Reformatted - and recommented the code a bit. - - * ace/OS: Added 3 new ACE #defines: - - #define ACE_ONE_SECOND_IN_MSECS 1000L - #define ACE_ONE_SECOND_IN_USECS 1000000L - #define ACE_ONE_SECOND_IN_NSECS 1000000000L - - This is much easier to read than trying to keep track of the - 000s! Then, replaced all uses of the original values with the - new symbolic constants. - - * ace/Timer_List.cpp: Removed an explicit template instantiation - of ACE_Async_Timer_Queue_Adapter<>. Why was it here in the - first place? - - * ace: Created a new group of Timer_Queue_Adapters files and moved - the Async and Thread adapters into this file. This reduces the - amount of coupling in the ACE library and removes problems with - circular includes. - - * ace/Timer_Queue_T: Added a new ACE_Thread_Timer_Queue_Adapter, - which makes it possible to use a timer queue in a thread - automagically. Thanks to Carlos O'Ryan for writing this. - - * examples/Timer_Queue: Began to integrate Carlo's new thread - timer queue test. - - * examples/Timer_Queue/Async_Timer_Queue_Test.cpp: Changed the - timer queue from a Timer_List to a Timer_Heap. - - * examples/Makefile (DIRS): Added Timer_Queue to the list of DIRS - to build. - -Sun Oct 12 16:45:47 1997 Carlos O'Ryan - - * ace/Sched_Params.h: - Added some comments. - - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: - Added some comments and template specializations. - - * examples/Naming/Makefile: - There is no need to set LDLIBS to add local object files - anymore, using FILES is enough. - -Sun Oct 12 03:35:37 1997 Nanbor Wang - - * examples/Timer_Queue: Added a new directory for testing of - various usages of timer queue. - - * tests/Async_Timer_Queue_Test: Moved to examples/Timer_Queue. - It doesn't really belong to tests/ directory. - - * ace/ACE.cpp (register_stdin_handler): Must register the reactor - we are using to the event handler. - (read_adapter): Must notify the reactor when we are done with - handling stdin event. - -Sun Oct 12 00:26:56 1997 Carlos O'Ryan - - * ace/Makefile: - * ace/Priority_Reactor.h: - * ace/Priority_Reactor.i: - * ace/Priority_Reactor.cpp: - Augmentes Select_Reactor, adding priority based dispatching for - the I/O Event_Handlers, the only feature supported is - dispatching in the order defined by the priorities. - Each Event_Handler defines its priority, if the priority is out - of range the culprit is "punished" by dispatching at the lowest - priority. - Care has been exercised to avoid dynamic memory allocation. - - * tests/Makefile: - * tests/Priority_Reactor_Test.h: - * tests/Priority_Reactor_Test.cpp: - Added small tests of the Priority_Reactor, the test runs an - Acceptor on the main thread and creates several threads (or - processes if the plaform does not support threads) that connect - to this Acceptor. The writing threads send several short - messages, the main thread receives them using one Svc_Handler - per writer, dispatched at different priorities. - The test itself is interesting, it shows how to write very - simple Svc_Handler, Connectors and Acceptors. - - * ace/Select_Reactor.h: - * ace/Select_Reactor.cpp: - The dispatching of all the handles in a "group" (READ, WRITE or - EXCEPT) was encapsulated in a single routine. - - * ace/Malloc_T.cpp: - In the Cached_Allocator memory was allocated as an arrays of - char, it must be released the same way. - - * ace/Sched_Params.h: - * ace/Sched_Params.i: - Added a new class (ACE_Sched_Priority_Iterator) to iterate over - the priorities. - - * tests/Priority_Task_Test.cpp: - Added some comments. - -Sat Oct 10 16:23:49 1997 Steve Huston - - * tests/SOCK_Connector_Test.cpp: Passes the test if the should-fail - non-blocking test fails for any reason - not limited to ECONNREFUSED - or ENOTCONN. - -Sat Oct 11 16:02:33 1997 Douglas C. Schmidt - - * ACE version 4.3.15, released Sat Oct 11 16:02:33 1997. - -Sat Oct 11 14:38:16 1997 Douglas C. Schmidt - - * ace/SOCK_Connector.cpp (complete): Fixed a typo with - ACE_NON_BLOCKING_BUG_DELAY. Thanks to John Zeb Dhom" - for reporting this. - - * tests/MT_SOCK_Test.cpp (client): Slightly revised the client - function so that it doesn't try to use non-blocking connects if - it's on a Win32 platform that has bugs with non-blocking - connects. - - * ace/SOCK_Connector.cpp: It appears that connect() can set the - ETIMEDOUT errno if the connection times out (whatever that - means). Therefore, I need to check for that errno, rather than - ETIME after calling connect(). - - * tests/SOCK_Connector_Test.cpp: Added a check for ETIMEDOUT - since this appears to be set by some platforms (e.g., - SGI). - -Sat Oct 11 02:52:10 1997 Douglas C. Schmidt - - * ACE version 4.3.14, released Sat Oct 11 02:52:10 1997. - -Sat Oct 11 02:10:29 1997 Carlos O'Ryan - - * examples/Logger/simple-server/Makefile: - * examples/Mem_Map/IO-tests/Makefile: - * examples/Reactor/Multicast/Makefile: - * examples/Service_Configurator/Misc/Makefile: - Fixed some more problems with the Makefiles for binaries; I took - the chance and added RCS ids on the Makefiles - -Fri Oct 10 18:39:39 1997 Douglas C. Schmidt - - * tests/Service_Config_Test.cpp: Moved the static member function - called cleanup() out into a stand-alone extern "C" function - called test_singleton_cleanup() to workaround MVS C++ compiler - bugs. Thanks to Chuck Gehr for reporting this. - - * ace/Task.cpp: Solved the age old MVS C++ problem where we can't - register C++ static member functions as C callback functions. - The solution here was to create a C wrapper to do the callback. - Thanks to Chuck Gehr for reporting this. - - * tests/Service_Config_Test.cpp: Made the destructor of - Test_Singleton public to work around bugs with the MVS C++ - compiler. Thanks to Chuck Gehr for reporting this. - - * ace/ACE, - ace/Proactor, - ace/SOCK_Connector, - ace/SPIPE_Connector, - ace/Acceptor, - tests/Conn_Test: Changed ETIMEDOUT errno to ETIME errno to be - consistent throughout ACE. There should be no uses of - ETIMEDOUT in ACE or the test apps and examples. - - * ace/ACE.cpp (handle_timed_complete): Only assume that we've - timed out if the return value from select() == 0 *and* the - timeout value isn't NULL... - - * ace/Object_Manager.h: Replaced the use of ACE_MT() in the header - file with a #ifdef. This solves problems that arise when ACE_MT - is defined as "nothing" when MT_SAFE is not defined. As a code - which has "ACE_MT();" becomes just ";" and fail to compile. - Thanks to Avraham Nash for reporting - this. - -Fri Oct 10 19:55:50 1997 Carlos O'Ryan - - * examples/ASX/CCM_App/Makefile: - * include/makeinclude/rules.bin.GNU: - I have re-applied Steve Huston changes from Oct 01, the change - was (IMHO) useful and made compilation cleaner. - - * examples/ASX/Event_Server/Event_Server/Makefile: - Fixed problem that made compilation fail. - -Fri Oct 10 19:52:44 1997 - - * ace/OS.h: - * ace/Connector.cpp: - * ace/SOCK_Connector.cpp: Added new #define - ACE_NON_BLOCKING_BUG_DELAY and replace their uses from some - magic numbers to this constant. - -Fri Oct 10 19:27:28 1997 Steve Huston - - * include/makeinclude/rules.bin.GNU - examples/ASX/CCM_App/Makefile - Removed the changes to these files added Oct 01. - -Fri Oct 10 15:21:07 1997 - - * examples/Connection/non_blocking/CPP-connector.cpp - (disconnecting): Remove this method. It was not being used. Also - rewrote some parts of handle_close to make the code simple. - - * ace/Connector.cpp (create_AST): The register_handler() method - now needs to explicitly be given the handle to wait on. This is - because the get_handle() method of Connector has been - depricated. - - * examples/Connection/non_blocking/test_sock_connector.cpp (main): - Since this test waits on the STDIN handle to become ready, we - have to make sure that the WFMO_Reactor is used on Win32. This - is necessary since select() on NT does not support waiting on - STDIN. - - * examples/Connection/non_blocking/CPP-connector.cpp (open): On - Win32, the std handle must be registered directly (and not as a - socket). On non-Win32, the std handle must be registered as a - normal handle with the READ mask. Since on Win32, STDIN is used - directly as an waitable handle, handle_signal will be called - instead of handle_input. Therefore, we had to add handle_signal - to the event_handler. - -Fri Oct 10 15:16:47 1997 Nanbor Wang - - * ace/WFMO_Reactor.{h,cpp}: - * ace/Select_Reactor.{h,cpp}: - * ace/Reactor_Impl.h: - * ace/Reactor.h: Added 2 new functions in ACE_Reactor class so we - can replace the signal handler and timer queue the reactor is - using. Notice that you should do this before you start the - reactor, otherwise, you may loose your scheduled timed events. - -Fri Oct 10 14:49:40 1997 Douglas C. Schmidt - - * bin/man2html: Added a new set rul -e 's/^$/

    /g', which - correctly preserves paragraph boundaries. Regenerated all of - the ACE html documentation so that it is much better formatted. - -Fri Oct 10 11:08:02 1997 Carlos O'Ryan - - * tests/run_tests.sh: - We remove the log file before running a test, we also check for - the log file existance before running run_test.check on - it. Thanks to Dean Clamons for - helping us with this. - - * tests/run_tests.check: - IRIX egrep does not support -q, we redirect the output the - /dev/null instead. - -Fri Oct 10 01:46:07 1997 Douglas C. Schmidt - - * ACE version 4.3.13, released Fri Oct 10 01:46:07 1997. - -Thu Oct 9 22:23:56 1997 Douglas C. Schmidt - - * ace/Thread_Manager.cpp: Moved the explicit template - instantiations for ACE_Unbounded_Queue out of the complicated - #ifdef since we also want this to compile even if we don't have - threads. - - * tests/MT_SOCK_Test.cpp: Revised the code so that it uses - processes on UNIX rather than threads. - - * tests/SOCK_Test.cpp (spawn): Cleaned up the code to make it - correct. - - * ace/Get_Opt.cpp (ACE_Get_Opt): Changed the third argument to the - ACE_Get_Opt constructor be changed from `char *' to `const char - *'. Thanks to Eric Newton for suggesting this. - -Thu Oct 09 18:43:14 1997 - - * ace/Strategies_T.cpp (connect_svc_handler): Added - synchronization to the method as the setting of the in_use bit - in the service handler must be done atomically with the finding - and binding of the service handler in the cache. - - * tests/Conn_Test.cpp (client_connections): Added multithreading - to the test in order to test out the new MT features of the - Connector. - - * ace/OS.cpp (invoke): Somehow there was a bug introduced in - ACE_Thread_Adapter::invoke where the user entry point was being - called twice! - -Thu Oct 09 17:54:31 1997 Douglas C. Schmidt - - * ACE version 4.3.12, released Thu Oct 09 17:54:31 1997. - -Thu Oct 9 17:46:59 1997 Carlos O'Ryan - - * ace/Thread_Manager.cpp: - Added explicit instantiation of - ACE_Unbounded_Queue_Iterator, it seems to - be needed on Linux and other platforms; thanks to Huiying Shen - for pointing out this one. - - * ace/OS.h: - * ace/OS.i: - Reverted the change that added support for - pthread_setconcurrency on IRIX, the function was supposed to be - undocumented, but present on the libraries, I could not find it - in any of the SGI machines we have access to. - - * ace/Thread_Manager.cpp: - On IRIX/SGIC++ we need to instantiate ACE_Node too. - - * ace/SOCK.h: - Moved the open() method to the public interface, it is used by - ACE_SOCK_Connector. - -Wed Oct 8 20:01:35 1997 Douglas C. Schmidt - - * ace/SOCK_Connector: Modified the ACE_SOCK_Connector so that it - doesn't maintain state and doesn't inherit from ACE_SOCK. - Therefore, we can have multiple threads using the same - ACE_SOCK_Connector simultaneously without any reentrancy - problems. - - * ace/SOCK.h: Moved the open() method into the public part of the - class so it can be used in ACE_SOCK_Connector::connect(). - - * ace/Connector.h: Removed the this->connector_ from the - ACE_Connector class in order to make this pattern work correctly - with multi-threaded programs. Also removed the connector() - accessor (which was never useful anyway). - - * ace/SOCK.cpp (open): Explicitly test setsockopt() for -1 in case - of failure. - - * tests/SOCK_Test.cpp (server): Revised this test to reflect the - fact that it doesn't iterate, but only runs one client and one - server. - - * tests: Added a new test for multi-threaded sockets called - MT_SOCK_Test.cpp. Thanks to Bob Laferriere - for motivating this test. - -Wed Oct 8 12:09:46 1997 Nanbor Wang - - * ace/OS.i (strcasecmp): Oops, we forgot to compare the strlen - first. Thanks to Murphy Ivan for - fixing the bug. - - * ace/OS.h: Added THR_DAEMON macro definition for Win32 (et. al.?) - to avoid compilation error. - Removed ACE_HAS_BROKEN_TEMPLATE_DESTRUCTOR and related macros. - -Wed Oct 8 09:52:20 1997 Carlos O'Ryan - - * ace/Parse_Node.cpp: - Fixed the minor syntax error *again*. - -Tue Oct 7 17:10:51 1997 Carlos O'Ryan - - * ace/Token_Manager.cpp: - Added a defined(ACE_MT_SAFE) protection around the lock creation - on ACE_Token_Manager::instance(), otherwise it would not work on - platforms without threads. Thanks to "Neil B. Cohen" - for pointing this one out. - -Tue Oct 7 07:07:45 1997 Douglas C. Schmidt - - * ace/Parse_Node.cpp (symbol): Added an ACE_ERROR_RETURN instead - of an ACE_RETURN to bail out if an error occurs. Thanks to Eric - Newton for reporting this. - -Tue Oct 7 10:57:48 1997 Carlos O'Ryan - - * ace/OS.h: - Added a prototype for pthread_setconcurrency when - ACE_HAS_IRIX62_THREADS is defined. This function is undocumented - but was needed by some users. - - * ace/Parse_Node.cpp: - Fixed a minor syntax error. - -Tue Oct 07 06:58:40 1997 Douglas C. Schmidt - - * ACE version 4.3.11, released Tue Oct 07 06:58:40 1997. - -Tue Oct 7 02:51:55 1997 Nanbor Wang - - * tests/TSS_Test.cpp (main): - * tests/Task_Test.cpp (main): - * tests/Barrier_Test.cpp (main): Removed thread_handles[] since we - don't need to join the thread explicitly anymore. - - * ace/Thread_Manager.{h,cpp}: Added an ACE_Unbounded_Quque to - collect terminated threads so that we can later join the threads - automatically by issuing a ACE_Thread_Manager::wait(). Some - typos are also fixed. Next step will be to replace current - thr_table_ with a hash table and store an index to this table - in TSS. - -Mon Oct 6 22:16:45 1997 Douglas C. Schmidt - - * ace/Thread_Manager: Added a new task() method to - ACE_Thread_Manager that returns a pointer to the current - ACE_Task_Base we're executing in if this thread is indeed - running in an ACE_Task_Base, else return 0. Thanks to Ari Erev - and John Neystadt for suggesting this. - - * ace/Thread_Manager: Moved the task_ pointer from the public part - of the ACE_Thread_Descriptor class into the private part of the - class and added an inline accessor instead. - - * ace/{Parse_Node.{h,cpp},Svc_Conf.y}: Added support to enable - dynamically allocate objects from factory functions that have - been pre-registered with the Service Configurator instead of - relying on dynamic loading. The new config file syntax would be - (note the colons): - - dynamic joe Service_Object * : make_queue() active - dynamic bob Service_Object * : make_queue() active - - Functions are found in the list of statically defined functions - for static services. Thanks to Eric C. Newton - for this fix. - -Mon Oct 6 13:00:19 1997 Carlos O'Ryan - - * ace/CORBA_Handler.cpp: Removed the use of reactor_ in the .cpp - file too; we are using the ACE_Event_Handler reactor_ (which is - a base class). - -Sat Oct 04 17:40:30 1997 Douglas C. Schmidt - - * ACE version 4.3.10, released Sat Oct 04 17:40:30 1997. - -Sat Oct 4 11:57:25 1997 Douglas C. Schmidt - - * apps/Orbix-Examples/Event_Comm/{Supplier,Consumer}/Makefile: - Changed a typo where /src/ was being used instead of /libsrc/. - Thanks to Jean-Marc STRAUSS for reporting - this. - - * examples/Connection/non_blocking/CPP-connector.cpp (init): - Removed the initialization of the local address. This is - error-prone and confusing to use. Thanks to Huiying Shen - for reporting this. - - * ace/SV_Semaphore_Simple: Added support for IPC_EXCL in order to - determine, upon creating the semaphore, if it already exists - (which means a bad key was selected), another daemon is still - running or the previous daemon didn't remove its resources. I - have this implemented now by first opening the semaphore and if - that fails then creating it. To support this, added another - enum, ACE_EXCL = IPC_EXCL, to the class header. - Also, changed the ACE_SV_Semaphore_Simple::open( key_t, ... ) - method to use - - if (ACE_BIT_ENABLED (flags, IPC_CREAT)) - - rather than - - if (flags == IPC_CREAT) - - Thanks to Michael McKnight for - reporting this. - - * ace: Replaced all uses of the template param LOCK with ACE_LOCK - to avoid conflicts with some systems that have a macro named - LOCK. - - * ace/IOStream_T.h: Added ACE_LACKS_ACE_IOSTREAM to the - IOStream_T.* files. Thanks to Torbjorn Lindgren - for reporting this. - - * ace/{Proactor,Service_Config,ACE_Sig_Handler}: Removed the use - of sig_atomic_t as a return type. Thanks to Torbjorn Lindgren - for reporting this. - -Sat Oct 04 03:14:46 1997 - - * ace/WFMO_Reactor.cpp (add_network_events_i): While looking - through all entries in the current (and suspended) handles for a - matching handle, we need to skip those that have been scheduled - for deletion). Also changed ACE_BIT_STRICTLY_ENABLED to - ACE_BIT_ENABLED. - - * ace/Select_Reactor.cpp (bit_ops): Since CONNECT is no longer a - logical OR of READ and WRITE, we have to explicitly make sure - that enable the handle in the correct wait sets. - - * ace/Event_Handler.h: Changed the values of the event - masks. CONNECT is no longer a logical OR of READ and WRITE. It - was its own unique value. - - * ace/OS.h: Removed ACE_BIT_STRICTLY_ENABLED. It did not do what I - thought it would do. - - * ace/Connector.cpp (handle_output): Added code that tries to find - out if the reactor uses event associations for the handles it - waits on. If so we need to reset it. This is necessary for - asynchronous connects. - - * ace/SOCK_Connector.i (reset_new_handle): Added new method on all - connectors to reset event associations of handles. - -Fri Oct 03 21:20:26 1997 David L. Levine - - * ace/Makefile: disable INSTALL in $(ACE_ROOT)/ace Makefile, - because it's not needed and it creates circular symlinks when - the library build fails. - -Fri Oct 3 11:39:45 1997 Douglas C. Schmidt - - * ace/Thread_Manager: Added a new flags_ field to - ACE_Thread_Descriptor and changed the insert_thr() and - append_thr() methods to update this flag so that we can keep - track of whether the thread was created "detached" or not. - - * ace/Reactor.cpp (event_loop_done): Replaced the use of - sig_atomic_t with int to workaround bugs with KAI C++. Thanks - to Torbjorn Lindgren for reporting this. - - * ace/CORBA_Handler: Removed the reactor() accessors since they - are subsumed by the methods in ACE_Event_Handler. Thanks to - Jean-Marc STRAUSS for reporting this. - -Thu Oct 02 15:38:34 1997 - - * Reactor: Renamed reset_new_handle to uses_event_associations. - - * ace/FIFO_Recv.cpp (ACE_FIFO_Recv): aux_handle_ must correctly be - initialized to ACE_INVALID_HANDLE. Thanks to Sandro Doro - for reporting this. - -Thu Oct 02 11:21:37 1997 Steve Huston - - * include/makeinclude/platform_{aix aix4.2}.GNU: added the - shared_libs_only = 0 and static_libs = 1 settings since C Set++ - builds the shared libs from the static. - - * ace/OS.h: Removed spaces around '##' in ACE_DES_FREE_TEMPLATE macro. - - * ace/Strategies_T.cpp: added #include "ace/Thread_Manager.h" - - * ace/Managed_Object.h: Added template arg in the "unimplemented - function" section. - -Thu Oct 02 10:46:18 1997 Steve Huston - - * ace/Malloc.h: added some comments on rationale and use of - ACE_MALLOC_ALIGN. - -Wed Oct 01 19:08:26 1997 Steve Huston - - * include/makeinclude/rules.bin.GNU: correctly builds programs - with multiple object modules. - - * examples/ASX/CCM_App/Makefile: needed some adjustment to work with - new rules.bin.GNU, above. - -Wed Oct 01 14:11:03 1997 - - * ace/Remote_Name_Space.cpp (resolve): We need to allocate one more - space than what strlen reports. - -Wed Oct 01 12:45:51 1997 David L. Levine - - * ace/ACE.cpp (count_interfaces, get_handle): changed "unix" to - "__unix" because DEC CXX doesn't #define "unix". Thanks to - Billy Quinn for reporting this. - - * ace/High_Res_Timer.h: added comment from Gabe - about ACE_OS::gethrtime () drift on MP - machines. - - * ace/OS.i (gethrtime, Solaris only): removed ACE_OSCALL_RETURN - wrapper around ::gethrtime () because it was broken (the type - was int) and not necessary (::gethrtime () should never fail), - so we can remove its overhead. - - * tests/Time_Value_Test.cpp: undef ACE_NO_INLINE in the - ACE_U_LongLong test hacks. - - * tests/SV_Shared_Memory_Test.cpp: delay construction of allocator - until first needed because it needs something that the - ACE_Object_Manager constructs. - - * tests/run_tests.vxworks: added console printout before each test. - -Tue Sep 30 21:42:58 1997 Douglas C. Schmidt - - * ACE version 4.3.9, released Tue Sep 30 21:42:58 1997. - -Tue Sep 30 17:15:14 1997 James C Hu - - * ace/Filecache.{h,cpp}: I removed the static locks in the - Filecache and made them local member objects. Since Filecache - is usually a singleton, no more memory is required this way. - - * tests/Hash_Map_Manager_Test.cpp: Added some code to test the - Hash_Map_Manager_Iterator. This is to show Bob Laferriere that - it works. - -Tue Sep 30 13:41:14 1997 Nanbor Wang - - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i - (handle_input): - * examples/Reactor/ReactorEx/test_network_events.cpp (handle_input): - * examples/Logger/simple-server/Logging_Acceptor.cpp - (handle_input): Changed to use reset_new_handle () for querying - whether we need to reset handles or not. - -Tue Sep 30 08:35:15 1997 David L. Levine - - * ace/Atomic_Op.i: added CVS header. - - * ace/Object_Manager.{h,cpp}: removed Filecache arrays, because - Filecache no longer needs them. - - * ace/Filecache.{h,cpp}: removed unused static Filecache::lock_. - - * tests/test_config.h: Added 1 second sleep to ACE_END_TEST to - allow all threads to terminate gracefully. - VxWorks only: removed the hack removal of the log file, because - it no longer appears to be necessary. - - * tests/TSS_Test_Errno.h,TSS_Test.cpp: dynamically allocate - Errno::lock_ to try to avoid problem with cleanup of statics - on VxWorks. It doesn't solve the problem, all of the time. - There are still statics in the ACE library, which could be - causing it. - -Tue Sep 30 01:35:28 1997 Nanbor Wang - - * ace/Naming_Context.cpp (close, close_down): Separated these two - functions calls. Close now only release the name_space_ - resource and close_down release all resources. Close should be - use when changing the name_space. - -Mon Sep 29 22:29:46 1997 Nanbor Wang - - * ace/Strategies_T.cpp (accept_svc_handler ): - * ace/Service_Manager.cpp (handle_input): - * ace/Acceptor.cpp (handle_input, accept_svc_handler): Changed to - use reset_new_handle () for querying whether we need to reset - handles or not. - - * ace/Reactor.{h,i} (reset_new_handle): - * ace/Reactor_Impl.h (reset_new_handle): - * ace/Select_Reactor.{h,i} (reset_new_handle): - * ace/WFMO_Reactor.{h,i} (reset_new_handle): Added this new method - so we can determine whether the implementation of the reactor - requires us to decouple the event a handle inherit from accept. - This scheme doesn't depend on the RTTI support of compilers. - Thanks to Irfan for the tips. - -Mon Sep 29 21:28:02 1997 - - * ace/Synch (ACE_Recursive_Thread_Mutex): Methods were added to - ACE_Recursive_Thread_Mutex so that it has a consistent interface - with other locking mechanisms. Thanks to Phil Logan - for submitting these changes. - -Mon Sep 29 13:28:05 1997 David L. Levine - - * ace/OS.i (thr_setconcurrency): added support on Irix 6.x, using - its ::pthread_setconcurrency (). Thanks to Felix Popp - for letting us know - about this Irix 6.2/3 system function, and for testing it out. - - * ace/ACE.cpp (handle_timed_complete) force recv check on VxWorks - because its read handle is always not set. Thanks to Steve for - helping track down the problem. We might want to consider doing - it this way on Unix platforms, as well, according to Steve. - - * apps/JAWS/server/HTTP_Server_T.cpp (accept): fixed typo, - "remote_address" instead of "remote_adrress". - - * tests/Time_Value_Test.cpp (test_ace_u_longlong): replaced - ACE_ASSERTs with calls to a static function that prints out - why the test failed. Also, disabled test of ACE_U_LongLong - if ACE_HAS_64BIT_LONG. - - * ace/OS.h: 1) Use u_long for ACE_hrtime_t if ACE_HAS_64BIT_LONGS. - 2) Added ACE_NO_INLINE support to allow wrapper_macros.GNU to - disable inlining from the command line. 3) Added - ACE_HAS_VERBOSE_NOTSUP support. - - * include/makeinclude/wrapper_macros.GNU: added "inline" flag to - allow enabling/disabling of inlining from the command line or - platform_macros.GNU. - - * ace/config-vxworks*.h: added ACE_HAS_VERBOSE_NOTSUP. - -Mon Sep 29 11:15:10 1997 Nanbor Wang - - * ace/OS.h (ace_cleanup_destroyer): Made this an export function. - -Sat Sep 27 17:04:48 1997 - - * ace/Reactor: Added new methods to be able to set and get the - implementation class being used by the reactor. The set method - is protected and should be used with care, specially while - changing the implementation class midway through an - application. Also both the methods are virtual, and user can - subclass to change their behavior. The internal code of the - reactor also changed to now use these methods exclusively rather - than the the raw data variables. - - * ace/Acceptor.cpp (handle_input): When using the WFMO_Reactor, we - need to reset the event association for the newly created - handle. This is because the newly created handle will inherit - the properties of the listen handle, including its event - associations. Therefore two changes were made: - - - A new directive (flag) was added to all the acceptors - (LSOCK_Acceptor, SOCK_Acceptor, SPIPE_Acceptor, TLI_Acceptor, - and UPIPE_Acceptor) to reset the event associations of the - newly created handle. Currently only the SOCK_Acceptor pays - attentions to this directive, others just ignore it. This flag - had to be added to all the acceptors for interface - compatibility and also to make sure that the Acceptor template - code works correctly. - - - A dynamic_cast was necessary to determine at run-time which - implementation of the Reactor we are using. But because this - code is limited to Win32, there should be no problems doing - the dynamic_cast. - - The same thing as above needed to be done to: - - - ACE_Accept_Strategy::accept_svc_handler (ace/Strategies_T.cpp) - - - ACE_Service_Manager::handle_input (ace/Service_Manager.cpp) - - - LOCK_SOCK_Acceptor::accept (apps/JAWS/server/HTTP_Server_T.h) - - - Logging_Acceptor.cpp::handle_input (examples/Logger/simple-server/Logging_Acceptor.cpp) - - - Network_Listener::handle_input (examples/Reactor/ReactorEx/test_network_events.cpp) - - - Handle_R_Stream::handle_input (examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i) - -Sat Sep 27 20:03:29 1997 Carlos O'Ryan - - * include/makeinclude/platform_sunos5_sunc++_orbix.GNU: - Activated exceptions by default too, since they are used by - Orbix anyway. - - * include/makeinclude/platform_sunos5_sunc++.GNU: - Some libraries were missing and the locations were not - completely accurate. - - * ace/config-sunos5.5-sunc++-4.x-orbix.h: - I let the MT Orbix as the default, since that is the - configuration here and that was implicit in the platform*.GNU - files. - - * include/makeinclude/wrapper_macros.GNU: - Added flags to the IDL compiler to emit support for both - CORBA::Any (-A) and the BOAImpl (-B) approach for the server - side implementations. - - * ace/CORBA_Handler.cpp: - The full definition for Thread_Manager was missing, I added an - include for it. - -Sat Sep 27 07:59:18 1997 David L. Levine - - * include/makeinclude/wrapper_macros.GNU, - platform_{chorus,lynxos,vxworks*}.GNU: - default to building shared libs only, except on Chorus, - LynxOS, and VxWorks. While the "shared_libs_only=1" make - flag is still supported, it is no longer necessary because - it is the default. - - To revert to the prior behavior of building both shared and - static libraries, add "static_libs=1" to either your make - command invocation or your include/makeinclude/platform_macros.GNU. - -Sat Sep 27 00:45:10 1997 Nanbor Wang - - * examples/OS/Process/README (imore): - * examples/OS/Process/Makefile: - * examples/OS/Process/imore.cpp: Added a new example: imore. - - * ace/SOCK_Stream.cpp (close, close_reader, close_writer): Moved - invalid handlers checking from close to close_reader and - close_writer. - -Fri Sep 26 14:28:36 1997 Nanbor Wang - - * tests/SPIPE_Test.cpp: - * tests/Process_Strategy_Test: Changed the macro "ACE_LACKS_EXEC" - to "ACE_LACKS_FORK". - - * ace/SOCK_Stream.cpp (close): Added checking for invalid handle - before shutting down the write end. - -Fri Sep 26 11:55:27 1997 Steve Huston - - * ace/Malloc.h: Use signed math in the preprocessor calculations - for ACE_CONTROL_BLOCK_ALIGN_LONGS (and all of its contributing - factors). - - * ace/ACE.cpp: Fixed the TLI/BSD checks in handle_timed_complete. - - * tests/SOCK_Connector_Test.cpp: Added ENOTCONN as a valid fail - condition (in addition to ECONNREFUSED). - -Fri Sep 26 05:11:40 1997 Nanbor Wang - - * ace/SOCK_Acceptor.cpp (shared_accept): Made the newly added - WSAEventSelect code unreachable. It caused several test program - hung when performing socket recieving. Don't know why this is - happening. According to the online manual, this should be the - right thing to do. Some more Access Violations to be fix - tomorrow. Oh, I mean, today. - -Fri Sep 26 01:22:28 1997 Douglas C. Schmidt - - * ace/OS: Made a few changes to OS.h and OS.i to stop compiler - warnings. Thanks to Wei Chiang for - reporting this. - - * ace/config-chorus.h: Added ACE_LACKS_RLIMIT and removed - ACE_LACKS_SIGACTION. Thanks to Wei Chiang - for reporting this. - - * ace/TLI_Connector.cpp (complete): Changed the call to - ACE::handle_timed_complete() to use the new parameter. - - * ace/ACE: Added an extra parameter to the call to - ACE::handle_timed_complete() to indicate (at run-time) that this - is being called via a TLI interface. Thanks to the - ever-vigilant Steve Huston for suggesting this. - - * tests/SOCK_Connector_Test.cpp: "ACEified" the new test program. - -Thu Sep 25 23:27:38 1997 - - * ace/config-win32.h: Error in directives: it should be "Define - ACE_HAS_WINSOCK2 to 0 in your config.h file if you do *not* want - to compile with WinSock 2.0.". The typo was a 1 instead of the - 0. Thanks to Gonzalo A. Diethelm for pointing - this out. - -Thu Sep 25 20:33:09 1997 Douglas C. Schmidt - - * ace/Message_Queue.h: Changed the *_i() methods to be virtual so - that we can change the queueing mechanism by subclassing from - ACE_Message_Queue. Thanks to Eric Newton for - this suggestion. - - * ace/Timer_List_T.cpp (ACE_Timer_List_Iterator_T): Changed - listParam to timer_list to keep programming style consistent... - -Thu Sep 25 17:06:42 1997 Steve Huston - - * ace/OS.i - ACE_OS::cond_timedwait - HP's threads return - EAGAIN on timeout from pthread_cond_timedwait, so adjust that - to ETIME. - - * tests/SOCK_Connector_Test.cpp - will now try to find another - host to run the connect to. Won't try on Win32 or VxWorks - though. - -Thu Sep 25 15:25:53 1997 David L. Levine - - * ace/Object_Manager.cpp,OS.cpp: moved socket_init to Object_Manager - ctor and socket_fini to Object_Manager dtor, to be sure that - WinSock gets initialized early and closed late. - - * ace/SOCK.{h,cpp}: removed dummy_ static now that the - Object_Manager initializes WinSock. - - No, I'm not a Win32 wizard all of the sudden. Thanks to - Irfan and Nanbor for directing these changes. - - * tests/run_tests.vxworks: commented out tests that don't run - productively on VxWorks: SV_Shared_Memory_Test, - Reactor_Exceptions_Test, SPIPE_Test, and UPIPE_SAP_Test. - -Thu Sep 25 03:50:27 1997 - - * ace/OS.i (thr_getspecific): Must restore errno if no errors have - occured. - - * ace/Log_Msg.cpp (close): Must close the message queue *before* - destruction since there is no destructor for the queue. - - * netsvcs/lib/Client_Logging_Handler.cpp (fini): fini must close - and unregister the acceptor. Closing the socket is simply not - enough. - -Thu Sep 25 01:39:47 1997 Nanbor Wang - - * ace/Containers.{i,cpp}: Commented out all ACE_TRACE macros in - ACE_Unbounded_Queue so that they won't cause SIGSEGV when we - turn the tracing on. Unbounded_Queue is used in Object_Manager - which must be initialize before most of other objects. - -Wed Sep 24 23:37:19 1997 Nanbor Wang - - * ace/OS.i (thr_getspecific): On NT, added check whether - ::GetLastError() is NO_ERROR when ::TlsGetValue() return 0. - -Wed Sep 24 13:37:02 1997 - - * ace/config-win32-common.h (ACE_LACKS_FORK): Added in macro to - distinguish between ACE_LACKS_FORK and ACE_LACKS_EXEC. Also - updated config-chorus.h, config-vxworks-ghs-1.8.h, and - config-vxworks5.x-g++.h. - - * ace/OS.h (ACE_WIN32CALL_RETURN && ACE_WIN32CALL): Added new - macros to distinguish between Win32 calls that set GetLastError - and those that set errno. Also updated ACE_OSCALL_RETURN and - ACE_OSCALL such that they do not set errno to GetLastError. This - is because these calls automatically set errno. - - Updates OS.* files to reflect these changes. - - * ace/SOCK_Acceptor.cpp (shared_accept): Make sure to reset the - event association inherited by the new handle. - - * ace/WFMO_Reactor.i (unbind): Added a check for invalid handles - being passed in for removals. - -Wed Sep 24 10:34:29 1997 Carlos O'Ryan - - * ace/OS.h: - Under HP-UX and g++ must be included for dynamic loading, - not ; thanks to Warren Thompson (wthompson@altaira.com) - for helping us with this one. - -Wed Sep 24 09:36:21 1997 David L. Levine - - * ace/Managed_Object.{h,i},Object_Manager.{h,cpp}: removed - ACE_Managed_Object get_object () interface. It wasn't - used anywhere; it was originally intended to support preallocated - objects but turned out to not be necessary. I think that it would - be more useful to make it possible to instantiate - ACE_Managed_Object instead, and have it implicitly register - with the ACE_Object_Manager. - - * ace/Timer_List_T.cpp (ACE_Timer_List_Iterator_T): - changed name of "list" argument ot "listParam" to resolve name - conflict with STL. Thanks to Brian Mendel for reporting this. - - * tests/run_tests.check: print out filename with error messages. - -Tue Sep 23 17:11:44 1997 Carlos O'Ryan - - * ace/config-hpux-10.x-g++.h: - Added A ACE_LACKS_TIMESPEC_T, thanks to Warren Thompson - (wthompson@altaira.com) for this one. - - * include/makeinclude/platform_hpux_gcc.GNU: - Added a -D_REENTRANT define, to enable reentrant methods, thanks - to Warren Thompson (wthompson@altaira.com) and Steve Huston - (shuston@riverace.com) for pointing out this. - - * ace/config-hpux-10.x.h: - Added an small comment to clarify that DCE/threads must be - installed if threading is wanted, they are an optional product - for HP-UX. - -Tue Sep 23 10:13:57 1997 David L. Levine - - * ace/Select_Reactor.cpp: added #include of ace/Thread.h. - Thanks to Vladimir Schipunov for - reporting this. - - * ace/Object_Manager.cpp: added #include of ace/Malloc.h. - Thanks to Vladimir Schipunov for - reporting this. - - * ace/config-aix-4.1.x.h: added ACE_HAS_PTHREAD_T and - ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR #defines. - Thanks to Vladimir Schipunov for - reporting the build problem on AIX 4.1, and to - Torbjorn Lindgren for providing these fixes. - - * ace/Token_Manager.{h,cpp},Object_Manager.{h,cpp}: - preallocate ACE_Token_Manager creation lock. - - * ace/Object_Manager.cpp: use ACE_Cleanup_Adapter - for preallocated arrays. - -Mon Sep 22 16:51:44 1997 - - * ace/OS.i (open): Changed code so that (_O_CREAT | _O_TRUNC) - means CREATE_ALWAYS. Thanks to Dave Brackman - (dbrackma@OhioEE.com) for pointing this out. - -Mon Sep 22 11:01:28 1997 Steve Huston - - * tests/SOCK_Connector_Test.cpp, Makefile, run_tests.sh - added new - test to exercise ACE_SOCK_Connector focusing on fail conditions. - -Mon Sep 22 07:11:21 1997 David L. Levine - - * ace/Message_Block.cpp (clone): check this block's cont () - instead of the new block's cont_ when cloning the continuation - messages. Thanks to Eric Newton for tracking - down this problem with failing to clone continuation blocks, - and for providing the fix. - - * ace/OS.{h,i} (ACE_U_LongLong): added operator!=, and made args - const to ctor, operator/, hi, and lo member functions. - - * ace/Managed_Object.[hi]: renamed ACE_Managed_Cleanup to - ACE_Cleanup_Adapter because it doesn't implicitly register - itself with the ACE_Object_Manager. - - * ace/ACE.cpp: moved ACE_Object_Manager_Destroyer to - Object_Manager.cpp because the ACE_Object_Manager should - always be linked into executables now, even if libACE is - statically linked. - - * ace/Filecache.{h,cpp},Signal.{h,cpp} preallocate locks for - Filecache and Signal in ACE_Object_Manager. - - * ace/Object_Manager.{h,cpp}: 1) renamed ACE_Managed_Cleanup to - ACE_Cleanup_Adapter. 2) Moved ACE_Object_Manager_Destroyer from - ACE.cpp to Object_Manager.cpp. 3) Added Filecache and Signal locks. - - * ace/Singleton.*: removed instance (TYPE *) member function because - it wasn't being used. And, it allows us to store the contained - instance_ as an object instead of a pointer, saving a dynamic - memory allocation on construction. - - * include/makeinclude/platform_vxworks5.x_g++.GNU: added $(MUNCHED) - to PRELINK, to allow applications to add libraries or object - files to be munched. - - * ace/stdcpp.h: stdarg.h must be #included before stdio.h on LynxOS. - -Sat Sep 20 17:32:23 1997 David L. Levine - - * ace/Object_Manager.{h,cpp},Managed_Object.*, - CORBA_Handler.{h,cpp},Dump.{h,cpp},Log_Msg.cpp,OS.cpp - revised ACE_Object_Manager interface for preallocated objects. - - Also, added documentation of ACE_Object_Manager interface to - Object_Manager.h and Managed_Object.h. - - * ace/CORBA_Handler.cpp,Dump.cpp,OS.cpp: use ACE_MT with - preallocated locks. - - * include/makeinclude/platform_*.GNU,wrapper_macros.GNU: - moved -O out of wrapper_macros.GNU and into each platform - file's OC[C]FLAGS to support "optimize" make flag. - - I moved -O and similar compile flags out of CFLAGS and/or - CCFLAGS and into OCFLAGS and/or OCCFLAGS. This allows the - ACE make system to support the "optimize" flag. It operates - similar to the "debug" flag, i.e., you can set "optimize=1" - or "optimize=0" in your platform_macros.GNU file to enable - or disable optimization. You can use the same syntax to - get the same effect from the "make" command line, e.g., - "make optimize=1 debug=0". - - I added optimize=1 to platform_*.GNU files that had -O, etc., - in their C[C]FLAGS. Therefore, there should be no net effect - from this change on any platform. - - * include/makeinclude/wrapper_macros.GNU: - I _removed_ the disabling of "debug" when "optimize=1" is - enabled. This _will_ have a net effect: if you were relying - on "debug" to be disabled when you enabled "optimize=1", - you'll be surprised. The change supports platforms that - allow "debug" and "optimize" simultaneously. - - Because I had added the disabling of "debug" recently, - and because "optimize=1" wasn't supported well, if at all, - I'd be suprised if any is actually affected by this change. - -Sat Sep 20 11:47:14 1997 Carlos O'Ryan - - * ace/Timer_Queue_T.cpp: - Changed the return type to , to match its declaration. The - intent was to error error values, which are declared as - throughout ACE. - -Sat Sep 20 08:07:36 1997 David L. Levine - - * ace/OS.i (gethrtime): on Linux only, removed "volatile" qualifier - from declaration of local variable "now". I don't think that - it's necessary. It causes compilation failure with g++ because - the ACE_U_LongLong copy constructor won't take a volatile - argument. Thanks to Sandro Doro for - tracking down this problem. - - * tests/Time_Value_Test.cpp: reverted to test ACE_U_LongLong on - all platforms except WIN32. It works properly on Linux with - the removal of volatile from ACE_OS::gethrtime's "now". Thanks - to Sandro Doro for figuring this one - out. - -Fri Sep 19 18:49:50 1997 Carlos O'Ryan - - * ace/config-irix6.x-g++.h: - * include/makeinclude/platform_irix6.x_g++.GNU: - Added support for IRIX 6.x w/gcc, thanks to Celeste E. Copeland - (celeste@altaira.com) for this. - -Thu Sep 18 19:33:02 1997 Carlos O'Ryan - - * Douglas added the following changes while going through the - Async_Timer_Queue. - - * ace/Timer_Queue_T.h: Factored out the code for handling - ualarm(). - - * ace/Timer_Queue_T.cpp (handle_signal): Cleanedup the logic - for rescheduling a ualarm() after expiring a timer. - - * tests/Async_Timer_Queue_Test.cpp (signal_handler): Changed the - use of ACE_DEBUG to ACE_ERROR to ensure that the call doesn't - magically disappear if ACE_NDEBUG is enabled. - -Fri Sep 19 18:05:48 1997 Douglas C. Schmidt - - * ace/Log_Msg.cpp (log): Changed the send() to a send_n() so that - all the data gets written... - -Fri Sep 19 14:52:53 1997 Nanbor Wang - - * netsvcs/lib/Client_Logging_Handler.cpp (get_handle): Can't use - ACE_ERROR_RETURN here because ACE_HANDLE is a void* on NT, not - int. - - * examples/Reactor/Misc: Added reactors.dsp signals_1.dsp - signals_2.dsp. - - * ace/OS.cpp (thr_exit): Commented out the call to - ACE_TSS_Cleanup::exit () because ACE_OS::thr_exit is actually - called from ACE_TSS_Cleanup::exit (). - -Fri Sep 19 12:50:37 1997 David L. Levine - - * ACE-INSTALL*,ace/README: added more documentation of requirement - for explicit main (int, char *[]) arguments and int return type - with ACE_HAS_NONSTATIC_OBJECT_MANAGER (on VxWorks). - -Thu Sep 18 22:45:09 1997 Douglas C. Schmidt - - * netsvcs/lib/Client_Logging_Handler.cpp (close): Fixed a - typo: it's output_ not outout_. Thanks to David for - pointing this out. - - * netsvcs/lib/Client_Logging_Handler.cpp: Make sure to clean up - all our resources (e.g., acceptor-mode and data-mode sockets) - when we close down. - - * netsvcs/servers/main.cpp (main): Restored the entire contents of - main(). - - * tests/Semaphore_Test.cpp: Updated the test to use a temporary - ACE_Time_Value variable that is passed to - ACE_Semaphore::acquire() so that we don't have problems with - reference anachronisms... Thanks to David Levine for reporting - this. - - * ace/Log_Msg.cpp: Changed over to using ACE_SPIPEs for the - logging mechanism rather than ACE_FIFOs to conform to the - changes to Client_Logging_Handler. - - * netsvcs/lib/Client_Logging_Handler.cpp: - Completely rewrote the Client Logging Daemon so that it uses - ACE_SPIPEs by default, rather than ACE_FIFOs. This is more - portable and makes it easier to write a generic client logging - daemon... If a platform doesn't support ACE_SPIPEs, then we - revert to using sockets. - -Thu Sep 18 21:56:33 1997 Nanbor Wang - - * ace/OS.cpp (ACE_TSS_Cleanup::exit): Masked out codes that relate - to freeing TSS keys and remove key entries from TSS cleanup - table. I removed it here to avoid race condition. - (ACE_TSS_Cleanup::free_all_key_left): Added this function to - free all left over TSS keys and remove them from TSS cleanup - table when the program exits. It is only called from - ACE_OS::cleanup_tss. - (ACE_OS::cleanup_tss): Added call to - ACE_TSS_Cleanup::free_all_key_left when ACE_WIN32 or - ACE_HAS_TSS_EMULATION are defined. - -Thu Sep 18 16:30:24 1997 David L. Levine - - * ace/Semaphore_Test: protected declarations of test_timeout_count - and timeouts because they're not used on Solaris. - - * netsvcs/lib/Client_Logging_Handler.cpp: added template - instantiations. - -Thu Sep 18 09:04:40 1997 - - * ace/Dynamic: Changed the way ACE_Dynamic worked. Instead of - keeping the "this" pointer of the object in question, we are now - simply keeping a flag that indicates whether the object was - dynamically created. The trick to this approach is to make sure - to reset the flag in the constructor. The "this" pointer - approach was broken when used with multiple inheritance, because - of "shearing" of the "this" pointer to get to the base - Svc_Handler class. - -Thu Sep 18 01:12:36 1997 Douglas C. Schmidt - - * ACE version 4.3.8, released Thu Sep 18 01:12:36 1997. - -Wed Sep 17 22:47:20 1997 Douglas C. Schmidt - - * ace/ACE: Added two new varargs methods for send() and recv(). - These are modeled after the ones that are in, e.g., ACE_SOCK_IO. - - * ace/Log_Msg.cpp (open): In the UNICODE version the compiler - complains about mixed wchar/char usage in Log_Msg.cpp: - - Log_Msg.cpp(468) : error C2665: 'ACE_INET_Addr::ACE_INET_Addr' : - none of the 8 overloads can convert parameter 1 - from type 'const unsigned short *' - - I fixed it modifing the connect() call from - - status = con.connect (*ACE_Log_Msg_message_queue, - ACE_INET_Addr (logger_key)); - - to - - status = con.connect (*ACE_Log_Msg_message_queue, - ACE_INET_Addr - (ACE_MULTIBYTE_STRING(logger_key))); - - Thanks to Dieter Quehl for - reporting this. - - * ace/SV_Semaphore_Simple.h: By default, we want the flags to - perform a SEM_UNDO. Thanks to Sandro Doro - for reporting this. - - * tests/Makefile (BIN): Added Semaphore_Test.cpp to the Makefile. - Thanks to Sandro Doro for reporting - this. - - * tests/Async_Timer_Queue_Test.cpp: If you want to print a '\', - you need to make it a \\... Thanks to David for noticing this. - - * apps/JAWS/clients/Blobby/Blob_Handler.h: There was a missing - #include for "ace/SOCK_Stream.h". - - * netsvcs/lib/Client_Logging_Handler: Reimplemented this service - so that it uses sockets on Win32 to receive logging messages - from clients. - - * ace/Log_Msg.cpp: Enhanced ACE_Log_Msg::log() so that it now uses - sockets on Win32 platforms to work around the lack of FIFOs. - - * ace/Log_Record.h: Revised the field layout of the ACE_Log_Record - so that the length field comes first. This is necessary for the - framing mechanisms used throughout ACE in various - configurations. - -Wed Sep 17 15:17:38 1997 James C Hu - - * ace/Filecache.cpp: ACE_Filecache::finish should check to see if - the file passed in is NULL before attempting to grab the - associated hash lock. Reported by Samuel Melamed - . - -Wed Sep 17 13:51:25 1997 Carlos O'Ryan - - * bin/auto_compile: - I setup autoflush on the logfile, it makes debugging and non - crontab usage a bit easier. - -Wed Sep 17 12:59:34 1997 - - * ace/Local_Name_Space_T.cpp: Fixed warnings caused by SEH macros. - -Wed Sep 17 01:07:40 1997 Douglas C. Schmidt - - * ACE version 4.3.7, released Wed Sep 17 01:07:40 1997. - -Tue Sep 16 23:34:36 1997 Douglas C. Schmidt - - * netsvcs/servers/main.cpp (main): The use of braces was incorrect - so that some services were being prematurely closed... - - * ace: Added a new flag called ACE_LACKS_FIFO to distinguish the - (lack of) features on Win32... - - * ace/Timer_Queue_T: Added an expire() wrapper for the - Async_Timer_Queue_Adapter. - - * ace/OS: Added a wrapper for strpbrk() and wcspbrk(). Thanks to - Bob Olson and Irfan for pointing out - the need for this. - -Tue Sep 16 18:03:58 1997 Carlos O'Ryan - - * bin/auto_compile: - It wouldn't report an error when run_tests.sh scream "FAILED", - now it does. - -Tue Sep 16 08:30:28 1997 Steve Huston - - * ace/OS.i: Changed a couple of ACE_UNUSED(arg) to ACE_UNUSED_ARG(arg) - -Mon Sep 15 12:08:38 1997 - - * ace/Reactor (register_handler): Originally this interface was - available for all platforms, but because ACE_HANDLE is an int on - non-Win32 platforms, compilers are not able to tell the - difference between - register_handler(ACE_Event_Handler*,ACE_Reactor_Mask) and - register_handler(ACE_Event_Handler*,ACE_HANDLE). Therefore, we - have restricted this method to Win32 only. - - * ace/WFMO_Reactor.h: Removed non-Win32 version of the - WFMO_Reactor. This is no longer required in the new scheme. - - * ace/XtReactor: - - Added remove_handler_i(const ACE_Handle_Set &,ACE_Reactor_Mask) - to make the compiler happy. - - Also changed ACE_Reactor_Handle_Set to ACE_Select_Reactor_Handle_Set. - - * ace/Select_Reactor.cpp (ACE_Select_Reactor_Token): Added set/get - select_reactor methods. - - * ace/OS.h (ACE_SEH_TRY): Changed ACE_SEH_TRY from nothing to - "if(1)" on non-Win32 platforms. This should stop some compilers - from complaining about unreachable code. - -Mon Sep 15 11:37:49 1997 Carlos O'Ryan - - * include/makeinclude/platform_hpux.GNU: - Added -D_REENTRANT to enable the _r functions. - -Mon Sep 15 09:40:57 1997 Carlos O'Ryan - - * bin/auto_compile: - Enabled the shared_libs_only flags to speed up compilations (and - reduce disk space usage). - -Sun Sep 14 22:36:17 1997 - - * ace/Select_Reactor.h: Added a no-op constructor for - ACE_Select_Reactor_Token to make the compiler happy. - -Sun Sep 14 21:02:31 1997 David L. Levine - - * all Makefiles: ran "make depend" to update all ACE Makefiles. - - * include/makeinclude/platform_irix6.x-32_sgic++.GNU, - platform_tandem.GNU: added debug = 1, to disable ACE_NDEBUG. - - * ace/Acceptor.cpp: added #include of ace/Handle_Set.h so that - it will compile on g++/Solaris. - - * ace/Managed_Object.h: added #include of ace/OS.h because - ACE_Cleanup class is used. - - * ace/Managed_Object.cpp: only #include ace/Synch.h if - ACE_TEMPLATES_REQUIRE_SOURCE is not defined. The #include - appears to be necessary with Digital Unix. But, it causes - inline functions warnings with g++, both with inlining - enabled and disabled. Circular #includes are evil :-) - - * ace/Select_Reactor.h: removed "," at end of DEFAULT_SIZE - enum definition. - - * ace/Select_Reactor.i (register_handler): added ACE_UNUSED_ARGS. - - * ace/Select_Reactor.i: moved ACE_Select_Reactor::size () after - ACE_Select_Reactor_Handler_Repository::size () to prevent use - before definition. - - * ace/Select_Reactor.cpp: added template instantiation. - - * ace/Svc_Conf_y.cpp: commented out unused args and wrapped - assignments in "if" conditionals to avoid g++ warnings. - - * ace/Token_Manager.h: inserting missing "public" access control - specifier for ACE_Cleanup. - - * ace/OS.{h,cpp} (gethrtime, Linux only): inlined and added Alpha - support. - - * ace/config-linux*.h: only define ACE_HAS_PENTIUM if i386 is defined. - -Sun Sep 14 10:35:57 1997 - - * ace/Reactor: The Reactor classes (ACE_Reactor and ACE_ReactorEx) - have changed. The motivation for this change was to allow users - to program abstractly and use the most efficient implementation - available on their platform. At the same time, we wanted to - make the changes required by the users kept to a minimal. - - Here is a layout of the new Reactor hierarchy in ACE (an example - of the GOF Bridge Pattern). Thanks to Thomas Jordan - (Thomas_Jordan@deluxedata.com) for suggesting this new design. - - - Reactor -----> Reactor_Impl - ^ - | - -------------------- - ^ ^ - | | - Select_Reactor WFMO_Reactor - - Reactor: - - The Reactor class now becomes an interface class that contains - a pointer to an implementation class. All methods of the - Reactor class forward all calls to the appropriate - implementation class. Users can pass in their own - implementation class. If an implementation class is not - supplied at creation time, the following default rules apply: - - On non-Win32 platforms: An instance of the Select_Reactor - class will be created and used as the implementation. - - On Win32 platforms: An instance of the WFMO_Reactor class will - be created and used as the implementation. This default - behavior can be overwritten at compile-time by setting the - ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL flag. In this case, an - instance of the Select_Reactor class will be created and used - as the implementation. - - Reactor_Impl: - - Reactor_Impl is an abstract class (i.e., the Bridge). - Select_Reactor and WFMO_Reactor inherit from this class. - - Select_Reactor: - - Previously known as the Reactor class. This class implements - the Reactor_Impl interface by using the select() system - call. This implementation is available on all platforms - (including Win32). - - WFMO_Reactor: - - WFMO (Wait For Multiple Objects) Reactor, previously known as - the ReactorEx class. This class implements the Reactor_Impl - interface by using the WaitForMultipleObjects() system call. - This implementation is currently only available on Win32 - platforms. - - Code changes for users: - - The higher authorities of ACE have decided that ReactorEx was - a "goofy" name and made little sense in the new hierarchy. - Therefore users using the old ReactorEx will have to change - over to start using the Reactor class (and make sure that the - implementation class being used is WFMO_Reactor). - - Also users that have extended Reactor or ReactorEx must - now subclass from Select_Reactor or WFMO_Reactor, - respectively. - - * ace/ReactorEx: - - The ReactorEx interface has been extended to be identical to the - Reactor interface. Some of these new operations will not be - supported in this version. However, we will have interface - compatability at this point. This allows the creation of the new - Reactor hierarchy in ACE. - - Removed all static (singleton) methods from ReactorEx. These are - not necessary anymore since ReactorEx will become an - implementation class. Reactor will take over this functionality. - - Changed methods names from resume_all to resume_handlers and - suspend_all to suspend_handlers. This increases the similarity - between ReactorEx and Reactor. - - Add a lock_adapter so that we can return an ACE_Lock form of our - internal lock. - - Added signal handling capabilities to ReactorEx. - - Added handler, requeue_position, mask_ops, and ready_ops - operations. However, they are not supported in this - version. They are mostly here for interface compatibility with - Reactor. - - Added a size() accessor that returns the current size of the - ReactorEx's internal descriptor table. - - Added an initialized() accessor that returns true if ReactorEx - has been successfully initialized, else false. - - * ace/Reactor: - - The Reactor interface has been extended to be identical to the - ReactorEx interface. Some of these new operations will not be - supported in this version. However, we will have interface - compatability at this point. This allows the creation of the new - Reactor hierarchy in ACE. - - Added resume_handler(ACE_Handle_Set &) and - suspend_handler(ACE_Handle_Set &) to the Reactor. This - increases the similarity between ReactorEx and Reactor. - - Add a lock_adapter so that we can return an ACE_Lock form of our - internal lock. This changes the signature of the return type - from ACE_Reactor_Lock to ACE_Lock. - - Added a size() accessor that returns the current size of the - Reactor's internal descriptor table. - - Added wakeup_all_thread() operation. Currently it just does a - notify. - - Added alertable_handle_events() operation. Currently it just - calls handle_events(). - - Added register_handler (that take event handles) operations. - However, they are not supported in this version. They are mostly - here for interface compatibility with ReactorEx. - - * ace/XtReactor: Now inherits from Select_Reactor instead of - Reactor. - - * ace/Timer_Queue_T.h: Removed the inclusion of Time_Value.h. This - file does not exist anymore - - * ace/Synch_T (ACE_Lock_Adapter): Changed the implementation of - the adapter such that the user is allowed to (optionally) pass - in the locking mechanism. - - * ace/Strategies: Removed ACE_ReactorEx_Notification_Strategy. - - * ace/Service_Config: Updated Service_Config so that all ReactorEx - and Proactor methods are removed. ReactorEx does not exist any - longer and Proactor methods are available as statics methods on - the Proactor class. - - * ace/OS.h (ACE_DEFAULT_SELECT_REACTOR_SIZE): Changed - ACE_DEFAULT_REACTOR_SIZE to ACE_DEFAULT_SELECT_REACTOR_SIZE. - There is no default size dictated by the Reactor class anymore. - - * ace/Local_Tokens,Token: Added new methods: acquire_read, - acquire_write, tryacquire_read, tryacquire_write. These methods - allow the Tokens to be used by the ACE_Lock_Adapter class. - - * ace/Handle_Set.h (MAXSIZE): Changed ACE_DEFAULT_REACTOR_SIZE to - ACE_DEFAULT_SELECT_REACTOR_SIZE. There is no default size - dictated by the Reactor class anymore. - - * ace/Event_Handler: Removed the Proactor and ReactorEx pointers - from Event_Handler. The Proactor has its own event handler - (ACE_Handler), and the ReactorEx does not exist anymore. - - * ace/Proactor: - - Changed Proactor to work with the new Reactor. - - Updated Proactor to bring it upto date with the recent changes - to the Timer_Queue. - - * tests: - - Removed the ACE_NEW_THREAD macro. With the new thread adapter, - the log stream for the new thread will automatically be set to - the creator thread's stream. Therefore, this macro is not - needed. - - Removed the inclusion of Service_Config.h. All tests are now - accessing the singletons that are supported by the class directly. - - * examples/Reactor/Proactor: Updated examples to use and access - the new Reactor class instead of the old ReactorEx. - - * examples/Reactor/ReactorEx: Updated examples to use and access - the new Reactor class instead of the old ReactorEx. - -Sun Sep 14 09:50:22 1997 Douglas C. Schmidt - - * ace/Singleton.i (ACE_Singleton): Moved the definition of the - ACE_Singleton default constructor into the *.i file. In - general, it's not a good idea to put definitions in *.h files. - - * tests/test_config.h: Improved the #undef scheme for ACE_NDEBUG. - -Sat Sep 13 23:51:55 1997 Nanbor Wang - - * ace/ACE_Library.{mak,mdp}: Removed Service_Record.cpp and added - Service_Type.cpp in project file. - - * ace/: Removed ace.{mak,mdp} and replaced them with - ACE_Library.{mak,mdp}. MSVC 4.2 insists to change the release - version DLL from our original setting "ace.{dll,lib}" to "ACE - dynamic Library.{dll,lib}". This is so far the only known - method to get around this. - - * netsvcs/servers/servers.{dsw,dsp}: Changed the output filenames - of debug version from maind.exe to main.exe. - - * netsvcs/lib/netsvcs.{dsw,dsp}: Changed the output filenames of - debug version from netsvcsd.{dll,lib} to netsvcs.{dll,lib}. - - * ace/ace.dsw: - * ace/ace_{dll,lib}.dsp: Removed Service_Record.cpp and added - Service_Type.cpp. - - * ace/Log_Msg.cpp (open): Fixed a typo. - - * ace/Reactor.cpp: Fixed a typo. - -Sat Sep 13 17:23:22 1997 Douglas C. Schmidt - - * ACE version 4.3.6, released Sat Sep 13 17:23:22 1997. - -Sat Sep 13 12:11:50 1997 Douglas C. Schmidt - - * tests: #include "test_config.h" before all the other files so - that we always have the ACE_ASSERT enabled... Thanks to Carlos - for noticing this. - - * ace/Reactor.cpp: Added Arturo's improvements for suspending and - resuming Event_Handlers. - - * tests/Reactors_Test.cpp: As a result of the new changes to - ACE_Thread_Manager, the Reactors_Test now seems to be working - fine. - - * ace/Thread_Manager.cpp (append_thr): When we append a new - Thr_Descriptor make sure to zero-out the cleanup_info_ fields - since otherwise horrible things will happen... - - * ace/Reactor: Added a new ACE_Reactor_Handle_Set called - suspend_set_ and updated the suspend_i() and resume_i() method - to use this set to store the ready bits that are enabled when we - suspend and resume and Event_Handler, respectively. Thanks to - Arturo for this suggestion. - - * tests/TSS_Test.cpp (main): Had to move the allocation and - deletion of TSS_Error into the ACE_HAS_THREADS section since - otherwise this test doesn't work when threading is disabled. - - * tests/Thread_Manager_Test.cpp: Move the template specialization - inside of the ACE_HAS_THREADS macro since otherwise this test - doesn't work when threading is disabled. - - * ace/Thread_Manager.cpp: Arrgh! Must initialize the cleanup_info - fields to 0 in the constructor for ACE_Thread_Descriptor! This - should fix a nasty bug... - - * tests/Async_Timer_Queue_Test.cpp: Continued to improve the - documentation in the test of the ACE_Async_Timer_Queue_Adapter. - - * ace/Timer_Queue_T.cpp (schedule): Oops, must pass &this->mask_ - to ACE_Sig_Set rather than this->mask_. - - * ace/Object_Manager.cpp: Changed #include - "ace/Service_Repository.h" to #include "ace/Service_Config.h" - since we now call ACE_Service_Config::close(). - - * ace/Service_Types: Removed a nasty circular dependency by simply - having each of the ACE_Service_Type_Impl subclasses take const - void *'s rather than their specific type (i.e., ACE_Stream or - ACE_Module, etc.). This turns out not to be a problem since we - treated them as const void *'s internally anyhow... - - * ace/Strategies_T.cpp: Fixed a bug in ACE_DLL_Strategy: - - ACE_Service_Type_Impl stp = new ACE_Service_Object_Type (svc_handler, this->svc_name_); - - should be - - ACE_Service_Type_Impl *stp = new ACE_Service_Object_Type (svc_handler, this->svc_name_) - - I wonder how this ever compiled?! - -Fri Sep 12 13:26:50 1997 Douglas C. Schmidt - - * ace/Mem_Map.cpp (close): Removed the following code in the - close() method that appears to be redundant with the code in - unmap(): - - if (this->file_mapping_ != this->handle_ - && this->file_mapping_ != ACE_INVALID_HANDLE) - ACE_OS::close (this->file_mapping_); - - Also cleaned up the close() code so that it doesn't try to close - the handle multiple times, even if close() is called more than - once. Thanks to Beged-Dov for reporting - this. - - * tests/Async_Timer_Queue_Test.cpp: Improved the structure of the - program and finished implementing the new feature that makes it - possible to avoid blocking SIGQUIT. - - * ace/Timer_Queue_T: Added support for an ACE_Sig_Set that can be - passed into the constructor of ACE_Async_Timer_Queue_Adapter. - This will enable us to selectively block only certain signals. - - * ace/Signal: Added a new constructor for ACE_Sig_Set that takes - ACE_Sig_Set * and also improved the documentation of the - constructor interfaces. - -Fri Sep 12 13:46:04 1997 David L. Levine - - * ace/OS.[hi],Log_Msg.h,config-lynxos.h, - include/makeinclude/platform_lynxos.GNU: added LynxOS port, - provided by Dave Mayerhoefer . Note how few - files were affected. What's even more amazing is the very small - number, 8, of very minor code changes to OS.[hi] and Log_Msg.h. - This is a tribute to the maturity of - - - * ace/Service_Object.h: Moved the ACE_Service_Type class into the - Service_Object.h file since this is "publically" visible to - applications. - - * ace/Service_Types.h: Improved the documentation of the - ACE_Service_Type subclass implementations. - - * ace/Service_Types: Changed the name next_ to link_ to be - consistent with the accessor name. - - * ace: Renamed Service_Record.{h,i,cpp} to Service_Types.{h,i,cpp} - to reflect the recent change in names. - - * ace/Service_Object.h: Renamed ACE_Service_Type to - ACE_Service_Type_Impl and ACE_Service_Record to ACE_Service_Type - in order to emphasize the use of the Bridge pattern. Thanks to - Eric Newton for motivating this. - - * ace/Svc_Conf.y: Removed the warning about Service name being - different from Module name. I'm not sure why this was - complaining in the first place. Thanks to Eric Newton for - pointing this out. - - * netsvcs/lib/README: The entry point for the time service client - is _make_ACE_TS_Clerk_Processor and not - _make_ACE_TS_Clerk_Connector. Thanks to Ivan for pointing this - out. - -Thu Sep 11 10:59:12 1997 - - * ace/Connector.cpp (handle_output): Increased the idle time - before we check the status of a non-blocking connection from 1 - ms to 35 ms when ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS is - defined (i.e., Win32.) This is very odd but wait a whole lot - longer seems to solve the problem. - - * ace/Log_Msg.cpp (close): On Win32, ACE_Log_Msg_Manager needs to - delete main thread's ACE_Log_Msg instance also. - -Thu Sep 11 10:37:00 1997 Carlos O'Ryan - - * ace/ACE.cpp: - * ace/INET_Addr.cpp: - * ace/Log_Msg.h: - * ace/Memory_Pool.h: - * ace/OS.h: - * ace/OS.i: - * ace/Parse_Node.cpp: - * ace/Strategies_T.h: - * bin/clone.cpp: - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h: - I checked the use of MAXNAMELEN vs. MAXPATHLEN; all buffers - intended to keep full filenames should have at least - MAXPATHLEN+1 chars. - Only buffers that will keep basenames (without any directories) - should have MAXNAMELEN+1 bytes. - I also added a new macro ACE_MAX_FULLY_QUALIFIED_NAME_LEN which - is the maximum number of characters for a fully qualified - internet hostname. - There remain one obscure usage of these macros in ace/Malloc.h - and Local_Naming_Space_T.{h,cpp}, but a quick fix broke - something, I will try again soon. - -Thu Sep 11 08:52:36 1997 David L. Levine - - * ace/OS.cpp (thr_key_detach): check to see if the - ACE_TSS_Cleanup lock has been constructed, and not - destructed, before attempting to use it. Statics are evil. - - * ace/Log_Msg.cpp (~ACE_Log_Msg): release guard before calling - ACE_Log_Msg_Manager::close (), because that deletes the lock. - - * ace/Managed_Object.{h,cpp} (get_object): changed type of "id" - to int because it will often be passed an enum. Pass "id" by - value to get_object (int id), for preallocated objects. - - * ace/Object_Manager.{h,cpp}: added ACE_LOG_MSG_INSTANCE_LOCK, - and ACE_PREALLOCATE_OBJECT macro. - - * include/makeinclude/wrapper_macros.GNU: ignore shared_libs_only - in modules that only build a static lib. Fixed shared_libs_only - by removing OBJDIRS, unless BIN is undefined, and VDIR. Removed - SHOBJ from both shared_libs_only and static_libs_only because - they're unused. - - * include/makeinclude/rules.local.GNU: added lib*.*_pure* to - clean.local target, to remove Purified libraries. - - * examples/Connection/non_blocking/Makefile, - examples/Service_Configurator/IPC-tests/server/Makefile: - removed -L./ from LDFLAGS because it's redundant: - wrapper_macros.GNU adds it. - -Wed Sep 10 22:58:10 1997 Douglas C. Schmidt - - * ace/Thread_Manager.cpp (exit): Reordered the code so that it - will keep the lock held long enough to copy out the thread exit - hook but will release the lock before calling this hook. - -Wed Sep 10 11:04:08 1997 David L. Levine - - * ace/config-sunos5.5-g++.h: added - ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS. - - * include/makeinclude/wrapper_macros.GNU: added PIC= with - static_libs_only, and added list of supported make flags. - - * include/makeinclude/wrapper_macros.GNU: added support for - debug=0, etc. Also, made debug, optimize, and profile - flags independent instead of exclusive. Thanks to Per - Andersson for suggesting this. - - * include/makeinclude/platform_*.GNU: replaced "CFLAGS += - $(DCFLAGS) with debug=1 so that debugging can easily be - disabled. Thanks to Per Andersson and James CE Johnson - for noticing this deficiency. - - * include/makeinclude/platform_vxworks5.x_g++.GNU: removed - "-I. -I$(ACE_ROOT)" from CFLAGS because it duplicates the - INCLDIRS set in wrapper_root.GNU. - -Wed Sep 10 10:35:06 1997 David L. Levine - - * ACE version 4.3.5, released Wed Sep 10 10:35:06 1997. - -Wed Sep 10 10:25:41 1997 David L. Levine - - * ace/Thread_Manager.cpp (exit): copy the thread exit hook before - releasing the guard, and call it after releasing the guard. - - * examples/Shared_Malloc/test_malloc.cpp (spawn): added (char *) - cast of slave_name () to avoid compilation warnings on Solaris. - -Wed Sep 10 00:43:04 1997 Nanbor Wang - - * ace/Makefile: Added Managed_Object to template sources. - - * ace/Object_Manager.{h,cpp}: * ace/Managed_Object.{h,cpp}: - Separate ACE_Managed_Object to a new set of file. - -Tue Sep 9 23:41:56 1997 Douglas C. Schmidt - - * tests/Reactors_Test.cpp (main): Check to see if wait() returns - -1 and then test to see what's gone wrong! - - * ace/OS.h: Added a "fake" #define for SIGALRM so that programs - will *compile* on platforms like Chorus. Thanks to Wei Chiang - for reporting this. - - * examples/Shared_Malloc/test_malloc.cpp (spawn): HP/UX doesn't - seem to like const char *const argv[] being given an initializer - list. I've fixed this to be just plain ol' char *argv[]. - Thanks to Sandro Doro for reporting this. - - * ace/Handle_Set.i (clr_bit): Replaced SOCKET with ACE_SOCKET so - this will compile on UNIX. - -Tue Sep 09 17:16:21 1997 - - * ace/Proactor: Updated Proactor to bring it upto date with the - recent changes to the Timer_Queue. - - * ace/Handle_Set.i (clr_bit and set_bit): These methods now change - the size_ member of the class on Win32. This is necessary since - the ACE_Handle_Set::operator fd_set *() accessor has been - optimized for size_ == 0. - -Tue Sep 09 09:14:07 1997 David L. Levine - - * ace/OS.cpp (cleanup_tss): On WIN32 and with ACE_HAS_TSS_EMULATION, - delete the ACE_TSS_Cleanup instance instead of registering it for - cleanup via the ACE_Object_Manager's at_exit (). This should allow - applications to use ACE_Log_Msg in their at_exit () hooks. Thanks - to Wei Chiang for reporting this problem. - - * ace/Object_Manager.{h,cpp}: added guard of internal structures. - (dtor): call at_exit hooks before calling cleanup_tss, now that - the ACE_TSS_Cleanup instance is no longer registered for an at_exit - call. (at_exit): set errno instead of returning different values - on error. Added ACE_Managed_Object template class, intended for - use in replacing static instances. - - * ace/Thread_Manager.cpp (exit): release guard before running the - thread exit hooks. This should help avoid deadlocks, in case - one of those hooks needs to operate on the Thread_Manager. - - * ace/CORBA_Handler.{h,cpp},Dump.{h,cpp},Object_Manager.{h,cpp}: - preallocate locks for CORBA_Handler and Dump in ACE_Object_Manager. - Statics are evil. - - * ace/Synch.{h,cpp},OS.cpp,Object_Manager.{h,cpp}: removed - ACE_TSS_Cleanup_Lock and replaced it with a preallocated mutex - in OS.cpp. Thanks to Nanbor for reporting problems at shutdown - with the old ACE_TSS_Cleanup_Lock static instance. - - * include/makeinclude/platform_sunos5_sunc++.GNU: when building - libraries only, don't use CC to create individual .shobj/*.so - files. The .so files are not needed to build libraries, because - libraries are built with -G. (They are needed to avoid upsetting - the ACE make rules, so they're created as links to their - corresponding .o files.) The .so files are still needed when - building executables in order to get all template instantiations. - - * include/makeinclude/platform_sunos5_g++.GNU: removed unused - SOLINK definitions. - -Mon Sep 8 18:38:22 1997 Douglas C. Schmidt - - * tests/Handle_Set_Test.cpp: It is possible for the order to get - the handles (using the iterator) will not agree with insert - order in ACE_Unbounded_Queue. It's best to use - ACE_Unbounded_Set. Thanks to Arturo for this fix. - -Mon Sep 8 17:43:43 1997 Darrell Brunsch - - * ace/Timer_{List,Wheel,Hash,Heap}_T.cpp: The iter() method now - returns a pointer to an iterator that is in a reset state - instead of an unknown one. - -Mon Sep 8 14:05:15 1997 Nanbor Wang - - * ace/ACE.cpp (read_adapter): Removed ACE_Thread_Control object in - this function. This is now taken care of by ACE_Thread_Manager. - (register_stdin_handler): This function no longer uses - ACE_Stdin_Args to pass in thread manager into read_adapter. - - * ace/ACE.h (ACE): Removed class ACE_Stdin_Args, because it is no - longer needed. - -Mon Sep 08 11:49:02 1997 David L. Levine - - * tests/run_tests.sh: moved log file checks out to separate file, - run_tests.check. - - * tests/run_tests.vxworks: added one-button test for VxWorks. - Check it out, Darrell. - - * ace/Filecache.cpp: commented out unused constants [RW]COPY_FLAGS. - -Mon Sep 08 08:26:52 1997 David L. Levine - - * ACE version 4.3.4, released Mon Sep 08 08:26:52 1997. - -Sat Sep 6 10:41:17 1997 Carlos O'Ryan - - * ace/Malloc.h: - sizeof() must be casted to int in ACE_CONTROL_BLOCK_ALIGN_LONGS - otherwise unsigned int arithmetic is used, thus obtaining - unexpected results. - -Sat Sep 06 09:07:02 1997 David L. Levine - - * OS.{h,cpp}: added ACE_Cleanup base class and - ace_cleanup_destroyer adapter. - - * Object_Manager.*: added at_exit () interface for ACE_Cleanup objects. - - * Singleton.{h,cpp},Token_Invariants.{h,cpp},Token_Manager.{h,cpp}: - base on ACE_Cleanup, so that simpler ACE_Object_Manager::at_exit () - can be used. - - * performance-tests/Misc/Makefile: moved $(BIN) files from FILES - to SRC so that they don't get put into libPerf. - -Sat Sep 6 02:36:31 1997 Nanbor Wang - - * tests/test_config.h (set_output): Added openning flag ios::trunc - explicitly if we are not appending to the opening ofstream. - This is required by standard CPP iostream libraries on NT (i.e., - we can't use ios::out alone when ofstream.open a file.) - -Sat Sep 6 00:21:33 1997 Douglas C. Schmidt - - * ace/Synch_T.h: Added new constructors: - - ACE_Guard(ACE_LOCK& l) : lock_(&l) - { this->owner_ = this->acquire(); } - - ACE_Read_Guard(ACE_LOCK& m) : ACE_Guard(&m) - { this->owner_ = this->acquire_read(); } - - ACE_Write_Guard(ACE_LOCK& m) : ACE_Guard(&m) - { this->owner_ = this->acquire_write(); } - - Remove default argument to current Guard classes. - - ACE_Guard(ACE_LOCK&l, int block) - ACE_Read_Guard(ACE_LOCK& m, int block) - ACE_Write_Guard(ACE_LOCK&m, int block) - with the current semantic. - - This change allows OS platforms with - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION or ACE_HAS ??? PRAGMA - ???, to> invoke common case constructor in a more efficient - way. Thanks to Arturo for this. - - * ace/Synch_T.h: ACE_Guard's destructor should be: - - ~ACE_Guard() { this->release(); } - - and not - - ~ACE_Guard() { if (this->owner_ != -1) this->release(); } - - because ACE_Guard::release has this test. Thanks to Arturo for - reporting this. - - * ace/ARGV.cpp: Declared the char* parameters for the ACE_ARGV - class constructors as const. Since they are copied in the - constructors, this is a safe thing to do. This makes it easier - to pass the result of string::c_str() to it. Thanks to Stephen - Coy for this suggestion. - - * ace/Thread_Manager.cpp: We were missing a Guard in the - ACE_Thread_Manager::at_exit() method. - - * ace/config-sunos5.5-sunc++-4.x.h: It appears that we need to set - ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS for Solaris 2.5 since otherwise - wierd things happen randomly. This is based on the following man - page entry for pthread_exit(): - - Do not call pthread_exit() from a cancellation cleanup handler - or destructor function that will be invoked as a result of - either an implicit or explicit call to pthread_exit(). - - * ace/Thread_Manager.cpp (run_thread_exit_hooks): Once the cleanup - hook(s) are called we set the value of the cleanup hook variable - to 0 to avoid false matches later on. - -Fri Sep 5 21:57:44 1997 Nanbor Wang - - * ace/Containers.i (is_empty): - * ace/Malloc.cpp (instance): Commented out ACE_TRACE in these - routines. They were causing recursive call if we used TRACE. - Thanks to Craig Perras for solving - this. - - * ace/Handle_Set.i (fd_set *): Added conditional compilation code - for Win32 platforms. This is because we don't maintain - on Win32 and, therefore, can't depend on it. - -Fri Sep 5 19:05:02 1997 Douglas C. Schmidt - - * tests/Thread_Manager_Test.cpp (main): moved delete - signal_catcher into the ACE_HAS_THREADS part of the main() - function. - - * ace/Reactor.cpp (check_handles): When handle_error was optimized - with fstat we put NULL value to second argument. It requires a - value to SCO OpenServer to work. Therefore, I added struct stat - temp and changed ACE_OS::fstat(handle, NULL) by - ACE_OS::fstat(handle, &temp); Thanks to Arturo for fixing this. - - * examples/Threads/process_manager.cpp (sig_handler): Fixed a bug - where the thread was exiting if no more children existed. - Thanks to Avraham Nash for reporting - this. - - * ace/Handle_Set: Added the following performance enhancements: - - . Assignment operator to optimize size == 0. - - . min_handle to manage the case when the Handle_Set start in - handle different of zero. - - . A new iterator algorithm tuned for select function calls. - - Thank to Arturo for these enhancements. - - * ace/config-aix-4.1.x.h: Added ACE_LACKS_TIMESPEC_T. Thanks to - Rob Head (rhead@virtc.com) for reporting this. - - * ace/OS.cpp (fork_exec): Changed the logic so that we don't - create a new console window on Win32. This isn't done on UNIX, - so there's no point in doing it here. Thanks to Jeff Richard - for pointing this out. - - * ace/Reactor.cpp: The call to - ACE_Reactor_Handler_Repository::open() in the constructor of - ACE_Reactor should check for == -1! Thanks to Brian Mendel for - reporting this. - - * ace/Reactor.cpp (remove_handler): Fixed a braino where the - conditional compile for NSIG should have been > 0 rather than == - 0. Thanks to fixing this codeKaren Amestoy - for reporting this fix. - -Fri Sep 05 16:17:50 1997 David L. Levine - - * performance-tests/Misc/preempt.cpp: added command line options, - and explanation on how to interpret the results. - -Thu Sep 04 10:26:11 1997 David L. Levine - - * ace/OS.cpp: (tss_open): removed paren from around type in "new" - statement, because GHS (and ANSI C++) compilers will choke on it. - Thanks to Brian Mendel for reporting - this. - - * ace/Thread_Manager.cpp: (ACE_Thread_Descriptor ctor): zero out - cleanup_hook_ in cleanup_info_ because we read it later on. - (dump): added guard because thr_table_ is accessed. (wait): - hacked in thr_yield () to give waited threads a chance to clean - up before continuing. - - * ace/OS.h (ACE_Cleanup_Info): added default ctor. - - * ace/Log_Msg.cpp (close): delete main thread's Log_Msg instance, - on Solaris if ACE_HAS_EXCEPTIONS is not defined, because main - thread TSS dtors apparently don't get called. - - * ace/Token_Manager.{h,cpp}: register ACE_Token_Manager singleton - for deletion with ACE_Object_Manager. - - * ace/Token_Invariants.{h,cpp}: register ACE_Token_Invariant_Manager - singleton for deletion with ACE_Object_Manager. - - * ace/Naming_Context.cpp (close) moved deletion of "name_options_" - from dtor to close (), because when Service_Repository is closed, - it calls close () instead of deleting the service. - - * ace/Process_Strategy.cpp (handle_signal): suppress printouts during - shutdown, to prevent using ACE_Log_Msg while it's being deleted. - - * ace/Timer_List.cpp: replace ACE_Recursive_Thread_Mutex with - ACE_SYNCH_RECURSIVE_MUTEX, for non-threaded platforms. - - * tests/Reactors_Test (~Test_Task): moved ASSERT after the printout, - so we can see why it failed. (svc): added printout with thread ID. - (main): deleted reactor at end of test to prevent leak. - - * tests/SPIPE_Test (client): increased sleep time to 10 sec, - because a long delay is needed with Purify. - - * tests/UPIPE_Test (connector): added 5 second sleep to give - acceptor a chance to start up. - - * include/makeinclude/wrapper_macros.GNU: added -max_threads=100 to - Quantify options. - - * include/makeinclude/rules.local.GNU: added *.sym to clean target. - -Thu Sep 04 09:39:08 1997 David L. Levine - - * ACE version 4.3.3, released Thu Sep 04 09:39:08 1997. - -Thu Sep 04 08:48:13 1997 David L. Levine - - * include/makeinclude/wrapper_macros.GNU: added shared_libs_only - and static_libs_only build options. Only static_libs_only - has been tested successfully. - - * include/makeinclude/rules.lib.GNU: added INSTALL support for - shared_libs_only and static_libs_only. - - * include/makeinclude/platform_vxworks*.GNU: use static_libs_only. - - * ace/OS.cpp: moved tss_open ()/tss_close () calls from invoke () - to ace_thread_adapter. - - * examples/Threads/auto_event.cpp,manual_event.cpp, - process_manager.cpp,reader_writer.cpp,tss2.cpp: - cast spawn entry point to ACE_THR_FUNC. - - * examples/Threads/task_four.cpp (Invoker_Task): rearranged - initializers to match declaration order. - - * examples/Threads/thread_specific.cpp (worker): use - ACE_OS::printf () instead of printf (), and print out the - ACE_hthread_t instead of the ACE_thread_t. - - * examples/IPC_SAP/SPIPE_SAP/client.cpp,consumer_msg.cpp, - consumer_read.cpp,producer_msg.cpp,producer_read.cpp,server.cpp: - moved #include of shared.h inside ACE_HAS_STREAM_PIPES protection - to avoid compilation warnings on unsupported platforms. - - * examples/Reactor/Ntalker/ntalker.cpp (main): removed unused "argc". - - * examples/*/*.cpp,netsvcs/clients/Tokens/mutex/test_mutex.cpp: - added args to main (). - -Wed Sep 3 21:38:18 1997 Carlos O'Ryan - - * ace/config-irix6.x-sgic++.h: - IRIX uses pthread_sigmask to manage per-thread signal mask, - thanks to Gonzalo Diethelm (gonzo@ing.puc.cl) for pointing out - this one. - - * ace/OS.h: - Removed an initial '#' for a comment line, thanks to Gonzalo - Diethelm (gonzo@ing.puc.cl) for pointing out this one. - - * ace/Timer_Hash_T.cpp: - * ace/Timer_Hash_T.h: - * ace/Timer_Heap_T.cpp: - * ace/Timer_Heap_T.h: - * ace/Timer_List.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_List_T.h: - * ace/Timer_Queue_T.cpp: - * ace/Timer_Queue_T.h: - * ace/Timer_Wheel_T.cpp: - * ace/Timer_Wheel_T.h: - In the word of its author: Modified the iterators kept in - each of these classes so that they are constructed - dynamically on the heap after the Queue has been properly - initialized. Otherwise, the iterators try to iterate over a - non-initialized queue, and fail miserably (usually dumping - core). Once more thanks to Gonzalo Diethelm - (gonzo@ing.puc.cl) for this changes. - - * tests/UPIPE_SAP_Test.cpp: - Gonzalo improved the error message. - - * ace/README: - Gonzalo updated the documentation for some macros. - -Wed Sep 03 15:21:46 1997 David L. Levine - - * ace/OS.h: define ACE_TSS macros with ACE_HAS_TSS_EMULATION, - and renamed some ACE_TSS_Emulation methods. - - * ace/OS.i: allow TSS_Emulation storage to be on thread stack, - instead of always dynamically allocating it. - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): allocate TSS_Emulation - storage on thread stack. (ACE_TSS_Cleanup::exit): only call - a TSS destructor if the thread's value is non-zero. - - * ace/Thread_Manager.cpp: support TSS_Emulation. - - * ace/Thread_Manager.cpp (resize): zero out unused cleanup_hooks - in thr_table_; (run_thread_exit_hooks): check for zero cleanup - hook before calling. - - * ace/Synch_T.*: allow ACE_HAS_TSS_EMULATION _or_ - ACE_HAS_THREAD_SPECIFIC_STORAGE. - - * ace/Object_Manager.{h,cpp}: allocate main thread's TSS_Emulation - storage in the ACE_Object_Manager instance. - - * ace/Log_Msg.h: befriend ACE_OS::cleanup_tss () instead of - ACE_Object_Manager, because the cleanup path is now indirect - from the ACE_Object_Manager. - - * ace/Log_Msg.cpp: use TSS_Emulation on VxWorks, so - VxWorks-specific code was removed. - - * ace/Task.cpp: removed unused #include of ace/Dynamic.h. (It had - been used for template instantiations, but they were moved.) - Also, removed unused #include of ace/Object_Manager.h. - - * ace/Svc_Handler.{h,cpp}: register Svc_Handler singleton for - deletion with the ACE_Object_Manager. - - * tests/Process_Strategy_Test (Options): added a destructor so that - the dynamically allocated concurrency_strategy_ can be deleted. - -Wed Sep 3 08:05:26 1997 Steve Huston - - * ace/Message_Block.h: Corrected comment on release(void) - the - underlying ACE_Data_Block's refcount is decremented; the - ACE_Message_Block is always deleted. - -Tue Sep 2 18:26:22 1997 Douglas C. Schmidt - - * ace/Task: Revised the ACE_Task_Base::svc_run() method to - register a thread exit hook (ACE_Task_Base::cleanup()) - - * ace/Task: Added a static method called cleanup() that can serve - as a thread exit hook to ensure that close() is always called - when a task exits a thread. - - * ace/Thread_Manager: Added the first-cut implementation of the - thread exit hooks. This one is butt-simple -- just allowing a - single hook per-thread, but that should be enough to get us over - the hump... - - * ace/OS.h: Moved the object_info_t type from Object_Manager.h and - renamed it to ACE_Cleanup_Info since we will use it with the - Thread_Manager and the Object_Manager. - - * ChangeLog-97b: Emptied out the ChangeLog-97b file until - we move the ChangeLog to this file... - - * ace/OS.h: Moved the typedef from the - ACE_Object_Manager into global scope so that it can also be used - by the ACE_Thread_Manager. - - * ace/DEV_IO: Moved the get_remote_addr() and get_local_addr() - from the DEV class to the DEV_IO class, which seems to be more - consistent with how they should be used. - - * ace/FILE_IO: Added the get_remote_addr() and get_local_addr() - methods to FILE_IO. Now we should be able to use this with the - Connector pattern. Thanks to Stephen Coy - for reporting this. - - * ace/DEV_Connector*h, ace/FILE*.h: Added "traits" for PEER_ADDR - and PEER_STREAM. Now we should be able to use this with the - Connector pattern. Thanks to Stephen Coy - for reporting this. - - * tests/Async_Timer_Queue_Test.cpp (main): Replaced the use of - fputs() with read() so that it will be signal-safe. Thanks to - Carlos for pointing out the need for this. - - * ace/Task: All the complex ACE_Task_Exit logic has been moved out - of the Task file and into the Thread_Manager file. This will - both simplify and generalize the behavior of cleanups on thread - exit. - -Tue Sep 2 14:42:52 1997 Nanbor Wang - - * ace/config-chorus.h (ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR): - Added this directive for Chorus uses g++. Thanks to David - Levine for pointing this out. - -Mon Sep 01 21:31:25 1997 David L. Levine - - * ChangeLog-97b,Makefile,bin/create_ace_build: ChangeLog is no longer - a symbolic link, but instead is the most recent ChangeLog file. - ChangeLog-97b was moved to ChangeLog. - - * ace/Timer_Queue_T.cpp (schedule): added ACE_UNUSED_ARGs for act - and interval. - - * ace/OS.h: changed ACE_SEH_EXCEPT and ACE_SEH_FINALLY from null - to "while (0)" on all platforms except ACE_WIN32. Thanks to - Nanbor for this bit of macro wizardry. - - * ace/OS.i (tss_base): cast VxWorks TCB spare field to a void **& - instead of a void **, because the function returns a reference - to it. - - * ace/OS.cpp: protected definition of - ACE_TSS_Emulation::tss_collection_ on VxWorks, where it's not used. - - * ace/OS.cpp (ACE_Thread_Adapter::invoke) don't exit the thread - with TSS_EMULATION, except on WIN32. (thr_create) On VxWorks, - use thread adapter as entry point instead of func (via macros). - - * ace/config-vxworks*.h: added ACE_HAS_TSS_EMULATION, with - ACE_DEFAULT_THREAD_KEYS set to 16, and ACE_LACKS_UNIX_SIGNALS. - - * tests/Async_Timer_Queue_Test.cpp: added template instantiations. - - * tests/IOStream_Test.cpp: no longer need to dynamically allocate - the ACE_SOCK_IOStreams with the recent ACE_Thread_Manager changes. - That was causing occasional problems with unsafe deletion of the - underlying ostreams. Thanks to James Johnson for consulting on - this intermittent (nasty) problem. - - * tests/SPIPE_Test.cpp: (main) added ACE_UNUSED_ARG of client - and server. - - * tests/Thread_Manager_Test (worker): added ACE_UNUSED_ARG (thr_mgr) - if ACE_LACKS_UNIX_SIGNALS, and added template instantiations. - - * tests/Thread_Manager_Test.cpp: dynamically allocate the - signal_catcher so that we can destroy it before the main - thread's TSS is cleaned up. - - * tests/TSS_Test.cpp: dynamically allocate TSS_Error so that we - can ensure its deletion before that of ACE_Object_Manager. - Also, makde the code a little easier to change the number of threads. - - * include/makeinclude/wrapper_macros.GNU: added Purify options to - ignore SIGINT and set max threads to 100. - -Mon Sep 1 10:53:39 1997 Douglas C. Schmidt - - * ace/Handle_Set: Added an assignment operator that is optimized - for the case when the right-hand side is 0. - - * ace/OS: The ACE_THR_C_FUNC macro was confusing for Win32. We've - replaced this with the original UNIX typedef and will just use - LPTHREAD_START_ROUTINE for Win32. - - * tests/Thread_Manager_Test.cpp (main): Revised this test so that - we don't have race conditions for suspend() and resume(). - - * tests/Tokens_Test.cpp (run_test): Removed the use of - THR_SUSPENDED and resume_all() since this is broken due to race - conditions and other hazards implicit in using suspend() and - resume() on threads. - - * ace/Handle_Set.cpp: There were several ACE_INLINE methods in the - Handle_Set.cpp file. I've removed the ACE_INLINE flag. - - * tests/SPIPE_Test.cpp: If ACE doesn't have STREAM pipes on a - platform (or we aren't on NT) then don't try to run this test. - Thanks to James CE Johnson for reporting - this. - - * ace/config-sunos5.[45]-g++.h: ACE defines _REENTRANT in - config.h. Application using classes of ACE can conflict by - using compilation option as -D_REENTRANT. I fixed this by - surrounding the define as: - - #if !defined (_REENTRANT) - #define _REENTRANT - #endif /* _REENTRANT */ - - Thanks to Jean-Marc Strauss for - reporting this. - - * ace/Timer_Queue_T.h: We need to #include "ace/Signal.h" since - our Async_Timer_Queue_Adapter needs it. Thanks to Neil Cohen - for reporting this. - - * ace/Reactor.cpp (check_handles): Optimized the check for invalid - handles by using fstat() rather than select() on non-Win32 - platforms. Thanks to Arturo for suggesting this optimization. - -Mon Sep 1 17:52:10 1997 Darrell Brunsch - - * ace/Timer_Heap_T.cpp: Changed cancel (id ...) to check for - previously expired/cancelled timers - -Mon Sep 01 08:43:37 1997 David L. Levine - - * ace/Synch.cpp: added #include of Object_Manager.h. - Thanks to Edan Ayal for reporting this. - -Mon Sep 1 00:46:05 1997 Nanbor Wang - - * ace/README: Added explanation for ACE_HAS_STL_MAP_CONFILICT. - - * ace/OS.h: Added conditional compilation directive - ACE_HAS_STL_MAP_CONFLICT. This is used when users want to - compile ACE with STL library and the STL map class conflicts - with map structure in . - - * ace/config-unixware-2.1.2-g++.h: - * ace/config-unixware-2.01-g++.h: - * ace/config-osf1-4.0-g++.h: - * ace/config-irix5.3-g++.h: - * ace/config-hpux-10.x-g++.h: - * ace/config-linux-pthread.h: - * ace/config-linux-lxpthreads.h: - * ace/config-linux.h: - * ace/config-freebsd.h: - * ace/config-freebsd-pthread.h: - Added ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR flag for all - config files which apparently use g++. - - * ace/config-vxworks-g++.h: - * ace/config-vxworks5.x-g++.h: - * ace/config-sunos4-g++.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos5.5-g++.h: - Moved ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR closer to - other template-related directives. - -Sun Aug 31 22:56:30 1997 Douglas C. Schmidt - - * ACE version 4.3.2, released Sun Aug 31 22:56:30 1997. - -Sun Aug 31 22:36:08 1997 Douglas C. Schmidt - - * tests/Async_Timer_Queue_Test.cpp: Need to #include "Timer_List.h" - rather than "Timer_Queue.h". - - * ace: Added ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT for all - config.h files. - - * ace/Handle_Set.cpp (count_bits): Continued to optimize this - method. Now, if ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT enabled - it will use a very fast loop that only runs for as many bits - that are enabled in the bitset. This approach also doesn't have - to access the Global Offset Table in shared libraries, which is - a win. Thanks to Arturo for contributing this. - - * tests/Async_Timer_Queue_Test.cpp: Generalized this test to use - the new ACE_Async_Timer_Queue_Adapter. - - * ace/Timer_Queue_T: Added the new ACE_Async_Timer_Queue_Adapter, - which makes it possible to encapsulate any of the ACE Timer - Queue mechanisms into a asynchronous signal-handling context. - - * ace/OS.i: If the platform doesn't support ualarm() (and it - doesn't lack UNIX signals) then we'll use alarm() rather - than ualarm(). Clearly, this isn't as good as ualarm(), - but it's better than nothing. - - * ace/OS.i: I'd missed replacing - - ACE_LACKS_POSIX_PROTO_FOR_SOME_FUNCS - - with - - ACE_LACKS_POSIX_PROTOTYPES_FOR_SOME_FUNCS - - in OS.i. Thanks to James CE Johnson for - pointing this out. - -Sun Aug 31 09:58:35 1997 Douglas C. Schmidt - - * Princess Diana was killed today in a senseless auto accident in - Paris, France. This is a very tragic ending to a very promising - life ahead of her. - -Sun Aug 31 15:08:00 1997 David L. Levine - - * tests/Async_Timer_Queue_Test.cpp: fixed and added some - ACE_UNUSED_ARG's. - - * netsvcs/clients/Tokens/invariant/invariant.cpp (run_mutex, - run_reader_writer), - netsvcs/clients/Tokens/mutex/test_mutex.cpp (run_test), - netsvcs/clients/Tokens/rw_lock/rw_locks.cpp (run_thread): - removed unused argument "vp". - - * ace/ACE.i (log2): moved "log" declaration outside of the - for loop because its used after the loop. - - * ace/Task.cpp (instance) only register for destruction with - ACE_Object_Manager when creating a new instance_. - - * ace/Thread_Manager.cpp (ACE_Thread_Control::exit) with TSS - emulation, don't exit the thread. Instead, - ACE_Thread_Adpater::invoke () will do it after cleaning up TSS. - - * ace/Synch{h,cpp}: (ACE_TSS_Cleanup_Lock) register for - destruction with ACE_Object_Manager. - - * ace/OS.*: major cleanup of ACE_TSS_Emulation, esp. how it - interacts with ACE_TSS_Cleanup::exit (). - -Sat Aug 30 17:30:24 1997 Steve Huston - - * Removed these config files: - config-hpux-10.x-aCC.h - config-hpux-10.x-decthreads.h - config-hpux-10.x-nothread.h - config-hpux-10.x-hpc++.h should be used with HP compilers on - HP-UX 10.x. - -Sat Aug 30 14:58:42 1997 Douglas C. Schmidt - - * ace/Signal.cpp (ACE_Sig_Action): Added a new constructor that - also takes an ACE_Sig_Set & *and* registers the handler... - - * ace/Handle_Set.cpp (count_bits): Added a newly optimized - algorithm for cases where - ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT. Thanks to Arturo for - this suggestion. - - * ace/config-sco-5.0.0*.h: Added ACE_HAS_LONG_FDMASK for all the - SCO files. Thanks to Arturo for suggesting this. - - * ace/Signal: Added a new mutator method to reassign an - ACE_Sig_Set to an ACE_Sig_Action. - - * ace/Handle_Set.i: If the size of the fd_set is 0 then operator - fd_set *() just returns 0. This will help to optimize the - performance of the Reactor. Thanks to Arturo for suggesting - this. - - * ace/Handle_Set.cpp (count_bits): Added yet another improvement - to remove the "i" iterator. Thanks to Arturo for this! - - * ace/Log_Msg.cpp (log): Used the new ACE_Log_Record::priority() - method in place of the type() method so that the priorities are - handled correctly. - - * ace/Log_Record: Added two new methods that get/set the - "priority" of an ACE_Log_Record. This value computed as the - base 2 log of the value of the corresponding ACE_Log_Priority - enumeral (which are all powers of two). We need this mapping - function so that we can use the priorities as parameters to the - putpmsg() function (which can only map between 0-255). Thanks - to Per Andersson for finding this stuff! - - * ace/ACE: Added a new method to compute the base2 logarithm of a - number. - - * Replaced all uses of ACE_Thread_Control since this is now - handled by the ACE_Thread_Manager. - - * ace/Thread_Manager.cpp (spawn_i): Make sure to pass "this" to - the ACE_Thread_Adapter if we're constructing it in the - ACE_Thread_Manager::spawn_i() method. - - * ace/OS.i (cond_timedwait): Added a special check to see if - timeout != 0, in which case we just call ACE_OS::cond_wait(). - Therefore, VxWorks can now use ACE_OS::cond_timedwait(), as long - as the timeout == 0! This simplifies certain internal ACE code. - Thanks to David Levine for pointing this out. - - * ace/Handle_Set.cpp (count_bits): Changed the code from - - for (int i = 0; i < sizeof (u_long); i++) - { - rval += ACE_Handle_Set::nbits_[n & 0xff]; - n >>= 8; - } - - to - - for (int i = 0; n != 0; i++) - { - rval += ACE_Handle_Set::nbits_[n & 0xff]; - n >>= 8; - } - - in order to speed it up in the "best case." Thanks to Arturo - Montes for reporting this. - - * ace/Thread.cpp (spawn_n): Added a test to make sure that the - thread_ids is != 0 before we assign into this. - -Fri Aug 29 22:45:21 1997 Nanbor Wang - - * ace/config-vxworks-g++.h: - * ace/config-vxworks5.x-g++.h: - * ace/config-sunos4-g++.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos5.5-g++.h: - Added flag ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR to these - config files. - - * ace/README: Added explanation of flag - "ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR." - When calling a template class'es destructor explicitly, if you - must use "ptr->FOO::~FOO ();" but not - "ptr->FOO::~FOO ();" then, you must add this flag to - your config file. - - * ace/OS.h (ACE_DES_FREE_TEMPLATE): Added this new macro to cope - with the fact that compilers require different syntax when - calling destructor of template classes explicitly. This macro - takes four arguments, POINTER, DEALLOCATOR, CLASS, and - TEMPLATE_PARAMETER. To deallocate a pointer allocated by - ACE_NEW_MALLOC and you need to call FOO class'es - destructor, you'll write: - - ACE_DES_FREE_TEMPLATE (ptr, alloc->free, FOO, ); - - * ace/Containers.cpp: Changed to use ACE_DES_FREE_TEMPLATE to iron - out differences among compilers. - -Fri Aug 29 15:31:50 1997 David L. Levine - - * ace/OS.*,Synch.{h,cpp},Object_Manager.cpp: started adding - support for TSS emulation. - - * ace/OS.h: declare class ostream if - ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. - - * tests/Async_Timer_Queue_Test.cpp (parse_commands): fixed - sscanf format specifiers to match argument types; (main): - fixed ACE_ERROR_RETURN parens; protected bulk of code with - ACE_HAS_UALARM so that the test will build cleanly on - platforms without it. - -Fri Aug 29 00:43:27 1997 Douglas C. Schmidt - - * ace/Synch.cpp (wait): Simpified the call to - ACE_OS::cond_timedwait() to avoid an extra test. Thanks to - Arturo for pointing this out. - - * ace/TTY_IO: Added native support for TSETA. Thanks to Arturo for - this. - - * ace/Strategies_T.cpp: Finished integrating the ACE_DLL_Strategy - implementation, which is used in TAO. Thanks to Satheesh Kumar - MG for motivating this. - - * ace/Synch_T.h: Clarified the constructor for ACE_TSS that takes - a TYPE * as an argument. Note that this only initializes the - TSS value in the *calling* thread, but not any other threads - that may come along later on. Thanks to Bob Laferriere - for helping to clarify this. - - * ace/Synch_T.h: Removed stray semi-colons from some of the - ACE_SYNCH_* macros. Thanks for Wei Chiang for reporting this. - -Fri Aug 29 11:40:10 1997 Darrell Brunsch - - * ace/OS.cpp: Added cast for ace_thread_adapter. - - * ace/OS.h: Changed name of ACE_Thread_Adapter's constructor's - fourth parameter from tm to tmgr since tm conflicted with - another tm. - - * ace/Thread_Manager.cpp: In spawn_i, changed the last parameter - given to spawn to thread_args. Also had to add a cast for - ace_thread_adapter. - -Fri Aug 29 06:44:05 1997 Nanbor Wang - - * ace/OS.h (ACE_DES_FREE): Added this macro which will call - designate destructor before freeing the memory. This is a - matching macro that should go with ACE_NEW_MALLOC and - ACE_NEW_MALLOC_RETURN which allocate memory using designate - allocator then call the user specified constructor explicitly. - - * ace/Containers.cpp: Many memory deallocations of container's - nodes were changed to use the new macro which deletes objects - correctly. - - Thanks very, very much to Ivan Murphy for torturing various - test programs and reporting those tests which fail the - excruciation. - -Fri Aug 29 01:26:38 1997 - - * ace/ReactorEx.cpp: Added two new methods to ReactorEx - - schedule_wakeup() and cancel_wakeup(). Also fixed some bugs - related to our local copy of network_events_ not getting updated - properly. Thanks to Edan Ayal for pointing out - the two missing functions. - -Thu Aug 28 20:12:23 1997 Douglas C. Schmidt - - * ace/Thread_Manager.cpp: Added a new ace_thread_manager_adapter() - function, which is similar to the ace_thread_adapter function - used in ACE_OS::thr_create(). However, the new function ensures - that threads spawned by an ACE_Thread_Manager are automatically - registered and deregistered from the Thread Manager. - - * ace/ACE.h (inherit_log_msg): Factored out the functionality to - inherit the logging features if the parent thread has an - ACE_Log_Msg instance in thread-specific storage. This function - is called in several places (e.g., OS.cpp and - Thread_Manager.cpp), so it pays to factor it out. - - * ace/OS.h (ACE_Thread_Adapter): Added a new data member that - keeps track of which thread entry point function we will pass to - the underlying OS thread creation routine. The default value is - ace_thread_adapter, but this can be overridden to do different - things... - - * ace/OS, - ace/Thread: Extended thr_create() so that if an - ACE_Thread_Adapter is passed to it this is used in lieu of the - func and arg parameters. This reduces the amount of dynamic - allocation and indirection required with the new - ACE_Thread_Manager. - - * ace/Task.h: Removed the ACE_Thread_Control data member from the - ACE_Task_Exit class since it now belongs to the - ACE_Thread_Manager instead... - - * ace/OS.cpp: Move the ACE_Thread_Adapter out of the OS.cpp file - and made it a first-class citizen of ACE. We can put this - to good use in the new ACE_Thread_Manager. - - * ace/OS.cpp: The ACE_Thread_Adapter is now the default behavior - in ACE. If you don't want to use it for whatever reason, - you'll need to set the ACE_NO_THREAD_ADAPTER macro. - - * ace/config-sco-5.0.0-fsu-pthread.h: Added - ACE_LACKS_CONST_TIMESPEC_PTR. Thanks to Arturo for this. - - * ace/Synch.cpp (wait): Removed the reference assignment and just - take the address of this->mutex_.lock_. Also, removed the - additional check for abstime == 0 in order to speed up the - common case. Thanks to Arturo for these suggestions. - -Thu Aug 28 20:02:03 1997 Douglas C. Schmidt - - * ACE version 4.3.1, released Thu Aug 28 20:02:03 1997. - -Thu Aug 28 00:21:09 1997 Douglas C. Schmidt - - * ace/Strategies_T.cpp (ACE_Thread_Strategy): Added reasonable - values to the default constructor. Thanks to Stephen Coy - for reporting this. - - * ace/config-irix6.x-sgic++-*.h: Added ACE_HAS_UALARM. Thanks to - Amos Shapira for reporting this. - - * ace/config-aix-4.*.h: Added ACE_HAS_UALARM. Thanks to Cary - Clark for reporting this. - - * ace/config-hpux-10.x*.h: Added ACE_HAS_UALARM. Thanks to Cary - Clark for reporting this. - - * ace/config-osf1*.h: Added ACE_HAS_UALARM. Thanks to Thilo - for reporting this. - - * ace/config-mvs.h: Added ACE_HAS_UALARM. Thanks to Chuck Gehr - for reporting this. - - * tests/Async_Timer_Queue_Test.cpp: Added a new test that will - illustrate how to implement an asynchronously invoked - Timer_Queue using UNIX SIGALRM signals. - -Thu Aug 28 19:32:07 1997 - - * examples/Reactor/ReactorEx: Added two new applications - (test_registry_changes.cpp and test_console_input.cpp) to show - some more features of ReactorEx. test_registry_changes.cpp shows - how to monitor the Registry using ReactorEx. - test_console_input.cpp shows how to use ReactorEx to get - notified when input shows up on the console. - -Thu Aug 28 18:07:37 1997 Darrell Brunsch - - * ace/Timer_{List,Heap,Wheel,Hash}_T.cpp: Changed the behavior - of the iterator to automatically initialize when the iterator - is constructed. - -Thu Aug 28 10:43:35 1997 David L. Levine - - * ace/Task.{h,cpp} (ACE_Task_Exit::instance) added call to - ACE_Object_Manager::at_exit () to clean up the singleton at - program termination. - -Thu Aug 28 03:25:52 1997 Nanbor Wang - - * tests/Task_Test.cpp (Barrier_Task): - * tests/TSS_Test.cpp (main): Added an array to collect thread - handles in order to clean them up. Thanks to Ivan Murphy - for pointing this out. - - * ace/Thread_Manager.{h,cpp} (spawn_n): - * ace/Task.{h,cpp} (activate): - Added an extra argument ACE_hthread_t thread_handles[] with - default value 0. We need this argument to collect handles of - spwaned/activated threads. On NT, we have to join terminated - threads explicitly to prevent handles leak. Thanks to Ivan - Murphy for digging this out. - -Wed Aug 27 10:48:25 1997 Douglas C. Schmidt - - * ace: Changed all occurrences of ACE_LACKS_RLIMIT_PROTO to - ACE_LACKS_RLIMIT_PROTOTYPE, ACE_LACKS_POSIX_PROTO to - ACE_LACKS_POSIX_PROTOTYPES, and ACE_LACKS_SYSV_MSQ_PROTOS to - ACE_LACKS_SYSV_MSQ_PROTOTYPES to be more consistent. - - * ace/config-sunos5.x*.h: Added ACE_HAS_UALARM to all the Solaris - config files. However, also had to add ACE_LACKS_UALARM_PROTOTYPE - since Solaris strangely doesn't provide this prototype. - - * ace/OS.h: Added an ACE_Time_Value version of ACE_OS::ualarm(). - - * ace/Signal: Added a new constructor for ACE_Sig_Action that - takes an ACE_Sig_Set parameter. - - * ace/Signal: Added a sigset() accessor method. - - * ace/config-unixware-2.1.2-g++.h: Added ACE_HAS_UALARM. Thanks - to Ganesh Pai for reporting this. - - * ace/OS.h: Added a default value of 0 to ACE_OS::time(). - - * ace/Synch.i (ACE_Thread_Mutex_Guard): Rearranged the code so - that we can inline the acquire(), tryacquire(), and release() - methods properly. Thanks to David Levine for pointing this out. - - * ace/OS.h: Added ACE_OS support for the ualarm() method. If your - platform supports ualarm() please send me email so I can set the - ACE_HAS_UALARM flag in your config.h file. - - * tests/Makefile: Added an asynchronous timer queue test. - - * examples/IOStream/server/iostream_server.cpp: Added a new macro - to work around the fact that some C++ compiles don't grok - template typedefs. Thanks to Oleg Krivosheev - for pointing this out. - - * ace/OS, - ace/Task.cpp: - Installed a bunch of patches for FSU pthreads. Thanks to Arturo - Montes for sending this. - - * Makefile: Added a line to the release script that will - automatically generate an ACE-INSTALL text file from the - ACE-INSTALL.html file. Thanks to Oleg Krivosheev - for suggesting this. - - * performance-tests/Misc/Makefile: Added $(BIN) to the FILE target - so that "make depend" will work. Thanks to David Levine for - pointing this out. - - * ace/Synch.i: Eliminated unnecessary assignment to this->owner_. - Thanks to Chris for pointing this out. - - * ace/OS.i (msgctl): Added a "struct" to the definition of - msqid_ds. Thanks to Steve Hickman for - reporting this. - -Thu Aug 28 01:07:21 1997 - - * examples/Reactor/ReactorEx/test_directory_changes.cpp: Added a - new example application. This application tests the working of - ReactorEx when users are interested in changes in the - filesystem. - -Wed Aug 27 22:06:23 1997 Nanbor Wang - - * *.{mak,mdp,dsw,dsp}: Updated ACE's library names on Win32 as - below. Only Microsoft's Win95 and Windows NT are effected. - - Version Dynamic Library Static Livrary - ------------------ -------------------- ----------------- - Debug aced.lib, aced.dll acesd.lib - Release ace.lib, ace.dll aces.lib - Debug w/ UNICODE aceud.lib, aceud.dll acesud.lib - Release w/ UNICODE aceu.lib, aceu.dll acesu.lib - - Thanks to John Morey for suggesting this and - Darrell for updating VC 5.0's makefiles. - - * ace/config-freebsd[-pthread].h (ACE_HAS_UALARM): FreeBSD does has - ualarm. - -Wed Aug 27 10:52:59 1997 Chris Cleeland - - * ace/Synch_T.h (CTOR): Eliminated unnecessary assignment to - this->owner_. - -Wed Aug 27 09:32:57 1997 David L. Levine - - * ace/Singleton.cpp (instance): removed full qualification of - "instance_" in ACE_NEW_RETURN macro, because it confused - the Sun C++ 4.2 preprocessor. - - * ace/Singleton.cpp: added support for ACE_HAS_SIG_C_FUNC platforms, - e.g., on MVS. At least I tried to. The cleanup function, - on ACE_HAS_SIG_C_FUNC platforms only, doesn't call the object's - destructor. It just deallocates the storage. That should be - good enough; I don't think it's worth trying to do more than that. - - * ace/Synch.cpp (close_singleton): removed call to - ACE_Allocator::close_singleton (), because this method is - only called if ACE_HAS_THREADS. - - * ace/Object_Manager.cpp (dtor): added call to - ACE_Allocater::close_singleton (), and protected call to - ACE_Static_Object_Lock::close_singleton () with ACE_HAS_THREADS. - - * tests/Time_Value_Test.cpp: disabled ACE_U_LongLong test - on ACE_WIN32 platforms, because that class is never used - there. Thanks to Nanbor for finding this. - - * performance-tests/Misc/preempt.cpp,Makefile: added preempt - test, which tests for thread preemption. - -Tue Aug 26 13:59:01 1997 Douglas C. Schmidt - - * netsvcs/lib/Server_Logging_Handler_T.cpp: Changed the symbol - "SS" to "SST" to avoid a namespace collision with UnixWare. - Thanks to Ganesh Pai for pointing this out. - - * ace: Added a new config file to sco using FSU pthreads. Thanks - to Arturo Montes for sending this. - - * include/makeinclude: Added a new platform macros file to sco - using FSU pthreads. Thanks to Arturo Montes - for sending this. - -Tue Aug 26 22:06:14 1997 - - * examples/Reactor/ReactorEx: Added two new applications for - testing some of the new features of ReactorEx. Added - documentation and renamed some of the older test files to make - it easier to comprehend the examples. - -Tue Aug 26 11:47:29 1997 - - * ace/OS.i (mutex_trylock): Changed this method to make it deal - correctly with abandoned mutexes. Also added a new mutex_trylock - method that allows the user to know if the mutex was abandoned - (through an extra out parameter). Also fixed - ACE_OS::cond_timedwait(), ACE_OS::cond_wait(), - ACE_OS::event_wait(), ACE_OS::event_timedwait() and - ACE_OS::sema_wait() to remove extra checks for WAIT_ABANDONED, - since we are not dealing with mutexes in these methods. Thanks - to Ivan Murphy for pointing this - out. - -Tue Aug 26 11:06:45 1997 David L. Levine - - * ace/OS.h,config-vxworks5.x-g++.h: - split ACE_HAS_RENAMED_MAIN into ACE_MAIN and - ACE_HAS_NONSTATIC_OBJECT_MANAGER. - - * ace/ACE.cpp: only create the ACE_Object_Manager_Destroyer - if not ACE_HAS_NONSTATIC_OBJECT_MANAGER. - - * ace/Object_Manager.{h,cpp}: dynamically allocated the - contained ACE_Unbounded_Queue to so that it can be deallocated - before the ACE_Allocator is destroyed. - - * ace/Singleton.{h,cpp}: register all ACE_Singletons for - cleanup with the ACE_Object_Manager. - - * ace/Synch.{h,cpp}: renamed ACE_Static_Object_Lock::atexit () to - close_singleton (), and removed the unused atexit hook. - - * ace/Log_Msg.cpp (ACE_Log_Msg_Manager::close): delete the - main thread's Log_Msg. - - * ace/config-vxworks-ghs-1.8.h: added ACE_HAS_NONSTATIC_OBJECT_MANAGER. - - * tests/Time_Value_Test.cpp: added tests of ACE_U_LongLong. - - * tests/Atomic_Op_Test.cpp (main): added arguments to main (). - - * tests/Barrier_Test.cpp (main): delete thread_handles array - to prevent memory leak. - - * examples/Reactor/Misc/test_signals_2.cpp (main): changed - type of second arg from "char *" to "char *[]". - -Mon Aug 25 14:13:57 1997 Carlos O'Ryan - - * ace/OS.h: - Changed the return type of sendmsg_timedwait from sszie_t to - ssize_t, this should only affect platforms where - ACE_LACKS_TIMEDWAIT_PROTOTYPES, further it was definitely wrong - before. - Thanks to ARTURO MONTES for pointing - out this one. - -Mon Aug 25 10:15:06 1997 David L. Levine - - * ace/Message_Queue.cpp (notify): fixed ACE_TRACE message. - - * examples/ASX/UPIPE_Event_Server/event_server.cpp, - examples/Connection/misc/test_upipe.cpp, - examples/Connection/non_blocking/test_*.cpp, - examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp, - examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp, - examples/Misc/test_dump.cpp, - examples/Reactor/FIFO/client.cpp, - examples/Reactor/Misc/test_*.cpp, - examples/Reactor/Proactor/test_multiple_loops.cpp, - examples/Reactor/Proactor/test_timeout.cpp, - examples/Reactor/ReactorEx/test_timeout.cpp, - examples/Reactor/ReactorEx/test_exceptions.cpp, - examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp, - examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp, - examples/Shared_Malloc/test_multiple_mallocs.cpp, - examples/System_V_IPC/SV_Message_Queues/*MQ_*.cpp, - examples/System_V_IPC/SV_Semaphores/Semaphores_?.cpp, - examples/Threads/process_mutex.cpp, - examples/Threads/recursive_mutex.cpp, - examples/Threads/tss1.cpp, - examples/Threads/thread_specific.cpp, - examples/Threads/token.cpp, - examples/Threads/wfmo.cpp, - tests/Simple_Message_Block_Test.cpp, - tests/Hash_Map_Manager_Test.cpp: - added arguments to main () to support redeclaring it on VxWorks. - - From now on, we should always declare main () with arguments, e.g., - int - main (int, char *[]) - -Sun Aug 24 10:27:33 1997 Douglas C. Schmidt - - * tests/Future_Test.cpp (Scheduler): Removed the non-existent - friend class Method_ObjectWork. Thanks to Sandro Doro - for reporting this problem. - - * ace/Message_Block.h: Clarified in the comments that the length() - of a Message_Block is 0 until the wr_ptr() is explicitly set. - Thanks to Amos Shapira for pointing out - the need for this. - -Sat Aug 23 14:43:27 1997 Douglas C. Schmidt - - * ACE version 4.3, released Sat Aug 23 14:43:27 1997. - -Sat Aug 23 14:40:32 1997 Douglas C. Schmidt - - * Released the long-awaited ACE 4.3. Good night sweet prince: - And flights of angels sing thee to thy rest. - -Sat Aug 23 00:44:09 1997 Douglas C. Schmidt - - * netsvcs/lib/Server_Logging_Handler.cpp: Make sure that we - explicitly instantiate ACE_Svc_Handler whether or not we're building with threads - since otherwise we get link errors. - -Fri Aug 22 20:58:49 1997 Nanbor Wang - - * ace/OS.cpp (ACE_TSS_Cleanup): Changed the lock for - ACE_TSS_Cleanup from a static object to a singleton to avoid the - nasty detruction order problem. This only effects Win32. - - * ace/Synch.{h,cpp}: Added a new singleton lock - "ACE_TSS_Cleanup_Lock" for Win32 platform. This object is - expect to be put under ACE_Object_Manager's control and will - probably gone/changed in the near future. - -Fri Aug 22 18:48:17 1997 Carlos O'Ryan - - * ACE-install.sh: - I updated the information on IRIX. Now we know for a fact it - compiles on IRIX 6.x, but we are not certain on IRIX 5.X. - - * bin/auto_compile_wrapper: - I have tried to make it clear that auto_compile_wrapper must be - tailored on each site. The email address is invalid and the - script should just crash the - - * ace/OS.i (cond_timedwait): - It used to always dereference the timeout parameter, which could - be 0 (heading for a - Sthreads use timestruc_t instead of timespec_t, thanks to - Ganesh Pai for pointing out this one and to - Steve Huston for explaining to us what - was going on. - -Fri Aug 22 08:46:39 1997 David L. Levine - - * include/makeinclude/platform_vxworks*.GNU: - unset SHLIB to fix builds without PRELIB. - - * netsvcs/lib/Logging_Strategy.cpp, - examples/Threads/task_three.cpp: include fstream.h and - iostream.h if ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. - - * examples/ASX/UPIPE_Event_Server/event_server.cpp, - examples/Log_Msg/test_log_msg.cpp, - examples/Reactor/Misc/test_time_value.cpp, - examples/Logger/Accepter-server/server_loggerd.cpp: - #include iostream.h if ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. - - * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp (svc): - replaced an iostream printout with an ACE_DEBUG call. - - * examples/Misc/test_read_buffer.cpp, - test_dump.cpp, - Mem_Map/IO-tests/test_io.cpp: - replaced bare OS calls with ACE_OS calls. - - * examples/Reactor/Misc/notification.cpp (Thread_Handler): - added cast of svc_run to ACE_THR_FUNC. - -Thu Aug 21 22:38:19 1997 Carlos O'Ryan - - * bin/auto_compile: - This tool will checkout ACE_wrapper from CVS, use - bin/create_ace_build to update a clone directory, compile ace - and tests in that clone directory and then run run_tests.sh. - If there is any problem it will report it to email. - - * bin/auto_compile_wrapper: - The former needs some configuration information and a proper - enviroment, hence it may not be invoked directly from your - crontab. This tool is used for that purpose. - - * apps/Gateway/Gateway/Makefile: - * apps/JAWS/server/Makefile: - * examples/Connection/non_blocking/Makefile: - * examples/IPC_SAP/DEV_SAP/reader/Makefile: - * examples/IPC_SAP/DEV_SAP/writer/Makefile: - * examples/Service_Configurator/IPC-tests/server/Makefile: - * netsvcs/clients/Naming/Client/Makefile: - * netsvcs/clients/Naming/Dump_Restore/Makefile: - * performance-tests/Synch-Benchmarks/Makefile: - No need to defines LIBS=-lACE here, it is already done in - wrapper_macros.GNU. Thanks to Cary Clark for - pointing out this one. - - * bin/create_ace_build: - New flag -a to create all symlinks using absolute paths, it - helps when the build directory is a symlink too. - - * include/makeinclude/platform_irix6.x-sgic++.GNU: - ACE now compiles with little or no warnings, I kept the linker - warnings deactivated though. - -ptall does not work any more. I added a comment on that. - - * ace/OS.h: - * apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp: - * apps/JAWS/clients/Blobby/Blob_Handler.cpp: - * apps/JAWS/server/HTTP_Server.cpp: - * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp: - * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp: - * examples/IPC_SAP/SPIPE_SAP/producer_read.cpp: - * examples/Reactor/Dgram/CODgram.cpp: - * examples/Reactor/Dgram/Dgram.cpp: - * examples/Reactor/Misc/test_demuxing.cpp: - * examples/Reactor/Misc/test_reactors.cpp: - * examples/Reactor/Misc/test_signals_2.cpp: - * examples/Threads/barrier2.cpp: - * examples/Threads/process_manager.cpp: - * examples/Threads/task_three.cpp: - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: - * netsvcs/clients/Tokens/collection/collection.cpp: - * netsvcs/clients/Tokens/mutex/test_mutex.cpp: - * performance-tests/Misc/childbirth_time.cpp: - * tests/Reactor_Exceptions_Test.cpp: - * tests/Reactors_Test.cpp: - * tests/SOCK_Test.cpp: - New macro ACE_NOTREACHED. Some compilers will issue warnings on - unreached statements with things like: - int foo() - { - if (bar) { - return 0; - } else { - return 1; - } - return 0; // warning here - } - but if we remove the last return some other compiler will issue - warnings on leaving the function with no return value. - This macro tries to deal with that, all we have to do is to - write the last line like: - int foo() - { - if (bar) { - return 0; - } else { - return 1; - } - ACE_NOTREACHED(return 0); // No warning now!!! - } - IMHO it also serves as a form of documentation. - -Thu Aug 21 21:00:35 1997 - - * ace/Auto_Ptr: Changed auto_ptr implementation to be as close - to the C++ specification as possible. Things that are still - missing are: - (a) std namespace - (b) member templates implementations - (c) making the constructors explicit - - * ace/OS.h (ACE_BIT_STRICTLY_ENABLED): Added new macro to check if - a bit is strictly enabled in a word. This is necessary when the - bit would be a combination of bits, and therefore, just - comparing against != 0 (like ACE_BIT_ENABLED does) is not enough - and comparing == BIT is necessary. - -Thu Aug 21 19:28:28 1997 James C Hu - - * include/makeinclude/rules.local.GNU (depend.local): If TAO_ROOT - is not set, don't try using it in sed. - - * bin/g++dep: Check the existence of the TAO_ROOT environment - variable before adding it to the relative pathname replacement - strategy. - -Thu Aug 21 16:29:02 1997 David L. Levine - - * ace/OS.h: added THR_JOINABLE and THR_SCHED_FIFO/RR/DEFAULT - to STHREADS, WTHREADS, and non-threaded platforms. On VxWorks - only, set NSIG to _NSIGS + 1. - - * ace/config-vxworks*.h: removed ACE_HAS_POSIX_SEM now that we - emulate it for VxWorks. - - * tests/Priority_Task_Test.cpp: use THR_SCHED_FIFO unconditionally - now that it's defined on all platforms. - - * include/makeinclude/platform_chorus.GNU, - platform_hpux_gcc.GNU, - platform_linux*.GNU, - platform_m88k.GNU, - platform_osf1_4.0_g++.GNU, - platform_sco*.GNU, - platform_sunos*_g++.GNU, - platform_unixware_g++.GNU, - g++ only: replaced PRELIB with "true" because it's not - needed for template instantiation. The old PRELIB no longer - worked without -lACE being added to LIBS in individual Makfiles. - The only reason to leave PRELIB defined to something is so that - the shared object definitions will be correct in rules.lib.GNU. - That should be fixed after 4.3 is released. - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: - PRELIB no longer needed with explicit template instantiation. - -Thu Aug 21 12:38:26 1997 Steve Huston - - * ace/config-hpux-10.x.h: Removed extraneous #endif - -Thu Aug 21 12:21:16 1997 Nanbor Wang - - * ace/OS.h (THR_JOINABLE): Defined this macro for Win32 as 0. - -Wed Aug 20 22:36:52 1997 Douglas C. Schmidt - - * ACE version 4.2.44, released Wed Aug 20 22:36:52 1997. - -Wed Aug 20 18:28:28 1997 Steve Huston - - * ace/config-hpux-10.x.h: Made some definitions dependent on the - HP-UX version that is compiling the code. - - * ace/Filecache.(cpp h): Moved the definition of ACE_Filecache_Object - from .cpp to .h to help AIX xlC's template instantiator along. - - * apps/Gateway/Peer/Peer.(cpp h): Moved the definition of Peer_Handler - from .cpp to .h to help AIX xlC's template instantiator along. - - * include/makeinclude/platform_(hpux hpux_aCC hpux_gcc).GNU: Added - a compiler option to define HPUX_VERS with the current OS version. - Used in the config-hpux-10.x.h file. - -Wed Aug 20 13:44:16 1997 Carlos O'Ryan - - * ace/config-unixware-2.1.2-g++.h: - Unixware does not define timespec_t. Thanks to Ganesh Pai - for pointing out this one. - -Wed Aug 20 11:37:44 1997 David L. Levine - - * include/makeinclude/rules.bin.GNU,platform_vxworks5.x_g++.GNU: - added POSTLINK to build symbol table. - -Wed Aug 20 07:43:14 1997 Douglas C. Schmidt - - * ACE version 4.2.43, released Wed Aug 20 07:43:14 1997. - -Tue Aug 19 08:25:28 1997 Steve Huston - - * tests/Barrier_Test.cpp: Added THR_JOINABLE to the flags for - creating threads - allows join to work on platforms that create - threads detached by default (i.e. AIX). - - * tests/Process_Strategy_Test.cpp: If the final ACE_OS::kill() fails, - don't ACE_OS::wait() for the process. - - * ace/config-aix-4.2.x.h: Added ACE_HAS_BROKEN_POSIX_TIME. Commented - out ACE_HAS_AIX_BROKEN_SOCKET_HEADER. Added ACE_HAS_PTHREAD_T, - and will now not use tid_t for any ACE types. Rearranged things - to start clarifying items. - - * ace/config-hpux-10.x.h: Removed ACE_HAS_SETKIND_NP and adjusted - other, more meaningful, threads-related definitions to match what - HP 10.10 and 10.20 have for threads. This matches changes to OS.* - - * ace/OS.(h i cpp): Removed use of ACE_SETKIND_NP in an effort to - simplify the variety of threads-capability definitions. The only - platforms which used ACE_HAS_SETKIND_NP were HP-UX (see above) and - OSF/1 V3.2 (which has the same threads package as HP-UX). OSF/1 - V3.2 may require some adjustments per this change - it probably - should be changed to match HP-UX. OSF/1 V4 (aka Digital UNIX) - is not affected by this change. - - * ace/Log_Msg.cpp: Changed the 't' format (thread ID) to call - thread_self() directly on AIX. - -Mon Aug 18 21:39:33 1997 Douglas C. Schmidt - - * ACE version 4.2.42, released Mon Aug 18 21:39:33 1997. - -Mon Aug 18 20:22:14 1997 Carlos O'Ryan - - * apps/Gateway/Peer/Makefile: - No need to define LIBS=-lACE here, its already done in - wrapper_macros.GNU. Thanks to Cary Clark - for helping in this effort. - -Mon Aug 18 19:54:36 1997 Nanbor Wang - - * ace/OS.{h,i} (open, mutex_init, sema_init, event_init, mmap): - Added an extra argument LPSECURITY_ATTRIBUTE with default value - 0 to all these methods so that we can modify objects' security - attributes when needed. Thanks to Ivan Murphy for pointing this - out. - -Mon Aug 18 19:50:13 1997 Carlos O'Ryan - - * examples/Service_Configurator/Makefile: - * examples/Service_Configurator/IPC-tests/server/Makefile: - * apps/Gateway/Gateway/Makefile: - * examples/Connection/non_blocking/Makefile: - $(SOEXT) must be used instead of just .so, the former does not - work on all platforms, notably HP-UX. Thanks to Cary Clark - for helping in this effort. - -Mon Aug 18 19:46:27 1997 Carlos O'Ryan - - * ace/OS.i: - Added support for the missing netdb reentrant functions, even - under IRIX 6.2 with no threads. Thanks Paul Roman - for reporting this. - -Mon Aug 18 12:53:16 1997 David Levine - - * tests/Barrier_Test.cpp (tester): VxWorks doesn't support - thr_join(). Therefore, we need to work around it for now. - Maybe Wind River will fix it at some point. - -Mon Aug 18 12:38:52 1997 Steve Huston - - * ace/config-aix-4.2.x.h: Removed ACE_HAS_SVR4_TIME, added - ACE_LACKS_TIMESPEC_T. - -Mon Aug 18 12:00:31 1997 Carlos O'Ryan - - * ace/config-mvs.h: - MVS does not define timespec_t either. Thanks to Chuck - Gehr for reporting this. - -Mon Aug 18 10:41:05 1997 Carlos O'Ryan - - * ace/OS.h: - * ace/README: - On some platforms timespec_t is not defined. We added a new - config macro (ACE_LACKS_TIMESPEC_T) to handle that and we do a - typedef to solve the problem. - - * ace/config-freebsd-pthread.h: - * ace/config-freebsd.h: - * ace/config-linux-lxpthreads.h: - * ace/config-linux-pthread.h: - * ace/config-linux.h: - These are *some* config files that needed changes due to the new - timespec_t stuff. - -Mon Aug 18 09:34:11 1997 David L. Levine - - * ace/OS.cpp (ACE_Thread_Adapter): rearranged initializers to - match declaration order. - - * ace/Log_Record.h: declare "class ostream" if - ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION Log_Record.h. - - * ace/IOStream.h,Log_Msg.cpp,Log_Record.cpp, - tests/test_config.h: include iostream.h instead of ace/stdcpp.h - if ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. - - * ace/config-vxworks*.h: added ACE_LACKS_TIMESPEC_T. - -Sun Aug 17 20:58:56 1997 Douglas C. Schmidt - - * ACE version 4.2.41, released Sun Aug 17 20:58:56 1997. - -Sun Aug 17 17:02:53 1997 Carlos O'Ryan - - * ace/config-irix6.x-sgic++-nothreads.h: - * ace/config-irix6.x-sgic++.h: - * include/makeinclude/platform_irix6.x-sgic++.GNU: - Finally a single config.h and platform_macros.GNU file can be use - for all the IRIX 6.X versions. - On SGI machines we need a higher value for - ACE_DEFAULT_BASE_ADDR, we used 1024*1024*1024, which works on - our site, but your mileage may vary. - - * include/makeinclude/platform_irix6.2_sgic++.GNU: - * include/makeinclude/platform_irix6.4_sgic++.GNU: - * ace/config-irix6.2-sgic++-nothreads.h: - * ace/config-irix6.2-sgic++.h: - * ace/config-irix6.4-sgic++-nothreads.h: - * ace/config-irix6.4-sgic++.h: - These files are no longer needed, see above. - - * ace/README: - * ace/ACE.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/Profile_Timer.cpp: - * ace/Profile_Timer.h: - We no longer use timestruct_t in ACE, it is a SYSVism; we use - timespec_t instead. Hence we have no need for the config - macro ACE_HAS_SVR4_TIME, but we keep it there for future - reference. - - * tests/Reader_Writer_Test.cpp: - On IRIX using ACE_Thread::yield() degraded performance for - multiprocessor machines, but worse, the test will not behave as - expected: instead of interleaving read/write locks over the - RW_Mutex it will make all the write locks first and then the read - locks. The test uses ACE_OS::sleep() for yielding the CPU, - and it uses different pauses for each thread (see code for - details). Further, it yields the CPU *before* taking the - lock, to give other threads a chance. - -Sat Aug 16 18:17:10 1997 Douglas C. Schmidt - - * ACE version 4.2.40, released Sat Aug 16 18:17:10 1997. - -Sat Aug 16 18:13:22 1997 Douglas C. Schmidt - - * ace/ReactorEx.cpp (add_network_events_i): Revised the code to - use the ACE_BIT_CMP_MASK and ACE_SET_BITS macros to simplify the - code. - - * ace/OS.h: Added a new macro called ACE_BIT_CMP_MASK which checks - if a "bit-wise" & with a word == a particular mask. - - * ace/OS.cpp (thr_create): If we're in the Pthreads implementation - then we assume that ACE_thread_t and ACE_hthread_t are the same. - If this *isn't* correct on some platform, please let us know. - Thanks to Carlos O'Ryan . - - * ace/Auto_Ptr.cpp: Reverted the changes of ACE_Auto_Ptr to - auto_ptr since we want to be Standard C++ Library compliant. - However, we only define auto_ptr if ACE_HAS_STANDARD_CPP_LIBRARY - is *not* enabled. - - * Removed the INSTALL file since this is redundant with the HTML - version of this file (ACE-INSTALL.html). Thanks to David Levine - for doing the legwork to merge this. - -Sat Aug 16 15:11:24 1997 Darrell Brunsch - - * ace/Auto_Ptr.h: Put in an #include (for auto_ptr) if - the standard C++ library is being used. - - * ace/Auto_Ptr.*: Changed the checks for ACE_HAS_STANDARD_CPP_LIBRARY - to also check to see if it is defined to 0 (which means the same - as it not being defined). - - * ace/ReactorEx.cpp: Changed the use of auto_ptr to work with - the one in the Standard C++ library. - - * ace/config-win32-common.h: Added ACE_HAS_BROKEN_NESTED_TEMPLATES - and ACE_LACKS_STL_DEFAULT_TEMPLATE_PARAMETER for the MSVC versions - that need them. - - * ace/Registry.cpp: changed some variable names from iterator to - iter to prevent conflicts with another variable - - * ace/Registry.cpp: - STL/bstring.h: - - Changed references of NPOS to Istring::npos - -Sat Aug 16 14:17:07 1997 Carlos O'Ryan - - * ace/Auto_Ptr.i: - * ace/Auto_Ptr.cpp: - Some code was only included if ACE_HAS_STANDARD_CPP_LIBRARY was - defined; but the intention was exactly the opposite. - -Sat Aug 16 14:33:26 1997 David L. Levine - - * README,FAQ,Makefile: changed references from INSTALL file - to ACE-INSTALL.html. - -Fri Aug 15 19:51:52 1997 - - * ace/Auto_Ptr.h: A rarely used piece of ACE code has changed - names because of name conflicts with the Microsoft Standard C++ - Library. The change is from auto_ptr to ACE_Auto_Ptr. A perl - script ($ACE_ROOT/bin/auto_ptr.perl) is provided for users to - change their code accordingly. - - The following files were effected: - - ace: ACE.cpp Auto_Ptr.cpp Auto_Ptr.h Auto_Ptr.i OS.h - ReactorEx.cpp Service_Config.cpp Service_Object.h - - examples/Threads: future1.cpp future2.cpp test_future1.cpp - test_future2.cpp - - tests: Future_Test.cpp - -Fri Aug 15 17:41:28 1997 Douglas C. Schmidt - - * ACE version 4.2.39, released Fri Aug 15 17:41:28 1997. - -Fri Aug 15 13:33:04 1997 Nanbor Wang - - * ace/OS.h (ACE_DEFAULT_GLOBALNAME_W): Moved pathname delimiter - from ACE_DEFAULT_{LOCAL|GLOBAL}NAME_* to - ACE_DEFUALT_NAMESPACE_DIR on NT. We need to append local/global - name to get a unique mutex name for naming service. NT won't - let us put a backslash in lock name. ;( - -Fri Aug 15 14:50:26 1997 Steve Huston - - * ace/Makefile: Moved ARGV from the TEMPLATES section to the FILES - section; now builds on AIX. - - * ace/config-hpux-10.x.h: Don't redefine _HPUX_SOURCE. Move the - ACE_HAS_REENTRANT_FUNCTIONS and ACE_CTIME_R_RETURNS_INT to the - build-with-threads section. Thanks to Neil Cohen - for helping to flush these problems out. - - * tests/Makefile: If building on AIX, wipe out the tempinc directory - before each compilation to keep the driver from compiling all - prior programs' template instantiations in every link step. - -Fri Aug 15 13:07:26 1997 Douglas C. Schmidt - - * ace/Signal.cpp (remove_handler): Added some additional - parameters to ACE_Sig_Action usages in order to get this stuff - to compile with G++ on SunOS 4.1.4. Thanks to Kumar Neelakantan - for reporting this. - - * ACE version 4.2.38, released Thu Aug 14 23:07:26 1997. - -Fri Aug 15 13:33:04 1997 Nanbor Wang - - * ace/Naming_Context.cpp (ACE_Naming_Context): Moved the deletion - of name_options_ from close to dtor of this class so that we can - reconfigure the naming context. - -Fri Aug 15 10:28:14 1997 Darrell Brunsch - - * ace/OS.cpp: Changed uname() for Win32 so it returns information - for Windows 95 and NT. - -Thu Aug 14 18:06:37 1997 Chris Cleeland - - * ace/OS.[hi] (strsplit_r): Added a new method which splits a - string separated by tokens, similar to the way that perl's - split() works. This is different from the strtok() family b/c - for the string ":/foo:/bar::boo", strtok() would return "/foo", - "/bar", "boo", while strsplit_r() returns "", "/foo", "/bar", - "", "boo". This method is also properly re-entrant, and thus - safe to use among multiple threads. - - * ace/ACE.cpp (ldfind): Fixed this so that it now properly deals - with paths containing empty components intended to indicate - 'current directory'. - -Thu Aug 14 17:30:36 1997 Steve Huston - - * ace/config-hpux-10.x.h - Add ACE_LACKS_CONST_STRBUF_PTR, remove - ACE_HAS_POSIX_SEM, clarify comments regarding setting of - _CMA_NOWRAPPERS_ - thanks to Cary Clark for - helping in this effort. - -Thu Aug 14 16:14:47 1997 David L. Levine - - * ace/High_Res_Timer.cpp (print_ave,print_total): fixed format - specification for total_secs to be lu instead of lld. - -Thu Aug 14 14:06:37 1997 Chris Cleeland - - * ace/ARGV.cpp: Completed the explicit template instantiations for - this component. - -Thu Aug 14 11:27:03 1997 Edward Everett Anderson - - * ace/ARGV.* (argv): - - * Added another behavior to ACE_ARGV -- a user can iteratively - build the parameter set with add(). Made the class more - consistent so that accessors work no matter which constructor is - used. - -Thu Aug 14 10:14:37 1997 Darrell Brunsch - - * Made several changes to allow ACE to work with the new standard - C++ header files, such as and the built in STL. Thanks - to Matthias Kerkhoff for these changes. - The default is to use the old headers, unless the - ACE_HAS_STANDARD_CPP_LIBRARY is defined as 1. - - * ace/config-win32-common.h: - ace/config-win32.h: - - - Added ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB flag to - distinguish compilers who have the standard C++ library - declared in the namespace std and those who use the global - namespace for it - - - Enabled ACE_HAS_SIG_ATOMIC_T and ACE_HAS_TYPENAME_KEYWORD for - MSVC 5 - - - Changed the semantics of ACE_HAS_STANDARD_CPP_LIBRARY from - [defined/undefined] to [(undefined or defined as 0)/defined != 0] - to allow the choice between the old iostream and standard C++ - library for those platforms that support both - - - Don't define the ACE_LACKS_IOSTREAM_FX when building with MSVC - 5.0 and the standard C++ library. - - - If __ACE_INLINE__ is defined as 0, config-win32-common.h - undefines __ACE_INLINE__ to decrease the size of libraries and - executables. - - * ace/IOStream.cpp: Moved the #ifdef ACE_LACKS_ACE_IOSTREAM up to the - proper place - - * ace/IOStream.h: - ace/IOStream_T.h: - ace/Log_Msg.cpp: - ace/Log_Msg.h: - ace/Log_Record.cpp: - ace/Log_Record.h: - examples/ASX/Message_Queue/*.dsp: - examples/OS/Process/*.dsp: - examples/Threads/*.dsp: - examples/Threads/barrier2.cpp: - examples/Threads/task_three.cpp: - netsvcs/lib/Logging_Strategy.cpp: - - Updated to including stdcpp.h instead of , - , , etc. - - * ace/OS.h: Updated to use stdcpp.h instead of including the - normal C headers. Moved the includes into stdcpp.h to allow - switching between the old and new versions - - * ace/Registry.h: Changed to use the standard C++ headers for STL - and added a typedef Name_Component and Binding to - ACE_Registry::* to help some unresolved problems. - - * tests/Hash_Map_Manager_Test.cpp: - tests/test_config.h: - - Updated to #include ace/stdcpp.h instead of and - - - * ace/stdcpp.h: Updated to include more of the new standard C++ - header files, and also promote some of the iostream classes to - the global namespace. - - * ace/ace.dsp: - - - Added some folders like Templates and Documentation - - Added some files that were missing to the project - - Enabled function level linking for debug projects - - Set it to "Not using MFC" - - Removed wsock32.lib from the project settings (since - config-win32-common.h will tell the linker to use the correct - winsock library) - - Removed some other unnecessary libraries (OLE) from the - project. - -Wed Aug 13 23:02:45 1997 Douglas C. Schmidt - - * ACE version 4.2.37, released Wed Aug 13 23:02:45 1997. - -Wed Aug 13 13:26:27 1997 Douglas C. Schmidt - - * tests/Barrier_Test.cpp (main): Fixed the test of the ACE_Barrier - class so that it doesn't leak handles. This also illustrates - the use of the ACE_Thread::join() and - ACE_Thread_Manager::spawn_n() methods. Thanks to Ivan Murphy - for pointing this out. - - * ace/Thread_Manager.cpp (spawn_n): Note that if we get a null - thread_ids parameter we shouldn't try to index into it! - - * include/makeinclude/rules.local.GNU (OBJDIRS): Added - so_locations to the list of directories cleaned up during a make - clean/realclean. Thanks to Amos Shapira for reporting this. - - * ACE version 4.2.36, released Wed Aug 13 07:30:10 1997. - - * include/makeinclude/platform_irix6.[x-]32_sgic++.GNU: Added a - -Wl,-woff,133 to LDFLAGS to make the linker shutup about branch - instructions that might degrade performance - (what does this mean?). Thanks to Amos for this. - - * tests/test_config.h: Fixed a typo (ourput_file() should be - output_file()). How on earth did this ever work?! Thanks to - Amos Shapira for reporting this. - - * ace/Message_Queue.cpp: Added a couple of new ACE_UNUSED_ARGs - Thanks to Amos Shapira for reporting this. - - * ace/OS.cpp (gethrtime): ACE_OS::gethrtime should cast its return - value to ACE_hrtime_t instead of (u_long long). Thanks to - Amos Shapira for reporting this. - -Wed Aug 13 14:51:47 1997 Darrell Brunsch - - * ace/SString.[i,cpp]: moved some inline methods from the .i into - the .cpp so the Win32 Unicode Release compiles with inlining. - -Wed Aug 13 01:14:08 1997 Nanbor Wang - - * tests/test_config.h (ACE_NEW_THREAD): Removed - ACE_Log_Msg::set_flags/clr_flags from this macro because - ACE_Log_Msg::flags is a static variable. We really don't need - to reset them when creating new threads. Once VxWorks can also - inherit ACE_Log_Msg's properties, we no longer need this macro. - - * ace/Log_Msg.h: Added trace_depth() functions. They are required - for inheriting ACE_Log_Msg's properties. - - * ace/OS.cpp: Changed ACE_Thread_Adapter implementation so that - newly created threads will inherit properties from their parent - threads. This is the default behavior and is valid on all - platform except VxWorks. If you don't want it and would like to - arrange the properties propagation yourself, you must define - ACE_THREADS_DONT_INHERIT_LOG_MSG in your ace/config.h file. Now, - creating a new thread will go thru ace_thread_adapter on all - platform except VxWorks. If ACE_THREADS_DONT_INHERIT_LOG_MSG is - defined but your platform defines ACE_HAS_THR_C_FUNC or - ACE_WIN32, creating new threads still need to use - ace_thread_adapter. This change also fixes a previous problem - which let threads access another thread's TSS. - -Tue Aug 12 21:57:30 1997 David L. Levine - - * etc/ACE-guidelines.html: added. - -Tue Aug 12 16:54:33 1997 Douglas C. Schmidt - - * Added Chuck Gehr's explanation of how to build ACE for MVS to - the ACE-INSTALL.html file at http://www.cs.wustl.edu/~schmidt/. - - * ace/OS.i: changed the name of ACE_U_LongLong::dump() to - ACE_U_LongLong::output(). Also moved some of the code that was - inlined in the class definition into the *.i file. - - * netsvcs/lib/Server_Logging_Handler.cpp: Added a template - specialization for ACE_Atomic_Op to - make things link with SGI and other systems that have long - different than int. Thanks to Amos Shapira for reporting this. - - * ace/Reactor.cpp (close): Removed the #ifdefs around - notify_handler_.open () and notify_handler_.close() since this - is now supposed to be available on all build configurations. - Thansk to Stefan Ericsson for reporting this. - - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - Removed a static variable that seemed to be causing problems for - SGI C++. Also, removed the now unnecessary "inherited" from - Handle_Thr_Acceptor. - - * examples/ASX/UPIPE_Event_Server/Peer_Router.h, - * netsvcs/lib/Log_Message_Receiver.h: Added an - ACE_UNIMPLEMENTED_FUNC macro for the assignment operator to work - around silly "features" of SGI C++... - - * include/makeinclude/platform_irix6.[x-]32_sgic++.GNU: Added some - additional patches to suppress warning code. Thanks to Torbjorn - Lindgren for this fix. - - * include/makeinclude/platform_mvs.GNU: Changed all occurrences of - "MVSLIB" to "ACELIB". Thanks to Chuck Gehr for reporting this. - -Tue Aug 12 15:03:42 1997 Steve Huston - - * ace/Timer_Hash_T.cpp, Timer_Wheel_T.cpp: Replaced references to - ACE_High_Res_Timer::gettimeofday with ACE_OS::gettimeofday. - The High Res version is deprecated, and doesn't work - correctly on HP-UX. - -Tue Aug 12 07:51:02 1997 Douglas C. Schmidt - - * ACE version 4.2.35, released Tue Aug 12 07:51:02 1997. - -Mon Aug 11 22:30:39 1997 David L. Levine - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: disabled - automatic template instantiation, because we use explicit - template instantiation, via a #pragma, with Green Hills. - Thanks to Brian Mendel for - finding the compiler options. - -Mon Aug 11 17:45:44 1997 Nanbor Wang - - * ace/OS.cpp (ace_thread_adapter): Changed the code so that TSS - ACE_Log_Msg will get created and put into cleanup stack first no - matter there is other ACE_Log_Msg instances or not. This fixed - the "order of destruction" problem on Win32 platform. Thanks to - Irfan for digging this out and helping solving it. - -Mon Aug 11 07:25:29 1997 - - * examples/Reactor/ReactorEx/test_reactorEx.cpp: Updated this - example to use the new Proactor and Asynch IO interfaces. - - * ace/Connector.cpp (activate_svc_handler): Fixed the "leak" of - svc_handler in case of error. Thanks to Wei Chiang - for reporting this. - -Mon Aug 11 01:11:26 1997 Douglas C. Schmidt - - * ACE version 4.2.34, released Mon Aug 11 01:11:26 1997. - -Mon Aug 11 01:06:02 1997 Douglas C. Schmidt - - * ace/Message_Queue.cpp (enqueue_tail_i): Inadvertantly - added "signal_dequeue_waiters()" where I meant - "signal_enqueue_waiters()." - - * include/makeinclude/wrapper_macros.GNU: Fixed a typo in the - wrapper_macros.GNU file that was causing link errors. - -Sun Aug 10 11:35:06 1997 Douglas C. Schmidt - - * ace/Message_Queue.cpp: To make sure that we have correctly - signaled waiters the signal_enqueue_waiters() and - signal_dequeue_waiters() methods now check the return value from - the semaphore release if ACE_HAS_OPTIMIZED_MESSAGE_QUEUE is - enabled. - - * include/makeinclude/wrapper_macros.GNU (VLDLIBS): Added a - new macro called ACELIB that can be used to make it easier - to enable static linking for ACE, i.e.: - - ACELIB = -Bstatic -lACE -Bdynamic - - or - - ACELIB = $(ACE_ROOT)/ace/libACE.a - - Can be added to the individual platform_macros.GNU file. This - allowed us to remove special code for MVS in wrapper_macros.GNU. - Thanks to Chuck Gehr for this fix. - - * netsvcs/lib: Added some comments after the #endifs. - - * ace/Filecache.cpp (insert_i): Updated the code so that we use - ACE_NEW_RETURN rather than operator new. This macro will - protect against failed allocations. - -Sat Aug 9 22:08:50 1997 Douglas C. Schmidt - - * ace: Added two new config files: - - config-irix6.x-sgic++.h - config-irix6.x-sgic++-nothreads.h - - This should hopefully consolidate the SGI platform - configuration. Thanks to Torbjorn Lindgren for - this fix. - - * include/makeinclude: Added two new platform macro files: - - platform_irix6.x-n32_sgic++.GNU: - platform_irix6.x-32_sgic++.GNU - - This should hopefully consolidate the SGI platform macros. - Thanks to Torbjorn Lindgren for this fix. - - * ace/Filecache.cpp: Fixed the syntax of the SGI pragma stuff. - Thanks to Torbjorn Lindgren for reporting this. - - * ace/Name_Request_Reply.h: Changed MAX_NAME_LEN to MAX_NAME_LENGTH - to avoid problems with Solaris 2.6. Thanks to Thanh Ma - for reporting this. - -Sat Aug 9 12:10:35 1997 Nanbor Wang - - * ace/config-win32-common.h (ACE_HAS_WINSOCK2): - * ace/config-win32.h (ACE_HAS_WINSOCK2): Rearranged definition of - this so that users can overwrite the default setting and choose - older Winsock if they want. No action needed for most NT - useres. Thanks to jmorey@tbi.com (John Morey) for pointing this - out. - -Sat Aug 09 11:28:36 1997 Steve Huston - - * ace/Profile_Timer.i: ACE_HAS_GETRUSAGE and !ACE_HAS_PRUSAGE - platforms now use ACE_OS::gettimeofday rather than - ACE_High_Res_Timer::gettimeofday in start() and stop() methods. - - * tests/Sigset_Ops_Test.cpp: adjusted test for sigismember() with - out-of-range signum to separately test return value and errno. - Also, returns non-zero from program on failed test. - -Fri Aug 08 17:39:43 1997 Douglas C. Schmidt - - * ACE version 4.2.33, released Fri Aug 08 17:39:43 1997. - -Fri Aug 08 02:50:31 1997 Douglas C. Schmidt - - * ace/Message_Queue: Factored out the code that differs depending - on whether we are using the optimized ACE_Message_Queue - implementation (i.e., VxWorks and NT). This change makes it - easier to maintain the code. Thanks to Darrell for helping with - this. - - * ace/Log_Msg.cpp (close): Fixed a couple of typos in this code, - in particular, we need to make sure that we don't call - ACE_Log_Msg_Manager::close() if we aren't multi-threaded. - - * ACE version 4.2.32, released Fri Aug 08 02:50:31 1997. - -Fri Aug 8 13:17:21 1997 Chris Cleeland - - * ace/OS.* (strtoul): Added the OS function strtoul() to turn - strings into unsigned longs. - -Fri Aug 8 12:26:54 1997 Steve Huston - - * ace/Log_Msg.cpp: Fixed some comments and removed unused code - I erroneously added August 6. - - * ace/config-hpux-10.x.h: Fixed to not always compile tracing code. - - * tests/test_config.h: ACE_END_TEST and ACE_END_LOG macros direct - log output back to stderr when shutting off the file output. - - * tests/TSS_Test.cpp: Removed ACE_Thread_Control object from the main - thread - it served no purpose and didn't work on HP-UX (due to - a documented pthread_exit restriction). Also changed a 'delete - ptr' to a call on operator delete (void *). - -Fri Aug 8 09:17:21 1997 Chris Cleeland - - * ace/Service_Repository.h (operations.): Improved documentation - on find(). - -Fri Aug 8 00:01:43 1997 Nanbor Wang - - * ace/Log_Msg.cpp (close): Moved ACE_Log_Msg::close() out of - ACE_MT_SAFE block so it always exists. This function only takes - care of non-VxWorks platforms. - - (instance): Removed at_exit() call since the instances will be - taken of by TSS_Cleanup. - - * ace/Object_Manager.cpp (~ACE_Object_Manager): Removed condition - compilation so it always calls ACE_Log_Msg::close(). - -Thu Aug 7 23:36:26 1997 Douglas C. Schmidt - - * ace/Reactor.h: Added the renew() method and the notify_handler_ - data member to all compilation cases, not just for - multi-threading. - - * ace/Service_Config.h: Clarified the fact that argv[0] is the - program name. Thanks to Chris Cleeland for pointing this out. - - * ace/config-mvs.h: Added the ACE_HAS_TEMPLATE_SPECIALIZATION flag - thanks to Chuck Gehr. - - * include/makeinclude/platform_irix6.2_sgic++.GNU: Turned on - exceptions and turned off implicit template instantiation. - Thanks to Amos Shapira for reporting the - former. - - * ace/config-irix6.2-sgic++.h: Also added the - ACE_HAS_TEMPLATE_SPECIALIZATION flag and changed the - platform_irix6.2.GNU file to not implicitly initialize - templates. If this breaks something, please let me know. - - * ace/config-irix6.2-sgic++.h: Added the ACE_HAS_EXCEPTIONS flag. - Thanks to Amos Shapira for reporting this. - However, there is some question as to whether this will work. - If it doesn't, please let me know. - - * ace/Reactor: Moved the ACE_Reactory_Notify class out from the - ACE_MT_SAFE section into the main code since this should work - for non-threaded builds, as well. Thanks to Stefan Ericsson - for reporting this. - - * ace/config-chorus.h: Added the ACE_HAS_TEMPLATE_SPECIALIZATION - flag. Thanks to Wei Chiang for this. - -Thu Aug 7 19:09:35 1997 Steve Huston - - * tests/Hash_Map_Manager_Test.cpp - split definition of Dumb_String - class to a new header, Hash_Map_Manager_Test.h. This makes AIX - C Set ++ happy. - - * tests/Process_Strategy_Test.cpp - split definitions of Options - and Counting_Service classes to Process_Strategy_Test.h for AIX - C Set ++'s benefit. - -Thu Aug 7 15:27:28 1997 Darrell Brunsch - - * ace/OS.h: Fixed typo in the definition of ACE_SYNCH_1 and - ACE_SYNCH_2 for ACE_HAS_OPTIMIZED_MESSAGE_QUEUE - -Thu Aug 7 13:05:20 1997 Chris Cleeland - - * ace/Strategies_T.h: Changed the argument to ACE_DLL_Strategy - from ACE_Service_Config to ACE_Service_Repository, which is more - concrete. - - * bin/g++dep (REL): Added sed rule so that TAO's dependencies are - set relative to $TAO_ROOT as well as $ACE_ROOT when the '-r' - option is utilized. - - * include/makeinclude/platform_linux_lxpthread.GNU (CCFLAGS): The - -Wall option can now be used. It only generates two warnings - throughout all of ACE! - - * include/makeinclude/rules.local.GNU (depend.local): Modified - this target so that TAO's dependencies are set relative to - $TAO_ROOT as well as $ACE_ROOT. - -Thu Aug 7 12:03:48 1997 James C Hu - - * ace/Filecache.{h,cpp}: Fixed unused variable found by Amos - Shapira. Fixed TEMPLATE_SPECIALIZATION dependency, sort of. Do - not attempt to use Filecache if you do not support - TEMPLATE_SPECIALIZATION. - -Thu Aug 07 00:19:12 1997 Douglas C. Schmidt - - * ACE version 4.2.31, released Thu Aug 07 00:19:12 1997. - -Wed Aug 6 22:20:54 1997 Douglas C. Schmidt - - * ace/Synch_T.h: Replaced all uses of ACE_Null_Condition_Mutex - with ACE_Null_Condition, which is much more straightforward... - - * ASNMP: Added Mike MacFaden's changes for IRIX. - -Wed Aug 6 16:37:51 1997 James C Hu - - * ace/Hash_Map_Manager.cpp: Changed implementation back to use a - single sentinel_ rather than an array of them. - - * ace/Filecache.{h,cpp}: Total re-implementations. Fewer locks - acquired and released when there is a cache hit. - -Wed Aug 06 12:55:26 1997 Steve Huston - - * ace/Log_Msg.(h cpp): - (ACE_Log_Msg_Manager) - Removed most of the non-VxWorks - pieces - there's just a lock left; the instances_ was removed - (ACE_Log_Msg) - Use ACE_Object_Manager to remove per-thread - instances of ACE_Log_Msg rather than using ACE_Log_Msg_Manager. - The use of an ACE_Unbounded_Set to hold the ACE_Log_Msg pointers - in previous versions caused some non-tail recursion problems when - tracing was enabled. - Uses an instance count to know when it's safe to free the dynamically - allocated class-static memory. - - * ace/Trace.(h cpp): Added new static member function: - int is_tracing(void) - returns 1 if tracing is enabled, else 0. - - * ace/Object_Manager.(h cpp): Added a flag to indicate the object is - being destroyed - during destruction, ACE_Object_Manager now refuses - to register any new memory pointers. Also turns tracing off during - destruction - ACE_Log_Msg makes use of ACE_Object_Manager, so we - don't want ACE_Log_Msg instance being deleted, then created for a - ACE_TRACE, then deleted, then created,... - -Wed Aug 06 03:35:41 1997 Douglas C. Schmidt - - * ACE version 4.2.30, released Wed Aug 06 03:35:41 1997. - -Wed Aug 6 00:13:27 1997 Nanbor Wang - - * netsvcs/lib/Server_Logging_Handler.cpp: We only need to - instantiate ACE_Svc_Handler when - ACE_HAS_THREADS. Otherwise, we'll have duplicate symbols - defined on platforms that do not support threads. - -Tue Aug 5 19:52:36 1997 Douglas C. Schmidt - - * ace/Containers: Added a new reset method for ACE_Unbounded_Set. - Thanks to Arturo Montes for - reporting this. - - * ace: Changed most uses of ACE_LACKS_COND_T to - ACE_HAS_OPTIMIZED_MESSAGE_QUEUE to make it possible to toggle - between the emulated condition variable implementation of - ACE_Message_Queue and the semaphore implementation. We need - this until we fully test out the semaphore implementation of - ACE_Message_Queue. - - * ace/Object_Manager.cpp (ACE_Object_Manager): Only call the - ACE_Log_Msg::close() method if ACE_MT_SAFE is enabled! Thanks - to Satoshi Ueno for reporting this. - - * ace/Malloc.h: Added a fix for misalignment of data in the - ACE_CONTROL_BLOCK_ALIGN_LONGS macro. Thanks to Fred LaBar - for this fix. - - * ace/ACE.cpp: (enter_recv_timedwait,enter_send_timedwait): Always - give val a default value of 0 to make Purify happy. Thanks to - David Levine for reporting this. - - * netsvcs/clients/Tokens/rw_lock/rw_locks.cpp, - netsvcs/clients/Tokens/manual/manual.cpp, - netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp: - Removed unreachable statements. Thanks to Cherif Sleiman - for reporting this deficiency and - testing the fix. - -Tue Aug 5 16:41:06 1997 Darrell Brunsch - - * ace/Synch_T.h: Added some more ACE_LACKS_COND_T changes for compilers - without template typdefs. - -Tue Aug 5 11:50:43 1997 Nanbor Wang - - * ace/Message_Queue.h: Fixed typos for the case when - ACE_LACKS_COND_T. - -Tue Aug 05 11:02:11 1997 - - * tests/Atomic_Op_Test.cpp (main): Made sure that on platforms - without threads, we don't try to run this test. - -Tue Aug 05 09:15:40 1997 David L. Levine - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: removed - -no_prelink from LDFLAGS because ghs 1.8.8 doesn't support it. - Thanks to Cherif Sleiman for - reporting this. - - * ace/Service_Record.cpp: added #include "ace/Stream_Modules.h" - to support template instantiation on GreenHills, at least. - Thanks to Cherif Sleiman for - reporting this deficiency and testing the fix. - - * ace/config-vxworks-ghs-1.8.h: added - ACE_LACKS_LINEBUFFERED_STREAMBUF. Thanks to Cherif Sleiman - for reporting this. - -Mon Aug 4 22:47:54 1997 Douglas C. Schmidt - - * ace/Message_Queue: Fixed consistency problems in naming notfull - vs. not_full. Thanks to David Levine for finding this. - - * ace/Message_Queue: Added specialized support for cases where - ACE_LACKS_COND_T (e.g., VxWorks and NT). This scheme uses - ACE_Thread_Semaphores in this case, which should be more - efficient). - - * ace/Synch_T.h: Added a new set of macros and typedefs for - ACE_SYNCH_SEMAPHORE. - - * examples/ASX/Message_Queue: Cleaned up all the Message_Queue - examples. - - * examples/ASX/Message_Queue/buffer_stream.cpp: Added a - NUL-terminator to the program so that it won't break. Thanks to - Darrell for finding this. - - * ace/Reactor.cpp (wait_for_multiple_events): Fixed some - stylistic problems in the Reactor. - - * ace/Synch.cpp (ace_static_object_lock_atexit): Changed from: - - extern "C" static void - - to: - - extern "C" void - - Thanks to Chuck Gehr for this. - -Mon Aug 4 14:03:22 1997 Steve Huston - - * tests/Enum_Interfaces_Test.cpp: return non-zero if test fails. - -Mon Aug 4 12:03:29 1997 Darrell Brunsch - - * tests/Semaphore_Test: Redid to test timed waits in a more - reasonably fashion. - -Mon Aug 4 11:43:09 1997 Douglas C. Schmidt - - * ace/OS: Continued to cleanup the problems with inconsistent - variants of sendmsg() and writev() on VxWorks. Thanks to Cherif - Sleiman for reporting this. - - * ace/OS.i (sema_wait): Fixed the implementation on NT so that - errno = ETIME. - - * tests/Semaphore_Test.cpp: Cleaned up the programming style a - bit. - - * ace/OS (writev): Removed the ACE_WRITEV_TYPE from the - ACE_OS::writev() method and instead put this as a cast on the - internal call to ::writev(). This is much cleaner and should - fix a bug introduced last night. Thanks Cherif Sleiman - for reporting this. - - * ace/Synch: Added a new release() method to ACE_Semaphore that - enables a caller to release multiple waiters. Thanks to Darrell - Brunsch for noticing this. - -Mon Aug 4 12:03:29 1997 Darrell Brunsch - - * tests/Semaphore_Test: Redid to test timed waits in a more - reasonably fashion. - -Sun Aug 03 23:47:13 1997 Douglas C. Schmidt - - * ACE version 4.2.29, released Sun Aug 03 23:47:13 1997. - -Sun Aug 3 22:18:33 1997 Douglas C. Schmidt - - * tests/Atomic_Op_Test.cpp: Added template specialization so that - David won't have to ;-) - - * ace/ACE: Added a new, complete set of send/recv operations with - timeouts. These implement the following methods: - - read, readv, write, writev, recv, recvfrom, recvmsg, send, sendto, sendmsg. - - The implementation provides two flavors: MIT pthread support, an - ACE portable support. To use MIT pthread support, you must to - define ACE_HAS_READ_TIMEDWAIT, ACE_HAS_READV_TIMEDWAIT, - ACE_HAS_WRITE_TIMEDWAIT, ACE_HAS_RECV_TIMEDWAIT, - ACE_HAS_RECVFROM_TIMEDWAIT, ACE_HAS_RECVMSG_TIMEDWAIT, - ACE_HAS_SEND_TIMEDWAIT, ACE_HAS_SENDTO_TIMEDWAIT and - ACE_HAS_SENDMSG_TIMEDWAIT respectively. See the config.h file - for SCO UNIX for an example. - - This new approach is not only more powerful (since it takes - advantage of OS-level mechanisms when they exist), but it also - greatly improves the modularity of the code and provides a - wider range of supported functionality. Thanks to Arturo - Montes for this new feature. - - * ace/ACE.cpp: Added comments to the ACE_Object_Manager_Destroyer - class. - - * ace/OS.h: Redid all the function prototypes for class ACE_OS so - that it's easier to read the arguments. - - * ace/config-sco-5.0.0-mit-pthread.h: Added the new macros that - enable timed reads and writes. Thanks to Arturo Montes - for this new feature. - - * ace: Added a corresponding #endif /* FOO */ for all #if defined - (FOO) in ACE. - - * ace: Changed all uses of ACE_IOStream_T to ACE_IOStream to - be more consistent with other uses of templates in ACE. - Thanks to Thilo for reporting this (and thanks to David - for not being offended ;-)). - - * ace/OS.i (operator/): Removed "const" from both the OS.h and - OS.i files for ACE_U_LongLong::operator/. It is redundant, - potentially confusing, and gives warnings on some compilers! - -Sun Aug 03 21:20:12 1997 - - * tests/Atomic_Op_Test.cpp: Added new test to test the Atomic - Operations Class in ACE. On platforms like Win32, ACE uses - template specialization to use native implementations provided - by the OS to accelarate these operations. - - * ace/config-win32-common.h (ACE_HAS_INTERLOCKED_EXCHANGEADD): - Added macro to config file. This macro is automatically set true - for NT4.0 systems or greater. - - * ace/Atomic_Op.i: On Win32 platforms, this code will be included - as template source code and will not be inlined. Therefore, we - first turn off ACE_INLINE, set it to be nothing, include this - code, and then turn ACE_INLINE back to its original setting. All - this nonsense is necessary since the generic template code that - needs to be specialized cannot be inlined, else the compiler - will ignore the specialization code. Also, the specialization - code *must* be inlined or the compiler will ignore the - specializations. - - The creation of this new file is necessary for non-Win32 - platforms to continue to inline the code as before. - - * ace/Synch_T.cpp: This file must include Atomic_Op.i if - ACE_INLINE has not be turned on. If it is, this file must be - included by Synch_T.h. - - * ace/Synch.cpp: Moved the specialization code from Synch.cpp to - Atomic_Op.i. This is necessary, otherwise the compiler will - ignore the specialization. - -Sun Aug 03 10:51:34 1997 David L. Levine - - * ace/config-osf1-4.0*.h: added #define ACE_HAS_LONGLONG_T. - Thanks to Thilo for reporting that OSF1-4.0 does. - -Sat Aug 02 23:51:19 1997 Douglas C. Schmidt - - * ACE version 4.2.28, released Sat Aug 02 23:51:19 1997. - - * ace/TTY_IO.cpp (control): Fixed a bug when using 8 bits for - character due to ISTRIP flag setting for device. Thanks to - Arturo Montes for reporting this bug. - - * ACE-categories: Updated the list of ACE classes to reflect - recent changes. - - * ASNMP: Added the new ACE+SNMP release courtesy of Mike - MacFaden . This builds cleanly on Solaris, - but it looks like there are a bunch of non-portable features - that won't compile cleanly on all the other platforms. - Therefore, until Mike or others get this stuff fully portable, - it won't be build by default in the top-level ACE Makefile. - - * ace/OS.h (class ACE_U_LongLong): Reformatted this a bit. - - * ace/SV_Semaphore_Simple.i: Removed the #include of - SV_Semaphore_Simple.h since it seems unnecessary and is causing - problems for TAO. - - * ace/IOStream_T.h (ACE_IOStream_T): Removed the unneeded ';' at - the end of the ACE_UNIMPLEMENTED_FUNC macros since this was - causing compiler errors. - -Sat Aug 02 13:11:22 1997 David L. Levine - - * ace/Synch.cpp (ACE_Static_Object_Lock::instance): commented - out call to ::atexit () because it causes shutdown problems - on DEC CXX, HP/UX, and AIX. Many thanks to James Johnson - for tenaciously tracking this one down, to Thilo and Steve - for assisting, and to all who reported the problem. - - * ace/Log_Msg.cpp (ACE_Log_Msg_Manager::open,close): neutered - on VxWorks, only, so that it will compile. - -Fri Aug 1 21:33:18 1997 Nanbor Wang - - * netsvcs/lib/netsvcs.mak: Added post compilation command that - copies DLL to ace/ directory because netsvcs/main.exe must have - this file in search path. - - * ace/Read_Buffer.cpp (ACE_Read_Buffer): Used ACE_OS::fdopen - instead of ::fdopen because it caused compilation error on NT. - -Fri Aug 1 17:25:04 1997 Chris Cleeland - - * include/makeinclude/platform_irix6.4_sgic++.GNU (CCFLAGS): Used - -ptnone and -no_prelink in order to get SGI to compile properly. - - * ace/config-irix6.4-sgic++.h (ACE_HAS_EXCEPTIONS): Added - ACE_HAS_EXCEPTIONS to this config. - - * ace/IOStream_T.h (ACE_IOStream_T): Wrapped send, recv, send_n, - and recv_n with the ACE_UNIMPLEMENTED_FUNC macro. - -Fri Aug 1 17:08:32 1997 Nanbor Wang - - * ace/ace.mak: Put OS.cpp back into the makefile. - - * ace/config-win32-common.h: Commented out checking of - ACE_HAS_WINSOCK2 when we are using NT 4.0 and above. The - original check prevented us from using winsock2. - - * ace/Thread_Manager.cpp: - * ace/Service_Repository.cpp: - * ace/ReactorEx.cpp: - * ace/Reactor.cpp: - * ace/Proactor.cpp: - * ace/Malloc.cpp: - * ace/Synch.{h,cpp}: Changed the lock held by - ACE_Static_Object_Lock from ACE_Thread_Mutex to - ACE_Recurssive_Thread_Mutex. - - * ace/Timer_Heap_T.cpp (ACE_Timer_Heap_T): Something was missing - here..... - -Fri Aug 1 13:39:13 1997 Douglas C. Schmidt - - * ace/TTY_IO.cpp (control): Removed the special M_UNIX code for - SCO_OpenServer. Thanks to Arturo Montes - for reporting this. - - * ace/Read_Buffer.cpp (ACE_Read_Buffer): Mistakenly used int - rather than ACE_HANDLE for one of the constructors in - ACE_Read_Buffer. - - * ace/OS.cpp (readv): Fixed a braino that manifests itself on - Chorus because I put the ACE_READV_TYPE in the wrong place. - Thanks to Wei Chiang for reporting this. - -Fri Aug 1 14:31:22 1997 Darrell Brunsch - - * tests/Timer_Queue_Test.cpp: removed casts from pointers to ints - (when a act was compared with a number) and instead used a cast - on the integer values. This gets rid of warnings on platforms - where the sizeof a pointer is larger than the sizeof an int. - -Fri Aug 01 12:10:28 1997 - - * ace/Synch_T: Changed parameter passing for ACE_Atomic_Op from - const TYPE to const TYPE &. - - * ace/Synch.cpp: These specializations have been added to - ACE_Atomic_Op to make the implementation faster on Win32 that - has OS support for doing this quickly through methods like - InterlockedIncrement and InterlockedDecrement. - - * ace/SV_Semaphore_Complex.cpp (open): Fixed more compiler - warnings: - - IOStream.cpp Naming_Context.cpp Read_Buffer.cpp - SV_Semaphore_Complex.cpp SV_Semaphore_Complex.i - -Fri Aug 1 11:57:45 1997 Chris Cleeland - - * ace/Containers.h (ACE_Fixed_Set): Eliminated declaration for - unnecessary ACE_Fixed_Set(size_t) CTOR. - - * ace/OS.h: Simplified the typedef of ACE_hrtime_t so that it's an - unsigned long long whenever ACE_HAS_LONG_LONG_T is defined. - -Fri Aug 01 10:12:26 1997 David L. Levine - - * ace/config-osf1-4.0.h: added ACE_HAS_TEMPLATE_SPECIALIZATION. - Thanks to Thilo for verifying that this is supported with DEC CXX. - - * ace/config-irix6.4-sgic++*.h: added ACE_TEMPLATES_REQUIRE_SOURCE - and ACE_REQUIRES_FUNC_DEFINITIONS. - - * ace/OS.h,README: added ACE_REQUIRES_FUNC_DEFINITIONS support. - - * ace/{Free_List.h,Remote_Tokens.h,Synch_T.h,Timer_*_T.h}: - wrapped unimplemented template class copy constructors and - assignment operators with ACE_UNIMPLEMENTED_FUNC. - - * tests/Service_Config_Test.cpp: removed templates to avoid - problems with finicky compilers, and added check of destruction - ordering. - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: added - -no_prelink to LDFLAGS. - -Fri Aug 01 00:14:46 1997 Douglas C. Schmidt - - * ACE version 4.2.27, released Fri Aug 01 00:14:46 1997. - -Thu Jul 31 21:51:01 1997 David L. Levine - - * ace/Log_Msg.cpp (open): fixed memory leak. - -Thu Jul 31 21:41:10 1997 Douglas C. Schmidt - - * tests/Service_Config_Test.cpp (run_test): You won't shout as I... - - * ace/Object_Manager.cpp (instance): ... fiddle about ;-) - -Thu Jul 31 17:39:56 1997 - - * ace: The following files were modified to avoid the - "unreferenced formal parameter" and other warnings from the - compiler: - - ACE.cpp Asynch_IO.cpp Asynch_IO.h INET_Addr.cpp OS.cpp OS.h OS.i - Proactor.cpp Reactor.cpp ReactorEx.cpp ReactorEx.i - SOCK_Dgram_Bcast.cpp Service_Config.cpp - -Thu Jul 31 16:46:44 1997 David L. Levine - - * ace/config*.h: replaced "ACE_REQUIRES_TEMPLATE_SPECIALIZATION" - with "ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION". - - * ace/config-vxworks-ghs-1.8.h,config-irix6.4-sgic++*.h: added - ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA. - - * all .cpp files that had "ACE_REQUIRES_TEMPLATE_SPECIALIZATION": - replaced with "ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION" and - added #pragma instantiate for Edision Design Group compilers, - e.g., SGI and Green Hills. - -Thu Jul 31 16:25:33 1997 Douglas C. Schmidt - - * ace/Synch.i (acquire): Added the timed acquire() interface to - ACE_Semaphore. - -Thu Jul 31 11:10:17 1997 Darrell Brunsch - - * tests/run_tests.bat: Redid this file completely making it - much smarter about running tests. Instead of just blindly - executing the tests, it checks the return values to see if - an error occured and also outputs relevant errors from the - log file if the test was unsuccessful. - - It's a remarkable example of batch programming wizardry. - -Thu Jul 31 10:39:04 1997 Darrell Brunsch - - * ace/INET_Addr.cpp: initialized error variable in - gethostname to stop warnings when inlining is on. - -Thu Jul 31 09:46:50 1997 Darrell Brunsch - - * ace/Timer_Heap_T.cpp: changed cancel(id) to check the timer - id to make sure it is in range (not negative and not larger - than the current size of the heap) - -Thu Jul 31 07:32:26 1997 David L. Levine - - * Malloc_T.{i,cpp},Timer_Queue_T.i: replaced LOCK with ACE_LOCK. - Thanks to Thilo for supplying patches. - - * ace/config-sunos5.5-g++.h: #define ACE_MALLOC_ALIGN to be 8. - - * ace/Object_Manager.*: renamed cleanup () to at_exit (). - - * Log_Msg.{h,cpp},Object_Manager.cpp: let ACE_Object_Manager - clean up the global ACE_Log_Msg_Manager. - - * Service_Config_Test.cpp: added test of - ACE_Object_Manager::at_exit (). - -Wed Jul 30 20:30:25 1997 Douglas C. Schmidt - - * ace/SOCK_Dgram.h: Added an = 0 to the flags parameter to recv(). - Thanks to Michael MacFaden for pointing out the inconsistency. - - * ace/OS.cpp (thr_create): Added support for the SCHED_IO policy, - which is supported by MIT Pthreads. Thanks to Arturo Montes - for this fix. - - * ace/SOCK_Dgram.h: Added a comment to clarify how to delete the - elements of the iovec array. Thanks to Mike MacFaden for - clarifying this. - - * ace/Reactor.h: Changed the comment for schedule_timer() to use - delta_timer rather than delay. - - * ace/Connector: Updated the timer cancellation id to be long - rather than int. - - * examples/Reactor/Misc/notification.cpp: Timers are now working - happily on Chorus, so we can revert the Chorus-specific patches. - Thanks to Wei Chiang for reporting this. - - * ace/SOCK_Dgram.cpp (recv): The timed recv() method must return - -1 on a timeout to meet its documented specification. Thanks to - Joseph Cross for reporting this - problem. - - * ace/OS.i (readv): Added a fix for Chorus, which has a different - readv() prototype than normal operating systems. Thanks to Wei - Chiang for reporting this. - -Wed Jul 30 20:02:21 1997 James C Hu - - * ace/Hash_Map_Manager.{h,cpp}: changed the *_i methods to use - shared_find() method to ease template specialization efforts. - Also, added a new shared_find() method. Added a parameter to - each to allow the passing in of the calculated hash value. - -Wed Jul 30 16:43:34 1997 - - * ace/config-win32-common.h: If _DEBUG is not set (that is, we are - building the Release version), we will turn on __ACE_INLINE__. - Thanks to Matthias Kerkhoff for - suggesting this. - -Wed Jul 30 06:53:30 1997 Matthias Kerkhoff - - * The use of the following configuration #defines in the entire - ACE distribution has been changed: - - - ACE_HAS_WINNT4 - - ACE_HAS_MFC - - ACE_HAS_STRICT - - ACE_MT_SAFE - - ACE_HAS_DLL - - ACE_HAS_SVC_DLL - - ACE_HAS_WINSOCK2 - - ACE_HAS_ORBIX - - ACE_HAS_MT_ORBIX - - In previous ACE-versions, code blocks depending on one of these - defines have been guarded by an #if defined(ACE_XXX_OPTION). - Therefore it has been necessary to define the default - configuration unconditionally in config-win32.h. - - The #if statements in the source files have been changed to - - #if defined(ACE_XXX_OPTION) && (ACE_XXX_OPTION != 0) - - while the default configuration in config-win32.h will only be used, - if it has not been overridden from the compilers command line (i.e.) : - - #if !defined(ACE_XXX_OPTION) - #define ACE_XXX_OPTION 1 - #endif - -Wed Jul 30 14:46:33 1997 Nanbor Wang - - * ace/Malloc.cpp: - * ace/Proactor.cpp: - * ace/ReactorEx.cpp: - * ace/Reactor.cpp: - * ace/Service_Repository.cpp: - * ace/Thread_Manager.cpp: - * ace/Synch.{h,cpp}: Changed ACE_Static_Object_Lock::get_lock () - to instance () to emphasize that it's a singleton. - - * ace/Containers.cpp: Fixed the problem caused by - ACE_Unbounded_Stacknotkeeping its size currectly. Thanks for - Matthias Kerkhoff for sending us the - patch. - - * ace/OS.cpp (exit): Corrected a bug in ACE_TSS_Cleanup::exit (). - It innocently uses default ctor to copy info_arr. And things - get out of hand when info_arr[] gets destructed. Thanks very - much for Matthias Kerkhoff for digging - this out and sending us the patch. - -Wed Jul 30 13:36:55 1997 David L. Levine - - * ace/config-vxworks-ghs-1.8.h: added #ifdef ppc wrapper around - #define of ACE_HAS_POWERPC, because GreenHills #defines that. - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: replaced - indlib.o LIBS with newer ghsbltin.o and ghsmath.o. - - * ace/OS.h: use the same ACE_UNUSED_ARG definition with ghs as - with other compilers. - - * ace/Object_Manager.*: revised interface, but still in flux. - cleanup () should work for process-wide registration, but is - untested. - -Wed Jul 30 11:13:57 1997 Chris Cleeland - - * ace/config-linux*.h (ACE_HAS_LONGLONG_T): These configs - file incorrectly had ACE_HAS_LONGLONG rather than - ACE_HAS_LONGLONG_T. - - * ace/OS.cpp (gethrtime): Added 'volatile' keyword to insure that - the automatic variables 'most' and 'least' don't get put into - registers. Putting this in stopped the SIGSEGV that was occurring - in Linux. - -Wed Jul 30 06:53:30 1997 Douglas C. Schmidt - - * ACE version 4.2.26, released Wed Jul 30 06:53:30 1997. - -Wed Jul 30 04:36:39 1997 Nanbor Wang - - * ace/Containers.{h,cpp}: Added back new parameterized allocation - strategy version. Finally. - - * ace/Synch.cpp (atexit): Moved ACE_Allocator here because only - here, we can be sure that no other user defined memory - activities are going on. This is becoming even more - interesting now.... Perhaps we should move all - close_singleton's here? - - * ace/Service_Config.cpp (close_singletons): Removed - ACE_Allocator::close_singleton () from this function because we - still need ACE_Allocator to "free" static objects' memory. - - * ace/Synch.{h,cpp}: Added a new class ACE_Static_Object_Lock - which provides a lock when instantiating static objects. - - * ace/Thread_Manager.cpp: Removed ace_thread_manager_lock_, - * ace/Service_Repository.cpp: Removed ace_service_repository_lock_, - * ace/ReactorEx.cpp: Removed ace_reactorex_lock_, - * ace/Reactor.cpp: Removed ace_reactor_lock_, - * ace/Proactor.cpp: Removed ace_proactor_lock_, - * ace/Malloc.cpp: Removed ace_malloc_lock_, - and replace them with a global single lock - ACE_Static_Object_Lock::get_lock (). - -Tue Jul 29 16:25:48 1997 Chris Cleeland - - * ace/OS.cpp (thr_create): Explicitly flagged 'stack' and 'size' - as unused arguments. - - * ace/Memory_Pool.cpp (handle_signal): Explicitly flagged siginfo - as an unused argument, and moved the decl of offset into the - conditional block in which it's used. - - * ace/OS.i (dlerror): Added explicit cast of the return value to - (char*) because on Linux dlerror() returns const char*, while on - Solaris it's char*. - - * ace/config-linux-lxpthreads.h: Created new flag - ACE_LACKS_POSIX_PROTO_FOR_SOME_FUNCS that can be used when only - certain functions are missing POSIX prototypes. This eliminates - more warnings with -Wall - - * ace/ACE.cpp (max_handles): Added return statement for the - RLIMIT_NOFILE case. - (count_interfaces): Removed unused variables. - -Tue Jul 29 15:10:35 1997 Darrell Brunsch - - * ace/OS.i: Changed sema_wait to take in a const ACE_Time_Value - -Tue Jul 29 12:41:27 1997 Douglas C. Schmidt - - * ace/config-sco-5.0.0-mit-pthread.h: Added the - ACE_LACKS_PWD_FUNCTIONS macro. Thanks to Arturo Montes - for reporting this. - -Tue Jul 29 13:10:00 1997 Nanbor Wang - - * ace/Signal.h: Moved inclusion of "Containers.h" to the bottom of - this file so everything is defined properly before use. - -Tue Jul 29 12:36:24 1997 - - * tests/Message_Queue_Test.cpp (main): Removed dynamic allocation - of the string array. - -Tue Jul 29 12:15:49 1997 Darrell Brunsch - - * ace/Proactor.cpp - * ace/Reactor.cpp: - * ace/ReactorEx.cpp: Changed the default Timer Queue to - Timer Heap instead of Timer List. - -Tue Jul 29 07:59:04 1997 David L. Levine - - * Makefile,TAO/Makefile: change mode of updated ChangeLog-* - file to 644 after updating it, when building a release - with TIMESTAMP enabled. - - * ace/OS.cpp (sched_params): added some more initializations - to 0 to avoid Purify warnings about unitialized memory reads. - - * ace/Object_Manager.cpp (~ACE_Object_Manager): removed unused - variable "i". Thanks to Amos Shapira - for reporting this. - - * ace/Service_Record.{h,i} Parse_Node.{h,cpp} (handle,open_handle): - removed "const" from ACE_SHLIB_HANDLE return value. Thanks - to the several people who noted compiler warnings from this. - - * ace/Naming_Context.cpp: added delete of this->name_options_; - (dtor,fini): call this->close (). - - * tests/IOStream_Test.cpp (client,server): use ACE_NEW_RETURN - instead of new. - -Tue Jul 29 01:53:18 1997 Nanbor Wang - - * ace/OS.h: Added two new macros ACE_NEW_MALLOC_RETURN and - ACE_NEW_MALLOC. Theses are similiar to ACE_ALLOCATOR_RETURN and - ACE_ALLOCATOR that allow memory allocation using user defined - functions. However, these two macros will call specified - constructor after memory is being allocated. - - * ace/Containers.{h,cpp}: Decoupled memory allocation strategy for - ACE_Unbounded_Stack, ACE_Unbounded_Set, ACE_Unbounded_Queue. - Users can now specified their own memory allocation strategies - if needed. If not specified, the default ACE_Allocator will be - used. - -Tue Jul 29 00:56:54 1997 Douglas C. Schmidt - - * ACE version 4.2.25, released Tue Jul 29 00:56:54 1997. - -Mon Jul 28 16:23:26 1997 David L. Levine - - * include/makeinclude/rules.nested.GNU: added missing - semicolon at end of last statement. Thanks to Amos - Shapira for providing this fix. - - * ace/OS.h (VxWorks only): only #include before - for GreenHills. Thanks to Dave Moore - for reporting a problem without this - fix with g++/VxWorks 5.3.1 for PowerPC target. - Also, commented out g++ string.h hack. It no longer appears - to be necessary. - - * tests/README: added VxWorks 5.3.1 test status. - - * tests/SPIPE_Test.cpp (main): fixed #ifdefs so that it compiles. - - * ace/OS.i: (strtok_r): replaced NULL with 0. NULL is #defined - as (void *) 0 on VxWorks, so it causes compile warnings. - Thanks to Dave Mayerhoefer for reporting - this problem. - - * ace/Object_Manager.{h,cpp},Makefile: added this class to - shutdown ACE library services, and reclaim their storage, - at program termination. - - * ace/ACE.cpp: added hook to call ACE_Object_Manager destructor - in this file. It's in this file so that it's sure to be - linked in to executables that statically link libACE.a. - - * ace/Service_Config.{h,cpp}: (close): delete ACE_STATIC_SVCS - instance, which is now saved in static_svcs_. Also, removed - LM_SHUTDOWN call, because the logger apparently gets shutdown - now with everything else (with ACE_Object_Manager). - - * ace/Object_Manager.* (delete_at_exit,delete_array_at_exit): - made these (inline) static functions, with return values. - - * tests/IOStream_Test.cpp (client,server): explicitly destroy - (and create) ACE_SOCK_IOStream instances, because they don't - get destroyed on Solaris. They're on the stack of separate - threads, so maybe the problem is related to not cleaning up - TSS on Solaris. Thanks to James CE Johnson - for some efficient debugging work, and for verifying that the - original code works properly on Linux. - -Mon Jul 28 21:59:09 1997 Nanbor Wang - - * ace/ace.mak: Added file Object_Manager.cpp. - - * ace/OS.h: Added #define RTLD_LAZY when - ACE_HAS_SVR4_DYNAMIC_LINKING and RTLD_LAZY is not defined. - FreeBSD 2.2.1 "forgot" to put in this definition. Thanks to - Satoshi Ueno for reporting this. - -Mon Jul 28 13:27:21 1997 Douglas C. Schmidt - - * ace/Object_Manager: Made a few minor stylistic updates. - - * netsvcs/servers/main.cpp (main): Updated this test program to - utilize the new ACE_Service_Object_Ptr class. - - * ace/Service_Object.h: Added a new smart pointer call - ACE_Service_Object_Ptr, which generalizes functionality that was - previously in the ./netsvcs/server/main.cpp file. Thanks to Wei - Chiang for this suggestion. - - * examples/Threads/process_manager.cpp (parse_args): Removed the - unused n_processes global variable. Thanks to Amos Shapira for - reporting this. - - * tests/SPIPE_Test.cpp (main): Cleaned up the #ifdef structure - to remove compiler warnings. Thanks to Amos Shapira for - this. - - * tests/Handle_Set_Test.cpp (test_performance): Removed an unused - ACE_HANDLE handle definition. Thanks to Amos Shapira for - reporting this. - - * ace/OS.i (sema_init): Swapped else and #endif to avoid - a compile error when ACE_LACKS_NAMED_POSIX_SEM is false. - Thanks to Wei Chiang for reporting this. - - * ace/OS.cpp (rwlock_init): Added a cast to (const void *) to keep - certain compilers from complaining. Thanks to Thilo and - Amos Shapira for reporting this. - - * ace/OS.i (sema_wait): *tv should have been &tv. Thanks to Thilo - for reporting this. - -Mon Jul 28 13:57:21 1997 James C Hu - - * ace/config-irix6.4-sgic++.h: Added template specialization #def. - -Sun Jul 27 20:47:01 1997 David L. Levine - - * tests/Handle_Set_Test.cpp: Instantiate templates with - ACE_HANDLE instead of int. - - * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp (main): use - ACE_OS::fprintf () instead of cerr. - -Sun Jul 27 20:10:26 1997 Douglas C. Schmidt - - * ACE version 4.2.24, released Sun Jul 27 20:10:26 1997. - -Sun Jul 27 16:03:30 1997 Nanbor Wang - - * tests/Handle_Set_Test.cpp (test_boundaries): Changed class of - queue from ACE_Unbounded_Queue to - ACE_Unbounded_Queue so it declares the right data - type. - - * ace/Synch.cpp (ACE_Process_Mutex): - * ace/OS.cpp (rwlock_init): - * ace/ACE.cpp (unique_name): Memories for placing unique_name are - now declared using ACE_UNIQUE_NAME_LEN. When calling - ACE::unique_name, the length is also specified using - ACE_UNIQUE_NAME_LEN because using "sizeof (buffer)" also caused - problem if we are using UNICODE. - - * ace/OS.h: Added a new directive ACE_UNIQUE_NAME_LEN to specified - the maximum length of an "unique name." - -Sun Jul 27 15:32:08 1997 David L. Levine - - * tests/Handle_Set_Test.cpp (main): uncommented - test_duplicates () and test_performance () calls, and added - ACE_Unbounded_Queue_Iterator specialization. - -Sun Jul 27 14:25:33 1997 Douglas C. Schmidt - - * tests/Handle_Set_Test.cpp (test_boundaries): Added a better test - to ensure that the ACE_Handle_Set_Iterators are working - correctly. This works by inserting the handles in a queue and - then making sure that they are the same values we receive from - the iterator. - - * ace/Handle_Set.i (operator): Fixed a subtle bug in the - ACE_Handle_Set_Iterator implementation. We need to make - sure that we increment the handle_index_ to the beginning - of the next word whenever we've examined all the bits in - the current word. Thanks to David Levine for noticing this - problem. - -Sun Jul 27 09:06:29 1997 David L. Levine - - * include/makeinclude/rules.lib.GNU: replaced hard-coded ".so" - with "$(SOEXT)". - - * include/makeinclude/rules.local.GNU: added/completed support - for "$(SOEXT)", and "$(VSHDIR)" instead of always hard-coding - them as ".so" and ".shobj/". - - * include/makeinclude/wrapper_macros.GNU: added support for - override of "$(VSHDIR)" in platform_macros.GNU. - - * apps/JAWS/clients/{Blobby,Caching}/Makefile, - apps/JAWS/stress_testing/Makefile, - apps/Orbix-Examples/Event_Comm/{Consumer,Supplier}/Makefile, - examples/ASX/Event_Server/Event_Server/Makefile, - examples/ASX/UPIPE_Event_Server/Makefile, - examples/Logger/simple-server/Makefile, - examples/Mem_Map/IO-tests/Makefile, - examples/Naming/Makefile, - examples/Reactor/Multicast/Makefile, - examples/Service_Configurator/Misc/Makefile, - examples/Shared_Malloc/Makefile: - replaced hard-coded ".shobj" with "$(VSHDIR)" in LDLIBS definitions. - - * include/makeinclude/platform_vxworks5.x_{g++,ghs}.GNU: - added overrides of .so build rules to change them .o builds. - - The above changes allow builds of modules that specify .shobj/*.so - on VxWorks, by mapping those objects to .obj/*.o. - -Sun Jul 27 03:07:35 1997 Nanbor Wang - - * ace/ACE.cpp (unique_name): Added __TEXT macro to the format - string in sprintf to avoid a nasty problem when using UNICODE on - NT. - -Sat Jul 26 21:12:07 1997 David L. Levine - - * ace/ReactorEx.cpp: added a couple of ACE_UNUSED_ARG's. - - * examples/Logger/simple-server/Logging_Handler.cpp (handle_input): - replace use of cerr with stderr (by using default arg of - ACE_Log_Record::print ()). - - * examples/Shared_Malloc/test_multiple_mallocs.cpp (main): use - ACE_OS::printf () instead of cout. - - * examples/Shared_Malloc/test_persistence.cpp: added #include - of iostream.h with ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. - -Sat Jul 26 15:55:43 1997 - - * ace/Malloc_T.cpp (ACE_Cached_Allocator): Changed (T *) to - (T*). VC++ did not like the former. - - * The entire ACE distribution was updated to use the new singleton - methods. The old singleton methods in Service_Config have been - deprecated and users are encouraged not to use these methods - anymore. It may not be supported in future releases. The - replacement is the instance() methods in the individual classes. - For example, ACE_Service_Config::reactor() is replaced by - ACE_Reactor::instance(). A perl script has been added - (ACE_wrappers/bin/Service_Config.perl) to allow users to change - their code over to the new methods. - - These changes will hopefully help in reducing the compile-time - dependencies in ACE source files and allow smaller custom ACE - libraries to be compiled. - - Thanks to Matthias Kerkhoff for making - these changes. - -Sat Jul 26 15:44:45 1997 Douglas C. Schmidt - - * ace/Malloc_T.cpp (ACE_Cached_Allocator): I think we want to - say "sizeof (T)" rather than "sizeof (T *)". - - * ace/FILE_IO.i (recv_n): There is a minor bug fix to be made in - FILE_IO.i. The method ACE_FILE_IO::recv_n() should call - ACE::read_n(), not ACE::recv_n(). Similarly, the method - ACE_FILE_IO::send_n() should call ACE::write_n(), not - ACE::send_n(). The functions ::recv() and ::send() are intended - only for *socket* I/O, and return failure conditions when - applied to *file* I/O. Thanks to David Brackman - for reporting this. - - * ace: Changed all LOCK names to ACE_LOCK to avoid clashes - with macros in the KAI C++ compiler. Thanks to Jeff - R. Hayes for pointing this out. - - * ace/Malloc_T.i: Added ACE_INLINE to some methods that weren't - getting inlined. - - * ace/OS.i: Added an implementation of timed semaphores for the - POSIX threading APIs. Also cleaned up the return values from - sema_wait() so that it always returns -1 if an error occurs - (originally, it was returning -2, which is confusing). Also - cleaned up the rd_lock() and wr_lock() methods in the same way. - -Sat Jul 26 16:00:05 1997 David L. Levine - - * Malloc_T.cpp (ACE_Cached_Allocator): fixed typo, sizeof (T*) - instead of sizeof (*T). - - * Proactor.cpp (instance): fixed signature in non-WIN32 - version. (run_event_loop): added ACE_UNUSED_ARG (tv). - -Fri Jul 25 12:08:47 1997 David L. Levine - - * ace/OS.[hi]: finished VxWorks (non-POSIX) semaphore implementation. - - * ace/Process.cpp (spawn): with GreenHills compiler only (for - VxWorks), call ACE_NOTSUP_RETURN instead of spawning via execve. - GreenHills 1.8.8 loses its lunch on the ACE_OS::execve () call. - Thanks to Dave Mayerhoefer for reporting - this problem. - - * tests/Mem_Map_Test.cpp (create_test_file): delete array "mybuf" - to prevent memory leak. - - * tests/Message_Queue_Test.cpp (main): delete "buffer" - elements at end of test to prevent memory leaks. - - * performance-tests/Misc/context_switch_time.cpp: use - ACE_Sched_Params for platform-independent thread priority - assignment. Also, modified Yield_Test so that only one thread - writes the test's timer. - - * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp (svc): - replaced an iostream printout with an ACE_DEBUG call. - - * examples/ASX/UPIPE_Event_Server/event_server.cpp: added - #include of iostream.h with ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. - - * examples/IPC_SAP/FILE_SAP/client.cpp: require 2 args instead - of 1; mask file mode with 0777 (octal); and use - ACE_OS::printf () instead of cout. - -Fri Jul 25 00:46:22 1997 - - * ace/Synch: Added documentation for Condition variables. Thanks - to Jeff for pointing out the lack of - documentation. - -Thu Jul 24 11:48:05 1997 David L. Levine - - * Makefile,TAO/Makefile: added a filter to exclude backup and - [.]#* files from releases. Thanks to Carlos O'Ryan - for reporting this problem. - - * include/makeinclude/platform_*.GNU: inserted CVS/RCS - keyword string. - - * performance-tests/Misc/basic_perf.cpp (per_iteration): - added support for ACE_U_LongLong. - - * performance-tests/Misc/childbirth_time.cpp: - (prof_fork,prof_native_thread): added ACE_UNUSED_ARGs - for unsupported platforms. (prof_ace_os_thread): added - (ACE_THR_FUNC) cast of first arg to ACE_OS::thr_create () call. - - * performance-tests/Misc/test_naming.cpp (find): replaced cerr - statement with an ACE_DEBUG. - - * examples/Misc/test_read_buffer.cpp: replaced bare OS calls - with ACE_OS calls. - -Thu Jul 24 11:35:37 1997 Darrell Brunsch - - * ace/Timer_Heap_T.cpp: Fixed a problem with reschedule() - corrupting the free list in Timer Heap. Thanks to - James Crawford , Silvano Peruzzi - , and Stuart Powell - for the fix. - -Wed Jul 23 23:29:15 1997 - - * ace/Message_Block.cpp (size): Changed the comparison from - (length < this->max_size_) to (length <= this->max_size_). - Thanks to Paul for suggesting this change. - -Wed Jul 23 21:54:23 1997 David L. Levine - - * examples/Shared_Malloc/test_malloc.cpp (spawn): cast argv - argument to (char *const *) for call to ACE_OS::execv (). - -Wed Jul 23 16:40:39 1997 Nanbor Wang - - * ace/ACE.cpp (get_ip_interfaces): ACE'ified codes for NT. UNIX - part will come later. - - * ace/Malloc_T.cpp (ACE_Cached_Allocator): Changed to use raw - memory allocation method for memory pool. - - * ace/OS.h (ACE_TEXT_STRING): Added this #define macro to switch - between ACE_WString and ACE_CString according to the usage of - UNICODE. - -Wed Jul 23 14:43:11 1997 David L. Levine - - * tests/Timer_Queue_Test.cpp(main): delete timer_id array at - the end of the test to avoid a memory leak. - -Wed Jul 23 13:40:39 1997 Nanbor Wang - - * ace/Process.cpp (ACE_Tokenizer::next): Moved checking of string - termination after checking delimiter and preserve_designator so - that we can use this class to tokenize multiple null terminated - strings cascaded together (using \0 as delimitor.) Notice tne - combined strings must be terminated with two null chars. I need - to use this class in ACE::get_ip_interfaces. - - * ace/Malloc_T.{h,i}: Changed the implementation of - ACE_Cached_Mem_Pool_Node from using union to a plain pointer. - This is because some C++ compilers don't allow union member to - have copy constructor. Thanks to Tim to dig this out. - -Wed Jul 23 12:58:04 1997 Steve Huston - - * ace/CORBA_Ref.cpp: Added #include "ace/Log_Msg.h" to catch the - ACE_DEBUG macro. diff --git a/ChangeLogs/ChangeLog-98a b/ChangeLogs/ChangeLog-98a deleted file mode 100644 index c5daa4d7ee1..00000000000 --- a/ChangeLogs/ChangeLog-98a +++ /dev/null @@ -1,6588 +0,0 @@ -Wed Apr 29 18:55:13 1998 David L. Levine - - * ACE version 4.5 released. - -Wed Apr 29 12:25:05 1998 David L. Levine - - * ace/config-lynxos.h: added ACE_POLL_IS_BROKEN so that - ACE_OS::sleep () uses select () instead of poll (). - - * tests/Map_Manager_Test.cpp: added a ssize_t loop index that's - used to avoid signed/unsigned comparisons. - -Tue Apr 28 23:08:10 1998 Nanbor Wang - - * ace/Hash_Map_Manager.cpp: Bugs fixed. - - * tests/Map_Manager_Test.cpp: Added assertion tests on the number - of iterations to ensure the test does run correctly. - - * tests/Map_Manager_Test.cpp (main): Disabled the VERBOSE_LITE - Log_Msg flag before starting the real test and reenabled it - after the tests. - -Tue Apr 28 06:49:50 1998 David L. Levine - - * ACE-INSTALL.html,os-patches/linux-patches.html: updated - Linux glibc-2 info. ACE works with glib-2.0.7-7, unmodified. - - * ace/config-g++-common.h: added - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES with egcs. egcs 1.0.2 - won't compile netsvcs/lib without it. - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: fixed location - of parenthesis in ppc check. Thanks to Brian Mendel - for reporting this. - - * ace/High_Res_Timer.cpp: initialize global_scale_factor_ to 1000 - on Linux. - -Mon Apr 27 07:18:54 1998 Nanbor Wang - - * ace/Service_Types.cpp: Changes to use typedef - ACE_Service_Object_Exterminator to define . Thanks to - Chuck Gehr for reminding this. - - * ace/Service_Object.h (ACE_Service_Object_Ptr): - * netsvcs/servers/main.cpp (main): Added more comments on how to - use ACE_Service_Object_Ptr with ACE_SVC_INVOKE correctly. - - * ace/OS.h (ACE_Service_Object_Exterminator): Define the type as - extern "C" function pointer to make MVS happy. Thanks to Chuck - Gehr for pointing this out. - - * ace/Service_Object.i (ACE_Service_Object_Ptr): Delete the - underlying Service_Object after calling its fini() method. - Thanks to Tom Arbuckle - for pointing this out. - -Sun Apr 26 21:50:07 1998 David L. Levine - - * ace/Svc_Conf_l.cpp,etc/Svc_Conf_[ly].cpp.diff,etc/README: - updated the patch files. Thanks to J. Russell Noseworthy - for reporting problems with - them. - -Sun Apr 26 01:05:20 1998 Douglas C. Schmidt - - * ACE version 4.4.43 released. - -Sat Apr 25 17:47:31 1998 Nanbor Wang - - * ace/OS.h (ACE_FACTORY_DECLARE): Added explicit casting for - gobbler to prevent some weird compiler from complaining too - much. - - * netsvcs/lib/Server_Logging_Handler_T.cpp - (ACE_Server_Logging_Acceptor_T): We can't initialize the - with a temporary object. Its content gets deleted - right after the constructor exits. - -Sat Apr 25 11:55:01 1998 Alexander Babu Arulanthu - - * ace/Containers.h (class ACE_Double_Linked_List): Added - comments.(, the parameter for this class should have - T* next_ and T* prev_ fields in it. - - * ace/Containers.h (class ACE_Double_Linked_List): Corrected the - documentation for the insert_head and insert_tail functions. - -Fri Apr 24 22:36:37 1998 David L. Levine - - * ace/Service_Config.cpp (process_directive): added - ACE_UNUSED_ARG (directive). - -Fri Apr 24 18:40:08 1998 Irfan Pyarali - - * ace/Asynch_Acceptor.cpp (handle_accept): Fixed this method so - that it has better flexibility and error checking. Also, added - hooks so that users can do validation of remote connections. - Also, a flag is checked before accept is reissued. Thanks to - Jason Katz for reporting these upgrades. - -Fri Apr 24 16:33:14 1998 Steve Huston - - * ace/OS.h: ACE_FACTORY_DEFINE - in the generated gobble function, - use the indicated object type to do the delete so 1) the aC++ - compiler won't complain, and 2) so the service object is - destructed properly. - - * tests/Env_Value_Test.cpp: Made it compile on Solaris. - -Fri Apr 24 15:45:38 1998 David L. Levine - - * ace/config-sunos5.5-*.h: set ACE_THR_PRI_FIFO_DEF to 30, because - sched_get_priority_min is not implemented on Solaris 2.5.x. - -Fri Apr 24 09:12:39 1998 Nanbor Wang - - * tests/Env_Value_Test.cpp: Made it UNICODE safe. - - * tests/version_tests/version_tests.dsw: - * tests/version_tests/OrdMultiSet_Test.dsp: Added new project - file. - -Fri Apr 24 09:09:49 1998 David L. Levine - - * ace/config-linux-common.h: added ACE_HAS_4_4BSD_SENDMSG_RECVMSG. - Thanks to Sandro Doro for recommending - this. - -Fri Apr 24 04:12:39 1998 Nanbor Wang - - * tests/version_tests/version_tests.dsw: - * tests/version_tests/OrdMultiSet_Test.dsp: Added new project - file. - -Thu Apr 23 22:52:20 1998 Nanbor Wang - - * tests/tests.dsw: Somehow, Thread_Mutex_Test.dsp got removed from - the workspace. - - * tests/Thread_Mutex_Test.dsp: Update include/lib path. - -Fri Apr 24 00:12:32 1998 Douglas C. Schmidt - - * ACE version 4.4.42 released. - -Thu Apr 23 22:28:02 1998 Douglas C. Schmidt - - * ace/Service_Config: Began adding support for the new service - configurator feature that will make it possible to dynamically - configure services that are read in from the command-line. - Thanks to Karlheinz for requesting this. - - * ace/Parse_Node.cpp (open_handle), - ace/Svc_Conf.l: The line for the service object for the service - configurator contains the DLL specifications. Previously, it - was possible to specify either the absolute path name of the DLL - or only the name of the DLL itself. For the latter, the service - configurator is searching for the DLL using the PATH environment - variable. If we used the absolute path name it was not - possible to use environment variables in the string. It is now - possible to do this for Win32 using their %foo% notation. - Thanks to Andreas Schuelke for - providing these fixes. - - * etc/Svc_Conf_y.cpp.diff, - etc/Svc_Conf_l.cpp.diff, - ace/Makefile: Change the YY* symbols to ACE_YY* symbols to - avoid clashes if we link with other flex/yacc generated code. - - * apps/Gateway/Gateway/gatewayd.cpp, - apps/Gateway/Peer/peerd.cpp: Added a check to see if the - svc.conf file exists before trying to parse the arguments. - Thanks to Dani Flexer for reporting this. - - * apps/Gateway/Peer/Options.cpp (parse_args): Added the "C:" - qualifier to the get_opt string. Thanks to Dani Flexer - for reporting this. - - * ace/Activation_Queue.h: Extended ACE_Activation_Queue so that it - can be a proper base class by making the destructor virtual and - putting the methods into the protected section. Thanks to Garry - Brother for this. - - * ace/XtReactor.cpp: Commented out most of the logic if we're - running on Win32 because (1) it doesn't work correctly since - HANDLEs are not ints and (2) there's no X windows on Win32 - anyhow... - - * ace/XtReactor.h: Made ACE_XtReactor be ACE_Export'd. Thanks to - Kirill Rybaltchenko for reporting - this. - -Thu Apr 23 13:54:33 1998 David L. Levine - - * ace/Malloc.i (free): added ACE_UNUSED_ARG (ptr) if ACE_NDEBUG. - - * include/makeinclude/platform_chorus.GNU: include dtool/htgt-cf.rf - from $(MERGEDIR) instead of $(CLASSIXDIR). Thanks to - Wei Chiang for this update. - -Wed Apr 22 22:13:57 1998 Douglas C. Schmidt - - * ace/ace_bcc.ide: Added a new IDE for the Borland C++ compiler. - Thanks to Valik Solorzano Barboza for - this. - - * ace/Msg_WFMO_Reactor.cpp (wait_for_multiple_events): Fixed a - missing semi-colon. Thanks to Jorn Jensen - for reporting this. - -Wed Apr 22 21:53:12 1998 David L. Levine - - * config-linux-kcc.h: added #define ACE_SIZEOF_LONG_DOUBLE - to 12 on i386. Thanks to Ben Eng for - reporting this. - -Tue Apr 21 18:38:22 1998 Nanbor Wang - - * ace/ace_ce_dll.dsp: Removing a deprecated /windowsce:noconvert - linker flag. - -Mon Apr 20 15:39:42 1998 Steve Huston - - * ace/Handle_Set.cpp: Access fds_bits elements using an fd_mask - pointer rather than array indexing of the fds_bits array itself. - HP-UX 11 plays some games with the fd_mask type - fd_mask is defined - as an int32_t, but the fds_bits is an array of longs. This makes - plainly indexing through the array by hand tricky, since the FD_* - macros treat the array as int32_t. So the bits are in the right - place for int32_t, even though the array is long. This, they say, - is to preserve the same in-memory layout for 32-bit and 64-bit - processes. So, we play the same game as the FD_* macros to get - the bits right. See /usr/include/sys/_fd_macros.h. - On all other systems, this amounts to practically a NOP, since this - is what would have been done anyway, without all this type jazz. - -Sat Apr 18 13:59:55 1998 David L. Levine - - * ace/Naming_Context.h: removed trailing ';' at end of - ACE_FACTORY_DECLARE. - - * ace/OS.*,Sched_Params.{h,cpp}: added support on Solaris - for setting the LWP priority. It is necessary to set the - LWP priority for bound threads in the Real-Time scheduing - class. Thread priority is essentially ignored. See the - pthread_setschedparam man page for more info. Thanks to - Fred Kuhns for helping track this problem - down. - - There is one drawback: to set the LWP priority, in ACE, - a thread must set its own priority. There are examples - in performance-tests/Misc/preempt.cpp: - - High_Priority_Task::svc (void) - { - // On Solaris 2.5.x, the LWP priority needs to be set. - // This is the ACE way to do that . . . - ACE_OS::thr_setprio (priority_); - - I don't know of a way to set the LWP priority for another - thread. The problem is that there is no way that I know of - to find the LWP ID of another (bound) thread. A thread can - find the ID of its own LWP using _lwp_self (). - - * ace/config-sunos5*,README: added ACE_HAS_PRIOCNTL and - ACE_NEEDS_LWP_PRIO_SET. - - * ace/config-osf1-4.0.h: added ACE_HAS_PRIOCNTL and - ACE_LACKS_PRI_T. - - * performance-tests/Misc/preempt.cpp (svc): set LWP priority - (on Solaris) by having the thread set its own priority. - This test now passes on Solaris 2.5.1! - - * ace/High_Res_Timer.cpp (reset): initialize by assignment with - 0 instead of using memset. Thanks to Carlos for noticing this. - - * ace/Object_Manager.cpp (ACE_Object_Manager ctor): allocate - registered_objects_ after the allocation of ACE_STATIC_OBJECT_LOCK, - just to be safe. - -Sat Apr 18 01:28:36 1998 Irfan Pyarali - - * ace/Timeprobe.h (class ACE_Timeprobe): Changed ACE_Timeprobe to - use ACE_OS::gethrtime(). - -Sat Apr 18 01:14:30 1998 Irfan Pyarali - - * ace/OS.cpp (start and stop): start and stop should only be done - when ACE_Countdown_Time::max_wait_time_ is non-zero. - - * ace/Acceptor.cpp (open): Only set the reactor if calls to open() - and register_handler() succeeds. - -Fri Apr 17 21:00:21 1998 Steve Huston - - * ace/config-hpux11.h: Changes and comments around the - ACE_DEFAULT_BASE_ADDR definition for 64-bit HP-UX 11. - - * ace/Naming_Context.cpp - * ace/Malloc_T.cpp - * ace/Memory_Pool.cpp: Hacks to work around bugs in HP-UX aC++ in - 64-bit mode on HP-UX 11. - - * ace/OS.i: Addition of a facility that allows config.h to specify - additional flags for ACE_OS::mmap, above what's set by the caller. - It's done using a new definition, ACE_OS_EXTRA_MMAP_FLAGS. - This was added primarily to allow setting of the MAP_ADDR32 flag - on HP-UX 11 if the ACE_DEFAULT_BASE_ADDR is set in the 32-bit range - to allow 32-bit and 64-bit programs to map the same region. - -Fri Apr 17 11:40:38 1998 Nanbor Wang - - * ace/OS.cpp (invoke): Should check against null thr_desc, not - thr_desc->flag (). Thanks to "Erickson, Jack (CICG - NY GFX)" - for reporting this. - - * ace/OS.h (ACE_Service_Object_Exterminator): Typedef of ACE - factory cleanup funciton. - (ACE_FACTORY_{DECLARE,DEFINE}): Added an extra argument to pass - back destructor for the object created by the factory. Changed - the ACE_FACTORY_DEFINE to generate this destructor function to - pair with factory function so that we can deallocate the object - in the same heap it was created. - (ACE_SVC_INVOKE): This will now pass in 0, which means we don't - want to use the destructor function. - - * ace/Parse_Node.{h,cpp} (symbol): Added an extra argument to get - back the destructor function from ACE_FACTORY. Only - Function_Node actually uses it. - (ACE_Function_Node::symbol): Initialize the Service_Object with - added destructor function ptr so it will get destructed in the - "right place". - - * ace/Service_Config.{h,cpp} (load_static_svcs): Invoke the - factory method with added argument to get back the destructor - function and then, pass it in to ace_create_service_type - function. - (ACE_Service_Manager): Changed to use the more generic - ACE_FACTORY_DEFINE than using ACE_SVC_FACTORY_DEFINE. - (ACE_SERVICE_ALLOCATOR): Must match with signature of the - new factory method. - - * ace/Service_Type.{h,cpp} - (ACE_Service_Object_Type,ACE_Service_Type_Impl): Keep the - destruction function in these object, if use provides one, then - use it to destruct the object, otherwise, just use delete. - - * ace/Naming_Context.{h,cpp}: Changed to use - ACE_FACTORY_{DEFINE,DECLARE}. - - * ace/Object_Manager.cpp: Changed the signature of - Service_Manager. - - * ace/Svc_Conf.h: Changed the signature of - ace_create_service_type. - - * ace/Svc_Conf_y.cpp: - * ace/Svc_Conf.y: Try to get the destruction function from - factories in svc_location. - (ace_create_service_type): Pass in the destruction function if - provided one. - -Fri Apr 17 08:31:38 1998 Douglas C. Schmidt - - * ace/Signal.cpp (dispatch): Fixed a typo. Thanks for David - Levine's help pointing this out. - -Thu Apr 16 21:12:48 1998 Douglas C. Schmidt - - * ace/Signal.cpp: There was a major portability violation in the - ACE_Sig_Handler::dispatch() method, which was previously - acquiring a mutex lock. This is NOT permitted in the POSIX - signal handler spec. In addition, the implementation had other - nasty consequences related to dynamic allocation of memory in - the signal handler, which has a bad habit of breaking - non-reentrant uses of "new". The consequence of all this is - that you really shouldn't be modifying signal handlers via the - Reactor in multiple threads of control. In general, threads and - signals are just plain evil, so they are best addressed via - sigwait() anyhow... - - Thanks to Sumedh and Naga for first tracking this down. - -Thu Apr 16 20:51:42 1998 David L. Levine - - * ace/config-linux-pthread.h: added ACE_HAS_THREADS. - ace/config-irix6.x-g++.h: added ACE_HAS_THREADS and ACE_MT_SAFE. - Thanks to Dave Tallman for reporting these. - -Thu Apr 16 04:14:53 1998 Irfan Pyarali - - * ace/Timeprobe: - - This class is used to instrument code. This is accomplished by - inserting time probes at different location in the code. - ACE_Timeprobe then measures the time difference between two time - probes. - - This class provides a lightweight implementation for measuring - the time required to execute code between two time probes. When - a time probe executes, it records the time, the id of the - calling thread, and an event description. The event description - can either be an unsigned long or a string (char *). If string - are used, care must be taken cause only pointer copies are done - and the string data is *not* copied. - - The recorded time probes can then be printed by calling - print_times(). If you have used unsigned longs as event - descriptions in any of your time probes, you must provide an - event description table that maps the unsigned longs to readable - strings. This map is a simple array of strings, and the event - number is used as the index into the array when looking for the - event description. If you have only used strings for the event - description, this map is not necessary. - -Wed Apr 15 23:01:08 1998 Nanbor Wang - - * ace/Thread_Manager.cpp (exit): Don't delete the ACE_Thread_Exit - object of the thread here. ACE_Thread_Manager::exit will be - called back again when performing TSS cleanup. Thanks to Dave - Tallman for the bug report. - -Wed Apr 15 17:12:14 1998 Steve Huston - - * ace/config-hpux-11.x-hpc++.h: Explicitly set ACE_SIZEOF_LONG based - on compiler switch for processor/memory model. - -Wed Apr 15 16:25:38 1998 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (handle_signal): Changed break to return 0. - - * ace/OS.cpp (uname): We have to make sure that the size of - (processor + subtype) is not greater than the size of - name->machine. So we give half the space to the processor and - half the space to subtype. The -1 is necessary for because of - the space between processor and subtype in the machine name. - - Thanks to Andrew Marchewka - (Andrew_Marchewka@SRT.CCMAIL.compuserve.com) for suggesting - these changes. - -Wed Apr 15 08:52:52 1998 David L. Levine - - * tests/Reactor_Exceptions_Test (handle_input): removed - ACE_NOTREACHED wrapper around return statement at end. - Now that the previous statement is a function call, the - compiler (cxx) doesn't detect that the statement can't - be reached. - -Wed Apr 15 01:03:42 1998 Douglas C. Schmidt - - * ace/OS.i (ACE_SOCKCALL_RETURN): Added a work-around for a - Borland 5.02 compiler bug. The key turns out to be the - throw-away intermediate assignment statement to correctly keep - the value of WSAGetLastError(). Thanks to Dave Tallman - for reporting this. - -Tue Apr 14 23:35:19 1998 Nanbor Wang - - * ace/Profile_Timer.cpp (elapsed_rusage): The differences of user - time and system time for GETRUSAGE were not calculated. - - * performance-tests/Synch-Benchmarks/Options.cpp (print_results): - Added dump code for ACE_HAS_GETRUSAGE. - - * ace/ace_{dll,lib}.dsp: Removed Service_Main.cpp from the - projects. We don't really need them in ACE DLL. - - * ace/Service_Main.cpp: Removed the file from CVS. Lots of - Service_Config examples can be found all round ACE directories - so we really don't need it here anymore. - -Tue Apr 14 20:30:53 1998 Steve Huston - - * ace/OS.i (mutex_init, cond_init): Added sections to properly - handle error conditions on platforms which claim - ACE_HAS_PTHREADS_1003_DOT_1C. - -Tue Apr 14 16:39:42 1998 Nanbor Wang - - * ace/ACE.cpp (ldfind): Fixed a miscalculated string size. - Thanks to Jason Katz for reporting the - bug. - -Tue Apr 14 14:33:33 1998 David L. Levine - - * tests/Thread_Manager_Test.cpp (main): don't try to suspend/resume - DCE threads, because they don't support it. Added a start barrier, - to ensure that worker threads set up their signal handlers before - the main thread tries to signal them. Drop DEFAULT_ITERATIONS from - 100000 to 10000 because 100000 takes a long time on a 200 MHz - Pentium. - -Tue Apr 14 12:59:04 1998 Douglas C. Schmidt - - * tests/Hash_Map_Manager_Test.cpp: Changed the consts to - size_t, as well... - -Tue Apr 14 11:40:23 1998 David L. Levine - - * tests/Hash_Map_Manager.cpp: made type, size_t, of String_Table_size - explicit, instead of using the default type of int. - -Tue Apr 14 10:10:46 1998 Douglas C. Schmidt - - * ACE version 4.4.41 released. - -Tue Apr 14 07:19:25 1998 David L. Levine - - * bin/make_release (create_kit): ACE+TAO instead of ACE_TAO. - Thanks to Doug for reporting this. - - * ace/OS.h (ACE_Thread_Adapter): added friend class declaration - to avoid g++ warning: only defines a private destructor and - has no friends. - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): only declare local - thr_desc if ACE_HAS_WIN32 and ACE_HAS_MFC. - -Tue Apr 14 00:46:05 1998 Douglas C. Schmidt - - * ACE version 4.4.40 released. - -Mon Apr 13 19:19:13 1998 Douglas C. Schmidt - - * ace/OS: Made the destructor of ACE_Thread_Adapter private to - keep people like Russ from abusing this class... ;-) - - * ace/OS.cpp (invoke): We were incorrectly deleting this and then - using one of its fields! Thanks to the ever-vigilant Russ - Noseworthy for reporting this. - - * ace/Log_Record.cpp (print): Added VERBOSE_LITE support to the - code so we don't spew out quite so much information. - - * ace/Log_Msg.cpp (log): Replaced all calls to - ACE_Log_Record::print() so that they pass the - ACE_Log_Msg::flags_ parameter. - - * ace/Log_Record.h: Changed the 'int verbose' parameter to 'u_long - verbose_flag' parameter so that we can pass in the - ACE_Log_Msg::flags_ and check to see what they are enabled with! - - * tests/test_config.h: Changed VERBOSE to VERBOSE_LITE so we don't - have quite so much junk printed out for the tests! - - * ace/Log_{Priority,Record}: Added a new flag called VERBOSE_LITE - that isn't quite as verbose as VERBOSE (it only prints things - that can change between calls to the ACE_Log_Msg::log() method). - In addition, also changed the ACE_Log_Record::print() method so - it prints the string format for the ACE_Log_Priority types. - This is a lot more legible than printing the numbers. - - * ace: Removed all uses of ACE_HAS_WILDCARD_BIND. This is now the - default behavior. If there's some weird platform that DOESN'T - have this behavior, we'll deal with that by setting the - ACE_LACKS_WILDCARD_BIND flag. - - * ace/OS.cpp (invoke): Removed the (void *) cast on delete this. - It wasn't necessary. Thanks to Steve Huston and David Levine - for reporting this. - -Mon Apr 13 19:12:49 1998 Nanbor Wang - - * ace/DEV_Connector.i (ACE_DEV_Connector): - * ace/Asynch_IO.cpp (accept,addresses): UNICODE changes. - -Mon Apr 13 18:05:26 1998 Steve Huston - - * tests/Thread_Manager_Test.cpp: Disabled the suspend/resume action - for Pthreads platforms. - -Mon Apr 13 10:18:59 1998 David L. Levine - - * ace/High_Res_Timer.i (hrtime_to_tv): in tv.usec calculation, - moved the cast to long to after the division by global_scale_factor_. - This is necessary for compatibility with ACE_U_LongLong. - - * bin/make_release (get_versions): use $KIT instead of hard-coded - ACE, so that it works with TAO. (tag): translate dots to - underscores, because CVS doesn't allow dots in tags. Thanks to - Doug and Hans Rohnert for reporting these. - -Sun Apr 12 21:11:53 1998 Nanbor Wang - - * ace/OS.h: Prevent using ACE_HAS_MOSTLY_UNICODE_APIS without UNICODE. - - * ace/OS.cpp (thr_create): - * ace/Thread_Manager.cpp (spawn_i): Removed directive - ACE_NO_THREAD_ADAPTER and its related code. - -Sat Apr 11 22:20:51 1998 Nanbor Wang - - * tests/Thread_Manager_Test.cpp (main): Don't check execute result - of kill_grp statement if we are running on Win32 platforms. - thr_kill is not supported there. - -Sat Apr 11 20:00:12 1998 Douglas C. Schmidt - - * ACE version 4.4.39, released Sat Apr 11 20:00:12 1998. - -Sat Apr 11 19:58:56 1998 Douglas C. Schmidt - - * Nanbor removed a bunch of *.MAK files, which were quite large - and taking up lots of space. - -Sat Apr 11 18:58:24 1998 Steve Huston - - * ace/INET_Addr.cpp: Fixed missing paren. - - * netsvcs/servers/servers4.mdp: Added ..\lib to include directories - for Release build. - -Sat Apr 11 13:28:19 1998 Douglas C. Schmidt - - * ACE version 4.4.38, released Sat Apr 11 13:28:19 1998. - -Sat Apr 11 12:46:08 1998 Douglas C. Schmidt - - * ace/config-mvs.h: Added some ACE_SIZEOF_* macros for MVS. - Thanks to Chuck Gehr for reporting - this. - - * ace/INET_Addr.cpp: Added a newline and a better explanation of - what went wrong if an error occurs. Thanks to Luca for - reporting this. - -Fri Apr 10 02:42:35 1998 Nanbor Wang - - * ace/Log_Msg.{h,cpp} (log_hexdump): - * ace/ACE.{h,cpp} (format_hexdump): The buffer to be hex-dumped should - always be of type (const char *) no matter we have UNICODE - system strings or not. - - * ace/OS.{h,cpp} (ACE_CE_Bridge): This new class bridges - a text-based ACE programs with a default window that prints out - the default ACE_Log_Msg output. - - CE always uses non-static object manager and we replace the - original main function with a well know entry that the main - window program can call back from to invoke the ACE program in a - separate thread. - - * ace/Log_Record.{h,cpp}: Added support for passing strings as - windows messages. - - * ace/Log_Msg.cpp (log): Specialized CE support. - - * windoezCE: The template windows program that receives ACE - messages. See CE-Status or README file for more info. - -Fri Apr 10 00:41:23 1998 Douglas C. Schmidt - - * tests/Reactor_Exception_Test: Tidied the test up a bit. Thanks - to Bob Laferriere for suggesting - this. - - * tests/test_config.h: Enabled ACE_Log_Msg::VERBOSE since it gives - more information that can be useful for debugging. - -Fri Apr 10 00:04:03 1998 Irfan Pyarali - - * ace/Proactor.cpp (post_completion): Added a new method to the - Proactor. It can be used to post a result to the completion port - of the Proactor. If errors occur, the result will be deleted by - this method. If successful, the result will be deleted by the - Proactor when the result is removed from the completion port. - Therefore, the result should have been dynamically allocated and - should be orphaned by the user once this method is called. - - Changed the timer mechanism to use this new method rather than - posting to the completion port directly. - - Thanks to Jason Katz for the - improvements. - -Thu Apr 9 17:31:47 1998 Douglas C. Schmidt - - * Updated all the Makefile dependencies and also added the - appropriate CVS strings to all Makefiles. - - * examples/IPC_SAP/SOCK_SAP: Improved both the CPP-unserver.cpp - and CPP-inserver.cpp programs so they work identically wrt - concurrency and logic. - - * ace/LSOCK_Stream.cpp: Fixed the get_remote_addr() and - get_local_addr() methods to work correctly. Apparently, - getpeername() doesn't work appropriately for UNIX domain - sockets, so we simply have both methods call getsockname(). - Thanks to Chuck Gehr for pointing out this problem. - - * ace/FILE_IO.cpp (get_local_addr): The RHS has an additional - field that is the FILE name, which did not get copied. Added an - ACE_dynamic_cast() to do the right thing here. Thanks to Ganesh - Pai for reporting this. - - * ace/Malloc*: Factored out all the code in ACE_Static_Allocator - into a new non-templatized base class called - ACE_Static_Base_Allocator so that we don't trigger multiply - defined symbols when we use this in TAO. Thanks to Carlos for - this very insightful trick! - - * tests/Thread_Manager_Test.cpp (main): Added ACE_ASSERT - statements so that we bailout if things go awry. Thanks to - Robert J. Laferriere for reporting - this. - -Thu Apr 09 18:06:53 1998 Nanbor Wang - - * ace/High_Res_Timer.i (hrtime_to_tv): Cast the parameter for usec - to long. It can be fixed because of Darrell's vigilance. - -Thu Apr 09 17:55:21 1998 Steve Huston - - * ace/config-hpux-10.x.h, config-hpux11.h, config-aix-4.2.x.h: - Added ACE_HAS_WILDCARD_BIND. - -Thu Apr 09 16:43:26 1998 Irfan Pyarali - - * ace/ACE.*: Changed *_version() functions to be non-inlined. - After this change, inclusion of ace/Version.h can be moved into - ACE.cpp. This change helps as all of ACE doesn't have to be - compiled after Version.h changes (Version.h changes every time a - new beta is produced). - -Thu Apr 9 12:27:23 1998 Carlos O'Ryan - - * tests/Hash_Map_Manager_Test.cpp: POOL_SIZE was simple "const - POOL_SIZE" I changed that to "const int POOL_SIZE". Added - missing template instantiation for Static_Allocator. - -Thu Apr 09 10:50:18 1998 Nanbor Wang - - * ace/WFMO_Reactor.cpp (dump): Fixed signed/unsigned mismatched - warnings on NT. Thanks to Darrell for noticing the bug. - -Thu Apr 9 09:37:08 1998 Douglas C. Schmidt - - * ace/Malloc_T: Moved the ACE_Static_Allocator::dump() method into - the Malloc_T.cpp file so we'd get a vtable... Thanks to David - Levine for reporting this. - - * tests/Hash_Map_Manager_Test.cpp (run_test): Added a return - value to make G++ and David Levine happy ;-). - -Thu Apr 09 10:50:18 1998 Nanbor Wang - - * ace/WFMO_Reactor.cpp (dump): Fixed signed/unsigned mismatched - warnings on NT. Thanks to Darrell for noticing the bug. - -Wed Apr 08 17:29:01 1998 Irfan Pyarali - - * ace/SOCK_Acceptor.cpp (open): There was a boo-boo in open() as - we were only calling bind_port() and ignoring the port supplied - by the user. Call bind_port only if port == 0. - -Wed Apr 8 01:09:52 1998 Douglas C. Schmidt - - * ace/Malloc_T: Added a new ACE_Static_Allocator class, which is - highly optimized for allocations where (1) all the memory size - is known in advance and (2) no deletions are done. This class - will ultimately be used in TAO to improve it's startup - performance for operation tables initialization. - - * tests/Hash_Map_Manager_Test.cpp: Enhanced the test so that it - uses the new ACE_Static_Allocator feature. - - * ace/OS: Added support for the rename() method. Thanks to Ganesh - Pai for suggesting this. - - * ace/config-win32-common.h, - config-sunos*.h: - config-irix-6*.h: - Enable the ACE_HAS_WILDCARD_BIND macro. - - * ace/ACE.cpp: Modified the bind_port() method so that it is more - efficient on platforms that interpret a 0 port to bind() as a - request for the kernel to select the port. Thanks to Chris - Cleeland for pointing this out. - - * ace/Hash_Map_Manager: Made a bunch of minor changes to fix some - subtle deadlocks with intra-class locking. - - * tests/Map_Manager_Test.cpp: Restructured the tests so that we - don't keep recomputing end() and rend() of the map in each loop - iteration! - -Wed Apr 08 10:02:16 1998 David L. Levine - - * bin/make_release: added this script that creates ACE and/or - TAO releases. - - * Makefile: added support for make_release. See comments at - the top of the Makefile. The old release mechanism has - been retained; to use it: make release-old or - make releaseall-old. - -Wed Apr 08 00:37:33 1998 Irfan Pyarali - - * ace/ACE.cpp (bind_port): This call was not flexible enough as it - always assumed that the user wanted INADDR_ANY. Added an extra - parameter to this function where the user can pass in the addr - that she is interested in. This extra parameter defaults to - INADDR_ANY, so no existing should break. - - * ace/SOCK_Acceptor.cpp (open): Not enough information was being - passed to the new ACE::bind_port() call. Changed open() so that - the sin_addr part of the address is passed along to - ACE::bind_port(). - -Tue Apr 07 15:25:08 1998 David L. Levine - - * ace/config-irix*.h: fixed determination of ACE_SIZEOF_LONG_DOUBLE, - depending on system release and ABI. Thanks to Robert J. - Laferriere for figuring it all out. - -Mon Apr 06 01:29:35 1998 Nanbor Wang - - * ace/ace_ce_dll.dsp: Update project files. Rearrange dll filenames a - bit so that it's eaier to have various ACE libraries for various - CE supported CPUs. Files for every supported CPU are generated - under CPU specific directory as follow: - - CPU Directory Name - Sh3 series ace/WCE/SH aced.{lib,dll} ace.{lib,dll} - MIPS series ace/WCE/MIPS aced.{lib,dll} ace.{lib,dll} - x86 emulation ace/WCE/x86em aced.{lib,dll} ace.{lib,dll} - - * ace/config-win32-common.h: Prevent CE from using wsock32.lib. - -Sun Apr 05 16:44:31 1998 Nanbor Wang - - * ace/OS.h (ASYS_ONLY_MULTIBYTE_STRING): New macro. Used to - activate wchar string to char string conversion only under CE, - under other cases, the argument to this macro is treated as - a regular char string. - - * ace/INET_Addr.cpp (set): Changed to use - ASYS_ONLY_MULTIBYTE_STRING. This has gotten out of control - now. I need to think of a better name for these macros. - -Tue Apr 07 09:30:28 1998 David L. Levine - - * include/makeinclude/platform_lynxos.GNU: set up PATH when - cross-compiling. With this change, users don't need to - do anything special to their platform_macros.GNU or - environment to cross-compile for LynxOS (assuming that - the default platform_lynxos.GNU configuration is suitable). - -Mon Apr 06 16:28:32 1998 Steve Huston - - * examples/Service_Configurator/IPC-tests/server/svc.conf: Corrected - library name to load tests from. Thanks to Sandro Doro - for noticing there was a problem here. - -Sun Apr 05 10:20:26 1998 David L. Levine - - * include/makeinclude/platform_lynxos.GNU: only define - CROSS-COMPILE if not building on LynxOS. - - * ace/OS.h: fixed ACE_CAST_CONST definition with Sun CC. - -Sun Apr 05 00:20:52 1998 Nanbor Wang - - * ace/ACE.h: Moved "#include "ace/OS.h" out of _ACE_H_ block to - resolve the circular inclusion that occured when building ACE - Unicode Release version. - -Sat Apr 04 21:19:32 1998 Douglas C. Schmidt - - * ACE version 4.4.37, released Sat Apr 04 21:19:32 1998. - -Sat Apr 04 19:41:03 1998 Nanbor Wang - - * ace/OS.cpp (thr_exit): Forgot to access creation flags thru - the access function. - -Sat Apr 04 14:01:53 1998 Steve Huston - - * performance-tests/Makefile: Put UDP back in dir list. - -Sat Apr 04 07:45:33 1998 David L. Levine - - * ace/Basic_Types.h,config-sunos4*.h,README: don't use - u_longlong_t on Suns if ACE_LACKS_U_LONGLONG_T is defined. - Define ACE_LACKS_U_LONGLONG_T in all SunOS4 config files. - Thanks to John Lindal for reporting - this. - -Sat Apr 4 02:06:57 1998 Nanbor Wang - - * ace/OS.cpp (invoke,thr_exit): (*Win32*) We also need to consider - threads that are not spawned by ACE_Thread_Manager by checking - the validity of cached ACE_Thread_Descriptor. In any rate, - please avoid using thread functions in ACE_Thread::* and - ACE_OS::thr_* directly. - -Sat Apr 4 01:03:17 1998 Alexander Babu Arulanthu - - * ace/Map_Manager.cpp (map): Added map method for the iterator interface. - -Sat Apr 4 00:55:30 1998 Douglas C. Schmidt - - * netsvcs/clients/Naming/{Client,Dump_Restore}/Makefile: - Moved all program source names to PSRC, not SRC, for - 'make depend'. - -Fri Apr 3 21:18:51 1998 Douglas C. Schmidt - - * ace/OS.cpp (cleanup): Moved ACE_Cleanup::cleanup() back into the - *.cpp file so that we have at least one non-inline virtual - function. - - * ace/OS (cleanup): Created a dummy ACE_Cleanup constructor since - the lack of this may be causing a bug with CC and the linker for - TAO's IDL compiler. Also moved the constructor and destructor of - ACE_Cleanup into the OS.i file and made them inline. We'll fix - this bug yet!!!! - -Fri Apr 03 18:45:35 1998 Steve Huston - - * apps/JAWS/clients/Blobby/Makefile - * apps/JAWS/clients/Caching/Makefile - * examples/ASX/Event_Server/Event_Server/Makefile - * examples/ASX/UPIPE_Event_Server/Makefile - * examples/Logger/simple-server/Makefile - * examples/Mem_Map/IO-tests/Makefile - * examples/Reactor/Multicast/Makefile - * examples/Service_Configurator/Misc/Makefile - * examples/Shared_Malloc/Makefile - * performance-tests/Synch-Benchmarks/Makefile - Adjusted for corresponding changes to rules.bin.GNU and/or - rules.lib.GNU, below. - - * examples/Connection/non_blocking/Makefile - * examples/Service_Configurator/IPC-tests/server/Makefile - * examples/Timer_Queue/Makefile - * performance-tests/Misc/Makefile - Moved all program source names to PSRC, not SRC, for - 'make depend'. - - * performance-tests/Makefile: Removed UDP from list of dirs to build. - - * include/makeinclude/rules.bin.GNU: Set OBJEXT and VOBJS from the - SRC files in the Makefile (LSRC sets VLOBJS in rules.lib.GNU; - SRC sets VOBJS in rules.bin.GNU). - - * include/makeinclude/rules.local.GNU: depend rule will also operate - on $(PSRC) in addition to $(SRC). PSRC is new - if you have more - than one program to build in a makefile, set PSRC to the source - files for make depend. - - * include/makeinclude/rules.lib.GNU: Use VLOBJS for archive lib object - files; using VOBJS gets it confused with VOBJS in rules.bin.GNU and - makes it very difficult to build lib and exe from same Makefile. - -Fri Apr 3 10:40:10 1998 Nanbor Wang - - * ace/OS.cpp (invoke): We were using AfxGetThread to determine - whether a thread was created with AfxBeginThread or - _beginthreadex. This seemed to cause some subtle problem with - MSVC 4.2. Since we always cached the Thread_Descriptor in TSS - now, we can just check how a thread was created and use the - appropriate thread exiting method. Thanks to Detlef Becker - for tracing down this obscure - bug. - - * ace/Thread_Manager.{h,i} (flags): Added this new access function - into ACE_Thread_Descriptor to get the creation flags for a - thread. - -Fri Apr 03 10:01:32 1998 Steve Huston - - * ace/ACE.cpp (handle_timed_complete): On AIX, always check a - completed non-blocking connect() because AIX sets only the write - handle from select regardless of whether the connect succeeded - or not. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: Removed - the #include - this is taken care of via ace/OS.h. - Having the #include in Dump_Restore.cpp caused some very weird - compile errors on DG/UX. - - * netsvcs/lib/Server_Logging_Handler.cpp: Fixed template instantiations - for Base_Optimizer, non-static logging cases. - -Fri Apr 03 09:16:24 1998 David L. Levine - - * ace/OS.cpp (ACE_TSS_Info::key_in_use): return true if - thread_count_ > 0, not if it is != -1. Thanks to Chris - Lahey for finding and reporting this. - - * ace/OS.i (thr_yield): on VxWorks, changed argument of - ::taskDelay () from 0 to 1. With an argument of 0, - ::taskDelay () doesn't appear to yield the current thread. - - * tests/run_tests.vxworks: Reactor_Notify_Test is OK on - VxWorks now. - - * ace/OS.h,config-sunos5.5-sunc++-4.x.h: added ACE_CAST_CONST, - so that we can work around broken cast constness requirements - with Sun CC 4.2. It requires, for example, that a reinterpret - cast to a local pointer variable in a const member function be - const. Wrong. - - * ace/Basic_Types.i (operator/ and %): fixed comments: former - instead of latter. - -Thu Apr 02 16:23:12 1998 Irfan Pyarali - - * ace/WFMO_Reactor.i (dump): Also changed the method from HANDLE - to ACE_HANDLE. - -Thu Apr 2 15:36:20 1998 Douglas C. Schmidt - - * ace: Added - - #define ACE_HAS_STL_QUEUE_CONFLICT - - to the config files which had ACE_HAS_STL_MAP_CONFLICT defined, - i.e., - config-sunos5.5-g++.h - config-sunos5.5-sunc++-4.x.h - - Thanks to Russ Noseworthy for - reporting this. - -Thu Apr 2 15:14:35 1998 Sumedh Mungee - - * ace/WFMO_Reactor.h (dump): Renamed HANDLE to ACE_HANDLE. - -Thu Apr 02 14:23:11 1998 David L. Levine - - * tests/Reactor_Notify_Test.cpp (Supplier_Task::handle_output): - added a thr_yield () so that the Supplier_Task always gets a - chance to run. - - * tests/run_tests.sh: Reactor_Notify_Test is OK on Chorus now. - -Wed Apr 01 18:59:42 1998 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (dump): Added dump() methods. - - * ace/Msg_WFMO_Reactor.cpp (wait_for_multiple_events): Reverted - Nanbor's change. The flag is properly set in - ACE_Msg_WFMO_Reactor::alertable_handle_events(). - -Wed Apr 1 15:40:01 1998 Douglas C. Schmidt - - * ace: Made the WMFO_Reactor and Select_Reactor's dump() methods - virtual to underscore the fact that the Reactor_Impl's new - dump() method is also virtual. - - * ace/OS.h: Changed ACE_HAS_STL_MAP_CONFLICT to - ACE_HAS_STL_QUEUE_CONFLICT for the appropriate cases in ACE. - Thanks to Russ Noseworthy for - reporting this. - - * ace/CORBA_Handler.cpp (ACE_CORBA_Handler): The reference_count_ - data member wasn't being initialized correctly. Thanks to - Mahesh Chandwani for reporting this. - - * ace: Renamed config-sunos5.5-sunc++-4.x-orbix.h to - config-sunos5.x-sunc++-4.x-orbix.h since this config file works - with SunOS 5.5 and 5.6. Thanks to Mahesh Chandwani - for reporting this. - -Wed Apr 01 16:28:30 1998 David L. Levine - - * ace/Reactor.{h,cpp},Reactor_Impl.h (dump): added dump () - method, which calls the (existing) dump () in the reactor - implementation. - - * ace/High_Res_Timer.* (hrtime_to_tv): fixed conversion of - ACE_hrtime_t to ACE_Time_Value to be compatible with - ACE_U_LongLong. - -Wed Apr 01 09:32:27 1998 Nanbor Wang - - * ace/Msg_WFMO_Reactor.cpp (wait_for_multiple_events): Should not - wait for all objects in this function. - -Tue Mar 31 15:27:25 1998 Steve Huston - - * apps/JAWS/server/JAWS_Pipeline_Handler.cpp: Defined 'status' in - the put() function. - - * ace/config-dgux-4.x-ghs.h: Removed settings for ACE_SIZEOF_LONG_LONG - since the compiler doesn't really support a long long that ACE - is looking for (64-bit). Use the ACE-supplied ACE_ULongLong type. - -Tue Mar 31 10:46:23 1998 Nanbor Wang - - * ace/Msg_WFMO_Reactor.cpp: Changed to use - MsgWaitForMultipleObjects if we are not under NT. Also in - MsgWaitForMultipleObjectsEx, we should use NT defined flags - instead of the boolean "alertable" directly. - -Tue Mar 31 07:22:09 1998 David L. Levine - - * ace/OS.i (cond_timedwait): restored ACE_HAS_DCE_DRAFT4_THREADS - behavior to use absolute time. Special-case only on LynxOS, - which requires a relative time. Thanks to Steve Coy - for reporting this on HP-UX. - - * tests/Thread_Manager_Test.cpp (worker): cache the thread's - Signal_Catcher on entry. That way, we don't have to - dereference it in the worker's loop. It seems that a worker - thread can continue to run after main exits (and cleans up - TSS). That shouldn't happen, but it looks like it does on - Linux, LynxOS, and Digital Unix. Thanks to James CE Johnson - for verifying that the fix works on Linux/ - Intel and DU 4.0. - - * examples/Threads/task_five.cpp (main): wrapped return statement - at end with ACE_NOTREACHED. This will prevent compiler warnings - from Green Hills and DEC CXX, and maybe SGI cc. - -Fri Mar 27 23:04:08 1998 David L. Levine - - * ace/config-linux-common.h: added ACE_DEFAULT_MAX_SOCKET_BUFSIZ - 65535, because some Linux 2.1.x kernels fail setsockopts if - bigger than that. Thanks to Ravi Nagabhyru - for reporting that. Also changed hard-code ACE_PAGESIZE to - ACE_HAS_GETPAGESIZE, even though getpagesize () doesn't get - used. ACE_OS::getpagesize () uses sysconf on Linux. - - * performance-tests/UDP/udp_test.cpp (main): getopt.optarg instead - of optarg, for -f option. - - * ace/IPC_SAP.cpp (enable,disable): removed the ACE_NOTREACHED - wrappers around the return statements. Seems that some versions - of Green Hills complain about an unreachable statement, but - we'll live with it. This change is only visible with SGI, - DEC CXX, and Green Hills. - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: added missing - close paren after ppc conditional. Thanks to Brian Mendel for - reporting this. - -Fri Mar 27 16:47:26 1998 Steve Huston - - * tests/tests.mdp: Made settings for Env_Value_Test consistent with - other tests, so that run_tests.bat can find it. - - * netsvcs/servers/servers4.mdp: Added ..\lib to Include directories - when building in Release mode. - -Fri Mar 27 13:55:13 1998 Nanbor Wang - - * ace/High_Res_Timer.i (gettime): ACE_OS::gettimeofday doesn't - take any argument. - -Fri Mar 27 09:50:52 1998 Steve Huston - - * ace/Strategies_T.cpp: Added #include "ace/Service_Repository.h" for - compile on HP. Thanks to Steve Coy for this. - -Fri Mar 27 09:21:21 1998 David L. Levine - - * tests/test_config.h: with Green Hills on VxWorks, rename - main to ace_main for compatibility with run_tests.vxworks. - - * ace/OS.{h,i},High_Res_Timer.* (gethrtime): added an optional - argument to allow specifying start/increment/stop to a timer. - It is currently only used on Chorus. On Chorus, using - the default ACE_HRTIMER_GETTIME will use clock_gettime () - instead of sysBench (). sysBench () disables interrupts, - so it must be used with care. - -Thu Mar 26 21:18:57 1998 David L. Levine - - * ace/Basic_Types.h,config-g++-common.h,config-freebsd*.h, - config-netbsd.h: moved setting of ACE_SIZEOF_LONG_DOUBLE to 12 - from Basic_Types.h to config-g++-common.h and the FreeBSD/NetBSD - config files. - -Thu Mar 26 20:53:30 1998 Nanbor Wang - - * ace/Containers.{h,i,cpp}: Changed the template parameter name - to to avoid namespace polution. Thank to John - Mulhern <9107@MN3.LAWSON.lawson.com> for suggestion this. - -Thu Mar 26 17:23:38 1998 Douglas C. Schmidt - - * ACE version 4.4.36, released Thu Mar 26 17:23:38 1998. - -Thu Mar 26 12:54:57 1998 David L. Levine - - * ace/IPC_SAP.cpp (enable,disable): wrapped return statement - at end with ACE_NOTREACHED. - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: added support - for x86 targets. - - * ace/Basic_Types.h: sizeof (long double) is 8 on ghs/VxWorks/i386, - not 12. - -Wed Mar 25 10:10:04 1998 David L. Levine - - * include/makeinclude/platform_{chorus,vxworks5.x}_ghs.GNU: - change OFLAGS to OCFLAGS. - - * include/makeinclude/platform_chorus_ghs.GNU: if debug is enabled, - link with crth_d.s.o instead of crth.s.o. - - * ace/config-g++common.h: don't #define - ACE_HAS_TEMPLATE_SPECIALIZATION with egcs 2.91. Thanks to - Sudish Joseph and - Loren Rittle for reporting this - apparent bug with egcs 2.91. (egcs 2.90 builds ACE cleanly - with ACE_HAS_TEMPLATE_SPECIALIZATION.) - - * include/makeinclude/platform_vxworks5.x_g++.GNU: add VxWorks - host bin directory to PATH if its not already there. - -Tue Mar 24 19:48:44 1998 Irfan Pyarali - - * ace/Proactor.cpp (timeout): Changed comparison from || to - &&. Thanks to Jason Katz for reporting - this. - -Tue Mar 24 18:14:18 1998 Steve Huston - - * ace/Env_Value_T.h: added #include "ace/OS.h" to get the definition - for ACE_static_cast - AIX xlC needs it for auto template generation. - -Tue Mar 24 09:00:36 1998 Carlos O'Ryan - - * bin/auto_compile: - Missing newline after the "DISABLED" message. - -Tue Mar 24 07:38:44 1998 David L. Levine - - * ace/config-sunos5.5-g++.h: replaced ACE_PAGE_SIZE with - ACE_HAS_GETPAGESIZE, and added ACE_HAS_STL_MAP_CONFLICT. - Thanks to Loren Rittle for reporting - these. - -Mon Mar 23 12:06:30 1998 David L. Levine - - * performance_tests/UDP/udp_test.cpp: made use of the Reactor - optional. With this change, the performance is comparable - to the original C version. - - * ace/OS.{h,i} (wslen,wscpy): added these, and WChar typedef, - for TAO. - - * include/makeinclude/platform_chorus_ghs.GNU: moved directories - to /project/doc/mvme/. - - * ace/config-vxworks5.x.h: protected #define of ACE_MAIN so that - it can be #defined on the command line. - -Mon Mar 23 11:38:43 1998 Nanbor Wang - - * ace/OS.h (MAXPATHLEN): Guard the MAXPATHLEN definition with - #ifndef in case if has already been defined. Thanks to "Patrick - J. McNerthney" for reporting this. - -Mon Mar 23 03:18:50 1998 Douglas C. Schmidt - - * ACE version 4.4.35, released Mon Mar 23 03:18:50 1998. - -Mon Mar 23 00:03:37 1998 Irfan Pyarali - - * examples/Reactor/ReactorEx/test_abandoned.cpp: Tests the - WFMO_Reactor's ability to handle abandoned mutexes. - - * examples/Reactor/ReactorEx/test_apc.cpp: Tests the - WFMO_Reactor's ability to handle regular APC notifications. - -Sun Mar 22 23:47:00 1998 Irfan Pyarali - - * ace/WFMO_Reactor.cpp: Added code to the Reactor to make it more - resilient when the wait() function returns WAIT_IO_COMPLETION - and WAIT_ABANDONED. - - ok_to_wait: Keep waiting if wait() returns WAIT_IO_COMPLETION. - - dispatch: Return if wait() returns - WAIT_IO_COMPLETION. - - dispatch_handles: Added code to correctly handle WAIT_ABANDONED - and to correctly figure out the index of the handler to be - dispatched. - - Thanks to Beskrovny Evgeny (evgeny_beskrovny@icomverse.com) of - Comverse Network Systems for pointing out the problem with - WAIT_IO_COMPLETION. - - * ace/Reactor.cpp (run_alertable_event_loop): Added new function - that runs the Reactor using alertable_handle_events() instead of - handle_events(). - -Sat Mar 21 19:58:42 1998 Nanbor Wang - - * ace/OS.i (flock_destroy): lock->lockname_ should be cast to - LPTSTR instead of char*. Thanks to Goran Lowkrantz - for reporting this. - - * examples/Threads/task_five.cpp: Allow users to set thread stack - size from command lines. If a user doesn't give one, it will be - set to 8k on non-Windows platforms. - -Fri Mar 20 22:07:15 1998 Nanbor Wang - - * ace/ACE_Library.{mak,mdp}: Added Msg_WFMO_Reactor. - - * ace/Asynch_IO.cpp (cancel): Added version check because MSVC 4.2 - doesn't support CancelIo. - -Fri Mar 20 21:46:16 1998 Douglas C. Schmidt - - * ACE version 4.4.34, released Fri Mar 20 21:46:16 1998. - -Fri Mar 20 20:53:27 1998 Nanbor Wang - - * ace/Parse_Node.cpp: Fixed typos. - -Fri Mar 20 14:18:53 1998 Douglas C. Schmidt - - * performance-tests/UDP/udp_test.cpp: Completed the ACE'ification - of this test. - -Fri Mar 20 09:31:22 1998 David L. Levine - - * ace/OS.h: with ACE_LACKS_WCHAR_T, changed wchar_t typedef - from long to ACE_UINT32 to ensure that it is 4 bytes on - any platform. - - * performance-tests/UDP/udp_test.cpp: added this test, which - provides UDP performance statistics. Thanks to Fred Kuhns - for contributing the test. - -Thu Mar 19 10:15:27 1998 Steve Huston - - * ace/OS.i: Changed the dynamic library load/unload code so that - on HP-UX, g++ does the same thing as aC++ (not like HP C++), using - and shl_(un)load. Thanks to Kirill Rybaltchenko - for this change. - -Thu Mar 19 10:13:35 1998 David L. Levine - - * performance-tests/Misc/preempt.cpp: 1) Added -f option to fork - instead of spawning new threads. 2) Added -l option for - specifying number of iterations of low priority thread/process. - 3) On Solaris, print LWP ID. - -Thu Mar 19 02:47:42 1998 Nanbor Wang - - * ace/ace_dll.dsp: Link against user32.lib for all configurations - for we now use Msg_WFMO and related APIs in ACE. (We should do - the same to ace_lib.dsp.) - - * ace/config-WinCE.h: Added dummy definition of stdin and stdout. - They don't have any real effect. - - * ace/ACE.{h,cpp} (ldopen,ldfind): Made these functions visible - under CE. Modified them to work under CE. - - * ace/OS.cpp: Added scope name to day_of_week_name and - month_name. They are used only on CE. - - * ace/OS.{h,i}: Added some dummy C methods for CE. Yacc and Lex - generated codes use these functions, although we don't really - use them in ACE. - - * ace/OS.i (exit): Added implementation of ACE_OS::exit under CE. Since - there's no ExitProcess available, I use TerminateProcess, which - is not exactly the same as using ExitProcess but that's the - closest thing I can think of. - (open): Made the char version unsupported under CE. - (fread,fwrite,...): Added dummy C methods definition for CE. - - * ace/Parse_Node.cpp: Regular CE stuff. There's a boundary - of char/wchar functions somewhere in this file. Most Svc_Conf - stuff uses char functions but the information gets converted to - wchar later. - - * ace/Service_Config.{h,i}: Added char version function for - Service_Type under CE. Service_Type (and its subclasses) are - the boundary of char/wchar functions. - - * ace/Service_Object.{h,i}: Added the chname method which always - returns char value of a Service_Object under all platforms. - - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: - * ace/Object_Manager.{cpp}: Regular CE stuff. - - * ace/Svc_Conf_l.cpp: Regular CE stuff. Haven't figure out a way - to modify this from Svc_Conf.l yet. - - * ace/Service_Config.cpp - * ace/Object_Manager.{cpp}: Ifdef'ed inclusion of Naming Context - related header files out. Naming context uses Registry which - uses iostream and STL, both are not available on CE (yet?). - - * ace/WFMO_Reactor.{h,cpp}: - * ace/Proactor.{h,i,cpp}: - * ace/Asynch_IO.{h,cpp}: Ifdef'ed the body so they are not visible - under CE. CE doesn't have asynchronous IO. - -Wed Mar 18 21:30:39 1998 Douglas C. Schmidt - - * ACE version 4.4.33, released Wed Mar 18 21:30:39 1998. - -Wed Mar 18 16:36:17 1998 Douglas C. Schmidt - - * Makefile (releaseall): There is no more TAO.tar.gz. There are - now two tar files, ACE.tar.gz and ACE+TAO.tar.gz. - ACE+TAO.tar.gz contains ALL of ACE. In particular, it will - always have the same version number and same ACE contents as - ACE.tar.gz. The intent here is that people who just want to use - ACE will use ACE.tar.gz and people who want to use ACE and TAO - will use ACE+TAO.tar.gz. Thanks to David Levine and Irfan for - helping with this. - -Wed Mar 18 15:50:30 1998 Nanbor Wang - - * ace/Log_Msg.cpp (ACE_Log_Msg): Added codes to grab - ACE_Log_Msg_Manager's lock while updating the instance_count_. - There was a race condition without the change. Thanks to Detlef - Becker's thread creation stress - test to reveal the bug. - -Tue Mar 17 17:20:00 1998 Nanbor Wang - - * examples/Threads/test.dsw: - * examples/Threads/task_five.cpp: - * examples/Threads/task_five.dsp: - * examples/Threads/Makefile: Added a new ACE_Task testing - program. Thanks to Detlef Becker - for providing the source. - -Wed Mar 18 11:00:11 1998 Alexander Babu Arulanthu - - * ace/Hash_Map_Manager.cpp (map): This method has been added to - the ACE_Hash_Map_Iterator_Base class. - -Wed Mar 18 09:25:30 1998 Chris Gill - - * ace/ace.dsw: added user32.lib to link for dynamic library on NT - for all builds. - -Wed Mar 18 09:22:13 1998 David L. Levine - - * ace/Containers.cpp,Hash_Map_Manager.cpp,Map_Manager.cpp - (operator *): initialize retv to 0 to avoid warning about - using it before setting its value. - - * tests/Thread_Mutex_Test.cpp (test): added no-op statement to - suppress GHS warning about unused local variable "mutex". - - * tests/Priority_Buffer_Test.cpp (consumer): added no-op statement - to suppress GHS warning about unused local variable "cur_priority". - - * ace/README: removed ACE_HAS_BOOL. It was unused. - - * performance-tests/Misc/basic_func.{h,cpp},basic_perf.cpp: - With MSVC 5.0, do something in the empty iteration because - otherwise it gets completely optimized away. Thanks to - Alexander Ovsiankin for providing - this fix. - -Tue Mar 17 23:53:56 1998 Douglas C. Schmidt - - * examples/Threads/task_five.cpp (main): Reformatted Detlef's new - torture test so that it conforms to ACE programming conventions. - -Tue Mar 17 23:22:20 1998 Irfan Pyarali - - * ace/Reactor.cpp (ACE_Reactor): If - ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL is defined, use - ACE_Msg_WFMO_Reactor for ACE_Reactor::instance(). - - * examples/Reactor/ReactorEx/test_window_messages.cpp: Tests - Msg_WFMO_Reactor's ability to handle regular events and window - messages. - -Tue Mar 17 21:41:57 1998 David L. Levine - - * examples/Threads/task_five.cpp (svc): use ACE_OS::sleepq - instead of ::Sleep. (main): declare "ii" outside of the - first loop because it is used in other loops. - -Tue Mar 17 16:02:26 1998 Irfan Pyarali - - * ace/WFMO_Reactor: Changes were made to WFMO_Reactor to make it - easier to extend it to handle window messages: - - - dispatch_handler() checks if there are window messages that - need to be dispatched if the matches . - If there are, they are dispatched by calling - dispatch_window_messages(). - - - dispatch_window_messages() is a noop for WFMO_Reactor. - - - Checking the return values from Wait*() functions was changed - as (WAIT_OBJECT_0 + nCount) is now a valid index. - - - Checking for remaining handles was abstracted into - poll_remaining_handles(). - - - Expiring of timer was abstracted out into expire_timers(). - Only the owner thread expires the timers. - - - calculate_timeout() was removed from - wait_for_multiple_events(). - - * ace/Msg_WFMO_Reactor: A new Reactor that specializes the - WFMO_Reactor. WFMO_Reactor uses WaitForMultipleObjects while - Msg_WFMO_Reactor uses MsgWaitForMultipleObjects. This allows - the Msg_WFMO_Reactor to react to Windows and COM/DCOM messages - in addition to the regular WFMO_Reactor events. - - Thanks to Beskrovny Evgeny (evgeny_beskrovny@icomverse.com) of - Comverse Network Systems for contributing this to ACE. - -Tue Mar 17 13:15:11 1998 Douglas C. Schmidt - - * ace/Future.cpp: Added missing ACE_MT macros so that we now - compile correctly if we don't have threads. Thanks to Laura - Paterno for reporting this. - -Tue Mar 17 15:13:17 1998 David L. Levine - - * ace/High_Res_Timer.cpp (dump): fleshed out the implementation. - - * ace/Profile_Timer.{h,cpp} (dump): implemented for platforms - w/o ACE_HAS_PRUSAGE_T and ACE_HAS_GETRUSAGE. - - * ace/OS.i (gethrtime): with ACE_HAS_CLOCK_GETTIME, carefully - construct return value to avoid arithmetic overflow if - ACE_LACKS_LONGLONG_T. - -Mon Mar 16 22:18:07 1998 Douglas C. Schmidt - - * ace/IPC_SAP.cpp: Moved return values outside of the #ifdefs to - quiet warning messages with KAI C++. Thanks to Laura Paterno - for reporting this. - -Tue Mar 17 00:04:53 1998 Nanbor Wang - - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: Applied "Regular CE Tricks [TM]". - -Mon Mar 16 23:34:39 1998 Nanbor Wang - - * ace/README: - * ace/config-WinCE.h: Added ACE_LACKS_STRRCHR. - - * ace/OS.i: Added implementation of ACE_OS::strrchr () when - platforms don't provide one. - -Mon Mar 16 16:08:45 1998 David L. Levine - - * ace/High_Res_Timer.cpp: set global_scale_factor_ to 1000 with - ACE_HAS_CLOCK_GETTIME, because clock_gettime has nanosecond - resolution, and with PSOS. - - * ace/Profile_Timer.{h,cpp},tests/Handle_Set_Test.cpp: use units - of microseconds instead of seconds if ACE_LACKS_FLOATING_POINT. - - * ace/OS.i (hostname): on Chorus, try the HOST environment variable - if ::gethostname () returns an empty string. - -Mon Mar 16 13:04:58 1998 Seth Benjamin Widoff - - * ace/OS.h: - Extended the ACE_HAS_STL_MAP_CONFLICT to include 'queue' as well - as 'map.' 'queue' is defined in sys/stream.h, which is included in - OS.h by netinet/in.h and sys/timod.h. - -Mon Mar 16 00:22:40 1998 Nanbor Wang - - * CE-status: Updated CE port status. - - * ace/config-WinCE.h: Added macro definitions for EOF and BUFSIZ. - - * ace/OS.{h,i} (ace_isspace): Added both char and wchar version - functions. Notice that this can't be called isspace because - most compilers implement isspace as a macro. - (dlerror,dlsym): Added wchar version of these functions under CE. - - * ace/OS.cpp (fork_exec): Modified parameters passed to - CreateProcess under CE. - - * ace/ARGV.{h,i,cpp}: Unicodize this class under CE. Notice that - under CE, you won't be able to use environment variable - substitution since there's no environment variable at all. - - * ace/Reactor.cpp: Don't include Service_Config.h and - WFMO_Reactor.h under CE for now. Prevent Reactor from - reconfigure the service configurator. - - * ace/Task.cpp: Don't include Service_Config.h under CE for now. - Prevent Task_Base from reconfigure the service configurator. - - * ace/SString.cpp: Don't include Service_Config.h under CE for - now. - - * ace/Svc_Conf.h: - * ace/Shared_Object.{h,cpp}: - * ace/Service_Type.{h,i,cpp}: - * ace/Service_Repository.{h,cpp}: - * ace/Service_Object.{h,i,cpp}: - * ace/Service_Manager.{h,cpp}: - * ace/Service_Config.{h,i,cpp}: Unicodize service configurator - related classes. I still need to find a point which breaks the - usage of char functions that flex and yacc use and wchar - functions that most CE functions use. - - * ace/Get_Opt.{h,cpp}: - * ace/Local_Token.{h,i,cpp}: - * ace/Map_Manager.cpp: - * ace/Message_Queue.cpp: - * ace/Module.{h,i,cpp}: - * ace/Parse_Node.cpp: - * ace/Pipe.cpp: - * ace/Stream.{h,cpp}: - * ace/Stream_Module.{h,cpp}: - * ace/Token_Manager.{h,cpp}: - * ace/Activation_Queue.cpp: Unicodize classes. Regular CE stuff. - -Sat Mar 14 06:43:32 1998 David L. Levine - - * ace/Basic_Types.h,config-win32-common.h,config-irix*.h: - moved WIN32 and SGI-specific code out of Basic_Types.h and - into their respective config files. - - * ace/Object_Manager.h: changed ACE_HAS_NON_STATIC_OBJECT_MANAGER - to ACE_HAS_NONSTATIC_OBJECT_MANAGER in comments. Thanks to - Kirill Rybaltchenko for reporting - this. - - * include/makeinclude/platform_chorus_ghs.GNU: set PATH, and - remove /tmp/gh_*.[os] files that GreenHills leaves. - - * ace/INET_ADDR.cpp (get_host_name): on Chorus, save errno in - error so that it gets propagated back to the caller. - -Sat Mar 14 00:13:22 1998 Douglas C. Schmidt - - * ace/Task.h (ACE_Task_Base): Give a default value of 0 for the - Thread Manager so we can use this as a base class. - - * tests/Future_Test.cpp: Since the Scheduler provides its own - activation queue it doesn't make sense to inherit from ACE_Task - (which provides its own queue) but instead ACE_Task_Base - (which doesn't define its own queue). Thanks to Loren Rittle - for reporting this. - - * examples/Threads/future[12].cpp: Since the Scheduler provides - its own activation queue it doesn't make sense to inherit from - ACE_Task (which provides its own queue) but instead - ACE_Task_Base (which doesn't define its own queue). Thanks to - Loren Rittle for reporting this. - - * examples/Threads/future[12].cpp: Removed the explicit call to - scheduler_->close() to avoid closing the scheduler down twice. - Thanks to Loren Rittle for reporting this. - -Fri Mar 13 23:41:44 1998 Nanbor Wang - - * ace/Process.cpp (ACE_Process_Options): Moved column out of - ifdef'ed area. - -Fri Mar 13 21:17:51 1998 David L. Levine - - * ace/Process.cpp (ACE_Process_Options): reordered initializers - to match declaration order. - -Fri Mar 13 17:30:16 1998 Nanbor Wang - - * ace/Process.{h,i,cpp}: As CE's CreateProcess is basically - broken, you can only start a new process using ACE_Process. You - cannot set any of environment, process attributes, thread - attributes, current directory, stratup info, and security - attributes. I have modified these files so that most attribute - access functions just do nothing. Some of "do nothing" - functions were defined as ACE_INLINE on CE. - - * ace/Memory_Pool.cpp: Regular CE stuff. - -Fri Mar 13 17:42:17 1998 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (handle_signal): If there are still - notification in the queue, we need to wake up again. - -Fri Mar 13 09:09:08 1998 David L. Levine - - * ace/Profile_Timer.*,config-chorus.GNU,README, - tests/Handle_Set_Test.cpp (test_performance): added - ACE_LACKS_FLOATING_POINT support. - - * include/makeinclude/platform_chorus_ghs.GNU: removed - -X445 from CFLAGS. I don't know what it does. - -Fri Mar 13 01:10:36 1998 Irfan Pyarali - - * ace/WFMO_Reactor: The following changes were made to make the - registration and removal of event_handlers from WFMO_Reactor - more robust. Thanks to Jonathan Biggar for - helping out. - - - ACE_WFMO_Reactor_Handler_Repository::Common_Info now contains - the delete_entry_ and close_masks_ fields as these were now - common to all three structures. - - - handle_additions() and handle_deletions() were changed to - make_changes_in_current_infos(), - make_changes_in_suspension_infos(), and - make_changes_in_to_be_added_infos() - - - Correct range for suspend_handlers() is 0 to max_handlep1_ - rather than (max_handlep1_ - 1) - - - suspend_handlers(), - resume_handlers(), - add_network_events_i(), - unbind_i(), - suspend_handler_i(), - resume_handler_i(), - unbind_all(), - - now go through the to_be_add_info_ array when making changes. - - * examples/Reactor/ReactorEx/test_prerun_state_changes.cpp: New - test added to check the Reactor's ability to handle state - changes before getting a chance to run. - - * examples/Reactor/ReactorEx/test_talker.cpp (main): Remove the - Procator from the Reactor so that the Proactor is not called - after it has been destroyed. - -Thu Mar 12 19:36:43 1998 Douglas C. Schmidt - - * ACE-INSTALL.html: Tidied up a bunch of things in this file. - Also, created a new $ACE_ROOT/os-patches/ directory and moved - the patches for Linux and LynxOS into this in order to - consolidate the patches into one location. - - * ace/WFMO_Reactor.cpp (upcall): Cleaned up a bunch of code to (1) - avoid a nasty "dangling else" bug and (2) simplify a bunch of - if/if statements. Thanks to Jonathan Biggar - for pointing this out. - -Thu Mar 12 18:21:15 1998 James C Hu - - * ace/config-linux-common.h: Incorporated changes that were - suggested by Robert Hanzlik to get ACE to - compile on Linux using glibc 2.1 and libg++/gcc 2.8. - -Thu Mar 12 17:25:28 1998 James C Hu - - * ACE-INSTALL.html: Added a table to Supported Platforms and - Compilers. - -Thu Mar 12 16:28:32 1998 Nanbor Wang - - * Apply regular string manipulation for CE to following files: - ACE.cpp ARGV.cpp Acceptor.cpp Activation_Queue.cpp - Asynch_Acceptor.cpp Asynch_IO.cpp CORBA_Handler.cpp - Connector.cpp Containers.cpp DEV_Addr.cpp Dynamic_Service.cpp - FIFO.cpp FIFO_Recv.cpp FIFO_Recv_Msg.cpp FIFO_Send.cpp - FIFO_Send_Msg.cpp FILE_Addr.cpp FILE_Connector.cpp Filecache.cpp - Future.cpp Get_Opt.cpp Hash_Map_Manager.cpp LSOCK.cpp - LSOCK_CODgram.cpp LSOCK_Connector.cpp LSOCK_Dgram.cpp - Local_Name_Space_T.cpp Local_Tokens.cpp Local_Tokens.i - Malloc_T.cpp Map_Manager.cpp Mem_Map.cpp Memory_Pool.cpp - Message_Queue.cpp Module.cpp Name_Proxy.cpp - Name_Request_Reply.cpp Naming_Context.cpp Obstack.cpp - Parse_Node.cpp Pipe.cpp Priority_Reactor.cpp Proactor.cpp - Process_Manager.cpp Read_Buffer.cpp Registry_Name_Space.cpp - Remote_Name_Space.cpp Remote_Tokens.cpp SPIPE_Acceptor.cpp - SV_Semaphore_Complex.cpp SV_Semaphore_Simple.cpp - Select_Reactor.cpp Service_Config.cpp Service_Main.cpp - Service_Manager.cpp Service_Repository.cpp Service_Types.cpp - Singleton.cpp Strategies_T.cpp Stream.cpp Svc_Handler.cpp - TLI.cpp TLI_Acceptor.cpp TLI_Connector.i Task_T.cpp - Time_Request_Reply.cpp Timer_Queue_Adapters.cpp - Token_Collection.cpp Token_Invariants.cpp Token_Manager.cpp - Token_Request_Reply.cpp WFMO_Reactor.cpp WFMO_Reactor.i - XtReactor.cpp. - -Thu Mar 12 15:37:14 1998 David L. Levine - - * ace/Read_Buffer.* (read): null terminate the result buffer. - Also, changed "inline" to "ACE_INLINE" and updated #includes - so that ACE inlining works. - -Thu Mar 12 02:19:53 1998 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (upcall): In the Select_Reactor, when it - upcalls to an event_handler which returns a -1, the - Select_Reactor only clears the specific mask bit for the - handler. For example, for a call to - Event_Handler::handle_input() which returns -1, the - Select_Reactor clears the READ_MASK bit. - - In the WFMO_Reactor, if any handler returns a -1, then it clears - ALL of the mask bits for the event handler. - - So, fixed WFMO_Reactor so that it works like Select_Reactor in - this regard. - - Thanks to Jonathan Biggar for pointing this - discrepancy out. - - * ace/WFMO_Reactor.cpp (dispatch_handles): The correct range check is - {WAIT_OBJECT_0,WAIT_OBJECT_0 + this->handler_rep_.max_handlep1 () - index} - and not - {WAIT_OBJECT_0,WAIT_OBJECT_0 + this->handler_rep_.max_handlep1 ()} - - Thanks to Evgeny Beskrovny evgeny_beskrovny@icomverse.com for - pointing this out. - -Wed Mar 11 15:20:09 1998 Douglas C. Schmidt - - * ace/OS.i (thr_getspecific): Added comments to the code to - explain the unusual step of saving errno across calls to - TlsGetValue() on Win32. Thanks to Tim Harrison for clarifying - this. - -Wed Mar 11 00:39:29 1998 Nanbor Wang - - * CE-status: A temporary file to trace the progress of the CE - port. - - * ace/ace_ce_dll.dsp: Added more .cpp files. - - * ace/High_Res_Timer.{h,cpp}: Undefined functions print_ave and - print_total. These two function use STDOUT which is not - supported on CE. We should probably modify the functions so - they write results to Log_Msg. - (get_register_scale_factor): This function always returns 1 on - CE to prevent the use of High_Res_Timer. - (get_env_global_scale_factor): Always returns -1 on CE because - environment variables are not supported. - - * ace/Thread_Manager.cpp (spawn_i): WinCE doesn't support - DuplicateHandle, therefore the best we can do now is just pass - back the handle to the spawned thread. Notice that you *can't* - close the handle by yourself under CE. Perhaps we shouldn't - even try to pass this info back. ??? - Applied regular CE porting tricks. - - * ace/SOCK_Dgram_Mcast.{h,cpp}: - * ace/SOCK_Dgram_Bcast.{h,cpp}: Changed some function signatures - to use wchar on CE. Applied regular CE porting tricks. - - * ace/IO_SAP.cpp: - * ace/SOCK_CODgram.cpp: - * ace/SOCK_Dgram.cpp: - * ace/Select_Reactor.cpp: - * ace/Timer_{Hash,Heap,List,Queue,Wheel}_T.cpp: Applied regular CE - porting tricks. Erm, I'm running out of tricks. - -Tue Mar 10 20:27:57 1998 Nanbor Wang - - * ace/Reactor.h (reset_event_loop): Made the signature match with - its definition in .cpp file. - -Tue Mar 10 15:07:00 1998 Douglas C. Schmidt - - * ace/Svc_Handler.cpp, - ace/Module.cpp: - Fixed some problems where Svc_Handlers in Modules were being - deleted prematurely. Thanks to Steve Coy - for reporting this. - - * ace/Reactor.h (ACE_Reactor): Added a "reset_event_loop" method - so that it's possible to reset the loop again once the - end_event_loop() method is called. Thanks to Eric Hopper - for reporting this. - - * ace/IOStream_T.cpp (ACE_IOStream): Moved some code to work - around some bugs with MSVC++ 5.0. Thanks to James CE Johnson - for reporting this. - -Tue Mar 10 15:57:54 1998 Nanbor Wang - - * ace/Handle_Set.cpp (dump): Cast mask_.fd_count to size_t. - Depend on whether you are using standard C++ library, the type - of fd_count count be size_t or ssize_t. Thanks to Darrell for - discovering this. - -Tue Mar 10 13:22:24 1998 Irfan Pyarali - - * ace/Asynch_IO.cpp (cancel): CancelIo is not supported on Win95. - - * ace/SString.cpp (set): Use ACE_WString::wstrlen(). - -Tue Mar 10 06:59:42 1998 David L. Levine - - * ace/SString.cpp (WString::set): added support for platforms - that don't have wchar_t, or that treat wchar_t and ACE_USHORT16 - as different types. - - * ace/OS.h,Basic_Types.h: moved ACE_USHORT16 typedef from OS.h to - Basic_Types.h. - - * ace/High_Res_Timer.h: fixed comment: timer.start () instead of - timer.stop () (twice). - -Mon Mar 09 22:15:43 1998 Irfan Pyarali - - * ace/SString.cpp (ACE_CString::operator=): Special cases have to - considered carefully so that memory is managed properly. This - is specially true when the ACE_CString::NULL_CString_ is used. - - * ace/SString.h (ACE_CString and ACE_WString): Added set methods - that allows the user to set the strings without having to use - the assignment operator. - -Mon Mar 09 16:11:16 1998 David L. Levine - - * examples/Map_Manager/test_hash_map_manager.cpp: added #include - of ace/SString.h and template instantiations. Replaced gets - with ACE_OS::fgets. - - * examples/Makefile,examples/Map_Manager/Makefile: added - Map_Manager to examples DIRS and added RCS keyword string. - -Mon Mar 9 14:59:20 1998 Carlos O'Ryan - - * include/makeinclude/platform_irix6.x-sgic++.GNU: - Added the definition for MATHLIB. - -Mon Mar 09 01:23:49 1998 Nanbor Wang - - * ace/ace_ce.dsw: - * ace/ace_ce_dll.dsp: New project/workspace files for WinCE. This - is a temporary workspace only and should be merged into ACE mail - Win32 project/workspace when the port is stable enough. - - * ace/config-WinCE.h: Added ACE_LACKS_GETS. - - * ace/Synch.i (get_nesting_level): Defined it as not supported on - CE. CE's CriticalSections don't have RecursionCount defined. - We should be able to simulate this, however. - - * ace/Process.{h,cpp}: - * ace/SString.{h,cpp}: Moved class ACE_Tokenizer from Process.* to - SString.*. Although ACE_Tokenizer is used in - ACE_Process[_Options], it really is a more general utility - class. - (operator<<): Conditionally compile these functions only when we - are not running ACE on CE. - - * ace/OS.i (atoi): Added inline implementation for wchar version. - (gets): Remove condition !defined (ACE_HAS_WINCE). This should - be taken care of by ACE_LACKS_GETS. - - * ace/OS.h (atoi): Added wchar version of this function. - (ASYS_WIDE_STRING): This macro converts char strings to - wchar strings when ACE_HAS_MOSTLY_UNICODE_APIS is defined. - (ASYS_MULTIBYTE_STRING): This macro converts wchar strings back - to char strings *only* when ACE_HAS_MOSTLY_UNICODE_APIS is - defined. - - * ace/INET_Addr.{h,cpp}: Redefined interface signatures on WinCE - using ASYS_* macros. The principle here is to pass wide char - strings in and get char strings out. That's because we will use - mostly wchar strings in CE but most winsock APIs return (or uses - char strings.) Doing so should reduce conversion between them - to minimum. - Converting debug messages with ASYS_TEXT. - - * ace/Log_Msg.cpp (open): - * ace/ACE.cpp (get_ip_interfaces): Only convert the wide character - string to a char string when ACE_HAS_MOSTLY_UNICODE_APIS flag is - not set using the ASYS_MULTIBYTE_STRING macro. - - * ace/SOCK.cpp: - * ace/SOCK_Acceptor.cpp: - * ace/Malloc.cpp: - * ace/Malloc_T.cpp: - * ace/Synch.cpp: - * ace/Message_Block.cpp: - * ace/IPC_SAP.cpp: - * ace/Handle_Set.cpp: - * ace/Addr.cpp: Converting debugging messages to wchar strings for - CE using the ASYS_TEXT macro. - -Sun Mar 08 14:29:30 1998 David L. Levine - - * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): - changed SUPPLIER_CONNECTOR to SUPPLIER_ACCEPTOR. Thanks - to Dani Flexer for reporting this. - - * ace/OS.i (cond_timedwait): removed "struct" from declaration - of local timespec_t relative_time, because timespec_t can - be a typedef. Thanks to Steve Coy for - reporting this. - - * Makefile: tag from ACE_wrappers, not its parent directory, - to avoid confusing CVS. - -Sat Mar 07 16:46:58 1998 David L. Levine - - * ACE version 4.4.32, released Sat Mar 07 16:46:58 1998. - -Fri Mar 06 08:37:44 1998 David L. Levine - - * bin/ace_ld: made perl4-compatible. Thanks to - Jerry Bickle for reporting this. - - * ace/os.i: (sigwait): removed "::" from before sigwait () call - with ACE_HAS_ONEARG_SIGWAIT, in case it's a macro. Thanks - to Kirill Rybaltchenko for - reporting this. - - * bin/create_ace_build: made perl4-compatible. Thanks to - Carlos for noticing this. - - * include/makeinclude/platform_vxworks5.x_g++.GNU: added - WIN32 host support. Thanks to Paul von Behren - for providing the patches. - - * ACE-INSTALL.html: added information from Paul von Behren - on building on NT hosts for - VxWorks targets. - - * tests/Recursive_Mutex_Test.cpp: 50 iterations instead of 100 - on Chorus. - - * include/makeinclude/platform_chorus_ghs.GNU: added -G to - LDFLAGS. - - * tests/run_tests.sh: added capability for executing the tests - on a remote (Chorus) target. - - * examples/System_V_IPC/Makefile: added clean and realclean targets - for VXWORKS. - - * Makefile: cd .. before tagging. - -Thu Mar 05 12:36:52 1998 Nanbor Wang - - * ace/OS.h (ACE_TRACE): Added a missing right paren. - -Thu Mar 05 10:04:06 1998 David L. Levine - - * include/makeinclude/platform_chorus_ghs.GNU: this works, - though it may not be optimum. - -Thu Mar 05 01:33:08 1998 Nanbor Wang - - * ace/config-WinCE.h: Added more CE stuff. Ostream is now - redefined as FILE on CE. - - * ace/OS.{i,cpp}: - * ace/Synch_T.cpp - * ace/Message_Queue.cpp: - * ace/SOCK_Connector.i: Added ASYS_TEXT to numerous - ACE_DEBUG/ACE_ERROR macros. We must use wide char strings in - CE. - - * ace/ACE.{h,cpp}: Redefined sock_error to return wchar string on - CE. Added ASYS_TEXT to debugging messages. - - * ace/Trace.{h,cpp}: - * ace/Log_Msg.{h,cpp}: Made it UNICODE compatible. - - * ace/Log_Record.cpp: Changed how ostream is used on CE. Although - the code here become some how platform dependent, fortunately, - it can be shielded out from the users thru various macros. - Added ASYS_TEXT. - - * ace/SString.h: Undefined friend relations of ACE_?String with - ostream on CE. CE doesn't support . - - * ace/OS.h: Changed the definition of ASYS_TEXT to use _TEXT. - This macro can be used with other compiler defined macros - (e.g. __FILE__.) Added ASYS_TEXT to adorn parameters of - ACE_TRACE so we don't need to modify our codes to make it - portable to CE. - - * ace/Log_Msg.cpp: Removed macro definition of ACE_WSPRINTF. It - didn't appear to be used anywhere. - -Wed Mar 04 09:32:32 1998 David L. Levine - - * ace/OS.cpp (readv,writev): added static cast of iov_len to int, - to avoid unsigned comparison < 0. - - * ace/Containers.cpp (ACE_Fixed_Set_Iterator::done), - ace/Map_Manager.cpp (ACE_Map_Iterator_Base::done): - removed const from static cast to avoid warnings about - meaningless type qualifier from GreenHills. - - * ace/Basic_Types.i (ACE_U_LongLong): added missing ACE_INLINE's. - - * ace/Svc_Conf.y,Svc_Conf_y.cpp, etc/Svc_Conf_y.cpp.diff - (svc_location): delete svc_initializer after initializing - svc_location. Thanks to Tom Arbuckle - for reporting this. - - * include/makeinclude/platform_linux_lxpthreads.GNU: separated - SOBUILD into compile and link steps because the - Service_Configurator/server/* examples are unable to - use files compiled with -fPIC and just labeled as .so as shared - ELF objects. Thanks to Tom Arbuckle - for reporting this. - - * include/makeinclude/platform_chorus_ghs.GNU: explicitly link - in ioassign.o to resolve _cerr. - - * tests//SOCK_Connector_Test.cpp, - ace/config-{chorus,lynxos,netbsd,psosim-g++,vxworks5.x, - win32-common}.h: - added ACE_LACKS_GETHOSTENT, so that SOCK_Connector_Test doesn't - have to enumerate the platforms that don't have ::gethostent (). - - * tests/Basic_Types_Test.cpp (main): if ACE_LACKS_LONGLONG_T, use - ACE_U_LongLong instead of long long. - -Tue Mar 03 22:15:16 1998 Nanbor Wang - - * ace/Remote_Name_Space.cpp: Replaced a bunch of usages of - ACE_WString::rep (). They were passed to ACE_Name_Request which - creates another copy for itself and nobody ever cleans up these - memories. Thanks to John Mulhern <9107@MN3.LAWSON.lawson.com> - for reporting this. - - * ace/OS.h (THR_DETACHED): Defined this macro so that we can - simulate detached threads on NT (Hi Irfan! ;-). Thanks to Andre - Arpin for prividing the use case of - detached threads. - - * ace/Thread_Manager.cpp (exit): Added detached threads - manipulating codes here. We now can simulate behaviros of UNIX - detached threads on NT (no one cares about their return status.) - -Tue Mar 03 15:05:42 1998 David L. Levine - - * ace/Basic_Types.{h,i} (ACE_U_LongLong::operator *=): updated - with James Hu's implementation. Now it's fast :-) - - * tests/Time_Value_Test.cpp (test_ace_u_longlong): added another - test of operator *=. - -Mon Mar 2 19:21:36 1998 Douglas C. Schmidt - - * ace/OS.h: Changed all uses of "/localname" and "/globalname" to - "localname" and "globalname" to avoid problems on UNIX. Thanks - to John Mulhern <9107@MN3.LAWSON.lawson.com> for reporting this. - - * ace/OS.h: Changed "C:\\temp\\" to "C:\\temp" to avoid some minor - problems on NT. Thanks to John Mulhern - <9107@MN3.LAWSON.lawson.com> for reporting this. - - * netsvcs/lib/Log_Message_Receiver.cpp - (Log_Message_Receiver_Impl): Removed some stray inline keywords. - Thanks to Russ Noseworthy for - reporting this. - - * ace/OS.i (sigwait): Added support for POSIX sigwait(). Thanks - to Russ Noseworthy for reporting - this. - - * ace/Containers.cpp (done): - ace/Map_Manager.cpp (done): Corrected some misplaced "consts" in - the ACE_static_cast macro. Thanks to Russ Noseworthy - for reporting this. - - * include/makeinclude/platform_sunos5_sunc++.GNU (CXX): Commented - out the -pta option since it might not be necessary. If this - breaks code then we'll need to reevaluate this change. Thanks - to Russ Noseworthy for suggesting - this. - -Mon Mar 02 17:06:46 1998 Nanbor Wang - - * ace/Thread_Manager.cpp (exit): Added Win32 thread exit - functionality. When a thread function falls out of scope, this - functions is called by ACE_Thread_Control::exit and it will not - call ACE_OS::thr_exit from here. Under this scenario, the - ACE_Thread_Manager::exit simply falls thru the end. If a user - call this function directly, this function will delete - ACE_Thread_Exit::instance() first, which simulate the cleanup - routine executed when a thread fall out of end by calling - ACE_Thread_Manager::exit recursively. After this is done - (returned from the second call,) this function will then call - ACE_OS::exit, which clean up the TSS objects and then really - exit the thread. Thanks to Gordon Watts for - pointing this out. - - * ace/OS.cpp (thr_exit): Added Win32 thread exit functionality. - ACE_OS::thr_exit now will try to clean up TSS objects by calling - ACE_OS::cleanup_tss. You really should _not_ calling this - function directly. Esp. from the main thread because I don't - know how to tell if you are calling it from main thread thread - or not and thus memory leak might occur. - -Mon Mar 02 09:13:26 1998 David L. Levine - - * ace/config-sunos5.5-sunc++-4.x.h: replaced ACE_PAGE_SIZE with - ACE_HAS_GETPAGESIZE, and added ACE_HAS_STL_MAP_CONFLICT. - Thanks to J. Russell Noseworthy - for these recommendations. - - * ace/config-sunos5.6-sunc++-4.x.h: just #include - config-sunos5.5-sunc++-4.x.h. There's no difference between - the two at this point. - - * include/makeinclude/platform_sunos5_sunc++.GNU: added -R./ and - -mt to LDFLAGS. Added -fast to LDFLAGS if "fast" flag is - enabled. Thanks to J. Russell Noseworthy - for these recommendations. - - * include/makeinclude/platform_sunos5.6_sparc_sunc++.GNU: just - include platform_sunos5_sunc++.GNU. There's no difference between - the two at this point. There is one significant net change to - the 5.6 platform: -s is no longer included in LDFLAGS. - - * ace/config-chorus.h: added ACE_LACKS_ACE_IOSTREAM with ghs, because - its iostream doesn't have separate operators for signed/unsigned - char. - -Sun Mar 1 13:54:02 1998 Nanbor Wang - - * Makefile: Added cvs commands to automatically tag the CVS - repository with version number 'ACE_9_9_99' tag and 'Current' - tag. - -Sun Mar 1 12:26:13 1998 Alexander Babu Arulanthu - - * ace/Hash_Map_Manager.cpp (reset_i): - * ace/Hash_Map_Manager.h: - Added reset () method for the Hash_Map_Iterator. - -Sun Mar 01 10:59:27 1998 Irfan Pyarali - - * ace/Asynch_IO.cpp (cancel): Changed CancelIO to CancelIo. - - * ace/Synch.h (ACE_Lock): Added a virtual destructor to ACE_Lock. - -Sun Mar 01 08:38:00 1998 David L. Levine - - * ace/OS.h: use the new ACE_DEFAULT_SYNCH_TYPE for the default - mutex, etc., type, so that it can be set VxWorks. The ACE default - type on VxWorks is SEM_Q_FIFO, the same as VxWorks' default. - The ACE default can be easily overridden in config.h by - defining ACE_DEFAULT_SYNCH_TYPE. - - * ace/OS.i (sema_init): on VxWorks, use the type argument for the - sema type, instead of hard-coding to SEM_Q_FIFO. - - * ACE-INSTALL.html: updated Linux/alpha "as" patch. - -Sat Feb 28 12:20:57 1998 Douglas C. Schmidt - - * ace/Message_Queue.cpp: Fixed the implementation of - wait_not_{full,empty}_cond() so that they utilize the - ACE_Time_Value it's passed. In addition, revised the - implementation of peek_dequeue_head() so that it uses the new - wait_not_empty_cond() implementation. Thanks to Tom Venturella - for reporting this. - -Fri Feb 27 15:47:15 1998 David L. Levine - - * ACE-INSTALL.html: added very useful information from - Chris Ryan about build ACE with - NT/Tornado for VxWorks. - - * ace/config-chorus.h: use ACE_NEEDS_READV/WRITEV with GHS as well - as with g++. - - * ace/Basic_Types.{h,i} (ACE_U_LongLong): added a bunch of arithmetic - operators for Carlos :-) The operator *= is _very_ slow, until we - come up with the right way to do it. - - * tests/Time_Value_Test.cpp (test_ace_u_longlong): added some tests - of the new operators. - -Fri Feb 27 13:42:09 1998 Douglas C. Schmidt - - * ace/ACE.cpp (recv_n): Removed the MSG_PEEK flag since it didn't - seem to work correctly. - -Fri Feb 27 11:18:28 1998 Chris Cleeland - - * ace/Log_Msg.cpp: Added three new conversion operators: "%{" - calls inc() to increase the trace_depth, "%}" calls dec() to - decrease the trace_depth, and "%$" is used in place of "\n" to - insert a newline followed by appropriate current indentation. - -Thu Feb 26 21:36:27 1998 Douglas C. Schmidt - - * ACE version 4.4.31, released Thu Feb 26 21:36:27 1998. - -Thu Feb 26 16:48:53 1998 Douglas C. Schmidt - - * ace/OS.h: Added new macros for ACE_FILE_STREAM and - ACE_FILE_CONNECTOR to be consistent with the ACE_SOCK_* stuff, - etc. Thanks to Ganesh Pai for reporting - this. - -Thu Feb 26 11:14:21 1998 David L. Levine - - * ace/Parse_Node.cpp (ACE_Location_Node): reordered initializers - to match declaration order. - -Thu Feb 26 02:42:57 1998 Nanbor Wang - - * ace/Service_Config.cpp (load_static_svcs): Removed explicit - constness cast from the allocation function. - -Wed Feb 25 23:08:44 1998 Douglas C. Schmidt - - * tests/MT_Reactor_Timer_Test.cpp: Made this test compile on - platforms that lack threads and also updated the programming - style to be consistent with other parts of ACE. - - * tests/Priority_Task_Test.cpp: Made this test compile on - platforms that lack threads. - - * ace/Svc_Conf.h: Fixed the prototype for - ace_create_service_type() to reflect the elimination of "const - void *". - - * ace/Parse_Node: Eliminated more uses of "const void *" and - changed them to plain ol' "void *". - - * ace/Service_Types.cpp (fini): Changed the "const void *" to be - simply "void *" since it didn't seem to make any sense they way - it was! Thanks to Stephen Coy for - insisting on this... - - * ace/config-sunos5.*.h: Moved the ACE_HAS_REENTRANT_FUNCTIONS - into the section of #defines that should be commented out if - we're not building a multi-threaded library. - - * ace/Service_Config.cpp (open): Tightened up the comparison of - the key with the ACE_DEFAULT_LOGGER_KEY to use string equality - rather than pointer equality. Thanks to Stephen Coy - for reporting this. - -Wed Feb 25 10:50:17 1998 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU: added suppression of - "no corresponding delete" warning, until that is fixed in libTAO. - Added -lm to LIBS for MT_Cubit client. - - * include/makeinclude/platform_chorus_ghs.GNU: we can link now. - - * ACE-INSTALL.html: added information on Linux v. 2.0.x - getsockname () bug. - -Tue Feb 24 15:07:50 1998 Nanbor Wang - - * tests/test.{mdp,mak}: Added Env_Value_Test and OrdMultiSet_Test - into the workspace. - - Removed all odbc libraries from all projects. We don't really - need them to run ACE. Thanks to gonzo@ing.puc.cl (Gonzalo - A. Diethelm) for pointing this out. - -Tue Feb 24 07:14:16 1998 Douglas C. Schmidt - - * ace/Asynch_Acceptor.cpp (handle_accept): Update the - event_handler's proactor pointer once it is accepted. Thanks to - Jason Katz for reporting this. - - * apps/Gateway/Gateway/Event.h (class Subscription): Moved the - htonl of total_consumers_ to *after* the loop that uses it! - Thanks to Jorn Jensen for reporting this. - -Tue Feb 24 05:08:31 1998 Nanbor Wang - - * ace/Asynch_Acceptor.i: Filled in some missing keywords. - - * ace/Log_Record.h (ACE_Log_Record): Hacked it to work for CE. - Undefined the ostream version of print (). I'm planning to drop - iostream support on WinCE. (Then, I don't have to write my - own. ;-) - - * ace/ACE.{h,i} (timestamp, format_hexdump): Removed UNICODE_ONLY version. - Changed to use ASYS_TCHAR to differentiate this condition. - - * ace/OS.h (ACE_OS): Undefined shm_{open,unlink} if - ACE_HAS_MOSTLY_UNICODE_APIS. - - * ace/OS.cpp (ctime,ctime_r): Added CE implementation. - - * ace/streams.h: Added /**/ between #include and <..> in several - places. - - * ace/*: Changed ACE_HAS_UNICODE_ONLY to - ACE_HAS_MOSTLY_UNICODE_APIS. - -Mon Feb 23 19:41:53 1998 Douglas C. Schmidt - - * ace/Asynch_Acceptor.i (bytes_to_read): Added an inline accessor - for the bytes_to_read_ field. Thanks to Jason Katz - for suggesting this. - -Mon Feb 23 12:26:06 1998 David L. Levine - - * ace/OS.cpp (sched_params): removed ACE_ADAPT_RETVAL from PTHREADS - ::sched_setscheduler () call, because it returns the old scheduling - policy, not 0, on success. - - * ace/config-osf1-4.0.h: removed ACE_HAS_EXCEPTIONS because that is - enabled by platform_osf1_4.0{,_rcc}.GNU. - - * include/makeinclude/platform_osf1_4.0.GNU: added suppression of - warning 835 because /usr/include/cxx/memory, line 505, triggers - a warning about an unreferenced parameter. - - * include/makeinclude/platform_osf1_4.0{,_rcc}.GNU: added - "exceptions = 1" so that ACE exception handling can be - disabled on the make command line. - -Mon Feb 23 11:27:10 1998 David L. Levine - - * ACE version 4.4.30, released Mon Feb 23 11:27:10 1998. - -Mon Feb 23 11:11:18 1998 Nanbor Wang - - * ace/Process.h: Define ACE_Process_Options::NO_EXEC as 0 on - Win32. It has no effect on NT anyway. - -Sun Feb 22 21:37:43 1998 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: updated - comments to reflect that WIND_BASE and WIND_HOST_TYPE - environment variables must be set. Thanks to Nanbor for - reporting that. Also, set CROSS-COMPILE flag. - - * include/makeinclude/rules.lib.GNU: updated VOBJS so that it - will build the fancy new TAO/orbsvcs hierarchy. - - * include/makeinclude/platform_{chorus*,lynxos,vxworks5.x_g*}.GNU: - set CROSS-COMPILE flag. It's only used by TAO at this point. - - * ace/Svc_Conf_y.cpp: updated based on new Svc_Conf.y. - - * etc/Svc_Conf_y.cpp.diff: regenerated for latest Svc_Conf_y.cpp. - - * ACE-INSTALL.html,include/makeinclude/platform_lynxos.GNU: moved - LynxOS installation info from its platform file to ACE-INSTALL.html. - -Sun Feb 22 21:26:19 1998 James CE Johnson - - * tests/IOStream_Test.cpp (server): break out of while loop if - read from client_handler fails. - -Sun Feb 22 13:06:20 1998 Douglas C. Schmidt - - * ace/Asynch_Acceptor.h (class ACE_Asynch_Acceptor): Made the - accept method virtual so that users can override it and do - things like enforce limits on the maximum number of simultaneous - connections. Thanks to Jason Katz for - suggesting this. - -Sun Feb 22 13:22:30 1998 Nanbor Wang - - * ace/OS.h: Moved definition of ACE_MAP_{PRIVATE,SHARED,FIXED} - down to where every platform can see. - -Sun Feb 22 13:06:20 1998 Douglas C. Schmidt - - * ace/Svc_Conf.y: Fixed a couple of places where we were - potentially dereferencing NULL pointers when services failed to - load. Thanks to Eric C. Newton for reporting - this. - -Sat Feb 21 12:44:51 1998 David L. Levine - - * ACE version 4.4.29, released Sat Feb 21 12:44:51 1998. - -Sat Feb 21 11:53:45 1998 Nanbor Wang - - * ace/Hash_Map_Manager.cpp (close_i): Remember to reset the - current size to 0 after deallocating all entries in the map. - Thanks to Alex for noticing this. - -Fri Feb 20 06:36:04 1998 David L. Levine - - * ace/Timer_Queue_Adapters (activate): added thread_names argument. - - * ace/OS.{h,i} (cond_timedwait): fixed on LynxOS (DCE_DRAFT4_THREADS), - where pthread_cond_timedwait () expects a relative instead of - absolute time. - - * tests/Buffer_Stream_Test (Consumer::svc): removed thr_yield for - LynxOS, now that ACE_OS::cond_timedwait () is fixed. - - * ace/OS.i (mmap): use ACE_DEFAULT_FILE_PERMS on LynxOS for the - shared memory object. - - * ace/Mem_Map.* (unmap): on LynxOS, write back the shared object to - the plain file, if the mmap () protection included PROT_WRITE. - - * ace/README: added ACE_HAS_BOOL, which can be used by TAO. - -Thu Feb 19 17:59:53 1998 Nanbor Wang - - * apps/JAWS/clients/Caching/*: Reworked and cleaned up these files a - bit. Added a test_URL.cpp file. Notice that these file will - finally be moved to other directory. - -Thu Feb 19 15:52:50 1998 Stanley D Leeson - - * ace/Task.{h,cpp} (activate): added optional thread_names array - argument. - -Thu Feb 19 12:55:00 1998 Nanbor Wang - - * ace/OS.h: Added /**/ between #include and '<', Thanks to - gonzo@ing.puc.cl (Gonzalo A. Diethelm) for providing the - patches. - -Thu Feb 19 11:18:08 1998 David L. Levine - - * ace/OS.h: added ACE_MAP_{PRIVATE,SHARED,FIXED}, and - ACE_OS::shm_{open,unlink}. - - * ace/OS.i: added ACE_OS::shm_{open,unlink}, and mmap support on - LynxOS. - - * ace/Mem_Map.*,Shared_Memory_MM.h,Filecache.cpp: default share - value to ACE_MAP_PRIVATE instead of MAP_PRIVATE, to allow easy - overriding in config files. - - * ace/config-lynxos.h: added ACE_HAS_SHM_OPEN, and map - ACE_MAP_PRIVATE to ACE_MAP_SHARED because MAP_PRIVATE is - not supported on LynxOS 2.5.0. - - * tests/Mem_Map_Test.cpp: replace file_size with line_length because - that's more accurate. - - * tests/SOCK_Connector_Test.cpp: use ACE_DEFAULT_SERVER_HOST on - LynxOS, and removed #include of sys/utsname.h because it's in OS.h. - - * include/makeinclude/platform_lynxos.GNU: added LYNXOS so that - other Makefiles can easily know if where building for LynxOS. - - * ace/ACE.cpp (recv_n): commented out the MSG_PEEK flag check because - it caused IOStream_Test to not terminate. - - * ace/Env_Value_T.{h,i}: moved ACE_Convert specializations from .i - file to .h file, because the resulted in multiple instantiations - with ACE_INLINE disabled, and missing specializations without - ACE_HAS_TEMPLATES_REQUIRE_SOURCE and inlining enabled. - - * tests/TSS_Test.cpp: weakened to work with LynxOS. It has a very - limited number of keys, maybe 16, and can't free them. And, the - test always core dumps if we try to request more keys than it has - available. - - * tests/run_tests.sh: disabled some tests on LynxOS. - -Thu Feb 19 10:41:05 1998 Douglas C. Schmidt - - * ace/SOCK.cpp (open): It appears that we don't need to do - SO_REUSEADDR if protocol_family != PF_UNIX. Thanks to Chuck - Gehr for reporting this. - -Wed Feb 18 22:34:40 1998 Nanbor Wang - - * examples/Reactor/Dgram/Dgram.dsw: - * examples/Reactor/Dgram/Dgram.dsp: - * examples/Reactor/Dgram/CODgram.dsp: Newly added files for NT. - - * examples/Reactor/Dgram/Dgram.cpp: - * examples/Reactor/Dgram/CODgram.cpp: Made them runnable on NT. - - * ace/Process.h (ACE_Process_Options): Changed the definition of - ACE_Process_Options::NO_EXEC to 0 for Win32 because it doesn't - mean anything on NT (you must exec a new program on NT, no fork - syntax available.) With this, we can simulate the fork effect - more or less (still not portable thou. See - examples/Reactor/Dgram/ for some examples.) - -Wed Feb 18 16:07:14 1998 Douglas C. Schmidt - - * netsvcs/lib/Log_Message_Receiver.cpp (log_output): There was a - problem where "outputfile" can be NULL, which causes problems - when it is dereferenced. Thanks to Stephen Coy - for reporting this. - - * ace/ACE.cpp (ldfind): modified the code to allow it to - consistently return a status indicating whether or not a - potential shared library file was found. Thanks to Patrick - J. McNerthney for reporting this. - -Wed Feb 18 15:30:48 1998 Carlos O'Ryan - - * include/makeinclude/rules.lib.GNU: - Now we can create libraries with some files in - subdirectories. Though the Makefile still needs to set VPATH. - -Wed Feb 18 12:22:48 1998 David L. Levine - - * tests/Buffer_Stream_Test.cpp (Consumer::svc): added a - thr_yield so that the test magically works on LynxOS. - ACE_OS::cond_timedwait is busted on LynxOS, we're investigating it. - -Wed Feb 18 11:53:00 1998 Carlos O'Ryan - - * bin/auto_compile: - Added netsvcs to auto_compile list. - -Tue Feb 17 18:27:15 1998 Douglas C. Schmidt - - * ACE version 4.4.28, released Tue Feb 17 18:27:15 1998. - -Tue Feb 17 17:59:32 1998 Nanbor Wang - - * examples/Reactor/Multicast/Multicast.dsw: - * examples/Reactor/Multicast/client.dsp: - * examples/reactor/multicast/server.dsp: New project files. - -Tue Feb 17 15:53:41 1998 Douglas C. Schmidt - - * ace/ACE.cpp (recv_n): Added a check to drop out if the MSG_PEEK - flag is set! Thanks to Keith Brown for - reporting this. - -Tue Feb 17 12:56:24 1998 Chris Cleeland - - * include/makeinclude/wrapper_macros.GNU: Broke the "purify" - command out of PRELINK into its own variable: PURELINK. This was - done to quiet purify when building shared libraries. It wasn't - possible simply to remove the PRELINK reference from SOLINK.cc - because PRELINK is also used for specifying quantify. - - Also added two new variables: PURE_CACHE_DIR and - PURE_CACHE_BASE_DIR. PURE_CACHE_DIR is the value of the - purify/quantify '-cache-dir=' option, and PURE_CACHE_BASE_DIR is - used as the base directory to build a user/compiler-specific cache - directory. In general, you probably want to use them like this: - "make PURE_CACHE_BASE_DIR=~/mypurecache", which will end up - creating the directory ~/mypurecache--. - -Tue Feb 17 09:23:05 1998 David L. Levine - - * ace/OS.h: there were two SIGCHLD #defines, if it was not - already #defined. I changed the second one to be SIGCLD instead. - - * ace/config-linux-common.h: removed ACE_LACKS_TCP_H on alpha because - it's not necessary with glibc-2.0.6. - -Tue Feb 17 08:41:06 1998 Douglas C. Schmidt - - * ace/OS.h (ACE_PROPER_SINGLETON_INSTANTIATION): Changed spelling - of SINGLETONE to SINGLETON. Thanks to Mark Maris - for reporting this. - -Tue Feb 17 07:41:32 1998 Douglas C. Schmidt - - * ACE version 4.4.27, released Tue Feb 17 07:41:32 1998. - -Tue Feb 17 03:32:30 1998 Nanbor Wang - - * ace/ACE.*: Changes for Windows CE just keeps going and going and - going... All following functions are member functions of class - ACE. - - This member funcion has wchar version _only_ when - ACE_HAS_UNICODE_ONLY is defined: - - timestamp - - I've added wchar version of the following member functions: - - strecpy - strsplit_r - strrepl - basename - execname - format_hexdump - - These functions are not defined on CE because they make no sense - on CE. - - strenvdup - daemonize - - There is no stdin defined on CE. Before we implement a stdin - for CE, these functions don't make any sense. - - read_adapter - register_stdin_handler - remove_stdin_handler - - Changing these functions to UNICODE will need to change the - svc.conf parser. Therefore, I'll leave them to a later point. - - ldopen - ldfind - - * ace/README: Added a new directive ACE_HAS_UNICODE_ONLY which - indicates that most APIs must use wchar instead of char. (Note - that on WinCE, only WinSock functions use the traditional char - interfaces. Most other functions only support wchar - interfaces, include str* functions.) - -Mon Feb 16 14:57:26 1998 David L. Levine - - * tests/Priority_Task_Test.cpp (open): fallback to minimum - ACE_SCHED_OTHER priority instead of 0. - - * tests/Priority_Task_Test.cpp (open): suppress warning message - about retrying task activation with fallback priority unless -d - option is specified. - - * ace/High_Res_Timer.cpp: initialize global_scale_factor_ to 1 if - ACE_HAS_{,AIX_}HI_RES_TIMER and ACE_WIN32 are not defined. - Thanks to Robert Olson for reporting a - problem with bad hires time values on Irix. - -Mon Feb 16 10:51:28 1998 Oliver Kellogg - - * include/makeinclude/platform_osf1_4.0_rcc.GNU: added this - new platform file for Rational rcc (2.4.1) on DU 4.0. - - * ace/config-osf1-4.0.h: added ACE_LACKS_SIGNED_CHAR to - RATIONAL section. - - * ace/OS.h: added __rational__ to list of users of long - ACE_UNUSED_ARG. - - * ace/OS.i (gethostbyname_r): added some ACE_UNUSED_ARGs for - Digital Unix. - -Sun Feb 15 16:32:52 1998 Nanbor Wang - - * netsvcs/clients/Naming/Client/svc.conf: Removed "-s" flag, which - set the database name for local namespce. This was causing - grief if users forgot to set this environment variable. Thanks - to Johannes Gutleber for reporting - this. - -Sun Feb 15 15:55:47 1998 Darrell Brunsch - - * ace/Timer_Hash_T.{cpp,h}: Timer Hash wasn't keeping the earliest - node pointer up to date with cancels. - -Sat Feb 14 21:12:52 1998 Douglas C. Schmidt - - * ace/Synch_T.h (class ACE_Guard): this->acquire() already sets - the owner, so we don't need to do it in the constructor. - -Sat Feb 14 20:57:59 1998 Nanbor Wang - - * netsvcs/lib/Log_Message_Receiver.{h,cpp} (log_output): Added this to - all receiver classes. It allows writing messages to a user - specified ostream. - - * netsvcs/lib/Server_Logging_Handler_T.cpp - (handle_logging_record): * netsvcs/lib/Client_Logging_Handler.cpp - (send): Use the above change to avoid missing data on NT. Thanks - to Greg White for providing the fix. - -Sat Feb 14 18:34:37 1998 Darrell Brunsch - - * ace/Timer_{Wheel,Hash}_T.cpp: Fixed a bug with earliest time - pointers not being set correctly. Thanks to Mark Evans - for reporting this. - - * tests/Timer_Queue_Test.cpp: Added a quick test to check to - make sure the earliest time is reported correctly. - -Sat Feb 14 18:28:19 1998 Douglas C. Schmidt - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): Fixed a problem with the - ACE_SOCK_Dgram_Mcast subscription method. Originally, each time - the ACE_SOCK_Dgram_Mcast subscribe() method was invoked, it - created a new socket, did appropriate setsockopt calls - (e.g. SO_USEPORT), did a bind() to that socket, and then did the - setsockopt call that actually joins the mcast group. The - problem with this was that is wasn't possible to a single socket - to subscribe to more than one multicast group. Multiple calls - to ACE_SOCK_Dgram_Mcast.subscribe() didn't work because the new - socket descriptor that was issued didn't listen to the old - multicast group(s). The fix was to change the subscribe() - method to only create, set up, and bind the socket if - get_handle() == ACE_INVALID_HANDLE. Thanks to Dave Meyer - for reporting this. - -Sat Feb 14 03:29:50 1998 Sergio Flores - - * ace/ACE.cpp (set_handle_limit): Fixed a couple of bugs - setting the maximum number of file descriptors. If we use - setrlimit, we should first get the hard limit before calling - it, or we get an EINVAL for trying to set a hard limit of 0 - and a soft limit greater than that. Also, for -1 the call - was not setting the limit to the maximum allowable. - - * ace/OS.h (ACE_MAX_DGRAM_SIZE): Moved the #define - ACE_MAX_DGRAM_SIZE from the PSOS specific part of OS.h. - -Fri Feb 13 19:25:55 1998 Douglas C. Schmidt - - * ace/Log_Record.cpp (ACE_Log_Record): Changed the "set" method - for priority() so that it doesn't convert the priority into the - base two logarithm of the parameter. Instead, this is handled - by the "get" method of priority(). Thanks to Eric C. Newton - for reporting this. - - * ace/OS.h: Added a new #define called ACE_MAX_DGRAM_SIZE, which - is set to 8k by default. Naturally, this can be overwritten in - platform-specific config.h files. - -Fri Feb 13 10:40:36 1998 David L. Levine - - * ACE version 4.4.26, released Fri Feb 13 10:40:36 1998. - -Thu Feb 12 14:33:12 1998 Nanbor Wang - - * ace/OS.i (mktemp): I missed this one in Win32 section. - -Fri Feb 13 09:04:13 1998 Oliver Kellogg - - * ace/config-osf1-4.0.h: added Rational RCC support. - -Wed Feb 11 09:50:27 1998 Steve Huston - - * ace/config-dgux-4.x-ghs.h - * include/makeinclude/platform_dgux4_ghs.GNU: Configs for ACE on - DG/UX 4 using Green Hills Multi C++ compiler, and draft 10 pthreads. - - * ace/README - * ace/OS.h: New macro ACE_NEEDS_SCHED_H for platforms which needs to - #include to get complete defs for thread scheduling. - - * ace/OS.cpp: Added a DG/UX-specific pthread_wait function for use with - draft 10 pthreads on DG/UX. - -Wed Feb 11 09:32:10 1998 David L. Levine - - * ACE-INSTALL.html: updated DU CXX and Linux info. - - * ace/Makefile: moved INSTALL= to before include of rules.local.GNU, - so that the (unused) install command doesn't show up with make -n. - - * include/makeinclude/platform_chorus_ghs.GNU: put posix -I before - stdc -I. - - * ace/OS.h: removed include of stdfileio.h on ghs/Chorus. It's not - necessary with the above change to platform_chorus_ghs.GNU. - -Wed Feb 11 09:24:51 1998 David L. Levine - - * ACE version 4.4.25, released Wed Feb 11 09:24:51 1998. - -Tue Feb 10 14:58:00 1998 Chris Gill - - * ace/Containers.cpp : removed unreachable break; - -Tue Feb 10 09:34:27 1998 David L. Levine - - * ace/INET_Addr.cpp (get_host_name): moved declaration of local - "hentry" so that it's not seen on Chorus. - - * ace/OS.i (getprotoby{name,number}{,_r}): not supported on Chorus. - - * ace/Makefile: build Select_Reactor.o without -g on ghs/Chorus, - because it causes GreenHills 1.8.8 to core dump. - - * ace/config-chorus.h: adjusted to work with GreenHills 1.8.8. - - * include/makeinclude/platform_chorus_ghs.GNU: use Gnu ar instead - of ax, because we don't have a license for ax. - - * Timer_Queue_Adapters.{h,i} (activate): added stack and stack_size - parameters to match declaration in ACE_Task_Base. - - * include/platform_linux{,_lxpthread}.GNU: removed - -fno-strict-prototypes from CFLAGS because it is no longer needed. - - * include/makeinclude/platform_sunos5_g++.GNU: added -lposix4, to - be consistent with the Sun C++ platform file. Some of the TAO - tests need it. - -Mon Feb 09 18:10:37 1998 Chris Gill - - * ace/Containers.{cpp,h} : made next () a const member function in - ACE_Ordered_MultiSet_Iterator - -Mon Feb 09 14:52:25 1998 David L. Levine - - * include/makeinclude/platform_chorus_ghs.GNU: added include path. - - * ace/config-chorus.h: with GreenHills, removed - ACE_HAS_WCHAR_TYPEDEFS_CHAR and ACE_LACKS_UNISTD_H. We'll - see if --multibyte_chars --wchar_t_keyword work. - - * ace/OS.h: added #include with GreenHills/Chorus. - - * netsvcs/clients/Naming/Client/Client_Test.cpp (handle_input): - get input from stdin, not ACE_STDIN. Thanks to Jack Erickson - for reporting this. - -Sun Feb 8 15:33:33 1998 Nanbor Wang - - * include/makeinclude/wrapper_macros.GNU: - * include/makeinclude/rules.lib.GNU: - * include/makeinclude/rules.local.GNU: Rename - ACE_LDSO_Major_Minor_Version_Number to ACE_LDSO_Version_Number. - - * include/makeinclude/rules.local.GNU: Put back checking of - current directory into library installation rules but with an - extra check for null ACE_LDSO_Version_Number. - -Sun Feb 08 12:06:30 1998 David L. Levine - - * ACE-INSTALL.html: added Scott Snyder's egcs 1.0.1 patch, which - allows netsvcs/lib/Server_Logging_Handler.cpp to build on - Linux/RedHat 5.0. - - * include/makeinclude/wrapper_macros.GNU: protected ACE_ROOT... - additions to INCLDIRS and LDFLAGS so they're only added once. - Thanks to James CE Johnson for this addition. - - * ace/config-linux-common.h: added ACE_HAS_TERM_IOCTLS. Thanks - to James CE Johnson for this addition. - - * examples/Naming/test_multiple_contexts.cpp,test_non_existent.cpp, - test_writers.cpp: - replaced uses of cout with ACE_DEBUG. - - * examples/performance-tests/Misc/basic_perf.cpp, - context_switch_time.cpp,preempt.cpp: - divide ACE_hrtime_t by ACE_UINT32, to prevent ambiguity with - ACE_U_LongLong operator / overloading. - -Sun Feb 8 01:45:59 1998 Nanbor Wang - - * include/makeinclude/wrapper_macros.GNU (versioned_so): Added - a new directive to allow automatic installing of so libraries - with version number. This flag is default to 0. Put this line, - - versioned_so = 1 - - in your platform_*.GNU file to enable this feature. - - (ACE_LDSO_Major_Minor_Version_Number): Define the version number - to be appended to versioned so libraries (Notice: it include a - dot at the beginning.) If versioned_so == 0, this macro expand - to nothing. - - * include/makeinclude/rules.lib.GNU (INSTALL): - * include/makeinclude/rules.local.GNU (INSTALL rules): Modified - installation rules to allow installing so libraries with version - numbers. - - * include/makeinclude/platform_netbsd.GNU: - * include/makeinclude/platform_freebsd[_pthread].GNU: Enabled - new versioned_so feature. - -Sat Feb 07 05:51:15 1998 Nanbor Wang - - * ace/Synch_T.cpp (ACE_TSS): Changed to use MessageBox on WinCE. - Because there's no console in WinCE, we can't output warning - messages to stderr. - - * ace/README (ACE_HAS_UNICODE_ONLY): This new directive is used to - removed some char version function definitions because it - doesn't make too much sense to support these function when most, - if not all, strings in the system are wchar strings. - - * ace/OS.{h,i} (ACE_DEFAULT_LOGGER_KEY): Added wchar definition if - we are using UNICODE. - (ACE_SHE_{TRY,FINALLY,EXCEPT}): WinCE doesn't support Win32 - structual exception, so these macros should be defined as on - UNIX platforms. - (mktime): Removed this function from WinCE. Don't even think - about using them. - (ACE_HAS_UNICODE_ONLY): If this directive is defined, the char - version of the following functions are not defined in ACE_OS: - - chdir - mkdir - mkfifo - mktemp - getcwd - unlink - tempnam - - Some of them has wchar version. - - (chdir,mkdir,getcwd): Added wchar version. Unfortunately, getcwd - still doesn't work for WinCE. - - * ace/OS.cpp (mktemp): Added wchar version of this function. - Other changes added. Please refer to the entry above. If - platform/compiler supports this function, then both char and - wchar versions are defined as inline functions in OS.i. - (socket_{init,fini}): Removed leading :: from WSAStartup and - WSACleanup because these two are implemented as macros on - WinCE. Changed to use MessageBox instead of cerr for outputing - error messages. - - * ace/config-win32-common.h: Don't defined ACE_HAD_P_READ_WRITE on - WinCE. - - * ace/config-WinCE.h: Defined directive ACE_HAS_UNICODE_ONLY. - - * ace/ace_dll.dsp: Adjusted CE project settings. - -Fri Feb 06 15:28:11 1998 David L. Levine - - * ace/config-sunos5.5-sunc++-4.x.h: disable explicit template - instantiations with CC 4.2, because it still does implicit - instantiation. We need to figure out how to disable that. - Then, we can enable -instances=global to get the real - benefits of explicit template instantiation with CC. - - * tests/Barrier_Test.cpp: updated a comment re. the VxWorks - task names test. - -Fri Feb 06 10:42:22 1998 David L. Levine - - * ACE version 4.4.24, released Fri Feb 06 10:42:22 1998. - -Fri Feb 06 10:30:00 1998 Chris Gill - - * ace/Containers.cpp: fixed error in - ACE_Doubly_Linked_List_Iterator::first (void); - -Fri Feb 06 08:27:32 1998 Chris Gill - - * ace/Containers.{cpp,h} : added "first" methods to all container - iterators: each positions the iterator at the first element - in the container and returns 1, or if the container is empty - positions the iterator at a well defined "null" position for - that container and returns 0: - - template int - ACE_Unbounded_Set_Iterator::first (void); - - template int - ACE_Unbounded_Queue_Iterator::first (void); - - template int - ACE_Unbounded_Stack_Iterator::first (void); - - template int - ACE_Bounded_Set_Iterator::first (void); - - template int - ACE_Fixed_Set_Iterator::first (void); - - template int - ACE_Doubly_Linked_List_Iterator::first (void); - -Wed Feb 04 22:23:24 1998 David L. Levine - - * include/makeinclude/platform_linux*.GNU: commented out or - removed SUPPRESS_DASH_G, because it's not needed with hacked - gas on Linux/Alpha. - - * ACE-INSTALL.html: added some comments on Linux/RedHat 5.0, - for both Intel and Alpha. Thanks to James CE Johnson - , Torbjorn Lindgren , - and Oleg Krivosheev for this information. - - * ace/config-linux-common.h: replaced #define of ACE_HAS_EXCEPTIONS - with a compile time check for egcs, which supports exceptions. - Exceptions can now be enabled on the make command line. Also, - moved some comments on Linux system configuration up to - ACE-INSTALL.html. - - * ace/config-linux-common.h,config-g++-common.h: moved - ACE_HAS_EXCEPTIONS #define from config-linux-common.h to - config-g++-common.h. - - * include/makeinclude/wrapper_macros.GNU: disabled exception handling, - the default, on g++ >= 2.8.0. On both Linux/alpha and - Solaris 2.5.1/sparc, exception handling increased the size of - libACE.so by about 25 percent. Exception handling can easily - be enabled on the make command line or by editing your - include/makeinclude/platform_macros.GNU. - - * netsvcs/lib/TS_Server_Handler.cpp: instantiate - ACE_Svc_Handler if - ACE_HAS_STREAM_PIPES, not if ACE_HAS_TLI. Thanks to Oliver - Kellogg for reporting this problem. - - * Makefile: made ACE-INSTALL a dependency of release and - cleanrelease so that it is only updated when necessary. - - * ace/OS.{h,i},README (gets): wrapped with !ACE_LACKS_GETS. - - * ace/config-g++-common.h: added ACE_LACKS_GETS for egcs. It - supports ::gets (), but warns about it at link time on Linux. - The Solaris gets () man pages recommends using fgets () instead. - - * netsvcs/clients/Naming/Client/Client_Test.cpp: replaced use of - ACE_OS::gets () with ACE_OS::fgets (). - -Wed Feb 04 11:07:46 1998 Chris Gill - - * ace/Containers.cpp : fixed my "fix" to new_position pointer in - ACE_Ordered_MultiSet::find_from () - now checks the pointer - before assigning something to it. - -Tue Feb 03 15:11:00 1998 Chris Gill - - * ace/Containers.cpp : fixed order of member initialization list - in ACE_DNode ctor, added update of new_position pointer in - ACE_Ordered_MultiSet::find_from () - -Mon Feb 02 21:26:30 1998 David L. Levine - - * tests/Map_Manager_Test.cpp (test_map_manager): print out - item.int_id_ instead of local i so that item gets used (CXX - warned that it wasn't). - - * include/makeinclude/platform_osf1_4.0.GNU: added suppression of - warning 610, nonoverriding_function_decl. - - * ace/config-chorus.h,config-freebsd*.h,,config-hpux-10.x-g++.h, - config-irix{5.3,6.x}-g++.h,config-osf1-4.0.h,config-m88k.h, - config-netbsd.h,config-psosim-g++.h,config-sco-4.2-nothread.h, - config-sco-5.0.0-mit-pthread.h,config-sunos4-g++.h, - config-sunos5.4-g++.h,config-unixware-2.*.h: - migrated to config-g++-common.h. - - * ace/config-sunos5.5-egcs*.h: removed. config-sunos5.5-g++.h - now supports egcs, via config-g++-common.h. - - * ace/config-sco-5.0.0*.h: added RCS keyword string. - - * include/makeinclude/wrapper_macros.GNU: support "exceptions" - make flag on all platform. If enabled, it adds - -DACE_HAS_EXCEPTIONS to CCFLAGS. Not all platforms support - exception handling, of course, and that is noted in the - description of the "exceptions" make flag. - - * include/makeinclude/platform_sunos5_sunc++.GNU, - platform_sunos5.6_sparc_sunc++_4.2.GNU: - removed -DACE_HAS_EXCEPTIONS, because it's now done in - wrapper_macros.GNU. - - * examples/Reactor/Misc/test_event_handler_t.cpp: renamed - ACE_Sig_Handler to ACE_Test_Sig_Handler to avoid collision - with ACE_Sig_Handler in ACE library. - - * tests/Env_Value_Test.cpp (main): print out signed instead of - unsigned values. - -Mon Feb 02 14:40:00 1998 Chris Gill - - * tests/OrdMultiSet_Test.cpp: added explicit template instantiation - for ACE_DNode - - * tests/OrdMultiSet_Test.dsp: new MSVC++ project for the test - - * tests/tests.dsw: added OrdMultiSet_Test.dsp project to workspace - - * tests/run_tests.{bat,sh,psosim,vxworks} : added OrdMultiSet_Test - - * tests/Makefile : added OrdMultiSet_Test - -Mon Feb 02 02:42:30 1998 Nanbor Wang - - * ace/OS.h (ACE_NOTSUP_RETURN): Moved its definition to the end of - this file where __TEXT has already been defined. WinCE needs to - use wchar. - - (struct utsname): Moved this definition after all datatypes are - filled in. Reverted my previous changed on it. - - Win32 only: Added wchar version of ACE_OS::{perror,fprintf, - vsprintf,sprintf}. - - Windows CE only: Undefined some char version function in class - ACE_OS. They are of no use on CE anyway. - - * ace/OS.i (fdopen): Added wchar version of ACE_OS::fdopen, it is - only available on Win32. - - Windows CE only: Added implementation for c-styled file - functions. Type FILE * is mapped to Win32 HANLDE under the hood - and Win32 API's are used to emulate these functions. - - * ace/OS.cpp: Removed some char version functions and added some - wchar functions. - -Sun Feb 01 15:12:49 1998 Chris Gill - - * tests/OrdMultiSet_Test.cpp: added an ACE test for the - ACE_Ordered_MultiSet and ACE_Ordered_MultiSet_Iterator - class templates. - - * ace/Containers.i (ACE_Ordered_MultiSet::is_empty ()): - changed to return 1 rather than cause a SEGV when the - container is in fact empty (the above test discovered the bug). - -1998-02-01 Nanbor Wang - - * ace/OS.h (struct utsname): Separated WCE's definition from - ACE_LACKS_UTSNAME_T bacause VxWorks doesn't have TCHAR type. - -Sun Feb 01 12:09:11 1998 David L. Levine - - * ace/Containers.cpp (ACE_Ordered_MultiSet::insert and find): - expanded ITERATOR type of second argument, because g++ couldn't - deal with it. It can in the class declaration in Containers.h, - so I didn't change that. - - * ace/config-sunos5.5-g++.h,config-lynxos.h,config-vxworks5.x.h: - migrated to config-g++-common.h. - - * tests/run_tests.vxworks: disabled Message_Queue_Test because - it sometimes page faults or hangs the target. - -Fri Jan 30 15:35:30 1998 Chris Gill - - * ace/Containers.{cpp,h,i} : added class templates - ACE_Ordered_MultiSet and ACE_Ordered_MultiSet_Iterator - which respectively implement abstractions for containment - of and iteration over an ordered set that allows multiple - identical instances of a given item. - -Fri Jan 30 02:42:30 1998 Nanbor Wang - - * ace/OS.cpp (uname): Made it comform with Unicode. - - * ace/OS.h (struct utsname): Changed the internal string type to - TCHAR. - - * ace/OS.i (gettimeofday): Added Windows CE implementation. - -Thu Jan 29 21:02:24 1998 David L. Levine - - * ace/config-sunos5.5-g++.h: revert so that ACE_HAS_STRING_CLASS - is #defined, regardless of g++ version. - - * ace/config-g++-common.h,config-gcc-2.7.2.h: replaced - config-gcc-2.7.2.h with config-g++-common.h, which will support - all g++ versions, including egcs. - - * ace/config-linux-common.h,config-sco-5.0.0-{fsu-pthread,nothread}.h: - migrated to config-g++-common.h. - -Thu Jan 29 20:28:30 1998 Douglas C. Schmidt - - * ACE version 4.4.23, released Thu Jan 29 20:28:30 1998. - -Thu Jan 29 16:17:28 1998 Nanbor Wang - - * ace/Log_Msg.cpp (open): Always close down the logger connection - before changing the setting. Added codes to allow resetting - logging endpoint back to STDERR from LOGGER. - - * ace/OS.h (ACE_DEFAULT_LOGGER_KEY): Changed to localhost:10012 - so it can be used in both netsvcs/lib/ and netsvcs/client/. - - * netsvcs/client/Logger/indirect_logger.cpp: Added code to reset - logging endpoint back to stderr. - - * netsvcs/lib/Client_Logging_Handler.cpp - (ACE_Client_Logging_Acceptor): Changed to initialize - logger_key_ with ACE_DEFAULT_LOGGER_KEY. - - * netsvcs/lib/Client_Logging_Handler.h: Removed DEFAULT_LOGGER_KEY - definition. - -Thu Jan 29 12:32:32 1998 Carlos O'Ryan - - * include/makeinclude/platform_irix6.x-sgic++.GNU: - Added support for debugging, somehow the DCCFLAGS were missing. - -Thu Jan 29 10:52:34 1998 David L. Levine - - * ace/config-lynxos.h: added putenv () declaration. - - * include/makeinclude/platform_sunos5_g++.GNU: added comment - about disabling optimization with g++ 2.8.0. - - * ace/config-sunos5.5-g++.h: don't #define ACE_HAS_STRING_CLASS - with g++ 2.8.0. - - * include/makeinclude/platform_sunos5_egcs.GNU: include - the g++ platform file, it works just fine. The net effect - on egcs is these three changes: - - 1) -fno-implicit-templates is included in CPPFLAGS. That - option is necessary with the egcs (egcs-2.90.23 980102 - (egcs-1.0.1 release)) that we use to save _much_ text - space. - - 2) Use -G instead of -shared in SOFLAGS. That way, - libstc++.so, etc., need not be built. - - 3) The compiler is called g++ instead of c++. I don't - think this hurts anything. And Purify knows about g++, - but not g++. - - These (and any other) options can be overridden in - platform_sunos5_egcs.GNU if necessary. See the commented - example there. - - * ace/config-sunos5.5-egcs.h: added - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION to match - -fno-implicit-templates in the platform_sunos5_egcs.GNU. - - * tests/Env_Value_Test.cpp: updated comment to explain why we - can't use spawn with ACE_HAS_NONSTATIC_OBJECT_MANAGER. We - can, in general, but we can't on VxWorks because it doesn't - have fork (). - -Thu Jan 29 10:32:28 1998 Carlos O'Ryan - - * include/makeinclude/platform_sunos5_sunc++.GNU: - The posix4 library is needed in some TAO examples. - - * ace/Module.h: - * ace/Message_Queue.h: - Workaround HP/C++ compiler bug, it does not support enums inside - templates so we move them into base classes. Thanks to Sundar - T.J for reporting this problem. - -Thu Jan 29 10:14:03 1998 Douglas C. Schmidt - - * ace/FIFO.h: Revised the comment at the beginning of ACE_FIFO to - clearly indicate that it doesn't work portably to Win32. Thanks - to Thomas Hampson for suggesting this. - -Wed Jan 28 15:36:55 1998 Carlos O'Ryan - - * bin/auto_compile: - We can use the top level Makefile on TAO now. - -Wed Jan 28 11:59:41 1998 Nanbor Wang - - * ace/OS.i (isatty): Added conversion from a Win32 HANDLE to a C - file handle. It works correctly now. Thanks to Chuck R. Gehr - for noticing the problem. - -Tue Jan 27 20:32:07 1998 Douglas C. Schmidt - - * ace/Message_Block: Added an accessor to retrieve the reference - count on an ACE_Data_Block. Thanks to Dave Meyer - for contributing this. - -Tue Jan 27 15:09:08 1998 Douglas C. Schmidt - - * ace/OS.i, - * ace/Timer_Queue_Adapters.cpp: - When using ACE_CLEANUP_???_POP macros, it was being called with - argument 1, which should be 0 (don't execute the cleanup). - Thanks to Arturo Montes for reporting - argument 1, which should be 0 (don't execute the cleanup).this. - -Tue Jan 27 14:56:49 1998 David L. Levine - - * ace/Basic_Types.*: more cleanup: got rid of ACE_USES_ACE_U_LONGLONG, - replaced VXWORKS && ghs with ACE_HAS_WCHAR_TYPEDEFS_CHAR, and - factored out some common #defines. Rearranged ACE_SIZEOF_LONG_LONG - and ACE_UINT64 logic so that it works on NT. - -Tue Jan 27 08:28:34 1998 Steve Huston - - * ace/Basic_Types.h: Simplified and changed so that the config.h file - can pre-specify the ACE_SIZEOF_* macros in case the preprocessor - has trouble calculating them. - -Tue Jan 27 06:45:07 1998 David L. Levine - - * examples/IOStream/server/iostream_server.cpp: for egcs, use - ACE_SOCK_IOSTREAM instead of its expansion in the ACE_Svc_Handler - template instantiation. - - * ace/Event_Handler_T.h,examples/Reactor/Misc/test_event_handler_t.cpp: - removed special-case support for ACE_HAS_SIGNFO_T, because ace/OS.h - declares a siginfo_t without it. - - * tests/run_tests.vxworks: enabled Priority_Reactor_Test and - Message_Queue_Test, because they appear to run successfully now. - Most of the time, anyways. Message_Queue_Test occasionally - pages faults; there appears to be a memory management problem. - -Tue Jan 27 02:38:16 1998 Nanbor Wang - - * ace/OS.{i,cpp}: - * ace/config-WinCE.h: More Windows CE insanities. - -Mon Jan 26 13:20:58 1998 David L. Levine - - * include/makeinclude/platform_osf1_4.0_g++.GNU: added $(ACELIB) - to SOFLAGS. Thanks to Oliver Kellogg - for reporting the problem with building shared libraries on - g++/DU 4.0. - - * ace/config-linux-common.h: moved ACE_LACKS_TCP_H so that it is - only seen on alphas (with glibc2). Thanks to Edgar Villanueva - for reporting this. - - * performance-tests/Misc/childbirth_time.cpp (prof_native_thread, - prof_ace_os_thread): changed type of local j to int to avoid - signed/unsigned comparison. - - * tests/Reactors_Test (Test_Task): changed type of member - handled_ from int to size_t to avoid signed/unsigned comparison - in Test_Task::handle_input (). - -Mon Jan 26 11:35:54 1998 Carlos O'Ryan - - * bin/auto_compile: - Added TAO_ROOT to the environment. - -Mon Jan 26 10:28:57 1998 Douglas C. Schmidt - - * ACE version 4.4.22, released Mon Jan 26 10:28:57 1998. - -Mon Jan 26 02:53:10 1998 Nanbor Wang - - * ace/OS.h: Namespace related macros are now ifdef'ed by - ACE_HAS_BROKEN_NAMESPACES instead of ACE_ORBIX_HAS_NAMESPACES. - - * ace/README - * ace/config-win32-common.h: Added a new flag - ACE_HAS_BROKEN_NAMESPACES to deal with MSVC's broken namespace - support. - - * ace/config-win32.h: Re-enable defining ACE_ORBIX_HAS_NAMESPACES - for Win32. - - * ace/config-WinCE.h: Temporary file to hold WinCE specific - configurations. It will probably be merged with - config-win32-common.h in some point. - - * ace/ace_dll.dsp: Added WinCE x86 emulation mode project - definition. - - * ace/OS.{h.i} (ACE_OS): Added Windows CE macros madness. - - * ace/config-win32-common.h: Ifdef'ed out ACE_HAS_SIG_ATOMIC_T for - WinCE. Prevent repeat definition of STRICT. - -Sun Jan 25 17:31:49 1998 Nanbor Wang - - * ace/config-win32.h: Disabled setting ACE_ORBIX_HAS_NAMESPACES by - default on NT. MSVC's namespace support is buggy. - -1998-01-25 Nanbor Wang - - * tests/Conn_Test.cpp: Rearranged explicit template instantiations - order to avoid errors from egcs. Thanks to Gonzo for reporting - the bug. - -Fri Jan 23 12:24:05 1998 Douglas C. Schmidt - - * ace/OS.i (sleep): Fixed a typo where tv_sec was being set rather - than tv_usec. Thanks to Gonzo for pointing this out. - -Fri Jan 23 06:27:51 1998 David L. Levine - - * ace/IOStream.h: use std::string if - ACE_USES_STD_NAMESPACE_FORSTDCPP_LIB IOStream.h. Thanks - to Gonzo for the patch. Also, changed - DEC_CXX to __DECCXX_VER because that's more accurate. - - * tests/Barrier_Test.cpp: specify thread name and stack size - on VxWorks. Thanks to Stan Leeson - for suggesting this. - - * tests/Env_Value_Test.cpp (TEST_THIS): cast val to (type) - before casting to (u_int), to try to avoid DEC CXX compiler - warning about integer overflow. Thanks to Frederic Andres - for reporting this. - - * ace/config-osf1-4.0.h: added ACE_HAS_EXCEPTIONS, etc., with - CXX 6.0. Thanks to Torbjorn Lindgren for - the patch. - - * ace/OS.i (thr_kill): removed ACE_ADAPT_RETVAL because - ::taskNameToID returns the task ID, not success/fail. - Thanks to Richard Keizer for - diagnosing the problem and providing the fix. - - * tests/run_tests.vxworks: enabled Thread_Manager_Test and - Message_Block_Test now that they succeed. Thanks to Richard Keizer - for the ACE_OS::thr_kill fix. - - * ace/OS.cpp (thr_create), ace/Thread_Manager.cpp (kill_thr): - on VxWorks, use strncmp instead of strcmp to check for allocated - thread ID. - -Thu Jan 22 16:34:18 1998 Douglas C. Schmidt - - * examples/Connection/misc/Connection_Handler.cpp (svc): Fixed a - bug in the example where the global Singleton Reactor was being - used rather than the object's Reactor. Thanks to Peter Gross - for reporting this. - -Thu Jan 22 09:04:13 1998 David L. Levine <@cs.wustl.edu> - - * ace/Hash_Map_Manager.cpp (ACE_Hash_Map_Iterator_Base ctor): - added a cast of mm.total_size_ to ssize_t, to try to avoid - a compiler warning. Thanks to Brian Mendel - for reporting this. - - * ace/config-osf1-4.0.h: updated g++ support. Thanks to - Oliver Kellogg for the patch. - - Thanks to Tom Venturella and Dave Mayerhoefer - (!) for requesting the following three changes: - - * ace/Thread_Manager.cpp: added support for a user-supplied - thread (VxWorks task) name. By itself, that means just passing - the ACE_thread_t along to ACE_OS::thr_create (). The tricky - part was then handling the case where the user doesn't supply - a name. It would be cleaner if the ACE_thread_t and ACE_hthread_t - typedefs were swapped on VxWorks, because the ACE_Thread_Manager - keys off of the ACE_thread_t. And in addition to being cleaner, - it would be safer because ACE_thread_t's currently aren't - guaranteed to be unique on VxWorks. - - * ace/OS.cpp (thr_create): on VxWorks only, use the t_id (task - name) and stack_size if supplied. Also added support for setting - the stack, but commented it out because it doesn't seem to work. - - * tests/Conn_Test.cpp: on VxWorks, assign thread (VxWorks task) - names to server and client threads, to test that feature. - - * ace/OS.cpp (spa [VxWorks only]): use ::taskSpawn () instead - of ::sp () so that the task name, ace_main, can be specified. - - * ACE-INSTALL.html: added note about not linked the ACE library - into every VxWorks executable. It should work when running - multiple ACE executables on a target, though I haven't tried it. - - * include/makeinclude/rules.local.GNU: set SOEXT if it was not set, - so that it's always non-null for make depend. - - * ace/OS.h: #define ACE_THR_PRI_FIFO_DEF on all threaded platforms, - if not already defined in OS.h or in the individual platform config - file. It should be used by applications for a default real-time - thread priority. - - * ace/config-chorus.GNU: added GreenHills support. - - * include/makeinclude/platform_chorus_ghs.GNU: added platform file. - -Wed Jan 21 21:37:03 1998 Nanbor Wang - - * ace/Hash_Map_Manager.cpp (close_i): Removed the HPUX_11 - destructor madness by saving the location to be destructed in a - temporary reference instead of calling the destructor from the - array directly. Thanks to Istvan Buki for - providing the patch. - -Wed Jan 21 20:36:43 1998 Chris Cleeland - - * ACE version 4.4.21, released Wed Jan 21 20:36:43 1998. - -Wed Jan 21 10:39:12 1998 David L. Levine - - * ace/Task.cpp (activate): for builds without threads only, - added ACE_UNUSED_ARG of stack and stack_size. - - * ace/High_Res_Timer.cpp: used unsigned constants instead of - signed, to allow resolution of overloaded - ACE_U_LongLong::operator/ (). - -Tue Jan 20 21:15:01 1998 Douglas C. Schmidt - - * ACE version 4.4.20, released Tue Jan 20 21:15:01 1998. - -Tue Jan 20 20:31:27 1998 Carlos O'Ryan - - * tests/test_config.h: - Changed several buffer sizes from BUFSIZ to MAXPATHLEN, they - were used for storing pathnames, so the later is a proper size - for them. - -Tue Jan 20 15:54:44 1998 Darrell Brunsch - - * ace/Timer_Heap_T.cpp: Fixed a bug that was introduced on - Sunday because of the non-use of position 0 (we have to - grow the heap one node early). - - * ace/Timer_Queue_T.{h,cpp}: Added a return_node () method - which is used to return a ACE_Timer_Node back into the - control of the Timer Queue after it leaves via - remove_first (). - -Tue Jan 20 15:52:31 1998 Douglas C. Schmidt - - * ACE version 4.4.19, released Tue Jan 20 15:52:31 1998. - -Tue Jan 20 12:49:05 1998 Nanbor Wang - - * ace/Hash_Map_Manager.cpp (ACE_Hash_Map_Manager): Member table_ - needs to be initialized to prevent deleting invalid memories. - -Tue Jan 20 11:57:24 1998 Carlos O'Ryan - - * bin/auto_compile: - Added several TAO components to the compile list. - The regular expression for make errors was missing several of - them. - -Tue Jan 20 03:36:54 1998 Nanbor Wang - - * ace/Hash_Map_Manager.cpp (open): We should call close_i () to - ensure previously allocated memory gets release before we - allocate new one. - -Mon Jan 19 22:21:34 1998 Nanbor Wang - - * tests/Env_Value_Test.cpp (main): Added test codes for unsigned - short. - - * ace/Env_Value_T.i (ACE_Convert): Added conversion function for - unsigned short. - -Mon Jan 19 15:13:47 1998 Douglas C. Schmidt - - * bin/Makefile: Fixed a problem with the CCFLAGS definition that - was causing circular macro expansion. Thanks to Philippe - O'Reilly for reporting this. - -Sun Jan 18 14:32:42 1998 Darrell Brunsch - - * ace/Timer_Heap_T.cpp: Problems were arising because of the - use of negative numbers in the timer_id array of the timer - heap for the free list. When the 0th index is in the free - list, pointers to it will show up as 0 (because 0 == -0). - This will look the same as a timer_id for the top of the - heap, and if cancel () was attempted on this invalid - timer_id, bad things would happen. To prevent this, index - 0 is now ignored so it doesn't show up in the free list. - -Sun Jan 18 18:12:52 1998 Nanbor Wang - - * examples/Service_Configurator/Misc/*.ds?: Added new project - files for this example. - -Sun Jan 18 17:27:52 1998 Darrell Brunsch - - * ace/Timer_Wheel_T.cpp: Fixed a problem with Timer Wheel's - expire(). The problem occured when the handle_timeout() method - of the event handler used would return a 0. This causes the - Timer Queue to cancel all timers using that event handler. - Because Timer Wheel's expire caches the position of some timers - that will be expired, it was trying to expire timers that were - already cancelled. Now it checks the timer before it expires. - -Sun Jan 18 16:08:36 1998 Douglas C. Schmidt - - * ace/Thread_Manager: Modified the signature to the spawn_n() - method so that it's possible to pass in an array of stack - pointers and stack sizes. Thanks to Thomas Venturella - for requesting this. - - * ace/Task: Modified the signature to the activate() method so - that it's possible to pass in an array of stack pointers and - stack sizes. Thanks to Thomas Venturella - for requesting this. - -Sun Jan 18 15:54:16 1998 Darrell Brunsch - - * ace/Timer_Wheel_T.h: - ace/Timer_Hash_T.h: - ace/Timer_Queue_T.h: - ace/Timer_Wheel_T.cpp: - ace/Timer_Hash_T.cpp: Added pure virtual get_first() method to - Timer_Queue_T. Added implementations to Timer_Wheel and Timer_Hash. - Timer_Heap and Timer_List already had implementations. - -Sat Jan 17 23:40:02 1998 Nanbor Wang - - * netsvcs/VCAUTO.MAK: - * netsvcs/lib/VCAUTO.MAK: Added directory information for easier - debugging. - -Sat Jan 17 16:10:04 1998 Douglas C. Schmidt - - * examples/Service_Configurator/Misc/main.cpp (main): Replaced the - buggy use of ACE_Service_Config daemon; with - ACE_Service_Config::open(). We'll have to fix this properly - some day, but for now this is the best solution. Thanks to - Pawel Roman for reporting this. - -Sat Jan 17 00:42:13 1998 Irfan Pyarali - - * ace/SString.cpp (substring): Fixed bug. count should be - initialized to length and not len_. - -Fri Jan 16 15:52:34 1998 Nanbor Wang - - * ace/IOStream.h (ACE_Streambuf): - * ace/config-win32-common.h: - * ace/iosfwd.h: - * ace/streams.h: Applied IOStream patches from James CE Johnson - . - -Fri Jan 16 01:42:52 1998 Irfan Pyarali - - * ace/OS.h: Changed the definition of ACE_CORBA_* macros so that - on non-Win32 platforms, they will be expand to the nested - classes. Thanks to Jonathan Reis - for reporting this. - - * ace/SString.h: Added the correct export macros. - -Thu Jan 15 15:45:48 1998 Douglas C. Schmidt - - * etc/ACE-guidelines.html: Reformatted this page a bit. - - * ace/Message_Queue.cpp (open): The fix from Slawomir Kuzniar was - incorrect. I reverted the change. - -Thu Jan 15 12:43:23 1998 Nanbor Wang - - * /: Added a bunch of makefiles (*.MAK) for one button - make-and-test on NT. - - * Makefile (FILTER): Added filter to remove VC one button related - makefile from ACE release. - - * ace/ACE_Library.{mdp,mak}: Added Shared_Memory.cpp file into the - project makefile. - -Thu Jan 15 09:12:26 1998 David L. Levine - - * tests/Barrier_Test.cpp,Message_Block_Test.cpp,Priority_Task_Test.cpp, - Reactor_Exceptions_Test.cpp,Reactors_Test.cpp,Thread_Mutex_Test.cpp: - (main): changed some local variables from int to size_t to avoid - signed/unsigned comparison. - - * ace/OS.i,config-linux-common.h,README: aded ACE_HAS_SOCKLEN_T - support for Linux/glibc2, which has a socklen_t type. - - * include/makeinclude/rules.local.GNU (depend.local): produce all 4 - combinations of .obj, .shobj, .o, and .so dependency targets. This - should take care of the problem of not rebuilding when a dependency - has changed, after we regenerate all the Makefiles. - - * include/makeinclude/rules.local.GNU (depend.local): removed the sed - rule that wiped out each Makefile line ending with :. I don't know - why that rule was there. With it, if a Makefile had a target such - as clean:, it got deleted. Not any more. - - * many Makefiles: updated dependences with revised depend.local. - - * bin/g++dep: added lib/g++-include path to gcc -MM invocation, so - that gcc can find all of its headers. (It didn't help to replace - gcc with g++, though I would have expected that to solve the - problem.) - - * ace/Timer_Heap_T.cpp (get_first): fixed ACE_TRACE id string. - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp, - * apps/Gateway/Peer/Peer.cpp (recv): - changed type of HEADER_SIZE to size_t to avoid signed/unsigned - comparison. - -Wed Jan 14 20:41:35 1998 Carlos O'Ryan - - * ace/Signal.i (is_member): - Fixed typo in new cast, the type is sigset_t not sigset. - -Wed Jan 14 20:27:44 1998 - - * ace/OS.h: - The new location for AF_ANY and AF_FILE was in the middle of a - big #if !ACE_WIN32, hence it was not working for NT, I moved it - further down and now NT is happy. - -Wed Jan 14 19:01:59 1998 Douglas C. Schmidt - - * ace/Message_Queue.cpp (open): In Message_Queue::open - deactivated_ flag is being set to 0 instead of - WAS_INACTIVE. This is causing incorrect return value from - first-time call to activate(). Thanks to Slawomir Kuzniar - for reporting this. - - * ace/Signal.i (is_member): Added an ACE_const_cast(). Thanks to - Oleg Krivosheev for reporting this. - -Wed Jan 14 06:45:52 1998 David L. Levine - - * ace/OS.i: Fixed typo in ACE_Time_Value::operator const timeval * - definition. (select's): cast the ACE_Time_Value to a - const timeval * and then to a timeval * so that they will - compile. - - * tests/Time_Value_Test.cpp (test_ace_u_longlong): made divisors of - operator/ tests explicitly unsigned, to avoid overloading problems - now that there are two division operators. - -Tue Jan 13 16:31:48 1998 Douglas C. Schmidt - - * ace/OS.i: Changed the signature of ACE_Time_Value::operator - timeval *() to return operator const timeval *(). Thanks to - Oleg Krivosheev for reporting this. Changed - several other unsafe casts to use the ACE_const_cast() macro. - -Tue Jan 13 13:30:23 1998 David L. Levine - - * ace/Profile_Timer.cpp (elapsed_time): use floating point - arithmetic for real_time calculation, in case delta_t is - less than ACE_ONE_SECOND_IN_NSECS (and for more precision - otherwise). Thanks to Brian Mendel for tripping over this. - - * ace/Basic_Types.{h,i} (ACE_U_LongLong): added - operator/ (const double). - - * ace/OS.h: moved definition of AF_FILE, etc., to _after_ the - #include of sys/socket.h. That way, the #ifndef AF_FILE - protection will work properly on Linux/glib2. Thanks to - Amos Shapira for breaking silence and - reporting this. - -Mon Jan 12 20:19:54 1998 Douglas C. Schmidt - - * ace/SString.i: Replaced all uses of NULL with 0 since NULL - causes problems with some lame C++ compilers. - - * ace/SString.i: Moved one of the inline find() methods down - so that GCC doesn't complain anymore. - - * tests/Reactor_Timer_Test.cpp (main): Changed long i to size_t i - to be consistent. - - * ace/Select_Reactor.h: Updated the explanation of how the - ACE_Select_Reactor_Token works. Thanks to Detlef Becker for - explaining this in great detail. - - * tests/test_config.h: Changed the type of all the consts to - size_t rather than int. This may cause a bit of upheaval at - first since we'll need to fix some other types. But it's the - "Right Thing"[TM] to do. - -Mon Jan 12 18:31:23 1998 Nanbor Wang - - * Start renaming MSVC 4.2 workspace/makefile names. - - * apps/Gateway/Peer/Peer4.{mdp,mak}: - * apps/Gateway/Gateway/Gateway4.{mdp,mak}: Made them in synch with - VC 5.0's status. - -Mon Jan 12 12:30:34 1998 David L. Levine - - * ace/config-linux-common.h: moved - ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES so that it isn't used - with egcs. Thanks to Gonzo for testing this. - - * tests/Service_Config.test: changed type of VARIETIES to u_int to - avoid signed/unsigned comparison in main. Thanks to Gonzo for - reporting this. - - * ace/config-linux-common.h: added ACE_HAS_TEMPLATE_TYPEDEFS and - ACE_HAS_TYPENAME_KEYWORD. Thanks to Oleg Krivosheev - for reporting these. - - * ace/config-vxworks5.x.h: merged the two VxWorks configs (g++ and - ghs) into this new config for easier maintenance. Added - ACE_THR_PRI_FIFO_DEF, set to 6. - - * tests/Reactor_Timer_Test.cpp (main): cast i to u_long to avoid - signed/unsigned comparison. - -Sun Jan 11 23:02:07 1998 Irfan Pyarali - - * tests/SString_Test.cpp (main): Removed the "silly" strings from - the tests. They are annoying and cause memory leaks. - -Sun Jan 11 22:16:28 1998 Nanbor Wang - - * apps/Gateway/Peer/Peer.{h,cpp} (transmit): Changed the function - to return the result of transmission. - (transmit_stdin): Make sure the function returns proper results - of transmission. - -Sun Jan 11 16:18:15 1998 Douglas C. Schmidt - - * ACE version 4.4.18, released Sun Jan 11 16:18:15 1998. - -Sun Jan 11 00:00:26 1998 Douglas C. Schmidt - - * apps/Gateway/Gateway/Gateway.cpp (parse_connection_config_file): - Fixed a typo, == should be =. Thanks to David Levine for - reporting this. - - * apps/Gateway/Peer/Peer.cpp (recv), - apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (recv): - Added a cast to remove a GCC warning about signed/unsigned - comparisons. Thanks to David Levine for reporting this. - - * ace/Log_Msg.cpp (log): Made a minor change to move where the - message is copied from thread-specific storage into the transfer - buffer. Thanks to Patrick J. McNerthney - for reporting this. - - * apps/Gateway/Peer/Peer: Added new logic to transmit subscription - requests to the Gateway. - - * apps/Gateway/Gateway/Event.h (class Event_Header): Make sure - that we correctly encode/decode the connection_id. - -Sat Jan 10 18:17:06 1998 Douglas C. Schmidt - - * apps/Gateway/Gateway/Event.h: Added the event priority_ field to - the Event_Key. We don't currently use this, but we may some - day. - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (put): - Changed the forward() method to process() since our new scheme - will need to do more than just forward, e.g., it will need to - handle subscriptions. - - * apps/Gateway/Gateway/Connection_Handler: Made the accessors - const member functions and also added accessors for the - Event_Channel * so this can be set by the - Connection_Handler_Acceptor::accept_svc_handler() method. - - * apps/Gateway/Gateway/Connection_Handler: Added mutators so that - we can set the local and remote addresses outside of the - constructor. - - * apps/Gateway/Gateway/Options: Added a connection_id() accessor - to set/get the connection id. This makes it possible to allow - Peers to connection with the Gateway. - - * apps/Gateway/Gateway/Gateway.cpp (parse_connection_config_file): - Added a sanity check to ensure that the connection ids start at - 1 and increment by 1. - -Sat Jan 10 22:37:37 1998 David L. Levine - - * ace/SString.i (find): changed type of local i to size_t to - avoid signed/unsigned comparison. - -Sat Jan 10 14:57:01 1998 - - * ace/Env_Value_T.h: - The return value for the assignment operator had no template - parameter, ditto for the arguments of the copy constructor and - the already mentioned operator. - -Sat Jan 10 13:20:08 1998 Nanbor Wang - - * tests/Conn_Test.cpp: Moved template instantiation codes around - to avoid warnings. - -Sat Jan 10 01:36:08 1998 Irfan Pyarali - - * ace/SString: Made the following changes to make the ACE string - class look more like the STL string class: - - - Added npos to all classes. - - - Added non-const reference operator[]. - - - Changed operator= and operator+= to return *this. - - - Added STL like find and rfind routines - - - Made the three classes be a similar as possible. - - - Changed the implementation of strstr to use the C library - strstr function. - - - Added constructors from single characters. - - - Made substring a const method. - -Fri Jan 9 19:11:39 1998 Nanbor Wang - - * tests/Map_Manager_Test.cpp (test_hash_map_manager): Added - ACE_UNUSED_ARG to eliminate warnings. - - * ace/Hash_Map_Manager.cpp (rbegin): Added more static cast to - eliminate warning messages. - -Fri Jan 9 11:35:53 1998 Douglas C. Schmidt - - * examples/Service_Configurator/IPC-tests/server/server_test.cpp: - Fixed a syntax error. Thanks to John Mulhern - <9107@MN3.LAWSON.lawson.com> for reporting this. - - * ace/Log_Msg.cpp (log): Changed abort_prog == 0 to abort_prog so - that STDERR would be printed correctly. - - * ACE-categories: Added all the ACE files into the ACE-categories - listing. Thanks to Andres Kruse for motivating this. - - * include/makeinclude/platform_sunos5_egcs.GNU (CXX): Removed - -pipe from CC and CXX. It was already in CCFLAGS. - -Fri Jan 09 11:56:44 1998 Irfan Pyarali - - * ace/config-win32.h (ACE_ORBIX_HAS_NAMESPACES): By default, you - will get the proper namespace usage for Orbix. If you don't - like this, comment out the #define ACE_ORBIX_HAS_NAMESPACES line - or #undef ACE_ORBIX_HAS_NAMESPACES in your config.h file after - including this config-win32.h. - -Fri Jan 09 07:04:47 1998 David L. Levine - - * include/makeinclude/platform_sunos5_g++.GNU: removed - -pipe from CC and CXX. It was already in CCFLAGS. - - * include/makeinclude/platform_vxworks5.x_g++.GNU: added - target-dependent support for symbol table extractor, and - disabled symbol table extraction (POSTLINK) by default. - Thanks to Keith Nicewarner for - reporting problems with this on PPC604 targets. - - * ace/config-linux-common.h: added ACE_HAS_STDCPP_STL_INCLUDES - and removed ACE_LACKS_ACE_IOSTREAM. Thanks to James CE Johnson - for reporting these. - - * tests/run_tests.vxworks: added Env_Value_Test. - -Fri Jan 09 00:14:20 1998 Nanbor Wang - - * apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp: - * apps/Gateway/Gateway/Config_Files.cpp: Defined - ACE_BUILD_SVC_DLL flag. All declarations of an exported class - must be declared with the same exporting flag. - - * apps/Gateway/Peer/Options.h: Updated the path of include file - Event.h. - -Thu Jan 08 22:11:57 1998 Nanbor Wang - - * ace/Env_Value_T.i (ACE_Convert): Added static cast for int and - short conversion funcions. - -Thu Jan 08 21:37:30 1998 Douglas C. Schmidt - - * ACE version 4.4.17, released Thu Jan 08 21:37:30 1998. - -Thu Jan 8 19:50:43 1998 Douglas C. Schmidt - - * ace/Task: Added a virtual destructor for ~ACE_Task_Base. Thanks - to Oleg Krivosheev for suggesting this. - - * ace: Added a new config-sunos5.5-egcs.h for the EGCS compiler. - Thanks to Oleg Krivosheev for contributing - this. - - * include/makeinclude: Added a new platform macros file for the - EGCS compiler on Solaris 2.x. Thanks to Oleg Krivosheev - for contributing this. - - * include/makeinclude/platform_sunos5_g++.GNU (CXX): Added the - -pipe flag. - - * man: Updated all the manual pages. - - * ace/Log_Msg: Added changes to allow the logging of custom built - log records. The main reason for these changes is to allow code - to handle the logging of out of memory conditions without - allocating any additional memory. Thanks to Patrick - J. McNerthney for this feature. - - * ace/Log_Msg: Added a new method called log_priority_enabled(), - which returns true if the priority is enabled (gee, is *that* - what it does? ;-)). Thanks to Patrick J. McNerthney - for this feature. - - * examples/Service_Configurator/IPC-tests/server/server_test.cpp - (main): Revised the driver program so that it doesn't create an - explicit ACE_Service_Config object. Thanks to John Mulhern - <9107@MN3.LAWSON.lawson.com> for reporting this. - - * apps/Gateway/{Gateway,Peer}/Options.cpp: Oops, ACE_BUILD_DLL - should be ACE_BUILD_SVC_DLL, yikes! Thanks to Jeff Hellzen - for reporting this. - - * apps/Gateway/{Peer,Gateway}/Options.{h,cpp}: Added a missing - #define ACE_BUILD_DLL and a missing ACE_Svc_Export. Thanks to - Jeff Hellzen for reporting this. - - * ace/Select_Reactor.cpp (suspend_i): The clr_bit call was - mistakenly made on the write mask, rather than the read mask. - Thanks to Billy Quinn for reporting this. - -Thu Jan 08 16:02:33 1998 Nanbor Wang - - * ace/Hash_Map_Manager.{h,cpp}: Added STL-styled iterator - functions. - - * tests/Map_Manager_Test.cpp: - * tests/Hash_Map_Manager_Test.cpp: - * tests/Conn_Test.cpp: - * ace/Local_Name_Space.cpp: - * ace/Filecache.cpp: Added missing template instantiation codes. - -Thu Jan 08 11:05:15 1998 - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Added the new Shared_Memory.cpp file to the project. - -Wed Jan 07 20:40:45 1998 David L. Levine - - * ace/OS.h: protect #define of AF_FILE, because Linux/RedHat 5.0 - #defines it in /usr/include/socketbits.h. Thanks to James CE - Johnson for reporting this. - - * tests/test_config.h (set_output): "if (! test_dir)" instead of - "if (test_dir)" so the output filename ends up non-null. - - * ace/Shared_Memory.{h,cpp},Makefile (~ACE_Shared_Memory): made - virtual and non-line. Added file Shared_Memory.cpp to contain - the definition. - -Wed Jan 07 17:59:57 1998 Nanbor Wang - - * ace/Free_List.i (add): Only delete freeed item when we hit the - high water mark, not the other way around. Thanks to Stuart - Myles for pointing this out. - -Wed Jan 7 17:46:09 1998 James C Hu - - * examples/Timer_Queue/Thread_Timer_Queue_Test.h: - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.h: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp: - * examples/Timer_Queue/Driver.h: - * examples/Timer_Queue/Driver.cpp: - Added virtual destructors to classes that needed them. - -Wed Jan 7 16:28:16 1998 Douglas C. Schmidt - - * ace/Event_Handler_T.cpp: Reordered the initializers in the - ACE_Event_Handler_T constructor so G++ doesn't complain. Thanks - to Oleg Krivosheev for reporting this. - - * ace/Shared_Memory.h: Added a virtual destructor to the - ACE_Shared_Memory abstract base class so that EGCS won't - complain. Thanks to Oleg Krivosheev for - reporting this. - - * ace/Event_Handler_T.h: Had to include the *.cpp file into .h - when ACE_TEMPLATES_REQUIRE_SOURCE is defined. Thanks to Oleg - Krivosheev for reporting this. - -Wed Jan 07 14:31:34 1998 Douglas C. Schmidt - - * ACE version 4.4.16, released Wed Jan 07 14:31:34 1998. - -Wed Jan 7 13:38:28 1998 Douglas C. Schmidt - - * tests/test_config.h (set_output): Added an environment variable - to specify where to put the log directory: ACE_TEST_DIR. Thanks - to Keith Nicewarner for reporting this. - - * ace/Service_Repository.cpp (close): Removed a fragment of - redundant code. Thanks to Eric Newton and Alex - Chan for reporting this. - -Tue Jan 06 17:19:13 1998 Nanbor Wang - - * ace/Containers.{h,cpp} (ACE_Unbounded_Set[_Iterator]): Added - STL-styled iterator functions. Changed the internal - representation of ACE_Unbounded_Set within iterators from a - reference to a pointer. We need this to compare if two - iterators are refering to the same set or not. - -Tue Jan 6 14:11:54 1998 Carlos O'Ryan - - * tests/Reader_Writer_Test.cpp: - Reverted to revision 4.21 since the latest one (4.23) fails; - thanks to Irfan for this solution. - -Tue Jan 06 10:37:49 1998 David L. Levine - - * ace/OS.i (rw_trywrlock_upgrade): moved the #if 0 up a bit so - that it builds on Linux/non-glibc. For some reason, its - preprocessor was getting confused. - - * ace/OS.i (nanosleep): convert nanoseconds to microseconds - by dividing by 1000, not multiplying. Thanks to - Mitch Kuninsky for reporting this. - - * ace/config-mvs.h: added ACE_LACKS_LONGLONG_T because MVS doesn't - support it. Thanks to Chuck Gehr for - confirming that. - -Mon Jan 5 01:20:51 1998 Nanbor Wang - - * ace/Map_Manager.{h,cpp}: Made operator == and != and their - arguments const. - -Sun Jan 04 19:45:47 1998 David L. Levine - - * ace/IPC_SAP.cpp (enable,disable): moved return 0 at end - to inside the #endif, to avoid warning about unreachable - return statement on ghs/VxWorks. Thanks to Brian Mendel - for reporting this. - - * ace/OS.i (rw_trywrlock_upgrade): moved return 0 inside the - #if 0 block to avoid warning about unreachable return statement - on ghs/VxWorks. Thanks to Brian Mendel for reporting this. - - * ace/OS.i (rw_trywrlock_upgrade): added ACE_UNUSED_ARG (rw) - to temporary code. - - * ace/Basic_Types.{h,i},README: replaced ACE_HAS_LONGLONG_T with - ACE_LACKS_LONGLONG_T. ACE_HAS_LONGLONG_T was no longer - being used on many platforms with the scheme in Basic_Types.h. - From now on, we'll assume that a platform has long long - (unless ACE_LACKS_LONGLONG_T is #defined), which should help - porting to new platforms. - - * ace/config-aix-4.{1,2}.x.h,config-dgux-4.11-epc.h, - config-linux-{common,kcc}.h,config-lynxos.h,config-m88k.h, - config-osf1-*.h,config-sunos5.*.h,config-tandem.h: - removed ACE_HAS_LONGLONG_T. - - * ace/config-chorus.h,config-psosim-g++.h,config-vxworks*.h: - added ACE_LACKS_LONGLONG_T. - - * ace/Basic_Types.{h,i} (ACE_U_LongLong): fixed operator/, and - added operator% and operator--. - - * ace/High_Res_Timer.*: changed type of global_scale_factor_ from - u_long to ACE_UINT32. Removed some hacks now that ACE_U_LongLong - has operator%. - - * tests/Time_Value_Test.cpp: added tests of ACE_U_LongLong - operator/ and operator%. - - * ACE-INSTALL.html: added link to Cygus repo patches. Thanks - to Achint Sandhu for providing the URL. - - * ace/OS.{h,i}: added ACE_OS::putenv (). - - * tests/Env_Value_Test.cpp: use ACE_OS::putenv (). - - * tests/Env_Value_Test.cpp: expect (unsigned long) -10 for - TEST_VALUE_NEGATIVE converted to an unsigned long. - Thanks to Jack Erickson for - verifying that it _should_ return (unsigned long) -10. - - * ace/OS.i (strtoul): on Linux with glibc, use ::strtol instead of - ::strtoul and cast the result to an unsigned long. Its ::strtoul - always seems to return 0 for a negative number, at least on - RedHat 4.2/Linux 2.0.30/Alpha with glibc 2.0 (0.961212-5). - - * ace/config-linux-common.h: factored out - ACE_LACKS_SOME_POSIX_PROTOTYPES from glibc and non-glibc - sections to common section. - - * etc/purify.solaris2: added suppression of MIU from putenv. - -Sun Jan 04 17:19:31 1998 Douglas C. Schmidt - - * ACE version 4.4.15, released Sun Jan 04 17:19:31 1998. - -Sun Jan 4 10:11:53 1998 Douglas C. Schmidt - - * ace/OS.i (rw_trywrlock_upgrade): Temporarily comments out this - method since we need to finish implementing it correctly. - - * ace/OS.i (rw_trywrlock_upgrade): Fixed a minor bug where we - weren't releasing the lock correctly if there were competing - readers. - - * apps/Gateway/Gateway/Event_Channel.cpp (put): Uncommented the - code that sets the appropriate locking strategy for the Message - Blocks. - - * apps/Gateway/Gateway/Connection_Handler.h: Made the - remote_addr() and local_addr() accessor methods return - const-correct values. - - * build/SunOS5.5/ace/OS: Revised a bunch of #ifdefs so that we can - selectively enable the ACE rwlock emulation, even if we're - compiling with ACE_HAS_STHREADS in order to get the native - Solaris semaphores. - - * apps/Gateway/Peer/Makefile: Tweaked the Makefile rules to fix - some minor problems. Thanks to David Levine for showing the - way... - -Sun Jan 04 12:37:02 1998 David L. Levine - - * tests/Env_Value_Test.cpp: hacked to work with - ACE_HAS_NONSTATIC_OBJECT_MANAGER. With that, it uses ::putenv (), - which we should wrap in ACE_OS. Also, expanded TEST_THIS to - provide a more helpful log message than just the ASSERT output. - - * ace/config-vxworks5.x-g++.h: removed - ACE_HAS_TEMPLATE_SPECIALIZATION. - - * tests/Hash_Map_Manager_Test.cpp (main): added casts of i->ext_id_ - and i->int_id_ to (char *) to force g++/VxWorks to apply the - conversion from Dumb_String to char *. - -Sun Jan 04 09:51:59 1998 Nanbor Wang - - * apps/Gateway/Gateway/Options.{h,cpp}: Removed macros to export - this class out of DLL. They are no longer needed. - - * apps/Gateway/Gateway/Gateway.dsp: Updated source file listings. - -Sat Jan 3 22:25:15 1998 Douglas C. Schmidt - - * apps/Gateway/Gateway: Changed the name of the ACE_Event_Channel - class to Event_Channel since this class wasn't a part of the ACE - library. - - * apps/Gateway/Gateway/Event_Channel.h: Updated the inheritance - relationship for Event_Channel so that it inherits from - ACE_Event_Handler rather than ACE_Task. ACE_Task was - overkill... - - * apps/Gateway/Gateway: Removed the supplier_id from all the - files. We didn't use this anyway and it was just confusing. - Also, renamed Proxy_* to Connection_* to underscore the fact - that the Supplier_Handler and Consumer_Handler work atop - *connections*. The previous naming scheme was too abstract for - its own good. - -Sat Jan 03 14:16:40 1998 Nanbor Wang - - * ace/Map_Manager.cpp (ACE_Map[_Reverse]_Iterator): Fixed the - initial iterator position. - -Fri Jan 02 18:43:14 1998 Douglas C. Schmidt - - * ACE version 4.4.14, released Fri Jan 02 18:43:14 1998. - -Fri Jan 2 17:39:04 1998 Douglas C. Schmidt - - * apps/Gateway/Peer/Options.cpp (Options): Rearranged the order of - the parameters in the base/member initialization section to make - GCC happy. Thanks to David Levine for getting on me about this. - - * apps/Gateway/Gateway/Options.h: Changed DEFAULT_TIMEOUT - to MAX_TIMEOUT to be consistent. Thanks to David - Levine for reporting this. - -Fri Jan 2 17:25:05 1998 Nanbor Wang - - * tests/Map_Manager_Test.cpp: Added codes to test STL-styled - functions in ACE_Map_Manager. - - * apps/Gateway/Gateway/Proxy_Handler.cpp: - * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp: - * apps/Gateway/Gateway/Event_Channel.cpp: - * apps/Gateway/Peer/Peer.cpp: - * ace/Local_Name_Space.cpp: - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: - * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: - * examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp: - * examples/Connection/blocking/SPIPE-connector.cpp: - * examples/Connection/misc/test_upipe.cpp: - * examples/Connection/non_blocking/test_sock_connector.cpp: - * examples/Connection/non_blocking/test_spipe_connector.cpp: - * examples/Connection/non_blocking/test_tli_connector.cpp: - * examples/Connection/non_blocking/test_lsock_connector.cpp: - * netsvcs/clients/Tokens/manual/manual.cpp: - * netsvcs/lib/TS_Clerk_Handler.cpp: - * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp: Added some - more explicit template instantiations. - - * ace/Map_Manager.{h,cpp}: Added back comparison operators for - ACE_Map_Iterator and ACE_Map_Reverse_Iterator. - - * ace/Token_Invariants.cpp: - * ace/Token_Collection.cpp: - * ace/Token_Manager.cpp: Added missing ACE_Map_Reverse_Iterator. - - * ace/Map_Manager.h: Remove unnecessary method declarations from - ACE_Map_Iterator adn ACE_Map_Reverse_Iterator. - - * examples/Connection/non_blocking/test_tli_connector.cpp: - * examples/Connection/non_blocking/test_sock_connector.cpp: - * examples/Connection/non_blocking/test_lsock_connector.cpp: - * examples/Connection/non_blocking/test_spipe_connector.cpp: - * examples/Connection/misc/test_upipe.cpp: - * examples/Connection/blocking/SPIPE-connector.cpp: - * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: - * examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp: - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: - * apps/JAWS/clients/Caching/http_handler.cpp: - * apps/JAWS/clients/Blobby/Blob.cpp: - * apps/Gateway/Peer/Peer.cpp: - * apps/Gateway/Gateway/Event_Channel.cpp: - * apps/Gateway/Gateway/Proxy_Handler.cpp: - * apps/Gateway/Gateway/Proxy_Handler_Connector.cpp: - * tests/Reactor_Performance_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Map_Manager_Test.cpp: - * tests/Conn_Test.cpp: - * netsvcs/lib/TS_Clerk_Handler.cpp: - * ace/Token_Manager.cpp: - * ace/Token_Invariants.cpp: - * ace/Token_Collection.cpp: - * ace/Local_Name_Space.cpp: Added explicit template instantiation - for ACE_Map_Iterator_Base. - - * ace/Map_Manager.{h,cpp}: Added a new class ACE_Map_Iterator_Base - to abstract out most common functionalities from - ACE_Map_Iterator and ACE_Map_Reverse_Iterator. Added some - missing functions to both iterator classes. - -Fri Jan 2 12:39:45 1998 Carlos O'Ryan - - * ace/Map_Manager.h: - Another declaration removed from ACE_Map_Reverse_Iterator, - operator* is defined in the base class. - - * tests/Conn_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Reactor_Performance_Test.cpp: - The instantiation of ACE_Map_Manager *requires* instantiating - ACE_Map_Reverse_Iterator. - - * ace/OS.i: - Cannot use ACE_ASSERT in OS.i, at least it make SGI compiler - unhappy. - - * ace/Map_Manager.cpp: - Several methods for ACE_Map_Manager were not given their fully - qualified name. - - * ace/OS.i: - The error code should be stored in errno, not in "error". - -Fri Jan 2 17:02:36 1998 Chris Cleeland - - * tests/run_tests.sh: Added Env_Value_Test to the list of tests to - run. - - * tests/Env_Value_Test.cpp (main): Fixed wrong test for negative - values with unsigned longs. Thanks to David Levine and - Linux/Alpha for finding this. - - * tests/Env_Value_Test.cpp (main): Changed the definition of the - TEST_THIS macro to be all on one line. While ugly, this helps in - locating the line when ACE_ASSERT fails, since allowing the macro - to have multiple lines skews the line # reported by ACE_ASSERT. - - * ace/Env_Value_T.*: Fixed lots of little bugs that got past both - g++ and Solaris compilers, but were caught by the ever-skeptical - SGI compiler. This included providing a definition for the missing - 'varname(void)' method. - -Fri Jan 02 10:12:28 1998 Steve Huston - - * ace/config-hpux-10.x-g++.h: Added #define HPUX_10 to catch OS - version-dependent code correctly. - -Fri Jan 02 07:06:44 1998 David L. Levine - - * apps/Gateway/Gateway/Makefile: restored the .obj/*.o targets. - They don't affect the build of the shared lib and are used if - the unshared lib is built. - - * apps/Gateway/Gateway/Options.h: added missing , in enum definition. - - * apps/Gateway/Gateway/Options.cpp (Options ctor): reordered - initializers to match declaration order. - - * apps/Gateway/Gateway/Config_Files.cpp (read_entry): fixed syntax - error, missing "if" after "else". Added #include of Options.h. - - * ace/OS.i (rw_trywrlock_upgrade): added ACE_UNUSED_ARG (rw) with - STHREADS. - - * ace/Synch.i (tryacquire_write_upgrade): only define if - ACE_HAS_THREADS. - - * tests/test_config.h: hacked ACE_INIT_LOG to work on VxWorks. - VxWorks gets upset if its asked to unlink a nonexistant file. - - * ace/Basic_Types.*: if using ACE_U_LongLong, #define - ACE_USES_ACE_U_LONGLONG and use that in the .i and .cpp files - instead of repeating all of the complex preprocessor tests - in Basic_Types.h. Thanks to Carlos for suggesting this. - - * ace/Env_Value_T.cpp: added protection against multiple inclusion. - - * tests/Env_Value_Test.cpp: added ACE_Env_Value instantiation. - -Fri Jan 02 00:47:33 1998 Douglas C. Schmidt - - * ACE version 4.4.13, released Fri Jan 02 00:47:33 1998. - -Fri Jan 2 00:17:04 1998 Douglas C. Schmidt - - * Reader_Writer_Test.cpp: Changed from an ACE_RW_Mutex to an - ACE_RW_Thread_Mutex so that we can use the new - tryacquire_write_upgrade() method. - - * ace/Env_Value_T.h: Reformatted the file a bit to conform to - ACE coding conventions. - -Thu Jan 1 12:04:29 1998 Douglas C. Schmidt - - * apps/Gateway/Peer/Options.cpp (parse_args): Changed the option - to set the passive acceptor port from -p to -a. This is now - consistent with the option for active connector port number, - which is -c. - - * apps/Gateway/Gateway/Gateway.cpp (fini): Added a call to - ACE::remove_stdin_handler(), which removes the handler for - ACE_STDIN so the gatewayd will shutdown cleanly. - - * ace/ACE: Added a new method, remove_stdin_handler(), which is - the inverse of the register_stdin_handler() method. However, - I'm not sure how to make this work on NT! - - * examples/Reactor/Misc/notification.cpp: Removed some - CHORUS-specific, which should be a no-op with our new signal() - and sigaction() scheme. - - * ace/OS.i: Enhanced the signal() and sigaction() wrappers so that - they simply ignore signums of 0. This means that we don't need - to special case all this stuff throughout ACE anymore. - - * ace/OS.h: Changed all the #defines for various SIG* so that they - are all 0. This way, we can ensure that the signal() functions - in ACE_OS can correctly ignore these signals. This should clean - up a ton of platform-dependent code throughout ACE. - - * apps/Gateway/Gateway/File_Parser.cpp (getint): Added a new - special-case check for the '*' character, which indicates "use - the default value for this field." - - * apps/Gateway/Gateway/Options: Added a new option to provide a - default max retry timeout. - - * tests/Reader_Writer_Test.cpp: Enhanced the test so that it - exercises the new "upgrade" feature of RW_Thread_Mutexes. - - * ace/{OS,Synch}: Added new methods, - ACE_OS::rw_trywrlock_upgrade() and - ACE_RW_Thread_Mutex::tryacquire_write_upgrade() that - conditionally upgrade a read lock to a write lock. This only - works if there are no other readers present, in which case the - method returns 0. Otherwise, the method returns -1 and sets - errno to EBUSY. Note that the caller of this method *must* - already possess this lock as a read lock. - - * apps/Gateway/{Gateway,Peer}/Makefile: Removed the $(VLIB) macro - so that we don't try to build the lib*.a files by default. - Thanks to David Levine for explaining this. - - * apps/Gateway/Gateway: Added new Options.{h,cpp} files and - rearranged the program to centralize all options processing in - an Options Singleton. - - * apps/Gateway/Peer/Options.cpp (parse_args): Changed the - connector and acceptor options to use a more generalizable - format. Now we can set the Consumer and Supplier port numbers - independently. - - * apps/Gateway/Gateway/Event.h: This is currently where the macros - from the following bullets have been moved, so they can be - shared by the Peer and Gateway components. - - * ace/OS.h: Moved the ACE_DEFAULT_{GATEWAY,PEER}_SERVER_PORT - macros into the Gateway application, where they belong. - - * apps/Gateway/Peer/Options.cpp (parse_args): Changed the option - to set the passive acceptor port from -p to -a. This is now - consistent with the option for active connector port number, - which is -c. - - * apps/Gateway/Gateway/Gateway.cpp (fini): Added a call to - ACE::remove_stdin_handler(), which removes the handler for - ACE_STDIN so the gatewayd will shutdown cleanly. - - * ace/ACE: Added a new method, remove_stdin_handler(), which is - the inverse of the register_stdin_handler() method. However, - I'm not sure how to make this work on NT! - - * examples/Reactor/Misc/notification.cpp: Removed some CHORUS-specific - code, which should be a no-op with our new signal() and sigaction() - scheme. - - * ace/OS.i: Enhanced the signal() and sigaction() wrappers so that - they simply ignore signums of 0. This means that we don't need - to special case all this stuff throughout ACE anymore. - - * ace/OS.h: Changed all the #defines for various SIG* so that they - are all 0. This way, we can ensure that the signal() functions - in ACE_OS can correctly ignore these signals. This should clean - up a ton of platform-dependent code throughout ACE. - - * apps/Gateway/Gateway/Gateway.cpp (init): Revised the code a bit - to factor out platform-dependent signal handling stuff in the - right place. - - * apps/Gateway/Gateway/gatewayd.cpp: Cleaned up the gatewayd main - program so that it reuses more ACE components and so that it is - more portable. - -Thu Jan 01 18:24:56 1998 Nanbor Wang - - * apps/Gateway/Gateway/Gateway.dsp: Added new file Options.cpp. - - * apps/Gateway/Gateway/Options.cpp (ACE_BUILD_SVC_DLL): Added - #define ACE_BUILD_SVC_DLL. - - * netsvcs/lib/Base_Optimizer.i: Removed this file. - - * netsvcs/lib/Base_Optimizer.h: Added codes to include in the - source file conditionally if needed. - - * netsvcs/lib/Base_Optimizer.cpp: Moved template implementation - from .i file. Removed ACE_INLINE keyword. - - * netsvcs/lib/Server_Logging_Handler.cpp: Added explicit template - instantiation macros. - -Thu Jan 01 17:13:06 1998 David L. Levine - - * apps/Gateway/Peer/Peer.cpp (Peer_Connector::open): added - return 0 statement at end. - - * apps/Gateway/Gateway/Options.cpp (Options ctor): reordered - initializers to match declaration order. - - * apps/Gateway/Gateway/Makefile: removed LOBJ and SHOBJ macros - because they're not needed. And, restored BUILD so that static - lib will be built if requested. - - * include/makeinclude/rules.lib.GNU: added OBJEXT macro, defaulted - to "o", and use it in VOBJS definition. - - * include/makeinclude/wrapper_macros.GNU: if building shared libs - only, set OBJEXT to "so" and VDIR to .shobj/, so that only shared - objects will be built. - - * apps/Gateway/Peer/Peer.cpp: added template instantiations. - - * netsvcs/lib/Base_Optimizer.*,Makefile: moved inline functions - to .i file and changed inline to ACE_INLINE. - - * netsvcs/lib/Server_Logging_Handler_T.{h,cpp}: don't use - Base_Optimizer with g++. Some versions of g++ 2.7.x have - trouble with its inline template member functions, especially - if __ACE_INLINE__ is disabled. - -Thu Jan 01 07:56:17 1998 Douglas C. Schmidt - - * ACE version 4.4.12, released Thu Jan 01 07:56:17 1998. - -Thu Jan 01 00:28:46 1998 Nanbor Wang - - * apps/Gateway/Peer/Peer.dsp: Added a new file "Options.cpp" into - this project. - - * tests/Env_Value_Test.cpp (main): Changed variable name: 'environ' - to 'envp'. Real OSes don't understand what the word means - and Access Violations will occur. - - * tests/run_tests.bat: Added Env_Value_Test. - - * tests/version_tests/version_tests.dsw: - * tests/tests.dsw: Added Env_Value_Test.dsp. - - * tests/version_tests/Env_Value_Test.dsp: - * tests/Env_Value_Test.dsp: New file. - -Thu Jan 1 00:00:00 1998 Douglas C. Schmidt - - * Happy New Year! Here's a thought for the new year, courtesy of - Sumedh: - - Nothing in the world is permanent, - and we're foolish when we ask anything to last; - but surely we're still more foolish - not to take delight in it while we have it. - - - W.Somerset Maugham (Razor's Edge) - -Wed Dec 31 19:10:59 1997 Douglas C. Schmidt - - * apps/Gateway/Peer/Peer: Added the hooks for making the Peer a - Connector, as well as an Acceptor. Now it's time to have some - fun. - - * apps/Gateway/Peer/peerd.cpp: Cleaned up the peerd main program - so that it reuses more ACE components and so that it is more - portable. - - * netsvcs/servers/main.cpp (main): Revised the code a bit to - factor out platform-dependent signal handling stuff in the right - place. - - * apps/Gateway/Peer: Factored out some common initialization code - to create an Options Singleton. Yowza! - - * apps/Gateway/README: Improved the documentation so that its - easier to tell what's supposed to happen and how to configure - the system. - - * apps/Gateway/Peer/Peer: Moved the Peer_Acceptor into the Peer.h - file and updated the documentation to clarify what's going on - better. - - * examples/Reactor/Dgram/: Enhanced the examples to make sure they - close() the dgram endpoint when the object is removed from the - Reactor. Thanks to Evgeny Beskrovny - for reporting this. - - * ace/Obstack.cpp: Fixed a stupid bug in the ACE_Obstack - constructor. Thanks to David Levine for reporting this. - - * ace/Local_Name_Space_T.h: Updated the documentation for class - ACE_Name_Space_Map to make it more clear. - -Wed Dec 31 21:21:50 1997 David L. Levine - - * examples/Reactor/Dgram/{CO,Dgram.cpp} (handle_close): added - ACE_UNUSED_ARG (handle). - - * tests/Env_Value_Test.cpp (main): removed unused arg argv and - local envargv. undef'ed ACE_HAS_NONSTATIC_OBJECT_MANAGER because - it can't deal with the three arguments to main (). - -Wed Dec 31 16:25:16 1997 Chris Cleeland - - * ace/Env_Value_T.*: Added a new template (ACE_Env_Value) which is - a typesafe encapsulation of environment variables with the - ability to provide a value to be used as a default if the - variable isn't set. An example of its use can be seen in the - corresponding test, tests/Env_Value_Test.cpp. Thanks to Carlos - O'Ryan for giving me the seed that started this. - - * tests/Env_Value_Test.cpp: Added test for the new template added - above. - - * tests/Makefile: Added new Env_Value_Test test to the Makefile. - - * ace/OS.{h,i} (strtod): Added new function for converting strings - to doubles. - -Tue Dec 30 22:07:44 1997 David L. Levine - - * ace/High_Res_Timer.cpp (elapsed_time): added a cast in - calculation of useconds to avoid MSVC++ warning about narrowing. - Thanks to Nanbor for reporting this. - - * ace/OS.i (gethrtime): commented out high-res tick counter on Linux - because it doesn't seem to work properly. Use ::gettimeofday () - instead. - - * tests/Basic_Types_Test.cpp (main): replaced #ifdef VXWORKS && ghs - with !ifdef ACE_HAS_WCHAR_TYPEDEFS_CHAR. - - * ace/Map_Manager.cpp (operator*): fixed typo in "ACE_Map_Entry". - - * ace/OS.h: added ACE_NSIG. In addition, I removed this: - - // Why is this defined? It must be a std C library symbol. - #if !defined (NSIG) - #define NSIG 0 - #endif /* NSIG */ - - We #define NSIG elsewhere on platforms (VxWorks, MVS) that need it. - #defining it to be 0 isn't good; it's better to catch the lack of - NSIG at compile time than at run time. - - * ace/{Log_Msg.cpp,OS.i,Select_Reactor.cpp,Signal.*,WFMO_Reactor.i}, - tests/Sigset_Ops_Test.cpp: replace NSIG with ACE_NSIG. - - * ace/Basic_Types.{h,i}: only use u_longlong_t on sun. Added - operator++ to ACE_U_LongLong, and tweaked calculation in operator/. - - * tests/Time_Value_Test.cpp (test_ace_u_longlong_): added test of - operator+, and one simple test of operator/. - - * ace/Filecache.h: removed extra , in enum ACE_Filecache_Flag definition. - -Tue Dec 30 20:32:03 1997 Nanbor Wang - - * ace/Map_Manager.{h,cpp}: Added STL-styled iterator function. - Changed the references to ACE_Map_Manager within interator - classes to pointers so we can check errors. - -Tue Dec 30 14:56:18 1997 Douglas C. Schmidt - - * ace/Obstack: Enhanced ACE_Obstack so that it can be given a - pointer to an allocator strategy. This allows users to take - complete control of where the memory comes from for the Obstack. - - * ace/Obstack: Changed the default value of "size" so that it is - (4096 - sizeof (ACE_Obstack)). - - * ace/Obstack: Added a new ACE_Obchunk constructor to simplify - some of the code. - -Mon Dec 29 20:21:32 1997 Steve Huston - - * include/makeinclude/rules.lib.GNU: Adjusted dependencies on building - a shared library to be on the object modules it will link in, not - necessarily $(VSJOBJ). - -Mon Dec 29 18:53:35 1997 James C Hu - - * ace/Filecache.h: Added an enum type, ACE_Filecache_Flag, which - gets passed into the ACE_Filecache_Handle constuctor to help - determine whether or not to use memory mapping (on Windows NT, - we sometimes do not want to memory map). - - * ace/Filecache.cpp: Required modifications to accomodate the - ACE_Filecache_Flag parameter. - -Mon Dec 29 15:37:24 1997 Nanbor Wang - - * ace/OS.i (event_timedwait): Added codes to guard against - negative wait time since we are passing an absolute time value - here, we may way past the target time when it gets called. - Thanks to Norbert Rapp for pointing - this. - -Mon Dec 29 13:57:43 1997 Carlos O'Ryan - - * ace/XtReactor.cpp: - Fixed syntax error, apparently some kind of typo. - - * ace/OS.h: - The ACE_*_cast() macros had (IMHO) surprizing priority, added - some parenthesis to make them behave as the new cast operators - are supposed to do. - -Mon Dec 29 08:59:28 1997 David L. Levine - - * ace/Basic_Types.h: Linux w/o glibc 2.0 doesn't have u_longlong_t, - so use "unsigned long long" for it. - - * ace/Task.cpp (activate): added ACE_UNUSED_ARG (thread_handles) on - non-threaded platforms. - - * ace/Thread_Manager.cpp (wait): added ACE_UNUSED_ARG - (abandon_detached_threads) on non-threaded platforms. - - * performance-tests/Misc/childbirth_time.cpp (prof_ace_os_thread): - added ACE_UNUSED_ARG (iteration) on non-threaded platforms. - - * performance-tests/Misc/preempt.cpp (main): added ACE_UNUSED_ARG - for argc and argv on non-threaded platforms. - - * include/makeinclude/platform_linux.GNU: enabled compiler warnings - by replacing -w with -Wall -Wpointer-arith in CFLAGS. - - * ace/ACE.cpp (count_interface,get_handle,get_ip_interfaces): use - same code for LynxOS as for __unix. - - * ace/OS.h: on LynxOS, redefine NSIG to be one greater than the - highest-numbered signal. LynxOS' signal.h #defines it to be - equal to the highest-numbered signal, 64. - -Mon Dec 29 08:35:17 1997 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: Removed the PRELIB - and PRELIB_USES_OBJ_ONLY stuff; merged in macros for building - on HP-UX 11.00. - * include/makeinclude/platform_hpux11_aCC.GNU - Removed this file. - The 10.x and 11.x builds are now both controlled by - platform_hpux_aCC.GNU. - -Sun Dec 28 10:50:54 1997 Douglas C. Schmidt - - * ACE version 4.4.11, released Sun Dec 28 10:50:54 1997. - -Sat Dec 27 18:03:52 1997 Nanbor Wang - - * ace/Log_Msg.cpp (dump): Sould test if we have a valid thr_desc - before dumping the information of it. Thanks to Luca Priorelli - for pointing this out. - -Sat Dec 27 16:13:59 1997 David L. Levine - - * ace/{OS.i,config-linux-common.h,README} (getrusage,{get,set}rlimit): - added ACE_HAS_RUSAGE_WHO_ENUM and ACE_HAS_RLIMIT_RESOURCE_ENUM - support. glibc 2.0 for Linux uses enums for the first arguments - to ::getrusage and ::{get,set}rlimit. - -Fri Dec 26 18:04:06 1997 - - * ace/Containers.h: Added iterator traits for following classes. - ACE_Unbounded_Set - ACE_Unbounded_Queue - ACE_Unbounded_Stack - ACE_Double_Linked_List - ACE_Fixed_Set - ACE_Bounded_Set - Thanks to for recommending this. - -Fri Dec 26 12:03:05 1997 David L. Levine - - * ace/config-osf1-4.0.h: added support for DCE threads, and merged in - config-osf1-4.0-g++.h. Thanks to Frederic Andres - for the DCE threads support #defines. - - * ace/config-osf1-4.0-g++.h: removed. All Digital Unix 4.0 configs - are now supported by config-osf1-4.0.h. - - * ace/platform_osf1_4.0.GNU: added comment on how to use DCE threads - instead of POSIX threads. - - * ace/OS.i (thr_{get,set}prio): don't apply the - !defined(ACE_LACKS_SETSCHED) test if ACE_HAS_DCETHREADS. - - * ace/OS.cpp (thr_create): added || ACE_HAS_DCETHREADS to - #ifndef ACE_LACKS_SETSCHED, so that priority is set with DCETHREADS. - - * ace/OS.cpp (sched_params): moved paren so that DCETHREADS block - will be executed even if ACE_LACKS_SETSCHED. - - * ace/Sched_Params.cpp ({next,previous)_priority): added - ACE_HAS_DCETHREADS check before !defined(ACE_LACKS_SETSCHED). - - * ace/OS.i (cond_timedwait): wrapped first arg to ACE_OSCALL in - parens because it confused cxx. - - * examples/System_V_IPC/SV_Message_Queues/{,T}MQ_Server.cpp: renamed - variable msgque because it conflicted with a symbol in the DEC cxx - w/DCE threads headers. - - * ACE-INSTALL.html: expanded discussion of gcc config.status file. - Thanks to Hans Rohnert for figuring - out the role of the config.status file. - -Fri Dec 26 06:44:25 1997 - - * ace/OS.h (ACE_OS::ace_flock_t): Added a new field "lockname_" to - remember the lock filename. - - * ace/OS.i (flock_init,flock_destroy): We need to remember the - name of the lock file when initializing the lock and unlink the - file when destroying the lock. - -Thu Dec 25 18:08:42 1997 Douglas C. Schmidt - - * ace/XtReactor.cpp: Removed g++ warning about initialization - order, enabled read/write masks for - ACE_Event_Handler::CONNECT_MASK; fixed typo that checks a write - mask, but sets a read mask; removed unused variable "zero." - Thanks to Eric Newton for these fixes. - -Thu Dec 25 17:17:16 1997 - - * ace/config-win32.h: * ace/config-win32-common.h: Added macro - definitions not to use C++-styled castings on Win32 by default - so that we don't depend on the RTTI support. - -Thu Dec 25 16:18:03 1997 - - * ace/SString.h (ACE_CString and ACE_WString): Added c_str() to - make it similar to STL's string class. - -Wed Dec 24 19:59:15 1997 David L. Levine - - * tests/IOStream_Test.cpp (client): changed stream error message - from "timeout" to "timed out", so that run_tests.check won't - complain about it. - -Wed Dec 24 18:37:49 1997 - - * ace/Synch.i (get_thread_id,get_nesting_level): Added ACE_INLINE. - -Wed Dec 24 18:31:31 1997 Douglas C. Schmidt - - * ACE version 4.4.10, released Wed Dec 24 18:31:31 1997. - -Wed Dec 24 14:27:33 1997 - - * ace/Synch.{h,i,cpp} (ACE_Recursive_Thread_Mutex): Changed - ACE_Recursive_Thread_Mutex to inherit from ACE_Thread_Mutex on - Win32 because ACE_Thread_Mutex is already recusive on Win32. - -Wed Dec 24 08:14:32 1997 David L. Levine - - * ace/Log_Msg.cpp (instance): without threads, dynamically create - the ACE_Log_Msg instance instead of using a static. Now, without - threads, the ACE library has no statics that require destruction - (at least on Solaris/g++ and Linux). And, all of the ACE tests - Purify cleanly. - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): wrapped - rethrow_w32_structural_exception () call with #ifdef ACE_WIN32. - It was eliminated by the ACE_SEH_EXCEPT macro on non-WIN32 - platforms, but some compilers (cxx) warned about the - unreachable code. This call is only supported on WIN32 anyways. - - * ace/OS.h: LynxOS has ACE_HAS_PTHREADS_1003_DOT_1C, but not - ACE_HAS_PTHREAD_SIGMASK. - - * tests/Time_Value_Test.cpp: only test ACE_U_LongLong on Solaris, - and other platforms with STHREADS. - -Wed Dec 24 04:25:49 1997 - - * ace/OS.i (sema_init): Added checking for initial semaphore - counts and set the semaphore to non-signaled state if the - initial count is zero. Changed the internal variable lock from - a mutex to a thread_mutex (Critical Section.) - -Tue Dec 23 21:06:14 1997 David L. Levine - - * ace/TLI_Stream.cpp (get_remote_addr): added ACE_UNUSED_ARG - for the arg if ! ACE_HAS_SVR4_TLI. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp (main): declare - local "i" outside the for loop because it is used after the loop. - -Tue Dec 23 19:34:10 1997 - - * ace/OS.i: Added comments for semaphore simulation. - -Tue Dec 23 19:33:59 1997 Douglas C. Schmidt - - * ACE version 4.4.9, released Tue Dec 23 19:33:59 1997. - -Tue Dec 23 19:05:32 1997 Douglas C. Schmidt - - * tests/IOStream_Test.cpp (server): Changed sleep(30) to - sleep(5). This seems more reasonable. Thanks to - James Johnson for this suggestion. - -Tue Dec 23 16:43:14 1997 Steve Huston - - * ace/README: Added descriptions for ACE_HAS_PTHREADS_1003_DOT_1C (this - was in use previously but not documented), ACE_HAS_XTI (new; XTI is - the POSIX superset of TLI - this implies ACE_HAS_TLI), - ACE_NEW_THROWS_EXCEPTIONS (new; the compiler throws bad_alloc if - a 'new' memory allocation fails). - - * ace/Hash_Map_Manager.cpp - Workaround for an aC++ bug in the HP-UX 11 - version of the compiler. - - * ace/INET_Addr.cpp: Note the failing host name in the error message - from ACE_INET_Addr::ACE_INET_Addr(u_short, const char []). - - * ace/OS.h: Changes made while porting to HP-UX 11: - - If ACE_HAS_PTHREADS_1003_DOT_1C (POSIX.1C), it implies (by - way of POSIX.1C) that these also be set: - ACE_HAS_PTHREAD_SIGMASK - ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - This is intended to make the process of configuring a new - new platform easier. - - If the new config macro ACE_NEW_THROWS_EXCEPTIONS is set, include - the file . The "proper" thing to do is to include - ; however, at least on HP-UX 11, this will cause - other things to get brought in, like , which will - screw up auto_ptr. The day that all this standard library and - STL stuff is finally straight, there will be dancing in the - streets... - - Support including the proper header file for XTI when it's - supposed to use rather than (POSIX specifies - XTI, a superset of TLI, to have ) - - If ACE_NEW_THROWS_EXCEPTIONS is set, the ACE_NEW and - ACE_NEW_RETURN macros handle the exception. - - * ace/OS.i: Fixed check for failure in ACE_OS::sema_init. - - * ace/config-hpux11.h: - * ace/config-hpux11-hpc++.h: New configs for HP-UX 11.00 - - * include/makeinclude/platform_hpux11_aCC.GNU: Platform macros for - HP-UX 11. It is set up for 32-bit build with comments for how to - do a 64-bit build. - - * examples/Makefile: Added Naming to the directory list to build. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp: Changed test from - ACE_HAS_SVR4_POLL to ACE_HAS_POLL. - - * examples/IPC_SAP/SOCK_SAP/C-inclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp: - * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp: Fixed a char * being - initialized by a string literal. - - * examples/Map_Manager/test_hash_map_manager.cpp: Added #include - "ace/SString.h" - - * examples/Mem_Map/IO-tests/test_io.cpp: Fixed a char * being - initialized by a string literal. Fixed diagnostic statements. - - * examples/Naming/test_multiple_contexts.cpp: - * examples/Naming/test_non_existent.cpp: - * examples/Naming/test_writers.cpp: Added Id line for CVS. - - * tests/Time_Value_Test.cpp: Added #include "test_config.h" - -Tue Dec 23 16:12:28 1997 - - * ace/OS.i: Must use ACE_OS::sema_wait instead of waiting on the - singling event when using simulated semaphores. - -Tue Dec 23 08:32:00 1997 Chris Gill - - * include/makeinclude/platform_sunos5_g++.GNU - Removed trailing spaces from CC and CXX macros - (the trailing space behind CXX was giving the TAO_IDL - make fits) - -Tue Dec 23 07:26:28 1997 David L. Levine - - * ace/TLI.cpp (get_local_addr): return -1, instead of 0, and - set errno (with ACE_NOTSUP_RETURN) if ! ACE_HAS_SVR4_TLI. - ({set,get}_option): added ACE_UNUSED_ARfor all - arguments if ! ACE_HAS_SVR4_TLI. - - * ace/TLI_Stream.cpp (get_remote_addr): return -1, instead of 0, - and set errno (with ACE_NOTSUP_RETURN) if ! ACE_HAS_SVR4_TLI. - Declare and set local "name" only if ACE_HAS_SVR4_TLI. - - * ace/TLI_Acceptor.cpp (handle_asynch_event): initialize local - "event" instead of defining it in the switch condition, to - avoid compiler warning about not using it. - - * examples/IPC_SAP/TLI_SAP/db-server.cpp (lookup_name): removed - unused local variable "len". - - * include/makeinclude/platform_osf1_4.0.GNU: removed some warning - suppressions that are no longer needed. - - * ace/Log_Msg.cpp (~ACE_Log_Msg): clean up the message queue and - allocated strings on non-threaded platforms. - - * tests/test_config.h (ACE_APPEND_LOG): added a close () of the - ace_file_stream before opening it. Forked children inherit the - opened file stream, and fail on their attempt to open it if it - is not explicitly closed. - -Mon Dec 22 22:42:57 1997 Douglas C. Schmidt - - * ace/OS: Added a few minor changes to Nanbor's Semaphore - emulation for WinCE. - -Mon Dec 22 11:39:19 1997 - - * OS.i (event_timedwait): Added code to handle timeouts. Thanks - to Luca Priorelli for reporting this. - -Mon Dec 22 07:03:13 1997 David L. Levine - - * ace/IOStream_Test.cpp (spawn): changed printout from - "Process_Mutex_Test-children" to "IOStream_Test-children". - -Mon Dec 22 03:08:22 1997 - - * ace/OS.i: Modified ACE_OS::cond_* for WinCE. - - * ace/config-win32-common.h: Prevent ACE from using NT specific - API on Win CE. - -Sun Dec 21 16:19:40 1997 Nanbor Wang - - * ace/OS.{h,i} (ACE_OS::sema_*): Added semaphore simulation code - for WinCE. This code is currently protected - ACE_USES_WINCE_SEMA_SIMULATION for debugging the code on NT. - This flag should soon be obsolete and changed to ACE_HAS_WINCE. - - Moved ACE_event_t macro definition for Win32 before ACE_sema_t - definition for NT. I need to use it in semaphore simulation. - - * ace/OS.h (class ACE_Cleanup_Info::operator ==, !=): Removed - keyword struct. ACE_Cleanup_Info is a class now. - - * ace/Containers.h (class ACE_Double_Linked_List): Removed - unused function declarations. - - * ace/Containers.h (class ACE_DNode): Removed ACE_DNode class. - -Sun Dec 21 18:47:09 1997 Douglas C. Schmidt - - * ACE version 4.4.8, released Sun Dec 21 18:47:09 1997. - -Sun Dec 21 12:39:38 1997 Douglas C. Schmidt - - * ace/OS.h (ACE_OS): Made the netdb_{acquire()/release()} methods - public to help ACE users stuck on weird OS platforms. Thanks to - Arturo Montes for this suggestion. - - * ace: Changed all ACE class documentation so that it puts the - =TITLE and =DESCRIPTION comments *after* the opening '{' rather - than before. I did this since (1) it makes emacs C++ mode - happier and (2) it makes Rational Rose reverse-engineering tool - happier too. Thanks to Thomas Jordan - for suggesting this. - - * ace/LOCK_SOCK_Acceptor.h: The accept() method of class - ACE_LOCK_SOCK_Acceptor is no longer a virtual. I don't know why - this was made virtual in the first place, but it was a mistake. - -Sun Dec 21 15:24:42 1997 Nanbor Wang - - * ace/OS.h (class ACE_Cleanup_Info::operator ==, !=): Removed - keyword struct. ACE_Cleanup_Info is a class now. - - * ace/Containers.h (class ACE_Double_Linked_List): Removed - unused function declarations. - - * ace/Containers.h (class ACE_DNode): Removed ACE_DNode class. - -Sat Dec 20 11:05:45 1997 Douglas C. Schmidt - - * tests/test_config.h (ACE_INIT_LOG): Added (%P|%t) to an - ACE_DEBUG statement to make it consistent. - - * tests/IOStream_Test.cpp (spawn): Revised the test so that it - prints data correctly to the child processes. - - * examples/Shared_Malloc/test_multiple_mallocs.cpp (main): Moved - the final print statement inside one of the if blocks so that it - appears only every second invocation to remind people to rerun - the program to remove the leaks. Thanks to Tom Arbuckle - for suggesting this. - - * ace/Malloc*: Changed ACE_MALLOC_STATS to ACE_HAS_MALLOC_STATS - since this is more consistent with ACE conventions. Also, - added ACE_HAS_MALLOC_STATS to the ace/README file. Thanks - to Tom Arbuckle for - suggesting this. - - * ace/Memory_Pool.cpp (ACE_Shared_Memory_Pool): Fixed the logic - for naming the backing store if the sscanf() call fails. Thanks - to Tom Arbuckle for - suggesting this. - -Sat Dec 20 15:39:00 1997 Nanbor Wang - - * tests/IOStream_Test.cpp (spawn): Changed ACE_LACKS_EXEC to - ACE_LACKS_FORK. - -Sat Dec 20 09:42:06 1997 David L. Levine - - * ace/OS.h: changed ACE_SEH_FINALLY to be if (1) on Unix, not - just pSOS. - -Fri Dec 19 23:20:42 1997 Nanbor Wang - - * tests/IOStream_Test.cpp (client): Removed an extra read. - - * ace/OS.h: ACE_SEH_FINALLY should always be executed on UNIX - platforms. - -Fri Dec 19 18:49:26 1997 Douglas C. Schmidt - - * ace/IOStream_T.i: Enhanced ACE_IOStream and its companions as - follows: - - - ACE_Streambuf_T<> now distinguishes recv() timeout failure from - a "real" stream failure - - - ACE_IOStream::eof() honors the streambuf's recv_timeout() value - and returns FALSE if the eof() check fails on timeout. - - - IOStream_Test.cpp tests the streambuf timeout via the stream eof() - and retrys if possible. - - Thanks to James Johnson for these fixes. - - * ace/Log_Record.i: Removed a no-op assignment to Time_Value - in the encode() method. Thanks to Patrick J. McNerthney - for reporting this. - - * ace/Log_Record.i: The time stamp put into the ACE_Log_Record - gets all messed up when the ACE_Log_Record is transmitted to the - Server_Logging_Handler and the client is run on a little-endian - architecture. This is because the ACE_Log_Record::encode method - does: - - this->time_stamp_ = ACE_Time_Value - - htonl (this->time_stamp_.sec ()), - htonl (this->time_stamp_.usec ())); - - When the ACE_Time_Value is passed in the resulting values from - "htonl", it calls "normalize" which totally messes with the - values passed. Thanks to Patrick J. McNerthney - for reporting this. - - * ace/OS.i: Fixed ctime_r() so that it doesn't crash if a NULL is - returned from ctime_r(). Thanks to Patrick J. McNerthney - for reporting this. - -Fri Dec 19 09:44:28 1997 David L. Levine - - * ace/OS.{h,i}: fixed sigwait for DEC cxx, yet again for cxx - V6.0-010. cxx #defines sigwait, and was getting confused - with ACE_OS::sigwait. I replaced Thilo's #undef sigwait, - and updated the ::sigwait declaration to what cxx uses internally. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp (server): cast arg - to long before casting to ACE_HANDLE, and removed function-style - cast. - -Fri Dec 19 00:39:40 1997 Douglas C. Schmidt - - * ACE version 4.4.7, released Fri Dec 19 00:39:40 1997. - -Thu Dec 18 19:47:47 1997 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP: Stripped the CPP-in{server,client}.cpp - tests down to their bare essence to only test the core features - of sockets. Thanks to Bryan and Brian for suggesting this. - - * ace/Message_Queue.cpp (ACE_Message_Queue_Iterator): Changed - queue to q to avoid clashes with STL. Thanks to Brian Mendel - for reporting this. - - * ace/OS.h: The server logging daemon is implemented using TCP/IP - under Win32. Therefore, we can simplify the creation of the - ACE_DEFAULT_LOGGER_KEY. Thanks to Patrick J. McNerthney - for reporting this problem. - -Thu Dec 18 22:35:45 1997 David L. Levine - - * ace/OS.h: fixed typo in end-of-comment marker. - - * ace/OS.h: on Digital Unix 4.0, only declare sigwait () with cxx, - not with g++. Thanks to Erik Margraf - for verifying this. - - * examples/IPC_SAP/SOCK_SAP/CPP-in{client,server}.cpp: tweaked - so that they build on VxWorks (spawn needs the (ACE_THR_FUNC) - cast), and without threads. - - * tests/run_tests.vxworks: updated VxWorks test status. - - * ace/Basic_Types.h: look for ULONGLONG_MAX, which Irix 6.x uses. - And, hard-code ACE_SIZEOF_LONG_DOUBLE to be 16 on __sgi, because - its float.h doesn't always allow us to distinguish them. - Thanks to Carlos for reporting these. - - * ace/High_Res_Timer.cpp,Profile_Timer.cpp: removed dependence - on ACE_U_LongLong. Thanks to Carlos for reporting this. - - * tests/Time_Value_Test.cpp: fixed #ifdefs so that ACE_ULongLong - isn't tested on Irix 6.x, etc. Thanks to Carlos for tripping - over this. - - * ace/IOStream_T.i (eof): made the return type, int, explicit. - - * ace/config-linux-common.h: started adding support for threads on - alpha (glibc). - -Thu Dec 18 21:17:46 1997 - - * ace/ace_dll.dsp: Added project files for Windows CE on SH3 - series CPU and x86 emulator. - - * ace/streams.h: - * ace/OS.h: Added Windows CE flags. - - * ace/OS.cpp (invoke): Added a dummy return to shut gcc up. - - * ace/OS.cpp (invoke): Added a dummy return to shut gcc up. - - * ace/OS.{h,cpp} (rethrow_w32_structural_exception): Added this - function, which prints out an error message to indicate the - occurance of structural exception and rethrow it again. - (ACE_Thread_Adapter::invoke): Rearranged try and except block - for Win32 and added a finally block so when a structural - exception occurs, a thread can clean it up properly, print out - an error message, and rethrow the exception again. - -Thu Dec 18 15:40:50 1997 James C Hu - - * ace/Filecache.{cpp,h}: - - debugged writing a file. - - can select if mapping is desired. - - * ace/OS.h: Added new #defines to facilitate forward declarations - of ACE_Export classes. - -Thu Dec 18 00:15:02 1997 Douglas C. Schmidt - - * ACE version 4.4.6, released Thu Dec 18 00:15:02 1997. - -Wed Dec 17 19:42:38 1997 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP: Enhanced the - CPP-{inserver,inclient}.cpp tests so that they will spawn - multiple client and server threads to perform the data transfer. - Thanks to Brian Mendel and Bryan Doerr for suggesting this. - - * ace/OS.i: Fixed some very subtle bugs with cond_signal() and - cond_broadcast(). Thanks to Patrick J. McNerthney - for reporting these and sending the fixes. - -Wed Dec 17 19:27:06 1997 Nanbor Wang - - * ACE-INSTALL.html (HREF): Added an advise not to use VC5.0 SP3. - - * examples/OS/Process/Makefile: Removed inclusion of - rules.lib.GNU. Thanks to Avi Nash for - noticing this. - -Tue Dec 16 22:09:42 1997 David L. Levine - - * tests/Time_Value_Test.cpp: restored #include test_config.h, - and changed #include ace/config.h to ace/inc_user_config.h. - - * examples/IPC_SAP/TLI_SAP/ftp-server.cpp, - examples/Reactor/Misc/test_timer_queue.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i, - examples/Shared_Malloc/test_malloc.cpp, - examples/Threads/thread_specific.cpp: replaced ACE_HAS_64BIT_LONGS - preprocessor logic with a cast through a long to an int. - A void * is the same size as a long on all currently supported - ACE platforms. The int cast is also there, to avoid compiler - warnings about narrowing. As a side effect, the function-style - casts were removed. - - * ace/config-osf1*.h,README: added comment stating that - ACE_HAS_64BIT_LONGS is deprecated. - - * ace/config-tandem.h: removed commented-out line that mentioned - ACE_HAS_64BIT_LONGS. - - * ace/OS.{h,i} (sigwait): removed DEC cxx version dependence. The - standard two-arg POSIX ::sigwait () seems to work just fine even - on older releases of Digital Unix 4.0, with the sigwait declaration - that we have in OS.h. Thanks to Erik Margraf - and Thilo - for helping to sort this out. - - I did change the ACE_OS::sigwait () return value determination - in OS.i. It now depends on whether or not POSIX ::sigwait () - returns 0, to agree with the documenation for POSIX sigwait. - Before, the code checked for a -1 return value from ::sigwait (). - -Tue Dec 16 21:00:49 1997 Chris Gill - - Single Threaded port of ACE to pSOSim - first checkin - - * psosim/Makefile: (new) make file for new psosim directory - - builds the configured simulator components - - * psosim/drv_conf.c: (new) board driver configuration code for - simulator - - * ace/sys_conf.h: (new) configuration settings for simulator, ACE - - * ace/config-psosim-g++.h: (new) config file for psosim w/ g++ - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: Added psos and psosim specific code - - * ace/Mem_Map.cpp: Removed function style casts which were killing - g++ - - * ace/Message_Block.cpp: Removed function style casts which were - killing g++ - - * ace/Containers.cpp: Removed function style casts which were - killing g++ - - * ace/Map_Manager.cpp: Removed function style casts which were - killing g++ - - * tests/Handle_Set_Test.cpp: Added PSOS #defines, alongside those - for VXWORKS - - * tests/SOCK_Connector_Test.cpp: Added PSOS #defines, alongside - those for VXWORKS - - * tests/Priority_Reactor_Test.cpp: Added PSOS #defines, alongside - those for VXWORKS - - * tests/MM_Shared_Memory_Test.cpp: Added PSOS #defines, alongside - those for VXWORKS - - * tests/Conn_Test.cpp: Added PSOS #defines, alongside those for - VXWORKS - - * tests/run_tests.psosim: (new) script to run only those tests - that are relevant to pSOSim, in its current single threaded - state - - * include/makeinclude/platform_psosim_g++.GNU (new) make macros - for pSOSim using g++ - - -Tue Dec 16 17:23:49 1997 Nanbor Wang - - * tests/Time_Value_Test.cpp: Removed inclusion of "ace/config.h". - - * ace/inc_user_config.h: Added this file to prevent multiple - inclusions of config.h file. Replace `#include "ace/config.h"' - with `#include "ace/inc_user_config.h"'. - - * ace/Log_Msg.cpp: - * ace/OS.h: - * ace/Trace.cpp: - * ace/streams.h: - * ace/iosfwd.h: Replace "config.h" with "inc_user_config.h". - -Tue Dec 16 08:30:41 1997 Douglas C. Schmidt - - * examples/IPC_SAP/FILE_SAP/client.cpp (main): Fixed "lines" to - "links." Thanks to Istvan Buki for reporting - this. - -Tue Dec 16 14:15:48 1997 - - * ace/OS.i (fstat): Fixed Dr. Schmidt's typo. - -Tue Dec 16 09:17:53 1997 David L. Levine - - * ace/Singleton.cpp (cleanup): set instance pointer to 0 after - deleting it. Thanks to Luca Priorelli - for suggesting this. - - * ace/Basic_Types.{h,i}: (ACE_U_LongLong): use ACE_UIN32 instead - of u_long for data members, to ensure that its sizeof is 8 bytes. - - * ace/OS.h: except on WIN32 and Solaris (ACE_HAS_HI_RES_TIMER), - always typedef ACE_hrtime_t to ACE_UINT64. This changes removes - the dependence on ACE_HAS_64BIT_LONGS. - - * ace/OS.cpp (ACE_TSS_Keys): replaced ACE_HAS_64BIT_LONGS - dependence with ACE_SIZEOF_LONG == 8, and similarly for - determination of 4-byte longs. - - * tests/TSS_Test.cpp (worker): replaced ACE_HAS_64BIT_LONGS - preprocessor logic with a cast of the void * argument to a long. - A void * is the same size as a long on all currently supported - ACE platforms. The int cast is also there, to avoid compiler - warnings about narrowing. - - * tests/Time_Value_Test.cpp: replaced use of ! ACE_HAS_64BIT_LONGS - with ACE_SIZEOF_LONG == 4. - -Mon Dec 15 22:47:24 1997 Douglas C. Schmidt - - * ACE version 4.4.5, released Mon Dec 15 22:47:24 1997. - -Mon Dec 15 20:17:10 1997 Douglas C. Schmidt - - * ace/OS.cpp: Fixed pread() and pwrite() so that they work - correctly even if we don't support threads. Thanks to Irfan for - finding this. - - * ace/OS.i: Tried to fix the fstat() wrapper on Win32 so that - it does the right think for HANDLES. Thanks to Lori Anderson - for pointing this out. - -Mon Dec 15 15:36:07 1997 Nanbor Wang - - * ace/Thread_Manager.cpp (exit,wait): Changed these two functions - more for Chorus. Thanks again to Wei Chian - for providing the patch. - -Mon Dec 15 06:42:42 1997 David L. Levine - - * ace/Log_Msg.cpp (instance): on non-threaded platforms, only - allocate a new ACE_Log_Msg_message_queue if the (static) pointer - is 0. Thanks to Stephen Coy for - reporting this. - - * ace/config-linux-common.h: updated header comments about - autosensing the platform capabilities. - - * tests/Process_Strategy_Test.cpp: (parse_args): added DEBUG - message if an unsupported concurreny strategy is provided with - a -c option. - -Mon Dec 15 01:12:33 1997 - - * ace/Synch_T.h (ACE_Atmoic_Op::value_i): Explicitly return - (by reference). This gives the user full, unrestricted - access to the underlying value. This method will usually be - used in conjunction with explicit access to the lock. Use with - care ;-) - -Sun Dec 14 21:37:08 1997 Douglas C. Schmidt - - * ace/OS.i (cond_wait,cond_timedwait): Fixed a missing return to - handle the case where we're using USYNC_PROCESS for the external - mutexes. - - * ace/OS: Made the use of the waiters_lock_ mutex consistent in - the ACE_cond_t implementation. This was broken since we used - the external_mutex to serialize access to the waiters_ count - inconsistently. Thanks to Patrick J. McNerthney - for reporting this very subtle bug. - -Sun Dec 14 12:29:26 1997 Nanbor Wang - - * ace/Thread_Manager.cpp (exit,wait): Disabled thread join - functionality in Chorus. Thanks to Wei Chiang - for providing the fix. - -Fri Dec 12 21:48:38 1997 Torbjorn Lindgren - - * ace/config-linux*.h: All Linux platform files except the - Linux-KCC modified to use the upgraded common Linux - configuration file. Linux-KCC looks reasonably easy to do, - if no-one that actually have KCC takes care of it I can do - this one later. - - * ace/config-linux-common.h: Modernized and updated the common - Linux configuration file to handle more of the common - configuration stuff. Also added the beginning of proper - glibc and egcs support for Linux. - -Sat Dec 13 14:22:28 1997 - - * ace/Basic_Types.h: Changed _M_IX386 to _M_IX86. - -Fri Dec 12 19:41:42 1997 - - * ace, tests, version_tests: Updated Win32 makefiles (VC4.2 and - VC5.0) to include new Basic_Types_Tests. - - * tests/Basic_Types_Test.cpp (main): Updated to use - ACE_OS::getpagesize(). - - * ace/ACE.cpp (round_to_pagesize): Updated to use - ACE_OS::getpagesize(). - - * ace/OS.i (getpagesize): Added this to ACE_OS. - -Fri Dec 12 07:49:01 1997 David L. Levine - - * ace/OS.i (inet_addr): changed type of "valid" from bool to u_int. - This code is only seen on VxWorks. - - * ace/IOStream.h (ACE_Quoted_String::operator <): changed return - type from bool to int. - - * ace/config-vxworks*.h,README: removed ACE_LACKS_SOCKET_BUFSIZ; - added ACE_DEFAULT_MAX_SOCKET_BUFSIZ of 32768. - - * examples/IPC_SAP/SOCK_SAP/C-in{client,server}.cpp: added - support to optionally set socket buffer sizes. - - * examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp: - removed unused constant SHMSZ. - - * examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp: removed - unused constant NO_OF_IO_HANDLERS. - - * ace/IOStream_T.h (ipfx,ipfx1): don't call setstate () on WIN32, - because MS VC++ 5.0 doesn't declare it. Thanks to Irfan for - reporting this. This "fix" is temporary, maybe, until we - figure out the proper fix. - - * ace/OS.h: cast the 1 in ACE_MSB_MASK to an fd_mask, to support - 64-bit fd_masks. I suspect that with this change, the - ACE_HAS_BROKEN_BITSHIFT used in config-tandem.h is no longer - necessary. - - Added Basic_Types: - * ace/Basic_Types.*,Makefile: Basic_Types defines the - following preprocessor macros: - - Sizes of built-in types: - ACE_SIZEOF_CHAR - ACE_SIZEOF_WCHAR - ACE_SIZEOF_SHORT - ACE_SIZEOF_INT - ACE_SIZEOF_LONG - ACE_SIZEOF_LONG_LONG - ACE_SIZEOF_VOID_P - ACE_SIZEOF_FLOAT - ACE_SIZEOF_DOUBLE - ACE_SIZEOF_LONG_DOUBLE - - Wrappers for built-in types of specific sizes: - ACE_INT16 - ACE_UINT16 - ACE_INT32 - ACE_UINT32 - ACE_UINT64 - (Note: ACE_INT64 is not defined, because there is no ACE_LongLong for - platforms that don't have a native 8-byte integer type.) - - Byte-order (endian-ness) determination: - ACE_BYTE_ORDER, to either ACE_BIG_ENDIAN or ACE_LITTLE_ENDIAN - ACE_BIG_ENDIAN or ACE_LITTLE_ENDIAN - - * ace/OS.*: moved ACE_U_LongLong to Basic_Types.*. - - * ace/OS.h: added #include . - - * ace/config-linux-common.h,README: added ACE_HAS_BYTESEX_H. - - * tests/Basic_Types_Test.cpp,run_tests.{bat,sh,vxworks),Makefile: - added new Basic_Types_Test. - - * tests/Time_Value_Test.cpp: removed ACE Version printout because - it is now in Basic_Types_Test. - -Fri Dec 12 03:00:21 1997 James C Hu - - * ace/config-sunos5.5-egcs-1.0.h: Fundamemntally identical to g++ - version, except added ACE_HAS_STDCPP_STL_INCLUDES, which is - taken to mean that the Standard C++ STL include files are - supported. - - * IOStream.h: Added #if's to handle the case where - ACE_HAS_STRING_CLASS, but if ACE_HAS_STDCPP_STL_INCLUDES, then - the string class is found in . Otherwise, it looks for - it in . - - * ace/OS.i: Re-implemented strcasecmp methods. Thought bad - implementations were related to a JAWS bug, but the hand - implementations are not used on Solaris. - -Thu Dec 11 23:20:57 1997 - - * ace/Strategies_T.cpp (activate_svc_handler): Changed the - parameter that was been passed into the open routine of - Svc_Handler. The that was passed to us is passed through - to open, rather than passing . Thanks to Mats Nilsson - for pointing this out. - - * ace/Connector.cpp (activate_svc_handler): Made sure that we pass - the connector pointer as the void* parameter to the svc_handler. - -Thu Dec 11 23:35:04 1997 Douglas C. Schmidt - - * ace/OS.i. The code was always calling dlsum for the _init() - hook, even if dlopen() failed. In addition to fixing this, I - also removed a potential handle leak. Thanks to Patrick - J. McNerthney for reporting this. - -Thu Dec 11 13:13:17 1997 David L. Levine - - * ace/LSOCK.cpp (recv_handle): fixed to remove compile errors and - warnings on platforms with both ACE_HAS_4_4BSD_SENDMSG_RECVMSG - and ACE_HAS_THREADS. The delta from version 4.3 of this file - is very small. Thanks to Kirill Rybaltchenko - for reporting this problem and - verifying the fix on LynxOS, the only affected platform. - - * ace/config-linux-kcc.h,include/makeinclude/platform_linux_kcc.GNU: - added linuxthreads support with the linux KAI C++ config. - Thanks to Ben Eng for the patches. - - * ace/IOStream_T.h: iostream fx emulation now skips whitespaces and - flushes when tied. Thanks to Ben Eng for the patch. - - * tests/IOStream_Test.cpp (server): check for double-quote instead - of newline as end-of-string character. Thanks to Ben Eng - for the patch. - - * tests/SV_Shared_Memory_Test.cpp: renamed "allocator" to - "myallocator" to avoid conflict with STL. Thanks to Ben Eng - for the patch. - - * include/makeinclude/platform_linux_lxpthread.GNU: protect - PRELIB definition with ifndef PRELIB, to allow overriding - without modifying the platform_macros.GNU file. Thanks to - James Johnson for this suggestion. - - * ace/IOStream_T.cpp: restored ACE_HAS_IOSTREAMH_INCLUSION - protection around the old g++ munch hack. There's no need - to trouble all (g++) platforms with its (4 byte) space penalty. - - * examples/IOStream/server/iostream_server.cpp (handle_input): - removed unused local "addr". - - * examples/Reactor/Dgram/{CODgram,Dgram}.cpp (run_test): added - return 0 at end so that the function always returns a value. - - * include/makeinclude/platform_lynxos.GNU: added comment indicator - to comment describing POSTLINK. - - * ACE-INSTALL.html: updated DEC CXX 6.0 test status: all tests pass - with the version of DIGITAL UNIX 4.0 and cxx 6.0 that we use. - -Wed Dec 10 23:57:00 1997 Chris Cleeland - - * ACE version 4.4.4, released Wed Dec 10 23:57:00 1997. - -Wed Dec 10 16:24:09 1997 - - * ace/Auto_Ptr.i: Apparently, the standard states that in order to - access members of a templated superclass from a templated - subclass, then the member name must be fully qualified. - Therefore, changed access to p_ to ACE_Auto_Basic_Ptr::p_. - Thanks to Stephen Coy for reporting this. - -Tue Dec 09 13:05:00 1997 - - * ace/Containers.cpp (copy_all_nodes): Added a temporary - ACE_Node pointer to get around the macro side effects. - -Sun Dec 7 10:20:46 1997 Douglas C. Schmidt - - * ace/Service_Config.cpp (parse_args): Added an appropriate macro - to switch from char * to UNICODE. Thanks to Timothy A. Brown - for reporting this. - - * ace/config-linux-*.h: Added ACE_HAS_GETRUSAGE_PROTO to all - the linux config files. Hopefully, this will help ACE to work - better with glibc. Thanks to Ernie Makris - and Torbjorn Lindgren for their help. - -Sat Dec 06 13:30:11 1997 Douglas C. Schmidt - - * ACE version 4.4.3, released Sat Dec 06 13:30:11 1997. - -Sat Dec 6 12:02:09 1997 Douglas C. Schmidt - - * examples/IOStream: Revised both the client and server to - demonstrate the ACE_IOStream functionality correctly. Also - added a README file explaining how to run the examples. Thanks - to James Johnson and Dustin Laurence - for suggesting this. - - * ace/IOStream_T: Added a new method eof() to the ACE_IOStream_T<> - class. This returns 1 if we've reached the end of the socket - stream, else 0. - -Fri Dec 5 16:58:29 1997 Douglas C. Schmidt - - * ace/Addr.h: Added a const ACE_Addr & instead of const ACE_Addr. - This will avoid an extra copy. Thanks to Irfan for noticing - this. - - * examples/Reactor/Dgram/CODgram.cpp: Also updated the CODgram - test to be just like the Dgram test. - - * examples/Reactor/Dgram/Dgram.cpp (main): Fixed a bug where it - was sending a huge buffer instead of just the string size. - Also, exit once we've finished the send. Finally, revised the - test so that it is easier to understand and so that it exits - properly. Thanks to Michael Hoffman - for reporting - this. - -Fri Dec 05 13:20:09 1997 David L. Levine - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: added OFLAGS. - Thanks to Brian Mendel for suggesting these. - - * tests/IOStream_Test.cpp: updated to work with the standard C++ - library version of iostreams. That primarily involved not - using operator>>(char& c) and operator>>(char* c) for C strings. - Thanks to Ben Eng for the patch. - - * ace/OS.{h,i},config-osf1-4.0.h: fixed sigwait on DEC CXX 6.0/ - recent DEC UNIX 4.0. The fix keys off the compiler version, - though it probably should depend on the OS. It adds a - sigwait declaration, which is a current signal.h deficiency. - With this change, ACE builds and tests cleanly on DEC UNIX. - - * ace/config-vxworks5.x-g++.h: restored comment that explains - ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. - - * netsvcs/lib/Makefile: the first line of the Local Target - (Server_Logging_Handler.*) override mysteriously disappeared, again. - -Fri Dec 5 12:15:49 1997 Chris Cleeland - - * ace/Select_Reactor.cpp: Made error messages on open failure more - verbose. Having these in place straightaway would have helped - track down some problems at Boeing much more effectively. - -Fri Dec 5 11:15:17 1997 Nanbor Wang - - * ace/Log_Msg.h (callers.): Added documentation for %I and %D - flags. Thanks to John Morey for reosting - this. - - * ace/Dynamic.h: - * ace/CORBA_Ref.h: - * ace/Token_Invariants.h: - * ace/Token_Collection.h: - * ace/Local_Tokens.h: - * ace/Remote_Name_Space.h: - * ace/Registry_Name_Space.h: - * ace/Strategies.h: - * ace/Name_Space.h: - * ace/Name_Request_Reply.h: - * ace/Naming_Context.h: - * ace/Name_Proxy.h: - * ace/Local_Name_Space.h: - * ace/Local_Name_Space_T.h: Corrected erroneous comments. These - files all contain incorrect filename info in the preambles which - make erroneous auto-generated man pages. - -Fri Dec 05 00:00:53 1997 - - * ace/OS.h: If the user wants minimum IOStream inclusion, i.e., - they have defined ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION, we will - just include the forward declarations, i.e., ace/iosfwd.h. Else - they will get all the stream header files, i.e., ace/streams.h. - The positive thing about this change is that if your code was - using stream classes and you were depending on OS.h to provide - you the stream header files, you will not have to change your - code, unless you have defined - ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. Thanks to Dr. Schmidt for - suggesting this and thanks to David Levine for suggesting it to - Dr. Schmidt ;-). - - * ace/config-vxworks5.x-g++.h: Restored - ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. - - * ace/Asynch_IO.cpp (open): Fixed typo. - -Thu Dec 04 21:20:47 1997 Douglas C. Schmidt - - * ACE version 4.4.2, released Thu Dec 04 21:20:47 1997. - -Thu Dec 4 19:45:04 1997 Douglas C. Schmidt - - * ace/Object_Manager.cpp (ACE_Object_Manager_Destroyer): Fixed a - bug in the - ACE_Object_Manager_Destroyer::~ACE_Object_Manager_Destroyer - thread comparison routine. Thanks to Steven Coy for this. Also - renamed _saved_main_thread_id to saved_main_thread_id_, which is - proper ACE style. - - * Updated the ACE-INSTALL.html file to explain why you don't need - to build everything all the time. Thanks to Dustin Laurence - for suggesting this. - - * tests/SOCK_Connector_Test.cpp (fail_no_listener_nonblocking): - Added a check for ENETUNREACH. Thanks to Dustin Laurence - for reporting this. - - * ace/Asynch_Acceptor.cpp (open): Changed the local variable named - sap_any to sa to avoid conflicts with the new sap_any macro. - - * ace/Asynch_IO: Made the ACE_Service_Hanlder::open() method - non-virtual to work around bugs with Borland C++. Thanks to - Valik Solorzano Barboza for suggesting this. - - * ace/ACE.cpp (COMPUTE): Put parens around elements the COMPUTE - macros so that it will work on Borland C++. Thanks to Valik - Solorzano Barboza for suggesting this. - - * ace/config-win32-common.h: Added ACE_HAS_BROKEN_SAP_ANY to deal - with Borland C++ bugs. Thanks to Valik Solorzano Barboza - for suggesting this. - - * ace/Addr: Added a workaround for the Borland C++ problems. This - introduces a new global macro called sap_any. However, this is - only used for Borland, so it should be ok. Thanks to Valik - Solorzano Barboza for suggesting this. - - * ace/LSOCK.cpp (recv_handle): Make the code smarter if we've got - both STREAMS and 4_4BSD_SENDMSG_RECVMSG. - - * Reran "make depend" over all of ACE. - - * netsvcs/clients/Logger/indirect_logging.cpp (main): Changed - LOGGING to LOGGER. Thanks to Irfan for noticing this. - - * netsvcs/lib/Client_Logging_Handler: Changed "rendezvous" to - "logger." - - * netsvcs/clients/Logger/indirect_logging.cpp, - netsvcs/lib/Client_Logging_Handler: Changed DEFAULT_RENDEZVOUS - to DEFAULT_LOGGER_KEY. Thanks to Steven Coy for pointing out - this inconsistency. - - * ace/OS.h: Renamed ACE_LOGGER_KEY to ACE_DEFAULT_LOGGER_KEY to - make it consistent with other ACE_DEFAULT_* names. - - * ace/OS.h: Changed the definition for ACE_LOGGER_KEY so that it - defaults to "localhost:10015" on platforms that don't support - ACE STREAM Pipes. Thanks to Steven Coy for suggesting this. - - * ace/Service_Config.cpp: Added the -k option to parse_args() so - that the user can set the logger key. Thanks to Steven Coy for - suggesting this. - - * ace/Service_Config: Added the logger_key as a parameter to the - other open() method, as well. Thanks to Steve Coy for being - picky ;-). - - * netsvcs/clients/Logger/direct_logging.cpp (main): Modified the - code to use the new framing scheme. - - * netsvcs/lib/Server_Logging_Handler_T.cpp - (handle_logging_record): Updated the code to take advantage of - our new framing scheme. - - * netsvcs/lib/Client_Logging_Handler.cpp (send): We can be smarter - now about sending the ACE_Log_Record across the network since - the length field is now fixed and it's guaranteed to be in the - first 4 bytes. Thanks to Steve Coy for suggesting this. - - * ace/Log_Record.h (ACE_Log_Record): Replaced the horribly - non-portable "long length_" field with the "ACE_INT32 length_" - field, which is nice because it is portable across platforms - with different long-word sizes. - -Thu Dec 04 09:57:40 1997 David L. Levine - - * include/makeinclude/platform_osf1_4.GNU: allow enabling of - WARNING_FLAGS by setting CXX_VER to POST_5X. Thanks to - James Johnson for this suggestion. - - * ace/Svc_Conf_l.cpp: rebuilt with Doug's flex. - -Thu Dec 04 03:46:04 1997 - - * ace/Makefile (Svc_Conf_l.cpp): Changed the sed macros to produce - OS.h include instead of stdcpp.h. - - * ace/Svc_Conf_l.cpp: Updated after code was regenerated using the - new sed changes in the Makefiles. Currently there are two - inclusions of OS.h in this file and an extra stdlib.h. Maybe - someone more experienced in sed can take these out by updating - the Makefile. - - * ace/IOStream_T.h (stdcpp.h): Removed inclusion of stdcpp.h. It - is redundant because IOStream.h includes it. - - * ace/streams.h: New file. This files tries to reduce the - differences between the old and new stream libraries for the - user. This is done by automatically selecting the correct - includes depending on the ACE_HAS_STANDARD_CPP_LIBRARY variable. - This file also helps out by making commonly used classes (e.g., - ios, ostream, iostream, cin, cout, etc) available in the global - name space when used with the Standard C++ Library. Use this - file where you would usually include or . - - * ace/iosfwd.h: New file. This files deals with forward - declaration for the stream classes. Remember that since the new - Standard C++ Library uses templates for the implementation of - the streams, simple forward declaration will not work. Classes - forward declared by this class include: - - ios - streambuf - istream - ostream - iostream - filebuf - ifstream - ofstream - fstream - - Use this file where you would usually forward declare the - classes listed above. - - * ace/stdcpp.h: Removed this file from the repository. This file - was trying to do too much. All the inclusion of the C Library - headers were unnecessary. This is because the new C++ standard - preserves the old C library include files. The functions from - those files will still be in the global namescape. The new - header files (e.g., cstdio), provides the same prototypes as the - old files (e.g., stdio.h), except that all prototypes are in the - std namespace. Since we want the old behavior and global - prototypes (for backward compatibility), inclusion of the new - header files was incorrect. - - stdcpp.h was included by OS.h. This caused almost all files to - force the inclusion of the stream header files. This was - changed so that OS.h only includes the ace/iosfwd.h file. This - means that if your code was using stream classes and you were - depending on OS.h to provide you the stream header files, you - will have to change your code to either include iostream.h or - iostream, or more portably ace/streams.h. - - * ace/OS.h: Removed stdcpp.h. Moved the standard C library - includes from stdcpp.h to OS.h. Also added ace/iosfwd.h to give - forward declaration for the stream classes. - - * ACE: Added explicit inclusion of ace/streams.h to the following - files: - - ace/IOStream.cpp - ace/Log_Record.cpp - ace/OS.cpp - ace/SString.cpp - ace/Log_Msg.cpp - tests/test_config.h - examples/Log_Msg/test_log_msg.cpp - examples/Reactor/Misc/test_time_value.cpp - examples/Threads/task_three.cpp - netsvcs/lib/Logging_Strategy.cpp - examples/Logger/Acceptor-server/server_loggerd.cpp - examples/ASX/UPIPE_Event_Server/event_server.cpp - examples/Reactor/Ntalker/ntalker.cpp - examples/Shared_Malloc/test_persistence.cpp - examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp - examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp - examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp - examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp - - * Updated makefile dependencies throughout ACE to reflect the - removal of stdcpp.h and the addition of streams.h. - - * examples/Threads/barrier2.cpp: Removed inclusion of stdcpp.h. - - * ace/IOStream_T.cpp: Reorganized include files so that inclusion - of config.h is not necessary. - - * ace/IOStream.cpp: Changed inclusion of config.h to OS.h. - - * ace: Removed config.h from the following files. It was - redundant. - - Timer_Hash.cpp - Timer_Heap.cpp - Timer_List.cpp - Timer_Queue.cpp - Timer_Wheel.cpp - - * ace: Added code to protect against multiple inclusions of - config.h. Following files were effected: - - Trace.cpp - Log_Msg.cpp - - * ace/config-win32-common.h: Removed redundant definitions of - ACE_HAS_TYPENAME_KEYWORD and ACE_HAS_SIG_ATOMIC_T. Thanks to - Matthias Kerkhoff for pointing this out. - -Wed Dec 3 21:37:47 1997 Douglas C. Schmidt - - * Added the new ACE-inheritance.ps and pdf files, which show the - class structure of ACE. Thanks to John Lindal - for generating this. - - * ace/Service_Config: Removed the static logger_key_ member and - replaced it with a (defaulted) parameter to open(). This is - more flexible. Thanks to Steve Coy for the suggestion. - - * ace/Service_Config.h: Addressed all the "@@" questions. - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (main): Fixed a - subtle bug in the "quit" logic. Thanks to Michael Hoffman - for reporting - this. - - * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record), - netsvcs/lib/Client_Logging_Handler.cpp (send): - Changed the code so that we now always send ACE_UINT32 bytes - worth of data for the length field. This ensures we're portable - across platforms. Thanks to Steven Coy for noticing this. - -Wed Dec 03 18:02:09 1997 - - * performance-tests/Synch-Benchmarks/Benchmark.cpp: Added template - instantiations for Atomic_Op. - -Wed Dec 3 10:29:58 1997 Carlos O'Ryan - - * ace/ACE.cpp: - Use ACE_UINT32 to compute the 32-bit CRC, on Alphas (and - probably other 64 bit machines) u_long seems to be longer than - that. - -Wed Dec 03 07:39:15 1997 Steve Huston - - * include/makeinclude/platform_hpux.GNU: - * include/makeinclude/platform_hpux_gcc.GNU: Moved some compile options - from the DCFLAGS to the CCFLAGS to compile correctly with or without - debugging. - -Wed Dec 03 06:26:14 1997 David L. Levine - - * ace/Future.cpp, - tests/{Future_Test,Reactors_Test,Reader_Writer_Test.cpp, - examples/Threads/manual_event.cpp: - moved ACE_Atomic_Op instantiation from - ace/Future.cpp to where it is used. - - * ace/OS.cpp (inet_aton): return 0 if addr argument is 0. Thanks - to Wei for reporting this. - - * ace/config-linux.common.h: set an ACE_DEFAULT_BASE_ADDR, on Alpha - for now. This might be necessary on Intel as well. - - * ace/OS.{h,i}, config-osf1-4.0.h: fixed use of ::sigwait with - DIGITAL_UNIX's cxx 6.0, which now uses ACE_HAS_ONEARG_SIGWAIT. - Also, added an ACE_DEFAULT_BASE_ADDR to the config file. - - * tests/{Priority_Reactor_Test,Reactor_Performance_Test}.cpp: - instantiate ACE_Map_*, for use by ACE_Connector, with ACE_HANDLE - instead of int. That's the way it's declared in ace/Connector.h. - -Wed Dec 03 00:17:50 1997 - - * tests/test_config.h: Removed code for - ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION, as this option is no longer - necessary. - - * ace/stdcpp.h: Removed code for - ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION, as this option is no longer - necessary. - - * ace/config-vxworks5.x-g++.h: Removed - ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. This flag is no longer - required. - - * ace/IOStream_T.cpp: Removed ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION - from #if defined. - - * ACE: Removed the explicit iostream.h inclusion from these: - - examples/ASX/UPIPE_Event_Server/event_server.cpp - examples/Log_Msg/test_log_msg.cpp - examples/Logger/Acceptor-server/server_loggerd.cpp - examples/Reactor/Misc/test_time_value.cpp - examples/Shared_Malloc/test_persistence.cpp - examples/Threads/task_three.cpp - netsvcs/lib/Logging_Strategy.cpp - - * ace/IOStream.h: Darrell missed removing this explicit iostream.h - inclusion. - - * ace/Future.cpp: Removed template instantiation of Atomic_Op - since Atomic_Op is not used by Future. - -Fri Dec 02 11:46:17 1997 - - * ace/Proactor.cpp (ACE_Proactor): Reenabled Proactor's thread - manager to wait on its Timer_Handler thread. - - * ace/Thread_Manager.cpp (close_singleton): Removed Win32 specific - codes. This is no longer necessary with above changes. - (wait): Close down thread handles when removing detached - threads. Avoid performing wait when the program is shutting - down. - (remove_thr_all): Extracted out this protected member function. - (close): Changed to use the new remove_thr_all function. - - * ace/Proactor.cpp (handle_events): Changed the magic number 258 - to WAIT_TIMEOUT. Thanks to Mark Rabotnikov - for pointing this out. - -Tue Dec 02 14:13:15 1997 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: Moved some compile options - from the DCFLAGS to the CCFLAGS to compile correctly with or without - debugging. Thanks to Istvan Buki for reporting - the problem. - -Tue Dec 02 06:16:39 1997 David L. Levine - - * ace/Object_Manager.cpp (~ACE_Object_Manager_Destroyer): don't - delete the ACE_Object_Manager if not destroyed by the main - thread. That can cause problems, at least on WIN32. And - it should only happen under exceptional conditions, at least - on WIN32. Thanks to Ari Erev and - John Neystadt for suggesting this. - - * ace/IOStream.cpp (underflow,overflow): moved get_mode_ and - put_mode_ accesses so that it now works on KAI C++. - Thanks to Ben Eng for the patch. - - * ace/config-linux-kcc.h: commented out ACE_TEMPLATES_REQUIRE_SOURCE. - Thanks to Ben Eng for this update. - - * ace/Profile_Timer.cpp (elapsed_time): changed - ACE_ONE_SECOND_IN_USECS to ACE_ONE_SECOND_IN_NSECS. Thanks - to Wei for noticing this. - - * ace/OS.cpp (inet_aton): removed CHORUS specialization. - Thanks to Wei for reporting this. - - * include/makeinclude/platform_chorus.GNU: added CHORUS = 1, - for use by individual Makefiles. - - * examples/Shared_Malloc/test_persistence.cpp: removed - ACE_Malloc - instantiation because it's in ace/System_Time.cpp. - - * ace/config-lynxos.h: removed ACE_HAS_UALARM, because LynxOS - apparently doesn't. - - * include/makeinclude/platform_lynxos.GNU: added -Winline and - removed -fno-strict-prototypes. - - * tests/Message_Queue_Test.cpp (main): increased queue size from - default of 16Kb to 32Kb, so that it runs on machines with 8Kb - pagesizes. And, added a check to see if the queue is full - before enqueuing. - - * ace/OS.i, config-osf1-4.0.h: DECXX 6009006 has SIGWAIT. - - * ACE-INSTALL.html: updated DEC_UNIX test status. Message_Queue_Test - and all of the Mutex_Tests now pass. Conn_Test no longer does. - -Tue Dec 02 00:18:04 1997 - - * ace/Memory_Pool.cpp (handle_signal): If guess_on_fault_ is true, - then we cannot call remap(0). This will always put the address - out of range. Therefore, we will shoot in the dark (user has - instructed us to do so as guess_on_fault_ is true) and try to - remap the file. If the user does not want this behavior, the - guess_on_fault_ flag should be turned off. Thanks to Jon - Prettyman for pointing this out. - -Mon Dec 01 16:13:06 1997 - - * ace/config-win32-common.h: Added back ACE_LACKS_ACE_IOSTREAM to - the config file. The test is not compiling. - - * tests/run_tests.bat: Look for "Win32 structured exception" in - the log files. - -Mon Dec 1 14:01:02 1997 Darrell Brunsch - - * ace/Log_Msg.cpp, ace/Log_Msg.h, ace/Log_Record.cpp, - ace/Log_Record.h ace/OS.h, ace/stdcpp.h, tests/test_config.h: - - Changed use of ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION in stdcpp.h - to include iostream when the above is #defined. Made - changes to other files to accommodate this change. - -Mon Dec 01 12:15:00 1997 - - * ace/config-win32-common.h (ACE_LACKS_ACE_IOSTREAM): James CE - Johnson claims that ACE_LACKS_ACE_IOSTREAM is no longer not - necessary when using the ACE_HAS_STANDARD_CPP_LIBRARY. - - * ace/OS.h: Changed the definition of ACE_UNIMPLEMENTED_FUNC so - that it just evaporates on platform that have - ACE_REQUIRES_FUNC_DEFINITIONS defined. - - ACE_UNIMPLEMENTED_FUNC is only required for template classes and - not for a normal class. When the template is explicitly - instantiated, it causes some compilers to look for the - definition of all the declared methods. - - On platforms that have this behavior, we have decided to take - out the declaration of this function. This is necessary since - an empty definition of {} usually does not work with some - constructors. And by providing a explicit definition of this - function, will cause all platforms to suffer. - - Therefore, platforms with ACE_REQUIRES_FUNC_DEFINITIONS defined - must be specially careful when using this. - -Mon Dec 01 07:56:02 1997 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++.GNU: added - -xildoff to LDFLAGS, to avoid occasional problems with - the incremental linker. Thanks to Hans Rohnert - for this suggestion. - - * include/makeinclude/platform_vxworks5.x_g++.GNU, - etc/ace_ld, bin/ace_ld, ACE-INSTALL.html: - moved ace_ld from etc/ to bin/. - - * Makefile: added etc/ to CLONE and RELEASE_FILES. - - * include/makeinclude/platform_lynxos.GNU: added -Wall to CFLAGS. - - * ace/ACE.cpp (set_handle_limit): only call setrlimit if - RLIMIT_NOFILE is #defined. - - * ace/OS.h: removed ACE_HAS_STDARG_THR_DEST dependence for - ACE_THR_DEST definition. - - * ace/OS.cpp (thr_keycreate): with ACE_HAS_DCETHREADS only, cast - dest argument to ::pthread_keycreate if ACE_HAS_STDARG_THR_DEST. - - * ace/OS.i (get{host,proto,serv}by{addr,name}_r): with - ACE_HAS_NONCONST_GETBY only, added some ACE_UNUSED_ARGS. - - * examples/Shared_Malloc/Malloc.cpp: removed - ACE_Guard instantiation because it's in - ace/Synch.cpp. - - * ace/config-lynxos.h: added ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS. - Without it, the Thread_Manager went recursively ballistic. - - * performance-tests/Misc/preempt.cpp (main): fixed printout if - ACE_OS::sched_params () call failed. - -Sun Nov 30 22:44:50 1997 Douglas C. Schmidt - - * ACE version 4.4.1, released Sun Nov 30 22:44:50 1997. - -Sun Nov 30 20:32:50 1997 David L. Levine - - * include/makeinclude/platform_osf1_3.2.GNU: removed -ptr option - from CCFLAGS, so the default template repository will be used. - Thanks to Dani Flexer for reporting this. - - * ace/Svc_Conf_l.cpp,Makefile: - 1) #include ace/stdcpp.h instead of stdio.h so that anything - that needs to be #included with/before stdio.h can be. - 2) Changed ECHO to ACE_SVC_CONF_ECHO to avoid compiler warning if - ECHO was #defined to be a constant. - - * ace/Makefile: set ACELIB to null so that it can be used to build - shared libs, including libACE.$(SOEXT). - - * include/makeinclude/platform_osf1_4.0.GNU: added $(ACELIB) to - SOFLAGS to avoid shared lib build warnings about undefined ACE - symbols. - - * ace/Thread_Manager.h: declare ACE_THR_MEMBER_FUNC outside of - ACE_Thread_Manager class with __GNUG__ instead of with - VXWORKS || IRIX5. The problem is with older versions of g++, - not with the OS. - -Sun Nov 30 14:13:09 1997 Douglas C. Schmidt - - * netsvcs/servers/README: Clarified a bit more about how to - configure the client and server logging processes. Thanks to - Neil Cohen for motivating this. - -Sun Nov 30 17:36:35 1997 Sergio Flores - - * ace/Synch.cpp (ACE_File_Lock): Fixed order of parameters in the - call to this->open() and too many arguments in call to - ACE_File_Lock::open(). - -Sun Nov 30 16:31:41 1997 Carlos O'Ryan - - * ace/Synch.h: - * ace/Synch.cpp: - ACE_File_Lock should create the file if it does not exist, to do - so the constructor takes the parameter to ACE_OS::open() - and defaults to O_CREAT|O_RDWR. - -Sat Nov 29 21:31:07 1997 Nanbor Wang - - * ace/Proactor.cpp (~ACE_Proactor_Timer_Handler): Removed explicit - call to thr_mgr_.close(). - (ACE_Proactor): Be sure to ask Thread_Manager not to wait for - the timer_handler_ thread. - - * ace/Thread_Manager.cpp (close_singleton): Only reset - exit_on_wait status if we are responsible for deleting the - global thread manager. - -Sat Nov 29 15:15:04 1997 Carlos O'Ryan - - * ace/IPC_SAP.cpp: - Removed warning for functions not returning a value on SGI, it - seems that the flow changed and the last return was reached - sometimes, hence the ACE_NOTREACHED macro is no longer needed. - -Sat Nov 29 13:12:47 1997 Douglas C. Schmidt - - * ace/Synch: Conditionally inlined all the ACE_Process_Mutex - wrapper calls and moved them into the Synch.i file. I'm not - sure why there weren't here before. - - * ace/Synch: Reimplemented ACE_RW_Process_Mutex to use - ACE_File_Lock, which provides the proper readers/writer - semantics that had been lacking in the previous implementation. - -Fri Nov 28 04:25:23 1997 Nanbor Wang - - * ace: Removed redundant trailing commas from - ACE_UNIMPLEMENTED_FUNC. - - * ace/Thread_Manager.{h,i,cpp}: Delete declaration of - remove_thr_self. It is no longer in use. - (wait_on_exit): Added this function to let users specify whether - they want their Thread_Manager wait for spawned threads on exit - or not. - (wait): On Win32, handles should be closed if we decide to let - the thread go wild. - (remove_thr): Added another parameter to control whether - remove_thr should close the handle or not. It is only used on - Win32. - (close): Removed the parameter for it has been - incoporated as a member. - (close_singleton): Reset on Win32. We'll never - need to wait for unfinished threads on NT. - (ACE_Thread_Manager): Added initialization of member - . It is default to 1 (wait on exit.) - - * ace/Containers.h: Corrected erroneous comments. - -Wed Nov 26 10:33:22 1997 - - * ace/Log_Msg (msg): Changed the parameters from char * to const - char *. - - * ace: Added unimplemented copy constructors and assignment - operators to the following classes: - - ACE_Map_Manager - ACE_Message_Block - ACE_Data_Block - ACE_Log_Msg - ACE_Message_Queue - ACE_Task - ACE_Task_Base - - Added ACE_UNIMPLEMENTED_FUNC macros to these classes: - - ACE_Mem_Map - ACE_Priority_Reactor - ACE_Select_Reactor - ACE_WFMO_Reactor - ACE_XtReactor - ACE_Reactor - ACE_Read_Buffer - ACE_CORBA_Handler - ACE_TSS_TPQ_Entry - ACE_Object_Manager - ACE_File_Lock - ACE_Semaphore - ACE_RW_Mutex - ACE_Mutex - ACE_Null_Barrier - ACE_Null_Condition - ACE_Null_Mutex_Guard - ACE_Event - ACE_Thread_Mutex - ACE_Thread_Mutex_Guard - ACE_Condition_Thread_Mutex - ACE_Recursive_Thread_Mutex - ACE_Barrier - ACE_Condition - - Thanks to Stanley D Leeson for these - suggestions. - -Sat Dec 20 14:57:30 1997 - - * All MSVC 5.0 project files: Removed unnecessary library - inclusions. Most of them are not necessary. Thanks to - Patrick J. McNerthney for suggesting - this. - -Wed Nov 26 15:49:14 1997 David L. Levine - - * ace/IOStream_T.i (recv) affects WIN32 only: fixed typo, - ACE_BIT_ENABLED instead of ACE_BIT_ENTABLED IOStream_T.i. - Thanks to James CE Johnson for reporting this. - - * include/makeinclude/platform_lynxos.GNU: added information - on necessary OS patches. - -Wed Nov 26 09:45:43 1997 Chris Cleeland - - * ace/OS.h (ACE_PROPER_SINGLETON_INSTANTIATION): Corrected - misspelling in the "! defined (MSC_VER)" branch. I just happened - to notice this, so I don't know if anybody ever tried it and it - failed. - -Tue Nov 25 12:07:07 1997 David L. Levine - - * include/makeinclude/platform_osf1_3.2.GNU: updated for - OSF/1 3.2g/CXX 5.7. Thanks to Dani Flexer - for the updates. - -Tue Nov 25 01:07:39 1997 - - * examples/Reactor/Proactor/test_multiple_loops.cpp (main): Made - sure that the Proactor was removed from reactor. - - * ace/WFMO_Reactor.cpp (remove_handler_i, - remove_suspended_handler_i): Make sure to preserve DONT_CALL - with normal event entries. - - * ace/Proactor.cpp: - - - A flag used to indicate when we are shutting down. - - - Made sure to signal the timer event when we are closing down. - - - Thread Manager: don't bother to wait (since the thread may have - already gone). But make sure to close up the descriptor. This - may not be necessary in the future when THR_DETACHED is - correctly implemented. - - * ace/Asynch_IO.h: Changed some code from protected to public. - Even though these functions are really protected, sometimes it - simplifies user code to be able to "fake" a result. Users - should use these with care. - - * examples/Reactor/Proactor/test_proactor.cpp - (handle_write_stream): Added code for partial write to socket. - However it ever seems to do a short write ;-). Also made sure - that the initial data coming from the AcceptEx call is also - dumped to the file. Thanks to Mark Rabotnikov - (mark@netmanage.co.il) for pointing this out. diff --git a/ChangeLogs/ChangeLog-98b b/ChangeLogs/ChangeLog-98b deleted file mode 100644 index d9de5949d12..00000000000 --- a/ChangeLogs/ChangeLog-98b +++ /dev/null @@ -1,12943 +0,0 @@ -Thu Dec 31 13:25:53 1998 James CE Johnson - - * docs/tutorials/019/server[2].cpp: - Test that the segment was created. If it already existed, the - malloc() will return 0 and we'll crash. - -Thu Dec 31 12:10:46 1998 Carlos O'Ryan - - * tests/RB_Tree_Test.cpp: - Added missing template instantiation, actually it seems that the - IRIX MIPSPro compiler was not doing recursive instantiation. - - * ace/ACE.cpp: - Use ACE_NOTREACHED in ACE::set_handle_limit(), the IRIX compiler - was complaining again. - -Thu Dec 31 10:58:11 1998 David L. Levine - - * ace/Containers_T.cpp (ACE_Fixed_Set::insert): removed - blank line between function header and body. - -Thu Dec 31 09:40:09 1998 Douglas C. Schmidt - - * ace/SOCK_Stream: Added a new ACE_SOCK_Stream constructor that - initializes the underlying ACE_HANDLE automagically. - -Wed Dec 30 17:07:21 1998 Douglas C. Schmidt - - * ace/Containers_T.h: Clarified that the insert() method on - ACE_Unbounded_Stack doesn't allow duplicates. Thanks to Susan - Liebeskind for reporting - this. - -Wed Dec 30 14:41:56 1998 Carlos O'Ryan - - * ace/ACE.cpp: - Sometimes the get_ip_interfaces routine was returning 0.0.0.0 as - a valid address, we explicitly avoid that now. - -Wed Dec 30 14:34:44 1998 Nanbor Wang - - * bin/GenExportH.BAT: Added '\$\I\d\$' string in generated file. - Also in generated file, make XXX_HAS_DLL defined to 1 if it - isn't defined already. - -Wed Dec 30 13:22:50 1998 Chris Gill - - * ace/Functor.{cpp, h, i} - ace/Functor_T.{cpp, h, i} - ace/Hash_Map_Manager.{h, i} - ace/Hash_Map_Manager_T.{h, i}: Moved ACE_Hash and ACE_Equal_To - STL-style functors from the Hash_Map_Manager files into the - Functor files (so other containers can use these from a central - place). Added ACE_Less_Than STL-style functor. Thanks to Doug - Schmidt, Carlos O'Ryan, and Irfan Pyarali for comments on the - distinctions between GOF command pattern functors and STL-style - functors. - - * ace/RB_Tree.{cpp, h, i}: Reworked templates so RB_Tree can take - advantage of template specialization for strcmp semantics without - the overhead of a virtual function call. Thanks to Carlos O'Ryan - for his suggestions on how to achieve this. - - * ace/OS.h - ace/config-psos-diab.h - include/makeinclude/platform_psos_diab.GNU - tests/Handle_Set_Test.cpp - tests/Process_Strategy_Test.cpp - tests/RB_Tree_Test.cpp - tests/Reactor_Performance_Test.cpp - tests/TSS_Test.cpp: A number of fixes to allow ACE pSOS tests to - compile and link successfully. - -Wed Dec 30 10:36:36 1998 David L. Levine - - * tests/Env_Value_Test.cpp: protected tests of doubles with - #ifndef ACE_LACKS_FLOATING_POINT, so that the test will - build for our Chorus platform. - -Tue Dec 29 16:24:24 1998 David L. Levine - - * bin/Service_Config.perl,auto_ptr.perl,corba-boolean.perl, - rename-ace.pl: use perl from user's path, so we don't have - to hard-code its location. - - * tests/Time_Value_Test.cpp: don't test ACE_U_LongLong if - the platform defines ACE_LACKS_LONGLONG_T, e.g., GreenHills, - because it makes a big mess. - - * bin/Hash_Map_Manager.pl,Hash_Map_Manager_Helper.csh: - translated Hash_Map_Manager_Helper.csh from csh to sh. - Renamed Hash_Map_Manager_Helper.csh to Hash_Map_Manager_Helper. - - * docs/ACE-guidelines.html: specifically disallow csh scripts. - -Tue Dec 29 15:09:15 1998 Douglas C. Schmidt - - * ACE version 4.6.10 released. - -Tue Dec 29 14:57:24 1998 Douglas C. Schmidt - - * docs/tutorials/{019,020}: Checked out the two new tutorials - from James Johnson. - -Tue Dec 29 14:37:57 1998 Douglas C. Schmidt - - * ACE version 4.6.9 released. - -Tue Dec 29 13:32:50 1998 Nanbor Wang - - * ace/OS.h (ACE_SELF): Changed it's definition from -1 to 0 on NT - to avoid warings from Intel C++. ACE_SELF is not used on NT. - Thanks to Karel Zuiderveld for - reporting this. - -Tue Dec 29 10:29:03 1998 Douglas C. Schmidt - - * ace: Fixed a bunch of warnings produced by Intel's C++ 4.0 - compiler. Thanks to Karel Zuidrveld - for reporting these. - -Tue Dec 29 09:47:48 1998 David L. Levine - - * ace/config-sunos*.h,README: - restored ACE_TIMER_SKEW, with explanatory comment. - -Mon Dec 28 23:12:59 1998 Douglas C. Schmidt - - * ace/DLL.h, - ace/Mem_Map.h, - ace/Read_Buffer.h: - Added ACE_UNIMPLEMENTED_FUNC() macros to these headers. - -Wed Dec 28 22:55:55 1998 Kirthika Parameswaran - - * ace/DLL.h: Prevent copying and assignment by putting these - methods in the private part of the class. - -Mon Dec 28 17:57:25 1998 James CE Johnson - - * docs/tutorials/020/*: - Sooner than expected... A brief and basic intro to using - ACE_Shared_Memory_MM. - - * docs/tutorials/online-tutorials.html: - Linked in 019 and 020 - -Mon Dec 28 16:32:42 1998 James CE Johnson - - * docs/tutorials/019/*: - At long last, a basic Tutorial on ACE_Shared_Memory_SV. With - luck, 020 will be added soon to cover ACE_Shared_Memory_MM - -Mon Dec 28 11:21:40 1998 Douglas C. Schmidt - - * ace/Strategies.h: Put the "virtual" keyword in from of the - ~ACE_Reactor_Notification_Strategy to make it clear - that this destructor is virtual. Thanks to Greg Gallant - for pointing this out. - -Mon Dec 28 11:12:08 1998 David L. Levine - - * ACE-INSTALL.html: added SunOS 5.7 (Solaris 7) info. - -Mon Dec 28 10:52:20 1998 Carlos O'Ryan - - * */Makefile: - Updated dependencies. - -Mon Dec 28 02:34:59 1998 Nanbor Wang - - * examples/Service_Configurator/IPC-tests/server/server_test.cpp - (main): Allow loading in static services in this application. - Thanks to Peter J. Mason for reporting this. - - * ace/Service_Config.{h,i,cpp} (ACE_Service_Config): Changed the - default value of to 1. Otherwise, it is - not consistent with the initial value of - ACE_Service_Config::no_static_svcs_ and that's very confusing. - (open): Added one more argument with - default value of 1. This allow us to turn off this behavior - when opening Service_Config. Otherwise, the only other way is - to create a fake ACE_Service_Config and use that to change the - static variable . - -Sun Dec 27 21:51:10 1998 David L. Levine - - * etc/purify.solaris2: added a couple of MIU suppressions for - SunOS 5.7's thread library. - -Fri Dec 25 08:23:51 1998 Douglas C. Schmidt - - * ACE-INSTALL.html: Fixed a broken link to the ACE FAQ. Thanks to - Barry Hoggard for reporting this. - -Fri Dec 25 01:55:32 1998 Irfan Pyarali - - * ace/Hash_Map_Manager: There are two problems with the current - implementation of Hash_Map_Manager: - - (a) It requires a hash() method on the key type. If it is not - possible for the key type to have a hash() function (e.g., - the key is a primitive type such as an int, or is a pointer - type, or a three party class), the usual solution is to do - partial template specialization. - - This is usually not a very good option since some compilers - do not support partial template specialization. - - (b) The second problem is with comparing two keys. - Hash_Map_Manager assumes that keys can be compared using - operator==. This assumption causes problems in some cases, - e.g., when using char * as the key. Usually with char *, - you want to use strcmp and not compare pointers. - - Solution to these two problems is the new Hash_Map_Manager_Ex - class. Problem (a) is addressed by using a function object - the - type of which is specified by the user as an additional template - parameter. Problem (b) is addressed by using another function - object - the type of which is specified by the user as an - additional template parameter. So the new Hash_Map_Manager_Ex - takes five template parameters: - - - - Backward compatibility: Hash_Map_Manager now inherits from - Hash_Map_Manager_Ex, fixing the hash_key function object (which - simply calls key.hash()) and fixing compare_keys (which simply - uses operator== on the keys). - - There will be one problem: Users of compilers that do not - implicitly instantiate templates will have to update their list - of template instantiations. To help with this, please see - $ACE_ROOT/bin/Hash_Map_Manager_Helper.csh - - Other miscellaneous changes: Added two new classes: ACE_Hash - and ACE_Equal_To. ACE_Hash assumes a hash() method on T. - ACE_Equal_To compares by using operator==. However, the - ACE_Hash class has been specialized to work with: - - char, signed char, unsigned char, - short, unsigned short, - int, unsigned int, - long, unsigned long, - const char *, char *, - const wchar_t *, wchar_t *, - const ACE_USHORT16 *, ACE_USHORT16 *, - - Also, ACE_Equal_To has been specialized to work with: - - const char *, char *, - const wchar_t *, wchar_t *, - const ACE_USHORT16 *, ACE_USHORT16 *, - - Remember, you don't have to use these specialization. You can - always create your own. - - If we had default template parameters, we could default hash_key - to ACE_Hash and compare_keys could default to - ACE_Equal_To. - - BTW, note that the specialization with ACE_Hash and ACE_Equal_To - is not partial template specialization. It is complete template - specialization, and we don't know of compilers that cannot - handle complete template specialization. - - Since we now have template specialization, Hash_Map_Manager_T.* - files were created. I also took this opportunity to inline most - of the Hash_Map_Manager functions. - - Also, update the makefiles and project files. - - BTW, these changes grossly simplified - tests/Hash_Map_Manager_Test.cpp and tests/Map_Manager_Test.cpp. - These tests will now work with compilers that do not support - partial template specialization. Maybe James can change - Filecache to take advantage of these changes. - - Updated the following files with the new template instantiations: - - ace/Filecache.cpp - ace/Local_Name_Space.cpp - ace/Template_Instantiations.cpp - tests/Conn_Test.cpp - tests/Hash_Map_Manager_Test.cpp - tests/Map_Manager_Test.cpp - TAO/examples/Callback_Quoter/Notifier_i.cpp - TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp - TAO/examples/Simple/bank/AccountManager_i.cpp - TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp - TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp - TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp - TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp - TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp - TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp - TAO/orbsvcs/orbsvcs/Trader/Trader.cpp - TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp - TAO/tao/ORB.cpp - TAO/tao/ORB_Core.cpp - TAO/tao/Object_Table.cpp - TAO/tao/Operation_Table.cpp - TAO/tao/POA.cpp - examples/Map_Manager/test_hash_map_manager.cpp - - Thanks to Carlos for suggesting these changes. Most of these - were inspired by SGI's STL. - - If these changes are successful (i.e., nobody is hunting me down - for breaking their code ;-)), we should add a similar comparison - function object to Map_Manager, Collections in Containers_T that - require an operator==() (typically for remove() and find()) and - the RB_Tree. - - * ace/ACE (hash_pjw): hash_pjw is now available for char *, - wchar_t *, and ACE_UINT16 *. - - * ace/OS (strlen, strcpy, strcmp): These functions are now - available for char *, wchar_t *, and ACE_UINT16 *. - - * ace/SString.cpp (ACE_WString::strlen): Simply calls - ACE_OS::strlen. - - * ace/config-win32-common.h (ACE_HAS_WCHAR_TYPEDEFS_USHORT): Since - Win32 typedefs wchar_t as a 16 bit unsigned short, this can - potentially cause problems with function overloading. - Therefore, I added ACE_HAS_WCHAR_TYPEDEFS_USHORT to the Win32 - config file. This is very similar to - ACE_HAS_WCHAR_TYPEDEFS_CHAR. Thanks to David Levine for helping - with this. - -Thu Dec 24 09:37:32 1998 Douglas C. Schmidt - - * ACE version 4.6.8 released. - -Thu Dec 24 00:59:46 1998 Nanbor Wang - - * ace/Thread_Manager.h (ACE_Thread_Manager): Added a more complete - documentation of the deprecated method. Thanks to - Keith Brown for reporting this. - -Wed Dec 23 16:37:52 1998 David L. Levine - - * ace/config-sunos5.5.h,include/makeinclude/platform_sunos5_ghs.GNU: - updated so that links succeed. - -Wed Dec 23 15:58:53 1998 Nanbor Wang - - * ace/ACE.cpp (ldfind): Supress changing the 'dll' name if a - customized dll extension is used. - -Tue Dec 22 22:34:32 1998 David L. Levine - - * ace/config-sunos5.5.h,include/makeinclude/platform_sunos5_ghs.GNU: - added GreenHills compiler support. - - * ace/OS.h: don't use hrtime_t for ACE_hrtime_t if - ACE_LACKS_LONGLONG_T. - -Mon Dec 21 16:06:07 1998 Douglas C. Schmidt - - * ace/Shared_Memory_MM.i: Changed the remove() method to call - ACE_Mem_Map::remove() rather than ACE_Mem_Map::unmap() so the - code is consistent with the documentation. Thanks to James - Johnson for reporting this. - -Mon Dec 21 13:55:33 1998 David L. Levine - - * ace/Containers_T.{i,cpp} (ACE_Bounded_Set::is_full): On LynxOS - only, uninlined this function to avoid Internal Compiler Error - with native (3.0.0) compiler. Thanks to Carlos for this fix, - it had us stumped for quite a while. - -Sat Dec 19 18:27:07 1998 Douglas C. Schmidt - - * ace/Timer_Queue_Adapters.cpp (handle_signal): Cleaned up an - unused variable. Thanks to David Levine for reporting this. - -Fri Dec 18 09:30:57 1998 David L. Levine - - * ace/High_Res_Timer.h (elapsed_time_incr): added missing - const to member function declaration. - - * ace/config-sunos5.5.h: removed redundant - ACE_HAS_XPG4_MULTIBYTE_CHAR #define. - - * ace/config-sunos5.7.h: added this config, for Solaris 7. - - * apps/Gateway/Gateway/Gateway.cpp, - examples/ASX/Event_Server/Transceiver/transceiver.cpp - (handle_signal): added ACE_UNUSED_ARG (signum). - -Fri Dec 18 06:08:47 1998 Douglas C. Schmidt - - * ace/High_Res_Timer: Made several methods const. Thanks to Ulf - Jaehrig for reporting this. - - * ace/Thread.h (ACE_Thread): Removed a stray join(ACE_Thread_ID) - method. Thanks to Jody Hagins for reporting - this. - -Thu Dec 17 21:06:30 EST 1998 James CE Johnson - - * docs/tutorials/000: - Removed. This is redundant with the Chap* directories. - -Thu Dec 17 17:18:21 1998 Douglas C. Schmidt - - * include/makeinclude/platform_sco5.0.0-{nothread,fsu-pthread}.GNU: - This file was been modified to get rid of thread related stuff - until we can obtain the FSU threads library. Thanks to Michael - Preobrazhensky for this. - -Thu Dec 17 16:56:28 1998 David L. Levine - - * bin/create_ace_build: try /bin/find if /usr/bin/find doesn't exist. - - * ace/High_Res_Timer.cpp (elapsed_time): rearranged terms in - nanoseconds calculation to avoid overflow on machines that don't - have native 64-bit ints. Thanks to Greg Holtmeyer - for helping to track this problem down. - -Thu Dec 17 12:43:11 1998 Douglas C. Schmidt - - * ace: Removed the use of ACE_DEBUG within handle_signal() methods - to avoid portability problems. Thanks to Susan Liebeskind - for reporting this. - -Tue Dec 15 14:45:49 1998 David L. Levine - - * *.h: removed () from #pragma implementation argument. - Thanks to Christian v. Mueffling for reporting - this. - - * docs/ACE-guidelines.html: added Doug's warning about side effects - in ACE_DEBUG statements. - -Tue Dec 15 14:43:47 1998 Ossama Othman - - * ace/OS.{h,i},README: added lstat() and readlink() methods. - Use ACE_LACKS_LSTAT and ACE_LACKS_READLINK if lstat() and readlink() - aren't supported. - -Tue Dec 15 11:55:51 1998 Steve Huston - - * ace/ACE_Library.(mak mdp): Added Message_Queue.cpp to the files list. - - * examples/NT_Service/NT_Service.(mak mdp): MSVC 4.2 project file for - the NT_Service example. - -Tue Dec 15 11:27:24 1998 David L. Levine - - * ace/config-chorus.h: added ACE_LACKS_READLINK. - - * ace/config-psos*.h,config-vxworks-5.x.h: added ACE_LACKS_READLINK - and ACE_LACKS_LSTAT. - -Tue Dec 15 08:44:18 1998 Steve Huston - - * examples/NT_Service: New example program, shows how to create, - manipulate, and run an NT Service using the ACE_NT_Service class. - Muchas gracias to Gonzalo Diethelm for smashing this code into a - good example - useful enough to show how things work, but simple - enough to show all the useful functionality in one concise program. - -Tue Dec 15 07:32:49 EST 1998 Aniruddha Gokhale - - * OS.h: - - Moved the definition of IOV_MAX after we have included the - limits.h file. Before make ing this change, we were getting lots - of warnings on SunOS 5.6 about redefinition of IOV_MAX. - -Mon Dec 14 15:39:39 1998 Carlos O'Ryan - - * tests/Makefile: - Updated dependencies. - -Mon Dec 14 10:49:29 1998 Nanbor Wang - - * Static_Performance.dsw: Quick and dirty workspace to build - several static version's performance tests. - - * ace/ace_lib.dsp: Removed "__ACE_INLINE__=0" from the default - static release build settings. - - * performance-tests/Misc/basic_perf.dsp: - * performance-tests/Misc/context_switch_time.dsp: Added static - build configurations. - - * tests/RB_Tree_Test.dsp: Redid the project file. A VC 6 only - compiler option somehow got into the file. Thanks to Ulf - Jaehrig for reporting this. - -Mon Dec 14 10:24:59 1998 Fred Kuhns - - * ace/OS.h: Added #define for IOV_MAX 16 - -Mon Dec 14 08:35:11 1998 David L. Levine - - * BUG-REPORT-FORM: added a few FMMs. - -Mon Dec 14 08:27:11 1998 Steve Huston - - * tests/run_tests.sh: Enabled MT_Reactor_Timer_Test. - -Sun Dec 13 16:40:18 1998 Nanbor Wang - - * tests/MT_Reactor_Timer_Test.dsp: - * tests/tests.dsw: Added the new project file - - MT_Reactor_Timer_Test. - - * tests/run_tests.bat: Added MT_Reactor_Timer_Test into - one-button test for NT. - - * tests/MT_Reactor_Timer_Test.cpp: Changed the use of - ACE_OS::{read,write} to ACE::{recv,send}. - -Sat Dec 12 17:19:17 1998 Irfan Pyarali - - * ace/ACE.cpp (ldfind): If we specified a suffix which is not the - default suffix on the platform, the ldfind() operation should - not try to add the default platform suffix but use ours. - -Sat Dec 12 07:44:02 1998 John Lindal - - * ace/config-mklinux.h: added. - -Fri Dec 11 23:26:20 1998 Nanbor Wang - - * tests/Message_Queue_Test.cpp: Generalize the test to perform - "platform specific" message queue tests when applicable. - Currently, this only applies to VxWorks and Windows NT 4.0 or - above. - - * tests/DLL_Test.cpp (main): STL's implementation of auto_ptr - doesn't define an assignment operator that takes a pointer of T. - Changed to use constructor to initialize the auto_ptr my_hello. - -Fri Dec 11 16:30:44 1998 Ossama Othman - - * tests/Time_Value_Test.cpp: Removed the ACE_DISABLE_AUTOCONF_LONGLONG - macro. It broke ACE+autoconf on non-sun platforms. - -1998-12-11 Nanbor Wang - - * test/DLL_Test.dsp: Fixed configuration settings. Most of the - time, it's easier to add new projects by using the - bin/dsp2dsp.pl. - - * ace/Message_Queue.{h,cpp} (enqueue): Made sure all bytes in a message - block chain are accounted for. - (enqueue_tail,dequeue_head): Added two more methods into - ACE_Message_Queue_Base. They are the prefered methods to use. - -Fri Dec 11 15:09:43 1998 Ossama Othman - - * tests/Time_Value_Test.cpp: define ACE_DISABLE_AUTOCONF_LONGLONG - before including ace/inc_user_config.h. This will prevent - an automatically generated ACE Configuration Project config.h - header from defining ACE_UINT64, and thus allowing - Time_Value_Test.cpp to compile on platforms that define - ACE_HAS_STHREADS. Please read the comment in Time_Value_Test.cpp. - ACE_DISABLE_AUTOCONF_LONGLONG is not meant for general use! - -Fri Dec 11 14:05:11 1998 Steve Huston - - * tests/MT_Reactor_Timer_Test.(cpp h): Replaced the multithread - timer set/cancel test with sensible tests. - -Fri Dec 11 08:51:07 1998 David L. Levine - - * ACE-INSTALL.html: updated egcs version information. - - * VERSION: added ace-users/comp.soft-sys.ace info. - - * include/makeinclude/platform_osf1_4.0.GNU: added suppression - of warning 1136, conversion to integral type of smaller size - could lose data. cxx V6.1-029 spews out a bunch of them, - otherwise. - - * tests/Time_Value_Test.cpp: protected definition of __ACE_INLINE__. - Thanks to Ossama for reporting this. - -1998-12-11 Nanbor Wang - - * ace/Message_Queue.{h,i,cpp} (ACE_Message_Queue_Base): Added a - bunch of pure virture functions in the class to define the - common interface functions of a message queue. This allows up - to experiment different message queue implementations easily. - Most significantly, all queueing operations are simplified into - and method in ACE_Message_Queue_Base as - "standard" queueing operations. Inherited class, of course, can - add fancier queueing operations (as in ACE_Message_Queue.) - - (ACE_Message_Queue_NT): A new adapter class inherited from - ACE_Message_Queue_Base that implement a message queue using NT's - IO completion ports. As it's name implies, this is a - specialized version for NT. It is not as versatile as ACE's - general MQ implementation. However, this implementation - consumes less NT handles which in some circumstances may be a - big win (because ACE_Message_Queue uses cv and on NT, cv is - simulated and consumes 4 handles per cv. ACE_Message_Queue_NT - only uses one handle and one critical section.) - - Several features inherited from IO completion port are, the - waiting threads are release in LIFO order, and you can control - (at initialization time,) the max number of threads that can be - release by the message queue to run concurrently. - - Notice that the constructor and the method have different - signature compared with those of ACE_Message_Queue. You should - use ACE_Message_Queue_Factory to create a message queue on the - fly if so desired. - - Thanks to Mark Lucovsky and Karlheinz Dorn - for providing the idea. - - * ace/Message_Queue_T.h (dequeue): Added the new method to match - with the changes in ACE_Message_Queue_Base. - (create_NT_message_queue): A wrapper function to manufacture an - ACE_Message_Queue_NT. - - -Thu Dec 10 09:08:26 1998 David L. Levine - - * ace/config-chorus.h: added ACE_LACKS_FSYNC. - - * ACE-INSTALL.html: ACE/TAO build on Linux RedHat 5.2 - as well as 5.1. - - * ace/config-osf1-3.2.h: added getpgid () prototype, because - an old comment said that it was missing from the system headers. - - * ace/config-linux-common.h: replaced ACE_LACKS_GETPGID with - a getpgid () prototype. - - Thanks to Ivan Pascal for motivating the - above two getpgid () updates. - - * ace/config-sunos5.5.h: updated comment on why explicit - instantiation isn't used with Sun CC. Thanks to - William A. Hoffman for introducing - us to -instances=explicit. - -Wed Dec 09 22:59:38 1998 David L. Levine - - * ACE version 4.6.7 released. - -Wed Dec 09 18:03:58 1998 Irfan Pyarali - - * examples/Reactor/WFMO_Reactor/test_network_events.cpp (main): - Removed global variables and cleaned up some minor things. - -Wed Dec 09 07:02:06 1998 David L. Levine - - * README, VERSION: expanded mention of BUG-REPORT-FORM. - - * docs/ACE-guidelines.html: strengthened mention of ACE_ASSERT danger. - Thanks to Irfan for the example. - - * tests/run_tests.vxworks: re-enabled Timeprobe_Test, now that - ACE_ASSERTs have been fixed in ACE's Containers. - - * ace/config-linux-common.h,config-osf1-{3.2,4.0}.h: - removed ACE_LACKS_GETPGID. Thanks to - Ivan Pascal for reporting that - getpid () is supported on those platforms. - - * ace/config-linux-common.h: restored ACE_LACKS_GETPGID, - because ::getpgid () isn't found on Alpha with glibc 2.0.7. - - * tests/Timeprobe_Test.cpp: disabled ACE_ENABLE_TIMEPROBES, - because the ACE lib is built by default without them. - - * performance-tests/Misc/context_switch_time.cpp: disabled - Yield_Test on VxWorks, because it doesn't run properly there. - - * ace/config-tandem.h,README: removed ACE_HAS_STRUCT_PROTOENT_DATA, - because it is no longer used. Thanks to Ossama for reporting this. - - * tests/Collection_Test.cpp, - examples/Reactor/Misc/test_early_timeouts.cpp: - removed unused parameter names argc and argv. - - * tests/DLL_Test.cpp: added ACE_Auto_Basic_Ptr template - instantiation. - -1998-12-09 Irfan Pyarali - - * tests/Collection_Test.cpp: Added new test for ACE collections. - - * ace/Map_Manager.cpp (operator*): - * ace/Containers_T.cpp (operator*): - * ace/SPIPE_Acceptor.cpp (create_new_instance): - - Fixed ACE_ASSERT usage. - - * ace/config-vxworks5.x.h: Added ACE_LACKS_FSYNC. - - * ace/OS.i (fsync): Added ACE_NOTSUP_RETURN (-1). - -Tue Dec 08 21:39:16 1998 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU,ACE-INSTALL.html: - enable DU 4.0 cxx 6.x warnings by default. To disable, if - you're using cxx 5.x, set CXX_VER to CXX_5 either on the - make command line, or in your environment. Thanks to - Gary York for being that last - cxx 6.x user to trip over this :-) - - * include/makeinclude/platform_lynxos.GNU: override - ACE_HAS_GNUG_PRE_2_8 to allow builds of all TAO tests - on LynxOS 3.0.0. Its g++ can handled nested classes, even though - it's in the 2.7 family. Thanks to Patty Hair - for suggesting that we try to build the tests on LynxOS. - -Tue Dec 8 19:50:49 1998 Douglas C. Schmidt - - * ace/Shared_Object.cpp: Changed the various default - implementations of init()/fini()/info() to return 0 rather than - -1 so that users won't have to subclass Service_Object just to - change the return value. Thanks to Eric Newton for motivating - this. - -Tue Dec 8 16:52:57 1998 Ossama Othman - - * ace/OS.{h,i}, ace/README: Added a fsync() method. Define - ACE_LACKS_FSYNC if ::fsync() isn't supported. - -Tue Dec 08 15:03:25 1998 Steve Huston - - * ace/NT_Service.{h cpp i}: Added a number of methods which can be - used to register, remove, and control an NT service. Also, - another macro, ACE_NT_SERVICE_RUN, which simplifies the setting up - and running the most common case, a single service. Huge thanks - to Gonzalo Diethelm for contributing - the bulk of this code! - -Tue Dec 08 11:22:56 1998 Chris Gill - - * ACE version 4.6.6 released. - -Tue Dec 08 10:45:56 1998 Nanbor Wang - - * ace/System_Time.h: Removed redundant ACE_Time_Date definition. - Thanks to Martin Krumpolec for reporting this. - -Mon Dec 07 22:58:53 1998 Irfan Pyarali - - * examples/Reactor/Misc/test_early_timeouts.cpp: On some - platforms, select() returns before the time value specified. - This tests counts the number of times this happens and the max - early timeout. - - * ace/DLL.cpp (open): Added a call to ACE::ldopen() before calling - ACE_OS::dlopen(). The allows us to find the library is - predefined places and also expand the file name to the correct - syntax (prefix and suffix) according to the platform. - - Also, fixed a bug where the flag has not - being consulted on a reopen. - - * ace/ACE.cpp (ldfind): Moved the code that calls - ExpandEnvironmentStringsA() from - ACE_Location_Node::open_handle() to ACE::ldfind(). This code is - more general and therefore belongs in ACE::ldfind(). - - * ace/Parse_Node.cpp and ace/Svc_Conf_y.cpp: Fixed the incorrect - use of ASYS_WIDE_STRING. Remember that the string returned from - ASYS_WIDE_STRING is only valid for that line of code ;) - -Mon Dec 7 19:10:24 EST 1998 James CE Johnson - - * docs/tutorials/ - * docs/tutorials/001/001.dsp - * docs/tutorials/002/002.dsp - * docs/tutorials/003/003.dsp - * docs/tutorials/004/004.dsp - * docs/tutorials/005/005.dsp - * docs/tutorials/006/006.dsp - * docs/tutorials/007/007.dsp - * docs/tutorials/008/008.dsp - * docs/tutorials/008/008-server/008-server.dsp - * docs/tutorials/008/008-direct/008-direct.dsp - * docs/tutorials/008/008-broadcast/008-broadcast.dsp - * docs/tutorials/009/009-directed/009-directed.dsp - * docs/tutorials/009/009-server/009-server.dsp - * docs/tutorials/009/009-broadcast/009-broadcast.dsp - * docs/tutorials/010/010.dsp - * docs/tutorials/011/011.dsp - * docs/tutorials/012/012.dsp - * docs/tutorials/013/013.dsp - * docs/tutorials/014/014.dsp - * docs/tutorials/018/018.dsp - * docs/tutorials/015/015-client/015-client.dsp - * docs/tutorials/015/015-server/015-server.dsp - * docs/tutorials/016/016.dsp - * docs/tutorials/017/017.dsp - * docs/tutorials/tutorials.dsw - Contributed by: - Stefan Ericsson - -Mon Dec 07 14:11:00 1998 Chris Gill - - * ace/README: added entries for ACE_LACKS_IOSTREAMS_TOTALLY - and ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS. Thanks to - Ossama Othman for reminding - me to do this. - -Mon Dec 07 09:27:04 1998 David L. Levine - - * ace/Stats.cpp (std_dev): added comments to not reformat - some code. It compiles with the Diab compiler for pSoS - the way it is. - -Sun Dec 06 23:59:29 1998 Irfan Pyarali - - * config-sunos5.5.h: Added back ACE_HAS_TIMER_SKEW. It is really - required. See me for an example that illustrates this need. - -Sun Dec 06 16:05:00 1998 Chris Gill - - Changes for pSOS port: ACE now compiles for pSOSystem 68k targets using - the Diab D-C++ 4.2a compiler release, and links with all but the - following ACE tests: Conn_Test, Handle_Set_Test, OrdMultiSet_Test, - Priority_Reactor_Test, Process_Strategy_Test, Reactor_Performance_Test, - and TSS_Test. - - * ace/Log_Msg.cpp - ace/Log_Record.{cpp, h} - ace/streams.h - ace/SString.cpp - ace/config-WinCE.h - ace/config-psos-diab.h - tests/test_config.h: Rearranged log print methods so that logging - can still be done on platforms where iostreams are not sufficiently - supported. Added ACE_LACKS_IOSTREAMS_TOTALLY to select this - behavior, and defined it in pSOS Diab config header (also added to - Windows CE config header, to simplify factoring out Win CE specific - logging methods). - - * include/makeinclude/platform_psos_diab.GNU - ace/OS.{cpp, h, i}: Removed Diab supplied library calls so ACE now - links directly to pSOSystem libraries. - - * ace/Parse_Node.cpp - ace/Stats.cpp: Modifications to circumvent bugs in the Diab 4.2a - compiler's handling of conditional operators. - -Sun Dec 06 08:32:36 1998 David L. Levine - - * ace/Containers_T.cpp,Local_Name_Space_T.cpp, - Name_Request_Reply.cpp,Service_Config.cpp,Service_Manager.cpp, - Svc_Conf.y,Svc_Conf_Tokens.h,Svc_Conf_y.cpp, - Time_Request_Reply.cpp,Trace.cpp: - use ACE_NLOGGING instead of ACE_NDEBUG. - -Sat Dec 05 21:45:00 1998 David L. Levine - - * ace/Containers_T.cpp,Local_Name_Space_T.cpp, - Name_Request_Reply.cpp,Service_Config.cpp,Service_Manager.cpp, - Svc_Conf.y,Svc_Conf_Tokens.h,Svc_Conf_y.cpp, - Time_Request_Reply.cpp,Trace.cpp: - added if NDEBUG protection to some local variables and - ACE_UNUSED_ARG to some parameters to avoid compiler warnings - when ACE_DEBUG is disabled. Thanks to Faron Dutton - for reporting this. - - * ace/Makefile (Svc_Conf_Tokens.h): escaped $\I\d$ string so - that it doesn't get expanded in the Makefile itself. - -Sat Dec 5 16:06:27 1998 Darrell Brunsch - - * ace/Local_Name_Space_T.cpp: Protected some of the ACE_DEBUG - statements with a ACE::debug () check. - -Fri Dec 04 13:46:12 1998 David L. Levine - - * ace/Stats.cpp (std_dev): fixed difference calculation so - that it always calculates a non-negative value. - - * performance-tests/Misc/context_switch_time.cpp - (High_Priority_Synchronized_Task::svc): check if nsec is >= - mutex_acquire_release_time, to avoid adding in negative - context_switch_times. - - * ace/config-vxworks5.x.h, - include/makeinclude/platform_vxworks5.x_g++.GNU, - include/makeinclude/platform_vxworks5.x_ghs.GNU: moved -DVXWORKS - from platform_vxworks5.x_* files to config-vxworks5.x.h, to reduce - command-line clutter a bit. - -Fri Dec 4 12:45:04 1998 James CE Johnson - - * docs/tutorials/linify: - * docs/tutorials/combine: - * docs/tutorials/fixMakefile: - Ensure that perms are 755 and that #!/.../perl is not used - -Wed Dec 02 14:21:34 1998 Nanbor Wang - - * ace/OS.i (fstat): This function needs to close down the c handle - opened by _open_osfhandle to avoid resource leaks on Win32. - Thanks to Christian Korn for reporting - this. - -Tue Dec 01 13:48:51 1998 Nanbor Wang - - * ace/config-freebsd-pthread.h: Added ACE_HAS_SIGWAIT. Also added - ifdef section to prevent threaded ACE from compiling on FreeBSD - under 3.0 (excluded.) - -Tue Dec 1 22:22:42 1998 Douglas C. Schmidt - - * ace/Synch.h: Added a comment to clarify the semantics of - ACE_RW_Process_Mutex. Thanks to Stanislav Meduna - for reporting this. - -Tue Dec 01 17:22:00 1998 Kirthika Parameswaran - - * tests/DLL_Test: Added the .dsp and tests.dsw to the - repository. - - * tests/run_tests.bat: Added an entry for DLL_Test. - -Tue Dec 01 13:54:35 1998 David L. Levine - - * ace/OS.h: added ESUCCESS definition (to 0), if not #defined. - -Tue Dec 01 13:48:51 1998 Nanbor Wang - - * ace/config-freebsd-pthread.h: Added ACE_HAS_SIGWAIT. Also added - ifdef section to prevent threaded ACE from compiling on FreeBSD - under 3.0 (excluded.) - - * ace/OS.i (sigwait): FreeBSD 3.0 supports sigwait. Changed the - ifdef condition to support sigwait for 3.0 or above. Thanks to - Bob McWhirter and Russell L. Carter - for helping to track this down. - -Tue Dec 01 12:59:57 1998 James CE Johnson - - * ace/IOStream_T.i (recv,recv_n): set errno to ESUCCESS - because it was never being set to ETIME when the read timed - out. (Before entering the peer_->recv/recv_n, errno was - ENOENT from previous activities and was the same after in - both positive & negative tests until I did the reset.) - (eof): cleaned up a bit. - - I tested against IOStream_Test for both positive and - negative. For the positive test, I changed the sleep() at - line 363 to a much larger value. The client worked fine. - For the negative test, I replaced the spleep() with a - close() & return() pair. The client saw the closure and - exited as expected. - -Tue Dec 1 08:55:48 PST 1998 James Hu - - * ace/Memory_Pool.cpp: Since type key_t might be something - other than int (e.g., a long), some additional code was needed - to support the sscanf. - -Tue Dec 01 10:49:00 1998 Chris Gill - - * tests/Win32clerk.conf - tests/Win32server.conf - tests/Win32tokens.conf: removed explicit path for netsvcs dll, as - this dll is now being moved to ACE_wrappers/bin after it is built - and the explicit path was causing dlopen to fail rather than - searching the path on NT, which caused Time_Service_Test to fail. - -Tue Dec 01 10:07:48 1998 David L. Levine - - * ACE version 4.6.5 released. - -Tue Dec 1 00:07:05 PST 1998 James Hu - - * ace/Containers_T.h: - * ace/Containers_T.i: - Fixed a bug introduced when someone genericized the creation - strategy for ACE_DLList. The removal routing had not been - similarly genericized. Thanks goes to Martin Krumpolec - for spotting the problem. - - -Mon Nov 30 19:10:23 1998 Kirthika Parameswaran - - * examples/DLL/Makefile: - * examples/DLL/Makefile.Today: - * examples/DLL/Makefile.Newsweek: - - Added the above makefiles. Makefile internally uses - Makefile.Today and Makefile.Newsweek to build the libraries - seperately. - -Mon Nov 30 13:54:04 1998 Douglas C. Schmidt - - * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_input): There - was a friggin' bug in this code that is a violation of Reactor - framework design rule #2, i.e., we were returning a non-0 value - from handle_input(), which is a no-no... Thanks to Steve Huston - for reporting this. - -Mon Nov 29 13:16:53 EST 1998 James CE Johnson - - * docs/tutorials/001/logger.h: - * docs/tutorials/001/page04.html: - * docs/tutorials/003/client.cpp: - * docs/tutorials/003/page01.html: - Added a blurb about the additional parameters to the recv(), - recv_n(), send() and send_n() method calls of ACE_SOCK_Stream. - -Sun Nov 29 22:14:32 1998 David L. Levine - - * ace/OS.i,cpp (exit): with ACE_HAS_NON_STATIC_OBJECT_MANAGER, - call ACE_Object_Manager::fini (). Uninlined to avoid circular - include problems with Object_Manager.h. The ACE_Object_Manager - instantiation on main's stack is not destroyed by ::exit (), - so this addition causes the ACE_Object_Manager to be - properly shutdown. Thanks to Jeff Greif - for pointing out that automatic objects are not destroyed - by ::exit (). - - * ace/Object_Manager.h: added Jeff Greif's ACE_OS::exit () - recommendations in comments. - -Sun Nov 29 20:13:15 1998 Kirthika Parameswaran - - * examples/DLL/Today.cpp: - * examples/DLL/Newsweek.cpp: - - Added ACE_BUILD_SVC_DLL and ACE_Svc_Export directives needed for the - extern "C" create_magazine function. - -Sun Nov 29 18:22:52 1998 Nanbor Wang - - * tests/Thread_Pool_Reactor_Test.cpp: Removed the use of - "main_reactor". The "main_reactor" was added to handle incoming - connections because this test was not working correctly without - moving out the acceptor to another reactor. However, I recently - found that the problem was actually due to the deadlocked - notify_handler which I fixed a while back. - - * ace/OS.h: Added forward declarations of ACE_Time_Value's - operator{+,-} so VC 6.0 won't get confused with the - operator{+,-} in namespace std. Thanks to Victor Yu - for reporting this. - -1998-11-29 James CE Johnson - - * docs/tutorials/007/page09.html: - Added warnings about a possible core dump when an event handler - exists in the thread pool's message queue after the handler has - been destroyed. Jeff Donner's work with - Tutorial 007 on Win32 lead to this discovery. - -Sat NOv 28 20:02:08 1998 Kirthika Parameswaran - - * examples/DLL/Today.cpp: - * examples/DLL/Newsweek.cpp: - - Added the #ifdef directive needed to seperate out the - functionality on NT and UNIX platforms. - -Sat NOv 28 20:02:08 1998 Kirthika Parameswaran - - * examples/DLL/Dll.dsw: - * examples/DLL/Test_dll.dsp: - * examples/DLL/Today.dsp: - * examples/DLL/Newsweek.dsp: - - Added to the repository. The test successfully executes on NT. - - * examples/DLL/README: Modified to add information on how to - execute this test example on NT. - -Fri Nov 27 13:32:38 1998 Kirthika Parameswaran - - * examples/DLL/test_dll.cpp (main): Added right arguments to the - ACE_ERROR_RETURN macro. - -Thu Nov 26 21:04:05 1998 Kirthika Parameswaran - - * examples/DLL/Makefile: - * examples/DLL/Today.{h,cpp}: - * examples/DLL/Newsweek.{h,cpp}: - * examples/DLL/Magazine.h: - - Placed the comments at the right place and added an descriptive - header wherever missing in the .h files. - - * examples/DLL/test_dll.cpp (main): Added auto_ptr for the - Magazine class object pointer. - - * examples/DLL/README: Added to the repository. - -Wed Nov 25 02:02:32 1998 Kirthika Parameswaran - - * examples/DLL/Makefile: - * examples/DLL/Today.{h,cpp}: - * examples/DLL/Newsweek.{h,cpp}: - * examples/DLL/Magazine.h: - * examples/DLL/test_dll.cpp: - - Added these files. This test example shows how dynamically linked - library objects can be loaded on demand and their methods accessed - on getting an pointer to these objects. - -Wed Nov 25 22:28:44 1998 Carlos O'Ryan - - * ace/INET_Addr.cpp: - Reverted the behavior to version 4.35, we don't use the first - alias as the hostname, but the value returned in the h_name - field. - This change was to support TAO in our local site, but it caused - many problems for other configurations of /etc/hosts and DNS. We - found another workaround for our local site which makes more - sense to the rest of the world. - -Wed Nov 25 20:34:12 1998 Kirthika Parameswaran - - * tests/DLL_Test.cpp (main): Removed ACE_OS::strcat which was - concatenating a string literal with a defined string. - -Wed Nov 25 12:01:20 1998 Ossama Othman - - * apps/gperf/gperf.texi: - * apps/gperf/gperf.info: - * apps/gperf/texinfo.tex: - * apps/gperf/version.texi: - - updated gperf.texi to work with recent versions of makeinfo (e.g. 1.68, - available in GNU texinfo-3.12). Regenerated gperf.info with latest - makeinfo (1.68). Added texinfo.tex to make available certain TeX - macros for texinfo to TeX converters. Added version.texi to centralize - gperf update dates and versions (gets included by gperf.texi). - -Wed Nov 25 12:01:20 1998 David L. Levine - - * performance-tests/Misc/context_switch_time.cpp (main): fixed - printouts by performing floating point division, instead of - converted integer division to double. Added checks of - activate () return values. - - * ace/OS.cpp (sched_params,lwp_getparams,lwpsetparams): set - LWP priority on Suns, even if only using the ACE_HAS_PTHREADS - interface. Though, we still don't get preemption if only using - that interface. performance-tests/Misc/preempt.cpp demonstrates - that. - - * ace/config-osf1-4.0.h: removed ACE_LACKS_THREAD_PROCESS_SCOPING. - DU 4.0 seems to have process scoping, though I think only - the superuser can use it. - -Wed Nov 25 10:48:42 1998 Douglas C. Schmidt - - * ace/Task.cpp: Fixed a bug whereby we weren't inheriting the - group id correctly when joining a group of existing threads. - Thanks to Valery Arkhangorodsky for - pointing this out. - -Tue Nov 24 03:50:09 1998 Kirthika Parameswaran - - * tests/DLL_Test.cpp: Renamed DLL_Wrapper_Test.cpp to - DLL_Test.cpp. Also, added ACE_OBJ_SUFFIX which takes care of the - object code convention on NT and UNIX platforms. Changed the - messages in ACE_ERROR to come from ACE_DLL::error(). - This is a running version tested using CC compiler too. - -Tue Nov 24 17:45:26 1998 Steve Huston - - * netsvcs/clients/Naming/Dump_Restore/Makefile: Added a LIBS += - $(ACELIB) to help this build on AIX. Thanks to Jon Lindgren - for reporting this problem. - - * README: Added Jon Lindgren to the contributor's list. Welcome, Jon! - -Tue Nov 24 09:34:58 1998 David L. Levine - - * include/makeinclude/platform_chorus.GNU: added support for - exceptions=0/1 make option. Thanks to Wei Chiang for - requesting this. - - * include/makeinclude/platform_chorus_ghs.GNU: removed - trailing / from MVME_DIR definition. - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: added - optimize=1, to enable optimization by default. - - * performance-tests/Misc/context_switch_time.cpp (main): - don't print suspend-resume results if the suspend-resume - test isn't run (because thr_suspend isn't supported). - Process command line options before calulating hi-res timer - scale factor. - - * ace/OS.h: replaced ENOTSUP with EDEADLK in a comment, - to fix a copy-and-paste error. - - * ace/Stats.* (mean): removed caching. It didn't account for - the fact that it could be called with different scale - factors. (std_dev): fixed sum_of_squares calculation to - always use 64-bit arithmetic. (print_summary): if the - std dev calculation overflows, retry with smaller scale - factor, until 0 is reached. - - * tests/Conn_Test.cpp: replaced #include of ace/Auto_Ptr.h, - because ACE_Auto_Basic_Array_Ptr is used. - -Mon Nov 24 03:30:36 1998 Kirthika Parameswaran - - * tests/DLL_Wrapper_Test.cpp: Added a test example for the DLL - wrapper class. - - * tests/Makefile: Added an entry for DLL_Wrapper_Test example. - -Mon Nov 23 23:49:36 1998 Kirthika Parameswaran - - * ace/DLL.h: Made the default value of the close_on_destruction - equal to 1. - - * ace/DLL.cpp (~ACE_DLL): Checked whether the member variable, - close_on_destruction_ is non-zero instead of comparing it to 1. - -Mon Nov 23 21:14:22 1998 Kirthika Parameswaran - - * ace/DLL.h (ACE_DLL): Set the default of close_on_destruction to - 1 instead of 0. - - * ace/DLL.cpp (~ACE_DLL): In the close operation, made a check for - whether the close_on_destruction_ flag was equal to 1 instead of - 0. - - * ace/DLL.cpp (get_handle): Made the close_on_destruction_ flag - equal to 0 when it gets orphaned as now the new owner has to - explicitly close the library. - -Mon Nov 23 20:29:52 1998 Douglas C. Schmidt - - * ace/DLL: Cleaned up the comments and also fixed an unnecessary - check to see if dll_name == 0. - -Mon Nov 23 10:20:22 1998 Kirthika Parameswaran - - * ace/DLL.h: Added a comment which specified that by default the - library would be closed before the ACE_DLL object gets - destroyed. - - * ace/DLL.cpp (get_handle): Changed the value for the member - variable, close_on_destruction_ to 1 on orphaning the handle - and giving it to the new owner. - -Mon Nov 23 17:14:40 1998 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_proactor.cpp (open): It is even - more neat to do this for faking the result. - // for Accept would have already moved the - // forward. Update it to the beginning position. - duplicate.wr_ptr (duplicate.wr_ptr () - bytes_transferred); - -Mon Nov 23 17:16:46 1998 Irfan Pyarali - - * ace/OS.h: Set the value of ACE_SHLIB_INVALID_HANDLE to 0 for HP. - Thanks to Steve Huston for providing this - information. - -Mon Nov 23 16:16:26 1998 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_proactor.cpp: Updated the code to - show that adjusting wr_ptr () to the place of rd_ptr () is the - better way to fake results properly. Thanks to "James A. Risinger" - for reporting this problem. - -Mon Nov 23 12:58:47 1998 Douglas C. Schmidt - - * examples/ASX/Message_Queue, - tests: - Replaced the improper (though technically correct) use of the - rd_ptr() with wr_ptr(). Thanks to Susan Liebeskind - for reporting this. - -Mon Nov 23 10:47:38 1998 David L. Levine - - * bin/generate_man_pages: added this script, which generates - the ACE man and html pages. - - * Makefile (release): added call to bin/generate_man_pages. - -Sun Nov 22 22:58:39 1998 Douglas C. Schmidt - - * ace/SPIPE_Addr.h: Replaced the use of an anonymous struct so - that class2man will be happy. Thanks to David Levine for - reporting this. - -Sun Nov 22 22:07:04 1998 David L. Levine - - * ace/Functor*: removed trailing // EOF because class2man choked - on it. - -Sun Nov 22 14:36:26 1998 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_proactor.cpp (open): Updated the - test to show the correct way to 'fake' call. - -Sun Nov 22 13:57:28 1998 Douglas C. Schmidt - - * ace/Makefile: Added Env_Value_T to the TEMPLATE_FILES macro in - the Makefile. Thanks to Ossama for reporting this. - -Sat Nov 21 14:32:53 1998 Douglas C. Schmidt - - * ace/DLL: Cleaned up the DLL logic to handle "close on - destruction" properly. - -Sat Nov 21 08:34:44 1998 David L. Levine - - * ace/OS.h: added ACE_LACKS_IP_ADD_MEMBERSHIP, for internal - use only. If IP_ADD_MEMBERSHIP isn't defined, ACE defines - ACE_LACKS_IP_ADD_MEMBERSHIP for subsequent use in - determining whether to define ip_mreq. - - * bin/html-windex: updated to match Doug's ~/bin version. - -Fri Nov 20 00:58:35 1998 Kirthika Parameswaran - - * ace/DLL.h (ACE_DLL): Added a new constructor which allows auto - opening of the dynamically linked library. - - * ace/DLL.h (get_handle): Added a method which returns teh handle - to the user. - - * ace/DLL.cpp (ACE_DLL): Added the auto-open feature taking care - of more than one open calls. - - * ace/DLL.cpp (get_handle): The orphan flag decides whether the - handle is orphaned or given to the user temporarily. - - * ace/DLL.cpp (open): Added a check so that a already existing - handle is closed before the next open is done. - -Fri Nov 20 23:40:12 1998 James CE Johnson - - * docs/tutorials/00[567]/client_handler.cpp : - * docs/tutorials/00[56]/page0[45].html - * docs/tutorials/007/page0[56].html - Rework the interaction of handle_input(), handle_close() and - close(). I had this all wrong by making handle_close() invoke - remove_handler() when it was unnecessary. - -Fri Nov 20 22:12:03 1998 Kirthika Parameswaran - - * ace/Makefile: Added an entry for DLL.{h,cpp}. - -Fri Nov 20 15:49:04 1998 Irfan Pyarali - - * ace/OS.h: Added ACE_SHLIB_INVALID_HANDLE which is used to - indicate a invalid shared library handle. - - * examples/Reactor/WFMO_Reactor/test_handle_close.cpp: This - application tests whether handle_close() gets called and if the - correct masks are passed along. The handler should get - handle_close() called for all three masks (READ, WRITE, and - EXCEPT). - - * ace/WFMO_Reactor.cpp (remove_handler_i, - remove_suspended_handler_i, and remove_to_be_added_handler_i): - There was a bug in WFMO_Reactor where handle_close() was not - called when it is not a complete removal. Added a call to - handle_close() for all the masks that were removed. Note that - partial removals do not change the state of the internal tables - of the reactor. - - * ace/OS.i (recvfrom): There is a bug in the Win32 implementation - of this function. It reports an error (with errno=WSAEMSGSIZE), - even MSG_PEEK is specified, when the message was too large to - fit into the specified buffer and was truncated. So we fixed it - by returning the length of the recv request when - errno=WSAEMSGSIZE and the MSG_PEEK flag was specified. - -Fri Nov 20 11:15:40 1998 David L. Levine - - * ace/config-sunos5.5.h: changed comment to use - -D_POSIX_PTHREAD_SEMANTICS to specify POSIX threads only. - Just commenting out ACE_HAS_STHREADS in insufficient. - See the Intro (3) man page for information on - -D_POSIX_PTHREAD_SEMANTICS; it's the Sun-recommended - way to specify use of POSIX threads. Thanks to - Rich Christy for pointing out that - removal of ACE_HAS_STHREADS doesn't work. - - * ACE-INSTALL.html: added notes on thread flavors on Solaris. - - * include/makeinclude/platform_sunos5_g++.GNU: added support - for threads=0. - - * ace/OS.cpp (thr_create): added static cast of PTHREAD_STACK_MIN - to size_t, to avoid signed/unsigned comparison on - g++ 2.7.2.3/Solaris86 2.6. - -Thu Nov 19 23:04:37 1998 Irfan Pyarali - - * ace/Functor.h (ACE_Command_Base): Added missing ACE_Export. - -Thu Nov 19 18:01:00 1998 Kirthika Parameswaran - - * ace/DLL.cpp (ACE_DLL): Made base-member initialisation change - to member variable close_mode_. - -Thu Nov 19 10:28:11 1998 David L. Levine - - * performance-tests/Misc/context_switch_time.cpp: fixed 64-to-32 - bit casts to work with unsigned 64 bit ACE_hrtime_t on NT. - -Wed Nov 18 20:56:38 1998 Kirthika Parameswaran - - * ace/DLL.{cpp,h} (ACE_DLL): Added the close-on-destruction - feature in the constructor of the ACE_DLL class. - -Thu Nov 19 00:18:26 1998 Irfan Pyarali - - * ace/OS.i (strnstr): Added a check to see if the substring is - longer than the string being searched. Fixed both the char and - wchar_t versions in OS.i and the ACE_USHORT16 version in - SString.cpp. Thanks to Knut Johannessen for - pointing out the bug and providing a fix. - - * ace/SString.i (find): The argument to strnstr() should be the - length of instead of len_ - pos>. - - * tests/SString_Test.cpp (main): Added tests to make sure that - find() and strstr() work even when the substring is longer that - the original string. - - * ace/Timeprobe_T.h (ACE_Timeprobe): Added accessors to the class - so that the user can get to the internals. This allows the - users to format the output of collecting the timeprobes - according to their liking. - -Wed Nov 18 15:51:42 1998 David L. Levine - - * ace/Basic_Types.h (ACE_UINT64_DBLCAST_ADAPTER): on other - than Win32 and without ACE_LACKS_LONGLONG_T, wrapped the - "n" macro definition with parenthesis, to avoid insidious - errors in equations due to removing the grouping. g++ 2.7.2.3 - noticed this on the latest context_switch_time.cpp. - - * ace/Svc_Handler.cpp (cleanup_hint): fixed ACE_TRACE string. - - * *.cpp: changed include protection from #if !defined to ifndef. - Added #pragma once, if possible, i.e., after #include of - an ace/ header. It can only be done after ace/config.h - is included, because some platforms don't allow #pragma once. - -Wed Nov 18 15:54:09 EST 1998 James CE Johnson - - * docs/tutorials/007/client_handler.cpp - * docs/tutorials/007/page06.html - - Jeff Donner (jdonner@schedsys.com) points out that Susan Liebskind's - fix to Tutorial 6 should also be applied to this one. - - The fix is: - Don't call baseclass close() from Client_handler::close(). Doing - so will result in double-delete of the handler object. - -Wed Nov 18 00:25:08 1998 Kirthika Parameswaran - - * ace/DLL.{h,cpp} (ACE_DLL): - Wrapper for dynamically linked library operations. - -Tue Nov 17 11:15:00 1998 Chris Gill - - * tests/version_tests/RB_Tree_Test.dsp - tests/version_tests/version_tests.dsw : created RB_Tree_Test project - for NT version tests and added it to version tests workspace. - -Tue Nov 17 10:15:10 1998 Nanbor Wang - - * ace/Map_Manager.cpp (resize_i): Made sure the new elements in - resize_i get constructed properly so we can use more complex - classes with it. Thanks to Knut Johannessen - for providing the patch. Also changed to use copy constructor - to move data across rather than construct/assign pair. - -Tue Nov 17 09:37:32 1998 David L. Levine - - * ace/config-linux-common.h: removed - ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR because it caused compilation - failure with egcs 1.0.2. - - * ace/config-g++-common.h: added ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR, - with egcs >= 1.1 only. Thanks to James Johnson for helping - to sort this out. - - * ace/config-osf1-4.0.h: moved ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR - from common area to DEC CXX area, because config-g++-common.h now - handles g++. - - * ace/IOStream_T.i (eof): fixed return value calculation - logic. Thanks to Arturo and James Johnson for providing - and verifying the fix. - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: - added -DVXWORKS to CFLAGS, because GHS 1.8.9 needs it. - (GHS 1.8.8 had a built-in processor define for it. Adding - -DVXWORKS doesn't seem to bother 1.8.8.) Thanks to Steve - Kay for reporting this. - - * ace/OS.h: even if ACE_HAS_IP_MULTICAST is not defined, if - IP_ADD_MEMBERSHIP is defined, assume that the ip_mreq struct - is also defined (presumably in netinet/in.h). This allows - compilation to succeed on GHS 1.8.9/VxWorks. Thanks to - Steve Kay for reporting it. - -Tue Nov 17 09:12:00 1998 Chris Gill - - * ace/SString.{h, i}: added < , > operators to string classes - - * apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp - tests/RB_Tree_Test.cpp: added missing template instantiations - - * tests/Makefile - tests/run_tests.sh : added RB_Tree test to UNIX makefile, test script - -Mon Nov 16 17:55:00 1998 Chris Gill - - * ace/Functor_T.{h, i} - ace/RB_Tree.{cpp, h, i} : added less-than comparison functor - (aka function object aka GOF Command Pattern) to allow ACE_RB_Tree - to be used with key types that do not support a < operator. - Thanks to Mark De Jong for reporting the less-than - problem and suggesting part of the solution. Also cleaned up class - naming and comments to conform to ACE coding standards, fixed an - access violation that occurred when deleting items from a tree. - - * tests/RB_Tree_Test.{cpp, dsp} - tests/run_tests.bat - tests.dsw: Added a test to verify correct tree - behavior under insertion and deletion for different key and item - types and insertion orders. - - * apps/JAWS/PROTOTYPE/HTTPU/http_headers.{cpp, h}: Changed type names - for ACE_RB_Tree and associated classes. - -Sun Nov 15 16:34:11 1998 David L. Levine - - * ace/config-osf1-4.0.h,config-linux-common.h: added - ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR #define. Thanks to - James Johnson for reporting that it is necessary. - - * ace/config-kcc-common.h: removed commented-out - ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR #define. - -Sun Nov 15 12:40:35 1998 James CE Johnson - - * docs/tutorials/018/* - * docs/tutorials/online-tutorials.html - A new tutorial on ACE_Token. - -Sun Nov 15 12:10:39 1998 James CE Johnson - - * docs/tutorials/013/* - - A few more tweeks now that the sun is up. Mostly simple - documentation changes but a couple of cleanups on the code as well. - -Sat Nov 14 23:15:58 EST 1998 James CE Johnson - - * docs/tutorials/013/message_queue.cpp - docs/tutorials/013/block.cpp - docs/tutorials/013/block.h - docs/tutorials/013/combine.shar - docs/tutorials/013/*.html - - Something changed between 4.5.x and 4.6 with the calling - order for ACE_Lock_Adapter<>::release() and ::destroy(). - - Specifically: In the older release, the data block's - lock was being held across its destruction. That required - some odd things to prevent the lock's deletion until it - was released. - - In the new version, it appears that release() is called - on the lock before the data block's destructor is called. - Data_Block::Lock::destroy() can now simply 'delete this' - The funky destroy_ flag is no longer necessary. - - Thanks to Bob McWhirter for causing me - to look back on this and get it fixed. - - I've also taken this opportunity to convert the tutorial - to the new style colorized HTML. - -Sat Nov 14 22:01:52 1998 David L. Levine - - * bin/make_release (diff): fixed logic that determines - when to use ../diffs/ instead of diffs/. Thanks to - Doug for reporting this. - -Sat Nov 14 14:21:49 1998 Douglas C. Schmidt - - * ACE version 4.6.4 released. - -Fri Nov 13 12:03:18 1998 Carlos O'Ryan - - * ace/config-irix6.x-sgic++.h: - * ace/config-irix6.x-sgic++-nothreads.h: - Under some versions of IRIX 6.X the readdir_r() prototype does - not show up unless threads support (actually POSIX1c support) is - enabled. I've change the config file to only use readdir_r() if - threads are enabled. Thanks to Bob Olson for - reporting this problem. - -Fri Nov 13 08:55:18 1998 David L. Levine - - * tests/Pipe_Test,Process_Mutex_Test.cpp: wrapped some variables - and functions with #ifndef ACE_LACKS_FORK, to avoid warnings - on g++/VxWorks. - -Thu Nov 12 09:07:28 1998 David L. Levine - - * bin/make_release: use ../diffs if building ace+tao kit, so - we no longer need a ../diffs symlink in TAO directory. Thanks - to Hans Rohnert for motivating this. - - * ace/README: removed ACE_LACKS_STREAM_MODULES. Thanks to - Ossama for reporting that it's no longer used. - -Wed Nov 11 23:11:15 1998 Darrell Brunsch - - * bin/ACEutils.pm: Updated to include $EXEPREFIX, which is used - in front of executables in the run_test.pl's. - -Wed Nov 11 01:08:32 1998 Nanbor Wang - - * ACE-INSTALL.html: Added a link to Ossama's ACE Configuration - Project. - -Tue Nov 10 22:29:00 1998 Douglas C. Schmidt - - * ACE version 4.6.3 released. - -Tue Nov 10 22:24:59 1998 Douglas C. Schmidt - - * docs/tutorials: Integrated Umar's code examples from - the ACE programmers manual. - -Tue Nov 10 21:53:01 1998 David L. Levine - - * ace/Process.cpp: added const to loop index, in CHORUS code. - -Tue Nov 10 19:27:32 1998 Darrell Brunsch - - * ace/OS.[i,cpp]: - Added checks for ACE_HAS_WINNT4 != 0 when checking for - ACE_HAS_WINNT4 like we do elsewhere. Thanks to Valery - Arkhangorodsky for pointing this out. - -Tue Nov 10 14:56:38 EST 1998 James CE Johnson - - * docs/tutorials/index.html - Including #17 now - - * docs/tutorials/017/*.html - docs/tutorials/017/combine.shar - Completed! Commented and converted into standared Tutorial format. - -Tue Nov 10 10:09:06 1998 David L. Levine - - * tests/Env_Value_Test.cpp (main): replaced hard-coded "/" with - ACE_DIRECTORY_SEPARATOR_STR. - - * ace/config-vxworks5.x.h: removed ACE_HAS_VERBOSE_NOTSUP #define. - Thanks to Margherita Vittone Wiersma and - Ramiro Penataro Blanco for complaining - about it. - -Mon Nov 9 23:27:59 1998 Douglas C. Schmidt - - * examples/ASX/Message_Queue/buffer_stream.cpp (main): Fixed an - off-by-one bug. Thanks to Rainer Blome - for reporting this. - -Mon Nov 09 21:31:56 1998 David L. Levine - - * tests/Env_Value_Test.cpp (main): prepended "./" to name of - file to spawn. With the last round of changes to - ace/Process.cpp, that's necessary if "." isn't in the user's - PATH. That's because we're now using only execvp, and no - longer using execve. - - * tests/Atomic_Op_Test.cpp,Barrier_Test.cpp,Buffer_Stream_Test.cpp, - Future_Test.cpp,IOStream_Test.cpp,MT_Reactor_Timer_Test.cpp, - Map_Manager_Test.cpp,Message_Block_Test.cpp, - Message_Queue_Notifications_Test.cpp,Notify_Performance_Test.cpp, - Pipe_Test.cpp,Priority_Buffer_Test.cpp,Priority_Task_Test.cpp, - Process_Mutex_Test.cpp,Reactor_Exceptions_Test.cpp, - Reactor_Notify_Test.cpp,Reactor_Performance_Test.cpp, - Reactors_Test.cpp,Reader_Writer_Test.cpp,SPIPE_Test.cpp, - SV_Shared_Memory_Test.cpp,Semaphore_Test.cpp,TSS_Test.cpp, - Task_Test.cpp,Thread_Manager_Test.cpp,Thread_Mutex_Test.cpp, - Thread_Pool_Reactor_Test.cpp,Thread_Pool_Test.cpp, - Tokens_Test.cpp,UPIPE_SAP_Test.cpp,Upgradable_RW_Test.cpp, - XtReactor_Test.cpp: - changed Log_Priority of "not supported" messages to LM_INFO. - Hopefully, it will help avoid confusion, especially among - new ACE users. Thanks to Gonzo for suggesting this. - - * tests/run_tests.sh: added ACE version number printouts. - - * BUG-REPORT-FORM: added phase (compilation/linking/execution/other), - and ACE+TAO/application/both. - -Mon Nov 9 02:52:11 1998 Douglas C. Schmidt - - * ace/Signal.cpp: handle_close() wasn't being called when - handle_signal() returns -1. It is now... Thanks to Vicentini - Emanuele for reporting this. - - * ace/Event_Handler.h (ACE_Event_Handler): Added a SIGNAL_MASK so - that we can pass this to handle_close() when handle_signal() - returns -1. - - * README: Fixed a typo where ACE-install.html was misspelled as - ACE-Install. Thanks to Michael Thomas - for reporting this. - -Sun Nov 08 22:00:22 1998 David L. Levine - - * ace/Message_Block.h: changed ACE_Message_Type to int, to - avoid overload ambiguity when it's unsigned. - -Sun Nov 8 10:42:38 1998 Douglas C. Schmidt - - * ace/Message_Block.h: Changed the ACE_Message_Type from being an - enum to being an ACE_UINT32 so that it's easier for users to add - their own message types to an ACE_Message_Queue. Thanks to - Martin Krumpolec for this suggestion and to - David Levine for catching that it should be an ACE_UINT32. - -Fri Nov 6 23:08:16 1998 Douglas C. Schmidt - - * ace/Process.cpp (spawn): Set result correctly when execvp() is - called. Also, make sure to check for putenv() failing. Thanks - to David Levine for pointing this out. - - * tests/Env_Value_Test.cpp: Reformatted the test a bit. - -Fri Nov 06 22:41:21 1998 David L. Levine - - * ace/Process.cpp (spawn): initialized local "result" to 0 - to avoid egcs warning about possible unitialized use. Added - const to loop index to avoid egcs warning about discarding - const. - - * ace/OS.h,Basic_Types.h: moved ACE_UINT64_FORMAT_SPECIFIER from - OS.h to Basic_Types.h, because other 64-bit int support is - there. Changed default ACE_UINT64_FORMAT_SPECIFIER to - "%llu", because that's what Solaris 2.x uses. - - * ace/config-win32-common.h,ace/config-linux-common.h: added - ACE_UINT64_FORMAT_SPECIFIER overrides. - - * ace/Log_Msg.cpp (log): added ACE_U_LongLong support. - -Fri Nov 6 13:29:11 1998 Douglas C. Schmidt - - * ace/OS.h (ACE_UINT64_FORMAT_SPECIFIER): Changed - #define ACE_UINT64_FORMAT_SPECIFIER "%I64d" - - to: - - #define ACE_UINT64_FORMAT_SPECIFIER "%I64u" - - to handle the signed/unsigned stuff correctly. Thanks Zoran! - - * ace/Process.cpp (spawn): Replaced the use of execve() with - execvp() by copying the environment variables manually first. - Thanks to Avi Nash for this fix. - - * ace/Log_Msg.cpp (log): Added support for a `%Q' format specifier - to the log() method. This prints out quad words, i.e., - ACE_UINT64's. Thanks to Zoran Ivanovic for - contributing this. - - * Updated the "site map" for ACE so that it doesn't use absolute - links. Thanks to Rainer Blome for - contributing this. - - * ace/Process.h: Clarified the behavior of ACE_Process and - ACE_Process_Options on UNIX because of the use of execve(), - which doesn't search the path. Thanks to Avi Nash for reporting - this. - -Fri Nov 06 15:01:20 1998 Rainer Blome - - * tests/run_tests.sh: augmented to make, run, and discard - each test for which it doesn't find an executable. - - Thus, if you first say make to build the executables, all tests - will just run (or not ;-), nothing is changed. - - If you start run_tests.sh without having built the executables, - it will make, run and discard the tests one by one instead. - Any compiler output goes to log/compilation.log. - -Fri Nov 06 12:58:24 1998 Nanbor Wang - - * ace/Thread_Manager.cpp: Removed several superfluous parens so - the code looks clearer and less error-prone. - -1998-11-06 James CE Johnson - - * docs/tutorials/013/block.cpp - * docs/tutorials/013/page05.html - * docs/tutorials/015/Compressor.cpp - * docs/tutorials/015/Crypt.cpp - * docs/tutorials/015/Recv.cpp - * docs/tutorials/015/Xmit.cpp - * docs/tutorials/015/*.html - Susan Liebeskind (susan.liebeskind@gtri.gatech.edu) discovered - that you can't use the 'inherited' typedef to initialize a - baseclass if you use the AIX C++ compiler. - -Fri Nov 06 08:57:49 1998 David L. Levine - - * tests/Mem_Map_Test.cpp (reverse_file): put the volatile - qualifier back in. LynxOS 3.0.0/PowerPC needs it with -O2 - and without ACE_HAS_INLINE. - - * VERSION: added reference to BUG-REPORT-FORM. Thanks to - Peter Nordlund for providing the new - text. - - * ace/SOCK_Dgram_Mcast.cpp (unsubscribe): fixed ACE_TRACE - string. - - * ACE-INSTALL.html: added note on possibly having to change - -G to -shared in platform_macro.GNU's SOFLAGS with GNU linker. - Thanks to Andy Gokhale and James Megquier for - reporting this. If anyone knows of an automagic fix, that would - be appreciated. - - * ACE-INSTALL.html: added note on how to enable IP multicast on - LynxOS. - -Thu Nov 5 23:10:46 1998 Nanbor Wang - - * ace/Thread_Manager.cpp (wait_task): Fixed a wrong parenthesis - pair. Thanks to Bob McWhirter for figuring - this out. - -Thu Nov 5 21:41:26 1998 James CE Johnson - - * docs/tutorials/017 - Began the ACE_Barrier tutorial. So far, it's just code but I'll - add the usual heavy comments & commentary in the next few days or - so. I'll update the docs/tutorials/index.html after that. - -Thu Nov 5 14:42:59 1998 Douglas C. Schmidt - - * ACE-INSTALL.html: Cleaned up a typo in the ACE-INSTALL.html - file. Thanks to James Megquier for reporting - this. - - * ace/config-sunos5.5.h: Cleaned up the comments a bit to make it - more clear how to enable/disable threads. Thanks to Russ - Noseworthy for reporting this. - - * ace/Stream.h: Clarified some subtleties with subclassing from - ACE_Stream. Thanks to Stephen Coy for reminding me of this. - - * include/makeinclude: Updated the platform_linux_kcc.GNU file. - Thanks to Joseph Weihs for reporting - this. - - * ACE.FAQ.html: Pointed out that ACE is Y2K compliant. Thanks to - Fredrik Lindahl for suggesting this. - -Thu Nov 05 13:23:29 1998 David L. Levine - - * include/makeinclude/platform_lynxos.GNU: default VERSION - to 3.0.0. We no longer build/test for LynxOS 2.5.0. Added - usage comments. - - * ACE-INSTALL.html: for LynxOS, added link to platform_lynxos.GNU - file, for usage information. Replaced some absolute paths in - URLs with relative paths. - -Wed Nov 4 23:28:55 1998 Douglas C. Schmidt - - * ace/Stream.h: Made all the methods of ACE_Stream virtual to - enable subclasses. Thanks to Bob McWhirter's for this - suggestion. - -Tue Nov 3 16:06:23 1998 Douglas C. Schmidt - - * examples/Logger/simple-server: Fixed the server so that it shuts - down cleanly when ^C is given. Thanks to Avi Nash - for reporting this. - -Tue Nov 03 13:17:49 1998 Nanbor Wang - - * ace/Thread_Manager.{h,i,cpp} (thread_desc_self): Changed this - method to an inline function. Removed outdated comments and - instead of searching thru the list when the current thread's - descriptor is not found in TSS cache, place an assertion there - for this should never happen. Thanks to Terry Rosenbaum - for motivating the change. - -Mon Nov 2 22:54:08 1998 Darrell Brunsch - - * ace/config-win32.h: - * ace/config-win32-common.h: - Only define ACE_LACKS_RECVMSG/SENDMSG for non-WinSock2 systems. - Before, it was being defined for all non-NT configurations. - Thanks to Irfan for suggesting this change. - -Mon Nov 2 18:18:04 1998 Douglas C. Schmidt - - * examples/Reactor/Dgram/CODgram.cpp, - examples/Reactor/Dgram/Dgram.cpp: - Fixed these programs so that they will work across - processes/machines, as well as within the same process. Thanks - to Larry for reporting this. - - * Added a "site map" for ACE. Thanks to Rainer Blome - for contributing this. - -Mon Nov 2 18:13:29 EST 1998 James CE Johnson - - * docs/ACE-FMM.html - Updated from Bob's latest. - -Mon Nov 02 11:22:30 1998 Nanbor Wang - - * tests/Thread_Pool_Reactor_Test.{h,cpp}: Renamed Acceptor_Handler to - Request_Handler to better reflect what the class actually does. - - * docs/ACE-categories.html: Fixed erroneous html tags. Thanks to - Rainer Blome for reporting this. - -Mon Nov 02 00:26:59 1998 Irfan Pyarali - - * ace: Since connectors really don't have any state, they don't - need to inherit from the SAP classes. Therefore, modified the - following to be simpler: - - TLI_Connector - DEV_Connector - SPIPE_Connector - UPIPE_Connector - -Sun Nov 01 21:18:24 1998 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (upcall): Before handle_input is called - because of FD_CLOSE, we check the return value of handle_input - because of FD_READ. If the user had returned -1, we won't call - handle_input again. Thanks to Gonzalo Diethelm - for suggesting this change. - - * examples/Reactor/WFMO_Reactor/test_network_events.cpp - (handle_input): Changed this method to keep reading from the - socket until EWOULDBLOCK occurs. - -Sun Nov 1 17:32:50 1998 Douglas C. Schmidt - - * tests/Hash_Map_Manager_Test.cpp (run_test): Oops, we need to - account for compilers that lack template specialization! Thanks - to David Levine for reporting this. - -Sun Nov 01 17:24:56 1998 David L. Levine - - * ace/config-win32-borland.h,config-win32-common.h,README: - removed ACE_LACKS_STL_DEFAULT_TEMPLATE_PARAMETER because - it's no longer used. Thanks to Ossama for reporting this. - -Sun Nov 01 08:54:08 1998 Douglas C. Schmidt - - * ACE version 4.6.2 released. - -Sat Oct 31 18:12:36 1998 Douglas C. Schmidt - - * tests/Hash_Map_Manager_Test.cpp (run_test): updated the test to - validate that the trybind() operation works correctly. Thanks - to Bill Fulton for this - fix. - - * ace/Hash_Map_Manager.cpp: trybind() was doing the "Wrong - Thing"[TM] by overwritting the INT_ID even if the entry was - already in the map! It's fixed now... Thanks to Bill Fulton - for reporting this. - -Sat Oct 31 17:15:42 1998 Douglas C. Schmidt - - * ACE version 4.6.1 released. - -1998-10-31 Nagarajan Surendran - - * ace/Select_Reactor_T.cpp (dispatch): Added signal_occurred at - the right return to indicate that a handle_signal () has been - dispatched. - -Fri Oct 30 20:31:27 1998 Darrell Brunsch - - * tests/Semaphore_Test.cpp: Cleaned up the #if's to make it easier - to understand, and fixed a related problem. Thanks to - Ossama for finding this. - -Fri Oct 30 15:47:39 1998 Douglas C. Schmidt - - * ace/Select_Reactor_T.cpp (dispatch): Make sure to include a - count of 1 if the Reactor dispatched a handle_signal() method. - This ensures we don't return 0 from handle_events() in cases - where we didn't timeout... Thanks to Naga for chasing this - down! - -Fri Oct 30 11:53:16 1998 David L. Levine - - * ace/config-sunos5.6.h: removed ACE_HAS_POSIX_SEM #define because - it caused a seg fault in Reactor_Notify_Test on - g++ 2.7.2.3/Solaris86 (with -D_POSIX_C_SOURCE=199506L - -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__). The seg fault is - at the end of the test: - - #0 0xdfd5a809 in realfree () - #1 0xdfd5ad16 in cleanfree () - #2 0xdfd5a43a in _malloc_unlocked () - #3 0xdfd5a2e9 in malloc () - #4 0xdfd61a25 in _strdup () - #5 0xdfeffcd5 in ACE_Log_Msg::log (this=0x8052ec0, - format_str=0x804f0af "(%P|%t) Ending %s test at %D\n", - log_priority=, - argp=0x80476ac "\nð\004\bÔÀÿß\177\023\004\bÔv\004\b§¹\004\b\001") - at /export/home/conga/levine/ACE_wrappers/ace/OS.i:1399 - #6 0xdfeffbfa in ACE_Log_Msg::log (this=0x8052ec0, - log_priority=, - format_str=0x804f0ac "d\n") at Log_Msg.cpp:601 - #7 0x804c935 in main () at Reactor_Notify_Test.cpp:297 - - It's hard to imagine how ACE_HAS_POSIX_SEM could cause that. - But, it's perfectly repeatable. And, we can live without - ACE_HAS_POSIX_SEM. - - * tests/run_tests.sh: really commented out Thread_Pool_Reactor_Test. - It _wasn't_ commented out in the 4.6 release. - - * tests/Mem_Map_Test.cpp (reverse_file): removed volatile - qualifier because it no longer seems to be necessary for LynxOS - 3.0.0/PowerPC. - -Fri Oct 30 09:23:55 1998 Douglas C. Schmidt - - * ace/SString.h: Cleaned up the ACE_SString comments to be more - helpful. Thanks to Ivan Murphy for - motivating this. - -Thu Oct 29 22:19:19 1998 James CE Johnson - - * docs/ACE-FMM.html: - Updated from Bob's latest version. Thanks Bob! - -Thu Oct 29 21:13:41 1998 James CE Johnson - - * docs/tutorials/016/Condition_i.cpp: - Fixed messed-up the signature on - Condition::operator Condition::value_t(void) - -Thu Oct 29 18:51:19 1998 Steve Huston - - * ace/ACE.cpp: Added "|| defined (_AIX)" to decision to do - template instantiations at end of file. Thanks to Ian - Wright for this fix. - - * ace/config-aix-4.1.x.h: Added ability to use g++ in addition to xlC. - Thanks again to Ian Wright for this addition. - - * include/makeinclude/platform_aix_g++.GNU: New platform_macros file - for building on AIX with g++. And, once again, thanks to Ian Wright - for this contribution. - - * ace/NT_Service.i: Added ACE_INLINE to the methods in this file. - Thanks to Goran Lowkrantz - for this fix. - -Thu Oct 29 17:36:29 1998 Darrell Brunsch - - * tests/Semaphore_Test: Removed the timed acquire stuff from - the worker thread and the display at the end of the test. - Now it shouldn't output the confusing "100% of threads - timed out" message on platforms without timed acquire. - -Thu Oct 29 15:25:19 1998 Nanbor Wang - - * ace/Svc_Handler.cpp (open): Added a trailing newline to the - error message. - -Thu Oct 29 15:13:07 EST 1998 James CE Johnson - - * docs/tutorials/index.html - * docs/tutorials/016/* - Added Tutorial 016. This discusses ACE_Condition<> and ways - to make it more manageable in an application. - -Thu Oct 29 11:44:21 1998 David L. Levine - - * ace/config-sunos5.6.h: changed ACE_THREAD_POSIX_SEM to - ACE_HAS_POSIX_SEM. It looked like a typo. - Only #define ACE_HAS_POSIX_SEM if _POSIX_PTHREAD_SEMANTICS is - #defined. Thanks to Ossama for help with this. - - Also, removed ACE_HAS_PTHREADS_STD because it's - #defined in config-sunos5.5.h. - -Wed Oct 28 14:30:01 1998 Rainer Blome - - * ace/Makefile: added AIX_TEMPLATE_HACK support. - This patch helps using Rob Jordan's trick described in the - ACE-INSTALL file. The existing description in the ACE-INSTALL - is a little misleading. Creating a ACE_All_Tmp.h will not - really help, because the Makefile will look for a ACE_All_Tmp.cpp. - - Here's how to use the patch: - - Use `make ACE_All' to create 0_ACE_All_Src.h, 0_ACE_All_Src.cpp and - 0_ACE_All_Tmp.cpp. These files contain include directives for each - of the files mentioned in the makefile variables FILES and - TEMPLATE_FILES. Then `make AIX_TEMPLATE_HACK=1' to compile the - library in one go. Compilation is fast then, but `ar' will still - take a long time. - -Wed Oct 28 09:13:10 1998 David L. Levine - - * ACE-INSTALL.html: expanded discussion of non-static - ACE_Object_Manager, including the fact that it's the - default config on Win32 and VxWorks. And that not - declaring main () with two arguments will lead to - link failure due to unresolved ace_main_i. - - * tests/Time_Service_Test.cpp,Tokens_Test.cpp: display - filename if ACE_Process::spawn () fails. - - * tests/run_tests.sh: only run Time_Service_Test if - ../netsvcs/server/main exists. Also, exit if a command - line argument is provided to run_tests.sh, and the argument - is not a Chorus hostname. - - * ace/Object_Manager.h: declare the ACE_Object_Manager_Base - methods to be public, instead of protected, for DEC CXX 5.6 - (in addition to Diab for PSoS). Thanks to Doug Anderson - for suggesting this. - - * ace/config-sunos5.5.h: removed ACE_HAS_TIMER_SKEW. Thanks - to Russ Noseworthy for verifying - that it no longer seems to be necessary. - - * ace/config-linux-common.h: added ACE_HAS_PROCFS. - -Tue Oct 27 22:14:18 1998 David L. Levine - - * ACE version 4.6 released. - -Tue Oct 27 21:54:17 1998 Douglas C. Schmidt - - * man: Added the ACE_Service_Repository_Iterator.{html,3} files. - Thanks to Erik Koerber for reporting - this. - - * Updated the manual pages to reflect the latest APIs in - the new release. - -Tue Oct 27 14:16:27 1998 James CE Johnson - - * docs/tutorials/015/Recv.cpp : Changed atoi() to ACE_OS::atoi() - * docs/tutorials/015/page22.html: Ensure that the correct cpp - and header files are HREF'd - - Thanks to Susan Leibeskind for catching these. - -Tue Oct 27 12:31:28 1998 Nanbor Wang - - * ace/OS.i (cond_timedwait): Made sure the broadcaster always gets - signaled no matter what the "wait" function return if this is - the last waiter for this cv. In any case, the calling thread is - no longer waiting on the cv any more. - -Tue Oct 27 08:22:41 1998 David L. Levine - - * ace/config-win32.h: fixed typo in comment: - ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER instead of - ACE_DONT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER. Thanks to - Olivier Lau for reporting this. - - * tests/Semaphore_Test.cpp (test_timeout_count,test_timeout): - put these in #ifndef STHREADS && #ifndef POSIX_SEM protection - to avoid compiler warnings about unused variable/function. - - * ace/config-sunos5.5.h: added comment to comment out - ACE_HAS_REGEX if there are link problems with g++ or egcs on - SunOS 5.5. Thanks to Hakan Kallberg for - reporting this. - - * ACE-INSTALL.html: added Sun C++ version/patchlevel information, - including a link to Sun's tech patches home patch. Thanks to - Susan for recommending this, and for providing the URL. - - * ACE-INSTALL.html: added note about segfault when attempting to - register a signal handler on LynxOS 3.0.0/PowerPC. - - * ace/Object_Manager.cpp (fini): added check of - instance_->shutting_down_ on entry. This will avoid - reentrance if fini () is called before the Object_Manager - is (explicitly) destroyed. Thanks to Gonzo for reporting it. - -Tue Oct 27 05:47:21 1998 Douglas C. Schmidt - - * ACE version 4.5.65 released. - -Tue Oct 27 03:24:36 1998 Nanbor Wang - - * ace/TP_Reactor.h: Added an description for TP_Reactor. - - * ace/OS.i (cond_timedwait): When emulating cv, there're chances - that the "wait for being signaled" function times out and return - an error. In this rare case, we must also signal the - broadcasting thread to bail out of cond_broadcast to avoid - deadlock since we are no longer waiting on the cv anymore. - Thanks to Detlef Becker for - noticing the problem and providing the patch. - -Mon Oct 26 20:59:15 1998 David L. Levine - - * ace/Synch_T.{i,cpp} (ACE_Lock_Adapter): uninlined the - ACE_Lock_Adapter default constructor. SunPRO C++ 4.2 + patch - 104631-07 has trouble compiling TAO with it inline. - Thanks to Terry Rosenbaum - for tracking this problem down and providing the fix. - -Mon Oct 26 18:33:28 1998 Carlos O'Ryan - - * Updated the dependencies in all the Makefiles, this was required - after the new Message_Block_T.{h,i,cpp} files. - -Mon Oct 26 19:16:27 1998 James CE Johnson - - * docs/tutorials/000/index.html: This index is has a layout - similar to Umar's ACE Tutorial document. As time progresses, we - will be merging the examples in his document into the online - tutorials. The current free-form tutorials will not go away but - will be supplimented with Umar's more structured approach. - -Mon Oct 26 17:37:55 1998 Carlos O'Ryan - - * ace/OS.h: - * ace/config-sunos5.4-sunc++-4.x.h: - * ace/config-sunos5.5.h: - Sun/CC throws the ::xalloc exception when operator new cannot - allocate the memory, thanks to Terry Rosenbaum - for reporting this and - providing a patch. - - * ace/Makefile: - Updated dependencies. - -Mon Oct 26 17:02:48 1998 Nanbor Wang - - * tests/Thread_Pool_Reactor_Test.cpp: Reduced the number of - connector threads _ONLY_ on platforms that couldn't handle too - many simultaneous connection. - - Changed to use dotted-decimal format to specify connection - endpoint for some platforms don't have a decent DNS support. - -Mon Oct 26 12:04:10 1998 Nanbor Wang - - * ace/ace_lib.dsp: Added TP_Reactor into the project. - -Mon Oct 26 11:29:55 1998 Darrell E. Brunsch - - * tests/Semaphore_Test.cpp: Changed behavior for ACE_HAS_STHREADS - and ACE_HAS_POSIX_SEM so it still tests everything but doesn't - test the timed waits. - -Mon Oct 26 08:22:18 1998 David L. Levine - - * docs/ACE-guidelines.html: added recommendation and - explanation re. use of #pragma once. - - * docs/ACE-guidelines.html: recommend avoiding g++ 2.8.1. - - * tests/SV_Shared_Memory_Test.cpp: don't try to run this - test if ACE_LACKS_FORK, because it uses ACE_OS::fork (). - It allocates the shared memory segment before the fork, - of course, so that was leaked if the fork was attempted - but failed. - - * tests/Pipe_Test.cpp,Process_Mutex_Test.cpp: don't try - to run these tests if ACE_LACKS_FORK, either. - - * tests/Mem_Map_Test.cpp (reverse_file): use a local, volatile - variable for the array index. Without it, the test core dumps - on LynxOS 3.0.0/PowerPC with -O2. - - * tests/run_tests.sh: run Timer_Queue_Test and Upgradeable_RW_Test - on LynxOS. - - * tests/run_tests.vxworks: changed - Message_Queue_Notifications_Test.cpp to - Message_Queue_Notifications_Test. - -Mon Oct 26 01:49:44 1998 Nanbor Wang - - * tests/Env_Value_Test.cpp (main): Changed argv and envp to type - LPTSTR[]. - -Sun Oct 25 23:52:40 1998 Douglas C. Schmidt - - * ACE version 4.5.64 released. - -Sun Oct 25 22:18:26 1998 Douglas C. Schmidt - - * ace/Select_Reactor_T.cpp (dispatch): Be more careful in how we - handle dispatching when signals occur. In general, if we're - interrupted by a non-Reactor-aware signal handler we need to - bail out... Thanks to Naga for reporting this. - - * examples/Reactor/Misc/test_signals_1.cpp: Cleaned up this test - so that it'll show off the signal handling capabilities of the - ACE Reactor better. - -Sun Oct 25 14:13:31 1998 Darrell Brunsch - - * ace/OS.i: Changed ACE_OS::sigaction to work with a null value - for on Windows. Thanks to Jim Buck for - reporting this. - - * examples/Reactor/Misc/reactors.dsp: - * examples/Reactor/Misc/signals_1.dsp: - * examples/Reactor/Misc/signals_2.dsp: - Corrected the include and library paths. Thanks to - Zoran Ivanovic for reporting this. - - * ChangeLog: Removed all the trailing spaces and tab characters so - CVS's commit-check will be happy. - -Sun Oct 25 10:59:21 1998 Douglas C. Schmidt - - * ace/config-sunos5.5.h: Added - - #if defined (i386) - #define ACE_HAS_X86_STAT_MACROS - #endif /* i386 */ - - to check for the [f]stat macros on Solaris for Intel. Thanks to - Daniel Nieten for reporting this. - -Sun Oct 25 00:15:03 1998 Nanbor Wang - - * ace/Service_Config.cpp (process_directives): We should use - ASYS_WIDE_STRING to convert a to a UNICODE string. - -Sat Oct 24 18:39:11 1998 Steve Huston - - * ace/ACE.cpp (get_ip_interfaces, get_handle): Add _AIX to the list - of macros which enable the proper code for these to work. - ACE::get_ip_interfaces still doesn't work right on AIX, though - - it reports one link-level interface. May need to get IBM's help - with this. - -Sat Oct 24 18:07:00 1998 Nanbor Wang - - * ace/OS.h (ACE_TEXT): Consolidated various ACE_TEXT definitions - into one and place it near the beginning of the file. - Re-indented macros. - -Sat Oct 24 17:47:15 1998 Arturo Montes - - * ace/OS.i (sigwait): Sigwait is little different with FSU - pthreads, sigwait take two arguments and return -1 if error, 0 - in otherwise. - -Sat Oct 24 17:26:41 1998 Darrell Brunsch - - * ace/OS.h (ACE_TEXT): Moved Nanbor's changes outside of - ACE_PSOS block. - - * ace/config-win32.h: Defined ACE_HAS_TEXT_MACRO_CONFLICT, - seeing that MSVC already defines __TEXT. - -Sat Oct 24 15:21:32 1998 Nanbor Wang - - * ace/OS.h (ACE_TEXT): Changed the macro __TEXT to ACE_TEXT to - avoid conflicting with OS/390. __TEXT is still available for - backward compatibility unless ACE_HAS_TEXT_MACRO_CONFLICT is - defined. However, using ACE_TEXT is prefered for obvious - reason. Thanks to Paul K. Fisher for - reporting this. - - * ace/README: Added documentation for ACE_HAS_TEXT_MACRO_CONFLICT. - - * *.cpp: Replaced a bunch of __TEXT to ACE_TEXT. - -Sat Oct 24 08:34:08 1998 Douglas C. Schmidt - - * ace/OS.i: Updated the fstat() and stat() calls to work properly - on the Solaris for Intel platform, which does weird things to - the fstat() and stat() functions to handle 32 and 64 bit file - offsets. Thanks to Daniel Nieten for - reporting this. - -Sat Oct 24 02:13:11 1998 Detlef Backer - - * ace/OS.cpp (invoke): ACE_Thread_Adapter::invoke() swapped the - nesting level of __except() and __finally() because if the - selector returns EXCEPTION_EXECUTE_HANDLER a global unwind takes - place, activating nested __finally blocks and in this case - terminating the thread before having a chance to execute the - handler. After reversing the logic, now the exception handler - gets called first before the termination handler is invoked. - - Furthermore I added the call to GetExceptionInformation(), - passing the result as a void* into the selector function. This - allows a case sensitive handling startegy of the exception in - the selector function. - - (inherit_log_msg): In ACE_Thread_Adapter::inherit_log_msg() I - moved the copy operation from the selector and handler - attributes outside of the "if (this->ostream_)" condition, - because I don't think this condition is related to the SEH. - - (thr_create): In ACE_OS::thr_create() I "inherit" the current - selector handler into the newly created ACE_Thread_Adapter in - case that the caller did not specify one at invocation. - - * ace/Thread_Manager.cpp (spawn_i): In - ACE_Thread_Manager::spawn_i() I added the initialization of - selector and handler at the creation time of - ACE_Thread_Adapter. - -Fri Oct 23 21:11:03 1998 Douglas C. Schmidt - - * ace/OS.h: Changed a comment to be consistent. Thanks to Serge - Kolgan for reporting this. - -Fri Oct 23 20:39:00 1998 Chris Gill - - * Paul Christopher Gill was born Friday October 23, 1998, at - 20:39 CDT, weighing 6 lbs. 7 oz., at 19 3/4 inches in length. - A true hacker in the making, Paul decided to work through the - evening even though it was a Friday night. ;-) - -Fri Oct 23 11:37:38 1998 Steve Huston - - * include/makeinclude/platform_aix4.2.GNU: Removed -qinitauto=5F from - DCFLAGS - with it, Process_Strategy_Test was going CPU bound in an - ostream operation. - -Fri Oct 23 00:27:11 1998 Douglas C. Schmidt - - * ACE version 4.5.63 released. - -Thu Oct 22 21:32:14 1998 Darrell Brunsch - - * ACE-INSTALL.html: Since we've been successfully using MSVC 6.0 - for a while, might as well mention it here in the documentation. - -Thu Oct 22 19:48:20 1998 James CE Johnson - - * docs/index.html - Reformatted it via emacs to make it more readable when editing. - Added a comment pointing to Bob McWhirter's original FMM document - to make it easier to update the repository in the future. - - * docs/tutorials/015/Client.h - * docs/tutorials/015/Client.cpp - * docs/tutorials/015/Server.h - * docs/tutorials/015/Server.cpp - - Since Windows just *pretends* to have mixed-case names the cpp - files conflict with client.cpp and server.cpp. I renamed these - files to: - - * docs/tutorials/015/Client_i.h - * docs/tutorials/015/Client_i.cpp - * docs/tutorials/015/Server_i.h - * docs/tutorials/015/Server_i.cpp - - Which necessitated changes to - * docs/tutorials/015/client.cpp - * docs/tutorials/015/server.cpp - * docs/tutorials/015/Makefile.client - * docs/tutorials/015/Makefile.server - * docs/tutorials/015/Makefile - * docs/tutorials/015/combine.shar - * docs/tutorials/015/*.html - - Thanks to Darrell Brunsch for catching this. - - -Thu Oct 22 16:52:21 1998 Steve Huston - - * tests/Thread_Pool_Reactor_Test.(cpp h): Adjusted debug output to - learn more about what's happening; added a check to be sure that - the correct number of messages are processed by each Svc_Handler. - -Thu Oct 22 15:46:42 1998 David L. Levine - - * ace/OS.cpp (ACE_TSS_Emulation::tss_base): if storage for - the TSS data must be allocated off the heap, zero all of it. - This avoids problems after fork in the child process on - LynxOS. - -Wed Oct 21 22:23:06 1998 Douglas C. Schmidt - - * ACE version 4.5.62 released. - -Wed Oct 21 21:19:53 1998 Douglas C. Schmidt - - * ace/Service_Config.cpp (process_directives): Replaced a - return -1 with a result = -1 and a break to avoid a - memory leak. Thanks to David for pointing this out. - -Wed Oct 21 20:00:51 1998 Nagarajan Surendran - - * tests/Timer_Queue_Test.cpp : - * tests/Map_Manager_Test.cpp: - * tests/Dynamic_Priority_Test.cpp: - Replaced double with ACE_timer_t everywhere so that it works on - platforms like Chorus. - -Wed Oct 21 18:44:26 1998 Nagarajan Surendran - - * tests/run_tests.sh: Changed egrep Chorus to CHORUS to identify a - Chorus vme board. - -Wed Oct 21 17:51:52 1998 Steve Huston - - * ace/ACE.cpp (get_ip_interfaces): If compiling on Win32 w/ Winsock 2, - use WSAIoctl(SIO_GET_INTERFACE_LIST) to get the interfaces from the - kernel rather than trying to fish through the registry. This should - help TAO's naming service be somewhat more reliable on Win32, as - well as solve some other nasties that plagued this thing. - - * ace/ws2tcpip.h: Filled out necessary pieces for the above change. - -Wed Oct 21 14:19:11 EDT 1998 James CE Johnson - - * docs/tutorials/007/thread_pool.cpp - * docs/tutorials/007/thread_pool.h - Alison Greig's question caused me to look back at these and - I find that an older g++ is unhappy about the close() methods. - It seems to confuse the baseclass 'close(u_long flags=0)' with - my derived 'close(void)' even though I also have 'close(u_long)'. - Anyway, I removed my 'close(void)' and now do all of my work in - the other method. - - * docs/tutorials/007/client_handler.cpp:handle_input() - Now using ACE_OS::thr_equal() instead of operator==() - This fixes Alison's problem. (Thanks for the solution David!) - -Wed Oct 21 07:12:32 1998 David L. Levine - - * tests/Thread_Pool_Reactor_Test.cpp: moved #include of - tests/Thread_Pool_Reactor_Test.h inside of ACE_HAS_THREADS - protection, so that it will compile without thread support. - Thanks to Jan Perman for - reporting this. - - * tests/MT_Reactor_Timer_Test.cpp: moved "the_reactor" declaration - outside of ACE_HAS_THREADS protection, so that it will compile - without thread support. Thanks to Jan Perman - for reporting this. - - * bin/g++dep: added -DACE_LACKS_PRAGMA_ONCE to keep it - quiet when the config.h doesn't #define it. Thanks to - Naga for reporting this. - - * ace/config-g++-common.h: protected #define of ACE_LACKS_PRAGMA_ONCE, - because g++dep now defines it with a -D. - - * ACE-INSTALL.html: updated Linux and LynxOS version status, - and egcs --enable-shared discussion. - - * ace/Hash_Map_Manager.cpp (operator *): only declare local "result" - without ACE_NDEBUG, to avoid compile warning with debug=0. - - * ace/Synch.cpp (ACE_Recursive_Thread_Mutex::release): only - declare local "t_id" without ACE_NDEBUG, to avoid compile warning - with debug=0. - - * ace/Timer_Heap_T.cpp (reschedule): only declare local "timerID" - without ACE_NDEBUG, to avoid compile warning with debug=0. - - * ace/SV_Message_Queue.h: fixed #ifndef protection to use - ACE_SV_MESSAGE_QUEUE_H instead of ACE_MESSAGE_QUEUE_H, to - prevent collision with the Message_Queue.h's protection. - Thanks to Rainer Blome for - reporting this. - - * ace/Object_Manager.cpp: removed some old, unused printouts. - -Tue Oct 20 19:40:41 1998 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: Added - -DACE_LACKS_PRAGMA_ONCE - aCC on both 10.20 and 11.00 complain about - #pragma once. Added it here rather than in config.h because (1) it - can be set in one file, not two, (2) in case a #pragma gets in before - config.h is included somehow. - - * include/makeinclude/platform_aix4.2.GNU: Revised flags passed to - xlC_r - remove -qextchk because it's the cause of the mismatched - type errors building netsvcs/lib (IBM reports this is fixed in - compiler version 3.6.4). Removed -M - it's not needed and wastes - disk space. Moved -qcheck to DCFLAGS and added -qinitauto=5F to - DCFLAGS. - - * include/makeinclude/rules.local.GNU: Added SHLIBA to the files that - get 'realclean'ed - this covers libACEshr.a on AIX. - - * netsvcs/lib/Makefile: - * netsvcs/clients/Naming/Client/Makefile: Added ACELIB to LIBS to - insure libACE is linked in. - -Tue Oct 20 19:37:42 1998 James CE Johnson - - * docs/tutorials/014/*.html: - * docs/tutorials/014/Makefile: - * docs/tutorials/014/combine.shar: - Colorized using the new and improved 'combine' script. Also - modified the Makefile so that the HTML sources won't get destroyed - if the shar operation failed. - - * docs/tutorials/015/Makefile: - Added the same Makefile modification to prevent loss of HTML sources - -Tue Oct 20 16:28:12 1998 David L. Levine - - * ACE-INSTALL.html: added recommended DU CXX version info. - Thanks to Susan Liebeskind - for suggesting this. - - * ACE-INSTALL.html: added AIX 4.2.1 xlC V3.1 patch info. - Thanks to Susan Liebeskind - for supplying it, in ready-to-use form. - - * tests/Thread_Manager._Test.cpp (main): changed debug messages - for suspend_grp/resume_grp with Pthreads, which fail due to - ENOTSUP. The resume_grp message was wrong (copy and paste - error). In addition, I reworded the messages to that - run_tests.check won't catch them. They don't indicate a - problem, just that Pthreads doesn't support those operations; - see Steve's Thu Oct 15 16:40:41 1998 entry. - -Tue Oct 20 14:31:37 EDT 1998 James CE Johnson - - * docs/tutorials/001/Makefile - * docs/tutorials/002/Makefile - * docs/tutorials/003/Makefile - * docs/tutorials/005/Makefile - * docs/tutorials/006/Makefile - * docs/tutorials/007/Makefile - * docs/tutorials/008/Makefile - * docs/tutorials/009/Makefile - * docs/tutorials/010/Makefile - * docs/tutorials/011/Makefile - * docs/tutorials/012/Makefile - * docs/tutorials/013/Makefile - * docs/tutorials/012a/Makefile - * docs/tutorials/Makefile - - Updated these makefiles to remove rules.lib.GNU - Added the "top-level" makefile to allow building - of all tutorials in one step. - -Tue Oct 20 12:54:39 1998 David L. Levine - - * ACE version 4.5.61 released. - -Tue Oct 20 07:43:56 1998 David L. Levine - - * include/makeinclude/platform_irix6.x_g++.GNU: added - LIBS += -lpthread. Thanks to Peter Nordlund - for reporting that it is needed. - - * ace/config-irix6.x-sgic++-nothreads.h,config-irix6.x-common.h: - moved ACE_HAS_GPERF from SGI C++ config to common SGI C++/g++ - config. Thanks to Peter Nordlund for - recommending this. - - * ace/config-aix-4.1.x.h,config-dgux-4.11-epc.h,config-dgux-4.x-ghs.h, - config-irix5.2.h,config-irix5.3-g++.h,config-irix5.3-sgic++.h, - config-m88k.h,config-tandem.h,config-osf1-3.2.h, - config-sunos5.4-centerline-2.x.h,config-sunos5.4-g++.h, - config-sunos5.4-sunc++-4.x-orbix.h,config-sunos5.4-sunc++-4.x.h, - config-sunos5.5.h,config-unixware-2.01-g++.h, - config-unixware-2.1.2-g++.h,config-irix6.x-common.h,README: - removed ACE_HAS_SVR4_TIME because it is no longer used. - Thanks to Peter Nordlund for - reporting this. - - * tests/MT_Reactor_Timer_Test.cpp (handle_exception, - handle_timeout): added ACE_UNUSED_ARG's. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: - added #include of ace/streams.h, because the dump () - method uses ofstream. - - * examples/Connection/non_blocking/CPP-acceptor.cpp (handle_close): - added ACE_UNUSED_ARG's. - - * ace/config-sunos5.5-sunc++-4.x.h,config-sunos5.5-g++.h: - removed, because config-sunos5.5.h should be used instead. - - * performance-tests/Misc/basic_perf.cpp (iteration_time): - added static cast 0 to ACE_hrtime_t to please g++ - on VxWorks (which uses ACE_U_LongLong for ACE_hrtime_t). - - * ace/config-cygwin32-common.h: removed msg_accrights{,len} - defines, because they were commented out. - - * OS.h,config-aix-4.1.x.h,config-linux-common.h,README: - added ACE_LACKS_MSG_ACCRIGHTS support. This consolidates - code that was in both of the config files. Thanks to - Ossama for suggesting it. - - * include/makeinclude/platform_vxworks*.GNU: moved our - wind installation from /project/doc/wind to /project/doc/pkg/wind. - -Tue Oct 20 07:09:31 1998 Steve Huston - - * ace/config-aix-4.2.x.h: Added ACE_HAS_GPERF. - - * tests/tests.(mak mdp): Fixed to build clean; Added: - DLList_Test, High_Res_Timer_Test, Dynamic_Priority_Test, - Thread_Pool_Reactor_Test, Upgradable_RW_Test, MT_Reactor_Timer_Test. - -Mon Oct 19 21:40:56 1998 David L. Levine - - * *.h: changed include protection from #if !defined to ifndef. - Added #pragma once, if possible, i.e., after #include of - an ace/ header. It can only be done after ace/config.h - is included, because some platforms don't allow #pragma once. - - * include/makeinclude/wrapper_macros.GNU: removed -DACE_LACKS_PRAGMA - for g++ because it's now in config-g++-common.h. - -Mon Oct 19 20:44:33 1998 James CE Johnson - - * docs/tutorials/015: - Once again I've modified just about every file. Finally though - Tutorial 015: Protocol Stream is done! - - * docs/tutorials/combine - Get rid of that silly "links" file and add "bodies". The new file - is an ordered list of files to use when assembling the HTML - pages. This makes it easier to stuff source code into the pages. - - * docs/tutorials/index.html - I could have sworn that I linked in 014 many moons ago. - Appologies to Bob McWhirter for leaving this out for so long! - -Mon Oct 19 17:00:52 EDT 1998 James CE Johnson - - * docs/tutorials/015: - Just about everything in this directory has been touched. I'm - in the middle of documenting it and need a checkpoint so nothing - gets lost! ETA for completion is later tonight or sometime tomorrow. - -Mon Oct 19 11:47:20 1998 David L. Levine - - * ace/OS.cpp (readPPCTimeBase): wrapped each line in "". - Otherwise, the C++ compiler on MVS complains unterminated - strings. Even though it isn't supposed to see this code :-/ - Thanks to Chuck Gehr for - reporting this. - - * ace/config-g++-common.h: added ACE_LACKS_PRAGMA_ONCE. - g++ doesn't need it, because it optimizes includes if the #ifndef - header protection convention is followed. And, it - complains about #pragma once. - - * ace/config-win32-common.h: added ACE_LACKS_PRAGMA_ONCE, - unless _MSC_VER < 1000. - -Mon Oct 19 11:13:00 1998 Chris Gill - - * ace/Message_Block.h: Added title and description comments to - deadline and laxity message priority strategy classes. - -Sun Oct 18 17:22:00 1998 James CE Johnson - - * docs/tutorials/014/combine.shar: - * docs/tutorials/015/combine.shar: - The additional input files to the combine script. A shell archive - seems to be the most economical way to keep their history. - Individual files just create clutter and a tar.gz wouldn't be - diff-able in the repository. - - * docs/tutorials/014/Makefile: - * docs/tutorials/015/Makefile: - Adjusted to create the HTML and combine.shar files. - -Sun Oct 18 16:51:43 1998 James CE Johnson - - * docs/tutorials/combine: A perl script for combining several - "source" files into an HTML. It was designed to combine comment - files with .cpp and .h files in the creation of tutorials. The - HTML output is commited to the repository, I haven't decided yet - if it's worth saving the input. - - * docs/tutorials/fix.Makefile: This was pulled out of one of the - old tutorials and made a bit more useful. It's purpose is to pull - dependency information out of a Makefile and create a .depend file - instead. This keeps makfiles cleaner and less confusing. - - * docs/tutorials/014/Makefile - * docs/tutorials/014/Task.cpp - Minor changes. I attempted to add THR_JOINABLE to the activate() - call but that resulted in a permanent hangup on Linux when trying - to exit the application - - * docs/tutorials/015/Client.cpp - * docs/tutorials/015/Client.h - * docs/tutorials/015/Compressor.cpp - * docs/tutorials/015/Compressor.h - * docs/tutorials/015/Crypt.cpp - * docs/tutorials/015/Crypt.h - * docs/tutorials/015/Handler.cpp - * docs/tutorials/015/Handler.h - * docs/tutorials/015/Makefile - * docs/tutorials/015/Makefile.client - * docs/tutorials/015/Makefile.server - * docs/tutorials/015/Protocol_Stream.cpp - * docs/tutorials/015/Protocol_Stream.h - * docs/tutorials/015/Protocol_Task.cpp - * docs/tutorials/015/Protocol_Task.h - * docs/tutorials/015/Recv.cpp - * docs/tutorials/015/Recv.h - * docs/tutorials/015/Server.cpp - * docs/tutorials/015/Server.h - * docs/tutorials/015/Xmit.cpp - * docs/tutorials/015/Xmit.h - * docs/tutorials/015/client.cpp - * docs/tutorials/015/page01.html - * docs/tutorials/015/page02.html - * docs/tutorials/015/page03.html - * docs/tutorials/015/page04.html - * docs/tutorials/015/page05.html - * docs/tutorials/015/page06.html - * docs/tutorials/015/server.cpp - The beginnings of a protocol stream tutorial. The code is done but - the tutorializing (eg -- HTML and comments) isn't complete. - -Sat Oct 17 21:20:44 1998 David L. Levine - - * ace/OS.i (gethrtime): updated comments on Alpha rpcc - instruction. Only 32 bits of high-res tick count are - available, even the 64 bits are read by the rpcc instruction. - The high 32 bits are for implementation-specific use, such - as a virtual tick counter. - -Sat Oct 17 13:41:57 1998 Douglas C. Schmidt - - * test/Future_Test.cpp: Added more comments so that the structure - and participants in the Active Object pattern would be more - obvious. - - * ace/Message_Block: Added a priority parameter, which defaults to - 0, to one of the constructor for ACE_Message_Block so that it - simplifies the new Method_Request semantics. - - * ace/Method_Request.h: Added priority() accessor/mutator methods - so that we can control where a Method_Request is placed in the - Activation_Queue, which is just a Facade for an - ACE_Message_Queue. - - * ace: Renamed ACE_Method_Object to ACE_Method_Request to - correspond to the new version of the Active Object pattern at - http://www.cs.wustl.edu/~schmidt/Act-Obj.ps.gz. This change - involved renaming the Method_Object.h and Method_Object.cpp - files to Method_Request.h and Method_Request.cpp, respectively. - For backwards compatibility, I kept the Method_Object.h file, - which now just includes Method_Request.h and adds a typedef of - ACE_Method_Request to ACE_Method_Object so no applications - should break. New applications should use the new names, - however. - - * ace/Acceptor.h: Moved the - ACE_Oneshot_Acceptor::register_handler() method into the private - part of the class so that users won't be tempted to call it! - Thanks to Larry for reporting this. - - * examples/Connection/non_blocking/CPP-acceptor: Fixed a bug that - occurred when timers were used in conjunction with the - ACE_Oneshot_Acceptor and handle_close(). - - * ace/Acceptor: Cleaned up the ACE_Oneshot_Acceptor comments. - Boy, this was confusing ;-). Thanks to Larry - for reporting this. - -Sat Oct 17 12:54:17 1998 Douglas C. Schmidt - - * ACE version 4.5.60 released. - -Sat Oct 17 12:50:44 1998 Douglas C. Schmidt - - * Fixed a number of warnings that crept into the release - yesterday. Thanks to David Levine and DEC C++ for - reporting these. - -Sat Oct 17 00:35:21 1998 Douglas C. Schmidt - - * ACE version 4.5.59 released. - -Sat Oct 17 00:29:37 1998 Douglas C. Schmidt - - * ace/Service_Config.cpp (process_directives): Only warn about a - missing svc.conf file if we're debugging. - -Fri Oct 16 23:16:30 1998 David L. Levine - - * docs/ACE-guidelines.html: 1) use complete sentences for - comments and 2) use prefix operators where possible, such - as on an iteration loop index. - -Fri Oct 16 15:45:08 1998 Douglas C. Schmidt - - * ace/Service_Config: Added a new method called - init_svc_conf_file_queue() that will properly initialize the new - queue containing the list of svc.conf files. - - * ace/Service_Config: Added a return value to parse_args() to make - sure we do a sanity check... - - * ace: Replaced all #if !defined (ACE_FOO_H) with #ifndef - ACE_FOO_H since many C++ preprocessors can recognize this idiom - and optimize for it. - - * ace/Service_Config.cpp (parse_args): Modified the -S option to - enqueue the directives in FIFO order rather than in LIFO order. - It's more intuitive to process them in the order they are - received! - - * ace/Service_Config: It's now possible to give multiple -f - options to the Service Configurator and it will open multiple - files and process each one in the order specified in argv. This - is useful if svc.conf are generated by automatic tools, e.g., - Wizards, that are operating independently. Thanks to David - O'Farrell for suggesting this. - - * tests/Upgradable_RW_Test.cpp: Revised the programming style ;-). - - * tests/Map_Manager_Test.cpp: Replaced all uses of postfix ++ - operators with prefix ++ operators because they are faster when - iterating over the various Maps. - - * ace/[Hash_]Map_Manager: Today we decided to remove the use of - locking for the ACE[_Hash]_Map_Manager Iterators. The original - scheme acquired the mutex of the [Hash_]Map_Manager on every - ++operator++/--operator-- call. Not only was this very - inefficient, but it was also essentially useless since it - doesn't protect against arbitrary insertions/deletions in the - underlying map during the iteration. - - Our first thought was to put an ACE_Read_Guard into the iterator - itself and acquire this for the duration of the iteration. - However, this approach is totally broken when using STL-style - iterators since the postfix ++ and -- operators return a copy of - the iterator, which easily causes deadlocks if non-recursive - mutexes are used. - - After much discussion, we decided it's better to let users - figure out their own locking usecase, rather than have the - iterators guess wrong and either screw up their code or yield - substantial inefficiencies. Therefore, the right approach is to - do something like this: - - typedef ACE_Map_Manager MAP_MANAGER; - typedef ACE_Map_Iterator ITERATOR; - typedef ACE_Map_Entry ENTRY; - - void - foo (MAP_MANAGER &map) - { - // ... - { - // Explicitly grab the lock and hold it for the duration of - // the iteration. - ACE_READ_GUARD (ACE_Thread_Mutex, ace_mon, map.mutex ()); - - ITERATOR end = map.end (); - - for (ITERATOR iter = map.begin (); - iter != end; - ++iter) - { - ENTRY &entry = *iter; - ++i; - } - // ... - } - - Note that as a general rule, it's better to use ++i rather than - i++ to avoid unnecessary copies. - -Fri Oct 16 14:57:58 1998 Irfan Pyarali - - * ace/Hash_Map_Manager and Map_Manager: Fixed the operator++ and - operator--. Also, moved the guard from the individual methods - to the iterator. Now, the read guard is held for the life time - of the iterator. - -Fri Oct 16 14:51:57 1998 Nanbor Wang - - * ace/OS.cpp (thr_create): Made sure if users don't specify - whether to spawn threads detached or joinable, we'd change the - creation flag for them so that they are always joinable (not - detached.) This is important for unify the thread behavior on - different platforms that have various default thread creation - policies. Thanks to Susan Liebeskind - for motivating the change. - -Fri Oct 16 01:28:17 1998 Douglas C. Schmidt - - * ACE version 4.5.58 released. - -Thu Oct 15 23:50:41 1998 Douglas C. Schmidt - - * ACE version 4.5.57 released. - -Thu Oct 15 22:05:02 1998 Douglas C. Schmidt - - * ace/ACE.cpp (unique_name): Moved the arguments around in the - sprintf() in order to generate a better "unique name". Thanks - to Bob McWhirter for suggesting this. - -Thu Oct 15 21:20:36 1998 Irfan Pyarali - - * ace/Hash_Map_Manager.cpp (operator-- and operator++): - * ace/Map_Manager.cpp (operator-- and operator++): - - Fixed by value and by reference return values. - -Thu Oct 15 20:16:46 1998 James CE Johnson - - * docs/ACE-FMM.html: Updated with Bob McWhirter's latest changes. - Discussion of race conditions when spawning threads from within a constructor. - -Thu Oct 15 18:30:58 1998 Douglas C. Schmidt - - * ace/OS.h: Added ACE_HTONS(x) macros to complement ACE_HTONL(x) - macros. Thanks to Balaji Srinivasan - for reporting this. - - * ace/[Hash_]Map_Manager.cpp: Postfix and prefix were inverted. - They are correct now. Thanks to Balaji Srinivasan - for reporting this. - -Thu Oct 15 18:02:51 1998 Darrell Brunsch - - * ace/config-win32.h: For non-winnt systems, define - ACE_LACKS_RECVMSG and ACE_LACKS_SENDMSG. Thanks to Bill Hall - for pointing this out. - - [BTW, Bill was the 400th individual to contribute an ACE/TAO - bug report, thanks to everyone for all their help over the years!] - -Thu Oct 15 16:50:09 1998 Nanbor Wang - - * ace/SOCK_Dgram_Mcast.i (set_option): Need to convert the - from char to int for Win32 because the shortest length - of must be at least sizeof (int) on Win32. Thanks - to Johan Lundin for reporting this. - -Thu Oct 15 16:40:41 1998 Steve Huston - - * tests/Thread_Manager_Test.cpp: Allow suspend/resume to be tried on - pthreads, but don't allow any error other than ENOTSUP. This - catches a bug in Thread_Manager that lost the error values on an - error. - - * ace/Thread_Manager.cpp (ACE_THR_OP macro): Don't remove a thread - from the active threads list if an operation fails with ENOTSUP. - This was causing calls to suspend_grp/resume_grp to erase the list - of threads in a group on pthreads, then wait_grp didn't wait because - it thought there weren't any more threads. - -Thu Oct 15 12:43:46 1998 Nanbor Wang - - * ace/Task.cpp (activate): Changed to activate new active objects - using the same grp_id if this task has been activated before and - no new grp_id is specified in activate method. Also, the task's - grp_id will only get updated if it has never been updated even - if is set. This prevent the original - get lost but the consequence if that if users select to - force_activate new tasks with a different grp_id, the new grp_id - will get lost and the only way to wait for these threads is to - either perform a wait for all threads, or wait for each - individual thread by waiting on the thread handles returned by - the activate method. Thanks to Bob McWhirter - for motivating this change. - (ACE_Task_Base): Changed to initialize to -1. - -Thu Oct 15 10:07:13 1998 David L. Levine - - * ACE version 4.5.56 released. - -Thu Oct 15 09:54:07 1998 David L. Levine - - * tests/run_tests.sh: commented out MT_Reactor_Timer_Test because - it doesn't halt on g++/Solaris or DU 4.0. - - * include/makeinclude/wrapper_macros.GNU: for g++, added - -DACE_LACKS_PRAGMA_ONCE to CCFLAGS. Thanks to Kirk Ellet - for pointing out that is has to be done - in CCFLAGS rather than as a #define in OS.h, because - ace/Synch_T.h uses the pragma before config.h is #included. - -Wed Oct 14 23:20:45 1998 Douglas C. Schmidt - - * ACE version 4.5.55 released. - -Wed Oct 14 22:17:31 1998 David L. Levine - - * docs/ACE-guidelines.html: added guideline for protection of - header files against multiple inclusion. Thanks to - Eric C. Newton for pointing out the construct - used by gcc/g++ to minimize unnecessary file inclusion. - Fortunately, other compilers use the same method. And, - thanks to Susan Liebeskind for being - the last ACE user to suggest something like this, and to - Pat McNerthney for spurring the search for - such an optimization. - -Wed Oct 14 12:36:00 1998 Douglas C. Schmidt - - * tests/run_tests.sh: Added the MT_Reactor_Timer_Test. - - * tests/MT_Reactor_Timer_Test.cpp: Fixed a number of bugs with - this test. It seems to work fine on Solaris now. - - * tests/MT_Reactor_Timer_Test.cpp (main): Added a test to make - sure that the ACE_Reactor::handle_events() method properly - counts the number of expired timers. - - * ace/Select_Reactor_T: Updated the various methods so that - handle_events() now works as advertised, i.e., it actually - returns the number of event handlers it dispatched. - - * ace: Added - - #if !defined (ACE_LACKS_PRAGMA_ONCE) - #pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - - To all the header files in ACE. This should speed up - compilation time on platforms whose C++ compilers support - #pragma once. Thanks to Patrick J. McNerthney - for suggesting this. - - * ace/Functor.h: Moved the definitions of the constructor and - destructor of ACE_Command_Base into the *.i file. - - * ace/Select_Reactor_T: Enhanced dispatch_timer_handlers() so that - it passes the number of timers dispatched as an out parameter to - avoid any ambiguity. - -Wed Oct 14 15:30:42 1998 Steve Huston - - * ace/Message_Block_T.h: Removed ACE_Export from definition of template - class ACE_Locked_Data_Block. - -Wed Oct 14 12:36:00 1998 Douglas C. Schmidt - - * ace/config-cygwin32-common.h, - ace/config-cygwin32.h, - ace/OS.h: - Added support for Cygwin32. Thanks to Phil Feairheller - for contributing this. - - * ace/config-vxworks5.x.h, - ace/config-chorus.h, - ace/config-psos*.h, - ace/config-cygwin32-common.h, - ace/OS.i: - Added and used the new ACE_LACKS_MKFIFO macro. Thanks to Phil - Feairheller for reporting this. - -Wed Oct 14 11:03:45 1998 Douglas C. Schmidt - - * ACE version 4.5.54 released. - -Wed Oct 14 00:28:10 1998 Douglas C. Schmidt - - * ACE version 4.5.53 released. - -1998-10-14 Nagarajan Surendran - - * ace/Synch_T.cpp : Changed ACE_mutex_t to ACE_cond_t for CHORUS - in ACE_Condition constructor. - -1998-10-13 Nagarajan Surendran - - * ace/Synch.i (ACE_Mutex::remove): Added a #else for non-chorus - cases instead of #endif to call ACE_OS::mutex_destroy. - - * ace/OS.cpp : Added static member definition - KnCap ACE_OS::actorcaps_[ACE_CHORUS_MAX_ACTORS] - for CHORUS. - - * ace/config-chorus.h: Added ACE_HAS_TSS_EMULATION. - -Tue Oct 13 22:40:40 1998 Carlos O'Ryan - - * ace/Makefile: - * ace/Message_Block.h: - * ace/Message_Block.i: - * ace/Message_Block.cpp: - * ace/Message_Block_T.h: - * ace/Message_Block_T.i: - * ace/Message_Block_T.cpp: - Added a new variant of the ACE_Data_Block class that holds an - instance of its locking strategy, this is useful because in some - cases the lifetime of the lock is tied to the lifetime of the - Data_Block itself. The Message_Block class was carefullly - modified to support this new feature, i.e. it does not hold a - lock while removing the data block because the hold may be part - of the data block itself. Still all the features in the - Message_Blocks are supported, for instance, a complete - Message_Block chain ca be destroyed while holding a single lock, - shared by all the Data_Blocks in the chain. - -Tue Oct 13 22:39:42 1998 David L. Levine - - * tests/MM_Shared_Memory_Test.cpp (client): added an - ACE_ASSERT to check that shm is non-zero. - - * ace/OS.h,config-chorus.h,README: added - ACE_HAS_PTHREAD_PROCESS_ENUM support. Thanks to - Alberto Villarica and Naga - for tracking the problem with Semaphore_Test hanging. - - * ace/OS.h: changed default PTHREAD_PROCESS_SHARED from 0 to 1. - That way, it's different than PHTREAD_PROCESS_PRIVATE. - -Tue Oct 13 22:09:12 1998 Irfan Pyarali - - * ace/Mem_Map.cpp (map_it): One more try to get this right ;) - Thanks to Jonathan Reis for the bug - reports, suggested fixes, and test program. - -Tue Oct 13 21:17:37 1998 Alexander Babu Arulanthu - - * ace/Asynch_IO.cpp: - * ace/Proactor.cpp: Fixed the problem with POSIX4 implementation - of Asynch_Transmit_File. Thanks to James Hu and Irfan for - reporting this problem and helped me on the fixes. - -Tue Oct 13 18:07:21 1998 Steve Huston - - * ace/config-aix-4.2.x.h: Set up so it should work with gcc as well - as xlC. Rearranged defs and removed some duplicates. - Enabled ACE_HAS_4_4BSD_SENDMSG_RECVMSG and removed the redefs - of msgbuf fields. - - * tests/Thread_Pool_Reactor_Test.cpp: Moved the definition of - Acceptor_Handler to a new file, Thread_Pool_Reactor_Test.h to - satisfy AIX xlC's template instantiation. - -Tue Oct 13 15:56:09 1998 Nagarajan Surendran - - * ace/OS.i: Fixed a few errors on CHORUS. - -Tue Oct 13 08:48:36 EDT 1998 James CE Johnson - - * docs/ACE-tutorials.html - * docs/ACE-FMM.html - Added Bob McWhirter's "Frequently Made - Mistakes" list. - -Tue Oct 13 07:28:38 1998 David L. Levine - - * ace/High_Res_Timer.cpp (dump): replaced ACE_static_casts with - ACE_CU64_TO_CU32, because the method is const. Thanks to Doug - for reporting this. - - * ace/Thread_Manager.cpp (join): replaced __xlC__ test with - _AIX. That way, g++ and xlC will both use the three-arg - join call on AIX. Thanks to Ian Wright - for reporting this. - - * ace/Makefile,examples/Bounded_Packet_Relay/Makefile: - updated dependencies. - - * ace/OS.[hi],config-fsu-pthread.h,config-aix-4.[12].x.h, - config-mit-pthread.h,config-hpux-10.x.h,config-hpux11.h, - config-irix6.x-{g++,sgic++}.h,config-mvs.h,config-tandem.h, - config-osf1-3.2.h,config-osf1-4.0.h,config-sco-5.0.0-mit-pthread.h, - config-irix6.x-common.h,README: - removed ACE_HAS_TID_T and ACE_HAS_PTHREAD_T support. ACE_hthread_t - is now a simple typedef of pthread_t. It was before, also, but not - so simple :-) Before, it was a typedef of tid_t on platforms - that had ACE_HAS_TID_T but not ACE_HAS_PTHREAD_T. There were - no such platforms; so, it was pthread_t on all PTHREADS platforms. - Thanks to Ossama, Arturo, and Steve for sorting all this out. - We ended up with just a single typedef, so it was worth it. - - * ace/OS.i (thr_cmp): use pthread_equal with PTHREADS, same as - in ACE_OS::thr_equal (). Thanks to Ossama for pointing out that - they were different, but shouldn't have been. - - * ace/config-aix-4.2.x.h,config-fsu-pthread.h,config-hpux-10.x.h, - config-hpux11.h,config-irix6.x-{g++,sgic++}.h,config-mit-pthread.h, - config-mvs.h,config-osf1-3.2.h,config-osf1-4.0.h, - config-sco-5.0.0-mit-pthread.hconfig-tandem.h,README: - removed ACE_HAS_PTHREAD_EQUAL because it's no longer used. Thanks - to Ossama for motivating the above change to thr_cmp, which had - been the only use of ACE_HAS_PTHREAD_EQUAL. - - * ace/Log_Record.h,OS.h: changed C++-style comments to C-style - comments in preprocessor directives. Thanks to - Fernando D. Mato Mira for reporting these. - -Tue Oct 13 00:19:42 1998 Douglas C. Schmidt - - * ace/OS.i (sema_destroy): I believe I've fixed the rats nest of - #ifdefs to get semaphores to work correctly on Chorus again. - Thanks to Naga for tracking this down! - - * ace/High_Res_Timer.cpp: Temporarily commented out the - ACE_static_casts so that this will compile with CC. - - * ace/Hash_Map_Manager, - ace/Map_Manager: - Added a public mutex() accessor that allows us to return a - reference to the lock_. This is useful for cases where we're - using ACE_Process_Mutex and need to call remove(). Thanks to - Bob McWhirter for this suggestion. - -Mon Oct 12 23:03:26 1998 Douglas C. Schmidt - - * ace/Mem_Map.cpp (map_it): Added a minor fix to handle the fact - that Chorus doesn't support filesize() on a shared memory - segment. Thanks to Alberto Villarica - for reporting this. - -Mon Oct 12 22:18:03 1998 David L. Levine - - * ace/High_Res_Timer.cpp (dump): cleaned up output so that it - works and is consistent across all platforms. (long long - printing is not portable: some platforms use %llu and - others use %Lu). - -Mon Oct 12 18:39:09 1998 Irfan Pyarali - - * ace/Mem_Map.cpp: Revised the code to take the offset into - account when deciding whether to grow the backing store. - - Also, ACE_Mem_Map was trying to be too clever when it tries to - make sure that your offset is a multiple of the allocation - granularity. It ends up messing up user offset and length - calculations. Therefore, I have taken this out of ACE_Mem_Map - code. Users is still welcome to use - ACE_OS::allocation_granularity and - ACE::round_to_allocation_granularity by themselves. - -Mon Oct 12 14:39:15 1998 Douglas C. Schmidt - - * ace/Parse_Node.cpp: Added some ACE_const_casts to cleanup the - casting going on here. - - * examples/ASX/CCM_App/CCM_App.cpp: We need to make sure and use - the ACE_SVC_FACTORY_* macros so that the gobbler will be set - correctly. Purify rules! - - * ace/Makefile: Make sure to add the // $ Id: $ CVS string when - recreating Svc_Conf_Tokens.h. - - * ace/Svc_Conf.y: Just to be paranoid, make sure to set the - gobbler function to 0. At least this way we'll get crashes - rather than bizarre errors if users don't use the ACE_*FACTORY* - macros. - -Mon Oct 12 19:19:27 1998 James CE Johnson - - * docs/ACE-tutorials.html: - Added a link to Bob McWhirter's Frequently Made Mistakes page. - - * docs/tutorials/014/Makefile - * docs/tutorials/014/Task.{cpp|h} - * docs/tutorials/014/EndTask.h - * docs/tutorials/014/stream.cpp - * docs/tutorials/014/page0[123456].html - A slightly modified version of Bob McWhirter's ACE_Stream tutorial. - -Mon Oct 12 15:59:00 1998 David L. Levine - - * ace/Message_Block.cpp (size): removed unused local "old_base". - -Mon Oct 12 11:24:45 PDT 1998 James Hu - - * Asynch_IO.cpp: Minor changes to deal with FMR error. - - * Message_Block.{cpp,i,h}: Changed rd_ptr_ and wr_ptr_ to be - byte offsets from base (). This allows one to resize a - duplicate without trashing other Message_Blocks that may be - referring to the same data block. - - * Proactor.cpp: Made the message block 64 bytes bigger to make - purify happier. - -Mon Oct 12 12:14:45 1998 Douglas C. Schmidt - - * ace/Parse_Node.cpp (ACE_Stream_Node): In error cases, the strops - parameter can be NULL. Therefore, we need to protect against - this case. Thanks to David O'Farrell - for reporting this. - -Mon Oct 12 10:43:09 1998 Alexander Babu Arulanthu - - * ace/Asynch_IO.cpp (ACE_Asynch_Result): Fixed a double deletion - problem. Thanks to James Hu for reporting this. - -Mon Oct 12 09:43:07 1998 Carlos O'Ryan - - * ace/Containers_T.h: - * ace/Containers_T.cpp: - Added a new method to modify the size of an ACE_Array. - -Mon Oct 12 09:23:49 1998 David L. Levine - - * netsvcs/lib/Name_Handler.cpp (lists_entries): one more try - to fix the egcs 1.1b bug: removed the ptmf temporary entirely. - -Sun Oct 11 17:33:22 1998 Douglas C. Schmidt - - * ace/Synch.cpp: Fixed a typo, s/lock_/process_lock_/. Thanks to - Naga for noticing this. - -Sun Oct 11 08:19:33 1998 David L. Levine - - * ace/config-linux-common.h: re-enabled msg_* undefs and defines, - but for libc5 (non-glibc) only. Thanks to JM Strauss - for verifying that they're needed. - - * netsvcs/lib/Name_Handler.cpp (lists_entries): replaced - switch statement with a multi-branch if statement, to - avoid Internal compiler error 980331 with egcs 1.1b (2.91.57) - (on Linux/alpha). - -Sat Oct 10 18:30:02 1998 Douglas C. Schmidt - - * ace/Synch_T: Added a process condition abstraction for Chorus - that is based on a condition variable stored in shared memory. - Thanks Alberto Villarica for - this. - - * ace/Synch: Added a process mutex abstraction for Chorus that is - based on a mutex stored in shared memory. Thanks Alberto - Villarica for this. - - * ace/config-chorus.h: Updated the config file for Chorus. Thanks - Alberto Villarica for this. - - * ace/OS.i: Added rudimentary flock support for Chorus. Thanks - Alberto Villarica for this. - - * ace/OS.i: Added exec*() support for Chorus. Thanks Alberto - Villarica for this. - - * ace/config-chorus.h: Added #include of file . - - * ace/Local_Name_Space_T.cpp (create_manager_i): Added a special - case for CHORUS so that we use a base address of 0. Thanks to - Alberto Villarica for reporting - this. - - * ace/Local_Name_Space_T.cpp (create_manager_i): Don't use - ACE_OS::access() if the platform lacks it. Thanks to Alberto - Villarica for reporting this. - -Sat Oct 10 18:33:06 1998 Alexander Babu Arulanthu - - * tests/Aio_Platform_Test.cpp: Comments. - -Sat Oct 10 17:42:18 1998 Douglas C. Schmidt - - * ACE version 4.5.52 released. - -Sat Oct 10 16:44:24 1998 Douglas C. Schmidt - - * ace/Service_Repository.cpp: Improved the documentation and added - some new ACE_const_casts. Thanks to Eric Palantir - for motivating this. - - * ace/Service_Config.cpp (open): The logger key should be set to - the static logger key only if the key supplied is EQUAL with the - default logger key. Thanks to Eric Palantir - for reporting this. - -Sat Oct 10 16:28:00 1998 Carlos O'Ryan - - * ace/Synch.h: - * ace/Synch.i: - * ace/Synch.cpp: - The ACE_Process_Mutex class was allocating one of its members - from the heap, thus it could not be placed in shared memory. - The problem was that the member required the creation of a - unique name if the user did not provide one; making the buffer - for this unique name a member of ACE_Process_Mutex allowed us to - initialize the lock_ member while still allocating it as a - member of the class. Thanks to Bob McWhirter - for helping to track this down. - -Sat Oct 10 12:45:31 1998 Douglas C. Schmidt - - * ace/Malloc_T.h: Added a documentation entry for class - ACE_Cached_Allocator. Thanks to Erik Koerber - for reporting this. - -Sat Oct 10 00:40:05 1998 Douglas C. Schmidt - - * ACE version 4.5.51 released. - -Fri Oct 09 23:47:42 1998 Irfan Pyarali - - * ace/Mem_Map.cpp (map_it): Fixed the setting of length_ again. - Hopefully, it will be right this time. - -Fri Oct 9 15:37:26 PDT 1998 James Hu - - * ace/Mem_Map.cpp: Protect against assigning 0 to length_. This - was causing JAWS to fail. - -Fri Oct 9 16:59:26 1998 Nagarajan Surendran - - * examples/IPC_SAP/SOCK_SAP/run_test: - * examples/IPC_SAP/SOCK_SAP/summarize: - Fixed the scripts to print the results correctly.Fixed - comments and usage. - -Fri Oct 09 16:35:00 1998 Chris Gill - - * ace/Timer_Queue_Adapters.cpp - ace/ace_dll.dsp - examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{cpp, h}: - Fixes for deferred callbacks in the BPR example on NT. - -Fri Oct 09 11:59:26 1998 David L. Levine - - * include/makeinclude/wrapper_macros.GNU: removed RM override - because it's not necessary. Thanks to - Tres Seaver for this suggestion. - - * include/makeinclude/platform_chorus_ghs.GNU, - platform_irix6.x-sgic++.GNU,platform_osf1_3.2.GNU, - platform_osf1_4.0.GNU,platform_osf1_4.0_rcc.GNU, - platform_sunos5_sunc++.GNU: - replaced hard-coded /bin/rm -f with $(RM). Thanks to - Tres Seaver for this suggestion. - - * ace/Containers_T.{h,cpp}: removed unecessary (and impolite) - argument name. - -Fri Oct 09 00:44:21 1998 Irfan Pyarali - - * ace/OS.i (mmap): CreateFileMapping must be created with a length - of 0 (which will get translated to the size of the file). This - must not be since only deals with the mapping of the - view and not with the file mapping object. It is ok to use 0 - since we are trying to emulate UNIX's mmap. - - * ace/ACE.cpp (round_to_allocation_granularity): - ace/OS.i (allocation_granularity): - - New methods. We need allocation granularity when rounding off - the offset in mmap and not the page size. Only on Win32, - allocation granularity is different from pagesize. - - * ace/High_Res_Timer.cpp: Added the inclusion of Object_Manager.h. - Otherwise, NT was picking up the definition of - ACE_Static_Object_Lock. - - * ace/Mem_Map.cpp (map_it): Fixed the problem where a requested - length of less than the filesize was being ignored. Also, - changed round_to_pagesize() to round_to_allocation_granularity(). - Thanks to Jonathan Reis for - pointing this bug out. - -Fri Oct 09 00:02:01 1998 Alexander Babu Arulanthu - - * ace/Asynch_IO.cpp: The YET another problem with doing multiple - Asynch_Accepts have been fixed. Thanks very much James Hu for - reporting this. I was calling reactor's resume_handlers and - suspend_handlers instead of only for one handle. Thanks very - much Irfan! for pointing this out. - -Thu Oct 08 23:06:20 1998 David L. Levine - - * config-linux-common.h: on Alpha only, added ACE_POLL_IS_BROKEN. - High_Res_Timer_Test revealed that it's necessary with - glibc 2.0.7-13. I don't think that its necessary on - Pentiums, but maybe it depends on glibc version. - - * OS.i (gethrtime),High_Res_Timer.cpp OS.i,README: - added ACE_HAS_ALPHA_TIMER support. See the comment - in ACE_OS::gethrtime about it being limited to 32 bits. - I don't know why, but that severely limits the range - of high res times. Therefore, it's not enabled by default - in any config files. - -Thu Oct 08 15:22:22 1998 Arturo Montes - - * ace/OS.{i,cpp}: Reverted FSU thread changes for now. - -Thu Oct 08 15:11:34 1998 Nanbor Wang - - * ACE-INSTALL.html: Updated document about spawning new thread - when ACE_HAS_MFC is defined. CWinBeginThread is not used - automatically. Users have to explicitly ask for this. - -Thu Oct 8 12:11:08 1998 Nagarajan Surendran - - * examples/IPC_SAP/SOCK_SAP/run_test: - * examples/IPC_SAP/SOCK_SAP/summarize: - - Added these scripts to run the test and summarize the - results. These scripts are modelled similar to the - $TAO_ROOT/performance-tests/Cubit/TAO/MT_Cubit scripts. - Thanks to David for the scripts. - -Thu Oct 08 08:23:09 1998 David L. Levine - - * ace/High_Res_Timer.cpp (get_registry_scale_factor): - default global_scale_factor to 1000 instead of 1, - because ACE_OS::gethrtime () defaults to nanoseconds. - Thanks to Peter Nordlund for - reporting that High_Res_Timer_Test failed on Irix without - this fix. - - * ace/Makefile (Svc_Conf_l.cpp): use Doug's flex to generate - this file, if running on a DOC group machine, instead of - using whatever flex is first on the users path. - - * etc/README: fixed typo. - - * ace/Svc_Conf_l.cpp,etc/Svc_Conf_l.cpp.diff (ACE_YY_DECL): - initialize ace_yy_cp and ace_yy_bp to 0 to avoid egcs 1.1 - warning about possible use before initialization. - -Wed Oct 7 23:47:29 1998 Alexander Babu Arulanthu - * ace/Asynch_IO.cpp: - * ace/Proactor.cpp : Fixed the problem with doing multiple - Asynch_Accepts. Thanks to James Hu for reporting this - problem. Thanks very much Irfan!!!, for helping me a lot in fixing - this one. - -Wed Oct 07 23:14:36 1998 Douglas C. Schmidt - - * ACE version 4.5.50 released. - -Wed Oct 7 21:44:20 1998 Douglas C. Schmidt - - * ace/Stream.h: Added a default value of 0 for both put() and - get(), which is more consistent with the underlying putq() and - getq() methods on ACE_Task. Thanks to Bob McWhirter - for this suggestion. - -Wed Oct 7 18:18:14 1998 Carlos O'Ryan - - * README: - * ace/config-irix6.x-g++.h: - * ace/config-irix6.x-common.h: - * ace/config-irix6.x-sgic++-nothreads.h: - Peter Nordlund kindly submitted a common - configuration file for IRIX 6.X that works with both g++ and SGI - MIPSPro 7.X - -Wed Oct 7 17:21:17 1998 Arturo Montes - - * ace/OS.{i,cpp}: FSU pthreads is draft6, but FSU in SCO is an - special port. The API is draft6 but return values is DRAFT7 - (really I am moving to STD). - -Wed Oct 07 09:30:00 CDT 1998 Chris Gill - - * ace/Functor.{cpp, h, i} - ace/Functor_T.{cpp, h, i} - ace/Makefile: - - Added ACE_Command_Base abstract base class and derived class - template ACE_Command_Callback to ACE to support the GOF Command - design pattern. - - * ace/Timer_Queue_Adapters.{cpp, h}: - - Added registration and deferred executiton of ACE_Command_Base - objects to ACE_Thread_Timer_Queue_Adapter. This is conditionally - compiled if the ACE_HAS_DEFERRED_TIMER_COMMANDS symbol is defined. - - * examples/Bounded_Packet_Relay/BPR_Drivers.{cpp, h} - examples/Bounded_Packet_Relay/BPR_Drivers_T.{cpp, h} - examples/Bounded_Packet_Relay/Makefile - examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{cpp, h} - examples/Bounded_Packet_Relay/bpr_thread.cpp: - - Changed example to use ACE_Command_Callback objects, modified event - handlers to register ACE_Command_Callback objects for deferred - excecution of timer cancellations and registrations. - -Wed Oct 07 02:37:58 1998 Douglas C. Schmidt - - * ACE version 4.5.49 released. - -Wed Oct 7 00:11:33 1998 Nanbor Wang - - * ACE-INSTALL.html: Added more information on using MFC with ACE, - some explanations about using run-time libraries and information - about VC6. - - * tests/version_tests/version_tests.dsw: Removed - MsgQueue_Notifications_Test.dsp and added - Message_Queue_Notifications_Test. - - * tests/*.dsp: Changed to use DLL version of run-time libraries - for static builds. Notice that user libraries are still linked - in statically. Only the run-time libraries are effected. - - * ace/README: Added information for ACE_USES_STATIC_MFC. - - * ace/config-win32-common.h: Re-structured MFC related macros - (_AFXDLL and _WINDLL) so that it allows us to use MFC in static - ACE libraries and the setting of MFC can propagate to - applications. By default, ACE uses MFC DLL if ACE_HAS_MFC=1. - If you want to use MFC as a static library, besides - ACE_HAS_MFC=1, also define ACE_USES_STATIC_MFC. Thanks to Jason - Milley for noticing the problem - of compiling static ACE library with MFC. - -Tue Oct 6 15:06:21 1998 Steve Huston - - * ace/Asynch_IO.cpp (ACE_Asynch_Accept_Handler): Removed the - version of the ctor with no args - it's equivalent to the one - with all defaulted args, and HP aCC complained. - - * ace/NT_Service.{h cpp i}: New class, ACE_NT_Service. This provides - a class and supporting macros to integrate NT Services into the - ACE framework at run-time. I'll work on getting an example into - the kit soon. - - * ace/ACE_Library.{mak mdp}: - ace/ace_dll.dsp, ace_lib.dsp: Added NT_Service files. - -Tue Oct 6 12:49:37 EDT 1998 James CE Johnson - - * docs/tutorials/006/client_handler.cpp - * docs/tutorials/006/page05.html - Susan Liebeskind discovered that invoking the baseclass - close() after handle_close() in Client_Handler::close() - causes the object to be destructed twice. I've removed - the call to the baseclass close(). She reports success - on Solaris, Dec and AIX. I've verified that Linux also - works fine with this fix. - -Tue Oct 06 09:53:22 1998 David L. Levine - - * ace/config-fsu-pthread.h,config-mit-pthread.h,config-mvs.h, - config-sco-5.0.0-mit-pthread.h,config-tandem.h,README: - removed ACE_HAS_YIELD_VOID_PTR because it's no longer used. - Thanks to Ossama for reporting this. - - * config-dgux-4.x-ghs.h,config-hpux-10.x.h,config-mit-pthread.h, - config-mvs.h,config-sco-5.0.0-mit-pthread.h,config-tandem.h,README: - removed ACE_LACKS_KEYDELETE because it's no longer used. Thanks to - Ossama for reporting this. - -Tue Oct 06 03:36:22 1998 Douglas C. Schmidt - - * ACE version 4.5.48 released. - -Tue Oct 06 02:53:28 1998 Douglas C. Schmidt - - * ACE version 4.5.47 released. - -Tue Oct 6 02:16:01 1998 Alexander Babu Arulanthu - - * ace/Asynch_Acceptor.cpp: - * ace/Asynch_IO.cpp (handle_input): - * ace/Proactor.cpp: - In POSIX implementation of Asynch_Accept, We dont have to read - initial data to read on to the Message Block given to the - Asynch_Accept. So we dont use it at all. We get local and peer - address from using socket and pass back to the application. - -Mon Oct 05 23:58:16 1998 Douglas C. Schmidt - - * ACE version 4.5.46 released. - -Mon Oct 5 23:19:30 1998 Nanbor Wang - - * ace/OS.cpp (fork): Changed to use fork1 when ACE_HAS_STHREAD is - defined. Otherwise, file descriptors get messed up and socket - connections get lost after exec'ing a new program. Generally - speaking, you should not simply fork a multi-threaded program - without calling exec (). On pthread compliant platform, fork - does what fork1 does on solaris thread. - -Mon Oct 05 21:21:42 1998 Douglas C. Schmidt - - * ACE version 4.5.45 released. - -Mon Oct 05 15:59:55 1998 David L. Levine - - * ACE version 4.5.44 released. - -Mon Oct 05 15:23:04 1998 Douglas C. Schmidt - - * ACE version 4.5.43 released. - -Mon Oct 5 15:34:41 1998 James CE Johnson - - * docs/tutorials/002/handler.h: Added includes for INET_Addr.h, - SOCK_Stream.h and Reactor.h. Susan Liebeskind pointed out that - AIX gets confused in processing templates if these aren't present. - -Mon Oct 05 10:02:37 1998 David L. Levine - - * ace/config-chorus.h: added ACE_LACKS_TRUNCATE. Thanks - to Steve Kay for reporting this. - - * tests/Semaphore_Test.cpp: added some ifdefs so that it - builds cleanly with ACE_HAS_POSIX_SEM. - -Sun Oct 05 03:49:09 PDT 1998 James Hu - - * ace/Asynch_Accept.* - * ace/Asynch_IO.* - Made some small modifications to support passing in and - retrieving an ACT when performing asynchronous accept. - -Sun Oct 04 22:07:09 1998 David L. Levine - - * ace/config-fsu-pthread.h,config-hpux-10.x.h,config-lynxos.h, - config-mit-pthread.h,config-mvs.h,config-osf1-3.2.h, - config-osf1-4.0.h,config-sco-5.0.0-mit-pthread.h,config-tandem.h, - README: removed ACE_HAS_PTHREAD_GETSPECIFIC_DATAPTR, because it's - no longer used. Thanks to Ossama for reporting this. - - * ace/config-tandem.h,README: removed ACE_HAS_PTHREAD_YIELD_VOIDPTR, - because it's no longer used. It was commented out in - config-tandem.h, anyways. Thanks to Ossama for reporting this. - -Sun Oct 4 20:00:44 1998 Carlos O'Ryan - - * bin/auto_compile: - Fixed the regular expression to detect compile errors. - The user can pass extra arguments to GNU make, the arguments are - given as the script is invoked. - -Sun Oct 4 14:30:03 1998 Nanbor Wang - - * ace/TP_Reactor.cpp (handle_events): Made sure we never suspend - the without holding the . Otherwise, - depend on how an OS schedules ready threads, we may have a - Reactor that could never be woken up. This leads to a very - delicate race condition when other threads which need to modify - Reactor's state get block on the token (because they couldn't - wake up the reactor). These threads later block the - nofify_handler thread when it's ready to resume - - (notify_handle): Since we don't suspend the , - there's no need to resume it here. - -Sat Oct 3 13:11:48 1998 Carlos O'Ryan - - * bin/auto_compile: - Removed some of the tests, they were crashing more often than - not. - -Sat Oct 3 09:36:09 1998 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_proactor.cpp: Comments. - -Sat Oct 03 09:24:45 1998 Susan Liebeskind - - * ace/Task.h,Thread.h,Thread_Manager.h,Timer_Queue_Adapters.h - (activate,spawn,spawn_n): added THR_JOINABLE to THR_NEW_LWP - default flags. - - On the boxes which implement POSIX 1003.1.b (Solaris, Digital Unix) - threads spawned using default flags provided by those methods were, - and still are, created *joinable*. - - On the box which implements Draft 7 (AIX), the spawned threads were - *detached*. With this change, they'll be created *joinable*, - instead. - - This change ensures consistent behavior across all platforms. - -Sat Oct 03 09:04:44 1998 David L. Levine - - * ace/ACE.cpp (set_handle_limit): wrapped the final - return statement with #ifdef __sgi. Irix complains without - this return statement. DEC cxx (correctly) says that it's not - reachable. ACE_NOTREACHED won't work here, because it handles - both platforms the same. - - * include/makeinclude/wrapper_macros.GNU: with quantify=1 - on sparcs, add -record-register-window-traps to $(PRELINK). - Thanks to Andy for discovering this Quantify option, for sparcs. - -Fri Oct 2 23:43:51 1998 Carlos O'Ryan - - * ace/config-irix6.x-g++.h: - * ace/config-irix6.x-sgic++-nothreads.h: - * ace/OS.h: - IRIX puts in header of IRIX, it is only - relevant for the autoconf project. - - * ace/ACE.cpp: - Added an extra return to make IRIX compiler happy. - -Fri Oct 2 21:48:18 1998 Nanbor Wang - - * tests/Thread_Pool_Reactor_Test.cpp: Send the message length - before each message so we don't need to use time delay to - separate consecutive requests. - -Fri Oct 02 16:27:07 1998 Nanbor Wang - - * ace/Thread_Manager.cpp: ACEified some code. - (terminate): Do not register a thread as being terminated if it - is being joined by another thread. Just remove it from - Thread_Manager's thr_list_. - -Fri Oct 2 00:19:04 1998 Nanbor Wang - - * tests/Thread_Pool_Reactor_Test.cpp: Fixed explicit template - instantiation. - - * ace/Strategies_T.{h,i,cpp}: Removed classes - ACE_Thread_Pool_Strategy and ACE_Svc_Handler_Pool_Strategy. - - * tests/run_tests.{sh,bat}: Added Thread_Pool_Reactor_Test into - one-buttoned test scripts. - -Thu Oct 01 12:04:30 1998 Nanbor Wang - - * tests/Thread_Pool_Reactor_Test.cpp: Added a command line argument - parser. - -Thu Oct 1 08:51:00 1998 Douglas C. Schmidt - - * tests/Thread_Pool_Reactor_Test.cpp: Reformatted the - code a bit. - - * ace/ACE.cpp (max_handles): Added yet another fix for AIX. - Thanks to Chris Lahey for this. - -Thu Oct 01 01:05:49 1998 Nanbor Wang - - * tests/tests.dsw: - * tests/version_tests/version_tests.dsw: - * tests/Thread_Pool_Reactor_Test.{cpp,dsp}: Added a new test that - torture tests the new ACE_TP_Reactor. - -Thu Oct 01 00:09:35 1998 Irfan Pyarali - - * ace/ACE.cpp: Fixed max_handles(). - - * tests/Conn_Test: Removed template specialization for - INET_Addr.hash(). - - * ace/Addr.i (hash): - * ace/INET_Addr.i (hash): - - Finally gave up with template specialization hell and freak'in - broken compilers and simply added a hash() method to ACE_Addr - and ACE_INET_Addr. ACE_Addr::hash() simply return 0 and should - be overwritten by subclasses that can provide better hashing. - -Wed Sep 30 10:16:56 1998 Douglas C. Schmidt - - * ace/ACE.cpp: Modified max_handles() so that it goes the right - thing on platforms like AIX that don't have any predefined limit - on the number of handles. Thanks to Chris Lahey - for reporting this. - -Wed Sep 30 01:56:54 1998 Irfan Pyarali - - * ace/Strategies_T: - - - ACE_Refcounted_Hash_Recyclable::operator==(const T &rhs): - Added new method to prevent implicit type conversions. - - - Changed ACE_Hash_Addr::hash_i to return u_long instead of - size_t. This makes it similar to the return value from - hash(). - - - Added hash caching ability to ACE_Hashable. - - - Removed the use of ACE_Hash_Addr inside the - ACE_Cached_Connect_Strategy. This allows us to reduce - implicit type conversions inside connect_svc_handler(). - - Users are now required to specialize - ACE_Refcounted_Hash_Recyclable::hash_i (void) instead - of ACE_Hash_Addr::hash_i(const ACE_INET_Addr&addr) - - * tests/Conn_Test.cpp: Changed template specialization of - ACE_Hash_Addr::hash_i(const ACE_INET_Addr&addr) - to ACE_Refcounted_Hash_Recyclable::hash_i (void). - - * ace/OS.cpp (open): Fixed a couple of things that were broken - with respect to when the SetFilePointer was called and when lock - was released. Also fixed the UNICODE version of open(). BTW, - these functions had to be moved from OS.i to OS.cpp since the - ACE_Managed_Object is not visible from OS.i. - -Wed Sep 30 02:29:48 1998 Carlos O'Ryan - - * performance-tests/TTCP/ACE-C++/Makefile: - * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: - Hacked so it would compile, don't know anything further than - that. - -Tue Sep 29 21:55:52 1998 Irfan Pyarali - - * ace/ace.dsw: Removed Connector.cpp from the compile list since - it is a files with template classes only. - -Tue Sep 29 21:14:02 1998 Nanbor Wang - - * ace/OS.i (open): Grab a lock from the Object_Manager when - O_APPEND is defined to simulate atomic behavior on most UNIX - platforms. Thanks to Irfan. - -Tue Sep 29 19:16:57 1998 James CE Johnson - - * docs/tutorials/007/thread_pool.h - * docs/tutorials/007/thread_pool.cpp - Added virtual methods for open() and close() that match the - baseclass. This will keep some compilers from complaining about a - partial-overload attempt. Thanks to Bob McWhirter for catching this. - -Tue Sep 29 16:13:10 1998 Irfan Pyarali - - * ace/Strategies_T: - * ace/Connector: - - Added accessors for the strategy. - -Tue Sep 29 14:04:49 EDT 1998 James CE Johnson - - * docs/tutorials/013/page08.html: Removed link to message_queue. - Thanks to Jeff Hellzen for pointing this out. - -Tue Sep 29 11:05:04 1998 David L. Levine - - * ace/README: removed ACE_HAS_ONLY_TWO_PARAMS_FOR_ASCTIME_R_AND_CTIME_R - because it is no longer used. Thanks to Ossama for reporting this. - - * ace/config-fsu-pthread.h,config-mit-pthread.h,config-mvs.h, - config-sco-5.0.0-mit-pthread.h,config-tandem.h,README: - removed ACE_HAS_PTHREAD_DSTATE_PTR because it is no longer used. - Thanks to Ossama for reporting this. - -Mon Sep 28 20:35:49 1998 Sergio Flores - - * ace/Containers_T.h: - * ace/Containers_T.cpp: Added begin () and end () to - ACE_Unbounded_Queue. - -Mon Sep 28 16:06:05 1998 David L. Levine - - * ace/OS.*,Object_Manager.{h,cpp}: removed ACE_HAS_TSS_EMULATION's - support for ACE_HAS_NATIVE_KEYS. Now, if ACE_HAS_TSS_EMULATION - is used and ACE_HAS_THREAD_SPECIFIC_STORAGE is #defined, then - the ACE TSS emulation will use one native TSS key. - - ACE_TSS_EMULATION may be useful even on platforms that - have native thread specific storage. It offers these - advantages: - - 1) ACE's TSS emulation offers a configurable number of TSS - keys, via ACE_DEFAULT_THREAD_KEYS. Most (all?) native TSS - implementations have a fixed number of keys. LynxOS 3.0.0, - for example, only has three keys available to applications. - - ACE_DEFAULT_THREAD_KEYS defaults to 64, to match the - number of native keys on Windows NT. - - 2) ACE's TSS emulation recycles deleted keys. Some native TSS - implementations, such as POSIX Draft 4, POSIX Draft 6, and - Solaris, do not allow deletion of TSS keys. Therefore, - unused keys cannot be recycled. - - 3) ACE's TSS emulation calls destructors on TSS objects in the - main thread. Solaris' native TSS, for example, does not. - - There is one known drawback to using ACE's TSS emulation: it is - slower than using native TSS. The performance penalty is - probably negligible for most applications, however. It involves - just an additional function call, an array index, and three numeric - comparisons beyond the native TSS call. The function call is - _not_ a virtual function call. (On MVS, there's an additional - memcpy of the TSS key with TSS emulation.) - - TSS emulation is enabled by default in the ACE configurations - for VxWorks, pSOS, and LynxOS. - - Many thanks to Arturo Montes for - expanding TSS emulation to platform that have native TSS. - -Sun Sep 27 20:12:13 EDT 1998 James CE Johnson - - * docs/tutorials/index.html: Linked in Tutorial 13 - -Sun Sep 27 18:53:25 1998 Carlos O'Ryan - - * tests/Map_Manager_Test.cpp: - Instead of clearing the capacity and size in the - free_search_structure() method we do it on the close() - method. The first method is also used in other places... - -Sun Sep 27 18:25:57 1998 David L. Levine - - * ace/OS.i (readdir_r): added __USE_POSIX test for three-arg - ::readdir_r (). Thanks to james@tsunami.com for providing - the patch. - -Sun Sep 27 09:35:04 1998 James CE Johnson - - * docs/tutorials/013/* - Completed Tutorial 013! The code is up to date and compilable on - RedHat Linux with egcs 1.1. It may need some template help on other - platforms. The HTML is done and in synch with the code. - -Sun Sep 27 01:52:36 1998 Carlos O'Ryan - - * ace/INET_Addr.cpp: - The get_host_name() method was returning the first name, and not - looking up in the alias list for the right match with the - address. - -Sun Sep 27 00:18:48 1998 Nanbor Wang - - * ace/Makefile: Updated dependency. - - * ace/OS.cpp (invoke): - * ace/Thread_Manager.cpp (ace_thread_manager_adapter): - (ACE_Thread_Exit::instance): Removed conditional macro - ACE_HAS_PTHREAD_SIGMASK so the Thread_Exit instance can be place - in TSS. This was guarded by ACE_HAS_PTHERAD_1003_DOT_3 which - later merged with ACE_HAS_PTHERAD_SIGMASK. However, the - origianl intension of this condition was to fix a bug in Xavier - pthread implementation. The effect of merging the two macros - forces ACE_Thread_Exit be allocated from stacks which, in turn, - prevent threads from exiting properly when pthread_cancel is - used. - - Linux is the only platform that I know which uses Xavier thread - library. The bug has apparently been fixed. If your platform - segfaults while spawning threads, please let me know. Thanks to - Chris Gill for noticing the abnormal behavior when calling - ACE_Thread::thr_cancel. - -Sat Sep 26 23:20:52 1998 Alexander Babu Arulanthu - - * ace/Proactor.cpp: Fixed the g++ warnings. - -Fri Sep 25 23:19:52 1998 David L. Levine - - * ace/Sched_Params.cpp: use both ACE_HAS_STHREADS and - ACE_HAS_PRIOCNTL. With just ACE_HAS_PRIOCNTL, the - min/max priority values weren't right on DU 4.0. With - this change, we're back to the strict POSIX interface - on DU 4.0, and SunOS if ACE_HAS_STHREADS is not #defined. - -Fri Sep 25 21:58:35 1998 Irfan Pyarali - - * ace/ACE.cpp (set_handle_limit): Added appropriate return value. - -Fri Sep 25 22:10:38 1998 Carlos O'Ryan - - * ace/Map_Manager.cpp: - Map_Manager::close() did not reset the capacity or current size - of the map. - -Fri Sep 25 18:24:17 1998 Darrell Brunsch - - * ace/Proactor.{h,cpp}: Had to allow the definition of - POSIX_COMPLETION_STRATEGY for the do-nothing constructor on - NT. - -Fri Sep 25 18:07:19 EDT 1998 James CE Johnson - - * A few more minor changes to docs/tutorials/013. With luck, the - HTML part will be done this weekend! - -Fri Sep 25 14:51:54 1998 Alexander Babu Arulanthu - - * ace/Asynch_IO.h: - * ace/Asynch_IO.cpp: - * ace/Proactor.h: - * ace/Proactor.cpp: - Implemented Asynch_Accept to work for AIO_CONTROL_BLOCKS strategy of - completion notification. - - Defined an auxillary Accept_Handler called ACE_AIO_Accept_Handler in - addition to the ACE_Asynch_Accept_Handler. ACE_AIO_Accept_Handler - holds the notification pipe and does a read on it to handle the - coming from Asynch_Accept_handler. - - THANKS to Doug and Irfan for suggesting this 'notification pipe' based - implementation for AIO_CONTROL_BLOCKS strategy, so that Proactor will - work on platforms where POSIX4 RT_Signals are broken (Solaris 2.6 !) - - Note : Proactor uses AIO_CONTROL_BLOACKS strategy by default on - POSIX4 platforms. Call the constructor with RT_SIGNALS to enable - Real Time singal implementation. - - This should become very easier when we finish organizing these - files according to the Bridge pattern. - -Fri Sep 25 12:40:45 1998 David L. Levine - - * ace/config-sunos5.{5,6}.h: removed #define/#undef of - ACE_THR_PRI_FIFO_DEF. They're no longer needed with the - hard-coded ACE_THR_PRI_* values for Solaris in ace/OS.h. - - * ace/OS.i: removed carriage returns. Thanks to Darrell - for noticing it. - - * tests/Handle_Set_Test.cpp: removed ACE_Node - template instantiation because it conflicted with the - ACE_Node instantiation in ace/Stats.cpp. - - * docs/ACE-porting.html: updated "auto configure" link. Thanks - to Ossama for reporting this. - - * ace/ACE.cpp (set_handle_limit): on platforms with - ACE_LACKS_RLIMIT or ! RLIMIT_NOFILE, don't use - ACE_NOTSUP_RETURN if the new_limit is <= the cur_limit. - On those platforms, the limit can't be changed anyways, - and the request was _not_ to increase the limit. So, - it's a no-op; just return 0. - -Fri Sep 25 12:15:00 1998 Irfan Pyarali - - * ace: The following ACE_TRACE calls being made during the - creation of the ACE_Log_Msg instance. The ACE_TRACE calls then - try to create the ACE_Log_Msg instance which then ends up - executing the ACE_TRACE's. Etc, etc, etc... - - Here are the methods with the ACE_TRACEs that I commented out to - get ACE to run: - - ACE_IPC_SAP::~ACE_IPC_SAP - ACE_SOCK::ACE_SOCK - ACE_SOCK::~ACE_SOCK - ACE_SOCK_IO::ACE_SOCK_IO - ACE_SOCK_IO::~ACE_SOCK_IO - ACE_SOCK_Stream::ACE_SOCK_Stream - ACE_SOCK_Stream::~ACE_SOCK_Stream - ACE_Thread::keycreate - ACE_Thread::setspecific - ACE_Thread::getspecific - - Thanks to "Patrick J. McNerthney" for this bug - report. - -Fri Sep 25 10:10:12 1998 Steve Huston - - * ace/OS.i (cond_timedwait): Add EINTR to the list of errno values - that get changed to ETIME on wait timeout. EINTR is from LynxOS. - Thanks to David Levine for this fix. - - * tests/Semaphore_Test.cpp: Remove the assertion that a timed out - semaphore will return EINTR for ACE_HAS_PTHREADS_DRAFT4. All - platforms expect ETIME, which is normalized in - ACE_OS::cond_timedwait. - -Thu Sep 24 22:31:30 1998 David L. Levine - - * ace/OS.h: hard-coded the ACE_THR_PRI_* values on suns. - SunOS 5.6 could use sched_get_priority_min/max () for FIFO - and RR. But for OTHER, it returns negative values, which - can't be used. And, sched_get_priority_min/max () aren't - supported in SunOS 5.5.1. It would really be helpful - if SunOS defined PRI_FIFO_MIN, etc., in sched.h, but - it doesn't, probably because its process scheduling is - so flexible. Thanks to Russ Noseworthy - for helping to figure this - out. - -Thu Sep 24 17:54:26 1998 Carlos O'Ryan - - * ace/Asynch_IO.cpp: - Removed duplicate instantiation of a template, IRIX does not - like this. Thanks to Ossama Othman - because his configure script - detected the Asynch I/O calls on IRIX and enabled this ACE - code. - -Thu Sep 24 16:28:32 1998 Irfan Pyarali - - * ace/config-win32-common.h: ACE_HAS_TEMPLATE_TYPEDEFS was defined - for VC4.1 and VC4.2. Template typedefs in Strategies_T.cpp - broke the VC4.2 compiler. Therefore, ACE_HAS_TEMPLATE_TYPEDEFS - was deprecated for VC4.1 and VC4.2. I also checked VC5.0 and it - didn't work. Therefore, for the time being, none of the VC - compilers support ACE_HAS_TEMPLATE_TYPEDEFS. I didn't try - VC6.0. - - * ace/Strategies_T.cpp (check_hint_i ): Changed the signature so - that it is identical to find_or_create_svc_handler_i(). For - some strange freakin reason, the VC4.2 could not gork - check_hint_i() but was able to gork - find_or_create_svc_handler_i. - - * ace/ACE_Library.mdp: Added Select_Reactor_Base.cpp and - Container.cpp to make ACE build with VC4.2. - -Thu Sep 24 13:30:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/README - examples/Bounded_Packet_Relay/Bounded_Packet_Relay.{dsp,dsw} - - Updated README, added in MSVC++ project, workspace files. - -Thu Sep 24 12:48:58 1998 David L. Levine - - * ace/Containers_T.cpp (ACE_{Bounded,Fixed}_Set_Iterator::done), - ace/Map_Manager.cpp (ACE_Map_Iterator_Base::done): - added ACE_CAST_CONST to the static cast. Thanks to Ossama for - reporting a compilation failure on Sun C++ 4.2/Solaris 2.6 - without it. - - * ace/High_Res_Timer.cpp (global_scale_factor): on Linux, - only use BogoMips if the CPU is an alpha. It would also - work directly on Pentium Pro, but not other Pentiums. With - a little effort, it could be made to work there, see the - BogoMips mini-HOWTO. Thanks to Ossama for enlightening me - on this corner of Linux. - - * tests/Upgradable_RW_Test.cpp (main): delete dynamically - allocated reader_tasks and writer_tasks, and arrays, at end of test. - -Thu Sep 24 09:17:32 1998 Steve Huston - - * ace/Containers_T.h: Added #include "ace/Containers.h" - AIX xlC - needs this when instantiating templates. - - * ace/Dirent.cpp: Do the HP check using only compiler-defined - preprocessor macros since config.h isn't included. - - * ace/OS.i: Fixed comments that referenced DCE threads. - Changed readdir_r #ifdefs to handle pthreads drafts 4 and 6 - the same, and split HP-UX 10.x off as a non-conformant player. - Thanks to David Levine for sorting this out with LynxOS. - - * ace/Thread_Manager.cpp: Changed occurrences of - ACE_HAS_DCE_DRAFT4_THREADS to ACE_HAS_PTHREADS_DRAFT4. Corrected - a call to pthread_detach. Changed a couple of calls to - pthread_detach on HP-UX 10.x to duplicate the thread handle before - the call because pthread_detach on HP-UX 10.x clears the handle - and it was still needed. - On AIX, xlC doesn't match the call to - ACE_Thread::join(ACE_hthread_t, void ** = 0) correctly when the - second arg is specified. So call the 3-arg variety on AIX, knowing - that the second arg is ignored underneath on pthreads. - -Wed Sep 23 22:13:04 1998 James CE Johnson - - * docs/tutorials/006/server.cpp: - Wrapped !defined(ACE_HAS_GNU_REPO) around the explicit template - instantiation. - - * docs/tutorials/005/client_handler.cpp (handle_input): - * docs/tutorials/006/client_handler.cpp (svc): - * docs/tutorials/006/client_handler.cpp (handle_input): - * docs/tutorials/007/client_handler.cpp (svc): - * docs/tutorials/007/client_handler.cpp (handle_input): - Use ACE_OS::memset() instead of direct call to memset() - - * docs/tutorials/005/Makefile: - * docs/tutorials/007/Makefile: - Touch .depend if it does not exist. - -Wed Sep 23 22:03:19 1998 Arturo Montes - - * ace/config-sco-5.0.0.h: added ACE_LACKS_READDIR_R. - -Wed Sep 23 14:26:44 EDT 1998 James CE Johnson - - * docs/tutorials/005/server.cpp - docs/tutorials/006/server.cpp - docs/tutorials/007/server.cpp - docs/tutorials/008/Makefile - docs/tutorials/009/Makefile - docs/tutorials/013/Makefile - docs/tutorials/013/block.cpp - docs/tutorials/013/block.h - docs/tutorials/013/data.h - docs/tutorials/013/message_queue.cpp - docs/tutorials/013/mld.cpp - docs/tutorials/013/mld.h - docs/tutorials/013/page01.html - docs/tutorials/013/page02.html - docs/tutorials/013/page03.html - docs/tutorials/013/page04.html - docs/tutorials/013/task.cpp - docs/tutorials/013/task.h - docs/tutorials/013/work.cpp - docs/tutorials/013/work.h - - Fixed explicit template instantiaions in - tutorials 5, 6, 7. - - Fixed a nasty bug in 9's Makefile (and removed - similar comment in 8's Makefile) - - Preliminary version of 013 committed. The code - worked before I began "optimizing" and should work - again in a couple of days. The HTML is not yet - done but will be by the weekend (I hope). - -Wed Sep 23 12:15:21 1998 David L. Levine - - * ace/Stats.*: modified standard deviation calculation to - help avoid overflow. Instead of keep running totals of - the sum and sum of squares, it stores each sample in an - dynamic structure. Then, to calculate the standard - deviation, each sample is compared with the mean. - - * ace/Sched_Params.cpp: replace ACE_HAS_STHREADS with - ACE_HAS_PRIOCNTL. Thanks to Ossama for pointing this out. - - * ace/Synch.h: replaced #endif /* ACE_HAS_STHREADS */ with - #endif /* 0 */. - - * performance-tests/TTCP/{ACE-C++,C,Orbix}/Makefile: removed - old Quantify LINK_COMMANDs. They don't look like they're used - anywhere. - - * include/makeinclude/wrapper_macros.GNU: removed -DACE_QUANTIFY - and -Dquantify, with quantify=1, because they're no longer used. - - * ace/OS.h,README: added ACE_LACKS_CMSG_DATA_{MACRO/MEMBER} support. - It will be used by autoconf, for Linux libc5 (pre-libc). Thanks - to Ossama for supplying it. - - * ace/config-g++-common.h: disable ACE_HAS_TEMPLATE_SPECIALIZATION - with g++ 2.9. Thanks to Andrew G. Harvey for a - problem with compiling ace/Filecache.cpp with g++ 2.9 on SunOS 5.5.1. - - * tests/Upgradeable_RW_Test.h: replaced ACE_Thread_Mutex with - ACE_SYNCH_MUTEX. Thanks to Ossama for reporting this. - - * ace/config-linux-common.h: commented out the msg_accrights(len) - #defines. Thanks to Ossama for noticing that they just don't - look right. They no longer appear to be necessary on Linux. - -Wed Sep 23 11:30:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers_T.{h,cpp} - - Fixed memory leaks uncovered by Purify, added large high water mark - for packet relay's underlying message queue. - -Wed Sep 23 11:28:13 1998 Carlos O'Ryan - - * bin/Process_Unix.pm: - If the exec() call fails we report the name and the arguments of - the program. - -Wed Sep 23 09:27:21 1998 Steve Huston - - * ace/Dirent.cpp: Fixed aCC workaround from 22-Sep so that only - non-g++ compilers on HP-UX see it. - -Wed Sep 23 02:21:24 1998 Douglas C. Schmidt - - * ACE version 4.5.42 released. - -Tue Sep 22 21:34:31 1998 Steve Huston - - * ace/Dirent.cpp: Make aCC quit yacking about an empty translation - unit. - - * ace/OS.i: Fix up the conditions for readdir_r on differing pthreads - drafts. - - * ace/config-aix-4.2.x.h: Added ACE_HAS_DIRENT. - -Tue Sep 22 21:00:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers_T.{h,cpp} - examples/Bounded_Packet_Relay/bpr_thread.cpp: - - More fixes from testing on NT, added more logging features. - -Tue Sep 22 17:07:17 1998 Nanbor Wang - - * tests/Message_Queue_Notifications_Test.cpp (Watermark_Test): - Repositioned a comma so it compiles on non-threaded platforms. - Thankd to Ossama for noticing this. - -Tue Sep 22 17:20:53 1998 James Hu - - * ace/Containers_T.{h,i}: - Added a remove method to the ACE_DLList_Iterator. This is - needed since ACE_DLList is actually an abstraction over - ACE_Double_Linked_List, so the user of ACE_DLList does not hold - the address of the "real" node that ACE_Double_Linked_List is - managing. - -Tue Sep 22 16:07:53 1998 Steve Huston - - * bin/Makefile: Will now only build envinfo if make is invoked - with "envinfo=1". The difference is needed to allow clone to be - built before ACE has been built. - -Tue Sep 22 13:58:06 1998 Carlos O'Ryan - - * ace/config-irix6.x-g++.h: - Added some missing defines, thanks to JM Strauss - for pointing them out. Also fixed a - test for the N32 ABI, it said _NABI32 and should be _ABIN32. - -Tue Sep 22 11:42:17 1998 David L. Levine - - * ace/config-lynxos.h: added ACE_HAS_POWERPC_TIMER with - __powerpc__, but commented it out because it requires an OS patch. - - * ace/OS.i (fstat): put a :: in front of the call to the - system fstat if it's not defined as a macro. Thanks to - Ossama for reporting that MM_Shared_Memory_Test failed - otherwise. - -Tue Sep 22 10:58:04 1998 Ossama Othman - - * ace/OS.i (ACE_cond_t::waiters): only define this function if - ACE_HAS_THREADS. - - Testing the autoconf integration on a Linux libc5 system w/o - threads caused me problems since ACE_LACKS_COND_T gets - defined by the configure script automatically since no - condition variable support was found. The ACE_cond_t class - appears to only get defined if ACE_HAS_THREADS is defined, - otherwise ACE_cond_t is typedefed to an int. For - this reason, I thought that it would be a good idea to make - the above modification to prevent compile time errors on - platforms without threads and when ACE_LACKS_COND_T is - defined on those platforms. - -Tue Sep 22 03:09:07 1998 Douglas C. Schmidt - - * ACE version 4.5.41 released. - -Tue Sep 22 00:31:26 1998 Douglas C. Schmidt - - * ace/Log_Record.cpp (print): Make sure that the process id and - timestamp are fixed width. Thanks to Valery Arkhangorodsky - for this fix. - -Mon Sep 21 22:54:44 1998 Douglas C. Schmidt - - * examples/Bounded_Packet_Relay: Removed a gratuitous - parameterized type which was causing problems for SunC++. - -Mon Sep 21 21:47:12 1998 David L. Levine - - * ace/README: added ACE_HAS_PURIFY and ACE_HAS_QUANTIFY. - - * include/makeinclude/wrapper_macros.GNU: added ACE_HAS_PURIFY - and ACE_HAS_QUANTIFY support. We should use these consistently. - In addition, added -I support for Purify and Quantify. - This support should no longer appear in individual Makefiles. - - * ACE-INSTALL.html: added paragraph on Purify/Quantify support - details, i.e., they must be on your PATH, and ACE puts the - instrumented libraries below /tmp by default. - -Mon Sep 21 20:46:00 1998 Nanbor Wang - - * ace/Containers_T.cpp (ACE_Double_Linked_List): Changed - dynamic_cast to static_cast. - -Mon Sep 21 18:35:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers_T.{h,cpp} (new) - examples/Bounded_Packet_Relay/bpr_thread.cpp: - - Factored out templates into separate files, fixed initialization, - concurrency, and deadlock problems found in NT testing. - -Mon Sep 21 18:27:19 1998 Irfan Pyarali - - * tests/Conn_Test.cpp: g++ cannot gork templates typedefs. - -Mon Sep 21 15:48:34 1998 Douglas C. Schmidt - - * ace/Acceptor: It's now possible to select if you want to reuse - the PEER_ACCEPTOR addr. Thanks to Chuck Gehr for suggesting - this. - -Mon Sep 21 15:00:34 1998 Nanbor Wang - - * ace/Thread_Manager.{h,cpp} (join): Allow passing back of thread's - exit status of the thread being joined. - -Mon Sep 21 11:24:33 1998 Douglas C. Schmidt - - * docs/ACE-categories.html (HREF): Updated the links to ace/ and - man/ since we moved the file around. Thanks to Byron Harris for - reporting this. - -Mon Sep 21 10:22:17 1998 Steve Huston - - * ace/Select_Reactor_T.cpp (handle_error): Check handles for all - errors (not just EBADF) on Win32, in addition to MVS. Thanks - to Xu Yifeng for this fix. - -Mon Sep 21 01:27:19 1998 Irfan Pyarali - - * ace/Strategies_T.cpp (find_or_create_svc_handler_i): g++ cannot - gork templates... - - * tests/Conn_Test.cpp: Fixed template instantiations. - - * ace/Strategies_T.cpp (ACE_Cached_Connect_Strategy): New methods - find_or_create_svc_handler_i and check_hint_i to simplify - connect_svc_handler. Also added _i methods to implement - non-locking versions. - - * ace/Strategies.h (ACE_Connection_Recycling_Strategy): - New methods: mark_as_close and cleanup_hint. - - * ace/Strategies: Added three new classes: ACE_Recyclable, - ACE_Hashable, and ACE_Refcountable. Also added - ACE_Refcounted_Hash_Recyclable. Deprecated ACE_Recyclable and - ACE_Hash_Recyclable - - * ace/Svc_Handler.h (cleanup_hint): Added new method. This can be - used by users when they are through with using the svc_handler - as a hint. - -Mon Sep 21 00:40:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers.{h,cpp} - examples/Bounded_Packet_Relay/bpr_thread.cpp - examples/Bounded_Packet_Relay/README: - - Reorganized construction of input and output device objects - and the relay object, cleaned up readme file. - -Sun Sep 20 22:01:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/BPR_Drivers.h: - - Made Bounded_Packet_Relay_Driver::display_menu (void) pure virtual: - now it all compiles *and* links. - -Sun Sep 20 21:49:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers.{h,cpp} - - Fourth checkin of bounded packet relay example: compiles. - -Sun Sep 20 20:41:29 1998 Nanbor Wang - - * ace/Acceptor.{h,cpp}: Added an extra argument to constructors of - ACE_Strategy_Acceptor and open method so that we can accept only - one connection request every time handle_input is called. - -Sun Sep 20 20:30:36 1998 Marina Igorevna Spivak - - * ace/OS.h : added ACE_GUARD_THROW, ACE_GUARD_THROW_RETURN, - ACE_NEW_TRY_THROW, ACE_NEW_TRY_THROW_RETURN macros to utilize - new exceptions macros. - -Sun Sep 20 19:18:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers.{h,cpp} - examples/Bounded_Packet_Relay/README - - Third checkin of bounded packet relay example, - addressed remaining coding style issues. - (very rough, still does not compile) - -Sun Sep 20 16:38:17 1998 Nanbor Wang - - * ace/Thread_Manager.i (get_next): Changed to use static_cast. - - * ace/Thread_Manager.cpp: Shielded off terminated_thr_list_ from - compilation on VxWorks. Thanks to David for noticing this. - -Sun Sep 20 12:17:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers.{h,cpp} - - Second checkin of bounded packet relay example, - addressed several coding style issues. - (very rough, still does not compile) - -Sun Sep 20 11:25:52 1998 David L. Levine - - * ace/OS.h: with ACE_HAS_TSS_EMULATION, use u_long instead of - u_int for ACE_thread_key_t. This avoids overload ambiguity - on platforms that typedef pthread_key_t to u_int. We'll be - in trouble if we try on one that uses u_long. In that case, - we could try u_short, or added an ACE_HAS. - - * ace/Thread_Manager.i (register_as_terminated): neutered on VxWorks, - so that it will compiled. - - * tests/SOCK_Connector_Test.cpp (host_is_up): don't define - this function ifdef ACE_LACKS_GETHOSTENT, because it isn't - used in that case. - -Sat Sep 19 14:29:56 1998 Douglas C. Schmidt - - * ace/OS.i (fstat): Removed the "::" in front of the fstat() call - since it's implemented as a macro on some platforms. Thanks to - Frank Adcock for reporting this. - - * examples/Bounded_Packet_Relay: Updated the coding style. - -Sat Sep 19 14:06:52 1998 Darrell Brunsch - - * apps/JAWS/PROTOTYPE/JAWS/IO.cpp: Fixed typo. - - * apps/JAWS/PROTOTYPE/JAWS/jaws.dsp: - * apps/gperf/src/gperf.dsp: - * ace/ace_dll.dsp: - * netsvcs/clients/Naming/Client/Client_Test.dsp: - * netsvcs/lib/netsvcs.dsp: - Changed behavior of all DLL projects and utilities (like - gperf) to put the dll and executables in $ACE_ROOT/bin. - - * ace/config-win32.h: ACE_HAS_GPERF is back. - - * ACE-INSTALL.html: On NT, $ACE_ROOT/bin should now be in - your path instead of $ACE_ROOT/ace. - -Sat Sep 19 12:27:31 1998 Irfan Pyarali - - * ace/Asynch_IO.cpp: thread_function() is only for UNIX. - -Sat Sep 19 10:43:41 1998 Alexander Babu Arulanthu - - * ace/Asynch_IO.cpp (open): Fixed the build errors with WIN32. - -Sat Sep 19 09:02:00 CDT 1998 Chris Gill - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.{h,cpp} - examples/Bounded_Packet_Relay/BPR_Drivers.{h,cpp} - examples/Bounded_Packet_Relay/bpr_thread.cpp - examples/Bounded_Packet_Relay/Makefile - examples/Bounded_Packet_Relay/README: - - First checkin of bounded packet relay example - (very rough, does not even compile yet) - -Sat Sep 19 00:42:53 1998 Alexander Babu Arulanthu - - * ace/Asynch_IO.cpp: Fixed NT warnings (hopefully :-) - -Fri Sep 18 22:50:21 1998 Nanbor Wang - - * ace/Thread_Manager.{h,i,cpp}: Added a join method to reclaim - OS/ACE resources that are used to managed thread object. I - encourage all ACE programmers to use ACE_Thread_Manager::join to - wait for threads spawned by ACE_Thread_Manager. It is more - portable than ACE_Thread (most significantly, wrt resource - management.) - (wait_grp,wait_task): Improved and corrected the - implementations. These two methods now also clean up resources - used by threads that has already terminated when the calls get - invoked. - - Changed the terminated_thr_queue_ to terminated_thr_list_ which - is now a double-linked list. This change allows us to - gather/cleanup infomation of threads belong to same group/task - in one pass. - - ACE_Thread_Manager::exit now tests the thread status to see if - ACE_THR_JOINING is set or not. If set, it means the thread is - being joined by join/wait_grp/wait_task and avoid double - removing the thread resources from OS. - - * ace/OS.h (ACE_Thread_State): Added ACE_THR_JOINING to identify - threads that are being joined by the Thread Manager. - - * ace/Container_T.{h,cpp} (ACE_Double_Linked_List): Added several - dynamic_cast in several places so we can generate code for both - base class and derived class. - (ACE_Double_Linked_List_Iterator): Added a method - "advance_and_delete" to allow removing double-linked list - element while iterating thru the list. The design is very - intrusive and you should know what you are doing before using - the method. Notice that ACE_Double_Linked_List is _not_ a - general purpose Container class. - - * tests/run_tests.bat: Added DLList_Test. - -Fri Sep 18 18:06:19 1998 Alexander Babu Arulanthu - - * ace/Asynch_IO.h: - * ace/Asynch_IO.cpp: - * examples/Reactor/Proactor/test_proactor.cpp: - Implemented Asynch_Accept for POSIX4 systems, by having only one - thread doing . Asynch_Accept_Handler has been - changed to act as Event Handler now. No problem of having threads - blocking on the now. Thanks to Irfan for this idea. - -Fri Sep 18 13:26:50 1998 David L. Levine - - * tests/High_Res_Timer_Test.cpp (check): raised success - threshold from 10 to 25 percent. Ossama saw just over - 10 percent on an Linux box, not surprising. Thanks to - him for reporting it. - - * ace/SOCK_Dgram_Mcast.cpp (unsubscribe): on other than ACE_WIN32, - added ACE_UNUSED_ARGs for protocol_family and protocol. Thanks - to Peter Liqun Na for reporting this. - - * ace/OS.cpp (ACE_TSS_Emulation_cleanup): added ACE_UNUSED_ARG (ptr). - - * bin/make-release: enter version number(s) into BUG-REPORT-FORM. - Thanks to Steve for this suggestion. - -Fri Sep 18 01:53:38 1998 Douglas C. Schmidt - - * ACE version 4.5.40 released. - -Fri Sep 18 01:51:46 1998 Douglas C. Schmidt - - * ace/ACE (open_temp_file): Changed the signature of this method - to take a const char * rather than a char *. - -Fri Sep 18 00:07:31 1998 Alexander Babu Arulanthu - - * ace/ACE.h (ACE): - * ace/ACE.cpp (open_temp_file): Added this method to do open for - the temp files, so that they will get deleted when they are - closed. - Thanks to Nanbor and Carlos. - -Thu Sep 17 23:01:50 1998 David L. Levine - - * ace/Containers.i: resurrected the file properly. - - * ace/Containers.i (~ACE_DLList_Node): removed extraneous ; - following function definition. - -Thu Sep 17 22:44:17 1998 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: If the client - doesn't connect to the server, make sure to shut down the test - gracefully, rather than getting a segfault. Thanks to - Margherita Vittone Wiersma for - reporting this. - -Thu Sep 17 22:33:00 1998 James CE Johnson - - * docs/tutorials/index.html - docs/tutorials/templates.html - - Added templates.html to discuss issues surrounding manual vs - automatic template instantiation. - -Thu Sep 17 20:01:33 1998 Nanbor Wang - - * tests/tests.dsw: - * tests/version_tests.dsw: - * tests/[version_tests/]High_Res_Timer_Test.dsp: - * tests/[version_tests/]DLList_Test.dsp: Added new project files. - -Thu Sep 17 19:27:11 1998 David L. Levine - - * ace/OS.cpp (TSS_base,some ACE_PSOS_Time_t functions): - removed ACE_INLINE. - - * examples/Shared_Malloc/test_malloc.cpp (gen_size): cast - &seed to unsigned long first, to avoid warning about - narrowing on Alphas (cxx/DU 4.0). - -Thu Sep 17 18:51:08 1998 Carlos O'Ryan - - * examples/Reactor/Multicast/server.cpp: - * examples/Reactor/Multicast/Log_Wrapper.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp: - Revert back to iovec instead of ACE_IO_Vector. - -Thu Sep 17 18:33:19 EDT 1998 James CE Johnson - - * docs/tutorials/002/server.pp - - Added necessary templates for explicit instantiation. - Thanks to Krishna Padmasola for providing the proper code - and to Clinton Carr for reminding me to do it! - -Thu Sep 17 16:30:00 1998 Carlos O'Ryan - - * This comments were lost in a previous commit. - - * ace/OS.h: - * ace/OS.i: - * ace/ACE.cpp: - * ace/ACE.h: - * ace/DEV_IO.cpp: - * ace/DEV_IO.h: - * ace/DEV_IO.i: - * ace/FIFO_Send_Msg.cpp: - * ace/FILE_IO.cpp: - * ace/FILE_IO.h: - * ace/FILE_IO.i: - * ace/LSOCK.cpp: - * ace/LSOCK_Stream.cpp: - * ace/LSOCK_Stream.h: - * ace/SOCK_Dgram.cpp: - * ace/SOCK_Dgram.h: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/SOCK_Dgram_Bcast.h: - * ace/SOCK_Dgram_Mcast.h: - * ace/SOCK_Dgram_Mcast.i: - * ace/SOCK_IO.cpp: - * ace/SOCK_IO.h: - * ace/SOCK_IO.i: - * ace/SPIPE_Stream.cpp: - * ace/SPIPE_Stream.h: - * ace/SPIPE_Stream.i: - Moved back to iovec instead of ACE_IO_Vector. Since this - structure is defined by ACE we can make it binary compatible - with the WSABUF structure (yet preserve the names of the UNIX - iovec struct). This allow us to simply pass arrays of iovec to - routines expecting WSABUF*. - But Win32 does not provide any functions to go scatter-gather - over files, so this is only used for sockets, new methods: - ACE_OS::sendv() and ACE_OS::recvv() were added for this - purpose, the old emulation is used for the other classes. Users - writing to higher-level components (such as ACE_SOCK or - ACE_SOCK_Dgram) will benefit from this without any changes to - their code. - - * ace/SOCK_Dgram.cpp: - * ace/SOCK_Dgram.h: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/SOCK_Dgram_Bcast.h: - * ace/SOCK_Dgram_Mcast.h: - * ace/SOCK_Dgram_Mcast.i: - Added the implementation for some send() variants that were - declared but not implemented. - - * ace/OS.h: - * ace/OS.i: - * ace/config-win32-common.h: - Added support for sendmsg() and recvmsg() on NT, emulated over - WSASendTo() and WSARecvFrom(), do data copies are made. - - * ace/Containers.cpp: - * ace/Containers.h: - * ace/Containers_T.h: - * ace/Containers_T.i: - Moved the non-templated code back to Containers.{h,i,cpp}, added - the infamous ACE_Export macro. - - * ace/ace_dll.dsp: - Added Containers.cpp to the project. - -Thu Sep 17 11:23:49 1998 Douglas C. Schmidt - - * ace/OS: Modified ACE_THR_FUNC so that its signature is always - void *(*)(void *). We now have a new type called - ACE_THR_FUNC_INTERNAL that is defined for each different OS - platform, e.g., VxWorks, pSoS, et al. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp (run_server): Oops, - we can't use ACE_THR_FUNC here since that has a different - signature on VxWorks. So we'll just expand this a bit. Thanks - to Raja Ati for reporting this. - -Thu Sep 17 09:54:56 1998 David L. Levine - - * ace/Svc_Handler.cpp (new): cleaned up the ACE_ASSERT check - for ACE_Dynamic::instance () not being null. - - * docs/ACE-guidelines.html: added guideline to define ACE_ - typedefs to reduce the number of #ifdefs. Thanks to - Carlos and Doug for this suggestion, and Chris for the - example :-). - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp (run_event_loop): - added casts to ACE_THR_FUNC to please VxWorks. Thanks to - Raja Ati for reporting this problem. - - It would probably be better to change the definition of - ACE_THR_FUNC on VxWorks (and PSOS) to be the same as on - other platforms. That will require other changes, though. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: - removed trailing ; from instantiation #pragma. - - * ace/config-lynxos.h: added ACE_HAS_TSS_EMULATION. - -Thu Sep 17 09:23:01 1998 Carlos O'Ryan - - * ace/FIFO_Send_Msg.cpp: - Fixed variable declaration, "struct ACE_IO_Vector_Base" is not - the same as "ACE_IO_Vector_Base". - - * ace/OS.i: - Fixed the ACE_OS::rand_r() signature for Win32. - - * ace/SOCK_Dgram_Mcast.cpp: - Fixed some problems with the Win32 implementation of - unsubscribe(). - -Thu Sep 17 08:41:14 1998 Carlos O'Ryan - - * examples/Shared_Malloc/test_malloc.cpp: - Fixed some problems with my changes to rand_r() - - * ace/Containers.i: - Resurrected this file to avoid problems with dependencies in - TAO. - -Thu Sep 17 08:41:24 1998 Steve Huston - - * include/makeinclude/platform_hpux_gcc.GNU: Added -L. to LDFLAGS. - Thanks to Anne Blankert for this fix. - -Thu Sep 17 07:31:13 1998 David L. Levine - - * ace/OS.i (truncate): added ACE_UNUSED_ARGs for NOTSUP case. - -Thu Sep 17 02:45:53 PDT 1998 James Hu - - * ace/Containers_T.h: - * ace/Containers_T.i: - * ace/Containers_T.cpp: - Added these files so that I could include some explicit - template instantiations inside Containers.cpp. Removed - #if guards around ACE_DLList since it no longer relies - on the feature that was being guarded against. - - * ace/Containers.h: - Simply #includes Containers_T.h. - - * ace/Containers.cpp: - Only contains some explicit template instantiations. - - * ace/Containers.i: - Removed, since it was no longer needed. - -Thu Sep 17 01:20:53 1998 Irfan Pyarali - - * ace/Msg_WFMO_Reactor.cpp (dispatch_window_messages): There was a - slight problem in Msg_WFMO_Reactor.cpp when ACE coexists with - MFC. Basically the dispatch_window_messages routine simply - returns -1 when the WM_QUIT message is received. However, if - the WFMO_Reactor and the MFC application run on the different - threads the main thread would never shut down since it just keep - waiting forever for the Quit message from other threads. The - easiest way to fix the above problem to call PostQuiteMessage - when WM_QUIT is received by WFMO_Reactor. - - Thanks to Hongbo Xu for fixing this. - - * ace/OS.i (open): No need to find the file size since - SetFilePointer supports FILE_END. Also fixed the UNICODE - version of ACE_OS::open(). - -Wed Sep 16 22:52:44 1998 Carlos O'Ryan - - * examples/Reactor/Multicast/server.cpp: - * examples/Reactor/Multicast/Log_Wrapper.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp: - Use ACE_IO_Vector instead of iovec because it is more portable. - -Wed Sep 16 22:17:54 1998 Carlos O'Ryan - - * ace/OS.h: - * ace/DEV_IO.cpp: - * ace/DEV_IO.h: - * ace/DEV_IO.i: - * ace/FIFO_Send_Msg.cpp: - * ace/FILE_IO.cpp: - * ace/FILE_IO.h: - * ace/FILE_IO.i: - * ace/LSOCK.cpp: - * ace/LSOCK_Stream.cpp: - * ace/LSOCK_Stream.h: - * ace/SOCK_Dgram.cpp: - * ace/SOCK_Dgram.h: - * ace/SOCK_Dgram_Bcast.h: - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Dgram_Mcast.h: - * ace/SOCK_Dgram_Mcast.i: - * ace/SOCK_IO.cpp: - * ace/SOCK_IO.h: - * ace/SOCK_IO.i: - * ace/SPIPE_Stream.cpp: - * ace/SPIPE_Stream.h: - * ace/SPIPE_Stream.i: - More iovec to ACE_IO_Vector_Base conversion. - - * ace/Containers.i: - The ACE_DLList_Node and ACE_DLList_Iterator class are protected - by a !defined (ACE_LACKS_TEMPLATE_AS_TEMPLATE_PARAMETER), so - should be their inline methods. - - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Dgram_Mcast.h: - * ace/SOCK_Dgram_Mcast.i: - Added a generic unsubscribe() method. - -Wed Sep 16 21:45:48 1998 Darrell Brunsch - - * ace/ACE.{h.cpp}: Changed some iovecs to ACE_IO_Vector_Base. - - * ace/config-win32.h: Commented out ACE_HAS_GPERF until we get - everything working with it. - -Wed Sep 16 21:43:07 1998 Nanbor Wang - - * ace/OS.i (open): Added SetFilePointer to move the file pointer - of the opened file to end of file if _O_APPEND is specified on - Win32. - -Wed Sep 16 20:42:16 1998 Douglas C. Schmidt - - * ace/OS: Added a typedef for ACE_IO_Vector_Base so that it will - shield the differences between Win32 and UNIX. - -Wed Sep 16 20:09:01 1998 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - ACE_OS::rand_r() is easier to use now. Just define a variable of - that type and invoke ACE_OS::rand_r() with it, it even works on - broken platforms that define it as a non-pointer. - This is a brief example on how to use it: - ACE_RANDR_TYPE seed; - int r1 = ACE_OS::rand_r (seed); - int r2 = ACE_OS::rand_r (seed); - -Wed Sep 16 17:46:23 PDT 1998 James Hu - - * ace/Containers.{h,i}: Added comments to DLList as per Doug's - request. - -Wed Sep 16 19:23:21 1998 Steve Huston - - * ace/config-hpux-11.x-hpc++.h: Moved ACE_HAS_DIRENT to config-hpux11.h - -Wed Sep 16 18:21:45 1998 Douglas C. Schmidt - - * ace/Containers.h: Reformatted the ACE_DLList* classes to conform - to ACE programming conventions. - - * ace/config-hpux-11.x-hpc++.h: Added ACE_HAS_DIRENT and - ACE_HAS_GPERF to appease John Mulhern. - - * ace/Asynch_Acceptor.cpp: Added ACE_reinterpret_cast()s to the - sockaddr *'s to appease aCC on HP/UX 11. Thanks to John Mulhern - for reporting this. - -Wed Sep 16 17:16:51 EDT 1998 James CE Johnson - - * docs/tutorials/012/Makefile - docs/tutorials/012/data.h - docs/tutorials/012/message_queue.cpp - docs/tutorials/012/page01.html - docs/tutorials/012/page02.html - docs/tutorials/012/page03.html - docs/tutorials/012/page04.html - docs/tutorials/012/page05.html - docs/tutorials/012/page06.html - docs/tutorials/012/task.cpp - docs/tutorials/012/task.h - docs/tutorials/index.html - - Tutorial 12. This corrects some of the nastyness - in number 11 by specializing the ACE_Message_Block - to carry around the data. - -Wed Sep 16 16:01:53 1998 Nanbor Wang - - * ace/Select_Reactor_T.{h,i,cpp}: Disable inlining in - Select_Reactor_T.i and always include them in .cpp file. The - latest version of SunCC can't grok this particular file and we - just turn it off here. We shall turn it back on once the - problem gets fixed. Thanks to Keith Brown - for providing this temporary fix. - -Wed Sep 16 13:41:50 1998 Douglas C. Schmidt - - * ace/OS.h: Added more protection for the semun definition, i.e., - (defined (__GLIBC__) && defined (_SEM_SEMUN_UNDEFINED)). This - fixes problems with Linux, GLIBC 2.1, and PGCC. Thanks to - Marc Lehmann for reporting this. - -Wed Sep 16 11:41:57 1998 David L. Levine - - * ace/High_Res_Timer.cpp: added ACE_HAS_POWERPC_TIMER support. - - * tests/High_Res_Timer_Test.cpp: added this new test. - - * tests/Makefile,run_tests.{bat,psosim,sh,vxworks}: - added High_Res_Timer_Test. - - * ace/OS.* (readPPCTimer): unlined readPPCTimer for - PowerPC. If it was called more than once in a - compilation unit, when inlined, the assembler complained - about multiple definitions of the aclock symbol. - - * ace/Malloc_T.cpp (dump): fixed typo, cb_ptr instead of - cp_ptr. Thanks to Umar Syyid for reporting this. - - * tests/TSS_Test.cpp (worker): allow second group of TSS keys to - be allocated, with TSS emulation. - - * ace/Svc_Handler.cpp (new): added check that - ACE_Dynamic::instance () is non-null before dereferencing it. - ACE_ASSERT/return 0 if it is null. - -Wed Sep 16 11:28:47 1998 Irfan Pyarali - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: In - general, using iostreams in ACE causes more problems for us than - it is worth since some systems do not support iostreams. I have - rewritten this file to not use iostreams but use - ACE_DEBUG/ACE_ERROR instead. - -Wed Sep 16 10:49:34 1998 Carlos O'Ryan - - * bin/auto_compile: Updated to the new directory hierarchy in TAO. - -Wed Sep 16 09:46:31 1998 Steve Huston - - * ace/config-hpux-10.x.h: Added ACE_HAS_DIRENT. - -Tue Sep 15 20:25:23 1998 Douglas C. Schmidt - - * tests/test_config.h: Always #undef ACE_NLOGGING so the tests - will produce output! Thanks to Chuck Gehr for reporting this. - - * ace/OS.i: Added a new ACE_LACKS_TRUNCATE flag to work around - platforms that lack the truncate() call. Thanks to - Sergio for reporting this. - -Tue Sep 15 17:57:26 1998 Sergio Flores - - * ace/config-vxworks5.x.h: Added ACE_LACKS_TRUNCATE to VxWorks - configuration. - -Tue Sep 15 16:58:18 1998 Nagarajan Surendran - - * include/makeinclude/platform_chorus_ghs.GNU: Changed the - MVME_DIR to /project/doc/mvme/mvme177. - - * ace/ARGV.cpp (ACE_ARGV::argv_to_string): Fixed the problem where - we were allocating space only for the length of the string whereas - strecpy was inserting the extra '\0' leading to Array bounds write. - -Tue Sep 15 16:34:47 1998 David L. Levine - - * ace/OS.i (gethrtime): added high-res timer support with - g++ and ACE_HAS_POWERPC_TIMER. - - * ace/OS.{h,cpp},config-vxworks5.x.h,README: changed ACE_HAS_POWERPC - to ACE_HAS_POWERPC_TIMER. - - * ace/config-lynxos.h: added ACE_HAS_PENTIUM, to provide - high-res timer support on LynxOS. - -Tue Sep 15 13:33:26 1998 Nanbor Wang - - * ace/config-{WinCE,g++-common}.h: - * ace/OS.{h,i,cpp}: Deprecated ACE_LACKS_GETS and ACE_OS::gets (void). - - * apps/gperf/src/gperf_lib.dsp: Enabled c++ exception handling to - avoid warning when compiling with standard c++ libraries. - -Tue Sep 15 11:22:53 1998 Aniruddha Gokhale - - * ace/OS.{h, i}: - - Added definition for the "stat" data structure. Also added the - definition for the "truncate" function. - -Mon Sep 14 23:28:24 1998 Douglas C. Schmidt - - * ACE version 4.5.39 released. - -Mon Sep 14 21:46:36 1998 David L. Levine - - * ace/Containers.h: added "class" to several ACE_DLList friend - declarations. - -Mon Sep 14 21:02:30 1998 Irfan Pyarali - - * ace/Mem_Map.cpp (map_it): Removed the code for - !ACE_HAS_P_READ_WRITE since we cover it in ACE_OS::pwrite. - - * ace/Filecache.cpp (ACE_Filecache_Object): Changed the - lseek/write combo to pwrite. - -Mon Sep 14 17:09:04 1998 Douglas C. Schmidt - - * ace/config-win32-common.h,OS.h,README: Removed all mention of - ACE_LACKS_FIFO, which was no longer necessary. Thanks to Ossama - Othman for suggesting this. - - * ace/ACE.cpp (bind_port): Renamed sin to sock_addr to make the - autoconf script happier. Thanks to Ossama Othman - for suggesting this. - - * include/makeinclude/platform_mvs.GNU: Updated the MVS platform - configuration as follows: - - changed: - debug = 1 - to: - debug = 0 - - added: - static_libs = 1 - - and deleted the line: - CCFLAGS += $(CFLAGS) - - Thanks to Chuck Gehr for these - changes. - -Mon Sep 14 14:34:32 1998 Darrell Brunsch - - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf_lib.dsp: - Fixed the project by removing new.cpp (which disappeared a - while back) and changed the code generation to DLL. Now - seems to work on NT. - - * ace/config-win32.h: ACE_HAS_GPERF now on NT. - -Mon Sep 14 13:41:26 1998 Douglas C. Schmidt - - * ace/OS: Fixed qsort() and bsearch() so they work correctly for - MVS. Thanks to Chuck Gehr for reporting this. - - * ace/config-mvs.h: Added - - #define ACE_HAS_DIRENT - #define ACE_LACKS_READDIR_R - - so that things will work correctly for MVS. Thanks to Chuck - Gehr for reporting this. - -Mon Sep 14 10:11:18 1998 Nanbor Wang - - * ace/ace_ce_dll.dsp: Added Select_Reactor_Base.cpp and removed - Array.cpp from the project. Thanks to Paul Sexton - for noticing this. - - * ace/config-WinCE.h: Added ACE_LACKS_BSEARCH. - - * ace/OS.h: Added /**/ between #include and in - pSOS section to prevent a MSVC warning. - - * ace/OS.i (bsearch): If the function is not supported by the - platform, return NULL instead of -1 so it behaves compatibly - with most common implementation. - -Mon Sep 14 09:37:09 1998 Douglas C. Schmidt - - * ace/Synch_T.h: Fixed a deadlock condition caused by acquiring - the internal lock in multiple places during the same call. - Thanks to Jorn Jensen for reporting this. - -Mon Sep 14 01:59:51 1998 Nanbor Wang - - * ace/Strategies_T.{h,i,cpp}: Added two new classes - ACE_Thread_Pool_Strategy and ACE_Svc_Handler_Pool_Strategy for - activating and creating Svc_Handler. They should be used with - the new TP_Reactor. More to come... - -Sun Sep 13 22:31:23 1998 Douglas C. Schmidt - - * ACE version 4.5.38 released. - -Sun Sep 13 18:36:11 EDT 1998 James CE Johnson - - * docs/tutorials/006/notify.cpp - No longer applicable. This used spawn() to create the - thread but the new version uses an ACE_Task<> derivative. - - * docs/tutorials/006/Makefile - Removed dependency info. - - * docs/tutorials/007/thread_pool.cpp - Removed THR_DETACHED from activate() call. I need a - better understanding of when to include this flag... - - * docs/tutorials/index.html - Setting up new Message_Queue entry points. - - * docs/tutorials/010/Makefile - docs/tutorials/010/block.h - docs/tutorials/010/message_queue.cpp - docs/tutorials/010/page01.html - docs/tutorials/010/page02.html - docs/tutorials/010/page03.html - docs/tutorials/010/page04.html - docs/tutorials/010/page05.html - docs/tutorials/010/page06.html - docs/tutorials/010/page07.html - docs/tutorials/010/task.cpp - docs/tutorials/010/task.h - - A tutorial showing a simple use of the ACE_Message_Queue. - - * docs/tutorials/011/Makefile - docs/tutorials/011/block.h - docs/tutorials/011/data.h - docs/tutorials/011/message_queue.cpp - docs/tutorials/011/page01.html - docs/tutorials/011/page02.html - docs/tutorials/011/page03.html - docs/tutorials/011/page04.html - docs/tutorials/011/page05.html - docs/tutorials/011/page06.html - docs/tutorials/011/task.cpp - docs/tutorials/011/task.h - - Extension of 010 adds queue-ing of non-trivial data. - - -Sun Sep 13 16:29:27 1998 Carlos O'Ryan - - * ace/Select_Reactor_T.h: - Use the ACE_UNIMPLETED_FUNC to make the code work on older - versions of IRIX - -Sat Sep 12 22:39:47 1998 Douglas C. Schmidt - - * ace/ACE.i: There was a bug with strecpy() -- it should return a - pointer to 1 byte PAST the '\0'... - -Sat Sep 12 21:43:07 1998 Nanbor Wang - - * ace/Timer_Hash.cpp: Removed the #pragma template instantiation - for ACE_Timer_Node_T because it is already - instantiated in Timer_Queue.cpp. Thanks to Sergio for noticing - this. - -Sat Sep 12 16:30:39 1998 Douglas C. Schmidt - - * ace/Dirent.cpp: Renamed the methods to be more "abstract" by - removing the "dir" suffixes. - - * ACE-INSTALL.html: Fixed a broken link. Thanks to Tom Shields - for reporting this. - - * ace/OS.h (ACE_OS): Added wrappers for the passwd iterator. - - * ace/OS.h (ACE_OS): Added wrappers for qsort() and bsearch(). - - * ace/README: Reformatted this file and also changed - ACE_REQUIRES_FUNC_DEFINITIONS - ACE_NEEDS_READV - ACE_NEEDS_SCHED_H - ACE_NEEDS_SYSTIME_H - ACE_NEEDS_WRITEV - - to - - ACE_NEEDS_FUNC_DEFINITIONS - ACE_LACKS_READV - ACE_LACKS_SCHED_H - ACE_LACKS_SYSTIME_H - ACE_LACKS_WRITEV - - respectively. - -Sat Sep 12 19:18:18 1998 Nanbor Wang - - * ace/OS.i (qsort): Fixed a typo. And removed "return" for this - is a void function. - -Sat Sep 12 13:13:39 EDT 1998 James CE Johnson - - docs/tutorials/003/Makefile - Removed dependency stuff since installations may vary - - docs/tutorials/003/client.cpp - docs/tutorials/003/page01.html - docs/tutorials/004/Makefile - docs/tutorials/004/client.cpp - docs/tutorials/004/page01.html - - Converted to new style with embedded comments instead of - line-numbered comments. - -Fri Sep 11 22:46:54 EDT 1998 James CE Johnson - - docs/tutorials/001/Source.tgz - docs/tutorials/001/acceptor.h - docs/tutorials/001/logger.h - docs/tutorials/001/page02.html - docs/tutorials/001/page03.html - docs/tutorials/001/page04.html - docs/tutorials/001/page05.html - docs/tutorials/001/server.cpp - docs/tutorials/002/Makefile - docs/tutorials/002/handler.h - docs/tutorials/002/page01.html - docs/tutorials/002/page02.html - docs/tutorials/002/page03.html - docs/tutorials/002/page04.html - docs/tutorials/002/server.cpp - - Updated to "new style". Corrected issues with Reactor - based on recent mailing list discussions. - -Fri Sep 11 12:30:37 1998 Nagarajan Surendran - - * ace/config-chorus.h: Uncommented ACE_LACKS_SYSV_SHMEM as ace - didn't compile on Chorus with that commented out. - -Fri Sep 11 09:02:00 CDT 1998 Chris Gill - - * ace/OS.{h,i} - ace/Containers.{cpp,h} - ace/config-psos-diab.h - include/makeinclude/platform_psos_diab.GNU: - Fixes to compile pSOS - added #if ! defined around new templates - as template parameters stuff in Config.* (Diab compiler can't - grok these), played with library linkage order platform macros. - -Fri Sep 11 08:54:41 EDT 1998 James CE Johnson - - * docs/tutorials/001/logger.h - Logging_Handler::open() should return 0 on success. - - * docs/tutorials/002/server.cpp - docs/tutorials/002/page02.html - Provide 'g_reactor' to the acceptor's open(). If you - don't do this, the app will core dump on ^C - - Thanks to Krishna Padmasola for - helping me see these. - -Thu Sep 10 16:53:21 1998 Carlos O'Ryan - - * tests/Upgradable_RW_Test.cpp: - Some templates were instantiated twice if threads were enabled. - -Thu Sep 10 13:41:53 1998 David L. Levine - - * config-sunos4-sun3.x.h,config-tandem.h,README: removed - ACE_HAS_SYSV_SPRINTF because it's no longer used. Thanks - to Ossama for reporting this. - -Thu Sep 10 10:18:29 1998 Nanbor Wang - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp (run_event_loop): - Changed to use ACE_Handle_Set instead of FD_SET. It is more - portable this way. Thanks to Andre Folkers - for noticing this. - -Wed Sep 09 16:29:36 1998 David L. Levine - - * BUG-REPORT-FORM,Makefile: added BUG-REPORT-FORM. Thanks - to Susan Liebeskind for the form. - -Wed Sep 9 13:22:11 1998 James Hu - - * ace/Containers.h: - * ace/Containers.cpp: Added a new container class ACE_DLList. - -Tue Sep 8 23:17:11 1998 Nanbor Wang - - * tests/Thread_Mutex_Test.cpp (test): - * tests/Priority_Buffer_Test.cpp (consumer): Changed the - do-nothing if statements to ACE_UNUSED_ARG because NT doesn't - like that. Thanks to David for clarifying this. - -Tue Sep 8 21:45:32 1998 Nanbor Wang - - * *.{dsp,dsw}: Updated for VC 6. - -Tue Sep 8 21:31:32 1998 Carlos O'Ryan - - * ace/config-irix6.x-sgic++-nothreads.h: - Added ACE_HAS_DIRENT and support for the envinfo tool. - -Tue Sep 08 18:54:28 1998 Steve Huston - - * ace/OS.h: Removed definitions of PTHREAD_DETACHED, PTHREAD_FLOAT, - PTHREAD_INHERIT_SCHED from the ACE_HAS_PTHREADS_DRAFT6 section of - mapping draft 6 names into the pthreads standard names. The first - two aren't used anywhere and the third is already defined on the - known draft 6 platforms. Thanks to Chuck Gehr and Arturo Montes for - helping to straighten this out. - -Tue Sep 8 15:10:42 1998 Carlos O'Ryan - - * tests/Makefile: - Updated dependencies. - -Tue Sep 8 13:16:37 1998 Douglas C. Schmidt - - * ace/config-sco-5.0.0.h: Added ACE_HAS_GPERF at the bequest - of Arturo. - -Tue Sep 08 10:25:48 1998 Nanbor Wang - - * ace_{dll,lib}.dsp: Changed the process type to "Blend*" which - make the project to work on any type of intel processors. - However, this disable the bug-fix to get around the infamous - Pentium floating point problem. - - * netsvcs/lib/netsvcs.dsp: - * netsvcs/servers/servers.dsp: Perform VC 6 modification. - -Tue Sep 08 07:28:05 1998 David L. Levine - - * ace/OS.i (readdir_r): don't use the POSIX.1c ::readdir_r on - suns without _POSIX_PTHREAD_SEMANTICS. - - * include/makeinclude/wrapper_macros.GNU: added - ACE_HAS_GNUG_PRE_2_8 macro. Use it for determining - exceptions-related flags with g++. It can also be used to - suppress builds with old (pre-2.8) versions of g++; see - TAO/tests/POA/TIE/Makefile for an example. - - * apps/Gateway/Gateway/File_Parser.cpp (getint): - egcs 1.1b can't handle the FP_RETURN_TYPE typedef. So, - use FP::Return_Type with __GNUG__. - - * ace/config-chorus.h: added ACE_HAS_DIRENT and - ACE_LACKS_READDIR_R. - - * ace/config-lynxos.h: don't use ACE_HAS_STRING_CLASS with - LynxOS >= 3.0.0. It requires that libg++ be linked in - to the IOStream tests. - - * docs/ACE-guidelines.html: notify via email if a particular - individual's attention is needed to address a comment in the code. - - * ace/Basic_Types.h: corrected comment: the dump method - is named output, because it takes an argument. - -Mon Sep 7 22:12:02 1998 Nanbor Wang - - * ace/config-freebsd.h: Added ACE_HAS_SIGINFO_T, - ACE_LACKS_SIGINFO_H, ACE_LACKS_UCONTEXT_H, ACE_LACKS_SI_ADDR and - ACE_HAS_DIRENT. - - * ace/config-freebsd-pthread.h: - * ace/config-linux-common.h: Added ACE_HAS_DIRENT. - -Mon Sep 7 12:39:10 EDT 1998 James CE Johnson - - docs/tutorials/008/page01.html - docs/tutorials/008/page02.html - docs/tutorials/008/page03.html - docs/tutorials/008/page04.html - docs/tutorials/008/page05.html - docs/tutorials/009/Makefile - docs/tutorials/009/broadcast_client.cpp - docs/tutorials/009/directed_client.cpp - docs/tutorials/009/page01.html - docs/tutorials/009/page02.html - docs/tutorials/009/page03.html - docs/tutorials/009/page04.html - docs/tutorials/009/page05.html - docs/tutorials/009/server.cpp - - Cleanup on Tutorial 008 and creation of Tutorial 009 which expands - 008 by making the server more selective in who it responds to. - -Mon Sep 7 10:06:54 1998 Douglas C. Schmidt - - * ace/ACE.h (ACE): Moved strnew (wchar_t *) into an ACE_WIN32 - section to protect it properly. Thanks to David Levine for - reporting this. - - * ace:config-sco-*.h: Added ACE_HAS_DIRENT on the advice of Arturo - Montes . - -Mon Sep 07 09:52:12 1998 David L. Levine - - * docs/ACE-guidelines.html: added general rule to put system - call wrappers in ACE_OS, extensions in ACE. - - * ace/config-osf1-4.0.h: added ACE_HAS_DIRENT and - _POSIX_PTHREAD_SEMANTICS. The latter was necessary - to tell ACE_OS::readdir_r () to use the three-arg - ::readdir_r (). - - * ace/config-lynxos.h: added ACE_HAS_DIRENT. - - * ace/Log_Msg.cpp (log): initialized local "c" to '\0' so that - egcs 1.1b won't complain that it might be used without - initialization. - - * ace/OS.i,ace/config-osf1-4.0.h (readdir_r): use - ACE_HAS_PTHREADS_STD instead of _POSIX_PTHREAD_SEMANTICS to - select the three-arg ::readdir_r (). - - * ace/config-vxworks.h: added ACE_HAS_DIRENT. - - * ace/OS.i,config-vxworks5.x.h (readdir_r,rewinddir,seekdir,telldir), - README: - added support for ACE_LACKS_READDIR_R, ACE_LACKS_SEEKDIR, and - ACE_LACKS_TELLDIR. - - * ace/OS.i (opendir): added const_cast to remove constness - from the argument, because VxWorks' header doesn't declare - it const. This shouldn't cause a problem on other platforms. - -Mon Sep 7 01:02:58 1998 Darrell Brunsch - - * ace/ACE.i: Changed ACE_INLINE to ASYS_INLINE. - - * ace/OS.h: Added a no-op type define for DIR and struct - dirent so compilation can continue on NT. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Added new dirent.* files and removed Array.{cpp,i} files. - -Sun Sep 6 15:49:46 1998 Douglas C. Schmidt - - * ace/ACE: Added several new helper string functions, which were - mined from the drwho program. - - * ace/OS: Moved strnew() into class ACE, which is where it - belongs... - - * ace/Containers: Merged the ACE_Array class entirely into the - Containers files, which is more consistent with the general - design of ACE. Also, removed ace/Array.i and Array.cpp since - they are no longer needed. We'll keep Array.h around for a - while for backwards compatibility, but it just #includes - "ace/Containers.h" now... - - * ace/config-sunos5*.h: Added ACE_HAS_DIRENT. We'll need help - figuring this out on the other platforms... - - * ace/OS: Began adding "Dirent" support to ACE_OS. This will - provide the UNIX/POSIX directory iterator routines when the - ACE_HAS_DIRENT macro is enabled. - - * ace/OS: Added fputs() to ACE_OS. I'm not sure why this was - missing... - - * ace/Makefile (FILES): Moved Priority_Reactor to earlier in - the Makefile to maintain alphabetical order. - -Sun Sep 6 14:06:43 1998 Douglas C. Schmidt - - * ace/OS.h: Moved the ACE_NEW_THROW macros that Matt Braun wrote - into ACE so that we can use these in all applications. - -Sun Sep 06 12:28:40 1998 Fred Kuhns - - * Added a simple reactor/acceptor figure to the first tutorial - docs/tutorial/001/simple.* - -Sun Sep 06 08:34:57 1998 David L. Levine - - * ace/config-g++-common.h,ace/README,tests/Conn_Test.cpp: - renamed ACE_HAS_OLD_GNUG to ACE_HAS_GNUG_PRE_2_8. - -Sat Sep 5 15:31:33 1998 Douglas C. Schmidt - - * ace: Removed ACE_HAS_IRIX_GETTIMEOFDAY and all of its uses - throughout ACE. It was no longer necessary. Thanks to Ossama - for reporting this. - - * ace/Synch.h: Added a "no-op" ACE_Barrier for cases where we - don't have ACE_HAS_THREADS enabled. - -Sat Sep 5 15:25:33 EDT 1998 James CE Johnson - - docs/tutorials/index.html - docs/tutorials/008/Makefile - docs/tutorials/008/server.cpp - docs/tutorials/008/broadcast_client.cpp - docs/tutorials/008/directed_client.cpp - docs/tutorials/008/page01.html - docs/tutorials/008/page02.html - docs/tutorials/008/page03.html - docs/tutorials/008/page04.html - docs/tutorials/008/page05.html - docs/tutorials/008/CVS/Root - docs/tutorials/008/CVS/Repository - docs/tutorials/008/CVS/Entries - docs/tutorials/009/Makefile - docs/tutorials/009/broadcast_client.cpp - docs/tutorials/009/directed_client.cpp - docs/tutorials/009/server.cpp - docs/tutorials/009/CVS/Root - docs/tutorials/009/CVS/Repository - docs/tutorials/009/CVS/Entries - - Began the next set of tutorials on the topic of Datagrams. - Thanks to Jeff Hellzen for this suggestion. - -Fri Sep 4 18:56:36 1998 Carlos O'Ryan - - * ace/Name_Proxy.cpp: - Fixed spurious double assignment (int foo = foo = bar;), thanks - to thanks to John Mulhern <9107@mn3.lawson.lawson.com> for - reporting this. - -Fri Sep 04 18:54:32 1998 Irfan Pyarali - - * ace/Select_Reactor_T.cpp (ACE_Select_Reactor_T): Made sure that - all references to Select_Reactor have the template argument in - them. Thanks to Chuck Gehr for - sending the patches. - -Fri Sep 4 18:29:29 1998 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_proactor.cpp: Changed to use - "test_proactor.cpp" as input file. - -Fri Sep 4 17:51:17 1998 Alexander Babu Arulanthu - - * ace/Proactor.cpp: - * ace/Asynch_Acceptor.cpp: - * ace/Asynch_Acceptor.h: - * ace/Asynch_IO.cpp: - * examples/Reactor/Proactor/test_proactor.cpp: - First round of changes for ACE_Asynch_Accept. Makes use of - separate thread for each accept call, each thread blocking on the - ACE_OS::accept. Thanks to Irfan, a better implementation using - TP_Reactor is currently being done. - -Fri Sep 4 16:45:36 1998 Douglas C. Schmidt - - * ace: Removed all traces of ACE_HAS_MT_SAFE_SOCKETS -- this was a - vestige from Solaris 2.2! Thanks to Ossama Othman - for suggesting this. - - * ace/Service_Config: Changed the default value of - ACE_Service_Config::debug_ from 1 to 0. Thus, debugging is - DISABLED by default. If you want to enable debugging, pass the - -d option to the constructor of ACE_Service_Config. - - * ace/Naming_Context.cpp, - ace/Service_Config.cpp, - ace/Service_Types.cpp, - ace/Service_Repository.cpp: Now we only print out service config - information if we're ACE::debug() is non-0. This is more - consistent with other parts of ACE. Thanks to XuYifeng - for reporting this. - - * ace/Service_Config: Moved the debug() stuff from here and put it - into class ACE so that it will be more globally visible. - -Fri Sep 04 15:24:44 1998 Nanbor Wang - - * ace/ACE.i: Here, we should use ASYS_INLINE which is always - defined as inline on most platforms. - - * ace/Log_Msg.h (ACE_Log_Msg): Added a new ACE_DEBUG format - character 'A' which prints out an ACE_timer_t value. This is - most useful when you want to print out the timers in - ACE_Profile_Timer::ACE_Elapse_Time. Thanks to Naga for - providing the brilliant idea. - - * tests/XtReactor_Test.cpp (main): Removed '.cpp' from - ACE_START_TEST title string. Thanks to Ossama for reporting - this. - - * Makefile (CONTROLLED_FILES): Removed some documents from the - list because they are in docs/ now. - - * tests/run_tests.bat: Removed trailing '.cpp' from - Message_Queue_Notifications_Test. Thanks to Jack Erickson - for reporting this. - - * ace/OS.i (signal): Added check for ACE_WIN32 to defeat the - effect of !defined (ACE_LACKS_UNIX_SIGNALS). Although Win32 - does has ACE_LACKS_UNIX_SIGNALS defined, it also has limited - support for signals. Thanks to XuYifeng - for reporting this. - -Fri Sep 04 07:26:57 1998 David L. Levine - - * include/makeinclude/rules.bin.GNU,wrapper_macros.GNU: - moved VBIN definition from rules.bin.GNU to wrapper_macros.GNU. - With this change, individual Makefiles need not define VBIN. - - * tests/run_tests.sh: removed -f so that temp file removal - works properly. Don't printout ipcs output unless it - changes, for resources owned by the user. - -Fri Sep 04 01:01:58 1998 Irfan Pyarali - - * ace/Timeprobe.h: Disable warning of using Microsoft Extensions. - -Fri Sep 04 02:12:03 1998 Douglas C. Schmidt - - * ACE version 4.5.37 released. - -Fri Sep 4 00:07:18 1998 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp (open): Added - template instantiations to make GCC happy. Thanks to David - Levine for reporting this. - -Thu Sep 03 19:15:52 1998 Fred Kuhns - - * docs/tutorial/006/client_acceptor.cpp: added - typedef ACE_Svc_Handler inherited; - -Thu Sep 03 17:03:46 1998 Irfan Pyarali - - * ace/Dynamic.cpp (instance): Removed the typedef in the header - file because some compiler was having problems with it. Thanks - to baksoo@dbserver.kaist.ac.kr for reporting this. - -Thu Sep 03 16:43:34 1998 David L. Levine - - * ace/OS.cpp (thr_create): play the zero thread priority game - on Solaris if defined (sun), not if defined (ACE_HAS_STHREADS). - This allows POSIX threads to be created with a thread priority - of 0 if _POSIX_C_SOURCE=199506L and _POSIX_PTHREAD_SEMANTICS - are defined. Thanks to Russ Noseworthy - for reporting this problem. - - * examples/Threads/tss2.cpp: added explicit ACE_Guard - instantiation. - - * tests/Dynamic_Priority_Test.cpp (main): changed "not supported" - to "not available" in printout that indicates that the - test will be run in time-sharing class, instead of - a real-time class. The test can still run in time-sharing - class. Thanks to Ossama for reporting this. - -Thu Sep 03 16:14:16 1998 Nanbor Wang - - * ace/Synch.i (ACE_Process_Mutex::remove): Reset this->lock_ to 0 - after removing the lock so we can avoid destroying the same - kernel object twice. Thanks to Detlef Becker - for reporting this. - -Thu Sep 03 15:43:22 1998 Irfan Pyarali - - * tests/Upgradable_RW_Test.cpp: Fixed this file so that it works - with egcs. - -Thu Sep 3 14:51:06 1998 Douglas C. Schmidt - - * docs: Moved ACE-{tutorials,guidelines,subsets,porting}.html - into the docs directory from the etc directory. This is - a more "fitting" location... - -Thu Sep 3 13:23:39 1998 Nanbor Wang - - * Makefile (CONTROLLED_FILES): Added docs/ into CONTROLLED_FILES. - -Thu Sep 03 09:24:20 1998 David L. Levine - - * ace/Message_Block.cpp: added ACE_Guard instantiation. - - * ace/SPIPE_Stream.i (recv_handle): replaced "recvfd = recvfd" with - ACE_UNUSED_ARG (recvfd) to avoid egcs 1.1 warning about a - statement with no effect. - -Thu Sep 03 00:26:23 1998 Nanbor Wang - - * ace/Time_Request_Reply.cpp (ACE_Time_Request): The second - parameter should be of type ACE_UINT32. - -Wed Sep 2 22:52:32 1998 Douglas C. Schmidt - - * netsvcs/lib/Name_Handler.cpp, - * ace/Time_Request_Reply.cpp: Fixed up yet another - minor mismatch caused by the ACE_SUCCESS/ACE_FAILURE fixes... - Thanks to David Levine for tracking these down. - -Wed Sep 02 20:55:18 1998 Douglas C. Schmidt - - * ACE version 4.5.36 released. - -Wed Sep 2 19:21:25 1998 Douglas C. Schmidt - - * ace/Name_Request_Reply.cpp: Continued to cleanup the residue of - the ACE_SUCCESS and ACE_FAILURE changes. Thanks to David Levine - for reporting this. - -Wed Sep 02 19:08:29 1998 David L. Levine - - * ace/Template_Instatiations.cpp: commented text following - an #endif. - -Wed Sep 02 16:46:45 1998 Douglas C. Schmidt - - * ACE version 4.5.35 released. BTW, these releases were aborted - due to CVS hiccups. We've got to figure out a better way to - roll this stuff back... - -Wed Sep 02 16:33:25 1998 Douglas C. Schmidt - - * ACE version 4.5.34 released. - -Wed Sep 02 16:31:22 1998 Nanbor Wang - - * ace/OS.h: Make sure ACE_NO_INLINE is not defined before defining - it to avoid double defining the macro. Thanks to Ossama Othman - for suggesting this. - -Wed Sep 2 11:10:08 1998 Douglas C. Schmidt - - * ace/Task.cpp (activate): Remmber to decrement the thr_count_ if - spawn_n() fails. Thanks to Russ Noseworthy - for reporting this fix. - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: Fixed another - void * -> char * problem. Now this stuff all seems to build - fine. - -Wed Sep 02 10:07:15 1998 David L. Levine - - * ace/Name_Request_Reply.{h,cpp}: reverted ACE_SUCCESS to SUCCESS - because other ACE code depended on it. - - * ace/Object_Manager.cpp (~ACE_Object_Manager_Base): moved - internal_lock_ deletion inside ACE_MT_SAFE protection. Thanks - to Dongwook Kim for reporting this. - - * include/makeinclude/platform_sunos5_sunc++.GNU: updated comments - to recommend not using Sun C++ 4.1. - -Wed Sep 02 09:34:32 1998 Oliver M. Kellogg - - * ace/OS.i (sigwait): use __sigwaitd10 with g++ on DU 4.0. - -Tue Sep 1 20:44:15 PDT 1998 James C. Hu - - * ace/Filecache.cpp: - * ace/UPIPE_Stream.cpp: I guess nobody uses GCC anymore. Fixed - some template instantiation problems in Filecache.cpp and - UPIPE_Stream.cpp. I guess, eventually all of this will be moved - into the Template_Instantiations.cpp file, but until then... - -Tue Sep 01 20:59:11 1998 David L. Levine - - * ace/OS.i (ts_object): commented test appearing after the #endif. - - * ace/OS.i (rw_trywrlock_upgrade): expanded/added comment to - clarify the with/without ACE_LACKS_RWLOCK_T distinction. - - * ace/OS.i (sigwait): fixed indentation. - - * ace/ACE.cpp (get_ip_interfaces): removed trailing } after comment - following #endif. - - * etc/ACE-guidelines.html: added section on scripts. Added rule - to prefix constants and enum values with ACE_ or TAO_. - -Tue Sep 1 19:05:05 1998 Douglas C. Schmidt - - * tests/XtReactor_Test.cpp: Added a new version that should work - on Linux. Thanks to Eric Newton for this fix. - -Tue Sep 1 19:40:03 1998 Carlos O'Ryan - - * tests/XtReactor_Test.cpp: - If ACE_LACKS_MOTIF is defined the test can use Athena - Widgets. Thanks to Eric C. Newton for - contributing this example. - -Tue Sep 1 19:05:05 1998 Douglas C. Schmidt - - * examples/Shared_Malloc/test_malloc.cpp (spawn): Fixed a minor - problem with conversions from const char * literals to char *'s. - Thanks to John Mulhern for reporting this problem. - - * examples/IPC_SAP/SOCK_SAP/CPP-in{server,client}.cpp: Fixed all - uses of void *request with char *request to stop ANSI C++ - compilers from complaining. Thanks to John Mulhern for - reporting this problem. - -Tue Sep 01 16:22:06 1998 Irfan Pyarali - - * ace/Filecache.cpp (init and ~ACE_Filecache_Object): Changed - SUCCESS to ACE_SUCCESS. - -Tue Sep 1 13:54:10 PDT 1998 James C. Hu - - * ace/Message_Block.h: - * ace/Message_Block.i: Added a space () method that reports - the amount of space remaining in the message block. - -Tue Sep 1 3:50:39 US/Central 1998 James CE Johnson - - * etc/tutorials/006/client_handler.cpp - etc/tutorials/006/client_handler.h - etc/tutorials/006/page04.html - etc/tutorials/006/page05.html - - Added a close() method to Client_Handler so that it will be closed - properly when the svc() method exits. - - * etc/tutorials/007/client_handler.cpp - etc/tutorials/007/client_handler.h - etc/tutorials/007/page05.html - etc/tutorials/007/page06.html - etc/tutorials/007/page09.html - - Added Client_Handler::close() that will be called when - Client_Handler::svc() exits in the thread-per-connection model. - Thread_Pool::svc() now calls the handler's handle_close() method - to properly shut down the handler if handle_input() fails. - -Tue Sep 01 12:58:02 1998 Chris Gill - - * ace/ACE.cpp - ace/Basic_Types.cp - ace/Containers.{cpp, h} - ace/Filecache.{cpp, h} - ace/Hash_Map_Manager.{cpp, h} - ace/INET_Addr.cpp - ace/Local_Tokens.cpp - ace/Log_Record.cpp - ace/Map_Manager.{cpp, h} - ace/Message_Block.cpp - ace/Name_Request_Reply.{cpp, h} - ace/OS.{cpp, h, i} - ace/Object_Manager.h - ace/Process.cpp - ace/Remote_Name_Space.cpp - ace/SOCK_Dgram_Mcast.{cpp, h} - ace/Service_Types.cpp - ace/Signal.cpp - ace/Synch_T.{cpp, h, i} - ace/Time_Hash.cpp - ace/Token_Request_Reply.h - ace/UPIPE_Stream.cpp - ace/config-psos-diab.h - ace/config-psos-tm.h: - - pSOS port of ACE for the Diab 4.2 and Trimedia cross compilers. - Thanks to Jin Lu of Philips Research for completing the ACE pSOS - port on the Trimedia cross compiler and contributing the changes - back to the ACE distribution. - -Tue Sep 1 10:43:24 1998 Douglas C. Schmidt - - * ace/config-linux-common.h, - ace/config-sco-5.0.0-mit-pthread.h, - ace/config-sco-5.0.0.h, - ace/README: - ACE_HAS_LONG_FDMASK macro has been changed to - ACE_HAS_BIG_FD_SET. Therefore, I updated these files. Thanks - to Ossama Othman for reporting - this. - -Tue Sep 01 10:21:49 1998 David L. Levine - - * tests/TSS_Test.cpp (cleanup, worker): with ACE_HAS_PTHREADS_DRAFT4, - delete the tss instances in cleanup instead of worker. This gets - rid of the memory leaks on those platforms. - - * include/makeinclude/platform_osf1_4.0.GNU: added - -hidden [...] -non_hidden magic. See comments in the file; - this solves a problem with mutiply defined symbols between - shared libraries and DEC's libcxxstd.a. It only affected - tests/IO_Stream_Test. - -Tue Sep 01 10:03:55 1998 Douglas C. Schmidt - - * ACE version 4.5.33 released. - -Tue Sep 01 03:46:21 1998 Steve Huston - - * ace/Asynch_Acceptor.{h cpp}: Enable the contents for platforms - with ACE_HAS_AIO_CALLS, not just ACE_WIN32. Thanks to John - Mulhern for these fixes. - - * examples/Reactor/Proactor/Makefile: Removed include of - platform_macros.GNU. Thanks to John Mulhern for this one too. - -Mon Aug 31 16:38:03 1998 Douglas C. Schmidt - - * ace/config-kcc-common.h: Added ACE_HAS_CPLUSPLUS_HEADERS to - prevent warnings/errors. Thanks to Ben Eng and - Todd Pack for reporting this. - - * Added a bunch of patches so that ACE compiles and passes its - tests on Chorus with gcc. Thanks to Alberto Villarica" - for reporting this. - -Mon Aug 31 14:02:34 1998 Darrell Brunsch - - * ace/ace.dsw: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Updated to MSVC 6, which consisted of changing the - version number insde to 6.00. This change gets it - to work in both 5 and 6, without any trouble. - -Mon Aug 31 12:25:15 1998 David L. Levine - - * ace/Object_Manager.*: reorganized to provide the - ACE_Object_Manager_Base class. This class contains - the data structures used to support Singleton - registration for destruction. - - * ace/ACE.{h,cpp}: added init () and fini (). These - currently just call the ACE_Object_Manager's init () - and fini (). The might be useful for applications - that use ACE_HAS_NONSTATIC_OBJECT_MANAGER and - ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER, and - therefore need to explicitly initialize and finalize - the ACE_Object_Manager singleton. - - * tests/Semaphore_Test.cpp (test_timeout): a timed - semaphore acquire fails on ACE_HAS_PTHREADS_DRAFT4 - with EINTR instead of ETIME if it times out. That's - the way it's documented, as well as the way it behaves on LynxOS. - - * tests/TSS_Test.cpp (cleanup): with DRAFT4 threads, - don't do anything in the cleanup function. - The intended use of this function doesn't apply. - With Draft 4 threads, this function is called implicitly - by pthread_setspecific whenever an old value is replaced. - This function is intended to be used with Draft 6 and later - threads, where it is called on thread termination with the - thread-specific value. - - * tests/test_config.cpp: set ACE_MAX_PROCESSES to 4 on LynxOS, - so that Process_Mutex_Test will succeed. - -Sun Aug 30 23:05:34 1998 Nanbor Wang - - * ace/Select_Reactor_T.cpp: Should include ace/Thread.h also. - Thanks to J. Russell Noseworthy - for reporting this. - - * ace/Select_Reactor.cpp: Added explicit template instantiation - for ACE_Lock_Adapter>. - Thanks to Eric C. Newton for reporting this. - -Sun Aug 30 07:44:54 1998 David L. Levine - - * ace/config-sunos5.5.h,ace/README, - include/makeinclude/platform_sunos5_sunc++.GNU: - use ACE_LACKS_RTTI instead of ACE_HAS_RTTI without rtti, - with Sun CC on SunOS 5.5. That removes all use of ACE_HAS_RTTI - from ACE. - - * netsvcs/lib/Name_Handler.h: added #include of ace/Singleton.h. - - * tests/run_tests.vxworks: commented out Dynamic_Priority_Test. - It now causes VxWorks to go to never-never land. - - * ace/config-g++-common.h,ace/README,tests/Conn_Test.cpp: - added ACE_HAS_OLD_GNUG. Thanks to Doug for this suggestion. - - * ace/Token.cpp (ACE_Token_Queue_Entry ctor): added - ACE_UNUSED_ARG (m) ifdef ACE_TOKEN_USES_SEMAPHORE. - -Sun Aug 30 00:14:29 1998 Irfan Pyarali - - * ace/Service_Object.cpp (fini): Make sure to check the - flag before proceeding. Also - ~ACE_Service_Type() now calls this->fini(). - - * ace/Svc_Handler: - * ace/Dynamic: - - Patrick J. McNerthney described this problem: - ________________________________________ - - ACE_Svc_Handler creates an - ACE_TSS_Singleton singleton - object to determine if the ACE_Svc_Handler is a dynamically - created object or not. ACE_TSS_Singleton declares the internal - single instance of the ACE_Dynamic object as a - ACE_TSS data type. - - The first time this object is "referenced", - ACE_TSS::ts_init() is called, which in turn calls - ACE_Thread::keycreate and registers - ACE_TSS::cleanup with it. Since ACE_TSS is a - template class, the vtable and the code of this object resides - in the dynamically loaded service DLL. - - During termination, the Object Manager closes down the Service - Configurator, causing all services to be shutdown, and their - DLLs are unloaded. - - The Object Manager then calls ACE_OS::cleanup_tss which attempts - to call the above registered ACE_TSS::cleanup - method. Since the DLL has already been unloaded, the - application faults trying to access the vtable. - ________________________________________ - - My earlier solution addressed this problem but only in - ~Object_Manager(), i.e., at the end of the application, by - carefully ordering the cleanup of singletons, tss, and the - unlinking of libraries. To solve this more generically and to - address this problem when DLLs are unlinked arbitrarily (and not - only at the end of applications), I moved the typedef of - ACE_TSS_Singleton from Svc_Handler.h to - Dynamic.h. Then the access to this singleton was changed from - DYNAMIC::instance() to ACE_Dynamic::instance(). - - This will force the generation of the code for this class to be - in the ACE library rather than in a user's DLL. Hence when TSS - cleanup hooks and Object Manager are trying to clean this object - up from ~Object_Manager, it won't crash as the code for this - class is in ACE and not in the unlinked DLL. - - This issue raised a couple of interesting observations about - ACE_Singleton and ACE_TSS_Singleton and DLLs: - - It is ok to use ACE_Singleton and ACE_TSS_Singleton in DLLs that - are going to be unlinked at the end of the program. For DLLs - that may get unlinked *before* the end of the program, they must - not use ACE_Singleton or ACE_TSS_Singleton. ACE_Singleton - registers with the Object_Manager for deletion and therefore is - accessed at the end of the application. ACE_TSS_Singleton is - very similar to ACE_Singleton. Moreover, it uses tss cleanup - hooks to clean up the thread specific storage. Therefore, if - the DLL lives shorter than the thread and/or the application, it - must *not* use ACE_Singleton and ACE_TSS_Singleton. - - This motivates the need for ACE_DLL_Singleton. As usual, - contributions to ACE are always welcome ;-) Many, many thanks to - Patrick J. McNerthney for all his help! - -Sat Aug 29 19:22:22 1998 Douglas C. Schmidt - - * examples/Service_Configurator/Misc/main.cpp (main): Fixed a stray - l_argv[3] = 0; I'm not sure why this was here... - -Sat Aug 29 17:31:06 1998 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP/CPP-in{client,server,server-fancy}.cpp: - Updated these tests to be more robust and better designed. - - * examples/IPC_SAP/SOCK_SAP/Makefile: Added the - CPP-inserver-fancy.cpp file. I'm not sure why I'd omitted it - for so long... - - * examples/IPC_SAP/SOCK_SAP/CPP-in{client,server}.cpp: Cleaned up - the code a bit to avoid warnings. Thanks to David Levine for - reporting these. - -Sat Aug 29 14:11:25 1998 David L. Levine - - * etc/ACE-guidelines.html: added rule to not for a pointer - being 0 before deleting it. It's always safe to delete a - 0 pointer. Thanks to James CE Johnson for - pointing this out. - -Fri Aug 28 23:29:51 1998 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP/CPP-in{client,server}.cpp: Enhanced - the client and server test so that it'll be a good benchmark for - the "best case" to compare TAO against. - -Fri Aug 28 21:53:13 1998 Steve Huston - - * ace/OS.h: Conditionalize setting of ACE_INFINITE on non-Win32 - to allow the platform config to define a value. - - * ace/config-hpux11.h: Define ACE_INFINITE as 10000000. This value - was empirically determined by John Mulhern. Until we know why - this had to be done, you may need to set a different value in - your own config.h file. - -Fri Aug 28 13:14:34 1998 Nanbor Wang - - * examples/Service_Configurator/Misc/main.cpp: Made the file CE - friendly. Added "-y" to service configurator so we can still - test static services. - -Fri Aug 28 13:45:28 1998 David L. Levine - - * include/makeinclude/platform_lynxos.GNU: added HOST_OS - support for PowerPC target. It has a slightly different - name (sunos-xcoff-ppc) than for x86 target (sunos-coff-x86). - - * ace/config-lynxos.h: there doesn't seem to be an - alloca () for PowerPC target. So, only enable - ACE_HAS_ALLOCA and ACE_HAS_ALLOCA_H ifdef __x86__. - -Fri Aug 28 12:30:57 1998 Carlos O'Ryan - - * bin/create_ace_build: - Now it will cleanup dead links on the build directory. - -Fri Aug 28 09:45:53 1998 Douglas C. Schmidt - - * ace/Synch: Fixed the constructor of ACE_Null_Condition so that - it's consistent with ACE_Condition_Thread_Mutex. Thanks to - Mats Nilsson for reporting this. - -Fri Aug 28 08:33:20 1998 Alexander Babu Arulanthu - - * ace/OS.h (FILE_FLAG_SEQUENTIAL_SCAN): Given null definitions for - FILE_FLAG_SEQUENTIAL_SCAN for Non Win32 platforms. - -Thu Aug 27 19:40:32 1998 Steve Huston - - * ace/OS.i: Changed an erroneous ACE_HAS_PTHREAD_DRAFT6 to - ACE_HAS_PTHREADS_DRAFT6. Thanks to Chuck Gehr for catching this. - -Thu Aug 27 15:47:34 1998 Irfan Pyarali - - * ace/Proactor.cpp (handle_signal): Fixed code for looping around - handle_events(). Thanks to Marc Penner - for pointing out the problem. - - * ace/OS.cpp (ACE_Countdown_Time::stop): Removed the setting of - errno to ETIME when we have used all of timeout. This was - necessary since this errno was interfering with errno being set - by other parts of ACE. - -Thu Aug 27 13:45:31 1998 Nanbor Wang - - * ace/OS.h: Added /**/ between "#include" and - "". Otherwise, MSVC spits out warnings, tons of - them. - - * ace/Profile_Timer.h (ACE_Profile_Timer): Remove the Win32 - section. Win32 (except CE) actually uses the code in - ACE_HAS_GETRUSAGE. - -Thu Aug 27 13:12:04 1998 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_proactor.cpp : - test_proactor_with_aio.cpp is removed. - test_proactor.cpp should do well on Win as well as other - POSIX4 compliant platforms (with some known bugs in Solaris2.6). - -Thu Aug 27 11:35:11 1998 David L. Levine - - * etc/ACE-guidelines.html: added rule to declare a loop index - before the loop, if it's used after the loop. - - * ace/OS.h,README: added ACE_LACKS_RTTI support, for use with - ACE_HAS_ANSI_CASTS without dynamic_cast. - - * ace/config-sunos5.5.h (Sun CC only), config-osf1-4.0.h: - added conditional ACE_LACKS_RTTI. - - * include/makeinclude/platform_osf1_4.0.GNU: added rtti=0 - support. - - * ACE-INSTALL.html,include/makeinclude/wrapper_macros.GNU: - updated comments to reflect that rtti=0 is now supported on - OSF1-4.0. (It's not only supported on Sun CC/SunOS 5.) - - * tests/SOCK_Connector_Test.cpp (host_is_up): broke out - the code to test whether a host exists, is reachable, and - is up into host_is_up (). Consider the host up if the - blocking connection attempt succeeds, or down if it doesn't. - -Wed Aug 26 23:43:42 1998 Douglas C. Schmidt - - * ACE version 4.5.32 released. - -Wed Aug 26 19:11:07 1998 Carlos O'Ryan - - * bin/count_lines: - A nice Perl script to count lines of code. - -Wed Aug 26 17:35:43 1998 Douglas C. Schmidt - - * tests/Reactors_Test.cpp (close): Oops, the ACE_ASSERT() was - incorrect. It should be - - ACE_ASSERT (Test_Task::task_count_ >= 0); - - Thanks to David Levine for reporting this. - -Wed Aug 26 07:47:57 1998 Nanbor Wang - - * ace/Select_Reactor.h: Added template specialization for - ACE_Guard> to speed - thing up when using lock-freed Select_Reactor. - - * ace/Select_Reactor.cpp: Removed template instantiation for - ACE_Guard> because - it's been specialized in .h file. - -Wed Aug 26 08:51:23 1998 Steve Huston - - * ace/OS.cpp (thr_keycreate): On pthreads draft 6, the call is - pthread_key_create, not pthread_keycreate. Thanks to Arturo - Montes for this fix. - -Wed Aug 26 08:32:18 1998 David L. Levine - - * tests/Reactor_Performance_Test.cpp (create_reactor): - wrapped block in "if" statement with {} to prevent syntax - error. Yet another example of why we should always use - {} in "if" statements :-) - -Wed Aug 26 07:54:49 1998 J. Russell Noseworthy - - * ace/OS.{i,cpp} (rwlock_init): use native ::rwlock_init on Solaris, - even if ACE_HAS_STHREADS isn't defined. This avoids a nasty - bug on startup with only ACE_HAS_PTHREADS defined on Solaris. - The ACE_Object_Manager fails to initialize its first - preallocated object, and core dumps when trying to use - the ACE_Log_Msg lock, which hasn't been initialized yet. - -Tue Aug 25 21:26:29 1998 James CE Johnson - - * include/makeinclude/platform_linux_lxpthread.GNU: - added NO_IMPLICIT_TEMPLATES support. To disable - -fno-implicit-templates, set NO_IMPLICIT_TEMPLATES - to anything in either your environment or on the - make command line. - -Tue Aug 25 20:04:09 1998 Douglas C. Schmidt - - * ace/config-hpux11.h: Added ACE_HAS_AIO_CALLS. Thanks to John - Mulhern for verifying this. - - * etc: Began to add the ACE tutorials. Thanks to James CE Johnson - for contributing this stuff. - - * tests/Reactor*.cpp: Fixed all the Reactor tests so that they'd - abide by the appropriate design rules. Thanks to Hans Rohnert - for reporting this. - -Tue Aug 25 19:31:37 1998 David L. Levine - - * ace/Memory_Pool.i (~ACE_Lite_MMAP_Memory_Pool,~ACE_MMAP_Memory_Pool): - swapped to avoid use of ~ACE_MMAP_Memory_Pool before its linline - definition. - -Tue Aug 25 18:48:50 1998 Irfan Pyarali - - * ace/Service_Config.cpp (parse_args): Changed the default for - ACE_Service_Config::no_static_svcs_ to be 1. This means that by - default static services (ACE_Naming_Context and - ACE_Service_Manager) will *not* be loaded into the Service - Repository. The -n option remains the same for backward - compatibility, i.e., it sets ACE_Service_Config::no_static_svcs_ - to 1. -y is a new option that sets - ACE_Service_Config::no_static_svcs_ to 0. - - The motivation for this change was to minimize the ACE - footprint, i.e., only load them if the program requires it. - -Tue Aug 25 18:28:11 1998 Nanbor Wang - - * ace/OS.i (strdup): Changed ::strlen to ACE_OS::strlen so we can - get the actual length for UNICODE strings. Thanks to Dana - Hackman for reporting this. - - Also, the size of the allocated memory should be - (strlen(s)+1)*sizeof(wchar_t), not strlen(s)*sizeof(wchar_t)+1. - -Tue Aug 25 14:33:46 1998 Carlos O'Ryan - - * ace/XtReactor.cpp: - The lock type for the ACE_XtReactor was wrong. - -Tue Aug 25 13:36:10 1998 Alexander Babu Arulanthu - - * tests/Aio_Platform_Test.cpp (do_sysconf): Fixed the VxWorks - warnings. - -Tue Aug 25 13:04:00 1998 Irfan Pyarali - - * ace/Memory_Pool: Added virtual destructors. - -Tue Aug 25 10:38:52 1998 Carlos O'Ryan - - * bin/auto_compile: - Added orbsvcs/test/Property/run_test.pl. - The Simple test was moved to Simple/time. - -Tue Aug 25 10:45:50 1998 Alexander Babu Arulanthu - - * tests/Aio_Platform_Test.cpp: Fixed the SunCC errors about - missing function prototypes. Also put the various - routines under "#if defined " - statements. - -Tue Aug 25 07:42:40 1998 David L. Levine - - * ace/Memory_Pool.cpp: changed ACE_Auto_Basic_Array_Ptr - template instantiation to ACE_Auto_Basic_Array_Ptr. - - * examples/IPC_SAP/UPIPE_SAP/ex3.cpp (consumer): changed - ACE_Auto_Basic_Ptr to ACE_Auto_Basic_Array_Ptr . - - * tests/Reactor_Performance_Test.cpp, - examples/IPC_SAP/UPIPE_SAP/ex{2,3}.cpp: - removed explicit ACE_Auto_Basic_Array_Ptr instantiation - because it's now in libACE. - - * include/makeinclude/wrapper_macros.GNU: added BUILD - definition when building static libs only. This was necessary - to allow the TAO/orbsvcs/tests/Simulator/{EventSup,DOVEMIB} - makes to work properly on both Solaris and VxWorks. - It also means that BUILD is no longer necessary in most Makefiles. - - * tests/Message_Queue_Notification_Test.cpp (main): removed - trailing ".cpp" from log file name. - - * ace/config-sunx86-sunc++-4.x.h: removed because it wasn't being - maintained, because config-sunos5.{5,6}.h are supported on Solaris86. - - * include/makeinclude/wrapper_macros.GNU: fixed determination - of whether the g++ version supports exception handling. Assume - that it doesn't on VxWorks. Thanks to Margherita Vittone Wiersma - for reporting this. - - * include/makeinclude/platform_vxworks5.x_g++.GNU: use := instead - of += to set PATH, because += seems to insert a space. - -Tue Aug 25 05:23:11 1998 Nanbor Wang - - * tests/Message_Queue_Notifications_Test.dsp: Fixed something.... - - * tests/tests.dsw: Fixed a typo. - - * ace/ace_{dll,lib}.dsp: - * ace/Makefile: Added Select_Reactor_T and Select_Reactor_Base. - Rebuilt file dependencies. - - * ace/Select_Reactor[_Base,_T].{h,i,cpp}: Templatized - ACE_Select_Reactor and gangs. The original Select_Reactor files - are splited into three sets of files. Select_Reactor_Base - defines common components used by Select_Reactor and defines - Select_Reactor_Base class. Select_Reactor_T defines the - template classes. Select_Reactor instantiates necessary - template classes. Next step is to add template specialization - for ACE_Guard< ACE_Select_Reactor_Token_T >. - - * ace/Synch.{h,i}: Added a new class ACE_Noop_Token which is a - subclass of ACE_Null_Mutex. It supports a null renew method. - This class should be called ACE_Null_Token but the name is - already used. - -Tue Aug 25 01:38:40 1998 Douglas C. Schmidt - - * examples/Threads/task_three.cpp (main): Fixed this example so - that it works portably with signals. Thanks to Susan Liebeskind - for reporting this. - - * tests/Aio_Platform_Test.cpp: Removed the forward decls - so that don't conflict with the use of "static" later on. - Thanks to David Levine for reporting this. - -Mon Aug 24 22:23:33 1998 David L. Levine - - * examples/IPC_SAP/UPIPE_SAP/ex{2,3}.cpp: removed unnecessary - includes of fstream.h. - -Mon Aug 24 18:11:39 1998 Irfan Pyarali - - * ace/Memory_Pool.cpp (ACE_Local_Memory_Pool::release): This - memory pool uses "new" to create memory chunks for the Malloc - class. However, since it did not keep track of this memory, - these chunks were leaked. - - The solution was to keep tarck of the chunks allocated and - delete them in release(). - - * ace/Object_Manager.cpp (~ACE_Object_Manager): Moved TSS cleanup - *before* Service_Config::close(). We need this to happen since - DLL related TSS objects need to get cleaned up *before* the DLL - is unlinked. The only downside to this order of things is that - Log_Msg will also get cleaned up by TSS cleanup, and we need to - make sure that we do not access Log_Msg after TSS cleanup. - - For this to work, we need to make sure of two things: user code - is not called and ACE does not use Log_Msg after this after TSS - resources have been cleaned up. The only major code that is - called is Service_Config::close(). Since - Service_Config::fini_svcs() has already been called, - Service_Config::close() only unlinks the DLLs and does not call - into user code. - - * ace/Service_Repository.cpp (close): Don't access Log_Msg since - it has already been deleted by the time this code runs. - - * ace/Service_Config.cpp (close): Don't access Log_Msg since it - has already been deleted by the time this code runs. - -Mon Aug 24 18:13:58 1998 Douglas C. Schmidt - - * tests/Aio_Platform_Test.cpp: Fixed a few problems due - to the fact that we weren't carefully guarding against platforms - that don't support AIO macros. Thanks to Dana Hackman - for reporting this. - -Mon Aug 24 15:18:46 1998 David L. Levine - - * tests/run_tests.sh: run Message_Queue_Notifications_Test - instead of Message_Queue_Notifications_Test.cpp. - -Mon Aug 24 13:05:03 1998 Douglas C. Schmidt - - * ace/config-{chorus,WinCE,vxworks5.x}.h: Added - ACE_HAS_STRDUP_EMULATION. Thanks to Chuck Gehr for this - suggestion. - - * ace/OS.i (strdup): Removed complicated #ifdef and replaced it - with ACE_HAS_STRDUP_EMULATION. - -Mon Aug 24 10:41:07 1998 Alexander Babu Arulanthu - - * ace/OS.h: Provided null defitions for all the wait - status macros for ACE_WIN32 platform. - -Mon Aug 24 00:11:00 1998 Douglas C. Schmidt - - * examples/Reactor/Misc/pingpong.cpp (run_svc): Fixed a subtle - potential "order of destruction" bug with this test. Thanks to - Hans Rohnert for reporting this. - -Sun Aug 23 21:09:55 1998 Arturo Montes - - * ace/OS.i (thr_testcancel): with ACE_HAS_PTHREAD_DRAFT6, - use ::pthread_testintr () instead of pthread_testcancel (). - Thats what FSU pthreads uses. Hopefully, MVS does also. - -Sun Aug 23 16:28:10 1998 Douglas C. Schmidt - - * ace/Process.cpp (spawn): Removed the ACE_DEBUG messages on exec - failure, etc. If apps want to know what has failed, they need - to check the return from spawn() or wait(). ACE shouldn't be - generating debugging information gratuitiously... - -Sun Aug 23 15:42:48 1998 Alexander Babu Arulanthu - - * ace/Process.cpp: Put the warning on failure on exec - ("ACE_Process::spawn (); exec failed: exiting!!!!\n") under - condition (ACE_Service_Config::debug_). - -Sun Aug 23 11:12:46 1998 Carlos O'Ryan - - * tests/Makefile: - * tests/Message_Queue_Notifications_Test.cpp: - Fixed typos. - -Sat Aug 22 21:52:23 1998 Douglas C. Schmidt - - * examples/IPC_SAP/UPIPE_SAP/ex[23].cpp: Changed the - Auto_Basic_Ptr to the Auto_Basic_Array_Ptr to avoid compilation - problems. Thanks to David Levine for reporting this. - -Sat Aug 22 20:13:37 1998 Darrell Brunsch - - * ACE-INSTALL.html: Added instructions for adding Alpha - configurations to MSVC 5 project files. - -Sat Aug 22 13:24:00 1998 Douglas C. Schmidt - - * tests/Message_Queue_Notifications_Test.cpp: Surrounded the - ACE_Barrier with conditional compilations for ACE_HAS_THREADS. - Thanks to Ganesh Pai for reporting this. - - * tests/Message_Queue_Notifications_Test.cpp: Cleaned up the - formatting a bit. - - * tests: Renamed MsgQueue_Notifications_Test.{cpp,bpr,dsp} to - Message_Queue_Notifications_Test.{cpp,bpr,dsp} to be more - consistent with spelling. - - * ace/OS.h: Moved the ACE_timer_t down a bit in the file so that - ACE_UINT is defined. Thanks to Naga for reporting this. - - * ace/OS.h: Added a "no-op" typedef for ACE_Rusage for platforms - that don't support it. Thanks to David Levine for reporting - this. - -Sat Aug 22 07:59:28 1998 David L. Levine - - * tests/UPIPE_SAP_Test.cpp (main): removed unused local - variables thr_handle_acceptor and thr_handle_connector. - - * tests/UPIPE_SAP_Test.cpp (connector): removed leading newline - in printout at end of thread execution. - - * ACE-INSTALL.html: added egcs section. Thanks to - Ganesh Pai for a portion of it. - - * examples/IPC_SAP/UPIPE_SAP/ex1.cpp (peer1); removed spurious - "new" in ACE_NEW_RETURN involcation. - - * examples/IPC_SAP/UPIPE_SAP/ex{2,3}.cpp: untabified. - - * examples/IPC_SAP/UPIPE_SAP/Makefile: updated dependencies - so that the module will build, now that auto_builtin_ptr.h - has been removed. - -Sat Aug 22 00:27:06 1998 Irfan Pyarali - - * ace/Read_Buffer.i (alloc): Added new method to get to - Read_Buffer's allocator. This is necessary because we need to - free up the memory that it allocates for us. - - * ace/Service_Object.cpp (fini): New method calls fini() on - and sets the flag. This flag is - tested in the destructor so that the is not fini'ed - twice. - - * ace/Service_Repository.cpp (fini): New method to finalize (call - fini() and possibly delete) all the services. - - * ace/Service_Config.cpp (fini_svcs): New method calls - ACE_Service_Repository::instance ()->fini (). - - * ace/Object_Manager.cpp (~ACE_Object_Manager): Added a call - to close and possibly delete all service instances in the - Service Repository by calling ACE_Service_Config::fini_svcs. - This call is made *before* the library singletons (such as - the Reactor, Proactor, Thread_Manager, and Allocator) are - destroyed since the service instances maybe accessing these - singletons in the fini() and destructor methods. Note that - user singletons are destroyed before the services are - fini'ed or closed. - - * ace/Service_Config.cpp (fini_svcs): Disable log messages when - appropriate. - -Fri Aug 21 22:26:54 1998 Steve Huston - - * ace/OS.i (ACE_OS::gettimeofday): On Win32, instead of _ftime, - use GetSystemTimeAsFileTime. _ftime has a bug crossing from - daylight time to standard time in the US. - -Fri Aug 21 22:13:51 1998 David L. Levine - - * ace/OS.i (thr_cancel, thr_setcancelstate, thr_setcanceltype, - thr_testcancel): added #else - case, with ACE_NOTSUP (-1), to the various threads - types. It catches - ACE_HAS_PTHREADS && ACE_LACKS_PTHREAD_CANCEL. Thanks - to Naga for reporting this. - - * ace/OS.i (thr_setcanceltype): don't support if - ACE_LACKS_PTHREAD_CANCEL. Thanks to Naga for reporting this. - - * ace/config-chorus.h: added ACE_LACKS_PTHREAD_CANCEL. - Thanks to Naga, again. - -Fri Aug 21 20:23:44 1998 Douglas C. Schmidt - - * examples/IPC_SAP/UPIPE_SAP/ex[123].cpp: Updated these programs - to use the ACE_Auto_Basic_Ptr instead of the bizarre - auto_builtin_ptr.h file, which has been removed... Also - replaced the global thr_mgr with the ACE_Thread_Manager - Singleton and moved the include file until AFTER the - ACE includes to avoid problems with HP/UX 11's C++ compiler. - Thanks to John Mulhern for motivating these fixes. - - * ace/config-hpux-10.x.h: Added a check so that if threading is - disabled, then timespec_t does not get defined. This seems to - work around a bug with HP/UX 10.x. Thanks to Ganesh M. Pai - for reporting this. - -Fri Aug 21 19:54:26 1998 Carlos O'Ryan - - * include/makeinclude/wrapper_macros.GNU: - The ACE_HAS_EXCEPTIONS macro definition goes into CPPFLAGS now, - so make depend can use it too. - -Fri Aug 21 18:47:40 1998 Nanbor Wang - - * ace/Process.cpp (wait): Need to check if status is non-null - before accessing the exit status on NT. Thanks to Carlos for - pointing this out. - -Fri Aug 21 16:40:39 1998 Carlos O'Ryan - - * ace/config-irix6.x-sgic++.h: - * ace/OS.i: - Some platforms (notable IRIX 6.x) do not update the timer in - pthread_cond_timedwait(), this made the Semaphore test fail for - those platforms. - I modified the ACE_OS::sema_wait() function to obtain the - desired behavior. - -Fri Aug 21 15:50:05 1998 Douglas C. Schmidt - - * etc/ACE-porting.html: Updated some discussion on selecting - versions of STL that work with ACE and TAO. Thanks to Bob - Laferriere for reporting - this. - -Fri Aug 21 14:49:31 1998 Steve Huston - - * include/makeinclude/platform_hpux_gcc.GNU: Changed the default - from build without threads to build with threads. Thanks to Ganesh - Pai for this change. - -Fri Aug 21 09:25:21 1998 Douglas C. Schmidt - - * ace/OS.h: Moved several #ifdefs from Profile_Timer.h into OS.h - to clean up the code. - - * ace/Profile_Timer.h: Cleaned up the class definition to make the - OSE tool happy. Thanks to Doug Anderson for - reporting this. - - * etc: Moved the ACE-subsets.html file into $ACE_ROOT/etc. - - * ace/Synch_Options.h: Fixed a typo that was giving the OSE tool - fits! Thanks to Doug Anderson for reporting - this. - -Fri Aug 21 03:41:01 1998 Nanbor Wang - - * examples/OS/Process/process.cpp: - * examples/OS/Process/imore.cpp: Minor bug fixes. Print out of - child processes' exit status. - -Thu Aug 20 23:33:15 1998 Nanbor Wang - - * ace/Process.cpp (wait): Allow passing back the exit status of - the child process on NT. - -Thu Aug 20 19:52:21 1998 Nagarajan Surendran - - * ace/OS.i: - ACE_INLINE int - ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data) - ... - #else /* this is Draft 7 or STD */ - *data = pthread_getspecific (key); - - changed the ::pthread_getspecific to pthread_getspecific as it - is a macro in Chorus. Thanks to David Levine for finding this. - -Thu Aug 20 17:05:28 1998 Douglas C. Schmidt - - * examples/Service_Configurator/Misc/Timer_Service.cpp: Added some - ACE_SVC_FACTORY_* macros for Timer_Service_1 so that it'll - compile and link properly. Thanks to David Levine for reporting - this. - -Thu Aug 20 14:39:53 1998 Nanbor Wang - - * ace/Process.{h,cpp} (ACE_Process::wait): Added a parameter of int* to - get back the exit status of a child process. - -Thu Aug 20 14:33:59 1998 Douglas C. Schmidt - - * etc/ACE-porting.html: Generalized the discussion to cover - porting TAO, as well as to explain what C++ features must/can be - supported to port ACE/TAO to a new platform. - -Thu Aug 20 05:12:24 1998 Douglas C. Schmidt - - * ACE version 4.5.31 released. - -Thu Aug 20 03:10:48 1998 Nanbor Wang - - * tests/UPIPE_SAP_Test.cpp (main): Reverted back to use - ACE_Thread. Although it's considered the "Right Thing" to spawn - threads using ACE_Thread_Manager, I'll keep this file to use - ACE_Thread to serve as an example that you can also use - ACE_Thread to do any tricks you like, and, a sanity check. - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): Don't create the - ACE_Thread_Exit object if we are not spawning the thread using - ACE_Thread_Manager. Otherwise, when a non-thread manager - spawned thread exits, the TSS clean up routing gets into an - infinite loop calling ~ACE_Thread_Exit recursively and - eventually the stack gets overflowed and the thread then - "appears" to exit normally. But in fact, TSS cleanup does not - complete at all. - - * ace/Thread_Manager.i: - * ace/Thread_Manager.cpp (at_exit,thr_self): Moved all at_exit - methods into the .i file. All at_exit methods and thr_self - don't really need to hold Thread_Manager's lock. - - Notice that after the newly spawned thread enters the - ACE_Thread_Adapter::invoke routine, we can safely manipulate its - Thread_Deacriptor because it has been registered properly. This - change should further reduce the times a thread gets started. - -Wed Aug 19 20:34:25 1998 Nanbor Wang - - * ace/README: - * ace/OS.h: Added a new macro directive - "ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER". By defining - this macro, it implicitly forces ACE to use non-static object - manager and _NOT_ instantiating ACE_Object_Manager for you and - assumes you will take the responsibility of instantiating - ACE_Object_Manager at the proper place in your programs. This - is usually used when using ACE with MFC/Windows programs. - Because the main function is defined by MFC/Windows libraries, - ACE has no way to instantiate object manager in these programs. - For programs using MFC, a good place to instantiate Object - Manger will be to define ACE_Object_Manager a member of - CApplication derived classes so it gets instantiated/destructed - properly. - - * ace/config-win32.h: Revised the comment about - ACE_HAS_NONSTATIC_OBJECT_MANAGER - -Wed Aug 19 17:15:00 1998 Douglas C. Schmidt - - * ace/Service_Config.cpp: Moved the registration of the SIGHUP - signal from the constructor to the open() method since otherwise - it'll never get called in the typical usecase... Thanks to - Susan Liebeskind for - reporting this. - -Wed Aug 19 14:11:22 1998 David L. Levine - - * ACE version 4.5.30 released. - -Wed Aug 19 13:38:40 1998 David L. Levine - - * ace/OS.cpp (ACE_TSS_Cleanup::detach): only declare local - temp_key ifdef ACE_WIN32, because it's only used there. - -Wed Aug 19 10:13:36 1998 Nanbor Wang - - * ace/OS.cpp (ACE_Thread_Cleanup::remove): Don't bother to check - the status when the object manager is shutting down. - Otherwise, we are creating another fresh ACE_TSS object all over - again. - (ACE_Thread_Cleanup::detach): When cleaning up a thread key, we - must first remove it from the internal table before actually - freeing the key to avoid race condition (the OS may reassigned - the key to other the_keycreate requests.) - - * ace/Log_Msg.cpp (close): Removed the ACE_Thread::key_free - statement. This should be handled by TSS cleanup mechanism. - - * ace/Thread_Manager.cpp (at_exit): Moved the return statement - after #endif macros to avoid the no return compiler warning. - - * tests/UPIPE_SAP_Test.cpp (main): Changed to use - ACE_Thread_Manager to spawn and wait for threads so the TSS - object gets cleanup correctly. Using plain vanilla - ACE_Thread::spawn and/or ACE_OS::thr_create no longer works. - -Wed Aug 19 10:06:25 1998 David L. Levine - - * etc/ACE-guidelines.html: @added guidelines to check for - success of an attempted open of an existing file, and to not - release copyrighted, etc., material with ACE/TAO. - - * tests/SOCK_Connector_Test.cpp (find_another_host): check to see - if the other host is up, by attempting a blocking connection with - it. Only return another host if the connection succeeds. - Also, cache the other host so that multiple calls will not - have to repeat the connection attempt. - -Wed Aug 19 08:25:20 1998 Douglas C. Schmidt - - * examples/Service_Configurator/Misc/Timer_Service.cpp: Changed - Timer_Service_2 to Timer_Service_1 since it was a typo. Thanks - to Irfan for reporting this. - -Tue Aug 18 22:10:43 1998 David L. Levine - - * ace/config-fsu-pthread.h,config-hpux-10.x.h,config-mit-pthread.h, - config-mvs.h,config-osf1-{3.2,4.0}.h,config-sco-5.0.0-mit-pthread.h, - config-sunos5.{5,6}.h,config-tandem.h: - removed ACE_HAS_ONEARG_SIGWAIT. It's no longer used. - -Tue Aug 18 16:50:28 1998 Irfan Pyarali - - * ace/Thread.i (sigsetmask): Renamed parameter name since it - conflicts with STL class name. Thanks to Kent Watsen - for pointing this out. - - * examples/Reactor/Proactor/test_proactor.cpp (handle_write_stream): - Fixed incorrect unary minus operator application. - -Tue Aug 18 16:43:00 1998 David L. Levine - - * ACE version 4.5.29 released. - -Tue Aug 18 14:15:23 1998 Steve Huston - - * include/makeinclude/platform_aix4.2.GNU: Don't link programs - against libACE.a - just against libACEshr.a (the shared lib). - - * include/makeinclude/platform_hpux_aCC.GNU: - * include/makeinclude/platform_hpux_gcc.GNU: Switch support for threads - on and off using "make threads=0" or "make threads=1". The default - for aCC is to use threads, and for gcc is to not. I deduced the - defaults from the old lib settings. Sorry if the gcc one is wrong. - - * ace/config-hpux-10.x.h: Added ACE_HAS_SIGISMEMBER_BUG, plus... - * ace/config-hpux11.h: Set threads things based on the setting - of ACE_HAS_THREADS, which gets set in platform_macros.GNU (see above) - to build with threads support. - -Tue Aug 18 10:57:32 1998 Carlos O'Ryan - - * include/makeinclude/rules.nested.GNU: - Removed extra enter/leave messages at each directory, GNUmake - does it for you. - -Tue Aug 18 08:15:30 1998 David L. Levine - - * tests/Aio_Platform_Test.cpp (do_sysconf): on VxWorks, don't - call ACE_OS::sysconf () because it's not supported. - - * bin/make_release: added -P to cvs checkout command, to ignore - empty diretories. - -Mon Aug 17 22:56:17 1998 Nanbor Wang - - * tests/version_tests/version_tests.dsw: - * tests/version_tests/Dynamic_Priority_Test.dsp: Added a new - project (as shown) into the workspace. - -Mon Aug 17 17:17:52 1998 Steve Huston - - * ace/Makefile: Removed IO_Cntl_Msg from files to build. It's empty. - - * include/makeinclude/platform_hpux_aCC.GNU: Added '302' to warnings - to suppress; changed LIBS from '=' to '+=' to work better with TAO - builds. Thanks to John Mulhern for these fixes. - -Mon Aug 17 17:04:31 1998 Nanbor Wang - - * tests/Env_Value_Test.cpp (main): Changed to use ASYS_TCHAR* for - arguments in main. - -Mon Aug 17 15:51:30 1998 David L. Levine - - * ace/OS.i (thr_sigsetmask): with ACE_HAS_PTHREADS_DRAFT4 or - ACE_HAS_PTHREADS_DRAFT6, added :: in front of sigprocmask () - call. Without it, g++ on LynxOS was warning about use of - sigprocmask () before definition. - -Mon Aug 17 14:59:13 1998 Douglas C. Schmidt - - * etc: Added a new file, ACE-porting.html, which explains how to - port ACE to new OS platforms. Thanks to Gabriel Lima - for submitting this. - - * ace/FILE_Connector.h: Changed ACE_FILE_Connector so that it no - longer inherits from ACE_FILE. This relationship is unnecessary - and was not used. Thanks to Byron Harris for reporting this. - -Mon Aug 17 12:14:13 1998 Steve Huston - - Large number of small changes (all listed below) to begin aligning - the large number of Pthreads-related definitions around the 4 supported - drafts: 4, 6, 7, as well as the standard (also known as draft 10). - The notation for "DCE threads" is gone. DCE threads are primarily - draft 4, plus platform-specific modifications. Now all code must - declare the pthreads draft, and handle any platform/implementation - oddities as such. - As time goes on, I will remove more of the ACE_HAS_... and ACE_LACKS... - things that are actually changes with the pthreads drafts. - I tested these on Solaris 2.5.1 (CC), HP-UX 10.20 and 11.00, AIX 4.2.1, - and sanity-tested on NT/MSVC (though no changes affected the WTHREADS - parts). - - * ace/README: Clarified use of Pthreads macros. - - * ace/config-hpux-10.x.h: - * ace/config-lynxos.h: - * ace/config-osf1-3.2.h: - * ace/config-osf1-4.0.h: - Changed from DCE threads to ACE_HAS_PTHREADS_DRAFT4. - - * ace/config-fsu-pthread.h: - * ace/config-m88k.h: - * ace/config-mvs.h: Added ACE_HAS_PTHREADS_DRAFT6. - - * ace/config-aix-4.1.x.h: - * ace/config-aix-4.2.x.h: Added ACE_HAS_PTHREADS_DRAFT7. - - * ace/config-chorus.h: - * ace/config-dgux-4.x-ghs.h: - * ace/config-hpux11.h: - * ace/config-irix6.x-g++.h: - * ace/config-irix6.x-sgic++.h: - * ace/config-linux-lxpthreads.h: - * ace/config-linux-pthread.h: - * ace/config-mit-pthread.h: - * ace/config-osf1-4.0.h: - * ace/config-sco-5.0.0-mit-pthread.h: - * ace/config-sunos-5.5.h: (also remove ACE_HAS_STHREADS if - _POSIX_PTHREAD_SEMANTICS is defined by user). - * ace/config-sunos5.6.h: - - Changed to / added ACE_HAS_PTHREADS_STD. - - * ace/config-hpux-10.x-g++.h: Changed over to use the base file - config-hpux-10.x.h. - - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: - Unified the compile ifdefs for pthreads around ACE_HAS_PTHREADS, - ACE_HAS_PTHREADS_DRAFT{4, 6, 7} and ACE_HAS_PTHREADS_STD. - Removed all use of ACE_HAS_DCETHREADS; put in platform-specific - settings where needed. - - * ace/Sched_Params.cpp: - * ace/Synch.cpp: Removed the use of ACE_HAS_DCETHREADS. - -Mon Aug 17 12:10:54 1998 Nanbor Wang - - * ace/ace_{dll,lib}.dsp: Removed Message_Queue_T.cpp from and included - Message_Queue.cpp into source files that get build. Hmm, I - thought I made this change long ago. - - * ace/ace_ce_dll.dsp: Changed the DLL output directories for some - configurations. - -Mon Aug 17 11:25:18 1998 Carlos O'Ryan - - * ace/Strategies_T.h: - In some platforms we need to include "ace/Thread_Manager.h" - because its definition is used in the inline methods of some - templates, and a few platform actually check the syntax of - template code, even if the template is not used. - -Mon Aug 17 10:06:01 1998 David L. Levine - - * netsvcs/lib/Server_Logging_Handler_T.cpp: replaced - #include with #include "ace/OS.h", so that - _REENTRANT gets defined with g++. - - * apps/Gateway/Peer/Peer.{h,cpp} (Peer_Connector::open): added - (unused) arguments to this function. They are only provided to - avoid a compiler warning about hiding the virtual function - ACE_Connector::open (ACE_Reactor *, - int). - - * tests/Dynamic_Priority_Test.cpp (run_performance_test): - added delete of time_offsets array. The test Purifies - cleanly now. - -Mon Aug 17 00:05:02 1998 Irfan Pyarali - - * examples/Reactor/ReactorEx/test_removals.cpp (main): Fixed - signed/unsigned mismatch. - - * examples/Reactor/ReactorEx/test_talker.cpp (handle_read_stream): - Fixed incorrect unary minus operator application. - -Sun Aug 16 20:57:12 1998 Nanbor Wang - - * ace/OS.i (dlerror): Fixed a typo. Thanks to Ossama Othman - for reporting this. - -Fri Aug 14 18:58:29 1998 Alexander Babu Arulanthu - - * tests/Aio_Platform_Test.cpp : Changed 's to - ACE_OS::sysconf's. - -Fri Aug 14 11:41:23 1998 Steve Huston - - * ace/OS.i (ACE_OS::dlclose): On HP-UX 10.x and 32-bit 11.00, do - not actually call shl_unload if the library's ref count is more than - 1. If shl_unload is called, it unloads the library, regardless of - the reference count. This has the affect of never unloading a - library that's been loaded more than once, until the OS unloads it - at process run-down. Better than invalidating references to it, - though. The wonder of wrappers at work for you... - -Fri Aug 14 10:01:05 1998 David L. Levine - - * ace/Basic_Types.h (ACE_UINT64_DBLCAST_ADAPTER): with - ACE_LACKS_LONGLONG_T, only use low 32 bits. We could devise - a conversion from ACE_U_LongLong to double that uses all - 64 bits; but, it's probably easier for users to upgrade - their hardware and/or compilers to ones that support 64 - bit ints :-) - -Thu Aug 13 19:29:33 1998 Douglas C. Schmidt - - * ace/Message_Queue_T.i: Changed the is_empty_i() method to check - if this->tail_ == 0 rather than this->cur_bytes_ <= 0 && - this->cur_count_ <= 0. Thanks to Dirk Broer - for suggesting this. - -Thu Aug 13 17:45:00 1998 Chris Gill - - * ace/Basic_Types.h: added ACE_UINT64_DBLCAST_ADAPTER macro - to patch unimplemented UINT64 to double casts - -Thu Aug 13 13:34:52 1998 David L. Levine - - * os-patches/linux-patches.html: the af_inet.c patch is only - needed through Linux kernel version 2.0.34. - - * tests/Conn_Test.cpp: disabled ACE_Hash_Addr template - specialization on non-egcs g++. - - * tests/Process_Strategy_Test.{h,cpp} (~Process_Strategy): - added an explicit destructor. g++ 2.7.2.3 got very - confused ("Internal compiler error") without it, apparently - when generating it implicitly. - - * tests/ MsgQueue_Notifications_Test.cpp (producer): removed - unused local "result". - -Wed Aug 12 22:45:50 1998 Nanbor Wang - - * tests/MsgQueue_Notifications_Test.cpp: Added an explicit - template instantiation. - -Wed Aug 12 21:32:05 1998 Carlos O'Ryan - - * ace/Message_Block.h: - * ace/Message_Block.i: - * ace/Message_Block.cpp: - Enabled the base() method, it replaces the internal buffer and - resets the Message_Block. There were other ways to do this (like - calling data_block->base()), but some users find it convenient. - I also modified the Data_Block::base() method to release any - memory held by the class before the method is called. Thanks to - Peter.Gorgia@libnet.com for pointing this out. - -Wed Aug 12 17:43:33 1998 Nanbor Wang - - * tests/MsgQueue_Notifications_Test.cpp: The watermark test which - uses cv's signaling to notify other threads is also merged into - this file. - - * tests/MsgQueue_Water_Mark_Test.{dsp,cpp}: Removed. - -Wed Aug 12 17:12:57 1998 Darrell Brunsch - - * APC.DSP: - * Abondoned.dsp: - * Console_Input.dsp: - * Directory_Changes.dsp: - * Exceptions.dsp: - * Multithreading.dsp: - * Network_Events.dsp: - * Prerun_State_Changes.dsp: - * Registration.dsp: - * Registry_Changes.dsp: - * Removals.dsp: - * Talker.dsp: - * Timeouts.dsp: - * Window_Messages.dsp: - * test_abandoned.cpp: - * test_apc.cpp: - * test_window_messages.cpp: - Added updated versions of project files (with correct include - directories). Also changed the

    's to take in argc and - argv. Thanks to Jeff Hellzen - for submitting these changes. - -Wed Aug 12 16:16:38 1998 Nanbor Wang - - * tests/MsgQueue_Notifications_Test.cpp: Since this test doesn't - use threads at all, I removed the #if ACE_HAS_THREADS macro. - -Wed Aug 12 14:57:51 1998 Jonathan Biggar - - * ace/config-sunos5.5.h: wrapped thread-related defines with - "#ifdef _REENTRANT". - - * include/makeinclude/platform_sunos5_sunc++.GNU,wrapper_macros.GNU, - ACE-INSTALL.html: added support for "threads" make option. - -Wed Aug 12 02:06:02 1998 Nanbor Wang - - * tests/test_config.h (ACE_Test_Output): It seemed like redirecting - the Log_Msg output back to stderr in close was a bit too early - and some messages popped out after some tests ran successfully. - Moved the redirecting code into the destructor. - -Tue Aug 11 22:47:49 1998 David L. Levine - - * ace/TP_Reactor.cpp (dispatch_io_set): added - ACE_UNUSED_ARG (ready_mask). - - * tests/test_config.h: added - ACE_Singleton template - instantiation. This shouldn't be done in a header, and - I wouldn't be surprised if it breaks somewhere. But, we - don't have any other need for a .cpp file to link into all tests. - -Tue Aug 11 17:30:32 1998 Steve Huston - - * tests/test_config.h: Fixed ACE_Test_Output to get torn down clean - in all cases by changing it from a static to an ACE_Singleton. - Re-enabled it for Win32, non-WinCE. - -Tue Aug 11 15:51:47 1998 Irfan Pyarali - - * ace/XtReactor.h (ACE_XtReactor): Changed the constructor so that - the XtAppContext can be passed later. This scheme allows for a - default constructor. Thanks to J-M Strauss - for suggesting this. - -Tue Aug 11 12:35:10 1998 Nanbor Wang - - * ace/OS.i (fopen): On WinCE, reset the handle to 0 if CreateFile - fails so we can detect errors when using the emulated FILE - pointer on CE. - - * tests/test_config.h (~ACE_Test_Output): Changed !defined - (ACE_HAS_WINCE) to !defined (ACE_WIN32). When using non-static - object manager, the singleton ACE_Log_Msg may no longer exist - here and the reseting here just causes access violations. Other - platforms which use non-static might suffer the same sympton. - -Tue Aug 11 12:29:03 1998 David L. Levine - - * os-patches/linux-patches.html: the gas patch on alphas - isn't necessary with binutils-2.9.1. - -Tue Aug 11 12:23:09 1998 Nanbor Wang - - * ace/ARGV.{h,cpp}: Made a series of changes to make the file CE - friendly. - - * ace/Message_Queue_T.cpp: Adjusted the indentation. - -Tue Aug 11 02:06:55 1998 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (dispatch_handles): Because dispatch_index - is absolute, nCount should be set to - (max_handlep1 - dispatch_index) instead of (nCount - - dispatch_index). Thanks to Alberto Villarica - for pointing this out. - -Mon Aug 10 20:12:21 1998 Steve Huston - - * ace/Log_Msg.cpp: On HP-UX 10.x, display thread's readable number - rather than an int represenation of a pointer. - - * tests/test_config.h (ACE_Test_Output): When destroying - ACE_Test_Output, make sure to remove all traces of it from - ACE_Log_Msg instance. - - * tests/Dynamic_Priority_Test.cpp: Don't try to set process-wide - scheduling if it's not supported on the platform. - - * tests/Thread_Manager_Test.cpp: Don't do a kill on pthreads draft - 4 platforms. This is a NOP for now - it will make a difference when - I check in more threads-related changes later. - -Mon Aug 10 10:35:26 1998 Douglas C. Schmidt - - * Added the ACE-subsets.html file to the ACE directory so that - we can all modify it. - -Mon Aug 10 10:29:29 1998 Nanbor Wang - - * ace/OS.i (shm_open): There's no need to mess with the security - attribute here. - -Mon Aug 10 01:09:05 1998 Nanbor Wang - - * ace/OS.{h,i}: Added a new function - "default_win32_security_attributes" to return the defualt - security setting of kernel objects. By default, this function - is a no-op. You must define - ACE_DEFINES_DEFAULT_WIN32_SECURITY_ATTRIBUTES for this function - to return a SECURITY_ATTRIBUTES object that has no access - restriction. - - Modified all functions that use Win32 kernel objects to invoke - this new function to get the appropriate security attributes. - Thanks to Ivan Murphy for - suggesting this. - - -Sun Aug 09 23:26:39 1998 Douglas C. Schmidt - - * ACE version 4.5.28 released. - -Sun Aug 9 23:08:51 1998 Douglas C. Schmidt - - * Checked in a bunch of files/directories that I'd neglected - to check in before. - -Sun Aug 09 23:02:24 1998 Douglas C. Schmidt - - * ACE version 4.5.27 released. - -Sun Aug 9 15:04:41 1998 Darrell Brunsch - - * netsvcs/clients/Tokens/manual/manual.cpp: Changed all instances - of "#if (ACE_WIN32)" to "#if defined (ACE_WIN32)" - - * netsvcs/netsvcs.dsw: Added this workspace which contains all the - netsvcs projects. - - * netsvcs/clients/Tokens/collection/collection.dsp: - * netsvcs/clients/Tokens/collection/collection.dsw: - * netsvcs/clients/Tokens/deadlock/deadlock.dsp: - * netsvcs/clients/Tokens/deadlock/deadlock.dsw: - * netsvcs/clients/Tokens/invariant/invariant.dsp: - * netsvcs/clients/Tokens/invariant/invariant.dsw: - * netsvcs/clients/Tokens/manual/manual.dsp: - * netsvcs/clients/Tokens/manual/manual.dsw: - * netsvcs/clients/Tokens/mutex/mutex.dsp: - * netsvcs/clients/Tokens/mutex/mutex.dsw: - * netsvcs/clients/Tokens/rw_lock/rw_lock.dsp: - * netsvcs/clients/Tokens/rw_lock/rw_lock.dsw: - Added these MSVC projects and workspaces. Thanks to Jeff - Hellzen for submitting these. - - * netsvcs/clients/Logger/direct_logging.dsp: - * netsvcs/clients/Logger/indirect_logging.dsp: - * netsvcs/clients/Naming/Client/Client_Test.dsp: - * netsvcs/clients/Naming/Client/main.dsp: - * netsvcs/lib/netsvcs.dsp: - * netsvcs/servers/servers.dsp: - Mainly just updated all of these and made sure that they worked. - -Sun Aug 9 09:17:16 1998 Douglas C. Schmidt - - * ace/Strategies_T.cpp (connect_svc_handler): Changed the call to - this->CONNECT_STRATEGIES::connect_svc_handler() to avoid compile - problems with GCC on LynxOS. Thanks to Sergio for reporting - this. - -Sat Aug 8 09:37:27 1998 Carlos O'Ryan - - * ace/INET_Addr.cpp: - Reverted the operator== optimization, it turns out that the - definition of struct in_addr is not portable after all. Maybe - there is a set of macros to make it portable? - - * ace/ACE.h: - * ace/ACE.cpp: - Returning is unnecesary; and gives no more - guarantees that , plus it gives warnings in - IRIX/MIPSPro compilers. - - * ace/Synch.cpp: - Removed explicit instantiations of ACE_Guard, - the class is specialized so no instantiation is necessary. Same - thing for ACE_Write_Guard and ACE_Read_Guard. - -Fri Aug 7 23:18:53 1998 Carlos O'Ryan - - * ace/config-sunos5.5.h: - Updated the new ACE_CC_NAME macros (and friends) so they work - with egcs (and hopefully g++). - - * tests/MT_SOCK_Test.cpp: - Removed double comma in function call. - -Fri Aug 7 21:39:26 1998 Carlos O'Ryan - - * ace/INET_Addr.cpp: - Compare the fields of in_addr instead of calling memcmp. - - * ace/Message_Block.cpp: - * ace/Message_Block.h: - * ace/Message_Block.i: - The Message_Block can receive an allocator for the data block, - so instead of creating them on the heap they can be allocated - from a TSS allocator or other memory pool. By default we use - ACE_New_Allocator. - - * apps/gperf/Makefile: - The Id was wrong. - - * bin/auto_compile: - Added gperf to the default list of directories. - -Fri Aug 7 13:58:58 1998 Gonzalo Diethelm - - * bin/envinfo.cpp: - Added this program, which will print the version information for - ACE, the OS and C++ compiler. The idea is to use this when posting - to the ACE mailing list. - - * ace/ACE.h: - * ace/ACE.cpp: - Added static methods to retrieve compiler information (name, major - version, minro version, beta version). - - * ace/config-sunos5.5.h: - Defined the compiler information macros for this platform. - - * bin/Makefile: - Modified the Makefile to support multiple binaries in the - directory (according to tests/Makefile). - - * bin/clone.cpp: - Added RCS Id. - -Fri Aug 7 12:46:42 1998 Douglas C. Schmidt - - * ace/Activation_Queue.h: Updated the documentation to indicate - the need for absolute rather than relative time values. Thanks - to Johannes Gutleber for reporting - this. - -Fri Aug 07 02:06:54 1998 Nanbor Wang - - * tests/MsgQueue_Water_Mark_Test.{dsp,cpp}: Added a new test to - make sure the water mark stuff works. It still needs to be - clean up to compile with g++. - -Fri Aug 07 01:00:55 1998 Irfan Pyarali - - * ace/Strategies_T.i (operator==): Added a method to compare a - ACE_Hash_Recyclable and a ACE_Recyclable. Also inlined a shit - load of small methods. - - * ace/Strategies_T.cpp (connect_svc_handler): If is not - connected to the correct address or is busy, we will not use it. - Therefore we need to set it to zero. - - * ace/Synch: Added template specializations for - ACE_Guard, ACE_Write_Guard, and - ACE_Read_Guard. - -Thu Aug 06 14:59:22 1998 Douglas C. Schmidt - - * ace/Thread_Manager.cpp: Updated all uses of cancel_thr for the - various apply*() methods so that they pass along the - async_cancel flag. - - * ace/Thread_Manager.cpp: Added a new ARG to the ACE_EXECUTE_OP - macro. Believe it or not, this change actually reduced the - amount of special-case code because we can now treat kill_thr() - just like the other *_thr() methods. Irfan was amazed ;-). - - * ace/Thread_Manager: Added a new flag called "async_cancel" to - all the Thread Manager cancel*() methods. This flag is disabled - by default (hence, there are no changes to the ACE Thread - Manager semantics). If it is enabled, however, it will attempt - to perform an asychronous thread cancellation on the - corresponding thread id(s). - -Thu Aug 6 17:44:50 1998 Douglas C. Schmidt - - * tests/Priority_Task_Test.cpp: Enhanced this test so that it runs - correctly on platforms where you must be root to muck around - with thread priorities. Thanks to John Mulhern - <9107@mn3.lawson.lawson.com> for reporting this. - - * tests/MT_SOCK_Test.cpp: Reformatted the code to make it more - readable and also to remove a C-style cast. - - * ace/Message_Queue_T.h: Improved the documentation of the low - water mark and high water marks. Thanks to Umar for encouraging - this. - -Thu Aug 6 20:41:44 1998 James C Hu - - * ace/Filecache.cpp: Avoided a deadlock detected by Tom Dobridge - (thanks!). - -Thu Aug 06 14:59:22 1998 Irfan Pyarali - - * ace/Strategies_T.cpp (connect_svc_handler): If is not - connected to the correct address or is busy, we will not use it. - Therefore we need to set it to zero. - - * ace/Synch: Added template specializations for - ACE_Guard, ACE_Write_Guard, and - ACE_Read_Guard. - -Thu Aug 6 14:30:11 1998 Carlos O'Ryan - - * ace/config-irix6.x-sgic++-nothreads.h: - Use template specializations instead of pragmas if the compiler - is 7.2 or better. - - * ace/config-irix6.x-sgic++.h: - The is not necessary in IRIX 6.4 - -Thu Aug 06 14:11:15 1998 Nanbor Wang - - * ace/Message_Queue_T.cpp: Make sure to check if the cur_bytes_ is - <= to the low_water_mark before signaling threads trying to - enqueue a Message_Block. - - * ace/Message_Queue_T.cpp: Fixed a bunch of code to use the - ACE_NEW_RETURN macro to ensure that errno is set correctly. - - * ace/Message_Queue.h: Changed the DEFAULT_LWM to be the same as - the DEFAULT_HWM since that's the "Right Way"[TM] to handle - this... Thanks to Umar Syyid for helping to - track this down. - - * ace/Message_Queue_T.i (is_empty_i): Removed the low water mark - logic entirely because this isn't the right place to put it. - Also reverted back to using && rather than || since we need - to handle "0-sized" messages. - -Thu Aug 6 09:41:22 1998 Nagarajan Surendran - - * ace/ARGV.{h,cpp} : Added a new - ACE_ARGV(ASYS_TCHAR *first_argv,ASYS_TCHAR *second_argv,int) - which creates a new ARGV which is the concatenation of the 2 argvs. - - Also added a new private method argv_to_string - which converts an argv to a string. - -Thu Aug 6 08:56:02 1998 Douglas C. Schmidt - - * ace/Module.h: Pointed out that ACE_Module should't be subclassed - -- ACE_Task should be subclasses. Thanks to Barney Dalton - for pointing this out. - -Wed Aug 05 23:57:16 1998 Irfan Pyarali - - * ace/Reactor.cpp (end_event_loop): Changed the code so that *all* - threads are woken up. Thanks to Olivier Lau - for pointing this bug out. - - * examples/Reactor/ReactorEx/test_multithreading.cpp (main): - Changed Reactor->close() to Reactor::end_event_loop(). - -Wed Aug 5 23:12:54 1998 Douglas C. Schmidt - - * include/makeinclude/wrapper_macros.GNU: Changed - PURE_CACHE_DIR = $(PURE_CACHE_BASE_DIR)-$(LOGNAME)-$(CXX) - - to - - PURE_CACHE_DIR = $(PURE_CACHE_BASE_DIR)-$(LOGNAME)-$(notdir $(CXX) ) - - Thanks to John Mulhern <9107@mn3.lawson.lawson.com> for this. - -Wed Aug 05 14:53:18 1998 Irfan Pyarali - - * ace/Strategies_T.cpp (connect_svc_handler): When using this - method, the user was required to pass us a zero for the - svc_handler. We would either find them a non-busy one, or will - create a new one. - - Unfortunately, the svc_handler lookup was taking too long. - Therefore, the following change was made to the - connect_svc_handler algorithm: the user is now allowed to pass - in the svc_handler that they used last as a "hint". The - algorithm first checks to see if the "hint" svc_handler is - connected to the correct address and is recyclable. If it is, - then it recycles the "hint" svc_handler and gives it back to the - user. This should improve the lookups in most cases. - - * ace/Svc_Handler.cpp (recycling_act): Added accessor to get the - . - - * tests/Conn_Test.cpp (idle): Added method so that we can tell - when a Svc_Handler is being set to idle. Also changed the test - so that it can use the new "hint" mechanism in the cached - connector. - -Wed Aug 5 16:12:34 1998 Nanbor Wang - - * ace/Log_Msg.cpp: Replaced usage of ACE_OS::thr_* with - ACE_Thread::*. Thanks to Arturo Montes - for sending the patches. - -Wed Aug 5 11:07:12 1998 Douglas C. Schmidt - - * ace/Service_Manager: Cleaned up the documentation and formatting - a bit. - - * ace/Message_Queue_T.i: Changed the computation of is_empty_i() - so that it's - - return this->cur_bytes_ <= this->low_water_mark_ || this->cur_count_ <= 0; - - i.e., we use an || rather than a &&. Thanks to Umar for - reporting this. - - * ace/Message_Queue_T.i: Changed the computation of is_empty_i() so - that it doesn't consider the queue to be empty unless the - cur_bytes_ <= the low_water_mark_ (which defaults to 0 so that - no existing code is affected). This change makes it possible - for producer/consumer threading applications to avoid the "silly - window syndrome." Thanks to Umar Syyid for - suggesting this. - -Wed Aug 05 00:10:27 1998 Irfan Pyarali - - * ace/OS.i (strnstr (both Unicode and Multibyte versions)): - * ace/SString.cpp (strstr): - Fixed "off by one error" in searching algorithm. Thanks to - Byron Harris for pointing this out. - - * tests/SString_Test.cpp (main): Added new test cases. - -Tue Aug 4 21:56:16 1998 Nanbor Wang - - * tests/TSS_Test.cpp: - * examples/Thread/thread_specific.cpp: Replaced ACE_OS::thr_* with - ACE_Thread::*. Thanks to Arturo Montes - for sending the patches. - -Tue Aug 4 18:44:54 1998 Gonzalo Diethelm - - * ACE-INSTALL.html: - Updated the file to recommend the creation of config.h as a - regular file that includes the appropriate platform config file, - instead of setting it to be a symlink. This is more flexible and - allows the user to redefine some of the ACE configuration - parameters. - - * ace/config-linux-common.h: - As an example of the above, now the user can #define - ACE_HAS_IP_MULTICAST in his config.h file to 0, and he won't be - using multicast under linux. This is clearer than having to edit - the config-linux-common.h file, which will now respect the user's - settings (if any).. - -Tue Aug 4 17:39:12 1998 Steve Huston - - * ace/ACE_Library.{mak mdp}: Added TP_Reactor.cpp to the project. - - * tests/Aio_Platform_Test.cpp: Don't try to sysconf() for the AIO - values if there's no chance of AIO on the system (_POSIX_ASYNC_IO - not defined at compile time). - - * examples/OS/Process/Process.dsp: Link against ace.lib for Release, - aced.lib for Debug (these were reversed). - -Tue Aug 4 12:09:51 1998 Douglas C. Schmidt - - * ace/OS.h: Clarified the fact that the ACE_DEFAULT_MUITCAST_ADDR - must be within the range for host group addresses: 224.0.0.0 to - 239.255.255.255. Thanks to Christa Schwanninger - for reporting this. - -Tue Aug 04 11:01:18 1998 Nanbor Wang - - * bin/GenExportH.BAT: Moved from TAO/TAO_IDL/. - - * ace/Token.{h,cpp} (signal_all_threads): Added this method which - changes the return values of all acquire method to 2. The last - thread waiting for the token will reset the signal state - (therefore, there's NO cancel_signal_all_threads method.) - (shared_acquire): Return 2 if the token is signaled after - acquiring the token successfully. - (release): If the token is signaled and there's no other thread - waiting to acquire the token, reset the signal state. - - * ace/TP_Reactor.{h,i,cpp} (wakeup_all_threads): Added - implementation for this virtual function. It "signals" the - token threads are waiting on and wake them up by notifying the - reactor. - (handle_events): Check to see if the reactor token is signaled - after acquiring it. If the the token is signaled, it will not - proceed to handle events (by calling select) but instead return - successfully. This allow the thread the chance to check if it's - time to shut down the event loop. - -Mon Aug 3 17:53:48 1998 Gonzalo Diethelm - - * performance-tests/Makefile: - * performance-tests/Misc/basic_func.cpp: - * performance-tests/Misc/basic_perf.cpp: - * performance-tests/Misc/childbirth_time.cpp: - * performance-tests/Misc/context_switch_time.cpp: - * performance-tests/Misc/preempt.cpp: - * performance-tests/Misc/test_mutex.cpp: - * performance-tests/Misc/test_naming.cpp: - * performance-tests/Misc/test_singleton.cpp: - * performance-tests/Synch-Benchmarks/Benchmark_Base.cpp: - * performance-tests/Synch-Benchmarks/Benchmark_Performance.cpp: - * performance-tests/Synch-Benchmarks/Options.cpp: - * performance-tests/Synch-Benchmarks/Performance_Test.cpp: - * performance-tests/Synch-Benchmarks/condb_test.cpp: - * performance-tests/Synch-Benchmarks/conds_test.cpp: - * performance-tests/Synch-Benchmarks/context_test.cpp: - * performance-tests/Synch-Benchmarks/memory_test.cpp: - * performance-tests/Synch-Benchmarks/mutex_test.cpp: - * performance-tests/Synch-Benchmarks/pipe_proc_test.cpp: - * performance-tests/Synch-Benchmarks/pipe_thr_test.cpp: - * performance-tests/Synch-Benchmarks/recursive_lock_test.cpp: - * performance-tests/Synch-Benchmarks/rwrd_test.cpp: - * performance-tests/Synch-Benchmarks/rwwr_test.cpp: - * performance-tests/Synch-Benchmarks/sema_test.cpp: - * performance-tests/Synch-Benchmarks/synch_driver.cpp: - * performance-tests/Synch-Benchmarks/sysvsema_test.cpp: - * performance-tests/Synch-Benchmarks/token_test.cpp: - * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: - * performance-tests/TTCP/C/new-ttcp.cpp: - * performance-tests/TTCP/ORBeline/ttcp_i.cpp: - * performance-tests/TTCP/Orbix/ttcpC.cpp: - * performance-tests/TTCP/Orbix/ttcpS.cpp: - * performance-tests/TTCP/Orbix/ttcp_i.cpp: - * performance-tests/UDP/udp_test.cpp: - Added ACE_RCSID to these files. - -Sun Aug 2 19:43:04 1998 Darrell Brunsch - - * tests/Reactor_Performance_Test.cpp: Made a change suggested by - Irfan to allow this test to work in Windows 95. - -Sat Aug 1 20:35:32 1998 Douglas C. Schmidt - - * ace: - include/makeinclude: - Added new config/platform files for SCO. These files enable the - following: - - - TAO_IDL work newly in SCO OpenServer. - - Fixed a compilation problem with EventService in TAO. - - Fixed a problem with ACE and TAO shared libraries. - - Some test with TSS_Emulation and recent changes in Thread_Manager. - - Thanks to Arturo for these changes. - -Sat Aug 01 13:34:12 1998 Irfan Pyarali - - * ace/OS.i (flock_wrlock): LockFileEx() and UnLockFileEx() are not - implemented on Win32. Therefore, the flock methods were changed - to use the non-Ex versions on Win95. Thanks to XuYifeng - for pointing this out. - - While making the changes, I found that there were a couple bugs - in the code: (a) the parameter was being ignored and - (b) the adjustment for == 0 was incorrect. I think I have - fixed both of these also in ACE_OS::adjust_flock_params(). - - One last thing: I changed flock_unlock() to use UnLockFile() - instead of UnLockFileEx(). UnLockFileEx() is also not supported - on Win95. Hopefully, it is ok to lock with LockFileEx() and - unlock with UnLockFile() instead of UnLockFileEx(). - - * ace/OS.cpp (pread): Changed bytes_written to bytes_read. - -Fri Jul 31 23:47:50 1998 Carlos O'Ryan - - * bin/auto_compile: - We now run several on-button tests in TAO, though it is still - hard to detect any errors. - -Fri Jul 31 21:33:22 1998 Douglas C. Schmidt - - * ace/Select_Reactor.cpp (open): Changed the code to ignore the - return value from ACE::set_handle_limit(). Thanks to Zheng Han - for reporting this and to Arturo for - suggesting the fix. - - * ace/ARGV.cpp: Enhanced the implemenation of string_to_array() so - that it should always work correctly even if there are a large - number of bytes in the original buf string. - - * ace/ARGV.cpp: Renamed string_to_array() to string_to_argv(), - which is more intuitive. - - * ace/OS.h: Added a new macro called ACE_DEFAULT_ARGV_BUFSIZ, - which is used as the default size of all the "argv" contents in - ACE_ARGV. This defaults to 4 kbytes. - -Fri Jul 31 19:55:10 1998 Gonzalo Diethelm - - * netsvcs/clients/Logger/direct_logging.cpp: - * netsvcs/clients/Logger/indirect_logging.cpp: - * netsvcs/clients/Naming/Client/Client_Test.cpp: - * netsvcs/clients/Naming/Client/main.cpp: - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: - * netsvcs/clients/Naming/Dump_Restore/createfile.cpp: - * netsvcs/clients/Naming/Dump_Restore/main.cpp: - * netsvcs/clients/Tokens/collection/collection.cpp: - * netsvcs/clients/Tokens/collection/rw_locks.cpp: - * netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp: - * netsvcs/clients/Tokens/invariant/invariant.cpp: - * netsvcs/clients/Tokens/manual/manual.cpp: - * netsvcs/clients/Tokens/mutex/test_mutex.cpp: - * netsvcs/clients/Tokens/rw_lock/rw_locks.cpp: - * netsvcs/lib/Base_Optimizer.cpp: - * netsvcs/lib/Client_Logging_Handler.cpp: - * netsvcs/lib/Log_Message_Receiver.cpp: - * netsvcs/lib/Logging_Strategy.cpp: - * netsvcs/lib/Name_Handler.cpp: - * netsvcs/lib/Server_Logging_Handler.cpp: - * netsvcs/lib/Server_Logging_Handler_T.cpp: - * netsvcs/lib/TS_Clerk_Handler.cpp: - * netsvcs/lib/TS_Server_Handler.cpp: - * netsvcs/lib/Token_Handler.cpp: - * netsvcs/servers/main.cpp: - Added ACE_RCSID to these files. - -Fri Jul 31 19:15:58 1998 Irfan Pyarali - - * ace/OS.cpp (pwrite and pread): There were many bugs in these two - methods. - - - It was assumed that it is ok to call WriteFile/ReadFile with - an OVERLAPPED structure. This is not true on Windows95. - Therefore, code had to be added to make sure that on - Windows95, WriteFile and ReadFile were called without an - OVERLAPPED struct. - - - We were assuming that if we used the OVERLAPPED struct, the - file pointer would not move. It turns out that the OVERLAPPED - struct has nothing with whether the file pointer moves or not. - It has to do with whether the file was opened with - FILE_FLAG_OVERLAPPED or not. Since it is not possible to - figure whether the file handle we got was opened with this - flag or not, we have to program defensively and reset the file - pointer in any case. - - - Also the !ACE_HAS_P_READ_WRITE implementation was not - restoring the file pointer to its original position. This was - also fixed. - -Fri Jul 31 18:33:39 1998 Gonzalo Diethelm - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp: - * apps/Gateway/Gateway/Config_Files.cpp: - * apps/Gateway/Gateway/Connection_Handler.cpp: - * apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp: - * apps/Gateway/Gateway/Connection_Handler_Connector.cpp: - * apps/Gateway/Gateway/Event_Channel.cpp: - * apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp: - * apps/Gateway/Gateway/File_Parser.cpp: - * apps/Gateway/Gateway/Gateway.cpp: - * apps/Gateway/Gateway/Options.cpp: - * apps/Gateway/Gateway/gatewayd.cpp: - * apps/Gateway/Peer/Options.cpp: - * apps/Gateway/Peer/Peer.cpp: - * apps/Gateway/Peer/peerd.cpp: - * apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.cpp: - * apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.cpp: - * apps/Orbix-Examples/Event_Comm/Consumer/consumer.cpp: - * apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.cpp: - * apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.cpp: - * apps/Orbix-Examples/Event_Comm/Supplier/supplier.cpp: - * apps/Orbix-Examples/Event_Comm/libsrc/Event_CommC.cpp: - * apps/Orbix-Examples/Event_Comm/libsrc/Event_CommS.cpp: - * apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.cpp: - * apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.cpp: - * apps/Orbix-Examples/Logger/Logger.cpp: - * apps/Orbix-Examples/Logger/client.cpp: - * apps/Orbix-Examples/Logger/loggerS.cpp: - * apps/Orbix-Examples/Logger/logger_i.cpp: - * apps/Orbix-Examples/Logger/server.cpp: - Added ACE_RCSID to these files. - -Fri Jul 31 17:50:01 1998 Gonzalo Diethelm - - * ace/TP_Reactor.cpp: - Added ACE_RCSID to this file, and all the .cpp files in examples, - listed below. - - * examples/ASX/CCM_App/CCM_App.cpp: - * examples/ASX/CCM_App/SC_Client.cpp: - * examples/ASX/CCM_App/SC_Server.cpp: - * examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp: - * examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp: - * examples/ASX/Event_Server/Event_Server/Options.cpp: - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: - * examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp: - * examples/ASX/Event_Server/Event_Server/event_server.cpp: - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: - * examples/ASX/Message_Queue/bounded_buffer.cpp: - * examples/ASX/Message_Queue/buffer_stream.cpp: - * examples/ASX/Message_Queue/priority_buffer.cpp: - * examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp: - * examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp: - * examples/ASX/UPIPE_Event_Server/Options.cpp: - * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp: - * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: - * examples/ASX/UPIPE_Event_Server/event_server.cpp: - * examples/CORBA/Test_i.cpp: - * examples/CORBA/client.cpp: - * examples/CORBA/server.cpp: - * examples/Connection/blocking/SPIPE-acceptor.cpp: - * examples/Connection/blocking/SPIPE-connector.cpp: - * examples/Connection/blocking/test_spipe_acceptor.cpp: - * examples/Connection/blocking/test_spipe_connector.cpp: - * examples/Connection/misc/Connection_Handler.cpp: - * examples/Connection/misc/test_upipe.cpp: - * examples/Connection/non_blocking/CPP-acceptor.cpp: - * examples/Connection/non_blocking/CPP-connector.cpp: - * examples/Connection/non_blocking/test_lsock_acceptor.cpp: - * examples/Connection/non_blocking/test_lsock_connector.cpp: - * examples/Connection/non_blocking/test_sock_acceptor.cpp: - * examples/Connection/non_blocking/test_sock_connector.cpp: - * examples/Connection/non_blocking/test_spipe_acceptor.cpp: - * examples/Connection/non_blocking/test_spipe_connector.cpp: - * examples/Connection/non_blocking/test_tli_acceptor.cpp: - * examples/Connection/non_blocking/test_tli_connector.cpp: - * examples/IOStream/client/iostream_client.cpp: - * examples/IOStream/server/iostream_server.cpp: - * examples/IPC_SAP/DEV_SAP/reader/reader.cpp: - * examples/IPC_SAP/DEV_SAP/writer/writer.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp: - * examples/IPC_SAP/FILE_SAP/client.cpp: - * examples/IPC_SAP/SOCK_SAP/C-inclient.cpp: - * examples/IPC_SAP/SOCK_SAP/C-inserver.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp: - * examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp: - * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp: - * examples/IPC_SAP/SPIPE_SAP/NPClient.cpp: - * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp: - * examples/IPC_SAP/SPIPE_SAP/client.cpp: - * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp: - * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp: - * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp: - * examples/IPC_SAP/SPIPE_SAP/producer_read.cpp: - * examples/IPC_SAP/SPIPE_SAP/server.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-client.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-server.cpp: - * examples/IPC_SAP/TLI_SAP/db-client.cpp: - * examples/IPC_SAP/TLI_SAP/db-server.cpp: - * examples/IPC_SAP/TLI_SAP/ftp-client.cpp: - * examples/IPC_SAP/TLI_SAP/ftp-server.cpp: - * examples/IPC_SAP/UPIPE_SAP/ex1.cpp: - * examples/IPC_SAP/UPIPE_SAP/ex2.cpp: - * examples/IPC_SAP/UPIPE_SAP/ex3.cpp: - * examples/Log_Msg/test_log_msg.cpp: - * examples/Logger/Acceptor-server/server_loggerd.cpp: - * examples/Logger/client/logging_app.cpp: - * examples/Logger/simple-server/Logging_Acceptor.cpp: - * examples/Logger/simple-server/Logging_Handler.cpp: - * examples/Logger/simple-server/server_loggerd.cpp: - * examples/Map_Manager/test_hash_map_manager.cpp: - * examples/Mem_Map/IO-tests/IO_Test.cpp: - * examples/Mem_Map/IO-tests/test_io.cpp: - * examples/Mem_Map/file-reverse/file-reverse.cpp: - * examples/Misc/test_XtReactor1.cpp: - * examples/Misc/test_XtReactor2.cpp: - * examples/Misc/test_dump.cpp: - * examples/Misc/test_get_opt.cpp: - * examples/Misc/test_profile_timer.cpp: - * examples/Misc/test_read_buffer.cpp: - * examples/Misc/test_set.cpp: - * examples/Misc/test_sstring.cpp: - * examples/Misc/test_trace.cpp: - * examples/Naming/test_multiple_contexts.cpp: - * examples/Naming/test_non_existent.cpp: - * examples/Naming/test_open.cpp: - * examples/Naming/test_writers.cpp: - * examples/OS/Process/imore.cpp: - * examples/OS/Process/process.cpp: - * examples/Reactor/Dgram/CODgram.cpp: - * examples/Reactor/Dgram/Dgram.cpp: - * examples/Reactor/FIFO/client.cpp: - * examples/Reactor/FIFO/server.cpp: - * examples/Reactor/Misc/notification.cpp: - * examples/Reactor/Misc/pingpong.cpp: - * examples/Reactor/Misc/test_demuxing.cpp: - * examples/Reactor/Misc/test_event_handler_t.cpp: - * examples/Reactor/Misc/test_reactors.cpp: - * examples/Reactor/Misc/test_signals_1.cpp: - * examples/Reactor/Misc/test_signals_2.cpp: - * examples/Reactor/Misc/test_time_value.cpp: - * examples/Reactor/Misc/test_timer_queue.cpp: - * examples/Reactor/Multicast/Log_Wrapper.cpp: - * examples/Reactor/Multicast/client.cpp: - * examples/Reactor/Multicast/server.cpp: - * examples/Reactor/Ntalker/ntalker.cpp: - * examples/Reactor/Proactor/test_multiple_loops.cpp: - * examples/Reactor/Proactor/test_proactor.cpp: - * examples/Reactor/Proactor/test_proactor_with_aio.cpp: - * examples/Reactor/Proactor/test_timeout.cpp: - * examples/Reactor/ReactorEx/test_abandoned.cpp: - * examples/Reactor/ReactorEx/test_apc.cpp: - * examples/Reactor/ReactorEx/test_console_input.cpp: - * examples/Reactor/ReactorEx/test_directory_changes.cpp: - * examples/Reactor/ReactorEx/test_exceptions.cpp: - * examples/Reactor/ReactorEx/test_multithreading.cpp: - * examples/Reactor/ReactorEx/test_network_events.cpp: - * examples/Reactor/ReactorEx/test_prerun_state_changes.cpp: - * examples/Reactor/ReactorEx/test_registration.cpp: - * examples/Reactor/ReactorEx/test_registry_changes.cpp: - * examples/Reactor/ReactorEx/test_removals.cpp: - * examples/Reactor/ReactorEx/test_talker.cpp: - * examples/Reactor/ReactorEx/test_timeouts.cpp: - * examples/Reactor/ReactorEx/test_window_messages.cpp: - * examples/Registry/test_registry_iterator.cpp: - * examples/Registry/test_registry_update.cpp: - * examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp: - * examples/Service_Configurator/IPC-tests/server/server_test.cpp: - * examples/Service_Configurator/Misc/Timer_Service.cpp: - * examples/Service_Configurator/Misc/main.cpp: - * examples/Shared_Malloc/Malloc.cpp: - * examples/Shared_Malloc/Options.cpp: - * examples/Shared_Malloc/test_malloc.cpp: - * examples/Shared_Malloc/test_multiple_mallocs.cpp: - * examples/Shared_Malloc/test_persistence.cpp: - * examples/Shared_Memory/test_MM.cpp: - * examples/Shared_Memory/test_SV.cpp: - * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp: - * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp: - * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp: - * examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp: - * examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp: - * examples/Threads/auto_event.cpp: - * examples/Threads/barrier1.cpp: - * examples/Threads/barrier2.cpp: - * examples/Threads/cancel.cpp: - * examples/Threads/future1.cpp: - * examples/Threads/future2.cpp: - * examples/Threads/manual_event.cpp: - * examples/Threads/process_manager.cpp: - * examples/Threads/process_mutex.cpp: - * examples/Threads/process_semaphore.cpp: - * examples/Threads/reader_writer.cpp: - * examples/Threads/recursive_mutex.cpp: - * examples/Threads/task_five.cpp: - * examples/Threads/task_four.cpp: - * examples/Threads/task_one.cpp: - * examples/Threads/task_three.cpp: - * examples/Threads/task_two.cpp: - * examples/Threads/thread_manager.cpp: - * examples/Threads/thread_pool.cpp: - * examples/Threads/thread_specific.cpp: - * examples/Threads/token.cpp: - * examples/Threads/tss1.cpp: - * examples/Threads/tss2.cpp: - * examples/Threads/wfmo.cpp: - * examples/Timer_Queue/Async_Timer_Queue_Test.cpp: - * examples/Timer_Queue/Driver.cpp: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp: - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: - * examples/Timer_Queue/main_async.cpp: - * examples/Timer_Queue/main_reactor.cpp: - * examples/Timer_Queue/main_thread.cpp: - -Fri Jul 31 12:07:16 1998 Irfan Pyarali - - * ace/XtReactor.cpp (XtWaitForMultipleEvents): The first select() - is made with the correct width. In XtAppProcessEvent(), the - descriptor set may change, so the underlying handle_max may also - have changed. The second select() is made with an incorrect - value for the width. The solution is to reinitialize width - before calling select() again. Thanks to J-M Strauss - for suggesting this change. - -Fri Jul 31 11:18:24 1998 Steve Huston - - * ACE-INSTALL.html: Removed the direction to set global include/library - paths in MSVC 4.2. - -Fri Jul 31 08:23:14 1998 Douglas C. Schmidt - - * examples/Misc/test_XtReactor[12].cpp: Updated these files so - they will work correctly with the "new" Reactor structure. Boy, - it's been a long time since anyone actually tried to use this - stuff... ;-) Thanks to J-M Strauss for - reporting this. - -Thu Jul 30 21:25:31 1998 Nanbor Wang - - * ace/Svc_Conf_y.cpp: This file didn't get patched with our - routine patch. Applied $ACE_ROOT/Svc_Conf_y.cpp.diff manually. - This change eliminates some warnings from g++. - -Thu Jul 30 19:03:12 1998 Douglas C. Schmidt - - * examples/Timer_Queue/Thread_Timer_Queue_Test.h: Changed the type - to class Thread_Timer_Queue_Test_Driver from - Timer_Queue_Test_Driver to work around a bug with MSVC++. Thanks to - Gonzo for pointing this out. - - * examples/Connection/blocking/SPIPE-{connector,acceptor}.cpp: - Added #include "ace/Proactor.h". Thanks to Gonzo for reporting - this. - -Thu Jul 30 17:54:14 1998 Nanbor Wang - - * tests/test_config.h: Added /**/ between #include and - to avoid MSVC warnings. - - * tests/WinCE/ce_tests.dsw: Renamed project - Message_Queue_Notifications_Test to MsgQueue_Notifications_Test. - - * tests/WinCE/Reactor_Performance_Test.dsp: This project file was - somehow missing. - - * tests/TSS_Test.cpp: - * tests/Reader_Writer_Test.cpp: - * tests/Message_Queue_Test.cpp: Added numerous ASYS_TEXT macros to - make sure we use the right strings on CE. - -Thu Jul 30 14:56:59 1998 Gonzalo A. Diethelm - - * ace/ACE.h: - * ace/ACE.cpp: - * ace/Event_Handler.h: - * ace/Event_Handler.cpp: - Moved the following static functions: - - register_stdin_handler - remove_stdin_handler - read_adapter - - from class ACE to class ACE_Event_Handler. That breaks a - dependency from ACE to higher-level classes. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: - * netsvcs/clients/Naming/Client/Client_Test.cpp: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp: - * examples/Timer_Queue/Async_Timer_Queue_Test.dsp: - * examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp: - * examples/Timer_Queue/Thread_Timer_Queue_Test.dsp: - * examples/Reactor/Ntalker/ntalker.cpp: - * examples/Reactor/Misc/test_demuxing.cpp: - * examples/Reactor/Misc/notification.cpp: - * examples/Connection/blocking/SPIPE-connector.cpp: - * examples/ASX/UPIPE_Event_Server/event_server.cpp: - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: - * examples/ASX/Event_Server/Event_Server/event_server.cpp: - * apps/Gateway/Peer/Peer.cpp: - * apps/Gateway/Gateway/Gateway.cpp: - All these were modified by the above change. - - * ace/OS.h: - * ace/OS.i: - Added a strnew function that works as strdup but uses new instead - of malloc to allocate memory. - -Thu Jul 30 16:54:20 1998 Douglas C. Schmidt - - * ACE version 4.5.26 released. - -Thu Jul 30 13:01:12 1998 Douglas C. Schmidt - - * ace/Task.h (ACE_Task_Base): Changed the spelling of - ACE_Task_Exit to ACE_Thread_Exit, which is correct. - Thanks to Daniel Winder for - reporting this. - -Thu Jul 30 08:43:41 1998 Steve Huston - - * tests/tests.(mdp mak): Made include and library paths relative. - -Thu Jul 30 02:22:49 1998 Nanbor Wang - - * ace/Synch_T.cpp (ts_init): Casted away constness of key_. - Changed to cast away constness of the pointer to once_. - -Thu Jul 30 01:12:30 1998 Douglas C. Schmidt - - * ace/TP_Reactor.i (notify_handle): Added an ASYS_TEXT where it - was missing. Thanks to Dieter Quehl for reporting this. - - * ace/Synch_T.cpp: It wasn't possible to call ts_object() to set - an initial zero pointer value. The solution is to give - ts_object() the same ability to initialize the key as ts_get(). - I also factored out some common code into a new method called - ts_init(). Thanks to Bob McWhirter for - reporting this. - -Wed Jul 29 23:58:04 1998 Douglas C. Schmidt - - * examples/Reactor/Ntalker: Added a README file and made some - stylistic changes to the ntalker.cpp example. - -Wed Jul 29 18:38:17 1998 Douglas C. Schmidt - - * ACE version 4.5.25 released. - -Wed Jul 29 17:46:21 1998 Douglas C. Schmidt - - * ace/Task_T.h: Updated documentation to explain that - ACE_Time_Values are ABSOLUTE rather than relative. Thanks to - James Johnson for reporting this. - -Wed Jul 29 16:05:16 1998 Carlos O'Ryan - - * bin/Process_Unix.pm: - Use SIGTERM instead of SIGHUP to kill a process, it is the Right - Thing and SIGHUP will not work in some cases because it is usual - to catch this signal. - -Wed Jul 29 14:04:49 1998 Irfan Pyarali - - * ace/Asynch_Acceptor.cpp (open): Added - as an extra parameter to - open(). is the number of - asynchronous accepts that are started at the end of . If - is -1, then - is set to and hence - number of asynchronous accepts are started. - - (get_handle): New method to get the underlying handle. - - (set_handle): New method to set the underlying listen handle. It - is the user's responsibility to make sure that the old listen - handle has been appropriately closed and the all outstanding - asynchronous operations have either completed or have been - canceled on the old listen handle. - -Wed Jul 29 12:49:09 1998 Nanbor Wang - - * ace/Makefile (FILES): Added TP_Reactor to the build list. - Updated dependency. - - * ace/TP_Reactor.{h,i} (handle_events,notify_handler): Added two - dummy methods to avoid warnings from SunCC. Thanks to Carlos - for noticing this. - -Wed Jul 29 09:41:23 1998 David L. Levine - - * ace/config-linux-common.h: added #define - ACE_DEFAULT_SELECT_REACTOR_SIZE 256 so that the - ACE_Select_Reactor works with this fix: - - if (size > (size_t) ACE::max_handles ()) - return ACE::set_handle_limit (size); - - On Linux (2.0.34), only root can set RLIMIT_NOFILE above 256. - -Wed Jul 29 04:19:05 1998 Nanbor Wang - - * Integrate TP_Reactor into ACE. Major framwork designed by - Irfan. Here's his changelog: - - * ace/TP_Reactor.h (ACE_TP_Reactor): One of the short comings of - the Select_Reactor in ACE was that it did not support a thread - pool based event dispatching model, similar to the one in - WFMO_Reactor. In Select_Reactor, only thread can be blocked - in handle_events() at any given time. - - A new Reactor has been added to ACE that removes this - short-coming. TP_Reactor is a specialization of Select - Reactor to support thread-pool based event dispatching. This - Reactor takes advantage of the fact that events reported by - select() are persistent if not acted upon immediately. It - works by remembering the event handler that just got - activated, releasing the internal lock (so that some other - thread can start waiting in the event loop) and then - dispatching the event handler outside the context of the - Reactor lock. - - This Reactor is best suited for situations when the callbacks - to event handlers can take arbitrarily long and/or a number of - threads are available to run the event loops. - - Note that callback code in Event Handlers - (e.g. Event_Handler::handle_input) does not have to be - modified or made thread-safe for this Reactor. This is - because an activated Event Handler is suspended in the Reactor - before the upcall is made and resumed after the upcall - completes. Therefore, one Event Handler cannot be called by - multiple threads simultaneously. - - * ace/Reactor.cpp (ACE_Reactor): - ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL can be used to make the - TP_Reactor the default Reactor implementation that will be - used by ACE_Reactor. - - I still need to add the reliable shutdown method and a - TP_Reactor_Test. - - * ace/Select_Reactor.{h,i,cpp} (renew): Moved decision of renew - supression from ACE_Select_Reactor_Notify::handle_input to this - method, which is a more appropriate place. - - * ace/Token.h (ACE_Token): Added more comprehensive comments about - the recent changes of reader/writer semantic. - -Tue Jul 28 12:36:18 1998 Irfan Pyarali - - * ace/Service_Config.cpp (~ACE_Service_Config): Removed the call - to ACE_Service_Config::close () from the destructor. This will - be called by the Object Manager upon destruction. - -Tue Jul 28 11:34:15 1998 Nanbor Wang - - * ace/OS.{h,i} (strpbrk): Added a const wchar_t version of this - function. Thanks to Ivan Murphy - for providing the fix. - -Tue Jul 28 09:52:08 1998 David L. Levine - - * ace/Thread_Manager.cpp (exit): only declare local close_handle - if ACE_USE_ONE_SHOT_AT_THREAD_EXIT. (ACE_Thread_Descriptor): - reordered initializers to match declaration order. - - * ace/Dynamic.cpp,Thread_Manager.cpp: moved - ACE_TSS_Singleton instantiation - from Thread_Manager.cpp to Dynamic.cpp. - -Mon Jul 27 16:31:27 1998 Arturo Montes - - * ace/Thread_Manager.{h,i,cpp}: - * ace/Log_Msg.cpp: The Thread_Manager::at_exit method now provides a - list of at_exit functions to be invoked to at thread termination - code. If you want to maintain previous compatibility use - ACE_USE_ONE_SHOT_AT_THREAD_EXIT. The new code maintaing - compatibility with the old code, ACE_Task::svc_run has not been - altered. - - We resolve a problem with ACE_TSS_cleanup, some platform - using Thread_Manager could be experimenting memory corruption because - of ACE_TSS_cleanup was being invoked before Thread_Manager exit - code. Now, if ACE_TSS_cleanup is called before of Thread_Manager - exit code, ACE_TSS_cleanup delegate ACE_Log_Msg delete instance - to Thread_Descriptor. - - Really, at_exit code is implemented in ACE_Thread_Descriptor, I - strongly recommend use at_exit code from Thread_Descriptor, - however in ACE_Thread_Manager we provide at_exit hook. - - Use of at_exit(void* object,ACE_CLEANUP_FUNC cleanup_hook,void* - param) is deprecated. We maitain it for compatibility and it - will be forever, however if you want implement new at_exit hook, - look into Thread_Manager.h and specialize ACE_At_Thread_Exit - class for your needs. - - If you want to allocate an ACE_At_Thread_Exit hook in stack, you - can do it. The at_exit code use at_exit overloading to take care - of this. Equally dynamic creation of at_exit hook is supported - too. - -Mon Jul 27 14:25:15 1998 Chris Gill - - * tests/Dynamic_Priority_Test.cpp: Changed C-Style casts to - ACE_static_casts, documented argument structure members - -Mon Jul 27 12:23:55 1998 Douglas C. Schmidt - - * ace/Select_Reactor.cpp (open): Changed a erroneous comparison - to - - if (size > (size_t) ACE::max_handles ()) - return ACE::set_handle_limit (size); - - Thanks to Avi Nash for reporting this. - -Sat Jul 25 20:26:21 1998 Steve Huston - - * ace/SPIPE_Acceptor.(h cpp): Modified Win32 part to start the - ConnectNamedPipe at open() time, in overlapped mode. Now also - processes the timeout in accept(), if specified. - -Sat Jul 25 16:18:30 1998 Carlos O'Ryan - - * ace/Malloc_T.i (addr): - Sun/CC does not like a reinterpret cast here, but only when T is - a char[20]. Use a couple of static casts and added a comment. - -Sat Jul 25 11:34:25 1998 Douglas C. Schmidt - - * ace/Typed_SV_Message_Queue.i (send): Fixed this call to use a - const cast AND a reinterpret cast. Thanks to David Levine for - reporting this. - -Fri Jul 24 23:14:09 1998 Douglas C. Schmidt - - * examples/Threads/thread_specific.cpp (cleanup): Added an - ACE_reinterpret_cast(). Thanks to John Mulhern - <9107@mn3.lawson.lawson.com> for this. - - * ace/Typed_SV_Message_Queue.i: Added some necessary - ACE_reinterpret_cast()s. Thanks to John Mulhern - <9107@mn3.lawson.lawson.com> for this. - - * ace/Malloc_T.i (addr): Changed (T *) cast to - ACE_reinterpret_cast(). Thanks to John Mulhern - <9107@mn3.lawson.lawson.com> for this. - - * ace/SOCK_Dgram_Bcast.cpp: Added an ACE_reinterpret_cast() macro - to make the HP/UX 11 C++ compiler happy. Thanks to John Mulhern - <9107@mn3.lawson.lawson.com> for this. - - * ace/config-hpux11.h: Added ACE_HAS_BROKEN_XTI_MACROS and - ACE_HAS_SIGISMEMBER_BUG. - - * ace/OS.i (sigismember): Sigismember works correctly in most - respects but the Sigset_Ops_Test tests the sigismember function - with an out-of-range signal number expecting it to fail with a - minus one result. On HPUX 11.0 it doesn't fail; it correctly - reports that the signal is not in the sigset. This happens - because HP, bless their hearts, thought that it should only - return out of range when the signal value was greater than the - capacity of the sigset; if ACE_NSIG is forced to 257 then the - test works as expected. But the real maximum signal is 45. - Added a fix for this courtesy of John Mulhern - <9107@mn3.lawson.lawson.com>. - - * ace/OS.h: Added a workaround for broken XTI header files on - HP/UX. Thanks to John Mulhern <9107@mn3.lawson.lawson.com> for - reporting this. - - * tests/Dynamic_Priority_Test.cpp: Reformatted this just a bit. - -Fri Jul 24 21:42:39 1998 David L. Levine - - * ace/OS.{h,cpp},Message_Block.{h,cpp}: renamed ACE_Time_Value::max - to ACE_Time_Value::max_time, because VxWorks #defines max. - - * tests/Message_Queue_Test.cpp: rearranged declarations so - that the test will build on non-threaded platforms. - - * tests/Dynamic_Priority_Test.cpp: changed ACE_MT_SYNCH to - ACE_SYNCH, so that we have a chance of building on non-threaded - platforms. - -Fri Jul 24 15:15:28 1998 Douglas C. Schmidt - - * Updated the manual pages to reflect recent changes. - - * ace/Svc_Conf.h: Change from yyerror (char *) to yyerror (const - char *). - -Fri Jul 24 14:36:30 1998 Chris Gill - - * ace/OS.{cpp, h} (ACE_Time_Value): Added ACE_Time_Value::max, - for the value at the other end of the time spectrum that can - be represented as a normalized ACE_Time_Value (LONG_MAX seconds, - ACE_ONE_SEC_IN_USECS - 1 microseconds). - - * ace/Message_Block.{cpp, h} (ACE_Message_Block): Changed default - parameters so message deadlines default to ACE_Time_Value::max - instead of ACE_Time_Value::zero - this ensures the assigned - static priority order is preserved in a dynamic message queue - if deadlines are not set. - - * ace/Message_Queue_T.{cpp, h} (ACE_Dynamic_Message_Queue): Changed - enqueue_tail and enqueue_head to call overloaded enqueue_prio - instead of static message queue base class methods (fixes bug - EC_Multiple_Test uncovered where a tail-enqueued zero length - message is still seen in the queue by the base class, but the - derived dynamic message queue class thinks the queue is empty) - - * DOC-way.html: added one on chess and sleep - -Fri Jul 24 12:35:12 1998 Nanbor Wang - - * ace/Token.{h,cpp}: Fixed warnings from gcc and SunCC. - -Fri Jul 24 09:05:24 1998 David L. Levine - - * ace/OS.cpp (thr_create): with ACE_HAS_DCE_DRAFT4_THREADS and - ACE_LACKS_SETDETACH (LynxOS and HP/UX 10.x), call - ::pthread_detach () on the newly spawned thread. Only do - it if the THR_DETACHED flag is enabled. - - * ace/Thread_Manager.cpp (join_thr,wait,wait_grp,wait_task): - with ACE_HAS_DCE_DRAFT4_THREADS and ACE_LACKS_SETDETACH - (LynxOS and HP/UX 10.x), call ::pthread_detach () on joined - threads. Only do it if the THR_DETACHED flag is not enabled. - - Thanks to Dave Mayerhoefer for diagnosing the - lack of ::pthread_detach () calls in ACE. - -Fri Jul 24 00:39:47 1998 Nanbor Wang - - * ace/ace_dll.dsp (Message_Queue_T.cpp): This file contains - template definitions and should not be included while building - ACE library. - - * ace/config-win32.h (ACE_HAS_NONSTATIC_OBJECT_MANAGER): Use - non-static object manager by default on Win32 (except CE.) This - at least fixed the problem of WSACleanup getting called too late. - - To disable this, define ACE_HAS_NONSTATIC_OBJECT_MANAGER to 0. - -Thu Jul 23 22:17:41 1998 Arturo Montes - - * ace/OS.cpp,Task.cpp,Thread_Manager.cpp: unify the Thread - Adapter use between general ACE threads and threads spawned - with a Thread_Manager. - - With this patch we add a new flag: ACE_USE_THREAD_MANAGER_ADAPTER. - If you set this flag in your config file, ACE will use the - ace_thread_manager_adapter in Thread_Manager, matching the current - behaviour. If you omit this flag, ACE will use ace_thread_adapter. - This change save a lot of source code and will let in the future - incorporate ACE_Thread at_exit. - -Thu Jul 23 15:30:41 1998 Nanbor Wang - - * ace/Token.{h,i,cpp}: On platforms that support timed acquire - semaphores, changed to use semaphores for signaling mechanism - for better performance. - (shared_acquire,renew): Give priority to acquire_write over - acquire_read. - -Thu Jul 23 14:05:20 1998 David L. Levine - - * performance-tests/Misc/context_switch_test.cpp: - helped yield test on VxWorks by timing each yield. - Added half-second delay between outer interations to give - LynxOS (w/ ACE_LACKS_SETDETACH) a chance to cleanup exited threads. - - * ace/config-sunos5.5.h: added support for _POSIX_PTHREAD_SEMANTICS. - If it is #defined, then #define ACE_HAS_PTHREADS_1003_DOT_1C - instead of ACE_HAS_STHREADS. Thanks to Doug Anderson - for investigating this and providing the - update. - - * ace/High_Res_Timer.cpp (elapsed_time (ACE_hrtime_t &nanoseconds)): - simplified the calculation. Thanks to Tom Dobridge - for the fix. - -Wed Jul 22 19:20:43 1998 Irfan Pyarali - - * ace/Proactor.h (ACE_Proactor): Since is a - valid constructor parameter for all platforms, - POSIX_COMPLETION_STRATEGY should be defined for all platforms. - - * ace/Proactor.cpp (ACE_Proactor): Only use the - completion_strategy when ACE_HAS_AIO_CALLS is defined. - - * ace/Asynch_IO.cpp (ACE_Asynch_Result): Only delete - this->aiocb_ptr_ when ACE_HAS_AIO_CALLS is defined. - -Wed Jul 22 17:58:27 1998 Alexander Babu Arulanthu - - * ace/OS.h: Updated the comments. - -Wed Jul 22 17:55:46 1998 Nanbor Wang - - * performance-tests/Synch-Benchmarks/token_test.cpp: A new test. - -Wed Jul 22 17:50:58 1998 Alexander Babu Arulanthu - - * ace/OS.h: Defiend ACE_SIG_AIO to be SIGRTMIN. This is the only - signal used for all the s. - -Wed Jul 22 17:46:45 1998 Alexander Babu Arulanthu - - * ace/Asynch_IO.h,Asynch_IO.cpp Proactor.h Proactor.cpp : - - First round of changes for sigtimedwait () based approach - of completion querying. - - Added one more parameter to the Proactor contructor to - decide the completion strategy for the POSIX implementation, - either control blocks or the RT signals. The default is RT - signals. - - Fixed Transmit file. Proactor's handle_events () is done - with in the ACE_Asynch_Transmit_Handler so that control does not - return to the user's application before the whole file is - transmitted. Otherwise the user's application might start writing - to the same socket and this might change the order of the file - that is being transmitted. - -Wed Jul 22 15:51:48 1998 Nanbor Wang - - * performance-tests/Synch-Benchmarks/Benchmark_Base.h - (Benchmark_Method_Base): Passing the test item into pre_run_test - so the thread can be setup correctly. Duh! - - * performance-tests/Synch-Benchmarks/Performance_Test.{h,cpp} - (pre_run_test): Added code so that it iterates thru test items - in svc.conf properly. Duh**2! - -Wed Jul 22 15:48:25 1998 David L. Levine - - * ACE version 4.5.24 released. - -Wed Jul 22 11:45:44 1998 Alexander Babu Arulanthu - - * tests/Aio_Platform_Test.cpp: Added calls test for - platforms with ACE_HAS_AIO_CALLS defined. - -Wed Jul 22 11:32:33 1998 David L. Levine - - * tests/Dynamic_Priority_Test.cpp: VxWorks only, fixed a few - minor things so that it builds now. - - * ace/config-linux-common.h: added ACE_HAS_GPERF. - -Tue Jul 21 23:09:31 1998 Nanbor Wang - - * performance-tests/Synch-Benchmarks/{Synch_Tests,synch_driver}.dsp: - Updated proejct source files and renamed debug version dll. - - * performance-tests/Synch-Benchmarks/Performance_Test.cpp: Added - ACE_Svc_Export directive. - -Tue Jul 21 20:17:31 1998 Steve Huston - - * ace/ACE_Library.{mdp mak}: Removed ..\STL from include directories. - -Tue Jul 21 12:34:11 1998 Alexander Babu Arulanthu - - * ace/config-lynxos.h: Defined ACE_HAS_AIO_CALLS. - -Mon Jul 20 19:35:21 1998 Steve Huston - - * ace/config-aix-4.1.x.h: Added ACE_LACKS_RLIMIT. Thanks to Zheng - Han for finding this problem. - - * ace/ACE_Library.{mdp mak}: Set up ".." as an include file directory - so that $ACE_ROOT doesn't have to be added to MSVC's global options. - Allows working on more than one ACE version. - - * netsvcs/lib/netsvcs4.{mdp mak}: Made paths to ACE components relative - and made Debug build netsvcsd.dll - this will work with Nanbor's new - DLL search method (from 19-July). - - * netsvcs/servers/servers4.{mdp mak}: - * netsvcs/clients/Logger/Logger.{mdp mak}: - Made paths to ACE components relative. - -Mon Jul 20 11:12:44 1998 David L. Levine - - * ace/Object_Manager.{h,cpp}: added ACE_TSS_BASE_LOCK, to - support ACE_HAS_TSS_EMULATION with ACE_USE_NATIVE_KEYS. - - * include/makeinclude/rules.lib.GNU: (INSTALL): use += to - define INSTALL instead of =, so that applications' INSTALL - won't be overwritten. - - * ace/config-osf1-4.0.h,config-linux-common.h: added - ACE_HAS_GPERF. - -Mon Jul 20 11:06:44 1998 Arturo Montes - - * ace/OS.*: added support for TSS emulation with Pthreads. - It uses one native TSS key for its internal implementation. - All other TSS keys, both within the ACE library and in - applications, use keys managed by ACE. - To enable, add these #defines to your config.h: - #define ACE_HAS_TSS_EMULATION - #define ACE_USE_NATIVE_KEYS - -Sun Jul 19 22:21:17 1998 David L. Levine - - * ace/OS.h: added ACE_THROW_SPEC definition. - -Sun Jul 19 00:48:42 1998 Nanbor Wang - - * ace/ACE.cpp (ldfind): Re-enabled searching for *d.dll before - *.dll for debug version of ACE. There was a premature return - error in the logic. This is now the default behavior and has to - be disabled explicitly by defining ACE_DISABLE_DEBUG_DLL_CHECK. - -Sat Jul 18 22:51:59 1998 Douglas C. Schmidt - - * ACE version 4.5.23 released. - -Sat Jul 18 22:48:52 1998 Douglas C. Schmidt - - * There was a typo in the Makefile where CE-status should have - been CE-status.txt. Thanks to Nanbor for fixing this. - -Sat Jul 18 22:14:07 1998 Douglas C. Schmidt - - * ACE version 4.5.22 released. - -Sat Jul 18 21:11:52 1998 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: Added +W829 to suppress - "string literal to char * is deprecated". I was going to fix these - in ACE, but TAO just wore me down... ;-) - -Sat Jul 18 Michael Kircher - - * tests/Upgradable_RW_Test.cpp: Changed the time measurement - completely. Before we meassured end-to-end. Now we meassure - only the time spend in actual doing things. At the end - all the time spend is summarized. - - * tests/Upgradable_RW_Test.h: Added this file, which contains - definitions for the test. - -Sat Jul 18 19:47:45 1998 Darrell Brunsch - - * ace/ACE.cpp: Looks like we are having some trouble with the - loading of *d.dll before *.dll on NT, so it is now disabled - by default (until the problem is solved). To enable use: - ACE_USE_DEBUG_DLL_CHECK. - -Sat Jul 18 13:51:49 1998 Douglas C. Schmidt - - * apps/Makefile: Always compile the gperf directory by default - now. - - * ace/config-sunos5.5.h: Added a new flag called ACE_HAS_GPERF, - which should be enabled if the OS/compiler platform can compile - GPERF. This will determine if we can use perfect hashing in - TAO! - -Sat Jul 18 10:52:49 1998 Gonzalo Diethelm - - * ace/Svc_Conf_l.cpp: - * ace/Svc_Conf_y.cpp: - Move the Id and added ACE_RCSID. - The #line commands changed their line numbers. - - * ace/Svc_Conf.l: - * ace/Svc_Conf.y: - Added an ACE_RCSID, and erased a few white spaces at the end. - - * etc/Svc_Conf_l.cpp.diff: - * etc/Svc_Conf_y.cpp.diff: - Got rid of a couple of RCS Ids that were being "replaced" by the - patches. These were probably a maintenance problem and didn't - really add much. I also cleaned up the patches: there were a - couple of useless replacements (lines with white spaces at the - ends, etc.), and some of the line offsets were wrong (but patch - could still catch them with its fuzz factors). Now the patches - apply cleanly. - -Sat Jul 18 9:00:00 1998 Douglas C. Schmidt - - * DCS: Born 36 years ago, at this moment. Yow, I've now become - a "perfect square" ;-) - -Fri Jul 17 18:30:10 1998 Irfan Pyarali - - * ace/Strategies_T.cpp (connect_svc_handler): The activation of - the newly created handler is moved outside the scope of the lock - of the cached connector. This is necessary to avoid subtle - deadlock conditions with this lock and the Reactor lock. Thanks - to Micheal for finding this race condition. - -Fri Jul 17 13:53:54 1998 Douglas C. Schmidt - - * examples/Threads/barrier2.cpp (ACE_MT_SYNCH>): Cleaned up the - coding style in this example. - - * ace/TTY_IO.cpp (control): Added entries for 300 baud. Thanks to - the ever vigilant Arturo Montes for - reporting this. - -Fri Jul 17 14:51:55 1998 Nanbor Wang - - * Makefile (CONTROLLED_FILES): Added CE-status to distribution. - Thanks to David for reminding this. - -Fri Jul 17 12:48:26 1998 Steve Huston - - * tests/Semaphore_Test.cpp: Removed unused variable, and disabled the - test for platforms with POSIX semaphores since POSIX semaphores - don't do timeouts (which this test stresses). - -Fri Jul 17 07:32:26 1998 David L. Levine - - * Makefile (CONTROLLED_FILES): added ACE-inheritance.{pdf,ps}.gz - to distribution. Thanks to Gabriel Lima for - reporting their absence. Also, added COPYING to distribution. - - * ace/IO_SAP.cpp (enable): removed unreachable break statement. - - * ace/OS.i (sema_wait w/time): on VxWorks and pSoS, subtract - the current time from the time argument to get the relative - time that the systems calls expect. Thanks to Steve Huston - for recommending this change. Also, removed ACE_ADAPT_RETVAL - wrap so that errno isn't disturbed. On VxWorks, convert - S_objLib_OBJ_TIMEOUT errno to ETIME. - - * tests/run_tests.{sh,vxworks}: added Semaphore_Test. - - * ACE-INSTALL.html: updated multicast on Linux discussion. - -Thu Jul 16 18:28:31 1998 Steve Huston - - * ace/OS.i (ACE_OS::sema_wait(ACE_sema_t*, ACE_Time_Value&)): - Changed WinCE version to use time as absolute and update it if - the semaphore is acquired. Changed Win32 version to update the - time if semaphore is acquired. - - * tests/Semaphore_Test.cpp: Added sanity checks for time that the - semaphore waits take and for the updated time values on acquiring - a semaphore. - -Thu Jul 16 15:41:08 1998 Douglas C. Schmidt - - * examples/IPC_SAP/UPIPE_SAP/ex2.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i, - examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i, - examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i, - examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i, - examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i, - examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i, - examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i: - Changed all uses of SIGIO to ACE_SIGIO. - - - * ace/IPC_SAP: Cleaned up the enable() and disable() methods and - documentation so they correctly use the new ACE_* macros - described in the following bullet. - - * ace/OS.h: Added new ACE_SIGIO, ACE_SIGURG, and ACE_CLOEXEC flags - that should be used instead of the SIGIO or SIGURG, etc., in - order to ensure uniqueness. However, legacy code will continue - to work. - - * ace/IO_SAP.cpp: Added new ACE_SIGIO, ACE_SIGURG, and ACE_CLOEXEC - flags that should be used instead of the SIGIO or SIGURG, etc., - in order to ensure uniqueness. However, legacy code will - continue to work. - -Thu Jul 16 15:02:55 1998 Carlos O'Ryan - - * ace/Synch_T.h: Use ACE_Condition_Thread_Mutex instead of - ACE_Condition as the default condition - variable (ACE_SYNCH_CONDITION), this removes some headaches wrt - template instantiation. - - * ace/IPC_SAP.cpp: Added support for the close-on-exec flag. We - use the new ACE_CLOEXEC macro for this. - -Thu Jul 16 12:50:42 1998 Nanbor Wang - - * netsvcs/lib/netsvcs.dsp: - * netsvcs/servers/servers.dsp: Updated DLL names. - - * ace/ACE.cpp (ldfind): Conventionallly, Win32 platforms - distinguish debug version DLL from release version DLLs by - suffixing debug version DLL names with 'd'. (E.g., aced.dll - v.s. ace.dll.) This was causing some problem in managing the - svc.conf files because we need to link the matching DLL with the - executables regarding of how they get compiled. - - I modified the ldfind so that when a debug version ACE is - searching for a DLL file, it will first try to find the debug - version of that DLL by suffixing the name with 'd'. If it can't - be found, it then searches for the name specified. The release - version doesn't try to do this. Now, we can specify only the - "normal" dll names in svc.conf files and ACE can pick up the - right dlls for you without changing svc.conf files. However, - you need to follow the Win32 DLL naming convention as described - above. - - I don't expect this feature to cause any backward compatibility - problem. However, if in the rare event, it does cause you - problem, you can disable it by defining - ACE_DISABLE_DEBUG_DLL_CHECK in your config.h file. Notice that - this change only affects Win32 platforms. - -Thu Jul 16 08:55:48 1998 David L. Levine - - * ace/Dynamic_Service.cpp (instance): removed const-ness - from local void * obj, because the function return value - isn't const. Sun C++ caught this. - - * STL,Makefile: removed STL from ACE, for good this time. There - are no more STL dependencies in TAO's AVStreams. However, if - you still want to use the version of STL that was in ACE, you - can obtain it at www.cs.wustl.edu/~schmidt/ACE_wrappers/STL. - - * ACE-INSTALL.html: added note on enabling multicast on Linux for - TAO's NameService. And, added note on adding a routing table - entry to enable multicast on Linux. Thanks to Nanbor for - discovering that. - -Wed Jul 15 19:00:33 1998 Douglas C. Schmidt - - * ace/Dynamic_Service.cpp (instance): Made the error reporting - less verbose. Thanks to Darrell for suggesting this. In - addition, changed the use of (SERVICE *) to - ACE_reinterpret_cast(). - -Wed Jul 15 16:16:40 1998 Chris Gill - - * ace/Message_Queue_T.cpp: Fixed message/byte counting bugs. - -Wed Jul 15 15:42:44 1998 James C Hu - - * ace/OS.h: Added a copy constructor for ACE_Thread_ID. - -Wed Jul 15 14:33:15 1998 Steve Huston - - * ace/Select_Reactor.cpp: Added some MVS-specific behavior in the - error checking/recovery code so that bad handles are properly - located and removed on MVS Open Edition. Thanks to Chuck Gehr - for his hard work in tracking these down. - -Tue Jul 14 14:00:00 1998 Michael Kircher - - * ace/Select_Reactor.cpp: Changed the handling - of the state_changed flag. Now, it is set to "changed" (=1) - after each run of the event loop. This fixed a nested - upcalls bug, which was caused by overwriting this - flag each time entering the event loop. So that, - when poping one level of the handle_events call - stack information was lost about changes. Now, we - assume that information has changed and - propagate this knowlegde down in the call - stack. No performance overhead is caused by that. - -Tue Jul 14 12:02:15 1998 Carlos O'Ryan - - * examples/IPC_SAP/SOCK_SAP/C-inserver.cpp: - * examples/IPC_SAP/SOCK_SAP/C-inclient.cpp: - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Acceptor.cpp: - * ace/ACE.cpp: - Use ACE_reinterpret_cast in several conversions address type - conversions (like from sockaddr* to sockaddr_in*). - Some compilers (HP/aCC) give a warning if the old C-style cast - operators are used; using the proper cast operator removes the - warning. Thanks to John Mulhern <9107@mn3.lawson.lawson.com> for - pointing out this problem. - -Tue Jul 14 11:26:40 1998 David L. Levine - - * Makefile: added STL back in, because TAO's AVStreams still uses it. - Thanks to Hans Rohnert for - reporting this. - - * ace/Message_Queue_T.cpp (refresh_{late,pending}_queue): removed some - breaks following ACE_ERROR_RETURNs, to avoid compiler warnings about - unreachable statements. - - * tests/Dynamic_Priority_Test.cpp: commented out unused global - FIFO_receipt_order. - - * ace/Basic_Types.h: added ACE_UINT64_LITERAL macro. Thanks to - Nanbor for suggesting it. - - * ace/Stats.cpp: use ACE_UINT64_LITERAL to replace platform-specific - code. - -Mon Jul 13 22:29:20 1998 David L. Levine - - * tests/Dynamic_Priority_Test.cpp: swapped "const" and "static" - qualifiers so that "static" appears first. - (run_performance_test): initialized random_int to 0 to avoid - g++ warning. - - * ace/Message_Queue_T.h: on VxWorks, added forward declaration - of class ACE_Message_Queue_Vx. - - * ace/Message_Queue_T.cpp (create_Vx_message_queue): added - template . - -Mon Jul 13 16:37:07 1998 Chris D. Gill - - * Message_Queue_T.cpp: - refined dynamic queues based on performance test results - -Mon Jul 13 16:35:50 1998 Chris Gill - - * ace/Message_Block.{cpp, h, i} - ace/Message_Queue_T.{cpp, h}: - - Removed automatic deletion of beyond messages, replaced this - with a remove_messages method to be called by an external - "reaper" if at all. Reorganized dynamic message queues - to remove sources of overhead, especially in checking - message status while refreshing the queue: added separate - head and tail pointers for pending, late, and beyond late - protions of queue: only move these pointers, not messages - (except at enqueue). - - * tests/Dynamic_Priority_Test.cpp: - - Added performance tests for static and dynamic queues - which do best case, worst case, and randomized ordering - of messages, presenting each ordering to all queues - and clocking enqueue and dequeue performance. - -Mon Jul 13 11:11:56 1998 Nanbor Wang - - * ace/Svc_Handler.h (ACE_SYNCH_USE>): Changed type of member - to int. Thanks to Zoran Ivanovic - for pointing this out. - -Sun Jul 12 13:25:04 1998 David L. Levine - - * ACE-INSTALL.html: Separated the Linux RedHat 5.1 and 5.0 - discussions into different paragraphs. - -Sat Jul 11 14:25:58 1998 David L. Levine - - * ace/Timer_Queue_Adapter.cpp: moved the ACE_RCSID inside the - ifndef ACE_TIMER_QUEUE_ADAPTERS_C protection, because this - file gets multiply included with g++. - - * ace/config-lynxos.h: added #define ACE_USE_RCS_ID 0. - -Sat Jul 11 03:44:00 1998 Gonzalo Diethelm - - * ace/inc_user_config.h: - Defined an ACE_RCSID macro to add RCS Id keywords to .cpp - files. Also defined an ACE_USE_RCSID macro that allows turning - this feature on and off. - - * ace/config-chorus.h: - * ace/config-psosim-g++.h: - * ace/config-vxworks5.x.h: - These files have the RCS Id keywords off by default. - I hope these are all (and the only) real-time OSs that could be - impacted by the extra 40K or so of space. - - * ace/ACE.cpp: - * ace/ACED.cpp: - * ace/ACER.cpp: - * ace/ARGV.cpp: - * ace/Acceptor.cpp: - * ace/Activation_Queue.cpp: - * ace/Addr.cpp: - * ace/Arg_Shifter.cpp: - * ace/Array.cpp: - * ace/Asynch_Acceptor.cpp: - * ace/Asynch_IO.cpp: - * ace/Auto_Ptr.cpp: - * ace/Basic_Types.cpp: - * ace/CORBA_Handler.cpp: - * ace/CORBA_Ref.cpp: - * ace/Connector.cpp: - * ace/Containers.cpp: - * ace/DEV.cpp: - * ace/DEV_Addr.cpp: - * ace/DEV_Connector.cpp: - * ace/DEV_IO.cpp: - * ace/Date_Time.cpp: - * ace/Dump.cpp: - * ace/Dump_T.cpp: - * ace/Dynamic.cpp: - * ace/Dynamic_Service.cpp: - * ace/Env_Value_T.cpp: - * ace/Event_Handler.cpp: - * ace/Event_Handler_T.cpp: - * ace/FIFO.cpp: - * ace/FIFO_Recv.cpp: - * ace/FIFO_Recv_Msg.cpp: - * ace/FIFO_Send.cpp: - * ace/FIFO_Send_Msg.cpp: - * ace/FILE.cpp: - * ace/FILE_Addr.cpp: - * ace/FILE_Connector.cpp: - * ace/FILE_IO.cpp: - * ace/Filecache.cpp: - * ace/Free_List.cpp: - * ace/Future.cpp: - * ace/Get_Opt.cpp: - * ace/Handle_Set.cpp: - * ace/Hash_Map_Manager.cpp: - * ace/High_Res_Timer.cpp: - * ace/INET_Addr.cpp: - * ace/IOStream.cpp: - * ace/IOStream_T.cpp: - * ace/IO_Cntl_Msg.cpp: - * ace/IO_SAP.cpp: - * ace/IPC_SAP.cpp: - * ace/LOCK_SOCK_Acceptor.cpp: - * ace/LSOCK.cpp: - * ace/LSOCK_Acceptor.cpp: - * ace/LSOCK_CODgram.cpp: - * ace/LSOCK_Connector.cpp: - * ace/LSOCK_Dgram.cpp: - * ace/LSOCK_Stream.cpp: - * ace/Local_Name_Space.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Local_Tokens.cpp: - * ace/Log_Msg.cpp: - * ace/Log_Record.cpp: - * ace/Malloc.cpp: - * ace/Malloc_T.cpp: - * ace/Managed_Object.cpp: - * ace/Map_Manager.cpp: - * ace/Mem_Map.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Block.cpp: - * ace/Message_Queue.cpp: - * ace/Message_Queue_T.cpp: - * ace/Method_Object.cpp: - * ace/Module.cpp: - * ace/Msg_WFMO_Reactor.cpp: - * ace/Multiplexor.cpp: - * ace/Name_Proxy.cpp: - * ace/Name_Request_Reply.cpp: - * ace/Name_Space.cpp: - * ace/Naming_Context.cpp: - * ace/OS.cpp: - * ace/Object_Manager.cpp: - * ace/Obstack.cpp: - * ace/Parse_Node.cpp: - * ace/Pipe.cpp: - * ace/Priority_Reactor.cpp: - * ace/Proactor.cpp: - * ace/Process.cpp: - * ace/Process_Manager.cpp: - * ace/Profile_Timer.cpp: - * ace/RB_Tree.cpp: - * ace/Reactor.cpp: - * ace/Read_Buffer.cpp: - * ace/Registry.cpp: - * ace/Registry_Name_Space.cpp: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Tokens.cpp: - * ace/SOCK.cpp: - * ace/SOCK_Acceptor.cpp: - * ace/SOCK_CODgram.cpp: - * ace/SOCK_Connector.cpp: - * ace/SOCK_Dgram.cpp: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_IO.cpp: - * ace/SOCK_Stream.cpp: - * ace/SPIPE.cpp: - * ace/SPIPE_Acceptor.cpp: - * ace/SPIPE_Addr.cpp: - * ace/SPIPE_Connector.cpp: - * ace/SPIPE_Stream.cpp: - * ace/SString.cpp: - * ace/SV_Message.cpp: - * ace/SV_Message_Queue.cpp: - * ace/SV_Semaphore_Complex.cpp: - * ace/SV_Semaphore_Simple.cpp: - * ace/SV_Shared_Memory.cpp: - * ace/Sched_Params.cpp: - * ace/Select_Reactor.cpp: - * ace/Service_Config.cpp: - * ace/Service_Manager.cpp: - * ace/Service_Object.cpp: - * ace/Service_Repository.cpp: - * ace/Service_Types.cpp: - * ace/Shared_Memory.cpp: - * ace/Shared_Memory_MM.cpp: - * ace/Shared_Memory_SV.cpp: - * ace/Shared_Object.cpp: - * ace/Signal.cpp: - * ace/Singleton.cpp: - * ace/Stats.cpp: - * ace/Strategies.cpp: - * ace/Strategies_T.cpp: - * ace/Stream.cpp: - * ace/Stream_Modules.cpp: - * ace/Svc_Handler.cpp: - * ace/Synch.cpp: - * ace/Synch_Options.cpp: - * ace/Synch_T.cpp: - * ace/System_Time.cpp: - * ace/TLI.cpp: - * ace/TLI_Acceptor.cpp: - * ace/TLI_Connector.cpp: - * ace/TLI_Stream.cpp: - * ace/TTY_IO.cpp: - * ace/Task.cpp: - * ace/Task_T.cpp: - * ace/Thread.cpp: - * ace/Thread_Manager.cpp: - * ace/Time_Request_Reply.cpp: - * ace/Timeprobe.cpp: - * ace/Timeprobe_T.cpp: - * ace/Timer_Hash.cpp: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Heap.cpp: - * ace/Timer_Heap_T.cpp: - * ace/Timer_List.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_Queue.cpp: - * ace/Timer_Queue_Adapters.cpp: - * ace/Timer_Queue_T.cpp: - * ace/Timer_Wheel.cpp: - * ace/Timer_Wheel_T.cpp: - * ace/Token.cpp: - * ace/Token_Collection.cpp: - * ace/Token_Invariants.cpp: - * ace/Token_Manager.cpp: - * ace/Token_Request_Reply.cpp: - * ace/Trace.cpp: - * ace/Typed_SV_Message.cpp: - * ace/Typed_SV_Message_Queue.cpp: - * ace/UNIX_Addr.cpp: - * ace/UPIPE_Acceptor.cpp: - * ace/UPIPE_Connector.cpp: - * ace/UPIPE_Stream.cpp: - * ace/WFMO_Reactor.cpp: - * ace/XtReactor.cpp: - * ace/gethrtime.cpp: - * tests/Aio_Platform_Test.cpp: - * tests/Atomic_Op_Test.cpp: - * tests/Barrier_Test.cpp: - * tests/Basic_Types_Test.cpp: - * tests/Buffer_Stream_Test.cpp: - * tests/Conn_Test.cpp: - * tests/Dynamic_Priority_Test.cpp: - * tests/Enum_Interfaces_Test.cpp: - * tests/Env_Value_Test.cpp: - * tests/Future_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/Hash_Map_Manager_Test.cpp: - * tests/IOStream_Test.cpp: - * tests/MM_Shared_Memory_Test.cpp: - * tests/MT_Reactor_Timer_Test.cpp: - * tests/MT_SOCK_Test.cpp: - * tests/Map_Manager_Test.cpp: - * tests/Mem_Map_Test.cpp: - * tests/Message_Block_Test.cpp: - * tests/Message_Queue_Test.cpp: - * tests/MsgQueue_Notifications_Test.cpp: - * tests/Naming_Test.cpp: - * tests/Notify_Performance_Test.cpp: - * tests/OrdMultiSet_Test.cpp: - * tests/Pipe_Test.cpp: - * tests/Priority_Buffer_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Priority_Task_Test.cpp: - * tests/Process_Mutex_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/Reactor_Exceptions_Test.cpp: - * tests/Reactor_Notify_Test.cpp: - * tests/Reactor_Performance_Test.cpp: - * tests/Reactor_Timer_Test.cpp: - * tests/Reactors_Test.cpp: - * tests/Reader_Writer_Test.cpp: - * tests/Recursive_Mutex_Test.cpp: - * tests/SOCK_Connector_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/SString_Test.cpp: - * tests/SV_Shared_Memory_Test.cpp: - * tests/Semaphore_Test.cpp: - * tests/Service_Config_Test.cpp: - * tests/Sigset_Ops_Test.cpp: - * tests/Simple_Message_Block_Test.cpp: - * tests/TSS_Test.cpp: - * tests/Task_Test.cpp: - * tests/Thread_Manager_Test.cpp: - * tests/Thread_Mutex_Test.cpp: - * tests/Thread_Pool_Test.cpp: - * tests/Time_Service_Test.cpp: - * tests/Time_Value_Test.cpp: - * tests/Timeprobe_Test.cpp: - * tests/Timer_Queue_Test.cpp: - * tests/Tokens_Test.cpp: - * tests/UPIPE_SAP_Test.cpp: - * tests/Upgradable_RW_Test.cpp: - * tests/XtReactor_Test.cpp: - * tests/tests_bcc.ide: - Added RCS Id keywords to all these files. - - * ace/ace_bcc.ide: - Don't really know what changed here... - -Fri Jul 10 23:11:36 1998 David L. Levine - - * bin/make_release: redirect rdiff error messages to /dev/null. - -Fri Jul 10 22:15:04 1998 David L. Levine - - * ACE version 4.5.21 released. - -Fri Jul 10 10:29:58 1998 David L. Levine - - * ace/SString.h: added ACE_INLINE specifiers to operator+ - declarations, to please Sun C++. Will AIX be able to cope? - -Thu Jul 09 23:27:26 1998 Gonzalo Diethelm - - * ace/OS.h: - Corrected definitions for ACE_Export under Borland compilers. - - * ace/SString.h: - Got rid of the friend operators. - - * ace/Containers.cpp: - * ace/Message_Queue_T.cpp: - * ace/Stream.cpp: - * ace/Timer_Heap_T.cpp: - * tests/Buffer_Stream_Test.cpp: - * tests/Dynamic_Priority_Test.cpp: - * tests/Future_Test.cpp: - * tests/Naming_Test.cpp: - * tests/Priority_Buffer_Test.cpp: - * tests/Thread_Pool_Test.cpp: - Got rid of a few assignments to zero that cause warnings with - the Borland compiler. - - * ace/ace_bcc.ide: - * tests/tests_bcc.ide: - Now Borland C++ 5.x supports building ACE as a DLL, and the tests - are linked against the Debug DLL. - - * tests/tests.bpg: - * tests/Dynamic_Priority_Test.bpr: - * tests/Timeprobe_Test.bpr: - * tests/Upgradable_RW_Test.bpr: - * tests/XtReactor_Test.bpr: - Added four new tests to the project group. - - * tests/Aio_Platform_Test.bpr: - * tests/Atomic_Op_Test.bpr: - * tests/Barrier_Test.bpr: - * tests/Basic_Types_Test.bpr: - * tests/Buffer_Stream_Test.bpr: - * tests/Conn_Test.bpr: - * tests/Dynamic_Priority_Test.bpr: - * tests/Enum_Interfaces_Test.bpr: - * tests/Env_Value_Test.bpr: - * tests/Future_Test.bpr: - * tests/Handle_Set_Test.bpr: - * tests/Hash_Map_Manager_Test.bpr: - * tests/IOStream_Test.bpr: - * tests/MM_Shared_Memory_Test.bpr: - * tests/MT_Reactor_Timer_Test.bpr: - * tests/MT_SOCK_Test.bpr: - * tests/Map_Manager_Test.bpr: - * tests/Mem_Map_Test.bpr: - * tests/Message_Block_Test.bpr: - * tests/Message_Queue_Test.bpr: - * tests/MsgQueue_Notifications_Test.bpr: - * tests/Naming_Test.bpr: - * tests/Notify_Performance_Test.bpr: - * tests/OrdMultiSet_Test.bpr: - * tests/Pipe_Test.bpr: - * tests/Priority_Buffer_Test.bpr: - * tests/Priority_Reactor_Test.bpr: - * tests/Priority_Task_Test.bpr: - * tests/Process_Mutex_Test.bpr: - * tests/Process_Strategy_Test.bpr: - * tests/Reactor_Exceptions_Test.bpr: - * tests/Reactor_Notify_Test.bpr: - * tests/Reactor_Performance_Test.bpr: - * tests/Reactor_Timer_Test.bpr: - * tests/Reactors_Test.bpr: - * tests/Reader_Writer_Test.bpr: - * tests/Recursive_Mutex_Test.bpr: - * tests/SOCK_Connector_Test.bpr: - * tests/SOCK_Test.bpr: - * tests/SPIPE_Test.bpr: - * tests/SString_Test.bpr: - * tests/SV_Shared_Memory_Test.bpr: - * tests/Semaphore_Test.bpr: - * tests/Service_Config_Test.bpr: - * tests/Sigset_Ops_Test.bpr: - * tests/Simple_Message_Block_Test.bpr: - * tests/TSS_Test.bpr: - * tests/Task_Test.bpr: - * tests/Thread_Manager_Test.bpr: - * tests/Thread_Mutex_Test.bpr: - * tests/Thread_Pool_Test.bpr: - * tests/Time_Service_Test.bpr: - * tests/Time_Value_Test.bpr: - * tests/Timeprobe_Test.bpr: - * tests/Timer_Queue_Test.bpr: - * tests/Tokens_Test.bpr: - * tests/UPIPE_SAP_Test.bpr: - * tests/Upgradable_RW_Test.bpr: - * tests/XtReactor_Test.bpr: - Uniform options for Borland C++ and C++ Builder. - -Thu Jul 09 16:23:34 1998 Irfan Pyarali - - * ace/Registry.h (ACE_Registry): Changed the Registry class so - that it does not use STL containers and the string classes - anymore. It now uses ACE containers and string classes. There - should be no dependency on STL in ACE anymore. - - * STL: Removed this directory since ACE is no longer dependent on - STL. If you still need these STL files, please refer to: - http://www.rahul.net/terris/. - - * examples/Registry/test_registry_{update,iterator}.cpp (main): - Updated files to work with modified Registry. - - * ace/SString.cpp (ACE_WString::operator<<): Added new operator. - - * Makefile: Updated Makefile so that STL is no longer released - with ACE. - -Thu Jul 09 09:37:43 1998 David L. Levine - - * ace/Basic_Types: for LONG_LONG size determination, don't use - ULONGLONG_MAX ifdef __GNUG__. This change should fix a build - problem on g++/Irix 6.4. Thanks to Johan Lundin - for reporting the problem. - -Wed Jul 08 17:47:48 1998 Irfan Pyarali - - * ace/Strategies_T (ACE_Scheduling_Strategy, - ACE_Schedule_All_Reactive_Strategy, and - ACE_Schedule_All_Threaded_Strategy): The code in these classes - was screwed up. The base class (ACE_Scheduling_Strategy) was - keeping a pointer to the SVC_HANDLER in order to enable the - derived classes to get to the Reactor and Thread Manager. Also, - if the user did not pass in an instance of SVC_HANDLER, one was - created dynamically ;-( Another problem was that the Reactor - field was set on the SVC_HANDLER, but the SVC_HANDLER was never - registered with the Reactor. So when the SVC_HANDLER was - deleted, it tried to remove itself from a potentially - non-existent Reactor. - - Solution: Removed scheduler_ as protected member of the base - class. Added thr_mgr_ to ACE_Schedule_All_Threaded_Strategy and - reactor_ to ACE_Schedule_All_Reactive_Strategy. Now these - classes do not need the scheduler_ member anymore. - -Wed Jul 8 13:47:02 1998 David L. Levine - - * ace/config-sunx86-sunc++-4.x.h: inserted note to not use this - config, but to use config-sunos5.5.h instead. After we - have installed and tested Sun C++ on Solaris86, we should - remove this config. - - * ACE-INSTALL.html: added note about increasing NUM_FILES to - 1000 in VxWorks kernel configuration. Thanks to - Jeff Franks for reminding me about - this change from the default VxWorks kernel configuration. - -Tue Jul 07 14:36:56 1998 Nanbor Wang - - * ace/ace_ce_dll.dsp: Added Stats.cpp into project. - - * ace/README: Added a new directive - ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS and its documentation. - - * ace/config-win32-common.h: Defined - ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS for Win32 except CE. - - * ace/Log_Msg.{h,cpp}: - * ace/OS.{h,i,cpp}: Changed to use ifdef - ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS for structural exception - code. - - * ace/Token.cpp: - * ace/Stats.cpp: - * ace/High_Res_Timer.cpp: Made them CE friendly. - -Tue Jul 07 09:26:22 1998 David L. Levine - - * ace/Thread_Manager.h: updated comments that describe - ACE_thread_t * argument to spawn () family. - - * ace/OS.{h,cpp},Thread_Manager.cpp: on VxWorks only, instead - of using a string to mark an ACE_thread_t as being allocated - by the ACE_Thread_Manager, use a single character (ASCII DC2). - - * tests/run_tests.vxworks: added Dynamic_Priority_Test. - - * apps/gperf/src/Makefile: added trailing $ to Id string. - -Tue Jul 7 10:48:42 EET DST 1998 Wei Chiang - - * tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp: - Use a counter, max. number of unread messages, instead of wait - to work around the blocking problem in ipcSend() - -Mon Jul 6 22:32:19 1998 Gonzalo Diethelm - - * ace/ace_bcc.ide: - Updates for Borland C++ 5.x. - - * ace/config-win32.h: - Made sure ACE_HAS_WINNT4 and _WIN32_WINNT are always defined if - they were not explicitly defined. - - * ace/config-win32-borland.h: - * ace/config-win32-common.h: - Moved all the Borland definitions to a config-win32-borland.h - file. - - * ace/OS.h (ACE_SEH_TRY): - Added correct support for Borland C++ 5.x. - - * ace/OS.cpp: - Replaced the ugly hack to access wProcessorArchitecture under - Borland compilers for an even uglier hack, but that will work on - every Borland compiler, as long as the members of SYSTEM_INFO are - consistent. See the code and get sick! - - * ace/LOCK_SOCK_Acceptor.h: - * ace/Array.cpp: - * ace/Arg_Shifter.cpp: - Were missing an "ace/" in some includes. - - * tests/tests_bcc.ide: - Added all (well, most) of the tests to the project file. - - * tests/Makefile: - * tests/Message_Queue_Notifications_Test.cpp: - * tests/Message_Queue_Notifications_Test.bpr: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/MsgQueue_Notifications_Test.cpp: - * tests/MsgQueue_Notifications_Test.bpr: - * tests/MsgQueue_Notifications_Test.dsp: - * tests/run_tests.bat: - * tests/run_tests.psosim: - * tests/run_tests.sh: - * tests/run_tests.vxworks: - * tests/tests.bpg: - * tests/tests.dsw: - * tests/tests.mak: - * tests/WinCE/Message_Queue_Notifications_Test.dsp: - * tests/WinCE/MsgQueue_Notifications_Test.dsp: - * tests/version_tests/Message_Queue_Notification_Test.dsp: - * tests/version_tests/MsgQueue_Notifications_Test.dsp : - Changed name of Message_Queue_Notifications_Test to - MsgQueue_Notifications_Test, to avoid problems with Borland - compilers. - - * tests/Enum_Interfaces_Test.cpp: - Added some output to test ACE_OS::uname(). - - * tests/Basic_Types_Test.cpp: - Changed a couple of debug lines to contain only one \n. - -Mon Jul 6 14:24:11 EET DST 1998 Wei Chiang - - * tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp: - Add a pause after each send_n()(i.e. ipcSend()) as a temporary - work around over the block problem in ipcSend() when the resources are - exhaused. - - -Mon Jul 6 03:56:49 1998 Nanbor Wang - - * ace/Thread_Manager.h (ACE_Thread_Manager::thr_self): Instead of - refering to ACE_Thread::thr_self, it should mention - ACE_Thread::self. - -Fri Jul 03 17:02:49 1998 David L. Levine - - * bin/make_release (create_kit): remove any existing .zip - files before trying to create new ones, because they get - in the way. Thanks to J. Russell Noseworthy - for reporting the problem - with new ACE+TAO.tar.gz's not being created. - -Fri Jul 3 14:24:59 1998 Darrell Brunsch - - * apps/gperf/src/gperf.dsw: - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf_lib.dsp: - Added MSVC5 Project files - - * apps/gperf/src/Key_List.cpp: - * apps/gperf/src/Options.h: - * apps/gperf/src/Options.cpp: - There was a enumeration CONST, and MSVC5 didn't like it. I - renamed it to CONSTANT. - - * apps/gperf/src/new.cpp - Changed a variable from int to size_t to get rid of a MSVC - warning. - - NOTE: I tried out some tests and even though gperf compiles - on NT, it doesn't seem to work correctly yet. That - will come later. - -Fri Jul 03 13:47:19 1998 David L. Levine - - * ACE version 4.5.20 released. - -Fri Jul 03 08:52:13 1998 Steve Huston - - * netsvcs/lib/Name_Handler.{cpp h}: Moved class Naming_Context from - .cpp to .h so that AIX xlC can find it when instantiating templates. - -Thu Jul 2 11:49:16 1998 Alexander Babu Arulanthu - - * ace/OS.h: - * ace/OS.i: Added ACE_OS::fseek (). NT supports this too. Just - defined SEEK_SET, SEEK_CUR etc, in case they are not defined. This - is similar to what has been done for lseek. - -Thu Jul 02 10:58:00 1998 Michael Kircher - - * tests/Upgradable_RW_Test.cpp: Totally new version, - now we use linked lists on which we search to - spend some time. - - * tests/Upgradable_RW_Test.dsp: Project file for this test. - - * tests/tests.dsw: Integrated this project. - - * tests/version_tests.dsw: Integrated this project. - - * tests/Upgradable_RW_Test.dsp: Project file for this test. - -Thu Jul 02 09:14:20 1998 David L. Levine - - * examples/Reactor/Misc/test_timer_queue.cpp (test_functionality): - use timer_id outside of an assert, so that we don't get compile - warnings with ACE_NDEBUG about it being unused. - - * ace/OS.cpp (thr_create): on VxWorks only, check if thr_id - points to a zero char *. If so, assign the VxWorks task - name pointer to it (*thr_id). Thanks to Bill Backstrom - for this suggestion. - - * ace/Thread_Manager.cpp (spawn_i): on VxWorks only, augmented - comment to explain the various cases for t_id and *t_id values. - - * ace/Thread_Manager.h (spawn*): on VxWorks only, added comment - explaining use of ACE_thread_t * argument. - - * tests/Barrier_Test.cpp: on VxWorks only, added test of - an ACE_thread_t that points to a 0 char *. - - * tests/Barrier_Test.cpp,Thread_Manager_Test.cpp: moved - VxWorks task name and stack size tests from Barrier_Test - to Thread_Manager_Test. - - * tests/run_tests.vxworks: on VxWorks only, enabled - Message_Queue_Test. It's OK to run it on VxWorks, now - that the iterator_test () is disabled in the test. - - * tests/SOCK_Connector_Test.cpp (succeed_nonblocking): - if the connection completion fails, reset the status - _before_ doing the printout. The printout causes the - errno to be overwritten on LynxOS 2.5.0, for example. - - * Makefile (releaseall): use $(MAKE) instead of make for - recursive make. - -Wed Jul 01 21:31:40 1998 Arturo Montes - - * ace/IOStream_T.i (recv_n, eof): fixed calculation of - timeout_ and return value. - -Wed Jul 01 08:51:33 1998 Chris Gill - - * ace/Service_Types.cpp - tests/Dynamic_Priority_Test.cpp: Moved explicit template - instantiations for ACE_Dynamic_Message_Queue and - ACE_Message_Queue_Factory from the test into the ACE library - (next to where the ACE_Message_Queue instantiations resided). - -Wed Jul 01 07:08:40 1998 David L. Levine - - * ace/Message_Queue.i,cpp (VxWorks only): removed args from a - couple of unsupported functions, and added ACE_UNUSED_ARGS - to others, to avoid compiler warnings. - - * tests/Message_Queue_Test.cpp (performance_test): allocate - the send blocks in the main thread instead of in the sender. - That way, the main thread can delete them after the - receiver has finished. Before this change, the sender would - sometimes delete them before the reciever finished. Thanks to - Carlos and his friend Mr. SIGSEGV for helping to track this down. - -Tue Jun 30 23:48:39 1998 Nanbor Wang - - * ace/Message_Queue.h: Added /**/ between #include and <> to - prevent warnings from MSVC. - -Tue Jun 30 22:05:01 1998 David L. Levine - - * tests/Dynamic_Priority_Test.cpp: added template - instantiations. - -Tue Jun 30 18:55:45 1998 Chris Gill - - * ace/Message_Queue_T.{cpp, h} - - Added methods to ACE_Message_Queue_Factory to - create an ACE_Dynamic_Message_Queue with the - deadline and laxity with cleanup strategies. - - * tests/Dynamic_Priority_Test.cpp - - Added tests for the new cleanup strategy factory methods - -Tue Jun 30 18:03:15 1998 Chris Gill - - * ace/Message_Queue_T.{cpp, h} - ace/Message_Block.{cpp, h, i} - - Reorganized ACE_Dynamic_Message_Queue and related classes, - fixed bugs that turned up in testing: it's ready to put - on the road and see how it runs ;-) - - * tests/Dynamic_Priority_Test.{cpp, dsp} - tests/tests.dsw - tests/Makefile - tests/run_tests.{bat, sh} - - Added a test for the static and dynamic (both deadline and laxity - based) message queues, which assigns various message attributes, - pushes messages into the queue, and makes sure the resulting - dequeue order is correct for the given kind of queue. - -Tue Jun 30 14:04:42 1998 Steve Huston - - * ace/Message_Queue_T.cpp: Fixed references to an undeclared - priority_eval_func_ptr_ - I think I figured out what it was - supposed to be doing, but I'm not quite sure. It compiles ;-) - - * ace/Synch.h (ACE_Adaptive_Lock): Removed "= 0" (pure virtual) from - destructor decl. The function is defined in Synch.cpp. - -Tue Jun 30 13:13:21 1998 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (open): Made sure that size does not exceed - MAXIMUM_WAIT_OBJECTS. Thanks to Dr. Schmidt for pointing this - out. - -Tue Jun 30 11:45:12 1998 Steve Huston - - * ace/Message_Queue_T.cpp: Added explicit class names where needed - for ANSI C++. Fixed some compile errors. Still needs more work to - compile correctly on HP-UX aCC. - -Tue Jun 30 09:27:25 1998 David L. Levine - - * etc/ACE-guidelines.html: added a guideline about using ACE_Export. - - * ace/Message_Queue.cpp (ACE_Message_Queue_Vx::dtor; VxWorks only): - added close () call to destructor, because the one in the parent - class will never get called because head_ is always 0 in the derived - class. - - * ace/Message_Queue.i (VxWorks only): finished implementing the - ACE_Message_Queue_Vx inline member functions. - - * tests/Message_Queue_Test.cpp: added performance tests and - tests of ACE_Message_Queue_Vx. - -Tue Jun 30 03:39:15 1998 Nanbor Wang - - * ace/Synch.h (ACE_RW_Process_Mutex): This class no longer needs - to inherit from ACE_Process_Mutex. - - * ace/Synch.cpp (ACE_RW_Process_Mutex): On non-Win32 platforms, - the underlying ACE_File_Lock needs to be created with owner's - read/write permission. Otherwise, other process won't be able - to access the lock. - - * Makefile (CONTROLLED_FILES): Added ChangeLog-98a and - ChangeLog-97b into release. Thanks to Ivan Murphy - for pointing this out. - -Tue Jun 30 00:51:32 1998 Douglas C. Schmidt - - * ACE version 4.5.19 released. - -Tue Jun 30 00:07:39 1998 Nanbor Wang - - * examples/Service_Configurator/Misc/main.dsp: Added macro - definition ACE_SVC_HAS_DLL=0 in this project. DLL linkage is - not used in this example (yet.) Thanks to Joe Covalesky - for noticing this. - -Mon Jun 29 21:16:39 1998 David L. Levine - - * ace/OS.cpp (invoke): wrapped final return with ACE_NOTREACHED. - "It's the right thing to do." - -Mon Jun 29 19:42:12 1998 Irfan Pyarali - - * ace/Timeprobe_T.cpp (ACE_Timeprobe): Changed __TEXT to ASYS_TEXT. - -Mon Jun 29 14:48:58 1998 Nanbor Wang - - * ace/OS.h: Added UNICODE macros for non-Win32 platforms. Thanks - to Jeff Greif for pointing this out. - - * ace/OS.cpp (invoke): Added a return at the end to keep AIX - happy. Thanks to CLahey@cccis.com for reporting this. - -Mon Jun 29 11:37:28 1998 Steve Huston - - * ace/ACE.cpp: Added a 'const' to initialized ASYS_TCHAR * - string - literal conversion to char * is deprecated in C++. - -Sun Jun 28 22:16:51 1998 David L. Levine - - * examples/Service_Configurator/Misc/main.cpp (main): removed - argc declaration because it was unused. - - * examples/Threads/task_five.cpp (work): added - ACE_UNUSED_ARG (stack_size). - - * ace/Message_Queue_T.h: fully qualify the DEFAULT_[HL]WM - references so that it will compile with aCC 1.07 on HPUX 10.20. - Thanks to Avi Nash for reporting this - problem. - - * acer/Message_Queue.{h,cpp} (ACE_Message_Queue_Vx:enqueue_head/tail): - implement these for VxWorks. enqueue_head_i just calls - enqueue_tail_i. - -Sat Jun 27 18:13:05 1998 Irfan Pyarali - - * ace/Timeprobe_T.cpp (ACE_Timeprobe - copy constructor): Stupid - MSVC is forcing me to define this and make it public; it should - really be protected; please don't use it. - - * ace/Timeprobe.h: Added ACE_SINGLETON_DECLARATION; otherwise all - compilation units would get a different instantiation of the - time probe class. Also, changed ACE_TIMEPROBE_SINGLETON to a - #define instead of a typedef; otherwise the compiler bitched - when it was use in ACE_SINGLETON_DECLARATION. - - * SINGLETON_INSTANTIATION: Removed this flag from all files in - ACE. It is causing duplicate declaration errors. - -Sat Jun 27 11:29:50 1998 Douglas C. Schmidt - - * ACE version 4.5.18 released. - -Sat Jun 27 11:27:28 1998 David L. Levine - - * ace/Basic_Types.h: use ACE_CAST_CONST instead of const in - ACE_CU64_TO_CU32. - -Sat Jun 27 11:03:52 1998 Douglas C. Schmidt - - * README: Updated the list of people who have contributed to TAO. - -Sat Jun 27 07:07:43 1998 Douglas C. Schmidt - - * ACE version 4.5.17 released. - -Sat Jun 27 00:27:29 1998 Irfan Pyarali - - * ace/Timeprobe: - - - Added back ACE_COMPILE_TIMEPROBES. David pointed out that - without this flag, size of ACE increases even when time probes - are not being used. Therefore, users must compile ACE with - this flag defined if they want to use time probes. This can - be achieved by doing one of the following: - - . Use make probe = 1, if you are using the make utility. - - . Define ACE_COMPILE_TIMEPROBES in config.h - - . Define ACE_COMPILE_TIMEPROBES in the VC project file. - - . Other regular methods will also work. - - It is not necessary to define ACE_COMPILE_TIMEPROBES when - using time probes, you simply need ACE_ENABLE_TIMEPROBES. You - can use the ACE_TIMEPROBE_* macros to program the time probes, - and use the ACE_ENABLE_TIMEPROBE to enable the time probes. - If you define ACE_ENABLE_TIMEPROBE in your code, but forget to - compile ACE with ACE_COMPILE_TIMEPROBES, you will end up with - linker errors. - - Remember that ACE_COMPILE_TIMEPROBES means that the ACE - library will contain code for time probes. This is only - useful when compiling ACE. ACE_ENABLE_TIMEPROBES means that - the ACE_TIMEPROBE_* macros should spring to life. - - - Added inclusion of OS.h. This way the ACE_COMPILE_TIMEPROBES - can be specified in the config file. - - * include/makeinclude/wrapper_macros.GNU: probe = 1 no longer - means ACE_ENABLE_TIMEPROBE. It only means - ACE_COMPILE_TIMEPROBES. This was changed because defining - ACE_ENABLE_TIMEPROBE here is too broad. ACE_ENABLE_TIMEPROBE is - cleverly designed so that it allows only some time probes to be - enabled (where ACE_ENABLE_TIMEPROBE is defined), while others to - be disabled (where ACE_ENABLE_TIMEPROBE is not defined). - - Example: IDL_Cubit time probes can be enabled without enabling - TAO time probes. Or TAO time probes can be enabled without - enabling IDL_Cubit time probes. TAO time probes are controlled - through TAO/tao/Timeprobes.h. - - * tests/Timeprobe_Test.cpp: - - - Defining ACE_ENABLE_TIMEPROBES is not forced. Users can - uncomment this at the top of the file. This relieves us from - trying to include the symbols of ACE_Timeprobes from ACE if - ACE was compiled without using ACE_COMPILE_TIMEPROBES (the - #include ace/Timeprobe.cpp trick did not work on all 8 - different ways of compiling ACE on NT). - - - Made the registration of the description arrays similar to the - real use cases (in TAO). - - - Introduced enums and took the magic numbers out. - -Fri Jun 26 20:37:06 1998 Matthew J Braun - * tests/Logger/clnt.h - * tests/Logger/clnt.cpp - * tests/Logger/svr.cpp - * orbsvcs/orbsvcs/Log/Logger_i.h - * orbsvcs/orbsvcs/Log/Logger_i.cpp - * orbsvcs/orbsvcs/Logger.idl - - The current status of this is incomplete. The svr* test is guaranteed - to be nonfunctional (I cannot yet speak for the rest). - - -Fri Jun 26 14:52:33 1998 Nanbor Wang - - * tests/test_config.h: Don't close the ofstream before opening the - log stream in ACE_APPEND_LOG on Win32. It it not necessary - because Win32 doesn't have fork anyway and it somehow confuses - Win32 (becuase no file was openen at that point.) - - * performance-tests/Makefile: Temporarily removed Synch-Benchmark - from the targets. It should be added back once the work is - done. - -Fri Jun 26 11:50:03 1998 David L. Levine - - * ace/OS.h: map ACE_dynamic_cast to static_cast with Sun C++, - without RTTI, to avoid warning about using dynamic_cast - without RTTI. Thanks to J. Russell Noseworthy - for reporting this. - - * include/makeinclude/wrapper_macros.GNU,ACE-INSTALL.html: - added rtti make option. - - * ace/Message_Queue.*: on VxWorks, added ACE_Message_Queue_Vx, - which wraps native VxWorks messages queues. See the header - file for limitations. - - * ace/Message_Queue_T.*,Makefile: split Message_Queue into - template and non-template files. - - * ace/Basic_Types.h: added ACE_CU64_TO_CU32 conversion macro, - for converting const ACE_UINT64 to const ACE_UINT32. The old - ACE_U64_TO_U32 wouldn't work with Sun C++'s ANSI casts. - - * performance-tests/Misc/basic_perf.cpp (per_iteration): use - ACE_CU64_TO_CU32 for narrowing the const ACE_UIN64 argument. - - * ace/config-sunos5.5.h: added ACE_HAS_ANSI_CASTS with Sun C++ 4.2. - - * include/makeinclude/platform_sunos5_sunc++.GNU: added - -features=castop to CCFLAGS, to enable use of ANSI casts. - - Thanks to J. Russell Noseworthy - for recommending the above two changes. - - * include/makeinclude/platform_sunos5_sunc++.GNU: Added - support for rtti=1 option to make, to optionally enable RTTI. - -Fri Jun 26 11:39:49 1998 Nanbor Wang - - * ACE-INSTALL.html: Added more infomation in {Free,Net}BSD. - -Fri Jun 26 10:51:07 1998 Carlos O'Ryan - - * ace/OS.h: - Fixed problem in ACE_DES_* macros, some preprocessors were - tokenizing ::~CLASS as ":: ~CLASS" and we wanted ":: ~ CLASS" - (were class in a macro argument). - -Fri Jun 26 09:48:55 1998 Douglas C. Schmidt - - * VERSION: Updated this file to direct bug reports to - the ACE mailing list. - -Fri Jun 26 10:43:02 EET DST 1998 Wei Chiang - - * ace/CLASSIX/CLASSIX_OS.cpp: - ACE_CLASSIX_OS::ACE_CLASSIX_OS() - After created an CLASSIX reactor as an actor-wide singleton - reactor, delete the original reator singleton, if any. - -Fri Jun 26 02:18:05 1998 Nanbor Wang - - * performance-tests/Synch-Benchmarks/Benchmark[_Base].{h,cpp}: - * performance-tests/Synch_Benchmarks/Makefile: Added a new class - Benchmark_Base so we can not only load the test items - but also the test methods dynamically. - -Wed Jun 24 21:37:22 1998 David L. Levine - - * ace/Message_Queue.cpp (refresh_queue): fixed syntax - error: extraneous ;. - -Wed Jun 24 19:52:30 1998 Irfan Pyarali - - * ace/IPC_SAP.cpp (enable,disable): Fixed #define nesting. - -Wed Jun 24 15:36:18 1998 Nanbor Wang - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp - (Peer_Router_Context): For some reason, MSVC can't grop the - temporary objects. Therefore, I changed the ACE_INET_Addr object - in the constructor to a local variable. - -Wed Jun 24 17:10:06 1998 Irfan Pyarali - - * ace/Timeprobe: Removed ACE_COMPILE_TIMEPROBE. ACE library will - always contain ACE_Timeprobe code. - -Wed Jun 24 16:20:02 1998 James CE Johnson - - * ace/IOStream.cpp (underflow,overflow): added protection against - errors, when get/put buffers can be set to 0. - -Wed Jun 24 14:42:50 1998 Chris Gill - - * ace/Message_Queue.{cpp,h}: added =TITLE/=DESCRIPTION - and method comments to ACE_Message_Queue_Factory - - * ace/Message_Block.h: fixed comment in ACE_Laxity_Message_Strategy - -Wed Jun 24 13:35:15 1998 Chris Gill - - * ace/Message_Queue.{cpp,h,i} - ace/Message_Block.{cpp,h,i}: Fixed ACE_UNIMPLEMENTED_FUNC - declarations in ACE_Dynamic_Message_Queue, moved the - ACE_Dynamic_Message_Strategy, ACE_Laxity_Message_Strategy, - and ACE_Deadline_Message_Strategy classes from the - Message_Queue.* files into the respective Message_Block.* - files (fixes link errors on platforms such as NT which - require template source). - -Wed Jun 24 11:38:00 1998 Chris Gill - - * ace/Message_Block.{cpp,h,i}: Added worst case execution time and - deadline absolute time ACE_Time_Value members to ACE_Message_Block. - These default to ACE_Time_Value::zero in the constructors and - initialization methods. - - * ace/Message_Queue.{cpp,h,i}: Added ACE_Dynamic_Message_Queue, - ACE_Dynamic_Message_Strategy, ACE_Deadline_Message_Strategy, - ACE_Laxity_Message_Strategy, and ACE_Message_Queue_Factory - classes to facilitate adaptive use of statically or dynamically - prioritized message queues. - -Wed Jun 24 10:23:27 1998 David L. Levine - - * bin/make_release: 1) inserted /pkg/gnu/bin at head of - PATH, if it exists. That way, cvs diff will use GNU diff. - Thanks to Doug for tripping over that. - 2) changed grep -E to egrep. - - * ace/OS.i,gethrtime.cpp (gethrtime): with Pentium and g++ or ghs, - only; fixed load of 64-bit tick count into two 4-byte ints. - - * performance-tests/Misc/basic_perf.cpp (iteration_time): check - for elapsed_time_ less than empty_iteration_time_, and return 0 - if so. - -Wed Jun 24 10:02:14 1998 Douglas C. Schmidt - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp - (parse_args): Fixed a warning about control reaching the end of - a method. Thanks to David Levine for reporting this. - - * .cvsignore: Added "build" to make CVS happy. Thanks to - David for this info. - - * ace/CLASSIX: Reran "make depend." - - -Wed Jun 24 13:34:32 EET DST 1998 Wei Chiang - - * tests/CLASSIX/* - Attached "CLASSIX_" to all the file names in this directory - Added Imakefile - - * ace/CLASSIX/CLASSIX_Select_Reactor.* - test/CLASSIX/CLD_Connector_Test.cpp - get_current_info() is now renamed to current_info() in compliant - with ACE_Reactor_Impl class. - -Wed Jun 24 08:17:25 EET DST 1998 Wei Chiang - - * Renamed ace/CLASSIX/CLASSIX_Reactor.* to - ace/CLASSIX/CLASSIX_Select_Reactor.* and adujsted other files - accordingly. - - * ace/CLASSIX/CLASSIX_Reactor.* - make naming reference consistenet: all the references to - ACE_CLASSIX_Reactor are now to ACE_CLASSIX_Select_Reactor - -Wed Jun 24 02:39:35 1998 Douglas C. Schmidt - - * ACE version 4.5.16 released. - -Wed Jun 24 00:00:44 1998 Douglas C. Schmidt - - * examples/ASX/Event_Server/Transceiver/transceiver.cpp: Cleaned - up the Event_Transceiver code a bit. - - * examples/ASX/Event_Server/Event_Server/event_server.cpp (main): - Cleaned up the code a bit. - - -Wed Jun 24 06:54:00 EET DST 1998 Wei Chiang - - * Attached "CLASSIX_" to all the file names in ace/CLASSIX. - - * Modified include statments in ace/CLASSIX/* to reflect the - name changes. - - * Added Makefile in ace/CLASSIX - - * ace/CLASSIX/CLASSIX_Reactor.h: - ACE_CLASSIX_Reactor_Notify is now derived from ACE_Reactor_Notify - The private data member, select_reactor_, is now an - ACE_CLASSIX_Reactor class instead of an ACE_Select_Reactor class. - - * ace/CLASSIX/CLASSIX_Reactor.cpp: - in open() - uses ACE_dynamic_cast() to cast - parameter from ACE_Reactor_Impl to ACE_CLASSIX_Reactor - -Tue Jun 23 22:18:42 1998 Douglas C. Schmidt - - * examples/Mem_Map/file-reverse/file-reverse.cpp: Fixed a minor - bug where the program would ungraciously core dump if the file - given on the command-line doesn't exist. Thanks to William - S. Lear for reporting this. - -Tue Jun 23 20:33:30 1998 Irfan Pyarali - - * ace/Synch.h (ACE_Adaptive_Lock): Added ACE_Export. - -Tue Jun 23 18:59:31 1998 Steve Huston - - * ace/Acceptor.cpp (ACE_Strategy_Acceptor<>::resume()): Don't - suspend() the object; resume() it - looked like a cut/paste error. - -Tue Jun 23 16:41:35 1998 Nanbor Wang - - * ace/Synch.{h,cpp} (class ACE_Adaptive_Lock): Added the new Lock - class which allows its subclass to determine the actual locking - mechanism it uses at run time. Notice that all subclasses must - provide their own contructor/destructor implementation. - -Tue Jun 23 06:40:35 1998 David L. Levine - - * examples/Map_Manager/test_hash_map_manager.cpp (main): - replaced use of cerr with and ACE_ERROR_RETURN. Thanks - to Philippe Klein for reporting - this. - - * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: - added #include of ace/streams.h. Thanks to Philippe Klein - for reporting this. - - * tests/TSS_Test.cpp (worker): declare "u" globally so that - we don't quickly run out of TSS keys. - -Mon Jun 22 09:25:32 1998 Carlos O'Ryan - - * ace/XtReactor.cpp: - The notify_handler_ is a pointer now, it was still deferenced as - an object. - -Mon Jun 22 09:04:21 1998 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU: removed suppression - of warning 340, used reference to copied (temporary) value, - because it's no longer needed. - - * ace/Message_Queue.cpp (ACE_Message_Queue_Iterator ctor): - replaced "queue" with "q" to avoid problems with STL or on - platforms that #define queue. Thanks to Dave Meyer - for reporting this. - - * ace/Synch_T.h: added adapter class ACE_TSS_Type_Adapter. - It adapts built-in types for use with ACE_TSS. - - * tests/TSS_Test.cpp: demonstrate/test use of ACE_TSS_Type_Adapter. - - * ace/Timeprobe.h: added semicolon to end of - ACE_TIMEPROBE_EVENT_DESCRIPTIONS definition, when it's non-null. - - * tests/Timeprobe_Test.cpp (main): removed trailing semicolon - from ACE_TIMEPROBE_EVENT_DESCRIPTIONS, and added ACE_UNUSED_ARGs - to avoid compilation warnings about unused variables. - -Mon Jun 22 04:49:29 1998 Douglas C. Schmidt - - * man/windex: Removed ACE_Service_Record from all the - documentation since it is no longer relevant. Thanks - to Ivan Murphy for reporting this. - -Mon Jun 22 02:59:42 1998 Nanbor Wang - - * ace/Process.cpp (setenv_i): Nedd to adjust the memory size to - the actual string size. - -Mon Jun 22 02:32:56 1998 Gonzalo Diethelm - - * ace/Thread_Manager.h: - * ace/Thread_Manager.cpp: - * ace/Thread_Manager.i: - * ace/OS.cpp (uname): - Moved a few things (comparison operators) from - ACE_Thread_Descriptor to ACE_Thread_Descriptor_Base, to satisfy - Borland compilers. - Enabled a conditional compilation for all Borland compilers. - Thanks to Valik Solorzano Barboza for pointing - these things out. - -Mon Jun 22 01:14:36 1998 Gonzalo Diethelm - - * ace/ACE.bpg: - * ace/ACED.bpr: - * ace/ACER.bpr: - Contained ^M characters. - I also made sure there were no absolute paths pointing to "gonzo" - directories... - - * ace/ACED.cpp: - * ace/ACER.cpp: - Added Stats.cpp as a module in the right place. - - * ace/OS.h: - Added a ACE_NOOP macro to avoid compilation warnings when "if" is - used as a noop in certain macros. - - * ace/Hash_Map_Manager.cpp: - * ace/Map_Manager.cpp: - Replaced the use of "if" as a noop with ACE_NOOP. - - * ace/Signal.cpp: - For some obscure reason, Borland needs a blank line between the - #if and the extern "C" void ace_sig_handler_dispatch() - definition. Don't ask... - - * ace/Asynch_IO.h: - Changed (again) inheritance for ACE_Asynch_Result from protected - to public. - - * tests/Aio_Platform_Test.bpr: - * tests/Atomic_Op_Test.bpr: - * tests/Barrier_Test.bpr: - * tests/Basic_Types_Test.bpr: - * tests/Buffer_Stream_Test.bpr: - * tests/Conn_Test.bpr: - * tests/Enum_Interfaces_Test.bpr: - * tests/Env_Value_Test.bpr: - * tests/Future_Test.bpr: - * tests/Handle_Set_Test.bpr: - * tests/Hash_Map_Manager_Test.bpr: - * tests/IOStream_Test.bpr: - * tests/MM_Shared_Memory_Test.bpr: - * tests/MT_Reactor_Timer_Test.bpr: - * tests/MT_SOCK_Test.bpr: - * tests/Map_Manager_Test.bpr: - * tests/Mem_Map_Test.bpr: - * tests/Message_Block_Test.bpr: - * tests/Message_Queue_Notifications_Test.bpr: - * tests/Message_Queue_Test.bpr: - * tests/Naming_Test.bpr: - * tests/Notify_Performance_Test.bpr: - * tests/OrdMultiSet_Test.bpr: - * tests/Pipe_Test.bpr: - * tests/Priority_Buffer_Test.bpr: - * tests/Priority_Reactor_Test.bpr: - * tests/Priority_Task_Test.bpr: - * tests/Process_Mutex_Test.bpr: - * tests/Process_Strategy_Test.bpr: - * tests/Reactor_Exceptions_Test.bpr: - * tests/Reactor_Notify_Test.bpr: - * tests/Reactor_Performance_Test.bpr: - * tests/Reactor_Timer_Test.bpr: - * tests/Reactors_Test.bpr: - * tests/Reader_Writer_Test.bpr: - * tests/Recursive_Mutex_Test.bpr: - * tests/SOCK_Connector_Test.bpr: - * tests/SOCK_Test.bpr: - * tests/SPIPE_Test.bpr: - * tests/SString_Test.bpr: - * tests/SV_Shared_Memory_Test.bpr: - * tests/Semaphore_Test.bpr: - * tests/Service_Config_Test.bpr: - * tests/Sigset_Ops_Test.bpr: - * tests/Simple_Message_Block_Test.bpr: - * tests/TSS_Test.bpr: - * tests/Task_Test.bpr: - * tests/Thread_Manager_Test.bpr: - * tests/Thread_Mutex_Test.bpr: - * tests/Thread_Pool_Test.bpr: - * tests/Time_Service_Test.bpr: - * tests/Time_Value_Test.bpr: - * tests/Timer_Queue_Test.bpr: - * tests/Tokens_Test.bpr: - * tests/UPIPE_SAP_Test.bpr: - * tests/tests.bpg: - Contained ^M characters. - I also made sure there were no absolute paths pointing to "gonzo" - directories... - -Mon Jun 22 01:33:12 1998 Nanbor Wang - - * ace/OS.h (ACE_SYNCH_{1,2}): These two macros were added back for - backward compatibility. - -Mon Jun 22 01:12:53 1998 Irfan Pyarali - - * ace/OS.i (dlerror): Just use FormatMessageA instead of - FormatMessage. The you don't have to worry about UNICODE being - turned on. - -Mon Jun 22 00:01:02 1998 Douglas C. Schmidt - - * ACE version 4.5.15 released. - -Sun Jun 21 23:54:28 1998 Nanbor Wang - - * ace/config-freebsd-pthread.h: Defined - ACE_LACKS_MUTEXATTR_PSHARED and ACE_LACKS_CONDATTR_PSHARED. - -Sun Jun 21 10:14:32 1998 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp (server): Fixed - another ambiguity caused by the recent SOCK_IO changes. Thanks - to David for pointing this out. - -Sun Jun 21 00:16:56 1998 Nanbor Wang - - * ace/OS.i (dlerror): Have to treat UNICODE differently because - FormatMessage takes wchar when UNICODE is defined. - - * ace/WFMO_Reactor.{h,i,cpp}: Changed the parent class of - ACE_WFMO_Reactor_Notify from ACE_Event_Handler to - ACE_Reactor_Notify. - (dump): Added this virtual function implementation for - ACE_WFMO_Reactor_Notify. - - * Ace/Proactor.cpp (timeout): Fixed a typo. - -Sat Jun 20 16:51:39 1998 Douglas C. Schmidt - - * ace/Reactor*: Made a slew of changes to the Reactor and it's - associated implementations so that we can integrate it - seamlessly with Chorus ClassiX IPC. Thanks to Wei Chiang for - these changes. - - * ace/Acceptor.cpp: Added a flag that keeps track of whether we should - use select() in the Acceptor. This makes it easier to integrate - this stuff with Chorus IPC. Thanks to Wei Chiang for this. - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: Removed the trailing - 0 to the send() operation to (1) avoid overload ambiguity and - (2) to use write() rather than send()! Thanks to Chris Healey - for reporting this. - - * ace/ACE: The default condition in the select switch in the - enter_*_timed_wait functions assumed that all values returned - from select if not 0 or 1 will be -1. This is true in those - functions due to only 1 file descriptor flag being set. Thanks - to Chris Healey for generalizing this a bit... - - * ace/SOCK_IO: Added the wrappers for the "non-flags" version of - timed send()/recv(). Thanks to Chris Healey for this. - - * ace/FILE_Addr.cpp: Cleaned up the code a bit to be more - consistent. Thanks to Chris Healey for suggesting this. - - * ace/FILE_Addr.cpp (ACE_FILE_Addr): Removed the memset() in the - constructor since this is overkill... - - * ace/ACE.cpp (send_n): Fixed a dump cut&paste bug in the timed - version of send_n(). Thanks to Chris Healey - for reporting this. - -Sat Jun 20 14:58:21 1998 Nanbor Wang - - * bin/indent_macros.perl: Instead of hardcoding perl's location in - the script, it now invokes perl according to user's environment - setting. Thanks to David for providing the improvement. - -Sat Jun 20 01:24:28 1998 Nanbor Wang - - * include/makeinclude/platform_freebsd_pthread.GNU: Changed to use - -Wall to report all warnings. - - * ace/OS.cpp (thr_create): Specify as an unused - argument when ACE_LACKS_SETSCHED. - - * ace/OS.{h,i,cpp}: Rearrange macro indentations. - - * bin/indent_macros.perl: This little perl script rearrange the - indentation of macros so they are a bit easier to debug. - - * ace/config-freebsd-pthread.h: Defined ACE_LACKS_PTHREAD_CANCEL. - -Sat Jun 20 00:14:07 1998 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_proactor_with_aio.cpp: Test - program for the Asynch_Transmit_File, Asynch_Read_File, - Asynch_Read_Stream, Asynch_Write_File and Asynch_Write_Stream. - -Fri Jun 19 23:58:35 1998 Alexander Babu Arulanthu - * ace/Proactor.h : - * ace/Proactor.cpp : - * ace/Asynch_IO.h : - * ace/Asynch_IO.cpp : - - Implemented Asynch_Transmit_File for POSIX4 systems. - - Added a new class "ACE_Asynch_Transmit_Handler", which is - an auxillary handler class for Asynch_Transmit_File. This - does the actual transmission doing file read and stream - write asynchronously and finally calling the - transmit_handler in the application. - - Aiocb list is now of size RTSIG_MAX, the maximum number - of RT signals that can be queued in a process at a time. - -Fri Jun 19 22:17:35 1998 David L. Levine - - * bin/make_release (check_workspace): use cvs checkout instead - of update, to notice any new directories that have been added - to the repository but not to the workspace. - - There are .cvsignore files in /project/adaptive/ACE_wrappers - and /project/adaptive/ACE_wrappers/java. They can be used - to suppress tripping over any new, uncontrolled files, such - as releases, that are added to these directories. - - Filter ^U from checkout output, so that release need not be - based on the latest repository versions. Instead, the release - is based on the contents of the /project/adapative/ACE_wrappers - workspace. It need not be brought up-to-date with the repository, - though it cannot contain any modified files. This change allows - other users to continue to check in files prior to or during the - release. - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (read): added - ACE_UNUSED_ARG (len). - - * Makefile: fixed build of .obj/gethrtime.o with ghs/VxWorks/i86. - - * tests/run_tests.vxworks: added Timeprobe_Test, but commented - out. That test page faults when built with ghs for Pentium. - It appears that the STL-style iterator usage in ACE_Timeprobe - isn't handled properly by the compiler. - -Fri Jun 19 16:51:05 1998 Nanbor Wang - - * ace/config-freebsd-pthread.h (ACE_HAS_NONCONST_MSGSND): Macro - definition added. - - * ace/OS.i (sigwait): Suppress compiler warnings on FreeBSD. - (msgsnd): Separated the case ACE_HAS_NONCONST_MSGSND out. - - Thanks to Russell L. Carter for reporting - the above fix. - -Fri Jun 19 11:22:27 1998 David L. Levine - - * ACE version 4.5.13 released. - -Thu Jun 18 21:14:25 1998 David L. Levine - - * examples/Threads/task_five.cpp: renamed global stack_size - to default_stack_size, to avoid shadowing by stack_size in - main (). - - * ace/OS.i (dlopen): added support for ACE_HAS_SGIDLADD. - (dlerror): on WIN32, return a formatted message instead of 0. - Thanks to Kent Watsen for the diffs. - - * ace/config-irix6.x-sgic++-nothreads.h: added ACE_HAS_SGIDLADD. - Thanks to Kent Watsen for this addition. - - * Makefile: ACE-INSTALL is not a .PHONY target. - - * ace/Makefile: only regenerate Svc_Conf_[ly].cpp if at Wash. U. - -Thu Jun 18 20:46:46 1998 Nanbor Wang - - * performance_tests/Misc/childbirth_time.cpp: Changed to use the - variable MULTIPLY_FACTOR in statistic calculation. - - * ace/config-freebsd-pthread.h: Added the following definition: - #define ACE_HAS_SIGINFO_T - #define ACE_LACKS_SIGINFO_H - #define ACE_LACKS_UCONTEXT_H - #define ACE_LACKS_SI_ADDR - - * include/makeinclude/platform_freebsd_pthread.GNU: Changed to - invoke linker directly using g++. Added -pthread flag for - linker. This implies programs will link against libc_r - automatically now. Removed -lc_r. Other minor changes. - - Thanks very much for lots of help from FreeBSD team esp. Amancio - Hasty and John Birrell - . - -Thu Jun 18 19:32:30 1998 David L. Levine - - * ace/Token.cpp (dump): commented out print of owner_. Is - there a portable way to print an ACE_thread_t via ACE_DEBUG? - -Thu Jun 18 18:46:00 1998 Carlos O'Ryan - - * ace/Timeprobe.h: - * ace/Timeprobe_T.h: - * ace/Timeprobe_T.cpp: - Added methods to print the absolute values, this can be used to - mix the results of several processes: por example on Sparcs the - high-res timer is a CPU register so the value is consistent - across processes, there are some potential problems with - multiple CPUs, but that's not our case. - -Thu Jun 18 16:25:28 1998 Nanbor Wang - - * examples/Threads/task_five.cpp (main): Extracted out the body of - the test loop so that the delete[] gets called everytime the - body gets executed. - - * ace/Thread_Manager.cpp (ACE_EXECUTE_OP,kill): We need to guard - against non-existing target thread after searching the thread - table. Thanks to Savas Parastatidis - for noticing the problem. - -Thu Jun 18 09:23:39 1998 Irfan Pyarali - - * ace/config-win32-common.h: Fixed the inclusion of winsock - related files. Thanks to Ernesto Guisado - for suggesting this. - -Wed Jun 17 22:47:50 1998 David L. Levine - - * ace/OS.i (rw_trywrlock_upgrade): moved declaration of - local "result" before the ACE_PTHREAD_CLEANUP_PUSH. - PTHREAD_CLEANUP_PUSH/POP are macros that contain open/ - close braces on some platforms. So, any declarations - between them are not visible after the POP. - -Wed Jun 17 19:01:53 1998 Nanbor Wang - - The following changes provide an interface for ACE programmers - of more finer control over how Win32 structured exceptions are - handled. Thanks to Detlef Becker - for contemplating the idea and passing it to us. - - * ace/Log_Msg.{h,cpp} (seh_except_{selector,handler}): Added - new methods to retrieve/set structured exception handling - behavior. is used to determine the "proper" action a - thread should take upon a structured exception and - performs the actual exception handling routine. They are - structured as below in ace_thread_adapter: - - __except (ACE_LOG_MSG->seh_except_selector () (0)) - { - ACE_LOG_MSG->seh_except_handler () (0); - } - - * ace/OS.{h,cpp} (ACE_SEH_EXCEPT_HANDLER): New typedef used to - define user win32 structured exception handler. - - (ACE_SEH_Exception_{Selector,Handler}): Default structured - exception handler. Two handlers ACE_Log_Msg are initialized to - them by default. - - (ACE_Thread_Adapter,inherit_log_msg): Added initializing and - inheriting code to pass the spawning thread's structured - exception handling behaviors. - - * ace/config-win32-common.h - (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION): This macro defines - the default action taken by ACE when a win32 structured - exception occurs. It is by default defined to - EXCEPTION_CONTINUE_SEARCH, which does not handle the exception - but simply pass the exception out. Users can overwrite the - default behavior by defining the macro in their config.h files. - -Wed Jun 17 17:30:11 1998 Michael Kircher - - * ace/OS.h: Added a condition variable and a flag to - the definition of reader/writer locks. - - * ace/OS.i: Implemented ACE_OS::rw_trywrlock_upgrade properly - using one condition variable and a flag. The condition - variable is used to get in front of all the possible - waiting writers and to wait on still working readers - on the rw_lock. The flag is used to indicate, that - a reader is upgrading its lock. rw_unlock obeys one more - case now. - - * ace/OS.cpp: The constructor for the Reader/writer locks - has changed slightly to initialize and destroy the - new members. - - * tests/Reader_Writer_Test.cpp: Added the use of the - rw_mutex.tryacquire_write_upgrade () method to the test. - -Wed Jun 17 07:34:11 1998 David L. Levine - - * tests/IOStream_Test.cpp (server): fixed sign of constant - used to check for valid double. Thanks to Mark Kettner - for reporting this. - - * performance-tests/UDP/udp_test.cpp: added a few - ACE_U64_TO_U32 explicit conversions. - - * tests/Priority_Buffer_Test.cpp (consumer): re-enabled the - statement to suppress the ghs warning about unused variable - cur_priority. - -Tue Jun 16 20:29:32 1998 Steve Huston - - * ACE-INSTALL.html: Added some comments concerning MSVC 5.0 and SP3. - Thanks to Bill Fulton for the excellent detective work. - -Tue Jun 16 16:08:23 1998 Irfan Pyarali - - * ace/Timeprobe_T.h (class ACE_Timeprobe): Fixed copy constructor - signature. Thanks to Chuck R. Gehr - (GehrCR@LOUISVILLE.STORTEK.COM) for pointing this out. - -Tue Jun 16 16:18:08 1998 Douglas C. Schmidt - - * ace/FILE_Addr.cpp (operator=): Check to make sure we - NUL-terminate the memcpy'd filename correctly. Thanks to Istvan - Buki for reporting this. - -Tue Jun 16 15:43:55 1998 Nanbor Wang - - * ACE-INSTALL.html: Changed to instruct users to #include - "ace/config-win32.h" instead of "config-win32.h" directly. - Thanks to Gonzo for noticing this. - -Tue Jun 16 10:33:20 1998 David L. Levine - - * os-patches/linux-patches.html: added RedHat 5.1 success - report from Chanaka Liyanaarachchi . - - * ace/Basic_Types.h,High_Res_Timer.cpp, - performance-tests/Misc/basic_perf.cpp: - added explicit ACE_U64_TO_U32 conversion macro. WIN32's __int64 - and ACE_U_LongLong need an explicit narrowing to 32 bits. This - macro provides a consistent way to do that on all platforms. - - * ace/Asynch_IO.*: added trailing $ to CVS keyword string. - - * ace/Asynch_IO.cpp: fixed so that it will compile with Sun CC - on Solaris 2.6. Thanks to Frederic ANDRES - for reporting this. - - * ACE-INSTALL.html: updated Linux RedHat info. - -Mon Jun 15 23:17:27 1998 David L. Levine - - * Makefile: added os-patches/ to distribution. - -Mon Jun 15 23:07:45 1998 David L. Levine - - * ACE version 4.5.12 released. - -Mon Jun 15 13:58:17 1998 David L. Levine - - * ace/config-chorus.h: replaced comment that said that the - config is for CHORUS using MIT threads with comment that says - that it uses the CHORUS POSIX threads interface. Thanks to - Leo Modica for questioning this, and Wei - Chiang for confirming it. - - * os-patches/linux-patches.html: updated glibc info. Thanks - to Bob Scott for pointing out the - glibc-2.0.7-7 is not available from sunsite. - -Sat Jun 13 13:10:05 1998 David L. Levine - - * tests/XtReactor_Test.cpp: moved explicit template instantiations - inside ACE_HAS_XT, because the #includes are all inside - ACE_HAS_XT also. - - * tests/XtReactor_Test.cpp: without ACE_HAS_XT, replaced - ACE_ERROR_RETURN with ACE_ERROR. This makes it consistent - with other tests, and allows the following ACE_END_TEST - statement to be reached. - - * tests/Process_Mutex_Test.cpp (main): specify full path to - spawned children. Removed Solaris/i386-specific code because - it should no longer be needed now that the test is fixed by - specifying the full path. (acquire_release): removed printout - at top. - - * ACE+TAO.tgz,ACE.tgz,ACE-lib.tgz,FSU-threads.tgz: added these - symlinks to their corresponding .tar.gz files. Thanks to - Gonzo and Darrell for suggesting this. - - * ace/RB_Tree.i (clear): removed extraneous ";" following the - function definition. - - * ace/Process.cpp (spawn): added an ACE_DEBUG printout before each - call to ACE_OS::exit (). - - * ace/Synch_T.cpp: removed the #pragma define_template for - ACE_Condition on __osf__ with cxx. It's no longer - needed, and was causing multiply defined instantiations with - cxx 6.1. - -Fri Jun 12 17:04:14 1998 Alexander Babu Arulanthu - - * ace/OS.h: Moved the #define's and typedef's (related to Proactor - stuff, things like TRANSMIT_BUFFERS etc) under '#if defined - (WIN32)' before OS.i. They were at the end of the file. - -Fri Jun 12 16:31:13 1998 Aniruddha Gokhale - - * ace/OS.h: (ACE_NTOHL, ACE_HTONL): Added macros for conversion - between network and host byte order. Thanks to James Hu for - contributing these. - -Fri Jun 12 14:29:40 1998 Douglas C. Schmidt - - * ace/OS.i (sema_wait): Changed the code so that it always treats - the time value argument in absolute time, even for Win32. - Thanks to Chuck Gehr for reporting this. - -Fri Jun 12 14:12:25 1998 Carlos O'Ryan - - * include/makeinclude/wrapper_macros.GNU: - The inclusion of the XtReactor is controlled on the - platform_macros file (or the command line). - Users simply type make xt_reactor=1 to enable this feature, or - set xt_reactor to 1 in the platform_macros.GNU file. - Some extra macros were added for platforms that require special - CPP, LD or libraries when linking against X/Windows. The macros - are described in this file. - The platforms that already had XtReactor compiled by default - still do. - - * ace/config-irix6.x-sgic++-nothreads.h: - * include/makeinclude/platform_irix6.x-sgic++.GNU: - Now the XtReactor configuration is controlled on the platform - file. - - * ACE-INSTALL.html: - Updated documentation for make flags. - - * tests/XtReactor_Test.cpp: - Fixed a few typos. - - * tests/Conn_Test.cpp: - Fixed some template instantiation pragmas. - -Thu Jun 11 22:05:31 1998 David L. Levine - - * tests/Process_Mutex_Test.cpp (main): kill children on - Solaris/i386 instead of waiting for them. (acquire_release): - added printout at top. It never appears, at least on - g++/Solaris/i386. - - * ace/Malloc.cpp (instance): wrap declaration of local "assertion" - with ifndef ACE_NDEBUG, to avoid warning about unused variable - with debug=0. - -1998-06-11 Alexander Babu Arulanthu - - * ace/Proactor.h (ACE_Proactor): Put insert_aiocb_list () under - ACE_HAS_AIO_CALLS so that it doesnt break in NT. - -Thu Jun 11 1998 Alexander Babu Arulanthu - - * ace/OS.h: Added typedef's, #define's and #include's under the - definition ACE_HAS_AIO_CALLS for the proactor porting. - - * ace/config-sunos5.6.h: Defined ACE_HAS_AIO_CALLS for - solaris2.6. - - * ace/Asynch_IO.h: - * ace/Asynch_IO.cpp: Added aio call support for Asynch_Read_File. See - the code under #if defined (ACE_HAS_AIO_CALLS) - - * ace/Proactor.h: - * ace/Proactor.cpp: Added support for AIO calls in Proactor. See - the code under #if defined (ACE_HAS_AIO_CALLS) - - * examples/Reactor/Proactor/test_proactor_with_aio.cpp: The test - program for Proactor doing aio stuff. - -Thu Jun 11 13:34:26 1998 Darrell Brunsch - - * ace/OS.cpp: Made change to uname to use a different structure - if certain Borland compilers are being used. Thanks to - Valik Solorzano for this fix. - - * bin/make_release: create .zip files in addition to .tar.gz files. - -Thu Jun 11 11:15:26 1998 Carlos O'Ryan - - * ace/XtReactor.cpp: - The notify_handler_ open method requires an extra argument. - -Wed Jun 10 14:31:55 1998 David L. Levine - - * ace/Strategies_T.cpp (ACE_Recyclable ctors): reordered - initializers to match declaration order. - - * tests/Conn_Test.cpp: fixed template instantiations: - ACE_SYNCH_MUTEX instead of ACE_SYNCH_RW_MUTEX. - - * tests/XtReactor_Test.cpp (main): added ACE_UNUSED_ARGS for - argc and argv without ACE_HAS_XT. - -Wed Jun 10 12:34:25 1998 Irfan Pyarali - - * ace/Strategies_T: Added two new template classes: ACE_Recyclable - and ACE_Hash_Recyclable. ACE_Recyclable adds a recyclable flag - to the class it is instantiated with. ACE_Hash_Recyclable - inherits from ACE_Recyclable and forces the class it is - instantiated with to have a hash() method. - - Also, the Hash_Addr was fixed so that it does not have the - recyclable flag anymore, since the Hash_Addr can be used even - when there is no recycling. - - Also updated the ACE_Cached_Connect_Strategy to reflect these - changes. - - * tests/Conn_Test.cpp: Fixed the template instantiations in lieu - of the changes to Hash_Addr. - -Wed Jun 10 11:05:39 1998 David L. Levine - - * bin/make_release: replaced ACE_wrappers-repository/ with - ACE_wrappers/ in diffs. Thanks to James Risinger - for reporting this. - -Wed Jun 10 01:31:46 1998 Gonzalo Diethelm - - * tests/Tokens_Test.cpp: - Changed how the Borland template instantiations are protected. - - * tests/XtReactor_Test.cpp: - test_config.h must be included before asking for ACE_HAS_XT. - Was missing the Borland non-sense. - - * tests/UPIPE_SAP_Test.cpp: - Protected the Borland template instantiations. - - * tests/Timeprobe_Test.cpp: - * tests/Time_Value_Test.cpp: - Added the Borland non-sense. - - * tests/Reactor_Timer_Test.cpp: - Added a couple of casts to avoid warnings. - - * tests/Priority_Buffer_Test.cpp: - Got rid of a (seemingly) useless piece of code. - - * tests/Naming_Test.cpp: - Modified a test so that it won't give warnings. - - * tests/Conn_Test.cpp: - Was missing the Borland non-sense. - Modified an #if-protected section to get rid of a warning. - Added a few extra Borland template instantiations. - - * ace/WFMO_Reactor.cpp: - * ace/SOCK_Dgram.cpp: - Under Borland, a couple of comparisons were always true (with a - warning) because of unsignedness. - - * ace/Malloc.cpp: - Assigned the consition of an assertion to a temporary variable to - avoid a misleading warning. - - * ace/Get_Opt.cpp: - Added an explicit comparison against 0 to avoid a warning. - - * ace/ACED.cpp: - * ace/ACER.cpp: - These files had been commited with ^M at the end of lines. - - * ace/ACE.cpp: - Changed a couple of run time checks for - ACE_DIRECTORY_SEPARATOR_CHAR into compile time tests; that got rid - of a couple of warnings under BCB3 (Borland C++ Builder 3.0). - - * ace/ACE.cpp: - * tests/Conn_Test.cpp: - Used ACE_NOTREACHED to avoid further warnings. - - * ace/OS.h: - Added Borland to the empty definition of ACE_NOTREACHED. - The definition of ACE_SEH_FINALLY for the case of Borland C++ - Builder 3.0 now uses __finally. This allowed most of the tests - that were hanging to complete ok. Thanks to David Tallman - for pointing this out. - -Tue Jun 9 19:35:26 1998 Douglas C. Schmidt - - * ace/XtReactor: Integrated the new XtReactor, which should now - work for Windows NT! Thanks to Kirill Rybaltchenko - for this. - - * tests: Added the new XtReactor_Test.cpp to test the features of - the XtReactor. Thanks to Kirill Rybaltchenko - for this test. - -Tue Jun 09 16:18:54 1998 David L. Levine - - * Makefile: removed old release targets. They're no longer - used, or maintained. - - * include/makeinclude/platform_sunos5_x86_g++.GNU: removed. - Use platform_sunos5_g++.GNU instead, on both sparcs and x86. - -Tue Jun 09 15:25:13 1998 David L. Levine - - * ACE version 4.5.11 released. - -Tue Jun 9 14:59:15 1998 Darrell Brunsch - - * ace/OS.cpp: Made it so both Borland and Microsoft use the - x.wProcessorArchitecture structure for system info. - -Tue Jun 09 14:35:28 1998 David L. Levine - - * tests/Tokens_Test.cpp,UPIPE_SAP_Test.cpp: only need the - template instantiations with Borland C++. - - * bin/make_release: create version diffs, in background, - when creating releases. - -Tue Jun 09 12:50:49 1998 Nanbor Wang - - * ace/ACE_Library.mak: Added Stats.cpp. - -Tue Jun 09 11:51:17 1998 Chris Gill - - * tests/MM_Shared_Memory_Test: added a null pointer check so - test complains rather than crashing when shared allocator fails. - -Mon Jun 8 21:03:23 1998 Douglas C. Schmidt - - * ace/Select_Reactor.cpp (any_ready): Fixed a more unrighteous bug - where we were assigning the values in the wait_set_ rather than - the ready_set_. Thanks to Stefan Ericsson - for reporting this bug. - -Mon Jun 8 19:15:38 1998 Nanbor Wang - - * ace/Malloc.h: - * ace/Malloc_Base.h (ACE_Allocator): Moved the definition of - abstract class ACE_Allocator from Malloc.h to a new file called - Malloc_Base.h to resolve a circular dependency among a bunch of - header files when compiling with UNICODE and inline enabled. - - * ace/SString.i: Changed to include "ace/Malloc_Base.h" to avoid - circular inclusion. - -Mon Jun 08 18:35:23 1998 Steve Huston - - * ACE-INSTALL.html: Added some updated HP-UX info (and a pointer to - Riverace's HP-UX hints page) and removed the warning to not use - MSVC 5.0 SP3 - per results from ace-users discussions last week, - SP3 is getting used successfully. - -Mon Jun 08 13:22:47 1998 David L. Levine - - * ace/Basic_Types.h: set ACE_SIZEOF_LONG_DOUBLE to 12 if - LDBL_MAX_EXP is 16384 and LDBL_DIG is 18. Thanks to - Sree Oggu for reporting this, on - SolarisX86 with Sun C++. - - * ace/Malloc.cpp (instance): cleaned up comments. - -Mon Jun 8 12:12:39 1998 Carlos O'Ryan - - * tests/UPIPE_SAP_Test.cpp: - Template instantiation was not using the ACE_SYNCH macros. - -Mon Jun 8 02:17:54 1998 Gonzalo Diethelm - - * ACE-INSTALL.html: - Added a comment regarding the new port to Borland C++ Builder. - - * ace/ACE.bpg: - * ace/ACED.bpr: - * ace/ACED.cpp: - * ace/ACER.bpr: - * ace/ACER.cpp: - - - * ace/ACE.cpp: - Got rid of unused const int MAX_STRING_SZ = 4096. - - * ace/Asynch_Acceptor.cpp: - * ace/Asynch_IO.cpp: - * ace/Msg_WFMO_Reactor.cpp: - * ace/config-win32-common.h: - Replaced the use of _WIN32_WINNT with ACE_HAS_WINNT4. Borland C++ - Builder doesn't handle _WIN32_WINNT very well when building under - Win95. - - * ace/Asynch_IO.h: - Now ACE_Asynch_Result inherits publicly from OVERLAPPED; - otherwise, Borland C++ Builder refuses to access OVERLAPPED - members. I'm not sure who's right or wrong here. - - * ace/CORBA_Ref.h: - Added an #include "ace/ACE.h". - - * ace/Future.h: - Two cosmetic changes. - - * ace/LOCK_SOCK_Acceptor.cpp: - Added an #include /**/ "ace/LOCK_SOCK_Acceptor.h". - - * ace/Log_Msg.cpp: - Borland C++ Builder doesn't like extern int sys_nerr, so I - protected against it. - - * ace/OS.cpp: - A couple of hacks to handle FILETIMEs and SYSTEM_INFO structs, - which are defined a little different under Borland C++ Builder. - - * ace/OS.h: - Added support for Borland C++ Builder. - - * ace/OS.i: - Borland C++ Builder handles a few functions differently: close, - SetFilePointer, wfdopen. - - * ace/Synch_T.h: - A comment on an #else spanned several lines and mixed // and /**/ - styles; hard to read. - - * ace/TTY_IO.cpp: - A switch was not properly indented and, as a result, had an extra - break that made Borland C++ Builder complain. - - * ace/WFMO_Reactor.cpp: - Got rid of a couple of unused local variables called result. - - * ace/config-win32-common.h: - Added a few defines for Borland C++ Builder. Don't know if - this is the proper way to do it, but there it is. - - * tests/Aio_Platform_Test.bpr: - * tests/Atomic_Op_Test.bpr: - * tests/Barrier_Test.bpr: - * tests/Basic_Types_Test.bpr: - * tests/Buffer_Stream_Test.bpr: - * tests/Conn_Test.bpr: - * tests/Enum_Interfaces_Test.bpr: - * tests/Env_Value_Test.bpr: - * tests/Future_Test.bpr: - * tests/Handle_Set_Test.bpr: - * tests/Hash_Map_Manager_Test.bpr: - * tests/IOStream_Test.bpr: - * tests/MM_Shared_Memory_Test.bpr: - * tests/MT_Reactor_Timer_Test.bpr: - * tests/MT_SOCK_Test.bpr: - * tests/Map_Manager_Test.bpr: - * tests/Mem_Map_Test.bpr: - * tests/Message_Block_Test.bpr: - * tests/Message_Queue_Notifications_Test.bpr: - * tests/Message_Queue_Test.bpr: - * tests/Naming_Test.bpr: - * tests/Notify_Performance_Test.bpr: - * tests/OrdMultiSet_Test.bpr: - * tests/Pipe_Test.bpr: - * tests/Priority_Buffer_Test.bpr: - * tests/Priority_Reactor_Test.bpr: - * tests/Priority_Task_Test.bpr: - * tests/Process_Mutex_Test.bpr: - * tests/Process_Strategy_Test.bpr: - * tests/Reactor_Exceptions_Test.bpr: - * tests/Reactor_Notify_Test.bpr: - * tests/Reactor_Performance_Test.bpr: - * tests/Reactor_Timer_Test.bpr: - * tests/Reactors_Test.bpr: - * tests/Reader_Writer_Test.bpr: - * tests/Recursive_Mutex_Test.bpr: - * tests/SOCK_Connector_Test.bpr: - * tests/SOCK_Test.bpr: - * tests/SPIPE_Test.bpr: - * tests/SString_Test.bpr: - * tests/SV_Shared_Memory_Test.bpr: - * tests/Semaphore_Test.bpr: - * tests/Service_Config_Test.bpr: - * tests/Sigset_Ops_Test.bpr: - * tests/Simple_Message_Block_Test.bpr: - * tests/TSS_Test.bpr: - * tests/Task_Test.bpr: - * tests/Thread_Manager_Test.bpr: - * tests/Thread_Mutex_Test.bpr: - * tests/Thread_Pool_Test.bpr: - * tests/Time_Service_Test.bpr: - * tests/Time_Value_Test.bpr: - * tests/Timer_Queue_Test.bpr: - * tests/Tokens_Test.bpr: - * tests/UPIPE_SAP_Test.bpr: - * tests/tests.bpg: - Added these Borland C++ Builder project files. - - * tests/Aio_Platform_Test.cpp: - * tests/Atomic_Op_Test.cpp: - * tests/Barrier_Test.cpp: - * tests/Basic_Types_Test.cpp: - * tests/Buffer_Stream_Test.cpp: - * tests/Enum_Interfaces_Test.cpp: - * tests/Env_Value_Test.cpp: - * tests/Future_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/Hash_Map_Manager_Test.cpp: - * tests/IOStream_Test.cpp: - * tests/MM_Shared_Memory_Test.cpp: - * tests/MT_Reactor_Timer_Test.cpp: - * tests/MT_SOCK_Test.cpp: - * tests/Map_Manager_Test.cpp: - * tests/Mem_Map_Test.cpp: - * tests/Message_Block_Test.cpp: - * tests/Message_Queue_Notifications_Test.cpp: - * tests/Message_Queue_Test.cpp: - * tests/Naming_Test.cpp: - * tests/Notify_Performance_Test.cpp: - * tests/OrdMultiSet_Test.cpp: - * tests/Pipe_Test.cpp: - * tests/Priority_Buffer_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Priority_Task_Test.cpp: - * tests/Process_Mutex_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/Reactor_Exceptions_Test.cpp: - * tests/Reactor_Notify_Test.cpp: - * tests/Reactor_Performance_Test.cpp: - * tests/Reactor_Timer_Test.cpp: - * tests/Reactors_Test.cpp: - * tests/Reader_Writer_Test.cpp: - * tests/Recursive_Mutex_Test.cpp: - * tests/SOCK_Connector_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/SString_Test.cpp: - * tests/SV_Shared_Memory_Test.cpp: - * tests/Semaphore_Test.cpp: - * tests/Service_Config_Test.cpp: - * tests/Sigset_Ops_Test.cpp: - * tests/Simple_Message_Block_Test.cpp: - * tests/TSS_Test.cpp: - * tests/Task_Test.cpp: - * tests/Thread_Manager_Test.cpp: - * tests/Thread_Mutex_Test.cpp: - * tests/Thread_Pool_Test.cpp: - * tests/Time_Service_Test.cpp: - * tests/Time_Value_Test.cpp: - * tests/Timer_Queue_Test.cpp: - * tests/Tokens_Test.cpp: - * tests/UPIPE_SAP_Test.cpp: - Added the Borland non-sense to allow the tests to link against the - ACE library under Borland C++ Builder. Major pain in the rear - end... - - * tests/test_config.h: - Added a couple of includes for the case of Borland C++ Builder. - - * tests/Hash_Map_Manager_Test.cpp: - Changed variable name allocator to alloc, to avoid conflicts with - STL allocators under Borland C++ Builder. - - * tests/Reactors_Test.cpp: - Changed variable name tm to thr_mgr, to avoid conflicts with - std::tm under Borland C++ Builder. - - * tests/Tokens_Test.cpp: - * tests/UPIPE_SAP_Test.cpp: - Added a few explicit template instantiations. - -Sun Jun 07 09:51:02 1998 David L. Levine - - * ace/Timeprobe_T.cpp: added #include of ace/Timeprobe.h. - It wouldn't compile on GreenHills without it. - - * STL/bool.h: only #define bool, etc., if _MSC_VER is #defined. - Thanks to Stanley Leeson for - reporting this. - - * tests/Timeprobe_Test.cpp: added #include of ace/Timeprobe.cpp - to pick up template instantiations, if ACE_COMPILE_TIMEPROBES - was not defined. This allows the test to build on platforms - that have explicit template instantiation when libACE was - built without timeprobes enabled. - -Sun Jun 7 01:06:12 1998 Douglas C. Schmidt - - * ace/config-freebsd-pthread.h: Added the - ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS flag to work around problems - with pthreads on FreeBSD. Thanks to Amancio Hasty - for reporting this. - -Sat Jun 6 22:00:54 1998 Douglas C. Schmidt - - * ace/Message_Queue.cpp: Added code so that advance() is more - thread-safe. - - * apps/gperf/src/Options.cpp (operator): Changed ACE_OS::exit() - to ACE_OS::_exit() so we'll leave no trace... - - * apps/gperf/src/Key_List.cpp (output_switch): Fixed another bug - where strcmp() should be generated instead of strncmp(). - - * apps/gperf/src: We no longer call the inline option "GNU" but - now call it "INLINE". - - * apps/gperf/src/{Options.h,Key_List.cpp,Gen_Perf.cpp}: Revised - the LARGE_STACK_ARRAY code so that it only gets compiled if - we're using GCC. - - * apps/gperf/src/Key_List.cpp (output_switch): Fixed a bug where - strcmp() was being used instead of strncmp(). Thanks to C++ - for finding this! - - * apps/gperf/src/Key_List.cpp: Removed all uses of "register" - since C++ compilers can do this automagically... - - * apps/gperf/tests/test.cpp (main): Modified the test program to - use C++ rather than C (ugh!). - - * ace: Added two new files: Timeprobe_T.h and Timeprobe_T.cpp in - order to solve problems with multiply defined symbols. Thanks - to Brian Mendel, David Levine, and Irfan for tracing this down. - -Sat Jun 6 19:10:54 1998 Sergio Flores - - * ace/config-vxworks5.x.h: changes the default thread priority - from 6 to 101. - -Sat Jun 06 16:43:01 1998 David L. Levine - - * ace/Timeprobe.cpp (dtor): inserted missing "[]" in delete of - array. - -Fri Jun 5 11:53:18 1998 Darrell Brunsch - - * ace/Log_Msg.{h,cpp}: Added enable_debug_messages() to do - the opposite of disable_debug_messages(). - - * ace/Parse_Node.cpp: Got rid of all the checks of the - Service Configurator's debug flag. Instead, the checking - will occur in the Service Configurator. - - * ace/Service_Config.cpp: Added to Stephen Coy's changes so - that debug messages are turned back on after the Service - Configurator is done. That way, other code can still use - debug messages. - -Thu Jun 4 12:25:48 1998 Rajiv C. Gandhi - - * apps/gperf/src/Options.h: removing the option to stack - allocate some large arrays as CC does not seem to like it. - - * apps/gperf/src/Key_List.cpp (output_lookup_array): removing - the option to stack allocate some large arrays as CC does - not seem to like it. - - * apps/gperf/src/Gen_Perf.cpp: removing the option to stack - allocate some large arrays as CC does not seem to like it. - -Thu Jun 04 05:03:09 1998 Douglas C. Schmidt - - * ACE version 4.5.10 released. - -Wed Jun 3 02:24:47 1998 Nanbor Wang - - * ace/config-win32-common.h: Instead of defining _MT for users if - it's not defined, spit out an error message and stop the - compilation. Thanks to Barney Dalton - for suggesting this. - -Tue Jun 02 20:03:51 1998 Steve Huston - - * ace/config-hpux-1[01].x-hpc++.h: Added ACE_HAS_USING_KEYWORD for - aC++ on both platforms. - -Tue Jun 02 12:19:29 1998 Nanbor Wang - - * ace/Thread_Manager.cpp (wait_grp,wait_task): These two were - still copying thread_descriptors and deleting the copies - directly. This corrupted the cached thread_descriptor. - Changing them to use Thread_Descriptor_Base solved the problem. - Thanks to Zoran Ivanovic for finding - this. - -Tue Jun 02 08:29:20 1998 David L. Levine - - * include/makeinclude/wrapper_macros.GNU,ACE-INSTALL.html: - moved probe=1 support from individual Makefiles to - wrapper_macros.GNU. - -Tue Jun 02 08:09:41 1998 Steve Huston - - * ace/config-aix-4.1.x.h: Removed ACE_HAS_THREAD_SELF. It was - causing compile failure. Thanks to Lee Nash - for helping to work this out. - -Mon Jun 01 16:19:52 1998 Steve Huston - - * examples/Reactor/Dgram/Dgram.mdp, Dgram.mak: Added these files - to build the examples with MSVC 4.2. - -Mon Jun 01 13:01:14 1998 Irfan Pyarali - - * examples/Reactor/Dgram/Dgram.cpp (run_test): Because of the - delayed de-registration in WFMO_Reactor, WFMO_Reactor was trying - to call handle_close on the Event Handler after it was - destroyed. Solution: dynamically created the Event Handler and - call "delete this" in handle_close. The other alternative was - to call remove_handler with the DONT_CALL flag and to close the - socket in the Event Handler's destructor. - - * ace/Timeprobe: The vxworks compiler is lame as it cannot handle - operator placement new for arrays. Therefore, ACE_Allocator was - removed in favor of regular new and delete. - -Mon Jun 01 09:54:51 1998 David L. Levine - - * tests/Timeprobe_Test.cpp: removed trailing ; from template - instantation pragmas. - - * tests/Conn_Test.cpp,MM_Shared_Memory_Test.cpp, - Priority_Reactor_Test.cpp,SOCK_Test.cpp: replaced - !defined (ACE_WIN32) && !defined (VXWORKS) with - !defined (ACE_LACKS_FORK). - -Sun May 31 23:05:10 1998 David L. Levine - - * ACE-INSTALL.html,include/makeinclude/wrapper_macros.GNU: - added repo=1 make option support. It only helps when - building ACE applications. ACE and TAO still use explicit - instantiation when building their libraries, because it's - easiest to avoid link collisions that way. And it already - works. - -Sun May 31 18:31:24 1998 James C Hu - - * ace/RB_Tree.i: - * ace/RB_Tree.cpp: Changes suggested by Sergio to make it work - with older version of GCC. Referred to RB_Tree_Node_Color - through the parent class RB_Tree_Node_Base. - -Sat May 30 13:14:18 1998 James C Hu - - * ace/RB_Tree.h: Try to put enum into a class again. This time, - created a dummy base class to hold the RED and BLACK enums. - -Sat May 30 08:01:31 1998 David L. Levine - - * ace/RB_Tree.h (RB_Tree_Iterator::operator =): Added explicit - return type to the declaration. Wrapped with - ACE_UNIMPLEMENTED_FUNC. - -Fri May 29 23:06:02 1998 David L. Levine - - * ace/RB_Tree.{h,i}: moved enum RB_Tree_Node_Color out of the - (template) class declaration because g++ 2.7.2.3 couldn't - find it there. - - * ace/Thread_Manager.cpp (remove_thr, VxWorks only): added [] to - delete of tid array. Thanks to Arturo Montes - for reporting this. - - * ace/RB_Tree.h (RB_Tree_Iterator::operator =): added explicit - return type to the declaration. Wrapped with - ACE_UNIMPLEMENTED_FUNC. - -Fri May 29 21:59:01 1998 James C Hu - - * RB_Tree.h: - * RB_Tree.i: - * RB_Tree.cpp: Debugged some minor typo errors, and changes - related to internalizing the RED and BLACK enums. - -Fri May 29 21:55:11 1998 David L. Levine - - * ace/High_Res_Timer.cpp: don't use ACE_HAS_PENTIUM code on - Solaris (ACE_HAS_HI_RES_TIMER) because it uses ::gethrtime (). - (dump): on Solaris, print 64-bit ints with %llu format. Other - platforms may need that, also. - - * ace/Makefile: replaced .o with $(OBJEXT) in gethrtime.o target, - so that make depend doesn't munge it. - - * ace/OS.h: only use the null versions of the - ACE_DES_FREE_TEMPLATE* macros with LynxOS 3.0.0. - - * include/makeinclude/platform_lynxos.GNU: commented out -Winline, - because it complains too much with -O2, and that's now the default. - -Fri May 29 17:52:37 1998 Douglas C. Schmidt - - * ACE version 4.5.9 released. - -Fri May 29 16:19:34 1998 Douglas C. Schmidt - - * ace/Synch_T.h (class ACE_Guard): ACE_Guard's destructor was - changing the errno value. Fixed this to avoid doing so... - Thanks to Arturo Montes for reporting - this. - -Fri May 29 15:33:41 1998 David L. Levine - - * performance-tests/Misc/context_switch_time.cpp: - added Synchronized Suspend-Resume Test. - -Fri May 29 14:46:49 1998 James C Hu - - * ace/Makefile - * ace/RB_Tree.h - * ace/RB_Tree.cpp: Added changes to RB_Tree to enable overloading - of the comparison method. Added class RB_Tree to the UNIX - Makefile. - - * ace/OS.cpp: Added some minor fixes to the difftime implementation. - - * ace/OS.cpp: - * ace/OS.i: - * ace/README: - * ace/config-sunos4*: - Added ACE_LACKS_DIFFTIME macro because SunOS4 does not support - the Standard C difftime function. Added a difftime - implementation for when such is the case. - -Fri May 29 08:22:36 1998 Steve Huston - - * ace/Log_Msg.cpp, Trace.cpp: Changed decision for - order-of-include/inline from ACE_WIN32 to - ACE_HAS_ONE_DEFINITION_RULE. This completes the changes needed - to be able to use the newer versions of HP aC++. - - * ace/config-win32.h: Set ACE_HAS_ONE_DEFINITION_RULE. - -Thu May 28 16:17:41 1998 Steve Huston - - * ace/README: Added ACE_HAS_ONE_DEFINITION_RULE. - * ace/config-hpux-10.x-hpc++.h: - * ace/config-hpux-11.x-hpc++.h: Added ACE_HAS_ONE_DEFINITION_RULE - for aC++. This is part of a set of changes to make ACE work - with HP aC++ A.01.09 (10.20) and A.03.05 (11.00). The other - changes are being tested still. Thanks _very_ much to Steve Coy - for digging through this with HP and working out a solution! - -Thu May 28 15:55:48 1998 Douglas C. Schmidt - - * Added new configuration files for SCO. Thanks to Arturo for - this. - -Thu May 28 13:57:50 1998 David L. Levine - - * ace/Filecache.cpp: removed redundant template instantiations. - - * ace/config-lynxos.cpp: added undef ACE_HAS_TEMPLATE_SPECIALIZATION - for LynxOS 3.0.0. - - * ace/Hash_Map_Manager.cpp,Map_Manager.cpp: replaced bare explicit - destructor calls with ACE_DES_FREE_TEMPLATE{,2} macro invocations. - - * ace/OS.h: #define ACE_DES_FREE_TEMPLATE to be null on LynxOS. - Without it, the g++ that's distributed with LynxOS 3.0.0 hopelessly - chokes on explicit calls to template class destructors. This - hack could cause memory leaks, though currently ACE_DES_FREE_TEMPLATE - is only used to call empty, non-virtual destructors (in - Containers.cpp, Hash_Map_Manager.cpp, and Map_Manager.cpp). - Also, added ACE_DES_FREE_TEMPLATE2 macro for use with two - template arguments. There's got to be a better way. - - * include/makeinclude/platform_lynxos.GNU: added LynxOS Version 3.0.0 - support. It's optional at this point: add VERSION=3.0.0 to your - make invocation to enable. Disabled -Wall with LynxOS 3.0.0. - Enabled optimization. - -Thu May 28 07:47:41 1998 Steve Huston - - * tests/SOCK_Connector_Test.cpp: Changed the "should succeed" test - from port 25 (smtp) to 7 (echo) to try and get a higher success - rate. Thanks to David Levine for this suggestion. - -Wed May 27 13:45:24 1998 Steve Huston - - * ace/ACE.cpp (handle_timed_complete): Fixed problem where - successful connect was being reported as a failure (P90). - - * tests/SOCK_Connector_Test.cpp: Added a test for a successful - non-blocking connect (tests fix from above). - -Wed May 27 07:04:42 1998 David L. Levine - - * ace/Service_Config.cpp: default debug_ to 1 instead - of 0. And the -d option now disables debug messages, - instead of enabling them. Thanks to Irfan for reporting - that LM_DEBUG messages were lost without this fix. - - * ace/High_Res_Timer (calibrate): added calibrate () method - to calculate the global scale factor on Pentiums. It's - called by the constructor for the first instantiation - in a process. (On WIN32, get_registry_scale_factor () is - called instead of calibrate ().) - - * ace/Stats.cpp (sample): continue aggregating data even - if there is overflow. This allows, e.g., a mean to be - calculated even if the standard deviation calculation overflow. - - * performance-tests/Misc/context_switch_time.cpp: don't run the - Yield_Test on VxWorks because it takes too long. - - * ace/High_Res_Timer.*: moved calibration from constructor to - global_scale_factor () accessor. - - * ace/Timeprobe.cpp: no longer need to explicitly calibrate the - High_Res_Timer. - -Tue May 26 22:25:18 1998 Stephen Coy - - * ace/Log_Msg.{h,cpp},Service_Config.cpp: added support for - -d in Service_Config files to enable/disable LM_DEBUG messages. - -Tue May 26 14:53:21 1998 Steve Huston - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): Fixed use of uninitialized - variable, nr_subscribed. Thanks to Nanbor for finding this. - -Tue May 26 13:39:21 1998 Carlos O'Ryan - - * ace/Timeprobe.cpp: - * tests/Timeprobe_Test.cpp: - Now egcs and Sun/CC are happy with this files. - -Tue May 26 00:35:49 1998 Irfan Pyarali - - * tests/Timeprobe_Test.cpp: Added new test. - - * ace/Timeprobe: Added the ability to have multiple event tables - for time probes. Multiple maps can be used to chunk up the time - probes. Each one can be added by calling event_descriptions(). - Different tables are used internally by consulting the - minimum_id for each table. It is up to the user to make sure - that multiple tables do not share the same event id range. - -Sat May 23 21:52:49 1998 Carlos O'Ryan - - * ace/Message_Block.h: - * ace/Message_Block.i: - The rd_ptr() and wr_ptr() are const methods now. - -Sat May 23 00:18:58 1998 Nanbor Wang - - * ace/ace_ce_dll.dsp: Updated settings for MIPS CPU. - - * tests/WinCE/*.dsp: Updated settings for MIPS CPU. - -Fri May 22 16:00:03 1998 Douglas C. Schmidt - - * tests/MT_SOCK_Test.cpp (spawn): We must check for !defined - (ACE_LACKS_FORK) rather test for VxWorks or Win32. Thanks to - Steven Coy for reporting this. - -Fri May 22 20:01:40 1998 David L. Levine - - * ace/OS.h: moved ACE_IO_Vector declaration ahead of OS.i #include. - - * ace/OS.i (ACE_IO_Vector::buffer): added static cast of new_buffer - to char *. - - * ace/OS.i (writev): changed return type from int to ssize_t to - match declaration in OS.h. - -Fri May 22 12:20:11 1998 Irfan Pyarali - - * ace: Other parts of ACE were modified to use the new - ACE_IO_Vector class. - - * ace/OS.h (ACE_IO_Vector): Added a new class that inherits from - the correct IO_Vector class provided by the platform. - - writev() and readv() were being emulated on Win32 in ACE. A new - ACE_OS::writev() and ACE_OS::readv() has been added to ACE - that uses WSASend() and WSARecv() respectively. However, in - order for you to exploit these new functions, you must use - ACE_IO_Vector instead of iovec. The ideal situation would have - been to totally replace iovec with ACE_IO_Vector but that would - break too much code. So, if you keep using iovec, you will use - the expenses and slow emulations. If you want to use WSASend() - and WSARecv(), switch over to ACE_IO_Vector. It will work on - both Win32 and non-Win32 platforms. - -Fri May 22 07:53:03 1998 David L. Levine - - * ace/config-linux-pthread.h: removed two - ACE_LACKS_CONDATTR_PSHARED #defines. That leaves just - one, that's commented out. - - * performance-tests/Misc/context_switch_time.cpp: create all - threads as detached so they don't have to be joined. They - test was using up resources on LynxOS, if a high -c option - was used, without this change. - - * ace/config-sunos5.5-{g++,sunc++-4.x}.h,config-sunos5.5.h: - merged config-sunos5.5-g++.h and config-sunos5.5-sunc++-4.x.h - into config-sunos5.5.h. That new file should be maintained - for both compilers from now on. The old files have been - retained for backward compatibility. The just #include - config-sunos5.5.h. - - * ace/config-sunos5.6.h: #include config-sunos5.5.h instead - of the separate Sun C++ and g++ configs. - - * include/makeinclude/platform_sunos5_sunc++.GNU: - updated comment to reflect change to config-sunos5.5.h. - -Fri May 22 07:30:23 1998 David L. Levine - - * ACE version 4.5.8 released. - -Fri May 22 07:26:06 1998 David L. Levine - - * ace/Stats.cpp: added some casts to avoid MSVC++ warnings - about narrowing. - - * ace/config-osf1-4.0.h: removed commented-out - ACE_LACKS_{COND,MUTEX}ATTR_PSHARED. - -Fri May 22 00:09:15 1998 Nanbor Wang - - * ace/Local_Tokens.{h,cpp} (ACE_Null_Token): Only defined default - ctor/dtor explicitly when ACE_LACKS_INLINE_FUNCTIONS. - - * ace/Stats.cpp: Defined ACE_BUILD_DLL at the beginning. - Win32 needs to define ULONGLONG literals as 999ui64. - This is the only place that uses i64 literals. - -Thu May 21 21:55:09 1998 David L. Levine - - * ACE version 4.5.7 released. - -Thu May 21 17:36:37 1998 David L. Levine - - * ace/config-sunos5.6.h: added support for POSIX 199506 - extensions. Thanks to J. Russell Noseworthy - for providing this support. - - * ace/Local_Tokens.{h,i}: inlined ACE_Null_Token ctor and dtor - in class header because the clone () method needs the ctor - inlined, and it's too difficult to get it right with macros. - - * tests/SString_Test.cpp (main): added ACE_ASSERT with s4 in - it, because it was unused otherwise. - - * performance-tests/Synch-Benchmarks/Options.cpp (print_results): - changed #else to #elif, because it has a condition after it. - -Thu May 21 15:28:07 1998 Nanbor Wang - - * tests/test_config.h: Modified to write output from tests into - log file. Notice that log files on CE have extension name - ".txt" instead of ".log". - - * ace/OS.i (strrchr): Added UNICODE version of this function. - - * ace/Log_Record.{h,cpp}: Generalized message formatting on CE by - adding a new method format_msg(). - - * ace/Reactor_Impl.h: Removed an extra comma. - - * ace/XtReactor.cpp: Include "ace/Reactor.h" - - * tests/Recursive_Mutex_Test.cpp: - * tests/Future.cpp: Removed iteration restriction on CE. - -Thu May 21 12:13:36 1998 Nanbor Wang - - * ace/ace_{dll,lib}.dsp: Added Stats.cpp into projects. - -Wed May 20 23:02:41 1998 Steve Huston - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): On Win32, if - ACE::get_ip_interfaces finds less than 2 interfaces, call - subscribe with "0.0.0.0". This is sort of a hack and is meant - only to help get things working again until ACE::get_ip_interfaces - can be made to work correctly in all cases. - -Wed May 20 10:42:12 1998 David L. Levine - - * ace/config-mvs.h: enabled ACE_LACKS_CONDATTR_PSHARED and - ACE_LACKS_MUTEXATTR_PSHARED. Thanks to Chuck Gehr - for advising on this. - - * ace/config-linux-lxpthreads.h,config-lynxos.h: removed - commented-out ACE_LACKS_{COND,MUTEX}ATTR_PSHARED #defines. - - * ace/config-sunos5.5-{sunc++-4.x,g++}.h: removed - commented-out ACE_LACKS_{COND,MUTEX}ATTR_PSHARED. Enabled - ACE_HAS_CLOCK_GETTIME, because we always link with -lposix4. - Thanks to J. Russell Noseworthy - for inspiring the ACE_HAS_CLOCK_GETTIME enable. - - * ace/config-osf1-4.0.h: removed uncommented - ACE_LACKS_CONDATTR_PSHARED, so that we can test whether - it's necessary. - - * ace/Stats.*,Makefile: added ACE_Stats class. - - * performance-tests/Misc/context_switch_time.cpp: use - ACE_Stats to calculate standard deviations. - -Tue May 19 21:24:50 1998 Nanbor Wang - - * tests/Future_Test.cpp: Reduced the number of iterations on CE. - - * ace/Synch.i: Added #ifdef (ACE_HAS_THREADS) to make it compile - on non-threaded platforms. - -Tue May 19 10:05:07 1998 Irfan Pyarali - - * ace/SString.cpp (strlen): Renamed ACE_WString::wstrlen to - ACE_WString::strlen. - - * ace/SString.i: Reordered functions to make g++ happy. - - * ace/ACE.cpp (hash_pjw): Changed ACE_OS::strlen to - ACE_WString::strlen. - -Tue May 19 09:52:08 1998 Carlos O'Ryan - - * ace/config-irix6.x-g++.h: - * ace/config-irix6.x-sgic++-nothreads.h: - * ace/config-irix6.x-sgic++.h: - Added ACE_LACKS_MUTEXATTR_PSHARED - -Mon May 18 16:37:36 1998 Irfan Pyarali - - * ace/SString.h (ACE_CString): Added the ability to hold on to - user supplied character strings without having to make a copy. - - * ace/OS.h (ACE_OS): Added implementations for strrchr, strnchr, - strnstr, and strstr. - - * ace/ACE.cpp (hash_pjw): Added new versions of these that work - with user specified string length. - -Mon May 18 12:24:40 1998 Douglas C. Schmidt - - * ace/config-*.h: Commented out most of the - ACE_LACKS_CONDATTR_PSHARED so we can see what platforms really - DON'T support this... - - * ace/OS.i (mutex_init): Added support for - pthread_mutexattr_setpshared() so we can initialize POSIX - pthreads process-wide mutexes. Thanks to Ki-hyun Yoon - for suggesting this. - - * ace/config-sunos5.6.h: Added an #define for - ACE_THREAD_POSIX_SEM. Thanks to Ki-hyun Yoon - for reporting this. - - * ace/config-sunos5*.h: Removed the ACE_LACKS_RWLOCK_T stuff since - it's unnecessary. Thanks to Chris Lahey for reminding me of - this... - -Mon May 18 13:48:14 1998 Nanbor Wang - - * ace/Synch.i: Added #ifdef (ACE_HAS_THREADS) to make it compile - on non-threaded platforms. - -Mon May 18 12:31:32 1998 Darrell Brunsch - - * ace/Service_Config.{h,i,cpp}: Added an accessor debug() for - external access to the variable. More debug messages - check this before displaying. - - * ace/Parse_Node.cpp: Checks Service_Config's debug flag before - outputting debug messages. - -Sun May 17 23:14:32 1998 Nanbor Wang - - * tests/Wince/*.dsp: Disabled precompiled headers. They ate up - all my disk space. - - * ace/Service_Config.cpp: takes a string of - type ASYS_TCHAR. Use ACE_WIDE_STRING to do the conversion. - - * ace/Log_Msg.{h,cpp} (ACE_ASSERT): Use unicode in ACE_ASSERT. - (log): Don't exit the program for now. Exiting program here - destroys all debugging message in the window. - - * tests/Reader_Writer_Test.cpp: Reduced the number of iterations - on WinCE. - - * ace/OS.i: Added ACE_OS::time () implementation for CE. - -Sun May 17 21:45:07 1998 David L. Levine - - * performance-tests/Misc/childbirth_time.cpp: changed type of - MULTIPLY_FACTOR from int to size_t to avoid signed/unsigned - comparison. - - * tests/Tokens_Test.cpp: synchronize start of thread svc () - routines. Occasionally, the first thread would finish before - any others had started. The TSS objects would get cleaned - up. Then, the remaining threads would start up and make a big - mess. - -Sat May 16 15:10:46 1998 Douglas C. Schmidt - - * ace/Service_Config.h (ACE_Service_Config): Moved the - process_directive() into the public part of the class so this - can be called by applications one the Service Configurator is - open. Thanks to Tom Arbuckle - for suggesting this. - -Sat May 16 14:12:09 1998 Nanbor Wang - - * ace/Thread_Manager.{h,i,cpp} (class ACE_Thread_Descriptor_Base): - Extract thread handle and thread creation flags out from - Thread_Descriptor into this new class. This is necessary - because after my last round of changes to improve - ACE_Thread_Manager, I changed the from - holding Thread_Descriptor's to holding pointers to descriptor. - This was a bad move because the address of these pointers had - already been "freed." The now holds - ACE_Thread_Descriptor_Base which contains only the information - needed for manipulating . Thanks to Arturo - for noticing this. - -Sat May 16 03:23:35 1998 Nanbor Wang - - * performance-tests/Misc/childbirth_time.cpp (main): Added a new - function to test the performance of ACE_Thread_Mutex in single - thread _without_ any contention. - -Fri May 15 22:55:51 1998 Nanbor Wang - - * tests/Recursive_Mutex_Test.cpp: Only iterate the test 50 times - on CE as on Chorus. Otherwise, as I'm using a CEdit to hold the - test output, CEdit would overflow. - - * ace/OS.i (thr_getspecific): Don't check for return value of - TlsGetValue on CE because CE doesn't seem to set the LastError - correspondingly. - (strchr): Added implementation on CE. - - * Added Activation_Queue.i and Strategies.i. - - * Combed thru all these files and added difinitions for ctor/dtor - for a bunch of classes explicitly. CE needs them. - - Activation_Queue.cpp Activation_Queue.h Dynamic.h Dynamic.i - Event_Handler.h Event_Handler.i Get_Opt.h Get_Opt.i Handle_Set.h - Handle_Set.i High_Res_Timer.h High_Res_Timer.i INET_Addr.h - INET_Addr.i IO_SAP.h IO_SAP.i IPC_SAP.h IPC_SAP.i Local_Tokens.h - Local_Tokens.i Log_Record.h Log_Record.i Malloc.h Malloc.i OS.h - OS.i Obstack.cpp Obstack.h Obstack.i Parse_Node.h Parse_Node.i - Pipe.h Pipe.i Process_Manager.h Process_Manager.i SOCK.h SOCK.i - SOCK_Acceptor.cpp SOCK_Acceptor.h SOCK_Acceptor.i SOCK_CODgram.h - SOCK_CODgram.i SOCK_Connector.h SOCK_Connector.i SOCK_Dgram.h - SOCK_Dgram.i SOCK_Dgram_Bcast.h SOCK_Dgram_Bcast.i - SOCK_Dgram_Mcast.h SOCK_Dgram_Mcast.i SOCK_IO.h SOCK_IO.i - SOCK_Stream.h SOCK_Stream.i SString.h SString.i Sched_Params.h - Sched_Params.i Select_Reactor.h Select_Reactor.i - Service_Manager.h Service_Manager.i Service_Repository.h - Service_Repository.i Service_Types.h Service_Types.i - Shared_Object.h Shared_Object.i Signal.h Signal.i Strategies.cpp - Strategies.h Strategies.i Strategies_T.cpp Strategies_T.h - Synch.cpp Synch.h Synch.i Synch_Options.cpp Synch_Options.h - Synch_Options.i Timer_Heap_T.cpp Timer_Heap_T.h Timer_List_T.cpp - Timer_List_T.h Timer_Queue_T.cpp Timer_Queue_T.h - Timer_Wheel_T.cpp Timer_Wheel_T.h. - -Fri May 15 16:55:34 1998 Douglas C. Schmidt - - * ace/config-sunos5*.h: Automatically enable ACE_LACKS_RWLOCK_T if - we're NOT using Solaris threads (since pthreads doesn't support - readers/writer locks). - - * ace/Service_Config.cpp: Removed a duplicate template - instantiation of template class - ACE_Unbounded_Queue_Iterator. Thanks to Ben Eng - for reporting this. - - * ace/OS: Fixed a number of problems that occurred when trying to - use the PTHREAD implementation on Solaris without using - ACE_HAS_STHREADS. The problems related primarily to the - ACE_OS::rw*() functions. To fix the problems, the following - changes were made. - - Remove the #if defined (ACE_HAS_STHREADS) from the case where we - have the native rw*() functions. We just use the - ACE_LACKS_RWLOCK_T compile flag to determine whether we have the - native functions. - - Without the ACE_HAS_STHREAD flag, ACE_rwlock_t comes up - undefined. To fix this, moved the definition at approx. line - 1868 above the #else at approx. line 1865 as the following: - - #if ! defined (ACE_LACKS_RWLOCK_T) - #include - typedef rwlock_t ACE_rwlock_t; - #endif // ! ACE_LACKS_RWLOCK_T - - Finally, the ACE_idtype_t type was also undefined. To fix this, - moved the typedef from within the #if defined (ACE_HAS_STHREADS) || - defined (DIGITAL_UNIX) block and create a new ifdef block: - - #if defined (ACE_HAS_IDTYPE_T) - typedef idtype_t ACE_idtype_t; - #else - typedef int ACE_idtype_t; - #endif - - Thanks to Chris Lahey for his through help at - recognizing and fixing these problems. - -Fri May 15 09:38:37 1998 David L. Levine - - * bin/make_release: redirect cvs tag output to /dev/null. - - * performance-tests/Misc/context_switch_time (main): fixed - printout of yield test time for other than the default - number of iterations. - -Fri May 15 09:29:57 1998 David L. Levine - - * ACE version 4.5.6 released. - -Fri May 15 08:25:19 1998 David L. Levine - - * ace/Service_Config.cpp: fixed and added template instantations. - - * ace/Svc_Conf_y.cpp,etc/Svc_Conf_y.cpp.diff: removed compile - warnings. - - * include/makeinclude/platform_sunos5_g++.GNU: use PIC instead of pic, - because the TAO orbsvcs lib needs it. - - * Makefile: added .PHONY for phony targets. - -Fri May 15 02:47:35 1998 Douglas C. Schmidt - - * ACE version 4.5.5 released. - -Fri May 15 02:42:06 1998 Douglas C. Schmidt - - * ACE version 4.5.4 released. - -Thu May 14 15:28:42 1998 Douglas C. Schmidt - - * ace/config-kcc-common.h: Added the ACE_HAS_USING_KEYWORD to the - config file. Thanks to Ben Eng for reporting - this. - - * examples/Service_Configurator/Misc: Updated the Timer_Service - test to demonstrate the new service configurator feature. It's - AWESOME! - - * ace/Svc_Conf.h, - ace/Svc_Conf.l: - Added a super-cool new feature that allows us to parse service - configurator directives from a string rather than from a - svc.conf file. - - * ace/Svc_Conf.l (yywrap): Free up ace_yy_current_buffer in yywrap - to prevent a memory leak. Thanks to Paul Motuzenko - for reporting this. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp: Enhanced the - implementation to make it easier to follow and to support the - latest features of CPP-inclient.cpp. - - * ace/OS.h (ACE_OS): Added a wrapper for strcspn(3s). - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: Added more - cool changes to the CPP-inserver.cpp example and renamed it. - -Thu May 14 14:46:02 1998 Irfan Pyarali - - * ace/OS.h: Moved the definition of ACE_Export before it is used. - -Thu May 14 13:22:46 1998 Carlos O'Ryan - - * ace/Message_Block.h: - * ace/Message_Block.cpp: - The static duplicate() method can take pointer to a const - Message_Block. - -Wed May 13 18:46:28 1998 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP/CPP-{inserver,inclient}.cpp: Added - profile timing to the server so we can compute socket - performance metrics. Also generalized the tests so we can - experiment with both oneway and twoway calls. - -Wed May 13 19:20:27 1998 James C Hu - - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: Added a substitute gets implementation for when - ACE_LACKS_GETS. The substitute is actually safer than gets, so - I may end up making gets call the new routine instead of - Standard C's. - - * ace/config-g++-common.h: Changed the g++ common file so that - 2.8.1 acts like EGCS does. This worked on Solaris 2.5.1. We'll - see how other's fare. - -Wed May 13 18:13:12 1998 Douglas C. Schmidt - - * ACE version 4.5.3 released. - -Wed May 13 11:29:56 1998 Nanbor Wang - - * performance-tests/Synch-Benchmarks/Options.cpp (print_results): - My previous change to add print_results functionality when - ACE_HAS_GETRUSAGE broke this on Win32. - - * ace/config-g++-common.h (ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS): - Made this macro defined for all versions of g++. - -Wed May 13 09:26:48 1998 David L. Levine - - * many *.{h,i,cpp,idl} files: inserted RCS keyword string. - -Wed May 13 00:35:25 1998 Irfan Pyarali - - * ace: Added ACE_Export to a bunch of class in ACE. Thanks to - Gonzalo A. Diethelm (gonzo@ing.puc.cl) for pointing this out. - -Tue May 12 15:16:04 1998 Nanbor Wang - - * ace/config-WinCE.h: - * ace/OS.h: Stopped using non-static object manager for CE. This - is causing some problem at process shutdown. - - * ace/Acceptor.cpp: Made CE friendly. - - * ace/Process.cpp ([~]ACE_Process_Options): Moved things around to - avoid compilation errors on CE. Secret: CE doesn't have - environment variables. - -Tue May 12 13:28:05 1998 Carlos O'Ryan - - * ace/OS.h: - The ACE_INLINE_FOR_GNUC macro must be defined (as the null - token) if ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTION is not - defined. - -Tue May 12 12:30:55 1998 Nanbor Wang - - * ace/README: - * ace/config-g++-common.h (ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS): - Added this new macro to get around a bug which only happens in - GNUC 2.7.xx. It mistakenly refers to the template definition as - the place where a function is used. - - * ace/OS.h (ACE_INLINE_FOR_GNUC): Added the macro to fix the GNUC - bug. - - * ace/Thread_Manager.h: Added above macro to set_next and - get_next. - -Tue May 12 12:11:36 1998 Bob Laferriere - - * ace/Process.{h,cpp}: modifications to make the environment buffer - and number of environment variables tunable in the constructor. - I also fixed a logic error which previously attempted to write - beyond an array bounds of the array of pointers into the - environment buffer. I made the environment_argv_ buffer tunable - as well. The new constructor takes the old hardcoded static sizes - as the default dynamic sizes for backwards compatiblity. - The behavior is to return -1 if the maximum buffer size or - maximum number of environment arguments has been reached in - following with the prior behavior. I opted not to make the members - grow as needed so the class would still follow it's prior behavior. - This would be simple to add, however. - -Tue May 12 08:29:50 1998 David L. Levine - - * ace/Malloc.cpp (ACE_Allocator::instance): replaced dynamic - allocation of the default ACE_Allocator with allocation from - the data segment. Thanks to Ben Eng for - providing the stack trace that revealed the problem. - - * ace/Malloc.h: added comments to not add data members to - ACE_Allocator or ACE_New_Allocator. - - * bin/g++dep: changed PATH to pick up /project/doc/pkg/gnu/bin/g++, - and removed GNUG_INCLUDE. Thanks to Ganesh Pai - for reporting problems with the old version on Linux. - -Tue May 12 02:59:27 1998 Nanbor Wang - - * performance-tests/Misc/childbirth_time.cpp: Added ACE_OS::sleep - (0) before all timing sections start. This ensures we own a - fresh time slice when the timing begin and reduce the chances of - getting preempted - -Tue May 12 00:42:05 1998 Nanbor Wang - - * bin/dsp2dsp.pl: This file clones a new MSVC 5.0 dsp file based - on setting from another dsp file. It is most useful in adding - new project files into tests/. - - * tests/WinCE/*: New project files. Updated the workspace. - Please see CE-status for the current progress. - - * tests/Buffer_Stream_Test.cpp: - * tests/Conn_Test.cpp: - * tests/Enum_Interfaces_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/Hash_Map_Manager_Test.cpp: - * tests/Message_Block_Test.cpp: - * tests/Reactors_Test.cpp: - * tests/Thread_Manager_Test.cpp: - * tests/Thread_Mutex_Test.cpp: Made CE friendly. - - * tests/test_config.h: Moved some common definitions shared among - CE and other platforms out. - - * ace/Acceptor.cpp: - * ace/Acceptor.h: - * ace/Connector.cpp: - * ace/Connector.h: - * ace/Stream.cpp: - * ace/Svc_Handler.cpp: - * ace/Svc_Handler.h: - * ace/Synch.h: - * ace/Synch.i: CE stuff. - - * ace/config-WinCE.h: Defined ACE_DEFAULT_SERVER_HOST in UNICODE - here to overwrite the default setting. - - * ace/Synch.i (ACE_Lock): CE needs a default ctor here. - -Mon May 11 15:43:01 1998 Nanbor Wang - - * tests/WinCE/ce_tests.dsw: - * tests/WinCE/Atomic_Op_Test.dsp: - * tests/WinCE/Barrier_Test.dsp: - * tests/WinCE/Basic_Types_Test.dsp: - * tests/WinCE/Map_Manager_Test.dsp: Added/Updated project files. - - * tests/Atomic_Op_Test.cpp: - * tests/Barrier_Test.cpp: - * tests/Basic_Types_Test.cpp: Made them CE friendly. - - * ace/config-WinCE.h: Only define ACE_LACKS_INLINE_FUNCTIONS when - building debug version of ACE for SH series CPU. - - * WindozeCE/WindozeCEDlg.cpp: Updated the initial message after the - display window but before ACE console progrm started. - - -Mon May 11 15:43:01 1998 Nanbor Wang - - * ace/OS.{i,cpp}: Moved CE's impelmentation of ACE_OS::fprintf to - cpp file. - -Mon May 11 15:15:24 1998 Carlos O'Ryan - - * ace/Thread_Manager.h: - Removed bogus ACE_INLINE macros in class declaration, they were - making the SGI compiler *very* unhappy. - -Mon May 11 15:11:11 1998 Nanbor Wang - - * ace/OS.cpp (ctime_r): Renamed the fmtstr to - ACE_OS_CTIME_R_FMTSTR for we may need to use similar scheme to - fix other bugs in the future. - -Mon May 11 14:50:47 CDT 1998 Everett Anderson - - * ace/Name_Proxy.cpp: Changed one last recv to recv_n. - -Mon May 11 13:14:22 1998 Chris Gill - - * ace/RB_Tree.{cpp,h,i}: (new) Red-Black Tree data structure - implementation. A Red-Black Tree is an efficient - self-balancing binary tree that uses recoloring to - minimize rotations while rebalancing on insertion or - deletion of a tree node. Items in the tree are stored - according to a key provided at insertion. This - implementation is an OO rendition of the ADT described - in Cormen, Leiserson, Rivest, "Introduction to Algorithms" - (c) 1990, MIT. - -Mon May 11 12:31:41 1998 Steve Huston - - * ace/OS.h: Made ACE_LD_SEARCH_PATH, ACE_LD_SEARCH_PATH_SEPARATOR_STR, - ACE_DLL_PREFIX, ACE_DLL_SUFFIX settable via config.h. - - * ace/config-hpux-10.x.h: - ace/config-hpux11.h: Set ACE_LD_SEARCH_PATH, ACE_DLL_SUFFIX. - Thanks to Kirill Rybaltchenko and David Levine for identifying - this problem. - -Mon May 11 12:27:05 1998 David L. Levine - - * ace/ACE.cpp (send_n): retry if ACE::send () fails due to - EWOULDBLOCK. Thanks to Dave Brackman - for reporting this. - - * tests/Env_Value_Test.cpp (main): check return values of - options.setenv () calls. Thanks to Bob Laferriere - for recommending this. - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: instead of - using GNU ranlib386 after using GHS ax for i386 targets, just - use GNU ar386. - - * ace/gethrtime.cpp: added some comments about GHS asm support. - - * java/netsvcs/{Logger,Time}/Makefile, - java/tests/netsvcs/Logger/Makefile: - replaced WRAPPER_ROOT with ACE_ROOT. - -Mon May 11 05:14:18 1998 Nanbor Wang - - * ace/config-WinCE.h: Added ACE_HAS_NON_STATIC_OBJECT_MANAGER. CE - console programs have to set this flag because the main - functions is actually renamed and running in a threads. - - * tests/test_config.h: Excluded class and macros to redirect - debugging messages to files under CE. This make debugging a bit - easier but we should eventually put them back under CE. - - * tests/Map_Manager_Test.cpp: Made CE friendly. - - * ace/Hash_Map_Manager.cpp: Some ACE_ERROR were not CE friendly. - - * ace/Profile_Timer.{h,i}: - * ace/Synch.{h,i}: Moved inline function definitions to Synch.i - file. Windows CE can't grok any inline at all. - -Mon May 11 02:43:45 1998 Nanbor Wang - - * performance-tests/Misc/childbirth_time.cpp (main): Added - a new method for benchmarking ACE_Thread_Manager::spawn_n. - Added other cosmetic changes. - -Sun May 10 23:20:36 1998 Irfan Pyarali - - * ace/Token.cpp: Adding more debugging statements. - - * ace/Asynch_Acceptor.cpp (should_reissue_accept): Added template - method that decides whether a new asynchronous accept should be - issued. - -Sun May 10 23:28:57 1998 Nanbor Wang - - * ace/OS.cpp(inherit_log_msg): - * ace/Log_Msg.cpp (thr_desc): Wait on Thread_Descriptor's lock - instead of the "global" Thread_Manager lock. - - * ace/Thread_Manager.cpp: Moved acquire_release() from - ACE_Thread_Manager to ACE_Thread_Descriptor. This method is - called from ACE_Log_Msg::thr_desc to prevent a thread from using - its thread descriptor before it is fully built. The change - relieve spwaned threads from waiting for other threads created - in the same spwan_n call to be created before it can start - running. - - (insert): Added an extra argument to control whether we want to - insert the newly created thread into ACE_Thread_Manager's thread - table or not. Notice that it is default to 1 to remain the - original behavior in case anyone is using this class/function - directly in their code. However, in ACE_Thread_Manager, we - always prevent it from inserting because we always register - thread descriptors from spawn_i. - -Sun May 10 01:51:29 1998 Nanbor Wang - - * ace/OS.h: Renamed ACE_OS::Time_To_The_Beginning to - ACE_OS::FILETIME_to_timval_skew. - - * ace/OS.cpp: Found the problem in ACE_OS::ctime_r. An internal - compiler bug (?) caused the bug. The solution: move the format - string out as a const string instead of putting it in sprintf - directly. Weird. - - * ace/Log_Record.{h,cpp}: Made priority_name_ and its access - function CE friendly. - -Sat May 9 20:09:13 1998 Nanbor Wang - - * ace/Thread_Manager.h: Changed the type of lock used by - to ACE_SYNCH_MUTEX. Or else, it won't - compile on platforms that doesn't support thread. Thanks to - Woody Zenfell for reporting this. - -Fri May 08 22:29:01 1998 Nanbor Wang - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): CE UNICODE related fix. - -Fri May 8 14:18:46 1998 Nanbor Wang - - * ace/Thread_Manager.h (ACE_Thread_Descriptor): Added ACE_INLINE - to declarations of set_next and get_next to get around a bug in - a version of g++. - -Fri May 8 11:57:23 1998 Douglas C. Schmidt - - * ace/Map_Manager.cpp: Fixed a bug where we weren't calling - close_i() when resizing the buffer. - - * ace/Thread_Manager.cpp (set_grp): In - ACE_Thread_Manager::{get,set}_grp we must check to see that we - have a valid pointer after the ACE_FIND. Otherwise a seg fault - occurs. Thanks to Chris Lahey for reporting - this. - -Fri May 08 09:47:50 1998 David L. Levine - - * ace/config-linux-common.h: only use ACE_HAS_POLL with glibc2. - Thanks to Saneyasu for reporting - this. - - * ace/OS.i (sleep): On Linux without ::poll () (prior to glibc), - copy the ACE_Time_Value argument because the system modifies it. - - * include/makeinclude/platform_osf1_4.0.GNU: moved -lm from LIBS - to MATHLIB. - - * performance-tests/UDP/Makefile: added $(MATHLIB) to LDLIBS. - - * tests/Aio_Platform_Test.cpp (have_asynchio): use - _SC_LISTIO_AIO_MAX instead of _SC_AIO_LISTIO_MAX if it's - #defined. It is on DU 4.0. - -Fri May 08 08:43:42 1998 Steve Huston - - * include/makeinclude/platform_hpux_gcc.GNU: Added $(PIC) to - definition of SOFLAGS. Thanks to Kirill Rybaltchenko - for this fix. - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): Added code for Win32 so that - if a subscribe is done without specifying an interface, the mcast - address is subscribed to on each non-loopback interface. This works - around a bug in NT's winsock in the presence of multiple IP - interfaces. Won't hurt 95 - will just run a bit slower than it - otherwise would. - - * examples/Reactor/Multicast/Multicast.{mdp,mak}: Added MSVC 4.2 - workspace for this example. - -Fri May 8 03:43:25 1998 Nanbor Wang - - * ace/Thread_Manager.{h,cpp}: Added yet one more member variable - into Thread_Descriptor to keep track of registration of - Thread_Descriptors. By adding this variable, we can avoid an - extra locking in remove_thr for most cases (normal cases ;-). - Thanks to the inspiration from Arturo Montes - . - -Thu May 07 22:06:13 1998 Ben Eng - - * ace/config-kcc-common.h,config-linux-{common,kcc}.h: updated - KCC/Linux support, and integrated into config-linux-common.h. - -Thu May 7 20:32:20 1998 Douglas C. Schmidt - - * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp - (main): Oops, we need to move the unlink() AFTER we create the - file... Thanks to Sandro Doro for - reporting this. - -Thu May 07 19:08:22 1998 Douglas C. Schmidt - - * ACE version 4.5.2 released. - -Thu May 7 14:10:41 1998 Carlos O'Ryan - - * ace/Timer_Hash_T.h: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Heap_T.cpp: - * ace/Timer_Wheel_T.cpp: - The classes had a INHERITED typedef for the base class, but - Solaris defines a macro by the same name. This causes very weird - problems with EGCS (and probably other g++ versions). - -Thu May 07 04:15:23 1998 Nanbor Wang - - * ace/Profile_Timer.cpp (elapsed_time): Treat Win32 differently - so I can use this function with WinCE Emulation build. The - problem is that Win32 can't convert __int64 to double. - - * ace/OS.{h,cpp} (ACE_Time_Value): (Win32 only) Added a new static - const member (Time_To_The_Beginning) of type DWORDLONG (unsigned - _int64) to adjust the time skew between FILETIME and POSIX time. - Changed the type of _100ns to ULARGE_INTEGER to eliminate - unnecessary computation. - -Wed May 6 23:58:40 1998 Carlos O'Ryan - - * ace/XtReactor.cpp: - The signature for the open() method of the notify pipe has been - modified. - -Wed May 6 23:28:47 1998 Douglas C. Schmidt - - * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp: - Fixed a couple of mistakes that were causing the UNIX domain - sockets not to work. Thanks to Sandro Doro - for recommending this. - - * performance-tests/Misc/context_switch_time.cpp (svc): An 'i' - was being defined twice, gorp! It's fixed now! - -Wed May 06 22:00:14 1998 David L. Levine - - * ace/config-linux-common.h: only #define - ACE_HAS_4_4BSD_SENDMSG_RECVMSG with __GLIBC__. Thanks - to Chanaka Liyanaarachchi for - reporting the lack of CMSG_DATA support on RedHat 4.2. - -Wed May 06 18:35:21 1998 Steve Huston - - * ace/ACE.cpp (get_ip_interfaces): Reset buf_len before each call to - get_reg_key to get registry value for device's IP address. It gets - overwritten on each call to get_reg_key. - - * include/makeinclude/platform_mvs.GNU: Added definition for PIC. - Though not related to position-independent-code, it is a switch that - makes shared lib builds work right. Removed the old SOBUILD def. - Thanks to Chuck Gehr for helping with this strategy. - -Wed May 06 16:32:53 1998 Nanbor Wang - - * ace/Filecache.h (ACE_Filecache_Handle): Removed - ACE_EXPORT_DECLARE and specified ACE_Export directly for - ACE_Filecache_Handle and ACE_Filecache in calss declarations. - - * ace/Thread_Manager.{h,i,cpp}: A bug was found by Arturo Montes - who noticed that when a thread was - spawned and then exited immediately, its thread descriptor might - get freed before even get registered into the thread table kept - by the Thread_Manager. Although it doesn't make any sense to - spawn a thread just to let it return immediately, a middleware - shouldn't restrict the way how users want to use it. - - I got around this problem by adding a lock into - Thread_Descriptor. Before spawning a thread, the Thread Manager - will first grab the lock. It won't release the lock until - calling append thread, at which point, the Thread_Descriptor of - the thread has been stashed into the table. Removing the - Thread_Descriptor also requires to hold this lock and release - the lock before the Thread_Descriptor is "freed." Therefore, - if a thread exit before its Thread_Manager ever gets a chance to - register it, it will block and waiting. - - The type of the lock is defined by ACE_DEFAULT_THREAD_MANAGER_LOCK - which, by default, is ACE_Thread_Mutex. User can change the - definition by defining in their config.h file. For example, if - you can be sure that all your threads will run for an extended - long time (which, in most case, should be true,) you can disable - this feature by defining this as a ACE_Null_Mutex to speed up - spawning and termination of threads. - - (thread_desc_freelist_): Added a free list to Thread_Manager to - recycle Thread_Descriptor. By default, this free list - pre-allocate 0 Thread_Descriptor and has low-water-mark of 1, - increment count 1 and a huge (25000) high water mark. That is, - if you use a Thread_Manager for an extended period of time, you - won't have to dynamically allocate memory for Thread_Descriptor - for every thread after your system is stable (the thread count - fluctuates between some certain values.) - - There are two ways to change the settings. First, by defining - ACE_DEFAULT_THREAD_MANAGER_LWM, ACE_DEFAULT_THREAD_MANAGER_HWM, - ACE_DEFAULT_THREAD_MANAGER_INC, and - ACE_DEFAULT_THREAD_MANAGER_PREALLOC in your file. - This changes the default setting of your ACE. (The global - Thread_Manager use this setting.) Or, you can specify these - values when creating a Thread_Manager. - - * ace/Free_List.cpp (alloc,dealloc): Don't grab the lock in these - two functions. They only get called from add() and remove() - which hold the lock before making the call. Actually, they also - gets called from the constructor and destructor. But that - shouldn't be a problem. - - * tests/Reactor_Notify_Test.cpp (run_test): Moved the #endif of - ACE_HAS_THREADS down to avoid compilation error on non-threaded - platforms. - -Tue May 5 14:12:08 1998 Douglas C. Schmidt - - * include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU: Added a - platform config file courtesy of Arturo Montes - . - -Tue May 05 08:35:18 1998 David L. Levine - - * ace/config-irix6.x-sgic++-nothreads.h: updated the determination - of ACE_SIZEOF_LONG_DOUBLE. Thanks to Bob Laferriere - for providing the fix. - - * include/makeinclude/platform_sunos5_g++.GNU: use -gstabs+ instead - of -g on Solaris86. - - * etc/Svc_Conf_l.cpp.diff: updated. It's magic, Nanbor :-) - The problem seems to be due to an old version left in - /tmp/Svc_Conf_l.cpp, which confuses flex. - - * ace/config-linux-common.h,config-g++-common.h: moved - ACE_HAS_PENTIUM (with i386) from config-linux-common.h - to config-g++-common.h. - - * ace/config-linux-common.h: added ACE_HAS_POLL, so we - don't use ::select () in ACE_OS::sleep (). Linux's - ::select () modifies its timeout argument! - - * ace/OS.i (gethrtime): added RDTSC support for all g++ - _and_ ACE_HAS_PENTIUM platforms. - - * ace/config-vxworks5.x.h: added ACE_HAS_PENTIUM with GHS - on Intel platforms. - - * ace/Makefile: for GHS on Intel 8086, build gethrtime.cpp. - It's used to provide a high-resolution time using the - Pentium RDTSC instruction. I don't know how to get - GHS' asm to do it, so it uses g++. - - * ACE-INSTALL.html: added note about carefully installing - egcs on Linux. Thanks to Kurt Sussman for - tracking down the cause of mysterious link failures. - -Tue May 05 02:15:49 1998 Nanbor Wang - - * ace/Svc_Conf_l.cpp: I know, I know. I shouldn't mess with this - file directly. But I couldn't manufacture this file even with - the stock Svc_Conf.l using Doug's flex. So, I reckon I'll just - check this in now and fix the Svc_Conf_l.diff later. - - * ace/Service_Config.{h,cpp} (process_directive): Standard CE - stuff. - - * WindozeCE/WinAdapter*.*: - * WindozeCE/WindozeCE*.*: Replaced the old adapter for CE with a - new one. The new version allows uses to scroll thru the - "console" output. - -Mon May 04 17:09:39 1998 David L. Levine - - * performance-tests/Misc/context_switch_time.cpp: lots of - cleanup. The main changes were the use of ACE_THR_PRI_FIFO_DEF - for the default therad priority, and removal of some - unnecessary thr_yield () calls. - - * tests/Aio_Platform_Test.cpp: added arguments to main (), - removed #includes that are already in ace/OS.h, and added - ACE_START_TEST/ACE_END_TEST calls. - -Mon May 4 13:08:18 1998 Douglas C. Schmidt - - * ace/config-sunos5.6.h: Removed a mysterious "30" at the end of - an #undef. Thanks to J. Russell Noseworthy - for reporting this problem. - -Mon May 04 08:49:09 1998 David L. Levine - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): with ACE_NEEDS_LWP_PRIO_SET, - added the call to ACE_OS::thr_setprio () so that the LWP priority - will be set if running in the RT class. Applications no longer - have to be concerned with this. - - * performance-tests/Misc/preempt.cpp (svc): removed - ACE_OS::thr_setprio () calls to set LWP priority, now that ACE - handles that internally. - - * include/makeinclude/platform_*linux.GNU: added "s" to - ARFLAGS, so that ranlib is no longer necessary. - -Sun May 03 22:37:38 1998 Nanbor Wang - - * ace/Parse_Node.cpp (open_handle): WinCE doesn't support - ExpandEnvironmentStringA. - - * ace/config-win32-common.h: Only define ACE_HAS_GETRUSAGE when - ACE_HAS_WINNT4 != 0. Thanks to Paul Motuzenko - for reporting this. - -Sun May 03 01:58:47 1998 Douglas C. Schmidt - - * ACE version 4.5.1 released. - -Sat May 2 14:35:04 1998 Douglas C. Schmidt - - * tests/Reactor_Notify_Test.cpp: Factored out some common code to - make the test more concise. - - * tests/Reactor_Notify_Test.cpp: Modified the test to check - whether our new mechanism for disabling the notify pipe works - correctly. - - * ace/{WFMO,Select}_Reactor[_Impl]: Added the - "disable_notify_pipe" flag in the constructor in order to - disable this feature and save on descriptors if they aren't - required. Thanks to Tom Venturella for - motivating this. - -Sat May 02 Alexander Babu Arulanthu - - * tests/Aio_Platform_Test.cpp: Included this test program for - testing a platform for Asynchronous I/O options. - * tests/Makefile (BIN): Added Aio_Platform_Test. - -Fri May 01 17:52:32 1998 Nanbor Wang - - * ace/Arg_Shifter.{h,cpp}: Added macros ACE_Export and - ACE_BUILD_DLL respectively. - - * ace/ACE_Library.mak: - * ace/ace_{dll,lib}.dsp: Added Arg_Shifter.cpp into project. - -Fri May 1 13:52:32 1998 Douglas C. Schmidt - - * ace/Addr: Made the destructor for ACE_Addr virtual so that - subclasses can be deleted correctly. Thanks to Wei Chiang - for reporting this. - - * ace: Added Arg_Shifter from TAO and renamed it to - ACE_Arg_Shifter. - - * ace/IOStream_T.i (recv_n): ACE_IOStream::eof (void) had - a subtle bug if it is called when a get operation (>>) has not - failed. Thanks to James CE Johnson for - reporting this bug. - - * examples/Connection/misc/Connection_Handler.cpp: Make sure to - activate() each active object using THR_DETACHED so we don't run - out of threading resources. Thanks to Brad Walton - for reporting this. - - * ace/Timer_Queue_Adapters.cpp: Rather than returning the result - of schedule_ualarm(), the - ACE_Async_Timer_Queue_Adapter::schedule() method should - return the timer id. Thanks to James Garrison - for reporting this. - - * examples/System_V_IPC/SV_Message_Queues: Renamed the so-called - "ACE_Message_Block" to "Message_Block" so it wouldn't be as - confusing. Thanks to Ganapathi for this - suggestion. - -Fri May 01 17:52:32 1998 Nanbor Wang - - * ace/ACE_Library.mak: - * ace/ace_{dll,lib}.dsp: Added Arg_Shifter.cpp into project. - -Fri May 01 14:09:21 1998 Steve Huston - - * ace/OS.h: Changed ACE_hrtime_t from signed to unsigned on Win32 - to insure correct results from ACE_High_Res_Timer::elapsed_time - calculations. Fixes bug P87. - -Fri May 01 11:52:47 1998 Nanbor Wang - - * ace/OS.h: Forgot to redefine ASYS_INLINE after #undef it. - - * ace/OS.i (last_error): On Win32, this should also update errno - after calling SetLastError (). Thanks to Steve for pointing - this out. Fixes bug P88. - -Fri May 01 10:01:09 1998 David L. Levine - - * ace/config-sunos5.6.h: replaced config-sunos5.6-sunc++-4.x.h - with this config file, which supports both Sun C++ and g++. - - * ace/OS.i (gethrtime): for the default (::gettimeofday) case, - use 64-bit instead of 32-bit arithmetic by casting to ACE_hrtime_t. - - * ace/Basic_Types.{h,i}: added ACE_U_LongLong::operator *. - - * ace/Env_Value_T.cpp: added #include of Env_Value_T.h. - -Fri May 1 00:35:40 1998 Nanbor Wang - - * include/makeinclude/wrapper_macros.GNU - (ACE_LDSO_Version_Number): Fixed the problem of not able to - parse a formal release number from ace/VERSION. - -Thu Apr 30 15:53:58 1998 Nanbor Wang - - * ACE.{h,i,cpp}: - * DEV.{h,i,cpp}: - * DEV_Connector.{h,i,cpp}: - * DEV_IO.{h,i,cpp}: - * Date_Time.{h,i,cpp}: - * FIFO_Recv.{h,i,cpp}: - * FIFO_Recv_Msg.{h,i,cpp}: - * FIFO_Send.{h,i,cpp}: - * FIFO_Send_Msg.{h,i,cpp}: - * FILE.{h,i,cpp}: - * FILE_Connector.{h,i,cpp}: - * FILE_IO.{h,i,cpp}: - * IO_SAP.{h,i,cpp}: - * IPC_SAP.{h,i,cpp}: - * LSOCK.{h,i,cpp}: - * LSOCK_CODgram.{h,i,cpp}: - * LSOCK_Connector.{h,i,cpp}: - * LSOCK_Dgram.{h,i,cpp}: - * LSOCK_Stream.{h,i,cpp}: - * Log_Record.{h,i,cpp}: - * Pipe.{h,i,cpp}: - * SOCK.{h,i,cpp}: - * SOCK_CODgram.{h,i,cpp}: - * SOCK_Connector.{h,i,cpp}: - * SOCK_Dgram.{h,i,cpp}: - * SOCK_Dgram_Bcast.{h,i,cpp}: - * SOCK_Dgram_Mcast.{h,i,cpp}: - * SOCK_IO.{h,i,cpp}: - * SOCK_Stream.{h,i,cpp}: - * SPIPE.{h,i,cpp}: - * SPIPE_Connector.{h,i,cpp}: - * SPIPE_Stream.{h,i,cpp}: - * SV_Message_Queue.{h,i,cpp}: - * SV_Semaphore_Complex.{h,i,cpp}: - * SV_Semaphore_Simple.{h,i,cpp}: - * UPIPE_Acceptor.{h,i,cpp}: - * UPIPE_Connector.{h,i,cpp}: Added inline control for these - supposedly default inline functions. - - * ace/config-WinCE.h: Added ACE_LACKS_INLINE_FUNCTIONS. - - * ace/OS.h: Added a new macro ASYS_INLINE for platforms that don't - support inline properly. This is controlled by the macro - ACE_LACKS_INLINE_FUNCTIONS. - - Walked thru all macros and indented them properly. - - * ace/README: Added documentation for ACE_LACKS_INLINE_FUNCTIONS. diff --git a/ChangeLogs/ChangeLog-99a b/ChangeLogs/ChangeLog-99a deleted file mode 100644 index 2ad076c02b8..00000000000 --- a/ChangeLogs/ChangeLog-99a +++ /dev/null @@ -1,13411 +0,0 @@ -Sat Jul 31 20:29:17 1999 Nanbor Wang - - * ace/OS.cpp: Moved the comment regarding *printf to where it - belongs. - - * ace/OS.h: Removed an extra trailing semicolon following - IPPROTO_TCP. - -Sat Jul 31 19:27:50 1999 Douglas C. Schmidt - - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - Now that position-independent malloc works, I finished - integrating all the features in this test. - -Sat Jul 31 19:06:05 1999 Carlos O'Ryan - - * ace/Pipe.cpp: - The third argument to ACE_OS::setsockopt() is a "const char*" no - sense in casting it to void*! - -Sat Jul 31 18:55:34 1999 Kirthika Parameswaran - - * ace/Asynch_IO_Impl.{h, cpp}: - Fixed compiler errors: redefinition of destructors of the - classes in this file. Removed inline declaration of destructors - and defined those which hadnt been defined. - -Sat Jul 31 17:54:32 1999 Carlos O'Ryan - - * etc/enforce_ace_try.diff: - Apply this patch file and then compile to enforce the correct - use of ACE_TRY macros. It renames the exception(), clear() and - print_exception() methods in the CORBA::Environment class. - -Sat Jul 31 17:39:42 1999 Carlos O'Ryan - - * ace/Timeprobe_T.cpp: - Print timeprobe results with higher precision (3 decimal - digits), this is useful for extremely fine grained analysis - where just microseconds won't cut it. - -Sat Jul 31 12:07:48 1999 Douglas C. Schmidt - - * ace: Updated comments in all the header files so that references - to method names like ACE_Event_Handler::handle_input() were - changed to . This change - enables the class2man scripts to use the appropriate "code" font - for these names in the auto-generated documentation. - - * ace/Asynch_IO_Impl: Moved the - virtual destructors for all the ACE_Asynch_*_Impl classes into - the *.cpp file, which is where they belong. - - * ace/Functor_T.h: Moved the destructor of ACE_Command_Callback - out of the header file and into the *.cpp file. - - * ace/Sched_Params.h: Updated the documentation a bit to mention - the ACE_SCHED_{FIFO,RR,OTHER} policies explicitly. Thanks to - Peter Mueller for motivating this. - - * ace/Synch_T: Moved the implementations of ACE_Read_Guard and - ACE_Write_Guard out of the class header and into the *.i file, - which is where they belong. - - * ace/Based_Pointer_T.i (operator *): In order to distinquish a - "NULL" pointer we keep a value of -1 in target. - - * ace/Based_Pointer_T.i: I was forgetting to check if - rhs == 0 for the ACE_Based_Pointer<> class. This leads to weird - behavior when assigning a "NULL" pointer. - - * examples/Reactor/Misc/notification.cpp: Cleaned up the program so - that it looks better and doesn't crash and burn when signals occur. - - * ace/Pipe.cpp (open): We now set the default size of the - ACE_Pipes that are implemented as Internet or UNIX-domain - sockets to ACE_DEFAULT_MAX_SOCKET_BUFSIZ. This will speed up - the Reactor's notify() method and prevent it from deadlocking as - quickly. Thanks to Detlef Becker - for testing this out. - - * ace/OS.h: Added a new macro called ACE_IPPROTO_TCP that factors - out the differences between PHARLAPs and "normal" systems. - - * ace/Strategies_T.{i,cpp}: Added some additional ACE_ERROR printouts - if open() methods fail in constructors. - - * ace/Strategies_T: The logic for creating a new Singleton wasn't - dynamic enough. It's now intelligent enough to create a new - SVC_HANDLER if it's not given one. Thanks to Hao Ruan - for reporting this. - -Sat Jul 31 15:57:16 1999 Carlos O'Ryan - - * ACE version 5.0 released. Party on Wayne. - -Sat Jul 31 12:20:59 1999 Nanbor Wang - - * tests/version_tests/version_tests.dsw: - * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/version_tests/Cached_Conn_Test.dsp: - * tests/version_tests/Cached_Accept_Conn_Test.dsp: Added three - missing version_tests project files. - -Sat Jul 31 00:22:46 1999 Nanbor Wang - - * tests/Basic_Types_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Upgradable_RW_Test.dsp: Rebuilt. ACE_Init_Test.dsp is - still broken. - -Fri Jul 30 10:27:31 1999 Steve Huston - - * ace/config-hpux-10.x.h: Allow building w/o threads - set _REENTRANT - if not set, to pick up _r functions; move - ACE_HAS_NONCONST_SELECT_ TIMEVAL out of the threads-only - section. - -Fri Jul 30 08:36:43 1999 Douglas C. Schmidt - - * ace/OS.i: Commented out the ACE_TRACE calls in ACE_OS::mutex_lock() - and ACE_OS::thread_mutex_lock() to avoid infinite recursion. Thanks - to Ulf Jaehrig for reporting this. - -Fri Jul 30 03:33:14 1999 Carlos O'Ryan - - * bin/auto_compile: - * bin/auto_compile_wrapper: - * bin/run_all_list.pm: - Added options to run only the tests that do not require threads - (-single_threaded) and that do not require the full corba - profile (-minimum_corba). Also added options to disable the cvs - update, to execute realclean before compiling and to print some - debugging info. - -Thu Jul 29 20:44:56 1999 Ossama Othman - - * include/makeinclude/wrapper_macros.GNU: - - Override minimum_corba variable if it isn't set to 1 (i.e. if - minimum_corba is not enabled). This change was needed to make - it easier to disable some TAO ORB services, examples and tests - that rely on CORBA features that aren't supported in the minimum - CORBA specification. - -Thu Jul 29 19:04:12 1999 Ossama Othman - - * ace/Atomic_Op.i: - * ace/Filecache.cpp: - - Replaced raw ACE_*_Guards with their corresponding - ACE_GUARD_RETURN macros. This corrects "unused variable" - warnings when building ACE without thread support. See David's - ChangeLog entry from Fri May 14 16:10:29 1999 for a better - description of why this was necessary. - -Thu Jul 29 18:29:46 1999 Nanbor Wang - - * bin/run_all_list.pm: Moved the RUN_LIST definition from - auto_compile to this file to reduce the work to maintain the - list and allow auto_compile and run_all_win32.pl to synchronize - the tests being run. - - * bin/auto_compile: - * bin/run_all_win32.pl: Removed definition of RUN_LIST and use the - run_all_list module. - -Thu Jul 29 17:30:14 1999 Douglas C. Schmidt - - * ace/Makefile[.am] (pkginclude_HEADERS): Removed Future_Node.* - Thanks to John Tucker and Michael Garvin - for reporting this. - -Thu Jul 29 14:47:10 1999 Ossama Othman - - * ace/Select_Reactor_T.cpp (dispatch_notification_handlers): - - This code is used for picking up updates from non-owner threads. - However, it is also useful for picking up notifications from the - notify pipe (even though the notify is part of the I/O handle - set in the Select_Reactor). Therefore, we have enabled this - code for the single-threaded case also. Thanks to Irfan for - this fix. - -Thu Jul 29 14:32:28 1999 Carlos O'Ryan - - * ace/ACE.cpp: - Linux without returns a different errno (EOPNOTSUPP) if the - connector or acceptor runs out of file descriptors. - - * ace/OS.i: - The Errno_Guard constructor was not using an argument in - platforms without exceptions. - -Thu Jul 29 13:59:15 1999 Douglas C. Schmidt - - * ACE version 4.6.47 released. - -Thu Jul 29 12:32:01 1999 Nanbor Wang - - * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor): - * ace/Select_Reactor_T.cpp (ACE_Select_Reactor_T): I forgot to - initialize flag in one of the two ctors. Thanks - to Ruediger Franke for catching - this one. - -Thu Jul 29 01:04:03 1999 Carlos O'Ryan - - * bin/auto_compile: - * bin/auto_compile_wrapper: - Updated to include the latest round of changes, new tests and - several improvements to send email and stuff. - -Wed Jul 28 18:29:46 1999 Jeff Parsons - - * ace/config-win32.h: - Removed ACE_HAS_STD_TEMPLATE_SPECIALIZATION - definition. See below. - - * ace/config-win32-common.h: - Added ACE_HAS_STD_TEMPLATE_SPECIALIZATION - definition, since there is a place for MSVC 6.0 stuff like this. - Also added ACE_HAS_BROKEN_IMPLICIT_CONST_CAST - definition for a generated code bug fix that just didn't have one version - that would satisfy both SunCC and MSVC. - -Wed Jul 28 18:26:53 1999 Carlos O'Ryan - - * ace/CDR_Stream.cpp: - * ace/Message_Block.h: - * ace/Message_Block.cpp: - * ace/Message_Block_T.h: - * ace/Message_Block_T.cpp: - Re-implemented the clone() method without data copies in a - backwards compatible way, a new clone_nocopy() method was added - so classes that inherit from Data_Block and only override - clone() will work correctly. - Also fixed the implementation of Locked_Data_Blocked because it - is used in TAO and we need zero-copy clone() operations in that - case. - -Wed Jul 28 16:16:27 1999 Nanbor Wang - - * ace/OS.cpp (set): Fixed a unsigned/signed conversion problem - that caused negative usec value in ACE_Time_Value. Thanks to - Jerry D. De Master for reporting the bug. - (FILETIME): Removed some unused macros for dealing with older - Borland C++ compilers. Thanks to Jody and Gonzo for confirming - this. - -Wed Jul 28 13:44:15 1999 Nanbor Wang - - * ACE-INSTALL.html: Remind users to pick the right configurations - when building from MSVC project files. Thanks to Jerry D. De - Master for suggesting this. - -Wed Jul 28 13:26:36 1999 David L. Levine - - * ACE-INSTALL.html: for VxWorks (thru Tornado 1.0.1), - -fno-implicit-templates is broken for x86 targets, - not all targets. - -Wed Jul 28 13:09:26 1999 David L. Levine - - * docs/ACE-subsets.html: updated libACE size breakdown. - -Wed Jul 28 12:08:56 1999 Ossama Othman - - * ace/CDR_Stream.cpp (reset_contents): - - Modified call to clone() so that it uses the newly added - zero-copy semantics. A data copy was already being made in - ACE_InputCDR::steal_from(), which also calls - ACE_InputCDR::reset_contents(). Two data copies were being - performed. This change reduces the number of data copies to - one. Thanks to Carlos for this change. - -Wed Jul 28 11:23:36 1999 Ossama Othman - - * ace/Message_Block.h: - * ace/Message_Block.cpp (clone): - - Added argument that allows the characteristics of an - ACE_Data_Block to be copied without copying the data that the - ACE_Data_Block holds. This modification is part of a zero-copy - optimization for TAO. Thanks to Carlos for implementing this - change. - -Wed Jul 28 09:48:37 1999 David L. Levine - - * docs/ACE-guidelines.html: added guideline about testing - for definition of a macro before using it. Thanks to - Susan Liebeskind for - providing this guideline. - -Wed Jul 28 00:06:32 1999 Douglas C. Schmidt - - * ace: Added a new Makefile.bor file for BCB4. Thanks to Christopher - Kohlhoff for contributing this. - -Tue Jul 27 23:25:18 1999 Douglas C. Schmidt - - * netsvcs/lib/Server_Logging_Handler_T.cpp (open): Updated a - comment to point out that we use a thread-per-connection - concurrency model. Thanks to Raghu Nambiath - for reporting this. - -Tue Jul 27 21:05:23 1999 David L. Levine - - * include/makeinclude/platform_tru64_cxx.GNU (ACE_DU_SUBVERSION): - fixed typo: -v instead of v-. Thanks to - Doug Anderson for reporting this. - -Tue Jul 27 16:58:54 1999 Kirthika Parameswaran - - * ace/ACE.cpp (out_of_handles): Added bug-fixes for RedHat5.2 and - FreeBSD. Thanks to James Megquier for discovering - and testing out the bug-fix on RedHat5.2 and Russell.L.Carter - for sending in a patch for FreeBSD. These - bug fixes are for: $ACE_ROOT/tests/ - Cached_Conn_Test and Cached_Accept_Conn_Test. - -Tue Jul 27 16:55:44 1999 Nanbor Wang - - * include/makeinclude/platform_sunos5_kcc.GNU (MATHLIB): KCC needs - to have this defined. - -Tue Jul 27 16:18:21 1999 David L. Levine - - * ACE-INSTALL.html: updated note about shared libraries - on VxWorks. In particular, they don't provide copies - of global (static) variables in the library. So, "programs" - that share a library will also share the static variables in - the library. [Bug 86] - -Tue Jul 27 14:26:37 1999 Douglas C. Schmidt - - * ace/SOCK_Dgram: Removed the QoS_Params from open() and - ACE_SOCK_Dgram since they don't appear to be useful. Thanks to - Vidya Narayanan for suggesting - this. - -Tue Jul 27 14:41:26 1999 Steve Huston - - * ace/Codeset_IBM1047.cpp: Added a static variable only for HP aC++ - to make it stop warning of an empty translation unit. - -Tue Jul 27 14:16:55 1999 Nanbor Wang - - * ace/Thread_Manager.cpp (cancel_thr): This method should return - the result of thread cancel operation if async_cancel is used. - Thanks to Peter Mueller for suggesting - the fix. - -Mon Jul 26 20:50:37 1999 Douglas C. Schmidt - - * ace/OS: Addded a new pair of priority() fields as place - holders for the forthcoming DiffServ QoS features. Thanks to - Vidya Narayanan for suggesting - this. - -Tue Jul 27 13:28:48 1999 David L. Levine - - * ace/OS.i (getuid): removed extra ACE_TRACE with - ACE_WIN32 or CHORUS. Thanks to Jerry D. De Master - for reporting this. - -Tue Jul 27 11:10:39 1999 David L. Levine - - * examples/System_V_IPC/Makefile: on VxWorks only, fixed - so that make all, etc., work properly (by just printing - the message that these examples aren't used on VxWorks). - -Tue Jul 27 10:25:41 1999 Steve Huston - - * ACE-INSTALL.html: Added a note about required HP-UX 10.20 - patch. Updated aC++ versions. - - * ace/Process.{h cpp} (ACE_Process_Options::command_line): Added - 'const' to make the entire array and contents const. Restores - ability for users of pre-5.0 to still pass char **. Thanks to - Bill Tovrea for reporting this. - - * examples/Connection/non_blocking/Makefile: Re-added LIBS += $(ACELIB) - (see ChangeLog, 23-Jul-1999) but did it in the section for AIX - C Set++ and IBM C/C++ only (ifdef TEMPINCDIR). This is needed to - generate the shared library (libConn) using those compilers. - -Mon Jul 26 20:50:37 1999 Douglas C. Schmidt - - * ace/Future.h: Moved the static methods until the bottom - of the ACE_Future_Rep class (again) to workaround a bug with - Borland's C++ Builder. Thanks to Christopher Kohlhoff - for reporting this (again). - -Mon Jul 26 20:59:23 1999 Carlos O'Ryan - - * websvcs/README: - Added a brief description of the directory and its current - contents. Thanks to Will Skunk - for motivating this. - -Mon Jul 26 20:50:37 1999 Douglas C. Schmidt - - * ace/Log_Msg.cpp: Added support for the 'W' (UNICODE) option for - Win32. Thanks to Valery Arkhangorodsky - for contributing this. - -Mon Jul 26 20:58:35 1999 Alexander Babu Arulanthu - - * ace/POSIX_Asynch_IO.cpp: - * ace/WIN32_Asynch_IO.cpp: Fixed the double deletion problem of - the result classes. Thanks to David Digby - and Timothy Schimke - for reporting this. - -Mon Jul 26 18:09:09 1999 Irfan Pyarali - - * tests/run_tests.sh (Cached_Conn_Test and - Cached_Accept_Conn_Test): These two tests are known to leak - memory when compiled with old gcc (g++). Therefore, we skip - these tests when using purify and old gcc (g++). A -p option - was added to the script to indicate that we want to run with - purify. - -Mon Jul 26 17:09:09 1999 David L. Levine - - * ace/Object_Manager.{h,cpp},Makefile: don't create the - ACE_TOKEN_MANAGER_CREATION_LOCK and - ACE_TOKEN_INVARIANTS_CREATION_LOCK preallocated objects - if the Token component isn't build. This gets rid of - unresolved references to the ACE_Token_Proxy compoents - on VxWorks/g++ when Token isn't built. Thanks to - Stephane Chatre for reporting this. - -Mon Jul 26 17:02:08 1999 David L. Levine - - * include/makeinclude/wrapper_macros.GNU: don't override - OBJDIRS on VxWorks with shared libs. This allows - make realclean to work properly on VxWorks, when shared - lib builds are enabled. - -Mon Jul 26 15:06:23 1999 Jeff Parsons - - * ace/CDR_Stream.i: - * ace/Map_Manager.i: - Had to cast some return values to avoid MSVC signed/unsigned - mismatch type warnings (level 4). - - * ace/config-win32.h: - Added ACE_HAS_STD_TEMPLATE_SPECIALIZATION define, so that - ACE_TEMPLATE_SPECIALIZATION macro adds the necessart - 'template <>' for MSVC, and so averts many many level 4 - warnings. - -Mon Jul 26 14:10:56 1999 Kirthika Parameswaran - - * ace/DLL.cpp (get_handle): Changed the check of - flag to now reset only if the - is set. Thanks to Bob McWhirter - for pointing this out. - -Mon Jul 26 12:32:41 1999 Douglas C. Schmidt - - * ACE version 4.6.46 released. - -Fri Jul 23 18:20:11 1999 Carlos O'Ryan - - * ace/config-irix6.x-sgic++-nothreads.h: - Enabled namespaces with MIPSPro 7.2 or higher. - -Fri Jul 23 16:40:15 1999 Carlos O'Ryan - - * ace/ACE.cpp: - Fixed typos in error return values for ACE::execname() - -Fri Jul 23 14:51:48 1999 Douglas C. Schmidt - - * examples/Service_Configurator/IPC-tests/Handle_L_CODgram, - examples/Service_Configurator/IPC-tests/Handle_L_Dgram, - examples/Service_Configurator/IPC-tests/Handle_L_Pipe: - Cleaned this stuff up so that it builds correctly when - ACE_LACKS_UNIX_DOMAIN_SOCKETS is enabled. Thanks to - David for reporting this. - - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe: - Made upper_case() a method in the Handle_L_Pipe class. - - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp: - Removed the bizarre hacks for SunOS4. This stuff probably - hasn't been tested since 1992! - -Fri Jul 23 14:16:22 1999 Steve Huston - - * ace/OS.i (ACE_OS::read): (only non-Win32), if call fails and - errno is EAGAIN, change it to EWOULDBLOCK. Improve portability for - platforms where EAGAIN and EWOULDBLOCK are different values and - both used, like HP-UX. - - * ace/Malloc_T.cpp (ACE_Malloc<> ctor): Added missing newline in error - message. - -Fri Jul 23 12:09:18 1999 Nanbor Wang - - * ace/OS.i: Fixed some mismatched ifdef/endif comments. - - * ace/ACE.cpp (execname): Fixed some misuses of ACE_HAS_WIN32 - macros where they should have been ACE_WIN32. Thanks to Andy - for noticing this. - -Fri Jul 23 11:28:17 1999 Douglas C. Schmidt - - * ace/Memory_Pool.cpp (init_acquire): shmat() returns -1 on - failure, not 0. Thanks to Kevin Liu - for reporting this. - -Fri Jul 23 11:35:31 1999 David L. Levine - - * examples/Connection/non_blocking/tests_lsock_{acceptor, - connector.cpp}: disabled if ACE_LACKS_UNIX_DOMAIN_SOCKETS. - Thanks to Alain Magloire for reporting this. - - * examples/Connection/non_blocking/Makefile: removed unneeded - LIBS (=$(ACELIB)) and BUILD macro definitions. - -Fri Jul 23 10:07:05 1999 David L. Levine - - * include/makeinclude/platform_qnx_neutrino.GNU: added - CROSS-COMPILE macro definition. Thanks to - Alain Magloire for reporting this. - -Fri Jul 23 08:58:56 1999 Douglas C. Schmidt - - * ace/Service_Config.h: Clarified the fact that the - ACE_Service_Config uses the Monostate pattern, so there can only - be one of them per-process. Thanks to Ralf Kluthe - for reporting this. - -Fri Jul 23 07:49:31 1999 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++.GNU: added - comment about options for producing 64-bit binaries. - Thanks to Jeff Franks for - raising this issue. - -Fri Jul 23 03:10:31 1999 Irfan Pyarali - - * ace/Strategies_T.cpp (find_or_create_svc_handler_i): - * ace/Cached_Connect_Strategy_T.cpp (cached_connect): - - I had added the new_connection() method that lets go of the lock - for the duration of the connect(), but forgot to use it in the - above functions ;) It should be fine now. - - * tests/Cached_Conn_Test.cpp (cached_connect): - * tests/Cached_Accept_Conn_Test.cpp (cached_connect): - - Host of the remote address should be ACE_LOCALHOST instead of - ACE_DEFAULT_SERVER_HOST. - -Thu Jul 22 23:23:26 1999 Irfan Pyarali - - * ace/Handle_Gobbler.h (class ACE_Handle_Gobbler): Inlined - declaration of the functions. - -Thu Jul 22 20:03:54 1999 Douglas C. Schmidt - - * ace/Acceptor.cpp: For sanity's sake, initialize all the data - members to 0 in the ACE_Strategy_Acceptor constructor. Thanks - to Jody Hagins for reporting this. - - * ace/Acceptor.cpp: The service_port_ data member in the - ACE_Strategy_Acceptor wasn't being initialized to 0. Thanks to - Jody Hagins for reporting this. - - * ace/Acceptor.cpp: Modified the dump() and info() methods so that - don't do bad things if service_name_ and service_description_ - are NULL. Thanks to Jody Hagins for this - suggestion. - - * ace/Message_Queue_T.h: Clarified what the errnos get set to when - timeouts occur or queues are deactivated. Thanks to - John Forest for suggesting this. - -Thu Jul 22 16:55:14 1999 Carlos O'Ryan - - * ace/Stats.cpp: - Fixed message that had a %s but no argument! - -Thu Jul 22 15:12:18 1999 David L. Levine - - * ace/Codeset_IBM1047.{h,cpp}: wrapped with #ifdef ACE_MVS - so that the code doesn't occupy any space on platforms - other than MVS. - -Thu Jul 22 14:22:41 1999 David L. Levine - - * examples/Shared_Malloc/Malloc.cpp: fixed explicit - template instantiations so that there are no duplications - with ACE_LACKS_SBRK and ACE_LACKS_SYSV_SHMEM. - -Thu Jul 22 12:17:26 1999 David L. Levine - - * ace/config-lynxos.h: removed ACE_LACKS_FORK on PowerPC. - All of the ACE tests that fork now succeed. - -Thu Jul 22 11:54:58 1999 David L. Levine - - * tests/SV_Shared_Memory_Test.cpp (child): added a one - second sleep to give the parent a chance to create the - semaphore. This allows the test to succeed on LynxOS/PPC - (with fork ()). - - * tests/Process_Mutex_Test.cpp,Process_Strategy_Test.cpp (main): - added a one second sleep after spawning each server, to give it - a chance to start. Also, wrapped some string literals with - ASYS_TEXT. Again, success on LynxOS/PPC with fork (). - -Thu Jul 22 10:42:06 1999 Clarence M. Weaver - - * ACE-INSTALL.html: added steps for running the ACE tests - on VxWorks platforms that lack NFS. - -Thu Jul 22 10:25:31 1999 David L. Levine - - * ace/Log_Record.cpp,SString.cpp: wrapped #include of - ace/streams.h with #ifndef ACE_LACKS_IOSTREAMS_TOTALLY. - [Bug 84] - -Thu Jul 22 09:55:10 1999 David L. Levine - - * docs/ACE-guidelines.html: updated commit message guideline - to show ChangeLogTag example. - -Thu Jul 22 02:15:46 1999 Irfan Pyarali - - * ace/Handle_Gobbler (class ACE_Handle_Gobbler): New class that - gobbles up handles :) This class is useful when we need to - control the number of handles available for a process. Mostly - used for testing purposes. - - Note that even though the new files are in the ace directory, - they are not part of the ace library. The files only contain - inline functions and Handle_Gobbler.h is only included where - needed. - - * tests/Cached_Conn_Test.cpp: - * tests/Cached_Accept_Conn_Test.cpp: - - Added Handle_Gobbler to the test to reduce the iterations - required before handles run out and purging starts. - -Wed Jul 21 21:45:22 1999 Nanbor Wang - - * ace/Reactor.cpp: Applied ACE_NOTREACHED to several - run_*_event_loop methods. - - * docs/ACE-guidelines.html: Updated ASYS_TEXT usage. - - * ace/RB_Tree.cpp: - * tests/Cache_Map_Manager_Test.cpp: Applied ASYS_TEXT liberally. - -Wed Jul 21 21:19:36 1999 David L. Levine - - * ACE-INSTALL.html: added note about ACE support for - shared libraries on VxWorks. It's still under - development. - -Wed Jul 21 18:38:00 1999 Irfan Pyarali - - * ace/Strategies_T.h (ACE_Cached_Connect_Strategy): Renamed - to . - - * ace/Hash_Cache_Map_Manager_T.cpp (find): Finding and updating - the attributes is faster through the find() that uses an entry. - Therefore, for find (key, value) and find (key) we go to - find (key, entry) instead of going to the base class. - - * ace/Cached_Connect_Strategy_T.cpp: - - - ACE_Cached_Connect_Strategy_Ex::check_hint_i - - ACE_Cached_Connect_Strategy_Ex::find - - Update the caching attributes directly since we don't do a - find() on the cache map. - -Wed Jul 21 15:54:25 1999 Nanbor Wang - - * ace/DLL.cpp: ACE_HAS_MOSTLY_UNICODE_APIS fixes. - - * ace/OS.i (ctime): - * ace/OS.cpp (ctime): One copy should only be available when - ACE_HAS_MOSTLY_UNICODE_APIS is defined. Thanks to Steve for - reporting this. - -Wed Jul 21 15:21:32 1999 David L. Levine - - * tests/Env_Value_Test.cpp (main): use the single-process - version if ACE_LACKS_FORK, in addition to if - ACE_HAS_NONSTATIC_OBJECT_MANAGER. - - * tests/Time_Service_Test.cpp (main): neuter if ACE_LACKS_FORK, - because the test uses ACE_Process::spawn (). - - Thanks to Riaz Syed for reporting these. - -Wed Jul 21 11:48:53 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - use full path to $(CC) in egcs version check, to avoid - warning if it is not on the user's PATH. - -Wed Jul 21 11:44:19 1999 Carlos O'Ryan - - * ace/OS.h: - Simplified the definition of the ACE_THR_PRI_*_DEF macros from - (MIN+(MAX-MIN)/2) to ((MIN+MAX)/2), the new definition is not - only easier to read, makes less operations (and function calls) - but it is also safer when the the priorities are "backwards" and - PRI_MAX < PRI_MIN - -Wed Jul 21 11:40:31 1999 Steve Huston - - * include/makeinclude/platform_aix4_cset++.GNU: - * include/makeinclude/platform_hpux_aCC.GNU: Replaced lines like - "debug=1" with ifeq (,$(debug)) debug=1 endif. - - * include/makeinclude/platform_aix4_g++.GNU: - Above change for variables, also added -Wl,-bbigtoc when linking - TAO_IDL, else it runs out of toc space. Don't do it for all links - because bigtoc introduces a run-time performance penalty. - -Wed Jul 21 10:25:07 1999 David L. Levine - - * ace/OS.{h,cpp} (tss_base,tss_open): with TSS emulation, - no longer return indication of whether tss_base allocated - the ts_storage array. Instead, added an (optional) - argument that tss_open can use for that purpose. This - allows threads that haven't been spawned by ACE to use - ACE's TSS emulation. Thanks to David Hauck - for reporting this and testing - the fix on NT. And, thanks to Terry Rosenbaum - for originally reporting it. - -Wed Jul 21 09:34:09 1999 David L. Levine - - * examples/Shared_Malloc/test_position_independent_malloc.cpp (main): - removed declarations of unused argc and argv. - -Wed Jul 21 04:32:20 1999 Nanbor Wang - - * ace/Reactor.cpp: - * ace/Reactor.h: - * ace/Reactor.i: - * ace/Reactor_Impl.h: - * ace/Select_Reactor_T.cpp: - * ace/Select_Reactor_T.h: - * ace/Select_Reactor_T.i: - * ace/TP_Reactor.cpp: - * ace/WFMO_Reactor.cpp: - * ace/WFMO_Reactor.h: - * ace/WFMO_Reactor.i: The change was motivated by removing a race - condition in TP_Reactor during shutdown. There was a small time - gap between a thread running TP_Reactor event loop checking its - end_event_loop flag to the thread actually grabing the token in - TP_Reactor. Since the token return to its "normal" state after - broadcasting, this thread has no chance to notice that the - reactor has already been shutdowned and thus a deadlock occured. - In order to fix the problem, we must keep a state indicating - whether the reactor has been shutdowned or not in the reactor. - - An added benefit of adding this state is that every reactor now - has its own run_reactor_event_loop which mimic the behavior of - the static ACE_Reactor::run_event_loop but instead of working on - the singleton reactor, the added function work on an instance of - reactor object. In fact, all event_loop control functions have - been added. They are named *_reactor_event_loop to - differentiate their behavior. These newly added function use - the added state in the reactor to control the looping of event - handling. All run_reactor_event_loop methods take an extra - argument of a function pointer. The function will be called in - every iteration if it is set. - - Notice that the singleton event loop control functions are still - available. Although these function merely forward the call to - the singleton reactor's *_reactor_event_loop functions, you can - still use them to control the "main" event loop. In fact, it is - required that you use these functions to run the main event loop - because it facilitates Service_Configurator's "reconfigure" - feature. - - All reactors now also have two extra functions namely - "deactivated" which is used to query whether the reactor will - handle more incoming event or not, and "deactivate" which is - used to control this new feature. - - An side effect of the change is that, once a reactor get - deactivated, calls to handle_events will return -1 immediately. - You can use the "deactivated" method to check if there's - actually an error in the handle_events method or it simply - returned because the reactor has been deactivated. This is also - how the various "run_reactor_event_loop" handle the situation. - Notice that this should not cause any backward compatibility - problem becuase if a user is using his own end_event_loop flag, - he will not (and should not) invoke any more handle_events after - the flag has been set. Also, if he is using the global - run_event_loop methods (for controling singleton reactor,) they - should still behave the same. - - To summarize the change: - - 1. The run_event_loop control logic has been "pushed" down into - each individual reactor. The methods supporting the logic are - defined in ACE_Reactor and are: - - run_reactor_event_loop () - run_alertable_reactor_event_loop () - end_reactor_event_loop () - reactor_event_loop_done () - reset_reactor_event_loop () - - 2. The origianl run_event_loop methods in ACE_Reactor are still - working but they now use the run_reactor_event_loop methods in - the implementation of the reactor. - - 3. Reactors now keep a state to indicate handle_events should be - called or not. They can be controlled thru: - - deactivated () - deactivate () - - methods. - -Tue Jul 20 21:31:50 1999 Jim Rogers jrogers@viasoft.com - - * ace/config-mvs.h: added ACE_HAS_EXCEPTIONS. - -Tue Jul 20 21:23:19 1999 David L. Levine - - * ace/OS.* (next_key,total_keys): with TSS_EMULATION, - added guard (using preallocated ACE_TSS_KEY_LOCK) - to access of next_key_. Uninlined both of these - functions because they now have the guards. Thanks - to Jake Hamby for reporting this. - -Tue Jul 20 21:11:02 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - fixed test of g++ for whether it's egcs. Thanks to - Erik Johannes for reporting this. - (The symptom was that TAO's IORManipulation.cpp wouldn't - compile due to an internal compiler error. Adding - -fno-exceptions works around that.) - -Tue Jul 20 18:30:22 1999 Irfan Pyarali - - * ace/Cached_Connect_Strategy_T.h: All functions in - ACE_Cached_Connect_Strategy_Ex and ACE_Cached_Connect_Strategy - that contain specific information about the map used by the - class should not be virtual. - - * ace/Future_Set.cpp (next_readable): Removed extra code that was - left behind from a debugging stage. Thanks to author John - Tucker for helping with this. - -Tue Jul 20 12:02:47 1999 David L. Levine - - * examples/Threads/task_five.cpp (main): removed - ACE_NOTREACHED wrapper around the final return statement. - It's reachable now. - -Tue Jul 20 11:46:09 1999 Douglas C. Schmidt - - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - Completely #ifdef'd this example out until we get it working. - Thanks to David Levine for reporting this. - -Tue Jul 20 11:15:23 1999 David L. Levine - - * ACE-INSTALL.html: updated memory requirements discussions. - -Tue Jul 20 09:43:36 1999 Ossama Othman - - * ace/Future_Set.cpp (next_readable): - - Fixed unused variable warnings. - -Tue Jul 20 09:33:02 1999 David L. Levine - - * ace/OS.{h,i} (sigwait): only use the DIGITAL_UNIX sigwait - massaging with cxx, not with any other compiler. Thanks to - Doug Anderson for suggesting this, because - egcs issued warnings with it. - -Tue Jul 20 07:06:28 1999 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU: - removed -ptr ptrepository. Let the compiler use its - default template repository. - - * include/makeinclude/rules.local.GNU (realclean): added - cxx_repository, for DU cxx. - -Tue Jul 20 07:01:57 1999 Doug Anderson - - * ace/OS.i (sigwait,thr_sigsetmask): added support for - Cray UNICOS 9. - -Mon Jul 19 22:46:54 1999 Irfan Pyarali - - * ace/Strategies_T.cpp - (ACE_Cached_Connect_Strategy::new_connection):: We use a reverse - lock to let go of the lock for the duration of the actual - connect. This will allow other threads to hack on the - connection cache while this thread creates the new connection. - Thanks to James Whitledge for - suggesting this. - - * tests/Cached_Accept_Conn_Test.cpp - * tests/Cached_Conn_Test.cpp - * tests/Conn_Test.cpp - - Added reverse lock template instantiations. - - * ace/Synch_T: Since the reverse lock constructor that created the - regular lock was removed, there was no need for the - variable, and could be changed into a - reference (instead of pointer). - -Mon Jul 19 23:04:15 1999 Douglas C. Schmidt - - * netsvcs/lib/Logging_Strategy.cpp (init): The ACE_LOG_MSG->open() - call at the end of the ACE_Logging_Strategy::init() method - *must* specify the flags and logger key or an application will - not connect to the client logger daemon automatically when the - ACE_Log_Msg::LOGGER flag is set in a svc.conf file. Thanks to - Jerry De Master for reporting this. - -Mon Jul 19 22:11:13 1999 David L. Levine - - * ACE-INSTALL.html: cleaned up instructions for building - on NT for VxWorks target. Thanks to Stephane Chatre - for reporting that the instructions - were out of date. - -Mon Jul 19 21:38:16 1999 Carlos O'Ryan - - * tests/run_tests.vxworks: - Re-enable the Cached_Conn_Test and Cached_Accept_Conn_Test, it - works on Linux, NT, Solaris, IRIX and HP-UX so we should be - pretty close. Thanks to Irfan for fixing the problems with this - test. - -Mon Jul 19 21:26:57 1999 David L. Levine - - * ace/OS.{h,i}: reverted sigwait () changes on Digital - Unix. They cause examples/Threads/process_manager.cpp - to not compile on DU 5.0 with cxx 6.2-021. See - Mon Jul 19 21:13:16 1999 Doug Anderson . - -Mon Jul 19 21:13:16 1999 Doug Anderson - - * ace/ACE.cpp,ace/Basic_Types.h,ace/CDR_Stream.{h,cpp}, - ace/SOCK_Dgram_Bcast.cpp,ace/config-cray.h, - tests/Basic_Types_Test.cpp,tests/Handle_Set_Test.cpp, - include/makeinclude/platform_cray.GNU - - I finally managed to get the latest and greatest to work on - the Cray. Still no CDR support, but that will be post 5.0. - - * ace/OS.{h,i}: added support for egcs on Digital Unix (4.0d & e). - Fixe problem with legacy workarounds in OS.* for sigwait() and - cxx/GNU that don't appear to be necessary on 4.0d/e/f with - neither cxx nor GNU. - - * include/makeinclude/platform_tru64_g++.GNU: added. Works - with ace/config-tru64.h. - -Mon Jul 19 19:46:50 1999 Irfan Pyarali - - * ace/OS.h: Added ACE_*_cast_*_ptr and ACE_*_cast_*_ref for const, - static, and reinterpret casts. - - * ace/Strategies_T.cpp (find): - * ace/Cached_Connect_Strategy_T.cpp (find): - - The comparison should be between ACE_PEER_CONNECTOR_ADDR and not - REFCOUNTED_HASH_RECYCLABLE_ADDRESS. - - * ace/Svc_Handler: Changed to . - was too generic and in some cases a method was already - present in classes deriving from Svc_Handler. - - Also, added a accessor. - - The following files were effected: - - - ace/Cached_Connect_Strategy_T.cpp - - ace/Cached_Connect_Strategy_T.h - - ace/Caching_Utility_T.cpp - - ace/Strategies.h - - ace/Strategies.i - - ace/Strategies_T.cpp - - ace/Strategies_T.h - - ace/Strategies_T.i - - tests/Cached_Accept_Conn_Test.cpp - - tests/Cached_Conn_Test.cpp - -Mon Jul 19 20:08:15 1999 Carlos O'Ryan - - * ace/Strategies_T.cpp: - Fixed lookup of connections in the Cached_Connect_Strategy, - thanks to Irfan for providing this fix. - -Mon Jul 19 12:26:20 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU, - ace/config-g++-common.h: - don't #define ACE_HAS_GNUG_PRE_2_8 with Tornado II's - g++. It's egcs, though it's version identifier says - it's 2.7. Thanks to Thomas Lockhart - for reporting this. [Bug 80] - -Mon Jul 19 09:50:31 1999 Steve Huston - - * ace/Future.cpp: Added ACE_TYPENAME to template-qualified types. - * ace/Future.cpp: Added #include "ace/Containers.h" to be sure the - types necessary for this class is available at template link - time. - - * apps/gperf/src/Options.h: If on PharLap ETS, clear out its definition - of EOS to avoid compile errors. Thanks to David Hauck - for this fix. - -Mon Jul 19 08:12:30 1999 David L. Levine - - * include/makeinclude/platform_tru64_cxx.GNU: added support - for DU 4.0E and D. - -Mon Jul 19 08:08:25 1999 Steve Huston - - * ace/config-hpux-(10 11).x-hpc++.h: In the aC++ section, if __HP_aCC - is not set, set it. Some parts of TAO rely on it, but it's not set - until the most recent versions of the compiler. Thanks to Brian - Wallis for helping figure this out. - -Mon Jul 19 07:53:59 1999 David L. Levine - - * ace/SOCK_Dgram_Mcast.cpp (open): added unnecessary const_cast - of mcast_addr to ACE_Addr &, so that Sun C++ 4.2 will compile - without error. Thanks to Andy for this fix. - -Sun Jul 18 21:36:04 1999 David L. Levine - - * OS.cpp (sched_params): wrapped DIGITAL_UNIX preprocessor - symbol in parenthesis. - -Sun Jul 18 14:30:54 1999 Douglas C. Schmidt - - * tests/run_tests.sh: Reenabled the Future_Set_Test. Hopefully, - this will work on Solaris and the other platforms now! - - * ace/Future*: Added some fixes for Future_Set that should prevent - it from hanging indefinitely on certain platforms. Also, - removed the Future_Node.h and Future_Node.cpp files since they - are no longer used. Thanks to John Tucker - for contributing these fixes. - - * ace/SOCK_Dgram_Mcast: Finished implementing the QoS-enabled APIs for - socket datagram multicast. This required refactoring quite a - bit of code and adding some new methods that take the - ACE_QoS_Params. - - * ace/SOCK_Dgram.cpp: Finished integrating the QoS support - for SOCK dgrams. - - * ace/SOCK_Dgram.cpp: Factored out common code in the - ACE_SOCK_Dgram constructors. - - * ace/SOCK_Connector: Finished implementing the QoS-enabled - connect() methods. To make this cleaner, I've created a new - "shared_open()" method that factors out the common code. - - * ace/SOCK_Acceptor: Finished implementing the QoS-enabled open() - method. To make this cleaner, I've created a new - "shared_open()" method that factors out the common code. - -Sat Jul 17 13:36:03 1999 Ossama Othman - - * ace/High_Res_Timer.cpp (get_cpuinfo): - - Removed extra `FILE *cpuinfo' declaration. - -Sat Jul 17 12:20:25 1999 Douglas C. Schmidt - - * ace/High_Res_Timer: Added integrated support for Alpha and - Pentium that will eliminate the 5sec startup delay for Linux/PII - clients using the ACE high resolution timer. Thanks to Thomas - Lockhart for these fixes. - - * netsvcs/servers/main.cpp (main): Fixed a typo caused by recent - integration of Jerry De Master's fixes. - -Fri Jul 16 19:41:05 1999 Irfan Pyarali - - * ace/ACE.cpp (out_of_handles): Added a function to check if a - process is out of handles (file descriptors). This is required - to avoid repeating this code in many places. Also, note that - all platform specific quirks can be captured in this function. - - * ace/Cached_Connect_Strategy_T.cpp (cached_connect): - * tests/Cached_Conn_Test.cpp (out_of_sockets_handler): - * tests/Cached_Accept_Conn_Test.cpp (out_of_sockets_handler): - - Changed the above to use the new ACE::out_of_handles() function. - - * ace/OS.h (ENFILE): Added ENFILE if missing on platform. In that - case, ENFILE will equal to EMFILE. - -Fri Jul 16 13:55:34 1999 Douglas C. Schmidt - - * include/makeinclude/{build_dll.bor,build_exe.bor,compiler.bor}, - ace/{Makefile.bor,ace.rc}: - Updated these files to add version information to the DLLs so - when you right click them in windows explorer you can see what - version the file is (e.g., "4.6.45"). Thanks to Christopher - Kohlhoff for contributing this. - - * netsvcs/servers/main.cpp (main): Disable debugging messages - if the -d option isn't given to ACE_Service_Config. Thanks to - Jerry De Master for reporting this. - - * ace/config-win32-borland.h: Updated this file to enable some - necessary macros. Thanks to Christopher Kohlhoff - for reporting this. - - * tests/DLL_Test.cpp, - tests/run_test.bat: Updated these to handle the appropriate - directory where the Borland tests are built. Thanks to - Christopher Kohlhoff for reporting this. - - * netsvcs/lib/Logging_Strategy.cpp (init): When the application - program is started, none of the log output is sent to the - Client_Logging_Service. Further investigation shows that the - ACE_Log_Msg::open() method is responsible for connecting to the - client logger if the ACE_Log_Msg::LOGGER flag is set. However, - the connections never attempted because the ACE_Log_Msg::open() - method is called before the Logging_Strategy flags have been - parsed. This problem was fixed by rearranging the point at - which the ACE_LOG_MSG->open() method was called. Thanks to - Jerry De Master for contributing this. - - * netsvcs/lib/Client_Logging_Handler.cpp (send), - netsvcs/lib/Log_Message_Receiver.cpp (log_output): - All log message output in ACE is done through one of the - ACE_Log_Record::print() methods. Each of the overloaded methods - has a argument as the second argument. However, all - uses of the ACE_Log_Record::print() method in - Log_Message_Receiver.cpp and Client_Logging_Handler.cpp pass - zero for the flags argument. To fix this, simply pass - ACE_Log_Msg::instance()->flags() instead of 0. Thanks to Jerry - De Master for contributing this. - - * ace/Log_Record.cpp (format_msg): Added code for the new - ACE_Log_Record::format_msg() method that adds the date/time - stamp to the ACE_Log_Msg::VERBOSE_LITE output. Thanks to Jerry - De Master for contributing this. - - * netsvcs/lib/Logging_Strategy.cpp (init): Make sure the - ACE_Log_Msg::VERBOSE_LITE flag is OR'd into the clr_flags() - call. Thanks to Jerry De Master for - reporting this. - - * netsvcs/lib/Logging_Strategy.cpp (tokenize): Make sure that - the ACE_Log_Msg::VERBOSE_LITE flag is correctly parsed. Thanks - to Jerry De Master for reporting this. - - * ace/Memory_Pool.h: Added a way to set the segment_size in - ACE_Shared_Memory_Pool_Options and ACE_Shared_Memory_Pool. - Thanks to Serge Kolgan for this fix. [This - feature was actually added a couple of beta releases ago, but - somehow the ChangeLog entry got lost.] - -Fri Jul 16 16:41:22 1999 Ossama Othman - - * ace/Stats.cpp (print_summary): - - Fixed format specifier that was expecting an integer argument. - It needed an additional percent specifier. - -Fri Jul 16 09:20:42 1999 Arturo Montes - - * ace/OS.i: Patch the dl* family to keep ACE - compatible in SCO OpenServer 5.0.0, 5.0.2, 5.0.4 with 5.0.5 - - * ace/config-sco-5.0.0.h: Bring OpenServer up to date. - - * include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU: - Use gcc-2.95. - -Fri Jul 16 11:50:24 1999 Nanbor Wang - - * ace/Log_Msg.cpp (log): - * tests/Basic_Types_Test.cpp (main): Reverted my previous - change. It was not a safe assumption. - -Fri Jul 16 02:28:10 1999 Nanbor Wang - - * ace/Log_Msg.cpp (log): Changed (*va_arg (argp,PTF))(), which - extracts a function pointer from va_list and makes a call using - the pointer pointer to ACE_reinterpret_cast (PTF, va_arg (argp, - long))(). This assumes the sizeof (long) is exactly equal to - the size of a function pointer. - - * tests/Basic_Types_Test.cpp (main): Narrow down the check to - ensure sizeof(long) == sizeof (a function pointer) (which is - true for all the platforms that ACE runs on.) - -Fri Jul 16 00:07:23 1999 Irfan Pyarali - - * tests/Cached_Accept_Conn_Test.cpp (test_connection_management): - Changed the test to allow for both one listen endpoint or - multiple listen endpoints. - -Thu Jul 15 22:42:36 1999 Nanbor Wang - - * ace/Message_Queue.h: (ACE_MESSAGE_QUEUE_DEFAULT_TYPE): - * ace/Future_Set.{h,cpp} (ACE_Future_Set): Typedef'ed the - ACE_Message_Queue to ACE_MESSAGE_QUEUE_DEFAULT_TYPE and use the - typedef'ed name in ACE_Future_Set's contstructor to get around a - bug in vxworks' g++ compiler. - -Thu Jul 15 22:14:18 1999 Irfan Pyarali - - * ace/Cached_Connect_Strategy_T.cpp - * ace/Cached_Connect_Strategy_T.h - * ace/Strategies_T.cpp - * ace/Strategies_T.h - - Changed find()'s signature to help g++. - - * tests/Cached_Accept_Conn_Test.cpp - * tests/Conn_Test.cpp - - Added template instantiations. - -Thu Jul 15 21:32:26 1999 David L. Levine - - * bin/create_ace_build: removed # -*- perl -*- on first - line so that t/csh users don't trip over it. Thanks - to Irfan for reporting this. - -Thu Jul 15 20:23:39 1999 Irfan Pyarali - - * tests/Cached_Conn_Test.cpp (test_connection_management): Changed - the test to allow for both one listen endpoint or multiple - listen endpoints. - - * ace/Cached_Connect_Strategy_T.cpp: - * ace/Strategies_T.cpp - - - find: Since the comparison of - REFCOUNTED_HASH_RECYCLABLE_ADDRESS doesn't work very well when - trying to find an idle connection (because there are many idle - states), we now use the new backet iterator to find a idle - connection. - - - check_hint_i: Explicitly checks for idleness; previously it - was simple checking !closed. - - * ace/Strategies.h (ACE_Recyclable): Changed ACE_Recyclable::State - to ACE_Recyclable_State. - - * ace/Strategies_T.h (ACE_Refcounted_Hash_Recyclable): - - - Added operator!=(ACE_Refcounted_Hash_Recyclable) - - Removed operator==(T) - - Added T &subject() - - Change operator==(ACE_Refcounted_Hash_Recyclable) to check - for equality in state and subject. - - * ace/Caching_Utility_T.cpp (minimum): Entries marked - ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE should also be considered - for purging. - - * ace/Cleanup_Strategies_T.cpp (cleanup): The hash map of the - connection cache may contain duplicates. Therefore, we are not - exactly sure which map entry will be removed when calling - unbind(). Therefore, we use the other unbind() which gives us - back the value of the entry that was removed. This way will - close the correct handler. - - * ace/Svc_Handler.cpp (state): Added a new method that allows the - user to explcitly set the state of the Svc_Handler. If the - Svc_Handler does not have a recycler, this method will have no - effect. - -Thu Jul 15 16:39:06 1999 Ossama Othman - - * Makefile: - * NEWS: - - The NEWS file is no longer a generated file so it was added to - the list of controlled files. - -Thu Jul 15 16:20:43 1999 Nanbor Wang - - * ace/Service_Manager.cpp (init): Check to see the acceptor handle - is ACE_INVALID_HANDLE before the actual initialization to - prevent this service from being initialized twice. - (fini): Must call remove_handler with - ACE_Event_Handler::DONT_CALL since the service manager won't be - around when the reactor is being destroyed. Thanks to Gheorghe - Aprotosoaie for reporting this. - -Thu Jul 15 16:26:28 1999 David L. Levine - - * ace/OS.cpp (spa): use ACE_NEEDS_HUGE_THREAD_STACKSIZE - instead of hard-coded value. - - * ace/config-vxworks5.x.h: added default - ACE_NEEDS_HUGE_THREAD_STACKSIZE of 64000. - -Thu Jul 15 16:08:48 1999 Nanbor Wang - - * ace/config-win32-common.h: Moved ACE_HAS_IP_MULTICAST down - *after* ACE_HAS_WINSOCK2 is defined. Thanks to Marina for - reporting this. - -Thu Jul 15 16:11:04 1999 David L. Levine - - * ace/Basic_Types.h (ACE_U_LongLong): removed user-defined - conversion to ptr_arith_t. Replaced with new macro, - ACE_LONGLONG_TO_PTR. - -Thu Jul 15 15:31:49 1999 Ossama Othman - - * ace/ACE.cpp (timestamp): - * ace/High_Res_Timer.cpp (print_ave): - * ace/Local_Tokens.cpp (open): - * ace/Log_Msg.cpp (log): - * ace/Log_Record.cpp (format_msg): - * ace/Naming_Context.cpp (parse_args): - * ace/OS.cpp (unique_name): - - Fixed warnings and generated by gcc 2.95; mostly due to format - specifier mismatches and inefficient conversion operator usage. - -Thu Jul 15 14:21:32 1999 David L. Levine - - * docs/ACE-guidelines.html: reverted to the original - perl magic that goes at the top of every script. The - fix that was supposed to work on HP/UX doesn't. See - Thu Jul 08 22:15:50 1999 David L. Levine - -Thu Jul 15 12:19:44 1999 David L. Levine - - * bin/make_release: added -u option, to allow updating the - version stamps from any directory. Also, added suppression - of cvs checkout warning about empty ("New") directories. - - * Makefile: added -u to make_release invocations. - -Thu Jul 15 11:39:44 1999 David L. Levine - - * ACE version 4.6.45 released. - -Thu Jul 15 11:26:43 1999 David L. Levine - - * Makefile: made NEWS a dependency of release. - -Thu Jul 15 10:05:40 1999 David L. Levine - - * docs/ACE-guidelines.html: removed reference to - ACE_OS::scanf (). No such thing. - -Thu Jul 15 10:01:31 1999 Steve Huston - - * ace/OS.h: TRANSMIT_FILE_BUFFERS are not defined on PharLap ETS - - it's a Microsoft-specific extension to Winsock 1.1. - - * ace/config-win32-common.h: ACE_HAS_IP_MULTICAST is only set for - Winsock 2. - - Thanks to David Hauck for these fixes. - -Thu Jul 15 09:28:32 1999 David L. Levine - - * include/makeinclude/platform_tru64_cxx.GNU: changed - 4.0f to 4.0F, because that's what sizer -v returns - on DU 4.0F. Thanks to Doug Anderson - for reporting this. - - * ace/config-tru64.h: only #define _LIBC_POLLUTION_H_ - with DU >= 5.0. Thanks to Doug Anderson - for reporting that it's not necessary on DU 4.0F. - -Thu Jul 15 09:15:11 1999 Steve Huston - - * ace/config-aix-4.x.h: Corrected template settings for IBM C/C++ - 3.6 compiler. It does not get ACE_HAS_STD_TEMPLATE_SPECIALIZATION. - - * include/makeinclude/platform_aix4_cset++.GNU: Delete the - testAIXCompilerVersion.cpp file after getting the compiler version. - -Thu Jul 15 07:33:30 1999 David L. Levine - - * ace/config-tru64.h,config-osf1.h,config-osf1-4.0.h, - include/makeinclude/platform_tru64_cxx.GNU,platform_osf1_cxx.GNU, - ACE-INSTALL.html: moved config-osf1.h to config-tru64.h, - and platform_osf1_cxx.GNU to platform_tru64_cxx.GNU. - Thanks to Doug Anderson for this suggestion. - -Wed Jul 14 22:23:10 1999 David L. Levine - - * ace/config-cray.h: replaced ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA - with ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION. The standard - "template class" explicit instantiations work with version - 3.2.0.1 of the compiler. Thanks to Doug Anderson - for reporting this. - - * ace/config-ghs-common.h: use - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION with Green Hills 1.8.9 - and later. Thanks to Carlos for suggesting that we give it - whirl. It worked :-) - -Wed Jul 14 22:03:08 1999 David L. Levine - - * ace/config-osf1-4.0.h: enable pragma message disable declbutnotref - with Digital Unix 4.0f, as well as 5.0. Thanks to - Doug Anderson for reporting that - it's necessary. - - * ACE-INSTALL.html: updated config/platform info for - Digital UNIX 4.0f (and 5.0). - - [Bug 65] - -Wed Jul 14 19:44:21 1999 Steve Huston - - * ace/Thread_Manager.cpp (spawn_i): Defer acquiring the thread - descriptor's lock until just before attempting to start the thread - to avoid places where the thread descriptor could be destroyed - while holding the lock (doing that is an undefined operation in - pthreads, and has particularly bad results on HP-UX 11). If the - thread creation does fail, release the lock before returning - the error indication (taking care to guard errno). Removed an - unreachable block of code which put the thread descriptor on the - wrong list anyway. - Removed the #if 1, #else, #endif around the auto_ptr for - new_thr_desc - if it's still working this close the ACE 5 release, - it wins. Besides, the use of the auto_ptr was ingrained in the - rest of the function, without the #if checks. - -Wed Jul 14 19:03:57 1999 David L. Levine - - * etc/purify.solaris2: added another UMR suppression for - __sigprocmask in the Solaris 2.6 threads library. Thanks - to Andy for reporting this. - -Wed Jul 14 16:30:48 1999 Irfan Pyarali - - * ace/Hash_Map_Manager_T.h (class ACE_Hash_Map_Bucket_Iterator): - Added a new class that allows the iteration over the entries of - a of a particular bucket in a hash map. - - * tests/Hash_Map_Bucket_Iterator_Test.cpp: A test for the new - ACE_Hash_Map_Bucket_Iterator class. - -Wed Jul 14 16:37:33 1999 Ossama Othman - - * Makefile: - - Added Makefile.am and NEWS to the list of controlled files. The - file `NEWS' will get generated when a release is made. - - * TODO: - * acconfig.h: - * configure.in: - * configure: - - Minor ACE Configuration Project related updates and fixes. - -Wed Jul 14 13:38:12 1999 Steve Huston - - * tests/Cached_Accept_Conn_Test.cpp: Moved defs of Client_Svc_Handler - and Server_Svc_Handler classes to new file, Cached_Accept_Conn_Test.h - to make AIX xlC happy. - - * tests/Cached_Conn_Test.cpp: Moved definition of Svc_Handler class - new file, Cached_Conn_Test.h to make AIX xlC happy. - - * tests/Cached_Accept_Conn_Test.cpp, Cached_Conn_Test.cpp: Don't - even try to build these on AIX C Set++ 3.1. It can't hack the - auto template instantiation - overwrites a template generator - file and tosses its cookies. ACE is still the best C++ compiler - test on the planet. - -Wed Jul 14 16:24:38 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.cpp: - Added new method to efficiently steal the contents of a CDR - stream and store them in another. - -Wed Jul 14 12:05:13 1999 David L. Levine - - * include/makeinclude/rules.local.GNU (LN_S): on WIN32 - hosts, use cp -p instead of ln -s, because symbolic - links aren't supported. - -Wed Jul 14 11:22:31 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU, - ACE_INSTALL.html: with egcs (Tornado II) and without - exception handling, add -Wno-uninitialized to CCFLAGS. - The version of egcs that is provided with Tornado II - produces some spurious warnings about uninitialized - variables (including "this" :-). This was a problem - in older versions of egcs, but has since been fixed. - To avoid the warning, we always disable the warning - with VxWorks' egcs. - -Wed Jul 14 11:20:31 1999 Steve Huston - - * ace/config-aix-4.x.h: Add ACE_LACKS_SETSCHED for pre-4.3 AIX. - -Wed Jul 14 11:15:24 1999 David L. Levine - - * examples/Shared_Malloc/Malloc.cpp: only explicitly - instantiate ACE_Read_Guard and - ACE_Write_Guard ifndef ACE_HAS_THREADS. - With threads, they're explicitly instantiated in - ace/Synch.cpp. - -Wed Jul 14 10:58:30 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.cpp: - Clarified the relationship between this implementation and the - original SunSoft version. - -Wed Jul 14 10:47:45 1999 David L. Levine - - * include/makeinclude/platform_qnx_neutrino.GNU: - added ACE_HAS_GNUG_PRE_2_8 := 0, so that exception - handling will be disabled by default. - -Wed Jul 14 10:34:37 1999 David L. Levine - - * examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp: fixed typo, - ACE_LACKS_UNIX_DOMAIN_SOCKETS instead of - ACE_HAS_UNIX_DOMAIN_SOCKETS. - -Wed Jul 14 10:22:29 1999 David L. Levine - - * ace/Singleton.*: added ACE_Unmanaged_Singleton and - ACE_Unmanaged_TSS_Singleton template class. They're - identical to ACE_Singleton and ACE_TSS_Singleton, - respectively, except that they don't register for - cleanup with the ACE_Object_Manager. Therefore, - the application is responsible for explicitly destroying - the instance after it is no longer needed (if it wants to - avoid memory leaks, at least). The close () static member - function must be used to explicitly destroy the Singleton. - Thanks to Valery Arkhangorodsky - for suggesting this and providing the code. - -Wed Jul 14 10:01:47 1999 David L. Levine - - * ace/OS.h (ACE_{,U_}ONE_SECOND_IN*): made the trailing - L or U upper case, for readability. Thanks to Chris - for noticing this. - -Wed Jul 14 09:40:37 1999 David L. Levine - - * include/makeinclude/wrapper_macros.GNU: when setting - ACE_HAS_GNUG_PRE_2_8, if not g++: don't override - the value to null if it was non-null. Also, clarified - use of ACE_HAS_GNUG_PRE_2_8: 1 for g++ < 2.8.0, - 0 for g++ >= 2.8.0, undefined for non-g++. - -Wed Jul 14 09:29:57 1999 David L. Levine - - * tests/Makefile (realclean): remove log/compilations.log*. - -Tue Jul 13 22:25:18 1999 Carlos O'Ryan - - * include/makeinclude/wrapper_macros.GNU: - Disable the "unitialized" warnings with EGCS+exceptions, it - gives too many bogus warnings to take care of them. - -Tue Jul 13 22:16:17 1999 Carlos O'Ryan - - * bin/ACEutils.pm: - Wait for non empty files, sometimes the process creates the - files but does not have enough time to fill its contents. - -Tue Jul 13 21:32:44 1999 Ossama Othman - - * acconfig.h: - * ltconfig: - * ltmain.sh: - * ace/Makefile.am: - * tests/Makefile.am: - - ACE Configuration Project updates. Synchronized with current - version of ACE in CVS repository. - -Tue Jul 13 15:22:51 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - set ACE_HAS_GNUG_PRE_2_8 to 0 with egcs (Tornado II). - -Tue Jul 13 15:15:43 1999 Steve Huston - - * ace/ace-dll.icc, ace-lib.icc: Corrected source file set; now builds - (still with some warnings) on AIX, Visual Age C++ 4. - -Tue Jul 13 15:11:28 1999 Nanbor Wang - - * bin/run_all_win32.pl: Fixed program output redirection problem. - Unfortunately, the fix requires one to have either 'sh' or '4nt' - to redirect output from another perl script correctly. - -Tue Jul 13 15:04:35 1999 David L. Levine - - * include/makeinclude/platform_qnx_neutrino.GNU: - removed full paths from commands, because they're - prefixed with i386-nto-. - - * ace/config-qnx-neutrino.h: updated to build with egcs. - -Tue Jul 13 15:03:01 1999 David L. Levine - - * ace/Pipe.cpp (open): moved declaration of local variable - "one" inside the ACE_LACKS_TCP_NODELAY #ifndef block. - -Tue Jul 13 14:57:56 1999 David L. Levine - - * ace/SV_Semaphore_Simple.{h,cpp} (init,open,name_2_key): - added static cast of ACE_INVALID_SEM_KEY to key_t. key_t - is unsigned on QNX Neutrino, but we want to keep - ACE_INVALID_SEM_KEY as -1. - -Tue Jul 13 11:57:53 1999 Nanbor Wang - - * ace/config-win32.h: Changed CApplication to CWinApp. Thanks to - John Morey for pointing this out. - -Tue Jul 13 11:13:52 1999 Steve Huston - - * ACE_INSTALL.html: Added some info for building on AIX with - Visual Age C++. - - * ace/config-aix-4.3.x.h: New file - these version-specific configs - are particularly useful with Visual Age C++, which has its own - funky make system that doesn't use the platform_macros.GNU files, - and so doesn't pick up the ACE_AIX_MAJOR/MINOR_VERS settings which - are used in config-aix-4.x.h. - - * ace/config-aix-4.x.h: Corrected template settings for Visual Age C++ - and added ACE_HAS_TYPENAME for VAC++ also. - -Tue Jul 13 10:40:31 1999 Irfan Pyarali - - * ace/Cached_Connect_Strategy_T.cpp (purge_connections): There is - no need to set the purge percentage again. - -Tue Jul 13 10:39:57 1999 Matthew J Braun - - * ace/Containers_T.h,i: Altered private member list_ of - DLList_Iterator to be a pointer rather than a reference. This - allows the reset method to work because it was overwriting the - contents of list_ rather than iterating over a different list - -Tue Jul 13 09:14:31 1999 Steve Huston - - * ace/Cached_Connect_Strategy_T.cpp (dtor): Added ACE_TYPENAME - to 'iter' declaration since its type depends on template parameters. - -Tue Jul 13 09:11:24 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: - moved LIBS setting for Green Hills 1.8.9 from - x86-only to all targets. Thanks to Dale Wood - for confirming that this - is necessary for PowerPC targets. - -Tue Jul 13 08:18:56 1999 David L. Levine - - * ace/config-osf1.h,config-osf1-4.0.h, - include/makeinclude/platform_osf1_cxx.GNU: - added another significant figure to the version identifer, - e.g., 0x40F and 0x500. [Bug 65] - -Tue Jul 13 06:45:53 1999 Steve Huston - - * examples/Shared_Malloc/test_position_independent_malloc.cpp: Moved - definition of Dummy_Data to test_position_independent_malloc.h, a - new file, to satisfy AIX IBM C++ template instantiation. - - * include/makeinclude/platform_aix4_cset++.GNU: Turn on/off warnings - based on compiler version, not OS version. Thanks to Craig - Rodrigues for sending the code in! - - * THANKS: Added Craig Rodrigues to the hall of fame. - - * ace/config-aix-4.1.x.h, config-aix-4.2.x.h: Added setting for - ACE_AIX_MAJOR_VERS and ACE_AIX_MINOR_VERS if they weren't set - already. Eases backwards compatibility for those who don't use - the ACE build macros (horrors! :-). Thanks to Jeff Donner - for this suggestion. - -Mon Jul 12 18:24:34 1999 Kirthika Parameswaran - - * tests/Cached_Accept_Conn_Test.cpp: - This tests explicit purging from the server's point of view. - When the acceptor in either its accept_svc_handler () or open () - runs out of descriptors, purging of unused svc_handlers from the - connecton cache is requested. - - * tests/Cached_Conn_Test.cpp: - Defined ACE_HAS_BROKEN_EXTENDED_TEMPLATES for the - Caching_Strategy_Adapter. If this condition is true, then only - Least Recently Used Caching Strategy is available. This was - necessary for compilers which dont accept long template lists, - for example GNUC version < 8.0. Total credit for this hack - to get through the old GNUC compiler goes to Irfan - of the DOC group. - - * tests/Makefile: - Added Cached_Accept_Conn_Test.cpp. - - * tests/Makefile: - * tests/run_tests.sh: - * tests/run_pharlap_tests.bat: - * tests/run_tests.bat: - * tests/run_tests.psosim: - * tests/run_tests.vxworks: - Added Cached_Conn_Test, Map_Manager_Test and - Cache_Map_Manager_Test to the above. - -Mon Jul 12 17:31:28 1999 Nanbor Wang - - * bin/run_all_win32.pl: Fixed the missing execution output problem - and simplified how the script gets invoked. See comments for - more details. - - * ace/config-win32.h: - * ace/Object_Manager.h: Updated some unclear comments regarding - the use and instantiation of non-static object manager. Thanks - to John Morey and David for pointing this out. - - * ace/ace_dll.dsp: Merged additional MFC configuration. Thanks to - John Morey for submitting the patch. - -Mon Jul 12 15:27:37 1999 David L. Levine - - * ace/config-osf1.h,config-osf1-4.0.h, - include/makeinclude/platform_osf1_cxx.GNU, - ACE-INSTALL.html: added support for DU 4.0f. It needs the - same #defines that we use on DU 5.0. [Bug 65] - -Mon Jul 12 14:41:14 1999 David L. Levine - - * ace/config-win32.h,Object_Manager.h: cleaned up comments - about the non-static ACE_Object_Manager. Thanks to - John Morey for reporting this. - -Mon Jul 12 13:54:34 1999 Kirthika Parameswaran - - * ace/Cache_Map_Manager_T.{h,i,cpp}: - Defined ACE_T1 and ACE_T2 which contain the template parameter - list and added ACE_HAS_BROKEN_EXTENDED_TEMPLATES macro where - needed. This takes care of the template list for compilers which - cant accept a long template list, for example: GCC 2.7.2. - Also changed the purge() to now call the for - purging entries form the cache. - - * ace/Hash_Cache_Map_Manager_T.h: - Added ACE_HAS_BROKEN_EXTENDED_TEMPLATES to complement the - Cache_Map_Manager class changes. - - * ace/Cached_Connect_Strategy_T.cpp: - Changed dtor to take care of the - ACE_HAS_BROKEN_EXTENDED_TEMPLATES definition. - - * ace/Cached_Connect_Strategy_T.h: - Removed CONNECTION_CACHE_ITERATOR typedef. - - * ace/Caching_Strategies_T.{h,i,cpp}: - Changed template parameter list and removed dependency on the - CONTAINER. Removed clear_cache() method. - - * ace/Caching_Utility_T.{h,i,cpp}: - Added default cleanup strategies to every kind of - caching_utiltity. ACE_Recyclable_Hanlder_Caching_Utility no - longer derives form ACE_Pair_Caching_Utility. - - * ace/Cleanup_Strategies_T.{h,i,cpp}: - Changed ACE_Svc_Cleanup_Strategy to - ACE_Recyclable_Handler_Cleanup_Strategy. - - * tests/Cache_Map_Manager_Test.cpp: - * tests/Map_Manager_Test.cpp: - Made changes to template instantiations. - - * tests/Cached_Conn_Test.cpp: - Added out_of_sockets_handler() which will do the purging. - Added a check for ENOBUFS which arose on NT and ENOENT which - arose on Linux + Solaris. Defined - ACE_HAS_BROKEN_EXTENDED_TEMPLATES for GCC versions < GCC 2.8. - -Mon Jul 12 12:14:45 1999 David L. Levine - - * docs/ACE-development-process.html: added this page, as - a start towards a less chaotic development process. - -Mon Jul 12 10:05:31 1999 Steve Huston - - * ace/Event_Handler_T.i: Added ACE_TYPENAME on template-dependent types - in function signatures. Quiets HP-UX aC++. - - * ace/Based_Pointer_Repository.h: - * ace/Based_Pointer_T.h: Added #include "ace/OS.h" to pick up def. of - ACE_Export when instantiating templates with AIX IBM C++. - - * include/makeinclude/platform_hpux_aCC.GNU: Removed definition for - CPP_LOCATION - use aCC - cpp has too many problems, and a fix for - the pragma warnings was checked into TAO_IDL. - -Mon Jul 12 09:26:29 1999 David L. Levine - - * testsr/Makefile: don't build libDLL_Test.so if not building - shared libraries. This simplifies the build on static-libs - only platforms, and can be used by run_tests.sh, below. - [Bug 62] - - * tests/run_tests.sh: don't run DLL_Test if libDLL_Test.so - was not built. - -Mon Jul 12 07:48:04 1999 David L. Levine - - * docs/ACE-guidelines.html: updated guideline under CVS - section to match the other one about always testing - on egcs. - -Sun Jul 11 23:59:52 1999 nanbor - - * ACE version 4.6.44 released. - -Sat Jul 10 18:05:41 1999 Nanbor Wang - - * ace/config-kcc-common.h: Added ACE_NEW_THROWS_EXCEPTIONS. - Thanks to David for pointing this out. - -Sat Jul 10 16:22:00 1999 Chris Gill - - * ace/config-win32-common.h: wrapped ACE_HAS_TYPENAME_KEYWORD so it is - only set for MSVC++ 6.0 or higher. This is to work around a compiler - bug in MSVC++ 5.0 when trying to compile certain forms with the - typename keyword in a template method argument list. - -Sat Jul 10 13:16:50 1999 Douglas C. Schmidt - - * ace/Malloc: Changed the type of pointer used by ACE_Name_Node - from void * to char * so that we can integrate this cleanly with - ACE_Based_Pointer<>, which will fail if we use void since we - can't return from a "void" function! - - * tests/Thread_Pool_Test.cpp (open): Fixed another somewhat bogus - warning from EGCS related to initialization of loop variables. - - * tests/New_Fail_Test.cpp (main): Make sure to initialize pointers - so that EGCS doesn't complain. - - * tests/MT_Reactor_Timer_Test.cpp (main): Fixed a signed/unsigned - mismatch. - - * tests: Added appropriate header comments for all the *.h files. - - * tests/Cache_Map_Manager_Test.cpp: Capitlized the hash_key - class to be Hash_Key, which is standard ACE programming style. - - * ace/Service_Config.cpp: Added yet another set of - changes to open_i() so that the -d option is handled - appropriately. Thanks to Jonathan Reis - for this fix. - - * ace/SOCK_Acceptor.h: Clarified the parameters for - ACE_SOCK_Acceptor's constructor and open() methods. Thanks to - Ron MacKenzie for motivating this. - -Sat Jul 10 13:56:30 1999 Nanbor Wang - - * tests/MT_Reactor_Timer_Test.cpp (main): Fixed signed/unsigned - comparison. - -Sat Jul 10 08:01:36 1999 David L. Levine - - * docs/ACE-guidelines.html: THANKS instead of README. - -Fri Jul 9 20:54:30 1999 Ossama Othman - - * ace/UNIX_Addr.{h,i} (hash): - - Implemented a hash function for ACE_UNIX_Addr instead of relying - on the base class no-op hash function. Thanks to Irfan for - explaining the best way to do this. - -Fri Jul 9 20:39:47 1999 Kirthika Parameswaran - - * tests/Cached_Conn_Test.cpp: Added an Svc_Handler class which - helped in verifying the course of the program execution. - - * ace/Caching_Utility_T.cpp (minimum): Cleaned up code by removing - redundant else if statement. - - * tests/Cache_Map_Manager_Test.cpp: Resolved some template typos - which surfaced on compiling with VxWorks. - -Fri Jul 09 20:14:13 1999 Irfan Pyarali - - * tests/MT_Reactor_Timer_Test.cpp (main): Added fixes so that test - can work with WFMO_Reactor (WFMO_Reactor needs an extra - handle_events() to get started). - - * tests/Conn_Test.cpp (spawn_processes): Only printing reaping - message when result is not -1. - - * ace/Strategies_T.i (ACE_Refcounted_Hash_Recyclable::operator==): - The check should be for "and", not "or". - - * tests/Conn_Test.cpp: Since timed accept is implemented using - select(), and we use timed accepts with threads, we need a real - lock when using timed accepts even if the OS has thread-safe - accept. - - Also changed the default number of clients to 5. Hopefully, - this won't overrun the backlog on the listen socket. - - * ace/Svc_Handler.cpp (shutdown): Remove self from Reactor only - when we have a valid handle. Otherwise, we lose our current - errno, since the failed remove_handler will set the errno to - EINVAL. - -Fri Jul 9 14:02:52 1999 Steve Huston - - * ace/config-aix-4.x.h: Re-enabled ACE_LACKS_SETSCHED for AIX 4.3. - The OS defs are not aligned/matched correctly with what they mean - in this area, but will need to wait til after ACE 5.0 is done - before straightening it out. - - * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor_Handler_Repository::bind_i): - Set errno to EMFILE if the max number of handles is registered, - instead of leaving a stale errno for the user to figure out. - - * tests/MT_Reactor_Timer_Test.h (Dispatch_Count_Handler): Changed - type of timers_fired_ from int to size_t so it matches type of - ACE_MAX_TIMERS. - -Fri Jul 9 14:27:10 1999 Douglas C. Schmidt - - * ace/Service_Config.cpp (open_i): Be default, disable debugging - messages. Only reenable them if the -d option is given. Thanks - to Jerry De Master for reporting this. - - * ace/Based_Pointer_T: Factored out all but the operator-> into - a new class called ACE_Based_Pointer_Basic so that we can use - this for "basic types" like char *. Thanks to Irfan for - pointing this out. - - * ace/Based_Pointer_Repository.cpp (unbind): Fixed a - bug in the unbind() loop. Thanks to David Levine and DEC UNIX - C++ for noticing this! - - * ace/Reactor.i (schedule_wakeup): Fixed a misplaced assignment - of Event_Handler->reator (). Thanks to Carlos for reporting - this. - -Fri Jul 09 13:11:33 1999 Nanbor Wang - - * tests/Conn_Test.cpp (spawn_threads): ACE_OS::perror takes a - wchar_t string on CE. - - * tests/test_config.h (set_output): We should use non-unicode - version of ACE_OS::getenv to initialize test_dir on "regular" - UNICODE compilation. Thanks to Steve for reporting this. - - Added more WinCE/UNICODE fixes. - -Fri Jul 9 12:16:00 1999 Kirthika Parameswaran - - * ace/Caching_Utility_T.cpp (minimum): - Modified minimum () of ACE_Recyclable_Handler_Utility class so - that the minimum value is also an entry which is purgable. - - * tests/Cache_Map_Manager_Test.cpp: - SunC++4.0 compiler doesnt accept typedefs with templates and - having ::, for example: HASH_MAP::iterator. One has to typedef - HASH_MAP::iterator and use it to typedef something else. Fixed - this problem in the above test. - -Fri Jul 9 11:39:40 1999 Douglas C. Schmidt - - * ace/Dirent.i: Added a pair of checks to open() and close() - to avoid double deletes. Thanks to Tom Arbuckle - for pointing this out. - - * ace/Reactor.i: For schedule_timer() and schedule_wakeup(), - make sure that the Event_Handler is assigned "this" Reactor - upon successful completion of the operation. Thanks to - Dirk Broer for suggesting this. - -Fri Jul 9 11:10:23 1999 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: Re-suppress warning - 829 on 10.x because there's an offending system header file. - - * tests/test_config.h (ACE_Test_Output::set_output): Change test_dir - to be const because it's initialized with a string literal. - -Fri Jul 9 10:52:45 1999 Kirthika Parameswaran - - * ace/Caching_Utility_T.cpp (minimum): Checked the state of the - Refcounted_Hash_Address with ACE_Recyclable::IDLE_AND_PURGABLE. - -Fri Jul 09 10:49:40 1999 David L. Levine - - * tests/Message_Queue_Test.cpp (main): changed success - message from timed dequeue test to not contain "timedout", - because that trips run_tests.check. - -Fri Jul 09 10:25:42 1999 Irfan Pyarali - - * ace/Shared_Memory_MM.h (ACE_Shared_Memory_MM): Changed the - filename parameter from a non-const string to a const string. - Thanks to Ulf Jaehrig for pointing out this - problem. - -Fri Jul 09 03:31:34 1999 David L. Levine - - * ace/Basic_Types.i: added const to each of the static casts. - -Fri Jul 09 01:45:25 1999 Nanbor Wang - - * bin/auto_compile_win32.pl: A lot of projects changed names - recently and thus the file was not working properly. - -Thu Jul 8 23:15:06 1999 Alexander Babu Arulanthu - - * Merging the "ami_phase3" branch on to the main branch. Change - was done to the CDR_Stream{h,i} files to add the method - to the CDR class. Other than that, no change was - done to ACE. - -Thu Jul 08 22:15:50 1999 David L. Levine - - * docs/ACE-guidelines.html: changed the perl magic that - goes at the top of every perl script, to pick up perl - from the users path. This new version works on HP/UX. - Thanks to Carlos for divining it. - -Thu Jul 08 22:05:31 1999 David L. Levine - - * ace/config-linux-common.h: added #define of - ACE_DEFAULT_BASE_ADDR to 0x40000000 on __powerpc__ - only. - - * ace/config-linuxppcr5.h: removed. LinuxPPC can - now use config-linux-lxpthreads.h. - - * ACE-INSTALL.html: added LinuxPPC info. - - Thanks to Andreas Tobler for helping - to factor out the code from config-linuxppcr5.h. - -Thu Jul 8 21:57:17 1999 Carlos O'Ryan - - * ace/Malloc_T.h: - * ace/Malloc_T.cpp: - Changed the Cached_Allocator class to use a char* as the memory - source. - It was allocated as char* and deallocated as a char*, but casted - to T* to use placement new; this was actually unneeded and - actually an error: the memory does not become a T* until - placement new is invoked on it. [BUGID:40] - -Thu Jul 08 21:34:42 1999 David L. Levine - - * ace/config-lynxos.h: on PowerPC, set - ACE_NEEDS_HUGE_THREAD_STACKSIZE to 32000, instead of - its apparent default of 15000. On both x86 and ppc, - #define ACE_MAP_FIXED to 0 and ACE_DEFAULT_BASE_ADDR to - 0 to try to get the OS to always pick shared memory addresses. - - Thanks to Dan Butler for - suggesting the use of ACE_NEEDS_HUGE_THREAD_STACKSIZE here. - - * tests/Recursive_Mutex_Test.cpp (main): removed explicit - stack size setting, now that we're using - ACE_NEEDS_HUGE_THREAD_STACKSIZE on LynxOS/PPC. - -Thu Jul 08 18:47:23 1999 Kirthika Parameswaran - - * ace/Cached_Connect_Strategy_T.cpp: - Changed: - entry->ext_id_.state (ACE_Recyclable::IDLE); - to - entry->ext_id_.state (ACE_Recyclable::IDLE_AND_PURGABLE); - - * ace/Caching_Utility_T.{h,cpp}: - Added ACE_Recyclable_Handler_Caching_Utility which takes care - that the svc_handler to be purged is in the IDLE_AND_PURGABLE - state. - Made method minimum () virtual. - - * ace/Strategies.h: - Added IDLE_AND_PURGABLE and IDLE_BUT_NOT_PURGABLE states and - removed IDLE state from the enum. This change was necessary to - take care of AMI using the Mux Strategy. - - * ace/Strategies_T.cpp (cache_i): - Made entry state ACE_Recyclable::IDLE_AND_PURGABLE. - - * ace/Startegies_T.i (operator==): - Added checks for the ACE_Recyclable::IDLE_AND_PURGABLE and - ACE_Recyclable::IDLE_BUT_NOT_PURGABLE states. - - Thanks to Irfan of the DOC group for - helping with this. - -Thu Jul 08 18:47:23 1999 Irfan Pyarali - - * tests/Cache_Map_Manager_Test.cpp: Simplified code and output. - -Thu Jul 08 14:56:22 1999 David L. Levine - - * ace/Basic_Types.{h,i} (ACE_U_LongLong): added operators - that take ACE_UINT32 arguments corresponding to each of - the operators that take ACE_U_LongLong & arguments. This - solves some more overload resolution ambiguities. - - * ace/Stats.cpp: changed comparisons of ACE_U_LongLong with - ints to unsigned ints, to avoid overload resolution ambiguity. - -Thu Jul 08 14:29:42 1999 David L. Levine - - * ace/OS.i (gethrtime): cast ts.tv_nsec explicitly to - ACE_hrtime_t, instead of ACE_UINT32, to avoid overload - resolution ambiguity now that we have that ACE_U_LongLong - implicit conversion to ptr_arith_t. - -Thu Jul 8 13:50:14 1999 Steve Huston - - * ace/Reactor_Impl.h (dispatch_notifications): Changed ACE_Handle_Set - arg from const to non-const. Fix in ACE_Select_Reactor_Notify - requires the ability to change the handle set. - - * ace/WFMO_Reactor.{h cpp}: Corresponding removal of 'const' from - ACE_WFMO_Reactor_Notify::dispatch_notifications. Signature change - only - the function is a no-op in this class. - - * ace/Select_Reactor_Base.{h cpp}: In ACE_Select_Reactor_Notify, - dispatch_notifications(), remove the notify pipe's handle from the - dispatch handle set when handling a notification. Else it remained - set and dispatchng I/O handlers came back and ran through it - again, which artificially increased the count of dispatched - handlers, and left some input unhandled when it was ready. - - * tests/MT_Reactor_Timer_Test.cpp: Added some verification checks to - be sure that timer, notify, and input events all are handled at the - right time. - -Thu Jul 08 12:35:23 1999 Nanbor Wang - - * tests/test_config.h: Reorganized WinCE's macros and fix some - minor unicode problems. - -Thu Jul 8 11:33:50 1999 Douglas C. Schmidt - - * Rebuilt the ACE+TAO.tar.gz file. For some reason, there - was a ^M at the end of each line! Thanks to Bruce Edge - for reporting this. - - * ace/Based_Pointer_Repository.cpp (unbind): Rearranged the - iterator code a bit to see if that'll make DEC C++ happy. - - * ace/OS.h: Moved the ACE_MALLOC_ALIGN macro into OS.h. - - * config-aix-4.x.h, - config-lynxos.h, - config-psos-diab-mips.h, - config-psos-diab-ppc.h, - config-psos-diab.h, - config-psos-tm.h, - config-psosim-g++.h, - config-sunos5.5.h: - Added the ACE_MALLOC_ALIGN macro back since it's used in - an ACE test program. - - * ace/Malloc.cpp: Removed the trailing ';' on the #pragma - instantiate. Thanks to David Levine for reporting this. - -Thu Jul 08 11:35:53 1999 David L. Levine - - * ACE-INSTALL.html: added note about IP multicast support - with Tornado II/VxWorks 5.4. It's not enabled by default - in ACE. - -Thu Jul 8 11:31:13 1999 Steve Huston - - * tests/Message_Queue_Test.cpp: Added a test to see the correct errno - is set for a timed-out dequeue operation. - -Thu Jul 08 11:30:43 1999 David L. Levine - - * ACE-INSTALL.html: added note about the uninitialized - variable warnings from (the old) egcs that is - distributed with Wind River's Tornado II. - -Thu Jul 08 10:40:02 1999 David L. Levine - - * ace/config-linuxppcr5.h: use config-linux-lxpthreads.h - because thread support works. - - * ace/config-linuxppcr5.h, config-linux-common.h: use an - ACE_DEFAULT_BASE_ADDR of 0x40000000, because that allows - Naming_Test to work. - - With these two changes, all ACE tests pass on LinuxPPC. - Thanks to Andreas Tobler for the - fixes and testing. - -Thu Jul 08 10:25:55 1999 David L. Levine - - * ace/OS.h,Basic_Types.h: added ACE_U_LongLong conversion operator - to ptr_arith_t. Moved ptr_arith_t typedef from OS.h to - Basic_Types.h, so that it can be used by ACE_U_LongLong. - Thanks to Chris for helping to figure this out. - -Thu Jul 8 08:34:22 1999 Steve Huston - - * ace/Log_Msg.cpp (log): Don't special-case the %t handling on AIX - 4.3 - just 4.2 and earlier. - -Thu Jul 8 00:23:02 1999 Douglas C. Schmidt - - * ace/Malloc_T.cpp: Updated all the methods that check - cp_ptr_ to return immediately if it's 0. Thanks to Dieter for - suggesting this. - - * ace/Malloc.cpp (dump): Added a cast to trigger operator void - * for freep_ (which may be a smart pointer in some - configurations). - - * ace/Based_Pointer_Repository: Revised the implementation of - this class to use the "Cheshire-Cat" technique to hide the - implementation to avoid circular #include dependencies. - - * ace/Token.h (ACE_Token): Clarified that the timeouts are in - "absolute" time, not relative time. Thanks to Everett Anderson - for reporting this. - - * ace/config-win32-borland.h: Only enable - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION if we're running on - older versions of Borland. Thanks to Christopher Kohlhoff - for reporting this. - -Wed Jul 07 22:44:22 1999 David L. Levine - - * tests/Recursive_Mutex_Test.cpp (main): added comment - explaining why the stack size is now set. - - * tests/test_config.h: removed special ACE_MAX_PROCESSES - and ACE_MAX_THREADS values for LynxOS, because most - tests don't need them. - - * tests/Process_Mutex_Test.cpp: use only 4 processes - instead of ACE_MAX_PROCESSES, on LynxOS only. Otherwise, - the test's ACE_LOG_MSG->op_status assertion fails. - - * ACE-INSTALL.html: removed statements about some tests - failing on LynxOS/PPC. Just Naming_Test and - MM_Shared_Memory_Test fail now. - -Wed Jul 07 19:51:00 1999 Chris Gill - - * ace/config-ghs-common.h: removed use of native auto_ptrs, as they - implement an older specification which lacks the reset method. - -Wed Jul 7 17:17:10 1999 Ossama Othman - - * ace/ARGV.cpp (ACE_ARGV): - * ace/OS.cpp (ACE_OS_Recursive_Thread_Mutex_Guard): - * ace/Sched_Params.i (ACE_Sched_Priority_Iterator): - - Added some class members to the member initializer lists to fix - some "Effective C++" warnings from EGCS. - -Wed Jul 7 16:33:29 1999 Kirthika Parameswaran - - * tests/Cached_Conn_Test.cpp (main): Added default testing of LRU, - LFU, FIFO caching strategies. - - * tests/Cached_Conn_Test.cpp (parse_args): - * tests/Cache_Map_Manager_Test (parse_args): - Runtime selection of different caching strategies - (lru/lfu/fifo/null) made possible. - - * Caching_Strategies_T.{i,cpp}: - Removed typos and also definied the virtual destructor for - ACE_Caching_Strategy. - - * tests/Map_Manager_Test.cpp (test_cache_map_manager): - Added to the construction of - and objects to make - it in sync with the changes made below. - -Wed Jul 07 16:06:45 1999 David L. Levine - - * tests/Recursive_Mutex_Test.cpp: explicitly set the - stack size. This solves the problem on LynxOS/PPC, below, so - the 65-iteration workaround was removed. Thanks to Doug for - this suggestion. - -Wed Jul 7 13:27:53 1999 Douglas C. Schmidt - - * ace/config-win32-borland.h, - ace/config-win32.h: Added support for the ACE::major_versions(), etc. - for PC versions of ACE, as well as UNIX. Thanks to - Jeff Hellzen for suggesting this. - - * ace: Added a new Based_Pointer_T.i file that inlines the - small methods. - - * ace/Malloc[_T]: Cleaned up the code so that we can use the - ACE_Based_Pointer<> consistently when - ACE_HAS_POSITION_INDEPENDENT_MALLOC is enabled and disable. - - * ace/Malloc.h: By default, ACE_MALLOC_PADDING is set to 1 so that - we don't get "divide by zero" errors. However, it's only used - in the computation of the ACE_Malloc_Header if it's > 1. - - * config-aix-4.x.h, - config-lynxos.h, - config-psos-diab-mips.h, - config-psos-diab-ppc.h, - config-psos-diab.h, - config-psos-tm.h, - config-psosim-g++.h, - config-sunos5.5.h: - Removed the ACE_MALLOC_ALIGN macro since it should no longer - be necessary. - - * ace/Malloc.h: Changed the use of macro ACE_MALLOC_ALIGN to - ACE_MALLOC_PADDING, which is more descriptive. - - * Fixed a typo in the TAO-mail.html program where ace-* - should have been tao-*. Thanks to Pedro Alves Ferreira - for reporting this. - - * Fixed all vestiages of "BUG-REPORT-FORM" to say - "PROBLEM-REPORT-FORM." Thanks to Neil B. Cohen - for reporting this. - -Wed Jul 07 12:27:32 1999 David L. Levine - - * ace/config-lynxos.h: added ACE_LACKS_FORK for PowerPC - only. This cleans up most of the remaining test problems - on LynxOS/PPC. - -Wed Jul 07 11:26:06 1999 Nanbor Wang - - * ace/Malloc_T.cpp: Added ASYS_TEXT macros. - -Wed Jul 7 09:05:32 1999 Steve Huston - - * ace/Caching_Strategies_T.i (ACE_Caching_Strategy_Adapter<>::purge_ - percent): Don't return a value from a void function. - -Wed Jul 07 08:35:24 1999 Irfan Pyarali - - * examples/Threads/future1.cpp - * examples/Threads/future2.cpp - * tests/Future_Set_Test.cpp - * tests/Future_Test.cpp - - Fixed some template instantiations. - -Wed Jul 7 03:27:16 1999 Douglas C. Schmidt - - * examples/Shared_Malloc: Added a new file called - test_position_independent_malloc.cpp that exercises the new - "position-independent" features of the ACE_Malloc< class. - - * ace/Malloc_T.cpp: All the ACE_Malloc constructors were calling - open() without checking the results. Now, if failure occurs we - print a message. In addition, we weren't checking in - shared_malloc() to make sure that we'd been properly initialized - by the constructor. Now, if we aren't initialized correctly we - return 0. Thanks to Dietrich Quehl - for reporting these problems. - - * ace/Memory_Pool: Added a new feature to ACE_Shared_Memory_Pool - and ACE_Shared_Memory_Pool_Options that makes it possible to - tailor the size of System V shared memory segments without - breaking any existing ACE code. Thanks to Serge Kolgan - for contributing this enhancement. - - * ace/Makefile.bor (OBJFILES): Updated this file to include - the new Based_Pointer_Repository.obj entry. - - * ace/Makefile: Reran make depend. - - * ace/Makefile: Added the Based_Pointer_Repository.{h,cpp} and - Based_Pointer_T.{h,cpp} files to the Makefile. - - * ace/Malloc.h: Added the first support for the new "Based Pointer - Malloc" feature that's described below. - - * ace: Added the Based_Pointer_Repository.{h,cpp} and - Based_Pointer_T.{h,cpp} files to the release. These classes - make it possible to transparently use "pointers" in shared - memory without having to ensure that the base addresses of all - the pointers are mapped into separate processes at the same - absolute memory base address. Thanks to Dietrich Quehl - for contributing this software. - -Wed Jul 07 01:28:40 1999 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added the Based_Pointer_Repository.{h,cpp} and - Based_Pointer_T.{h,cpp} files to the project files. - - * ace/Based_Pointer_Repository.cpp: Added define ACE_BUILD_DLL. - -Tue Jul 06 22:47:04 1999 David L. Levine - - * bin/check_build_logs: filter out Purify warning about - non-pic R_SPARC_*. - - * ace/config-linuxppcr5.h: commented out #define __USE_XOPEN - because it's not necessary with glibc 2.1.1. Thanks to - Andreas Tobler for reporting this. - - * ace/OS.i (thr_kill, thr_setprio, sema_destroy, sema_wait, chdir, - unlink, sema_post, thr_continue, thr_getprio, thr_suspend, - ioctl): on VxWorks only, removed ACE_ADAPT_RETVAL wrapper from - system call, because it returns OK/ERROR (except for ioctl, - which returns driver number/ERROR). Thanks to Elias Sreih - for reporting this. - - * tests/SOCK_Send_Recv_Test.cpp (server): added 5 second - sleep so that the code agrees with the comments :-) It now - passes on LynxOS. Thanks to Steve Huston for the fix. Also, - changed an exit () call to ACE_OS::exit (), and changed a few - C-style casts to ANSI-style casts. - -Tue Jul 6 19:20:16 1999 Steve Huston - - * ace/Cache_Map_Manager_T.h: Removed extra "ace/" from #pragma - implementation directive. - - * tests/Cache_Map_Manager_Test.cpp: Changed typedefs for KEY and - VALUE from size_t to ACE_UINT32 to they always pick up the - specializations for ACE_Hash, etc. On HP-UX and AIX, size_t is - not the same as ACE_UINT32, and this caused build errors. - - * tests/Conn_Test.cpp: Restrict range of the test on PharLap ETS, - else it runs out of resources with default configuration. - -Tue Jul 6 18:21:37 1999 Everett Anderson - - * ace/Token_Request_Reply.{h,i,cpp}: Added - ACE_TOKEN_REQUEST_HEADER_SIZE for the fixed-length portion of - ACE_Token_Request's Transfer struct, changing length - calculations accordingly. Added two bytes to the buffer to - accomodate '\0' values after the token name and client ID. - - * ace/Remote_Tokens.cpp: Changed the check for failure when - receiving a reply in request_reply. - -Tue Jul 6 18:21:36 1999 Douglas C. Schmidt - - * ace/Map_Manager.cpp: Made this file conform to the ACE programming - guidelines. - -Tue Jul 6 18:31:34 1999 Carlos O'Ryan - - * include/makeinclude/platform_irix6.x_sgic++.GNU: - Removed pesky warnings about functions to big to optimize - because it would be slow. - -Tue Jul 6 18:15:31 1999 Steve Huston - - * ACE_INSTALL.html: Added a further note re PharLap ETS builds. - - * ace/config-pharlap.h: Added ACE_TIMER_SKEW of 10ms. - - * tests/Atomic_Op_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Cache_Map_Manager_Test.dsp: - * tests/Future_Set_Test.dsp: - Changed PharLap ETS configurations to put intermediate files in - ETS_LIB\Debug (like all the others), not in ETS_DLL\Debug. - - * tests/test_config.h: Set ACE_MAX_CLIENTS to 4 for PharLap ETS. - - * tests/run_pharlap_tests.bat: Disabled some tests of unsupported - facilities. - - * tests/SOCK_Test.cpp: Replaced "localhost" with ACE_LOCALHOST. - -Tue Jul 6 17:54:52 1999 Kirthika Parameswaran member. - - * ace/Cache_Map_Manager_T.{h, cpp}: - * ace/Hash_Cache_Map_Manager_T.{h,cpp}: - Changed the signature of the constructor.This was needed to be - able to use the External Polymorphism pattern. - - * tests/Cache_Map_Manager_Test.cpp: - * tests/Cached_Conn_Test.cpp: - Made necessary changes to reflect the changes above. - Thanks to Irfan of the DOC group for helping with this. - -Tue Jul 6 17:34:52 1999 Steve Huston - - * ace/config-aix-4.x.h: Enabled ACE_HAS_PTHREADS_UNIX98_EXT and - removed ACE_LACKS_RWLOCK_T for AIX 4.3. Moved some other - ACE_LACKS settings to the pre-4.3 threads section to allow - taking advantage of more capability on AIX 4.3. - -Tue Jul 06 16:29:32 1999 Nanbor Wang - - * ace/OS.h: Moved the string conversion macros before including - OS.i because we also use them in the file. Thanks to Carlos for - reporting this. - - * OS.{h,i,cpp}: - * Parse_Node.cpp: Windows CE fixes. - -Tue Jul 06 15:56:19 1999 David L. Levine - - * ace/ACE.h,Object_Manager.{h,cpp},OS.{h,cpp} - (ACE_Object_Manager*::init () and fini ()): return 1 instead - of -1 after the first call, per program invocation. Thanks - to Jody Hagins for this suggestion. - -Tue Jul 6 15:04:49 1999 Douglas C. Schmidt - - * ace/OS.i (sigwait): Fixed a problem with macro-itis and GCC. The - following macro - - # if (__FreeBSD__ < 3) || defined (CHORUS) || defined (ACE_PSOS) - - was always evaluating to true, even when we're not on FreeBSD!. - The following macro works around this: - - # if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) || - defined (CHORUS) || defined (ACE_PSOS) - - Thanks to Elias Sreih for - reporting this and Carlos for suggesting the workaround. - -Tue Jul 6 11:39:59 1999 Douglas C. Schmidt - - * ace/OS.i: Updated the comment for ACE_ADAPT_RETVAL to - clarify why it is needed. Thanks to Elias Sreih - for motivating this clarification. - -Tue Jul 6 10:42:02 1999 Nanbor Wang - - * tests/test_config.h (ACE_INIT_LOG): Fixed a typo in VxWorks' - definition of ACE_INIT_LOG. Thanks to David for reporting - this. - -Tue Jul 6 10:17:19 1999 Douglas C. Schmidt - - * include/makeinclude/ace_flags.bor: Removed an extraneous - "\orbsvcs". Thanks to Eugene Surovegin (surovegin@softlab.ru) - for reporting this. - -Tue Jul 06 10:17:12 1999 David L. Levine - - * bin/check_build_logs: use mhmail instead of mailx on Suns. - mailx loses the subject, when run from my cron job. Thanks - to Naga for reporting this. - -Mon Jul 5 20:45:21 1999 Steve Huston - - * ace/OS.(h i): Added code for support of pthread suspend/resume and - pthreads reader-writer locks. These features are enabled by setting - the ACE_HAS_PTHREADS_UNIX98_EXT and removing ACE_LACKS_RWLOCK_T. - - * ace/config-hpux11.h: Added ACE_HAS_PTHREADS_UNIX98_EXT and removed - ACE_LACKS_RWLOCK_T - this enables native reader/writer locks as well - as thread suspend and reusme. - - * ace/README: Added ACE_HAS_PTHREADS_UNIX98_EXT. - - * apps/JAWS/server/HTTP_Config.(h cpp): - * apps/JAWS/server/HTTP_Response.( h cpp): const-corrected char *. - -Mon Jul 5 16:39:50 1999 Douglas C. Schmidt - - * ACE-INSTALL.html: Updated the discussion to point out - our support for KAI C++ 3.3, Borland C++ Builder 4.0, and the - IBM VisualAge C++ compiler. - - * ace/Future.h: Moved the static methods until the bottom - of the ACE_Future_Rep class to workaround a bug with Borland's - C++ Builder. Thanks to Christopher Kohlhoff - for testing this fix. - - * ace/Timer_Heap_T.cpp (grow_heap): Removed an extra memory - allocation that snuck in whilst integrating the IBM VisualAge - C++ compiler patches. Thanks to David Levine for reporting - this. - - * Added new Borland Makefiles. Thanks to Christopher Kohlhoff - for these. - - * include/makeinclude: Added several new platform configuration - files for Borland C++ Builder. Thanks to Christopher Kohlhoff - for these. - -Mon Jul 5 13:08:36 1999 Kirthika Parameswaran - - * tests/Cache_Map_Manager_Test.cpp: Added ACE_UNUSED_ARG macros - for to ward off warnings. - -Mon Jul 05 13:00:19 1999 Irfan Pyarali - - * ace/Malloc.i (free): Fixed unused arg warning for . - - * examples/Threads/future1.cpp: - * examples/Threads/future2.cpp: - - Fixed template instantiations. - -Mon Jul 5 12:25:11 1999 Carlos O'Ryan - - * ace/OS.i (strspn): - This function cannot return -1 to indicate errors, the function - returns an unsigned integral type. - -Mon Jul 05 12:14:56 1999 Nanbor Wang - - * ace/OS.i: Wchat_t version of strenvdup should only be available - on Win32. Thanks to Bala, Carlos, and David for noticing this. - (strspn): Ditto to this function. - -Mon Jul 05 09:58:07 1999 David L. Levine - - * ACE-INSTALL.html: in example config.h for VxWorks on NT, - use "" style #includes instead of <>. <> should only be - used for system headers. - -Mon Jul 05 04:11:05 1999 Nanbor Wang - - * tests/version_tests/Future_Set_Test.dsp: - * tests/version_tests/version_tests.dsw: Added Future_Set_Test - into version tests workspace. - - * ace/ACE.cpp: - * ace/ACE.h: - * ace/DLL.cpp: - * ace/DLL.h: - * ace/Env_Value_T.h: - * ace/Env_Value_T.i: - * ace/FIFO.cpp: - * ace/FIFO.h: - * ace/FIFO.i: - * ace/FIFO_Recv.cpp: - * ace/FIFO_Recv.h: - * ace/FIFO_Recv_Msg.cpp: - * ace/FIFO_Recv_Msg.h: - * ace/FIFO_Send.cpp: - * ace/FIFO_Send.h: - * ace/FIFO_Send_Msg.cpp: - * ace/FIFO_Send_Msg.h: - * ace/FILE_Connector.i: - * ace/Filecache.cpp: - * ace/Get_Opt.cpp: - * ace/INET_Addr.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Log_Record.cpp: - * ace/Message_Queue_T.cpp: - * ace/Name_Proxy.cpp: - * ace/Naming_Context.cpp: - * ace/Naming_Context.h: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/Parse_Node.cpp: - * ace/Parse_Node.h: - * ace/Proactor.cpp: - * ace/Process.cpp: - * ace/RB_Tree.cpp: - * ace/Registry_Name_Space.cpp: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Name_Space.h: - * ace/Remote_Tokens.cpp: - * ace/Remote_Tokens.h: - * ace/Remote_Tokens.i: - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SPIPE_Connector.cpp: - * ace/SV_Message_Queue.cpp: - * ace/SV_Semaphore_Simple.cpp: - * ace/SV_Shared_Memory.cpp: - * ace/Stats.cpp: - * ace/Stats.h: - * ace/Strategies_T.cpp: - * ace/Strategies_T.i: - * ace/Svc_Conf.h: - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: - * ace/Token_Collection.cpp: - * ace/Token_Collection.h: - * ace/Token_Collection.i: - * ace/Token_Invariants.cpp: - * ace/Token_Invariants.h: - * ace/UPIPE_Acceptor.cpp: - * ace/UPIPE_Connector.cpp: - * ace/UPIPE_Connector.i: - * ace/WFMO_Reactor.cpp: - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Proactor.cpp: - * ace/config-win32-common.h: - * tests/CDR_Test.cpp: - * tests/Cache_Map_Manager_Test.cpp: - * tests/Collection_Test.cpp: - * tests/DLL_Test.cpp: - * tests/DLL_Test.h: - * tests/DLList_Test.cpp: - * tests/Dynamic_Priority_Test.cpp: - * tests/Env_Value_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/High_Res_Timer_Test.cpp: - * tests/IOStream_Test.cpp: - * tests/MT_Reactor_Timer_Test.cpp: - * tests/Map_Manager_Test.cpp: - * tests/Map_Test.cpp: - * tests/Message_Queue_Test.cpp: - * tests/Naming_Test.cpp: - * tests/New_Fail_Test.cpp: - * tests/Pipe_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Process_Mutex_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/Process_Strategy_Test.h: - * tests/Reactor_Performance_Test.cpp: - * tests/SOCK_Connector_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/SV_Shared_Memory_Test.cpp: - * tests/Service_Config_Test.cpp: - * tests/Thread_Manager_Test.cpp: - * tests/Time_Service_Test.cpp: - * tests/Tokens_Test.cpp: - * tests/UPIPE_SAP_Test.cpp: - * tests/Upgradable_RW_Test.cpp: - * tests/test_config.h: Changes to make it possible to write pure - UNICODE programs on NT. Now it is possible to compile ACE on NT - with ACE_HAS_MOSTLY_UNICODE_APIS defined. Most tests passed - without trouble. However, Future_Set_Test is not yet included - in the version_tests and Dynamic_Priority_Test also - failed. Thanks to Valery Arkhangorodsky - for providing a preliminary patch for - ACE to motivate the change. - -Sun Jul 04 18:57:13 1999 David L. Levine - - * ACE-INSTALL.html: when building tao_idl on NT to be - used for generating code for VxWorks, build without - ACE_HAS_EXCEPTIONS. Otherwise, TAO_IDLFLAGS must - be overridden to be null instead of -Ge 1. Thanks to - Carlos for this suggestion. - -Sun Jul 4 17:06:17 1999 Douglas C. Schmidt - - * tests/Notify_Performance_Test.cpp, - tests/Message_Block_Test.cpp, - tests/Priority_Task_Test.cpp, - tests/Thread_Pool_Reactor_Test.cpp: Fixed a couple of - warnings related to initializing char *'s with const char *'s. - Thanks to SunC++ 5.0 for reporting this. - -Sun Jul 04 16:07:33 1999 David L. Levine - - * ACE-INSTALL.html: updated instructions for building on - NT host for VxWorks. - -Sun Jul 04 15:41:34 1999 David L. Levine - - * many Makefiles: call ace_components via sh, instead of - directly in the make $(shell) command. This allows it - to work on platforms that don't have /bin/sh, such as NT. - -Sun Jul 4 12:34:24 1999 Douglas C. Schmidt - - * ace/Timer_Hash_T.cpp (cancel): Reversed a comparison from - <= to > to make the ACE_ASSERT replacement work properly. - Thanks to David Levine for reporting this. - - * tests/Thread_Pool_Test.cpp (open): We need to define 'int i' - outside of the for loop to keep EGCS from complaining for some - reason. - - * ace/Timer_Heap_T.cpp: Reformatted this code to conform to - the ACE programming guidelines. - - * ace/Timer_Heap_T.cpp (schedule): Replaced an ad hoc check for - allocator failure with the ACE_ALLOCATOR_RETURN macro. - - * ace/RB_Tree.cpp: Modified Carlo's change so that we add an - extra set of parens in a special way, rather than using a new - macro. This is more consistent with how we deal with this - problem in other parts of ACE. - - * ace/RB_Tree.cpp (insert_i): Removed an unreachable statement. - Thanks to David Levine for reporting this. - -Sat Jul 3 22:12:07 1999 Carlos O'Ryan - - * ace/Object_Manager.cpp (get_singleton_lock): - Fixed one of the ACE_Thread_Mutex version of this method. One of - the braces after an if() statement got "accidentaly" removed; - binding the "else" part of the statement to the previous if() - instead. - -Sat Jul 3 18:54:18 1999 Carlos O'Ryan - - * ace/RB_Tree.cpp: - If the "constructor" parameter in an ACE_NEW_RETURN macro has a - comma in it (such as Foo(x,y,z)) we need to replace it with a - macro, so it is seen as a single token by the pre-processor. - Otherwise it (the pre-processor) gets confused and uses - the comma as separator. Thanks to David for detecting this one. - -Sat Jul 3 15:57:40 1999 Carlos O'Ryan - - * ace/SOCK_Dgram_Mcast.cpp: - Fixed error code return, it should be -1 not ACE_INVALID_HANDLE - - * ace/SOCK_Connector.cpp: - Fixed stray comment characters. - -Sat Jul 03 14:04:10 1999 David L. Levine - - * ace/Makefile: call ace_components via sh, and use single - instead of double quotes, so that it works with Cygwin - on NT host. - -Sat Jul 3 12:05:46 1999 Douglas C. Schmidt - - * ace/SOCK_Dgram_Mcast: Modified the subscribe() method to return - 0 or -1 rather than ACE_HANDLE. Thanks to Vidya Narayanan - for suggesting this. - - * ace/SOCK_Acceptor, - ace/SOCK_Connector, - ace/SOCK: Added the ACE_Protocol_Info *, ACE_SOCK_GROUP, and - flags parameters to these classes so we can pass down the GQoS - information. Thanks to Vidya Narayanan - for suggesting this. - - * ace/SOCK.h: Added the reuse_addr parameter to open() and the - ACE_SOCK constructor. - - * tests/Future_Set_Test.cpp (main): We were casting a - const ASYS_TCHAR * to u_int, yikes! - - * ace/RB_Tree.cpp: Cleaned up the code so it's conformant with the - ACE programming style, particularly for dynamic memory - allocation (which wasn't using ACE_NEW). - - * ace/ACE.cpp (get_ip_interfaces): Cleaned up the code so it conforms - to the ACE programming guidelines. - - * ace/Timer_Hash_T.cpp: Fixed a number mistakes where the return - value of new wasn't being checked. - - * ace/Timer_Heap_T.cpp, - ace/Timer_Wheel_T.cpp: Removed the apparently extraneous parens - used in the ACE_NEW* macros in order to keep EGCS 2.95 happy. - Thanks to Jody Hagins and Arturo Montes - for reporting this. BTW, if this - causes problems on any compilers please let me know. - - * ace: Reformatted all the ACE_NEW* macros so they conform to - ACE programming style. - - * ace/Priority_Reactor.cpp: Cleaned up the code to conform to - the ACE programming style. - - * ace/OS.cpp (tss_base): Cleaned up a loop a bit so it conforms - to the ACE programming style. - -Sat Jul 3 11:09:51 1999 Alexander Babu Arulanthu - - * ace/WIN32_Asynch_IO.cpp - * ace/WIN32_Proactor.cpp - Addressed Doug's @@ Alex comments. It was simply making some - debug statements conditional upon ACE::debug () flag. - -Fri Jul 2 19:50:29 1999 Douglas C. Schmidt - - * ace/OS.h: There was a typo in the ACE_WIN32CALL_RETURN() macro - for Borland C++. Thanks to Jody Hagins for - reporting this. - - * ace/config-win32-borland.h: Clarified the fact that this file - shouldn't be #included directly. Thanks to Thaddeus Olczyk - for motivating this. - -Fri Jul 02 22:22:12 1999 Steve Huston - - * ace/config-hpux-11.x-hpc++.h: Added - ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION for aC++. - - * include/makeinclude/platform_hpux_aCC.GNU: Removed the suppression - of warning 829 (auto convert of string literal to char * deprecated). - With the exception of some JAWS code, all of ACE has been rid of the - offenders. - - * websvcs/tests/Makefile: Replace VLDLIBS with correct LDLIBS. Now - works on AIX. - -Fri Jul 2 19:37:16 1999 Carlos O'Ryan - - * tests/Future_Test.cpp: - The timeout variable was declared in one scope but used in - another one. Added another timeout variable to keep it happy. - - * tests/Message_Queue_Test.cpp: - A pointer was initialize using "0x" i think it was a typo and - should be "0". - -Fri Jul 02 18:28:31 1999 Steve Huston - - * ace/config-hpux11.h: Added ACE_HAS_BROKEN_T_ERROR. - Enable threads by default, unless site config explicitly turns it - off by setting ACE_HAS_THREADS to 0. Thanks to Brian Wallis - for motivating this change. - - * ace/config-hpux-11.x-hpc++.h: Added - ACE_HAS_STD_TEMPLATE_SPECIALIZATION. - - * include/makeinclude/platform_hpux_aCC.GNU: If on 11.00 and the - user requests a build w/o threads, set ACE_HAS_THREADS to 0 to - override the config default (see config-hpux11.h, above). - -Fri Jul 2 11:49:12 1999 Kirthika Parameswaran - - * tests/Cached_Conn_Test.cpp: This is a test which shows how the - Strategy Connector can automagically as well as explicitly cache - and purge connection from its connection cache using different - caching strategies. - - * ace/Cached_Connect_Strategy_T.{h, cpp}: Added a method - "purge_connections ()" which allows explicit purging of - connnections from the connection cache. - -Fri Jul 2 13:54:14 1999 Douglas C. Schmidt - - * ace/Future_Set.cpp, - ace/Future.cpp: Added ACE_TYPENAME at a couple of places - to make HP/UX aCC happy. Thanks to Eric Mitchell - for reporting this. - - * ace/SOCK_Dgram: Added send() and recv() methods that take - ACE_OVERLAPPED structures. Thanks to Vidya Narayanan - for suggesting this. - - * ace/OS.h: Added an ACE_OVERLAPPED_FLAG that's used to abstract - away from the WSA_FLAG_OVERLAPPED macro on Win32. Thanks to - Vidya Narayanan for suggesting - this. - - * ace/OS.cpp: Removed unnecessary ';' after ACE_BEGINTHREADEX() and - ACE_ENDTHREADEX(). Thanks to Kris Johnson - for reporting this. - - * ace/Service_Config.cpp (open_i): It appears that - - if (ACE::debug ()) - ACE_Log_Msg::disable_debug_messages (); - - should really be - - if (ACE::debug () == 0) - ACE_Log_Msg::disable_debug_messages (); - - Thanks to Jonathan Reis for - reporting this. - - * tests/Future_Test.cpp (main): Make sure to use absolute time - rather than relative time for the timeouts. Thanks to Peter - Brandstrom for reporting this. - -Fri Jul 02 13:44:17 1999 Irfan Pyarali - - * tests/Thread_Pool_Reactor_Test.cpp (worker): Added const fix to - and . - - * tests/Priority_Task_Test.cpp: Added const fix to . - - * tests/Notify_Performance_Test.cpp (print_results): Added const - fix to . - - * tests/Message_Block_Test.cpp: Added const fix to . - -Fri Jul 2 11:49:12 1999 Irfan Pyarali - - * Initialized some variables to zero to avoid some silly warnings - from egcs (with exceptions): - - - ace/Free_List.cpp - - ace/Malloc.i - - tests/DLL_Test.cpp - - tests/Mem_Map_Test.cpp - - tests/Message_Queue_Test.cpp - - tests/Reactor_Notify_Test.cpp - -Fri Jul 2 11:49:12 1999 Kirthika Parameswaran - - * ace/Strategies_T.h (ACE_Cached_Connect_Strategy): Made "virtual" - methods which were getting overriden in the derived - Cached_Connect_Strategy_Ex class. - - * ace/Cached_Connect_Strategy_T.{h, cpp}: Added a method - "purge_connections ()" which allows explicit purging of - connnections from the connection cache. - - * tests/Cached_Conn_Test.cpp: This is a test which shows how the - Strategy Connector can automagically as well as explicitly cache - and purge connection from its connection cache using different - caching strategies. - -Fri Jul 2 11:49:12 1999 Kirthika Parameswaran - - * tests/Cached_Conn_Test.cpp: This is a test which shows how the - Strategy Connector can automagically as well as explicitly cache - and purge connection from its connection cache using different - caching strategies. - - * ace/Cached_Connect_Strategy_T.{h, cpp}: Added a method - "purge_connections ()" which allows explicit purging of - connnections from the connection cache. - -Fri Jul 02 11:50:21 1999 Steve Huston - - * ace/ace_lib.dsp: Added Pharlap ETS configurations for Debug and - Release. - - * ace/config-pharlap.h: Added ACE_LACKS_* definitions to avoid some - unimplemented memory mapped things. Added a definition for - ACE_PAGE_SIZE because it's not obvious how to get it at run time. - Include because some of the OS functions call ETS - kernel functions for low-level system info gathering. - Set ACE_HAS_TSS_EMULATION. The PharLap TSS leaves some to be - desired, according to TSS_Test. - - * ace/config-win32-common.h: In building for PharLap, don't bring in - the OS-supplied wsock32.lib - need to use the PharLap one. - - * ace/ACE.cpp: PharLap ETS changes: - ACE::ldfind: PharLap doesn't have expand environment strings. - ACE::get_ip_interfaces: Use PharLap kernel functions to find - interfaces and learn their addresses. - ACE::terminate_process: Unsupported on PharLap. - ACE::handle_timed_open: If the open times out, set errno to - ETIMEDOUT, not ETIME. - ACE::handle_timed_accept: If the select times out, set errno to - ETIMEDOUT, not ETIME. - ACE::sock_error: If not a known error, format a message with the - error number in it - this is the only chance for a PharLap - system error to indicate the error number. - - * ace/OS.h: Changed def of ACE_DEFAULT_SERVER_HOST to ACE_LOCALHOST. - - * ace/OS.cpp (ACE_OS::uname): PharLap: Use ETS kernel functions to get - target processor class. PharLap doesn't do GetSystemInfo. - - * ace/OS.i (ACE_OS::hostname): PharLap: Attempt gethostname if using - RT version, though this isn't too reliable (requires ethernet and - BOOTP). - (ACE_OS::dlerror): PharLap doesn't support FormatMessage, - so format the error number. - (ACE_OS::mmap, ACE_OS::mprotect, ACE_OS::msync): PharLap doesn't - do memory-mapped files. - (ACE_OS::getpagesize): PharLap - use page size set from config.h. - Don't know a way to get this info at run time. - (ACE_OS::hostname (whar_t *, size_t)): PharLap - no wide chars. - - * ace/Log_Msg.cpp (log): PharLap doesn't do FormatMessage, so print - = %d for %p. - - * ace/Pipe.cpp (open): The protocol level for TCP_NODELAY on PharLap - is SOL_SOCKET, as opposed to Win32, where it's IPPROTO_TCP. - - * ace/SPIPE_Connector.cpp (connect): PharLap doesn't have the - SetNamedPipeHandleState function. - - * ace/WFMO_Reactor.cpp: PharLap ETS changes, because PharLap doesn't - implement async I/O, or WaitForMultipleObjectsEx. - register_handler_i: (This is a general Winsock 1.1 change) Creating - an event handle for a socket is not supported. - ok_to_wait, wait_for_multiple_events: Use WaitForMultipleObjects, - not WaitForMultipleObjectsEx. Should be fine since the big - difference is alertable, and that's not supported on ETS anyway. - - * tests/test_config.h: On PharLap, direct all logging to host console. - - * tests/tests_pharlap_msvc.lnk: Cleaned things up; extended stack size - from 8K to 32K. Change the starting load offset to - 0x100000 - the tests don't all fit in the default range. - Disabled the target screen driver to make all the test output from - all threads go to the host, thereby getting saved in the log files. - - * tests/run_pharlap_tests.bat: Fixed names of the executables. - - * tests/Atomic_Op_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Basic_Types_Test.dsp: - * tests/Buffer_Stream_Test.dsp: - * tests/CDR_Test_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Conn_Test.dsp: - * tests/DLList_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/Enum_Interfaces_Test.dsp: - * tests/Env_Value_Test.dsp: - * tests/Future_Test.dsp: - * tests/Handle_Set_Test.dsp: - * tests/Hash_Map_Manager_Test.dsp: - * tests/High_Res_Timer_Test.dsp: - * tests/IOStream_Test.dsp: - * tests/Map_Manager_Test.dsp: - * tests/Map_Test.dsp: - * tests/Mem_Map_Test.dsp: - * tests/Message_Block_Test.dsp: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/Message_Queue_Test.dsp: - * tests/MM_Shared_Memory_Test.dsp: - * tests/MT_Reactor_Timer_Test.dsp: - * tests/MT_SOCK_Test.dsp: - * tests/Naming_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Notify_Performance_Test.dsp: - * tests/OrdMultiSet_Test.dsp: - * tests/Pipe_Test.dsp: - * tests/Priority_Buffer_Test.dsp: - * tests/Priority_Reactor_Test.dsp: - * tests/Priority_Task_Test.dsp: - * tests/Process_Mutex_Test.dsp: - * tests/Process_Strategy_Test.dsp: - * tests/RB_Tree_Test.dsp: - * tests/Reactor_Exceptions_Test.dsp: - * tests/Reactor_Notify_Test.dsp: - * tests/Reactor_Performance_Test.dsp: - * tests/Reactor_Timer_Test.dsp: - * tests/Reactors_Test.dsp: - * tests/Reader_Writer_Test.dsp: - * tests/Recursive_Mutex_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/Semaphore_Test.dsp: - * tests/Service_Config_Test.dsp: - * tests/Sigset_Ops_Test.dsp: - * tests/Simple_Message_Block_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/SOCK_Test.dsp: - * tests/SPIPE_Test.dsp: - * tests/SString_Test.dsp: - * tests/SV_Shared_Memory_Test.dsp: - * tests/Svc_Handler_Test.dsp: - * tests/Task_Test.dsp: - * tests/Thread_Manager_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Thread_Pool_Reactor_Test.dsp: - * tests/Thread_Pool_Test.dsp: - * tests/Time_Service_Test.dsp: - * tests/Time_Value_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Timer_Queue_Test.dsp: - * tests/Tokens_Test.dsp: - * tests/TSS_Test.dsp: - * tests/Upgradeable_RW_Test.dsp: - * tests/UPIPE_SAP_Test.dsp: - Fixed settings for PharLap ETS configurations. - - * tests/Conn_Test.cpp (server): If the acceptor fails, do not try to - close the svc_handler - the failed ACE_Oneshot_Acceptor already - closed it. - - * tests/SOCK_Send_Recv_Test.cpp: Use ACE_LOCALHOST, not "localhost". - -Thu Jul 1 21:49:39 1999 Matthew J Braun - - * ace/Containers_T.i,h,cpp - Added reset () methods to the derived classes of - ACE_Double_Linked_List_Iterator because the behavior of the base - class's version was not sufficient (and would cause way fun - segfaults when used). - - * tests/Map_Manager_Test.cpp - * tests/DLList_Test.cpp - ACE_const_cast'ed some string literals to char *'s to appease - the evil monstrosity that is SC 5.0. - -Wed Jun 30 18:11:41 1999 Ossama Othman - - * ace/OS.i (strncasecmp): - - Corrected ACE_TRACE statement to contain "strncasecmp" instead - of "strcasecmp." - -Thu Jul 01 21:07:22 1999 Douglas C. Schmidt - - * ACE version 4.6.43 released. - -Thu Jul 01 10:53:33 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: - set INCLDIRS, so that wrapper_macros.GNU doesn't insert -I. - Otherwise, with GHS on NT host, ACE's Signal.h gets #included - instead of VxWorks' signal.h by target/h/private/sigLibP.h. - Thanks to Dale Wood and - Dave Steele for helping to figure - this out. - - * include/makeinclude/platform_vxworks5.x_g++.GNU, - bin/ace_ld: changed -c option to -C [...] --, so - that its arguments don't need to be quoted. I - couldn't figure out a way to quote on NT host. Thanks - to Dale Wood for enlightening me - on some of the intricacies of NT. - -Thu Jul 01 10:47:41 1999 David L. Levine - - * bin/libsize.pl: always use `pwd`, because the PWD environment - variable doesn't appear to get updated by recursive makes. - -Thu Jul 01 08:46:10 1999 David L. Levine - - * bin/check_build_logs: filter out lines from IDL_Cubit - that contain "0 errors". - -Thu Jul 01 00:24:52 1999 Nanbor Wang - - * docs/ACE-guidelines.html: Added a table explaining how to use - all the different ACE_*_STRING macros. - - * tests/DLList_Test.cpp: - * tests/Hash_Map_Manager_Test.cpp: - * tests/Map_Manager_Test.cpp: - * tests/Message_Block_Test.cpp: - * tests/Notify_Performance_Test.cpp: - * tests/Priority_Task_Test.cpp: - * tests/Thread_Pool_Reactor_Test.cpp: - * tests/test_config.h: UNICODE fixes. The usage of ASYS_TCHAR and - LPCTSTR were mistaken in many places. - -Wed Jun 30 16:13:58 1999 Irfan Pyarali - - * tests/Future_Set_Test.cpp: Added missing template instantiation - for ACE_Hash_Map_Reverse_Iterator_Ex. Also, added some fixes - from John Tucker . - -Wed Jun 30 12:09:22 1999 Nanbor Wang - - * ace/ace_bcc.ide: - * tests/tests_bcc.ide: - * *.{bpr,bpg}: Removed unused BCB project files. - -Tue Jun 29 23:12:58 1999 Carlos O'Ryan - - * ace/OS.i: - Use ACE_CAST_CONST to keep the silly Sun/CC 4.2 from - complaining. - -Tue Jun 29 22:48:43 1999 Irfan Pyarali - - * ace/OS.i (strncasecmp): Changed to . - -Tue Jun 29 22:33:55 1999 Carlos O'Ryan - - * ace/OS.i: - Fixed warnings in green hills and possibly othre EDG-based - compilers. - - * tests/run_tests.sh: - * tests/run_tests.vxworks: - Take Future_Set_Test out, it does not work in too many - platforms. - -Tue Jun 29 21:24:13 1999 Douglas C. Schmidt - - * ace/SOCK.cpp (open): Removed an unused variable. Thanks - to Carlos for reporting this. - -Tue Jun 29 20:53:41 1999 Carlos O'Ryan - - * ace/config-irix5.3-g++.h: - IRIX 5.3 (!) has a DIRENT structure, thanks to Isaac Stoddard - for providing this fix. - -Tue Jun 28 20:19:11 1999 Darrell Brunsch - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Manually cleaned up these projects and fixed them so they should - work on NT Alpha again. - -Tue Jun 29 18:48:22 1999 Irfan Pyarali - - * ace/Functor_T.h (class ACE_Pointer_Hash): Added new class for - hashing pointers on their values. - - * ace/Future_Set: Restored future map to be a - ACE_Hash_Map_Manager_Ex. - -Tue Jun 29 14:45:38 1999 Irfan Pyarali - - * tests/run_tests.bat: Removed New_Fail_Test from the - run_tests.bat (the script for NT). This tests takes too long to - run and swaps out the entire machine making is impossible to do - useful things while the test is running. Note that the test is - still there and can be run by hand (i.e., on its own, without - the run_tests.bat script). - - * ace/Future: Changed the observer collection to be an unbounded - set and changed the future map to map manager. These are - temporary changes to get things compiling again. Once we figure - out the correct hashing functions, we can restore the original - code. - -Tue Jun 29 13:38:52 1999 Ossama Othman - - * AUTHORS: - - Added an AUTHORS file to bring ACE closer to recent software - distribution conventions. - - * Makefile: - - Added Carlos' websvcs directory to the release, in addition to - the missing top-level ACE Configuration project files and - directories. - - * config.guess: - * config.sub: - * ltconfig: - * ltmain.sh: - * missing: - * mkinstalldirs: - - Updated from latest GNU libtool and GNU automake. - -Tue Jun 29 12:07:08 1999 Ossama Othman - - * README: - * THANKS: - - Moved list of contributors to the file `THANKS' to bring the - distribution closer to conventional distribution standards. - - * Makefile: - - Added the THANKS file to the list of controlled files so that it - gets distributed with ACE. - -Tue Jun 29 11:27:23 1999 Matthew J Braun - - * ace/Containers_T.i: Modified next method in ACE_DLList_Iterator - to avoid segfaults (a bad thing). - -Tue Jun 29 10:54:15 1999 Carlos O'Ryan - - * ace/OS.i: - Sun/CC was not pleased with a cast from "void* const" to "const - char*", and rightly so. - -Tue Jun 29 09:21:06 1999 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - * ace/SOCK_Dgram.h: - * ace/SOCK_Dgram.i: - Fixed the unix version ACE_OS::sendto() call. - Also fixed the Win32 version and the Win32 version of - ACE_OS::recvfrom, had to change the signatures to make them safe - and fit the WinSock2 interfaces. - -Tue Jun 29 07:07:30 1999 David L. Levine - - * bin/check_build_logs: allow _ with -l and -m options, and - @ and . with -m option. - -Mon Jun 28 21:31:58 1999 Douglas C. Schmidt - - * ace/OS: Added a constructor to ACE_Flow_Spec to initialize - its various fields wholesale. Thanks to Kumar Surender - for this suggestion. - - * ace/SOCK: Added a new constructor and a new open() method - that pass through the QoS information required by WSASocket(). - - * ace/{OS,SOCK_Connector,SOCK_Dgram,SOCK_Dgram_Mcast}: Renamed - ACE_Connect_QoS_Params to ACE_QoS_Params since (1) it's used in - ACE_OS::connect() *and* ACE_OS::join_leaf() and (2) it's used - for Dgrams, which aren't connection oriented. Thanks to Kumar - Surender for this suggestion. - - * ace/OS: Added set/get methods for time-to-live on the - ACE_Flow_Spec classes. This is necessary since RAPI defines - this. - - * ace/OS: Added a new ACE_OS::recvfrom() method that's a wrapper - for the WSARecvFrom() on Win32 and (will be) an "emulation" on - non-Win32 platforms. - - * ace/OS: Added a new ACE_OS::sendto() method that's a wrapper - for the WSASendTo() on Win32 and an "emulation" on non-Win32 - platforms. - - * ace/OS.h: Updated the QoS documentation to clarify that these - features are appropriate for IntServ (RSVP) *and* DiffServ. - Thanks to Kumar Surender , Vidya - Narayanan and Pradeep Avasthi - suggesting this. - - * ace/SOCK_Dgram.h: Added send() and recv() methods for - ACE_SOCK_Dgram that take overlapped I/O parameters. This is - needed for the GQoS WinSock API. - -Mon Jun 28 21:53:06 1999 David L. Levine - - * bin/libsize.pl: added support for liborbsvcs, and - for shared libs (with -s option). - - * bin/check_build_logs: fixed command-line argument processing. - -Mon Jun 28 17:30:08 1999 Nanbor Wang - - * ace/OS.i (recvv): We must not passed a null pointer to - but a pointer pointing to a real flag. This fixed the - SOCK_Send_Recv_Test failing on NT problem. Thanks to Jody - Hagins for reporting this. - -Mon Jun 28 15:10:50 1999 Irfan Pyarali - - * ace/Strategies_T: Removed ACE_Hash_Addr which was no longer used - in ACE and is not necessary given the new - ACE_Hash_Map_Manager_Ex class. - -Mon Jun 28 15:00:01 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.cpp: - Added new method to reset the state of a CDR stream without need - for any memory allocations. - -Mon Jun 28 12:48:35 1999 David L. Levine - - * bin/check_build_logs: added this script, which checks build - logs named *.log, of current day. - -Mon Jun 28 09:32:59 1999 Douglas C. Schmidt - - * ace/{Future_Set,Future}: Integrated new enhancements to use - the ACE_Hash_Map_Manager rather than the ACE_DLL_Linked_List to - speed up notifications for the Future Set. Thanks to John - Tucker for this enhancement. - - * tests: Integrated the Future_Set_Test into this directory and the - various batch files. Thanks to John Tucker - for this test. - - * ace/Map_Manager.i: Added an ACE_const_cast to the lock_ used - in the newly const total_size() and current_size() methods. - - * ace/Map_T, - * ace/Map_Manager, - * ace/Cache_Map_Manager_T, - * ace/Active_Map_Manager_T, - * ace/Hash_Map_Manager_T: The current_size() and total_size() methods - must be const. - - * ace/OS.i: Fixed a type inconsistency where wchar_t should have been - char and added a missing ';'. - - * ace/OS.i: Fixed a typo where last_error should have been - lerror. Thanks to Chris Gill for reporting this. - - * ace/OS.cpp (ACE_BEGINTHREADEX): Oops, mistyped "_beginthreadex()" - as "_beingthreadex()". I must be going through an existential - phase ;-). Thanks to Chris Gill for reporting this. - - * ace/OS.i: Fixed a typo where last_error should have been - lerror. Thanks to Chris Gill for reporting this. - - * ace/OS.cpp (ACE_BEGINTHREADEX): Oops, mistyped "_beginthreadex()" - as "_beingthreadex()". I must be going through an existential - phase ;-). Thanks to Chris Gill for reporting this. - -Sun Jun 27 18:03:24 1999 Douglas C. Schmidt - - * ACE-INSTALL.html: Updated the discussion for Borland C++ - Building 4.0 and IBM's VisualAge C++ compiler to reference the - appropriate maintainers. - - * ace/WIN32_Proactor.cpp, ace/WIN32_Asynch_IO.cpp: Added back some - initializers to keep EGCS happy. - - * ace/config-g++-common.h: Added ACE_LACKS_AUTO_PTR to work around - an omission within the EGCS standard library. - - * ace/Auto_Ptr.h: If ACE_LACKS_AUTO_PTR is enabled then use our - version of auto_ptr. This is necessary to work around problems - with EGCS. - - * ace/config-g++-common.h: Define ACE_HAS_STANDARD_CPP_LIBRARY so - that #include will work properly. However, this - required that we also set ACE_USES_OLD_IOSTREAMS, as well. - Thanks to Carlos for help with this. - - * ace/config-g++-common.h: The EGCS 1.1.1 compiler supports the - template<> syntax. If this breaks older EGCS or GCC compilers - we'll have to handle each of those cases. - - * ace/config-win32-borland.h: - Added ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION. - - * ace/OS.h: Replaced the const's for ACE_DEFAULT_SHLIB_MODE and - ACE_SHLIB_INVALID_HANDLE with #defines since it's more portable. - - * ace/OS.i: All the strcasecmp() and strncasecmp() methods were - broken. Thanks to David Levine for reporting this. - - * ace/WFMO_Reactor.cpp: Updated the programming style a bit to - conform to the ACE guidelines. - -Sun Jun 27 20:50:02 1999 Douglas C. Schmidt - - Added support for IBM's VisualAge C++ compiler. - - * ace: Added a new config-visualage.h file that automatically - includes the proper configurations for IBM's VisualAge C++ - compiler on Win32 and AIX. - - * ace/OS.i: The IBM VisualAge C++ compiler's prototypes for _chdir(), - _mkdir(), and _tempnam() are broken, so we must add a cast to - char *. - - * ace/OS.cpp: Added new macros ACE_ENDTHREADEX and - ACE_BEGINTHREADEX to work around a bugs with _endthreadex() and - _beginthreadex() on IBM's VisualAge C++ compiler. - - * ace/OS.cpp (ACE_Time_Value::set): Replaced this expression: - - this->tv_.tv_usec = long ((_100ns.QuadPart % (10000 * 1000)) / 10); - - with this expression: - - this->tv_.tv_usec = long ((long (_100ns.QuadPart) % long (10000 * 1000)) / 10); - - to work around a bug with IBM's VisualAge C++ compiler. - - * ace/OS.cpp: Replaced a hard-coded MSVC++'ism for signed long long - with a use of the ACE_UINT64_LITERAL macro, which works for all - Win32 C++ compilers. - - * ace/config-win32-visualage.h, - ace/config-aix-4.x.h: Added a workaround for an IBM VisualAge - C++ bug with the WIFEXITED and WEXITSTATUS macro. - - * ace/OS.h: Added workarounds for bugs with IBM's VisualAge C++ compiler - as it pertains to the ACE_DES_FREE_TEMPLATE and - ACE_DES_FREE_TEMPLATE2 macros. - - * ace/Map_T.h: Added a workaround for a bug with IBM's VisualAge C++ - compiler. I think this workaround should help with other C++ - compilers, as well. Also reformated the code to make it - consistent with the ACE programming guidelines. - - * ace/Hash_Purgable_Map_Manager_T.cpp: Added a workaround for a - VisualAge C++ bug. - - * ace/config-aix-4.x.h: Added VisualAge C++ compiler support. - - * ace/Timer_Heap_T.cpp: We must hard code numbers like - 1024 for an array size to workaround bugs with the IBM VisualAge - C++ compiler. - - * ace/Basic_Types.h: Added #defines for ACE_INT64_LITERAL. - - * ace/config-win32-common.h: #include the - config-win32-visualage.h file. - - * ace: Added the following files for the IBM VisualAge C++ compiler: - - ace-lib.icc - WinNT configuration file to create a static library - ace-dll.icc - WinNT configuration file to create a dynamic library - config-win32-visualage.h - VisualAge C++ defines - - * tests: Added the icc.bat and makeicc.pl files, which build the - tests for the IBM VisualAge C++ compiler. - - * tests: Added the *.icc project files for the IBM VisualAge C++ compiler. - -Sun Jun 27 18:17:43 1999 Carlos O'Ryan - - * ace/CORBA_macros.h: - On platforms with native C++ exceptions we use ACE_UNUSED_ARG() - in the throw macros to avoid warnings about the unused - ACE_TRY_ENV variable. - -Sun Jun 27 14:56:16 1999 Nanbor Wang - - * tests/run_tests.bat: Added the patch for running tests compiled - with Borland C++. Thanks to Jody Hagins for - the patch. - - * tests/Cache_Map_Manager_Test.dsp: The project file was - mis-configured. - - * tests/version_tests/version_tests.dsw: - * tests/version_tests/Cache_Map_Manager_Test.dsp: Added this new - project file. - -Sun Jun 27 12:36:00 1999 Chris Gill - - * ace/RB_Tree.{h, i}: Moved non-deprecated iterator base class - method next (RB_Tree_Node<...>) down into derived forward and - reverse iterator classes due to method resolution conflict - with deprecated next (void) method in forward iterator class. - When the deprecated next method is removed, these will be - moved out of the derived classes and into the base class. - Thanks to Matt Braun and Carlos O'Ryan for pointing out - this problem. - -Sat Jun 26 16:22:07 1999 Marina Spivak - - * ace/ace_lib.dsp - * ace/ace_dll.dsp: - Updated to include Hash_Map_With_Allocator_T.* files. - -Sat Jun 26 16:05:29 1999 Ossama Othman - - * acconfig.h: - * configure.in: - - Added support/test for ACE_HAS_MEMCHR macro. - - * ace/Makefile.am: - * tests/Makefile.am: - - Synchronized with latest version of ACE. - - * m4/features.m4: - - Updated asynchronous IO tests. - -Sat Jun 26 14:41:31 1999 Marina Spivak - - * ace/Event_Handler_T.h - Removed "ACE_Export" - it is not necessary for a template class. - - * ace/Hash_Map_With_Allocator.{h,i,cpp}: - Added these files to ACE. These files contain a thin wrapper - around ACE_Hash_Map_Manager, which is useful when - ACE_Hash_Map_Manager is used with a shared memory (or memory - mapped file) allocator (e.g., ACE Naming Service, and TAO Naming - Service are example use cases). Please see header file for more - details. - -Sat Jun 26 12:45:26 1999 Douglas C. Schmidt - - * tests/Cache_Map_Manager_Test.cpp: Fixed this test so that it - compiles with SunC++ 4.2 and its broken C++ templates... Thanks - to David Levine for reporting this. - - * ace/Malloc_T.i: Make sure to put ACE_INLINE on all the methods - in the .i files. Thank to Marina for reporting this. - - * ace/Hash_Map_Manager_T.h: Fixed the programming style a bit. - - * ace/Arg_Shifter.cpp (ACE_Arg_Shifter): Reformatted this - stuff a bit. - -Sat Jun 26 12:45:26 1999 Jody Hagins - - This is a change log for the modifications made to support - Borland C++Builder 4.0, Patch 1. Thanks to - Christopher Kohlhoff and Chris Uzdavinis - for helping with this. - - First, I did not get integrate the makefiles to the BCB environment - as it requires alot of tools and more time. I hope to fet to this - in the somewhat near future. However, each directory that has stuff - that I built and tested has a Makefile.bor, which will make whatever - is there with BCB4. Note that the makefiles do not, at present, - have a clean or anything except the default make. - - To build, make sure config.h points to, or simply includes - ace/config-win32.h. - - Finally, not all the programs and exampales have BCB makefiles. - However, it should not be too difficult to adapt the ones that are - there. In addition, the .bpr files should NOT be used to build - the libraries, or any examples. If you want to build examples, - you will need to start with a fresh project in BCB. - - At present (4.6.42) all tests, except SOCK_Send_Recv_Test run - successfully, and some of my own tests run. Also, the TAO services - and programs seem to be operating as well. - - * ace/Asynch_Acceptor.cpp: Need CancelIO for BCB as well - - * ace/Atomic_Op.i: Need ACE_TEMPLATE_SPECIALIZE on specializations. - - * ace/CDR_Stream.h: Need LongLong for BCB as well - - * ace/Functor.i: Need ACE_TEMPLATE_SPECIALIZE on specializations. - - * ace/Future.h: Work around a BCB4 bug which causes the create() - method from being seen. - - * ace/IOStream.h: Only want CString stuff for MSC. - - * ace/IOStream_T.cpp: Only want CString stuff for MSC. - - * ace/OS.cpp: _fdopen, in BCB, takes a non-const pointer - - * ace/OS.h: Differentiate between mode masks and user mode masks. - - BCB doesn't like initialized data in precompiled header files so - define certain constants instead. A bug in BCB prevents calling - a destructor explicitly on a typedef declared inside a class. - So, TEMPLATE3 and TEMPLATE4 versions of ACE_DES_FREE are - necessary for destruction of templates with more parameters. - - BCB4 has a bug in the RTL that resets the GetLastError() value - to zero when errno is accessed. Thus, setting errno to - ::GetLastError requires a copy. To keep from having the code - everywhere, I added ACE_OS::set_errno_to_last_error () and - ACE_OS::set_errno_to_wsa_last_error (), and used it everywhere - errno was being set to GetLastError() or WSAGetLastError(). - - BCB4 has a bug in the optimizer that screws up the return from - certain expressions when a variable is set on both sides of an - assignment. Thus, the definition of ACE_WIN32CALL_RETURN needed - to change. - - * ace/OS.i: Use ACE_set_errno_to_last_error where appropriate. - BCB4 bug requires splitting FILETIME dummy_1, dummy_2; into - separate declarations. - - * ace/Select_Reactor.h: Need ACE_TEMPLATE_SPECIALIZE on - specializations. - - * ace/WFMO_Reactor.cpp: Use ACE_set_errno_to_last_error where - appropriate. Likewise, fix the use of auto_ptr copy ctor, which - can not take a const ref. - - * ace/WIN32_Asynch_IO.cpp: Use ACE_set_errno_to_last_error - where appropriate. Need CancelIo for BCB as well. - - * ace/WIN32_Proactor.cpp: Use ACE_set_errno_to_last_error - where appropriate. - - * ace/config-win32-borland.h: Specific build stuff for BCB - - * ace/config-win32-common.h: Differences between BCB and MSC - - * apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp: BCB4 bug prevents - using typedef inside class for explicit dextructor. - - * apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp: - BCB4 bug prevents using typedef inside class for explicit - dextructor. - - * apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp: BCB4 bug prevents - using typedef inside class for explicit dextructor. - - * apps/JAWS/PROTOTYPE/JAWS/IO.cpp: Get rid of const warning - - * tests/DLL_Test.cpp: The get_hello function has calling - convention __cdecl (by default since the calling convention is - not mentioned). However, BCB decorates __cdecl with a leading - underscore (and doesn't decorate __stdcall). Thus, we needed to - add some decoration to find the function. Also, added prefix to - find the executable. - - * tests/Message_Queue_Test.cpp: BCB4 defines a "messages" and by - default sucks that namespace into the global namespace, so a new - variable name was needed. - - * tests/Reactor_Exceptions_Test.cpp: The test throws a structured - exception. The ISO does not require non C++ exceptions to be - caught by catch (...). MSVC catches it but BCB4 does not. So, - the code needed to be changed to catch a structured exception as - well. - - * tests/run_tests.bat: Changed to allow running the BCB tests, - when in another directory. - -Sat Jun 26 08:40:01 1999 David L. Levine - - * ace/Proactor.cpp: fixed template instantiation pragmas - (to match explicit template instantiation directives). - -Sat Jun 26 08:21:52 1999 David L. Levine - - * ace/Signal.h: reordered #includes to avoid warning about - #pragma once. - -Fri Jun 25 22:30:24 1999 David L. Levine - - * docs/ACE-guidelines.html: always test on egcs before - commiting. It catches real problems that are missed - by some of the other compilers we (well, some of us :-) - use. - -Fri Jun 25 22:20:16 1999 David L. Levine - - * ace/Future.cpp (detach): changed equality comparison of - curr_observer from itself to the observer argument. - Thanks to egcs -W for snagging this. - -Fri Jun 25 21:46:46 1999 David L. Levine - - * ace/OS.h,ace/Signal.h,ace/config-psos-tm.h - (ACE_DONT_INCLUDE_ACE_SIGNAL_H): added this interlock - diagnostic to inform the user when ace/Signal.h gets #included - instead of signal.h. Thanks to Dale Wood - and Timothy Canham for tripping - over it, on the same day, and reporting it. - -Fri Jun 25 17:22:02 1999 Nanbor Wang - - * ace/Select_Reactor_T.cpp (close): Don't call close() on the - if there isn't one. - - * ace/SOCK_Acceptor.cpp (open): The error status was not set - correctly if listen() failed. - - Thanks to Irfan for helping with this. - -Fri Jun 25 16:48:17 1999 David L. Levine - - * ace/OS.h: don't #include directly on VxWorks. - When cross-compiling on NT host, the GreenHills compiler - #includes ace's Signal.h instead of VxWorks' signal.h. - No comment. OS.h doesn't need to #include signal.h directly, - because it gets indirectly #included through sigLib.h. Thanks - to Dale Wood for reporting this. - -Fri Jun 25 16:03:59 1999 Douglas C. Schmidt - - * ace/Future.cpp: Fixed a couple of places where the set() method - didn't have the new *this parameter added. - - * ace: Added Future_Set.{h,cpp} and Future_Node.{h,cpp}, as well - as the new Future.{h,cpp} files to the ACE release. Thanks to - John Tucker for contributing these. - - * ace/Synch.h: Added a comment pointing out that Solaris - threads do not support timed acquire(). Thanks to Darren - DeRidder for reporting - this. - -Fri Jun 25 15:07:00 1999 John Tucker - - The following describes the changes to ACE_Future_Set: - - * I followed the Observer Pattern where the ACE_Future_Set is the - "Observer" and the ACE_Future_Rep is the "Subject". - - * I created an abstract base class called ACE_Future_Observer - which contains a single pure virtual member function "update()". - - * The ACE_Future_Rep is modified so that it contains a list of - ACE_Future_Observer pointers and an interface for attaching - and detaching ACE_Future_Observer Observer objects. The - "attach(...)" member function allows objects which implement the - ACE_Future_Observer interface to attach themselves to - ACE_Future_Rep objects so that they will be notified of - changes to the ACE_Future_Rep Subject. The "detach(...)" - member function allows objects which implement the - ACE_Future_Observer interface to detach themselves from - ACE_Future_Rep objects so that they will no longer be - notified of changes to the ACE_Future_Rep Subject. - - * The ACE_Future_Rep::set() method is modified so that it invokes the - "update()" method of each ACE_Future_Observer object stored - in its list of attached ACE_Future_Observer Observer - objects. It also removes each ACE_Future_Observer Observer - object from its list. - - * The ACE_Future_Set class derives from the ACE_Future_Observer - class. - - * The ACE_Future_Set class contains its own ACE_Message_Queue - attribute which will be used by writer threads to notify reader - threads that an ACE_Future is readable. - - * The ACE_Future_Set class contains a list of ACE_Future - Subject objects which clients in the reader threads insert into - it. When an ACE_Future is inserted into an - ACE_Future_Set, the ACE_Future_Set attaches itself to the - specified ACE_Future, keeping in mind the ACE_Future_Set - implements the ACE_Future_Observer interface, and also - inserts the specified ACE_Future object into its list of - ACE_Future objects. - - * The ACE_Future_Set class implements its "update()" method to - just enqueue an ACE_Message_Block with Null data onto its - ACE_Message_Queue. Since this "ACE_Future_Set::update()" - method will be invoked by the ACE_Future_Rep::set() method in - the writer thread, it will allow the ACE_Future_Set in the - writer thread to signal itself that an ACE_Future has become - readable. - - * The "int ACE_Future_Set::next_readable(ACE_Future &future, - ACE_Time_Value *)" method in the reader thread will block via a - call to "dequeue()" on its ACE_Message_Queue until is awakened - by a call to "ACE_Future_Set::update()" in the writer thread. - Once awakened, the ACE_Future_Set object iterates through its - list of ACE_Future objects until it encounters a readable - one. This readable ACE_Future will be removed from its list - and assigned to the specified "future" parameter". - - * The ACE_Future_Set destructor detaches itself from all - ACE_Future objects remaining in its list. - - * I did not use the ACE_Reactor since I could foresee the - ACE_Future_Set being used by applications which did not run,or - want to run, the event loop. - -Fri Jun 25 14:28:05 1999 Ossama Othman - - * ace/UNIX_Addr.cpp (ACE_UNIX_Addr): Moved base_set() call in - constructor to member initializer list. This is cleaner coding - style. The original code, before a bug fix was made, was like - that. I just forgot to put it back in the member initializer - list after the fix. - -Fri Jun 25 15:15:32 1999 Steve Huston - - * performance-tests/Misc/Makefile: set static_libs_only so the library - selection gets done right on AIX. Clean out the tempinc dir - between binaries on AIX. - - * performance-tests/Misc/test_singleton.cpp: Moved def of DC_Singleton - to new file, test_singleton.h so it works on AIX w/ xlC. - - * ace/Hash_Cache_Map_Manager_T.h: Removed the "ace/" from the - #pragma implementation line. The compiler remembers the directory - it came from. - - * examples/ASX/UPIPE_Event_Server/Peer_Router.h: - * examples/Connection/non_blocking/CPP-connector.h: - * examples/Connection/non_blocking/CPP-acceptor.h: - Added #pragma implementation, for AIX IBM C++. - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: - Split the Options class to a new file, CPP-inclient.h, to make - IBM C++ (xlC) like it. - - * examples/IOStream/server/iostream_server.cpp: Split the Handler - class off to new iostream_server.h file, to make IBM C++ (xlC) - like it. - - * examples/Logger/Acceptor-server/server_loggerd.cpp: Moved the - Options and handler classes' definitions to new server_loggerd.h - file to build with AIX IBM C++. - - * examples/Misc/testr_dump.cpp: Moved the program's classes' - definitions to new server_loggerd.h file to build with AIX IBM - C++. - - * examples/IPC_SAP/SOCK_SAP/Makefile: - * examples/Connection/non_blocking/Makefile: - * examples/Misc/Makefile: - On AIX w/ IBM C++, delete the tempinc directory before compiling - each new program. Keeps the template instantiations from one - program from conflicting with the others. - - * include/makeinclude/rules.lib.GNU: On AIX using IBM C++ only, don't - try to link in the auto-instantiated template object modules if - there aren't any. - - * include/platform_aix4_cset++.GNU: Removed TMPL_OBJS - not needed now. - * examples/Misc/Makefile: On AIX w/ IBM C++, delete the tempinc - directory before compiling each new program. Keeps the template - instantiations from one program from conflicting with the - others. - -Fri Jun 25 12:40:29 1999 David L. Levine - - * ACE-INSTALL.html: added/expanded/moved discussions of - enabling/increasing virtual memory on Linux and LynxOS. Thanks - to Fabrice Podlyski for providing - detailed information for LynxOS. - -Fri Jun 25 11:16:32 1999 Kirthika Parameswaran - - * tests/Makefile: Updated dependencies for Cache_Map_Manager_Test - and Map_Manager_Test. - -Fri Jun 25 07:41:05 1999 David L. Levine - - * docs/ACE-guidelines.html: added guideline to include - directories containing files with template definitions in a -I. - -Thu Jun 24 22:42:44 1999 David L. Levine - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): fixed UNICOS - preprocessor usage so that it's not in the middle of the - ACE_reintepret_cast. - -Thu Jun 24 22:18:52 1999 Doug Anderson - - * ace/CDR_Stream.*,ace/SOCK_Dgram_Mcast.cpp,ace/config-cray.h: - updates for Cray UNICOS port. - -Thu Jun 24 21:33:11 1999 Kirthika Parameswaran - - * ace/Caching_Strategies_T.{h, cpp} (class ACE_FIFO_Caching_Strategy): - * ace/Caching_Strategies_T.{h, cpp} (class ACE_LRU_Caching_Strategy): - * ace/Caching_Strategies_T.{h, cpp} (class ACE_LFU_Caching_Strategy): - Removed the overloaded clear_cache () method with entries as an - formal argument. - - * ace/Caching_Strategy_Utility_T.{h,i,cpp}: Renamed as - Caching_Utiltity.{h, i, cpp}. Also, removed formal - argument from the clear_cache() method, and made purge_percent - of type double instead of unsigned int. - - * tests/Cache_Map_Manager_Test.cpp: Changed the purge_test and - added a test for the Cache_Map_Manager using the Map_Manager. - - * tests/Map_Manager_Test.cpp: Changed the template instantiation - in vein with the changes to the names of the Caching_Utility - classes. - - * tests/Cache_Map_Manager_test.dsp: - * tests/tests.dsw: - Made NT project for the test and added it to the tests workspace. - -Thu Jun 24 20:43:54 1999 Irfan Pyarali - - * examples/Reactor/WFMO_Reactor/test_multithreading.cpp - (Task_Handler): Change loop to go from 1 to number_of_handles - instead of 0 to number_of_handles - 1. - -Thu Jun 24 18:36:22 1999 Douglas C. Schmidt - - * ace/Signal.h: Removed the still-born - ACE_Sig_Action (struct sigaction *) method. Thanks to Umar - Syyid for reporting this. - -Thu Jun 24 15:47:32 1999 Steve Huston - - * tests/run_pharlap_tests.bat: One-button script for running the tests - built for PharLap ETS. - - * tests/tests_pharlap_msvc.lnk: PharLap ETS LinkLoc input file for - building test for ETS. Very possible that local sites will need to - adjust this for the target environment. - - * tests/Atomic_Op_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Basic_Types_Test.dsp: - * tests/Buffer_Stream_Test.dsp: - * tests/CDR_Test_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Conn_Test.dsp: - * tests/DLList_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/Enum_Interfaces_Test.dsp: - * tests/Env_Value_Test.dsp: - * tests/Future_Test.dsp: - * tests/Handle_Set_Test.dsp: - * tests/Hash_Map_Manager_Test.dsp: - * tests/High_Res_Timer_Test.dsp: - * tests/IOStream_Test.dsp: - * tests/Map_Manager_Test.dsp: - * tests/Map_Test.dsp: - * tests/Mem_Map_Test.dsp: - * tests/Message_Block_Test.dsp: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/Message_Queue_Test.dsp: - * tests/MM_Shared_Memory_Test.dsp: - * tests/MT_Reactor_Timer_Test.dsp: - * tests/MT_SOCK_Test.dsp: - * tests/Naming_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Notify_Performance_Test.dsp: - * tests/OrdMultiSet_Test.dsp: - * tests/Pipe_Test.dsp: - * tests/Priority_Buffer_Test.dsp: - * tests/Priority_Reactor_Test.dsp: - * tests/Priority_Task_Test.dsp: - * tests/Process_Mutex_Test.dsp: - * tests/Process_Strategy_Test.dsp: - * tests/RB_Tree_Test.dsp: - * tests/Reactor_Exceptions_Test.dsp: - * tests/Reactor_Notify_Test.dsp: - * tests/Reactor_Performance_Test.dsp: - * tests/Reactor_Timer_Test.dsp: - * tests/Reactors_Test.dsp: - * tests/Reader_Writer_Test.dsp: - * tests/Recursive_Mutex_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/Semaphore_Test.dsp: - * tests/Service_Config_Test.dsp: - * tests/Sigset_Ops_Test.dsp: - * tests/Simple_Message_Block_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/SOCK_Test.dsp: - * tests/SPIPE_Test.dsp: - * tests/SString_Test.dsp: - * tests/SV_Shared_Memory_Test.dsp: - * tests/Svc_Handler_Test.dsp: - * tests/Task_Test.dsp: - * tests/Thread_Manager_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Thread_Pool_Reactor_Test.dsp: - * tests/Thread_Pool_Test.dsp: - * tests/Time_Service_Test.dsp: - * tests/Time_Value_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Timer_Queue_Test.dsp: - * tests/Tokens_Test.dsp: - * tests/TSS_Test.dsp: - * tests/Upgradeable_RW_Test.dsp: - * tests/UPIPE_SAP_Test.dsp: - Added "PharLap ETS Debug" configurations. - - * ACE-INSTALL.html: Added some info about the PharLap TNT ETS port. - -Thu Jun 24 14:10:20 1999 David L. Levine - - * bin/libsize.pl: use appropriate size command for all of - our cross-compile platforms. - -Thu Jun 24 14:00:27 1999 David L. Levine - - * ace/config-sunos5.7.h: with ghs only, undef ACE_HAS_PROC_FS - and ACE_HAS_PRUSAGE_T because the Sun's sys/procfs_isa - requires 64-bit ints. - -Thu Jun 24 13:53:53 1999 David L. Levine - - * ace/Proactor.cpp: added missing backslash to one of - the instantiation pragmas. - -Thu Jun 24 12:53:22 1999 Steve Huston - - * ace/OS.(h i): Added check for ACE_HAS_WINSOCK2 != 0 wherever - the check was only for ifdef ACE_HAS_WINSOCK2. Allows building on - Winsock 1.1. - - * ace/config-pharlap.h: New config file for use with PharLap TNT - Embedded ToolSuite. This is not really tested yet - that activity - continues. - -Thu Jun 24 07:05:17 1999 David L. Levine - - * ace/config-osf1-4.0.h,include/makeinclude/platform_osf1_4.0.GNU, - include/makeinclude/platform_osf1_cxx.GNU: use pragmas instead of - command line arguments to disable specific warning messages. - This cleans up the command line, and makes it easier to control - warning message suppression (because the compiler version is - available in __DECCXX_VER to the preprocessor.) - -Wed Jun 23 21:27:45 1999 David L. Levine - - * ACE-INSTALL.html: removed space from "resource requirements" - tag to avoid problems with web browers. - -Wed Jun 23 20:18:42 1999 Douglas C. Schmidt - - * ace/WFMO_Reactor: Added a no-op work_pending() - implementation until we figure out how to implement this. - - * ace/Reactor_Impl.h, - * ace/Reactor.{cpp,h}, - * ace/Select_Reactor_T.{h,cpp}: Added a work_pending() method - that just checks if there are I/O events "ready" for - dispatching, but doesn't actually dispatch event handlers. This - is needed for TAO's work_pending() API. Thanks to Irfan for - suggesting this. - -Wed Jun 23 15:27:48 1999 David L. Levine - - * bin/libsize.pl: added this script, which provide a size - breakdown of either the ACE or TAO libraries. - -Wed Jun 23 14:34:27 1999 David L. Levine - - * ACE-INSTALL.html: added link to ACE Library Size Breakdown - in System Resource Requirements discussion. - -Wed Jun 23 14:09:27 1999 Kirthika Parameswaran - - * ace/Caching_Strategies_T.cpp (ACE_LRU_Caching_Strategy): - Checked and modified the creation and deletion logic of the - caching utility object. - * ace/Cache_Map_Manager_T.cpp (~Cache_Map_Manager): - Added the close method call to avoid memory leaks. - * tests/run_test.pl: - * tests/run_test.bat: - Added Cache_Map_Manager_Test. - * tests/Cache_Map_Manager_Test: Removed extra comma. - * ace/Caching_Strategies_T.{h, i, cpp} - * ace/Cache_Map_Manager_T.{i,h,cpp} - * ace/Caching_Strategy_Utility_T.{h,i,cpp} - * ace/Cleanup_Strategies_T.{h, i,cpp} - * ace/Hash_Cache_Map_Manager_T.{h, i,cpp} - * ace/ace_dll.dsp: - Added above caching related files into the NT ace workspace. - -Wed Jun 23 10:09:06 1999 David L. Levine - - * ACE-INSTALL.html: updated System Resource requirements discussion. - All of ACE+TAO requires well over 1 Gb of disk now :-/. - -Wed Jun 23 00:03:31 1999 Douglas C. Schmidt - - * ace/SOCK_Dgram.cpp (ACE_SOCK_Dgram): Fixed an unused args - warning. Thanks to David for reporting this. - - * ace/Service_Config.h (ACE_Service_Config): Moved the - documentation for the open() method's "argv" parameters *to* the - open() method. Also clarified that by default we don't install - the "statically configured services" (such as ACE_Svc_Manager). - Thanks to Ian MacDonald for motivating this. - - * ace/OS.i (accept): Added a new workaround for platforms - like VxWorks that can't handle NULL addrs to accept(). Thanks - to James Hu and John Weald - for this fix. - - * ace/config-vxworks5.x.h: Added a new macro - ACE_HAS_BROKEN_ACCEPT_ADDR to work around VxWorks problems - with NULL addrs to accept(). - -Tue Jun 22 21:17:49 1999 Kirthika Parameswaran - - * tests/Cache_Map_Manager_Test.cpp: Tests the Cache_Map_Manager - as well as the Hash_Cache_Map_Manager which has additional - features of caching and purging of entries along with the map - properties. - * tests/Makefile: Added Cache_Map_Manager_Test.cpp - -Tue Jun 22 15:20:53 1999 David L. Levine - - * tests/Thread_Manager_Test.cpp (main): removed THR_DETACHED. - That seems to solve the libthread panic problem on Solaris, - even with group signalling enabled. Thanks to Carlos for - suggesting this. - -Tue Jun 22 15:11:34 1999 Matthew J Braun - - * ace/Containers_T.h,i - Added new next(T *&) methods to the ACE_DLList_Iterator - classes and marked the old versions as DEPRECATED. - -Tue Jun 22 13:40:22 1999 David L. Levine - - * docs/tutorials/*/Makefile: replace rm -f with $(RM). - -Tue Jun 22 13:07:19 1999 Carlos O'Ryan - - * tests/Message_Block_Test.cpp: - * websvcs/lib/URL_Addr.i: - * websvcs/lib/URL_Addr.cpp: - Removed more g++ -W warnings - -Tue Jun 22 11:12:42 1999 David L. Levine - - * ACE-INSTALL.html: added System Resource Requirements - section. Thanks to Hakan Kallberg - and Eric Mitchell for the - Linux swap space and -pipe removal suggestions. - -Tue Jun 22 07:45:59 1999 David L. Levine - - * ace/Event_Handler_T.i: fixed some occurrences of - ACE_INLINE that were after the function return type. - -Tue Jun 22 07:30:12 1999 David L. Levine - - * ace/Stats.cpp: fixed for ACE_LACKS_LONGLONG_T platforms. - (sample): replace return statement with an else branch, to - make it easier to see what the code is doing. - -Mon Jun 21 23:36:02 1999 Carlos O'Ryan - - * websvcs/lib/URL_Addr.cpp: - Fixed warnings about unused variables. - -Mon Jun 21 23:27:01 1999 Darrell Brunsch - - * ace/SString.h: Added ACE_TString typdef that is either a - ACE_CString or ACE_WString, depending on whether UNICODE - is defined. - -Mon Jun 21 23:22:46 1999 Douglas C. Schmidt - - * examples/Misc/test_trace.cpp: Improved this test so it will - work more effectively on single-threaded *and* multi-threaded - platforms. Thanks to Hao Ruan for reporting - this. Also fixed a warnng in this test caused by failure to - return a value on every return path. Thanks to David Levine for - reporting this. - -Mon Jun 21 14:17:22 1999 Carlos O'Ryan - - * ace/Stats.h: - * ace/Stats.cpp: - Added new class to keep latency and throughput statistics. - -Mon Jun 21 13:24:41 1999 David L. Levine - - * include/makeinclude/platform_freebsd.GNU,platform_linux.GNU, - platform_linux_lxpthread.GNU,platform_psosim_g++.GNU, - platform_qnx_neutrino.GNU,platform_sunos5_g++.GNU, - platform_vxworks5.x_g++.GNU: added -W to CFLAGS. -Wall - doesn't include the -W checks, at least with egcs 1.1.2. - -Mon Jun 21 10:18:01 1999 David L. Levine - - * ace/Makefile: moved FlReactor, Msg_WFMO_Reactor, TkReactor, - and XtReactor from OTHER to DEMUX_FILES because TAO uses - them in some configurations. They add negligible size - overhead when not used. Thanks to Nanbor for pointing this - out. - -Mon Jun 21 10:11:15 1999 Carlos O'Ryan - - * ace/Makefile: - The TP_Reactor is used by TAO, but was listed in the OTHER - component. Moved to the DEMUX component to make it always - available. Thanks to David Levine for pointing this out. - -Mon Jun 21 09:58:42 1999 Joe Hoffert - - * ace/QoS.{h,cpp}: Removed these files from ACE since they have a - lot of problems. Will add back later when they compile and are - tested. - -Mon Jun 21 08:40:14 1999 Steve Huston - - * examples/Connection/misc/Connection_Handler.cpp (handle_input): - Corrected signed/unsigned mismatch I accidentally put in last week. - - * ace/CORBA_macros.h: Added __HP_aCC to the compilers that need - special handling for throwing an exception from a value-returning - function. - - * include/makeinclude/platform_hpux_aCC.GNU: Added +DAportable - to CCFLAGS if no architecture specified. Added -z to LDFLAGS - to force SEGV on dereference 0 pointer. Added definition for - CPP_LOCATION to not use aCC - it displays warnings for unrecognized - #pragmas and this dirties the TAO builds. Thanks to Brian Wallis - for these ideas. - -Sat Jun 19 22:28:35 1999 Carlos O'Ryan - - * bin/auto_compile: - Updated the list of tests run every night. - -Sat Jun 19 18:15:48 1999 Carlos O'Ryan - - * ace/OS.h: - * ace/CORBA_macros.h: - The ACE_GUARD macros needed some blanks to work with a template - as the lock type parameter. - -Sat Jun 19 10:34:55 1999 Douglas C. Schmidt - - * ace/Acceptor.cpp, - ace/Connector.cpp: Modified the make_svc_handler() hook method - in these classes to set the Reactor of the newly created - SVC_HANDLER to the same reactor that the Acceptor or Connector - is using. Thanks to John Aughey for - this suggestion. - - * man/{html,man3}: Zapped the Ace_Export.* files since - they don't belong here. Thanks to Zoran Ivanovic - for reporting this. - -Fri Jun 18 20:49:09 1999 Irfan Pyarali - - * ace/Synch.cpp: Added template instantiations for - ACE_Write_Guard. - -Fri Jun 18 19:30:09 1999 Douglas C. Schmidt - - * ACE version 4.6.42 released. - -Fri Jun 18 18:49:39 1999 Carlos O'Ryan - - * tests/Makefile: - * tests/run_tests.psosim: - * tests/run_tests.sh: - * tests/run_tests.vxworks: - Disabled Map_Manager_Test, it does not work with too many - platforms and the features it tests are not used (yet). - -Fri Jun 18 16:54:43 1999 Irfan Pyarali - - * tests/Message_Queue_Test.cpp: - * tests/Message_Block_Test.cpp: - Removed template instantiations for ACE_Message_Queue_Iterator - and ACE_Message_Queue_Reverse_Iterator. They are already - available in the ace library. - - * ace/Service_Types.cpp: Added explicit instantiations for - ACE_Message_Queue_Reverse_Iterator. ACE_Message_Queue and - ACE_Message_Queue_Iterator were already there. This addition - will complete the set. - -Fri Jun 18 12:12:59 1999 Douglas C. Schmidt - - * ace/SOCK_Dgram: Added the first set of hooks to support - QoS-enabled data grams for Win2K GQoS. - -Fri Jun 18 11:37:31 1999 Nanbor Wang - - * *.{mdp,mak}: Removed all MSVC++ 4.x workspaces and makefiles. - We are no longer supporting this version of MSVC++. If you need - support for MSVC++ 4.x please contact Steve Huston - of Riverace to arrange a support - contract. - -Fri Jun 18 12:19:42 1999 Matthew J Braun - - * tests/DLList_Test.cpp: Removeed unnecessary explicit template - instantiation that mirrored ones in ace/Containers.cpp to fix - compile errors on VxWorks. Why this _ever_ worked, I don't - know... - -Fri Jun 18 11:37:31 1999 Nanbor Wang - - * ace/Service_Config.h (class ACE_Static_Svc_Descriptor): Changed - the type of from LPTCSTR to 'const ASYS_TCHAR*'. - -Thu Jun 17 12:46:30 1999 Douglas C. Schmidt - - * tests/Conn_Test.cpp: Fixed a problem with explicit template - instantiations so that this test will compile even if ACE isn't - built with threads. - - * netsvcs/lib/Server_Logging_Handler.cpp: Fixed the explicit - template instantiations so hopefully they'll work when ACE is - compiled without threads. Thanks to Carlos for reporting this. - - * ace/SOCK_Dgram_Mcast.cpp: We needed to modify the return values - of subscribe_i() so that we'd have the ability to differentiate - a "short-circuit" return on NT. Thanks to Marina for reporting - this. - - * ace/OS.h: Added an automatic test to check if we're running on - an EBCDIC character set, and if so, set - ACE_STANDARD_CHARACTER_SET_SIZE to 256 rather than 128. Thanks - to Jim Rogers for this suggestion. - - * performance-tests/TTCP/Makefile: Zapped the Orbix and ORBeline - directories from the Makefile. These are *way* out of date and - have been superceeded by the versions in - $TAO_ROOT/performance-tests/Thruput/. Thanks to Youzhong Liu - for reporting this. - -Thu Jun 17 12:59:24 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - Added accessors for the codeset translators. - -Thu Jun 17 00:33:57 1999 Nanbor Wang - - * include/makeinclude/platform_freebsd.GNU (VERSION): Applied the - patch to automatically detect FreeBSD version. Thanks to - Goldshtain Dmitry for providing the - patch. - - * bin/Process_Win32.pm (TimedWait): - Get and return the exit status from the waited process. - -Wed Jun 16 22:03:29 1999 Irfan Pyarali - - * ace/OS.h (ACE_OS): Removed ACE_WIDE_DL_TYPE and the wide char - versions of dlopen(), dlsym(), and dlerror(). Even Win32 - doesn't support them. - - Also changed the argument type of ACE_OS::dlopen(), - ACE_OS::dlsym(), ACE_DLL::ACE_DLL(), ACE_DLL::open(), and - ACE_DLL::symbol() from ACE_DL_TYPE to const char *. Now the - ACE_OS wrappers do the correct const cast before calling the OS - function. Note that since this change is only adding constness - to the argument, the change is backward compatible. - -Wed Jun 16 20:47:27 1999 Carlos O'Ryan - - * bin/Process_Win32.pm: - The wait time for a process seems to be in milliseconds. - -Wed Jun 16 20:03:41 1999 Steve Huston - - * ace/Containers_T.cpp: Qualify dllist_ with 'this->' to get the - template types looked up correctly. This is what fixes the pesky - future error 641 on HP-UX aC++. - - * ace/RB_Tree.i: Qualify node_ and tree_ with 'this->' to get the - template types looked up correctly. aC++ is really happy now, - and so is Steve :-) - -Wed Jun 16 18:50:38 1999 Carlos O'Ryan - - * ace/OS.i: - Fixed typos in single threaded code. - -Wed Jun 16 18:14:45 1999 Kirthika Parameswaran - - * ace/Cached_Connect_Strategy_T.{h, cpp}: Added ATTRIBUTES to - the template list for the Cached_Connect_Strategy_Ex class to - ward off g++ compiler errors. - -Wed Jun 16 15:54:08 1999 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - * ace/config-win32.h: - Auto-detect if we are using MSVC5.0 or MSVC6.0 and define the - ACE_HAS_WINSOCK_GQOS macro in that case. This macro is used in - the places where the QoS data structure of both compilers are - different. - -Mon Jun 14 22:52:48 1999 Kirthika Parameswaran - - * tests/Map_Manager_Test.cpp: Removed template instantiation - regarding ACE_Read_Mutex. Added template - instantiations for ACE_Pair and - ACE_Reference_Pair to make sunc++5.0 happy. - - * ace/Caching_Strategy_Utility_T.{h.cpp}: Removed math.h from the - include list since it caused problems when native exceptions were - enabled. - -Mon Jun 14 21:41:40 1999 Douglas C. Schmidt - - * ace/Connector.h: Added a comment to clarify that if - Connector::connect() fails the close() hook of the Svc_Handler - is called to prevent resource leaks. Thanks to V. Lakshmanan - for motivating this. - -Mon Jun 14 20:54:09 1999 Kirthika Parameswaran - - * ace/Synch.cpp: Declared template definitions for - ACE_Read_Mutex to get around compiler errors - while building $ACE_ROOT/tests. Thanks to Dr.Schmidt for - suggesting this. - -Mon Jun 14 19:33:04 1999 Douglas C. Schmidt - - * ace/SOCK_Acceptor.cpp (accept): Fixed a bizarre problem with - Win32 where it's imperative that the third parameter to - must be a NULL pointer if we want to ignore the client address. - - * ace/OS.i: Cleaned up warnings in join_leaf() and ioctl() due to - unused args. Thanks to Marina for reporting this. - -Mon Jun 14 15:56:27 1999 David L. Levine - - * ace/config-qnx-neutrino.h, - include/makeinclude/platform_qnx_neutrino.GNU: added config - files for QNX Neutrino. They support cross-compiling on a - QNX4 host for Neutrino target. Builds are almost (but not - completely) clean. - - * include/makeinclude/platform_qnx_neutrino.GNU: only - build static libs, because they seem to work better. Many - of the ACE tests pass with this configuration! (Some of - the usual suspects, such as Conn_Test, don't.) - - * ace/config-qnx-neutrino.h: don't need ACE_HAS_PENTIUM here, - because it's in config-g++-common.h. Removed - ACE_HAS_USING_KEYWORD, because g++ 2.8.1 doesn't support - namespaces. - -Mon Jun 14 14:33:29 1999 David L. Levine - - * tests/Reactor_Performance_Test.cpp (handle_input): removed - printout when result == 0. It happens when the client finishes - first, which I think is OK. - -Mon Jun 14 11:55:31 1999 Steve Huston - - * include/makeinclude/platform_aix4_g++.GNU: New platform file for AIX - 4.x using GNU compiler. Been tested w/ egcs 1.1.2. - - * include/makeinclude/platform_aix4_cset++.GNU: Make shared libs - correctly and without building the static one first. - Also, for cset++, disable warnings on AIX 4.3 to shut up the - 0-valued preprocessor warnings. This is not a great - long-term general solution, but it'll do the job. - - * include/makeinclude/wrapper_macros.GNU: - * include/makeinclude/rules.lib.GNU: On AIX, build shared lib w/o - requiring static one first. When building shared libs, also link - against them and install the proper files when done. The correct - files built for libfoo are: - libfoo.a: archive/static library - libfoo.so: shared library, but not set up for run-time linker. - This is the one loaded by ACE dynamic loading. - libfooshr.a: an archive library with libfoo.so as its only - member. This is what to link against when building - a program/library that uses libfoo. - - Silly? Uh-huh. But that's life in AIX land. I tried to get things - building/running clean using the run-time linker (-brtl) but had - no end of trouble. And, since no other libs in /usr/lib want to - do it that way either, it's like this. - -Mon Jun 14 09:58:02 1999 Douglas C. Schmidt - - * ace/OS.i: Added ACE_UNUSED_ARG() macros for all the non-WINSOCK2 - cases in the ACE_Flow_Spec and ACE_QoS methods. Thanks to David - for reporting this. - - * ace/OS.i: Moved the definition of ACE_Errno_Guard's methods to - earlier in the file to avoid problems with inline ordering. - Thanks to David for reporting this. - - * ACE-INSTALL.html: Updated Barry Hoggard's CORBA page URL. - -Mon Jun 14 07:17:23 1999 David L. Levine - - * docs/ACE-guidelines.html: fixed typo: exceptions. - -Sun Jun 13 14:22:54 1999 Douglas C. Schmidt - - * ace/LSOCK_Acceptor.cpp: Rewrote the accept() method to use the - same new technique that's used in ACE_SOCK_Acceptor::accept(). - This is necessary since there's no longer a shared_accept(). - - * ace/SOCK_Acceptor: Removed shared_accept() since it's been split - into two parts to make the QoS features easier to maintain. - - * ace/SOCK_Acceptor: Added the new ACE_Accept_QoS_Params parameter - to the ACE_SOCK_Acceptor::accept(). Also created two new - private methods, shared_accept_start() and - shared_accept_finish(), that factor out common code. - - * ace/SOCK_Connector: Added the new ACE_Connect_QoS_Params - parameter to ACE_SOCK_Connector::connect(). Also created two - new private methods, shared_connect_start() and - shared_connect_finish(), that factor out common code. - - * ace/SOCK_Connector.cpp: Cleaned up the logic that checks for - various types of errors and updated the code to use the new - ACE_Errno_Guard features. - - * ace/OS.h: Added an equality and in-equality operator for - ACE_Errno_Guard and moved all the methods into OS.i rather than - OS.h. Also added an ACE_Export to the ACE_Errno_Guard class so - that it can be used outside of the ACE library. - - * ace/OS.h: For Win32, added support for the WinSock2 QoS - functions WSAAccept(), WSAConnect(), WSAJoinLeaf(), and - WSAIoctl(). - - * ace/OS.h: For Win32, added thin wrappers ACE_Flow_Spec and - ACE_QoS that encapsulate the WinSock2 FLOWSPEC and QOS structs, - respectively. - - * ace/OS.h: For Win32, added an implicit conversion operator from - iovec to WSABUF since they are structurally equivalent. - -Sun Jun 13 14:22:54 1999 Douglas C. Schmidt - - * bin/README.html: Updated the information about the ACE - documentation tools to be more helpful. - -Fri Jun 11 20:04:37 1999 Carlos O'Ryan - - * bin/Process_Unix.pm: - Fixed problems on TimedWait(). - -Fri Jun 11 15:28:44 1999 Douglas C. Schmidt - - * ace/OS.h: Need to add #include before - since pthread.h doesn't include signal.h on SunOS 5.7. Thanks - to Rick Weisner for reporting this. - - * ace/OS: ACE_OS::memchr() should return a const void * rather - than a void *. Thanks to Rick Weisner - for reporting this. - - * ace/Dirent.i: Don't call closedir() on a NULL dirp because some - platforms (such as SunOS 5.7) will segfault! Thanks to Tom - Arbuckle for pointing - this out. - -Fri Jun 11 14:47:47 1999 Carlos O'Ryan - - * bin/auto_compile: Does not compile all the directories in TAO, - because it takes too much space (and time). Run several more - tests in TAO that are stable. Improve output. - - * ace/Log_Msg.cpp: Use ACE_HAS_THR_C_DEST for TSS "destructors", - not ACE_HAS_THR_C_FUNC. - - * bin/ACEutils.pm: - * bin/Process_Unix.pm: - * bin/Process_Win32.pm: Added new routines to wait for a process - with a timeout, ditto for the ACE::waitforfile() routine. They - can be used to write more reliable test drivers. - -Fri Jun 11 14:40:49 1999 David L. Levine - - * bin/create_ace_build: run the directory mode value through eval, - to convert it from octal to decimal, if necessary. Thanks to - Russ Noseworthy for providing the patch. - - * include/makeinclude/platform_sunos5_sunc++.GNU: only set - TEMPLATE_REPOSITORY for Sun C++ 4.2. 5.0 doesn't need it. - Thanks to Dennis C. De Mars for - reporting this. - - * tests/Reactor_Performance_Test.cpp (main): return error status - from run_event_loop () call. And, added a few ACE_ERROR - printouts. Thanks to Steve for mentioned this. - - * ace/config-sunos5.5.h: properly reverted all the changes of - today. The comments are more helpful this way. - - * include/makeinclude/platform_linux_lxpthread.GNU: changed - PLATFORM_AIO_SUPPORT to use := instead of =, so that it only - invokes the shell once. Thanks to Lothar Werzinger - for suggesting this. - -Fri Jun 11 12:10:00 1999 Chris Gill - - * tests/RB_Tree_Test.{cpp, h (new)}: factored out class template - declaration into a .h file to make AIX C++ happy. - -Thu Jun 10 23:11:36 1999 Kirthika Parameswaran - - * ace/Cache_Map_Manager_T.{h, i, cpp}: Added Iterator - implementations to the template parameters to be able to build - using the g++ compiler. Also removed unnecessary HASH_KEY and - COMPARE_KEYS from the template list. - - * ace/Hash_Cache_Map_Manager_T.{h, i, cpp}: Made appropriate - changes to support changes made to Cache_Map_Manager. - - * ace/Caching_Strategies_T.{h, i, cpp}: Added an overloaded - clear_cache method which allows the user to specify the total - number of entries in the cache. Also added the - Caching_Strategy_Utility parameter which decouples the actual - purging from the caching strategy. - - * ace/Caching_Strategy_Utility.{h,i,cpp}: Added a Null version of - the utility to be used with the Null strategy. - - * ace/Cleanup_Strategies_T.{h,i,cpp}: Added the ACE_UNSED_ARGS - macro to ward of g++ warnings. - - * tests/Map_Manager_Test.cpp: Added performance tests for the - Cache_Map_Manager and the Hash_Cache_Map_Manager. - -Thu Jun 10 20:29:00 1999 Chris Gill - - * ace/RB_Tree.h: Made constructors for iterator base class - protected instead of protected, so the the base class can only - be constructed by the derived forward and reverse iterator - classes. Thanks to Matt Braun for pointing this out. - - * tests/RB_Tree_Test.cpp: Major overhaul of the test to use a test - class template that encapsulates the test details and makes the - code much more readable. Then, the main program merely - instantiates a test for each of the four possible combinations - of key/item type parameterization over int and const char *, and - calls the run_test () method of each test instance. - -Thu Jun 10 12:44:22 1999 Steve Huston - - * tests/UPIPE_SAP_Test.cpp: Disable for Win32 if !ACE_HAS_WINNT4. - The test relies on ACE_SPIPE_Acceptor which requires NT4 to - work. - -Thu Jun 10 12:47:52 1999 David L. Levine - - * ace/config-linux-lxpthreads.h: removed ACE_HAS_AIO_CALLS. It's - now enabled in the platform_macros.GNU file: - - * include/makeinclude/platform_linux_lxpthread.GNU: added - automatic detection of AIO support, based on existence of - /usr/lib/librt.so. - - * include/makeinclude/platform_linux_lxpthread.GNU: add -lrt to - LIBS only if $(PLATFORM_AIO_SUPPORT) is equal to - -DACE_HAS_AIO_CALLS. - - Thanks to Jake Hamby for reporting that not - all Linux platforms have AIO support. - -Thu Jun 10 10:17:08 1999 David L. Levine - - * ace/config-sunos5.5.h: with Sun C++ 5.0, #define - _RWSTD_NO_EXCEPTIONS 1 if exceptions are not enabled. This - avoids a warning about throw expressions being ignored with - -noex. See /opt/SUNWspro_5.0/SC5.0/include/CC/stdcomp.h for - more information. - - * ace/os-patches/vxworks-5.1.txt,ACE-INSTALL.html: added these - notes for using ACE with VxWorks 5.1. - - * docs/ACE-guidelines.html: avoid source code filenames that - include "Error". Avoid #include . - -Wed Jun 9 21:45:24 1999 Douglas C. Schmidt - - * tests/Svc_Handler_Test.cpp (main): Revised the test a bit to - make it more clear what's going on. - - * ace/Svc_Handler.cpp: Fixed a typo in flush() -- we need to - update the temp pointer with temp->cont() *not* entry->cont(). - - * ace/Svc_Handler.cpp (dump): Fixed a typo -- I wasn't comparing - the pointer to 0, I was comparing the ACE_Time_Value! - -Wed Jun 9 21:10:00 1999 Chris Gill - - * ace/config-psos-diab-ppc.h: added - ACE_HAS_NONCONST_SELECT_TIMEVAL - - * tests/RB_Tree_Test.cpp: fixed constness issues revealed by - SunC++ 5.0, added return value assertions for insert calls, - added typedefs. - -Wed Jun 9 20:40:50 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.cpp: Added new methods to support message - reassembly in GIOP 1.1 - -Wed Jun 9 15:32:37 1999 Douglas C. Schmidt - - * ace/Message_Queue_T: Added a lock() accessor method so that - other components can access the lock used by a Message Queue. - - * ace/Svc_Handler.cpp: Added better support for timeout handling - for the ACE_Buffered_Svc_Handler. - - * ace/Svc_Handler: Split the buffering portion of ACE_Svc_Handler - off into a separate class called ACE_Buffered_Svc_Handler to - avoid adding extra space and complexity to the existing - ACE_Svc_Handler. Thanks to Irfan for suggesting this, as well - as also suggesting ways to improve the performance by caching - the current size of the buffer. - - * ace/OS.h: Added a patch to work around some problems with macros - for USYNCH_THREAD. Thanks to David Levine and Russ Noseworthy - for this. - - * examples/Threads/task_five.cpp (main): Improved the form and - content of this example a bit. - - * include/makeinclude/platform_sunos5_sunc++.GNU, - * include/makeinclude/platform_sunos5_g++.GNU, - * include/makeinclude/platform_irix6.x_g++.GNU, - * include/makeinclude/platform_linux_lxpthread.GNU, - * include/makeinclude/platform_irix6.x_sgic++.GNU: - Added support to make it easier to override various settings - in platform_macros files. Thanks to Dave Meyer - for contributing this. - - * ace/SPIPE_Stream: Added sendv(), sendv_n(), and recvv_n() - methods to SPIPE_Stream. Thank to Carlos for pointing this out. - - * ace/config-mvs.h: Changed the size of the ACE_SIZEOF_DOUBLE and - ACE_SIZEOF_LONG_DOUBLE from 4 and to 8 and 16, respectively. - Thanks to Jim Rogers for reporting this. - - * ace/config-mvs.h: Added ACE_HAS_NONCONST_SELECT_TIMEVAL on the - advice of Jim Rogers . - - * ace/OS.h (class ACE_Errno_Guard): Propagate the return value of - the assignment operator to allow chaining. Thanks to Jeff for - reporting this. - - * ace/OS.i: Fixed a bizzarre problem with lower-case ace_os::. - Thanks to Andy for pointing this out. - - * ace/Svc_Conf.y: Don't enable YYDEBUG by default so that we can - save some space in the generated code. - - * ace/OS: Added several more uses of ACE_Errno_Guard, which has - been enhanced to support assignment. Thanks to Irfan for - suggesting this. - - * tests/Svc_Handler_Test.cpp: Added a simple test for the new - buffering feature in ACE_Svc_Handler. - - * ace/Strategies.cpp: Added an explicit template instantiation for - ACE_Message_Queue_Iterator since this is now - used in ACE_Svc_Handler. - - * ace/Svc_Handler: Added a "buffering" feature to the - ACE_Svc_Handler. This feature makes it possible to queue up - ACE_Message_Blocks in an ACE_Message_Queue until (1) the queue - is "full" or (2) a period of time elapses, at which point the - queue is "flushed" via sendv_n() to the peer. - -Wed Jun 9 12:23:30 1999 Jeff Parsons - - * tests/version_tests/version_tests.dsw: - * tests/run_tests.bat: - * tests/run_tests.psosim: - * tests/run_tests.vxworks: - Added Svc_Handler_Test to these. - - * tests/tests.dsw: - Added Svc_Handler_Test.dsp (created and checked in by - Nanbor) to the workspace. - -Wed Jun 9 10:46:07 1999 Carlos O'Ryan - - * ace/Strategies.cpp: - Moved template instantiations to ace/Service_Types.cpp - - * ace/Service_Types.cpp: - Added missing template instantiations for - ACE_Message_Queue_Iterator<> - - * ace/Svc_Handler.cpp (flush): - Removed extra characters and the end of a #endif - Fixed warning about unused variable - Use right iterator for the Message_Queue - -Wed Jun 09 10:11:29 1999 David L. Levine - - * ace/config-g++-common.h: added #define of - ACE_NEW_THROWS_EXCEPTIONS, with egcs if ACE_HAS_EXCEPTIONS is - #defined. That allows ACE's New_Fail_Test to pass. Thanks - to Jake Hamby for providing the fix. - -Tue Jun 8 22:44:18 1999 Douglas C. Schmidt - - * Hacked BYACC to generate a parser that doesn't have any - incorrect const char *'s. This clears the last major const - issue in libACE. - -Tue Jun 8 20:46:05 1999 Matthew J Braun - - * ace/Functor.i,h: Migrated ACE_Hash template specializations - from native types to ACE types (ACE_UINT16, etc). This was - necessary since native types are not portable. - -Tue Jun 8 15:47:06 1999 Douglas C. Schmidt - - * ace: Updated most of the places in ACE that can benefit from the - new ACE_Errno_Guard class. - - * ace/OS.h: Added a new ACE_Errno_Guard class that improves - performance when thread-specific errno must be saved/restored in - a block of code. Thanks to Serge Kolgan for - motivating this and to Rick Weisner - for explaining the technique to Serge. - - * ace/Env_Value_T.h: Added a new ACE_Convert() function that works - for const char *'s. Thanks to David for reporting this. - -Tue Jun 08 18:08:41 1999 Steve Huston - - * ace/OS.h: Added new overridable macro, ACE_LOCALHOST. This allows - overriding of the string used to do a loopback IP socket to the - local host. Some systems (e.g. PharLap ETS) don't have a host table - out of the box, and require an IP address string. - - * ace/Pipe.cpp: Use the new ACE_LOCALHOST macro instead of a hard - "localhost" when using a socket to emulate a pipe. Thanks to - Bruce Trask for working to get this - ironed out for PharLap ETS. - - * README: Added Bruce Trask to the Hall of Fame ;-) - - * tests/SOCK_Connector_Test.cpp: Check for failed host lookup - before trying to connect. Changed the way sethostent is done on - AIX 4.3 to work around an apparent bug in AIX 4.3. - -Tue Jun 08 13:46:38 1999 Nanbor Wang - - * ace/OS.h (wmain): Added a new macro to tweak the wchat_t version - of main program entry point to create the non-static - Object_Manager. This is only enabled if UNICODE and ACE_WIN32 - is defined (although you can also use wmain under non-UNICODE - environment). - -Mon Jun 07 14:34:53 1999 Nanbor Wang - - * ace/CORBA_macros.h: The member function for dumping - TAO_Exception is changed to _tao_print_exception. - -Tue Jun 08 14:44:07 1999 David L. Levine - - * tests/Thread_Manager_Test.cpp (main): on Sun only, added 5 - second sleep before the "main thread finished" printout. It - might help (but certainly doesn't prevent) avoid an occasional - thread lib panic on SunOS 5.5 through 5.7. - -Tue Jun 08 14:01:51 1999 David L. Levine - - * ACE version 4.6.41 released. - -Tue Jun 8 12:42:56 1999 Douglas C. Schmidt - - * Fixed lots of brokens URL links. Thanks to Eric S Rosenthal - for reporting these. - -Mon Jun 7 17:09:56 1999 Douglas C. Schmidt - - * examples/Naming/test_multiple_contexts.cpp (main): Added a cast - to resolve const problems. Thanks to David for reporting this. - - * examples/Naming/test_writers.cpp (main): Fixed a typo. Thanks - to David for reporting this. - -Mon Jun 7 14:21:48 1999 Kirthika Parameswaran - - * tests/DLL_Test.cpp (main): ANSI C++ spec doesnt allow void * to - be typecasted to a function_pointer. Hence made changes to - remove the warning due to this. Thanks to Nanbor - for pointing it out. - -Mon Jun 7 14:12:02 1999 Nanbor Wang - - * ACE-INSTALL.html: Added a general section explaining the order - of user defined macros and platform config file. Thanks to - Stephen E Blake for pointing - this out. - -Mon Jun 07 10:55:12 1999 David L. Levine - - * ace/config-osf1-4.0.h: added #define ACE_HAS_BROKEN_T_ERROR - to permit building again. Thanks to Doug for this fix. - -Mon Jun 7 12:35:17 1999 Douglas C. Schmidt - - * examples/Service_Configurator/IPC-tests/client: Fixed some more - warnings related to const-correctness. I believe that ACE is - now just about completely const-correct. - - * examples/Service_Configurator/Misc/main.cpp (main): Cast to - (ASYS_TCHAR **) rather than (ASYS_THCAR *[]). Thanks to David - for reporting this. - - * examples/IPC_SAP/DEV_SAP/writer/writer.cpp (main): Fixed a stray - comma. Thanks to David for reporting this. - - * tests/Hash_Map_Manager_Test.cpp: Changed the use of ASYS_TCHAR * - to LPCTSTR to ensure const-correctness. - - * netsvcs/lib: Reformatted all the *.h files to conform to the ACE - programming guidelines. - -Sun Jun 6 22:02:43 1999 Douglas C. Schmidt - - * ace/OS.i (t_error): Fixed the broken t_error() usage on SunOS - 5.5 and 5.6... - - * ace/README: Added a new macro called ACE_HAS_BROKEN_T_ERROR to - workaround the frigging broken prototype for t_error() on - Solaris 2.5. Note that this macro is required for SunOS 2.5 and - 2.6, but not SunOS 2.7 (thank goodness). - - * Fixed gazillions of incorrect usages of char * (which should - have been const char *) throughout ACE. - - * netsvcs/clients/Tokens: Fixed some const char * inconsistencies. - - * netsvcs/lib/Name_Handler.h: Fixed another inconsistent use of - char * that should have been const char *. - - * ace/Service_Config.h: Fixed a const incorrectness in the - ACE_Static_Svc_Descriptor. - - * ace/Process.h (ACE_Process_Options): The parameter type of - command_line() should be LPCTSTR argv[] *not* LPTSTR argv[]. - This fix should be ok as a further extension to what Carlos did - below. - -Sun Jun 06 20:33:00 1999 Carlos O'Ryan - - * ace/SString.h: - Added missing ACE_Export macro - -Sun Jun 6 20:34:40 1999 Carlos O'Ryan - - * ace/Synch.h: - * ace/Timer_Queue_T.h: - * ace/Timer_Queue.cpp: - * ace/Select_Reactor.cpp: - Moved explicit template instantiations around, now ACE compiles - and links with Sun/CC and inlining enabled. TAO does not. - -Sun Jun 6 18:05:48 1999 Carlos O'Ryan - - * ace/Process.h: - * ace/Process.cpp: - Added const-correct version of the command_line() method, in the - future we should remove the non-const version, but I don't feel - like breaking an interface today. - - -Sun Jun 06 09:08:48 1999 David L. Levine - - * PROBLEM-REPORT-FORM: added requests to not send - as attachment, or tar'red, compressed, and/or - uuencoded, or with line lengths >= 80 characters. - -Sun Jun 06 08:08:11 1999 David L. Levine - - * ace/Functor.{h,i} (ACE_Hash::operator ()): - conditionally compile only if ACE_SIZEOF_LONG is not 8, - to avoid conflict with ACE_HASH on 64-bit - platforms (alphas). - -Sat Jun 5 23:34:21 1999 Douglas C. Schmidt - - * ace/Containers_T: Changed all uses of "index" to "slot" to avoid - conflicts with broken C++ compilers that define macros named - "index." - -Sat Jun 5 22:57:31 1999 Carlos O'Ryan - - * ace/OS.h: - Added new macro (ACE_TEMPLATE_SPECIALIZATION) to handle the - differences between compilers supporting the standard way to - specialize a template (i.e. template<> class Foo) vs. the - old style (just saying class Foo). - Also added new macro ACE_HAS_STD_TEMPLATE_SPECIALIZATION that - platforms must define if they want the new style. - - * ace/Filecache.cpp: - * ace/Functor.h: - Use the new ACE_TEMPLATE_SPECIALIZATION macro - - * ace/config-sunos5.5.h: - Define the new ACE_HAS_STD_TEMPLATE_SPECIALIZATION for Sun/CC - 5.0 - - * ACE-INSTALL.html: - Added some notes about our success with Sun/CC 5.0 - -Sat Jun 5 16:48:47 1999 Carlos O'Ryan - - * ace/config-irix6.x-common.h - * ace/config-irix6.x-sgic++-nothreads.h - * ace/config-irix6.x-sgic++.h - * include/makeinclude/platform_irix6.x-sgic++.GNU - * include/makeinclude/platform_irix6.x_common.GNU - * include/makeinclude/platform_irix6.x_g++.GNU - * include/makeinclude/platform_irix6.x_kcc.GNU - * include/makeinclude/platform_irix6.x_sgic++.GNU: On IRIX 6.5 we - must not define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS, thanks to - Bob Laferriere for pointing this out. - Created a new platform_*.GNU file that auto detects the IRIX - version (couldn't find a pre-processor macro to do it); also - renamed the platform_irix6.x-sgic++.GNU file to use underscore - instead of '-'; that way it is more consistent with the other - files. - -Sat Jun 5 13:29:07 1999 Douglas C. Schmidt - - * ace/Codeset_IBM1047: Minor reformatting to conform to ACE - programming guidelines. - -Sat Jun 5 13:00:46 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - New methods added to the InputCDR class to simplify the process - of reading a buffer from a socket or file. - -Fri Jun 4 23:52:19 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - Added support for codeset translators. - Many thanks to Jim Rogers for providing - these fixes. - - * ace/Makefile: - * ace/Codeset_IBM1047.h: - * ace/Codeset_IBM1047.cpp: - A pair of codeset translators between IBM1047 (aka EBCDIC) and - ISO8859-1 (aka ISO-Latin-1) - - * ace/config-mvs.h: - Define an ACE_MVS macro - -Fri Jun 4 15:23:18 1999 Kirthika Parameswaran - - * ace/Cached_Connect_Strategy_T.{h,i,cpp}: Removed common code by - making Cached_Connect_Strategy_Ex derive from - Cached_Connect_Strategy class. - -Fri Jun 04 09:59:58 1999 Irfan Pyarali - - * docs/tutorials/tutorials.dsw: Fixed "_" to "-". Thanks to Tom - Bradley for pointing - out this problem. - -Fri Jun 4 09:02:35 1999 Aniruddha Gokhale - - * ace/POSIX_Asynch_IO.cpp: Fixed a syntax error. There were two - consecutive commas in the ACE_DEBUG statement which were causing - syntax errors while compiling. - -Fri Jun 4 00:28:07 1999 Alexander Babu Arulanthu - - * ace/POSIX_Asynch_IO.cpp: Fixed the Linux egcs warning. - -Thu Jun 3 17:05:36 1999 Kirthika Parameswaran - - * ace/Cached_Connect_Strategy_T.h - * ace/Cached_Connect_Strategy_T.i - * ace/Cached_Connect_Strategy_T.cpp - - Caching connection strategy used by the Strategy Connector. - - * ace/Cache_Map_Manager_T.h - * ace/Cache_Map_Manager_T.i - * ace/Cache_Map_Manager_T.cpp - - Map Manager which performs caching depending on the caching - strategy used. - - * ace/Hash_Cache_Map_Manager_T.h - * ace/Hash_Cache_Map_Manager_T.i - * ace/Hash_Cache_Map_Manager_T.cpp - - Hash_Map used as a specialised form of the Cache Map. - - * ace/Caching_Strategies_T.h - * ace/Caching_Strategies_T.i - * ace/Caching_Strategies_T.cpp - - Strategies used for caching purposes, example: Least Recently - Used. - - * ace/Caching_Strategy_Utility_T.h - * ace/Caching_Strategy_Utility_T.i - * ace/Caching_Strategy_Utility_T.cpp - - Helper class for the caching strategy classes which does the - purging of entries. - - * ace/Cleanup_Strategies_T.h - * ace/Cleanup_Strategies_T.i - * ace/Cleanup_Strategies_T.cpp - - Strategy which deals with destruction and cleanup in general. - - * ace/Makefile - - Added the above under the TEMPLATE_FILES. - - * examples/Web_Crawler/Optimal_Cache_Map_Manager_T.h - * examples/Web_Crawler/Optimal_Cache_Map_Manager_T.i - * examples/Web_Crawler/Optimal_Cache_Map_Manager_T.cpp - * examples/Web_Crawler/Cached_Connect_Strategy_T.h - * examples/Web_Crawler/Cached_Connect_Strategy_T.i - * examples/Web_Crawler/Cached_Connect_Strategy_T.cpp - * examples/Web_Crawler/Caching_Strategies_T.h - * examples/Web_Crawler/Caching_Strategies_T.i - * examples/Web_Crawler/Caching_Strategies_T.cpp - - Removed these files and added them to the ace library itself. - - * examples/Web_Crawler/Command_Processor.cpp - * examples/Web_Crawler/Command_Processor.h - * examples/Web_Crawler/HTTP_URL.cpp - * examples/Web_Crawler/HTTP_URL.h - * examples/Web_Crawler/Iterators.h - * examples/Web_Crawler/Makefile - * examples/Web_Crawler/Mem_Map_Stream.cpp - * examples/Web_Crawler/Mem_Map_Stream.h - * examples/Web_Crawler/Options.h - * examples/Web_Crawler/URL.h - * examples/Web_Crawler/URL_Addr.h - * examples/Web_Crawler/URL_Status.h - * examples/Web_Crawler/URL_Visitor.cpp - * examples/Web_Crawler/URL_Visitor.h - * examples/Web_Crawler/URL_Visitor_Factory.h - * examples/Web_Crawler/Web_Crawler.h - * examples/Web_Crawler/main.cpp - - Changed to include files pertaining to Caching and Connection - management from ace library. - -Thu Jun 03 15:57:43 1999 Irfan Pyarali - - * ace/Strategies_T (ACE_Cached_Connect_Strategy): Allowed the user - to pass in a mutex. This allows the user to pass in a - preconfigured mutex of his/her liking. Since the parameters - default appropriately, no existing code should break. - - * ace/Functor: Changed ACE_Hash specialization - to ACE_Hash. - -Thu Jun 3 10:36:35 Matthew J Braun - - * ace/Functor.i - * ace/Functor.h: - Added ACE_Hash . It truncates the ULongLong - to a ULong and returns it. Nothing major... - -Wed Jun 2 17:50:23 1999 Carlos O'Ryan - - * include/makeinclude/platform_mvs.GNU: - Debugging info was not generated on the C++ files. - The -+ flag should be added to CPPFLAGS using += - Thanks to Jim Rogers for these fixes. - -Wed Jun 02 16:11:34 1999 Nanbor Wang - - * ace/TTY_IO.cpp (control): Commented out odd baud rates (56000, - 128000, 256000) which don't seem to be supported on FreeBSD. - -Wed Jun 02 00:07:44 1999 - - * tao/test_cancel.dsp - * tao/post_completions. - * tao/test_end_event_lo - * tao/test_multiple_loo - * tao/test_proactor.dsp - * tao/test_proactor.dsw - * tao/test_timeout.dsp - - * examples/Reactor/Proactor/test_cancel.cpp: - * examples/Reactor/Proactor/README: - * examples/Reactor/Proactor/Makefile: - - Related to ChangeLog : Tue Jun 1 16:48:58 1999 Alexander Babu - Arulanthu - -Tue Jun 1 21:44:05 1999 Carlos O'Ryan - - * include/makeinclude/platform_linux_lxpthread.GNU: - Added the rt library to the command line, ACE uses aynchronous - I/O by default on linux. - -Tue Jun 1 16:48:58 1999 Alexander Babu Arulanthu - - Ported to POSIX platforms based - on API. Made the return values consistent in both - WIN32 and POSIX platforms as follows. - - All completion notifications for the I/O operations will occur - normally. - - = Return Values: - - -1 : Operation failed. (can get only in POSIX). - 0 : All the operations were cancelled. - 1 : All the operations were already finished in this - handle. Unable to cancel them. - 2 : Atleast one of the requested operations cannot be - cancelled. - - * ace/Asynch_IO.cpp - * ace/Asynch_IO.h - * ace/POSIX_Asynch_IO.cpp - * ace/POSIX_Asynch_IO.h - * ace/POSIX_Proactor.h - * ace/WIN32_Asynch_IO.cpp: - * ace/POSIX_Proactor.cpp: - - * ace/config-linux-lxpthreads.h: Enabled the ACE_HAS_AIO_CALLS - flag for this platform. - - -Tue Jun 1 15:02:34 1999 Carlos O'Ryan - - * ace/Connector.h: - Documented the new connect() method - -Tue Jun 01 11:18:03 1999 - - * examples/Reactor/Proactor/test_end_event_loop.cpp: - * tao/post_completions.cpp - * tao/test_end_event_loop.cpp - * tao/test_end_event_loop.dsp - * tao/test_proactor.dsw - Fixed the link problems. - -Tue Jun 1 09:57:42 1999 Douglas C. Schmidt - - * ace/TTY_IO.cpp (control), - * ace/config-freebsd.h, - ace/config-freebsd-pthread.h: Attached is a patch that will - allow the ACE_TTY_IO class to work with FreeBSD tty devices. - Thanks to John Aughey for contributing these. - - * ACE-INSTALL.html: Updated the list of platforms that ACE is - supported on. - -Tue Jun 01 10:00:29 1999 David L. Levine - - * ACE-INSTALL.html: updated Sun C++ and DU versions in fully - supported platforms list. - -Mon May 31 22:45:18 1999 David L. Levine - - * ace/config-lynxos.h: added ACE_HAS_GPERF. - -Mon May 31 16:28:27 1999 Jeff Parsons - - * ace/CDR_Stream.h: - Added and updated some comments. - -Mon May 31 16:13:21 1999 David L. Levine - - * ace/Makefile: if ACE_COMPONENTS is equal to FOR_TAO, - override it with the proper component values. The - override allows it to be set on the command line, e.g., - make ACE_COMPONENTS=FOR_TAO. Thanks to Carlos for - reporting this. - -Mon May 31 14:00:21 1999 Steve Huston - - * ace/RB_Tree.i: Reverted changes from May 21. It broke the LynxOS - build of tests/RB_Tree_Test. - -Mon May 31 11:51:03 1999 Douglas C. Schmidt - - * ace/CORBA_Handler.h: Updated the comments to clarify how to use - this class. Thanks to Ram Vishnuvajjala - for motivating this. - - * ace/Service_Config: Added a static variable called is_initialized - that keeps track of whether the is already - initialized. If it is, we can't allow to be called - since it's not reentrant... - -Sun May 30 14:08:48 1999 Ossama Othman - - * ace/Makefile: - * ace/Vector.{h,i,cpp}: - * tests/Makefile: - * tests/Vector_Test.cpp: Removed the ACE_Vector implementation - from the distribution. - -Sat May 29 14:14:37 1999 Ossama Othman - - * ace/Vector.{h,i,cpp}: Added STL Vector-style insert() and - erase() methods. Also added a new constructor that creates an - ACE_Vector from a specified range of iterators. ACE_Vector - class is now Purify clean (i.e. fixed any and all memory leaks). - - * tests/Vector_Test.cpp: Added tests for the newly added - ACE_Vector::insert() and ACE_Vector::erase() methods. - -Fri May 28 20:19:50 1999 Ossama Othman - - * ace/Vector.{h,i,cpp}, - tests/Vector_Test.cpp: Implemented an ACE_Vector class based on - the ACE_Array class. It is not derived from it, however. The - ACE_Vector class provides an STL Vector-like interface. The - Vector_Test tests the important features of the ACE_Vector class - and sends output to `logs/Vector_Test.log'. - - * ace/Makefile, - tests/Makefile: Added ACE_Vector related files to the makefiles - and updated the dependencies. - -Thu May 27 15:50:17 1999 Ossama Othman - - * ace/UNIX_Addr.cpp (set), Explicitly set the sun_family to - AF_UNIX, otherwise it will be zero by a previous call to - memset(). AF_UNSPEC, which is zero, is what the call to - memset() cause the sun_family to be. - -Wed May 26 01:46:27 1999 Nanbor Wang - - * include/makeinclude/platform_freebsd.GNU: - * include/makeinclude/platform_freebsd_pthread.GNU: Consolidated - platform macro files for FreeBSD. - - * ace/config-freebsd-pthread.h: - * ace/config-freebsd.h: Added ACE_HAS_NONCONST_SELECT_TIMEVAL. - -Tue May 25 21:38:40 1999 Carlos O'Ryan - - * ace/UNIX_Addr.cpp: The default constructor was not setting the - address family to AF_UNIX. Now that we do so we can let the OS - select a ephemeral UNIX domain endpoint for us. - -Tue May 25 19:20:15 1999 Steve Huston - - * tests/run_tests.(sh bat): Added SOCK_Send_Recv_Test. - -Tue May 25 16:54:41 1999 Jeff Parsons - - * tests/SOCK_Send_Recv_Test.cpp: - Fixed a signed/unsigned mismatch warning and - changed several uses of static_cast to - reinterpret_cast. This is a belated entry, I put it - first in TAO/ChangeLog by mistake. - -Tue May 25 15:19:06 1999 David L. Levine - - * include/makeinclude/platform_sunos5_ghs.GNU: added - -Xleaveg7 to CFLAGS with threads=1. It's necessary - to avoid execution problems in multithreaded programs. - Thanks to Stefaan Kiebooms for providing - this fix. - -Tue May 25 13:40:10 1999 Ossama Othman - - * ace/LSOCK_Acceptor.cpp (get_local_addr): - - Only the base class members of ACE_UNIX_Addr were being copied - since the assignment lacked a dynamic cast. Thanks to Carlos and - Irfan for clarifying this. - -Tue May 25 11:41:28 1999 Irfan Pyarali - - * ace/Timeprobe_T.h (class ACE_Timeprobe): Moved the default size - from Timeprobe_T.h to OS.h, where it can easily be redefined by - the user. - -Tue May 25 07:37:47 1999 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU: removed suppression - of warning 839: no_corresponding_delete. - -Mon May 24 14:04:11 1999 Steve Huston - - * tests/SOCK_Send_Recv_Test.cpp: New test to exercise ACE_SOCK send - and receive variations. It concentrates on recvv/sendv-like things - now in order to shake out Winsock 1.1 issues. To be complete, it - should be added to over time. - - * tests/Makefile: - * tests/version_tests/{SOCK_Send_Recv_Test.dsp, version_tests.dsw}: - * tests/{SOCK_Send_Recv_Test.dsp, tests.dsw}: Add new test. - -Mon May 24 12:11:03 1999 Irfan Pyarali - - * ace/OS.i (ACE_SOCKCALL_RETURN): Fixed macro by comparing against - FAILVALUE rather than SOCKET_ERROR. Some winsock calls don't - return SOCKET_ERROR. Thanks to Christopher Kohlhoff - for reporting this problem. - -Sun May 23 11:33:07 1999 Alexander Babu Arulanthu - - Changes for the following enhancement in the Proactor - implementation. Enhanced the semantics of the , - so that when it is called, it wakes up all the threads blocked on - waiting for completions and end the event loop. Thanks to Edwin - D. Windes for reporting the issue. - - * ace/Proactor.h: - * ace/Proactor.cpp: Added static helper methods and states to post - the wakeup completions to the CompletionPort. - - * ace/Asynch_IO.h: - * ace/Asynch_IO.cpp: Added a method to the - ACE_Handler. - - * ace/Object_Manager.cpp - * ace/Object_Manager.h: Added a new Thread_Mutex called - to protect the thread count in - the event loop. - - * ace/POSIX_Asynch_IO.cpp - * ace/POSIX_Proactor.cpp - * ace/POSIX_Proactor.h - * ace/Proactor.cpp - * ace/Proactor.h - * ace/Proactor_Impl.h - * ace/WIN32_Proactor.cpp - * ace/WIN32_Proactor.h: - Changes for posting wakeup completions. - - * examples/Reactor/Proactor/test_end_event_loop.cpp: - * examples/Reactor/Proactor/test_end_event_loop.dsp: - * examples/Reactor/Proactor/post_completions.dsp: - * examples/Reactor/Proactor/Makefile: Test file the - enhancement. - -Sat May 22 16:57:38 1999 Carlos O'Ryan - - * ace/FlReactor.cpp: Sun/CC doesn't like reinterpret cast when - converting from an int into an int; this is silly, but I cannot - use static_cast because on NT reinterpret_cast is the right - thing. Use old-style casts for the moment. - - * tests/FlReactor_Test.cpp: Minor cosmetic fixes. - -Sat May 22 16:36:14 1999 Chris Gill - - * ACE version 4.6.40 released. - -Sat May 22 14:53:47 1999 David L. Levine - - * ace/Filecache.cpp: snagged another "template <>". Thanks to - Bala for reporting it. - -Sat May 22 07:30:44 1999 David L. Levine - - * ace/config-chorus.h,ace/config-lynxos.h: added - ACE_HAS_NONCONST_SELECT_TIMEVAL. - - * ace/Filecache.cpp: commented out "template<>" for now. Not all - compilers can cope with it. - -Fri May 21 21:12:37 1999 Irfan Pyarali - - * ace/Map_Manager.i (operator==): Since is a pointer - now, we must compare by value, rather than by address. - -Fri May 21 12:56:38 1999 David L. Levine - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: fixed to - build without threads: #ifdef ACE_MT_SAFE is insufficient. - Must also check if it is 0. - -Fri May 21 12:45:32 1999 Carlos O'Ryan - - * ace/Map_Manager.i: - Fixed minor error in previous commit. Thanks to Irfan for - helping out with this. - -Fri May 21 11:18:21 1999 Steve Huston - - * ace/config-hpux11.h: Added ACE_HAS_NONCONST_SELECT_TIMEVAL. - - * ace/RB_Tree.i: Fully template-qualified references to node_ and - tree_ in iterators; makes HP aC++ happy. - -Fri May 21 11:27:44 1999 Irfan Pyarali - - * ace/Map_Manager.h (class ACE_Map_Iterator_Base): Changed the - ACE_Map_Manager reference to a pointer. This way there is no - problem in reinitializing , and hence the compiler - will not have a problem in providing us a default assignment - operator. Thanks to Knut Johannessen for - pointing out this problem. - - * ace/Process: A nifty ACE::fork was added several months ago - which offers the option to avoid zombies, but it is not used in - ACE_Process::spawn. - - Mark L. Boriack provided patches which - adds an data member to ACE_Process_Options, - appropriate accessor functions, and changes the ACE_OS::fork - call to ACE::fork in ACE_Process::spawn, making use of the - option. The default behavior is left unchanged, i.e., you get - zombies. Thanks Mark. - -Fri May 21 10:34:10 1999 David L. Levine - - * ace/gethrtime.cpp,Makefile (gethrtime on Green - Hills/VxWorks): reverted to building gethrtime.cpp with g++, because - the ghs assembly code didn't work properly. - -Fri May 21 10:10:13 1999 Ossama Othman - - * ACE-INSTALL.html: Updated information about building egcs' C++ - shared libraries with an example, and emphasized the fact that - the `--enable-shared' configuration option is not an egcs - run-time option. Thanks to Wallace Owen for - motivating this. - -Fri May 21 09:15:08 1999 Carlos O'Ryan - - * ace/config-sunos5.5.h: - Added ACE_HAS_NONCONST_SELECT_TIMEVAL here too - -Fri May 21 07:53:58 1999 Steve Huston - - * ace/config-vxworks5.x.h, config-osf1-4.0.h: Added - ACE_HAS_NONCONST_SELECT_TIMEVAL. - -Thu May 20 18:01:24 1999 Steve Huston - - * ace/Filecache.cpp: Added "template<>" to specializations. - - * ace/OS.i (ACE_OS::select, ACE_OS::sleep): Removed implicit - dependency on binary object layout with regard to using an - ACE_Time_Value object as a struct timeval; use the timeval* - operator instead. On platforms with ACE_HAS_NONCONST_SELECT_TIMEVAL - don't just cast away const-ness of the ACE_Time_Value - modification - of the timeval by select() is not consistent, and Linux is not the - only one that modifies it (Solaris 7 does also, as well as AIX and - possibly HP; Solaris 2.5/6 don't specify). So, play it safe. - Inlining and optimization should prevent this from having any - affect on performance. - - * ace/config-sunos5.5.h, config-hpux-10.x.h, config-aix-4.x.h: - Added #define ACE_HAS_NONCONST_SELECT_TIMEVAL. - -Thu May 20 17:47:35 1999 Irfan Pyarali - - * ace/OS.h (ACE_DES_ARRAY_FREE_*): Added new macros to facilitate - proper destruction of arrays. - - * ace/Containers_T.cpp (ACE_Array_Base): Changed ACE_Array_Base to - use the new ACE_DES_ARRAY_FREE_* macros in order to prevent the - memory leaks. - -Thu May 20 17:46:02 1999 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Fixed Alpha configurations. Thanks to - Christian Schuderer for - reporting this. - -Thu May 20 15:35:23 1999 Carlos O'Ryan - - * tests/TkReactor_Test.cpp: - It was not compiling if ACE_HAS_TK was not defined. - -Thu May 20 15:33:21 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: - added (and default to) LIBS for Green Hills 1.8.9. - -Thu May 20 14:34:59 1999 David L. Levine - - * ace/config-sunos5.5.h: with Green Hills only, added - ACE_LACKS_ACE_IOSTREAM. ACE's IOStream_Test never halts - when built with Green Hills 1.8.9. - -Thu May 20 14:21:44 1999 David L. Levine - - * ace/OS.i: (t_getname): fixed comment after #endif, to - agree with the #ifdef. - -Thu May 20 13:51:20 1999 Nanbor Wang - - * ace/config-win32-common.h: I forgot to put '/**/' between - #include and which caused MSVC to generate warnings - when checking file dependencies. Thanks to Christian Schuderer - for reporting this. - -Thu May 20 13:52:04 1999 David L. Levine - - * ace/config-sunos5.5.h: build with threads if - _POSIX_C_SOURCE >= 199506L or #ifdef _POSIX_PTHREAD_SEMANTICS. - Added #define ACE_LACKS_RWLOCK_T if _POSIX_PTHREAD_SEMANTICS - is #defined (and therefore ACE_HAS_STHREADS is not #defined). - The rwlock functions are a Solaris threads interface, and - are not POSIX. - - * include/makeinclude/platform_sunos5_ghs.GNU: default to - building without threads support, because Green Hills 1.8.9 - is incompatible with the SunOS threads libraries. - -Thu May 20 12:12:01 1999 David L. Levine - - * ace/OS.{h,cpp},Sched_Params.cpp: with ACE_HAS_PRIOCNTL, - moved #include of sys/{rt,ts}priocntl.h from OS.cpp and - Sched_Params.cpp to OS.h, so that USYNC_THREAD and USYNC_PROCESS - #defines can be protected effectively. - -Thu May 20 11:19:45 1999 Joe Hoffert - - * ace/ATM_Addr.cpp: Added ACE_UNUSED_ARG for selector parameter - when appropriate. - -Thu May 20 09:57:57 1999 Bill Rizzi - - * ace/Log_Msg.{h,cpp},examples/Log_Msg/test_log_msg.cpp - (priority_mask): added optional support for process priority - mask, in addition to the (now default) thread priority mask. - -Thu May 20 09:42:54 1999 David L. Levine - - * ace/OS.h (fcntl): changed type of last argument from int to - long, to permit safer casting from pointer types. - - * ace/OS.i (flock_*): use ACE_OS::fcntl instead of ::fcntl. - - * ace/OS.cpp (ftruncate): use ACE_OS::fcntl instead of ::fcntl. - - Thanks to an anonymous ACE user for reporting that - these functions weren't using ACE_OS::fcntl. - -Wed May 19 23:50:18 1999 Nagarajan Surendran - - * ace/TkReactor.{h,cpp}: - * ace/Makefile: - Added a new reactor implementation based on the Tcl/Tk Event - loop and event handling mechanism. - - * ace/tests/TkReactor_Test.{cpp,tcl}: - * ace/tests/Makefile: - The Tk Reactor test and the tcl script for the GUI. This is - similar to the XtReactor_Test. - - * ace/include/makeinclude/wrapper_macros.GNU: - * ace/include/makeinclude/platform_sunos5_sunc++.GNU - Added changes to Makefile flags for XtReactor. - -Wed May 19 21:56:49 1999 David L. Levine - - * ace/Message_Queue.h: fixed typo in comment: interrupt. - -Wed May 19 21:34:29 1999 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU: removed these - warning suppressions: - 174: expr_has_no_effect - 610: nonoverriding_function_decl - They're certainly not needed with cxx 6.2-020, and - hopefully not needed with earlier versions. - -Wed May 19 10:52:15 1999 Irfan Pyarali - - * examples/DLL/test_dll.cpp (main): Fixed auto pointer use. It - was causing "Temporary used for non-const reference" warnings. - -Wed May 19 10:04:54 1999 Jeff Parsons - - * ace/SString.i: - Changed the default constructor to set rep_ to the - empty string instead of the null string. Thanks to - Knut Johannessen for pointing - this out. - -Wed May 19 06:34:58 1999 David L. Levine - - * ace/config-minimal.h: added #define ACE_USE_THREAD_MANAGER_ADAPTER, - so that ACE_Thread_Exit isn't needed in the ACE_OS layer. - -Tue May 18 22:03:49 1999 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU,platform_osf1_cxx.GNU: - removed suppression of warning 9 (nested comment not allowed) on - Digital Unix 5.0 and later. - -Tue May 18 15:01:39 1999 Steve Huston - - * ace/ACE.cpp: Added #include "ace/SString.h" to catch def for - ACE_Tokenizer in Winsock 1.1 mode. - -Tue May 18 13:30:55 1999 Nanbor Wang - - * include/makeinclude/rules.nested.GNU: FOR is not an excutable on - Win32, therefore, we must bring in the command processor in to - use FOR. Thanks to David Hooker for - reporting the bug. - -Tue May 18 11:46:55 1999 Douglas C. Schmidt - - * ace/FILE_Connector.h: Changed the default perms from 0 to - ACE_DEFAULT_FILE_PERMS. - -Tue May 18 11:28:32 1999 Joe Hoffert - - * examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp: forced - ACE_TLI_Stream's recv method to call ACE_OS::t_rcv rather than - ACE_OS::read to be compatible with XTI. - -Tue May 18 11:00:15 1999 Douglas C. Schmidt - - * ace/Task_T: Moved the ACE_Buffered_Task logic out of the Task - abstraction since it doesn't belong there. - - * ace/Makefile: Regenerated the dependencies. - - * ace/FlReactor.cpp: We should be including rather than - "FL/Fl.h". - -Tue May 18 10:42:47 1999 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU: removed - suppression of warning 1180, statement causes unreachable - return, because it's no longer necessary. - -Tue May 18 10:38:53 1999 David L. Levine - - * tests/Thread_Manager_Test.cpp: replaced Hash_Map_Manager - with a simple array. This avoids dynamic allocation in - the signal handler. And, it avoids having to specialize - ACE_Hash on platforms that have a pthread_t - struct. - -Tue May 18 09:33:46 1999 Douglas C. Schmidt - - * ace/FILE_IO: Added new sendv()/recvv() and sendv_n()/recvv_n() - methods to be consistent with SOCK_IO and SOCK_Stream. - - * ace/SOCK_IO.cpp (recvv): Make sure to 0-out the iov_base so that - it's always ok to delete it, even if any of the internal - operations fail! - -Tue May 18 10:14:47 1999 Carlos O'Ryan - - * ace/Makefile: - * ace/FlReactor.h: - * ace/FlReactor.i: - * ace/FlReactor.cpp: - * include/makeinclude/platform_linux_lxpthread.GNU: - * include/makeinclude/wrapper_macros.GNU: - * tests/Makefile: - * tests/FlReactor_Test.cpp: - Added new reactor implementation based on the event loop of the - Fast-Light toolkit, similar to the XtReactor. - FLTK is a GUI toolkit that works on UNIX/X-Windows and on Win32, - it is integrated to OpenGL and is pure C++. - Check http://fltk.easysw.org for more details. - -Tue May 18 09:35:00 1999 David L. Levine - - * tests/Thread_Manager_Test.{h,cpp},Makefile: - removed Thread_Manager_Test.h. - -Mon May 17 22:39:06 1999 David L. Levine - - * tests/Thread_Manager_Test.cpp: added a couple more - explicit template instantiations. Thanks to Carlos - for reporting that they're needed on Irix. And, - added an ACE_Hash specialization to - keep DU cxx happy. - -Mon May 17 16:31:16 1999 Douglas C. Schmidt - - * ace/Task_T.cpp, - ace/OS.h: Removed ACE_DEFAULT_WRITEV_MAX and replaced it - with IOV_MAX. - -Mon May 17 15:49:48 1999 David L. Levine - - * config-dgux-4.x-ghs.h,config-vxworks5.x.h,config-ghs-common.h: - factored ACE_LACKS_SIGNED_CHAR to config-ghs-common.h. - - * config-dgux-4.x-ghs.h: removed ACE_LACKS_ACE_IOSTREAM. - It should work now, though we don't have that platform - to verify it. - -Mon May 17 15:08:45 1999 Carlos O'Ryan - - * ace/CORBA_macros.h: - Fixed implementation of the ACE_READ_GUARD_THROW_EX and - ACE_WRITE_GUARD_THROW_EX macros. - -Mon May 17 15:12:54 1999 David L. Levine - - * test/Thread_Manager_Test.cpp: use a hash map, instead of - TSS, to store each thread's indication of whether it has - been signalled. That way, the signal handler doesn't have - to access TSS. Increased the delay from 1 to 2 seconds after - the signal test, which also seems to help avoid thread lib - panics on Solaris. - -Mon May 17 14:02:01 1999 David L. Levine - - * tests/Conn_Test.cpp (handler): added comment saying that even - the ACE_OS::exit () call isn't safe. - -Mon May 17 10:31:04 1999 Nanbor Wang - - * ace/Service_Repository.cpp (find_i): A missing pointer check was - causing the remove method to segfault. Thanks to Tom Arbuckle - for pointing this out. - -Mon May 17 10:21:29 1999 David L. Levine - - * tests/TSS_Test.cpp: removed the signal handler. It - wasn't used for the test, and contained an ACE_DEBUG. - -Mon May 17 10:12:45 1999 David L. Levine - - * ace/config-chorus.h,config-dgux-4.x-ghs.h,config-sunos5.5.h, - config-vxworks5.x.h,config-ghs-common.h: - factored out Green Hill-specific #defines to config-ghs-common.h. - -Mon May 17 09:07:41 1999 David L. Levine - - * tests/Conn_Test.cpp (handler): commented out unused arg - "signum". - -Sun May 16 20:38:58 1999 Nanbor Wang - - * ace/CDR_Stream.{h,i} (current): Added this accesor function for - Flick IDL compiler. Thanks to Tim Stack for - recommending this. - -Sun May 16 20:08:41 1999 David L. Levine - - * tests/Thread_Manager_Test.cpp (handler,worker): - moved ACE_DEBUG out of signal handler. It was - causing occasional lockups on SunOS. Signal - handlers must never do anything that could cause - a lock to be acquired. - - * tests/Conn_Test.cpp (handler): removed ACE_DEBUG. - -Sun May 16 20:04:09 1999 David L. Levine - - * ace/OS.h: moved #include of ace/Trace.h to before #include of - ace/OS.i. - - * ace/OS.{i,cpp}: enabled ACE_TRACE for most functions (except - those that are used by ACE_TRACE). - -Sun May 16 19:54:10 1999 Alexander Babu Arulanthu - - * ace/config-sunos5.7.h: Comments - * ace/config-sunos5.6.h: Comments - - * ace/POSIX_Asynch_IO.cpp: - * ace/POSIX_Proactor.h: - * ace/POSIX_Proactor.cpp: - Using ACE_dynamic_cast to get - from gives build errors on - egcs. is not the correct solution for - this. Solved this problem by having one more list of - so that we dont have to do any - casting. - * ace/Proactor.cpp (ACE_Proactor): Indentation. - * examples/Reactor/Proactor/post_completions.cpp: Added template - pragma's. - -Sun May 16 18:35:59 1999 Douglas C. Schmidt - - * ACE version 4.6.39 released. - -Sun May 16 12:34:48 1999 David L. Levine - - * ace/Log_Msg.cpp (ACE_Log_Msg_Manager::lock_): changed - the lock type from ACE_Thread_Mutex to - ACE_Recursive_Thread_Mutex. This allows ACE_Log_Msg's - methods to be called after calling ACE_Log_Msg::acquire (), - without deadlock. Thanks to Bill Rizzi - for suggesting this. - -Sat May 15 08:30:43 1999 David L. Levine - - * ace/Containers.h: added #include of ace/Malloc_Base.h. - It's needed for the definition of ACE_Allocator when - instantiating container classes. - -Sat May 15 03:32:02 1999 Nanbor Wang - - * ace/CDR_Stream.h: Added #include of ace/SString.h. - -Fri May 14 23:05:32 1999 David L. Levine - - * ace/Log_Record.h: removed unnecessary #include of ace/SString.h. - -Fri May 14 21:11:46 1999 Carlos O'Ryan - - * ace/Task_T.h: - * ace/Task_T.cpp: - Fixed syntax errors in ACE_Buffered_Task - -Fri May 14 21:03:30 1999 Carlos O'Ryan - - * netsvcs/lib/Log_Message_Receiver.cpp: - Changed ACE_Guard instantiations with ACE_GUARD() macros to - avoid some warnings with egcs, similar to the problem that David - had with Message_Queue_T.cpp - -Fri May 14 19:31:04 1999 Ossama Othman - - * ace/Message_Block.cpp (total_size): - - Corrected warning caused by assignment to non-const from const. - - * ace/Message_Queue_T.cpp (close): - - Temporary variable wasn't declared. - - * ace/Message_Queue_T.cpp (remove_messages): - - Removed unused variable. - -Fri May 14 19:16:06 1999 Ossama Othman - - * ace/Task_T.cpp (put, flush): - - Corrected syntax errors where return type was placed before - template keyword. - -Fri May 14 16:46:42 1999 Douglas C. Schmidt - - * ace/Task_T: Added a new class called ACE_Buffered_Task that - buffers up its ACE_Message_Blocks until (1) the buffer is full - or (2) a timeout elapses, at which point the buffers are written - out using some type of writev()-like mechanism. - - * ace/OS.h: Added a new macro called ACE_DEFAULT_WRITEV_MAX, which - defaults to the maximum value that writev() can have. - - * ace/Message_Block.cpp: Added a new method called total_size() - that returns the total number of bytes in a composite - Message_Block (i.e., a Message_Block that has a chain of - Message_Blocks). - - * ace/Message_Queue_T.cpp: Reimplemented all the hand-coded loops - to use the new ACE_Message_Block::total_size() method. - -Fri May 14 16:17:27 1999 Nanbor Wang - - * ace/Synch.h (ACE_Null_Mutex>): Conditionally compiles ~ACE_Guard() - destructor. Win32 needs this definition. - -Fri May 14 16:10:29 1999 David L. Levine - - * ace/Message_Queue_T.cpp: replaced raw ACE_Read_Guards - with ACE_READ_GUARD_RETURN macros. That avoids a compiler - warning (egcs 1.1.1/SunOS 5.7) now that the ACE_Guard - destructor has been removed. Thanks to Irfan and Carlos - for suggesting this fix. - -Fri May 14 15:35:50 1999 Irfan Pyarali - - * ace/ACE.cpp (clr_flags and set_flags): We should use ioctl() - calls to implement on vxworks this rather than fcntl(). Thanks - to Joseph A. Condlin for reporting this. - -Fri May 14 13:15:02 1999 Joe Hoffert - - * examples/IPC_SAP/TLI_SAP/Makefile: Took out FORE specific - information. Somehow my local changes got checked in - this is - to undo that. - -Fri May 14 12:58:02 1999 Joe Hoffert - - * ace/ATM_Addr.h: - * ace/ATM_Addr.i: - * ace/ATM_Addr.cpp: Added accessor methods for the selector byte - of an ATM address. - - * examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp: Modify example code - to have the user optionally specify the selector byte. - -Fri May 14 12:47:38 1999 David L. Levine - - * ace/Addr.cpp,ace/Synch_Options.cpp: added comments about - the static objects. - -Fri May 14 11:36:05 1999 Carlos O'Ryan - - * ace/SString.h: - * ace/SString.i: Added new class to auto destroy dynamically - allocated strings, sort of a mixing between auto_ptr and - CString. Auto_Ptr_Array was not useful because we need to free - using ACE_OS::free() (and in the future allocators). - -Fri May 14 10:37:49 1999 Douglas C. Schmidt - - * ace/OS.i: Fixed a deadlock in cond_timedwait()/cond_broadcast(). - Thanks to Brian C. Olson for reporting - this. - - * ace/Synch.h (ACE_Null_Mutex>): Commented out the ~ACE_Guard() - destructor to prevent segfaults on certain versions of SunC++. - Thanks to Russ Noseworthy for reporting this bizarre bug! - -Fri May 14 09:51:55 1999 Carlos O'Ryan - - * ace/Message_Block.h: - * ace/Message_Block.cpp: - Modified default constructor and constructor taking a Data_Block - to also take an Allocator. - -Fri May 14 09:14:55 1999 David L. Levine - - * include/makeinclude/platform_osf1_cxx.GNU: - added $(ACELIB) to SOFLAGS for DU 5.x. It should - have been there all along. - -Thu May 13 17:27:14 1999 Nanbor Wang - - * netsvcs/servers/svc.conf: - * netsvcs/clients/Naming/Client/svc2.conf: - * netsvcs/clients/Naming/Client/svc2.conf: Removed relative paths - from all DLL's. They were hard-coded which was not portable. - ACE should figure out the correct path automatically. - - * netsvcs/lib/Name_Handler.cpp: Replaced several calls to - ACE_WString::rep with ACE_WString::fast_rep to avoid memory - leaks. Thanks to Valery Arkhangorodsky - for reporting this. - - * ace/Registry.cpp (close): Only close when we do own a - key. - - * netsvcs/lib/Name_Handler.cpp (resolve): The atype string needs - to be delete[]'ed once we are done with it. Thanks to Valery - Arkhangorodsky for pointing this out. - -Thu May 13 09:39:17 1999 David L. Levine - - * tests/Makefile: added Tokens_Test to BIN2 if Tokens component - is not configured in. This ensures that Tokens_Test gets - cleaned up, even if the ace directory was realcleaned first - (and ACE_BUILD_COMPONENTS is therefore empty). - -Thu May 13 07:24:41 1999 David L. Levine - - * ace/POSIX_Proactor.cpp (handle_events): replaced - incorrect dynamic_cast with a reinterpret cast. - -Wed May 12 17:42:09 1999 Carlos O'Ryan - - * ace/Message_Block.h: - * ace/Message_Block.cpp: - The message blocks can be obtained from an allocator now. Thanks - to John Aughey for this cool feature. - -Wed May 12 16:24:17 1999 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/Makefile: - * examples/Reactor/Proactor/test_proactor.cpp: - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Proactor.h: - * ace/Proactor.cpp : - * ace/POSIX_Asynch_IO.cpp: Fixed the problem with terminating the - Timer thread. Also, fixed the places where conversion between - void * and ACE_POSIX_Asynch_Result. Used ACE_reinterpret_cast at - these places. - -Wed May 12 12:14:09 1999 Ossama Othman - - * COPYING: Additional updates/clarifications suggested by Richard - Stallman. - -Wed May 12 00:25:57 1999 Nanbor Wang - - * ace/Thread_Manager.h (ACE_Thread_Manager): Added clarification - for the semantics differences among wait(), wait_grp() and - wait_task(). - -Tue May 11 18:11:51 1999 James C. Hu - - * ace/config-sunos5.7.h: SunOS 5.7 (aka Solaris 7) does not have a - limited select. - -Tue May 11 17:11:51 1999 David L. Levine - - * tests/Conn_Test.cpp (spawn_threads): changed some ACE_NEW - statements to ACE_NEW_RETURN. - -Tue May 11 15:43:30 1999 David L. Levine - - * ace/OS.h: added ACE_THR_PRI_OTHER_DEF for NT, because MT_Cubit - uses it. - -Tue May 11 14:45:08 1999 David L. Levine - - * tests/Conn_Test.cpp: fixed use of status on platforms that lack - fork. - -Tue May 11 14:10:29 1999 David L. Levine - - * ace/config-osf-4.0.h: added #define of - ACE_NEW_THROWS_EXCEPTIONS, if exception handling is enabled. - - * tests/New_Fail_Test.cpp: removed workaround for DEC cxx, and - modified error message to mention ACE_NEW_THROWS_EXCEPTIONS. - -Tue May 11 12:02:03 1999 David L. Levine - - * ace/config-win32-common.h: set __ACE_INLINE__ to 1 if not - #defined. It's scary when I trip over syntax errors on Win32 - :-) - -Tue May 11 10:00:00 1999 Chris Gill - - * ace/OS.i: fixed name of unused argument for pSOS - - * ace/RB_Tree.{cpp, h}: moved enumerated type from template to - non-templatized base class to make old g++ happy. - -Mon May 10 22:59:46 1999 David L. Levine - - * include/makeinclude/wrapper_macros.GNU: don't set VDIR to - .shobj/ for VxWorks, because it uses the same .o files for - static and shared libs. - - * include/makeinclude/platform_vxworks5.x_g++.GNU: disable RTTI - for egcs, because the Tornado 1.0.x libs don't support it. No - harm in disabling for old g++. - -Mon May 10 15:33:56 1999 Douglas C. Schmidt - - * ace/INET_Addr.cpp (string_to_addr): Fixed a mistake that - occurred when integrating Jerry D. De Master - fix. Thanks to Zoran and Jerry for - reporting this. - -Mon May 10 15:00:31 1999 Nanbor Wang - - * ACE-INSTALL.html: Changed to use ACE_NO_INLINE to supress - inlining to match with the recent dsp file changes. Added a - link to Barry Hoggard's CORBA page which contains ACE related - MSVC setting hints. - - * ace/Select_Reactor_Base.cpp (unbind): We need to make sure the - reactor's suspend_set_ also gets cleaned up when unbinding a - handler. Thanks to Casey Lucas for pointing - this out. - -Mon May 10 17:08:29 1999 James C. Hu - - * ace/ACE.cpp: - * ace/config-sunos5.6.h: - * ace/README: Added support to enter_recv_timedwait, - enter_send_timedwait, handle_timed_complete, and - handle_timed_accept to use poll() instead of select() if poll() - is available and select() is known to have problems. Created - ACE_HAS_LIMITED_SELECT macro. Certain versions of SunOS 5.6 do - not correctly select on file descriptors that are larger than - 1023. - -Mon May 10 13:32:11 1999 David L. Levine - - * tests/Conn_Test.cpp (spawn_threads): wait a maximum of 200 - seconds. Carlos reported that the test sometimes hangs on Irix. - -Mon May 10 12:14:00 1999 Chris Gill - - * ace/RB_Tree.cpp: fixed a dangling pointer bug in - RB_Tree::delete_fixup. Added pointer tests to all dereferences - in this piece of code. - -Mon May 10 11:35:18 1999 Ossama Othman - - * COPYING: Made some updates suggested by Richard Stallman - of the Free Software Foundation - (http://www.fsf.org/). - -Mon May 10 11:01:58 1999 David L. Levine - - * tests/New_Fail_Test.cpp: DEC cxx catches its default, - NoNamedException. OK, I guess. - - * tests/Upgradable_RW_Test.cpp: added -f option, which enables - FIFO thread scheduling. Some platforms require superuser - privilege to use it. Also, wait a maximum of 1 second per - iteration. And, replaced some u_longs with u_ints. - - * tests/Thread_Manager_Test.cpp (main): wait a maximum of 60 - seconds, because the test sometimes hangs on SunOS 5.5.1 and - SunOS 5.7. - -Mon May 10 08:26:44 1999 David L. Levine - - * bin/g++dep: added support for our Solaris 7 machines. - -Sun May 9 18:07:24 1999 Ossama Othman - - * acconfig.h: - * configure.in: Added support/tests for - ACE_LACKS_CHAR_RIGHT_SHIFTS and - ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS. - - * ace/README: Fixed typo. ACE_LACKS_LINEBUFFERED_STREAMBUF was - used twice. Corrected the appropriate one to - ACE_LACKS_UNBUFFERED_STREAMBUF. - -Sun May 09 11:45:00 1999 Chris Gill - - * ace/RB_Tree.cpp added explicit scoping to RB_SearchResult - parameter in RB_Tree<...>::find_node (). - -Sun May 09 11:30:00 1999 Chris Gill - - * ace/Makefile - examples/Connection/non_blocking/Makefile - examples/IPC_SAP/SPIPE_SAP/Makefile - examples/IPC_SAP/TLI_SAP/Makefile - examples/Reactor/Misc/Makefile - examples/Service_Configurator/IPC-tests/client/Makefile - examples/Service_Configurator/IPC-tests/server/Makefile - netsvcs/lib/Makefile - netsvcs/servers/Makefile - tests/Makefile: ran make depend after adding new RB_Tree - interface. - -Sat May 08 19:30:00 1999 Chris Gill - - * ace/RB_Tree.{cpp, h, i} - tests/RB_Tree_Test.cpp: finished implementing all methods for - the ACE_Hash_Map_Manager_Ex compliant interface, fixed a bug in - the internal tree search method (thanks to David Levine for - pointing this out), and added a new section to the test that - exercises the new bind and unbind methods. - -Sat May 08 17:09:10 1999 David L. Levine - - * apps/Gateway/Gateway/Event_Channel.cpp (bind_proxy,subscribe): - wrapped final return statement with ACE_NOTREACHED, to please DU - cxx 6.2. - -Sat May 08 08:49:44 1999 David L. Levine - - * ace/CDR_Stream.h: only use unsigned long for Boolean with Green - Hills 1.8.8 on Chorus, not 1.8.9. - - * ace/IOStream.h,README: added ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS - and ACE_LACKS_CHAR_RIGHT_SHIFTS support. - - * ace/config-chorus.h: added ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS - #define for g++. - - * ace/config-vxworks5.x.h: added ACE_LACKS_CHAR_RIGHT_SHIFTS - #define for Green Hills 1.8.9. - -Sat May 08 08:44:00 1999 Chris Gill - - * ace/RB_Tree.{cpp, h, i} - tests/RB_Tree_Test.cpp - apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp: Added more - implementation code and necessary template instantiations for - migration of RB_Tree class templates to conform to the - ACE_Hash_Map_Manager API. - -Sat May 08 03:59:52 1999 Nanbor Wang - - * ace/config-win32-common.h: Re-ordered __ACE_INLINE__ macro check - and definition so users can turn of inlining correctly. - However, the right thing to do is to define ACE_NO_INLINE macro. - - * ace/ace_{dll,lib}.dsp: Moved RB_Tree.cpp to template folder and - excluded it from being built. - - * ace/ace_lib.dsp: - * performance-tests/Misc/basic_perf.dsp: - * performance-tests/Misc/context_switch_time.dsp: - * tests/version_tests/*.dsp: We should have used ACE_NO_INLINE - instead of defining __ACE_INLINE__=0 to supress the use of - inlining. Thanks to Nick Sawadsky - for reporting this. - -Fri May 07 23:05:24 1999 David L. Levine - - * ace/config-vxworks5.x.h: added ACE_LACKS_LINEBUFFERED_STREAMBUF - for Green Hills 1.8.9. - - * ace/README: added ACE_LACKS_LINEBUFFERED_STREAMBUF. - -Fri May 7 19:39:43 1999 Carlos O'Ryan - - * ace/Message_Block_T.i: Found little buf in - ACE_Locked_Data_Block<> default constructor. - -Fri May 07 16:54:00 1999 Chris Gill - - * ace/RB_Tree.{cpp, h, i}: Reorganized and optimized internal - methods, added read and write guards, implemented all public - find and unbind methods for the interface comparable to - ACE_Hash_Map_Manager_Ex. - -Fri May 07 14:40:12 1999 David L. Levine - - * include/makeinclude/platform_osf1_cxx.GNU: added, to support - uniform use of cxx across different OS versions. - - * ace/config-osf1-4.0.h: conditionally #define DIGITAL_UNIX, to - support definition in CFLAGS. - - * ace/config-osf1.h: added, to support easy migration to DU 5.0. - -Fri May 07 11:00:52 1999 David L. Levine - - * ACE-INSTALL.html: OK on RedHat 6.0 Linux. - -Fri May 07 08:58:47 1999 David L. Levine - - * ace/OS.{h,i}: added some QNX support. In OS.i, this mostly - consisted of adding a !defined (ACE_LACKS_MUTEXATTR_PSHARED) - check to _POSIX_THREAD_PROCESS_SHARED. Thanks to Alain Magloire - for providing this support. - -Thu May 6 21:48:26 1999 Ossama Othman - - * acconfig.h: - * configure.in: - * ace/OS.h: - * ace/README: - * ace/config-hpux11.h: - * ace/config-irix6.x-g++.h: - * ace/config-irix6.x-kcc.h: - * ace/config-irix6.x-sgic++.h: - * ace/config-linux-lxpthreads.h: - * ace/config-osf1-4.0.h: - * ace/config-sco-5.0.0-mit-pthread.h: - * ace/config-sunos5.5.h: Removed all references to - ACE_HAS_PTHREAD_SIGMASK. This macro has been deprecated. - -Thu May 6 20:12:57 1999 Ossama Othman - - * acconfig.h: - * configure.in: Added tests/support for ACE_LACKS_PTHREAD_SIGMASK, - ACE_LACKS_TCP_NODELAY and ACE_LACKS_NULL_PTHREAD_STATUS. Thanks - to David for providing a test for ACE_LACKS_NULL_PTHREAD_STATUS. - -Thu May 06 14:26:54 1999 David L. Levine - - * ace/README,ace/Pipe.cpp (open): added support for - ACE_LACKS_TCP_NODELAY. Thanks to Alain Magloire - for providing the patch. - -Thu May 6 14:23:14 1999 Carlos O'Ryan - - * ace/Synch_T.cpp: Removed ACE_ALLOC_HOOK_DEFINE macros for the - Guard<> objects, they don't need them (because they are - allocated on the stack) and the HOOK_DECLARE macros where not - used in the header file. - - * bin/count_lines: Several new file types, fixed computations when - multiple modules are used. - -Thu May 06 12:28:54 1999 David L. Levine - - * docs/ACE-FMM.html: replaced a > with > and added RCS Id - string. - - * ACE-INSTALL.html: added link to docs/ACE-FMM.html. - -Thu May 06 12:23:51 1999 Steve Huston - - * ace/OS.i (recvv, sendv): Added code to make these functions work - on Win32 w/ Winsock 1.1. - -Wed May 05 15:10:37 1999 David L. Levine - - * ace/OS.h: added ACE_U_ONE_SECOND_IN_*SECS. They're typed and - unsigned. The old ACE_ONE_SECOND_IN_*SECS macros are retained - for backward compatibility. - -Wed May 5 13:58:25 1999 Carlos O'Ryan - - * ace/OS.i: Don't use poll() for the implementation of - ACE_OS::sleep(), it has bad resolution and it gives wrong - results on Linux. - - * tests/High_Res_Timer_Test.cpp: Added new option to run several - iterations of each interval. - -Wed May 05 13:14:52 1999 Steve Huston - - * ace/ACE.cpp: Removed DllMain - Win32 does not have the gusto to - handle the initialization/finalization in this way. It causes - DLL dependency problems which result in early detachment of - winsock, and possible network data loss in some cases. - - * ace/OS.cpp, Object_Manager.cpp: Clarified some comments - regarding multiple ACE_OS_Object_Manager and ACE_Object_Manager - objects in existence and how they're handled. - - * tests/ACE_Init_Test.cpp: Always does ACE::init and ACE::fini - now. This is one example of how to handle a non-console program - in Win32. - -Wed May 05 13:07:49 1999 David L. Levine - - * bin/Makefile: replaced /bin/rm with $(RM) and removed clean - pseudotarget. - -Tue May 04 20:38:00 1999 Chris Gill - - * tests/RB_Tree_Test.cpp: Added missing explicit template - instantiations for ACE_RB_Tree_Iterator_Base. Thanks to Carlos - O'Ryan for reporting this. - - * include/makeinclude/platform_psos_diab_ppc.GNU: added -g flag - back into debug flags since it can easily be deactivated via - make debug=0. - -1999-05-04 Seth Widoff - - * ace/Containers_T.cpp (ACE_Array_Base::max_size): When - resizing the array to be larger, the max_size method was copying - in the contents of the older, smaller array, but not - initializing the new elements. - -Tue May 4 17:37:30 1999 Kirthika Parameswaran - - * examples/Web_Crawler/Options.cpp (parse_args): Change the - default options from "www.cs.wustl.edu" to "tao.cs.wustl.edu". - -Tue May 04 16:24:00 1999 Chris Gill - - * ace/RB_Tree.{cpp, h, i}: Added deprecation comments to methods - that are going to be replaced by the new Hash_Map_Manager - compliant interface. Factored out iterator base class, added - reverse iterator. Interim checkin since it all compiles and - RB_Tree_Test runs clean. - -Tue May 04 15:56:41 1999 Steve Huston - - * ace/ACE.cpp: Re-enabled DllMain (see Mon May 3 entry from Chris - Gill). - - * ace/OS.cpp, Object_Manager.cpp: In ACE_OS_Object_Manager and - ACE_Object_Manager, differentiate between The singleton instance - and other instances when allocating and freeing per-process - information. - - * tests/run_tests.bat: Added ACE_Init_Test. - -Mon May 3 18:04:32 1999 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_aiocb_ace.cpp: Added this - file. If this test is sucessful, ACE_POSIX_AIOCB_PROACTOR could - be defined for a platform. - -Mon May 03 09:35:00 1999 Chris Gill - - * ace/RB_Tree.cpp: fixed bug in ACE_RB_Tree::RB_delete_fixup in - which a null pointer was dereferenced while trying to determine - the color of the node that was being pointed to. Per the RB - Tree discussion in Cormen Lieserson and Rivest's "Introduction - to Algorithms", after which this implementation is modeled, a - nil node is implicity treated as having been colored BLACK. - Thanks to Long Hoang for reporting - the problem and providing a test program that showed the bug. - -Mon May 03 15:53:15 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU, - tests/run_tests.vxworks,ACE-INSTALL.html: added support for - shared lib builds. Thanks to Ramiro Penataro Blanco - and James D. Rucker - for figuring this out, and - providing detailed instructions for others to follow. - -Mon May 03 15:20:00 1999 Kirthika Parameswaran - - * examples/Web_Crawler/main.cpp: - * examples/Web_Crawler/Web_Crawler.{h,cpp}: - * examples/Web_Crawler/Cached_Connect_Strategy_T.{h,i,cpp}: - * examples/Web_Crawler/Caching_Strategies_T.{h,i,cpp}: - * examples/Web_Crawler/Command_Processor.{h,cpp}: - * examples/Web_Crawler/HTTP_URL.{h,cpp}: - * examples/Web_Crawler/Iterators.{h,cpp}: - * examples/Web_Crawler/Mem_Map_Stream.{h,cpp}: - * examples/Web_Crawler/Optimal_Cache_Map_Manager_T.{h,i,cpp}: - * examples/Web_Crawler/Options.{h,cpp}: - * examples/Web_Crawler/URL.{h,cpp}: - * examples/Web_Crawler/URL_Addr.{h,cpp}: - * examples/Web_Crawler/URL_Status.{h,cpp}: - * examples/Web_Crawler/URL_visitor.{h,cpp}: - * examples/Web_Crawler/URL_Visitor_Factory.{h,cpp}: - * examples/Web_Crawler/Makefile - * examples/Web_Crawler/README - - This example is a HTTP client which crawls over the link provided - and checks whether the links recusively are valid or not. - This example was used to test teh auto-purging feature where the - connections are removed from the connection cache when the process - runs out of file descriptors. - -Mon May 03 14:46:28 1999 Steve Huston - - * tests/ACE_Init_Test.dsp: Fixed to build on all configurations (for - Intel anyway). - -Mon May 03 10:30:37 1999 David L. Levine - - * ACE version 4.6.38 released. - -Mon May 3 09:56:06 1999 Douglas C. Schmidt - - * ace/INET_Addr.cpp (get_host_name): Make sure to check if - get_host_name() fails and do something useful in this case. - Thanks to Frank O'Dwyer for reporting this. - -Mon May 03 09:35:00 1999 Chris Gill - - * ace/ACE.cpp: disabled BOOL APIENTRY DllMain(HANDLE hModule, - DWORD ul_reason_for_call, LPVOID lpReserved) by having it - just return TRUE. This function is used only on NT. This - is a temporary workaround for the problem of tao_idl - crashing on NT, and will be replaced ASAP with a more - complete fix to Object Manager initialization/cleanup at - DLL load/unload time on NT. Thanks to David Levine for - suggesting this fix. - -Mon May 03 09:27:54 1999 David L. Levine - - * docs/ACE-guidelines.html: added guideline to put - spaces around comment delimiters. Thanks to Chris - Gill for suggesting this. - -Sun May 02 14:36:43 1999 David L. Levine - - * ace/OS.h: Added ghs back to the list of compilers for which - ACE_NOTREACHED disappears. It was causing warnings for - many ACE and TAO files. - -Sun May 02 08:21:13 1999 David L. Levine - - * ace/OS.i (pthread_sigmask): added ACE_UNUSED_ARGs to - NOTSUP case. - - * ace/OS.i (pthread_sigmask),ace/config-chorus.h,ace/README: - added ACE_LACKS_PTHREAD_SIGMASK. - -Sat May 01 17:33:04 1999 David L. Levine - - * ace/OS.cpp,Object_Manager.cpp: reverted this change because - it causes a seg fault on NT: - - Thu Apr 29 13:41:52 1999 Steve Huston - - * ace/{OS.cpp Object_Manager.cpp}: Fixed leaking ACE_Object_Manager - when config has #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0. - -Sat May 01 12:06:57 1999 Nanbor Wang - - * ace/ACE.cpp: - * ace/config-win32.h: Reverted my previous change. I didn't - notice David had already fixed it. Thanks David. - -Sat May 01 01:48:29 1999 Nanbor Wang - - * ace/ACE.cpp (DllMain): Only use DllMain to control - Object_Manager's lifecycle when - ACE_USES_DLL_TO_MANAGE_THE_LIFECYCLE_OF_OBJECT_MANAGER is - defined and we are building ACE as a DLL. - - * ace/config-win32.h: Defining - ACE_USES_DLL_TO_MANAGE_THE_LIFECYCLE_OF_OBJECT_MANAGER =1, when - compiling DLL version of ACE will cause then ACE::init/fini be - called automatically for you in DllMain when ACE gets linked - in/unlinked. - - Defining ACE_USES_DLL_TO_MANAGE_THE_LIFECYCLE_OF_OBJECT_MANAGER - =1 automatically define ACE_HAS_NONSTATIC_OBJECT_MANAGER to 1 - and define ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER. - -Fri Apr 30 22:53:01 1999 David L. Levine - - * ace/OS.h: put Object_Manager back on the stack of main, - instead of using ACE::init () and ACE::fini (). It - should be functionally equivalent, and then some: if - the user's main () returns, the Object_Manager will get - properly destroyed if it's on the stack. And, it's better - for subset support if we avoid class ACE calls from OS.h. - - * include/makeinclude/rules.lib.GNU: cleaned up a bit. - -Fri Apr 30 17:42:11 1999 Alexander Babu Arulanthu - - * ace/OS.i (pthread_sigmask): - * ace/OS.h (ACE_OS): Added wrapper for to get - the Proactor code compile on LynxOS. - - * ace/config-lynxos.h (ACE_HAS_AIO_CALLS): - Enabled ACE_HAS_AIO_CALLS for LynxOS. Also enabled - ACE_HAS_AIOCB_PROACTOR since LynxOS 3.0.0 has not got - yet, so signal proactor cannot work correctly. - - * ace/POSIX_Proactor.cpp: - * examples/Reactor/Proactor/test_aiosig_ace.cpp - (setup_signal_delivery): Added ACE_OS:: scope to pthread_sigmask - so that it works (fails!!) correctly on LynxOS. - - * examples/Reactor/Proactor/post_completions.cpp: - * examples/Reactor/Proactor/test_timeout.cpp: Added 'main' - function for platforms where only AIOCB_Proactor is enabled so - that the test prints out a message. - - * examples/Reactor/Proactor/Makefile: - -Fri Apr 30 14:44:12 1999 Darrell Brunsch - - * ACE-INSTALL.html: Added a note about manually cleaning out the - ACE_wrappers directories on Win32, which could be required for a - true start from scratch build. Thanks to David Hooker - for this insight. - -Fri Apr 30 14:06:41 1999 Douglas C. Schmidt - - * COPYING: Updated the COPYING file to reflect the use new of - ACE(TM) and TAO(TM). - -Fri Apr 30 13:23:22 1999 Steve Huston - - * docs/tutorials/017/Barrier_i.cpp: - * docs/tutorials/018/token.cpp: Added explicit template - instantiations. - -Fri Apr 30 12:11:36 1999 Ossama Othman - - * ace/OS.i (gethostbyname2): - - Added an IPv4-only implementation. If ACE_HAS_IP6 is not defined, - the IPv4-only implementation will be used. - -Fri Apr 30 12:11:50 1999 Nanbor Wang - - * tests/Basic_Types_Test.cpp: Added checks for sizeof(long) == - sizeof(void*) and sizeof(long) >= sizeof (a_function_pointer). - Certain code in ACE depends on the assumptions. - -Fri Apr 30 11:24:26 1999 Steve Huston - - * tests/ACE_Init_Test.cpp: Added compile-time change to adapt to - build w/ static ACE lib and ACE_HAS_NONSTATIC_OBJECT_MANAGER. - * tests/version_tests/ACE_Init_Test.dsp: Changes to build clean on - all configurations. - -Fri Apr 30 02:06:53 1999 Nanbor Wang - - * ace/Parse_Node.cpp (symbol): According to the new ANSI C++ - specification, casting a void* pointer to a function pointer is - not allowed. However, casting a void* pointer to an integer - type that is large enough to hold the pointer value is legal. I - chose to cast the return value to long since it should be large - enough to hold the void* pointer's value on most platforms. I am - not sure if casting a long value to a function pointer is legal - or not (can't find a good explanation in spec) but it prevent - SunC++ 5.0 compilers from complaining about illegal pointer - conversion. - - * ace/OS.h: Removed ACE_non_function_ptr_to_function_ptr_cast, - it is no longer needed. - -Fri Apr 30 00:36:23 1999 Ossama Othman - - - * ace/Get_Opt.cpp: - * ace/TLI_Acceptor.cpp: - * ace/TLI_Connector.cpp: - - Cast away const from string literals using ACE_const_cast to make - Sun C++ 5.0 happier. - -Thu Apr 29 18:32:43 1999 Irfan Pyarali - - * ace/OS.h: Removed ghs from the list of compilers for which - ACE_NOTREACHED disappears. It was causing warnings for - TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp. - -Thu Apr 29 19:48:25 1999 Ossama Othman - - * ace/OS.{h,i} (ACE_OS): - - More IPv6 support. Added support for the new IPv4/IPv6 - inet_ntop() and inet_pton() calls. If ACE_HAS_IP6 is not - defined, these calls will use IPv4 implementations (see - Stevens' book "UNIX Network Programming - Volume I") and - return an error if a family other than AF_INET is passed to - them. - - * ace/OS.h: - - Define INET_ADDRSTRLEN and INET6_ADDRSTRLEN if they don't - get defined after including . - -Thu Apr 29 18:32:43 1999 Ossama Othman - - * ace/README: - * ace/OS.h (ACE_OS): - * ace/OS.i (gethostbyname2): - - Added support for the gethostbyname2() system call. It is only - enabled if ACE_HAS_IP6 is defined. When I have time, I'll add - more IPv6 support. - -Thu Apr 29 15:30:04 1999 Douglas C. Schmidt - - * ace/INET_Addr.cpp (string_to_addr): Added support to check for - both "port numbers" and "port names". Thanks to Jerry D. De - Master for suggesting this. - - * ace/Select_Reactor_T.h, - ace/Reactor.h, - ace/Select_Reactor_T.h, - ace/TP_Reactor.h (ACE_TP_Reactor): Updated the documentation to - clarify the purpose of the flag. Thanks to Susan - Liebeskind for reporting this. - -Thu Apr 29 13:41:52 1999 Steve Huston - - * ace/{OS.cpp Object_Manager.cpp}: Fixed leaking ACE_Object_Manager - when config has #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0. Now - both ACE_OS_Object_Manager and ACE_Object_Manager remember if they - were dynamically allocated whether the above #define is used or not - and correctly clean up and track the singleton properly. - Thanks to David and Irfan for identifying this and helping with the - solution. - -Wed Apr 28 20:21:12 1999 Irfan Pyarali - - * ace/Synch_T.h (class ACE_Anti_*_Guard): I had accidentally - checked in the anti guard classes. These are not needed since - we decided to stick with the reverse lock class rather than the - anti guard classes. - -Wed Apr 28 18:02:36 1999 Nanbor Wang - - * ace/OS.h: Added a new macro called - ACE_non_function_ptr_to_function_ptr_cast to get around some - compiler constrain. In face, ANSI C++ standard prevents casting - from a non-function pointer (e.g., void *) to a function - pointer. Currently, only egcs check for this condition. - - * ace/Parse_Node.cpp (symbol): Changed to use the new - ACE_non_function_ptr_to_function_ptr_cast. - -Wed Apr 28 16:53:16 1999 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/Aio_Platform_Test_C.cpp: Added this - file, a simple C version of the - $ACE_ROOT/tests/Aio_Platforms_Test.cpp. Useful for submitting bug - reports etc. - - * ace/Proactor.cpp: - * ace/POSIX_Asynch_IO.cpp: Fixed old g++ warnings - -Wed Apr 28 15:39:14 1999 Nanbor Wang - - * ace/Parse_Node.cpp (symbol): Use reinterpret_cast to cast - dlsym's return value. - -Wed Apr 28 12:40:26 1999 David L. Levine - - * ace/Synch_T.{i,cpp} (~ACE_Reverse_Lock): uninlined destructor. - See docs/ACE-guidelines.html for an explanation of why a - class should have at least one non-inline, non-pure virtual - function if it has any virtual functions. egcs 1.1.1b - needed this one. - -Wed Apr 28 09:02:26 1999 Douglas C. Schmidt - - * ace/config-sunos5.5.h: It appears that SunC++ 5.0 wants - ACE_HAS_THR_C_DEST to be defined. - - * ace/SString: Clarified the comments a bit to avoid confusion. - Also, moved the definition of ACE_SString to AFTER ACE_CString - and ACE_WString since they are more general. Thanks to Kevin - Lyda for reporting this. - -Tue Apr 27 20:59:52 1999 Douglas C. Schmidt - - * netsvcs/clients/Naming: Moved the README file into the Client/ - directory since that's what it described. - - * netsvcs/clients/Naming/Client/Client_Test.cpp: Reformatted some - code to conform to ACE programming guidelines. - - * ace/Naming_Context.cpp (parse_args): Oops, fixed a braino - related to strcmp(). Thanks to Valery Arkhangorodsky - for reporting this. - -Tue Apr 27 18:00:31 1999 Steve Huston - - * ace/OS.cpp (ACE_OS_CString, ACE_OS_WString): Fixed one-off error - in allocating new string's memory. - -Tue Apr 27 17:36:28 1999 Ossama Othman - - * m4/threads.m4: - - Restructured thread detection test so that it properly detects - threads on platforms that provide PTHREADS backward compatibility - macros, such as Digital Unix 4.0 and 5.0. - -Tue Apr 27 18:56:00 1999 Chris Gill - - * ace/Containers_T.{cpp, h} - tests/OrdMultiSet_Test.cpp: added a workaround for a problem with - implicit template instantiation and a do-nothing destructor - definition. Thanks to Sarmeesha Reddy and - Steven Tine for reporting this. - - * include/makeinclude/platform_psos_diab_ppc.GNU: changes to use - the board support package linker file. Thanks to Sarmeesha - Reddy and Steven Tine - for contributing this change. - -Tue Apr 27 16:30:57 1999 Ossama Othman - - * ace/UNIX_Addr.h (ACE_UNIX_Addr): - - Corrected typographical error in comment. - -Tue Apr 27 12:57:06 1999 Ossama Othman - - * configure.in: - - Removed `tests/log/Makefile' from the list of files to - generate (i.e. removed from AC_OUTPUT macro call). - - * tests/Makefile.am: - - Corrected a typo. I neglected to add "_SOURCES" to the end - of the Collection_Test source variable variable. Also added - more missing tests to the list of test programs. Commented out - Cache_Manager_Test. It appears to need a header that doesn't - exist. - - * ace/Makefile.am (pkginclude_HEADERS): - - Removed `Timer_Queue.i' from the list of headers. - - * bin/autogen: - * bin/bootstrap: - - Renamed the `autogen' script to `bootstrap'. - -Tue Apr 27 11:54:53 1999 Ossama Othman - - * configure.in: - - Temorarily removed my experimental C++ libtool support so that - I can get a semi-working test distribution out on the net. - - * ltconfig: - * ltmain.sh: - - Reverted to more stable version, i.e. w/o my C++ support. - - * m4/threads.m4: - - Added KAI C++ thread flag check. - -Tue Apr 27 11:45:40 1999 Irfan Pyarali - - * tests/Collection_Test.cpp (main): Added some additional array - tests and fixed template instantiation errors. Thanks to David - Levine for pointing them out. - - * ace/OS.h (ACE_DES_FREE): Changed all the ACE_DES* macros to - check for zero pointers. Thanks to Torsten Kuepper - for pointing this bug out. - -Tue Apr 27 11:08:35 1999 Nanbor Wang - - * ace/Basic_Types.h: Forced KAI compiler to use ACE_U_LongLong if - ACE_LACKS_LONGLONG_T is defined. - - * ace/DLL.cpp: - * ace/Service_Config.i: - * ace/Service_Object.i: - * ace/INET_Addr.cpp: Some CE related changes. - -Tue Apr 27 00:03:16 1999 Irfan Pyarali - - * tests/Collection_Test.cpp (main): Added test code for ACE_Array. - -Mon Apr 26 23:55:43 1999 Irfan Pyarali - - * ace/Synch_T.h (class ACE_Reverse_Lock): Removed constructor that - created the lock. There were two reasons for this: (a) it was - unrealistic that the reverse lock would own and create the - regular lock and (b) this constructor made it impossible that - ACE_Reverse_Lock can be used with ACE_Lock (the abstract - class). Thanks to Carlos for pointing this out. - -Mon Apr 26 21:43:23 1999 Ossama Othman - - * ace/Makefile.am (pkginclude_HEADERS, libACE_IPC_la_SOURCES): - - Added ATM_Addr sources to these variables. - - * ace/Makefile.am (EXTRA_libACE_la_SOURCES): - - Accidentally removed this variable. It is needed for - conditionally built sources, such as `gethrtime.cpp'. - - * tests/Makefile.am: - - Added newly added tests to the list of test programs to be built. - Changed "noinst_PROGRAMS" variable to "check_PROGRAMS" so that - tests only get built when a `make check' is issued by the user. - -Mon Apr 26 19:29:25 1999 Ossama Othman - - * tests/Reverse_Lock_Test.cpp (main): - - ACE_START_TEST macro had "Thread_Mutex_Test" instead of - "Reverse_Lock_Test." - -Mon Apr 26 17:01:22 1999 Steve Huston - - * ace/ACE.cpp (DllMain): Re-enabled this for use on Win32. - - * ace/OS.h (main): On non-pSoS, use ACE::init, ACE::fini rather than - creating object manager instances on the stack. Allows a single - instance regardless of program type; especially helpful on Win32. - - * ace/OS.cpp (ACE_OS_Object_Manager ctor): - * ace/Object_Manager.cpp (ACE_Object_Manager ctor): - Don't set instance_ if it was already set. So if two - ACE_Object_Manager instances end up getting created, the first one - stays The Instance, and the second gets used privately by its - creator. Previously, the original was forgotten. Thanks to David - Levine for working out this and the above details with me to get the - Win32 crowd in business without platform-specific hacks. - -Mon Apr 26 16:43:32 1999 Nanbor Wang - - * ace/Asynch_IO_Impl.h (ACE_Asynch_[Read|Write]_File_Impl): - Declared the read/write pure virtual methods of - ACE_Asynch_[Read|Write]_Stream_Impl again in these class to - avoid KAI compiler's overwriting pure virtual function - warnings. - -Mon Apr 26 10:54:23 1999 Carlos O'Ryan - - * ace/High_Res_Timer.h: - Moved the static method hrtime_to_tv to the public section. It - is useful outside this class. - - * ace/Synch_T.cpp: - The default constructor for ACE_Reverse_Lock should not allocate - the locking mechanism, otherwise it cannot work with ACE_Lock. - -Mon Apr 26 07:30:51 1999 Nanbor Wang - - * ace/OS.i (fstat): Changed to use CE's implementation and added - some features that're supported on other Win32 platforms. The - original implementation for Win32 closed down the file handle - accidentally which is not a "Good Thing[TM]". Thanks to Dominic - Williams for pointing this out. - -Sun Apr 25 21:35:37 1999 David L. Levine - - * ace/ACE.{h,cpp},OS.{h,cpp},Object_Manager.{h,cpp} (init,fini): - moved init_fini_count_ from ACE Object_Managers to ACE, so that - it is only used via ACE::init () and ACE::fini (). Thanks - to Steve Huston for pointing out that the old way didin't work - if an Object_Manager was created prior to starting main (), - and there were ACE::init ()/ACE::fini () calls in main (). - -Sun Apr 25 16:59:21 1999 Nanbor Wang - - * include/makeinclude/platform_sunos5_kcc.GNU: Fixed incorrect - compiler flags. - - * ace/config-sunos5.7.h: Added definition of uint64_t on KAI. - - * ace/config-kcc-common.h: Changed to use non-static object - manager. - Defined ACE_SIZEOF_LONGLONG. KAI compiler has type long long. - - * ace/OS.h: ACE_NOTREACHED should expand to nothing on KAI - compiler. - - * ace/CDR_Stream.h (ACE_CDR): KAI compiler doesn't have - longlong_t. - - * ace/Basic_Types.h: KAI compiler should define ACE_UINT64 as - unsigned long long. - -Sun Apr 25 14:52:18 1999 Douglas C. Schmidt - - * COPYING, - TAO/COPYING: Updated the ACE+TAO COPYING information to - emphasize the relationship to open source. Thanks to Malcolm - Spence for suggesting the wording. - -Sat Apr 24 23:03:31 1999 Alexander Babu Arulanthu - - * ACE_wrappers/ace/POSIX_Asynch_IO.cpp - * ACE_wrappers/ace/POSIX_Asynch_IO.h - * ACE_wrappers/ace/POSIX_Proactor.cpp - * ACE_wrappers/ace/POSIX_Proactor.h - * ACE_wrappers/ace/Proactor.cpp - * ACE_wrappers/ace/Proactor.h - * ACE_wrappers/ace/Proactor_Impl.h - - * ACE_wrappers/examples/Reactor/Proactor/Makefile - * ACE_wrappers/examples/Reactor/Proactor/README - * ACE_wrappers/examples/Reactor/Proactor/test_aiocb.cpp - * ACE_wrappers/examples/Reactor/Proactor/test_aiosig.cpp - * ACE_wrappers/examples/Reactor/Proactor/test_aiosig_ace.cpp - * ACE_wrappers/examples/Reactor/Proactor/test_proactor.cpp - * ACE_wrappers/examples/Reactor/Proactor/test_timeout.cpp - - - Completed Multithreading of POSIX_SIG_Proactor. - - - Introduced another constructor for ACE_POSIX_SIG_Proactor for taking - signal mask to be used with the Proactor. - - - Thanks to Dave Butenhof for helping a lot to - understand the various things in the POSIX4 standard. - - - Thanks to Dave suggestion of keeping null_handler for the sigaction - to real-time signals. With this and a couple of other correct POSIX - things SIG proactor is now working with in Solaris 2.7. - - - Lynx OS doesnt support , so it couldnt be - multithreaded. Enabled AIOCB_Proactor for this platform. - - - Added an example to make use of the real-time signal numbers for the - asynchronous I/O calls. - - * examples/Reactor/Proactor/test_posix_sig_proactor.cpp: This - program demonstrates how to post fake completions to The - Proactor. It also shows the how to specify the particular - real-time signals to post completions. - - * ace/config-lynxos.h: Enabled ACE_POSIX_AIOCB_PROACTOR for this - platform, since was not available. Without - , SIG_Proactor can not work correctly. - - * ace/config-linux-lxpthreads.h: Removed ACE_HAS_AIO_CALLS. Even - simple aio calls test is hanging. - -Sat Apr 24 13:09:27 1999 Douglas C. Schmidt - - * ace/Containers_T.h: Added allocator support to ACE_Array. - Thakns to Paul Francis for contributing this. - - * ace/Future.h (class ACE_Future): Make sure to mention that - get()'s ACE_Time_Value must be in absolute, not relative, time. - Thanks to Ian MacDonald for reporting this. - -Sat Apr 24 07:24:51 1999 David L. Levine - - * tests/Reverse_Lock_Test.cpp: removed ACE_Guard - instantiation because it's in ace/Synch.cpp. - - * ace/config-vxworks5.x.h: added ACE_THR_PRI_OTHER_DEF - #define, for use by MT_Cubit. - - * ace/Object_Manager.cpp, OS.cpp (fini): unconditionally set - instance_ to 0 at the end. This allows init () to - work properly if called after fini (), such as for - repeated test on VxWorks. Thanks to Todd Mullanix - for reporting this. - -Fri Apr 23 17:53:24 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - for PPC860, changed -m=860 to -mcpu=860. Thanks to - Todd Mullanix for reporting this. - -Fri Apr 23 15:48:31 1999 James Hu - - * ace/OS.h: - * ace/OS.i: - * ace/README: - * ace/config-sunos5.5.h: added support for the memchr - library call, and created ACE_HAS_MEMCHR macro. - -Fri Apr 23 10:48:31 1999 David L. Levine - - * tests/New_Fail_Test.cpp (main): added uses of the - two static functions when they're not otherwise used, - to prevent g++ warnings. - -Fri Apr 23 09:11:24 1999 Carlos O'Ryan - - * tests/Reverse_Lock_Test.cpp: - Fixed template instantiation problems. - -Thu Apr 22 21:39:44 1999 Ossama Othman - - * tests/Makefile.am: - - Added support to create the `tests/log' directory after - the tests have been built. - - * tests/log/Makefile.am - - The above change deprecates this Makefile.am file. Thanks to - Nanbor for motivating this change. - -Thu Apr 22 20:50:30 1999 Jeff Parsons - - * ace/CDR_Stream.i: Modified reset() to reset all the message - blocks, instead of just the first one as it had previously done. - Thanks to Jerry D. De Master for pointing - out the problem and suggesting a fix. - -Thu Apr 22 19:40:52 1999 Steve Huston - - * ace/OS.h: Adjust exception thrown at out-of-memory for HP-UX, aC++. - - * ace/config-hpux-10.x-hpc++.h: Add ACE_NEW_THROWS_EXCEPTIONS. - -Thu Apr 22 19:30:01 1999 Irfan Pyarali - - * ace/Synch_T.h (class ACE_Reverse_Lock): Added an interesting - adapter class that changes a lock into a reverse lock, i.e., - acquire() on this class calls release() on the lock, and - release() on this class calls acquire() on the lock. - - One motivation for this class is when we temporarily want to - release a lock (which we have already acquired) but then - reaquire it soon after. An alternative design would be to add a - Anti_Guard or Reverse_Guard class which would release() on - construction and acquire() destruction. However, there are - *many* varieties of the Guard class and this design choice would - lead to at least 6 new classes. One new ACE_Reverse_Lock class - seemed more reasonable. - - * tests/Reverse_Lock_Test.cpp: Test for the new ACE_Reverse_Lock - class. - - * tests/Env_Value_Test.cpp (main): Fixed UNICODE string - concatenation problem. - - * tests/version_tests: Added a bunch of missing project files. - - * ace/ace_lib.dsp: Added missing files. - -Thu Apr 22 19:10:52 1999 Steve Huston - - * ace/ATM_Addr.cpp: Put in class's consts for non-FORE platforms. - -Thu Apr 22 17:05:36 1999 Nanbor Wang - - * bin/auto_compile_win32.pl: Added version_tests. - - * include/makeinclude/platform_sunos5_kcc.GNU: Makefile macros for - KAI C++ compiler. - - * ace/config-sunos5.5.h: Added KAI C++ compiler support. - - * docs/exceptions.html: Explicitly state that ACE try macros will - replace TAO try macros and advise users to take action if they - are still using TAO try macros. Thanks to Don Busch - for pointing this out. - -Thu Apr 22 15:07:10 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - added PPC860 support. Thanks to Todd Mullanix - figuring out how to - support it, with help from Thomas Mehrkam - and Hai Vu . - -Thu Apr 22 13:26:26 1999 Irfan Pyarali - - * ace/XtReactor.cpp (remove_handler_i): In the registration phase, - we registered first with ACE_Select_Reactor and then with X. - Now we are now doing things in reverse order. Thanks to JM - Strauss for contributing these changes. - -Thu Apr 22 13:23:00 1999 Chris Gill - - * include/makeinclude/platform_psos_diab_ppc.GNU: commented out -g - switch which was triggering a bug in the Diab 4.2b compiler when - compiling in debug information. This is supposed to be fixed in - the 4.3a release of the Diab compiler. The ACE tests all compile - now for pSOS/PPC. Thanks to Sarmeesha Reddy - for reporting the bug to Diab and obtaining the workaround. - -Thu Apr 22 10:46:17 1999 Steve Huston - - * apps/JAWS/server: Added $(ACELIB) to LDLIBS to build libJAWS on AIX - with xlC. - - * tests/New_Fail_Test.cpp: Added __GNUG__ to the platforms which do not - actually perform the test; added some more explanation and a better - log message for when it doesn't actually run. - -Thu Apr 22 10:28:39 1999 David L. Levine - - * ace/config-minimal.h: removed suppression of ACE_TSS_EMULATION - and enable of ACE_USE_THREAD_MANAGER_ADAPTER. They're no - longer necessary with the clean OS.cpp. - -Thu Apr 22 08:52:48 1999 Steve Huston - - * tests/New_Fail_Test.cpp: Fixed to compile clean without exceptions. - - * tests/run_tests.{sh bat}: Added New_Fail_Test. - -Wed Apr 21 16:41:08 1999 David L. Levine - - * tests/Reactor_Performance_Test.cpp (main): added 10 second - time limit to run_event_loop () call. That prevents the - test from hanging forever if some of the connections - are lost. - - * tests/Priority_Reactor_Test.cpp: default to 5 children - instead of 10 on LynxOS. Beyond 8, the test seems to - take forever on LynxOS 3.0.0. - - * tests/run_tests.sh: enabled Reactor_Performance_Test, - Priority_Reactor_Test, Time_Service_Test, and Tokens_Test - on LynxOS. - -Wed Apr 21 16:35:21 1999 Steve Huston - - * tests/New_Fail_Test.cpp: Test to be sure that the ACE_NEW[_RETURN] - stuff works correctly when heap is exhausted. - * tests/Makefile: Added New_Fail_Test. - * tests/tests.dsw, New_Fail_Test.dsp: Add new test to MSVC. - -Wed Apr 21 15:35:44 1999 Steve Huston - - * ace/ACE.cpp: On Win32, with ACE_HAS_NONSTATIC_OBJECT_MANAGER, use - DllMain to do ACE::init() and ACE::fini(). - - * tests/ACE_Init_Test.dsp, - * tests/ACE_Init_Test.{cpp h}, - * tests/ACE_Init_TestDlg.{cpp h}, - * tests/ACE_Init_Test.(ico rc rc2 res}, - * tests/ACE_Init_Test_(Resource StdAfx}.h: New test to be sure that - ACE DLL is initialized properly from an MFC app. - - * tests/tests.dsw: Added ACE_Init_Test.dsp project. - -Wed Apr 21 14:59:04 1999 David L. Levine - - * ace/OS.cpp (ACE_OS_Object_Manager::fini): on LynxOS only, - disabled ACE_{recursive/thread}_mutex_destroy () calls, because - they failed on LynxOS in forked children. The prevents - the failure message from being printed, with no apparent - ill effect. - -Wed Apr 21 10:06:11 1999 Steve Huston - - * include/makeinclude/platform_sunos5_sunc++.GNU: Moved -lthread from - the all-Orbix section to the MT-Orbix section for LIBS. - -Wed Apr 21 09:25:16 1999 David L. Levine - - * tests/Upgradable_RW_Test.cpp (main): replaced ACE_SCHED_FIFO - with THR_SCHED_FIFO in activate call. Thanks to Carlos for - finding this subtle error. - -Wed Apr 21 03:34:18 1999 Douglas C. Schmidt - - * ACE version 4.6.37 released. - -Tue Apr 20 22:55:18 1999 David L. Levine - - * ace/OS.i (thr_join): ifdef ACE_LACKS_PTHREAD_NULL_STATUS, - provide the address of a temporary variable for the status - argument of ::pthread_join (), if the caller passed 0. - - * ace/config-lynxos.h,README: added ACE_LACKS_PTHREAD_NULL_STATUS. - LynxOS 3.0.0 fails ::pthread_join () calls with EFAULT - if the second (status) argument is 0. - -Tue Apr 20 21:53:32 1999 Joe Hoffert - - * examples/IPC_SAP/TLI_SAP/Makefile: Had inadvertently checked in - local changes. Now undoing these changes. - -Tue Apr 20 18:25:45 1999 Douglas C. Schmidt - - * ace/{SOCK,TLI,LSOCK,Asynch}_Acceptor.h: Replaced the use of the - hard-coded backlog value of 5 with ACE_DEFAULT_BACKLOG. Thanks - to Irfan for motivating this. - - * ace/OS.h: Added a new (overriddable) macro called - ACE_DEFAULT_BACKLOG that's used to control the default number of - connections that can be accepted by an OS. The default value is - 5. - -Tue Apr 20 18:22:00 1999 Chris Gill - - * ace/Map_T.i - ace/config-psos-diab-mips.h - ace/config-psos-diab-ppc.h - ace/config-psos-diab.h - include/makeinclude/platform_psos_diab_ppc.GNU - tests/Handle_Set_Test.cpp - tests/Process_Strategy_Test.cpp: fixed the remaining tests - for which compiler bug workarounds were available for pSOS - PPC with the Diab 4.2b compiler. - -Tue Apr 20 16:41:39 1999 Nanbor Wang - - * ace/Thread_Manager.cpp (num_tasks_in_group): Make sure we are - not searching for a null task. Thanks to Umar Syyid - for pointing this out. - -Tue Apr 20 15:10:33 1999 Irfan Pyarali - - * tests/Reactor_Performance_Test.cpp: Changed the default number - of connections () from 20 to 5 for NT. This - seems reasonable since the default backlog is 5. Once we have - the ability to set the backlog from the ACE_Acceptor class, we - can increase this number. - -Tue Apr 20 13:55:34 1999 Joe Hoffert - - * ace/OS.i: Fixed ACE_OS::t_free to free memory if pointer is not - null. - - * ace/TLI.h: Added default ACE_XTI_ATM_DEVICE. - - * ace/TLI_Connector.cpp: Disabled non-blocking connects for XTI/ATM - since FORE's drivers have problems with this. Also, fixed t_alloc - memory leaks. - - * ace/ATM_Addr.cpp: Added code formatting change. - - * examples/IPC_SAP/TLI_SAP/CPP-ATM-{server,client}.cpp: Added - the use of ACE_XTI_ATM_DEVICE - -Tue Apr 20 13:30:51 1999 Douglas C. Schmidt - - * ace/ace.icc: Added a configuration file for creating a shared - library with Visual Age C++. - -Mon Apr 19 23:50:25 1999 Irfan Pyarali - - * tests/Time_Service_Test.cpp (main): Fixed error message. - - * ace/Connector.cpp (handle_close): Removed unused argument - . - -Mon Apr 19 17:17:47 1999 Steve Huston - - * docs/tutorials/tutorials.dsw: Fixed project file name for 019-021. - -Mon Apr 19 17:02:42 1999 Irfan Pyarali - - * ace/Connector.cpp (handle_close): There is no need to call - cancel_timer() or remove_handler() from handle_close(). Removal - of all svc tuples from the is done by . - -Mon Apr 19 16:45:54 1999 David L. Levine - - * ace/OS.{h,cpp},Object_Manager.{h,cpp} (ACE_OS_Object_Manager, - ACE_Object_Manager: added static counter to match init ()/fini () - calls. Don't destroy Object_Managers until final fini () call. - Thanks to Ian MacDonald for tracking down - the problem with multiple DLLs in a process. This change - delays destruction of the ACE_Object_Manager until the final - fini () call. - -Mon Apr 19 15:24:55 1999 Douglas C. Schmidt - - * ace/TLI_Stream.cpp (ACE_TLI_Stream): Make sure to set the value - of rwflag_ to 0 so that purify is happy. Thanks to Joe Hoffert - for reporting this. - -Mon Apr 19 14:35:42 1999 Irfan Pyarali - - * examples/IPC_SAP/UPIPE_SAP/ex2.cpp (supplier): - * examples/IPC_SAP/UPIPE_SAP/ex3.cpp (consumer): - - Avoided annoying g++ warning about by explicitly - making a temporary. Thanks to David for pointing this out. - -Sun Apr 18 21:52:43 1999 David L. Levine - - * ace/config-linux-common.h: moved ACE_LACKS_MADVISE to - non-glibc section. Thanks to JM Strauss - for reporting that it wasn't on a Linux system with a - 2.0.35 kernel. - -Sun Apr 18 16:36:30 1999 Ossama Othman - - * ace/config-linux-common.h (ACE_LACKS_MADVISE): - - Re-enabled #define ACE_LACKS_MADVISE. Linux doesn't appear - to have an madvise() system call. - - * configure.in: - * tests/Makefile.am: - - Added libtool support for modules (dlopened libraries). - -Sun Apr 18 08:48:37 1999 David L. Levine - - * ace/Auto_Ptr.i: reordered inline methods to avoid use before - definition. Fixed a few ACE_TRACE comments. - -Sun Apr 18 00:26:28 1999 Irfan Pyarali - - * tests/Notify_Performance_Test.cpp (main): - * tests/Reactor_Performance_Test.cpp (main): - * tests/Priority_Reactor_Test.cpp (main): - - Avoided annoying g++ warning about by explicitly - making a temporary. Thanks to David for pointing this out. - -Sat Apr 17 18:52:38 1999 Irfan Pyarali - - * ace/Memory_Pool.cpp (acquire): Changed use of auto_ptr. - - * ace/Auto_Ptr.i (operator=): Changed to . Thanks to - David Levine and Jean-Marc Strauss - for reporting this. - -Sat Apr 17 08:34:22 1999 David L. Levine - - * examples/Naming/Makefile,performance-tests/Misc/Makefile, - tests/Makefile,all netsvcs Makefiles: - updated for proper support of ACE subsets, with BIN2/LIB2/SHLIB2. - -Fri Apr 16 22:14:36 1999 Irfan Pyarali - - * ace/Auto_Ptr: Made several changes to bring the implementation - up to the specification: - - - Made the constructors take non-const parameters. - - Made release() non-const. - - Added reset(). - - Thanks to Simeon Simeonov , Rainer Blome - , Jody Hagins , and John - Mulhern for helping. - - * tests/Reactor_Performance_Test.cpp: Updated to work with new - auto pointer implementation. - -Fri Apr 16 19:36:35 1999 Alexander Babu Arulanthu - - * ace/Proactor.h (ACE_Proactor): Switched the order of TIMER_QUEUE - and delete_implementation in the constructor. - - * examples/Reactor/Proactor/test_multiple_loops.cpp: Fixed to work - on the WIN32 correctly. This can work only on WIN32 (combining - Proactor with Reactor's event loop). So I have put a #if defined - around the file. - -Fri Apr 16 18:09:44 1999 Irfan Pyarali - - * tests/Conn_Test.cpp (server): If we timeout on accept(), it is - not an error, and should not be reported as one. Thanks to - Thomas Mehrkam for pointing this out. - -Fri Apr 16 13:08:49 1999 David L. Levine - - * ace/OS.{h,cpp},ACE.{h,cpp}: (read_n,send_n,write_n): moved - from ACE to ACE_OS, so that the uses in OS.cpp could be localized. - The ACE versions are now just wrappers over the ACE_OS - versions, for backward compatibility. Thanks to - Erik Ivanenko for reporting - that OS.cpp used a couple of the ACE static member functions. - -Fri Apr 16 10:13:14 1999 David L. Levine - - * include/makeinclude/rules.nested.GNU,ACE-INSTALL.html: added - support for recursive make invocations with Windows NT's shell. - Thanks to Dave Steele for diagnosing the - problem, and Tres Seaver for providing - the wild NT FOR command. Check it out, Darrell. - -Fri Apr 16 07:52:11 1999 Darrell Brunsch - - * ace/High_Res_Timer.cpp: Fixed my previous fix with - calibrate being called on Windows NT when a high-res - timer of 1 Mhz was being found. Calibrate should not - be called on NT now. Thanks to Zoran Ivanovic - for noticing this. - - * ace/Profile_Timer.cpp: Integrated the patch from Andy - Marchewka for returning rusage information - from elapsed_time. - -Thu Apr 15 16:50:21 1999 David L. Levine - - * ACE-INSTALL.html: updated discussion of "dir unexpected" - error when building for VxWorks on NT. Thanks to - Dave Steele for providing the - insight. - -Thu Apr 15 14:04:36 1999 David L. Levine - - * include/makeinclude/rules.lib.GNU: don't call $(RANLIB) - if it is null. - - * include/makeinclude/platform_vxworks5.x_{g++,ghs}.GNU: removed - RANLIB definition, so that it will be null. This prevents - calling "true" on NT hosts. - - Thanks to Thomas Mehrkam for reporting - that his NT host doesn't have "true". - -Thu Apr 15 14:00:00 1999 Chris Gill - - * ace/OS.{h, i}: simplified the conditional compilation logic - for a couple of the pSOS-specific ACE_OS methods, removed a - handful of marker comments, added a conditional compilation - branch for pid_t declaration. - -Wed Apr 14 22:40:08 1999 David L. Levine - - * tests/run_tests.sh: call run_tests.check via sh, to support - platforms that don't have /bin/sh. Thanks to Thomas Mehrkam - for reporting that his NT host doesn't - have /bin/sh. - -Wed Apr 14 18:56:00 1999 Chris Gill - - * ace/OS.{h, i} - ace/config-psos-diab-ppc.h - include/makeinclude/platform_psos_diab_ppc.GNU: changes to adapt - the pSOS Diab 68k/MIPS port to PPC. Many thanks to Sarmeesha - Reddy and Steven Tine - for contributing these changes. - -Wed Apr 14 17:06:22 1999 David L. Levine - - * ace/config-vxworks5.x.h: added #define ACE_HAS_DLL 0. - Thanks to Thomas Mehrkam for - reporting that it's necessary on NT hosts. - -Wed Apr 14 13:10:48 1999 Alexander Babu Arulanthu - - * ace/config-sunos5.7.h: - Enabled ACE_HAS_AIO_CALLS for Solaris - 7. ACE_POSIX_AIOCB_PROACTOR works now on this. - * examples/Reactor/Proactor/test_aiocb.cpp: Updated comments. - * ace/config-sunos5.6.h: Removed the ACE_AIORETURN/ERROR macros. - * ace/Proactor.cpp (ACE_Proactor): Removed debug print statments. - * ace/config-lynxos.h: Removed the ACE_AIORETURN/ERROR macros. - * ace/POSIX_Proactor.cpp: - * ace/WIN32_Asynch_IO.h: - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Proactor.h: - * ace/WIN32_Proactor.cpp: - * ace/Proactor_Impl.h: - Completed committing changes related to the - additions done earlier. - -Wed Apr 14 09:07:38 EDT 1999 Aniruddha Gokhale - - * ace/POSIX_Proactor.cpp: - - Several methods were missing the "int signal_number" parameter - that was added as mentioned in the log entry below. In addition, - an undefined ACE_SIG_AIO flag was used. I found a log entry in - ChangeLog-98b which says that ACE_SIG_AIO is ACE_SIGRTMIN. So I - replaced the 5 occurrences of ACE_SIG_AIO with ACE_SIGRTMIN. - -Wed Apr 14 02:34:13 1999 Alexander Babu Arulanthu - - Added additional parameter to all the Asynchronos - Operation method so that we can specify which real-time signal should - be used for each of the Asynchronous Operation. This only makes sense - in the ACE_SIG_Proactor configuration. - - * ace/Asynch_IO_Impl.h: - * ace/Asynch_IO.h: - * ace/Asynch_IO.cpp: - * ace/POSIX_Asynch_IO.h: - * ace/POSIX_Asynch_IO.cpp: - * ace/POSIX_Proactor.h: - - - For each asynchronous call issued, the real-time signal is - registered with the Proactor so that it can wait for the completions - using that signal. Previously, the signal number for all the - operations was the same signal and it was hard coded. - - - method which earlier existed only for - has been added to - also. just takes the from the result - object and registers the signal number. Registering involves, - masking the signal, setting the signal delivery for that RT signal - etc. - - - Allowing to specify signal number for each operation can be useful, - since the order in which the completions are delivered from the - completion queue, is based on the signal numbers in addition to the - priority. Applications might want to leverage this. - - * ace/OS.h: - OS.h has been defined with ACE_SIGRTMIN and ACE_SIGRTMAX, which are - defined to SIGRTMIN and SIGRTMAX respectively, for POSIX4 - platforms. For others, they are 0. - -Tue Apr 13 15:29:37 1999 David L. Levine - - * ace/Object_Manager.cpp: moved ACE_Service_Config signal - handler allocation from constructor to init (). Tidy, - tidy, tidy. - -Tue Apr 13 14:52:15 1999 Joe Hoffert - - * ace/ATM_Addr.cpp: Fixed g++ warnings of unused parameters. - -Tue Apr 13 14:47:18 1999 David L. Levine - - * tests/Basic_Types_Test.cpp (main): replaced call to sysconf () - with ACE_OS::sysconf (). Thanks to Erik Ivanenko - for noticing this. - -Tue Apr 13 14:17:48 1999 David L. Levine - - * ace/OS.cpp: replaced use of ACE_TSS with ACE_WIN32 or - ACE_HAS_TSS_EMULATION with native use of ACE_OS TSS, to remove - dependency on ace/Synch.h. Also, changed ACE_OS::NULL_key to - be -1 instead of 0 with ACE_HAS_TSS_EMULATION. - -Tue Apr 13 09:05:25 1999 David L. Levine - - * ace/Sched_Params.i (ACE_Sched_Priority_Iterator): removed - ACE_TRACE's, because Sched_Param is in the ACE_OS (lowest) - component. Thanks to Erik Ivanenko - for reporting this. - -Tue Apr 13 08:21:41 1999 Steve Huston - - * include/makeinclude/platform_sunos5_sunc++.GNU - * include/makeinclude/platform_sunos5_sunc++_orbix.GNU: Added a make - option, mt_orbix, to control whether the MT or non-MT variant of - Orbix is used. Default is MT; to use non-MT, "make mt_orbix=0". - - * ace/config-sunos5.x-sunc++-4.x-orbix.h: Include correct config-sunos5 - file based on OS version at compile time. Allow site config to - specify ACE_HAS_MT_ORBIX 0. - -Mon Apr 12 14:24:28 1999 David L. Levine - - * include/makeinclude/rules.local.GNU (realclean.local): - added BIN2, LIB2, SHLIB2, and SHLIBA2 to support - subsetting. It allows realclean to remove old BIN, - LIB, SHLIB, and SHLIBA targets after remove the - ace_components information file. Also, removed explicit - -f following $(RM). -f should be included in the RM macro - if appropriate for the platform. - -Mon Apr 12 13:01:32 1999 David L. Levine - - * ace/gethrtime.cpp (ACE_gethrtime),Makefile: added support for - rdtsc instruction with GHS on Intel targets. Thanks to - Andy Alvarez for providing the assembly - instructions to do this! - -Mon Apr 12 12:04:20 1999 Joe Hoffert - - * ace/Makefile,ATM_Addr.cpp: - Added ACE_ATM_Addr class back into Makefile since it's working - now. Fixed address initialization problem in ACE_ATM_Addr. - NOTE: This code currently only works with Solaris 2.5/2.6. Will - need to update the code for FORE's implementation on Solaris 2.7. - NOTE: To use FORE's XTI/ATM implementation the following #defines - need to be included (typically in ace/config.h): - #define ACE_HAS_FORE_ATM_XTI - #define ACE_HAS_TIUSER_H_BROKEN_EXTERN_C - #define ACE_TLI_TCP_DEVICE "/dev/xtisvc*" //(e.g., /dev/xtisvc0) - AND the following flags are needed to build the ace library - (typically in include/makeinclude/platform_macros.GNU): - CPPFLAGS += -I$(FORE_ROOT)/include - -Mon Apr 12 10:04:31 1999 Carlos O'Ryan - - * include/makeinclude/rules.local.GNU: - The default rule to compile .idl files is only enabled if - TAO_ROOT is not defined, otherwise we should use the rule in - $TAO_ROOT/rules.tao.GNU - -Mon Apr 12 00:18:23 1999 Douglas C. Schmidt - - * ACE version 4.6.36 released. - -Sun Apr 11 17:06:53 1999 Alexander Babu Arulanthu - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (run_client): Fixed - the warnings on Linux (config-linux.h). - -Sun Apr 11 16:09:16 1999 Douglas C. Schmidt - - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (run_client): Made - some fixes if ACE_MT_SAFE is false... Thanks to Alex for - reporting these. - -Sun Apr 11 16:02:49 1999 Alexander Babu Arulanthu - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp (create_handler): - Fixed the warnings (control reaching end of block) and error (passing - u_long to close) which showed up on Linux(with config-linux.h) - - * performance-tests/Misc/preempt.cpp, - * examples/Threads/task_five.cpp: Replaced ACE_MT_SYNCH by - ACE_SYNCH to get it compile on Linux. - -Sun Apr 11 14:38:22 1999 Ossama Othman - - * configure.in: Added test for ACE_NEEDS_FUNC_DEFINITIONS. - Corrected bug in ACE_TEMPLATES_REQUIRE_SOURCE test. - -Sat Apr 10 14:02:11 1999 Douglas C. Schmidt - - * ace/Malloc[_Base]: Added a new no-op constructor for - ACE_Allocator to hopefully work around a problem with DEC UNIX - C++. - -Fri Apr 09 10:08:49 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - enable -fno-implicit-templates for targets other than - Intel. It appears to work for PPC targets, and is necessary - to avoid compiler warnings about different symbol sizes - in object files. Thanks to Thomas Mehrkam - for tracking down the source of the warnings, and verifying - that -fno-implicit-templates works for PPC targets. - -Fri Apr 09 08:14:55 1999 David L. Levine - - * include/makeinclude/rules.local.GNU: replaced "ln -s" with - $(LN_S), and set that to "ln -s" by default. Thanks to - Rainer Blome for suggesting this. - -Fri Apr 9 00:38:03 1999 Douglas C. Schmidt - - * ace/SOCK_Acceptor.cpp (shared_accept): Make sure to disable - ACE_NONBLOCK on the newly accepted socket since otherwise - applications can have weird behavior. Thanks to Margaret Reitz - and Irfan for helping to track this down. - -Thu Apr 08 13:47:03 1999 David L. Levine - - * BUG-REPORT-FORM,PROBLEM-REPORT-FORM, - README,VERSION,Makefile,Makefile.am,bin/make_release, - docs/ACE-bug-process.html: moved BUG-REPORT-FORM - to PROBLEM-REPORT-FORM. Thanks to Thomas Lockhart - for suggesting this. - - * docs/ACE-guidelines.html: added checklist for ACE/TAO changes, - including commit with a meaningful message, update a - ChangeLog, and ack and respond to the requestor. - -Thu Apr 8 13:18:22 1999 Alexander Babu Arulanthu - - * ace/SString.h: Updated the documentation to show that "Memory is - _not_ allocated/freed if is 0". - -Wed Apr 7 20:24:48 1999 Nanbor Wang - - * ace/CORBA_macros.h (ACE_DECLARE_NEW_CORBA_ENV): Removed the - trailing semi-column. Thanks to Marina for the reminder. - -Wed Apr 7 19:09:05 1999 Douglas C. Schmidt - - * ace/Containers_T: Replaced all Foo &Foo::operator=() with void - Foo::operator=() to avoid nasty problems with propagation of - errors. Thanks to Chris Schleicher for - reporting this. - -Wed Apr 07 17:25:07 1999 Nanbor Wang - - * apps/Gateway/Gateway/connection_config: Changed the connection 1 - and 2 to use localhost since it would probably be the most - common test case. - - * apps/Gateway/README: Replaced all references of proxy_config - to connection_config. Also change the example port number to - 10011 and 10012 which are the default port number used by the - gatewayd. - - Thanks to Sam Rhine for reporting - this. - -Wed Apr 7 16:36:41 1999 Darrell Brunsch - - * ACE-INSTALL.html: Put a note in saying to rebuild all - when upgrading releases. - -Wed Apr 07 14:25:47 1999 Joe Hoffert - - * ace/ATM_Addr.{h,cpp}: modified files to compile for - machines without FORE XTI/ATM support. - - * examples/IPC_SAP/TLI_SAP/CPP-{server,client}.cpp: - modified files to take out XTI/ATM code. - - * examples/IPC_SAP/TLI_SAP/Makefile,CPP-ATM-{server,client}.cpp: - added separate test files for XTI/ATM - -Wed Apr 7 14:20:59 1999 Jeff Parsons - - * ace/Basic_Types.h: - Added a signed companion to David's - ACE_UINT64_LITERAL, to avoid MSVC warnings. If - the platform has no 8-byte integer, this is - useless, but we must keep all compilers happy. - Also modified ACE_INT64_MAX tp use this, and - added a signed companion to - ACE_UINT64_FORMAT_SPECIFIER. - -Wed Apr 07 13:57:33 1999 David L. Levine - - * ACE-INSTALL.html: updated egcs shared library discussion - with information from Tim Rose - that egcs 1.1.1 statics libs work fine on Solaris 2.6. - -Wed Apr 07 13:14:34 1999 Nanbor Wang - - * ace/Service_Object.{h,i} (fini_called): Accessor to the - underlying fini_already_called_ flag. - - * ace/Service_Repository.cpp (find_i): Disallowed returning a - service which fini() has been called upon. - -Wed Apr 7 11:30:09 1999 Carlos O'Ryan - - * bin/auto_compile: - Added more tests to the script. - -Wed Apr 07 09:54:28 1999 David L. Levine - - * include/makeinclude/rules.local.GNU: instead of trying to - overwrite an existing symlink with ln -f, remove it first. - Thanks to Keith Rohrer for reporting that - Solaris' ln -f doesn't work. - - * ace/config-vxworks_5.x.h: added ACE_HAS_RECURSIVE_MUTEXES. - Thanks to Tom Venturella - for suggesting this, because the VxWorks semaphores that - ACE uses for mutexes are recursive. - - * ace/Synch.i (set_thread_id): added ACE_UNUSED_ARG (t), with - ACE_HAS_RECURSIVE_MUTEXES. - -Wed Apr 07 09:37:34 1999 David L. Levine - - * include/makeinclude/platform_osf1_4.0.GNU: disable warning - 1016 when optimization is enabled. That gets rid of the - "D:incint" warning about bzero in sys/select.h. - - * docs/ACE-guidelines.html: always use $(RM) instead of rm or - rm -f in Makefiles. - -Wed Apr 07 02:42:50 1999 Douglas C. Schmidt - - * ACE version 4.6.35 released. - -Wed Apr 07 02:04:30 1999 Douglas C. Schmidt - - * ACE version 4.6.34 released. - -Tue Apr 6 21:09:32 1999 Douglas C. Schmidt - - * ace/ATM_Addr: Added the ATM_Addr.* files into the CVS - respository. However, we're not going to enable this in the - Makefile or project files until they are tested. - -Tue Apr 6 20:48:16 1999 Jeff Parsons - - * ace/Basic_Types.h: - Added max and min #defines for various ACE data types. Now, - when using the ACE or ACE_CDR data types, we need not - depend on the vagaries of limits.h and float. - -Tue Apr 6 20:39:01 1999 Ossama Othman - - * ace/Log_Record.cpp (format_msg): - * ace/Log_Record.cpp (print): - - Changed host_name[] to *host_name since null pointers were being - passed into the host_name array. Strictly speaking, host_name - should thus be a pointer, not an array. Also cleaned up - ternary operator in format_msg() by parenthesizing some - expressions. - -Tue Apr 6 20:19:23 1999 Douglas C. Schmidt - - * ace/Makefile: Removed the ATM_Addr files until Joe can - get them checked in. - -Tue Apr 06 19:36:24 1999 Irfan Pyarali - - * ace/Active_Map_Manager.h (ACE_Active_Map_Manager_Key): Added a - separate structure that holds the fields of the key. This - separate structure makes it easier to manage copying the index - and the generation to and from the user buffer. - -Tue Apr 6 16:07:29 1999 Douglas C. Schmidt - - * ace/Synch.cpp (get_thread_id): If we have recursive mutexes then - it's not possible to get the id of the thread that's currently - holding the mutex. Thanks to David for reporting this. - -Tue Apr 6 15:50:14 1999 Balachandran Natarajan - - * docs/exceptions.html: - Updated the documentation. - -Tue Apr 6 15:25:56 1999 Darrell Brunsch - - * ace/High_Res_Timer.{h,i,cpp}: On Win32, don't call calibrate if - we cannot get the scale factor. Instead, just automatically - fall back on ACE_OS::gettimeofday (). - - Also added another static variable to represent the conditions - where the global scale factor is not set yet or high resolution - timers are not supported. - -Tue Apr 06 15:14:29 1999 David L. Levine - - * ace/Basic_Types.h: added ACE_UINT64_LITERAL for platforms - with ACE_LACKS_U_LONGLONG_T. - - * tests/Basic_Types_Test.cpp: added test of ACE_UINT64_LITERAL. - -Tue Apr 06 14:54:56 1999 Nanbor Wang - - * tests/Message_Queue_Test.cpp (performance_test): - * tests/Message_Queue_Notifications_Test.cpp (producer): Unicode - related change. - - * ace/ace_ce_dll.dsp: Added Active_Map_Manager.cpp. - - * ace/OS.h: - * ace/config-WinCE.h: CE now uses non-static object manager. - - * WindozeCE/WindozeCE.h: Instantiate the non-static object manager - within the class. - - * WindozeCE/WindozeCEDlg.cpp: We should register the bridge window - using its HANDLE so it would work no matter we build ACE with or - without MFC support. - -Tue Apr 6 14:17:06 1999 Joe Hoffert - - * ace/OS.h: Added support for the FORE ATM XTI interface. - - * ace/TLI_{Acceptor,Connector}: Added support for the FORE ATM XTI - interface. - - * ace/ATM_Addr: Added support for ATM address for the XTI ATM - driver. Eventually, this class will be generalized to work on - WinSock 2 ATM support, as well. - -Tue Apr 06 13:56:18 1999 Thomas Lockhart - - * include/makeinclude/rules.local.GNU: added -f to ln -s commands, - to force overwrite of old symlink. This eases moving of - installed ACE code trees. - -Tue Apr 6 00:17:59 1999 Kirthika Parameswaran - - * ace/DLL {.h, .cpp} (set_handle): Added the set_handle () method - which allows the user to set the ACE_SHLIB_HANDLE for the DLL. - Thanks to Bob McWhirter for bringing up this point. - -Mon Apr 5 22:27:02 1999 Douglas C. Schmidt - - * ace/config-irix6.x-sgic++-nothreads.h: Added - - #if !defined (ACE_HAS_NETDB_REENTRANT_FUNCTIONS) - #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - #endif /* ACE_HAS_NETDB_REENTRANT_FUNCTIONS */ - - to fix a problem with SGI 6.5. Thanks to Bob Laferrie - for reporting this. - -Mon Apr 5 19:42:11 1999 Ossama Othman - - * configure.in: - * m4/acinclude.m4: - - Created the macro ACE_CHECK_FOR_CVS_DIR to prevent the configure - script from continuing the configuration if the current - configuration directory is in a CVS controlled directory. The - idea is to prevent automatically generated files from being - checked into the repository. This will prevent accidental - overwrites of ACE's current Makefiles by the automatically - generated ones, for example. - - In addition, this should ease the transition from the current - Makefile scheme to the new Auto{conf,make}/libtool scheme since - the current Makefiles can remain under CVS control without - the generate Makefiles interfering with them. - -Mon Apr 05 17:02:46 1999 David L. Levine - - * ace/High_Res_Timer.cpp (global_scale_factor ()): removed - comment that said we use BogoMIPS on Linux/Intel. We - only use it on Linux/alpha. Thanks to - Thomas Lockhart for - reporting this. - -Mon Apr 5 15:54:57 1999 Darrell Brunsch - - * ace/Profile_Timer.i: Removed ACE_OS::gettimeofday () - calls from start and stop. - -Mon Apr 05 15:09:49 1999 David L. Levine - - * ace/OS.h: removed second #include of netdb.h. Thanks to - John H Aughey for reporting this. - -Mon Apr 05 14:17:31 1999 David L. Levine - - * ace/Trace.cpp: removed unnecessary (and complicated) - #include of ace/ACE.h. - -Mon Apr 5 13:21:49 1999 Alexander Babu Arulanthu - - * ace/Proactor.cpp: - (svc): - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Proactor.h: - * ace/Proactor.h: - * ace/Proactor_Impl.h: - * ace/WIN32_Proactor.cpp: - * ace/WIN32_Proactor.h: - * examples/Reactor/Proactor/test_timeout.cpp: - Completed Timers implementation for POSIX platforms. Timers - implementation is now common for POSIX and WIN32. Portable - ACE_Auto_Event is used in the auxillary thread to wait for the - Timer events. - The Timer's code in WIN32 has been removed and the common code exists - in Proactor.{h,cpp} only. - A new factory method called create_asynch_timer has been created to - create the Timer Result class. This is used internally by the Proactor - to post timer completions to the Proactor completion - queue. Application may want to use this directly to fake - completions. - -Mon Apr 05 12:05:01 1999 David L. Levine - - * ace/OS.*,Thread_Manager.{h,cpp}: moved flags members from - ACE_Thread_Descriptor to a new ACE_OS_Thread_Descriptor base - class, to remove dependency of OS.cpp on Thread_Manager.h. - -Sun Apr 4 18:19:05 1999 Ossama Othman - - * configure.in: - - Changed ANSI C++ cast test to fail on warnings. Currently, - only g++ and Sun C++ warning/error conversion is supported. - - Moved the ACE_SET_COMPILER_FLAGS macro after the AC_ARG_ENABLE - and AC_ARG_WITH calls so that user settings can influence what - compiler flags get set. - - Removed some M4 comments (`dnl') that were inside of the - template specialization test header block. The test was failing - since `dnl' was being quoted by M4 and actually placed inside - the test program source during test source compilation. Also - corrected a typo in the same test. - - Changed test for ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION so - that it attempts to link instead of just compile. Hopefully - this will make the test "tougher." - - * m4/compiler.m4: - - Added `-features=castop' compiler flag and completed support for - `-features=rtti' via `--enable-rtti'. These flags only work for - Sun C++ 4.2. Added support for the `-noex' Sun C++ compiler flag - when the user disables exception handling. - - * m4/platform.m4: Minor comment updates. - -Sat Apr 3 19:41:36 1999 Nanbor Wang - - * ace/TTY_IO.cpp (control): Disabled support for higher baudrate - for non-NT platforms. - -Sat Apr 3 19:37:07 1999 Douglas C. Schmidt - - * ace/TTY_IO.cpp (control): Added support for more modem speeds. - Thanks to Valery Arkhangorodsky for - reporting this. - -Sat Apr 3 17:02:48 1999 James CE Johnson - - * docs/tutorials/*: Regenerated all the HTML to get the hyperlinks - into the various headers. I'm sure somebody will let me know if I - munged it all. - - * docs/tutorials/(019|020|021) : Finally made myself sit down and - add Kirthika's last abstracts. - -Sat Apr 3 15:27:07 1999 Ossama Othman - - * Makefile.am - * ace/Makefile.am - * netsvcs/clients/Naming/Client/Makefile.am - * netsvcs/clients/Tokens/manual/Makefile.am - * netsvcs/lib/Makefile.am - * tests/Makefile.am - - Added targets to clean up files and directories created during - compilation. Automake will setup the `clean-local' targets to - run automatically whenever a `make clean' is done. - -Fri Apr 02 23:25:11 1999 David L. Levine - - * bin/make_release: added TAO/tao/Version.h. Thanks to - Nanbor for suggesting this. - - * ace/OS.cpp: removed use of ACE_Array with WIN32 and - TSS_EMULATION. In doing this, fixed an off-by-one error: - ACE_TSS_Cleanup::remove () would try to remove key value - "n" from an ACE_Array of size "n". - -Fri Apr 2 19:19:09 1999 Ossama Othman - - * bin/autogen: Update NEWS file by copying VERSION. Temporary - hack to make Automake happy when doing a `make dist'. - -Fri Apr 2 18:37:29 1999 Ossama Othman - - * configure.in: Placed the asynchronous IO checks right after - the thread library checks. This was done to make sure the - library with AIO support gets added to the link list before - the rest of the tests start, and to make sure that it doesn't - get added if AIO isn't supported or isn't working. - - * Makefile.am (ACE_EXTRA_DIST): Changed directory names to use - `$(top_srcdir)' instead of the current directory `.'. This - allows a distribution to be made from a directory other than - ACE's top level source directory. - - * m4/compiler.m4: Explicitly add the `-xildoff' flag to Sun CC's - LDFLAGS. This is just a precautionary measure. It shouldn't - be needed. - -Fri Apr 2 12:41:09 1999 Ossama Othman - - * ace/Containers_T.h (all of the classes listed below): - * ace/Containers_T.i (ACE_Array): - * ace/Containers_T.i (ACE_DLList): - * ace/Containers_T.cpp (ACE_Bounded_Stack): - * ace/Containers_T.cpp (ACE_Fixed_Stack): - * ace/Containers_T.cpp (ACE_Unbounded_Stack): - * ace/Containers_T.cpp (ACE_Unbounded_Queue): - * ace/Containers_T.cpp (ACE_Double_Linked_List): - * ace/Containers_T.cpp (ACE_Fixed_Set): - * ace/Containers_T.cpp (ACE_Bounded_Set): - * ace/Containers_T.cpp (ACE_Unbounded_Set): - * ace/Containers_T.cpp (ACE_Ordered_MultiSet): - * ace/Handle_Set.h (ACE_Handle_Set): - * ace/Handle_Set.i (ACE_Handle_Set): - - Changed assignment operators (operator=) to return a reference - to `*this' so that assignments may be chained. - -Thu Apr 1 23:41:56 1999 Jeff Parsons - - * ace/CDR_Stream.cpp: - Fixed write_array() to memcpy if doing a byte-swap - and size = 1. Previously, it was falling through - without writing anything. Thanks to Jerry De Master - for pointing this out. - -Thu Apr 01 22:38:25 1999 Douglas C. Schmidt - - * ACE version 4.6.33 released. - -Thu Apr 01 21:09:00 1999 Irfan Pyarali - - * Sequence.h (TAO_Base_Sequence): Made the copy constructor and - the assignment operator public since making them protected was - breaking some compilers. - - * ace/Filecache.cpp (ACE_Filecache_Object): Fixed typo: - should be . - -Thu Apr 1 19:41:26 1999 Ossama Othman - - * ace/IPC_SAP.h (ACE_IPC_SAP): - * ace/SOCK.h (ACE_SOCK): - * ace/SOCK_IO.h (ACE_SOCK_IO): - * ace/SV_Semaphore_Simple.h (ACE_SV_Semaphore_Simple): - * ace/Synch.h (ACE_Barrier): - * ace/Synch.h (ACE_Event): - * ace/Synch.h (ACE_Guard): - * ace/Synch.h (ACE_Null_Mutex): - * ace/Synch.h (ACE_RW_Mutex): - * ace/Synch.h (ACE_Semaphore): - Reverted the changes that made these base class destructors - virtual. They don't need to be virtual for the way they are - being used. - -Thu Apr 01 19:01:20 1999 Irfan Pyarali - - * ace/Containers.h (ACE_DLList_Node): - * ace/Containers_T.h (ACE_Double_Linked_List_Iterator): - * ace/Containers_T.h (ACE_Unbounded_Set_Iterator): - * ace/Event_Handler.h (ACE_Event_Handler): - * ace/Event_Handler.h (ACE_Notification_Buffer): - * ace/Filecache.h (ACE_Filecache_Handle): - * ace/Filecache.h (ACE_Filecache_Object): - * ace/Local_Tokens.h (ACE_TPQ_Iterator): - * ace/Local_Tokens.h (ACE_Token_Proxy): - * ace/Local_Tokens.h (ACE_Token_Proxy_Queue): - * ace/Malloc.h (ACE_Name_Node): - * ace/Malloc.h (ACE_Static_Allocator_Base): - * ace/Memory_Pool.h (ACE_MMAP_Memory_Pool): - * ace/Memory_Pool.h (ACE_MMAP_Memory_Pool_Options): - * ace/Memory_Pool.h (ACE_Shared_Memory_Pool): - * ace/Memory_Pool.h (ACE_Shared_Memory_Pool_Options): - * ace/OS.h (ACE_Countdown_Time): - * ace/OS.h (ACE_Thread_Adapter): - * ace/OS.h (ACE_Thread_Control): - * ace/OS.h (ACE_Thread_Exit): - * ace/Service_Object.h (ACE_Service_Type): - * ace/Signal.h (ACE_Sig_Adapter): - * ace/Synch.h (ACE_Adaptive_Lock): - * ace/Synch.h (ACE_TSS_Adapter): - - In some cases, classes with pointers *can* use the default copy - constructor and the assignment operator. A more careful - screening of the egcs -Weffc++ flag need to be done before a - copy constructor and assignment operator can be considered - harmful/dangerous. For now, the changes Ossama made have been - reverted. - - * ace/Filecache.cpp (ACE_Filecache_Object): - * ace/Signal.i (ACE_Sig_Action): - * ace/OS.i (ACE_Time_Value): - - Removed default contruction of structs. Old g++ is broken. - - * ace/Filecache.cpp (ACE_Filecache_Object): Fixed incorrect - initialization of . - -Thu Apr 1 16:22:18 1999 Ossama Othman - - * ace/Containers_T.h (ACE_Unbounded_Set_Iterator): - * ace/Containers_T.cpp (ACE_Unbounded_Set_Iterator): - The signatures for the prefix and postfix operators were - switched. Prefix operators take a void and return a - a reference and postfix operators take an int and returns a - copy. - - * ace/Containers.h (ACE_DLList_Node): - * ace/Containers_T.h (ACE_Double_Linked_List_Iterator): - * ace/Containers_T.h (ACE_Unbounded_Set_Iterator): - * ace/Event_Handler.h (ACE_Event_Handler): - * ace/Event_Handler.h (ACE_Notification_Buffer): - * ace/Filecache.h (ACE_Filecache_Handle): - * ace/Filecache.h (ACE_Filecache_Object): - * ace/Local_Tokens.h (ACE_TPQ_Iterator): - * ace/Local_Tokens.h (ACE_Token_Proxy): - * ace/Local_Tokens.h (ACE_Token_Proxy_Queue): - * ace/Malloc.h (ACE_Name_Node): - * ace/Malloc.h (ACE_Static_Allocator_Base): - * ace/Memory_Pool.h (ACE_MMAP_Memory_Pool): - * ace/Memory_Pool.h (ACE_MMAP_Memory_Pool_Options): - * ace/Memory_Pool.h (ACE_Shared_Memory_Pool): - * ace/Memory_Pool.h (ACE_Shared_Memory_Pool_Options): - * ace/OS.h (ACE_Countdown_Time): - * ace/OS.h (ACE_Thread_Adapter): - * ace/OS.h (ACE_Thread_Control): - * ace/OS.h (ACE_Thread_Exit): - * ace/Service_Object.h (ACE_Service_Type): - * ace/Signal.h (ACE_Sig_Adapter): - * ace/Synch.h (ACE_Adaptive_Lock): - * ace/Synch.h (ACE_TSS_Adapter): - Explicitly disallow use of implicitly generated copy - constructor and assignment operator to prevent inadvertent - memory leaks. - - * ace/Filecache.cpp (ACE_Filecache_Object): - * ace/OS.i (ACE_Time_Value): - * ace/Signal.i (ACE_Sig_Action): - * ace/Signal.i (ACE_Sig_Guard): - * ace/Signal.i (ACE_Sig_Set): - * ace/Synch_T.i (ACE_Guard): - Added base member initializers for class members that weren't - initialized. Better style and helps avoid some warnings. - - * ace/IPC_SAP.h (ACE_IPC_SAP): - * ace/SOCK.h (ACE_SOCK): - * ace/SOCK_IO.h (ACE_SOCK_IO): - * ace/SV_Semaphore_Simple.h (ACE_SV_Semaphore_Simple): - * ace/Synch.h (ACE_Barrier): - * ace/Synch.h (ACE_Event): - * ace/Synch.h (ACE_Guard): - * ace/Synch.h (ACE_Null_Mutex): - * ace/Synch.h (ACE_RW_Mutex): - * ace/Synch.h (ACE_Semaphore): - Made base class destructor virtual to ensure that it gets - called by derived class destructor. - -Thu Apr 1 13:31:56 1999 Jeff Parsons - - * ace/CDR_Stream.{i,cpp}: - Moved the destructors and a couple of short output CDR - functions from .cpp to .i. - -Thu Apr 1 03:30:19 1999 Nanbor Wang - - * bin/tao_svcconf.pl: New perl script to help converting TAO's - svc.conf file to use static services. - -Wed Mar 31 14:30:28 1999 Nanbor Wang - - * ace/OS.h: Fixed mis-matched #endif comments. Thanks to Eric - Eide for pointing this out. - -Thu Mar 31 14:30:20 Douglas C. Schmidt - - * tests/Message_Block_Test.cpp: updated some printouts. - -Wed Mar 31 10:46:31 1999 Steve Huston - - * ace/Message_Block_T.h: Add template arg to operator = definition for - ACE_Locked_Data_Block<>. - - * ace/config-aix-4.x.h: Don't set _BSD for AIX 4.2 (or 4.3). Setting - it works ok on AIX 4.2, but breaks TAO builds. Not setting it has - caused no regressions on 4.2, and allows TAO to build more. - -Tue Mar 30 23:28:41 1999 Irfan Pyarali - - * ace/Message_Block.cpp (init_i): This function was not releasing - the old data block (if was non-zero). Fixed this - problem and avoided the memory leak. Thanks to Sangwoo Jin - for reporting this leak. - - Also changed the constructors to set to zero. - - * tests/Message_Queue_Test.cpp (receiver): Fixed hacked use of - init() to prevent memory leak. The new init_i() fixes the leak. - -Tue Mar 30 23:24:02 1999 Ossama Othman - - * configure.in: - * m4/features.m4: - * m4/threads.m4: - Updated several library checks to use a single call of my - re/implementation of the new autoconf AC_SEARCH_LIBS test instead - of having several AC_CHECK_LIB calls in a row. Nice! - - The thread detection tests were overhauled. They are now - simpler but retain the same functionality as the previous - tests. They were greatly reduced in size so debugging, updating - and enhancing should be much easier now. - - * m4/acinclude.m4: - Reimplemented Autoconf's AC_SEARCH_LIBS into ACE_SEARCH_LIBS. - The functionality is the same but the ACE reimplementation - actually works when C++ is the test language. For some reason - Autoconf's test isn't being generated properly by GNU M4. - -Tue Mar 30 22:04:49 1999 Nanbor Wang - - * ace/config-win32-common.h: Added definition of - ACE_DEFAULT_THREAD_PRIORITY as 0. Thanks to John Morey - for reporting this. - -Tue Mar 30 21:31:01 1999 David L. Levine - - * Makefile (RELEASE_LIB_FILES): added bin/ and etc/. - Thanks to John Lindal - for reporting that the ACE library Makefile needs - bin/ace_components. - -Tue Mar 30 18:49:58 1999 Darrell Brunsch - - * bin/make_release: Added .ico to binary file types. - -Tue Mar 30 12:23:23 1999 Douglas C. Schmidt - - * ACE version 4.6.32 released. - -Tue Mar 30 11:03:31 1999 Douglas C. Schmidt - - * ace/Synch.h (ACE_Adaptive_Lock): Clarified a comment about how - to define a constructor in a subclass that initializes the - lock_. Thanks to Michael Kircher for reporting this. - -Tue Mar 30 10:37:43 1999 Ossama Othman - - * ace/OS.i (getpwnam_r): Added patch contributed by Roland Gigler - for getpwnam_r on SCO UnixWare 7. - -Mon Mar 29 20:22:44 1999 Ossama Othman - - * configure.in: - * m4/features.m4: - Added new M4 macro include file, and moved asynchronous IO tests - to `m4/features.m4'. The asynchronous IO tests were improved by - making them run-time tests. Cross-compiled platforms will fall - back to a compile-time test. Thanks to Alex for providing - run-time tests. The tests are based on his AIO tests found in - the examples/Reactor/Proactor directory. - -Sun Mar 28 18:02:54 1999 Ossama Othman - - * configure.in: - Enabled the C++ libtool support mentioned below. Removed all - references to CXXCPPFLAGS since the CPPFLAGS variable is used - by autoconf for both C and C++. - - * ltconfig: - Added my experimental libtool C++ support. The hacks I made - allow it to build C++ shared libraries. - - * m4/acinclude.m4: - * m4/threads.m4: - Renamed some variables. Namespace pollution was breaking most - of the tests. - -Sun Mar 28 12:20:44 1999 Nanbor Wang - - * ace/OS.h: - * ace/CORBA_macros.h: Moved ACE_NEW_THROW* and ACE_GUARD_THROW* - macros from OS.h to CORBA_macros.h. Also added - ACE_*GUARD_THROW_EX which has the new ACE try macros semantics. - CORBA_macros.h needs to include "OS.h" to source in the correct - platform configuration macros. - -Sun Mar 28 13:27:15 1999 Balachandran Natarajan - - * docs/exceptions.html: - Added a new example - -Fri Mar 26 23:35:28 1999 Nanbor Wang - - * ace/config-freebsd-pthread.h: Added ACE_NEEDS_SCHED_H. - - * ace/config-irix6.x-g++.h: - * ace/config-irix6.x-kcc.h: - * ace/config-irix6.x-sgic++.h: - * ace/OS.h: Reverted changes about ACE_LASKS_SCHED_H. - - * ace/config-dgux-4.x-ghs.h: - * ace/config-irix6.x-sgic++.h: - * ace/README: - * ace/OS.h: Renamed ACE_LACKS_SCHED_H with ACE_NEEDS_SCHED_H to - refect what it really means. The original name was quite - confusing. - -Fri Mar 26 18:16:25 1999 Carlos O'Ryan - - * ace/config-irix6.x-g++.h: - * ace/config-irix6.x-kcc.h: - * ace/config-irix6.x-sgic++.h: - There is no need to explicitly include or to define - ACE_LACKS_SCHED_H the file is present in IRIX 6.4. - -Fri Mar 26 17:57:25 1999 Nanbor Wang - - * ace/config-freebsd-pthread.h: Defined cuserid as an extern "C" - function. - - * ace/OS.h: should only be included when !defined - (ACE_LACKS_SCHED_H). - - Thanks to Eric Eide for sending the patch. - -Fri Mar 26 17:12:21 1999 Darrell Brunsch - - * ace/Profile_Timer.{h,i,cpp}: On Win32 platforms that - support RUsage, Profile_Timer will use both that and - High Resolution Timers for measurements. Depending - on the method, one or the other will be used. - -Fri Mar 26 17:02:00 1999 Ossama Othman - - * configure.in: - Improved ACE_HAS_USING_KEYWORD test so that it works for platforms - that support the `using' keyword but don't have the `std' namespace. - - Updated ACE_HAS_TEMPLATE_SPECIALIZATION test so that it works for - compilers that require the "template<>" syntax for specialization. - - Improved ACE_HAS_ONLY_SCHED_OTHER by checking for run time errors - when a thread scheduling policy other than SCHED_OTHER is set. - Thanks to David for suggesting this modification. - - * m4/acinclude.m4: - Added support for converting warnings to errors for Sun C++. - - * m4/threads.m4: - Added test to check if `-Kthread' compiler flag enables thread - support. SCO UnixWare 7 uses this flag. - -Fri Mar 26 07:21:33 1999 David L. Levine - - * tests/Reactor_Performance_Test.cpp (handle_input): wrapped - final return statement with ACE_NOTREACHED. - -Thu Mar 25 20:16:49 1999 Darrell Brunsch - - * bin/make_release: I wasn't using $bin_files for the - ACE+TAO.zip creation, so now that is fixed. Thanks to - Greg Ross for pointing this out. - -Thu Mar 25 16:31:27 1999 Carlos O'Ryan - - * ace/OS.h: - Added new macros for byte swapping, this are rather evil. They - add the correct padding to use a single long to represent a - short or char, but in such a way that the first bytes of the - long contain the required data. - Nobody should need that, but the IDL compiler does. - -Thu Mar 25 16:25:46 1999 Ossama Othman - - * configure.in: Added test for ACE_HAS_BROKEN_MAP_FAILED. - - * ace/OS.h: Added __USLC__ to list of macros in the conditional that - keeps the compiler from complaining about parameters which are not - used. This is needed for the C++ compiler on SCO UnixWare 7. - Thanks to Roland for letting me know about this. - -Thu Mar 25 14:55:37 1999 David L. Levine - - * tests/Basic_Types_Test.cpp: print out ACE version - information even with ACE_HAS_MINIMAL_ACE_OS. - -Thu Mar 25 13:52:57 1999 Irfan Pyarali - - * tests/Reactor_Performance_Test.cpp (handle_input): This code - wasn't entirely correct. Well actually, I think where was some - change in the semantics of Windows. Previously, once the handle - was close, it seems that the application still got notified if - there was data on the socket. With WinNT SP4, it seems that - once the handle was closed, no additional FD_READs were issued - by the OS, even if data was available on the socket. - - In ACE, both FD_READ and FD_CLOSE get mapped to handle_input(). - The way to know when the connection was closed is to do a recv() - in handle_input() and check for a zero return. When told of new - data, the old code in handle_input() only did one recv() of - BUFSIZ bytes. If there was more than BUFSIZ bytes of data on the - socket, there would be some data left on the socket. Hence, - when notified of FD_CLOSE, it did another recv() which - succeeded, and handle_input() never returned -1, making the test - hang. - - The change made was to make handle_input() call recv() until - EWOULDBLOCK occurs (note that the socket is in non-blocking - mode). Hence, when FD_CLOSE occurred, the socket did not have - any data left, recv() returned 0 and handle_input() returned -1, - which finally closed the test down correctly. - -Thu Mar 25 13:13:51 1999 Ossama Othman - - * Makefile.am (ACE.ifnames): - Placed rule generation of ACE.ifnames within a MAINTAINER_MODE - automake conditional. If a `--enable-maintainer-mode' option - isn't given on the configure script command line then don't - generate a new `ACE.ifnames' file. - - * configure.in: - Added AM_MAINTAINER_MODE so that maintainer level Makefile - features are disabled by default. - - * acconfig.h: - * ace/OS.h: - * ace/README: - Added ACE_HAS_BROKEN_MAP_FAILED macro for platforms that do not - cast MAP_FAILED to a (void *). Defining this macro prevents - compilers on those platforms from complaining about assigning - an int to a (void *). Thanks to Roland Gigler - for providing feedback about this. - -Thu Mar 25 11:30:44 1999 Balachandran Natarajan - - * docs/exceptions.html: - Corrected a couple of links... - -Thu Mar 25 01:04:00 1999 Alexander Babu Arulanthu - - * ace/OS.h (ACE_OS): Added ACE_DEFAULT_TEMP_DIR_ENV to be "TEMP" - for WIN32 and "TMP" for Unix. - -Wed Mar 24 18:30:18 1999 Douglas C. Schmidt - - * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: Added a new - version of this program that fixes a number of bugs with the old - one. Thanks to Hao Ruan for these fixes. - -Wed Mar 24 15:31:27 1999 Darrell Brunsch - - * High_Res_Timer.cpp: - * High_Res_Timer.h: - * OS.i: - - Changed the implementation of the High Resolution Timer on - Win32 to use QueryPerformanceCounter instead of assembly code. - The docs also say that this is MP-safe. Thanks to Gregory D. - Fee for suggesting this. - - * Profile_Timer.cpp: - * Profile_Timer.h: - * Profile_Timer.i: - - Now uses the High Res Timer on Win32 instead of rusage. - -Wed Mar 24 14:36:12 1999 Ossama Othman - - * ace/OS.cpp (ACE_OS_PREALLOCATE_OBJECT): Initialized obj_p to zero - to make egcs happy. - -Wed Mar 24 13:23:36 1999 David L. Levine - - * ACE-INSTALL.html: removed note about building netsvcs before - running the one-button test on WIN32. Thanks to Nanbor for - hacking run_tests.bat :-) - -Wed Mar 24 13:16:17 1999 Nanbor Wang - - * ace/WFMO_Reactor.i (handler): - * ace/Select_Reactor_T.cpp (handler_i): Made sure we can safely - pass out the event handler before we do so. Thanks to Michael - Preobrazhensky for reporting this. - - * tests/run_tests.bat: Do not run Time_Service_Test if - netsvcs/servers/main.exe doesn't exist. Thanks to - Jeffrey_Franks@i-o.com for reporting the problem and David for - suggesting the fix. - -Wed Mar 24 12:47:56 1999 David L. Levine - - * ACE-INSTALL.html: added note to build netsvcs on Win32 - before running run_tests.bat. Thanks to Jeff Franks - for suggesting this. - -Wed Mar 24 06:53:57 1999 David L. Levine - - * ace/OS.cpp (thr_create): SunOS 5.7 allows thread priority of 0, - so we no longer need to work around that. - -Tue Mar 23 22:49:15 1999 Ossama Othman - - * configure.in: Added a test for ACE_NEEDS_DEV_IO_CONVERSION. - -Tue Mar 23 22:29:20 1999 David L. Levine - - * ace/config-sunos5.7.h: undef ACE_HAS_ONLY_SCHED_OTHER, because - other scheduling policies are supported by SunOS 5.7. Thanks - to Ossama and autoconf for noticing this. - -Tue Mar 23 20:42:44 1999 Ossama Othman - - * tests/Cache_Manager_Test.cpp (main): Added missing ACE_START_TEST - and ACE_END_TEST macros. - - * m4/threads.m4: Modified UNIX International threads check to include - check for rwlock_destroy() in -lthread since thr_create() was - found without explicitly linking to -lthread on Solaris 2.5.1. - rwlock_destroy() should be found only by linking to -lthread which - will cause the configure script to add -lthread to the library link - list. - -Tue Mar 23 16:25:39 1999 David L. Levine - - * docs/ACE-subsets.html: added FOR_TAO subset sizes. - -Tue Mar 23 15:15:20 1999 Nanbor Wang - - * ace/Map_Manager.{i,cpp} (ACE_Map_Iterator_Base::operator*): - Moved this function to .cpp file to avoid compilation problem on - SunOS 5.6 with SunCC 4.2. Once we know a patch that will fix - the problem, we should move it back to .i file again. Thanks to - James Megquier for reporting the problem. - -Tue Mar 23 14:56:58 1999 Ossama Othman - - * acconfig.h: - * configure.in: - * ace/OS.h: - * ace/TLI.cpp: - * ace/config-osf1-4.0.h: Removed all references to - ACE_HAS_BROKEN_T_ERRNO and removed the definition of the _terrno() - function from TLI.cpp since it isn't a standard TLI function (at - least not the Steven's books that I've read). This also fixes a - problem on Solaris that was causing an autoconfigured build of - TLI.cpp to fail. - - * ace/Makefile.am: Make sure template source files get installed for - all cases. Previously, they only got installed if the template - source is required by the compiler. However, they are still needed - by compilers that don't explicitly require template sources to - be included in a file that references them. - - * configure.in: Fixed the test for ACE_TEMPLATES_REQUIRE_SOURCE. - Thanks to Carlos for his help on this. Removed the test for - ACE_HAS_BROKEN_T_ERRNO since it is no longer needed due to the - above change. - - * README: Added Konstantinos Margaritis to the - ACE contributor list. - -Tue Mar 23 12:57:40 1999 Douglas C. Schmidt - - * netsvcs/lib/Client_Logging_Handler.cpp: Split off the logging to - an ostream from the logging for STDERR. Thanks to Bill Rizzi - (rizzi@softserv.com) for pointing out this problem. - - * netsvcs/lib/Client_Logging_Handler.cpp: Changed the default from - ACE_STDOUT to ACE_STDERR to be consistent. Thanks to Bill Rizzi - (rizzi@softserv.com) for pointing out the problem. - -Tue Mar 23 12:06:04 1999 Nanbor Wang - - * ace/OS.h (ACE_THROW_SPEC): Added prgama to disable reporting - warning 4290 on MSVC. MSVC "supports" the exception - specification but doesn't provide an implementation for it. - Instead, it warns you the specification is ignored. - -Mon Mar 22 21:34:06 1999 David L. Levine - - * include/makeinclude/platform_sunos5_g++.GNU: use -m uname - option instead of -i, because GNU uname doesn't support -i. - -Mon Mar 22 18:59:55 1999 Steve Huston - - * ace/NT_Service.cpp (state): Changed the (DWORD *, ACE_Time_Value *) - version to reliably return -1 on any error. Thanks to Martin - Krumpolec for keeping me honest here, and for - sending in better code. - -Mon Mar 22 14:16:04 1999 David L. Levine - - * ace/OS.{h,cpp} (cleanup_tss): added tss_close (), to enable - deleting the native key on program termination. That's not - implemented yet, because it requires a separate - ACE_OS::thr_keyfree (ACE_OS_thread_key_t). - - * ace/OS.cpp (fini), README, ace/config-linux-lxpthreads.h: - removed ACE_FINI_HOOK support. It wasn't helping. - -Mon Mar 22 11:14:16 1999 Ossama Othman - - * Makefile.am: - Various minor updates. - - * configure.in: - * m4/platform.m4 - Moved known platform specific macro checks from `configure.in' - to `platform.m4'. - - * tests/Makefile.am: - Updated to build the DLL_Test shared library. Support for the - test is still broken (my fault :). - - * aclocal.m4: - * configure: - These are automatically generated so they shouldn't be under - CVS control. I Removed them from the CVS repository. - -Mon Mar 22 09:42:26 1999 David L. Levine - - * docs/ACE-subsets.html: added current status section. - -Mon Mar 22 01:04:23 1999 Nanbor Wang - - * ace/OS.cpp (free_all_keys_left): Changed to remove left-over - keys using TlsFree on Win32. We can't use ACE_OS::thr_keyfree - here because it tries to update the TSS in_use_ information - which has already been deleted at this point. - (cleanup_tss): Uncommented free_all_keys_left. - -Sun Mar 21 21:26:46 1999 David L. Levine - - * bin/make_release: fixed error status when building ACE+TAO. - Thanks to Doug for reporting this. - -Sun Mar 21 21:16:02 1999 Douglas C. Schmidt - - * ACE version 4.6.31 released. - -Sun Mar 21 20:45:57 1999 Douglas C. Schmidt - - * ACE version 4.6.30 released. - -Sun Mar 21 18:39:16 1999 Ossama Othman - - * ACE.ifnames: - - Updated with new macro list. - - * Makefile.am: - - Added the m4 directory to the distribution list and made some - minor updates. - - * ace/Makefile.am: - * m4/subsets.m4: - - Subsetting updates/corrections. - - * configure.in: - - Added work around for buggy glibc2.1 when including both - and . Added check for auto_ptr class - declaration since some platforms have but may not - declare the auto_ptr class. Shortened some of the "checking" - messages. - - * ace-config.1.in: ace-config script man page template - * aceConf.sh.in: ace-config "unknown" library script - - Added these files to the CVS repository. - - * config.guess: - * config.sub: - * ltconfig: - * ltmain.sh: - - Updated these files to the ones in the latest libtool. - - * libtool: - - Removed this since it is automatically generated for each platform. - It shouldn't be under CVS control. - -Sun Mar 21 17:59:22 1999 Carlos O'Ryan - - * ace/CDR_Stream.cpp: - Fixed a problem with ACE_OutputCDR::write_octet_array_mb, thanks - to Dave Meyer for isolating and reporting - this bug again [it was fixed in TAO and somehow it crept to the - ACE version of the CDR classes]. - -Sun Mar 21 17:42:08 1999 Ossama Othman - - * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record): - Use ACE_NTOHL macro instead of system ntohl() to get around bug - in egcs-2.91.6x. - -Sun Mar 21 16:07:24 1999 Ossama Othman - - * ace/config-g++-common.h (ACE_HAS_USING_KEYWORD): - Define ACE_HAS_USING_KEYWORD for egcs 1.1.x. - -Sun Mar 21 09:44:30 1999 David L. Levine - - * tests/Timeprobe_Test.cpp: don't test ACE_Singleton - creation during static construction if ACE_HAS_PURIFY - is enabled, because it notices the memory-in-use. - - * examples/Naming/Makefile: changed SRC to PSRC. - - * examples/Naming/Makefile,performance-tests/Misc/Makefile, - tests/Makefile: - Use ace_components instead of the current ACE_COMPONENTS - setting to determine what should be built. - -Sat Mar 20 19:10:37 1999 Carlos O'Ryan - - * ace/Connector.h: - * ace/Connector.cpp: - * ace/Strategies_T.h: - * ace/Strategies_T.cpp: - Added new methods to the ACE_Connector, ACE_Strategy_Connector, - ACE_Connect_Strategy and ACE_Cached_Connect_Strategy. - The motivation for this new method is a bit convoluted: - In TAO we store the Svc_Handler returned from connect() as a - hint for later Cached_Connector lookups. But the location - where we store it could be shared between multiple threads. - To minimize the number of locks this hint is only modified and - examined by the Cached_Connector, while the lock in the - connection map is beign held. - - The problem arises when the hint is returned: another thread - could try to use the same hint location, detect that the hint - is in use and replace it before the thread that just requested - the object has a chance to read the hint value. - The solution is to use two variables: one is the hint - location, carefully protected by the Cached_Connector lock, - the other is a variable in the thread stack, they return the - same thing, but the second variable is not affected by changes - done by other threads. - - In short: we addeda connect() method that takes two arguments, - the first is just intented to update the cached connector - hint, the second is where the real connection gets returned. - - * tests/Makefile: - David discovered that using SRC to list the sources does not - work under some platforms. But using PSRC does. - -Sat Mar 20 15:51:14 1999 Ossama Othman - - * configure.in: - Added tests for: ACE_HAS_BROKEN_NAMESPACES - ACE_HAS_BROKEN_CONVERSIONS - ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS - ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP - ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP - ACE_HAS_PTHREAD_PROCESS_ENUM - - Added some minor updates and corrections. - -Sat Mar 20 09:06:10 1999 David L. Levine - - * tests/Map_Manager_Test.cpp: changed index () to slot_index () - and generation () to slot_generation (), to correspond to - Active_Map_Manager interface change. - - * examples/ASX/Message_Queue/Makefile: changed LSRC to PSRC. - - * ace/Object_Manager.{h,cpp}: removed complex support from - ACE_Object_Manager for cleanup of some ACE_Singleton locks - during static construction/destruction, only. The affected - lock types are ACE_Thread_Mutex, ACE_Mutex, and - ACE_RW_Thread_Mutex. ACE_Recursive_Thread_Mutex and - ACE_Null_Mutex will still be cleaned up if used to create - ACE_Singletons during static construction/destruction. As - noted in ace/Singleton.h, those are the best type of locks - to use with ACE_Singleton, anyways. - - This support was tricky to get right, and increased the size of - the Object_Manager object file by 46 to 59 percent. Now, if - ACE_Singletons are created during static construction or - destruction, with either an ACE_Thread_Mutex, ACE_Mutex, or - ACE_RW_Thread_Mutex lock, those locks will be dynamically - allocated and leaked. - -Sat Mar 20 02:03:53 1999 Ossama Othman - - * acinclude.m4: - - Split acinclude.m4 into several M4 macro files and moved those - files into the new `m4' subdirectory, includind acinclude.m4. - - * m4/acinclude.m4: - * m4/compiler.m4: - * m4/subsets.m4: - * m4/threads.m4: - - Added these M4 files. - - * bin/autogen: - - Script to regenerate auto{conf,make} and libtool related files. - Additional functionality may be added to this script in the - future. - - * Makefile.am: - * ace/Makefile.am: - * apps/gperf/src/Makefile.am: - * apps/gperf/tests/Makefile.am: - * apps/gperf/Makefile.am: - * apps/Makefile.am: - * netsvcs/clients/Logger/Makefile.am: - * netsvcs/clients/Naming/Client/Makefile.am: - * netsvcs/clients/Naming/Dump_Restore/Makefile.am: - * netsvcs/clients/Naming/Makefile.am: - * netsvcs/clients/Tokens/collection/Makefile.am: - * netsvcs/clients/Tokens/deadlock/Makefile.am: - * netsvcs/clients/Tokens/invariant/Makefile.am: - * netsvcs/clients/Tokens/manual/Makefile.am: - * netsvcs/clients/Tokens/mutex/Makefile.am: - * netsvcs/clients/Tokens/rw_lock/Makefile.am: - * netsvcs/clients/Tokens/Makefile.am: - * netsvcs/clients/Makefile.am: - * netsvcs/lib/Makefile.am: - * netsvcs/servers/Makefile.am: - * netsvcs/Makefile.am: - * man/man3/Makefile.am: ( NOT ADDED YET ) - * man/Makefile.am: ( NOT ADDED YET ) - * tests/log/Makefile.am: - * tests/Makefile.am: - - Added Automake makefile templates for ACE. - - * configure.in: - * m4/subsets.m4: - * ace/Makefile.am: - - Added support for David's ACE subsetting work. - -Fri Mar 19 23:36:37 1999 Irfan Pyarali - - * ace/Active_Map_Manager.h (ACE_Active_Map_Manager_Key): Changed - method index() to slot_index() and generation() to - slot_generation(). These changes were motivated by the - OpenEdition platform/compiler, which defines a macro called - index(). Also, changed the type of and - from u_long to ACE_UINT32 to get consistent size across - platforms. - -Fri Mar 19 22:50:19 1999 David L. Levine - - * bin/ace_ld: inserted ^['"]? at beginning of patterns that check - for -l and -L, to make sure they're at the beginning of arguments. - Thanks to Henric Jungheim for - suggesting this. - - * tests/Makefile: removed SRC, because it caused link problems - on DU 4.0. - -Fri Mar 19 18:56:26 1999 Carlos O'Ryan - - * Fixed several makefiles that did not have a SRC or LSRC variable - defined. - - * Re-generated the dependencies for both ACE and TAO, this time on - a platform that includes the template code. - - * include/makeinclude/rules.local.GNU: - Now we can run make depend inside a build directory. - Removed any $(ACE_ROOT)/ace/config*.h files from the dependency - list, those are not used. - -Fri Mar 19 18:05:27 1999 Ossama Othman - - * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record): - Reverted change that was thought to work around egcs compiler bug. - The call to ntohl() within the templates still causes the compiler - to complain. - -Fri Mar 19 17:31:57 1999 Carlos O'Ryan - - * ace/CDR_Stream.cpp: - Fixed silly error in the InputCDR constructor taking an - ACE_Message_Block. - -Fri Mar 19 15:41:30 1999 Irfan Pyarali - - * ace/config-win32-common.h: Added CE fix. - -Fri Mar 19 15:03:54 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - Changed CDR to ACE_CDR. - Fixed ACE_InputCDR constructor when receiving a linked list of - Message_Blocks. - - * tests/CDR_Test.cpp: - Added a test for the constructor above. - -Fri Mar 19 10:29:17 1999 David L. Levine - - * ace/Singleton.cpp (instance): removed at_exit () calls - from both ACE_Singleton and ACE_TSS_Singleton, only - when the ACE_Object_Manager hasn't started or has already - shutdown. In those cases, the singletons will leak. - - * ace/Object_Manager.cpp (ACE_Object_Manager ctor), - ace/OS.cpp (ACE_OS_Object_Manager ctor): allow - newer instances to overwrite older ones, in case an application - #defines ACE_HAS_NONSTATIC_OBJECT_MANAGER and uses the - Object_Manager during construction of static objects. - - * tests/Timeprobe_Test.cpp: added test of ACE_Singleton - creation during construction of static objects. Timeprobes - can do that, when they're enabled. - - * ace/OS.cpp (fini), README: added ACE_FINI_HOOK support. - Applications can #define ACE_FINI_HOOK to any executable code, - and it will be executed on program termination. - - * ace/config-linux-lxpthreads.h: with ACE_HAS_TSS_EMULATION, - #define ACE_FINI_HOOK to insert a one-second sleep at - program termination. It's necessary to avoid occasional - segfaults of unknown origin, but they appear to be in the - LinuxThreads library. - - * bin/ace_components: added. It is used to record/access - which components were built into the ACE library. See next - entry for files that have been updated to use it. - - * ace/Makefile,tests/Makefile,tests/run_tests.sh: use - ace_components to record which components are in the ACE library. - Suppress build/run of tests that use Token and Other. - - * netsvcs/{clients,servers}/Makefile: use ace_components instead of - the current ACE_COMPONENTS setting to determine what should be built. - -Fri Mar 19 03:24:34 1999 Irfan Pyarali - - * ace/Singleton.cpp (instance): Commented out the call to - ACE_Object_Manager::at_exit(). Currently, this is causing - multiple instances of ACE_Object_Manager to get created, and - hence causing all sorts of problems. - - * ace/OS.cpp (cleanup_tss): Removed the call to - free_all_keys_left() (WIN32 only), because it causes - segmentation faults at shutdown. - -Fri Mar 19 00:15:21 1999 Nanbor Wang - - The following changes are specific to WindowsCE. They are - required to remove MFC dependency from CE port. Thanks to Eric - Covington for motivating this. - - * ace/config-WinCE.h: We no longer enfoce the use of MFC with ACE - CE port anymore. - - * ace/config-win32-common.h: When not using MFC, CE needs to - include and explicitly. - - * ace/Log_Record.cpp (print): - * ace/OS.{h,cpp} (ACE_CE_Bridge): Changed to use HWND to record - target window handle instead of CWnd. Also, we stop passing - output string in a CString anymore. The string is now created - using ACE_OS::strdup and must be released by the target window - using ACE_OS::free.. A small smart pointer class will be added - later. Notice that if you used ACE CE port before, the wParam - can no longer be casted to a CString*, it should be casted to - LPTSTR now. - - * WindozeCE/WindozeCEDlg.cpp: should be casted to LPTSTR - and it should be freed using ACE_OS::free. - - * ace/ace_ce_dll.dsp: CE programs (or DLL only?) not using MFC - must specify all libraries used by the program, even msvcrt. - -Thu Mar 18 22:21:39 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: changed - ACE_QUOTE to '"', instead of "", on win32 hosts. "" just - evaporates to nothing; we really need one double quote. - Thanks to Hans Rohnert for verifying this. - -Thu Mar 18 18:49:32 1999 Marina Spivak - - * ace/SString.i (compare): fixed the function to work properly in - case strings have different lenghts. - - * ace/SString.cpp: fixed code to gracefully handle failed memory - allocations. - - * ace/SString.h: added comments about strings with release=0, not - necessarily being null terminated. - -Thu Mar 18 14:31:29 1999 Steve Huston - - * tests/DLL_Test.cpp: Use the new DLL_Test.h file that contains the - class defs - needed for AIX xlC. This should have been done - with the Mar 15 changes but slipped through the cracks. - - * include/makeinclude/platform_hpux_aCC.GNU: Added support for - building HP-UX 11 distributions with both 32 and 64 bits. - - * docs/tutorials/006/client_handler.cpp (Client_Handler::open): Changed - arg name to void_acceptor to avoid redefining it inside the function. - - * docs/tutorials/007/client_acceptor.cpp (Client_Acceptor(Thread_Pool&) - Fixed initialization of concurrency_. - - * docs/tutorials/018/Test_T.cpp (open): Fix ACE_UNUSED_ARG(arg). - - * ace/Message_Queue.h (ACE_Message_Queue_Base): Removed "= 0" from - ~ACE_Message_Queue_Base. AIX xlC warns that pure virtual dtor - needs an out-of-line definition to be a base of another class. - There is already a definition for the dtor in Message_Queue.i. - -Thu Mar 18 14:30:04 1999 Nanbor Wang - - * ace/OS.i (timezone): Removed the leading '::' to cope with VC - 5. Thanks to Lan Yaolong for reporting - this. - -Wed Mar 17 17:23:43 1999 Vishal Kachroo - - * ace/OS.i (timezone): Added support for timezone () on CHORUS - -Wed Mar 17 14:06:24 1999 Ossama Othman - - * acconfig.h: Some characters got removed so I put them back. - -Wed Mar 17 13:59:42 1999 Ossama Othman - - * configure.in: - * acconfig.h: - Added autoconf check for rename() system call. - -Wed Mar 17 07:55:38 1999 Nanbor Wang - - * include/makeinclude/platform_freebsd_pthread.GNU: Made some - adjustment for building ELF executables which are the default on - FreeBSD 3 and above. I'll incoporate Russell's LinuxThread - change later. - -Wed Mar 17 13:36:32 1999 David L. Levine - - * bin/make_release: return non-zero exit status on failure. - -Wed Mar 17 12:47:04 1999 Nanbor Wang - - * ace/Service_Config.cpp (open_i): Also delete the parse buffer - before exiting the function for it is no longer needed. We - still need to deallocate the buffer at close method to prevent - the case when uses manipulate Service_Config directly using - process_directives. - -Wed Mar 17 12:33:35 1999 Douglas C. Schmidt - - * ace/OS.i: Reenabed ACE_OS::rename() and we'll see which - platforms need to have ACE_LACKS_RENAME. Thanks to Susan - Liebeskind for reporting this. - -Wed Mar 17 10:46:26 1999 Ossama Othman - - * ace/Message_Block.i (space): Moved ACE_Message_Block::space() - after inline declarations of ACE_Message_Block::end() and - ACE_Message_Block::wr_ptr() to prevent "used before it was - declared inline" warnings on end() and wr_ptr(). - -Wed Mar 17 10:24:26 1999 David L. Levine - - * ace/OS.cpp (argv_to_string): initialized temp to 0 to avoid warnings - from VxWorks g++. - ace/OS.i (strenvdup): initialized temp to 0 to avoid warnings from - VxWorks g++. Thanks to Hans Rohnert for reporting these. - - * include/makeinclude/platform_vxworks5.x_g++.GNU (RANLIB): - replaced /bin/true with @true, to avoid build warning on - NT hosts. Thanks to Hans Rohnert for reporting this. - -Wed Mar 17 09:58:43 1999 Douglas C. Schmidt - - * ace/Svc_Conf.l (yy_delete_parse_buffer): Added a check for NULL - to avoid freeing buffers multiple times. Thanks to Tom Arbuckle - for this fix and to - Nanbor for noticing the problem in the first place! - -Wed Mar 17 08:30:58 1999 David L. Levine - - * ACE version 4.6.29 released. - -Wed Mar 17 03:12:43 1999 James C. Hu - - * ace/Message_Block.i: Changed the definition of space () to be - something more useful than it was. Thanks to Bill Rizzi - (rizzi@softserv.com) for pointing out the problem. - - * ace/Cache_*: Removed by popular decree. Can be found in - JAWS/PROTOTYPE. - -Wed Mar 17 03:06:20 1999 Nanbor Wang - - * ace/Service_Config.cpp (close): Re-enabled cleaning up the lex - buffer. - - * ace/Svc_Conf_l.cpp (ace_yy_delete_parse_buffer): We should not - remove uninitialize buffer. - -Tue Mar 16 19:48:57 1999 Irfan Pyarali - - * ace/Makefile and tests/Makefile: Reverted these files to the - pre-Cache_Manager state. The Cache_Manager files don't compile - on g++ and vxworks and we need to make a release now. - - * ace/Map_T.h (class ACE_Noop_Key_Generator): Added new class. - This class makes it easy to use the map adapters when you don't - care about generating new keys. - -Tue Mar 16 11:36:41 1999 Nanbor Wang - - * ace/config-freebsd-pthread.h: FreeBSD 2.2 and above also support - threads, but siginfo_t is only supported on FreeBSD 3.0 and - above. Thanks to Goldshtain Dmitry - for pointing these out. - -Tue Mar 16 16:46:04 1999 David L. Levine - - * ace/Hash_Bucket_T.h: added class to friend - ACE_Hash_Bucket_DLCStack_Iterator declaration. - -Tue Mar 16 16:35:39 1999 David L. Levine - - * docs/ACE-guidelines.html: never use TRUE, true, FALSE, false, etc. - -Tue Mar 16 15:58:07 1999 Nanbor Wang - - * ace/Service_Config.cpp (close): Don't call the - ace_yy_delete_parse_buffer for now. It is causing access - violation. - -Tue Mar 16 15:15:00 1999 Chris Gill - - * ace/ACE.{cpp, i} - ace/OS.{cpp, h, i} - ace/FIFO.cpp - ace/Log_Record.cpp - ace/SOCK_Dgram_Mcast.cpp - ace/SPIPE_Connector.cpp - ace/TLI_Acceptor.cpp - ace/config-psos-diab-mips.h (new) - ace/config-psos-diab.h - ace/config-psos-tm.h - ace/streams.h: integrated pSOS/MIPS changes into ACE. Thanks to - Jaepil Kim (jpkim@lgsoft.com) for completing the ACE pSOS port - for the MIPS platform, and for sending these modifications. - -Tue Mar 16 14:25:03 1999 Steve Huston - - * ace/ACE.cpp (get_ip_interfaces, count_interfaces, get_bcast_addr): - On AIX, use CSIOCGIFCONF instead of SIOCGIFCONF to retrieve - interface information. Thanks to Eric Newton for - figuring this out. - -Tue Mar 16 12:20:53 1999 Balachandran Natarajan - - * ace/Service_Config.h (ACE_Service_Config): - Added documentation for the parse_args () method. This was in - request to Bill Rizzi . - -Tue Mar 16 10:57:46 1999 Douglas C. Schmidt - - * ace/Svc_Conf.l: Added a new method ace_yy_delete_parse_buffer() - that frees up FLEX buffers when the program is done. Thanks to - Tom Arbuckle for - this fix. - - * examples/ASX/Message_Queue/buffer_stream.cpp (main): Changed pm - to cm and vice versa to be consistent. Thanks to Rainer Blome - for reporting this. - -Tue Mar 16 10:50:42 1999 Steve Huston - - * include/makeinclude/platform_aix4_cset++.GNU: New file to cover - all AIX 4.x versions with the C Set++ (xlC) compiler. - - * include/makeinclude/platform_aix.GNU, platform_aix4.2.GNU: These - files are deprecated; they simply include the new file above, - platform_aix4_cset++.GNU. - -Tue Mar 16 10:38:35 1999 Carlos O'Ryan - - * ace/Hash_Bucket_T.cpp: - Removed default parameter declaration from the constructor for - ACE_Hash_Bucket_Manager definition. Default parameter - declarations can only show up in the function declaration. - -Tue Mar 16 10:25:53 1999 Steve Huston - - * ace/config-aix-4.1.x.h, config-aix-4.2.x.h: These now simply - include config-aix-4.x.h. All further changes for any AIX 4.x - version should go in config-aix-4.x.h. - -Tue Mar 16 08:12:54 1999 Steve Huston - - * ace/Thread_Manager.cpp: In thread_within(ACE_thread_t), replaced use - of '==' with ACE_OS::thr_equal. In hthread_within (ACE_hthread_t), - replaced use of '==' with ACE_OS::thr_cmp. Thanks very much to - Peter Windle for pointing this out. - - * README: Added Peter Windle to the list of distinguished contributors. - -Tue Mar 16 03:05:22 1999 James Hu - - * ace/Cache_Hash_T.{cpp,h}: - * ace/Cache_Heap_T.{cpp,h}: - * ace/Cache_List_T.{cpp,h}: - * ace/Cache_Manager.{cpp,h}: - * ace/Cache_Manager_T.{cpp,h}: - * ace/Cache_Object.{cpp,h}: - * ace/Hash_Bucket_T.{cpp,h}: - Incorporated fixes from purify and benchmarking sessions at Entera. - Cosmetic changes coming soon (documentation strings and removal - of magic numbers). - - * ace/Makefile: Added above files to Makefile. - - * ace/OS.i: FreeBSD does not support the timezone() function as - documented by Vishal below. Using Chris Gill's implementation - for LynxOS. - - * tests/Makefile: - * tests/Cache_Manager_Test.cpp: Added this test to illustrate - Cache_Manager. Still needs changes to use ACE_DEBUG instead of - cerr. - -Mon Mar 15 19:05:22 1999 Steve Huston - - * ace/config-aix-4.x.h: New config file that covers all of the AIX 4.x - versions with C Set++ (xlC) and g++. Many thanks to Susan - Liebeskind for doing to port to AIX 4.3 and - testing, providing needed changes! - - * ace/OS.i (wait): Fixed to handle ACE_HAS_UNION_WAIT case correctly, - without depending on AIX - thanks to Susan Liebeskind for this too! - - * ace/ACE.cpp (fork, with zombie avoidance): Fixed to work right - with ACE_HAS_UNION_WAIT (ala AIX 4.2). - - * include/makeinclude/rules.lib.GNU: New template instantiation - scheme for AIX with C Set++ (xlC); goes with... - * etc/xlc_dummy.cpp: New file, purpose of which is to help with AIX - xlC template instantiation. This is the new, improved method from - IBM suport. It still generates a zillion duplicate definition - warnings, but IBM doesn't have any better solution. - - * include/makeinclude/platform_aix4.2.GNU: This will work with both - AIX 4.2 and 4.3 now. I'll take care of the naming soon. - - * tests/Map_Test.(cpp h): Moved template defs to new file, Map_Test.h - to satisfy AIX xlC. Thanks to Susan for this too. - - * tests/DLL_Test.(cpp h): Moved template defs to new file, DLL_Test.h - to satisfy AIX xlC. - - * tests/Makefile, Makefile.DLL: Fixed to build libDLL_Test correctly - on AIX w/ xlC. - - * tests/run_tests.sh: Sets LIBPATH correctly for AIX (4.2 at least). - -Mon Mar 15 00:26:31 1999 Douglas C. Schmidt - - * netsvcs/ACE-netsvcs.html: Updated this to document the current - version. Thanks to Bill Rizzi for - reporting this. - - * netsvcs/lib/Client_Logging_Handler.cpp: Make sure that debug - messages go to stderr and log messages go to stdout. Thanks to - Bill Rizzi for reporting this. - - * netsvcs/lib/Client_Logging_Handler.cpp (fini): Oops, fixed a - minor buglet with return values. Thanks to David for reporting - this. - - * netsvcs/lib/Client_Logging_Handler.cpp (send): Added a check to - make sure we don't crash if the ostream is NULL. Thanks to Bill - Rizzi for reporting this. - -Sun Mar 14 22:54:41 1999 Douglas C. Schmidt - - * netsvcs/lib/Client_Logging_Handler.cpp (init): Added an - ACE_OS::unlink() to prevent STREAM pipes from getting confused - if this application doesn't shutdown gracefully. Thanks to Bill - Rizzi for reporting this. - -Sun Mar 14 19:51:25 1999 Ossama Othman - - * configure.in: Added real-time support library `-lrt' check to - asynchronous IO functions/libraries checks. - - GNU glibc 2.1 adds support for the POSIX 1b real-time - specification in the library `librt'. The POSIX asynchronous IO - functions may be found in that library. Currently, `-lpthread' - must also be linked to in addition to `-lrt'. - -Sun Mar 14 17:20:09 1999 Douglas C. Schmidt - - * ace/Log_Msg: Generalized the enable_debug_messages() and - disable_debug_messages() methods so they can be used to enable - or disable arbitrary priorities. Thanks to Susan Liebeskind - for suggesting this. - -Sun Mar 14 14:46:00 1999 Chris Gill - - * ace/OS.i (tzset,timezone): pSOS doesn't support these two - functions. - - * ace/OS.{cpp, h}: added comments clarifying usage for - ACE_Time_Value::max_time, use of ACE_PSOS_TM in ACE_OS::signal (). - -Sun Mar 14 01:30:43 1999 Nanbor Wang - - * ace/OS.i (tzset,timezone): WinCE doesn't support these two - functions. - -Sat Mar 13 12:14:34 1999 Douglas C. Schmidt - - * ace/Thread_Manager: Changed the following methods: - - int task_list (..) - int thread_list (...) - int hthread_list (..) - int thread_grp_list (...) - int hthread_grp_list (...) - - to return actual number of fetched values. - - * ace/Thread_Manager: Added two new methods, task_all_list() and - thread_all_list(), which return lists of all the tasks and - threads in a Thread_Manager, respectively. Thanks to Zoran - Ivanovic for contributing this. - - * ace/Shared_Memory_{MM,SV}.h: Clarified the relationship of - these classes to the more powerful ACE_Malloc<> abstraction. - Thanks to Ti Z for suggesting this. - -Sat Mar 13 13:27:55 1999 David L. Levine - - * ace/OS.i (timezone,tzset): not supported on VxWorks. - - * include/makeinclude/ platform_osf1_4.0.GNU: added suppression - of msg 1180, statement causes unreachble return, with cxx 6.2 - and later. It doesn't like ACE_OSCALL_RETURN and - ACE_NOTSUP_RETURN, though it seems to be going overboard. - The warnings appeared with cxx 6.2-009. If someone uses - 6.2-007, they might have to manually remove the 1180 suppression. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp (handle_events), - C-inserver.cpp (main), - netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record), - apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (svc): - replaced NOTREACHED comment with ACE_NOTREACHED macro. DU cxx - started complaining about the unreached return statement. - -Sat Mar 13 16:16:13 1999 James CE Johnson - - * docs/tutorials/021: Added some comments to page04 about the - template parameters and the use of the ACE_LOCK parameter in - particular. (Thanks to Bala for the suggestion.) - -Sat Mar 13 00:37:17 1999 Douglas C. Schmidt - - * ACE version 4.6.28 released. - -Fri Mar 12 20:17:47 1999 Irfan Pyarali - - * ace/Select_Reactor_Base.cpp (handle_input): - * ace/WFMO_Reactor.cpp (handle_signal): Added support for - dispatching QOS_MASK and GROUP_QOS_MASK. - -Fri Mar 12 19:13:11 1999 Carlos O'Ryan - - * ace/OS.i: - Implemented ACE_OS::timezone() for LynxOS. - -Fri Mar 12 16:31:19 1999 Ossama Othman - - * ACE-INSTALL.html (Linux): added note about non-thread safe - glibc 2.0 dynamic loader. The dynamic loader in glibc 2.1 is - thread safe. - -Fri Mar 12 13:44:54 1999 Kirthika Parameswaran - - * tests/DLL_Test.cpp (main): Fixed the errors on VxWorks and - LynxOS by shifting the START_TEST before the #ifdefs began. - -Fri Mar 12 12:53:17 1999 David L. Levine - - * ace/config-sunos5.5.h: with CC 5.0, replaced ACE_LACKS_ACE_IOSTREAMS - with ACE_USES_OLD_IOSTREAMS. - - * include/makeinclude/platform_sunos5.5_sunc++.GNU: with CC 5.0, - added -library=iostream,no%Cstd to CCFLAGS. - - Thanks to Diethard Ohrt for the - above two updates to support CC 5.0. - -Fri Mar 12 12:09:14 1999 David L. Levine - - * ace/OS.h: fixed comment after #endif to match its #ifdef. - -Fri Mar 12 11:46:55 1999 Vishal Kachroo - - Added two new functions tzset () and timezone (). The former sets the - timezone information based on an environment variable TZ which is - set when the user logs on. (For St. Louis TZ=US/Central and - timezone = 360 minutes or 6 hrs. from GMT.). timezone () retrieves - the timezone value in seconds. - - * ace/OS.h (ACE_OS): Added a wrapper for timezone () and tzset (). - * ace/OS.i (ACE_OS): Added Implementation for the above functions. - - The timezone information is being used in the Time Service. - -Thu Mar 11 20:11:13 1999 Douglas C. Schmidt - - * ace/Get_Opt.cpp (operator): Reverted the following change since - it will break documented behavior. Thanks to Jon Biggar for - reporting this. - - * ace/Get_Opt.cpp (operator): When the getopt encountered an - unknown option or an option with a missing required argument, it - returned '?' and continues to allow processing with the next - argument (no problem so far). However, if it encountered an - argument that is not an option (i.e. no '-' in front) or if it - encounters a double dash (i.e. '--') it returns EOF which - disallows further processing. Now, it returns a '?' after - advancing optind to allow further processing. Thanks to Mark - Laffoon for reporting this. - -Thu Mar 11 15:34:24 1999 David L. Levine - - * ace/ACE.cpp: removed unnecessary #includes of ace/IPC_SAP.h, - ace/Process.h, and ace/SString.h. Thanks to Elias Sreih - and Liang Chen - for suggesting this. - - * ace/OS.cpp (ACE_OS::thr_setspecific): on ACE_WIN32 with - ACE_HAS_TSS_EMULATION, don't register the one native key - with ACE_TSS_Cleanup::instance (). There's no need, because - it doesn't have a destructor. And, it prevents startup - because the ACE_TSS_Cleanup structures haven't been set up - completely when it is called. Thanks to Terry Rosenbaum - for reporting this. - - Thu Mar 11 14:04:15 1999 David L. Levine - - * include/makeinclude/platform_chorus_ghs.GNU: added protection - to not reset exceptions flag if it was defined. - -Thu Mar 11 12:53:41 1999 Carlos O'Ryan - - * ace/Thread_Manager.i: - The method to return the number of threads was using thr_lists_ - as a pointer, but it isn't. - -Thu Mar 11 10:12:51 1999 Douglas C. Schmidt - - * ace/Thread_Manager: Added a method to return the current number - of threads in the ACE_Thread_Manager. Thanks to Zoran Ivanovic - for suggesting this. - -Thu Mar 11 10:27:51 1999 Kirthika Parameswaran - - * tests/DLL_Test.cpp (main): Allowed the main to be accessible on - all platforms by shifting the #ifdefs inside the main. The - problem arose due to the main being declared an undefined - reference on LynxOS. - -Wed Mar 10 13:31:37 1999 Ossama Othman - - * ace/config-linux-common.h: - Commented out ACE_HAS_DLFCN_H_BROKEN_EXTERN_C, ACE_LACKS_MSYNC and - ACE_LACKS_MADVISE. They are no longer needed for recent revisions - of glibc 2.x. Thanks to for pointing this out. - -Wed Mar 10 11:05:39 1999 David L. Levine - - * ace/Thread.h,ace/Thread_Manager.h (exit): added comment - that exit () should not be called by main thread. - - * ace/OS.h: added an ACE_OS_thread_key_t typedef on WIN32 - with ACE_HAS_TSS_EMULATION. Thanks to Terry Rosenbaum - for reporting that - it was missing. - - * include/makeinclude/platform_osf1_4.0.GNU: disable msg 1136 with - cxx 6.1-029. Thanks to Doug Anderson for - reporting this. - -Wed Mar 10 10:57:16 1999 Carlos O'Ryan - - * ace/Basic_Types.h: - Fixed minor problem that would show up if sizeof(int)==2; thanks - to Cristian Ferretti for reporting this - problem. - -Wed Mar 10 10:13:52 1999 Nanbor Wang - - * ace/Message_Block.i (reference_count): Made sure the inline - function is defined before used. Thanks to David for noticing - this. - -Wed Mar 10 08:52:59 1999 David L. Levine - - * include/makeinclude/platform_chorus.GNU: fixed - exceptions=1 support. Thanks to Wei Chiang for - reporting this. - - * include/makeinclude/wrapper_macros.GNU: added exceptions=1 - support for pre-2.8 g++. It's not recommended, because pre-2.8 - g++ doesn't support exceptions well. It's provided for - completeness. - - * include/makeinclude/platform_chorus.GNU: removed - exceptions=1 support, because now it's in wrapper_macros.GNU. - -Tue Mar 09 21:54:39 1999 David L. Levine - - * netsvcs/Makefile,netsvcs/clients/Makefile: updated - ACE_COMPONENTS check to allow everything to be built - in the default case, when ACE_COMPONENTS isn't set. - Thanks to Carlos for noticing this. - - * netsvcs/Makefile,netsvcs/servers/Makefile: moved - netsvcs/server build suppression, when ACE_COMPONENTS - lacks Other, from netsvcs/Makefile to netsvcs/servers/Makefile. - - * examples/Naming/Makefile: suppress build if ACE_COMPONENTS - is defined and doesn't contain Other. - - * performance-tests/Misc/Makefile: don't build test_naming - if ACE_COMPONENTS is defined and doesn't contain Other. - - * ace/Log_Record.i (length): cast the long argument to ACE_UINT32, - to avoid warning message if long is greater than 4 bytes. - Thanks to Hao Ruan for reporting this. - -Tue Mar 9 20:56:35 1999 Carlos O'Ryan - - * include/makeinclude/rules.nested.GNU: - If the DIRS macro is not set we simply do not recurse. Before - this change we got an error from the shell. - - * bin/auto_compile: - If there are no errors then send a message when a warning was - detected during compilation. - -Tue Mar 09 15:15:19 1999 David L. Levine - - * bin/create_ace_build: check for ace/ and include/ directories - in top level directory, instead of ace/, examples/ and netsvcs/. - This allows use with trimmed-down workspaces. Thanks to Jeff - for suggesting this. - - * include/makeinclude/platform_chorus_ghs.GNU: added exceptions - make option support. Thanks to Wei Chiang for reporting that - it wasn't supported. - -Tue Mar 9 12:59:09 1999 Douglas C. Schmidt - - * docs/ACE-subsets.html: Updated the subsets to reflect what's - actually in the ACE Makefile. - - * ace/Message_Block.h: Changed the private section in both - ACE_Message_Block and ACE_Data_Block to protected allowing - derived classes to access data members of the parent class; - Thanks to Alexander Davidovich for suggesting - this. - - * ace/Message_Block: Added new reference counting accessor methods - to Message_Block and Data_Block. Thanks to Alexander Davidovich - for suggesting this. - -Tue Mar 09 11:21:49 1999 Nanbor Wang - - * ace/Message_Block.h: For some reason, default ctor and operator= - must be declared private instead of protected if they are not to - be accessable. Otherwise, VC complains. - -Tue Mar 09 01:06:44 1999 Douglas C. Schmidt - - * ACE version 4.6.27 released. - -Tue Mar 09 00:39:23 1999 Douglas C. Schmidt - - * ACE version 4.6.26 released. - -Mon Mar 08 23:23:35 1999 Nanbor Wang - - * ace/Thread_Manager.{h,cpp} (thread_within,hthread_within, - thread_grp_list,hthread_grp_list): Added new functions to - check if a thread is managed by the thread manager and collect - the thread ids/handles in a thread group. Thanks to XuYifeng - for motivating the addition. - -Mon Mar 08 22:23:33 1999 David L. Levine - - * ace/Makefile: added FOR_TAO short-cut to ACE_COMPONENTS. - If the ACE_COMPONENTS variable is set to FOR_TAO, then - only the components necessary to support TAO will be - built into libACE. - - * netsvcs/clients/Makefile: suppress build if Other - ACE_COMPONENT isn't built. - - * netsvcs/Makefile: suppress server build if Other and Token - ACE_COMPONENT aren't built. - -Mon Mar 8 17:35:04 1999 Gonzalo Diethelm - - * ace/NT_Service.cpp: - * ace/NT_Service.h: - Now the handle_control method calls separate protected virtual - methods to do its work. That way, it is easier to override what - must be done on each case, just by overriding one of the new - methods. - -Mon Mar 08 15:41:08 1999 Steve Huston - - * include/makeinclude/platform_hpux.GNU: Added -DACE_LACKS_PRAGMA_ONCE. - Thanks to Hao Ruan for reporting this. - - * README: Added Hao Ruan to the list of contributors. - -Mon Mar 08 12:27:54 1999 David L. Levine - - * ace/Service_Config.cpp (handle_signal): added ACE_UNUSED_ARG (sig) - if ACE_NDEBUG is defined, to avoid compilation warning about - unused argument with debug=0. - - * docs/ACE-subsets.html: added subset characterizations on - several platforms. - - * include/makeinclude/platform_sunos5_ghs.GNU: fixed AR and - ARFLAGS to use CC to build static libs. It looks like GreenHills - no longer supplies a separate archiver with 1.8.9. - -Mon Mar 08 11:58:03 1999 Nanbor Wang - - * ace/Task.cpp (activate): Made sure we don't mess with the passed - in grp_id if the task was not previously actived. Thanks to - XuYifeng for noticing this. - -Fri Mar 05 14:15:46 1999 David L. Levine - - * ace/OS.cpp (ACE_TSS_Cleanup (),free_all_keys_left ()): - with ACE_TSS_Emulation only, don't free the TSS key that - ACE_TSS_Cleanup uses internally for its in_use_ member. - The key doesn't get freed in ACE_OS::thr_key_detach (), - because that gets called during shutdown. So, - free_all_keys_left () would attempt to free it. But, - the dynamic memory associated with it had already been - deleted by ACE_TSS_Cleanup::exit (). And, there - aren't any other resources associated with it. So, - free_all_keys_left () can just skip over it. - - * ace/OS.cpp (cleanup_tss): disabled call to - free_all_keys_left () with ACE_HAS_TSS_EMULATION, because - we can't safely access the TSS values that were created by - the main thread. They were destroyed when the ACE_TSS_Cleanup - instance exit () function was called. There don't seem to - be any leaks if free_all_keys_left () isn't called, anyways. - -Fri Mar 5 11:05:04 1999 Nanbor Wang - - * examples/Log_Msg/Log_Msg.dsw: Fixed the path to Callback.dsp. - Thanks to Zoran Ivanovic for reporting - this. - - * performance-tests/Misc/Makefile: Removed test_guard from the - Makefile. This test requires having - ACE_USES_OBSOLETE_GUARD_CLASSES defined in order to compare - ACE_Guard to ACE_Thread_Mutex_Guard (obsolete). - - * ace/OS.h: Removed ACE_THREAD_GUARD*. - - * ace/config-psos-{diab,tm}.h: Removed - ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE. It is no longer - needed. - - * ace/Synch_T.{h,i}: One would assume compilers are smart enough - to treat _all_ in-class functions as inline. Not for template - member functions. This is true at least for SunCC, egcs, gcc, - and MSVC. These functions seems to impose extra overhead. - After removing the in-class definitions for ACE_Guard, the cost - of using ACE_Guard is now as good as using - ACE_Thread_Mutex_Guard (which, by the way, is depricated.) So, - there's no need for a ACE_THREAD_MUTEX_GUARD class. Afterall, - the "ACE Way[TM]" of defining inline functions is the "Right - Way[TM]". The motto of the change is, always put inline - functions in .i files (even for template specialization) - otherwise, they'll become regular functions. If you really need - to put function definitions within class definitions, mark - inline function explicitly. - - Thanks to Andy Marchewka for noticing the - performance differences between ACE_Thread_Mutex_Guard and (old) - ACE_Guard. - -Fri Mar 5 11:06:12 1999 Douglas C. Schmidt - - * ace/Svc_Conf.y: Always print out an error message when we - increment yyerror. Thanks to Ulf Jaehrig - for reporting this. - -Thu Mar 4 12:26:47 1999 Nanbor Wang - - * tests/Message_Queue_Notifications_Test.cpp (svc): Made increment - of thread-safe. - -Thu Mar 04 07:00:20 1999 David L. Levine - - * ace/config-aix-4.2.x.h: added ACE_LACKS_PRAGMA_ONCE - to xlC section. Thanks to Rainer Blome - for reporting this. - - * ace/config-osf1-4.0.h: added ACE_LACKS_PRAGMA_ONCE to - cxx section, with __DECCXX_VER < 60090010. This should - help avoid compilation warnings from cxx 5.x. Thanks - to Oliver M. Kellogg for - reporting this. - - * ACE-INSTALL.html: corrected name of ace/config-linux-lxpthreads.h. - Thanks to Barry Hoggard for reporting this. - - * tests/Makefile,Makefile.DLL: instead of always running a - recursive make to build libDLL_Test.so, only do that if it - needs to be built. And, added dependencies to Makefile.DLL. - - * ace/Makefile: commented out use of TEMPLATE_FILES. I don't - believe that it's needed. - - * ace/CLASSIX/Makefile: removed unused TEMPLATE_FILES and - LSRC2 macros, and gethrtime build rule. - - * docs/ACE-subsets.html: updated, and added documentation for - ACE_COMPONENTS and the ACE_OS adapation layer. - -Wed Mar 3 22:30:02 1999 James CE Johnson - - * ace/IOStream_T.{cpp|h|i}: Those last changes break (at least) - examples/IOStream/server. I'm backing them out and restoring - the 4.6.25 versions of these files until Chris can get back to - me about what's going on. - -Wed Mar 03 21:49:58 1999 David L. Levine - - * ace/OS.cpp (socket_init,socket_fini): replaced use of - cerr with ACE_OS::fprintf. - - * ace/OS.h: conditionally #include Object_Manager.h, only - if ACE_HAS_MINIMAL_ACE_OS is not defined. Merged main () - #defines for Unix/NT and WinCE, to ease maintenance. - - * ace/config-minimal.h: removed undef of - ACE_HAS_NONSTATIC_OBJECT_MANAGER, because OS.h now conditionally - #includes Object_Manager.h. Added ACE_MAIN_OBJECT_MANAGER #define, - to only instantiate the ACE_OS_Object_Manager. - - * ace/config-WinCE.h: added ACE_MAIN and ACE_MAIN_OBJECT_MANAGER - #defines, to support merging of the main () #defines in OS.h. - - * ace/OS.{h,cpp}: added ACE_OS_Object_Manager::starting_up () - and shutting_down (). (ACE_TSS_Cleanup::remove): replaced - use of ACE_Object_Manager::shutting_down () with - ACE_OS_Object_Manager::shutting_down (). Thanks to Irfan - for reporting that, otherwise, ace/Object_Manager.h had - to be #included by OS.cpp on NT, if ACE_NONSTATIC_OBJECT_MANAGER - wasn't #defined. - - * tests/Basic_Types_Test.cpp: hacked a bit to support building, - and running, with ACE_HAS_MINIMAL_ACE_OS. Don't look, - unless you want to forever ruin all of your good coding habits. - -Wed Mar 03 19:08:52 1999 Irfan Pyarali - - * ace/Map_T.h (ACE_Map): Further degraded my code to make it - compile with lame compilers ;-) This time it was the lame pSOS - diab compiler that could not recongnize a typedef in the base - template class. - -Wed Mar 03 11:31:00 1999 David L. Levine - - * docs/ACE-guidelines.html: added guideline to try to limit - the length of source code lines to less than 80 characters. - And, reverted to the previous version of the file. The - last version was apparently committed by mistake. - - * include/makeinclude/wrapper_macros.GNU (ACE_HAS_GNUG_PRE_2_8): - added support for eg++. Assume that it's egcs, and therefore - ACE_HAS_GNUG_PRE_2_8 is set to 0. Thanks to Russell L. Carter - for supplying a patch. - -Wed Mar 3 09:35:20 1999 Ossama Othman - - * ace/Memory_Pool.cpp (handle_signal): Added a check to see if the - current mapping is up to date so that faults caused by other - mappings will be passed on. Thanks to - Joseph Weihs for reporting this and for - providing a fix. - -Wed Mar 3 05:48:24 1999 Douglas C. Schmidt - - * ace/ACE.cpp (fork): Added an extra pair of parens within the - WIFE*() macros to work around GCC bugs. Thanks to Alexandre - Karev and Andre Folkers - for reporting this. - -Tue Mar 2 22:50:18 1999 Alexander Babu Arulanthu - - * ace/POSIX_Asynch_IO.h: - * ace/POSIX_Proactor.cpp: - Added forward declaration for ACE_Proactor_Impl. Using static cast - to down cast from to - . Thanks to John.Mulhern@lawson.com for - reporting the warnings in HP UX. - -Tue Mar 02 21:17:19 1999 David L. Levine - - * ace/OS.{h,cpp},Object_Manager.{h,cpp}: changed Object_Manager - state to be per-instance, instead of global. This makes - it easier to enforce startup and shutdown ordering, - regardless of whether the Object_Managers are static, - created on the stack of main (), or dynamically allocated. - - * ace/IOStream_T.h: fixed a couple more line breaks. - - * Makefile: added support for suppressing man page regeneration - on make release command line. - - * include/makeinclude/platform_osf1_4.0.GNU: added automated - support for warning 1136. It's only supported by cxx 6.2. - Thanks to James CE Johnson for reporting - this, and to Andrew Hobson for - diagnosing the problem. - - * ace/OS.i (thr_getspecific): added #else clause w/ACE_NOTSUP_RETURN - to support ACE_HAS_MINIMAL_ACE_OS. - - * ace/config-minimal.h: added #undef of - ACE_HAS_NONSTATIC_OBJECT_MANAGER, to avoid #include of - Object_Manager.h. And, added #define ACE_USE_THREAD_MANAGER_ADAPTER - so that ACE_Thread_Adapter::invoke () won't use any - ACE_Thread_Exit functions. - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): removed - ACE_HAS_MINIMAL_ACE_OS conditional compilation, because - config-minimal.h now #defines ACE_USE_THREAD_MANAGER_ADAPTER. - And, added #else clauses to three TSS-related functions. - -Tue Mar 02 14:43:29 1999 Steve Huston - - * ace/Map_T.(h i): Qualified types inherited from template base - classes; qualified with ACE_TYPENAME where needed. Now aC++ - is happy. - - * ace/config-hpux-10.x-hpc++.h: Added ACE_HAS_TYPENAME_KEYWORD for - aC++. - - * tests/DLL_Test.cpp: Enable on HP-UX. Generalize the library - prefix/suffix with the platform definitions from OS.h. - -Tue Mar 2 12:41:00 1999 Chris Gill - - * ace/IOStream_T.{cpp, h}: Fixed some line breaks that were - inadvertently introduced when these files were last checked in. - -Tue Mar 2 10:54:16 1999 Nanbor Wang - - * Cache_{Hash,Heap}_T.{h,cpp}: - * Cache_Manager[_T].{h,cpp}: - * Cache_Object.cpp: - * Hash_Bucket_T.{h,cpp}: Fixed erroneous include directives. - Thanks to Christian.Destor@alcatel.fr for reporting this. - -Tue Mar 2 10:33:47 1999 James CE Johnson - - * ace/IOStream_T.{cpp|h|i}: Christopher Healey - noticed occasional core dumps from - ~ACE_IOStream on heavily loaded systems. It turns out that - streambuf_ was being deleted out from under the object. These - three files include his patches for this problem. - -Tue Mar 2 02:28:54 1999 Nanbor Wang - - * ace/CDR_Stream.h (do_byte_swap): This accessor function should - be public accessible. Otherwise it's useless. Reorder class - declaration so the protected members appear before private - members/functions. - -Mon Mar 1 23:26:41 1999 Kirthika Parameswaran - - * tests/DLL_Test.cpp (ACE_HAS_SVR4_DYNAMIC_LINKING): - Added this check to prevent this test from being run - separately. - -Mon Mar 01 17:02:48 1999 David L. Levine - - * ACE version 4.6.25 released. - -Mon Mar 01 16:54:02 1999 David L. Levine - - * ace/OS.cpp,Object_Manager.cpp: fixed ObjMan state logic to - ensure that the ACE_Object_Manager is fini'd before the - ACE_OS_Object_Manager, even when both are static objects. - Thanks to Carlos for reporting this problem. - -Mon Mar 01 14:05:46 1999 David L. Levine - - * ACE version 4.6.24 released. - -Mon Mar 01 13:04:53 1999 David L. Levine - - * ace/OS.*,Object_Manager.{h,cpp},ACE.cpp: added class - ACE_OS_Object_Manager. It manages the three preallocated - locks that ACE_OS uses. Many thanks to Nanbor for - suggesting the scheme to avoid dependency on Synch_T.h - for the ACE_Guard instantiations: OS.cpp now has a - couple of lightweight guards for its internal use. - - * ace/ACE.{i,cpp},OS.*: moved ACE::strecpy () and - ACE::unique_name () from class ACE to ACE_OS. That - allows ACE_OS to be self-contained. The ACE versions - were left for backward compatibility; they now just - wrap the ACE_OS versions. - - With these changes, a stand-alone ACE OS adaptation layer - can now be built. The ace/config-minimal.h config file - should be included in ace/config.h if you want to build - the ACE OS adaptation layer. - - Two deficiencies remain with the ACE OS adaptation layer: - the dependencies on ACE_Log_Msg have been conditionally - compiled out by config-minimal.h. Similarly, there is - a conditional dependency of ACE_Thread_Adapter::invoke () - on ACE_Thread_Exit. It would probably be best to move - that to ACE Thread_Manager, if possible. - - * ace/config-minimal.h: suppress ACE_HAS_TSS_EMUATION, because - it requires other ACE headers to be #included. - - * ace/Synch.{i,cpp} (~ACE_Recursive_Thread_Mutex): added - a call to this->remove (). Without it, the mutex wasn't - being destroyed. Uninlined both the destructor to avoid - code bloat if there are multiple returns in a function - that instantiates an ACE_Recursive_Thread_Mutex locally. - And, uninlined the remove () function, to save code space, - because it's non-trivial and not expected to be time critical. - -Sun Feb 28 20:21:05 1999 Kirthika Parameswaran - - * tests/Makefile.DLL (realclean): Added the realclean target to - the makefile. - - * tests/run_tests.sh (ace_version): Disabled DLL_Test for chorus, - LynxOS, Unicos platforms as they dont support shared libraries. - -Sun Feb 28 20:08:54 1999 Alexander Babu Arulanthu - - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Asynch_IO.h: - * ace/POSIX_Asynch_IO.cpp: - Fixed to pass wherever is being - passed, since it is ok to pass the derived class pointer in place of - base class pointer. - Defined the fields and in - so that they can be used instead of - and . Because and - fields are not supported on HP yet. - -Sun Feb 28 14:22:38 1999 David L. Levine - - * include/makeinclude/platform_linux_kcc.GNU: added - -D_GNU_SOURCE to CFLAGS, because it's needed with - glibc 2.1. It can't go into the config file, because - it needs to be #defined before the #include of - features.h. But, features.h #defines the glibc version. - Thanks to Ben Eng for reporting this. - - * ace/config-minimal.h: disable ACE_ASSERT, ACE_DEBUG, and ACE_ERROR. - -Sun Feb 28 12:57:53 1999 Nanbor Wang - - * ace/Thread_Manager.cpp (terminate): The condition for handling - joining thread was wrong. Thanks to Terry Rosenbaum - for reporting the bug. - -Sun Feb 28 08:37:44 1999 David L. Levine - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): replaced call - to ACE_Thread::self () with call to ACE_OS::thr_self (), - so that we don't need to #include ace/Thread.h. Thanks - to Russ Noseworthy for reporting this. - -Sat Feb 27 17:25:52 1999 David L. Levine - - * ace/Makefile: updated dependencies. They didn't have - any .shobj dependencies, just .obj. - - * tests/Makefile: ran make depend. It didn't have any - dependencies. - - * include/makeinclude/platform_linux_kcc.GNU: added note that - evaluation copies of KCC might come with libraries that were - built with exception handling support. To use them, ACE must be - built with exception handling support - (exceptions=1). Thanks to John Lindal - for reporting this. - - Also, added support for the exceptions make flag. - -Sat Feb 27 13:31:17 1999 Douglas C. Schmidt - - * ace/OS.i: Fixed the remaining problems with ACE_OSCALL_RETURN - macro usage for sem_wait(), sem_post(), and sem_trywait(). - Thanks to David Levine for reporting this. - - * ace/OS.h: Added a set of ACE_THREAD_GUARD macros that use - ACE_Thread_Mutex_Guard. These seem to be faster on many - platforms than the ACE_Guard. Thanks to - Andy Marchewka for reporting this. - - * ace/Dump.cpp: Moved the explicit template instantiation of - ACE_Guard out of dump and put it into - Synch.cpp, where it's with the other instantiations. - -Fri Feb 26 23:58:46 1999 Jeff Parsons - - * ace/CDR_Stream.{h,i,cpp}: - Added some read- and write-pointer alignment - functions, as proposed by Carlos. Also deleted some - ACE_OutputCDR members that weren't being used. - Checked the build on NT and suncc. Must come up with - some kind of test for these new functions. - -Fri Feb 26 21:56:05 1999 David L. Levine - - * ace/Makefile: moved ACE_COMPONENTS to after include - of wrapper_macros.GNU, so that users can set it in - their platform_macros.GNU. Also, added ACE_LACKS_ACE_OTHER - to CFLAGS if Other ACE_COMPONENT is not built. - -Fri Feb 26 17:48:32 1999 Steve Huston - - * include/makeinclude/platform_hpux_aCC.GNU: Added OCFLAGS - value for optimize=1 builds; added support for distrib=1 - builds to build for off-site distribution. - -Fri Feb 26 12:38:00 1999 David L. Levine - - * ace/OS.cpp: added #include "ace/Thread_Manager.h" on - WIN32, for ACE_Thread_Descriptor declaration. Thanks - to Barry Hoggard for reporting this. - - * ace/Managed_Object.h: fixed comments in description. - -Fri Feb 26 11:56:08 1999 Ossama Othman - - * ace/Log_Priority.h (ACE_Log_Priority): Removed all references to - ACE_HAS_BROKEN_ENUMS since it has been deprecated (see David's - ChangeLog entries from Feb 5). - -Fri Feb 26 11:09:47 1999 Ossama Othman - - * ace/OS.i (sema_destroy): ACE_OSCALL and ACE_OSCALL_RETURN macro - calls for sem_destroy, sem_unlink and sem_close had too few - arguments. Added the missing arguments for the macros. - -Fri Feb 26 10:59:45 1999 Alexander Babu Arulanthu - - * examples/Reactor/WFMO_Reactor/test_talker.cpp (main): Fixed to - use the new proactor interface. - -Thu Feb 25 22:17:58 1999 David L. Levine - - * ace/OS.cpp (spa, for VxWorks only): updated comment about - ::sp () default values, and added comments for each argument - to ::taskSpawn (). Thanks to Tad Jarosinski - for asking about spa (). - -Thu Feb 25 20:10:06 1999 Ossama Othman - - * ace/Synch.h: - * ace/Synch.i: - * ace/Synch_T.h: - - Added an ACE_Null_Semaphore class. Thanks to Irfan for his guidance - on this. Also fixed ACE_SYNCH_SEMAPHORE to be ACE_Null_Semaphore - when ACE is built without thread support. - -Thu Feb 25 18:37:27 1999 Irfan Pyarali - - * ace/WFMO_Reactor (cancel_wakeup and masks_ops): Fixed the - cancel_wakeup() method. It was doing too much, i.e., if the - masks were reduced to null, it was removing the event handler - entry. The new version behaves more like the Select Reactor in - that it simply plays with the masks without removing the event - handler. - - Also, implemented the mask_ops() operation. - - Thanks to Douglas C. Schmidt and Zoran - Ivanovic for helping in pinpointing the - problem. - - * ace/Service_Config.cpp (fini_svcs and close): Since the reactor - and proactor singletons potentially call user code (in - handle_close()), we must shut them down *before* the log msg is - destroyed. Therefore, moved the close_singletons() call from - close() to fini_svcs(). - - * ace/Select_Reactor_Base.cpp (bit_ops): Since we return the old - masks everytime, find the old reactor masks at the start of the - method. This automatically does the work of the GET_MASK - operation. - - * ace/Proactor.cpp: Added #include "ace/Object_Manager.h" - - * examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp: - handle_close() was getting called twice; changed code to prevent - double deletion. - - * examples/Reactor/WFMO_Reactor/test_handle_close.cpp: Added the - ability to cancel reads, change masks, and check for existing - reactor masks. - -Thu Feb 25 17:35:10 1999 Kirthika Parameswaran - - * tests/DLL_Test.cpp: - Changed the OBJ_SUFFIX to ".so" as on Linux the .o file cannot - be a shared object. Also the OBJ_PREFIX is now "./lib" for - non-Win32 platforms. - * tests/Makefile: - Additional option DLL_TEST added so that a .so can be produced - for DLL_Test. - * tests/Makefile.DLL: - This is the makefile which produces libDLL_Test.so for DLL_Test. - -Wed Feb 24 23:47:22 1999 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_proactor.cpp: - * ace/WIN32_Asynch_IO.h: - * ace/Proactor.cpp: - * ace/WIN32_Proactor.cpp: - * ace/Proactor.h: - * ace/Proactor_Impl.h: - * ace/POSIX_Proactor.h: - Changed the return values of the API to - return -1 on error, 0 on timeout, 1 on success. This has been done so - that it looks like the . Previously - was returning -1 on error, 0 on success - and 0 on timeout also. - - Fixed the and - to do indefinite blocking when - ACE_INFINITE is passed. is used instead of - . - - Renamed the class to more appropriate - . - -Wed Feb 24 22:08:50 1999 Douglas C. Schmidt - - * ace/OS.i: Fixed all the sem_* calls so that they no longer use - the ACE_ADAPT_RETVAL() macro, which was broken since these calls - all return -1 on failure. Thanks to John E. Bossom - for reporting this. - -Wed Feb 24 17:40:49 1999 James CE Johnson - - * docs/tutorials/combine: - * docs/tutorials/colorize: - A few enhancements to make the colorization better. Also, when - #include "ace/something.h" is seen by the colorizer, it will - create a link to ../../../ace/something.h. That should give - direct links from the tutorial pages to the ACE headers. - -Wed Feb 24 16:56:51 1999 James CE Johnson - - * docs/tutorials/017/barrier2.cpp: Added this to show how you can - change the thread count while threads are still active. - - * docs/tutorials/017/*.html: Regenerated due to the new file. - - * docs/tutorials/018/*.html: Added Kirthika's abstract & - regenerated. - - * docs/tutorials/018/token.cpp: Typo in the comments... - -Wed Feb 24 14:57:10 1999 Nanbor Wang - - * ace/OS.h (ASYS_ONLY_WIDE_STRING): New UNICODE macros to convert - char* to wchar* when UNICODE is defined but not on CE. - - * ace/Service_Config.cpp (parse_args): Convert getopt.optarg using - ASYS_ONLY_WIDE_STRING. - -Wed Feb 24 13:54:15 1999 David L. Levine - - * ace/config-minimal.h: changed #include protection to - ACE_CONFIG_MINIMAL_H, so that this config can be #included - by others. - - * ace/OS.{h,cpp},Thread_Manager.h: moved ACE_Thread_Control and - ACE_Thread_Exit class definitions from Thread_Manager.h to OS.h, - so that Task.h no longer needs to be #included by OS.cpp. - - * ace/OS.cpp: protected #include of Containers_T.h with - defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION). - -Wed Feb 24 05:30:59 1999 Douglas C. Schmidt - - * ace/Message_Queue_T.i (dequeue): Replaced the improper - self-recursive call to dequeue() with dequeue_head(). Thanks to - Marc Engel for reporting this. - -Tue Feb 23 20:58:17 1999 Douglas C. Schmidt - - * ace/OS.i: Make sure to do the right thang if we're compiling the - ACE recursive thread mutexes on platforms that lack threading. - - * ace/Service_Object: Added a new ACE_Service_Object constructor - that takes an ACE_Reactor * and passes this down to the - ACE_Event_Handler base class. - - * ace/Event_Handler: Added a new ACE_Event_Handler constructor - that takes an ACE_Reactor * and an int priority that default to - the right values. - -Tue Feb 23 21:53:32 1999 David L. Levine - - * ace/OS.h,README: added ACE_HAS_MINIMAL_ACE_OS support. - - * ace/config-minimal.h: added this config file. It defines - ACE_HAS_MINIMAL_ACE_OS. It is designed to build only - the minimal ACE_OS adaptation layer. - -Tue Feb 23 20:28:45 1999 Marina Spivak - - * ace/SString.{h,i,cpp}: Added a private member to the - ACE_CString class to keep track of the size of data buffer, and - avoid unnecessary memory reallocations. Updated class methods - to use buf_len_. - -Tue Feb 23 19:54:55 1999 Alexander Babu Arulanthu - - * ace/POSIX_Asynch_IO.h: - * ace/POSIX_Asynch_IO.cpp: - Fixed the potential dominance warnings in POSIX - implementation. Updated the documentation. - -Tue Feb 23 18:11:11 1999 Kirthika Parameswaran - - * examples/DLL/DLL.dsw: - examples/DLL/Main.dsp: - examples/DLL/Newsweek.dsp: - examples/DLL/Today.dsp: - Added extra include and linker options to the projects. - - * tests/DLL_Test: - Added OBJ_PREFIX to cater to the problem which arose due to the fact - that the .o is produced under the .obj directory on SunOS. - - * tests/run_tests.sh: - tests/run_tests.bat: - Made an entry for DLL_Test. - -Tue Feb 23 16:54:33 1999 Irfan Pyarali - - * ace/OS.i (recursive_mutex_trylock and recursive_mutex_lock): - Removed the "abandoned" versions of these routines. Abandoned - mutexes are only supported for process mutexes, but not for - thread mutexes. - -Tue Feb 23 15:50:40 1999 Alexander Babu Arulanthu - - * ace/Proactor.cpp: - * ace/Proactor.h: - * ace/Proactor_Impl.h: - * ace/POSIX_Proactor.h: - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Asynch_IO.h: - * ace/POSIX_Asynch_IO.cpp: - * ace/WIN32_Proactor.cpp: - Implemented for POSIX platforms. Thanks to Irfan - for the cool design. This API has been changed a little bit for - portability. API now exists at - class. To post completions, users will have - to get hold of an class (either get it from - the predefined factory methods at the Proactor or derive from - or , then call - on it passing in the which can - be got through method in the . - The need for RTTI has been avioded in this design. - -Tue Feb 23 15:19:33 1999 Steve Huston - - * ace/NT_Service.(h cpp): Added two new methods: - state (DWORD *, ACE_Time_Value * = 0) as an alternate way to get the - service's state, with definite indication of error. Also changed - comments on the other state() method to clarify the return value. - test_access (DWORD) tests caller's access to the service. - Thanks to Martin Krumpolec for these ideas and - suggestions! - -Tue Feb 23 14:12:52 1999 Irfan Pyarali - - * ace/Active_Map_Manager_T.h (npos): Added a new static member - function that returns a key that cannot be found in the map. - Thanks to Fernando D. Mato Mira for - suggesting this. - -Tue Feb 23 12:15:09 1999 Nanbor Wang - - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: - * ace/Parse_Node.cpp (symbol): - * ace/OS.cpp (fork_exec): - * ace/INET_Addr.cpp (ACE_INET_Addr): More Unicode fixes. - -Tue Feb 23 12:00:21 1999 Steve Huston - - * examples/NT_Service/main.cpp: Allow -i option without a value, and - default to AUTO_START. Also, added a README file to explain how to - use the program. Thanks to Zoran Ivanovic for - the change and the README file! - -Mon Feb 22 22:03:47 1999 Nanbor Wang - - * bin/auto_compile_win32.pl: Perl script for compiling all the - million different config. combination on Win32. Hey, it also - works on Alpha. Thanks to Darrell Brunsch for testing it on - Alpha/NT. - - * ace/ace_{dll,lib}.dsp: Fixed broken project settings. - -Mon Feb 22 21:56:27 1999 David L. Levine - - * ace/Sched_Params.cpp: removed #include of ACE.h because it's - not necessary. - - * ace/Makefile: added ACE_COMPONENTS default definition. - Moved Sched_Params from THREADS_FILES to OS_FILES because - OS.cpp needs it. It only contributes 172 bytes to libACE - on VxWorks and 248 on LynxOS. - -Sun Feb 21 18:52:17 1999 Douglas C. Schmidt - - * ACE version 4.6.23 released. - -Sun Feb 21 08:46:09 1999 David L. Levine - - * ace/OS.i (recursive_mutex_{init,lock,trylock}: added some - ACE_UNUSED_ARGS. - - * ace/OS.{i,cpp} (cond_*): uninlined the ACE_OS:cond_* function - versions with ACE_LACKS_COND_T. Most are too big to be - good candidates for inlining. And the others cause use-before- - definition problems in OS.i. - -Sun Feb 21 00:17:58 1999 Darrell Brunsch - - * websvcs/lib/URL_Addr.i: Can now copy null Addrs. Also added - hash function implementation. - - * websvcs/lib URL_Addr.h: Added hash function. - - * websvcs/lib/URL_Addr.cpp: Fixed a bug with - ACE_HTTP_Addr::create_relative_address and urls beginning with - "/". It used to copy the first '/', which wasn't needed. - -Sat Feb 20 15:39:16 1999 David L. Levine - - * ace/OS.{h,cpp},Object_Manager.{h,cpp}: changed ACE_OS::exit () - to call an exit hook that is registered by the ACE_Object_Manager, - instead of directly calling ACE_Object_Manager::fini (). - - * ace/OS.i (thr_self): moved definitions to before first use. - -Sat Feb 20 11:50:30 1999 Nanbor Wang - - * ace/OS.i (thr_equal): Moved the body of ACE_OS::thr_equal before - recursive_mutex methods to avoid "function redefined as inline" - problem. Thanks to David Levine for reporting this. - -Sat Feb 20 09:05:20 1999 Douglas C. Schmidt - - * ace/OS.cpp: Changed the ACE_static_cast() in ACE_OS_Wstring to - first use an ACE_const_cast(). Thanks to Andy Gokhale for - reporting this. - -Sat Feb 20 02:53:38 1999 Nanbor Wang - - * ace/OS.cpp (ACE_OS_WString): Need to add a statis cast when - converting from wchar to char to eliminate a warning from Win98. - - * ace/config-win32-common.h: Do not check for library type on CE. - - * ace/config-WinCE.h: Defined ACE_HAS_WINCE as 1. - -Fri Feb 19 22:54:18 1999 Carlos O'Ryan - - * ace/OS.h: - Fixed the return types for ACE_OS_WString and ACE_OS_CString - assignment operators, even though they are not defined they - should be declared to return something, otherwise egcs give us a - ton of warnings. - -Fri Feb 19 21:02:49 1999 Douglas C. Schmidt - - * ace/config-win32-common.h: #define'd ACE_HAS_RECURSIVE_MUTEXES - for Win32. - - * ace/OS.cpp: Removed the SString.h dependency in OS.cpp! - -Fri Feb 19 21:44:31 1999 Darrell Brunsch - - * ace/OS.i: Was using two many arguments to thread_mutex_lock () - and ACE_OS::thread_mutex_trylock (). - - * ace/Synch.i: Typo in comment - -Fri Feb 19 18:18:13 1999 Nanbor Wang - - * ace/OS.{h,i,cpp}: Added ACE_OS_WString and ACE_OS_CString which - should only be used within ACE_OS to perform conversion between - wchar strings and char string. - Changed the wide/multibyte conversion macros to use - ACE_OS_?String classes and removed dependencies to Auto_Ptr.h - and SString.h. - - * ace/config-win32-common.h: Removed checked for (_DLL) if - ACE_HAS_DLL = 0. Otherwise, the static build won't compile. - - * ace/Token_Manager.cpp (release_token): - * ace/Service_Manager.cpp (list_services): Changed - ASYS_MULTIBYTE_STRING to ASYS_ONLY_MULTIBYTE_STRING. Because - the new conversion classes have stronger type checking, these - errors weren't found until now. - -Fri Feb 19 17:01:08 1999 David L. Levine - - * ace/Makefile: moved ACE from OS_FILES to UTILS_FILES. - -Fri Feb 19 15:44:23 1999 Douglas C. Schmidt - - * ace/OS, - ace/Synch: Moved the implementation of the - ACE_Recursive_Thread_Mutex from the Synch.* files to - the OS.* files in order to reduce coupling in OS.* and - other parts of ACE. - -Fri Feb 19 12:36:43 1999 Carlos O'Ryan - - * ace/OS.i: - Fixed missing ACE_INLINE for ACE_OS::strenvdup() - -Fri Feb 19 11:35:57 1999 Steve Huston - - * include/makeinclude/platform_sunos5_sunc++.GNU: Added new option - "distrib". If you do a "make distrib=1" the -R options won't be - given when linking, which produces dynamic load records requiring - objects/libraries in standard places, or use of LD_LIBRARY_PATH. - The default is distrib=0, which is the existing behavior. - -Fri Feb 19 11:22:48 1999 Nanbor Wang - - * ace/OS.cpp (open): Don't call CreateFileA with FILE_SHARE_DELETE - when compiled on Win95 because it doesn't support the flag. The - implication of this change is that unlink before close will not - work on Win95. So programs that are targeted to both NT and - Win95 cannot depend on it. Thanks to Rod Joseph - for reporting the bug. - -Thu Feb 18 21:10:45 1999 Douglas C. Schmidt - - * ace/OS.cpp (string_to_argv): We no longer have to special case - for WinCE since this logic has been moved into - ACE_OS::strenvdup(). - - * ace/ACE.cpp: Implemented ACE::strenvdup() using - ACE_OS::strenvdup(). - - * ace/OS: Move the implementation of strenvdup() from ACE to - ACE_OS to remove another dependency from the OS wrappers. - - * ace/ARGV.cpp: Rewrote the ACE_ARGV::string_to_argv() and - ACE_ARGV::argv_to_string() methods to use the new - ACE_OS::string_to_argv() and ACE_OS::argv_to_string(). - - * ace/OS.h: Added string_to_argv() and argv_to_string() methods to - ACE_OS to remove the dependency on ACE_ARGV. - -Thu Feb 18 19:21:03 1999 James CE Johnson - - * docs/tutorials/005/client_handler.cpp: Replaced the leading '_' - in the open() method so that we can cast _acceptor to acceptor. - -Thu Feb 18 14:12:28 1999 Nanbor Wang - - * netsvcs/clients/Naming/Client/svc.conf: Changed to start up - ACE_Naming_Context as dynamic service. Thanks to Darren - Whobrey for reporting this problem. - - * ace/Name_Proxy.cpp (open): The timeout value was set upp - ACE_Time_Value::zero accidentally when we want blocking - connect. Thanks to Darren Whobrey for - reporting the bug. - - * ace/CDR_Stream.{h,i} (ACE_InputCDR::do_byte_swap): Added - accessor function for Flick. - - * ace/CORBA_macros.h (ACE_THROW_INT): This should return a new - instance of the exception. Thanks to Andy for pointing this - out. - -Wed Feb 17 16:40:56 1999 Nanbor Wang - - * ace/OS.h (ACE_NEW_THROW_EX): A new ACE_NEW_THROW macro which - makes ACE_NEW_THROW_EX behave like a exception-throwing - function. I.e., you need to follow ACE_NEW_THOW_EX with - appropriate ACE_CHECK* macros. The use of ACE_NEW_THROW, - ACE_NEW_THROW_RETURN, ACE_NEW_TRY_THROW are deprecated. - - * docs/exceptions.html: Added documentation for - ACE_DECLARE_NEW_CORBA_ENV. - - * ace/config-WinCE.h: Automatically define ACE_HAS_WINCE if it is - not already defined. - - * ace/Synch.cpp: I had to shuffle the location of .i file around - to avoid a warning from SH compiler for CE. - - * ace/config-win32-common.h: Disabled checking for DLL run-time, - WIN32, and multi-threaded run-time on Windows CE. - - * ace/CORBA_macros.h (ACE_DECLARE_NEW_CORBA_ENV): Added this macro - for declaring a new CORBA_Environment called ACE_TRY_ENV. - ACE_TRY_NEW_ENV should now be avoided because it won't work if - multiple try blocks are needed in the top-most functions. - Instead, you can use the new macro to define the environment - variable and use ACE_TRY/ACE_TRY_EX as usually. This is even - more intuitive than ACE_TRY_NEW_ENV. ;) Thanks to Andy for - reporting the problem. - -Wed Feb 17 10:44:29 1999 Alexander Babu Arulanthu - - * examples/Reactor/Proactor/test_proactor.dsp: - * examples/Reactor/Proactor/test_proactor.cpp: - * examples/Reactor/Proactor/Makefile: - rtagged these files with "new_proactor" - -Tue Feb 16 17:08:53 1999 Steve Huston - - * examples/ASX/Event_Server/Transceiver: Moved Event_Transceiver - class definition to new file, transceiver.h, to build ok on AIX (P15) - and fixed core dump if ctor fails to connect. - - * examples/Connection/misc: Moved some class definitions from - test_upipe.cpp to new file test_upipe.h to build ok on AIX (P17). - Same thing with Connection_Handler - new file Connection_Handler.h. - - * examples/Connection/misc/Makefile: Clean out tempinc directory - between program compiles so AIX xlC doesn't freak out. - -Tue Feb 16 16:42:23 1999 Nanbor Wang - - * ace/CORBA_macros.h (ACE_PRINT_EXCEPTION): A new macro that deal - with printing out the exception for debugging. Thanks to Lothar - Werzinger for suggesting this. - - * docs/exceptions.html: Added documentation for the new macro - ACE_PRINT_EXCEPTION. Since there's no portable way to print out - the content of a CORBA_Exception, we use this macro to deal with - differences among various ORB implementations. This macro is - user definable. - - Thanks to Eric Covington for figuring out the - following. - - * ace/ace_ce_dll.dsp: Added Functor.cpp and Message_Queue.cpp. - - * ace/High_Res_Timer.cpp (dump): Fixed Unicode problem. - - * ace/OS.i (truncate): WinCE does not have char* version of - truncate. - -Tue Feb 16 00:39:35 1999 Alexander Babu Arulanthu - * ace/ace_dll.dsp: - * examples/Reactor/Proactor/test_proactor.dsp: - * examples/Reactor/Proactor/test_proactor.cpp: - Updated the files. - * ace/WIN32_Asynch_IO.h: - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Asynch_IO.i: - Added the files - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Updated these files - * examples/Reactor/Proactor/Makefile: - New make file which also compiles the test_aiosig_ace.cpp - program. - * ace/POSIX_Asynch_IO.i: - Added the file. - - - rTagged the ACE_wrappers repository with - After the following changes rtagged the repository with - - - * ace/ - Proactor.h - Asynch_IO.cpp - Asynch_IO.h - Makefile - Proactor.cpp - Proactor.h - config-lynxos.h - config-sunos5.6.h - config-sunos5.7.h - POSIX_Asynch_IO.{h,CPP} - POSIX_Proactor.{h,cpp} - WIN32_Asynch_IO.{h,cpp} - Asynch_IO_Impl.{h,cpp,i} - Proactor_Impl.h - Applied Bridge pattern to the POSIX implementation of the Proactor - code. ACE_POSIX_AIOCB_Proactor works fine on Solaris - 2.6. ACE_POSIX_SIG_Proactor works on LynxOS. Take a look at the tests - at the $(ACE_ROOT)/examples/Reactor/Proactor/ and the README. - - * tests/ - Aio_Platform_Test.cpp - *examples/Reactor/Proactor/: - test_proactor.cpp - test_aiocb.cpp - test_aiosig.cpp - test_aiosig_ace.cpp - README - Test files for testing out the platforms. - -Mon Feb 15 13:17:15 1999 Douglas C. Schmidt - - * ACE version 4.6.22 released. - -Sun Feb 14 15:25:27 1999 Ossama Othman - - * ACE-configuration.txt: - * ACE.ifnames: - * acconfig.h: - * ace-config.in: - * ace-diff-config.in: - * acinclude.m4: - * aclocal.m4: - * config.guess: - * config.sub: - * configure: - * configure.in: - * install-sh: - * libtool: - * ltconfig: - * ltmain.sh: - * missing: - * mkinstalldirs: - * ace/config.h.in: - - Started to introduce the work done by the ACE Configuration - Project into the official ACE distribution. - - To help speed development, the work being done by the ACE - Configuration Project is being slowly introduced into the official - ACE distribution. Some of the functionality in the work created by - the ACE Configuration Project has been removed so that ACE may be - built in the usual fashion. Once the ACE Configuration Project - work stabilizes on more platforms that removed functionality may be - added to ACE. - - Currently the configure script contains most of the tests that are - necessary to properly configure ACE on most platforms. However, - there are still some autoconf tests that are missing. As such, you - may encounter and most likely will have compilation problems. - - The `configure' script that is currently being used has been - modified from the ACE Configuration Project's `configure' script to - prevent makefiles from being automatically generated since there are - still some issues that must be addressed before automatically - generated makefiles are incorporated into the official ACE - distribution. - -Sun Feb 14 14:09:11 1999 James CE Johnson - - * docs/tutorials/015/server.cpp (main): Force the singleton to use - the Select Reactor instead of the OS-default. This should fix the - problem this tutorial has on Win32 due to blocking vs non-blocking - socket configuration. - - * docs/tutorials/015/Protocol_Task.h : Removed the ability to - activate this task. The code is now a little simpler and less - likely to behave in unpredicatable ways. - - * docs/tutorials/015/* : A few typos fixed but mostly fallout from - removing the ability to activate the Protocol_Task. - - * docs/tutorials/016/page01.html : Added Kirthika's abstract. - - * docs/tutorials/016/condition.cpp : Made max_threads_ a - non-static member variable that is set by open(). - - * docs/tutorials/017/page01.html : Added Kirthika's abstract. - -Sun Feb 14 12:47:03 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - Minor cosmetic changes, mostly trailing spaces. - -Sat Feb 13 22:06:17 1999 Nanbor Wang - - The following changes are based on the patch Eric Covington - submitted. Thanks very much to Eric for - bringing ACE/CE up-to-date. - - * ace/ace_ce_dll.dsp: Updated. - - * ace/OS.cpp: (open): CE doesn't support opening files with - attribute FILE_SHARE_DELETE. - - * ace/OS.i (abort): CE doesn't support abort. - - * ace/Stats.cpp (print_summary): CE doesn't support strerror. - - * ace/Stats.i (dump): Changed to use ACE_DEBUG. - - * tests/Thread_Manager_Test.cpp (main): - * ace/tests/SOCK_Connector_Test.cpp (find_another_host): - * ace/Log_Msg.cpp (log): - * ace/INET_Addr.cpp (addr_to_string): Fixed Unicode problems. - -Fri Feb 12 16:14:47 1999 Douglas C. Schmidt - - * ace/Remote_Tokens.cpp: Replaced the typedef for - ACE_TSS_CONNECTION_MUTEX with #define ACE_TSS_CONNECTION_MUTEX. - Thanks to Arturo for reporting this. - -Fri Feb 12 18:41:22 1999 Steve Huston - - * ace/SString.cpp: Added "ace/" to #include "Auto_Ptr.h" to conform - to conding guidelines. - -Fri Feb 12 17:16:17 1999 David L. Levine - - * tests/run_tests.vxworks: commented out Message_Queue_Test and - Timeprobe_Test, because they lockup the machine. And, - fixed string length of DLL_Test printout. - -Fri Feb 12 17:06:30 1999 Arturo Montes - - * ace/config-sco-5.0.0-CC-fsu-pthread.h: removed this config - file, because it's not used. - -Fri Feb 12 16:36:55 1999 Nanbor Wang - - * ace/SOCK_IO.{h,i,cpp} (send,recv): Added back the iovec version - of send/recv back to maintain backward compatibility. Thanks to - Steve for pointing this out. - -Fri Feb 12 15:37:10 1999 David L. Levine - - * ace/Makefile: split FILES up into subsets. See - docs/ACE-subsets.html for more information. - -Fri Feb 12 12:31:29 1999 Ossama Othman - - * ace/Makefile: Removed blank line that was added when troubleshooting - the cvs log problem. The extra line cause Digital Unix's make to - complain about a missing separator. - -Fri Feb 12 09:19:21 1999 David L. Levine - - * ace/config-sunos5.5.h: added ACE_HAS_STANDARD_CPP_LIBRARY and - ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB #defines with Sun CC 5.0. - Thanks to Diethard Ohrt for - providing these. - -Thu Feb 11 15:05:42 1999 Darrell Brunsch - - * ACE-INSTALL.html: Reworded the first step of the Windows - NT installation to be a bit clearer. - -Thu Feb 11 14:30:35 1999 Darrell Brunsch - - * ace/ace_dll.dsp: Fixed Alpha Configuration. - -Thu Feb 11 03:48:50 1999 Nanbor Wang - - * ace/CORBA_macros.h: Added #pragma once and ACE_CORBA_MACROS_H to - prevent duplicate inclusion of this file. - - Added a new macro ACE_ANY_EXCEPTION to denote the name of the - CORBA exception caught by the ACE_CATCHANY. Thanks to Lothar - Werzinger for suggesting this. - -Wed Feb 10 23:01:16 1999 Darrell Brunsch - - * ace/config-win32-common.h: Made a better effort at finding out - if the files are compiled against the correct run-time - libraries. Now _DLL is checked to see if it is defined for - ACE_HAS_DLL != 0 builds, and if it is not defined for static - builds. - - This should help diagnose the problem of not using (Debug) - Multithreaded DLL run-time libraries in clients that use DLL - versions of ace (one symptom of this mistake is errno not - working correctly because of one copy being defined in the DLL - and one in the program itself). - -Wed Feb 10 22:19:33 1999 James CE Johnson - - * docs/tutorials/014/stream.cpp : Removed the __LINE__ displays. - * docs/tutorials/014/page01.html : Added Kirthika's abstract - - * docs/tutorials/015/page01.html : Added Kirthika's abstract - * docs/tutorials/015/page12.html : Oops... Wrong intro text. - * docs/tutorials/015/Protocol_Stream.cpp : Typos fixed - * docs/tutorials/015/Protocol_Task.cpp : Typos fixed - -Wed Feb 10 15:04:26 1999 Ossama Othman - - * ace/Makefile: added Pair_T.cpp and Template_Instantiations.cpp - to the TEMPLATE_FILES list/variable. They were missing. - * tests/Conn_Test.cpp (spawn_processes): initialized - pid_t *children_ptr to zero to prevent "uninitialized" - warnings from egcs 1.1.1. - -Wed Feb 10 14:16:25 1999 Ossama Othman - - * tests/Message_Queue_Test.cpp (performance_test): initialized - ACE_Message_Block **send_block to zero to prevent "uninitialized" - warnings from egcs 1.1.1. - -Wed Feb 10 14:02:46 1999 Ossama Othman - - * ace/ACE.cpp (get_ip_interfaces): initialized struct ifreq * ifs - to zero to prevent "uninitialized" warnings from egcs 1.1.1. - -Wed Feb 10 10:53:59 1999 Carlos O'Ryan - - * examples/IPC_SAP/TLI_SAP/ftp-server.cpp: - Fixed several minor syntax errors. - -Tue Feb 09 16:54:10 1999 Jeff Parsons - - * ace/CDR_Stream.cpp: - Put the 'XXX_DISABLE_SWAP_ON_READ' code back into the - ACE_INputCDR methods read_array(), read_2(), read_4(), - read_8() and read_16(). I didn't realize at first how - crucial that is to the Boeing folks. Thanks to Carlos - for bringing this to my attention. - -Tue Feb 09 16:07:32 1999 Nanbor Wang - - * ace/Synch.{h,i,cpp}: Removed classes ACE_Null_Mutex_Guard and - ACE_Thread_Mutex_Guard since there doesn't seem any need for - them any more. They should be replaced by - ACE_Guard and ACE_Guard. If - by any chance you still need to use them, add - ACE_USES_OBSOLETE_GUARD_CLASSES into your config.h file. - - * ace/Local_Tokens.h: Replaced ACE_Null_Mutex_Guard and - ACE_Thread_Mutex_Guard with ACE_Guard and - ACE_Guard. - -Tue Feb 9 16:12:42 1999 James CE Johnson - - * docs/tutorials/{010|011}/task.{h|cpp} : barrier_ doesn't need to be a - pointer since Doug moved n_threads to the ctor. Minor typos - corrected also. - - * docs/tutorials/010/message_queue.cpp : Typos... - - * docs/tutorials/002/server.cpp: Added call to notify() in the - signal handler so that ^C will exit as expected. - -Tue Feb 09 13:57:23 1999 Nanbor Wang - - * tests/DLList_Test.cpp (main): The test should log the result to - DLList_Test.log, not ACE_DLList_Test.log. - - * tests/run_tests.{sh,vxworks,psosim}: Added DLList_Test. - - * tests/run_tests.bat: Removed DLL_Test. - - * ace/ACE.cpp (ldfind): Win32 only. Made sure we always look for - the DLL at the current directory first on Win32 which is the - default behavior on Win32. - - * ace/ace_{dll,lib}.dsp: Removed entries of Service_Record.{h,i}. - Thanks to David for noticing this. - -Tue Feb 09 10:21:33 1999 David L. Levine - - * ace/Service_Types.{i,cpp},README: removed obsolete references to - Service_Record. - - * tests/MT_Reactor_Timer_Test.cpp (main): added printout with numbers - of expected and actual events, if result is not ACE_MAX_TIMERS + 2 - - * include/makeinclude/wrapper_macros.GNU: added BUILD line with both - shared_libs and static_libs enabled, so that individual Makefiles - don't need a BUILD line. - - * docs/ACE-subsets.html: updated to reflect current ACE status. - -Mon Feb 08 14:32:43 1999 Nanbor Wang - - * docs/exceptions.html: Added guidelines of switching from TAO try - macros to ACE try macros. Other cosmetic changes. - -Mon Feb 8 13:54:32 1999 Yamuna Krishnamurthy - - * docs/tutorials/011/task.cpp : - In the open return this->activate (THR_NEW_LWP, - this->n_threads_); was taking an udefined variable threads. - - * docs/tutorials/011/message_queue.cpp: - Corrected Compilation error due to a typo (static misspelt as - statuc!!!) - -Mon Feb 8 09:21:10 1999 Douglas C. Schmidt - - * ace/Map_T.h, - ace/Pair_T.h: Aded parens around the #pragma implementation file - names so the AIX compiler would be happy. Thanks to Martin - Krumpolec for reporting this. - -Mon Feb 08 00:39:49 1999 Douglas C. Schmidt - - * ACE version 4.6.21 released. - -Sun Feb 7 22:48:01 1999 Nanbor Wang - - * ace/CORBA_macros.h (ACE_THROW_RETURN): The second macro argument - was missing. - -Sun Feb 7 22:32:21 1999 Douglas C. Schmidt - - * ace/CORBA_macros.h: It wasn't clear why the ACE_THROW_RETURN - macro for non-NT platforms wasn't taking a second RETV - parameter. I've fixed this, however. - -Sun Feb 07 13:55:15 1999 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++.GNU: added - comment about possibly needing -compat=4 with Sun CC 5.0. - Thanks to Sush Bankapura for - reporting success with it. - -Sun Feb 7 00:43:32 1999 Jeff Parsons - - * ace/CDR_Stream.cpp: - Turns out that read_boolean_array was declared, but - the body was missing (?). - -Sat Feb 6 22:38:40 1999 Jeff Parsons - - * ACE_wrappers/tests/CDR_Test.cpp: - Changed #include file name to ace/CDR_Stream.h (the new - source file name). - -Sat Feb 6 22:21:14 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.cpp: - Fixed the write_boolean_array() method; it only needs a const - array of booleans. - -Sat Feb 6 22:07:45 1999 Jeff Parsons - - * ace/CDR.{h,i,cpp}: Renamed these as... - * ace/CDR_Stream.{h,i,cpp}: Mustn't have files with the - same name (the TAO files) for the sake of some compilers. - * Makefile: - * ace_dll.dsp: - Changed to reflect the renaming above. - -Sat Feb 6 20:30:51 1999 Carlos O'Ryan - - * ace/CDR.h: - * ace/CDR.i: - * ace/CDR.cpp: - Fixed some indentation and style problems. - -Sat Feb 06 07:47:20 1999 David L. Levine - - * tests/test_config.h (~ACE_Test_Output): wrapped use of - cerr with #ifndef ACE_LACKS_IOSTREAM_TOTALLY. - -Sat Feb 06 02:41:07 1999 Irfan Pyarali - - * tests/Map_Test.cpp: The hell of explicit template instantiation. - Someone please save me from these stupid compilers. - - * ace/Map: Broken g++ (2.7) has deformed my beautiful code based - on typedefs and forced me to use their basic form. However, - users should continue to use the typedefs provided as I do in - the Map_Test. - -Fri Feb 05 21:57:24 1999 Irfan Pyarali - - * ace/Map_T: Added a new Map mini framework to ACE. The classes - in this mini framework allows the Map interface to be used - without caring about the specific Map implementation being used. - There is the class hierarchy of the framework: - - forwards - ACE_Iterator --------> ACE_Iterator_Impl (abstract) - - ACE_Iterator_Impl is subclassed by: - - - ACE_Map_Impl_Iterator_Adapter - - ACE_Active_Map_Manager_Iterator_Adapter - - ACE_Hash_Map_Manager_Ex_Iterator_Adapter - - ACE_Map_Manager_Iterator_Adapter - - forwards - ACE_Reverse_Iterator --------> ACE_Reverse_Iterator_Impl (abstract) - - ACE_Reverse_Iterator_Impl is subclassed by: - - - ACE_Map_Impl_Reverse_Iterator_Adapter - - ACE_Active_Map_Manager_Reverse_Iterator_Adapter - - ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter - - ACE_Map_Manager_Reverse_Iterator_Adapter - - ACE_Map is subclassed by: - - - ACE_Map_Impl - - ACE_Active_Map_Manager_Adapter - - ACE_Hash_Map_Manager_Ex_Adapter - - ACE_Map_Manager_Adapter - - Also included in the framework is a Key Generator class and a - Key Adapter class. The Key Generator class is used by some map - adapters to generate keys since the maps they adapt do not - generate keys. The Key Adapter class is used by the active map - adapter to allow encoding and decoding of active keys into user - keys. - - Note that the iterators use the bridge pattern while the map - class uses an abstract base class based inheritance approach. - The reason for this is that STL containers return the iterators - by value. An abstract base class cannot be returned by value. - - An alternative design would be to add an abstract base class - that the ACE maps would derive from. Unfortunately, this would - break many things including the ability to add these maps to - shared memory and explicit template instantiations. - - This mini framework would have been idle to apply the external - polymorphism pattern. However, the ACE map classes are - different enough that adaption was necessary. This turned out - to be a blessing in disguise since I was able to add extra - common functionality such as the key generator and key adapter - to the map adapters. I did add the external polymorphic - subclasses to the framework for future use. - - The classes in this framework are as close STL containers as I - would dare to make them ;) Thanks to Carlos for helping design - them. - - * tests/Map_Test: New test to illustrate and test the workings of - the new ACE Map classes. There are two aspect to this test: - (a) functionality testing includes testing the iterators and - various operations, and (b) performance testing to compare the - relative performance of the maps. - - * ace/Pair: Added new Pair class to ACE that holds instances of - the template arguments. Also, added a Reference_Pair class that - only hold references of the template arguments. - - * ace/Hash_Map_Manager_T.* (ACE_Hash_Map_Manager_Ex): - * ace/Map_Manager.* (Map_Manager): - Added new rebind() methods to make interface compatible with - other maps. Also, fixed the constness of some functions. - - * ace/Hash_Map_Manager.h: Fixed order of inclusion of template - code. - - * ace/Active_Map_Manager_T.h (ACE_Active_Map_Manager): Added new - versions of bind, find, and unbind to reduce the number of data - copies. - - * ace/Active_Map_Manager.h (ACE_Active_Map_Manager_Key): Added the - ability for the active key to encode and decode into and out of - a data stream. This relieves the developer from concerning - herself about the internal structure of the active key. - - * ace/config-win32-common.h: Define WIN32 if not already defined. - - * tests/SString_Test.cpp: Added testing for substring creation and - comparisons. - - * ace/OS.h (ACE_dynamic_cast_*_ptr and ACE_dynamic_cast_*_ref): - Added new macros to handle casting of template class. - - * tests/test_config.h: Removed global KEY class that was not being - used anymore anyway. - -Fri Feb 05 21:12:56 1999 Douglas C. Schmidt - - * ACE version 4.6.20 released. - -Fri Feb 05 12:02:31 1999 Steve Huston - - * tests/run_tests.sh: Added SHLIB_PATH support for HP-UX. Fixed - the LD_LIBRARY_PATH setting to work if there was no path set - on entry to the script. - - * ace/config-hpux-9.x.h, config-hpux-(10,11).x-hpc++.h: - Removed ACE_HAS_BROKEN_ENUMS. This affects the HP C++ compiler, not - aC++. I made this change based on David's experience with the - enums and Green Hills, below. If it causes any problems, let me - know and I'll reset it. - -Fri Feb 05 10:11:18 1999 David L. Levine - - * ace/Log_Priority.h: changed ENSURE_32_BITS to LM_ENSURE_32_BITS, - and its value from 0xffffffff to 0x7fffffff. Green Hills 1.8.9 - properly complained that 0xffffffff doesn't fit into an int. - - * ace/config-sco-5.0.0-CC-fsu-pthread.h,config-sunos5.5.h, - config-vxworks5.x.h: removed ACE_HAS_BROKEN_ENUMS, because - it's not necessary with 0x7fffffff. - -Thu Feb 4 23:11:26 1999 Carlos O'Ryan - - * websvcs/lib/URL_Addr.h: - * websvcs/lib/URL_Addr.i: - Added operator= to the ACE_URL_Addr classes. - - * websvcs/lib/URL_Addr.cpp: - Fixed minor memory allocation problem for invalid HTTP - addresses. - It removes './' when creating relative addresses. - -Wed Feb 03 21:50:09 1999 David L. Levine - - * ace/config-vxworks5.x.h: added ACE_HAS_BROKEN_ENUMS with - Green Hills, because it's needed with 1.8.9. And, added - ACE_HAS_STANDARD_CPP_LIBRARY #define to 1, for Green Hills 1.8.9 - (with __STANDARD_CXX #defined) only, because it doesn't work with - 1.8.8. Thanks to Jacob Jones for - reporting these. - - * ace/config-sunos5.5.h: with Green Hills 1.8.9 (with - __STANDARD_CXX #defined), added ACE_HAS_STANDARD_CPP_LIBRARY - #define to 1. - -Wed Feb 03 14:57:21 1999 Nanbor Wang - - * ace/Thread_Manager.h (ACE_At_Thread_Exit[_Func]): Added - ACE_Export keywords. Thanks to Terry Rosenbaum - for pointing this out. - - * ace/Service_Config.{h,i,cpp}: Added one more argument to open - methods that allows ignoring the default svc.conf file. You can - still open svc.conf files using the -f option. - -Wed Feb 03 10:12:14 1999 David L. Levine - - * bin/make_release: fixed release_filter so that it doesn't put - CVS files into the release. - - * ace/Object_Manager.h: updated comments to reflect that - ACE_HAS_NONSTATIC_OBJECT_MANAGER is now #defined in - several ace/config files, including that for Win32. - Thanks to Dave Meyer for pointing - that out. - -Wed Feb 3 09:30:11 1999 Carlos O'Ryan - - * websvcs/lib/URL_Addr.cpp: - Fixed some memory leaks. - HTTP_Addr::create_relative_address supports the #label syntax. - -Wed Feb 03 07:02:49 1999 David L. Levine - - * tests/CDR_Test.cpp: commented out ACE_Auto_Basic_Array_Ptr - explicit instantiation, because it's in ace/Memory_Pool.cpp. - -Tue Feb 2 21:35:21 1999 James CE Johnson - - * docs/tutorials/007/client_handler.h: - * docs/tutorials/007/thread_pool.h: - A couple of syntax goofs. I'm surprised it compiled for anyone! - - * docs/tutorials/007/thread_pool.h: - Changed ACE_Time_Value(0.25) to ACE_Time_Value(0,250000) - - * docs/tutorials/*/Makefile: - Added '.depend' to the list of files removed by the CLEAN - target. I shoulda' done this the other day. - -Tue Feb 2 20:02:22 1999 Darrell Brunsch - - * bin/make_release: Added .gz to the list of binary file extensions. - -Tue Feb 2 19:28:46 1999 Douglas C. Schmidt - - * docs/tutorials: ACE-ified the first 11 tutorials. I hope - James still recognizes this stuff now ;-) - -Tue Feb 2 19:12:50 1999 James CE Johnson - - * docs/tutorials/001/logger.h (class Logging_Handler): - Incorporated Pradeep's suggestion to get rid of the memset() and - use the recv() return value to drop in the null-termination. - -Tue Feb 2 14:19:30 1999 Darrell Brunsch - - * websvcs/websvcs.dsw: - * websvcs/lib/websvcs.dsw: - * websvcs/lib/websvcs.dsp: - * websvcs/tests/tests.dsw: - * websvcs/tests/Test_URL_Addr.dsp: - Added MSVC project files for the websvcs library. - - * websvcs/lib/URL_addr.cpp: - Now correctly exports classes in DLLs. - -Tue Feb 2 12:48:34 1999 Jeff Parsons - - * tests/CDR_Test.cpp: - Changed the template type of the auto_ptr for char. We were - getting a Purify FMR message on Unix. - -Tue Feb 2 12:27:13 1999 Douglas C. Schmidt - - * ace/ACE.cpp: Added an ACE_UNUSED_ARG for program_name for - ACE::daemonize(). Thanks to David Levine for reporting this. - - * ace/OS.h: Generalized the WIF* macros so that they will be - defined on any platform that lacks them, not just NT. Thanks to - David Levine for reporting this. - -Tue Feb 02 08:58:32 1999 Steve Huston - - * tests/MT_Reactor_Timer_Test.cpp: Moved definition of status outside - of ACE_HAS_THREADS condition since it's used in either case. Thanks - to Frederic Andres for this fix. - -Mon Feb 01 23:16:34 1999 Douglas C. Schmidt - - * ACE version 4.6.19 released. - -Mon Feb 01 22:06:40 1999 David L. Levine - - * bin/make_release (create_kit): fixed typo, bin_files - instead of binfiles. - -Mon Feb 01 21:24:45 1999 Douglas C. Schmidt - - * ACE version 4.6.18 released. - -Mon Feb 1 21:02:26 1999 Darrell Brunsch - - * ace/ace_dll.dsp: Some template files were being compiled - in the Release/Unicode/Alpha configs. This is now not the - case. - -Mon Feb 1 13:49:11 1999 Carlos O'Ryan - - * ace/config-linux-common.h: - Added a definition for ACE_TIMER_SKEW, apparently it is only - needed in multiple CPU machines (with SMP enabled); but it did - solve the problems with MT_Reactor_Timer_Test. - -Mon Feb 01 13:08:11 1999 Jeff Parsons - - * tests/CDR_Test.cpp: - Used an auto_ptr to manage a string sent to string_read(). I - had included the .h file for auto ptrs (Carlos corrected my - typo, see below), but had never checked in the code using - auto_ptr. - -Mon Feb 01 12:54:11 1999 Steve Huston - - * ace/NT_Service.(h i): Some fixes provided by Martin Krumpolec - - thanks to Martin for these! - - Supplied missing ctor for name/desc variant. - - svc() method is not pure virtual any longer to prevent SCP-type - applications from having to override it and never use it. - -Mon Feb 1 12:04:35 1999 Darrell Brunsch - - * bin/make_release: Added zip and gif to the binary files in - zips. - -Mon Feb 01 12:00:55 1999 David L. Levine - - * ace/config-sunos5.5.h: With CC 5.0, enabled explicit template - instantiation and added ACE_LACKS_ACE_IOSTREAM. Early versions - of CC 5.0 seem to have problems with automatic template - instantiation and ACE_IOStream. - - * include/makeinclude/platform_sunos5_sunc++.GNU: added CC 5.0 - support to enable explicit template instantiation, and disable - inlining by default. - - Thanks to Diethard Ohrt for confirming - that above fixes allow ACE and TAO to build with CC 5.0. - - * include/makeinclude/platform_sunos5_{g++,ghs}.GNU: removed -lw - from libs. It's not necessary, and apparently causes problems - on Solaris 2.6, because libc now includes the code that was - formerly in libw. Thanks to Steve Coleman - for reporting this. - -Mon Feb 1 10:41:09 1999 Carlos O'Ryan - - * tests/CDR_Test.cpp: - There was a typo in a included filename. - -Mon Feb 1 08:39:15 1999 Douglas C. Schmidt - - * ace/Synch.h: Clarified that the ACE_Semaphore::acquire() is in - absolute, rather than relative, time. Thanks to Jacques - Salerian for reporting this. - -Sun Jan 31 20:10:23 1999 Jeff Parsons - - * ace/OS.h: - Just renamed the CDR byte order macros to something more - reasonable. - -Sun Jan 31 18:19:45 1999 Douglas C. Schmidt - - * docs/tutorials/Makefile: Now we can build the UNSHAR SHAR HTML - right from the top-level. Thanks James! - - * tests/Process_Strategy_Test: Updated the test to use ACE::fork() - and the new "avoid zombies" feature of ACE_Process_Strategy. - - * ace/ACE: Added a new version of fork() that can avoid creating - zombies. Thanks to Garry Brother for - this code. - - * ace/Strategies_T: Changed the ACE_Process_Strategy so that - programmers can designate to not create zombies. Thanks to - Garry Brother for this suggestion. - - * ace/ACE.cpp (daemonize): Only do a chdir if pathname != 0. - - * ace/ACE: Added a "program_name" argument to daemonize() so that - we can set the program name. - - * docs/tutorials: Reformatted all the header files to conform - to the ACE programming style. - -Sun Jan 31 16:09:55 1999 Jeff Parswons >parsons@cs.wustl.edu> - - * ACE_wrappers/tests/CDR_Test.cpp: - Plugged a memory leak in a string read from the CDR stream. - Thanks to Sangwoo Jin for pointing this out. - - * ace/CDR.{h,i,cpp}: - Changed the name of the "base" class holding the constants to - 'CDR' from 'ACE_CDR'. In leveraging this code in the TAO cdr - classes, I've discovered that there are many files that - use these constants, so probably best to keep the original - name. Also made minor changes to read_string, read_wstring, - append_string and append_wstring to prevent a memeory leak - if the operation fails. - -Sun Jan 31 11:58:32 1999 James CE Johnson - - * docs/tutorials/{010|011|012|013|017}: - In all of these, I'd overridden open() as open(int) to specify - the number of threads in a thread-pool. Steve Huston pointed - out that this causes grief with some compilers. I've changed - all of these open(int) overrides to start(int) instead. - - * docs/tutorials/017/Barrier_i.cpp (threads): - The thr_equal() call was changed to !thr_equal(). - - * docs/tutorials/010/taks.cpp: - Vishal recommended some extra commentation to make things a bit - more clear WRT barrier synch. - - * docs/tutorials/013/page01.html: - Added Kirthika's abstract. - -Sat Jan 30 16:03:23 1999 Carlos O'Ryan - - * websvcs/lib/URL_Addr.h: - * websvcs/lib/URL_Addr.cpp: - The HTTP address class can create an URL_Addr from a path - relative to it. This is useful when interpreting an address - inside an HTML document. - -Sat Jan 30 13:34:00 1999 Nanbor Wang - - * examples/Connection/non_blocking/test_sock_connector.cpp (main): - Prevent the program from executing if compiled on non-NT Win32 - platform without Winsock2 installed. Thanks to Greg Harrison - for reporting ths problem. - -1999-01-29 Irfan Pyarali - - * ace/Mem_Map.cpp (map_it): NT makes no claims about replacing - previous mapping at the specified address. Therefore, I have - added a new macro ACE_LACKS_AUTO_MMAP_REPLACEMENT which is - defined if there is no system support for replacing any previous - mappings. In this case, we unmap() before (potentially) mapping - to the same location. ACE_LACKS_AUTO_MMAP_REPLACEMENT is - defined on NT. - -Fri Jan 29 17:40:34 1999 Carlos O'Ryan - - * websvcs/lib/URL_Addr.h: - * websvcs/lib/URL_Addr.cpp: - We were not checking against nil strings in several places, also - fixed some uninitialized members in the HTTP_Addr constructors. - - * bin/auto_compile: - Added protection against simultaneous executions of the script; - it checks for .disable file on the $LOGDIR directory, if present - it does not execute; if not present it creates one; the file is - deleted at program termination. - -Fri Jan 29 16:25:22 1999 Steve Huston - - * ace/config-hpux-10.x-hpc++.h: Added ACE_HAS_GPERF. - * apps/gperf/src/List_Node.cpp (ctor): Added ACE_const_cast to - a char * initializer. - * apps/gperf/src/Options.cpp: Fixed -j processing (typo). - - * docs/tutorials/017/barrier.cpp: Can't init a long with a thread ID. - On HP-UX 10.20, it's a struct. - * docs/tutorials/017/Barrier_i.cpp: Use ACE_OS::thr_equal to check - equality of thread IDs. - - * docs/tutorials/019/server/cpp: Removed redefinition of char *s from - 'for' loop. Works around a compiler issue, but isn't needed anyway. - - * include/makeinclude/platform_hpux_aCC.GNU: On HP-UX 10.20, suppress - (future)error 667 and warning 495 to stop hearing about the problems - with the system-supplied header files. The compiler still says - there was 1 future error, but at least it's easy to scan the output - for real errors now. - -Fri Jan 29 14:49:37 1999 Carlos O'Ryan - - * ace/ACE.cpp: - * ace/Basic_Types.h: - * ace/INET_Addr.cpp: - * ace/Memory_Pool.cpp: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/config-cray.h: - * examples/IPC_SAP/SOCK_SAP/C-inserver.cpp: - * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp: - * examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp: - * include/makeinclude/platform_cray.GNU: - * tests/Basic_Types_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/Message_Queue_Test.cpp: - * tests/SV_Shared_Memory_Test.cpp: - * tests/run_tests.sh: - Thanks to Doug Anderson for this port of ACE to - Cray machines. - -Fri Jan 29 13:51:40 1999 Nanbor Wang - - * ace/OS.h: Removed definition of ACE_Thread_State. - - * ace/Thread_Manager.*: Changed the ACE_Thread_State as a bunch of - bit-masks so we don't overwrite the thread states accidentally. - Thanks to Tom Dobridge for reporting - the bug. - -1999-01-28 Irfan Pyarali - - * ace/Hash_Map_Manager_T.cpp (open): this->close_i() must be - called *before* the allocators are changed. - - * ace/Map_Manager.cpp (open): Close the old map (if any) before - creating the new map. This also make open() reentrant. Thanks - to Zoran Ivanovic for reporting this bug. - -Thu Jan 28 19:08:25 1999 Carlos O'Ryan - - * ace/Active_Map_Manager_T.h: - Steve's change didn't make it, so I changed BASE to - ACE_AMM_BASE, I don't know about the pragma. - -Thu Jan 28 16:43:17 1999 Steve Huston - - * ace/Active_Map_Manager_T.(h i): Renamed BASE to ACE_AMM_BASE - BASE - conflicted with something in AIX xlC. Also fixed #pragma - implementatation to work on xlC. - -Thu Jan 28 10:04:39 1999 Carlos O'Ryan - - * ace/Hash_Map_Manager_T.cpp: - Reverted to version 4.2, thanks to Kirthika for helping find - this one. - -Thu Jan 28 09:11:29 1999 Andreas Tobler - - * ace/config-linuxppcr5.h: added this config file, for - LinuxPPC R5 platforms. - -Thu Jan 28 08:55:21 1999 David L. Levine - - * ace/config-mklinux.h: replaced ACE_HAS_SOCKLEN_T, removed - __USE_XOPEN. Thanks to Andreas Tobler for - these clarifying this. - -Wed Jan 27 19:12:48 1999 James CE Johnson - - * docs/tutorials/008/*: - * docs/tutorials/009/*: - * docs/tutorials/011/*: - * docs/tutorials/012/*: - Updates from the reviewers. - -Wed Jan 27 17:06:38 1999 David L. Levine - - * ace/Makefile: removed some unprintable characters. - -Wed Jan 27 16:31:01 1999 Ossama Othman - - * ace/Makefile: Added LOCK_SOCK_Acceptor to TEMPLATE_FILES list. - -Wed Jan 27 14:50:13 1999 Nanbor Wang - - * examples/Service_Configurator/Misc/main.cpp: Changed to open the - Service_Config object with ignore_static_svc set to 0. That - allows this example to use static service. (By default, static - services are not loaded.) Thanks to Arturo Montes - for reporting this. - -Wed Jan 27 13:47:00 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: use - double double quotes around COMPILE argument to ace_ld, - but only on WIN32 hosts. Thanks to Peter Weat - for figuring this out. - -Wed Jan 27 13:04:55 1999 David L. Levine - - * ACE version 4.6.17 released. - -Wed Jan 27 12:32:22 1999 David L. Levine - - * ACE-INSTALL.html,include/makeinclude/platform_vxworks5.x_g++.GNU: - default PERL_PATH to "perl", and added notes to set it to the full - perl path if perl is not on your path. - -Wed Jan 27 10:16:06 1999 Carlos O'Ryan - - * docs/ACE-guidelines.html: - Added an entry for the creation of files containing template - code. - -Tue Jan 26 20:44:36 1999 Nanbor Wang - - * ace/SOCK_IO.cpp (send,recv): Changed to use sendv/recvv to - handle variable arguments send/recv. - - * ACE-INSTALL.html: Fixed the dead link to CE-status. Thanks to - Mike Preradovic for reporting - this. - -Tue Jan 26 14:38:11 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: expanded - the information on the PERL_PATH environment variable for - NT hosts. Thanks to Peter Weat for - reporting this. - -Tue Jan 26 13:40:51 1999 Nanbor Wang - - * ace/High_Res_Timer.cpp (elapsed_time_incr): Rearranged the - formula to avoid compilation errors for platforms without - ULONGLONG. Thanks to David for the tip. - -Tue Jan 26 12:01:19 1999 Jeff Parsons - - * ACE_wrappers/tests/CDR_Test.dsp: - * ACE_wrappers/tests/CDR_Test.cpp: - Added lines to the test code to send the output to - the log file, and deleted the unnecessary Header - Files folder in the project. - * ace/CDR.{i,cpp}: - Relocated the longdouble comparison operators' - definitions, and moved a misplaced '}', which - were causing build errors. - -Tue Jan 26 10:55:02 1999 Carlos O'Ryan - - * ace/Active_Map_Manager.h: - The _T.h file has to be included *after* the inclusion of the .i - file, otherwise the template may not see the inline functions; - the problem only showed up on IRIX. - -Mon Jan 25 22:11:36 1999 Jeff Parsons - - * ACE_wrappers/tests/CDR_Test.dsp: - * ACE_wrappers/tests/tests.dsw: - * ACE_wrappers/tests/versions_tests/CDR_Test.dsp: - * ACE_wrappers/tests/versions_tests/version_tests.dsw: - * ACE_wrappers/tests/run_tests.sh: - * ACE_wrappers/tests/run_tests.psosim: - * ACE_wrappers/tests/run_tests.bat: - * ACE_wrappers/tests/run_tests.vxworks: - Fixed the project files (they had incorrrect project - settings, I think) and updated the workspace files. - Also, on a tip from Nanbor, added CDR_Test to the - various run_tests files. - -Mon Jan 25 20:22:01 1999 Jeff Parsons - - * ace/CDR.{h,i,cpp}: - * ace/Basic_Types.h: - * ACE_Wrappers/tests/CDR_Test.cpp: - Better design of ACE CDR, compiles and runs on NT, g++ - and CC. - -Mon Jan 25 09:35:42 1999 Steve Huston - - * ace/ACE.cpp (handle_timed_complete): If connect times out, set - errno to ETIMEDOUT, not ETIME. Matches what will happen if a - simple blocking connect times out. - - * ace/OS.i (ACE_OS::accept, ACE_OS::recv): (only non-Win32), if - call fails and errno is EAGAIN, change it to EWOULDBLOCK. - - * tests/MT_SOCK_Test.cpp: Remove EAGAIN hacks; above changes fix - this for all programs. - -Sun Jan 24 22:04:42 1999 David L. Levine - - * docs/ACE-guidelines.html: added operator==/!= guideline. - -Sun Jan 24 20:25:44 1999 Irfan Pyarali - - * ace: When a class provides operator==, it must also provide - operator!=. Also, both these operators should be const. - - Fixed the above violations in: - - ACE_TSS_Ref - ACE_Thread_ID - ACE_Registry::Binding - ACE_Registry::Name_Component - ACE_Active_Map_Manager_Key - - * ace/Map_Manager: Renamed methods that may become identical if - INT_ID is the same as size_t. Thanks to Ossama for helping with - this. - -Sun Jan 24 19:46:55 1999 Jeff Parsons - - * ace/CDR.{h,i,cpp}: - * ace/Basic_Types.h: - Made some fixes to make DEC cxx happy, but I'm going to - undo many of the typedefs and change the design. These - changes will hopefully lead to a clean build with cxx, - but the CDR classes are not yet in finished form. - -Sun Jan 24 19:26:34 1999 Irfan Pyarali - - * ace/SString.cpp (set): Fixed usage case of when the incoming - string is not zero but the length specified is zero. - - * tests/SString_Test.cpp (main): Added zero sized strings and - single character strings to the test. - -Sun Jan 24 19:09:45 1999 Nanbor Wang - - * ace/config-win32-common.h - (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR): VC apparently - does it right. - -Sun Jan 24 17:22:02 1999 Ossama Othman - - * ace/SString.cpp (substring): the variable "length" was misspelled - on one of the lines in the method. - -Sun Jan 24 16:17:58 1999 Nanbor Wang - - * ace/README: - * ace/OS.h: - * ace/config-g++-common.h: - * ace/config-osf1-4.0.h: - * ace/config-psos-diab.h: - * ace/config-psos-tm.h: Replace ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR - with ACE_HAS_WORKING_EXPLITCIT_TEMPLATE_DESTRUCTOR to reflect - the true problem. Thanks to Ossama for suggesting the name. - -Sun Jan 24 16:20:17 1999 James CE Johnson - - * docs/ACE-FMM: - Added an entry about the DONT_CALL flag to remove_handler(). - - * docs/tutorials/00[45789]: - * docs/tutorials/01[012]: - Many changes from Yamuna, Pradeep, Kirthika and Ossama. In all, - there were 62 files changed. Mostly the .html's due to - recombination and colorization. - -Sun Jan 24 14:23:07 1999 Douglas C. Schmidt - - * ace/SString.cpp: The substring() method did not check for zero - length. Thanks to Mike Goldman for this fix. - -Sun Jan 24 02:08:57 1999 Carlos O'Ryan - - * websvcs/lib/URL_Addr.cpp: - * websvcs/lib/URL_Addr.h: - * websvcs/lib/URL_Addr.i: - * websvcs/tests/Test_URL_Addr.cpp: - Added support for mailto: URLs - -Sat Jan 23 23:53:29 1999 Carlos O'Ryan - - * websvcs/Makefile: - * websvcs/lib/Makefile: - * websvcs/lib/URL_Addr.h: - * websvcs/lib/URL_Addr.i: - * websvcs/lib/URL_Addr.cpp: - * websvcs/tests/Makefile: - * websvcs/tests/Test_URL_Addr.cpp: - Added a small library to keep basic Web related wrappers. The - first set is a small collection of URL address classes, - including HTTP and FTP representations. - -Sat Jan 23 23:26:17 1999 Nanbor Wang - - * ace/High_Res_Timer.{h,cpp} (elapsed_time_incr): Added a new - function to access the incremental timer in nanosecond. - -Sat Jan 23 23:08:27 1999 Jeff Parsons - - * ace/CDR.{h,i,cpp}: - Caught numerous inline ordering errors and mistakes in - long double functions (not defined on NT) with g++. - -Sat Jan 23 21:13:47 1999 Jeff Parsons - - * tests/tests.dsw: - * tests/CDR_Test.dsp: - * tests/Makefile: - * tests/CDR_Test.cpp: - New test in the suite for the new ACE CDR classes (see below). - - * TAO/TAOACE.dsw: - * TAO/TAOACE_static.dsw: - * ace/Makefile: - * ace/CDR.{h,i,cpp}: - * ace/OS.h: - * ace/Basic_Types.h: - CDR stuff modified from TAO library. Typedefs, default - constants and macros added to OS.h and Basic_Types.h. - There is now complete CDR functionality in ACE, except - for the interpreter, and thus also no handling of Any - or TypeCode types. - -Sat Jan 23 17:50:22 1999 Steve Huston - - * tests/MT_SOCK_Test.cpp: 1. Check for EAGAIN as well as EWOULDBLOCK - after an accept fail (this change will probably be removed at some - point when we figure out how to handle EAGAIN/EWOULDBLOCK). - 2. Close the ACE_SOCK_Acceptor in the server before going into - the "reap children" loop so any half-connected clients will get - closed. - -Sat Jan 23 17:25:48 1999 Kirthika Parameswaran - - * ace/Hash_Map_Manager_T.{h,cpp}: Reverted changes made since the - ACE_Hash_Map_Manager_Ex was getting used in shared memory and - hence could not have "virtual" methods. - -Sat Jan 23 04:53:12 1999 Irfan Pyarali - - * ace/Active_Map_Manager: Added a new associative container (map - abstraction) that associates system generated keys with user - specified values. Since the key is system generated, searches - are very fast and take a constant amount of time. This map uses - a key that keeps information of the index and the generation - count of the slot it represents. Since the index information is - part of the key, lookups are super fast and predictable. - - This performance of this map is truely awesome: - - - inserts O(1) worse case - - lookups O(1) worse case - - deletes O(1) worse case - - * ace/Map_Manager: Completely reworked the internals of the - Map_Manager. A number of problems were addressed: - - (a) Finding an empty slot took O(n). New code takes O(1). - - (b) Resizing was lame as it increased by ACE_DEFAULT_MAP_SIZE - everytime. The new scheme is cool since it grows - exponentially up to 64K and after that grow in chunks of - 32K. - - (c) Old scheme used a simple but inefficient flag. - The new scheme uses two doubly linked list to track used and - free slots. Note that this scheme still uses an array to - manage the search structure but manages the two linked list - on top of the array. Thanks to Carlos for this cool idea. - - (d) current_size() was broken. This is fixed in the new code. - - (e) Inlined a bunch of small functions. - - * tests/SString_Test.cpp: Added empty string test. - - * ace/Containers_T.h (operator=): ACE_Array_Base must be fully - qualified: ACE_Array_Base. Thanks to Susan Liebeskind - for pointing this out. - - * tests/Map_Manager_Test.cpp (test_map_manager): Added - Active_Map_Manager to the test. - -Fri Jan 22 21:27:14 1999 Kirthika Parameswaran - - * ace/Hash_Map_Manager_T.h - (class ACE_Hash_Map_Entry): Modified the destructor to be - "virtual" so that it gets invoked on the destruction of its - derived class objects. - (class ACE_Hash_Map_Manager_Ex): Modified the destructor to be - "virtual" so that it gets invoked on the destruction of its - derived class objects. - Modified shared_find () to be "virtual" so that it can be - defined in its derived classes. - Declared a virtual method for creating new entries for the map - called create_entry (). - - * ace/Hash_Map_Manager_T.cpp - (create_entry): Added this virtual method which creates a new - map entry. This is necessary to allow the map to contain various - types of map entries. - (bind_i): - (trybind_i): - (unbind_i): - Used create_entry () to obtain a new entry object. - - * ace/Hash_Purgable_Map_Manager_T.{h,i,cpp}: - The ACE_Hash_Purgable_Map_Manager_Ex derives from - ACE_Hash_Map_Manager_Ex and provides the feature of purging - K entries from the map. The default purging algorithm is Least - Recently Used, which has been implemented using a virtual timer - that increments whenever an entry is looked up or used. Each - entry has a purge_tag which is the timestamp updated by the - timer value whenever it is referenced. The entry is an object of - ACE_Hash_Purgable_Map_Entry class which is derived from - ACE_Hash_Map_Entry. - (purge): This is the method which flushes K entries from the - map. Locks are held. - (purge_i): This method also flushes K entries but w.o. locks - being held. - (create_entry): Creates an ACE_Hash_Purgable_Map_Entry object. - (shared_find): This method is used to lookup and verify whether - an entry is present in the map. Also, the purge_tag of the entry - is updated with the current timer value. - - * tests/Purgable_Map_Manager.cpp: Added this test which - illustrates the use of the Hash_Purgable_Map_Manager to maintain - a cache map. Also displays the change in the map size on - purging. - -Fri Jan 22 16:10:35 1999 Steve Huston - - * ace/Select_Reactor_Base.cpp (ACE_Select_Reactor_Notify::handle_input) - EAGAIN is also a legit errno value (not only EWOULDBLOCK) for end - of data on pipe. Makes count of dispatches returned from - ACE_Select_Reactor's handle_events correct in the presence of - notifications. - - * ace/OS.i (ACE_OS::sema_init): Always init s->name_ to 0, else it - might be non-zero (and junk) when deleted. - - * ace/config-hpux11.h: Added an overrideable ACE_TIMER_SKEW of 10 msec. - -Fri Jan 22 15:07:08 1999 Douglas C. Schmidt - - * ace/Containers_T.cpp: Yikes, don't delete the fixed stack since - it wasn't allocated dynamically! Thanks to Mike Goldman - for this fix! - -Fri Jan 22 13:08:00 1999 Chris Gill - - * ace/ACE.{cpp, h}: added static methods ACE::gcd, which computes the - greatest common divisor of two u_longs using Euclid's algorithm, and - ACE::minimum_frame size, which computes the minimum enclosing frame - size for two u_longs. - -Thu Jan 21 20:45:09 1999 James CE Johnson - - * docs/tutorials/006/client_acceptor.h - * docs/tutorials/006/client_handler.cpp - * docs/tutorials/006/client_handler.h - * docs/tutorials/006/page01.html - * docs/tutorials/006/page02.html - * docs/tutorials/006/page03.html - * docs/tutorials/006/page04.html - * docs/tutorials/006/page05.html - Integrated changes from Vishal and Kirthika - - * docs/tutorials/008/combine.shar - * docs/tutorials/008/page02.html - * docs/tutorials/008/page03.html - * docs/tutorials/008/page04.html - * docs/tutorials/009/combine.shar - * docs/tutorials/009/directed_client.cpp - * docs/tutorials/009/page01.html - * docs/tutorials/009/page02.html - * docs/tutorials/009/page03.html - * docs/tutorials/009/page04.html - * docs/tutorials/009/page05.html - * docs/tutorials/009/server.cpp - Changes from Kirthika plus colorization. - - -Thu Jan 21 16:01:50 1999 James CE Johnson - - * docs/tutorials/007/Makefile: - * docs/tutorials/007/combine.shar: - * docs/tutorials/007/page01.html: - * docs/tutorials/007/page02.html: - * docs/tutorials/007/page03.html: - * docs/tutorials/007/page04.html: - * docs/tutorials/007/page05.html: - * docs/tutorials/007/page06.html: - * docs/tutorials/007/page07.html: - * docs/tutorials/007/page08.html: - * docs/tutorials/007/page09.html: - * docs/tutorials/007/thread_pool.cpp: - * docs/tutorials/008/Makefile: - * docs/tutorials/008/combine.shar: - * docs/tutorials/008/directed_client.cpp: - * docs/tutorials/008/page01.html: - * docs/tutorials/008/page02.html: - * docs/tutorials/008/page03.html: - * docs/tutorials/008/page04.html: - * docs/tutorials/008/page05.html: - * docs/tutorials/008/server.cpp: - * docs/tutorials/009/Makefile: - Included Kirthika's abstract. - Colorized both tutorials & convereted to new format. - -Thu Jan 21 14:25:58 1999 David L. Levine - - * ace/SString.h: changed !ACE_HAS_WINCE wrap of ostream - operators to !ACE_LACKS_IOSTREAM_TOTALLY. - - * ace/OS.i (getuid): added static cast of -1 to uid_t on - Chorus, to avoid compiler warning about change in sign. - - * ace/OS.h: moved (protected) MAXHOSTNAMELEN #define from - pSOS and NT-only code to where its visible on all platforms. - When we removed the #include of rpc.h, we lost the - #define of MAXHOSTNAMELEN on Chorus. - -Thu Jan 21 15:19:26 1999 James CE Johnson - - * docs/tutorials/001/Makefile: - * docs/tutorials/001/page01.html: - * docs/tutorials/001/page02.html: - * docs/tutorials/001/page03.html: - * docs/tutorials/001/page04.html: - * docs/tutorials/001/page05.html: - * docs/tutorials/005/client_handler.cpp: - * docs/tutorials/005/page02.html: - * docs/tutorials/005/page03.html: - * docs/tutorials/005/page04.html: - * docs/tutorials/005/page05.html: - * docs/tutorials/005/page06.html: - * docs/tutorials/006/client_handler.cpp: - * docs/tutorials/006/page01.html: - * docs/tutorials/006/page02.html: - * docs/tutorials/006/page03.html: - * docs/tutorials/006/page04.html: - * docs/tutorials/006/page05.html: - Incorporated new comments from Vishal, Yamuna and Pradeep. - -Thu Jan 21 13:05:31 1999 Steve Huston - - * docs/tutorials/Makefile: Removed include .depend to allow the - whole set of tutorials to be built from the top. Thanks to James - Johnson for guiding this fix. - -Wed Jan 20 19:47:16 1999 Nanbor Wang - - * ace/OS.{h,i,cpp} (fopen): Reimplement fopen using Win32 APIs so - ACE_OS::unlink behaves the same as it does on UNIX platforms. - Both ACE_OS::open and ACE_OS::fopen have been corrected. - There's also a ACE::open_temp_file which should be the prefered - method to open temp files when ACE_HANDLE is used. That's - because Win32 tries to map the file opened by - ACE::open_temp_file to memory. - - * ace/Parse_Node.cpp (symbol): need to be initialized. - Thanks to David for reporting the bug. - -Wed Jan 20 17:37:21 1999 Steve Huston - - * ace/Log_Msg.h: Added "do {} while (0)" as defs for ACE_HEX_DUMP, - ACE_ERROR, ACE_DEBUG when ACE_NLOGGING is defined. Having null defs - for these caused MSVC some problems. Thanks to Doug Schmidt for - giving (and explaining) the correct definitions. - -Wed Jan 20 13:38:03 1999 David L. Levine - - * ace/OS.i (readdir_r): added ACE_UNUSED_ARG (entry) - without ACE_HAS_REENTRANT_FUNCTIONS. - - * docs/ACE-guidelines.html: added guideline for calling - ACE_OS::unlink () immediately after opening a temporary file. - - * *.h: replaced () around #pragma implementation argument. Thanks - to Susan Liebeskind and - Steve Huston for reporting and confirming that it's necessary - on AIX. - -Wed Jan 20 01:48:21 1999 Nanbor Wang - - * ace/Parse_Node.cpp (symbol): Remembered to pass down the - "gobbler" in a Static_Function_Node. Thanks to Eric C. Newton - for reporting and providing the fix. - -Tue Jan 19 17:52:49 1999 Douglas C. Schmidt - - * ace/SString.h: Clarified the role of the argument for - the method. Thanks to Sudhanshu Garg - for suggesting this. - -Tue Jan 19 16:15:26 1999 David L. Levine - - * OS.i,README,config-cygwin32-common.h,config-linux-common.h, - config-psos-diab.h,config-psos-tm.h,config-psosim-g++.h, - config-sco-5.0.0-mit-pthread.h,config-sco-5.0.0.h, - config-tandem.h: removed removed include of rpc/rpc.h, and - ACE_LACKS_RPC_H. Thanks to Susan Liebeskind - for initially suggesting this, - and to Russ Noseworthy for reporting another problem (on - SunOS 5.6 w/o threads) with it. ACE doesn't need it. - - * bin/g++dep: removed /project/doc/pkg/gnu/bin from PATH so that - I can run make depend on Linux. - -Tue Jan 19 12:14:09 1999 Douglas C. Schmidt - - * Makefile (CONTROLLED_FILES): Added ChangeLog-98b to the - CONTROLLED_FILES macro. Thanks to Susan Liebeskind - for suggesting this. - -Tue Jan 19 10:24:00 1999 Chris Gill - - * apps/JAWS/PROTOTYPE/HTTPU/HTTPU.{dsp, dsw}: converted to MSVC++ 6.0 - (and backward compatible) format. - - * apps/JAWS/PROTOTYPE/HTTPU/http_headers.{cpp, h}: fixed ACE_RB_Tree - templates, template instantiations. Thanks to Sridhar Sabella - (ssabbella@cemax.com) for pointing this out. - -Tue Jan 19 00:42:44 1999 Irfan Pyarali - - * examples/Log_Msg/test_callback.cpp (log): Removed the use of - cerr and used ACE_OS::printf() instead. - - * ace/Log_Record.cpp (print): Fixed comparison between signed and - unsigned. Thanks to David Levine for pointing this out. - -Mon Jan 18 23:55:03 1999 Darrell Brunsch - - * ACE-INSTALL.html: Added more info on Alpha configuration - problems and fixes. - -Mon Jan 18 23:07:38 1999 Nanbor Wang - - * ace/OS.cpp (open): Files opened with CreateFileA (on Win32 of - course,) are now opened with FILE_SHARE_DELETE flag set. This - allows ACE_OS::unlink to work as it should. However, I haven't - figured out how to make unlink work with file opened with fopen - yet. Apparently, fopen does not open file with - FILE_SHARE_DELETE. - -Mon Jan 18 22:54:18 1999 Darrell Brunsch - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Updated NT Alpha configurations. - - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf_lib.dsp: - Added NT Alpha configurations. - -Mon Jan 18 22:14:00 1999 James CE Johnson - - * docs/tutorials/011/message_queue.cpp: - * docs/tutorials/011/page02.html: - ACE_Message_Block::copy() will advance the wr_ptr() for us. - Previously, I was doing that myself in run_test(). The test only - worked because I never wrote data to the block after that. If I - had, things would have broken horribly. - -Mon Jan 18 20:41:48 1999 Douglas C. Schmidt - - * ace/Message_Block.h: Clarified that the wr_ptr() is incremented - by n as a result of the copy operation. Thanks to Zoran - Ivanovic for suggesting this. - - * ace/INET_Addr.h (ACE_INET_Addr): Changed the default for - ipaddr_format to 1 (which is what it had been originally) rather - than 0 since the original way is faster since it doesn't use - DNS. Thanks to Zoran Ivanovic for finding - this. - -Mon Jan 18 20:31:47 1999 James CE Johnson - - * docs/tutorials/006/client_handler.cpp: - Typo... - - * docs/tutorials/006/*.html: - * docs/tutorials/006/combine.shar: - Colorized, added Kirthika's abstract. - -Mon Jan 18 16:19:56 1999 Nanbor Wang - - * ace/OS.cpp (open): If a file is open with _O_TEMPORARY flag set - on Win32, we also set the FILE_ATTRIBUTE_TEMPORARY so OS will - try to cache it in memory to speed up access. - - * ace/ACE.cpp (open_temp_file): On Win32, temporary file should be - opened with _O_TEMPORARY flag set, not FILE_DELETE_ON_CLOSE. - - * include/makeinclude/wrapper_macros.GNU: My previous fix of - avoiding multiple definition of ACE_NDEBUG was not correct. Now - the macro check where should the definition go to. Thanks to - David for showing me the right way to do this. - -Mon Jan 18 11:23:06 1999 Carlos O'Ryan - - * include/makeinclude/platform_irix6.x-sgic++.GNU: - Added the -multigot flag when building shared libraries, - otherwise TAO/orbsvcs is too big. - -Mon Jan 18 09:54:54 1999 David L. Levine - - * ace/config-sunos5.5.h: moved ACE_HAS_PRIOCNTL #define so - that it's defined even without threads. Thanks to - Russ Noseworthy for reporting this. - - * ace/OS.cpp (lwp_getparams): removed ACE_MT_SAFE check - that Doug added Saturday. It's not necessary with the - above fix to config-sunos5.5.h. - - * examples/Log_Msg/test_ostream.cpp: don't try to create the - ofstream if ACE_LACKS_IOSTREAM_TOTALLY. Also, removed - declarations of unused argc/argv arguments because some - g++ versions complain about them. - -Mon Jan 18 08:17:49 1999 Douglas C. Schmidt - - * ace/SOCK_IO.cpp, - ace/SOCK_Dgram.cpp: Added - - ACE_UNUSED_ARG (timeout); - - to the #else part of the recv (iovec *) methods. Thanks to Mike - Goldman for reporting this. - -Mon Jan 18 01:13:57 1999 Nanbor Wang - - * ace/CORBA_macros.h: ACE_TRY_NEW_ENV also needs to define a new - CORBA::Environment even with native exceptions. Mark exception - caught by ACE_CATCH as unused arg to avoid compilation warnings. - -Mon Jan 18 00:12:13 1999 Douglas C. Schmidt - - * ACE version 4.6.16 released. - -Sun Jan 17 16:40:22 1999 Douglas C. Schmidt - - * tests/Reactor_Exceptions_Test.cpp (main): Changed the LM_INFO - message to indicate that C++ exception support isn't ENABLED on - a platform, rather than saying that it's not supported at all... - -Sun Jan 17 15:16:35 1999 Nanbor Wang - - * ace/SString.cpp (operator<<): The operator<< used to print out - ACE_WString caused an infinite loop on platform without UNICODE - defined because we didn't convert the wide string on these - platform. However, since an ACE_WString always contains a wide - string, the conversion from wide string to char string should - always be done here. Thanks to Scott Snyder - for noticing this bug. - - (operator<<): Changed the ACE_SString and ACE_CString version to - check against the case when the internal contains 0. - The ACE_CString version was printing out the string one char a - time. Can't see any reason why this is done like this. Changed - to print out the underlying directly. - -Sun Jan 17 14:42:39 1999 James CE Johnson - - * docs/tutorials/001/*: - * docs/tutorials/002/*: - * docs/tutorials/003/*: - * docs/tutorials/004/*: - * docs/tutorials/005/*: - Converted to the new (colorized) format used by T13 and beyond. - I will convert the remaining tutorials (6-12) as each is reviewed. - - * docs/tutorials/005/fix.Makefile: - * docs/tutorials/006/fix.Makefile: - * docs/tutorials/007/fix.Makefile: Replaced by ../fix.Makefile. - - * docs/tutorials/010/Makefile: - * docs/tutorials/011/Makefile: - * docs/tutorials/012/Makefile: - * docs/tutorials/013/Makefile: - * docs/tutorials/014/Makefile: - * docs/tutorials/016/Makefile: - * docs/tutorials/017/Makefile: - These all referenced ../007/fix.Makefile. They now reference - ../fix.Makefile instead. - -Sun Jan 17 13:50:16 1999 James CE Johnson - - * docs/tutorials/002/handler.h: - * docs/tutorials/002/handler.h: - * docs/tutorials/002/page03.html: - * docs/tutorials/003/client.cpp: - * docs/tutorials/003/page01.html: - * docs/tutorials/004/page01.html: - * docs/tutorials/005/client_handler.h: - * docs/tutorials/005/page02.html: - * docs/tutorials/005/page04.html: - * docs/tutorials/005/page05.html: - * docs/tutorials/005/server.cpp: - - More improvements from Doug's class (and Ossama). Each "page2" - includes an abstract by Kirthika. - - Reviewers to date: - Yamuna Krishnamurthy - Kirthika Parameswaran - Balachandran Natarajan - Pradeep Gore - Ossama Othman - -Sat Jan 16 19:08:12 1999 Douglas C. Schmidt - - * ace/High_Res_Timer.cpp: Added #ifdef so high-res timers work - correctly on KCC. Thanks to Scott Snyder - for contributing this. - - * tests/test_config.h: Updated randomize() so that it uses a - "fixed" seed, so that it will produce "reusable" random numbers. - - * include/makeinclude/platform_linux_kcc.GNU (LD): Added the -lm - flag. Thanks to Scott Snyder for - contributing this. - - * tests/run_tests.sh: Added an - LD_LIBRARY_PATH=../netsvcs/lib:$LD_LIBRARY_PATH so that we can - use a relative name for the svc.conf files used in the - Time_Service_Test and Tokens_Test. - - * ace/config-irix6.x-common.h: Added support for long double for - KCC. Thanks to Scott Snyder for - contributing this. - - * ace/config-irix6.x-kcc.h: Added KCC support. Thanks to Scott - Snyder for contributing this. - - * ace/config-osf1-4.0.h: Added KCC support. Thanks to Scott - Snyder for contributing this. - - * ace/IOStream.h: Fixed up the PUT_CODE and GET_CODE macros so - that they work with KCC. Thanks to Scott Snyder - for contributing this. - - * ace/Env_Value_T.h (ACE_Convert): Added a new ACE_Convert - constructor for u_int so that TAO compiles correctly with KCC. - Thanks to Scott Snyder for contributing - this. - - * include/makeinclude/platform_osf1_4.0_kcc.GNU: Added a new - platform config file for KCC. Thanks to Scott Snyder - for contributing this. - -Sat Jan 16 18:13:29 1999 Nanbor Wang - - * include/makeinclude/wrapper_macros.GNU: Commented out adding - ACE_NDEBUG to CCFLAGS to avoid defining it twice. Most (if not - all) platforms include CFLAGS into CCFLAGS. So, if "make - debug=0" no longer work on your platform, then, you may need to - add "CCFLAGS += $(CFLAGS)" into your platform_xxx.GNU. - -Sat Jan 16 13:40:40 1999 Douglas C. Schmidt - - * ace/Proactor.cpp (schedule_timer): Had to add an - ACE_SYNCH_RECURSIVE_THREAD_MUTEX in place of - ACE_Recursive_Thread_Mutex to avoid problems when threads=0. - - * ace/OS.cpp (lwp_getparams): For some reason we had to - add - - # if defined (ACE_HAS_STHREADS) || (defined (sun) && (ACE_MT_SAFE != 0)) - - instead of - - # if defined (ACE_HAS_STHREADS) || defined (sun) - - to avoid problems when threads=0. - - * ace/Asynch_IO.cpp: Replaced some ACE_Thread_Mutex decls with - ACE_SYNCH_MUTEX to avoid problems with threads=0. - - * ace/config-sunos5.6.h: If defined(_POSIX_C_SOURCE) && - _POSIX_C_SOURCE >= 199506L) || defined (__EXTENSIONS__) then - #define ACE_HAS_SIGWAIT to avoid compilation errors. Thanks to - Russ Noseworthy for reporting this. - - * ace/OS.i: Fixed the ACE_OS::readdir_r() so that it doesn't fail - if threads are disabled via "make threads=0". Thanks to Russ - Noseworthy for reporting this. - - * ace/FILE_Connector.h (ACE_FILE_Connector): Added the O_CREAT - flag to the list of flags passed to connect(). This ensures - that the file is created if it doesn't already exist. Thanks to - Pradeep Gore for reporting this. - -Fri Jan 15 21:28:04 1999 Irfan Pyarali - - * ace/Log_Msg (ACE_Log_Msg_Callback): Added an interface class - used for getting logging callbacks. Users who are interested in - getting the logging messages directly, can subclass this - interface and override the log() method. They must then register - their subclass with the Log_Msg class and make sure that they - turn on the ACE_Log_Msg::MSG_CALLBACK flag. - - Your log() routine is called with an instance of - ACE_Log_Record. From this class, you can get the log - message, the verbose log message, message type, message - priority, and so on. - - Remember that there is one Log_Msg object per thread. - Therefore, you may need to register your callback object with - many Log_Msg objects (and have the correct synchronization in - the log() method) or have a separate callback object per - Log_Msg object. - - Thanks to Chris Lahey for suggesting this - and send patches. - - * examples/Log_Msg/test_callback.cpp: Added new example for - Log_Msg. This program tests the Log_Msg abstraction wrt writing - to user defined callback objects. - -Fri Jan 15 21:10:25 1999 Nanbor Wang - - * ace/CORBA_macros.h: Made sure ACE_CORBA_HAS_EXCEPTIONS always - gets set properly. Added ACE_ADPOT_CORBA_ENV to reuse a - existing CORBA::Environment variable. - -Fri Jan 15 17:05:12 1999 Irfan Pyarali - - * ace/Log_Record: Factored out the redundant formatting code. The - new scheme also allows the end user to get to verbose formatted - string. Thanks to Nanbor for helping out with this. - -Fri Jan 15 17:15:18 EST 1999 James CE Johnson - - * docs/tutorials/templates.html - docs/tutorials/001/acceptor.h - docs/tutorials/001/logger.h - docs/tutorials/001/page01.html - docs/tutorials/001/page02.html - docs/tutorials/001/page03.html - docs/tutorials/001/page04.html - docs/tutorials/001/page05.html - docs/tutorials/001/server.cpp - docs/tutorials/003/page01.html - - Many changes from Ossama plus a new abstract (for T3) from - Kirthika. - -Fri Jan 15 14:40:26 1999 Douglas C. Schmidt - - * ace/SOCK_IO, - ace/SOCK_Dgram: Modified the recv(iovec *) and recvv(iovec *) - methods so that they use select() to avoid spinning if no data - is available. Thanks to Mike Goldman for this - fix. - -Fri Jan 15 10:47:26 1999 Douglas C. Schmidt - - * ace/Service_Repository.cpp: If a service being removed from the - Service_Repository used the Service_Repository while being - removed it could access objects that had already been deleted. - Fix this by decrementing the current_size_ member in - "real-time". Thanks to Eric Newton for reporting this. - -Fri Jan 15 08:08:31 1999 Douglas C. Schmidt - - * ACE version 4.6.15 released. - -Fri Jan 15 07:20:46 1999 Chris Gill - - * ace/OS.i: Fixed variable names in isatty () on NT - -Fri Jan 15 03:45:46 1999 Nanbor Wang - - * docs/exceptions.html: Rewrote the exception handling guildlines - based on ACE's try macros. - -Fri Jan 15 01:32:55 1999 Douglas C. Schmidt - - * ACE version 4.6.14 released. - -Fri Jan 15 00:03:32 1999 Irfan Pyarali - - * examples/Log_Msg/test_ostream.cpp: Added new example for - Log_Msg. This program tests the Log_Msg abstraction wrt writing - to stderr and to a file. - -Thu Jan 14 21:50:22 1999 Nanbor Wang - - * ace/CORBA_macros.h: Added a new set of try macros which help - application developers write portable code that handles - CORBA::Exception portably. The macros will work with any ORB. - - The total number of macros has reduces significantly and they - should be much easier to use because the rules all follow the - same style. - - The new try macros should be prefered over the original try - macro in $TAO_ROOT/TAO/try_macros.h because those macros will - soon be *DEPRICATED* once we finished convert TAO to use the new - macros. - - Please see ACE_wrappers/docs/exceptions.html for guidelines and - rules of using ACE's try macros. - -Thu Jan 14 20:41:33 1999 Douglas C. Schmidt - - * ace/OS: Moved some code around to consolidate the getuid() and - isatty() functions. - - * ace/OS: Added support for the setuid() call. Thanks to Susan - Liebeskind for suggesting - this. - -Thu Jan 14 16:18:37 EST 1999 James CE Johnson - - * docs/tutorials/001/page02.html: - docs/tutorials/001/page03.html: - - Included Kirthika Parameswaran's - abstract and analogy. Thanks Kirthika! - - * docs/tutorials/001/Source.tgz: - docs/tutorials/001/acceptor.h: - docs/tutorials/001/logger.h: - docs/tutorials/001/server.cpp: - docs/tutorials/001/page[345].html: - * docs/tutorials/002/page0[23].html: - docs/tutorials/002/handler.h: - - Added improvements from Kirthika, Pradeep and Yamuna - -Thu Jan 14 11:46:25 1999 Douglas C. Schmidt - - * ace/Synch_T.h: Pointed out that we can only parameterize - ACE_Condition<> with ACE_Thread_Mutex and ACE_...Null_Mutex. - Thanks to Knut-Havard Aksnes for reporting - this. - -Thu Jan 14 02:33:37 1999 Douglas C. Schmidt - - * ACE version 4.6.13 released. - -Thu Jan 14 00:07:34 1999 Irfan Pyarali - - * docs/tutorials/014/stream.cpp: Added #include "ace/streams.h". - -Wed Jan 13 23:18:03 1999 Nanbor Wang - - * ace/OS.h: - * config-g++-common.h: - * config-osf1-4.0.h: - * config-psos-diab.h: - * config-psos-tm.h: Revert my previous change. Removed the - ChangeLog entry about the change. - -Wed Jan 13 22:30:49 1999 David L. Levine - - * include/makeinclude/platform_chorus_ghs.GNU: removed - explicit link with libedgnoe.a, because GreenHills adds - that implicitly. - - * ace/OS.h: added quick hack to ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR - logic to allow compilation with g++. - -Wed Jan 13 18:48:30 EST 1999 James CE Johnson - - * docs/tutorials/004/client.cpp: - docs/tutorials/010/message_queue.cp: - docs/tutorials/011/message_queue.cpp: - docs/tutorials/012/message_queue.cpp: - docs/tutorials/013/message_queue.cpp: - docs/tutorials/014/EndTask.h: - docs/tutorials/019/client.cpp: - docs/tutorials/019/client2.cpp: - docs/tutorials/019/server.cpp: - docs/tutorials/019/server2.cpp: - docs/tutorials/019/shmem.cpp: - docs/tutorials/020/client.cpp: - docs/tutorials/020/server.cpp: - docs/tutorials/021/client.cpp: - docs/tutorials/021/mpool.cpp: - docs/tutorials/021/mpool.h: - docs/tutorials/021/server.cpp: - Fixed many NT issues found by Irfan. Most are related to the - fact that NT doesn't have SysV shared memory. - -Wed Jan 13 04:45:59 1999 James C Hu - - * ace/Cache_Object.{h,cpp}: - * ace/Cache_Manager.{h,cpp}: - * ace/Cache_Manager_T.{h,cpp}: - * ace/Cache_Hash_T.{h,cpp}: - * ace/Cache_Heap_T.{h,cpp}: - * ace/Hash_Bucket_T.{h,cpp}: - Supporting infrastructure for the new Filecache. These classes - form the basis of a generic in memory cache engine. - -Wed Jan 13 02:17:57 1999 Irfan Pyarali - - * ace/OS.cpp (writev): This function should use ACE::write_n - instead of ACE::send_n. Similarly, readv() should use - ACE::read_n instead of ACE::recv_n. - - * ace/ACE.cpp (send): This function should use ACE_OS::sendv - instead of ACE_OS::writev. Similarly, recv() should use - ACE_OS::recvv instead of ACE_OS::readv. - - * docs/tutorials: Fixed all the NT project files. - -Tue Jan 12 22:41:05 1999 Nanbor Wang - - * ace/config-freebsd.h: Uncommented ACE_HAS_SIGWAIT. This is - required for FreeBSD 2.2.8. Thanks to John Aughey - for reporting this. - - * ace/SOCK_IO.{h,i}: - * ace/SOCK_Stream.{h,i} (sendv_n/recvv_n): Moved these functions - from SOCK_IO to SOCK_Stream where it makes more sense to have - the semantic of sending/receiving bytes. - -Tue Jan 12 19:52:26 1999 Nanbor Wang - - * ACE-INSTALL.html: Added more info on dynamically linking - run-time libraries. - - * ace/SOCK_IO.{h,i,cpp} (sendv,recvv,sendv_n,recvv_n): Renamed - vector send_n/recv_n. There were name clashing since these - methods have similar signatures to some send_n/recv_n in - ACE_SOCK_Stream, they got hidden by the derived methods. - Renaming them solve the problem. - -Tue Jan 12 10:59:58 1999 David L. Levine - - * include/makeinclude/platform_chorus_ghs.GNU: fixed location of - libedgenoe.a, so that a symlink in $(GHS_DIR) is no longer necessary. - Thanks to Steve Kay for reporting this. - - * ace/config-mklinux.h: removed ACE_HAS_SOCKLEN_T, added __USE_XOPEN. - Thanks to Andreas Tobler for these updates. - -Tue Jan 12 08:44:11 EST 1999 Aniruddha Gokhale - - * ace/Acceptor.cpp (handle_close): - - Since the reactor_ data member is made private, we need to use - its accessor method to retrieve it. - -Tue Jan 12 02:12:38 1999 Nanbor Wang - - * ace/OS.h (ACE_DES_NO_FREE,ACE_DES_FREE): These two macros - shouldn't be treated differently no matter - ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR is defined or not. - Otherwise, virtual destructor won't work in one of the original - definitions. - - There shouldn't be different different definitions for calling - template destructor explicitly either. However, we need to find - that out. The meaning of ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR - seems to be reversed. That needs to be fixed also. - -Tue Jan 12 00:18:15 1999 Douglas C. Schmidt - - * ace/Event_Handler.h: Moved the priority_ and reactor_ data - members into the private section of the class since these can - always be accessed via their accessor methods. Thanks to Mike - Goldman for reporting this. - -Mon Jan 11 15:30:26 1999 Nanbor Wang - - * ace/Process.{h,i} (get_process_attributes,get_thread_attributes): - Removed the constness from the return value to avoid Intel C++ - warnings. Thanks to Karel Zuiderveld - for reporting this. - - * bin/ADDIDL.DSM: A VB script to add new IDL files into DevStudio - projects. Thanks to Peter for contributing - this nice tool. - -Mon Jan 11 12:54:26 1999 Douglas C. Schmidt - - * ace/SOCK_IO: Added const qualifiers to all the send*() and - recv*() methods that take ACE_Time_Value values. Thanks to Jody - Hagins for reporting this. - - * ace/SOCK_IO: Added a new send_n() method that uses the new - ACE::sendv_n() method! - - * ace/ACE: Added a new sendv_n() and writev_n() method that sends - all the bytes in the iovec! - - * ace/ACE.h (ACE): Added default values of 0 for ACE::writev() and - ACE::readv(). - - * examples/NT_Service: Tidied up the formatting to conform to the - ACE programming guidelines. - -Mon Jan 11 10:23:06 1999 Nanbor Wang - - * ace/config-freebsd-pthread.h: Added ACE_LACKS_READDIR_R. - * ace/config-freebsd.h: Added ACE_LACKS_READDIR_R, - ACE_HAS_NONCONST_MSGSND, ACE_LACKS_MALLOC_H. ACE_HAS_SIGINFO_T - only applies to 3.0 and above. Thanks to Ivan Pascal - for reporting the change. - -Sun Jan 10 21:52:57 1999 David L. Levine - - * tests/Message_Queue_Notifications_Test.cpp (iterator_test): - added comment explaining why a message queue size of 32 Kb - is used, instead of the default of 16 Kb. - - * docs/ACE-guidelines.html: added guidelines for boolean types - and function return values. - -Sun Jan 10 17:33:29 1999 Douglas C. Schmidt - - * tests/Message_Queue_Notifications_Test.cpp: Replaced delete mb - with mb->release(). Thanks to Susan Liebeskind - for reporting this - inconsistency. - - * ace/Task_T.h, - ace/Message_Queue_T.h: Clarified the fact that the - ACE_Time_Value arguments to the Message_Queue methods - use absolute, rather than relative, time. Thanks to - Stanford S. Guillory for pointing out - the need for this clarification. - -Sun Jan 10 09:18:41 1999 Martin Krumpolec - - * ace/Log_Msg.cpp (log): only re-enable tracing if it had - not been explicitly disabled. - -Sun Jan 10 01:06:18 1999 Irfan Pyarali - - * ace/Log_Msg.cpp (log): Change call from exit() to abort(). - - * ace/OS.i (abort): Added new function. - -Sat Jan 9 22:05:07 1999 Nanbor Wang - - * bin/tao_env.pl: A new perl script that help you translate _env - to TAO_IN_ENV. - -Sat Jan 09 10:53:37 1999 David L. Levine - - * ace/Name_Proxy.cpp (open): swapped branches of conditional - so that options.time_value () is used if USE_TIMEOUT is enabled. - Thanks to Mike Goldman for reporting this. - -Fri Jan 08 19:19:17 1999 Nanbor Wang - - * ace/OS.h: Applied ACE_TEXT to the definition of - ACE_DEFAULT_TEMP_FILE on Win32. Thanks to - for reporting this. - -Fri Jan 08 13:24:12 1999 David L. Levine - - * ace/Synch.h (ACE_Process_Mutex): made data members - private instead of public. Thanks to Peter Gross - for reporting this. - - * examples/Threads/reader_writer.cpp: removed volatile - qualifier from declaration of "shared_thr_id", so that - the file will compile on DU 4.0 with DCE threads. The - volatile qualifier caused a type mismatch with - ACE_thread_t. And, it's not necessary, because all - access of the shared_thr_id is guarded. - - * include/makeinclude/platform_chorus_ghs.GNU: added gnuch68 - to -alttools, and removed bin from AR; use libedgnoe.a instead - of libedg.a with GHS 1.8.9.1. - - * ace/config-sunos5.5.h: don't define ACE_HAS_XPG4_MULTIBYTE_CHAR - with ghs, because its version 1.8.9 doesn't seem to support it. - Also, with ghs, replaced the __ctype [] declaration with an - #include of , because that's cleaner. Finally, - added ACE_HAS_BROKEN_ENUMS for ghs (1.8.9). - -Thu Jan 07 09:05:27 1999 David L. Levine - - * ace/config-sunos5.5.h: added ACE_HAS_SIG_C_FUNC with - Sun CC >= 4.2. Sun CC 5.0 needs it; Sun CC 4.2 doesn't - object to it on SunOS 5.5.1, 5.6, and 5.7. Thanks to - Neil Cohen for figuring out how to - compile ACE with Sun CC 5.0. - - * include/makeinclude/platform_sunos5_sunc++.GNU: only - use -features=castop and -rtti with Sun CC 4.2. CC 5.0 - doesn't support them; I assume that it enables RTTI by - default. Thanks to Neil Cohen for - reporting this. - - * ACE-INSTALL.html: added ACE_HAS_REGEX #undef suggestion for - shared lib link problems with egcs 1.1.x on Solaris 2.5.x. - Thanks to Bob McWhirter for reporting this - problem. - -Thu Jan 07 04:45:36 1999 Douglas C. Schmidt - - * ACE version 4.6.12 released. - -Thu Jan 07 04:01:08 1999 Irfan Pyarali - - * ace/Containers_T.cpp (max_size): No need to reallocate if the - new size is the same. Thanks to Mike Goldman for - pointing this out. - - * ace/Strategies_T.cpp (check_hint_i and cleanup_hint_i): - purge_i() should be called after the entry is closed. - - * Select_Reactor_Base.cpp (unbind): The next - should be calculated not only based on the but also - the . - - Thanks to Mark L. Boriack for providing - a description of this bug. - -Wed Jan 06 21:42:11 1999 David L. Levine - - * ace/OS.cpp (thr_create): moved #endif /* ACE_LACKS_SETDETACH */ - outside of }, to allow compilation on DU 4.0/cxx with DCE threads. - - * ace/config-osf1-4.0.h: with DCE threads only, added - ACE_LACKS_THREAD_PROCESS_SCOPING. - -Wed Jan 06 16:36:21 1999 David L. Levine - - * ACE version 4.6.11 released. - -Wed Jan 06 15:15:37 1999 Nanbor Wang - - * ace/Service_Config.cpp (process_directive,close): Moved the - deletion of into close method. - Otherwise, there's no way to reconfigure the service - configuration once it get started. Thanks to Mike Goldman - for reporting the problem. - -Wed Jan 6 14:27:24 EST 1999 James CE Johnson tutorial. It could be a lot better - than it is but I'm still new to ACE_Malloc... - - * docs/tutorials/021/online-tutorials.html: - Added the link for #21 - -Tue Jan 05 22:55:07 1999 Irfan Pyarali - - * ace/Strategies_T.cpp (cleanup_hint_i and check_hint_i): Since we - are holding the connection cache lock in these methods, the - Svc_Handler should not call purge(). If it does, a deadlock - will occur (unless we have recursive locks) since we are already - holding the connection cache lock. Therefore, we zero out the - recycler before calling svc_handler->close() and purge out the - svc_handler entry ourself (through purge_i()). - - Thanks to Mark L. Boriack for providing - a precise example illustrating this bug. - -Tue Jan 5 18:48:47 James CE Johnson - - * docs/tutorials/templates.html: Fixed a number of problems here. - Thanks to Amos Shapira for pointing - them out. - - * docs/tutorials/colorize: I pulled out the colorization code from - combine into this standalone script. One of these days I'll fix - combine so that the code isn't duplicated... - -Tue Jan 5 16:14:00 1999 Carlos O'Ryan - - * ace/config-irix6.x-common.h: - Added ACE_TIMER_SKEW definition. - - * ace/FILE.cpp: - Fixed the seek() prototype, is was declared as taking a "off_t" - argument, but is was defined with a "long" argument, - unfortunately in most platforms this was not a problem. - -Tue Jan 05 13:15:35 1999 Nanbor Wang - - * ace/Service_Config.i (open): Be sure to pass down the - argument down to the real open method. - -Tue Jan 05 08:08:06 1999 David L. Levine - - * tests/MM_Shared_Memory_Test.cpp (spawn): fixed syntax error - by moving ) to end of ACE_ERROR invocation. - - * ace/config-osf1-4.0.h: added 10 ms ACE_TIMER_SKEW, so that - MT_Reactor_Timer_Test passes. - - * ace/config-lynxos.h: added 10 ms ACE_TIMER_SKEW, so that - MT_Reactor_Timer_Test comes closer to passing. It now - chokes on the wait () near the end. - - * ace/OS.i (thr_getspecific): moved return 0 statement inside - the Draft 7/STD #else block, to avoid warning about unreachable - statement with Draft 4/6. - - * ace/config-osf1-4.0.h: with Draft 4 pthreads, added - ACE_LACKS_READDIR_R. - - * tests/MT_Reactor_Timer_Test.cpp (main): added printout if - wait () fails. - -Tue Jan 5 00:59:04 1999 Douglas C. Schmidt - - * ace/Synch: Changed the remove() method of ACE_Thread_Mutex, - ACE_Mutex, ACE_Semaphore, ACE_RW_Mutex, ACE_Event, - ACE_Thread_Condition_Mutex, ACE_File_Lock, and - ACE_Recursive_Thread_Mutex so that they check a flag to see if - remove() has already been called. If it has, then the remove() - call does nothing. This avoids nasty problems on platforms like - Win95 that fail mysteriously if locks are destroyed multiple - times. Note that our solution isn't perfect since it won't - protect against race conditions if multiple threads call - remove() simultaneously. However, if this happens it's a sign - that the application was designed incorrectly... Thanks to Paul - Felix and Irfan for tracking this down.... - - * ace/FILE: Added new methods, seek() and tell(), that are more - intuitively named than the existing position() methods. The - position() methods have been retained for backwards - compatiblity, but are now marked as deprecated. - - * ace/OS.h: Added a macro for ACE_DEFAULT_HTTP_PORT, which - is 80 of course... - - * ace/INET_Addr.cpp: Make sure that addr_to_string() correctly - checks the length of its buffer before doing a sprintf(). In - addition, added an option to print the results in either ip-addr - format or ip-name format. - - * ace/Mem_Map.cpp (map): where ace/Mem_Map.cpp mmap() will succeed - if the length of the file mapping is 0, which will be the case - if we've just created the file. This was the wrong place to - make this check. - - * tests/MM_Shared_Memory_Test.cpp: Cleaned up a few things - in this test so that it'll be easier to maintain. - -Mon Jan 04 08:45:45 1999 David L. Levine - - * ace/config-sunos5.7.h: only use the g++ hacks if the - g++ version is prior to 2.8. Assume that later versions - were built on SunOS 5.7 host, and/or don't have header - files that are incompatible with the system headers. - - * bin/create_ace_build: changed symlink creation failure from - error (with termination) to warning create_ace_build. - -Mon Jan 4 03:15:57 1999 Douglas C. Schmidt - - * ace/Mem_Map: If we're remapping an already-mapped file - (i.e., the base_addr_ != 0) && the addr parameter IS 0 (i.e., - the user isn't trying to respecify where to map this file), then - we'll try to map over top of the existing region, which implies - "MAP_FIXED". - -Sun Jan 03 23:21:46 1999 Nanbor Wang - - * ace/Service_Config.cpp (initialize): Both initialize methods now - remove the service object from the repository if its init() - method failed. - -Sun Jan 3 14:39:49 1999 Douglas C. Schmidt - - * ace/ACE: Added a simple dirname() wrapper method. - - * ace/SString: The set(const char *, size_t, int = 1) and - set(const char *, int) methods were inherently ambiguous. - I've fixed this by changing removing the default parameters. - Thanks to Irfan for suggesting this fix. - - * ace/Mem_Map.cpp: mmap() will fail if the length of the file - mapping is 0, which will be the case if we've just created the - file. Therefore, don't even bother trying to mmap() in this - case and return a successful result. - - * ace/FILE: Moved the get_remote_addr() and get_local_addr() - methods from the FILE_IO class to the FILE class since that's - more properly where they belong. Also added a new remove() - method that unlinks the file. - - * tests/Priority_Reactor_Test.cpp, - tests/Conn_Test.cpp, - tests/Notify_Performance_Test.cpp, - Priority_Reactor_Test.cpp, - Reactor_Performance_Test.cpp: Since the default is to skip argv0 - there's no sense explicitly saying this in the constructor of - ACE_Get_Opt. - - * ace/FILE_Connector.h: Updated the comments to reflect recent - changes. - - * ace/FILE.h: Added a new get_info() method that takes a reference - to an ACE_FILE_Info rather than a pointer. This is a cleaner - API, IMHO. - - * ace/FILE_Connector.cpp (connect): When the argument - is ACE_Addr::sap_any, then connect will select a temporary - filename using the new feature of ACE_FILE_Addr described below. - - * ace/FILE_Addr.cpp (set): When the address is ACE_Addr::sap_any, - then we'll select a new temporary filename using the new - ACE_DEFAULT_TEMP_FILE macro and ACE_OS::mktemp(). - - * ace/OS.h: Added a new ACE_DEFAULT_TEMP_FILE macro that defaults - to "/tmp/ace-file-XXXXXX" and is used by the ACE_FILE_Connector - to create a temporary file when it's given an ACE_Addr::sap_any. - - * ace/FILE_Addr.h: The accessor should return an int to be - consistent. - - * ace/OS.h: Added a new ACE_sap_any_cast macro, which makes it - much easier to cast the ACE_Addr::sap_any to the right subclass. - - * tests/Reactor_Performance_Test.cpp, - tests/Reactor_Exceptions_Test.cpp, - tests/Process_Strategy_Test.cpp, - tests/Priority_Reactor_Test.cpp, - tests/IOStream_Test.cpp, - tests/Conn_Test.cpp: Replaced all the C-style casts for - ACE_Addr::sap_any with the new ACE_sap_any_cast macro. - -Sun Jan 03 21:48:37 1999 Irfan Pyarali - - * ace/Asynch_Acceptor.cpp: Since this is a template file, I - removed it from the ace library build on NT. - - * ace/Asynch_Acceptor.cpp (open): Changed C-style cast to use the - new ACE_sap_any_cast macro from Dr. Schmidt. - -Sun Jan 03 09:12:23 1999 David L. Levine - - * ace/config-sunos5.5.h: with GreenHills, added - ACE_LACKS_LINEBUFFERED_STREAMBUF and ACE_LACKS_SIGNED_CHAR. - - * ace/Basic_Types.* (ACE_U_LongLong): unioned the data members - with a double, to ensure alignment on 8-byte boundaries. It - could matter when an ACE_U_LongLong is used as a true 8-byte - quantity, such as in a call to Solaris ::gethrtime (). - - * tests/Time_Value_Test.cpp: replaced remaining #ifdef - ACE_HAS_STHREADS with #ifdef sun. - -Sat Jan 2 23:48:44 1999 James CE Johnson - - * docs/ACE-tutorials.html - * docs/tutorials/guide-tutorials.html - * docs/tutorials/new-tutorials.html - * docs/tutorials/online-tutorials.html - Converted some of the absolute URLs to relative. I only have the - docs/tutorials tree here at home so I couldn't do any more than - these. - - * docs/tutorials/021/* - New tutorial on ACE_Malloc<>. I haven't begun the documentation - yet but wanted to get the code commited so it doesn't get lost. - -Sat Jan 02 08:34:27 1999 David L. Levine - - * examples/ASX/Event_Server/Event_Server/event_server.cpp - (handle_input), - examples/Reactor/Misc/test_early_timeouts.cpp (main): - added ACE_UNUSED_ARG (n), to avoid compile warning with ACE_NDEBUG. - - * performance-tests/Misc/test_naming.cpp (find): moved function - call w/side effect out of ACE_ASSERT. Thanks to DU 4.0 cxx - for noticiing it, with ACE_NDEBUG. - -Fri Jan 01 18:57:22 1999 David L. Levine - - * ace/Containers_T.i (ACE_Array,ACE_Array::operator=): - added missing ACE_INLINE's. - - * ace/OS.{h,cpp} (ACE_TSS_Info::operator{==,!=}): added - constness. It's necessary with the ACE_Array changes, - with ACE_HAS_TSS_EMULATION. - -Fri Jan 1 12:22:14 1999 Carlos O'Ryan - - * ace/Containers_T.h: - * ace/Containers_T.i: - * ace/Containers_T.cpp: - * bin/Array_Helper: - * bin/Array.pl: - Moved most of the implementation of ACE_Array into - ACE_Array_Base this class does not require == or != operators - defined for the template parameter. - I also added methods to access and manipulate the capacity of - the array (max_size) as opposed to always changing its size (the - portion actually used). - - * ace/Object_Manager.cpp: - * ace/Template_Instantiations.cpp: - * ace/OS.cpp: - * apps/JAWS/clients/Caching/URL_Properties.cpp: - Fixed ACE_Array instantiations. diff --git a/ChangeLogs/ChangeLog-99b b/ChangeLogs/ChangeLog-99b deleted file mode 100644 index 2bdeb97ccd3..00000000000 --- a/ChangeLogs/ChangeLog-99b +++ /dev/null @@ -1,7290 +0,0 @@ -Fri Dec 31 08:07:18 1999 David L. Levine - - * all Makefiles: updated dependencies. - -Thu Dec 30 11:17:27 1999 David L. Levine - - * etc/ACE-development-process.html: fixed some typos. - -Wed Dec 29 15:42:21 1999 David L. Levine - - * ace/OS.h: added null definition of ACE_ENDLESS_LOOP, - if not already #defined. - - * ace/config-cxx-common.h: added definition of ACE_ENDLESS_LOOP - to avoid compiler warning about unreachable statement following - the loop. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp (main): - inserted ACE_ENDLESS_LOOP. - -Wed Dec 29 13:21:48 1999 David L. Levine - - * include/makeinclude/platform_linux_cxx.GNU: added - MATHLIB and test -f cxx_repository/*.o. - -Wed Dec 29 09:11:46 1999 David L. Levine - - * ace/config-cxx-common.h: enable ACE_USES_OLD_IOSTREAMS - without __USE_STD_IOSTREAM. Removed ACE_HAS_STRING_CLASS - on Linux, because IOStream_Test won't compile with it. - - * include/makeinclude/platform_linux_cxx.GNU: removed - -D__USE_STD_IOSTREAM test, because IOStream_Test failed - with it. - - * include/makeinclude/platform_linux_cxx.GNU: Removed - -use_ld_input because it has no effect on Linux. Thanks - to Ken Block for pointing - that out. - -Tue Dec 28 18:32:02 1999 Vishal Kachroo - - * ace/QoS_Session_Impl.cpp: Added a comment for get qos(). - - * examples/QOS/Receiver_QOS_Event_Handler.cpp: - * examples/QOS/Receiver_QOS_Event_Handler.h: - * examples/QOS/server.cpp: - - Changed the server of the GQoS example to use the newly added - QoS classes of ACE. The program structure has changed to reflect - the abstractness of the ACE QoS API. The final goal is to remove - all the GQoSisms from the applications, even if this means - constraining it by the granularity provided by RAPI. - -Tue Dec 28 15:50:46 1999 David L. Levine - - * tests/test_config.h (set_output): removed the flags - local variable, with its conditionally compiled type - determination. The absorbed code is much cleaner. - -Tue Dec 28 15:37:11 1999 Chris Gill - - * ace/Log_Msg.cpp - ace/Malloc.cpp - ace/OS.{cpp, h, i} - ace/Process_Manager.cpp - ace/SOCK_Dgram_Mcast.cpp - ace/Service_Config.{cpp, h} - ace/Task.cpp - ace/Thread.i - ace/Thread_Manager.{cpp, h} - - ace/config-psos-diab-ppc.h: merged in changes for pSOS (Diab PPC) - to support additional pHILE+ file system capabilities, and to deal - with the limitations on sharing file and socket handles across pSOS - tasks. Thanks to Sarmeesha Reddy and Steve Tine of Motorola for - contributing these changes to ACE. - -Tue Dec 28 15:32:55 1999 David L. Levine - - * tests/Makefile: build libDLL_Test.so before building - any executables, so that it doesn't see the template - instantiations from all of the tests (after a make - realclean, anyways). - -Tue Dec 28 08:55:23 1999 David L. Levine - - * include/makeinclude/platform_linux_cxx.GNU: - added -D__USE_STD_IOSTREAM. - - * ace/config-cxx-common.h,ace/config-linux-common.h: - added support for __USE_STD_IOSTREAM. - -Tue Dec 28 02:03:11 1999 Nanbor Wang - - * ace/Container_T.i (remove): Changed to call the method - using the in ACE_DLList[_Reverse]_Iterator, otherwise, - the in the ACE_Double_Linked_List got called which - incurred memory leaks. Thanks to Lorin Hochstein - for reporting the bug. - -Mon Dec 27 21:29:25 1999 David L. Levine - - * tests/Log_Msg_Test.cpp (test_ostream): removed local - variable flags, because cxx X6.3/Linux doesn't like - it as an int. - -Mon Dec 27 19:17:46 1999 Vishal Kachroo - - * ace/SOCK.cpp: Added #pragma template instantiations for g++. - -Mon Dec 27 16:24:09 1999 David L. Levine - - * ace/IOStream.h (setb): commented out declaration of - unused arg a. - -Mon Dec 27 15:51:39 1999 David L. Levine - - * tests/test_config.h (set_output): with __USE_STD_OSTREAM - (with Compaq cxx X6.3 on Linux), declare variable flags - as std::ios_base::openmode instead of int. Otherwise, - it complained about a type mismatch. Other compilers - may need this eventually, as well. egcs didn't like it, - so let's wait to see how best to generalize it. - -Mon Dec 27 13:03:50 1999 Vishal Kachroo - - * ace/QoS_Session_Impl.cpp: fixed the "pragma once is obsolete" - warning thrown by Sung++. - -Mon Dec 27 12:27:33 1999 Nanbor Wang - - * tests/run_tests.bat: Changed to allow _Borland 4_ users to set - the PATH environment variable to include the path to the - appropriate ACE dll if necessary, and it sets the PATH - environment variable to the correct directory depending on the - "build options". Thanks to Charles Frasch - for contributing this fix. - -Mon Dec 27 11:29:20 1999 David L. Levine - - * include/makeinclude/platform_linux_cxx.GNU: removed - -I/usr/include/g++. (It's not needed with\end{verbatim} - ACE_HAS_CPLUSPLUS_HEADERS.) Thanks to Judy Ward - for pointing out that cxx should - not be using the g++ headers. - - * ace/config-cxx-common.h: on Linux, #define - ACE_HAS_CPLUSPLUS_HEADERS instead of ACE_LACKS_ACE_IOSTREAM. - -Mon Dec 27 09:28:40 1999 Balachandran Natarajan - - * QoS_Session_Impl.h: Fixed a warning in g++. - -Sun Dec 26 23:45:44 1999 Vishal Kachroo - - * QoS_Session.h: Provided a definition for the virtual destructor - of ACE_QoS_Session. - - * QoS_Session_Impl.{cpp,h}: Replaced the - ACE_LACKS_INLINE_FUNCTIONS macro with __ACE_INLINE__. - - * ace/ace_dll.dsp: Added the new QoS files to the NT DLL project. - -Sun Dec 26 21:50:46 1999 Vishal Kachroo - - The following existing files were changed for the ACE QoS API. - - * SOCK.h: - * SOCK.cpp: - Added a QoS session set to the ACE_SOCK. Also methods to join - a new QoS session. - - * SOCK_Dgram_Mcast.h: - * SOCK_Dgram_Mcast.cpp: - The QoS subscribe method was changed to accommodate QoS. - - The following new files were added. - - * QoS_Session.h: Has the abstract base class for concrete QoS - implementations. - - * QoS_Session_Factory.{h,cpp}: Concrete Factory for QoS - implementations. Currently two implementations are - supported, RAPI and GQoS. - - * QoS_Session_Impl.{h,cpp,i}: Has the QoS implementation classes. - RAPI and GQoS are supported. - - * ace/Makefile: Added the new QoS classes. - - * include/makeinclude/wrapper_macros.GNU (): Added the - ACE_HAS_RAPI flag. For ACE to have RAPI support it should be - built with "make rapi=1". The platform_macros.GNU should have - - PLATFORM_RAPI_CPPFLAGS= - PLATFORM_RAPI_LIBS=-lrsvp - PLATFORM_RAPI_LDFLAGS= - -Sun Dec 26 16:43:16 1999 Yamuna Krishnamurthy - - * ace/OS.i: - Replaced malloc with ACE_NEW_RETURN - -Fri Dec 24 16:33:48 1999 Ossama Othman - - * acconfig.h: - - Added ACE_HAS_RECURSIVE_MUTEXES to list of macros. - - * configure.in: - - Fixed ACE_LACKS_SETSCHED test. It previously didn't check that - sched_setscheduler() existed. Both sched_setscheduler() and - either pthread_attr_setschedpolicy() or pthread_attr_setsched() - must be defined. This was an AIX related fix. - - Initialized variables in all compile-time tests. This fixes - compile-time test warnings on AIX. - -Fri Dec 24 13:06:59 1999 Ossama Othman - - The following fixes were motivated by problems discovered in a - configure script log file (config.log) that was generated on AIX, - and sent in by Mike Winter . - - * THANKS: - - Added my Mike Winter to the THANKS list. - - * acconfig.h: - - Removed an extraneous comment. - - * configure.in: - - Added tests for ACE_HAS_BROKEN_XTI_MACROS and - ACE_HAS_BROKEN_T_ERROR. - - Updated TLI/XTI preprocessor directives in TLI/XTI related - tests. - - Fixed pthread_rwlock_t and pthread_rwlockattr_t structure - tests. Previously the tests were missing the header files to - search in. - - AIX defines _THREAD_SAFE in . Check if it is defined - after including . - - * ltcf-cxx.sh: - - Added Digital/Compaq C++ libtool support. - - Minor Sun C++ updates. - - * ace/OS.h: - - AIX defines TCP_NODELAY and TCP_MAXSEG in tiuser.h so undefine - them if ACE_HAS_BROKEN_XTI_MACROS is defined before including - tiuser.h. - - Simplified TLI/XTI related macros. - -Fri Dec 24 08:04:58 1999 Douglas C. Schmidt - - * ace: - tests: Moved ace/Auto_IncDec_T.cpp to - tests/Auto_IncDec_Test.cpp, which is where it belongs. Thanks - to David for reporting this. - -Thu Dec 23 13:57:04 1999 David L. Levine - - * include/makeinclude/rules.local.GNU: uncommented the - rules for building .o files from .C and .cc files. - They've been commented out since this file was put - under CVS control, so it's not obvious why they can't - be used. Thanks to Wei.Chiang@nokia.com for suggesting - this. - -Thu Dec 23 12:16:38 1999 Christopher Kohlhoff - - * ace: Added missing files Capabilities.cpp and Configuration.cpp - to $ACE_ROOT/ace/Makefile.bor. - - * ACE/tests: Added new tests Auto_IncDec_Test and - Capabilities_test to Makefile.bor. - - * ACE/tests: Fixed syntax error in a Borland C++Builder specific - section of Auto_IncDec_Test.cpp. - - * ACE/tests: Fixed Malloc_Test so that it does not fail with - Borland C++Builder. - - * ACE/tests/ Changed run_tests.bat so that it does not invoke - ACE_Init_Test when run with the "bor" command line - argument. This test uses MFC and need not be built or run. - -Thu Dec 23 11:46:38 1999 Douglas C. Schmidt - - * ace/OS.h: Moved - - #if defined (ACE_HAS_SYS_FILIO_H) - # include /**/ - #endif /* ACE_HAS_SYS_FILIO_H */ - - from OS.i to OS.h so that the FIONREAD macro will be defined for - the ACE_SOCK_Dgram::recv() method even if inline = 0. Thanks to - Alain Sauron for reporting this. - -Wed Dec 22 11:29:43 1999 Nanbor Wang - - * bin/auto_compile_win32.pl: Renamed ImplRepo.dsw to - ImplRepo_Service.dsw. Thanks to Derek Dominish - for reporting this. - -Wed Dec 22 08:44:56 1999 Douglas C. Schmidt - - * tests/Log_Msg_Test.cpp: Conditionally compiled the iostream - print statements so that the test builds correctly if - ACE_LACKS_IOSTREAM_TOTALLY is defined. Thanks to David Levine - for reporting this. - -Wed Dec 22 08:22:24 1999 David L. Levine - - * tests/CDR_File_Test.cpp: disabled with - ACE_LACKS_IOSTREAM_TOTALLY. - -Tue Dec 21 21:27:48 1999 David L. Levine - - * ace/config-cxx-common.h: enable ACE_LACKS_ACE_IOSTREAM - on Linux. cxx 6.3 generates unresolved streambuf symbols, - otherwise. - - * include/makeinclude/platform_linux_cxx.GNU: added. - - * include/makeinclude/platform_osf1_4.0.GNU: changed comment - now that cxx code is in ace/config-cxx-common.h. - -Tue Dec 21 08:02:43 1999 Douglas C. Schmidt - - * ace/Log_Msg.h (ACE_Log_Msg): Clarified that the - ACE_Log_Msg_Callbacks are not inherited when a new thread is - spawned. Thanks to Airat A. Sadreev - for reporting this. - -Tue Dec 21 11:31:18 1999 bala - - * ACE version 5.0.10 released. - -Tue Dec 21 01:04:55 1999 Ossama Othman - - * ACE-configuration.txt: - - Updated information about using ACE+autoconf. - - * configure.in: - - Moved AC_{EXE,OBJ}EXT tests before C++ linker flags since these - tests require C linker flags. - - * Makefile (release, releaseall): - - ACE-INSTALL should be a dependency of these targets in order for - it to be generated. This fixes a "no such file or directory" - error that occurs when making an ACE beta/release. Note that - this fix is unrelated to the ACE+autoconf bootstrapping support - that was recently added. - - * bin/bootstrap: - - Output message that lets the user know that bootstrapping is - done. - -Mon Dec 20 23:55:18 1999 Ossama Othman - - * Makefile (release, releaseall): - - Removed ACE+autoconf bootstrapping commands. Bootstrapping must - be done later in the process (i.e. in bin/make_release). - - * bin/make_release: - - Fixed MD5 checksum generation. - - Added temporary hacks to bootstrap ACE+autoconf support into the - release. - -Mon Dec 20 22:15:45 1999 Ossama Othman - - * Makefile: - - Added ACE-configuration.txt, ltcf-c.sh, ltcf-cxx.sh and - Makefile.in to the list of CONTROLLED_FILES. - - Added ACE+autoconf bootstrapping commands the release and - releaseall targets. This allows a bootstrapped ACE+autoconf - setup to be shipped with ACE, thus allowing the configure script - to work "out of the box." - - * bin/bootstrap: - - Added bootstrapping options that enable or disable certain types - of workspaces. By default, automatic dependency tracking is - disabled by default. - - * bin/make_release: - - If path to additional GNU tools is broken, default to existing - PATH and hope for the best. - - Fixed MD5 checksum generation. - -Mon Dec 20 21:14:41 1999 Ossama Othman - - * configure.in: - - Disabled maintainer mode check that prevented users from running - the configure script. - - Added experimental libtool C++ support. - - Replaced CVS directory check with top-level source directory - check to prevent stock ACE makefiles from being overwritten - during configuration. - - * ltcf-c.sh: - * ltcf-cxx.sh: - - Adding these files to the CVS repository. They will soon be - merged into the upstream libtool package. Local copies will no - longer be necessary. - - * m4/acinclude.m4: - - Alot of M4 quoting fixes/improvements. - - Reduced size ACE_CONVERT_WARNINGS_TO_ERRORS Autoconf macro. It - still needs to be refined a bit (e.g. AC_REQUIREing compiler - flag setups). - - (ACE_CHECK_SETRLIMIT_ENUM, ACE_CHECK_GETRUSAGE_ENUM): - - Added regex for one or more spaces before function name to - prevent functions such as "__getrusage" from matching the - regex. This fixes a problem on platforms that have both - "getrusage," and "__getrusage," for example. - - (ACE_CHECK_TOP_SRCDIR): - - Added this autoconf macro. It prevents ACE from being - configured in the top-level source directory. Configuring ACE - in the top-level source directory would cause the stock ACE - makefiles to be overwritten. Since autoconf support in ACE is - still in the testing stages, we need to make sure that users can - fall back on the stock ACE build procedure. This "feature" can - be overridden by using the "--enable-maintainer-mode" configure - script option. - - * m4/compiler.m4: - - Set variable "WERROR" that contains the compiler flags to - convert warnings to errors. Eventually, this support should be - moved to its own macro that is AC_REQUIREd by - ACE_CONVERT_WARNINGS_TO_ERRORS. - - * m4/features.m4 (ACE_CHECK_ASYNCH_IO): - - Minor M4 quoting fixes/improvements. - -Sun Dec 19 09:34:49 1999 David L. Levine - - * bin/g++dep: set TAO_ROOT to $ACE_ROOT/TAO if it was - unset. Thanks to Darrell for reporting that TAO_ROOT - wasn't being substituted if it wasn't set. - -Sat Dec 18 01:16:20 1999 Irfan Pyarali - - * ace/ACE.cpp (recv_i and send_i): The selection of the next - message block to send/recv was incorrect. The correct way is to - chase the continuation chain and then go to the next - continuation chain. - -Fri Dec 17 22:25:56 1999 David L. Levine - - * ace/config-cxx-common.h: added, to factor out common - configuration for Compaq cxx. - - * ace/config-osf1-4.0.h,config-linux-common.h: updated to - use config-cxx-common.h. - -Fri Dec 17 21:32:48 1999 David L. Levine - - * ace/config-linux-common.h: added support for Compaq - (Digital) cxx. Currently, that just means allowing - compilation to succeed. - -Fri Dec 17 21:29:19 1999 David L. Levine - - * ace/OS.h: use __DECCXX instead of DEC_CXX to detect that - the compiler is Compaq (Digital) cxx. DEC_CXX is - #defined in ACE config files for cxx, but __DECCXX is - #defined by the compiler. Only the latter should be used. - -Fri Dec 17 21:20:48 1999 David L. Levine - - * ace/TTY_IO.cpp (control): added static cast of TCSETS to - int to avoid cxx 6.3 warning about conversion of unsigned - int to int. Also added the cast to TCGETS. - -Fri Dec 17 14:40:02 1999 Nanbor Wang - - * ace/Local_Tokens.h (ACE_TSS_TPQ_Entry): Made the destructor - virtual to avoid warnings from egcs. - -Fri Dec 17 13:27:24 1999 Steve Huston - - * ace/config-pharlap.h: Added ACE_LACKS_TCP_NODELAY. Thanks to David - Hauck for this. Fixes bugzilla #270. - -Fri Dec 17 11:38:09 1999 Douglas C. Schmidt - - * We just reached our 800th external contributor: Andrey - Nechypurenko . Andrey gets a free copy of - ACE+TAO as a prize! - - * ace/config-linux-common.h: Wrapped the #define - ACE_DEFAULT_SELECT_REACTOR_SIZE with a #if !defined() so that - users can override this. Thanks to Charlie Duke - for suggesting this. - -Thu Dec 16 12:26:36 1999 Nanbor Wang - - * bin/auto_compile_win32.pl: Took out Concurrency Service from the - build list. - -Wed Dec 15 21:24:05 1999 Irfan Pyarali - - * ace/config-win32-common.h (ACE_DEFAULT_MAX_SOCKET_BUFSIZ): - Windows doesn't like 65536 ;-) If 65536 is specified, it is - listenly ignored by the OS, i.e., setsockopt does not fail, and - you get stuck with the default size of 8k. - -Tue Dec 14 08:57:03 1999 Vishal Kachroo - - * ace/OS.h: Added a #ifdef for WINSOCK2_GQOS for removing the - errors on NT due to the previous change in ACE_Flow_Spec class. - -Tue Dec 14 07:49:58 1999 Vishal Kachroo - - * ace/OS.i: - * ace/OS.h: Extended the ACE_Flow_Spec and ACE_QoS classes to - accommodate the use of such classes for non-Win32 - platforms. These changes are motivated by the new ACE QoS - classes that will soon be included with ACE. - -Mon Dec 13 16:23:22 1999 Nanbor Wang - - * ace/Malloc.{h,cpp}: Made print_alignment_info available for all - configuration. - -Mon Dec 13 02:49:04 1999 Nanbor Wang - - * ace/Memory_Pool.cpp (remap): Commented out the printout of remap - message in MMAP_Memory_Pool as this function is called from the - signal handler. (It didn't really cause any problem but we - shouldn't use ACE_DEBUG from signal handlers anyway.) - -Mon Dec 13 01:12:00 1999 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (update_state): make_changes() calls into - user code which can request other changes. So keep looping - until all requested changes are completed. Thanks to Edan Ayal - for reporting this problem! - -Sun Dec 12 20:10:23 1999 Nanbor Wang - - * ace/config-hpux-10.x.h: Tweaked ACE_MALLOC_PADDING, - ACE_MALLOC_ALIGN, and ACE_CONTROL_BLOCK_ALIGN_LONGS manually for - HPUX. - - * tests/Malloc_Test.cpp: Added an ACE_TEST_REMAP_ON_FAULT macro - which is not defined on linux only. Linux seems to have problem - calling mmap from within the signal handler. - -Sat Dec 11 15:00:43 1999 Nanbor Wang - - * tests/Malloc_Test.cpp (main): Alignment information should only - be printed when ACE_NDEBUG is not defined. - -Sat Dec 11 14:27:27 1999 Ossama Othman - - * ace/Makefile.am (pkginclude_HEADERS): - - Split header file list into `.h' files (HEADER_FILES) and `.i' - (INLINE_FILES). This gets around a limitation on Solaris. - -Sat Dec 11 10:40:38 1999 Nanbor Wang - - * ace/config-lynxos.h: Added ACE_HAS_TYPENAME_KEYWORD. - -Fri Dec 11 11:13:54 1999 James Hu - - * ace/Dirent.i: - Constructor with a path passed in was not initializing dirp_. - -Fri Dec 10 17:29:54 1999 Nanbor Wang - - * ace/Malloc.h: - * ace/Malloc.cpp: Added methods for both - control block. They are only available for debug version. - - * tests/Malloc_Test.cpp: Removed temporary debug print out and - changed to use . - - This test no longer forces the mmap to remap. Linux doesn't - handle the case correctly. - -Fri Dec 10 15:37:09 1999 Douglas C. Schmidt - - * ACE-INSTALL.html: Clarified how the clone procedure should - work. Thank to Jerry D. De Master - for suggesting this. - - * ace/OS.h: Changed the value of O_NDELAY from 0 to 1 on - Windows NT. Thanks to Craig Perras for - reporting this. - -Fri Dec 10 15:55:53 1999 Ossama Othman - - * ace/Configuration.cpp: - - Added a comment stating that ACE_SYNCH_MUTEX should not be used - in the template instantiations because the resulting template - instantiation for the single-threaded case already exists in - ACE. Thanks to Doug for letting me know about this. - - * m4/compiler.m4 (CXXFLAGS): - - Added missing flags that fix Sun C++ 5.0 weirdness on Solaris. - -Fri Dec 10 14:35:26 1999 Ossama Othman - - * acconfig.h (_RWSTD_NO_EXCEPTIONS): - - Sun CC 5.0 without exception support needs this macro to be - defined to prevent warnings from occurring due to its broken - header. - - * configure.in: - - Added a few "checkpoints" where the cache is saved to aid in - debugging. - - (ACE_HAS_THREAD_SPECIFIC_STORAGE): - - Added check for pthread_keycreate(). Old POSIX threads - implementations used pthread_keycreate() instead of - pthread_key_create(). - - (ACE_HAS_SIG_C_FUNC): - (ACE_HAS_THR_C_FUNC): - (ACE_HAS_THR_C_DEST): - - Added tests that check if signal handlers, thread start - routines, and thread destructors should be declared `extern - "C"'. These changes allow clean builds on Solaris 7 with Sun CC - 5.0. - - (ACE_HAS_STDARG_THR_DEST): - - Check if thread destructor argument to pthread_key_create (or - pthread_keycreate) should be of type `void(*)(...)'. - - * m4/compiler.m4 (_RWSTD_NO_EXCEPTIONS): - - Define _RWSTD_NO_EXCEPTIONS when compiling on Solaris with Sun - CC 5.0 without exceptions. - -Fri Dec 10 11:43:50 1999 Douglas C. Schmidt - - * tests/run_tests.lst: Disabled the MT_Reactor_Timer_Test - until Darrell can fix the timer queue. - -Fri Dec 10 07:24:12 1999 David L. Levine - - * ACE-INSTALL.html: on VxWorks, automatic - construction/destruction of static objects should be enabled. - Thanks to Erik Johannes for reminding - me of this. - -Thu Dec 9 17:18:57 1999 Douglas C. Schmidt - - * ace/Acceptor.cpp (handle_input): Only printout a diagnostic - message if ACE::debug () > 0. Thanks to Chris Uzdavinis - for reporting this. - -Thu Dec 9 19:55:58 1999 Ossama Othman - - * acconfig.h: - * configure.in: - - Added checks/support for the ACE_HAS_PTHREADS_UNIX98_EXT macro. - - * ace/OS.h (ACE_rwlock_t): - * ace/OS.i (rw_tryrdlock, rw_trywrlock, rw_rdlock, rw_wrlock, - rw_unlock): - - ACE_LACKS_RWLOCK_T should not imply !ACE_HAS_PTHREADS_UNIX98_EXT - because the pthread_rwlock_t type exist despite the fact that - rwlock_t doesn't. - -Thu Dec 09 15:53:20 1999 Nanbor Wang - - * ace/Malloc.cpp: - * ace/Malloc.h: - * ace/Malloc.i: Separated the control block implementation into - "position independent control block" and "lean and mean control - block." Each control block implementation has its own - definitions of Malloc_Header and Name_Node as inner classes. - ACE_Control_Block implements the "old, lean and mean" control - structure for ACE_Malloc_T and ACE_PI_Control_Block implements - the "new, position independent" control structure for - ACE_Malloc_T. - - Added several macros to finer control the padding and alignment - because calculating the padding requires using some operations - that can not be evaluated during the compile time and the - original padding length calculation don't always work. Usually, - you don't have to worry about the padding. But if you are - interested in tweaking these parameters, here are some hints. - - - (ACE_MALLOC_PADDING): defines the minimum size of a Malloc_Header. - The actual size of Malloc_Header should always be the a multiple - of ACE_MALLOC_ALIGN and may be larger then ACE_MALLOC_PADDING. - - - (ACE_MALLOC_PADDING_SIZE): define the actual size of the array - of long used to pad the ACE_Control_Block::ACE_Malloc_Header. - If it is not defined by the user, ACE will try to calculate it - for you. If it is defined as 0, there'll be no padding at all. - This macro is compiler/platform dependent. - - - (ACE_CONTROL_BLOCK_ALIGN_LONGS): define the actual size of the - array of long used to pad the ACE_Control_Block so that the - first Malloc_Header always starts from the alignment boundary. - If it is not defined by the user, ACE will try to calculate it - for you. If it is defined as 0, there'll be no padding at all. - This macro is compiler/platform dependent. - - - (ACE_PI_MALLOC_PADDING_SIZE): similar to ACE_MALLOC_PADDING_SIZE - but applied to ACE_PI_Control_Block::ACE_Malloc_Header. - - - (ACE_PI_CONTROL_BLOCK_ALIGN_LONGS): similar to - ACE_CONTROL_BLOCK_ALIGN_LONGS but applied to - ACE_PI_Control_Block. - - * ace/Malloc_T.cpp: - * ace/Malloc_T.h: - * ace/Malloc_T.i: Parameterized the type of control block used in - ACE_Malloc, which is now renamed to ACE_Malloc_T, as a template - parameter so that we can control tradeoff between efficiency and - flexibility. - - Another ACE_Malloc template class was added which simply use - ACE_Malloc_T with ACE_Control_Block as its internal control - structure so that we don't have to change the existing programs - using ACE_Malloc. However, for platforms/compilers using - explicit template instantiation, you still need to add the - instantiations for the based template class. For example, if - you instantiated "ACE_Malloc", you'll need to add - "ACE_Malloc_T". Likewise for - ACE_Malloc_LIFO_Iterator and ACE_Malloc_FIFO_Iterator. - - * ace/Based_Pointer_T.h: Renamed arguments "overload" to "o". KCC - complained about using "overload" as variable names - - * ace/Configuration.cpp: - * ace/Naming_Context.cpp: - * ace/Service_Config.cpp: - * ace/System_Time.cpp: - * ace/Template_Instantiations.cpp: - * docs/tutorials/021/client.cpp: - * docs/tutorials/021/server.cpp: - * examples/Reactor/Misc/demuxing.dsp: - * examples/Shared_Malloc/Malloc.cpp: - * examples/Shared_Malloc/test_persistence.cpp: - * examples/System_V_IPC/SV_Semaphores/Semaphores.cpp: - * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp: - * examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp: - * performance-tests/TCP/TCP.dsp: - * tests/Malloc_Test.cpp: - * tests/SV_Shared_Memory_Test.cpp: Added explicit template - instantiations for base malloc class in corresponding with the - above change. - -Thu Dec 09 15:40:03 1999 David L. Levine - - * ace/OS.i (mmap): on LynxOS, fixed use of file_mapping - argument. It it was 0, set it equal to the address of - an int on the stack. Thanks to Chad Elliott - for reporting a problem with - ACE_OS::mmap on LynxOS. And thanks to Chad for an - explanation of why Malloc_Test and TAO's Naming_Service -f - don't work: it's because they require that the mapped - object be changed. LynxOS 3.0.x and earlier don't support - that. - -Thu Dec 09 07:30:12 1999 David L. Levine - - * Makefile (CONTROLLED_FILES): added ChangeLog-99a. Thanks - to Pierre Oberson for reporting - that it was missing. - -Wed Dec 8 13:36:59 1999 Ossama Othman - - * configure.in (ACE_SYS_RESTARTABLE_SYSCALLS): - - Disabled ACE_SYS_RESTARTABLE_SYSCALLS test. On platforms where - it detects restartable system calls, it defines - ACE_HAS_SIGNAL_SAFE_OS_CALLS. This causes the ACE_OSCALL* - macros in OS.h to use "ACE_LOG_MSG->restart()" before - ace/Log_Msg.h is included, ending up in ACE_LOG_MSG being an - unknown macro. Currently, none of ACE's supported platforms - actually define ACE_HAS_SIGNAL_SAFE_OS_CALLS so disabling this - test okay for now. - - * ace/OS.i (ioctl): - - Commented out ACE_DEBUG call. ACE_OS should not depend on - ACE_Log_Msg in any way. - -Wed Dec 8 10:15:20 1999 Douglas C. Schmidt - - * bin/clone.cpp: The definition of mk_symbolic_link() was - missing the third argument 'int level'. Thanks to Jerry De - Master for reporting this. - - * ace/Synch.h: Added comments to ACE_Thread_Mutex_Guard and - ACE_Null_Mutex_Guard explaining that they were obsolete and - should be replaced by ACE_Guard and - ACE_Guard, respectively. Thanks to Pierre - Oberson for reporting this. - -Tue Dec 7 22:53:01 1999 Douglas C. Schmidt - - * netsvcs/lib/Client_Logging_Handler.cpp (send): Clarified that - *someday* we'll improve the implementation to queue data when a - connection is lost and automagically reinitiate the connection. - Thanks to David X Callaway for - motivating this. - -Tue Dec 07 22:14:15 1999 David L. Levine - - * docs/ACE-guidelines.html: added a guideline about signal - handlers. - -Tue Dec 7 21:39:42 1999 Douglas C. Schmidt - - * ace/OS.i: Fixed the definition of ACE_NETDBCALL_RETURN so that - - memcpy (TARGET,ace_result_,SIZE); - - is changed to - - memcpy (TARGET,ace_result_, - SIZE < sizeof(TYPE) ? SIZE : sizeof(TYPE)); - - This fixes a bug with UnixWare. Thanks to Phil Mesnier - for reporting this. - -Tue Dec 07 21:20:37 1999 Nanbor Wang - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added ace.rc to project files. One can use - GetFileVersionInfo on Win32 to get the ACE library version info - now. Thanks to David Hauck for - suggesting this. - -Tue Dec 07 15:27:24 1999 David L. Levine - - * docs/ACE-guidelines.html: added guideline to use THR_BOUND - for time-critical threads. Thanks to Marina for reminding - me about this, and for running some experiments on Solaris - that demonstrate that it's necessary (and really works :-). - -Tue Dec 07 13:25:53 1999 Nanbor Wang - - * ace/Based_Pointer_T.{h,cpp}: Added two constructors that take a - base pointer for base_offset_ calculation. They can be used - when we already know the base address of the pointer to avoid an - extra lookup from the Based_Pointer_Repository. - - * ace/Malloc_T.i (init_malloc_header_ptr): Changed to initialize - the pointer using the address of control block. Notice that - the address of the control block should never change during the - lifetime of ACE_Malloc. - - Thanks to Irfan for noticing the performance issue. - -Mon Dec 06 21:16:53 1999 Irfan Pyarali - - * ace/SOCK_Dgram.cpp (send): Added missing timed send. - Thanks to Yuval Yosef for motivating this. - - * ace/SOCK_IO.h (ACE_SOCK_IO): Most methods now support an - optional timeout parameter. - - * ace/SOCK_Stream.h (ACE_SOCK_Stream): All methods now support an - optional timeout parameter. Also fixed the parameter type - in recv_urg and send_urg to be size_t instead of int. - - * ace/ACE: - - - All the I/O function were made consistent in ACE. This - included matching send and recv functions, all of which now - support timeouts. - - - Many of the timed functions, e.g., ACE::readv() and - ACE::sendto(), were changed such that the case - was made common between the code that expected OS provided timed - functions and the other where the timed function was simulated - by ACE. - - - Certain file I/O operation were made simple by removing the - extra parameter. Timeouts are not supported in file - I/O. In some cases, e.g., the timed writev and readv functions, - the function was removed since it was not necessary as taking - the parameter made it redundant with the function in - ACE_OS. - - - The "_n" methods were given a performance boost when they are - used with timeouts. We only set the handle into non-blocking - mode only once rather than for every iteration in the loop. - - - Added send/recv/send_n/recv/recv_n methods that take a message - block as the data container. - - - Here is the description of the updated functions from the - documentation: - ________________________________________ - - The parameter in the following methods indicates how - long to blocking trying to transfer data. If == 0, - then the call behaves as a normal send/recv call, i.e., for - blocking sockets, the call will block until action is possible; - for non-blocking sockets, EWOULDBLOCK will be returned if no - action is immediately possible. - - If != 0, the call will wait until the relative time - specified in * elapses. - - Errors are reported by -1 and 0 return values. If the operation - times out, -1 is returned with . If it succeeds - the number of bytes transferred is returned. - - The "_n" I/O methods keep looping until all the data has been - transferred. These methods also work for sockets in - non-blocking mode i.e., they keep looping on EWOULDBLOCK. - is used to make sure we keep making progress, i.e., - the same timeout value is used for every I/O operation in the - loop and the timeout is not counted down. If the transfer times - out, the number of bytes transferred so far are returned. - - Methods with parameter are I/O vector variants of the - I/O operations. - ________________________________________ - - * ace/config-win32-common.h: Set IOV_MAX on Win32 to be 1024. It - seems like Win32 does not have a limit on the number of buffers - that can be transferred by the scatter/gather type of I/O - functions, e.g., WSASend and WSARecv. We are arbitrarily - setting this to be 1k for now. The typically use case is to - create an I/O vector array of size IOV_MAX on the stack and then - filled in. Note that we probably don't want too big a value for - IOV_MAX since it may mostly go to waste or the size of the - activation record may become excessively large. - - * ace/OS: - - The "faked" readv() in ACE for operating systems without it was - calling read_n(). This was changed to call read() since readv() - makes no guarantee that everything requested will be read. Same - changes applied for writev(). - - send_n() does not belong in the OS class. It belongs in the ACE - class. Therefore, it was moved. - - read_n() is only called for file handles (and not for socket - handles). Therefore, there is no point in checking for - EWOULDBLOCK. Same change was made to write_n(). - - * ace/Handle_Set.h (ACE_Handle_Set): Added an explicit fdset() - function to get to the fd_set *. This eliminates the need for - the stupid cast operator. - -Mon Dec 6 21:13:08 1999 Douglas C. Schmidt - - * ace/Configuration.cpp (set_string_value): When setting a value - in the registry, the specified length must include the NUL - terminating character. Thanks to Chris Hafey - for reporting this. - -Mon Dec 6 11:06:43 1999 Ossama Othman - - * m4/acinclude.m4 (ACE_TRY_COMPILE): - - Make choice of compiler flags to use dependent on the current - autoconf test language. This fixes a problem with C++ compiler - flags potentially passed as C flags to libtool. - - (ACE_USE_TEMP_FILE): - - Added checks for existing files that should be directories and - vice versa. - - If the file passed as argument is in a directory and the - directory doesn't exist then create the directory. In order to - be as general as possible a script fragment was implemented with - the same functionality as "mkdir -p" because "mkdir -p" may not - be portable. - - * m4/threads.m4 (ACE_SEARCH_THREAD_FLAGS): - - Make choice of compiler flags to use dependent on the current - autoconf test language. This fixes a problem with C++ compiler - flags potentially passed as C flags to libtool. - -Mon Dec 06 08:25:22 1999 David L. Levine - - * include/makeinclude/platform_sunos5_sunc++.GNU: added more - comments about support of 64-bit binaries with Sun CC 5.0. - Thanks to Dani Flexer for - providing them. - -Mon Dec 6 07:55:05 1999 Douglas C. Schmidt - - * ace/config-sunos5.7.h: Added several new #defines needed to - port ACE to 64 bit Solaris. Thanks to Dani Flexer - for these. - - * ace/ACE.cpp: Changed the implementation of count_interfaces() - to handle the fact that size_t is a 64 bit type but the - parameter to ioctl needs to be an int, which according to LP64 - is 32 bits. Thanks to Dani Flexer - for reporting this. - - * netsvcs/lib/Client_Logging_Handler.cpp (handle_signal): - If SIGPIPE occurs, ACE_Client_Logging_Handler::handle_signal() - returns -1, thus removing svc handler from reactor. Since svc - handler is implemented as a singleton here, all next incoming - SPIPE connections operate on object that is already destroyed -> - SIGSEGV/SIGBUS. Therefore, we now return 0 in handle_signal(). - Thanks to Alexander Dergatch for reporting - this. - - * netsvcs/lib/Server_Logging_Handler_T.cpp (svc): The following - loop - - while ((result = this->handle_input ()) > 0) - continue; - - causes server thread to leave its execution loop, because - handle_input() always returns 0 or -1. This should be replaced - with - - while ((result = this->handle_input ()) == 0) - - Thanks to Alexander Dergatch for reporting - this. - -Sun Dec 05 21:54:47 1999 David L. Levine - - * ace/Dump.cpp (ACE_ODB ctor): initialize current_size_ - data member, so that examples/misc/test_dump will pass - on MSVC 6.0/NT 4.0, at least. Thanks to Soren Ilsoe - for reporting this. - -Sun Dec 5 16:50:37 1999 Ossama Othman - - * ace/OS.h: - - Some compilers were picky about the circular dependency fix. - Moved inclusion of ace/Log_Msg.h after ace/OS.i yet again. - -Sat Dec 04 21:14:37 1999 Nanbor Wang - - * tests/Malloc_Test.cpp (init_test): Need to call init_acquire to - make sure the old mapfile does get removed. - - Added more printout items in the normally disabled debug - section. - -Sat Dec 04 19:45:49 1999 Nanbor Wang - - * ace/Memory_Pool.cpp: Conditionally bind/unbind the - Pagefile_Memory_Pool with the Based_Pointer_Repository depends - on whether position independent pointers are used or not. - -Sat Dec 4 16:59:08 1999 Ossama Othman - - Circular dependency fixes/updates: - - * ace/OS.h: - - Include "ace/Log_Msg.h" before "ace/OS.i" because the methods in - ACE_OS depend on ACE_Log_Msg for output and error reporting. - - * ace/Log_Record.h: - - Include "ace/OS.h" instead of "ace/ACE.h." OS.h is needed to - pull in the definition of ACE_Export. ACE.h was overkill. This - change is at the core of the circular dependency fix. - - * ace/Log_Record.cpp: - - Include "ace/ACE.cpp" to pull in definition of ACE::log2(). - - The above changes made the following changes necessary. They also - corrected an annoying circular dependency problem that was - occurring when using an automatically generated ace/config.h. The - below changes are actually legitimate fixes since the source files - in question unnecessarily relied on other headers to pull in ACE - class definitions. - - * ace/DLL.cpp: - - Include "ace/ACE.h" because ACE_DLL::open() uses ACE::ldfind(). - - * ace/Functor.h: - - Include "ace/ACE.h" instead of "ace/OS.h" because - "ace/Functor.i" needs the hash functions in the ACE class. - - All of the above changes nicely reduced the number of source files - that depend on ace/ACE.{h,i}! - - * ace/Makefile: - * apps/gperf/src/Makefile: - - Updated dependencies. - -Fri Dec 3 21:51:38 1999 Nanbor Wang - - * ace/Malloc_T.cpp (shared_malloc): Changed the for loop to - while(1) so the compilers can identify the control will never - fall off the end of the loop and apply ACE_NOTREACHED to the - final return statement. - -Fri Dec 03 12:14:31 1999 Nanbor Wang - - * ace/Malloc_T.i (init_malloc_header_ptr): Applied ACE_UNUSED_ARG - when we are not using position independent pointers. - - * ace/Malloc_T.cpp (shared_malloc): Split the structural exception - try block into two to avoid warnings from the OSF compiler. - Thanks to David for reporting this. - -Thu Dec 2 22:42:53 1999 James Hu - - * ace/TP_Reactor.cpp: - Instead of setting suspend_set_ and wait_set_ both all the time, - try to determine whether or not the handler is suspended and - choose one of the sets to do the bit_ops on. - -Thu Dec 2 22:41:53 1999 Yamuna Krishnamurthy - - * ace/OS.i: - Added the bug fix to the SIO_GET_QOS call in ACE::ioctl () for - RC2 release. This involved removing explicit buffer allocation - for the provider specific buffer and just allocating one - contiguos buffer for the QOS structure. - -Thu Dec 02 18:16:27 1999 James Hu - - * ace/Filecache.cpp: Make it possible to remove something from - the Filecache. - -Thu Dec 02 18:03:27 1999 Nanbor Wang - - * tests/Malloc_Test.cpp (parent): Before binding the name "bar", - do a series of small malloc and a huge malloc to make sure the - child process will segfault and the remapping is tested on the - child process. - - * ace/Memory_Pool.h: - * ace/Memory_Pool.cpp: Added a no-op method to - Local_Memory_Pool because we might call remap from ACE_Malloc on - Win32. - - (Win32 only) Added a new function that takes a - pointer to an EXCEPTION_POINTERS and is responsible to determine - if remapping of the memory map file is required or not. - - * ace/Malloc_T.h: - * ace/Malloc_T.i (init_malloc_header_ptr): Added a new inline - function which simply initializes a (position independent) - pointer pointing to a Malloc_Header. This is required because - the placement new in this function makes MSVC think we are - creating a new object and disallow the use of ACE_SEH_TRY in - functions that use placement new. - - * ace/Malloc_T.cpp: Added the use of ACE_SEH_TRY in several - ACE_Malloc::shared_* methods so we can catch the potential - access violations and force remapping of memory maps. On UNIX, - this is done thru in Memory_Pool. - -Thu Dec 2 09:17:02 1999 Douglas C. Schmidt - - * ace/config-win32-borland.h: Apparently, the Borland BC4 compiler - lacks operator placement delete, so I added #define - ACE_LACKS_PLACEMENT_OPERATOR_DELETE to handle this case. Thanks - to Mike Gingell . - -Wed Dec 1 22:26:06 1999 Douglas C. Schmidt - - * tests/MM_Shared_Memory_Test.cpp: Make sure to force the test - to use System V Semaphores if the OS platform supports POSIX - semaphores natively (since these don't have the right semantics - for this test). Thanks to Steve Huston for reporting this bug. - This fix should clear BUG ID 382. - -Wed Dec 01 06:16:34 1999 Nanbor Wang - - * ace/Malloc.h (ACE_MALLOC_PADDING): Restored default value to 1. - Added a new macro ACE_MALLOC_HEADER_SIZE which serves the same - function as ACE_MALLOC_PADDING (both specify the minimum malloc - header size) but ACE_MALLOC_HEADER_SIZE is normalized to be - multiple of ACE_MALLOC_ALIGN. - - (ACE_CONTROL_BLOCK_ALIGN_LONGS): Changed back to use - ACE_MALLOC_ALIGN to calculate the starting malloc header - alignment. - - * tests/Malloc_Test.cpp: Expanded the memory offset between parent - and child mmap base address so there'll be no overlap even when - we use a larger ACE_MALLOC_PADDING. - -Wed Dec 1 02:10:51 1999 Douglas C. Schmidt - - * tests/Auto_IncDec_Test.cpp: The main() function was missing - a return type. Also, don't run the test with output logged to - stderr. Thanks to David Levine for reporting this. - -Tue Nov 30 16:11:52 1999 Steve Huston - - * tests/run_tests.sh: Made the check for libDLL_Test use a - configurable suffix rather than hardcoded .so so it works on - platforms like HP-UX (which uses .sl). - -Tue Nov 30 14:24:31 1999 Ossama Othman - - * acconfig.h: - - Minor cosmetic updates. - - * configure.in: - - Only enable POSIX semaphore support if process shared semaphores - are supported. Presumably process shared semaphores are only - available if the _POSIX_THREAD_PROCESS_SHARED macro is defined - by the platform. [Bug 304] - -Tue Nov 30 00:22:48 1999 Nanbor Wang - - * tests/Malloc_Test.cpp: Changed to store the mmap allocator in an - auto_ptr instead of as a static object so we can be absolutely - sure about the creation order. - - Added an init_test method which creates a mmap memory pool and - releases it immediately to make sure the test won't - crash/deadlock due to previous crashes. - -Mon Nov 29 16:36:06 1999 Nanbor Wang - - * ace/Malloc.h (ACE_MALLOC_PADDING): Changed the default value of - ACE_MALLOC_PADDING to 16 to avoid some some alignment problem. - - Fixed the padding size calculation in ACE_Malloc_Header. - - * tests/Malloc_Test.cpp (main): Added some debug printout which is - commented out for now (they are not used for regular test.) - -Mon Nov 29 14:34:16 1999 Ossama Othman - - * ace/config-win32-borland.h: - * ace/config-win32-common.h: - - The ACE_HAS_BROKEN_IMPLICIT_CONST_CAST macro I previously - removed is used in TAO's IDL_Test. Thanks to Jeff for pointing - this out. - - * ace/OS.i (sema_init): - - The call to sem_init() for the process shared case incorrectly - used USYNC_THREAD for the second argument. For the - USYNC_PROCESS case, the second argument to ::sem_init() should - be "type == USYNC_PROCESS" since it will evaluate to "1" in this - case. A conditional is used since some platforms may not define - USYNC_PROCESS to be a non-zero value. - -Mon Nov 29 12:15:56 1999 Douglas C. Schmidt - - * tests/Auto_IncDec_Test.cpp: Updated this test to use multiple - threads, if available. Thanks to Edan Ayal for - this. - -Mon Nov 29 11:47:55 1999 Ossama Othman - - * ace/OS.h: - - Backed out the inline related changes I made. Some compilers - have a problem with them. - -Sun Nov 28 20:03:03 1999 Ossama Othman - - * ace/OS.i (sema_init): - - According UNIX Network Programming V2 by Stevens, sem_init() is - currently not required to return zero on success, but it *does* - return -1 upon failure. For this reason, check for failure by - comparing to -1, instead of checking for success by comparing to - zero. - -Sun Nov 28 19:05:31 1999 Nanbor Wang - - * ace/Process_Manager.cpp (open): Fixed an ASYS_TEXT usage. - ASYS_TEXT can not enclose several string literals. - -Sun Nov 28 18:09:49 1999 Ossama Othman - - * m4/acinclude.m4 (ACE_USE_TEMP_FILE): - - Check that the source directory is not the current directory - before moving a file in the current directory out of the way. - Previously an attempt to move the same file out of the way was - performed to twice. - -Sun Nov 28 17:06:00 1999 Ossama Othman - - * acconfig.h: - - Added ACE_HAS_POSITION_INDEPENDENT_MALLOC macro. - - * configure.in: - - Dropped AC_ISC_POSIX macro in favor of an AC_CHECK_LIB strerror - test. - - Disabled exception handling support by default. - - Added "--enable-pi-malloc" configure script option to - enable/disable ACE's position independent malloc feature. By - default, this feature will be enabled. - - Added a run-time test for sem_open(). glibc() apparently - defines a stub for this function in the pthread library but - there is no entry in for it. As such, the - configure script assumed that it is a working function. It - turns out it is not (on Linux with glibc <= 2.1.2). - - Generalized/improved setrlimit and getrusage tests that check if - the first argument is an enum. The tests now determine exactly - what the enum type is. Previously, the test was specific to - Linux/glibc platforms. - - Fixed some tests that didn't initialize a const variable before - it was used. - - Added a test that checks the integrity of the generated - configuration. The test attempts to compile ace/OS.cpp. If it - fails then the rest of ACE won't compile, indicating that the - automatic configuration wasn't successful. Upon failure, some - diagnostic information is output, and a request to submit a bug - report is made. - - Flush the cached configuration test results to the cache file. - This is mainly useful for configure script debugging purposes. - - * ace/Log_Msg.h (ACE_Log_Msg): - - Added additional spaces before comments describing each format - specifier since the single quote "'" at the beginning of each - description was interpreted as a troff comment. Thanks to Kevin - Dalley for pointing this out and suggesting a fix. - - * ace/OS.h: - - Consolidated some ACE_INLINE macro preprocessor conditionals. - - Moved inclusion of Log_Msg.h and OS.i to the end of the file in - case some declarations or definitions found earlier in OS.h are - ever needed in the future by these two files. - - * ace/Trace.h: - * ace/Trace.cpp: - - Removed inclusion of Log_Msg.h from Trace.cpp and included OS.h - in Trace.h. OS.h is needed for the definition of ACE_Export. - - * ace/config-win32-borland.h: - * ace/config-win32-common.h: - - Removed ACE_HAS_BROKEN_IMPLICIT_CONST_CAST macro. This macro - isn't used anywhere in ACE or TAO. - - * ace/Makefile: - - Updated dependencies. - - * bin/am_edit: - - This script is generates IDL source file targets and - dependencies in Makefile.in files. It is essentially the same - script that the KDE developers use for their IDL sources except - that it is has been customised for TAO_IDL generated sources. - Thanks to Stephan Kulow for pointing out the - availability of this script. - - * bin/make_release: - - Archive list should be concatenated instead replaced. This list - is currently only used by the MD5 checksum generation support. - - * bin/generate_html_windex: - - Created this script to generate the acewindex.html file. It - generates the acewindex.html directly from the man pages instead - of an intermediate windex file. Some platforms don't have a - "catman -w" equivalent command since the man database is - generated automatically by the OS (e.g. Debian GNU/Linux). This - script allows the acewindex.html file to be generated on such - platforms. The windex file (not acewindex.html) isn't generated - but this typically isn't a problem since it is not the ACE - install system's responsibility to (re)generate a windex file at - install time. It is up to the sysadmin to do so. Thanks to - Kevin Dalley for motivating the creation of - this script. - - * bin/bootstrap: - - The list of ROFF and HTML man pages is now automatically - generated and inserted into the appropriate Makefile.am file in - this script. This allows the removal of the non-portable - "$(shell ...)" expression from the Makefile.am files. It also - improves build performance in the man directories since the list - is only evaluate at bootstrap time instead of each time the - directory is built. - - * man/Makefile.am (acewindex.html): - - Use the newly created `generate_html_windex' script to create - the acewindex.html file since not all platforms support "catman - -w" windex file generation. - - * man/html/Makefile.am (html_DATA): - * man/man3/Makefile.am (man_MANS): - - Removed the commands that generate the man pages lists. The - `bootstrap' script now takes care of substituting what each of - the Makefile.am variables should contain. - - * m4/acinclude.m4: - - Improved ACE_USE_TEMP_FILE macro. It now checks for the - existence of a file with the same name as the temporary file in - the current directory, in addition to the top-level source - directory. - - Moved the setrlimit and getrusage enum tests into Autoconf - macros in this file. The macros are ACE_CHECK_SETRLIMIT_ENUM - and ACE_CHECK_GETRUSAGE_ENUM. - - Fixed AC_SYS_RESTARTABLE_SYSCALLS and added it to this file. - The patched version compiles and runs, whereas the existing/old - version doesn't even compile on some platforms. The - AC_SYS_RESTARTABLE_SYSCALLS test is broken in GNU Autoconf - 2.13. I use this test to determine if the - ACE_HAS_SIGNAL_SAFE_OS_CALLS macro should be defined for ACE. I - patched it so that it works, at least platforms that expect a - signal handler that expects an int argument. - - * m4/subsets.m4: - - Disable building of all subset libraries by default. - -Sun Nov 28 09:45:36 1999 Darrell Brunsch - - * netsvcs/lib/Logging_Strategy.cpp: ACE_Logging_Strategy::fini () - now returns a value. - -Sun Nov 28 02:41:02 1999 Nanbor Wang - - * tests/Reactor_Notify_Test.cpp (run_test): Only print out the - error message when the notification pipe is not disable. - Otherwise, when the notification pipe gets disabled, the event - loop depends purely on the OS scheduling policy to determine how - many times to gets to run. Since the Supplier_Task removes - itself from the reactor, there could be no active event handler - available in the reactor when the gets called if - the task finishes before the event loop - has a chance to finish its iterations. Another way to solve - this is to add a thr_yield after every notification but that - seems to defeat the intention of the test. Thanks to Ivan - Murphy for reporting the false error output. - -Sat Nov 27 22:06:26 1999 Nanbor Wang - - * ace/OS.cpp: Defined ACE_ENDTHREADEX and ACE_BEGINTHREADEX to use - ExitThread and BeginThread for WinCE 2.11 and above. Thanks to - Peter C. Chien for the tip. - - * ace/ace_ce_dll.dsp: Reworked for WinCE 2.11. More - configurations are added and the distributed token related files - are removed from the project. - - * ace/OS.{h,cpp}: WinCE 2.11 and above does implement exit method - so we don't need to provide our own for them. - - * ace/config-WinCE.h: Updated configuration settings for WinCE - 2.11. - - * ace/Memory_Pool.{h,i}: Added the method for - accessing the base address information of the memory pool. - -Sat Nov 27 18:36:48 1999 Douglas C. Schmidt - - * tests/Priority_Buffer_Test.cpp (consumer): Revised the test - so that it doesn't bother to check the priority in the - ACE_ASSERT macro if we're sending a shutdown message. Thanks to - Ivan Murphy and Darrell Brunsch for narrowing this down. - -Thu Nov 25 13:32:00 1999 Douglas C. Schmidt - - * netsvcs/lib/Client_Logging_Handler.cpp (parse_args): Make sure - to free() the host or logger key before calling strdup()! - - * netsvcs/lib/Logging_Strategy.cpp (parse_args): Fixed up this - code so that we correctly allocated and deallocate filename_ - using strdup()/free() to prevent weird memory problems. Thanks - to Alexander Dergatch for reporting this. - -Sat Nov 27 15:01:44 1999 Carlos O'Ryan - - * ACE version 5.0.9 released. - -Sat Nov 27 14:59:27 1999 Carlos O'Ryan - - * bin/make_release: - There was a non-scoped variable. - -Thu Nov 25 13:24:37 1999 Darrell Brunsch - - * tests/Capabilities_Test.cpp: Changed a variable from - int to ACE_HANDLE. - -Thu Nov 25 02:17:34 1999 Nanbor Wang - - * ace/Malloc.h: Added back some apparent bug fixes during the - alignment change. - -Thu Nov 25 01:41:33 1999 Nanbor Wang - - * ace/Malloc.h: Removed the alignment change for now. - -Wed Nov 24 14:41:14 1999 Nanbor Wang - - * ace/Process.i (wait): Changed to use the process handle to wait - for process termination. - - * ace/OS.h: - * ace/OS.i (wait,waitpid): Added an extra argument that takes the - process handle of the waited process. On Win32, is - ignored if the is not equal to 0. Passing the process - is prefer on Win32 because using to wait on the - project doesn't always work correctly if the waited process has - already terminated. - -Wed Nov 24 08:30:52 1999 Douglas C. Schmidt - - * examples/Shared_Malloc/test_malloc.cpp (malloc_recurse): Fixed - the AMS macro to be ACE_MALLOC_STATS. Thanks to David Levine - for reporting this. - -Tue Nov 23 12:47:39 1999 Douglas C. Schmidt - - * ace/Malloc.h: Modified the definition and use of - ACE_MALLOC_PADDING_SIZE so that it works correctly and the code - that uses it compiles... Thanks to Alexander Belopolsky - for reporting this. - - * ace/Malloc: Replaced the AMS macro, which polluted the global - namespace, with ACE_MALLOC_STATS, which doesn't... Thanks to - Alexander Belopolsky for reporting - this. - - * ace/OS.h: Modified ACE_MIN macro so that it uses the > operator to - be consistent with the ACE_MAX macro. Thanks to Derek Dominish - for reporting this. - - * tests/Malloc_Test: Updated the Malloc_Test so that it'll - allocate and test doubles to make sure they work correctly. - - * ace/Malloc.h: Modified the alignment logic to make things - work properly for datatypes like doubles. Thanks to Alexander - Belopolsky for working this out. - -Tue Nov 23 12:02:53 1999 Douglas C. Schmidt - - * ace/OS.i: Moved the inline methods for sec()/usec()/msec() so - that are defined *before* they are used... - -Tue Nov 23 11:34:40 1999 Nanbor Wang - - * tests/Malloc_Test.cpp (myallocator): Applied ACE_TEXT to several - malloc argument. Thanks to Ivan Murphy for reporting this. - -Tue Nov 23 11:06:13 1999 Nanbor Wang - - * tests/CDR_File_Test.cpp (run_test): Changed to - LPCTSTR so the test compile with UNICODE. Thanks to Ivan Murphy - for reporting this. - -Mon Nov 22 18:02:19 1999 Irfan Pyarali - - * ace/Strategies_T.cpp: - * ace/Cached_Connect_Strategy_T.cpp: - - There was a strange interaction in - find_or_create_svc_handler_i() because of these two changes: - - Fri Nov 12 00:30:41 1999 Irfan Pyarali - - and - - Mon Jul 19 22:46:54 1999 Irfan Pyarali - - Basically, was assigned to the newly created svc_handler. - It had, however, not been added to the connection map nor had it - been assigned a hint or recycler, i.e., it was partially - initialized. - - However, we let go of the connector lock during the OS level - connect call, hence exposing the partially initialized - svc_handler to other threads. - - The solution is to use a temporary variable until the - svc_handler is completely initialized. After this we can assign - to . Note that making a new svc_handler, - connecting remotely, binding to the map, and assigning of the - hint and recycler should be atomic to the outside world. - -Mon Nov 22 17:06:34 1999 Darrell Brunsch - - * bin/auto_compile_win32.pl: Changed the project file for - ImplRepo_Service. Thanks to Derek Dominish - for pointing this out. - -Mon Nov 22 14:15:23 1999 Douglas C. Schmidt - - * examples/Configuration/config_test.cpp: ACE-ified this example. - - * ace/OS.i: Replaced all the uses of ACE_Time_Value private methods - within the overloaded global relational operator to use inline - methods. This change should work around bugs with MSVC++. - Thanks to Alok Gupta for reporting - this. - - * ace/Service_Config.cpp (parse_args): Reverted the behavior - of parse_args() so that it doesn't return an error when it runs - across an option that it doesn't recognize. This is necessary - to support certain use-cases where the Service Configurator is - part of an application-specific configuration process. We do, - however, print a warning message if ACE::debug() > 0. Thanks to - Ivan Murphy for reporting this and - suggesting a fix. - -Sat Nov 20 10:16:07 1999 Douglas C. Schmidt - - * ace/Configuration.cpp: Moved DEFBUFSIZE into the Win32-specific - part of the code and changed the name to ACE_DEFAULT_BUFSIZE so - that it won't conflict with any global names. Thanks to David - Levine for reporting this. - -Fri Nov 19 17:25:13 1999 Douglas C. Schmidt - - * ace: Double checked that ACE builds correctly when threads are - disabled. - - * ace/Local_Tokens.cpp (client_id): Had to futz with the code - a bit to get it to work for both the threaded and non-threaded - case. - - * ace/Activation_Queue.h: Added a #define of ACE_Activation_List - to ACE_Activation_Queue to be compatible with the terminology - used in the POSA2 book! - - * ace/Message_Queue_T: Moved message_bytes(size_t) and - message_length(size_t) from the *.i file to the *.cpp file to - workaround bugs with SunC++ 5.0. Thanks to Rick Weisner - and John Tucker - for reporting this problem and providing - the fix. - - * ace/Configuration.cpp: There were inconsistencies in the explicit - template instantiations where ACE_Thread_Mutex should have been - ACE_SYNCH_MUTEX so that the code will work when threading is - disabled. In addition, we must be careful to conditionally - compile certain ACE_Allocator<> and ACE_Malloc<> template - instantiations since they are only valid when ACE_HAS_THREADS is - defined. - - * include/makeinclude/platform_irix6.x_sgic++.GNU, - * ace/Local_Tokens, - * ace/Synch_T.i: - Made a number of minor changes so that ACE will compile/work - when threading is not enabled. Thanks to Extern Chatterji - for reporting this. - - * ace/Message_Block.h: Clarified the comment for space(). - Thanks to Eric Newton for reporting this. - -Fri Nov 19 02:21:11 1999 Darrell Brunsch - - * ace/Configuration.h: - * ace/Configuration.cpp: - Altered the Unicode macros used so it compiles in the two - Unicode configurations. Thanks to Ruibiao Qiu - for noticing this. - -Thu Nov 18 22:49:09 1999 David L. Levine - - * tests/run_tests.lst: DISABLED Process_Manager_Test - because it fails on Solaris and HPUX_aCC. - -Thu Nov 18 20:47:49 1999 Krishnakumar Elakkara Pathayapura - - * THANKS: added Marcelo Matus - -Thu Nov 18 19:44:04 1999 David L. Levine - - * ace/OS.i (ACE_TSS_Emulation::tss_base,ts_object): on VxWorks, - if ACE_VXWORKS_SPARE is 0, allocate a TSS array (and - zero it out) in tss_object () instead of tss_base (). - This allow tss_base () to still be used on the left-hand - side. The only way that tss_base () should be called - on VxWorks with 0 ACE_VXWORKS_SPARE is through ts_object (). - Thanks to Dave Steele and - Dale Wood for further discussion and - insight. - -Thu Nov 18 19:20:16 1999 Ossama Othman - - * ace/OS.h (SEM_FAILED): - - Changed SEM_FAILED from ((sem_t *) 0) to ((sem_t *) -1). - Although it makes more sense to have a zero fail value, it - appears that many OSes are still brain damaged enough to use -1 - instead. This change is consistent with what ACE expected as - the sem_open() fail value prior to my updates. - -Thu Nov 18 16:37:55 1999 Ossama Othman - - * ace/OS.h: - - If a platform has named POSIX semaphores, define SEM_FAILED if - it isn't already defined. - - * ace/OS.i (sema_init): - - Cast MAP_FAILED to (sem_t *) when comparing to sem_t pointer. - - Check sem_open() failure against SEM_FAILED macro instead of - ((sem_t *) -1) since sem_open() in some named POSIX semaphore - implementations returns ((sem_t *) 0) on failure (e.g. glibc - 2.1.x on Linux). - -Thu Nov 18 08:19:39 1999 Douglas C. Schmidt - - * ace/SOCK_Dgram_Bcast.cpp: Some systems seem to generate 0 - (AF_UNDEF) for the sa_family, even when there are no errors! - Thus, we only print an error if this is not the case, or if - we're in "debugging" mode. Thanks to Extern Chatterji - for reporting this. - -Thu Nov 18 12:08:20 1999 Balachandran Natarajan - - * ace/Configuration.cpp: Added missing template instantiations for - SunCC5.0 - -Thu Nov 18 11:49:39 1999 Ossama Othman - - * bin/make_release: - - Added MD5 checksum generation support. Each ACE/TAO archive - will now have an associated file that contains its MD5 - checksum. [Bug 48] - -Thu Nov 18 08:19:39 1999 Douglas C. Schmidt - - * ace/Log_Msg.cpp: Added a new flag to win32 FormatMessage call, - which removes unneccessary newlines in resulting message. So - whole logged message fits on one line and logs are then nicer - and easier to parse. Thanks to Martin Krumpolec - for contributing this. - -Wed Nov 17 22:45:01 1999 David L. Levine - - * ace/OS.i (ACE_TSS_Emulation::tss_base): on VxWorks, - if ACE_VXWORKS_SPARE is 0, allocate a TSS array. This - can happen if the task wasn't spawned through ACE, - but then tries to use ACE's TSS emulation. Thanks - to Dave Steele for the - excellent detective work and patch. - - * ace/config-vxworks5.x.h: added ACE_VXWORKS_SPARE, - defaulted to spare4. - -Wed Nov 17 17:36:25 1999 Steve Huston - - * ace/config-hpux-11.x-hpc++.h: Added - ACE_LACKS_PLACEMENT_OPERATOR_DELETE for aC++. This is a known bug by - HP, at least at aC++ A.03.10. - -Wed Nov 17 16:33:40 1999 Ossama Othman - - * ace/Makefile.am: - - Added Auto_IncDec_T.*, Capabilities.* and Configuration.* to - list of sources. - - * tests/Makefile.am: - - Added Auto_IncDec_Test, Capabilities_Test and - Process_Manager_Test to list of tests. - - * tests/Capabilities_Test.cpp: - - Create the config file within the test itself instead of having - a seperate config file. This makes the test self-contained, and - also allows the test to be run in a build environment where the - sources are in a different directory from the binaries (e.g. a - "VPATH" build). This change was motivated by a problem that - occurred in an ACE+autoconf VPATH build. - - * tests/Capabilities_Test.cfg: - - Removed this file. It is now created at run-time by the - Capablities_Test itself. - -Wed Nov 17 13:45:25 1999 Ossama Othman - - * acconfig.h: - * configure.in: - * ace/OS.h: - * ace/OS.i: - - Added support for two additional macros, namely ACE_HAS_LSEEK64 - and ACE_LACKS_LLSEEK_PROTOTYPE. This make it easier to - customize llseek support for a given platform. - - * ace/config-linux-common.h: - - Define ACE_HAS_LSEEK64 and ACE_LACKS_LSEEK64_PROTOTYPE for glibc - 2.1.x, and define ACE_HAS_LLSEEK and ACE_LACKS_LLSEEK_PROTOTYPE - for glibc 2.0.x. [Bug 375] - -Wed Nov 17 07:36:04 1999 Douglas C. Schmidt - - * tests: Removed the Cache_Manager_Test.cpp since Cache_Manager.* - is no longer in ACE. Thanks to Airat A. Sadreev - for reporting this. - - * netsvcs/lib/Client_Logging_Handler.cpp (fini): Added a void * - cast to the arguments to ACE_OS::free(). Thanks to David Levine - for reporting this. - -Tue Nov 16 07:58:11 1999 Douglas C. Schmidt - - * netsvcs/lib/Client_Logging_Handler.cpp (fini): - Make sure to dynamically allocate the logger_key_ and - server_host_ so that we don't end up with weird memory problems. - Thanks to Alexander Dergatch for reporting this. - - * ace/config-irix6.x-common.h: Added - ACE_LACKS_PLACEMENT_OPERATOR_DELETE to keep Irix compilers from - complaining! Thanks to David for reporting this. - -Mon Nov 15 20:44:04 1999 Douglas C. Schmidt - - * ace/OS.cpp (inherit_log_msg): Added a comment explaining why - we don't inherit the callback when a new thread is created - - since all hell would break loose otherwise if it came off the - stack! Thanks to Sangwoo Jin for - motivating this clarification. - -Mon Nov 15 19:54:36 1999 Ossama Othman - - * ace-config.in: - - Added missing "-lACE" to the library list. Thanks to Benedikt - Eric Heinen for pointing this out. - -Mon Nov 15 13:28:03 1999 Luther J Baker - - * ace/Log_Msg.cpp (priority_mask_): - Added delete_ostream_(0) to ctor. - -Mon Nov 15 09:33:49 1999 Douglas C. Schmidt - - * ace/Synch.h (ACE_Mutex): changed protected: to public: in - ACE_Mutex so that certain compilers would be happy. Thanks to - Ivan Murphy for reporting this. - - * ace/Configuration.h (ACE_Configuration_Section_Key): The - reserved word "operator" has a typo and is typed as "Operator". - Thanks to Andy Gokhale for reporting this. - -Sun Nov 14 20:20:13 1999 Douglas C. Schmidt - - * ace/Configuration.h: Improved the ACE-ification of this file. - -Sun Nov 14 18:13:37 1999 Ossama Othman - - * ACE-configuration.txt: - - Updated with information about bootstrapping autoconf support in - ACE since it is currently not enabled by default in ACE. - - * configure.in: - - User must now specify the "--enable-maintainer-mode" configure - script option in order to be able to use the configure script. - If an attempt is made to run the configure script with this - option, the configure script will immediately exit with a - summary that states that ACE stock build procedure should be - used until autoconf support is fully integrated into ACE. - - Once autoconf support is fully integrated into ACE, this - requirement will be removed. - -Sun Nov 14 15:22:29 1999 Darrell Brunsch - - * ace/Configuration.cpp: Fixed a statement unreachable in - expand_path (). - -Sat Nov 13 19:55:17 1999 Luther J Baker - - * ace/SString.cpp (next): - Removed a buggy line for Tokenizer. - Thanks to Sangwoo Jin for reporting this. - -Sat Nov 13 18:38:21 1999 Darrell Brunsch - - * ace/Configuration.cpp: Fixed some compiler problems with the - ACE_Malloc template instantiations and pointer casting. - -Sat Nov 13 11:29:20 1999 Douglas C. Schmidt - - * tests/run_tests.lst: Re-enabled the Process_Manager_Test - to see if it Dave Madden's fixes worked. - -Fri Nov 12 21:26:58 1999 David L. Levine - - * ace/OS.h: without threads, added #ifndef protection for - all of the THR_* macros that didn't already have it. - And, with ACE_HAS_PRIOCNTL on sun, #include - before #including sys/rtpriocntl.h. That ensures that - the THR_* macros are defined first by the system header - file. Thanks to Timothy Canham - for reporting this. - - Also, changed a couple of #includes - to "ace/sys_conf.h", because that file is not a system - header. - -Fri Nov 12 00:30:41 1999 Irfan Pyarali - - * ace/Connector.cpp (connect_i): Since we should change only - in the confines on the connector lock, it is not proper to use - the copy of and assign it to when the connect - succeeds. The removal of should not change the - algorithm (famous last words ;) since not really be - considered in the case of failures. - - * ace/Strategies_T.cpp (ACE_Cached_Connect_Strategy): - * ace/Cached_Connect_Strategy_T.cpp: - - If the new connection fails, close out the svc_handler and set - it to zero. - - Also in cleanup_hint_i(), reset the <*act_holder> in the - confines and protection of the lock. - - * ace/Svc_Handler.cpp (cleanup_hint): Expanded the interface to - allow the resetting of the in an atomic manner wrt - the lock of the connector. - - The above changes should fix BUG 310. Thanks to Eric Mitchell - for reporting it. - -Fri Nov 12 12:13:29 1999 Steve Huston - - * ace/config-aix-4.x.h: Made _BSD_INCLUDES and ACE_HAS_CHARPTR_DL - be defined only for pre-AIX 4.3. Thanks to Greg Siebers - for these changes. - Set ACE_LACKS_PLACEMENT_OPERATOR_DELETE for IBM C++ 3.6 and prior. - -Fri Nov 12 11:50:19 1999 Nanbor Wang - - * ACE-INSTALL.html: Added ACE lib/dll naming rules. - -Fri Nov 12 10:02:10 1999 Douglas C. Schmidt - - * ace/config-win32-common.h, - * ace/config-win32.h: Fixed inconsistent use of <> and - "" for ACE-specific #includes. Thanks to Dave Delano - for reporting this. - -Fri Nov 12 08:25:25 1999 David L. Levine - - * ace/Log_Msg.cpp (open,log,dump): ensure that there - is a message_queue_ by calling get_lock () in multithreaded - applications. This solves the problem where the first - thread that uses a Log_Msg terminates before any other - threads create a Log_Msg instance. Thanks to - Mike Mazurek for reporting this. - -Thu Nov 11 20:46:29 1999 Ossama Othman - - * examples/Configuration/Makefile: - - Added a Makefile for this example. - - * examples/Configuration/config_test.cpp: - - ACEified this example, and corrected several errors and - warnings. - -Thu Nov 11 20:28:44 1999 Carlos O'Ryan - - * ace/Local_Tokens.cpp: - * ace/OS.cpp: - Removed gcc-2.95 warnings about mismatch format and arguments, - the warning only shows up under gcc-2.95 for alphas. - We use to print the addresses which produces correct - results in all the platforms we have access to. - Thanks to Cristian Ferretti for pointing this - out. - -Thu Nov 11 19:55:52 1999 Darrell Brunsch - - * ace/Configuration.h: - * ace/Configuration.cpp: - * examples/Configuration/config_test.cpp: - MSVC doesn't like _export and _import so changed them to - export_config and import_config. - -Thu Nov 11 18:41:24 1999 Ossama Othman - - * ace/Configuration.h: - * ace/Configuration.cpp: - - "path_" variable was allocated with strdup(), but deallocated - with delete(). free() should be used instead. - - Added missing class members to member initializer lists. - - Changed name of export() to _export(). "export" is a C++ - keyword, and shouldn't be used as function name. The import() - method was changed to _import() for sake of being consistent. - - Removed duplicate template instantiations. - -Thu Nov 11 17:09:19 1999 Darrell Brunsch - - * ace/Configuration.h: - * ace/Configuration.cpp: - ACE-ified the code. Also fixed miscellaneous compiler warnings - and put in template specialization code. - -Thu Nov 11 12:10:40 1999 Douglas C. Schmidt - - * ace/Process_Manager.cpp, - ace/Process.cpp: It looks like the thread that's going to use - the Process_Manager object must do a setpgid (0, 0) in order to - establish a process group for its children. Apparently, when - you run the test program from the command line, the shell sets - the process up in a group of its own, but when you run it from - the test script, it's a member of the script's group. In the - latter case, when you spawn a child process, you can't add it to - your own group (because your group doesn't exist!). Thanks to - Dave Madden for contributing this fix. - -Thu Nov 11 01:54:55 1999 Luther J Baker - - * ace/Log_Msg.h (msg_ostream): - * ace/Log_Msg.cpp (msg_ostream): - * ace/Log_Msg.cpp (~ACE_Log_Msg): - - Added a member to flag whether or not Log_Msg object - assumes responsibility for destroying its ostream_*. - -Wed Nov 10 23:29:25 1999 Darrell Brunsch - - * ace/Configuration.cpp: - * ace/Configuration.h: - * ace/Configuration.i: - * examples/Configuration/Configuration.dsw: - * examples/Configuration/Test.dsp: - * examples/Configuration/config_test.cpp: - Added the ACE Configuration class files. Thanks to Chris - Hafey for submitting them. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * ace/Makefile: - * examples/Configuration/Makefile: - Added the Configuration files to the projects and Makefiles. - - * ace/config-win32.h: - MSVC only supports operator placement delete as of version 6. - -Wed Nov 10 22:12:32 1999 Ossama Othman - - * configure.in: - - Enabled the CVS directory check so that ACE's stock Makefiles - won't get inadvertently clobbered by developers who want to - experiment with the configure script. - - * m4/acinclude.m4: - - Made CVS directory check more verbose. It now provides an - example of how to avoid the error it detects, i.e. it provides - an example that demonstrates to do a build without affecting the - source. - - * Makefile.in: - * ace/Makefile.in: - * ace/config.h.in: - * apps/gperf/src/Makefile.in: - * apps/gperf/Makefile.in: - * apps/Makefile.in: - * netsvcs/clients/Logger/Makefile.in: - * netsvcs/clients/Naming/Client/Makefile.in: - * netsvcs/clients/Naming/Dump_Restore/Makefile.in: - * netsvcs/clients/Naming/Makefile.in: - * netsvcs/clients/Tokens/collection/Makefile.in: - * netsvcs/clients/Tokens/deadlock/Makefile.in: - * netsvcs/clients/Tokens/invariant/Makefile.in: - * netsvcs/clients/Tokens/manual/Makefile.in: - * netsvcs/clients/Tokens/mutex/Makefile.in: - * netsvcs/clients/Tokens/rw_lock/Makefile.in: - * netsvcs/clients/Tokens/Makefile.in: - * netsvcs/clients/Makefile.in: - * netsvcs/lib/Makefile.in: - * netsvcs/servers/Makefile.in: - * netsvcs/Makefile.in: - * man/html/Makefile.in: - * man/man3/Makefile.in: - * man/Makefile.in: - * tests/Makefile.in: - - Added these files so that developers who don't have GNU - Autoconf, Automake and Libtool can run the configure script and - attempt builds to provide feedback to us. - -Wed Nov 10 21:35:47 1999 Ossama Othman - - * m4/compiler.m4: - - Added some default flags for compilers on IRIX. - - * m4/threads.m4: - - Added more thread library checks in an effort to figure out if a - thread library really is needed, in the case that the initial - check for pthread_create succeeds without the need of a thread - library. Such a problem occurred on IRIX. This modification - should correct the problem. - -Wed Nov 10 10:55:34 1999 Ossama Othman - - * ace/OS.i (memset, thr_self, thr_getspecific): - - Commented the ACE_TRACE statements. On some compiler/platform - combinations these methods get called before the Object Manager - is initialized, which causes the ACE_TRACE call to seg fault - when tracing is enabled in ACE. - -Tue Nov 9 17:50:01 1999 Darrell Brunsch - - * ace/config-hpux-10.x-hpc++.h: - Added ACE_LACKS_PLACEMENT_OPERATOR_DELETE since it doesn't seem - to be supported on aCC. - -Tue Nov 9 15:47:10 1999 Ossama Othman - - * ace/XtReactor.cpp (TimerCallbackProc): - - Fixed "unused argument" warning. - -Tue Nov 9 14:57:51 1999 Ossama Othman - - * configure.in: - - Minor comment updates. - - * m4/features.m4: - - Fixed asynchronous IO tests. The tests now properly detect - working asynchronous IO on Linux, for example. - - Force asynchronous IO tests to be performed after the thread - detection tests in case the real time functions depend on the - thread library. - -Tue Nov 9 10:11:22 1999 Douglas C. Schmidt - - * ace/config-g++-common.h: Added ACE_LACKS_PLACEMENT_OPERATOR_DELETE - for the GCC 2.8 and earlier family of compilers since they don't - seem to support this feature. - -Mon Nov 8 09:41:34 1999 Douglas C. Schmidt - - * ace/Svc_Handler.cpp: Removed the unused parameter `n'. Thanks - to David Levine for reporting this. - -Mon Nov 8 16:34:27 1999 Ossama Othman - - * acconfig.h: - * configure.in: - - Added autoconf support/tests for the following ACE macros: - - ACE_HAS_STRPTIME - ACE_LACKS_NATIVE_STRPTIME - ACE_LACKS_PLACEMENT_OPERATOR_NEW - ACE_LACKS_PLACEMENT_OPERATOR_DELETE - -Mon Nov 8 09:41:34 1999 Douglas C. Schmidt - - * ace/config-g++-common.h: Added ACE_LACKS_PLACEMENT_OPERATOR_NEW - for older versions of G++. Thanks to David Levine for reporting - this. - - * ace/config-sunos5.5.h: Added a #define for - ACE_LACKS_PLACEMENT_OPERATOR_DELETE to handle problems with - SunC++ 4.2. - - * ace/Svc_Handler: Not all C++ compilers support placement - operator delete, so we need to #ifdef for it. Thanks to Andy - Gokhale for reporting this. - -Sun Nov 07 23:36:51 1999 Nanbor Wang - - * tests/run_tests.bat: - * tests/tests.dsw: - * tests/Auto_IncDec.dsp: - * tests/version_tests/version_tests.dsw: - * tests/version_tests/Auto_IncDec_Test.dsp: Added Auto_IncDec_Test - for MSVC workspaces. - -Sun Nov 7 12:03:31 1999 Douglas C. Schmidt - - * ace/Svc_Handler: Added two new placement operator new() and - delete() operations so that it is possible to allocate an - ACE_Svc_Handler from a custom allocator. Thanks to Edan Ayal - for contributing this. - - * tests/run_tests.lst: Added Auto_IncDec_Test to the tests. - - * ace/Makefile, - tests/Makefile: Added the new Auto_IncDec* stuff to the - makefiles. - - * ace: Added Auto_IncDec_T.{h,i,cpp} to the ACE release. This class - automatically increments and decrements a parameterized counter. - Thanks to Edan Ayal for contributing this. - - * tests/Auto_IncDec_Test.cpp: Added a test for the ACE_Auto_IncDec - class. Thanks to Edan Ayal for contributing - this. - -Fri Nov 05 14:26:38 1999 Jim Buck - - * ace/OS.cpp (ACE_Time_Value::set): fixed calculation of - microsecond part. This change restores the correct pre-ACE 5.0 - behavior. - -Fri Nov 5 07:58:14 1999 Douglas C. Schmidt - - * ace/Memory_Pool.i: Fixed stupid typos in Memory_Pool.i. - Thanks to Jeff Parsons for reporting this. - - * ace/Memory_Pool.i: Default arguments shouldn't be in the - *.i signatures. Thanks to Andy Gokhale for reporting this. - -Thu Nov 4 08:36:34 1999 Douglas C. Schmidt - - * ace/Memory_Pool: Moved the sync() and protect() methods - from ACE_Pagefile_Memory_Pool into the *.i file and made their - parameter names anonymous since these methods are no-ops. - Thanks to Martin Krumpolec for suggesting - this. - - * include/makeinclude/compiler.bor: Changed MISC_CFLAGS - to -a8 -b- -Ve -Vx. Thanks to Jody Hagins for this suggestion. - -Thu Nov 04 15:19:54 1999 David L. Levine - - * ACE version 5.0.8 released. - -Thu Nov 04 08:16:25 1999 David L. Levine - - * config-linux-common.h: only enabled ACE_HAS_SIGTIMEDWAIT - with glibc. RedHat 5.2 doesn't have sigtimedwait. - -Mon Nov 01 14:29:04 1999 David L. Levine - - * ace/Filecache.cpp,Capabilities.cpp,Makefile: moved - ACE_Hash and ACE_Equal_To - explicit instantiations from Filecache.cpp to Capabilities.cpp, - because it needs them and is used with FOR_TAO. - -Mon Nov 01 15:05:44 1999 Steve Huston - - * THANKS: Added Greg Siebers - -Mon Nov 01 15:02:31 1999 Steve Huston - - * ace/config-aix-4.x.h: Added definition of ACE_LD_SEARCH_PATH. - Thanks to Greg Siebers for this fix. - -Mon Nov 01 10:11:36 1999 David L. Levine - - * ace/Capabilities.{i,cpp}: unlined definition of - ~ACE_CapEntry. It caused an internal compiler error - with g++ 2.7.2.3, and it is a good idea to not inline - it because it's virtual. Also, prepended ACE_ to - enum values. - -Sun Oct 31 22:46:17 1999 David L. Levine - - * tests/Capabilities_Test.cpp (main): removed declarations - of unused argc and argv arguments. - -Sun Oct 31 16:39:53 1999 Darrell Brunsch - - * ace/Capabilities.cpp: - Added ACE_BUILD_DLL so the class is properly exported on NT. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Added Capabilities files to MSVC projects. - - * tests/Capabilities_Test.cpp: - Was loading the wrong file, changed to loading - Capabilites_Test.cfg instead of captest.cfg. - - * tests/Capabilities_Test.dsp: - * tests/version_tests/Capabilities_Test.dsp: - * tests/tests.dsw: - Added Capabilities_Test project files. - - * tests/run_tests.bat: - Added Capabilities_Test to the list of tests. - -Sun Oct 31 15:29:08 1999 Douglas C. Schmidt - - * ace/Capabilities.cpp: Cleaned up some of the explicit template - instantiations so they will work on all platforms. Thanks to - Bala for pointing this out. - - * ace/Makefile, - * tests/run_tests.lst, - tests/Makefile (BIN): Added an entry for the new ACE_Capabilities - classes. - -Fri Oct 29 21:09:49 1999 Ossama Othman - - * man/html/Makefile.am: - - For some reason Automake couldn't automatically copy the HTML - man pages to the distribution directory when doing a `make dist' - so do it manually. - -Fri Oct 29 19:53:59 1999 Ossama Othman - - * Makefile.am (EXTRA_DIST): - - Removed ACE.DSW from the distribution list. - - * configure.in: - - Removed test for necessity of _GNU_SOURCE macro. All uses and - need of that feature test macro have been removed from ACE. - - If a thread library was detected, define _REENTRANT in the - command line, not the generated config.h header. The user can - use the ace-config script to determine what other flags are - needed to compile ACE. - - Check for sched_yield in the librt library, if it exists, in - addition to the others listed. Solaris 7 moves sched_yield from - the libposix4 library to librt. - - Added libsocket to list of libraries to search for - getservbyname(). - - If check for socket() results in unresolved symbols, add `-lnsl' - to library search. - - Improved ACE_HAS_PTHREAD_PROCESS_ENUM test. - - Added checks for getpgid, strtok_r, strptime and lseek64 - prototypes. The old getpgid test is superceded by a new one. A - prototype is declared if the checks determine that certain - feature test macros are needed to enable them. - - Added man directory Makefiles to list of files to generate. - - * ace-config.in: - - Minor updates. Modified so that "ace" is the default library if - one isn't specified. - - * ace-config.1.in: - - Minor updates. - - * ace/config-linux-common.h: - * ace/OS.h: - - Moved all prototypes to OS.h. Only macros should be defined - config headers. Each of the moved prototypes are enabled by - using the following newly added macros: - - ACE_LACKS_GETPGID_PROTOTYPE - ACE_LACKS_STRPTIME_PROTOTYPE - ACE_LACKS_STRTOK_R_PROTOTYPE - ACE_LACKS_LSEEK64_PROTOTYPE - - All prototypes in ace/OS.h should come after the inclusion of - ace/Basic_Types.h since the prototypes may need types that are - only available after that inclusion. Also added a - ACE_LACKS_PREAD_PROTOTYPE that is used to enable make both - pread() and pwrite() protypes. - - Recent glibc libraries have pread() and pwrite() but only enable - the prototypes if _XOPEN_SOURCE=500 is defined (Single Unix - specification). Now define ACE_HAS_P_READ_WRITE and - ACE_LACKS_PREAD_PROTOTYPE on Linux. - - * bin/bootstrap: - - Added ACE man page generation. Generating the man pages during - the bootstrapping process allows the man page list in - man/man3/Makefile.am to be generated by a shell command instead - of having to explicitly specify each man page in that Makefile. - The man pages will only be generated if the ACE.3 man page - doesn't exist. That man page should be representative of the - existence of the rest of the man pages. - - * man/Makefile.am: - * man/html/Makefile.am: - * man/man3/Makefile.am: - - Added Automake input files for the ACE man pages. The man pages - will now be installed during a `make install'. This is an - ACE Configuration Project specific enhancement. ACE's current - man page scheme is unchanged, and doesn't support this feature. - - * m4/features.m4: - - Delete test_aio.log when the test is done. - -Fri Oct 29 17:01:58 1999 Kirthika Parameswaran - - * ace/OS.h: Added ACE_DEFAULT_SHLIB_MODE for KCC. Since this mode - wasnt right the DLL_Test failed when compiled using the KAI - compiler. This change fixes this problem too. Thanks to Nanbor - and Michael Kircher - for helping me on this task. - -Fri Oct 29 07:08:16 1999 David L. Levine - - * include/makeinclude/rules.local.GNU, - include/makeinclude/wrapper_macros.GNU - include/makeinclude/platform_vxworks5.x_g++.GNU: - fixed typo: COMSPEC instead of COMPSPEC. - -Thu Oct 28 11:15:43 1999 Nanbor Wang - - * docs/ACE-guidelines.html: Added a new guideline on avoiding - multicharacter format specifiers in ACE_DEBUG/ACE_ERROR. - -Thu Oct 28 10:54:42 1999 Nanbor Wang - - * ace/Message_Block.cpp: - * ace/Name_Request_Reply.cpp: - * ace/Time_Request_Reply.cpp: - * ace/Token_Request_Reply.cpp: - Replaced the use of %ld or %lu with %d or %u in - ACE_DEBUG/ACE_ERROR. - - * ace/config-kcc-common.h: Undefined - ACE_HAS_NONSTATIC_OBJECT_MANAGER. Thanks to Russ Noseworthy for - noticing this. - -Thu Oct 28 10:49:51 1999 Darrell Brunsch - - * ACE.dsw: This is an internal file that I last updated - in 1997 (I don't think it ever got included in the - releases). Being out of date and not used, I removed it. - -Thu Oct 28 09:31:19 1999 David L. Levine - - * tests/SOCK_Send_Recv_Test.cpp (client): if len is not 255, - print out its value. - -Thu Oct 28 09:27:47 1999 David L. Levine - - * include/makeinclude/rules.local.GNU, - include/makeinclude/wrapper_macros.GNU - include/makeinclude/platform_vxworks5.x_g++.GNU: - support ComSpec as well as COMSPEC environment variable - (on Windows). Thanks to Tom Venturella for reporting that - ComSpec was defined on the system that he was using. - -Wed Oct 27 20:31:22 1999 Luther J Baker - - * ace/Arg_Shifter.h (ACE_Arg_Shifter): Spelling errors. - -Wed Oct 27 16:45:56 1999 David L. Levine - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): use an - ACE_reinterpret_cast instead of an ACE_static_cast to - cast func (of type ACE_THR_FUNC_INTERNAL) to ACE_THR_FUNC. - Thanks to Tom Venturella for reporting that the static_cast - didn't compile on Tornado II. - -Wed Oct 27 16:40:07 1999 David L. Levine - - * ace/OS.h,ACE.h: added newline before ACE_CLASS_IS_NAMESPACE. - This might solve the problem with the ACE_OS man page - generation failure. Thanks to Samuel Stickland - for reporting this problem. - -Wed Oct 27 12:53:15 1999 Nanbor Wang - - * ace/Object_Manager.h: - * ace/config-win32.h: The instructions on how to disable the use - of nonstatic object manager were not consistent for NT and other - platforms. Thanks to Russ Noseworthy for reporting this. - -Wed Oct 27 09:48:41 1999 David L. Levine - - * include/makeinclude/wrapper_macros.GNU: changed check - for whether exceptions are enabled from ifndef exceptions - to ifeq ($(exceptions),). That allows use of - exceptions=0. Thanks to Phil Mesnier - for reporting this. - -Wed Oct 27 09:46:05 1999 David L. Levine - - * include/makeinclude/platform_qnx_neutrino.GNU: removed - -Winline, because it was complaining about operator<< - in generated code. - -Wed Oct 27 08:32:47 1999 Douglas C. Schmidt - - * ace/OS.i (timezone): Added an ACE_UNUSED_ARG to please KCC. - Thanks to Dave Madden for reporting this. - -Tue Oct 26 14:56:15 1999 Balachandran Natarajan - - * ace/FlReactor.cpp (reset_timer_interval): Fixed a compile error - with Sun_Egcs. Thanks to Thomas Groth - for reporting this problem & also for giving a fix. - -Sat Oct 23 19:11:51 1999 Nanbor Wang - - * ACE version 5.0.7 released. - -Fri Oct 22 16:58:44 1999 Darrell Brunsch - - * ace/Dynamic_Service.h: Added an include for OS.h so the - Dynamic_Service.cpp will always get included on platforms - that need it (ie. win32). - - Thanks to Paulo Breda Vieira for spotting - this problem in the AV Streaming code on NT. - -Thu Oct 21 20:21:13 1999 Douglas C. Schmidt - - * ace/Memory_Pool.cpp (map_file): Make sure to update the - base_addr_ with the new mem_map_.addr() before the call to - update the ACE based pointer. Thanks to Damien Dufour - for reporting this. - -Thu Oct 21 17:10:17 1999 Vishal Kachroo - - * ace/OS.i (ioctl): Corrected the implementation of - ACE_OS::ioctl () call with ACE_SIO_GET_QOS io control - code. Thanks to Vidya Narayanan - for reporting this. - - * ACE_wrappers/examples/QOS/server.cpp: - * ACE_wrappers/examples/QOS/client.cpp: - * ACE_wrappers/examples/QOS/Sender_QOS_Event_Handler.cpp: - * ACE_wrappers/examples/QOS/Receiver_QOS_Event_Handler.cpp: - Changed the QOS example to GET-QOS only on receipt of a QoS - event. Also tested the changes made to the ioctl (GET_QOS) in - OS.i. - -Thu Oct 21 15:46:08 1999 David L. Levine - - * tests/run_tests.lst: disabled Process_Manager_Test, for now, - because it asserts on Solaris, Irix, Linux, and HP/UX. - -Wed Oct 21 14:05:00 1999 Ruibiao Qiu - - * ace/examples/IPC_SAP/ATM_SAP/CPP_{client,server}.dsp: Added - configurations for building static executables on NT. - -Wed Oct 20 00:05:34 1999 Douglas C. Schmidt - - * ace/OS.i: Replaced 0666 wit ACE_DEFAULT_FILE_PERMS. Thanks - to Dave Delano for reporting this. - -Tue Oct 19 13:31:15 1999 Joe Hoffert - - * ace/ATM_Params.h, ATM_QoS.{h,i}: - Cleaned up comments, removed ACE_ATM_QoS::get_options_params - method (since it's not used), and made changes for UNIX build. - -Tue Oct 19 12:55:16 1999 Ossama Othman - - * ace/Codeset_IBM1047.h: - - Include `ace/inc_user_config.h' before check for definition of - ACE_MVS macro since otherwise ACE_MVS may not get defined. - - * ace/Codeset_IBM1047.cpp: - - Moved inclusion of `ace/Codeset_IBM1047.h' ahead of ACE_MVS - macro definition check, and removed inclusing of - `ace/inc_user_config.h' - - * ace/OS.i (llseek): - - Reenabled lseek64() on Linux. If _LARGEFILE64_SOURCE is not - defined then an external declaration for lseek64() is made in - the config-linux-common.h header. - - * ace/config-linux-common.h: - - Minor comment update. - - Added extern declaration of lseek64() if _LARGEFILE64_SOURCE is - not defined. - - * ace/Handle_Set.cpp: - - Check if _XOPEN_SOURCE is #defined instead of _GNU_SOURCE to - determine if the fd_set structure has an fds_bits member. - - * ace/Makefile: - - Updated dependencies. - - * ace/Makefile.am: - - Added ATM files to source lists. - - * acconfig.h: - - Added entries for some additional "feature test" macros, such as - _XOPEN_SOURCE. - - * bin/g++dep: - * include/makeinclude/rules.local.GNU: - - Incorporated Jody Hagins patches that get - around a trailing backslash problem in generated Makefile - dependencies. Thanks Jody! - -Tue Oct 19 12:30:00 1999 Kirthika Parameswaran - - * examples/Web_Crawler.dsp: Changed the settings to make the - executable name as main.exe. - * examples/Web_Crawler/URL_Visitor.cpp (~URL_Validation_Visitor): - Removed double deletion of the which is the - Strategy Connector. - -Tue Oct 19 11:24:16 1999 Nanbor Wang - - * include/makeinclude/wrapper_macros.GNU: Commented out an - out-dated OBJEXT definition. If a rule requires to generated - *.so, then it should specify the extension using SOEXT. Thanks - to Aniruddha Gokhale for - reporting this. - -Tue Oct 19 10:27:37 1999 Carlos O'Ryan - - * bin/run_all_list.pm: - Added TAO/tests/DSI_Gateway to the list of tests - -Tue Oct 19 00:43:34 1999 Nanbor Wang - - * ace/config-win32-common.h: Undefined ACE_HAS_EXCEPTIONS under - WinCE. - - The following changes are contributions from James Buck - and Peter C. Chien . - - * ace/config-WinCE.h (ACE_LACKS_SOCKET_BUFSIZ): We cannot change - the socket buffer size on WinCE. - - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: Added a customized TSS errno implementation for - WinCE version 2.10 and above based on James and Peter's patch. - ACE_Errno_Guard also had to be changed when using this - implementation. However, this code is not active by default - because I don't know how to detect CE's OS and platform - configuration automatically. To use the code, define - ACE_HAS_WINCE_BROKEN_ERRNO. - - * ace/OS.i(cond_wait,cond_timedwait): On WinCE, we must tweak the - returning result from the semaphore if timeout occurred. - Because CE uses the simulated semaphore, the returning value is - not the same as that returned by a native semaphore. - -Tue Oct 19 00:03:57 1999 Nanbor Wang - - * include/makeinclude/wrapper_macros.GNU: - * include/makeinclude/rules.bin.GNU: - * include/makeinclude/rules.lib.GNU: - * include/makeinclude/rules.local.GNU: Chaged the following - settings to be platform configurable: - - OBJDIRS: Names of directories to keep obj files. Default is - '.obj' and '.shobj'. - OBJEXT: Extension name for obj files. Default is 'o'. - SOEXT: Extension name for so files. Default is 'so'. - LIBEXT: Extension name for lib files. Default is 'a'. - CC_OUTPUT_FLAG: - LINK_OUTPUT_FLAG: - SO_OUTPUT_FLAG: Flags to specify output file name for cc, linker - and so_linker. Defaults are '-o'. - -Mon Oct 18 23:46:00 1999 Nanbor Wang - - * ace/config-freebsd-pthread.h: Undefined ACE_HAS_PENTIUM for - freebsd. The high resolution timer doesn't seem to work on this - platfrom. - - * ace/OS.i (cuserid): Added missing ACE_UNUSED_ARG (maxlen) - statement. - - * ace/Log_Msg.cpp (log): FreeBSD defines sys_nerr as a const int. - -Mon Oct 18 23:13:55 1999 Kirthika Parameswaran - - * examples/Web_Crawler/URL_Visitor.cpp: Updated some broken - template instantiations. Thanks to Bruce Alderson - for reporting this. - -Mon Oct 18 21:32:29 1999 Ossama Othman - - Updates that remove need to use _GNU_SOURCE macro on Linux/glibc - systems [Bug 167]: - - * ace/OS.i: - - Return ACE_static_cast (off_t, -1), instead of just -1 in - ACE_OS::lseek(). (not related to _GNU_SOURCE updates) - - Only enable lseek64() on Linux/glibc systems if - _LARGEFILE64_SOURCE is defined. - - Don't use cuserid() on Linux/glibc systems. It was dropped - from POSIX.1 back in 1990. Instead, extract the user name from - getpwuid(geteuid()), as suggested by the glibc cuserid() man - pages and Stevens' Advanced programming in the UNIX - Environment. - - * ace/Handle_Set.cpp: - - XPG4.2 declares an fds_bit member in the fd_set structure. - Since _GNU_SOURCE is being disabled in ACE, use the __fds_bits - member. It's not pretty, but it works. - - * ace/config-linux-common.h: - - strptime() is an XOPEN function. It is only enabled if - _XOPEN_SOURCE or _GNU_SOURCE is defined (_GNU_SOURCE causes - _XOPEN_SOURCE to be defined on Linux/glibc systems). If - _XOPEN_SOURCE is not defined, create an external declaration for - it. - -Mon Oct 18 18:41:38 1999 Steve Huston - - * ace/OS.h: Add #include for HP-UX 10.x, and... - * ace/OS.i (ACE_OS::sigwait): On HP-UX 10.x, call cma_sigwait - directly. Fixes bug #66. - -Mon Oct 18 15:45:08 1999 Irfan Pyarali - - * ace/OS.i (event_wait): The following changes are incorrect and - have been reverted: - - http://ace.cs.wustl.edu/cvsweb/ace-cvs.cgi/ACE_wrappers/ace/OS.i?r1=4.796&r2=4.797. - - Remember that is only turned on to remember - state, i.e., when == 0. In the case when - there are waiters, i.e., != 0, - is not turned on, and therefore breaks the wait function since - - while (event->is_signaled_ == 0) - - never becomes false. We need a better way to protect against to - guard against spurious wakeups. - -Mon Oct 18 13:42:37 1999 Nanbor Wang - - * ace/OS.h: Added extra parentheses to avoid operator precedence - mix-up. Thanks to JM Strauss - for reporting this. - -Mon Oct 18 13:30:08 1999 Nanbor Wang - - * ace/OS.h: Removed a whole bunch of extra blank in ACE_DES_*FREE* - macro definitions. Thanks to JM Strauss - for pointing this out. - -Sun Oct 17 19:08:51 1999 Balachandran Natarajan - - * ace/QtReactor.cpp: Fixed a bug in remove_handle_i () method. I - found this when I was testing the test for the QtReactor. - -Sun Oct 17 11:00:46 1999 Douglas C. Schmidt - - * include/makeinclude/platform_sunos5_sunc++.GNU (LD): Added - a fix so that SunC++ 5.0 will work correctly when it's used in - "compat" mode with SunC++ 4.2. Thanks to Susan Liebeskind - for reporting this fix. - - * ace/Malloc_T.cpp (remove): Need to call the destructor of - ACE_Malloc_Stats explicitly in remove(). Thanks to Jean-Marc - Strauss for reporting this. - - * ace/Containers_T.i (get): ACE_DLList::get() didn't check - the return value from ACE_Double_Linked_List::get() so it was - possible for the node variable to be NULL. Now it checks for - the error case explicitly. Thanks to Boris Sukholitko - for reporting this bug. - - * ace/Containers_T.cpp (get): The ACE_Double_Linked_List::get() - method should return -1 on error but it was returning 1. Now, - the implementation matches the documentation. Thanks to Boris - Sukholitko for reporting this bug. - -Sat Oct 16 17:10:23 1999 Douglas C. Schmidt - - * ace/Makefile: - * ace/Svc_Conf_l.cpp: Replace exit(1) with ACE_OS::exit(1) - so that CodeWarrior doesn't get confused. Thanks to David - Delano for reporting this. - - * ace/OS.cpp: Removed the '&' in front of thread_args to make - CodeWarrior happier. Thanks to David Delano - for reporting this. - - * ace/OS.cpp: Removed the table_() "initialization" for - ACE_TSS_Cleanup since this breaks the CodeWarrior C++ compiler. - Thanks to David Delano for reporting this. - - * ace/OS.i: There was a bug with the ACE_OS::truncate() - emulation for Win32. We need to check for ACE_INVALID_HANDLE - and NOT < 0! Thanks to David Delano for - reporting this. - -Sat Oct 16 11:17:10 1999 Irfan Pyarali - - * TAO/tao/Sync_Strategies.cpp (buffering_constraints_reached): - Changed the signature of - TAO_Flush_Sync_Strategy::buffering_constraints_reached() to - match the base class. - -Fri Oct 15 17:28:05 1999 Irfan Pyarali - - * ace/Connector.cpp (connect_i): Only close if we have a - valid . Thanks to Yury Kuznesov for - reporting this problem. - -Fri Oct 15 17:26:08 1999 Balachandran Natarajan - - * include/makeinclude/wrapper_macros.GNU: Added a new flag that - would help conditional compilation compilation of the - QtReactor. - - * ace/QtReactor.cpp: - * ace/QtReactor.h: Files for the QtReactor. Thanks to Hamish - Friedlander for donating this to ACE. For - the sake of record, Qt is a multiplatform C++ GUI toolkit. - - * ace/Makefile: Added the above files to Makefile. Changes were - also made to generate files from moc (Meta Object Compiler, - that comes with Qt libraries) and include them with the build. - -Fri Oct 15 01:03:13 1999 Douglas C. Schmidt - - * ace/Activation_Queue: ACE_Activation_Queue has no methods for - inspecting the size of the queue. The solution was to add the - methods: method_count(), is_empty(), and is_full(). Thanks to - Travis Shirk for contributing this. - -Fri Oct 15 00:36:35 1999 Douglas C. Schmidt - - * tests/Process_Manager_Test.cpp (main): Replaced - ACE_OS::exit(secs) with return secs so that Purify will be - happy. - -Thu Oct 14 14:30:06 1999 David L. Levine - - * tests/Process_Manager_Test.cpp: use u_int instead of - bool. Make ~Exit_Handler () public so that g++ doesn't - complain about a private destructor with no friends. - Commented out unused local variable child7. - -Thu Oct 14 14:25:44 1999 Dave Madden - - * tests/Process_Manager_Test.cpp: fixed the memory leaks, and - most of the "unused variable" warnings should be gone. - I've added, but left commented out, ASSERTs for the child - process' exit codes. The reason is that, on Unix, the exit - code contains extra information (exited, traced, stopped, - signaled, etc.) that causes the exit code from wait() to be - different from what the child's main() returned. - -Wed Oct 13 20:23:58 1999 Nanbor Wang - - * ace/config-WinCE.h: Added ACE_LACKS_ACE_TOKEN and - ACE_LACKS_ACE_OTHER to reduce CE dll's footprint. - - * ace/Memory_Pool.cpp (ACE_Pagefile_Memory_Pool::map): The - SECURITY_DESCRIPTOR and its management routines are only - supported on NT. Changed to pass a NULL security attribute on - non-NT platforms (95, 98, CE.) - -Wed Oct 13 10:50:39 1999 David L. Levine - - * tests/run_tests.sh: use uname -s without checking to - see if /bin/uname, etc., exist. Redirect stderr to - the sysname string. It works. - -Wed Oct 13 10:39:50 1999 David L. Levine - - * ace/OS.h: ensure that ACE_THR_PRI_FIFO_DEF and - ACE_THR_PRI_OTHER_DEF are defined on non-threaded platforms, - to support application source code compatibility. - -Wed Oct 13 10:11:47 1999 David L. Levine - - * tests/Malloc_Test.cpp: fixed preprocessor logic so that - the test is neutered on LynxOS. [Bug 224] - -Wed Oct 13 01:15:45 1999 Nanbor Wang - - * ace/Parse_Node.cpp: Made sure we don't try to duplicate a null - string. This was causing problem when the initialization string - was missing from a service entry. Thanks to Chris Hafey - for reporting this. - -Tue Oct 12 15:05:12 1999 Douglas C. Schmidt - - * tests/run_tests.lst: Reenabed Dave Madden's new - Process_Manager_Test so that we can see if it works on various - platforms. - - * tests/Process_Manager_Test.cpp (main): Added a new one-button - test for the ACE_Process_Manager. Thanks to Dave Madden - for contributing this test. - - * ace/Process_Manager.cpp (wait): Fixed a bug triggered by - a process-specific wait. Thanks to Dave Madden - for contributing this fix. - - * ace/ACE.cpp (format_hexdump): Replaced - - textver[i] = (c < 0x20 || c > 0x7e) ? '.' : c; - - with - - textver[i] = isprint (c) ? c : '.'; - - since this is more portable. Thanks to Jim Rogers - for reporting this. - - * ace/Memory_Pool.i: Changed implementation to - round_to_chunk_size() to ACE::round_to_pagesize(), which appears - to be the "Right Thing"[TM] on NT. - -Tue Oct 12 14:49:00 1999 Ruibiao Qiu - - * ace/ATM_Stream.h - * ace/ATM_Acceptor.h: Moved #pragma after ACE include - so that g++ would not give warning messages. Thanks to - Dr. David L. Levine for pointing this out. - -Tue Oct 12 14:26:15 1999 David L. Levine - - * ace/config-qnx-neutrino.h: added #define of - ACE_THR_PRI_FIFO_DEF. This allows us to easily set a thread - priority (10) that's lower the the TCP service threads (17) in - tests. Thanks to Sean Boudreau for suggesting - that. - -Tue Oct 12 14:16:18 1999 David L. Levine - - * etc/purify.solaris2: added some more UMR suppressions - for SunOS 5.7 (with Sun CC 4.2). - -Tue Oct 12 13:22:22 1999 David L. Levine - - * include/makeinclude/platform_sunos5.6_sparc_sunc++_4.2.GNU: - removed to avoid confusion. It just included - platform_sunos5_sunc++.GNU; that should be used directly, - instead. Thanks to Dan Butler - for reporting this. - -Tue Oct 12 12:40:41 1999 Jeff Parsons - - * ace/Memory_Pool.i: - * ace/Memory_Pool.cpp: - Fixed some errors in Win32 specific code. - -Tue Oct 12 12:20:08 1999 David L. Levine - - * docs/ACE-subsets.html: updated status, and added some - missing motivation sections. Thanks to Wei Chiang - for reporting that the document - was out-of-date. - -Tue Oct 12 11:57:21 1999 David L. Levine - - * ace/config-sunos5.6-sunc++-4.x.h: removed because it - #included a header that no longer exists in the - distribution. ace/config-sunos5.6.h should be used - instead. Thanks to Dan Butler - for reporting this. - -Tue Oct 12 11:48:00 1999 Ruibiao Qiu - - * ace/ATM_Addr.{h,cpp,i}: - * ace/ATM_Stream.{h,cpp,i}: - * ace/ATM_Connector.{h,cpp,i}: - * ace/ATM_Acceptor.{h,cpp,i}: - * ace/ATM_QoS.{h,cpp,i}: - * ace/ATM_Params.{h,cpp,i}: Added support for Fore ATM on Windows - platform. Enabled when ACE_HAS_ATM and ACE_HAS_FORE_ATM_WS2 - are defined. - - * ace/config-win32-common.h: Added needed header include when - ACE_HAS_FORE_ATM_WS2 is defined. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Included ATM_* classes files in the porject files. - - * examples/IPC_SAP/ATM_SAP/CPP-client.cpp - * examples/IPC_SAP/ATM_SAP/CPP-server.cpp: Changed example codes - so that they can be run on Windows. They are now non-interactive, - and show data rates at each end. - - * examples/IPC_SAP/ATM_SAP/CPP_client.dsp - * examples/IPC_SAP/ATM_SAP/CPP_server.dsp - * examples/IPC_SAP/ATM_SAP/ATM_SAP.dsw: Created MSVC project files - and workspace file for these examples. - -Tue Oct 12 11:37:56 1999 David L. Levine - - * tests/run_tests.sh: export ACE_ROOT if setting it. - -Tue Oct 12 11:32:23 1999 David L. Levine - - * tests/run_tests.pl,run_tests.sh: don't print "Skipping test - on this platform" message for DISABLED tests. Set - ACE_ROOT to .. if it wasn't set. - - * tests/run_tests.sh: don't invoke uname command on - Neutrino, because it's not supported. - -Tue Oct 12 08:53:52 1999 Irfan Pyarali - - * ace/Message_Queue.cpp (enqueue): and - should increase by total_size() and total_length() respectively. - And in dequeue(), should decrease by - total_length(). Thanks to Christopher Kohlhoff - for pointing this out. - -Tue Oct 12 10:00:52 1999 Douglas C. Schmidt - - * ace/Memory_Pool (ACE_Pagefile_Memory_Pool):Added a new memory - pool that uses the Win32 page file. Thanks to Dieter Quehl for - contributing this. - -Mon Oct 11 17:07:46 1999 Douglas C. Schmidt - - * ace/Message_Queue.cpp (enqueue): ACE fails to compile because of - a for-loop scoping problem in the method - ACE_Message_Queue_NT::enqueue. Thanks to Christopher Kohlhoff - for reporting this. - - * ace/Activation_Queue.cpp (enqueue): Changed the - creation of the ACE_Message_Block so that it uses the sizeof - (ACE_Method_Request) to ensure the queue's flow control - mechanism works properly. Thanks to Dan Gilboa - for reporting this. - -Mon Oct 11 17:36:15 1999 Nanbor Wang - - Thanks to Wei Chiang for the following - patches. - - * ace/Thread_Manager.cpp (kill_thr): Chorus only supports - SIGTHREADKILL here. Made sure we remove the killed thread from - the managed thread list. - - * tests/Thread_Manager_Test.cpp: Changed the test to check for - cooperative cancellation even if the platform doesn't support - sending signaling to a specific thread. On Chorus, this signal - has to be SIGTHREADKILL. - -Mon Oct 11 17:35:51 1999 Nanbor Wang - - * ace/config-kcc-common.h: Added - ACE_HAS_STD_TEMPLATE_SPECIALIZATION for KCC. - -Mon Oct 11 12:05:31 1999 Wei Chiang - - * ace/Signal.cpp (ACE_Sig_Action ctors), - ace/Select_Reactor_T.cpp (register_handler,remove_handler): - disabled signal-related operations on Chorus. - -Mon Oct 11 10:15:28 1999 David L. Levine - - * bin/check_build_logs: suppress some Purify warnings. Purify - says that it's ignoring the problem; so will we. - -Mon Oct 11 10:09:56 1999 David L. Levine - - * ACE version 5.0.6 released. - -Mon Oct 11 07:34:34 1999 Douglas C. Schmidt - - * ace/OS.h: Removed a stray '>' that was causing OS.h not to - compile. Thanks to Marvin Allen Wolfthal - for reporting this. - -Fri Oct 8 07:47:08 1999 Douglas C. Schmidt - - * ace/OS.h: Removed the word "defined" since that was breaking - SunCC 4.2. Thanks to Andy Gokhale for reporting this. - -Thu Oct 07 18:47:03 1999 Irfan Pyarali - - * ace/OS.h (ACE_NOTSUP): Added new macro. This one is similar to - ACE_NOTSUP_RETURN, except that there is no return value (similar - to ACE_GUARD and ACE_GUARD_RETURN). - - * ace/Message_Queue (message_length): Returns the total length on - the queue, i.e., sum of the message block lengths. - - Since manual changes to these stats might be necessary, - specially when queued message blocks change size or lengths - (without dequeuing the messages from the queue), we also provide - methods for setting these stats. - - * ace/Message_Block.i (total_length): This new method is similar - to except that it deals with the length of the - message blocks and not the size of the message blocks. It - returns the length of the message blocks, including chained - message blocks. - -Thu Oct 7 13:17:29 1999 Douglas C. Schmidt - - * ACE-INSTALL.html: Changed the word "compiler" to - "linker". Thanks to George Ball - for reporting this. - -Thu Oct 07 11:35:13 1999 Steve Huston - - * ace/streams.h: Added #include in the non-Win32 - section of the !ACE_HAS_STANDARD_CPP_LIBRARY section, for systems - like Solaris w/ SC4.2. - -Wed Oct 6 21:36:18 1999 Douglas C. Schmidt - - * ace/Log_Msg.cpp (log): Forgot to remove a stray %s. - Thanks to Kitty Krishnakumar for - reporting this. - -Wed Oct 06 16:42:56 1999 Nanbor Wang - - * examples/Reactor/Misc/Misc.dsw: - * examples/Reactor/Misc/demuxing.dsp: Added the demuxing test - project file. - - * examples/Reactor/Misc/test_demuxing.cpp: MS Windows only - supports a limited set of signals. Made sure we use them in the - examples. - -Wed Oct 06 16:20:28 1999 David L. Levine - - * tests/CDR_File_Test.cpp (run_test): when reading, ensure - that the message block has sufficient space to properly - align the 64-bit double on LynxOS and Neutrino. Thanks - to Jeff for helping to track this down, and for Carlos - for providing the fix. - -Wed Oct 6 15:40:11 1999 Vishal Kachroo - - * ace/OS.i : Initialised the qos_len variable to sizeof (QOS) - within the ioctl () method for ACE_SIO_GET_QOS. - - * ACE_wrappers/examples/QOS/client.cpp: - * ACE_wrappers/examples/QOS/server.cpp: Added a test for the - ACE_SIO_GET_QOS io control code. The Sending and Receiving - QOS flowspec parameters are extracted and printed for both the - sender and receiver using this control code. - -Wed Oct 6 08:36:17 1999 Douglas C. Schmidt - - * ace/OS.h: Changed - - # if defined (__SUNPRO_CC < 0x500) - - to this - - # if defined (__SUNPRO_CC < 0x500) || ((__SUNPRO_CC == 0x500 && > __SUNPRO_CC_COMPAT == 4)) - - to work around compilation problems with Sun CC 5.0 when used in - Sun CC 4 compatibilty mode. Thanks to Erik Koerber - for this fix. - - * ace/Log_Msg.cpp (log): Added support for a %m option that - behaves like strerror() rather than perror(). Thanks to Kitty - Krishnakumar for this feature. - - * ace/OS.i (event_wait): We need to put the call to - ACE_OS::cond_wait() in a loop to guard against spurious wakeups. - Thanks to Sergey Nemanov and Vladimir - Kondratiev for reporting this - and suggesting a fix. - - * tests/Malloc_Test.cpp: Don't run the Malloc_Test on LynxOS. - - * tests/MM_Shared_Memory_Test.cpp: Fixed the code so that it'll - compile correctly on platforms that lack fork(), such as - VxWorks. Thanks to David Levine for reporting this. - -Tue Oct 5 16:17:57 1999 Douglas C. Schmidt - - * tests/MM_Shared_Memory_Test.cpp (spawn): Make sure to - delete the synchronizer in both the parent and the child - processes since otherwise we get a memory leak! Thanks to David - Levine for pointing this out. - - * tests/Task_Test.cpp (main): Make sure to delete the thread hook - before exiting the process to avoid a memory leak. Thanks to - David Levine for pointing this out. - -Tue Oct 5 15:04:03 1999 Douglas C. Schmidt - - * ace/[Active_|Hash_]Map_Manager: Modified these classes so that the - find() methods are all "const". Thanks to Jody Hagins - for reporting this. - -Tue Oct 05 21:58:06 1999 Nanbor Wang - - * ace/config-WinCE.h: Reenabled ACE_HAS_MFC. This should be the - most portable configuration. If you insist not to use MFC at - all, define ACE_HAS_MFC=0 in your config.h file. - - * ace/OS.h: - * ace/OS.cpp (set_window): Removed the MFC specific set_window - method so we can use ACE in both MFC and non-MFC applications. - - * ace/INET_Addr.h: Applied ASYS_TEXT to several default - string literals. - - * ace/DLL.h: - * ace/DLL.cpp: Changed the type of in ctor and the open - method to ASYS_TCHAR to minimize string conversion. - - * tests/DLL_Test.cpp: Applied ASYS_TEXT to the name of the DLL - file. - -Tue Oct 5 19:01:43 1999 Jeff Parsons - - * ace/CDR_Stream.i: - Changed << for bounded (w)strings to marshal only 'length' - bytes, instead of 'bound' bytes. The previous method could - cause an access violation if the string fits near the end - of a system page, but the 'bound' extends beyond it. Thanks - to Brian Wright for reporting this - bug. - -Mon Oct 4 08:31:58 1999 Douglas C. Schmidt - - * examples/Shared_Malloc/test_persistence.cpp: Enhanced the - list_employees() method so that it'll print the contents of - ACE_Malloc<> in FIFO and LIFO order. - - * ace/Malloc[_T].{h,cpp}: Added a new iterator for ACE_Malloc<> - called ACE_Malloc_FIFO_Iterator, which prints out the - ACE_Name_Node entries in FIFO order. In addition, renamed - ACE_Malloc_Iterator to be ACE_Malloc_LIFO_Iterator because it - prints the ACE_Name_Node entries in LIFO order. Also added a - #define of ACE_Malloc_Iterator to ACE_Malloc_LIFO_Iterator to - ensure backwards compatibility. Thanks to Wenli Bai - for this enhancements. - - * tests/MM_Shared_Memory_Test.cpp: Fixed the test so that it should - work correctly for platforms that use either processes or - threads. Also, make sure to call remove() on the - ACE_Process_Semaphore so that stray semaphores aren't left - around. Thanks to David Levine for helping to track this down. - - * ace/Synch.h: Updated the documentation for the - ACE_Process_Semaphore destructor to indicate that it doesn't - remove the semaphore. Instead, you must call remove() - explicitly. Thanks to David Levine for helping to track this - down. - - * ace/Malloc_T.cpp (print_stats): Added a cast for the ACE_LOCK to - work around the fact that the print_stats() method is const. - Thanks to Jean-Marc Strauss for - reporting this. - - * ace/INET_Addr.cpp (set): Added ACE_UNUSED_ARG - so the compiler won't complain about the protocol paraemter in - parts of the code where it's not used. - - * tests/MM_Shared_Memory_Test.cpp (spawn): Added ACE_UNUSED_ARG - so the compiler won't complain about process_synchronizer in - parts of the code where it's not used. - -Sun Oct 3 12:47:35 1999 Douglas C. Schmidt - - * tests/Process_Mutex_Test.cpp (main): Renamed the confusing "server" stuff - to "parent" where appropriate. - - * tests/MM_Shared_Memory_Test.cpp: Don't call ACE_OS::exit() - in the child since this won't clean up the Object_Manager - correctly. Thanks to David Levine for reporting this. However, - we'll still have two "end" statements, but only one begin - statement, which is confusing. I'm not sure how to solve this, - but it won't break anything. - - * tests/MM_Shared_Memory_Test.cpp: Oops, only do the - acquire()/release() of the Process_Semaphore if we have fork()! - - * tests/MM_Shared_Memory_Test.cpp: Added an ACE_Process_Semaphore - so we no longer need to sleep in order to wait for the server to - be initialized. - - * tests/Process_Strategy_Test.cpp (main): Switched the processes - in which the client and server are run so that the server is now - run in the parent and the client is run in the child. This made - it possible to remove the ACE_OS::sleep(1) call because the - acceptor is created before the fork, so the client should always - be able to connect to the server, even if the server isn't - scheduled to run again before the client. - - * tests/Process_Mutex_Test.cpp, - * tests/SV_Shared_Memory_Test.cpp: - Fixed some improper style problems with these tests. - -Sun Oct 03 10:34:19 1999 David L. Levine - - * tests/SV_Shared_Memory_Test.cpp (main): only delete - parent_mutex and parent_synch in the parent, to prevent - double deletion by the child. [Bug 91] - -Sun Oct 03 10:21:15 1999 David L. Levine - - * tests/SV_Shared_Memory_Test.cpp: create parent_mutex and - parent_synch before forking, to avoid race condition between - their creation in the parent and use in the child. This - allowed us to remove the sleep (1) in the child. [Bug 91] - -Sun Oct 03 10:17:21 1999 David L. Levine - - * ace/OS.cpp (ACE_Thread_Adapter::invoke): added casts of - func (to ACE_THR_FUNC) and its return value (to void *) - so that this function will compile for VxWorks and pSOS. - -Sat Oct 2 18:54:38 1999 Vishal Kachroo - - * ace/SOCK_Dgram_Mcast.{cpp,h}: Added ACE_Protocol_info as a - parameter to the QoS enabled private method subscribe_ifs. This - allows the use of ACE_Protocol_Info->iAddressFamily in the call - to join_leaf (). Thanks to Vidya Narayanan - for pointing this out. - -Sat Oct 2 16:20:33 1999 Nanbor Wang - - * ace/config-kcc-common.h: The macro __KCC_VERSION was not - available in 3.3e so we switched to check the existence of this - macro to decide the availability of auto_ptr::reset(). Thanks - to Ossama for noticing this bug. - -Sat Oct 2 16:10:26 1999 Ossama Othman - - * ace/config-linux-common.h: - - Linux (glibc 2.x) has lseek64() so define ACE_HAS_LLSEEK. - - * ace/OS.i (llseek): - - Removed external declaration for llseek() on Linux. Linux uses - lseek64(), not llseek(). Updated macro checks to use lseek64() - for Linux. [Bug 276] - -Sat Oct 2 16:01:50 1999 Douglas C. Schmidt - - * ace/INET_Addr.h (ACE_INET_Addr): Removed an unnecessary "protocol" - string. Thanks to Jeff and Ossama for reporting this. - -Sat Oct 2 12:50:43 1999 Douglas C. Schmidt - - * ace/INET_Addr: Previous, it was not possible to specify the - proto argument in the ACE_INET_Addr constructor because it was - hard-coded to "tcp". Now, this can be passed as a parameter. - Thanks to Jaymes Galvin for this suggestion. - -Fri Oct 1 14:44:12 1999 Vishal Kachroo - - * ace/OS.h : Added the Winsock2 GQOS related #defines to this - file. The #defines are limited to the ones used in the ACE QOS - example. - - * ACE_wrappers/examples/QOS/server.cpp: - * ACE_wrappers/examples/QOS/client.cpp: - * ACE_wrappers/examples/QOS/QosEvent.h: - Changed the QOS example to use the ACE flags instead of Windows - flags. Removed the #defines from the example and moved them to - OS.h - -Fri Oct 1 13:14:17 1999 Douglas C. Schmidt - - * ChangeLog: Added more Borland support. Thanks to - Christopher Kohlhoff for this. - -Fri Oct 01 13:05:24 1999 David L. Levine - - * Makefile: move instructions for creating kits down in - the file, and added note that they're intended for - ACE+TAO developers and maintainers, only. Thanks to - Rick Hess for pointing out that - that wasn't clear. - -Fri Oct 1 08:23:36 1999 Joe Hoffert - - * ace/ATM_Connector.{h,i}: Added add_leaf method and functionality. - -Thu Sep 30 16:55:41 1999 Douglas C. Schmidt - - * tests/Task_Test.cpp (main): Added a short example illustrating - how the new ACE_Thread_Hook mechanism works. - - * ace/OS.cpp: Added new support for the thread_hook to - ACE_OS_Object_Manager. - - * ace/OS.cpp (invoke): Added support for a virtual "start_hook()" - method in a new ACE_Thread_Hook class. This makes it possible - for users to subclass ACE_Thread_Hook perform initialization - operations before the thread entry point method is called back. - Thanks to Chris Hafey for this - suggestion. - -Thu Sep 30 20:40:42 1999 Marina Spivak - - * bin/run_all_list.pm: - Added TAO/examples/Load_Balancing demo to the list of daily - executed tests. - -Thu Sep 30 11:36:20 1999 Charles Frasch - - * include/makeinclude/wrapper_macros.GNU: in checks for - ACE_HAS_GNUG_PRE_2_8, use $(notdir $(CXX)) to properly - handle case where CXX has a directory part. - -Thu Sep 30 11:13:14 1999 Douglas C. Schmidt - - * ace/Pipe.cpp (open): Don't use socketpair() for pipes on LynxOS - since this doesn't work for some reason. Instead, use the - socket emulation. Thanks to David Levine for reporting this. - -Thu Sep 30 10:30:00 1999 Kirthika Parameswraan - - * ace/README: Added documentation for: - ACE_HAS_BROEN_EXTENDED_TEMPLATES Thanks to Fritz Bosch - for suggesting this. - -Thu Sep 30 10:07:38 1999 Douglas C. Schmidt - - * ace/Strategies_T.h: Added - - #define ACE_Refcounted_Hash_Recyclable ARHR - - to work around broken linkers that can't handle long - symbol names. Thanks to Fritz Bosch - for this suggestion. - -Wed Sep 29 20:58:45 1999 Darrell Brunsch - - * ace/config-win32.h: - * ace/config-win32-common.h: - Winsock2.h wasn't being included before my checks of the - winsock version, so I moved it to -common.h instead. - -Wed Sep 29 16:40:45 1999 Nanbor Wang - - The following changes fix the Service_Configurator on Windows - CE. Thanks very much to Kirthika for her help on making this - work. - - * tests/WinCE/DLL_Test.dsp: - * tests/WinCE/ce_tests.dsw: Added the DLL_Test project. - - * ace/ace_ce_dll.dsp: Added DLL.cpp into the project. - - * ace/Service_Types.i (name): - * ace/Service_Object.i (name): Changed to use ACE::strnew to - duplicate the name string. - - * ace/Parse_Node.cpp: Changed all the ACE_*_Node classes to make - copies of all string variables and release when they get - destructed. This is necessary because on Windows CE, the - strings passed into these classes are very short-lived (we use - ASCII to UNICODE conversion macros which make temporary copies - only.) The change shouldn't affect the performance of ACE since - parsing the svc.conf entries should never be in the critical - path. - - * ace/Parse_Node.h: The comments for in - ACE_Location_Node is completely outdated. It now specifies - whether the Service_Object generated by this Location_Node - should be removed or not when it is no longer in use, not the - . - - * ace/OS.i (access): Added a temporary implementation for CE here. - ACE::ldfind check the file accessibility using this function. - Currently, we hard-code the method to check for read-access only - (i.e., the argument is not used) which needs to be - fixed. - - * ace/OS.cpp (fopen): Check for invalid handle and return NULL if - handle is invalid on CE. Otherwise, CE programs get totally - confused. - - * ace/Malloc.cpp (dump): I added some more operations in the dump - methods but forgot to make them UNICODE friendly. - - * ace/config-WinCE.h: Added the macro definition for - ACE_DEFAULT_LD_SEARCH_PATH since CE doesn't support environment - variables at all and we need to hard-code the search path on - CE. - - * ace/README: Added documentation for ACE_DEFAULT_LD_SEARCH_PATH. - - * ace/ACE.cpp (ldfind): When the macro ACE_DEFAULT_LD_SEARCH_PATH is - defined, we should use the hard-coded search path instead of - trying to use getenv to acquire the search path. - - * examples/Service_Configurator/Misc/Timer_Service.cpp: - * examples/Service_Configurator/Misc/Timer_Service.h: Made the - services UNICODE and CE friendly by applying ASYS_TEXT and using - ASYS_TCHAR liberally. - - * examples/Service_Configurator/Misc/README: Added instructions on - how to run the example on Windows CE. - -Tue Sep 28 15:46:23 1999 Darrell Brunsch - - * ace/OS.i: Fixed some GQOS stuff for the older versions of - WinSock 2. - - * ace/config-win32.h: Uses a better detection technique to - figure out whether we are compiling with WinSock 2's newer - headers or not. - -Tue Sep 28 14:48:26 1999 Irfan Pyarali - - * ace/WFMO_Reactor.cpp (handler): Implemented previously - unimplemented function. - -Tue Sep 28 15:02:33 1999 Vishal Kachroo - - * ace/OS.i (ioctl): Added the #if def ACE_HAS_WINSOCK2_GQOS for - the extra fields in struct _flowspec. - -Mon Sep 27 19:16:34 1999 Douglas C. Schmidt - - * ace/OS.i (timezone): SunOS 4 needs to use gettimeofday() to find - the current timezone. Thanks to Kamen Penev - for reporting this fix. - -Mon Sep 27 19:30:54 1999 Carlos O'Ryan - - * THANKS: - Added Dennis to the hall of fame list. - -Mon Sep 27 17:12:51 1999 Vishal Kachroo - - * ace/OS.i: - * ace/OS.h: - Added an overloaded ioctl () that is used when the io control - code is one of SIO_SET_QOS or SIO_GET_QOS. Thanks to Vidya - Narayanan for help with this - feature. - - * ACE_wrappers/examples/QOS/server.cpp: - * ACE_wrappers/examples/QOS/client.cpp: - Made changes to the usage of ioctl () in the above files to - reflect the corresponding changes in ACE. - -Mon Sep 27 13:11:02 1999 Douglas C. Schmidt - - * ace/config-sunos5.5.h: Wrap the define statement in a - conditional that prevents declaration of #define - ACE_HAS_STL_QUEUE_CONFLICT for gcc 2.95. We don't know if this - is a problem in newer versions of Solaris but this will get rid - of it for 5.5.1. Thanks to Siegurd Weber - for this fix. - -Mon Sep 27 16:56:10 1999 Carlos O'Ryan - - * ace/OS.cpp: - ACE_OS::cond_init() has two completely separate versions, i - forgot to fix the NT version too, thanks to Vishal for pointing - this out. - -Mon Sep 27 16:05:35 1999 Darrell Brunsch - - * tests/Object_Manager_Test.dsp: - * tests/run_tests.bat: - * tests/tests.dsw: - * tests/version_tests/Object_Manager_Test.dsp: - * tests/version_tests/version_tests.dsw: - Added Object_Manager_Test support on Win32 and MSVC. - -Mon Sep 27 15:23:47 1999 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - Fixed overloading problems for cond_init() under LynxOS and - Chorus, thanks to John K. Black - for reporting the problem and providing a fix. - This fixes [BUGID:342] - -Mon Sep 27 13:11:02 1999 Douglas C. Schmidt - - * ace/SString.h: Added the default value for the ACE_CString - method set (const char *, int = 1). We had removed the default - values from both the set() methods in order to remove an - ambiguity. However, it appears that it's ok to give just this - method a default value. Moreover, this prevents existing code - from breaking. Thanks to Giga Giguashvili - and Ivan Murthy - for reporting this. - -Sat Sep 25 17:09:57 1999 Carlos O'Ryan - - * ACE version 5.0.5 released. - -Fri Sep 24 17:20:41 1999 Nanbor Wang - - * ace/config-kcc-common.h: KCC does support auto_ptr::reset - after 3.4. Made sure we don't define ACE_AUTO_PTR_LACKS_RESET - for newer version of KCC. Thanks to Ossama for reporting the - problem. - -Fri Sep 24 08:59:13 1999 Douglas C. Schmidt - - * ace/config-sunos4-g++.h: Added ACE_HAS_DIRENT. - Thanks to Kamen Penev for reporting this. - - * tests/Handle_Set_Test.cpp (test_boundaries): Added some casts - and parens so that the code will compile with MSVC++ 5.0. - Thanks to Carlos O'Ryan for reporting this. - - * examples/Connection/blocking/SPIPE-{acceptor,connector}.cpp: - Reformatted some of the code. - -Fri Sep 24 08:27:28 1999 David L. Levine - - * ace/OS.*,Synch.cpp: reverted changes of: - - Thu Sep 23 11:13:38 1999 Wei Chiang - - because Bug 342 proposes a more general fix. - -Thu Sep 23 19:02:47 1999 Vishal Kachroo - - * examples/QOS/server.cpp (main): - * examples/QOS/server.cpp (main): - - Removed the instantiation of ACE_OS_Object_Manager from - the above files. This is done automagically in ACE. - - * examples/QOS/Sender_QOS_Event_Handler.h: - Fixed a warning regarding the #def of MY_DEFPORT. - -Thu Sep 23 14:12:58 1999 Carlos O'Ryan - - * bin/auto_compile: - It was reporting success even when things failed. - -Thu Sep 23 11:13:38 1999 Wei Chiang - - * ace/OS.*,Synch.cpp: Chorus compiler (g++) seems to be - confused by "int" and "int&" in overloaded operations. - A dummy variables to full Chorus compiler is added to - cond_init (ACE_cond_t*, ACE_condattr_t&, LPCTSTR void*). - - * include/makeinclude/rules.bin.GNU,platform_chorus.GNU: - updated to support linking of TAO executables for Chorus. - -Wed Sep 22 19:30:49 1999 Randall Sharo - - * ace/OS.i (sema_wait): on VxWorks, update tv to return - the wait time. [Bug 339] - - * ace/Synch.h (ACE_Semaphore::acquire): updated comment - to show that the absolute acquisition time is returned, - not the elapsed time while waiting. - -Wed Sep 22 16:59:19 1999 Nanbor Wang - - * ace/config-win32-common.h: Added definition of - ACE_AUTO_PTR_LACKS_RESET when ACE_HAS_STANDARD_CPP_LIBRARY is - defined. Thanks to Ossama for the quick hint. - -Wed Sep 22 13:05:55 1999 Jim Rogers - - * ace/Codeset_IBM1047.cpp: added #include "ace/inc_user_config.h" - at the beginning, to properly pick up the ACE_MVS #define - on MVS. - -Wed Sep 22 11:20:39 1999 David L. Levine - - * ace/Basic_Types.h: use u_long for ptr_arith_t, even - with 64-bit ints, with Sun CC. For unknown reasons, - Sun CC 5.0 won't allow a reintepret cast of a 64-bit - pointer to a 64-bit int (with -xtarget=ultra -xarch=v9a). - Thanks to Giga Giguashvili for - reporting this. - -1999-09-21 James CE Johnson - - * docs/tutorials/Makefile - * docs/tutorials/???/* - Added a number of notes about proper usage of THR_NEW_LWP and - THR_DETACHED. Rebuilt all of the .html and .shar files. Probably - touched too many along the way but better safe than sorry. - -Tue Sep 21 21:56:10 1999 David L. Levine - - * docs/ACE-subsets.html: replaced absolute link to - ../ACE-INSTALL.html#repo with a relative link. And, - added "typically" to the 25 percent size reduction figure. - -Tue Sep 21 16:49:36 1999 Douglas C. Schmidt - - * docs/ACE-subsets.html,ACE-INSTALL.html: Updated the document - to point to the -frepo discussion. Thanks to Timothy Canham - for motivating this. - -Tue Sep 21 16:07:26 1999 David L. Levine - - * docs/ACE-subsets.html: fixed size comparison chart; the - For TAO entry was missing for SunOS 5.7/egcs 2.91.60. - Thanks to Timothy Canham - for reporting this. - -Tue Sep 21 15:34:16 1999 Douglas C. Schmidt - - * ace/Service_Config.cpp (process_directives_i): Added a fix - so that the Service_Config allows one level of reentrancy. - Thanks to Jonathan Reis for - suggesting this. - -Tue Sep 21 11:35:57 1999 Douglas C. Schmidt - - * examples/Threads/tss1.cpp (main): Need to rearrange where the - explicit template instantiations are to make certain compilers - happy. Thanks to Jeffrey Franks for - reporting the problem. - - * tests/Makefile.bor: Updated ACE tests makefile to build (almost) - all of the tests. Thanks to Christopher Kohlhoff - for this fix. - - * examples/Reactor/Misc/test_signals_2.cpp (main), - * examples/Reactor/WFMO_Reactor/test_talker.cpp (STDIN_Handler): - Preemptively fixed a couple more potential problems that might - trigger the type of problem reported in the next entry below. - -Tue Sep 21 11:41:33 1999 Ossama Othman - - * apps/Gateway/Gateway/Event_Channel.cpp (open): - Changed cast style to make gcc 2.95.1 happy. Thanks to Jeffrey - Franks for reporting the problems. - -Tue Sep 21 11:25:32 1999 Carlos O'Ryan - - * bin/auto_compile: - Print the most recent ChangeLog entries in the log file. - Report successful builds by default. - Reformat email to make Darrell happier, btw, he made most of - these suggestions. - -Tue Sep 21 11:13:21 1999 Steve Huston - - * ace/streams.h: Added includes/using to pick up strstream for - istrstream, ostrstream classes when ACE_HAS_STD_CPP_LIBRARY is set. - -Tue Sep 21 09:38:20 1999 David L. Levine - - * tests/run_tests.lst: disabled Signal_Test. [Bug 309] - -Tue Sep 21 08:33:21 1999 David L. Levine - - * ACE-INSTALL.html: use shared_libs=1, not shared_libs_only=1, - to build shared libs on VxWorks. That avoids missing libACE.a, - for example, when linking other libraries. Thanks to - Uwe Landrock for reporting this. - -Mon Sep 20 10:52:37 1999 Douglas C. Schmidt - - * ACE-INSTALL.html: Clarified that the --unix flag must be given for - Cygwin tools on Vxworks and NT. Thanks to Uwe Landrock - for reporting this. - -Mon Sep 20 10:34:51 1999 Steve Huston - - * ACE-INSTALL.html: Fixed broken link to Riverace's HP-UX info. - Thanks to Doug for finding this. - -Sun Sep 19 12:48:31 1999 Douglas C. Schmidt - - * tests/Signal_Test.cpp: Only send outselves a signal if we're - running the signal handler in a separate thread. - -Sun Sep 19 10:39:30 1999 Douglas C. Schmidt - - * tests/Signal_Test.cpp: Changed the type of shut_down indicator from - ACE_Atomic_Op<> to sig_atomic_t. This prevents some nasty - deadlocks. - - * tests/run_tests.lst: Reenabled Signal_Test so we can see if it's - still working. - - * tests/Signal_Test.cpp: Changed the worker_child() function so that - just before its thread exits, it will sent its process a signal - to the signal handling thread to dislodge it if it hasn't - shutdown on its own accord yet. Thanks to David Levine for - reporting this. This fixes [BUGID:309]. - - * ACE/Handle_Set.h: Updated the documentation to point out that it's - the *caller's* responsibility to ensure handles aren't - added/cleared from the set if their values are larger than - ACE_DEFAULT_SELECT_REACTOR_SIZE. This behavior is necessary to - ensure efficiency. - - * tests/Handle_Set_Test.cpp (test_boundaries): Fixed the test so - that it will correctly ignore any handle values >= - ACE_DEFAULT_SELECT_REACTOR_SIZE. Thanks to David Levine for - reporting this. This fixes [BUGID:315]. - -Sat Sep 18 18:49:31 1999 Jeff Parsons - - * ace/config-win32-borland.h: - Undefined ACE_HAS_BROKEN_IMPLICIT_CONST_CAST as - suggested by Christopher Kohlhoff . - -Sat Sep 18 17:31:52 1999 Douglas C. Schmidt - - * examples/QOS: Improved the conformance to ACE programming - guidelines a bit. - - * ace/Message_Block.cpp: Whenever a ACE_Message_Block accepts a - ACE_Data_Block that was produced by someone else, it should - verify that the allocator is non-NULL and if it is, then it - should allocate the ACE_ALLOCATOR_RETURN on it. Thanks to - Pierre Grondin for reporting - this. - - * docs/tutorials/006: Fixed the activate() method so that it uses - THR_DETACHED. Thanks to Shafiek Savahl - for reporting this. - -Sat Sep 18 16:17:34 1999 Carlos O'Ryan - - * bin/auto_compile: - The messages include the build name in the subject line. Thanks - to Darrell for suggesting this idea. - -Sat Sep 18 12:00:28 1999 Douglas C. Schmidt - - * ace/Message_Block.h: Changed all the ACE_Message_Block constructors - so that the priority parameter defaults to - ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY, rather than 0. Thanks to - Detlef Becker for this suggestion. - - * ace/OS.h: Added a new macro called - ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY, which defaults to 0 but - which can be overridden in a config.h file to a different value - so it's possible to transparently choose default priorities that - are > 0. Thanks to Detlef Becker - for this suggestion. - -Fri Sep 17 19:49:15 1999 Kirthika Parameswaran - - * tests/Hash_Map_Manager_Test.cpp: Repositioned template - instantiations and static variables to make the debug=0 build - happy with SunCC5.0. - -Fri Sep 17 15:34:46 1999 Nanbor Wang - - * ace/Malloc.cpp (dump): - * ace/Malloc_T.cpp (dump): Enriched various dump methods a bit. - -Thu Sep 16 17:53:57 CDT 1999 Loren Rittle - - * bin/update-ace+tao.sh: Added force option. - -Thu Sep 16 17:43:02 CDT 1999 Loren Rittle - - * bin/update-ace+tao.sh: Improve portability. - -Thu Sep 16 11:08:45 1999 Ossama Othman - - * ace/Makefile: - * tests/Makefile: - - Updated dependencies. - -Wed Sep 15 21:42:08 1999 Carlos O'Ryan - - * ace/OS.h: - Removed extra "typedef" in the declaration of the - ACE_Protocol_Info structure, it was causing a large number of - warnings in several platforms. - -Wed Sep 15 15:08:33 1999 Ossama Othman - - * bin/run_all_list.pm: - - Run the newly added TAO/tests/ORB_init/run_test.pl script when - executing the ORB_init test. - -Wed Sep 15 14:49:50 1999 Balachandran Natarajan - - * ace/Hash_Map_With_Allocator_T.h: - * ace/Hash_Map_With_Allocator_T.i: Added a method unbind () which - unbinds an entry by only taking a key. - -Wed Sep 15 13:19:36 1999 Nanbor Wang - - * ace/Service_Config.cpp (process_directive): Added ace_yyrestart - to make sure the service config parser has a valid buffer to - work on. Thanks to Lothar Werzinger - for reporting this. - -Wed Sep 15 10:50:21 1999 James Hu - - * ace/TP_Reactor.{cpp,h,i} (mask_ops): Fixed a problem where - cancel_wakeup would fail. Since an event handler is suspended - for the duration of the up-call, the wait_mask_ was being - over-written by the suspend_mask_ when the event handler was - resumed. This fixes the problem by extending TP_Reactor with - its own implementations of mask_ops that operate on both - wait_mask_ and suspend_mask_. - -Wed Sep 15 10:14:21 1999 Ossama Othman - - * docs/exceptions.html: - - Corrected some ACE_TRY_THROW examples. The exception being - thrown must have a parameter list, even if it is empty - (e.g.: ACE_TRY_THROW (CORBA::BAD_PARAM ());) - -Tue Sep 14 22:10:24 1999 Kristopher Johnson - - * ace/Process_Manager.cpp (wait): changed array index from - i to idx. Thanks to Dave Madden for confirming this fix. - - Reverted this change: - Tue Sep 14 16:01:04 1999 Christopher Kohlhoff - because it's no longer necessary. - -Tue Sep 14 21:00:45 1999 Vishal Kachroo - - * ace/OS.h: Added a typedef for ACE_Protocol_Info for non-Win32 - platforms. Defined it as a struct (with limited fields) instead - of u_long because applications using ACE_Protocol_Info on - non-Win32 platforms expect this to be a structure instead of a - u_long. - - * ACE_wrappers/examples/QOS/Makefile: Added this for the test to - compile on non-Win32 platforms. - - * ACE_wrappers/examples/QOS/server.cpp: - * ACE_wrappers/examples/QOS/client.cpp: - * ACE_wrappers/examples/QOS/QosEvent.h: - * ACE_wrappers/examples/QOS/Sender_QOS_Event_Handler.cpp: - - Removed the last remains of win32isms from the test. The QoS - test now compiles clean on non-Win32 platforms. - -Tue Sep 14 17:49:33 1999 Luther J Baker - - * ace/Arg_Shifter.cpp (get_the_parameter): removed an errant - return 0; - -Tue Sep 14 16:01:04 1999 Christopher Kohlhoff - - * ace/Process_Manager.cpp (wait): moved declaration of - loop index i out of the loop, because it is used outside - the scope of the loop. - -Tue Sep 14 15:03:21 1999 Ossama Othman - - * bin/run_all_list.pm: - - Added ORB_init test to the list of tests to run. - - * configure.in: - * configure: - - Do not define ACE_USE_POLL, even if system poll() works. - -Tue Sep 14 11:02:06 1999 Balachandran Natarajan - - * ace/Hash_Map_With_Allocator_T.h: - * ace/Hash_Map_With_Allocator_T.cpp:Added a find () method that - would lookup at the underlying Hash_Map_Manager_Ex to do the - find. - -Sat Sep 11 12:18:22 1999 Douglas C. Schmidt - - * ace/Pipe.cpp: Make sure to use SOCK_STREAM rather than SOCK_DGRAM - when creating a socketpair. Thanks to Dave Madden for reporting - this. - -Mon Sep 13 13:31:23 1999 Luther J Baker - - * ace/Arg_Shifter.cpp (get_the_parameter): continued -ORB parsing - fixes. Allows one simple method to return a parameter value for - defined flag is it exists. - -Mon Sep 13 11:01:24 1999 Nanbor Wang - - * examples/Shared_Malloc/test_persistence.cpp: Added comments on - the use of scanf. Thanks to Wenli Bai for - reporting the problem. - -Sun Sep 12 19:23:51 1999 Nanbor Wang - - * ACE version 5.0.4 released. - -Sat Sep 11 12:18:22 1999 Douglas C. Schmidt - - * ace/Process_Manager.cpp: Reverted the following change so that we - just add a fake "friend" to keep G++ happy... Also, fixed a - typo where we should have allocated an ACE_Managed_Process - rather than an ACE_Process. Thanks to Dave Madden for reporting - this. - - * ace/Process_Manager.cpp: Added the ACE_CLASS_IS_NAMESPACE method - to ACE_Managed_Process to make G++ happy. Also, removed the - trailing '_' since we don't need this because we've prefixed - "ACE_" already. - -Fri Sep 10 16:58:34 1999 Nanbor Wang - - * ace/Malloc_T.cpp (open,shared_malloc): Added several placement - new's if position independent malloc is enabled to avoid reading - uninitialized memory. - -Fri Sep 10 16:39:13 1999 Vishal Kachroo - - * examples/QOS/README: - * examples/QOS/server.cpp: - * examples/QOS/client.cpp: - * examples/QOS/Sender_QOS_Event_Handler.h: - * examples/QOS/Sender_QOS_Event_Handler.cpp: - - Removed the Win32-isms from the above files and used cleaner ACE - interfaces. Added a README file that describes the test. - -Fri Sep 10 16:38:51 1999 Nanbor Wang - - * tests/WinCE/*.dsp: VC 6 changed all the dsp files format. - -Fri Sep 10 11:20:47 1999 Douglas C. Schmidt - - * ace/SOCK_Acceptor.h, - ace/SOCK_Connector.h: Updated the documentation to clarify what - happens wrt blocking vs. non-blocking connects and accepts. - Thanks to Jose Rubio for motivating - this change. - -Thu Sep 9 16:27:56 1999 Douglas C. Schmidt - - * ace/Process_Manager, - ace/Process: Added some new patches from Dave Madden to obtain - greater control over the spawn() behavior. - -Fri Sep 10 14:30:17 1999 Vishal Kachroo - - * ace/SOCK_Dgram_Mcast.i: - * ace/SOCK_Dgram_Mcast.h: - - Added two send () functions using overlapped I/O to the - ACE_SOCK_Dgram_Mcast class. These simply call the parent - class functions with the same signature. The recv () functions - need not be added as there is currently no recv () function - within SOCK_Dgram_Mcast class to hide any parent class recv () - functions. - -Fri Sep 10 12:24:17 1999 Carlos O'Ryan - - * THANKS: - Added Joerg Pommnitz to the list of contributors. - -Thu Sep 9 22:48:56 1999 Darrell Brunsch - - * ace/config-hpux-10.x-hpc++.h: - * ace/config-hpux-11.x-hpc++.h: - Fixed spelling of ACE_PREPROCESSOR_ARGS to - ACE_CC_PREPROCESSOR_ARGS. - -Thu Sep 9 18:22:21 CDT 1999 Carlos O'Ryan - - * ace/Future.cpp: - HP/aCC was giving bogus warning about function without a return - statement (the function only has a throw). - -Thu Sep 09 14:56:29 1999 David L. Levine - - * ACE-INSTALL.html: we now fully support QNX Neutrino 2.0. - - * ACE-INSTALL.html: expanded repo=1 discussion. [Bug 248] - -Thu Sep 09 13:21:03 1999 Nanbor Wang - - * ace/ace_ce.dsw: - * ace/ace_ce_dll.dsp: Changed to use the project file format for - CE Toolkit for VC 6. - - * ace/config-WinCE.h: Added some macros definitons for POSIX error - codes. They are removed for Palm-size CE v2.01. This - configuration is still not working because its compilers don't - support placement new, which I don't know how to work around. - - * ace/Process_Manager.cpp (wait): Applied ASYS_TEXT macros. - - * ace/OS.cpp (init,fini): Applied ACE_TEXT macros around error - message print out. - (print_error_message): Added a WinCE specialized - implementation. - -Thu Sep 09 12:45:06 1999 David L. Levine - - * ace/config-qnx-neutrino.h: added ACE_HAS_SIGISMEMBER_BUG. - Sigset_Ops_Test passes with that. - -Thu Sep 09 12:31:51 1999 David L. Levine - - * tests/Handle_Set_Test (handle_vector[]): - limit the maximum handle in handle_vector to 31, 63, 127, and - 254 if ACE_DEFAULT_REACTOR_SIZE is less than or equal to - 32, 64, 128, and 256, respectively. [Bug 315] - -Thu Sep 9 09:39:46 1999 Kirthika Parameswaran - - * etc/purify.solaris2: Added suppression for MLK due to OS accept - call. [Bug 227] - -Thu Sep 09 09:24:29 1999 David L. Levine - - * tests/run_tests.lst: disabled Signal_Test. [Bug 309] - -Thu Sep 9 08:46:58 1999 Douglas C. Schmidt - - * tests/Lazy_Map_Manager_Test.cpp (main): ACEified this a bit - and fixed a typo for the argv argument in main(). - - * Updated the ACE-mail.html file to put the *-request addresses - first. Thanks to Lorin Hochstein for this - suggestion. - -Wed Sep 08 23:01:22 1999 Nanbor Wang - - * examples/Service_Configurator/Misc/Timer_Service.h: Added - ACE_Svc_Export specifiers. - - * examples/Service_Configurator/Misc/Misc.dsw: - * examples/Service_Configurator/Misc/Timer.dsp: Added a new - project file for the dll file. - -Wed Sep 08 22:19:47 1999 David L. Levine - - * ace/config-qnx-neutrino.h: added some magic to allow - compilation to succeed when optimization is enabled, - for x86 targets. The egcs 1.1.2 string.h #includes - x86/string.h, which has anti-social #defines for - memcmp, memcpy, and memset. Therefore, they can't be - used as C++ member functions, such as in ACE_OS. The - hack is to disable optimization just when #including - string.h. - - * include/makeinclude/platform_qnx_neutrino.GNU: default - both optimize and repo to 1. - -Wed Sep 8 17:25:07 1999 Douglas C. Schmidt - - * ace/OS.h (ACE_FACTORY_DEFINE): It shouldn't be necessary - to use ACE_dynamic_cast() or ACE_static_cast() for the - ACE_FACTORY_DEFINE macro because ACE_Service_Object's destructor - is virtual. Thanks to Carlos for pointing this out. - -Wed Sep 8 16:51:45 1999 Kirthika Parameswaran - - * ace/Acceptor.cpp (handle_close): Removed a unnecessary check - for which was causing UMR to occur. - -Wed Sep 08 16:48:55 1999 David L. Levine - - * include/makeinclude/wrapper_macros.gnu (purify): moved - -ignore-signals option to tests/Makefile, because that's - where it's needed. - - * tests/Makefile (purify): added SIGHUP and SIGTERM to - -ignore-signals, to prevent warnings from Signal_Test. - [Bug 309] - -Wed Sep 8 15:58:07 1999 Douglas C. Schmidt - - * tests/Log_Msg_Test.cpp (test_ostream): Make sure to add 1 - to the buffer we allocate dynamically so we can put a NUL at the - end of it! Thanks to David Levine for reporting this. [Bug 312] - - * examples/Service_Configurator/Misc/main.cpp (main): Changed the - test of the -f Service Configurator option so that it links two - different svc.conf files to avoid reentrancy problems. - - * examples/Service_Configurator/Misc/svc.conf: Revised this - svc.conf file (and the application) to illustrate the use of - both static *and* dynamic service. Thanks to Amir Bahmanyari - for motivating this. - -Wed Sep 8 14:05:00 1999 Kirthika Parameswaran - - * ace/Log_Msg.cpp: Shifted the instantiations to the top to keep - SunCC5.0 debug=0 build happy. - - * tests/Cached_Accept_Conn_Test.cpp: Repositioned global - declarations to ward off compilation errors on HP-UX. - -Wed Sep 8 13:13:18 1999 Douglas C. Schmidt - - * ace/Process.h (ACE_Process): Made the spawn() method virtual - so code can be executed just before and/or after the actual - fork(). Thanks to Dave Madden for this fix. - -Tue Sep 07 19:55:52 1999 Irfan Pyarali - - * ace/Map_Manager.h (ACE_Map_Manager): The old map manager (the - one before the changes made to support the active map manager) - used to allow deletion of entries from the map during iteration - (note that this feature was accidental since typically changes - to container invalidates the iterators). The new design did not - support this "feature". However, some users had come to depend - on this feature. - - The solution was to delay the movement of freed slots from the - occupied list to the free list until we run out of free slots in - the free list when binding new entries into the map. However, - this change requires additional state in each entry that keeps - track of whether this entry has been freed. Also, the time - required for binding new entries is less predictable since the - bind may require moving of freed slots from the occupied list to - the free list because of the initial lazy unbind. - - Changes were also required to the Active_Map_Manager since it - directly depends on the internals of the Map_Manager. - - Since this lazy feature is not required in the majority of cases - and results in increased memory consumption, this feature is - only support if ACE_HAS_LAZY_MAP_MANAGER is defined. - - A new test Lazy_Map_Manager_Test.cpp was added to check the new - changes. - - Thanks for Dr. Schmidt for helping with this solution and to - Murphy Ivan for pointing out this - problem. - - Bug fixed: id 228. - -Tue Sep 7 15:19:33 1999 Douglas C. Schmidt - - * tests/Log_Msg_Test.cpp (test_ostream): NUL-terminated the buffer - to avoid an array bounds overflow! Thanks to David Levine for - reporting this. - -Tue Sep 7 12:38:37 1999 Darrell Brunsch - - * tests/Reactor_Timer_Test.cpp: Purify was showing an UMR in - test_registering_one_handler(). This was because Time_Handler - didn't have a constructor that initialized its timer_id_ member - and it wasn't being set in this method (like the others). I - added a default constructor to Time_Handler. [Bug 249] - -Tue Sep 7 08:04:41 1999 Douglas C. Schmidt - - * ace/OS.i (isatty): Fixed this code so that it doesn't use - osf_handle() anymore on NT, but instead just casts the - ACE_HANDLE to an int. Thanks to Mark Winrock - for suggesting this fix and - testing it out. - - * tests/run_tests.lst: Added Signal_Test. - -1999-09-07 Douglas C. Schmidt - - * tests/Signal_Test.cpp (main): Fixed the test so that it won't - try to run the "synchronous signal handler in a separate thread" - on Linux because Linux threads are non-standard wrt signals. - -Mon Sep 6 21:19:27 1999 Douglas C. Schmidt - - * tests/Signal_Test.cpp (run_test): Added an ACE_UNUSED_ARG - for the synchronous_signal_handler pointer-to-function for the - case where ACE_HAS_THREADS is disabled. Otherwise, we get a - warning. - -Mon Sep 6 18:47:18 1999 Darrell Brunsch - - * ace/Process_Manager.h: Moved handle_signal outside of a !defined - ACE_WIN32 block and moved handle_input inside of it, and this - fixes some errors on MSVC. - -Mon Sep 6 14:19:14 1999 Douglas C. Schmidt - - * tests/Reactor_Notify_Test.cpp (main): Added a hyphen to - the ACE_DEBUG printout "with timeout =" so that it says "with - time-out =" to avoid confusing the run_tests.sh script! Thanks - to David Levine for reporting this. - - * ace/Process_Manager.cpp: Integrated more patches from - Dave Madden so that the correct - register_handler() method is used on Win32. - -Mon Sep 06 15:05:17 1999 David L. Levine - - * ace/Makefile: moved ACELIB setting (to null) to before include - of rules.lib.GNU. That way, rules.lib.GNU can use the value of - $(ACELIB) to determine whether the ACE library object files - should be linked into the library, with repo=1. [Bug 248] - - * include/makeinclude/rules.lib.GNU: with repo=1 when building - static libs, except for libACE, include all of the ACE lib's - object files. The prevents multiple instantiations, by GNU - repo, of templates that are used in the ACE library. See the - gcc info pages, Template Instantiation node, for more information. - [Bug 248] - -Mon Sep 6 08:45:31 1999 Douglas C. Schmidt - - * examples/Reactor/WFMO_Reactor: Cleaned up some of the coding in - the examples. - - * ace/Profile_Timer.cpp: Reformatted the code a bit. - - * examples/Threads/process_manager.cpp (main): Fixed some warnings - and errors. Thanks to David for reporting this. - - * ace/OS.i: Fixed ACE_UNUSED_ARG(options) to be - ACE_UNUSED_ARG(wait_options). Thanks to David's build logs for - reporting this. - - * tests/Signal_Test.cpp: Changed the types of parameters passed - to run_test() from int to long so that we can safely cast them - to and from void *'s. Thanks to David Levine for pointing this - out. - - * ace/Process_Manager.cpp (notify_proc_handler): Removed - the now unused parameter h. Thanks to David for pointing this - out. - -Mon Sep 06 07:25:01 1999 David L. Levine - - * ace/OS.h: added ACE_Export to ACE_OS_Exit_Info class - declaration. It shouldn't be necessary, but - Dmitry Goldshtain reports that - Builder 4 needs it. - -Mon Sep 06 03:31:34 1999 Nanbor Wang - - * tests/Signal_Test.cpp (run_test): Removed a redundant use of - ACE_UNUSED_ARG (synchronous_signal_handler). Thanks to KCC 3.3e - for pointing this out. - -Mon Sep 6 01:03:03 1999 Douglas C. Schmidt - - * examples/Threads/Makefile (BIN): Added process_manager.cpp - back into the list of programs that get built automagically. - - * ace/Process_Manager: Added some new patches from Dave Madden - that continue to improve the - ACE_Process_Manager and make it portable between NT and UNIX. - - * examples/Threads: Readded process_manager.cpp now that - Dave Madden has updated it. - -Sun Sep 05 23:52:16 1999 Nanbor Wang - - * ace/OS.h (WIFEXITED,WEXITSTATUS): On platforms that do not - define these macros, we should always assume the child process - exit properly because the return status does not tell us how the - process exited. Likewise, the WEXITSTATUS macro should simply - return the status we got from ACE_OS::wait because it only - contains the exit status of child process. - -Sun Sep 5 23:40:25 1999 Douglas C. Schmidt - - * examples/QOS: Continued to improve the coding style so it'll - look like normal "ACE" code. - -Sun Sep 05 21:32:40 1999 David L. Levine - - * ace/Synch.cpp: removed unnecessary #include of ace/Object_Manager.h. - -1999-09-05 Vishal Kachroo - - Made the receiver of QOS test portable by removing - Win32-isms from it. Files modified : - - * examples/QOS/QosEvent.h: - * examples/QOS/server.cpp: - -Sun Sep 5 13:40:18 1999 Michael Kircher - - * ace/ACE.cpp: Made the status code to be of type - ACE_exitcode instead of int. This is necessary - because of the change on waitpid (). - -Sun Sep 5 10:59:18 1999 Douglas C. Schmidt - - * ace/Process.i (wait): Removed the ACE_static_cast() Michael - had added recently because the change below makes it - unnecessary. - - * ace/OS.h (ACE_OS): Modified the 3-arg wait() and the waitpid() - methods to take an ACE_exitcode* rather than int* so this will - work on Win32. - - * ace/Log_Msg.cpp: Added a new explicit template instantiation - for template class - - ACE_Guard >; - - to fix compiler errors that showed up with EGCS. - - * tests/Signal_Test.cpp (run_test): Added ACE_UNUSED_ARG macros - for several symbols that aren't used when the test is compiled - single threaded. - -Sat Sep 05 02:05:00 1999 Michael Kircher - - * ace/OS.cpp: Fixed a missing "#else". - - * ace/Process.i, - ace/Process_Manager.h, - ace/Process_Manager.cpp: - Fixed an "int" versus "ACE_exitcode" conversion - problem. - -Sat Sep 4 23:37:29 1999 Douglas C. Schmidt - - * ace/config-win32-common.h: Missing a '&&' that was causing - problems on Win32. Thanks to Michael Kircher - for reporting this. - -Sat Sep 04 20:24:32 1999 David L. Levine - - * ace/Handle_Gobbler.i (close_remaining_handles,free_handles): - moved the function definitions ahead of their first use in - the file. - -Sat Sep 04 20:17:49 1999 David L. Levine - - * ace/Pipe.cpp (open): added ACE_UNUSED_ARG (buffer_size) - for all platforms that #define ACE_LACKS_SOCKET_BUFSIZ. - -Sat Sep 4 14:43:36 1999 Douglas C. Schmidt - - * tests/Signal_Test.cpp: Finished off the test so that it now - works for all the various combinations of synchronous and - asynchronous tests. Now, to make it work on Linux... - - * ace/OS.h: The use of ACE_static_cast in the ACE_FACTORY_DEFINE macro - didn't make any sense, so I've replaced it with - ACE_dynamic_cast. - - * ace/Process_Manager.*, - * ace/Process.*, - * ace/OS.h: - Created a new typedef called ACE_exitcode that factors out the - difference between Win32 and UNIX exit codes from wait() - operations. Thanks to Dave Madden for - suggesting this. - -Sat Sep 04 12:22:38 1999 David L. Levine - - * ace/OS.i (shm_open,close,filesize,ftruncate,mmap): moved - these functions up in the file so that they're defined before - being used by ACE_OS::sema_init (). - -Fri Sep 3 11:57:24 1999 Douglas C. Schmidt - - * ace/Event_Handler.h (ACE_Event_Handler): Added the new - handle_exit() method, which is called by the ACE_Process_Manager - when a process exits. Thanks to Dave Madden - for contributing this. - - * ace/Process.*, - ace/Process_Manager.*: Integrated a new round of changes from - Dave Madden that factor out most of the - remaining differences between Win32 and UNIX. - - * ace/OS.h, - * ace/config-win32-common.h: Added a #ifndef for __IBMCPP__ to - make things work for Visual Age C++. Thanks to Boris Kaminer - for reporting this. - - * ace/{ACE,OS}: Added ACE_HAS_UNICODE to conditionally compile the - strnew() definition. Thanks to Boris Kaminer - for reporting this. - - * ace: Added a new optimized ace-dll.icc file so that ACE will - build better with IBM's Visual Age C++. Thanks to Boris Kaminer - for contributing this. - - * ace/OS.h, - * ace/config-win32-common.h: Added a #ifndef for __IBMCPP__ to - make things work for Visual Age C++. Thanks to Boris Kaminer - for reporting this. - - * ace/{ACE,OS}: Added ACE_HAS_UNICODE to conditionally compile the - strnew() definition. Thanks to Boris Kaminer - for reporting this. - - * ace: Added a new optimized ace-dll.icc file so that ACE will - build better with IBM's Visual Age C++. Thanks to Boris Kaminer - for contributing this. - -1999-09-03 Vishal Kachroo - - * ace/OS.i: - * ace/OS.h: Added a new overloaded ACE_OS::ioctl () function that - takes in ACE_QoS as one of the parameters, constructs a windows - QOS from it and passes it to WSAIoctl (). This function can be - used when the I/O control code is SIO_SET_QOS. - -Fri Sep 3 14:58:51 1999 Darrell Brunsch - - * config-aix-4.x.h: - * config-hpux-10.x-hpc++.h: - * config-hpux-11.x-hpc++.h: - * config-mvs.h: - * config-win32-borland.h: - * config-win32.h: - Moved many of the preprocessor information for various - platforms from TAO_IDL to here (in ACE_CC_PREPROCESSOR and - ACE_CC_PREPROCESSOR_ARGS). - -Fri Sep 3 13:52:43 1999 Carlos O'Ryan - - * bin/auto_compile: - Fixed the implementation of the -dont_run option. - -Fri Sep 3 09:05:20 1999 Kirthika Parameswaran - - * ace/Containers_T.cpp (delete_nodes): Removed the redundant check - which was verifying that was always > 0. But - itself is unsigned so thsi check was redundant - causing warnings with egcs. - -Thu Sep 2 23:54:49 1999 Nanbor Wang - - * ace/Containers_T.h (class ACE_Double_Linked_List): Added more - comments to stress that this is not a general purpose container - class. Thanks to Rusty Conover for - suggesting this. - -Thu Sep 2 18:39:23 1999 Douglas C. Schmidt - - * ace/Process_Manager.cpp (handle_close): Did a better job of - fixing the use of ACE_UNUSED_ARG to make EGCS happy. - -Thu Sep 2 12:21:41 1999 Douglas C. Schmidt - - * ace/Select_Reactor_Base: Renamed the notify_set_, alloc_set_, - and free_set_ to *_queue_ since that's what they really are! - -Thu Sep 2 17:42:22 1999 Carlos O'Ryan - - * ace/Malloc_T.cpp: - Eliminated UMR problem with the position independent malloc - support. Thanks to Doug for figuring this stuff out. - -Thu Sep 2 12:21:41 1999 Douglas C. Schmidt - - * tests/Log_Msg_Test.cpp (test_log_msg_features): Changed the - use of %p to prevent an error message from being printed that'll - confuse the run_tests script. - - * Just added the 700th non-DOC group individual who has contributed - to ACE+TAO over the years. In the last year, we've gone from - 400 to 700 contributors, which is great! - - * tests/CDR_File_Test.cpp (main): Fixed a signed/unsigned warning - and removed the unreferenced argc/argv parameters. - - * tests{run_tests.lst,Makefile}: Added the new ACE_Log_Msg.cpp - test. - - * tests: Added a new test called Log_Msg_Test.cpp. This exercises - the many features of the ACE_Log_Msg class. - - * tests/Object_Manager_Test.cpp (main): Just reformatted some - stuff. - -Thu Sep 2 14:42:31 1999 Kirthika Parameswaran - - * tests/Cached_Accept_Conn_Test.cpp: Repositioned - ACE_HAS_BROKEN_EXTENDED_TEMPLATES macro before the inclusion of - the header since thats where the typedefs had been shifted. - Also, to keep both gcc2.7.3 and sunCC5.0 w.o debugging symbols - happy it was necessary to move the definitions of - methods before the instantiations. - -Thu Sep 2 12:21:41 1999 Douglas C. Schmidt - - * ace/OS.h: Added an ACE_static_cast in the ACE_FACTORY_DEFINE macro - to let the compiler catch "bad casts," i.e., when X isn't allow - to be cast from an ACE_Service_Object. Thanks to Jody Hagins - for suggesting this. - - * ace/config-win32-common.h: Deleted - - #define ACE_LACKS_STRPTIME - - and added - - #define ACE_HAS_STRPTIME - #define ACE_LACKS_NATIVE_STRPTIME - - In addition, I removed the wday and yday stuff in - ACE_OS::strptime(). Thanks to Kevin Lyda - for suggesting this. - - * ace/OS.h: Make sure to add a cast to ACE_Service_Object * in the - ACE_FACTORY_DEFINE macro so that the offset will be corrected - automagically. Thanks to Eric C. Newton for - reporting this and suggesting a fix. - - * ace/Log_Msg: Modified the msg_callback(ACE_Log_Msg_Callback *) - method to return the existing ACE_Log_Msg_Callback * so we can - support "chaining". - - * ace/Log_Msg.cpp: Added explicit template instantiations for - ACE_Reverse_Lock. - - * ace/Log_Msg.cpp: Changed the implementation described below to - use an ACE_Reverse_Lock, which is cool ;-). Thanks to Carlos - for explaining how this worked. - - * ace/Log_Msg.cpp: Don't hold the lock during a msg_callback() to - avoid deadlock. Thanks to Matthew Davis - for reporting this. - - * tests/Cached_Accept_Conn_Test.cpp: Removed a "static" from - int debug so that the friggin' SunC++ compiler will link... - -Thu Sep 02 11:04:18 1999 David L. Levine - - * bin/check_build_logs: added /dev/null to egrep invocation - so that it always shows the file name. Thanks to Doug for - reporting this. - -Thu Sep 02 11:02:25 1999 David L. Levine - - * ace/config-qnx-neutrino.h: added ACE_LACKS_SOCKET_BUFSIZ. - -Thu Sep 2 08:56:39 1999 Jeff Parsons - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - Added << and >> operators for ACE_CDR::Char. These are not - to be used by TAO or the IDL compiler, they are solely for - use with the ACE library, so that 1-byte values can be - streamed without using the CORBAisms to_char and from_char. - Otherwise, if a 1-byte value were on the rhs of a CDR operator, - the compiler will probably promote the operator to the one - using ACE_CDR::Short, which is not at all what we want. - -Wed Sep 1 21:37:59 1999 Douglas C. Schmidt - - * tests/Makefile (BIN): Added the new CDR_File_Test.cpp to - the list of files that are automatically built. Also, added - this to run_tests.lst. - - * tests: Added a new test called CDR_File_Test, which - exercises the ACE_CDR_Stream features in conjunction with file - I/O. Thanks to Giga Giguashvili . - - * tests/CDR_Test.cpp: Moved the main() function to the end - of the file. - - * ace/OS.i: Moved the new ACE_OS::filesize() method down in - this file until *after* the ACE_OS::close() method to prevent a - "used before being inlined" error on DU. Thanks to David for - reporting this. - -Wed Sep 1 20:41:03 1999 Carlos O'Ryan - - * tests/run_tests.lst: - Disabled the Time_Service_Test, it was crashing the parent - process. - -Wed Sep 01 19:46:30 1999 David L. Levine - - * bin/check_build_logs: allow log directory (-l option argument) - to start with anything except -. - -Wed Sep 1 17:15:25 1999 Kirthika Parameswaran - - * ace/Arg_Shifter.cpp (get_current_parameter): Removed egcs - warnings by making int and also cleaned up the - code. - -Wed Sep 1 15:51:41 1999 Douglas C. Schmidt - - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: Fixed a typo - where ACE_reinterpret_cast() was misspelled. Thanks to - David for reporting this. - - * examples/QOS/server.cpp: "ACE"-ified this example. - - * ace/OS: Added a new method called ACE_OS::filesize() that - takes a LPCTSTR so that we can pass a file name to this. - - * ace/config-win32-borland.h: Changed ACE_CC_COMPILER to - CPP32.EXE on the recommendation of Christopher Kohlhoff - . - - * ace/Synch.h: Updated the documentation of ACE_Semaphore::remove() - to clarify that it should only be called by one thread to avoid - race conditions. Thanks to Clarence Bishop - for mentioning this. - -1999-09-01 Vishal Kachroo - - * ACE_wrappers/ace/OS.h: - * ACE_wrappers/ace/OS.i: - Added a wrapper ACE_OS::enum_protocols () for WSAEnumProtocols(). - Tested this function with the ACE QOS test. - - * examples/QOS/client.cpp: - * examples/QOS/server.cpp: - Replaced the occurences of WSAEnumProtocols with - ACE_OS::enum_protocols () and successfully ran the QOS test. - -Wed Sep 1 15:51:41 1999 Douglas C. Schmidt - - * ace/OS.i: Ensure that ACE_OS::localtime_r() does the "Right - Thing"[TM], i.e., returns the pointer in the buffer provided by - the user, even if there's no native support for localtime_r() on - the OS platform. In addition, added an ACE_OS_GUARD for this - use-case so that we don't have race conditions in MT programs. - This necessitated moving the localtime_r() wrapper facade into - the OS.cpp file. Thanks to Jody Hagins for - these suggestions. - - * ace/SV_Semaphore_Complex: Improved the documentation a bit - based on comments from Herbert . - -Wed Sep 1 15:15:00 1999 Luther Baker - - * ace/Arg_Shifter.h: Added function (get_current_parameter(offset) - to return parameters that may be mangled with flags. - - * ace/Arg_Shifter.cpp: Implemented function above. - -Wed Sep 1 14:50:48 1999 Nanbor Wang - - * ace/OS.h: Added definitions for _O_BINARY, _O_TEXT, and _O_RAW - if they are not defined. Thanks to Kevin Lyda - for pointing this out. - -Wed Sep 1 14:30:58 1999 Darrell Brunsch - - * ace/Process_Manager.cpp: Typo fixed. - -Wed Sep 1 11:18:26 1999 Douglas C. Schmidt - - * tests/Reactor_Notify_Test.cpp: Fixed an erroneous use of = - rather than != and added another pair of explicit template - instantiations for ACE_Auto_Basic_Ptr<>. Thanks to Carlos for - reporting this. - - * ace/Process_Manager.cpp (handle_close): Removed a warning - about unused parameter. Thanks to David for reporting this. - - * tests/Reactor_Notify_Test.cpp: I needed to add - - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - rather than - - #else - -Wed Sep 01 11:55:31 1999 Steve Huston - - * ace/CORBA_Handler.{h cpp} (ACE_ST_CORBA_Handler): Made the - ACE_ST_CORBA_Handler instance get cleaned up via object manager - at rundown, giving it a chance to clean up it's reactor - registrations and reset its Orbix callbacks. Also added a new - capability of allowing the ACE_ST_CORBA_Handler to daisy-chain - the Orbix callbacks - this is only enabled if - ACE_TAKEOVER_ORBIX_CALLBACKS is set in the config.h file, and - its use is highly discouraged unless you really know what you're - doing and can account for all of the callbacks. - -Wed Sep 1 11:18:26 1999 Douglas C. Schmidt - - Thanks to David for reporting this. - - * tests/run_tests.lst: Disabled the Process_Manager_Test - until it's stable. Thanks to David for reporting this. - -Wed Sep 1 00:05:04 1999 Douglas C. Schmidt - - * ace/config-win32-borland.h: Added a #define for ACE_CC_COMPILER - so that things will work properly on Borland. Thanks to - Goldshtain Dmitry and Adrian - Mercieca for reporting this. - -Wed Sep 01 10:45:15 1999 David L. Levine - - * ace/OS.{h,cpp} (ACE_OS_Object_Manager::init,fini): replaced - use of ACE_ERROR with a new, private method (print_error_message). - If one of the operations in init () fails, then the Log_Msg - instance might not work properly. Thanks to Alain Magloire - for noting this. - - print_error_message also consolidates the common const char - strings into one place. This entire changes reduces the size - of OS.o by about 900 bytes. - -Wed Sep 1 00:05:04 1999 Douglas C. Schmidt - - * tests/Reactor_Notify_Test.cpp: Only run the iterations in - this test for 2000 times, not 10000 times. - -Wed Sep 1 07:41:58 1999 Jeff Parsons - - * ace/Process_Manager.cpp (wait): - An ACE_NEW_RETURN needed ACE_INVALID_PID for the return - value instead of ACE_INVALID_HANDLE. - -Wed Sep 1 00:05:04 1999 Douglas C. Schmidt - - * tests/Process_Manager_Test.cpp: Made some minor changes in - this test so that it'll compile. We still need to update it so - it'll run correctly with the new version of ACE_Process_Manager, - however. - - * ace/Process_Manager: Integrated the latest and greatest - ACE_Process_Manager from Dave Madden . This - should now work relatively transparently on all OS platforms - that support processes. We'll be adding a new - Process_Manager_Test.cpp shortly... - - * tests/Reactor_Notify_Test.cpp: Modified this test to exercise - the new user-level notification queueing in the ACE_Reactor. - -Tue Aug 31 16:05:14 1999 Douglas C. Schmidt - - * ace/Process_Manager.cpp (handle_close): Added an ACE_UNUSED_ARG - to keep the compiler from warning that the "handle" parameter - isn't used. - - * ace/OS.h: Added a new #defined called - ACE_REACTOR_NOTIFICATION_ARRAY_SIZE that designates the size of - the array of ACE_Notification_Buffers used by the new Reactor - user-level notification queue feature. - - * ace/Select_Reactor_Base: Added support for a user-level - notification queue that can buffer very large amounts of pending - notifications, i.e., well beyond the 64 kbyte limit imposed by - the use of a socket. This feature is only enabled if - ACE_HAS_REACTOR_NOTIFICATION_QUEUE is enabled in a config.h - file. Thanks to Detlef Becker - for suggesting this and contributing a prototype implementation. - -Tue Aug 31 20:10:49 1999 Yamuna Krishnamurthy - - * ace/OS.h: Added the ACE_HAS_NO_THROW_SPEC check in order to - suppress the generation of throw specs to placate some compilers - and make it easier for CORBA developers to by lazy wrt C++ - exception throw specs ;-). Thank to Andreas Geisler - for suggesting this addition - -1999-08-31 Vishal Kachroo - - Modified the ACE GQoS test to use a single handler registered - for QOS_MASK|READ_MASK instead of two separate handlers. Had to - remove the following files and add other files. - - * ACE_wrappers/examples/QOS/QOS_Event_Handler.cpp - * ACE_wrappers/examples/QOS/Read_Handler.h - * ACE_wrappers/examples/QOS/QOS_Event_Handler.h - * ACE_wrappers/examples/QOS/Read_Handler.cpp - - Added the following files : - - The Sender event handler is only registered for QOS events. It - uses the ACE_OS::sendto () as soon as it receives a QOS event. - - * ACE_wrappers/examples/QOS/Sender_QOS_Event_Handler.cpp - * ACE_wrappers/examples/QOS/Sender_QOS_Event_Handler.h - - The Receiver event handler is registered for both QOS as well as - READ events since it has to initially wait for a PATH RSVP - message from the sender (QOS event, finally!!) and then read - from the same QOS enabled socket. - - * ACE_wrappers/examples/QOS/Receiver_QOS_Event_Handler.cpp - * ACE_wrappers/examples/QOS/Receiver_QOS_Event_Handler.cpp - - The client and server have been modified to subscribe to the - same multicast session. The RSVP SP on the receiver side sends - RESV messages at the earliest indication of QOS parameters AND - existence of a matching PATH state. This state is found only if - a multicast socket has been created (by the sender) with a - matching "multicast session" address. - - * ACE_wrappers/examples/QOS/server.cpp: - * ACE_wrappers/examples/QOS/client.cpp: - - Modified the following to incorporate the removal and addition - of files listed above. - - * ACE_wrappers/examples/QOS/QOS.dsw - * ACE_wrappers/examples/QOS/client.dsp - * ACE_wrappers/examples/QOS/server.dsp - -Tue Aug 31 16:05:14 1999 Douglas C. Schmidt - - * ace/Malloc_T, - * ace/Malloc: For historical reasons, we'd had a nested class - called ACE_Malloc_Control_Block within ACE_Malloc_Header. This - was redundant and confusing, so I merged the fields of - ACE_Malloc_Control_Block into ACE_Malloc_Header. In addition, I - also added a constructor that initialized the fields to 0 so - that we won't have problems with Purify complaining about - uninitialized memory reads. Thanks to Carlos for reporting - this. - -Tue Aug 31 15:54:56 1999 Douglas C. Schmidt - - * ace/Process_Manager.h: There was a bizarre default value - for the pid parameter, which was helping to cause ambiguity - warnings from the C++ compiler. I've removed this. - -Tue Aug 31 00:16:34 1999 Douglas C. Schmidt - - * build/egcs/tests/Cached_Accept_Conn_Test.h: Moved the template - class into the header file so that IBM C++ will be happy. - - * tests/Cached_*_Test.h: Updated these files to include the proper - descriptive information. - - * tests/Upgradable_RW_Test.h: Cleaned up the formatting for this - test. - - * tests/Cached_Accept_Conn_Test.cpp, - * tests/Cached_Conn_Test.cpp, - * tests/Conn_Test.cpp, - * tests/DLList_Test.cpp, - * tests/Hash_Map_Manager_Test.cpp: - Fixed some "order of definition" problems caused by the - workarounds for SunC++ 5.0 -g bugs. Also replaced the use of - ADDR and STRING with ACE_ADDR and ACE_STRING to avoid potential - clashes with symbols in the global name space. Thanks to David - for reporting this. - -1999-08-31 Vishal Kachroo - - * ACE_wrappers/examples/QOS/server.cpp - * ACE_wrappers/examples/QOS/client.cpp - * ACE_wrappers/examples/QOS/QOS_Event_Handler.cpp - * ACE_wrappers/examples/QOS/QosEvent.h - * ACE_wrappers/examples/QOS/Read_Handler.h - * ACE_wrappers/examples/QOS/QOS_Event_Handler.h - * ACE_wrappers/examples/QOS/Read_Handler.cpp - * ACE_wrappers/examples/QOS/QOS.dsw - * ACE_wrappers/examples/QOS/client.dsp - * ACE_wrappers/examples/QOS/server.dsp: - These files test the new ACE GQoS features, which - implement IntServ features over WinNT 2000. - -Tue Aug 31 14:47:54 1999 Kirthika Parameswaran - - * ACE-INSTALL.html: Added a note on building egcs with the - -fsquangle option contributed by Skye Sweeney - . - -Tue Aug 31 00:16:34 1999 Douglas C. Schmidt - - * bin/clone.cpp: Modified this program so that it'll work more - flexibly with symbolic links. In particular, clone can now - generate symbolic links with relative pathnames to the source. - Thus, you can now call it like this: - - % clone -s ../../foo . - - and all of the cloned links will properly refer to ../../foo - (adding the appropriate number of extra '..'s to handle - directory nesting). Thanks to Jonathan Biggar - for these fixes. - - * ace/Process.cpp: Need to #include "ace/Signal.h". - - * Added a series of fixes that allow ACE to build and - run cleanly with SunC++ 5.0 and Solaris 7 even when debugging is - NOT enabled. These changes require moving the explicit template - instantiations from the BOTTOM of the *.cpp files to near the - top. Thanks to Robert Shewan for reporting - this. - - * ace/Process_Manager.cpp: Fixed some warnings. Thanks to - Carlos for reporting this. - -Mon Aug 30 21:14:46 1999 Douglas C. Schmidt - - * ace/Process_Manager.cpp: Added the destructor for - ACE_Process_Descriptor. Thanks to David for reporting this. - -Mon Aug 30 17:20:56 1999 David L. Levine - - * ace/config-qnx-neutrino.h: added ACE_LACKS_MUTEXATTR_PSHARED. - - * ace/OS.i (mutex_init): enable the ACE_UNUSED_ARG (type) - statement with ACE_LACKS_MUTEXATTR_PSHARED. - -Mon Aug 30 17:10:00 1999 Kirthika Parameswaran - - * ACE-INSTALL.html: Added a note about the "-fsquangle" option - to be used with egcs to shorten long symbol names. - -Mon Aug 30 16:12:36 1999 Douglas C. Schmidt - - * ace/Process.i: Oops, the implementation of gethandle() was - in a Win32-specific part of the code... - - * ace/Msg_WFMO_Reactor.h: Fixed a problem that was causing - ACE_Msg_WFMO_Reactor from being included in the documentation - windex files. Thanks to Jody Hagins for reporting this. - -Mon Aug 30 16:16:46 1999 Ossama Othman - - * PROBLEM-REPORT-FORM: - - Updated to point to refer reports ace-bugs mailing list. - -Mon Aug 30 14:27:26 1999 David L. Levine - - * tests/Cached_Accept_Conn_Test.cpp,Cached_Conn_Test.cpp, - Map_Manager.cpp: - use the explicit template instantiations even with - ACE_HAS_GNU_REPO. g++ 2.91.66 misses some of them with -frepo. - -Mon Aug 30 15:23:12 1999 Douglas C. Schmidt - - * ace/Process_Manager: Integrated the new features that make it - possible to notify a Reactor when a process exits. Thanks to - Dave Madden for contributing this. - - * ace/Process: Added a more portable timed wait() operation for - UNIX platforms. However, this method has the following two - limitations: (1) on UNIX platforms this function uses , - i.e., it overwrites any existing alarm and (2) it steals all - SIGCHLDs during the timeout period, which will break another - ACE_Process_Manager in the same process that's expecting SIGCHLD - to kick off process reaping. If you know a good solution to - this please let us know. Thanks to Dave Madden - for contributing this. - - * ace/Process: Added setgroup() and getgroup() methods to - ACE_Process_Options so that we can manage groups of processes. - Thanks to Dave Madden for contributing this. - - * examples/OS/Process/process.cpp: Added a new version that - tests the various wait() methods on ACE_Process. Thanks to Dave - Madden for contributing this. - - * config-chorus.h, - config-cray.h, - config-cygwin32-common.h, - config-freebsd-pthread.h, - config-freebsd.h, - config-hpux-9.x.h, - config-hpux-9.x.h, - config-lynxos.h, - config-netbsd.h, - config-sunos4-g++.h, - config-sunos4-lucid3.2.h, - config-sunos4-sun3.x.h, - config-sunos4-sun4.1.4.h, - config-sunos4-sun4.x-orbix.h, - config-sunos4-sun4.x.h, - config-win32-common.h: - Added ACE_LACKS_SETPGID on the assumption that platforms lacking - getpgid() won't have setpgid() either. If this turns out to be - incorrect, please let me know. - - * ace/OS: Added a new wrapper facade method for setpgid(). Thanks to - Dave Madden for contributing this. - - * ace/OS.h: Added a new macro called ACE_INVALID_PID. Thanks to - Dave Madden for contributing this. - - * ace/Local_Tokens.h: Added a comment explaining that these locking - classes aren't intended as general-purpose synchronization - mechanisms. Thanks to Brian Wright - - * examples/Misc/test_trace.cpp (main): Added a call to - ACE_OS::atexit() to make sure we test this someplace. - -Mon Aug 30 12:11:06 1999 Carlos O'Ryan - - * ace/Strategies.i: - Once a Recyclable object reaches the ACE_RECYCLABLE_CLOSED state - its state cannot change. This eliminates a nasty race condition - where one thread detects that the connection is closed (and sets - the state accordingly), but another thread changes the state to - IDLE, based on old information. - Thanks to Mark L Boriack for reporting - this problem and helping us debug it. - -Mon Aug 30 10:43:08 1999 Carlos O'Ryan - - * ace/config-irix6.x-common.h: - Added ACE_HAS_SIGSUSPEND and ACE_HAS_TIMEDWAIT - -Mon Aug 30 10:18:52 1999 Ossama Othman - - * PROBLEM-REPORT-FORM: - - Fixed typo. - - * acconfig.h: - * configure.in: - - Removed ACE_LACKS_ATEXIT test since the macro no longer exists. - - Added test for ACE_HAS_SIGSUSPEND. - -Mon Aug 30 07:38:11 1999 David L. Levine - - * tests/Message_Block_Test.cpp, - examples/Reactor/Misc/test_event_handler_t.cpp: - use the explicit template instantiations even with - ACE_HAS_GNU_REPO. g++ 2.91.66 misses some of them with -frepo. - -Sun Aug 29 22:57:26 1999 Douglas C. Schmidt - - * tests/Signal_Test.cpp (worker_parent): Revised the test - so that we transmit the parent process ID in argv so that the - child doesn't have to "guess." This solves the annoying - problems with Linux threads... - -Sun Aug 29 21:35:17 1999 David L. Levine - - * ace/config-g++-common.h: - 1) Don't #define ACE_HAS_EXPLICIT_INSTANTIATION with - ACE_HAS_GNU_REPO, so that -frepo can do its thing. [Bug 248] - 2) #undef ACE_HAS_STRING_CLASS with ACE_HAS_GNU_REPO, because - egcs 2.91.66 can't build IOStream test (due to an unresolved - basic_string method instantiation) otherwise. - - * ace/config-aix-4.x.h,ace/config-cygwin32-common.h, - ace/config-hpux-10.x-g++.h,ace/config-irix5.3-g++.h, - ace/config-irix6.x-g++.h,ace/config-linux-common.h, - ace/config-lynxos.h,ace/config-osf1-4.0.h,ace/config-sunos4-g++.h, - ace/config-sunos5.4-g++.h,ace/config-sunos5.5.h, - ace/config-unixware-2.*-g++.h: - moved ACE_HAS_STRING_CLASS #define before #include of - config-g++common.h, so that config-g++-common.h can #undef - it with ACE_HAS_GNU_REPO. - - * include/makeinclude/rules.lib.GNU: when ace_lib_prelink is - enabled, add a link step before building a library. This is - used, for example, to insert template instantiations into - object files. [Bug 248] - - * include/makeinclude/wrapper_macros.GNU: set ace_lib_prelink - to 1 when repo is enabled. Added ACE_NUL and ACE_NUL_STDERR - macros, for internal use to support the prelink step. [Bug 248] - -Sun Aug 29 07:53:33 1999 Douglas C. Schmidt - - * tests/Signal_Test.cpp: Linux threads are problematic because - getppid() isn't the process id of your parent PROCESS, it's the - "process" id of your parent THREAD. Yikes! Therefore, I had to - rearrange this test so that it'll work on Linux. - - * ace/config-qnx-neutrino.h, - * ace/config-vxworks5.x.h, - * ace/config-osf1-4.0.h, - * ace/config-sunos5.5.h, - * ace/config-linux-common.h: Added support for - the ACE_HAS_SIGTIMEDWAIT and ACE_HAS_SIGSUSPEND macros. - - * ace/OS: Added a new sigsuspend() wrapper to class ACE_OS. This - implementation is "smarter" than the default behavior of - sigsuspend(2) because it'll handle NULL sigset_t *'s gracefully. - - * ace/Signal: Make the use of ACE_Sig_Set & parameters - const-correct. - - * ace/Signal: Added a new method for ACE_Sig_Action that'll register - an ACE_Sig_Set's worth of signals simultaneously. - - * ace/Signal: Updated the documentation to explain what the various - constructors do. - - * ace/Process.h: Updated the documentation for ACE_Process::spawn() - to explain what the return values are. - - * tests/Makefile: Added Signal_Test to the list of tests that are - built automatically. - - * tests: Added a new test, Signal_Test.cpp, that exercises the - various signal handling capabilities supported by ACE on various - OS platforms. - - * ace/OS.h, - * ace/README, - * ace/config-vxworks5.x.h: - Removed all mention of the ACE_LACKS_ATEXIT feature. This is - now the default behavior because we ACE_OS_Object_Manager::at_exit() - to get consistent semantics, as described below. Thanks to David - for pointing this out. - - * ace/OS.i: Changed the implementation of ACE_OS::atexit() to always - use the ACE_OS_Object_Manager::instance ()->at_exit() method so - that we get consistent semantics across platforms. - -Sun Aug 29 18:27:38 1999 Ossama Othman - - * ACE.ifnames: - * ace-diff-config.in: - - Removed ace-diff-config.in and ACE.ifnames from the repository. - They are only used for internal ACE Configuration Project - testing. - - * Makefile.am: - * configure.in: - - Removed references to ace-diff-config.in and ACE.ifnames. - - * acconfig.h: - * configure.in: - - Added entries and tests for the following macros: - - ACE_AUTO_PTR_LACKS_RESET - ACE_HAS_LLSEEK - ACE_HAS_EXPLICIT_KEYWORD - ACE_HAS_MUTABLE_KEYWORD - ACE_HAS_STD_TEMPLATE_SPECIALIZATION - ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION - ACE_HAS_SIGTIMEDWAIT - ACE_LACKS_ATEXIT - ACE_LACKS_GETPPID - - * configure.in: - - Fixed auto_ptr test. auto_ptr was being used incorrectly. - -Sun Aug 29 07:53:33 1999 Douglas C. Schmidt - - * tests/Process_Manager_Test.cpp: Changed the names of the signal - handlers to one_child_synchronous_signal_handler() and - multiple_children_synchronous_signal_handler() to reflect how - they are used. - - * ace/OS.[hi]: Added a new wrapper for sigtimedwait() so that - we can encapsulate this. To make programming more consistent, - the encapsulation uses an ACE_Time_Value, rather than a struct - timespec. - - * ace/config-linux-pthread.h, - * ace/config-linux-lxpthreads.h: Removed the - - #define ACE_HAS_SIGWAIT - - macro since this was already defined in config-linux-common.h. - - * tests/Malloc_Test.cpp: Improved the test by printing out - additional diagnostic information. Also validated that it works - when ACE_DEFAULT_BASE_ADDR == 0 on Solaris using SunCC (with - purify) and EGCS. - - * ace/Malloc: Added a dump() method to ACE_Malloc_Header. - - * ace/Process_Manager.cpp (ACE_Process_Descriptor): Changed - a -1 to a 0 to prevent a compiler warning. Thanks to - David Levine and DEC UNIX for reporting this. - -Sun Aug 29 00:14:09 1999 Luther Baker - - * ace/Arg_Shifter.h (cur_arg_strncasecmp): Removed and replaced earlier - method 'is_or_contains_ignore_case' with 'cur_arg_strncasecmp.' - This method does less and it is more self-contained, adding protection - and greater flexibility for the program program using it. - - * ace/Arg_Shifter.cpp (cur_arg_strncasecmp): Implementation - corresponding with changes in ACE_Arg_Shifter class. - -Sun Aug 29 00:13:35 1999 Douglas C. Schmidt - - * ace/Process_Manager.i: Moved the destructor for - ACE_Process_Descriptor out of the *.i file since it's always - called by vector delete and therefore inlining it is pointless. - -Sat Aug 28 23:46:55 1999 Douglas C. Schmidt - - * ace/Process_Manager.cpp (resize): The loop should run - from 0 < this->current_count_ rather than 0 < - this->max_process_table_size_. - -Sat Aug 28 16:28:33 1999 David L. Levine - - * ace/Synch_T.i: reordered some methods to avoid - use before definition. - -Fri Aug 27 18:52:00 1999 Luther Baker - - * ace/Arg_Shifter.h (is_or_contains_ignore_case): added method - to facilitate CORBA spec in ORB_init. - - * ace/Arg_Shifter.cpp (is_or_contains_ignore_case): implemented - the method added. Part of a larger project to implement CORBA - spec regarding -ORB parsing in ORB_init. - -Fri Aug 27 18:58:50 1999 Douglas C. Schmidt - - * tests/run_tests.lst: Reenabled the Process_Manager_Test since - it now seems to work fine with EGCS after the fix noted below. - -Fri Aug 27 18:39:14 1999 Douglas C. Schmidt - - * ace/Process_Manager.cpp (wait): Fixed a mistake in the coding - logic whereby we were returning from the function in a loop even - when there was no error. Thanks to David Levine and DEC UNIX - for pointing this out. - -Fri Aug 27 16:05:49 1999 David L. Levine - - * ace/OS.*,Log_Msg.cpp,Synch_T.i: reverted changes of - Fri Aug 27 11:29:21 1999 David L. Levine - to see if they caused problems on NT. Thanks to Michael - and Jeff for reporting this. - -Fri Aug 27 12:01:37 1999 David L. Levine - - * ace/OS.cpp (mktime): added static cast of -1 return value - to time_t to avoid warnings on VxWorks. - -Fri Aug 27 11:38:36 1999 Nanbor Wang - - * ace/Service_Config.cpp (process_directives): Remember to close - down the svc.conf file pointers once they are processed. Thanks - to Lothar Werzinger for pointing - this out. - -Fri Aug 27 11:29:21 1999 David L. Levine - - * ace/OS.*: moved ACE_OS_Recursive_Thread_Mutex_Guard from - OS.cpp to OS.h so that Log_Msg.cpp can use it. - - * ace/Log_Msg.cpp: replaced use of ACE_Guards with - ACE_OS_Thread_Recursive_Mutex. [Bug 262] - - * ace/OS.h (ACE_OS_Recursive_Thread_Mutex_Guard::lock): - added this method. - - * ace/OS.cpp (ACE_OS_GUARD,ACE_TSS_CLEANUP_GUARD, - ACE_TSS_BASE_GUARD): fixed to use - ACE_OS_Recursive_Thread_Mutex_Guard::lock. Added - _RETURN versions. - - * ace/Synch_T.i: reordered some methods to avoid - use before definition. - -Fri Aug 27 09:53:09 1999 Joe Hoffert - - * ace/ATM_Stream.{h,cpp}: added get_vpi_vci method. - * examples/IPC_SAP/ATM_SAP/CPP-{client,server}.cpp: Changed tests to - print out VPI and VCI after connected. - -Fri Aug 27 10:50:10 1999 David L. Levine - - * ACE version 5.0.3 released. - -Fri Aug 27 09:32:26 1999 David L. Levine - - * bin/make_release: added some diagnostics to see why - diffs aren't being created. - -Fri Aug 27 07:17:58 1999 Toshio Hori - - * ACE-INSTALL.html: fixed a typo, missing ; after - < and >. - -Thu Aug 26 21:01:02 1999 Jim Rucker - - * ace/Thread_Manager.cpp (spawn_i): on VxWorks, if t_handle - is non-0, set it with thr_handle. - -Thu Aug 26 16:33:42 1999 David L. Levine - - * ace/Log_Msg.cpp: removed unnecessary #include "ace/Synch_T.h". - [Bug 262] - -Thu Aug 26 13:49:00 1999 David L. Levine - - * examples/Threads/Makefile: removed process_manager from BIN. - See Sat Aug 21 12:36:40 1999 Douglas C. Schmidt. - -Thu Aug 26 12:22:55 1999 David L. Levine - - * ace/config-ghs-common.h: on Sun, added - ACE_HAS_NONSTATIC_OBJECT_MANAGER. It's necessary - to prevent seg fault on startup. Thanks to - David Sunwall for - reporting this problem. - -Thu Aug 26 12:11:09 1999 David L. Levine - - * docs/ACE-guidelines.html: added guidelines to avoid - default arguments, and favor narrow interfaces. - -Thu Aug 26 11:44:26 1999 David L. Levine - - * tests/Time_Value_Test.cpp (main): added static casts - of the doubles to longs. g++ 2.7.2.3 warned about - passing a double to a long :-) - -Thu Aug 26 11:20:55 1999 David L. Levine - - * tests/Time_Value_Test.cpp (main): added a test showing - that ACE_Time_Value (2.5) == ACE_Time_Value (2). - The 2.5 gets coerced to a long with value 2. Beware . . . - -Thu Aug 26 10:43:04 1999 Carlos O'Ryan - - * ace/config-sunos5.6.h: - egcs-2.95 under Solaris 5.6 does not need - ACE_HAS_STL_QUEUE_CONFLICT, thanks to Krishnakumar - B. for reporting this problem. - This fixes [BUGID:264] - -Thu Aug 26 07:29:42 1999 David L. Levine - - * ace/OS.{h,i} (ACE_Time_Value): reverted - Wed Aug 25 22:05:54 1999 David L. Levine - change. It caused overload ambiguity when the types of - sec and usec didn't match, and on Sun CC 4.2/SunOS 5.6. - Thanks to Andy for reporting that. - -Wed Aug 25 22:05:54 1999 David L. Levine - - * ace/OS.{h,i} (ACE_Time_Value): added four new - constructors. One takes a double, to avoid surprises - (truncation) when constructing an ACE_Time_Value from - a double. The other three constructors take two - unsigned longs, ints, and unsigned ints. They avoid - the ambiguity introduced by the new double constructor. - Thanks to Dave Meyer for starting this :-) - - The double constructor is wrapped with - #ifndef ACE_LACKS_FLOATING_POINT. - - * tests/Time_Value_Test.cpp (main): removed cast of - 2.0 to long. - -Wed Aug 25 16:15:07 1999 David L. Levine - - * docs/ACE-subsets.html: removed spurious LOGGING_FILES - text. - -Wed Aug 25 15:55:05 1999 David L. Levine - - * ace/OS.{h,cpp},Object_Manager.*,Signal.i (default_mask): moved - the default_mask () static method from ACE_Object_Manager - to ACE_OS_Object_Manager, so that it can be used by - Log_Msg.cpp without layer inversion. (Left a deprecated, - inline ACE_Object_Manager::default_mask (), for backward - compatibility.) default_mask () now returns a sigset_t * - instead of an ACE_Sig_Set *, again to avoid layer inversion. - - * ace/Log_Msg.cpp (log): replaced use of ACE_Sig_Guard - with a bare-bones ACE_Log_Msg_Sig_Guard. [Bug 262] - -Wed Aug 25 14:53:58 1999 Carlos O'Ryan - - * bin/run_all.pl: - * bin/auto_compile: - The script did not start with the canonical trick to run perl - from [t]csh, [ba]sh or perl itself. - -Wed Aug 25 14:45:06 1999 Ossama Othman - - * tests/Process_Manager_Test.cpp: - - Explicitly include "ace/Signal.h" to make declaration of - ACE_Sig_Set class visible. - - return statement at end of multiple_children_sig_handler() - function is never reached. It was commented out to prevent - compiler warnings. - -Wed Aug 25 13:34:07 1999 Narendra Ravi - - * ACE-INSTALL.html: added information about -j GNU make option. - -Wed Aug 25 12:26:49 1999 Carlos O'Ryan - - * ace/OS.h: - On Borland C++ (and other platforms) we should use - std::bad_alloc instead of bad_alloc for the ACE_bad_alloc - exception. We use the ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB - macro to detect this. Thanks to Jody Hagins - for this fix. - - * tests/run_tests.lst: - Disabled the Token test, it is more trouble that it is worth. It - hangs and tends to freeze the complete testsuite. - -Wed Aug 25 12:09:32 1999 Carlos O'Ryan - - * Makefile: - Include (conditionally) the $TAO_ROOT/tao/tao_targets.GNU file, - that defines the targets required to compile just TAO. - -Tue Aug 24 21:47:44 1999 David L. Levine - - * ace/Synch_Options.{h,cpp} (timeout): added const to - ACE_Time_Value & argument, because it's not modified. - Thanks to John Lindal for suggesting this. - -Tue Aug 24 10:02:51 1999 Douglas C. Schmidt - - * tests/Process_Manager_Test.cpp: Fixed a number of warnings - caused by unused args and signed/unsigned mismatches. Thanks to - David Levine for reporting this. - - * ace/Service_Repository.h, - ace/Service_Config.h, - ace/OS.h: - Changed the default number of entries in the - ACE_Service_Repository from ACE_DEFAULT_SELECT_REACTOR_SIZE - to ACE_DEFAULT_SERVICE_REPOSITORY_SIZE, which defaults to - 1024. Thanks to Ivan Murthy for - suggesting this. - - -Tue Aug 24 16:23:07 1999 Carlos O'Ryan - - * bin/make_release: - Use an explicit temporary file to create the ChangeLog, i had - some problems with the previous scheme, but it could be my - shell. - When tagging TAO we have to change directories. - -Tue Aug 24 12:19:29 1999 Carlos O'Ryan - - * tests/Makefile: - Updated dependencies - - * performance-tests/TCP/tcp_test.cpp: - Fixed argument parsing. - -Tue Aug 24 10:37:02 1999 David L. Levine - - * bin/cvslog (find_changelogs): one more time: append /$file - to `pwd`, so that we can find ChangeLogs in child directories. - Always call basename (), again. - -Tue Aug 24 09:10:58 1999 David L. Levine - - * bin/cvslog (find_changelogs): don't call basename () immediately - after calling `pwd`, so that ChangeLogs in current directory - will be found. - -Tue Aug 24 07:11:52 1999 David L. Levine - - * ace/OS.*,Object_Manager.{h,cpp},README: with ACE_LACKS_ATEXIT, - use ACE_OS_Object_Manager::at_exit () to emulate atexit (). - [Bug 246] - - * tests/Object_Manager_Test.cpp,tests/Makefile, - tests/run_pharlap_tests.bat,tests/run_tests.bat, - tests/run_tests.lst,tests/run_tests.psosim, - tests/run_tests.vxworks,tests/t.icc,tests/icc.bat: - added Object_Manager_Test. - -Mon Aug 23 22:03:24 1999 Carlos O'Ryan - - * include/makeinclude/rules.lib.GNU: - * include/makeinclude/rules.local.GNU: - When compiling both shared and static libraries only one of them - was installed. Thanks to Paul Calabrese - for providing this fix. - -Mon Aug 23 21:41:43 1999 Carlos O'Ryan - - * tests/run_tests.pl: - We search for "Starting" instead of "starting" because that's - what the tests print out now. - -Mon Aug 23 21:20:28 1999 Carlos O'Ryan - - * docs/ACE-guidelines.html: - Added new guidelines relevant to ACE+TAO. - -Mon Aug 23 16:57:13 1999 Carlos O'Ryan - - * performance-tests/RPC/README: - * performance-tests/RPC/client.cpp: - Changed the options to make it more consistent with other tests - like this one. - Added a README file - -Mon Aug 23 16:53:00 1999 Carlos O'Ryan - - * performance-tests/Makefile: - * performance-tests/TCP/README: - Added a README file for the test - - * performance-tests/TCP/tcp_test.cpp: - Added options to pace the events and to control the message size - on the server side. - - * performance-tests/RPC/Makefile: - * performance-tests/RPC/client.cpp: - * performance-tests/RPC/ping.x: - * performance-tests/RPC/server.c: - Added a simple RPC test to compare sockets (ACE), RPC and TAO. - -Mon Aug 23 13:30:32 1999 Nanbor Wang - - * include/makeinclude/platform_sunos5_kcc.GNU: The optimization - flag for KCC should be +K3, not -K2. - -Mon Aug 23 10:56:40 1999 David L. Levine - - * bin/cvslog: added this wrapper around cvs log. It - expands ChangeLogTags to their ChangeLog entries. - Thanks to Luther for helping greatly with it. - -Mon Aug 23 08:46:37 1999 David L. Levine - - * ace/Object_Manager.{h,cpp}: replaced the use of - ACE_Unbounded_Queue with a new - ACE_Cleanup_Info_Node private helper class. The reduces - the size of libACE by over 4 Kb, and is the first step - towards moving the Object_Manager's atexit () support to - OS. [Bug 246] - -Mon Aug 23 07:28:02 1999 David L. Levine - - * tests/run_tests.check: changed "starting" to "Starting", - to match a recent change to test_config.h. - - * tests/test_config.h: changed one remaining "starting" to - "Starting", to be consistent. - -Mon Aug 23 07:08:17 1999 David L. Levine - - * tests/run_tests.lst: disabled Process_Manager_Test, - because it never terminates when built with egcs - on both Solaris 7 and Linux. - -Sun Aug 22 21:15:13 1999 David L. Levine - - * ace/Makefile: with Green Hills for x86 target, use - $(MAKE) instead of make to build .obj/gethrtime.o. - Thanks to Cliff_H_Campbell - for reporting this. - -Sun Aug 22 21:02:26 1999 David L. Levine - - * ace/config-vxworks5.x.h: added ACE_LACKS_ATEXIT. - -Sun Aug 22 21:01:18 1999 David L. Levine - - * ace/README: added ACE_LACKS_ATEXIT. - -Sun Aug 22 14:51:56 1999 Vishal Kachroo - - * ace/OS.i (join_leaf): Constructed a winsock2 QOS structure - within ACE_OS::join_leaf () from the corresponding ACE QOS - classes. Passed this QOS structure to WSAJoinLeaf (). - -Sun Aug 22 12:18:42 1999 Nanbor Wang - - * ace/Process.i (wait): Fixed a typo. - - * ace/Process.cpp (ACE_Process): Removed an extra underscore. - - * ace/OS.i (getppid): Removed undefined variable . - -Sat Aug 21 12:36:40 1999 Douglas C. Schmidt - - * ace/OS.h: Moved the ACE_OS::set_exit_hook() static method - into the OS.i file so be more consistent with the other ACE_OS - methods. Also, changed the signature of extern "C" void - ACE_OS_Object_Manager_Internal_Exit_Hook () to void - ACE_OS_Object_Manager_Internal_Exit_Hook (void) so that this - will match the type declaration for ACE_EXIT_HOOK. - [NOTE: that's not really a signature change. g++ needs the - "void", however, to avoid a bug without -pedantic.] - - * ace/Process_Manager.cpp: Use the new ACE_OS::wait() method, - which is portable to Win32, rather than ACE_OS::waitpid(). - - * tests/Process_Manager_Test.cpp: Completed the first major - enhancement to the test that exercises the new - ACE_Process_Manager features. This test builds and runs cleanly - on Solaris using CC and should run on other versions of UNIX - that support threads and processes. It would be great if - someone could improve it to run on Win32, as well. - - * ace/Process_Manager: Added support for the spawn_n() method, - which creates N new processes. - - * tests: Cleaned up the use of ACE_INIT_LOG/ACE_APPEND_LOG in - Process_Manager_Test.cpp and Malloc_Test.cpp so we don't lose - information. Both these tests now write their child processes' - output to "-child.log". - - * ace/Thread_Manager.h: Added a default value of 0 to the - exit() method since this is a common return status. - - * ace/config-win32-common.h: Added ACE_LACKS_GETPPID. - - * ace: Added a new wrapper for getppid(). For platforms that - don't support this system call, please add ACE_LACKS_GETPPID. - - * tests: Moved the $ACE_ROOT/examples/Threads/process_manager.cpp - example into the $ACE_ROOT/tests directory, renamed it to - Process_Manager_Test.cpp, and revised the test to illustrate the - new ACE_Process_Manager features. - - * tests/run_tests.lst: Added the Process_Manager_Test to the - list of tests to run. - - * tests/Malloc_Test.cpp (main): Added some necessary ASYS_TEXT - macros. - - * ace/Process.i: Rather than replicate the #ifdef logic in - ACE_OS::kill() within ACE_Process:kill(), we just forward to - ACE_OS::kill() and let it sort this out! - - * ace/Process: Moved several of the short wait() methods from the - *.cpp file to the *.i file and inlined them. - - * ace/Process_Manager.cpp: The logic for the implementation of - terminate() was incorrect, i.e., the process table entry should - be removed *if* ACE::terminate_process() succeeds but *not* if - it fails! - - * ace/OS.h: Added a new method called wait() that works portably - on Win32 and UNIX/POSIX platforms. - - * ace/Process: Added an optional "options" parameter to the former - "blocking" wait() method on ACE_Process. This allows clients to - use the WNOHANG option to avoid blocking if the child process - hasn't exited yet. Also changed the type of the return value to - pid_t rather than int. Finally, added an optional status - pointer to the "timed" wait() method (which only works on - Win32). - - * ace/OS.h: On platforms that do not define WNOHANG natively, - changed #ifdef of WNOHANG to 0100 (which can be used in bitmask - comparisons) rather than Douglas Adams favorite constant: 42. - -Sat Aug 21 14:13:46 1999 Carlos O'Ryan - - * ACE version 5.0.2 released. - -Sat Aug 21 11:52:51 1999 Carlos O'Ryan - - * Makefile: - Fixed small problem in the releaseall target. - - * bin/make_release: - The shell did not like the embedded script to print the - ChangeLog entry. - -Fri Aug 20 15:40:58 1999 Douglas C. Schmidt - - * ace/Process_Manager: Added a new method called wait() that's - just syntactic sugar for ACE_Process_Manager::reap(). Thanks to - Dave Madden for suggesting this. - - * ace/OS: Added support for ACE_OS::atexit(), which necessitated - changing the extern "C" signature for ACE_EXIT_HOOK to typedef - void (*ACE_EXIT_HOOK) (void) so that this will be consistent - with the signature expected by the ISO/ANSI C atexit() call. At - the moment, ACE_OS::atexit just calls ::atexit() (unless a - platform's config.h file #defines ACE_LACKS_ATEXIT). - Ultimately, we might want to have this hook into the - ACE_OS_Object_Manager's at_exit() support, which may be more - portable and reliable. - - * ace/ACE_Process_Manager.h: Made the destructor virtual so it's - possible to subclass from this class. - - * ace/Process_Manager.h: Updated the comments on the wait() - method to indicate that a signal handler must be used to keep - track of the number of remaining child processes. Thanks to - Dave Binder for motivating this. - -Thu Aug 19 18:45:00 1999 Chris Gill - - * ace/Auto_Ptr.h: modified ACE_AUTO_PTR_RESET macro, to pass the - type of the pointer. This is needed for the case where - ACE_AUTO_PTR_LACKS_RESET is defined, in order to explicitly - convert the pointer into an auto_ptr for assignment. - -Thu Aug 19 17:26:50 1999 John Heitmann - - * docs/ACE-SSL.html: Cleaned up the auto generated errors. - -Thu Aug 19 16:47:21 1999 Douglas C. Schmidt - - * ACE-INSTALL.html: Added a reference to $ACE_ROOT/docs/ACE-SLL.html. - - * docs: Added a new ACE-SSL.html file that explains how to participate in the - ACE SSL project. Thanks to John Heitmann - for adding this. - -Thu Aug 19 15:31:58 1999 Nanbor Wang - - * ace/OS.h (ACE_OSTREAM_TYPE): Removed the redundant trailing * - for the defintion when ACE_LACKS_IOSTREAM_TOTALLY is defined. - -Thu Aug 19 14:16:37 1999 David L. Levine - - * include/makeinclude/rules.nested.GNU: added ACE_NESTED_COMMAND - hook. Users can set it to whatever they like (preferably in - include/makeinclude/platform_macros.GNU). One example is - to set it to: - - ACE_NESTED_COMMAND := || break $? - - to terminate building if a build in one subdirectory fails. - Thanks to Lothar Werzinger for - suggesting this addition. - -Thu Aug 19 13:06:00 1999 Michael Kircher - - * ace/Read_Buffer.cpp: Fixed a bug in rec_read () method - which prohibited reading more than 1024 bytes at once. - -Thu Aug 19 13:03:07 1999 Douglas C. Schmidt - - * ace/ACE.h (ACE): Fixed a "cut & paste" error in the comment -- - basename should have been dirname. Thanks to Mark Hyett - for reporting this. - - * ace/ACE.cpp: Fixed a bug in ACE::dirname() that was causing problems - if the pathname didn't have a delim character. Thanks to Russ - Noseworthy for reporting this and providing a fix. - -Thu Aug 19 12:59:56 1999 Carlos O'Ryan - - * ace/Message_Block.i: - Moved ACE_Message_Block::replace_data_block() down in the file - because it was using inline functions that were defined after it - was. Thanks to David for pointing this out. - -Thu Aug 19 10:53:50 1999 David L. Levine - - * ace/OS.i (setuid): added ACE_UNUSED_ARG (uid) for VxWorks, - pSOS, WIN32, and Chorus. Thanks to Garry Brother - for reporting this. - -Thu Aug 19 10:04:12 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: added - trap to cause builds to fail if the exceptions flag is - enabled. The VxWorks libraries don't support exceptions. - And, exceptions give the (Tornado II) compiler fits, e.g., - with ACE_wrappers/TAO/tao/IORManipulation.cpp. Thanks to - Erik Johannes for this nifty preemptive - solution, and to Nick Sawadsky - for motivating its implementation. - -Thu Aug 19 09:34:41 1999 Douglas C. Schmidt - - * ace/WFMO_Reactor.h, - * ace/WFMO_Reactor.cpp, - * ace/Select_Reactor_T.h, - * ace/Select_Reactor_T.cpp, - * ace/Reactor_Impl.h, - * ace/Reactor.h, - * ace/Reactor.cpp: - Added a pair of restart() methods that can be used to set/get - the restart_ flag, which controls whether the handle_events() - event loop is restarted automatically when select() is - interrpted. Thanks to Erik Koerber - for suggesting this. - - * ace/Service_Config: Updated the failure result comment for - open() and cleaned up the return value and errno propagation for - open_i() when process_commandline_directives() fails. Thanks to - Jerry D. De Master for reporting the bug - and suggesting a fix. - - * ace/Service_Config.h: Moved the process_directives() method - used to parse the svc.conf files out of the protected part of - the class to the public part so that application programmers can - call this directly to reconfigure services from the svc.conf - files. Thanks to John Mink for - suggesting this. - -Wed Aug 18 22:45:24 1999 Douglas C. Schmidt - - * ace/WFMO_Reactor.h, - * ace/WFMO_Reactor.cpp, - * ace/XtReactor.h, - * ace/XtReactor.cpp, - * ace/TkReactor.h, - * ace/TkReactor.cpp, - * ace/FlReactor.h, - * ace/FlReactor.cpp, - * ace/Select_Reactor_T.h, - * ace/Select_Reactor_T.cpp, - * ace/Reactor_Impl.h, - * ace/Reactor.h, - * ace/Reactor.cpp: - * ace/Timer_Hash_T.h: - * ace/Timer_Heap_T.h: - * ace/Timer_List_T.h: - * ace/Timer_Queue_T.h: - * ace/Timer_Wheel_T.h: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Heap_T.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_Wheel_T.cpp: - Changed all uses of const long to long... - -Wed Aug 18 22:15:58 1999 Carlos O'Ryan - - * tests/run_tests.sh: - It was running the DISABLED tests, thanks to David for pointing - this out. - -Wed Aug 18 21:48:52 1999 David L. Levine - - * ACE-INSTALL.html: added Toshio Hori - suggestions (in a new section) on building just what's - needed for TAO, and his tips for reducing disk space - usage on Unix platforms. - -Wed Aug 18 21:32:56 1999 Ossama Othman - - * docs/usage-bugzilla.html: - - Added a simple document explaining basic usage of our - installation of bugzilla. - - * ACE-INSTALL.html: - * PROBLEM-REPORT-FORM: - - Updated with information about the bugzilla usage - documentation. - -Wed Aug 18 20:28:23 1999 David L. Levine - - * bin/check_build_logs: check for just Stop, not [Ss]top, - to avoid snagging top output. Gnu make says "Stop" when - it can't find a dependency. - -Wed Aug 18 19:08:08 1999 David L. Levine - - * ace/OS.{h,cpp},Object_Manager.{h,cpp},Log_Msg.cpp: - moved ACE_LOG_MSG_INSTANCE_LOCK from ACE_Object_Manager - to ACE_OS_Object_Manager, so that Log_Msg.cpp needn't - to depend on Object_Manager for it. - -Wed Aug 18 18:20:11 1999 Carlos O'Ryan - - * tests/SOCK_Send_Recv_Test.cpp: - Fixed typo. - -Wed Aug 18 17:58:06 1999 Carlos O'Ryan - - * THANKS: - * ace/README: - * ace/config-irix6.x-common.h: - Added new macro (ACE_HAS_BROKEN_DGRAM_SENDV) to handle platforms - where using sendmsg with exactly IOV_MAX elements in the iovec - fails (normally the number of elements can be up to and - including IOV_MAX). Thanks to Tobin Bergen-Hill - for tracking this down. - -Wed Aug 18 16:08:46 1999 Douglas C. Schmidt - - * tests/SOCK_Send_Recv_Test.cpp: Reformatted this test so - that it conforms to ACE programming guidelines. - -Wed Aug 18 13:49:30 1999 David L. Levine - - * ace/Makefile: if ACE_COMPONENTS = FOR_TAO, don't include - Filecache in UTILS_FILES. TAO doesn't need Filecache. - And, its ACE_Hash and ACE_Equal_To - explicit template instantiations collide with those in - ACE_wrappers/TAO/tao/POA.cpp. That precludes building - a shared libTAO for VxWorks, for example. And, it costs 14 Kb. - Thanks to Erik Johannes for helping - to find this solution. And reminding me to implement it :-) - -Wed Aug 18 13:16:09 1999 David L. Levine - - * ACE-INSTALL.html: clarify that PERL_PATH must include - the full path, including the perl.exe filename. Thanks - to Walter Welzel for - reporting this. - -Wed Aug 18 13:11:30 1999 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - The new methods to manipulate condition variable attributes - were not compiling on single threaded platforms. - -Wed Aug 18 13:09:36 1999 David L. Levine - - * tests/Makefile: don't add libDLL_Test.$(SOEXT) to BUILD - on VxWorks. Thanks to Walter Welzel - for reporting that it did get build for VxWorks with - shared libs enabled, but not successfully (or usefully). - -Wed Aug 18 10:36:16 1999 Nanbor Wang - - * ACE-INSTALL.html: Updated all references to MSVC 4.x. We no - longer support the compiler. Thanks to Welzel Walter - for pointing this out. - -Wed Aug 18 10:42:13 1999 Douglas C. Schmidt - - * ace/Timer_List_T.cpp (reset_interval): Added a constcast to - make SunC++ 4.2 happy. Thanks to Andy for reporting this. - - * ace/WFMO_Reactor.i (reset_timer_interval): The return type - was incorrect... Thanks to Andy and Jeff for reporting this. - -Wed Aug 18 09:47:51 1999 Carlos O'Ryan - - * tests/run_tests.pl: - The disabled tests were executed anyway, thanks to David for - pointing this out. - -Wed Aug 18 09:34:46 1999 Carlos O'Ryan - - * ace/FlReactor.cpp: - * ace/XtReactor.cpp: - Fixed typos in the code, this is only used in a few platforms, - that's why it didn't show up before. - -Tue Aug 17 20:02:55 1999 Douglas C. Schmidt - - * tests/Reactor_Timer_Test.cpp: Enhanced this test to exercise - the new reset_timer_interval() feature that Darrell added. It - appears to work quite well. Also, make the test easier to - understand by adding more structure. - - * ace/WFMO_Reactor.h, - * ace/WFMO_Reactor.cpp, - * ace/XtReactor.h, - * ace/XtReactor.cpp, - * ace/TkReactor.h, - * ace/TkReactor.cpp, - * ace/FlReactor.h, - * ace/FlReactor.cpp, - * ace/Select_Reactor_T.h, - * ace/Select_Reactor_T.cpp, - * ace/Reactor_Impl.h, - * ace/Reactor.h, - * ace/Reactor.cpp: - Exposed the new reset_interval() method Darrell added to all the - Timer mechanisms via a method in each of these Reactor's called - reset_timer_interval(). - - * ace/Timer_Hash_T.h: - * ace/Timer_Heap_T.h: - * ace/Timer_List_T.h: - * ace/Timer_Queue_T.h: - * ace/Timer_Wheel_T.h: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Heap_T.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_Wheel_T.cpp: - Changed the return values of to be (1) - consistent (i.e., to return a value through all paths in the - method) and (2) to return -1 on failure and 0 on success. - Also replaced a number of C-style casts with - ACE_reinterpret_casts. - -Tue Aug 17 20:51:35 1999 Carlos O'Ryan - - * ace/TP_Reactor.h: - * ace/TP_Reactor.cpp: - The TP Reactor also experiences a performance hit if signal - masking is enabled. Therefore, we can now make this optional. - -Tue Aug 17 19:10:00 1999 Darrell Brunsch - - * ace/OS.cpp: Fixed typo. - - * ace/Stats.cpp: Removed some warnings showing up in MSVC when - assigning ACE_UINT64 values to ACE_UINT32 variables. Used - ACE_U64_TO_U32 to remove these warnings. - - * ace/Timer_Hash_T.h: - * ace/Timer_Heap_T.h: - * ace/Timer_List_T.h: - * ace/Timer_Queue_T.h: - * ace/Timer_Wheel_T.h: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Heap_T.cpp: - * ace/Timer_List_T.cpp: - * ace/Timer_Wheel_T.cpp: - Added a new method, which can be used to - change the interval of a timer represented by a timer_id. - -Tue Aug 17 18:43:53 1999 Jeff Parsons - - * ace/OS.h: - * ace/OS.i: - Added wscmp and wsncmp functions to go with the existing - wslen and wscpy functions. These all use WChar*, so arg - size is independent of platform. These are to be used for - all manipulations of CORBA::WString. The two that were - added were needed for wstring tests in Param_Test. WChar* - versions of the other string manipulation functions will - be added as needed. - -Tue Aug 17 17:49:33 1999 Douglas C. Schmidt - - * ace/config-sunos5.5.h: If (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) - are enabled then #undef ACE_HAS_PROC_FS and ACE_HAS_PRUSAGE_T to - work around problems with Solaris 7. Thanks to Sridhara Rao - Dasu for reporting this. - - * ace/OS.i: Updated the readdir_r() conditional compilation so that - it'll work when _FILE_OFFSET_BITS == 64. Thanks to Sridhara Rao - Dasu for reporting this. - -Tue Aug 17 17:17:13 1999 Carlos O'Ryan - - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: - Added new data type to handle condition variable attributes - (ACE_condattr_t). New methods to manipulate that data type - (ACE_OS::cond_attr_init and destroy) Add new method to create a - condition variable from a pre-initialized attribute. - - * ace/Synch.h: - * ace/Synch.i: - * ace/Synch.cpp: - Added new wrapper for the ACE_condattr_t structure. - - * ace/Token.h: - * ace/Token.cpp: - Use ACE_Condition_Attributes to minimize the number of memory - allocations and locks in the critical path of the TP_Reactor. - -Tue Aug 17 15:55:17 1999 Nanbor Wang - - * performance-tests/TCP/TCP.{dsw,dsp}: - * performance-tests/TCP/Makefile: - * performance-tests/TCP/tcp_test.cpp: Added the new test modified - by Carlos and a bit further by me. The test measures TCP - performance of a platform. We can also use it to test the - performance of various reactors. - -Tue Aug 17 14:52:40 1999 Darrell Brunsch - - * ace/config-win32.h: Added ACE_CC_COMPILER definition for MSVC. - ACE_CC_COMPILER is a string containing the compiler program. - -Tue Aug 17 13:48:27 CDT 1999 Loren Rittle - - * bin/update-ace+tao.sh: Use authoritative name list instead of - ad hoc list to update file. - -Tue Aug 17 06:33:05 1999 Douglas C. Schmidt - - * ace/Task.h: Clarified the comment regarding - open() and close() on ACE_Task_Base. Thanks to Jeff Franks - for suggesting this. - -Tue Aug 17 11:56:33 1999 Carlos O'Ryan - - * ace/Select_Reactor_T.h: - * ace/Select_Reactor_T.cpp: - Added option in the constructor to disable the signal handling - features in the select reactor. This eliminates a couple of - kernel level locks that are not needed in all applications. - - * ace/Stats.h: - * ace/Stats.cpp: - Now we keep track of the iteration where the minimum and maximum - latencies were achieved. - -Tue Aug 17 06:33:05 1999 Douglas C. Schmidt - - * bin: Added a new shell script called update-ace+tao.sh - that updates the ACE/TAO source tree to the latest - numeric-assigned version. Thanks to Loren Rittle - for contributing this. - -Mon Aug 16 20:09:12 1999 Carlos O'Ryan - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - Added new method to transfer the contents of one CDR stream into - another. This is used in the implementation of the ORB to - minimize the number of data copies, memory allocations and - locks. - - * ace/Message_Block.h: - * ace/Message_Block.i: - Added new method to replace the Data_Block, this method returns - the old one, letting the user decide how to deallocated the Data - block, possibly transfering it to another Message_Block. - -Mon Aug 16 15:58:12 1999 Steve Huston - - * ace/config-sunos5.5.h: - * include/makeinclude/platform_sunos5_sunc++.GNU: Added support - for using "compat=4" mode for Sun CC 5. To use this, do - "make compat4=1", or equivalent. Compat 4 uses -compat=4 with - its old iostreams, but the newer Sun CC 5 scheme of explicit - template instantiation. - -Mon Aug 16 11:59:18 1999 Vishal Kachroo - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): Constructed and passed a - complete sockaddr_in to the ACE_OS::join_leaf () call. This was - just being passed sockaddr_in.sin_addr.s_addr. - -Sat Aug 14 18:01:27 1999 Carlos O'Ryan - - * tests/run_tests.pl: - Fixed some output messages that were going to stdout. - -Sat Aug 14 15:20:27 1999 Douglas C. Schmidt - - * ace/SOCK_Dgram_Mcast.cpp (subscribe): It looks like there - was a bug where we were passing an s_addr to ACE_OS::join_leaf() - rather than a sockaddr *. Fixing this also cleaned up some code - that was #ifdef'd for UNICOS. Thanks to Vishal for reporting - this. - - * ace/Process.h: Added a virtual to ~ACE_Process so that it - can be used for subclassing more readily. Thanks to Zoran - Ivanovic for suggesting this. - -Sat Aug 14 14:11:25 1999 Everett Anderson - - * ace/Remote_Tokens.cpp (tryacquire): Fixed so that it uses - ACE_Token_Request::TRY_ACQUIRE instead of RELEASE. - -Fri Aug 13 18:55:51 1999 Douglas C. Schmidt - - * ace/Handle_Set.h (ACE_Handle_Set): Clarified the meaning of the - nbits_ array. Thanks to Hao Ruan for - motivating this. - -Fri Aug 13 21:18:40 1999 David L. Levine - - * ace/OS.i (llseek): on Linux, moved extern "C" llseek () - declaration out of the function. Thanks to Tal Lev-Ami - for this fix. - -Fri Aug 13 20:50:02 1999 Nanbor Wang - - * ace/Select_Reactor_T.cpp (handle_events): Added a deactivation - check for non-threaded case. The original check was mixed with - thread owner check and thus got disabled under single-threaded - configurations. Thanks to Kirthika for reporting the problem. - -Fri Aug 13 13:11:16 1999 David L. Levine - - * bin/make_release: moved ACE_wrappers/TAO addition to - $release_files so that it's only done for the ACE+TAO kit. - -Fri Aug 13 12:44:08 1999 David L. Levine - - * Makefile,bin/make_release: added support (and documentation) - for creating kits with or without new tags, or using an old - tag; generated man pages; installation to the public ftp/http - site on ace; and zip files. - -Fri Aug 13 07:58:12 1999 David L. Levine - - * ace/OS.{h,i},README,config-osf1-4.0.h (llseek): added - ACE_HAS_LLSEEK support. Thanks to Tal Lev-Ami - for providing this. - -Thu Aug 12 22:05:37 1999 Douglas C. Schmidt - - * ace/OS.i (sema_wait, rw_tryrdlock, rw_trywrlock): - Replaced more ad hoc uses of the - - int error = 0; - ... - error = errno; - ... - errno = error; - - idiom with the ACE_Errno_Guard. - - * ace/Synch.h: Updated the comment to remind folks who would - like to have a working ACE_Process_Condition to contact us if - they know how to do this. Thanks to Craig Anderson - for motivating this. - - * tests/Process_Strategy_Test.cpp (open): Clarified the behavior - of the code that's run when fork() is used. Thanks to Umar - Syyid for motivating this. - -Thu Aug 12 21:30:09 1999 Alexander Babu Arulanthu - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - added SIMNT support. - -Thu Aug 12 20:54:40 1999 David L. Levine - - * ace/config-osf1-4.0.h: added ACE_HAS_USING_KEYWORD - for cxx and Rational compilers. [Bug 163] - -Thu Aug 12 20:47:13 1999 Carlos O'Ryan - - * tests/Cached_Accept_Conn_Test.cpp: - Made the and variables global - instead of static, because otherwise Sun/CC automatic template - instantiation cannot find them at link time. The variables are - used in template code that is defined and used in the same file, - but Sun/CC does not seem to understand that. - -Thu Aug 12 17:14:35 1999 Jeff Parsons - - * ace/OS.h: - Changed typedef of WChar to ACE_UINT16. The CDR operations - are already using write_2, read_2 and SHORT_SIZE, and - in the process of implementing wchars and wstrings in - IDL, it's going to be important to optimize for the - Unicode common case. - -Thu Aug 12 16:24:16 1999 David L. Levine - - * bin/make_release: chdir up a level before removing the - staging directory. Thanks to Carlos for pointing out - that it's necessary, because we had chdir'd into it. - And for noticing that $build_commands got clobbered in - create_kit (). Obey $generate_man_pages setting. - -Thu Aug 12 16:03:03 1999 David L. Levine - - * ACE version 5.0.1 released. - -Thu Aug 12 15:49:00 1999 David L. Levine - - * Makefile,bin/make_release: build kits in /tmp staging - area, and copy to ace's ftp pub/ACE directory. - -Thu Aug 12 11:36:46 1999 Carlos O'Ryan - - * ace/OS.h: - * ace/Svc_Handler.cpp: - * ace/Future.cpp: - Some platforms require arguments in the exception thrown from - operator new. The standard (std::bad_alloc) does not require - any. - Added a new macro (ACE_throw_bad_alloc) that takes care of these - differences, including platforms that don't throw exceptions but - return something. - -Wed Aug 11 17:00:00 1999 Kirthika Parameswaran - - * tests/Cached_Accept_Conn_Test.cpp: - Removed run_event_loop and end_event_loop and put in - handle_events with a flag to stop the loop. This is a bug fix - for Bug183. - -Wed Aug 11 15:49:37 1999 David L. Levine - - * docs/ACE-guidelines.html: cleaned up ACE doc tool discussion. - Added Carlos' inlining heuristics. - -Wed Aug 11 13:53:20 1999 David L. Levine - - * ace/config-win32.h,config-win32-borland.h: added - ACE_HAS_MUTABLE_KEYWORD. Thanks to Jody for this request. - -Wed Aug 11 13:15:26 1999 David L. Levine - - * ace/config-g++-common.h,config-win32.h,config-win32-borland.h: - added ACE_HAS_EXPLICIT_KEYWORD - (for egcs only, in config-g++-common.h). Thanks to Jody Hagins - for this update. - - * ace/config-g++-common.h: added ACE_HAS_MUTABLE_KEYWORD. - -Wed Aug 11 13:10:32 1999 David L. Levine - - * ace/OS.h,README: added ACE_HAS_MUTABLE_KEYWORD support. - Thanks to Jody Hagins for providing it. - -Wed Aug 11 12:55:23 1999 Carlos O'Ryan - - * ace/Svc_Handler.cpp: - * ace/Future.cpp: - The throw expressions require a constructor, not just the type, - thanks to David for pointing this out. - -Wed Aug 11 10:12:11 1999 David L. Levine - - * ace/OS.h,Auto_Ptr.h,SString.h,README: added support for - ACE_HAS_EXPLICIT_KEYWORD. Thanks to Jody Hagins - for suggesting this. - -Wed Aug 11 10:07:36 1999 Carlos O'Ryan - - * ace/Future.cpp: - * ace/Local_Tokens.cpp: - * ace/Log_Msg.cpp: - * ace/Log_Record.cpp: - * ace/Svc_Handler.cpp: - * netsvcs/lib/Token_Handler.cpp: - Fixed several warnings and errors with gcc-2.95 - - * include/makeinclude/wrapper_macros.GNU: - Add -fcheck-new to the command-line of g++ when compiling with - exceptions disabled. In that case new operators could return 0 - and without this option the constructor will surely be invoked - on invalid data. - - * bin/auto_compile: - Use LOGNAME instead of USER to get the username because it is - more portable. - -Tue Aug 10 23:47:32 1999 Kirthika Parameswaran - - * ace/Cached_Connect_Strategy_T.h: - * ace/Caching_Utility_T.h: - * ace/Caching_Strategies_T.h: - * ace/Cleanup_Strategies_T.h: - * ace/Cache_Map_Manager_T.h: - * ace/Hash_Cache_Map_Manager_T.h: - - Defined macros to shorten lengthy class names for linkers which - couldnt grok long names (example: Sun Linker). Thanks to - Dr.Schmidt for this cool idea. - -Tue Aug 10 19:07:32 1999 Carlos O'Ryan - - * tests/run_tests.sh: - * tests/run_tests.pl: - * tests/run_tests.lst: - Move the list of tests to a separate file. This file is used to - drive both a perl version of the script and the old shell - version. - The new perl version is able to terminate programs that hang, - but still has problem with processes that fork children who then - hang for some reason. The perl script has to be ported to Win32 - too. - - * bin/run_all_list.pm: - Use the new tests/run_tests.pl script on Unix. - - * bin/run_all.pl: - Run all the test scripts in ACE and TAO, much like run_all_win32 - but for unix systems. - - * bin/auto_compile: - Remember to remove the disable file in case of errors. - -Tue Aug 10 18:08:30 1999 Jeff Parsons - - * ace/CDR_Stream.h: - * ace/CDR_STream.i: - Added all the necessary stuff for wstrings. - -Tue Aug 10 15:36:02 1999 David L. Levine - - * tests/Malloc_Test.cpp (main): removed unused argc - declaration, with ACE_LACKS_FORK && ! ACE_HAS_WIN32. - -Tue Aug 10 15:26:43 1999 David L. Levine - - * ace/OS.cpp (strptime): removed unreachable break after - return statement, in default case of switch statement. - -Tue Aug 10 14:46:12 1999 David L. Levine - - * ace/OS.{h,cpp},README: Changed support for ACE_OS::strptime () - to be configurable. VxWorks, LynxOS, and Chorus, for example, - don't have a native ::strptime (). The current emulation cost - 2 Kb, which will be objectionable to some embedded systems - developers. - - Replaced ACE_LACKS_STRPTIME with a combination - ACE_HAS_STRPTIME/ACE_LACKS_NATIVE_STRPTIME. ACE_HAS_STRPTIME - enables ACE_OS::strptime () support. ACE_LACKS_NATIVE_STRPTIME - lets ACE know that there's no native ::strptime (), so it then - uses its emulation. - - This has two advantages: it minimizes footprint in the default - case, and doesn't break builds on platforms that don't have - ::strptime (). It easily allows developers to configure ACE - identically, with respect to strptime, on their Unix, NT, and - embedded platforms. [Bug 219] - - * ace/config-sunos5.5.h,config-linux-common.h,config-osf1-4.0.h, - config-irix6.x-common.h: - added #define ACE_HAS_STRPTIME. [Bug 219] - -Tue Aug 10 12:28:54 1999 Jeff Parsons - - * bin/run_all_list.pm: - Added IDL test to the list. - -Mon Aug 09 16:49:45 1999 Nanbor Wang - - * ace/Process.{h,cpp} (wait): Re-visited the implementation so it - behaves the same on both UNIX and Win32. Thanks to Doug for - suggesting this. - -Mon Aug 09 16:30:24 1999 David L. Levine - - * docs/ACE-guidelines.html: added note to follow the - ACE documentation tools guidelines and restrictions. - Thanks to Doug for pointing this out. - -Mon Aug 09 16:06:01 1999 Nanbor Wang - - * include/makeinclude/wrapper_macros.GNU: Applied smart eg++ - recognizer. Thanks to Craig Anderson for - providing the patch. - -Mon Aug 9 11:29:36 1999 Douglas C. Schmidt - - * bin: Fixed html-windex so that it works when class names contain - the digit '3' in them, e.g., ACE_WIN32_Asynch_Accept, etc. - Thanks to Jody Hagins for reporting this - problem. - -Mon Aug 09 15:10:27 1999 Nanbor Wang - - * ace/Process.h (wait): Rewrote comments. - - * ace/Service_Config.h (open): Revised the comments for several - service_config flags. Thanks to Doug for pointing this out. - -Mon Aug 9 11:29:36 1999 Douglas C. Schmidt - - * examples/Reactor/Misc/test_demuxing.cpp: Added a destructor - to ~STDIN_Handler that will remove the event handler for STDIN - and the registered timer. - -Mon Aug 9 10:45:24 1999 Douglas C. Schmidt - - * ace/Memory_Pool.cpp (handle_signal): When working with an MMAP - memory pool, a "real" segmentation fault (not related to - updating the memory mapping) will cause the process to fail but - not write a core file. This is because that on linux (and - possibly other flavours of UNIX) core file writing is a default - behaviour which is disabled once you register a signal handler. - Even if the signal handler returns a bad return value which - crashes the program, a core file will not be written. - - The fix for this is to modify the mmap() signal handler so that - it de-registers the signal handler when detecting a segfault - with the mapping up to date and return an "ok" answer. the - program will attempt to access the illegal address again and - dump core. Thanks to Joseph Weihs for - contributing this fix. - - * ace/Signal: Changed the new handle_i() and register_handler_i() - methods to be static member functions so they can be called from - the static dispatch() member function. Thanks to Andreas - Geisler for reporting this. - -Mon Aug 9 10:33:50 1999 Douglas C. Schmidt - - * examples/ASX/CCM_App/SC_Server.cpp: Make sure to enable - the appropriate parameter for ACE_Service_Config::open() so that - static services will be enabled. Thanks to Michael Roth - for reporting this. - -Mon Aug 09 10:21:37 1999 David L. Levine - - * include/makeinclude/wrapper_macros.GNU (INCLDIRS): - removed "-I.". It's not necessary, because the preprocessor - will first look for headers in the current directory, when - appropriate. It causes trouble, for example, on NT for - VxWorks with Green Hills. Instead of including the system's - Signal.h, ACE's signal.h gets #included with "-I.". Thanks - to Dale Wood for helping to track - this down. [Bug 35] - - * include/makeinclude/platform_vxworks5.x_ghs.GNU: no longer - need to override INCLDIRS, now that it doesn't contain "-I.". - [Bug 35] - -Mon Aug 09 10:09:57 1999 David L. Levine - - * ace/OS.h,streams.h: moved ACE_OSTREAM_TYPE #define from - streams.h to OS.h, so that it is seen with - ACE_LACKS_IOSTREAM_TOTALLY. And, provide default value - for ACE_DEFAULT_LOG_STREAM. [Bug 208] - - * ace/Log_Msg.cpp: changed a couple remaining ostream occurrences - to ACE_OSTREAM_TYPE. Replaced conditional use of - ACE_DEFAULT_LOG_STREAM/&cerr with ACE_DEFAULT_LOG_STREAM, - now that it's always defined. [Bug 208] - -Mon Aug 09 09:47:06 1999 David L. Levine - - * ace/Log_Msg.{h,cpp}: replaced the ACE_Log_Msg_key_created_ - and ACE_Log_Msg_key_ file static variables with static - class members ACE_Log_Msg::key_created_ and - ACE_Log_Msg::log_msg_tss_key_, respectively. Only declare - ACE_Log_Msg::log_msg_tss_key_ if the platform supports TSS - (native or emulated). Replaced the ACE_Log_Msg_message_queue - file static variable with ACE_Log_Msg_Manager::message_queue_. - Cleaned up Log_Msg.cpp. [Bug 86] - - Thanks to Umar Syyid for suggesting that - we remove the file static variables. - -Mon Aug 09 09:33:43 1999 David L. Levine - - * ace/OS.h: #define ECOMM (to ECONNABORTED) if it's not - already #defined. This allows support on NT. Thanks to - Andy for reporting this. - -Mon Aug 9 07:45:19 1999 Douglas C. Schmidt - - * ace/Signal.h: Modified the behavior of the - ACE_Sig_Handler::dispatch() method so that on Win32 it'll - automagically re-register the signal handler after the - handler_signal() method returns with a non -1 value. Thanks to - Andreas Geisler for suggesting - this. - - * tests/Malloc_Test.cpp: Win32 didn't seem to like a 32k - offset for the virtual address. Let's try 64k instead. Thanks - to Nanbor for reporting this. - - * tests/Malloc_Test.cpp: Changed the sense of the conditional - compilation test from && !defined (ACE_WIN32) to || defined - (ACE_WIN32) so that this will run on Win32. Thanks to - Nanbor for reporting this. - - * ace/OS.i: Cleaned up the coding style for the sigset* - wrapper functions. - -Sun Aug 08 21:19:42 1999 David L. Levine - - * ace/config-osf1-4.0.h: removed unreferenced_function_param - warning suppression. It's no longer needed with the fixes - to avoid unreferenced function parameters. [Bug 217] - -Fri Aug 06 15:20:00 1999 Kirthika Parameswaran - - * ACE-INSTALL.html: added information about compilation on - SunOS5.6 using egcs1.1.2. - -Fri Aug 06 13:47:51 1999 David L. Levine - - * ACE-INSTALL.html: added note about disabling optimization - for some files with Tornado II. - -Fri Aug 06 13:39:48 1999 David L. Levine - - * ACE-INSTALL.html: updated VxWorks build information, - specifically, the instructions for building on NT host. - And, added information about linking libACE.so and libTAO.so - into the VxWorks kernel. Thanks to - Erik Johannes and Stephane Chatre - for helping to clarify and verify. - -Fri Aug 06 12:10:19 1999 Nanbor Wang - - * ace/config-win32-common.h: Added - ACE_HAS_POSITION_INDEPENDENT_MALLOC. - - * ace/OS.cpp (strptime_getnum): getnum should be strptim_getnum. - - * ace/config-win32-common.h: Added ACE_LACKS_STRPTIME. Thanks to - Andy for pointing this out. - -Fri Aug 06 11:13:27 1999 David L. Levine - - * ace/streams.h,OS.h,Log_Msg.h: with ACE_LACKS_IOSTREAM_TOTALLY, - removed the hack that re-#defined ostream. Replaced that - with an ACE_OSTREAM_TYPE macro. [Bug 208] - -Fri Aug 06 10:49:34 1999 David L. Levine - - * ACE-INSTALL.html: updated egcs versions that we use - (1.1.1 and 1.1.2). - -Fri Aug 6 08:43:22 1999 Douglas C. Schmidt - - * examples/Log_Msg/test_log_msg.cpp (main): Changed this - test so that it no longer abort()s, but instead calls - ACE_OS::_exit(). This should help avoid confusion when it's - run. Thanks to Kevin Lyda for - reporting this. This fixes [BUGID:211]. - - * ace/SOCK_Dgram_Mcast: The QoS-enabled subscribe() call must - call the QoS-enabled open() call, rather than the "regular" - open() call because otherwise QoS information isn't initialized! - Thanks to Vishal for pointing this out. - -Fri Aug 06 08:22:00 1999 David L. Levine - - * ace/Object_Manager.cpp: with ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK, - made the ACE_Static_Object_Lock_lock instance static, to - match the non-ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK behavior. - Thanks to Jody for this change. - - Also, consolidated the code to alway use the - ACE_Static_Object_Lock_Type typedef. - -Fri Aug 06 06:55:49 1999 Jody Hagins - - * include/makeinclude/rules.local.GNU (depend.local): added - ACE_DEPEND_SED_CMD hook, so that users can add sed scripts. - An example is to use relative instead of absolute paths - in dependencies. I put this into it to get the desired - (site-specific) functionality: - - USER_DEPEND_SED_CMD=-e "s;$(PRISM_ROOT);\$$(PRISM_ROOT);g" - -Thu Aug 5 22:26:18 1999 Douglas C. Schmidt - - * ace/OS.h (ACE_OS): Added support for strptime() for platforms that - lack it. Thanks to Kevin Lyda for - contributing this. Note that if a platform fails to compile - because it doesn't support this function, please enable - ACE_LACKS_STRPTIME in the config.h file and send us email. - -Thu Aug 05 21:37:05 1999 David L. Levine - - * ace/Object_Manager.cpp (ACE_Static_Object_Lock_lock, - ACE_Static_Object_Lock::instance, cleanup_lock): - added support for ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK. - It's not (currently) used by ACE. But, applications may - find it useful for avoiding recursive calls if they have - overridden operator new. Thanks to Jody Hagins - for contributing it. - -Thu Aug 05 21:04:20 1999 David L. Levine - - * ace/streams.h: removed #includes of istream.h and ostream.h - with ACE_HAS_STD_CPP_LIBRARY and ACE_USES_OLD_IOSTREAMS. - Those headers aren't available with Sun CC. I think that - they might be unnecessary with egcs for Tornado II. Thanks - to Doug for reporting this. Ref. - Thu Aug 05 14:31:48 1999 David L. Levine . - -Thu Aug 5 16:43:29 1999 Douglas C. Schmidt - - * tests/Malloc_Test.cpp: Rearranged the #ifdefs so that - we don't do much of anything if the platform doesn't support - processes. Thanks to David Levine for reporting this. - -Thu Aug 5 16:27:15 1999 Carlos O'Ryan - - * include/makeinclude/rules.lib.GNU: - * include/makeinclude/wrapper_macros.GNU: - Added new macro (ACE_SHLIBS) to control the final link line of - shared libraries. Use this macro to list the -l options - required by your shared library that are *not* included in the - system LIBS macro, for example "-lTAO -lACE"; the system will - automagically change that to be "-lTAOshr -lACEshr" on AIX. - This also decouples the shared library link line from the - binaries, which use LDLIBS and ACELIB, allowing the application - developers to easily mix shared libraries and binaries in the - same directory, even if the binaries depend on the generated - shared library. - -Thu Aug 05 15:44:39 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_g++.GNU: on - WIN32 host, assume that $(CC) is on the user's path (or is a - full pathname). That way, we don't need to determine ACE_CC - dynamically, which causes trouble with the WIN32 shell. Thanks - to Erik Johannes for reporting this. - [NOTE: this had been committed on a branch, but never on the - main line.] - -Thu Aug 05 15:35:21 1999 Nanbor Wang - - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf_lib.dsp: - * ace/ace_lib.dsp: - * ace/ace_dll.dsp: Changed the default configuration to Win32 - Debug so if anyone doesn't know what he is doing, he'll most - likely to success. - -Thu Aug 05 15:30:32 1999 David L. Levine - - * ace/streams.h: with ACE_LACKS_IOSTREAMS_TOTALLY, always - #define ostream FILE *. [Bug 208] - -Thu Aug 05 15:13:01 1999 David L. Levine - - * ace/config-lynxos.h: added note on why we don't #define - ACE_HAS_POSIX_SEM for LynxOS. [Bug 164] - -Thu Aug 05 14:53:44 1999 David L. Levine - - * ace/config-vxworks5.x.h: added support for the Diab - compiler, version 4.2a or later. Compilation succeeds but links - still have unresolved symbols related to new and delete. [Bug - 207] - - * ace/OS.h,README: added support for ACE_LACKS_NEW_H. [Bug 207] - - * ace/OS.h: for VxWorks, use the ANSI prototypes for - inet_ntoa.h, etc., for all VxWorks compilers, not just Green - Hills. This allows compilation to succeed with Diab 4.2a. [Bug - 207] - - Thanks to Erik Johannes for helping with - this quick port to Diab 4.2a for VxWorks. - -Thu Aug 05 14:31:48 1999 David L. Levine - - * ace/iosfwd.h: #include iosfwd with - ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION as well as without - ACE_HAS_OLD_IOSTREAMS. This allows builds to succeed for - Tornado II with its egcs. [Bug 206] - - * ace/streams.h: added #includes of istream.h, ostream.h, - and iomanip.h with ACE_HAS_STD_CPP_LIBRARY and - ACE_USES_OLD_IOSTREAMS. It's necessary for builds for Tornado - II, but should be harmless and helpful on other platforms. [Bug - 206] - - Thanks to Matthias Schumann for - first reporting the solution to the build problem for Tornado II. - -Thu Aug 5 13:03:28 1999 Douglas C. Schmidt - - * ace/Malloc_T.cpp (shared_free): Looks like ACE_reinterpret_cast - isn't the right thing to do... Let's just use good ol' - fashioned C-style casts instead. Thanks to Bala for reporting - this. - -Thu Aug 05 12:05:42 1999 David L. Levine - - * include/makeinclude/wrapper_macros.GNU: moved minimum_corba - make flag support from wrapper_macros.GNU to TAO/rules.tao.GNU. - Thanks to Bala for noticing this. [Bug 204] - -Thu Aug 05 12:01:14 1999 Nanbor Wang - - * ace/Malloc_T.cpp (shared_free): Applied - ACE_reinterpret_cast (ACE_Malloc_Header*, yadda) to serveral - pointer comparisons. MSVC was complaining because the pointers are - of different types. - -Thu Aug 5 11:57:23 1999 Balachandran Natarajan - - * include/makeinclude/wrapper_macros.GNU (YACC): Removed the - definition of interface_repo a command line option with 'make' - to $TAO_ROOT/rules.tao.GNU as per Dr.Levine's suggestions. - -Thu Aug 05 08:43:27 1999 David L. Levine - - * include/makeinclude/platform_vxworks5.x_diab.GNU: added. - Thanks to Erik Johannes for - helping to figure out its contents. Note that compiles - succeed with Diab 4.2a for VxWorks, but links do not, yet. - -Thu Aug 05 08:37:09 1999 David L. Levine - - * ACE-INSTALL.html: added Kirk Davies' notes for running - the ACE tests on Tornado II, without NFS installed. - -Thu Aug 5 00:15:45 1999 Douglas C. Schmidt - - * ace/Based_Pointer_T: Changed the type of index for operator[] - and operator+= to be int instead of long so that it'll work - correctly when constant values are used. Thanks to - Nanbor and KCC for pointing this out! - -Wed Aug 4 19:46:33 1999 Carlos O'Ryan - - * tests/run_tests.sh: - Disabled the New_Fail_Test because it breaks other - compilations. - -Wed Aug 4 15:56:51 1999 Douglas C. Schmidt - - * tests/Malloc_Test.cpp: Make this test work even if - ACE_HAS_POSITION_INDEPENDENT_MALLOC isn't set for a particular - platform. - - * tests/Malloc_Test.h: Added a #include for - "ace/Based_Pointer_T.h". Thanks to Carlos for pointing out the - need for this. - -Wed Aug 4 17:07:12 1999 Balachandran Natarajan - - * include/makeinclude/wrapper_macros.GNU : Made the interface - repository files to be compiled by default. If the user does not - want these files to be compiled he can turn it off by issuing - interface_repo=1 with the 'make' command. - -Wed Aug 4 15:56:51 1999 Douglas C. Schmidt - - * ace/Task.h (ACE_Task_Base): Changed the parameter name - to , which is more descriptive. - Thanks to John Forest for - motivating this. - -Wed Aug 4 15:54:51 1999 Carlos O'Ryan - - * netsvcs/clients/Naming/Client/Makefile: - * netsvcs/clients/Naming/Dump_Restore/Makefile: - If the libraries are specified as dependencies then they don't - need to be listed in LDLIBS - -Wed Aug 4 13:20:54 1999 Douglas C. Schmidt - - * ace/Malloc.h: Ok, let's try this again ;-). Removed the - forward declarations and typedefs and replaced them with - #defines. Hopefully, this will make all the compilers happy! - -Wed Aug 04 12:58:53 1999 Nanbor Wang - - * tests/*.dsp: Fixed Alpha configurations. - -Wed Aug 4 12:26:53 1999 Carlos O'Ryan - - * ace/Malloc.h: - Added more forward declarations for the compilations that - enabled PIM. - -Wed Aug 4 11:59:57 1999 Carlos O'Ryan - - * ace/Malloc.h: - The previous fix did not work, i used forward declarations to - make it work. - -Wed Aug 4 09:28:35 1999 Douglas C. Schmidt - - * ace/Malloc.h: Replaced the use of typedefs for macros - to define ACE_MALLOC_HEADER_PTR ACE, ACE_NAME_NODE_PTR, - ACE_CHAR_PTR to try to avoid "incomplete type" messages from - certain versions of G++. Macros are "later binding" than - typedefs for this situation. - - * ace/Asynch_Acceptor.cpp (handle_accept): Fixed an expression - that had incorrect parentheses. Thanks to David Digby - for reporting this. - -Wed Aug 04 02:40:45 1999 Nanbor Wang - - * tests/run_tests.bat: * tests/tests.dsw: - * tests/Malloc_Test.dsp: - * tests/version_tests/Malloc_Test.dsp: Added project files for the - Malloc_Test and added the test in run_test.bat. - -Tue Aug 3 22:39:34 1999 Douglas C. Schmidt - - * tests/{Makefile,run_tests.sh}: Added support for the new - Malloc_Test. - - * tests/Malloc_Test.cpp: Added a new test that exercises the new - position-independent ACE_Malloc with ACE_MMAP_Memory_Pool and - ACE_Process_Mutex. - - * ace/Malloc_T: Added an accessor called mutex() to allow - applications to acquire()/release() the lock used to provide - mutual exclusion to an allocator. - - * tests/SV_Shared_Memory_Test.cpp: Reformatted this test to - conform to ACE programming guidelines. - - * ace/Memory_Pool: The void * and char * arguments to the various - ACE_*_Memory_Pool_Options constructors should be const; now they - are! - - * examples/Shared_Malloc/test_position_independent_malloc.cpp (main): - Added auto_ptr support to this test, as well. - - * examples/Shared_Malloc/test_multiple_mallocs.cpp: Enhanced - this test so that it uses auto pointers and also now takes - advantage of position-independent malloc, when possible. - - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - Finished integrating all the features of this test. It's pretty - cool now! - - * examples/Shared_Malloc/Makefile: Updated the LSRC target so - 'make depend' works correctly... - - * ace/Select_Reactor_Base.cpp (find): Don't set errno = ENOENT - if we find a valid mapping of handle to Event_Handler. Thanks - to Hao Ruan for reporting this. - - * ace/Based_Pointer_T: Added support for operator= (const - ACE_Based_Pointer_Basic &). - - * ace/Based_Pointer_T: Added definitions for - ACE_Based_Pointer::operator= and - ACE_Based_Pointer_Basic::operator= to make EGCS happy. - - * ace/Malloc.h: Factored out the common code for - ACE_Based_Pointer<> and the underlying types, thereby reducing - the number of #ifdef's. - - * ace/Based_Pointer_T: Added an operator CONCRETE *() method - - * ace/Based_Pointer_Repository.cpp: The original implementation - of this classes stored a pointer to the size of each mapped - address, rather than just the value. This was causing problems - when used for shared memory because the memory was allocated in - one process and freed in another. This is now fixed by not - storing a pointer, but by storing the value instead. Thanks to - Nanbor for reporting this. - -Tue Aug 3 23:43:47 1999 Carlos O'Ryan - - * netsvcs/clients/Naming/Client/Makefile: - * netsvcs/clients/Naming/Dump_Restore/Makefile: - Fixed dependencies so parallel compilations (using the -j - option) will work correctly. This fixes [BUGID:187] - -Tue Aug 3 23:23:18 1999 Kirthika Parameswaran - - * ace/Cached_Connect_Strategy_T.{h,cpp} (cleanup): - Added a specialised method to prevent memory leaks with old - versions of g++. This method calls the underlying iterator - and does the cleanup. - - * ace/run_tests.sh: - Removed purify check over Cached_Accept_Conn_Test and - Cached_Conn_Test since they no longer leak memory when built - using old version of g++. - -Tue Aug 3 22:23:18 1999 Balachandran Natarajan - - * include/makeinclude/wrapper_macros.GNU: Added an ifeq flag for - the interface repository. Compiling with interface_repo=1 will - compile the files for interface repository. - -Tue Aug 03 21:17:00 1999 Nanbor Wang - - * tests/SOCK_Connector_Test.cpp (host_is_up): Added a time out - value of 5 second to spped up the test. Thanks to Jody Hagins - for submitting the patch. - -Tue Aug 03 18:30:47 1999 Kirthika Parameswaran - - * ace/Strategies.h (ACE_Connection_Recycling_Strategy): - Added a new pure virtual method which will - provide a non-locking implementation of the - method. - - * ace/Strategies_T.h (ACE_Cached_Connect_Strategy): - * ace/Cached_Connect_Strategy_T.h (ACE_Cached_Connect_Strategy_Ex): - Made public. - - * ace/Caching_Utility_T.{h,cpp} - (ACE_Refcounted_Recyclable_Caching_Utility): Added this class - which caters to purging of refcounted and recyclable handlers. - - * ace/Cleanup_Strategy_T.{h,cpp}: - (ACE_Refcounted_Recyclable_Cleanup_Strategy): Added this class - which caters to the cleanup of handlers which are refcounted and - recyclable. Heres where the necessity of making the non-locking - version of public arose in the first place. - - * ace/OS.h (ACE_Recyclable_State): - Removed hardcoded values and left the enum values to the - discretion of the compiler. - -Tue Aug 03 16:58:08 1999 Joe Hoffert - - * ace/ATM_Acceptor.{h,cpp}: - * ace/ATM_Connector.{h,cpp}: - * ace/ATM_Stream.{h,i,cpp}: - * ace/ATM_Params.cpp: - * ace/ATM_QoS.cpp: - * ace/XTI_ATM_Mcast.{h,i,cpp}: - Fixed inlining errors. - -Tue Aug 03 16:15:00 1999 Chris Gill - - * ace/Auto_Ptr.h: created ACE_AUTO_PTR_RESET macros, which depend on - whether or not ACE_AUTO_PTR_LACKS_RESET is defined. - - * ace/config-kcc-common.h: defined ACE_AUTO_PTR_LACKS_RESET, because - KCC native auto_ptr support is difficult to disable, and implements - an older version of auto_ptr (without the reset method). - -Tue Aug 03 13:26:47 1999 Nanbor Wang - - * ace/Service_Repository.cpp (instance): Check to see if - the ACE_Object_Manager is being shutting down before creating a - new instance of Service_Repository. Otherwise, we may be - creating a new service repository just for shutting it down. - Thanks to Doug for noticing this. - - * ace/Service_Config.cpp (fini_svcs): Since it is now possible for - ACE_Service_Repository::instance to return 0 during program - shutdown, we must check its value before using it. - - Notice that the change assumes people don't do stupid things - like initializing the Service_Config during program shutdown. - -Mon Aug 2 23:21:01 1999 Carlos O'Ryan - - * bin/auto_compile: - Added several flags to: disable test execution, specify the list - of build directories on the command line, send email on - successful compilation, keep a more detailed history, etc. - -Mon Aug 02 18:38:37 1999 Joe Hoffert - - * ace/ATM_Acceptor.{h,i,cpp} : - * ace/ATM_Connector.{h,i,cpp} : - * ace/ATM_Params.{h,i,cpp} : - * ace/ATM_QoS.{h,i,cpp} : - * ace/ATM_Stream.{h,i,cpp} : - * ace/XTI_ATM_Mcast.{h,i,cpp} : - * ace/ATM_Addr.{h,cpp}: - * ace/Makefile: - * ace/TLI_Connector.i: - Added new ATM wrapper files to make the mechanism of sockets or - XTI transparent when using the ATM protocol. Modified existing - files to take advantage of these wrapper classes. - - * examples/IPC_SAP/ATM_SAP : - * examples/IPC_SAP/ATM_SAP/CPP-client.cpp : - * examples/IPC_SAP/ATM_SAP/CPP-server.cpp : - * examples/IPC_SAP/ATM_SAP/Makefile : - Added new test directory and programs to test ATM wrapper classes. - - * examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp: - Modified existing test program to utilize new ATM_QoS class. - -Mon Aug 02 17:24:05 1999 Nanbor Wang - - * ace/OS.h (ACE_DL_TYPE): Only WinCE uses wchar_t DL type, we'll - just deal with this in ACE_OS::dlsym instead of defining - different types here. - - * ace/OS.i (dlsym): GetProcAddress is defined differently on - Windows CE and other Win32 platforms so we need to treat them - differently. - - * ace/Malloc.h (ACE_Malloc_Header): Added a dummy member function - to prevent egcs from complaining "all member functions are - private." - - * ace/Based_Pointer_Repository.cpp: Fixed the use of map - iterators. - - * examples/Shared_Malloc/test_position_independent_malloc.cpp - (main): Delete the allocator before exiting from main. - - * ace/Malloc.h (ACE_Malloc_Header,ACE_Name_Node,ACE_Control_Block): - Added an unimplemented assignment operator for this class. - Otherwise, some compilers will try to use - ACE_Based_Pointer_Base::operator= which is not implemented. - -Mon Aug 2 09:58:20 1999 Ossama Othman - - * netsvcs/lib/Name_Handler.cpp (init): - * netsvcs/lib/Server_Logging_Handler_T.cpp (init): - * netsvcs/lib/TS_Clerk_Handler.cpp (init): - - Changed cast to ACE_SignalHandler to allow it to compile under - gcc 2.95. Thanks to Jeffrey Franks for - reporting the problem. - -Sun Aug 1 15:58:39 1999 James CE Johnson - - * docs/tutorials/colorize: - Added
     wrapper around generated output.
    -
    -        * docs/tutorials/Chap_03/Makefile:
    -        * docs/tutorials/Chap_03/README:
    -        * docs/tutorials/Chap_03/mm.cpp:
    -        * docs/tutorials/Chap_03/ex03.html: mm.cpp (and ex03.html) are a
    -          slightly modified version of ex02.html that uses a memory mapped
    -          file instead of SYSV SHMEM.  To work around the lack of fork()
    -          in Win32, the app must be executed once in server mode
    -          (argv[1] == 's') and again in client mode.
    -
    -Sun Aug  1 15:58:39 1999  Douglas C. Schmidt  
    -
    -        * ace/Memory_Pool.cpp: If the base_addr is 0 for the
    -          ACE_MMAP_Memory_Pool_Options, then we will disable the
    -          "use_fixed_addr" option since it's going to cause big trouble to
    -          mmap() at location 0!  Plus, when 0 is used it's intended as an
    -          indication that the application wants the OS to choose the
    -          appropriate mapping.  This minor change in semantics works
    -          particularly well with the new
    -          ACE_HAS_POSITION_INDEPENDENT_MALLOC feature, because we can now
    -          let the OS choose the mapping location with out fear of begin
    -          mapped to a different location!
    -
    -        * ace  /Memory_Pool.cpp: Conditionally include
    -          ace/Based_Pointer_Repository.h when
    -          ACE_HAS_POSITION_INDEPENDENT_MALLOC is defined.
    -
    -        * ace/config-sunos5.5.h: Enabled the
    -          ACE_HAS_POSITION_INDEPENDENT_MALLOC macro by default.  Let's see
    -          whether this breaks lots of stuff ;-).
    -
    -        * ace/OS.h: Moved the definition of ACE_IPPROTO_TCP down
    -          further in this file so that the IPPROTO_TCP macro would be
    -          defined.
    -
    -        * ace/Based_Pointer_T.cpp: Removed an inappropriate use of
    -          ACE_INLINE in the *.cpp file.  Thanks to DEC UNIX C++ for
    -          reporting this!
    -
    -Sun Aug 01 02:41:44 1999  Nanbor Wang  
    -
    -        * examples/Shared_Malloc/Shared_Malloc.dsw
    -        * examples/Shared_Malloc/position_independent_malloc.dsp: Added
    -          this new project file for position independent malloc test.
    diff --git a/FAQ b/FAQ
    deleted file mode 100644
    index c184fbde84c..00000000000
    --- a/FAQ
    +++ /dev/null
    @@ -1,1847 +0,0 @@
    -There are many changes and improvements in the new version of ACE.
    -The ChangeLog file contains complete details about all of them.
    -
    -I've tested ACE thoroughly on Solaris 2.3 and 2.4 with the SunC++ 4.x
    -compiler and Centerline 2.x.  I've also tested it with the SunC++ 3.x
    -compiler on the SunOS 4.x platform.  However, I've not been able to
    -test it on other platforms.  If anyone has time to do that, and can
    -report the results back to me I'd appreciate that.
    -
    -Please let me know if you have any questions or comments.
    -
    -	Doug
    -
    -----------------------------------------
    -
    -1. SIGHUP
    -
    -> 1) Where the heck does the HUP signal get registered for the 
    -> $ACE_ROOT/tests/Service_Configurator/server stuff? I looked there and
    -> in $ACE_ROOT/libsrc/Service_Configurator. No luck. I guess I am
    -> just blind from reading.
    -
    -	Take a look in ./libsrc/Service_Configurator/Service_Config.h.
    -The constructor for Service_Config is where it happens:
    -
    -  Service_Config (int ignore_defaults = 0, 
    -		  size_t size = Service_Config::MAX_SERVICES, 
    -		  int signum = SIGHUP);
    -
    -----------------------------------------
    -2. Multi-threaded Signal_Handler support
    -
    -> It appears Signal_Handler is
    -> not setup for multi-threaded apps.  How do you handle signals
    -> in different threads? Do I have to put in the hooks in my app or should
    -> it go in the Threads arena?
    -
    -	Ah, good question...  My design follows the approach espoused
    -by Sun.  Basically, they suggest that you implement per-thread signal
    -handling atop of the basic UNIX signal handlers (or in the case of
    -ACE, the handle_signal() callbacks on Event_Handler subclasses) by
    -using the thread id returned by thr_self() to index into a search
    -structure containing the handlers.  This should be pretty straight
    -forward to layer atop the existing ACE Signal_Handler mechanisms.
    -However, you might ask yourself whether you really want (1) separate
    -signal handler *functionality* in different threads or (2) different
    -threads that mask out certain signals.  The latter might be easier to
    -implement and reason about!
    -
    -----------------------------------------
    -3. Problems compiling ACE with G++
    -
    -> I substituted -lg++ for -lC in macro_wrappers.GNU and ran make.
    -> 
    -> Most stuff seemed to build.  Continually got messages like the following:
    -> ld: /usr2/tss/jvm/ACE_wrappers/lib/libASX.a: warning: archive has no table of c
    -> ontents; add one using ranlib(1)
    -> ld: /usr2/tss/jvm/ACE_wrappers/lib/libThreads.a: warning: archive has no table 
    -> of contents; add one using ranlib(1)
    -> ld: /usr2/tss/jvm/ACE_wrappers/lib/libSPIPE.a: warning: archive has no table of
    ->  contents; add one using ranlib(1)
    -> ld: /usr2/tss/jvm/ACE_wrappers/lib/libASX.a: warning: archive has no table of c
    -> ontents; add one using ranlib(1)
    -> ld: /usr2/tss/jvm/ACE_wrappers/lib/libThreads.a: warning: archive has no table 
    -> of contents; add one using ranlib(1)
    -> ld: /usr2/tss/jvm/ACE_wrappers/lib/libSPIPE.a: warning: archive has no table of
    ->  contents; add one using ranlib(1)
    -
    -> no matter how many times I used ranlib or removed the libraries and re-compiled
    -> or whatever.  Perhaps these are System V specific and will not work on 4.1.3?
    -
    -	Yes, that's exactly right.  If you look at the files, they all
    -contain ifdef's for features that aren't included in the
    -./include/makeinclude/wrapper_macros.GNU file.  To make this more
    -obvious, I've enclosed the following message in the ACE-INSTALL.html file:
    -
    -	* Sun OS 4.1.x
    -
    -		  Note that on SunOS 4.x you may get warnings from the 
    -		  linker that "archive has no table of contents; add
    -		  one using ranlib(1)" for certain libraries (e.g.,
    -		  libASX.a, libThreads.a, and libSPIPE.a).  This 
    -		  occurs since SunOS 4.x does not support these features.
    -
    -> never able to get .so -- assume these are shared libraries that gcc can not
    -> deal with.
    -
    -	Yes, if you use the stock gcc/gas/gnu ld
    -compiler/assembler/linker, you won't get shared libraries to work.  It
    -is possible to hack this by using the "collect" version of g++.
    -However, as usual, I strongly advise people to stay away from g++ if
    -you want to use shared libraries or templates.
    -
    -> got some linker errors as follows:
    -> 
    -> g++ -g  -DACE_NTRACE  -DACE_HAS_MT_SAFE_SOCKETS -DACE_HAS_NO_T_ERRNO -DACE_HAS_
    -> OLD_MALLOC -DACE_HAS_POLL -DACE_HAS_SEMUN -DACE_HAS_SETOWN -DACE_HAS_STRBUF_T -
    -> DACE_HAS_STREAMS -DACE_HAS_SVR4_DYNAMIC_LINKING -DACE_HAS_TIUSER_H -DACE_HAS_SY
    -> S_FILIO_H -DACE_PAGE_SIZE=4096 -DACE_HAS_ALLOCA -DACE_HAS_CPLUSPLUS_HEADERS -DA
    -> CE_HAS_SVR4_SIGNAL_T -DACE_HAS_STRERROR -DMALLOC_STATS -I/usr2/tss/jvm/ACE_wrap
    -> pers/include  -I/usr2/tss/jvm/ACE_wrappers/libsrc/Shared_Malloc  -o test_malloc
    ->  .obj/test_malloc.o -L/usr2/tss/jvm/ACE_wrappers/lib  -Bstatic -lSemaphores -lS
    -> hared_Malloc -lShared_Memory -lReactor -lThreads -lMem_Map -lLog_Msg -lFIFO -lI
    -> PC_SAP -lMisc -lnsl -lg++
    -> ld: /usr2/tss/jvm/ACE_wrappers/lib/libThreads.a: warning: archive has no table 
    -> of contents; add one using ranlib(1)
    -> ld: Undefined symbol 
    ->    _free__t6Malloc2Z18Shared_Memory_PoolZ13PROCESS_MUTEXPv 
    ->    _free__t6Malloc2Z17Local_Memory_PoolZ10Null_MutexPv 
    ->    _malloc__t6Malloc2Z18Shared_Memory_PoolZ13PROCESS_MUTEXUl 
    ->    _malloc__t6Malloc2Z17Local_Memory_PoolZ10Null_MutexUl 
    ->    _remove__t6Malloc2Z17Local_Memory_PoolZ10Null_Mutex 
    ->    ___t6Malloc2Z17Local_Memory_PoolZ10Null_Mutex 
    ->    _print_stats__t6Malloc2Z17Local_Memory_PoolZ10Null_Mutex 
    ->    _remove__t6Malloc2Z18Shared_Memory_PoolZ13PROCESS_MUTEX 
    ->    ___t6Malloc2Z18Shared_Memory_PoolZ13PROCESS_MUTEX 
    ->    _print_stats__t6Malloc2Z18Shared_Memory_PoolZ13PROCESS_MUTEX 
    -> collect2: ld returned 2 exit status
    -> gcc: file path prefix `static' never used
    -> make[2]: *** [test_malloc] Error 1
    -> make[2]: Leaving directory `/usr2/tss/jvm/ACE_wrappers/tests/Shared_Malloc'
    -> <========     End all: /usr2/tss/jvm/ACE_wrappers/tests/Shared_Malloc
    -
    -	That looks like a problem that G++ has with templates.  I
    -don't know of any reasonable solution to this problem using g++.
    -
    -> Finally decided there was enough stuff that it looked like I might have some
    -> thing so I tried to run some tests and could not find so much as one piece
    -> of documentation that might give me some clue about running tests.
    -
    -You should take a look at ./tests/Service_Configurator/server/README
    -file.  That explains how to run the more complicated tests.  As for
    -the other tests, it is pretty straight forward if you look at the
    -./tests/IPC_SAP/SOCK_SAP and ./tests/Reactor/* directory code to
    -figure out how to run the tests.  I don't have a Q/A department, so
    -any documentation has to come from volunteers.
    -
    -----------------------------------------
    -4. Is there any docs or man pages on the Log_Record class?
    -
    -There is a paper in the C++_wrappers_doc.tar.Z file on ics.uci.edu
    -called reactor2.ps that has some examples of using Log_Record.  The
    -./apps/Logger directories show several examples using Log_Record.  
    -Finally, the source code for Log_Record is pretty short (though it
    -clearly could be commented better ;-)).
    -
    -----------------------------------------
    -5. Signal handling prototypes
    -
    -> According to the man page on sigaction on our system, that line
    -> should look something like the following:
    -> 
    ->       sa.sa_handler = SIG_DFL;
    -
    -	The problem is that most versions of UNIX I've come across
    -don't have a correct prototype for this field of struct sigaction.
    -That's why I define two variants of signal handler typedefs: one that
    -is a typedef of the "correct version" (which I call SignalHandler) and
    -one of which is a typedef of the "incorrect version" (which I call
    -SignalHandlerV).  You might check out the sysincludes.h file to see
    -how it is defining SignalHandlerV and make sure this matches what your
    -OS/Compiler defines in 
    -
    -----------------------------------------
    -6. Omitting shared libraries
    -
    -> Can anyone tell me a way to turn off the creation of the shared libraries
    -> in the ACE build.
    -
    -You can simply comment out the LIB target in the $ACE_ROOT/ace/Makefile
    -or change the BUILD target from
    -
    -BUILD	= $(VLIB) $(VSHLIB) $(SHLIBA)
    -
    -to
    -
    -BUILD	= $(VSHLIB) $(SHLIBA)
    -
    -----------------------------------------
    -7. DCE threading and signal handling
    -
    ->Reading the DCE docs leaves me confused as to how to make everyone
    ->work together in a happy hormonious whole. May basic need is to catch
    ->asynchronous signals so i can release some global resources before
    ->the process exits.
    -
    -You need to spawn a separate thread to handle signals.  As part of
    -your init, do this:
    -	pthread_create(&tid, thread_attr, signal_catcher, NULL);
    -	pthread_detach(&tid);
    -
    -Where signal_catcher is like this:
    -static void *
    -signal_catcher(void *arg)
    -{
    -    static int		catch_sigs[] = {
    -	SIGHUP, SIGINT, SIGQUIT, SIGTERM, SIGCHLD
    -    };
    -    sigset_t		catch_these;
    -    int			i;
    -    error_status_t	st;
    -
    -    for ( ; ; ) {
    -	sigemptyset(&catch_these);
    -	for (i = 0; i < sizeof catch_sigs / sizeof catch_sigs[0]; i++)
    -	    sigaddset(&catch_these, catch_sigs[i]);
    -	i = sigwait(&catch_these);
    -	/* Note continue below, to re-do the loop. */
    -	switch (i) {
    -	default:
    -	    fprintf(stderr, "Caught signal %d.  Exiting.\n", i);
    -	    CLEANUP_AND_EXIT();
    -	    /* NOTREACHED */
    -#if	defined(SIGCHLD)
    -	case SIGCHLD:
    -	    srvrexec__reap();
    -	    continue;
    -#endif	/* defined(SIGCHLD) */
    -	}
    -    }
    -    return NULL;
    -}
    -----------------------------------------
    -8.
    -
    -> I have installed ACE2.15.5 on SunOS 4.1.3 with gcc2.6.0. I run the test program
    -> ---server_test. The static is OK, but error found when I commented out the first
    -> one and uncommented out the second one in the svc.conf file: 
    -> 
    -> #static Svc_Manager "-d -p 3912"
    -> dynamic Remote_Brdcast Service_Object * .shobj/Handle_Broadcast.so:remote_broad
    -> cast "-p 10001"
    -> 
    -> The error goes like this:
    -> 
    -> -----------
    -> jupiter[12] %server_test -d
    -> starting up daemon server_test
    -> opening static service Svc_Manager
    -> did static on Svc_Manager, error = 0
    -> signal signal 1 occurred
    -> beginning reconfiguration at Sat Feb 25 13:40:29 1995
    -> Segmentation fault (core dumped)
    -> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    -
    -My guess is that the code generated by GCC on SunOS 4.x does not
    -correctly initialize static variables from shared libraries.  The
    -SunC++ 4.0.x compiler does this correctly on Solaris 2.x (though I
    -believe that on SunOS 4.x it doesn't work without some extra coaxing).
    -
    -In general, I try to avoid using ACE's explicit dynamic linking
    -mechanisms on SunOS 4.x and GCC.  You can write plenty of interesting
    -and useful code with ACE without using those features.  Those tests
    -are mostly there to illustrate the "proof of concept."
    -----------------------------------------
    -9. 
    -
    -> a) I noticed the default constructor for the reactor does an open w/ defaults.
    ->    Does this mean I need to close it if I wish to re-open it with different
    ->    size and restart values?
    -
    -	No.  With the latest versions of ACE, you can now just call
    -open() with a new size and it will correctly resize the internal
    -tables to fit.
    -
    -> b) What is the usage difference between the normal FD_Set objects 
    ->    (rd/wr/ex_handle_mask_) and the ready FD_Set objects 
    ->    (rd/wr/ex_handle_mask_ready)?
    -
    -	The normal FD_Sets (now called Handle_Set in ACE 3.0.5) holds
    -the "waitable" descriptors (these are the descriptors given to
    -select() or poll()).  In contrast, the ready FD_Sets may be set by
    -Event_Handler subclasses (by called the set_ready() API) to indicate
    -to the Reactor that they want to be redispatched on the next go-round
    -*without* blocking.  If you look at the Reactor code, you'll see that
    -the wait_for() method checks the ready sets first and doesn't block if
    -there are any bits set in those masks.  This features makes it
    -possible for Event_Handlers to control subsequent dispatching policies
    -of the Reactor.
    -
    -> c) What does the positive return value do from an event handler callback:
    ->   -1 detaches the event handler for that mask
    ->    0 does nothing - keeps the event handler registered for that mask
    ->   >0 resets a bit in the current dispatching mask (I think) - does this mean 
    ->    this event will be called again before the current dispatch cycle is done?
    -
    -Almost...  (it's tied in with my description of the ready sets above).
    -It means that once the Reactor finishes cycling through the set of
    -descriptors it got back from select() or poll(), it will redispatch
    -the ready set descriptors before sleeping.
    -
    ->    Without direct access to the bit masks in X, I'm not sure I could emulate
    ->    this activity - what do you think?
    -
    -I'm not sure.  I'm not enough of an X guru.  Maybe someone else on the
    -list knows the answer to this?
    -
    -> d) If I let X do the select blocking, will that have any affect on 
    ->    the Reactor performing signal handling? 
    -
    -	Yes, I think that will cause problems since the Reactor relies
    -on a "handshake" between its Signal_Handler component and its
    -handle_events loop to properly handle signals.
    -
    -> e) Is the Poll method preferred over Select if it is available - why?
    -
    -For systems that implement select() in terms of poll() (e.g., Solaris
    -2.x) then it may be somewhat faster.  Otherwise, it doesn't really
    -matter since (1) they (should) do the same thing and (2) the end user
    -shouldn't notice any change in behavior.
    -
    -----------------------------------------
    -10. 
    -
    -> I would very much like to evaluate/use the ACE Toolkit,
    -> but am limited as to disk space on our system.
    -> What is the total disk space required for a compiled,
    -> usable toolkit?
    -
    -The source code itself is around 2 Meg, uncompressed.  
    -
    -The compiled version of ACE is around 90 Meg compiled with the SunC++
    -4.x compiler (naturally, this will differ with other compilers).
    -However, of this amount, about 40 meg are for the libraries, and
    -another 50 meg are for the test programs.  Naturally, you don't need
    -to keep the test programs compiled.
    -
    -The postscript documentation is around 5 Meg, compressed.
    -
    -----------------------------------------
    -11.
    -
    -> This is regarding the newer release of ACE and pertaining to the library
    -> archive file. My question is, if all the ".o" files are archived into one
    -> single "libACE.a", does it increase the size of the executable program?
    -
    -No.  The use of a *.a file allows the linker to extract out only those
    -*.o files that are actually used by the program.
    -
    -> If it does, then does a large executable program mean possibility of it being 
    -> slower?
    -
    -	No.
    -
    -----------------------------------------
    -12.
    -
    -> What happens if I have several reactors in a process (e.g. in different 
    -> threads)?
    -> 
    -> Programmer 1 decides to register at reactor 1 in his thread 1 a signal handler 
    -> for SIGUSR.
    -> Programmer 2 decides to register at reactor 2 in his thread 2 a signal handler
    -> for SIGUSR.
    -
    -	Naturally, the behavior of this all depends on the semantics
    -of the threads package...  In Solaris 2.x, signal handlers are shared
    -by all threads.  Moreover, the Reactor uses a static table to hold the
    -thread handlers.  Thus, only one of the handler's would be registered
    -(i.e., whichever one was registered second).
    -
    -> Programmer 3 designs the process and decides to have thread 1 and thread 2
    -> running in the same process and also makes use of a third party software library
    -> that internally has also registered a signal handler (not at the reactor) for
    -> SIGUSR.
    -
    -	Now you've got big problems!  This is an example of a
    -limitation with UNIX signal handlers...  In general, it's a bad idea
    -to use signal handlers if you can avoid it.  This is yet another
    -reason why.
    -
    -> When looking into Ace/ACE_wrappers/tests/Reactor/misc/signal_tester.C you
    -> have shown a way to do this by marking the dummy file_descriptor of the
    -> Sig_Handler object ready for reading asynchronously. The handle_input()
    -> routine of Sig_Handler object will then be dispatched synchronously.
    -> But what happens if I have several reactors. 
    -> The asynchronously dispatched
    -> handle_signal() routine does not know via which reactor it has been registered
    -> so in which reactor to modify the dummy file_descriptor.
    -> Is your suggestion to have just one process global reactor in such a case?
    -
    -	Yes, precisely.  I would *strongly* recommend against using
    -several reactors within separate threads within the same process if
    -you are going to be having them handle signals.  Can you use 1
    -reactor and/or have one reactor handle signals within a process?
    -
    -> One thing we want to do is the priorization of Event_Handlers. I.e. in case
    -> of concurrent events the sequence in which the Event_Handler methods will be
    -> activated depends on their priority relative to each other. 
    -> We have two choices:
    -> - complete priorization, which means a high priority Input Event_Handler may
    ->   be activated prior to a lower prioritized Output Event_Handler (and doing
    ->   so violating the 'hardcoded rule' that output must be done prior to input).
    -> - priorization only in categories, which means all Output Event_handler are
    ->   ordered by their priority regardless of priorities for the category of Input
    ->   Event_Handlers. The priority is fixed between the categories, i.e. first
    ->   output then input then out-of-band.
    -> 
    -> Right now I would think that we have to use the second choice if we want to
    -> use the feature of asynchronous output with automatical re-queueing. Am I right
    -> ?
    -
    -	Hum, that's an interesting problem.  It might be better to
    -subclass the Reactor to form a new class called Priority_Reactor.
    -This subclass would override the Reactor's dispatch method and
    -dispatch the event handlers in "priority" order.  I've never done
    -that, but I don't think it would be all that difficult.
    -
    -----------------------------------------
    -13. 
    -
    -> 	Is the Orbix (aka CORBA) version still around?
    -
    -Nope, IONA does not support Orbix-2.X nor Orbix-3.0 anymore (the
    -versions of Orbix that the ACE code was based upon).  Plus we didn't
    -maintain this code for ages, so it probably was broken too.
    -
    -----------------------------------------
    -14. 
    -> We are using your ACE software and ran into a problem which may or may not
    -> be related to the mutex locks.  The question may have more to do with how 
    -> mutex locks should be used.  We had a class which was using your mutex 
    -> lock wrapper.  Each member function of the class acquired the lock before 
    -> processing and released on exiting the function.  Some member functions may 
    -> call other member functions.  The following is an example:
    -> 
    -> class foo {
    -> 
    -> void a()
    -> {
    ->   MT( Mutex_Block m( this->lock_ ));
    -> 
    ->   if( cond )
    ->     b();
    -> }
    -> 
    -> void b()
    -> {
    ->   MT( Mutex_Block m( this->lock_ ));
    -> 
    ->   if( cond )
    ->     a();
    -> }
    -> 
    -> };
    -> 
    -> Is this valid ?  My assumtpion is that the mutex lock is recursive and 
    -> the same thread can acquire the lock multiple times in different member
    -> functions.
    -
    -	Ah, that's a great question since there are subtle and
    -pernicious problems lurking in the approach you are trying above.
    -Basically, Solaris mutex locks are *not* recursive (don't ask why...)
    -Thus, if you want to design an application like the one above you'll
    -need to use one or more of the following patterns:
    -
    -----------------------------------------
    -A. Use recursive mutexes.  Although these are not available in
    -   Solaris directly they are supported in the later versions
    -   of ACE.  You might want to take a look at the latest
    -   version (./gnu/ACE-3.1.9.tar.Z).  It's got lots of new
    -   support for threading and synchronization.  In that case,
    -   you simply do the following:
    -
    -	class Foo 
    -	{
    -	  public:
    -	  void a()
    -	  {
    -	    MT( Guard > m( this->lock_ ));
    -	    b ();
    -	  }
    -
    -	  void b()
    -	  {
    -	    MT( Guard > m( this->lock_ ));
    -	    b_i ();
    -	  }
    -
    -	};
    -
    -   The advantage with this is that it requires almost no
    -   changes to existing code.  The disadvantage is that
    -   recursive locks are just slightly more expensive.
    -
    -B. Have two layers of methods (a) which are public and acquire
    -   the Mutex and then call down to methods in layer (b), which
    -   are private and do all the work.  Methods in layer b assume
    -   that the locks are held.  This avoids the deadlock problem
    -   caused by non-recursive mutexes.  Here's what this approach
    -   looks like (using the more recent ACE class names):
    -
    -	class Foo 
    -	{
    -	  public:
    -	  void b()
    -	  {
    -	    MT( Guard m( this->lock_ ));
    -	    b_i ();
    -	  }
    -
    -	  void b_i()
    -	  {
    -	    if( cond )
    -	      a_i();
    -	  }
    -
    -	  void a_i()
    -	  {
    -	    if( cond )
    -	      b_i();
    -	  }
    -
    -	  void a()
    -	  {
    -	    MT( Guard m( this->lock_ ));
    -	    a_i ();
    -	  }
    -
    -	};
    -
    -    The advantage here is that inline functions can basically
    -    remove all performance overhead.  The disadvantage is that
    -    you need to maintain two sets of interfaces.
    -
    -C. Yet another approach is to release locks when calling
    -   other methods, like this:
    -
    -	class Foo 
    -	{
    -	  public:
    -	  void b()
    -	  {
    -	    MT( Guard m( this->lock_ ));
    -	    m.release ();
    -	    a ();
    -	    m.acquire ();
    -	  }
    -
    -	  void a()
    -	  {
    -	    MT( Guard m( this->lock_ ));
    -	    m.release ();
    -	    b ();
    -	    m.acquire ();
    -	  }
    -
    -	};
    -
    -   The disadvantage with this, of course, is that you
    -   greatly increase your locking overhead.  In addition,
    -   you need to be very careful about introducing race
    -   conditions into the code.  The primary reason for
    -   using this approach is if you need to call back to
    -   code that you don't have any control over (such as
    -   OS I/O routines) and you don't want to hold the 
    -   lock for an indefinite period of time.
    -----------------------------------------
    -	   
    -	BTW, all three of these patterns are used in the ACE Reactor
    -class category.  The Reactor has a number of fairly complex
    -concurrency control and callback issues it must deal with and I've
    -found it useful to use all three of these patterns jointly.
    -
    -	I'd be interested to hear any comments on these approaches.
    -	
    -	Doug
    -----------------------------------------
    -15. 
    -
    -> I am working on Solaris 2.3 and trying to understand how to get around
    -> the problem of trying to open a Socket connection to a remote host that
    -> is "dead".  Of course you get a nice long process block if the socket
    -> is in Blocking mode (TCP lets you know when you can continue - how polite). 
    ->
    -> So how does a non-blocking connect work with respect to using
    -> the Reactor and a SOCK_Stream object to coordinate the opening
    -> of the connection? Do I wait on the OUTPUT event for the FD?
    -> How do I know if the connect worked or possibly timed-out?  Is
    -> this a reliable approach (I read somewhere that this will only
    -> work if the STREAMS module is at the top of the protocol stack
    -> - MAN page I think)?
    -
    -An example of implementing this is in the Gateway sample application
    -in the new ACE.  It's also encapsulated in the Connector<> pattern of
    -the Connection class category in ./libsrc/Connection.  You may want to
    -take a look at those two things for concrete usage examples.
    -
    -However, the basics of getting non-blocking to work are:
    -- set socket to non-blocking
    -- initiate connect() request
    -- if connect() returned 0 you're connected
    -- if connect() returned -1 and errno is EWOULDBLOCK (or EAGAIN, depending  
    -on where you are), then register an event handler for read and write events  
    -on the socket
    -- any other errno value is fatal
    -
    -When an event is returned
    -- no matter which event you get back (read or write), you may have gotten  
    -the event out of error.  Thus, re-attempt the connect() and check to see if  
    -errno is EISCONN (if it's not there's a problem!)
    -- if errno was EISCONN, the connection is ready to go, otherwise you must  
    -handle an error condition
    -
    -If you want to "time out" after a certain period of time, consider  
    -registering for a timer event with Reactor.  If the timer goes off before  
    -the connection succeeds, close down the appropriate socket.
    -
    -> Is using a separate thread to make the connection a better way to avoid
    -> the potentialy long block in the main thread during the connect call?
    -
    -You could do that, but it can all be accomplised in a single process using  
    -the facilities available.
    -----------------------------------------
    -16. 
    -
    -> I was wondering, does the Reactor class have the ability to prioritize 
    -> activity on the registered event handlers?
    -
    -	The default strategy for the Reactor's dispatch routine
    -(Reactor::dispatch) does not prioritize dispatching other than to
    -dispatch callbacks in ascending order from 0 -> maxhandlep1.
    -
    -> We have a requirment to be able to process both real-time, as well as, stored
    -> telemetry and ERMs concurrently.  Real-time needs to be processed at a higher
    -> priority than stored data.  Our design is based on both real-time and stored 
    -> data coming into our process via separate sockets.  
    -
    -	I can think of several ways to do this:
    -	
    -	1. Use dup() or dup2() to organize your sockets such that the
    -	   higher priority sockets come first in the Handle_Sets that
    -	   the Reactor uses to dispatch sockets.  This is pretty easy
    -	   if you don't want to muck with the Reactor code at all.
    -
    -	2. You could subclass Reactor::dispatch() and revise it so
    -	   that it dispatches according to some other criteria that
    -	   you define in order to ensure your prioritization of
    -	   sockets.
    -
    -BTW, I'm not sure what you mean by "real-time" but I assume that you
    -are aware that there is no true "real-time" scheduling for network I/O
    -in Solaris.  However, if by "real-time" you mean "higher priority"
    -then either of the above strategies should work fine.  
    -----------------------------------------
    -17. 
    -
    -> 	I compiled the new ACE 3.2.0 's apps/Gateway. The compiling went
    -> through without any errors. But I could not get it running,  neither single
    -> threaded nor multi-threaded. The cc_config and rt_config files entries are given
    -> below. Also the machine configurations are given below. Does it need some more 
    -> settings or some patch !!??
    -
    -	I believe you are seeing the effects of the dreaded Sun MP bug
    -with non-blocking connects.  The easy work around for now is simply to
    -give the "-b" option to the Gateway::init() routine via the svc.conf
    -file:
    -
    -dynamic Gateway Service_Object *.shobj/Gateway.so:_alloc_gatewayd() active 
    -				"-b -d -c cc_config -f rt_config"
    -
    -If you check line 137 of the Gateway::parse_args() method you'll see
    -what this does.
    -----------------------------------------
    -18.
    -
    -How to get ACE to work with GCC C++ templates.
    -
    -The first and foremost thing to do is to get the latest version of GCC
    -(2.7.2) and also get the template repository patches from
    -
    -ftp://ftp.cygnus.com/pub/g++/gcc-2.7.1-repo.gz
    -
    -This will get the ball rolling...
    -
    -Here is some more info on G++ templates courtesy of Medhi TABATABAI
    -:
    -
    -Where's the Template?
    -=====================
    -
    -   C++ templates are the first language feature to require more
    -intelligence from the environment than one usually finds on a UNIX
    -system.  Somehow the compiler and linker have to make sure that each
    -template instance occurs exactly once in the executable if it is
    -needed, and not at all otherwise.  There are two basic approaches to
    -this problem, which I will refer to as the Borland model and the
    -Cfront model.
    -
    -Borland model
    -     Borland C++ solved the template instantiation problem by adding
    -     the code equivalent of common blocks to their linker; template
    -     instances are emitted in each translation unit that uses them, and
    -     they are collapsed together at run time.  The advantage of this
    -     model is that the linker only has to consider the object files
    -     themselves; there is no external complexity to worry about.  This
    -     disadvantage is that compilation time is increased because the
    -     template code is being compiled repeatedly.  Code written for this
    -     model tends to include definitions of all member templates in the
    -     header file, since they must be seen to be compiled.
    -
    -Cfront model
    -     The AT&T C++ translator, Cfront, solved the template instantiation
    -     problem by creating the notion of a template repository, an
    -     automatically maintained place where template instances are
    -     stored.  As individual object files are built, notes are placed in
    -     the repository to record where templates and potential type
    -     arguments were seen so that the subsequent instantiation step
    -     knows where to find them.  At link time, any needed instances are
    -     generated and linked in.  The advantages of this model are more
    -     optimal compilation speed and the ability to use the system
    -     linker; to implement the Borland model a compiler vendor also
    -     needs to replace the linker.  The disadvantages are vastly
    -     increased complexity, and thus potential for error; theoretically,
    -     this should be just as transparent, but in practice it has been
    -     very difficult to build multiple programs in one directory and one
    -     program in multiple directories using Cfront.  Code written for
    -     this model tends to separate definitions of non-inline member
    -     templates into a separate file, which is magically found by the
    -     link preprocessor when a template needs to be instantiated.
    -
    -   Currently, g++ implements neither automatic model.  The g++ team
    -hopes to have a repository working for 2.7.0.  In the mean time, you
    -have three options for dealing with template instantiations:
    -
    -  1. Do nothing.  Pretend g++ does implement automatic instantiation
    -     management.  Code written for the Borland model will work fine, but
    -     each translation unit will contain instances of each of the
    -     templates it uses.  In a large program, this can lead to an
    -     unacceptable amount of code duplication.
    -
    -  2. Add `#pragma interface' to all files containing template
    -     definitions.  For each of these files, add `#pragma implementation
    -     "FILENAME"' to the top of some `.C' file which `#include's it.
    -     Then compile everything with -fexternal-templates.  The templates
    -     will then only be expanded in the translation unit which
    -     implements them (i.e. has a `#pragma implementation' line for the
    -     file where they live); all other files will use external
    -     references.  If you're lucky, everything should work properly.  If
    -     you get undefined symbol errors, you need to make sure that each
    -     template instance which is used in the program is used in the file
    -     which implements that template.  If you don't have any use for a
    -     particular instance in that file, you can just instantiate it
    -     explicitly, using the syntax from the latest C++ working paper:
    -
    -          template class A;
    -          template ostream& operator << (ostream&, const A&);
    -
    -     This strategy will work with code written for either model.  If
    -     you are using code written for the Cfront model, the file
    -     containing a class template and the file containing its member
    -     templates should be implemented in the same translation unit.
    -
    -     A slight variation on this approach is to use the flag
    -     -falt-external-templates instead; this flag causes template
    -     instances to be emitted in the translation unit that implements
    -     the header where they are first instantiated, rather than the one
    -     which implements the file where the templates are defined.  This
    -     header must be the same in all translation units, or things are
    -     likely to break.
    -
    -     *See Declarations and Definitions in One Header: C++ Interface,
    -     for more discussion of these pragmas.
    -
    -  3. Explicitly instantiate all the template instances you use, and
    -     compile with -fno-implicit-templates.  This is probably your best
    -     bet; it may require more knowledge of exactly which templates you
    -     are using, but it's less mysterious than the previous approach,
    -     and it doesn't require any `#pragma's or other g++-specific code.
    -     You can scatter the instantiations throughout your program, you
    -     can create one big file to do all the instantiations, or you can
    -     create tiny files like
    -
    -          #include "Foo.h"
    -          #include "Foo.cc"
    -          
    -          template class Foo;
    -
    -     for each instance you need, and create a template instantiation
    -     library from those.  I'm partial to the last, but your mileage may
    -     vary.  If you are using Cfront-model code, you can probably get
    -     away with not using -fno-implicit-templates when compiling files
    -     that don't `#include' the member template definitions.
    -
    -4. Placing a function that looks like this near the top of a .C file
    -   that uses any inline template member functions permits proper inlining:
    -
    -   // #ifdef __GNUG__
    -   // This function works around the g++ problem with inline template member
    -   // calls not being inlined ONLY in the first block (in a compilation
    -   // unit) from which they are called.
    -   // This function is inline and is never called, so it does not produce
    -   // any executable code.  The "if" statements avoid compiler warnings about
    -   // unused variables.
    -   inline
    -   void
    -   gcc_inline_template_member_function_instantiator()
    -   {
    -       if ( (List *) 0 );
    -   }
    -   // #endif  // __GNUG__
    -
    -   other prerequisites:
    -   -- All inline template member functions should be defined in
    -      the template class header.  Otherwise, g++ will not inline
    -      nested inline template member function calls.
    -   -- Template .h and .C files should NOT include iostream.h
    -      (and therefore debugging.h).
    -      This is because iostream.h indirectly includes other
    -      GNU headers that have unprotected #pragma interface,
    -      which is incompatible with -fno-implicit-templates and optimal
    -      space savings.
    -   -- inline virtual destructors will not be inlined, unless necessary,
    -      if you want to save every last byte
    -   -- be sure that -Winline is enabled
    -
    -----------------------------------------
    -19.
    -
    -> 	1. when are dynamically loaded objects removed from the Service_Config.
    -
    -The Service Configurator calls dlclose() when a "remove Service_Name"
    -directive is encountered in the svc.conf file (or programmatically
    -when the Service_Config::remove() method is invoked).  Check out the
    -code in ./libsrc/Service_Config/Service_Repository.i and
    -./libsrc/Service_Config/Service_Config.i to see exactly what happens.
    -
    -> 	2. In the Service Configurator, when an item is entered in the svc.conf
    -> 		how dow you know which items will be invoked as threads and 
    -> 		which items are forked. I know that static items are executed 
    -> 		internally. 
    -
    -	No!  It's totally up to the subclass of Service_Object to
    -decide whetehr threading/forking/single-threading is used.  Check out
    -the ./apps/Logger/Service_Configurator_Logger for examples of
    -single-threaded and multi-threaded configuration.
    -----------------------------------------
    -20. 
    -
    -> I have been reading the Service Configurator Logger. I was wondering about 
    -> cleanup of new objects. In the handle_input method for the Acceptor a new
    -> svc_handler is allocated for each new input request and deleted in the 
    -> handle_close. I was wondering how handle close was called when a client who
    -> has created a socket terminates the connection (i.e., when is handle_close
    -> called).
    -
    -handle_close() is automatically called by the Reactor when a
    -handle_input()/handle_output()/etc. method returns -1.  This is the
    -"hook" that instructs the Reactor to call handle_**() and then remove
    -the Event_Handler object from its internal tables.
    -
    -----------------------------------------
    -21. 
    -
    -> How does the Logger know to remove the client socket and the svc_handler object.
    -> Does he recieve an exception. 
    -
    -	No.  when the client terminates the underlying TCP/IP
    -implementation sends a RESET message to the logger host.  This is
    -delivered to the logger process as a 0-sized read().  It then knows to
    -close down.
    -
    -> What I am worried about is a leak. Where by alot of clients connect and 
    -> disconnect and the server does not cleanup correctly. Such as a core dump
    -> from the client where he cannot close correctly.
    -
    -	That's handled by the underlying TCP (assuming it is
    -implemented correctly...).
    -
    -> What I am doing is attempting to convert the logger example into an alarm
    -> manager for remote nodes. In this application a node may be powered down
    -> there by terminating a Logger/Alarm server connection abnormally, this could
    -> leave the Logger with many dangling sockets and allocated svc_handler objects.
    -
    -	If the TCP implementation doesn't handle this correctly then
    -the standard way of dealing with it is to have an Event_Handler use a
    -watchdog timer to periodically "poll" the client to make sure it is
    -still connected.  BTW, PCs tend to have more problems with this than
    -UNIX boxes since when they are turned off the TCP implementation may
    -not be able to send a RESET...
    -----------------------------------------
    -22. 
    -
    -Using templates with Centerline.
    -
    -Centerline uses ptlink to process the C++ templates. ptlink expect the
    -template declarations and definitions (app.h and app.C) to reside in
    -the same directory. This works fine for the ACE hierarchy since
    -everything is a link to the appropriate src directory (include/*.[hi]
    ---> ../src/). When a users of the ACE distribution attempts to include
    -the ACE classes in an existing application hierarchy this problem will
    -arise if ptlink is used.
    -
    -The solution is to create a link to the declaration file from the
    -definition file directory and use the "-I" to point to the definition
    -directory.
    -
    -----------------------------------------
    -
    -23. 
    -
    -> When I try to compile $ACE_ROOT/src/Message_Queue.C on a Solaris
    -> 5.3 system using SUNPro CC 4.0, the compiler aborts with a Signal 10
    -> (Bus Error).  Our copy of CC 4.0 is over a year old and I do not
    -> know if any patches or upgrades exist for it.  If they do, then we
    -> have not applied them to our compiler.
    -
    -	Several other people have run across this as well.  It turns
    -out that there is a bug in the Sun 4.0.0 C++ compiler that will get a
    -bus error when -g is used.  If you compilg Message_Queue.C *without*
    --g then it works fine.  The later versions of SunC++ don't have this
    -bug.  I'd recommend that you upgrade as soon as possible.
    -
    -----------------------------------------
    -
    -24. 
    -
    -> I have added a dynamic service to the Service Configurator. This new service
    -> fails on the load because it uses application libraries that are not shared 
    -> object libraries (i.e., objects in libApp.a). I am assuming from the error
    -> message that the problem is the mix match of shared and non-shared objects.
    -
    -	Right, exactly.
    -
    -> I was wondering if there is an easy way to add static services to the 
    -> Service Configurator. The example directory listing static service is
    -> very tightly coupled with the Service_Config object. Is there another
    -> way of adding static services.
    -
    -	Sure, that's easy.  The best way to do this is to use the
    -interfaces of the Service_Respository class to configure static
    -services into the Service_Config.  A good example of how to do this is
    -in Service_Config.[Chi]:
    -
    -int
    -Service_Config::load_defaults (void)
    -{
    -  for (Static_Svc_Descriptor *sl = Service_Config::service_list_; sl->name_ != 0; sl++)
    -    {
    -      Service_Type *stp = ace_create_service_type (sl->name_, sl->type_, 
    -						   (const void *) (*sl->alloc_)(),
    -						   sl->flags_);
    -      if (stp == 0)
    -	continue;
    -
    -      const Service_Record *sr = new Service_Record (sl->name_, stp, 0, sl->active_);
    -
    -      if (Service_Config::svc_rep->insert (sr) == -1)
    -	return -1;
    -    }
    -  return 0;
    -}
    -
    -----------------------------------------
    -25. 
    -
    -> 8. Do you have examples of the SYNC/ASYNC pattern?
    -
    -	Yes.  Check out the following:
    -	
    -	1. The latest version of ./apps/Gateway/Gateway has
    -	   an example of this when you compile with the USE_OUTPUT_MT 
    -	   flag.  In this case, the Reactor performs the "Async"
    -	   processing, which multiplexes all incoming messages from peers
    -	   arriving on Input_Channels.  These messages are then queued
    -	   up at the appropriate Output_Channels.  Each Output_Channel
    -	   runs in a separate thread, performing the "Sync"
    -	   processing.
    -	   
    -	2. Also, the latest version of the OOCP-tutorial4.ps.gz
    -	   file available from wuarchive.wustl.edu in the
    -	   directory /languages/c++/ACE/ACE-documentation shows
    -	   an example of using the Half-Sync/Half-Async pattern
    -	   to build an Image Server.  I'm using this as an
    -	   example in my tutorials these days.
    -
    -----------------------------------------
    -26.
    -
    -> We had a discussion about something we saw in the new ACE code.
    -> I thing there was a member function of a class that was doing a 
    -> "delete this".  Is this safe?
    -
    -In general it is safe as long as (1) the object has been allocated
    -dynamically off the heap and (2) you don't try to access the object
    -after it has been deleted.  You'll note that I tend to use this idiom
    -in places where an object is registered with the Reactor, which must
    -then must ensure the object cleans itself up when handle_close() is
    -called.  Note that to ensure (1) I try to declare the destructor
    -"private" or "protected" so that the object must be allocated off the
    -heap (some compilers have a problem with this, so I may not be as
    -consistent as I ought to...).
    -
    -----------------------------------------
    -27. 
    -
    -> 5. What is the correct way for building a modified ACE library?
    -> 	Changing in "libsrc" or in "include" directory?
    -> 	When I make a complete new directory, how can I get introduced
    -> 	the dependencies within my new makefile, can you give a short hint?
    -
    -Sure, no problem.  For instance, here's what I did tonight when I
    -added the new Thread_Specific.[hiC] files to ACE:
    -
    -	1. Created three new files Thread_Specific.[hiC] in
    -	   ./libsrc/Threads. 
    -
    -	2. cd'd to ../../include/ace and did a
    -	
    -	   % ln -s ../../libsrc/Threads/Thread_Specific.[hi] .
    -	   
    -	3. cd'd to ../../src and did a 	   
    -
    -	   % ln -s ../../libsrc/Threads/Thread_Specific.C .
    -
    -	4. then I did
    -	
    -	   % make depend
    -
    -	   on the ./src directory, which updated the dependencies. 
    -
    -----------------------------------------
    -28. The following is from Neil B. Cohen (nbc@metsci.com), who is
    -    writing about how to work around problems he's found with HP/UX.
    -
    -I've been trying to compile the latest beta (3.2.9) on an HP running
    -HPUX9.05 for the past week or so. I've had problems with templates up
    -and down the line. I finally discovered (after some discussions with
    -the HP support people) that they have made numerous changes to their
    -C++ compiler recently to fix problems with templates and
    -exceptions. If you are trying to compile ACE under HPUX with anything
    -less than version 3.70 of the HP compiler, you may have serious
    -problems (we were using v3.50 which came with the machine when we
    -bought it a few months ago).
    -
    -Also, unlike earlier ACE versions, I was forced to add the following
    -line to the rules.lib.GNU file to "close" the library - ie. force the
    -various template files to be instantiated and linked to the ACE
    -library itself. I don't know if this is necessary, or the only way to
    -make things work, but it seems to do the job for my system.
    -
    -in rules.lib.GNU...
    -
    -$(VLIB): $(VOBJS)
    -    - CC -pts -pth -ptb -ptv -I$(ACE_ROOT)/include $(VOBJS)
    -    $(AR) $(ARFLAGS) $@ $? ./ptrepository/*.o
    -    -$(RANLIB) $@
    -    -chmod a+r $@
    -
    -I added the CC line, and added the "./ptrepository/*.o" to the $(AR)
    -cmd.  Sun has an -xar option, I believe that does something similar to
    -this.  Also - note that I'm not sure that the "-ptb" option is
    -necessary. I added that before we upgraded the compiler, so it may not
    -be needed now...
    -
    -----------------------------------------
    -29. 
    -
    -> I just ran my program with Purify, and it is telling me that there
    -> is at least one large (~4k) memory leak in
    -> ACE_Thread_Specific.  This may or may not be serious,
    -> but it is probably worth looking into.
    -
    -Right, that's ok.  This is data that's allocated on a "per-thread"
    -basis the first time a thread makes a call using the LM_ERROR or
    -LM_DEBUG macros.  The data isn't freed-up until the thread exits.
    -
    -----------------------------------------
    -
    -30. 
    -
    ->     In my trying to use the Reactor pattern for my application I
    -> noticed that I had to couple my eventHandler derived objects with a
    -> specific IPC_SAP mechanism. To use some of your own examples your
    -> Client_Stream object contains a TLI_Stream object to use in data
    -> transfer. My application calls for determining the communication
    -> mechanism at run time. To do this my eventHandler must be able to
    -> create the appropriate IPC_Stream object at run time and use its
    -> methods through a super class casting. The problem is that there is no
    -> super class with the virtual methods for send, recv, etc. To solve my
    -> problem I will create that super class and have the TLI ( as well as
    -> other wrapper objects) inherit from it instead of IPC_SAP. My question
    -> is I am suspicious of why ACE wasn't designed with that in mind? Is my
    -> application that unique ? or is there a better way to do this that I
    -> am not aware of ?  Your help in this matter will be much appreciated.
    -
    -ACE was developed using static binding for IPC_SAP in order to
    -emphasize speed of execution over dynamic flexibility *in the core
    -infrastructure*.  To do otherwise would have penalized the performance
    -of *all* applications in order to handle the relatively infrequent
    -case where you want to be able to swap mechanisms at run-time.
    -
    -Since it is straightforward to create an abstract class like the one
    -you describe above I decided to make this a "layered" service rather
    -than use this mechanism in the core of ACE.
    -
    -BTW, I would not modify TLI_SAP and SOCK_SAP to inherit from a new
    -class. Instead, I would use the Bridge and Adapter patterns from the
    -"Gang of Four" patterns catalog and do something like this:
    -
    -----------------------------------------
    -// Abstract base class
    -class ACE_IPC_Stream
    -{
    -public:
    -	virtual ssize_t recv (void *buf, size_t bytes) = 0;
    -	virtual ssize_t send (const void *buf, size_t bytes) = 0;
    -	virtual ACE_HANDLE get_handle (void) const = 0;
    -	// ...
    -};
    -----------------------------------------
    -
    -and then create new classes like 
    -
    -----------------------------------------
    -template 
    -class ACE_IPC_Stream_T : public ACE_IPC_Stream
    -{
    -public:
    -	virtual ssize_t recv (void *buf, size_t bytes)
    -	{
    -		return this->ipc_.recv (buf, bytes);
    -	}
    -
    -	virtual ssize_t send (const void *buf, size_t bytes)
    -	{
    -		return this->ipc_.send (buf, bytes);
    -	}
    -
    -	virtual ACE_HANDLE get_handle (void)
    -	{
    -		return this->ipc_.get_handle ();
    -	}
    -	// ...
    -
    -private:
    -	IPC ipc_;
    -	// Target of delegation 
    -	// (e.g., ACE_SOCK_Stream or ACE_TLI_Stream).
    -}
    -----------------------------------------
    -
    -Then you could write code that operated on ACE_SAP *'s to get a
    -generic interface, but that reused existing code like SOCK_SAP and
    -TLI_SAP, e.g.,
    -
    -----------------------------------------
    -class My_Event_Handler : public ACE_Event_Handler
    -{
    -public:
    -	My_Event_Handler (void) {
    -		// Figure out which IPC mechanism to use somehow:
    -		
    -		if (use_tli)
    -			this->my_ipc_ = new ACE_SAP_IPC;
    -		else if (use_sockets)
    -			this->my_ipc_ = new ACE_SAP_IPC;
    -		else
    -			...
    -	}
    -
    -private:
    -	ACE_IPC_Stream *my_ipc_;
    -};
    -----------------------------------------
    -
    -There are obviously details left out here, but this is the general idea.
    -
    -----------------------------------------
    -31. 
    -
    -> I was trying to view your 'Writting example applications in CORBA' article
    -> /tutorial using ghostview but the .ps file seems to be corrupted ( I tried to
    -> ftp it more than once). Any help would be much appreciated.
    -
    -There are two solutions to this problem (which seems to be caused by a
    -weird interaction between ghostview and the "psnup" program I use to
    -generate the slides 4-up on a page):
    -
    -	1. If you want to print them or view them 1-up on a page you
    -	   can edit the postscript file and remove the first 551
    -	   lines or so (which are generated by the psnup script).
    -	   This will cause the document to be printed 1-up rather than
    -	   4-up.
    -
    -	2. You can try to print the 4-up file on a postscript printer. 
    -	   Believe it or not, this typically works, even though ghostview
    -	   can't handle it!
    -
    -----------------------------------------
    -32.
    -
    -> We would like to use the Reactor class as a static member on some of
    -> our classes (one per process) so that we can see and use the Reactor
    -> witnin each process on a global level.  We are using it to set
    -> timers several levels down in our class trees and don't want to pass
    -> a pointer to it through all of our constructors.  My question is:
    -> are there any static initialization dependencies that you know of
    -> when using the default "do nothing" constructor of the Reactor that
    -> could prevent use from using it as a static member variable?  Thanks
    -> for any advice on this issue.
    -
    -The only problems you'll have are the typical ones about "order of
    -initialization" of statics in separate files.  You'll also have to
    -live with the default size of the I/O handler table, which probably
    -isn't a problem since the max is something like 1024 or so.
    -
    -BTW, I solve this problem in ACE via the Service_Config::reactor,
    -which is a static *pointer* to a Reactor.  If you really wanted to
    -make this work nicely, you could use the Singleton pattern from the
    -"Gang of Four" patterns catalog.  That should solve your problem even
    -more elegantly!
    -
    -----------------------------------------
    -33. 
    -> I just got the ACE-3.3 version and am trying it on the HP-UX.
    -> I run into a small problem while cloning the directories that
    -> might be worth fixing.
    -> 
    -> I made a directory called ACE_WRAPPERS/HP-UXA.09.05-g1, cd to it
    -> and run "make -f ../Makefile clone".  when I look in src, I have:
    -> Acceptor.C@ -> ../libsrc/Connection/Acceptor.C
    -> 
    -> However, ../libsrc does not exist.  It is not one of the CLONE
    -> variables in ACE_WRAPPERS/Makefile.  I don't think you'd want to
    -> clone libsrc too, since its files don't change.
    -
    -I think you can solve this problem as follows:
    -
    -% cd ACE_WRAPPERS
    -% setenv ACE_ROOT $cwd
    -% cd HP-UXA.09.05-g1
    -% make -f ../Makefile clone
    -% setenv ACE_ROOT $cwd
    -% make
    -
    -That should build the links correctly since they'll point to the
    -absolute, rather than relative, pathnames!
    -
    -----------------------------------------
    -34.
    -
    -> Our quality personal has asked me the following questions for which
    -> I think you are the right guy for answering that:
    -
    -> o How long is ACE used in industrial products?
    -
    -It was first used at Ericsson starting in the fall of 1992, so that
    -makes it about 3 years now.
    -
    -> o What are reference projects comparable to ours that use ACE?
    -
    -The ones I have directly worked with include:
    -
    -Motorola -- satellite communication control
    -Kodak Health Imaging Systems -- enterprise medical imaging
    -Siemens -- enterprise medical imaging
    -Ericsson/GE Mobile Communications -- telecommunication switch management
    -Bellcore -- ATM switch signal software
    -
    -In addition, there are probably about 100 or more other companies that
    -have used ACE in commercial products.  The current mailing list has
    -about 300 people from about 230 different companies and universities.
    -If you'd like additional info, please let me know.
    -
    -> o How many persons have contributed on testing and writing error
    -> reports for ACE?
    -
    -Around 60 or so.  All the contributors are listed by name and email
    -address at the end of the README file distributed with the ACE release.
    -
    -> o How many bug fixes have been made since ACE was public domain?
    -
    -All information related to bug fixes is available in the ChangeLog
    -file distributed with the ACE release (I could count these for you if
    -you need that level of detail).
    -
    -> o How many literature is there on ACE?
    -
    -All articles published about ACE are referenced in the BIBLIOGRAPHY
    -file in the top-level directory of ACE.
    -
    -----------------------------------------
    -
    -35.
    -
    -> We are currently evaluating ACE for use on a new telecom switch.
    -> Many of us like ACE but are having trouble convincing some team
    -> members that wrappers are better than using the direct Unix
    -> system calls.
    -
    -> I have read your papers that came with ACE, but was wondering if there
    -> are other papers that address the benefits (or problems) of wrappers?
    -
    -This topic has been discussed in other places, most notably the book
    -by Erich Gamma and Richard Helm and Ralph Johnson and John Vlissides
    -called "Design Patterns: Elements of Reusable Object-Oriented
    -Software" (Addison-Wesley, 1994), where it is described in terms of
    -the "Adapter" pattern.
    -
    -Very briefly, there are several key reasons why you should *not* use
    -UNIX system calls directly (regardless of whether you use ACE or not).
    -
    -1. Portability -- 
    -
    -   	Unless you plan to develop code on only 1 UNIX platform (and
    -   	you never plan to upgrade from that platform as it goes
    -   	through new releases of the OS) you'll run across many, many
    -   	non-portable features.   It's beyond the scope of this
    -        FAQ to name them all, but just take a look at ACE sometime
    -        and you'll see all the #ifdefs I've had to add to deal with
    -	non-compatible OSs and compilers.  Most of these are centralized
    -	in one place in ACE (in the ace/OS.*files), but it took a lot
    -	of work to factor this out.  By using wrappers, you can avoid
    -	most of this problem in the bulk of your application code
    -	and avoid revisiting all of these issues yourself.
    -
    -        In addition, ACE is now ported to other platforms (e.g.,
    -        Windows NT and Windows 95).  If you want to write code that
    -        is portable across platforms, wrappers are a good way to
    -        accomplish this. 
    -
    -2. Ease of programming --
    -
    -	I'd go as far as to say that anyone who wants to program
    -   	applications using C-level APIs like sockets or TLI is not
    -   	serious about developing industrial strength, robust, and easy
    -   	to maintain software.  Sockets and TLI are *incredibly*
    -   	error-prone and tedious to use, in addition to being
    -   	non-portable.  I've got a paper that discusses this in detail
    -	at URL http://www.cs.wustl.edu/~schmidt/PDF/COOTS-95.pdf
    -	
    -3. Incorporation with higher-level patterns and programming methods -- 
    -
    -	Here's where the Adapter pattern stuff really pays
    -	off.  For example, by making all the UNIX network
    -	programming interfaces and synchronization mechanisms
    -	have the same API I can write very powerful higher-level
    -	patterns (e.g., Connector and Acceptor) that generalize
    -	over these mechanisms.  For proof of this, take a look
    -	at the ./tests/Connection/non_blocking directory
    -	in the latest ACE-beta.tar.gz at wuarchive.wustl.edu
    -	in the /languages/c++/ACE directory.  It implements
    -	the same exact program that can be parameterized
    -	with sockets, TLI, and STREAM pipes *without*
    -	modifying any application source code.  It is 
    -	literally impossible to do this without wrappers.
    -
    -----------------------------------------
    -36.
    -
    -> How can I use a kind of "Reactor" in such a way that a reading
    -> thread can notice the arrival of new data on several shared memory
    -> areas ?
    -
    -Ah, that is a tricky issue!  The underlying problem is that UNIX is
    -inconsistent with respect to the ability to "wait" on different
    -sources of events.  In this case, Windows NT is much more consistent
    -(but it has its own set of problems...).
    -
    -> Poll, Select and Reactor (so far I read) assume that file
    -> descriptors are present, which is not the case with shared memory.
    -
    -That's correct (though to be more precise, the Reactor can also deal
    -with signals, as I discuss below).  
    -
    -> Is there a common and efficient way to deal with that kind of
    -> situation, or do I have to insert extra ipc mechanisms (based on
    -> descriptors) ?
    -
    -There are several solutions:
    -
    -1. Use the Reactor's signal handling capability (see the
    -   ./tests/Reactor/misc/signal_tester.C for an example)
    -   and have the process/thread that writes to shared 
    -   data send a signal to the reader process(es).  The
    -   disadvantage of this is that your code needs to 
    -   be signal-safe now...
    -
    -2. Use a combination of SPIPE_Streams and the Reactor
    -   to implement a simple "notification protocol," e.g.,
    -   the receiver process has an Event_Handler with a
    -   SPIPE_Stream in it that can be notified when the
    -   sender process writes data to shared memory.
    -   The disadvantage here is that there's an extra
    -   trip through the kernel, though the overhead
    -   is very small since you only need to send 1 byte.
    -
    -3. Use threads and either bypass the Reactor altogether
    -   or integrate the threads with the Reactor using its
    -   Reactor::notify() mechanism (see the 
    -   ./tests/Reactor/misc/notification.C file for an
    -   example of how Reactor::notify() works).  The
    -   disadvantage of this approach is that it won't
    -   work for platforms that lack threads.
    -
    -----------------------------------------
    -37.
    -
    -> What do you think about wrapping communication methodologies in C++ streams?
    -> What I mean is having defining a stream and extractor/insertor functions
    -> which the underlying implementation reads/writes on comm mechanisms instead of
    -> files.  I would think this to be a very general interface for all comms
    -> implementations.  All user code would look the same, but the underlying stream
    -> implementations would be different.  Whether the stream functionality would
    -> be defined by the stream itself (eg tcpstream) or with manipulators
    -> (eg commstream cs; cs << tcp;) is up for grabs in my mind.
    -> 
    -> Anyhow, I was wondering your input...
    -
    -That technique has been used for a long time.  In fact, there are
    -several freely available versions of iostreams that do this and
    -RogueWave also sells a new product (Net.h++) that does this.  I think
    -this approach is fine for simple applications.
    -
    -However, it doesn't really work well if you need to write
    -sophisticated distributed applications that must use features like
    -non-blocking I/O, concurrency, or that must be highly robust against
    -the types of errors that occur in a distributed system.
    -
    -For these kinds of systems you either need some type of ORB, or you
    -need to write the apps with lower-level C++ wrappers like the ones
    -provided by ACE.
    -
    -----------------------------------------
    -
    -38.
    -
    -> What is the difference between cont() and next() in an ACE_Message_Block?
    -
    -Ah, good question.  cont() gives you a pointer to the next
    -Message_Block in a chain of Message_Block fragments that all belong to
    -the same logical message.  In contrast, next() (and prev()) return
    -pointers to the next (and previous) Message_Block in the doubly linked
    -list of Message_Blocks on a Message_Queue.  
    -
    -BTW, this is *exactly* the same structure as in System V Streams...
    -
    -> Which would I use if I wanted to add a header and a trailer, each stored in
    -> ACE_Message_Blocks of their own, to another ACE_Message_Block?
    -
    -You should use cont() for that.  Does that make sense?
    -----------------------------------------
    -
    -39.
    -
    -> I think that your site is cool, but it's being a terrible tease in
    -> that I really want to read the contents, but don't know anything
    -> about x-gzip formatting.  I'm running Netscape 2.0 under MS Windows
    -> NT.
    -
    -To view PostScript files under Win32 you will need a PostScript 
    -viewer such as GSview.  You can find GSview and Ghostscript (which is
    -needed to run GSview) at http://www.cs.wisc.edu/~ghost/.  
    -
    -It seems that both Netscape and Internet Explorer mangles the names 
    -of downloaded files to reflect their content type, so *.ps.gz files 
    -are saved as *_ps.ps instead.  Fortunately, GSview as of version 2.2
    -supports gzip compressed postscript.  When set up as a viewer for
    -Postscript files, files with mangled names can be viewed by GSview 
    -without any preprocessing.
    -
    -----------------------------------------
    -
    -40. 
    -
    -> What I am doing is
    -> 1. Making an ACE_SOCK_Dgram and let it choose the next available port number.
    -> 2. Making a message that will be broadcasted to X number of servers. This
    ->    message has a port number which the server will use to send its reply.
    -> 3. Broadcast the message to a fixed port number.
    -> 4. Wait for replies from the servers.
    -> 
    -> 
    -> It looks like I need "ACE::bind_port" to return the port number that
    -> it picked and "ACE_SOCK_Dgram::shared_open" will need it store the
    -> port number so I could call some function like
    -> ACE_SOCK_Dgram::get_port_number or it would need to return the port
    -> number instead of the handle(I could always call
    -> ACE_SOCK_Dgram::get_handle if I needed the handle).
    -> 
    -> Is there I way to get the port number that I have missed?
    -
    -Sure, can't you just do this:
    -
    -// Defaults to all "zeros", so bind will pick port.
    -ACE_INET_Addr dg_addr;
    -
    -ACE_SOCK_Dgram dg;
    -
    -dg.open (dg_addr);
    -
    -dg.get_local_addr (dg_addr);
    -
    -dg_addr.get_port_number ();
    -
    -----------------------------------------
    -
    -41. How can you rename a core file?
    -
    -new_disposition.sa_handler = &Handle_Coredump_Signal;
    -sigemptyset(&new_disposition.sa_mask);
    -sigaddset(&new_disposition.sa_mask,SIGCHLD);
    -new_disposition.sa_flags = 0;
    -sigaction(SIGSEGV,&new_disposition,&old_disposition);
    -
    -*****************
    -
    -void
    -Handle_Coredump_Signal(void)
    -{
    -    int   status;
    -    pid_t child;
    -    char  new_core_name[64];
    -    
    -    if(0 == (child = fork()))
    -    {
    -	abort();
    -    }
    -    else
    -    {
    -	if(-1 == waitpid(child,&status,NULL))
    -	{
    -	    exit(-1);
    -	}
    -	sprintf(new_core_name,"core_%d",getpid());
    -	rename("core",new_core_name);
    -	exit(0);
    -    }
    -}
    -
    -----------------------------------------
    -
    -42. 
    -
    -> I have seen 2 different inlining policies in ACE
    -> 
    -> 1) The .i file is included unconditionally by both the .h and .C file
    ->    and all functions in the .i file carry the "inline" keyword.
    -
    -Right.  Those are for cases where I *always* want to inline those
    -methods.  I do this mostly for very short wrapper methods (e.g.,
    -read() or write()) that are likely to be on the "fast path" of an
    -application.
    -
    -> 2) The .i file is included by the .h file ONLY if __INLINE__ is defined
    ->    for the compile.  This causes the functions in the .i file to be
    ->    compiled as inline functions (INLINE translates to inline in this case).
    ->    If __INLINE__ is not defined, the .i file is only included by the .C
    ->    file and the functions do NOT carry the "inline" keyword.
    -
    -I do this for cases where it's really not essential to have those
    -methods inline, but some users might want to compile ACE that was if
    -they want to eliminate all the wrapper function-call overhead.  For
    -instance, I'll typically do this when I'm running benchmarks.
    -
    -----------------------------------------
    -
    -43. Integrating ACE and CORBA
    -
    -> Our goal is to implement a CORBA-II compliant application.  I am
    -> trying to conceptually visualize the applicability to ACE to this
    -> attempt (which we're pretty excited about), and I was hoping you'd
    -> offer any opinions / observations that you might have.
    -
    -We've successfully integrated ACE with several implementations of
    -CORBA (in particular Orbix 1.3 and 2.0) and used it in a number of
    -commercial applications.  In these systems, we use ACE for a number of
    -tasks, including the following:
    -
    -1. Intra-application concurrency control, threading, and
    -   synchronization via the ACE_Thread_Manager and Synch* classes. 
    -   
    -2. Dynamic linking of services via the ACE_Service_Config.
    -
    -3. Integration of event loops via the ACE_Reactor.
    -
    -4. Management of shared memory via ACE_Malloc.
    -
    -5. High-performance network I/O via the ACE_SOCK* wrappers.
    -
    -plus many more.
    -
    -You can find out more info about the ACE/CORBA integration and the
    -performance issues associated with it in the following paper:
    -
    -http://www.cs.wustl.edu/~schmidt/PDF/COOTS-96.pdf
    -
    -----------------------------------------
    -
    -44. 
    -
    -> Can the Reactor's event loop be called recursively?
    -
    -This is not advisable.  The Reactor's dispatch() method is not
    -reentrant (though it is thread-safe) since it maintains state about
    -the active descriptors it is iterating over.  Therefore, depending on
    -the descriptors you're selecting on, you could end up with spurious
    -handle_*() callbacks if you make nested calls to the
    -Reactor::handle_events() method.
    -
    -> For example, if I have a program that sets up some event handlers
    -> and then calls, in an infinite loop, ACE_Reactor::handle_events().
    -> Can one of the event handlers call handle_events() again if it needs
    -> to block, while allowing other event handlers a chance to run?
    -
    -I'm not sure if this is really a good idea, even if the Reactor were
    -reentrant.  In particular, what good does it do for one Event_Handler
    -to "block" by calling handle_events() again?  The event the handler is
    -waiting for will likely be dispatched by the nested handle_events()
    -call!  So when you returned back from the nested call to
    -handle_events() it will be tricky to know what state you were in and
    -how to proceed.
    -
    -Here's how I design my single-threaded systems that have to deal with
    -this:
    -
    -  	1. I use a single event loop based on the Reactor, which acts
    -	   a cooperative multi-tasking scheduler/dispatcher.
    -	   
    -	2. I then program all Event_Handler's as non-blocking I/O
    -	   objects.  This is straightforward to do for both input and
    -	   output using the ACE_Reactor::schedule_wakeup() and
    -	   ACE_Reactor::cancel_wakeup() methods (available with the
    -	   latest version of ACE).  
    -	   
    -	3. Then, whenever an Event_Handler must block on I/O, it 
    -	   queues up its state on an ACE_Message_Queue, calls
    -	   ACE_Reactor::schedule_wakeup(), and returns to the 
    -	   main event loop so that other Event_Handlers can be
    -	   dispatched.  When the I/O is ready, the Reactor will
    -	   call back to the appropriate handle_* method, which
    -	   can pick up the state it left in the Message_Queue and
    -	   continue. 
    -
    -There are a number of places to find more information on this sort of
    -design:
    -
    -	1. $ACE_ROOT/apps/Gateway/Gateway/Channel.cpp --
    -	   This Gateway application example shows the C++ code.
    -
    -	2. http://www.cs.wustl.edu/~schmidt/PDF/TAPOS-00.pdf --
    -	   This paper describes the underlying patterns.
    -
    -	3. http://www.cs.wustl.edu/~schmidt/PDF/OONP-tutorial4.pdf
    -	   -- This tutorial explains the source code and 
    -	   the patterns.
    -
    -BTW, I'll be describing patterns for this type of design challenge in
    -my tutorial at USENIX COOTS in June.  Please check out
    -http://www.cs.wustl.edu/~schmidt/COOTS-96.html for more info.
    -
    -----------------------------------------
    -
    -45. 
    -
    ->   In one of my programs, a process needs to receive input from
    -> multiple input sources. One of the input sources is a file
    -> descriptor while another is a message queue. Is there a clean way to
    -> integrate this a message queue source into the Reactor class so that
    -> both inputs are handled uniformly?
    -
    -Do you have multiple threads on your platform?  If not, then life will
    -be *very* tough and you'll basically have to use multiple processes to
    -do what you're trying to do.  There is *no* portable way to combine
    -System V message queues and file descriptors on UNIX, unfortunately.
    -
    -If you do have threads, the easiest thing to do is to have a thread
    -reading the message queue and redirecting the messages into the
    -Reactor via its notify() method.  
    -
    -Please take a look at the program called
    -
    -examples/Reactor/Misc/notification.cpp
    -
    -for an example.
    -
    -----------------------------------------
    -
    -46. 
    -
    -> I'm writing a program to find out the address for a socket.  The
    -> idea is that we open an ACE_Acceptor (and will eventually perform
    -> accept() on it.)  Before we can do that we need to find out the
    -> address of the ACE_Acceptor so that we can publish it (for others to
    -> be able to connect to it.)  The trouble is that the call
    -> ACE_INET_Addr::get_host_name () prints "localhost" as the host name
    -> while I would like to principal host name to be printed instead.
    -
    -All ACE_INET_Addr::get_host_name() is doing is calling
    -ACE_OS::gethostbyaddr(), which in turn will call the socket
    -gethostbyaddr() function.  I suspect that what you should do is
    -something like the following:
    -
    -ACE_Acceptor listener (ACE_Addr::sap_any);
    -
    -ACE_INET_Addr addr;
    -
    -listener.get_local_addr (addr);
    -
    -char *host = addr.get_host_name ();
    -
    -if (::strcmp (host, "localhost") == 0)
    -{
    -  char name[MAXHOSTNAMELEN];
    -  ACE_OS::hostname (name, sizeof name);
    -  cerr << name << endl;
    -}
    -else
    -  cerr << host << endl;
    -
    -----------------------------------------
    -
    -47. 
    -
    -> Could you please point me to stuff dealing with asynchronous cross
    -> platform socket calls. I want to use non blocking socket calls on
    -> both UNIX and NT.
    -
    -Sure, no problem.  Take a look at the
    -
    -./examples/Connection/non_blocking/
    -
    -directory.  There are a number of examples there.  In addition, there
    -are examples of non-blocking connections in 
    -
    -./examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
    -
    -The code that actually enables the non-blocking socket I/O is in
    -ace/IPC_SAP.cpp
    -
    -----------------------------------------
    -
    -48.
    -
    -> Is ACE exception-safe?  If I throw an exception out of event 
    -> handler, will the Reactor code clean itself?
    -
    -Yes, that should be ok.  In general, the two things to watch out for
    -with exceptions are:
    -
    -	1. Memory leaks -- There shouldn't be any memory leaks internally
    -	   to the Reactor since it doesn't allocate any memory when 
    -	   dispatching event handlers.
    -	  
    -	2. Locks -- In the MT_SAFE version of ACE, the Reactor acquires
    -	   an internal lock before dispatching Event_Handler callbacks.
    -	   However, this lock is controlled by an ACE_Guard, whose
    -	   destructor will release the lock if exceptions are thrown
    -	   from an Event_Handler.
    -
    -----------------------------------------
    -
    -49.
    -
    ->   I am building a Shared memory manager object using MMAP and MALLOC
    -> basically as:
    -> 
    -> typedef ACE_Malloc SHMALLOC;
    -> 
    -> I noticed that the ACE_MMAP_Memory_Pool class provides for the users
    -> to specify a Semaphore key. However, once I use it via the
    -> ACE_Malloc<..>::ACE_Malloc(const char* poolname) constructor, I lose
    -> this option. 
    -
    -Yes, that is correct.  That design decision was made to keep a clean
    -interface that will work for all the various types of memory pools.
    -
    -> Is there any recommended way to specialize ACE classes to allow this
    -> key to be overridden?
    -
    -Yes indeed, you just create a new subclass (e.g., class
    -My_Memory_Pool) that inherits from ACE_MMAP_Memory_Pool and then you
    -pass in the appropriate key to the constructor of ACE_MMAP_Memory_Pool
    -in the constructor of My_Memory_Pool.  Then you just say:
    -
    -typedef ACE_Malloc SHMALLOC;
    -
    -Please check out the file:
    -
    -examples/Shared_Malloc/Malloc.cpp 
    -
    -which illustrates more or less how to do this.
    -
    -----------------------------------------
    -
    -50.
    -
    -> What is the best way to turn on TRACE output in ACE.  I commented
    -> out the #define ACE_NTRACE 1 in config.h and rebuilt ACE and the
    -> examples.
    -
    -The best way to do this is to say
    -
    -#define ACE_NTRACE 0
    -
    -in config.h.
    -
    -> When I run the CPP-inserver example in examples/IPC_SAP/SOCK_SAP, I
    -> get some trace output but not everything I would expect to see.
    -
    -Can you please let me know what you'd expect to see that you're not
    -seeing?  Some of the ACE_TRACE macros for the lower-level ACE methods
    -are commented out to avoid problems with infinite recursion (i.e.,
    -tracing the ACE_Trace calls...).  I haven't had a chance to go over
    -all of these indepth, but I know that it should be possible to turn
    -many of them back on.
    -
    -> It would be nice to have a runtime option for turning trace on and
    -> off.
    -
    -There already is.  In fact, there are two ways to do it.
    -If you want to control tracing for the entire process, please check
    -out ACE_Trace::start_tracing() and ACE_Trace::stop_tracing().  
    -
    -If you want to control tracing on a per-thread basis please take a
    -look at the ACE_Log_Msg class.  There are methods called
    -stop_tracing() and start_tracing() that do what you want.
    -
    -----------------------------------------
    -
    -51. 
    -
    -> I've been using an acceptor and a connector in one (OS-) process.
    -> What does happen, if a signal is sent to this process? Is the signal
    -> processed by every ACE_Event_Handler (or its descendants) that is
    -> around?  The manual page simply states that handle signal is called
    -> as soon as a signal is triggered by the OS.
    -
    -How this signal is handled depends on several factors:
    -
    -1. Whether your using ACE_Sig_Handler or ACE_Sig_Handlers to register
    -   the signal handlers.
    -
    -2. If you're using ACE_Sig_Handler, then the ACE_Event_Handler * that
    -   you've most recently registered to handle the signal will
    -   have it's handle_signal() method called back by the Reactor.
    -
    -3. If you're using ACE_Sig_Handlers, then all of the ACE_Event_Handler *
    -   that you've register will be called back.
    -
    -For examples of how this works, please check out
    -
    -$ACE_ROOT/examples/Reactor/Misc/test_signals.cpp
    -
    -This contains a long comment that explains precisely how everything
    -works!
    diff --git a/Kokyu/Default_Dispatcher_Impl.cpp b/Kokyu/Default_Dispatcher_Impl.cpp
    deleted file mode 100644
    index 228ac17872f..00000000000
    --- a/Kokyu/Default_Dispatcher_Impl.cpp
    +++ /dev/null
    @@ -1,133 +0,0 @@
    -// $Id$
    -
    -#include "Default_Dispatcher_Impl.h"
    -#include "ace/Sched_Params.h"
    -
    -#if ! defined (__ACE_INLINE__)
    -#include "Default_Dispatcher_Impl.i"
    -#endif /* __ACE_INLINE__ */
    -
    -ACE_RCSID(Kokyu, Dispatcher_Impl, "$Id$")
    -
    -namespace Kokyu
    -{
    -int
    -Default_Dispatcher_Impl::init_i (const ConfigInfoSet& config_info_set)
    -{
    -  //create and init the dispatcher tasks here
    -
    -  ACE_DEBUG ((LM_DEBUG, "entering init_t\n" ));
    -  int size;
    -  size = config_info_set.size ();
    -
    -  if (size == 0)
    -    return -1;
    -
    -  this->ntasks_ = size;
    -
    -  Dispatcher_Task_Auto_Ptr * tasks_array=0;
    -  ACE_NEW_RETURN (tasks_array, Dispatcher_Task_Auto_Ptr[ntasks_], -1);
    -
    -  ACE_DEBUG ((LM_DEBUG, "after new on task array\n" ));
    -  tasks_.reset(tasks_array);
    -
    -  ACE_DEBUG ((LM_DEBUG, "task array auto_ptr set\n" ));
    -
    -  ConfigInfoSet& config_set = const_cast (config_info_set);
    -  ConfigInfoSet::ITERATOR iter(config_set);
    -  int i=0;
    -
    -  ConfigInfo* config;
    -  for (;iactivate ();
    -
    -  curr_config_info_ = config_info_set;
    -  return 0;
    -}
    -
    -int
    -Default_Dispatcher_Impl::activate ()
    -{
    -  int i;
    -  for(i=0; iget_curr_config_info ().thread_priority_;
    -
    -      if (this->tasks_[i]->activate (flags, 1, 1, priority) == -1)
    -        {
    -          flags = THR_BOUND;
    -          priority = ACE_Sched_Params::priority_min (ACE_SCHED_OTHER,
    -                                                     ACE_SCOPE_THREAD);
    -          if (this->tasks_[i]->activate (flags, 1, 1, priority) == -1)
    -            ACE_ERROR ((LM_ERROR,
    -                        "EC (%P|%t) cannot activate queue %d", i));
    -        }
    -    }
    -
    -  return 0;
    -}
    -
    -Dispatcher_Task*
    -Default_Dispatcher_Impl::find_task_with_preemption_prio (Priority_t prio)
    -{
    -  int i;
    -
    -  if (prio >=0)
    -  {
    -    for( i=0; ipreemption_priority () == prio)
    -        return  tasks_[i].get();
    -    }
    -  }
    -
    -  return 0;
    -}
    -
    -int
    -Default_Dispatcher_Impl::dispatch_i (const Dispatch_Command* cmd,
    -                  const QoSDescriptor& qos_info)
    -{
    -  //delegate to the appropriate task
    -  if (qos_info.preemption_priority_ < 0)
    -    return -1;
    -
    -  Dispatcher_Task* task =
    -    find_task_with_preemption_prio (qos_info.preemption_priority_);
    -
    -  if (task != 0)
    -    task->enqueue (cmd, qos_info);
    -  else
    -    tasks_[0]->enqueue (cmd, qos_info);
    -
    -  return 0;
    -}
    -
    -int
    -Default_Dispatcher_Impl::shutdown_i ()
    -{
    -  //post shutdown command to all tasks
    -  int i;
    -
    -  for(i=0; ienqueue (shutdown_cmd, qos_info);
    -    }
    -
    -  return 0;
    -}
    -
    -}
    diff --git a/Kokyu/Default_Dispatcher_Impl.h b/Kokyu/Default_Dispatcher_Impl.h
    deleted file mode 100644
    index dab89df9119..00000000000
    --- a/Kokyu/Default_Dispatcher_Impl.h
    +++ /dev/null
    @@ -1,74 +0,0 @@
    -/* -*- C++ -*- */
    -/**
    - *  @file   Default_Dispatcher_Impl.h
    - *
    - *  $Id$
    - *
    - *  @author Venkita Subramonian (venkita@cs.wustl.edu)
    - *
    - * Based on previous work by Tim Harrison (harrison@cs.wustl.edu),
    - * Chris Gill, Carlos O'Ryan and other members of the DOC group.
    - */
    -
    -#ifndef DEFAULT_DISPATCHER_IMPL_H
    -#define DEFAULT_DISPATCHER_IMPL_H
    -#include "ace/pre.h"
    -#include "ace/OS.h"
    -
    -#if !defined (ACE_LACKS_PRAGMA_ONCE)
    -# pragma once
    -#endif /* ACE_LACKS_PRAGMA_ONCE */
    -
    -#include "ace/Task.h"
    -#include "ace/Message_Block.h"
    -#include "ace/Auto_Ptr.h"
    -
    -#include "kokyu_export.h"
    -#include "Kokyu.h"
    -#include "Dispatcher_Impl.h"
    -#include "Dispatcher_Task.h"
    -
    -namespace Kokyu
    -{
    -  class Default_Dispatcher_Impl : public Dispatcher_Impl
    -  {
    -  public:
    -    virtual ~Default_Dispatcher_Impl ();
    -    int activate ();
    -
    -  private:
    -    int init_i (const ConfigInfoSet&);
    -    int dispatch_i (const Dispatch_Command*,
    -                  const QoSDescriptor&);
    -    int shutdown_i ();
    -    Dispatcher_Task* find_task_with_preemption_prio (Priority_t);
    -
    -  private:
    -    typedef auto_ptr Dispatcher_Task_Auto_Ptr;
    -    ACE_Auto_Array_Ptr tasks_;
    -    int ntasks_;
    -    ConfigInfoSet curr_config_info_;
    -  };
    -
    -  // ****************************************************************
    -
    -  class Shutdown_Task_Command : public Dispatch_Command
    -  {
    -  public:
    -    /// Constructor
    -    Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
    -
    -    /// Command callback
    -    int execute ();
    -  };
    -
    -  // ****************************************************************
    -
    -} //end of namespace
    -
    -#if defined (__ACE_INLINE__)
    -#include "Default_Dispatcher_Impl.i"
    -#endif /* __ACE_INLINE__ */
    -
    -#include "ace/post.h"
    -#endif /* DEFAULT_DISPATCHER_IMPL_H */
    diff --git a/Kokyu/Default_Dispatcher_Impl.i b/Kokyu/Default_Dispatcher_Impl.i
    deleted file mode 100644
    index 07df24d94d9..00000000000
    --- a/Kokyu/Default_Dispatcher_Impl.i
    +++ /dev/null
    @@ -1,21 +0,0 @@
    -// $Id$
    -
    -namespace Kokyu
    -{
    -ACE_INLINE
    -Default_Dispatcher_Impl::~Default_Dispatcher_Impl()
    -{
    -}
    -
    -ACE_INLINE
    -Shutdown_Task_Command::Shutdown_Task_Command (ACE_Allocator *mb_allocator)
    -{
    -  ACE_UNUSED_ARG ((mb_allocator));
    -}
    -
    -ACE_INLINE int
    -Shutdown_Task_Command::execute ()
    -{
    -  return -1;
    -}
    -}
    diff --git a/Kokyu/Dispatcher_Impl.cpp b/Kokyu/Dispatcher_Impl.cpp
    deleted file mode 100644
    index 762d0254fdf..00000000000
    --- a/Kokyu/Dispatcher_Impl.cpp
    +++ /dev/null
    @@ -1,9 +0,0 @@
    -// $Id$
    -
    -#include "Dispatcher_Impl.h"
    -
    -#if ! defined (__ACE_INLINE__)
    -#include "Dispatcher_Impl.i"
    -#endif /* __ACE_INLINE__ */
    -
    -ACE_RCSID(Kokyu, Dispatcher_Impl, "$Id$")
    diff --git a/Kokyu/Dispatcher_Impl.h b/Kokyu/Dispatcher_Impl.h
    deleted file mode 100644
    index 623704b8dbe..00000000000
    --- a/Kokyu/Dispatcher_Impl.h
    +++ /dev/null
    @@ -1,52 +0,0 @@
    -/* -*- C++ -*- */
    -/**
    - *  @file   Dispatcher_Impl.h
    - *
    - *  $Id$
    - *
    - *  @author Venkita Subramonian (venkita@cs.wustl.edu)
    - *
    - * Based on previous work by Tim Harrison (harrison@cs.wustl.edu),
    - * Chris Gill, Carlos O'Ryan and other members of the DOC group.
    - */
    -
    -#ifndef DISPATCHER_IMPL_H
    -#define DISPATCHER_IMPL_H
    -#include "ace/pre.h"
    -#include "ace/OS.h"
    -
    -#if !defined (ACE_LACKS_PRAGMA_ONCE)
    -# pragma once
    -#endif /* ACE_LACKS_PRAGMA_ONCE */
    -
    -#include "kokyu_export.h"
    -#include "Kokyu.h"
    -
    -namespace Kokyu
    -{
    -  class Dispatcher_Impl
    -  {
    -  public:
    -    //following an idiom to avoid public virtual functions.
    -    //instead make them private and use the template method
    -    //pattern - "Virtually Yours" article in CUJ Experts Forum
    -    int init (const ConfigInfoSet&);
    -    int dispatch (const Dispatch_Command*,
    -                  const QoSDescriptor&);
    -    int shutdown ();
    -    virtual ~Dispatcher_Impl();
    -  private:
    -    virtual int init_i (const ConfigInfoSet&) =0;
    -    virtual int dispatch_i (const Dispatch_Command*,
    -                            const QoSDescriptor&) =0;
    -    virtual int shutdown_i () =0;
    -
    -  };
    -} //end of namespace
    -
    -#if defined (__ACE_INLINE__)
    -#include "Dispatcher_Impl.i"
    -#endif /* __ACE_INLINE__ */
    -
    -#include "ace/post.h"
    -#endif /* DISPATCHER_IMPL_H */
    diff --git a/Kokyu/Dispatcher_Impl.i b/Kokyu/Dispatcher_Impl.i
    deleted file mode 100644
    index 54a9748aae7..00000000000
    --- a/Kokyu/Dispatcher_Impl.i
    +++ /dev/null
    @@ -1,28 +0,0 @@
    -// $Id$
    -
    -namespace Kokyu
    -{
    -ACE_INLINE
    -int Dispatcher_Impl::init (const ConfigInfoSet& config_info)
    -{
    -  return init_i (config_info);
    -}
    -
    -ACE_INLINE
    -int Dispatcher_Impl::dispatch (const Dispatch_Command* cmd,
    -                               const QoSDescriptor& qos_info)
    -{
    -  return dispatch_i (cmd, qos_info);
    -}
    -
    -ACE_INLINE
    -int Dispatcher_Impl::shutdown ()
    -{
    -  return shutdown_i ();
    -}
    -
    -ACE_INLINE
    -Dispatcher_Impl::~Dispatcher_Impl()
    -{
    -}
    -}
    diff --git a/Kokyu/Dispatcher_Task.cpp b/Kokyu/Dispatcher_Task.cpp
    deleted file mode 100644
    index 87e58535211..00000000000
    --- a/Kokyu/Dispatcher_Task.cpp
    +++ /dev/null
    @@ -1,155 +0,0 @@
    -// $Id$
    -
    -#include "Dispatcher_Task.h"
    -
    -#if ! defined (__ACE_INLINE__)
    -#include "Dispatcher_Task.i"
    -#endif /* __ACE_INLINE__ */
    -
    -ACE_RCSID(Kokyu, Dispatcher_Task, "$Id$")
    -
    -namespace Kokyu
    -{
    -
    -int
    -Dispatcher_Task::init ()
    -{
    -  switch(curr_config_info_.dispatching_type_)
    -    {
    -    case FIFO_DISPATCHING:
    -      ACE_NEW_RETURN (
    -          this->the_queue_,
    -          ACE_Message_Queue,
    -          -1);
    -      break;
    -
    -    case DEADLINE_DISPATCHING:
    -      ACE_NEW_RETURN (
    -          this->the_queue_,
    -          ACE_Dynamic_Message_Queue (deadline_msg_strategy_),
    -          -1);
    -      break;
    -
    -    case LAXITY_DISPATCHING:
    -      ACE_NEW_RETURN (
    -           this->the_queue_,
    -           ACE_Dynamic_Message_Queue (laxity_msg_strategy_),
    -           -1);
    -      break;
    -
    -    default:
    -      return -1;
    -      break;
    -    }
    -
    -  if (this->the_queue_ != 0)
    -    {
    -      this->msg_queue(this->the_queue_);
    -    }
    -  return 0;
    -}
    -
    -int
    -Dispatcher_Task::svc (void)
    -{
    -  int done = 0;
    -  while (!done)
    -    {
    -      ACE_Message_Block *mb;
    -      if (this->getq (mb) == -1)
    -        if (ACE_OS::last_error () == ESHUTDOWN)
    -          return 0;
    -        else
    -          ACE_ERROR ((LM_ERROR,
    -                      "EC (%P|%t) getq error in Dispatching Queue\n"));
    -
    -      Dispatch_Queue_Item *qitem =
    -        ACE_dynamic_cast(Dispatch_Queue_Item*, mb);
    -
    -      if (qitem == 0)
    -        {
    -          ACE_Message_Block::release (mb);
    -          continue;
    -        }
    -
    -      Dispatch_Command* command = qitem->command ();
    -
    -      ACE_ASSERT(command != 0);
    -      int result = command->execute ();
    -
    -      if (command->can_be_deleted ())
    -        command->destroy ();
    -
    -      ACE_Message_Block::release (mb);
    -
    -      if (result == -1)
    -        done = 1;
    -    }
    -  return 0;
    -}
    -
    -int
    -Dispatcher_Task::enqueue (const Dispatch_Command* cmd,
    -                          const QoSDescriptor& qos_info)
    -{
    -  if (this->allocator_ == 0)
    -    this->allocator_ = ACE_Allocator::instance ();
    -
    -  void* buf = this->allocator_->malloc (sizeof (Dispatch_Queue_Item));
    -
    -  if (buf == 0)
    -    return -1;
    -
    -  ACE_Message_Block *mb =
    -    new (buf) Dispatch_Queue_Item (cmd,
    -                                   qos_info,
    -                                   this->data_block_.duplicate (),
    -                                   this->allocator_);
    -
    -  this->putq (mb);
    -
    -  return 0;
    -}
    -
    -int Dispatcher_Task::get_native_prio ()
    -{
    -  ACE_hthread_t thr_handle;
    -  ACE_Thread::self (thr_handle);
    -  int prio;
    -
    -  if (ACE_Thread::getprio (thr_handle, prio) == -1)
    -  {
    -    if (errno == ENOTSUP)
    -    {
    -      ACE_DEBUG((LM_DEBUG,
    -                 ACE_TEXT ("getprior not supported on this platform\n")
    -               ));
    -      return 0;
    -    }
    -    ACE_ERROR_RETURN ((LM_ERROR,
    -                       ACE_TEXT ("%p\n"),
    -                       ACE_TEXT ("getprio failed")),
    -                      -1);
    -  }
    -
    -  return prio;
    -}
    -
    -void Dispatch_Queue_Item::init_i (const QoSDescriptor& qos_info)
    -{
    -  this->msg_priority (qos_info.preemption_priority_);
    -  this->msg_execution_time (qos_info.execution_time_);
    -  this->msg_deadline_time (qos_info.deadline_);
    -}
    -
    -}
    -
    -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
    -
    -template class ACE_Locked_Data_Block >;
    -
    -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
    -
    -#pragma instantiate ACE_Locked_Data_Block >
    -
    -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
    diff --git a/Kokyu/Dispatcher_Task.h b/Kokyu/Dispatcher_Task.h
    deleted file mode 100644
    index 9beae6d556c..00000000000
    --- a/Kokyu/Dispatcher_Task.h
    +++ /dev/null
    @@ -1,106 +0,0 @@
    -/* -*- C++ -*- */
    -/**
    - *  @file   Dispatcher_Task.h
    - *
    - *  $Id$
    - *
    - *  @author Venkita Subramonian (venkita@cs.wustl.edu)
    - *
    - * Based on previous work by Tim Harrison (harrison@cs.wustl.edu),
    - * Chris Gill, Carlos O'Ryan and other members of the DOC group.
    - */
    -
    -#ifndef TAO_DISPATCHER_TASK_H
    -#define TAO_DISPATCHER_TASK_H
    -#include "ace/pre.h"
    -#include "ace/OS.h"
    -
    -#if !defined (ACE_LACKS_PRAGMA_ONCE)
    -# pragma once
    -#endif /* ACE_LACKS_PRAGMA_ONCE */
    -
    -#include "ace/Task.h"
    -
    -#include "kokyu_export.h"
    -#include "Kokyu.h"
    -
    -namespace Kokyu
    -{
    -
    -class Dispatch_Queue_Item : public ACE_Message_Block
    -{
    -public:
    -  Dispatch_Queue_Item (const Dispatch_Command* , const QoSDescriptor&);
    -
    -  Dispatch_Queue_Item::Dispatch_Queue_Item (
    -        const Dispatch_Command* cmd,
    -        const QoSDescriptor& qos_info,
    -        ACE_Allocator* mb_allocator =0);
    -
    -  Dispatch_Queue_Item::Dispatch_Queue_Item (
    -        const Dispatch_Command* cmd,
    -        const QoSDescriptor& qos_info,
    -        ACE_Data_Block* data_block,
    -        ACE_Allocator* mb_allocator =0);
    -
    -  Dispatch_Command* command ();
    -
    -private:
    -  void init_i(const QoSDescriptor&);
    -
    -private:
    -  const Dispatch_Command* command_;
    -  QoSDescriptor qos_info_;
    -};
    -
    -/**
    - * @class Dispatcher_Task
    - *
    - * @brief Implement the dispatching queues for FIFO and Priority
    - * dispatching.
    - *
    - */
    -class Dispatcher_Task : public ACE_Task
    -{
    -public:
    -  /// Constructor
    -  Dispatcher_Task (const ConfigInfo& config_info,
    -                   ACE_Thread_Manager* thr_manager = 0);
    -
    -  int init();
    -
    -  int enqueue (const Dispatch_Command* cmd,
    -           const QoSDescriptor& qos_info);
    -
    -  /// Process the events in the queue.
    -  int svc (void);
    -
    -  const ConfigInfo& get_curr_config_info() const;
    -  Priority_t preemption_priority() const;
    -
    -private:
    -  static int get_native_prio();
    -
    -private:
    -  /// An per-task allocator
    -  ACE_Allocator *allocator_;
    -
    -  /// Helper data structure to minimize memory allocations...
    -  ACE_Locked_Data_Block > data_block_;
    -
    -  /// The queue
    -  ACE_Message_Queue* the_queue_;
    -
    -  ConfigInfo curr_config_info_;
    -  ACE_Deadline_Message_Strategy deadline_msg_strategy_;
    -  ACE_Laxity_Message_Strategy laxity_msg_strategy_;
    -};
    -
    -} //end of namespace
    -
    -#if defined (__ACE_INLINE__)
    -#include "Dispatcher_Task.i"
    -#endif /* __ACE_INLINE__ */
    -
    -#include "ace/post.h"
    -#endif /* DISPATCHER_TASK_H */
    diff --git a/Kokyu/Dispatcher_Task.i b/Kokyu/Dispatcher_Task.i
    deleted file mode 100644
    index 93736390d48..00000000000
    --- a/Kokyu/Dispatcher_Task.i
    +++ /dev/null
    @@ -1,76 +0,0 @@
    -// $Id$
    -
    -namespace Kokyu
    -{
    -ACE_INLINE
    -Dispatcher_Task::Dispatcher_Task (const ConfigInfo& config_info,
    -                                  ACE_Thread_Manager* thr_manager)
    -  :  ACE_Task (thr_manager),
    -     allocator_ (0),
    -     curr_config_info_ (config_info),
    -        deadline_msg_strategy_ (0, 0, 0x7FFFFFFFUL, 0x08000000UL ),
    -        //bits for static priority = 0
    -        //max dynamic prio = 2^31 - 1
    -        //pending offset = 15/16th of the dynamic prio range
    -        //which means that the LATE population will be in the
    -        //1/16th part of the range.
    -        laxity_msg_strategy_ (0, 0, 0x7FFFFFFFUL, 0x08000000UL )
    -{
    -   this->init();
    -}
    -
    -ACE_INLINE
    -Priority_t
    -Dispatcher_Task::preemption_priority() const
    -{
    -        return curr_config_info_.preemption_priority_;
    -}
    -
    -
    -ACE_INLINE
    -const ConfigInfo&
    -Dispatcher_Task::get_curr_config_info() const
    -{
    -    return curr_config_info_;
    -}
    -
    -ACE_INLINE
    -Dispatch_Queue_Item::Dispatch_Queue_Item (
    -        const Dispatch_Command* cmd,
    -        const QoSDescriptor& qos_info)
    - :command_ (cmd), qos_info_ (qos_info)
    -{
    -   this->init_i (qos_info);
    -}
    -
    -ACE_INLINE
    -Dispatch_Queue_Item::Dispatch_Queue_Item (
    -        const Dispatch_Command* cmd,
    -        const QoSDescriptor& qos_info,
    -        ACE_Data_Block *data_block,
    -        ACE_Allocator* mb_allocator)
    - : ACE_Message_Block (data_block, 0, mb_allocator),
    -   command_ (cmd), qos_info_ (qos_info)
    -
    -{
    -   this->init_i (qos_info);
    -}
    -
    -ACE_INLINE
    -Dispatch_Queue_Item::Dispatch_Queue_Item (
    -        const Dispatch_Command* cmd,
    -        const QoSDescriptor& qos_info,
    -        ACE_Allocator* mb_allocator)
    - : ACE_Message_Block (mb_allocator),
    -   command_ (cmd), qos_info_ (qos_info)
    -{
    -   this->init_i (qos_info);
    -}
    -
    -ACE_INLINE
    -Dispatch_Command*
    -Dispatch_Queue_Item::command()
    -{
    -  return const_cast (command_);
    -}
    -}
    diff --git a/Kokyu/Kokyu.cpp b/Kokyu/Kokyu.cpp
    deleted file mode 100644
    index ef5c190711b..00000000000
    --- a/Kokyu/Kokyu.cpp
    +++ /dev/null
    @@ -1,45 +0,0 @@
    -// $Id$
    -
    -#include "Kokyu.h"
    -#include "Default_Dispatcher_Impl.h"
    -
    -#if ! defined (__ACE_INLINE__)
    -#include "Kokyu.i"
    -#endif /* __ACE_INLINE__ */
    -
    -ACE_RCSID(Kokyu, Dispatcher_Impl, "$Id$")
    -
    -namespace Kokyu
    -{
    -
    -int Dispatcher::dispatch (const Dispatch_Command* cmd, const QoSDescriptor& qos)
    -{
    -  return dispatcher_impl_->dispatch (cmd, qos);
    -}
    -
    -int Dispatcher::shutdown ()
    -{
    -  return dispatcher_impl_->shutdown ();
    -}
    -
    -
    -void Dispatcher::implementation (Dispatcher_Impl* impl)
    -{
    -  dispatcher_impl_.reset (impl);
    -}
    -
    -
    -Dispatcher*
    -Dispatcher_Factory::
    -create_dispatcher (const ConfigInfoSet& config_info_set)
    -{
    -  Dispatcher_Impl* tmp;
    -  ACE_NEW_RETURN (tmp, Default_Dispatcher_Impl, (Dispatcher*)0);
    -  Dispatcher* disp;
    -  ACE_NEW_RETURN (disp, Dispatcher, (Dispatcher*)0);
    -  disp->implementation (tmp);
    -  tmp->init (config_info_set);
    -  return disp;
    -}
    -
    -}
    diff --git a/Kokyu/Kokyu.dsw b/Kokyu/Kokyu.dsw
    deleted file mode 100644
    index 9ce4ef90750..00000000000
    --- a/Kokyu/Kokyu.dsw
    +++ /dev/null
    @@ -1,41 +0,0 @@
    -Microsoft Developer Studio Workspace File, Format Version 6.00
    -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
    -
    -###############################################################################
    -
    -Project: "Kokyu_DLL"=.\Kokyu_DLL.dsp - Package Owner=<4>
    -
    -Package=<5>
    -{{{
    -}}}
    -
    -Package=<4>
    -{{{
    -}}}
    -
    -###############################################################################
    -
    -Project: "Kokyu_static"=.\Kokyu_static.dsp - Package Owner=<4>
    -
    -Package=<5>
    -{{{
    -}}}
    -
    -Package=<4>
    -{{{
    -}}}
    -
    -###############################################################################
    -
    -Global:
    -
    -Package=<5>
    -{{{
    -}}}
    -
    -Package=<3>
    -{{{
    -}}}
    -
    -###############################################################################
    -
    diff --git a/Kokyu/Kokyu.h b/Kokyu/Kokyu.h
    deleted file mode 100644
    index 4d18b0d9399..00000000000
    --- a/Kokyu/Kokyu.h
    +++ /dev/null
    @@ -1,136 +0,0 @@
    -/* -*- C++ -*- */
    -/**
    - *  @file   Kokyu.h
    - *
    - *  $Id$
    - *
    - *  @author Venkita Subramonian (venkita@cs.wustl.edu)
    - *
    - * Based on previous work by Tim Harrison (harrison@cs.wustl.edu),
    - * Chris Gill, Carlos O'Ryan and other members of the DOC group.
    - */
    -
    -#ifndef KOKYU_H
    -#define KOKYU_H
    -#include "ace/pre.h"
    -#include "ace/OS.h"
    -
    -#if !defined (ACE_LACKS_PRAGMA_ONCE)
    -# pragma once
    -#endif /* ACE_LACKS_PRAGMA_ONCE */
    -
    -#include "ace/Array.h"
    -#include "ace/Time_Value.h"
    -#include "ace/Auto_Ptr.h"
    -#include "ace/Message_Block.h"
    -
    -#include "kokyu_export.h"
    -
    -namespace Kokyu
    -{
    -  typedef long Priority_t;
    -  typedef ACE_Time_Value Deadline_t; //absolute deadline
    -  typedef ACE_Time_Value Execution_Time_t; //execution time
    -
    -  enum Dispatching_Type_t
    -    // Defines the type of prioritization strategy
    -    // to be used by a dispatching queue
    -    {
    -      FIFO_DISPATCHING,
    -      DEADLINE_DISPATCHING,
    -      LAXITY_DISPATCHING
    -    };
    -
    -  enum Criticality_t
    -    // Defines the criticality of the operation.
    -    // For use with Dynamic Scheduler.
    -    {
    -      VERY_LOW_CRITICALITY,
    -      LOW_CRITICALITY,
    -      MEDIUM_CRITICALITY,
    -      HIGH_CRITICALITY,
    -      VERY_HIGH_CRITICALITY
    -    };
    -
    -  enum Importance_t
    -    // Defines the importance of the operation,
    -    // which can be used by the Scheduler as a
    -    // "tie-breaker" when other scheduling
    -    // parameters are equal.
    -    {
    -      VERY_LOW_IMPORTANCE,
    -      LOW_IMPORTANCE,
    -      MEDIUM_IMPORTANCE,
    -      HIGH_IMPORTANCE,
    -      VERY_HIGH_IMPORTANCE
    -    };
    -
    -  struct ConfigInfo
    -  {
    -    Priority_t preemption_priority_;
    -
    -    // OS priority of the dispatching thread associated with the queue
    -    Priority_t thread_priority_;
    -
    -    // type of dispatching queue
    -    Dispatching_Type_t dispatching_type_;
    -  };
    -
    -  typedef ACE_Array ConfigInfoSet;
    -
    -  struct QoSDescriptor
    -  {
    -    Priority_t preemption_priority_;
    -    Deadline_t deadline_;
    -    Execution_Time_t execution_time_;
    -  };
    -
    -  class Kokyu_Export Dispatch_Command
    -    {
    -    public:
    -      Dispatch_Command(int dont_delete = 0);
    -
    -      /// Command callback
    -      virtual int execute () = 0;
    -
    -      int can_be_deleted () const;
    -
    -      void destroy (void);
    -    protected:
    -      /// Destructor
    -      // only inheritance is possible and object should be on heap,
    -      // since object could be handed over to a different thread.
    -      virtual ~Dispatch_Command (void);
    -
    -    private:
    -      int dont_delete_;
    -    };
    -
    -  class Dispatcher_Impl;
    -
    -  class Kokyu_Export Dispatcher
    -  {
    -  public:
    -    int dispatch (const Dispatch_Command*, const QoSDescriptor&);
    -    int shutdown ();
    -    void implementation (Dispatcher_Impl*);
    -  private:
    -    auto_ptr dispatcher_impl_;
    -  };
    -
    -  class Kokyu_Export Dispatcher_Factory
    -    {
    -    public:
    -      //@@ Should we return auto_ptr instead?
    -      static Dispatcher* create_dispatcher (const ConfigInfoSet&);
    -    };
    -} //end of namespace
    -
    -#if defined (__ACE_INLINE__)
    -#include "Kokyu.i"
    -#endif /* __ACE_INLINE__ */
    -
    -#include "Dispatcher_Impl.h"
    -
    -#include "ace/post.h"
    -#endif /* KOKYU_H */
    diff --git a/Kokyu/Kokyu.i b/Kokyu/Kokyu.i
    deleted file mode 100644
    index 583e64c237f..00000000000
    --- a/Kokyu/Kokyu.i
    +++ /dev/null
    @@ -1,33 +0,0 @@
    -// $Id$
    -
    -
    -namespace Kokyu
    -{
    -
    -ACE_INLINE
    -Dispatch_Command::Dispatch_Command (int dont_delete)
    -        :dont_delete_ (dont_delete)
    -{
    -}
    -
    -ACE_INLINE
    -int Dispatch_Command::can_be_deleted (void) const
    -{
    -  return !dont_delete_;
    -}
    -
    -ACE_INLINE
    -void Dispatch_Command::destroy (void)
    -{
    -  //@@what if it was allocated thru an allocator?
    -  //may be this should be left as a  pure virtual
    -  delete this;
    -}
    -
    -ACE_INLINE
    -Dispatch_Command::~Dispatch_Command (void)
    -{
    -}
    -
    -
    -}
    diff --git a/Kokyu/Kokyu.mpc b/Kokyu/Kokyu.mpc
    deleted file mode 100644
    index 684029092b7..00000000000
    --- a/Kokyu/Kokyu.mpc
    +++ /dev/null
    @@ -1,7 +0,0 @@
    -project : Kokyulib, core {
    -  depends     = ace
    -  sharedname  = Kokyu
    -  dllflags    = KOKYU_BUILD_DLL
    -  libout      = ..
    -  include_dir = ace
    -}
    diff --git a/Kokyu/Kokyu_DLL.dsp b/Kokyu/Kokyu_DLL.dsp
    deleted file mode 100644
    index 07a733f6ba8..00000000000
    --- a/Kokyu/Kokyu_DLL.dsp
    +++ /dev/null
    @@ -1,198 +0,0 @@
    -# Microsoft Developer Studio Project File - Name="Kokyu_DLL" - Package Owner=<4>
    -# Microsoft Developer Studio Generated Build File, Format Version 6.00
    -# ** DO NOT EDIT **
    -
    -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
    -
    -CFG=Kokyu_DLL - Win32 Debug
    -!MESSAGE This is not a valid makefile. To build this project using NMAKE,
    -!MESSAGE use the Export Makefile command and run
    -!MESSAGE 
    -!MESSAGE NMAKE /f "Kokyu_DLL.mak".
    -!MESSAGE 
    -!MESSAGE You can specify a configuration when running NMAKE
    -!MESSAGE by defining the macro CFG on the command line. For example:
    -!MESSAGE 
    -!MESSAGE NMAKE /f "Kokyu_DLL.mak" CFG="Kokyu_DLL - Win32 Debug"
    -!MESSAGE 
    -!MESSAGE Possible choices for configuration are:
    -!MESSAGE 
    -!MESSAGE "Kokyu_DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
    -!MESSAGE "Kokyu_DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
    -!MESSAGE 
    -
    -# Begin Project
    -# PROP AllowPerConfigDependencies 0
    -# PROP Scc_ProjName ""
    -# PROP Scc_LocalPath ""
    -CPP=cl.exe
    -MTL=midl.exe
    -RSC=rc.exe
    -
    -!IF  "$(CFG)" == "Kokyu_DLL - Win32 Release"
    -
    -# PROP BASE Use_MFC 0
    -# PROP BASE Use_Debug_Libraries 0
    -# PROP BASE Output_Dir "Release"
    -# PROP BASE Intermediate_Dir "Release"
    -# PROP BASE Target_Dir ""
    -# PROP Use_MFC 0
    -# PROP Use_Debug_Libraries 0
    -# PROP Output_Dir ""
    -# PROP Intermediate_Dir "DLL\Release"
    -# PROP Ignore_Export_Lib 0
    -# PROP Target_Dir ""
    -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "KOKYU_DLL_EXPORTS" /YX /FD /c
    -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "KOKYU_BUILD_DLL" /FD /c
    -# SUBTRACT CPP /YX
    -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
    -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
    -# ADD BASE RSC /l 0x409 /d "NDEBUG"
    -# ADD RSC /l 0x409 /d "NDEBUG"
    -BSC32=bscmake.exe
    -# ADD BASE BSC32 /nologo
    -# ADD BSC32 /nologo /o"Kokyu.bsc"
    -LINK32=link.exe
    -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
    -# ADD LINK32 ace.lib /nologo /dll /machine:I386 /out:"..\bin\Kokyu.dll" /libpath:"../ace"
    -# SUBTRACT LINK32 /incremental:yes /debug
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_DLL - Win32 Debug"
    -
    -# PROP BASE Use_MFC 0
    -# PROP BASE Use_Debug_Libraries 1
    -# PROP BASE Output_Dir "Debug"
    -# PROP BASE Intermediate_Dir "Debug"
    -# PROP BASE Target_Dir ""
    -# PROP Use_MFC 0
    -# PROP Use_Debug_Libraries 1
    -# PROP Output_Dir ""
    -# PROP Intermediate_Dir "DLL\Debug"
    -# PROP Ignore_Export_Lib 0
    -# PROP Target_Dir ""
    -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "KOKYU_DLL_EXPORTS" /YX /FD  /c
    -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "KOKYU_BUILD_DLL" /FD  /c
    -# SUBTRACT CPP /YX
    -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
    -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
    -# ADD BASE RSC /l 0x409 /d "_DEBUG"
    -# ADD RSC /l 0x409 /d "_DEBUG"
    -BSC32=bscmake.exe
    -# ADD BASE BSC32 /nologo
    -# ADD BSC32 /nologo /o"Kokyu.bsc"
    -LINK32=link.exe
    -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
    -# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Kokyud.dll" /pdbtype:sept /libpath:"../ace"
    -
    -!ENDIF 
    -
    -# Begin Target
    -
    -# Name "Kokyu_DLL - Win32 Release"
    -# Name "Kokyu_DLL - Win32 Debug"
    -# Begin Group "Source Files"
    -
    -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
    -# Begin Source File
    -
    -SOURCE=.\Default_Dispatcher_Impl.cpp
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Impl.cpp
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Task.cpp
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Kokyu.cpp
    -# End Source File
    -# End Group
    -# Begin Group "Header Files"
    -
    -# PROP Default_Filter "h;hpp;hxx;hm;inl"
    -# Begin Source File
    -
    -SOURCE=.\Default_Dispatcher_Impl.h
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Impl.h
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Task.h
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Kokyu.h
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\kokyu_export.h
    -# End Source File
    -# End Group
    -# Begin Group "Resource Files"
    -
    -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
    -# End Group
    -# Begin Group "Inline Files"
    -
    -# PROP Default_Filter ""
    -# Begin Source File
    -
    -SOURCE=.\Default_Dispatcher_Impl.i
    -
    -!IF  "$(CFG)" == "Kokyu_DLL - Win32 Release"
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_DLL - Win32 Debug"
    -
    -# PROP Exclude_From_Build 1
    -
    -!ENDIF 
    -
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Impl.i
    -
    -!IF  "$(CFG)" == "Kokyu_DLL - Win32 Release"
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_DLL - Win32 Debug"
    -
    -# PROP Exclude_From_Build 1
    -
    -!ENDIF 
    -
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Task.i
    -
    -!IF  "$(CFG)" == "Kokyu_DLL - Win32 Release"
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_DLL - Win32 Debug"
    -
    -# PROP Exclude_From_Build 1
    -
    -!ENDIF 
    -
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Kokyu.i
    -
    -!IF  "$(CFG)" == "Kokyu_DLL - Win32 Release"
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_DLL - Win32 Debug"
    -
    -# PROP Exclude_From_Build 1
    -
    -!ENDIF 
    -
    -# End Source File
    -# End Group
    -# End Target
    -# End Project
    diff --git a/Kokyu/Kokyu_Static.dsp b/Kokyu/Kokyu_Static.dsp
    deleted file mode 100644
    index fd0bdfba1ca..00000000000
    --- a/Kokyu/Kokyu_Static.dsp
    +++ /dev/null
    @@ -1,186 +0,0 @@
    -# Microsoft Developer Studio Project File - Name="Kokyu_Static" - Package Owner=<4>
    -# Microsoft Developer Studio Generated Build File, Format Version 6.00
    -# ** DO NOT EDIT **
    -
    -# TARGTYPE "Win32 (x86) Static Library" 0x0104
    -
    -CFG=Kokyu_Static - Win32 Debug
    -!MESSAGE This is not a valid makefile. To build this project using NMAKE,
    -!MESSAGE use the Export Makefile command and run
    -!MESSAGE 
    -!MESSAGE NMAKE /f "Kokyu_Static.mak".
    -!MESSAGE 
    -!MESSAGE You can specify a configuration when running NMAKE
    -!MESSAGE by defining the macro CFG on the command line. For example:
    -!MESSAGE 
    -!MESSAGE NMAKE /f "Kokyu_Static.mak" CFG="Kokyu_Static - Win32 Debug"
    -!MESSAGE 
    -!MESSAGE Possible choices for configuration are:
    -!MESSAGE 
    -!MESSAGE "Kokyu_Static - Win32 Release" (based on "Win32 (x86) Static Library")
    -!MESSAGE "Kokyu_Static - Win32 Debug" (based on "Win32 (x86) Static Library")
    -!MESSAGE 
    -
    -# Begin Project
    -# PROP AllowPerConfigDependencies 0
    -# PROP Scc_ProjName ""
    -# PROP Scc_LocalPath ""
    -CPP=cl.exe
    -RSC=rc.exe
    -
    -!IF  "$(CFG)" == "Kokyu_Static - Win32 Release"
    -
    -# PROP BASE Use_MFC 0
    -# PROP BASE Use_Debug_Libraries 0
    -# PROP BASE Output_Dir "Release"
    -# PROP BASE Intermediate_Dir "Release"
    -# PROP BASE Target_Dir ""
    -# PROP Use_MFC 0
    -# PROP Use_Debug_Libraries 0
    -# PROP Output_Dir ""
    -# PROP Intermediate_Dir "Static\Release"
    -# PROP Target_Dir ""
    -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
    -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "ACE_AS_STATIC_LIBS" /FD /c
    -# SUBTRACT CPP /YX
    -# ADD BASE RSC /l 0x409 /d "NDEBUG"
    -# ADD RSC /l 0x409 /d "NDEBUG"
    -BSC32=bscmake.exe
    -# ADD BASE BSC32 /nologo
    -# ADD BSC32 /nologo
    -LIB32=link.exe -lib
    -# ADD BASE LIB32 /nologo
    -# ADD LIB32 /nologo /out:"Kokyus.lib"
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_Static - Win32 Debug"
    -
    -# PROP BASE Use_MFC 0
    -# PROP BASE Use_Debug_Libraries 1
    -# PROP BASE Output_Dir "Debug"
    -# PROP BASE Intermediate_Dir "Debug"
    -# PROP BASE Target_Dir ""
    -# PROP Use_MFC 0
    -# PROP Use_Debug_Libraries 1
    -# PROP Output_Dir ""
    -# PROP Intermediate_Dir "Static\Debug"
    -# PROP Target_Dir ""
    -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD   /c
    -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "ACE_AS_STATIC_LIBS" /FD   /c
    -# SUBTRACT CPP /YX
    -# ADD BASE RSC /l 0x409 /d "_DEBUG"
    -# ADD RSC /l 0x409 /d "_DEBUG"
    -BSC32=bscmake.exe
    -# ADD BASE BSC32 /nologo
    -# ADD BSC32 /nologo
    -LIB32=link.exe -lib
    -# ADD BASE LIB32 /nologo
    -# ADD LIB32 /nologo /out:"Kokyusd.lib"
    -
    -!ENDIF 
    -
    -# Begin Target
    -
    -# Name "Kokyu_Static - Win32 Release"
    -# Name "Kokyu_Static - Win32 Debug"
    -# Begin Group "Source Files"
    -
    -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
    -# Begin Source File
    -
    -SOURCE=.\Default_Dispatcher_Impl.cpp
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Impl.cpp
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Task.cpp
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Kokyu.cpp
    -# End Source File
    -# End Group
    -# Begin Group "Header Files"
    -
    -# PROP Default_Filter "h;hpp;hxx;hm;inl"
    -# Begin Source File
    -
    -SOURCE=.\Default_Dispatcher_Impl.h
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Impl.h
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Task.h
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Kokyu.h
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\kokyu_export.h
    -# End Source File
    -# End Group
    -# Begin Group "Inline Files"
    -
    -# PROP Default_Filter ""
    -# Begin Source File
    -
    -SOURCE=.\Default_Dispatcher_Impl.i
    -
    -!IF  "$(CFG)" == "Kokyu_Static - Win32 Release"
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_Static - Win32 Debug"
    -
    -# PROP Exclude_From_Build 1
    -
    -!ENDIF 
    -
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Impl.i
    -
    -!IF  "$(CFG)" == "Kokyu_Static - Win32 Release"
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_Static - Win32 Debug"
    -
    -# PROP Exclude_From_Build 1
    -
    -!ENDIF 
    -
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Dispatcher_Task.i
    -
    -!IF  "$(CFG)" == "Kokyu_Static - Win32 Release"
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_Static - Win32 Debug"
    -
    -# PROP Exclude_From_Build 1
    -
    -!ENDIF 
    -
    -# End Source File
    -# Begin Source File
    -
    -SOURCE=.\Kokyu.i
    -
    -!IF  "$(CFG)" == "Kokyu_Static - Win32 Release"
    -
    -!ELSEIF  "$(CFG)" == "Kokyu_Static - Win32 Debug"
    -
    -# PROP Exclude_From_Build 1
    -
    -!ENDIF 
    -
    -# End Source File
    -# End Group
    -# End Target
    -# End Project
    diff --git a/Kokyu/Makefile b/Kokyu/Makefile
    deleted file mode 100644
    index 5d6a5302e0b..00000000000
    --- a/Kokyu/Makefile
    +++ /dev/null
    @@ -1,582 +0,0 @@
    -#----------------------------------------------------------------------------
    -#
    -# $Id$
    -#
    -#----------------------------------------------------------------------------
    -
    -MAKEFILE = Makefile
    -LIBNAME  = libKokyu
    -LIB      = $(LIBNAME).a
    -SHLIB    = $(LIBNAME).$(SOEXT)
    -
    -CPP_SRCS += \
    -	Kokyu \
    -	Dispatcher_Impl \
    -	Dispatcher_Task \
    -	Default_Dispatcher_Impl
    -
    -FILES = $(CPP_SRCS)
    -DEFS  = $(addsuffix .h,$(FILES))
    -LSRC  = $(addsuffix .cpp,$(FILES))
    -LIBS=$(ACELIB)
    -
    -#----------------------------------------------------------------------------
    -#       Include macros and targets
    -#----------------------------------------------------------------------------
    -
    -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
    -include $(ACE_ROOT)/include/makeinclude/macros.GNU
    -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
    -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
    -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
    -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
    -
    -#----------------------------------------------------------------------------
    -#       Local targets
    -#----------------------------------------------------------------------------
    -
    -ifeq ($(shared_libs),1)
    -ifneq ($(SHLIB),)
    -CPPFLAGS     += -DKOKYU_BUILD_DLL
    -endif
    -endif
    -ifeq ($(static_libs),1)
    -ifneq ($(LIB),)
    -CPPFLAGS     += -DACE_AS_STATIC_LIBS
    -endif
    -endif
    -
    -
    -
    -#----------------------------------------------------------------------------
    -#       Dependencies
    -#----------------------------------------------------------------------------
    -
    -
    -
    -# DO NOT DELETE THIS LINE -- g++dep uses it.
    -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
    -
    -
    -.obj/Kokyu.o .obj/Kokyu.so .shobj/Kokyu.o .shobj/Kokyu.so: Kokyu.cpp Kokyu.h \
    - $(ACE_ROOT)/ace/pre.h \
    - $(ACE_ROOT)/ace/Auto_Ptr.h \
    - $(ACE_ROOT)/ace/post.h \
    - $(ACE_ROOT)/ace/ace_wchar.h \
    - $(ACE_ROOT)/ace/ace_wchar.inl \
    - $(ACE_ROOT)/ace/Trace.h \
    - $(ACE_ROOT)/ace/ACE_export.h \
    - $(ACE_ROOT)/ace/Global_Macros.h \
    - $(ACE_ROOT)/ace/OS_Export.h \
    - $(ACE_ROOT)/ace/Auto_Ptr.i \
    - $(ACE_ROOT)/ace/Auto_Ptr.cpp \
    - kokyu_export.h Kokyu.i Default_Dispatcher_Impl.h \
    - $(ACE_ROOT)/ace/Task.h \
    - $(ACE_ROOT)/ace/Service_Object.h \
    - $(ACE_ROOT)/ace/Shared_Object.h \
    - $(ACE_ROOT)/ace/OS.h \
    - $(ACE_ROOT)/ace/OS_Dirent.h \
    - $(ACE_ROOT)/ace/OS_Errno.h \
    - $(ACE_ROOT)/ace/OS_Errno.inl \
    - $(ACE_ROOT)/ace/OS_Dirent.inl \
    - $(ACE_ROOT)/ace/OS_String.h \
    - $(ACE_ROOT)/ace/Basic_Types.h \
    - $(ACE_ROOT)/ace/Basic_Types.i \
    - $(ACE_ROOT)/ace/OS_String.inl \
    - $(ACE_ROOT)/ace/OS_Memory.h \
    - $(ACE_ROOT)/ace/OS_Memory.inl \
    - $(ACE_ROOT)/ace/OS_TLI.h \
    - $(ACE_ROOT)/ace/OS_TLI.inl \
    - $(ACE_ROOT)/ace/Time_Value.h \
    - $(ACE_ROOT)/ace/Time_Value.inl \
    - $(ACE_ROOT)/ace/Default_Constants.h \
    - $(ACE_ROOT)/ace/Min_Max.h \
    - $(ACE_ROOT)/ace/streams.h \
    - $(ACE_ROOT)/ace/OS.i \
    - $(ACE_ROOT)/ace/Shared_Object.i \
    - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
    - $(ACE_ROOT)/ace/Event_Handler.h \
    - $(ACE_ROOT)/ace/Event_Handler.i \
    - $(ACE_ROOT)/ace/DLL.h \
    - $(ACE_ROOT)/ace/Service_Object.i \
    - $(ACE_ROOT)/ace/Thread_Manager.h \
    - $(ACE_ROOT)/ace/Thread.h \
    - $(ACE_ROOT)/ace/Thread_Adapter.h \
    - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
    - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
    - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
    - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
    - $(ACE_ROOT)/ace/Thread_Adapter.inl \
    - $(ACE_ROOT)/ace/Thread.i \
    - $(ACE_ROOT)/ace/Thread_Exit.h \
    - $(ACE_ROOT)/ace/Thread_Control.h \
    - $(ACE_ROOT)/ace/Thread_Control.inl \
    - $(ACE_ROOT)/ace/Synch.h \
    - $(ACE_ROOT)/ace/Synch.i \
    - $(ACE_ROOT)/ace/Synch_T.h \
    - $(ACE_ROOT)/ace/Synch_T.i \
    - $(ACE_ROOT)/ace/Synch_T.cpp \
    - $(ACE_ROOT)/ace/Log_Msg.h \
    - $(ACE_ROOT)/ace/Log_Priority.h \
    - $(ACE_ROOT)/ace/Unbounded_Queue.h \
    - $(ACE_ROOT)/ace/Node.h \
    - $(ACE_ROOT)/ace/Node.cpp \
    - $(ACE_ROOT)/ace/Unbounded_Queue.inl \
    - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
    - $(ACE_ROOT)/ace/Malloc_Base.h \
    - $(ACE_ROOT)/ace/Containers.h \
    - $(ACE_ROOT)/ace/Containers.i \
    - $(ACE_ROOT)/ace/Containers_T.h \
    - $(ACE_ROOT)/ace/Array_Base.h \
    - $(ACE_ROOT)/ace/Array_Base.inl \
    - $(ACE_ROOT)/ace/Array_Base.cpp \
    - $(ACE_ROOT)/ace/Unbounded_Set.h \
    - $(ACE_ROOT)/ace/Unbounded_Set.inl \
    - $(ACE_ROOT)/ace/Unbounded_Set.cpp \
    - $(ACE_ROOT)/ace/Containers_T.i \
    - $(ACE_ROOT)/ace/Containers_T.cpp \
    - $(ACE_ROOT)/ace/Free_List.h \
    - $(ACE_ROOT)/ace/Free_List.i \
    - $(ACE_ROOT)/ace/Free_List.cpp \
    - $(ACE_ROOT)/ace/Singleton.h \
    - $(ACE_ROOT)/ace/Singleton.i \
    - $(ACE_ROOT)/ace/Singleton.cpp \
    - $(ACE_ROOT)/ace/Object_Manager.h \
    - $(ACE_ROOT)/ace/Object_Manager.i \
    - $(ACE_ROOT)/ace/Managed_Object.h \
    - $(ACE_ROOT)/ace/Managed_Object.i \
    - $(ACE_ROOT)/ace/Managed_Object.cpp \
    - $(ACE_ROOT)/ace/Framework_Component.h \
    - $(ACE_ROOT)/ace/Framework_Component.inl \
    - $(ACE_ROOT)/ace/ACE.h \
    - $(ACE_ROOT)/ace/Flag_Manip.h \
    - $(ACE_ROOT)/ace/Flag_Manip.i \
    - $(ACE_ROOT)/ace/Handle_Ops.h \
    - $(ACE_ROOT)/ace/Handle_Ops.i \
    - $(ACE_ROOT)/ace/Lib_Find.h \
    - $(ACE_ROOT)/ace/Lib_Find.i \
    - $(ACE_ROOT)/ace/Init_ACE.h \
    - $(ACE_ROOT)/ace/Init_ACE.i \
    - $(ACE_ROOT)/ace/Sock_Connect.h \
    - $(ACE_ROOT)/ace/Sock_Connect.i \
    - $(ACE_ROOT)/ace/ACE.i \
    - $(ACE_ROOT)/ace/Framework_Component_T.h \
    - $(ACE_ROOT)/ace/Framework_Component_T.inl \
    - $(ACE_ROOT)/ace/Framework_Component_T.cpp \
    - $(ACE_ROOT)/ace/Thread_Manager.i \
    - $(ACE_ROOT)/ace/Task.i \
    - $(ACE_ROOT)/ace/Task_T.h \
    - $(ACE_ROOT)/ace/Message_Queue.h \
    - $(ACE_ROOT)/ace/Message_Block.h \
    - $(ACE_ROOT)/ace/Message_Block.i \
    - $(ACE_ROOT)/ace/Message_Block_T.h \
    - $(ACE_ROOT)/ace/Message_Block_T.i \
    - $(ACE_ROOT)/ace/Message_Block_T.cpp \
    - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
    - $(ACE_ROOT)/ace/Message_Queue_T.h \
    - $(ACE_ROOT)/ace/Message_Queue_T.i \
    - $(ACE_ROOT)/ace/Message_Queue_T.cpp \
    - $(ACE_ROOT)/ace/Notification_Strategy.h \
    - $(ACE_ROOT)/ace/Notification_Strategy.inl \
    - $(ACE_ROOT)/ace/Message_Queue.i \
    - $(ACE_ROOT)/ace/Task_T.i \
    - $(ACE_ROOT)/ace/Task_T.cpp \
    - $(ACE_ROOT)/ace/Module.h \
    - $(ACE_ROOT)/ace/Module.i \
    - $(ACE_ROOT)/ace/Module.cpp \
    - $(ACE_ROOT)/ace/Stream_Modules.h \
    - $(ACE_ROOT)/ace/Stream_Modules.cpp \
    - Dispatcher_Impl.h Dispatcher_Impl.i Dispatcher_Task.h \
    - Dispatcher_Task.i Default_Dispatcher_Impl.i
    -
    -.obj/Dispatcher_Impl.o .obj/Dispatcher_Impl.so .shobj/Dispatcher_Impl.o .shobj/Dispatcher_Impl.so: Dispatcher_Impl.cpp Dispatcher_Impl.h \
    - $(ACE_ROOT)/ace/pre.h \
    - $(ACE_ROOT)/ace/Task.h \
    - $(ACE_ROOT)/ace/Service_Object.h \
    - $(ACE_ROOT)/ace/Shared_Object.h \
    - $(ACE_ROOT)/ace/ACE_export.h \
    - $(ACE_ROOT)/ace/post.h \
    - $(ACE_ROOT)/ace/ace_wchar.h \
    - $(ACE_ROOT)/ace/ace_wchar.inl \
    - $(ACE_ROOT)/ace/OS.h \
    - $(ACE_ROOT)/ace/OS_Dirent.h \
    - $(ACE_ROOT)/ace/OS_Export.h \
    - $(ACE_ROOT)/ace/OS_Errno.h \
    - $(ACE_ROOT)/ace/OS_Errno.inl \
    - $(ACE_ROOT)/ace/OS_Dirent.inl \
    - $(ACE_ROOT)/ace/OS_String.h \
    - $(ACE_ROOT)/ace/Basic_Types.h \
    - $(ACE_ROOT)/ace/Basic_Types.i \
    - $(ACE_ROOT)/ace/OS_String.inl \
    - $(ACE_ROOT)/ace/OS_Memory.h \
    - $(ACE_ROOT)/ace/OS_Memory.inl \
    - $(ACE_ROOT)/ace/OS_TLI.h \
    - $(ACE_ROOT)/ace/OS_TLI.inl \
    - $(ACE_ROOT)/ace/Time_Value.h \
    - $(ACE_ROOT)/ace/Time_Value.inl \
    - $(ACE_ROOT)/ace/Default_Constants.h \
    - $(ACE_ROOT)/ace/Global_Macros.h \
    - $(ACE_ROOT)/ace/Min_Max.h \
    - $(ACE_ROOT)/ace/streams.h \
    - $(ACE_ROOT)/ace/Trace.h \
    - $(ACE_ROOT)/ace/OS.i \
    - $(ACE_ROOT)/ace/Shared_Object.i \
    - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
    - $(ACE_ROOT)/ace/Event_Handler.h \
    - $(ACE_ROOT)/ace/Event_Handler.i \
    - $(ACE_ROOT)/ace/DLL.h \
    - $(ACE_ROOT)/ace/Service_Object.i \
    - $(ACE_ROOT)/ace/Thread_Manager.h \
    - $(ACE_ROOT)/ace/Thread.h \
    - $(ACE_ROOT)/ace/Thread_Adapter.h \
    - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
    - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
    - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
    - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
    - $(ACE_ROOT)/ace/Thread_Adapter.inl \
    - $(ACE_ROOT)/ace/Thread.i \
    - $(ACE_ROOT)/ace/Thread_Exit.h \
    - $(ACE_ROOT)/ace/Thread_Control.h \
    - $(ACE_ROOT)/ace/Thread_Control.inl \
    - $(ACE_ROOT)/ace/Synch.h \
    - $(ACE_ROOT)/ace/Synch.i \
    - $(ACE_ROOT)/ace/Synch_T.h \
    - $(ACE_ROOT)/ace/Synch_T.i \
    - $(ACE_ROOT)/ace/Synch_T.cpp \
    - $(ACE_ROOT)/ace/Log_Msg.h \
    - $(ACE_ROOT)/ace/Log_Priority.h \
    - $(ACE_ROOT)/ace/Unbounded_Queue.h \
    - $(ACE_ROOT)/ace/Node.h \
    - $(ACE_ROOT)/ace/Node.cpp \
    - $(ACE_ROOT)/ace/Unbounded_Queue.inl \
    - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
    - $(ACE_ROOT)/ace/Malloc_Base.h \
    - $(ACE_ROOT)/ace/Containers.h \
    - $(ACE_ROOT)/ace/Containers.i \
    - $(ACE_ROOT)/ace/Containers_T.h \
    - $(ACE_ROOT)/ace/Array_Base.h \
    - $(ACE_ROOT)/ace/Array_Base.inl \
    - $(ACE_ROOT)/ace/Array_Base.cpp \
    - $(ACE_ROOT)/ace/Unbounded_Set.h \
    - $(ACE_ROOT)/ace/Unbounded_Set.inl \
    - $(ACE_ROOT)/ace/Unbounded_Set.cpp \
    - $(ACE_ROOT)/ace/Containers_T.i \
    - $(ACE_ROOT)/ace/Containers_T.cpp \
    - $(ACE_ROOT)/ace/Free_List.h \
    - $(ACE_ROOT)/ace/Free_List.i \
    - $(ACE_ROOT)/ace/Free_List.cpp \
    - $(ACE_ROOT)/ace/Singleton.h \
    - $(ACE_ROOT)/ace/Singleton.i \
    - $(ACE_ROOT)/ace/Singleton.cpp \
    - $(ACE_ROOT)/ace/Object_Manager.h \
    - $(ACE_ROOT)/ace/Object_Manager.i \
    - $(ACE_ROOT)/ace/Managed_Object.h \
    - $(ACE_ROOT)/ace/Managed_Object.i \
    - $(ACE_ROOT)/ace/Managed_Object.cpp \
    - $(ACE_ROOT)/ace/Framework_Component.h \
    - $(ACE_ROOT)/ace/Framework_Component.inl \
    - $(ACE_ROOT)/ace/ACE.h \
    - $(ACE_ROOT)/ace/Flag_Manip.h \
    - $(ACE_ROOT)/ace/Flag_Manip.i \
    - $(ACE_ROOT)/ace/Handle_Ops.h \
    - $(ACE_ROOT)/ace/Handle_Ops.i \
    - $(ACE_ROOT)/ace/Lib_Find.h \
    - $(ACE_ROOT)/ace/Lib_Find.i \
    - $(ACE_ROOT)/ace/Init_ACE.h \
    - $(ACE_ROOT)/ace/Init_ACE.i \
    - $(ACE_ROOT)/ace/Sock_Connect.h \
    - $(ACE_ROOT)/ace/Sock_Connect.i \
    - $(ACE_ROOT)/ace/ACE.i \
    - $(ACE_ROOT)/ace/Framework_Component_T.h \
    - $(ACE_ROOT)/ace/Framework_Component_T.inl \
    - $(ACE_ROOT)/ace/Framework_Component_T.cpp \
    - $(ACE_ROOT)/ace/Thread_Manager.i \
    - $(ACE_ROOT)/ace/Task.i \
    - $(ACE_ROOT)/ace/Task_T.h \
    - $(ACE_ROOT)/ace/Message_Queue.h \
    - $(ACE_ROOT)/ace/Message_Block.h \
    - $(ACE_ROOT)/ace/Message_Block.i \
    - $(ACE_ROOT)/ace/Message_Block_T.h \
    - $(ACE_ROOT)/ace/Message_Block_T.i \
    - $(ACE_ROOT)/ace/Message_Block_T.cpp \
    - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
    - $(ACE_ROOT)/ace/Message_Queue_T.h \
    - $(ACE_ROOT)/ace/Message_Queue_T.i \
    - $(ACE_ROOT)/ace/Message_Queue_T.cpp \
    - $(ACE_ROOT)/ace/Notification_Strategy.h \
    - $(ACE_ROOT)/ace/Notification_Strategy.inl \
    - $(ACE_ROOT)/ace/Message_Queue.i \
    - $(ACE_ROOT)/ace/Task_T.i \
    - $(ACE_ROOT)/ace/Task_T.cpp \
    - $(ACE_ROOT)/ace/Module.h \
    - $(ACE_ROOT)/ace/Module.i \
    - $(ACE_ROOT)/ace/Module.cpp \
    - $(ACE_ROOT)/ace/Stream_Modules.h \
    - $(ACE_ROOT)/ace/Stream_Modules.cpp \
    - $(ACE_ROOT)/ace/Auto_Ptr.h \
    - $(ACE_ROOT)/ace/Auto_Ptr.i \
    - $(ACE_ROOT)/ace/Auto_Ptr.cpp \
    - kokyu_export.h Kokyu.h Kokyu.i Dispatcher_Impl.i
    -
    -.obj/Dispatcher_Task.o .obj/Dispatcher_Task.so .shobj/Dispatcher_Task.o .shobj/Dispatcher_Task.so: Dispatcher_Task.cpp Dispatcher_Task.h \
    - $(ACE_ROOT)/ace/pre.h \
    - $(ACE_ROOT)/ace/Task.h \
    - $(ACE_ROOT)/ace/Service_Object.h \
    - $(ACE_ROOT)/ace/Shared_Object.h \
    - $(ACE_ROOT)/ace/ACE_export.h \
    - $(ACE_ROOT)/ace/post.h \
    - $(ACE_ROOT)/ace/ace_wchar.h \
    - $(ACE_ROOT)/ace/ace_wchar.inl \
    - $(ACE_ROOT)/ace/OS.h \
    - $(ACE_ROOT)/ace/OS_Dirent.h \
    - $(ACE_ROOT)/ace/OS_Export.h \
    - $(ACE_ROOT)/ace/OS_Errno.h \
    - $(ACE_ROOT)/ace/OS_Errno.inl \
    - $(ACE_ROOT)/ace/OS_Dirent.inl \
    - $(ACE_ROOT)/ace/OS_String.h \
    - $(ACE_ROOT)/ace/Basic_Types.h \
    - $(ACE_ROOT)/ace/Basic_Types.i \
    - $(ACE_ROOT)/ace/OS_String.inl \
    - $(ACE_ROOT)/ace/OS_Memory.h \
    - $(ACE_ROOT)/ace/OS_Memory.inl \
    - $(ACE_ROOT)/ace/OS_TLI.h \
    - $(ACE_ROOT)/ace/OS_TLI.inl \
    - $(ACE_ROOT)/ace/Time_Value.h \
    - $(ACE_ROOT)/ace/Time_Value.inl \
    - $(ACE_ROOT)/ace/Default_Constants.h \
    - $(ACE_ROOT)/ace/Global_Macros.h \
    - $(ACE_ROOT)/ace/Min_Max.h \
    - $(ACE_ROOT)/ace/streams.h \
    - $(ACE_ROOT)/ace/Trace.h \
    - $(ACE_ROOT)/ace/OS.i \
    - $(ACE_ROOT)/ace/Shared_Object.i \
    - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
    - $(ACE_ROOT)/ace/Event_Handler.h \
    - $(ACE_ROOT)/ace/Event_Handler.i \
    - $(ACE_ROOT)/ace/DLL.h \
    - $(ACE_ROOT)/ace/Service_Object.i \
    - $(ACE_ROOT)/ace/Thread_Manager.h \
    - $(ACE_ROOT)/ace/Thread.h \
    - $(ACE_ROOT)/ace/Thread_Adapter.h \
    - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
    - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
    - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
    - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
    - $(ACE_ROOT)/ace/Thread_Adapter.inl \
    - $(ACE_ROOT)/ace/Thread.i \
    - $(ACE_ROOT)/ace/Thread_Exit.h \
    - $(ACE_ROOT)/ace/Thread_Control.h \
    - $(ACE_ROOT)/ace/Thread_Control.inl \
    - $(ACE_ROOT)/ace/Synch.h \
    - $(ACE_ROOT)/ace/Synch.i \
    - $(ACE_ROOT)/ace/Synch_T.h \
    - $(ACE_ROOT)/ace/Synch_T.i \
    - $(ACE_ROOT)/ace/Synch_T.cpp \
    - $(ACE_ROOT)/ace/Log_Msg.h \
    - $(ACE_ROOT)/ace/Log_Priority.h \
    - $(ACE_ROOT)/ace/Unbounded_Queue.h \
    - $(ACE_ROOT)/ace/Node.h \
    - $(ACE_ROOT)/ace/Node.cpp \
    - $(ACE_ROOT)/ace/Unbounded_Queue.inl \
    - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
    - $(ACE_ROOT)/ace/Malloc_Base.h \
    - $(ACE_ROOT)/ace/Containers.h \
    - $(ACE_ROOT)/ace/Containers.i \
    - $(ACE_ROOT)/ace/Containers_T.h \
    - $(ACE_ROOT)/ace/Array_Base.h \
    - $(ACE_ROOT)/ace/Array_Base.inl \
    - $(ACE_ROOT)/ace/Array_Base.cpp \
    - $(ACE_ROOT)/ace/Unbounded_Set.h \
    - $(ACE_ROOT)/ace/Unbounded_Set.inl \
    - $(ACE_ROOT)/ace/Unbounded_Set.cpp \
    - $(ACE_ROOT)/ace/Containers_T.i \
    - $(ACE_ROOT)/ace/Containers_T.cpp \
    - $(ACE_ROOT)/ace/Free_List.h \
    - $(ACE_ROOT)/ace/Free_List.i \
    - $(ACE_ROOT)/ace/Free_List.cpp \
    - $(ACE_ROOT)/ace/Singleton.h \
    - $(ACE_ROOT)/ace/Singleton.i \
    - $(ACE_ROOT)/ace/Singleton.cpp \
    - $(ACE_ROOT)/ace/Object_Manager.h \
    - $(ACE_ROOT)/ace/Object_Manager.i \
    - $(ACE_ROOT)/ace/Managed_Object.h \
    - $(ACE_ROOT)/ace/Managed_Object.i \
    - $(ACE_ROOT)/ace/Managed_Object.cpp \
    - $(ACE_ROOT)/ace/Framework_Component.h \
    - $(ACE_ROOT)/ace/Framework_Component.inl \
    - $(ACE_ROOT)/ace/ACE.h \
    - $(ACE_ROOT)/ace/Flag_Manip.h \
    - $(ACE_ROOT)/ace/Flag_Manip.i \
    - $(ACE_ROOT)/ace/Handle_Ops.h \
    - $(ACE_ROOT)/ace/Handle_Ops.i \
    - $(ACE_ROOT)/ace/Lib_Find.h \
    - $(ACE_ROOT)/ace/Lib_Find.i \
    - $(ACE_ROOT)/ace/Init_ACE.h \
    - $(ACE_ROOT)/ace/Init_ACE.i \
    - $(ACE_ROOT)/ace/Sock_Connect.h \
    - $(ACE_ROOT)/ace/Sock_Connect.i \
    - $(ACE_ROOT)/ace/ACE.i \
    - $(ACE_ROOT)/ace/Framework_Component_T.h \
    - $(ACE_ROOT)/ace/Framework_Component_T.inl \
    - $(ACE_ROOT)/ace/Framework_Component_T.cpp \
    - $(ACE_ROOT)/ace/Thread_Manager.i \
    - $(ACE_ROOT)/ace/Task.i \
    - $(ACE_ROOT)/ace/Task_T.h \
    - $(ACE_ROOT)/ace/Message_Queue.h \
    - $(ACE_ROOT)/ace/Message_Block.h \
    - $(ACE_ROOT)/ace/Message_Block.i \
    - $(ACE_ROOT)/ace/Message_Block_T.h \
    - $(ACE_ROOT)/ace/Message_Block_T.i \
    - $(ACE_ROOT)/ace/Message_Block_T.cpp \
    - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
    - $(ACE_ROOT)/ace/Message_Queue_T.h \
    - $(ACE_ROOT)/ace/Message_Queue_T.i \
    - $(ACE_ROOT)/ace/Message_Queue_T.cpp \
    - $(ACE_ROOT)/ace/Notification_Strategy.h \
    - $(ACE_ROOT)/ace/Notification_Strategy.inl \
    - $(ACE_ROOT)/ace/Message_Queue.i \
    - $(ACE_ROOT)/ace/Task_T.i \
    - $(ACE_ROOT)/ace/Task_T.cpp \
    - $(ACE_ROOT)/ace/Module.h \
    - $(ACE_ROOT)/ace/Module.i \
    - $(ACE_ROOT)/ace/Module.cpp \
    - $(ACE_ROOT)/ace/Stream_Modules.h \
    - $(ACE_ROOT)/ace/Stream_Modules.cpp \
    - kokyu_export.h Kokyu.h \
    - $(ACE_ROOT)/ace/Auto_Ptr.h \
    - $(ACE_ROOT)/ace/Auto_Ptr.i \
    - $(ACE_ROOT)/ace/Auto_Ptr.cpp Kokyu.i \
    - Dispatcher_Task.i
    -
    -.obj/Default_Dispatcher_Impl.o .obj/Default_Dispatcher_Impl.so .shobj/Default_Dispatcher_Impl.o .shobj/Default_Dispatcher_Impl.so: Default_Dispatcher_Impl.cpp \
    - Default_Dispatcher_Impl.h \
    - $(ACE_ROOT)/ace/pre.h \
    - $(ACE_ROOT)/ace/Task.h \
    - $(ACE_ROOT)/ace/Service_Object.h \
    - $(ACE_ROOT)/ace/Shared_Object.h \
    - $(ACE_ROOT)/ace/ACE_export.h \
    - $(ACE_ROOT)/ace/post.h \
    - $(ACE_ROOT)/ace/ace_wchar.h \
    - $(ACE_ROOT)/ace/ace_wchar.inl \
    - $(ACE_ROOT)/ace/OS.h \
    - $(ACE_ROOT)/ace/OS_Dirent.h \
    - $(ACE_ROOT)/ace/OS_Export.h \
    - $(ACE_ROOT)/ace/OS_Errno.h \
    - $(ACE_ROOT)/ace/OS_Errno.inl \
    - $(ACE_ROOT)/ace/OS_Dirent.inl \
    - $(ACE_ROOT)/ace/OS_String.h \
    - $(ACE_ROOT)/ace/Basic_Types.h \
    - $(ACE_ROOT)/ace/Basic_Types.i \
    - $(ACE_ROOT)/ace/OS_String.inl \
    - $(ACE_ROOT)/ace/OS_Memory.h \
    - $(ACE_ROOT)/ace/OS_Memory.inl \
    - $(ACE_ROOT)/ace/OS_TLI.h \
    - $(ACE_ROOT)/ace/OS_TLI.inl \
    - $(ACE_ROOT)/ace/Time_Value.h \
    - $(ACE_ROOT)/ace/Time_Value.inl \
    - $(ACE_ROOT)/ace/Default_Constants.h \
    - $(ACE_ROOT)/ace/Global_Macros.h \
    - $(ACE_ROOT)/ace/Min_Max.h \
    - $(ACE_ROOT)/ace/streams.h \
    - $(ACE_ROOT)/ace/Trace.h \
    - $(ACE_ROOT)/ace/OS.i \
    - $(ACE_ROOT)/ace/Shared_Object.i \
    - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
    - $(ACE_ROOT)/ace/Event_Handler.h \
    - $(ACE_ROOT)/ace/Event_Handler.i \
    - $(ACE_ROOT)/ace/DLL.h \
    - $(ACE_ROOT)/ace/Service_Object.i \
    - $(ACE_ROOT)/ace/Thread_Manager.h \
    - $(ACE_ROOT)/ace/Thread.h \
    - $(ACE_ROOT)/ace/Thread_Adapter.h \
    - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
    - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
    - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
    - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
    - $(ACE_ROOT)/ace/Thread_Adapter.inl \
    - $(ACE_ROOT)/ace/Thread.i \
    - $(ACE_ROOT)/ace/Thread_Exit.h \
    - $(ACE_ROOT)/ace/Thread_Control.h \
    - $(ACE_ROOT)/ace/Thread_Control.inl \
    - $(ACE_ROOT)/ace/Synch.h \
    - $(ACE_ROOT)/ace/Synch.i \
    - $(ACE_ROOT)/ace/Synch_T.h \
    - $(ACE_ROOT)/ace/Synch_T.i \
    - $(ACE_ROOT)/ace/Synch_T.cpp \
    - $(ACE_ROOT)/ace/Log_Msg.h \
    - $(ACE_ROOT)/ace/Log_Priority.h \
    - $(ACE_ROOT)/ace/Unbounded_Queue.h \
    - $(ACE_ROOT)/ace/Node.h \
    - $(ACE_ROOT)/ace/Node.cpp \
    - $(ACE_ROOT)/ace/Unbounded_Queue.inl \
    - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
    - $(ACE_ROOT)/ace/Malloc_Base.h \
    - $(ACE_ROOT)/ace/Containers.h \
    - $(ACE_ROOT)/ace/Containers.i \
    - $(ACE_ROOT)/ace/Containers_T.h \
    - $(ACE_ROOT)/ace/Array_Base.h \
    - $(ACE_ROOT)/ace/Array_Base.inl \
    - $(ACE_ROOT)/ace/Array_Base.cpp \
    - $(ACE_ROOT)/ace/Unbounded_Set.h \
    - $(ACE_ROOT)/ace/Unbounded_Set.inl \
    - $(ACE_ROOT)/ace/Unbounded_Set.cpp \
    - $(ACE_ROOT)/ace/Containers_T.i \
    - $(ACE_ROOT)/ace/Containers_T.cpp \
    - $(ACE_ROOT)/ace/Free_List.h \
    - $(ACE_ROOT)/ace/Free_List.i \
    - $(ACE_ROOT)/ace/Free_List.cpp \
    - $(ACE_ROOT)/ace/Singleton.h \
    - $(ACE_ROOT)/ace/Singleton.i \
    - $(ACE_ROOT)/ace/Singleton.cpp \
    - $(ACE_ROOT)/ace/Object_Manager.h \
    - $(ACE_ROOT)/ace/Object_Manager.i \
    - $(ACE_ROOT)/ace/Managed_Object.h \
    - $(ACE_ROOT)/ace/Managed_Object.i \
    - $(ACE_ROOT)/ace/Managed_Object.cpp \
    - $(ACE_ROOT)/ace/Framework_Component.h \
    - $(ACE_ROOT)/ace/Framework_Component.inl \
    - $(ACE_ROOT)/ace/ACE.h \
    - $(ACE_ROOT)/ace/Flag_Manip.h \
    - $(ACE_ROOT)/ace/Flag_Manip.i \
    - $(ACE_ROOT)/ace/Handle_Ops.h \
    - $(ACE_ROOT)/ace/Handle_Ops.i \
    - $(ACE_ROOT)/ace/Lib_Find.h \
    - $(ACE_ROOT)/ace/Lib_Find.i \
    - $(ACE_ROOT)/ace/Init_ACE.h \
    - $(ACE_ROOT)/ace/Init_ACE.i \
    - $(ACE_ROOT)/ace/Sock_Connect.h \
    - $(ACE_ROOT)/ace/Sock_Connect.i \
    - $(ACE_ROOT)/ace/ACE.i \
    - $(ACE_ROOT)/ace/Framework_Component_T.h \
    - $(ACE_ROOT)/ace/Framework_Component_T.inl \
    - $(ACE_ROOT)/ace/Framework_Component_T.cpp \
    - $(ACE_ROOT)/ace/Thread_Manager.i \
    - $(ACE_ROOT)/ace/Task.i \
    - $(ACE_ROOT)/ace/Task_T.h \
    - $(ACE_ROOT)/ace/Message_Queue.h \
    - $(ACE_ROOT)/ace/Message_Block.h \
    - $(ACE_ROOT)/ace/Message_Block.i \
    - $(ACE_ROOT)/ace/Message_Block_T.h \
    - $(ACE_ROOT)/ace/Message_Block_T.i \
    - $(ACE_ROOT)/ace/Message_Block_T.cpp \
    - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
    - $(ACE_ROOT)/ace/Message_Queue_T.h \
    - $(ACE_ROOT)/ace/Message_Queue_T.i \
    - $(ACE_ROOT)/ace/Message_Queue_T.cpp \
    - $(ACE_ROOT)/ace/Notification_Strategy.h \
    - $(ACE_ROOT)/ace/Notification_Strategy.inl \
    - $(ACE_ROOT)/ace/Message_Queue.i \
    - $(ACE_ROOT)/ace/Task_T.i \
    - $(ACE_ROOT)/ace/Task_T.cpp \
    - $(ACE_ROOT)/ace/Module.h \
    - $(ACE_ROOT)/ace/Module.i \
    - $(ACE_ROOT)/ace/Module.cpp \
    - $(ACE_ROOT)/ace/Stream_Modules.h \
    - $(ACE_ROOT)/ace/Stream_Modules.cpp \
    - $(ACE_ROOT)/ace/Auto_Ptr.h \
    - $(ACE_ROOT)/ace/Auto_Ptr.i \
    - $(ACE_ROOT)/ace/Auto_Ptr.cpp \
    - kokyu_export.h Kokyu.h Kokyu.i Dispatcher_Impl.h Dispatcher_Impl.i \
    - Dispatcher_Task.h Dispatcher_Task.i Default_Dispatcher_Impl.i
    -
    -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
    diff --git a/Kokyu/kokyu_export.h b/Kokyu/kokyu_export.h
    deleted file mode 100644
    index 8b15053da15..00000000000
    --- a/Kokyu/kokyu_export.h
    +++ /dev/null
    @@ -1,55 +0,0 @@
    -// -*- C++ -*-
    -// $Id$
    -// Definition for Win32 Export directives.
    -// This file is generated automatically by generate_export_file.pl Kokyu
    -// ------------------------------
    -#ifndef KOKYU_EXPORT_H
    -#define KOKYU_EXPORT_H
    -
    -#include "ace/config-all.h"
    -
    -#if defined (ACE_AS_STATIC_LIBS)
    -#  if !defined (KOKYU_HAS_DLL)
    -#    define KOKYU_HAS_DLL 0
    -#  endif /* ! KOKYU_HAS_DLL */
    -#else
    -#  if !defined (KOKYU_HAS_DLL)
    -#    define KOKYU_HAS_DLL 1
    -#  endif /* ! KOKYU_HAS_DLL */
    -#endif
    -
    -#if defined (KOKYU_HAS_DLL) && (KOKYU_HAS_DLL == 1)
    -#  if defined (KOKYU_BUILD_DLL)
    -#    define Kokyu_Export ACE_Proper_Export_Flag
    -#    define KOKYU_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
    -#    define KOKYU_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
    -#  else /* KOKYU_BUILD_DLL */
    -#    define Kokyu_Export ACE_Proper_Import_Flag
    -#    define KOKYU_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
    -#    define KOKYU_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
    -#  endif /* KOKYU_BUILD_DLL */
    -#else /* KOKYU_HAS_DLL == 1 */
    -#  define Kokyu_Export
    -#  define KOKYU_SINGLETON_DECLARATION(T)
    -#  define KOKYU_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
    -#endif /* KOKYU_HAS_DLL == 1 */
    -
    -// Set KOKYU_NTRACE = 0 to turn on library specific tracing even if
    -// tracing is turned off for ACE.
    -#if !defined (KOKYU_NTRACE)
    -#  if (ACE_NTRACE == 1)
    -#    define KOKYU_NTRACE 1
    -#  else /* (ACE_NTRACE == 1) */
    -#    define KOKYU_NTRACE 0
    -#  endif /* (ACE_NTRACE == 1) */
    -#endif /* !KOKYU_NTRACE */
    -
    -#if (KOKYU_NTRACE == 1)
    -#  define KOKYU_TRACE(X)
    -#else /* (KOKYU_NTRACE == 1) */
    -#  define KOKYU_TRACE(X) ACE_TRACE_IMPL(X)
    -#endif /* (KOKYU_NTRACE == 1) */
    -
    -#endif /* KOKYU_EXPORT_H */
    -
    -// End of auto generated file.
    diff --git a/Kokyu/tests/EDF/EDF.dsp b/Kokyu/tests/EDF/EDF.dsp
    deleted file mode 100644
    index 2684638fcae..00000000000
    --- a/Kokyu/tests/EDF/EDF.dsp
    +++ /dev/null
    @@ -1,104 +0,0 @@
    -# Microsoft Developer Studio Project File - Name="EDF" - Package Owner=<4>
    -# Microsoft Developer Studio Generated Build File, Format Version 6.00
    -# ** DO NOT EDIT **
    -
    -# TARGTYPE "Win32 (x86) Console Application" 0x0103
    -
    -CFG=EDF - Win32 Debug
    -!MESSAGE This is not a valid makefile. To build this project using NMAKE,
    -!MESSAGE use the Export Makefile command and run
    -!MESSAGE 
    -!MESSAGE NMAKE /f "EDF.mak".
    -!MESSAGE 
    -!MESSAGE You can specify a configuration when running NMAKE
    -!MESSAGE by defining the macro CFG on the command line. For example:
    -!MESSAGE 
    -!MESSAGE NMAKE /f "EDF.mak" CFG="EDF - Win32 Debug"
    -!MESSAGE 
    -!MESSAGE Possible choices for configuration are:
    -!MESSAGE 
    -!MESSAGE "EDF - Win32 Release" (based on "Win32 (x86) Console Application")
    -!MESSAGE "EDF - Win32 Debug" (based on "Win32 (x86) Console Application")
    -!MESSAGE 
    -
    -# Begin Project
    -# PROP AllowPerConfigDependencies 0
    -# PROP Scc_ProjName ""
    -# PROP Scc_LocalPath ""
    -CPP=cl.exe
    -RSC=rc.exe
    -
    -!IF  "$(CFG)" == "EDF - Win32 Release"
    -
    -# PROP BASE Use_MFC 0
    -# PROP BASE Use_Debug_Libraries 0
    -# PROP BASE Output_Dir "Release"
    -# PROP BASE Intermediate_Dir "Release"
    -# PROP BASE Target_Dir ""
    -# PROP Use_MFC 0
    -# PROP Use_Debug_Libraries 0
    -# PROP Output_Dir "Release"
    -# PROP Intermediate_Dir "Release"
    -# PROP Ignore_Export_Lib 0
    -# PROP Target_Dir ""
    -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
    -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
    -# SUBTRACT CPP /YX
    -# ADD BASE RSC /l 0x409 /d "NDEBUG"
    -# ADD RSC /l 0x409 /d "NDEBUG"
    -BSC32=bscmake.exe
    -# ADD BASE BSC32 /nologo
    -# ADD BSC32 /nologo
    -LINK32=link.exe
    -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
    -# ADD LINK32 ..\..\..\ace\aced.lib ..\..\Kokyud.lib /nologo /subsystem:console /machine:I386
    -
    -!ELSEIF  "$(CFG)" == "EDF - Win32 Debug"
    -
    -# PROP BASE Use_MFC 0
    -# PROP BASE Use_Debug_Libraries 1
    -# PROP BASE Output_Dir "Debug"
    -# PROP BASE Intermediate_Dir "Debug"
    -# PROP BASE Target_Dir ""
    -# PROP Use_MFC 0
    -# PROP Use_Debug_Libraries 1
    -# PROP Output_Dir "Debug"
    -# PROP Intermediate_Dir "Debug"
    -# PROP Ignore_Export_Lib 0
    -# PROP Target_Dir ""
    -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c
    -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD  /c
    -# SUBTRACT CPP /YX
    -# ADD BASE RSC /l 0x409 /d "_DEBUG"
    -# ADD RSC /l 0x409 /d "_DEBUG"
    -BSC32=bscmake.exe
    -# ADD BASE BSC32 /nologo
    -# ADD BSC32 /nologo
    -LINK32=link.exe
    -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    -# ADD LINK32 ..\..\..\ace\aced.lib ..\..\Kokyud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    -
    -!ENDIF 
    -
    -# Begin Target
    -
    -# Name "EDF - Win32 Release"
    -# Name "EDF - Win32 Debug"
    -# Begin Group "Source Files"
    -
    -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
    -# Begin Source File
    -
    -SOURCE=.\test.cpp
    -# End Source File
    -# End Group
    -# Begin Group "Header Files"
    -
    -# PROP Default_Filter "h;hpp;hxx;hm;inl"
    -# End Group
    -# Begin Group "Resource Files"
    -
    -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
    -# End Group
    -# End Target
    -# End Project
    diff --git a/Kokyu/tests/EDF/EDF.dsw b/Kokyu/tests/EDF/EDF.dsw
    deleted file mode 100644
    index 57af290f426..00000000000
    --- a/Kokyu/tests/EDF/EDF.dsw
    +++ /dev/null
    @@ -1,29 +0,0 @@
    -Microsoft Developer Studio Workspace File, Format Version 6.00
    -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
    -
    -###############################################################################
    -
    -Project: "test"=.\EDF.dsp - Package Owner=<4>
    -
    -Package=<5>
    -{{{
    -}}}
    -
    -Package=<4>
    -{{{
    -}}}
    -
    -###############################################################################
    -
    -Global:
    -
    -Package=<5>
    -{{{
    -}}}
    -
    -Package=<3>
    -{{{
    -}}}
    -
    -###############################################################################
    -
    diff --git a/Kokyu/tests/EDF/test.cpp b/Kokyu/tests/EDF/test.cpp
    deleted file mode 100644
    index 24dc46310a5..00000000000
    --- a/Kokyu/tests/EDF/test.cpp
    +++ /dev/null
    @@ -1,96 +0,0 @@
    -// $Id$
    -
    -#include "ace/Auto_Ptr.h"
    -
    -#include "Kokyu.h"
    -#include "ace/Task.h"
    -#include "ace/Sched_Params.h"
    -
    -class MyCommand : public Kokyu::Dispatch_Command
    -{
    -public:
    -  MyCommand(int i)
    -    :Kokyu::Dispatch_Command(1),id_(i)
    -  {
    -  }
    -
    -  int execute()
    -  {
    -  ACE_hthread_t thr_handle;
    -  ACE_Thread::self (thr_handle);
    -  int prio;
    -
    -  if (ACE_Thread::getprio (thr_handle, prio) == -1)
    -  {
    -    if (errno == ENOTSUP)
    -    {
    -      ACE_DEBUG((LM_DEBUG,
    -                 ACE_TEXT ("getprior not supported on this platform\n")
    -               ));
    -      return 0;
    -    }
    -    ACE_ERROR_RETURN ((LM_ERROR,
    -                       ACE_TEXT ("%p\n"),
    -                       ACE_TEXT ("getprio failed")),
    -                      -1);
    -  }
    -
    -    ACE_DEBUG ((LM_DEBUG,
    -                ACE_TEXT (("(%t|prio=%d) | command %d executed\n")),
    -                prio, id_));
    -    return 0;
    -  }
    -
    -private:
    -  int id_;
    -};
    -
    -
    -int main (int,char**)
    -{
    -  Kokyu::ConfigInfoSet config_info(3);
    -
    -  Kokyu::Priority_t min_prio =
    -    ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
    -
    -  config_info[0].preemption_priority_ = 1;
    -  config_info[0].thread_priority_ = min_prio;
    -  config_info[0].dispatching_type_ = Kokyu::DEADLINE_DISPATCHING;
    -
    -  ACE_DEBUG ((LM_DEBUG, "before create_dispatcher\n" ));
    -  auto_ptr
    -    disp (Kokyu::Dispatcher_Factory::create_dispatcher (config_info));
    -
    -  ACE_ASSERT (disp.get() != 0);
    -
    -  MyCommand cmd1(1), cmd2(2), cmd3(3);
    -
    -  Kokyu::QoSDescriptor qos1, qos2, qos3;
    -
    -  // Get the current time.
    -  ACE_Time_Value current_time = ACE_OS::gettimeofday ();
    -
    -  ACE_Time_Value deadline1, deadline2, deadline3;
    -
    -  deadline1 = current_time + ACE_Time_Value(150,0);
    -  deadline2 = current_time + ACE_Time_Value(200,0);
    -  deadline3 = current_time + ACE_Time_Value(100,0);
    -
    -  qos1.preemption_priority_ = 1;
    -  qos1.deadline_ = deadline1;
    -  qos2.preemption_priority_ = 1;
    -  qos2.deadline_ = deadline2;
    -  qos3.preemption_priority_ = 1;
    -  qos3.deadline_ = deadline3;
    -
    -  disp->dispatch (&cmd1, qos1);
    -  printf("inserted 1\n");
    -  disp->dispatch (&cmd2, qos2);
    -  printf("inserted 2\n");
    -  disp->dispatch (&cmd3, qos3);
    -  printf("inserted 3\n");
    -
    -  while(1){}
    -
    -  return 0;
    -}
    diff --git a/Kokyu/tests/FIFO/FIFO.dsp b/Kokyu/tests/FIFO/FIFO.dsp
    deleted file mode 100644
    index 1eb83b8b161..00000000000
    --- a/Kokyu/tests/FIFO/FIFO.dsp
    +++ /dev/null
    @@ -1,104 +0,0 @@
    -# Microsoft Developer Studio Project File - Name="FIFO" - Package Owner=<4>
    -# Microsoft Developer Studio Generated Build File, Format Version 6.00
    -# ** DO NOT EDIT **
    -
    -# TARGTYPE "Win32 (x86) Console Application" 0x0103
    -
    -CFG=FIFO - Win32 Debug
    -!MESSAGE This is not a valid makefile. To build this project using NMAKE,
    -!MESSAGE use the Export Makefile command and run
    -!MESSAGE 
    -!MESSAGE NMAKE /f "FIFO.mak".
    -!MESSAGE 
    -!MESSAGE You can specify a configuration when running NMAKE
    -!MESSAGE by defining the macro CFG on the command line. For example:
    -!MESSAGE 
    -!MESSAGE NMAKE /f "FIFO.mak" CFG="FIFO - Win32 Debug"
    -!MESSAGE 
    -!MESSAGE Possible choices for configuration are:
    -!MESSAGE 
    -!MESSAGE "FIFO - Win32 Release" (based on "Win32 (x86) Console Application")
    -!MESSAGE "FIFO - Win32 Debug" (based on "Win32 (x86) Console Application")
    -!MESSAGE 
    -
    -# Begin Project
    -# PROP AllowPerConfigDependencies 0
    -# PROP Scc_ProjName ""
    -# PROP Scc_LocalPath ""
    -CPP=cl.exe
    -RSC=rc.exe
    -
    -!IF  "$(CFG)" == "FIFO - Win32 Release"
    -
    -# PROP BASE Use_MFC 0
    -# PROP BASE Use_Debug_Libraries 0
    -# PROP BASE Output_Dir "Release"
    -# PROP BASE Intermediate_Dir "Release"
    -# PROP BASE Target_Dir ""
    -# PROP Use_MFC 0
    -# PROP Use_Debug_Libraries 0
    -# PROP Output_Dir "Release"
    -# PROP Intermediate_Dir "Release"
    -# PROP Ignore_Export_Lib 0
    -# PROP Target_Dir ""
    -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
    -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
    -# SUBTRACT CPP /YX
    -# ADD BASE RSC /l 0x409 /d "NDEBUG"
    -# ADD RSC /l 0x409 /d "NDEBUG"
    -BSC32=bscmake.exe
    -# ADD BASE BSC32 /nologo
    -# ADD BSC32 /nologo
    -LINK32=link.exe
    -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
    -# ADD LINK32 ..\..\..\ace\aced.lib ..\..\Kokyud.lib /nologo /subsystem:console /machine:I386
    -
    -!ELSEIF  "$(CFG)" == "FIFO - Win32 Debug"
    -
    -# PROP BASE Use_MFC 0
    -# PROP BASE Use_Debug_Libraries 1
    -# PROP BASE Output_Dir "Debug"
    -# PROP BASE Intermediate_Dir "Debug"
    -# PROP BASE Target_Dir ""
    -# PROP Use_MFC 0
    -# PROP Use_Debug_Libraries 1
    -# PROP Output_Dir "Debug"
    -# PROP Intermediate_Dir "Debug"
    -# PROP Ignore_Export_Lib 0
    -# PROP Target_Dir ""
    -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c
    -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD  /c
    -# SUBTRACT CPP /YX
    -# ADD BASE RSC /l 0x409 /d "_DEBUG"
    -# ADD RSC /l 0x409 /d "_DEBUG"
    -BSC32=bscmake.exe
    -# ADD BASE BSC32 /nologo
    -# ADD BSC32 /nologo
    -LINK32=link.exe
    -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    -# ADD LINK32 ..\..\..\ace\aced.lib ..\..\Kokyud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    -
    -!ENDIF 
    -
    -# Begin Target
    -
    -# Name "FIFO - Win32 Release"
    -# Name "FIFO - Win32 Debug"
    -# Begin Group "Source Files"
    -
    -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
    -# Begin Source File
    -
    -SOURCE=.\test.cpp
    -# End Source File
    -# End Group
    -# Begin Group "Header Files"
    -
    -# PROP Default_Filter "h;hpp;hxx;hm;inl"
    -# End Group
    -# Begin Group "Resource Files"
    -
    -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
    -# End Group
    -# End Target
    -# End Project
    diff --git a/Kokyu/tests/FIFO/FIFO.dsw b/Kokyu/tests/FIFO/FIFO.dsw
    deleted file mode 100644
    index 0e51d4387e0..00000000000
    --- a/Kokyu/tests/FIFO/FIFO.dsw
    +++ /dev/null
    @@ -1,29 +0,0 @@
    -Microsoft Developer Studio Workspace File, Format Version 6.00
    -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
    -
    -###############################################################################
    -
    -Project: "test"=.\FIFO.dsp - Package Owner=<4>
    -
    -Package=<5>
    -{{{
    -}}}
    -
    -Package=<4>
    -{{{
    -}}}
    -
    -###############################################################################
    -
    -Global:
    -
    -Package=<5>
    -{{{
    -}}}
    -
    -Package=<3>
    -{{{
    -}}}
    -
    -###############################################################################
    -
    diff --git a/Kokyu/tests/FIFO/test.cpp b/Kokyu/tests/FIFO/test.cpp
    deleted file mode 100644
    index 6697e704bdb..00000000000
    --- a/Kokyu/tests/FIFO/test.cpp
    +++ /dev/null
    @@ -1,84 +0,0 @@
    -// $Id$
    -
    -#include "ace/Auto_Ptr.h"
    -
    -#include "Kokyu.h"
    -#include "ace/Task.h"
    -
    -class MyCommand : public Kokyu::Dispatch_Command
    -{
    -public:
    -  MyCommand(int i)
    -    :Kokyu::Dispatch_Command(1),id_(i)
    -  {
    -  }
    -
    -  int execute()
    -  {
    -  ACE_hthread_t thr_handle;
    -  ACE_Thread::self (thr_handle);
    -  int prio;
    -
    -  if (ACE_Thread::getprio (thr_handle, prio) == -1)
    -  {
    -    if (errno == ENOTSUP)
    -    {
    -      ACE_DEBUG((LM_DEBUG,
    -                 ACE_TEXT ("getprior not supported on this platform\n")
    -               ));
    -      return 0;
    -    }
    -    ACE_ERROR_RETURN ((LM_ERROR,
    -                       ACE_TEXT ("%p\n"),
    -                       ACE_TEXT ("getprio failed")),
    -                      -1);
    -  }
    -
    -    ACE_DEBUG ((LM_DEBUG,
    -                ACE_TEXT (("(%t|prio=%d) | command %d executed\n")),
    -                prio, id_));
    -    return 0;
    -  }
    -
    -private:
    -  int id_;
    -};
    -
    -
    -int main (int,char**)
    -{
    -  Kokyu::ConfigInfoSet config_info(3);
    -
    -  config_info[0].preemption_priority_ = 1;
    -  config_info[0].thread_priority_ = 15;
    -  config_info[0].dispatching_type_ = Kokyu::FIFO_DISPATCHING;
    -
    -  config_info[1].preemption_priority_ = 2;
    -  config_info[1].thread_priority_ = 2;
    -  config_info[1].dispatching_type_ = Kokyu::FIFO_DISPATCHING;
    -
    -  config_info[2].preemption_priority_ = 3;
    -  config_info[2].thread_priority_ = 0;
    -  config_info[2].dispatching_type_ = Kokyu::FIFO_DISPATCHING;
    -
    -  ACE_DEBUG ((LM_DEBUG, "before create_dispatcher\n" ));
    -  auto_ptr disp (Kokyu::Dispatcher_Factory::create_dispatcher (config_info));
    -
    -  ACE_ASSERT (disp.get() != 0);
    -
    -  MyCommand cmd1(1), cmd2(2), cmd3(3);
    -
    -  Kokyu::QoSDescriptor qos1, qos2, qos3;
    -
    -  qos1.preemption_priority_ = 2;
    -  qos2.preemption_priority_ = 3;
    -  qos3.preemption_priority_ = 1;
    -
    -  disp->dispatch (&cmd1, qos1);
    -  disp->dispatch (&cmd2, qos2);
    -  disp->dispatch (&cmd3, qos3);
    -
    -  while(1){}
    -
    -  return 0;
    -}
    diff --git a/Makefile b/Makefile
    deleted file mode 100644
    index e24162850f1..00000000000
    --- a/Makefile
    +++ /dev/null
    @@ -1,242 +0,0 @@
    -#----------------------------------------------------------------------------
    -#       $Id$
    -#
    -#       Top-level Makefile for the ACE toolkit libraries, tests, and
    -#       applications
    -#----------------------------------------------------------------------------
    -
    -#### Please see ACE-INSTALL.html for build information.
    -
    -#----------------------------------------------------------------------------
    -#       Local macros
    -#----------------------------------------------------------------------------
    -
    -INFO    = README \
    -          THANKS \
    -          VERSION
    -
    -DIRS    = ace \
    -	  ACEXML \
    -          netsvcs \
    -          tests \
    -          apps \
    -          examples \
    -          performance-tests \
    -          websvcs
    -
    -CLONE   = Makefile \
    -          ace \
    -          apps \
    -          bin \
    -          etc \
    -          examples \
    -          include \
    -          netsvcs \
    -          performance-tests \
    -          TAO \
    -          tests \
    -          websvcs \
    -	  ACEXML
    -
    -#----------------------------------------------------------------------------
    -#       Include macros and targets
    -#----------------------------------------------------------------------------
    -
    -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
    -include $(ACE_ROOT)/include/makeinclude/macros.GNU
    -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
    -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
    -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
    -
    -# Optional TAO targets.
    --include $(ACE_ROOT)/TAO/tao_targets.GNU
    -
    -# For the following to work you need to compile the
    -# $(ACE_ROOT)/bin/clone.cpp file and install it in your ~/bin
    -# directory (or some place similar).
    -
    -.PHONY: clone
    -clone:
    -	@for dir in $(CLONE); \
    -        do \
    -                (clone -s $(ACE_ROOT)/$$dir $$dir) \
    -        done
    -
    -CORE_DIRS= \
    -	ace \
    -	apps/gperf/src \
    -	TAO/tao \
    -	TAO/TAO_IDL \
    -	TAO/orbsvcs/orbsvcs \
    -	TAO/orbsvcs/Naming_Service
    -
    -.PHONY: Core reverseclean
    -Core:
    -	@for dir in $(CORE_DIRS); \
    -	do \
    -		$(MAKE) -C $$dir; \
    -	done
    -
    -reverseclean:
    -	@$(ACE_ROOT)/bin/reverse_clean $(DIRS)
    -
    -#### NOTE:  The following comments describe how to create kits.
    -####        It's intended for use by ACE+TAO developers and
    -####        maintainers only.  ACE+TAO users need not be concerned
    -####        with creating kits, just unpacking and using them.
    -
    -#### The "release" and "releaseall" targets can be used to create
    -#### the ACE and ACE+TAO kits.  By default, each creates a new beta
    -#### release.  To create a new minor or major release, add REL=minor
    -#### or REL=major, respectively, to the make invocation.
    -####
    -#### NOTE: the REL modifier applies to _both_ ACE and TAO in
    -#### releaseall!
    -####
    -#### To create a new ACE minor release and a TAO beta release:
    -####   % make release REL=minor
    -####   % cd TAO
    -####   % make release
    -####
    -#### There are some other release/releaseall options [default value is in
    -#### brackets]:
    -####   ACE_TAG [ACE version in your workspace]: prepend tag with -ta
    -####   TAO_TAG [TAO version in your workspace]: prepend tag with -tt
    -####
    -####   NOTE: the ACE and TAO versions will be updated automatically
    -####   by release/releaseall.  ACE_TAG and TAO_TAG can be overridden
    -####   to kit a particular version.
    -####
    -####   APPLY_NEW_TAG [enabled]: set to null to disable
    -####   CHECK [disabled]: set to -n to see what make_release will do, but not
    -####     do it
    -####   GENERATE_MAN_PAGES [enabled]: set to null to disable regeneration of
    -####     the ACE_wrappers/man/ hierarchy
    -####   INSTALL_KIT [enabled]: set to null to not install in public
    -####     ftp/http directory on host ace
    -####   REL [beta]: set to minor or major, optionally, when applying a new tag
    -####   ZIP_FILES [enabled]: set to -z to disable creation of .zip files
    -####
    -#### Example creation of ACE-only kit, version ACE-5_0_1 from current
    -#### workspace:
    -#### make release ACE_TAG='-ta ACE-5_0_1' APPLY_NEW_TAG= \
    -####   GENERATE_MAN_PAGES= INSTALL_KIT= ZIP_FILES=-z
    -
    -CONTROLLED_FILES = \
    -        ACE-INSTALL.html \
    -        ACE-install.sh \
    -        ASNMP \
    -        AUTHORS \
    -        COPYING \
    -        ChangeLog* \
    -        FAQ \
    -        Makefile \
    -        Makefile.am \
    -        PROBLEM-REPORT-FORM \
    -        README \
    -        THANKS \
    -        TODO \
    -        VERSION \
    -	ACEXML \
    -        acconfig.h \
    -        ace \
    -        ace-config.1.in \
    -        ace-config.in \
    -        aceConf.sh.in \
    -        apps \
    -        bin \
    -        docs \
    -        etc \
    -        examples \
    -        include \
    -        m4 \
    -        netsvcs \
    -        os-patches \
    -        performance-tests \
    -        tests \
    -        websvcs
    -
    -RELEASE_FILES = \
    -        $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
    -        ACE_wrappers/ACE-INSTALL \
    -        ACE_wrappers/man
    -
    -ALL_RELEASE_FILES = \
    -        $(RELEASE_FILES) \
    -        ACE_wrappers/TAO
    -
    -RELEASE_LIB_FILES = \
    -        ACE_wrappers/VERSION \
    -        ACE_wrappers/ace \
    -        ACE_wrappers/bin \
    -        ACE_wrappers/etc \
    -        ACE_wrappers/include \
    -        ACE_wrappers/m4 \
    -        ACE_wrappers/netsvcs \
    -        ACE_wrappers/tests \
    -        ACE_wrappers/websvcs
    -
    -# Files that should get tagged at release time but shouldn't be in any
    -# of the release file lists since they may already be in a directory
    -# found in those lists.
    -RELEASE_TAG_FILES = \
    -        html \
    -        man/Makefile.am \
    -        man/man3/Makefile.am
    -
    -.PHONY: release releasetao releaseall tag
    -
    -ACE_TAG_VALUE = $(shell head -1 VERSION | perl -ne \
    -                's/.* ([\d\.]+),.*\n/$$1/; tr/./_/; print "ACE-$$_";')
    -ACE_TAG       = -ta $(ACE_TAG_VALUE)
    -TAO_TAG_VALUE = $(shell head -1 TAO/VERSION | perl -ne \
    -                's/.* ([\d\.]+),.*\n/$$1/; tr/./_/; print "TAO-$$_";')
    -TAO_TAG       = -tt $(TAO_TAG_VALUE)
    -APPLY_NEW_TAG      = tag
    -CHECK              =
    -GENERATE_MAN_PAGES = -g
    -INSTALL_KIT        = -i
    -REL                = beta
    -ZIP_FILES          =
    -
    -#### The release target creates the ACE (only) kit.
    -release: $(APPLY_NEW_TAG)
    -	@$(ACE_ROOT)/bin/make_release -k ace $(ACE_TAG) \
    -         $(INSTALL_KIT) $(GENERATE_MAN_PAGES) $(ZIP_FILES) $(CHECK)
    -
    -tag:
    -	@$(ACE_ROOT)/bin/make_release $(CHECK) -k ace -v $(REL) -u
    -
    -#### The following target is for use by the TAO Makefile.  It should not
    -#### be called directly from the command line.  The releasetao target
    -#### creates the combined ACE-TAO kit.
    -releasetao:
    -	@$(ACE_ROOT)/bin/make_release -k ace+tao $(ACE_TAG) $(TAO_TAG) \
    -         $(INSTALL_KIT) $(GENERATE_MAN_PAGES) $(ZIP_FILES) $(CHECK)
    -
    -#### The releaseall target:
    -####   1) Creates the ACE kit.
    -####   2) Updates the TAO release (VERSION, ChangeLog, and tag) by
    -####      recursively invoking make release in the TAO directory.
    -####      The make then recursively invokes make releasetao in this
    -####      directory to create the combined ACE-TAO kit.
    -releaseall: $(APPLY_NEW_TAG)
    -	@cd TAO  &&  $(MAKE) -s release REL=$(REL)
    -
    -.PHONY: show_controlled_files show_release_files show_release_lib_files
    -.PHONY: show_release_tag_files
    -
    -show_controlled_files:
    -	@echo $(CONTROLLED_FILES)
    -
    -show_release_files:
    -	@echo $(RELEASE_FILES)
    -
    -show_release_lib_files:
    -	@echo $(RELEASE_LIB_FILES)
    -
    -show_release_tag_files:
    -	@echo $(RELEASE_TAG_FILES)
    -
    -ACE-INSTALL: ACE-INSTALL.html
    -	@lynx -dump $< > $@
    diff --git a/Makefile.am b/Makefile.am
    deleted file mode 100644
    index efa36037bf8..00000000000
    --- a/Makefile.am
    +++ /dev/null
    @@ -1,101 +0,0 @@
    -##---------------------------------------------------------------------------
    -##       $Id$
    -##
    -##       Top-level Makefile for the ACE toolkit libraries, tests, and
    -##       applications
    -##
    -##---------------------------------------------------------------------------
    -
    -##
    -##  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 #check-news
    -
    -bin_SCRIPTS = ace-config
    -
    -man_MANS = ace-config.1
    -
    -## Build the library directories first.
    -## The docs directory is currently handled by the "dist-hook" makefile target.
    -SUBDIRS = \
    -  ace \
    -  netsvcs \
    -  tests \
    -  apps \
    -  man
    -
    -##SUBDIRS = \
    -##          docs \
    -##          apps \
    -##          examples \
    -##          performance-tests \
    -##          bin \
    -##          ASNMP \
    -##          os-patches \
    -##          etc \
    -##          includes
    -
    -## For some reason, automake doesn't include acconfig.h in the distribution
    -EXTRA_DIST = \
    -  ACE-INSTALL.html \
    -  ACE-install.sh \
    -  BIBLIOGRAPHY \
    -  ChangeLog-93 \
    -  ChangeLog-94 \
    -  ChangeLog-95 \
    -  ChangeLog-96a \
    -  ChangeLog-96b \
    -  ChangeLog-97a \
    -  ChangeLog-97b \
    -  ChangeLog-98a \
    -  ChangeLog-98b \
    -  ChangeLog-99a \
    -  ChangeLog-99b \
    -  FAQ \
    -  PROBLEM-REPORT-FORM \
    -  VERSION \
    -  acconfig.h \
    -  ace-config.in \
    -  ace-config.1.in \
    -  aceConf.sh.in \
    -  ltcf-c.sh \
    -  ltcf-cxx.sh
    -
    -DISTCLEANFILES = ace-config aceConf.sh ace-config.1 
    -
    -## release:
    -##         $(MAKE) dist distdir=$(PACKAGE)$(VERSION)
    -release:
    -	$(MAKE) dist
    -
    -## Put `exec' in the name because this should be installed by
    -## `install-exec', not `install-data'.
    -confexecdir=$(libdir)
    -confexec_DATA = aceConf.sh
    -
    -## Directories to include in the distribution but which I am too lazy to
    -## create Makefile.am files for.  A Makefile.am for these directories isn't
    -## needed anyway.
    -ACE_EXTRA_DIST = bin docs m4
    -
    -## Clean up some additional files/directories possibly created during
    -## the configure script tests.
    -clean-local:
    -	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
    -	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
    -
    -## Make sure config.h doesn't get into the distribution
    -## since it may later intefere with the newly generated
    -## config.h when doing VPATH builds.
    -## We don't want it in the distribution, anyway, since
    -## config.h is platform specific.
    -dist-hook:
    -	-rm -f $(distdir)/ace/config.h
    -	(cd $(top_srcdir); tar cf - $(ACE_EXTRA_DIST)) | (cd $(distdir); \
    -          tar xfBp -)
    -	list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \
    -          rm -rf $$p; \
    -        done
    diff --git a/Makefile.bor b/Makefile.bor
    deleted file mode 100644
    index a10fc536b15..00000000000
    --- a/Makefile.bor
    +++ /dev/null
    @@ -1,24 +0,0 @@
    -#
    -# Makefile for building ACE
    -#
    -
    -!ifndef	BUILD
    -BUILD =	all
    -!endif
    -
    -!if $(BUILD) ==	all
    -
    -DIRS = \
    -        ace \
    -        examples \
    -        performance-tests \
    -        tests \
    -        ACEXML \
    -        ACEXML\tests
    -
    -!else
    -!error Please set your BUILD variable to either "all".
    -!endif
    -
    -
    -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
    diff --git a/PACE/ChangeLog b/PACE/ChangeLog
    deleted file mode 100644
    index 6fef5133ed1..00000000000
    --- a/PACE/ChangeLog
    +++ /dev/null
    @@ -1,3716 +0,0 @@
    -Wed Dec 12 12:30:32 2001  Joe Hoffert  
    -
    -        * VERSION:
    -          Updated the version to 1.2. (Thanks to Garth Watney 
    -           for pointing out this
    -          oversight.)
    -
    -        * THANKS:
    -          Added Garth Watney .
    -
    -Thu Oct  4 10:03:27 2001  Joe Hoffert  
    -
    -        * pace/vxworks/pthread.c:
    -        * pace/vxworks/pthread.h:
    -        * pace/vxworks/pthread.inl:
    -        * pace/vxworks/types.h:
    -          Changed default stack size, moved pthread_self from .inl
    -          to .c file, and removed redundant code for C vs C++
    -          signatures.
    -
    -        * tests/Cond_Var_Test.c:
    -        * tests/Makefile:
    -        * tests/Pthreads_Test.c:
    -          Modified tests to take out gratuitous print statements.
    -          These tests should now only print out statements when
    -          there is an error (like the ACE and TAO tests).
    -
    -        * tests/README:
    -          Added comment about mqueue_test needing input.
    -
    -        * tests/Pthread_Storage_Test.c:
    -        * tests/Stat_Test.c:
    -          Added new tests for thread-specific storage and for some
    -          functions typically declared in the stat.h file.
    -
    -Tue Sep  4 16:23:46 2001  Joe Hoffert  
    -
    -	* tests/vxworks_stub.c: 
    -	* tests/Cond_Var_Test.c: 
    -	  Rectified warnings about type of argc.
    -
    -Tue Sep  4 15:26:46 2001  Joe Hoffert  
    -
    -	* tests/Cond_Var_Test.c: 
    -	  Cleanup up unused variables and signed type on argc.
    -
    -	* tests/Makefile: 
    -	  Corrected inclusion of BIN2 - executables that aren't
    -	  always included - for non VxWorks platforms.
    -
    -Tue Sep  4 09:15:00 2001  Joe Hoffert  
    -
    -	* tests/Pthreads_Test.c: 
    -	  Moved PACE_UNUSED_ARG to after declaration of variables.
    -
    -Tue Sep  4 08:55:02 2001  Joe Hoffert  
    -
    -	* tests/Cond_Var_Test.c: 
    -	  Added test for condition variables.
    -
    -Tue Sep  4 08:36:13 2001  Joe Hoffert  
    -
    -	* tests/vxworks_stub.c: 
    -	  Added call to pacevx_vxworks_init to initialize the
    -	  main thread.
    -
    -	* tests/Pthreads_Test.c (main): 
    -	  Moved PACE_UNUSED_ARG to beginning of main.
    -
    -	* tests/Makefile: 
    -	  Makefile doesn't build Posix_SP_Test on VxWorks. The
    -	  test doesn't compile (which is actually the test for
    -	  certain #defines).
    -
    -	* pace/pthread.h: 
    -	  Added #define PACE_PTHREAD_MUTEX_INITIALIZER 
    -	  PTHREAD_MUTEX_INITIALIZER
    -
    -Fri Aug 31 16:48:10 2001  Joe Hoffert  
    -
    -	* pace/vxworks/types.h: 
    -	  Removed extraneous blank lines.
    -
    -	* pace/vxworks/pthread.inl: 
    -	  Cleaned up comment for popping cleanup routines.
    -
    -	* pace/vxworks/pthread.c: 
    -	  Removed duplicate code (for C and C++) and fixed
    -	  VxWorks unld errors by making the main thread detached
    -	  and unregistering the cleanup function when the
    -	  last non-main thread is done.
    -
    -	* pace/vxworks/pthread.h: 
    -	  Added PACE_PTHREAD_MUTEX_INITIALIZER initializer.
    -
    -Fri Aug 24 08:24:43 2001  Joe Hoffert  
    -
    -	* pace/vxworks/stdio.inl: 
    -	* pace/vxworks/pthread.c: 
    -	  Added spaces between function name and argument list
    -	  for some functions since fuzz was complaining about
    -	  it.
    -
    -Wed Aug 22 12:30:25 2001  Joe Hoffert  
    -
    -	* pace/win32/pace_lib.dsp: 
    -	  Added #define PACE_AS_STATIC_LIBS to static debug
    -	  build be consistent with ACE and TAO project files.
    -	  It was mistakenly just added for the static release
    -	  build previously.
    -
    -Wed Aug 22 12:16:30 2001  Joe Hoffert  
    -
    -	* pace/win32/pace_lib.dsp: 
    -	  Added #define PACE_AS_STATIC_LIBS to be consistent
    -	  with ACE and TAO project files.
    -
    -	* pace/win32/pace_dll.dsp: 
    -	  Added #define PACE_BUILD_DLL and removed #define
    -	  PACE_DLL_EXPORTS to be consistent with ACE and TAO
    -	  project files.
    -
    -Wed Aug 22 12:05:27 2001  Joe Hoffert  
    -
    -	* pace/config/constants.h: 
    -	  Removed PACE_HAS_DLL and PACE_Export #defines since
    -	  these are now implemented appropriately for PACE
    -	  in pace/config/config.h.
    -
    -Wed Aug 22 09:04:28 2001  Joe Hoffert  
    -
    -	* Makefile: 
    -	  Took away restriction for VxWorks since we now support
    -	  that OS.
    -
    -	* include/makeinclude/rules.common.GNU: 
    -	  Added check for pace_tracing set to 1 and included the
    -	  appropriate -DPACE_TRACING if set.
    -
    -	* pace/Makefile: 
    -	  Changed absolute path of $(ACE_ROOT)/PACE to $(PACE_ROOT)
    -	  to include rules.common.GNU and defined PACE_ROOT to be
    -	  $(ACE_ROOT)/PACE if not already defined. This is needed
    -	  for the DII COE work since there the PACE files are not
    -	  necessarily underneath the ACE files.
    -
    -	* pace/aio.h: 
    -	* pace/ctype.h: 
    -	* pace/dirent.h: 
    -	* pace/fcntl.h: 
    -	* pace/grp.h: 
    -	* pace/locale.h: 
    -	* pace/math.h: 
    -	* pace/mqueue.h: 
    -	* pace/pthread.h: 
    -	* pace/pwd.h: 
    -	* pace/sched.h: 
    -	* pace/semaphore.h: 
    -	* pace/setjmp.h: 
    -	* pace/signal.h: 
    -	* pace/stdio.h: 
    -	* pace/stdlib.h: 
    -	* pace/string.h: 
    -	* pace/termios.h: 
    -	* pace/time.h: 
    -	* pace/unistd.h: 
    -	* pace/utime.h: 
    -	* pace/sys/mman.h: 
    -	* pace/sys/socket.h: 
    -	* pace/sys/stat.h: 
    -	* pace/sys/times.h: 
    -	* pace/sys/utsname.h: 
    -	* pace/sys/wait.h: 
    -	  Added PACE_Export to all function declarations -
    -	  for Windows DLL builds.
    -
    -	* pace/config/config.h: 
    -	  Added PACE_Export #define to go away for non-Windows
    -	  platforms and to be appropriate for a DLL - using dllexport
    -	  - or for an application or DLL that including these functions
    -	  - using dllimport.
    -
    -	* pace/config/constants.h: 
    -	  Moved PACE_TRACE define to utility.h.
    -
    -	* pace/config/features.h: 
    -	  Removed extraneous lines at end of file.
    -
    -	* pace/config/utility.h: 
    -	  Moved PACE_TRACE define from constants.h to here -
    -	  and made it to be turned on or off by setting pace_tracing
    -	  to 1.
    -
    -	* pace/vxworks/pthread.c: 
    -	  Added PACE_TRACE tracing and renamed pace_pthread*
    -	  functions to pthread* functions. This will allow
    -	  the compiler to flag us - with an error - when these
    -	  functions are implemented and we can then remove
    -	  our emulation code.
    -
    -	* pace/vxworks/pthread.h: 
    -	  Added declarations for all the POSIX Pthread
    -	  functions that VxWorks doesn't support - and
    -	  which we emulate in pthread.c.
    -
    -	* pace/vxworks/pthread.inl: 
    -	  Added PACE_TRACE tracing and added calls to POSIX
    -	  routines which get emulated in pthread.c.
    -
    -	* pace/vxworks/aio.inl: 
    -	* pace/vxworks/ctype.inl: 
    -	* pace/vxworks/dirent.inl: 
    -	* pace/vxworks/fcntl.inl: 
    -	* pace/vxworks/grp.inl: 
    -	* pace/vxworks/locale.inl: 
    -	* pace/vxworks/math.inl: 
    -	* pace/vxworks/mman.inl: 
    -	* pace/vxworks/mqueue.inl: 
    -	* pace/vxworks/pwd.inl: 
    -	* pace/vxworks/sched.inl: 
    -	* pace/vxworks/semaphore.inl: 
    -	* pace/vxworks/setjmp.inl: 
    -	* pace/vxworks/signal.inl: 
    -	* pace/vxworks/socket.inl: 
    -	* pace/vxworks/stat.inl: 
    -	* pace/vxworks/stdio.inl: 
    -	* pace/vxworks/stdlib.inl: 
    -	* pace/vxworks/string.inl: 
    -	* pace/vxworks/termios.inl: 
    -	* pace/vxworks/time.inl: 
    -	* pace/vxworks/times.inl: 
    -	* pace/vxworks/unistd.inl: 
    -	* pace/vxworks/utime.inl: 
    -	* pace/vxworks/wait.inl: 
    -	  Added PACE_TRACE tracing.
    -
    -	* pace/vxworks/utsname.inl: 
    -	  Added PACE_TRACE tracing and added OS version for
    -	  release name.
    -
    -	* tests/Makefile: 
    -	  Cleaned up a dangling continuation line and added comment
    -	  about building Posix_SP_Test last since it may not even
    -	  compile ( which is actually the tests).
    -
    -	* tests/Posix_SP_Test.c: 
    -	* tests/Pthreads_Test.c: 
    -	* tests/mqueue_test.c: 
    -	  Included vxworks_stub.c file to build for VxWorks.
    -
    -	* tests/Stdio_Test.c: 
    -	  Included vxworks_stub.c file to build for VxWorks and
    -	  unlinked temporary file when done.
    -
    -	* tests/vxworks_stub.c: 
    -	  Added this file to encapsulate the machinations needed
    -	  to get the tests to build for VxWorks.
    -
    -Fri Jul 20 15:53:56 2001  Joe Hoffert  
    -
    -        * pace/win32/string.c (strtok_r):
    -          Fixed problems with reference to ACE_OS and some C++
    -          incongruities.
    -
    -Fri Jul 20 15:44:02 2001  Joe Hoffert  
    -
    -        * pace/win32/string.h: 
    -
    -        * pace/win32/string.inl (strtok_r): 
    -
    -        * pace/win32/string.c (strtok_r):
    -          Added support for strtok_r. Stole code from ACE_OS_String.
    -          Was causing a problem with the TAO IDL compiler. 
    -
    -Tue Jul 10 10:43:38 2001  Joe Hoffert  
    -
    -        * Makefile: 
    -          Changed default definition of PACE_ROOT to be $ACE_ROOT/PACE
    -          rather than $ACE_ROOT/pace.
    -
    -Mon Jul  9 15:53:43 2001  Joe Hoffert  
    -
    -        * tests/Stdio_Test.c: 
    -          Added directives to compile test for VxWorks, e.g. calling
    -          spa and having it call ace_main (borrowed from ACE_OS).
    -
    -        * tests/Pthreads_Test.c: 
    -        * tests/Makefile: 
    -          Added Pthreads_Test to test POSIX threads (at least
    -          minimally).
    -
    -Mon Jul  9 15:39:26 2001  Joe Hoffert  
    -
    -        * pace/vxworks/utsname.h: 
    -          VxWorks does not have a utsname.h so remove it from being
    -          included.
    -
    -        * pace/vxworks/signal.inl:
    -          Fixed call to sigwait. Used call to sigtimedwait (as ACE
    -          does) since sigwait doesn't appear to be supported by
    -          VxWorks.
    -
    -        * pace/vxworks/pthread.inl: 
    -          Moved some functions from inline to non-inline.
    -
    -        * pace/vxworks/pthread.c:
    -          Moved some functions from inline to non-inline.
    -
    -        * pace/pthread.h: 
    -          Changed some functions from inline to non-inline for
    -          VxWorks.
    -
    -        * pace/fcntl.h:
    -          Added appropriate return for pace_fcntl on VxWorks.
    -
    -Fri Jun 29 15:52:28 2001  Joe Hoffert  
    -
    -        * pace/config/platform.h: 
    -          Remove "#error "Here in platform.h for Win32" message.
    -
    -Tue Jun 12 14:46:48 2001  Joe Hoffert  
    -
    -        * pace/vxworks/unistd.inl: 
    -          Added cast for non-const char*.
    -
    -        * pace/vxworks/time.inl: 
    -          Removed declaration of errno.
    -
    -        * pace/vxworks/pthread.inl: 
    -        * pace/vxworks/pthread.h: 
    -        * pace/vxworks/pthread.c: 
    -          Added supported for pthreads. The vast majority of this code
    -          was donated by Hughes Network Systems via Braeton Taylor
    -          .
    -
    -        * pace/config/config.h: 
    -
    -        * pace/pthread.h: 
    -          With the addition of VxWorks not all PACE functions are inlined
    -          now. Added #if !(PACE_VXWORKS) to handle this.
    -
    -        * THANKS: 
    -          Added Braeton Taylor of Hughes Network Systems for his
    -          contribution of pthread code for VxWorks.
    -
    -Fri Jun  1 15:38:45 2001  Joe Hoffert  
    -
    -        * pace/vxworks/aio.c: 
    -        * pace/vxworks/aio.inl: 
    -        * pace/vxworks/aio.h: 
    -        * pace/vxworks/assert.c: 
    -        * pace/vxworks/assert.inl: 
    -        * pace/vxworks/assert.h: 
    -        * pace/vxworks/ctype.c: 
    -        * pace/vxworks/ctype.h: 
    -        * pace/vxworks/ctype.inl: 
    -        * pace/vxworks/dirent.c: 
    -        * pace/vxworks/dirent.h: 
    -        * pace/vxworks/dirent.inl: 
    -        * pace/vxworks/errno.h: 
    -        * pace/vxworks/fcntl.c: 
    -        * pace/vxworks/fcntl.h: 
    -        * pace/vxworks/fcntl.inl: 
    -        * pace/vxworks/grp.c: 
    -        * pace/vxworks/grp.h: 
    -        * pace/vxworks/grp.inl: 
    -        * pace/vxworks/limits.h: 
    -        * pace/vxworks/locale.c: 
    -        * pace/vxworks/locale.h: 
    -        * pace/vxworks/locale.inl: 
    -        * pace/vxworks/math.c: 
    -        * pace/vxworks/math.h: 
    -        * pace/vxworks/math.inl: 
    -        * pace/vxworks/mman.c: 
    -        * pace/vxworks/mman.h: 
    -        * pace/vxworks/mman.inl: 
    -        * pace/vxworks/mqueue.c: 
    -        * pace/vxworks/mqueue.h: 
    -        * pace/vxworks/pthread.c: 
    -        * pace/vxworks/pthread.h: 
    -        * pace/vxworks/pthread.inl: 
    -        * pace/vxworks/pwd.c: 
    -        * pace/vxworks/pwd.h: 
    -        * pace/vxworks/pwd.inl: 
    -        * pace/vxworks/sched.c: 
    -        * pace/vxworks/sched.h: 
    -        * pace/vxworks/sched.inl: 
    -        * pace/vxworks/semaphore.c: 
    -        * pace/vxworks/semaphore.h: 
    -        * pace/vxworks/semaphore.inl: 
    -        * pace/vxworks/setjmp.c: 
    -        * pace/vxworks/setjmp.h: 
    -        * pace/vxworks/setjmp.inl: 
    -        * pace/vxworks/signal.c: 
    -        * pace/vxworks/signal.h: 
    -        * pace/vxworks/signal.inl: 
    -        * pace/vxworks/socket.c: 
    -        * pace/vxworks/socket.h: 
    -        * pace/vxworks/socket.inl: 
    -        * pace/vxworks/stat.c: 
    -        * pace/vxworks/stat.h: 
    -        * pace/vxworks/stat.inl: 
    -        * pace/vxworks/stdio.c: 
    -        * pace/vxworks/stdio.h: 
    -        * pace/vxworks/stdio.inl: 
    -        * pace/vxworks/stdlib.c: 
    -        * pace/vxworks/stdlib.h: 
    -        * pace/vxworks/stdlib.inl: 
    -        * pace/vxworks/string.c: 
    -        * pace/vxworks/string.h: 
    -        * pace/vxworks/string.inl: 
    -        * pace/vxworks/termios.c: 
    -        * pace/vxworks/termios.h: 
    -        * pace/vxworks/termios.inl: 
    -        * pace/vxworks/time.c: 
    -        * pace/vxworks/time.h: 
    -        * pace/vxworks/time.inl: 
    -        * pace/vxworks/times.c: 
    -        * pace/vxworks/times.h: 
    -        * pace/vxworks/times.inl: 
    -        * pace/vxworks/types.h: 
    -        * pace/vxworks/unistd.c: 
    -        * pace/vxworks/unistd.h: 
    -        * pace/vxworks/unistd.inl: 
    -        * pace/vxworks/utime.c: 
    -        * pace/vxworks/utime.h: 
    -        * pace/vxworks/utime.inl: 
    -        * pace/vxworks/utsname.c: 
    -        * pace/vxworks/utsname.h: 
    -        * pace/vxworks/utsname.inl: 
    -        * pace/vxworks/wait.c: 
    -        * pace/vxworks/wait.h: 
    -        * pace/vxworks/wait.inl: 
    -          Added these files for the VxWorks port of PACE.
    -
    -Mon May 14 12:55:33 2001  Joe Hoffert  
    -
    -	* docs/www/pace-car.html:
    -
    -	  Deleted this file since it comflicts with PACE-car.html on
    -          file systems that are not case-sensitive. (It also appears
    -          to be a duplicate file.)
    -
    -Sun May 13 14:42:11 2001  Luther J Baker  
    -
    -	* docs/www/*:
    -
    -	  Basic Web Site added to the repo.
    -
    -Sun May 13 14:18:34 2001  Luther J Baker  
    -
    -	* docs/index.html:
    -	* docs/overview.html:
    -	* docs/legend.html:
    -	* docs/todo.html:	
    -	* docs/PACE_POSIX_support.txt:
    -
    -	  Superfluous files removed.
    -
    -	* docs/README:	
    -
    -	  Added identification line of text.
    -
    -Mon Apr 23 10:43:23 2001  Carlos O'Ryan  
    -
    -        * pace/config/compiler.h:
    -          Reverted on of Cristian's changes.  He agrees that it is not
    -          worthwhile to use the C9X 'inline' feature when only a few
    -          versions of gcc support it, while inlining static functions with
    -          -O3 is supported by all versions.
    -
    -Mon Apr 23 09:45:13 2001  Carlos O'Ryan  
    -
    -        * pace/win32/pthread.c (pthread_getschedparam):
    -          Fixed syntax error, thanks to Cristian Ferretti
    -           for keeping track of the builds
    -          and providing the patch.
    -
    -Sun Apr 22 18:53:28 2001  Carlos O'Ryan  
    -
    -        * pace/win32/ctype.h:
    -          ctype.inl is already #included in pace/ctype.h, no need to
    -          #include it again.
    -
    -Sun Apr 22 15:03:11 2001  Carlos O'Ryan  
    -
    -        * pace/ctype.h:
    -          Add missing #includes that were causing compilation warnings.
    -
    -Sat Apr 21 17:37:40 2001  Carlos O'Ryan  
    -
    -        * pace/win32/socket.inl:
    -        * pace/win32/socket.c:
    -          Make Fuzz happy, some RCS ids went missing.
    -
    -Sat Apr 21 15:31:27 2001  Carlos O'Ryan  
    -
    -        * PACE/pace/ctype.h:
    -        * PACE/pace/config/compiler.h:
    -        * PACE/pace/config/platform.h:
    -        * PACE/pace/win32/pthread.c:
    -        * PACE/pace/win32/pthread.inl:
    -        * PACE/pace/win32/semaphore.c:
    -        * PACE/pace/win32/semaphore.h:
    -        * PACE/pace/win32/signal.inl:
    -        * PACE/pace/win32/socket.c:
    -        * PACE/pace/win32/socket.h:
    -        * PACE/pace/win32/socket.inl:
    -        * PACE/pace/win32/stdlib.inl:
    -        * PACE/pace/win32/unistd.h:
    -        * PACE/pace/win32/unistd.inl:
    -        * PACE/pace/win32/utime.c:
    -        * PACE/pace/win32/utsname.c:
    -        * PACE/pace/win32/utsname.inl:
    -        * PACE/pace/win32/wait.inl:
    -          Add support for mingw (www.mingw.org) and partial support for
    -          cygwin (http://cygwin.com/).  Many thanks to Cristian Ferretti
    -          
    -
    -Mon Apr 16 16:17:35 2001  Carlos O'Ryan  
    -
    -        * pace/posix/socket.h:
    -        * pace/config/platform.h:
    -        * include/makeinclude/rules.common.GNU:
    -          Add support for QNX, it behaves like other POSIX platforms.
    -
    -Wed Mar 21 09:26:38 2001  Joe Hoffert  
    -
    -        * pace/posix/socket.h:
    -          Added typedef of pace_socklen_t to int for Solaris 5.6. Thanks
    -          to Lu Yunhai  for this solution.
    -
    -Mon Mar 19 16:56:47 2001  Luther Baker  
    -
    -        * pace/win32/unistd.c:
    -        * pace/win32/unistd.inl:
    -        * pace/win32/stdio.c:
    -        * pace/win32/time.inl:
    -          Removed ::MsvcFoo punctuation. Since PACE is a c-library,
    -          it doesn't recognize this C++ism. (::)
    -
    -        * pace/win32/unistd.h:
    -          Added signature for pace_win32_read (needs to be visible
    -          before unistd.inl).
    -
    -Tue Mar 13 12:58:09 2001  Joe Hoffert  
    -
    -        * pace/win32/setjmp.inl:
    -          Removed function calls to setjmp and sigsetjmp since
    -          these are now macros.
    -
    -        * pace/win32/stdio.c:
    -          Adding pace_win32_fseek function to support pace_fseek.
    -
    -        * pace/win32/time.inl:
    -          Adding support for tzset for Windows.
    -
    -        * pace/win32/unistd.c:
    -          Adding call to pace_win32_read function and cleaned up
    -          pace_write code.
    -
    -        * pace/win32/unistd.inl:
    -          Adding pace_win32_read function to support pace_read.
    -
    -Wed Feb 28 15:04:41 2001  Joe Hoffert  
    -
    -        * pace/posix/string.inl (pace_strtok_r):
    -          Added call to strtok_r for Lynx and SunOS since it is
    -          supported but PACE_HAS_REENTRANT doesn't get defined
    -          for them.
    -
    -        * pace/posix/setjmp.inl:
    -        * pace/setjmp.h:
    -          Changed setjmp and sigsetjmp from functions to macros since
    -          the functions were causing warnings on linux (Red Hat 7).
    -
    -        * include/makeinclude/rules.common.GNU:
    -          Added support for Solaris 8
    -
    -Fri Feb  9 19:35:29 2001  Luther J Baker  
    -
    -        * pace/config/compiler.h
    -        * pace/config/utility.h
    -        * pace/config/fcntl.h
    -        * pace/win32/mman.inl
    -        * pace/win32/pthread.h
    -        * pace/win32/semaphore.inl
    -        * pace/win32/stat.inl
    -        * pace/win32/stdio.inl
    -        * pace/win32/types.h
    -        * pace/win32/unistd.inl
    -        * pace/win32/utime.h
    -        * pace/win32/utime.inl
    -
    -          Thanks to Christopher Kohlhoff 
    -          for making the changes necessary to port PACE to
    -          Borland C++ Builder 5.
    -
    -Thu Feb  1 17:36:24 2001  Luther J Baker  
    -
    -        * pace/win32/signal.h (PACE_SIGSET_T):
    -        * pace/win32/signal.inl (pace_sigfillset):
    -
    -          Used ACE implementation.
    -
    -Sun Jan 28 13:20:28 2001  Luther J Baker  
    -
    -        * pace/posix/unistd.inl (pace_getlogin_r):
    -
    -          Changed C++ style comments to C.
    -
    -Thu Jan 25 17:26:41 2001  Luther J Baker  
    -
    -        * pace/posix/unistd.inl (pace_access):
    -
    -          Yet another change to the illustrious function.
    -          Let it be noted that there needs to be a better test for
    -          the _REENTRANT policy. Linux supports 'these' calls but
    -          is currently forced to the emulation code.
    -
    -          The #if (PACE_SUNOS) || (PACE_LYNXOS) should not be here.
    -          Instead, there should be a simple test like PACE_HAS_REENTRANT
    -          or something even higher (such as in ACE: ACE_MT_SAFE).
    -
    -Tue Jan 23 14:56:51 2001  Luther J Baker  
    -
    -        * pace/posix/unistd.inl (pace_getlogin_r):
    -
    -          Rewrote code and based preprocessor selection on
    -          PACE_HAS_REENTRANT as opposed to PACE_LYNXOS, PACE_SUNOS
    -          on an otherwise defined platform macro.
    -
    -Fri Jan 19 12:43:27 2001  Priyanka Gontla  
    -
    -        * pace/posix/socket.h:
    -          Added a check for HPUX so that pace_family_t is not defined for
    -          HPUX.
    -
    -Thu Jan 18 15:22:07 2001  Joe Hoffert  
    -
    -        * tests/Stdio_Test.c (main):
    -          Removed SLEEPTIME constant since it isn't always used.
    -
    -        * pace/emulation/mqueue.c:
    -          Added char* casts from malloc and mmap calls.
    -
    -        * pace/posix/unistd.inl (pace_getlogin_r):
    -          Changed from POSIX User Group Unit of Functionality to
    -          User Group Reentrant Unit of Functionality.
    -
    -        * pace/posix/sched.inl (pace_sched_rr_get_interval):
    -          SunOS 5.5.1 uses sched_get_rr_get_interval rather than
    -          sched_rr_get_interval.
    -
    -        * pace/posix/socket.h:
    -          Fixed problems with SunOS 5.5.1 support (i.e., doesn't
    -          use socklen_t structs - it uses ints instead - and it
    -          doesn't use family_t structs at all.)
    -
    -Mon Jan 15 10:44:39 2001  Darrell Brunsch 
    -
    -        * tests/tests.dsw:
    -
    -          Added dependencies between the projects.
    -
    -        * pace/win32/pace_dll.dsp:
    -        * pace/win32/pace_lib.dsp:
    -        * tests/test_stdio.dsp:
    -
    -          - Fixed the intermediate and output directories to
    -            fit the model used in ACE.
    -
    -          - Changed the names of the two pace* projects so
    -            msvc_auto_compile.pl will be able to recognize
    -            them as libraries.
    -
    -          - Added two new configurations to test_stdio so it
    -            now can link to both the dynamic and static
    -            version of PACE.
    -
    -          - Changed the configuration name of the static
    -            projects to Win32 Static Release and Debug
    -
    -Mon Jan 15 10:32:19 2001  Carlos O'Ryan  
    -
    -        * pace/setjmp.h:
    -          The 'extern "C"' block was closed twice, making KCC unhappy.
    -
    -Mon Jan 15 10:20:55 2001  Carlos O'Ryan  
    -
    -        * pace/posix/socket.c:
    -          Change #include from "pace/posix/sys/socket.inl" to
    -          "pace/posix/socket.inl", the former does not exist and the
    -          program fails to compile.
    -          Only detected in builds with inline=0
    -
    -Fri Jan 12 07:35:31 2001  Joe Hoffert  
    -
    -        * Makefile:
    -          Changed to ignore VxWorks platforms (not currently
    -          supported by PACE).
    -
    -        * include/makeinclude/rules.common.GNU:
    -          Added CFLAGS for LynxOS 3.0.0 so that the PACE library
    -          will compile and not break nightly builds.
    -
    -        * tests/mqueue_test.c:
    -        * tests/Stdio_Test.c:
    -        * tests/Posix_SP_Test.c:
    -          Changed to compile (i.e., do nothing) for LynxOS 3.0.0
    -          to keep nightly builds from breaking.
    -
    -        * pace/posix/pthread.inl:
    -          Added support for LynxOS 3.0.0.
    -
    -        * pace/posix/socket.h:
    -          Fixed problems with LynxOS support (i.e., Lynx doesn't
    -          use socklen_t structs - it uses ints instead - and Lynx
    -          doesn't use family_t structs at all.)
    -
    -Thu Jan 04 17:10:09 2001  Luther Baker  
    -
    -        * pace/win32/pace.dsw
    -
    -          Typographic changes.
    -
    -Thu Jan 04 13:59:00 2001  Luther Baker  
    -
    -        * pace/win32/pace.dsw
    -
    -          Changed MS libraries to link to. Now consistent with ACE.
    -          (ie, Always 'Multithreaded DLL' with Debug version using
    -          the DEBUG DLL and Release using the standard DLL).
    -
    -        * pace/pace/win32/stdlib.h
    -
    -          Updated. Implements the posix C functions that were added
    -          to PACE last year.
    -
    -Wed Jan  3 10:01:02 2001  Joe Hoffert  
    -
    -        * pace/man/Makefile:
    -          Updated directory to use to generate man pages (in html).
    -
    -Fri Dec 22 12:09:59 2000  Luther J Baker  
    -
    -        * pace/Makefile:
    -        * pace/config/config.h:
    -
    -        * pace/sys/socket.h:
    -        * pace/posix/socket.h:
    -        * pace/posix/socket.inl:
    -        * pace/posix/socket.c:
    -
    -          Updated. Linux is building sockets correctly now.
    -
    -Fri Dec 22 10:54:13 2000  Luther J Baker  
    -
    -        * pace/socket.h
    -        * pace/sys/socket.h
    -        * pace/Makefile
    -
    -          Moved socket.h to sys/socket.h.
    -
    -          Started looking at Makefile to add socket.h
    -
    -Thu Dec 21 18:22:28 2000  Luther J Baker  
    -
    -        * docs/index.html:
    -        * docs/legend.html:
    -        * docs/overview.html:
    -        * docs/todo.html:
    -
    -          Begin moving PACE documentation to main distribution.
    -          Also rewriting much of this.
    -
    -Thu Dec 21 18:02:23 2000  Luther J Baker  
    -
    -        * pace/docs/todo.txt
    -
    -          Meaningless file removed.
    -
    -Wed Dec 20 16:49:47 2000  Luther J Baker  
    -
    -        * tests/Stdio_Test.c:
    -
    -          An innocent change :-/. Used pace_strcmp (...) instead of
    -          strcmp. Had to include "pace/string.h".
    -
    -Wed Dec 20 16:42:45 2000  Luther J Baker  
    -
    -        * pace/socket.h:
    -        * pace/posix/socket.inl:
    -        * pace/posix/socket.c:
    -
    -          Beginning of PACE POSIX socket implementation.
    -
    -Wed Dec 20 15:19:50 2000  Luther J Baker  
    -
    -        * pace/config/config.h:
    -
    -          Added PACE_HAS_POSIX_SOCK_UOF for upcoming socket
    -          implementation.
    -
    -Thu Dec 19 11:40:00 2000  Luther J Baker  
    -
    -        * pace/win32/unistd.c:
    -
    -          Added pace_ prefix to emulation functions.
    -
    -Thu Oct 26 04:00:00 2000  Luther J Baker  
    -
    -        * pace/win32/schedtypes.h:
    -        * pace/win32/sched.h:
    -
    -          Compliance with ACE_HAS_PACE for ACE.
    -          sched_param now has a member sched_priority.
    -
    -Wed Oct 18 15:41:20 2000  Luther J Baker  
    -
    -        * pace/win32/pthread.h:
    -        * pace/win32/pthreadtypes.h:
    -        * pace/semphore.h:
    -        * pace/win32/semphore.h:
    -        * pace/win32/semphore.inl:
    -
    -          Debugging ACE building with PACE over NT
    -          ACE_HAS_PACE.
    -
    -Tue Oct  3 15:37:35 2000  Joe Hoffert  
    -
    -        * pace/posix/stdio.inl:
    -          Added vfprintf, vprintf, and vsprintf support
    -
    -Tue Sep 26 15:19:20 2000  Joe Hoffert  
    -
    -        * tests/Makefile:
    -        * pace/Makefile:
    -          Moved checks for inlining flags down in the file so
    -          that include/makeinclude/platform_macros.GNU can be
    -          checked to see if the flags are set there.
    -
    -        * pace/posix/stdio.h:
    -          Moved stdio.h header file include after stdarg.h
    -          header file (per comment in ace/OS.h file)
    -
    -Fri Sep 22 11:32:25 2000  Darrell Brunsch 
    -
    -        * PACE/pace/posix/math.inl:
    -        * PACE/pace/win32/math.inl:
    -
    -          Disabled fuzz math.h inclusion check.
    -
    -Wed Sep 13 13:52:00 2000  Luther J Baker  
    -
    -        * pace/win32/types.h:
    -
    -          Removed irrelevant base types and kept pace_* types.
    -
    -          (ie:
    -              typedef DWORD nlink_t;
    -              typedef nlink_t pace_nlink_t;
    -          became
    -              typedef DWORD pace_nlink_t;
    -          )
    -
    -Wed Sep 13 13:42:15 2000  Luther J Baker  
    -
    -        * pace/sys/wait.h:
    -
    -          More types changed to pace_*.
    -
    -Wed Sep 13 13:25:33 2000  Luther J Baker  
    -
    -        * pace/unistd.h:
    -        * pace/win32/unistd.inl:
    -
    -          Even more type shifts to pace_*.
    -
    -Wed Sep 13 13:06:27 2000  Luther J Baker  
    -
    -        * pace/unistd.h:
    -
    -          More of uid_t to pace_uid_t.
    -
    -Wed Sep 13 12:59:52 2000  Luther J Baker  
    -
    -        * pace/unistd.h:
    -
    -          Change arguments from uid_t to pace_uid_t.
    -
    -Tue Aug 29 14:59:35 2000  Luther J Baker  
    -
    -        * pace/win32/stat.inl (pace_fstat):
    -
    -          Typo.
    -
    -Tue Aug 29 14:57:04 2000  Luther J Baker  
    -
    -        * pace/win32/stat.h (pace_stat):
    -
    -          Atered pace_stat_h typedef.
    -
    -        * pace/win32/stat.inl (pace_stat):
    -
    -          Implemented pace_fstat and pace_stat.
    -
    -Tue Aug 29 14:14:45 2000  Luther J Baker  
    -
    -        * pace/stat.h (pace_fstat):
    -        * pace/stat.h (pace_fchmod):
    -        * pace/posix/stat.inl (pace_fchmod):
    -        * pace/posix/stat.inl (pace_fstat):
    -        * pace/win32/stat.inl (pace_fchmod):
    -        * pace/win32/stat.inl (pace_fstat):
    -
    -          Changed argument 1 from an int to a PACE_HANDLE.
    -
    -Tue Aug 29 13:07:55 2000  Luther J Baker  
    -
    -        * pace/win32/fcntl.inl (pace_creat):
    -
    -          Fixed a typo.
    -
    -Mon Aug 28 20:40:25 2000  Luther J Baker  
    -
    -        * pace/win32/stat.h (pace_win32_mkdir):
    -        * pace/win32/stat.inl (pace_win32_mkdir):
    -        * pace/win32/stat.c (pace_win32_mkdir):
    -
    -          Altered naming convention of emulation function.
    -
    -Mon Aug 28 20:00:26 2000  Luther J Baker  
    -
    -        * PACE/pace/fcntl.h:
    -        * PACE/pace/win32/fcntl.inl:
    -
    -          Added support of fcntl (...) for win32. No op.
    -
    -Fri Aug 25 12:11:38 2000  Luther J Baker  
    -
    -        * /pace/unistd.h:
    -
    -          Change ssize_t to pace_ssize_t.
    -
    -        * /pace/win32/unistd.h:
    -        * /pace/win32/unistd.inl:
    -        * /pace/win32/unistd.c:
    -        * /pace/win32/mqueue.inl:
    -
    -          Changes related to type conflicts with ACE.
    -
    -Tue Aug 22 18:59:41 2000  Luther J Baker  
    -
    -        * PACE/ChangeLog:
    -
    -          Updated.
    -
    -Tue Aug 22 18:51:34 2000  Luther J Baker  
    -
    -        * pace/win32/dirent.h:
    -        * pace/win32/signal.h:
    -        * stdio.h:
    -        * stdlib.h:
    -        * time.h:
    -        * types.h:
    -        * unistd.h:
    -        * utsname.h:
    -
    -          Update to compile.
    -
    -Tue Aug 22 17:58:38 2000  Luther J Baker  
    -
    -        * PACE/ChangeLog:
    -
    -          Updated.
    -
    -Tue Aug 22 17:52:02 2000  Luther J Baker  
    -
    -        * PACE_POSIX_support.txt:
    -
    -          Updated emulation records.
    -
    -        * pace/fcntl.h:
    -        * pace/win32/fcntl.h:
    -        * pace/win32/fcntl.c:
    -
    -          Updated creat func to pace_win32_create to eliminate compile probs.
    -
    -        * TODO:
    -
    -          Updated.
    -
    -        * pace/config/utility.h:
    -
    -          Updated to work with multithreaded errno correctly.
    -
    -        * pace/win32/pthread.h:
    -        * pace/win32/pthread.inl:
    -        * pace/win32/pthread.c:
    -
    -          Update emulations!
    -
    -        * pace/win32/time.inl:
    -
    -          Updated/hacked to compile correctly!
    -
    -        * pace/win32/pace_dll.dsp:
    -        * pace/win32/pace_lib.dsp:
    -
    -          Updated project settings to use proper multithreaded DLL / LIB.
    -
    -Tue Aug 22 12:44:09 2000  Luther J Baker  
    -
    -        * pace/config/features.h (_MT):
    -
    -          Added to support multithreading.
    -
    -        * pace/win32/pthread.c (pthread_create):
    -
    -          Completed using basic _beginthreadex.
    -
    -        * pace/win32/TODO:
    -
    -          Updated.
    -
    -Mon Aug 21 20:34:51 2000  Luther J Baker  
    -
    -        * pace/config/features.h:
    -
    -          Updated to reflect PACE_HAS_MFC and PACE_MT_SAFE.
    -          Following ace/config-win32-common.h.
    -
    -Mon Aug 21 19:40:23 2000 Luther J Baker  
    -
    -        * pace/win32/pthread.c (pthread_attr_init):
    -
    -          Updated attr initialization in pthread_attr_init.
    -
    -Fri Aug 18 17:57:42 2000  Steve Huston  
    -
    -        * include/makeinclude/rules.common.GNU: Added section for HP-UX.
    -
    -Fri Aug 18 12:30:51 2000  Steve Huston  
    -
    -        * include/makeinclude/rules.common.GNU: Added section for AIX.
    -
    -Wed Aug 16 17:31:43 2000  Luther J Baker  
    -
    -        * pace/win32/pthread.h:
    -        * pace/win32/pthread.inl:
    -        * pace/win32/pthread.c:
    -        * pace/win32/pthreadtypes.h:
    -        * pace/win32/schedtypes.h:
    -        * pace/win32/TODO
    -
    -          More fabulous emulation updates!
    -
    -Wed Aug 16 16:26:32 2000  Luther J Baker  
    -
    -        * pace/win32/pthread.h:
    -        * pace/win32/pthread.inl:
    -        * pace/win32/pthread.c:
    -
    -          The first commit in a long series of emulations.
    -
    -Mon Aug 14 22:24:50 2000  Luther J Baker  
    -
    -        * pace/win32/sched.inl (pace_sched_get_priority_max):
    -
    -          Removed an extraneous '#include' left from the previous commit.
    -
    -        * pace/win32/pace_dll.dsp:
    -        * pace/win32/pace_lib.dsp:
    -
    -          Added new files to the project files.
    -          (pthreadtypes.h schedtypes.h)
    -
    -Mon Aug 14 21:41:24 2000  Luther J Baker  
    -
    -        * pace/win32/pthreadtypes.h:
    -        * pace/win32/schedtypes.h:
    -
    -          Added to repository to break up the complexity
    -          of the code and avoid circular dependencies.
    -
    -        * pace/win32/types.h:
    -
    -          Updated declarations to remove circular dependencies.
    -
    -        * pace/win32/sched.h:
    -
    -          Updated to use schedtypes.h.
    -
    -        * pace/win32/pthread.h:
    -
    -          Updated to use pthreadtypes.h.
    -
    -        * pace/pthread.h:
    -
    -          Updated signatures to use pace prefixed types.
    -
    -Thu Aug 10 04:18:14 2000  John Heitmann  
    -
    -        * tests/Stdio_Test.c:
    -          Changed a c++ style comment to a c style comment.
    -
    -        * pace/fcntl.h
    -        * pace/mqueue.h
    -        * pace/semaphore.h
    -        * pace/stdio.h
    -          Removed global scope modifier, since it should be
    -          supplied by the client.
    -
    -Wed Aug 09 19:30:39 2000  Luther J Baker  
    -
    -        * tests/tests.dsw:
    -
    -          Removed test projects files that use constants from
    -          POSIX specific platforms (Posix_SP_Test.c, mqueue_test.c).
    -
    -Wed Aug 09 19:22:17 2000  Luther J Baker  
    -
    -        * tests/tests.dsw:
    -        * tests/test_stdio.dsp:
    -
    -          Added to the repository.
    -          Note that I also added the pace_lib and pace_dll projects
    -          to this workspace. Unlike, ACE, the library is pretty
    -          small and the tests are quite limited and so they all
    -          fit quite nicely in a project file!
    -
    -        * tests/Stdio_Test.c:
    -
    -          Altered to sleep for 20 secs to test the exe size in memory.
    -
    -Tue Aug 08 17:09:38 2000  Joe Hoffert 
    -
    -        * pace/config/config.h:
    -          Added comments explaining the PACE_HAS_*UOF* macros.
    -
    -        * pace/posix/time.inl:
    -          Fixed checking of return values for reentrant functions
    -          on LynxOS.
    -
    -        * pace/posix/unistd.inl:
    -          Fixed erroneous comment about PACE_HAS_POSIX_UGR_UOF.
    -
    -Thu Aug 03 10:23:04 2000  David L. Levine 
    -
    -        * VERSION: updated for next beta, manually.
    -
    -Wed Aug  2 14:43:08 2000  John Heitmann  
    -
    -        * include/makeinclude/rules.common.GNU:
    -          Changed VPATH:= to VPATH+= so it wouldn't
    -          trounce on other VPATH assignments. This
    -          fix enables TAO to comile clean on top of PACE.
    -
    -Sat Jul 29 09:39:24 2000  David L. Levine 
    -
    -        * tests/mqueue_test.c: added RCS Id string.
    -
    -Sat Jul 29 09:31:59 2000  David L. Levine 
    -
    -        * tests/mqueue_test.c: got it to compile cleanly on OSF1,
    -          by adding an unused arg to msg_handler, and commenting
    -          the characters after an #endif.
    -
    -Sat Jul 29 09:19:01 2000  David L. Levine 
    -
    -        * include/makeinclude/rules.common.h (CFLAGS): on OSF1, added
    -          -D_DEC_XPG, to pickup up _SC_AIO_LISTIO_MAX, et al., from
    -          /usr/include/unistd.h.
    -
    -Sat Jul 29 09:08:15 2000  David L. Levine 
    -
    -        * pace/config/config.h,pace/posix/aio.inl (aio_suspend):
    -          added PACE_AIO_SUSPEND_LIST_ARG_CAST, with special value
    -          on OSF1 (DIGITAL_UNIX).
    -
    -Fri Jul 28 18:11:24 2000  David L. Levine 
    -
    -        * README: mention LynxOS' non-standard signal interface.
    -
    -Fri Jul 28 15:54:38 2000  Joe Hoffert  
    -
    -        * tests/Makefile:
    -          Modified to use ace_components rather than
    -          pace_components.
    -
    -        * pace/posix/signal.h:
    -          Changed pace_sig_pf typedef to compile for LynxOS. Still
    -          need to fix it to compile for ACE with PACE for LynxOS.
    -
    -        * pace/posix/signal.inl:
    -          Fixed sigwait and signal for LynxOS (at least for building
    -          pace).
    -
    -        * pace/posix/time.inl:
    -        * pace/posix/pwd.inl:
    -        * pace/posix/grp.inl:
    -        * pace/posix/dirent.inl:
    -          Changed LynxOS workarounds for the reentrant functions
    -          and deleted the check for SUNOS since now it can use
    -          the POSIX calls (with _POSIX_PTHREAD_SEMANTICS being
    -          defined properly).
    -
    -        * pace/config/config.h:
    -          Deleted definition of _REENTRANT (and put it in
    -          include/makeinclude/rules.common.GNU) and defined
    -          the different POSIX UoF macros to be 0 if we're
    -          not using all of them.
    -
    -        * pace/Makefile:
    -          Modified to use bin/ace_components rather than
    -          bin/pace_components (which is going away).
    -
    -        * include/makeinclude/rules.common.GNU:
    -          Adding -D_POSIX_PTHREAD_SEMANTICS (if threads == 1)
    -          and -D_REENTRANT for SunOS so they get defined before
    -          any include files.
    -
    -Fri Jul 28 11:29:08 2000  David L. Levine 
    -
    -        * README: added brief discussion of how PACE helps
    -          insulate applications from the OS.
    -
    -Fri Jul 28 06:28:26 2000  John Heitmann  
    -
    -        * pace/posix/dirent.inl
    -        * pace/posix/grp.inl
    -        * pace/posix/pwd.inl
    -        * pace/posix/signal.inl
    -          Got rid of PACE_HAS_PTHREAD_SEMANTICS not supported code
    -          in favor of platform specific modifications.
    -
    -Thu Jul 27 15:02:53 2000  Luther J Baker  
    -
    -        * pace/config/utility.h:
    -
    -          Clean up comments.
    -
    -Thu Jul 27 14:04:47 2000  Luther J Baker  
    -
    -        * pace/config/defines.h:
    -
    -          Removed #include "temp.h".
    -
    -Thu Jul 27 13:50:48 2000  Luther J Baker  
    -
    -        * pace/config/constants.h:
    -
    -          Moved contents of pace/config/temp.h to constants.h.
    -          Some of this probably shouldn't be in contstants.h.
    -
    -        * pace/config/temp.h:
    -
    -          Removed.
    -
    -Thu Jul 27 13:03:29 2000  Luther J Baker  
    -
    -        * pace/config/constants.h (PACE_ONE_SECOND_IN_NSECS):
    -
    -          Typo!
    -
    -Thu Jul 27 12:33:55 2000  David L. Levine 
    -
    -        * README, VERSION: updated in preparation for 1.0 release.
    -
    -Thu Jul 27 08:36:01 2000  John Heitmann  
    -
    -        * pace/fcntl.h
    -        * pace/mqueue.h
    -        * pace/semaphore.h
    -        * pace/stdio.h
    -          Added :: qualifier to macros, but of course these should
    -          be defined by the user, so these will go away once
    -          I update OS.*.
    -
    -        * pace/config/config.h
    -          Added _REENTRANT for solaris.
    -
    -        * pace/posix/time.inl
    -        * pace/posix/unistd.inl
    -          Took away PACE_HAS_PTHREAD_SEMANTICS in favor of platform
    -          specific code. It appears PAC_HAS_PTHREAD_SEMANTICS is now
    -          superfluous.
    -
    -        * ../ace/OS.i
    -          Qualified two functions with pace_ as they should
    -          have been originally. Paceified ACE_OS::gettimeofday.
    -
    -Wed Jul 26 17:13:51 2000  John Heitmann  
    -
    -        * pace/emulation/mqueue.c:
    -          Removed print_queue(), qualified attrdefault
    -          with pace_, fixed memory leaks, and fixed
    -          the totally broken mq_unlink.
    -
    -Tue Jul 25 17:09:13 2000  Luther J Baker   
    -
    -        * pace/win32/mman.c:
    -
    -          Typo.
    -
    -Tue Jul 25 17:00:13 2000  Luther J Baker  
    -
    -        * pace/win32/dirent.h:
    -        * pace/win32/dirent.inl:
    -        * pace/win32/dirent.c:
    -        * pace/win32/fcntl.h:
    -        * pace/win32/fcntl.inl:
    -        * pace/win32/fcntl.c:
    -        * pace/win32/mman.h:
    -        * pace/win32/mman.inl:
    -        * pace/win32/mman.c:
    -        * pace/win32/semaphore.h:
    -        * pace/win32/semaphore.inl:
    -        * pace/win32/semaphore.c:
    -        * pace/win32/signal.h:
    -        * pace/win32/signal.inl:
    -        * pace/win32/signal.c:
    -        * pace/win32/stat.h:
    -        * pace/win32/stat.inl:
    -        * pace/win32/stat.c:
    -        * pace/win32/unistd.h:
    -        * pace/win32/unistd.inl:
    -        * pace/win32/unistd.c:
    -        * pace/win32/utime.h:
    -        * pace/win32/utime.inl:
    -        * pace/win32/utime.c:
    -        * pace/win32/utsname.h:
    -        * pace/win32/utsname.inl:
    -        * pace/win32/utsname.c:
    -
    -          Placed emulation prototype in the .h file.
    -          Removed emulation code from the .inl file.
    -          Moved emulation code to the .c file.
    -
    -Mon Jul 24 15:57:24 2000  John Heitmann  
    -
    -        * pace/posix/string.inl
    -          Casted away const returns.
    -
    -        * pace/posix/signal.h
    -          Moved pace_sig_pf back inside the extern "C" {}
    -
    -Mon Jul 24 14:19:54 2000  Luther J Baker  
    -
    -        * pace/win32/TODO:
    -
    -          Updated.
    -
    -Mon Jul 24 14:02:54 2000  Luther J Baker  
    -
    -        * pace/win32:
    -
    -          Updated pace.dsw. Re-arranged files and folders.
    -
    -        * pace/win32/TODO:
    -
    -          Updated.
    -
    -Sun Jul 23 20:36:54 2000  Luther J Baker  
    -
    -        * pace/win32/TODO:
    -
    -          Updated.
    -
    -Sun Jul 23 20:21:02 2000  Luther J Baker  
    -
    -        * pace/win32/*:
    -
    -          Cleaned up alot of implementation.
    -
    -          Got rid of separate 'emulation' functions because only win32
    -          is in this directory (if we supported multiple platforms in
    -          this directory, then the code would get messy so we would do
    -          better to inline and call emulation funcs according to the
    -          platform at hand).
    -
    -          Inserted ACE style macros for WIN32 OS calls. Set errno
    -          properly and adapts return values to POSIX compliance.
    -
    -Sun Jul 23 19:17:33 2000  Luther J Baker  
    -
    -        * pace/win32/pthread.h:
    -
    -          Added typedefs from pace/posix/pthread.h.
    -
    -Sun Jul 23 18:34:26 2000  Luther J Baker  
    -
    -        * pace/win32/pthread.inl:
    -
    -          Win32 doesn't support pthreads. These all need to be emulated.
    -
    -        * pace/docs/PACE_POSIX_support.txt
    -
    -          Updated.
    -
    -Sun Jul 23 17:32:44 2000  Luther J Baker  
    -
    -        * pace/pthread.h:
    -
    -          Missing pace_* prefix on two sigset_t args.
    -          Missing pace_* prefix on pthread_t arg.
    -
    -          Became evident on NT because there are no definitions for
    -          the native types.
    -
    -Sat Jul 22 09:24:34 2000  Ossama Othman  
    -
    -        * pace/Makefile.am (DESTDIRS):
    -
    -          Added missing line continuation backslash `\'.
    -
    -        * pace/posix/Makefile.am (noinst_LTLIBRARIES):
    -
    -          Rename libtool convenience library to `libPACE_POSIX.la' to
    -          avoid name clash with the actual `libPACE.la' library.
    -
    -Fri Jul 21 20:41:04 2000  Luther J Baker  
    -
    -        * pace/win32/unistd.inl:
    -        * pace/posix/unistd.inl:
    -        * pace/unistd.h:
    -
    -          Typos.
    -
    -Fri Jul 21 20:35:38 2000  Luther J Baker  
    -
    -        * pace/win32/wait.h:
    -        * pace/win32/wait.inl:
    -
    -          ACE implements waitpid with an additional argument (HANDLE).
    -          Eliminated POSIX support here.
    -
    -        * pace/docs/PACE_POSIX_support.txt
    -
    -          Updated.
    -
    -Fri Jul 21 20:23:55 2000  Luther J Baker  
    -
    -        * pace/win32/utsname.inl (pace_uname):
    -
    -          Partial emulation made. But more work to be done!
    -
    -        * pace/docs/PACE_POSIX_support.txt
    -
    -          Updated.
    -
    -Fri Jul 21 19:49:19 2000  Luther J Baker  
    -
    -        * pace/win32/utime.h (pace_utime):
    -        * pace/win32/utime.inl (pace_utime):
    -
    -          Implemented the "RIGHT ANSWER[TM]" but it doesn't work so
    -          casted away and made the current func work. Left the
    -          correct implementation -- "unimplemented" :-/ in the file.
    -
    -        * pace/docs/PACE_POSIX_support.txt
    -
    -          Updated.
    -
    -Fri Jul 21 19:22:28 2000  Luther J Baker  
    -
    -        * pace/win32/string.inl:
    -
    -          Fixed eror from adding new funcs (retval param was const).
    -
    -Fri Jul 21 18:43:07 2000  Luther J Baker  
    -
    -        * pace/win32/unistd.inl:
    -
    -          Emulated or removed implementation.
    -
    -        * pace/docs/PACE_POSIX_support.txt
    -
    -          Updated.
    -
    -Fri Jul 21 18:33:04 2000  Luther J Baker  
    -
    -        * pace/config/constants.h (PACE_ONE_SECOND_IN_MSECS):
    -
    -          Added.
    -
    -Fri Jul 21 18:19:50 2000  Luther J Baker  
    -
    -        * pace/config/utility.h:
    -
    -          Added PACE_SYSCALL_FAILED 0xFFFFFFFF
    -
    -Fri Jul 21 12:19:06 2000  Luther J Baker  
    -
    -        * pace/config/utility.h:
    -
    -          Typo. ACE_ADAPT_RETVAL ... PACE_ADAPT_RETVAL.
    -
    -Thu Jul 20 22:58:16 2000  John Heitmann  
    -
    -        * pace/stdlib.h
    -        * pace/posix/stdlib.inl
    -          Added atexit, div, labs, ldiv, mblen, mbstowcs, mbtowc
    -          strtod, strtol, strtoul, system, wcstombs, wctomb.
    -
    -        * pace/string.h
    -        * pace/posix/string.inl
    -          Removed const return from strchr, strstr, strrchr, strpbrk.
    -
    -        *../ace/OS_String.*
    -          Paceified.
    -
    -        *../ace/ThreadManager.cpp
    -          Paceified.
    -
    -        * docs/ACE_Integration.txt
    -          Updated.
    -
    -Thu Jul 20 19:17:15 2000  Luther J Baker  
    -
    -        * pace/win32/unistd.inl:
    -
    -          Part of file fixed. Wanted to commit before I lose something.
    -
    -Thu Jul 20 19:19:28 2000  Luther J Baker  
    -
    -        * pace/unistd.h:
    -        * pace/posix/unistd.h:
    -
    -          _isatty, lseek are both implemented in win32 with
    -          int fildes. Removed PACE_HANDLE here.
    -
    -Thu Jul 20 19:00:12 2000  Luther J Baker  
    -
    -        * pace/posix/unistd.inl (pace_fsync):
    -
    -          Missing the wrapper? pace_fsync --> return fildes.
    -          Changed to 'return fsync (fildes); :-)
    -
    -Thu Jul 20 18:55:39 2000  Luther J Baker  
    -
    -        * pace/unistd.h:
    -        * pace/posix/unistd.inl:
    -
    -          More PACE_HANDLE (dup, dup2)
    -
    -Thu Jul 20 14:47:20 2000  Luther J Baker  
    -
    -        * pace/config/utility.h:
    -
    -          Better comments and changed syntax of PACE_OSCALL_RETURN.
    -
    -Thu Jul 20 14:42:26 2000  Luther J Baker  
    -
    -        * pace/config/utility.h (ACE_ADAPT_RETVAL):
    -
    -          Typo.
    -
    -Thu Jul 20 14:12:44 2000  Luther J Baker  
    -
    -        * pace/posix/unistd.inl:
    -        * pace/unistd.h:
    -
    -          Lots of int file descriptors changed to PACE_HANDLE.
    -
    -Wed Jul 19 19:50:54 2000  Luther J Baker  
    -
    -        * pace/config/utility.h:
    -
    -          Added some sorely needed macros for adapting return values.
    -          Used extensively by ACE to emulate funcs on win32.
    -
    -Tue Jul 18 23:25:43 2000  John Heitmann  
    -
    -        * pace/posix/signal.h
    -        * pace/posix/signal.inl
    -        * pace/posix/stdio.h
    -        * pace/posix/stdlib.h
    -        * pace/posix/time.h
    -        * pace/posix/unistd.h
    -
    -        Added double definition protections around types, PACE_NULL
    -        in particular.
    -
    -        * pace/posix/signal*
    -
    -        Changed signal's pointer to a functions to almost support
    -        Lynx, but it is not quite working yet.
    -
    -        * ../ace/ACE.cpp
    -        * ../ace/OS_Memory.h
    -
    -        Changed system calls to pace calls.
    -
    -        * ../ace/OS.h
    -
    -        Reverted part of my earlier changes to support Lynxos in
    -        a cleaner way.
    -
    -        * ../ace/OS.h
    -        * ../ace/OS.i
    -
    -        Many small changes including wrapping most calls with ACE_OSCALL
    -        to handle EINTR correctly.
    -
    -Tue Jul 18 15:13:40 2000  Luther J Baker  
    -
    -        * pace/win32/times.h:
    -        * pace/win32/times.inl:
    -
    -          Fixed type support.
    -          Eliminated unsupported funcs (return -1 and set ernno).
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Tue Jul 18 15:09:09 2000  Luther J Baker  
    -
    -        * pace/win32/time.inl:
    -
    -          Eliminated and confirmed suport for funcs.
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Tue Jul 18 14:43:08 2000  Luther J Baker  
    -
    -        * pace/termios.h:
    -        * pace/posix/termios.inl:
    -
    -          PACE_HANDLE substituted in for file descriptors.
    -
    -        * pace/win32/termios.h:
    -        * pace/win32/termios.inl:
    -
    -          Eliminated support for most funcs. Return -1 and set ernno
    -          to ENOTSUP.
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Tue Jul 18 14:15:11 2000  Luther J Baker  
    -
    -        * pace/win32/stdio.inl:
    -
    -          Eliminated support for cterm.
    -          Created support for v...print.. family of funcs.
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Tue Jul 18 13:52:13 2000  Luther J Baker  
    -
    -        * pace/win32/stat.h:
    -        * pace/win32/stat.inl:
    -
    -          Eliminated, emulated and confirmed suport for funcs.
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Tue Jul 18 13:16:14 2000  Luther J Baker  
    -
    -        * pace/win32/signal.h:
    -        * pace/win32/signal.inl:
    -
    -          Eliminated, emulated and confirmed suport for funcs.
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Tue Jul 18 11:33:16 2000  Luther J Baker  
    -
    -        * pace/win32/setjmp.h:
    -        * pace/win32/setjmp.inl:
    -
    -          Eliminated support sig(setjmp/longjmp).
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Mon Jul 17 18:29:27 2000  Luther J Baker  
    -
    -        * pace/win32/semaphore.h:
    -        * pace/win32/semaphore.inl:
    -
    -          Eliminated support for these functions. Started emulation.
    -
    -        * pace/win32/types.h:
    -
    -          Changed PACE_HANDLE to represent HANDLE (not void *).
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Mon Jul 17 16:37:16 2000  Luther J Baker  
    -
    -        * pace/win32/sched.h:
    -        * pace/win32/sched.inl:
    -
    -          Eliminated support for these functions.
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Mon Jul 17 16:27:43 2000  Luther J Baker  
    -
    -        * pace/win32/pwd.h:
    -        * pace/win32/pwd.inl:
    -
    -          Emulate some... return no support for others.
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -        * pace/win32/mqueue.h:
    -
    -          Typo.
    -
    -Mon Jul 17 15:57:43 2000  Luther J Baker  
    -
    -        * pace/win32/mqueue.h:
    -        * pace/win32/mqueue.h:
    -
    -          Fixed types to compile for win32.
    -          Code was NOT emulated so types are dummy types and
    -          PACE_ERRNO_NO_SUPPORT_RETURN (-1) was applied when applicable.
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Mon Jul 17 14:56:31 2000  Luther J Baker  
    -
    -        * pace/win32/mman.inl:
    -
    -          Emulate some... return no support for others.
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -Mon Jul 17 14:00:35 2000  Andrew G. Gilpin  
    -
    -        * pace/config/utility.h:
    -
    -          Changed #if (PACE_WIN32 != 0) to #if (PACE_WIN32) to be
    -          more consistent.
    -
    -Mon Jul 17 13:57:05 2000  Luther J Baker  
    -
    -        * pace/posix/mman.inl (pace_shm_open):
    -        * pace/win32/mman.inl (pace_shm_open):
    -        * pace/sys/mman.h (pace_shm_open):
    -
    -          Return value changed to PACE_HANDLE.
    -
    -        * pace/win32/mman.h:
    -
    -          Added some sorely needed constant macro definitions.
    -
    -        * pace/config/utility.h:
    -
    -          Removed #define PACE_POSIX_ERROR_INT_RETVAL -1
    -
    -Mon Jul 17 13:31:50 2000  Luther J Baker  
    -
    -        * pace/config/utility.h:
    -
    -          Added #define PACE_POSIX_ERROR_INT_RETVAL -1
    -
    -Mon Jul 17 13:07:50 2000  Luther J Baker  
    -
    -        * pace/aio.h (pace_aio_cancel):
    -        * pace/posix/aio.inl (pace_aio_cancel):
    -        * pace/win32/aio.inl (pace_aio_cancel):
    -        * pace/mman.h:
    -        * pace/posix/mman.inl:
    -        * pace/win32/mman.inl:
    -
    -          Substituted PACE_HANDLE for ints that were file descriptors.
    -
    -Mon Jul 17 12:49:17 2000  Luther J Baker  
    -
    -        * pace/win32/types.h:
    -
    -          PACE_HANDLE and PACE_INVALID_HANDLE get changed in WIN32
    -          to a void *. (In POSIX dir, we use an int as a file desc.)
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Updated.
    -
    -        * pace/win32/dirent.inl
    -
    -          Uses the new PACE_HANDLE.
    -
    -Mon Jul 17 12:27:47 2000  Andrew G. Gilpin  
    -
    -        * pace/config/utility.h:
    -
    -          Prevented windows.h from getting included on non Win32 platforms. :)
    -
    -Mon Jul 17 11:47:11 2000  Luther J Baker  
    -
    -        * docs/PACE_POSIX_support.txt:
    -
    -          Added to specify native/emulation/not supported funcs.
    -
    -        * pace/win32/fcntl.h:
    -
    -          creat isn't quite exactly as ACE does it. Leave this out
    -          until correctly finished!
    -
    -Sun Jul 16 16:21:16 2000  Luther J Baker  
    -
    -        * pace/win32/grp.inl:
    -        * pace/win32/grp.h:
    -
    -          No WIN32 support. ACE does not emulate this family.
    -          Build a group struct & return -1 and set ernno to
    -          NO SUPPORT!
    -
    -Sun Jul 16 16:17:25 2000  Luther J Baker  
    -
    -        * pace/config/utility.h (PACE_FAIL_RETURN):
    -
    -          Fixed to work with just PACE_WIN32 defined.
    -
    -Fri Jul 14 22:56:29 2000  Luther J Baker  
    -
    -        * pace/config/utility.h (PACE_FAIL_RETURN):
    -
    -          Defined.
    -
    -Fri Jul 14 22:41:53 2000  Luther J Baker  
    -
    -        * pace/fcntl.h:
    -        * pace/fcntl.inl:
    -
    -          Some old changes didn't seem to take?
    -
    -Fri Jul 14 22:25:31 2000  Luther J Baker  
    -
    -        * pace/win32/dirent.inl:
    -
    -          Typo.
    -
    -Fri Jul 14 22:06:14 2000  Luther J Baker  
    -
    -        * pace/win32/fcntl.inl:
    -
    -          Type in comments for pace_win32_emulate_creat.
    -
    -Fri Jul 14 22:00:34 2000  Luther J Baker  
    -
    -        * pace/win32/fcntl.inl (creat):
    -
    -          WIN32 doesn't support integers as file handles. Note here,
    -          we return -1 for failure and we cast a HANDLE to an int
    -          for success.
    -
    -          Also, emulated support for POSIX creat. The ACE_OS version
    -          extensively uses thread protection. This is commented out and
    -          may be added in later, when threads are implemented in PACE.
    -
    -        * pace/fcntl.h (creat):
    -
    -          Comments regarding return values == (int)*HANDLE for WIN32.
    -
    -Fri Jul 14 21:20:59 2000  Luther J Baker  
    -
    -        * pace/win32/types.h:
    -
    -          Added #include  for common definitions and basic types.
    -
    -Fri Jul 14 20:49:46 2000  Luther J Baker  
    -
    -        * pace/config/utility.h:
    -
    -          Added some neat :-) ACE_* macro utilities.
    -
    -Fri Jul 14 20:38:44 2000  Luther J Baker  
    -
    -        * pace/win32/dirent.inl:
    -
    -          Added (POSIX_HAS_POSIX_FS_UOF) protection to emulation funcs.
    -
    -Fri Jul 14 20:18:46 2000  Luther J Baker  
    -
    -        * pace/config/utility.h:
    -        * pace/win32/errno.h:
    -
    -          Moved win32 error definitions to pace/win32/errno.h.
    -
    -        * pace/config/utility.h:
    -
    -          Changed #include  to #include "pace/errno.h".
    -
    -Fri Jul 14 20:05:33 2000  Luther J Baker  
    -
    -        * pace/win32/pace_dll.dsp:
    -        * pace/win32/pace_lib.dsp:
    -
    -          Default the build to all POSIX units of functionality.
    -          Defined PACE_HAS_ALL_POSIX_FUNCS in
    -          Settings >> C/C++ >> Preprocessor
    -
    -Fri Jul 14 19:06:09 2000  John Heitmann  
    -
    -        * ../include/makeinclude/wrappermacros.GNU:
    -          Added -DPACE_HAS_ALL_POSIX_FUNCS to flags.
    -
    -        * pace/pthread.h:
    -        * pace/unistd.h:
    -          Removed a duplicate closing }.
    -
    -        * pace/pthread.h:
    -          Added (void) in arguments to pointers to functions
    -          which were otherwise interpreted as (...) args.
    -
    -Fri Jul 14 18:50:07 2000  Luther J Baker  
    -
    -        * pace/win32/unistd.h:
    -
    -          Removed incompatible #include  for win32.
    -
    -Fri Jul 14 18:19:10 2000  Luther J Baker  
    -
    -        * pace/win32/signal.h:
    -
    -          Typo...(pace_s_sigaction becomes pace_sigaction_s).
    -
    -Fri Jul 14 18:05:09 2000  Luther J Baker  
    -
    -        * pace/win32/dirent.h:
    -
    -          Removed dir_init.
    -
    -        * pace/win32/dirent.inl:
    -
    -          win32 emulation functions finished.
    -          closedir  ==  pace_win32_emulate_closedir
    -          opendir   ==  pace_win32_emulate_opendir
    -          readdir   ==  pace_win32_emulate_readdir
    -
    -Fri Jul 14 17:46:56 2000  Luther J Baker  
    -
    -        * pace/win32/dirent.h:
    -
    -          Removed 'const' member of dirent struct.
    -          Added dir_init to guarantee that 'started_reading_' is
    -          initialized correctly!
    -
    -        * pace/win32/types.h:
    -
    -          Added support for win32
    -          PACE_WIN32_INVALID_HANDLE = (void*)0
    -
    -Fri Jul 14 15:55:24 2000  Joe Hoffert  
    -
    -        * pace/sys/mman.h:
    -        * pace/sys/stat.h:
    -        * pace/sys/times.h:
    -        * pace/sys/utsname.h:
    -        * pace/sys/wait.h:
    -          move closing } for extern "C" to near end of file, after
    -          .inl #includes.
    -
    -        * pace/Makefile:
    -          Added defining appropriate macros when subsetting PACE into
    -           POSIX units of functionality.
    -
    -        * pace/aio.h:
    -        * pace/assert.h:
    -        * pace/ctype.h:
    -        * pace/dirent.h:
    -        * pace/fcntl.h:
    -        * pace/grp.h:
    -        * pace/locale.h:
    -        * pace/math.h:
    -        * pace/mqueue.h:
    -        * pace/pthread.h:
    -        * pace/pwd.h:
    -        * pace/sched.h:
    -        * pace/semaphore.h:
    -        * pace/setjmp.h:
    -        * pace/signal.h:
    -        * pace/stddef.h:
    -        * pace/stdio.h:
    -        * pace/stdlib.h:
    -        * pace/string.h:
    -        * pace/termios.h:
    -        * pace/time.h:
    -        * pace/unistd.h:
    -        * pace/utime.h:
    -        * pace/emulation/mqueue.c:
    -        * pace/emulation/mqueue.h:
    -        * pace/posix/aio.inl:
    -        * pace/posix/ctype.inl:
    -        * pace/posix/dirent.inl:
    -        * pace/posix/fcntl.inl:
    -        * pace/posix/grp.inl:
    -        * pace/posix/locale.inl:
    -        * pace/posix/math.inl:
    -        * pace/posix/mman.inl:
    -        * pace/posix/mqueue.inl:
    -        * pace/posix/pthread.inl:
    -        * pace/posix/pwd.inl:
    -        * pace/posix/sched.inl:
    -        * pace/posix/semaphore.inl:
    -        * pace/posix/setjmp.inl:
    -        * pace/posix/signal.inl:
    -        * pace/posix/stat.inl:
    -        * pace/posix/stdio.inl:
    -        * pace/posix/stdlib.inl:
    -        * pace/posix/string.inl:
    -        * pace/posix/termios.inl:
    -        * pace/posix/time.inl:
    -        * pace/posix/times.inl:
    -        * pace/posix/unistd.inl:
    -        * pace/posix/utime.inl:
    -        * pace/posix/utsname.inl:
    -        * pace/posix/wait.inl:
    -        * pace/win32/aio.inl:
    -        * pace/win32/ctype.inl:
    -        * pace/win32/dirent.inl:
    -        * pace/win32/fcntl.inl:
    -        * pace/win32/grp.inl:
    -        * pace/win32/locale.inl:
    -        * pace/win32/math.inl:
    -        * pace/win32/mman.inl:
    -        * pace/win32/mqueue.inl:
    -        * pace/win32/pthread.inl:
    -        * pace/win32/pwd.inl:
    -        * pace/win32/sched.inl:
    -        * pace/win32/semaphore.inl:
    -        * pace/win32/setjmp.inl:
    -        * pace/win32/signal.inl:
    -        * pace/win32/stat.inl:
    -        * pace/win32/stdio.inl:
    -        * pace/win32/stdlib.inl:
    -        * pace/win32/string.inl:
    -        * pace/win32/termios.inl:
    -        * pace/win32/time.inl:
    -        * pace/win32/times.inl:
    -        * pace/win32/unistd.inl:
    -        * pace/win32/utime.inl:
    -        * pace/win32/utsname.inl:
    -        * pace/win32/wait.inl:
    -          Wrapped each function with its corresponding POSIX unit of
    -           functionality (or the catch-all PACE_HAS_POSIX_NONUOF_FUNCS).
    -
    -        * pace/config/config.h:
    -          Changed to define all the POSIX macros when
    -           PACE_HAS_ALL_POSIX_FUNCS is defined.
    -
    -        * tests/Makefile:
    -          Adding default flag of PACE_HAS_ALL_POSIX_FUNCS.
    -
    -        * tests/Stdio_Test.c:
    -          change variable from FILE to PACE_FILE.
    -
    -Fri Jul 14 15:02:47 2000  Luther J Baker  
    -
    -        * PACE/pace/win32/dirent.h:
    -
    -          pace_dir changed to PACE_DIR.
    -          PACE_TCHAR changed to char.
    -
    -Fri Jul 14 14:34:43 2000  David L. Levine 
    -
    -        * pace/assert.h,pace/{posix,win32}/assert.{h,inl}:
    -          changed pace_assert from an inline function to a macro.
    -          That way, it will report the proper file/line number,
    -          instead of those of the pace_assert inline function.
    -
    -          Also, moved #include  from .inl file to .h
    -          file.  Because we're now using a macro, client code
    -          must #include .
    -
    -Fri Jul 14 09:26:36 2000  David L. Levine 
    -
    -        * include/makeinclude/rules.common.GNU: if debug is disabled,
    -          add -DPACE_NDEBUG to CFLAGS or CCFLAGS.
    -
    -        * pace/{posix,win32}/assert.inl: neuter if PACE_NDEBUG is
    -          defined.  Even though assert () won't do anything with
    -          NDEBUG, data (__FILE__ and __LINE__, presumably) was stored
    -          in the .o file without this change.
    -
    -          We might want to consider making pace_assert a macro.
    -          As an inline function, __FILE__ and __LINE__ won't be
    -          very helpful.
    -
    -Fri Jul 14 08:17:59 2000  David L. Levine 
    -
    -        * pace/{aio.h,assert.h,ctype.h,dirent.h,fcntl.h,grp.h,locale.h,
    -          math.h,mqueue.h,pthread.h,pwd.h,sched.h,semaphore.h,setjmp.h,
    -          stdio.h,stdlib.h,string.h,termios.h,time.h,unistd.h,utime.h}:
    -          move closing } for extern "C" to near end of file, after
    -          .inl #includes.
    -
    -Fri Jul 14 00:30:38 2000  John Heitmann  
    -
    -        * ../ace/OS.i
    -          Minor updates. Currently only LynxOS has a dirty build
    -          of libACE, although libACE still can't be linked against
    -          correctly.
    -
    -        * pace/signal.h
    -        * pace/posix/signal.*
    -        * pace/stdlib.h
    -        * pace/posix/stdlib.*
    -        * pace/pthread.h
    -        * pace/posix/pthread.*
    -
    -          Added typedef of pointers to functions which forced
    -          functions which take pointers to functions to accept
    -          arguments of c++ linkage... I think.
    -
    -Thu Jul 13 16:37:33 2000  John Heitmann  
    -
    -        * ../include/makeinclude/wrapper_macros.GNU
    -
    -          Added 'pace' flag to support compilation with PACE.
    -          'make pace=1' and behold the power of pace!
    -
    -        * include/makeinclude/rules.common.GNU
    -
    -          Removed netinet, arpa, and common form the VPATH
    -
    -        * pace/1/
    -        * pace/arpa/
    -        * pace/netinet/
    -        * pace/common/
    -
    -          Removed. 
    -
    -Thu Jul 13 14:57:53 2000  David L. Levine 
    -
    -        * pace/{posix,win32}/assert.inl (pace_assert): removed unnecessary
    -          return statement at end of function.
    -
    -Thu Jul 13 10:53:06 2000  Luther J Baker  
    -
    -        * pace/win32/dirent.h:
    -
    -          Added structs for dirent and DIR.
    -
    -Thu Jul 13 00:46:37 2000  John Heitmann  
    -
    -        * pace/signal.h
    -        * pace/posix/signal.h
    -        * pace/posix/signal.inl
    -
    -          Changed the typedef of pace_s_sigevent
    -          to pace_sigevent_s to match up with pace_stat_s. The
    -          problem with both of these is that the data type names
    -          conflict with function names.
    -
    -        * pace/stdio.h
    -        * pace/posix/stdio.c
    -
    -          Changed all '...' functions to defines. Now the library
    -          should be totally empty on platforms without emulation code.
    -
    -        * include/makeinclude/rules.common.GNU
    -        * tests/Makefile
    -
    -          Because the library can be empty again, don't include
    -          the library by default. As a temporary kludge emulation=1
    -          is set in rules.common.GNU for Linux, which is the only
    -          platform thus far which has a non-empty library.
    -
    -        * pace/emulation/mqueue.c
    -        * pace/emulation/mqueue.h
    -
    -          Support for all functionality is now complete, cleaner,
    -          and somewhat less buggy.
    -
    -        * tests/mqueue_test.c
    -
    -          Borrowed a test from Konstantin Knizhnik's web site,
    -          will eventually have to make this a one-button test.
    -
    -Wed Jul 12 17:30:54 2000  John Heitmann  
    -
    -        * pace/posix/types.h
    -          Fixed pace_tchar.
    -
    -Wed Jul 12 16:31:51 2000  Luther J Baker  
    -
    -        * pace/win32/types.h:
    -
    -          Fixed PACE_TCHAR.
    -
    -Wed Jul 12 16:10:39 2000  John Heitmann  
    -
    -        * pace/fcntl.h
    -        * pace/mqueue.h
    -        * pace/semaphore.h
    -        * pace/stdio.h
    -        * pace/unistd.h
    -        * pace/unistd.inl
    -        * pace/tests/mqueue_test.c
    -          Updated all #define pace_func (X) macros to remove the need
    -          for double paranthesis.
    -
    -Wed Jul 12 17:01:47 2000  Ossama Othman  
    -
    -        * Makefile.am:
    -        * pace/Makefile.am:
    -        * pace/posix/Makefile.am:
    -        * tests/Makefile.am:
    -
    -          Preliminary Automake input files for PACE.  They aren't working
    -          yet, but do provide a good start.
    -
    -Wed Jul 12 15:27:27 2000  Luther J Baker  
    -
    -        * pace/posix/types.h (PACE_TCHAR):
    -        * pace/win32/types.h (PACE_TCHAR):
    -
    -          Added typedef char PACE_TCHAR;
    -          Protected some of the typedefs.
    -
    -Wed Jul 12 14:26:10 2000  Luther J Baker  
    -
    -        * pace/win32/aio.inl:
    -
    -          PACE_ERRNO_NO_SUPPORT_RETURN (-1);
    -          Emulate support for these latter.
    -
    -Wed Jul 12 14:15:10 2000  Luther J Baker  
    -
    -        * pace/win32/signal.h:
    -        * pace/win32/time.h:
    -
    -          Added types to help win32 along.
    -
    -Wed Jul 12 12:10:55 2000  David L. Levine  
    -
    -        * pace/config/platform.h: added OSF1 support.
    -
    -Wed Jul 12 11:51:52 2000  Luther J Baker  
    -
    -        * pace/win32/errno.h:
    -
    -          Added to repository.
    -
    -        * pace/win32/pace_dll.dsp:
    -        * pace/win32/pace_lib.dsp:
    -
    -          Modified to include the new file.
    -
    -Wed Jul 12 11:45:34 2000  David L. Levine  
    -
    -        * include/makeinclude/rules.commmon.GNU: added OSF1 support.
    -
    -Wed Jul 12 10:53:01 2000  Luther J Baker  
    -
    -        * pace/win32/pace_lib.dsp:
    -        * pace/win32/pace_dll.dsp:
    -
    -          Added the PACE/pace/*.h files. These currently contain
    -          the interface we need to compile into our code. Maybe
    -          we can change the following, but we now have
    -          PACE/pace/aio.h and PACE/pace/win32/aio.h
    -          both showing up in the VC++ list as aio.h and aio.h.
    -          The PACE/pace/win32 files always show up second :-)
    -
    -Wed Jul 12 10:24:20 2000  Luther J Baker  
    -
    -        * pace/win32/wait.h:
    -        * pace/win32/utsname.h:
    -        * pace/win32/utime.h:
    -        * pace/win32/unistd.h:
    -        * pace/win32/types.h:
    -        * pace/win32/times.h:
    -        * pace/win32/time.h:
    -        * pace/win32/termios.h:
    -        * pace/win32/string.h:
    -        * pace/win32/stdlib.h:
    -        * pace/win32/stdio.h:
    -        * pace/win32/stat.h:
    -        * pace/win32/signal.h:
    -        * pace/win32/setjmp.h:
    -        * pace/win32/semaphore.h:
    -        * pace/win32/sched.h:
    -        * pace/win32/pwd.h:
    -        * pace/win32/pthread.h:
    -        * pace/win32/mqueue.h:
    -        * pace/win32/mman.h:
    -        * pace/win32/math.h:
    -        * pace/win32/locale.h:
    -        * pace/win32/limits.h:
    -        * pace/win32/grp.h:
    -        * pace/win32/fcntl.h:
    -        * pace/win32/dirent.h:
    -        * pace/win32/ctype.h:
    -        * pace/win32/assert.h:
    -        * pace/win32/aio.h:
    -
    -          Removed function prototypes. These were moved to the PACE/*.h files.
    -          Removed #include *.inl files. These are inluded by the PACE/*.h files.
    -          Postfixed the protective preprocessor guards with _WIN32
    -          (ie: PACE_CTYPE_H_WIN32).
    -
    -Wed Jul 12 01:25:44 2000  John Heitmann  
    -
    -        * pace/emulation/time.c:
    -          Removed since it is currently empty.
    -
    -        * pace/emulation/time.h:
    -          Minor changes to how this file is included in:
    -
    -        * pace/posix/time.h:
    -          Changed how emulation/time.h is included on Linux
    -
    -        * pace/config/compiler.h
    -        * pace/posix/string.inl
    -        * pace/posix/unistd.inl
    -          Changed to quell odd compiler warnings from gcc. Added
    -          PACE_BROKEN_INLINE.
    -
    -        * pace/emulation/mqueue.*
    -          Improved and updated code, but it is still not complete.
    -
    -        * pace/tests/mqueue_test.c
    -        * pace/tests/Makefile
    -          Added a very simple test to verify mqueue works.
    -
    -Tue Jul 11 21:05:58 2000  David L. Levine  
    -
    -        * pace/unistd.h,pace/posix/unistd.inl:
    -          1) pace_execl{,e,p} weren't declared/defined with
    -             PACE_INLINE, so they were being put into each .o.
    -          2) Reordered some of the function definitions in
    -             posix/unistd.inl, so that they appear before all uses.
    -
    -Tue Jul 11 19:31:13 2000  David L. Levine  
    -
    -        * pace/stdio.h: fixed copy+paste error in comment:
    -          tmpfile instead of sscanf.
    -
    -Tue Jul 11 4:28:00 2000  Andrew G. Gilpin  
    -
    -        * rules.common.GNU:
    -          Added functionality so that PACE_SYSVER on Linux is in the
    -          same format as LINUX_VERSION_CODE from the Linux source code.
    -          For example, Linux version 2.2.12 -> 0x02020C == 131596
    -
    -Tue Jul 11 10:24:03 2000  Joe Hoffert  
    -
    -        * tests/Makefile:
    -          Changed to always include the PACE library. This was causing
    -          problems for functions that are never inlined when inlining
    -          is enabled.
    -
    -Mon Jul 10 13:47:25 2000  John Heitmann  
    -
    -        * pace/stddef.h
    -        * pace/stdio.h
    -        * pace/string.h
    -        * pace/unistd.h
    -          Changed to new format, all functions should now be
    -          declared in pace/
    -
    -        * pace/mqueue.h
    -        * pace/emulation/mqueue*
    -          Emulated mqueue for linux. Curently there is no support for
    -          mq_notify, and there is a race condition if two procs try to
    -          create the same queue at the same time.
    -
    -        * pace/stdio.h
    -        * pace/posix/stdio.inl
    -        * pace/unistd.h
    -        * pace/posix/unistd.inl
    -          Moved ctermid back to where it should be (stdio).
    -
    -        * pace/string.h
    -        * pace/posix/string.inl
    -          Added mem* functions (e.g. memset), since they are C std.
    -
    -        * pace/time.h
    -        * pace/posix/time.inl
    -          ENOSYSed clock_* and timer_* functions for Linux, although
    -          emulation may be possible.
    -
    -        * pace/posix/pthread.inl
    -          ENOSYSed many functions not supported on Linux. Linux should
    -          build clean now for the moment.
    -
    -Mon Jul 10 08:50:37 2000  Joe Hoffert  
    -
    -        * pace/posix/time.inl:
    -        * pace/posix/pthread.inl:
    -        * pace/posix/aio.inl:
    -          Changed code to use PACE_NONCONST_ARG_CAST rather than
    -          #idef'ing for LynxOS and doing the cast.
    -
    -        * pace/config/defines.h:
    -          Changed order of include so that platform.h (and
    -          POSIX_HAS_* #defines) will be first.
    -
    -        * pace/config/config.h:
    -          Added PACE_NONCONST_ARG_CAST macro. Needed for LynxOS
    -          when it doesn't use const args for POSIX functions
    -          taking const args.
    -
    -        * tests/Makefile:
    -        * pace/Makefile:
    -          Took out common rules and included
    -          include/makeinclude/rules.common.GNU instead.
    -
    -        * include/makeinclude/rules.common.GNU:
    -          Added this file to take out common rules from the
    -          different Makefiles.
    -
    -        * tests/Posix_SP_Test.c:
    -          Made test more robust (e.g., check for all specified POSIX
    -          names for sysconf and for NULL and non-NULL arg to time)
    -          Also, ifdefed out some sysconf names for LynxOS since those
    -          names are supported. Sent email to LynuxWorks about this.
    -
    -Fri Jul  7 19:11:38 2000  John Heitmann  
    -
    -        * pace/sys/mman.h
    -        * pace/sys/stat.h
    -        * pace/sys/times.h
    -        * pace/sys/types.h
    -        * pace/sys/utsname.h
    -        * pace/sys/wait.h
    -        * pace/termios.h
    -        * pace/time.h
    -        * pace/unistd.h
    -        * pace/utime.h
    -        * pace/posix/mman.h
    -        * pace/posix/stat.h
    -        * pace/posix/termios.h
    -        * pace/posix/time.h
    -        * pace/posix/times.h
    -        * pace/posix/types.h
    -        * pace/posix/unistd.h
    -        * pace/posix/utime.h
    -        * pace/posix/utsname.h
    -        * pace/posix/wait.h
    -
    -        Continued  changes:
    -
    -        Changed the #if defined (PACE_HAS_POSIX) to #if
    -        PACE_HAS_POSIX per our recent conversation regarding all macros being
    -        assigned a value.
    -
    -        Moved the prototype function signatures to the root
    -        directory *.h file.
    -
    -        Changed the form the *.inl file was included.
    -
    -
    -Fri Jul  7 17:24:33 2000  Luther J Baker  
    -
    -        * pace/fcntl.h:
    -
    -          Missing extern "C" { }.
    -
    -Fri Jul  7 17:22:56 2000  Luther J Baker  
    -
    -        * pace/aio.h:
    -        * pace/posix/aio.h:
    -        * pace/assert.h:
    -        * pace/posix/assert.h:
    -        * pace/ctype.h:
    -        * pace/posix/ctype.h:
    -        * pace/dirent.h:
    -        * pace/posix/dirent.h:
    -        * pace/fcntl.h:
    -        * pace/posix/fcntl.h:
    -        * pace/grp.h:
    -        * pace/posix/grp.h:
    -        * pace/math.h:
    -        * pace/posix/math.h:
    -        * pace/mqueue.h:
    -        * pace/posix/mqueue.h:
    -        * pace/pthread.h:
    -        * pace/posix/pthread.h:
    -        * pace/pwd.h:
    -        * pace/posix/pwd.h:
    -        * pace/sched.h:
    -        * pace/posix/sched.h:
    -        * pace/semaphore.h:
    -        * pace/posix/semaphore.h:
    -        * pace/setjmp.h:
    -        * pace/posix/setjmp.h:
    -        * pace/signal.h:
    -        * pace/posix/signal.h:
    -
    -          Changed the protection includes. Eg:
    -            ROOT directory PACE_ASSERT_H
    -            POSIX directory PACE_ASSERT_H_POSIX.
    -
    -          Changed the #if defined (PACE_HAS_POSIX) to #if PACE_HAS_POSIX
    -          per our recent conversation regarding all macros being assigned a
    -          value.
    -
    -          Moved the prototype function signatures to the root directory *.h file.
    -
    -          Changed the form the *.inl file was included.
    -
    -Fri Jul  7 16:23:57 2000  Luther J Baker  
    -
    -        * pace/errno.h:
    -        * pace/posix/errno.h
    -
    -          Altered to fit in current
    -
    -Fri Jul  7 16:04:30 2000  Luther J Baker  
    -
    -        * pace/config/platform:
    -
    -          # define all unused macros so we can test them against '0'
    -          in the source code.
    -
    -Fri Jul  7 15:24:57 2000  Luther J Baker  
    -
    -        * pace/config/compiler.h:
    -
    -          # define PACE_HAS_CPLUSPLUS __cplusplus
    -
    -Fri Jul 07 14:41:51 2000  Luther J Baker  
    -
    -        * pace/win32/types.h:
    -
    -          Fixed some non-native type problems. Also, made some temporary
    -          types (pthread_*) until we actually get to win32/pthread.h at
    -          which point, we will correctly define these.
    -
    -Fri Jul  7 02:18:02 2000  John Heitmann  
    -
    -        * pace/posix/dirent.*:
    -        * pace/posix/pthread.*:
    -        * pace/posix/sched.h:
    -        * pace/posix/signal.*:
    -        * pace/posix/stat.*:
    -        * pace/posix/time.*:
    -        * pace/posix/utsname.inl:
    -          Fixed a problem with certain typedefs not being
    -          exposed in other .inl files due to an odd
    -          interaction of the #pragma once style protections
    -          present in the header files. A few structs were redefined
    -          a second time outside of their header file.
    -
    -          Also, pace_stat was changed to pace_stat_s to avoid a conflict
    -          witht the pace_stat() function.
    -
    -        * pace/win32/termios.*:
    -        * pace/win32/wait.h:
    -        * pace/win32/utsname.*:
    -        * pace/win32/times.*:
    -        * pace/win32/stat.*:
    -        * pace/win32/mman.*:
    -          Added changes made to /posix earlier.
    -
    -
    -Thu Jul  6 13:04:02 2000  Joe Hoffert  
    -
    -        * tests/Posix_SP_Test.c:
    -          Made tests more robust checking for all possible parameter
    -          values. Also, changed check for failure. Just because a
    -          function doesn't support a particular parameter value, does
    -          not mean the function doesn't support that function. If
    -          the PACE symbols can be used (i.e., the code compiles) then
    -          the function is supported.
    -
    -Thu Jul 06 12:17:21 2000  David L. Levine  
    -
    -        * pace/posix/pthread.inl (pace_pthread_mutex_{get,set}prioceiling):
    -          LynxOS does not have pthread_mutex_{get,set}prioceiling, so
    -          don't call them with PACE_LYNXOS.
    -
    -Wed Jul 5 13:38:11 2000 John Heitmann 
    -
    -        * pace/types.h:
    -          Added #include  to expose types on LynxOS.
    -
    -        * pace/time.inl:
    -          Casted away const for LynxOS.
    -
    -        * pace/posix/termios.*:
    -          Fixed a typedef and removed tc*pgrp which didn't seem to
    -          take from the last commit.
    -
    -        * ../ace/OS.i:
    -          Updated corresponding functions to those newly added in PACE.
    -
    -Wed Jul  5 17:15:26 2000  John Heitmann  
    -
    -        * pace/Makefile:
    -          Fixed error introduced by my earlier update.
    -
    -        * pace/termios.*:
    -          Added typedefs and changed function signatures appropriately.
    -          Removed tcgetpgrp which was added to unistd earlier.
    -
    -        * pace/sys/wait.h:
    -          Added macros.
    -
    -        * pace/sys/utsname.*:
    -        * pace/sys/times.*:
    -        * pace/sys/stat.*:
    -        * pace/sys/mman.*
    -          Added typedefs and changed function parameters appropriately.
    -
    -        * pace/time.h:
    -          Added #include "pace/signal.h"
    -
    -        * pace/unistd.inl:
    -          Changed spelling error.
    -
    -        * pace/signal.*:
    -        * pace/stat.*:
    -          Typedefs of structs later used as pointers were broken
    -          so I reverted back to the old way temporarily.
    -
    -Wed Jul 05 16:00:32 2000  Luther J Baker  
    -
    -        * pace/win32/types.h:
    -
    -          Removed redefinition of size_t.
    -
    -Wed Jul 05 14:54:16 2000  Luther J Baker  
    -
    -        * pace/win32/types.h:
    -
    -          Define native UNIX types to work on WIN32 types.
    -
    -Wed Jul  5 15:28:25 2000  John Heitmann  
    -
    -        * pace/Makefile:
    -          Fixed paths that were invalidated when wait.h and termios.h
    -          were moved.
    -
    -Wed Jul 05 14:46:38 2000  Luther J Baker 
    -
    -        * pace/win32/aio.h:
    -
    -          Removed #include .
    -
    -Wed Jul 05 13:41:00 2000  Luther J Baker  
    -
    -        * PACE/win32/types.h:
    -
    -          Removed #include .
    -          Moved -*- C -*- to same line as $-Id-$
    -
    -Wed Jul  5 13:25:34 2000  Luther J Baker  
    -
    -        * pace/win32/*
    -
    -          Removed (posix ace) from files.
    -
    -Wed Jul 05 12:49:20 2000  Luther J Baker  
    -
    -        * PACE/config/platform.h
    -
    -          WIN32 doesn't use the makefile.
    -          #define PACE_WIN32 2000
    -
    -Wed Jul  5 12:48:41 2000  Luther J Baker  
    -
    -        * pace/win32/*.
    -
    -          Update files per PACE/posix changes.
    -
    -Mon Jul  3 19:30:39 2000  John Heitmann  
    -
    -        * pace/posix/time.*:
    -          Added macros, typedefs, clock(), and difftime().
    -
    -        * pace/posix/unistd.*:
    -          Added macros, typedefs, tcgetpgrp(), tcsetpgrp().
    -
    -        * pace/posix/utime.*:
    -          Added macros and typedefs.
    -
    -Mon Jul  3 9:45:00 2000 John Heitmann 
    -
    -        * pace/config/types.h:
    -          Removed. Functionality replaced by platform
    -          specific pace/sys/types.
    -
    -        * pace/config/defines.h:
    -          Deleted reference to types.h.
    -
    -Mon Jul  3 00:25:44 2000  John Heitmann  
    -
    -        * pace/sys/termios.h:
    -          Moved to pace/
    -
    -        * pace/posix/aio.*:
    -        * pace/posix/direnet.*:
    -        * pace/posix/fcntl.*:
    -        * pace/posix/grp.*:
    -        * pace/posix/locale.*:
    -        * pace/posix/math.*:
    -        * pace/posix/mqueue.*:
    -        * pace/posix/pthread.*:
    -        * pace/posix/pwd.*:
    -        * pace/posix/sched.*:
    -        * pace/posix/semaphore.*:
    -        * pace/posix/setjmp.*:
    -        * pace/posix/signal.*:
    -        * pace/stddef.*:
    -        * pace/posix/stdio.*:
    -        * pace/posix/stdlib.*:
    -        * pace/posix/string.*:
    -        * pace/posix/types.*:
    -        * pace/posix/time.*:
    -          Added many missing typedefs and macros. A bug has been
    -          added in also in types.h. It is harmless but causes a
    -          compiler warning that I could not fix. Files lower in
    -          the alphabet such as utime haven't been finished yet.
    -
    -        * pace/posix/stdio.*:
    -          Added in the missing functions fgetpos, fsetpos, fwrite,
    -          setvbuf, vfprintf, vprintf, vsprintf. The last three
    -          are empty until passing the macro va_list is resolved.
    -
    -        * pace/posix/locale.*:
    -          Added localeconv ().
    -
    -        * pace/posix/signal.*:
    -          Added raise () and signal ().
    -
    -        * pace/posix/unistd.*:
    -        * pace/posix/stdio.*:
    -          Moved ctermid() from stdio to unistd.
    -
    -        * pace/posix/stdlib.*:
    -          Added abort ().
    -
    -        * pace/:
    -          Added stddef.h and errno.h
    -
    -Fri Jun 30 16:54:41 2000  John Heitmann  
    -
    -        * pace/wait.h:
    -          Moved to sys/
    -
    -Fri Jun 30 15:55:52 2000  Joe Hoffert  
    -
    -        * pace/posix/time.h:
    -        * pace/posix/time.inl:
    -        * pace/win32/time.h:
    -        * pace/win32/time.inl:
    -          Corrected type for timeptr arg for pace_mktime function.
    -          Corrected non-const arg for pace_strftime. (NOTE: The
    -          Solaris man page incorrectly documents the constness
    -          of the first argument.)
    -
    -        * pace/posix/stdlib.inl:
    -        * pace/win32/stdlib.inl:
    -          Corrected void return value for srand.
    -
    -Fri Jun 30 15:05:08 2000  Joe Hoffert  
    -
    -        * pace/posix/TODO:
    -          Added testing with and without PACE_HAS_POSIX_PTHREAD_SEMANTICS
    -          defined.
    -
    -        * pace/win32/setjmp.h:
    -        * pace/win32/setjmp.inl:
    -        * pace/posix/setjmp.h:
    -        * pace/posix/setjmp.inl:
    -          Added pace_setjmp and pace_longjmp functions.
    -
    -        * pace/posix/time.h:
    -        * pace/posix/time.inl:
    -        * pace/win32/time.h:
    -        * pace/win32/time.inl:
    -          Cleaned up comments and added functions pace_asctime,
    -          pace_ctime, pace_gmtime, pace_localtime, pace_mktime,
    -          and pace_strftime.
    -          Removed unneeded PACE_HAS_POSIX_PTHREAD_SEMANTICS guards
    -          in .inl files.
    -
    -        * pace/win32/stdlib.h:
    -        * pace/win32/stdlib.inl:
    -        * pace/posix/stdlib.h:
    -        * pace/posix/stdlib.inl:
    -          Added functions pace_abs, pace_atof, pace_bsearch, pace_qsort,
    -          pace_rand, and pace_srand.
    -          Added "Requires PACE_HAS_REENTRANT" comment for pace_rand_r
    -          in header files.
    -
    -        * pace/Makefile:
    -          Added all 18 POSIX Units of Functionality components to
    -          be built as separate libaries as specified on the command
    -          line (just like ACE).
    -
    -Fri Jun 30 10:10:53 2000  Joe Hoffert  
    -
    -        * tests/Posix_SP_Test.c:
    -          Fixed description. Fixed name value arg to sysconf to be
    -          POSIX. Added more extensive checking and output of values
    -          when a function succeeds.
    -
    -        * pace/Makefile:
    -          Removed extraneous #INCLDIRS comment.
    -
    -        * pace/posix/pthread.inl:
    -        * pace/posix/aio.inl:
    -          Casted away const from certain functions for LynxOS when
    -          their prototypes don't have const.
    -
    -        * tests/Makefile:
    -          Moved PACE_SYSNAME definition below wrapper_macros.GNU so
    -          that cross-compiled platforms (e.g., LynxOS) can define
    -          PACE_SYSNAME.
    -
    -        * pace/config/platform.h:
    -          Changed of PACE_HAS_POSIX for LynxOS from PACE_LYNX to
    -          PACE_LYNXOS.
    -
    -Thu Jun 29 19:53:10 2000  Luther J Baker  
    -
    -        * pace/config/utility.h:
    -
    -          (ENOTSUP) is not defined on win32. Added support.
    -
    -Thu Jun 29 19:22:46 2000  Luther J Baker  
    -
    -        * pace/win32
    -          Altered syntax (#include pace/posix/file.h) left over
    -          from copying.
    -
    -Thu Jun 29 16:42:31 2000  John Heitmann  
    -
    -        * pace/posix/pthread.{h,inl}:
    -        Changed pthead_condattr_init to pthread_condattr init
    -        and pace_pace_pthread... to pace_pthread...
    -
    -
    -Thu Jun 29 15:04:42 2000  Joe Hoffert  
    -
    -        * pace/man/Makefile (index.html):
    -          Created PACE_DOC++ as executable to invoke and assigned
    -          /project/doc/pkg/bin/doc++ to it.
    -
    -        * pace/posix/assert.h:
    -          Removed extraneous '.' in comment.
    -
    -Thu Jun 29 15:04:42 2000  Joe Hoffert  
    -
    -        * pace/posix/aio.h:
    -        * pace/posix/assert.h:
    -        * pace/posix/ctype.h:
    -        * pace/posix/dirent.h:
    -        * pace/posix/fcntl.h:
    -        * pace/posix/grp.h:
    -        * pace/posix/locale.h:
    -        * pace/posix/math.h:
    -        * pace/posix/mman.h:
    -        * pace/posix/mqueue.h:
    -        * pace/posix/pthread.h:
    -        * pace/posix/pwd.h:
    -        * pace/posix/sched.h:
    -        * pace/posix/semaphore.h:
    -        * pace/posix/setjmp.h:
    -        * pace/posix/signal.h:
    -        * pace/posix/stdio.h:
    -        * pace/posix/stdlib.h:
    -        * pace/posix/string.h:
    -        * pace/posix/time.h:
    -        * pace/posix/unistd.h:
    -        * pace/posix/utime.h:
    -        * pace/posix/wait.h:
    -          Adding doc++ html man comments.
    -
    -        * pace/posix/stdio.{h,inl} (pace_printf):
    -          Removed pace_snprintf and pace_vsprint functions since they
    -          are not POSIX.
    -
    -Thu Jun 29 14:47:19 2000  Joe Hoffert  
    -
    -        * pace/posix/stdio.inl (pace_printf):
    -
    -        * pace/man/pace.jpg:
    -          JPEG file of the PACE icon used in the html man pages.
    -
    -        * pace/man/banner:
    -          Created banner file that is inserted at the bottom of
    -          the generated html man pages. This file contains the
    -          PACE logo pointing to the PACE Web page.
    -
    -        * pace/man/Makefile:
    -          Created Makefile for the html man pages using doc++
    -
    -Thu Jun 29 09:21:19 2000  Joe Hoffert  
    -
    -        * pace/man/Makefile:
    -
    -        * pace/config/config.h:
    -          Changed C++ // comment to C /* */ comment. The compiler
    -          (appropriately) choked on the former.
    -
    -        * pace/Makefile:
    -          Moved defining PACE_SYSNAME until after all the macro and rules
    -          files are included. Otherwise, PACE_SYSNAME was not getting
    -          defined for LynxOS.
    -
    -        * pace/posix/types.h:
    -          Put an #if defined (PACE_SUNOS) guard around inclusion of
    -          inttypes.h since this file isn't found on Lynx.
    -
    -Thu Jun 29 02:38:52 2000  John Heitmann  
    -
    -        * pace/posix/mman.inl:
    -          Added cast to char* from void* in param passing.
    -
    -        * pace/posix/stdio.h:
    -        * pace/posix/stdio.c:
    -          Changed *printf from macros to functions.
    -
    -        * pace/posix/unistd.c:
    -        * pace/posix/unistd.h:
    -          Changed the macros execl, execle, execlp to functions.
    -
    -Wed Jun 28 11:18:17 2000  Joe Hoffert  
    -
    -        * pace/Makefile:
    -        * tests/Makefile:
    -          Modified to make PACE_ROOT $(ACE_ROOT)/PACE rather than the
    -          previous value of $(ACE_ROOT)/pace.
    -
    -Wed Jun 28 09:32:29 2000  David L. Levine  
    -
    -        * pace/config/config.h: added platform-dependent determination
    -          of PACE_HAS_REENTRANT.  Also, wrapped all of the PACE_HAS...
    -          #defines with a check to see if it had already been defined.
    -
    -        * pace/posix/stdlib.inl (pace_rand_r): use PACE_HAS_REENTRANT,
    -          now that the platform-dependent code is in pace/config/config.h.
    -
    -Wed Jun 28 09:21:07 2000  Joe Hoffert  
    -
    -        * tests/Makefile:
    -        * pace/Makefile:
    -          Changed inlining to be the default.
    -
    -Tue Jun 27 23:09:34 2000 John Heitmann 
    -
    -        * pace/posix/unistd.h:
    -        * pace/posix/termios.inl:
    -          Added #includes of  and  to preclude
    -          undeclared token warnings without inlining enabled.
    -
    -        * pace/posix/pwd.inl:
    -          Added PACE_UNUSED_ARG where needed.
    -
    -Tue Jun 27 22:03:52 2000  David L. Levine  
    -
    -        * pace/posix/stdlib.inl (pace_rand_r): on Linux and
    -          SunOS, rand_r isn't available if certains macros
    -          aren't defined, so reflect that.  rand_r doesn't
    -          appear anywhere in the LynxOS 3.1.0 headers, so
    -          NO_SUPPORT there as well.
    -
    -Tue Jun 27 16:35:20 2000  Joe Hoffert  
    -
    -        * pace/posix/aio.h:
    -          Removed copyrighted Solaris man text that accidentally get
    -          committed to the repository and replaced it with text to
    -          denote what really needs to go there.
    -
    -Tue Jun 27 14:32:40 2000  Joe Hoffert  
    -
    -        * pace/posix/aio.h:
    -
    -        * tests/Makefile (ACELIB):
    -          Defining PACE_HAS_INLINE from the Makefile and adding the PACE
    -          library if we are not inlining.
    -
    -        * pace/posix/stdio.inl:
    -          Removed function since it's now a macro in the header file.
    -
    -        * pace/posix/stdio.h:
    -          Changed pace_sprintf from a function to a macro because of
    -          compilation warnings. Can be changed later.
    -
    -        * pace/config/compiler.h (PACE_INLINE):
    -          Changed definition of PACE_INLINE depending on if PACE_HAS_INLINE
    -          is defined.
    -
    -        * pace/config/features.h:
    -          Removed PACE_HAS_INLINE from here since the Makefile now
    -          defines it.
    -
    -        * pace/Makefile:
    -          Defining PACE_HAS_INLINE from the Makefile.
    -
    -Tue Jun 27 11:23:41 2000  David L. Levine  
    -
    -        * pace/posix/pthread.{h,inl} (pthread_cleanup_{push,pop}):
    -          replaced these inline functions with macros.  They're
    -          supposed to be used in the same block; pthread_cleanup_pop
    -          refers to a local object that pthread_cleanup_push declares.
    -          I don't see how to implement that with inline functions.
    -
    -Tue Jun 27 10:11:00 2000 John Heitmann 
    -
    -        * pace/tests/Posix_SP_Test.c
    -        * pace/tests/Stdio_Test.c
    -        * pace/pace/posix/time.inl
    -          Added more PACE_UNUSED_ARG
    -
    -Tue Jun 27 9:51:43 2000 John Heitmann 
    -
    -        * pace/tests/Makefile
    -          Changed VLDLIBS := to +=
    -
    -        * pace/tests/Posix_SP_Test.c
    -          Included pace/stdio.h
    -
    -Mon Jun 26 15:07:08 2000  Luther J Baker  
    -
    -        * pace/pace/win32/pace.dsw:
    -        * pace/pace/win32/pace_dll.dsp:
    -        * pace/pace/win32/pace_lib.dsp:
    -
    -          Updated to link correctly.
    -
    -Mon Jun 26 13:27:02 2000  Luther J Baker  
    -
    -        * pace/pace/win32/pace.dsw:
    -        * pace/pace/win32/pace_dll.dsp:
    -        * pace/pace/win32/pace_lib.dsp:
    -
    -          Added to repository.
    -
    -Mon Jun 26 12:24:36 2000  Luther J Baker  
    -
    -        * pace/pace/posix/TODO:
    -
    -          Updated.
    -
    -        * pace/pace/win32/*.[h,inl,cpp] README TODO:
    -
    -          Added to repository.
    -
    -Mon Jun 26 11:03:00 2000 John Heitmann 
    -
    -        * pace/pace/posix/pwd.inl
    -        * pace/pace/posix/string.inl
    -        * pace/pace/posix/grp.inl
    -        * pace/pace/posix/dirent.inl
    -
    -          Added PACE_UNUSED_ARG where needed.
    -
    -Sat Jun 24 7:10 2000 
    -
    -        * pace/pace/posix/unistd.inl
    -        * pace/pace/posix/signal.inl
    -
    -          Added PACE_UNUSED_ARG where needed.
    -
    -Wed Jun 21 18:50:04 2000  Luther J Baker  
    -
    -        * in.h, inet.h, netdb.h, socket.h, strings.h, thread.h
    -
    -          Not part of POSIX spec. Removed from pace.
    -
    -Wed Jun 21 18:42:22 2000  Luther J Baker  
    -
    -        * pace/tests/Makefile:
    -
    -          Copied changes Joe made to pace/pace/Makefile regarding
    -          platform definitions.
    -
    -        * pace/config/config.h (PACE_HAS_EXTENSIONS):
    -        * pace/pace/posix/dirent.inl
    -        * pace/pace/posix/grp.inl
    -        * pace/pace/posix/mman.inl
    -        * pace/pace/posix/pwd.inl
    -        * pace/pace/posix/signal.inl
    -        * pace/pace/posix/stdio.inl
    -        * pace/pace/posix/stdlib.inl
    -        * pace/pace/posix/string.inl
    -        * pace/pace/posix/types.h
    -        * pace/pace/config/utility.h
    -
    -          Removed deprecated definitions and non-posix functions.
    -
    -Wed Jun 21 16:44:24 2000  Joe Hoffert  
    -
    -        * pace/Makefile:
    -          Changed to define the PACE_`platform' values
    -          Change include directories to -I.. to resolve problems.
    -
    -        * tests/Makefile:
    -          Change include directories to -I.. to resolve problems.
    -
    -        * pace/config/platform.h:
    -          Modified platform #defines to PACE_`platform' (e.g., PACE_POSIX)
    -
    -        * pace/posix/math.{h,inl}:
    -          Fixed pace_pow arguments
    -
    -        * pace/posix/mman.{h,inl}:
    -        * pace/posix/aio.h:
    -        * pace/posix/locale.h:
    -        * pace/posix/pthread.{h,inl}:
    -        * pace/posix/stdio.h:
    -          Fixed syntax errors and typos
    -
    -Wed Jun 21 13:15:47 2000  Luther J Baker  
    -
    -        * pace/posix/stdio.inl (pace_setbuf):
    -
    -          Altered return value and fixed typos.
    -
    -Tue Jun 20 15:39:26 2000  Luther J Baker  
    -
    -        * pace/config/compiler.h:
    -
    -          Removed errant '\\' at end of lines and changed to '\'.
    -
    -Tue Jun 20 15:31:43 2000  Luther J Baker  
    -
    -        * pace/posix/mman.h:
    -        * pace/posix/socket.h:
    -        * pace/posix/stat.h:
    -        * pace/posix/termios.h:
    -        * pace/posix/times.h:
    -        * pace/posix/types.h:
    -        * pace/posix/utsname.h:
    -        * pace/posix/in.h:
    -        * pace/posix/inet.h:
    -        * pace/posix/aio.h:
    -        * pace/posix/assert.h:
    -        * pace/posix/defines.h:
    -        * pace/posix/dirent.h:
    -        * pace/posix/fnctl.h:
    -        * pace/posix/grp.h:
    -        * pace/posix/limits.h:
    -        * pace/posix/locale.h:
    -        * pace/posix/mqueue.h:
    -        * pace/posix/netdb.h:
    -        * pace/posix/pthread.h:
    -        * pace/posix/pwd.h:
    -        * pace/posix/sched.h:
    -        * pace/posix/semaphore.h:
    -        * pace/posix/setjmp.h:
    -        * pace/posix/signal.h:
    -        * pace/posix/stdio.h:
    -        * pace/posix/stdlib.h:
    -        * pace/posix/string.h:
    -        * pace/posix/strings.h:
    -        * pace/posix/thread.h:
    -        * pace/posix/time.h:
    -        * pace/posix/unistd.h:
    -        * pace/posix/utime.h:
    -        * pace/posix/wait.h:
    -
    -          Edited for consistency with previous entry.
    -
    -          Removed #include "pace/defines.h".
    -
    -Tue Jun 20 15:14:44 2000  Luther J Baker  
    -
    -        * pace/sys/mman.h:
    -        * pace/sys/socket.h:
    -        * pace/sys/stat.h:
    -        * pace/sys/termios.h:
    -        * pace/sys/times.h:
    -        * pace/sys/types.h:
    -        * pace/sys/utsname.h:
    -        * pace/netinet/in.h:
    -        * pace/arpa/inet.h:
    -        * pace/aio.h:
    -        * pace/assert.h:
    -        * pace/defines.h:
    -        * pace/dirent.h:
    -        * pace/fnctl.h:
    -        * pace/grp.h:
    -        * pace/limits.h:
    -        * pace/locale.h:
    -        * pace/mqueue.h:
    -        * pace/netdb.h:
    -        * pace/pthread.h:
    -        * pace/pwd.h:
    -        * pace/sched.h:
    -        * pace/semaphore.h:
    -        * pace/setjmp.h:
    -        * pace/signal.h:
    -        * pace/stdio.h:
    -        * pace/stdlib.h:
    -        * pace/string.h:
    -        * pace/strings.h:
    -        * pace/thread.h:
    -        * pace/time.h:
    -        * pace/unistd.h:
    -        * pace/utime.h:
    -        * pace/wait.h:
    -
    -          Inserted #include "pace/config/defines.h".
    -
    -        * pace/config/defines.h:
    -
    -          Removed from pace/ dir and placed in config dir.
    -
    -Tue Jun 20 14:53:12 2000  Luther J Baker  
    -
    -        * pace/defines.h:
    -
    -          This file needs to be included first! It was calling #including
    -          itself from the posix directory but was doing so off of macros
    -          that itself defined.
    -
    -Mon Jun 19 05:03:53 2000  Luther J Baker  
    -
    -        * pace/posix/ctype.h
    -        * pace/posix/ctype.inl
    -        * pace/posix/math.h
    -        * pace/posix/math.inl
    -
    -          Correct functions added and implemented. _POSIX_C_LANG_SUPPORT.
    -
    -Mon Jun 19 04:34:34 2000  Luther J Baker  
    -
    -        * pace/sys/mman.h:
    -        * pace/sys/socket.h:
    -        * pace/sys/stat.h:
    -        * pace/sys/termios.h:
    -        * pace/sys/times.h:
    -        * pace/sys/types.h:
    -        * pace/sys/utsname.h:
    -        * pace/netinet/in.h:
    -        * pace/arpa/inet.h:
    -        * pace/aio.h:
    -        * pace/assert.h:
    -        * pace/defines.h:
    -        * pace/dirent.h:
    -        * pace/fnctl.h:
    -        * pace/grp.h:
    -        * pace/limits.h:
    -        * pace/locale.h:
    -        * pace/mqueue.h:
    -        * pace/netdb.h:
    -        * pace/pthread.h:
    -        * pace/pwd.h:
    -        * pace/sched.h:
    -        * pace/semaphore.h:
    -        * pace/setjmp.h:
    -        * pace/signal.h:
    -        * pace/stdio.h:
    -        * pace/stdlib.h:
    -        * pace/string.h:
    -        * pace/strings.h:
    -        * pace/thread.h:
    -        * pace/time.h:
    -        * pace/unistd.h:
    -        * pace/utime.h:
    -        * pace/wait.h:
    -
    -          Altered these files #ifdef macro to PACE_FILE_H_INDIRECT so that the
    -          implementation pace/posix/*.h files didn't conflict with the preprocessor
    -          name space.
    -
    -          Fully qualified all the includes in these files from #include "posix/file.h"
    -          to #include "pace/posix/file.h"
    -
    -Mon Jun 19 03:57:37 2000  Luther J Baker  
    -
    -        * pace/ctype.h:
    -        * pace/posix/ctype.h:
    -        * pace/posix/ctype.inl:
    -        * pace/posix/ctype.c:
    -
    -        * pace/math.h:
    -        * pace/posix/math.h:
    -        * pace/posix/math.inl:
    -        * pace/posix/math.c:
    -
    -          Added to repository.
    -
    -Sat Jun 17 17:24:47 2000  Luther J Baker  
    -
    -        * pace/sys/mman.h:
    -        * pace/sys/socket.h:
    -        * pace/sys/stat.h:
    -        * pace/sys/termios.h:
    -        * pace/sys/times.h:
    -        * pace/sys/types.h:
    -        * pace/sys/utsname.h:
    -        * pace/netinet/in.h:
    -        * pace/arpa/inet.h:
    -
    -          Altered these "root" files to include the correct
    -          subdirectory/file.
    -
    -Sat Jun 17 16:46:39 2000  Luther J Baker  
    -
    -        * pace/aio.h:
    -        * pace/assert.h:
    -        * pace/defines.h:
    -        * pace/dirent.h:
    -        * pace/fnctl.h:
    -        * pace/grp.h:
    -        * pace/limits.h:
    -        * pace/locale.h:
    -        * pace/mqueue.h:
    -        * pace/netdb.h:
    -        * pace/pthread.h:
    -        * pace/pwd.h:
    -        * pace/sched.h:
    -        * pace/semaphore.h:
    -        * pace/setjmp.h:
    -        * pace/signal.h:
    -        * pace/stdio.h:
    -        * pace/stdlib.h:
    -        * pace/string.h:
    -        * pace/strings.h:
    -        * pace/thread.h:
    -        * pace/time.h:
    -        * pace/unistd.h:
    -        * pace/utime.h:
    -        * pace/wait.h:
    -
    -          Altered these "root" files to include the correct
    -          subdirectory/file.
    -
    -Fri Jun 16 17:47:59 2000  Luther J Baker  
    -
    -        * pace/pace/config/features.h
    -
    -          Added to the repository to isolate user defined features.
    -          (ie: PACE_HAS_INLINE)
    -
    -        * pace/pace/config/compiler.h
    -
    -          Added *hack* to cover PACE_INLINE to static, inline
    -          or (blank) expansion depending on the compiler.
    -
    -        * pace/pace/config/platform.h
    -        * pace/pace/config/config.h
    -        * pace/pace/config/utility.h
    -
    -          Cleaned up source.
    -
    -        * pace/pace/common/README
    -        * pace/pace/common
    -
    -          Removed from the repository. Not used for anything.
    -
    -        * pace/pace/*.h
    -
    -          Started adding code to include the correct directory
    -          here, but there seems to be a better way... :-) We will
    -          wait and see. Do away with these .h files and simply
    -          go to the correct directory via the makefile.
    -
    -Fri Jun 16 16:15:25 2000  Joe Hoffert  
    -
    -        * pace/Makefile:
    -          Added POSIX Units of Functionality targets for libraries.
    -
    -        * pace/{assert,locale}.h:
    -        * pace/posix/{assert,locale}.{h,inl,c}:
    -          Added new POSIX APIs for assert and setlocale.
    -
    -        * pace/posix/stdio.{h,inl}:
    -          Added needed POSIX APIs.
    -
    -        * pace/config/{compile,temp}.h:
    -          Redefined PACE_UNUSED_ARG and moved from temp.h to compile.h.
    -
    -        * pace/posix/aio.inl:
    -          Made some formatting changes.
    -
    -Fri Jun 16 16:05:52 2000  Joe Hoffert  
    -
    -        * tests/{Makefile,Stdio_Test,Posix_SP_Test.c}:
    -          Updated the tests to more informational and adding uname -s
    -          information for some different platforms.
    -
    -Fri Jun 16 14:11:44 2000  Luther J Baker  
    -
    -        * pace/posix/*.h
    -
    -          Added all .h files to posix directory. The implementation
    -          specific .h files are simply lumped together into one large
    -          directory while the original interface files are still
    -          found in the similarly names sunos directory.
    -
    -          SunOS dirs (sys, netinet, arpa) ==> PACE implementation dir
    -          - - - -                             - - - -
    -          (pace/pace/sys/types.h          ==> pace/pace/posix/types.h)
    -          (pace/pace/unistd.h             ==> pace/pace/posix/unistd.h)
    -
    -Thu Jun 15 13:49:14 2000  Luther J Baker  
    -
    -        * pace/config/defaults.h
    -
    -          Removed superfluous defaults originally copied
    -          from ACE_OS.
    -
    -Mon Jun 12 17:23:59 2000  Luther J Baker  
    -
    -        * pace/config/constants.h:
    -
    -          Added POSIX minimum values in PACE format.
    -
    -        * pace/config/platform.h (PACE_LINUX):
    -
    -          Removed ACE code that shouldn't be included in PACE files.
    -          Deprecated macro that did not follow our current pattern.
    -          Added PACE_LINUX macro.
    -
    -Mon Jun 12 15:41:51 2000  Luther J Baker  
    -
    -        * pace/config/compiler.h:
    -
    -          Deprecated PACE_HAS_CPLUSPLUS.
    -          Current PACE_CPLUSPLUS
    -
    -          We will save the 'HAS' for user defined feature macros.
    -          Anytime we are renaming a current macro, we will just
    -          prepend PACE_'xxx'. See the next ChangeLog entry. The
    -          same motivation applies. Once I change the source code
    -          to reflect this idea, I will remove the deprecated
    -          macro names.
    -
    -          Moved error stuff from 'codes.h' to compiler.
    -
    -        * pace/config/codes.h"
    -
    -          Removed from repository.
    -
    -        * pace/defines.h:
    -
    -          Removed #include "codes.h" from repository.
    -
    -Fri Jun  9 14:05:25 2000  Luther J Baker  
    -
    -        * pace/config/compiler.h:
    -        * pace/config/config.h:
    -
    -          Moved PACE_HAS_INLINE from compiler.h to config.h.
    -
    -          Deprecated macros. Left in but I will removed the
    -          deprecated macros once I change the code to use the
    -          current macros.
    -
    -Fri Jun  9 13:02:26 2000  Luther J Baker  
    -
    -        * pace/*.h pace/posix/*.inl,c
    -
    -          See config/types.h from previous ChangeLog. All these
    -          types are altered in the source code. (ie: pthread_t
    -          became pace_pthread_t).
    -
    -          perl -pi -e `s/pid_t/pace_pid_t/` *.h posix/*.inl posix/*.c
    -
    -Fri Jun  9 12:20:23 2000  Luther J Baker  
    -
    -        * pace/config/types.h:
    -
    -          These are posix types in pace wrappers.
    -          They are macro definitions. The actual types are not
    -          available until the appropriate file is included.
    -          Thus, I didn't put them into pace/sys/types.h.
    -
    -        * pace/pace/defines.h
    -
    -          Added pace/config/types.h.
    -
    -Thu Jun  8 15:10:24 2000  Joe Hoffert  
    -
    -        * pace/tests/{Makefile,Posix_SP_Test.c}:
    -          Added new test for POSIX_SINGLE_PROCESS unit of functionality
    -          and updated Makefile for changes to the PACE library directory
    -          structure.
    -
    -Thu Jun  8 15:10:24 2000  Joe Hoffert  
    -
    -        * pace/pace/*.h:
    -        * pace/pace/arpa/*.h:
    -        * pace/pace/netinet/*.h:
    -        * pace/pace/sys/*.h:
    -          Modifying .h files to remove any path in front of .inl files.
    -
    -        * pace/pace/posix/*.c:
    -          Modifying .c files to remove any path in front of .inl files.
    -
    -        * pace/pace/posix/time.inl
    -          Changed PACE_SETERNNO to PACE_SET_ERRNO
    -
    -Thu Jun  8 15:03:42 2000  Joe Hoffert  
    -
    -        * pace/pace/Makefile:
    -          Added support for PACE_SYSNAME to determine appropriate platform
    -          subdirectory for VPATH and INCLDIRS.
    -
    -Thu Jun  8 14:44:39 2000  Luther J Baker  
    -
    -        * ../pace/linux/README
    -        * ../pace/linux
    -        * ../pace/sunos/README
    -        * ../pace/sunos
    -        * ../pace/emulation
    -
    -          Removed from reposistory.
    -
    -        * ../pace/linux/TODO
    -
    -          Moved to ../pace/posix/TODO
    -
    -        * ../pace/pace.dsw
    -
    -          Moved to ../pace/win32/pace.dsw.
    -          Hi Darrell. This takes all traces of win32 stuff out of
    -          the main dir and although its slightly different than
    -          ace or tao, we are using our directories a little
    -          differently here. Nanbor thought that is might be ok so
    -          I will try it here until it breaks? or someone has good
    -          reason to move it back.
    -
    -Thu Jun  8 12:09:56 2000  Joe Hoffert  
    -
    -        * pace/pace/sunos/*.{c,inl}:
    -          Removed files and put them in the posix subdirectory.
    -        * pace/pace/linux/*.{c,inl}:
    -          Removed files and put them in the posix subdirectory.
    -        * pace/pace/posix/*.{c,inl}:
    -          Added files from the linux/sunos subdirectories. (The files
    -          were identical from both directories aside from the $Id$ macro,
    -          i.e., the person who checked them in.)
    -
    -Wed Jun  7 12:27:13 2000  Joe Hoffert  
    -
    -        * Makefile:
    -          Added Makefile for upper level pace directory.
    -        * pace/Makefile:
    -          Changed Makefile to fit in with the general makefile scheme in
    -          ACE and TAO.
    -        * config/compiler.h:
    -          Defined PACE_HAS_INLINE even for C files so that the functions
    -          will be directly added with the .h file.
    -        * tests/{Makefile,Stdio_Test.c,Posix_SP_Test.c}:
    -          Adding Makefile and tests to the tests directory.
    -
    -Mon Jun  5 17:43:07 2000  Luther J Baker  
    -
    -        * docs/todo.txt:
    -
    -          Updated. You may go here to find current
    -          responsibilities.
    -
    -Mon Jun  5 17:22:23 2000  Luther J Baker  
    -
    -        * pace/paces.dsp
    -        * pace/pacesd.dsp
    -
    -          Removed from the repository.
    -          These files are generated (ie: paces.lib),
    -          not project files.
    -
    -Mon Jun  5 17:19:30 2000  Luther J Baker  
    -
    -        * pace/THANKS:
    -
    -          Added John Heitmann, Andrew Gilpin and Darrell Brunsch.
    -          Note: names and email addresses are nicely accesible
    -          from this alphabetical file.
    -
    -Mon Jun  5 17:04:36 2000  Andrew G. Gilpin  
    -
    -        * [inl,c]
    -
    -          Commited files to the repository in pace/linux
    -
    -        * aio, dirent, fcntl, grp, in, inet, mman, mqueue,
    -          netdb, pthread, pwd, sched, semaphore, setjmp,
    -          signal, socket, stat, stdio, stdlib, string,
    -          strings, termios, time, times, unistd, utime,
    -          utsname, wait
    -
    -Mon Jun  5 16:47:32 2000  Luther J Baker  
    -
    -        * [inl,c]
    -
    -          Moved files from root directory to pace/sunos.
    -
    -        * aio, dirent, fcntl, grp, in, inet, mman, mqueue,
    -          netdb, pthread, pwd, sched, semaphore, setjmp,
    -          signal, socket, stat, stdio, stdlib, string,
    -          strings, termios, time, times, unistd, utime,
    -          utsname, wait
    -
    -Mon Jun  5 15:23:53 2000  Luther J Baker  
    -
    -        * /pace/linux
    -        * /pace/linux/README
    -
    -          Added to repository.
    -
    -        * /pace/emulation
    -        * /pace/emulation/README
    -
    -          Removed from repository.
    -
    -Fri Jun 02 16:55:10 2000    
    -
    -        * ACE_wrappers/pace/pace/paces.dsp
    -        * ACE_wrappers/pace/pace/pacesd.dsp
    -
    -          Added to repository. Naming consistency with other
    -          ACE libraries. Also removed pre-compiled header
    -          option as well as separate directories for debug
    -          and release versions of software.
    -
    -        * ACE_wrappers/pace/pace/pace_lib.dsp
    -
    -          Removed from repository. Naming consistency.
    -
    -Thu Jun  1 17:41:04 2000  Luther J Baker  
    -
    -        * ACE_wrappers/pace/pace/emulation
    -        * ACE_wrappers/pace/pace/common
    -        * ACE_wrappers/pace/pace/emulation/README
    -        * ACE_wrappers/pace/pace/common/README
    -
    -          Added to repository.
    -
    -
    -Thu Jun  1 17:18:17 2000  Luther J Baker  
    -
    -        * pace/config/config_sunos5.7.h:
    -          Removed from repository.
    -
    -        * ACE_wrappers/pace/pace/posix/README
    -        * ACE_wrappers/pace/pace/win32/README
    -        * ACE_wrappers/pace/pace/vxworks/README
    -
    -          Added to repository to keep the directories visible.
    -
    -
    -Thu Jun 01 16:50:48 2000    
    -
    -        * ACE_wrappers/pace/pace/pace.dsw
    -        * ACE_wrappers/pace/pace/pace_lib.dsp
    -
    -          Added to the repository.
    -
    -Tue May 30 16:54:06 2000  Luther J Baker  
    -
    -        * THANKS:
    -          Added key people to this file.
    -
    -Tue May 30 14:13:00 2000  Luther J Baker  
    -
    -        * ACE_wrappers/pace/pace/posix
    -        * ACE_wrappers/pace/pace/win32
    -        * ACE_wrappers/pace/pace/vxworks
    -        * ACE_wrappers/pace/THANKS
    -
    -          Added to the repository to facilitate cross-platform work.
    -
    -Wed May 24 18:56:16 2000  Darrell Brunsch 
    -
    -        * docs/ACE_Integration.txt: (added)
    -
    -          For the PACE crew, a file used to document our progress in
    -          splitting of ACE_OS and the PACE integration.
    -
    -Wed May 24 14:40:41 2000  Luther J Baker  
    -
    -        * README/VERSION:
    -          Added to repository.
    -
    -Tue May 23 18:22:48 2000  Luther J Baker  
    -
    -        * pace/pace/Makefile:
    -          Added to repository.
    -
    -        * 'touch' to force dirs to show up with cvs co -P
    -          pace/docs/README
    -          pace/examples/README
    -          pace/pace/README
    -          pace/pace++/README
    -          pace/tests/README
    -
    -Tue May 23 17:59:06 2000  Luther J Baker  
    -
    -        * docs/todo.txt:
    -          Currently, all .o files appear in the
    -          ACE_wrappers/pace/pace directory (e.g.: nested
    -          files such as pace/pace/sys/socket.c generate
    -          pace/pace/socket.o. See pace/docs/todo.txt.
    -
    -        * ACE_wrappers/pace/pace:
    -          Source files added.
    diff --git a/PACE/Makefile b/PACE/Makefile
    deleted file mode 100644
    index 88088fe2333..00000000000
    --- a/PACE/Makefile
    +++ /dev/null
    @@ -1,43 +0,0 @@
    -#----------------------------------------------------------------------------
    -#	$Id$
    -#
    -#	Makefile for the PACE directory
    -#----------------------------------------------------------------------------
    -
    -#----------------------------------------------------------------------------
    -#	Local macros
    -#----------------------------------------------------------------------------
    -
    -ifndef PACE_ROOT
    -  PACE_ROOT = $(ACE_ROOT)/PACE
    -endif # ! PACE_ROOT
    -
    -INFO  = README
    -
    -DIRS  =	pace \
    -	tests
    -
    -# Add these DIRS later - keep it simple for now
    -#	pace++ \
    -#	examples
    -
    -# Makefiles TBD:
    -#	ttcp
    -#       CORBA
    -
    -
    -#----------------------------------------------------------------------------
    -#	Include macros and targets
    -#----------------------------------------------------------------------------
    -
    -include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
    -include	$(ACE_ROOT)/include/makeinclude/macros.GNU
    -ifdef CHORUS
    -DIRS  =
    -  all clean realclean:
    -	@echo PACE won\'t run or build for Chorus.
    -else
    -include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
    -include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
    -include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
    -endif # VXWORKS
    diff --git a/PACE/Makefile.am b/PACE/Makefile.am
    deleted file mode 100644
    index 4980da4cb5c..00000000000
    --- a/PACE/Makefile.am
    +++ /dev/null
    @@ -1,30 +0,0 @@
    -##---------------------------------------------------------------------------
    -##       $Id$
    -##
    -##       Top-level Makefile for the PACE toolkit libraries, tests, and
    -##       applications
    -##
    -##---------------------------------------------------------------------------
    -
    -##
    -##  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 #check-news
    -
    -SUBDIRS = \
    -  pace \
    -  tests
    -
    -DESTDIRS = \
    -  docs \
    -  examples \
    -  pace++
    -
    -## Clean up some additional files/directories possibly created during
    -## the configure script tests.
    -clean-local:
    -	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
    -	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
    diff --git a/PACE/README b/PACE/README
    deleted file mode 100644
    index cc361881310..00000000000
    --- a/PACE/README
    +++ /dev/null
    @@ -1,49 +0,0 @@
    -# $Id$
    -
    -Copyright (c) 2000  Center for Distributed Object Computing,
    -Washington University, St. Louis, Missouri, USA.
    -
    -This is POSIX ACE (PACE).  It is based on ACE, the Adaptive
    -Communications Environment, developed by Doug Schmidt and the
    -Distributed Object Computing Group at Washington University and the
    -University of California, Irvine.  Please see the ACE copyright
    -notice, available at
    -http://www.cs.wustl.edu/~schmidt/ACE_wrappers/COPYING.
    -
    -PACE is intended for lightweight and/or verified systems.  It offers
    -these benefits:
    -
    -* A strict POSIX.1-like, low-level interface.  Its interface is "POSIX
    -  compatible"; by that we mean as close to POSIX.1 as it can be, given
    -  that PACE is not an operating system.  And, to avoid name conflicts
    -  with OS APIs, all low-level PACE function names have the pace_
    -  prefix.
    -
    -* The low-level interface is partitioned into multiple files, one
    -  per POSIX.1 section.
    -
    -* The low-level interface is written in C, so that it can be used in
    -  both C and C++ programs.
    -
    -* PACE (on most platforms) does not require the use of multiple
    -  inheritance, static objects, exception handling, or other C++
    -  language constructs that impair code size and/or run-time performance.
    -
    -
    -PACE also insulates applications from the personalities of operating
    -systems.  For example:
    -
    -* SunOS 5.7's intro (3) man page states that _POSIX_PTHREAD_SEMANTICS
    -  and _REENTRANT flags are automatically turned on by defining
    -  _POSIX_C_SOURCE flag with a value greater than or equal to 199506L.
    -  However, that doesn't appear to happen, so PACE does it.
    -
    -* On LynxOS 3.1.0 and Compaq Tru64, several POSIX functions prototypes
    -  are missing const qualifiers.  PACE provides the proper function
    -  prototypes (and its implementation casts as necessary for
    -  compatibility).
    -
    -* LynxOS 3.1.0 has a non-POSIX signal () interface; the handler function
    -  prototype is not void (*) (int).  PACE adapts its interface to the
    -  POSIX standard interface.
    -
    diff --git a/PACE/THANKS b/PACE/THANKS
    deleted file mode 100644
    index 4331a4dd69d..00000000000
    --- a/PACE/THANKS
    +++ /dev/null
    @@ -1,18 +0,0 @@
    -ACKNOWLEDGEMENTS
    -
    -Baker, Luther 
    -Brunsch, Darrell 
    -Gilpin, Andrew 
    -Guallar, Gonzalo Diethelm 
    -Heitmann, John 
    -Hoffert, Joe 
    -Levine, David 
    -Loftis, Bjorn 
    -Syyid, Umar 
    -            
    -Taylor, Braeton 
    -Watney, Garth 
    -
    -Thanks,
    -
    -        The PACE Development Team
    diff --git a/PACE/VERSION b/PACE/VERSION
    deleted file mode 100644
    index 3543e990cd5..00000000000
    --- a/PACE/VERSION
    +++ /dev/null
    @@ -1,5 +0,0 @@
    -This is PACE version 1.2.
    -
    -PACE is developed by the Center for Distributed Object Computing,
    -Department of Computer Science, Washington University, St. Louis,
    -Missouri, USA.
    diff --git a/PACE/docs/ACE_Integration.txt b/PACE/docs/ACE_Integration.txt
    deleted file mode 100644
    index 8265485564e..00000000000
    --- a/PACE/docs/ACE_Integration.txt
    +++ /dev/null
    @@ -1,17 +0,0 @@
    -$Id$
    -These are the plans for splitting up ACE_OS and their status for both being
    -split up and being PACE enabled.
    -
    -Finished:
    ----------
    -OS_Dirent
    -OS_String
    -
    -Planned:
    ---------
    -OS_Stdio
    -OS_Memory
    -OS_Process
    -OS_Synch
    -OS_Socket
    -OS_QoS
    diff --git a/PACE/docs/README b/PACE/docs/README
    deleted file mode 100644
    index 055c8729cdc..00000000000
    --- a/PACE/docs/README
    +++ /dev/null
    @@ -1 +0,0 @@
    -$Id$
    diff --git a/PACE/docs/www/Introduction/begin.html b/PACE/docs/www/Introduction/begin.html
    deleted file mode 100644
    index cbcb1a75914..00000000000
    --- a/PACE/docs/www/Introduction/begin.html
    +++ /dev/null
    @@ -1,135 +0,0 @@
    -
    -
    -
    -  
    -    PACE: Begin
    -  
    -
    -  
    -
    -    
    -      
    -        
    -      
    -      
    -        
    -      
    -      
    -        
    -      
    -      
    -        
    -      
    -    

    - - - - - - -
    -

    - - Click-Me-To-Begin - -

    -
    - - - - - - - - - - - - - -
    Beginning...The TeamPhasesStructure
    BuildingUsingChangingPorting
    -
    -

    - - Click-Me-To-Begin - -

    -
    -
    -
    -

    Under Construction!!

    -

    In the beginning...

    - -

    Dr. David Levine had the initial idea for PACE. - ACE+TAO were part of Boeing DII COE project of 2001. - While reviewing the needs for the project and - realizing that ACE_OS (ACE' own adaptation layer) - was quite large and full of potentially avoidable - dependencies, David across the idea that several - POSIX compliant platforms could be encapsulated - into one standard interface, a POSIX interface.

    - -

    This would potentially allow ACE_OS to port to - a POSIX API, separated from ACE_OS, which would - then port correctly between the minor POSIX - variant operating systems which ACE supported.

    - -

    This idea quickly developed into the broader - concept that the POSIX interface library could - actually replace the ACE_OS layer in the feature - laden ACE framework library and has since grown - or will grow to include platforms such as Win32 - and VXWorks (which lack true POSIX compliance).

    - -

    As you can see, this creates a benefit for ACE, - namely, PosixACE (PACE) becomes a formal starting - point to begin reducing the complexity and - interdependence problems that had creeped into - ACE over the past 5 years.

    - -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:47:17 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/Introduction/build.html b/PACE/docs/www/Introduction/build.html deleted file mode 100644 index 1a5322315f6..00000000000 --- a/PACE/docs/www/Introduction/build.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - PACE: Build - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Begin - -

    -
    - - - - - - - - - - - - - -
    Beginning...The TeamPhasesStructure
    BuildingUsingChangingPorting
    -
    -

    - - Click-Me-To-Begin - -

    -
    -
    -
    -

    Under Construction!!

    -

    Building

    -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:47:08 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/Introduction/change.html b/PACE/docs/www/Introduction/change.html deleted file mode 100644 index 510cfb7298e..00000000000 --- a/PACE/docs/www/Introduction/change.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - PACE: Changing - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Begin - -

    -
    - - - - - - - - - - - - - -
    Beginning...The TeamPhasesStructure
    BuildingUsingChangingPorting
    -
    -

    - - Click-Me-To-Begin - -

    -
    -
    -
    -

    Under Construction!!

    -

    Changing

    -

    Content here :-)

    -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:47:23 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/Introduction/phases.html b/PACE/docs/www/Introduction/phases.html deleted file mode 100644 index d857ecb94db..00000000000 --- a/PACE/docs/www/Introduction/phases.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - PACE: Phases - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Begin - -

    -
    - - - - - - - - - - - - - -
    Beginning...The TeamPhasesStructure
    BuildingUsingChangingPorting
    -
    -

    - - Click-Me-To-Begin - -

    -
    -
    -
    -

    Under Construction!!

    -

    Phases...

    -

    Content here :-)

    -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:47:29 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/Introduction/porting.html b/PACE/docs/www/Introduction/porting.html deleted file mode 100644 index 3cd3e07a26d..00000000000 --- a/PACE/docs/www/Introduction/porting.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - PACE: Porting - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Begin - -

    -
    - - - - - - - - - - - - - -
    Beginning...The TeamPhasesStructure
    BuildingUsingChangingPorting
    -
    -

    - - Click-Me-To-Begin - -

    -
    -
    -
    -

    Under Construction!!

    -

    Porting

    -
      -
    • SunOS

    • -
    • LynxOS

    • -
    • Win32

    • -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:47:33 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/Introduction/struct.html b/PACE/docs/www/Introduction/struct.html deleted file mode 100644 index e2dec21a619..00000000000 --- a/PACE/docs/www/Introduction/struct.html +++ /dev/null @@ -1,123 +0,0 @@ - - - - - PACE: Struct - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Begin - -

    -
    - - - - - - - - - - - - - -
    Beginning...The TeamPhasesStructure
    BuildingUsingChangingPorting
    -
    -

    - - Click-Me-To-Begin - -

    -
    -
    -
    -

    Under Construction!!

    -

    Structure

    -

    Pictures of the directory structure here...

    - -

    Configuration

    -
      -
    • There is currently no Autoconf support for - PACE.
    • -
    • PACE is currently included in the ACE+TAO - distribution and upon getting the latest copy - of ACE+TAO, can be found at
      -ACE_wrappers/PACE.
      -
    • -
    • Configuration directory:
      -ACE_wrappers/PACE/config
      -
    • -
    - -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:47:39 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/Introduction/team.html b/PACE/docs/www/Introduction/team.html deleted file mode 100644 index cbadf1f1533..00000000000 --- a/PACE/docs/www/Introduction/team.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - PACE: Team - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Begin - -

    -
    - - - - - - - - - - - - - -
    Beginning...The TeamPhasesStructure
    BuildingUsingChangingPorting
    -
    -

    - - Click-Me-To-Begin - -

    -
    -
    -
    -

    Under Construction!!

    -

    The Team...

    -

    Dr. Levine initially enlisted the help of Luther - Baker, Joe Hoffert, John Heitmann and Chris Gill - to help with the PACE effort. -

    -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:47:45 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/Introduction/using.html b/PACE/docs/www/Introduction/using.html deleted file mode 100644 index f8eb5ee58db..00000000000 --- a/PACE/docs/www/Introduction/using.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - PACE: Using - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Begin - -

    -
    - - - - - - - - - - - - - -
    Beginning...The TeamPhasesStructure
    BuildingUsingChangingPorting
    -
    -

    - - Click-Me-To-Begin - -

    -
    -
    -
    -

    Under Construction!!

    -

    Using

    -

    Content here :-)

    -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:47:51 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/PACE-abstract.html b/PACE/docs/www/PACE-abstract.html deleted file mode 100644 index 0d87438704b..00000000000 --- a/PACE/docs/www/PACE-abstract.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - PACE Overview - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Go-Home -

    -
    - - - - - - -
    PACE OverviewPACE ObtainPACE Documentation
    -
    -

    - - Click-Me-To-Go-Home - -

    -
    -
    -
    - -

    PACE Abstract

    - -

    PACE is a POSIX compliant middleware library that was - written to allow developers to use one common programming - API to access POSIX semantics across multiple, different - operating systems, some of which are not currently POSIX - compliant. -

    - -

    PACE is part of the open source ACE+TAO library/framework - and its implementation was initiated in response to the RT - DII COE project at BOEING that specifically targeted - operating systems NT4 SP6, LynxOS 3.1.0a and SunOS 5.8. - The RT DII COE project wants to build a Mission Application - Independent programming framework described as an - architecture, an approach, a collection of reusable software, - a software infrastructure and a set of guidelines and - standards. The proposed framework consists of three layers: - the kernel, the data exchange layer and common Support - Applications. -

    - -

    Such an ideal framework demands a strong, robust - infrastructure and as such, ACE+TAO was chosen to be part - of this project. ACE is the TAO developers API, essentially - making TAO platform independent (or dependent on which platform - ACE is ported to). As such, ACE provides very high level - abstractions and key pattern techniques but handles different - platforms, especially non-POSIX platforms, on a case-by-case - basis (Win32 and VXWorks are two good examples). -

    - -

    PACE was born to abstract support for current and additional - non-POSIX platforms away from ACE, thus, becoming an API for - ACE developers to write to. Initial PACE support was limited - to the previously mentioned DII COE platforms. Funding is now - available to PACE to more of the platforms ACE supports, - potentially encapsulating all of the platforms ACE currently - supports. This will help separate the concerns of the current - ACE+TAO framework so that: -

    - -
      -
    • (PACE = low level, operating system middleware)
    • -
    • (ACE = high level, pattern oriented abstraction API)
    • -
    • (TAO = open source ORB)
    • -
    - -

    In addition to presenting some of the PACE code, I intend to - discuss some of the pitfalls of porting middleware and how we - overcame them in our current work on PACE as well as how they - should be addressed as PACE continues to grow. -

    - -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:45:22 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/PACE-car.html b/PACE/docs/www/PACE-car.html deleted file mode 100644 index b33baa006db..00000000000 --- a/PACE/docs/www/PACE-car.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - PACE Car - - - - - - - -
    - back-to-PACE-page - -
    - - - -

    - - -Last modified: Sun May 13 14:45:30 CDT 2001 - -

    - - - diff --git a/PACE/docs/www/PACE-docs.html b/PACE/docs/www/PACE-docs.html deleted file mode 100644 index 96340a10c4c..00000000000 --- a/PACE/docs/www/PACE-docs.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - PACE Overview - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Go-Home - -

    -
    - - - - - - -
    PACE OverviewPACE ObtainPACE Documentation
    -
    -

    - - Click-Me-To-Go-Home - -

    -
    -
    -
    -

    PACE Documentation

    -

    -

    -

    -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:45:39 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/PACE-obtain.html b/PACE/docs/www/PACE-obtain.html deleted file mode 100644 index a21ea02d262..00000000000 --- a/PACE/docs/www/PACE-obtain.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - PACE Overview - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Go-Home - -

    -
    - - - - - - -
    PACE OverviewPACE ObtainPACE Documentation
    -
    -

    - - Click-Me-To-Go-Home - -

    -
    -
    -
    -

    PACE Obtain

    - -

    PACE is currently available as part of the ACE+TAO - distribution found at -

    -

    - -

    As such, the installation instructions are also found - found on the ACE+TAO distribution web-site -

    -

    - -

    For a other PACE details, (essential PACE design strategy, - HOW-TO to use PACE) etc... please goto -

    -

    -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:45:48 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/PACE-overview.html b/PACE/docs/www/PACE-overview.html deleted file mode 100644 index 33c8398400b..00000000000 --- a/PACE/docs/www/PACE-overview.html +++ /dev/null @@ -1,229 +0,0 @@ - - - - - PACE Overview - - - - - - - - - - - - - - - - - -

    - - - - - - -
    -

    - - Click-Me-To-Go-Home - -

    -
    - - - - - - -
    PACE OverviewPACE ObtainPACE Documentation
    -
    -

    - - Click-Me-To-Go-Home - -

    -
    -
    -
    -

    PACE Overview

    -

    PACE is an OS abstraction layer designed for lightweight - and/or verified systems.

    - -

    It offers these benefits:

    -
      -
    • -

      A strict POSIX.1-like, low-level interface. Its - interface is "POSIX compatible"; by that we mean as - close to POSIX.1 as it can be, given that PACE is not - an operating system. And, to avoid name conflicts with - OS APIs, all low-level PACE function names have - the pace_ prefix. -

      -
    • -

      The low-level interface is a C file, so that it can be - used in both C and C++ programs. -

      -
    • -

      The low-level interface is partitioned into multiple - files, one per POSIX.1 section. -

      -
    • -
    - -
    - -

    ACE uses PACE

    -

    The ADAPTIVE Communication Environment - (ACE) - is a freely available, open-source, object-oriented - (OO) - framework that implements many core design patterns for - concurrent communication software. -

    - -

    ACE is currently built on an - - OS Adaptation Layer that abstracts away specific - computer architecture / platform dependencies therfore - allowing ACE to be portable across any platform that the - adaptation layer supports. -

    - -

    ACE also forms the foundation upon which - TAO - is built. The combination of implementing TAO (adding - specific functionality to ACE) and the ever shifting sands - of vendor-specific operating systems has grown the ACE - adapatation layer from a small core of critial functions to - over 30,000 lines of interdependent code. The development of - TAO tied in with requests from our sponsors as well as - suggestions from the development community at large - contributed to our decision to re-engineer ACE' adaptation - layer. PACE is one part of this effort. -

    - -
    - -

    PACE Objectives

    -

    Some objectives of this phase of ACE' development (PACE) - include: -

    -
      -
    • -

      ACE Developers: Make the low level abstraction - layer code more maintainable.
      - (reduce file size and file interdependence - improve - code modularity) -

      -
    • -
    • -

      ACE Users: Reduce ACE' footprint.
      - (this is not a one-step task by any stretch of the - imagination, but we will begin breaking out the code - into separate files - allowing developers the - opportunity option to compile and link specific - object files to their executables instead of the - entire ACE adaptation layer library) -

      -
    • -
    • -

      ACE Users: Update the adaptation layer to be - POSIX compliant.
      - (see next) -

      -
    • -
    • -

      ACE Users: Split the adaptation layer to support - both a C API (PACE) as well as a set of - C++ wrapper classes (ACE_OS) allowing - both C & C++ developers to call - directly into the low level API.
      - (encapslate POSIX and system calls in C - wrappers and re-write the (ACE_OS) adaptation layer to - transparently call into the POSIX emulation API - (PACE)) -

      -
    • -
    • -

      ACE Users: ACE will not change its public - interface, it will only add low level C - operations to its repertoire. As is obvious, software - built on this adaptation layer is portable across the - various platforms that ACE supports. This provides - backward compatilibity for people already using the - current C++ (ACE_OS) adaptation layer of - ACE.

      -
    • -
    - -

    This is an open-source project maintained by: -

    -
    -
    -

    Additional information regarding - ACE - and - PACE - and - TAO - is available as well as a - - full source distribution of TAO + ACE + PACE. -

    - -

    If you have any questions, suggestions or contributions - regarding PACE, please - write - to us or subscribe to the pace-users mailing list - (send email to - - majordomo@cs.wustl.edu - with "subscribe pace-users" in the body, - not the subject line ;-) -

    - -
    - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:45:55 CDT 2001 - -

    -
    - - - diff --git a/PACE/docs/www/PACE.html b/PACE/docs/www/PACE.html deleted file mode 100644 index f4105c86a85..00000000000 --- a/PACE/docs/www/PACE.html +++ /dev/null @@ -1,150 +0,0 @@ - - - - - PACE Front Door - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -

    DOC Group
    - Washington University
    - St. Louis, Missouri

    -
    - - Wash-U-DOC-Center - - -

    DOC Group
    - University of California
    - Irvine, California

    -
    - POSIX
    Adaptation
    Layer
    (PACE
    - - (TM) - ) -
    - - Click-Me-Cool - - A
    POSIX
    Middleware
    Toolkit
    -
    - -
    -

    - o - - PACE Overview

    -
    -

    - o - - PACE Obtain

    -
    -

    - o - - PACE Docs

    -
    -

    - o - - PACE Copyright

    -
    -
    -
    -
    -

    - o - Zen Overview - o

    -
    -

    - o - - ACE Overview - o

    -
    -

    - o - - TAO Overview - o

    -
    -

    - o - Java ACE & - JAWS - o

    -
    -
    -
    -
    -

    - - PACE Team Members - o

    -
    -

    - - Who is using PACE? - o

    -
    -

    - - PACE Mailing List - o

    -
    -

    - - PACE Sponsors - o

    -
    -
    -
    - - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:46:04 CDT 2001 - -

    - - - diff --git a/PACE/docs/www/Pix/PACE-mini-logo.gif b/PACE/docs/www/Pix/PACE-mini-logo.gif deleted file mode 100644 index e8ad069612e..00000000000 Binary files a/PACE/docs/www/Pix/PACE-mini-logo.gif and /dev/null differ diff --git a/PACE/docs/www/Pix/PACE-red-blue-logo.gif b/PACE/docs/www/Pix/PACE-red-blue-logo.gif deleted file mode 100644 index ac6deaacdab..00000000000 Binary files a/PACE/docs/www/Pix/PACE-red-blue-logo.gif and /dev/null differ diff --git a/PACE/docs/www/Pix/PACE-red-blue-smaller.gif b/PACE/docs/www/Pix/PACE-red-blue-smaller.gif deleted file mode 100644 index 4065a7a55fd..00000000000 Binary files a/PACE/docs/www/Pix/PACE-red-blue-smaller.gif and /dev/null differ diff --git a/PACE/docs/www/Pix/ace-tmp.jpg b/PACE/docs/www/Pix/ace-tmp.jpg deleted file mode 100644 index 883e1b924d3..00000000000 Binary files a/PACE/docs/www/Pix/ace-tmp.jpg and /dev/null differ diff --git a/PACE/docs/www/Pix/doc-logo.jpg b/PACE/docs/www/Pix/doc-logo.jpg deleted file mode 100644 index 1d5dcd1c403..00000000000 Binary files a/PACE/docs/www/Pix/doc-logo.jpg and /dev/null differ diff --git a/PACE/docs/www/Pix/heli-1.jpg b/PACE/docs/www/Pix/heli-1.jpg deleted file mode 100644 index 678c7675f82..00000000000 Binary files a/PACE/docs/www/Pix/heli-1.jpg and /dev/null differ diff --git a/PACE/docs/www/Pix/pace-car1.jpg b/PACE/docs/www/Pix/pace-car1.jpg deleted file mode 100644 index 7e0500cb329..00000000000 Binary files a/PACE/docs/www/Pix/pace-car1.jpg and /dev/null differ diff --git a/PACE/docs/www/Pix/pace-car2.jpg b/PACE/docs/www/Pix/pace-car2.jpg deleted file mode 100644 index 23eadce61c3..00000000000 Binary files a/PACE/docs/www/Pix/pace-car2.jpg and /dev/null differ diff --git a/PACE/docs/www/Pix/pace-car3.jpg b/PACE/docs/www/Pix/pace-car3.jpg deleted file mode 100644 index 8551fcf7b8e..00000000000 Binary files a/PACE/docs/www/Pix/pace-car3.jpg and /dev/null differ diff --git a/PACE/docs/www/Pix/redball.gif b/PACE/docs/www/Pix/redball.gif deleted file mode 100644 index 41b0daed865..00000000000 Binary files a/PACE/docs/www/Pix/redball.gif and /dev/null differ diff --git a/PACE/docs/www/Pix/stealth.jpg b/PACE/docs/www/Pix/stealth.jpg deleted file mode 100644 index d93907fe06a..00000000000 Binary files a/PACE/docs/www/Pix/stealth.jpg and /dev/null differ diff --git a/PACE/docs/www/index.html b/PACE/docs/www/index.html deleted file mode 100755 index f4105c86a85..00000000000 --- a/PACE/docs/www/index.html +++ /dev/null @@ -1,150 +0,0 @@ - - - - - PACE Front Door - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -

    DOC Group
    - Washington University
    - St. Louis, Missouri

    -
    - - Wash-U-DOC-Center - - -

    DOC Group
    - University of California
    - Irvine, California

    -
    - POSIX
    Adaptation
    Layer
    (PACE
    - - (TM) - ) -
    - - Click-Me-Cool - - A
    POSIX
    Middleware
    Toolkit
    -
    - -
    -

    - o - - PACE Overview

    -
    -

    - o - - PACE Obtain

    -
    -

    - o - - PACE Docs

    -
    -

    - o - - PACE Copyright

    -
    -
    -
    -
    -

    - o - Zen Overview - o

    -
    -

    - o - - ACE Overview - o

    -
    -

    - o - - TAO Overview - o

    -
    -

    - o - Java ACE & - JAWS - o

    -
    -
    -
    -
    -

    - - PACE Team Members - o

    -
    -

    - - Who is using PACE? - o

    -
    -

    - - PACE Mailing List - o

    -
    -

    - - PACE Sponsors - o

    -
    -
    -
    - - - - -

    - Doc Group

    - - -

    - - -Last modified: Sun May 13 14:46:04 CDT 2001 - -

    - - - diff --git a/PACE/examples/README b/PACE/examples/README deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/PACE/include/makeinclude/rules.common.GNU b/PACE/include/makeinclude/rules.common.GNU deleted file mode 100644 index 464d476ea79..00000000000 --- a/PACE/include/makeinclude/rules.common.GNU +++ /dev/null @@ -1,121 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Common rules for building PACE targets -#---------------------------------------------------------------------------- - -ifndef PACE_ROOT - PACE_ROOT = $(ACE_ROOT)/PACE -endif # ! PACE_ROOT - -VPATH+=config:sys - -ifeq ($(PACE_SYSNAME),) - PACE_SYSNAME = $(shell uname -s) -endif # ! PACE_SYSNAME - -ifeq ($(PACE_SYSVER),) - PACE_SYSVER = $(shell uname -r) -endif # ! PACE_SYSVER - -ifeq ($(PACE_SYSNAME),Linux) - PACE_SYSVER := $(shell echo $(PACE_SYSVER) | \ - perl -ne 'printf "%lu\n", hex sprintf "%02X%02X%02x", split /\./') -else - PACE_SYSVER := $(shell echo $(PACE_SYSVER) | sed 's/\.//g') -endif # PACE_SYSNAME == Linux - -# List of platforms and uname -s values -# ===================================== -# Solaris SunOS -# NT "NT" (uname not supported) -# LynxOS LynxOS -# VxWorks "VxWorks" (strictly cross-compiled) -# Linux Linux -# pSOS "pSOS" (strictly cross-compiled) -# Chorus "Chorus" (strictly cross-compiled) -# QNX Neutrino "Neutrino" (strictly cross-compiled) -# OSF/1 OSF1 -# IRIX (64 bit) IRIX64 -# IRIX (32 bit) IRIX (unconfirmed) -# HPUX HP-UX -# AIX AIX - -ifeq ($(PACE_SYSNAME),SunOS) - # Hard code special cases for SunOS 5.6, 5.7, and 5.8 since - # we need a 3 digit version number for comparison purposes. - ifeq ($(PACE_SYSVER),58) - PACE_SYSVER := $(PACE_SYSVER)0 - endif # PACE_SYSVER == 58 - ifeq ($(PACE_SYSVER),57) - PACE_SYSVER := $(PACE_SYSVER)0 - endif # PACE_SYSVER == 57 - ifeq ($(PACE_SYSVER),56) - PACE_SYSVER := $(PACE_SYSVER)0 - endif # PACE_SYSVER == 56 - VPATH :=.:posix:$(VPATH) - CFLAGS += -DPACE_SUNOS=$(PACE_SYSVER) -D_REENTRANT - ifeq ($(threads),1) - CFLAGS += -D_POSIX_PTHREAD_SEMANTICS - endif # ! ($(threads),0) -endif - -ifeq ($(PACE_SYSNAME),NT) - VPATH :=.:win32:$(VPATH) - CFLAGS += -DPACE_WIN32=$(PACE_SYSVER) -endif - -ifeq ($(PACE_SYSNAME),LynxOS) - VPATH :=.:posix:$(VPATH) - CFLAGS += -DPACE_LYNXOS=$(PACE_SYSVER) - ifeq ($(PACE_SYSVER),0x300) - CFLAGS += -D_POSIX_THREADS_CALLS - endif # ($(PACE_SYSVER),0x300) -endif - -ifeq ($(PACE_SYSNAME),OSF1) - VPATH :=.:posix:$(VPATH) - CFLAGS += -DPACE_OSF1=$(PACE_SYSVER) -D_DEC_XPG -endif - -ifeq ($(PACE_SYSNAME),VxWorks) - VPATH :=.:vxworks:$(VPATH) - CFLAGS += -DPACE_VXWORKS=$(PACE_SYSVER) -endif - -ifeq ($(PACE_SYSNAME),Linux) - VPATH :=.:posix:$(VPATH) - emulation=1 - CFLAGS += -DPACE_LINUX=$(PACE_SYSVER) -endif - -ifeq ($(PACE_SYSNAME),AIX) - VPATH := .:posix:$(VPATH) - CFLAGS += -DPACE_HAS_POSIX -D_REENTRANT -endif - -ifeq ($(PACE_SYSNAME),HP-UX) - VPATH := .:posix:$(VPATH) - CFLAGS += -DPACE_HAS_POSIX -D_REENTRANT -endif - -ifeq ($(PACE_SYSNAME),QNX) - VPATH := .:posix:$(VPATH) - CFLAGS += -DPACE_QNX=$(PACE_SYSVER) -D_REENTRANT -endif - -ifeq ($(debug),) - ifeq (,$(findstring $(CFLAGS),$(CCFLAGS))) - CCFLAGS += -DPACE_NDEBUG - else - CFLAGS += -DPACE_NDEBUG - endif -endif # debug - -ifeq ($(pace_tracing),1) - ifeq (,$(findstring $(CFLAGS),$(CCFLAGS))) - CCFLAGS += -DPACE_TRACING - else - CFLAGS += -DPACE_TRACING - endif -endif # debug diff --git a/PACE/pace++/README b/PACE/pace++/README deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/PACE/pace/Makefile b/PACE/pace/Makefile deleted file mode 100644 index c29a22d1cdc..00000000000 --- a/PACE/pace/Makefile +++ /dev/null @@ -1,498 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the PACE/pace C library release -#---------------------------------------------------------------------------- - -MAKEFILE = Makefile -LIB = libPACE.a -SHLIB = libPACE.$(SOEXT) - -PACE_FILES = \ - aio \ - assert \ - ctype \ - dirent \ - fcntl \ - grp \ - locale \ - math \ - mqueue \ - pthread \ - pwd \ - sched \ - semaphore \ - setjmp \ - signal \ - stdio \ - stdlib \ - string \ - termios \ - time \ - unistd \ - utime -CONFIG_FILES = -SYS_FILES = \ - sys/mman \ - sys/socket \ - sys/stat \ - sys/times \ - sys/utsname \ - sys/wait - -# POSIX_SOCKET Unit of Functionality -# pace_accept is in sys/socket.h -# pace_bind is in sys/socket.h -# pace_connect is in sys/socket.h -# pace_getpeername is in sys/socket.h -# pace_getsockname is in sys/socket.h -# pace_getsockopt is in sys/socket.h -# pace_setsockopt is in sys/socket.h -# pace_isfdtype is in sys/socket.h -# pace_listen is in sys/socket.h -# pace_recv is in sys/socket.h -# pace_recvfrom is in sys/socket.h -# pace_rcvmsg is in sys/socket.h -# pace_send is in sys/socket.h -# pace_sendto is in sys/socket.h -# pace_sendmsg is in sys/socket.h -# pace_shutdown is in sys/socket.h -# pace_socket is in sys/socket.h -# pace_socketpair is in sys/socket.h -POSIX_SOCK_FILES = \ - sys/socket - -# POSIX_SINGLE_PROCESS Unit of Functionality (POSIX.1) -# pace_sysconf is in unistd.h; -# pace_time is in time.h; -# pace_uname is in sys/ustname.h -POSIX_SP_FILES = \ - unistd \ - time \ - sys/utsname - -# POSIX_MULTI_PROCESS Unit of Functionality (POSIX.1) -# pace__exit is in unistd.h -# pace_assert is in assert.h -# pace_execl, pace_execle, pace_execlp, pace_execv, pace_execve, pace_execvp -# are in unistd.h; -# pace_exit is in stdlib.h; -# pace_fork is in unistd.h; -# pace_getenv is in stdlib.h; -# pace_getpid, pace_getppid are in unistd.h; -# pace_setlocale is in locale.h; -# pace_sleep is in unistd.h; -# pace_times is in sys/times.h; -# pace_wait, pace_waitpid are in wait.h; -POSIX_MP_FILES = \ - unistd \ - assert \ - stdlib \ - locale \ - sys/times \ - sys/wait - -# POSIX_SIGNALS Unit of Functionality (POSIX.1) -# pace_abort is in stdlib.h; -# pace_alarm is in unistd.h; -# pace_kill is in signal.h; -# pace_pause is in unistd.h; -# pace_sigaction, pace_sigaddset, pace_sigdelset, pace_sigemptyset, -# pace_sigfillset, pace_sigismember are in signal.h; -# pace_siglongjmp is in setjmp.h; -# pace_sigpending, pace_sigprocmask are in signal.h; -# pace_sigsetjmp is in setjmp.h; -# pace_sigsuspend is in signal.h; -POSIX_SIG_FILES = \ - stdlib \ - unistd \ - signal \ - setjmp - -# POSIX_USER_GROUPS Unit of Functionality (POSIX.1) -# pace_getegid, pace_geteuid, pace_getgid, pace_getgroups, pace_getlogin, -# pace_getpgrp, pace_getuid, pace_setgid, pace_setsid, pace_setuid are in -# unistd.h; -POSIX_UG_FILES = \ - unistd - -# POSIX_FILE_SYSTEM Unit of Functionality (POSIX.1) -# pace_access, pace_chdir are in unistd.h; -# pace_closedir is in dirent.h; -# pace_creat is in fcntl.h; -# pace_fpathconf is in unistd.h; -# pace_fstat is in sys/stat.h -# pace_getcwd, pace_link are in unistd.h -# pace_mkdir is in sys/stat.h -# pace_opendir is in dirent.h; -# pace_pathconf is in unistd.h; -# pace_readdir is in dirent.h; -# pace_remove, pace_rename are in stdio.h; -# pace_rewinddir is in dirent.h; -# pace_rmdir is in unistd.h; -# pace_stat is in sys/stat.h; -# pace_tmpfile, pace_tmpnam are in stdio.h; -# pace_unlink is in unistd.h; -# pace_utime is in utime.h; -POSIX_FS_FILES = \ - unistd \ - dirent \ - fcntl \ - sys/stat \ - stdio \ - utime - -# POSIX_FILE_ATTRIBUTES Unit of Functionality (POSIX.1) -# pace_chmod is in sys/stat.h; -# pace_chown is in unistd.h; -# pace_umask is in sys/stat.h; -POSIX_FA_FILES = \ - sys/stat \ - unistd - -# POSIX_FIFO Unit of Functionality (POSIX.1) -# pace_mkfifo is in sys/stat.h; -POSIX_F_FILES = \ - sys/stat - -# POSIX_DEVICE_IO Unit of Functionality (POSIX.1) -# pace_clearerr is in stdio.h; -# pace_close is in unistd.h; -# pace_fclose, pace_fdopen, pace_feof, pace_ferror are in stdio.h; -# pace_fflush, pace_fgetc, pace_fgets, pace_fileno are in stdio.h; -# pace_fopen, pace_fprintf, pace_fputc, pace_fputs, pace_fread, pace_freopen, -# pace_fscanf, pace_fwrite, pace_getc, pace_getchar, pace_gets are in stdio.h; -# pace_open is in fcntl.h; -# pace_perror, pace_printf, pace_putc, pace_putchar, pace_puts are in stdio.h; -# pace_read is in unistd.h; -# pace_scanf is in stdio.h; -# pace_setbuf, pace_sprintf, pace_sscanf, pace_ungetc are in stdio.h; -# pace_write are in unistd.h; -POSIX_DI_FILES = \ - stdio \ - unistd \ - fcntl - -# POSIX_FD_MGMT Unit of Functionality (POSIX.1) -# pace_dup, pace_dup2 are in unistd.h; -# pace_fcntl is in fcntl.h; -# pace_fseek, pace_ftell are in stdio.h; -# pace_lseek in unistd.h; -# pace_rewind is in stdio.h; -POSIX_FM_FILES = \ - unistd \ - fcntl \ - stdio - -# POSIX_PIPE Unit of Functionality (POSIX.1) -# pace_pipe is in unistd.h; -POSIX_P_FILES = \ - unistd - -# POSIX_DEVICE_SPECIFIC Unit of Functionality (POSIX.1) -# pace_cfgetispeed, pace_cfgetospeed, pace_cfsetispeed, pace_cfsetospeed are -# in termios.h; -# pace_ctermid is in stdio.h; -# pace_isatty is in unistd.h; -# pace_tcdrain, pace_tcflow, pace_tcflush, pace_tcgetattr, pace_tcsendbreak, -# pace_tcsetattr are in termios.h; -# pace_ttyname is in unistd.h; -POSIX_DS_FILES = \ - termios \ - stdio \ - unistd - -# POSIX_SYSTEM_DATABASE Unit of Functionality (POSIX.1) -# pace_getgrgid, pace_getgrnam, pace_getpwnam, pace_getpwuid are in grp.h; -POSIX_SD_FILES = \ - grp - -# POSIX_C_LANG_SUPPORT Unit of Functionality (POSIX.1) -# Character handling functions (e.g., isalnum, toupper) are in ctype.h; -# Mathematics functions (e.g., acos, tanh) are in math.h; -# Non-local jump functions (i.e., longjmp, setjmp) are in setjmp.h; -# General utility functions (i.e., abs, srand) are in stdlib.h; -# String handling functions (i.e., strcat, strtok) are in string.h; -# Date and Time functions (i.e., asctime, tzset) are in time.h; -POSIX_CLS_FILES = \ - ctype \ - math \ - setjmp \ - stdlib \ - time - -# _POSIX_JOB_CONTROL Unit of Functionality (POSIX.1) -# pace_setpgid is in unistd.h; -# pace_tcgetpgrp, pace_tcsetpgrp are in termios.h -_POSIX_JC_FILES = \ - unistd \ - termios - -# POSIX_USER_GROUPS_R Unit of Functionality (POSIX.1) -# pace_getlogin_r is in unistd.h; -POSIX_UGR_FILES = \ - unistd - -# POSIX_FILE_LOCKING Unit of Functionality (POSIX.1) -# pace_flockfile, pace_ftrylockfile, pace_funlockfile, pace_getc_unlocked, -# pace_getchar_unlocked, pace_putc_unlocked, pace_putchar_unlocked are in -# stdio.h; -POSIX_FL_FILES = \ - stdio - -# POSIX_C_LANG_SUPPORT_R Unit of Functionality (POSIX.1) -# pace_asctime_r, pace_ctime_r, pace_gmtime_r, pace_localtime_r are in time.h; -# pace_rand_r is in stdlib.h; -# pace_strtok_r is in string.h; -# pace_readdir_r is in dirent.h; -POSIX_CLSR_FILES = \ - time \ - stdlib \ - string \ - dirent - -# POSIX_SYSTEM_DATABASE_R Unit of Functionality (POSIX.1) -# pace_getgrgid_r, pace_getgrnam_r are in grp.h; -# pace_getpwnam_r, pace_getpwuid_r are in pwd.h; -POSIX_SDR_FILES = \ - grp \ - pwd - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -INCLDIRS += -I$(PACE_ROOT) - -#### -#### Build customization. -#### -ifndef PACE_COMPONENTS - #### Do we want PACE subsets as below? If so, we need to add the - #### documentation referenced below as well. - #### Please see docs/PACE-subsets.html for documentation. ?? - PACE_COMPONENTS = \ - Pace \ - Config \ - Sys - CFLAGS += -DPACE_HAS_ALL_POSIX_FUNCS -endif # PACE_COMPONENTS - -ifeq (FOR_ACE,$(PACE_COMPONENTS)) - #### These PACE components are necessary to support ACE. - override PACE_COMPONENTS = \ - Pace \ - Config \ - Sys - CFLAGS += -DPACE_HAS_ALL_POSIX_FUNCS -else # ! FOR_ACE - #### Is there anything in PACE that ACE doesn't need? Probably not -endif # ! FOR_ACE - -#### -#### PACE_COMPONENTS support. -#### -ifneq (,$(findstring Pace,$(PACE_COMPONENTS))) - FILES += $(PACE_FILES) -endif # Pace - -ifneq (,$(findstring Config,$(PACE_COMPONENTS))) - FILES += $(CONFIG_FILES) -endif # Config - -ifneq (,$(findstring Sys,$(PACE_COMPONENTS))) - FILES += $(SYS_FILES) -endif # Sys - -ifneq (,$(findstring Posix_sp,$(PACE_COMPONENTS))) - FILES = $(POSIX_SP_FILES) - LIB = libPACE_SP.a - SHLIB = libPACE_SP.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_SP_UOF -endif # Single Process - -ifneq (,$(findstring Posix_mp,$(PACE_COMPONENTS))) - FILES = $(POSIX_MP_FILES) - LIB = libPACE_MP.a - SHLIB = libPACE_MP.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_MP_UOF -endif # Multi Process - -ifneq (,$(findstring Posix_sig,$(PACE_COMPONENTS))) - FILES = $(POSIX_SIG_FILES) - LIB = libPACE_S.a - SHLIB = libPACE_S.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_SIG_UOF -endif # Signals - -ifneq (,$(findstring Posix_usg,$(PACE_COMPONENTS))) - FILES = $(POSIX_UG_FILES) - LIB = libPACE_UG.a - SHLIB = libPACE_UG.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_UG_UOF -endif # User Groups - -ifneq (,$(findstring Posix_fs,$(PACE_COMPONENTS))) - FILES = $(POSIX_FS_FILES) - LIB = libPACE_FS.a - SHLIB = libPACE_FS.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_FS_UOF -endif # File System - -ifneq (,$(findstring Posix_fa,$(PACE_COMPONENTS))) - FILES = $(POSIX_FA_FILES) - LIB = libPACE_FA.a - SHLIB = libPACE_FA.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_FA_UOF -endif # File Attributes - -ifneq (,$(findstring Posix_fif,$(PACE_COMPONENTS))) - FILES = $(POSIX_F_FILES) - LIB = libPACE_F.a - SHLIB = libPACE_F.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_F_UOF -endif # Fifo - -ifneq (,$(findstring Posix_di,$(PACE_COMPONENTS))) - FILES = $(POSIX_DI_FILES) - LIB = libPACE_DI.a - SHLIB = libPACE_DI.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_DI_UOF -endif # Device Input/Output - -ifneq (,$(findstring Posix_fm,$(PACE_COMPONENTS))) - FILES = $(POSIX_FM_FILES) - LIB = libPACE_FM.a - SHLIB = libPACE_FM.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_FM_UOF -endif # File Descriptor Management - -ifneq (,$(findstring Posix_p,$(PACE_COMPONENTS))) - FILES = $(POSIX_P_FILES) - LIB = libPACE_P.a - SHLIB = libPACE_P.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_P_UOF -endif # Pipe - -ifneq (,$(findstring Posix_ds,$(PACE_COMPONENTS))) - FILES = $(POSIX_DS_FILES) - LIB = libPACE_DS.a - SHLIB = libPACE_DS.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_DS_UOF -endif # Device Specific - -ifneq (,$(findstring Posix_sd,$(PACE_COMPONENTS))) - FILES = $(POSIX_SD_FILES) - LIB = libPACE_SD.a - SHLIB = libPACE_SD.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_SD_UOF -endif # System Database - -ifneq (,$(findstring Posix_cls,$(PACE_COMPONENTS))) - FILES = $(POSIX_CLS_FILES) - LIB = libPACE_CLS.a - SHLIB = libPACE_CLS.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_CLS_UOF -endif # C Language Support - -ifneq (,$(findstring Posix_jc,$(PACE_COMPONENTS))) - FILES = $(_POSIX_JC_FILES) - LIB = libPACE_JC.a - SHLIB = libPACE_JC.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_JC_UOF -endif # Job Control - -ifneq (,$(findstring Posix_ugr,$(PACE_COMPONENTS))) - FILES = $(POSIX_UGR_FILES) - LIB = libPACE_UGR.a - SHLIB = libPACE_UGR.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_UGR_UOF -endif # User Groups - Reentrant - -ifneq (,$(findstring Posix_fl,$(PACE_COMPONENTS))) - FILES = $(POSIX_FL_FILES) - LIB = libPACE_FL.a - SHLIB = libPACE_FL.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_FL_UOF -endif # File Locking - -ifneq (,$(findstring Posix_clr,$(PACE_COMPONENTS))) - FILES = $(POSIX_CLSR_FILES) - LIB = libPACE_CLSR.a - SHLIB = libPACE_CLSR.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_CLSR_UOF -endif # C Language Support - Reentrant - -ifneq (,$(findstring Posix_sr,$(PACE_COMPONENTS))) - FILES = $(POSIX_SDR_FILES) - LIB = libPACE_SDR.a - SHLIB = libPACE_SDR.$(SOEXT) - CFLAGS += -DPACE_HAS_POSIX_SDR_UOF -endif # System Database - Reentrant - -LSRC = $(addsuffix .cpp,$(FILES)) - -BUILD += PACE_COMPONENTS - -#### Setting PACELIB to null allows it to be used for building shared -#### libraries, including libPACE.$(SOEXT,) on certain platforms. -PACELIB = - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -#### Disable installs in this ($(ACE_ROOT)/pace/pace) directory, because this -#### is the (default) destination of installs anyways. This line prevents -#### creation of a link from the PACE library to itself when the build of -#### the PACE library fails. -INSTALL = -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -ifndef PACE_ROOT - PACE_ROOT = $(ACE_ROOT)/PACE -endif # ! PACE_ROOT - -include $(PACE_ROOT)/include/makeinclude/rules.common.GNU - -ifndef static_libs_only - ifndef shared_libs_only - static_libs_only = 1 - endif # ! shared_libs_only -endif # ! static_libs_only - -# If we are inlining the PACE functions then we need to define -# PACE_HAS_INLINE. Inlining is the default. -ifndef inline - CFLAGS += -DPACE_HAS_INLINE -endif # ! inline - -ifeq (1,$(inline)) - CFLAGS += -DPACE_HAS_INLINE -endif # inline - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -.PHONY: PACE_COMPONENTS -PACE_COMPONENTS: - @sh $(ACE_ROOT)/bin/ace_components --pace --set ' $(PACE_COMPONENTS) ' - -realclean: - @sh $(ACE_ROOT)/bin/ace_components --pace --remove - -# AIX template compilation speedup hack -# Not added for PACE - can always be added later if needed - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/PACE/pace/Makefile.am b/PACE/pace/Makefile.am deleted file mode 100644 index 65d64169da5..00000000000 --- a/PACE/pace/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -##--------------------------------------------------------------------------- -## $Id$ -## -## Makefile for the PACE C library -## -##--------------------------------------------------------------------------- - -## -## 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 = \ - @SUBDIRS@ - -DESTDIRS = \ - config \ - emulation \ - man \ - posix \ - sys \ - vxworks \ - win32 - -PACE_LIB = @PACE_LIB@ - -lib_LTLIBRARIES = libPACE.la -libPACE_la_LIBADD = $(PACE_LIB) - -pkginclude_HEADERS = \ - aio.h \ - assert.h \ - ctype.h \ - dirent.h \ - errno.h \ - fcntl.h \ - grp.h \ - limits.h \ - locale.h \ - math.h \ - mqueue.h \ - pthread.h \ - pwd.h \ - sched.h \ - semaphore.h \ - setjmp.h \ - signal.h \ - stddef.h \ - stdio.h \ - stdlib.h \ - string.h \ - termios.h \ - time.h \ - unistd.h \ - utime.h - -## Clean up some additional files/directories possibly created during -## the configure script tests. -clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations diff --git a/PACE/pace/aio.h b/PACE/pace/aio.h deleted file mode 100644 index f9d8be32a3c..00000000000 --- a/PACE/pace/aio.h +++ /dev/null @@ -1,125 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/aio.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_AIO_H -#define PACE_AIO_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/aio.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/aio.h" -#elif (PACE_WIN32) -# include "pace/win32/aio.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function aio_cancel. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), section 6.7.7. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_aio_cancel (PACE_HANDLE fildes, - pace_aiocb * aiocb); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function aio_error. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), section 6.7.5. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_aio_error (const pace_aiocb * aiocbp); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function aio_fsync. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), section 6.7.9. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_aio_fsync (int op, pace_aiocb * aiocbp); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function aio_read. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), section 6.7.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_aio_read (pace_aiocb * aiocbp); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function aio_return. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), section 6.7.6. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_aio_return (pace_aiocb * aiocbp); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function aio_suspend. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), section 6.7.8. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_aio_suspend(const pace_aiocb * const list[], - int nent, - const pace_timespec * timeout); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function aio_write. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), section 6.7.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_aio_write (pace_aiocb * aiocbp); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function lio_listio. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), section 6.7.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_lio_listio (int mode, - pace_aiocb * const list[], - int nent, - pace_sigevent * sig); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/aio.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/aio.inl" -# elif (PACE_WIN32) -# include "pace/win32/aio.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_AIO_H */ diff --git a/PACE/pace/assert.h b/PACE/pace/assert.h deleted file mode 100644 index 00c5dff1180..00000000000 --- a/PACE/pace/assert.h +++ /dev/null @@ -1,64 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/assert.h - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#ifndef PACE_ASSERT_H -#define PACE_ASSERT_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/assert.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/assert.h" -#elif (PACE_WIN32) -# include "pace/win32/assert.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX macro assert. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - - Use a macro because assert uses __FILE__ and __LINE__, which - would not be useful with an inline function. - */ - -#if (PACE_HAS_POSIX_MP_UOF) -#if defined (PACE_NDEBUG) -# define pace_assert(X) -#else /* ! PACE_NDEBUG */ -# define pace_assert(X) assert (X) -#endif /* ! PACE_NDEBUG */ -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/assert.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/assert.inl" -# elif (PACE_WIN32) -# include "pace/win32/assert.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_ASSERT_H */ diff --git a/PACE/pace/config/compiler.h b/PACE/pace/config/compiler.h deleted file mode 100644 index 92e25c97a05..00000000000 --- a/PACE/pace/config/compiler.h +++ /dev/null @@ -1,69 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/config/compiler.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CONFIG_COMPILER_H -#define PACE_CONFIG_COMPILER_H - -#if defined (__cplusplus) -# define PACE_HAS_CPLUSPLUS __cplusplus -# if defined (PACE_HAS_INLINE) -# define PACE_INLINE inline -# else -# define PACE_INLINE -# endif /* ! PACE_HAS_INLINE */ -#else /* ! __cplusplus */ -/* If PACE_HAS_INLINE is defined then we need the PACE functions to be - * static. Otherwise, we want PACE_INLINE to be defined as nothing. - */ -# if defined (PACE_HAS_INLINE) -# define PACE_INLINE static -# else -# define PACE_INLINE -# endif /* ! PACE_HAS_INLINE */ -#endif /* ! __cplusplus */ - -#if defined (PACE_HAS_INLINE) && defined (__GNUC__) && !(PACE_LYNXOS) -# define PACE_BROKEN_INLINE inline -#else -# define PACE_BROKEN_INLINE -#endif /* PACE_HAS_INLINE */ - -/* ============================================================================ - * Compiler Silencing macros - * - * Some compilers complain about parameters that are not used. This macro - * should keep them quiet. - * ============================================================================ - */ - -#if defined (ghs) || \ - defined (__GNUC__) || \ - defined (__hpux) || \ - defined (__sgi) || \ - defined (__DECCXX) || \ - defined (__KCC) || \ - defined (__rational__) \ - || (__USLC__) -/* Some compilers complain about "statement with no effect" with (a). - * This eliminates the warnings, and no code is generated for the null - * conditional statement. NOTE: that may only be true if -O is enabled, - * such as with GreenHills (ghs) 1.8.8. - */ -# define PACE_UNUSED_ARG(a) {if (&a) { /* null */ }} -#else /* ! ghs || __GNUC__ || ..... */ -# define PACE_UNUSED_ARG(a) (a) -#endif /* ! ghs || __GNUC__ || ..... */ - -#endif /* PACE_CONFIG_COMPILER_H */ diff --git a/PACE/pace/config/config.h b/PACE/pace/config/config.h deleted file mode 100644 index fb0d0b4c760..00000000000 --- a/PACE/pace/config/config.h +++ /dev/null @@ -1,221 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/config/config.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CONFIG_CONFIG_H -#define PACE_CONFIG_CONFIG_H - -#if !defined (PACE_HAS_POSIX_C_SOURCE) -# if defined (_POSIX_C_SOURCE) -# define PACE_HAS_POSIX_C_SOURCE _POSIX_C_SOURCE -# endif /* _POSIX_C_SOURCE */ -#endif /* ! PACE_HAS_POSIX_C_SOURCE */ - -#if !defined (PACE_HAS_EXTENSIONS) -# if defined (__EXTENSIONS__) -# define PACE_HAS_EXTENSIONS __EXTENSIONS__ -# endif /* __EXTENSIONS__ */ -#endif /* ! PACE_HAS_EXTENSIONS */ - -#if !defined (PACE_HAS_REENTRANT) -# if defined (PACE_LINUX) -# ifdef __USE_POSIX -# define PACE_HAS_REENTRANT 1 -# else /* ! __USE_POSIX */ -# endif /* ! __USE_POSIX */ -# elif defined (PACE_LYNXOS) -/* LynxOS uses _POSIX_REENTRANT_FUNCTIONS, but not _REENTRANT */ -# elif defined (PACE_SUNOS) -# if defined (__EXTENSIONS__) || defined (_REENTRANT) || \ - (_POSIX_C_SOURCE - 0 >= 199506L) -# define PACE_HAS_REENTRANT 1 -# else /* ! __EXTENSIONS__ && ! _REENTRANT && _POSIX_C_SOURCE < 199506L */ -# endif /* ! __EXTENSIONS__ && ! _REENTRANT && _POSIX_C_SOURCE < 199506L */ -# else /* other POSIX */ -# define PACE_HAS_REENTRANT 1 -# endif /* other POSIX */ -#endif /* ! PACE_HAS_REENTRANT */ - - -#if !defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS) -# if defined (_POSIX_PTHREAD_SEMANTICS) -# define PACE_HAS_POSIX_PTHREAD_SEMANTICS _POSIX_PTHREAD_SEMANTICS -# endif /* _POSIX_PTHREAD_SEMANTICS */ -#endif /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */ - - -#if PACE_HAS_POSIX == PACE_LYNXOS -# define PACE_NONCONST_ARG_CAST(TYPE) (TYPE) -# define PACE_VOIDSTARTSTAR_ARG_CAST(TYPE) (TYPE) -# define PACE_AIO_SUSPEND_LIST_ARG_CAST (struct aiocb **) -# define PACE_THR_ENTRY_CAST -#elif PACE_HAS_POSIX == DIGITAL_UNIX -# define PACE_NONCONST_ARG_CAST(TYPE) (TYPE) -# define PACE_VOIDSTARTSTAR_ARG_CAST(TYPE) -# define PACE_AIO_SUSPEND_LIST_ARG_CAST (const struct aiocb **) -# define PACE_THR_ENTRY_CAST -#elif PACE_LACKS_POSIX == PACE_VXWORKS -# define PACE_NONCONST_ARG_CAST(TYPE) (TYPE) -# define PACE_VOIDSTARTSTAR_ARG_CAST(TYPE) -# define PACE_AIO_SUSPEND_LIST_ARG_CAST (const struct aiocb **) -# define PACE_THR_ENTRY_CAST(TYPE) (TYPE) -#else /* ! PACE_LYNXOS */ -# define PACE_NONCONST_ARG_CAST(TYPE) -# define PACE_VOIDSTARTSTAR_ARG_CAST(TYPE) -# define PACE_AIO_SUSPEND_LIST_ARG_CAST -# define PACE_THR_ENTRY_CAST -#endif /* ! PACE_LYNXOS */ - -/* Adding appropriate macros for the different POSIX units of - functionality that PACE supports. - These macros define which POSIX functions get included when - PACE is built. The functions are grouped according to POSIX - Units of Functionality per the POSIX document ?? pp. ??. - The following macros correspond to the following POSIX - Unit of Functionality: - - PACE_HAS_POSIX_SOCK_UOF -> POSIX Socket UoF - PACE_HAS_POSIX_SP_UOF -> POSIX Single Process UoF - PACE_HAS_POSIX_MP_UOF -> POSIX Multiple Process UoF - PACE_HAS_POSIX_SIG_UOF -> POSIX Signals UoF - PACE_HAS_POSIX_UG_UOF -> POSIX User Groups UoF - PACE_HAS_POSIX_FS_UOF -> POSIX File System UoF - PACE_HAS_POSIX_FA_UOF -> POSIX File Attributes UoF - PACE_HAS_POSIX_F_UOF -> POSIX FIFO UoF - PACE_HAS_POSIX_DI_UOF -> POSIX Device I/O UoF - PACE_HAS_POSIX_FM_UOF -> POSIX File Descriptor Management UoF - PACE_HAS_POSIX_P_UOF -> POSIX Pipe UoF - PACE_HAS_POSIX_DS_UOF -> POSIX Device Specific UoF - PACE_HAS_POSIX_SD_UOF -> POSIX System Database UoF - PACE_HAS_POSIX_CLS_UOF -> POSIX C Language Support UoF - PACE_HAS_POSIX_JC_UOF -> POSIX Job Control UoF - PACE_HAS_POSIX_UGR_UOF -> POSIX User Groups (Reentrant) UoF - PACE_HAS_POSIX_FL_UOF -> POSIX File Locking UoF - PACE_HAS_POSIX_CLSR_UOF -> POSIX C Language Support (Reentrant) UoF - PACE_HAS_POSIX_SDR_UOF -> POSIX System Database (Reentrant) UoF - PACE_HAS_POSIX_NONUOF_FUNCS -> Any POSIX function in PACE that is not in - one of the above units of functionality. - */ -#if PACE_HAS_ALL_POSIX_FUNCS -# define PACE_HAS_POSIX_UOF 1 -# define PACE_HAS_POSIX_SP_UOF 1 -# define PACE_HAS_POSIX_MP_UOF 1 -# define PACE_HAS_POSIX_SIG_UOF 1 -# define PACE_HAS_POSIX_UG_UOF 1 -# define PACE_HAS_POSIX_FS_UOF 1 -# define PACE_HAS_POSIX_FA_UOF 1 -# define PACE_HAS_POSIX_F_UOF 1 -# define PACE_HAS_POSIX_DI_UOF 1 -# define PACE_HAS_POSIX_FM_UOF 1 -# define PACE_HAS_POSIX_P_UOF 1 -# define PACE_HAS_POSIX_DS_UOF 1 -# define PACE_HAS_POSIX_SD_UOF 1 -# define PACE_HAS_POSIX_CLS_UOF 1 -# define PACE_HAS_POSIX_JC_UOF 1 -# define PACE_HAS_POSIX_UGR_UOF 1 -# define PACE_HAS_POSIX_FL_UOF 1 -# define PACE_HAS_POSIX_CLSR_UOF 1 -# define PACE_HAS_POSIX_SDR_UOF 1 -# define PACE_HAS_POSIX_NONUOF_FUNCS 1 -#else -# if !defined PACE_HAS_POSIX_SOCK_UOF -# define PACE_HAS_POSIX_SOCK_UOF 0 -# endif /* ! PACE_HAS_POSIX_SOCK_UOF */ -# if !defined PACE_HAS_POSIX_SP_UOF -# define PACE_HAS_POSIX_SP_UOF 0 -# endif /* ! PACE_HAS_POSIX_SP_UOF */ -# if !defined PACE_HAS_POSIX_MP_UOF -# define PACE_HAS_POSIX_MP_UOF 0 -# endif /* ! PACE_HAS_POSIX_MP_UOF */ -# if !defined PACE_HAS_POSIX_SIG_UOF -# define PACE_HAS_POSIX_SIG_UOF 0 -# endif /* ! PACE_HAS_POSIX_SIG_UOF */ -# if !defined PACE_HAS_POSIX_UG_UOF -# define PACE_HAS_POSIX_UG_UOF 0 -# endif /* ! PACE_HAS_POSIX_UG_UOF */ -# if !defined PACE_HAS_POSIX_FS_UOF -# define PACE_HAS_POSIX_FS_UOF 0 -# endif /* ! PACE_HAS_POSIX_FS_UOF */ -# if !defined PACE_HAS_POSIX_FA_UOF -# define PACE_HAS_POSIX_FA_UOF 0 -# endif /* ! PACE_HAS_POSIX_FA_UOF */ -# if !defined PACE_HAS_POSIX_F_UOF -# define PACE_HAS_POSIX_F_UOF 0 -# endif /* ! PACE_HAS_POSIX_F_UOF */ -# if !defined PACE_HAS_POSIX_DI_UOF -# define PACE_HAS_POSIX_DI_UOF 0 -# endif /* ! PACE_HAS_POSIX_DI_UOF */ -# if !defined PACE_HAS_POSIX_FM_UOF -# define PACE_HAS_POSIX_FM_UOF 0 -# endif /* ! PACE_HAS_POSIX_FM_UOF */ -# if !defined PACE_HAS_POSIX_P_UOF -# define PACE_HAS_POSIX_P_UOF 0 -# endif /* ! PACE_HAS_POSIX_P_UOF */ -# if !defined PACE_HAS_POSIX_DS_UOF -# define PACE_HAS_POSIX_DS_UOF 0 -# endif /* ! PACE_HAS_POSIX_DS_UOF */ -# if !defined PACE_HAS_POSIX_SD_UOF -# define PACE_HAS_POSIX_SD_UOF 0 -# endif /* ! PACE_HAS_POSIX_SD_UOF */ -# if !defined PACE_HAS_POSIX_CLS_UOF -# define PACE_HAS_POSIX_CLS_UOF 0 -# endif /* ! PACE_HAS_POSIX_CLS_UOF */ -# if !defined PACE_HAS_POSIX_JC_UOF -# define PACE_HAS_POSIX_JC_UOF 0 -# endif /* ! PACE_HAS_POSIX_JC_UOF */ -# if !defined PACE_HAS_POSIX_UGR_UOF -# define PACE_HAS_POSIX_UGR_UOF 0 -# endif /* ! PACE_HAS_POSIX_UGR_UOF */ -# if !defined PACE_HAS_POSIX_FL_UOF -# define PACE_HAS_POSIX_FL_UOF 0 -# endif /* ! PACE_HAS_POSIX_FL_UOF */ -# if !defined PACE_HAS_POSIX_CLSR_UOF -# define PACE_HAS_POSIX_CLSR_UOF 0 -# endif /* ! PACE_HAS_POSIX_CLSR_UOF */ -# if !defined PACE_HAS_POSIX_SDR_UOF -# define PACE_HAS_POSIX_SDR_UOF 0 -# endif /* ! PACE_HAS_POSIX_SDR_UOF */ -# if !defined PACE_HAS_POSIX_NONUOF_FUNCS -# define PACE_HAS_POSIX_NONUOF_FUNCS 0 -# endif /* ! PACE_HAS_POSIX_NONUOF_FUNCS */ -#endif /* PACE_HAS_ALL_POSIX_FUNCS */ - -#if (PACE_WIN32) - -# if defined (PACE_AS_STATIC_LIBS) -# if !defined (PACE_HAS_DLL) -# define PACE_HAS_DLL 0 -# endif /* ! PACE_HAS_DLL */ -# else -# if !defined (PACE_HAS_DLL) -# define PACE_HAS_DLL 1 -# endif /* ! PACE_HAS_DLL */ -# endif /* PACE_AS_STATIC_LIBS */ - -#define PACE_Proper_Export_Flag __declspec (dllexport) -#define PACE_Proper_Import_Flag __declspec (dllimport) - -#endif /* PACE_WIN32 */ - -#if defined (PACE_HAS_DLL) && (PACE_HAS_DLL == 1) -# if defined (PACE_BUILD_DLL) -# define PACE_Export PACE_Proper_Export_Flag -# else /* PACE_BUILD_DLL */ -# define PACE_Export PACE_Proper_Import_Flag -# endif /* PACE_BUILD_DLL */ -#else /* PACE_HAS_DLL != 1 */ -# define PACE_Export -#endif /* PACE_HAS_DLL != 1 */ - -#endif /* PACE_CONFIG_CONFIG_H */ diff --git a/PACE/pace/config/constants.h b/PACE/pace/config/constants.h deleted file mode 100644 index 885fc104987..00000000000 --- a/PACE/pace/config/constants.h +++ /dev/null @@ -1,244 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * constants.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CONFIG_CONSTANTS_H -#define PACE_CONFIG_CONSTANTS_H - -#define PACE_ONE_SECOND_IN_MSECS 1000L -#define PACE_ONE_SECOND_IN_USECS 1000000L -#define PACE_ONE_SECOND_IN_NSECS 1000000000L - -/* ============================================================================ - * Posix minimum values - * ============================================================================ */ - -/* The number of I/O operations that can be specified in a list I/O call. */ -# if defined (_POSIX_AIO_LISTIO_MAX) -# define PACE_POSIX_AIO_LISTIO_MAX _POSIX_AIO_LISTIO_MAX -# endif - -/* The number of outstanding asynchronous I/O operations. */ -# if defined (_POSIX_AIO_MAX) -# define PACE_POSIX_AIO_MAX _POSIX_AIO_MAX -# endif - -/* The length of the arguments for one of the exec functions, in bytes, - * excluding environment data. */ -# if defined (_POSIX_ARG_MAX) -# define PACE_POSIX_ARG_MAX _POSIX_ARG_MAX -# endif - -/* The number of simultaneous processes per real user ID. */ -# if defined (_POSIX_CHILD_MAX) -# define PACE_POSIX_CHILD_MAX _POSIX_CHILD_MAX -# endif - -/* The number of timer expiration overruns. */ -# if defined (_POSIX_DELAYTIMER_MAX) -# define PACE_POSIX_DELAYTIMER_MAX _POSIX_DELAYTIMER_MAX -# endif - -/* The value of a file's link count. */ -# if defined (_POSIX_LINK_MAX) -# define PACE_POSIX_LINK_MAX _POSIX_LINK_MAX -# endif - -/* The size of the storage required for a login name, in bytes, - * including the terminating NULL. */ -# if defined (_POSIX_LOGIN_NAME_MAX) -# define PACE_POSIX_LOGIN_NAME_MAX _POSIX_LOGIN_NAME_MAX -# endif - -/* The number of bytes in a terminal canonical input queue. */ -# if defined (_POSIX_MAX_CANON) -# define PACE_POSIX_MAX_CANON _POSIX_MAX_CANON -# endif - -/* The number of bytes for which space will be available in a - * terminal input queue. */ -# if defined (_POSIX_MAX_INPUT) -# define PACE_POSIX_MAX_INPUT _POSIX_MAX_INPUT -# endif - -/* The number of message queues that can be open for a single - * process. */ -# if defined (_POSIX_MQ_OPEN_MAX) -# define PACE_POSIX_MQ_OPEN_MAX _POSIX_MQ_OPEN_MAX -# endif - -/* The maximum number of message priorities supported by the - * implementation. */ -# if defined (_POSIX_MQ_PRIO_MAX) -# define PACE_POSIX_MQ_PRIO_MAX _POSIX_MQ_PRIO_MAX -# endif - -/* The number of bytes in a filename. */ -# if defined (_POSIX_NAME_MAX) -# define PACE_POSIX_NAME_MAX _POSIX_NAME_MAX -# endif - -/* The number of simultaneous supplementary group IDs per process. */ -# if defined (_POSIX_NGROUPS_MAX) -# define PACE_POSIX_NGROUPS_MAX _POSIX_NGROUPS_MAX -# endif - -/* The number of files that one process can have open at one time. */ -# if defined (_POSIX_OPEN_MAX) -# define PACE_POSIX_OPEN_MAX _POSIX_OPEN_MAX -# endif - -/* The number of bytes in a pathname. */ -# if defined (_POSIX_PATH_MAX) -# define PACE_POSIX_PATH_MAX _POSIX_PATH_MAX -# endif - -/* The number of bytes that can be written atomically when writing - * to a pipe. */ -# if defined (_POSIX_PIPE_BUF) -# define PACE_POSIX_PIPE_BUF _POSIX_PIPE_BUF -# endif - -/* The number of realtime signal numbers reserved for application use. */ -# if defined (_POSIX_RTSIG_MAX) -# define PACE_POSIX_RTSIG_MAX _POSIX_RTSIG_MAX -# endif - -/* The number of semaphores that a process may have. */ -# if defined (_POSIX_SEM_NSEMS_MAX) -# define PACE_POSIX_SEM_NSEMS_MAX _POSIX_SEM_NSEMS_MAX -# endif - -/* The maximum value a semaphore may have. */ -# if defined (_POSIX_SEM_VALUE_MAX) -# define PACE_POSIX_SEM_VALUE_MAX _POSIX_SEM_VALUE_MAX -# endif - -/* The number of queued signals that a process may send and have pending - * at the receiver(s) at any time. */ -# if defined (_POSIX_SIGQUEUE_MAX) -# define PACE_POSIX_SIGQUEUE_MAX _POSIX_SIGQUEUE_MAX -# endif - -/* The value that can be stored in an object of type ssize_t. */ -# if defined (_POSIX_SSIZE_MAX) -# define PACE_POSIX_SSIZE_MAX _POSIX_SSIZE_MAX -# endif - -/* The number of streams that one process can have open at one time. */ -# if defined (_POSIX_STREAM_MAX) -# define PACE_POSIX_STREAM_MAX _POSIX_STREAM_MAX -# endif - -/* The number of attempts made to destroy the thread-specific data - * values of a thread on thread exit. */ -# if defined (_POSIX_THREAD_DESTRUCTOR_ITERATIONS) -# define PACE_POSIX_THREAD_DESTRUCTOR_ITERATIONS _POSIX_THREAD_DESTRUCTORITERATIONS -# endif - -/* The number of data keys per process. */ -# if defined (_POSIX_THREAD_KEYS_MAX) -# define PACE_POSIX_THREAD_KEYS_MAX _POSIX_THREAD_KEYS_MAX -# endif - -/* The number of threads per process. */ -# if defined (_POSIX_THREAD_THREADS_MAX) -# define PACE_POSIX_THREAD_THREADS_MAX _POSIX_THREAD_THREADS_MAX -# endif - -/* The size of the storage required for a terminal device name, in bytes, - * including the terminating NULL. */ -# if defined (_POSIX_TTY_NAME_MAX) -# define PACE_POSIX_TTY_NAME_MAX _POSIX_TTY_NAME_MAX -# endif - -/* The per-process number of times. */ -# if defined (_POSIX_TIMER_MAX) -# define PACE_POSIX_TIMER_MAX _POSIX_TIMER_MAX -# endif - -/* The maximum number of bytes supported for the name of a time zone - * (not of the TZ variable). */ -# if defined (_POSIX_TZNAME_MAX) -# define PACE_POSIX_TZNAME_MAX _POSIX_TZNAME_MAX -# endif - - -/* ============================================================================ - * Temporary MACROS. Correct them later. - * ============================================================================ */ - -#include "pace/sys/types.h" - -/* Tracing */ -# define PACE_DEBUG(X) -# define PACE_LM_DEBUG PACE_stderr -# define PACE_BEGIN_DUMP -# define PACE_END_DUMP - -/* Identification for PACE.h */ -# define PACE_RCSID(X,Y,Z) - -/* Hooks */ -/* Dummy values */ -# define PACE_ALLOC_HOOK_DECLARE int declare_hook -# define PACE_ALLOC_HOOK_DEFINE(X) - -/* Signals / ioctl / fcntl - dummy values */ -# define PACE_SIGURG 1 -# define PACE_NONBLOCK 2 -# define PACE_CLOEXEC 3 - -/* Flags */ -/* Will not be a macro, dummy values */ -# define PACE_set_flags(X,Y) 1 -# define PACE_clr_flags(X,Y) 1 - -/* Log Error */ -# define PACE_ERROR(X) - -/* Host Entries */ -# if defined (PACE_HAS_STRUCT_NETDB_DATA) -typedef char PACE_HOSTENT_DATA[sizeof(struct hostent_data)]; -typedef char PACE_SERVENT_DATA[sizeof(struct servent_data)]; -typedef char PACE_PROTOENT_DATA[sizeof(struct protoent_data)]; -# else -# if !defined PACE_HOSTENT_DATA_SIZE -# define PACE_HOSTENT_DATA_SIZE (4*1024) -# endif /* PACE_HOSTENT_DATA_SIZE */ -# if !defined PACE_SERVENT_DATA_SIZE -# define PACE_SERVENT_DATA_SIZE (4*1024) -# endif /*PACE_SERVENT_DATA_SIZE */ -# if !defined PACE_PROTOENT_DATA_SIZE -# define PACE_PROTOENT_DATA_SIZE (2*1024) -# endif /*PACE_PROTOENT_DATA_SIZE */ -typedef char PACE_HOSTENT_DATA[PACE_HOSTENT_DATA_SIZE]; -typedef char PACE_SERVENT_DATA[PACE_SERVENT_DATA_SIZE]; -typedef char PACE_PROTOENT_DATA[PACE_PROTOENT_DATA_SIZE]; -# endif /* PACE_HAS_STRUCT_NETDB_DATA */ - -/* PACE_HAS_SIN_LEN */ - -/* PACE_FREE */ -/* adjust later to use macros to decide how to free */ -# define PACE_FREE(X,Y) \ -X Y - -# define AF_ANY -1 - -/* PACE CATCHALL */ -/* FIONREAD is used in PACE_SOCK_IO::recvv */ -/* PACE_HAS_ALLOCA is used in PACE_SOCK_IO::recvv */ - -#endif /* PACE_CONFIG_CONSTANTS_H */ diff --git a/PACE/pace/config/defaults.h b/PACE/pace/config/defaults.h deleted file mode 100644 index deadb92b071..00000000000 --- a/PACE/pace/config/defaults.h +++ /dev/null @@ -1,26 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * defaults.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - - -#ifndef PACE_CONFIG_DEFAULTS_H -#define PACE_CONFIG_DEFAULTS_H - - -/* Define the default constants for PACE. Many of these are used for - * the PACE tests and applications. You can change these values by - * defining the macros in your config.h file. */ - - -#endif /* PACE_CONFIG_DEFAULTS_H */ diff --git a/PACE/pace/config/defines.h b/PACE/pace/config/defines.h deleted file mode 100644 index 0aabf77f21c..00000000000 --- a/PACE/pace/config/defines.h +++ /dev/null @@ -1,27 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/config/defines.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CONFIG_DEFINES_H -#define PACE_CONFIG_DEFINES_H - -#include "pace/config/platform.h" -#include "pace/config/config.h" -#include "pace/config/compiler.h" -#include "pace/config/constants.h" -#include "pace/config/defaults.h" -#include "pace/config/utility.h" -#include "pace/config/features.h" - -#endif /* PACE_CONFIG_DEFINES_H */ diff --git a/PACE/pace/config/features.h b/PACE/pace/config/features.h deleted file mode 100644 index 14ea1e86607..00000000000 --- a/PACE/pace/config/features.h +++ /dev/null @@ -1,49 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/config/features.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CONFIG_FEATURES_H -#define PACE_CONFIG_FEATURES_H - -/* Features: Can be customized by the developer. */ - -#if defined (WIN32) - -/* If using win32 .. define PACE_HAS_MFC to 1, if you want ACE to use - * CWinThread. This should be defined, if your application uses MFC. - * Setting applies to : building PACE - * Runtime restrictions: MFC DLLs must be installed - * Additonal notes : If both PACE_HAS_MFC and PACE_MT_SAFE are - * defined, the MFC DLL (not the static lib) - * will be used from ACE. */ -# if !defined (PACE_HAS_MFC) -# define PACE_HAS_MFC 0 -# endif /* PACE_HAS_MFC */ - -/* Turn off the following define if you want to disable threading. - * Compile using multi-thread libraries. - * Setting applies to : building PACE, linking with PACE - * Runtime restrictions: multithreaded runtime DLL must be installed. */ -# if !defined (PACE_MT_SAFE) -# define PACE_MT_SAFE 1 -# endif /* PACE_MT_SAFE */ - -/* Turn on multithreading. */ -# if !defined (_MT) -# define _MT -# endif /* _MT */ - -#endif /* WIN32 */ - -#endif /* PACE_CONFIG_FEATURES_H */ diff --git a/PACE/pace/config/platform.h b/PACE/pace/config/platform.h deleted file mode 100644 index 4dde03ea27a..00000000000 --- a/PACE/pace/config/platform.h +++ /dev/null @@ -1,86 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/config/platform.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CONFIG_PLATFORM_H -#define PACE_CONFIG_PLATFORM_H - -/* Be careful not to define these macros 2x. */ -/* IE: makefile or other config file. */ -/* This could create compiler warnings. */ - -/* These platforms are POSIX compliant. */ - -#if defined (PACE_LINUX) -# define PACE_HAS_POSIX PACE_LINUX -# define PACE_LYNXOS 0 -# define PACE_SUNOS 0 -# define PACE_VXWORKS 0 -# define PACE_WIN32 0 -#elif defined (PACE_LYNXOS) -# define PACE_HAS_POSIX PACE_LYNXOS -# define PACE_LINUX 0 -# define PACE_SUNOS 0 -# define PACE_VXWORKS 0 -# define PACE_WIN32 0 -#elif defined (PACE_OSF1) -# define PACE_HAS_POSIX DIGITAL_UNIX -# define PACE_LINUX 0 -# define PACE_LYNXOS 0 -# define PACE_VXWORKS 0 -# define PACE_WIN32 0 -#elif defined (PACE_SUNOS) -# define PACE_HAS_POSIX PACE_SUNOS -# define PACE_LINUX 0 -# define PACE_LYNXOS 0 -# define PACE_VXWORKS 0 -# define PACE_WIN32 0 -#elif defined (PACE_QNX) -# define PACE_HAS_POSIX PACE_QNX -# define PACE_LINUX 0 -# define PACE_SUNOS 0 -# define PACE_LYNXOS 0 -# define PACE_VXWORKS 0 -# define PACE_WIN32 0 - -/* These platforms are NOT POSIX compliant. */ - -/* This is really kludgy but not sure what else to do at this point. - It appears that if PACE_HAS_POSIX is not defined (i.e., no #define - at all of any kind) and the same goes for PACE_VXWORKS then in - pace/config/config.h #if PACE_HAS_POSIX == PACE_LYNXOS will evaluate - to true. I am assuming both get default values of 0. - - PACE_WIN32 should be defined as 0 though because pace/config/utility.h - checks it. - */ - -#elif defined (PACE_VXWORKS) -# define PACE_LACKS_POSIX PACE_VXWORKS -# define PACE_LINUX -1 -# define PACE_LYNXOS -1 -# define PACE_SUNOS -1 -# define PACE_WIN32 0 -/* Doesn't use the makefile! */ -#elif defined (WIN32) -# undef PACE_WIN32 -# define PACE_WIN32 2000 -# define PACE_LACKS_POSIX PACE_WIN32 -# define PACE_LINUX 0 -# define PACE_LYNXOS 0 -# define PACE_SUNOS 0 -# define PACE_VXWORKS 0 -#endif - -#endif /* PACE_CONFIG_PLATFORM_H */ diff --git a/PACE/pace/config/utility.h b/PACE/pace/config/utility.h deleted file mode 100644 index 79b13e4755f..00000000000 --- a/PACE/pace/config/utility.h +++ /dev/null @@ -1,118 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/config/utility.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CONFIG_UTILITY_H -#define PACE_CONFIG_UTILITY_H - -/* ---------------------------------------------------------------------- - * error control - * ---------------------------------------------------------------------- */ - -#if defined (PACE_TRACING) && PACE_TRACING == 1 -# include -#endif - -#include "pace/errno.h" - -# define PACE_ERRNO_NO_SUPPORT_RETURN(FAILVALUE) \ -return ( (errno = ENOTSUP), FAILVALUE) - -# define PACE_ERRNO_NO_SUPPORT() errno=ENOTSUP - -/* ---------------------------------------------------------------------- - A couple useful inline functions for checking whether bits are - enabled or disabled. - * ---------------------------------------------------------------------- */ - -# define PACE_POW(X) (((X) == 0)?1:(X-=1,X|=X>>1,X|=X>>2,X|=X>>4,X|=X>>8,X|=X>>16,(++X))) -# define PACE_EVEN(NUM) (((NUM) & 1) == 0) -# define PACE_ODD(NUM) (((NUM) & 1) == 1) -# define PACE_BIT_ENABLED(WORD, BIT) (((WORD) & (BIT)) != 0) -# define PACE_BIT_DISABLED(WORD, BIT) (((WORD) & (BIT)) == 0) -# define PACE_BIT_CMP_MASK(WORD, BIT, MASK) (((WORD) & (BIT)) == MASK) -# define PACE_SET_BITS(WORD, BITS) (WORD |= (BITS)) -# define PACE_CLR_BITS(WORD, BITS) (WORD &= ~(BITS)) - -/* Turn a number into a string. */ -# define PACE_ITOA(X) #X - -/* Create a string of a server address with a "host:port" format. */ -# define PACE_SERVER_ADDRESS(H,P) H":"P - -/* ---------------------------------------------------------------------- - Specific for (PACE_WIN32) - * ---------------------------------------------------------------------- */ - -#if (PACE_WIN32) - -#include - -/* Perform a mapping of Win32 error numbers into POSIX errnos. */ -# define PACE_FAIL_RETURN(RESULT) do { \ - switch (GetLastError ()) { \ - case ERROR_NOT_ENOUGH_MEMORY: errno = ENOMEM; break; \ - case ERROR_FILE_EXISTS: errno = EEXIST; break; \ - case ERROR_SHARING_VIOLATION: errno = EACCES; break; \ - case ERROR_PATH_NOT_FOUND: errno = ENOENT; break; \ - } \ - return RESULT; } while (0) - -/* The "null" device on Win32. */ -# define PACE_DEV_NULL "nul" - -/* Define the pathname separator characters for Win32 (ugh). */ -# define PACE_DIRECTORY_SEPARATOR_STR "\\" -# define PACE_DIRECTORY_SEPARATOR_CHAR '\\' -# define PACE_LD_SEARCH_PATH "PATH" -# define PACE_LD_SEARCH_PATH_SEPARATOR_STR ";" -# define PACE_DLL_SUFFIX ".dll" -# define PACE_DLL_PREFIX "" - -# define PACE_SYSCALL_FAILED 0xFFFFFFFF - -/* Turns "FALSE" into -1 */ -# define PACE_ADAPT_RETVAL(OP,RESULT) \ - ((RESULT = (OP)) == FALSE ? -1 : 0) - -/* If failure, sets errno before returning */ -# define PACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ - do { \ - TYPE pace_result_; \ - pace_result_ = (TYPE) X; \ - if (pace_result_ == FAILVALUE) \ - { \ - errno = GetLastError (); \ - } \ - return pace_result_; \ - } while (0) - -/* Casts return value. */ -# define PACE_OSCALL_RETURN(X,TYPE,FAILVALUE) \ - return (TYPE) X; - -#endif /* PACE_WIN32 */ - -/* ---------------------------------------------------------------------- - * debug tracing - * ---------------------------------------------------------------------- */ - -#if defined (PACE_TRACING) && PACE_TRACING == 1 -# define PACE_TRACE(MODULE) \ -fprintf(stderr, "PACE_TRACE %s, %d, %s\n", (MODULE), __LINE__, __FILE__) -#else -# define PACE_TRACE(MODULE) -#endif /* TRACING */ - -#endif /* PACE_CONFIG_UTILITY_H */ diff --git a/PACE/pace/ctype.h b/PACE/pace/ctype.h deleted file mode 100644 index cbca084d280..00000000000 --- a/PACE/pace/ctype.h +++ /dev/null @@ -1,164 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/ctype.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CTYPE_H -#define PACE_CTYPE_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/ctype.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/ctype.h" -#elif (PACE_WIN32) -# include "pace/win32/ctype.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function isalnum. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_isalnum (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function isalpha. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_isalpha (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function iscntrl. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_iscntrl (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function isdigit. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_isdigit (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function isgraph. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_isgraph (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function islower. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_islower (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function isprint. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_isprint (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function ispunct. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_ispunct (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function isspace. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_isspace (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function isupper. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_isupper (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function isxdigit. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_isxdigit (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function tolower. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_tolower (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function toupper. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_toupper (int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/ctype.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/ctype.inl" -# elif (PACE_WIN32) -# include "pace/win32/ctype.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_CTYPE_H */ diff --git a/PACE/pace/dirent.h b/PACE/pace/dirent.h deleted file mode 100644 index 55ab381a49d..00000000000 --- a/PACE/pace/dirent.h +++ /dev/null @@ -1,95 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/dirent.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_DIRENT_H -#define PACE_DIRENT_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/dirent.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/dirent.h" -#elif (PACE_WIN32) -# include "pace/win32/dirent.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function opendir. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.1.2. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE PACE_DIR * pace_opendir (const char * dirname); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function readdir. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.1.2. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE pace_dirent * pace_readdir (PACE_DIR * dirp); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function readdir_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.1.2. - */ -#if (PACE_HAS_POSIX_CLSR_UOF) - PACE_Export PACE_INLINE int pace_readdir_r (PACE_DIR * dirp, - pace_dirent * entry, - pace_dirent ** result); -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - /** - PACE's implementation of the POSIX function rewinddir. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.1.2. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE void pace_rewinddir (PACE_DIR * dirp); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function closedir. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.1.2. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_closedir (PACE_DIR * dirp); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/dirent.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/dirent.inl" -# elif (PACE_WIN32) -# include "pace/win32/dirent.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_DIRENT_H */ diff --git a/PACE/pace/emulation/mqueue.c b/PACE/pace/emulation/mqueue.c deleted file mode 100644 index 4e0e6912de6..00000000000 --- a/PACE/pace/emulation/mqueue.c +++ /dev/null @@ -1,570 +0,0 @@ -/* $Id$ -*- C -*- - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/emulation/mqueue.c - * - * = AUTHOR - * John Heitmann - * - * ============================================================================ */ - -#include "pace/sys/mman.h" -#include "pace/stdio.h" -#include "pace/fcntl.h" -#include "pace/string.h" -#include "pace/stdlib.h" -#include "pace/sys/types.h" -#include "pace/pthread.h" -#include "pace/sys/stat.h" -#include "pace/emulation/mqueue.h" - -typedef struct -{ - pace_mq_attr attr; - pace_size_t num_open; /* How many processes have a valid mqd_t to here */ - pace_size_t rec_wait; /* How many processes are blocked on mq_receive */ - pace_pid_t not_pid; /* Who is actually registered for notification */ - pace_sigevent notification; - pace_pthread_mutex_t mutex; - pace_pthread_cond_t cond; - pace_size_t head; - pace_size_t freelist; -} mqfile; - -typedef struct -{ - pace_size_t next; /* Index of next element */ - unsigned int priority; - pace_size_t length; -} message_header; - -static struct mq_attr pace_attrdefault = { 0, 32, 256, 0 }; -#define PACE_MQ_LOCKPOSTFIX "mqlock9587" -#define PACE_MQ_DATAPOSTFIX "mqdata2355" - -/* This remains mq_open due to the macro in pace/mqueue.h */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -pace_mqd_t mq_open (const char* name, - int oflag, - pace_mode_t mode, - pace_mq_attr* attr) -{ - int m_padding = sizeof (message_header); /* How much extra space per message do we need */ - int f_padding = sizeof (mqfile); /* How much fixed padding is needed */ - int mflags, mprot; - int fd; - int i; - pace_size_t mapsize; - char* mmaploc; - char* new_name; - char* lock_name; - int create_mmap = 0; /* 1 if the file has never be inited */ - message_header* temp = 0; /*Used in initialization of mqueue*/ - long index; /* index into the file */ - pace_mqd_t result = (pace_mqd_t) pace_malloc (sizeof (struct mqd)); - pace_stat_s statbuf; - -retry: - if (attr == 0) - { - attr = &pace_attrdefault; - } - else - { - if (attr->mq_maxmsg < 0 || attr->mq_msgsize < 0) - { - errno = EBADF; - return (pace_mqd_t)-1; - } - } - - /* Create a name that will go to /tmp with a unique name */ - new_name = (char*) malloc (256); - lock_name = (char*) malloc (256); - snprintf (new_name, 256, "/tmp%s%s", name, PACE_MQ_DATAPOSTFIX); - snprintf (lock_name, 256, "/tmp%s%s", name, PACE_MQ_LOCKPOSTFIX); - - /* Fix alignment */ - if (attr->mq_msgsize % sizeof (long) != 0) - { - attr->mq_msgsize += 8 - (attr->mq_msgsize % sizeof (long)); - } - - if (oflag & PACE_O_CREAT) - { - /* We need to protect access without the help of O_RDONLY in the fs */ - fd = pace_open (new_name, PACE_O_RDWR | PACE_O_CREAT | PACE_O_EXCL, mode); - - if (fd == -1 && errno != EEXIST) - { - /* An error other than EEXIST has occurred. */ - return (pace_mqd_t)-1; - } - else if (fd != -1) - { - /* If a new file was created successfully */ - create_mmap = 1; - } - else if (oflag & PACE_O_EXCL) - { - /* If the file exists and we don't want it */ - errno = EEXIST; - return (pace_mqd_t)-1; - } - else - { - /* We want the existing file */ - fd = pace_open (new_name, PACE_O_RDWR); - if (fd == -1 && errno == ENOENT) - { - /* Something odd is going on */ - goto retry; - } - else if (fd == -1) - { - return (pace_mqd_t)-1; - } - } - } - else - { - fd = pace_open (new_name, PACE_O_RDWR); - if (fd == -1) - { - return (pace_mqd_t)-1; - } - } - - /* - The following loop makes shure that we haven't entered a race condition. If a file - has been created but not initialized, its IXUSR will not be set (see above). - */ - while (create_mmap == 0) - { - if (stat (lock_name, &statbuf) == -1) - { - close (fd); - if (errno == ENOENT && (oflag & O_CREAT)) - { - goto retry; - } - return (pace_mqd_t)-1; - } - else - { - break; - } - } - - mapsize = f_padding + (attr->mq_msgsize + m_padding) * (attr->mq_maxmsg); - mprot = PACE_PROT_READ | PACE_PROT_WRITE; - mflags = PACE_MAP_SHARED; - - if (create_mmap) - { - /* Create and 0 out the file */ - if (pace_lseek (fd, mapsize, PACE_SEEK_SET) == -1) - { - pace_unlink (new_name); - return (pace_mqd_t)-1; - } - if (pace_write (fd, "", 1) != 1) - { - pace_unlink (new_name); - return (pace_mqd_t)-1; - } - - mmaploc = (char*) pace_mmap (0, mapsize, mprot, mflags, fd, 0); - pace_close (fd); - if (mmaploc == MAP_FAILED) - { - pace_unlink (new_name); - return (pace_mqd_t)-1; - } - - pace_memset (mmaploc, 0, mapsize); - - if ((errno = pace_pthread_mutex_init (&(((mqfile*)mmaploc)->mutex), 0)) != 0) - { - pace_unlink (new_name); - pace_munmap (mmaploc, mapsize); - return (pace_mqd_t)-1; - } - if ((errno = pace_pthread_mutex_lock (&(((mqfile*)mmaploc)->mutex))) != 0) - { - pace_unlink (new_name); - pace_munmap (mmaploc, mapsize); - return (pace_mqd_t)-1; - } - - if ((errno = pace_pthread_cond_init (&(((mqfile*)mmaploc)->cond), 0)) != 0) - { - pace_unlink (new_name); - pace_munmap (mmaploc, mapsize); - return (pace_mqd_t)-1; - } - - index = sizeof (mqfile); - ((mqfile*)mmaploc)->freelist = index; - ((mqfile*)mmaploc)->head = 0; - - for (i = 0; i < attr->mq_maxmsg; ++i) - { - temp = (message_header *) &mmaploc[index]; - index += sizeof (message_header) + attr->mq_msgsize; - temp->next = index; - } - temp->next = 0; - attr->mq_curmsgs = 0; - ((mqfile*)mmaploc)->attr = *attr; - - /* Create the lock file so that the file is known to be inited */ - if (pace_open (lock_name, O_CREAT | O_EXCL) == -1) - { - pace_unlink (new_name); - pace_munmap (mmaploc, mapsize); - return (pace_mqd_t)-1; - } - - } - else - { - /* Just open the existing map */ - mmaploc = (char*) pace_mmap (0, mapsize, mprot, mflags, fd, 0); - if (mmaploc == MAP_FAILED) - { - return (pace_mqd_t)-1; - } - pace_close (fd); - - /* ???? Test here for race */ - - if (pace_pthread_mutex_lock (&(((mqfile*)mmaploc)->mutex)) == -1) - { - pace_munmap (mmaploc, mapsize); - return (pace_mqd_t)-1; - } - ((mqfile*)mmaploc)->attr.mq_flags = attr->mq_flags; - } - - ((mqfile*)mmaploc)->num_open++; - - - if (pace_pthread_mutex_unlock (&(((mqfile*)mmaploc)->mutex)) == -1) - { - pace_munmap (mmaploc, mapsize); - return (pace_mqd_t)-1; - } - - result->mptr = mmaploc; - result->length = mapsize; - result->oflag = oflag; - - return result; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_close (pace_mqd_t mqdes) -{ - if (pace_pthread_mutex_lock (&( ((mqfile*)mqdes->mptr)->mutex)) == -1) - { - errno = EBADF; - return -1; - } - ((mqfile*)mqdes->mptr)->num_open--; - if (pace_pthread_mutex_unlock (&(((mqfile*)mqdes->mptr)->mutex)) == -1) - { - errno = EBADF; - return -1; - } - if (munmap (mqdes->mptr, mqdes->length) == -1) - { - return -1; - } - free (mqdes); - return 0; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_unlink (const char* name) -{ - int result1, result2; - char* new_name; - new_name = (char*) malloc (256); - snprintf (new_name, 256, "/tmp%s%s", name, PACE_MQ_DATAPOSTFIX); - result1 = pace_unlink (new_name); - snprintf (new_name, 256, "/tmp%s%s", name, PACE_MQ_LOCKPOSTFIX); - result2 = pace_unlink (new_name); - free (new_name); - return (result1 == -1 || result2 == -1 ? -1 : 0); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_send (pace_mqd_t mqdes, - const char* ptr, - pace_size_t length, - unsigned int priority) -{ - mqfile* queue = ((mqfile*)mqdes->mptr); - long index, old_index; - if (mqdes->oflag & O_RDONLY) - { - /* Incorrect access priviledges */ - errno = EBADF; - return -1; - } - if (queue->attr.mq_msgsize < (int) length) - { - /* Message too long */ - errno = EMSGSIZE; - return -1; - } - if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0) - { - return -1; - } - /* If the queue is full... */ - if (queue->attr.mq_curmsgs >= queue->attr.mq_maxmsg) - { - if (queue->attr.mq_flags & O_NONBLOCK) - { - errno = EAGAIN; - return -1; - } - while (queue->attr.mq_maxmsg <= queue->attr.mq_curmsgs) - { - pace_pthread_cond_wait (&queue->cond, &queue->mutex); - pace_printf ("Send Woke Up\n"); - } - } - - /* Fill in the fields of the header */ - ((message_header*)(&mqdes->mptr[queue->freelist]))->priority = priority; - ((message_header*)(&mqdes->mptr[queue->freelist]))->length = length; - pace_memcpy (((void*)(&mqdes->mptr[queue->freelist + sizeof (message_header)])), - ptr, length); - - /* Update the linked list */ - old_index = 0; - index = queue->head; - while (index != 0 && ((message_header*)(&mqdes->mptr[index]))->priority >= priority) - { - old_index = index; - index = ((message_header*)(&mqdes->mptr[index]))->next; - } - - /* If the msg goes at the head */ - if (old_index == 0) - { - queue->head = queue->freelist; - queue->freelist = ((message_header*)(&mqdes->mptr[queue->freelist]))->next; - ((message_header*)(&mqdes->mptr[queue->head]))->next = index; - } - else - { - ((message_header*)(&mqdes->mptr[old_index]))->next = queue->freelist; - old_index = queue->freelist; - queue->freelist = ((message_header*)(&mqdes->mptr[queue->freelist]))->next; - ((message_header*)(&mqdes->mptr[old_index]))->next = index; - } - - queue->attr.mq_curmsgs++; - - if ((errno = pace_pthread_mutex_unlock (&queue->mutex)) != 0) - { - return -1; - } - - if (queue->attr.mq_curmsgs == 1) - { - /* If there is no one waiting and blocked */ - if (queue->not_pid != 0 && queue->rec_wait == 0) - { - if (queue->notification.sigev_notify == SIGEV_SIGNAL) - { - sigqueue (queue->not_pid, - queue->notification.sigev_signo, - queue->notification.sigev_value); - } - queue->not_pid = 0; - } - else - { - pace_printf ("Send is Signalling\n"); - /* Let other waiting threads know there is food on the table */ - if ((errno = pace_pthread_cond_signal (&((mqfile*)mqdes->mptr)->cond)) != 0) - { - return -1; - } - } - } - return 0; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -pace_ssize_t mq_receive (pace_mqd_t mqdes, - char * msg_ptr, - pace_size_t msg_len, - unsigned int * nmsg_prio) -{ - mqfile* queue = ((mqfile*)mqdes->mptr); - pace_size_t temp; - - if (queue->attr.mq_msgsize > (long) msg_len) - { - errno = EMSGSIZE; - return -1; - } - - if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0) - { - return -1; - } - - /* If the queue is empty... */ - if (queue->attr.mq_curmsgs <= 0) - { - if (queue->attr.mq_flags & O_NONBLOCK) - { - errno = EAGAIN; - return -1; - } - while (queue->attr.mq_curmsgs <= 0) - { - pace_printf ("Recv is going to sleep\n"); - queue->rec_wait++; - pace_pthread_cond_wait (&(queue->cond), &(queue->mutex)); - queue->rec_wait--; - pace_printf ("Recv is waking from sleep\n"); - } - } - - if (nmsg_prio != 0) - { - *nmsg_prio = ((message_header*)(&mqdes->mptr[queue->head]))->priority; - } - - pace_memcpy (msg_ptr, ((void*)(&mqdes->mptr[queue->head + sizeof (message_header)])), - ((message_header*)(&mqdes->mptr[queue->head]))->length); - temp = queue->head; - queue->head = ((message_header*)(&mqdes->mptr[queue->head]))->next; - ((message_header*)(&mqdes->mptr[temp]))->next = queue->freelist; - queue->freelist = temp; - - queue->attr.mq_curmsgs--; - - if (pace_pthread_mutex_unlock (&queue->mutex) == -1) - { - errno = EBADMSG; - return -1; - } - - if (queue->attr.mq_curmsgs == (queue->attr.mq_maxmsg-1)) - { - pace_printf ("Recv is signalling\n"); - /* Let other waiting threads know there is room available */ - if ((errno = pace_pthread_cond_signal (&((mqfile*)mqdes->mptr)->cond)) != 0) - { - return -1; - } - } - - return ((message_header*)(&mqdes->mptr[queue->head]))->length; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_getattr (pace_mqd_t mqdes, pace_mq_attr * mqstat) -{ - mqfile* queue = ((mqfile*)mqdes->mptr); - - if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0) - { - return -1; - } - - *mqstat = queue->attr; - - pace_pthread_mutex_unlock (&queue->mutex); - - return 0; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_setattr(pace_mqd_t mqdes, - const pace_mq_attr * mqstat, - pace_mq_attr * omqstat) -{ - mqfile* queue = ((mqfile*)(mqdes->mptr)); - - if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0) - { - return -1; - } - if (omqstat != 0) - { - *omqstat = ((mqfile*)mqdes->mptr)->attr; - } - if (mqstat == 0 || mqdes == 0) - { - /* You eediot*/ - errno = EFAULT; - pace_pthread_mutex_unlock (&queue->mutex); - return -1; - } - - ((mqfile*)mqdes->mptr)->attr.mq_flags = mqstat->mq_flags; - - pace_pthread_mutex_unlock (&queue->mutex); - return 0; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_notify (pace_mqd_t mqd, const pace_sigevent* notification) -{ - mqfile* queue = ((mqfile*)(mqd->mptr)); - pace_pid_t pid = pace_getpid (); - - if ((errno = pace_pthread_mutex_lock (&queue->mutex)) != 0) - { - return -1; - } - - if (notification == 0) - { - /* Unregister if notification is null */ - if (queue->not_pid == pid) - { - queue->not_pid = 0; - } - } - else - { - if (queue->not_pid && pace_kill (queue->not_pid, 0)) - { - /* If another process is registered */ - if (errno != ESRCH) - { - pace_pthread_mutex_unlock (&queue->mutex); - return -1; - } - } - queue->not_pid = pid; - queue->notification = *notification; - } - - pthread_mutex_unlock (&queue->mutex); - - return 0; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/emulation/mqueue.h b/PACE/pace/emulation/mqueue.h deleted file mode 100644 index 539f0c19e90..00000000000 --- a/PACE/pace/emulation/mqueue.h +++ /dev/null @@ -1,95 +0,0 @@ -/* $Id$ - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/emulation/mqueue.h - * - * = AUTHOR - * John Heitmann - * - * = DESCRIPTION - * An implementation of POSIX message queues originally built for Linux, - * which lacks mqueue.h. Some ideas were taken from the W. Richard Stevens - * book Unix Network Programming Interprocess Communications Volume 2 - * Second Edition. - * Memory Mapped io is used to enable a quick but persistent queue. - * - * ============================================================================ */ - -#ifndef PACE_EMU_MQUEUE_H -#define PACE_EMU_MQUEUE_H - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_MQ_ATTR -typedef struct mq_attr -{ - long mq_flags; - long mq_maxmsg; - long mq_msgsize; - long mq_curmsgs; -} pace_mq_attr; - -struct mqd -{ - long length; - int oflag; - char* mptr; -}; - -#define PACE_MQD_T -typedef struct mqd* pace_mqd_t; - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -pace_mqd_t mq_open (const char* name, - int oflag, - pace_mode_t mode, - pace_mq_attr* attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_close (pace_mqd_t mqdes); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_unlink (const char* name); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_send (pace_mqd_t mqdes, - const char* ptr, - pace_size_t length, - unsigned int priority); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -pace_ssize_t mq_receive (pace_mqd_t mqdes, - char * msg_ptr, - pace_size_t msg_len, - unsigned int * nmsg_prio); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_getattr (pace_mqd_t mqdes, pace_mq_attr * mqstat); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_setattr(pace_mqd_t mqdes, - const pace_mq_attr * mqstat, - pace_mq_attr * omqstat); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int mq_notify (pace_mqd_t mqd, const pace_sigevent* notification); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_EMU_MQUEUE_H */ diff --git a/PACE/pace/emulation/time.h b/PACE/pace/emulation/time.h deleted file mode 100644 index f4784190c81..00000000000 --- a/PACE/pace/emulation/time.h +++ /dev/null @@ -1,46 +0,0 @@ -/* $Id$ - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/emulation/time.h - * - * = AUTHOR - * John Heitmann - * - * ============================================================================ */ - -#ifndef PACE_EMU_TIME_H -#define PACE_EMU_TIME_H - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_EMU_CLOCKID_T -#define PACE_EMU_CLOCKID_T - typedef int pace_emu_clockid_t; -#endif /* PACE_EMU_CLOCKID_T */ - -#ifndef PACE_EMU_TIMER_T -#define PACE_EMU_TIMER_T - typedef int pace_emu_timer_t; -#endif /* PACE_EMU_TIMER_T */ - -#ifndef PACE_EMU_ITIMERSPEC -#define PACE_EMU_ITIMERSPEC - typedef struct emu_itimerspec {} pace_emu_itimerspec; -#endif /* PACE_EMU_ITIMERSPEC */ - -#ifndef PACE_EMU_TIMESPEC -#define PACE_EMU_TIMESPEC - typedef struct emu_timespec {} pace_emu_timespec; -#endif /* PACE_EMU_TIMESPEC */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_EMU_TIME_H */ diff --git a/PACE/pace/errno.h b/PACE/pace/errno.h deleted file mode 100644 index ae4f6bd4344..00000000000 --- a/PACE/pace/errno.h +++ /dev/null @@ -1,37 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/errno.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_ERRNO_H -#define PACE_ERRNO_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/errno.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/errno.h" -#elif (PACE_WIN32) -# include "pace/win32/errno.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_ERRNO_H */ diff --git a/PACE/pace/fcntl.h b/PACE/pace/fcntl.h deleted file mode 100644 index 43d85574b26..00000000000 --- a/PACE/pace/fcntl.h +++ /dev/null @@ -1,94 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/fnctl.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_FCNTL_H -#define PACE_FCNTL_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/fcntl.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/fcntl.h" -#elif (PACE_WIN32) -# include "pace/win32/fcntl.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function creat. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.3.2. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_creat (const char * path, pace_mode_t mode); - /* WIN32 doesn't correctly return a file desciptor. WIN32 doesn't use - integers to represent file handles. Instead, we return 1 for success - and -1 for failure. - */ -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function fcntl. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.5.2. - */ -#if (PACE_HAS_POSIX_FM_UOF) - /* int fcntl (int fildes, int cmd, *//* arg *//* ... ); */ -# if defined (PACE_WIN32) - int fcntl (PACE_HANDLE fildes, int cmd, /* arg */ ... ); -# endif /* PACE_WIN32 */ - -# if defined (PACE_VXWORKS) && PACE_VXWORKS - PACE_Export PACE_INLINE int pace_fcntl(PACE_HANDLE fildes, - int cmd, - long arg); -# else -# define pace_fcntl fcntl -# endif /* ! PACE_VXWORKS */ -#endif /* PACE_HAS_POSIX_FM_UOF */ - - /** - PACE's implementation of the POSIX function open. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.3.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - /* int open (const char *path, int oflag, *//* pace_mode_t mode *//* ... );*/ -# if defined (PACE_HAS_CPLUPLUS) -# define pace_open ::open -# else -# define pace_open open -# endif /* PACE_HAS_CPLUSPLUS */ -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/fcntl.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/fcntl.inl" -# elif (PACE_WIN32) -# include "pace/win32/fcntl.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_FCNTL_H_INDIRECT */ diff --git a/PACE/pace/grp.h b/PACE/pace/grp.h deleted file mode 100644 index eab5aba2b7c..00000000000 --- a/PACE/pace/grp.h +++ /dev/null @@ -1,93 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/grp.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_GRP_H -#define PACE_GRP_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/grp.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/grp.h" -#elif (PACE_WIN32) -# include "pace/win32/grp.h" -#endif - -# if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -# endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function getgrgid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 9.2.1. - */ -#if (PACE_HAS_POSIX_SD_UOF) - PACE_Export PACE_INLINE pace_group * pace_getgrgid (pace_gid_t gid); -#endif /* PACE_HAS_POSIX_SD_UOF */ - - /** - PACE's implementation of the POSIX function getgrgid_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 9.2.1. - */ -#if (PACE_HAS_POSIX_SDR_UOF) - PACE_Export PACE_INLINE int pace_getgrgid_r (pace_gid_t gid, - pace_group * grp, - char * buffer, - size_t bufsize, - pace_group ** result); -#endif /* PACE_HAS_POSIX_SDR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - /** - PACE's implementation of the POSIX function getgrnam. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 9.2.1. - */ -#if (PACE_HAS_POSIX_SD_UOF) - PACE_Export PACE_INLINE pace_group * pace_getgrnam (const char * name); -#endif /* PACE_HAS_POSIX_SD_UOF */ - - /** - PACE's implementation of the POSIX function getgrnam_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 9.2.1. - */ -#if (PACE_HAS_POSIX_SDR_UOF) - PACE_Export PACE_INLINE int pace_getgrnam_r (const char * name, - pace_group * grp, - char * buffer, - size_t bufsize, - pace_group ** result); -#endif /* PACE_HAS_POSIX_SDR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/grp.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/grp.inl" -# elif (PACE_WIN32) -# include "pace/win32/grp.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_GRP_H */ diff --git a/PACE/pace/limits.h b/PACE/pace/limits.h deleted file mode 100644 index 9e13488b1fa..00000000000 --- a/PACE/pace/limits.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/limits.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_LIMITS_H_INDIRECT -#define PACE_LIMITS_H_INDIRECT - -#include "pace/config/defines.h" - -#if defined (PACE_HAS_POSIX) -# include "pace/posix/limits.h" -#elif defined (PACE_VXWORKS) -# include "pace/vxworks/limits.h" -#elif defined (PACE_WIN32) -# include "pace/win32/limits.h" -#endif - -#endif /* PACE_LIMITS_H_INDIRECT */ diff --git a/PACE/pace/locale.h b/PACE/pace/locale.h deleted file mode 100644 index 0435a4a7370..00000000000 --- a/PACE/pace/locale.h +++ /dev/null @@ -1,65 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/locale.h - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#ifndef PACE_LOCALE_H -#define PACE_LOCALE_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/locale.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/locale.h" -#elif (PACE_WIN32) -# include "pace/win32/locale.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - Fills in pace_lconv with values consistent with the - current locality. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE pace_lconv* pace_localeconv (void); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function setlocale. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1.2. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE char * pace_setlocale (int category, - const char * locale); -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/locale.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/locale.inl" -# elif (PACE_WIN32) -# include "pace/win32/locale.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_LOCALE_H */ diff --git a/PACE/pace/man/Makefile b/PACE/pace/man/Makefile deleted file mode 100644 index 8203d2d650c..00000000000 --- a/PACE/pace/man/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the PACE html man pages -# The man pages are generated from the POSIX header files. -#---------------------------------------------------------------------------- - -PACE_DOC++ = /project/doc/pkg/bin/doc++ -index.html: - $(PACE_DOC++) -H -F -B banner ../*.h - -clean: - $(RM) *.html *.gif *.class *.tex *.db .html diff --git a/PACE/pace/man/banner b/PACE/pace/man/banner deleted file mode 100644 index 668e1f5de5d..00000000000 --- a/PACE/pace/man/banner +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/PACE/pace/man/pace.jpg b/PACE/pace/man/pace.jpg deleted file mode 100644 index 62bc7130603..00000000000 Binary files a/PACE/pace/man/pace.jpg and /dev/null differ diff --git a/PACE/pace/math.h b/PACE/pace/math.h deleted file mode 100644 index 44e23ee09e2..00000000000 --- a/PACE/pace/math.h +++ /dev/null @@ -1,245 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = Filename - * pace/math.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_MATH_H -#define PACE_MATH_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/math.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/math.h" -#elif (PACE_WIN32) -# include "pace/win32/math.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function acos. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_acos (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function asin. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_asin (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function atan. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_atan (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function atan2. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_atan2 (double x, double y); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function cos. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_cos (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function sin. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_sin (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function tan. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_tan (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function cosh. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_cosh (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function sinh. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_sinh (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function tanh. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_tanh (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function exp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_exp (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function frexp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_frexp (double x, int * exp); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function ldexp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_ldexp (double x, int exp); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function log. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_log (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function log10. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_log10 (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function modf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_modf (double x, double * iptr); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function pow. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_pow (double x, double y); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function sqrt. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_sqrt (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function ceil. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_ceil (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function fabs. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_fabs (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function floor. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_floor (double x); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function fmod. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_fmod (double x, double y); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/math.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/math.inl" -# elif (PACE_WIN32) -# include "pace/win32/math.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_MATH_H */ diff --git a/PACE/pace/mqueue.h b/PACE/pace/mqueue.h deleted file mode 100644 index c799567c968..00000000000 --- a/PACE/pace/mqueue.h +++ /dev/null @@ -1,131 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/mqueue.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_MQUEUE_H -#define PACE_MQUEUE_H - -#include "pace/config/defines.h" -#include "pace/signal.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/mqueue.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/mqueue.h" -#elif (PACE_WIN32) -# include "pace/win32/mqueue.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function mq_close. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 15.2.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mq_close (pace_mqd_t mqdes); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function mq_getattr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 15.2.8. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mq_getattr (pace_mqd_t mqdes, - pace_mq_attr * mqstat); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function mq_notify. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 15.2.6. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mq_notify (pace_mqd_t mqdes, - const pace_sigevent * notification); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function mq_open. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 15.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -# define pace_mq_open mq_open -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - /* mqd_t mq_open (const char *name, int oflag, (*//* args *//*) ... ); */ - - /** - PACE's implementation of the POSIX function mq_receive. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 15.2.5. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE pace_ssize_t pace_mq_receive (pace_mqd_t mqdes, - char * msg_ptr, - pace_size_t msg_len, - unsigned int * nmsg_prio); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function mq_send. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 15.2.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mq_send (pace_mqd_t mqdes, - const char * mst_ptr, - pace_size_t msg_len, - unsigned int psg_prio); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function mq_setattr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 15.2.7. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mq_setattr (pace_mqd_t mqdes, - const pace_mq_attr * mqstat, - pace_mq_attr * omqstat); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function mq_unlink. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 15.2.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mq_unlink (const char * name); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/mqueue.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/mqueue.inl" -# elif (PACE_WIN32) -# include "pace/win32/mqueue.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_MQUEUE_H */ diff --git a/PACE/pace/posix/Makefile.am b/PACE/pace/posix/Makefile.am deleted file mode 100644 index d50c7d6885b..00000000000 --- a/PACE/pace/posix/Makefile.am +++ /dev/null @@ -1,113 +0,0 @@ -##--------------------------------------------------------------------------- -## $Id$ -## -## Makefile for the PACE C library -## -##--------------------------------------------------------------------------- - -## -## 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 - -## Create a libtool convenience library that contains the contents of -## the POSIX-specific version of PACE. -noinst_LTLIBRARIES = libPACE_POSIX.la - -libPACE_POSIX_la_SOURCES = \ - aio.c \ - assert.c \ - ctype.c \ - dirent.c \ - fcntl.c \ - grp.c \ - locale.c \ - math.c \ - mman.c \ - mqueue.c \ - pthread.c \ - pwd.c \ - sched.c \ - semaphore.c \ - setjmp.c \ - signal.c \ - stat.c \ - stdio.c \ - stdlib.c \ - string.c \ - termios.c \ - time.c \ - times.c \ - unistd.c \ - utime.c \ - utsname.c \ - wait.c - -PACE_INLINE_FILES = \ - aio.inl \ - assert.inl \ - ctype.inl \ - dirent.inl \ - fcntl.inl \ - grp.inl \ - locale.inl \ - math.inl \ - mman.inl \ - mqueue.inl \ - pthread.inl \ - pwd.inl \ - sched.inl \ - semaphore.inl \ - setjmp.inl \ - signal.inl \ - stat.inl \ - stdio.inl \ - stdlib.inl \ - string.inl \ - termios.inl \ - time.inl \ - times.inl \ - unistd.inl \ - utime.inl \ - utsname.inl \ - wait.inl - -PACE_HEADER_FILES = \ - aio.h \ - assert.h \ - ctype.h \ - dirent.h \ - errno.h \ - fcntl.h \ - grp.h \ - limits.h \ - locale.h \ - math.h \ - mman.h \ - mqueue.h \ - pthread.h \ - pwd.h \ - sched.h \ - semaphore.h \ - setjmp.h \ - signal.h \ - stat.h \ - stdio.h \ - stdlib.h \ - string.h \ - termios.h \ - time.h \ - times.h \ - types.h \ - unistd.h \ - utime.h \ - utsname.h \ - wait.h - -pkgincludedir = $(includedir)/$(PACKAGE)/posix -pkginclude_HEADERS = \ - $(PACE_INLINE_FILES) \ - $(PACE_HEADER_FILES) diff --git a/PACE/pace/posix/README b/PACE/pace/posix/README deleted file mode 100644 index 0116632c065..00000000000 --- a/PACE/pace/posix/README +++ /dev/null @@ -1 +0,0 @@ -POSIX dir diff --git a/PACE/pace/posix/TODO b/PACE/pace/posix/TODO deleted file mode 100644 index 6141d90a333..00000000000 --- a/PACE/pace/posix/TODO +++ /dev/null @@ -1,7 +0,0 @@ -$ID$ - -Testing -======= -Test PACE libraries with and without PACE_HAS_POSIX_PTHREAD_SEMANTICS -defined. There are some functions (e.g., in time.h) that have been -changed because it looked like they didn't need this guard. diff --git a/PACE/pace/posix/aio.c b/PACE/pace/posix/aio.c deleted file mode 100644 index d2f62e92389..00000000000 --- a/PACE/pace/posix/aio.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/aio.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/aio.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/aio.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/aio.h b/PACE/pace/posix/aio.h deleted file mode 100644 index 75a11416cc7..00000000000 --- a/PACE/pace/posix/aio.h +++ /dev/null @@ -1,45 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/aio.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_AIO_H_POSIX -#define PACE_AIO_H_POSIX - -#include -#include "pace/time.h" -#include "pace/signal.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_AIO_ALLDONE AIO_ALLDONE -#define PACE_AIO_CANCELED AIO_CANCELED -#define PACE_AIO_NOCANCELED AIO_NOTCANCELED -#define PACE_LIO_NOP LIO_NOP -#define PACE_LIO_NOWAIT LIO_NOWAIT -#define PACE_LIO_READ LIO_READ -#define PACE_LIO_WAIT LIO_WAIT -#define PACE_LIO_WRITE LIO_WRITE - -#ifndef PACE_AIOCB -#define PACE_AIOCB -typedef struct aiocb pace_aiocb; -#endif /* PACE_AIOCB */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_AIO_H_POSIX */ diff --git a/PACE/pace/posix/aio.inl b/PACE/pace/posix/aio.inl deleted file mode 100644 index d219c0cabf9..00000000000 --- a/PACE/pace/posix/aio.inl +++ /dev/null @@ -1,94 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/aio.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_cancel (PACE_HANDLE fildes, pace_aiocb * aiocbp) -{ - return aio_cancel (fildes, aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_error (const pace_aiocb * aiocbp) -{ - return aio_error (PACE_NONCONST_ARG_CAST (struct aiocb *) aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_fsync (int op, pace_aiocb * aiocbp) -{ - return aio_fsync (op, aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_read (pace_aiocb * aiocbp) -{ - return aio_read (aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_return (pace_aiocb * aiocbp) -{ - return aio_return (aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_suspend (const pace_aiocb * const list[], - int nent, - const pace_timespec * timeout) -{ - return aio_suspend (PACE_AIO_SUSPEND_LIST_ARG_CAST list, - nent, - PACE_NONCONST_ARG_CAST (struct timespec *) timeout); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_write (pace_aiocb * aiocbp) -{ - return aio_write (aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_lio_listio (int mode, - pace_aiocb * const list[], - int nent, - pace_sigevent * sig) -{ - return lio_listio (mode, PACE_NONCONST_ARG_CAST (struct aiocb **) list, - nent, sig); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/posix/assert.c b/PACE/pace/posix/assert.c deleted file mode 100644 index 368fd0a62f6..00000000000 --- a/PACE/pace/posix/assert.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/assert.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/assert.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/assert.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/assert.h b/PACE/pace/posix/assert.h deleted file mode 100644 index 08c8b075cea..00000000000 --- a/PACE/pace/posix/assert.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/assert.h - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#ifndef PACE_ASSERT_H_POSIX -#define PACE_ASSERT_H_POSIX - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_ASSERT_H_POSIX */ diff --git a/PACE/pace/posix/assert.inl b/PACE/pace/posix/assert.inl deleted file mode 100644 index cc7974093d0..00000000000 --- a/PACE/pace/posix/assert.inl +++ /dev/null @@ -1,14 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/assert.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ diff --git a/PACE/pace/posix/ctype.c b/PACE/pace/posix/ctype.c deleted file mode 100644 index 7bf7d34ae07..00000000000 --- a/PACE/pace/posix/ctype.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/ctype.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/ctype.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/ctype.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/ctype.h b/PACE/pace/posix/ctype.h deleted file mode 100644 index 88c47c8e8cb..00000000000 --- a/PACE/pace/posix/ctype.h +++ /dev/null @@ -1,27 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/ctype.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CTYPE_H_POSIX -#define PACE_CTYPE_H_POSIX - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_CTYPE_H_POSIX */ diff --git a/PACE/pace/posix/ctype.inl b/PACE/pace/posix/ctype.inl deleted file mode 100644 index 538164bda4d..00000000000 --- a/PACE/pace/posix/ctype.inl +++ /dev/null @@ -1,133 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/ctype.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isalnum (int c) -{ - return isalnum (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isalpha (int c) -{ - return isalpha (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_iscntrl (int c) -{ - return iscntrl (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isdigit (int c) -{ - return isdigit (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isgraph (int c) -{ - return isgraph (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_islower (int c) -{ - return islower (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isprint (int c) -{ - return isprint (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_ispunct (int c) -{ - return ispunct (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isspace (int c) -{ - return isspace (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isupper (int c) -{ - return isupper (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isxdigit (int c) -{ - return isxdigit (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_tolower (int c) -{ - return tolower (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_toupper (int c) -{ - return toupper (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/posix/dirent.c b/PACE/pace/posix/dirent.c deleted file mode 100644 index d04ea9c1ac9..00000000000 --- a/PACE/pace/posix/dirent.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/dirent.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/dirent.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/dirent.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/dirent.h b/PACE/pace/posix/dirent.h deleted file mode 100644 index 5662910233a..00000000000 --- a/PACE/pace/posix/dirent.h +++ /dev/null @@ -1,40 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/dirent.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_DIRENT_H_POSIX -#define PACE_DIRENT_H_POSIX - -#include "pace/sys/types.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_DIR_T -#define PACE_DIR_T -typedef DIR PACE_DIR; -#endif /* PACE_DIR_T */ - -#ifndef PACE_DIRENT -#define PACE_DIRENT -typedef struct dirent pace_dirent; -#endif /* PACE_DIRENT */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_DIRENT_H_POSIX */ diff --git a/PACE/pace/posix/dirent.inl b/PACE/pace/posix/dirent.inl deleted file mode 100644 index 084b43e591c..00000000000 --- a/PACE/pace/posix/dirent.inl +++ /dev/null @@ -1,68 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/dirent.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -PACE_DIR * -pace_opendir (const char * dirname) -{ - return opendir (dirname); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -pace_dirent * -pace_readdir (PACE_DIR * dirp) -{ - return readdir (dirp); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -int -pace_readdir_r (PACE_DIR * dirp, pace_dirent * entry, - pace_dirent ** result) -{ -#if (PACE_LYNXOS) - *result = readdir_r (dirp, entry); - if (*result == 0) - return errno; - return 0; -#else - return readdir_r (dirp, entry, result); -#endif /* PACE_LYNXOS */ -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -void -pace_rewinddir (PACE_DIR * dirp) -{ - rewinddir (dirp); - return; -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_closedir (PACE_DIR * dirp) -{ - return closedir (dirp); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/posix/errno.h b/PACE/pace/posix/errno.h deleted file mode 100644 index 08595910435..00000000000 --- a/PACE/pace/posix/errno.h +++ /dev/null @@ -1,76 +0,0 @@ -/* $Id$ - -* ============================================================================ -* -* = LIBRARY -* pace -* -* = FILENAME -* pace/posix/errno.h -* -* = AUTHOR -* John Heitmann -* -* =========================================================================== *\ -/ - -#ifndef PACE_ERRNO_H_POSIX -#define PACE_ERRNO_H_POSIX - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_E2BIG E2BIG -#define PACE_EACCES EACCES -#define PACE_EAGAIN EAGAIN -#define PACE_EBADF EBADF -#define PACE_EBADMSG -#define PACE_EBUSY EBUSY -#define PACE_ECANCELED ECANCELED -#define PACE_ECHILD ECHILD -#define PACE_EDEADLK EDEADLK -#define PACE_EDOM EDOM -#define PACE_EEXIST EEXIST -#define PACE_EFAULT EFAULT -#define PACE_EFBIG EFBIG -#define PACE_EINPROGRESS EINPROGRESS -#define PACE_EINTR EINTR -#define PACE_EINVAL EINVAL -#define PACE_EIO EIO -#define PACE_EISDIR EISDIR -#define PACE_EMFILE EMFILE -#define PACE_EMLINK EMLINK -#define PACE_EMSGSIZE EMSGSIZE -#define PACE_EENAMETOOLONG ENAMETOOLONG -#define PACE_ENFILE ENFILE -#define PACE_ENODEV ENODEV -#define PACE_ENOENT ENOENT -#define PACE_ENOEXEC ENOEXEC -#define PACE_ENOLCK ENOLCK -#define PACE_ENOMEM ENOMEM -#define PACE_ENOSPC ENOSPC -#define PACE_ENOSYS ENOSYS -#define PACE_ENOTDIR ENOTDIR -#define PACE_ENOTEMPTY ENOTEMPTY -#define PACE_ENOTSUP ENOTSUP -#define PACE_ENOTTY ENOTTY -#define PACE_ENXIO ENXIO -#define PACE_EPERM EPERM -#define PACE_EPIPE EPIPE -#define PACE_ERANGE ERANGE -#define PACE_EROFS EROFS -#define PACE_ESPIPE ESPIPE -#define PACE_ESRCH ESRCH -#define PACE_ETIMEDOUT ETIMEDOUT -#define PACE_EXDEV EXDEV - -#define pace_errno errno - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_ERRNO_H_POSIX */ diff --git a/PACE/pace/posix/fcntl.c b/PACE/pace/posix/fcntl.c deleted file mode 100644 index 69183a1ba35..00000000000 --- a/PACE/pace/posix/fcntl.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/fcntl.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/fcntl.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/fcntl.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/fcntl.h b/PACE/pace/posix/fcntl.h deleted file mode 100644 index fc57bc098e3..00000000000 --- a/PACE/pace/posix/fcntl.h +++ /dev/null @@ -1,63 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/fnctl.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_FCNTL_H_POSIX -#define PACE_FCNTL_H_POSIX - -#include "pace/sys/types.h" -#include "pace/unistd.h" -#include "pace/sys/stat.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_FD_CLOEXEC FD_CLOEXEC -#define PACE_F_DUPFD D_DUPFD -#define PACE_F_GETFD F_GETFD -#define PACE_F_GETFL F_GETFL -#define PACE_F_GETLK F_GETLK -#define PACE_F_RDLCK F_RDLCK -#define PACE_F_SETFD F_SETFD -#define PACE_F_SETFL F_SETFL -#define PACE_F_SETLK F_SETLK -#define PACE_F_SETLKW F_SETLKW -#define PACE_F_UNLCK F_UNLCK -#define PACE_F_WRLCK F_WRLCK -#define PACE_O_ACCMODE O_ACCMODE -#define PACE_O_APPEND O_APPEND -#define PACE_O_CREAT O_CREAT -#define PACE_O_DSYNC O_DSYNC -#define PACE_O_EXCL O_EXCL -#define PACE_O_NOCTTY O_NOCTTY -#define PACE_O_NONBLOCK O_NONBLOCK -#define PACE_O_RDONLY O_RDONLY -#define PACE_O_RDWR O_RDWR -#define PACE_O_RSYNC O_RSYNC -#define PACE_O_SYNC O_SYNC -#define PACE_O_TRUNC O_TRUNC -#define PACE_O_WRONLY O_WRONLY - -#ifndef PACE_FLOCK -#define PACE_FLOCK -typedef struct flock pace_flock; -#endif /* PACE_FLOCK */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_FCNTL_H_POSIX */ diff --git a/PACE/pace/posix/fcntl.inl b/PACE/pace/posix/fcntl.inl deleted file mode 100644 index 01a7e732294..00000000000 --- a/PACE/pace/posix/fcntl.inl +++ /dev/null @@ -1,23 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/fcntl.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_creat (const char * path, pace_mode_t mode) -{ - return creat (path, mode); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/posix/grp.c b/PACE/pace/posix/grp.c deleted file mode 100644 index 59b11cbb739..00000000000 --- a/PACE/pace/posix/grp.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/grp.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/grp.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/grp.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/grp.h b/PACE/pace/posix/grp.h deleted file mode 100644 index 38be525562f..00000000000 --- a/PACE/pace/posix/grp.h +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace (posix ace) - * - * = FILENAME - * pace/posix/grp.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_GRP_H_POSIX -#define PACE_GRP_H_POSIX - -#include - -# if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -# endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_GROUP -#define PACE_GROUP -typedef struct group pace_group; -#endif /* PACE_GROUP */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_GRP_H_POSIX */ diff --git a/PACE/pace/posix/grp.inl b/PACE/pace/posix/grp.inl deleted file mode 100644 index fcac3d5f1fd..00000000000 --- a/PACE/pace/posix/grp.inl +++ /dev/null @@ -1,73 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/grp.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_group * -pace_getgrgid (pace_gid_t gid) -{ - return getgrgid (gid); -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getgrgid_r (pace_gid_t gid, - pace_group * grp, - char * buffer, - size_t bufsize, - pace_group ** result) -{ -#if (PACE_LYNXOS) - *result = getgrgid_r (grp, gid, buffer, bufsize); - if (*result == 0) - return errno; - return 0; -#else - return getgrgid_r (gid, grp, buffer, bufsize, result); -#endif /* ! PACE_LYNXOS */ -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_group * -pace_getgrnam (const char * name) -{ - return getgrnam (name); -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getgrnam_r (const char * name, - pace_group * grp, - char * buffer, - size_t bufsize, - pace_group ** result) -{ -#if (PACE_LYNXOS) - *result = getgrnam_r (grp, PACE_NONCONST_ARG_CAST (char *) name, - buffer, bufsize); - if (*result == 0) - return errno; - return 0; -#else - return getgrnam_r (name, grp, buffer, bufsize, result); -#endif /* ! PACE_LYNXOS */ -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ diff --git a/PACE/pace/posix/limits.h b/PACE/pace/posix/limits.h deleted file mode 100644 index fb952113bbd..00000000000 --- a/PACE/pace/posix/limits.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace (posix ace) - * - * = FILENAME - * pace/posix/limits.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_LIMITS_H -#define PACE_LIMITS_H - -#include - -# if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -# endif /* (PACE_HAS_CPLUSPLUS) */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_LIMITS_H */ diff --git a/PACE/pace/posix/locale.c b/PACE/pace/posix/locale.c deleted file mode 100644 index 3f818716eda..00000000000 --- a/PACE/pace/posix/locale.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/locale.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/locale.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/locale.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/locale.h b/PACE/pace/posix/locale.h deleted file mode 100644 index 704d23d3c96..00000000000 --- a/PACE/pace/posix/locale.h +++ /dev/null @@ -1,40 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/locale.h - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#ifndef PACE_LOCALE_H_POSIX -#define PACE_LOCALE_H_POSIX - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_LC_ALL LC_ALL -#define PACE_LC_COLLATE LC_COLLATE -#define PACE_LC_CTYPE LC_CTYPE -#define PACE_LC_MONETARY LC_MONETARY -#define PACE_LC_NUMERIC LC_NUMERIC -#define PACE_LC_TIME LC_TIME -#define PACE_NULL NULL - -#ifndef PACE_LCONV -#define PACE_LCONV -typedef struct lconv pace_lconv; -#endif /* PACE_LCONV */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_LOCALE_H_POSIX */ diff --git a/PACE/pace/posix/locale.inl b/PACE/pace/posix/locale.inl deleted file mode 100644 index ed0a94e319d..00000000000 --- a/PACE/pace/posix/locale.inl +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/locale.inl - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#include - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_lconv * -pace_localeconv (void) -{ - return localeconv (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -char * -pace_setlocale (int category, const char * locale) -{ - return setlocale (category, locale); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/PACE/pace/posix/math.c b/PACE/pace/posix/math.c deleted file mode 100644 index 8c2e32301fa..00000000000 --- a/PACE/pace/posix/math.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/math.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/math.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/math.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/math.h b/PACE/pace/posix/math.h deleted file mode 100644 index 34e68241bc7..00000000000 --- a/PACE/pace/posix/math.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/math.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_MATH_H_POSIX -#define PACE_MATH_H_POSIX - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_HUGE_VAL HUGE_VAL - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_MATH_H_POSIX */ diff --git a/PACE/pace/posix/math.inl b/PACE/pace/posix/math.inl deleted file mode 100644 index 29709c4dd95..00000000000 --- a/PACE/pace/posix/math.inl +++ /dev/null @@ -1,215 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/math.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -/* FUZZ: disable check_for_math_include */ -#include - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_acos (double x) -{ - return acos (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_asin (double x) -{ - return asin (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_atan (double x) -{ - return atan (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_atan2 (double x, double y) -{ - return atan2 (x, y); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_cos (double x) -{ - return cos (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_sin (double x) -{ - return sin (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_tan (double x) -{ - return tan (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_cosh (double x) -{ - return cosh (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_sinh (double x) -{ - return sinh (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_tanh (double x) -{ - return tanh (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_exp (double x) -{ - return exp (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_frexp (double x, int * exp) -{ - return frexp (x, exp); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_ldexp (double x, int exp) -{ - return ldexp (x, exp); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_log (double x) -{ - return log (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_log10 (double x) -{ - return log10 (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_modf (double x, double * iptr) -{ - return modf (x, iptr); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_pow (double x, double y) -{ - return pow (x, y); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_sqrt (double x) -{ - return sqrt (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_ceil (double x) -{ - return ceil (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_fabs (double x) -{ - return fabs (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_floor (double x) -{ - return floor (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_fmod (double x, double y) -{ - return fmod (x, y); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/posix/mman.c b/PACE/pace/posix/mman.c deleted file mode 100644 index b68b87baa22..00000000000 --- a/PACE/pace/posix/mman.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/mman.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/mman.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/mman.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/mman.h b/PACE/pace/posix/mman.h deleted file mode 100644 index f45efe48efa..00000000000 --- a/PACE/pace/posix/mman.h +++ /dev/null @@ -1,42 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/mman.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_MMAN_H_POSIX -#define PACE_SYS_MMAN_H_POSIX - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_MAP_FAILED MAP_FAILED -#define PACE_MAP_FIXED MAP_FIXED -#define PACE_MAP_PRIVATE MAP_PRIVATE -#define PACE_MAP_SHARED MAP_SHARED -#define PACE_MCL_CURRENT MCL_CURRENT -#define PACE_MS_ASYNC MS_ASYNC -#define PACE_MS_INVALIDATE -#define PACE_MS_SYNC MS_SYNC -#define PACE_PROT_EXEC PROT_EXEC -#define PACE_PROT_NONE PROT_NONE -#define PACE_PROT_READ PROT_READ -#define PACE_PROT_WRITE PROT_WRITE - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_MMAN_H_POSIX */ diff --git a/PACE/pace/posix/mman.inl b/PACE/pace/posix/mman.inl deleted file mode 100644 index a89782fa44e..00000000000 --- a/PACE/pace/posix/mman.inl +++ /dev/null @@ -1,127 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/mman.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mlock (const void * addr, pace_size_t len) -{ - return mlock (((char*)addr), len); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mlockall (int flags) -{ - return mlockall (flags); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_mmap (void * addr, - pace_size_t len, - int prot, - int flags, - PACE_HANDLE fildes, - pace_off_t off) -{ - return mmap ((char *) addr, len, prot, flags, fildes, off); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_munlock (const void * addr, pace_size_t len) -{ - return munlock (((char*)addr), len); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mprotect (void * addr, - pace_size_t len, - int prot) -{ - return mprotect ((char*)addr, len, prot); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_msync (void * addr, - pace_size_t len, - int flags) -{ - return msync ((char*)addr, len, flags); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_munlockall () -{ - return munlockall (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_munmap (void * addr, pace_size_t len) -{ - return munmap ((char *) addr, len); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -PACE_HANDLE -pace_shm_open (const char * name, - int oflag, - pace_mode_t mode) -{ -# if (PACE_POSIX_C_SOURCE > 2) - return shm_open (name, oflag, mode); -# else /* ! PACE_POSIX_C_SOURCE */ - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (oflag); - PACE_UNUSED_ARG (mode); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -# endif /* ! PACE_POSIX_C_SOURCE */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_shm_unlink (const char * name) -{ -# if (PACE_POSIX_C_SOURCE > 2) - return shm_unlink (name); -# else /* ! PACE_POSIX_C_SOURCE */ - PACE_UNUSED_ARG (name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -# endif /* ! PACE_POSIX_C_SOURCE */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/posix/mqueue.c b/PACE/pace/posix/mqueue.c deleted file mode 100644 index 596c75e3905..00000000000 --- a/PACE/pace/posix/mqueue.c +++ /dev/null @@ -1,24 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace (posix ace) - * - * = FILENAME - * pace/posix/mqueue.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/mqueue.h" - -#if PACE_LINUX -# include "pace/emulation/mqueue.c" -#endif /* PACE_LINUX */ - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/mqueue.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/mqueue.h b/PACE/pace/posix/mqueue.h deleted file mode 100644 index 66483f040cf..00000000000 --- a/PACE/pace/posix/mqueue.h +++ /dev/null @@ -1,43 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/mqueue.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_MQUEUE_H_POSIX -#define PACE_MQUEUE_H_POSIX - -#if PACE_LINUX -# include "pace/emulation/mqueue.h" -#else -# include -#endif /* PACE_LINUX */ - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_MQD_T -#define PACE_MQD_T - typedef mqd_t pace_mqd_t; -#endif /* PACE_MQD_T */ - -#ifndef PACE_MQ_ATTR -#define PACE_MQ_ATTR - typedef struct mq_attr pace_mq_attr; -#endif /* PACE_MQ_ATTR */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_MQUEUE_H_POSIX */ diff --git a/PACE/pace/posix/mqueue.inl b/PACE/pace/posix/mqueue.inl deleted file mode 100644 index 2459563e9b3..00000000000 --- a/PACE/pace/posix/mqueue.inl +++ /dev/null @@ -1,87 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/mqueue.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_close (pace_mqd_t mqdes) -{ - return mq_close (mqdes); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_getattr (pace_mqd_t mqdes, - pace_mq_attr * mqstat) -{ - return mq_getattr (mqdes, mqstat); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_notify (pace_mqd_t mqdes, - const pace_sigevent * notification) -{ - return mq_notify (mqdes, notification); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -ssize_t -pace_mq_receive (pace_mqd_t mqdes, - char * msg_ptr, - size_t msg_len, - unsigned int * msg_prio) -{ - return mq_receive (mqdes, msg_ptr, msg_len, msg_prio); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_send (pace_mqd_t mqdes, - const char * msg_ptr, - size_t msg_len, - unsigned int msg_prio) -{ - return mq_send (mqdes, msg_ptr, msg_len, msg_prio); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_setattr (pace_mqd_t mqdes, - const pace_mq_attr * mqstat, - pace_mq_attr * omqstat) -{ - return mq_setattr (mqdes, mqstat, omqstat); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_unlink (const char * name) -{ - return mq_unlink (name); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/posix/pthread.c b/PACE/pace/posix/pthread.c deleted file mode 100644 index 426c377c446..00000000000 --- a/PACE/pace/posix/pthread.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/pthread.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/pthread.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/pthread.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/pthread.h b/PACE/pace/posix/pthread.h deleted file mode 100644 index b998c50e7c1..00000000000 --- a/PACE/pace/posix/pthread.h +++ /dev/null @@ -1,81 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/pthread.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_PTHREAD_H_POSIX -#define PACE_PTHREAD_H_POSIX - -#include -#include "pace/sys/types.h" -#include "pace/signal.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_PTHREAD_CANCELED PTHREAD_CANCELED -#define PACE_PTHREAD_CANCEL_AYNCHRONOUS PTHREAD_CANCEL_ASYNCHRONOUS -#define PACE_PTHREAD_CANCEL_DEFERRED PTHREAD_CANCEL_DEFERRED -#define PACE_PTHREAD_CACEL_DISABLE PTHREAD_CANCEL_DISABLE -#define PACE_PTHREAD_CANCEL_ENABLE PTHREAD_CANCEL_ENABLE -#define PACE_PTHREAD_COND_INITIALIZER PTHREAD_COND_INITIALIZER -#define PACE_PTHREAD_CREATE_DETACHED PTHREAD_CREATE_DETACHED -#define PACE_PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_JOINABLE -#define PACE_PTHREAD_EXPLICIT_SCHED PTHREAD_EXPLICIT_SCHED -#define PACE_PTHREAD_INHERIT_SCHED PTHREAD_INHERIT_SCHED -#define PACE_PTHREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#define PACE_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT -#define PACE_PTHREAD_PRIO_INHERIT PTHREAD_PRIO_INHERIT -#define PACE_PTHREAD_PRIO_NONE PTHREAD_PRIO_NONE -#define PACE_PTHREAD_PRIO_PROTECT PTHREAD_PRIO_PROTECT -#define PACE_PTHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE -#define PACE_PTHREAD_PROCESS_SHARED PTHREAD_PROCESS_SHARED -#define PACE_PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS -#define PACE_PTHREAD_SCOPE_SYSTEM PTHREAD_SCOPE_SYSTEM - -#ifndef PACE_SCHED_PARAM -#define PACE_SCHED_PARAM - typedef struct sched_param pace_sched_param; -#endif /* PACE_SCHED_PARAM */ - -#if defined (PACE_HAS_CPLUSPLUS) -# ifndef PACE_ATFORK_PF -# define PACE_ATFORK_PF - typedef void (*pace_atfork_pf) (void); -# endif /* PACE_ATFORK_PF */ - -# ifndef PACE_KEYCREATE_PF -# define PACE_KEYCREATE_PF - typedef void (*pace_keycreate_pf) (void*); -# endif /* PACE_KEYCREATE_PF */ - -# ifndef PACE_ONCE_PF -# define PACE_ONCE_PF - typedef void (*pace_once_pf) (void); -# endif /* PACE_ONCE_PF */ - -# ifndef PACE_CREATE_PF -# define PACE_CREATE_PF - typedef void* (*pace_create_pf) (void*); -# endif /* PACE_CREATE_PF */ - -#endif /* PACE_HAS_CPLUPLUS */ - - - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_PTHREAD_H_POSIX */ diff --git a/PACE/pace/posix/pthread.inl b/PACE/pace/posix/pthread.inl deleted file mode 100644 index cb16f5b9575..00000000000 --- a/PACE/pace/posix/pthread.inl +++ /dev/null @@ -1,761 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/pthread.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/unistd.h" - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -# if defined (PACE_HAS_CPLUSPLUS) -PACE_INLINE -int -pace_pthread_atfork (pace_atfork_pf prepare, - pace_atfork_pf parent, - pace_atfork_pf child) -{ - return pthread_atfork (prepare, parent, child); -} -# else /* ! PACE_HAS_CPLUSPLUS */ -PACE_INLINE -int -pace_pthread_atfork (void (*prepare) (), - void (*parent) (), - void (*child) ()) -{ - return pthread_atfork (prepare, parent, child); -} -# endif /* PACE_HAS_CPLUSPLUS */ -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_destroy (pace_pthread_attr_t * attr) -{ - return pthread_attr_destroy (attr); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getdetachstate (const pace_pthread_attr_t * attr, - int * detachstate) -{ - return pthread_attr_getdetachstate (attr, detachstate); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getinheritsched (const pace_pthread_attr_t * attr, - int * inheritsched) -{ -#if PACE_LYNXOS == 0x300 - return pthread_attr_getinheritsched (PACE_NONCONST_ARG_CAST (pace_pthread_attr_t *) attr); -#else - return pthread_attr_getinheritsched (PACE_NONCONST_ARG_CAST (pace_pthread_attr_t *) attr, - inheritsched); -#endif /* PACE_LYNXOS != 0x300 */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getschedparam (const pace_pthread_attr_t * attr, - pace_sched_param * param) -{ - return pthread_attr_getschedparam (attr, param); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr, - int * policy) -{ - return pthread_attr_getschedpolicy (attr, policy); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getscope (const pace_pthread_attr_t * attr, - int * contentionscope) -{ - return pthread_attr_getscope (attr, contentionscope); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getstackaddr (const pace_pthread_attr_t * attr, - void ** stackaddr) -{ - return pthread_attr_getstackaddr (attr, stackaddr); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getstacksize (const pace_pthread_attr_t * attr, - size_t * stacksize) -{ -#if PACE_LYNXOS == 0x300 - return pthread_attr_getstacksize (PACE_NONCONST_ARG_CAST (pace_pthread_attr_t *) attr); -#else - return pthread_attr_getstacksize (PACE_NONCONST_ARG_CAST (pace_pthread_attr_t *) attr, - stacksize); -#endif /* PACE_LYNXOS != 0x300 */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_init (pace_pthread_attr_t * attr) -{ - return pthread_attr_init (attr); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setdetachstate (pace_pthread_attr_t * attr, - int detachstate) -{ - return pthread_attr_setdetachstate (attr, detachstate); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setinheritsched (pace_pthread_attr_t * attr, - int inheritsched) -{ - return pthread_attr_setinheritsched (attr, inheritsched); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setschedparam (pace_pthread_attr_t * attr, - const pace_sched_param * param) -{ - return pthread_attr_setschedparam (attr, param); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setschedpolicy (pace_pthread_attr_t * attr, - int policy) -{ - return pthread_attr_setschedpolicy (attr, policy); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setscope (pace_pthread_attr_t * attr, - int contentionscope) -{ - return pthread_attr_setscope (attr, contentionscope); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setstackaddr (pace_pthread_attr_t * attr, - void * stackaddr) -{ - return pthread_attr_setstackaddr (attr, stackaddr); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setstacksize (pace_pthread_attr_t * attr, - size_t stacksize) -{ - return pthread_attr_setstacksize (attr, stacksize); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cancel (pace_pthread_t thread) -{ - return pthread_cancel (thread); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_broadcast (pace_pthread_cond_t * cond) -{ - return pthread_cond_broadcast (cond); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_destroy (pace_pthread_cond_t * cond) -{ - return pthread_cond_destroy (cond); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_init (pace_pthread_cond_t * cond, - const pace_pthread_condattr_t * attr) -{ -#if PACE_LYNXOS == 0x300 - return pthread_cond_init (cond, *attr); -#else - return pthread_cond_init (cond, attr); -#endif /* PACE_LYNXOS != 0x300 */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_signal (pace_pthread_cond_t * cond) -{ - return pthread_cond_signal (cond); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_timedwait (pthread_cond_t * cond, - pace_pthread_mutex_t * mutex, - const pace_timespec * abstime) -{ - return pthread_cond_timedwait (cond, mutex, PACE_NONCONST_ARG_CAST (struct timespec *) abstime); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_wait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex) -{ - return pthread_cond_wait (cond, mutex); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_destroy (pace_pthread_condattr_t * attr) -{ - return pthread_condattr_destroy (attr); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_getpshared (const pace_pthread_condattr_t * attr, - int * pshared) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (pshared); - return -1; -#else - return pthread_condattr_getpshared (PACE_NONCONST_ARG_CAST (pace_pthread_condattr_t *) attr, pshared); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_init (pace_pthread_condattr_t * attr) -{ - return pthread_condattr_init (attr); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_setpshared (pace_pthread_condattr_t * attr, - int pshared) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (pshared); - return -1; -#else - return pthread_condattr_setpshared (attr, pshared); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -# if defined (PACE_HAS_CPLUSPLUS) -PACE_INLINE -int -pace_pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, - pace_create_pf start_routine, - void * arg) -{ - return pthread_create (thread, attr, start_routine, arg); -} -# else /* ! PACE_HAS_CPLUSPLUS */ -PACE_INLINE -int -pace_pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, - void * (*start_routine) (void*), - void * arg) -{ -#if PACE_LYNXOS == 0x300 - return pthread_create (thread, *attr, start_routine, arg); -#else - return pthread_create (thread, attr, start_routine, arg); -#endif /* PACE_LYNXOS != 0x300 */ -} -# endif /*! PACE_HAS_CPLUSPLUS */ -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_detach (pace_pthread_t thread) -{ -#if PACE_LYNXOS == 0x300 - return pthread_detach (&thread); -#else - return pthread_detach (thread); -#endif /* PACE_LYNXOS != 0x300 */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_equal (pace_pthread_t t1, pthread_t t2) -{ - return pthread_equal (t1, t2); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void -pace_pthread_exit (void * value_ptr) -{ - pthread_exit (value_ptr); - return; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_getschedparam (pace_pthread_t thread, - int * policy, - pace_sched_param * param) -{ - return pthread_getschedparam (thread, policy, param); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_pthread_getspecific (pace_pthread_key_t key) -{ -#if PACE_LYNXOS == 0x300 - void *value; - if (pthread_getspecific (key, &value) != 0) - return 0; - - return value; -#else - return pthread_getspecific (key); -#endif /* PACE_LYNXOS != 0x300 */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_join (pace_pthread_t thread, void ** value_ptr) -{ - return pthread_join (thread, value_ptr); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -# if defined (PACE_HAS_CPLUSPLUS) -PACE_INLINE -int -pace_pthread_key_create (pace_pthread_key_t * key, - pace_keycreate_pf destructor) -{ - return pthread_key_create (key, destructor); -} -#else /* ! PACE_HAS_CPLUSPLUS */ -PACE_INLINE -int -pace_pthread_key_create (pace_pthread_key_t * key, - void (*destructor)(void*)) -{ - return pthread_key_create (key, destructor); -} -# endif /* PACE_HAS_CPLUSPLUS */ -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_key_delete (pace_pthread_key_t key) -{ - return pthread_key_delete (key); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_kill (pace_pthread_t thread, int sig) -{ - return pthread_kill (thread, sig); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_destroy (pace_pthread_mutex_t * mutex) -{ - return pthread_mutex_destroy (mutex); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_getprioceiling (pace_pthread_mutex_t * mutex, - int * prioceiling) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (mutex); - PACE_UNUSED_ARG (prioceiling); - return -1; -#elif PACE_LYNXOS - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -#else /* ! PACE_LYNXOS */ - return pthread_mutex_getprioceiling (mutex, prioceiling); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_init (pace_pthread_mutex_t * mutex, - const pace_pthread_mutexattr_t * attr) -{ -#if PACE_LYNXOS == 0x300 - return pthread_mutex_init (mutex, *attr); -#else - return pthread_mutex_init (mutex, attr); -#endif /* PACE_LYNXOS != 0x300 */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_lock (pace_pthread_mutex_t * mutex) -{ - return pthread_mutex_lock (mutex); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_setprioceiling (pace_pthread_mutex_t * mutex, - int prioceiling, - int * old_ceiling) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (mutex); - PACE_UNUSED_ARG (prioceiling); - PACE_UNUSED_ARG (old_ceiling); - return -1; -#elif PACE_LYNXOS - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -#else /* ! PACE_LYNXOS */ - return pthread_mutex_setprioceiling (mutex, prioceiling, old_ceiling); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_trylock (pthread_mutex_t * mutex) -{ - return pthread_mutex_trylock (mutex); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_unlock (pace_pthread_mutex_t * mutex) -{ - return pthread_mutex_unlock (mutex); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_destroy (pace_pthread_mutexattr_t * attr) -{ - return pthread_mutexattr_destroy (attr); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_getprioceiling (pace_pthread_mutexattr_t * attr, - int * prioceiling) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (prioceiling); - return -1; -#else - return pthread_mutexattr_getprioceiling (attr, prioceiling); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_getprotocol (const pace_pthread_mutexattr_t * attr, - int * protocol) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (protocol); - return -1; -#else - return pthread_mutexattr_getprotocol (PACE_NONCONST_ARG_CAST (pace_pthread_mutexattr_t *) attr, protocol); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_setprioceiling (pace_pthread_mutexattr_t * attr, - int prioceiling) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (prioceiling); - return -1; -#else - return pthread_mutexattr_setprioceiling (attr, prioceiling); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr, - int protocol) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (protocol); - return -1; -#else - return pthread_mutexattr_setprotocol (attr, protocol); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_getpshared (const pace_pthread_mutexattr_t * attr, - int * pshared) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (pshared); - return -1; -#else - return pthread_mutexattr_getpshared (PACE_NONCONST_ARG_CAST (pace_pthread_mutexattr_t *) attr, pshared); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_init (pace_pthread_mutexattr_t * attr) -{ - return pthread_mutexattr_init (attr); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr, - int pshared) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (pshared); - return -1; -#else - return pthread_mutexattr_setpshared (attr, pshared); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -# if defined (PACE_HAS_CPLUSPLUS) -PACE_INLINE -int -pace_pthread_once (pace_pthread_once_t * once_control, - pace_once_pf void_routine) -{ - return pthread_once (once_control, void_routine); -} -# else /* ! PACE_HAS_CPLUSPLUS */ -PACE_INLINE -int -pace_pthread_once (pace_pthread_once_t * once_control, - void (*void_routine) (void)) -{ - return pthread_once (once_control, void_routine); -} -# endif /* PACE_HAS_CPLUSPLUS */ -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_pthread_t -pace_pthread_self () -{ - return pthread_self (); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setcancelstate (int state, int * oldstate) -{ - return pthread_setcancelstate (state, oldstate); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setcanceltype (int type, int * oldtype) -{ - return pthread_setcanceltype (type, oldtype); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setschedparam (pace_pthread_t thread, - int policy, - const pace_sched_param * param) -{ - return pthread_setschedparam (thread, policy, param); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setspecific (pace_pthread_key_t key, const void * value) -{ - return pthread_setspecific (key, PACE_NONCONST_ARG_CAST (void *) value); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_sigmask (int how, const sigset_t * set, - sigset_t * oset) -{ - return pthread_sigmask (how, set, oset); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void -pace_pthread_testcancel () -{ - pthread_testcancel (); - return; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ diff --git a/PACE/pace/posix/pwd.c b/PACE/pace/posix/pwd.c deleted file mode 100644 index 6284186cd66..00000000000 --- a/PACE/pace/posix/pwd.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/pwd.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/pwd.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/pwd.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/pwd.h b/PACE/pace/posix/pwd.h deleted file mode 100644 index 70398e0871c..00000000000 --- a/PACE/pace/posix/pwd.h +++ /dev/null @@ -1,35 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/pwd.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_PWD_H_POSIX -#define PACE_PWD_H_POSIX - -#include -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_PASSWD -#define PACE_PASSWD - typedef struct passwd pace_passwd; -#endif /* PACE_PASSWD */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_PWD_H_POSIX */ diff --git a/PACE/pace/posix/pwd.inl b/PACE/pace/posix/pwd.inl deleted file mode 100644 index ee52fd2be0d..00000000000 --- a/PACE/pace/posix/pwd.inl +++ /dev/null @@ -1,81 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/pwd.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_passwd * -pace_getpwuid (pace_uid_t uid) -{ - return getpwuid (uid); -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getpwuid_r (pace_uid_t uid, - pace_passwd * pwd, - char * buffer, - pace_size_t bufsize, - pace_passwd ** result) -{ -#if (PACE_LYNXOS) - if (getpwuid_r (pwd, uid, buffer, bufsize) == 0) - /* Successful search */ - { - **result = *pwd; - return 0; - } - - return -1; -#else - return getpwuid_r (uid, pwd, buffer, bufsize, result); -#endif /* ! PACE_LYNXOS */ -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_passwd * -pace_getpwnam (const char * name) -{ - return getpwnam (name); -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getpwnam_r (const char * name, - pace_passwd * pwd, - char * buffer, - pace_size_t bufsize, - pace_passwd ** result) -{ -# if (PACE_LYNXOS) - if (getpwnam_r (pwd, PACE_NONCONST_ARG_CAST (char *) name, - buffer, bufsize) == 0) - /* Successful search */ - { - **result = *pwd; - return 0; - } - - return -1; -#else - return getpwnam_r (name, pwd, buffer, bufsize, result); -#endif /* ! PACE_LYNXOS */ -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ diff --git a/PACE/pace/posix/sched.c b/PACE/pace/posix/sched.c deleted file mode 100644 index d78a66dbc7f..00000000000 --- a/PACE/pace/posix/sched.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/sched.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sched.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/sched.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/sched.h b/PACE/pace/posix/sched.h deleted file mode 100644 index a3405d2bbd1..00000000000 --- a/PACE/pace/posix/sched.h +++ /dev/null @@ -1,38 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/sched.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SCHED_H_POSIX -#define PACE_SCHED_H_POSIX - -#include -#include "pace/time.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_SCHED_FIFO SCHED_FIFO -#define PACE_SCHED_OTHER SCHED_RR - -#ifndef PACE_SCHED_PARAM -#define PACE_SCHED_PARAM - typedef struct sched_param pace_sched_param; -#endif /* PACE_SCHED_PARAM */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SCHED_H_POSIX */ diff --git a/PACE/pace/posix/sched.inl b/PACE/pace/posix/sched.inl deleted file mode 100644 index 86f3ac7d776..00000000000 --- a/PACE/pace/posix/sched.inl +++ /dev/null @@ -1,95 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/sched.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_get_priority_max (int policy) -{ - return sched_get_priority_max (policy); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_get_priority_min (int policy) -{ - return sched_get_priority_min (policy); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_getparam (pace_pid_t pid, - pace_sched_param * param) -{ - return sched_getparam (pid, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_rr_get_interval (pace_pid_t pid, - pace_timespec * interval) -{ -#if PACE_SUNOS == 551 - return sched_get_rr_get_interval (pid, interval); -#else - return sched_rr_get_interval (pid, interval); -#endif /* PACE_SUNOS != 551 */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_setparam (pace_pid_t pid, - const pace_sched_param * param) -{ - return sched_setparam (pid, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_getscheduler (pace_pid_t pid) -{ - return sched_getscheduler (pid); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_setscheduler (pace_pid_t pid, - int policy, - const pace_sched_param * param) -{ - return sched_setscheduler (pid, policy, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_yield () -{ - return sched_yield (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/posix/semaphore.c b/PACE/pace/posix/semaphore.c deleted file mode 100644 index 695190f4531..00000000000 --- a/PACE/pace/posix/semaphore.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/semaphore.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/semaphore.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/semaphore.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/semaphore.h b/PACE/pace/posix/semaphore.h deleted file mode 100644 index 4cdf0d3dd04..00000000000 --- a/PACE/pace/posix/semaphore.h +++ /dev/null @@ -1,31 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/semaphore.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SEMAPHORE_H_POSIX -#define PACE_SEMAPHORE_H_POSIX - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -typedef sem_t pace_sem_t; - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SEMAPHORE_H_POSIX */ diff --git a/PACE/pace/posix/semaphore.inl b/PACE/pace/posix/semaphore.inl deleted file mode 100644 index b0d4fb21906..00000000000 --- a/PACE/pace/posix/semaphore.inl +++ /dev/null @@ -1,86 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/semaphore.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_close (pace_sem_t * sem) -{ - return sem_close (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_destroy (pace_sem_t * sem) -{ - return sem_destroy (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_getvalue (pace_sem_t * sem, int * sval) -{ - return sem_getvalue (sem, sval); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_init (pace_sem_t * sem, int pshared, unsigned int value) -{ - return sem_init (sem, pshared, value); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_post (pace_sem_t * sem) -{ - return sem_post (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_trywait (pace_sem_t * sem) -{ - return sem_trywait (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_unlink (const char * name) -{ - return sem_unlink (name); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_wait (pace_sem_t * sem) -{ - return sem_wait (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/posix/setjmp.c b/PACE/pace/posix/setjmp.c deleted file mode 100644 index 00db5828a7c..00000000000 --- a/PACE/pace/posix/setjmp.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/setjmp.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/setjmp.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/setjmp.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/setjmp.h b/PACE/pace/posix/setjmp.h deleted file mode 100644 index 30221f2e74d..00000000000 --- a/PACE/pace/posix/setjmp.h +++ /dev/null @@ -1,32 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/setjmp.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SETJMP_H_POSIX -#define PACE_SETJMP_H_POSIX - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - typedef jmp_buf pace_jmp_buf; - typedef sigjmp_buf pace_sigjmp_buf; - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SETJMP_H_POSIX */ diff --git a/PACE/pace/posix/setjmp.inl b/PACE/pace/posix/setjmp.inl deleted file mode 100644 index e51bcb77167..00000000000 --- a/PACE/pace/posix/setjmp.inl +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/setjmp.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_longjmp (pace_jmp_buf env, int val) -{ - longjmp (env, val); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -void -pace_siglongjmp (pace_sigjmp_buf env, int val) -{ - siglongjmp (env, val); - return; -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ diff --git a/PACE/pace/posix/signal.c b/PACE/pace/posix/signal.c deleted file mode 100644 index 46d96b76fb0..00000000000 --- a/PACE/pace/posix/signal.c +++ /dev/null @@ -1,28 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/signal.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/signal.h" - -#if (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/signal.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_CPLUSPLUS) -} -#endif diff --git a/PACE/pace/posix/signal.h b/PACE/pace/posix/signal.h deleted file mode 100644 index 6362595ae31..00000000000 --- a/PACE/pace/posix/signal.h +++ /dev/null @@ -1,71 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/signal.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#ifndef PACE_SIGNAL_H_POSIX -#define PACE_SIGNAL_H_POSIX - -#include -#include "pace/sys/types.h" -#include "pace/time.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_SIG_PF -# define PACE_SIG_PF - typedef void (*pace_sig_pf)(int); -#endif /* PACE_SIG_PF */ - -#ifndef PACE_SIG_ATOMIC_T -#define PACE_SIG_ATOMIC_T - typedef sig_atomic_t pace_sig_atomic_t; -#endif /* PACE_SIG_ATOMIC_T */ - -#ifndef PACE_SIGSET_T -#define PACE_SIGSET_T - typedef sigset_t pace_sigset_t; -#endif /* PACE_SIGSET_T */ - -#ifndef PACE_SIGACTION_S -#define PACE_SIGACTION_S - typedef struct sigaction pace_sigaction_s; -#endif /* PACE_SIGACTION_S */ - -#ifndef PACE_SIGINFO_T -#define PACE_SIGINFO_T - typedef siginfo_t pace_siginfo_t; -#endif /* PACE_SIGINFO_T */ - -#ifndef PACE_SIGEVENT -#define PACE_SIGEVENT - typedef struct sigevent pace_sigevent; -#endif /* PACE_SIGEVENT */ - -#ifndef PACE_SIGVAL -#define PACE_SIGVAL - typedef union sigval pace_sigval; -#endif /* PACE_SIGVAL */ - -#ifndef PACE_TIMESPEC -#define PACE_TIMESPEC - typedef struct timespec pace_timespec; -#endif /* PACE_TIMESPEC */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SIGNAL_H_POSIX */ diff --git a/PACE/pace/posix/signal.inl b/PACE/pace/posix/signal.inl deleted file mode 100644 index ce591600baa..00000000000 --- a/PACE/pace/posix/signal.inl +++ /dev/null @@ -1,167 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/signal.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/pthread.h" -#include "pace/time.h" - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_kill (pace_pid_t pid, int sig) -{ - return kill (pid, sig); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_raise (int sig) -{ - /* Implementation from POSIX std 8.1:54 */ - return pthread_kill (pthread_self (), sig); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigaction (int sig, const pace_sigaction_s * act, - pace_sigaction_s * oact) -{ - return sigaction (sig, act, oact); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigaddset (pace_sigset_t * set, int signo) -{ - return sigaddset (set, signo); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigemptyset (pace_sigset_t * set) -{ - return sigemptyset (set); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigdelset (pace_sigset_t * set, int signo) -{ - return sigdelset (set, signo); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigfillset (pace_sigset_t * set) -{ - return sigfillset (set); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigismember (const pace_sigset_t * set, int signo) -{ - return sigismember (set, signo); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_sig_pf -pace_signal (int sig, pace_sig_pf func) -{ - return signal (sig, func); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigpending (pace_sigset_t * set) -{ - return sigpending (set); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigprocmask (int how, const pace_sigset_t * set, - pace_sigset_t * oset) -{ - return sigprocmask (how, set, oset); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigqueue (pace_pid_t pid, int signo, - const pace_sigval value) -{ - return sigqueue (pid, signo, value); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigsuspend (const pace_sigset_t * sigmask) -{ - return sigsuspend (sigmask); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigtimedwait (const pace_sigset_t * set, pace_siginfo_t * info, - const pace_timespec * timeout) -{ - return sigtimedwait (set, info, timeout); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigwait (const pace_sigset_t * set, int * sig) -{ - return sigwait (PACE_NONCONST_ARG_CAST (pace_sigset_t *) set, - PACE_VOIDSTARTSTAR_ARG_CAST (void**) sig); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigwaitinfo (const pace_sigset_t *set, pace_siginfo_t *info) -{ - return sigwaitinfo (set, info); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/posix/socket.c b/PACE/pace/posix/socket.c deleted file mode 100644 index ef5494116c7..00000000000 --- a/PACE/pace/posix/socket.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/socket.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/socket.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/socket.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/socket.h b/PACE/pace/posix/socket.h deleted file mode 100644 index 187230d776a..00000000000 --- a/PACE/pace/posix/socket.h +++ /dev/null @@ -1,231 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/socket.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SOCKET_H_POSIX -#define PACE_SOCKET_H_POSIX - -#include -#if PACE_LYNXOS == 0x300 || PACE_LYNXOS == 0x310 -#include -#include -#else -#include -#include -#endif /* PACE_LYNXOS != 0x300 && PACE_LYNXOS != 0x310 */ - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_SOMAXCONN -#define PACE_SOMAXCONN SOMAXCONN -#endif /* PACE_SOMAXCONN */ - -#ifndef PACE_SOCKLEN_T -#define PACE_SOCKLEN_T -# if PACE_LYNXOS == 0x300 || PACE_LYNXOS == 0x310 || PACE_SUNOS == 551 || PACE_SUNOS == 560 || PACE_QNX == 600 - typedef int pace_socklen_t; -# else - typedef socklen_t pace_socklen_t; -# endif /* PACE_LYNXOS != 0x300 && PACE_LYNXOS != 0x310 */ -#endif /* PACE_SOCKLEN_T */ - -#ifndef PACE_SA_FAMILY_T -#define PACE_SA_FAMILY_T -# if PACE_LYNXOS != 0x300 && PACE_LYNXOS != 0x310 && PACE_SUNOS != 551 && (PACE_HPUX) - typedef sa_family_t pace_family_t; -# endif /* PACE_LYNXOS != 0x300 && PACE_LYNXOS != 0x310 */ -#endif /* PACE_SA_FAMILY_T */ - -#ifndef PACE_MSGHDR -#define PACE_MSGHDR - typedef struct msghdr pace_msghdr; -#endif /* PACE_MSGHDR */ - -#ifndef PACE_CMSGRHDR -#define PACE_CMSGRHDR - typedef struct cmsghdr pace_cmsghdr; -#endif /* PACE_CMSGRHDR */ - -#ifndef PACE_LINGER -#define PACE_LINGER - typedef struct linger pace_linger; -#endif /* PACE_LINGER */ - -#ifndef PACE_SOCK_STREAM -#define PACE_SOCK_STREAM SOCK_STREAM -#endif /* PACE_SOCK_STREAM */ - -#ifndef PACE_SOCK_DGRAM -#define PACE_SOCK_DGRAM SOCK_DGRAM -#endif /* PACE_SOCK_DGRAM */ - -#ifndef PACE_SOCK_RAW -#define PACE_SOCK_RAW SOCK_RAW -#endif /* PACE_MSGHDR */ - -#ifndef PACE_SOCK_SEQPACKET -#define PACE_SOCK_SEQPACKET SOCK_SEQPACKET -#endif /* PACE_SOCK_SEQPACKET */ - -#ifndef PACE_PF_UNSPEC -#define PACE_PF_UNSPEC PF_UNSPEC -#endif /* PACE_PF_UNSPEC */ - -#ifndef PACE_PF_LOCAL -#define PACE_PF_LOCAL PF_LOCAL -#endif /* PACE_PF_LOCAL */ - -#ifndef PACE_PF_INET -#define PACE_PF_INET PF_INET -#endif /* PACE_PF_INET */ - -#ifndef PACE_PF_ISO -#define PACE_PF_ISO PF_ISO -#endif /* PACE_PF_ISO */ - -#ifndef PACE_PF_OSI -#define PACE_PF_OSI PF_OSI -#endif /* PACE_PF_OSI */ - -#ifndef PACE_AF_UNSPEC -#define PACE_AF_UNSPEC AF_UNSPEC -#endif /* PACE_AF_UNSPEC */ - -#ifndef PACE_AF_LOCAL -#define PACE_AF_LOCAL AF_LOCAL -#endif /* PACE_AF_LOCAL */ - -#ifndef PACE_AF_INET -#define PACE_AF_INET AF_INET -#endif /* PACE_AF_INET */ - -#ifndef PACE_AF_ISO -#define PACE_AF_ISO AF_ISO -#endif /* PACE_AF_ISO */ - -#ifndef PACE_AF_OSI -#define PACE_AF_OSI AF_OSI -#endif /* PACE_AF_OSI */ - -#ifndef PACE_MSG_OOB -#define PACE_MSG_OOB MSG_OOB -#endif /* PACE_MSG_OOB */ - -#ifndef PACE_MSG_PEEK -#define PACE_MSG_PEEK MSG_PEEK -#endif /* PACE_MSG_PEEK */ - -#ifndef PACE_MSG_DONTROUTE -#define PACE_MSG_DONTROUTE MSG_DONTROUTE -#endif /* PACE_MSG_DONTROUTE */ - -#ifndef PACE_MSG_EOR -#define PACE_MSG_EOR MSG_EOR -#endif /* PACE_MSG_EOR */ - -#ifndef PACE_MSG_TRUNC -#define PACE_MSG_TRUNC MSG_TRUNC -#endif /* PACE_MSG_TRUNC */ - -#ifndef PACE_MSG_CTRUNC -#define PACE_MSG_CTRUNC MSG_CTRUNC -#endif /* PACE_MSG_CTRUNC */ - -#ifndef PACE_MSG_WAITALL -#define PACE_MSG_WAITALL MSG_WAITALL -#endif /* PACE_MSG_WAITALL */ - -#ifndef PACE_SOL_SOCKET -#define PACE_SOL_SOCKET SOL_SOCKET -#endif /* PACE_SOL_SOCKET */ - -#ifndef PACE_SO_BROADCAST -#define PACE_SO_BROADCAST SO_BROADCAST -#endif /* PACE_SO_BROADCAST */ - -#ifndef PACE_SO_DEBUG -#define PACE_SO_DEBUG SO_DEBUG -#endif /* PACE_SO_DEBUG */ - -#ifndef PACE_SO_DONTROUTE -#define PACE_SO_DONTROUTE SO_DONTROUTE -#endif /* PACE_SO_DONTROUTE */ - -#ifndef PACE_SO_ERROR -#define PACE_SO_ERROR SO_ERROR -#endif /* PACE_SO_ERROR */ - -#ifndef PACE_SO_KEEPALIVE -#define PACE_SO_KEEPALIVE SO_KEEPALIVE -#endif /* PACE_SO_KEEPALIVE */ - -#ifndef PACE_SO_LINGER -#define PACE_SO_LINGER SO_LINGER -#endif /* PACE_SO_LINGER */ - -#ifndef PACE_SO_OOBINLINE -#define PACE_SO_OOBINLINE SO_OOBINLINE -#endif /* PACE_SO_OOBINLINE */ - -#ifndef PACE_SO_RCVBUF -#define PACE_SO_RCVBUF SO_RCVBUF -#endif /* PACE_SO_RCVBUF */ - -#ifndef PACE_SO_RCVLOWAT -#define PACE_SO_RCVLOWAT SO_RCVLOWAT -#endif /* PACE_SO_RCVLOWAT */ - -#ifndef PACE_SO_RCVTIMEO -#define PACE_SO_RCVTIMEO SO_RCVTIMEO -#endif /* PACE_SO_RCVTIMEO */ - -#ifndef PACE_SO_REUSEADDR -#define PACE_SO_REUSEADDR SO_REUSEADDR -#endif /* PACE_SO_REUSEADDR */ - -#ifndef PACE_SO_SNDBUF -#define PACE_SO_SNDBUF SO_SNDBUF -#endif /* PACE_SO_SNDBUF */ - -#ifndef PACE_SO_SNDLOWAT -#define PACE_SO_SNDLOWAT SO_SNDLOWAT -#endif /* PACE_SO_SNDLOWAT */ - -#ifndef PACE_SO_SNDTIMEO -#define PACE_SO_SNDTIMEO SO_SNDTIMEO -#endif /* PACE_SO_SNDTIMEO */ - -#ifndef PACE_SO_TYPE -#define PACE_SO_TYPE SO_TYPE -#endif /* PACE_SO_TYPE */ - -#ifndef PACE_CMSG_DATA -#define PACE_CMSG_DATA(cmsg) CMSG_DATA(cmsg) -#endif /* PACE_CMSG_DATA */ - -#ifndef PACE_CMSG_NXTHDR -#define PACE_CMSG_NXTHDR(mhdr, cmsg) CMSG_NXTHDR(mhdr, cmsg) -#endif /* PACE_CMSG_DATA */ - -#ifndef PACE_CMSG_FIRSTHDR -#define PACE_CMSG_NXTHDR(mhdr, cmsg) CMSG_NXTHDR(mhdr, cmsg) -#endif /* PACE_CMSG_DATA */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SOCKET_H_POSIX */ diff --git a/PACE/pace/posix/socket.inl b/PACE/pace/posix/socket.inl deleted file mode 100644 index 5b38e4e198c..00000000000 --- a/PACE/pace/posix/socket.inl +++ /dev/null @@ -1,242 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/socket.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include -#include - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_accept (int s, - pace_sockaddr * socketaddress, - pace_socklen_t * addresslen) -{ - accept (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_bind (int s, - const pace_sockaddr * socketaddress, - pace_socklen_t addresslen) -{ - bind (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_connect (int s, - const pace_sockaddr * socketaddress, - pace_socklen_t addresslen) -{ - connect (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_getpeername (int s, - pace_sockaddr * socketaddress, - pace_socklen_t * addresslen) -{ - getpeername (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_getsockname (int s, - pace_sockaddr * socketaddress, - pace_socklen_t * addresslen) -{ - getsockname (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_getsockopt (int s, - int level, - int optname, - void * optval, - pace_socklen_t optlen) -{ - getsockopt (s, level, optname, optval, optlen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_setsockopt (int s, - int level, - int optname, - const * optval) -{ - setsockopt (s, level, optname, optval); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_setsockopt (int s, - int level, - int optname, - const * optval) -{ - setsockopt (s, level, optname, optval); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_isfdtype (int fildes, int fdtype) -{ - isfdtype (fildes, fdtype); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_listen (int s, int backlog) -{ - listen (s, backlog); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_recv (int s, - void * buf, - pace_size_t len, - int flags) -{ - recv (s, buf, len, flags); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_recvfrom (int s, - void * buf, - pace_size_t len, - int flags, - pace_sockaddr * from, - pace_socklen_t * fromlen) -{ - recvfrom (s, buf, len, flags, from, fromlen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_rcvmsg (int s, - pace_msghdr * msg, - int flags) -{ - rcvmsg (s, msg, flags); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_send (int s, - const void * buf, - pace_size_t len, - int flags) -{ - send (s, buf, len, flags); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_sendto (int s, - const void * buf, - pace_size_t len, - int flags, - const pace_sockaddr * to, - pace_socklen_t * tolen) -{ - sendto (s, buf, len, flags, to, tolen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_sendmsg (int s, - const pace_msghdr * msg, - int flags) -{ - sendmsg (s, msg, flags); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_shutdown (int s, int how) -{ - shutdown (s, how); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_socket (int protofamily, int type, int protocol) -{ - socket (protofamily, type, protocol); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_socketpair (int protofamily, - int type, - int protocol, - int sv[2]) -{ - socketpair (protofamily, type, protocol, sy); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - - - - - - - - - - - diff --git a/PACE/pace/posix/stat.c b/PACE/pace/posix/stat.c deleted file mode 100644 index efd10b03f76..00000000000 --- a/PACE/pace/posix/stat.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/stat.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/stat.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/stat.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/stat.h b/PACE/pace/posix/stat.h deleted file mode 100644 index 1fc9ca38e74..00000000000 --- a/PACE/pace/posix/stat.h +++ /dev/null @@ -1,58 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/stat.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_STAT_H_POSIX -#define PACE_SYS_STAT_H_POSIX - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_S_IRGRP S_IRGRP -#define PACE_S_IROTH S_IROTH -#define PACE_S_IRUSR S_IRUSR -#define PACE_S_IRWXG S_IRWXG -#define PACE_S_IRWXO S_IRWXO -#define PACE_S_IRWXU S_IRWXU -#define PACE_S_ISBLK S_ISBLK -#define PACE_S_ISCHR S_ISCHR -#define PACE_S_ISDIR S_ISDIR -#define PACE_S_ISFIFO S_ISFIFO -#define PACE_S_ISGID S_SIGID -#define PACE_S_ISREG S_ISREG -#define PACE_S_ISUID S_ISUID -#define PACE_S_IWGRP S_IWGRP -#define PACE_S_IWOTH S_IWOTH -#define PACE_S_IWUSR S_IWUSR -#define PACE_S_IXGRP S_IXGRP -#define PACE_S_IXOTH S_IXOTH -#define PACE_S_IXUSR S_IXUSR -#define PACE_S_TYPEISMQ S_TYPEISMQ -#define PACE_S_TYPEISSEM S_TYPEISSEM -#define PACE_S_TYPEISSHM S_TYPEISSHM - -#ifndef PACE_STAT -#define PACE_STAT - /* Kludge since there is a func and a type of the same name */ - typedef struct stat pace_stat_s; -#endif /* PACE_STAT */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_STAT_H_POSIX */ diff --git a/PACE/pace/posix/stat.inl b/PACE/pace/posix/stat.inl deleted file mode 100644 index fa9b1e61714..00000000000 --- a/PACE/pace/posix/stat.inl +++ /dev/null @@ -1,77 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/stat.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FA_UOF) -PACE_INLINE -int -pace_chmod (const char * path, pace_mode_t mode) -{ - return chmod (path, mode); -} -#endif /* PACE_HAS_POSIX_FA_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fchmod (PACE_HANDLE fildes, pace_mode_t mode) -{ - return fchmod (fildes, mode); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_fstat (PACE_HANDLE fildes, pace_stat_s * buf) -{ - return fstat (fildes, buf); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_mkdir (const char * path, pace_mode_t mode) -{ - return mkdir (path, mode); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_F_UOF) -PACE_INLINE -int -pace_mkfifo (const char * path, pace_mode_t mode) -{ - return mkfifo (path, mode); -} -#endif /* PACE_HAS_POSIX_F_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_stat (const char * path, pace_stat_s * buf) -{ - return stat (path, buf); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FA_UOF) -PACE_INLINE -pace_mode_t -pace_umask (pace_mode_t cmask) -{ - return umask (cmask); -} -#endif /* PACE_HAS_POSIX_FA_UOF */ diff --git a/PACE/pace/posix/stdio.c b/PACE/pace/posix/stdio.c deleted file mode 100644 index 251d6da309d..00000000000 --- a/PACE/pace/posix/stdio.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/stdio.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/stdio.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/stdio.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/stdio.h b/PACE/pace/posix/stdio.h deleted file mode 100644 index 901476acd75..00000000000 --- a/PACE/pace/posix/stdio.h +++ /dev/null @@ -1,58 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/stdio.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STDIO_H_POSIX -#define PACE_STDIO_H_POSIX - -#include -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_BUFSIZ BUFSIZ -#define PACE_EOF EOF -#define PACE_FILENAME_MAX FILENAME_MAX -#define PACE_L_ctermid L_ctermid -#define PACE_L_cuserid L_cuserid -#ifndef PACE_NULL -#define PACE_NULL NULL -#endif /* PACE_NULL */ -#define PACE_SEEK_CUR SEEK_CUR -#define PACE_SEEK_END SEEK_END -#define PACE_SEEK_SET SEEK_SET -#define PACE_TMP_MAX TMP_MAX -#define pace_stderr stderr -#define pace_stdout stdout -#define pace_stdin stdin - -#ifndef PACE_FPOS_T -#define PACE_FPOS_T -typedef fpos_t pace_fpos_t; -#endif /* PACE_FPOS_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -typedef FILE PACE_FILE; - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STDIO_H_POSIX */ diff --git a/PACE/pace/posix/stdio.inl b/PACE/pace/posix/stdio.inl deleted file mode 100644 index 630d7c5e2bc..00000000000 --- a/PACE/pace/posix/stdio.inl +++ /dev/null @@ -1,502 +0,0 @@ -/* $Id$ -*- C -*- - - * =========================================================================== - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/stdio.inl - * - * = AUTHOR - * Luther Baker - * - * =========================================================================== */ - -#include - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -void -pace_clearerr (FILE * stream) -{ - clearerr (stream); - return; -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -char * -pace_ctermid (char * s) -{ - return ctermid (s); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fclose (FILE * stream) -{ - return fclose (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -FILE * -pace_fdopen (int fildes, - const char * type) -{ - return fdopen (fildes, - type); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_ferror (FILE * stream) -{ - return ferror (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_feof (FILE * stream) -{ - return feof (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fflush (FILE * stream) -{ - return fflush (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fileno (FILE * stream) -{ - return fileno (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fgetc (FILE * stream) -{ - return fgetc (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fgetpos(PACE_FILE * stream, - pace_fpos_t * pos) -{ - return fgetpos (stream, pos); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -char * -pace_fgets (char * s, - int n, - FILE * stream) -{ - return fgets (s, - n, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -void -pace_flockfile (FILE * file) -{ -#if defined (PACE_HAS_REENTRANT) - flockfile (file); -#else /* ! PACE_HAS_REENTRANT */ - PACE_UNUSED_ARG (file); - PACE_ERRNO_NO_SUPPORT (); -#endif /* ! PACE_HAS_REENTRANT */ - return; -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -FILE * -pace_fopen (const char * filename, - const char * mode) -{ - return fopen (filename, - mode); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fputc (int c, - FILE * stream) -{ - return fputc (c, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fputs (const char * s, - FILE * stream) -{ - return fputs (s, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -size_t -pace_fread (void * ptr, - size_t size, - size_t number_of_items, - FILE * stream) -{ - return fread (ptr, - size, - number_of_items, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -FILE * -pace_freopen (const char * filename, - const char * mode, - FILE * stream) -{ - return freopen (filename, - mode, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -int -pace_fseek (FILE * stream, - long offset, - int whence) -{ - return fseek (stream, - offset, - whence); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fsetpos(PACE_FILE *stream, const pace_fpos_t *pos) -{ - return fsetpos (stream, pos); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -long -pace_ftell (FILE * stream) -{ - return ftell (stream); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_ftrylockfile (FILE * file) -{ -#if defined (PACE_HAS_REENTRANT) - return ftrylockfile (file); -#else /* ! PACE_HAS_REENTRANT */ - PACE_UNUSED_ARG(file); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -#endif /* ! PACE_HAS_REENTRANT */ -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -void -pace_funlockfile (FILE * file) -{ -#if defined (PACE_HAS_REENTRANT) - funlockfile (file); -#else /* ! PACE_HAS_REENTRANT */ - PACE_UNUSED_ARG(file); - PACE_ERRNO_NO_SUPPORT (); -#endif /* ! PACE_HAS_REENTRANT */ - return; -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -pace_size_t -pace_fwrite(const void * ptr, - pace_size_t size, pace_size_t nmemb, - PACE_FILE * stream) -{ - return fwrite (ptr, size, nmemb, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_getc (FILE * stream) -{ - return getc (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_getc_unlocked (FILE * stream) -{ -#if defined (PACE_HAS_REENTRANT) - return getc_unlocked (stream); -#else /* ! PACE_HAS_POSIX */ - PACE_UNUSED_ARG(stream); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -#endif /* ! PACE_HAS_POSIX */ -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_getchar () -{ - return getchar (); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_getchar_unlocked () -{ -#if defined (PACE_HAS_REENTRANT) - return getchar_unlocked (); -#else /* ! PACE_HAS_REENTRANT */ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -#endif /* ! PACE_HAS_REENTRANT */ -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -char * -pace_gets (char * s) -{ - return gets (s); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -void -pace_perror (const char * s) -{ - perror (s); - return; -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_putc (int c, - FILE * stream) -{ - return putc (c, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_putc_unlocked (int c, - FILE * stream) -{ -#if defined (PACE_HAS_REENTRANT) - return putc_unlocked (c, stream); -#else /* ! PACE_HAS_REENTRANT */ - PACE_UNUSED_ARG(c); - PACE_UNUSED_ARG(stream); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -#endif /* ! PACE_HAS_REENTRANT */ -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_putchar (int c) -{ - return putchar (c); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_putchar_unlocked (int c) -{ -#if defined (PACE_HAS_REENTRANT) - return putchar_unlocked (c); -#else /* ! PACE_HAS_REENTRANT */ - PACE_UNUSED_ARG(c); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -#endif /* ! PACE_HAS_REENTRANT */ -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_puts (const char * s) -{ - return puts (s); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_remove (const char * path) -{ - return remove (path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_rename (const char * old_name, - const char * new_name) -{ - return rename (old_name, - new_name); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -void -pace_rewind (FILE * stream) -{ - rewind (stream); - return; -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -void -pace_setbuf (FILE * stream, char * buf) -{ - setbuf (stream, buf); - return; -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_setvbuf(PACE_FILE * stream, - char * buf, - int mode, pace_size_t size) -{ - return setvbuf (stream, buf, mode, size); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -FILE * -pace_tmpfile () -{ - return tmpfile (); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -char * -pace_tmpnam (char * s) -{ - return tmpnam (s); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_ungetc (int c, FILE * stream) -{ - return ungetc (c, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_vfprintf (PACE_FILE * stream, - const char * format, - va_list arg) -{ - return vfprintf (stream, format, arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_vprintf (const char * format, - va_list arg) -{ - return vprintf (format, arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_vsprintf (char * s, - const char * format, - va_list arg) -{ - return vsprintf (s, format, arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/posix/stdlib.c b/PACE/pace/posix/stdlib.c deleted file mode 100644 index 041a8bd0bbe..00000000000 --- a/PACE/pace/posix/stdlib.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/stdlib.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/stdlib.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/stdlib.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/stdlib.h b/PACE/pace/posix/stdlib.h deleted file mode 100644 index 5e9b762e77b..00000000000 --- a/PACE/pace/posix/stdlib.h +++ /dev/null @@ -1,64 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/stdlib.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STDLIB_H_POSIX -#define PACE_STDLIB_H_POSIX - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_EXIT_FAILURE EXIT_FAILURE -#define PACE_EXIT_SUCCESS EXIT_SUCCESS -#define PACE_MB_CUR_MAX MB_CUR_MAX -#ifndef PACE_NULL -# define PACE_NULL NULL -#endif /* PACE_NULL */ -#define PACE_RAND_MAX RAND_MAX - -#ifndef PACE_DIV_T -#define PACE_DIV_T - typedef div_t pace_div_t; -#endif /* PACE_DIV_T */ - -#ifndef PACE_LDIV_T -#define PACE_LDIV_T - typedef ldiv_t pace_ldiv_t; -#endif /* PACE_LDIV_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_WCHAR_T -#define PACE_WCHAR_T - typedef wchar_t pace_wchar_t; -#endif /* PACE_WCHAR_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -# ifndef PACE_BSEARCH_PF -# define PACE_BSEARCH_PF - typedef int (*pace_bsearch_pf) (const void*, const void*); -# endif /* PACE_BSEARCH_PF */ -#endif /* PACE_HAS_CPLUSPLUS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STDLIB_H_POSIX */ diff --git a/PACE/pace/posix/stdlib.inl b/PACE/pace/posix/stdlib.inl deleted file mode 100644 index eb8e7f578a0..00000000000 --- a/PACE/pace/posix/stdlib.inl +++ /dev/null @@ -1,323 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/stdlib.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -void -pace_abort (void) -{ - abort (); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_abs (int val) -{ - return abs (val); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_atexit (void (*func)(void)) -{ - return atexit (func); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_atof (const char * str) -{ - return atof (str); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_atoi (const char * str) -{ - return atoi (str); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -long -pace_atol (const char * str) -{ - return atol (str); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -# if defined (PACE_HAS_CPLUSPLUS) -PACE_INLINE -void * -pace_bsearch (const void *key, const void *base, - size_t nel, size_t size, - pace_bsearch_pf compar) -{ - return bsearch (key, base, nel, size, compar); -} -# else /* ! PACE_HAS_CPLUSPLUS */ -PACE_INLINE -void * -pace_bsearch (const void *key, const void *base, - size_t nel, size_t size, - int (*compar)(const void *,const void *)) -{ - return bsearch (key, base, nel, size, compar); -} -# endif /* PACE_HAS_CPLUSPLUS */ -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_div_t -pace_div (int numer, int denom) -{ - return div (numer, denom); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -void -pace_exit (int status) -{ - exit (status); - return; -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -char * -pace_getenv (const char * name) -{ - return getenv (name); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -long int -pace_labs (long int j) -{ - return labs (j); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_ldiv_t -pace_ldiv (long int numer, long int denom) -{ - return ldiv (numer, denom); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mblen (const char* s, pace_size_t n) -{ - return mblen (s, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_size_t -pace_mbstowcs (pace_wchar_t* pwcs, - const char* s, - pace_size_t n) -{ - return mbstowcs (pwcs, s, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mbtowc (pace_wchar_t* pwc, - const char* s, - pace_size_t n) -{ - return mbtowc (pwc, s, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -# if (PACE_HAS_CPLUSPLUS) -PACE_INLINE -void -pace_qsort (void * base, size_t nel, size_t width, - pace_bsearch_pf compar) -{ - qsort (base, nel, width, compar); -} -# else /* ! PACE_HAS_CPLUSPLUS */ -PACE_INLINE -void -pace_qsort (void * base, size_t nel, size_t width, - int (*compar)(const void *,const void *)) -{ - qsort (base, nel, width, compar); -} -# endif /* PACE_HAS_CPLUSPLUS */ -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_rand () -{ - return rand (); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_srand (unsigned int seed) -{ - srand (seed); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -int -pace_rand_r (unsigned int *seed) -{ -#if defined (PACE_HAS_REENTRANT) - return rand_r (seed); -#else /* ! PACE_HAS_REENTRANT */ - PACE_UNUSED_ARG (seed); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -#endif /* ! PACE_HAS_REENTRANT */ -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -double -pace_strtod (const char* nptr, - char** endptr) -{ - return strtod (nptr, endptr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_strtol (const char* nptr, - char** endptr, - int base) -{ - return strtol (nptr, endptr, base); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -unsigned long int -pace_strtoul (const char* nptr, - char** endptr, - int base) -{ - return strtoul (nptr, endptr, base); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_system (const char* string) -{ - return system (string); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_size_t -pace_wcstombs (char* s, - const pace_wchar_t* pwcs, - pace_size_t n) -{ - return wcstombs (s, pwcs, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_wctomb (char* s, pace_wchar_t wchar) -{ - return wctomb (s, wchar); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -/* Memory Management. */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_malloc (size_t size) -{ - return malloc (size); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_calloc (size_t nelem, size_t elsize) -{ - return calloc (nelem, elsize); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_free (void * ptr) -{ - free (ptr); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_realloc (void * ptr, size_t size) -{ - return realloc (ptr, size); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/posix/string.c b/PACE/pace/posix/string.c deleted file mode 100644 index 4d06077a947..00000000000 --- a/PACE/pace/posix/string.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/string.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/string.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/string.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/string.h b/PACE/pace/posix/string.h deleted file mode 100644 index f25fd8b077e..00000000000 --- a/PACE/pace/posix/string.h +++ /dev/null @@ -1,36 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/string.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STRING_H_POSIX -#define PACE_STRING_H_POSIX - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if !defined (PACE_NULL) -# define PACE_NULL NULL -#endif /* NULL */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STRING_H_POSIX */ diff --git a/PACE/pace/posix/string.inl b/PACE/pace/posix/string.inl deleted file mode 100644 index de23cfacf52..00000000000 --- a/PACE/pace/posix/string.inl +++ /dev/null @@ -1,206 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/string.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include -#include "pace/string.h" - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memchr (const void *s, int c, pace_size_t n) -{ - return (void*) memchr (s, c, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_memcmp (const void *s1, const void *s2, pace_size_t n) -{ - return memcmp (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memcpy (void * s1, const void * s2, pace_size_t n) -{ - return memcpy (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memmove (void *s1, const void *s2, pace_size_t n) -{ - return memmove (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_BROKEN_INLINE -void * -pace_memset (void *s, int c, pace_size_t n) -{ - return memset (s, c, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strcat (char * s1, const char * s2) -{ - return strcat (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strncat (char * s1, const char * s2, size_t n) -{ - return strncat (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strchr (const char * s, int c) -{ - return (char*) strchr (s, c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strrchr (const char * s, int c) -{ - return (char*) strrchr (s, c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -int -pace_strcmp (const char * s1, const char * s2) -{ - return strcmp (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -int -pace_strncmp (const char * s1, const char * s2, size_t n) -{ - return strncmp (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -char * -pace_strcpy (char * s1, const char * s2) -{ - return strcpy (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strncpy (char * s1, const char * s2, size_t n) -{ - return strncpy (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -size_t -pace_strcspn (const char * s1, const char * s2) -{ - return strcspn (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strspn (const char * s1, const char * s2) -{ - return strspn (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strlen (const char * s) -{ - return strlen (s); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -char * -pace_strpbrk (const char * s1, const char * s2) -{ - return (char*) strpbrk (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strstr (const char * s1, const char * s2) -{ - return (char*) strstr (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strtok (char * s1, const char * s2) -{ - return strtok (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -char * -pace_strtok_r (char * s, const char * sep, char ** lasts) -{ -# if defined (PACE_HAS_REENTRANT) || (PACE_LYNXOS) || (PACE_SUNOS) - return strtok_r (s, sep, lasts); -# else /* ! PACE_HAS_REENTRANT */ - PACE_UNUSED_ARG (s); - PACE_UNUSED_ARG (sep); - PACE_UNUSED_ARG (lasts); - PACE_ERRNO_NO_SUPPORT (); - return 0; -# endif /* ! PACE_HAS_REENTRANT */ -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ diff --git a/PACE/pace/posix/termios.c b/PACE/pace/posix/termios.c deleted file mode 100644 index e828411f160..00000000000 --- a/PACE/pace/posix/termios.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/termios.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/termios.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/termios.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/termios.h b/PACE/pace/posix/termios.h deleted file mode 100644 index e2fdb0d8af8..00000000000 --- a/PACE/pace/posix/termios.h +++ /dev/null @@ -1,50 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/termios.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_TERMIOS_H_POSIX -#define PACE_SYS_TERMIOS_H_POSIX - -#include "pace/sys/types.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS) */ - -#ifndef PACE_CC_T -#define PACE_CC_T -typedef cc_t pace_cc_t; -#endif /* PACE_CC_T */ - -#ifndef PACE_SPEED_T -#define PACE_SPEED_T -typedef speed_t pace_speed_t; -#endif /* PACE_SPEED_T */ - -#ifndef PACE_TCFLAG_T -#define PACE_TCFLAG_T -typedef tcflag_t pace_tcflag_t; -#endif /* PACE_TCFLAG_T */ - -#ifndef PACE_TERMIOS -#define PACE_TERMIOS -typedef struct termios pace_termios; -#endif /* PACE_TERMIOS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TERMIOS_H_POSIX */ diff --git a/PACE/pace/posix/termios.inl b/PACE/pace/posix/termios.inl deleted file mode 100644 index df12227a79e..00000000000 --- a/PACE/pace/posix/termios.inl +++ /dev/null @@ -1,109 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/termios.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/unistd.h" -#include - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -pace_speed_t -pace_cfgetospeed (const pace_termios *termiosp) -{ - return cfgetospeed (termiosp); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_cfsetospeed (pace_termios *termios_p, pace_speed_t speed) -{ - return cfsetospeed (termios_p, speed); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -pace_speed_t -pace_cfgetispeed (const pace_termios *termios_p) -{ - return cfgetispeed (termios_p); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_cfsetispeed (pace_termios *termios_p, pace_speed_t speed) -{ - return cfsetispeed (termios_p, speed); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcdrain (PACE_HANDLE fildes) -{ - return tcdrain (fildes); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcgetattr (PACE_HANDLE fildes, pace_termios *termios_p) -{ - return tcgetattr (fildes, termios_p); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcflow (PACE_HANDLE fildes, int action) -{ - return tcflow (fildes, action); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcflush (PACE_HANDLE fildes, int queue_selector) -{ - return tcflush (fildes, queue_selector); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcsendbreak (PACE_HANDLE fildes, int duration) -{ - return tcsendbreak (fildes, duration); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcsetattr (PACE_HANDLE fildes, - int optional_actions, - const pace_termios *termios_p) -{ - return tcsetattr (fildes, optional_actions, termios_p); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ diff --git a/PACE/pace/posix/time.c b/PACE/pace/posix/time.c deleted file mode 100644 index 08f00379305..00000000000 --- a/PACE/pace/posix/time.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/time.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/time.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/time.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/time.h b/PACE/pace/posix/time.h deleted file mode 100644 index 8fb12b9f360..00000000000 --- a/PACE/pace/posix/time.h +++ /dev/null @@ -1,95 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/time.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_TIME_H_POSIX -#define PACE_TIME_H_POSIX - -#if PACE_LINUX -# include "pace/emulation/time.h" -#endif /* PACE_LINUX */ - -#include -#include "pace/signal.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_CLK_TCK CLK_TCK -#define PACE_CLOCKS_PER_SEC CLOCKS_PER_SEC -#define PACE_CLOCK_REALTIME CLOCK_REALTIME -#ifndef PACE_NULL -#define PACE_NULL NULL -#endif /* PACE_NULL */ -#define PACE_TIMER_ABSTIME TIMER_ABSTIME - -#ifndef PACE_CLOCKID_T -#define PACE_CLOCKID_T -# if defined PACE_EMU_CLOCKID_T - typedef pace_emu_clockid_t pace_clockid_t; -# else - typedef clockid_t pace_clockid_t; -# endif /* PACE_LINUX */ -#endif /* PACE_CLOCKID_T */ - -#ifndef PACE_CLOCK_T -#define PACE_CLOCK_T - typedef clock_t pace_clock_t; -#endif /* PACE_CLOCK_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_TIMER_T -#define PACE_TIMER_T -# if defined PACE_EMU_TIMER_T - typedef pace_emu_timer_t pace_timer_t; -# else - typedef timer_t pace_timer_t; -# endif /* PACE_LINUX */ -#endif /* PACE_TIMER_T */ - -#ifndef PACE_TIME_T -#define PACE_TIME_T - typedef time_t pace_time_t; -#endif /* PACE_TIME_T */ - -#ifndef PACE_TM -#define PACE_TM - typedef struct tm pace_tm; -#endif /* PACE_TM */ - -#ifndef PACE_TIMESPEC -#define PACE_TIMESPEC - typedef struct timespec pace_timespec; -#endif /* PACE_TIMESPEC */ - -#ifndef PACE_ITIMERSPEC -#define PACE_ITIMERSPEC - typedef struct itimerspec pace_itimerspec; -#endif /* PACE_ITIMERSPEC */ - -#ifndef PACE_SIGEVENT -#define PACE_SIGEVENT - typedef struct sigevent pace_sigevent; -#endif /* PACE_SIGEVENT */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_TIME_H_POSIX */ diff --git a/PACE/pace/posix/time.inl b/PACE/pace/posix/time.inl deleted file mode 100644 index 415e728eb36..00000000000 --- a/PACE/pace/posix/time.inl +++ /dev/null @@ -1,324 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/time.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/errno.h" -#include "pace/signal.h" -extern int errno; - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_asctime (const pace_tm * time) -{ - return asctime (time); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -char * -pace_asctime_r (const pace_tm * time, char * buf) -{ -#if (PACE_LYNXOS) - /*lynxos 3.1 has POSIX.4 Draft 9 versions of this */ - if (asctime_r (time, buf, 26) != 0) - return (char*) 0; - return buf; -#else - return asctime_r (time, buf); -#endif /* PACE_LYNXOS */ -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_clock_t -pace_clock (void) -{ - return clock (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -double -pace_difftime (pace_time_t time1, pace_time_t time2) -{ - return difftime (time1, time2); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_clock_getres (pace_clockid_t clock_id, - pace_timespec * res) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (clock_id); - PACE_UNUSED_ARG (res); - return -1; -#else - return clock_getres (clock_id, res); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_clock_gettime (pace_clockid_t clock_id, - pace_timespec * tp) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (clock_id); - PACE_UNUSED_ARG (tp); - return -1; -#else - return clock_gettime (clock_id, tp); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_clock_settime (pace_clockid_t clock_id, - const pace_timespec * tp) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (clock_id); - PACE_UNUSED_ARG (tp); - return -1; -#else - return clock_settime (clock_id, PACE_NONCONST_ARG_CAST (struct timespec *) tp); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_ctime (const pace_time_t * clock) -{ - return ctime (clock); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -char * -pace_ctime_r (const pace_time_t * clock, char * buf) -{ -# if (PACE_LYNXOS) - return ctime_r (clock, buf, 26); -# else - return ctime_r (clock, buf); -# endif /* PACE_SUNOS */ -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -pace_tm * -pace_gmtime (const pace_time_t * clock) -{ - return gmtime (clock); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -pace_tm * -pace_gmtime_r (const pace_time_t * clock, pace_tm * result) -{ -#if (PACE_LYNXOS) - /*lynxos 3.1 has POSIX.4 Draft 9 versions of these */ - if (gmtime_r (result, clock) != 0) - return (pace_tm*)0; - return result; -#else - return gmtime_r (clock, result); -#endif /* PACE_LYNXOS */ -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -pace_tm * -pace_localtime (const pace_time_t * clock) -{ - return localtime (clock); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -pace_tm * -pace_localtime_r (const pace_time_t * clock, pace_tm * result) -{ -#if (PACE_LYNXOS) - /*lynxos 3.1 has POSIX.4 Draft 9 versions of these */ - if (localtime_r (result, clock) != 0) - return (pace_tm*)0; - return result; -#else - return localtime_r (clock, result); -#endif /* PACE_LYNXOS */ -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -time_t -pace_mktime (pace_tm * timeptr) -{ - return mktime (timeptr); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_nanosleep (const pace_timespec * rqtp, - pace_timespec * rmtp) -{ - return nanosleep (PACE_NONCONST_ARG_CAST (struct timespec *) rqtp, rmtp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strftime (char *s, pace_size_t maxsize, - const char *format, - const pace_tm *timeptr) -{ - return strftime (s, maxsize, format, timeptr); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -time_t -pace_time (pace_time_t * tloc) -{ - return time (tloc); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_create (pace_clockid_t clock_id, - pace_sigevent * evp, - pace_timer_t *timerid) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (clock_id); - PACE_UNUSED_ARG (evp); - PACE_UNUSED_ARG (timerid); - return -1; -#else - return timer_create (clock_id, evp, timerid); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_delete (pace_timer_t timerid) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (timerid); - return -1; -#else - return timer_delete (timerid); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_getoverrun (pace_timer_t timerid) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (timerid); - return -1; -#else - return timer_getoverrun (timerid); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_gettime (pace_timer_t timerid, - pace_itimerspec * value) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (timerid); - PACE_UNUSED_ARG (value); - return -1; -#else - return timer_gettime (timerid, value); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_settime (pace_timer_t timerid, - int flags, - const pace_itimerspec * value, - pace_itimerspec * ovalue) -{ -#if PACE_LINUX - errno = ENOSYS; - PACE_UNUSED_ARG (timerid); - PACE_UNUSED_ARG (flags); - PACE_UNUSED_ARG (value); - PACE_UNUSED_ARG (ovalue); - return -1; -#else - return timer_settime (timerid, flags, PACE_NONCONST_ARG_CAST (struct itimerspec *) value, ovalue); -#endif /* PACE_LINUX */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_tzset () -{ -# if defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS) - tzset (); -# else /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */ - PACE_ERRNO_NO_SUPPORT (); -# endif /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */ - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/posix/times.c b/PACE/pace/posix/times.c deleted file mode 100644 index 3e47e331020..00000000000 --- a/PACE/pace/posix/times.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/times.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/times.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/times.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/times.h b/PACE/pace/posix/times.h deleted file mode 100644 index 1aeebd76a29..00000000000 --- a/PACE/pace/posix/times.h +++ /dev/null @@ -1,39 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/times.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_TIMES_H_POSIX -#define PACE_SYS_TIMES_H_POSIX - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_CLOCK_T -#define PACE_CLOCK_T -typedef clock_t pace_clock_t; -#endif /* PACE_CLOCK_T */ - -#ifndef PACE_TMS -#define PACE_TMS -typedef struct tms pace_tms; -#endif /* PACE_TMS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TIMES_H_POSIX */ diff --git a/PACE/pace/posix/times.inl b/PACE/pace/posix/times.inl deleted file mode 100644 index 5c808d1a7d0..00000000000 --- a/PACE/pace/posix/times.inl +++ /dev/null @@ -1,23 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/times.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pace_clock_t -pace_times (pace_tms * buffer) -{ - return times (buffer); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/PACE/pace/posix/types.h b/PACE/pace/posix/types.h deleted file mode 100644 index 9ce4e5c2c85..00000000000 --- a/PACE/pace/posix/types.h +++ /dev/null @@ -1,134 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/types.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#include -#include - -#ifndef PACE_SYS_TYPES_H_POSIX -#define PACE_SYS_TYPES_H_POSIX - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /* For future upgradeability to wchar */ -#ifndef PACE_TCHAR -#define PACE_TCHAR - typedef char pace_tchar; -#endif /* PACE_TCHAR */ - -#ifndef PACE_HANDLE - typedef int PACE_HANDLE; -#endif /* PACE_HANDLE */ - -#ifndef PACE_INVALID_HANDLE -#define PACE_INVALID_HANDLE -1 -#endif /* PACE_INVALID_HANDLE */ - -#ifndef PACE_DEV_T -#define PACE_DEV_T - typedef dev_t pace_dev_t; -#endif /* PACE_DEV_T */ - -#ifndef PACE_GID_T -#define PACE_GID_T - typedef gid_t pace_gid_t; -#endif /* PACE_GID_T */ - -#ifndef PACE_INO_T -#define PACE_INO_T - typedef ino_t pace_ino_t; -#endif /* PACE_INO_T */ - -#ifndef PACE_MODE_T -#define PACE_MODE_T - typedef mode_t pace_mode_t; -#endif /* PACE_MODE_T */ - -#ifndef PACE_NLINK_T -#define PACE_NLINK_T - typedef nlink_t pace_nlink_t; -#endif /* PACE_NLINK_T */ - -#ifndef PACE_OFF_T -#define PACE_OFF_T - typedef off_t pace_off_t; -#endif /* PACE_OFF_T */ - -#ifndef PACE_PID_T -#define PACE_PID_T - typedef pid_t pace_pid_t; -#endif /* PACE_PID_T */ - -#ifndef PACE_PTHREAD_ATTR_T -#define PACE_PTHREAD_ATTR_T - typedef pthread_attr_t pace_pthread_attr_t; -#endif /* PACE_PTHREAD_ATTR_T */ - -#ifndef PACE_PTHREAD_CONDATTR_T -#define PACE_PTHREAD_CONDATTR_T - typedef pthread_condattr_t pace_pthread_condattr_t; -#endif /* PACE_PTHREAD_CONDATTR_T */ - -#ifndef PACE_PTHREAD_COND_T -#define PACE_PTHREAD_COND_T - typedef pthread_cond_t pace_pthread_cond_t; -#endif /* PACE_PTHREAD_COND_T */ - -#ifndef PACE_PTHREAD_KEY_T -#define PACE_PTHREAD_KEY_T - typedef pthread_key_t pace_pthread_key_t; -#endif /* PACE_PTHREAD_KEY_T */ - -#ifndef PACE_PTHREAD_MUTEXATTR_T -#define PACE_PTHREAD_MUTEXATTR_T - typedef pthread_mutexattr_t pace_pthread_mutexattr_t; -#endif /* PACE_PTHREAD_MUTEXATTR_T */ - -#ifndef PACE_PTHREAD_MUTEX_T -#define PACE_PTHREAD_MUTEX_T - typedef pthread_mutex_t pace_pthread_mutex_t; -#endif /* PACE_PTHREAD_MUTEX_T */ - -#ifndef PACE_PTHREAD_ONCE_T -#define PACE_PTHREAD_ONCE_T - typedef pthread_once_t pace_pthread_once_t; -#endif /* PACE_PTHREAD_ONCE_T */ - -#ifndef PACE_PTHREAD_T -#define PACE_PTHREAD_T - typedef pthread_t pace_pthread_t; -#endif /* PACE_PTHREAD_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_SSIZE_T -#define PACE_SSIZE_T - typedef ssize_t pace_ssize_t; -#endif /* PACE_SSIZE_T */ - -#ifndef PACE_UID_T -#define PACE_UID_T - typedef uid_t pace_uid_t; -#endif /* PACE_UID_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TYPES_H_POSIX */ diff --git a/PACE/pace/posix/unistd.c b/PACE/pace/posix/unistd.c deleted file mode 100644 index f8e1e9a4676..00000000000 --- a/PACE/pace/posix/unistd.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/unistd.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/unistd.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/unistd.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/unistd.h b/PACE/pace/posix/unistd.h deleted file mode 100644 index 0b79b75b43b..00000000000 --- a/PACE/pace/posix/unistd.h +++ /dev/null @@ -1,56 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/unistd.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_UNISTD_H_POSIX -#define PACE_UNISTD_H_POSIX - -#include "pace/sys/types.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_F_OK F_OK -#ifndef PACE_NULL -# define PACE_NULL NULL -#endif /* PACE_NULL */ -#define PACE_R_OK R_OK -#define PACE_SEEK_CUR SEEK_CUR -#define PACE_SEEK_END SEEK_END -#define PACE_SEEK_SET SEEK_SET -#define PACE_STDERR_FILENO STDERR_FILENO -#define PACE_STDIN_FILENO STDIN_FILENO -#define PACE_STDOUT_FILENO STDOUT_FILENO -#define PACE_W_OK W_OK -#define PACE_X_OK X_OK - -/* _POSIX _PC _SC Macros need to go here */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T -typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_SSIZE_T -#define PACE_SSIZE_T -typedef ssize_t pace_ssize_t; -#endif /* PACE_SSIZE_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_UNISTD_H_POSIX */ diff --git a/PACE/pace/posix/unistd.inl b/PACE/pace/posix/unistd.inl deleted file mode 100644 index c0496a7da7c..00000000000 --- a/PACE/pace/posix/unistd.inl +++ /dev/null @@ -1,470 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/unistd.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include -#include -#include - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -void -pace__exit (int status) -{ - _exit (status); - return; -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_access (const char * path, int amode) -{ - return access (path, amode); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -unsigned int -pace_alarm (unsigned int seconds) -{ - return alarm (seconds); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_chdir (const char * path) -{ - return chdir (path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FA_UOF) -PACE_INLINE -int -pace_chown (const char * path, uid_t owner, pace_gid_t group) -{ - return chown (path, owner, group); -} -#endif /* PACE_HAS_POSIX_FA_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_close (PACE_HANDLE fildes) -{ - return close (fildes); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -PACE_HANDLE -pace_dup (PACE_HANDLE fildes) -{ - return dup (fildes); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -PACE_HANDLE -pace_dup2 (PACE_HANDLE fildes, PACE_HANDLE fildes2) -{ - return dup2 (fildes, fildes2); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -int -pace_execv (const char * path, - char * const argv[]) -{ - return execv (path, argv); - /* if successful, this operation does NOT return */ -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -int -pace_execve (const char * path, - char * const argv[], - char * const envp[]) -{ - return execve (path, argv, envp); - /* if successful, this operation does NOT return */ -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -int -pace_execvp (const char * file, - char * const argv[]) -{ - return execvp (file, argv); - /* if successful, this operation does NOT return */ -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fdatasync (PACE_HANDLE fildes) -{ - return fdatasync (fildes); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_fork () -{ - return fork (); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -long -pace_fpathconf (PACE_HANDLE fildes, int name) -{ - return fpathconf (fildes, name); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fsync (PACE_HANDLE fildes) -{ - return fsync (fildes); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_ftruncate (PACE_HANDLE fildes, pace_off_t length) -{ - return ftruncate (fildes, length); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -char * -pace_getcwd (char * buf, size_t size) -{ - return getcwd (buf, size); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -uid_t -pace_getegid () -{ - return getegid (); -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -uid_t -pace_geteuid () -{ - return geteuid (); -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -int -pace_getgroups (int gidsetsize, pace_gid_t grouplist[]) -{ - return getgroups (gidsetsize, grouplist); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -uid_t -pace_getgid () -{ - return getgid (); -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -char* -pace_getlogin () -{ - return getlogin (); -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UGR_UOF) -PACE_INLINE -int -pace_getlogin_r (char * name, size_t namesize) -{ - /* this func will eventually get rewritten to * - * autodetect _REENTRANT correctly */ -#if (PACE_HAS_REENTRANT) || (PACE_LYNXOS) || (PACE_SUNOS) - /* supported call */ - return getlogin_r (name, namesize); -#else - /* unsupported call (emulated) * - * careful, emulation is not 100% reentrant safe */ - char * non_reentrant_ptr_to_static_os_memory = getlogin (); - if (0 == non_reentrant_ptr_to_static_os_memory) - return errno; - strncpy (name, non_reentrant_ptr_to_static_os_memory, namesize); - return 1; -#endif /* PACE_HAS_REENTRANT */ -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pid_t -pace_getpgrp () -{ - return getpgrp (); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_getpid () -{ - return getpid (); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_getppid () -{ - return getppid (); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -uid_t -pace_getuid () -{ - return getuid (); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_isatty (int fildes) -{ - return isatty (fildes); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_link (const char * existing, const char * new_link) -{ - return link (existing, new_link); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -pace_off_t -pace_lseek (PACE_HANDLE fildes, pace_off_t offset, int whence) -{ - return lseek (fildes, offset, whence); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -long -pace_pathconf (const char * path, int name) -{ - return pathconf (path, name); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_pause () -{ - return pause (); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_P_UOF) -PACE_INLINE -int -pace_pipe (PACE_HANDLE fildes[2]) -{ - return pipe (fildes); -} -#endif /* PACE_HAS_POSIX_P_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -ssize_t -pace_read (PACE_HANDLE fildes, void * buf, size_t nbyte) -{ - return read (fildes, buf, nbyte); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_rmdir (const char * path) -{ - return rmdir (path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -int -pace_setgid (pace_gid_t gid) -{ - return setgid (gid); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_JC_UOF) -PACE_INLINE -int -pace_setpgid (pid_t pid, pid_t pgid) -{ - return setpgid (pid, pgid); -} -#endif /* PACE_HAS_POSIX_JC_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pid_t -pace_setsid () -{ - return setsid (); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -int -pace_setuid (uid_t uid) -{ - return setuid (uid); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -unsigned int -pace_sleep (unsigned int seconds) -{ - return sleep (seconds); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_SP_UOF) -PACE_INLINE -long -pace_sysconf (int name) -{ - return sysconf (name); -} -#endif /* PACE_HAS_POSIX_SP_UOF */ - -#if (PACE_HAS_POSIX_JC_UOF) -PACE_INLINE -pid_t -pace_tcgetpgrp (PACE_HANDLE fildes) -{ - return tcgetpgrp (fildes); -} -#endif /* PACE_HAS_POSIX_JC_UOF */ - -#if (PACE_HAS_POSIX_JC_UOF) -PACE_INLINE -int -pace_tcsetpgrp (PACE_HANDLE fildes, pid_t pgrp_id) -{ - return tcsetpgrp (fildes, pgrp_id); -} -#endif /* PACE_HAS_POSIX_JC_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -char * -pace_ttyname (PACE_HANDLE fildes) -{ - return ttyname (fildes); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_ttyname_r (PACE_HANDLE fildes, - char * name, - size_t namesize) -{ -#if (PACE_SUNOS) || (PACE_LYNXOS) - if (ttyname_r (fildes, name, (int) namesize) == 0) - return errno; - return 0; -#else - return ttyname_r (fildes, name, namesize); -#endif /* PACE_SUNOS */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_unlink (const char * path) -{ - return unlink (path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -ssize_t -pace_write (PACE_HANDLE fildes, const void * buf, size_t nbyte) -{ - return write (fildes, buf, nbyte); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ diff --git a/PACE/pace/posix/utime.c b/PACE/pace/posix/utime.c deleted file mode 100644 index 864e8d422b1..00000000000 --- a/PACE/pace/posix/utime.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/utime.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/utime.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/utime.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/utime.h b/PACE/pace/posix/utime.h deleted file mode 100644 index 00018e31751..00000000000 --- a/PACE/pace/posix/utime.h +++ /dev/null @@ -1,35 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/utime.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_UTIME_H_POSIX -#define PACE_UTIME_H_POSIX - -#include "pace/sys/types.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_UTIMBUF -#define PACE_UTIMBUF -typedef struct utimbuf pace_utimbuf; -#endif /* PACE_UTIMBUF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_UTIME_H_POSIX */ diff --git a/PACE/pace/posix/utime.inl b/PACE/pace/posix/utime.inl deleted file mode 100644 index 589229d3b38..00000000000 --- a/PACE/pace/posix/utime.inl +++ /dev/null @@ -1,24 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/utime.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_utime (const char * path, - const pace_utimbuf * times) -{ - return utime (path, times); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/posix/utsname.c b/PACE/pace/posix/utsname.c deleted file mode 100644 index 1fa1461795e..00000000000 --- a/PACE/pace/posix/utsname.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/utsname.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/utsname.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/utsname.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/utsname.h b/PACE/pace/posix/utsname.h deleted file mode 100644 index 0e7d58e6f95..00000000000 --- a/PACE/pace/posix/utsname.h +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/utsname.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_UTSNAME_H_POSIX -#define PACE_SYS_UTSNAME_H_POSIX - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_UTSNAME -#define PACE_UTSNAME -typedef struct utsname pace_utsname; -#endif /* PACE_UTSNAME */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_UTSNAME_H_POSIX */ diff --git a/PACE/pace/posix/utsname.inl b/PACE/pace/posix/utsname.inl deleted file mode 100644 index 84797fd519e..00000000000 --- a/PACE/pace/posix/utsname.inl +++ /dev/null @@ -1,23 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/utsname.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_SP_UOF) -PACE_INLINE -int -pace_uname (pace_utsname * name) -{ - return uname (name); -} -#endif /* PACE_HAS_POSIX_SP_UOF */ diff --git a/PACE/pace/posix/wait.c b/PACE/pace/posix/wait.c deleted file mode 100644 index 786b8e59fbd..00000000000 --- a/PACE/pace/posix/wait.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/wait.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/wait.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/posix/wait.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/posix/wait.h b/PACE/pace/posix/wait.h deleted file mode 100644 index 4bc233da5b5..00000000000 --- a/PACE/pace/posix/wait.h +++ /dev/null @@ -1,38 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/wait.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_WAIT_H_POSIX -#define PACE_WAIT_H_POSIX - -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_WEXITSTATUS WEXITSTATUS -#define PACE_WIFEXITED WIFEXITED -#define PACE_WIFSIGNALED WISIGNALED -#define PACE_WIFSTOPPED WIFSTOPPED -#define PACE_WNOHANG WNOHANG -#define PACE_WSTOPSIG WSTOPSIG -#define PACE_WTERMSIG WTERMSIG -#define PACE_WUNTRACED WUNTRACED - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_WAIT_H */ diff --git a/PACE/pace/posix/wait.inl b/PACE/pace/posix/wait.inl deleted file mode 100644 index f1f98ad4d5e..00000000000 --- a/PACE/pace/posix/wait.inl +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/wait.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_wait (int * statloc) -{ - return wait (statloc); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_waitpid (pid_t pid, int * statloc, int options) -{ - return waitpid (pid, statloc, options); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/PACE/pace/pthread.h b/PACE/pace/pthread.h deleted file mode 100644 index a744915833d..00000000000 --- a/PACE/pace/pthread.h +++ /dev/null @@ -1,733 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/pthread.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_PTHREAD_H -#define PACE_PTHREAD_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/pthread.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/pthread.h" -#elif (PACE_WIN32) -# include "pace/win32/pthread.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function pthread_atfork. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.1.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_atfork (void (*prepare) (void), - void (*parent) (void), - void (*child) (void)); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_destroy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_destroy (pace_pthread_attr_t * attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_getdetachstate. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_getdetachstate (const pace_pthread_attr_t * attr, - int * detachstate); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_getinheritsched. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.5.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_getinheritsched (const pace_pthread_attr_t * attr, - int * inheritsched); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_getschedparam. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.5.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_getschedparam (const pace_pthread_attr_t * attr, - pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_getschedpolicy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.5.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr, - int * policy); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_getscope. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.5.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_getscope (const pace_pthread_attr_t * attr, - int * contentionscope); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_getstackaddr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_getstackaddr (const pace_pthread_attr_t * attr, - void ** stackaddr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_getstacksize. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_getstacksize (const pace_pthread_attr_t * attr, - size_t * stacksize); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_init. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_init (pace_pthread_attr_t * attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_setdetachstate. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_setdetachstate (pace_pthread_attr_t * attr, - int detachstate); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_setinheritsched. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.5.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_setinheritsched (pace_pthread_attr_t * attr, - int inheritsched); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_setschedparam. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.5.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_setschedparam (pace_pthread_attr_t * attr, - const pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_setschedpolicy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.5.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_setschedpolicy (pace_pthread_attr_t * attr, - int policy); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_setscope. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.5.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_setscope (pace_pthread_attr_t * attr, - int contentionscope); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_setstackaddr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_setstackaddr (pace_pthread_attr_t * attr, - void * stackaddr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_attr_setstacksize. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_attr_setstacksize (pace_pthread_attr_t * attr, - size_t stacksize); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_cancel. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 18.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_cancel (pace_pthread_t thread); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_cleanup_push. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 18.2.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -# define pace_pthread_cleanup_push(routine, arg) \ - pthread_cleanup_push (routine, arg) -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_cleanup_pop. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 18.2.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -# define pace_pthread_cleanup_pop(execute) \ - pthread_cleanup_pop (execute) -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -# define PACE_PTHREAD_COND_INITIALIZER PTHREAD_COND_INITIALIZER - - /** - PACE's implementation of the POSIX function pthread_cond_broadcast. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_cond_broadcast (pace_pthread_cond_t * cond); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_cond_destroy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_cond_destroy (pace_pthread_cond_t * cond); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_cond_init. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_cond_init (pace_pthread_cond_t * cond, - const pace_pthread_condattr_t * attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_cond_signal. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_cond_signal (pace_pthread_cond_t * cond); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_cond_timedwait. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_cond_timedwait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex, - const pace_timespec * abstime); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_cond_wait. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_cond_wait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_condattr_destroy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_condattr_destroy (pace_pthread_condattr_t * attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_condattr_getpshared. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_condattr_getpshared (const pace_pthread_condattr_t * attr, - int * pshared); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_condattr_init. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_condattr_init (pace_pthread_condattr_t * attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_condattr_setpshared. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.4.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_condattr_setpshared (pace_pthread_condattr_t * attr, - int pshared); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_create. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, - void * (*start_routine) (void*), - void * arg); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_detach. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_detach (pace_pthread_t thread); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_equal. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.7. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_equal (pace_pthread_t t1, - pace_pthread_t t2); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_exit. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.5. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - void pace_pthread_exit (void * value_ptr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_getschedparam. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.2.5. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_getschedparam (pace_pthread_t thread, - int * policy, - pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_getspecific. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 17.1.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - void * pace_pthread_getspecific (pace_pthread_key_t key); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_join. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_join (pace_pthread_t thread, - void ** value_ptr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_key_create. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 17.1.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_key_create (pace_pthread_key_t * key, - void (*destructor)(void*)); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_key_delete. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 17.1.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_key_delete (pace_pthread_key_t key); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_kill. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.10. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_kill (pace_pthread_t thread, - int sig); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutex_destroy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.3.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutex_destroy (pace_pthread_mutex_t * mutex); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutex_getprioceiling. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.6.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutex_getprioceiling (pace_pthread_mutex_t * mutex, - int * prioceiling); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutex_init. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.3.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutex_init (pace_pthread_mutex_t * mutex, - const pace_pthread_mutexattr_t * attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutex_lock. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.3.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutex_lock (pace_pthread_mutex_t * mutex); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutex_setprioceiling. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.6.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutex_setprioceiling (pace_pthread_mutex_t * mutex, - int prioceiling, - int * old_ceiling); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutex_trylock. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.3.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutex_trylock (pace_pthread_mutex_t * mutex); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutex_unlock. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.3.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutex_unlock (pace_pthread_mutex_t * mutex); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutexattr_destroy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.3.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutexattr_destroy (pace_pthread_mutexattr_t * sttr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function - pthread_mutexattr_getprioceiling. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.6.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutexattr_getprioceiling (pace_pthread_mutexattr_t * attr, - int * prioceiling); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutexattr_getprotocol. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.6.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutexattr_getprotocol (const pace_pthread_mutexattr_t * attr, - int * protocol); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function - pthread_mutexattr_setprioceiling. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.6.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutexattr_setprioceiling (pace_pthread_mutexattr_t * attr, - int prioceiling); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutexattr_setprotocol. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.6.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr, - int protocol); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutexattr_getpshared. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.3.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutexattr_getpshared (const pace_pthread_mutexattr_t * attr, - int * pshared); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutexattr_init. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.3.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutexattr_init (pace_pthread_mutexattr_t * attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_mutexattr_setpshared. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.3.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr, - int pshared); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_once. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.8. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_once (pace_pthread_once_t * once_control, - void (*void_routine) (void)); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -# define PACE_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT - - /** - PACE's implementation of the POSIX function pthread_self. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 16.2.6. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - pace_pthread_t pace_pthread_self (); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_setcancelstate. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 18.2.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_setcancelstate (int state, - int * oldstate); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_setcanceltype. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 18.2.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_setcanceltype (int type, - int * oldtype); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_setschedparam. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.5.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_setschedparam (pace_pthread_t thread, - int policy, - const pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_setspecific. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 17.1.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_setspecific (pace_pthread_key_t key, - const void * value); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_sigmask. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.5. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - int pace_pthread_sigmask (int how, - const pace_sigset_t * set, - pace_sigset_t * oset); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function pthread_testcancel. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 18.2.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE - void pace_pthread_testcancel (); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/pthread.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/pthread.inl" -# elif (PACE_WIN32) -# include "pace/win32/pthread.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_PTHREAD_H */ diff --git a/PACE/pace/pwd.h b/PACE/pace/pwd.h deleted file mode 100644 index e4e9cf0bac5..00000000000 --- a/PACE/pace/pwd.h +++ /dev/null @@ -1,93 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/pwd.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_PWD_H -#define PACE_PWD_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/pwd.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/pwd.h" -#elif (PACE_WIN32) -# include "pace/win32/pwd.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function getpwuid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 9.2.2. - */ -#if (PACE_HAS_POSIX_SD_UOF) - PACE_Export PACE_INLINE pace_passwd * pace_getpwuid (pace_uid_t uid); -#endif /* PACE_HAS_POSIX_SD_UOF */ - - /** - PACE's implementation of the POSIX function getpwuid_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 9.2.2. - */ -#if (PACE_HAS_POSIX_SDR_UOF) - PACE_Export PACE_INLINE int pace_getpwuid_r (pace_uid_t uid, - pace_passwd * pwd, - char * buffer, - pace_size_t bufsize, - pace_passwd ** result); -#endif /* PACE_HAS_POSIX_SDR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - /** - PACE's implementation of the POSIX function getpwnam. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 9.2.2. - */ -#if (PACE_HAS_POSIX_SD_UOF) - PACE_Export PACE_INLINE pace_passwd * pace_getpwnam (const char * name); -#endif /* PACE_HAS_POSIX_SD_UOF */ - - /** - PACE's implementation of the POSIX function getpwnam_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 9.2.2. - */ -#if (PACE_HAS_POSIX_SDR_UOF) - PACE_Export PACE_INLINE int pace_getpwnam_r (const char * name, - pace_passwd * pwd, - char * buffer, - pace_size_t bufsize, - pace_passwd ** result); -#endif /* PACE_HAS_POSIX_SDR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/pwd.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/pwd.inl" -# elif (PACE_WIN32) -# include "pace/win32/pwd.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_PWD_H */ diff --git a/PACE/pace/sched.h b/PACE/pace/sched.h deleted file mode 100644 index 20c9dc50ca5..00000000000 --- a/PACE/pace/sched.h +++ /dev/null @@ -1,124 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/sched.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SCHED_H -#define PACE_SCHED_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/sched.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/sched.h" -#elif (PACE_WIN32) -# include "pace/win32/sched.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function sched_get_priority_max. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.3.6. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sched_get_priority_max (int policy); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sched_get_priority_min. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.3.6. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sched_get_priority_min (int policy); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sched_getparam. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.3.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sched_getparam (pace_pid_t pid, - pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sched_rr_get_interval. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.3.6. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sched_rr_get_interval (pace_pid_t pid, - pace_timespec * interval); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sched_setparam. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.3.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sched_setparam (pace_pid_t pid, - const pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sched_getscheduler. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.3.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sched_getscheduler (pace_pid_t pid); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sched_setscheduler. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.3.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sched_setscheduler (pace_pid_t pid, - int policy, - const pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sched_yield. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 13.3.5. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sched_yield (); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/sched.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/sched.inl" -# elif (PACE_WIN32) -# include "pace/win32/sched.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SCHED_H */ diff --git a/PACE/pace/semaphore.h b/PACE/pace/semaphore.h deleted file mode 100644 index 9c2a34824aa..00000000000 --- a/PACE/pace/semaphore.h +++ /dev/null @@ -1,130 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/semaphore.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SEMAPHORE_H -#define PACE_SEMAPHORE_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/semaphore.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/semaphore.h" -#elif (PACE_WIN32) -# include "pace/win32/semaphore.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function sem_close. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.2.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sem_close (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sem_destroy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.2.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sem_destroy (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sem_getvalue. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.2.8. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sem_getvalue (pace_sem_t * sem, int * sval); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sem_init. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sem_init (pace_sem_t * sem, - int pshared, - unsigned int value); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sem_open. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.2.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -# define pace_sem_open sem_open -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sem_post. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.2.7. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sem_post (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sem_trywait. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.2.6. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sem_trywait (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sem_unlink. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.2.5. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sem_unlink (const char * name); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sem_wait. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 11.2.6. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sem_wait (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/semaphore.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/semaphore.inl" -# elif (PACE_WIN32) -# include "pace/win32/semaphore.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SEMAPHORE_H */ diff --git a/PACE/pace/setjmp.h b/PACE/pace/setjmp.h deleted file mode 100644 index 99a6651982f..00000000000 --- a/PACE/pace/setjmp.h +++ /dev/null @@ -1,85 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/setjmp.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SETJMP_H -#define PACE_SETJMP_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/setjmp.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/setjmp.h" -#elif (PACE_WIN32) -# include "pace/win32/setjmp.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function setjmp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - /* int pace_setjmp (pace_jmp_buf env); */ -# define pace_setjmp setjmp -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function sigsetjmp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.1. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - /* int pace_sigsetjmp (pace_sigjmp_buf env, int savemask); */ -# define pace_sigsetjmp setjmp -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function longjmp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE void pace_longjmp (pace_jmp_buf env, int val); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function siglongjmp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.1. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE void pace_siglongjmp (pace_sigjmp_buf env, int val); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/setjmp.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/setjmp.inl" -# elif (PACE_WIN32) -# include "pace/win32/setjmp.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SETJMP_H */ diff --git a/PACE/pace/signal.h b/PACE/pace/signal.h deleted file mode 100644 index 6ca0a0f200c..00000000000 --- a/PACE/pace/signal.h +++ /dev/null @@ -1,199 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/signal.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#ifndef PACE_SIGNAL_H -#define PACE_SIGNAL_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/signal.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/signal.h" -#elif (PACE_WIN32) -# include "pace/win32/signal.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function kill. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.2. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_kill (pace_pid_t pid, int sig); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - C std 7.14.2.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_raise (int sig); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sigaction. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.4. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_sigaction (int sig, - const pace_sigaction_s * act, - pace_sigaction_s * oact); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function sigaddset. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.3. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_sigaddset (pace_sigset_t * set, int signo); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function sigemptyset. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.3. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_sigemptyset (pace_sigset_t * set); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function sigdelset. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.3. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_sigdelset (pace_sigset_t * set, int signo); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function sigfillset. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.3. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_sigfillset (pace_sigset_t * set); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function sigismember. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.3. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_sigismember (const pace_sigset_t * set, - int signo); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - C std 7.14.1.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE pace_sig_pf pace_signal(int sig, pace_sig_pf func); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sigpending. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.6. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_sigpending (pace_sigset_t * set); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function sigprocmask. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.5. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_sigprocmask (int how, - const pace_sigset_t * set, - pace_sigset_t * oset); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function sigqueue. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.9. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sigqueue (pace_pid_t pid, - int signo, - const pace_sigval value); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sigsuspend. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.7. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_sigsuspend (const pace_sigset_t * sigmask); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function sigtimedwait. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.8. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sigtimedwait (const pace_sigset_t * set, - pace_siginfo_t * info, - const pace_timespec * timeout); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function sigwait. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.8. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sigwait (const pace_sigset_t * set, - int * sig); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - /** - PACE's implementation of the POSIX function sigwaitinfo. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.3.8. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_sigwaitinfo (const pace_sigset_t * set, - pace_siginfo_t * info); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/signal.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/signal.inl" -# elif (PACE_WIN32) -# include "pace/win32/signal.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SIGNAL_H */ diff --git a/PACE/pace/stddef.h b/PACE/pace/stddef.h deleted file mode 100644 index 457dddcd50f..00000000000 --- a/PACE/pace/stddef.h +++ /dev/null @@ -1,53 +0,0 @@ -/* $Id$ - -* ============================================================================ -* -* = LIBRARY -* pace -* -* = FILENAME -* pace/stddef.h -* -* = AUTHOR -* John Heitmann -* -* =========================================================================== */ - -#ifndef PACE_STDDEF_H -#define PACE_STDDEF_H - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_NULL -#define PACE_NULL NULL; -#endif /* PACE_NULL */ - -#ifndef PACE_OFFSETOF -# define PACE_OFFSETOF -# define pace_offsetof offsetof; -#endif /* PACE_OFFSETOF */ - -#ifndef PACE_PTRDIFF_T -#define PACE_PTRDIFF_T -typedef ptrdiff_t pace_ptrdiff_t; -#endif /* PACE_PTRDIFF_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T -typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_WCHAR_T -#define PACE_WCHAR_T -typedef wchar_t pace_wchar_t; -#endif /* PACE_WCHAR_T */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STDDEF_H */ diff --git a/PACE/pace/stdio.h b/PACE/pace/stdio.h deleted file mode 100644 index 29cb3444e35..00000000000 --- a/PACE/pace/stdio.h +++ /dev/null @@ -1,528 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/stdio.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STDIO_H -#define PACE_STDIO_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/stdio.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/stdio.h" -#elif (PACE_WIN32) -# include "pace/win32/stdio.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function clearerr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE void pace_clearerr (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function ctermid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.7.1. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE char * pace_ctermid (char * s); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function fclose. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_fclose (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function fdopen. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.2.2. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE PACE_FILE * pace_fdopen (int fildes, - const char * type); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function ferror. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_ferror (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function feof. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_feof (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function fflush. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_fflush (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function fileno. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.2.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_fileno (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function fgetc. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_fgetc (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - C std 7.19.9.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_fgetpos(PACE_FILE * stream, - pace_fpos_t * pos); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function fgets. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE char * pace_fgets (char * s, int n, - PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function flockfile. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.2.6. - */ -#if (PACE_HAS_POSIX_FL_UOF) - PACE_Export PACE_INLINE void pace_flockfile (PACE_FILE * file); -#endif /* PACE_HAS_POSIX_FL_UOF */ - /* Requires PACE_HAS_REENTRANT. */ - - /** - PACE's implementation of the POSIX function fopen. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE PACE_FILE * pace_fopen (const char * filename, - const char * mode); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function fprintf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) -# define pace_fprintf fprintf -#endif /* PACE_HAS_POSIX_DI_UOF */ - /* int pace_fprintf (PACE_FILE *stream, const char *format, ...);*/ - - /** - PACE's implementation of the POSIX function fputc. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_fputc (int c, PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function fputs. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_fputs (const char * s, PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function fread. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE pace_size_t pace_fread (void * ptr, - pace_size_t size, - pace_size_t number_of_items, - PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function freopen. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE FILE * pace_freopen (const char * filename, - const char * mode, - PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function fscanf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) -# define pace_fscanf fscanf -#endif /* PACE_HAS_POSIX_DI_UOF */ - /* int pace_scanf (const char *format, ... ); */ - - /** - PACE's implementation of the POSIX function fseek. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_FM_UOF) - PACE_Export PACE_INLINE int pace_fseek (PACE_FILE * stream, - long offset, - int whence); -#endif /* PACE_HAS_POSIX_FM_UOF */ - - /** - C std 7.19.9.3 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_fsetpos(PACE_FILE *stream, - const pace_fpos_t *pos); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function ftell. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_FM_UOF) - PACE_Export PACE_INLINE long pace_ftell (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_FM_UOF */ - - /** - PACE's implementation of the POSIX function ftrylockfile. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.2.6. - */ -#if (PACE_HAS_POSIX_FL_UOF) - PACE_Export PACE_INLINE int pace_ftrylockfile (PACE_FILE * file); -#endif /* PACE_HAS_POSIX_FL_UOF */ - /* Requires PACE_HAS_REENTRANT. */ - - /** - PACE's implementation of the POSIX function funlockfile. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.2.6. - */ -#if (PACE_HAS_POSIX_FL_UOF) - PACE_Export PACE_INLINE void pace_funlockfile (PACE_FILE * file); -#endif /* PACE_HAS_POSIX_FL_UOF */ - /* Requires PACE_HAS_REENTRANT. */ - - /** - C std 7.19.8.2 - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE pace_size_t pace_fwrite(const void * ptr, - pace_size_t size, - pace_size_t nmemb, - PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function getc. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_getc (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function getc_unlocked. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.2.7. - */ -#if (PACE_HAS_POSIX_FL_UOF) - PACE_Export PACE_INLINE int pace_getc_unlocked (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_FL_UOF */ - /* Requires PACE_HAS_REENTRANT. */ - - /** - PACE's implementation of the POSIX function getchar. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_getchar (); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function getchar_unlocked. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.2.7. - */ -#if (PACE_HAS_POSIX_FL_UOF) - PACE_Export PACE_INLINE int pace_getchar_unlocked (); -#endif /* PACE_HAS_POSIX_FL_UOF */ - /* Requires PACE_HAS_REENTRANT. */ - - /** - PACE's implementation of the POSIX function gets. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE char *pace_gets (char * s); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function perror. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE void pace_perror (const char * s); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function printf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) -# define pace_printf printf -#endif /* PACE_HAS_POSIX_DI_UOF */ - /* int pace_printf (const char* format, ...); */ - - /** - PACE's implementation of the POSIX function putc. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_putc (int c, PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function putc_unlocked. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.2.7. - */ -#if (PACE_HAS_POSIX_FL_UOF) - PACE_Export PACE_INLINE int pace_putc_unlocked (int c, PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_FL_UOF */ - /* Requires PACE_HAS_REENTRANT. */ - - /** - PACE's implementation of the POSIX function putchar. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_putchar (int c); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function putchar_unlocked. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.2.7. - */ -#if (PACE_HAS_POSIX_FL_UOF) - PACE_Export PACE_INLINE int pace_putchar_unlocked (int c); -#endif /* PACE_HAS_POSIX_FL_UOF */ - /* Requires PACE_HAS_REENTRANT. */ - - /** - PACE's implementation of the POSIX function puts. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_puts (const char * s); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function remove. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_remove (const char * path); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function rename. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.5.3. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_rename (const char * old_name, - const char * new_name); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function rewind. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_FM_UOF) - PACE_Export PACE_INLINE void pace_rewind (PACE_FILE * stream); -#endif /* PACE_HAS_POSIX_FM_UOF */ - - /** - PACE's implementation of the POSIX function sprintf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) -# define pace_sprintf sprintf -#endif /* PACE_HAS_POSIX_DI_UOF */ - /* int pace_sprintf (char* s, const char* format, ...); */ - - /** - PACE's implementation of the POSIX function scanf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) -# define pace_scanf scanf -#endif /* PACE_HAS_POSIX_DI_UOF */ - /* int pace_scanf (const char *format, ... ); */ - - /** - PACE's implementation of the POSIX function setbuf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE void pace_setbuf (PACE_FILE * stream, char * buf); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - - /** - C std 7.19.5.6 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_setvbuf(PACE_FILE * stream, - char * buf, - int mode, pace_size_t size); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - /** - PACE's implementation of the POSIX function sscanf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) -# define pace_sscanf sscanf -#endif /* PACE_HAS_POSIX_DI_UOF */ - /* int pace_sscanf (const char *s, const char *format, ... ); */ - - /** - PACE's implementation of the POSIX function tmpfile. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE FILE * pace_tmpfile (); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function tmpnam. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE char * pace_tmpnam (char * s); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function ungetc. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_ungetc (int c, FILE * stream); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - C std 7.19.6.8 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_vfprintf (PACE_FILE * stream, - const char * format, - va_list arg); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std 7.19.6.10 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_vprintf (const char * format, - va_list arg); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std 7.19.6.13 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_vsprintf (char * s, - const char * format, - va_list arg); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/stdio.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/stdio.inl" -# elif (PACE_WIN32) -# include "pace/win32/stdio.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STDIO_H */ diff --git a/PACE/pace/stdlib.h b/PACE/pace/stdlib.h deleted file mode 100644 index 60c7ea203d1..00000000000 --- a/PACE/pace/stdlib.h +++ /dev/null @@ -1,305 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/stdlib.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STDLIB_H -#define PACE_STDLIB_H - -#include "pace/config/defines.h" -#include "pace/unistd.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/stdlib.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/stdlib.h" -#elif (PACE_WIN32) -# include "pace/win32/stdlib.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - C std 7.20.4.1 - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE void pace_abort (void); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function abs. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_abs (int val); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - C std ref. 7.20.4.2 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_atexit (void (*func)(void)); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function atof. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE double pace_atof (const char * str); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function atoi. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_atoi (const char * str); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function atol. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE long pace_atol (const char * str); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function bsearch. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE void * pace_bsearch (const void *key, - const void *base, - size_t nel, size_t size, - int (*compar)(const void *, - const void *)); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - C std ref. 7.20.6.2 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE pace_div_t pace_div (int numer, int denom); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function exit. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE void pace_exit (int status); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function getenv. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.6.1. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE char * pace_getenv (const char * name); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - C std ref. 7.20.6.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE long int pace_labs (long int j); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std ref. 7.20.6.2 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE pace_ldiv_t pace_ldiv (long int numer, - long int denom); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std ref. 7.20.7.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mblen (const char* s, pace_size_t n); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std ref. 7.20.8.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE pace_size_t pace_mbstowcs (pace_wchar_t* pwcs, - const char* s, - pace_size_t n); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std ref. 7.20.7.2 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mbtowc (pace_wchar_t* pwc, - const char* s, - pace_size_t n); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function qsort. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE void pace_qsort (void * base, - size_t nel, - size_t width, - int (*compar)(const void *, - const void *)); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function rand. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_rand (); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function srand. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE void pace_srand (unsigned int seed); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function rand_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.8. - */ -#if (PACE_HAS_POSIX_CLSR_UOF) - PACE_Export PACE_INLINE int pace_rand_r (unsigned int * seed); -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - /* Requires PACE_HAS_REENTRANT. */ - - /** - C std ref. 7.20.1.3 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE double pace_strtod (const char* nptr, - char** endptr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std ref. 7.20.1.4 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_strtol (const char* nptr, - char** endptr, - int base); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std ref. 7.20.7.2 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE unsigned long int pace_strtoul (const char* nptr, - char** endptr, - int base); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std ref. 7.20.4.5 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_system (const char* string); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std ref. 7.20.8.2 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE pace_size_t pace_wcstombs (char* s, - const pace_wchar_t* pwcs, - pace_size_t n); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std ref. 7.20.7.3 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_wctomb (char* s, pace_wchar_t wchar); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - - /* Memory Management */ - - /** - PACE's implementation of the POSIX function malloc. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE void * pace_malloc (size_t size); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function calloc. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE void * pace_calloc (size_t nelem, size_t elsize); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function free. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE void pace_free (void * ptr); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function realloc. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE void * pace_realloc (void * ptr, size_t size); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/stdlib.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/stdlib.inl" -# elif (PACE_WIN32) -# include "pace/win32/stdlib.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STDLIB_H */ diff --git a/PACE/pace/string.h b/PACE/pace/string.h deleted file mode 100644 index 5160715c601..00000000000 --- a/PACE/pace/string.h +++ /dev/null @@ -1,240 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/string.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STRING_H -#define PACE_STRING_H - -#include "pace/config/defines.h" -#include "pace/unistd.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/string.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/string.h" -#elif (PACE_WIN32) -# include "pace/win32/string.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - pace_memchr function, C std ref. 7.21.5.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE void * pace_memchr(const void *s, - int c, - pace_size_t n); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - pace_memcmp function, C std ref. 7.21.4.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_memcmp(const void *s1, - const void *s2, - pace_size_t n); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - pace_memcpy function, C std ref. 7.21.2.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE void *pace_memcpy(void * s1, - const void * s2, - pace_size_t n); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - pace_memmove function, C std ref.7.21.2.2 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE void *pace_memmove(void *s1, - const void *s2, - pace_size_t n); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - pace_memset function, C std ref. 7.21.6.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE void *pace_memset(void *s, int c, pace_size_t n); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function strcat. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_strcat (char * s1, const char * s2); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strncat. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_strncat (char * s1, - const char * s2, - size_t n); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strchr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_strchr (const char * s, int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strrchr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_strrchr (const char * s, int c); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strcmp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_strcmp (const char * s1, const char * s2); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strncmp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE int pace_strncmp (const char * s1, - const char * s2, - size_t n); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strcpy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_strcpy (char * s1, const char * s2); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strncpy. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_strncpy (char * s1, - const char * s2, - size_t n); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strcspn. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE size_t pace_strcspn (const char * s1, - const char * s2); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strspn. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE size_t pace_strspn (const char * s1, - const char * s2); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strlen. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE size_t pace_strlen (const char * s); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strpbrk. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_strpbrk (const char * s1, - const char * s2); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strstr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_strstr (const char * s1, - const char * s2); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strtok. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_strtok (char * s1, const char * s2); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function strtok_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.3. - */ -#if (PACE_HAS_POSIX_CLSR_UOF) - PACE_Export PACE_INLINE char * pace_strtok_r (char * s, - const char * sep, - char ** lasts); -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - /* Requires PACE_HAS_REENTRANT. */ - - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/string.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/string.inl" -# elif (PACE_WIN32) -# include "pace/win32/string.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STRING_H */ diff --git a/PACE/pace/sys/mman.h b/PACE/pace/sys/mman.h deleted file mode 100644 index 28d11481391..00000000000 --- a/PACE/pace/sys/mman.h +++ /dev/null @@ -1,151 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/sys/mman.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_MMAN_H -#define PACE_SYS_MMAN_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/mman.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/mman.h" -#elif (PACE_WIN32) -# include "pace/win32/mman.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function mlock. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.1.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mlock (const void * addr, pace_size_t len); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function mlockall. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.1.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mlockall (int flags); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function mmap. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE void * pace_mmap (void * addr, - pace_size_t len, - int prot, - int flags, - PACE_HANDLE fildes, - pace_off_t off); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function mprotect. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.2.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_mprotect (void * addr, - pace_size_t len, - int prot); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function msync. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.2.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_msync (void * addr, - pace_size_t len, - int flags); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function munlock. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.1.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_munlock (const void * addr, - pace_size_t len); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function munlockall. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.1.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_munlockall (); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function munmap. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.2.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_munmap (void * addr, pace_size_t len); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function shm_open. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.3.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE PACE_HANDLE pace_shm_open (const char * name, - int oflag, - pace_mode_t mode); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - /* Requires PACE_POSIX_C_SOURCE > 2. */ - - /** - PACE's implementation of the POSIX function shm_open. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 12.3.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_shm_unlink (const char * name); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - /* Requires PACE_POSIX_C_SOURCE > 2. */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/mman.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/mman.inl" -# elif (PACE_WIN32) -# include "pace/win32/mman.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_MMAN_H */ diff --git a/PACE/pace/sys/socket.h b/PACE/pace/sys/socket.h deleted file mode 100644 index 52b407cfeff..00000000000 --- a/PACE/pace/sys/socket.h +++ /dev/null @@ -1,252 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/sys/socket.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SOCKET_H -#define PACE_SOCKET_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/socket.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/socket.h" -#elif (PACE_WIN32) -# include "pace/win32/socket.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -/** - PACE's implementation of the POSIX function accept. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_accept (int s, - pace_sockaddr * socketaddress, - pace_socklen_t * addresslen); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function bind. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_bind (int s, - const pace_sockaddr * socketaddress, - pace_socklen_t addresslen); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function connect. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_connect (int s, - const pace_sockaddr * socketaddress, - pace_socklen_t addresslen); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function getpeername. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_getpeername (int s, - pace_sockaddr * socketaddress, - pace_socklen_t * addresslen); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function getsockname. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_getsockname (int s, - pace_sockaddr * socketaddress, - pace_socklen_t * addresslen); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function getsockopt. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_getsockopt (int s, - int level, - int optname, - void * optval, - pace_socklen_t optlen); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function setsockopt. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_setsockopt (int s, - int level, - int optname, - const * optval); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function isfdtype. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_isfdtype (int fildes, int fdtype); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function listen. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_listen (int s, int backlog); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function recv. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE pace_ssize_t pace_recv (int s, - void * buf, - pace_size_t len, - int flags); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function recvfrom. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE pace_ssize_t pace_recvfrom (int s, - void * buf, - pace_size_t len, - int flags, - pace_sockaddr * from, - pace_socklen_t * fromlen); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function recvmsg. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE pace_ssize_t pace_rcvmsg (int s, - pace_msghdr * msg, - int flags); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function send. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE pace_ssize_t pace_send (int s, - const void * buf, - pace_size_t len, - int flags); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function sendto. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE pace_ssize_t pace_sendto (int s, - const void * buf, - pace_size_t len, - int flags, - const pace_sockaddr * to, - pace_socklen_t * tolen); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function sendmsg. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE pace_ssize_t pace_sendmsg (int s, - const pace_msghdr * msg, - int flags); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function shutdown. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_shutdown (int s, int how); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function socket. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_socket (int protofamily, - int type, - int protocol); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -/** - PACE's implementation of the POSIX function socketpair. - See IEEE Standards Project Approved 30 January 2000. - (IEEE Std P1003.1g, D6.6, March 1997 Edition) -*/ -#if (PACE_HAS_POSIX_SOCK_UOF) - PACE_Export PACE_INLINE int pace_socketpair (int protofamily, - int type, - int protocol, - int sv[2]); -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/socket.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/socket.inl" -# elif (PACE_WIN32) -# include "pace/win32/socket.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SOCKET_H */ - diff --git a/PACE/pace/sys/stat.h b/PACE/pace/sys/stat.h deleted file mode 100644 index f1ab6a98dc0..00000000000 --- a/PACE/pace/sys/stat.h +++ /dev/null @@ -1,80 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/sys/stat.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_STAT_H -#define PACE_SYS_STAT_H - -#include "pace/config/defines.h" -#include "pace/sys/types.h" - - -#if (PACE_HAS_POSIX) -# include "pace/posix/stat.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/stat.h" -#elif (PACE_WIN32) -# include "pace/win32/stat.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if (PACE_HAS_POSIX_FA_UOF) - PACE_Export PACE_INLINE int pace_chmod (const char * path, pace_mode_t mode); -#endif /* PACE_HAS_POSIX_FA_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_fchmod (PACE_HANDLE fildes, - pace_mode_t mode); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_fstat (PACE_HANDLE fildes, -pace_stat_s * buf); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_mkdir (const char * path, pace_mode_t mode); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_F_UOF) - PACE_Export PACE_INLINE int pace_mkfifo (const char * path, - pace_mode_t mode); -#endif /* PACE_HAS_POSIX_F_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_stat (const char * path, pace_stat_s * buf); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FA_UOF) - PACE_Export PACE_INLINE pace_mode_t pace_umask (pace_mode_t cmask); -#endif /* PACE_HAS_POSIX_FA_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/stat.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/stat.inl" -# elif (PACE_WIN32) -# include "pace/win32/stat.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_STAT_H */ diff --git a/PACE/pace/sys/times.h b/PACE/pace/sys/times.h deleted file mode 100644 index 2f3db177f5c..00000000000 --- a/PACE/pace/sys/times.h +++ /dev/null @@ -1,51 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/sys/times.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_TIMES_H -#define PACE_SYS_TIMES_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/times.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/times.h" -#elif (PACE_WIN32) -# include "pace/win32/times.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE pace_clock_t pace_times (pace_tms * buffer); -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/times.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/times.inl" -# elif (PACE_WIN32) -# include "pace/win32/times.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TIMES_H */ diff --git a/PACE/pace/sys/types.h b/PACE/pace/sys/types.h deleted file mode 100644 index e668be409d7..00000000000 --- a/PACE/pace/sys/types.h +++ /dev/null @@ -1,37 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/sys/types.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_TYPES_H -#define PACE_SYS_TYPES_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/types.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/types.h" -#elif (PACE_WIN32) -# include "pace/win32/types.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TYPES_H */ diff --git a/PACE/pace/sys/utsname.h b/PACE/pace/sys/utsname.h deleted file mode 100644 index 1f50d58ea18..00000000000 --- a/PACE/pace/sys/utsname.h +++ /dev/null @@ -1,51 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/sys/utsname.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_UTSNAME_H -#define PACE_SYS_UTSNAME_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/utsname.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/utsname.h" -#elif (PACE_WIN32) -# include "pace/win32/utsname.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if (PACE_HAS_POSIX_SP_UOF) - PACE_Export PACE_INLINE int pace_uname (pace_utsname * name); -#endif /* PACE_HAS_POSIX_SP_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/utsname.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/utsname.inl" -# elif (PACE_WIN32) -# include "pace/win32/utsname.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_UTSNAME_H */ diff --git a/PACE/pace/sys/wait.h b/PACE/pace/sys/wait.h deleted file mode 100644 index 8fc12e00bd8..00000000000 --- a/PACE/pace/sys/wait.h +++ /dev/null @@ -1,67 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/sys/wait.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_WAIT_H -#define PACE_WAIT_H - -#include "pace/config/defines.h" -#include "pace/sys/types.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/wait.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/wait.h" -#elif (PACE_WIN32) -# include "pace/win32/wait.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - /** - PACE's implementation of the POSIX function wait. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.2.1. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE pace_pid_t pace_wait (int * statloc); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function waitpid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.2.1. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE pace_pid_t pace_waitpid (pace_pid_t pid, - int * statloc, - int options); -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/wait.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/wait.inl" -# elif (PACE_WIN32) -# include "pace/win32/wait.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_WAIT_H */ diff --git a/PACE/pace/termios.h b/PACE/pace/termios.h deleted file mode 100644 index 2a3d855259d..00000000000 --- a/PACE/pace/termios.h +++ /dev/null @@ -1,145 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/termios.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_TERMIOS_H -#define PACE_SYS_TERMIOS_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/termios.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/termios.h" -#elif (PACE_WIN32) -# include "pace/win32/termios.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function cfgetospeed. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.1.3. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE pace_speed_t pace_cfgetospeed (const pace_termios * termiosp); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function cfsetospeed. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.1.3. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE int pace_cfsetospeed (pace_termios * termios_p, - pace_speed_t speed); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function cfgetispeed. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.1.3. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE pace_speed_t pace_cfgetispeed (const pace_termios * termios_p); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function cfsetispeed. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.1.3. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE int pace_cfsetispeed (pace_termios * termios_p, - pace_speed_t speed); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function tcdrain. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.2.2. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE int pace_tcdrain (PACE_HANDLE fildes); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function tcflow. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.2.2. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE int pace_tcflow (PACE_HANDLE fildes, int action); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function tcflush. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.2.2. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE int pace_tcflush (PACE_HANDLE fildes, - int queue_selector); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function tcgetattr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.2.1. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE int pace_tcgetattr (PACE_HANDLE fildes, - pace_termios * termios_p); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function tcsendbreak. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.2.2. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE int pace_tcsendbreak (PACE_HANDLE fildes, - int duration); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function tcsetattr. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.2.1. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE int pace_tcsetattr (PACE_HANDLE fildes, - int optional_actions, - const pace_termios * termios_p); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/termios.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/termios.inl" -# elif (PACE_WIN32) -# include "pace/win32/termios.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TERMIOS_H */ diff --git a/PACE/pace/time.h b/PACE/pace/time.h deleted file mode 100644 index 688eac0ddf6..00000000000 --- a/PACE/pace/time.h +++ /dev/null @@ -1,274 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/time.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_TIME_H -#define PACE_TIME_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/time.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/time.h" -#elif (PACE_WIN32) -# include "pace/win32/time.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function asctime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_asctime (const pace_tm * time); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function asctime_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1.1. - */ -#if (PACE_HAS_POSIX_CLSR_UOF) - PACE_Export PACE_INLINE char * pace_asctime_r (const pace_tm * tm, - char * buf); -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - - /** - C std 7.23.2.1 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE pace_clock_t pace_clock (void); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - C std 7.23.2.2 - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE double pace_difftime (pace_time_t time1, - pace_time_t time2); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function clock_getres. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 14.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_clock_getres (pace_clockid_t clock_id, - pace_timespec * res); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function clock_gettime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 14.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_clock_gettime (pace_clockid_t clock_id, - pace_timespec * tp); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function clock_settime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 14.2.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_clock_settime (pace_clockid_t clock_id, - const pace_timespec * tp); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function ctime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE char * pace_ctime (const pace_time_t * clock); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function ctime_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.5. - */ -#if (PACE_HAS_POSIX_CLSR_UOF) - PACE_Export PACE_INLINE char * pace_ctime_r (const pace_time_t * clock, - char * buf); -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - /** - PACE's implementation of the POSIX function gmtime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE pace_tm * pace_gmtime (const pace_time_t * clock); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function gmtime_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.6. - */ -#if (PACE_HAS_POSIX_CLSR_UOF) - PACE_Export PACE_INLINE pace_tm * pace_gmtime_r (const pace_time_t * clock, - pace_tm * result); -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - /** - PACE's implementation of the POSIX function localtime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE pace_tm * pace_localtime (const time_t * clock); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function localtime_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.7. - */ -#if (PACE_HAS_POSIX_CLSR_UOF) - PACE_Export PACE_INLINE pace_tm * pace_localtime_r (const pace_time_t * clock, - pace_tm * result); -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - /** - PACE's implementation of the POSIX function mktime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE pace_time_t pace_mktime (pace_tm * timeptr); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function nanosleep. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 14.2.5. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_nanosleep (const pace_timespec * rqtp, - pace_timespec * rmtp); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function strftime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE pace_size_t pace_strftime (char *s, - pace_size_t maxsize, - const char *format, - const pace_tm *timeptr); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function time. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.5.1. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE pace_time_t pace_time (pace_time_t *tloc); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - /** - PACE's implementation of the POSIX function timer_create. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 14.2.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_timer_create (pace_clockid_t clock_id, - pace_sigevent * evp, - pace_timer_t * timerid); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function timer_delete. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 14.2.3. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_timer_delete (pace_timer_t timerid); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function timer_getoverrun. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 14.2.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_timer_getoverrun (pace_timer_t timerid); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function timer_gettime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 14.2.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_timer_gettime (pace_timer_t timerid, - pace_itimerspec * value); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function timer_settime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 14.2.4. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_timer_settime (pace_timer_t timerid, - int flags, - const pace_itimerspec * value, - pace_itimerspec * ovalue); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function tzset. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 8.3.2. - */ -#if (PACE_HAS_POSIX_CLS_UOF) - PACE_Export PACE_INLINE void pace_tzset (); -#endif /* PACE_HAS_POSIX_CLS_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/time.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/time.inl" -# elif (PACE_WIN32) -# include "pace/win32/time.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_TIME_H */ diff --git a/PACE/pace/unistd.h b/PACE/pace/unistd.h deleted file mode 100644 index 3b6b99f545a..00000000000 --- a/PACE/pace/unistd.h +++ /dev/null @@ -1,524 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/unistd.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_UNISTD_H -#define PACE_UNISTD_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/unistd.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/unistd.h" -#elif (PACE_WIN32) -# include "pace/win32/unistd.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function _exit. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.2.2. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE void pace__exit (int status); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function access. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.6.3. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_access (const char * path, int amode); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function alarm. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.4.1. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE unsigned int pace_alarm (unsigned int seconds); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function chdir. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.2.1. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_chdir (const char * path); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function chown. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.6.5. - */ -#if (PACE_HAS_POSIX_FA_UOF) - PACE_Export PACE_INLINE int pace_chown (const char * path, - pace_uid_t owner, - pace_gid_t group); -#endif /* PACE_HAS_POSIX_FA_UOF */ - - /** - PACE's implementation of the POSIX function close. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.3.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE int pace_close (PACE_HANDLE fildes); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function dup. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.2.1. - */ -#if (PACE_HAS_POSIX_FM_UOF) - PACE_Export PACE_INLINE PACE_HANDLE pace_dup (PACE_HANDLE fildes); -#endif /* PACE_HAS_POSIX_FM_UOF */ - - /** - PACE's implementation of the POSIX function dup2. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.2.1. - */ -#if (PACE_HAS_POSIX_FM_UOF) - PACE_Export PACE_INLINE PACE_HANDLE pace_dup2 (PACE_HANDLE fildes, - PACE_HANDLE fildes2); -#endif /* PACE_HAS_POSIX_FM_UOF */ - - /** - PACE's implementation of the POSIX function execl. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.1.2. - */ -#if (PACE_HAS_POSIX_MP_UOF) -# define pace_execl execl -#endif /* PACE_HAS_POSIX_MP_UOF */ - /* PACE_Export PACE_INLINE int pace_execl (const char* path, - const char* arg, ...); */ - - /** - PACE's implementation of the POSIX function execle. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.1.2. - */ -#if (PACE_HAS_POSIX_MP_UOF) -# define pace_execle execle -#endif /* PACE_HAS_POSIX_MP_UOF */ - /* PACE_Export PACE_INLINE int pace_execle (const char* path, - const char* arg, ...);*/ - - /** - PACE's implementation of the POSIX function execlp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.1.2. - */ -#if (PACE_HAS_POSIX_MP_UOF) -# define pace_execlp execlp -#endif /* PACE_HAS_POSIX_MP_UOF */ - /* PACE_Export PACE_INLINE int pace_execlp (const char* file, - const char* arg, ...);*/ - - /** - PACE's implementation of the POSIX function execv. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.1.2. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE int pace_execv (const char * path, - char * const argv[]); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function execve. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.1.2. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE int pace_execve (const char * path, - char * const argv[], - char * const envp[]); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function execvp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.1.2. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE int pace_execvp (const char * file, - char * const argv[]); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function fdatasync. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.6.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_fdatasync (PACE_HANDLE fildes); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function fork. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.1.1. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE pace_pid_t pace_fork (); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function fpathconf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.7.1. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE long pace_fpathconf (PACE_HANDLE fildes, int name); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function fsync. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.6.1. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_fsync (PACE_HANDLE fildes); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function ftruncate. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.6.7. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_ftruncate (PACE_HANDLE fildes, - pace_off_t length); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - /** - PACE's implementation of the POSIX function getcwd. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.2.2. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE char * pace_getcwd (char * buf, size_t size); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function getegid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.2.1. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE pace_uid_t pace_getegid (); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function geteuid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.2.1. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE pace_uid_t pace_geteuid (); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function getgid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.2.1. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE pace_uid_t pace_getgid (); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function getgroups. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.2.3. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE int pace_getgroups (int gidsetsize, - pace_gid_t grouplist[]); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function getlogin. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.2.4. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE char * pace_getlogin (); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function getlogin_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.2.4. - */ -#if (PACE_HAS_POSIX_UGR_UOF) - PACE_Export PACE_INLINE int pace_getlogin_r (char * name, size_t namesize); -#endif /* PACE_HAS_POSIX_UGR_UOF */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - /** - PACE's implementation of the POSIX function getpgrp. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.3.1. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE pace_pid_t pace_getpgrp (); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function getpid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.1.1. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE pace_pid_t pace_getpid (); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function getppid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.1.1. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE pace_pid_t pace_getppid (); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function getuid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.2.1. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE pace_uid_t pace_getuid (); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function isatty. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.7.2. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE int pace_isatty (int fildes); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function link. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.3.4. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_link (const char * existing, - const char * new_link); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function lseek. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.5.3. - */ -#if (PACE_HAS_POSIX_FM_UOF) - PACE_Export PACE_INLINE pace_off_t pace_lseek (PACE_HANDLE fildes, - off_t offset, - int whence); -#endif /* PACE_HAS_POSIX_FM_UOF */ - - /** - PACE's implementation of the POSIX function pathconf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.7.1. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE long pace_pathconf (const char * path, int name); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function pause. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.4.2. - */ -#if (PACE_HAS_POSIX_SIG_UOF) - PACE_Export PACE_INLINE int pace_pause (); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - - /** - PACE's implementation of the POSIX function pipe. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.1.1. - */ -#if (PACE_HAS_POSIX_P_UOF) - PACE_Export PACE_INLINE int pace_pipe (PACE_HANDLE fildes[2]); -#endif /* PACE_HAS_POSIX_P_UOF */ - - /** - PACE's implementation of the POSIX function read. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.4.1. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE pace_ssize_t pace_read (PACE_HANDLE fildes, - void * buf, - size_t nbyte); -#endif /* PACE_HAS_POSIX_DI_UOF */ - - /** - PACE's implementation of the POSIX function rmdir. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.5.2. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_rmdir (const char * path); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function setgid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.2.2. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE int pace_setgid (pace_gid_t gid); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function setpgid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.3.3. - */ -#if (PACE_HAS_POSIX_JC_UOF) - PACE_Export PACE_INLINE int pace_setpgid (pace_pid_t pid, pace_pid_t pgid); -#endif /* PACE_HAS_POSIX_JC_UOF */ - - /** - PACE's implementation of the POSIX function setsid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.3.2. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE pace_pid_t pace_setsid (); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function setuid. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.2.2. - */ -#if (PACE_HAS_POSIX_UG_UOF) - PACE_Export PACE_INLINE int pace_setuid (pace_uid_t uid); -#endif /* PACE_HAS_POSIX_UG_UOF */ - - /** - PACE's implementation of the POSIX function sleep. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 3.4.3. - */ -#if (PACE_HAS_POSIX_MP_UOF) - PACE_Export PACE_INLINE unsigned pace_sleep (unsigned int seconds); -#endif /* PACE_HAS_POSIX_MP_UOF */ - - /** - PACE's implementation of the POSIX function sysconf. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.8.1. - */ -#if (PACE_HAS_POSIX_SP_UOF) - PACE_Export PACE_INLINE long pace_sysconf (int name); -#endif /* PACE_HAS_POSIX_SP_UOF */ - - /** - PACE's implementation of the POSIX function ttyname. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.2.3.1. - */ -#if (PACE_HAS_POSIX_JC_UOF) - PACE_Export PACE_INLINE pace_pid_t pace_tcgetpgrp (PACE_HANDLE fildes); -#endif /* PACE_HAS_POSIX_JC_UOF */ - - /** - PACE's implementation of the POSIX function ttyname. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 7.2.3.1. - */ -#if (PACE_HAS_POSIX_JC_UOF) - PACE_Export PACE_INLINE int pace_tcsetpgrp (PACE_HANDLE fildes, - pace_pid_t pgrp_id); -#endif /* PACE_HAS_POSIX_JC_UOF */ - - /** - PACE's implementation of the POSIX function ttyname. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.7.2. - */ -#if (PACE_HAS_POSIX_DS_UOF) - PACE_Export PACE_INLINE char * pace_ttyname (PACE_HANDLE fildes); -#endif /* PACE_HAS_POSIX_DS_UOF */ - - /** - PACE's implementation of the POSIX function ttyname_r. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 4.7.2. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_Export PACE_INLINE int pace_ttyname_r (PACE_HANDLE fildes, - char * name, - size_t namesize); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - /* Requires PACE_HAS_POSIX_PTHREAD_SEMANTICS. */ - - /** - PACE's implementation of the POSIX function unlink. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.5.1. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_unlink (const char * path); -#endif /* PACE_HAS_POSIX_FS_UOF */ - - /** - PACE's implementation of the POSIX function write. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 6.4.2. - */ -#if (PACE_HAS_POSIX_DI_UOF) - PACE_Export PACE_INLINE pace_ssize_t pace_write (PACE_HANDLE fildes, - const void * buf, - size_t nbyte); -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/unistd.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/unistd.inl" -# elif (PACE_WIN32) -# include "pace/win32/unistd.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_UNISTD_H */ diff --git a/PACE/pace/utime.h b/PACE/pace/utime.h deleted file mode 100644 index 90a5cfa1a22..00000000000 --- a/PACE/pace/utime.h +++ /dev/null @@ -1,57 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/utime.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_UTIME_H -#define PACE_UTIME_H - -#include "pace/config/defines.h" - -#if (PACE_HAS_POSIX) -# include "pace/posix/utime.h" -#elif (PACE_VXWORKS) -# include "pace/vxworks/utime.h" -#elif (PACE_WIN32) -# include "pace/win32/utime.h" -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /** - PACE's implementation of the POSIX function utime. - See POSIX standard (Internation Standard ISO/IEC 9945-1:1996; - IEEE Std 1003.1, 1996 Edition), Section 5.6.6. - */ -#if (PACE_HAS_POSIX_FS_UOF) - PACE_Export PACE_INLINE int pace_utime (const char * path, - const pace_utimbuf * times); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if defined (PACE_HAS_INLINE) -# if (PACE_HAS_POSIX) -# include "pace/posix/utime.inl" -# elif (PACE_VXWORKS) -# include "pace/vxworks/utime.inl" -# elif (PACE_WIN32) -# include "pace/win32/utime.inl" -# endif -#endif /* PACE_HAS_INLINE */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_UTIME_H */ diff --git a/PACE/pace/vxworks/README b/PACE/pace/vxworks/README deleted file mode 100644 index 170f4b84920..00000000000 --- a/PACE/pace/vxworks/README +++ /dev/null @@ -1 +0,0 @@ -VXWORKS dir. diff --git a/PACE/pace/vxworks/aio.c b/PACE/pace/vxworks/aio.c deleted file mode 100644 index f9c32d822b4..00000000000 --- a/PACE/pace/vxworks/aio.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/aio.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/aio.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/aio.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/aio.h b/PACE/pace/vxworks/aio.h deleted file mode 100644 index fa519c4df73..00000000000 --- a/PACE/pace/vxworks/aio.h +++ /dev/null @@ -1,45 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/aio.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_AIO_H_VXWORKS -#define PACE_AIO_H_VXWORKS - -#include -#include "pace/time.h" -#include "pace/signal.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_AIO_ALLDONE AIO_ALLDONE -#define PACE_AIO_CANCELED AIO_CANCELED -#define PACE_AIO_NOCANCELED AIO_NOTCANCELED -#define PACE_LIO_NOP LIO_NOP -#define PACE_LIO_NOWAIT LIO_NOWAIT -#define PACE_LIO_READ LIO_READ -#define PACE_LIO_WAIT LIO_WAIT -#define PACE_LIO_WRITE LIO_WRITE - -#ifndef PACE_AIOCB -#define PACE_AIOCB -typedef struct aiocb pace_aiocb; -#endif /* PACE_AIOCB */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_AIO_H_VXWORKS */ diff --git a/PACE/pace/vxworks/aio.inl b/PACE/pace/vxworks/aio.inl deleted file mode 100644 index f79a7573c4b..00000000000 --- a/PACE/pace/vxworks/aio.inl +++ /dev/null @@ -1,112 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/aio.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_cancel (PACE_HANDLE fildes, pace_aiocb * aiocbp) -{ - PACE_TRACE("pace_aio_cancel"); - - return aio_cancel (fildes, aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_error (const pace_aiocb * aiocbp) -{ - PACE_TRACE("pace_aio_error"); - - return aio_error (PACE_NONCONST_ARG_CAST (struct aiocb *) aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_fsync (int op, pace_aiocb * aiocbp) -{ - PACE_TRACE("pace_aio_fsync"); - - PACE_UNUSED_ARG (op); - PACE_UNUSED_ARG (aiocbp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_read (pace_aiocb * aiocbp) -{ - PACE_TRACE("pace_aio_read"); - - return aio_read (aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_return (pace_aiocb * aiocbp) -{ - PACE_TRACE("pace_aio_return"); - - return aio_return (aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_suspend (const pace_aiocb * const list[], - int nent, - const pace_timespec * timeout) -{ - PACE_TRACE("pace_aio_suspend"); - - return aio_suspend (PACE_AIO_SUSPEND_LIST_ARG_CAST list, - nent, - PACE_NONCONST_ARG_CAST (struct timespec *) timeout); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_write (pace_aiocb * aiocbp) -{ - PACE_TRACE("pace_aio_write"); - - return aio_write (aiocbp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_lio_listio (int mode, - pace_aiocb * const list[], - int nent, - pace_sigevent * sig) -{ - PACE_TRACE("pace_lio_listio"); - - return lio_listio (mode, PACE_NONCONST_ARG_CAST (struct aiocb **) list, - nent, sig); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/vxworks/assert.c b/PACE/pace/vxworks/assert.c deleted file mode 100644 index 8731f27260d..00000000000 --- a/PACE/pace/vxworks/assert.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/assert.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/assert.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/assert.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/assert.h b/PACE/pace/vxworks/assert.h deleted file mode 100644 index 3b2f014109d..00000000000 --- a/PACE/pace/vxworks/assert.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/assert.h - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#ifndef PACE_ASSERT_H_VXWORKS -#define PACE_ASSERT_H_VXWORKS - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_ASSERT_H_VXWORKS */ diff --git a/PACE/pace/vxworks/assert.inl b/PACE/pace/vxworks/assert.inl deleted file mode 100644 index b3def672d99..00000000000 --- a/PACE/pace/vxworks/assert.inl +++ /dev/null @@ -1,14 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/assert.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ diff --git a/PACE/pace/vxworks/ctype.c b/PACE/pace/vxworks/ctype.c deleted file mode 100644 index 01b1da173ab..00000000000 --- a/PACE/pace/vxworks/ctype.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/ctype.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/ctype.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/ctype.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/ctype.h b/PACE/pace/vxworks/ctype.h deleted file mode 100644 index 106684d7371..00000000000 --- a/PACE/pace/vxworks/ctype.h +++ /dev/null @@ -1,27 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/ctype.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_CTYPE_H_VXWORKS -#define PACE_CTYPE_H_VXWORKS - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_CTYPE_H_VXWORKS */ diff --git a/PACE/pace/vxworks/ctype.inl b/PACE/pace/vxworks/ctype.inl deleted file mode 100644 index df9afc8dd76..00000000000 --- a/PACE/pace/vxworks/ctype.inl +++ /dev/null @@ -1,159 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/ctype.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isalnum (int c) -{ - PACE_TRACE("pace_isalnum"); - - return isalnum (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isalpha (int c) -{ - PACE_TRACE("pace_isalpha"); - - return isalpha (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_iscntrl (int c) -{ - PACE_TRACE("pace_iscntrl"); - - return iscntrl (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isdigit (int c) -{ - PACE_TRACE("pace_isdigit"); - - return isdigit (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isgraph (int c) -{ - PACE_TRACE("pace_isgraph"); - - return isgraph (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_islower (int c) -{ - PACE_TRACE("pace_islower"); - - return islower (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isprint (int c) -{ - PACE_TRACE("pace_isprint"); - - return isprint (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_ispunct (int c) -{ - PACE_TRACE("pace_ispunct"); - - return ispunct (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isspace (int c) -{ - PACE_TRACE("pace_isspace"); - - return isspace (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isupper (int c) -{ - PACE_TRACE("pace_isupper"); - - return isupper (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isxdigit (int c) -{ - PACE_TRACE("pace_isxdigit"); - - return isxdigit (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_tolower (int c) -{ - PACE_TRACE("pace_tolower"); - - return tolower (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_toupper (int c) -{ - PACE_TRACE("pace_toupper"); - - return toupper (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/vxworks/dirent.c b/PACE/pace/vxworks/dirent.c deleted file mode 100644 index c1a09545067..00000000000 --- a/PACE/pace/vxworks/dirent.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/dirent.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/dirent.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/dirent.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/dirent.h b/PACE/pace/vxworks/dirent.h deleted file mode 100644 index 1b746c6ec4a..00000000000 --- a/PACE/pace/vxworks/dirent.h +++ /dev/null @@ -1,40 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/dirent.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_DIRENT_H_VXWORKS -#define PACE_DIRENT_H_VXWORKS - -#include "pace/sys/types.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_DIR_T -#define PACE_DIR_T -typedef DIR PACE_DIR; -#endif /* PACE_DIR_T */ - -#ifndef PACE_DIRENT -#define PACE_DIRENT -typedef struct dirent pace_dirent; -#endif /* PACE_DIRENT */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_DIRENT_H_VXWORKS */ diff --git a/PACE/pace/vxworks/dirent.inl b/PACE/pace/vxworks/dirent.inl deleted file mode 100644 index 71d68023212..00000000000 --- a/PACE/pace/vxworks/dirent.inl +++ /dev/null @@ -1,74 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/dirent.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -PACE_DIR * -pace_opendir (const char * dirname) -{ - PACE_TRACE("pace_opendir"); - - return opendir (PACE_NONCONST_ARG_CAST(char *) dirname); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -pace_dirent * -pace_readdir (PACE_DIR * dirp) -{ - PACE_TRACE("pace_readdir"); - - return readdir (dirp); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -int -pace_readdir_r (PACE_DIR * dirp, pace_dirent * entry, - pace_dirent ** result) -{ - PACE_TRACE("pace_readdir_r"); - - PACE_UNUSED_ARG (entry); - /* has better not be 0! */ - *result = pace_readdir (dirp); - return 0; -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -void -pace_rewinddir (PACE_DIR * dirp) -{ - PACE_TRACE("pace_rewinddir"); - - rewinddir (dirp); - return; -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_closedir (PACE_DIR * dirp) -{ - PACE_TRACE("pace_closedir"); - - return closedir (dirp); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/vxworks/errno.h b/PACE/pace/vxworks/errno.h deleted file mode 100644 index 7e64a524658..00000000000 --- a/PACE/pace/vxworks/errno.h +++ /dev/null @@ -1,75 +0,0 @@ -/* $Id$ - -* ============================================================================ -* -* = LIBRARY -* pace -* -* = FILENAME -* pace/vxworks/errno.h -* -* = AUTHOR -* Joe Hoffert -* -* =========================================================================== */ - -#ifndef PACE_ERRNO_H_VXWORKS -#define PACE_ERRNO_H_VXWORKS - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_E2BIG E2BIG -#define PACE_EACCES EACCES -#define PACE_EAGAIN EAGAIN -#define PACE_EBADF EBADF -#define PACE_EBADMSG -#define PACE_EBUSY EBUSY -#define PACE_ECANCELED ECANCELED -#define PACE_ECHILD ECHILD -#define PACE_EDEADLK EDEADLK -#define PACE_EDOM EDOM -#define PACE_EEXIST EEXIST -#define PACE_EFAULT EFAULT -#define PACE_EFBIG EFBIG -#define PACE_EINPROGRESS EINPROGRESS -#define PACE_EINTR EINTR -#define PACE_EINVAL EINVAL -#define PACE_EIO EIO -#define PACE_EISDIR EISDIR -#define PACE_EMFILE EMFILE -#define PACE_EMLINK EMLINK -#define PACE_EMSGSIZE EMSGSIZE -#define PACE_EENAMETOOLONG ENAMETOOLONG -#define PACE_ENFILE ENFILE -#define PACE_ENODEV ENODEV -#define PACE_ENOENT ENOENT -#define PACE_ENOEXEC ENOEXEC -#define PACE_ENOLCK ENOLCK -#define PACE_ENOMEM ENOMEM -#define PACE_ENOSPC ENOSPC -#define PACE_ENOSYS ENOSYS -#define PACE_ENOTDIR ENOTDIR -#define PACE_ENOTEMPTY ENOTEMPTY -#define PACE_ENOTSUP ENOTSUP -#define PACE_ENOTTY ENOTTY -#define PACE_ENXIO ENXIO -#define PACE_EPERM EPERM -#define PACE_EPIPE EPIPE -#define PACE_ERANGE ERANGE -#define PACE_EROFS EROFS -#define PACE_ESPIPE ESPIPE -#define PACE_ESRCH ESRCH -#define PACE_ETIMEDOUT ETIMEDOUT -#define PACE_EXDEV EXDEV - -#define pace_errno errno - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_ERRNO_H_VXWORKS */ diff --git a/PACE/pace/vxworks/fcntl.c b/PACE/pace/vxworks/fcntl.c deleted file mode 100644 index c0bc9a30a38..00000000000 --- a/PACE/pace/vxworks/fcntl.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/fcntl.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/fcntl.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/fcntl.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/fcntl.h b/PACE/pace/vxworks/fcntl.h deleted file mode 100644 index 534beaca5b2..00000000000 --- a/PACE/pace/vxworks/fcntl.h +++ /dev/null @@ -1,63 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/fnctl.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_FCNTL_H_VXWORKS -#define PACE_FCNTL_H_VXWORKS - -#include "pace/sys/types.h" -#include "pace/unistd.h" -#include "pace/sys/stat.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_FD_CLOEXEC FD_CLOEXEC -#define PACE_F_DUPFD D_DUPFD -#define PACE_F_GETFD F_GETFD -#define PACE_F_GETFL F_GETFL -#define PACE_F_GETLK F_GETLK -#define PACE_F_RDLCK F_RDLCK -#define PACE_F_SETFD F_SETFD -#define PACE_F_SETFL F_SETFL -#define PACE_F_SETLK F_SETLK -#define PACE_F_SETLKW F_SETLKW -#define PACE_F_UNLCK F_UNLCK -#define PACE_F_WRLCK F_WRLCK -#define PACE_O_ACCMODE O_ACCMODE -#define PACE_O_APPEND O_APPEND -#define PACE_O_CREAT O_CREAT -#define PACE_O_DSYNC O_DSYNC -#define PACE_O_EXCL O_EXCL -#define PACE_O_NOCTTY O_NOCTTY -#define PACE_O_NONBLOCK O_NONBLOCK -#define PACE_O_RDONLY O_RDONLY -#define PACE_O_RDWR O_RDWR -#define PACE_O_RSYNC O_RSYNC -#define PACE_O_SYNC O_SYNC -#define PACE_O_TRUNC O_TRUNC -#define PACE_O_WRONLY O_WRONLY - -#ifndef PACE_FLOCK -#define PACE_FLOCK -typedef struct flock pace_flock; -#endif /* PACE_FLOCK */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_FCNTL_H_VXWORKS */ diff --git a/PACE/pace/vxworks/fcntl.inl b/PACE/pace/vxworks/fcntl.inl deleted file mode 100644 index 23308b8fe22..00000000000 --- a/PACE/pace/vxworks/fcntl.inl +++ /dev/null @@ -1,39 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/fcntl.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_creat (const char * path, pace_mode_t mode) -{ - PACE_TRACE("pace_creat"); - - return creat (path, mode); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -int -pace_fcntl (PACE_HANDLE fildes, int cmd, long arg) -{ - PACE_TRACE("pace_fcntl"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(cmd); - PACE_UNUSED_ARG(arg); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/vxworks/grp.c b/PACE/pace/vxworks/grp.c deleted file mode 100644 index 4a12ee0f64c..00000000000 --- a/PACE/pace/vxworks/grp.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/grp.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/grp.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/grp.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/grp.h b/PACE/pace/vxworks/grp.h deleted file mode 100644 index 5fcd0fd959d..00000000000 --- a/PACE/pace/vxworks/grp.h +++ /dev/null @@ -1,32 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace (posix ace) - * - * = FILENAME - * pace/vxworks/grp.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_GRP_H_VXWORKS -#define PACE_GRP_H_VXWORKS - -# if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -# endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_GROUP -#define PACE_GROUP -typedef struct group pace_group; -#endif /* PACE_GROUP */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_GRP_H_VXWORKS */ diff --git a/PACE/pace/vxworks/grp.inl b/PACE/pace/vxworks/grp.inl deleted file mode 100644 index 428ac7364e5..00000000000 --- a/PACE/pace/vxworks/grp.inl +++ /dev/null @@ -1,82 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/grp.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_group * -pace_getgrgid (pace_gid_t gid) -{ - PACE_TRACE("pace_getgrgid"); - - /* getgrgid() is not supported: just one user anyways */ - PACE_UNUSED_ARG (gid); - return 0; -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getgrgid_r (pace_gid_t gid, - pace_group * grp, - char * buffer, - size_t bufsize, - pace_group ** result) -{ - PACE_TRACE("pace_getgrgid_r"); - - /* getgrgid_r() is not supported: just one user anyways */ - PACE_UNUSED_ARG (gid); - PACE_UNUSED_ARG (grp); - PACE_UNUSED_ARG (buffer); - PACE_UNUSED_ARG (bufsize); - PACE_UNUSED_ARG (result); - return 0; -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_group * -pace_getgrnam (const char * name) -{ - PACE_TRACE("pace_getgrnam"); - - /* getgrnam() is not supported: just one user anyways */ - PACE_UNUSED_ARG (name); - return 0; -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getgrnam_r (const char * name, - pace_group * grp, - char * buffer, - size_t bufsize, - pace_group ** result) -{ - PACE_TRACE("pace_getgrnam_r"); - - /* getgrnam_r() is not supported: just one user anyways */ - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (grp); - PACE_UNUSED_ARG (buffer); - PACE_UNUSED_ARG (bufsize); - PACE_UNUSED_ARG (result); - return 0; -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ diff --git a/PACE/pace/vxworks/limits.h b/PACE/pace/vxworks/limits.h deleted file mode 100644 index e0d70071157..00000000000 --- a/PACE/pace/vxworks/limits.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace (posix ace) - * - * = FILENAME - * pace/vxworks/limits.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_LIMITS_H_VXWORKS -#define PACE_LIMITS_H_VXWORKS - -#include - -# if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -# endif /* (PACE_HAS_CPLUSPLUS) */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_LIMITS_H_VXWORKS */ diff --git a/PACE/pace/vxworks/locale.c b/PACE/pace/vxworks/locale.c deleted file mode 100644 index 530fd21999c..00000000000 --- a/PACE/pace/vxworks/locale.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/locale.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/locale.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/locale.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/locale.h b/PACE/pace/vxworks/locale.h deleted file mode 100644 index 4838e912fd3..00000000000 --- a/PACE/pace/vxworks/locale.h +++ /dev/null @@ -1,40 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/locale.h - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#ifndef PACE_LOCALE_H_VXWORKS -#define PACE_LOCALE_H_VXWORKS - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_LC_ALL LC_ALL -#define PACE_LC_COLLATE LC_COLLATE -#define PACE_LC_CTYPE LC_CTYPE -#define PACE_LC_MONETARY LC_MONETARY -#define PACE_LC_NUMERIC LC_NUMERIC -#define PACE_LC_TIME LC_TIME -#define PACE_NULL NULL - -#ifndef PACE_LCONV -#define PACE_LCONV -typedef struct lconv pace_lconv; -#endif /* PACE_LCONV */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_LOCALE_H_VXWORKS */ diff --git a/PACE/pace/vxworks/locale.inl b/PACE/pace/vxworks/locale.inl deleted file mode 100644 index 5ce0566e9c3..00000000000 --- a/PACE/pace/vxworks/locale.inl +++ /dev/null @@ -1,38 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/locale.inl - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#include - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_lconv * -pace_localeconv (void) -{ - PACE_TRACE("pace_localeconv"); - - return localeconv (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -char * -pace_setlocale (int category, const char * locale) -{ - PACE_TRACE("pace_setlocale"); - - return setlocale (category, locale); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/PACE/pace/vxworks/math.c b/PACE/pace/vxworks/math.c deleted file mode 100644 index 1d3b87dc973..00000000000 --- a/PACE/pace/vxworks/math.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/math.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/math.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/math.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/math.h b/PACE/pace/vxworks/math.h deleted file mode 100644 index cda356e550e..00000000000 --- a/PACE/pace/vxworks/math.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/math.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_MATH_H_VXWORKS -#define PACE_MATH_H_VXWORKS - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_HUGE_VAL HUGE_VAL - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_MATH_H_VXWORKS */ diff --git a/PACE/pace/vxworks/math.inl b/PACE/pace/vxworks/math.inl deleted file mode 100644 index 81bd1bc19e2..00000000000 --- a/PACE/pace/vxworks/math.inl +++ /dev/null @@ -1,259 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/math.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -/* FUZZ: disable check_for_math_include */ -#include - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_acos (double x) -{ - PACE_TRACE("pace_acos"); - - return acos (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_asin (double x) -{ - PACE_TRACE("pace_asin"); - - return asin (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_atan (double x) -{ - PACE_TRACE("pace_atan"); - - return atan (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_atan2 (double x, double y) -{ - PACE_TRACE("pace_atan2"); - - return atan2 (x, y); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_cos (double x) -{ - PACE_TRACE("pace_cos"); - - return cos (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_sin (double x) -{ - PACE_TRACE("pace_sin"); - - return sin (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_tan (double x) -{ - PACE_TRACE("pace_tan"); - - return tan (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_cosh (double x) -{ - PACE_TRACE("pace_cosh"); - - return cosh (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_sinh (double x) -{ - PACE_TRACE("pace_sinh"); - - return sinh (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_tanh (double x) -{ - PACE_TRACE("pace_tanh"); - - return tanh (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_exp (double x) -{ - PACE_TRACE("pace_exp"); - - return exp (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_frexp (double x, int * exp) -{ - PACE_TRACE("pace_frexp"); - - return frexp (x, exp); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_ldexp (double x, int exp) -{ - PACE_TRACE("pace_ldexp"); - - return ldexp (x, exp); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_log (double x) -{ - PACE_TRACE("pace_log"); - - return log (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_log10 (double x) -{ - PACE_TRACE("pace_log10"); - - return log10 (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_modf (double x, double * iptr) -{ - PACE_TRACE("pace_modf"); - - return modf (x, iptr); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_pow (double x, double y) -{ - PACE_TRACE("pace_pow"); - - return pow (x, y); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_sqrt (double x) -{ - PACE_TRACE("pace_sqrt"); - - return sqrt (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_ceil (double x) -{ - PACE_TRACE("pace_ceil"); - - return ceil (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_fabs (double x) -{ - PACE_TRACE("pace_fabs"); - - return fabs (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_floor (double x) -{ - PACE_TRACE("pace_floor"); - - return floor (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_fmod (double x, double y) -{ - PACE_TRACE("pace_fmod"); - - return fmod (x, y); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/vxworks/mman.c b/PACE/pace/vxworks/mman.c deleted file mode 100644 index 149f345054e..00000000000 --- a/PACE/pace/vxworks/mman.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/mman.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/sys/mman.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/mman.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/mman.h b/PACE/pace/vxworks/mman.h deleted file mode 100644 index 7bddb69ee86..00000000000 --- a/PACE/pace/vxworks/mman.h +++ /dev/null @@ -1,42 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/mman.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_SYS_MMAN_H_VXWORKS -#define PACE_SYS_MMAN_H_VXWORKS - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_MAP_FAILED MAP_FAILED -#define PACE_MAP_FIXED MAP_FIXED -#define PACE_MAP_PRIVATE MAP_PRIVATE -#define PACE_MAP_SHARED MAP_SHARED -#define PACE_MCL_CURRENT MCL_CURRENT -#define PACE_MS_ASYNC MS_ASYNC -#define PACE_MS_INVALIDATE -#define PACE_MS_SYNC MS_SYNC -#define PACE_PROT_EXEC PROT_EXEC -#define PACE_PROT_NONE PROT_NONE -#define PACE_PROT_READ PROT_READ -#define PACE_PROT_WRITE PROT_WRITE - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_MMAN_H_VXWORKS */ diff --git a/PACE/pace/vxworks/mman.inl b/PACE/pace/vxworks/mman.inl deleted file mode 100644 index 79e07ea78c0..00000000000 --- a/PACE/pace/vxworks/mman.inl +++ /dev/null @@ -1,153 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/mman.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/fcntl.h" - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mlock (const void * addr, pace_size_t len) -{ - PACE_TRACE("pace_mlock"); - - return mlock (((char*)addr), len); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mlockall (int flags) -{ - PACE_TRACE("pace_mlockall"); - - return mlockall (flags); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_mmap (void * addr, - pace_size_t len, - int prot, - int flags, - PACE_HANDLE fildes, - pace_off_t off) -{ - PACE_TRACE("pace_mmap"); - - PACE_UNUSED_ARG(addr); - PACE_UNUSED_ARG(len); - PACE_UNUSED_ARG(prot); - PACE_UNUSED_ARG(flags); - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(off); - PACE_ERRNO_NO_SUPPORT_RETURN ((void *) -1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_munlock (const void * addr, pace_size_t len) -{ - PACE_TRACE("pace_munlock"); - - return munlock (((char*)addr), len); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mprotect (void * addr, - pace_size_t len, - int prot) -{ - PACE_TRACE("pace_mprotect"); - - PACE_UNUSED_ARG(addr); - PACE_UNUSED_ARG(len); - PACE_UNUSED_ARG(prot); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_msync (void * addr, - pace_size_t len, - int flags) -{ - PACE_TRACE("pace_msync"); - - PACE_UNUSED_ARG(addr); - PACE_UNUSED_ARG(len); - PACE_UNUSED_ARG(flags); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_munlockall () -{ - PACE_TRACE("pace_munlockall"); - - return munlockall (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_munmap (void * addr, pace_size_t len) -{ - PACE_TRACE("pace_munmap"); - - PACE_UNUSED_ARG(addr); - PACE_UNUSED_ARG(len); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -PACE_HANDLE -pace_shm_open (const char * name, - int oflag, - pace_mode_t mode) -{ - PACE_TRACE("pace_shm_open"); - - /* Just use open per ACE. */ - return pace_open (name, oflag, mode); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_shm_unlink (const char * name) -{ - PACE_TRACE("pace_shm_unlink"); - - /* Just use unlink per ACE. */ - return pace_unlink (name); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/vxworks/mqueue.c b/PACE/pace/vxworks/mqueue.c deleted file mode 100644 index b2cbe7f35b9..00000000000 --- a/PACE/pace/vxworks/mqueue.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace (posix ace) - * - * = FILENAME - * pace/vxworks/mqueue.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/mqueue.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/mqueue.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/mqueue.h b/PACE/pace/vxworks/mqueue.h deleted file mode 100644 index 8e3b66e136a..00000000000 --- a/PACE/pace/vxworks/mqueue.h +++ /dev/null @@ -1,43 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/mqueue.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_MQUEUE_H_VXWORKS -#define PACE_MQUEUE_H_VXWORKS - -#if PACE_LINUX -# include "pace/emulation/mqueue.h" -#else -# include -#endif /* PACE_LINUX */ - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_MQD_T -#define PACE_MQD_T - typedef mqd_t pace_mqd_t; -#endif /* PACE_MQD_T */ - -#ifndef PACE_MQ_ATTR -#define PACE_MQ_ATTR - typedef struct mq_attr pace_mq_attr; -#endif /* PACE_MQ_ATTR */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_MQUEUE_H_VXWORKS */ diff --git a/PACE/pace/vxworks/mqueue.inl b/PACE/pace/vxworks/mqueue.inl deleted file mode 100644 index 78b983e5e66..00000000000 --- a/PACE/pace/vxworks/mqueue.inl +++ /dev/null @@ -1,101 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/posix/mqueue.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_close (pace_mqd_t mqdes) -{ - PACE_TRACE("pace_mq_close"); - - return mq_close (mqdes); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_getattr (pace_mqd_t mqdes, - pace_mq_attr * mqstat) -{ - PACE_TRACE("pace_mq_getattr"); - - return mq_getattr (mqdes, mqstat); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_notify (pace_mqd_t mqdes, - const pace_sigevent * notification) -{ - PACE_TRACE("pace_mq_notify"); - - return mq_notify (mqdes, notification); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -ssize_t -pace_mq_receive (pace_mqd_t mqdes, - char * msg_ptr, - size_t msg_len, - unsigned int * msg_prio) -{ - PACE_TRACE("pace_mq_receive"); - - return mq_receive (mqdes, msg_ptr, msg_len, msg_prio); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_send (pace_mqd_t mqdes, - const char * msg_ptr, - size_t msg_len, - unsigned int msg_prio) -{ - PACE_TRACE("pace_mq_send"); - - return mq_send (mqdes, msg_ptr, msg_len, msg_prio); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_setattr (pace_mqd_t mqdes, - const pace_mq_attr * mqstat, - pace_mq_attr * omqstat) -{ - PACE_TRACE("pace_mq_setattr"); - - return mq_setattr (mqdes, mqstat, omqstat); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_unlink (const char * name) -{ - PACE_TRACE("pace_mq_unlink"); - - return mq_unlink (name); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/vxworks/pthread.c b/PACE/pace/vxworks/pthread.c deleted file mode 100644 index ecf556b1639..00000000000 --- a/PACE/pace/vxworks/pthread.c +++ /dev/null @@ -1,1376 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/pthread.c - * - * = AUTHOR - * Joe Hoffert. The *VAST* majority of the pthread code for VxWorks - * has been supplied by Hughes Network Systems via Braeton Taylor. - * - * ============================================================================= */ - -#include "pace/pthread.h" - -/* pthread queue */ -static pthread_q_entry pthread_queue[PTHEAD_QUEUE_MAX_LEN]; -static pthread_q_entry * first = NULL; -static pthread_q_entry * current = NULL; -static int pthread_count = 0; -/*static pthread_q_entry * pthread_queue_get_entry();*/ -static int initialized = 0; -static int registered_cleanup_init = 0; - -static pthread_key_entry keyList[PTHREAD_KEYS_MAX]; - -/* - * The defaut pthread attr structure, if calling task - * does not pass attr, this default will be used - */ -static struct _PTHREAD_ATTR _pthread_attr_default_s = -{ - PTHREAD_DEFAULT_STACK_SIZE, /* stacksize */ - { '\0' }, /* name */ - {100}, /* priority */ - PTHREAD_SCOPE_SYSTEM, /* scope */ - SCHED_FIFO, /* indirect function */ - /* According to the POSIX standard PTHREAD_CREATE_JOINABLE - * is the default - */ - /*PTHREAD_CREATE_DETACHED * detached */ - PTHREAD_CREATE_JOINABLE /* joinable */ -}; - -/* global default access */ -pace_pthread_attr_t pthread_attr_default = &_pthread_attr_default_s; - - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/pthread.inl" -#endif /* ! PACE_HAS_INLINE */ - -/* - * VxWorks Helper Functions - */ - -/* - * Setup the thread information needed for main. This function - * mimics much of what's in pthread_create below but this is - * only for registering a thread already created (as in the case - * of main). - */ -STATUS -pacevx_vxworks_init() -{ - WIND_TCB *pTcb; - pace_pthread_t pthread; - int taskid; - unsigned int i; - STATUS status; - - PACE_TRACE("pacevx_vxworks_init"); - - /* Fill in the main thread's TCB with the information needed - * for POSIX emulation. - */ - taskid = taskIdSelf(); - if ((pTcb = taskTcb(taskid)) == NULL) - { - taskDelete(taskid); - return ERROR; - } - - pthread = (pace_pthread_t )malloc(sizeof(struct _PTHREAD_T)); - - if (pthread == NULL) - { - taskDelete(taskid); - return ERROR; - } - - /* construct pace_pthread_t structure */ - - bzero((char *)pthread, sizeof(struct _PTHREAD_T)); - pthread->tid = taskid; - pthread->stateflag = PTHREAD_CANCEL_ENABLE; - pthread->canceltype = PTHREAD_CANCEL_ASYNCHRONOUS; - /*pthread->detachflag = PTHREAD_CREATE_JOINABLE;*/ - pthread->detachflag = PTHREAD_CREATE_DETACHED; - - /* initialize the join semaphore also */ - if ((pthread->joinSem = semBCreate(SEM_Q_PRIORITY, SEM_EMPTY)) == NULL) - { - free((void *)pthread); - taskDelete(taskid); - return ERROR; - } - - /* save to the WIND_TCB for reference afterward */ - pTcb->_USER_SPARE4 = (int) pthread; - - /* I guess this doesn't need to get added for the main thread. - * It seems to cause problems for main. - if (registered_cleanup_init == 0) - { - status = taskDeleteHookAdd((FUNCPTR)pacevx_pthread_run_cleanup); - if (status == ERROR) - { - return ERROR; - } - registered_cleanup_init = 1; - } - - pacevx_pthread_queue_add(pthread); - */ - - return OK; -} - -/* - * Get a free entry from the pthread queue. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -pthread_q_entry * -pacevx_pthread_queue_get_entry () -{ - int i; - - PACE_TRACE("pacevx_pthread_queue_get_entry"); - - for (i = 0; i < PTHEAD_QUEUE_MAX_LEN; i++) - { - if (pthread_queue[i].status == FALSE) - return &pthread_queue[i]; - } - - /* error condition, can alloc more in future */ - return NULL; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -/* - * Run the destructor functions for the specific data key - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -void -pacevx_pthread_destructor_key (pace_pthread_key_t key, void * arg) -{ - PACE_TRACE("pacevx_pthread_destructor_key"); - - if (pacevx_pthread_key_validate(key)) - { - if (keyList[key].destructor != NULL) - { - (*(keyList[key].destructor))(arg); - } - } -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -/* - * Run the destructor functions for the thread - * For each key value, if there is a non-NULL destructor pointer, - * and the thread has a non-NULL value associated with that key, - * the function pointed to is called with the current associated - * value as its sole argument. - * - * return: none. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -void -pacevx_pthread_destructor_thread (pace_pthread_t pthread) -{ - int i; - - PACE_TRACE("pacevx_pthread_destructor_thread"); - - for (i = 0; i < PTHREAD_KEYS_MAX; i ++) - { - if (pthread->keyvaluelist[i] != NULL) - { - pacevx_pthread_destructor_key(i, pthread->keyvaluelist[i]); - } - } -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -/* - * General exit processing. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -void -pacevx_pthread_proc_exit (pace_pthread_t pthread, void *value_ptr) -{ - int key; - int needgive = 0; - - PACE_TRACE("pacevx_pthread_proc_exit"); - - pacevx_pthread_cleanup_popall(pthread); - - /* thread storage data cleanup is automatically*/ - pacevx_pthread_destructor_thread(pthread); - - /* joinable or detached */ - if (pthread->detachflag == PTHREAD_CREATE_DETACHED) - { - free(pthread); - } - else - { - key = intLock(); - - /* pass the value */ - pthread->joinvalue = value_ptr; - - switch (pthread->joinstate) - { - case JOIN_PENDING: - pthread->joinstate = JOIN_TERMINATED; - needgive = 1; - break; - case JOIN_NORMAL: - default: - pthread->joinstate = JOIN_TERMINATED; - break; - } - intUnlock(key); - - /* unblock the calling thread */ - if (needgive) - semGive(((pace_pthread_t)(pthread->jointhread))->joinSem); - } -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pacevx_pthread_verify (pace_pthread_t pthread) -{ - int key; - pthread_q_entry * entry; - - PACE_TRACE("pacevx_pthread_verify"); - - key = intLock(); - - /* if queue is empty */ - if (first == NULL) - { - intUnlock(key); - return ERROR; - } - - entry = first; /* get the first one */ - - while (entry != NULL) - { - if (entry->pthread == pthread) - { - intUnlock(key); - return TRUE; - } - entry = entry->next; - } - - intUnlock(key); - - return FALSE; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -/* - * The cleanup routine that will be called if the task get deleted. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -void -pacevx_pthread_run_cleanup (WIND_TCB *pTcb) -/* pointer to deleted task's WIND_TCB */ -{ - pace_pthread_t pthread; - - PACE_TRACE("pacevx_pthread_run_cleanup"); - - /* free thread tcb only*/ - if (pTcb->_USER_SPARE4 != 0) - { - pthread = (pace_pthread_t) pTcb->_USER_SPARE4; - - pacevx_pthread_proc_exit(pthread, NULL); - } -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -/* - * Add to the pthread queue. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pacevx_pthread_queue_add (pace_pthread_t pthread) -{ - int key; - pthread_q_entry * entry; - - PACE_TRACE("pacevx_pthread_queue_add"); - - key = intLock(); - - if ((entry = pacevx_pthread_queue_get_entry()) != NULL) - { - entry->status = TRUE; - entry->pthread = pthread; - - if (first == NULL) - { - first = entry; - current = entry; - } - else - { - current->next = entry; - current = entry; - } - pthread_count ++; - intUnlock(key); - return OK; - } - - intUnlock(key); - return ERROR; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -/* - * Remove an entry to the pthread queue. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pacevx_pthread_queue_remove (pace_pthread_t pthread) -{ - int key; - pthread_q_entry * entry1; - pthread_q_entry * entry2; - - PACE_TRACE("pacevx_pthread_queue_remove"); - - key = intLock(); - - if (first == NULL) - { - intUnlock(key); - return ERROR; - } - - /* if it is the first one, simple */ - if (first->pthread == pthread) - { - first->status = FALSE; - first->pthread = NULL; - - entry1 = first->next; - - first->next = NULL; - - /* if it is the only one */ - if (current == first) - current = entry1; - - first = entry1; - - /* Check for the last thread and unregister cleanup function */ - if (first == NULL) - taskDeleteHookDelete((FUNCPTR)pacevx_pthread_run_cleanup); - - intUnlock(key); - return OK; - } - - /* else */ - - entry1 = first; - entry2 = entry1->next; - - while (entry2 != NULL) - { - if (entry2->pthread == pthread) - { - if (current == entry2) - current = entry1; - - entry1->next = entry2->next; /* remove the node */ - - /* set invalid and put back to the list */ - entry2->status = FALSE; - entry2->pthread = NULL; - entry2->next = NULL; - intUnlock(key); - return OK; - } - entry1 = entry2; - entry2 = entry2->next; - } - - intUnlock(key); - return ERROR; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -/* - * Run the rest of cleanup routines left in the stack. - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -void -pacevx_pthread_cleanup_popall (pace_pthread_t thread) -{ - int count; - int i; - - PACE_TRACE("pacevx_pthread_cleanup_popall"); - - count = thread->rtnCount - 1; - - /* - * We don't currently support any way - * to add cleanup routines since pace_pthread_cleanup_push and - * pace_pthread_cleanup_pop are undefined macros for VxWorks. - */ - for (i = count; i > 0 ; i--) - { - thread->rtnCount --; - (*(thread->cleanupRtn[i].routine))(thread->cleanupRtn[i].args); - } -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -/* - * Validate the key to see if the key is already created (valid) - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pacevx_pthread_key_validate (pace_pthread_key_t key) -{ - int intkey; - - PACE_TRACE("pacevx_pthread_key_validate"); - - intkey = intLock(); - - if (keyList[key].valid) - { - intUnlock(intkey); - return TRUE; - } - else - { - intUnlock(intkey); - return FALSE; - } -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - - -/* - * PACE - POSIX Functions - */ - - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_cond_timedwait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex, - const pace_timespec * abstime) -{ - /* - int msec_timeout; - if (abstime->sec () == 0 && abstime->usec () == 0) - msec_timeout = 0; * Do a "poll." * - else - { - // Assumes that struct timespec is same size as struct timeval, - // which assumes that time_t is a long: it currently is. - struct pace_timespec ts; - - pace_clock_gettime (CLOCK_REALTIME, &ts); - - // Note that we must convert between absolute time (which is - // passed as a parameter) and relative time. - pace_timespec relative_time = (*abstime) - ts; - - // Watchout for situations where a context switch has caused the - // current time to be > the timeout. - if (relative_time < 0) - msec_timeout = 0; - else - msec_timeout = relative_time.msec (); - } - // Inline the call to ACE_OS::sema_wait () because it takes an - // ACE_Time_Value argument. Avoid the cost of that conversion . . . - int ticks_per_sec = ::sysClkRateGet (); - int ticks = msec_timeout * ticks_per_sec / ACE_ONE_SECOND_IN_MSECS; - result = ::semTake (cv->sema_.sema_, ticks); - */ - - - - - - int timeval = 0; - int errornumber; - int returnval = 0; - STATUS status; - - PACE_TRACE("pthread_cond_timedwait"); - - if (pace_pthread_mutex_unlock(mutex) != OK) return ERROR; - - /* convert the abstime to timeval */ - status = semTake(*cond, timeval); - - if (status != OK) - { - errornumber = errnoGet(); - if (errornumber == S_objLib_OBJ_ID_ERROR) - returnval = EINVAL; - else if (errornumber == S_objLib_OBJ_TIMEOUT) - returnval = ETIMEDOUT; - else - returnval = ERROR; - } - - pace_pthread_mutex_lock(mutex); - - return returnval; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_cond_wait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex) -{ - STATUS status; - int errornumber; - int returnval = 0; - - PACE_TRACE("pthread_cond_wait"); - - if (pace_pthread_mutex_unlock(mutex) != OK) - return ERROR; - - status = semTake(*cond, WAIT_FOREVER); - - if(status != OK) - { - errornumber = errnoGet(); - if (errornumber == S_objLib_OBJ_ID_ERROR) - returnval = EINVAL; - else - returnval = ERROR; - } - - pace_pthread_mutex_lock(mutex); - - return returnval; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, -# if defined (PACE_HAS_CPLUSPLUS) - pace_create_pf start_routine, -# else - void * (*start_routine) (void*), -# endif - void * arg) -{ - pace_pthread_attr_t pattr; - char * pname; - int taskid; - pace_pthread_t pthread; - WIND_TCB * pTcb; - - PACE_TRACE("pthread_create"); - - if (attr == 0) - pattr = pthread_attr_default; - else - if (*attr == 0) - pattr = pthread_attr_default; - else - pattr = *attr; - - if (pattr->name[0] != '\0') /* name is provided */ - pname = pattr->name; - else - pname = (char *)0; - - taskid = taskSpawn(pname, - (SCHED_FIFO_HIGH_PRI - pattr->schedule.sched_priority), - VX_FP_TASK, pattr->stacksize, (FUNCPTR)start_routine, - (int)arg, 0,0,0,0,0,0,0,0,0); - - if (taskid == ERROR) - return ERROR; - - if ((pTcb = taskTcb(taskid)) == NULL) - { - taskDelete(taskid); - return ERROR; - } - - pthread = (pace_pthread_t) malloc(sizeof(struct _PTHREAD_T)); - - if (pthread == NULL) - { - taskDelete(taskid); - return ERROR; - } - - /* construct pace_pthread_t structure */ - - bzero((char *)pthread, sizeof(struct _PTHREAD_T)); - pthread->tid = taskid; - pthread->stateflag = PTHREAD_CANCEL_ENABLE; - pthread->canceltype = PTHREAD_CANCEL_ASYNCHRONOUS; - pthread->detachflag = pattr->dstate; - - /* initialize the join semaphore also */ - if ((pthread->joinSem = semBCreate(SEM_Q_PRIORITY, SEM_EMPTY)) == NULL) - { - free((void *)pthread); - taskDelete(taskid); - return ERROR; - } - - /* pass it to the caller */ - *thread = pthread; - - /* save to the WIND_TCB for reference afterward */ - pTcb->_USER_SPARE4 = (int) pthread; - - if (registered_cleanup_init == 0) - { - taskDeleteHookAdd((FUNCPTR)pacevx_pthread_run_cleanup); - registered_cleanup_init = 1; - } - - pacevx_pthread_queue_add(pthread); - - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_detach (pace_pthread_t thread) -{ - int key; - int needfree; - needfree = 0; - - PACE_TRACE("pthread_detach"); - - if (!pacevx_pthread_verify(thread)) - return EINVAL; - - key = intLock(); - - switch (thread->joinstate) - { - /* task is joined, or detached, but still running, do nothing */ - case JOIN_PENDING: - case JOIN_DETATCHED: - intUnlock(key); - return OK; - break; - case JOIN_NORMAL: /* task is running */ - thread->joinstate = JOIN_DETATCHED; - break; - case JOIN_TERMINATED: - needfree = 1; - break; - default: - break; - } - - intUnlock(key); - - if (needfree) - { - pacevx_pthread_queue_remove(thread); - free(thread); - } - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_join (pace_pthread_t thread, void ** value_ptr) -{ - /* - * The pthread_join() function suspends execution of the calling - * thread until the target thread terminates, unless the target - * thread has already terminated. - * The terminating thread can pass value to the caller by - * pthread_exit() and the calling thread gets it from "value_ptr" - * The application must verify the "value_ptr" value before using it. - */ - pace_pthread_t pthread; - int needfree; - int key; - - PACE_TRACE("pthread_join"); - - if (!pacevx_pthread_verify(thread)) - return ERROR; - - if (thread->detachflag != PTHREAD_CREATE_JOINABLE) - return ERROR; - - if ((pthread = pace_pthread_self()) == NULL) - return ERROR; - - needfree = 0; - - key = intLock(); - switch (thread->joinstate) - { - case JOIN_NORMAL: - thread->jointhread = pthread; - thread->joinstate = JOIN_PENDING; - break; - case JOIN_TERMINATED: - needfree = 1; - break; - case JOIN_PENDING: - default: - intUnlock(key); - return ERROR; - } - intUnlock(key); - - if (needfree) - { - *value_ptr = thread->joinvalue; - pacevx_pthread_queue_remove(thread); - free(thread); - return OK; - } - - /* if we are here, thread is not terminated yet */ - semTake(pthread->joinSem, WAIT_FOREVER); - - /* cleanup */ - *value_ptr = thread->joinvalue; - pacevx_pthread_queue_remove(thread); - free(thread); - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_key_create (pace_pthread_key_t * key, -# if defined (PACE_HAS_CPLUSPLUS) - pace_keycreate_pf destructor) -# else - void (*destructor)(void*)) -# endif -{ - /* - * Create a thread-specific data key. Also initialize the - * data structure if it is called first time. - */ - int i; - int intkey; - - PACE_TRACE("pthread_key_create"); - - /* do the initialization if it is the first time */ - if (initialized == 0) - { - initialized = 1; - - /* initialize the data structure */ - for (i = 0; i < PTHREAD_KEYS_MAX; i++) - { - keyList[i].index = i; - keyList[i].valid = FALSE; - keyList[i].destructor = NULL; - } - } - - /* find first available position */ - intkey = intLock(); - for (i = 0; i < PTHREAD_KEYS_MAX; i++) - { - if (keyList[i].valid == FALSE) - { - *key = (pace_pthread_key_t)keyList[i].index; - keyList[i].valid = TRUE; - keyList[i].destructor = destructor; - intUnlock(intkey); - - return OK; - } - } - - intUnlock(intkey); - return ERROR; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_key_delete (pace_pthread_key_t key) -{ - int intkey; - - PACE_TRACE("pthread_key_delete"); - - if ((key < 0) || (key >= PTHREAD_KEYS_MAX)) - return ERROR; - - intkey = intLock(); - - keyList[key].valid = FALSE; - keyList[key].destructor = NULL; - - intUnlock(intkey); - - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_once (pace_pthread_once_t * once_control, -# if defined (PACE_HAS_CPLUSPLUS) - pace_once_pf init_routine) -# else - void (*init_routine) (void)) -# endif -{ - /* - * Once function allows the function to be executed exact only once - * Subsequent calls of pthread_once() with the same once_control will - * not call the void_routine(). - */ - int i; - int key; - pace_pthread_t pthread; - - PACE_TRACE("pthread_once"); - - if ((pthread = pace_pthread_self()) == NULL) - return ERROR; - - /* make it atomic */ - key = intLock(); - - for (i = 0; i < pthread->onceCount; i++) - { - if (*once_control == pthread->onceList[i].once_ctl) - { - /* do nothing, already called */ - intUnlock(key); - return OK; - } - } - - /* if we are here, no match is found */ - pthread->onceList[pthread->onceCount].once_ctl = *once_control; - pthread->onceCount++; - intUnlock(key); - - /* run the init routine */ - (*init_routine)(); - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_init (pace_pthread_attr_t * attr) -{ - PACE_TRACE("pthread_attr_init"); - - /* - * Attempt to allocate memory for the attributes object. - */ - - if ((*attr = (pace_pthread_attr_t) malloc(sizeof(struct _PTHREAD_ATTR))) - == NULL) - { - return ERROR; - } - - /* - * Set the default attributes. - */ - - memcpy ((void *)(*attr), (void *)pthread_attr_default, - sizeof(struct _PTHREAD_ATTR)); - - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_setdetachstate (pace_pthread_attr_t * attr, - int detachstate) -{ - PACE_TRACE("pthread_attr_setdetachstate"); - - if ((detachstate != PTHREAD_CREATE_DETACHED) || - (detachstate != PTHREAD_CREATE_JOINABLE)) - { - (*attr)->dstate = PTHREAD_CREATE_DETACHED; - return ERROR; - } - - (*attr)->dstate = detachstate; - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_setschedparam (pace_pthread_attr_t * attr, - const pace_sched_param * param) -{ - PACE_TRACE("pthread_attr_setschedparam"); - - /* range check */ - if (param->sched_priority > SCHED_RR_HIGH_PRI || - param->sched_priority < SCHED_RR_LOW_PRI ) - { - return ERROR; - } - - (*attr)->schedule.sched_priority = param->sched_priority; - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_cancel (pace_pthread_t thread) -{ - PACE_TRACE("pthread_cancel"); - - /* - * In VxWorks, to cancel a thread is to delete a task. - */ - if (!pacevx_pthread_verify(thread)) - return ESRCH; - - if (taskIdVerify(thread->tid) == ERROR) /* already exit, never happen */ - return ERROR; - - if (thread->stateflag == PTHREAD_CANCEL_DISABLE) - return ERROR; - else - return (taskDelete(thread->tid)); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_getschedparam (pace_pthread_t thread, - int * policy, - pace_sched_param * param) -{ - PACE_TRACE("pthread_getschedparam"); - - if (thread == 0) - return ERROR; - - *policy = sched_getscheduler(thread->tid); - - if (sched_getparam(thread->tid, param) == OK) - { - /* convert VxWorks priority to POSIX priority */ - param->sched_priority = SCHED_FIFO_HIGH_PRI - param->sched_priority; - return OK; - } - - return ERROR; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -void * -pthread_getspecific (pace_pthread_key_t key) -{ - pace_pthread_t pthread; - - PACE_TRACE("pthread_getspecific"); - - if (!pacevx_pthread_key_validate(key)) - return NULL; - - if ((pthread = pace_pthread_self()) != NULL) - { - return pthread->keyvaluelist[key]; - } - - return NULL; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_mutex_init (pace_pthread_mutex_t * mutex, - const pace_pthread_mutexattr_t * attr) -{ - /* - * Initialises the mutex referenced by mutex with attributes - * specified by attr. If attr is NULL, the default mutex - * attributes are used. - */ - - /* Make SEM_Q_FIFO the default since this is what ACE does (and - * ACE works) plus this is supposedly the default for VxWorks. - */ - int options = SEM_Q_FIFO; - - PACE_TRACE("pthread_mutex_init"); - - if (attr != NULL) - { - switch ((*attr)->protocol) - { - case PTHREAD_PRIO_INHERIT: - /* POSIX's PTHREAD_PRIO_INHERIT maps to VxWorks' SEM_INVERSION_SAFE. - * However, this doesn't seem to be supported (at least on 5.3.1). - * Return an error. - */ - return ERROR; - break; - - case PTHREAD_PRIO_PROTECT: - /* VxWorks does not support this functionality. - * Return an error. - */ - return ERROR; - break; - - case PTHREAD_PRIO_NONE: - options = SEM_Q_FIFO; - break; - - default: - perror("Invalid POSIX protocol specified"); - return ERROR; - break; - } - } - - *mutex = semMCreate(options); - if (*mutex == NULL) { - return ERROR; - } - - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_mutex_lock (pace_pthread_mutex_t * mutex) -{ - STATUS status; - int errornumber; - - PACE_TRACE("pthread_mutex_lock"); - - status = semTake(*mutex, WAIT_FOREVER); - if (status == OK) - { - return OK; - } - else - { - errornumber = errnoGet(); - if (errornumber == S_objLib_OBJ_ID_ERROR) - return EINVAL; - - return ERROR; - } -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_mutex_trylock (pace_pthread_mutex_t * mutex) -{ - STATUS status; - int errornumber; - - PACE_TRACE("pthread_mutex_trylock"); - - status = semTake(*mutex, NO_WAIT); - if (status == OK) - return OK; - else - { - errornumber = errnoGet(); - if (errornumber == S_objLib_OBJ_ID_ERROR) - return EINVAL; - if (errornumber == S_objLib_OBJ_UNAVAILABLE) - return EBUSY; - - return ERROR; - } -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_mutex_unlock (pace_pthread_mutex_t * mutex) -{ - STATUS status; - int errornumber; - - PACE_TRACE("pthread_mutex_unlock"); - - status = semGive(*mutex); - if (status == OK) - return OK; - else - { - errornumber = errnoGet(); - if (errornumber == S_semLib_INVALID_OPERATION) - return EPERM; - - return ERROR; - } -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr, - int protocol) -{ - PACE_TRACE("pthread_mutexattr_setprotocol"); - -/* - * Does not support PTHREAD_PRIO_PROTECT for VxWorks - */ - if ((protocol == PTHREAD_PRIO_NONE) || - (protocol == PTHREAD_PRIO_INHERIT )) - { - (*attr)->protocol = protocol; - return OK; - } - - return ERROR; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_mutexattr_init (pace_pthread_mutexattr_t * attr) -{ - /* - * Initializes a mutex attributes object attr with the - * default value for all of the attributes - */ - pace_pthread_mutexattr_t pattr; - - PACE_TRACE("pthread_mutexattr_init"); - - pattr = (pace_pthread_mutexattr_t) malloc(sizeof(struct _PTHREAD_MUX_ATTR)); - if (pattr == NULL) - return ERROR; - - /* POSIX's PTHREAD_PRIO_INHERIT maps to VxWorks' SEM_INVERSION_SAFE. - * However, this doesn't seem to be supported (at least on 5.3.1). - * Set PTHREAD_PRIO_NONE as the default since the only other choice - * is PTHREAD_PRIO_PROTECT which VxWorks doesn't support. - pattr->protocol = PTHREAD_PRIO_INHERIT; - */ - pattr->protocol = PTHREAD_PRIO_NONE; - pattr->shared = PTHREAD_PROCESS_SHARED; - pattr->type = PTHREAD_MUTEX_DEFAULT; - - *attr = pattr; - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr, - int pshared) -{ - PACE_TRACE("pthread_mutexattr_setpshared"); - - /* - * Only supports PTHREAD_PROCESS_SHARED - */ - if (attr == 0) return EINVAL; - - if (pshared != PTHREAD_PROCESS_SHARED) - return ERROR; - else - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_setcancelstate (int state, int * oldstate) -{ - int key; - pace_pthread_t pthread; - - PACE_TRACE("pthread_setcancelstate"); - - if ((state != PTHREAD_CANCEL_ENABLE) && - (state != PTHREAD_CANCEL_DISABLE)) - { - return ERROR; - } - - if ((pthread = pace_pthread_self()) == NULL) - return ERROR; - - key = intLock(); - *oldstate = pthread->stateflag; - pthread->stateflag = state; - intUnlock(key); - - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_setcanceltype (int type, int * oldtype) -{ - /* - * Only asychronouse type is supported - */ - pace_pthread_t pthread; - - PACE_TRACE("pthread_setcanceltype"); - - if (type != PTHREAD_CANCEL_ASYNCHRONOUS) - return ERROR; - - if ((pthread = pace_pthread_self()) == NULL) - return ERROR; - - *oldtype = pthread->canceltype; - - return OK; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_setschedparam (pace_pthread_t thread, - int policy, - const pace_sched_param * param) -{ - /* - * Only priority can be changed. - */ - struct sched_param sparam; - - PACE_TRACE("pthread_setschedparam"); - - if (thread == 0) - return ERROR; - - if (policy != sched_getscheduler(thread->tid)) - return ERROR; - - /* convert POSIX priority to VxWorks priority */ - sparam.sched_priority = SCHED_FIFO_HIGH_PRI - param->sched_priority; - - return (sched_setparam(thread->tid, &sparam)); -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_setspecific (pace_pthread_key_t key, const void * value) -{ - pace_pthread_t pthread; - - PACE_TRACE("pthread_setspecific"); - - if (!pacevx_pthread_key_validate(key)) - return ERROR; - - if ((pthread = pace_pthread_self()) != NULL) - { - pthread->keyvaluelist[key] = PACE_NONCONST_ARG_CAST(void *) value; - return OK; - } - - return ERROR; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_sigmask (int how, - const sigset_t * set, - sigset_t * oset) -{ - PACE_TRACE("pthread_sigmask"); - - switch (how) - { - case SIG_BLOCK: - case SIG_UNBLOCK: - { - /* get the old mask */ - *oset = sigsetmask (*set); - /* create a new mask: the following assumes that sigset_t is 4 bytes, - * which it is on VxWorks 5.2, so bit operations are done simply . . . - */ - sigsetmask (how == SIG_BLOCK ? (*oset |= *set) : (*oset &= ~*set)); - break; - } - case SIG_SETMASK: - *oset = sigsetmask (*set); - break; - default: - return -1; - } - - return 0; -} -#endif /* PACE_HAS_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -pace_pthread_t -pthread_self () -{ - WIND_TCB *pTcb; - - PACE_TRACE("pthread_self"); - - if ((pTcb = taskTcb(taskIdSelf())) == NULL) - return (pace_pthread_t)NULL; - - return (pace_pthread_t)(pTcb->_USER_SPARE4); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/vxworks/pthread.h b/PACE/pace/vxworks/pthread.h deleted file mode 100644 index 260fe7a553d..00000000000 --- a/PACE/pace/vxworks/pthread.h +++ /dev/null @@ -1,163 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/pthread.h - * - * = AUTHOR - * Joe Hoffert. The *VAST* majority of the pthread code for VxWorks - * has been supplied by Hughes Network Systems via Braeton Taylor. - * - * ============================================================================ */ - -#ifndef PACE_PTHREAD_H_VXWORKS -#define PACE_PTHREAD_H_VXWORKS - -#include -#include -#include -#include -#include "pace/sys/types.h" -#include "pace/signal.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_PTHREAD_CANCELED PTHREAD_CANCELED -#define PACE_PTHREAD_CANCEL_AYNCHRONOUS PTHREAD_CANCEL_ASYNCHRONOUS -#define PACE_PTHREAD_CANCEL_DEFERRED PTHREAD_CANCEL_DEFERRED -#define PACE_PTHREAD_CACEL_DISABLE PTHREAD_CANCEL_DISABLE -#define PACE_PTHREAD_CANCEL_ENABLE PTHREAD_CANCEL_ENABLE -#define PACE_PTHREAD_COND_INITIALIZER PTHREAD_COND_INITIALIZER -#define PACE_PTHREAD_CREATE_DETACHED PTHREAD_CREATE_DETACHED -#define PACE_PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_JOINABLE -#define PACE_PTHREAD_EXPLICIT_SCHED PTHREAD_EXPLICIT_SCHED -#define PACE_PTHREAD_INHERIT_SCHED PTHREAD_INHERIT_SCHED -#define PACE_PTHREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#define PACE_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT -#define PACE_PTHREAD_PRIO_INHERIT PTHREAD_PRIO_INHERIT -#define PACE_PTHREAD_PRIO_NONE PTHREAD_PRIO_NONE -#define PACE_PTHREAD_PRIO_PROTECT PTHREAD_PRIO_PROTECT -#define PACE_PTHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE -#define PACE_PTHREAD_PROCESS_SHARED PTHREAD_PROCESS_SHARED -#define PACE_PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS -#define PACE_PTHREAD_SCOPE_SYSTEM PTHREAD_SCOPE_SYSTEM - -#define PTHREAD_MUTEX_INITIALIZER 0 -#define PTHREAD_COND_INITIALIZER 0 - -#ifndef PACE_SCHED_PARAM -#define PACE_SCHED_PARAM - typedef struct sched_param pace_sched_param; -#endif /* PACE_SCHED_PARAM */ - -#if defined (PACE_HAS_CPLUSPLUS) -# ifndef PACE_ATFORK_PF -# define PACE_ATFORK_PF - typedef void (*pace_atfork_pf) (void); -# endif /* PACE_ATFORK_PF */ - -# ifndef PACE_KEYCREATE_PF -# define PACE_KEYCREATE_PF - typedef void (*pace_keycreate_pf) (void*); -# endif /* PACE_KEYCREATE_PF */ - -# ifndef PACE_ONCE_PF -# define PACE_ONCE_PF - typedef void (*pace_once_pf) (void); -# endif /* PACE_ONCE_PF */ - -# ifndef PACE_CREATE_PF -# define PACE_CREATE_PF - typedef void* (*pace_create_pf) (void*); -# endif /* PACE_CREATE_PF */ - -#endif /* PACE_HAS_CPLUPLUS */ - - /* - * VxWorks helper functions - */ -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - extern pace_pthread_attr_t pthread_attr_default; - - STATUS pacevx_vxworks_init(); - void pacevx_pthread_proc_exit(pace_pthread_t pthread, void *value_ptr); - int pacevx_pthread_verify(pace_pthread_t pthread); - void pacevx_pthread_run_cleanup (WIND_TCB *pTcb); - int pacevx_pthread_queue_add(pace_pthread_t pthread); - int pacevx_pthread_queue_remove(pace_pthread_t pthread); - void pacevx_pthread_cleanup_popall(pace_pthread_t thread); - void pacevx_pthread_destructor_thread(pace_pthread_t pthread); - int pacevx_pthread_key_validate(pace_pthread_key_t key); - void pacevx_pthread_destructor_key(pace_pthread_key_t key, void * arg); - - int pthread_cond_timedwait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex, - const pace_timespec * abstime); - int pthread_cond_wait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex); -# if defined (PACE_HAS_CPLUSPLUS) - int pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, - pace_create_pf start_routine, - void * arg); - int pthread_key_create (pace_pthread_key_t * key, - pace_keycreate_pf destructor); - int pthread_once (pace_pthread_once_t * once_control, - pace_once_pf init_routine); -# else /* ! PACE_HAS_CPLUSPLUS */ - int pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, - void * (*start_routine) (void*), - void * arg); - int pthread_key_create (pace_pthread_key_t * key, - void (*destructor)(void*)); - int pthread_once (pace_pthread_once_t * once_control, - void (*init_routine) (void)); -# endif /*! PACE_HAS_CPLUSPLUS */ - int pthread_detach (pace_pthread_t thread); - int pthread_join (pace_pthread_t thread, void ** value_ptr); - int pthread_key_delete (pace_pthread_key_t key); - int pthread_attr_init (pace_pthread_attr_t * attr); - int pthread_attr_setdetachstate (pace_pthread_attr_t * attr, - int detachstate); - int pthread_attr_setschedparam (pace_pthread_attr_t * attr, - const pace_sched_param * param); - int pthread_cancel (pace_pthread_t thread); - int pthread_getschedparam (pace_pthread_t thread, - int * policy, - pace_sched_param * param); - void * pthread_getspecific (pace_pthread_key_t key); - int pthread_mutex_init (pace_pthread_mutex_t * mutex, - const pace_pthread_mutexattr_t * attr); - int pthread_mutex_lock (pace_pthread_mutex_t * mutex); - int pthread_mutex_trylock (pace_pthread_mutex_t * mutex); - int pthread_mutex_unlock (pace_pthread_mutex_t * mutex); - int pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr, - int protocol); - int pthread_mutexattr_init (pace_pthread_mutexattr_t * attr); - int pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr, - int pshared); - int pthread_setcancelstate (int state, int * oldstate); - int pthread_setcanceltype (int type, int * oldtype); - int pthread_setschedparam (pace_pthread_t thread, - int policy, - const pace_sched_param * param); - int pthread_setspecific (pace_pthread_key_t key, - const void * value); - int pthread_sigmask (int how, - const sigset_t * set, - sigset_t * oset); - pace_pthread_t pthread_self (); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_PTHREAD_H_VXWORKS */ diff --git a/PACE/pace/vxworks/pthread.inl b/PACE/pace/vxworks/pthread.inl deleted file mode 100644 index 02f694072bd..00000000000 --- a/PACE/pace/vxworks/pthread.inl +++ /dev/null @@ -1,935 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/pthread.inl - * - * = AUTHOR - * Joe Hoffert. The *VAST* majority of the pthread code for VxWorks - * has been supplied by Hughes Network Systems via Braeton Taylor. - * - * - * ============================================================================= */ - -#include "pace/unistd.h" - -#include "pace/stdio.h" - -/* - * PACE - POSIX Functions - */ - - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_atfork ( -# if defined (PACE_HAS_CPLUSPLUS) - pace_atfork_pf prepare, - pace_atfork_pf parent, - pace_atfork_pf child -# else /* ! PACE_HAS_CPLUSPLUS */ - void (*prepare) (), - void (*parent) (), - void (*child) () -# endif /* PACE_HAS_CPLUSPLUS */ - ) -{ - PACE_TRACE("pace_pthread_atfork"); - /* - * In VxWorks, there is only one process. - */ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_destroy (pace_pthread_attr_t * attr) -{ - PACE_TRACE("pace_pthread_attr_destroy"); - /* - * Free memory allocated to the attributes object. - */ - if ((*attr) == 0) - return ERROR; - - free ((char *) *attr); - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getdetachstate (const pace_pthread_attr_t * attr, - int * detachstate) -{ - PACE_TRACE("pace_pthread_attr_getdetachstate"); - - *detachstate = (*attr)->dstate; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getinheritsched (const pace_pthread_attr_t * attr, - int * inheritsched) -{ - PACE_TRACE("pace_pthread_attr_getinheritsched"); - - /* - * Get the priority inheritence of the thread attribute structure. - * Only PTHREAD_EXPLICIT_SCHED is returned. - */ - *inheritsched = PTHREAD_EXPLICIT_SCHED; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getschedparam (const pace_pthread_attr_t * attr, - pace_sched_param * param) -{ - PACE_TRACE("pace_pthread_attr_getschedparam"); - - param->sched_priority = (*attr)->schedule.sched_priority; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr, - int * policy) -{ - PACE_TRACE("pace_pthread_attr_getschedpolicy"); - - /* - * VxWorks only supports SCHED_FIFO. - */ - - *policy = SCHED_FIFO; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getscope (const pace_pthread_attr_t * attr, - int * contentionscope) -{ - PACE_TRACE("pace_pthread_attr_getscope"); - - /* - * Since all VxWorks tasks are system wide scope, - * no support for the scope except for PTHREAD_SCOPE_SYSTEM - */ - - *contentionscope = PTHREAD_SCOPE_SYSTEM; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getstackaddr (const pace_pthread_attr_t * attr, - void ** stackaddr) -{ - PACE_TRACE("pace_pthread_attr_getstackaddr"); - - /* - * VxWorks has no support for stack address getting - */ - - return ERROR; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getstacksize (const pace_pthread_attr_t * attr, - size_t * stacksize) -{ - PACE_TRACE("pace_pthread_attr_getstacksize"); - - if (*attr == 0) - return ERROR; - - *stacksize = (*attr)->stacksize; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_init (pace_pthread_attr_t * attr) -{ - PACE_TRACE("pace_pthread_attr_init"); - - return pthread_attr_init(attr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setdetachstate (pace_pthread_attr_t * attr, - int detachstate) -{ - PACE_TRACE("pace_pthread_attr_setdetachstate"); - - return pthread_attr_setdetachstate (attr, detachstate); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setinheritsched (pace_pthread_attr_t * attr, - int inheritsched) -{ - PACE_TRACE("pace_pthread_attr_setinheritsched"); - - /* - * For VxWorks, no inheritance of priority between the spawning task - * and the spawned task. Only PTHREAD_EXPLICIT_SCHED is supported. - */ - if (inheritsched == PTHREAD_EXPLICIT_SCHED) - { - return OK; - } - - return ERROR; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setschedparam (pace_pthread_attr_t * attr, - const pace_sched_param * param) -{ - PACE_TRACE("pace_pthread_attr_setschedparam"); - - return pthread_attr_setschedparam (attr, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setschedpolicy (pace_pthread_attr_t * attr, - int policy) -{ - PACE_TRACE("pace_pthread_attr_setschedpolicy"); - - /* - * In VxWorks, the schedule policy is set in system scope, - * the whole system is running with one single scheduler, and - * is always pre-emptive priority based. The system wide - * scheduler can only be changed by kernelTimeSlice() - * - * To maintain the RTOS characteristics, only SCHED_FIFO is - * supported. - */ - if (policy != SCHED_FIFO) - return ERROR; - else - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setscope (pace_pthread_attr_t * attr, - int contentionscope) -{ - PACE_TRACE("pace_pthread_attr_setscope"); - - /* - * Since all VxWorks tasks are system wide scope, - * no support for the scope except for PTHREAD_SCOPE_SYSTEM - */ - if (contentionscope != PTHREAD_SCOPE_SYSTEM) - return ERROR; - else - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setstackaddr (pace_pthread_attr_t * attr, - void * stackaddr) -{ - PACE_TRACE("pace_pthread_attr_setstackaddr"); - - /* - * VxWorks does not support stack address setting. - */ - return ERROR; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setstacksize (pace_pthread_attr_t * attr, - size_t stacksize) -{ - PACE_TRACE("pace_pthread_attr_setstacksize"); - - /* - * Default size will be assigned if the stacksize is 0 - */ - if (*attr == 0) return ERROR; - - if (stacksize != 0) - (*attr)->stacksize = stacksize; - else - (*attr)->stacksize = PTHREAD_DEFAULT_STACK_SIZE; - - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cancel (pace_pthread_t thread) -{ - PACE_TRACE("pace_pthread_cancel"); - - return pthread_cancel (thread); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_broadcast (pace_pthread_cond_t * cond) -{ - PACE_TRACE("pace_pthread_cond_broadcast"); - - /* - * This call unblocks all the threads that are blocked - * on the specified condition variable cond. - */ - return semFlush(*cond); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_destroy (pace_pthread_cond_t * cond) -{ - PACE_TRACE("pace_pthread_cond_destroy"); - - if (*cond != NULL) - return semDelete(*cond); - - return EINVAL; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_init (pace_pthread_cond_t * cond, - const pace_pthread_condattr_t * attr) -{ - PACE_TRACE("pace_pthread_cond_init"); - - *cond = semBCreate(SEM_Q_PRIORITY, SEM_FULL); - if (*cond == NULL) - return ERROR; - - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_signal (pace_pthread_cond_t * cond) -{ - PACE_TRACE("pace_pthread_cond_signal"); - - return semGive(*cond); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_timedwait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex, - const pace_timespec * abstime) -{ - PACE_TRACE("pace_pthread_cond_timedwait"); - - return pthread_cond_timedwait(cond, - mutex, - abstime); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_wait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex) -{ - PACE_TRACE("pace_pthread_cond_wait"); - - return pthread_cond_wait(cond, - mutex); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_destroy (pace_pthread_condattr_t * attr) -{ - PACE_TRACE("pace_pthread_condattr_destroy"); - - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_getpshared (const pace_pthread_condattr_t * attr, - int * pshared) -{ - PACE_TRACE("pace_pthread_condattr_getpshared"); - - /* - * All the resources in present VxWorks are shared system wide. - */ - *pshared = PTHREAD_PROCESS_SHARED; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_init (pace_pthread_condattr_t * attr) -{ - PACE_TRACE("pace_pthread_condattr_init"); - - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_setpshared (pace_pthread_condattr_t * attr, - int pshared) -{ - PACE_TRACE("pace_pthread_condattr_setpshared"); - - /* - * All the resources in present VxWorks are shared system wide. - */ - if (pshared != PTHREAD_PROCESS_SHARED) - return ERROR; - - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, - void * (*start_routine) (void*), - void * arg) -{ - PACE_TRACE("pace_pthread_create"); - - return pthread_create (thread, - attr, - start_routine, - arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_detach (pace_pthread_t thread) -{ - PACE_TRACE("pace_pthread_detach"); - - return pthread_detach (thread); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_equal (pace_pthread_t t1, pace_pthread_t t2) -{ - PACE_TRACE("pace_pthread_equal"); - - if (pacevx_pthread_verify(t1) && pacevx_pthread_verify(t2)) - { - if (t1->tid != t2->tid) - return 0; - } - - return 1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void -pace_pthread_exit (void * value_ptr) -{ - /* - * Normal thread exit. All the cleanup routines will be popped, if any. - * If the thread is detached, free the storage; otherwise wait for join. - */ - pace_pthread_t pthread; - - PACE_TRACE("pace_pthread_exit"); - - if ((pthread = pace_pthread_self()) != NULL) - { - pacevx_pthread_proc_exit(pthread, value_ptr); - - exit(0); - } - - exit(-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_getschedparam (pace_pthread_t thread, - int * policy, - pace_sched_param * param) -{ - PACE_TRACE("pace_pthread_getschedparam"); - - return pthread_getschedparam (thread, - policy, - param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_pthread_getspecific (pace_pthread_key_t key) -{ - PACE_TRACE("pace_pthread_getspecific"); - - return pthread_getspecific (key); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_join (pace_pthread_t thread, void ** value_ptr) -{ - PACE_TRACE("pace_pthread_join"); - - return pthread_join (thread, - value_ptr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_key_create (pace_pthread_key_t * key, - void (*destructor)(void*)) -{ - PACE_TRACE("pace_pthread_key_create"); - - return pthread_key_create (key, - destructor); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_key_delete (pace_pthread_key_t key) -{ - PACE_TRACE("pace_pthread_key_delete"); - - return pthread_key_delete (key); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_kill (pace_pthread_t thread, int sig) -{ - PACE_TRACE("pace_pthread_kill"); - - if (pacevx_pthread_verify(thread)) - return kill(thread->tid, sig); - else - return EINVAL; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_destroy (pace_pthread_mutex_t * mutex) -{ - PACE_TRACE("pace_pthread_mutex_destroy"); - - if (*mutex != NULL) - return semDelete(*mutex); - - return EINVAL; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_getprioceiling (pace_pthread_mutex_t * mutex, - int * prioceiling) -{ - PACE_TRACE("pace_pthread_mutex_getprioceiling"); - - /* - * Mutex priority is not supported in VxWorks; - * it depends on the thread using it and has the same priority - * ceiling as this thread (SCHED_RR_HIGH_PRI). - */ - *prioceiling = SCHED_RR_HIGH_PRI; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_init (pace_pthread_mutex_t * mutex, - const pace_pthread_mutexattr_t * attr) -{ - PACE_TRACE("pace_pthread_mutex_init"); - - return pthread_mutex_init (mutex, - attr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_lock (pace_pthread_mutex_t * mutex) -{ - PACE_TRACE("pace_pthread_mutex_lock"); - - return pthread_mutex_lock (mutex); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_setprioceiling (pace_pthread_mutex_t * mutex, - int prioceiling, - int * old_ceiling) -{ - PACE_TRACE("pace_pthread_mutex_setprioceiling"); - - /* - * Mutex priority is not supported in VxWorks; - * it depends on the thread using it and has the same priority - * ceiling as this thread (SCHED_RR_HIGH_PRI). - */ - *old_ceiling = SCHED_RR_HIGH_PRI; - - if (prioceiling != SCHED_RR_HIGH_PRI) - return ERROR; - - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_trylock (pace_pthread_mutex_t * mutex) -{ - PACE_TRACE("pace_pthread_mutex_trylock"); - - return pthread_mutex_trylock (mutex); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_unlock (pace_pthread_mutex_t * mutex) -{ - PACE_TRACE("pace_pthread_mutex_unlock"); - - return pthread_mutex_unlock (mutex); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_destroy (pace_pthread_mutexattr_t * attr) -{ - PACE_TRACE("pace_pthread_mutexattr_destroy"); - - free(*attr); - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_getprioceiling (pace_pthread_mutexattr_t * attr, - int * prioceiling) -{ - PACE_TRACE("pace_pthread_mutexattr_getprioceiling"); - - /* - * Mutex priority is not supported in VxWorks, - * it depends the thread using it and has the same priority - * ceiling as this thread (SCHED_RR_HIGH_PRI). - */ - *prioceiling = SCHED_RR_HIGH_PRI; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_getprotocol (const pace_pthread_mutexattr_t * attr, - int * protocol) -{ - PACE_TRACE("pace_pthread_mutexattr_getprotocol"); - -/* - * Does not support PTHREAD_PRIO_PROTECT for VxWorks - */ - if (attr == 0) - return EINVAL; - - *protocol = (*attr)->protocol; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_setprioceiling (pace_pthread_mutexattr_t * attr, - int prioceiling) -{ - PACE_TRACE("pace_pthread_mutexattr_setprioceiling"); - - /* - * Mutex priority is not supported in VxWorks; - * it depends on the thread using it and has the same priority - * ceiling as this thread (SCHED_RR_HIGH_PRI). - */ - if (prioceiling == SCHED_RR_HIGH_PRI) - return OK; - else - return ERROR; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr, - int protocol) -{ - PACE_TRACE("pace_pthread_mutexattr_setprotocol"); - - return pthread_mutexattr_setprotocol (attr, - protocol); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_getpshared (const pace_pthread_mutexattr_t * attr, - int * pshared) -{ - PACE_TRACE("pace_pthread_mutexattr_getpshared"); - - /* - * Only supports PTHREAD_PROCESS_SHARED - */ - *pshared = PTHREAD_PROCESS_SHARED; - return OK; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_init (pace_pthread_mutexattr_t * attr) -{ - PACE_TRACE("pace_pthread_mutexattr_init"); - - return pthread_mutexattr_init (attr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr, - int pshared) -{ - PACE_TRACE("pace_pthread_mutexattr_setpshared"); - - return pthread_mutexattr_setpshared (attr, - pshared); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_once (pace_pthread_once_t * once_control, - void (*void_routine) (void)) -{ - PACE_TRACE("pace_pthread_once"); - - return pthread_once (once_control, - void_routine); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_pthread_t -pace_pthread_self () -{ - PACE_TRACE("pace_pthread_self"); - - return pthread_self(); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setcancelstate (int state, - int * oldstate) -{ - PACE_TRACE("pace_pthread_setcancelstate"); - - return pthread_setcancelstate (state, - oldstate); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setcanceltype (int type, - int * oldtype) -{ - PACE_TRACE("pace_pthread_setcanceltype"); - - return pthread_setcanceltype (type, - oldtype); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setschedparam (pace_pthread_t thread, - int policy, - const pace_sched_param * param) -{ - PACE_TRACE("pace_pthread_setschedparam"); - - return pthread_setschedparam (thread, - policy, - param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setspecific (pace_pthread_key_t key, - const void * value) -{ - PACE_TRACE("pace_pthread_setspecific"); - - return pthread_setspecific (key, - value); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_sigmask (int how, - const pace_sigset_t * set, - pace_sigset_t * oset) -{ - PACE_TRACE("pace_pthread_sigmask"); - - return pthread_sigmask (how, - set, - oset); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void -pace_pthread_testcancel () -{ - PACE_TRACE("pace_pthread_testcancel"); - - /* Do nothing per ACE (i.e., ACE_OS::thr_testcancel). */ - return; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/vxworks/pwd.c b/PACE/pace/vxworks/pwd.c deleted file mode 100644 index 08f623cb684..00000000000 --- a/PACE/pace/vxworks/pwd.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/pwd.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/pwd.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/pwd.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/pwd.h b/PACE/pace/vxworks/pwd.h deleted file mode 100644 index 4a2463658e5..00000000000 --- a/PACE/pace/vxworks/pwd.h +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/pwd.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_PWD_H_VXWORKS -#define PACE_PWD_H_VXWORKS - -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_PASSWD -#define PACE_PASSWD - typedef struct passwd pace_passwd; -#endif /* PACE_PASSWD */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_PWD_H_VXWORKS */ diff --git a/PACE/pace/vxworks/pwd.inl b/PACE/pace/vxworks/pwd.inl deleted file mode 100644 index 1e4aab00715..00000000000 --- a/PACE/pace/vxworks/pwd.inl +++ /dev/null @@ -1,82 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/pwd.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_passwd * -pace_getpwuid (pace_uid_t uid) -{ - PACE_TRACE("pace_getpwuid"); - - /* getpwuid() is not supported: just one user anyways */ - PACE_UNUSED_ARG (uid); - return 0; -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getpwuid_r (pace_uid_t uid, - pace_passwd * pwd, - char * buffer, - pace_size_t bufsize, - pace_passwd ** result) -{ - PACE_TRACE("pace_getpwuid_r"); - - /* getpwuid_r() is not supported: just one user anyways */ - PACE_UNUSED_ARG (uid); - PACE_UNUSED_ARG (pwd); - PACE_UNUSED_ARG (buffer); - PACE_UNUSED_ARG (bufsize); - PACE_UNUSED_ARG (result); - return 0; -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_passwd * -pace_getpwnam (const char * name) -{ - PACE_TRACE("pace_getpwnam"); - - /* getpwuid() is not supported: just one user anyways */ - PACE_UNUSED_ARG (name); - return 0; -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getpwnam_r (const char * name, - pace_passwd * pwd, - char * buffer, - pace_size_t bufsize, - pace_passwd ** result) -{ - PACE_TRACE("pace_getpwnam_r"); - - /* getpwuid_r() is not supported: just one user anyways */ - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (pwd); - PACE_UNUSED_ARG (buffer); - PACE_UNUSED_ARG (bufsize); - PACE_UNUSED_ARG (result); - return 0; -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ diff --git a/PACE/pace/vxworks/sched.c b/PACE/pace/vxworks/sched.c deleted file mode 100644 index 14a8857f86e..00000000000 --- a/PACE/pace/vxworks/sched.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/sched.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/sched.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/sched.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/sched.h b/PACE/pace/vxworks/sched.h deleted file mode 100644 index 722b5953c95..00000000000 --- a/PACE/pace/vxworks/sched.h +++ /dev/null @@ -1,38 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/sched.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_SCHED_H_VXWORKS -#define PACE_SCHED_H_VXWORKS - -#include -#include "pace/time.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_SCHED_FIFO SCHED_FIFO -#define PACE_SCHED_OTHER SCHED_RR - -#ifndef PACE_SCHED_PARAM -#define PACE_SCHED_PARAM - typedef struct sched_param pace_sched_param; -#endif /* PACE_SCHED_PARAM */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SCHED_H_VXWORKS */ diff --git a/PACE/pace/vxworks/sched.inl b/PACE/pace/vxworks/sched.inl deleted file mode 100644 index 1d6a11bcdf3..00000000000 --- a/PACE/pace/vxworks/sched.inl +++ /dev/null @@ -1,107 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/sched.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_get_priority_max (int policy) -{ - PACE_TRACE("pace_sched_get_priority_max"); - - return sched_get_priority_max (policy); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_get_priority_min (int policy) -{ - PACE_TRACE("pace_sched_get_priority_min"); - - return sched_get_priority_min (policy); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_getparam (pace_pid_t pid, - pace_sched_param * param) -{ - PACE_TRACE("pace_sched_getparam"); - - return sched_getparam (pid, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_rr_get_interval (pace_pid_t pid, - pace_timespec * interval) -{ - PACE_TRACE("pace_sched_rr_get_interval"); - - return sched_rr_get_interval (pid, interval); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_setparam (pace_pid_t pid, - const pace_sched_param * param) -{ - PACE_TRACE("pace_sched_setparam"); - - return sched_setparam (pid, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_getscheduler (pace_pid_t pid) -{ - PACE_TRACE("pace_sched_getscheduler"); - - return sched_getscheduler (pid); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_setscheduler (pace_pid_t pid, - int policy, - const pace_sched_param * param) -{ - PACE_TRACE("pace_sched_setscheduler"); - - return sched_setscheduler (pid, policy, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_yield () -{ - PACE_TRACE("pace_sched_yield"); - - return sched_yield (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/vxworks/semaphore.c b/PACE/pace/vxworks/semaphore.c deleted file mode 100644 index f4d56e89543..00000000000 --- a/PACE/pace/vxworks/semaphore.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/semaphore.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/semaphore.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/semaphore.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/semaphore.h b/PACE/pace/vxworks/semaphore.h deleted file mode 100644 index f5a0a97d05a..00000000000 --- a/PACE/pace/vxworks/semaphore.h +++ /dev/null @@ -1,31 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/semaphore.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_SEMAPHORE_H_VXWORKS -#define PACE_SEMAPHORE_H_VXWORKS - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -typedef sem_t pace_sem_t; - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SEMAPHORE_H_VXWORKS */ diff --git a/PACE/pace/vxworks/semaphore.inl b/PACE/pace/vxworks/semaphore.inl deleted file mode 100644 index edf2e95eea4..00000000000 --- a/PACE/pace/vxworks/semaphore.inl +++ /dev/null @@ -1,102 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/semaphore.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_close (pace_sem_t * sem) -{ - PACE_TRACE("pace_sem_close"); - - return sem_close (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_destroy (pace_sem_t * sem) -{ - PACE_TRACE("pace_sem_destroy"); - - return sem_destroy (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_getvalue (pace_sem_t * sem, int * sval) -{ - PACE_TRACE("pace_sem_getvalue"); - - return sem_getvalue (sem, sval); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_init (pace_sem_t * sem, int pshared, unsigned int value) -{ - PACE_TRACE("pace_sem_init"); - - return sem_init (sem, pshared, value); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_post (pace_sem_t * sem) -{ - PACE_TRACE("pace_sem_post"); - - return sem_post (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_trywait (pace_sem_t * sem) -{ - PACE_TRACE("pace_sem_trywait"); - - return sem_trywait (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_unlink (const char * name) -{ - PACE_TRACE("pace_sem_unlink"); - - return sem_unlink (name); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_wait (pace_sem_t * sem) -{ - PACE_TRACE("pace_sem_wait"); - - return sem_wait (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/vxworks/setjmp.c b/PACE/pace/vxworks/setjmp.c deleted file mode 100644 index e2248f0389b..00000000000 --- a/PACE/pace/vxworks/setjmp.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/setjmp.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/setjmp.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/setjmp.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/setjmp.h b/PACE/pace/vxworks/setjmp.h deleted file mode 100644 index 5c0f8b57751..00000000000 --- a/PACE/pace/vxworks/setjmp.h +++ /dev/null @@ -1,33 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/setjmp.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_SETJMP_H_VXWORKS -#define PACE_SETJMP_H_VXWORKS - -#include -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - typedef jmp_buf pace_jmp_buf; - typedef sigjmp_buf pace_sigjmp_buf; - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SETJMP_H_VXWORKS */ diff --git a/PACE/pace/vxworks/setjmp.inl b/PACE/pace/vxworks/setjmp.inl deleted file mode 100644 index b302dc91f55..00000000000 --- a/PACE/pace/vxworks/setjmp.inl +++ /dev/null @@ -1,38 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/setjmp.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_longjmp (pace_jmp_buf env, int val) -{ - PACE_TRACE("pace_longjmp"); - - longjmp (env, val); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -void -pace_siglongjmp (pace_sigjmp_buf env, int val) -{ - PACE_TRACE("pace_siglongjmp"); - - siglongjmp (env, val); - return; -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ diff --git a/PACE/pace/vxworks/signal.c b/PACE/pace/vxworks/signal.c deleted file mode 100644 index b7b840f3539..00000000000 --- a/PACE/pace/vxworks/signal.c +++ /dev/null @@ -1,28 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/signal.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/signal.h" - -#if (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/signal.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_CPLUSPLUS) -} -#endif diff --git a/PACE/pace/vxworks/signal.h b/PACE/pace/vxworks/signal.h deleted file mode 100644 index 9b4343559a8..00000000000 --- a/PACE/pace/vxworks/signal.h +++ /dev/null @@ -1,71 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/signal.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#ifndef PACE_SIGNAL_H_VXWORKS -#define PACE_SIGNAL_H_VXWORKS - -#include -#include "pace/sys/types.h" -#include "pace/time.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_SIG_PF -# define PACE_SIG_PF - typedef void (*pace_sig_pf)(int); -#endif /* PACE_SIG_PF */ - -#ifndef PACE_SIG_ATOMIC_T -#define PACE_SIG_ATOMIC_T - typedef sig_atomic_t pace_sig_atomic_t; -#endif /* PACE_SIG_ATOMIC_T */ - -#ifndef PACE_SIGSET_T -#define PACE_SIGSET_T - typedef sigset_t pace_sigset_t; -#endif /* PACE_SIGSET_T */ - -#ifndef PACE_SIGACTION_S -#define PACE_SIGACTION_S - typedef struct sigaction pace_sigaction_s; -#endif /* PACE_SIGACTION_S */ - -#ifndef PACE_SIGINFO_T -#define PACE_SIGINFO_T - typedef siginfo_t pace_siginfo_t; -#endif /* PACE_SIGINFO_T */ - -#ifndef PACE_SIGEVENT -#define PACE_SIGEVENT - typedef struct sigevent pace_sigevent; -#endif /* PACE_SIGEVENT */ - -#ifndef PACE_SIGVAL -#define PACE_SIGVAL - typedef union sigval pace_sigval; -#endif /* PACE_SIGVAL */ - -#ifndef PACE_TIMESPEC -#define PACE_TIMESPEC - typedef struct timespec pace_timespec; -#endif /* PACE_TIMESPEC */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SIGNAL_H_VXWORKS */ diff --git a/PACE/pace/vxworks/signal.inl b/PACE/pace/vxworks/signal.inl deleted file mode 100644 index b5c94f61d4b..00000000000 --- a/PACE/pace/vxworks/signal.inl +++ /dev/null @@ -1,207 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/signal.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_kill (pace_pid_t pid, int sig) -{ - PACE_TRACE("pace_kill"); - - return kill (pid, sig); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_raise (int sig) -{ - PACE_TRACE("pace_raise"); - - return raise (sig); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigaction (int sig, const pace_sigaction_s * act, - pace_sigaction_s * oact) -{ - PACE_TRACE("pace_sigaction"); - - return sigaction (sig, act, oact); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigaddset (pace_sigset_t * set, int signo) -{ - PACE_TRACE("pace_sigaddset"); - - return sigaddset (set, signo); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigemptyset (pace_sigset_t * set) -{ - PACE_TRACE("pace_sigemptyset"); - - return sigemptyset (set); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigdelset (pace_sigset_t * set, int signo) -{ - PACE_TRACE("pace_sigdelset"); - - return sigdelset (set, signo); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigfillset (pace_sigset_t * set) -{ - PACE_TRACE("pace_sigfillset"); - - return sigfillset (set); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigismember (const pace_sigset_t * set, int signo) -{ - PACE_TRACE("pace_sigismember"); - - return sigismember (set, signo); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_sig_pf -pace_signal (int sig, pace_sig_pf func) -{ - PACE_TRACE("pace_signal"); - - return signal (sig, func); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigpending (pace_sigset_t * set) -{ - PACE_TRACE("pace_sigpending"); - - return sigpending (set); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigprocmask (int how, const pace_sigset_t * set, - pace_sigset_t * oset) -{ - PACE_TRACE("pace_sigprocmask"); - - return sigprocmask (how, set, oset); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigqueue (pace_pid_t pid, int signo, - const pace_sigval value) -{ - PACE_TRACE("pace_sigqueue"); - - return sigqueue (pid, signo, value); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigsuspend (const pace_sigset_t * sigmask) -{ - PACE_TRACE("pace_sigsuspend"); - - return sigsuspend (sigmask); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigtimedwait (const pace_sigset_t * set, pace_siginfo_t * info, - const pace_timespec * timeout) -{ - PACE_TRACE("pace_sigtimedwait"); - - return sigtimedwait (set, info, timeout); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigwait (const pace_sigset_t * set, int * sig) -{ - PACE_TRACE("pace_sigwait"); - - /* It appears that sigwait is not supported for 5.3.1 or 5.4. - * ACE uses sigtimedwait instead. (The code below is directly - * from ACE_OS. - * This is the call that should be made if VxWorks supported - * sigwait: - PACE_UNUSED_ARG (sig); - return sigwait (set); - - * Second arg is a struct siginfo *, which we don't need (the - * selected signal number is returned). Third arg is timeout: 0 - * means forever. - */ - *sig = sigtimedwait (set, 0, 0); - return *sig; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigwaitinfo (const pace_sigset_t *set, pace_siginfo_t *info) -{ - PACE_TRACE("pace_sigwaitinfo"); - - return sigwaitinfo (set, info); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/vxworks/socket.c b/PACE/pace/vxworks/socket.c deleted file mode 100644 index 84b52baa24c..00000000000 --- a/PACE/pace/vxworks/socket.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/socket.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/sys/socket.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/socket.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/socket.h b/PACE/pace/vxworks/socket.h deleted file mode 100644 index 4d23fe807d1..00000000000 --- a/PACE/pace/vxworks/socket.h +++ /dev/null @@ -1,218 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/socket.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_SOCKET_H_VXWORKS -#define PACE_SOCKET_H_VXWORKS - -#include -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_SOMAXCONN -#define PACE_SOMAXCONN SOMAXCONN -#endif /* PACE_SOMAXCONN */ - -#ifndef PACE_SOCKLEN_T -#define PACE_SOCKLEN_T - typedef int pace_socklen_t; -#endif /* PACE_SOCKLEN_T */ - -#ifndef PACE_SA_FAMILY_T -#define PACE_SA_FAMILY_T -#endif /* PACE_SA_FAMILY_T */ - -#ifndef PACE_MSGHDR -#define PACE_MSGHDR - typedef struct msghdr pace_msghdr; -#endif /* PACE_MSGHDR */ - -#ifndef PACE_CMSGRHDR -#define PACE_CMSGRHDR - typedef struct cmsghdr pace_cmsghdr; -#endif /* PACE_CMSGRHDR */ - -#ifndef PACE_LINGER -#define PACE_LINGER - typedef struct linger pace_linger; -#endif /* PACE_LINGER */ - -#ifndef PACE_SOCK_STREAM -#define PACE_SOCK_STREAM SOCK_STREAM -#endif /* PACE_SOCK_STREAM */ - -#ifndef PACE_SOCK_DGRAM -#define PACE_SOCK_DGRAM SOCK_DGRAM -#endif /* PACE_SOCK_DGRAM */ - -#ifndef PACE_SOCK_RAW -#define PACE_SOCK_RAW SOCK_RAW -#endif /* PACE_MSGHDR */ - -#ifndef PACE_SOCK_SEQPACKET -#define PACE_SOCK_SEQPACKET SOCK_SEQPACKET -#endif /* PACE_SOCK_SEQPACKET */ - -#ifndef PACE_PF_UNSPEC -#define PACE_PF_UNSPEC PF_UNSPEC -#endif /* PACE_PF_UNSPEC */ - -#ifndef PACE_PF_LOCAL -#define PACE_PF_LOCAL PF_LOCAL -#endif /* PACE_PF_LOCAL */ - -#ifndef PACE_PF_INET -#define PACE_PF_INET PF_INET -#endif /* PACE_PF_INET */ - -#ifndef PACE_PF_ISO -#define PACE_PF_ISO PF_ISO -#endif /* PACE_PF_ISO */ - -#ifndef PACE_PF_OSI -#define PACE_PF_OSI PF_OSI -#endif /* PACE_PF_OSI */ - -#ifndef PACE_AF_UNSPEC -#define PACE_AF_UNSPEC AF_UNSPEC -#endif /* PACE_AF_UNSPEC */ - -#ifndef PACE_AF_LOCAL -#define PACE_AF_LOCAL AF_LOCAL -#endif /* PACE_AF_LOCAL */ - -#ifndef PACE_AF_INET -#define PACE_AF_INET AF_INET -#endif /* PACE_AF_INET */ - -#ifndef PACE_AF_ISO -#define PACE_AF_ISO AF_ISO -#endif /* PACE_AF_ISO */ - -#ifndef PACE_AF_OSI -#define PACE_AF_OSI AF_OSI -#endif /* PACE_AF_OSI */ - -#ifndef PACE_MSG_OOB -#define PACE_MSG_OOB MSG_OOB -#endif /* PACE_MSG_OOB */ - -#ifndef PACE_MSG_PEEK -#define PACE_MSG_PEEK MSG_PEEK -#endif /* PACE_MSG_PEEK */ - -#ifndef PACE_MSG_DONTROUTE -#define PACE_MSG_DONTROUTE MSG_DONTROUTE -#endif /* PACE_MSG_DONTROUTE */ - -#ifndef PACE_MSG_EOR -#define PACE_MSG_EOR MSG_EOR -#endif /* PACE_MSG_EOR */ - -#ifndef PACE_MSG_TRUNC -#define PACE_MSG_TRUNC MSG_TRUNC -#endif /* PACE_MSG_TRUNC */ - -#ifndef PACE_MSG_CTRUNC -#define PACE_MSG_CTRUNC MSG_CTRUNC -#endif /* PACE_MSG_CTRUNC */ - -#ifndef PACE_MSG_WAITALL -#define PACE_MSG_WAITALL MSG_WAITALL -#endif /* PACE_MSG_WAITALL */ - -#ifndef PACE_SOL_SOCKET -#define PACE_SOL_SOCKET SOL_SOCKET -#endif /* PACE_SOL_SOCKET */ - -#ifndef PACE_SO_BROADCAST -#define PACE_SO_BROADCAST SO_BROADCAST -#endif /* PACE_SO_BROADCAST */ - -#ifndef PACE_SO_DEBUG -#define PACE_SO_DEBUG SO_DEBUG -#endif /* PACE_SO_DEBUG */ - -#ifndef PACE_SO_DONTROUTE -#define PACE_SO_DONTROUTE SO_DONTROUTE -#endif /* PACE_SO_DONTROUTE */ - -#ifndef PACE_SO_ERROR -#define PACE_SO_ERROR SO_ERROR -#endif /* PACE_SO_ERROR */ - -#ifndef PACE_SO_KEEPALIVE -#define PACE_SO_KEEPALIVE SO_KEEPALIVE -#endif /* PACE_SO_KEEPALIVE */ - -#ifndef PACE_SO_LINGER -#define PACE_SO_LINGER SO_LINGER -#endif /* PACE_SO_LINGER */ - -#ifndef PACE_SO_OOBINLINE -#define PACE_SO_OOBINLINE SO_OOBINLINE -#endif /* PACE_SO_OOBINLINE */ - -#ifndef PACE_SO_RCVBUF -#define PACE_SO_RCVBUF SO_RCVBUF -#endif /* PACE_SO_RCVBUF */ - -#ifndef PACE_SO_RCVLOWAT -#define PACE_SO_RCVLOWAT SO_RCVLOWAT -#endif /* PACE_SO_RCVLOWAT */ - -#ifndef PACE_SO_RCVTIMEO -#define PACE_SO_RCVTIMEO SO_RCVTIMEO -#endif /* PACE_SO_RCVTIMEO */ - -#ifndef PACE_SO_REUSEADDR -#define PACE_SO_REUSEADDR SO_REUSEADDR -#endif /* PACE_SO_REUSEADDR */ - -#ifndef PACE_SO_SNDBUF -#define PACE_SO_SNDBUF SO_SNDBUF -#endif /* PACE_SO_SNDBUF */ - -#ifndef PACE_SO_SNDLOWAT -#define PACE_SO_SNDLOWAT SO_SNDLOWAT -#endif /* PACE_SO_SNDLOWAT */ - -#ifndef PACE_SO_SNDTIMEO -#define PACE_SO_SNDTIMEO SO_SNDTIMEO -#endif /* PACE_SO_SNDTIMEO */ - -#ifndef PACE_SO_TYPE -#define PACE_SO_TYPE SO_TYPE -#endif /* PACE_SO_TYPE */ - -#ifndef PACE_CMSG_DATA -#define PACE_CMSG_DATA(cmsg) CMSG_DATA(cmsg) -#endif /* PACE_CMSG_DATA */ - -#ifndef PACE_CMSG_NXTHDR -#define PACE_CMSG_NXTHDR(mhdr, cmsg) CMSG_NXTHDR(mhdr, cmsg) -#endif /* PACE_CMSG_DATA */ - -#ifndef PACE_CMSG_FIRSTHDR -#define PACE_CMSG_NXTHDR(mhdr, cmsg) CMSG_NXTHDR(mhdr, cmsg) -#endif /* PACE_CMSG_DATA */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SOCKET_H_VXWORKS */ diff --git a/PACE/pace/vxworks/socket.inl b/PACE/pace/vxworks/socket.inl deleted file mode 100644 index 440254fd0da..00000000000 --- a/PACE/pace/vxworks/socket.inl +++ /dev/null @@ -1,280 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/socket.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include -#include - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_accept (int s, - pace_sockaddr * socketaddress, - pace_socklen_t * addresslen) -{ - PACE_TRACE("pace_accept"); - - accept (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_bind (int s, - const pace_sockaddr * socketaddress, - pace_socklen_t addresslen) -{ - PACE_TRACE("pace_bind"); - - bind (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_connect (int s, - const pace_sockaddr * socketaddress, - pace_socklen_t addresslen) -{ - PACE_TRACE("pace_connect"); - - connect (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_getpeername (int s, - pace_sockaddr * socketaddress, - pace_socklen_t * addresslen) -{ - PACE_TRACE("pace_getpeername"); - - getpeername (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_getsockname (int s, - pace_sockaddr * socketaddress, - pace_socklen_t * addresslen) -{ - PACE_TRACE("pace_getsockname"); - - getsockname (s, socketaddress, addresslen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_getsockopt (int s, - int level, - int optname, - void * optval, - pace_socklen_t optlen) -{ - PACE_TRACE("pace_getsockopt"); - - getsockopt (s, level, optname, optval, optlen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_setsockopt (int s, - int level, - int optname, - const * optval) -{ - PACE_TRACE("pace_setsockopt"); - - setsockopt (s, level, optname, optval); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_setsockopt (int s, - int level, - int optname, - const * optval) -{ - PACE_TRACE("pace_setsockopt"); - - setsockopt (s, level, optname, optval); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_isfdtype (int fildes, int fdtype) -{ - PACE_TRACE("pace_isfdtype"); - - isfdtype (fildes, fdtype); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_listen (int s, int backlog) -{ - PACE_TRACE("pace_listen"); - - listen (s, backlog); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_recv (int s, - void * buf, - pace_size_t len, - int flags) -{ - PACE_TRACE("pace_recv"); - - recv (s, buf, len, flags); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_recvfrom (int s, - void * buf, - pace_size_t len, - int flags, - pace_sockaddr * from, - pace_socklen_t * fromlen) -{ - PACE_TRACE("pace_recvfrom"); - - recvfrom (s, buf, len, flags, from, fromlen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_rcvmsg (int s, - pace_msghdr * msg, - int flags) -{ - PACE_TRACE("pace_rcvmsg"); - - rcvmsg (s, msg, flags); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_send (int s, - const void * buf, - pace_size_t len, - int flags) -{ - PACE_TRACE("pace_send"); - - send (s, buf, len, flags); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_sendto (int s, - const void * buf, - pace_size_t len, - int flags, - const pace_sockaddr * to, - pace_socklen_t * tolen) -{ - PACE_TRACE("pace_sendto"); - - sendto (s, buf, len, flags, to, tolen); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -pace_ssize_t -pace_sendmsg (int s, - const pace_msghdr * msg, - int flags) -{ - PACE_TRACE("pace_sendmsg"); - - sendmsg (s, msg, flags); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_shutdown (int s, int how) -{ - PACE_TRACE("pace_shutdown"); - - shutdown (s, how); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_socket (int protofamily, int type, int protocol) -{ - PACE_TRACE("pace_socket"); - - socket (protofamily, type, protocol); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - -#if (PACE_HAS_POSIX_SOCK_UOF) -PACE_INLINE -int -pace_socketpair (int protofamily, - int type, - int protocol, - int sv[2]) -{ - PACE_TRACE("pace_socketpair"); - - socketpair (protofamily, type, protocol, sy); -} -#endif /* PACE_HAS_POSIX_SOCK_UOF */ - - - - - - - - - - - diff --git a/PACE/pace/vxworks/stat.c b/PACE/pace/vxworks/stat.c deleted file mode 100644 index 4a1e3ba06bb..00000000000 --- a/PACE/pace/vxworks/stat.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/stat.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/sys/stat.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/stat.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/stat.h b/PACE/pace/vxworks/stat.h deleted file mode 100644 index ce6669cb971..00000000000 --- a/PACE/pace/vxworks/stat.h +++ /dev/null @@ -1,59 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/stat.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_SYS_STAT_H_VXWORKS -#define PACE_SYS_STAT_H_VXWORKS - -#include -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_S_IRGRP S_IRGRP -#define PACE_S_IROTH S_IROTH -#define PACE_S_IRUSR S_IRUSR -#define PACE_S_IRWXG S_IRWXG -#define PACE_S_IRWXO S_IRWXO -#define PACE_S_IRWXU S_IRWXU -#define PACE_S_ISBLK S_ISBLK -#define PACE_S_ISCHR S_ISCHR -#define PACE_S_ISDIR S_ISDIR -#define PACE_S_ISFIFO S_ISFIFO -#define PACE_S_ISGID S_SIGID -#define PACE_S_ISREG S_ISREG -#define PACE_S_ISUID S_ISUID -#define PACE_S_IWGRP S_IWGRP -#define PACE_S_IWOTH S_IWOTH -#define PACE_S_IWUSR S_IWUSR -#define PACE_S_IXGRP S_IXGRP -#define PACE_S_IXOTH S_IXOTH -#define PACE_S_IXUSR S_IXUSR -#define PACE_S_TYPEISMQ S_TYPEISMQ -#define PACE_S_TYPEISSEM S_TYPEISSEM -#define PACE_S_TYPEISSHM S_TYPEISSHM - -#ifndef PACE_STAT -#define PACE_STAT - /* Kludge since there is a func and a type of the same name */ - typedef struct stat pace_stat_s; -#endif /* PACE_STAT */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_STAT_H_VXWORKS */ diff --git a/PACE/pace/vxworks/stat.inl b/PACE/pace/vxworks/stat.inl deleted file mode 100644 index 56359e690a0..00000000000 --- a/PACE/pace/vxworks/stat.inl +++ /dev/null @@ -1,99 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/stat.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FA_UOF) -PACE_INLINE -int -pace_chmod (const char * path, pace_mode_t mode) -{ - PACE_TRACE("pace_chmod"); - - PACE_UNUSED_ARG(path); - PACE_UNUSED_ARG(mode); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FA_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fchmod (PACE_HANDLE fildes, pace_mode_t mode) -{ - PACE_TRACE("pace_fchmod"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(mode); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_fstat (PACE_HANDLE fildes, pace_stat_s * buf) -{ - PACE_TRACE("pace_fstat"); - - return fstat (fildes, buf); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_mkdir (const char * path, pace_mode_t mode) -{ - PACE_TRACE("pace_mkdir"); - - PACE_UNUSED_ARG (mode); - return mkdir (PACE_NONCONST_ARG_CAST (char *) path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_F_UOF) -PACE_INLINE -int -pace_mkfifo (const char * path, pace_mode_t mode) -{ - PACE_TRACE("pace_mkfifo"); - - PACE_UNUSED_ARG(path); - PACE_UNUSED_ARG(mode); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_F_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_stat (const char * path, pace_stat_s * buf) -{ - PACE_TRACE("pace_stat"); - - return stat (PACE_NONCONST_ARG_CAST (char *) path, buf); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FA_UOF) -PACE_INLINE -pace_mode_t -pace_umask (pace_mode_t cmask) -{ - PACE_TRACE("pace_umask"); - - PACE_UNUSED_ARG(cmask); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FA_UOF */ diff --git a/PACE/pace/vxworks/stdio.c b/PACE/pace/vxworks/stdio.c deleted file mode 100644 index ec5b053e2ff..00000000000 --- a/PACE/pace/vxworks/stdio.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/stdio.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/stdio.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/stdio.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/stdio.h b/PACE/pace/vxworks/stdio.h deleted file mode 100644 index 2e819b7a431..00000000000 --- a/PACE/pace/vxworks/stdio.h +++ /dev/null @@ -1,58 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/stdio.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_STDIO_H_VXWORKS -#define PACE_STDIO_H_VXWORKS - -#include -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_BUFSIZ BUFSIZ -#define PACE_EOF EOF -#define PACE_FILENAME_MAX FILENAME_MAX -#define PACE_L_ctermid L_ctermid -#define PACE_L_cuserid L_cuserid -#ifndef PACE_NULL -#define PACE_NULL NULL -#endif /* PACE_NULL */ -#define PACE_SEEK_CUR SEEK_CUR -#define PACE_SEEK_END SEEK_END -#define PACE_SEEK_SET SEEK_SET -#define PACE_TMP_MAX TMP_MAX -#define pace_stderr stderr -#define pace_stdout stdout -#define pace_stdin stdin - -#ifndef PACE_FPOS_T -#define PACE_FPOS_T -typedef fpos_t pace_fpos_t; -#endif /* PACE_FPOS_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -typedef FILE PACE_FILE; - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STDIO_H_VXWORKS */ diff --git a/PACE/pace/vxworks/stdio.inl b/PACE/pace/vxworks/stdio.inl deleted file mode 100644 index 27ffc39bcc5..00000000000 --- a/PACE/pace/vxworks/stdio.inl +++ /dev/null @@ -1,565 +0,0 @@ -/* $Id$ -*- C -*- - - * =========================================================================== - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/stdio.inl - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#include - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -void -pace_clearerr (FILE * stream) -{ - PACE_TRACE("pace_clearerr"); - - clearerr (stream); - return; -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -char * -pace_ctermid (char * s) -{ - PACE_TRACE("pace_ctermid"); - - PACE_UNUSED_ARG(s); - PACE_ERRNO_NO_SUPPORT_RETURN ((char *) 0); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fclose (FILE * stream) -{ - PACE_TRACE("pace_fclose"); - - return fclose (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -FILE * -pace_fdopen (int fildes, - const char * type) -{ - PACE_TRACE("pace_fdopen"); - - return fdopen (fildes, - type); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_ferror (FILE * stream) -{ - PACE_TRACE("pace_ferror"); - - return ferror (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_feof (FILE * stream) -{ - PACE_TRACE("pace_feof"); - - return feof (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fflush (FILE * stream) -{ - PACE_TRACE("pace_fflush"); - - return fflush (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fileno (FILE * stream) -{ - PACE_TRACE("pace_fileno"); - - return fileno (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fgetc (FILE * stream) -{ - PACE_TRACE("pace_fgetc"); - - return fgetc (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fgetpos (PACE_FILE * stream, - pace_fpos_t * pos) -{ - PACE_TRACE("pace_fgetpos"); - - return fgetpos (stream, pos); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -char * -pace_fgets (char * s, - int n, - FILE * stream) -{ - PACE_TRACE("pace_fgets"); - - return fgets (s, - n, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -void -pace_flockfile (FILE * file) -{ - PACE_TRACE("pace_flockfile"); - - PACE_UNUSED_ARG (file); - PACE_ERRNO_NO_SUPPORT (); - return; -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -FILE * -pace_fopen (const char * filename, - const char * mode) -{ - PACE_TRACE("pace_fopen"); - - return fopen (filename, - mode); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fputc (int c, - FILE * stream) -{ - PACE_TRACE("pace_fputc"); - - return fputc (c, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fputs (const char * s, - FILE * stream) -{ - PACE_TRACE("pace_fputs"); - - return fputs (s, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -size_t -pace_fread (void * ptr, - size_t size, - size_t number_of_items, - FILE * stream) -{ - PACE_TRACE("pace_fread"); - - return fread (ptr, - size, - number_of_items, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -FILE * -pace_freopen (const char * filename, - const char * mode, - FILE * stream) -{ - PACE_TRACE("pace_freopen"); - - return freopen (filename, - mode, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -int -pace_fseek (FILE * stream, - long offset, - int whence) -{ - PACE_TRACE("pace_fseek"); - - return fseek (stream, - offset, - whence); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fsetpos (PACE_FILE *stream, const pace_fpos_t *pos) -{ - PACE_TRACE("pace_fsetpos"); - - return fsetpos (stream, pos); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -long -pace_ftell (FILE * stream) -{ - PACE_TRACE("pace_ftell"); - - return ftell (stream); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_ftrylockfile (FILE * file) -{ - PACE_TRACE("pace_ftrylockfile"); - - PACE_UNUSED_ARG(file); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -void -pace_funlockfile (FILE * file) -{ - PACE_TRACE("pace_funlockfile"); - - PACE_UNUSED_ARG(file); - PACE_ERRNO_NO_SUPPORT (); - return; -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -pace_size_t -pace_fwrite (const void * ptr, - pace_size_t size, pace_size_t nmemb, - PACE_FILE * stream) -{ - PACE_TRACE("pace_fwrite"); - - return fwrite (ptr, size, nmemb, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_getc (FILE * stream) -{ - PACE_TRACE("pace_getc"); - - return getc (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_getc_unlocked (FILE * stream) -{ - PACE_TRACE("pace_getc_unlocked"); - - PACE_UNUSED_ARG(stream); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_getchar () -{ - PACE_TRACE("pace_getchar"); - - return getchar (); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_getchar_unlocked () -{ - PACE_TRACE("pace_getchar_unlocked"); - - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -char * -pace_gets (char * s) -{ - PACE_TRACE("pace_gets"); - - return gets (s); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -void -pace_perror (const char * s) -{ - PACE_TRACE("pace_perror"); - - perror (s); - return; -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_putc (int c, - FILE * stream) -{ - PACE_TRACE("pace_putc"); - - return putc (c, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_putc_unlocked (int c, - FILE * stream) -{ - PACE_TRACE("pace_putc_unlocked"); - - PACE_UNUSED_ARG(c); - PACE_UNUSED_ARG(stream); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_putchar (int c) -{ - PACE_TRACE("pace_putchar"); - - return putchar (c); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_putchar_unlocked (int c) -{ - PACE_TRACE("pace_putchar_unlocked"); - - PACE_UNUSED_ARG(c); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_puts (const char * s) -{ - PACE_TRACE("pace_puts"); - - return puts (s); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_remove (const char * path) -{ - PACE_TRACE("pace_remove"); - - return remove (path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_rename (const char * old_name, - const char * new_name) -{ - PACE_TRACE("pace_rename"); - - return rename (old_name, - new_name); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -void -pace_rewind (FILE * stream) -{ - PACE_TRACE("pace_rewind"); - - rewind (stream); - return; -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -void -pace_setbuf (FILE * stream, char * buf) -{ - PACE_TRACE("pace_setbuf"); - - setbuf (stream, buf); - return; -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_setvbuf (PACE_FILE * stream, - char * buf, - int mode, pace_size_t size) -{ - PACE_TRACE("pace_setvbuf"); - - return setvbuf (stream, buf, mode, size); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -FILE * -pace_tmpfile () -{ - PACE_TRACE("pace_tmpfile"); - - return tmpfile (); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -char * -pace_tmpnam (char * s) -{ - PACE_TRACE("pace_tmpnam"); - - return tmpnam (s); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_ungetc (int c, FILE * stream) -{ - PACE_TRACE("pace_ungetc"); - - return ungetc (c, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_vfprintf (PACE_FILE * stream, - const char * format, - va_list arg) -{ - PACE_TRACE("pace_vfprintf"); - - return vfprintf (stream, format, arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_vprintf (const char * format, - va_list arg) -{ - PACE_TRACE("pace_vprintf"); - - return vprintf (format, arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_vsprintf (char * s, - const char * format, - va_list arg) -{ - PACE_TRACE("pace_vsprintf"); - - return vsprintf (s, format, arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/vxworks/stdlib.c b/PACE/pace/vxworks/stdlib.c deleted file mode 100644 index bea76354026..00000000000 --- a/PACE/pace/vxworks/stdlib.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/stdlib.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/stdlib.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/stdlib.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/stdlib.h b/PACE/pace/vxworks/stdlib.h deleted file mode 100644 index 75a5196af60..00000000000 --- a/PACE/pace/vxworks/stdlib.h +++ /dev/null @@ -1,64 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/stdlib.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STDLIB_H_VXWORKS -#define PACE_STDLIB_H_VXWORKS - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_EXIT_FAILURE EXIT_FAILURE -#define PACE_EXIT_SUCCESS EXIT_SUCCESS -#define PACE_MB_CUR_MAX MB_CUR_MAX -#ifndef PACE_NULL -# define PACE_NULL NULL -#endif /* PACE_NULL */ -#define PACE_RAND_MAX RAND_MAX - -#ifndef PACE_DIV_T -#define PACE_DIV_T - typedef div_t pace_div_t; -#endif /* PACE_DIV_T */ - -#ifndef PACE_LDIV_T -#define PACE_LDIV_T - typedef ldiv_t pace_ldiv_t; -#endif /* PACE_LDIV_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_WCHAR_T -#define PACE_WCHAR_T - typedef wchar_t pace_wchar_t; -#endif /* PACE_WCHAR_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -# ifndef PACE_BSEARCH_PF -# define PACE_BSEARCH_PF - typedef int (*pace_bsearch_pf) (const void*, const void*); -# endif /* PACE_BSEARCH_PF */ -#endif /* PACE_HAS_CPLUSPLUS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STDLIB_H_VXWORKS */ diff --git a/PACE/pace/vxworks/stdlib.inl b/PACE/pace/vxworks/stdlib.inl deleted file mode 100644 index 56569bb52bd..00000000000 --- a/PACE/pace/vxworks/stdlib.inl +++ /dev/null @@ -1,381 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/stdlib.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -void -pace_abort (void) -{ - PACE_TRACE("pace_abort"); - - abort (); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_abs (int val) -{ - PACE_TRACE("pace_abs"); - - return abs (val); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_atexit (void (*func)(void)) -{ - PACE_TRACE("pace_atexit"); - - return atexit (func); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_atof (const char * str) -{ - PACE_TRACE("pace_atof"); - - return atof (str); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_atoi (const char * str) -{ - PACE_TRACE("pace_atoi"); - - return atoi (str); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -long -pace_atol (const char * str) -{ - PACE_TRACE("pace_atol"); - - return atol (str); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -# if defined (PACE_HAS_CPLUSPLUS) -PACE_INLINE -void * -pace_bsearch (const void *key, const void *base, - size_t nel, size_t size, - pace_bsearch_pf compar) -{ - PACE_TRACE("pace_bsearch"); - - return bsearch (key, base, nel, size, compar); -} -# else /* ! PACE_HAS_CPLUSPLUS */ -PACE_INLINE -void * -pace_bsearch (const void *key, const void *base, - size_t nel, size_t size, - int (*compar)(const void *,const void *)) -{ - PACE_TRACE("pace_bsearch"); - - return bsearch (key, base, nel, size, compar); -} -# endif /* PACE_HAS_CPLUSPLUS */ -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_div_t -pace_div (int numer, int denom) -{ - PACE_TRACE("pace_div"); - - return div (numer, denom); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -void -pace_exit (int status) -{ - PACE_TRACE("pace_exit"); - - exit (status); - return; -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -char * -pace_getenv (const char * name) -{ - PACE_TRACE("pace_getenv"); - - return getenv (name); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -long int -pace_labs (long int j) -{ - PACE_TRACE("pace_labs"); - - return labs (j); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_ldiv_t -pace_ldiv (long int numer, long int denom) -{ - PACE_TRACE("pace_ldiv"); - - return ldiv (numer, denom); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mblen (const char* s, pace_size_t n) -{ - PACE_TRACE("pace_mblen"); - - return mblen (s, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_size_t -pace_mbstowcs (pace_wchar_t* pwcs, - const char* s, - pace_size_t n) -{ - PACE_TRACE("pace_mbstowcs"); - - return mbstowcs (pwcs, s, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mbtowc (pace_wchar_t* pwc, - const char* s, - pace_size_t n) -{ - PACE_TRACE("pace_mbtowc"); - - return mbtowc (pwc, s, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -# if (PACE_HAS_CPLUSPLUS) -PACE_INLINE -void -pace_qsort (void * base, size_t nel, size_t width, - pace_bsearch_pf compar) -{ - PACE_TRACE("pace_qsort"); - - qsort (base, nel, width, compar); -} -# else /* ! PACE_HAS_CPLUSPLUS */ -PACE_INLINE -void -pace_qsort (void * base, size_t nel, size_t width, - int (*compar)(const void *,const void *)) -{ - PACE_TRACE("pace_qsort"); - - qsort (base, nel, width, compar); -} -# endif /* PACE_HAS_CPLUSPLUS */ -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_rand () -{ - PACE_TRACE("pace_rand"); - - return rand (); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_srand (unsigned int seed) -{ - PACE_TRACE("pace_srand"); - - srand (seed); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -int -pace_rand_r (unsigned int *seed) -{ - PACE_TRACE("pace_rand_r"); - - PACE_UNUSED_ARG (seed); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -double -pace_strtod (const char* nptr, - char** endptr) -{ - PACE_TRACE("pace_strtod"); - - return strtod (nptr, endptr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_strtol (const char* nptr, - char** endptr, - int base) -{ - PACE_TRACE("pace_strtol"); - - return strtol (nptr, endptr, base); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -unsigned long int -pace_strtoul (const char* nptr, - char** endptr, - int base) -{ - PACE_TRACE("pace_strtoul"); - - return strtoul (nptr, endptr, base); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_system (const char* string) -{ - PACE_TRACE("pace_system"); - - return system (string); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_size_t -pace_wcstombs (char* s, - const pace_wchar_t* pwcs, - pace_size_t n) -{ - PACE_TRACE("pace_wcstombs"); - - return wcstombs (s, pwcs, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_wctomb (char* s, pace_wchar_t wchar) -{ - PACE_TRACE("pace_wctomb"); - - return wctomb (s, wchar); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -/* Memory Management. */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_malloc (size_t size) -{ - PACE_TRACE("pace_malloc"); - - return malloc (size); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_calloc (size_t nelem, size_t elsize) -{ - PACE_TRACE("pace_calloc"); - - return calloc (nelem, elsize); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_free (void * ptr) -{ - PACE_TRACE("pace_free"); - - free (ptr); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_realloc (void * ptr, size_t size) -{ - PACE_TRACE("pace_realloc"); - - return realloc (ptr, size); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/vxworks/string.c b/PACE/pace/vxworks/string.c deleted file mode 100644 index a6404ccfd0b..00000000000 --- a/PACE/pace/vxworks/string.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/string.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/string.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/string.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/string.h b/PACE/pace/vxworks/string.h deleted file mode 100644 index f2fcee61fe5..00000000000 --- a/PACE/pace/vxworks/string.h +++ /dev/null @@ -1,36 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/string.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STRING_H_VXWORKS -#define PACE_STRING_H_VXWORKS - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if !defined (PACE_NULL) -# define PACE_NULL NULL -#endif /* NULL */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STRING_H_VXWORKS */ diff --git a/PACE/pace/vxworks/string.inl b/PACE/pace/vxworks/string.inl deleted file mode 100644 index 65c2701b606..00000000000 --- a/PACE/pace/vxworks/string.inl +++ /dev/null @@ -1,238 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/string.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include -#include "pace/string.h" - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memchr (const void *s, int c, pace_size_t n) -{ - PACE_TRACE("pace_memchr"); - - return (void*) memchr (s, c, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_memcmp (const void *s1, const void *s2, pace_size_t n) -{ - PACE_TRACE("pace_memcmp"); - - return memcmp (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memcpy (void * s1, const void * s2, pace_size_t n) -{ - PACE_TRACE("pace_memcpy"); - - return memcpy (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memmove (void *s1, const void *s2, pace_size_t n) -{ - PACE_TRACE("pace_memmove"); - - return memmove (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_BROKEN_INLINE -void * -pace_memset (void *s, int c, pace_size_t n) -{ - PACE_TRACE("pace_memset"); - - return memset (s, c, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strcat (char * s1, const char * s2) -{ - PACE_TRACE("pace_strcat"); - - return strcat (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strncat (char * s1, const char * s2, size_t n) -{ - PACE_TRACE("pace_strncat"); - - return strncat (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strchr (const char * s, int c) -{ - PACE_TRACE("pace_strchr"); - - return (char*) strchr (s, c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strrchr (const char * s, int c) -{ - PACE_TRACE("pace_strrchr"); - - return (char*) strrchr (s, c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -int -pace_strcmp (const char * s1, const char * s2) -{ - PACE_TRACE("pace_strcmp"); - - return strcmp (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -int -pace_strncmp (const char * s1, const char * s2, size_t n) -{ - PACE_TRACE("pace_strncmp"); - - return strncmp (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -char * -pace_strcpy (char * s1, const char * s2) -{ - PACE_TRACE("pace_strcpy"); - - return strcpy (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strncpy (char * s1, const char * s2, size_t n) -{ - PACE_TRACE("pace_strncpy"); - - return strncpy (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -size_t -pace_strcspn (const char * s1, const char * s2) -{ - PACE_TRACE("pace_strcspn"); - - return strcspn (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strspn (const char * s1, const char * s2) -{ - PACE_TRACE("pace_strspn"); - - return strspn (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strlen (const char * s) -{ - PACE_TRACE("pace_strlen"); - - return strlen (s); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_BROKEN_INLINE -char * -pace_strpbrk (const char * s1, const char * s2) -{ - PACE_TRACE("pace_strpbrk"); - - return (char*) strpbrk (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strstr (const char * s1, const char * s2) -{ - PACE_TRACE("pace_strstr"); - - return (char*) strstr (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strtok (char * s1, const char * s2) -{ - PACE_TRACE("pace_strtok"); - - return strtok (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -char * -pace_strtok_r (char * s, const char * sep, char ** lasts) -{ - PACE_TRACE("pace_strtok_r"); - - return strtok_r (s, sep, lasts); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ diff --git a/PACE/pace/vxworks/termios.c b/PACE/pace/vxworks/termios.c deleted file mode 100644 index 4cc7e1d7388..00000000000 --- a/PACE/pace/vxworks/termios.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/termios.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/termios.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/termios.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/termios.h b/PACE/pace/vxworks/termios.h deleted file mode 100644 index a21eef15fb6..00000000000 --- a/PACE/pace/vxworks/termios.h +++ /dev/null @@ -1,49 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/termios.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_SYS_TERMIOS_H_VXWORKS -#define PACE_SYS_TERMIOS_H_VXWORKS - -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS) */ - -#ifndef PACE_CC_T -#define PACE_CC_T -typedef int pace_cc_t; -#endif /* PACE_CC_T */ - -#ifndef PACE_SPEED_T -#define PACE_SPEED_T -typedef int pace_speed_t; -#endif /* PACE_SPEED_T */ - -#ifndef PACE_TCFLAG_T -#define PACE_TCFLAG_T -typedef int pace_tcflag_t; -#endif /* PACE_TCFLAG_T */ - -#ifndef PACE_TERMIOS -#define PACE_TERMIOS -typedef int pace_termios; -#endif /* PACE_TERMIOS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TERMIOS_H_VXWORKS */ diff --git a/PACE/pace/vxworks/termios.inl b/PACE/pace/vxworks/termios.inl deleted file mode 100644 index 30c778371f3..00000000000 --- a/PACE/pace/vxworks/termios.inl +++ /dev/null @@ -1,145 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/termios.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -pace_speed_t -pace_cfgetospeed (const pace_termios *termiosp) -{ - PACE_TRACE("pace_cfgetospeed"); - - PACE_UNUSED_ARG(termiosp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_cfsetospeed (pace_termios *termios_p, pace_speed_t speed) -{ - PACE_TRACE("pace_cfsetospeed"); - - PACE_UNUSED_ARG(termios_p); - PACE_UNUSED_ARG(speed); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -pace_speed_t -pace_cfgetispeed (const pace_termios *termios_p) -{ - PACE_TRACE("pace_cfgetispeed"); - - PACE_UNUSED_ARG(termios_p); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_cfsetispeed (pace_termios *termios_p, pace_speed_t speed) -{ - PACE_TRACE("pace_cfsetispeed"); - - PACE_UNUSED_ARG(termios_p); - PACE_UNUSED_ARG(speed); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcdrain (PACE_HANDLE fildes) -{ - PACE_TRACE("pace_tcdrain"); - - PACE_UNUSED_ARG(fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcgetattr (PACE_HANDLE fildes, pace_termios *termios_p) -{ - PACE_TRACE("pace_tcgetattr"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(termios_p); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcflow (PACE_HANDLE fildes, int action) -{ - PACE_TRACE("pace_tcflow"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(action); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcflush (PACE_HANDLE fildes, int queue_selector) -{ - PACE_TRACE("pace_tcflush"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(queue_selector); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcsendbreak (PACE_HANDLE fildes, int duration) -{ - PACE_TRACE("pace_tcsendbreak"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(duration); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcsetattr (PACE_HANDLE fildes, - int optional_actions, - const pace_termios *termios_p) -{ - PACE_TRACE("pace_tcsetattr"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(optional_actions); - PACE_UNUSED_ARG(termios_p); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ diff --git a/PACE/pace/vxworks/time.c b/PACE/pace/vxworks/time.c deleted file mode 100644 index 2074220b3ab..00000000000 --- a/PACE/pace/vxworks/time.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/time.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/time.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/time.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/time.h b/PACE/pace/vxworks/time.h deleted file mode 100644 index d5f51c59d38..00000000000 --- a/PACE/pace/vxworks/time.h +++ /dev/null @@ -1,87 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/time.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_TIME_H_VXWORKS -#define PACE_TIME_H_VXWORKS - -#include -#include "pace/signal.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_CLK_TCK CLK_TCK -#define PACE_CLOCKS_PER_SEC CLOCKS_PER_SEC -#define PACE_CLOCK_REALTIME CLOCK_REALTIME -#ifndef PACE_NULL -#define PACE_NULL NULL -#endif /* PACE_NULL */ -#define PACE_TIMER_ABSTIME TIMER_ABSTIME - -#ifndef PACE_CLOCKID_T -#define PACE_CLOCKID_T -# if defined PACE_EMU_CLOCKID_T - typedef pace_emu_clockid_t pace_clockid_t; -# else - typedef clockid_t pace_clockid_t; -# endif /* PACE_LINUX */ -#endif /* PACE_CLOCKID_T */ - -#ifndef PACE_CLOCK_T -#define PACE_CLOCK_T - typedef clock_t pace_clock_t; -#endif /* PACE_CLOCK_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_TIMER_T -#define PACE_TIMER_T - typedef timer_t pace_timer_t; -#endif /* PACE_TIMER_T */ - -#ifndef PACE_TIME_T -#define PACE_TIME_T - typedef time_t pace_time_t; -#endif /* PACE_TIME_T */ - -#ifndef PACE_TM -#define PACE_TM - typedef struct tm pace_tm; -#endif /* PACE_TM */ - -#ifndef PACE_TIMESPEC -#define PACE_TIMESPEC - typedef struct timespec pace_timespec; -#endif /* PACE_TIMESPEC */ - -#ifndef PACE_ITIMERSPEC -#define PACE_ITIMERSPEC - typedef struct itimerspec pace_itimerspec; -#endif /* PACE_ITIMERSPEC */ - -#ifndef PACE_SIGEVENT -#define PACE_SIGEVENT - typedef struct sigevent pace_sigevent; -#endif /* PACE_SIGEVENT */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_TIME_H_VXWORKS */ diff --git a/PACE/pace/vxworks/time.inl b/PACE/pace/vxworks/time.inl deleted file mode 100644 index a2ed9715823..00000000000 --- a/PACE/pace/vxworks/time.inl +++ /dev/null @@ -1,296 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/time.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/errno.h" -#include "pace/signal.h" - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_asctime (const pace_tm * time) -{ - PACE_TRACE("pace_asctime"); - - return asctime (time); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -char * -pace_asctime_r (const pace_tm * time, char * buf) -{ - /*VxWorks 5.3 seems to have POSIX.4 Draft 9 versions of this as well */ - size_t buflen = 26; - - PACE_TRACE("pace_asctime_r"); - - if (asctime_r (time, buf, & buflen) != 0) - return (char*) 0; - return buf; -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_clock_t -pace_clock (void) -{ - PACE_TRACE("pace_clock"); - - return clock (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -double -pace_difftime (pace_time_t time1, pace_time_t time2) -{ - PACE_TRACE("pace_difftime"); - - return difftime (time1, time2); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_clock_getres (pace_clockid_t clock_id, - pace_timespec * res) -{ - PACE_TRACE("pace_clock_getres"); - - return clock_getres (clock_id, res); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_clock_gettime (pace_clockid_t clock_id, - pace_timespec * tp) -{ - PACE_TRACE("pace_clock_gettime"); - - return clock_gettime (clock_id, tp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_clock_settime (pace_clockid_t clock_id, - const pace_timespec * tp) -{ - PACE_TRACE("pace_clock_settime"); - - return clock_settime (clock_id, PACE_NONCONST_ARG_CAST (struct timespec *) tp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_ctime (const pace_time_t * clock) -{ - PACE_TRACE("pace_ctime"); - - return ctime (clock); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -char * -pace_ctime_r (const pace_time_t * clock, char * buf) -{ - size_t buflen = 26; - - PACE_TRACE("pace_ctime_r"); - - return ctime_r (clock, buf, & buflen); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -pace_tm * -pace_gmtime (const pace_time_t * clock) -{ - PACE_TRACE("pace_gmtime"); - - return gmtime (clock); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -pace_tm * -pace_gmtime_r (const pace_time_t * clock, pace_tm * result) -{ - PACE_TRACE("pace_gmtime_r"); - - /* VxWorks 5.3 apparently has POSIX.4 Draft 9 versions of these */ - if (gmtime_r (clock, result) != 0) - return (pace_tm*)0; - return result; -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -pace_tm * -pace_localtime (const pace_time_t * clock) -{ - PACE_TRACE("pace_localtime"); - - return localtime (clock); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -pace_tm * -pace_localtime_r (const pace_time_t * clock, pace_tm * result) -{ - PACE_TRACE("pace_localtime_r"); - - /* VxWorks 5.3 apparently has POSIX.4 Draft 9 versions of these */ - if (localtime_r (clock, result) != 0) - return (pace_tm*)0; - return result; -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -time_t -pace_mktime (pace_tm * timeptr) -{ - PACE_TRACE("pace_mktime"); - - return mktime (timeptr); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_nanosleep (const pace_timespec * rqtp, - pace_timespec * rmtp) -{ - PACE_TRACE("pace_nanosleep"); - - return nanosleep (PACE_NONCONST_ARG_CAST (struct timespec *) rqtp, rmtp); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strftime (char *s, pace_size_t maxsize, - const char *format, - const pace_tm *timeptr) -{ - PACE_TRACE("pace_strftime"); - - return strftime (s, maxsize, format, timeptr); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -time_t -pace_time (pace_time_t * tloc) -{ - PACE_TRACE("pace_time"); - - return time (tloc); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_create (pace_clockid_t clock_id, - pace_sigevent * evp, - pace_timer_t *timerid) -{ - PACE_TRACE("pace_timer_create"); - - return timer_create (clock_id, evp, timerid); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_delete (pace_timer_t timerid) -{ - PACE_TRACE("pace_timer_delete"); - - return timer_delete (timerid); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_getoverrun (pace_timer_t timerid) -{ - PACE_TRACE("pace_timer_getoverrun"); - - return timer_getoverrun (timerid); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_gettime (pace_timer_t timerid, - pace_itimerspec * value) -{ - PACE_TRACE("pace_timer_gettime"); - - return timer_gettime (timerid, value); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_settime (pace_timer_t timerid, - int flags, - const pace_itimerspec * value, - pace_itimerspec * ovalue) -{ - PACE_TRACE("pace_timer_settime"); - - return timer_settime (timerid, flags, PACE_NONCONST_ARG_CAST (struct itimerspec *) value, ovalue); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_tzset () -{ - PACE_TRACE("pace_tzset"); - - PACE_ERRNO_NO_SUPPORT (); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/vxworks/times.c b/PACE/pace/vxworks/times.c deleted file mode 100644 index 51b4dc90dc7..00000000000 --- a/PACE/pace/vxworks/times.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/times.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/sys/times.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/times.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/times.h b/PACE/pace/vxworks/times.h deleted file mode 100644 index d2ae481355e..00000000000 --- a/PACE/pace/vxworks/times.h +++ /dev/null @@ -1,39 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/times.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_SYS_TIMES_H_VXWORKS -#define PACE_SYS_TIMES_H_VXWORKS - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_CLOCK_T -#define PACE_CLOCK_T -typedef int pace_clock_t; -#endif /* PACE_CLOCK_T */ - -#ifndef PACE_TMS -#define PACE_TMS -typedef struct tms pace_tms; -#endif /* PACE_TMS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TIMES_H_VXWORKS */ diff --git a/PACE/pace/vxworks/times.inl b/PACE/pace/vxworks/times.inl deleted file mode 100644 index c571dd8a2de..00000000000 --- a/PACE/pace/vxworks/times.inl +++ /dev/null @@ -1,26 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/times.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pace_clock_t -pace_times (pace_tms * buffer) -{ - PACE_TRACE("pace_times"); - - PACE_UNUSED_ARG(buffer); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/PACE/pace/vxworks/types.h b/PACE/pace/vxworks/types.h deleted file mode 100644 index dbcdcf7ce63..00000000000 --- a/PACE/pace/vxworks/types.h +++ /dev/null @@ -1,261 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/types.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#include -#include -#include - -#ifndef PACE_SYS_TYPES_H_VXWORKS -#define PACE_SYS_TYPES_H_VXWORKS - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PTHREAD_MAX_PRIORITY 255 -#define PTHREAD_MIN_PRIORITY 0 - -#define MAX_CLEAN_RTN 20 -#define MAX_ONCE_ENTRY 100 - -#define JOIN_NORMAL 0 -#define JOIN_PENDING 1 -#define JOIN_TERMINATED 2 -#define JOIN_DETATCHED 3 - -/* This needs to be pretty big for VxWorks according to ACE */ -#define PTHREAD_DEFAULT_STACK_SIZE 64000 - -/* detach */ -#define PTHREAD_CREATE_DETACHED 0x40 /* = THR_DETACHED */ -#define PTHREAD_CREATE_JOINABLE 0 -/* scope */ -#define PTHREAD_SCOPE_SYSTEM 0x01 /* = THR_BOUND */ -#define PTHREAD_SCOPE_PROCESS 0 - -/* inherit */ -#define PTHREAD_INHERIT_SCHED 1 -#define PTHREAD_EXPLICIT_SCHED 0 - -/* - * Value of process-shared attribute - */ -#define PTHREAD_PROCESS_SHARED 1 /* = USYNC_PROCESS */ -#define PTHREAD_PROCESS_PRIVATE 0 /* = USYNC_THREAD */ -#define DEFAULT_TYPE PTHREAD_PROCESS_PRIVATE - -#define PTHREAD_MUTEX_DEFAULT 0x1 -#define PTHREAD_MUTEX_ERRORCHECK 0x2 -#define PTHREAD_MUTEX_NORMAL 0x3 -#define PTHREAD_MUTEX_RECURSIVE 0x4 - -#define PTHREAD_PRIO_INHERIT 0x10 -#define PTHREAD_PRIO_NONE 0x20 -#define PTHREAD_PRIO_PROTECT 0x30 - -/* - * macros - default initializers defined as in synch.h - * Any change here should be reflected in synch.h. - */ - - -/* cancellation type and state */ -#define PTHREAD_CANCEL_ENABLE 0x00 -#define PTHREAD_CANCEL_DISABLE 0x01 -#define PTHREAD_CANCEL_DEFERRED 0x00 -#define PTHREAD_CANCEL_ASYNCHRONOUS 0x02 -#define PTHREAD_CANCELED -19 - -#define PTHREAD_MAXNAME 100 - - - /* For future upgradeability to wchar */ -#ifndef PACE_TCHAR -#define PACE_TCHAR - typedef char pace_tchar; -#endif /* PACE_TCHAR */ - -#ifndef PACE_HANDLE - typedef int PACE_HANDLE; -#endif /* PACE_HANDLE */ - -#ifndef PACE_INVALID_HANDLE -#define PACE_INVALID_HANDLE -1 -#endif /* PACE_INVALID_HANDLE */ - -#ifndef PACE_DEV_T -#define PACE_DEV_T - typedef dev_t pace_dev_t; -#endif /* PACE_DEV_T */ - -#ifndef PACE_GID_T -#define PACE_GID_T - typedef gid_t pace_gid_t; -#endif /* PACE_GID_T */ - -#ifndef PACE_INO_T -#define PACE_INO_T - typedef ino_t pace_ino_t; -#endif /* PACE_INO_T */ - -#ifndef PACE_MODE_T -#define PACE_MODE_T - typedef mode_t pace_mode_t; -#endif /* PACE_MODE_T */ - -#ifndef PACE_NLINK_T -#define PACE_NLINK_T - typedef nlink_t pace_nlink_t; -#endif /* PACE_NLINK_T */ - -#ifndef PACE_OFF_T -#define PACE_OFF_T - typedef off_t pace_off_t; -#endif /* PACE_OFF_T */ - -#ifndef PACE_PID_T -#define PACE_PID_T - typedef pid_t pace_pid_t; -#endif /* PACE_PID_T */ - -#ifndef PACE_PTHREAD_ATTR_T -#define PACE_PTHREAD_ATTR_T - - typedef struct _PTHREAD_ATTR - { - int stacksize; - char name[PTHREAD_MAXNAME]; /*the name */ - struct sched_param schedule; /* priority */ - int scope; /* options */ - int policy; /* schedule policy */ - int dstate; /* detached state */ - } * pace_pthread_attr_t; -#endif /* PACE_PTHREAD_ATTR_T */ - -#ifndef PACE_PTHREAD_CONDATTR_T -#define PACE_PTHREAD_CONDATTR_T - typedef int pace_pthread_condattr_t; -#endif /* PACE_PTHREAD_CONDATTR_T */ - -#ifndef PACE_PTHREAD_COND_T -#define PACE_PTHREAD_COND_T - typedef SEM_ID pace_pthread_cond_t; -#endif /* PACE_PTHREAD_COND_T */ - -#ifndef PACE_PTHREAD_KEY_T -#define PACE_PTHREAD_KEY_T - typedef int pace_pthread_key_t; -#endif /* PACE_PTHREAD_KEY_T */ - -#ifndef PACE_PTHREAD_MUTEXATTR_T -#define PACE_PTHREAD_MUTEXATTR_T - - typedef struct _PTHREAD_MUX_ATTR - { - int protocol; /* priority inheritance */ - int shared; /* system or process */ - int type; /* mutex type */ - } * pace_pthread_mutexattr_t; -#endif /* PACE_PTHREAD_MUTEXATTR_T */ - -#ifndef PACE_PTHREAD_MUTEX_T -#define PACE_PTHREAD_MUTEX_T - typedef SEM_ID pace_pthread_mutex_t; -#endif /* PACE_PTHREAD_MUTEX_T */ - -#ifndef PACE_PTHREAD_ONCE_T -#define PACE_PTHREAD_ONCE_T - typedef int pace_pthread_once_t; -# define PTHREAD_ONCE_INIT 0 -#endif /* PACE_PTHREAD_ONCE_T */ - -#ifndef PACE_PTHREAD_T -#define PACE_PTHREAD_T -# define PTHREAD_KEYS_MAX 100 -# define _USER_SPARE4 spare4 - typedef struct _FUNC_HANDLE - { - void (*routine)(void *); - void * args; - } funcHandle; - - typedef struct _ONCE_FUNC - { - int once_ctl; - void (*init_routine)(void); - } pthread_once_e; - - typedef struct _PTHREAD_T - { - unsigned int tid; - funcHandle cleanupRtn[MAX_CLEAN_RTN]; - int rtnCount; - pthread_once_e onceList[MAX_ONCE_ENTRY]; - int onceCount; /* once variable count */ - int stateflag; /* cancel state */ - int canceltype; /* cancel type */ - int detachflag; /* detached state */ - int joinstate; /* join state */ - SEM_ID joinSem; /* join semaphore */ - void * joinvalue; /* pass value */ - struct _PTHREAD_T * jointhread; /* the calling thread */ - void * keyvaluelist[PTHREAD_KEYS_MAX]; - } * pace_pthread_t; -#endif /* PACE_PTHREAD_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_SSIZE_T -#define PACE_SSIZE_T - typedef ssize_t pace_ssize_t; -#endif /* PACE_SSIZE_T */ - -#ifndef PACE_UID_T -#define PACE_UID_T - typedef uid_t pace_uid_t; -#endif /* PACE_UID_T */ - -#ifndef PACE_PTHREAD_QUEUE_T -#define PACE_PTHREAD_QUEUE_T - struct _PTHREAD_QUEUE_ENTRY - { - int status; - pace_pthread_t pthread; - struct _PTHREAD_QUEUE_ENTRY * next; - }; - - typedef struct _PTHREAD_QUEUE_ENTRY pthread_q_entry; - -# define PTHEAD_QUEUE_MAX_LEN 100 - - struct _PTHREAD_KEY_ENTRY - { - int index; - int valid; - void (*destructor)(void*); - }; - - typedef struct _PTHREAD_KEY_ENTRY pthread_key_entry; -#endif /* PACE_PTHREAD_QUEUE_T */ - - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TYPES_H_VXWORKS */ diff --git a/PACE/pace/vxworks/unistd.c b/PACE/pace/vxworks/unistd.c deleted file mode 100644 index 16234ef66fb..00000000000 --- a/PACE/pace/vxworks/unistd.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/unistd.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/unistd.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/unistd.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/unistd.h b/PACE/pace/vxworks/unistd.h deleted file mode 100644 index 19ca710618f..00000000000 --- a/PACE/pace/vxworks/unistd.h +++ /dev/null @@ -1,56 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/unistd.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_UNISTD_H_VXWORKS -#define PACE_UNISTD_H_VXWORKS - -#include "pace/sys/types.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_F_OK F_OK -#ifndef PACE_NULL -# define PACE_NULL NULL -#endif /* PACE_NULL */ -#define PACE_R_OK R_OK -#define PACE_SEEK_CUR SEEK_CUR -#define PACE_SEEK_END SEEK_END -#define PACE_SEEK_SET SEEK_SET -#define PACE_STDERR_FILENO STDERR_FILENO -#define PACE_STDIN_FILENO STDIN_FILENO -#define PACE_STDOUT_FILENO STDOUT_FILENO -#define PACE_W_OK W_OK -#define PACE_X_OK X_OK - -/* _POSIX _PC _SC Macros need to go here */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T -typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_SSIZE_T -#define PACE_SSIZE_T -typedef ssize_t pace_ssize_t; -#endif /* PACE_SSIZE_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_UNISTD_H_VXWORKS */ diff --git a/PACE/pace/vxworks/unistd.inl b/PACE/pace/vxworks/unistd.inl deleted file mode 100644 index eb4c1ac675f..00000000000 --- a/PACE/pace/vxworks/unistd.inl +++ /dev/null @@ -1,601 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/unistd.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include -#include -#include -#include -#include - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -void -pace__exit (int status) -{ - PACE_TRACE("pace__exit"); - - exit (status); - return; -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_access (const char * path, int amode) -{ - PACE_TRACE("pace_access"); - - PACE_UNUSED_ARG(path); - PACE_UNUSED_ARG(amode); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -unsigned int -pace_alarm (unsigned int seconds) -{ - PACE_TRACE("pace_alarm"); - - PACE_UNUSED_ARG(seconds); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_chdir (const char * path) -{ - PACE_TRACE("pace_chdir"); - - return chdir (PACE_NONCONST_ARG_CAST (char *) path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FA_UOF) -PACE_INLINE -int -pace_chown (const char * path, uid_t owner, pace_gid_t group) -{ - PACE_TRACE("pace_chown"); - - PACE_UNUSED_ARG(path); - PACE_UNUSED_ARG(owner); - PACE_UNUSED_ARG(group); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FA_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_close (PACE_HANDLE fildes) -{ - PACE_TRACE("pace_close"); - - return close (fildes); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -PACE_HANDLE -pace_dup (PACE_HANDLE fildes) -{ - PACE_TRACE("pace_dup"); - - PACE_UNUSED_ARG(fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -PACE_HANDLE -pace_dup2 (PACE_HANDLE fildes, PACE_HANDLE fildes2) -{ - PACE_TRACE("pace_dup2"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(fildes2); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -int -pace_execv (const char * path, - char * const argv[]) -{ - PACE_TRACE("pace_execv"); - - PACE_UNUSED_ARG(path); - PACE_UNUSED_ARG(argv); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); - /* if successful, this operation does NOT return */ -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -int -pace_execve (const char * path, - char * const argv[], - char * const envp[]) -{ - PACE_TRACE("pace_execve"); - - PACE_UNUSED_ARG(path); - PACE_UNUSED_ARG(argv); - PACE_UNUSED_ARG(envp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); - /* if successful, this operation does NOT return */ -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -int -pace_execvp (const char * file, - char * const argv[]) -{ - PACE_TRACE("pace_execvp"); - - PACE_UNUSED_ARG(file); - PACE_UNUSED_ARG(argv); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); - /* if successful, this operation does NOT return */ -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fdatasync (PACE_HANDLE fildes) -{ - PACE_TRACE("pace_fdatasync"); - - PACE_UNUSED_ARG(fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_fork () -{ - PACE_TRACE("pace_fork"); - - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -long -pace_fpathconf (PACE_HANDLE fildes, int name) -{ - PACE_TRACE("pace_fpathconf"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fsync (PACE_HANDLE fildes) -{ - PACE_TRACE("pace_fsync"); - - PACE_UNUSED_ARG(fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_ftruncate (PACE_HANDLE fildes, pace_off_t length) -{ - PACE_TRACE("pace_ftruncate"); - - return ftruncate (fildes, length); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -char * -pace_getcwd (char * buf, size_t size) -{ - PACE_TRACE("pace_getcwd"); - - return getcwd (buf, size); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -uid_t -pace_getegid () -{ - PACE_TRACE("pace_getegid"); - - /* getegid() is not supported: just one user anyway */ - return 0; -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -uid_t -pace_geteuid () -{ - PACE_TRACE("pace_geteuid"); - - /* geteuid() is not supported: just one user anyway */ - return 0; -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -int -pace_getgroups (int gidsetsize, pace_gid_t grouplist[]) -{ - PACE_TRACE("pace_getgroups"); - - /* getgroups() is not supported: just one user anyway */ - PACE_UNUSED_ARG(gidsetsize); - PACE_UNUSED_ARG(grouplist); - return 0; -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -uid_t -pace_getgid () -{ - PACE_TRACE("pace_getgid"); - - /* getgid() is not supported: just one user anyway */ - return 0; -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -char* -pace_getlogin () -{ - PACE_TRACE("pace_getlogin"); - - PACE_ERRNO_NO_SUPPORT_RETURN ((char *) 0); -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UGR_UOF) -PACE_INLINE -int -pace_getlogin_r (char * name, size_t namesize) -{ - PACE_TRACE("pace_getlogin_r"); - - PACE_UNUSED_ARG(name); - PACE_UNUSED_ARG(namesize); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pid_t -pace_getpgrp () -{ - PACE_TRACE("pace_getpgrp"); - - /* getpgrp() is not supported: just one user anyway */ - return 0; -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_getpid () -{ - PACE_TRACE("pace_getpid"); - - /* getpid() is not supported: just one user anyway */ - return 0; -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_getppid () -{ - PACE_TRACE("pace_getppid"); - - /* getppid() is not supported: just one user anyway */ - return 0; -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -uid_t -pace_getuid () -{ - PACE_TRACE("pace_getuid"); - - /* getuid() is not supported: just one user anyways */ - return 0; -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_isatty (int fildes) -{ - PACE_TRACE("pace_isatty"); - - return isatty (fildes); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_link (const char * existing, const char * new_link) -{ - PACE_TRACE("pace_link"); - - PACE_UNUSED_ARG(existing); - PACE_UNUSED_ARG(new_link); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -pace_off_t -pace_lseek (PACE_HANDLE fildes, pace_off_t offset, int whence) -{ - PACE_TRACE("pace_lseek"); - - return lseek (fildes, offset, whence); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -long -pace_pathconf (const char * path, int name) -{ - PACE_TRACE("pace_pathconf"); - - PACE_UNUSED_ARG(path); - PACE_UNUSED_ARG(name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_pause () -{ - PACE_TRACE("pace_pause"); - - return pause (); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_P_UOF) -PACE_INLINE -int -pace_pipe (PACE_HANDLE fildes[2]) -{ - PACE_TRACE("pace_pipe"); - - PACE_UNUSED_ARG(fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_P_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -ssize_t -pace_read (PACE_HANDLE fildes, void * buf, size_t nbyte) -{ - PACE_TRACE("pace_read"); - - return read (fildes, PACE_NONCONST_ARG_CAST (char *) buf, nbyte); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_rmdir (const char * path) -{ - PACE_TRACE("pace_rmdir"); - - return rmdir (PACE_NONCONST_ARG_CAST (char *) path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -int -pace_setgid (pace_gid_t gid) -{ - PACE_TRACE("pace_setgid"); - - /* setuid() is not supported: just one user anyways */ - return 0; -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_JC_UOF) -PACE_INLINE -int -pace_setpgid (pid_t pid, pid_t pgid) -{ - PACE_TRACE("pace_setpgid"); - - /* setpgid() is not supported: just one user anyways */ - return 0; -} -#endif /* PACE_HAS_POSIX_JC_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pid_t -pace_setsid () -{ - PACE_TRACE("pace_setsid"); - - /* setsid() is not supported: just one user anyways */ - return 0; -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -int -pace_setuid (uid_t uid) -{ - PACE_TRACE("pace_setuid"); - - /* setuid() is not supported: just one user anyways */ - return 0; -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -unsigned int -pace_sleep (unsigned int seconds) -{ - struct timespec rqtp; - /* Initializer doesn't work with Green Hills 1.8.7 */ - - PACE_TRACE("pace_sleep"); - - rqtp.tv_sec = seconds; - rqtp.tv_nsec = 0L; - return nanosleep (&rqtp, 0); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_SP_UOF) -PACE_INLINE -long -pace_sysconf (int name) -{ - PACE_TRACE("pace_sysconf"); - - PACE_UNUSED_ARG(name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SP_UOF */ - -#if (PACE_HAS_POSIX_JC_UOF) -PACE_INLINE -pid_t -pace_tcgetpgrp (PACE_HANDLE fildes) -{ - PACE_TRACE("pace_tcgetpgrp"); - - PACE_UNUSED_ARG(fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_JC_UOF */ - -#if (PACE_HAS_POSIX_JC_UOF) -PACE_INLINE -int -pace_tcsetpgrp (PACE_HANDLE fildes, pid_t pgrp_id) -{ - PACE_TRACE("pace_tcsetpgrp"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(pgrp_id); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_JC_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -char * -pace_ttyname (PACE_HANDLE fildes) -{ - PACE_TRACE("pace_ttyname"); - - PACE_UNUSED_ARG(fildes); - PACE_ERRNO_NO_SUPPORT_RETURN ((char *) 0); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_ttyname_r (PACE_HANDLE fildes, - char * name, - size_t namesize) -{ - PACE_TRACE("pace_ttyname_r"); - - PACE_UNUSED_ARG(fildes); - PACE_UNUSED_ARG(name); - PACE_UNUSED_ARG(namesize); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_unlink (const char * path) -{ - PACE_TRACE("pace_unlink"); - - return unlink (PACE_NONCONST_ARG_CAST (char *) path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -ssize_t -pace_write (PACE_HANDLE fildes, const void * buf, size_t nbyte) -{ - PACE_TRACE("pace_write"); - - return write (fildes, PACE_NONCONST_ARG_CAST (char *) buf, nbyte); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ diff --git a/PACE/pace/vxworks/utime.c b/PACE/pace/vxworks/utime.c deleted file mode 100644 index fc770964337..00000000000 --- a/PACE/pace/vxworks/utime.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/utime.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/utime.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/utime.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/utime.h b/PACE/pace/vxworks/utime.h deleted file mode 100644 index 144ca29d567..00000000000 --- a/PACE/pace/vxworks/utime.h +++ /dev/null @@ -1,35 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/utime.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_UTIME_H_VXWORKS -#define PACE_UTIME_H_VXWORKS - -#include "pace/sys/types.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_UTIMBUF -#define PACE_UTIMBUF -typedef struct utimbuf pace_utimbuf; -#endif /* PACE_UTIMBUF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_UTIME_H_VXWORKS */ diff --git a/PACE/pace/vxworks/utime.inl b/PACE/pace/vxworks/utime.inl deleted file mode 100644 index 28c38097d68..00000000000 --- a/PACE/pace/vxworks/utime.inl +++ /dev/null @@ -1,27 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/utime.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_utime (const char * path, - const pace_utimbuf * times) -{ - PACE_TRACE("pace_utime"); - - return utime (PACE_NONCONST_ARG_CAST (char *) path, - PACE_NONCONST_ARG_CAST (pace_utimbuf *) times); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/vxworks/utsname.c b/PACE/pace/vxworks/utsname.c deleted file mode 100644 index be5b4a33584..00000000000 --- a/PACE/pace/vxworks/utsname.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/utsname.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/sys/utsname.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/utsname.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/utsname.h b/PACE/pace/vxworks/utsname.h deleted file mode 100644 index 6773129303a..00000000000 --- a/PACE/pace/vxworks/utsname.h +++ /dev/null @@ -1,47 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/utsname.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_SYS_UTSNAME_H_VXWORKS -#define PACE_SYS_UTSNAME_H_VXWORKS - -#include "pace/stddef.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_UTSNAME -#define PACE_UTSNAME -# if !defined (SYS_NMLN) -# define SYS_NMLN 257 -# endif /* SYS_NMLN */ -# if !defined (_SYS_NMLN) -# define _SYS_NMLN SYS_NMLN -# endif /* _SYS_NMLN */ -typedef struct -{ - pace_tchar sysname[_SYS_NMLN]; - pace_tchar nodename[_SYS_NMLN]; - pace_tchar release[_SYS_NMLN]; - pace_tchar version[_SYS_NMLN]; - pace_tchar machine[_SYS_NMLN]; -} pace_utsname; -#endif /* PACE_UTSNAME */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_UTSNAME_H_VXWORKS */ diff --git a/PACE/pace/vxworks/utsname.inl b/PACE/pace/vxworks/utsname.inl deleted file mode 100644 index 0925ebfef1f..00000000000 --- a/PACE/pace/vxworks/utsname.inl +++ /dev/null @@ -1,40 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/utsname.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/string.h" -#include -#include - -#if (PACE_HAS_POSIX_SP_UOF) -PACE_INLINE -int -pace_uname (pace_utsname * name) -{ - size_t maxnamelen = sizeof name->nodename; - - PACE_TRACE("pace_uname"); - - pace_strcpy (name->sysname, "VxWorks"); -#if (PACE_VXWORKS == 531) - pace_strcpy (name->release, "5.3.1"); -#elif (PACE_VXWORKS == 540) - pace_strcpy (name->release, "5.4.0"); -#endif /* PACE_VXWORKS != 531 */ - pace_strcpy (name->version, sysBspRev ()); - pace_strcpy (name->machine, sysModel ()); - - return gethostname (name->nodename, maxnamelen); -} -#endif /* PACE_HAS_POSIX_SP_UOF */ diff --git a/PACE/pace/vxworks/wait.c b/PACE/pace/vxworks/wait.c deleted file mode 100644 index 2be98112c5f..00000000000 --- a/PACE/pace/vxworks/wait.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/wait.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/sys/wait.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/vxworks/wait.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/vxworks/wait.h b/PACE/pace/vxworks/wait.h deleted file mode 100644 index 1e588452e1f..00000000000 --- a/PACE/pace/vxworks/wait.h +++ /dev/null @@ -1,38 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/wait.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_WAIT_H_VXWORKS -#define PACE_WAIT_H_VXWORKS - -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_WEXITSTATUS WEXITSTATUS -#define PACE_WIFEXITED WIFEXITED -#define PACE_WIFSIGNALED WISIGNALED -#define PACE_WIFSTOPPED WIFSTOPPED -#define PACE_WNOHANG WNOHANG -#define PACE_WSTOPSIG WSTOPSIG -#define PACE_WTERMSIG WTERMSIG -#define PACE_WUNTRACED WUNTRACED - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_WAIT_H_VXWORKS */ diff --git a/PACE/pace/vxworks/wait.inl b/PACE/pace/vxworks/wait.inl deleted file mode 100644 index 1aee5137b7f..00000000000 --- a/PACE/pace/vxworks/wait.inl +++ /dev/null @@ -1,42 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/vxworks/wait.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_wait (int * statloc) -{ - PACE_TRACE("pace_wait"); - - PACE_UNUSED_ARG (statloc); - PACE_ERRNO_NO_SUPPORT_RETURN (0); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pid_t -pace_waitpid (pid_t pid, int * statloc, int options) -{ - PACE_TRACE("pace_waitpid"); - - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (statloc); - PACE_UNUSED_ARG (options); - PACE_ERRNO_NO_SUPPORT_RETURN (0); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/PACE/pace/win32/README b/PACE/pace/win32/README deleted file mode 100644 index d46fa4c9dc3..00000000000 --- a/PACE/pace/win32/README +++ /dev/null @@ -1 +0,0 @@ -WIN32 dir diff --git a/PACE/pace/win32/TODO b/PACE/pace/win32/TODO deleted file mode 100644 index 659d8656d19..00000000000 --- a/PACE/pace/win32/TODO +++ /dev/null @@ -1,29 +0,0 @@ ----------------------------------------------------------------------- - - * Emulation: - - pthreads - - dirent - - * ACE_wrappers/PACE/docs/PACE_POSIX_support.txt: - - Update this file as emulation occurs. - - * Build ACE with ACE_HAS_PACE - ----------------------------------------------------------------------- - - * pthreads: Do we need to define this for win32? - - OS.cpp:2769 => PACE_PTHREAD_STACK_MIN - OS.cpp:2798 => PACE_PTHREAD_CREATE_JOINABLE - OS.cpp:2801 => PACE_PTHREAD_CREATE_DETACHED - ----------------------------------------------------------------------- - - * get rid of the temp macros / junk in config/constants.h - ----------------------------------------------------------------------- - - * add MFC support to pthread.c - ----------------------------------------------------------------------- diff --git a/PACE/pace/win32/aio.c b/PACE/pace/win32/aio.c deleted file mode 100644 index 25c7427877e..00000000000 --- a/PACE/pace/win32/aio.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/aio.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/aio.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/aio.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/aio.h b/PACE/pace/win32/aio.h deleted file mode 100644 index 764372de642..00000000000 --- a/PACE/pace/win32/aio.h +++ /dev/null @@ -1,44 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/aio.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_AIO_H_WIN32 -#define PACE_AIO_H_WIN32 - -#include "pace/time.h" -#include "pace/signal.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_AIO_ALLDONE AIO_ALLDONE -#define PACE_AIO_CANCELED AIO_CANCELED -#define PACE_AIO_NOCANCELED AIO_NOTCANCELED -#define PACE_LIO_NOP LIO_NOP -#define PACE_LIO_NOWAIT LIO_NOWAIT -#define PACE_LIO_READ LIO_READ -#define PACE_LIO_WAIT LIO_WAIT -#define PACE_LIO_WRITE LIO_WRITE - -#ifndef PACE_AIOCB -#define PACE_AIOCB -typedef struct aiocb pace_aiocb; -#endif /* PACE_AIOCB */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_AIO_H_WIN32 */ diff --git a/PACE/pace/win32/aio.inl b/PACE/pace/win32/aio.inl deleted file mode 100644 index 1c1335857f0..00000000000 --- a/PACE/pace/win32/aio.inl +++ /dev/null @@ -1,106 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/aio.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_cancel (PACE_HANDLE fildes, pace_aiocb * aiocbp) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (aiocbp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_error (const pace_aiocb * aiocbp) -{ - PACE_UNUSED_ARG (aiocbp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_fsync (int op, pace_aiocb * aiocbp) -{ - PACE_UNUSED_ARG (op); - PACE_UNUSED_ARG (aiocbp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_read (pace_aiocb * aiocbp) -{ - PACE_UNUSED_ARG (aiocbp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_return (pace_aiocb * aiocbp) -{ - PACE_UNUSED_ARG (aiocbp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_suspend (const pace_aiocb * const list[], - int nent, - const pace_timespec * timeout) -{ - PACE_UNUSED_ARG (list); - PACE_UNUSED_ARG (nent); - PACE_UNUSED_ARG (timeout); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_aio_write (pace_aiocb * aiocbp) -{ - PACE_UNUSED_ARG (aiocbp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_lio_listio (int mode, - pace_aiocb * const list[], - int nent, - pace_sigevent * sig) -{ - PACE_UNUSED_ARG (mode); - PACE_UNUSED_ARG (list); - PACE_UNUSED_ARG (nent); - PACE_UNUSED_ARG (sig); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/assert.c b/PACE/pace/win32/assert.c deleted file mode 100644 index 7620a619828..00000000000 --- a/PACE/pace/win32/assert.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/assert.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/assert.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/assert.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/assert.h b/PACE/pace/win32/assert.h deleted file mode 100644 index af0c8dac758..00000000000 --- a/PACE/pace/win32/assert.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/assert.h - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#ifndef PACE_ASSERT_H_WIN32 -#define PACE_ASSERT_H_WIN32 - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_ASSERT_H_WIN32 */ diff --git a/PACE/pace/win32/assert.inl b/PACE/pace/win32/assert.inl deleted file mode 100644 index 00796cb2f26..00000000000 --- a/PACE/pace/win32/assert.inl +++ /dev/null @@ -1,14 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/assert.inl - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ diff --git a/PACE/pace/win32/ctype.c b/PACE/pace/win32/ctype.c deleted file mode 100644 index dd3be4098b0..00000000000 --- a/PACE/pace/win32/ctype.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/ctype.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/ctype.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/ctype.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/ctype.h b/PACE/pace/win32/ctype.h deleted file mode 100644 index 9025f3de909..00000000000 --- a/PACE/pace/win32/ctype.h +++ /dev/null @@ -1,27 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/ctype.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_CTYPE_H_WIN32 -#define PACE_CTYPE_H_WIN32 - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_CTYPE_H_WIN32 */ diff --git a/PACE/pace/win32/ctype.inl b/PACE/pace/win32/ctype.inl deleted file mode 100644 index 60f692f2c12..00000000000 --- a/PACE/pace/win32/ctype.inl +++ /dev/null @@ -1,133 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/ctype.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isalnum (int c) -{ - return isalnum (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isalpha (int c) -{ - return isalpha (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_iscntrl (int c) -{ - return iscntrl (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isdigit (int c) -{ - return isdigit (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isgraph (int c) -{ - return isgraph (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_islower (int c) -{ - return islower (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isprint (int c) -{ - return isprint (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_ispunct (int c) -{ - return ispunct (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isspace (int c) -{ - return isspace (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isupper (int c) -{ - return isupper (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_isxdigit (int c) -{ - return isxdigit (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_tolower (int c) -{ - return tolower (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_toupper (int c) -{ - return toupper (c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/win32/dirent.c b/PACE/pace/win32/dirent.c deleted file mode 100644 index b67213012f0..00000000000 --- a/PACE/pace/win32/dirent.c +++ /dev/null @@ -1,100 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/dirent.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/dirent.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/dirent.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_POSIX_FS_UOF) -int -closedir (PACE_DIR * dirp) -{ - if (dirp->current_handle_ != (void*)0) - { - FindClose (dirp->current_handle_); - } - dirp->current_handle_ = (void*)0; - dirp->started_reading_ = 0; - return 1; -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_DIR * -opendir (const char * dirname) -{ - PACE_DIR * dirp = (PACE_DIR*) pace_malloc (sizeof (PACE_DIR)); - const pace_size_t dir_size = pace_strlen (dirname) + 1; - dirp->directory_name_ = (char*) pace_malloc (dir_size); - pace_strcpy (dirp->directory_name_, dirname); - dirp->current_handle_ = PACE_INVALID_HANDLE; - dirp->started_reading_ = 0; - return dirp; -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -pace_dirent * -readdir (PACE_DIR * dirp) -{ - if (dirp->started_reading_) - { - dirp->current_handle_ = FindFirstFile (dirp->directory_name_, - &(dirp->fdata_)); - if (dirp->current_handle_ != PACE_INVALID_HANDLE) - { - FindClose (dirp->current_handle_); - dirp->current_handle_ = PACE_INVALID_HANDLE; - } - else /* Skip "." and ".." */ - { - int retval = 1; - while (*(dirp->fdata_.cFileName) == '.' - && retval - && dirp->fdata_.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY) - { - retval = FindNextFile (dirp->current_handle_, - &(dirp->fdata_)); - } - if (retval == 0) - { - dirp->current_handle_ = PACE_INVALID_HANDLE; - } - } - dirp->started_reading_ = 1; - } - else - { - int retval = FindNextFile (dirp->current_handle_, - &(dirp->fdata_)); - if (retval == 0) - { - dirp->current_handle_ = PACE_INVALID_HANDLE; - } - } - - if (dirp->current_handle_ != PACE_INVALID_HANDLE) - { - dirp->dirent_.d_name = dirp->fdata_.cFileName; - return &(dirp->dirent_); - } - else - { - return (pace_dirent*)0; - } -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/win32/dirent.h b/PACE/pace/win32/dirent.h deleted file mode 100644 index 9a379a35a12..00000000000 --- a/PACE/pace/win32/dirent.h +++ /dev/null @@ -1,74 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/dirent.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_DIRENT_H_WIN32 -#define PACE_DIRENT_H_WIN32 - -#include "pace/sys/types.h" -#include "windows.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_DIRENT_T -#define PACE_DIRENT_T - - typedef struct /* dirent */ { - unsigned short d_ino; - unsigned short d_off; - unsigned short d_reclen; - char * d_name; - } pace_dirent; - -#endif /* PACE_DIRENT_T */ - -#ifndef PACE_DIR_T -#define PACE_DIR_T - - typedef WIN32_FIND_DATA PACE_TEXT_WIN32_FIND_DATA; - - typedef struct /* DIR */ { - char * directory_name_; - // The name of the directory we are looking into - HANDLE current_handle_; - // Remember the handle between calls. - pace_dirent dirent_; - // The struct for the results - PACE_TEXT_WIN32_FIND_DATA fdata_; - // The struct for intermediate results. - int started_reading_; - // A flag to remember if we started reading already. - } PACE_DIR; - -#endif /* PACE_DIR_T */ - -#if (PACE_HAS_POSIX_FS_UOF) - int closedir (PACE_DIR * dirp); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) - PACE_DIR * opendir (const char * dirname); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) - pace_dirent * readdir (PACE_DIR * dirp); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_DIRENT_H_WIN32 */ diff --git a/PACE/pace/win32/dirent.inl b/PACE/pace/win32/dirent.inl deleted file mode 100644 index edf5071c55d..00000000000 --- a/PACE/pace/win32/dirent.inl +++ /dev/null @@ -1,68 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/dirent.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/string.h" -#include "pace/stdlib.h" - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_closedir (PACE_DIR * dirp) -{ - return closedir (dirp); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -PACE_DIR * -pace_opendir (const char * dirname) -{ - return opendir (dirname); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -pace_dirent * -pace_readdir (PACE_DIR * dirp) -{ - return readdir (dirp); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -int -pace_readdir_r (PACE_DIR * dirp, - pace_dirent * entry, - pace_dirent ** result) -{ - PACE_UNUSED_ARG (dirp); - PACE_UNUSED_ARG (entry); - PACE_UNUSED_ARG (result); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -void -pace_rewinddir (PACE_DIR * dirp) -{ - PACE_UNUSED_ARG (dirp); - PACE_ERRNO_NO_SUPPORT (); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/win32/errno.h b/PACE/pace/win32/errno.h deleted file mode 100644 index 7e35b76b566..00000000000 --- a/PACE/pace/win32/errno.h +++ /dev/null @@ -1,84 +0,0 @@ -/* $Id$ - -* ============================================================================ -* -* = LIBRARY -* pace -* -* = FILENAME -* pace/win32/errno.h -* -* = AUTHOR -* John Heitmann -* -* =========================================================================== */ - - -#ifndef PACE_ERRNO_H_WIN32 -#define PACE_ERRNO_H_WIN32 - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if !defined (ENOSYS) -# define ENOSYS EFAULT /* Operation not supported or unknown error. */ -#endif /* !ENOSYS */ - -#if !defined (ENOTSUP) -# define ENOTSUP ENOSYS /* Operation not supported. */ -#endif /* !ENOTSUP */ - -#define PACE_E2BIG E2BIG -#define PACE_EACCES EACCES -#define PACE_EAGAIN EAGAIN -#define PACE_EBADF EBADF -#define PACE_EBADMSG -#define PACE_EBUSY EBUSY -#define PACE_ECANCELED ECANCELED -#define PACE_ECHILD ECHILD -#define PACE_EDEADLK EDEADLK -#define PACE_EDOM EDOM -#define PACE_EEXIST EEXIST -#define PACE_EFAULT EFAULT -#define PACE_EFBIG EFBIG -#define PACE_EINPROGRESS EINPROGRESS -#define PACE_EINTR EINTR -#define PACE_EINVAL EINVAL -#define PACE_EIO EIO -#define PACE_EISDIR EISDIR -#define PACE_EMFILE EMFILE -#define PACE_EMLINK EMLINK -#define PACE_EMSGSIZE EMSGSIZE -#define PACE_EENAMETOOLONG ENAMETOOLONG -#define PACE_ENFILE ENFILE -#define PACE_ENODEV ENODEV -#define PACE_ENOENT ENOENT -#define PACE_ENOEXEC ENOEXEC -#define PACE_ENOLCK ENOLCK -#define PACE_ENOMEM ENOMEM -#define PACE_ENOSPC ENOSPC -#define PACE_ENOSYS ENOSYS -#define PACE_ENOTDIR ENOTDIR -#define PACE_ENOTEMPTY ENOTEMPTY -#define PACE_ENOTSUP ENOTSUP -#define PACE_ENOTTY ENOTTY -#define PACE_ENXIO ENXIO -#define PACE_EPERM EPERM -#define PACE_EPIPE EPIPE -#define PACE_ERANGE ERANGE -#define PACE_EROFS EROFS -#define PACE_ESPIPE ESPIPE -#define PACE_ESRCH ESRCH -#define PACE_ETIMEDOUT ETIMEDOUT -#define PACE_EXDEV EXDEV - -#define pace_errno errno - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_ERRNO_H_WIN32 */ diff --git a/PACE/pace/win32/fcntl.c b/PACE/pace/win32/fcntl.c deleted file mode 100644 index 5fe6e12bfb0..00000000000 --- a/PACE/pace/win32/fcntl.c +++ /dev/null @@ -1,164 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/fcntl.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/fcntl.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/fcntl.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_POSIX_FS_UOF) -#include -#include -int -pace_win32_creat (const char * path, pace_mode_t mode) -{ - /* Emulation is still buggy! DO NOT YET USE! */ - - DWORD access = GENERIC_READ, - creation = OPEN_EXISTING, - flags = 0, - shared_mode = FILE_SHARE_READ | FILE_SHARE_WRITE; - - HANDLE h = (void*)0; - - if (PACE_BIT_ENABLED (mode, O_WRONLY)) - { - access = GENERIC_WRITE; - } - else if (PACE_BIT_ENABLED (mode, O_RDWR)) - { - access = GENERIC_READ | GENERIC_WRITE; - } - - if ((mode & (_O_CREAT | _O_EXCL)) == (_O_CREAT | _O_EXCL)) - { - creation = CREATE_NEW; - } - else if ((mode & (_O_CREAT | _O_TRUNC)) == (_O_CREAT | _O_TRUNC)) - { - creation = CREATE_ALWAYS; - } - else if (PACE_BIT_ENABLED (mode, _O_CREAT)) - { - creation = OPEN_ALWAYS; - } - else if (PACE_BIT_ENABLED (mode, _O_TRUNC)) - { - creation = TRUNCATE_EXISTING; - } - - if (PACE_BIT_ENABLED (mode, _O_TEMPORARY)) - { - flags |= FILE_FLAG_DELETE_ON_CLOSE | FILE_ATTRIBUTE_TEMPORARY; - } - - if (PACE_BIT_ENABLED (mode, FILE_FLAG_WRITE_THROUGH)) - { - flags |= FILE_FLAG_WRITE_THROUGH; - } - if (PACE_BIT_ENABLED (mode, FILE_FLAG_OVERLAPPED)) - { - flags |= FILE_FLAG_OVERLAPPED; - } - if (PACE_BIT_ENABLED (mode, FILE_FLAG_NO_BUFFERING)) - { - flags |= FILE_FLAG_NO_BUFFERING; - } - if (PACE_BIT_ENABLED (mode, FILE_FLAG_RANDOM_ACCESS)) - { - flags |= FILE_FLAG_RANDOM_ACCESS; - } - if (PACE_BIT_ENABLED (mode, FILE_FLAG_SEQUENTIAL_SCAN)) - { - flags |= FILE_FLAG_SEQUENTIAL_SCAN; - } - if (PACE_BIT_ENABLED (mode, FILE_FLAG_DELETE_ON_CLOSE)) - { - flags |= FILE_FLAG_DELETE_ON_CLOSE; - } - if (PACE_BIT_ENABLED (mode, FILE_FLAG_BACKUP_SEMANTICS)) - { - flags |= FILE_FLAG_BACKUP_SEMANTICS; - } - if (PACE_BIT_ENABLED (mode, FILE_FLAG_POSIX_SEMANTICS)) - { - flags |= FILE_FLAG_POSIX_SEMANTICS; - } - -#if 0 ////////////////////////////////////////////////////////////////////// - - /* Threads and version info that isn't implemented yet in PACE. - ACE_MT (ACE_thread_mutex_t *ace_os_monitor_lock = 0;) - */ - if (PACE_BIT_ENABLED (mode, _O_APPEND)) - { - ACE_MT - ( - ace_os_monitor_lock = (ACE_thread_mutex_t *) - ACE_OS_Object_Manager::preallocated_object[ - ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK]; - ACE_OS::thread_mutex_lock (ace_os_monitor_lock); - ) - } - -#if !defined (ACE_HAS_WINCE) /* CE doesn't have FILE_SHARE_DELETE */ - if (ACE_OS::get_win32_versioninfo().dwPlatformId == - VER_PLATFORM_WIN32_NT) - shared_mode |= FILE_SHARE_DELETE; -#endif /* ACE_HAS_WINCE */ - -//////////////////////////////////////////////////////////// -#endif /* 0 */ - - h = CreateFile (path, - access, - shared_mode, - 0, - creation, - flags, - 0); - - if (PACE_BIT_ENABLED (mode, _O_APPEND)) - { - if (h != PACE_INVALID_HANDLE) - { - SetFilePointer (h, 0, 0, FILE_END); - } - /* Threads and version info that isn't implemented yet in PACE. - ACE_MT (ACE_thread_mutex_t *ace_os_monitor_lock = 0;) - ACE_MT (ACE_OS::thread_mutex_unlock (ace_os_monitor_lock);) - */ - } - - if (h == PACE_INVALID_HANDLE) - { - /* Where is this in ACE? - ACE_FAIL_RETURN (h); - */ - return -1; - } - else - { - /* return h; - - POSIX returns lowest unused file descriptor but windows - doesn't handle files in the same manner. - We return -1 for failure and 1 for success. - */ - return 1; - } -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/win32/fcntl.h b/PACE/pace/win32/fcntl.h deleted file mode 100644 index 7cb57a52cb0..00000000000 --- a/PACE/pace/win32/fcntl.h +++ /dev/null @@ -1,71 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/fnctl.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_FCNTL_H_WIN32 -#define PACE_FCNTL_H_WIN32 - -#include "pace/sys/types.h" -#include "pace/unistd.h" -#include "pace/sys/stat.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if defined (__BORLANDC__) -#define _O_TEMPORARY 0x08 -#endif /* __BORLANDC__ */ - -#define PACE_FD_CLOEXEC FD_CLOEXEC -#define PACE_F_DUPFD D_DUPFD -#define PACE_F_GETFD F_GETFD -#define PACE_F_GETFL F_GETFL -#define PACE_F_GETLK F_GETLK -#define PACE_F_RDLCK F_RDLCK -#define PACE_F_SETFD F_SETFD -#define PACE_F_SETFL F_SETFL -#define PACE_F_SETLK F_SETLK -#define PACE_F_SETLKW F_SETLKW -#define PACE_F_UNLCK F_UNLCK -#define PACE_F_WRLCK F_WRLCK -#define PACE_O_ACCMODE O_ACCMODE -#define PACE_O_APPEND O_APPEND -#define PACE_O_CREAT O_CREAT -#define PACE_O_DSYNC O_DSYNC -#define PACE_O_EXCL O_EXCL -#define PACE_O_NOCTTY O_NOCTTY -#define PACE_O_NONBLOCK O_NONBLOCK -#define PACE_O_RDONLY O_RDONLY -#define PACE_O_RDWR O_RDWR -#define PACE_O_RSYNC O_RSYNC -#define PACE_O_SYNC O_SYNC -#define PACE_O_TRUNC O_TRUNC -#define PACE_O_WRONLY O_WRONLY - -#ifndef PACE_FLOCK -#define PACE_FLOCK -typedef struct flock pace_flock; -#endif /* PACE_FLOCK */ - -#if (PACE_HAS_POSIX_FS_UOF) - int pace_win32_creat (const char * path, pace_mode_t mode); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_FCNTL_H_WIN32 */ diff --git a/PACE/pace/win32/fcntl.inl b/PACE/pace/win32/fcntl.inl deleted file mode 100644 index b821d7bbfc9..00000000000 --- a/PACE/pace/win32/fcntl.inl +++ /dev/null @@ -1,38 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/fcntl.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_creat (const char * path, pace_mode_t mode) -{ - /* Emulation is still buggy! creat (path, mode); */ - PACE_UNUSED_ARG (path); - PACE_UNUSED_ARG (mode); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_fcntl (PACE_HANDLE fildes, int cmd, /* arg */ ... ) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (cmd); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - diff --git a/PACE/pace/win32/grp.c b/PACE/pace/win32/grp.c deleted file mode 100644 index 0bcfffa87d4..00000000000 --- a/PACE/pace/win32/grp.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/grp.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/grp.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/grp.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/grp.h b/PACE/pace/win32/grp.h deleted file mode 100644 index c800c8bc21e..00000000000 --- a/PACE/pace/win32/grp.h +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace () - * - * = FILENAME - * pace/win32/grp.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_GRP_H_WIN32 -#define PACE_GRP_H_WIN32 - -# if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -# endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_GROUP -#define PACE_GROUP - typedef struct group { - int val_; - } pace_group; -#endif /* PACE_GROUP */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_GRP_H_WIN32 */ diff --git a/PACE/pace/win32/grp.inl b/PACE/pace/win32/grp.inl deleted file mode 100644 index 905e9eadea3..00000000000 --- a/PACE/pace/win32/grp.inl +++ /dev/null @@ -1,72 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/grp.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_group * -pace_getgrgid (pace_gid_t gid) -{ - pace_group * retval = (pace_group*)0; - PACE_UNUSED_ARG (gid); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getgrgid_r (pace_gid_t gid, - pace_group * grp, - char * buffer, - size_t bufsize, - pace_group ** result) -{ - PACE_UNUSED_ARG (gid); - PACE_UNUSED_ARG (grp); - PACE_UNUSED_ARG (buffer); - PACE_UNUSED_ARG (bufsize); - PACE_UNUSED_ARG (result); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_group * -pace_getgrnam (const char * name) -{ - pace_group * retval = (pace_group*)0; - PACE_UNUSED_ARG (name); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getgrnam_r (const char * name, - pace_group * grp, - char * buffer, - size_t bufsize, - pace_group ** result) -{ - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (grp); - PACE_UNUSED_ARG (buffer); - PACE_UNUSED_ARG (bufsize); - PACE_UNUSED_ARG (result); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ diff --git a/PACE/pace/win32/limits.h b/PACE/pace/win32/limits.h deleted file mode 100644 index 0624528da7a..00000000000 --- a/PACE/pace/win32/limits.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/limits.h - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================ */ - -#ifndef PACE_LIMITS_H_WIN32 -#define PACE_LIMITS_H_WIN32 - -#include - -# if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -# endif /* (PACE_HAS_CPLUSPLUS) */ - -# if defined (PACE_HAS_CPLUSPLUS) -} -# endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_LIMITS_H_WIN32 */ diff --git a/PACE/pace/win32/locale.c b/PACE/pace/win32/locale.c deleted file mode 100644 index 1d10f0e3b32..00000000000 --- a/PACE/pace/win32/locale.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/locale.c - * - * = AUTHOR - * Joe Hoffert - * - * ============================================================================= */ - -#include "pace/locale.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/locale.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/locale.h b/PACE/pace/win32/locale.h deleted file mode 100644 index c56a9d9fec3..00000000000 --- a/PACE/pace/win32/locale.h +++ /dev/null @@ -1,40 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/locale.h - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#ifndef PACE_LOCALE_H_WIN32 -#define PACE_LOCALE_H_WIN32 - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_LC_ALL LC_ALL -#define PACE_LC_COLLATE LC_COLLATE -#define PACE_LC_CTYPE LC_CTYPE -#define PACE_LC_MONETARY LC_MONETARY -#define PACE_LC_NUMERIC LC_NUMERIC -#define PACE_LC_TIME LC_TIME -#define PACE_NULL NULL - -#ifndef PACE_LCONV -#define PACE_LCONV -typedef struct lconv pace_lconv; -#endif /* PACE_LCONV */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_LOCALE_H */ diff --git a/PACE/pace/win32/locale.inl b/PACE/pace/win32/locale.inl deleted file mode 100644 index bdcf0ba226a..00000000000 --- a/PACE/pace/win32/locale.inl +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/locale.inl - * - * = AUTHOR - * Joe Hoffert - * - * =========================================================================== */ - -#include - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_lconv * -pace_localeconv (void) -{ - return localeconv (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -char * -pace_setlocale (int category, const char * locale) -{ - return setlocale (category, locale); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/PACE/pace/win32/math.c b/PACE/pace/win32/math.c deleted file mode 100644 index 01302f35ac5..00000000000 --- a/PACE/pace/win32/math.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/math.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/math.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/math.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/math.h b/PACE/pace/win32/math.h deleted file mode 100644 index e1658a72c12..00000000000 --- a/PACE/pace/win32/math.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/math.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_MATH_H_WIN32 -#define PACE_MATH_H_WIN32 - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_HUGE_VAL HUGE_VAL - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_MATH_H_WIN32 */ diff --git a/PACE/pace/win32/math.inl b/PACE/pace/win32/math.inl deleted file mode 100644 index 47112cebda3..00000000000 --- a/PACE/pace/win32/math.inl +++ /dev/null @@ -1,215 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/math.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -/* FUZZ: disable check_for_math_include */ -#include - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_acos (double x) -{ - return acos (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_asin (double x) -{ - return asin (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_atan (double x) -{ - return atan (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_atan2 (double x, double y) -{ - return atan2 (x, y); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_cos (double x) -{ - return cos (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_sin (double x) -{ - return sin (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_tan (double x) -{ - return tan (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_cosh (double x) -{ - return cosh (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_sinh (double x) -{ - return sinh (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_tanh (double x) -{ - return tanh (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_exp (double x) -{ - return exp (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_frexp (double x, int * exp) -{ - return frexp (x, exp); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_ldexp (double x, int exp) -{ - return ldexp (x, exp); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_log (double x) -{ - return log (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_log10 (double x) -{ - return log10 (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_modf (double x, double * iptr) -{ - return modf (x, iptr); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_pow (double x, double y) -{ - return pow (x, y); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_sqrt (double x) -{ - return sqrt (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_ceil (double x) -{ - return ceil (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_fabs (double x) -{ - return fabs (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_floor (double x) -{ - return floor (x); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_fmod (double x, double y) -{ - return fmod (x, y); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/win32/mman.c b/PACE/pace/win32/mman.c deleted file mode 100644 index 7c08f8f6e0f..00000000000 --- a/PACE/pace/win32/mman.c +++ /dev/null @@ -1,123 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/mman.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/mman.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/mman.inl" -#endif /* ! PACE_HAS_INLINE */ - -#include -#include - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -void * -mmap (void * addr, size_t len, int prot, int flags, - PACE_HANDLE fildes, pace_off_t off) -{ - void *addr_mapping = 0; - int nt_flags = 0; - PACE_HANDLE file_mapping = PACE_INVALID_HANDLE; - - if (PACE_BIT_ENABLED (flags, MAP_PRIVATE)) - { - prot = PAGE_WRITECOPY; - nt_flags = FILE_MAP_COPY; - } - else if (PACE_BIT_ENABLED (flags, MAP_SHARED)) - { - if (PACE_BIT_ENABLED (prot, PAGE_READONLY)) - nt_flags = FILE_MAP_READ; - if (PACE_BIT_ENABLED (prot, PAGE_READWRITE)) - nt_flags = FILE_MAP_WRITE; - } - - file_mapping = CreateFileMapping (fildes, - 0, - prot, - 0, - 0, - 0); - if (file_mapping == 0) - PACE_FAIL_RETURN (MAP_FAILED); - -# if defined (PACE_OS_EXTRA_MMAP_FLAGS) - nt_flags |= PACE_OS_EXTRA_MMAP_FLAGS; -# endif /* PACE_OS_EXTRA_MMAP_FLAGS */ - -# if !defined (PACE_HAS_WINCE) - addr_mapping = MapViewOfFileEx (file_mapping, - nt_flags, - 0, - off, - len, - addr); -# else - ACE_UNUSED_ARG (addr); /* WinCE does not allow specifying .*/ - addr_mapping = MapViewOfFile (file_mapping, - nt_flags, - 0, - off, - len); -# endif /* ! PACE_HAS_WINCE */ - - /* Only close this down if we used the temporary. */ - if (file_mapping == PACE_INVALID_HANDLE) - CloseHandle (file_mapping); - - if (addr_mapping == 0) - PACE_FAIL_RETURN (MAP_FAILED); - - else if (PACE_BIT_ENABLED (flags, MAP_FIXED) - && addr_mapping != addr) - { - errno = EINVAL; - return MAP_FAILED; - } - else - return addr_mapping; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -mprotect (void * addr, size_t len, int prot) -{ - DWORD dummy; /* Sigh! */ - return VirtualProtect(addr, len, prot, &dummy) ? 0 : -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -msync (void * addr, size_t len, int flags) -{ - PACE_UNUSED_ARG (flags); - PACE_WIN32CALL_RETURN - (PACE_ADAPT_RETVAL - (FlushViewOfFile (addr, len), pace_result_), int, -1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -munmap (void * addr, size_t len) -{ - PACE_UNUSED_ARG (len); - PACE_WIN32CALL_RETURN - (PACE_ADAPT_RETVAL - (UnmapViewOfFile (addr), pace_result_), int, -1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/mman.h b/PACE/pace/win32/mman.h deleted file mode 100644 index 2a5621823d7..00000000000 --- a/PACE/pace/win32/mman.h +++ /dev/null @@ -1,65 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/mman.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_MMAN_H_WIN32 -#define PACE_SYS_MMAN_H_WIN32 - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -# define MAP_PRIVATE 1 -# define MAP_SHARED 2 -# define MAP_FIXED 4 -# if !defined (MAP_FAILED) -# undef MAP_FAILED -# define MAP_FAILED ((void *) -1) -# endif - -# define PACE_MAP_FAILED MAP_FAILED -# define PACE_MAP_FIXED MAP_FIXED -# define PACE_MAP_PRIVATE MAP_PRIVATE -# define PACE_MAP_SHARED MAP_SHARED -# define PACE_MCL_CURRENT MCL_CURRENT -# define PACE_MS_ASYNC MS_ASYNC -# define PACE_MS_INVALIDATE -# define PACE_MS_SYNC MS_SYNC -# define PACE_PROT_EXEC PROT_EXEC -# define PACE_PROT_NONE PROT_NONE -# define PACE_PROT_READ PROT_READ -# define PACE_PROT_WRITE PROT_WRITE - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - void * mmap (void * addr, size_t len, int prot, int flags, - PACE_HANDLE fildes, pace_off_t off); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int mprotect (void * addr, size_t len, int prot); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int msync (void * addr, size_t len, int flags); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int munmap (void * addr, size_t len); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_MMAN_H */ diff --git a/PACE/pace/win32/mman.inl b/PACE/pace/win32/mman.inl deleted file mode 100644 index c324089991b..00000000000 --- a/PACE/pace/win32/mman.inl +++ /dev/null @@ -1,129 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/mman.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mlock (const void * addr, pace_size_t len) -{ - PACE_UNUSED_ARG (addr); - PACE_UNUSED_ARG (len); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mlockall (int flags) -{ - PACE_UNUSED_ARG (flags); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_mmap (void * addr, - size_t len, - int prot, - int flags, - PACE_HANDLE fildes, - pace_off_t off) -{ - return mmap (addr, len, prot, flags, fildes, off); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_munlock (const void * addr, size_t len) -{ - PACE_UNUSED_ARG (addr); - PACE_UNUSED_ARG (len); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mprotect (void * addr, size_t len, int prot) -{ - return mprotect (addr, len, prot); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_msync (void * addr, - size_t len, - int flags) -{ - return msync (addr, len, flags); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_munlockall () -{ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_munmap (void * addr, size_t len) -{ - return munmap (addr, len); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -PACE_HANDLE -pace_shm_open (const char * name, int oflag, pace_mode_t mode) -{ - /* Would be similar to ACE_OS::open - which (currently uses threads and Object Manager). - */ - PACE_HANDLE retval = PACE_INVALID_HANDLE; - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (oflag); - PACE_UNUSED_ARG (mode); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_shm_unlink (const char * name) -{ -#if defined (__BORLANDC__) - return unlink (name); -#else /* __BORLANDC__ */ - return _unlink (name); -#endif /* __BORLANDC__ */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/mqueue.c b/PACE/pace/win32/mqueue.c deleted file mode 100644 index 2f08c3e979e..00000000000 --- a/PACE/pace/win32/mqueue.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace () - * - * = FILENAME - * pace/win32/mqueue.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/mqueue.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/mqueue.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/mqueue.h b/PACE/pace/win32/mqueue.h deleted file mode 100644 index 17110c5a740..00000000000 --- a/PACE/pace/win32/mqueue.h +++ /dev/null @@ -1,45 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/mqueue.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_MQUEUE_H_WIN32 -#define PACE_MQUEUE_H_WIN32 - -#include "pace/signal.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_MQD_T -#define PACE_MQD_T - /* Temporary fix until we emulate these funcs. - typedef mqd_t pace_mqd_t; - */ - typedef int pace_mqd_t; -#endif /* PACE_MQD_T */ - -#ifndef PACE_MQ_ATTR -#define PACE_MQ_ATTR - /* Temporary fix until we emulate these funcs. - typedef struct mq_attr pace_mq_attr - */ - typedef struct mq_attr { int a_; } pace_mq_attr; -#endif /* PACE_MQ_ATTR */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_MQUEUE_H_WIN32 */ diff --git a/PACE/pace/win32/mqueue.inl b/PACE/pace/win32/mqueue.inl deleted file mode 100644 index 956ddaf7be2..00000000000 --- a/PACE/pace/win32/mqueue.inl +++ /dev/null @@ -1,104 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/mqueue.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_close (pace_mqd_t mqdes) -{ - PACE_UNUSED_ARG (mqdes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_getattr (pace_mqd_t mqdes, - pace_mq_attr * mqstat) -{ - PACE_UNUSED_ARG (mqdes); - PACE_UNUSED_ARG (mqstat); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_notify (pace_mqd_t mqdes, - const pace_sigevent * notification) -{ - PACE_UNUSED_ARG (mqdes); - PACE_UNUSED_ARG (notification); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_ssize_t -pace_mq_receive (pace_mqd_t mqdes, - char * msg_ptr, - size_t msg_len, - unsigned int * msg_prio) -{ - PACE_UNUSED_ARG (mqdes); - PACE_UNUSED_ARG (msg_ptr); - PACE_UNUSED_ARG (msg_len); - PACE_UNUSED_ARG (msg_prio); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_send (pace_mqd_t mqdes, - const char * msg_ptr, - size_t msg_len, - unsigned int msg_prio) -{ - PACE_UNUSED_ARG (mqdes); - PACE_UNUSED_ARG (msg_ptr); - PACE_UNUSED_ARG (msg_len); - PACE_UNUSED_ARG (msg_prio); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_setattr (pace_mqd_t mqdes, - const pace_mq_attr * mqstat, - pace_mq_attr * omqstat) -{ - PACE_UNUSED_ARG (mqdes); - PACE_UNUSED_ARG (mqstat); - PACE_UNUSED_ARG (omqstat); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mq_unlink (const char * name) -{ - PACE_UNUSED_ARG (name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/pace.dsw b/PACE/pace/win32/pace.dsw deleted file mode 100644 index d1deae4e284..00000000000 --- a/PACE/pace/win32/pace.dsw +++ /dev/null @@ -1,41 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "pace_dll"=.\pace_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pace_lib"=.\pace_lib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/PACE/pace/win32/pace_dll.dsp b/PACE/pace/win32/pace_dll.dsp deleted file mode 100644 index 8fca3ae3eb9..00000000000 --- a/PACE/pace/win32/pace_dll.dsp +++ /dev/null @@ -1,623 +0,0 @@ -# Microsoft Developer Studio Project File - Name="PACE DLL" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=PACE DLL - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pace_dll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pace_dll.mak" CFG="PACE DLL - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "PACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "PACE DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "PACE DLL - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "DLL\Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PACE_DLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "_WINDOWS" /D "PACE_BUILD_DLL" /D "WIN32" /D "PACE_HAS_ALL_POSIX_FUNCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../../../bin/pace.dll" -# SUBTRACT LINK32 /profile - -!ELSEIF "$(CFG)" == "PACE DLL - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "pace_dll___Win32_Debug" -# PROP BASE Intermediate_Dir "pace_dll___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "DLL\Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PACE_DLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D "_WINDOWS" /D "PACE_BUILD_DLL" /D "WIN32" /D "PACE_HAS_ALL_POSIX_FUNCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/paced.dll" /pdbtype:sept -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "PACE DLL - Win32 Release" -# Name "PACE DLL - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\aio.c -# End Source File -# Begin Source File - -SOURCE=.\assert.c -# End Source File -# Begin Source File - -SOURCE=.\ctype.c -# End Source File -# Begin Source File - -SOURCE=.\dirent.c -# End Source File -# Begin Source File - -SOURCE=.\fcntl.c -# End Source File -# Begin Source File - -SOURCE=.\grp.c -# End Source File -# Begin Source File - -SOURCE=.\locale.c -# End Source File -# Begin Source File - -SOURCE=.\math.c -# End Source File -# Begin Source File - -SOURCE=.\mman.c -# End Source File -# Begin Source File - -SOURCE=.\mqueue.c -# End Source File -# Begin Source File - -SOURCE=.\pthread.c -# End Source File -# Begin Source File - -SOURCE=.\pwd.c -# End Source File -# Begin Source File - -SOURCE=.\sched.c -# End Source File -# Begin Source File - -SOURCE=.\semaphore.c -# End Source File -# Begin Source File - -SOURCE=.\setjmp.c -# End Source File -# Begin Source File - -SOURCE=.\signal.c -# End Source File -# Begin Source File - -SOURCE=.\stat.c -# End Source File -# Begin Source File - -SOURCE=.\stdio.c -# End Source File -# Begin Source File - -SOURCE=.\stdlib.c -# End Source File -# Begin Source File - -SOURCE=.\string.c -# End Source File -# Begin Source File - -SOURCE=.\termios.c -# End Source File -# Begin Source File - -SOURCE=.\time.c -# End Source File -# Begin Source File - -SOURCE=.\times.c -# End Source File -# Begin Source File - -SOURCE=.\unistd.c -# End Source File -# Begin Source File - -SOURCE=.\utime.c -# End Source File -# Begin Source File - -SOURCE=.\utsname.c -# End Source File -# Begin Source File - -SOURCE=.\wait.c -# End Source File -# End Group -# Begin Group "Header Files (Prototypes)" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\aio.h -# End Source File -# Begin Source File - -SOURCE=..\assert.h -# End Source File -# Begin Source File - -SOURCE=..\ctype.h -# End Source File -# Begin Source File - -SOURCE=..\dirent.h -# End Source File -# Begin Source File - -SOURCE=..\errno.h -# End Source File -# Begin Source File - -SOURCE=..\fcntl.h -# End Source File -# Begin Source File - -SOURCE=..\grp.h -# End Source File -# Begin Source File - -SOURCE=..\limits.h -# End Source File -# Begin Source File - -SOURCE=..\locale.h -# End Source File -# Begin Source File - -SOURCE=..\math.h -# End Source File -# Begin Source File - -SOURCE=..\sys\mman.h -# End Source File -# Begin Source File - -SOURCE=..\mqueue.h -# End Source File -# Begin Source File - -SOURCE=..\pthread.h -# End Source File -# Begin Source File - -SOURCE=..\pwd.h -# End Source File -# Begin Source File - -SOURCE=..\sched.h -# End Source File -# Begin Source File - -SOURCE=..\semaphore.h -# End Source File -# Begin Source File - -SOURCE=..\setjmp.h -# End Source File -# Begin Source File - -SOURCE=..\signal.h -# End Source File -# Begin Source File - -SOURCE=..\sys\stat.h -# End Source File -# Begin Source File - -SOURCE=..\stddef.h -# End Source File -# Begin Source File - -SOURCE=..\stdio.h -# End Source File -# Begin Source File - -SOURCE=..\stdlib.h -# End Source File -# Begin Source File - -SOURCE=..\string.h -# End Source File -# Begin Source File - -SOURCE=..\termios.h -# End Source File -# Begin Source File - -SOURCE=..\time.h -# End Source File -# Begin Source File - -SOURCE=..\sys\times.h -# End Source File -# Begin Source File - -SOURCE=..\sys\types.h -# End Source File -# Begin Source File - -SOURCE=..\unistd.h -# End Source File -# Begin Source File - -SOURCE=..\utime.h -# End Source File -# Begin Source File - -SOURCE=..\sys\utsname.h -# End Source File -# Begin Source File - -SOURCE=..\sys\wait.h -# End Source File -# End Group -# Begin Group "Header Files (Win32 Specific)" - -# PROP Default_Filter "h" -# Begin Source File - -SOURCE=.\aio.h -# End Source File -# Begin Source File - -SOURCE=.\assert.h -# End Source File -# Begin Source File - -SOURCE=.\ctype.h -# End Source File -# Begin Source File - -SOURCE=.\dirent.h -# End Source File -# Begin Source File - -SOURCE=.\errno.h -# End Source File -# Begin Source File - -SOURCE=.\fcntl.h -# End Source File -# Begin Source File - -SOURCE=.\grp.h -# End Source File -# Begin Source File - -SOURCE=.\limits.h -# End Source File -# Begin Source File - -SOURCE=.\locale.h -# End Source File -# Begin Source File - -SOURCE=.\math.h -# End Source File -# Begin Source File - -SOURCE=.\mman.h -# End Source File -# Begin Source File - -SOURCE=.\mqueue.h -# End Source File -# Begin Source File - -SOURCE=.\pthread.h -# End Source File -# Begin Source File - -SOURCE=.\pthreadtypes.h -# End Source File -# Begin Source File - -SOURCE=.\pwd.h -# End Source File -# Begin Source File - -SOURCE=.\sched.h -# End Source File -# Begin Source File - -SOURCE=.\schedtypes.h -# End Source File -# Begin Source File - -SOURCE=.\semaphore.h -# End Source File -# Begin Source File - -SOURCE=.\setjmp.h -# End Source File -# Begin Source File - -SOURCE=.\signal.h -# End Source File -# Begin Source File - -SOURCE=.\stat.h -# End Source File -# Begin Source File - -SOURCE=.\stdio.h -# End Source File -# Begin Source File - -SOURCE=.\stdlib.h -# End Source File -# Begin Source File - -SOURCE=.\string.h -# End Source File -# Begin Source File - -SOURCE=.\termios.h -# End Source File -# Begin Source File - -SOURCE=.\time.h -# End Source File -# Begin Source File - -SOURCE=.\times.h -# End Source File -# Begin Source File - -SOURCE=.\types.h -# End Source File -# Begin Source File - -SOURCE=.\unistd.h -# End Source File -# Begin Source File - -SOURCE=.\utime.h -# End Source File -# Begin Source File - -SOURCE=.\utsname.h -# End Source File -# Begin Source File - -SOURCE=.\wait.h -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "inl" -# Begin Source File - -SOURCE=.\aio.inl -# End Source File -# Begin Source File - -SOURCE=.\assert.inl -# End Source File -# Begin Source File - -SOURCE=.\ctype.inl -# End Source File -# Begin Source File - -SOURCE=.\dirent.inl -# End Source File -# Begin Source File - -SOURCE=.\fcntl.inl -# End Source File -# Begin Source File - -SOURCE=.\grp.inl -# End Source File -# Begin Source File - -SOURCE=.\locale.inl -# End Source File -# Begin Source File - -SOURCE=.\math.inl -# End Source File -# Begin Source File - -SOURCE=.\mman.inl -# End Source File -# Begin Source File - -SOURCE=.\mqueue.inl -# End Source File -# Begin Source File - -SOURCE=.\pthread.inl -# End Source File -# Begin Source File - -SOURCE=.\pwd.inl -# End Source File -# Begin Source File - -SOURCE=.\sched.inl -# End Source File -# Begin Source File - -SOURCE=.\semaphore.inl -# End Source File -# Begin Source File - -SOURCE=.\setjmp.inl -# End Source File -# Begin Source File - -SOURCE=.\signal.inl -# End Source File -# Begin Source File - -SOURCE=.\stat.inl -# End Source File -# Begin Source File - -SOURCE=.\stdio.inl -# End Source File -# Begin Source File - -SOURCE=.\stdlib.inl -# End Source File -# Begin Source File - -SOURCE=.\string.inl -# End Source File -# Begin Source File - -SOURCE=.\termios.inl -# End Source File -# Begin Source File - -SOURCE=.\time.inl -# End Source File -# Begin Source File - -SOURCE=.\times.inl -# End Source File -# Begin Source File - -SOURCE=.\unistd.inl -# End Source File -# Begin Source File - -SOURCE=.\utime.inl -# End Source File -# Begin Source File - -SOURCE=.\utsname.inl -# End Source File -# Begin Source File - -SOURCE=.\wait.inl -# End Source File -# End Group -# Begin Group "Config Files" - -# PROP Default_Filter "c" -# Begin Source File - -SOURCE=..\config\compiler.h -# End Source File -# Begin Source File - -SOURCE=..\config\config.h -# End Source File -# Begin Source File - -SOURCE=..\config\constants.h -# End Source File -# Begin Source File - -SOURCE=..\config\defaults.h -# End Source File -# Begin Source File - -SOURCE=..\config\defines.h -# End Source File -# Begin Source File - -SOURCE=..\config\features.h -# End Source File -# Begin Source File - -SOURCE=..\config\platform.h -# End Source File -# Begin Source File - -SOURCE=..\config\temp.h -# End Source File -# Begin Source File - -SOURCE=..\config\utility.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/PACE/pace/win32/pace_lib.dsp b/PACE/pace/win32/pace_lib.dsp deleted file mode 100644 index 0a41c79bf03..00000000000 --- a/PACE/pace/win32/pace_lib.dsp +++ /dev/null @@ -1,609 +0,0 @@ -# Microsoft Developer Studio Project File - Name="PACE LIB" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=PACE LIB - Win32 Static Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pace_lib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pace_lib.mak" CFG="PACE LIB - Win32 Static Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "PACE LIB - Win32 Static Release" (based on "Win32 (x86) Static Library") -!MESSAGE "PACE LIB - Win32 Static Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "PACE LIB - Win32 Static Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "LIB\Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "PACE_AS_STATIC_LIBS" /D "WIN32" /D "PACE_HAS_ALL_POSIX_FUNCS" /V"ERBOSE:LIB" /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:".\paces.lib" - -!ELSEIF "$(CFG)" == "PACE LIB - Win32 Static Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "pace_lib___Win32_Debug" -# PROP BASE Intermediate_Dir "pace_lib___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "LIB\Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "PACE_HAS_ALL_POSIX_FUNCS" /D "PACE_AS_STATIC_LIBS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:".\pacesd.lib" - -!ENDIF - -# Begin Target - -# Name "PACE LIB - Win32 Static Release" -# Name "PACE LIB - Win32 Static Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\aio.c -# End Source File -# Begin Source File - -SOURCE=.\assert.c -# End Source File -# Begin Source File - -SOURCE=.\ctype.c -# End Source File -# Begin Source File - -SOURCE=.\dirent.c -# End Source File -# Begin Source File - -SOURCE=.\fcntl.c -# End Source File -# Begin Source File - -SOURCE=.\grp.c -# End Source File -# Begin Source File - -SOURCE=.\locale.c -# End Source File -# Begin Source File - -SOURCE=.\math.c -# End Source File -# Begin Source File - -SOURCE=.\mman.c -# End Source File -# Begin Source File - -SOURCE=.\mqueue.c -# End Source File -# Begin Source File - -SOURCE=.\pthread.c -# End Source File -# Begin Source File - -SOURCE=.\pwd.c -# End Source File -# Begin Source File - -SOURCE=.\sched.c -# End Source File -# Begin Source File - -SOURCE=.\semaphore.c -# End Source File -# Begin Source File - -SOURCE=.\setjmp.c -# End Source File -# Begin Source File - -SOURCE=.\signal.c -# End Source File -# Begin Source File - -SOURCE=.\stat.c -# End Source File -# Begin Source File - -SOURCE=.\stdio.c -# End Source File -# Begin Source File - -SOURCE=.\stdlib.c -# End Source File -# Begin Source File - -SOURCE=.\string.c -# End Source File -# Begin Source File - -SOURCE=.\termios.c -# End Source File -# Begin Source File - -SOURCE=.\time.c -# End Source File -# Begin Source File - -SOURCE=.\times.c -# End Source File -# Begin Source File - -SOURCE=.\unistd.c -# End Source File -# Begin Source File - -SOURCE=.\utime.c -# End Source File -# Begin Source File - -SOURCE=.\utsname.c -# End Source File -# Begin Source File - -SOURCE=.\wait.c -# End Source File -# End Group -# Begin Group "Header Files (Prototypes)" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\aio.h -# End Source File -# Begin Source File - -SOURCE=..\assert.h -# End Source File -# Begin Source File - -SOURCE=..\ctype.h -# End Source File -# Begin Source File - -SOURCE=..\dirent.h -# End Source File -# Begin Source File - -SOURCE=..\errno.h -# End Source File -# Begin Source File - -SOURCE=..\fcntl.h -# End Source File -# Begin Source File - -SOURCE=..\grp.h -# End Source File -# Begin Source File - -SOURCE=..\limits.h -# End Source File -# Begin Source File - -SOURCE=..\locale.h -# End Source File -# Begin Source File - -SOURCE=..\math.h -# End Source File -# Begin Source File - -SOURCE=..\sys\mman.h -# End Source File -# Begin Source File - -SOURCE=..\mqueue.h -# End Source File -# Begin Source File - -SOURCE=..\pthread.h -# End Source File -# Begin Source File - -SOURCE=..\pwd.h -# End Source File -# Begin Source File - -SOURCE=..\sched.h -# End Source File -# Begin Source File - -SOURCE=..\semaphore.h -# End Source File -# Begin Source File - -SOURCE=..\setjmp.h -# End Source File -# Begin Source File - -SOURCE=..\signal.h -# End Source File -# Begin Source File - -SOURCE=..\sys\stat.h -# End Source File -# Begin Source File - -SOURCE=..\stddef.h -# End Source File -# Begin Source File - -SOURCE=..\stdio.h -# End Source File -# Begin Source File - -SOURCE=..\stdlib.h -# End Source File -# Begin Source File - -SOURCE=..\string.h -# End Source File -# Begin Source File - -SOURCE=..\termios.h -# End Source File -# Begin Source File - -SOURCE=..\time.h -# End Source File -# Begin Source File - -SOURCE=..\sys\times.h -# End Source File -# Begin Source File - -SOURCE=..\sys\types.h -# End Source File -# Begin Source File - -SOURCE=..\unistd.h -# End Source File -# Begin Source File - -SOURCE=..\utime.h -# End Source File -# Begin Source File - -SOURCE=..\sys\utsname.h -# End Source File -# Begin Source File - -SOURCE=..\sys\wait.h -# End Source File -# End Group -# Begin Group "Header Files (Win32 Specific)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\aio.h -# End Source File -# Begin Source File - -SOURCE=.\assert.h -# End Source File -# Begin Source File - -SOURCE=.\ctype.h -# End Source File -# Begin Source File - -SOURCE=.\dirent.h -# End Source File -# Begin Source File - -SOURCE=.\errno.h -# End Source File -# Begin Source File - -SOURCE=.\fcntl.h -# End Source File -# Begin Source File - -SOURCE=.\grp.h -# End Source File -# Begin Source File - -SOURCE=.\limits.h -# End Source File -# Begin Source File - -SOURCE=.\locale.h -# End Source File -# Begin Source File - -SOURCE=.\math.h -# End Source File -# Begin Source File - -SOURCE=.\mman.h -# End Source File -# Begin Source File - -SOURCE=.\mqueue.h -# End Source File -# Begin Source File - -SOURCE=.\pthread.h -# End Source File -# Begin Source File - -SOURCE=.\pthreadtypes.h -# End Source File -# Begin Source File - -SOURCE=.\pwd.h -# End Source File -# Begin Source File - -SOURCE=.\sched.h -# End Source File -# Begin Source File - -SOURCE=.\schedtypes.h -# End Source File -# Begin Source File - -SOURCE=.\semaphore.h -# End Source File -# Begin Source File - -SOURCE=.\setjmp.h -# End Source File -# Begin Source File - -SOURCE=.\signal.h -# End Source File -# Begin Source File - -SOURCE=.\stat.h -# End Source File -# Begin Source File - -SOURCE=.\stdio.h -# End Source File -# Begin Source File - -SOURCE=.\stdlib.h -# End Source File -# Begin Source File - -SOURCE=.\string.h -# End Source File -# Begin Source File - -SOURCE=.\termios.h -# End Source File -# Begin Source File - -SOURCE=.\time.h -# End Source File -# Begin Source File - -SOURCE=.\times.h -# End Source File -# Begin Source File - -SOURCE=.\types.h -# End Source File -# Begin Source File - -SOURCE=.\unistd.h -# End Source File -# Begin Source File - -SOURCE=.\utime.h -# End Source File -# Begin Source File - -SOURCE=.\utsname.h -# End Source File -# Begin Source File - -SOURCE=.\wait.h -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "inl" -# Begin Source File - -SOURCE=.\aio.inl -# End Source File -# Begin Source File - -SOURCE=.\assert.inl -# End Source File -# Begin Source File - -SOURCE=.\ctype.inl -# End Source File -# Begin Source File - -SOURCE=.\dirent.inl -# End Source File -# Begin Source File - -SOURCE=.\fcntl.inl -# End Source File -# Begin Source File - -SOURCE=.\grp.inl -# End Source File -# Begin Source File - -SOURCE=.\locale.inl -# End Source File -# Begin Source File - -SOURCE=.\math.inl -# End Source File -# Begin Source File - -SOURCE=.\mman.inl -# End Source File -# Begin Source File - -SOURCE=.\mqueue.inl -# End Source File -# Begin Source File - -SOURCE=.\pthread.inl -# End Source File -# Begin Source File - -SOURCE=.\pwd.inl -# End Source File -# Begin Source File - -SOURCE=.\sched.inl -# End Source File -# Begin Source File - -SOURCE=.\semaphore.inl -# End Source File -# Begin Source File - -SOURCE=.\setjmp.inl -# End Source File -# Begin Source File - -SOURCE=.\signal.inl -# End Source File -# Begin Source File - -SOURCE=.\stat.inl -# End Source File -# Begin Source File - -SOURCE=.\stdio.inl -# End Source File -# Begin Source File - -SOURCE=.\stdlib.inl -# End Source File -# Begin Source File - -SOURCE=.\string.inl -# End Source File -# Begin Source File - -SOURCE=.\termios.inl -# End Source File -# Begin Source File - -SOURCE=.\time.inl -# End Source File -# Begin Source File - -SOURCE=.\times.inl -# End Source File -# Begin Source File - -SOURCE=.\unistd.inl -# End Source File -# Begin Source File - -SOURCE=.\utime.inl -# End Source File -# Begin Source File - -SOURCE=.\utsname.inl -# End Source File -# Begin Source File - -SOURCE=.\wait.inl -# End Source File -# End Group -# Begin Group "Config Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\config\compiler.h -# End Source File -# Begin Source File - -SOURCE=..\config\config.h -# End Source File -# Begin Source File - -SOURCE=..\config\constants.h -# End Source File -# Begin Source File - -SOURCE=..\config\defaults.h -# End Source File -# Begin Source File - -SOURCE=..\config\defines.h -# End Source File -# Begin Source File - -SOURCE=..\config\features.h -# End Source File -# Begin Source File - -SOURCE=..\config\platform.h -# End Source File -# Begin Source File - -SOURCE=..\config\temp.h -# End Source File -# Begin Source File - -SOURCE=..\config\utility.h -# End Source File -# End Group -# End Target -# End Project diff --git a/PACE/pace/win32/pthread.c b/PACE/pace/win32/pthread.c deleted file mode 100644 index b53dab9396c..00000000000 --- a/PACE/pace/win32/pthread.c +++ /dev/null @@ -1,359 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/pthread.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/pthread.h" -#include - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/pthread.inl" -#endif /* ! PACE_HAS_INLINE */ - -////////////////////////////////////////////////////////////////////// -// pthread_t -////////////////////////////////////////////////////////////////////// - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, - void * (*start_routine) (void*), - void * arg) -{ - /* Get around a gcc bug. */ - typedef unsigned (__stdcall *bthrexr)(void*); - - unsigned flags = 0x0, thr_addr = 0x0; - if (attr->sparam_.sched_priority != THREAD_PRIORITY_NORMAL) - { - // CREATE_SUSPENDED is the only flag win32 currently supports - flags = CREATE_SUSPENDED; - } - - thread = (pace_pthread_t) - _beginthreadex (0, - attr->stack_size_, - (bthrexr) start_routine, - arg, - flags, - &thr_addr); - - if (flags == CREATE_SUSPENDED && thread != 0) - { - SetThreadPriority (thread, attr->sparam_.sched_priority); - ResumeThread (thread); - } - - if (thread == 0) - { - return 0; - } - else - { - PACE_FAIL_RETURN (-1); - } - -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -pace_pthread_t -pthread_self () -{ - return GetCurrentThread (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_getschedparam (pace_pthread_t thread, - int * policy, - pace_sched_param * param) -{ - PACE_UNUSED_ARG (policy); - if (param != (pace_sched_param*)0) - { - param->sched_priority = GetThreadPriority (thread); - return 0; - } - /* Invalid pointer to pace_sched_param. */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_setschedparam (pace_pthread_t thread, - int policy, - const pace_sched_param * param) -{ - PACE_UNUSED_ARG(policy); - - if (SetThreadPriority (thread, param->sched_priority)) - { - return 0; - } - /* ERROR: with return value of SetThreadPriority. */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -////////////////////////////////////////////////////////////////////// -// pthread_attr_t -////////////////////////////////////////////////////////////////////// - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_init (pace_pthread_attr_t * attr) -{ - /* These need to be the platform defaults! - * Since I made this, I need to maintain this invariant! - * Eventually, #define 'words' would be better than - * constants here! */ - - attr->init_ = 1; - attr->detach_state_ = 0; - attr->policy_ = 0; - attr->sparam_.sched_priority = 0; - attr->inherit_sched_ = 0; - attr->contention_scope_ = 0; - attr->guard_size_ = 0; - attr->stackaddr_set_ = 0; - attr->stack_addr_ = (void*)0; - attr->stack_size_ = 0; - - return 0; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_destroy (pace_pthread_attr_t * attr) -{ - if (attr->init_ == 1) - { - attr->init_ = 0; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_getdetachstate (const pace_pthread_attr_t * attr, - int * detachstate) -{ - if (attr->init_ == 1) - { - *detachstate = attr->detach_state_; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_setdetachstate (pace_pthread_attr_t * attr, - int detachstate) -{ - if (attr->init_ == 1) - { - attr->detach_state_ = detachstate; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_getinheritsched (const pace_pthread_attr_t * attr, - int * inheritsched) -{ - if (attr->init_ == 1) - { - *inheritsched = attr->inherit_sched_; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_setinheritsched (pace_pthread_attr_t * attr, - int inheritsched) -{ - if (attr->init_ == 1) - { - attr->inherit_sched_ = inheritsched; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_getschedparam (const pace_pthread_attr_t * attr, - pace_sched_param * param) -{ - if (attr->init_ == 1) - { - param->sched_priority = attr->sparam_.sched_priority; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_setschedparam (pace_pthread_attr_t * attr, - const pace_sched_param * param) -{ - if (attr->init_ == 1) - { - attr->sparam_.sched_priority = param->sched_priority; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr, - int * policy) -{ - if (attr->init_ == 1) - { - *policy = attr->policy_; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int pthread_attr_setschedpolicy (pace_pthread_attr_t * attr, - int policy) -{ - if (attr->init_ == 1) - { - attr->policy_ = policy; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_getscope (const pace_pthread_attr_t * attr, - int * contentionscope) -{ - if (attr->init_ == 1) - { - *contentionscope = attr->contention_scope_; - return 0; - } - /* ERROR: not initialized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_setscope (pace_pthread_attr_t * attr, - int contentionscope) -{ - if (attr->init_ == 1) - { - attr->contention_scope_ = contentionscope; - return 0; - } - /* ERROR: not initialized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_getstackaddr (const pace_pthread_attr_t * attr, - void ** stackaddr) -{ - if (attr->init_ == 1) - { - *stackaddr = attr->stack_addr_; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_setstackaddr (pace_pthread_attr_t * attr, - void * stackaddr) -{ - if (attr->init_ == 1) - { - attr->stack_addr_ = stackaddr; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_getstacksize (const pace_pthread_attr_t * attr, - size_t * stacksize) -{ - if (attr->init_ == 1) - { - *stacksize = attr->stack_size_; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pthread_attr_setstacksize (pace_pthread_attr_t * attr, - size_t stacksize) -{ - if (attr->init_ == 1) - { - attr->stack_size_ = stacksize; - return 0; - } - /* ERROR: not initilalized properly! */ - return -1; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/pthread.h b/PACE/pace/win32/pthread.h deleted file mode 100644 index 582b89c2ab1..00000000000 --- a/PACE/pace/win32/pthread.h +++ /dev/null @@ -1,178 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/pthread.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_PTHREAD_H_WIN32 -#define PACE_PTHREAD_H_WIN32 - -#include "pace/sys/types.h" -#include "pace/signal.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_PTHREAD_CANCELED PTHREAD_CANCELED -#define PACE_PTHREAD_CANCEL_AYNCHRONOUS PTHREAD_CANCEL_ASYNCHRONOUS -#define PACE_PTHREAD_CANCEL_DEFERRED PTHREAD_CANCEL_DEFERRED -#define PACE_PTHREAD_CACEL_DISABLE PTHREAD_CANCEL_DISABLE -#define PACE_PTHREAD_CANCEL_ENABLE PTHREAD_CANCEL_ENABLE -#define PACE_PTHREAD_COND_INITIALIZER PTHREAD_COND_INITIALIZER -#define PACE_PTHREAD_CREATE_DETACHED PTHREAD_CREATE_DETACHED -#define PACE_PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_JOINABLE -#define PACE_PTHREAD_EXPLICIT_SCHED PTHREAD_EXPLICIT_SCHED -#define PACE_PTHREAD_INHERIT_SCHED PTHREAD_INHERIT_SCHED -#define PACE_PTHREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#define PACE_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT -#define PACE_PTHREAD_PRIO_INHERIT PTHREAD_PRIO_INHERIT -#define PACE_PTHREAD_PRIO_NONE PTHREAD_PRIO_NONE -#define PACE_PTHREAD_PRIO_PROTECT PTHREAD_PRIO_PROTECT -#define PACE_PTHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE -#define PACE_PTHREAD_PROCESS_SHARED PTHREAD_PROCESS_SHARED -#define PACE_PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS -#define PACE_PTHREAD_SCOPE_SYSTEM PTHREAD_SCOPE_SYSTEM - -#if defined (PACE_HAS_CPLUSPLUS) - -# ifndef PACE_ATFORK_PF -# define PACE_ATFORK_PF - typedef void (*pace_atfork_pf) (void); -# endif /* PACE_ATFORK_PF */ - -# ifndef PACE_KEYCREATE_PF -# define PACE_KEYCREATE_PF - typedef void (*pace_keycreate_pf) (void*); -# endif /* PACE_KEYCREATE_PF */ - -# ifndef PACE_ONCE_PF -# define PACE_ONCE_PF - typedef void (*pace_once_pf) (void); -# endif /* PACE_ONCE_PF */ - -# ifndef PACE_CREATE_PF -# define PACE_CREATE_PF - typedef void* (*pace_create_pf) (void*); -# endif /* PACE_CREATE_PF */ - -#endif /* PACE_HAS_CPLUPLUS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, - void * (*start_routine) (void*), - void * arg); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - pace_pthread_t pthread_self (); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - /* Returns -1 if invalid pointer to param is passed in! */ - int pthread_getschedparam (pace_pthread_t thread, - int * policy, - pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_setschedparam (pace_pthread_t thread, - int policy, - const pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - /* Returns -1 if attr is already valid! */ - int pthread_attr_init (pace_pthread_attr_t * attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - /* Returns -1 if attr is invalid! */ - int pthread_attr_destroy (pace_pthread_attr_t * attr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_getdetachstate (const pace_pthread_attr_t * attr, - int * detachstate); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_setdetachstate (pace_pthread_attr_t * attr, - int detachstate); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_getinheritsched (const pace_pthread_attr_t * attr, - int * inheritsched); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_setinheritsched (pace_pthread_attr_t * attr, - int inheritsched); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_getschedparam (const pace_pthread_attr_t * attr, - pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_setschedparam (pace_pthread_attr_t * attr, - const pace_sched_param * param); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr, - int * policy); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_setschedpolicy (pace_pthread_attr_t * attr, - int policy); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_getscope (const pace_pthread_attr_t * attr, - int * contentionscope); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_setscope (pace_pthread_attr_t * attr, - int contentionscope); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_getstackaddr (const pace_pthread_attr_t * attr, - void ** stackaddr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_setstackaddr (pace_pthread_attr_t * attr, - void * stackaddr); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_getstacksize (const pace_pthread_attr_t * attr, - size_t * stacksize); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pthread_attr_setstacksize (pace_pthread_attr_t * attr, - size_t stacksize); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_PTHREAD_H_WIN32 */ diff --git a/PACE/pace/win32/pthread.inl b/PACE/pace/win32/pthread.inl deleted file mode 100644 index 3fea1729342..00000000000 --- a/PACE/pace/win32/pthread.inl +++ /dev/null @@ -1,682 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/pthread.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/unistd.h" - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_atfork (void (*prepare) (void), - void (*parent) (void), - void (*child) (void)) -{ - PACE_UNUSED_ARG (prepare); - PACE_UNUSED_ARG (parent); - PACE_UNUSED_ARG (child); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_create (pace_pthread_t * thread, - const pace_pthread_attr_t * attr, - void * (*start_routine) (void*), - void * arg) -{ - PACE_UNUSED_ARG (thread); - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (start_routine); - PACE_UNUSED_ARG (arg); - - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_pthread_t -pace_pthread_self () -{ - return pthread_self (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_getschedparam (pace_pthread_t thread, - int * policy, - pace_sched_param * param) -{ - return pthread_getschedparam (thread, policy, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setschedparam (pace_pthread_t thread, - int policy, - const pace_sched_param * param) -{ - return pthread_setschedparam (thread, policy, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_init (pace_pthread_attr_t * attr) -{ - return pthread_attr_init (attr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_destroy (pace_pthread_attr_t * attr) -{ - return pthread_attr_destroy (attr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getdetachstate (const pace_pthread_attr_t * attr, - int * detachstate) -{ - return pthread_attr_getdetachstate (attr, detachstate); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setdetachstate (pace_pthread_attr_t * attr, - int detachstate) -{ - return pthread_attr_setdetachstate (attr, detachstate); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getinheritsched (const pace_pthread_attr_t * attr, - int * inheritsched) -{ - return pthread_attr_getinheritsched (attr, inheritsched); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setinheritsched (pace_pthread_attr_t * attr, - int inheritsched) -{ - return pthread_attr_setinheritsched (attr, inheritsched); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getschedparam (const pace_pthread_attr_t * attr, - pace_sched_param * param) -{ - return pthread_attr_getschedparam (attr, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setschedparam (pace_pthread_attr_t * attr, - const pace_sched_param * param) -{ - return pthread_attr_setschedparam (attr, param); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getschedpolicy (const pace_pthread_attr_t * attr, - int * policy) -{ - return pthread_attr_getschedpolicy (attr, policy); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setschedpolicy (pace_pthread_attr_t * attr, - int policy) -{ - return pthread_attr_setschedpolicy (attr, policy); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getscope (const pace_pthread_attr_t * attr, - int * contentionscope) -{ - return pthread_attr_getscope (attr, contentionscope); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setscope (pace_pthread_attr_t * attr, - int contentionscope) -{ - return pthread_attr_setscope (attr, contentionscope); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getstackaddr (const pace_pthread_attr_t * attr, - void ** stackaddr) -{ - return pthread_attr_getstackaddr (attr, stackaddr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setstackaddr (pace_pthread_attr_t * attr, - void * stackaddr) -{ - return pthread_attr_setstackaddr (attr, stackaddr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_getstacksize (const pace_pthread_attr_t * attr, - size_t * stacksize) -{ - return pthread_attr_getstacksize (attr, stacksize); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_attr_setstacksize (pace_pthread_attr_t * attr, - size_t stacksize) -{ - return pthread_attr_setstacksize (attr, stacksize); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cancel (pace_pthread_t thread) -{ - PACE_UNUSED_ARG (thread); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_broadcast (pace_pthread_cond_t * cond) -{ - PACE_UNUSED_ARG (cond); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_destroy (pace_pthread_cond_t * cond) -{ - PACE_UNUSED_ARG (cond); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_init (pace_pthread_cond_t * cond, - const pace_pthread_condattr_t * attr) -{ - PACE_UNUSED_ARG (cond); - PACE_UNUSED_ARG (attr); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_signal (pace_pthread_cond_t * cond) -{ - PACE_UNUSED_ARG (cond); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_timedwait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex, - const struct timespec * abstime) -{ - PACE_UNUSED_ARG (cond); - PACE_UNUSED_ARG (mutex); - PACE_UNUSED_ARG (abstime); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_cond_wait (pace_pthread_cond_t * cond, - pace_pthread_mutex_t * mutex) -{ - PACE_UNUSED_ARG (cond); - PACE_UNUSED_ARG (mutex); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_destroy (pace_pthread_condattr_t * attr) -{ - PACE_UNUSED_ARG (attr); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_getpshared (const pace_pthread_condattr_t * attr, - int * pshared) -{ - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (pshared); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_init (pace_pthread_condattr_t * attr) -{ - PACE_UNUSED_ARG (attr); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_condattr_setpshared (pace_pthread_condattr_t * attr, - int pshared) -{ - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (pshared); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_detach (pace_pthread_t thread) -{ - PACE_UNUSED_ARG (thread); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_equal (pace_pthread_t t1, pace_pthread_t t2) -{ - return t1 == t2; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void -pace_pthread_exit (void * value_ptr) -{ - PACE_UNUSED_ARG (value_ptr); - PACE_ERRNO_NO_SUPPORT (); - return; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_pthread_getspecific (pace_pthread_key_t key) -{ - void * retval = (void*)0; - PACE_UNUSED_ARG (key); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_join (pace_pthread_t thread, void ** value_ptr) -{ - PACE_UNUSED_ARG (thread); - PACE_UNUSED_ARG (value_ptr); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_key_create (pace_pthread_key_t * key, - void (*destructor)(void*)) -{ - PACE_UNUSED_ARG (key); - PACE_UNUSED_ARG (destructor); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_key_delete (pace_pthread_key_t key) -{ - PACE_UNUSED_ARG (key); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_kill (pace_pthread_t thread, int sig) -{ - PACE_UNUSED_ARG (thread); - PACE_UNUSED_ARG (sig); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_destroy (pace_pthread_mutex_t * mutex) -{ - PACE_UNUSED_ARG (mutex); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_getprioceiling (pace_pthread_mutex_t * mutex, - int * prioceiling) -{ - PACE_UNUSED_ARG (mutex); - PACE_UNUSED_ARG (prioceiling); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_init (pace_pthread_mutex_t * mutex, - const pace_pthread_mutexattr_t * attr) -{ - PACE_UNUSED_ARG (mutex); - PACE_UNUSED_ARG (attr); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_lock (pace_pthread_mutex_t * mutex) -{ - PACE_UNUSED_ARG (mutex); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_setprioceiling (pace_pthread_mutex_t * mutex, - int prioceiling, - int * old_ceiling) -{ - PACE_UNUSED_ARG (mutex); - PACE_UNUSED_ARG (prioceiling); - PACE_UNUSED_ARG (old_ceiling); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_trylock (pace_pthread_mutex_t * mutex) -{ - PACE_UNUSED_ARG (mutex); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutex_unlock (pace_pthread_mutex_t * mutex) -{ - PACE_UNUSED_ARG (mutex); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_destroy (pace_pthread_mutexattr_t * attr) -{ - PACE_UNUSED_ARG (attr); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_getprioceiling (pace_pthread_mutexattr_t * attr, - int * prioceiling) -{ - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (prioceiling); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_getprotocol (const pace_pthread_mutexattr_t * attr, - int * protocol) -{ - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (protocol); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_setprioceiling (pace_pthread_mutexattr_t * attr, - int prioceiling) -{ - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (prioceiling); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_setprotocol (pace_pthread_mutexattr_t * attr, - int protocol) -{ - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (protocol); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_getpshared (const pace_pthread_mutexattr_t * attr, - int * pshared) -{ - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (pshared); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_init (pace_pthread_mutexattr_t * attr) -{ - PACE_UNUSED_ARG (attr); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_mutexattr_setpshared (pace_pthread_mutexattr_t * attr, - int pshared) -{ - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (pshared); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_once (pace_pthread_once_t * once_control, - void (*void_routine) (void)) -{ - PACE_UNUSED_ARG (once_control); - PACE_UNUSED_ARG (void_routine); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setcancelstate (int state, int * oldstate) -{ - PACE_UNUSED_ARG (state); - PACE_UNUSED_ARG (oldstate); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setcanceltype (int type, int * oldtype) -{ - PACE_UNUSED_ARG (type); - PACE_UNUSED_ARG (oldtype); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_setspecific (pace_pthread_key_t key, const void * value) -{ - PACE_UNUSED_ARG (key); - PACE_UNUSED_ARG (value); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_pthread_sigmask (int how, const pace_sigset_t * set, - pace_sigset_t * oset) -{ - PACE_UNUSED_ARG (how); - PACE_UNUSED_ARG (set); - PACE_UNUSED_ARG (oset); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void -pace_pthread_testcancel () -{ - PACE_ERRNO_NO_SUPPORT (); - return; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/pthreadtypes.h b/PACE/pace/win32/pthreadtypes.h deleted file mode 100644 index 9d578a56801..00000000000 --- a/PACE/pace/win32/pthreadtypes.h +++ /dev/null @@ -1,132 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/pthreadtypes.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -/* Keep pthread types defined here as they just clutter up sys/types.h - - * Do NOT include this file directly!! Please include "sys/types.h". */ - -#ifndef PACE_SYS_PTHREADTYPES_H_WIN32 -#define PACE_SYS_PTHREADTYPES_H_WIN32 - -#include "pace/win32/schedtypes.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_PTHREAD_ATTR_T -#define PACE_PTHREAD_ATTR_T 1 - typedef struct pthread_attr_t - { - int init_; - int detach_state_; - int policy_; - pace_sched_param sparam_; - int inherit_sched_; - int contention_scope_; - pace_size_t guard_size_; - int stackaddr_set_ ; - void * stack_addr_; - pace_size_t stack_size_; - } pace_pthread_attr_t; -#endif /* PACE_PTHREAD_ATTR_T */ - -#ifndef PACE_PTHREAD_COND_T -#define PACE_PTHREAD_COND_T 1 - typedef struct pthread_cond_t - { -#if 0 - /* Concurrent access protection. */ - struct _pthread_fastlock __c_lock; - - /* Pool of threads waiting. */ - _pthread_descr __c_waiting; -#endif - int a; - - } pace_pthread_cond_t; - -#endif /* PACE_PTHREAD_COND_T */ - -#ifndef PACE_PTHREAD_CONDATTR_T -#define PACE_PTHREAD_CONDATTR_T 1 - typedef struct pthread_condattr_t - { - int not_used_; - } pace_pthread_condattr_t; -#endif /* PACE_PTHREAD_CONDATTR_T */ - -#ifndef PACE_PTHREAD_KEY_T -#define PACE_PTHREAD_KEY_T 1 - typedef unsigned int pthread_key_t; - typedef pthread_key_t pace_pthread_key_t; -#endif /* PACE_PTHREAD_KEY_T */ - -#ifndef PACE_PTHREAD_MUTEX_T -#define PACE_PTHREAD_MUTEX_T 1 - typedef struct pthread_mutex_t - { - /* Depth of recursive locking */ - int recursive_count_; - -#if 0 - /* Owner thread (if recursive or errcheck) */ - _pthread_descr __m_owner; -#endif - - /* Mutex kind: fast, recursive or errcheck */ - int type_; - - union - { - HANDLE proc_mutex_; - CRITICAL_SECTION thr_mutex_; - }; - -#if 0 - /* Underlying fast lock */ - struct _pthread_fastlock __m_lock; -#endif - - } pace_pthread_mutex_t; -#endif /* PACE_PTHREAD_MUTEX_T */ - -#ifndef PACE_PTHREAD_MUTEXATTR_T -#define PACE_PTHREAD_MUTEXATTR_T - typedef struct pthread_mutexattr_t - { - int mutex_kind_; - } pace_pthread_mutexattr_t; -#endif /* PACE_PTHREAD_MUTEXATTR_T */ - -#ifndef PACE_PTHREAD_ONCE -#define PACE_PTHREAD_ONCE - - typedef int pthread_once_t; - typedef pthread_once_t pace_pthread_once_t; - -#endif /* PACE_PTHREAD_ONCE */ - -#ifndef PACE_PTHREAD_T -#define PACE_PTHREAD_T - typedef HANDLE pace_pthread_t; - typedef DWORD pace_idpthread_t; -#endif /* PACE_PTHREAD_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_PTHREADTYPES_H_WIN32 */ diff --git a/PACE/pace/win32/pwd.c b/PACE/pace/win32/pwd.c deleted file mode 100644 index bb58fd5ce40..00000000000 --- a/PACE/pace/win32/pwd.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/pwd.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/pwd.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/pwd.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/pwd.h b/PACE/pace/win32/pwd.h deleted file mode 100644 index f66e326d96c..00000000000 --- a/PACE/pace/win32/pwd.h +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/pwd.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_PWD_H_WIN32 -#define PACE_PWD_H_WIN32 - -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_PASSWD -#define PACE_PASSWD - typedef struct passwd { int a_; } pace_passwd; -#endif /* PACE_PASSWD */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_PWD_H_WIN32 */ diff --git a/PACE/pace/win32/pwd.inl b/PACE/pace/win32/pwd.inl deleted file mode 100644 index 24e9f7b1f10..00000000000 --- a/PACE/pace/win32/pwd.inl +++ /dev/null @@ -1,72 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/pwd.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_passwd * -pace_getpwuid (pace_uid_t uid) -{ - pace_passwd * retval = (pace_passwd*)0; - PACE_UNUSED_ARG (uid); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getpwuid_r (pace_uid_t uid, - pace_passwd * pwd, - char * buffer, - pace_size_t bufsize, - pace_passwd ** result) -{ - PACE_UNUSED_ARG (uid); - PACE_UNUSED_ARG (pwd); - PACE_UNUSED_ARG (buffer); - PACE_UNUSED_ARG (bufsize); - PACE_UNUSED_ARG (result); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ - -#if (PACE_HAS_POSIX_SD_UOF) -PACE_INLINE -pace_passwd * -pace_getpwnam (const char * name) -{ - pace_passwd * retval = (pace_passwd*)0; - PACE_UNUSED_ARG (name); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_SD_UOF */ - -#if (PACE_HAS_POSIX_SDR_UOF) -PACE_INLINE -int -pace_getpwnam_r (const char * name, - pace_passwd * pwd, - char * buffer, - pace_size_t bufsize, - pace_passwd ** result) -{ - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (pwd); - PACE_UNUSED_ARG (buffer); - PACE_UNUSED_ARG (bufsize); - PACE_UNUSED_ARG (result); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SDR_UOF */ diff --git a/PACE/pace/win32/sched.c b/PACE/pace/win32/sched.c deleted file mode 100644 index 9438ab245c5..00000000000 --- a/PACE/pace/win32/sched.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/sched.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sched.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/sched.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/sched.h b/PACE/pace/win32/sched.h deleted file mode 100644 index 6c04ae6b995..00000000000 --- a/PACE/pace/win32/sched.h +++ /dev/null @@ -1,34 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/sched.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SCHED_H_WIN32 -#define PACE_SCHED_H_WIN32 - - /* These definitions are used in other files. - * Separate the declarations from the definitions to avoid circular - * inclusion. ie: some other funcs just need the typedefs and structs. */ - -#include "pace/win32/schedtypes.h" -#include "pace/time.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SCHED_H_WIN32 */ diff --git a/PACE/pace/win32/sched.inl b/PACE/pace/win32/sched.inl deleted file mode 100644 index 06577337db6..00000000000 --- a/PACE/pace/win32/sched.inl +++ /dev/null @@ -1,103 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/sched.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_get_priority_max (int policy) -{ - PACE_UNUSED_ARG (policy); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_get_priority_min (int policy) -{ - PACE_UNUSED_ARG (policy); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_getparam (pace_pid_t pid, - pace_sched_param * param) -{ - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (param); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_rr_get_interval (pace_pid_t pid, - pace_timespec * interval) -{ - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (interval); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_setparam (pace_pid_t pid, - const pace_sched_param * param) -{ - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (param); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_getscheduler (pace_pid_t pid) -{ - PACE_UNUSED_ARG (pid); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_setscheduler (pace_pid_t pid, - int policy, - const pace_sched_param * param) -{ - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (policy); - PACE_UNUSED_ARG (param); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sched_yield () -{ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/schedtypes.h b/PACE/pace/win32/schedtypes.h deleted file mode 100644 index b3358e0c5db..00000000000 --- a/PACE/pace/win32/schedtypes.h +++ /dev/null @@ -1,67 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/schedtypes.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -/* Keep sched types defined here as they need to be in more than one - * file and otherwise cause circular dependencies. - - * Do NOT include this file directly!! Please include "pace/sched.h". */ - -#ifndef PACE_SYS_SCHEDTYPES_H_WIN32 -#define PACE_SYS_SCHEDTYPES_H_WIN32 - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - /* These are defined via POSIX, but win32 is not POSIX compliant! - * So please forgive me for these (non pace prefix) sins! */ - -#ifndef SCHED_OTHER -#define SCHED_OTHER 0 -#endif /* SCHED_RR */ - -#ifndef SCHED_FIFO -#define SCHED_FIFO 1 -#endif /* SCHED_FIFO */ - -#ifndef SCHED_RR -#define SCHED_RR 2 -#endif /* SCHED_RR */ - -#ifndef PACE_SCHED_OTHER -#define PACE_SCHED_OTHER SCHED_OTHER -#endif /* PACE_SCHED_OTHER */ - -#ifndef PACE_SCHED_FIFO -#define PACE_SCHED_FIFO SCHED_FIFO -#endif /* PACE_SCHED_FIFO */ - -#ifndef PACE_SCHED_RR -#define PACE_SCHED_RR SCHED_RR -#endif /* PACE_SCHED_RR */ - -#ifndef PACE_SCHED_PARAM -#define PACE_SCHED_PARAM 1 - typedef struct sched_param - { - int sched_priority; - } pace_sched_param; -#endif - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_SCHEDTYPES_H_WIN32 */ diff --git a/PACE/pace/win32/semaphore.c b/PACE/pace/win32/semaphore.c deleted file mode 100644 index 23728df5c29..00000000000 --- a/PACE/pace/win32/semaphore.c +++ /dev/null @@ -1,122 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/semaphore.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/semaphore.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/semaphore.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -# include -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -sem_close (pace_sem_t * sem) -{ - PACE_WIN32CALL_RETURN - (PACE_ADAPT_RETVAL - (CloseHandle (sem), pace_result_), int, -1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -sem_destroy (pace_sem_t * sem) -{ - PACE_WIN32CALL_RETURN - (PACE_ADAPT_RETVAL - (CloseHandle (sem), pace_result_), int, -1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -sem_init (pace_sem_t * sem, int pshared, unsigned int value) -{ - PACE_UNUSED_ARG (pshared); - - /* Create the semaphore with its value initialized to and - its maximum value initialized to . - - How do we want to call CreateSemaphore? What about the char *? - */ - *sem = CreateSemaphore (0, value, 2147483647, "noname"); - - if (*sem == 0) - { - PACE_FAIL_RETURN (-1); - } - /* NOTREACHED */ - else - { - return 0; - } -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -sem_post (pace_sem_t * sem) -{ - PACE_WIN32CALL_RETURN - (PACE_ADAPT_RETVAL - (ReleaseSemaphore (*sem, 1, 0), pace_result_), int, -1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -sem_trywait (pace_sem_t * sem) -{ - int result = WaitForSingleObject (*sem, 0); - - if (result == WAIT_OBJECT_0) - { - return 0; - } - else - { - if (result == WAIT_TIMEOUT) - { - errno = EBUSY; - } - else - { - errno = GetLastError (); - } - /* This is a hack, we need to find an appropriate mapping... */ - return -1; - } -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -sem_wait (pace_sem_t * sem) -{ - switch (WaitForSingleObject (*sem, INFINITE)) - { - case WAIT_OBJECT_0: - return 0; - default: - /* This is a hack, we need to find an appropriate mapping... */ - errno = GetLastError (); - return -1; - } -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - diff --git a/PACE/pace/win32/semaphore.h b/PACE/pace/win32/semaphore.h deleted file mode 100644 index 7abd89211f0..00000000000 --- a/PACE/pace/win32/semaphore.h +++ /dev/null @@ -1,62 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/semaphore.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SEMAPHORE_H_WIN32 -#define PACE_SEMAPHORE_H_WIN32 - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_SEM_T -#define PACE_SEM_T - typedef HANDLE pace_sem_t; -#endif /* PACE_SEM_T */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int sem_close (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int sem_destroy (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int sem_init (pace_sem_t * sem, int pshared, unsigned int value); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_INLINE pace_sem_t * sem_open (const char * name, int oflag, ...); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int sem_post (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int sem_trywait (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int sem_wait (pace_sem_t * sem); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SEMAPHORE_H_WIN32 */ diff --git a/PACE/pace/win32/semaphore.inl b/PACE/pace/win32/semaphore.inl deleted file mode 100644 index dea94013317..00000000000 --- a/PACE/pace/win32/semaphore.inl +++ /dev/null @@ -1,108 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/semaphore.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_close (pace_sem_t * sem) -{ - return sem_close (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_destroy (pace_sem_t * sem) -{ - return sem_destroy (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_getvalue (pace_sem_t * sem, int * sval) -{ - PACE_UNUSED_ARG (sem); - PACE_UNUSED_ARG (sval); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_init (pace_sem_t * sem, - int pshared, - unsigned int value) -{ - return sem_init (sem, pshared, value); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_sem_t * -pace_sem_open (const char * name, int oflag, ...) -{ - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (oflag); - return (pace_sem_t)NULL; -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_post (pace_sem_t * sem) -{ - return sem_post (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_trywait (pace_sem_t * sem) -{ - return sem_trywait (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_unlink (const char * name) -{ -#if defined (__BORLANDC__) - return unlink (name); -#else /* __BORLANDC__ */ - return _unlink (name); -#endif /* __BORLANDC__ */ -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sem_wait (pace_sem_t * sem) -{ - return sem_wait (sem); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - diff --git a/PACE/pace/win32/setjmp.c b/PACE/pace/win32/setjmp.c deleted file mode 100644 index b245f6fe3c1..00000000000 --- a/PACE/pace/win32/setjmp.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/setjmp.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/setjmp.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/setjmp.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/setjmp.h b/PACE/pace/win32/setjmp.h deleted file mode 100644 index bd8b44ad1fd..00000000000 --- a/PACE/pace/win32/setjmp.h +++ /dev/null @@ -1,42 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/setjmp.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SETJMP_H_WIN32 -#define PACE_SETJMP_H_WIN32 - -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -# define PACE_SIGJLEN 128 - -# ifndef PACE_JMP_BUF -# define PACE_JMP_BUF - typedef jmp_buf pace_jmp_buf; -#endif /* PACE_JMP_BUF */ - -# ifndef PACE_SIGJMP_BUF -# define PACE_SIGJMP_BUF - typedef long sigjmp_buf[PACE_SIGJLEN]; - typedef sigjmp_buf pace_sigjmp_buf; -#endif /* PACE_SIGJMP_BUF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SETJMP_H_WIN32 */ diff --git a/PACE/pace/win32/setjmp.inl b/PACE/pace/win32/setjmp.inl deleted file mode 100644 index d3be714dfd4..00000000000 --- a/PACE/pace/win32/setjmp.inl +++ /dev/null @@ -1,36 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/setjmp.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_longjmp (pace_jmp_buf env, int val) -{ - longjmp (env, val); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -void -pace_siglongjmp (pace_sigjmp_buf env, int val) -{ - PACE_UNUSED_ARG (env); - PACE_UNUSED_ARG (val); - PACE_ERRNO_NO_SUPPORT (); - return; -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ diff --git a/PACE/pace/win32/signal.c b/PACE/pace/win32/signal.c deleted file mode 100644 index f0d1685971a..00000000000 --- a/PACE/pace/win32/signal.c +++ /dev/null @@ -1,45 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/signal.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/signal.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/signal.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_POSIX_SIG_UOF) -int -sigaction (int sig, const pace_sigaction_s * act, - pace_sigaction_s * oact) -{ - pace_sigaction_s sa; - - if (oact == 0) - { - oact = &sa; - } - - if (act == 0) - { - oact->sa_handler = signal (sig, SIG_IGN); - signal (sig, oact->sa_handler); - } - else - { - oact->sa_handler = signal (sig, act->sa_handler); - } - return (oact->sa_handler == SIG_ERR ? -1 : 0); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ diff --git a/PACE/pace/win32/signal.h b/PACE/pace/win32/signal.h deleted file mode 100644 index 8795f8726b6..00000000000 --- a/PACE/pace/win32/signal.h +++ /dev/null @@ -1,81 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/signal.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - - -#ifndef PACE_SIGNAL_H_WIN32 -#define PACE_SIGNAL_H_WIN32 - -#include "pace/sys/types.h" -#include "pace/time.h" -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_SIGATOMIC_T -#define PACE_SIGATOMIC_T - typedef sig_atomic_t pace_sig_atomic_t; -#endif /* PACE_SIGATOMIC_T */ - -#ifndef PACE_SIGSET_T -#define PACE_SIGSET_T - enum { PACE_SIG_BITS = 4 }; - typedef struct /* sigset_t */ { - /* signal set type */ - unsigned int sigbits_[PACE_SIG_BITS]; - } pace_sigset_t; -#endif /* PACE_SIGSET_T */ - -#ifndef PACE_SIGACTION_S -#define PACE_SIGACTION_S - typedef void (__cdecl *pace_sig_pf)(int); - typedef struct /* sigaction */ { - int sa_flags; - pace_sig_pf sa_handler; - pace_sigset_t sa_mask; - } pace_sigaction_s; -#endif /* PACE_SIGACTION_S */ - -#ifndef PACE_SIGINFO_T -#define PACE_SIGINFO_T - typedef struct /* siginfo_t */ { - - PACE_HANDLE si_handle_; - // Win32 HANDLE that has become signaled. - - PACE_HANDLE *si_handles_; - // Array of Win32 HANDLEs all of which have become signaled. - } pace_siginfo_t; -# endif /* PACE_SIGINFO_T */ - -#ifndef PACE_SIGEVENT - typedef struct sigevent pace_sigevent; -#endif /* PACE_SIGEVENT */ - -#ifndef PACE_SIGVAL - typedef union sigval pace_sigval; -#endif /* PACE_SIGVAL */ - -#if (PACE_HAS_POSIX_SIG_UOF) - int sigaction (int sig, const pace_sigaction_s * act, - pace_sigaction_s * oact); -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SIGNAL_H_WIN32 */ diff --git a/PACE/pace/win32/signal.inl b/PACE/pace/win32/signal.inl deleted file mode 100644 index 437d609f926..00000000000 --- a/PACE/pace/win32/signal.inl +++ /dev/null @@ -1,193 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/signal.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_kill (pace_pid_t pid, int sig) -{ - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (sig); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_raise (int sig) -{ - PACE_UNUSED_ARG (sig); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigaction (int sig, const pace_sigaction_s * act, - pace_sigaction_s * oact) -{ - return sigaction (sig, act, oact); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigaddset (pace_sigset_t * set, int signo) -{ - PACE_UNUSED_ARG (set); - PACE_UNUSED_ARG (signo); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigemptyset (pace_sigset_t * set) -{ - PACE_UNUSED_ARG (set); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigdelset (pace_sigset_t * set, int signo) -{ - PACE_UNUSED_ARG (set); - PACE_UNUSED_ARG (signo); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigfillset (pace_sigset_t * set) -{ - /* PACE_SIG_BITS is an enum defined in PACE/pace/win32/signal.inl */ - int i = 0; - for ( ; i < PACE_SIG_BITS; ++i) - { - set->sigbits_[i] = ~(unsigned int)0; - } - return 0; -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigismember (const pace_sigset_t * set, int signo) -{ - PACE_UNUSED_ARG (set); - PACE_UNUSED_ARG (signo); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void -(*pace_signal(int sig, void (*func)(int)))(int) -{ - return signal (sig, func); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigpending (pace_sigset_t * set) -{ - PACE_UNUSED_ARG (set); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigprocmask (int how, const pace_sigset_t * set, - pace_sigset_t * oset) -{ - PACE_UNUSED_ARG (how); - PACE_UNUSED_ARG (set); - PACE_UNUSED_ARG (oset); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigqueue (pace_pid_t pid, int signo, - const pace_sigval value) -{ - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (signo); - PACE_UNUSED_ARG (value); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_sigsuspend (const pace_sigset_t * sigmask) -{ - PACE_UNUSED_ARG (sigmask); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigtimedwait (const pace_sigset_t * set, pace_siginfo_t * info, - const pace_timespec * timeout) -{ - PACE_UNUSED_ARG (set); - PACE_UNUSED_ARG (info); - PACE_UNUSED_ARG (timeout); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigwait (const pace_sigset_t * set, int * sig) -{ - PACE_UNUSED_ARG (set); - PACE_UNUSED_ARG (sig); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_sigwaitinfo (const pace_sigset_t * set, pace_siginfo_t * info) -{ - PACE_UNUSED_ARG (set); - PACE_UNUSED_ARG (info); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/socket.c b/PACE/pace/win32/socket.c deleted file mode 100644 index 682a843fe1b..00000000000 --- a/PACE/pace/win32/socket.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * $Id$ - */ - -#include "pace/sys/socket.h" - -/* - * Empty for win32. - */ diff --git a/PACE/pace/win32/socket.h b/PACE/pace/win32/socket.h deleted file mode 100644 index bfaaaab9953..00000000000 --- a/PACE/pace/win32/socket.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * $Id$ - * - * Empty for win32. - */ diff --git a/PACE/pace/win32/socket.inl b/PACE/pace/win32/socket.inl deleted file mode 100644 index 62d778da847..00000000000 --- a/PACE/pace/win32/socket.inl +++ /dev/null @@ -1,7 +0,0 @@ -/* - * $Id$ - */ - -/* - * Empty for win32. - */ diff --git a/PACE/pace/win32/stat.c b/PACE/pace/win32/stat.c deleted file mode 100644 index 1f2bb2fabe5..00000000000 --- a/PACE/pace/win32/stat.c +++ /dev/null @@ -1,40 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/stat.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/stat.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/stat.inl" -#endif /* ! PACE_HAS_INLINE */ - -#include -#include - -#if (PACE_HAS_POSIX_FS_UOF) -int -pace_win32_mkdir (const char * path, pace_mode_t mode) -{ - PACE_UNUSED_ARG (mode); -# if defined (__IBMCPP__) && (__IBMCPP__ >= 400) - PACE_OSCALL_RETURN (_mkdir ((char *) path), int, -1); -# elif defined (PACE_WINCE) - PACE_WIN32CALL_RETURN - (PACE_ADAPT_RETVAL - (CreateDirectory (path, NULL), pace_result_), int, -1); -# else - PACE_OSCALL_RETURN (_mkdir (path), int, -1); -# endif /* PACE_WIN32 */ -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/win32/stat.h b/PACE/pace/win32/stat.h deleted file mode 100644 index e05363468ad..00000000000 --- a/PACE/pace/win32/stat.h +++ /dev/null @@ -1,65 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/stat.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_STAT_H_WIN32 -#define PACE_SYS_STAT_H_WIN32 - -#include "pace/sys/types.h" -#include -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_S_IRGRP S_IRGRP -#define PACE_S_IROTH S_IROTH -#define PACE_S_IRUSR S_IRUSR -#define PACE_S_IRWXG S_IRWXG -#define PACE_S_IRWXO S_IRWXO -#define PACE_S_IRWXU S_IRWXU -#define PACE_S_ISBLK S_ISBLK -#define PACE_S_ISCHR S_ISCHR -#define PACE_S_ISDIR S_ISDIR -#define PACE_S_ISFIFO S_ISFIFO -#define PACE_S_ISGID S_SIGID -#define PACE_S_ISREG S_ISREG -#define PACE_S_ISUID S_ISUID -#define PACE_S_IWGRP S_IWGRP -#define PACE_S_IWOTH S_IWOTH -#define PACE_S_IWUSR S_IWUSR -#define PACE_S_IXGRP S_IXGRP -#define PACE_S_IXOTH S_IXOTH -#define PACE_S_IXUSR S_IXUSR -#define PACE_S_TYPEISMQ S_TYPEISMQ -#define PACE_S_TYPEISSEM S_TYPEISSEM -#define PACE_S_TYPEISMQ S_TYPEISMQ -#define PACE_S_TYPEISSEM S_TYPEISSEM -#define PACE_S_TYPEISSHM S_TYPEISSHM - -#ifndef PACE_STAT -#define PACE_STAT - typedef struct stat pace_stat_s; -#endif /* PACE_STAT */ - -#if (PACE_HAS_POSIX_FS_UOF) - int pace_win32_mkdir (const char * path, pace_mode_t mode); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_STAT_H_WIN32 */ diff --git a/PACE/pace/win32/stat.inl b/PACE/pace/win32/stat.inl deleted file mode 100644 index 4ebc17eed86..00000000000 --- a/PACE/pace/win32/stat.inl +++ /dev/null @@ -1,99 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/stat.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_FA_UOF) -PACE_INLINE -int -pace_chmod (const char * path, pace_mode_t mode) -{ - PACE_UNUSED_ARG (path); - PACE_UNUSED_ARG (mode); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FA_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fchmod (PACE_HANDLE fildes, pace_mode_t mode) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (mode); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_fstat (PACE_HANDLE fildes, pace_stat_s * buf) -{ - /* There are two impl in ACE. This is the simpler. But requires - * you to close the temporary file desc. */ - int retval = -1; - int fd = _open_osfhandle ((long) fildes, 0); - if (fd != -1) - { - retval = _fstat (fd, (struct _stat *) buf); - } - - _close (fd); - - /* Remember to close the file handle. */ - return retval; -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_mkdir (const char * path, pace_mode_t mode) -{ - return pace_win32_mkdir (path, mode); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_F_UOF) -PACE_INLINE -int -pace_mkfifo (const char * path, pace_mode_t mode) -{ - PACE_UNUSED_ARG (path); - PACE_UNUSED_ARG (mode); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_F_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_stat (const char * path, pace_stat_s * buf) -{ - return _stat (path, (struct _stat *)buf); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FA_UOF) -PACE_INLINE -pace_mode_t -pace_umask (pace_mode_t cmask) -{ -#if defined (__BORLANDC__) - return umask (cmask); -#else /* __BORLANDC__ */ - return _umask (cmask); -#endif /* __BORLANDC__ */ -} -#endif /* PACE_HAS_POSIX_FA_UOF */ diff --git a/PACE/pace/win32/stdio.c b/PACE/pace/win32/stdio.c deleted file mode 100644 index 3aae70d32ca..00000000000 --- a/PACE/pace/win32/stdio.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/stdio.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/stdio.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/stdio.inl" -#endif /* ! PACE_HAS_INLINE */ - - -#if (PACE_HAS_POSIX_FM_UOF) -int -pace_win32_fseek (FILE * stream, long offset, int whence) -{ -# if SEEK_SET != FILE_BEGIN \ - || SEEK_CUR != FILE_CURRENT \ - || SEEK_END != FILE_END - //#error Windows NT is evil AND rude! - switch (whence) - { - case SEEK_SET: - whence = FILE_BEGIN; - break; - case SEEK_CUR: - whence = FILE_CURRENT; - break; - case SEEK_END: - whence = FILE_END; - break; - default: - errno = EINVAL; - return -1; // rather safe than sorry - } -# endif /* SEEK_SET != FILE_BEGIN - || SEEK_CUR != FILE_CURRENT - || SEEK_END != FILE_END */ - PACE_OSCALL_RETURN (fseek (stream, offset, whence), int, -1); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ diff --git a/PACE/pace/win32/stdio.h b/PACE/pace/win32/stdio.h deleted file mode 100644 index f765305c77c..00000000000 --- a/PACE/pace/win32/stdio.h +++ /dev/null @@ -1,90 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/stdio.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STDIO_H_WIN32 -#define PACE_STDIO_H_WIN32 - -#include -#include - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - typedef FILE PACE_FILE; - typedef fpos_t pace_fpos_t; - -# ifndef PACE_BUSIZ -# define PACE_BUFSIZ BUFSIZ -# endif /* PACE_BUFSIZ */ - -# ifndef PACE_EOF -# define PACE_EOF EOF -# endif /* PACE_EOF */ - -# ifndef PACE_FILENAME_MAX -# define PACE_FILENAME_MAX FILENAME_MAX -# endif /* PACE_FILENAME_MAX */ - -# ifndef PACE_L_ctermid -# define PACE_L_ctermid L_ctermid -# endif /* PACE_L_ctermid */ - -# ifndef PACE_L_cuserid -# define PACE_L_cuserid L_cuserid -# endif /* PACE_L_cuserid */ - -# ifndef PACE_NULL -# define PACE_NULL NULL -# endif /* PACE_NULL */ - -# ifndef PACE_SEEK_CUR -# define PACE_SEEK_CUR SEEK_CUR -# endif /* PACE_SEEK_CUR */ - -# ifndef PACE_SEEK_END -# define PACE_SEEK_END SEEK_END -# endif /* PACE_SEEK_END */ - -# ifndef PACE_SEEK_SET -# define PACE_SEEK_SET SEEK_SET -# endif /* PACE_SEEK_SET */ - -# ifndef PACE_TMP_MAX -# define PACE_TMP_MAX TMP_MAX -# endif /* PACE_TMP_MAX */ - -# ifndef pace_stderr -# define pace_stderr stderr -# endif /* pace_stderr */ - -# ifndef pace_stdout -# define pace_stdout stdout -# endif /* pace_stdout */ - -# ifndef pace_stdin -# define pace_stdin stdin -# endif - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T 1 - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STDIO_H_WIN32 */ diff --git a/PACE/pace/win32/stdio.inl b/PACE/pace/win32/stdio.inl deleted file mode 100644 index 180140149b9..00000000000 --- a/PACE/pace/win32/stdio.inl +++ /dev/null @@ -1,464 +0,0 @@ -/* $Id$ -*- C -*- - - * =========================================================================== - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/stdio.inl - * - * = AUTHOR - * Luther Baker - * - * =========================================================================== */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -void -pace_clearerr (FILE * stream) -{ - clearerr (stream); - return; -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fclose (FILE * stream) -{ - return fclose (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -char * -pace_ctermid (char * s) -{ - char * retval = (char*)0; - PACE_UNUSED_ARG (s); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -FILE * -pace_fdopen (int fildes, - const char * type) -{ -#if defined (__BORLANDC__) - return fdopen (fildes, (char *)type); -#else /* __BORLANDC__ */ - return fdopen (fildes, type); -#endif /* __BORLANDC__ */ -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_ferror (FILE * stream) -{ - return ferror (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_feof (FILE * stream) -{ - return feof (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fflush (FILE * stream) -{ - return fflush (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fileno (FILE * stream) -{ - return fileno (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fgetc (FILE * stream) -{ - return fgetc (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fgetpos(PACE_FILE * stream, - pace_fpos_t * pos) -{ - return fgetpos (stream, pos); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -char * -pace_fgets (char * s, - int n, - FILE * stream) -{ - return fgets (s, n, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -void -pace_flockfile (FILE * file) -{ - PACE_UNUSED_ARG (file); - PACE_ERRNO_NO_SUPPORT (); - return; -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -FILE * -pace_fopen (const char * filename, - const char * mode) -{ - return fopen (filename, mode); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fputc (int c, FILE * stream) -{ - return fputc (c, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_fputs (const char * s, FILE * stream) -{ - return fputs (s, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -size_t -pace_fread (void * ptr, - size_t size, - size_t number_of_items, - FILE * stream) -{ - return fread (ptr, - size, - number_of_items, - stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -FILE * -pace_freopen (const char * filename, - const char * mode, - FILE * stream) -{ - return freopen (filename, mode, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -int -pace_fseek (FILE * stream, - long offset, - int whence) -{ - return fseek (stream, offset, whence); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fsetpos(PACE_FILE * stream, const pace_fpos_t * pos) -{ - return fsetpos (stream, pos); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -long -pace_ftell (FILE * stream) -{ - return ftell (stream); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_ftrylockfile (FILE * file) -{ - PACE_UNUSED_ARG (file); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -void -pace_funlockfile (FILE * file) -{ - PACE_UNUSED_ARG(file); - PACE_ERRNO_NO_SUPPORT (); - return; -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -pace_size_t -pace_fwrite(const void * ptr, - pace_size_t size, pace_size_t nmemb, - PACE_FILE * stream) -{ - return fwrite (ptr, size, nmemb, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_getc (FILE * stream) -{ - return getc (stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_getc_unlocked (FILE * stream) -{ - PACE_UNUSED_ARG (stream); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_getchar () -{ - return getchar (); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_getchar_unlocked () -{ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -char * -pace_gets (char * s) -{ - return gets (s); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -void -pace_perror (const char * s) -{ - perror (s); - return; -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_putc (int c, FILE * stream) -{ - return putc (c, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_putc_unlocked (int c, - FILE * stream) -{ - PACE_UNUSED_ARG (c); - PACE_UNUSED_ARG (stream); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_putchar (int c) -{ - return putchar (c); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FL_UOF) -PACE_INLINE -int -pace_putchar_unlocked (int c) -{ - PACE_UNUSED_ARG(c); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FL_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_puts (const char * s) -{ - return puts (s); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_remove (const char * path) -{ - return remove (path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_rename (const char * old_name, - const char * new_name) -{ - return rename (old_name, new_name); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -void -pace_rewind (FILE * stream) -{ - rewind (stream); - return; -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -void -pace_setbuf (FILE * stream, char * buf) -{ - setbuf (stream, buf); - return; -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_setvbuf(PACE_FILE * stream, - char * buf, - int mode, pace_size_t size) -{ - return setvbuf (stream, buf, mode, size); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -FILE * -pace_tmpfile () -{ - return tmpfile (); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -char * -pace_tmpnam (char * s) -{ - return tmpnam (s); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_ungetc (int c, FILE * stream) -{ - return ungetc (c, stream); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_vfprintf (PACE_FILE * stream, - const char * format, - va_list arg) -{ - return vfprintf (stream, format, arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_vprintf (const char * format, - va_list arg) -{ - return vprintf (format, arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_vsprintf (char * s, - const char * format, - va_list arg) -{ - return vsprintf (s, format, arg); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/stdlib.c b/PACE/pace/win32/stdlib.c deleted file mode 100644 index 2d6f593e75d..00000000000 --- a/PACE/pace/win32/stdlib.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/stdlib.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/stdlib.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/stdlib.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/stdlib.h b/PACE/pace/win32/stdlib.h deleted file mode 100644 index 01a93eded34..00000000000 --- a/PACE/pace/win32/stdlib.h +++ /dev/null @@ -1,63 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/stdlib.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STDLIB_H_WIN32 -#define PACE_STDLIB_H_WIN32 - -#include -#include "pace/unistd.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - - typedef div_t pace_div_t; - typedef ldiv_t pace_ldiv_t; - -# ifndef PACE_EXIT_FAILURE -# define PACE_EXIT_FAILURE EXIT_FAILURE -# endif /* PACE_EXIT_FAILURE */ - -# ifndef PACE_EXIT_SUCCESS -# define PACE_EXIT_SUCCESS EXIT_SUCCESS -# endif /* PACE_EXIT_SUCCESS */ - -# ifndef PACE_MB_CUR_MAX -# define PACE_MB_CUR_MAX MB_CUR_MAX -# endif /* PACE_MB_CUR_MAX */ - -# ifndef PACE_NULL -# define PACE_NULL NULL -# endif /* PACE_NULL */ - -# ifndef PACE_RAND_MAX -# define PACE_RAND_MAX RAND_MAX -# endif /* PACE_RAND_MAX */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T 1 - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_WCHAR_T -#define PACE_WCHAR_T 1 - typedef wchar_t pace_wchar_t; -#endif /* PACE_WCHAR_T */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STDLIB_H_WIN32 */ diff --git a/PACE/pace/win32/stdlib.inl b/PACE/pace/win32/stdlib.inl deleted file mode 100644 index 3597e1954dc..00000000000 --- a/PACE/pace/win32/stdlib.inl +++ /dev/null @@ -1,303 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/stdlib.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -void -pace_abort (void) -{ - abort (); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_abs (int val) -{ - return abs (val); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_atexit (void (*func)(void)) -{ - return atexit (func); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -double -pace_atof (const char * str) -{ - return atof (str); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_atoi (const char * str) -{ - return atoi (str); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -long -pace_atol (const char * str) -{ - return atol (str); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_bsearch (const void *key, const void *base, - size_t nel, size_t size, - int (*compar)(const void *,const void *)) -{ - return bsearch (key, base, nel, size, compar); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_div_t -pace_div (int numer, int denom) -{ - return div (numer, denom); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -void -pace_exit (int status) -{ - exit (status); - return; -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -char * -pace_getenv (const char * name) -{ - return getenv (name); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -long int -pace_labs (long int j) -{ - return labs (j); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_ldiv_t -pace_ldiv (long int numer, long int denom) -{ - return ldiv (numer, denom); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mblen (const char* s, pace_size_t n) -{ - return mblen (s, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_size_t -pace_mbstowcs (pace_wchar_t* pwcs, - const char* s, - pace_size_t n) -{ - return mbstowcs (pwcs, s, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_mbtowc (pace_wchar_t* pwc, - const char* s, - pace_size_t n) -{ - return mbtowc (pwc, s, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_qsort (void * base, size_t nel, size_t width, - int (*compar)(const void *, const void *)) -{ - qsort (base, nel, width, compar); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_rand () -{ - return rand (); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_srand (unsigned int seed) -{ - srand (seed); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -int -pace_rand_r (unsigned int *seed) -{ - PACE_UNUSED_ARG (seed); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -double -pace_strtod (const char* nptr, - char** endptr) -{ - return strtod (nptr, endptr); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_strtol (const char* nptr, - char** endptr, - int base) -{ - return strtol (nptr, endptr, base); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -unsigned long int -pace_strtoul (const char* nptr, - char** endptr, - int base) -{ - return strtoul (nptr, endptr, base); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_system (const char* string) -{ - PACE_UNUSED_ARG (string); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} - -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_size_t -pace_wcstombs (char* s, - const pace_wchar_t* pwcs, - pace_size_t n) -{ - return wcstombs (s, pwcs, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_wctomb (char* s, pace_wchar_t wchar) -{ - return wctomb (s, wchar); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -/* Memory Management. */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_malloc (size_t size) -{ - return malloc (size); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_calloc (size_t nelem, size_t elsize) -{ - return calloc (nelem, elsize); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_free (void * ptr) -{ - free (ptr); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void * -pace_realloc (void * ptr, size_t size) -{ - return realloc (ptr, size); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - - - - diff --git a/PACE/pace/win32/string.c b/PACE/pace/win32/string.c deleted file mode 100644 index f7f79cc7fab..00000000000 --- a/PACE/pace/win32/string.c +++ /dev/null @@ -1,42 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/string.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/string.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/string.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -char * -strtok_r (char * s, const char * sep, char ** lasts) -{ - int l_org; - int l_sub; - - if (s == 0) - s = *lasts; - else - *lasts = s; - if (*s == 0) // We have reached the end - return 0; - l_org = pace_strlen (s); - l_sub = pace_strlen (s = pace_strtok (s, sep)); - *lasts = s + l_sub; - if (l_sub != l_org) - *lasts += 1; - return s ; -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ diff --git a/PACE/pace/win32/string.h b/PACE/pace/win32/string.h deleted file mode 100644 index fdc5be5ab96..00000000000 --- a/PACE/pace/win32/string.h +++ /dev/null @@ -1,42 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/string.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_STRING_H_WIN32 -#define PACE_STRING_H_WIN32 - -#include "pace/unistd.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#if !defined (PACE_NULL) -# define PACE_NULL NULL -#endif /* NULL */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -char * strtok_r (char * s, const char * sep, char ** lasts); -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_STRING_H_WIN32 */ diff --git a/PACE/pace/win32/string.inl b/PACE/pace/win32/string.inl deleted file mode 100644 index be669a7048c..00000000000 --- a/PACE/pace/win32/string.inl +++ /dev/null @@ -1,198 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/string.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memchr (const void *s, int c, pace_size_t n) -{ - return memchr (s, c, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_memcmp (const void *s1, const void *s2, pace_size_t n) -{ - return memcmp (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memcpy (void * s1, const void * s2, pace_size_t n) -{ - return memcpy (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memmove (void *s1, const void *s2, pace_size_t n) -{ - return memmove (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -void * -pace_memset (void *s, int c, pace_size_t n) -{ - return memset (s, c, n); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strcat (char * s1, const char * s2) -{ - return strcat (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strncat (char * s1, const char * s2, size_t n) -{ - return strncat (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strchr (const char * s, int c) -{ - return strchr (s, c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strrchr (const char * s, int c) -{ - return strrchr (s, c); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_strcmp (const char * s1, const char * s2) -{ - return strcmp (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -int -pace_strncmp (const char * s1, const char * s2, size_t n) -{ - return strncmp (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strcpy (char * s1, const char * s2) -{ - return strcpy (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strncpy (char * s1, const char * s2, size_t n) -{ - return strncpy (s1, s2, n); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strcspn (const char * s1, const char * s2) -{ - return strcspn (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strspn (const char * s1, const char * s2) -{ - return strspn (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strlen (const char * s) -{ - return strlen (s); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strpbrk (const char * s1, const char * s2) -{ - return strpbrk (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strstr (const char * s1, const char * s2) -{ - return strstr (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_strtok (char * s1, const char * s2) -{ - return strtok (s1, s2); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -char * -pace_strtok_r (char * s, const char * sep, char ** lasts) -{ - return strtok_r (s, sep, lasts); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - - diff --git a/PACE/pace/win32/termios.c b/PACE/pace/win32/termios.c deleted file mode 100644 index d5d32ced9a6..00000000000 --- a/PACE/pace/win32/termios.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/termios.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/termios.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/termios.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/termios.h b/PACE/pace/win32/termios.h deleted file mode 100644 index 8d491f5f460..00000000000 --- a/PACE/pace/win32/termios.h +++ /dev/null @@ -1,56 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/termios.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_TERMIOS_H_WIN32 -#define PACE_SYS_TERMIOS_H_WIN32 - -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS) */ - -#ifndef PACE_CC_T -#define PACE_CC_T - /* Temporary until we correctly emulate these funcs on WIN32. */ - typedef int cc_t; - typedef cc_t pace_cc_t; -#endif /* PACE_CC_T */ - -#ifndef PACE_SPEED_T -#define PACE_SPEED_T - /* Temporary until we correctly emulate these funcs on WIN32. */ - typedef int speed_t; - typedef speed_t pace_speed_t; -#endif /* PACE_SPEED_T */ - -#ifndef PACE_TCFLAG_T -#define PACE_TCFLAG_T - /* Temporary until we correctly emulate these funcs on WIN32. */ - typedef int tcflag_t; - typedef tcflag_t pace_tcflag_t; -#endif /* PACE_TCFLAG_T */ - -#ifndef PACE_TERMIOS -#define PACE_TERMIOS - /* Temporary until we correctly emulate these funcs on WIN32. */ - typedef struct termios { int a_; } pace_termios; -#endif /* PACE_TERMIOS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TERMIOS_H_WIN32 */ diff --git a/PACE/pace/win32/termios.inl b/PACE/pace/win32/termios.inl deleted file mode 100644 index 4b9905bff62..00000000000 --- a/PACE/pace/win32/termios.inl +++ /dev/null @@ -1,124 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/termios.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -speed_t -pace_cfgetospeed (const pace_termios * termiosp) -{ - PACE_UNUSED_ARG (termiosp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_cfsetospeed (pace_termios * termios_p, pace_speed_t speed) -{ - PACE_UNUSED_ARG (termios_p); - PACE_UNUSED_ARG (speed); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -speed_t -pace_cfgetispeed (const pace_termios * termios_p) -{ - PACE_UNUSED_ARG (termios_p); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_cfsetispeed (pace_termios * termios_p, pace_speed_t speed) -{ - PACE_UNUSED_ARG (termios_p); - PACE_UNUSED_ARG (speed); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcdrain (PACE_HANDLE fildes) -{ - PACE_UNUSED_ARG (fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcgetattr (PACE_HANDLE fildes, pace_termios * termios_p) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (termios_p); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcflow (PACE_HANDLE fildes, int action) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (action); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcflush (PACE_HANDLE fildes, int queue_selector) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (queue_selector); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcsendbreak (PACE_HANDLE fildes, int duration) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (duration); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_tcsetattr (PACE_HANDLE fildes, - int optional_actions, - const pace_termios * termios_p) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (optional_actions); - PACE_UNUSED_ARG (termios_p); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ diff --git a/PACE/pace/win32/time.c b/PACE/pace/win32/time.c deleted file mode 100644 index f5ed95f59fa..00000000000 --- a/PACE/pace/win32/time.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/time.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/time.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/time.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/time.h b/PACE/pace/win32/time.h deleted file mode 100644 index aeaf12e0771..00000000000 --- a/PACE/pace/win32/time.h +++ /dev/null @@ -1,107 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/time.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_TIME_H_WIN32 -#define PACE_TIME_H_WIN32 - -#include -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -# ifndef PACE_CLK_TCK -# define PACE_CLK_TCK CLK_TCK -# endif /* PACE_CLK_TCK */ - -# ifndef PACE_CLOCKS_PER_SEC -# define PACE_CLOCKS_PER_SEC CLOCKS_PER_SEC -# endif /* PACE_CLOCKS_PER_SEC */ - -# ifndef PACE_CLOCK_REALTIME -# define PACE_CLOCK_REALTIME CLOCK_REALTIME -# endif /* PACE_CLOCK_REALTIME */ - -# ifndef PACE_NULL -# define PACE_NULL NULL -# endif /* PACE_NULL */ - -# ifndef PACE_TIMER_ABSTIME -# define PACE_TIMER_ABSTIME TIMER_ABSTIME -# endif /* PACE_TIMER_ABSTIME */ - -#ifndef PACE_CLOCKID_T -#define PACE_CLOCKID_T 1 - typedef int clockid_t; - typedef clockid_t pace_clockid_t; -#endif /* PACE_CLOCKID_T */ - -#ifndef PACE_CLOCK_T -#define PACE_CLOCK_T 1 - typedef clock_t pace_clock_t; -#endif /* PACE_CLOCK_T */ - -#ifndef PACE_TIMER_T -#define PACE_TIMER_T 1 - typedef long timer_t; - typedef timer_t pace_timer_t; -#endif /* PACE_TIMER_T */ - -#ifndef PACE_TIME_T -#define PACE_TIME_T 1 - typedef time_t pace_time_t; -#endif /* PACE_TIME_T */ - -#ifndef PACE_TM -#define PACE_TM 1 - typedef struct tm pace_tm; -#endif /* PACE_TM */ - -#ifndef PACE_TIMESPEC -#define PACE_TIMESPEC 1 - typedef struct timespec pace_timespec; -#endif /* PACE_TIMESPEC */ - -#ifndef PACE_ITIMERSPEC -#define PACE_ITIMERSPEC 1 - typedef struct itimerspec pace_itimerspec; -#endif /* PACE_ITIMERSPEC */ - -#ifndef PACE_SIGVAL -#define PACE_SIGVAL 1 - typedef union sigval { - int sival_int; /* integer value */ - void * sival_ptr; /* pointer value */ -} pace_sigval; -#endif /* PACE_SIGVAL */ - -#ifndef PACE_SIGEVENT -#define PACE_SIGEVENT 1 - typedef struct sigevent { - int sigev_notify; /* notification mode */ - int sigev_signo; /* signal number */ - union sigval sigev_value; /* signal value */ - void (*sigev_notify_function)(union sigval); - pace_pthread_attr_t * sigev_notify_attributes; - int __sigev_pad2; - } pace_sigevent; -#endif /* PACE_SIGEVENT */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_TIME_H_WIN32 */ diff --git a/PACE/pace/win32/time.inl b/PACE/pace/win32/time.inl deleted file mode 100644 index 7550ef274ad..00000000000 --- a/PACE/pace/win32/time.inl +++ /dev/null @@ -1,265 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/time.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_asctime (const struct tm * time) -{ - return asctime (time); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -char * -pace_asctime_r (const struct tm * time, char * buf) -{ - char * retval = (char*)0; - PACE_UNUSED_ARG (time); - PACE_UNUSED_ARG (buf); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -pace_clock_t -pace_clock (void) -{ - return clock (); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -double -pace_difftime (pace_time_t time1, pace_time_t time2) -{ - return difftime (time1, time2); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_clock_getres (clockid_t clock_id, - struct timespec * res) -{ - PACE_UNUSED_ARG (clock_id); - PACE_UNUSED_ARG (res); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_clock_gettime (clockid_t clock_id, - struct timespec * tp) -{ - PACE_UNUSED_ARG (clock_id); - PACE_UNUSED_ARG (tp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_clock_settime (clockid_t clock_id, - const struct timespec * tp) -{ - PACE_UNUSED_ARG (clock_id); - PACE_UNUSED_ARG (tp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -char * -pace_ctime (const time_t * clock) -{ - return ctime (clock); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -char * -pace_ctime_r (const time_t * clock, char * buf) -{ - char * retval = (char*)0; - PACE_UNUSED_ARG (clock); - PACE_UNUSED_ARG (buf); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -struct tm * -pace_gmtime (const time_t * clock) -{ - return gmtime (clock); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -struct tm * -pace_gmtime_r (const time_t * clock, struct tm * result) -{ - struct tm * retval = (struct tm*)0; - PACE_UNUSED_ARG (clock); - PACE_UNUSED_ARG (result); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -struct tm * -pace_localtime (const time_t * clock) -{ - return localtime (clock); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLSR_UOF) -PACE_INLINE -struct tm * -pace_localtime_r (const time_t * clock, struct tm * result) -{ - struct tm * retval = (struct tm*)0; - PACE_UNUSED_ARG (clock); - PACE_UNUSED_ARG (result); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_CLSR_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -time_t -pace_mktime (struct tm * timeptr) -{ - return mktime (timeptr); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_nanosleep (const struct timespec * rqtp, - struct timespec * rmtp) -{ - PACE_UNUSED_ARG (rqtp); - PACE_UNUSED_ARG (rmtp); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -size_t -pace_strftime (char * s, size_t maxsize, - const char * format, - const struct tm * timeptr) -{ - return strftime (s, maxsize, format, timeptr); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -time_t -pace_time (time_t * tloc) -{ - return time (tloc); -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_create (clockid_t clock_id, - struct sigevent * evp, - pace_timer_t * timerid) -{ - PACE_UNUSED_ARG (clock_id); - PACE_UNUSED_ARG (evp); - PACE_UNUSED_ARG (timerid); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_delete (pace_timer_t timerid) -{ - PACE_UNUSED_ARG (timerid); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_getoverrun (pace_timer_t timerid) -{ - PACE_UNUSED_ARG (timerid); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_gettime (pace_timer_t timerid, - pace_itimerspec * value) -{ - PACE_UNUSED_ARG (timerid); - PACE_UNUSED_ARG (value); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_timer_settime (pace_timer_t timerid, - int flags, - const pace_itimerspec * value, - pace_itimerspec * ovalue) -{ - PACE_UNUSED_ARG (timerid); - PACE_UNUSED_ARG (flags); - PACE_UNUSED_ARG (value); - PACE_UNUSED_ARG (ovalue); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_CLS_UOF) -PACE_INLINE -void -pace_tzset () -{ - _tzset (); - return; -} -#endif /* PACE_HAS_POSIX_CLS_UOF */ diff --git a/PACE/pace/win32/times.c b/PACE/pace/win32/times.c deleted file mode 100644 index d699c0edd36..00000000000 --- a/PACE/pace/win32/times.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/times.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/times.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/times.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/times.h b/PACE/pace/win32/times.h deleted file mode 100644 index 26a500cbf76..00000000000 --- a/PACE/pace/win32/times.h +++ /dev/null @@ -1,40 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/times.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_TIMES_H_WIN32 -#define PACE_SYS_TIMES_H_WIN32 - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_CLOCK_T -#define PACE_CLOCK_T - /* Temporary until we emulate this correctly. */ - typedef int clock_t; - typedef clock_t pace_clock_t; -#endif /* PACE_CLOCK_T */ - -#ifndef PACE_TMS -#define PACE_TMS - /* Temporary until we emulate this correctly. */ - typedef struct tms { int a_; } pace_tms; -#endif /* PACE_TMS */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TIMES_H_WIN32 */ diff --git a/PACE/pace/win32/times.inl b/PACE/pace/win32/times.inl deleted file mode 100644 index 1f4765882dc..00000000000 --- a/PACE/pace/win32/times.inl +++ /dev/null @@ -1,24 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/times.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pace_clock_t -pace_times (struct tms * buffer) -{ - PACE_UNUSED_ARG (buffer); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/PACE/pace/win32/types.h b/PACE/pace/win32/types.h deleted file mode 100644 index cd6a7b10cd8..00000000000 --- a/PACE/pace/win32/types.h +++ /dev/null @@ -1,100 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/types.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_TYPES_H_WIN32 -#define PACE_SYS_TYPES_H_WIN32 - -#include -#if defined (__BORLANDC__) -# include -#else /* __BORLANDC__ */ -# include -# include -#endif /* __BORLANDC__ */ - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_TCHAR -#define PACE_TCHAR 1 - typedef char pace_tchar; -#endif /* PACE_TCHAR */ - -#ifndef PACE_HANDLE -#define PACE_HANDLE HANDLE -#endif /* PACE_HANDLE */ - -#ifndef PACE_INVALID_HANDLE -#define PACE_INVALID_HANDLE (HANDLE)-1 -#endif /* PACE_INVALID_HANDLE */ - -#ifndef PACE_DEV_T -#define PACE_DEV_T 1 - typedef dev_t pace_dev_t; -#endif /* PACE_DEV_T */ - -#ifndef PACE_GID_T -#define PACE_GID_T 1 - typedef int pace_gid_t; -#endif /* PACE_GID_T */ - -#ifndef PACE_INO_T -#define PACE_INO_T 1 - typedef ino_t pace_ino_t; -#endif /* PACE_INO_T */ - -#ifndef PACE_MODE_T -#define PACE_MODE_T 1 - typedef int pace_mode_t; -#endif /* PACE_MODE_T */ - -#ifndef PACE_NLINK_T -#define PACE_NLINK_T 1 - typedef DWORD pace_nlink_t; -#endif /* PACE_NLINK_T */ - -#ifndef PACE_OFF_T -#define PACE_OFF_T 1 - typedef off_t pace_off_t; -#endif /* PACE_OFF_T */ - -#ifndef PACE_PID_T -#define PACE_PID_T 1 - typedef long pace_pid_t; -#endif /* PACE_PID_T */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T 1 - typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_SSIZE_T -#define PACE_SSIZE_T 1 - typedef long pace_ssize_t; -#endif /* PACE_SSIZE_T */ - -#ifndef PACE_UID_T -#define PACE_UID_T 1 - typedef int pace_uid_t; -#endif /* PACE_UID_T */ - -#include "pace/win32/pthreadtypes.h" - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_TYPES_H_WIN32 */ diff --git a/PACE/pace/win32/unistd.c b/PACE/pace/win32/unistd.c deleted file mode 100644 index 1eda995d323..00000000000 --- a/PACE/pace/win32/unistd.c +++ /dev/null @@ -1,146 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/unistd.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/unistd.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/unistd.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_POSIX_DI_UOF) -int -pace_win32_close (PACE_HANDLE fildes) -{ - PACE_WIN32CALL_RETURN - (PACE_ADAPT_RETVAL - (CloseHandle (fildes), pace_result_), int, -1); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_HANDLE -pace_win32_dup (PACE_HANDLE fildes) -{ - PACE_HANDLE new_fd; - if (DuplicateHandle(GetCurrentProcess (), - fildes, - GetCurrentProcess(), - &new_fd, - 0, - TRUE, - DUPLICATE_SAME_ACCESS)) - { - return new_fd; - } - else - { - PACE_FAIL_RETURN (PACE_INVALID_HANDLE); - } -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -int -pace_win32_ftruncate (PACE_HANDLE fildes, pace_off_t length) -{ - if (SetFilePointer (fildes, length, NULL, FILE_BEGIN) != (unsigned) -1) - { - PACE_WIN32CALL_RETURN - (PACE_ADAPT_RETVAL - (SetEndOfFile (fildes), pace_result_), int, -1); - } - else - { - PACE_FAIL_RETURN (-1); - } -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FM_UOF) -pace_off_t -pace_win32_lseek (PACE_HANDLE fildes, pace_off_t offset, int whence) -{ -# if SEEK_SET != FILE_BEGIN \ - || SEEK_CUR != FILE_CURRENT \ - || SEEK_END != FILE_END - - /* #error Windows NT is evil AND rude! */ - switch (whence) { - - case SEEK_SET: { - whence = FILE_BEGIN; - break; - } - case SEEK_CUR: { - whence = FILE_CURRENT; - break; - } - case SEEK_END: { - whence = FILE_END; - break; - } - default: { - errno = EINVAL; - return (off_t)-1; // rather safe than sorry - } - } - PACE_OSCALL_RETURN (lseek (handle, offset, whence), off_t, -1); -# endif /* SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END */ - DWORD result = SetFilePointer (fildes, offset, NULL, whence); - if (result == PACE_SYSCALL_FAILED) - { - off_t retval = -1; - PACE_FAIL_RETURN (retval); - } - else - { - return result; - } -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -pace_ssize_t -pace_win32_write (PACE_HANDLE fildes, const void * buf, size_t nbyte) -{ - DWORD bytes_written; /* This is set to 0 byte WriteFile. */ - - if (WriteFile (fildes, buf, nbyte, &bytes_written, 0)) - { - return (pace_ssize_t) bytes_written; - } - else - { - PACE_FAIL_RETURN (-1); - } -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -pace_ssize_t -pace_win32_read (PACE_HANDLE fildes, void * buf, size_t nbyte) -{ - DWORD ok_len; - - if (ReadFile (fildes, buf, nbyte, &ok_len, 0)) - { - return (pace_ssize_t) ok_len; - } - else - { - PACE_FAIL_RETURN (-1); - } -} -#endif /* PACE_HAS_POSIX_DI_UOF */ diff --git a/PACE/pace/win32/unistd.h b/PACE/pace/win32/unistd.h deleted file mode 100644 index 1292cea5bd9..00000000000 --- a/PACE/pace/win32/unistd.h +++ /dev/null @@ -1,119 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/unistd.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_UNISTD_H_WIN32 -#define PACE_UNISTD_H_WIN32 - -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -# ifndef PACE_F_OK -# define PACE_F_OK F_OK -# endif /* PACE_F_OK */ - -# ifndef PACE_NULL -# define PACE_NULL NULL -# endif /* PACE_NULL */ - -# ifndef PACE_R_OK -# define PACE_R_OK R_OK -# endif /* PACE_R_OK */ - -# ifndef PACE_SEEK_CUR -# define PACE_SEEK_CUR SEEK_CUR -# endif /* PACE_SEEK_CUR */ - -# ifndef PACE_SEEK_END -# define PACE_SEEK_END SEEK_END -# endif /* PACE_SEEK_END */ - -# ifndef PACE_SEEK_SET -# define PACE_SEEK_SET SEEK_SET -# endif /* PACE_SEEK_SET */ - -# ifndef PACE_STDERR_FILENO -# define PACE_STDERR_FILENO STDERR_FILENO -# endif /* PACE_STDERR_FILENO */ - -# ifndef PACE_STDIN_FILENO -# define PACE_STDIN_FILENO STDIN_FILENO -# endif /* PACE_STDIN_FILENO */ - -# ifndef PACE_STDOUT_FILENO -# define PACE_STDOUT_FILENO STDOUT_FILENO -# endif /* PACE_STDOUT_FILENO */ - -# ifndef PACE_W_OK -# define PACE_W_OK W_OK -# endif /* PACE_W_OK */ - -# ifndef PACE_X_OK -# define PACE_X_OK X_OK -# endif /* PACE_X_OK */ - -/* _POSIX _PC _SC Macros go here */ - -#ifndef PACE_SIZE_T -#define PACE_SIZE_T 1 -typedef size_t pace_size_t; -#endif /* PACE_SIZE_T */ - -#ifndef PACE_SSIZE_T -#define PACE_SSIZE_T 1 -typedef ssize_t pace_ssize_t; -#endif /* PACE_SSIZE_T */ - -#if (PACE_HAS_POSIX_DI_UOF) - int pace_win32_close (PACE_HANDLE fildes); -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) - PACE_HANDLE pace_win32_dup (PACE_HANDLE fildes); -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) - int pace_win32_ftruncate (PACE_HANDLE fildes, pace_off_t length); -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FM_UOF) - pace_off_t pace_win32_lseek (PACE_HANDLE fildes, - pace_off_t offset, - int whence); -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) - pace_ssize_t pace_win32_write (PACE_HANDLE fildes, - const void * buf, - pace_size_t nbyte); -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) - pace_ssize_t pace_win32_read (PACE_HANDLE fildes, - void * buf, - pace_size_t nbyte); -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_UNISTD_H_WIN32 */ - - - - diff --git a/PACE/pace/win32/unistd.inl b/PACE/pace/win32/unistd.inl deleted file mode 100644 index 83f3f2a9e14..00000000000 --- a/PACE/pace/win32/unistd.inl +++ /dev/null @@ -1,514 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/unistd.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include -#include -#include -#include -#include - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -void -pace__exit (int status) -{ - _exit (status); - return; -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_access (const char * path, int amode) -{ - return _access (path, amode); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -unsigned int -pace_alarm (unsigned int seconds) -{ - PACE_UNUSED_ARG (seconds); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_chdir (const char * path) -{ -#if defined (__BORLANDC__) - return chdir (path); -#else /* __BORLANDC__ */ - return _chdir (path); -#endif /* __BORLANDC__ */ -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FA_UOF) -PACE_INLINE -int -pace_chown (const char * path, pace_uid_t owner, pace_gid_t group) -{ - PACE_UNUSED_ARG (path); - PACE_UNUSED_ARG (owner); - PACE_UNUSED_ARG (group); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FA_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -int -pace_close (PACE_HANDLE fildes) -{ - return pace_win32_close (fildes); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -PACE_HANDLE -pace_dup (PACE_HANDLE fildes) -{ - return pace_win32_dup (fildes); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -PACE_HANDLE -pace_dup2 (PACE_HANDLE fildes, PACE_HANDLE fildes2) -{ - PACE_HANDLE retval = (void*)0; - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (fildes2); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -int -pace_execv (const char * path, - char * const argv[]) -{ -#if defined (__BORLANDC__) || defined(__MINGW32__) - return execv (path, argv); -#else /* __BORLANDC__ || __MINGW32__ */ - return _execv (path, (const char * const *) argv); -#endif /* __BORLANDC__ || __MINGW32__ */ - /* if successful, this operation does NOT return */ -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -int -pace_execve (const char * path, - char * const argv[], - char * const envp[]) -{ -#if defined (__BORLANDC__) || defined (__MINGW32__) - return execve (path, argv, envp); -#else /* __BORLANDC__ || __MINGW32__ */ - return _execve (path, (const char *const *) argv, - (const char *const *) envp); -#endif /* __BORLANDC__ || __MINGW32__ */ - /* if successful, this operation does NOT return */ -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -int -pace_execvp (const char * file, - char * const argv[]) -{ -#if defined (__BORLANDC__) || defined (__MINGW32__) - return execvp (file, argv); -#else /* __BORLANDC__ || __MINGW32__ */ - return _execvp (file, (const char *const *) argv); -#endif /* __BORLANDC__ || __MINGW32__ */ - /* if successful, this operation does NOT return */ -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fdatasync (PACE_HANDLE fildes) -{ - PACE_UNUSED_ARG (fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pace_pid_t -pace_fork () -{ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -long -pace_fpathconf (PACE_HANDLE fildes, int name) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_fsync (PACE_HANDLE fildes) -{ - PACE_UNUSED_ARG (fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_ftruncate (PACE_HANDLE fildes, pace_off_t length) -{ - return pace_win32_ftruncate (fildes, length); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -char * -pace_getcwd (char * buf, size_t size) -{ - return getcwd (buf, size); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pace_uid_t -pace_getegid () -{ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pace_uid_t -pace_geteuid () -{ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -int -pace_getgroups (int gidsetsize, pace_gid_t grouplist[]) -{ - PACE_UNUSED_ARG (gidsetsize); - PACE_UNUSED_ARG (grouplist); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pace_uid_t -pace_getgid () -{ - pace_uid_t retval = -1; - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -char * -pace_getlogin () -{ - char * retval = (char*)0; - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UGR_UOF) -PACE_INLINE -int -pace_getlogin_r (char * name, size_t namesize) -{ - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (namesize); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_UGR_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pace_pid_t -pace_getpgrp () -{ - pace_pid_t retval = -1; - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pace_pid_t -pace_getpid () -{ - return GetCurrentProcessId (); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pace_pid_t -pace_getppid () -{ - pace_pid_t retval = -1; - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pace_uid_t -pace_getuid () -{ - pace_uid_t retval = -1; - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -int -pace_isatty (int fildes) -{ -#if defined (__BORLANDC__) || defined (__MINGW32__) - return isatty (fildes); -#else /* __BORLANDC__ || __MINGW32__ */ - return _isatty (fildes); -#endif /* __BORLANDC__ || __MINGW32__ */ -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_link (const char * existing, const char * new_link) -{ - PACE_UNUSED_ARG (existing); - PACE_UNUSED_ARG (new_link); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_FM_UOF) -PACE_INLINE -pace_off_t -pace_lseek (PACE_HANDLE fildes, pace_off_t offset, int whence) -{ - return pace_win32_lseek (fildes, offset, whence); -} -#endif /* PACE_HAS_POSIX_FM_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -long -pace_pathconf (const char * path, int name) -{ - PACE_UNUSED_ARG (path); - PACE_UNUSED_ARG (name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_SIG_UOF) -PACE_INLINE -int -pace_pause () -{ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SIG_UOF */ - -#if (PACE_HAS_POSIX_P_UOF) -PACE_INLINE -int -pace_pipe (PACE_HANDLE fildes[2]) -{ - PACE_UNUSED_ARG (fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_P_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -pace_ssize_t -pace_read (PACE_HANDLE fildes, void * buf, pace_size_t nbyte) -{ - return pace_win32_read (fildes, buf, nbyte); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_rmdir (const char * path) -{ - return rmdir (path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -int -pace_setgid (pace_gid_t gid) -{ - PACE_UNUSED_ARG (gid); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_JC_UOF) -PACE_INLINE -int -pace_setpgid (pace_pid_t pid, pace_pid_t pgid) -{ - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (pgid); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_JC_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -pace_pid_t -pace_setsid () -{ - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_UG_UOF) -PACE_INLINE -int -pace_setuid (pace_uid_t uid) -{ - PACE_UNUSED_ARG (uid); - PACE_ERRNO_NO_SUPPORT_RETURN (uid); -} -#endif /* PACE_HAS_POSIX_UG_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -unsigned int -pace_sleep (unsigned int seconds) -{ - Sleep (seconds * PACE_ONE_SECOND_IN_MSECS); - return 0; -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_SP_UOF) -PACE_INLINE -long -pace_sysconf (int name) -{ - PACE_UNUSED_ARG (name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SP_UOF */ - -#if (PACE_HAS_POSIX_JC_UOF) -PACE_INLINE -pace_pid_t -pace_tcgetpgrp (PACE_HANDLE fildes) -{ - pace_pid_t retval = -1; - PACE_UNUSED_ARG (fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_JC_UOF */ - -#if (PACE_HAS_POSIX_JC_UOF) -PACE_INLINE -int -pace_tcsetpgrp (PACE_HANDLE fildes, pace_pid_t pgrp_id) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (pgrp_id); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_JC_UOF */ - -#if (PACE_HAS_POSIX_DS_UOF) -PACE_INLINE -char * -pace_ttyname (PACE_HANDLE fildes) -{ - char * retval = (char*) 0; - PACE_UNUSED_ARG (fildes); - PACE_ERRNO_NO_SUPPORT_RETURN (retval); -} -#endif /* PACE_HAS_POSIX_DS_UOF */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE -int -pace_ttyname_r (PACE_HANDLE fildes, - char * name, - size_t namesize) -{ - PACE_UNUSED_ARG (fildes); - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (namesize); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_unlink (const char * path) -{ - return _unlink (path); -} -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if (PACE_HAS_POSIX_DI_UOF) -PACE_INLINE -pace_ssize_t -pace_write (PACE_HANDLE fildes, const void * buf, size_t nbyte) -{ - return pace_win32_write (fildes, buf, nbyte); -} -#endif /* PACE_HAS_POSIX_DI_UOF */ diff --git a/PACE/pace/win32/utime.c b/PACE/pace/win32/utime.c deleted file mode 100644 index cafec0eb6cb..00000000000 --- a/PACE/pace/win32/utime.c +++ /dev/null @@ -1,41 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/utime.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/utime.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/utime.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_POSIX_FS_UOF) -int -win32_utime (const char * path, const pace_utimbuf * times) -{ - PACE_UNUSED_ARG (path); - PACE_UNUSED_ARG (times); - - PACE_ERRNO_NO_SUPPORT_RETURN (-1); - -#if 0 - /* Not yet working */ - char * path2 = (char*) malloc (sizeof (path)); - pace_strcpy (path2, path); - - pace_utimbuf * times2 = (pace_utimbuf*) malloc (sizeof (pace_utimbuf); - memcpy (times2, times, sizeof times); - return _utime (path2, times2); -#endif -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/win32/utime.h b/PACE/pace/win32/utime.h deleted file mode 100644 index 5b90db1bd70..00000000000 --- a/PACE/pace/win32/utime.h +++ /dev/null @@ -1,43 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/utime.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_UTIME_H_WIN32 -#define PACE_UTIME_H_WIN32 - -#include "pace/sys/types.h" -#if defined (__BORLANDC__) -#include -#else -#include -#endif /* __BORLANDC__ */ - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#ifndef PACE_UTIMBUF -#define PACE_UTIMBUF - typedef struct _utimbuf pace_utimbuf; -#endif /* PACE_UTIMBUF */ - -#if (PACE_HAS_POSIX_FS_UOF) - int win32_utime (const char * path, const pace_utimbuf * times); -#endif /* PACE_HAS_POSIX_FS_UOF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_UTIME_H_WIN32 */ diff --git a/PACE/pace/win32/utime.inl b/PACE/pace/win32/utime.inl deleted file mode 100644 index 4a83d7713e0..00000000000 --- a/PACE/pace/win32/utime.inl +++ /dev/null @@ -1,33 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/utime.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/string.h" - -#if (PACE_HAS_POSIX_FS_UOF) -PACE_INLINE -int -pace_utime (const char * path, - const pace_utimbuf * times) -{ - /* Emulation not yet finished! Not yet working! */ - -#if defined (__BORLANDC__) - return utime (path, (const struct utimbuf*)times); -#else /* __BORLANDC__ */ - /* Not quite the perfect answer... win32 doesn't take const args. */ - return _utime ((char*)path, (struct _utimbuf*)times); -#endif /* __BORLANDC__ */ -} -#endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/win32/utsname.c b/PACE/pace/win32/utsname.c deleted file mode 100644 index 9963f1ff624..00000000000 --- a/PACE/pace/win32/utsname.c +++ /dev/null @@ -1,181 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/utsname.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/utsname.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/utsname.inl" -#endif /* ! PACE_HAS_INLINE */ - -#if (PACE_HAS_POSIX_SP_UOF) -int -uname (pace_utsname * name) -{ - PACE_UNUSED_ARG (name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); - -#if 0 /* Emulation: Not bug free! :-/ */ - - size_t maxnamelen = sizeof name->nodename; - pace_strcpy (name->sysname, "Win32"); - - OSVERSIONINFO vinfo; - vinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - ::GetVersionEx (&vinfo); - - SYSTEM_INFO sinfo; - GetSystemInfo(&sinfo); - pace_strcpy (name->sysname, "Win32"); - - if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) - { - /* Get information from the two structures */ - pace_sprintf (name->release, "Windows NT %d.%d", - vinfo.dwMajorVersion, - vinfo.dwMinorVersion); - pace_sprintf (name->version, - "Build %d %s", - vinfo.dwBuildNumber, - vinfo.szCSDVersion); - - /* We have to make sure that the size of (processor + subtype) is - not greater than the size of name->machine. So we give half - the space to the processor and half the space to subtype. The - -1 is necessary for because of the space between processor and - subtype in the machine name. - */ - const int bufsize = ((sizeof (name->machine) / sizeof (ACE_TCHAR)) / 2) - 1; - char processor[bufsize] = "Unknown"; - char subtype[bufsize] = "Unknown"; - - WORD arch = sinfo.wProcessorArchitecture; - - switch (arch) - { - - case PROCESSOR_ARCHITECTURE_INTEL: { - - pace_strcpy (processor, "Intel"); - if (sinfo.wProcessorLevel == 3) - { - pace_strcpy (subtype, "80386"); - } - else if (sinfo.wProcessorLevel == 4) - { - pace_strcpy (subtype, "80486"); - } - else if (sinfo.wProcessorLevel == 5) - { - pace_strcpy (subtype, "Pentium"); - } - else if (sinfo.wProcessorLevel == 6) - { - pace_strcpy (subtype, "Pentium Pro"); - } - else if (sinfo.wProcessorLevel == 7) /* guessing here */ - { - pace_strcpy (subtype, "Pentium II"); - } - break; - } - - case PROCESSOR_ARCHITECTURE_MIPS: { - pace_strcpy (processor, "MIPS"); - pace_strcpy (subtype, "R4000"); - break; - } - - case PROCESSOR_ARCHITECTURE_ALPHA: { - pace_strcpy (processor, "Alpha"); - pace_sprintf (subtype, "%d", sinfo.wProcessorLevel); - break; - } - - case PROCESSOR_ARCHITECTURE_PPC: { - pace_strcpy (processor, "PPC"); - if (sinfo.wProcessorLevel == 1) - { - pace_strcpy (subtype, "601"); - } - else if (sinfo.wProcessorLevel == 3) - { - pace_strcpy (subtype, "603"); - } - else if (sinfo.wProcessorLevel == 4) - { - pace_strcpy (subtype, "604"); - } - else if (sinfo.wProcessorLevel == 6) - { - pace_strcpy (subtype, "603+"); - } - else if (sinfo.wProcessorLevel == 9) - { - pace_strcpy (subtype, "804+"); - } - else if (sinfo.wProcessorLevel == 20) - { - pace_strcpy (subtype, "620"); - } - break; - } - - case PROCESSOR_ARCHITECTURE_UNKNOWN: { - - default: - { - /* @@ We could provide WinCE specific info here. But let's - defer that to some later point. - */ - pace_strcpy (processor, "Unknown"); - break; - } - } - } - pace_sprintf(name->machine, "%s %s", processor, subtype); - } - else if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) - { - // Get Windows 95 Information - pace_strcpy (name->release, "Windows 95"); - pace_sprintf (name->version, "%d", LOWORD (vinfo.dwBuildNumber)); - if (sinfo.dwProcessorType == PROCESSOR_INTEL_386) - { - pace_strcpy (name->machine, "Intel 80386"); - } - else if (sinfo.dwProcessorType == PROCESSOR_INTEL_486) - { - pace_strcpy (name->machine, "Intel 80486"); - } - else if (sinfo.dwProcessorType == PROCESSOR_INTEL_PENTIUM) - { - pace_strcpy (name->machine, "Intel Pentium"); - } - } - else - { - /* We don't know what this is! */ - pace_strcpy (name->release, "???"); - pace_strcpy (name->version, "???"); - pace_strcpy (name->machine, "???"); - } - - /* ick */ - return ACE_OS::hostname (name->nodename, maxnamelen); - -#endif /* emulation */ - -} -#endif /* PACE_HAS_POSIX_SP_UOF */ diff --git a/PACE/pace/win32/utsname.h b/PACE/pace/win32/utsname.h deleted file mode 100644 index c603b6b2c31..00000000000 --- a/PACE/pace/win32/utsname.h +++ /dev/null @@ -1,43 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/utsname.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_SYS_UTSNAME_H_WIN32 -#define PACE_SYS_UTSNAME_H_WIN32 - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -# ifndef PACE_UTSNAME -# define PACE_UTSNAME -# define PACE_SYS_NMLN 257 - typedef struct /* utsname */ { - char sysname[PACE_SYS_NMLN]; - char nodename[PACE_SYS_NMLN]; - char release[PACE_SYS_NMLN]; - char version[PACE_SYS_NMLN]; - char machine[PACE_SYS_NMLN]; -} pace_utsname; -# endif /* PACE_UTSNAME */ - -#if (PACE_HAS_POSIX_SP_UOF) - int uname (pace_utsname * name); -#endif /* PACE_HAS_POSIX_SP_UOF */ - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_SYS_UTSNAME_H_WIN32 */ diff --git a/PACE/pace/win32/utsname.inl b/PACE/pace/win32/utsname.inl deleted file mode 100644 index bc79bb80db4..00000000000 --- a/PACE/pace/win32/utsname.inl +++ /dev/null @@ -1,26 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/utsname.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/string.h" - -#if (PACE_HAS_POSIX_SP_UOF) -PACE_INLINE -int -pace_uname (pace_utsname * name) -{ - PACE_UNUSED_ARG (name); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} -#endif /* PACE_HAS_POSIX_SP_UOF */ diff --git a/PACE/pace/win32/wait.c b/PACE/pace/win32/wait.c deleted file mode 100644 index 6a4308040af..00000000000 --- a/PACE/pace/win32/wait.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/wait.c - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#include "pace/sys/wait.h" - -#if !defined (PACE_HAS_INLINE) -# include "pace/win32/wait.inl" -#endif /* ! PACE_HAS_INLINE */ diff --git a/PACE/pace/win32/wait.h b/PACE/pace/win32/wait.h deleted file mode 100644 index cf2b7007afa..00000000000 --- a/PACE/pace/win32/wait.h +++ /dev/null @@ -1,38 +0,0 @@ -/* $Id$ - - * ============================================================================ - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/wait.h - * - * = AUTHOR - * Luther Baker - * - * ============================================================================ */ - -#ifndef PACE_WAIT_H_WIN32 -#define PACE_WAIT_H_WIN32 - -#include "pace/sys/types.h" - -#if defined (PACE_HAS_CPLUSPLUS) -extern "C" { -#endif /* PACE_HAS_CPLUSPLUS */ - -#define PACE_WEXITSTATUS WEXITSTATUS -#define PACE_WIFEXITED WIFEXITED -#define PACE_WIFSIGNALED WISIGNALED -#define PACE_WIFSTOPPED WIFSTOPPED -#define PACE_WNOHANG WNOHANG -#define PACE_WSTOPSIG WSTOPSIG -#define PACE_WTERMSIG WTERMSIG -#define PACE_WUNTRACED WUNTRACED - -#if defined (PACE_HAS_CPLUSPLUS) -} -#endif /* PACE_HAS_CPLUSPLUS */ - -#endif /* PACE_WAIT_H_WIN32 */ diff --git a/PACE/pace/win32/wait.inl b/PACE/pace/win32/wait.inl deleted file mode 100644 index 166a0936d10..00000000000 --- a/PACE/pace/win32/wait.inl +++ /dev/null @@ -1,45 +0,0 @@ -/* $Id$ -*- C -*- - - * ============================================================================= - * - * = LIBRARY - * pace - * - * = FILENAME - * pace/win32/wait.inl - * - * = AUTHOR - * Luther Baker - * - * ============================================================================= */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pace_pid_t -pace_wait (int * statloc) -{ - PACE_UNUSED_ARG (statloc); - - { - pace_pid_t retval = -1; - PACE_ERRNO_NO_SUPPORT_RETURN (retval); - } -} -#endif /* PACE_HAS_POSIX_MP_UOF */ - -#if (PACE_HAS_POSIX_MP_UOF) -PACE_INLINE -pace_pid_t -pace_waitpid (pace_pid_t pid, int * statloc, int options) -{ - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (statloc); - PACE_UNUSED_ARG (options); - - /* ACE version uses a HANDLE */ - { - pace_pid_t retval = -1; - PACE_ERRNO_NO_SUPPORT_RETURN (retval); - } -} -#endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/PACE/tests/Cond_Var_Test.c b/PACE/tests/Cond_Var_Test.c deleted file mode 100644 index eb7a073cfc3..00000000000 --- a/PACE/tests/Cond_Var_Test.c +++ /dev/null @@ -1,136 +0,0 @@ -/* $Id$ -*- C -*- */ - -/* ===================================================================== */ -/* */ -/* = FILENAME */ -/* Cond_Var_Test.c */ -/* */ -/* = DESCRIPTION */ -/* Testing the platform for POSIX condition variables. This is not */ -/* meant to be an exhaustive test at this point but more a sanity */ -/* check that PACE works (at least somewhat) as advertised. */ -/* This program simply creates some threads, waits on a condition */ -/* variable, joins the threads, and then exits. */ -/* */ -/* This test is largely taken from the O'Reilly _Pthreads */ -/* Programming_ book and accompanying example code. */ -/* */ -/* = AUTHOR */ -/* Joe Hoffert */ -/* */ -/* ===================================================================== */ - -#include "pace/stdio.h" -#include "pace/stdlib.h" -#include "pace/pthread.h" - -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 -#include "vxworks_stub.c" -#endif /* VXWORKS */ - -#define NUM_THREADS 3 -#define TCOUNT 10 -#define COUNT_THRES 12 - -int count = 0; -int thread_ids[3] = {0,1,2}; -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 -/* VxWorks does not handle the *_ININITALIZER values and we - * can not emulate it since it involves memory allocation for - * VxWorks. - */ -pace_pthread_mutex_t count_lock; -pace_pthread_cond_t count_hit_threshold; -#else -pace_pthread_mutex_t count_lock = PACE_PTHREAD_MUTEX_INITIALIZER; -pace_pthread_cond_t count_hit_threshold = PACE_PTHREAD_COND_INITIALIZER; -#endif - -void *inc_count(void *idp) -{ - int i = 0; - /*int *my_id = idp;*/ - PACE_UNUSED_ARG (idp); - - pace_sleep(1); - - for (i = 0; i < TCOUNT; i++) { - pace_pthread_mutex_lock(&count_lock); - count++; - /* pace_printf("inc_counter(): thread %d, count = %d, unlocking mutex\n", - *my_id, count); */ - if (count == COUNT_THRES) { - /* pace_printf("inc_count(): Thread %d, count %d\n", *my_id, count); */ - pace_pthread_cond_signal(&count_hit_threshold); - } - pace_pthread_mutex_unlock(&count_lock); - } - - return(NULL); -} - -void *watch_count(void *idp) -{ - /*int *my_id = idp;*/ - PACE_UNUSED_ARG (idp); - - /* pace_printf("watch_count(): thread %d\n", *my_id); */ - - pace_pthread_mutex_lock(&count_lock); - - while (count < COUNT_THRES) { - pace_pthread_cond_wait(&count_hit_threshold, &count_lock); - /* pace_printf("watch_count(): thread %d, count %d\n", *my_id, count); */ - } - - pace_pthread_mutex_unlock(&count_lock); - - return(NULL); -} - -int -main() -{ - int i; - pace_pthread_t threads[3]; - -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 - /* VxWorks does not handle the *_ININITALIZER values and we - * can not emulate it since it involves memory allocation for - * VxWorks. - */ - pace_pthread_mutex_init(&count_lock, 0); - pace_pthread_cond_init(&count_hit_threshold, 0); -#endif - - pace_pthread_create(&threads[0], NULL, inc_count, (void *)&thread_ids[0]); - pace_pthread_create(&threads[1], NULL, inc_count, (void *)&thread_ids[1]); - pace_pthread_create(&threads[2], NULL, watch_count, (void *)&thread_ids[2]); - - for (i = 0; i < NUM_THREADS; i++) { - pace_pthread_join(threads[i], NULL); - } - - if (count < COUNT_THRES) - { - pace_printf ("### ERROR ###: count should be >= %d.\n", - COUNT_THRES); - pace_printf ("### ERROR ###: However, count == %d.\n", - count); - pace_exit (-1); - } - - /* pace_printf ("main(): This should be the last print statement.\n"); */ - -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 - /* VxWorks does not handle the *_ININITALIZER values and we - * can not emulate it since it involves memory allocation for - * VxWorks. We need to explicitly delete the mutex and condition - * variable allocated by the init calls. - */ - pace_pthread_mutex_destroy(&count_lock); - pace_pthread_cond_destroy(&count_hit_threshold); -#endif /* PACE_VXWORKS && PACE_VXWORKS != 0 */ - - return 0; -} diff --git a/PACE/tests/Makefile b/PACE/tests/Makefile deleted file mode 100644 index 83e9eb5be83..00000000000 --- a/PACE/tests/Makefile +++ /dev/null @@ -1,204 +0,0 @@ -#---------------------------------------------------------------------------- -# -# $Id$ -# -# Makefile for all the PACE tests -#---------------------------------------------------------------------------- - -CFLAGS += -DPACE_HAS_ALL_POSIX_FUNCS - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -# Build POSIX_SP_Test conditionally. For some platforms, it doesn't build -# (which is actually the test of support for the #defines). -BIN = Cond_Var_Test \ - Pthread_Storage_Test \ - Pthreads_Test \ - Stdio_Test \ - Stat_Test - -BIN2 = mqueue_test \ - Posix_SP_Test - -#### If the PACE library wasn't built with all components, don't -#### try to build certain tests. -PACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --pace) - -PSRC=$(addsuffix .c,$(BIN)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -ACELIB = - -# Don't include Posix_SP_Test and mqueue_test for a VxWorks build. -# Posix_SP_Test doesn't compile (which is the test - seeing if the symbols -# are available). So VxWorks obviously doesn't pass this test. -# SA_RESTART is not defined for VxWorks so mqueue_test doesn't build -# on that platform. -ifdef VXWORKS - ACELIB += -lPACE - LDFLAGS += -L$(PACE_ROOT)/pace/ -else - BIN += $(BIN2) -endif -INCLDIRS += -I$(PACE_ROOT) -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU - -ifndef SOEXT - SOEXT=so -endif - -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -include $(ACE_ROOT)/PACE/include/makeinclude/rules.common.GNU - -ifndef static_libs_only - ifndef shared_libs_only - static_libs_only = 1 - endif # shared_libs_only -endif # static_libs_only - -# If we are inlining the PACE functions then we don't want to include -# the PACE library (and we need to define PACE_HAS_INLINE). If we're not -# inlining then we need to include the PACE library. Inlining is the default. - -ifndef inline - CFLAGS += -DPACE_HAS_INLINE -else - ifneq (0,$(inline)) - CFLAGS += -DPACE_HAS_INLINE - else - LIBS += -L$(ACE_ROOT)/PACE/pace -lPACE - endif # ! inline -endif # ! inline - -# To compile in the PACE lib on platforms that compile c code -ifeq (1, $(emulation)) - LIBS += -L$(PACE_ROOT)/pace -lPACE -endif # emulation - -# To build multiple executables in the same directory on AIX, it works -# best to wipe out any previously-created tempinc directory. -# The compiler/linker isn't too smart about instantiating templates... -ifdef TEMPINCDIR -COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc) -endif - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Cond_Var_Test.o .obj/Cond_Var_Test.o .obj/Cond_Var_Test.o .obj/Cond_Var_Test.o: Cond_Var_Test.c \ - $(ACE_ROOT)/PACE/pace/stdio.h \ - $(ACE_ROOT)/PACE/pace/config/defines.h \ - $(ACE_ROOT)/PACE/pace/config/platform.h \ - $(ACE_ROOT)/PACE/pace/config/config.h \ - $(ACE_ROOT)/PACE/pace/config/compiler.h \ - $(ACE_ROOT)/PACE/pace/config/constants.h \ - $(ACE_ROOT)/PACE/pace/sys/types.h \ - $(ACE_ROOT)/PACE/pace/config/defaults.h \ - $(ACE_ROOT)/PACE/pace/config/utility.h \ - $(ACE_ROOT)/PACE/pace/errno.h \ - $(ACE_ROOT)/PACE/pace/config/features.h \ - $(ACE_ROOT)/PACE/pace/stdlib.h \ - $(ACE_ROOT)/PACE/pace/unistd.h \ - $(ACE_ROOT)/PACE/pace/pthread.h - -.obj/mqueue_test.o .obj/mqueue_test.o .obj/mqueue_test.o .obj/mqueue_test.o: mqueue_test.c \ - $(ACE_ROOT)/PACE/pace/stdio.h \ - $(ACE_ROOT)/PACE/pace/config/defines.h \ - $(ACE_ROOT)/PACE/pace/config/platform.h \ - $(ACE_ROOT)/PACE/pace/config/config.h \ - $(ACE_ROOT)/PACE/pace/config/compiler.h \ - $(ACE_ROOT)/PACE/pace/config/constants.h \ - $(ACE_ROOT)/PACE/pace/sys/types.h \ - $(ACE_ROOT)/PACE/pace/config/defaults.h \ - $(ACE_ROOT)/PACE/pace/config/utility.h \ - $(ACE_ROOT)/PACE/pace/errno.h \ - $(ACE_ROOT)/PACE/pace/config/features.h \ - $(ACE_ROOT)/PACE/pace/fcntl.h \ - $(ACE_ROOT)/PACE/pace/mqueue.h \ - $(ACE_ROOT)/PACE/pace/signal.h \ - $(ACE_ROOT)/PACE/pace/stdlib.h \ - $(ACE_ROOT)/PACE/pace/unistd.h \ - $(ACE_ROOT)/PACE/pace/string.h - -.obj/Pthread_Storage_Test.o .obj/Pthread_Storage_Test.o .obj/Pthread_Storage_Test.o .obj/Pthread_Storage_Test.o: Pthread_Storage_Test.c \ - $(ACE_ROOT)/PACE/pace/stdio.h \ - $(ACE_ROOT)/PACE/pace/config/defines.h \ - $(ACE_ROOT)/PACE/pace/config/platform.h \ - $(ACE_ROOT)/PACE/pace/config/config.h \ - $(ACE_ROOT)/PACE/pace/config/compiler.h \ - $(ACE_ROOT)/PACE/pace/config/constants.h \ - $(ACE_ROOT)/PACE/pace/sys/types.h \ - $(ACE_ROOT)/PACE/pace/config/defaults.h \ - $(ACE_ROOT)/PACE/pace/config/utility.h \ - $(ACE_ROOT)/PACE/pace/errno.h \ - $(ACE_ROOT)/PACE/pace/config/features.h \ - $(ACE_ROOT)/PACE/pace/stdlib.h \ - $(ACE_ROOT)/PACE/pace/unistd.h \ - $(ACE_ROOT)/PACE/pace/time.h \ - $(ACE_ROOT)/PACE/pace/pthread.h - -.obj/Pthreads_Test.o .obj/Pthreads_Test.o .obj/Pthreads_Test.o .obj/Pthreads_Test.o: Pthreads_Test.c \ - $(ACE_ROOT)/PACE/pace/stdio.h \ - $(ACE_ROOT)/PACE/pace/config/defines.h \ - $(ACE_ROOT)/PACE/pace/config/platform.h \ - $(ACE_ROOT)/PACE/pace/config/config.h \ - $(ACE_ROOT)/PACE/pace/config/compiler.h \ - $(ACE_ROOT)/PACE/pace/config/constants.h \ - $(ACE_ROOT)/PACE/pace/sys/types.h \ - $(ACE_ROOT)/PACE/pace/config/defaults.h \ - $(ACE_ROOT)/PACE/pace/config/utility.h \ - $(ACE_ROOT)/PACE/pace/errno.h \ - $(ACE_ROOT)/PACE/pace/config/features.h \ - $(ACE_ROOT)/PACE/pace/stdlib.h \ - $(ACE_ROOT)/PACE/pace/unistd.h \ - $(ACE_ROOT)/PACE/pace/pthread.h - -.obj/Stdio_Test.o .obj/Stdio_Test.o .obj/Stdio_Test.o .obj/Stdio_Test.o: Stdio_Test.c \ - $(ACE_ROOT)/PACE/pace/stdio.h \ - $(ACE_ROOT)/PACE/pace/config/defines.h \ - $(ACE_ROOT)/PACE/pace/config/platform.h \ - $(ACE_ROOT)/PACE/pace/config/config.h \ - $(ACE_ROOT)/PACE/pace/config/compiler.h \ - $(ACE_ROOT)/PACE/pace/config/constants.h \ - $(ACE_ROOT)/PACE/pace/sys/types.h \ - $(ACE_ROOT)/PACE/pace/config/defaults.h \ - $(ACE_ROOT)/PACE/pace/config/utility.h \ - $(ACE_ROOT)/PACE/pace/errno.h \ - $(ACE_ROOT)/PACE/pace/config/features.h \ - $(ACE_ROOT)/PACE/pace/unistd.h \ - $(ACE_ROOT)/PACE/pace/string.h - -.obj/Stat_Test.o .obj/Stat_Test.o .obj/Stat_Test.o .obj/Stat_Test.o: Stat_Test.c $(ACE_ROOT)/PACE/pace/stdio.h \ - $(ACE_ROOT)/PACE/pace/config/defines.h \ - $(ACE_ROOT)/PACE/pace/config/platform.h \ - $(ACE_ROOT)/PACE/pace/config/config.h \ - $(ACE_ROOT)/PACE/pace/config/compiler.h \ - $(ACE_ROOT)/PACE/pace/config/constants.h \ - $(ACE_ROOT)/PACE/pace/sys/types.h \ - $(ACE_ROOT)/PACE/pace/config/defaults.h \ - $(ACE_ROOT)/PACE/pace/config/utility.h \ - $(ACE_ROOT)/PACE/pace/errno.h \ - $(ACE_ROOT)/PACE/pace/config/features.h \ - $(ACE_ROOT)/PACE/pace/unistd.h \ - $(ACE_ROOT)/PACE/pace/fcntl.h \ - $(ACE_ROOT)/PACE/pace/sys/stat.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/PACE/tests/Makefile.am b/PACE/tests/Makefile.am deleted file mode 100644 index af6f453c2af..00000000000 --- a/PACE/tests/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -##---------------------------------------------------------------------------- -## $Id$ -## -## Makefile.am for all the PACE ``one-button'' tests -##---------------------------------------------------------------------------- - -## -## 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 - -INCLUDES = -I$(top_builddir) -I$(top_srcdir) - -## LDFLAGS = -## Libtool will automatically link against the "proper" library. -## Do not change the "libACE.la." It is not a typographical error! -## -## We override the "LIBS" variable provided by the configure script since -## we should only need to link against the ACE library for these tests. -LDADD = $(top_builddir)/pace/libPACE.la -##LIBS = $(top_builddir)/pace/libPACE.la - -## Build the following test programs when a `make check' is -## issued by the user. -check_PROGRAMS = \ - Posix_SP_Test \ - Stdio_Test - -Posix_SP_Test_SOURCES = Posix_SP_Test.c - -Stdio_Test_SOURCES = Stdio_Test.c - -## The tests we want to run are all of the test programs we are going to build. -## Do not run them if they are cross-compiled. -if PACE_CROSS_COMPILED -TESTS = -else -TESTS = $(check_PROGRAMS) -endif - -## Set up the test environment -##TESTS_ENVIRONMENT = - -## Clean up template repositories, etc. -clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations - -## Clean up `log' directory , etc. -distclean-local: - -rm -rf log diff --git a/PACE/tests/Posix_SP_Test.c b/PACE/tests/Posix_SP_Test.c deleted file mode 100644 index 8eccf95fc4c..00000000000 --- a/PACE/tests/Posix_SP_Test.c +++ /dev/null @@ -1,253 +0,0 @@ -/* $Id$ -*- C -*- */ - -/* ===================================================================== - * - * = FILENAME - * Posix_SP_Test.c - * - * = DESCRIPTION - * Testing the platform for POSIX_SINGLE_PROCESS unit of - * functionality. This consists of calls to sysconf, time, and - * uname. - * This is not meant to be an exhaustive test at this point but more - * a sanity check that PACE works (at least somewhat). - * - * = AUTHOR - * Joe Hoffert - * - * ===================================================================== - */ - -#if PACE_LYNXOS != 0x300 -#include "pace/stdio.h" -#include "pace/unistd.h" -#include "pace/time.h" -#include "pace/sys/utsname.h" - -const char * success = "SUCCEEDED"; -const char * failure = "***FAILED***"; - -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 -#include "vxworks_stub.c" -#endif /* VXWORKS */ - -void -check_sysconf () -{ - long retval; - int index; -#if PACE_HAS_POSIX == PACE_LYNXOS - const int confnamessize = 30; -#else - const int confnamessize = 38; -#endif /* PACE_HAS_POSIX != PACE_LYNXOS */ - - int confnames[] = {_SC_AIO_LISTIO_MAX, - _SC_AIO_MAX, - _SC_AIO_PRIO_DELTA_MAX, - _SC_ARG_MAX, - _SC_CHILD_MAX, - _SC_CLK_TCK, - _SC_DELAYTIMER_MAX, -#if PACE_HAS_POSIX != PACE_LYNXOS - _SC_GETGR_R_SIZE_MAX, - _SC_GETPW_R_SIZE_MAX, - _SC_LOGIN_NAME_MAX, -#endif /* PACE_HAS_POSIX != PACE_LYNXOS */ - _SC_MQ_OPEN_MAX, - _SC_MQ_PRIO_MAX, - _SC_NGROUPS_MAX, - _SC_OPEN_MAX, - _SC_PAGESIZE, - _SC_RTSIG_MAX, - _SC_SEM_NSEMS_MAX, - _SC_SEM_VALUE_MAX, - _SC_SIGQUEUE_MAX, - _SC_STREAM_MAX, -#if PACE_HAS_POSIX != PACE_LYNXOS - _SC_THREAD_DESTRUCTOR_ITERATIONS, - _SC_THREAD_KEYS_MAX, - _SC_THREAD_STACK_MIN, - _SC_THREAD_THREADS_MAX, -#endif /* PACE_HAS_POSIX != PACE_LYNXOS */ - _SC_TIMER_MAX, -#if PACE_HAS_POSIX != PACE_LYNXOS - _SC_TTY_NAME_MAX, -#endif /* PACE_HAS_POSIX != PACE_LYNXOS */ - _SC_TZNAME_MAX, - _SC_ASYNCHRONOUS_IO, - _SC_FSYNC, - _SC_JOB_CONTROL, - _SC_MAPPED_FILES, - _SC_MEMLOCK, - _SC_MEMLOCK_RANGE, - _SC_MEMORY_PROTECTION, - _SC_MESSAGE_PASSING, - _SC_PRIORITIZED_IO, - _SC_PRIORITY_SCHEDULING, - _SC_REALTIME_SIGNALS}; - char * confstrs[] = {"_SC_AIO_LISTIO_MAX", - "_SC_AIO_MAX", - "_SC_AIO_PRIO_DELTA_MAX", - "_SC_ARG_MAX", - "_SC_CHILD_MAX", - "_SC_CLK_TCK", - "_SC_DELAYTIMER_MAX", -#if PACE_HAS_POSIX != PACE_LYNXOS - "_SC_GETGR_R_SIZE_MAX", - "_SC_GETPW_R_SIZE_MAX", - "_SC_LOGIN_NAME_MAX", -#endif /* PACE_HAS_POSIX != PACE_LYNXOS */ - "_SC_MQ_OPEN_MAX", - "_SC_MQ_PRIO_MAX", - "_SC_NGROUPS_MAX", - "_SC_OPEN_MAX", - "_SC_PAGESIZE", - "_SC_RTSIG_MAX", - "_SC_SEM_NSEMS_MAX", - "_SC_SEM_VALUE_MAX", - "_SC_SIGQUEUE_MAX", - "_SC_STREAM_MAX", -#if PACE_HAS_POSIX != PACE_LYNXOS - "_SC_THREAD_DESTRUCTOR_ITERATIONS", - "_SC_THREAD_KEYS_MAX", - "_SC_THREAD_STACK_MIN", - "_SC_THREAD_THREADS_MAX", -#endif /* PACE_HAS_POSIX != PACE_LYNXOS */ - "_SC_TIMER_MAX", -#if PACE_HAS_POSIX != PACE_LYNXOS - "_SC_TTY_NAME_MAX", -#endif /* PACE_HAS_POSIX != PACE_LYNXOS */ - "_SC_TZNAME_MAX", - "_SC_ASYNCHRONOUS_IO", - "_SC_FSYNC", - "_SC_JOB_CONTROL", - "_SC_MAPPED_FILES", - "_SC_MEMLOCK", - "_SC_MEMLOCK_RANGE", - "_SC_MEMORY_PROTECTION", - "_SC_MESSAGE_PASSING", - "_SC_PRIORITIZED_IO", - "_SC_PRIORITY_SCHEDULING", - "_SC_REALTIME_SIGNALS"}; - - PACE_UNUSED_ARG (confstrs); - - /* Success indicated by compilation for this function. */ - /* printf("pace_sysconf %s\n", success); */ - for (index = 0; index < confnamessize; index++) - { - /* Call pace_sysconf() */ - errno = 0; - retval = pace_sysconf(confnames[index]); - - /* Return value of -1 indicates an invalid name or no support - for the functionality associated with the name. POSIX- - conformant platforms may not support all the names. However, - using the names above should not cause compilation errors. - */ - /* printf("pace_sysconf: name == %s\n", confstrs[index]); */ - if (retval == -1) - { - /* printf("retval == %ld\n", retval); */ - if (errno == 0) - { - /* printf("Unsupported name [errno did not change]\n"); */ - } - else - { - printf("invalid name [errno did not change]\n"); - } - } - else - { - /* printf("pace_sysconf: value == %ld\n", retval); */ - } - } - - /* printf("\n"); */ -} - -void -check_time () -{ - long retval; - time_t local_time; - - /* Call pace_time() with time_t * arg */ - local_time = 0; - errno = 0; - retval = pace_time(&local_time); - - /* printf("pace_time %s\n", success); */ - if (retval == -1) - { - printf("errno == %d\n", errno); - } - else - { - /* printf("pace_time (with time_t* arg) == %ld\n", local_time); */ - } - - /* Call pace_time() with NULL arg */ - errno = 0; - retval = pace_time(0); - - if (retval == -1) - { - printf("errno == %d\n", errno); - } - else - { - /* printf("pace_time (with NULL arg) == %ld\n\n", retval); */ - } -} - -void -check_uname () -{ - long retval; - struct utsname name; - - /* Call pace_uname() */ - errno = 0; - retval = pace_uname(&name); - /* printf("pace_uname %s\n", success); */ - - if (retval < 0) - { - printf("pace_uname error: %d\n", errno); - } - else - { - /* printf("pace_uname: uname.sysname == %s\n", name.sysname); */ - /* printf("pace_uname: uname.nodename == %s\n", name.nodename); */ - /* printf("pace_uname: uname.release == %s\n", name.release); */ - /* printf("pace_uname: uname.version == %s\n", name.version); */ - /* printf("pace_uname: uname.machine == %s\n", name.machine); */ - } -} - -int -main (int argc, char **argv) -{ - /* Check the PACE calls to the sysconf POSIX function. */ - check_sysconf(); - - /* Check the PACE calls to the time POSIX function. */ - check_time(); - - /* Check the PACE calls to the uname POSIX function. */ - check_uname(); - - PACE_UNUSED_ARG (argc); - PACE_UNUSED_ARG (argv); - return 0; -} -#else -int -main (int argc, char **argv) -{ - printf("PACE does not support LynxOS 3.0.0.\n"); -} -#endif /* PACE_LYNXOS == 0x300 */ diff --git a/PACE/tests/Pthread_Storage_Test.c b/PACE/tests/Pthread_Storage_Test.c deleted file mode 100644 index 726b3835c1d..00000000000 --- a/PACE/tests/Pthread_Storage_Test.c +++ /dev/null @@ -1,144 +0,0 @@ -/* $Id$ -*- C -*- */ - -/* ===================================================================== */ -/* */ -/* = FILENAME */ -/* Pthreads_Test.c */ -/* */ -/* = DESCRIPTION */ -/* Testing the platform for POSIX threads thread specific storage. */ -/* This is not meant to be an exhaustive test at this point but more */ -/* a sanity check that PACE works (at least somewhat) as advertised. */ -/* This program creates some threads, stores some thread specific */ -/* information in each one (some time information) and then checks */ -/* that the different threads contained different values. */ -/* */ -/* This test is largely taken from the O'Reilly _Pthreads */ -/* Programming_ book and accompanying example code. */ -/* */ -/* = AUTHOR */ -/* Joe Hoffert */ -/* */ -/* ===================================================================== */ - -#include "pace/stdio.h" -#include "pace/stdlib.h" -#include "pace/time.h" -#include "pace/pthread.h" - -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 -#include "vxworks_stub.c" -#endif /* VXWORKS */ - -#define NUM_THREADS 3 -/*pace_pthread_key_t saved_time_key;*/ -pace_pthread_key_t saved_ID_key; - -/*void free_time (void *arg)*/ -void free_ID (void *arg) -{ - /*pace_timespec *timep = (pace_timespec *)arg; - pace_printf("free_time:\n"); - pace_free(timep);*/ - - pace_pthread_t *threadp = (pace_pthread_t *)arg; - /* pace_printf("free_ID:\n"); */ - pace_free(threadp); -} - -/*void save_the_time (void)*/ -long save_the_ID (void) -{ - /*pace_timespec *timep; - - timep = (pace_timespec *)malloc(sizeof(pace_timespec)); - clock_gettime(1, timep); - pace_printf("save_the_time: \t\t%ld %ld\n",timep->tv_sec, timep->tv_nsec); - pace_pthread_setspecific(saved_time_key, (void *)timep);*/ - - pace_pthread_t *pace_thread = - (pace_pthread_t *)malloc(sizeof(pace_pthread_t)); - - *pace_thread = pace_pthread_self(); - /* pace_printf("save_the_ID: \t\t%ld\n", (long)*pace_thread); */ - pace_pthread_setspecific(saved_ID_key, (void *)pace_thread); - - return ((long)*pace_thread); -} - -/*void what_time_did_i_save (void)*/ -long what_ID_did_i_save (void) -{ - /*pace_timespec *timep; - - timep = pace_pthread_getspecific(saved_time_key); - printf("what_time_did_i_save: \t%ld %ld\n",timep->tv_sec, timep->tv_nsec);*/ - - pace_pthread_t *pace_thread; - - pace_thread = pace_pthread_getspecific(saved_ID_key); - /* pace_printf("what_ID_did_i_save: \t%ld\n", (long)*pace_thread); */ - return ((long)*pace_thread); -} - -void *thread_routine (void *arg) -{ - long saved_id; - long retrieved_id; - /*int *my_id=(int *)arg;*/ - PACE_UNUSED_ARG (arg); - - /* pace_printf("thread_routine %d\n", *my_id); */ - /*save_the_time(); - what_time_did_i_save();*/ - saved_id = save_the_ID(); - pace_sleep (1); - retrieved_id = what_ID_did_i_save(); - - if (saved_id != retrieved_id) - { - pace_printf ("### ERROR ###: saved id %ld does not equal retrieved - id %ld.\n", saved_id, retrieved_id); - pace_exit (-1); - } - - return (NULL); -} - -int -main (int argc, char *argv[]) -{ - int i; - int *id_arg; - pace_pthread_t threads[NUM_THREADS]; - - PACE_UNUSED_ARG (argc); - PACE_UNUSED_ARG (argv); - - id_arg = (int *) pace_malloc (NUM_THREADS * sizeof(int)); - - /* pace_printf("main : initializing the key\n"); */ - /*pace_pthread_key_create(&saved_time_key, free_time);*/ - pace_pthread_key_create(&saved_ID_key, free_ID); - - /* pace_printf("main : spawning the threads\n"); */ - for (i = 0; i < NUM_THREADS; i++) - { - id_arg[i] = i; - - pace_pthread_create(&(threads[i]), - NULL, - thread_routine, - (void *) &(id_arg[i])); - } - - for (i = 0; i < NUM_THREADS; i++) - { - pace_pthread_join(threads[i], NULL); - /* pace_printf("main : thread %d has finished. \n", i); */ - } - - /* pace_printf("main : goodbye\n"); */ - - return 0; -} diff --git a/PACE/tests/Pthreads_Test.c b/PACE/tests/Pthreads_Test.c deleted file mode 100644 index 7d2710f598b..00000000000 --- a/PACE/tests/Pthreads_Test.c +++ /dev/null @@ -1,110 +0,0 @@ -/* $Id$ -*- C -*- */ - -/* ===================================================================== */ -/* */ -/* = FILENAME */ -/* Pthreads_Test.c */ -/* */ -/* = DESCRIPTION */ -/* Testing the platform for POSIX threads. This is not meant */ -/* to be an exhaustive test at this point but more a sanity check */ -/* that PACE works (at least somewhat) as advertised. */ -/* This program simply creates some threads, joins them, and then */ -/* exits. */ -/* */ -/* This test is largely taken from the O'Reilly _Pthreads */ -/* Programming_ book and accompanying example code. */ -/* */ -/* = AUTHOR */ -/* Joe Hoffert */ -/* */ -/* ===================================================================== */ - -#include "pace/stdio.h" -#include "pace/stdlib.h" -#include "pace/pthread.h" - -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 -#include "vxworks_stub.c" -#endif /* VXWORKS */ - -const int FUNC1_LOOP_MAX = 5; -const int FUNC2_LOOP_MAX = 50; - -void -func1 (int *pnum_times) -{ - int i; - int j; - int x; - - for (i = 0; i < FUNC1_LOOP_MAX; i++) - { - /*pace_printf("func1\n");*/ - for (j = 0; j < 100000; j++) - x += i; - - (*pnum_times)++; - } -} - -void -func2 (int *pnum_times) -{ - int i; - int j; - int x; - - for (i = 0; i < FUNC2_LOOP_MAX; i++) - { - /*pace_printf("func2\n");*/ - for (j = 0; j < 100; j++) - x += i; - - (*pnum_times)++; - } -} - -void -join_point (int func1_times, int func2_times) -{ - int total; - - total = func1_times + func2_times; - if (total != FUNC1_LOOP_MAX + FUNC2_LOOP_MAX) - { - pace_printf ("### ERROR ###: total iterations should be %d but are %d.\n", - FUNC1_LOOP_MAX + FUNC2_LOOP_MAX, total); - pace_exit (-1); - } -} - -int -main (int argc, char **argv) -{ - /* Test creating threads and joining them. */ - pace_pthread_t thread1; - pace_pthread_t thread2; - int func1_ret = 0; - int func2_ret = 0; - - PACE_UNUSED_ARG (argc); - PACE_UNUSED_ARG (argv); - - pace_pthread_create(&thread1, - NULL, - (void *) func1, - (void *) &func1_ret); - - pace_pthread_create(&thread2, - NULL, - (void *) func2, - (void *) &func2_ret); - - pace_pthread_join(thread1, NULL); - pace_pthread_join(thread2, NULL); - - join_point(func1_ret, func2_ret); - - return 0; -} diff --git a/PACE/tests/README b/PACE/tests/README deleted file mode 100644 index 20d2c164084..00000000000 --- a/PACE/tests/README +++ /dev/null @@ -1,6 +0,0 @@ -Most of the tests are typical of the ACE and TAO tests in that no -output means the test ran successfully. Otherwise, error messages -are output indicating an error. - -Currently the mqueue_test executable requires user input for determing -the kind of test to run. diff --git a/PACE/tests/Stat_Test.c b/PACE/tests/Stat_Test.c deleted file mode 100644 index e221fc0c813..00000000000 --- a/PACE/tests/Stat_Test.c +++ /dev/null @@ -1,83 +0,0 @@ -/* $Id$ -*- C -*- */ - -/* ===================================================================== */ -/* */ -/* = FILENAME */ -/* Stat_Test.c */ -/* */ -/* = DESCRIPTION */ -/* Testing the platform for POSIX functions typically found in the */ -/* sys/stat.h file (e.g., chmod, mkdir, stat). This is not meant */ -/* to be an exhaustive test at this point but more a sanity check */ -/* that PACE works (at least somewhat) as advertised. */ -/* This program creates a directory (via mkdir), creates a temporary */ -/* file in that directory (via open), modifies the permissions of */ -/* the file (via chmod and fchmod), gets information about the file */ -/* (via stat and fstat), and checks the process' file mode creation */ -/* mask (via umask). The temporary file and directory are then */ -/* closed and deleted. */ -/* */ -/* = AUTHOR */ -/* Joe Hoffert */ -/* */ -/* ===================================================================== */ - -#include "pace/stdio.h" -#include "pace/unistd.h" -#include "pace/fcntl.h" -#include "pace/sys/stat.h" - -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 -#include "vxworks_stub.c" -#endif /* VXWORKS */ - - -#if PACE_LYNXOS != 0x300 -int -main (int argc, char **argv) -{ - const char * dirname = "./junk"; - const char * failure = "***FAILED***"; - - int fd; - /* - int retval; - char* retval2; - char buffer[256]; - */ - - /* Test creating a directory. */ - /*printf("Starting test...\n"); - if (pace_mkdir(dirname, mode) != 0) - { - pace_printf("pace_mkdir %s\n", failure); - return -1; - } - */ - - fd = pace_open (dirname, - O_WRONLY | O_CREAT, - 0x644); - if (fd == 0) - { - pace_printf("pace_open %s\n", failure); - pace_perror("pace_open"); - return -1; - } - else - { - pace_close (fd); - pace_unlink (dirname); - } - - PACE_UNUSED_ARG (argc); - PACE_UNUSED_ARG (argv); - return 0; -} -#else -int -main (int argc, char **argv) -{ - printf("PACE does not support LynxOS 3.0.0.\n"); -} -#endif /* PACE_LYNXOS == 0x300 */ diff --git a/PACE/tests/Stdio_Test.c b/PACE/tests/Stdio_Test.c deleted file mode 100644 index 469b4f433a8..00000000000 --- a/PACE/tests/Stdio_Test.c +++ /dev/null @@ -1,123 +0,0 @@ -/* $Id$ -*- C -*- */ - -/* ===================================================================== */ -/* */ -/* = FILENAME */ -/* Stdio_Test.c */ -/* */ -/* = DESCRIPTION */ -/* Testing the platform for POSIX standard I/O. This is not meant */ -/* to be an exhaustive test at this point but more a sanity check */ -/* that PACE works (at least somewhat) as advertised. */ -/* This program creates/opens a temporary file, writes to the file, */ -/* reads from the file to make sure it's what was written, and */ -/* then closes/deletes the file. */ -/* */ -/* = AUTHOR */ -/* Joe Hoffert */ -/* */ -/* ===================================================================== */ - -#include "pace/stdio.h" -#include "pace/unistd.h" -#include "pace/string.h" - -const char * filename = "temp"; -const char * mode = "w+"; -const char * string1 = "line 1\n"; -const char * success = "SUCCEEDED"; -const char * failure = "***FAILED***"; - -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 -#include "vxworks_stub.c" -#endif /* VXWORKS */ - - -#if PACE_LYNXOS != 0x300 -int -main (int argc, char **argv) -{ - /* Test creating/opening a file. */ - PACE_FILE *file; - int retval; - char* retval2; - char buffer[256]; - - file = pace_fopen (filename, - mode); - if (file == 0) - { - printf("pace_fopen %s\n", failure); - return -1; - } - - /* Test writing to a file. */ - retval = pace_fputs (string1, - file); - if (retval == EOF) - { - printf("pace_fputs %s\n", failure); - return -1; - } - - /* Test flushing a file. */ - retval = pace_fflush (file); - if (retval != 0) - { - printf("pace_fflush %s\n", failure); - return -1; - } - - /* Test seeking in a file. */ - retval = pace_fseek (file, - 0, - 0); - if (retval != 0) - { - printf("pace_fseek %s\n", failure); - return -1; - } - - /* Test reading from a file. */ - retval2 = pace_fgets (buffer, - sizeof(buffer), - file); - if (retval2 == 0) - { - printf("pace_fgets %s\n", failure); - return -1; - } - - if (pace_strcmp(buffer, string1) != 0) - { - printf("strcmp of pace_fgets %s\n", failure); - return -1; - } - - /* Test closing a file. */ - retval = pace_fclose (file); - if (retval != 0) - { - printf("pace_fclose %s\n", failure); - return -1; - } - - /* Test removing a file. */ - retval = pace_unlink (filename); - if (retval != 0) - { - printf("pace_unlink %s\n", failure); - return -1; - } - - PACE_UNUSED_ARG (argc); - PACE_UNUSED_ARG (argv); - return 0; -} -#else -int -main (int argc, char **argv) -{ - printf("PACE does not support LynxOS 3.0.0.\n"); -} -#endif /* PACE_LYNXOS == 0x300 */ diff --git a/PACE/tests/mqueue_test.c b/PACE/tests/mqueue_test.c deleted file mode 100644 index b8f55b46d6e..00000000000 --- a/PACE/tests/mqueue_test.c +++ /dev/null @@ -1,134 +0,0 @@ -/* $Id$ */ - -#if PACE_LYNXOS != 0x300 -#include "pace/stdio.h" -#include "pace/fcntl.h" -#include "pace/mqueue.h" -#include "pace/stdlib.h" -#include "pace/signal.h" -#include "pace/string.h" - -#if defined (PACE_VXWORKS) && PACE_VXWORKS != 0 -#include "vxworks_stub.c" -#endif /* VXWORKS */ - -/* Most of this code is borowed from Konstantin Knizhnik */ - -pace_mqd_t mqdes; - -void -msg_handler (int handler_arg) -{ - char buf[1024]; - unsigned int priority; - int len = pace_mq_receive(mqdes, buf, sizeof buf, &priority); - - PACE_UNUSED_ARG (handler_arg); - - if (len < 0) - { - perror("mq_receive"); - } - pace_printf("\nReceive message with priority %d: %s\n", priority, buf); -} - -#define QUEUE_NAME "/testmsg1" - -int -main (int argc, char** argv) -{ -#if PACE_LYNXOS > 0 - pace_printf ("mqueue_test not supported on LynxOS.\n"); - PACE_UNUSED_ARG (argc); - PACE_UNUSED_ARG (argv); - return EXIT_SUCCESS; -#else /* ! PACE_LYNXOS */ - char buf[1024]; - int choice, len; - unsigned int priority; - pace_sigevent notification; - static pace_sigaction_s sa; - int one = 1; - - mqdes = pace_mq_open(QUEUE_NAME, O_CREAT | O_RDWR, 0777, 0); - if (mqdes == (pace_mqd_t)-1) - { - perror("mq_open"); - return EXIT_FAILURE; - } - - notification.sigev_notify = SIGEV_SIGNAL; - notification.sigev_signo = SIGUSR1; - - sa.sa_handler = msg_handler; - sa.sa_flags = SA_RESTART; - pace_sigaction(SIGUSR1, &sa, NULL); - - while (one) - { - printf("\t1. Send\n" - "\t2. Asynchronouse receive\n" - "\t3. Synchronouse receive\n" - "\t4. Close queue and exit\n" - "\t5. Remove queue and exit\n" - "> "); - if (!pace_fgets(buf, sizeof buf, stdin)) - { - return EXIT_FAILURE; - } - if (pace_sscanf(buf, "%d", &choice) != 1) - { - pace_printf("Please select 1..5\n"); - continue; - } - switch (choice) - { - case 1: - do - { - pace_printf("Message priority: "); - pace_fgets(buf, sizeof buf, stdin); - } while (pace_sscanf(buf, "%d", &priority) != 1); - pace_printf("Message to send: "); - pace_fgets(buf, sizeof buf, stdin); - if (pace_mq_send(mqdes, buf, pace_strlen(buf)+1, priority) == -1) - { - perror("mq_send"); - return EXIT_FAILURE; - } - break; - case 2: - pace_mq_notify(mqdes, ¬ification); - pace_printf("Waiting for notifications...\n"); - break; - case 3: - len = pace_mq_receive(mqdes, buf, sizeof buf, &priority); - if (len < 0) - { - perror("mq_receive"); - } - pace_printf("Receive message with priority %d: %s\n", priority, buf); - break; - case 4: - pace_mq_close(mqdes); - return EXIT_SUCCESS; - case 5: - pace_mq_close(mqdes); - pace_mq_unlink(QUEUE_NAME); - return EXIT_SUCCESS; - default: - pace_printf("Please select 1..5\n"); - } - } - PACE_UNUSED_ARG (argc); - PACE_UNUSED_ARG (argv); - return EXIT_SUCCESS; -#endif /* ! PACE_LYNXOS */ -} -#else -int -main (int argc, char **argv) -{ - printf("PACE does not support LynxOS 3.0.0.\n"); -} -#endif /* PACE_LYNXOS == 0x300 */ diff --git a/PACE/tests/test_stdio.dsp b/PACE/tests/test_stdio.dsp deleted file mode 100644 index 198cfb45f4f..00000000000 --- a/PACE/tests/test_stdio.dsp +++ /dev/null @@ -1,162 +0,0 @@ -# Microsoft Developer Studio Project File - Name="test_stdio" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=test_stdio - Win32 Static Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "test_stdio.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "test_stdio.mak" CFG="test_stdio - Win32 Static Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "test_stdio - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "test_stdio - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "test_stdio - Win32 Static Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "test_stdio - Win32 Static Release" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "test_stdio - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PACE_HAS_ALL_POSIX_FUNCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 pace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../pace/win32" - -!ELSEIF "$(CFG)" == "test_stdio - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "_DEBUG" /D "PACE_HAS_ALL_POSIX_FUNCS" /D "WIN32" /D "_CONSOLE" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 paced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../pace/win32" - -!ELSEIF "$(CFG)" == "test_stdio - Win32 Static Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Static_Debug" -# PROP BASE Intermediate_Dir "Static_Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Static_Debug" -# PROP Intermediate_Dir "Static_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I ".." /D "_DEBUG" /D "PACE_HAS_ALL_POSIX_FUNCS" /D "WIN32" /D "_CONSOLE" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "_DEBUG" /D "PACE_HAS_ALL_POSIX_FUNCS" /D "WIN32" /D "_CONSOLE" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 paced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../pace/win32" -# ADD LINK32 pacesd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../pace/win32" - -!ELSEIF "$(CFG)" == "test_stdio - Win32 Static Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Static_Release" -# PROP BASE Intermediate_Dir "Static_Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Static_Release" -# PROP Intermediate_Dir "Static_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PACE_HAS_ALL_POSIX_FUNCS" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PACE_HAS_ALL_POSIX_FUNCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 pace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../pace/win32" -# ADD LINK32 paces.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../pace/win32" - -!ENDIF - -# Begin Target - -# Name "test_stdio - Win32 Release" -# Name "test_stdio - Win32 Debug" -# Name "test_stdio - Win32 Static Debug" -# Name "test_stdio - Win32 Static Release" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Stdio_Test.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/PACE/tests/tests.dsw b/PACE/tests/tests.dsw deleted file mode 100644 index 3b385f17556..00000000000 --- a/PACE/tests/tests.dsw +++ /dev/null @@ -1,59 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "PACE DLL"=..\pace\win32\pace_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "PACE LIB"=..\pace\win32\pace_lib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "test_stdio"=.\test_stdio.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name PACE DLL - End Project Dependency - Begin Project Dependency - Project_Dep_Name PACE LIB - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/PACE/tests/vxworks_stub.c b/PACE/tests/vxworks_stub.c deleted file mode 100644 index 7ec9bf3f884..00000000000 --- a/PACE/tests/vxworks_stub.c +++ /dev/null @@ -1,109 +0,0 @@ -/* $Id$ -*- C -*- */ - -/* ===================================================================== */ -/* */ -/* = FILENAME */ -/* vxworks_stub.c */ -/* */ -/* = DESCRIPTION */ -/* The file includes the special machinations that are needed to */ -/* kick off a C program in VxWorks. Every test run on VxWorks needs */ -/* to have this so it is put into this common file. */ -/* */ -/* = AUTHOR */ -/* Joe Hoffert */ -/* */ -/* ===================================================================== */ - -# define main post_pace_main -# include /**/ /* for ::sp() */ -# include /**/ "pace/pthread.h" - -int post_pace_main(); - -/* This global function can be used from the VxWorks shell to pass - * arguments to a C main () function. - * - * usage: -> spa main, "arg1", "arg2" - * - * All arguments must be quoted, even numbers. - */ -int -spa (FUNCPTR entry, ...) -{ - const unsigned int MAX_ARGS = 10; - char *argv[MAX_ARGS]; - va_list pvar; - unsigned int argc; - int ret; - - /* Hardcode a program name because the real one isn't available - * through the VxWorks shell. - */ - argv[0] = "pace_main"; - - /* Peel off arguments to spa () and put into argv. va_arg () isn't - * necessarily supposed to return 0 when done, though since the - * VxWorks shell uses a fixed number (10) of arguments, it might 0 - * the unused ones. This function could be used to increase that - * limit, but then it couldn't depend on the trailing 0. So, the - * number of arguments would have to be passed. - */ - va_start (pvar, entry); - - for (argc = 1; argc <= MAX_ARGS; ++argc) - { - argv[argc] = va_arg (pvar, char *); - - if (argv[argc] == 0) - break; - } - - if (argc > MAX_ARGS && argv[argc-1] != 0) - { - /* try to read another arg, and warn user if the limit was exceeded */ - if (va_arg (pvar, char *) != 0) - pace_fprintf (stderr, "spa(): number of arguments limited to %d\n", - MAX_ARGS); - } - else - { - /* fill unused argv slots with 0 to get rid of leftovers - * from previous invocations - */ - unsigned int i; - for (i = argc; i <= MAX_ARGS; ++i) - argv[i] = 0; - } - - /* The hard-coded options are what ::sp () uses, except for the - * larger stack size (instead of ::sp ()'s 20000). - */ - ret = taskSpawn (argv[0], /* task name */ - 100, /* task priority */ - VX_FP_TASK, /* task options */ - PTHREAD_DEFAULT_STACK_SIZE, /* stack size */ - entry, /* entry point */ - argc, /* first argument to main () */ - (int) argv, /* second argument to main () */ - 0, 0, 0, 0, 0, 0, 0, 0); - va_end (pvar); - - /* taskSpawn () returns the taskID on success: return 0 instead if - * successful - */ - return ret > 0 ? 0 : ret; -} - -int -pace_main(int argc, char* argv[]) -{ - /* Setup information for VxWorks emulation */ - if (pacevx_vxworks_init() == ERROR) - return ERROR; - - /* Call the "normal" main function now that we've done - * our bookkeeping. - */ - return post_pace_main(argc, argv); -} diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM deleted file mode 100644 index dd3c515cc7d..00000000000 --- a/PROBLEM-REPORT-FORM +++ /dev/null @@ -1,76 +0,0 @@ -[Please use the form below to submit bug reports, problem - reports, etc., to the ACE developers and interested users. - Send to ace-bugs@cs.wustl.edu. Please send it as plain - ASCII text, _not_ uuencoded or as an attachment. - - We prefer that all bug reports be submitted through our bug tracking - system. See $ACE_ROOT/docs/usage-bugzilla.html for more information - about how to do this. If you are unsure as to whether your problem - is a real bug or not then please submit your question to the mailing - list using the following form. Not using the problem report form - will make it harder or impossible to identify the problem, and in - many cases we will be unable to help at all. Also please try to - browse bugzilla and the ChangeLog files to find out if your problem - has been solved in a more recent version of ACE. - - To ensure that you see responses, please do one of the following: - - 1) Subscribe to the ace-bugs mail list, by sending email with - contents "subscribe ace-bugs" to majordomo@cs.wustl.edu. - - 2) Or, monitor the comp.soft-sys.ace newsgroup for responses. - - Replace/remove all the explanatory text in brackets before mailing. - - Please send this form as ASCII text only. Do _not_ send it as an - attachment, or as tar'ed, compressed and/or uuencoded text. And - limit line lengths to less than 80 characters. - - PLEASE make your Subject: line as descriptive as possible. - Subjects like "ACE bug" or "bug report" are not helpful! - Also, do _not_ include the word "help" in the Subject!] - -8<----------8<----------8<----------8<----------8<----------8<----------8<---- - -To: ace-bugs@cs.wustl.edu -Subject: [area]: [synopsis] - - ACE VERSION: 5.3.1 - - HOST MACHINE and OPERATING SYSTEM: - If on Windows based OS's, which version of WINSOCK do you - use?: - - TARGET MACHINE and OPERATING SYSTEM, if different from HOST: - COMPILER NAME AND VERSION (AND PATCHLEVEL): - - CONTENTS OF $ACE_ROOT/ace/config.h: - - CONTENTS OF $ACE_ROOT/include/makeinclude/platform_macros.GNU (unless - this isn't used in this case, e.g., with Microsoft Visual C++): - - AREA/CLASS/EXAMPLE AFFECTED: -[What example failed? What module failed to compile?] - - DOES THE PROBLEM AFFECT: - COMPILATION? - LINKING? - On Unix systems, did you run make realclean first? - EXECUTION? - OTHER (please specify)? -[Please indicate whether ACE, your application, or both are affected.] - - SYNOPSIS: -[Brief description of the problem] - - DESCRIPTION: -[Detailed description of problem. Don't just say " -doesn't work, here's a fix," explain what your program does -to get to the state. ] - - REPEAT BY: -[What you did to get the error; include test program or session -transcript if at all possible. ] - - SAMPLE FIX/WORKAROUND: -[If available ] diff --git a/README b/README deleted file mode 100644 index d8c63738ab4..00000000000 --- a/README +++ /dev/null @@ -1,220 +0,0 @@ -This document is also available at the following URL: - -http://www.cs.wustl.edu/~schmidt/ACE.html. - -All software and documentation is available via both anonymous ftp and -the World Wide Web.] - -THE ADAPTIVE COMMUNICATION ENVIRONMENT (ACE) - -An Object-Oriented Network Programming Toolkit - ----------------------------------------- - -Overview of ACE - -The ADAPTIVE Communication Environment (ACE) is an object-oriented -(OO) toolkit that implements fundamental design patterns for -communication software. ACE provides a rich set of reusable C++ -wrappers and frameworks that perform common communication software -tasks across a range of OS platforms, including Win32 (i.e., WinNT -3.5.x/4.x, Win95, and WinCE), most versions of UNIX (e.g., SunOS 4.x -and 5.x, SGI IRIX 5.x and 6.x, HP-UX 9.x, 10.x, and 11.x, DEC UNIX -4.x, AIX 4.x, Linux, SCO, UnixWare, NetBSD, and FreeBSD), real-time -operating systems (e.g., VxWorks, Chorus, LynxOS, and pSoS), and MVS -OpenEdition. A single source tree is used for all these platforms and -porting ACE to other platforms is relatively easy. - -The communication software components provided by ACE include event -demultiplexing and event handler dispatching, service initialization, -interprocess communication, shared memory management, message routing, -dynamic (re)configuration of distributed services, multi-threading, -and concurrency control. There are both C++ and Java versions of ACE -available. - -ACE is targeted for developers of high-performance and real-time -communication services and applications on UNIX, POSIX, and Win32 -platforms. ACE simplifies the development of OO network applications -and services that utilize interprocess communication, event -demultiplexing, explicit dynamic linking, and concurrency. ACE -automates system configuration and reconfiguration by dynamically -linking services into applications at run-time and executing these -services in one or more processes or threads. - -ACE is currently used in commercial projects and products by dozens of -companies including Ericsson, Bellcore, Siemens, Motorola, Kodak, -Boeing, Lucent, DEC, Lockheed Martin, and SAIC. Commercial support -for ACE is available at http://www.riverace.com. - ----------------------------------------- - -C++ Wrappers for OS Interfaces - -The lower-level portions of ACE provide a set of portable and -type-secure C++ wrappers that encapsulate the following C language OS -interfaces: - - . IPC mechanisms - -- e.g., Internet- and UNIX-domain sockets, TLI, Named - Pipes (for UNIX and Win32) and STREAM pipes; - - . Event demultiplexing - -- e.g., select(), poll(), and Win32 - WaitForMultipleObjects and I/O completion ports; - - . Multi-threading and synchronization - -- e.g., Solaris threads, POSIX Pthreads, and Win32 - threads; - - . Explicit dynamic linking - -- e.g., dlopen/dlsym on UNIX and LoadLibrary/GetProc - on Win32; - - . Memory-mapped files and shared memory management - -- e.g., BSD mmap(), SYSV shared memory, and Win32 - shared memory; - - . System V IPC - -- e.g., shared memory, semaphores, message queues. - -The OS Adaptation Layer shields the upper levels of ACE from platform -dependencies associated with the underlying OS interfaces. - ----------------------------------------- - -Frameworks and Class Categories - -ACE also contains a higher-level network programming framework that -integrates and enhances the lower-level C++ wrappers. This framework -supports the dynamic configuration of concurrent distributed services -into applications. The framework portion of ACE contains the -following class categories: - - . The Reactor - -- Supports both Reactive and Proactive I/O; - - . The Service Configurator - -- Support dynamic (re)configuration of objects; - - . The ADAPTIVE Service Executive - -- A user-level implementation of System V STREAMS, - that supports modular integration of - hierarchically-related communicaion services; - - . Concurrency - -- Various types of higher-level concurrency - control and synchronization patterns (such as - Polymorphic Futures and Active Objects); - - . Shared Malloc - -- Components for managing dynamically allocation - of shared and local memory; - ----------------------------------------- - -Distributed Services and Components - -Finally, ACE provides a standard library of distributed services that -are packaged as components. These service components play two roles -in ACE: - - 1. They provide reusable components for common distributed - system tasks such as logging, naming, locking, and time - synchronization. - - 2. They illustrate how to utilize ACE features such as the - Reactor, Service Configurator, Service Initialization, - Concurrency, and IPC components. - ----------------------------------------- - -Middleware Applications - -ACE has been used in research and development projects at many -universities and companies. For instance, it has been used to build -avionics systems at Boeing, telecommunication systems at Bellcore, -Ericsson, Motorola, and Lucent; medical imaging systems at Siemens and -Kodak; and many academic research projects. Two example middleware -applications provided with the ACE release include: - - 1. The ACE ORB (TAO) -- TAO is a real-time implementation of - CORBA built using the framework components and patterns - provided by ACE. - - 2. JAWS -- JAWS is a high-performance, adaptive Web server - built using the components in ACE. - ----------------------------------------- - -OBTAINING ACE - -The current ACE release is provided as a tar file that is around 3 Meg -compressed using GNU gzip. ACE may be obtained electronically from -http://www.cs.wustl.edu/~schmidt/ACE-obtain.html. This release -contains the source code, test drivers, and example applications -(including JAWS) for C++ wrapper libraries and the higher-level ACE -network programming framework developed as part of the ADAPTIVE -project at the University of California, Irvine and at Washington -University, St. Louis. - -You can get The ACE ORB (TAO) in a companion release at -http://www.cs.wustl.edu/~schmidt/TAO.html. - ----------------------------------------- - -ACE DOCUMENTATION AND TUTORIALS - -Many of the C++ wrappers and higher-level components have been -described in issues of the C++ Report, as well as in proceedings of -many journals, conferences, and workshops. - -A collection of white papers and tutorial handouts are included at -ftp://wuarchive.wustl.edu/languages/c++/ACE/ACE-documentation. This -directory contains postscript versions of various papers that describe -different aspects of ACE. - -I update these papers periodically to reflect changes to the ACE -architecture. Therefore, you might want to check the date on the -files to make sure that you have read the most recent versions of -these papers. - -This material is also available available via the WWW at URL: - -http://www.cs.wustl.edu/~schmidt/ACE.html - ----------------------------------------- - -ACE MAILING LIST AND NEWSGROUP - -A mailing list, ace-users@cs.wustl.edu, is available for discussing -bug fixes, enhancements, and porting issues regarding ACE. Please -send mail to me at the ace-users-request@cs.wustl.edu if you'd like to -join the mailing list. There is also a USENET newsgroup called -comp.soft-sys.ace. - ----------------------------------------- - -BUILDING AND INSTALLING ACE - -Please refer to the http://www.cs.wustl.edu/~schmidt/ACE-install.html -file for information on how to build and test the ACE wrappers. The -BIBLIOGRAPHY file contains information on where to obtain articles -that describe the ACE wrappers and the ADAPTIVE system in more detail. - -The current release has been tested extensively, but if you find any -bugs, please report them to the ACE mailing list -ace-users@cs.wustl.edu using the $ACE_ROOT/PROBLEM-REPORT-FORM. -Please use the same form to submit questions, comments, etc. -To ensure that you see responses, please do one of the following: - - 1) Subscribe to the ace-users mail list, by sending email with - contents "subscribe ace-users" to majordomo@cs.wustl.edu. - - 2) Or, monitor the comp.soft-sys.ace newsgroup for responses. - ----------------------------------------- - -ACKNOWLEDGEMENTS - -Please see the file `$ACE_ROOT/THANKS' for a list of the thousands of -people who've contributed to ACE and TAO over the years. diff --git a/Static_Performance.dsw b/Static_Performance.dsw deleted file mode 100644 index 8e50198ea15..00000000000 --- a/Static_Performance.dsw +++ /dev/null @@ -1,263 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ACE DLL"=.\ace\ace_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ACE LIB"=.\ace\ace_lib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "IDL_Cubit Client"=".\TAO\performance-tests\Cubit\TAO\IDL_Cubit\client.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "IDL_Cubit Server"=".\TAO\performance-tests\Cubit\TAO\IDL_Cubit\server.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "MT_Cubit Client"=".\TAO\performance-tests\Cubit\TAO\MT_Cubit\client.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "MT_Cubit Server"=".\TAO\performance-tests\Cubit\TAO\MT_Cubit\server.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "TAO DLL"=.\TAO\tao\TAO.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "TAO LIB"=.\TAO\tao\TAO_Static.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "TAO_IDL Compiler"=.\TAO\TAO_IDL\tao_idl.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name ACE dynamic library - End Project Dependency - Begin Project Dependency - Project_Dep_Name TAO_IDL_BE_DLL - End Project Dependency - Begin Project Dependency - Project_Dep_Name TAO_IDL_FE_DLL - End Project Dependency -}}} - -############################################################################### - -Project: "TAO_IDL Compiler Static"=.\TAO\TAO_IDL\tao_idl_static.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name TAO_IDL_BE_LIB - End Project Dependency - Begin Project Dependency - Project_Dep_Name TAO_IDL_FE_LIB - End Project Dependency -}}} - -############################################################################### - -Project: "TAO_IDL_BE_DLL"=.\TAO\TAO_IDL\TAO_IDL_BE_DLL.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name TAO_IDL_FE_DLL - End Project Dependency -}}} - -############################################################################### - -Project: "TAO_IDL_BE_LIB"=.\TAO\TAO_IDL\TAO_IDL_BE_LIB.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name TAO_IDL_FE_LIB - End Project Dependency -}}} - -############################################################################### - -Project: "TAO_IDL_FE_DLL"=.\TAO\TAO_IDL\TAO_IDL_FE_DLL.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name ACE DLL - End Project Dependency - Begin Project Dependency - Project_Dep_Name gperf - End Project Dependency - Begin Project Dependency - Project_Dep_Name gperf_lib - End Project Dependency -}}} - -############################################################################### - -Project: "TAO_IDL_FE_LIB"=.\TAO\TAO_IDL\TAO_IDL_FE_LIB.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name ACE LIB - End Project Dependency - Begin Project Dependency - Project_Dep_Name gperf - End Project Dependency - Begin Project Dependency - Project_Dep_Name gperf_lib - End Project Dependency -}}} - -############################################################################### - -Project: "basic_perf"=".\performance-tests\Misc\basic_perf.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "context_switch_time"=".\performance-tests\Misc\context_switch_time.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "gperf"=.\apps\gperf\src\gperf.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name ACE dynamic library - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip.cpp deleted file mode 100644 index c9e68d98406..00000000000 --- a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// $Id$ -// -#include "Roundtrip.h" - -ACE_RCSID(AMI_Latency, Roundtrip, "$Id$") - -Roundtrip::Roundtrip (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -Test::Timestamp -Roundtrip::test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return send_time; -} - -void -Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.h b/TAO/performance-tests/AMI_Latency/Roundtrip.h deleted file mode 100644 index efef33dd7e6..00000000000 --- a/TAO/performance-tests/AMI_Latency/Roundtrip.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -#ifndef ROUNDTRIP_H -#define ROUNDTRIP_H -#include "ace/pre.h" - -#include "TestS.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Roundtrip interface -class Roundtrip - : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Roundtrip (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual Test::Timestamp test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// Use an ORB reference to conver strings to objects and shutdown - /// the application. - CORBA::ORB_var orb_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ROUNDTRIP_H */ diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp deleted file mode 100644 index 5f0061601e4..00000000000 --- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// -// $Id$ -// -#include "Roundtrip_Handler.h" - -ACE_RCSID(AMI_Latency, Roundtrip, "$Id$") - -Roundtrip_Handler::Roundtrip_Handler (int expected_callbacks) - : pending_callbacks_ (expected_callbacks) -{ -} - -int -Roundtrip_Handler::pending_callbacks (void) const -{ - return this->pending_callbacks_; -} - -void -Roundtrip_Handler::dump_results (ACE_UINT32 gsf) -{ - this->latency_stats_.dump_results ("AMI Latency", gsf); -} - -void -Roundtrip_Handler::test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->pending_callbacks_--; - - ACE_hrtime_t now = ACE_OS::gethrtime (); - this->latency_stats_.sample (now - send_time); -} - -void -Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_TRY - { - this->pending_callbacks_--; - holder->raise_test_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_method:"); - } - ACE_ENDTRY; -} - -void -Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void -Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_TRY - { - holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown:"); - } - ACE_ENDTRY; -} diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h deleted file mode 100644 index ae777f50f20..00000000000 --- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h +++ /dev/null @@ -1,61 +0,0 @@ -// -// $Id$ -// - -#ifndef ROUNDTRIP_HANDLER_H -#define ROUNDTRIP_HANDLER_H -#include "ace/pre.h" - -#include "TestS.h" -#include "ace/Basic_Stats.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Roundtrip interface -class Roundtrip_Handler - : public virtual POA_Test::AMI_RoundtripHandler - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Roundtrip_Handler (int expected_callbacks); - - /// Return the number of pending callbacks - int pending_callbacks (void) const; - - /// Dump the results - void dump_results (ACE_UINT32 gsf); - - // = The skeleton methods - virtual void test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// The number of callbacks not received yet - int pending_callbacks_; - - /// Collect the latency results - ACE_Basic_Stats latency_stats_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ROUNDTRIP_H */ diff --git a/TAO/performance-tests/AMI_Latency/Server_Task.cpp b/TAO/performance-tests/AMI_Latency/Server_Task.cpp deleted file mode 100644 index 6df92f32a3f..00000000000 --- a/TAO/performance-tests/AMI_Latency/Server_Task.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// -// $Id$ -// -#include "Server_Task.h" - -ACE_RCSID(AMI_Latency, Server_Task, "$Id$") - -Server_Task::Server_Task (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -int -Server_Task::svc (void) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY {} ACE_ENDTRY; - return 0; -} diff --git a/TAO/performance-tests/AMI_Latency/client.cpp b/TAO/performance-tests/AMI_Latency/client.cpp deleted file mode 100644 index 0d396c4b67b..00000000000 --- a/TAO/performance-tests/AMI_Latency/client.cpp +++ /dev/null @@ -1,185 +0,0 @@ -// $Id$ - -#include "Roundtrip_Handler.h" -#include "tao/debug.h" -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" -#include "ace/Sched_Params.h" -#include "ace/Stats.h" - -ACE_RCSID(AMI_Latency, client, "$Id$") - -const char *ior = "file://test.ior"; - -ACE_hrtime_t throughput_base; - -int niterations = 1000; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "k:i:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'k': - ior = get_opts.opt_arg (); - break; - - case 'i': - niterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k " - "-i " - "-p " - "-b " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "server (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "server (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (roundtrip.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - "Nil Test::Roundtrip reference <%s>\n", - ior), - 1); - - for (int j = 0; j < 100; ++j) - { - ACE_hrtime_t start = 0; - (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - Roundtrip_Handler *roundtrip_handler_impl; - ACE_NEW_RETURN (roundtrip_handler_impl, - Roundtrip_Handler (niterations), - 1); - PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl); - - Test::AMI_RoundtripHandler_var roundtrip_handler = - roundtrip_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_hrtime_t test_start = ACE_OS::gethrtime (); - - for (int i = 0; i != niterations; ++i) - { - // Invoke asynchronous operation.... - roundtrip->sendc_test_method (roundtrip_handler.in (), - ACE_OS::gethrtime () - ACE_ENV_ARG_PARAMETER); - if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER)) - orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - - ACE_TRY_CHECK; - } - - ACE_Time_Value tv (0, 2000); - - while (roundtrip_handler_impl->pending_callbacks ()) - { - orb->perform_work (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - ACE_hrtime_t test_end = ACE_OS::gethrtime (); - - ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration....")); - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - ACE_DEBUG ((LM_DEBUG, "done\n")); - - roundtrip_handler_impl->dump_results (gsf); - - ACE_Throughput_Stats::dump_throughput ("Total", gsf, - test_end - test_start, - niterations); - - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught: "); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/AMI_Latency/server.cpp b/TAO/performance-tests/AMI_Latency/server.cpp deleted file mode 100644 index 74498dc13e0..00000000000 --- a/TAO/performance-tests/AMI_Latency/server.cpp +++ /dev/null @@ -1,155 +0,0 @@ -// $Id$ - -#include "Roundtrip.h" -#include "Server_Task.h" -#include "ace/Get_Opt.h" -#include "ace/Sched_Params.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(AMI_Latency, server, "$Id$") - -const char *ior_output_file = "test.ior"; -int nthreads = 4; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:n:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - - case 'n': - nthreads = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-o " - "-n " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "server (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "server (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - Roundtrip *roundtrip_impl; - ACE_NEW_RETURN (roundtrip_impl, - Roundtrip (orb.in ()), - 1); - PortableServer::ServantBase_var owner_transfer(roundtrip_impl); - - Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - Server_Task server_task (orb.in ()); - if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, - nthreads) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot activate server threads\n"), - 1); - - server_task.thr_mgr ()->wait (); - - ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.cpp b/TAO/performance-tests/DII_Latency/Roundtrip.cpp deleted file mode 100644 index df15cd65d8a..00000000000 --- a/TAO/performance-tests/DII_Latency/Roundtrip.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// $Id$ -// -#include "Roundtrip.h" - -ACE_RCSID(DII_Latency, Roundtrip, "$Id$") - -Roundtrip::Roundtrip (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -Test::Timestamp -Roundtrip::test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return send_time; -} - -void -Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.h b/TAO/performance-tests/DII_Latency/Roundtrip.h deleted file mode 100644 index efef33dd7e6..00000000000 --- a/TAO/performance-tests/DII_Latency/Roundtrip.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -#ifndef ROUNDTRIP_H -#define ROUNDTRIP_H -#include "ace/pre.h" - -#include "TestS.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Roundtrip interface -class Roundtrip - : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Roundtrip (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual Test::Timestamp test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// Use an ORB reference to conver strings to objects and shutdown - /// the application. - CORBA::ORB_var orb_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ROUNDTRIP_H */ diff --git a/TAO/performance-tests/DII_Latency/client.cpp b/TAO/performance-tests/DII_Latency/client.cpp deleted file mode 100644 index 57935526269..00000000000 --- a/TAO/performance-tests/DII_Latency/client.cpp +++ /dev/null @@ -1,178 +0,0 @@ -// $Id$ - -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" -#include "ace/Sched_Params.h" -#include "ace/Stats.h" -#include "ace/Sample_History.h" - -#include "tao/Strategies/advanced_resource.h" -#include "tao/DynamicInterface/Request.h" - -ACE_RCSID(DII_Latency, client, "$Id$") - -const char *ior = "file://test.ior"; -int niterations = 100; -int do_dump_history = 0; -int do_shutdown = 1; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'h': - do_dump_history = 1; - break; - - case 'x': - do_shutdown = 0; - break; - - case 'k': - ior = get_opts.opt_arg (); - break; - - case 'i': - niterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k " - "-i " - "-x (disable shutdown) " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "client (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "client (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (object.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Nil CORBA::Object reference <%s>\n", - ior), - 1); - } - - for (int j = 0; j < 100; ++j) - { - CORBA::Request_var request = - object->_request ("test_method" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::ULongLong dummy = 0; - request->add_in_arg("send_time") <<= dummy; - - request->set_return_type (CORBA::_tc_ulonglong); - request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - ACE_Sample_History history (niterations); - - ACE_hrtime_t test_start = ACE_OS::gethrtime (); - for (int i = 0; i < niterations; ++i) - { - CORBA::ULongLong start = ACE_OS::gethrtime (); - - CORBA::Request_var request = - object->_request ("test_method" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - request->add_in_arg("send_time") <<= start; - - request->set_return_type (CORBA::_tc_ulonglong); - request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_hrtime_t now = ACE_OS::gethrtime (); - history.sample (now - start); - } - - ACE_hrtime_t test_end = ACE_OS::gethrtime (); - - ACE_DEBUG ((LM_DEBUG, "test finished\n")); - - ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration....")); - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - ACE_DEBUG ((LM_DEBUG, "done\n")); - - if (do_dump_history) - { - history.dump_samples ("HISTORY", gsf); - } - - ACE_Basic_Stats stats; - history.collect_basic_stats (stats); - stats.dump_results ("Total", gsf); - - ACE_Throughput_Stats::dump_throughput ("Total", gsf, - test_end - test_start, - stats.samples_count ()); - - if (do_shutdown) - { - CORBA::Request_var request = - object->_request ("shutdown" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/DII_Latency/server.cpp b/TAO/performance-tests/DII_Latency/server.cpp deleted file mode 100644 index e96f0ff595a..00000000000 --- a/TAO/performance-tests/DII_Latency/server.cpp +++ /dev/null @@ -1,136 +0,0 @@ -// $Id$ - -#include "Roundtrip.h" -#include "ace/Get_Opt.h" -#include "ace/Sched_Params.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(Single_Threaded_Latency, server, "$Id$") - -const char *ior_output_file = "test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-o " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "server (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "server (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - Roundtrip *roundtrip_impl; - ACE_NEW_RETURN (roundtrip_impl, - Roundtrip (orb.in ()), - 1); - PortableServer::ServantBase_var owner_transfer(roundtrip_impl); - - Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp deleted file mode 100644 index 6de5cfe047a..00000000000 --- a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// -// $Id$ -// -#include "Roundtrip.h" -#include "tao/DynamicInterface/Server_Request.h" - -ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$") - -Roundtrip::Roundtrip (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -void -Roundtrip::invoke (CORBA::ServerRequest_ptr request - ACE_ENV_ARG_DECL) -{ - if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) - { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - return; - } - - else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0) - { - CORBA::NVList_ptr list; - this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - CORBA::Any type_id (CORBA::_tc_string); - list->add_value ("type_id", type_id, CORBA::ARG_IN - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - request->arguments (list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - const char *arg; - *(nv->value ()) >>= arg; - - CORBA::Boolean type_matches = 0; - if (ACE_OS::strcmp (arg, "IDL:Test/Roundtrip:1.0") == 0 - || ACE_OS::strcmp (arg, "IDL:omg.org/CORBA/Object:1.0") == 0 - || ACE_OS::strcmp (arg, "") == 0) - type_matches = 1; - - CORBA::Any result; - result <<= CORBA::Any::from_boolean (type_matches); - - request->set_result (result ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - return; - } - - else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0) - { - CORBA::NVList_ptr list; - this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - CORBA::Any send_time (CORBA::_tc_ulonglong); - list->add_value ("send_time", send_time, CORBA::ARG_IN - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - request->arguments (list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - return; - } - - CORBA::Any bad_operation; - CORBA::BAD_OPERATION exception; - bad_operation <<= exception; - request->set_exception (bad_operation ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -CORBA::RepositoryId -Roundtrip::_primary_interface (const PortableServer::ObjectId &, - PortableServer::POA_ptr - ACE_ENV_ARG_DECL_NOT_USED) -{ - return CORBA::string_dup ("IDL:Test/Roundtrip:1.0"); -} diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.h b/TAO/performance-tests/DSI_Latency/Roundtrip.h deleted file mode 100644 index d795dcb56f1..00000000000 --- a/TAO/performance-tests/DSI_Latency/Roundtrip.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// $Id$ -// - -#ifndef ROUNDTRIP_H -#define ROUNDTRIP_H -#include "ace/pre.h" - -#include "tao/DynamicInterface/Dynamic_Implementation.h" -#include "tao/PortableServer/PortableServer.h" -#include "tao/corba.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Roundtrip interface -class Roundtrip - : public virtual PortableServer::DynamicImplementation - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Roundtrip (CORBA::ORB_ptr orb); - - // = The DSI methods - virtual void invoke (CORBA::ServerRequest_ptr request - ACE_ENV_ARG_DECL); - virtual CORBA::RepositoryId _primary_interface ( - const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL); - -private: - /// Use an ORB reference to conver strings to objects and shutdown - /// the application. - CORBA::ORB_var orb_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ROUNDTRIP_H */ diff --git a/TAO/performance-tests/DSI_Latency/client.cpp b/TAO/performance-tests/DSI_Latency/client.cpp deleted file mode 100644 index 2a264e91b43..00000000000 --- a/TAO/performance-tests/DSI_Latency/client.cpp +++ /dev/null @@ -1,163 +0,0 @@ -// $Id$ - -#include "TestC.h" -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" -#include "ace/Sched_Params.h" -#include "ace/Stats.h" -#include "ace/Sample_History.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(DSI_Latency, client, "$Id$") - -const char *ior = "file://test.ior"; -int niterations = 100; -int do_dump_history = 0; -int do_shutdown = 1; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'h': - do_dump_history = 1; - break; - - case 'x': - do_shutdown = 0; - break; - - case 'k': - ior = get_opts.opt_arg (); - break; - - case 'i': - niterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k " - "-i " - "-x (disable shutdown) " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "client (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "client (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (roundtrip.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Nil Test::Roundtrip reference <%s>\n", - ior), - 1); - } - - for (int j = 0; j < 100; ++j) - { - ACE_hrtime_t start = 0; - (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - ACE_Sample_History history (niterations); - - ACE_hrtime_t test_start = ACE_OS::gethrtime (); - for (int i = 0; i < niterations; ++i) - { - ACE_hrtime_t start = ACE_OS::gethrtime (); - - (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_hrtime_t now = ACE_OS::gethrtime (); - history.sample (now - start); - } - - ACE_hrtime_t test_end = ACE_OS::gethrtime (); - - ACE_DEBUG ((LM_DEBUG, "test finished\n")); - - ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration....")); - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - ACE_DEBUG ((LM_DEBUG, "done\n")); - - if (do_dump_history) - { - history.dump_samples ("HISTORY", gsf); - } - - ACE_Basic_Stats stats; - history.collect_basic_stats (stats); - stats.dump_results ("Total", gsf); - - ACE_Throughput_Stats::dump_throughput ("Total", gsf, - test_end - test_start, - stats.samples_count ()); - - if (do_shutdown) - { - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/DSI_Latency/server.cpp b/TAO/performance-tests/DSI_Latency/server.cpp deleted file mode 100644 index ebc70ade1d7..00000000000 --- a/TAO/performance-tests/DSI_Latency/server.cpp +++ /dev/null @@ -1,142 +0,0 @@ -// $Id$ - -#include "Roundtrip.h" -#include "ace/Get_Opt.h" -#include "ace/Sched_Params.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(DSI_Latency, server, "$Id$") - -const char *ior_output_file = "test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-o " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "server (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "server (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - Roundtrip *roundtrip_impl; - ACE_NEW_RETURN (roundtrip_impl, - Roundtrip (orb.in ()), - 1); - PortableServer::ServantBase_var owner_transfer(roundtrip_impl); - - PortableServer::ObjectId_var oid = - root_poa->activate_object (roundtrip_impl - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var roundtrip = - root_poa->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp b/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp deleted file mode 100644 index 72f83576b44..00000000000 --- a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// $Id$ -// -#include "Roundtrip.h" - -ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$") - -Roundtrip::Roundtrip (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -Test::Timestamp -Roundtrip::test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return send_time; -} - -void -Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.h b/TAO/performance-tests/Deferred_Latency/Roundtrip.h deleted file mode 100644 index efef33dd7e6..00000000000 --- a/TAO/performance-tests/Deferred_Latency/Roundtrip.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -#ifndef ROUNDTRIP_H -#define ROUNDTRIP_H -#include "ace/pre.h" - -#include "TestS.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Roundtrip interface -class Roundtrip - : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Roundtrip (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual Test::Timestamp test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// Use an ORB reference to conver strings to objects and shutdown - /// the application. - CORBA::ORB_var orb_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ROUNDTRIP_H */ diff --git a/TAO/performance-tests/Deferred_Latency/client.cpp b/TAO/performance-tests/Deferred_Latency/client.cpp deleted file mode 100644 index 8aa94d94172..00000000000 --- a/TAO/performance-tests/Deferred_Latency/client.cpp +++ /dev/null @@ -1,203 +0,0 @@ -// $Id$ - -#include "TestC.h" - -#include "tao/DynamicInterface/Request.h" - -#include "tao/Strategies/advanced_resource.h" - -#include "ace/Get_Opt.h" -#include "ace/Sched_Params.h" -#include "ace/High_Res_Timer.h" -#include "ace/Sched_Params.h" -#include "ace/Stats.h" -#include "ace/Sample_History.h" - -ACE_RCSID(Deferred_Latency, client, "$Id$") - -const char *ior = "file://test.ior"; -int niterations = 1000; -int burst = 10; -int do_shutdown = 1; -int do_dump_history = 0; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "hxk:i:b:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'h': - do_dump_history = 1; - break; - - case 'x': - do_shutdown = 0; - break; - - case 'k': - ior = get_opts.opt_arg (); - break; - - case 'i': - niterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case 'b': - burst = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k " - "-i " - "-b " - "-x (disable shutdown) " - "-h (dump history) " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "client (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "client (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (roundtrip.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Nil Test::Roundtrip reference <%s>\n", - ior), - 1); - } - - for (int j = 0; j < 100; ++j) - { - ACE_hrtime_t start = 0; - (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - ACE_Sample_History history (niterations); - - ACE_hrtime_t test_start = ACE_OS::gethrtime (); - - CORBA::Request_var *request; - ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1); - - for (int i = 0; i < niterations; ++i) - { - int j; - - for (j = 0; j != burst; ++j) - { - CORBA::ULongLong start = ACE_OS::gethrtime (); - - request[j] = - roundtrip->_request ("test_method" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - request[j]->add_in_arg () <<= start; - request[j]->set_return_type (CORBA::_tc_ulonglong); - - request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - for (j = 0; j != burst; ++j) - { - request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::ULongLong retval; - if ((request[j]->return_value () >>= retval) == 1) - { - ACE_hrtime_t now = ACE_OS::gethrtime (); - history.sample (now - retval); - } - } - } - delete[] request; - - ACE_hrtime_t test_end = ACE_OS::gethrtime (); - - ACE_DEBUG ((LM_DEBUG, "test finished\n")); - - ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration....")); - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - ACE_DEBUG ((LM_DEBUG, "done\n")); - - if (do_dump_history) - { - history.dump_samples ("HISTORY", gsf); - } - - ACE_Basic_Stats stats; - history.collect_basic_stats (stats); - stats.dump_results ("Total", gsf); - - ACE_Throughput_Stats::dump_throughput ("Total", gsf, - test_end - test_start, - stats.samples_count ()); - - if (do_shutdown) - { - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/Deferred_Latency/server.cpp b/TAO/performance-tests/Deferred_Latency/server.cpp deleted file mode 100644 index e96f0ff595a..00000000000 --- a/TAO/performance-tests/Deferred_Latency/server.cpp +++ /dev/null @@ -1,136 +0,0 @@ -// $Id$ - -#include "Roundtrip.h" -#include "ace/Get_Opt.h" -#include "ace/Sched_Params.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(Single_Threaded_Latency, server, "$Id$") - -const char *ior_output_file = "test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-o " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "server (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "server (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - Roundtrip *roundtrip_impl; - ACE_NEW_RETURN (roundtrip_impl, - Roundtrip (orb.in ()), - 1); - PortableServer::ServantBase_var owner_transfer(roundtrip_impl); - - Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile deleted file mode 100644 index 6abeb8554f4..00000000000 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile +++ /dev/null @@ -1,616 +0,0 @@ -#---------------------------------------------------------------------------- -# -# $Id$ -# -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -ifndef TAO_ROOT - TAO_ROOT = $(ACE_ROOT)/TAO -endif # ! TAO_ROOT - -LDLIBS = -lRTCORBA_Common -lTAO_Strategies -lTAO_PortableServer -lTAO - -BIN_UNCHECKED = server client - -CLIENT_OBJS = client.o -SERVER_OBJS = server.o - -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) -SRC=$(CLIENT_OBJS:.o=.cpp) $(SERVER_OBJS:.o=.cpp) -CPPFLAGS += -I../Common - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU - -ifeq ($(rt_corba),1) - ifeq ($(minimum_corba),0) - BIN=$(BIN_UNCHECKED) - endif # minimum_corba -endif # rt_corba - -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -include $(TAO_ROOT)/taoconfig.mk - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -server: $(addprefix $(VDIR),$(SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -realclean: clean - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/client.o .obj/client.o .obj/client.o .obj/client.o: client.cpp ../Common/testC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - ../Common/rtcorba_common_export.h ../Common/testC.i \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/TAOC.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Stats.h \ - $(ACE_ROOT)/ace/Basic_Stats.h \ - $(ACE_ROOT)/ace/Basic_Stats.inl \ - $(ACE_ROOT)/ace/Stats.i \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Sched_Params.h \ - $(ACE_ROOT)/ace/Sched_Params.i - -.obj/server.o .obj/server.o .obj/server.o .obj/server.o: server.cpp ../Common/test_i.h ../Common/testS.h \ - ../Common/testC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - ../Common/rtcorba_common_export.h ../Common/testC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - ../Common/testS_T.h ../Common/testS_T.i ../Common/testS_T.cpp \ - ../Common/testS.i ../Common/test_i.i \ - $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.h \ - $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/Sched_Params.h \ - $(ACE_ROOT)/ace/Sched_Params.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp deleted file mode 100644 index 72f83576b44..00000000000 --- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// $Id$ -// -#include "Roundtrip.h" - -ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$") - -Roundtrip::Roundtrip (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -Test::Timestamp -Roundtrip::test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return send_time; -} - -void -Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h deleted file mode 100644 index efef33dd7e6..00000000000 --- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -#ifndef ROUNDTRIP_H -#define ROUNDTRIP_H -#include "ace/pre.h" - -#include "TestS.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Roundtrip interface -class Roundtrip - : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Roundtrip (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual Test::Timestamp test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// Use an ORB reference to conver strings to objects and shutdown - /// the application. - CORBA::ORB_var orb_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ROUNDTRIP_H */ diff --git a/TAO/performance-tests/Single_Threaded_Latency/client.cpp b/TAO/performance-tests/Single_Threaded_Latency/client.cpp deleted file mode 100644 index 2d841b9909d..00000000000 --- a/TAO/performance-tests/Single_Threaded_Latency/client.cpp +++ /dev/null @@ -1,164 +0,0 @@ -// $Id$ - -#include "TestC.h" -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" -#include "ace/Sched_Params.h" -#include "ace/Stats.h" -#include "ace/Sample_History.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(Single_Threaded_Latency, client, "$Id$") - -const char *ior = "file://test.ior"; -int niterations = 100; -int do_dump_history = 0; -int do_shutdown = 1; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'h': - do_dump_history = 1; - break; - - case 'x': - do_shutdown = 0; - break; - - case 'k': - ior = get_opts.opt_arg (); - break; - - case 'i': - niterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k " - "-i " - "-x (disable shutdown) " - "-h (dump history) " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "client (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "client (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (roundtrip.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Nil Test::Roundtrip reference <%s>\n", - ior), - 1); - } - - for (int j = 0; j < 100; ++j) - { - ACE_hrtime_t start = 0; - (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - ACE_Sample_History history (niterations); - - ACE_hrtime_t test_start = ACE_OS::gethrtime (); - for (int i = 0; i < niterations; ++i) - { - ACE_hrtime_t start = ACE_OS::gethrtime (); - - (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_hrtime_t now = ACE_OS::gethrtime (); - history.sample (now - start); - } - - ACE_hrtime_t test_end = ACE_OS::gethrtime (); - - ACE_DEBUG ((LM_DEBUG, "test finished\n")); - - ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration....")); - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - ACE_DEBUG ((LM_DEBUG, "done\n")); - - if (do_dump_history) - { - history.dump_samples ("HISTORY", gsf); - } - - ACE_Basic_Stats stats; - history.collect_basic_stats (stats); - stats.dump_results ("Total", gsf); - - ACE_Throughput_Stats::dump_throughput ("Total", gsf, - test_end - test_start, - stats.samples_count ()); - - if (do_shutdown) - { - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/Single_Threaded_Latency/server.cpp b/TAO/performance-tests/Single_Threaded_Latency/server.cpp deleted file mode 100644 index e96f0ff595a..00000000000 --- a/TAO/performance-tests/Single_Threaded_Latency/server.cpp +++ /dev/null @@ -1,136 +0,0 @@ -// $Id$ - -#include "Roundtrip.h" -#include "ace/Get_Opt.h" -#include "ace/Sched_Params.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(Single_Threaded_Latency, server, "$Id$") - -const char *ior_output_file = "test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-o " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "server (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "server (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - Roundtrip *roundtrip_impl; - ACE_NEW_RETURN (roundtrip_impl, - Roundtrip (orb.in ()), - 1); - PortableServer::ServantBase_var owner_transfer(roundtrip_impl); - - Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp deleted file mode 100644 index 09d15331436..00000000000 --- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// -// $Id$ -// -#include "Client_Task.h" - -ACE_RCSID(Thread_Per_Connection_Latency, Client_Task, "$Id$") - -Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip, - int niterations) - : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip)) - , niterations_ (niterations) -{ -} - -int -Client_Task::svc (void) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - for (int i = 0; i != this->niterations_; ++i) - { - CORBA::ULongLong start = ACE_OS::gethrtime (); - - (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_hrtime_t now = ACE_OS::gethrtime (); - this->latency_.sample (now - start); - } - } - ACE_CATCHANY - { - return 0; - } - ACE_ENDTRY; - return 0; -} - -void -Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals, - const char *msg, - ACE_UINT32 gsf) -{ - totals.accumulate (this->latency_); - this->latency_.dump_results (msg, gsf); -} - -void -Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) -{ - CORBA::ULongLong dummy = 0; - for (int i = 0; i != 100; ++i) - { - ACE_TRY - { - (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY {} ACE_ENDTRY; - } -} diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h deleted file mode 100644 index ffc4e9d6b6a..00000000000 --- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -#ifndef CLIENT_TASK_H -#define CLIENT_TASK_H -#include "ace/pre.h" - -#include "TestC.h" -#include "ace/Task.h" -#include "ace/Basic_Stats.h" - -/// Implement the Test::Client_Task interface -class Client_Task : public ACE_Task_Base -{ -public: - /// Constructor - Client_Task (Test::Roundtrip_ptr roundtrip, - int niterations); - - /// Add this thread results to the global numbers and print the - /// per-thread results. - void accumulate_and_dump (ACE_Basic_Stats &totals, - const char *msg, - ACE_UINT32 gsf); - - /// The service method - virtual int svc (void); - -private: - /// Make sure that the current thread has a connection available. - void validate_connection (ACE_ENV_SINGLE_ARG_DECL); - -private: - /// The object reference used for this test - Test::Roundtrip_var roundtrip_; - - /// The number of iterations - int niterations_; - - /// Keep track of the latency (minimum, average, maximum and jitter) - ACE_Basic_Stats latency_; -}; - -#include "ace/post.h" -#endif /* CLIENT_TASK_H */ diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp deleted file mode 100644 index 2bc67948fd0..00000000000 --- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// $Id$ -// -#include "Roundtrip.h" - -ACE_RCSID(Single_Per_Connection_Latency, Roundtrip, "$Id$") - -Roundtrip::Roundtrip (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -Test::Timestamp -Roundtrip::test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return send_time; -} - -void -Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h deleted file mode 100644 index efef33dd7e6..00000000000 --- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -#ifndef ROUNDTRIP_H -#define ROUNDTRIP_H -#include "ace/pre.h" - -#include "TestS.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Roundtrip interface -class Roundtrip - : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Roundtrip (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual Test::Timestamp test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// Use an ORB reference to conver strings to objects and shutdown - /// the application. - CORBA::ORB_var orb_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ROUNDTRIP_H */ diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp deleted file mode 100644 index 69aac2b4ca5..00000000000 --- a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp +++ /dev/null @@ -1,149 +0,0 @@ -// $Id$ - -#include "Client_Task.h" -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" -#include "ace/Sched_Params.h" -#include "ace/Stats.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(Thread_Per_Connection_Latency, client, "$Id$") - -const char *ior = "file://test.ior"; -int niterations = 1000; -int do_shutdown = 1; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'x': - do_shutdown = 0; - break; - - case 'k': - ior = get_opts.opt_arg (); - break; - - case 'i': - niterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k " - "-i " - "-x (disable shutdown) " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "client (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "client (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (roundtrip.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Nil Test::Roundtrip reference <%s>\n", - ior), - 1); - } - - ACE_DEBUG ((LM_DEBUG, "Starting threads\n")); - - Client_Task task0(roundtrip.in (), niterations); - Client_Task task1(roundtrip.in (), niterations); - Client_Task task2(roundtrip.in (), niterations); - Client_Task task3(roundtrip.in (), niterations); - - ACE_hrtime_t test_start = ACE_OS::gethrtime (); - task0.activate(THR_NEW_LWP | THR_JOINABLE); - task1.activate(THR_NEW_LWP | THR_JOINABLE); - task2.activate(THR_NEW_LWP | THR_JOINABLE); - task3.activate(THR_NEW_LWP | THR_JOINABLE); - - task0.thr_mgr()->wait (); - ACE_hrtime_t test_end = ACE_OS::gethrtime (); - - ACE_DEBUG ((LM_DEBUG, "Threads finished\n")); - - ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration....")); - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - ACE_DEBUG ((LM_DEBUG, "done\n")); - - ACE_Basic_Stats totals; - task0.accumulate_and_dump (totals, "Task[0]", gsf); - task1.accumulate_and_dump (totals, "Task[1]", gsf); - task2.accumulate_and_dump (totals, "Task[2]", gsf); - task3.accumulate_and_dump (totals, "Task[3]", gsf); - - totals.dump_results ("Total", gsf); - - ACE_Throughput_Stats::dump_throughput ("Total", gsf, - test_end - test_start, - totals.samples_count ()); - - if (do_shutdown) - { - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp deleted file mode 100644 index 004ce70cebf..00000000000 --- a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp +++ /dev/null @@ -1,136 +0,0 @@ -// $Id$ - -#include "Roundtrip.h" -#include "ace/Get_Opt.h" -#include "ace/Sched_Params.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(Thread_Per_Connection_Latency, server, "$Id$") - -const char *ior_output_file = "test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-o " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "server (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "server (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - Roundtrip *roundtrip_impl; - ACE_NEW_RETURN (roundtrip_impl, - Roundtrip (orb.in ()), - 1); - PortableServer::ServantBase_var owner_transfer(roundtrip_impl); - - Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp deleted file mode 100644 index efb544633b2..00000000000 --- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// -// $Id$ -// -#include "Client_Task.h" - -ACE_RCSID(Thread_Pool_Latency, Client_Task, "$Id$") - -Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip, - int niterations) - : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip)) - , niterations_ (niterations) -{ -} - -int -Client_Task::svc (void) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - for (int i = 0; i != this->niterations_; ++i) - { - CORBA::ULongLong start = ACE_OS::gethrtime (); - - (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_hrtime_t now = ACE_OS::gethrtime (); - this->latency_.sample (now - start); - } - } - ACE_CATCHANY - { - return 0; - } - ACE_ENDTRY; - return 0; -} - -void -Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals, - const char *msg, - ACE_UINT32 gsf) -{ - totals.accumulate (this->latency_); - this->latency_.dump_results (msg, gsf); -} - -void -Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL) -{ - CORBA::ULongLong dummy = 0; - for (int i = 0; i != 100; ++i) - { - ACE_TRY - { - (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY {} ACE_ENDTRY; - } -} diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h deleted file mode 100644 index ffc4e9d6b6a..00000000000 --- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -#ifndef CLIENT_TASK_H -#define CLIENT_TASK_H -#include "ace/pre.h" - -#include "TestC.h" -#include "ace/Task.h" -#include "ace/Basic_Stats.h" - -/// Implement the Test::Client_Task interface -class Client_Task : public ACE_Task_Base -{ -public: - /// Constructor - Client_Task (Test::Roundtrip_ptr roundtrip, - int niterations); - - /// Add this thread results to the global numbers and print the - /// per-thread results. - void accumulate_and_dump (ACE_Basic_Stats &totals, - const char *msg, - ACE_UINT32 gsf); - - /// The service method - virtual int svc (void); - -private: - /// Make sure that the current thread has a connection available. - void validate_connection (ACE_ENV_SINGLE_ARG_DECL); - -private: - /// The object reference used for this test - Test::Roundtrip_var roundtrip_; - - /// The number of iterations - int niterations_; - - /// Keep track of the latency (minimum, average, maximum and jitter) - ACE_Basic_Stats latency_; -}; - -#include "ace/post.h" -#endif /* CLIENT_TASK_H */ diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp deleted file mode 100644 index 6028512202c..00000000000 --- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// $Id$ -// -#include "Roundtrip.h" - -ACE_RCSID(Thread_Pool_Latency, Roundtrip, "$Id$") - -Roundtrip::Roundtrip (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -Test::Timestamp -Roundtrip::test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return send_time; -} - -void -Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h deleted file mode 100644 index efef33dd7e6..00000000000 --- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -#ifndef ROUNDTRIP_H -#define ROUNDTRIP_H -#include "ace/pre.h" - -#include "TestS.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Roundtrip interface -class Roundtrip - : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Roundtrip (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual Test::Timestamp test_method (Test::Timestamp send_time - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// Use an ORB reference to conver strings to objects and shutdown - /// the application. - CORBA::ORB_var orb_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ROUNDTRIP_H */ diff --git a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp deleted file mode 100644 index e485bb2b843..00000000000 --- a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// -// $Id$ -// -#include "Worker_Thread.h" - -ACE_RCSID(Thread_Pool_Latency, Worker_Thread, "$Id$") - -Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -int -Worker_Thread::svc (void) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY {} ACE_ENDTRY; - return 0; -} diff --git a/TAO/performance-tests/Thread_Pool_Latency/client.cpp b/TAO/performance-tests/Thread_Pool_Latency/client.cpp deleted file mode 100644 index 643f541a53f..00000000000 --- a/TAO/performance-tests/Thread_Pool_Latency/client.cpp +++ /dev/null @@ -1,149 +0,0 @@ -// $Id$ - -#include "Client_Task.h" -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" -#include "ace/Sched_Params.h" -#include "ace/Stats.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(Thread_Pool_Latency, client, "$Id$") - -const char *ior = "file://test.ior"; -int niterations = 1000; -int do_shutdown = 1; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'x': - do_shutdown = 0; - break; - - case 'k': - ior = get_opts.opt_arg (); - break; - - case 'i': - niterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k " - "-i " - "-x (disable shutdown) " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "client (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "client (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (roundtrip.in ())) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Nil Test::Roundtrip reference <%s>\n", - ior), - 1); - } - - ACE_DEBUG ((LM_DEBUG, "Starting threads\n")); - - Client_Task task0(roundtrip.in (), niterations); - Client_Task task1(roundtrip.in (), niterations); - Client_Task task2(roundtrip.in (), niterations); - Client_Task task3(roundtrip.in (), niterations); - - ACE_hrtime_t test_start = ACE_OS::gethrtime (); - task0.activate(THR_NEW_LWP | THR_JOINABLE); - task1.activate(THR_NEW_LWP | THR_JOINABLE); - task2.activate(THR_NEW_LWP | THR_JOINABLE); - task3.activate(THR_NEW_LWP | THR_JOINABLE); - - task0.thr_mgr()->wait (); - ACE_hrtime_t test_end = ACE_OS::gethrtime (); - - ACE_DEBUG ((LM_DEBUG, "Threads finished\n")); - - ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration....")); - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - ACE_DEBUG ((LM_DEBUG, "done\n")); - - ACE_Basic_Stats totals; - task0.accumulate_and_dump (totals, "Task[0]", gsf); - task1.accumulate_and_dump (totals, "Task[1]", gsf); - task2.accumulate_and_dump (totals, "Task[2]", gsf); - task3.accumulate_and_dump (totals, "Task[3]", gsf); - - totals.dump_results ("Total", gsf); - - ACE_Throughput_Stats::dump_throughput ("Total", gsf, - test_end - test_start, - totals.samples_count ()); - - if (do_shutdown) - { - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/Thread_Pool_Latency/server.cpp b/TAO/performance-tests/Thread_Pool_Latency/server.cpp deleted file mode 100644 index bcacaf713c2..00000000000 --- a/TAO/performance-tests/Thread_Pool_Latency/server.cpp +++ /dev/null @@ -1,139 +0,0 @@ -// $Id$ - -#include "Roundtrip.h" -#include "Worker_Thread.h" -#include "ace/Get_Opt.h" -#include "ace/Sched_Params.h" - -#include "tao/Strategies/advanced_resource.h" - -ACE_RCSID(Thread_Pool_Latency, server, "$Id$") - -const char *ior_output_file = "test.ior"; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-o " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - int priority = - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) - + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - - if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, - priority, - ACE_SCOPE_PROCESS)) != 0) - { - if (ACE_OS::last_error () == EPERM) - { - ACE_DEBUG ((LM_DEBUG, - "server (%P|%t): user is not superuser, " - "test runs in time-shared class\n")); - } - else - ACE_ERROR ((LM_ERROR, - "server (%P|%t): sched_params failed\n")); - } - - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - Roundtrip *roundtrip_impl; - ACE_NEW_RETURN (roundtrip_impl, - Roundtrip (orb.in ()), - 1); - PortableServer::ServantBase_var owner_transfer(roundtrip_impl); - - Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - Worker_Thread worker (orb.in ()); - - worker.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1); - worker.thr_mgr ()->wait (); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/THANKS b/THANKS deleted file mode 100644 index 9aa68caa66b..00000000000 --- a/THANKS +++ /dev/null @@ -1,1711 +0,0 @@ -ACKNOWLEDGEMENTS - -ACE and TAO have been deeply influenced and improved by the following -members of my research group at Washington University and at the -University of California at Irvine. - -Everett Anderson -Alexander Babu Arulanthu -Shawn Atkins -Jaiganesh Balasubramanian -Krishnakumar Balasubramanian -Matt Braun -Darrell Brunsch -Dante J. Cannarozzi -Sharath R. Cholleti -Chris Cleeland -Angelo Corsaro -Mayur Deshpande -Eric Ding -Sergio Flores-Gaitan -Chris Gill -Andrew G. Gilpin -Aniruddha Gokhale -Priyanka Gontla -Pradeep Gore -Matthew P. Hampton -Shawn Hannan -Tim Harrison -John Heitmann -Joe Hoffert -James Hu -Frank A. Hunleth -Prashant Jain -Vishal Kachroo -Michael Kircher -Boris Kolpackov -Yamuna Krishnamurthy -Fred Kuhns -David Levine -Mike Moran -Sumedh Mungee -Balachandran Natarajan -Kirthika Parameswaran -Krishnakumar Pathayapura -Carlos O'Ryan -Ossama Othman -Jeff Parsons -Irfan Pyarali -Marina Spivak -Venkita Subramonian -Nagarajan Surendran -Nanbor Wang -Seth Widoff -Torben Worm - -I would also like to thank all the following people who have also -contributed to ACE and TAO over the years: - -Paul Stephenson -Olaf Kruger -Ed Brown -Lee Baker -Alex Ranous -Mark Patton -Steffen Winther Sorensen -Troy Warner -Stacy Mahlon -Charles Eads -Mark Frutig -Todd Hoff -George -Brad Needham -Leslee Xu -Detlef Becker -Bruce Worden -Chris Tarr -Bill Sears -Greg Lavender -Steve Warwick -Mats Sundvall -Andreas Ueltschi -Nigel Hooke -Medhi Tabatabai -Stuart Powell -Bin Mu -Andrew McGowan -Ken Konecki -John P. Hearn -Giang Hoang Nguyen -Carlos Garcia Braschi -Jam Hamidi -Eric Vaughan -Karlheinz Dorn , -Gerhard Lenzer -Steve Ritter -Chandra Venkatapathy -Matt Stevens -Bob Vistica -David Trumble -George Reynolds -Hans Rohnert -Alex V. Maclinovsky -Todd Blanchard -Rob Clairmont -Christian Millour -Neil B. Cohen -Dieter Quehl -Reginald S. Perry -James Morris -Mark Seaborn -Phil Brooks -E. Jason Scheck -Daniel Proulx -Bill Tang -John Huchinson -Jack Erickson -Byron Walton -Bill Lear -Mark Zusman -Aurelio Nocerino -Walt Akers -Greg Baker -Alexandre Karev -Pramod Kumar Singh -Bryon Rigg -Brad Brown -Patty Genualdi -Eshel Liran -Mick Adams -Chris Eich -Mike Flinn -Audun Tornquist -Sandeep Joshi -Bernd Hofner -Craig Perras -Kirk Sinnard -Matthew Newhook -Gerolf Wendland -Phil Mesnier -Ross Dargahi -Richard Orr -Rich Ryan -Jan Rychter -Tom Marrs <0002104588@mcimail.com> -Bob Olson -Jean-Francois Ripouteau -Ajit Sagar -Ashish Singhai -David Sames -Gonzalo Diethelm -Raj -Darrin Edelman -Steve Weismuller -Eric C. Newton -Andres Kruse -Ramesh Nagabushnam -Antonio Tortorici -Nigel Lowe -Tom Leith -Michael Fortinsky -Marco Sommerau -Gary Salsbery -Eric Beser -Alfred Keller -John Lu -James Mansion -Jesper S. M|ller -Chris Lahey -Michael R"uger -Istvan Buki -Greg Wilson -Garrett Conaty -Brad Flood -Marius Kjeldahl -Steve Huston -Eugene K. Plaude -Joseph DeAngelis -Kim Gillies -Luca Priorelli -Alan Stewart -Hani Yakan -William L. Gerecke -Craig Johnston -Pierre-Yves Duval -Rochi Febo Dommarco -Jonathan Biggar -Scott Shupe -Chuck Gehr -Avi Nash -Padhu Ramalingam -Jay Denkberg -Ayman Farahat -Tilo Christ -Ari Erev -Hamutal Yanay -Vital Aza -Alex Villazon -David Artus -Todd Barkalow -Alexander Smundak -Thilo Kielmann -Matthias Kerkhoff -Fred LaBar -Hanan Herzog -Eric Parker -James Michael Dwyer -Arun Katkere -Bob Dunmire -Sandro Doro -Robert Lyng -Phil Logan -John Cosby -Wayne Vucenic -Harry Gunnarsson -James CE Johnson -Samuel_Bercovici -Per Andersson -Anthony McConnell -Mark Rabotnikov -John Bossom -Rino Simioni -Slawomir Kuzniar -Rob Jordan -Michael Maxie -John Cosby -Nigel Owen -Jorn Jensen -Paul Roman -Dave Mayerhoefer -Bert Craytor -Joey Zhu -Arthur J. Lewis -Michael R. MacFaden -Paul Han -Jeff Morgan -Arturo Montes -Elliot Lau -Mark Wright -Michael Newton -Kumar Neelakantan -Scott Halstead -Jean-Marc Strauss -Adam Porter -Hakan Kallberg -Eric Dean Russell -Daniel Montalibet -Norbert Rapp -Ganesh Pai -Berni Merkle -Tom Wright -Torbjorn Lindgren -Mike Bernat -Brian Mendel -Jeremy Buch -Kevin Boyle -Kevin Martindale -Luis Lopes -Adrian Salt -Hongbo Xu -Michael Hartman -Tom Dobridge -Rich Christy -Satoshi Ueno -Eugene R. Somdahl -Robert Head -Ivan Murphy -Jan Perman -Shankar Krishnamoorthy -Reza Roodsari -Jim Crossley -Johannes Gutleber -Yigong Liu -Erik Urdang -Mike Schweiger -Anthony Mutiso -Jeff R. Hayes -David Brackman -Dave Moore -Joseph Cross -Cherif Sleiman -Stefan Ericsson -Wei Chiang -Thanh Ma -Oleg Krivosheev -Stephen Coy -Bob Laferriere -Satheesh Kumar MG -Karen Amestoy -Jeff Richard -Samuel Melamed -Vladimir Schipunov -Felix Popp -Billy Quinn -Michael McKnight -Huiying Shen -Alex Chan -Aaron Valdivia -Edan Ayal -Jeffrey Peterson -Neil Lavelle -Steven Wohlever -Manojkumar Acharya -Evgeny Beskrovny -Kirill Rybaltchenko -Laura Paterno -Ben Eng -Mike Kamrad -Marios Zikos -Mark L Boriack -Mark Hyett -Caleb Epstein -Valik Solrzano Barboza -John Connett -Tom Arbuckle -Stephen Henry -Dani Flexer -Michael Hoffman -John Lindal -Dustin Laurence -Ernie Makris -Timothy A. Brown -Pat McNerthney -Lori Anderson -Erik Margraf -Bryan Doerr -Adam Miller -Thomas Jordan -Keith Nicewarner -Frederic Andres -Achint Sandhu -Mitch Kuninsky -Alex Chan -Jeff Hellzen -Thomas Venturella -Philippe O'Reilly -Stan Leeson -Richard Keizer -Edgar Villanueva -Oliver Kellogg -Dave Meyer -Thomas Hampson -Jay Kistler -Scott Snyder -Mark Evans -Todd Pack -Mark Maris -Jason Katz -Jim Penny -Chris Ryan -J. Russell Noseworthy -Carol Sanders -Jerry Bickle -Paul von Behren -Sudish Joseph -Loren Rittle -Alexander Ovsiankin -Fred Kuhns -Ravi Nagabhyru -Tom Brusehaver -Dave Tallman -Monish Rajpal -Garry Brother -Andreas Schuelke -Ganapathi -James Garrison -Brad Walton -Paul Motuzenko -Kurt Sussman -Rob Thornton -Chanaka Liyanaarachchi -Saneyasu -Steve Kay -Greg White -Ki-hyun Yoon -Umar Syyid -Bill Fulton -Amancio Hasty -Zoran Ivanovic -Sree Oggu -James Risinger -Leo Modica -Bob Scott -Mark Kettner -Kent Watsen -Chris Healey -Philippe Klein -William S. Lear -John Geiss -Ernesto Guisado -Stuart Myles -Lothar Werzinger -Andrew Harbick -Pavel Motuzenko -Ross J. Lillie -Sam Hauer -Frank. J. Hodum -David Miron -Anton van Straaten -Joe Covalesky -Bill Backstrom -Jeff Franks -John Mulhern <9107@mn3.lawson.lawson.com> -Johan Lundin -Eric Powers -Zheng Han -Gabriel Lima -Doug Anderson -Hongyin Quan -Maximilian Hoferer -Kevin Stanley -Jeff Greif -Jeff McDaniel -Andreas Geisler -Bob McWhirter -Daniel Winder -Zheng Han -Christa Schwanninger -Byron Harris -Barney Dalton -Peter Gorgia -Dirk Broer -Joseph E. LaPrade -Goran Lowkrantz -Susan Liebeskind -Dana Hackman -Margherita Vittone Wiersma -Priya Narasimhan -Jeff Hopper -Mats Nilsson -Dongwook Kim -Don Davis -Alberto Villarica -XuYifeng -Ossama Othman -Tom Shields -Krishna Padmasola -Andre Folkers -Paul Sexton -Marc Lehmann -Anne Blankert -Raja Ati -Clinton Carr -Peter Liqun Na -Frank Adcock -Xu Yifeng -Valery Arkhangorodsky -Alan Scheinine -Andrew G. Harvey -Dann Corbit -James -Jason Milley -Ulf Jaehrig -Peter Nordlund -Mark Weel -Tres Seaver -Erik Koerber -Eric R. Medley -David O'Farrell -Amir Bahmanyari -Ian Wright -David Janello -Rich Wellner -Fernando D. Mato Mira -Jonathan Reis -Seung-Lee Hoon -Russell L. Carter -Bill Hall -Brian Gilstrap -Balaji Srinivasan -Anders W. Tell -Larry Lachman -Terry Rosenbaum -Rainer Blome -Kirk Ellett -Sunil Kumar -T Stach -Ron Barack -Daniel Nieten -Paul K. Fisher -Jim Buck -Olivier Lau -Achim Stindt -Fredrik Lindahl -Joseph Weihs -Serge Kolgan -James Megquier -Martin Krumpolec -Michael Thomas -Vicentini Emanuele -Bob Price -Ramiro Penataro Blanco -Sigg Pascal -Ivan Leong -Virginie Amar -Tom Ziomek -Hamish Friedlander -Mark De Jong -Knut Johannessen -Leif Jakobsmeier -Jon Lindgren -Steve Vinoski -Christian Mueffling -Victor Yu -Jeff Donner -Joe Loyall -Stanislav Meduna -Christian Korn -Ron Barack -Steve Totten -Faron Dutton -Gary York -Patty Hair -Ivan Pascal -William A. Hoffman -Mark Lucovsky -Greg Holtmeyer -Jody Hagins -Patrice Bensoussan -Keith Brown -Barry Hoggard -Peter J. Mason -Jerry D. De Master -Greg Gallant -wym -Karel Zuiderveld -Mike Goldman -Peter Gross -Greg Ross -Stanford S. Guillory -Peter Weat -Magnus Karlsson -Andreas Tobler -John Aughey -Knut-Havard Aksnes -Eric Mitchell -Tommy Andreasen -Slava Galperin -Jeff Olszewski -Sudhanshu Garg -Mike Preradovic -Greg Harrison -Sangwoo Jin -Jacques Salerian -Steve Coleman -Diethard Ohrt -Jacob Jones -Phil Ruelle -Sush Bankapura -Eric Covington -Darren Whobrey -Mason Taube -Rod Joseph -Hans Horsmann -Kevin Royalty -Souhad Mcheik -Mark Little -Tim Stack -Marc Engel -Uma Markandu -Henrik Nordberg -Tad Jarosinski -Andy Marchewka -Neal Norwitz -Frederic Maria -David Hooker -Christian.Destor -Andrew Hobson -Andre Folkers -Torsten Kuepper -Hao Ruan -Alexander Davidovich -Cristian Ferretti -N Becker -Yaolong Lan -Elias Sreih -Liang Chen -Mark Laffoon -Ti Z -Brian Dance -Alexey Gadzhiev -Francois Bernier -Bill Rizzi -Peter Windle -Jaepil Kim -Dmitry Goldshtain -Carl Grinstead -Henric Jungheim -Konstantinos Margaritis -Michael Preobrazhensky -Gregory D. Fee -Roland Gigler -Frank Buschmann -Eric Eide -Don Busch -Thomas Lockhart -David Hauck -Keith Rohrer -Tim Rose -Sam Rhine -Chris Schleicher -Margaret Reitz -Thomas Mehrkam -Erik Ivanenko -Sarmeesha Reddy -Steven Tine -Dave Steele -Simeon Simeonov -David H. Whittington -Ian MacDonald -Hans Ridder -Todd Mullanix -Hai Vu -Paul Francis -Kristopher Johnson -Dave Butenhof -Dominic Williams -Srikumar Kareti -Ian Pepper -Kevin Lyda -James D. Rucker -Brian Wallis -Sandeep Goyal -englishmalc@my-dejanew.com -Frank O'Dwyer -Long Hoang -Steven D. Chen -Alain Magloire -Jim Rogers -Nick Sawadsky -David Brownell -Richard Stallman -Casey Lucas -Brian C. Olson -Joseph A. Condlin -Serge Du -Mike Mazurek -Christian Schuderer -John R. Taylor -Bill Tovrea -Wallace Owen -Vyacheslav A. Batenin -Edwin D. Windes -Christopher Kohlhoff -Andreas Terstegge -Stefaan Kiebooms -Keith Nichol -Rebecca Sanford -Ram Vishnuvajjala -Tom Bradley -Shaun Ohagan -Dale Wood -Robert Flanders -Gul Onural -Stephen E Blake -Eric S Rosenthal -Sridevi Subramanian -Bruce Trask -Jake Hamby -Rick Weisner -Dennis C. De Mars -V. Lakshmanan -Hata Yoshiaki -Vidya Narayanan -Sean Landis -Youzhong Liu -John Weald -Gilbert Roulot -Gildo Medeiros Junior -Brian Peterson -Fabrice Podlyski -Darren DeRidder -John Tucker -Oleg Orlov -Timothy Canham -Randy Heiland -Joyce Fu -Surender Kumar -Pradeep Avasthi -Guicheney Christophe -Madhu Konety -Isaac Stoddard -Alvarez -Peter Brandstrom -Eugene Surovegin -Thaddeus Olczyk -John Chludzinski -Pedro Alves Ferreira -Bruce Edge -Dan Butler -Ron MacKenzie -Craig Rodrigues -Phil Y. Wang -David Brock -John Morey -Dwayne Burns -Denis Ouellet -Stefan Ullrich -Brian Raven -Gheorghe Aprotosoaie -Carsten Zerbst -Paul Calabrese -Stephane Chatre -James Whitledge -Erik Johannes -Alex Hornby -Riaz Syed -Clarence M. Weaver -Roger Egbers -Ralf Kluthe -Ruud Diterwich -Bill Nesbitt -Will Skunk -David Digby -Timothy Schimke -Jim Robinson -Peter Mueller -Raghu Nambiath -Mike Gingell -David McCann -Ruediger Franke -Brian Jones -Michael Garvin -Mike Vitalo -Kirk Davies -Arno Pernozzoli -Trey Grubbs -Matthias Schumann -John Gathright -Alexander Villatora -Hoang Duong -Michael Roth -Craig Anderson -Mitsuhiko Hara -Weihai Yu -Tal Lev-Ami -Chris Zimman -Rick Wesson -Sridhara Rao Dasu -Walter Welzel -Anthony Shipman -Tobin Bergen-Hill -Toshio Hori -John Mink -Duane Binder -Randall Sharo -Dave Madden -Cliff_H_Campbell -Narendra Ravi -Krishnakumar B. -David Sunwall -Brian Wright -Yosi Sarusi -Robert Shewan -Skye Sweeney -Lars Immisch -Adrian Mercieca -Stefan Wendt -Herbert -Clarence Bishop -Giga Giguashvili -Philipp Slusallek -Matthew Davis -Janusz Stopa -Rusty Conover -Alex Mintz -Phillippe Merle -Mark Winrock -Boris Kaminer -Martin Botzler -Lorin Hochstein -Wenli Bai -Harry Forry -Jose Rubio -Joerg Pommnitz -Mogens Hansen -Shafiek Savahl -Pierre Grondin -John Masiyowski -Uwe Landrock -Klaus Banzer -Probal Bhattacharjya -Dmitri Katchalov -Alok Gupta -Chien Yueh -John K. Black -Kamen Penev -Gregory Yarmit -Jarek Tomaszewski -Siegurd Weber -Fabrizio Giannotti -Harald Finster -Fritz Bosch -Charles Frasch -Chris Hafey -Rick Hess -David Dunn -Jaymes Galvin -Marat -Sergey Nemanov -Vladimir Kondratiev -John Glynn -Raymond Wiker -Michael Pitman -Joseph Jefferson -Engelbert Staller -George Ball -Dennis Noll -Ronald Fischer -Marvin Allen Wolfthal -Dan Gilboa -Sean Boudreau -Shalini Yajnik -Matt Thompson -Peter C Chien -Bruce Alderson -Christoph Poggemann -Travis Shirk -Alain Sauron -Yury Kuznesov -David Delano -Boris Sukholitko -Brian Mason -Thomas Groth -Damien Dufour -Paulo Breda Vieira -Samuel Stickland -Bryan Van de Ven -Greg Siebers -Rob Gabbot -Paul Carreiro -Jovan Kilibarda -Derek Dominish -Devesh Kothari -Stephen Moon -Hani Mawlawi -Benedikt Eric Heinen -Jason Topaz -Alexander Dergatch -Airat A. Sadreev -Klaus Hofmann -Miroslav Koncar -Extern Chatterji -Zach Frey -Ruibiao Qiu -Marcelo Matus -R Seshardi -Stephan Kulow -Alexander Belopolsky -Ben Bourner -Lalitha Chinthamani -Thomas Huang -Sankaranarayanan K. V -Ephraim Vider -Reid Spencer -Kevin Dalley -Jan Nielsen -Jochen Linkohr -Mirko Brandner -Yuval Yosef -Chad Elliott -David X. Callaway -Soren Ilsoe -Eric Hopper -Martin Johnson -Pierre Oberson -Chris Uzdavinis -Ishay Green -Andrey Nechypurenko -Charlie Duke -Jonathan Luellen -Andrew Psaltis -Erik Jones -Ted Burghart -Mike Winter -Judy Ward -Ken Block -Jamshid Afshar -Jerry Jiang -Rob Ruff -Hugh Arnold -Hessel Idzenga -Mark C. Barnes -Suresh Kannan -Alex Scholte -Greg Jansen -Raj Narayanaswamy -Iain Melville -Daniel Lang -Chris Leishman -Klemen Zagar -Rick Ohnemus -Adamo, Vince -Defang Zhou -Dave Zumbro -Ted Nolan -Jianfei Xu -Alvin C. Shih -J. Scott Evans -Alex Luk -Kenneth Osenbroch -Jason Czavislak -Alex Chachanashvili -Gilbert Grosdidier -James Briggs -Herbert Wang -Anders Olsson x -Sergey Gnilitsky -David Wicks -Girish Birajdar -Hajdukiewicz Markus -Gerwin Robert -Alia Atlas -David Hall -Todd Gruhn -John Hickin -Alex Brown -Rich Seibel -Jim Scheller -Bob Bouterse -Sandeep Adwankar -W. Craig Trader -Bruce McIntosh -Natarajan Kalpathy -David O'Farrell -Bob Bouterse -Malcolm Spence -Dong-Yueh Liu -Craig Ball -Norbert Krain -Adrian Miranda -Cody Dean -Hans Scharkowitz -Charles Meier -Tim Sim -Shalabh Bhatnagar -Charles Scott -Espen Harlinn -mulder -Richard L. Johnson -Tam Nguyen -Jeff Graham -Ralph Loader -Ji Wuliu -Wada Hiroshi -Sal Amander -Bill Tonseth -Torsten Pfuetzenreuter -John M. Mills -David McWeeny -Florian Lackerbauer -Manuel Benche -Steve Luoma -Roger Tragin -Alex Bangs -Yangfen Qiu -Johnny Chen -John Foresteire -Larry Peacock -Francisco Bravo -Antti Valtokari -John Smyder -Mathew Samuel -Conrad Hughes -John Rodgers -Charles Taurines -James Lacey -Nick Pratt -Xiaojun Wu -George Lafortune -Aoxiang Xu -Dima Skvortsov -Moore Y. Cao -Wai Keung Fung -Michael Laing -Benoit Viaud -Ken Weinert -Ferran Boladeres Salvad -Bill Tonseth -Steve Vranyes -Jim Melton -Ron Klein -Anuj Singhal -Henrik Kai -Dominic Hughes -Lior Shalev -Charlie Duke -William Horn -Greg Hall -Aviad Eden -Vianney Lecroart -Russell Mora -Samir Shaikh -Eric Yee -Matt Emerson -Yiu L. Lee -Pedro Brandao -Hakon Innerdal -Sami Aario -Ingo Dahm -Vijay Aswadhati -Xiaowen Wang - -Warren Miller -Youngkwan Cho -Dorr H. Clark -Dave McNeely -Eric Malenfant -Roland Fischer -Alexander Libman -Roger Larsson -Martin Stack -Michael Ravits -Derek Viljoen -Hamed Azizadah -Keo Kelly -Joachim Achtzehnter -Tomer Amiaz -Sergey Osokin -Nick Logvinov -Viatcheslav Batenine -Shashi Bhushan -Javier Corrales -J. Randy Pitz -Richard Reitmeyer -Xavier Montet -Letha Etzkorn -James Dabbs -Matej Sekoranja -Mattias Eriksson -Nicoletta Viale -George Reid -Kim Lester -Wilson Chan -William Rucklidge -Victor Krebss -Chander P. Thareja -John Mills -Haifeng Lee -Hans Utz -Askok Kumar Kalanithi -Chris Able -John Hiltenbrand -Steve Hespelt -Peter Fischer -Madhu Ramachandran -Caleb Epstein -Bruno Marconi -Ken Childress -Michael Kramer -Johnny Willemsen -Jonathan Astle -Javier Lopez Sanchez -Nir Drang -Albert Wijnja -Marcel Van Der Weert -Mervyn Quah -Giovanni Zito -Matthew Adams -Sameer Schabungbam -Jeff Butler -Roland Rüdenauer -John Buckman -Guy Rosen - -Bennett R. Stabile -Paul Caffrey -Low Aik long -Michael Rinne -Jaffar Shaikh -Roger Beck -Trueman Bill -Harold Bien -Mateu Batle -Philip Miller -Base V Paul -Evghenii Filippov -Mike Curtis -Jessie Ragsdale -Shourya Sarcar -Eric Crampton -Sandip Patel -ChenXu -Vsevolod Novikov -Brendan Corcoran -Steve Sivier -Rick Schneeman -Klaus H. Wolf -Jean-Christophe Dubois -Michael Hampel -Wei Zheng -Bernd Annamaier -Joachim Tremouroux -Momchil Velikov -Munagala Ramanath -Kevin Marshall -Adrian Mercieca -David Channon -Andy Guy -Oscar Rodriquez -Jonathan Cano -Alain Decamps -Paul Rubel -Jon Loeliger -Ricardo Chan -Sarabjeet Duhra -Sathish Tiptur -Michael Rushton -Arno Pernozzoli -Calum Mitchell -Jerry Odenwelder -Kent Stewart -Alexander Kogan -Michael Lindner -Arnaud Compan -Michael Searles -Bogdan Jeram -Sebastian Schubert -Li Zhou -Shivakumar Patil -Steve Olson -Allen Broadman -Yuriy Zaporozhets -Joe Guan -Attilio Dona -McGanahan Skjellifetti -Matthias Wittig -David Allen -Edwin McKay -Scott Bolin -Mike Anderson -David Singer -Nick Lin -Ron Hashimshony -Max Khon -Jonas Nordin -Jonathan Stockdale -Jean-Francois Daune -Wei Chiang -Rick Stille -Kirill Kuolechov -Edwin Wrench -Yung Trinh -Richard Eperjesi -Ben Strong -David Karr -Sathish Tiptur -Lu Yunhai -Christian Ewald -Samuel Qi Luo -Sergey Logvin -Orlando Ribeiro -Doug Warner -Kevin Regan -Andy Olson -Max Voronoy -Alexandr Gavrilov -Scott Gunn -Mason Deaver -Richard Huber -Glen Osterhout -YingLi -Haka -Sam Chong -Virgilijus Globis -Stefan Scherer -Pim Philipse -Michael Grove -John Mackenzie -Ricky Marek -Patrick Maassen -Christian Schuhegger -David L Smith -Rainer Doerntge -Tompa -Derek Horton -Shameek Basu -Dipti Jain -Eric Zuur -Jeffrey J. Persch -Rahul Shukla -Pierre Fayolle -Greg McCain -Matt Cheers -Benjamin Fry -Ram Ben-Yakir -Eric Desamore -John Ashmun -Przemyslaw Marciniak -Carsten Madsen -David Sperry -Ted Horst -Diana Arroyo -Peter Phillips -Benny Prijono -Roland Ziegler -Stelios Sfakianakis -Mike Letchworth -Brian Gilmer -James Dunham -Juergen Pfreundt -Joel Sherrill -Jules Colding -Stephane Pion -Raghu Narayan -Richard Goold -Nathalie D'Amours -Albert Pariante -Stephen Torri -Philippe Perrin -Gunnar Buason -David Hanvey -Jeff McNiel -Georg Lohrer -Rachel G Smith -Tom Lake -Logan Modahala -Jean Malenfant -Victor Poznyak -Juan Jose Comellas -James Dorsey -Benot Desmeules -Tom Moog -Stan Pinte -Dayisi -Peter Georgakakis -Richard Hardgrave -Mark Drijver -Guy Bolton King -Carlton Teel -Alexandre Cervieri -Darren Griffith -Sam Mok -Josh Curry -Norman Wilson -Itzhak Briskman -James Kanyok -Corey Trager -Kirat Singh -Oleg Pavliv -Frederick Niemi -Andrew Munro -Nicolas Huynh -Kevin Burge -Wayne Erchak -Yew Khong See -Greg Thompson -Mike Pyle -Kobi Cohen-Arazi -Israel Illescas Gomez -Brodie Thiesfield -Erik Toubro Nielsen -Masaoud T. Moonim -Steve Witten -Gil Rapaport -Boris Temkin -Steve Perkins -Jerry Thomas -cuma -Ron Heald -Andrew Finnell -Dan Levi -Rob Andzik -James Maynard -Francois Rioux -Ophir Bleiberg -Allen Kelly -Victor Pitchouc -Srikanth Vedire -J Shane Culpepper -Benn Howard -Steffen Hieber -Craig L. Ching -Ben Howard -Rich Newman -Kelly F. Hickel -David Trusty -Burkhard Neppert -Crawford Lodge -Scott Gaa -Jenny Kowald -Oren Zeev-Ben-Mordehai -Holger P. Krekel -Glenn Popelka -Marco Kranawetter -Tibor Kiss -Robert Davidson -Peter Crowther -Mouna Seri -Vladimir Chovanec -Alexander Rieger -Glen Coakley -Scott Plant -Wilfried Reinoehl -Sangeetha Ramadurai -Victor Chernenko -Frank Wolf -Christophe Galerne -Scott Harris -Stefan Kluehspies -Egon Wuchner -Ugendreshwar Kudupudi -Ekkehard Hoffmann -Ted Krovetz -Grzegorz Sikora -Fabris -Christina Junru -Patrick Rabau -Hyman Rosen -Torbjorn Backstrom -Robert Burke -Olivier Brunet -Bret Clark -Steve Rahn -Bertrand Motuelle -Blair Zajac -Gary Duzan -Garry Shammis -Eamonn Saunders -Yev Omenzel -John E Hein -Tino Schwarze -Don Hinton -Gergely Timar -Peter Phillips -Kuznesov Yury -Daniel Manfis -Massimo Pichini -Eyal Neuman -Dave Hale -Giulio Agostini -Werner Buchert -Kevin Cline -Mahesh Varadarajan -Olof Lindfors -Tom Wagner -Kyle Brost -Vincent Nicolas -Jonathan Wackley -Jan Kalin -Andreas Huggel -Alain Totouom -Tushar Nair -Sunny Leung -Bonifides Bautista -Brad Hoskins -Hagen Ulrich -Adrian Mercieca -Lars Steubesand -Heping He -Leo Kov -Suresh N -David Arndt -Tad Hetke -Graeme Clark -Gu Song -Chris Hughes -Fikri Pribadi -Ioulia Passynkova -Steve Osselton -Doron Rajwan -Stuart Jones -Guillaume Renaud -Tommy Svensson -Jstwo -Hartmut Quast -Ulrich Voigt -Syed Wasim Ali -Bo Balder -Michael Sawczyn -Ildar Gabdulline -David Yongqiang Wang -Andrew Foster -C Chan -Alexey Chalimov -Andrea Bernicchia -Praphul Menon -Patrick N -Garth Watney -Jim Connelly -Eyal Lubetzky -Gaoyan Xie -Michael Brinkmann -Chatchai Khumboa -Andrey Shkinev -Michael Graf -Justin Michel -Robert Martin -Charles Meidinger -Petr Tuma -Greg Burley -Marvin Greenberg -Mike Connors -Ben Flight -Bob Jolliffe -Jesse -Robert Handl -Keith Snively -Ahmed Riza -Miljenko Norsic -David Robison -Preston Elder -Eric Peters -Edward A Thompson -Eugene Alterman -Patrick Cosmo -Ran Kohavi -Harvinder Sawhney -Sorin Iordachescu -Mahesh Vedantam -Brian Olson -Roy Sharon -Charlie Grames -Tom Howard -Michael Gillmann -Yaniv Ben Ari -Victor Terber -David Sanders -Yoram Zini -Sean McCauliff -Shmulik Regev -Andrew L. Shwaika -Gerhard Voss -Gregor Bruce -Ian Cahoon -Alexei I. Adamovich -Sohail Husain -Jerome Julius -William R Volz -Koushik Banerjee -Zoran Cetusic -Patrick Bennett -Felix Wyss -Tim Rydell -Petr Shelomovsky -Juliana Diniz -Yuval Cohen -Timothy Kilbourn -Marc Walrave -Petru Marginean -Paresh Raote -Donna Maskell -Steve Ige -Marco Kranawetter -Christian Veleba -Olli Savia -Bhaskara Rao G -M Schulze -John Michael Zorko -Ami Bar -David Smith -Peter van Merkerk -Bill Dyer -Rodney Morris -Mark Hoffmann -Markus Wild -Joe Hayes -Chip Jones -Patrick J Lardieri -Ken O'Brien -Daniel Troesser -Ivan Pazymenko -Dan Green -Cyrille Chplov -Peter Heitman -Paxton Mason -Yan Dai -Sean I. Luzader -Renjie Tang -Max V. Zinal -Stan Sosnovsky -Ariel Peltz -Carsten Prescher -Raghuram Shetty -Val Dumiterscu -Oleg Kraynov -Stephan Gudmundson -Frank Kuhlman -Sorin Iordachescu -Denis Otchenashko -Marc M Adkins -Jon Lambert -Rainer Lucas -Allan S Iverson -Jeffrey Shaffer -Oleg Burlachenko -Jian Chen -Jeff Paciga -Laurent Sabourin -Frank Rybak -Tim Iskander -Michele Amoretti -Ido Yellin -Eric Page -Kevin Heifner -James Haiar -Pavel Repin -Whitney Kew -Jaroslaw Nozderko -Tom Phan -Andrew Guy -Bharathi Kangatharan -Jean Quinsat -Ma Ting Chong -Andrew Sutton -Ansgar Konermann -Amir Kunst -Daniel Garrido -Andy Alvarez -Soeren Gerlach -Vitaly Prapirny -Sasha Agranov -Ru Gunatilleke -Peter Kullmann -Lyn Headley -Jeff Adams -Alexander Maack -Timothy Culp -Oleg Terletsky -Bill Tonseth -Frank Pilhofer -Eric Quere -Keith Thornton -Nathan Krasney -Marek Maleta -David Smith -Dimitrije Jankovic -Frank O. Flemisch -Ken Sedgwick -Cary Steinmetz -Ty Tenait -Nitin Mallya -Nick Cross -Christopher W. Midgley -Wanjia -Shanliang Cheng -Andy Ling -Stephen Howard -Carsten T. Nielsen -Adee Ran - -Davide Pasetto -Michael Hornok -W.M. van den Boogaard -Carol Hunsicker -Joseph Sarbak -Ruslan Zasukhin -Colin Weaver -Kew Whitney -Sean Ogle -Tim Bradley -Kier Schmitt -George Varsamis -Alan Tanga -Bertin Colpron -Jeff Wilson -Dmitry Khrapov -Francois -Laxmikant Bopalkar -Steven Gardner -Ronald Berger -Jeremy Altavilla -Brian Appel -Lan Zhineng -Leen Van Kampen -James Beale -Mark Xu -Umberto Mascia -Marcel Loose -Christian Klutz -Ville Lehtiniemi -Chumsu Kim -Schone Mullerin -Cemal Yimaz -Newton Aird -Frederic Motte -Roger Weeks -Gautam Thaker -Christophe Juniet -Jeff W -Geir Berset -Ken Sedgwick -Vince Mounts -Vladislav Zverev -Erich Hochmuth -Nick S. Petrov -Dmitry Botcharnikov -Philippe Haussy -k2@biogate.com -Eric Frias -Antonio Saraiva -Sean M. Paus -Yuanfang Zhang -Jonathan Franklin -Cristian Ungureanu -Tommy Persson -Christian Barheine -Victor Kirk -Sandeep Neema -Mike Curtis -Artashes Ghazaryan -Ashok Sadasivan -Andreas Koehler -Thomas Devanneaux -Paul Marquis -Ed Skees -Marc Alter -Martin Geliot -Simon McQueen -Jason Pasion -Philipp Leibfried -Erwin Rol -Dirk Moermans -Huseyin Calgin -Jaroslaw Nozderko -Sharon Caspi -Thomas Natterer -Wilbur Lang -Rick Marlborough -David-A O-Brien -Shelton Tang -Frederic Langlet -Antonio Leonforte -Pablo d'Angelo -Christophe Vedel -Uwe Jaeger -Viktor Ransmayr -Daniel Bell -Mathias Waack -Mike Nordell -Tufan Oruk -Tim Smith -Andy King -Eric Strennen -Abhay Kulkarni -Ron Muck -Ma Weida -Terry Lao -Volker Boerchers -Tim Pullen -Dieter Knueppel -Marc Tardif -Guan Joe -Petr Ferschmann -Greg Mulyar -Max F. Bilyk -Danile White -Andrew Marlow -Michael F"olsl -Vincent Chau -Theo Landman -Igor Pisarenko -Dima Scub -Volodymyr Orlenko -Grigory -Michael Soden -Dennis Sporcic -Emmanuel Thevenot Beaufort -Denis Parnaland -Matthias Blankenhaus -Wolfgang Schroeder -Mario Hofmann -Bruce MacDonald -Jeffrey Graham -Otis Nyandoro -Ray Limpus -Dmitri Belogaj -Will Christof -Ferran Boladeres Salvad -Juan Carlos Montes Costa -Edward Scott -Steve Spencer -Fukasawa Mitsuo -Martin Brown -Terry Mihm -Jeff Gray -Rob Eger -Leonid Kvetnyi -Rudolf Weber -Sergei Pimenov -David Kinder -Sebastien Lalonde -Jia Wan -Bertin Colpron - -I would particularly like to thank Paul Stephenson, who worked with me -at Ericsson in the early 1990's. Paul devised the recursive Makefile -scheme that underlies this distribution and also spent countless hours -with me discussing object-oriented techniques for developing -distributed application frameworks. - -Finally, I'd also like to thank Todd L. Montgomery , -fellow heavy metal head, for fulfilling his quest to get ACE to -compile with GCC! - -In conclusion, our goal is to see ACE+TAO continue to evolve and -become a more comprehensive, robust, and well-documented C++ class -library that is freely available to researchers and developers. If -you have any improvements, suggestions, and or comments, we'd like to -hear about it. Please see the instructions in - -$ACE_ROOT/PROBLEM-REPORT-FORM -$TAO_ROOT/PROBLEM-REPORT-FORM - -for instructions on submitting suggestions or fixes. - - Thanks, - - Douglas C. Schmidt - schmidt@uci.edu diff --git a/TODO b/TODO deleted file mode 100644 index 5d077f244a6..00000000000 --- a/TODO +++ /dev/null @@ -1,264 +0,0 @@ -============================================================================ - ACE/TAO TODO List -============================================================================ - -ACE and TAO ------------ -For notes about what things need to be done for ACE and TAO, see their -respective release notes. - - -ACE/TAO Configuration Project ------------------------------ -1. Add support for Linux netdb reentrant functions (LOW PRIORITY) -2. Add support for Linux sysinfo(). (LOW PRIORITY) -3. Change tests that need ACE_CONVERT_WARNINGS_TO_ERRORS and possibly - others to use regular expression searches instead. (MAYBE NOT) -4. Process all of the remaining TODOs and FIXMEs in configure.in. -5. Ensure the configure script will work for cross-compiled platforms. -6. Make sure failed autoconf test programs in config.log failed for - the "right" reasons, not due to some typo, for example. -7. Figure out the best way to choose interface numbers for the libACE.la - -version-info libtool flag. -8. Integrate the remaining ACE subdirectories into the automake scheme. -9. Verify that the new automake build scheme works, i.e. everything - gets built correctly. -10. Really test the configure script and automake build scheme; really - "pound" on them. (e.g. test and make sure everything works on - as many platforms as possible). -11. Write documentation on how to maintain the Autoconf and Automake files. - HOWTOs/tutorials on how to use Auto{conf,make} and libtool would be - good, too. -12. Implement remaining configure script options (e.g. --enable-optimize). -13. Make sure all of the ACE feature macros are supported by the configure - script. -14. Modify ace/Makefile.am and tao/Makefile.am so that the template - sources are always included in the distribution (though not - necessarily the installation). -15. Verify that the contents of the `AUTHORS' file is correct. -16. Add some information to the `NEWS' file. -17. Add subset dependencies to subsets.m4 for libACE_Token and - libACE_Other. -18. Add ACE subset library support to the ace-config script. -19. Fix/check the minimum/maximum thread priority test. -20. Verify that the asynchronous IO checks actually work properly. -21. ACE_TEMPLATES_REQUIRE_SOURCE test fails for the wrong reasons - Solaris' linker claims that the function Foo::Foo (int) - doesn't exist. Where is it getting function Foo::Foo (int) - from? It should be getting function Foo::Foo (int). -22. Fix tests/Makefile.am to conditionally build some of the tests - since some of the ACE components that are needed for the tests - may not have been built. -23. Repeat #22 for other binaries in ACE. -24. Need to implement and/or verify tests for the following ACE macros: - -/* Define this if you don't want debug version ACE search for debug version - DLLs first before looking for the DLL names specified. */ -#undef ACE_DISABLE_DEBUG_DLL_CHECK - -+ACE_DONT_INCLUDE_ACE_SIGNAL_H - -+ACE_HAS_BROKEN_ACCEPT_ADDR - -/* Platform doesn't cast MAP_FAILED to a (void *). */ -#undef ACE_HAS_BROKEN_MAP_FAILED - -/* Compiler/platform has the wrong prototype for t_error(), i.e., - t_error(char *) rather than t_error(const char *). */ -#undef ACE_HAS_BROKEN_T_ERROR - -/* Platform has Fast-Light (FL) toolkit installed */ -#undef ACE_HAS_FL - -+ACE_HAS_FORE_ATM_WS2 -+ACE_HAS_FORE_ATM_XTI -+ACE_HAS_IP6 -+ACE_HAS_LIMITED_SELECT -+ACE_HAS_PHARLAP_RT --ACE_HAS_PTHREAD_SIGMASK -+ACE_HAS_STD_TEMPLATE_SPECIALIZATION -+ACE_HAS_TK -+ACE_HAS_WINSOCK2_GQOS -+ACE_LACKS_CHAR_RIGHT_SHIFTS -+ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS -+ACE_LACKS_NULL_PTHREAD_STATUS -+ACE_LACKS_PTHREAD_SIGMASK --ACE_LACKS_SCHED_H -+ACE_LACKS_TCP_NODELAY -+ACE_NEEDS_SCHED_H -+ACE_USES_OLD_TERMIOS_STRUCT - - - -/* Compiler enforces C++ One Definition Rule */ -#undef ACE_HAS_ONE_DEFINITION_RULE - -/* Platform has void (*)(...) prototype for pthread_key_create() destructor - (e.g., LynxOS). */ -#undef ACE_HAS_STDARG_THR_DEST - -/* Platform/compiler supports Win32 structural exceptions */ -#undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS - -/* Platform, such as AIX4, needs to wrap #include of sys/socket.h with - #undef/#define of __cplusplus. */ -#undef ACE_HAS_AIX_BROKEN_SOCKET_HEADER - -/* Compiler/platform correctly calls init()/fini() for shared libraries */ -#undef ACE_HAS_AUTOMATIC_INIT_FINI - -/* Compiler has integer overflow problem with bit-shift operations. */ -#undef ACE_HAS_BROKEN_BITSHIFT - -/* Earlier versions of HP/UX C++ are damned... */ -#undef ACE_HAS_BROKEN_HPUX_TEMPLATES - -/* FIXME: What does this do and what do we test for? */ -#undef ACE_HAS_BROKEN_IF_HEADER - -/* TODO: WE HAVE A TEST FOR THIS, BUT WE NEED TO KNOW IF IT WORKS! */ -/* Platform headers don't support prototypes */ -#undef ACE_HAS_BROKEN_MSG_H - -/* MSVC has trouble with defining STL containers for nested structs and - classes */ -#undef ACE_HAS_BROKEN_NESTED_TEMPLATES - -/* Platform has a bug with non-blocking connects (e.g., WinNT 4.0) */ -#undef ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS - -/* OS/compiler's header files are inconsistent with libC definition of - rand_r(). */ -#undef ACE_HAS_BROKEN_RANDR - -/* OS/Compiler's header files are not consistent with readv() definition. */ -#undef ACE_HAS_BROKEN_READV - -/* OS header files have some problems with XTI (HP/UX 11). */ -#undef ACE_HAS_BROKEN_XTI_MACROS - -/* Build ACE using the frigging PC DLL nonsense... */ -#undef ACE_HAS_DLL - -/* Needed for pSoS -- FIXME: need a better description */ -#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE - -/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) */ -#undef ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -/* Platform supports IP multicast */ -#undef ACE_HAS_IP_MULTICAST - -/* Platform supports IPv6 */ -#undef ACE_HAS_IP6 - -/* Causes the ACE_Object_Manager instance to be created in - main (int, char *[]), instead of as a static (global) instance. */ -#undef ACE_HAS_NONSTATIC_OBJECT_MANAGER - -/* Compiler/platform has "big" fd_set, i.e. large number of bits set - in fd_set passed back from select(). */ -#undef ACE_HAS_BIG_FD_SET - -/* Platform supports MT safe mktime() call (do any of them?) */ -#undef ACE_HAS_MT_SAFE_MKTIME - -/* Sockets may be called in multi-threaded programs */ -#undef ACE_HAS_MT_SAFE_SOCKETS - -/* Use the semaphore implementation of ACE_Message_Queue rather than the - emulated condition variable (NT and VxWorks). */ -#undef ACE_HAS_OPTIMIZED_MESSAGE_QUEUE - -/* Purify'ing. Defined on command line. */ -#undef ACE_HAS_PURIFY - -/* Quantify'ing. Defined on command line. */ -#undef ACE_HAS_QUANTIFY - -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ -#undef ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS - -/* Compiler typedefs wchar with char. */ -#undef ACE_HAS_WCHAR_TYPEDEFS_CHAR - -/* For Win32: Use Select_Reactor as default implementation of Reactor instead - of WFMO_Reactor. */ -#undef ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL - -/* Platform has bug with sigismember() (HP/UX 11). */ -#undef ACE_HAS_SIGISMEMBER_BUG - -/* Compiler requires extern "C" functions for signals. */ -#undef ACE_HAS_SIG_C_FUNC - -/* Use the STRICT compilation mode on Win32. */ -#undef ACE_HAS_STRICT - -/* Compiler/platform has strange hostent API for socket *_r() calls */ -#undef ACE_HAS_STRUCT_NETDB_DATA - -/* HP/UX has an undefined syscall for GETRUSAGE... */ -#undef ACE_HAS_SYSCALL_GETRUSAGE - -/* Platform allows multiple threads to call accept() on the same port - (e.g., WinNT). */ -#undef ACE_HAS_THREAD_SAFE_ACCEPT - -/* The pthread_keycreate() routine *must* take extern C functions. */ -#undef ACE_HAS_THR_C_DEST - -/* The pthread_create() routine *must* take extern C functions. */ -#undef ACE_HAS_THR_C_FUNC - -/* Platform/compiler supports WCHAR */ -#undef ACE_HAS_WCHAR - -/* The Win32 platform supports WinSock 2.0 */ -#undef ACE_HAS_WINSOCK2 - -/* No system support for replacing any previous mappings. */ -#undef ACE_LACKS_AUTO_MMAP_REPLACEMENT - -/* pthread_cond_timedwait does *not* reset the time argument when - the lock is acquired. */ -#undef ACE_LACKS_COND_TIMEDWAIT_RESET - -/* Platform forgot const in cond_timewait (e.g., HP/UX). */ -#undef ACE_LACKS_CONST_TIMESPEC_PTR - -/* Platform lacks SYSV message queue prototypes */ -#undef ACE_LACKS_SYSV_MSQ_PROTOS - -/* Required by platforms with small default stacks. */ -#undef ACE_NEEDS_HUGE_THREAD_STACKSIZE - -///// FIX THIS TEST ///// -/* Platform needs regexpr.h for regular expression support */ -#undef ACE_NEEDS_REGEXPR_H - -///// FIX THIS TEST ///// -/* Platform needs to #include to get thread scheduling defs. */ -#undef ACE_NEEDS_SCHED_H - -/* OS has LWPs, and when the priority of a bound thread is set, then the LWP - priority must be set also. */ -#undef ACE_NEEDS_LWP_PRIO_SET - -/* Platform redefines the t_... names (UnixWare) */ -#undef ACE_REDEFINES_XTI_FUNCTIONS - -/* Compiler's template mechanism must use a pragma. This is used for AIX's - C++ compiler. */ -#undef ACE_TEMPLATES_REQUIRE_PRAGMA - -/* Platform uses assembly symbols instead of C symbols in dlsym() */ -#undef ACE_USES_ASM_SYMBOL_IN_DLSYM - -/* When linking MFC as a static library is desired */ -#undef ACE_USES_STATIC_MFC - -/* A parameter list indicating the version of WinSock (e.g., "1, 1" is - version 1.1). */ -#undef ACE_WSOCK_VERSION diff --git a/VERSION b/VERSION deleted file mode 100644 index 17c3c4875a2..00000000000 --- a/VERSION +++ /dev/null @@ -1,11 +0,0 @@ -This is ACE version 5.3.1, released Wed Feb 19 12:50:58 2003. - -If you have any problems with or questions about ACE, please send -email to the ACE mailing list (ace-users@cs.wustl.edu), using the form -found in the file PROBLEM-REPORT-FORM. To ensure that you see responses, -please do one of the following: - - 1) Subscribe to the ace-users mail list, by sending email with - contents "subscribe ace-users" to majordomo@cs.wustl.edu. - - 2) Or, monitor the comp.soft-sys.ace newsgroup for responses. diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index b4ec9cdc6f2..00000000000 --- a/acconfig.h +++ /dev/null @@ -1,1469 +0,0 @@ -/* -*- C++ -*- */ -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H - -/* ACE configuration header file */ - -/* @TOP@ */ -/* All lines above "@TOP@" will be placed at the top of config.h.in. */ - -/* - $Id$ - - This file, "acconfig.h," contains additional preprocessor symbols that - autoheader may encounter. -*/ - - -#ifndef _POSIX_THREADS -# undef _POSIX_THREADS -#endif - -#ifndef _POSIX_THREAD_SAFE_FUNCTIONS -# undef _POSIX_THREAD_SAFE_FUNCTIONS -#endif - -/* Some platforms need _POSIX_PTHREAD_SEMANTICS to make some functions work */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif - -/* ACE currently doesn't use these; however the configure script does */ -#undef ACE_LACKS_SYSTIMES_H -#undef ACE_LACKS_UNBUFFERED_STREAMBUF -#undef ACE_HAS_STDCPP_STL_INCLUDES - -#undef ACE_HAS_LIBC_H -#undef ACE_HAS_OSFCN_H -#undef ACE_HAS_NEW_NO_H -#undef ACE_HAS_NEW_H -#undef ACE_HAS_STDEXCEPT_NO_H -#undef ACE_HAS_EXCEPTION_H - -/* Platform provides header */ -#undef ACE_HAS_SYS_IOCTL_H - -/* - * Deprecated! (or soon to be?) - */ -#undef ACE_HAS_OSF1_GETTIMEOFDAY /* timezone* 2nd parameter & no prototype */ -#undef ACE_HAS_LYNXOS_SIGNALS -#undef ACE_HAS_TANDEM_SIGNALS -#undef ACE_HAS_IRIX_53_SIGNALS - -#undef PTHREAD_STACK_MIN -#undef PTHREAD_STACK_MAX - -/* ///////////////////// OSSAMA'S NEW STUFF ////////////////// */ -/* - THIS STUFF WILL REPLACE THE ABOVE OLDER STUFF AND/OR WILL BE MERGED INTO IT -*/ - -/* results from checks for programs */ -/* results from checks for libraries */ -/* results from checks for header files */ -/* results from checks for typedefs */ -/* results from checks for structures */ -/* results from checks for variables */ -/* results from checks for compiler characteristics */ -/* results from checks for library functions */ -/* results from checks for system services */ - -/* AIX specific configuration parameters */ -#undef AIX -#undef _BSD -#undef _BSD_INCLUDES - -/* Cray specific configuration parameters */ -/* - * The following predefined macros are used within ACE ifdefs. - * These are defined when using the Cray compilers. _CRAYMPP - * is defined, for example, if you are running on a Cray T3E - * massively parallel machine. Moreover, in the case of the T3E, - * _CRAYT3E will be defined. This is used to determine the - * ACE_SIZEOF defines for primitive types. - * - * _UNICOS is defined as either the major version of UNICOS being run, - * e.g. 9 or 10 on the vector machines (e.g. C90, T90, J90, YMP, ...) - * or the major+minor+level UNICOS/mk version, e.g. 2.0.3 => 203, - * being run on an MPP machine. - * - * Summary: - * - * _CRAYMPP (defined only if running on MPP machine, e.g. T3E, UNICOS/mk) - * _CRAYT3E (defined specifically if compiling on a Cray T3E) - * _UNICOS (defined if running UNICOS or UNICOS/mk) - * - * Tested on UNICOS 10.0.0.2, UNICOS/mk 2.0.3.10 - * - * Contributed by Doug Anderson - */ -#undef _CRAYMPP -#undef _CRAYT3E -#undef _UNICOS - -/* DG/UX specific configuration parameters */ -#undef ACE_DGUX -#undef _DGUX_SOURCE -#undef _POSIX4A_DRAFT10_SOURCE -#undef _POSIX4_DRAFT_SOURCE - -/* FreeBSD specific configuration parameters */ -/* Nothing yet */ - -/* HP/UX specific configuration parameters */ -#undef HPUX -#undef HPUX_10 -#undef HPUX_11 -#undef _HPUX_SOURCE - -/* Irix specific configuration parameters */ -#undef IRIX5 -#undef IRIX6 -#undef _BSD_TYPES -#undef _SGI_MP_SOURCE -#undef _MODERN_C_ - -/* Linux specific configuration parameters */ -/* Nothing yet */ - -/* LynxOS specific configuration parameters */ -#undef __NO_INCLUDE_WARN__ -#undef _POSIX_THREADS_CALLS - -/* M88K specific configuration parameters */ -#undef m88k -#undef __m88k__ - -/* MVS specific configuration parameters */ -/* Nothing yet */ - -/* NetBSD specific configuration parameters */ -#undef ACE_NETBSD - -/* OSF/1 and Digital Unix specific configuration parameters */ -#undef DEC_CXX -#undef DIGITAL_UNIX - -/* pSOS specific configuration parameters */ -#undef ACE_PSOS -#undef ACE_PSOSIM -#undef ACE_PSOSTBD - -/* SCO specific configuration parameters */ -#undef SCO -#undef _SVID3 - -/* SunOS / Solaris specific configuration parameters */ -#undef _RWSTD_NO_EXCEPTIONS - -/* Tandem specific configuration parameters */ -/* Nothing yet */ - -/* UnixWare specific configuration parameters */ -#undef UNIXWARE -#undef UNIXWARE_2_0 -#undef UNIXWARE_2_1 - -/* VXWorks specific configuration parameters */ -#undef VXWORKS - -/* Win32 specific configuration parameters */ -#undef ACE_WIN32 - -/* ACE internals */ -#undef ACE_DEFAULT_BASE_ADDR -#undef ACE_DEFAULT_BASE_ADDRL -#undef ACE_DEFAULT_CLOSE_ALL_HANDLES -#undef ACE_DEFAULT_MAX_SOCKET_BUFSIZ -#undef ACE_DEFAULT_SELECT_REACTOR_SIZE -#undef ACE_MALLOC_ALIGN -#undef ACE_MAP_PRIVATE -#undef ACE_THR_PRI_FIFO_DEF -#undef ACE_TIMER_SKEW -#undef ACE_UINT64_FORMAT_SPECIFIER -#undef ACE_USE_RCSID -#undef IP_ADD_MEMBERSHIP -#undef IP_DROP_MEMBERSHIP - - -/* Specify sizes of given built-in types. If a size isn't defined here, - then ace/Basic_Types.h will attempt to deduce the size. */ -/* #undef ACE_SIZEOF_CHAR */ -#undef ACE_SIZEOF_SHORT -#undef ACE_SIZEOF_INT -#undef ACE_SIZEOF_LONG -#undef ACE_SIZEOF_LONG_LONG -#undef ACE_SIZEOF_VOID_P -#undef ACE_SIZEOF_FLOAT -#undef ACE_SIZEOF_DOUBLE -#undef ACE_SIZEOF_LONG_DOUBLE - - -/* typedef for ACE_UINT64 */ -/* - We only make the typedef if ACE_UINT64_TYPEDEF is defined. Otherwise, - let ace/Basic_Types.h do the work for us. -*/ -#undef ACE_UINT64_TYPEDEF -#if defined(ACE_UINT64_TYPEDEF) - typedef ACE_UINT64_TYPEDEF ACE_UINT64; -#endif /* ACE_UINT64_TYPEDEF */ - -/* typedef for ACE_LOFF_T */ -#undef ACE_LOFF_T_TYPEDEF - -/* Enable ACE inlining */ -#undef __ACE_INLINE__ - -/* Explicitly disable ACE inlining */ -#undef ACE_NO_INLINE - -/* Enable ACE_Timeprobes */ -#undef ACE_COMPILE_TIMEPROBES - -/* Enable use of GNU template repositories. GNU C++ w/repo patch - and EGCS only */ -#undef ACE_HAS_GNU_REPO - -/* Define this if you don't want debug version ACE search for debug version - DLLs first before looking for the DLL names specified. */ -#undef ACE_DISABLE_DEBUG_DLL_CHECK - -/* Platform supports Asynchronous IO calls */ -#undef ACE_HAS_AIO_CALLS - -/* Use ACE's alternate cuserid() implementation since a system - cuserid() may not exist, or it is not desirable to use it. The - implementation requires ACE_LACKS_PWD_FUNCTIONS to be undefined and - that the geteuid() system call exists. */ -#undef ACE_HAS_ALT_CUSERID - -/* Platform supports new C++ style casts (dynamic_cast, static_cast, - reinterpret_cast and const_cast) */ -#undef ACE_HAS_ANSI_CASTS - -/* Number of TSS keys, with ACE_HAS_TSS_EMULATION _only_. Defaults to 64. */ -#undef ACE_DEFAULT_THREAD_KEYS - -/* Specify this if you don't want threads to inherit parent thread's - ACE_Log_Msg properties. */ -#undef ACE_THREADS_DONT_INHERIT_LOG_MSG - -/* Compiler enforces C++ One Definition Rule */ -#undef ACE_HAS_ONE_DEFINITION_RULE - -/* OS has priocntl (2) */ -#undef ACE_HAS_PRIOCNTL - -/* Platform has the MIT pthreads APIs for timed send/recv operations */ -#undef ACE_HAS_RECV_TIMEDWAIT -#undef ACE_HAS_RECVFROM_TIMEDWAIT -#undef ACE_HAS_RECVMSG_TIMEDWAIT -#undef ACE_HAS_SEND_TIMEDWAIT -#undef ACE_HAS_SENDTO_TIMEDWAIT -#undef ACE_HAS_SENDMSG_TIMEDWAIT -#undef ACE_HAS_READ_TIMEDWAIT -#undef ACE_HAS_READV_TIMEDWAIT -#undef ACE_HAS_WRITE_TIMEDWAIT -#undef ACE_HAS_WRITEV_TIMEDWAIT - -/* Platform has enum instead of int for first argument to ::{get,set}rlimit (). - The value of this macro is the enum definition, e.g., - enum __rlimit_resource, for Linux glibc 2.0. */ -#undef ACE_HAS_RLIMIT_RESOURCE_ENUM - -/* Platform has enum instead of int for first argument to ::getrusage (). The - value of this macro is the enum definition, e.g., enum __rusage_who, for - Linux glibc 2.0. */ -#undef ACE_HAS_RUSAGE_WHO_ENUM - -/* Platform has void (*)(...) prototype for pthread_key_create() - destructor (e.g., LynxOS). */ -#undef ACE_HAS_STDARG_THR_DEST - -/* Used when users want to compile ACE with STL and STL map class - conflicts with map struct. */ -#undef ACE_HAS_STL_MAP_CONFLICT - -/* Used when users want to compile ACE with STL and STL queue class - conflicts with queue struct. */ -#undef ACE_HAS_STL_QUEUE_CONFLICT - -/* Platform/compiler supports Win32 structural exceptions */ -#undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS - -/* Platform has BSD 4.4 sendmsg()/recvmsg() APIs. */ -#undef ACE_HAS_4_4BSD_SENDMSG_RECVMSG - -/* Platform has pread() and pwrite() support */ -#undef ACE_HAS_P_READ_WRITE - -/* Platform, such as AIX4, needs to wrap #include of sys/socket.h with - #undef/#define of __cplusplus. */ -#undef ACE_HAS_AIX_BROKEN_SOCKET_HEADER - -/* Platform has AIX4 ::read_real_time () */ -#undef ACE_HAS_AIX_HI_RES_TIMER - -/* Compiler/platform supports alloca() */ -#undef ACE_HAS_ALLOCA - -/* Compiler/platform has */ -#undef ACE_HAS_ALLOCA_H - -/* CPU is an Alpha, with the rpcc instruction to read the tick timer. */ -#undef ACE_HAS_ALPHA_TIMER - -/* Compiler/platform correctly calls init()/fini() for shared libraries */ -#undef ACE_HAS_AUTOMATIC_INIT_FINI - -/* Compiler handles explicit calling of template destructor correctly. - See "ace/OS.h" for details. */ -#undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -/* Platform doesn't cast MAP_FAILED to a (void *). */ -#undef ACE_HAS_BROKEN_MAP_FAILED - -/* Compiler/platform doesn't support namespaces (or the support is not - fully implemented.) */ -#undef ACE_HAS_BROKEN_NAMESPACES - -/* Compiler has integer overflow problem with bit-shift operations. */ -#undef ACE_HAS_BROKEN_BITSHIFT - -/* Compiler can't handle const char * as rvalue in conditional operator. */ -#undef ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS - -/* Compiler can't handle calls like foo->operator T *() */ -#undef ACE_HAS_BROKEN_CONVERSIONS - -/* Compiler/platform uses macro for ctime (e.g., MVS) */ -#undef ACE_HAS_BROKEN_CTIME - -/* Platform sendv() does not work properly with datagrams, i.e. it - fails when the iovec size is IOV_MAX. */ -#undef ACE_HAS_BROKEN_DGRAM_SENDV - -/* Earlier versions of HP/UX C++ are damned... */ -#undef ACE_HAS_BROKEN_HPUX_TEMPLATES - -/* Platform headers don't support prototypes */ -#undef ACE_HAS_BROKEN_MSG_H - -/* HP/UX does not wrap the mmap(2) header files with extern "C". */ -#undef ACE_HAS_BROKEN_MMAP_H - -/* MSVC has trouble with defining STL containers for nested structs and - classes */ -#undef ACE_HAS_BROKEN_NESTED_TEMPLATES - -/* Platform has a bug with non-blocking connects (e.g., WinNT 4.0) */ -#undef ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS - -/* Platform defines struct timespec in */ -#undef ACE_HAS_BROKEN_POSIX_TIME - -/* Platform defines ctime_r, asctime_r, rand_r and getpwnam_r as macros */ -#undef ACE_HAS_BROKEN_R_ROUTINES - -/* OS/compiler's header files are inconsistent with libC definition of - rand_r(). */ -#undef ACE_HAS_BROKEN_RANDR - -/* OS/Compiler's header files are not consistent with readv() definition. */ -#undef ACE_HAS_BROKEN_READV - -/* Compiler can't handle the static ACE_Addr::sap_any construct. */ -#undef ACE_HAS_BROKEN_SAP_ANY - -/* OS/compiler omits the const from the sendmsg() prototype. */ -#undef ACE_HAS_BROKEN_SENDMSG - -/* OS/compiler omits the const from the rlimit parameter in the - setrlimit() prototype. */ -#undef ACE_HAS_BROKEN_SETRLIMIT - -/* Compiler/platform has the wrong prototype for t_error(), i.e., - t_error(char *) rather than t_error(const char *). */ -#undef ACE_HAS_BROKEN_T_ERROR - -/* platform define struct timespec members as ts_sec and ts_nsec - instead of tv_sec and tv_nsec. This is highly non-portable. - Currently only FreeBSD 2.1.x uses it. */ -#undef ACE_HAS_BROKEN_TIMESPEC_MEMBERS - -/* OS/compiler omits the const from the iovec parameter in the - writev() prototype. */ -#undef ACE_HAS_BROKEN_WRITEV - -/* OS header files have some problems with XTI (HP/UX 11). */ -#undef ACE_HAS_BROKEN_XTI_MACROS - -/* Platform has (which contains bzero() prototype) */ -#undef ACE_HAS_BSTRING - -/* Platform has . */ -#undef ACE_HAS_BYTESEX_H - -/* Platform supports the Win32 CancelIO() function (WinNT 4.0 and beyond). */ -#undef ACE_HAS_CANCEL_IO - -/* OS/platform uses char * for dlopen/dlsym args, rather than const char *. */ -#undef ACE_HAS_CHARPTR_DL - -/* OS/platform uses char * for sockopt, rather than const char * */ -#undef ACE_HAS_CHARPTR_SOCKOPT - -/* sprintf() returns char * rather than int (e.g., SunOS 4.x) */ -#undef ACE_HAS_CHARPTR_SPRINTF - -/* Platform supports POSIX 1.b clock_gettime () */ -#undef ACE_HAS_CLOCK_GETTIME - -/* Prototypes for both signal() and struct sigaction are consistent. */ -#undef ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -/* Compiler/platform has correctly prototyped header files */ -#undef ACE_HAS_CPLUSPLUS_HEADERS - -/* Platform has cygwin32 socket.h */ -#undef ACE_HAS_CYGWIN32_SOCKET_H - -/* Platform supports operations on directories via struct dirent, - readdir_r, etc. */ -#undef ACE_HAS_DIRENT - -/* For platforms, e.g., RedHat 4.2/Linux 2.0.30/Alpha, that don't - declare dl* functions as extern "C" in dlfcn.h.*/ -#undef ACE_HAS_DLFCN_H_BROKEN_EXTERN_C - -/* Build ACE using the frigging PC DLL nonsense... */ -#undef ACE_HAS_DLL - -/* Compiler supports C++ exception handling */ -#undef ACE_HAS_EXCEPTIONS - -/* Platform has Fast-Light (FL) toolkit installed */ -#undef ACE_HAS_FL - -/* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must - be defined, except on Win32) */ -#undef ACE_HAS_GETPAGESIZE - -/* Platform supports the getrusage() system call. */ -#undef ACE_HAS_GETRUSAGE - -/* Platform has a getrusage () prototype in sys/resource.h that - differs from the one in ace/OS.i. */ -#undef ACE_HAS_GETRUSAGE_PROTO - -/* GNUC 2.7.3 mistakenly takes the template definition as the place - where an inline function of an argument class is first used. */ -#undef ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS - -/* Denotes that GNU has cstring.h as standard which redefines memchr() */ -#undef ACE_HAS_GNU_CSTRING_H - -/* The GPERF utility is compiled for this platform */ -#undef ACE_HAS_GPERF - -/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) */ -#undef ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -/* Platform supports lseek64(). This should not be defined if - ACE_HAS_LLSEEK is defined. */ -#undef ACE_HAS_LSEEK64 - -/* Platform supports llseek(). This should not be defined if - ACE_HAS_LSEEK64 is defined.*/ -#undef ACE_HAS_LLSEEK - -/* Compiler/platform supports SunOS high resolution timers */ -#undef ACE_HAS_HI_RES_TIMER - -/* Compiler/platform supports idtype_t. */ -#undef ACE_HAS_IDTYPE_T - -/* Inline all the static class OS methods to remove call overhead */ -/* Note: This gets defined by OS.h if __ACE_INLINE__ is defined */ -#undef ACE_HAS_INLINED_OSCALLS - -/* Platform supports IP multicast */ -#undef ACE_HAS_IP_MULTICAST - -/* Platform supports IPv6 */ -#undef ACE_HAS_IP6 - -/* Platform supports the very odd IRIX 6.2 threads... */ -#undef ACE_HAS_IRIX62_THREADS - -/* Causes the ACE_Object_Manager instance to be created in - main (int, char *[]), instead of as a static (global) instance. */ -#undef ACE_HAS_NONSTATIC_OBJECT_MANAGER - -/* Platform supports thr_keydelete (e.g,. UNIXWARE) */ -#undef ACE_HAS_THR_KEYDELETE - -/* Platform calls thr_minstack() rather than thr_min_stack() (e.g., Tandem). */ -#undef ACE_HAS_THR_MINSTACK - -/* The rusage_t structure has only two fields. */ -#undef ACE_HAS_LIMITED_RUSAGE_T - -/* Compiler/platform has "big" fd_set, i.e. large number of bits set - in fd_set passed back from select(). */ -#undef ACE_HAS_BIG_FD_SET - -/* Platform defines MAP_FAILED as a long constant. */ -#undef ACE_HAS_LONG_MAP_FAILED - -/* Enabled malloc statistics collection. */ -#undef ACE_HAS_MALLOC_STATS - -/* Use native implementation of memchr(). */ -#undef ACE_HAS_MEMCHR - -/* Avoid #including ace/streams.h in OS.h. Users must include - ace/streams.h, , or explicitly in their code. - Some platforms, such as g++/VxWorks, have trouble compiling templates - and iostreams header because of static variables in the stream - headers. This flag will also avoid extra compilation and runtime - overheads on some platforms. */ -#undef ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION - -/* Some files, such as ace/streams.h, want to include new style C++ - stream headers. These headers are iomanip, ios, iostream, istream, - ostream, fstream and streambuf. If _all_ of these headers aren't - available, then assume that only iostream.h and fstream.h are - available. */ -#undef ACE_USES_OLD_IOSTREAMS - -/* Platform supports Microsoft Foundation Classes */ -#undef ACE_HAS_MFC - -/* Platform supports recvmsg and sendmsg */ -#undef ACE_HAS_MSG - -/* Platform supports MT safe mktime() call (do any of them?) */ -#undef ACE_HAS_MT_SAFE_MKTIME - -/* Sockets may be called in multi-threaded programs */ -#undef ACE_HAS_MT_SAFE_SOCKETS - -/* Platform uses non-const char * in calls to gethostbyaddr, - gethostbyname, getservbyname */ -#undef ACE_HAS_NONCONST_GETBY - -/* Platform has a non-const parameter to msgsnd() (e.g., SCO). */ -#undef ACE_HAS_NONCONST_MSGSND - -/* Platform's select() uses non-const timeval* (only found on Linux - right now) */ -#undef ACE_HAS_NONCONST_SELECT_TIMEVAL - -/* Platform has "old" GNU compiler, i.e. does not completely support - standard C++. (compiling with g++ prior to version 2.8.0) */ -#undef ACE_HAS_GNUG_PRE_2_8 - -/* Compiler/platform uses old malloc()/free() prototypes (ugh) */ -#undef ACE_HAS_OLD_MALLOC - -/* Uses ctime_r & asctime_r with only two parameters vs. three. */ -#undef ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -/* Platform, e.g., Solaris 2.5, only supports SCHED_OTHER POSIX - scheduling policy. */ -#undef ACE_HAS_ONLY_SCHED_OTHER - -/* Use the semaphore implementation of ACE_Message_Queue rather than - the emulated condition variable (NT and VxWorks). */ -#undef ACE_HAS_OPTIMIZED_MESSAGE_QUEUE - -/* Platform supports the OSF TLI timod STREAMS module */ -#undef ACE_HAS_OSF_TIMOD_H - -/* Platform is an Intel Pentium microprocessor. */ -#undef ACE_HAS_PENTIUM - -/* Platform contains */ -#undef ACE_HAS_POLL - -/* Platform supports "position-independent" features provided by - ACE_Based_Pointer<>. */ -#undef ACE_HAS_POSITION_INDEPENDENT_POINTERS - -/* Platform supports POSIX O_NONBLOCK semantics */ -#undef ACE_HAS_POSIX_NONBLOCK - -/* Platform supports POSIX real-time semaphores (e.g., VxWorks and - Solaris) */ -#undef ACE_HAS_POSIX_SEM - -/* Platform supports the POSIX struct timespec type */ -#undef ACE_HAS_POSIX_TIME - -/* Platform supports the /proc file system and defines tid_t - in */ -#undef ACE_HAS_PROC_FS - -/* Platform supports PowerPC time-base register. */ -#undef ACE_HAS_POWERPC_TIMER - -/* Platform supports the prusage_t struct */ -#undef ACE_HAS_PRUSAGE_T - -/* Platform supports POSIX Threads */ -#undef ACE_HAS_PTHREADS - -/* Platform supports POSIX Threads .4a Draft 4 */ -#undef ACE_HAS_PTHREADS_DRAFT4 - -/* Platform supports POSIX Threads .4a Draft 6 */ -#undef ACE_HAS_PTHREADS_DRAFT6 - -/* Platform supports POSIX Threads .1c Draft 7 */ -#undef ACE_HAS_PTHREADS_DRAFT7 - -/* Platform supports POSIX.1c-1995 threads */ -#undef ACE_HAS_PTHREADS_STD - -/* Platform has the UNIX98 extensions to Pthreads (suspend, continue, - rwlocks) */ -#undef ACE_HAS_PTHREADS_UNIX98_EXT - -/* Platform has pthread_condattr_setkind_np(). */ -#undef ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP - -/* Platform has pthread_mutexattr_setkind_np(). */ -#undef ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP - -/* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and - PTHREAD_PROCESS_SHARED values */ -#undef ACE_HAS_PTHREAD_PROCESS_ENUM - -/* Purify'ing. Defined on command line. */ -#undef ACE_HAS_PURIFY - -/* Quantify'ing. Defined on command line. */ -#undef ACE_HAS_QUANTIFY - -/* Mutexes are inherently recursive (e.g., Win32) */ -#undef ACE_HAS_RECURSIVE_MUTEXES - -/* Platform will recurse infinitely on thread exits from TSS cleanup - routines (e.g., AIX) */ -#undef ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS - -/* Platform supports reentrant functions (i.e., all the POSIX *_r - functions). */ -#undef ACE_HAS_REENTRANT_FUNCTIONS - -/* Solaris for intel uses macros for fstat() and stat(), these are - wrappers for _fxstat() and _xstat() uses of the macros. Causes - compile and runtime problems. */ -#undef ACE_HAS_X86_STAT_MACROS - -/* Platform has support for multi-byte character support compliant - with the XPG4 Worldwide Portability Interface wide-character - classification. */ -#undef ACE_HAS_XPG4_MULTIBYTE_CHAR - -/* No system support for replacing any previous mappings. */ -#undef ACE_LACKS_AUTO_MMAP_REPLACEMENT - -/* Platform lacks support for the standard C++ auto_ptr class */ -#undef ACE_LACKS_AUTO_PTR - -/* Compiler/platform standard C++ auto_ptr implementation lacks - reset() method */ -#undef ACE_AUTO_PTR_LACKS_RESET - -/* Compiler/platform lacks the standard C library bsearch() function */ -#undef ACE_LACKS_BSEARCH - -/* Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but does not define - CMSG_DATA (cmsg) macro. */ -#undef ACE_LACKS_CMSG_DATA_MACRO - -/* Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but its cmsghdr - structure does not contain an 'unsigned char cmsg_data[0]' member. - (This may be 'unsigned char __cmsg_data[0]' on some platforms, in - which case we need another macro.) */ -#undef ACE_LACKS_CMSG_DATA_MEMBER - -/* Compiler/platform lacks the standard C library qsort() function */ -#undef ACE_LACKS_QSORT - -/* Platform lacks POSIX-style fcntl () */ -#undef ACE_LACKS_FCNTL - -/* Platform lacks fsync() */ -#undef ACE_LACKS_FSYNC - -/* Compiler does not support dynamic_cast. Usually used with - ACE_HAS_ANSI_CASTS */ -#undef ACE_LACKS_RTTI - -/* Platform lacks readdir_r() */ -#undef ACE_LACKS_READDIR_R - -/* Platform lacks seekdir() */ -#undef ACE_LACKS_SEEKDIR - -/* Platform lacks telldir() */ -#undef ACE_LACKS_TELLDIR - -/* Platform can't handle "inline" keyword correctly. */ -#undef ACE_LACKS_INLINE_FUNCTIONS - -/* Iostreams are not supported adequately on the given platform. */ -#undef ACE_LACKS_IOSTREAM_TOTALLY - -/* Platform does not support reentrant netdb functions - (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, - gethostbyname_r, getservbyname_r). */ -#undef ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -/* Platform supports the POSIX regular expression library */ -#undef ACE_HAS_REGEX - -/* Platform has special header for select(). */ -#undef ACE_HAS_SELECT_H - -/* For Win32: Use Select_Reactor as default implementation of Reactor - instead of WFMO_Reactor. */ -#undef ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL - -/* Compiler/platform defines a union semun for SysV shared memory */ -#undef ACE_HAS_SEMUN - -/* Platform has a function to set t_errno (e.g., Tandem). */ -#undef ACE_HAS_SET_T_ERRNO - -/* Platform has shm_open() */ -#undef ACE_HAS_SHM_OPEN - -/* Platform supports SVR4 extended signals */ -#undef ACE_HAS_SIGINFO_T - -/* Platform has bug with sigismember() (HP/UX 11). */ -#undef ACE_HAS_SIGISMEMBER_BUG - -/* Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., - SCO and FreeBSD) */ -#undef ACE_HAS_SIG_MACROS - -/* Platform supports the Win32 SignalObjectAndWait() function (WinNT - 4.0 and beyond). */ -#undef ACE_HAS_SIGNAL_OBJECT_AND_WAIT - -/* Automatically restart OS system calls when EINTR occurs */ -#undef ACE_HAS_SIGNAL_SAFE_OS_CALLS - -/* Platform has the sigsuspend() system call */ -#undef ACE_HAS_SIGSUSPEND - -/* Platform has the sigtimedwait() system call */ -#undef ACE_HAS_SIGTIMEDWAIT - -/* Platform/compiler has the sigwait(2) prototype */ -#undef ACE_HAS_SIGWAIT - -/* Compiler/platform defines the sig_atomic_t typedef */ -#undef ACE_HAS_SIG_ATOMIC_T - -/* Compiler requires extern "C" functions for signals. */ -#undef ACE_HAS_SIG_C_FUNC - -/* Platform supports new BSD inet_addr len field. */ -#undef ACE_HAS_SIN_LEN - -/* OS/compiler uses size_t * rather than int * for socket lengths */ -#undef ACE_HAS_SIZET_SOCKET_LEN - -/* Platform requires (struct sockaddr *) for msg_name field of - struct msghdr. */ -#undef ACE_HAS_SOCKADDR_MSG_NAME - -/* Compiler/platform provides the sys/sockio.h file */ -#undef ACE_HAS_SOCKIO_H - -/* Platform provides socklen_t type, such as Linux with glibc2. */ -#undef ACE_HAS_SOCKLEN_T - -/* Compiler has brain-damaged SPARCwork SunOS 4.x signal prototype... */ -#undef ACE_HAS_SPARCWORKS_401_SIGNALS - -/* Compiler supports the ssize_t typedef */ -#undef ACE_HAS_SSIZE_T - -/* Platform supports UNIX International Threads */ -#undef ACE_HAS_STHREADS - -/* Platform has thr_yield() */ -#undef ACE_HAS_THR_YIELD - -/* Platform/compiler supports Standard C++ Library */ -#undef ACE_HAS_STANDARD_CPP_LIBRARY - -/* Compiler/platform supports struct strbuf */ -#undef ACE_HAS_STRBUF_T - -/* Platform/compiler lacks strdup() (e.g., VxWorks, Chorus, WinCE) */ -#undef ACE_HAS_STRDUP_EMULATION - -/* Compile ACE_OS::strptime() wrapper into ACE. */ -#undef ACE_HAS_STRPTIME - -/* Platform supports STREAMS */ -#undef ACE_HAS_STREAMS - -/* Platform supports STREAM pipes */ -#undef ACE_HAS_STREAM_PIPES - -/* Compiler/platform supports strerror () */ -#undef ACE_HAS_STRERROR - -/* Use the STRICT compilation mode on Win32. */ -#undef ACE_HAS_STRICT - -/* Platform/Compiler supports a String class (e.g., GNU or Win32). */ -#undef ACE_HAS_STRING_CLASS - -/* Platform has (which contains bzero() prototype) */ -#undef ACE_HAS_STRINGS - -/* Compiler/platform has strange hostent API for socket *_r() calls */ -#undef ACE_HAS_STRUCT_NETDB_DATA - -/* Platform has void * as second parameter to gettimeofday and a has a - prototype */ -#undef ACE_HAS_SUNOS4_GETTIMEOFDAY - -/* Compiler has horrible SunOS 4.x signal handlers... */ -#undef ACE_HAS_SUNOS4_SIGNAL_T - -/* Compiler/platform supports SVR4 dynamic linking semantics */ -#undef ACE_HAS_SVR4_DYNAMIC_LINKING - -/* Compiler/platform supports SVR4 gettimeofday() prototype but - doesn't have a prototype */ -#undef ACE_HAS_SVR4_GETTIMEOFDAY - -/* Compiler/platform supports SVR4 signal typedef. */ -#undef ACE_HAS_SVR4_SIGNAL_T - -/* Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff). */ -#undef ACE_HAS_SVR4_TLI - -/* HP/UX has an undefined syscall for GETRUSAGE. */ -#undef ACE_HAS_SYSCALL_GETRUSAGE - -/* Compiler/platform contains the file. */ -#undef ACE_HAS_SYSCALL_H - -/* Platform provides header */ -#undef ACE_HAS_SYSENT_H - -/* Platform supports system configuration information */ -#undef ACE_HAS_SYSINFO - -/* Platform supports System V IPC (most versions of UNIX, but not Win32) */ -#undef ACE_HAS_SYSV_IPC - -/* Platform/compiler supports _sys_errlist symbol */ -#undef ACE_HAS_SYS_ERRLIST - -/* Platform provides header */ -#undef ACE_HAS_SYS_FILIO_H - -/* Compiler/platform supports _sys_siglist array */ -#undef ACE_HAS_SYS_SIGLIST - -/* Platform provides header */ -#undef ACE_HAS_SYS_XTI_H - -/* Compiler implements template specialization */ -#undef ACE_HAS_TEMPLATE_SPECIALIZATION - -/* Compiler supports standard C++ template specializations - (e.g. "template <>" syntax.) */ -#undef ACE_HAS_STD_TEMPLATE_SPECIALIZATION - -/* Compiler supports standard C++ template method specializations - (e.g. "template <>" syntax.) */ -#undef ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION - -/* Compiler implements templates that support typedefs inside of - classes used as formal arguments to a template class. */ -#undef ACE_HAS_TEMPLATE_TYPEDEFS - -/* Platform has terminal ioctl flags like TCGETS and TCSETS. */ -#undef ACE_HAS_TERM_IOCTLS - -/* Platform supports threads */ -#undef ACE_HAS_THREADS - -/* Platform allows multiple threads to call accept() on the same port - (e.g., WinNT). */ -#undef ACE_HAS_THREAD_SAFE_ACCEPT - -/* Platform has thread_self() rather than pthread_self() (e.g., - DCETHREADS and AIX) */ -#undef ACE_HAS_THREAD_SELF - -/* Compiler/platform has thread-specific storage */ -#undef ACE_HAS_THREAD_SPECIFIC_STORAGE - -/* The pthread_keycreate() routine *must* take extern C functions. */ -#undef ACE_HAS_THR_C_DEST - -/* The pthread_create() routine *must* take extern C functions. */ -#undef ACE_HAS_THR_C_FUNC - -/* Platform/compiler supports timezone * as second parameter to - gettimeofday() and has a prototype*/ -#undef ACE_HAS_TIMEZONE_GETTIMEOFDAY - -/* Platform supports TLI timod STREAMS module */ -#undef ACE_HAS_TIMOD_H - -/* Platform supports TLI tiuser header */ -#undef ACE_HAS_TIUSER_H - -/* Platform does not protect with extern "C" */ -#undef ACE_HAS_TIUSER_H_BROKEN_EXTERN_C - -/* Platform supports TLI. Also see ACE_TLI_TCP_DEVICE. */ -#undef ACE_HAS_TLI - -/* Platform provides TLI function prototypes */ -#undef ACE_HAS_TLI_PROTOTYPES - -/* ACE provides TSS emulation. See also ACE_DEFAULT_THREAD_KEYS. */ -#undef ACE_HAS_TSS_EMULATION - -/* Platform supports ualarm() */ -#undef ACE_HAS_UALARM - -/* Platform supports ucontext_t (which is used in the extended signal API). */ -#undef ACE_HAS_UCONTEXT_T - -/* The wait() system call takes a (union wait *) rather than int * */ -#undef ACE_HAS_UNION_WAIT - -/* Has inconsistent SVR4 signal stuff, but not the same as the other - platforms */ -#undef ACE_HAS_UNIXWARE_SVR4_SIGNAL_T - -/* Platform/compiler supports wchar_t */ -#undef ACE_HAS_WCHAR - -/* Platform has header file */ -#undef ACE_HAS_UTIME - -/* Compiler supports explicit constructors. */ -#undef ACE_HAS_EXPLICIT_KEYWORD - -/* Compiler supports the C++ `mutable' keyword. */ -#undef ACE_HAS_MUTABLE_KEYWORD - -/* Compiler supports the C++ typename keyword */ -#undef ACE_HAS_TYPENAME_KEYWORD - -/* Compiler supports the new using keyword for C++ namespaces. */ -#undef ACE_HAS_USING_KEYWORD - -/* Prints out console message in ACE_NOTSUP. Useful for tracking down - origin of ACE_NOTSUP. */ -#undef ACE_HAS_VERBOSE_NOTSUP - -/* Platform requires void * for mmap(). */ -#undef ACE_HAS_VOIDPTR_MMAP - -/* OS/compiler uses void * arg 4 setsockopt() rather than const char * */ -#undef ACE_HAS_VOIDPTR_SOCKOPT - -/* The Win32 platform support TryEnterCriticalSection() (WinNT 4.0 and - beyond) */ -#undef ACE_HAS_WIN32_TRYLOCK - -/* The Win32 platform supports WinSock 2.0 */ -#undef ACE_HAS_WINSOCK2 - -/* Platform has the XLI version of TLI */ -#undef ACE_HAS_XLI - -/* Platform has Xt Intrinsics Toolkit */ -#undef ACE_HAS_XT - -/* Platform does not have Motif X toolkit available */ -#undef ACE_LACKS_MOTIF - -/* Platform has XTI (X/Open-standardized superset of TLI). Implies - ACE_HAS_TLI but uses a different header file. */ -#undef ACE_HAS_XTI - -/* Platform lacks access() (e.g., VxWorks and Chorus) */ -#undef ACE_LACKS_ACCESS - -/* Platform can not build ace/IOStream{,_T}.cpp. This does not - necessarily mean that the platform does not support iostreams. */ -#undef ACE_LACKS_ACE_IOSTREAM - -/* Do not compile support for the "other" ACE features, such as CORBA - handling, name services, and QOS. */ -#undef ACE_LACKS_ACE_OTHER - -/* Do not compile support for the ACE Service Configurator. */ -#undef ACE_LACKS_ACE_SVCCONF - -/* Do not compile support for the ACE Token feature. */ -#undef ACE_LACKS_ACE_TOKEN - -/* Platform lacks condition variables (e.g., Win32 and VxWorks) */ -#undef ACE_LACKS_COND_T - -/* pthread_cond_timedwait does *not* reset the time argument when - the lock is acquired. */ -#undef ACE_LACKS_COND_TIMEDWAIT_RESET - -/* Platform has no implementation of pthread_condattr_setpshared(), even - though it supports pthreads! */ -#undef ACE_LACKS_CONDATTR_PSHARED - -/* Platform uses struct strbuf * rather than const struct strbuf * - (e.g., HP/UX 10.x) */ -#undef ACE_LACKS_CONST_STRBUF_PTR - -/* Platform forgot const in cond_timewait (e.g., HP/UX). */ -#undef ACE_LACKS_CONST_TIMESPEC_PTR - -/* Platform lacks difftime() implementation */ -#undef ACE_LACKS_DIFFTIME - -/* Platform lacks the exec() family of system calls (e.g., Win32, - VxWorks, Chorus) */ -#undef ACE_LACKS_EXEC - -/* Platform lacks file locking mechanism */ -#undef ACE_LACKS_FILELOCKS - -/* Platform does not support floating point operations */ -#undef ACE_LACKS_FLOATING_POINT - -/* Platform lacks the fork() system call (e.g., Win32, VxWorks, Chorus) */ -#undef ACE_LACKS_FORK - -/* Platform lacks the getopt() prototype (e.g., LynxOS) */ -#undef ACE_LACKS_GETOPT_PROTO - -/* Platform lacks getpgid() call (e.g., Win32, Chorus, and FreeBSD). */ -#undef ACE_LACKS_GETPGID - -/* Platform lacks getppid() call. */ -#undef ACE_LACKS_GETPPID - -/* Platform lacks setregid() call. */ -#undef ACE_LACKS_SETREGID - -/* Platform lacks setreuid() call. */ -#undef ACE_LACKS_SETREUID - -/* Platforms lacks getservbyname() (e.g., VxWorks and Chorus). */ -#undef ACE_LACKS_GETSERVBYNAME - -/* iostream header does not declare ipfx (), opfx (), etc. */ -#undef ACE_LACKS_IOSTREAM_FX - -/* Platform lacks streambuf "linebuffered ()". */ -#undef ACE_LACKS_LINEBUFFERED_STREAMBUF - -/* Compiler/platform does not support the unsigned long long datatype. */ -#undef ACE_LACKS_LONGLONG_T - -/* Platform lacks the lstat() function. */ -#undef ACE_LACKS_LSTAT - -/* Platform does not have u_longlong_t typedef */ -#undef ACE_LACKS_U_LONGLONG_T - -/* Platform lacks madvise() (e.g., Linux) */ -#undef ACE_LACKS_MADVISE - -/* Platform lacks malloc.h */ -#undef ACE_LACKS_MALLOC_H - -/* Platform lacks memory.h (e.g., VxWorks and Chorus) */ -#undef ACE_LACKS_MEMORY_H - -/* Platform lacks mkfifo(), e.g. VxWorks, Chorus, pSoS, and WinNT. */ -#undef ACE_LACKS_MKFIFO - -/* ACE has no mktemp() */ -#undef ACE_LACKS_MKTEMP - -/* The platform doesn't have mmap(2) (e.g., SCO UNIX). */ -#undef ACE_LACKS_MMAP - -/* Platform/compiler doesn't have open() mode masks. */ -#undef ACE_LACKS_MODE_MASKS - -/* The platform doesn't have mprotect(2) (e.g., EPLX real time OS from CDC - (based on LYNX)) */ -#undef ACE_LACKS_MPROTECT - -/* Platform defines ACE_HAS_MSG, but lacks msg_accrights{,len}. */ -#undef ACE_LACKS_MSG_ACCRIGHTS - -/* Platform lacks struct msgbuf (e.g., NT and MSV). */ -#undef ACE_LACKS_MSGBUF_T - -/* Platform lacks msync() */ -#undef ACE_LACKS_MSYNC - -/* Platform doesn't support "sync" third argument to msync (?) */ -#undef ACE_HAS_BROKEN_NETBSD_MSYNC - -/* Platform doesn't support tempnam */ -#undef ACE_LACKS_TEMPNAM - -/* Platform lacks pthread_mutexattr_setpshared(). */ -#undef ACE_LACKS_MUTEXATTR_PSHARED - -/* OS requires non-null status pointer for ::pthread_join () */ -#undef ACE_LACKS_NULL_PTHREAD_STATUS - -/* Platform lacks (e.g., MVS) */ -#undef ACE_LACKS_PARAM_H - -/* Platform lacks named POSIX semaphores (e.g., Chorus) */ -#undef ACE_LACKS_NAMED_POSIX_SEM - -/* Platform lacks native strptime() implementation. */ -#undef ACE_LACKS_NATIVE_STRPTIME - -/* Platform/compiler lacks {get,set}rlimit() function (e.g., VxWorks, - Chorus, and SCO UNIX) */ -#undef ACE_LACKS_RLIMIT - -/* Platform/compiler lacks {get,set}rlimit() prototypes (e.g., Tandem) */ -#undef ACE_LACKS_RLIMIT_PROTOTYPE - -/* Platform lacks POSIX prototypes for certain System V functions like - shared memory and message queues. */ -#undef ACE_LACKS_POSIX_PROTOTYPES - -/* Platform lacks POSIX prototypes for certain System V functions like - shared memory and message queues. */ -#undef ACE_LACKS_SOME_POSIX_PROTOTYPES - -/* Compiler doesn't support placement operator new(size_t, void *). */ -#undef ACE_LACKS_PLACEMENT_OPERATOR_NEW - -/* Compiler doesn't support placement operator delete(void *, void *). */ -#undef ACE_LACKS_PLACEMENT_OPERATOR_DELETE - -/* Compiler complains about use of obsolete "#pragma once" */ -#undef ACE_LACKS_PRAGMA_ONCE - -/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */ -#undef ACE_LACKS_PRI_T - -/* Platform lack pthread_attr_setstackaddr() */ -#undef ACE_LACKS_THREAD_STACK_ADDR - -/* Platform lacks pthread_cancel() */ -#undef ACE_LACKS_PTHREAD_CANCEL - -/* Platform lacks pthread_sigmask () */ -#undef ACE_LACKS_PTHREAD_SIGMASK - -/* Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2) */ -#undef ACE_LACKS_PTHREAD_THR_SIGSETMASK - -/* Platfrom lack pthread_yield() support. */ -#undef ACE_LACKS_PTHREAD_YIELD - -/* Platform lacks, getpwnam(), etc. */ -#undef ACE_LACKS_PWD_FUNCTIONS - -/* Platform lacks getpwnam_r() methods (e.g., SGI 6.2). */ -#undef ACE_LACKS_PWD_REENTRANT_FUNCTIONS - -/* Platform lacks the readlink() function. */ -#undef ACE_LACKS_READLINK - -/* Platform lacks the rename() function. */ -#undef ACE_LACKS_RENAME - -/* Platform lacks recvmsg() */ -#undef ACE_LACKS_RECVMSG - -/* Platform lacks readers/writer locks. */ -#undef ACE_LACKS_RWLOCK_T - -/* Platform lacks a working sbrk() (e.g., Win32 and VxWorks) */ -#undef ACE_LACKS_SBRK - -/* Platform lacks struct sembuf (e.g., Win32 and VxWorks) */ -#undef ACE_LACKS_SEMBUF_T - -/* Platform lacks pthread_attr_setdetachstate() (e.g., HP/UX 10.x) */ -#undef ACE_LACKS_SETDETACH - -/* Platform lacks pthread_attr_setsched() (e.g. MVS) */ -#undef ACE_LACKS_SETSCHED - -/* Platform lacks struct sigaction (e.g., Win32 and Chorus) */ -#undef ACE_LACKS_SIGACTION - -/* Platform lacks "signed char" type (broken!) */ -#undef ACE_LACKS_SIGNED_CHAR - -/* Platform lacks signal sets (e.g., Chorus and Win32) */ -#undef ACE_LACKS_SIGSET - -/* Platform/compiler lacks strrchr () function. */ -#undef ACE_LACKS_STRRCHR - -/* Platforms/compiler lacks the sys_nerr variable (e.g., VxWorks and MVS). */ -#undef ACE_LACKS_SYS_NERR - -/* Platform lacks sys/msg.h (e.g., Chorus and VxWorks) */ -#undef ACE_LACKS_SYSV_MSG_H - -/* Platform lacks SYSV message queue prototypes */ -#undef ACE_LACKS_SYSV_MSQ_PROTOS - -/* Platform lacks key_t (e.g., Chorus, VxWorks, Win32) */ -#undef ACE_LACKS_KEY_T - -/* Platform lacks sendmsg() */ -#undef ACE_LACKS_SENDMSG - -/* Platform lacks the si_addr field of siginfo_t (e.g., VxWorks and - HP/UX 10.x) */ -#undef ACE_LACKS_SI_ADDR - -/* Platform lacks System V shared memory (e.g., Win32 and VxWorks) */ -#undef ACE_LACKS_SYSV_SHMEM - -/* Platform lacks the siginfo.h include file (e.g., MVS) */ -#undef ACE_LACKS_SIGINFO_H - -/* Platform doesn't support SO_SNDBUF/SO_RCVBUF (used in TAO) */ -#undef ACE_LACKS_SOCKET_BUFSIZ - -/* Platform lacks the socketpair() call (e.g., SCO UNIX) */ -#undef ACE_LACKS_SOCKETPAIR - -/* Compiler doesn't support static data member templates */ -#undef ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - -/* Compiler/platform lacks strcasecmp() (e.g., DG/UX, UNIXWARE, VXWORKS) */ -#undef ACE_LACKS_STRCASECMP - -/* Platform doesn't define struct strrecvfd. */ -#undef ACE_LACKS_STRRECVFD - -/* Platform doesn't have syscall() prototype */ -#undef ACE_LACKS_SYSCALL - -/* Platform lacks header file */ -#undef ACE_LACKS_SYS_TYPES_H - -/* Header files lack t_errno for TLI */ -#undef ACE_LACKS_T_ERRNO - -/* Platform doesn't have netinet/tcp.h */ -#undef ACE_LACKS_TCP_H - -/* OS does not support TCP_NODELAY */ -#undef ACE_LACKS_TCP_NODELAY - -/* Platform lacks pthread_attr_setscope() */ -#undef ACE_LACKS_THREAD_PROCESS_SCOPING - -/* Platform lacks pthread_attr_setstacksize() (e.g., Linux pthreads) */ -#undef ACE_LACKS_THREAD_STACK_SIZE - -/* MIT pthreads platform lacks the timedwait prototypes */ -#undef ACE_LACKS_TIMEDWAIT_PROTOTYPES - -/* Platform does not define timepec_t as a typedef for struct timespec. */ -#undef ACE_LACKS_TIMESPEC_T - -/* Platform doesn't have truncate() (e.g., vxworks) */ -#undef ACE_LACKS_TRUNCATE - -/* Platform/compiler lacks the getpgid() prototype */ -#undef ACE_LACKS_GETPGID_PROTOTYPE - -/* Platform/compiler lacks the setregid() prototype */ -#undef ACE_LACKS_SETREGID_PROTOTYPE - -/* Platform/compiler lacks the setreuid() prototype */ -#undef ACE_LACKS_SETREUID_PROTOTYPE - -/* Platform/compiler lacks the strptime() prototype */ -#undef ACE_LACKS_STRPTIME_PROTOTYPE - -/* Platform/compiler lacks the strtok_r() prototype */ -#undef ACE_LACKS_STRTOK_R_PROTOTYPE - -/* Platform/compiler lacks the lseek64() prototype. This should not - be defined if ACE_LACKS_LLSEEK_PROTOTYPE is defined. */ -#undef ACE_LACKS_LSEEK64_PROTOTYPE - -/* Platform/compiler lacks the llseek() prototype. This should not - be defined if ACE_LACKS_LSEEK64_PROTOTYPE is defined. */ -#undef ACE_LACKS_LLSEEK_PROTOTYPE - -/* Platform/compiler lacks the pread() and pwrite() prototypes */ -#undef ACE_LACKS_PREAD_PROTOTYPE - -/* Platform/compiler lacks the ualarm() prototype (e.g., Solaris) */ -#undef ACE_LACKS_UALARM_PROTOTYPE - -/* Compiler does not have any istream operator>> for chars, u_chars, or - signed chars. */ -#undef ACE_LACKS_CHAR_RIGHT_SHIFTS - -/* Compiler does not have operator>> (istream &, u_char *) or - operator>> (istream &, signed char *) */ -#undef ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS - -/* Platform lacks the ucontext.h file */ -#undef ACE_LACKS_UCONTEXT_H - -/* Platform lacks the unistd.h file (e.g., VxWorks and Win32) */ -#undef ACE_LACKS_UNISTD_H - -/* ACE platform has no UNIX domain sockets */ -#undef ACE_LACKS_UNIX_DOMAIN_SOCKETS - -/* Platform lacks full signal support (e.g., Win32 and Chorus). */ -#undef ACE_LACKS_UNIX_SIGNALS - -/* Platform lacks struct utsname (e.g., Win32 and VxWorks) */ -#undef ACE_LACKS_UTSNAME_T - -/* Platform lacks wchar_t typedef */ -#undef ACE_LACKS_WCHAR_T - -/* The bind() call will not select the port if it's 0. */ -#undef ACE_LACKS_WILDCARD_BIND - -/* Renames "main (int, char *[])", for platforms such as g++/VxWorks - that don't allow main. Requires the use of - ACE_HAS_NONSTATIC_OBJECT_MANAGER. */ -#undef ACE_MAIN - -/* Compile using multi-thread libraries */ -#undef ACE_MT_SAFE - -/* Turns off debugging features */ -#undef ACE_NDEBUG - -/* Necessary with some compilers to pass ACE_TTY_IO as parameter to - DEV_Connector. */ -#undef ACE_NEEDS_DEV_IO_CONVERSION - -/* Required by platforms with small default stacks. */ -#undef ACE_NEEDS_HUGE_THREAD_STACKSIZE - -/* OS has LWPs, and when the priority of a bound thread is set, then - the LWP priority must be set also. */ -#undef ACE_NEEDS_LWP_PRIO_SET - -/* Platform doesn't define readv, so use our own */ -#undef ACE_LACKS_READV - -/* Platform doesn't define writev, so use our own */ -#undef ACE_LACKS_WRITEV - -/* Platform needs regexpr.h for regular expression support */ -#undef ACE_NEEDS_REGEXPR_H - -/* Platform needs to #include to get thread scheduling defs. */ -#undef ACE_NEEDS_SCHED_H - -/* doesn't automatically #include */ -#undef ACE_LACKS_SYSTIME_H - -/* Compiler's 'new' throws exception on failure (ANSI C++ behavior). */ -#undef ACE_NEW_THROWS_EXCEPTIONS - -/* Turns off the LM_DEBUG and LM_ERROR logging macros... */ -#undef ACE_NLOGGING - -/* Turns off the tracing feature. */ -#undef ACE_NTRACE - -/* Defines the page size of the system (not used on Win32 or with - ACE_HAS_GETPAGESIZE). */ -#undef ACE_PAGE_SIZE - -/* Platform redefines the t_... names (UnixWare) */ -#undef ACE_REDEFINES_XTI_FUNCTIONS - -/* Platform uses int for select() rather than fd_set */ -#undef ACE_SELECT_USES_INT - -/* Compiler's template mechanism must use a pragma. This is used for - AIX's C++ compiler. */ -#undef ACE_TEMPLATES_REQUIRE_PRAGMA - -/* Compiler's template mechanim must see source code (i.e., .cpp - files). This is used for GNU G++. */ -#undef ACE_TEMPLATES_REQUIRE_SOURCE - -/* Compiler's template instantiation mechanism supports the use of - explicit C++ specializations for all used templates. This is also - used for GNU G++ if you don't use the "repo" patches. */ -#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - -/* Compiler's template instantiation mechanism supports the use of - "#pragma instantiate". Edison Design Group compilers, e.g., SGI - C++ and Green Hills 1.8.8 and later, support this. */ -#undef ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA - -/* Compiler requires a definition for a "hidden" function, e.g., a - private, unimplemented copy constructor or assignment operator. - The SGI C++ compiler needs this, in template classes, with - ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA. */ -#undef ACE_NEEDS_FUNC_DEFINITIONS - -/* Device the platform uses for TCP on TLI. Only needed if not - /dev/tcp. */ -#undef ACE_TLI_TCP_DEVICE - -/* The OS/platform supports the poll() event demultiplexor */ -#undef ACE_USE_POLL - -/* Platform has broken poll() */ -#undef ACE_POLL_IS_BROKEN - -/* Platform uses assembly symbols instead of C symbols in dlsym() */ -#undef ACE_USES_ASM_SYMBOL_IN_DLSYM - -/* When linking MFC as a static library is desired */ -#undef ACE_USES_STATIC_MFC - -/* Platform has its standard c++ library in the namespace std. */ -#undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB - -/* A parameter list indicating the version of WinSock (e.g., "1, 1" is - version 1.1). */ -#undef ACE_WSOCK_VERSION - -#undef HAVE_RESTARTABLE_SYSCALLS - - -/* @BOTTOM@ */ -/* All lines below "@BOTTOM@" will be placed at the bottom of config.h.in. */ - - -#endif /* ACE_CONFIG_H */ diff --git a/ace-config.1.in b/ace-config.1.in deleted file mode 100644 index 0fe88bb087d..00000000000 --- a/ace-config.1.in +++ /dev/null @@ -1,57 +0,0 @@ -.\" Process this file with -.\" groff -man -Tascii ace-config.1 -.\" -.TH ace-config 1 "DECEMBER 1998" "Library Configuration" "User Manuals" -.SH NAME -ace-config \- Display ACE Library Configuration -.SH SYNOPSIS -.B ace-config -.I OPTION -.B [ -.I OPTION -.B ... ] -.B [ -.I LIBRARY -.B ] -.SH DESCRIPTION -.B ace-config -is a script that is used to display what compiler flags and libraries were -used when ACE was built. -.SH OPTIONS -.IP --version -ACE version information -.IP --help -display help message and exit -.IP --cxx -C++ compiler used for compiling -.IP --cxxflags -C++ pre-processor and compiler flags -.IP --libs -library linking information -.IP --libs-only-L -the -L/-R part of -.I --libs -.IP --libs-only-l -the -l part of -.I --libs -.SH LIBRARY -.I LIBRARY -refers to the library for which the specified configuration is desired. Valid -libraries are: -.IP ace -the ACE library -.IP netsvcs -the ACE net services library -.IP tao -the ACE ORB (TAO) library -.SH FILES -.I @libdir@/aceConf.sh -.RS -Additional ACE related library configuration information. -.RE -.SH BUGS -None. -.SH AUTHOR -Ossama Othman -.SH "SEE ALSO" -.BR tao-config (1) diff --git a/ace-config.in b/ace-config.in deleted file mode 100644 index a1e19895647..00000000000 --- a/ace-config.in +++ /dev/null @@ -1,215 +0,0 @@ -#!/bin/sh -# -# $Id$ - -set -e - -prefix=@prefix@ -exec_prefix=@exec_prefix@ - -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -datadir=@datadir@ -sysconfdir=@sysconfdir@ -sharedstatedir=@sharedstatedir@ -localstatedir=@localstatedir@ -libdir=@libdir@ -infodir=@infodir@ -mandir=@mandir@ -includedir=@includedir@ - -pkgdatadir=${datadir}/@PACKAGE@ -pkglibdir=${libdir}/@PACKAGE@ -pkgincludedir=${includedir}/@PACKAGE@ - -usage() -{ - cat <Conf.sh - -is looked in for the necessary information. -EOF - - exit $1 -} - -if test $# -eq 0; then - usage 1 -fi - -cxx=false -cxxflags=false -libs_L=false -libs_l=false - -# These values are only valid for ACE. -the_compiler="@CXX@" -the_libs="@ACE_LIBDIR@ -lACE @ACE_LIBS@" -the_flags="@ACE_INCLUDEDIR@ @CXXFLAGS@" - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --version) - echo @PACKAGE@ @VERSION@ - exit 0 - ;; - --exec-prefix) - echo $exec_prefix - exit 0 - ;; - --prefix) - echo $prefix - exit 0 - ;; - --*dir) - dirname=\$`echo $1 | sed -e 's,^--,,'` - dirname=`eval echo $dirname` - test -z "$dirname" && exit 1 - echo $dirname - exit 0 - ;; - --help) - usage 0 - ;; - --cxx) - cxx=true - ;; - --cxxflags) - cxxflags=true - ;; - --libs) - libs_L=true - libs_l=true - ;; - --libs-only-L) - libs_L=true - ;; - --libs-only-l) - libs_l=true - ;; - --*) - usage 1 - ;; - ace) -# These are set before this option parsing loop begins. -# the_compiler="@CXX@" -# the_libs="$the_libs @ACE_LIBDIR@ -lACE @ACE_LIBS@" -# the_flags="$the_flags @ACE_INCLUDEDIR@ @CXXFLAGS@" - ;; - netsvcs) - echo "Currently unsupported." - exit 1 -# the_libs="$the_libs @ACE_LIBDIR@ @NETSVCS_LIBS@" -# the_flags="$the_flags @ACE_INCLUDEDIR@ @CXXFLAGS@" - ;; - tao) - # The TAO compiler should be the same as ACE's compiler! - the_compiler="`tao-config --cxx tao`" - the_libs="$the_libs `tao-config --libs tao`" - the_flags="$the_flags `tao-config --cxxflags tao`" - ;; - *) - cnf_sh=${libdir}/${1}Conf.sh - if test -f ${cnf_sh}; then - . ${cnf_sh} - up_name=`echo $1 | tr a-z A-Z` - cnf_compiler=\$${up_name}_COMPILER - cnf_libdir=\$${up_name}_LIBDIR - cnf_libs=\$${up_name}_LIBS - cnf_flags=\$${up_name}_INCLUDEDIR - the_compiler="`eval echo $cnf_compiler`" - the_libs="$the_libs `eval echo $cnf_libdir` `eval echo $cnf_libs`" - the_flags="$the_flags `eval echo $cnf_flags`" - else - echo Unknown library \`$1\' 1>&2 - fi - ;; - esac - shift -done - -if $cxx; then - all_flags="$the_compiler" -fi - -if $cxxflags; then - all_flags="$all_flags $the_flags" -fi - -if $libs_L || $libs_l; then - all_flags="$all_flags $the_libs" -fi - -if test -z "$all_flags" || test "x$all_flags" = "x "; then - exit 1 -fi - -# Straight out any possible duplicates, but be careful to -# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz' -other_flags= -lib_L_flags= -rev_libs= -for i in $all_flags; do - case "$i" in - # a library, save it for later, in reverse order - -l*) rev_libs="$i $rev_libs" ;; - -L*|-R*) - if $libs_L; then - case " $lib_L_flags " in - *\ $i\ *) ;; # already there - *) lib_L_flags="$lib_L_flags $i" ;; # add it to output - esac - fi;; - *) - case " $other_flags " in - *\ $i\ *) ;; # already there - *) other_flags="$other_flags $i" ;; # add it to output - esac ;; - esac -done - -ord_libs= -if $libs_l; then - for i in $rev_libs; do - case " $ord_libs " in - *\ $i\ *) ;; # already there - *) ord_libs="$i $ord_libs" ;; # add it to output in reverse order - esac - done -fi - -echo $other_flags $lib_L_flags $ord_libs - -exit 0 diff --git a/ace/ACE.cpp b/ace/ACE.cpp deleted file mode 100644 index f1c924305a4..00000000000 --- a/ace/ACE.cpp +++ /dev/null @@ -1,3493 +0,0 @@ -// $Id$ - -#include "ace/ACE.h" -#include "ace/Basic_Types.h" -#include "ace/Handle_Set.h" -#include "ace/Auto_Ptr.h" -#include "ace/SString.h" -#include "ace/Version.h" -#include "ace/Message_Block.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/ACE.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -ACE_RCSID(ace, ACE, "$Id$") - - // Static data members. - -// Keeps track of whether we're in some global debug mode. -char ACE::debug_ = 0; - -// Hex characters. -const ACE_TCHAR ACE::hex_chars_[] = ACE_LIB_TEXT ("0123456789abcdef"); - -// Size of a VM page. -size_t ACE::pagesize_ = 0; - -// Size of allocation granularity. -size_t ACE::allocation_granularity_ = 0; - -int -ACE::out_of_handles (int error) -{ - // EMFILE is common to all platforms. - if (error == EMFILE || -#if defined (ACE_WIN32) - // On Win32, we need to check for ENOBUFS also. - error == ENOBUFS || -#elif defined (HPUX) - // On HPUX, we need to check for EADDRNOTAVAIL also. - error == EADDRNOTAVAIL || -#elif defined (linux) - // On linux, we need to check for ENOENT also. - error == ENOENT || - // For RedHat5.2, need to check for EINVAL too. - error == EINVAL || - // Without threads check for EOPNOTSUPP - error == EOPNOTSUPP || -#elif defined (sun) - // On sun, we need to check for ENOSR also. - error == ENOSR || - // Without threads check for ENOTSUP - error == ENOTSUP || -#elif defined (__FreeBSD__) - // On FreeBSD we need to check for EOPNOTSUPP (LinuxThreads) or - // ENOSYS (libc_r threads) also. - error == EOPNOTSUPP || - error == ENOSYS || -#elif defined (__OpenBSD__) - // OpenBSD appears to return EBADF. - error == EBADF || -#elif defined (__sgi) // irix - error == ENOTSUP || -#elif defined (DIGITAL_UNIX) // osf1 - error == ENOTSUP || -#endif /* ACE_WIN32 */ - error == ENFILE) - return 1; - else - return 0; -} - -u_int -ACE::major_version (void) -{ - return ACE_MAJOR_VERSION; -} - -u_int -ACE::minor_version (void) -{ - return ACE_MINOR_VERSION; -} - -u_int -ACE::beta_version (void) -{ - return ACE_BETA_VERSION; -} - -const ACE_TCHAR * -ACE::compiler_name (void) -{ -#ifdef ACE_CC_NAME - return ACE_CC_NAME; -#else - return ""; -#endif -} - -u_int -ACE::compiler_major_version (void) -{ -#ifdef ACE_CC_MAJOR_VERSION - return ACE_CC_MAJOR_VERSION; -#else - return 0; -#endif -} - -u_int -ACE::compiler_minor_version (void) -{ -#ifdef ACE_CC_MINOR_VERSION - return ACE_CC_MINOR_VERSION; -#else - return 0; -#endif -} - -u_int -ACE::compiler_beta_version (void) -{ -#ifdef ACE_CC_BETA_VERSION - return ACE_CC_BETA_VERSION; -#else - return 0; -#endif -} - -int -ACE::select (int width, - ACE_Handle_Set *readfds, - ACE_Handle_Set *writefds, - ACE_Handle_Set *exceptfds, - const ACE_Time_Value *timeout) -{ - int result = ACE_OS::select (width, - readfds ? readfds->fdset () : 0, - writefds ? writefds->fdset () : 0, - exceptfds ? exceptfds->fdset () : 0, - timeout); - if (result > 0) - { -# if !defined (ACE_WIN64) - // This isn't needed for Windows... it's a no-op anyway. - if (readfds) - readfds->sync ((ACE_HANDLE) width); - if (writefds) - writefds->sync ((ACE_HANDLE) width); - if (exceptfds) - exceptfds->sync ((ACE_HANDLE) width); -#endif /* ACE_WIN64 */ - } - return result; -} - -int -ACE::select (int width, - ACE_Handle_Set &readfds, - const ACE_Time_Value *timeout) -{ - int result = ACE_OS::select (width, - readfds.fdset (), - 0, - 0, - timeout); - -#if !defined (ACE_WIN64) - if (result > 0) - readfds.sync ((ACE_HANDLE) width); -#endif /* ACE_WIN64 */ - return result; -} - -int -ACE::terminate_process (pid_t pid) -{ -#if defined (ACE_HAS_PHARLAP) - ACE_UNUSED_ARG (pid); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_WIN32) - // Create a handle for the given process id. - ACE_HANDLE process_handle = - ::OpenProcess (PROCESS_TERMINATE, - FALSE, // New handle is not inheritable. - pid); - - if (process_handle == ACE_INVALID_HANDLE - || process_handle == 0) - return -1; - else - { - // Kill the process associated with process_handle. - BOOL terminate_result = - ::TerminateProcess (process_handle, 0); - // Free up the kernel resources. - ACE_OS::close (process_handle); - return terminate_result; - } -#elif defined (CHORUS) - KnCap cap_; - - // Use the pid to find out the actor's capability, then kill it. -# if defined(CHORUS_4) - if (::acap (pid, &cap_) == 0) -# else - if (::acap (AM_MYSITE, pid, &cap_) == 0) -# endif - return ::akill (&cap_); - else - return -1; -#else - return ACE_OS::kill (pid, 9); -#endif /* ACE_HAS_PHARLAP */ -} - -int -ACE::process_active (pid_t pid) -{ -#if !defined(ACE_WIN32) - int retval = ACE_OS::kill (pid, 0); - - if (retval == 0) - return 1; - else if (errno == ESRCH) - return 0; - else - return -1; -#else - // Create a handle for the given process id. - ACE_HANDLE process_handle = - ::OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, pid); - if (process_handle == ACE_INVALID_HANDLE - || process_handle == 0) - return 0; - else - { - DWORD status; - int result = 1; - if (::GetExitCodeProcess (process_handle, - &status) == 0 - || status != STILL_ACTIVE) - result = 0; - - ::CloseHandle (process_handle); - return result; - } -#endif /* !ACE_WIN32 */ -} - -const ACE_TCHAR * -ACE::execname (const ACE_TCHAR *old_name) -{ -#if defined (ACE_WIN32) - const ACE_TCHAR *suffix = ACE_OS::strrchr (old_name, ACE_LIB_TEXT ('.')); - if (suffix == 0 || ACE_OS::strcasecmp (suffix, ACE_LIB_TEXT (".exe")) != 0) - { - ACE_TCHAR *new_name; - - size_t size = - ACE_OS::strlen (old_name) - + ACE_OS::strlen (ACE_LIB_TEXT (".exe")) - + 1; - - ACE_NEW_RETURN (new_name, - ACE_TCHAR[size], - 0); - ACE_TCHAR *end = new_name; - - end = ACE_OS::strecpy (new_name, old_name); - - // Concatenate the .exe suffix onto the end of the executable. - // end points _after_ the terminating nul. - ACE_OS::strcpy (end - 1, ACE_LIB_TEXT (".exe")); - - return new_name; - } -#endif /* ACE_WIN32 */ - return old_name; -} - -u_long -ACE::hash_pjw (const char *str, size_t len) -{ - u_long hash = 0; - - for (size_t i = 0; i < len; i++) - { - const char temp = str[i]; - hash = (hash << 4) + (temp * 13); - - u_long g = hash & 0xf0000000; - - if (g) - { - hash ^= (g >> 24); - hash ^= g; - } - } - - return hash; -} - -u_long -ACE::hash_pjw (const char *str) -{ - return ACE::hash_pjw (str, ACE_OS::strlen (str)); -} - -#if defined (ACE_HAS_WCHAR) -u_long -ACE::hash_pjw (const wchar_t *str, size_t len) -{ - u_long hash = 0; - - for (size_t i = 0; i < len; i++) - { - // @@ UNICODE: Does this function do the correct thing with wchar's? - - const wchar_t temp = str[i]; - hash = (hash << 4) + (temp * 13); - - u_long g = hash & 0xf0000000; - - if (g) - { - hash ^= (g >> 24); - hash ^= g; - } - } - - return hash; -} - -u_long -ACE::hash_pjw (const wchar_t *str) -{ - return ACE::hash_pjw (str, ACE_OS::strlen (str)); -} -#endif /* ACE_HAS_WCHAR */ - -// The CRC routine was taken from the FreeBSD implementation of cksum, -// that falls under the following license: -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * James W. Williams of NASA Goddard Space Flight Center. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -u_long ACE::crc_table_[] = -{ - 0x0, - 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, - 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, - 0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, - 0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x5f15adac, - 0x5bd4b01b, 0x569796c2, 0x52568b75, 0x6a1936c8, 0x6ed82b7f, - 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, 0x709f7b7a, - 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, - 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, - 0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, - 0xa4ad16ea, 0xa06c0b5d, 0xd4326d90, 0xd0f37027, 0xddb056fe, - 0xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95, - 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0xe13ef6f4, - 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0, - 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, - 0x2ac12072, 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, - 0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, 0x7897ab07, - 0x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, 0x6f52c06c, - 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, - 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, - 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, - 0xbb60adfc, 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, - 0x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, 0x902b669d, - 0x94ea7b2a, 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e, - 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, 0xc6bcf05f, - 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, - 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, - 0x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, - 0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x5c007b8a, - 0x58c1663d, 0x558240e4, 0x51435d53, 0x251d3b9e, 0x21dc2629, - 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, 0x3f9b762c, - 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, - 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, - 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, - 0xeba91bbc, 0xef68060b, 0xd727bbb6, 0xd3e6a601, 0xdea580d8, - 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3, - 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, 0xae3afba2, - 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71, - 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, - 0x857130c3, 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, - 0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, 0x7b827d21, - 0x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, 0x6c47164a, - 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, 0x18197087, - 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, - 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, - 0x2056cd3a, 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, - 0xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, - 0xdbee767c, 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18, - 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, 0x89b8fd09, - 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, - 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, - 0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4}; - -// Compute a POSIX 1003.2 checksum. The routine takes an string and -// computes the CRC for it (it stops on the first '\0' character). - -// UNICOS UINT32's are 64-bit on the Cray PVP architecture -#if defined(_UNICOS) || (ACE_SIZEOF_LONG == 8) -# define COMPUTE(var, ch) (var) = ( 0x00000000ffffffff & ((var) << 8)) ^ ACE::crc_table_[(((var) >> 24) ^ (ch))&0xff] -#else /* _UNICOS */ -# define COMPUTE(var, ch) (var) = ((var) << 8) ^ ACE::crc_table_[(((var) >> 24) ^ (ch))&0xff] -#endif /* _UNICOS */ - -u_long -ACE::crc32 (const char *string) -{ - register ACE_UINT32 crc = 0; - - u_long len = 0; - - for (const char *p = string; - *p != 0; - ++p) - { - COMPUTE (crc, *p); - ++len; - } - - // Include the length of the string. - - for (; len != 0; len >>= 8) - COMPUTE (crc, len & 0xff); - - return ~crc; -} - -u_long -ACE::crc32 (const char *buffer, ACE_UINT32 len) -{ - register ACE_UINT32 crc = 0; - - for (const char *p = buffer; - p != buffer + len; - ++p) - COMPUTE (crc, *p); - - // Include the length of the string. - - for (; len != 0; len >>= 8) - COMPUTE (crc, len & 0xff); - - return ~crc; -} - -u_long -ACE::crc32 (iovec *iov, int len) -{ - register ACE_UINT32 crc = 0; - - int total_len = 0; - - for (int i = 0; i < len; ++i) - { - for (const char *p = (char *) iov[i].iov_base; - p != (char *) iov[i].iov_base + iov[i].iov_len; - ++p) - COMPUTE (crc, *p); - - total_len += iov[i].iov_len; - } - - // Include the length of the string. - - for (; total_len != 0; total_len >>= 8) - COMPUTE (crc, total_len & 0xff); - - return ~crc; -} - -#undef COMPUTE - -#if !defined (ACE_HAS_WINCE) -ACE_TCHAR * -ACE::strenvdup (const ACE_TCHAR *str) -{ - ACE_TRACE ("ACE::strenvdup"); - - return ACE_OS::strenvdup (str); -} -#endif /* ACE_HAS_WINCE */ - -/* - -Examples: - -Source NT UNIX -================================================================== -netsvc netsvc.dll libnetsvc.so - (PATH will be (LD_LIBRARY_PATH - evaluated) evaluated) - -libnetsvc.dll libnetsvc.dll libnetsvc.dll + warning -netsvc.so netsvc.so + warning libnetsvc.so - -..\../libs/netsvc ..\..\libs\netsvc.dll ../../libs/netsvc.so - (absolute path used) (absolute path used) - -*/ - -const ACE_TCHAR * -ACE::basename (const ACE_TCHAR *pathname, ACE_TCHAR delim) -{ - ACE_TRACE ("ACE::basename"); - const ACE_TCHAR *temp = ACE_OS::strrchr (pathname, delim); - - if (temp == 0) - return pathname; - else - return temp + 1; -} - -const ACE_TCHAR * -ACE::dirname (const ACE_TCHAR *pathname, ACE_TCHAR delim) -{ - ACE_TRACE ("ACE::dirname"); - static ACE_TCHAR return_dirname[MAXPATHLEN + 1]; - - const ACE_TCHAR *temp = ACE_OS::strrchr (pathname, delim); - - if (temp == 0) - { - return_dirname[0] = '.'; - return_dirname[1] = '\0'; - - return return_dirname; - } - else - { - // When the len is truncated, there are problems! This should - // not happen in normal circomstances - size_t len = temp - pathname + 1; - if (len > (sizeof return_dirname / sizeof (ACE_TCHAR))) - len = sizeof return_dirname / sizeof (ACE_TCHAR); - - ACE_OS::strsncpy (return_dirname, - pathname, - len); - return return_dirname; - } -} - -ssize_t -ACE::recv (ACE_HANDLE handle, - void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::recv (handle, (char *) buf, len, flags); - else - { -#if defined (ACE_HAS_RECV_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday (); - timespec_t ts = copy; - return ::recv_timedwait (handle, buf, len, flags, &ts); -#else - int val = 0; - if (ACE::enter_recv_timedwait (handle, timeout, val) ==-1) - return -1; - else - { - ssize_t bytes_transferred = ACE_OS::recv (handle, (char *) buf, len, flags); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_RECV_TIMEDWAIT */ - } -} - -#if defined (ACE_HAS_TLI) - -ssize_t -ACE::t_rcv (ACE_HANDLE handle, - void *buf, - size_t len, - int *flags, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::t_rcv (handle, (char *) buf, len, flags); - else - { - int val = 0; - if (ACE::enter_recv_timedwait (handle, timeout, val) ==-1) - return -1; - else - { - ssize_t bytes_transferred = ACE_OS::t_rcv (handle, (char *) buf, len, flags); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } - } -} - -#endif /* ACE_HAS_TLI */ - -ssize_t -ACE::recv (ACE_HANDLE handle, - void *buf, - size_t n, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE::recv_i (handle, buf, n); - else - { -#if defined (ACE_HAS_READ_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday (); - timespec_t ts = copy; - return ::read_timedwait (handle, buf, n, &ts); -#else - int val = 0; - if (ACE::enter_recv_timedwait (handle, timeout, val) == -1) - return -1; - else - { - ssize_t bytes_transferred = ACE::recv_i (handle, buf, n); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_READ_TIMEDWAIT */ - } -} - -ssize_t -ACE::recvmsg (ACE_HANDLE handle, - struct msghdr *msg, - int flags, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::recvmsg (handle, msg, flags); - else - { -#if defined (ACE_HAS_RECVMSG_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday (); - timespec_t ts = copy; - return ::recvmsg_timedwait (handle, msg, flags, &ts); -#else - int val = 0; - if (ACE::enter_recv_timedwait (handle, timeout, val) == -1) - return -1; - else - { - int bytes_transferred = ACE_OS::recvmsg (handle, msg, flags); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_RECVMSG_TIMEDWAIT */ - } -} - -ssize_t -ACE::recvfrom (ACE_HANDLE handle, - char *buf, - int len, - int flags, - struct sockaddr *addr, - int *addrlen, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::recvfrom (handle, buf, len, flags, addr, addrlen); - else - { -#if defined (ACE_HAS_RECVFROM_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday (); - timespec_t ts = copy; - return ::recvfrom_timedwait (handle, buf, len, flags, addr, addrlen, &ts); -#else - int val = 0; - if (ACE::enter_recv_timedwait (handle, timeout, val) == -1) - return -1; - else - { - int bytes_transferred = ACE_OS::recvfrom (handle, buf, len, flags, addr, addrlen); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_RECVFROM_TIMEDWAIT */ - } -} - -ssize_t -ACE::recv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - int flags, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - n = ACE_OS::recv (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred, - flags); - // Check EOF. - if (n == 0) - return 0; - - // Check for other errors. - if (n == -1) - { - // Check for possible blocking. - if (errno == EWOULDBLOCK) - { - // Wait for the blocking to subside. - int result = ACE::handle_read_ready (handle, - 0); - - // Did select() succeed? - if (result != -1) - { - // Blocking subsided. Continue data transfer. - n = 0; - continue; - } - } - - // Other data transfer or select() failures. - return -1; - } - } - - return ACE_static_cast (ssize_t, bytes_transferred); -} - -ssize_t -ACE::recv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - ssize_t result = 0; - int error = 0; - - int val = 0; - ACE::record_and_set_non_blocking_mode (handle, val); - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - // Since the socket is in non-blocking mode, this call will not - // block. - n = ACE_OS::recv (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred, - flags); - - // Check for errors. - if (n == 0 || - n == -1) - { - // Check for possible blocking. - if (n == -1 && - errno == EWOULDBLOCK) - { - // Wait upto for the blocking to subside. - int rtn = ACE::handle_read_ready (handle, - timeout); - - // Did select() succeed? - if (rtn != -1) - { - // Blocking subsided in period. Continue - // data transfer. - n = 0; - continue; - } - } - - // Wait in select() timed out or other data transfer or - // select() failures. - error = 1; - result = n; - break; - } - } - - ACE::restore_non_blocking_mode (handle, val); - - if (error) - return result; - else - return ACE_static_cast (ssize_t, bytes_transferred); -} - -#if defined (ACE_HAS_TLI) - -ssize_t -ACE::t_rcv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - int *flags, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - n = ACE_OS::t_rcv (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred, - flags); - // Check EOF. - if (n == 0) - return 0; - - // Check for other errors. - if (n == -1) - { - // Check for possible blocking. - if (errno == EWOULDBLOCK) - { - // Wait for the blocking to subside. - int result = ACE::handle_read_ready (handle, - 0); - - // Did select() succeed? - if (result != -1) - { - // Blocking subsided. Continue data transfer. - n = 0; - continue; - } - } - - // Other data transfer or select() failures. - return -1; - } - } - - return bytes_transferred; -} - -ssize_t -ACE::t_rcv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - int *flags, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - ssize_t result = 0; - int error = 0; - - int val = 0; - ACE::record_and_set_non_blocking_mode (handle, val); - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - // Since the socket is in non-blocking mode, this call will not - // block. - n = ACE_OS::t_rcv (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred, - flags); - - // Check for errors. - if (n == 0 || - n == -1) - { - // Check for possible blocking. - if (n == -1 && - errno == EWOULDBLOCK) - { - // Wait upto for the blocking to subside. - int rtn = ACE::handle_read_ready (handle, - timeout); - - // Did select() succeed? - if (rtn != -1) - { - // Blocking subsided in period. Continue - // data transfer. - n = 0; - continue; - } - } - - // Wait in select() timed out or other data transfer or - // select() failures. - error = 1; - result = n; - break; - } - } - - ACE::restore_non_blocking_mode (handle, val); - - if (error) - return result; - else - return bytes_transferred; -} - -#endif /* ACE_HAS_TLI */ - -ssize_t -ACE::recv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - n = ACE::recv_i (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred); - // Check EOF. - if (n == 0) - { - return 0; - } - // Check for other errors. - if (n == -1) - { - // Check for possible blocking. - if (errno == EWOULDBLOCK) - { - // Wait for the blocking to subside. - int result = ACE::handle_read_ready (handle, - 0); - - // Did select() succeed? - if (result != -1) - { - // Blocking subsided. Continue data transfer. - n = 0; - continue; - } - } - - // Other data transfer or select() failures. - return -1; - } - } - - return ACE_static_cast (ssize_t, bytes_transferred); -} - -ssize_t -ACE::recv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - ssize_t result = 0; - int error = 0; - - int val = 0; - ACE::record_and_set_non_blocking_mode (handle, val); - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - // Since the socket is in non-blocking mode, this call will not - // block. - n = ACE::recv_i (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred); - - // Check for errors. - if (n == 0 || - n == -1) - { - // Check for possible blocking. - if (n == -1 && - errno == EWOULDBLOCK) - { - // Wait upto for the blocking to subside. - int rtn = ACE::handle_read_ready (handle, - timeout); - - // Did select() succeed? - if (rtn != -1) - { - // Blocking subsided in period. Continue - // data transfer. - n = 0; - continue; - } - } - - // Wait in select() timed out or other data transfer or - // select() failures. - error = 1; - result = n; - break; - } - } - - ACE::restore_non_blocking_mode (handle, val); - - if (error) - return result; - else - return ACE_static_cast (ssize_t, bytes_transferred); -} - -// This is basically an interface to ACE_OS::readv, that doesn't use -// the struct iovec explicitly. The ... can be passed as an arbitrary -// number of (char *ptr, int len) tuples. However, the count N is the -// *total* number of trailing arguments, *not* a couple of the number -// of tuple pairs! - -ssize_t -ACE::recv (ACE_HANDLE handle, size_t n, ...) -{ - va_list argp; - int total_tuples = ACE_static_cast (int, (n / 2)); - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::recvv (handle, iovp, total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} - -ssize_t -ACE::recvv (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::recvv (handle, iov, iovcnt); - else - { -#if defined (ACE_HAS_READV_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday (); - timespec_t ts = copy; - return ::readv_timedwait (handle, iov, iovcnt, &ts); -#else - int val = 0; - if (ACE::enter_recv_timedwait (handle, timeout, val) == -1) - return -1; - else - { - ssize_t bytes_transferred = ACE_OS::recvv (handle, iov, iovcnt); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_READV_TIMEDWAIT */ - } -} - -ssize_t -ACE::recvv_n_i (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0; - - for (int s = 0; - s < iovcnt; - ) - { - // Try to transfer as much of the remaining data as possible. - ssize_t n = ACE_OS::recvv (handle, - iov + s, - iovcnt - s); - // Check EOF. - if (n == 0) - return 0; - - // Check for other errors. - if (n == -1) - { - // Check for possible blocking. - if (errno == EWOULDBLOCK) - { - // Wait for the blocking to subside. - int result = ACE::handle_read_ready (handle, - 0); - - // Did select() succeed? - if (result != -1) - { - // Blocking subsided. Continue data transfer. - n = 0; - continue; - } - } - - // Other data transfer or select() failures. - return -1; - } - - for (bytes_transferred += n; - s < iovcnt - && n >= ACE_static_cast (ssize_t, - iov[s].iov_len); - s++) - n -= iov[s].iov_len; - - if (n != 0) - { - char *base = ACE_static_cast (char *, - iov[s].iov_base); - iov[s].iov_base = base + n; - iov[s].iov_len = iov[s].iov_len - n; - } - } - - return bytes_transferred; -} - -ssize_t -ACE::recvv_n_i (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0; - ssize_t result = 0; - int error = 0; - - int val = 0; - ACE::record_and_set_non_blocking_mode (handle, val); - - for (int s = 0; - s < iovcnt; - ) - { - // Try to transfer as much of the remaining data as possible. - // Since the socket is in non-blocking mode, this call will not - // block. - ssize_t n = ACE_OS::recvv (handle, - iov + s, - iovcnt - s); - - // Check for errors. - if (n == 0 || - n == -1) - { - // Check for possible blocking. - if (n == -1 && - errno == EWOULDBLOCK) - { - // Wait upto for the blocking to subside. - int rtn = ACE::handle_read_ready (handle, - timeout); - - // Did select() succeed? - if (rtn != -1) - { - // Blocking subsided in period. Continue - // data transfer. - n = 0; - continue; - } - } - - // Wait in select() timed out or other data transfer or - // select() failures. - error = 1; - result = n; - break; - } - - for (bytes_transferred += n; - s < iovcnt - && n >= ACE_static_cast (ssize_t, - iov[s].iov_len); - s++) - n -= iov[s].iov_len; - - if (n != 0) - { - char *base = ACE_reinterpret_cast (char *, - iov[s].iov_base); - iov[s].iov_base = base + n; - iov[s].iov_len = iov[s].iov_len - n; - } - } - - ACE::restore_non_blocking_mode (handle, val); - - if (error) - return result; - else - return bytes_transferred; -} - -ssize_t -ACE::recv_n (ACE_HANDLE handle, - ACE_Message_Block *message_block, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0; - - iovec iov[ACE_IOV_MAX]; - int iovcnt = 0; - - while (message_block != 0) - { - // Our current message block chain. - const ACE_Message_Block *current_message_block = message_block; - - while (current_message_block != 0) - { - size_t current_message_block_length = - current_message_block->length (); - char *this_rd_ptr = current_message_block->rd_ptr (); - - // Check if this block has any space for incoming data. - while (current_message_block_length > 0) - { - u_long this_chunk_length; - if (current_message_block_length > ULONG_MAX) - this_chunk_length = ULONG_MAX; - else - this_chunk_length = - ACE_static_cast (u_long, current_message_block_length); - // Collect the data in the iovec. - iov[iovcnt].iov_base = this_rd_ptr; - iov[iovcnt].iov_len = this_chunk_length; - current_message_block_length -= this_chunk_length; - this_rd_ptr += this_chunk_length; - - // Increment iovec counter. - iovcnt++; - - // The buffer is full make a OS call. @@ TODO find a way to - // find ACE_IOV_MAX for platforms that do not define it rather - // than simply setting ACE_IOV_MAX to some arbitrary value such - // as 16. - if (iovcnt == ACE_IOV_MAX) - { - size_t current_transfer = 0; - - ssize_t result = ACE::recvv_n (handle, - iov, - iovcnt, - timeout, - ¤t_transfer); - - // Add to total bytes transferred. - bytes_transferred += current_transfer; - - // Errors. - if (result == -1 || result == 0) - return result; - - // Reset iovec counter. - iovcnt = 0; - } - } - - // Select the next message block in the chain. - current_message_block = current_message_block->cont (); - } - - // Selection of the next message block chain. - message_block = message_block->next (); - } - - // Check for remaining buffers to be sent. This will happen when - // ACE_IOV_MAX is not a multiple of the number of message blocks. - if (iovcnt != 0) - { - size_t current_transfer = 0; - - ssize_t result = ACE::recvv_n (handle, - iov, - iovcnt, - timeout, - ¤t_transfer); - - // Add to total bytes transferred. - bytes_transferred += current_transfer; - - // Errors. - if (result == -1 || result == 0) - return result; - } - - // Return total bytes transferred. - return bytes_transferred; -} - -ssize_t -ACE::send (ACE_HANDLE handle, - const void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::send (handle, (const char *) buf, n, flags); - else - { -#if defined (ACE_HAS_SEND_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday(); - timespec_t ts = copy; - return ::send_timedwait (handle, buf, n, flags, &ts); -#else - int val = 0; - if (ACE::enter_send_timedwait (handle, timeout, val) == -1) - return -1; - else - { - ssize_t bytes_transferred = ACE_OS::send (handle, (const char *) buf, n, flags); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_SEND_TIMEDWAIT */ - } -} - -#if defined (ACE_HAS_TLI) - -ssize_t -ACE::t_snd (ACE_HANDLE handle, - const void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::t_snd (handle, (const char *) buf, n, flags); - else - { - int val = 0; - if (ACE::enter_send_timedwait (handle, timeout, val) == -1) - return -1; - else - { - ssize_t bytes_transferred = ACE_OS::t_snd (handle, (const char *) buf, n, flags); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } - } -} - -#endif /* ACE_HAS_TLI */ - -ssize_t -ACE::send (ACE_HANDLE handle, - const void *buf, - size_t n, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE::send_i (handle, buf, n); - else - { -#if defined (ACE_HAS_WRITE_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday (); - timespec_t ts = copy; - return ::write_timedwait (handle, buf, n, &ts); -#else - int val = 0; - if (ACE::enter_send_timedwait (handle, timeout, val) == -1) - return -1; - else - { - ssize_t bytes_transferred = ACE::send_i (handle, buf, n); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_WRITE_TIMEDWAIT */ - } -} - -ssize_t -ACE::sendmsg (ACE_HANDLE handle, - const struct msghdr *msg, - int flags, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::sendmsg (handle, msg, flags); - else - { -#if defined (ACE_HAS_SENDMSG_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday (); - timespec_t ts = copy; - return ::sendmsg_timedwait (handle, msg, flags, &ts); -#else - int val = 0; - if (ACE::enter_send_timedwait (handle, timeout, val) == -1) - return -1; - else - { - int bytes_transferred = ACE_OS::sendmsg (handle, msg, flags); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_SENDMSG_TIMEDWAIT */ - } -} - -ssize_t -ACE::sendto (ACE_HANDLE handle, - const char *buf, - int len, - int flags, - const struct sockaddr *addr, - int addrlen, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::sendto (handle, buf, len, flags, addr, addrlen); - else - { -#if defined (ACE_HAS_SENDTO_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday (); - timespec_t ts = copy; - return ::sendto_timedwait (handle, buf, len, flags, addr, addrlen, ts); -#else - int val = 0; - if (ACE::enter_send_timedwait (handle, timeout, val) == -1) - return -1; - else - { - int bytes_transferred = ACE_OS::sendto (handle, buf, len, flags, addr, addrlen); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_SENDTO_TIMEDWAIT */ - } -} - -ssize_t -ACE::send_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - n = ACE_OS::send (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred, - flags); - // Check EOF. - if (n == 0) - return 0; - - // Check for other errors. - if (n == -1) - { - // Check for possible blocking. - if (errno == EWOULDBLOCK || errno == ENOBUFS) - { - // Wait for the blocking to subside. - int result = ACE::handle_write_ready (handle, - 0); - - // Did select() succeed? - if (result != -1) - { - // Blocking subsided. Continue data transfer. - n = 0; - continue; - } - } - - // Other data transfer or select() failures. - return -1; - } - } - - return bytes_transferred; -} - -ssize_t -ACE::send_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - ssize_t result = 0; - int error = 0; - - int val = 0; - ACE::record_and_set_non_blocking_mode (handle, val); - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - // Since the socket is in non-blocking mode, this call will not - // block. - n = ACE_OS::send (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred, - flags); - - // Check for errors. - if (n == 0 || - n == -1) - { - // Check for possible blocking. - if (n == -1 && - errno == EWOULDBLOCK || errno == ENOBUFS) - { - // Wait upto for the blocking to subside. - int rtn = ACE::handle_write_ready (handle, - timeout); - - // Did select() succeed? - if (rtn != -1) - { - // Blocking subsided in period. Continue - // data transfer. - n = 0; - continue; - } - } - - // Wait in select() timed out or other data transfer or - // select() failures. - error = 1; - result = n; - break; - } - } - - ACE::restore_non_blocking_mode (handle, val); - - if (error) - return result; - else - return bytes_transferred; -} - -#if defined (ACE_HAS_TLI) - -ssize_t -ACE::t_snd_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - n = ACE_OS::t_snd (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred, - flags); - // Check EOF. - if (n == 0) - return 0; - - // Check for other errors. - if (n == -1) - { - // Check for possible blocking. - if (errno == EWOULDBLOCK || errno == ENOBUFS) - { - // Wait for the blocking to subside. - int result = ACE::handle_write_ready (handle, - 0); - - // Did select() succeed? - if (result != -1) - { - // Blocking subsided. Continue data transfer. - n = 0; - continue; - } - } - - // Other data transfer or select() failures. - return -1; - } - } - - return bytes_transferred; -} - -ssize_t -ACE::t_snd_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - ssize_t result = 0; - int error = 0; - - int val = 0; - ACE::record_and_set_non_blocking_mode (handle, val); - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - // Since the socket is in non-blocking mode, this call will not - // block. - n = ACE_OS::t_snd (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred, - flags); - - // Check for errors. - if (n == 0 || - n == -1) - { - // Check for possible blocking. - if (n == -1 && - errno == EWOULDBLOCK || errno == ENOBUFS) - { - // Wait upto for the blocking to subside. - int rtn = ACE::handle_write_ready (handle, - timeout); - - // Did select() succeed? - if (rtn != -1) - { - // Blocking subsided in period. Continue - // data transfer. - n = 0; - continue; - } - } - - // Wait in select() timed out or other data transfer or - // select() failures. - error = 1; - result = n; - break; - } - } - - ACE::restore_non_blocking_mode (handle, val); - - if (error) - return result; - else - return bytes_transferred; -} - -#endif /* ACE_HAS_TLI */ - -ssize_t -ACE::send_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - n = ACE::send_i (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred); - // Check EOF. - if (n == 0) - return 0; - - // Check for other errors. - if (n == -1) - { - // Check for possible blocking. - if (errno == EWOULDBLOCK || errno == ENOBUFS) - { - // Wait for the blocking to subside. - int result = ACE::handle_write_ready (handle, - 0); - - // Did select() succeed? - if (result != -1) - { - // Blocking subsided. Continue data transfer. - n = 0; - continue; - } - } - - // Other data transfer or select() failures. - return -1; - } - } - - return bytes_transferred; -} - -ssize_t -ACE::send_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - ssize_t n; - ssize_t result = 0; - int error = 0; - - int val = 0; - ACE::record_and_set_non_blocking_mode (handle, val); - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - // Try to transfer as much of the remaining data as possible. - // Since the socket is in non-blocking mode, this call will not - // block. - n = ACE::send_i (handle, - (char *) buf + bytes_transferred, - len - bytes_transferred); - - // Check for errors. - if (n == 0 || - n == -1) - { - // Check for possible blocking. - if (n == -1 && - errno == EWOULDBLOCK || errno == ENOBUFS) - { - // Wait upto for the blocking to subside. - int rtn = ACE::handle_write_ready (handle, - timeout); - - // Did select() succeed? - if (rtn != -1) - { - // Blocking subsided in period. Continue - // data transfer. - n = 0; - continue; - } - } - - // Wait in select() timed out or other data transfer or - // select() failures. - error = 1; - result = n; - break; - } - } - - ACE::restore_non_blocking_mode (handle, val); - - if (error) - return result; - else - return bytes_transferred; -} - -// Send N char *ptrs and int lengths. Note that the char *'s precede -// the ints (basically, an varargs version of writev). The count N is -// the *total* number of trailing arguments, *not* a couple of the -// number of tuple pairs! - -ssize_t -ACE::send (ACE_HANDLE handle, size_t n, ...) -{ - va_list argp; - int total_tuples = ACE_static_cast (int, (n / 2)); - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::sendv (handle, iovp, total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} - -ssize_t -ACE::sendv (ACE_HANDLE handle, - const iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout) -{ - if (timeout == 0) - return ACE_OS::sendv (handle, iov, iovcnt); - else - { -#if defined (ACE_HAS_WRITEV_TIMEDWAIT) - ACE_Time_Value copy = *timeout; - copy += ACE_OS::gettimeofday (); - timespec_t ts = copy; - return ::sendv_timedwait (handle, iov, iovcnt, &ts); -#else - int val = 0; - if (ACE::enter_send_timedwait (handle, timeout, val) == -1) - return -1; - else - { - ssize_t bytes_transferred = ACE_OS::sendv (handle, iov, iovcnt); - ACE::restore_non_blocking_mode (handle, val); - return bytes_transferred; - } -#endif /* ACE_HAS_WRITEV_TIMEDWAIT */ - } -} - -ssize_t -ACE::sendv_n_i (ACE_HANDLE handle, - const iovec *i, - int iovcnt, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0; - - iovec *iov = ACE_const_cast (iovec *, i); - - for (int s = 0; - s < iovcnt; - ) - { - // Try to transfer as much of the remaining data as possible. - ssize_t n = ACE_OS::sendv (handle, - iov + s, - iovcnt - s); - // Check EOF. - if (n == 0) - return 0; - - // Check for other errors. - if (n == -1) - { - // Check for possible blocking. - if (errno == EWOULDBLOCK || errno == ENOBUFS) - { - // Wait for the blocking to subside. - int result = ACE::handle_write_ready (handle, - 0); - - // Did select() succeed? - if (result != -1) - { - // Blocking subsided. Continue data transfer. - n = 0; - continue; - } - } - - // Other data transfer or select() failures. - return -1; - } - - for (bytes_transferred += n; - s < iovcnt - && n >= ACE_static_cast (ssize_t, - iov[s].iov_len); - s++) - n -= iov[s].iov_len; - - if (n != 0) - { - char *base = ACE_reinterpret_cast (char *, - iov[s].iov_base); - iov[s].iov_base = base + n; - iov[s].iov_len = iov[s].iov_len - n; - } - } - - return bytes_transferred; -} - -ssize_t -ACE::sendv_n_i (ACE_HANDLE handle, - const iovec *i, - int iovcnt, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0; - ssize_t result = 0; - int error = 0; - - int val = 0; - ACE::record_and_set_non_blocking_mode (handle, val); - - iovec *iov = ACE_const_cast (iovec *, i); - - for (int s = 0; - s < iovcnt; - ) - { - // Try to transfer as much of the remaining data as possible. - // Since the socket is in non-blocking mode, this call will not - // block. - ssize_t n = ACE_OS::sendv (handle, - iov + s, - iovcnt - s); - - // Check for errors. - if (n == 0 || - n == -1) - { - // Check for possible blocking. - if (n == -1 && - errno == EWOULDBLOCK || errno == ENOBUFS) - { - // Wait upto for the blocking to subside. - int rtn = ACE::handle_write_ready (handle, - timeout); - - // Did select() succeed? - if (rtn != -1) - { - // Blocking subsided in period. Continue - // data transfer. - n = 0; - continue; - } - } - - // Wait in select() timed out or other data transfer or - // select() failures. - error = 1; - result = n; - break; - } - - for (bytes_transferred += n; - s < iovcnt - && n >= ACE_static_cast (ssize_t, - iov[s].iov_len); - s++) - n -= iov[s].iov_len; - - if (n != 0) - { - char *base = ACE_reinterpret_cast (char *, - iov[s].iov_base); - iov[s].iov_base = base + n; - iov[s].iov_len = iov[s].iov_len - n; - } - } - - ACE::restore_non_blocking_mode (handle, val); - - if (error) - return result; - else - return bytes_transferred; -} - -ssize_t -ACE::write_n (ACE_HANDLE handle, - const ACE_Message_Block *message_block, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0; - - iovec iov[ACE_IOV_MAX]; - int iovcnt = 0; - - while (message_block != 0) - { - // Our current message block chain. - const ACE_Message_Block *current_message_block = message_block; - - while (current_message_block != 0) - { - size_t current_message_block_length = - current_message_block->length (); - char *this_block_ptr = current_message_block->rd_ptr (); - - // Check if this block has any data to be sent. - while (current_message_block_length > 0) - { - u_long this_chunk_length; - if (current_message_block_length > ULONG_MAX) - this_chunk_length = ULONG_MAX; - else - this_chunk_length = - ACE_static_cast (u_long, current_message_block_length); - // Collect the data in the iovec. - iov[iovcnt].iov_base = this_block_ptr; - iov[iovcnt].iov_len = this_chunk_length; - current_message_block_length -= this_chunk_length; - this_block_ptr += this_chunk_length; - - // Increment iovec counter. - iovcnt++; - - // The buffer is full make a OS call. @@ TODO find a way to - // find ACE_IOV_MAX for platforms that do not define it rather - // than simply setting ACE_IOV_MAX to some arbitrary value such - // as 16. - if (iovcnt == ACE_IOV_MAX) - { - size_t current_transfer = 0; - - ssize_t result = ACE::writev_n (handle, - iov, - iovcnt, - ¤t_transfer); - - // Add to total bytes transferred. - bytes_transferred += current_transfer; - - // Errors. - if (result == -1 || result == 0) - return result; - - // Reset iovec counter. - iovcnt = 0; - } - } - - // Select the next message block in the chain. - current_message_block = current_message_block->cont (); - } - - // Selection of the next message block chain. - message_block = message_block->next (); - } - - // Check for remaining buffers to be sent. This will happen when - // ACE_IOV_MAX is not a multiple of the number of message blocks. - if (iovcnt != 0) - { - size_t current_transfer = 0; - - ssize_t result = ACE::writev_n (handle, - iov, - iovcnt, - ¤t_transfer); - - // Add to total bytes transferred. - bytes_transferred += current_transfer; - - // Errors. - if (result == -1 || result == 0) - return result; - } - - // Return total bytes transferred. - return bytes_transferred; -} - -ssize_t -ACE::send_n (ACE_HANDLE handle, - const ACE_Message_Block *message_block, - const ACE_Time_Value *timeout, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0; - - iovec iov[ACE_IOV_MAX]; - int iovcnt = 0; - - while (message_block != 0) - { - // Our current message block chain. - const ACE_Message_Block *current_message_block = message_block; - - while (current_message_block != 0) - { - char *this_block_ptr = current_message_block->rd_ptr (); - size_t current_message_block_length = - current_message_block->length (); - - // Check if this block has any data to be sent. - while (current_message_block_length > 0) - { - u_long this_chunk_length; - if (current_message_block_length > ULONG_MAX) - this_chunk_length = ULONG_MAX; - else - this_chunk_length = - ACE_static_cast (u_long, current_message_block_length); - // Collect the data in the iovec. - iov[iovcnt].iov_base = this_block_ptr; - iov[iovcnt].iov_len = this_chunk_length; - current_message_block_length -= this_chunk_length; - this_block_ptr += this_chunk_length; - - // Increment iovec counter. - iovcnt++; - - // The buffer is full make a OS call. @@ TODO find a way to - // find ACE_IOV_MAX for platforms that do not define it rather - // than simply setting ACE_IOV_MAX to some arbitrary value such - // as 16. - if (iovcnt == ACE_IOV_MAX) - { - size_t current_transfer = 0; - - ssize_t result = ACE::sendv_n (handle, - iov, - iovcnt, - timeout, - ¤t_transfer); - - // Add to total bytes transferred. - bytes_transferred += current_transfer; - - // Errors. - if (result == -1 || result == 0) - return result; - - // Reset iovec counter. - iovcnt = 0; - } - } - - // Select the next message block in the chain. - current_message_block = current_message_block->cont (); - } - - // Selection of the next message block chain. - message_block = message_block->next (); - } - - // Check for remaining buffers to be sent. This will happen when - // ACE_IOV_MAX is not a multiple of the number of message blocks. - if (iovcnt != 0) - { - size_t current_transfer = 0; - - ssize_t result = ACE::sendv_n (handle, - iov, - iovcnt, - timeout, - ¤t_transfer); - - // Add to total bytes transferred. - bytes_transferred += current_transfer; - - // Errors. - if (result == -1 || result == 0) - return result; - } - - // Return total bytes transferred. - return bytes_transferred; -} - -ssize_t -ACE::readv_n (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0; - - for (int s = 0; - s < iovcnt; - ) - { - ssize_t n = ACE_OS::readv (handle, - iov + s, - iovcnt - s); - - if (n == -1 || n == 0) - return n; - - for (bytes_transferred += n; - s < iovcnt - && n >= ACE_static_cast (ssize_t, - iov[s].iov_len); - s++) - n -= iov[s].iov_len; - - if (n != 0) - { - char *base = ACE_reinterpret_cast (char *, - iov[s].iov_base); - iov[s].iov_base = base + n; - iov[s].iov_len = iov[s].iov_len - n; - } - } - - return bytes_transferred; -} - -ssize_t -ACE::writev_n (ACE_HANDLE handle, - const iovec *i, - int iovcnt, - size_t *bt) -{ - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0; - - iovec *iov = ACE_const_cast (iovec *, i); - - for (int s = 0; - s < iovcnt; - ) - { - ssize_t n = ACE_OS::writev (handle, - iov + s, - iovcnt - s); - if (n == -1 || n == 0) - return n; - - for (bytes_transferred += n; - s < iovcnt - && n >= ACE_static_cast (ssize_t, - iov[s].iov_len); - s++) - n -= iov[s].iov_len; - - if (n != 0) - { - char *base = ACE_reinterpret_cast (char *, - iov[s].iov_base); - iov[s].iov_base = base + n; - iov[s].iov_len = iov[s].iov_len - n; - } - } - - return bytes_transferred; -} - -int -ACE::handle_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout, - int read_ready, - int write_ready, - int exception_ready) -{ -#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) - ACE_UNUSED_ARG (write_ready); - ACE_UNUSED_ARG (exception_ready); - - struct pollfd fds; - - fds.fd = handle; - fds.events = read_ready ? POLLIN : POLLOUT; - fds.revents = 0; - - int result = ACE_OS::poll (&fds, 1, timeout); -#else - ACE_Handle_Set handle_set; - handle_set.set_bit (handle); - - // Wait for data or for the timeout to elapse. - int select_width; -# if defined (ACE_WIN64) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -# else - select_width = int (handle) + 1; -# endif /* ACE_WIN64 */ - int result = ACE_OS::select (select_width, - read_ready ? handle_set.fdset () : 0, // read_fds. - write_ready ? handle_set.fdset () : 0, // write_fds. - exception_ready ? handle_set.fdset () : 0, // exception_fds. - timeout); - -#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ - - switch (result) - { - case 0: // Timer expired. - errno = ETIME; - /* FALLTHRU */ - case -1: // we got here directly - select() returned -1. - return -1; - case 1: // Handle has data. - /* FALLTHRU */ - default: // default is case result > 0; return a - // ACE_ASSERT (result == 1); - return result; - } -} - -int -ACE::enter_recv_timedwait (ACE_HANDLE handle, - const ACE_Time_Value *timeout, - int &val) -{ - int result = ACE::handle_read_ready (handle, - timeout); - - if (result == -1) - return -1; - - ACE::record_and_set_non_blocking_mode (handle, - val); - - return result; -} - -int -ACE::enter_send_timedwait (ACE_HANDLE handle, - const ACE_Time_Value *timeout, - int &val) -{ - int result = ACE::handle_write_ready (handle, - timeout); - - if (result == -1) - return -1; - - ACE::record_and_set_non_blocking_mode (handle, - val); - - return result; -} - -void -ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle, - int &val) -{ - // We need to record whether we are already *in* nonblocking mode, - // so that we can correctly reset the state when we're done. - val = ACE::get_flags (handle); - - if (ACE_BIT_DISABLED (val, ACE_NONBLOCK)) - // Set the handle into non-blocking mode if it's not already in - // it. - ACE::set_flags (handle, ACE_NONBLOCK); -} - -void -ACE::restore_non_blocking_mode (ACE_HANDLE handle, - int val) -{ - if (ACE_BIT_DISABLED (val, - ACE_NONBLOCK)) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - // Only disable ACE_NONBLOCK if we weren't in non-blocking mode - // originally. - ACE::clr_flags (handle, ACE_NONBLOCK); - } -} - - -// Format buffer into printable format. This is useful for debugging. -// Portions taken from mdump by J.P. Knight (J.P.Knight@lut.ac.uk) -// Modifications by Todd Montgomery. - -size_t -ACE::format_hexdump (const char *buffer, - size_t size, - ACE_TCHAR *obuf, - size_t obuf_sz) -{ - ACE_TRACE ("ACE::format_hexdump"); - - u_char c; - ACE_TCHAR textver[16 + 1]; - - // We can fit 16 bytes output in text mode per line, 4 chars per byte. - size_t maxlen = (obuf_sz / 68) * 16; - - if (size > maxlen) - size = maxlen; - - size_t i; - - size_t lines = size / 16; - for (i = 0; i < lines; i++) - { - size_t j; - - for (j = 0 ; j < 16; j++) - { - c = (u_char) buffer[(i << 4) + j]; // or, buffer[i*16+j] - ACE_OS::sprintf (obuf, - ACE_LIB_TEXT ("%02x "), - c); - obuf += 3; - if (j == 7) - { - ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" ")); - obuf++; - } - textver[j] = ACE_OS::ace_isprint (c) ? c : '.'; - } - - textver[j] = 0; - - ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" %s\n"), - textver); - - while (*obuf != '\0') - obuf++; - } - - if (size % 16) - { - for (i = 0 ; i < size % 16; i++) - { - c = (u_char) buffer[size - size % 16 + i]; - ACE_OS::sprintf (obuf, - ACE_LIB_TEXT ("%02x "), - c); - obuf += 3; - if (i == 7) - { - ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" ")); - obuf++; - } - textver[i] = ACE_OS::ace_isprint (c) ? c : '.'; - } - - for (i = size % 16; i < 16; i++) - { - ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" ")); - obuf += 3; - if (i == 7) - { - ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" ")); - obuf++; - } - textver[i] = ' '; - } - - textver[i] = 0; - ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" %s\n"), - textver); - } - return size; -} - -// Returns the current timestamp in the form -// "hour:minute:second:microsecond." The month, day, and year are -// also stored in the beginning of the date_and_time array. - -ACE_TCHAR * -ACE::timestamp (ACE_TCHAR date_and_time[], - int date_and_timelen, - int return_pointer_to_first_digit) -{ - //ACE_TRACE ("ACE::timestamp"); - - if (date_and_timelen < 35) - { - errno = EINVAL; - return 0; - } - -#if defined (WIN32) - // Emulate Unix. Win32 does NOT support all the UNIX versions - // below, so DO we need this ifdef. - static const ACE_TCHAR *day_of_week_name[] = - { - ACE_LIB_TEXT ("Sun"), - ACE_LIB_TEXT ("Mon"), - ACE_LIB_TEXT ("Tue"), - ACE_LIB_TEXT ("Wed"), - ACE_LIB_TEXT ("Thu"), - ACE_LIB_TEXT ("Fri"), - ACE_LIB_TEXT ("Sat") - }; - - static const ACE_TCHAR *month_name[] = - { - ACE_LIB_TEXT ("Jan"), - ACE_LIB_TEXT ("Feb"), - ACE_LIB_TEXT ("Mar"), - ACE_LIB_TEXT ("Apr"), - ACE_LIB_TEXT ("May"), - ACE_LIB_TEXT ("Jun"), - ACE_LIB_TEXT ("Jul"), - ACE_LIB_TEXT ("Aug"), - ACE_LIB_TEXT ("Sep"), - ACE_LIB_TEXT ("Oct"), - ACE_LIB_TEXT ("Nov"), - ACE_LIB_TEXT ("Dec") - }; - - SYSTEMTIME local; - ::GetLocalTime (&local); - - ACE_OS::sprintf (date_and_time, - ACE_LIB_TEXT ("%3s %3s %2d %04d %02d:%02d:%02d.%06d"), - day_of_week_name[local.wDayOfWeek], - month_name[local.wMonth - 1], - (int) local.wDay, - (int) local.wYear, - (int) local.wHour, - (int) local.wMinute, - (int) local.wSecond, - (int) (local.wMilliseconds * 1000)); - return &date_and_time[15 + (return_pointer_to_first_digit != 0)]; -#else /* UNIX */ - ACE_TCHAR timebuf[26]; // This magic number is based on the ctime(3c) man page. - ACE_Time_Value cur_time = ACE_OS::gettimeofday (); - time_t secs = cur_time.sec (); - - ACE_OS::ctime_r (&secs, - timebuf, - sizeof timebuf); - // date_and_timelen > sizeof timebuf! - ACE_OS::strsncpy (date_and_time, - timebuf, - date_and_timelen); - char yeartmp[5]; - ACE_OS::strsncpy (yeartmp, - &date_and_time[20], - 5); - char timetmp[9]; - ACE_OS::strsncpy (timetmp, - &date_and_time[11], - 9); - ACE_OS::sprintf (&date_and_time[11], - "%s %s.%06ld", - yeartmp, - timetmp, - cur_time.usec ()); - date_and_time[33] = '\0'; - return &date_and_time[15 + (return_pointer_to_first_digit != 0)]; -#endif /* WIN32 */ -} - -// This function rounds the request to a multiple of the page size. - -size_t -ACE::round_to_pagesize (off_t len) -{ - ACE_TRACE ("ACE::round_to_pagesize"); - - if (ACE::pagesize_ == 0) - ACE::pagesize_ = ACE_OS::getpagesize (); - - return (len + (ACE::pagesize_ - 1)) & ~(ACE::pagesize_ - 1); -} - -size_t -ACE::round_to_allocation_granularity (off_t len) -{ - ACE_TRACE ("ACE::round_to_allocation_granularity"); - - if (ACE::allocation_granularity_ == 0) - ACE::allocation_granularity_ = ACE_OS::allocation_granularity (); - - return (len + (ACE::allocation_granularity_ - 1)) & ~(ACE::allocation_granularity_ - 1); -} - -ACE_HANDLE -ACE::handle_timed_complete (ACE_HANDLE h, - const ACE_Time_Value *timeout, - int is_tli) -{ - ACE_TRACE ("ACE::handle_timed_complete"); - -#if !defined (ACE_WIN32) && defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) - - struct pollfd fds; - - fds.fd = h; - fds.events = POLLIN | POLLOUT; - fds.revents = 0; - -#else - ACE_Handle_Set rd_handles; - ACE_Handle_Set wr_handles; - - rd_handles.set_bit (h); - wr_handles.set_bit (h); -#endif /* !ACE_WIN32 && ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ - -#if defined (ACE_WIN32) - // Winsock is different - it sets the exception bit for failed connect, - // unlike other platforms, where the read bit is set. - ACE_Handle_Set ex_handles; - ex_handles.set_bit (h); -#endif /* ACE_WIN32 */ - - int need_to_check = 0; - int known_failure = 0; - -#if defined (ACE_WIN32) - int n = ACE_OS::select (0, // Ignored on Windows: int (h) + 1, - 0, - wr_handles, - ex_handles, - timeout); -#else -# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) - - int n = ACE_OS::poll (&fds, 1, timeout); - -# else - int n = ACE_OS::select (int (h) + 1, - rd_handles, - wr_handles, - 0, - timeout); -# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ -#endif /* ACE_WIN32 */ - - // If we failed to connect within the time period allocated by the - // caller, then we fail (e.g., the remote host might have been too - // busy to accept our call). - if (n <= 0) - { - if (n == 0 && timeout != 0) - errno = ETIME; - return ACE_INVALID_HANDLE; - } - - // Usually, a ready-for-write handle is successfully connected, and - // ready-for-read (exception on Win32) is a failure. On fails, we - // need to grab the error code via getsockopt. On possible success for - // any platform where we can't tell just from select() (e.g. AIX), - // we also need to check for success/fail. -#if defined (ACE_WIN32) - ACE_UNUSED_ARG (is_tli); - - // On Win32, ex_handle set indicates a failure. We'll do the check - // to try and get an errno value, but the connect failed regardless of - // what getsockopt says about the error. - if (ex_handles.is_set (h)) - { - need_to_check = 1; - known_failure = 1; - } -#elif defined (VXWORKS) - ACE_UNUSED_ARG (is_tli); - - // Force the check on VxWorks. The read handle for "h" is not set, - // so "need_to_check" is false at this point. The write handle is - // set, for what it's worth. - need_to_check = 1; -#else - if (is_tli) - -# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) - need_to_check = (fds.revents & POLLIN) && !(fds.revents & POLLOUT); -# else - need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h); -# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ - - else -#if defined(AIX) - // AIX is broken... both success and failed connect will set the - // write handle only, so always check. - need_to_check = 1; -#else -# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) - need_to_check = (fds.revents & POLLIN); -# else - need_to_check = rd_handles.is_set (h); -# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ -#endif /* AIX */ -#endif /* ACE_WIN32 */ - - if (need_to_check) - { -#if defined (SOL_SOCKET) && defined (SO_ERROR) - int sock_err = 0; - int sock_err_len = sizeof (sock_err); - int sockopt_ret = ACE_OS::getsockopt (h, SOL_SOCKET, SO_ERROR, - (char *)&sock_err, &sock_err_len); - if (sockopt_ret < 0) - { - h = ACE_INVALID_HANDLE; - } - - if (sock_err != 0 || known_failure) - { - h = ACE_INVALID_HANDLE; - errno = sock_err; - } -#else - char dummy; - - // The following recv() won't block provided that the - // ACE_NONBLOCK flag has not been turned off . - n = ACE::recv (h, &dummy, 1, MSG_PEEK); - - // If no data was read/peeked at, check to see if it's because - // of a non-connected socket (and therefore an error) or there's - // just no data yet. - if (n <= 0) - { - if (n == 0) - { - errno = ECONNREFUSED; - h = ACE_INVALID_HANDLE; - } - else if (errno != EWOULDBLOCK && errno != EAGAIN) - h = ACE_INVALID_HANDLE; - } -#endif - } - - // 1. The HANDLE is ready for writing and doesn't need to be checked or - // 2. recv() returned an indication of the state of the socket - if there is - // either data present, or a recv is legit but there's no data yet, - // the connection was successfully established. - return h; -} - -// Wait up to amount of time to accept a connection. - -int -ACE::handle_timed_accept (ACE_HANDLE listener, - ACE_Time_Value *timeout, - int restart) -{ - ACE_TRACE ("ACE::handle_timed_accept"); - // Make sure we don't bomb out on erroneous values. - if (listener == ACE_INVALID_HANDLE) - return -1; - -#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) - - struct pollfd fds; - - fds.fd = listener; - fds.events = POLLIN; - fds.revents = 0; - -#else - // Use the select() implementation rather than poll(). - ACE_Handle_Set rd_handle; - rd_handle.set_bit (listener); -#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ - - // We need a loop here if is enabled. - - for (;;) - { -#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) - - int n = ACE_OS::poll (&fds, 1, timeout); - -#else - int select_width; -# if defined (ACE_WIN64) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -# else - select_width = int (listener) + 1; -# endif /* ACE_WIN64 */ - int n = ACE_OS::select (select_width, - rd_handle, 0, 0, - timeout); -#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ - - switch (n) - { - case -1: - if (errno == EINTR && restart) - continue; - else - return -1; - /* NOTREACHED */ - case 0: - if (timeout != 0 - && timeout->sec () == 0 - && timeout->usec () == 0) - errno = EWOULDBLOCK; - else - errno = ETIMEDOUT; - return -1; - /* NOTREACHED */ - case 1: - return 0; - /* NOTREACHED */ - default: - errno = EINVAL; - return -1; - /* NOTREACHED */ - } - } - ACE_NOTREACHED (return 0); -} - -// Make the current process a UNIX daemon. This is based on Stevens -// code from APUE. - -int -ACE::daemonize (const ACE_TCHAR pathname[], - int close_all_handles, - const ACE_TCHAR program_name[]) -{ - ACE_TRACE ("ACE::daemonize"); -#if !defined (ACE_LACKS_FORK) - pid_t pid = ACE_OS::fork (); - - if (pid == -1) - return -1; - else if (pid != 0) - ACE_OS::exit (0); // Parent exits. - - // 1st child continues. - ACE_OS::setsid (); // Become session leader. - - ACE_OS::signal (SIGHUP, SIG_IGN); - - pid = ACE_OS::fork (program_name); - - if (pid != 0) - ACE_OS::exit (0); // First child terminates. - - // Second child continues. - - if (pathname != 0) - // change working directory. - ACE_OS::chdir (pathname); - - ACE_OS::umask (0); // clear our file mode creation mask. - - // Close down the I/O handles. - if (close_all_handles) - for (int i = ACE::max_handles () - 1; i >= 0; i--) - ACE_OS::close (i); - - return 0; -#else - ACE_UNUSED_ARG (pathname); - ACE_UNUSED_ARG (close_all_handles); - ACE_UNUSED_ARG (program_name); - - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_LACKS_FORK */ -} - -pid_t -ACE::fork (const ACE_TCHAR *program_name, - int avoid_zombies) -{ - if (avoid_zombies == 0) - return ACE_OS::fork (program_name); - else - { - // This algorithm is adapted from an example in the Stevens book - // "Advanced Programming in the Unix Environment" and an item in - // Andrew Gierth's Unix Programming FAQ. It creates an orphan - // process that's inherited by the init process; init cleans up - // when the orphan process terminates. - // - // Another way to avoid zombies is to ignore or catch the - // SIGCHLD signal; we don't use that approach here. - - pid_t pid = ACE_OS::fork (); - if (pid == 0) - { - // The child process forks again to create a grandchild. - switch (ACE_OS::fork (program_name)) - { - case 0: // grandchild returns 0. - return 0; - case -1: // assumes all errnos are < 256 - ACE_OS::_exit (errno); - default: // child terminates, orphaning grandchild - ACE_OS::_exit (0); - } - } - - // Parent process waits for child to terminate. -#if defined (ACE_HAS_UNION_WAIT) - union wait status; - if (pid < 0 || ACE_OS::waitpid (pid, &(status.w_status), 0) < 0) -#else - ACE_exitcode status; - if (pid < 0 || ACE_OS::waitpid (pid, &status, 0) < 0) -#endif /* ACE_HAS_UNION_WAIT */ - return -1; - - // child terminated by calling exit()? - if (WIFEXITED ((status))) - { - // child terminated normally? - if (WEXITSTATUS ((status)) == 0) - return 1; - else - errno = WEXITSTATUS ((status)); - } - else - // child didn't call exit(); perhaps it received a signal? - errno = EINTR; - - return -1; - } -} - -int -ACE::max_handles (void) -{ - ACE_TRACE ("ACE::max_handles"); -#if defined (RLIMIT_NOFILE) && !defined (ACE_LACKS_RLIMIT) - rlimit rl; - int r = ACE_OS::getrlimit (RLIMIT_NOFILE, &rl); -# if !defined (RLIM_INFINITY) - if (r == 0) - return rl.rlim_cur; -#else - if (r == 0 && rl.rlim_cur != RLIM_INFINITY) - return rl.rlim_cur; - // If == RLIM_INFINITY, fall through to the ACE_LACKS_RLIMIT sections -# endif /* RLIM_INFINITY */ -#endif /* RLIMIT_NOFILE && !ACE_LACKS_RLIMIT */ - -#if defined (_SC_OPEN_MAX) - return ACE_OS::sysconf (_SC_OPEN_MAX); -#elif defined (FD_SETSIZE) - return FD_SETSIZE; -#else - ACE_NOTSUP_RETURN (-1); -#endif /* _SC_OPEN_MAX */ -} - -// Set the number of currently open handles in the process. -// -// If NEW_LIMIT == -1 set the limit to the maximum allowable. -// Otherwise, set it to be the value of NEW_LIMIT. - -int -ACE::set_handle_limit (int new_limit) -{ - ACE_TRACE ("ACE::set_handle_limit"); - int cur_limit = ACE::max_handles (); - int max_limit = cur_limit; - - if (cur_limit == -1) - return -1; - -#if !defined (ACE_LACKS_RLIMIT) && defined (RLIMIT_NOFILE) - struct rlimit rl; - - ACE_OS::memset ((void *) &rl, 0, sizeof rl); - int r = ACE_OS::getrlimit (RLIMIT_NOFILE, &rl); - if (r == 0) - max_limit = rl.rlim_max; -#endif /* ACE_LACKS_RLIMIT */ - - if (new_limit == -1) - new_limit = max_limit; - - if (new_limit < 0) - { - errno = EINVAL; - return -1; - } - else if (new_limit > cur_limit) - { -#if !defined (ACE_LACKS_RLIMIT) && defined (RLIMIT_NOFILE) - rl.rlim_cur = new_limit; - return ACE_OS::setrlimit (RLIMIT_NOFILE, &rl); -#else - // Must return EINVAL errno. - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_LACKS_RLIMIT */ - } - else - { -#if !defined (ACE_LACKS_RLIMIT) && defined (RLIMIT_NOFILE) - rl.rlim_cur = new_limit; - return ACE_OS::setrlimit (RLIMIT_NOFILE, &rl); -#else - // We give a chance to platforms without RLIMIT to work. - // Instead of ACE_NOTSUP_RETURN (0), just return 0 because - // new_limit is <= cur_limit, so it's a no-op. - return 0; -#endif /* ACE_LACKS_RLIMIT */ - } - - // Irix complains without this return statement. DEC cxx - // (correctly) says that it's not reachable. ACE_NOTREACHED won't - // work here, because it handles both platforms the same. - // IRIX does not complain anymore [7.2] - ACE_NOTREACHED (return 0); -} - -int -ACE::map_errno (int error) -{ - switch (error) - { -#if defined (ACE_WIN32) - case WSAEWOULDBLOCK: - return EAGAIN; // Same as UNIX errno EWOULDBLOCK. -#endif /* ACE_WIN32 */ - } - - return error; -} - -// Euclid's greatest common divisor algorithm. -u_long -ACE::gcd (u_long x, u_long y) -{ - if (y == 0) - { - return x; - } - else - { - return ACE::gcd (y, x % y); - } -} - - -// Calculates the minimum enclosing frame size for the given values. -u_long -ACE::minimum_frame_size (u_long period1, u_long period2) -{ - // if one of the periods is zero, treat it as though it as - // uninitialized and return the other period as the frame size - if (0 == period1) - { - return period2; - } - if (0 == period2) - { - return period1; - } - - // if neither is zero, find the greatest common divisor of the two periods - u_long greatest_common_divisor = ACE::gcd (period1, period2); - - // explicitly consider cases to reduce risk of possible overflow errors - if (greatest_common_divisor == 1) - { - // periods are relative primes: just multiply them together - return period1 * period2; - } - else if (greatest_common_divisor == period1) - { - // the first period divides the second: return the second - return period2; - } - else if (greatest_common_divisor == period2) - { - // the second period divides the first: return the first - return period1; - } - else - { - // the current frame size and the entry's effective period - // have a non-trivial greatest common divisor: return the - // product of factors divided by those in their gcd. - return (period1 * period2) / greatest_common_divisor; - } -} - - -u_long -ACE::is_prime (const u_long n, - const u_long min_factor, - const u_long max_factor) -{ - if (n > 3) - for (u_long factor = min_factor; - factor <= max_factor; - ++factor) - if (n / factor * factor == n) - return factor; - - return 0; -} - -const ACE_TCHAR * -ACE::sock_error (int error) -{ -#if defined (ACE_WIN32) - static ACE_TCHAR unknown_msg[64]; - - switch (error) - { - case WSAVERNOTSUPPORTED: - return ACE_LIB_TEXT ("version of WinSock not supported"); - /* NOTREACHED */ - case WSASYSNOTREADY: - return ACE_LIB_TEXT ("WinSock not present or not responding"); - /* NOTREACHED */ - case WSAEINVAL: - return ACE_LIB_TEXT ("app version not supported by DLL"); - /* NOTREACHED */ - case WSAHOST_NOT_FOUND: - return ACE_LIB_TEXT ("Authoritive: Host not found"); - /* NOTREACHED */ - case WSATRY_AGAIN: - return ACE_LIB_TEXT ("Non-authoritive: host not found or server failure"); - /* NOTREACHED */ - case WSANO_RECOVERY: - return ACE_LIB_TEXT ("Non-recoverable: refused or not implemented"); - /* NOTREACHED */ - case WSANO_DATA: - return ACE_LIB_TEXT ("Valid name, no data record for type"); - /* NOTREACHED */ - /* - case WSANO_ADDRESS: - return "Valid name, no MX record"; - */ - case WSANOTINITIALISED: - return ACE_LIB_TEXT ("WSA Startup not initialized"); - /* NOTREACHED */ - case WSAENETDOWN: - return ACE_LIB_TEXT ("Network subsystem failed"); - /* NOTREACHED */ - case WSAEINPROGRESS: - return ACE_LIB_TEXT ("Blocking operation in progress"); - /* NOTREACHED */ - case WSAEINTR: - return ACE_LIB_TEXT ("Blocking call cancelled"); - /* NOTREACHED */ - case WSAEAFNOSUPPORT: - return ACE_LIB_TEXT ("address family not supported"); - /* NOTREACHED */ - case WSAEMFILE: - return ACE_LIB_TEXT ("no file handles available"); - /* NOTREACHED */ - case WSAENOBUFS: - return ACE_LIB_TEXT ("no buffer space available"); - /* NOTREACHED */ - case WSAEPROTONOSUPPORT: - return ACE_LIB_TEXT ("specified protocol not supported"); - /* NOTREACHED */ - case WSAEPROTOTYPE: - return ACE_LIB_TEXT ("protocol wrong type for this socket"); - /* NOTREACHED */ - case WSAESOCKTNOSUPPORT: - return ACE_LIB_TEXT ("socket type not supported for address family"); - /* NOTREACHED */ - case WSAENOTSOCK: - return ACE_LIB_TEXT ("handle is not a socket"); - /* NOTREACHED */ - case WSAEWOULDBLOCK: - return ACE_LIB_TEXT ("socket marked as non-blocking and SO_LINGER set not 0"); - /* NOTREACHED */ - case WSAEADDRINUSE: - return ACE_LIB_TEXT ("address already in use"); - /* NOTREACHED */ - case WSAECONNABORTED: - return ACE_LIB_TEXT ("connection aborted"); - /* NOTREACHED */ - case WSAECONNRESET: - return ACE_LIB_TEXT ("connection reset"); - /* NOTREACHED */ - case WSAENOTCONN: - return ACE_LIB_TEXT ("not connected"); - /* NOTREACHED */ - case WSAETIMEDOUT: - return ACE_LIB_TEXT ("connection timed out"); - /* NOTREACHED */ - case WSAECONNREFUSED: - return ACE_LIB_TEXT ("connection refused"); - /* NOTREACHED */ - case WSAEHOSTDOWN: - return ACE_LIB_TEXT ("host down"); - /* NOTREACHED */ - case WSAEHOSTUNREACH: - return ACE_LIB_TEXT ("host unreachable"); - /* NOTREACHED */ - case WSAEADDRNOTAVAIL: - return ACE_LIB_TEXT ("address not available"); - /* NOTREACHED */ - default: - ACE_OS::sprintf (unknown_msg, ACE_LIB_TEXT ("unknown error: %d"), error); - return unknown_msg; - /* NOTREACHED */ - } -#else - ACE_UNUSED_ARG (error); - ACE_NOTSUP_RETURN (0); -#endif /* ACE_WIN32 */ -} - -char * -ACE::strndup (const char *str, size_t n) -{ - const char *t = str; - size_t len; - - // Figure out how long this string is (remember, it might not be - // NUL-terminated). - - for (len = 0; - len < n && *t++ != '\0'; - len++) - continue; - - char *s; - ACE_ALLOCATOR_RETURN (s, - (char *) ACE_OS::malloc (len + 1), - 0); - return ACE_OS::strsncpy (s, str, len + 1); -} - -#if defined (ACE_HAS_WCHAR) -wchar_t * -ACE::strndup (const wchar_t *str, size_t n) -{ - const wchar_t *t = str; - size_t len; - - // Figure out how long this string is (remember, it might not be - // NUL-terminated). - - for (len = 0; - len < n && *t++ != '\0'; - len++) - continue; - - wchar_t *s; - ACE_ALLOCATOR_RETURN (s, - ACE_static_cast (wchar_t *, - ACE_OS::malloc ((len + 1) - * sizeof (wchar_t))), - 0); - return ACE_OS::strsncpy (s, str, len + 1); -} -#endif /* ACE_HAS_WCHAR */ - -char * -ACE::strnnew (const char *str, size_t n) -{ - const char *t = str; - size_t len; - - // Figure out how long this string is (remember, it might not be - // NUL-terminated). - - for (len = 0; - len < n && *t++ != L'\0'; - len++) - continue; - - char *s; - ACE_NEW_RETURN (s, - char[len + 1], - 0); - return ACE_OS::strsncpy (s, str, len + 1); -} - -#if defined (ACE_HAS_WCHAR) -wchar_t * -ACE::strnnew (const wchar_t *str, size_t n) -{ - const wchar_t *t = str; - size_t len; - - // Figure out how long this string is (remember, it might not be - // NUL-terminated). - - for (len = 0; - len < n && *t++ != ACE_TEXT_WIDE ('\0'); - len++) - continue; - - wchar_t *s; - ACE_NEW_RETURN (s, - wchar_t[len + 1], - 0); - return ACE_OS::strsncpy (s, str, len + 1); -} -#endif /* ACE_HAS_WCHAR */ - -const char * -ACE::strend (const char *s) -{ - while (*s++ != '\0') - continue; - - return s; -} - -#if defined ACE_HAS_WCHAR -const wchar_t * -ACE::strend (const wchar_t *s) -{ - while (*s++ != ACE_TEXT_WIDE ('\0')) - continue; - - return s; -} -#endif - -char * -ACE::strnew (const char *s) -{ - if (s == 0) - return 0; - char *t = 0; - ACE_NEW_RETURN (t, - char [::strlen (s) + 1], - 0); - if (t == 0) - return 0; - else - return ACE_OS::strcpy (t, s); -} - -#if defined (ACE_HAS_WCHAR) -wchar_t * -ACE::strnew (const wchar_t *s) -{ - if (s == 0) - return 0; - wchar_t *t = 0; - ACE_NEW_RETURN (t, - wchar_t[ACE_OS_String::strlen (s) + 1], - 0); - if (t == 0) - return 0; - else - return ACE_OS::strcpy (t, s); -} -#endif /* ACE_HAS_WCHAR */ - -void -ACE::strdelete (char *s) -{ - delete [] s; -} - -#if defined (ACE_HAS_WCHAR) -void -ACE::strdelete (wchar_t *s) -{ - delete [] s; -} -#endif /* ACE_HAS_WCHAR */ diff --git a/ace/ACE.h b/ace/ACE.h deleted file mode 100644 index 1972b3e679f..00000000000 --- a/ace/ACE.h +++ /dev/null @@ -1,786 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file ACE.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_ACE_H -#define ACE_ACE_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Flag_Manip.h" -#include "ace/Handle_Ops.h" -#include "ace/Lib_Find.h" -#include "ace/Init_ACE.h" -#include "ace/Sock_Connect.h" - -// Forward declarations. -class ACE_Time_Value; -class ACE_Message_Block; -class ACE_Handle_Set; - -// When log2 is defined as macro redefine it as acelog2 -#if defined (log2) -# define acelog2 log2 -# undef log2 -#endif /* log2 */ - -/** - * @class ACE - * - * @brief Contains value added ACE methods that extend the behavior - * of the UNIX and Win32 OS calls. - * - * This class consolidates all these ACE static methods in a - * single place in order to manage the namespace better. These - * methods are put here rather than in ACE_OS in order to - * separate concerns. - */ -class ACE_Export ACE : public ACE_Flag_Manip, public ACE_Handle_Ops, - public ACE_Lib_Find, public ACE_Init_ACE, - public ACE_Sock_Connect -{ - - ACE_CLASS_IS_NAMESPACE (ACE); -public: - - // = ACE version information. - /// e.g., the "5" in ACE 5.1.12. - static u_int major_version (void); - - /// e.g., the "1" in ACE 5.1.12. - static u_int minor_version (void); - - /// e.g., the "12" in ACE 5.1.12. - /// Returns 0 for "stable" (non-beta) releases. - static u_int beta_version (void); - - // = C++ compiler version information. - /// E.g., the "SunPro C++" in SunPro C++ 4.32.0 - static const ACE_TCHAR * compiler_name (void); - - /// E.g., the "4" in SunPro C++ 4.32.0 - static u_int compiler_major_version (void); - - /// E.g., the "32" in SunPro C++ 4.32.0 - static u_int compiler_minor_version (void); - - /// E.g., the "0" in SunPro C++ 4.32.0 - static u_int compiler_beta_version (void); - - /// Check if error indicates the process being out of handles (file - /// descriptors). - static int out_of_handles (int error); - - /** - * @name I/O operations - * - * Notes on common parameters: - * - * is the connected endpoint that will be used for I/O. - * - * is the buffer to write from or receive into. - * - * is the number of bytes to transfer. - * - * The parameter in the following methods indicates how - * long to blocking trying to transfer data. If == 0, - * then the call behaves as a normal send/recv call, i.e., for - * blocking sockets, the call will block until action is possible; - * for non-blocking sockets, EWOULDBLOCK will be returned if no - * action is immediately possible. - * - * If != 0, the call will wait until the relative time - * specified in * elapses. - * - * The "_n()" I/O methods keep looping until all the data has been - * transferred. These methods also work for sockets in non-blocking - * mode i.e., they keep looping on EWOULDBLOCK. is used - * to make sure we keep making progress, i.e., the same timeout - * value is used for every I/O operation in the loop and the timeout - * is not counted down. - * - * The return values for the "*_n()" methods match the return values - * from the non "_n()" methods and are specified as follows: - * - * - On complete transfer, the number of bytes transferred is returned. - * - On timeout, -1 is returned, errno == ETIME. - * - On error, -1 is returned, errno is set to appropriate error. - * - On EOF, 0 is returned, errno is irrelevant. - * - * On partial transfers, i.e., if any data is transferred before - * timeout/error/EOF, will contain the number of - * bytes transferred. - * - * Methods with parameter are I/O vector variants of the I/O - * operations. - * - * Methods with the extra argument will always result in - * getting called. Methods without the extra argument - * will result in getting called on Win32 platforms, and - * getting called on non-Win32 platforms. - */ - //@{ - static ssize_t recv (ACE_HANDLE handle, - void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0); - -#if defined (ACE_HAS_TLI) - - static ssize_t t_rcv (ACE_HANDLE handle, - void *buf, - size_t len, - int *flags, - const ACE_Time_Value *timeout = 0); - -#endif /* ACE_HAS_TLI */ - - static ssize_t recv (ACE_HANDLE handle, - void *buf, - size_t len, - const ACE_Time_Value *timeout = 0); - - static ssize_t recvmsg (ACE_HANDLE handle, - struct msghdr *msg, - int flags, - const ACE_Time_Value *timeout = 0); - - static ssize_t recvfrom (ACE_HANDLE handle, - char *buf, - int len, - int flags, - struct sockaddr *addr, - int *addrlen, - const ACE_Time_Value *timeout = 0); - - static ssize_t recv_n (ACE_HANDLE handle, - void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - -#if defined (ACE_HAS_TLI) - - static ssize_t t_rcv_n (ACE_HANDLE handle, - void *buf, - size_t len, - int *flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - -#endif /* ACE_HAS_TLI */ - - static ssize_t recv_n (ACE_HANDLE handle, - void *buf, - size_t len, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - - /// Receive into a variable number of pieces. - /** - * Accepts a variable, caller-specified, number of pointer/length - * pairs. Arguments following @a n are char *, size_t pairs. - * - * @param handle The I/O handle to receive on - * @param n The total number of char *, size_t pairs following @a n. - * - * @return -1 on error, else total number of bytes received. - */ - static ssize_t recv (ACE_HANDLE handle, size_t n, ...); - - static ssize_t recvv (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout = 0); - - static ssize_t recvv_n (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - - static ssize_t recv_n (ACE_HANDLE handle, - ACE_Message_Block *message_block, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - - static ssize_t send (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0); - -#if defined (ACE_HAS_TLI) - - static ssize_t t_snd (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0); - -#endif /* ACE_HAS_TLI */ - - static ssize_t send (ACE_HANDLE handle, - const void *buf, - size_t len, - const ACE_Time_Value *timeout = 0); - - static ssize_t sendmsg (ACE_HANDLE handle, - const struct msghdr *msg, - int flags, - const ACE_Time_Value *timeout = 0); - - static ssize_t sendto (ACE_HANDLE handle, - const char *buf, - int len, - int flags, - const struct sockaddr *addr, - int addrlen, - const ACE_Time_Value *timeout = 0); - - static ssize_t send_n (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - -#if defined (ACE_HAS_TLI) - - static ssize_t t_snd_n (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - -#endif /* ACE_HAS_TLI */ - - static ssize_t send_n (ACE_HANDLE handle, - const void *buf, - size_t len, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - - /// Varargs variant. - static ssize_t send (ACE_HANDLE handle, size_t n, ...); - - static ssize_t sendv (ACE_HANDLE handle, - const iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout = 0); - - static ssize_t sendv_n (ACE_HANDLE handle, - const iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - - /// Send all the s chained through their and - /// pointers. This call uses the underlying OS gather-write - /// operation to reduce the domain-crossing penalty. - static ssize_t send_n (ACE_HANDLE handle, - const ACE_Message_Block *message_block, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - - // = File system I/O functions (these don't support timeouts). - - static ssize_t read_n (ACE_HANDLE handle, - void *buf, - size_t len, - size_t *bytes_transferred = 0); - - static ssize_t write_n (ACE_HANDLE handle, - const void *buf, - size_t len, - size_t *bytes_transferred = 0); - - /// Write all the s chained through their and - /// pointers. This call uses the underlying OS gather-write - /// operation to reduce the domain-crossing penalty. - static ssize_t write_n (ACE_HANDLE handle, - const ACE_Message_Block *message_block, - size_t *bytes_transferred = 0); - - static ssize_t readv_n (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - size_t *bytes_transferred = 0); - - static ssize_t writev_n (ACE_HANDLE handle, - const iovec *iov, - int iovcnt, - size_t *bytes_transferred = 0); - //@} - - /** - * Wait up to amount of time to passively establish a - * connection. This method doesn't perform the , it just - * does the timed wait... - */ - static int handle_timed_accept (ACE_HANDLE listener, - ACE_Time_Value *timeout, - int restart); - - /** - * Wait up to amount of time to complete an actively - * established non-blocking connection. If is non-0 then - * we are being called by a TLI wrapper (which behaves slightly - * differently from a socket wrapper). - */ - static ACE_HANDLE handle_timed_complete (ACE_HANDLE listener, - const ACE_Time_Value *timeout, - int is_tli = 0); - - /** - * Reset the limit on the number of open handles. If == - * -1 set the limit to the maximum allowable. Otherwise, set it to - * be the value of . - */ - static int set_handle_limit (int new_limit = -1); - - /** - * Returns the maximum number of open handles currently permitted in - * this process. This maximum may be extended using - * . - */ - static int max_handles (void); - - // = String functions -#if !defined (ACE_HAS_WINCE) - /** - * Return a dynamically allocated duplicate of , substituting - * the environment variable if . Note that the - * pointer is allocated with and must be freed by - * . - */ - static ACE_TCHAR *strenvdup (const ACE_TCHAR *str); -#endif /* ACE_HAS_WINCE */ - - /// Returns a pointer to the "end" of the string, i.e., the character - /// past the '\0'. - static const char *strend (const char *s); - - /// This method is just like , except that it uses rather than . If is NULL returns NULL rather than - /// segfaulting... - static char *strnew (const char *s); - - /// Delete the memory allocated by . - static void strdelete (char *s); - - /// Create a fresh new copy of , up to chars long. Uses - /// to allocate the new string. - static char *strndup (const char *str, size_t n); - - /// Create a fresh new copy of , up to chars long. Uses - /// to allocate the new string. - static char *strnnew (const char *str, size_t n); - -#if defined (ACE_HAS_WCHAR) - static const wchar_t *strend (const wchar_t *s); - - static wchar_t *strnew (const wchar_t *s); - - static void strdelete (wchar_t *s); - - static wchar_t *strndup (const wchar_t *str, size_t n); - - static wchar_t *strnnew (const wchar_t *str, size_t n); - -#endif /* ACE_HAS_WCHAR */ - - /** - * On Windows, determines if a specified pathname ends with ".exe" - * (not case sensitive). If on Windows and there is no ".exe" suffix, - * a new ACE_TCHAR array is allocated and a copy of @c pathname with - * the ".exe" suffix is copied into it. In this case, the caller is - * responsible for calling delete [] on the returned pointer. - * - * @param pathname The name to check for a proper suffix. - * - * @retval @c pathname if there is a proper suffix for Windows. This is - * always the return value for non-Windows platforms. - * @retval If a suffix needs to be added, returns a pointer to new[] - * allocated memory containing the original @c pathname plus - * a ".exe" suffix. The caller is responsible for freeing the - * memory using delete []. - */ - static const ACE_TCHAR *execname (const ACE_TCHAR *pathname); - - /** - * Returns the "basename" of a separated by . For - * instance, the basename of "/tmp/foo.cpp" is "foo.cpp" when - * is '/'. - */ - static const ACE_TCHAR *basename (const ACE_TCHAR *pathname, - ACE_TCHAR delim = - ACE_DIRECTORY_SEPARATOR_CHAR); - - /** - * Returns the "dirname" of a . For instance, the dirname - * of "/tmp/foo.cpp" is "/tmp" when is '/'. If - * has no ".\0" is returned. This method does not modify - * and is not reentrant. - */ - static const ACE_TCHAR *dirname (const ACE_TCHAR *pathname, - ACE_TCHAR delim = ACE_DIRECTORY_SEPARATOR_CHAR); - - /** - * Returns the current timestamp in the form - * "hour:minute:second:microsecond." The month, day, and year are - * also stored in the beginning of the array, which - * is a user-supplied array of size s. Returns - * 0 if unsuccessful, else returns pointer to beginning of the - * "time" portion of . If - * is 0 then return a pointer to the - * space before the time, else return a pointer to the beginning of - * the time portion. - */ - static ACE_TCHAR *timestamp (ACE_TCHAR date_and_time[], - int time_len, - int return_pointer_to_first_digit = 0); - - /** - * if == 0 call directly, else create - * an orphan process that's inherited by the init process; init - * cleans up when the orphan process terminates so we don't create - * zombies. - */ - static pid_t fork (const ACE_TCHAR *program_name = ACE_LIB_TEXT (""), - int avoid_zombies = 0); - - /** - * Become a daemon process using the algorithm in Richard Stevens - * "Advanced Programming in the UNIX Environment." If - * is non-zero then all open file handles are - * closed. - */ - static int daemonize (const ACE_TCHAR pathname[] = ACE_LIB_TEXT ("/"), - int close_all_handles = ACE_DEFAULT_CLOSE_ALL_HANDLES, - const ACE_TCHAR program_name[] = ACE_LIB_TEXT ("")); - - // = Miscelleous functions. - /// Rounds the request to a multiple of the page size. - static size_t round_to_pagesize (off_t length); - - /// Rounds the request to a multiple of the allocation granularity. - static size_t round_to_allocation_granularity (off_t len); - - // @@ UNICODE what about buffer? - /// Format buffer into printable format. This is useful for - /// debugging. - static size_t format_hexdump (const char *buffer, size_t size, - ACE_TCHAR *obuf, size_t obuf_sz); - - /// Computes the hash value of using the "Hash PJW" routine. - static u_long hash_pjw (const char *str); - - /// Computes the hash value of using the "Hash PJW" routine. - static u_long hash_pjw (const char *str, size_t len); - -#if defined (ACE_HAS_WCHAR) - /// Computes the hash value of using the "Hash PJW" routine. - static u_long hash_pjw (const wchar_t *str); - - /// Computes the hash value of using the "Hash PJW" routine. - static u_long hash_pjw (const wchar_t *str, size_t len); -#endif /* ACE_HAS_WCHAR */ - - /// Computes the ISO 8802-3 standard 32 bits CRC for the string - /// (not for a file). - static u_long crc32 (const char *str); - - /// Computes the ISO 8802-3 standard 32 bits CRC for the given - /// buffer (the length is included in the CRC). - static u_long crc32 (const char *buf, ACE_UINT32 len); - - /// Computes the ISO 8802-3 standard 32 bits CRC for the - /// @ len iovec buffers. - static u_long crc32 (iovec *iov, int len); - - /// Euclid's greatest common divisor algorithm. - static u_long gcd (u_long x, u_long y); - - /// Calculates the minimum enclosing frame size for the given values. - static u_long minimum_frame_size (u_long period1, u_long period2); - - /** - * Function that can burn up noticeable CPU time: brute-force - * determination of whether number "n" is prime. Returns 0 if - * it is prime, or the smallest factor if it is not prime. min_factor - * and max_factor can be used to partition the work among threads. - * For just one thread, typical values are 2 and n/2. - */ - static u_long is_prime (const u_long n, - const u_long min_factor, - const u_long max_factor); - - /// Map troublesome win32 errno values to values that standard C - /// strerr function understands. Thank you Microsoft. - static int map_errno (int error); - - /// Returns a string containing the error message corresponding to a - /// WinSock error. This works around an omission in the Win32 API... - static const ACE_TCHAR *sock_error (int error); - - /** - * Checks if process with is still alive. Returns 1 if it is - * still alive, 0 if it isn't alive, and -1 if something weird - * happened. - */ - static int process_active (pid_t pid); - - /** - * Terminate the process abruptly with id . On Win32 platforms - * this uses and on POSIX platforms is uses - * with the -9 (SIGKILL) signal, which cannot be caught or - * ignored. Note that this call is potentially dangerous to use - * since the process being terminated may not have a chance to - * cleanup before it shuts down. - */ - static int terminate_process (pid_t pid); - - /** - * This method uses process id and object pointer to come up with a - * machine wide unique name. The process ID will provide uniqueness - * between processes on the same machine. The "this" pointer of the - * will provide uniqueness between other "live" objects in - * the same process. The uniqueness of this name is therefore only - * valid for the life of . - */ - static void unique_name (const void *object, - ACE_TCHAR *name, - size_t length); - - /// Computes the base 2 logarithm of . - static u_long log2 (u_long num); - - /// Hex conversion utility. - static ACE_TCHAR nibble2hex (u_int n); - - /// Convert a hex character to its byte representation. - static u_char hex2byte (ACE_TCHAR c); - - // = Set/get the debug level. - static char debug (void); - static void debug (char d); - - /// Wrapper facade for that uses - /// s. - static int select (int width, - ACE_Handle_Set &readfds, - const ACE_Time_Value *timeout = 0); - - /// Timed wait for handle to get read ready. - static int handle_read_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout); - - /// Timed wait for handle to get write ready. - static int handle_write_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout); - - /// Timed wait for handle to get exception ready. - static int handle_exception_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout); - - /// Timed wait for handle to get read, write, or exception ready. - static int handle_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout, - int read_ready, - int write_ready, - int exception_ready); - - /// Wait for before proceeding to a operation. - /// keeps track of whether we're in non-blocking mode or not. - static int enter_recv_timedwait (ACE_HANDLE handle, - const ACE_Time_Value *timeout, - int &val); - - /// Wait for before proceeding to a operation. - /// keeps track of whether we're in non-blocking mode or not. - static int enter_send_timedwait (ACE_HANDLE handle, - const ACE_Time_Value* timeout, - int &val); - - /// This makes sure that is set into non-blocking mode. - /// keeps track of whether were in non-blocking mode or not. - static void record_and_set_non_blocking_mode (ACE_HANDLE handle, - int &val); - - /// Cleanup after a timed operation, restore the appropriate - /// non-blocking status of . - static void restore_non_blocking_mode (ACE_HANDLE handle, - int val); - -private: - - // - // = Recv_n helpers - // - - static ssize_t recv_i (ACE_HANDLE handle, - void *buf, - size_t len); - - static ssize_t recv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - int flags, - size_t *bytes_transferred); - - static ssize_t recv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred); - -#if defined (ACE_HAS_TLI) - - static ssize_t t_rcv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - int *flags, - size_t *bytes_transferred); - - static ssize_t t_rcv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - int *flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred); - -#endif /* ACE_HAS_TLI */ - - static ssize_t recv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - size_t *bytes_transferred); - - static ssize_t recv_n_i (ACE_HANDLE handle, - void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred); - - static ssize_t recvv_n_i (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - size_t *bytes_transferred); - - static ssize_t recvv_n_i (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout, - size_t *bytes_transferred); - - // - // = Send_n helpers - // - - static ssize_t send_i (ACE_HANDLE handle, - const void *buf, - size_t len); - - static ssize_t send_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - size_t *bytes_transferred); - - static ssize_t send_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred); - -#if defined (ACE_HAS_TLI) - - static ssize_t t_snd_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - size_t *bytes_transferred); - - static ssize_t t_snd_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred); - -#endif /* ACE_HAS_TLI */ - - static ssize_t send_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - size_t *bytes_transferred); - - static ssize_t send_n_i (ACE_HANDLE handle, - const void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred); - - static ssize_t sendv_n_i (ACE_HANDLE handle, - const iovec *iov, - int iovcnt, - size_t *bytes_transferred); - - static ssize_t sendv_n_i (ACE_HANDLE handle, - const iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout, - size_t *bytes_transferred); - - /// Size of a VM page. - static size_t pagesize_; - - /// Size of allocation granularity. - static size_t allocation_granularity_; - - /// CRC table. - static u_long crc_table_[]; - - /// Hex characters. - static const ACE_TCHAR hex_chars_[]; - - /// Are we debugging ACE? - static char debug_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/ACE.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#if defined (acelog2) -# define log2 acelog2 -#endif /* acelog2 */ - -#include "ace/post.h" -#endif /* ACE_ACE_H */ diff --git a/ace/ACE.i b/ace/ACE.i deleted file mode 100644 index 189aa5d437d..00000000000 --- a/ace/ACE.i +++ /dev/null @@ -1,312 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Wrappers for methods that have been moved to ACE_OS. - -ASYS_INLINE ssize_t -ACE::read_n (ACE_HANDLE handle, - void *buf, - size_t len, - size_t *bytes_transferred) -{ - return ACE_OS::read_n (handle, - buf, - len, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE::write_n (ACE_HANDLE handle, - const void *buf, - size_t len, - size_t *bytes_transferred) -{ - return ACE_OS::write_n (handle, - buf, - len, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE::recv_n (ACE_HANDLE handle, - void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) -{ - if (timeout == 0) - return ACE::recv_n_i (handle, - buf, - len, - flags, - bytes_transferred); - else - return ACE::recv_n_i (handle, - buf, - len, - flags, - timeout, - bytes_transferred); -} - -#if defined (ACE_HAS_TLI) - -ASYS_INLINE ssize_t -ACE::t_rcv_n (ACE_HANDLE handle, - void *buf, - size_t len, - int *flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) -{ - if (timeout == 0) - return ACE::t_rcv_n_i (handle, - buf, - len, - flags, - bytes_transferred); - else - return ACE::t_rcv_n_i (handle, - buf, - len, - flags, - timeout, - bytes_transferred); -} - -#endif /* ACE_HAS_TLI */ - -ASYS_INLINE ssize_t -ACE::recv_n (ACE_HANDLE handle, - void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) -{ - if (timeout == 0) - return ACE::recv_n_i (handle, - buf, - len, - bytes_transferred); - else - return ACE::recv_n_i (handle, - buf, - len, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE::recvv_n (ACE_HANDLE handle, - iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) -{ - if (timeout == 0) - return ACE::recvv_n_i (handle, - iov, - iovcnt, - bytes_transferred); - else - return ACE::recvv_n_i (handle, - iov, - iovcnt, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE::send_n (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) -{ - if (timeout == 0) - return ACE::send_n_i (handle, - buf, - len, - flags, - bytes_transferred); - else - return ACE::send_n_i (handle, - buf, - len, - flags, - timeout, - bytes_transferred); -} - -#if defined (ACE_HAS_TLI) - -ASYS_INLINE ssize_t -ACE::t_snd_n (ACE_HANDLE handle, - const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) -{ - if (timeout == 0) - return ACE::t_snd_n_i (handle, - buf, - len, - flags, - bytes_transferred); - else - return ACE::t_snd_n_i (handle, - buf, - len, - flags, - timeout, - bytes_transferred); -} - -#endif /* ACE_HAS_TLI */ - -ASYS_INLINE ssize_t -ACE::send_n (ACE_HANDLE handle, - const void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) -{ - if (timeout == 0) - return ACE::send_n_i (handle, - buf, - len, - bytes_transferred); - else - return ACE::send_n_i (handle, - buf, - len, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE::sendv_n (ACE_HANDLE handle, - const iovec *iov, - int iovcnt, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) -{ - if (timeout == 0) - return ACE::sendv_n_i (handle, - iov, - iovcnt, - bytes_transferred); - else - return ACE::sendv_n_i (handle, - iov, - iovcnt, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len) -{ -#if defined (ACE_WIN32) || defined (ACE_PSOS) || defined (HPUX) - return ACE_OS::send (handle, (const char *) buf, len); -#else - return ACE_OS::write (handle, (const char *) buf, len); -#endif /* ACE_WIN32 */ -} - -ASYS_INLINE ssize_t -ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len) -{ -#if defined (ACE_WIN32) || defined (ACE_PSOS) - return ACE_OS::recv (handle, (char *) buf, len); -#else - return ACE_OS::read (handle, (char *) buf, len); -#endif /* ACE_WIN32 */ -} - -ASYS_INLINE int -ACE::handle_read_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) -{ - return ACE::handle_ready (handle, - timeout, - 1, - 0, - 0); -} - -ASYS_INLINE int -ACE::handle_write_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) -{ - return ACE::handle_ready (handle, - timeout, - 0, - 1, - 0); -} - -ASYS_INLINE int -ACE::handle_exception_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) -{ - return ACE::handle_ready (handle, - timeout, - 0, - 0, - 1); -} - -ASYS_INLINE void -ACE::unique_name (const void *object, - ACE_TCHAR *name, - size_t length) -{ - ACE_OS::unique_name (object, name, length); -} - -ASYS_INLINE u_long -ACE::log2 (u_long num) -{ - u_long log = 0; - - for (; - num > 0; - log++) - num >>= 1; - - return log; -} - -ASYS_INLINE ACE_TCHAR -ACE::nibble2hex (u_int n) -{ - // @@ UNICODE does this work? - return ACE::hex_chars_[n & 0x0f]; -} - -ASYS_INLINE u_char -ACE::hex2byte (ACE_TCHAR c) -{ - if (isdigit (c)) - return (u_char) (c - ACE_LIB_TEXT ('0')); - else if (islower (c)) - return (u_char) (10 + c - ACE_LIB_TEXT ('a')); - else - return (u_char) (10 + c - ACE_LIB_TEXT ('A')); -} - -ASYS_INLINE char -ACE::debug (void) -{ - return ACE::debug_; -} - -ASYS_INLINE void -ACE::debug (char c) -{ - ACE::debug_ = c; -} diff --git a/ace/ACE_export.h b/ace/ACE_export.h deleted file mode 100644 index 9783eab8fc9..00000000000 --- a/ace/ACE_export.h +++ /dev/null @@ -1,46 +0,0 @@ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by -// generate_export_file.pl -// ------------------------------ -#ifndef ACE_EXPORT_H -#define ACE_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) -# if !defined (ACE_HAS_DLL) -# define ACE_HAS_DLL 0 -# endif /* ! ACE_HAS_DLL */ -#else -# if !defined (ACE_HAS_DLL) -# define ACE_HAS_DLL 1 -# endif /* ! ACE_HAS_DLL */ -#endif /* ACE_AS_STATIC_LIB */ - -#if defined (ACE_HAS_DLL) -# if (ACE_HAS_DLL == 1) -# if defined (ACE_BUILD_DLL) -# define ACE_Export ACE_Proper_Export_Flag -# define ACE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else -# define ACE_Export ACE_Proper_Import_Flag -# define ACE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_BUILD_DLL */ -# else -# define ACE_Export -# define ACE_SINGLETON_DECLARATION(T) -# define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ! ACE_HAS_DLL == 1 */ -#else -# define ACE_Export -# define ACE_SINGLETON_DECLARATION(T) -# define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_HAS_DLL */ - -#endif /* ACE_EXPORT_H */ - -// End of auto generated file. diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp deleted file mode 100644 index ccf88313461..00000000000 --- a/ace/ARGV.cpp +++ /dev/null @@ -1,345 +0,0 @@ -// ARGV.cpp -// $Id$ - -// Transforms a string BUF into an ARGV-style vector of strings. - -#include "ace/ARGV.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/ARGV.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, ARGV, "$Id$") - -ACE_ALLOC_HOOK_DEFINE (ACE_ARGV) - -void -ACE_ARGV::dump (void) const -{ - ACE_TRACE ("ACE_ARGV::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("argc_ = %d"), this->argc_)); - - ACE_ARGV *this_obj = ACE_const_cast (ACE_ARGV *, this); - - for (int i = 0; i < this->argc_; i++) - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nargv_[%i] = %s"), - i, - this_obj->argv ()[i])); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// Creates this->argv_ out of this->buf_. New memory is allocated for -// each element of the array. This is used by the array-to-string -// style constructor and for creating this->argv_ when in iterative -// mode. - -int -ACE_ARGV::string_to_argv (void) -{ - ACE_TRACE ("ACE_ARGV::string_to_argv"); - - return ACE_OS::string_to_argv (this->buf_, - this->argc_, - this->argv_, - this->substitute_env_args_); -} - -int -ACE_ARGV::argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf) -{ - return ACE_OS::argv_to_string (argv, buf); -} - -ACE_ARGV::ACE_ARGV (const ACE_TCHAR buf[], - int substitute_env_args) - : substitute_env_args_ (substitute_env_args), - state_ (TO_PTR_ARRAY), - argc_ (0), - argv_ (0), - buf_ (0), - length_ (0), - queue_ () -{ - ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR[] to ACE_TCHAR *[]"); - - if (buf == 0 || buf[0] == 0) - return; - - // Make an internal copy of the string. - ACE_NEW (this->buf_, - ACE_TCHAR[ACE_OS::strlen (buf) + 1]); - ACE_OS::strcpy (this->buf_, buf); - - // Create this->argv_. - if (this->string_to_argv () == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("string_to_argv"))); -} - -ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[], - int substitute_env_args) - : substitute_env_args_ (substitute_env_args), - state_ (TO_STRING), - argc_ (0), - argv_ (0), - buf_ (0), - length_ (0), - queue_ () -{ - ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR*[] to ACE_TCHAR[]"); - - if (argv == 0 || argv[0] == 0) - return; - - size_t buf_len = 0; - - // Determine the length of the buffer. - - for (int i = 0; argv[i] != 0; i++) - { -#if !defined (ACE_LACKS_ENV) - ACE_TCHAR *temp = 0; - - // Account for environment variables. - if (this->substitute_env_args_ - && (argv[i][0] == '$' - && (temp = ACE_OS::getenv (&argv[i][1])) != 0)) - buf_len += ACE_OS::strlen (temp); - else -#endif /* !ACE_LACKS_ENV */ - buf_len += ACE_OS::strlen (argv[i]); - - // Add one for the extra space between each string. - buf_len++; - } - - // Step through all argv params and copy each one into buf; separate - // each param with white space. - - ACE_NEW (this->buf_, - ACE_TCHAR[buf_len + 1]); - - ACE_TCHAR *end = this->buf_; - int j; - - for (j = 0; argv[j] != 0; j++) - { -#if !defined (ACE_LACKS_ENV) - ACE_TCHAR *temp = 0; - - // Account for environment variables. - if (this->substitute_env_args_ - && (argv[j][0] == '$' - && (temp = ACE_OS::getenv (&argv[j][1])) != 0)) - end = ACE_OS::strecpy (end, temp); - else -#endif /* ACE_LACKS_ENV */ - end = ACE_OS::strecpy (end, argv[j]); - - // Replace the null char that strecpy copies with white space as - // a separator. - *(end - 1) = ACE_LIB_TEXT (' '); - } - - // Remember how many arguments there are - this->argc_ = j; - - // Null terminate the string. - *end = '\0'; -} - -ACE_ARGV::ACE_ARGV (ACE_TCHAR *first_argv[], - ACE_TCHAR *second_argv[], - int substitute_env_args) - : substitute_env_args_ (substitute_env_args), - state_ (TO_STRING), - argc_ (0), - argv_ (0), - buf_ (0), - length_ (0), - queue_ () -{ - ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR*[] + ACE_TCHAR *[] to ACE_TCHAR[]"); - - int first_argc; - int second_argc; - - ACE_TCHAR *first_buf; - ACE_TCHAR *second_buf; - - // convert the first argv to a string - first_argc = this->argv_to_string (first_argv,first_buf); - - // convert the second argv to a string - second_argc = this->argv_to_string (second_argv,second_buf); - - // Add the number of arguments in both the argvs. - this->argc_ = first_argc + second_argc; - - size_t buf_len = - ACE_OS::strlen (first_buf) + ACE_OS::strlen (second_buf) + 1; - - // Allocate memory to the lenght of the combined argv string. - ACE_NEW (this->buf_, - ACE_TCHAR[buf_len + 1]); - - // copy the first argv string to the buffer - ACE_OS::strcpy (this->buf_, first_buf); - - // concatenate the second argv string to the buffer - ACE_OS::strcat (this->buf_, second_buf); - - // Delete the first and second buffers - - delete [] first_buf; - - delete [] second_buf; -} - - -ACE_ARGV::ACE_ARGV (int substitute_env_args) - : substitute_env_args_ (substitute_env_args), - state_ (ITERATIVE), - argc_ (0), - argv_ (0), - buf_ (0), - length_ (0), - queue_ () -{ - ACE_TRACE ("ACE_ARGV::ACE_ARGV Iterative"); - - // Nothing to do yet -- the user puts in arguments via add () -} - -int -ACE_ARGV::add (const ACE_TCHAR *next_arg) -{ - // Only allow this to work in the "iterative" verion -- the - // ACE_ARGVs created with the one argument constructor. - if (this->state_ != ITERATIVE) - { - errno = EINVAL; - return -1; - } - - // Put the new argument at the end of the queue. - if (this->queue_.enqueue_tail ((ACE_TCHAR *) next_arg) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Can't add more to ARGV queue")), - -1); - - this->length_ += ACE_OS::strlen (next_arg); - - this->argc_++; - - // Wipe argv_ and buf_ away so that they will be recreated if the - // user calls argv () or buf (). - if (this->argv_ != 0) - { - for (int i = 0; this->argv_[i] != 0; i++) - ACE_OS::free ((void *) this->argv_[i]); - - delete [] this->argv_; - this->argv_ = 0; - } - - delete [] this->buf_; - this->buf_ = 0; - - return 0; -} - -int -ACE_ARGV::add (ACE_TCHAR *argv[]) -{ - for (int i = 0; argv[i] != 0; i++) - if (this->add (argv[i]) == -1) - return -1; - - return 0; -} - -// Free up argv_ and buf_ - -ACE_ARGV::~ACE_ARGV (void) -{ - ACE_TRACE ("ACE_ARGV::~ACE_ARGV"); - - if (this->argv_ != 0) - for (int i = 0; this->argv_[i] != 0; i++) - ACE_OS::free ((void *) this->argv_[i]); - - delete [] this->argv_; - delete [] this->buf_; -} - -// Create buf_ out of the queue_. This is only used in the -// "iterative" mode. - -int -ACE_ARGV::create_buf_from_queue (void) -{ - ACE_TRACE ("ACE_ARGV::create_buf_from_queue"); - - // If the are no arguments, don't do anything - if (this->argc_ <= 0) - return -1; - - delete [] this->buf_; - - ACE_NEW_RETURN (this->buf_, - ACE_TCHAR[this->length_ + this->argc_], - -1); - - // Get an iterator over the queue - ACE_Unbounded_Queue_Iterator iter (this->queue_); - - ACE_TCHAR **arg; - ACE_TCHAR *ptr = this->buf_; - size_t len; - int more = 0; - - while (!iter.done ()) - { - // Get next argument from the queue. - iter.next (arg); - - more = iter.advance (); - - len = ACE_OS::strlen (*arg); - - // Copy the argument into buf_ - ACE_OS::memcpy ((void *) ptr, - (const void *) (*arg), - len * sizeof (ACE_TCHAR)); - // Move the pointer down. - ptr += len; - - // Put in an argument separating space. - if (more != 0) - *ptr++ = ' '; - } - - // Put in the NUL terminator - *ptr = '\0'; - - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Unbounded_Queue; -template class ACE_Unbounded_Queue_Iterator; -template class ACE_Node; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Unbounded_Queue -#pragma instantiate ACE_Unbounded_Queue_Iterator -#pragma instantiate ACE_Node -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/ARGV.h b/ace/ARGV.h deleted file mode 100644 index 696d69f7512..00000000000 --- a/ace/ARGV.h +++ /dev/null @@ -1,179 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file ARGV.h - * - * $Id$ - * - * @author Doug Schmidt - * @author Everett Anderson - */ -//========================================================================== - -#ifndef ACE_ARGUMENT_VECTOR_H -#define ACE_ARGUMENT_VECTOR_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" -#include "ace/Unbounded_Queue.h" - -/** - * @class ACE_ARGV - * - * @brief Builds a counted argument vector (ala argc/argv) from either - * a string or a set of separate tokens. Can substitute environment - * variable values for tokens that are environment variable references. - */ -class ACE_Export ACE_ARGV -{ -public: - // = Initialization and termination. - /** - * Splits the specified string into an argument vector, split at whitespace. - * - * @param buf An ACE_TCHAR array to split into tokens for the vector. - * - * @param substitute_env_args If non-zero, any token that is an - * an environment variable reference ($VAR) will have - * its environment variable value in the resultant vector - * in place of the environment variable name. This only works - * if the token is an environment variable reference and - * nothing else; it doesn't substitute environment variable - * references within a token. For example, @c $HOME/file will - * not substitute the value of the HOME environment variable. - */ - ACE_ARGV (const ACE_TCHAR buf[], - int substitute_env_args = 1); - - /** - * Converts into a linear string. If - * is enabled then we'll substitute the environment variables for - * each $ENV encountered in the string. The operation is not - * allowed on an ACE_ARGV created this way. - */ - ACE_ARGV (ACE_TCHAR *argv[], - int substitute_env_args = 1); - - /** - * Creates an ACE_ARGV which is the concatenation of the first_argv - * and the second argv. The argv arguments should be null pointer - * terminated. - */ - ACE_ARGV (ACE_TCHAR *first_argv[], - ACE_TCHAR *second_argv[], - int substitute_env_args =1); - - /** - * Entry point for creating an ACE_TCHAR *[] command line - * iteratively via the method. When this constructor is used, - * the state is enabled. The and methods - * are allowed, and the result is recreated when called multiple - * times. The subscript operator is not allowed. - */ - ACE_ARGV (int substitute_env_args = 1); - - /// Destructor. - ~ACE_ARGV (void); - - // = Accessor arguments. - /// Returns the th string in the ARGV array. - const ACE_TCHAR *operator[] (size_t index); - - /** - * Returns the array. Caller should not delete this memory - * since the destructor will delete it. If the caller - * modifies the array in the iterative mode, the changes are not - * saved to the queue. - */ - ACE_TCHAR **argv (void); - - /// Returns . - int argc (void) const; - - /// Returns the . Caller should not delete this memory since - /// the destructor will delete it. - const ACE_TCHAR *buf (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /// Add another argument. This only works in the state. - /// Note that this method does not copy , nor does it - /// assume ownership of managing its memory, i.e., the caller is - /// responsible for memory management. Returns -1 on failure and 0 - /// on success. - int add (const ACE_TCHAR *next_arg); - - /** - * Add another array. The parameter must be NULL - * terminated. This only works in the state. Returns - * -1 on failure and 0 on success. - */ - int add (ACE_TCHAR *argv[]); - - /// What state is this ACE_ARGV in? - int state (void) const; - - // These are the states possible via the different constructors. - enum States - { - /// ACE_ARGV converts buf[] to ACE_TCHAR *argv[] - TO_STRING = 1, - /// ACE_ARGV converts ACE_TCHAR *argv[] to buf[] - TO_PTR_ARRAY = 2, - /// Builds buf[] or ACE_TCHAR *argv[] iteratively with . - ITERATIVE = 3 - }; - -private: - - /// Creates buf_ from the queue, deletes previous buf_. - int create_buf_from_queue (void); - - /// Converts buf_ into the ACE_TCHAR *argv[] format. - int string_to_argv (void); - - /// Returns the string created from argv in buf and - /// returns the number of arguments. - int argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf); - - /// Replace args with environment variable values? - int substitute_env_args_; - - /// Current state marker. - int state_; - - /// Number of arguments in the ARGV array. - int argc_; - - /// The array of string arguments. - ACE_TCHAR **argv_; - - /// Buffer containing the contents. - ACE_TCHAR *buf_; - - /// Total length of the arguments in the queue, not counting - /// separating spaces - size_t length_; - - /// Queue which keeps user supplied arguments. This is only - /// active in the "iterative" mode. - ACE_Unbounded_Queue queue_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/ARGV.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_ARGUMENT_VECTOR_H */ diff --git a/ace/ARGV.i b/ace/ARGV.i deleted file mode 100644 index 4b118c700c0..00000000000 --- a/ace/ARGV.i +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Return the number of args -ACE_INLINE int -ACE_ARGV::argc (void) const -{ - ACE_TRACE ("ACE_ARGV::argc"); - return this->argc_; -} - -// Return the state of this ACE_ARGV -ACE_INLINE int -ACE_ARGV::state(void) const -{ - ACE_TRACE ("ACE_ARGV::state"); - return this->state_; -} - -// Return the arguments in a space-separated string -ACE_INLINE const ACE_TCHAR * -ACE_ARGV::buf (void) -{ - ACE_TRACE ("ACE_ARGV::buf"); - - if (this->buf_ == 0 && this->state_ == ITERATIVE) - this->create_buf_from_queue (); - - return (const ACE_TCHAR *) this->buf_; -} - -// Return the arguments in an entry-per-argument array - -ACE_INLINE ACE_TCHAR ** -ACE_ARGV::argv (void) -{ - ACE_TRACE ("ACE_ARGV::argv"); - - // Try to create the argv_ if it isn't there - if (this->argv_ == 0) - { - if (this->state_ == ITERATIVE && this->buf_ == 0) - this->create_buf_from_queue (); - - // Convert buf_ to argv_ - if (this->string_to_argv () == -1) - return (ACE_TCHAR **) 0; - } - - return (ACE_TCHAR **) this->argv_; -} - -// Subscript operator. - -ACE_INLINE const ACE_TCHAR * -ACE_ARGV::operator[] (size_t i) -{ - ACE_TRACE ("ACE_ARGV::operator[]"); - - // Don't go out of bounds. - if (i >= ACE_static_cast (size_t, this->argc_)) - return 0; - - return (const ACE_TCHAR *) this->argv ()[i]; -} - - - diff --git a/ace/ATM_Acceptor.cpp b/ace/ATM_Acceptor.cpp deleted file mode 100644 index e2eb96146e6..00000000000 --- a/ace/ATM_Acceptor.cpp +++ /dev/null @@ -1,309 +0,0 @@ -// $Id$ - -#include "ace/ATM_Acceptor.h" - -ACE_RCSID(ace, ATM_Acceptor, "$Id$") - -#if defined (ACE_HAS_ATM) - -#if defined (ACE_HAS_LINUX_ATM) -#include /**/ "linux/atmdev.h" -#endif /* ACE_HAS_LINUX_ATM */ - -#if !defined (__ACE_INLINE__) -#include "ace/ATM_Acceptor.i" -#endif /* __ACE_INLINE__ */ - -// Put the actual definitions of the ACE_ATM_Request and -// ACE_ATM_Request_Queue classes here to hide them from clients... - -ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Acceptor) - -void -ACE_ATM_Acceptor::dump (void) const -{ - ACE_TRACE ("ACE_ATM_Acceptor::dump"); -} - -ACE_ATM_Acceptor::ACE_ATM_Acceptor (void) -{ - ACE_TRACE ("ACE_ATM_Acceptor::ACE_ATM_Acceptor"); -} - -ACE_ATM_Acceptor::~ACE_ATM_Acceptor (void) -{ - ACE_TRACE ("ACE_ATM_Acceptor::~ACE_ATM_Acceptor"); -} - -int -ACE_ATM_Acceptor::get_local_addr (ACE_ATM_Addr &local_addr) -{ - ACE_TRACE ("ACE_ATM_Acceptor::get_local_addr"); - -#if defined (ACE_HAS_FORE_ATM_WS2) - unsigned long ret = 0; - DWORD deviceID = 0; - ATM_ADDRESS addr; - struct sockaddr_atm *laddr; - - if (::WSAIoctl ((int) ((ACE_SOCK_Acceptor *)this) -> get_handle (), - SIO_GET_ATM_ADDRESS, - (LPVOID) &deviceID, - sizeof (DWORD), - (LPVOID)&addr, - sizeof (ATM_ADDRESS), - &ret, - 0, - 0) == SOCKET_ERROR) { - ACE_OS::printf ("ATM_Acceptor (get_local_addr): WSIoctl: %d\n", - ::WSAGetLastError ()); - return -1; - } - - laddr = (struct sockaddr_atm *)local_addr.get_addr (); - ACE_OS::memcpy ((void *)& (laddr -> satm_number), - (void *)&addr, - ATM_ADDR_SIZE - 1); - - return 0; -#elif defined (ACE_HAS_FORE_ATM_XTI) - ACE_UNUSED_ARG (local_addr); - - return 0; -#elif defined (ACE_HAS_LINUX_ATM) - ATM_Addr *myaddr = (ATM_Addr *)local_addr.get_addr (); - int addrlen = sizeof (myaddr->sockaddratmsvc); - - if (ACE_OS::getsockname (acceptor_.get_handle (), - (struct sockaddr *) & (myaddr->sockaddratmsvc), - &addrlen) < 0) { - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ATM_Acceptor (get_local_addr): ioctl: %d\n"), - errno)); - return -1; - } - - return (0); -#else - ACE_UNUSED_ARG (local_addr); - - return 0; -#endif /* ACE_HAS_FORE_ATM_WS2 && ACE_HAS_FORE_ATM_XTI */ -} - -ACE_HANDLE -ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, - int backlog, - ACE_ATM_Params params) -{ - ACE_TRACE ("ACE_ATM_Acceptor::open"); -#if defined (ACE_HAS_FORE_ATM_XTI) - ACE_HANDLE handle = acceptor_.open (remote_sap, - params.get_reuse_addr (), - params.get_oflag (), - params.get_info (), - backlog, - params.get_device ()); - return (handle == ACE_INVALID_HANDLE ? -1 : 0); -#elif defined (ACE_HAS_FORE_ATM_WS2) - struct sockaddr_atm local_atm_addr; - ACE_HANDLE ret; - DWORD flags = 0; - - /* Create a local endpoint of communication */ - - // Only leaves can listen. - flags = ACE_FLAG_MULTIPOINT_C_LEAF | ACE_FLAG_MULTIPOINT_D_LEAF; - - if ((ret = ACE_OS::socket (AF_ATM, - SOCK_RAW, - ATMPROTO_AAL5, - 0, - 0, - flags)) - == ACE_INVALID_HANDLE) { - ACE_OS::printf ("Acceptor (open): socket %d\n", - ::WSAGetLastError ()); - return (ret); - } - - ((ACE_SOCK_Acceptor *)this) -> set_handle (ret); - - /* Set up the address information to become a server */ - ACE_OS::memset ((void *) &local_atm_addr, 0, sizeof local_atm_addr); - local_atm_addr.satm_family = AF_ATM; - local_atm_addr.satm_number.AddressType = SAP_FIELD_ANY_AESA_REST; - local_atm_addr.satm_number.Addr[ ATM_ADDR_SIZE - 1 ] - = ((ACE_ATM_Addr *)&remote_sap) -> get_selector (); - local_atm_addr.satm_blli.Layer2Protocol = SAP_FIELD_ANY; - local_atm_addr.satm_blli.Layer3Protocol = SAP_FIELD_ABSENT; - local_atm_addr.satm_bhli.HighLayerInfoType = SAP_FIELD_ABSENT; - - /* Associate address with endpoint */ - if (ACE_OS::bind (( (ACE_SOCK_Acceptor *)this) -> get_handle (), - ACE_reinterpret_cast (struct sockaddr *, &local_atm_addr), - sizeof local_atm_addr) == -1) { - ACE_OS::printf ("Acceptor (open): bind %d\n", ::WSAGetLastError ()); - return (ACE_INVALID_HANDLE); - } - - /* Make endpoint listen for service requests */ - if (ACE_OS::listen (( (ACE_SOCK_Acceptor *)this) -> get_handle (), - backlog) - == -1) { - ACE_OS::printf ("Acceptor (open): listen %d\n", ::WSAGetLastError ()); - return (ACE_INVALID_HANDLE); - } - - return 0; -#elif defined (ACE_HAS_LINUX_ATM) - //we need to set the qos before binding to the socket - //use remote_sap as local_sap - - ACE_ATM_Addr local_sap; - ATM_Addr *local_sap_addr = (ATM_Addr*)local_sap.get_addr (); - ACE_ATM_QoS def_qos; - ATM_QoS qos = def_qos.get_qos (); - - ACE_HANDLE handle; - if ((handle = ACE_OS::socket (params.get_protocol_family (), - params.get_type (), - params.get_protocol (), - params.get_protocol_info (), - params.get_sock_group (), - params.get_flags () - )) - == ACE_INVALID_HANDLE) { - ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("Acceptor (socket): socket %d\n"), - errno); - return (ACE_INVALID_HANDLE); - } - - ((ACE_SOCK_Acceptor *)this) -> set_handle (handle); - if (ACE_OS::setsockopt (handle, - SOL_ATM, - SO_ATMQOS, - ACE_reinterpret_cast (char*, &qos), - sizeof (qos)) < 0) { - ACE_OS::printf ("Acceptor (setsockopt): setsockopt:%d\n", - errno); - } - - struct atmif_sioc req; - struct sockaddr_atmsvc aux_addr[1024]; - - req.number = 0; - req.arg = aux_addr; - req.length = sizeof (aux_addr); - if (ACE_OS::ioctl (handle, - ATM_GETADDR, - &req) < 0) { - ACE_OS::perror ("Acceptor (setsockopt): ioctl:"); - } - else { - local_sap_addr->sockaddratmsvc = aux_addr[0]; - } - local_sap.set_selector (( (ACE_ATM_Addr*)&remote_sap)->get_selector ()); - - if (ACE_OS::bind (handle, - ACE_reinterpret_cast (struct sockaddr *, - & (local_sap_addr->sockaddratmsvc)), - sizeof (local_sap_addr->sockaddratmsvc) - ) == -1) { - ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("Acceptor (open): bind %d\n"), - errno); - return -1; - } - // Make endpoint listen for service requests - if (ACE_OS::listen (handle, - backlog) - == -1) { - ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("Acceptor (listen): listen %d\n"), - errno); - return -1; - } - - return 0; -#else - ACE_UNUSED_ARG (remote_sap); - ACE_UNUSED_ARG (backlog); - ACE_UNUSED_ARG (params); -#endif /* ACE_HAS_FORE_ATM_XTI/ACE_HAS_FORE_ATM_WS2/ACE_HAS_LINUX_ATM */ -} - -int -ACE_ATM_Acceptor::accept (ACE_ATM_Stream &new_sap, - ACE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle, - ACE_ATM_Params params, - ACE_ATM_QoS qos) -{ - ACE_TRACE ("ACE_ATM_Acceptor::accept"); -#if defined (ACE_HAS_FORE_ATM_XTI) - ATM_QoS optbuf = qos.get_qos (); - - return (acceptor_.accept (new_sap.get_stream (), - remote_addr, - timeout, - restart, - reset_new_handle, - params.get_rw_flag (), - params.get_user_data (), - &optbuf)); -#elif defined (ACE_HAS_FORE_ATM_WS2) - ACE_HANDLE n_handle; - ACE_HANDLE s_handle = ((ACE_SOCK_Acceptor *) this) -> get_handle (); - struct sockaddr_atm *cli_addr - = (struct sockaddr_atm *)remote_addr -> get_addr (); - int caddr_len = sizeof (struct sockaddr_atm); - - do { - n_handle = ACE_OS::accept (s_handle, - ACE_reinterpret_cast (struct sockaddr *, - cli_addr), - &caddr_len); - } while (n_handle == ACE_INVALID_HANDLE && errno == EINTR); - - ((ACE_ATM_Addr *)remote_addr) -> set (cli_addr, - ((ACE_ATM_Addr *)remote_addr) -> get_selector ()); - ((ACE_IPC_SAP *)&new_sap) -> set_handle (n_handle); - - return 0; -#elif defined (ACE_HAS_LINUX_ATM) - ACE_UNUSED_ARG (params); - - ACE_HANDLE s_handle = ((ACE_SOCK_Acceptor *) this) -> get_handle (); - struct atm_qos accept_qos = qos.get_qos (); - - if (ACE_OS::setsockopt (s_handle, - SOL_ATM, - SO_ATMQOS, - ACE_reinterpret_cast (char*, - &accept_qos), - sizeof (accept_qos)) < 0) { - ACE_OS::printf ("Acceptor (accept): error setting Qos"); - } - - return (acceptor_.accept (new_sap.get_stream (), - remote_addr, - timeout, - restart, - reset_new_handle)); -#else - ACE_UNUSED_ARG (new_sap); - ACE_UNUSED_ARG (remote_addr); - ACE_UNUSED_ARG (timeout); - ACE_UNUSED_ARG (restart); - ACE_UNUSED_ARG (reset_new_handle); - ACE_UNUSED_ARG (params); - ACE_UNUSED_ARG (qos); - return (0); -#endif /* ACE_HAS_FORE_ATM_XTI */ -} - -#endif /* ACE_HAS_ATM */ diff --git a/ace/ATM_Acceptor.h b/ace/ATM_Acceptor.h deleted file mode 100644 index 11dcc7698fb..00000000000 --- a/ace/ATM_Acceptor.h +++ /dev/null @@ -1,110 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file ATM_Acceptor.h - * - * $Id$ - * - * @author Joe Hoffert - */ -//============================================================================= - - -#ifndef ACE_ATM_ACCEPTOR_H -#define ACE_ATM_ACCEPTOR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_ATM) - -#include "ace/Time_Value.h" -#include "ace/ATM_Stream.h" -#include "ace/ATM_Params.h" -#include "ace/ATM_QoS.h" - -#if defined (ACE_HAS_LINUX_ATM) -#include /**/ "atm.h" -#endif /* ACE_HAS_LINUX_ATM */ - -#if defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) -#include "SOCK_Acceptor.h" -typedef ACE_SOCK_Acceptor ATM_Acceptor; -#elif defined (ACE_HAS_FORE_ATM_XTI) -#include "TLI_Acceptor.h" -typedef ACE_TLI_Acceptor ATM_Acceptor; -#endif // ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM - -/** - * @class ACE_ATM_Acceptor - * - * @brief Defines the member functions for ACE_ATM_Acceptor abstraction. - * - * This class wraps up the ACE_SOCK_Acceptor and ACE_TLI_Acceptor - * to make the mechanism for the ATM protocol transparent. - */ -class ACE_Export ACE_ATM_Acceptor -{ - -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_ATM_Acceptor (void); - - ~ACE_ATM_Acceptor (); - - /// Initiate a passive mode connection. - ACE_ATM_Acceptor (const ACE_Addr &remote_sap, - int backlog = ACE_DEFAULT_BACKLOG, - ACE_ATM_Params params = ACE_ATM_Params()); - - /// Initiate a passive mode socket. - ACE_HANDLE open (const ACE_Addr &remote_sap, - int backlog = ACE_DEFAULT_BACKLOG, - ACE_ATM_Params params = ACE_ATM_Params()); - - /// Close down the acceptor and release resources. - int close (void); - - // = Passive connection acceptance method. - - /// Accept a new data transfer connection. A of 0 means - /// block forever, a of {0, 0} means poll. == 1 - /// means "restart if interrupted." - int accept (ACE_ATM_Stream &new_sap, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0, - ACE_ATM_Params params = ACE_ATM_Params(), - ACE_ATM_QoS qos = ACE_ATM_QoS()); - - /// Get the local address currently listening on - int get_local_addr( ACE_ATM_Addr &local_addr ); - - // = Meta-type info - typedef ACE_ATM_Addr PEER_ADDR; - typedef ACE_ATM_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - ATM_Acceptor acceptor_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/ATM_Acceptor.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_ATM */ -#include "ace/post.h" -#endif /* ACE_ATM_ACCEPTOR_H */ diff --git a/ace/ATM_Acceptor.i b/ace/ATM_Acceptor.i deleted file mode 100644 index 3561cfa4733..00000000000 --- a/ace/ATM_Acceptor.i +++ /dev/null @@ -1,30 +0,0 @@ -// $Id$ - -// ATM_Acceptor.i - -ACE_INLINE -ACE_ATM_Acceptor::ACE_ATM_Acceptor (const ACE_Addr &remote_sap, - int backlog, - ACE_ATM_Params params) -{ - ACE_TRACE ("ACE_ATM_Acceptor::ACE_ATM_Acceptor"); - if (open (remote_sap, - backlog, - params) < 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_ATM_Acceptor::ACE_ATM_Acceptor"))); -} - -ACE_INLINE -int -ACE_ATM_Acceptor::close (void) -{ -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) - return (acceptor_.close()); -#else - return 0; -#endif // ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM -} - - diff --git a/ace/ATM_Addr.cpp b/ace/ATM_Addr.cpp deleted file mode 100644 index 1cb266876e6..00000000000 --- a/ace/ATM_Addr.cpp +++ /dev/null @@ -1,503 +0,0 @@ -// $Id$ - -// Defines the Internet domain address family address format. - -#include "ace/ATM_Addr.h" -#if defined (ACE_HAS_ATM) - -#include "ace/Log_Msg.h" - -#if defined (ACE_HAS_FORE_ATM_WS2) -#include /**/ "forews2.h" -#endif /* ACE_HAS_FORE_ATM_WS2 */ - -#if !defined (__ACE_INLINE__) -#include "ace/ATM_Addr.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, ATM_Addr, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Addr) - -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) -#define BHLI_MAGIC "FORE_ATM" -// This is line rate in cells/s for an OC-3 MM interface. -const long ACE_ATM_Addr::LINE_RATE = 353207; -const int ACE_ATM_Addr::OPT_FLAGS_CPID = 0x1; -const int ACE_ATM_Addr::OPT_FLAGS_PMP = 0x2; -const int ACE_ATM_Addr::DEFAULT_SELECTOR = 0x99; -#elif defined (ACE_HAS_LINUX_ATM) -//pbrandao:for Linux: -//pbrandao:for now stick with current definitions -//pbrandao:see if later need to change -const long ACE_ATM_Addr::LINE_RATE = 353207; -const int ACE_ATM_Addr::OPT_FLAGS_CPID = 0; -const int ACE_ATM_Addr::OPT_FLAGS_PMP = 0; -const int ACE_ATM_Addr::DEFAULT_SELECTOR = 0x99; -#else -const long ACE_ATM_Addr::LINE_RATE = 0L; -const int ACE_ATM_Addr::OPT_FLAGS_CPID = 0; -const int ACE_ATM_Addr::OPT_FLAGS_PMP = 0; -const int ACE_ATM_Addr::DEFAULT_SELECTOR = 0x0; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ - -// Default constructor - -ACE_ATM_Addr::ACE_ATM_Addr (u_char selector) -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) - : ACE_Addr (AF_ATM, -#elif defined (ACE_HAS_LINUX_ATM) - : ACE_Addr (PF_ATMSVC, -#else - : ACE_Addr (AF_UNSPEC, -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ - sizeof this->atm_addr_) -{ - // ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr"); - (void) ACE_OS::memset ((void *) &this->atm_addr_, - 0, - sizeof this->atm_addr_); - this->init (selector); -} - -// Copy constructor. - -ACE_ATM_Addr::ACE_ATM_Addr (const ACE_ATM_Addr &sap, - u_char selector) -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) - : ACE_Addr (AF_ATM, -#elif defined (ACE_HAS_LINUX_ATM) - : ACE_Addr (PF_ATMSVC, -#else - : ACE_Addr (AF_UNSPEC, -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ - sizeof this->atm_addr_) -{ - ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr"); - this->set (sap, selector); -#if defined (ACE_HAS_LINUX_ATM) - this->atm_addr_.sockaddratmsvc.sas_family = PF_ATMSVC; - this->atm_addr_.atmsap.blli[0].l3_proto = ATM_L3_NONE; - this->atm_addr_.atmsap.blli[0].l2_proto = ATM_L2_NONE; - this->atm_addr_.atmsap.bhli.hl_type = ATM_HL_NONE; -#endif /* ACE_HAS_LINUX_ATM */ -} - -ACE_ATM_Addr::ACE_ATM_Addr (const ATM_Addr *sap, - u_char selector) -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) - : ACE_Addr (AF_ATM, -#elif defined (ACE_HAS_LINUX_ATM) - : ACE_Addr (PF_ATMSVC, -#else - : ACE_Addr (AF_UNSPEC, -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ - sizeof this->atm_addr_) -{ - ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr"); - this->set (sap, selector); -} - - -ACE_ATM_Addr::ACE_ATM_Addr (const ACE_TCHAR sap[], - u_char selector) -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) - : ACE_Addr (AF_ATM, -#elif defined (ACE_HAS_LINUX_ATM) - : ACE_Addr (PF_ATMSVC, -#else - : ACE_Addr (AF_UNSPEC, -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ - sizeof this->atm_addr_) -{ - ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr"); - this->set (sap, selector); -} - -void -ACE_ATM_Addr::init (u_char selector) -{ -#if defined (ACE_HAS_FORE_ATM_XTI) - // Note: this approach may be FORE implementation-specific. When we - // bind with tag_addr ABSENT and tag_selector PRESENT, only the - // selector (i.e. address[19]) is used by the TP. The rest of the - // local address is filled in by the TP and can be obtained via the - // 'ret' parameter or with t_getname ()/t_getprotaddr (). - - atm_addr_.addressType = (u_int16_t) AF_ATM; - - atm_addr_.sap.t_atm_sap_addr.SVE_tag_addr = (int8_t) T_ATM_ABSENT; - atm_addr_.sap.t_atm_sap_addr.SVE_tag_selector = (int8_t) T_ATM_PRESENT; - - atm_addr_.sap.t_atm_sap_addr.address_format = (u_int8_t) T_ATM_ENDSYS_ADDR; - atm_addr_.sap.t_atm_sap_addr.address_length = ATMNSAP_ADDR_LEN; - atm_addr_.sap.t_atm_sap_addr.address[ATMNSAP_ADDR_LEN - 1] = selector; - - atm_addr_.sap.t_atm_sap_layer2.SVE_tag = (int8_t) T_ATM_ABSENT; - atm_addr_.sap.t_atm_sap_layer3.SVE_tag = (int8_t) T_ATM_ABSENT; - - atm_addr_.sap.t_atm_sap_appl.SVE_tag = (int8_t) T_ATM_PRESENT; - atm_addr_.sap.t_atm_sap_appl.ID_type = (u_int8_t) T_ATM_USER_APP_ID; - - ACE_OS::memcpy (atm_addr_.sap.t_atm_sap_appl.ID.user_defined_ID, - BHLI_MAGIC, - sizeof atm_addr_.sap.t_atm_sap_appl.ID); -#elif defined (ACE_HAS_FORE_ATM_WS2) - ACE_OS::memset ((void *)&atm_addr_, 0, sizeof atm_addr_); - atm_addr_.satm_number.Addr[ ATM_ADDR_SIZE - 1 ] = (char)selector; - atm_addr_.satm_family = AF_ATM; - atm_addr_.satm_number.AddressType = ATM_NSAP; - atm_addr_.satm_number.NumofDigits = ATM_ADDR_SIZE; - atm_addr_.satm_blli.Layer2Protocol = SAP_FIELD_ABSENT; - atm_addr_.satm_blli.Layer3Protocol = SAP_FIELD_ABSENT; - atm_addr_.satm_bhli.HighLayerInfoType = SAP_FIELD_ABSENT; - - // Need to know the correspondence. - //atm_addr_.sap.t_atm_sap_appl.SVE_tag = (int8_t) T_ATM_PRESENT; - //atm_addr_.sap.t_atm_sap_appl.ID_type = (u_int8_t) T_ATM_USER_APP_ID; - //ACE_OS::memcpy (atm_addr_.sap.t_atm_sap_appl.ID.user_defined_ID, - // BHLI_MAGIC, - // sizeof atm_addr_.sap.t_atm_sap_appl.ID); -#elif defined (ACE_HAS_LINUX_ATM) - atm_addr_.sockaddratmsvc.sas_family = AF_ATMSVC; - atm_addr_.sockaddratmsvc.sas_addr.prv[ATM_ESA_LEN - 1] = (char)selector; - atm_addr_.atmsap.blli[0].l3_proto = ATM_L3_NONE; - atm_addr_.atmsap.blli[0].l2_proto = ATM_L2_NONE; - atm_addr_.atmsap.bhli.hl_type = ATM_HL_NONE; -#else - ACE_UNUSED_ARG (selector); -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ -} - -int -ACE_ATM_Addr::set (const ACE_ATM_Addr &sap, - u_char selector) -{ - ACE_TRACE ("ACE_ATM_Addr::set"); - - this->init (selector); - - this->ACE_Addr::base_set (sap.get_type (), - sap.get_size ()); - -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) - ACE_ASSERT (sap.get_type () == AF_ATM); -#elif defined (ACE_HAS_LINUX_ATM) - ACE_ASSERT (sap.get_type () == PF_ATMSVC); -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 */ - - (void) ACE_OS::memcpy ((void *) &this->atm_addr_, - (void *) &sap.atm_addr_, - sizeof this->atm_addr_); - return 0; -} - -int -ACE_ATM_Addr::set (const ATM_Addr *sap, - u_char selector) -{ - ACE_TRACE ("ACE_ATM_Addr::set"); - - this->init (selector); - -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) - this->ACE_Addr::base_set (AF_ATM, -#elif defined (ACE_HAS_LINUX_ATM) - this->ACE_Addr::base_set (PF_ATMSVC, -#else - this->ACE_Addr::base_set (AF_UNSPEC, -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 */ - sizeof (*sap)); - - (void) ACE_OS::memcpy ((void *) &this->atm_addr_, - (void *) sap, - sizeof this->atm_addr_); - return 0; -} - -int -ACE_ATM_Addr::set (const ACE_TCHAR address[], - u_char selector) -{ - ACE_TRACE ("ACE_ATM_Addr::set"); - int ret; - - this->init (selector); - -#if defined (ACE_HAS_FORE_ATM_XTI) - atm_addr_.sap.t_atm_sap_addr.SVE_tag_addr = - (int8_t) T_ATM_PRESENT; -#endif /* ACE_HAS_FORE_ATM_XTI */ - - ret = this -> string_to_addr (address); - this -> set_selector (selector); - return ret; -} - -// Transform the string into the current addressing format. - -int -ACE_ATM_Addr::string_to_addr (const ACE_TCHAR sap[]) -{ - ACE_TRACE ("ACE_ATM_Addr::string_to_addr"); - -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) - this->ACE_Addr::base_set (AF_ATM, -#elif defined (ACE_HAS_LINUX_ATM) - this->ACE_Addr::base_set (PF_ATMSVC, -#else - this->ACE_Addr::base_set (AF_UNSPEC, -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ - sizeof this->atm_addr_); -#if defined (ACE_HAS_FORE_ATM_XTI) - struct hostent *entry; - struct atmnsap_addr *nsap; - - // Yow, someone gave us a NULL ATM address! - if (sap == 0) - { - errno = EINVAL; - return -1; - } - else if ((entry = gethostbyname_atmnsap ((ACE_TCHAR *)sap)) != 0) - { - ACE_OS::memcpy (atm_addr_.sap.t_atm_sap_addr.address, - entry->h_addr_list[0], - ATMNSAP_ADDR_LEN - 1); - } - else if ((nsap = atmnsap_addr (sap)) != 0) - { - ACE_OS::memcpy (atm_addr_.sap.t_atm_sap_addr.address, - nsap->atmnsap, - ATMNSAP_ADDR_LEN); - } - else { - errno = EINVAL; - return -1; - } -#elif defined (ACE_HAS_FORE_ATM_WS2) - DWORD dwValue; - HANDLE hLookup; - WSAQUERYSETW qsRestrictions; - CSADDR_INFO csaBuffer; - WCHAR tmpWStr[100]; - - MultiByteToWideChar (CP_ACP, MB_PRECOMPOSED, sap, -1, tmpWStr, 100); - - csaBuffer.LocalAddr.iSockaddrLength = sizeof (struct sockaddr_atm); - csaBuffer.LocalAddr.lpSockaddr = (struct sockaddr *)&atm_addr_; - csaBuffer.RemoteAddr.iSockaddrLength = sizeof (struct sockaddr_atm); - csaBuffer.RemoteAddr.lpSockaddr = (struct sockaddr *)&atm_addr_; - - qsRestrictions.dwSize = sizeof (WSAQUERYSETW); - qsRestrictions.lpszServiceInstanceName = 0; - qsRestrictions.lpServiceClassId = &FORE_NAME_CLASS; - qsRestrictions.lpVersion = 0; - qsRestrictions.lpszComment = 0; - qsRestrictions.dwNameSpace = FORE_NAME_SPACE; - qsRestrictions.lpNSProviderId = 0; - qsRestrictions.lpszContext = L""; - qsRestrictions.dwNumberOfProtocols = 0; - qsRestrictions.lpafpProtocols = 0; - qsRestrictions.lpszQueryString = tmpWStr; - qsRestrictions.dwNumberOfCsAddrs = 1; - qsRestrictions.lpcsaBuffer = &csaBuffer; - qsRestrictions.lpBlob = 0; //&blob; - - if (::WSALookupServiceBeginW (&qsRestrictions, LUP_RETURN_ALL, &hLookup) - == SOCKET_ERROR) { - ACE_OS::printf ("Error: WSALookupServiceBeginW failed! %d\n", - ::WSAGetLastError ()); - return -1; - } - - dwValue = sizeof (WSAQUERYSETW); - - if (::WSALookupServiceNextW (hLookup, 0, &dwValue, &qsRestrictions) - == SOCKET_ERROR) { - if (WSAGetLastError () != WSA_E_NO_MORE) { - ACE_OS::printf ("Error: WSALookupServiceNextW failed! %d\n", - ::WSAGetLastError ()); - return -1; - } - } - - if (WSALookupServiceEnd (hLookup) == SOCKET_ERROR) { - ACE_OS::printf ("Error : WSALookupServiceEnd failed! %d \n", - ::WSAGetLastError ()); - errno = EINVAL; - return -1; - } -#elif defined (ACE_HAS_LINUX_ATM) - if (sap == 0 || !ACE_OS::strcmp (sap,"")) { - errno = EINVAL; - return -1; - } - - if (text2atm ((ACE_TCHAR *)sap, - (struct sockaddr *)& (atm_addr_.sockaddratmsvc), - sizeof (atm_addr_.sockaddratmsvc), - T2A_SVC | T2A_NAME) < 0) { - ACE_DEBUG (LM_DEBUG, - "Error : text2atm failed!\n"); - errno = EINVAL; - return -1; - } -#else - ACE_UNUSED_ARG (sap); - - return 0; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ - -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) - return 0; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 */ -} - -// Transform the current address into string format. - -int -ACE_ATM_Addr::addr_to_string (ACE_TCHAR addr[], - size_t addrlen) const -{ - ACE_TRACE ("ACE_ATM_Addr::addr_to_string"); - -#if defined (ACE_HAS_FORE_ATM_XTI) - ACE_TCHAR buffer[MAXNAMELEN + 1]; - struct atmnsap_addr nsap; - ACE_OS::memcpy (nsap.atmnsap, - atm_addr_.sap.t_atm_sap_addr.address, - ATMNSAP_ADDR_LEN); - ACE_OS::sprintf (buffer, - ACE_LIB_TEXT ("%s"), - atmnsap_ntoa (nsap)); - - size_t total_len = ACE_OS::strlen (buffer) + sizeof ('\0'); - - if (addrlen < total_len) - return -1; - else - ACE_OS::strcpy (addr, buffer); - - return 0; -#elif defined (ACE_HAS_FORE_ATM_WS2) - ACE_TCHAR buffer[MAXNAMELEN + 1]; - int i; - - if (addrlen < ATM_ADDR_SIZE + 1) - return -1; - - for (i = 0; i < ATM_ADDR_SIZE; i++) { - buffer[ i * 3 ] = '\0'; - ACE_OS::sprintf (buffer, ACE_LIB_TEXT ("%s%02x."), - buffer, - atm_addr_.satm_number.Addr[ i ]); - } - - buffer[ ATM_ADDR_SIZE * 3 - 1 ] = '\0'; - ACE_OS::strcpy (addr, buffer); - - return 0; -#elif defined (ACE_HAS_LINUX_ATM) - ACE_TCHAR buffer[MAX_ATM_ADDR_LEN + 1]; - int total_len; - if ((total_len = atm2text (buffer, - sizeof buffer, - (struct sockaddr *)& (atm_addr_.sockaddratmsvc), - A2T_PRETTY)) < 0) { - ACE_DEBUG ((LM_DEBUG,"ACE_ATM_Addr (addr_to_string): atm2text failed\n")); - return -1; - } - if (addrlen < (size_t)total_len) - return -1; - else - ACE_OS::strcpy (addr, - buffer); - - return 0; -#else - ACE_UNUSED_ARG (addr); - ACE_UNUSED_ARG (addrlen); - return -1; -#endif /* ACE_HAS_FORE_ATM_XTI && ACE_HAS_FORE_ATM_WS2 */ -} - -const ACE_TCHAR * -ACE_ATM_Addr::addr_to_string (void) const -{ - ACE_TRACE ("ACE_ATM_Addr::addr_to_string"); - - static ACE_TCHAR addr[MAXHOSTNAMELEN + 1]; - if (this->addr_to_string (addr, - MAXHOSTNAMELEN + 1) < 0) - return 0; - - return addr; -} - -// Set a pointer to the address. -void -ACE_ATM_Addr::set_addr (void *addr, int len) -{ - ACE_TRACE ("ACE_ATM_Addr::set_addr"); - -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) - this->ACE_Addr::base_set (AF_ATM, -#elif defined (ACE_HAS_LINUX_ATM) - this->ACE_Addr::base_set (PF_ATMSVC, -#else - this->ACE_Addr::base_set (AF_UNSPEC, -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_WS2 */ - len); - ACE_OS::memcpy ((void *) &this->atm_addr_, - (void *) addr, len); -} - -// Compare two addresses for inequality. - -int -ACE_ATM_Addr::operator != (const ACE_ATM_Addr &sap) const -{ - ACE_TRACE ("ACE_ATM_Addr::operator !="); - return ! ((*this) == sap); -} - -// Compare two addresses for equality. - -int -ACE_ATM_Addr::operator == (const ACE_ATM_Addr &sap) const -{ - ACE_TRACE ("ACE_ATM_Addr::operator =="); - -#if defined (ACE_HAS_LINUX_ATM) - return (atm_equal ((const struct sockaddr *)& (this->atm_addr_.sockaddratmsvc), - (const struct sockaddr *)& (sap.atm_addr_.sockaddratmsvc), - 0, - 0) - && - sap_equal (& (this->atm_addr_.atmsap), - & (sap.atm_addr_.atmsap), - 0)); -#else - return ACE_OS::memcmp (&atm_addr_, - &sap.atm_addr_, - sizeof (ATM_Addr)) == 0; -#endif /* ACE_HAS_LINUX_ATM */ -} - -void -ACE_ATM_Addr::dump (void) const -{ - ACE_TRACE ("ACE_ATM_Addr::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - ACE_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16]; - ACE_OS::sprintf (s, - ACE_LIB_TEXT ("%s"), - this->addr_to_string ()); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s"), s)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -#endif /* ACE_HAS_ATM */ diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h deleted file mode 100644 index 39aecd2447e..00000000000 --- a/ace/ATM_Addr.h +++ /dev/null @@ -1,186 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file ATM_Addr.h - * - * $Id$ - * - * @author Joe Hoffert - */ -//========================================================================== - -#ifndef ACE_ATM_ADDR_H -#define ACE_ATM_ADDR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_ATM) - -#include "ace/ACE_export.h" -#include "ace/Addr.h" - -#if defined (ACE_HAS_FORE_ATM_XTI) -typedef ATMSAPAddress ATM_Addr; -#elif defined (ACE_HAS_FORE_ATM_WS2) -#define FORE_NAME_SPACE NS_ALL -typedef struct sockaddr_atm ATM_Addr; -#elif defined (ACE_HAS_LINUX_ATM) - -#include /**/ "atm.h" - -//pbrandao:as Linux has this 2 structs separeted we "link it" here -typedef struct _linux_atm_addr -{ - struct sockaddr_atmsvc sockaddratmsvc; - struct atm_sap atmsap; -} ATM_Addr; -#else -typedef int ATM_Addr; -#endif /* ACE_HAS_FORE_ATM_XTI/ACE_HAS_FORE_ATM_WS2/ACE_HAS_LINUX_ATM */ - -/** - * @class ACE_ATM_Addr - * - * @brief Defines the ATM domain address family address format. - */ -class ACE_Export ACE_ATM_Addr : public ACE_Addr -{ -public: - // Constants used for ATM options - static const long LINE_RATE; - static const int OPT_FLAGS_CPID; - static const int OPT_FLAGS_PMP; - static const int DEFAULT_SELECTOR; - - // = Initialization methods. - /// Default constructor. - ACE_ATM_Addr (u_char selector = DEFAULT_SELECTOR); - - /// Copy constructor. - ACE_ATM_Addr (const ACE_ATM_Addr &, - u_char selector = DEFAULT_SELECTOR); - - /** - * Creates an from an ATMSAPAddress structure. This - * is vendor specific (FORE systems). May need to change when other - * vendors are supported. - */ - ACE_ATM_Addr (const ATM_Addr *, - u_char selector = DEFAULT_SELECTOR); - - /** - * Initializes an from the which can be - * "atm-address" (e.g., - * "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00") or "hostname" - * (e.g., "frisbee.cs.wustl.edu"). - */ - ACE_ATM_Addr (const ACE_TCHAR sap[], - u_char selector = DEFAULT_SELECTOR); - - /// Default dtor. - ~ACE_ATM_Addr (void); - - // = Initialization methods (useful after object construction). - /// Default initialization for non-address values (e.g., - /// t_atm_sap_addr.SVE_tag_addr, t_atm_sap_addr.SVE_tag_selector) - void init (u_char selector = DEFAULT_SELECTOR); - - /// Initializes from another . - int set (const ACE_ATM_Addr &, - u_char selector = DEFAULT_SELECTOR); - - /** - * Initializes an from an ATMSAPAddress/sockaddr_atm - * structure. This is vendor specific (FORE systems). May need to - * change when other vendors are supported. - */ - int set (const ATM_Addr *, - u_char selector = DEFAULT_SELECTOR); - - /** - * Initializes an from the which can be - * "atm-address" (e.g., - * "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00") or "hostname" - * (e.g., "frisbee.cs.wustl.edu"). - */ - int set (const ACE_TCHAR sap[], - u_char selector = DEFAULT_SELECTOR); - - /** - * Initializes an from the which can be - * "atm-address" (e.g., - * "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00") or "hostname" - * (e.g., "frisbee.cs.wustl.edu"). - */ - virtual int string_to_addr (const ACE_TCHAR sap[]); - - /** - * Return the character representation of the ATM address (e.g., - * "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00") storing it in - * the (which is assumed to be bytes long). This - * version is reentrant. Returns -1 if the of the - * is too small, else 0. - */ - virtual int addr_to_string (ACE_TCHAR addr[], - size_t addrlen) const; - - /** - * Return the character representation of the ATM address (e.g., - * "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00"). Returns -1 - * if the of the is too small, else 0.(This version - * is non-reentrant since it returns a pointer to a static data - * area.) - */ - const ACE_TCHAR *addr_to_string (void) const; - - /// Return a pointer to the underlying network address. - virtual void *get_addr (void) const; - - /// Set a pointer to the address. - virtual void set_addr (void *, int); - - /// Return the selector for network address. - u_char get_selector (void) const; - - /// Set the selector for the network address. - void set_selector (u_char selector); - - /** - * Compare two addresses for equality. The addresses are considered - * equal if they contain the same ATM address. Q: Is there any - * other check for equality needed for ATM? - */ - int operator == (const ACE_ATM_Addr &SAP) const; - - /// Compare two addresses for inequality. - int operator != (const ACE_ATM_Addr &SAP) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -// char *construct_options (ACE_HANDLE fd, -// int qos_kb, -// int flags, -// long *optsize); -// // Construct options for ATM connections - -private: - ATM_Addr atm_addr_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/ATM_Addr.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_ATM */ -#include "ace/post.h" -#endif /* ACE_ATM_ADDR_H */ diff --git a/ace/ATM_Addr.i b/ace/ATM_Addr.i deleted file mode 100644 index 41bb6c27193..00000000000 --- a/ace/ATM_Addr.i +++ /dev/null @@ -1,49 +0,0 @@ -// $Id$ - -// ATM_Addr.i - -// Default dtor. -ACE_INLINE -ACE_ATM_Addr::~ACE_ATM_Addr (void) -{ -} - -// Return the address. - -ACE_INLINE void * -ACE_ATM_Addr::get_addr (void) const -{ - ACE_TRACE ("ACE_ATM_Addr::get_addr"); - return (void *) &this->atm_addr_; -} - -ACE_INLINE u_char -ACE_ATM_Addr::get_selector (void) const -{ - ACE_TRACE ("ACE_ATM_Addr::get_selector"); -#if defined (ACE_HAS_FORE_ATM_XTI) - return atm_addr_.sap.t_atm_sap_addr.address[ATMNSAP_ADDR_LEN - 1]; -#elif defined (ACE_HAS_FORE_ATM_WS2) - return atm_addr_.satm_number.Addr[ ATM_ADDR_SIZE - 1 ]; -#elif defined (ACE_HAS_LINUX_ATM) - return atm_addr_.sockaddratmsvc.sas_addr.prv[ATM_ESA_LEN - 1]; -#else - return 0; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ -} - -ACE_INLINE void -ACE_ATM_Addr::set_selector (u_char selector) -{ - ACE_TRACE ("ACE_ATM_Addr::set_selector"); -#if defined (ACE_HAS_FORE_ATM_XTI) - atm_addr_.sap.t_atm_sap_addr.address[ATMNSAP_ADDR_LEN - 1] = selector; -#elif defined (ACE_HAS_FORE_ATM_WS2) - atm_addr_.satm_number.Addr[ ATM_ADDR_SIZE - 1 ] = selector; -#elif defined (ACE_HAS_LINUX_ATM) - atm_addr_.sockaddratmsvc.sas_addr.prv[ATM_ESA_LEN - 1] = selector; -#else - ACE_UNUSED_ARG (selector); -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ -} - diff --git a/ace/ATM_Connector.cpp b/ace/ATM_Connector.cpp deleted file mode 100644 index c04294ab0c1..00000000000 --- a/ace/ATM_Connector.cpp +++ /dev/null @@ -1,141 +0,0 @@ -// ATM_Connector.cpp -// $Id$ - -#include "ace/ATM_Connector.h" -#if defined (ACE_HAS_ATM) - -#include "ace/Handle_Set.h" - -ACE_RCSID(ace, ATM_Connector, "$Id$") - -#if !defined (__ACE_INLINE__) -#include "ace/ATM_Connector.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Connector) - -void -ACE_ATM_Connector::dump (void) const -{ - ACE_TRACE ("ACE_ATM_Connector::dump"); -} - -ACE_ATM_Connector::ACE_ATM_Connector (void) -{ - ACE_TRACE ("ACE_ATM_Connector::ACE_ATM_Connector"); -} - -// Actively connect and produce a new ACE_ATM_Stream if things go well... -// Connect the to the , waiting up to -// amount of time if necessary. - -int -ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, - const ACE_ATM_Addr &remote_sap, - ACE_ATM_Params params, - ACE_ATM_QoS options, - ACE_Time_Value *timeout, - const ACE_ATM_Addr &local_sap, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_ATM_Connector::connect"); -#if defined (ACE_HAS_FORE_ATM_XTI) - return connector_.connect(new_stream.get_stream(), - remote_sap, - timeout, - local_sap, - reuse_addr, - flags, - perms, - params.get_device(), - params.get_info(), - params.get_rw_flag(), - params.get_user_data(), - &options.get_qos()); -#elif defined (ACE_HAS_FORE_ATM_WS2) - ACE_DEBUG(LM_DEBUG, - ACE_LIB_TEXT ("ATM_Connector(connect): set QoS parameters\n" )); - - ACE_HANDLE s = new_stream.get_handle(); - struct sockaddr_atm *saddr = ( struct sockaddr_atm *)remote_sap.get_addr(); - ACE_QoS cqos = options.get_qos(); - - ACE_QoS_Params qos_params = ACE_QoS_Params(0, - 0, - &cqos, - 0, - 0); - - ACE_DEBUG(LM_DEBUG, - ACE_LIB_TEXT ("ATM_Connector(connect): connecting...\n")); - - int result = ACE_OS::connect( s, - ( struct sockaddr *)saddr, - sizeof( struct sockaddr_atm ), - qos_params ); - - if ( result != 0 ) - ACE_OS::printf( "ATM_Connector(connect): connection failed, %d\n", - ::WSAGetLastError()); - - return result; -#elif defined (ACE_HAS_LINUX_ATM) - ACE_UNUSED_ARG (params); - ACE_UNUSED_ARG (timeout); - ACE_UNUSED_ARG (reuse_addr); - ACE_UNUSED_ARG (perms); - ACE_UNUSED_ARG (flags); - - ACE_HANDLE handle = new_stream.get_handle(); - ATM_QoS qos =options.get_qos(); - ATM_Addr *local_addr=(ATM_Addr*)local_sap.get_addr(), - *remote_addr=(ATM_Addr*)remote_sap.get_addr(); - - if (ACE_OS::setsockopt(handle, - SOL_ATM, - SO_ATMSAP, - ACE_reinterpret_cast(char*, - &(local_addr->atmsap)), - sizeof(local_addr->atmsap)) < 0) { - ACE_OS::printf( "ATM_Connector(connect): unable to set atmsap %d\nContinuing...", - errno); - } - if (ACE_OS::setsockopt(handle, - SOL_ATM, - SO_ATMQOS, - ACE_reinterpret_cast(char*, - &qos), - sizeof(qos)) < 0) { - ACE_DEBUG((LM_DEBUG,ACE_LIB_TEXT ("ATM_Connector(connect): unable to set qos %d\n"), - errno)); - return -1; - } - - int result = ACE_OS::connect(handle, - (struct sockaddr *)&(remote_addr->sockaddratmsvc), - sizeof( remote_addr->sockaddratmsvc)); - - if ( result != 0 ) - ACE_DEBUG(LM_DEBUG, - ACE_LIB_TEXT ("ATM_Connector(connect): connection failed, %d\n"), - errno); - - return result; -#else - ACE_UNUSED_ARG (new_stream); - ACE_UNUSED_ARG (remote_sap); - ACE_UNUSED_ARG (params); - ACE_UNUSED_ARG (options); - ACE_UNUSED_ARG (timeout); - ACE_UNUSED_ARG (local_sap); - ACE_UNUSED_ARG (reuse_addr); - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (perms); - return 0; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ -} - -#endif /* ACE_HAS_ATM */ - diff --git a/ace/ATM_Connector.h b/ace/ATM_Connector.h deleted file mode 100644 index 6689b0acdd5..00000000000 --- a/ace/ATM_Connector.h +++ /dev/null @@ -1,158 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file ATM_Connector.h - * - * $Id$ - * - * @author Joe Hoffert - */ -//============================================================================= - -#ifndef ACE_ATM_CONNECTOR_H -#define ACE_ATM_CONNECTOR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_ATM) - -#include "ace/ATM_Stream.h" -#include "ace/ATM_Params.h" -#include "ace/ATM_QoS.h" - -#if defined (ACE_WIN32) || defined (ACE_HAS_LINUX_ATM) -#include "SOCK_Connector.h" -typedef ACE_SOCK_Connector ATM_Connector; -#else -#include "XTI_ATM_Mcast.h" -typedef ACE_XTI_ATM_Mcast ATM_Connector; -#endif - -/** - * @class ACE_ATM_Connector - * - * @brief Defines an active connection factory for the ACE_ATM C++ - * wrappers. - */ -class ACE_Export ACE_ATM_Connector -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_ATM_Connector (void); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The are the parameters needed for either socket - * or XTI/ATM connections. The is the amount of time to - * wait to connect. If it's 0 then we block indefinitely. If - * *timeout == {0, 0} then the connection is done using non-blocking - * mode. In this case, if the connection can't be made immediately - * the value of -1 is returned with . If - * *timeout > {0, 0} then this is the maximum amount of time to wait before - * timing out. If the time expires before the connection is made - * . The is the value of local address - * to bind to. If it's the default value of then - * the user is letting the OS do the binding. If == 1 - * then the is reused, even if it hasn't been cleanedup yet. - */ - ACE_ATM_Connector (ACE_ATM_Stream &new_stream, - const ACE_ATM_Addr &remote_sap, - ACE_ATM_Params params = ACE_ATM_Params(), - ACE_ATM_QoS options = ACE_ATM_QoS(), - ACE_Time_Value *timeout = 0, - const ACE_ATM_Addr &local_sap = ACE_ATM_Addr( "", 0 ), - int reuse_addr = 0, -#if defined (ACE_WIN32) - int flags = 0, -#else - int flags = O_RDWR, -#endif /* ACE_WIN32 */ - int perms = 0); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The are the parameters needed for either socket - * or XTI/ATM connections. The is the amount of time to - * wait to connect. If it's 0 then we block indefinitely. If - * *timeout == {0, 0} then the connection is done using non-blocking - * mode. In this case, if the connection can't be made immediately - * the value of -1 is returned with . If - * *timeout > {0, 0} then this is the maximum amount of time to wait before - * timing out. If the time expires before the connection is made - * . The is the value of local address - * to bind to. If it's the default value of then - * the user is letting the OS do the binding. If == 1 - * then the is reused, even if it hasn't been cleanedup yet. - */ - int connect (ACE_ATM_Stream &new_stream, - const ACE_ATM_Addr &remote_sap, - ACE_ATM_Params params = ACE_ATM_Params(), - ACE_ATM_QoS options = ACE_ATM_QoS(), - ACE_Time_Value *timeout = 0, - const ACE_ATM_Addr &local_sap = ACE_ATM_Addr( "", - 0 ), - int reuse_addr = 0, -#if defined (ACE_WIN32) - int flags = 0, -#else - int flags = O_RDWR, -#endif /* ACE_WIN32 */ - int perms = 0); - - /** - * Try to complete a non-blocking connection. - * If connection completion is successful then contains - * the connected ACE_SOCK_Stream. If is non-NULL then it - * will contain the address of the connected peer. - */ - int complete (ACE_ATM_Stream &new_stream, - ACE_ATM_Addr *remote_sap, - ACE_Time_Value *tv); - - //int add_leaf (ACE_ATM_Stream ¤t_stream, - // const ACE_Addr &remote_sap, - // ACE_INT32 leaf_id, - // ACE_Time_Value *timeout = 0); - - /** - * Actively add a leaf to the root (i.e., point-to-multipoint). The - * is the address of the leaf that we - * are trying to add. - */ - int add_leaf (ACE_ATM_Stream ¤t_stream, - const ACE_Addr &remote_sap, - ACE_ATM_QoS &qos); - - /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); - - // = Meta-type info - typedef ACE_ATM_Addr PEER_ADDR; - typedef ACE_ATM_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - ATM_Connector connector_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/ATM_Connector.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_ATM */ -#include "ace/post.h" -#endif /* ACE_ATM_CONNECTOR_H */ diff --git a/ace/ATM_Connector.i b/ace/ATM_Connector.i deleted file mode 100644 index 6b6d6fb876c..00000000000 --- a/ace/ATM_Connector.i +++ /dev/null @@ -1,120 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ATM_Connector.i - -ACE_INLINE -ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream, - const ACE_ATM_Addr &remote_sap, - ACE_ATM_Params params, - ACE_ATM_QoS options, - ACE_Time_Value *timeout, - const ACE_ATM_Addr &local_sap, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_ATM_Connector::ACE_ATM_Connector"); - if ((ACE_HANDLE)this->connect (new_stream, - remote_sap, - params, - options, - timeout, - local_sap, - reuse_addr, - flags, - perms) == ACE_INVALID_HANDLE - && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_ATM_Stream::ACE_ATM_Stream"))); -} - -// Try to complete a non-blocking connection. - -ACE_INLINE -int -ACE_ATM_Connector::complete (ACE_ATM_Stream &new_stream, - ACE_ATM_Addr *remote_sap, - ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_ATM_Connector::complete"); -#if defined (ACE_HAS_ATM) - return connector_.complete(new_stream.get_stream(), - remote_sap, - tv); -#else - ACE_UNUSED_ARG(new_stream); - ACE_UNUSED_ARG(remote_sap); - ACE_UNUSED_ARG(tv); - return 0; -#endif -} - -ACE_INLINE -int -ACE_ATM_Connector::add_leaf (ACE_ATM_Stream ¤t_stream, - const ACE_Addr &remote_sap, - ACE_ATM_QoS &qos) -{ - ACE_TRACE ("ACE_ATM_Connector::add_leaf"); -#if defined (ACE_HAS_FORE_ATM_XTI) - return connector_.add_leaf(current_stream.get_stream(), - remote_sap, - leaf_id, - timeout); -#elif defined (ACE_HAS_FORE_ATM_WS2) - struct sockaddr_atm *saddr = (struct sockaddr_atm *)remote_sap.get_addr(); - ACE_QoS cqos = qos.get_qos(); - int addr_len = sizeof( struct sockaddr_atm ); - - ACE_QoS_Params qos_params(0, - 0, - &cqos, - 0, - (JL_SENDER_ONLY)); - - ACE_OS::printf( "ATM_Connector::add_leaf: connecting...\n" ); - - ACE_HANDLE result = ACE_OS::join_leaf(current_stream.get_handle(), - (struct sockaddr *)saddr, - addr_len, - qos_params); - - if ( result == ACE_INVALID_HANDLE ) - ACE_OS::printf( "ATM_Connector(add_leaf): connection failed, %d\n", - ::WSAGetLastError()); - - return (result != ACE_INVALID_HANDLE); -#elif defined (ACE_HAS_LINUX_ATM) - ACE_OS::printf("ATM_Connector(add_leaf): not yet implemented in Linux \n"); - - ACE_UNUSED_ARG(current_stream); - ACE_UNUSED_ARG(remote_sap); - ACE_UNUSED_ARG(leaf_id); - ACE_UNUSED_ARG(timeout); - - return 0; -#else - ACE_UNUSED_ARG(current_stream); - ACE_UNUSED_ARG(remote_sap); - ACE_UNUSED_ARG(leaf_id); - ACE_UNUSED_ARG(timeout); - return 0; -#endif -} - -ACE_INLINE -int -ACE_ATM_Connector::reset_new_handle (ACE_HANDLE handle) -{ -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - // Reset the event association - return ::WSAEventSelect ((SOCKET) handle, - 0, - 0); -#else /* !defined ACE_HAS_WINSOCK2 */ - ACE_UNUSED_ARG (handle); - return 0; -#endif /* ACE_WIN32 */ -} - diff --git a/ace/ATM_Params.cpp b/ace/ATM_Params.cpp deleted file mode 100644 index dba4af08daf..00000000000 --- a/ace/ATM_Params.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// $Id$ - -#include "ace/ATM_Params.h" - -ACE_RCSID(ace, ATM_Params, "$Id$") - -#if defined (ACE_HAS_ATM) - -#if !defined (__ACE_INLINE__) -#include "ace/ATM_Params.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Params) - -void -ACE_ATM_Params::dump (void) const -{ - ACE_TRACE ("ACE_ATM_Params::dump"); -} - -#endif /* ACE_HAS_ATM */ - diff --git a/ace/ATM_Params.h b/ace/ATM_Params.h deleted file mode 100644 index 921e2abcaaf..00000000000 --- a/ace/ATM_Params.h +++ /dev/null @@ -1,210 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file ATM_Params.h - * - * $Id$ - * - * @author Joe Hoffert - */ -//========================================================================== - - -#ifndef ACE_ATM_PARAMS_H -#define ACE_ATM_PARAMS_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_ATM) - -#include "ace/ACE_export.h" - -#if defined (ACE_HAS_FORE_ATM_XTI) -#include "ace/TLI.h" -#define ATM_PROTOCOL_DEFAULT 0 -typedef struct t_info Param_Info; -typedef struct netbuf Param_Udata; -#elif defined (ACE_HAS_FORE_ATM_WS2) -#include "ace/SOCK.h" -#define ATM_PROTOCOL_DEFAULT ATMPROTO_AAL5 -#define ACE_XTI_ATM_DEVICE "" -typedef int Param_Info; -typedef int Param_Udata; -#elif defined (ACE_HAS_LINUX_ATM) -#include /**/ "atm.h" -#define AF_ATM PF_ATMSVC -#define ACE_XTI_ATM_DEVICE "" -#define ATM_PROTOCOL_DEFAULT ATM_AAL5 -typedef int Param_Info; -typedef int Param_Udata; -#else -#define ACE_XTI_ATM_DEVICE "" -typedef int Param_Info; -typedef int Param_Udata; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ - -/** - * @class ACE_ATM_Params - * - * @brief Wrapper class that simplifies the information passed to the ATM - * enabled ACE_ATM_Connector class. - */ -class ACE_Export ACE_ATM_Params -{ -public: - /** - * Initialize the data members. This class combines options from - * ACE_SOCK_Connector (, , , - * , , and ) and - * ACE_TLI_Connector (, , , , and ) - * so that either mechanism can be used transparently for ATM. - */ - ACE_ATM_Params (int rw_flag = 1, - const char device[] = ACE_XTI_ATM_DEVICE, - Param_Info *info = 0, - Param_Udata *udata = 0, - int oflag = O_RDWR, - int protocol_family = AF_ATM, - int protocol = ATM_PROTOCOL_DEFAULT, - int type = -#if defined (ACE_HAS_LINUX_ATM) - SOCK_DGRAM, -#else - SOCK_RAW, -#endif /* ACE_HAS_LINUX_ATM */ - ACE_Protocol_Info *protocol_info = 0, - ACE_SOCK_GROUP g = 0, - u_long flags - = ACE_FLAG_MULTIPOINT_C_ROOT - | ACE_FLAG_MULTIPOINT_D_ROOT, // connector by default - int reuse_addr = 0); - - /// Destructor. - ~ACE_ATM_Params (); - - /// Get protocol family. - int get_protocol_family (void) const; - - /// Set protocol family. - void set_protocol_family (int); - - /// Get protocol. - int get_protocol (void) const; - - /// Set protocol. - void set_protocol (int); - - /// Get type. - int get_type (void) const; - - /// Set type. - void set_type (int); - - /// Get protocol info. - ACE_Protocol_Info *get_protocol_info( void ); - - /// Set protocol info. - void set_protocol_info( ACE_Protocol_Info *); - - /// Get socket group. - ACE_SOCK_GROUP get_sock_group( void ); - - /// Set socket group. - void set_sock_group( ACE_SOCK_GROUP ); - - /// Get socket flags. - u_long get_flags( void ); - - /// Set socket flags. - void set_flags( u_long ); - - /// Get reuse_addr flag. - int get_reuse_addr (void) const; - - /// Set reuse_addr flag. - void set_reuse_addr (int); - - /// Get device. - const char* get_device (void) const; - - /// Get info. - Param_Info* get_info (void) const; - - /// Set info. - void set_info (Param_Info *); - - /// Get r/w flag. - int get_rw_flag (void) const; - - /// Set r/w flag. - void set_rw_flag (int); - - /// Get user data. - Param_Udata* get_user_data (void) const; - - /// Set user data. - void set_user_data (Param_Udata*); - - /// Get open flag. - int get_oflag (void) const; - - /// Set open flag. - void set_oflag (int); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Protocol family for sockets connections. - int protocol_family_; - - /// Protocol for sockets connections. - int protocol_; - - /// Type for opening sockets. - int type_; - - /// Information about the protocol. - ACE_Protocol_Info *protocol_info_; - - /// Socket group used (for sockets only). - ACE_SOCK_GROUP group_; - - /// Flags for sockets (for sockets only). - u_long flags_; - - /// Flag for reusing address for opening sockets. - int reuse_addr_; - - /// Device name for XTI/ATM connections. - const char *device_; - - /// Info for XTI/ATM connections. - Param_Info *info_; - - /// R/W flag for XTI/ATM connections. - int rw_flag_; - - /// User data for XTI/ATM connections. - Param_Udata *udata_; - - /// Open flag for XTI/ATM connections. - int oflag_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/ATM_Params.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_ATM */ -#include "ace/post.h" -#endif /* ACE_ATM_PARAMS_H */ diff --git a/ace/ATM_Params.i b/ace/ATM_Params.i deleted file mode 100644 index 43bce9f0a42..00000000000 --- a/ace/ATM_Params.i +++ /dev/null @@ -1,224 +0,0 @@ -// $Id$ - -// ATM_Params.i - -ACE_INLINE -ACE_ATM_Params::ACE_ATM_Params (int rw_flag, - const char device[], - Param_Info *info, - Param_Udata *udata, - int oflag, - int protocol_family, - int protocol, - int type, - ACE_Protocol_Info *protocol_info, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr) - : protocol_family_(protocol_family), - protocol_(protocol), - type_(type), - protocol_info_(protocol_info), - group_(g), - flags_(flags), - reuse_addr_(reuse_addr), - device_(device), - info_(info), - rw_flag_(rw_flag), - udata_(udata), - oflag_(oflag) -{ - ACE_TRACE ("ACE_ATM_Params::ACE_ATM_Params"); -} - -// Default dtor. -ACE_INLINE -ACE_ATM_Params::~ACE_ATM_Params (void) -{ - ACE_TRACE ("ACE_ATM_Params::~ACE_ATM_Params"); -} - -ACE_INLINE -int -ACE_ATM_Params::get_protocol_family (void) const -{ - ACE_TRACE ("ACE_ATM_Params::get_protocol_family"); - return protocol_family_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_protocol_family (int family) -{ - ACE_TRACE ("ACE_ATM_Params::set_protocol_family"); - protocol_family_ = family; -} - -ACE_INLINE -int -ACE_ATM_Params::get_protocol (void) const -{ - ACE_TRACE ("ACE_ATM_Params::get_protocol"); - return protocol_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_protocol (int protocol) -{ - ACE_TRACE ("ACE_ATM_Params::set_protocol"); - protocol_ = protocol; -} - -ACE_INLINE -int -ACE_ATM_Params::get_type (void) const -{ - ACE_TRACE ("ACE_ATM_Params::get_type"); - return type_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_type (int type) -{ - ACE_TRACE ("ACE_ATM_Params::set_type"); - type_ = type; -} - -ACE_INLINE -ACE_Protocol_Info* -ACE_ATM_Params::get_protocol_info( void ) -{ - ACE_TRACE ("ACE_ATM_Params::get_protocol_info"); - return protocol_info_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_protocol_info( ACE_Protocol_Info *protocol_info ) -{ - ACE_TRACE ("ACE_ATM_Params::set_protocol_info"); - protocol_info_ = protocol_info; -} - -ACE_INLINE -ACE_SOCK_GROUP -ACE_ATM_Params::get_sock_group( void ) -{ - ACE_TRACE ("ACE_ATM_Params::get_sock_group"); - return group_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_sock_group( ACE_SOCK_GROUP g ) -{ - ACE_TRACE ("ACE_ATM_Params::set_sock_group"); - group_ = g; -} - -ACE_INLINE -u_long -ACE_ATM_Params::get_flags( void ) -{ - ACE_TRACE ("ACE_ATM_Params::get_flags"); - return flags_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_flags( u_long flags) -{ - ACE_TRACE ("ACE_ATM_Params::set_flags"); - flags_ = flags; -} - -ACE_INLINE -int -ACE_ATM_Params::get_reuse_addr (void) const -{ - ACE_TRACE ("ACE_ATM_Params::get_reuse_addr"); - return reuse_addr_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_reuse_addr (int reuse_addr) -{ - ACE_TRACE ("ACE_ATM_Params::set_reuse_addr"); - reuse_addr_ = reuse_addr; -} - -ACE_INLINE -const char* -ACE_ATM_Params::get_device (void) const -{ - ACE_TRACE ("ACE_ATM_Params::get_device"); - return device_; -} - -ACE_INLINE -Param_Info* -ACE_ATM_Params::get_info (void) const -{ - ACE_TRACE ("ACE_ATM_Params::get_info"); - return info_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_info (Param_Info* info) -{ - ACE_TRACE ("ACE_ATM_Params::set_info"); - info_ = info; -} - -ACE_INLINE -int -ACE_ATM_Params::get_rw_flag (void) const -{ - ACE_TRACE ("ACE_ATM_Params::get_rw_flag"); - return rw_flag_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_rw_flag (int rw_flag) -{ - ACE_TRACE ("ACE_ATM_Params::set_rw_flag"); - rw_flag_ = rw_flag; -} - -ACE_INLINE -Param_Udata* -ACE_ATM_Params::get_user_data (void) const -{ - ACE_TRACE ("ACE_ATM_Params::get_user_data"); - return udata_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_user_data (Param_Udata *udata) -{ - ACE_TRACE ("ACE_ATM_Params::set_user_data"); - udata_ = udata; -} - -ACE_INLINE -int -ACE_ATM_Params::get_oflag (void) const -{ - ACE_TRACE ("ACE_ATM_Params::get_oflag"); - return oflag_; -} - -ACE_INLINE -void -ACE_ATM_Params::set_oflag (int oflag) -{ - ACE_TRACE ("ACE_ATM_Params::set_oflag"); - oflag_ = oflag; -} - diff --git a/ace/ATM_QoS.cpp b/ace/ATM_QoS.cpp deleted file mode 100644 index ffdfe21413f..00000000000 --- a/ace/ATM_QoS.cpp +++ /dev/null @@ -1,633 +0,0 @@ -// $Id$ - -#include "ace/ATM_QoS.h" - -ACE_RCSID(ace, ATM_QoS, "$Id$") - -#if defined (ACE_HAS_ATM) - -#if !defined (__ACE_INLINE__) -#include "ace/ATM_QoS.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) -#define BHLI_MAGIC "FORE_ATM" -// This is line rate in cells/s for an OC-3 MM interface. -const long ACE_ATM_QoS::LINE_RATE = 353207; -const int ACE_ATM_QoS::OPT_FLAGS_CPID = 0x1; -const int ACE_ATM_QoS::OPT_FLAGS_PMP = 0x2; -const int ACE_ATM_QoS::DEFAULT_SELECTOR = 0x99; -const int ACE_ATM_QoS::DEFAULT_PKT_SIZE = 8192; -#elif defined (ACE_HAS_LINUX_ATM) -//pbrandao:for Linux: -//pbrandao:for now stick with current definitions -//pbrandao:see if later need to change -const long ACE_ATM_QoS::LINE_RATE = 353207; -const int ACE_ATM_QoS::OPT_FLAGS_CPID = 0x1; -const int ACE_ATM_QoS::OPT_FLAGS_PMP = 0x2; -const int ACE_ATM_QoS::DEFAULT_SELECTOR = 0x99; -const int ACE_ATM_QoS::DEFAULT_PKT_SIZE = 8192; -#else -const long ACE_ATM_QoS::LINE_RATE = 0L; -const int ACE_ATM_QoS::OPT_FLAGS_CPID = 0; -const int ACE_ATM_QoS::OPT_FLAGS_PMP = 0; -const int ACE_ATM_QoS::DEFAULT_SELECTOR = 0x0; -const int ACE_ATM_QoS::DEFAULT_PKT_SIZE = 0; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ - -ACE_ALLOC_HOOK_DEFINE(ACE_ATM_QoS) - -ACE_ATM_QoS::ACE_ATM_QoS (int pktSize) -{ - ACE_TRACE ("ACE_ATM_QoS::ACE_ATM_QoS"); -#if defined (ACE_HAS_LINUX_ATM) - ACE_OS::memset(&qos_, 0, sizeof(qos_)); - qos_.aal = ATM_PROTOCOL_DEFAULT; - qos_.rxtp.traffic_class = ATM_ANYCLASS; - qos_.rxtp.max_sdu = pktSize; - qos_.txtp.traffic_class = ATM_ANYCLASS; - qos_.txtp.max_sdu = pktSize; -#else - ACE_UNUSED_ARG (pktSize); -#endif /* ACE_HAS_LINUX_ATM */ -} - -ACE_ATM_QoS::ACE_ATM_QoS(int rate, - int pktSize) -{ - ACE_TRACE( "ACE_ATM_QoS::ACE_ATM_QoS" ); -#if defined (ACE_HAS_FORE_ATM_WS2) - AAL_PARAMETERS_IE ie_aalparams; - ATM_TRAFFIC_DESCRIPTOR_IE ie_td; - ATM_BROADBAND_BEARER_CAPABILITY_IE ie_bbc; - ATM_QOS_CLASS_IE ie_qos; - Q2931_IE *ie_ptr; - int size; - - // Setting up cbr parameters ... - ie_aalparams.AALType = AALTYPE_5; - ie_aalparams.AALSpecificParameters.AAL5Parameters.ForwardMaxCPCSSDUSize - = pktSize; // was 1516; - ie_aalparams.AALSpecificParameters.AAL5Parameters.BackwardMaxCPCSSDUSize - = pktSize; // was 1516; - ie_aalparams.AALSpecificParameters.AAL5Parameters.Mode = AAL5_MODE_MESSAGE; - ie_aalparams.AALSpecificParameters.AAL5Parameters.SSCSType = AAL5_SSCS_NULL; - - size = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(AAL_PARAMETERS_IE); - - ie_td.Forward.PeakCellRate_CLP0 = SAP_FIELD_ABSENT; - ie_td.Forward.PeakCellRate_CLP01 = rate; - ie_td.Forward.SustainableCellRate_CLP0 = SAP_FIELD_ABSENT; - ie_td.Forward.SustainableCellRate_CLP01 = SAP_FIELD_ABSENT; - ie_td.Forward.MaxBurstSize_CLP0 = SAP_FIELD_ABSENT; - ie_td.Forward.MaxBurstSize_CLP01 = SAP_FIELD_ABSENT; - ie_td.Forward.Tagging = SAP_FIELD_ABSENT; - - ie_td.Backward.PeakCellRate_CLP0 = SAP_FIELD_ABSENT; - ie_td.Backward.PeakCellRate_CLP01 = rate; - ie_td.Backward.SustainableCellRate_CLP0 = SAP_FIELD_ABSENT; - ie_td.Backward.SustainableCellRate_CLP01 = SAP_FIELD_ABSENT; - ie_td.Backward.MaxBurstSize_CLP0 = SAP_FIELD_ABSENT; - ie_td.Backward.MaxBurstSize_CLP01 = SAP_FIELD_ABSENT; - ie_td.Backward.Tagging = SAP_FIELD_ABSENT; - - ie_td.BestEffort = 0; // Note: this must be set to zero for CBR. - - size += sizeof( Q2931_IE_TYPE ) - + sizeof( ULONG ) - + sizeof( ATM_TRAFFIC_DESCRIPTOR_IE ); - - ie_bbc.BearerClass = BCOB_X; - ie_bbc.TrafficType = TT_CBR; - ie_bbc.TimingRequirements = TR_END_TO_END; - ie_bbc.ClippingSusceptability = CLIP_NOT; - ie_bbc.UserPlaneConnectionConfig = UP_P2P; - - size += sizeof( Q2931_IE_TYPE ) - + sizeof( ULONG ) - + sizeof( ATM_BROADBAND_BEARER_CAPABILITY_IE ); - - ie_qos.QOSClassForward = QOS_CLASS1; - ie_qos.QOSClassBackward = QOS_CLASS1; // This may not be really used - // since we do only simplex data xfer. - - size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_QOS_CLASS_IE); - - qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size); - if (qos_.ProviderSpecific.buf == 0) { - ACE_ERROR((LM_ERROR, - ACE_LIB_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), - size)); - return; - } - qos_.ProviderSpecific.len = size; - ACE_OS::memset(qos_.ProviderSpecific.buf, 0, size); - - ie_ptr = (Q2931_IE *) qos_.ProviderSpecific.buf; - ie_ptr->IEType = IE_AALParameters; - ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) - + sizeof( ULONG ) - + sizeof( AAL_PARAMETERS_IE ); - ACE_OS::memcpy(ie_ptr->IE, &ie_aalparams, sizeof(AAL_PARAMETERS_IE)); - - ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength); - ie_ptr->IEType = IE_TrafficDescriptor; - ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) - + sizeof( ULONG ) - + sizeof( ATM_TRAFFIC_DESCRIPTOR_IE ); - ACE_OS::memcpy(ie_ptr->IE, &ie_td, sizeof(ATM_TRAFFIC_DESCRIPTOR_IE)); - - ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength); - ie_ptr->IEType = IE_BroadbandBearerCapability; - ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) - + sizeof( ULONG ) - + sizeof( ATM_BROADBAND_BEARER_CAPABILITY_IE ); - ACE_OS::memcpy(ie_ptr->IE, - &ie_bbc, - sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE)); - - ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength); - ie_ptr->IEType = IE_QOSClass; - ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) - + sizeof( ULONG ) - + sizeof( ATM_QOS_CLASS_IE ); - ACE_OS::memcpy(ie_ptr->IE, &ie_qos, sizeof(ATM_QOS_CLASS_IE)); - - // qos_.SendingFlowspec.TokenRate = 0xffffffff; - // qos_.SendingFlowspec.TokenBucketSize = 0xffffffff; - // qos_.SendingFlowspec.PeakBandwidth = 0xffffffff; - // qos_.SendingFlowspec.Latency = 0xffffffff; - // qos_.SendingFlowspec.DelayVariation = 0xffffffff; - // qos_.SendingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT; - // This will most probably be ignored by the service provider. - // qos_.SendingFlowspec.MaxSduSize = 0xffffffff; - // qos_.SendingFlowspec.MinimumPolicedSize = 0xffffffff; - - // qos_.ReceivingFlowspec.TokenRate = 0xffffffff; - // qos_.ReceivingFlowspec.TokenBucketSize = 0xffffffff; - // qos_.ReceivingFlowspec.PeakBandwidth = 0xffffffff; - // qos_.ReceivingFlowspec.Latency = 0xffffffff; - // qos_.ReceivingFlowspec.DelayVariation = 0xffffffff; - // qos_.ReceivingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT; - // This will most probably be ignored by the service provider. - // qos_.ReceivingFlowspec.MaxSduSize = 0xffffffff; - // qos_.ReceivingFlowspec.MinimumPolicedSize = 0; - - ACE_Flow_Spec send_fspec( 0xffffffff, - 0xffffffff, - 0xffffffff, - 0xffffffff, - 0xffffffff, - SERVICETYPE_BESTEFFORT, - // This will most probably ignored by SP. - 0xffffffff, - 0xffffffff, - 15, - ACE_DEFAULT_THREAD_PRIORITY ), - recv_fspec( 0xffffffff, - 0xffffffff, - 0xffffffff, - 0xffffffff, - 0xffffffff, - SERVICETYPE_BESTEFFORT, - // This will most probably ignored by SP. - 0xffffffff, - 0, - 15, - ACE_DEFAULT_THREAD_PRIORITY ); - - qos_.sending_flowspec (send_fspec); - qos_.receiving_flowspec (recv_fspec); -#elif defined (ACE_HAS_FORE_ATM_XTI) - ACE_UNUSED_ARG (rate); - ACE_UNUSED_ARG (pktSize); -#elif defined (ACE_HAS_LINUX_ATM) - ACE_OS::memset(&qos_, - 0, - sizeof(qos_)); - qos_.aal = ATM_PROTOCOL_DEFAULT; - qos_.rxtp.max_sdu = pktSize; - - if (rate > 0) { - qos_.rxtp.pcr = rate; - qos_.rxtp.traffic_class = ATM_CBR; - qos_.txtp.traffic_class = ATM_CBR; - qos_.txtp.pcr = rate; - } - else { - qos_.rxtp.traffic_class = ATM_UBR; - qos_.txtp.traffic_class = ATM_UBR; - } - - qos_.txtp.max_sdu = pktSize; -#else - ACE_UNUSED_ARG (rate); -#endif /* ACE_HAS_FORE_ATM_WS2 || ACE_HAS_FORE_ATM_XTI || ACE_HAS_LINUX_ATM */ -} - -void -ACE_ATM_QoS::set_cbr_rate (int rate, - int pktSize) -{ - ACE_TRACE ("ACE_ATM_QoS::set_cbr_rate"); -#if defined (ACE_HAS_FORE_ATM_WS2) - /* - AAL_PARAMETERS_IE ie_aalparams; - ATM_TRAFFIC_DESCRIPTOR_IE ie_td; - ATM_BROADBAND_BEARER_CAPABILITY_IE ie_bbc; - ATM_QOS_CLASS_IE ie_qos; - Q2931_IE *ie_ptr; - int size; - */ - - ACE_OS::printf( "ATM_QoS(set_cbr_rate): set rate to %d c/s\n", rate ); - - // Setting up cbr parameters ... - /* - FORE has changed this - we no longer specify QoS this way - ie_aalparams.AALType = AALTYPE_5; - ie_aalparams.AALSpecificParameters.AAL5Parameters.ForwardMaxCPCSSDUSize - = pktSize; // was 1516; - ie_aalparams.AALSpecificParameters.AAL5Parameters.BackwardMaxCPCSSDUSize - = pktSize; // was 1516; - ie_aalparams.AALSpecificParameters.AAL5Parameters.Mode = AAL5_MODE_MESSAGE; - ie_aalparams.AALSpecificParameters.AAL5Parameters.SSCSType = AAL5_SSCS_NULL; - - size = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(AAL_PARAMETERS_IE); - - ie_td.Forward.PeakCellRate_CLP0 = SAP_FIELD_ABSENT; - ie_td.Forward.PeakCellRate_CLP01 = rate; - ie_td.Forward.SustainableCellRate_CLP0 = SAP_FIELD_ABSENT; - ie_td.Forward.SustainableCellRate_CLP01 = SAP_FIELD_ABSENT; - ie_td.Forward.MaxBurstSize_CLP0 = SAP_FIELD_ABSENT; - ie_td.Forward.MaxBurstSize_CLP01 = SAP_FIELD_ABSENT; - ie_td.Forward.Tagging = SAP_FIELD_ABSENT; - - ie_td.Backward.PeakCellRate_CLP0 = SAP_FIELD_ABSENT; - ie_td.Backward.PeakCellRate_CLP01 = rate; - ie_td.Backward.SustainableCellRate_CLP0 = SAP_FIELD_ABSENT; - ie_td.Backward.SustainableCellRate_CLP01 = SAP_FIELD_ABSENT; - ie_td.Backward.MaxBurstSize_CLP0 = SAP_FIELD_ABSENT; - ie_td.Backward.MaxBurstSize_CLP01 = SAP_FIELD_ABSENT; - ie_td.Backward.Tagging = SAP_FIELD_ABSENT; - - ie_td.BestEffort = 0; // Note: this must be set to zero for CBR. - - size += sizeof( Q2931_IE_TYPE ) + - sizeof( ULONG ) + - sizeof( ATM_TRAFFIC_DESCRIPTOR_IE ); - - ie_bbc.BearerClass = BCOB_X; - ie_bbc.TrafficType = TT_CBR; - ie_bbc.TimingRequirements = TR_END_TO_END; - ie_bbc.ClippingSusceptability = CLIP_NOT; - ie_bbc.UserPlaneConnectionConfig = UP_P2P; - - size += sizeof(Q2931_IE_TYPE) + - sizeof(ULONG) + - sizeof(ATM_BROADBAND_BEARER_CAPABILITY_IE); - - ie_qos.QOSClassForward = QOS_CLASS1; - ie_qos.QOSClassBackward = QOS_CLASS1; // This may not be really used - // since we only simplex data xfer. - - size += sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + sizeof(ATM_QOS_CLASS_IE); - - qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size); - if (qos_.ProviderSpecific.buf == 0) { - ACE_ERROR((LM_ERROR, - ACE_LIB_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), - size)); - return; - } - qos_.ProviderSpecific.len = size; - ACE_OS::memset(qos_.ProviderSpecific.buf, 0, size); - - ie_ptr = (Q2931_IE *) qos_.ProviderSpecific.buf; - ie_ptr->IEType = IE_AALParameters; - ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) + - sizeof( ULONG ) + - sizeof( AAL_PARAMETERS_IE ); - ACE_OS::memcpy(ie_ptr->IE, &ie_aalparams, sizeof(AAL_PARAMETERS_IE)); - - ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength); - ie_ptr->IEType = IE_TrafficDescriptor; - ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) + - sizeof( ULONG ) + - sizeof( ATM_TRAFFIC_DESCRIPTOR_IE ); - ACE_OS::memcpy(ie_ptr->IE, &ie_td, sizeof(ATM_TRAFFIC_DESCRIPTOR_IE)); - - ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength); - ie_ptr->IEType = IE_BroadbandBearerCapability; - ie_ptr->IELength = sizeof( Q2931_IE_TYPE ) + - sizeof( ULONG ) + - sizeof( ATM_BROADBAND_BEARER_CAPABILITY_IE ); - ACE_OS::memcpy( ie_ptr->IE, - &ie_bbc, - sizeof( ATM_BROADBAND_BEARER_CAPABILITY_IE )); - - ie_ptr = (Q2931_IE *) ((char *)ie_ptr + ie_ptr->IELength); - ie_ptr->IEType = IE_QOSClass; - ie_ptr->IELength = sizeof(Q2931_IE_TYPE) + sizeof(ULONG) + - sizeof(ATM_QOS_CLASS_IE); - ACE_OS::memcpy(ie_ptr->IE, &ie_qos, sizeof(ATM_QOS_CLASS_IE)); - */ - - const int BYTES_PER_ATM_CELL = 53; - ACE_OS::memset(&qos_, 0, sizeof(ATM_QoS)); - // Setting the token rate sets the minimum rate. 3 Mbits/sec seems too high. - // Certainly for Vaudeville audio, we only need about 1000 c/s which is - // 424000 bits/sec which is 53000 bytes/sec. - //qos_.SendingFlowspec.TokenRate = 3*(1024*128); // 3Mbits/sec - qos_.SendingFlowspec.TokenRate = 53000; // 1000 cells/sec - qos_.SendingFlowspec.TokenBucketSize = 32*1024; // our block size - //ourQos.SendingFlowspec.PeakBandwidth = ourQos.SendingFlowspec.TokenRate; - qos_.SendingFlowspec.ServiceType = SERVICETYPE_GUARANTEED; - // Peak bandwidth is in bytes/sec. The rate is specified in cells/sec so - // we need to convert from cells/sec to bytes/sec (i.e., multiply by 53). - qos_.SendingFlowspec.PeakBandwidth = rate * BYTES_PER_ATM_CELL; - qos_.SendingFlowspec.Latency = -1; // we don't care too much - qos_.SendingFlowspec.DelayVariation = -1; // we don't care too much - // no provider-specific data allowed on ATM - qos_.ProviderSpecific.buf=0; - qos_.ProviderSpecific.len=0; - // unidirectional P2MP; we don't need to setup the Receiving flowspec - - //qos_.SendingFlowspec.TokenRate = 0xffffffff; - //qos_.SendingFlowspec.TokenBucketSize = 0xffffffff; - //qos_.SendingFlowspec.PeakBandwidth = 0xffffffff; - //qos_.SendingFlowspec.Latency = 0xffffffff; - //qos_.SendingFlowspec.DelayVariation = 0xffffffff; - //qos_.SendingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT; - // This will most probably be ignored by the service provider. - //qos_.SendingFlowspec.MaxSduSize = 0xffffffff; - //qos_.SendingFlowspec.MinimumPolicedSize = 0xffffffff; - - //qos_.ReceivingFlowspec.TokenRate = 0xffffffff; - //qos_.ReceivingFlowspec.TokenBucketSize = 0xffffffff; - //qos_.ReceivingFlowspec.PeakBandwidth = 0xffffffff; - //qos_.ReceivingFlowspec.Latency = 0xffffffff; - //qos_.ReceivingFlowspec.DelayVariation = 0xffffffff; - //qos_.ReceivingFlowspec.ServiceType = SERVICETYPE_BESTEFFORT; - // This will most probably be ignored by the service provider. - //qos_.ReceivingFlowspec.MaxSduSize = 0xffffffff; - //qos_.ReceivingFlowspec.MinimumPolicedSize = 0; - - /* - ACE_Flow_Spec send_fspec( 0xffffffff, - 0xffffffff, - 0xffffffff, - 0xffffffff, - 0xffffffff, - SERVICETYPE_BESTEFFORT, - // This will most probably ignored by SP. - 0xffffffff, - 0xffffffff, - 15, - ACE_DEFAULT_THREAD_PRIORITY ), - recv_fspec( 0xffffffff, - 0xffffffff, - 0xffffffff, - 0xffffffff, - 0xffffffff, - SERVICETYPE_BESTEFFORT, - // This will most probably ignored by SP. - 0xffffffff, - 0, - 15, - ACE_DEFAULT_THREAD_PRIORITY ); - - qos_.sending_flowspec( send_fspec ); - qos_.receiving_flowspec( recv_fspec ); - */ -#elif defined (ACE_HAS_FORE_ATM_XTI) - ACE_UNUSED_ARG (rate); - ACE_UNUSED_ARG (pktSize); -#elif defined (ACE_HAS_LINUX_ATM) - ACE_UNUSED_ARG (pktSize); - - qos_.rxtp.traffic_class = ATM_CBR; - qos_.rxtp.pcr = rate; - qos_.txtp.traffic_class = ATM_CBR; - qos_.txtp.pcr = rate; -#else - ACE_UNUSED_ARG (rate); -#endif /* ACE_HAS_FORE_ATM_WS2 || ACE_HAS_FORE_ATM_XTI || ACE_HAS_LINUX_ATM */ -} - -void -ACE_ATM_QoS::dump (void) const -{ - ACE_TRACE ("ACE_ATM_QoS::dump"); -} - -void -ACE_ATM_QoS::set_rate (ACE_HANDLE fd, - int rate, - int flags) -{ - ACE_TRACE ("ACE_ATM_QoS::set_rate"); -#if defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) - set_cbr_rate( rate ); - - ACE_UNUSED_ARG( fd ); - ACE_UNUSED_ARG( flags ); -#elif defined (ACE_HAS_FORE_ATM_XTI) - long optlen = 0; - qos_.buf = construct_options(fd, - rate, - flags, - &optlen); - qos_.len = optlen; -#else - ACE_UNUSED_ARG (rate); -#endif /* ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM || ACE_HAS_FORE_ATM_XTI */ -} - -char* -ACE_ATM_QoS::construct_options (ACE_HANDLE fd, - int rate, - int flags, - long *len) -{ -#if defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) - ACE_UNUSED_ARG (fd); - ACE_UNUSED_ARG (rate); - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (len); - return (0); -#elif defined (ACE_HAS_FORE_ATM_XTI) - struct t_opthdr *popt; - char *buf; - int qos_cells; - struct t_info info; - - if (ACE_OS::t_getinfo (fd, &info) == -1) - { - ACE_OS::t_error ("t_getinfo"); - return 0; - } - - buf = (char *) ACE_OS::malloc (info.options); - - if (buf == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Unable to allocate %d bytes for options\n"), - info.options), - 0); - - popt = (struct t_opthdr *) buf; - - if (flags & OPT_FLAGS_CPID) - { - // This constructs the T_ATM_ORIG_ADDR option, which is used to - // signal the UNI 3.1 Calling Party ID Information Element. - t_atm_addr *source_addr; - - popt->len = sizeof (struct t_opthdr) + sizeof (t_atm_addr); - popt->level = T_ATM_SIGNALING; - popt->name = T_ATM_ORIG_ADDR; - popt->status = 0; - - source_addr = - (t_atm_addr *)((char *) popt + sizeof (struct t_opthdr)); - - source_addr->address_format = T_ATM_ENDSYS_ADDR; - source_addr->address_length = ATMNSAP_ADDR_LEN; - - ATMSAPAddress local_addr; - struct t_bind boundaddr; - - boundaddr.addr.maxlen = sizeof(local_addr); - boundaddr.addr.buf = (char *) &local_addr; - - //if (ACE_OS::t_getprotaddr(fd, &boundaddr, 0) < 0) { - if (ACE_OS::t_getname(fd, - &boundaddr.addr, - LOCALNAME) < 0) - { - ACE_OS::t_error("t_getname (local_address)"); - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Can't get local address!\n"))); - ACE_OS::free (buf); - return 0; - } - - ACE_OS::memcpy(source_addr->address, - local_addr.sap.t_atm_sap_addr.address, - ATMNSAP_ADDR_LEN); - - popt = T_OPT_NEXTHDR (buf, info.options , popt); - } - - // This constructs all options necessary (bearer cap., QoS, and - // Traffic Descriptor) to signal for a CBR connection with the - // specified QoS in kbit/sec., and/or specify a PMP connection. - - // For FORE 200e cards, the adapter shapes traffic to CBR with rate - // equal to PCR CLP=0+1 (traffic.forward.PCR_all_traffic) - - qos_cells = (rate * 1000) / (48*8); - - if ((qos_cells > 0 && qos_cells < LINE_RATE) - || (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP))) - { - struct t_atm_bearer *bearer; - struct t_atm_traffic *traffic; - - // T_ATM_BEARER_CAP: Broadband bearer capability - popt->len = sizeof (struct t_opthdr) + sizeof (struct t_atm_bearer); - popt->level = T_ATM_SIGNALING; - popt->name = T_ATM_BEARER_CAP; - popt->status = 0; - - bearer = (struct t_atm_bearer *)((char *) popt + - sizeof (struct t_opthdr)); - bearer->bearer_class = T_ATM_CLASS_X; - - if (qos_cells) - { - bearer->traffic_type = T_ATM_CBR; - bearer->timing_requirements = T_ATM_END_TO_END; - } - else - { - bearer->traffic_type = 0; // UBR - bearer->timing_requirements = 0; - } - bearer->clipping_susceptibility = T_ATM_NULL; - - if (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP)) - bearer->connection_configuration = T_ATM_1_TO_MANY; - else - bearer->connection_configuration = T_ATM_1_TO_1; - - popt = T_OPT_NEXTHDR (buf, info.options, popt); - - // T_ATM_TRAFFIC: traffic descriptor - popt->len = sizeof (struct t_opthdr) + sizeof (struct t_atm_traffic); - popt->level = T_ATM_SIGNALING; - popt->name = T_ATM_TRAFFIC; - popt->status = 0; - - traffic = (struct t_atm_traffic *)((char *) popt + - sizeof (struct t_opthdr)); - - traffic->forward.PCR_high_priority = T_ATM_ABSENT; - traffic->forward.PCR_all_traffic = qos_cells ? qos_cells : LINE_RATE; - traffic->forward.SCR_high_priority = T_ATM_ABSENT; - traffic->forward.SCR_all_traffic = T_ATM_ABSENT; - traffic->forward.MBS_high_priority = T_ATM_ABSENT; - traffic->forward.MBS_all_traffic = T_ATM_ABSENT; - traffic->forward.tagging = T_NO; - - traffic->backward.PCR_high_priority = T_ATM_ABSENT; - traffic->backward.PCR_all_traffic = - (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP)) - ? 0 : qos_cells ? qos_cells : LINE_RATE; - traffic->backward.SCR_high_priority = T_ATM_ABSENT; - traffic->backward.SCR_all_traffic = T_ATM_ABSENT; - traffic->backward.MBS_high_priority = T_ATM_ABSENT; - traffic->backward.MBS_all_traffic = T_ATM_ABSENT; - traffic->backward.tagging = T_NO; - - traffic->best_effort = qos_cells ? T_NO : T_YES; - - popt = T_OPT_NEXTHDR (buf, - info.options, - popt); - } - - if (qos_cells > 0 && qos_cells < LINE_RATE) - { - struct t_atm_qos *qos; - - // T_ATM_QOS: Quality of Service - popt->len = sizeof (struct t_opthdr) + sizeof (struct t_atm_qos); - popt->level = T_ATM_SIGNALING; - popt->name = T_ATM_QOS; - popt->status = 0; - - qos = (struct t_atm_qos *)((char *) popt + sizeof (struct t_opthdr)); - qos->coding_standard = T_ATM_ITU_CODING; - qos->forward.qos_class = T_ATM_QOS_CLASS_1; - qos->backward.qos_class = T_ATM_QOS_CLASS_1; - - popt = T_OPT_NEXTHDR (buf, info.options, popt); - } - - // Return actual size of options and option buffer to user. - *len = (char *) popt - buf; - - return buf; -#else - ACE_UNUSED_ARG (fd); - ACE_UNUSED_ARG (rate); - ACE_UNUSED_ARG (flag); - ACE_UNUSED_ARG (len); - return (0); -#endif /* ACE_HAS_FORE_ATM_WS2 */ -} - -#endif /* ACE_HAS_ATM */ - diff --git a/ace/ATM_QoS.h b/ace/ATM_QoS.h deleted file mode 100644 index 02ad18676da..00000000000 --- a/ace/ATM_QoS.h +++ /dev/null @@ -1,103 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file ATM_QoS.h - * - * $Id$ - * - * @author Joe Hoffert - */ -//========================================================================== - - -#ifndef ACE_ATM_QoS_H -#define ACE_ATM_QoS_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined(ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_ATM) - -#if defined (ACE_HAS_FORE_ATM_WS2) -// just map to WS2 GQOS struct -typedef ACE_QoS ATM_QoS; -#elif defined (ACE_HAS_FORE_ATM_XTI) -typedef struct netbuf ATM_QoS; -#elif defined (ACE_HAS_LINUX_ATM) -#include /**/ "atm.h" -#include "ATM_Params.h" -typedef struct atm_qos ATM_QoS; -#else -typedef int ATM_QoS; -#endif /* ACE_HAS_FORE_ATM_WS2 || ACE_HAS_FORE_ATM_XTI || ACE_HAS_LINUX_ATM */ - -/** - * @class ACE_ATM_QoS - * - * @brief Define the QoS parameters for ATM - * - * This class wraps up QoS parameters for both ATM/XTI and - * ATM/WinSock2 to make the mechanism for the ATM protocol - * transparent. - */ -class ACE_Export ACE_ATM_QoS -{ -public: - // Constants used for ATM options - static const long LINE_RATE; - static const int OPT_FLAGS_CPID; - static const int OPT_FLAGS_PMP; - static const int DEFAULT_SELECTOR; - static const int DEFAULT_PKT_SIZE; - - // = Initializattion and termination methods. - /// Default constructor. - ACE_ATM_QoS(int = DEFAULT_PKT_SIZE); - - /// Constructor with a CBR rate. - ACE_ATM_QoS(int, - int = DEFAULT_PKT_SIZE); - - ~ACE_ATM_QoS (); - - /// Set the rate. - void set_rate (ACE_HANDLE, - int, - int); - - /// Set CBR rate in cells per second. - void set_cbr_rate (int, - int = DEFAULT_PKT_SIZE); - - /// Get ATM_QoS struct. - ATM_QoS get_qos (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Construct QoS options. - char* construct_options(ACE_HANDLE, - int, - int, - long*); - -private: - ATM_QoS qos_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/ATM_QoS.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_ATM */ -#include "ace/post.h" -#endif /* ACE_ATM_QoS_H */ diff --git a/ace/ATM_QoS.i b/ace/ATM_QoS.i deleted file mode 100644 index 349fb962027..00000000000 --- a/ace/ATM_QoS.i +++ /dev/null @@ -1,17 +0,0 @@ -// $Id$ - -// ATM_QoS.i - -ACE_INLINE -ACE_ATM_QoS::~ACE_ATM_QoS () -{ - ACE_TRACE ("ACE_ATM_QoS::~ACE_ATM_QoS"); -} - -ACE_INLINE -ATM_QoS -ACE_ATM_QoS::get_qos (void) -{ - ACE_TRACE ("ACE_ATM_QoS::get_qos"); - return qos_; -} diff --git a/ace/ATM_Stream.cpp b/ace/ATM_Stream.cpp deleted file mode 100644 index 0bd8c537eac..00000000000 --- a/ace/ATM_Stream.cpp +++ /dev/null @@ -1,292 +0,0 @@ -// $Id$ - -#include "ace/ATM_Stream.h" - -ACE_RCSID (ace, ATM_Stream, "$Id$") - -#if defined (ACE_HAS_ATM) - -#if !defined (__ACE_INLINE__) -#include "ace/ATM_Stream.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE (ACE_ATM_Stream) - -void -ACE_ATM_Stream::dump (void) const -{ - ACE_TRACE ("ACE_ATM_Stream::dump"); -} - -char* -ACE_ATM_Stream::get_peer_name (void) const -{ - ACE_TRACE ("ACE_ATM_Stream::get_peer_name"); -#if defined (ACE_HAS_FORE_ATM_XTI) - // // Use t_getprotaddr for XTI/ATM - // struct t_bind *localaddr - // = (struct t_bind *) ACE_OS::t_alloc (get_handle (), - // T_BIND, - // T_ADDR); - // struct t_bind *peeraddr - // = (struct t_bind *) ACE_OS::t_alloc (get_handle (), - // T_BIND, - // T_ADDR); - // ::t_getprotaddr (get_handle (), - // localaddr, - // peeraddr); - - // char* connected_name = (char*) ACE_OS::malloc (peeraddr->addr.len + 1); - // ACE_OS::strcpy (connected_name, - // peeraddr->addr.buf); - // ACE_OS::t_free ((char *) localaddr, - // T_BIND); - // ACE_OS::t_free ((char *) peeraddr, - // T_BIND); - // return (connected_name); - -#error "This doesn't seem to work. May need to jimmy-rig something with the" -#error "/etc/xti_hosts file - Ugh!" - - ACE_ATM_Addr sa; - struct netbuf name; - name.maxlen = sa.get_size (); - name.buf = (char *) sa.get_addr (); - ACE_OS::t_getname (this->get_handle (), &name, REMOTENAME); - // ACE_OS::ioctl (this->get_handle (), - // TI_GETPEERNAME, - // &name); - return (name.buf); - -#elif defined (ACE_HAS_FORE_ATM_WS2) - // Use getpeername for WinSock2. - struct sockaddr_atm name; - ACE_OS::memset (&name, 0, sizeof (name)); - int nameSize = sizeof (name); - - if (ACE_OS::getpeername (this->get_handle (), - (struct sockaddr *) &name, - &nameSize) != 0) { - return 0; - } - - char buffer[256]; - for (unsigned int index = 0; index < ATM_ADDR_SIZE - 1; index++) { - buffer[ index * 3 ] = '\0'; - sprintf (buffer, "%s%02x.", buffer, name.satm_number.Addr[ index ]); - } - buffer[ (ATM_ADDR_SIZE - 1) * 3 ] = '\0'; - sprintf (buffer, "%s%02x.", buffer, 0); - buffer[ ATM_ADDR_SIZE * 3 - 1 ] = '\0'; - for (index = 0; index < ACE_OS::strlen (buffer); ++index) - buffer[index] = tolower (buffer[index]); - - ifstream atm_hosts ("C:/WINNT/atmhosts"); - assert (atm_hosts.is_open ()); - - // Find the host address in the ATM hosts file and return the - // host name - char line[256]; - char *host_ptr, *host_name = 0; - ACE_NEW_RETURN (host_name, char[256], 0); - while (!atm_hosts.eof ()) { - atm_hosts.getline (line, 256); - // Convert the line to lower case to ease comparison - for (index = 0; index < ACE_OS::strlen (line); ++index) - line[index] = tolower (line[index]); - if (ACE_OS::strstr (line, buffer) != 0) - { - char *strtok_p; - // Grab the second token which is the host name - ACE_OS::strtok_r (line, " \t", &strtok_p); - host_ptr = strtok (0, " \t", &strtok_p); - ACE_OS::strcpy (host_name, host_ptr); - break; - } - } - - return host_name; -#elif defined (ACE_HAS_LINUX_ATM) - ATM_Addr name; - int nameSize = sizeof (name.sockaddratmsvc); - - if (ACE_OS::getpeername (this->get_handle (), - (struct sockaddr *) & (name.sockaddratmsvc), - &nameSize) < 0) { - ACE_OS::perror ("ACE_ATM_Stream (get_peer_name) : "); - return 0; - } - - static ACE_TCHAR buffer[MAX_ATM_ADDR_LEN + 1]; - int total_len; - if ((total_len = atm2text (buffer,sizeof buffer, - (struct sockaddr *) & (name.sockaddratmsvc), - A2T_PRETTY|A2T_NAME)) < 0) { - ACE_DEBUG ((LM_DEBUG,ACE_LIB_TEXT ("ACE_ATM_Stream (get_peer_name) :%d"),errno)); - return 0; - } - - return (char*) buffer; -#else - return 0; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ -} - -ACE_HANDLE -ACE_ATM_Stream::get_handle (void) const -{ - ACE_TRACE ("ACE_ATM_Stream::get_handle"); -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) - return stream_.get_handle (); -#else - return 0; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ -} - -int -ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, - ACE_UINT16 &vci) const -{ - ACE_TRACE ("ACE_ATM_Stream::get_vpi_vci"); -#if defined (ACE_HAS_FORE_ATM_XTI) - struct t_atm_conn_prop conn_prop; - char* connect_opts = (char *) &conn_prop; - int opt_size = sizeof (t_atm_conn_prop); - struct t_info info; - struct t_optmgmt opt_req, opt_ret; - - if (ACE_OS::t_getinfo (stream_.get_handle (), - &info) < 0) - { - ACE_OS::t_error ("t_getinfo"); - return -1; - } - - char *buf_req = (char *) ACE_OS::malloc (info.options); - if (buf_req == 0) - { - ACE_OS::fprintf (stderr, - "Unable to allocate %ld bytes for options\n", - info.options); - return -1; - } - - char *buf_ret = (char *) ACE_OS::malloc (info.options); - if (buf_ret == 0) - { - ACE_OS::fprintf (stderr, - "Unable to allocate %ld bytes for options\n", - info.options); - return -1; - } - - ACE_OS::memset (&opt_req, 0, sizeof (opt_req)); - ACE_OS::memset (&opt_ret, 0, sizeof (opt_ret)); - - struct t_opthdr *popt = (struct t_opthdr *) buf_req; - struct t_opthdr *popt_ret = (struct t_opthdr *) buf_ret; - - popt->len= sizeof (struct t_opthdr) + opt_size; - - // We are only concerned with SVCs so no other check or values are needed - // here. - popt->level = T_ATM_SIGNALING; - popt->name = T_ATM_CONN_PROP; - popt->status = 0; - - opt_req.opt.len = popt->len; - opt_req.opt.buf = (char *) popt; - opt_req.flags = T_CURRENT; - - popt = T_OPT_NEXTHDR (buf_req, - info.options, - popt); - opt_ret.opt.maxlen = info.options; - opt_ret.opt.buf = (char *) popt_ret; - - if (ACE_OS::t_optmgmt (stream_.get_handle (), - &opt_req, - &opt_ret) < 0) { - ACE_OS::t_error ("t_optmgmt"); - return -1; - } - - ACE_OS::memcpy (connect_opts, - (char *) popt_ret + sizeof (struct t_opthdr), - opt_size); - - ACE_OS::free (buf_ret); - ACE_OS::free (buf_req); - - vpi = conn_prop.vpi; - vci = conn_prop.vci; - return (0); -#elif defined (ACE_HAS_FORE_ATM_WS2) - ATM_CONNECTION_ID connID; - DWORD bytes = 0; - - if (::WSAIoctl ((int) this -> get_handle (), - SIO_GET_ATM_CONNECTION_ID, - 0, - 0, - (LPVOID) &connID, - sizeof (ATM_CONNECTION_ID), - &bytes, - 0, - 0) - == SOCKET_ERROR) { - ACE_OS::printf ("Error: WSAIoctl %d\n", WSAGetLastError ()); - } - - vpi = (ACE_UINT16) connID.VPI; - vci = (ACE_UINT16) connID.VCI; - - return 0; -#elif defined (ACE_HAS_LINUX_ATM) -#if defined (SO_ATMPVC) /* atm version>=0.62 */ - struct sockaddr_atmpvc mypvcaddr; - int addrpvclen = sizeof (mypvcaddr); - if (ACE_OS::getsockopt (stream_.get_handle (), - SOL_ATM, - SO_ATMPVC, - ACE_reinterpret_cast (char*,&mypvcaddr), - &addrpvclen) < 0) { - ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), - errno); - return -1; - } - vpi = (ACE_UINT16) mypvcaddr.sap_addr.vpi; - vci = (ACE_UINT16) mypvcaddr.sap_addr.vci; - - return 0; -#elif defined (SO_VCID) /* patch for atm version 0.59 */ - struct atm_vcid mypvcid; - int pvcidlen = sizeof (mypvcid); - if (ACE_OS::getsockopt (stream_.get_handle (), - SOL_ATM,SO_VCID, - ACE_reinterpret_cast (char*,&mypvcid), - &pvcidlen) < 0) { - ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), - errno); - return -1; - } - vpi = (ACE_UINT16) mypvcid.vpi; - vci = (ACE_UINT16) mypvcid.vci; - - return 0; -#else - ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: Not implemented in this ATM version. Update to >= 0.62\n Or patch 0.59")); - ACE_UNUSED_ARG (vci); - ACE_UNUSED_ARG (vpi); - - return (-1); -#endif /* SO_ATMPVC || SO_VCID */ -#else - return (-1); -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ -} - -#endif /* ACE_HAS_ATM */ diff --git a/ace/ATM_Stream.h b/ace/ATM_Stream.h deleted file mode 100644 index 4024cfb917b..00000000000 --- a/ace/ATM_Stream.h +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file ATM_Stream.h - * - * $Id$ - * - * @author Joe Hoffert - */ -//============================================================================= - - -#ifndef ACE_ATM_STREAM_H -#define ACE_ATM_STREAM_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_ATM) - -#include "ace/ATM_Addr.h" -#include "ace/ATM_Params.h" - -#if defined (ACE_WIN32) -#include "SOCK_Stream.h" -typedef ACE_SOCK_Stream ATM_Stream; -#else -#include "TLI_Stream.h" -typedef ACE_TLI_Stream ATM_Stream; -#endif - -/** - * @class ACE_ATM_Stream - * - * @brief Defines the member functions for ACE_ATM_Stream abstraction. - */ -class ACE_Export ACE_ATM_Stream -{ -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_ATM_Stream (void); - - // = ATM-specific open and shutdown operations. - /// open the stream. - int open (ACE_ATM_Params params = ACE_ATM_Params()); - - /// Close down and release resources. - int close (void); - - /// Get the underlying handle. - ACE_HANDLE get_handle (void) const; - - /// Get the underlying stream. - ATM_Stream& get_stream (void); - - /// Get the name of the connected host. - char* get_peer_name (void) const; - - /// Get the VPI and VCI of the stream. - int get_vpi_vci (ACE_UINT16 &vpi, - ACE_UINT16 &vci) const; - - /// Recv an n byte buffer from the connected transport mechanism. - ssize_t recv (void *buf, - size_t n, - int *flags = 0) const; - - /// Send exactly n bytes to the connected transport mechanism. - ssize_t send_n (const void *buf, - size_t n, - int flags) const; - - // = Meta-type info - typedef ACE_ATM_Addr PEER_ADDR; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Typedef'd to the appropriate stream mechanism above. - ATM_Stream stream_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/ATM_Stream.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_ATM */ -#include "ace/post.h" -#endif /* ACE_ATM_STREAM_H */ diff --git a/ace/ATM_Stream.i b/ace/ATM_Stream.i deleted file mode 100644 index 904934e75a5..00000000000 --- a/ace/ATM_Stream.i +++ /dev/null @@ -1,124 +0,0 @@ -// $Id$ - -// ATM_Stream.i - -#include "ace/ATM_Stream.h" - -ACE_INLINE -ACE_ATM_Stream::ACE_ATM_Stream (void) -{ - ACE_TRACE ("ACE_ATM_Stream::ACE_ATM_Stream"); -} - -ACE_INLINE -int -ACE_ATM_Stream::open (ACE_ATM_Params params) -{ - ACE_TRACE ("ACE_ATM_Stream::open"); -#if defined (ACE_HAS_FORE_ATM_XTI) - ACE_HANDLE handle = stream_.open (params.get_device(), - params.get_oflag(), - params.get_info()); - return (handle == ACE_INVALID_HANDLE ? -1 : 0); -#elif defined (ACE_HAS_FORE_ATM_WS2) - params.set_flags( ACE_FLAG_MULTIPOINT_C_ROOT | ACE_FLAG_MULTIPOINT_D_ROOT ); - - int retval = stream_.open (params.get_type(), - params.get_protocol_family(), - params.get_protocol(), - params.get_protocol_info(), - params.get_sock_group(), - params.get_flags(), - params.get_reuse_addr()); - if (retval == -1) - return -1; - - struct sockaddr_atm sock_addr; - - ACE_OS::memset(&sock_addr, 0, sizeof(struct sockaddr_atm)); - sock_addr.satm_family = AF_ATM; - sock_addr.satm_number.AddressType=ADDR_ANY; - sock_addr.satm_number.NumofDigits = ATM_ADDR_SIZE; - sock_addr.satm_blli.Layer2Protocol = SAP_FIELD_ABSENT; - sock_addr.satm_blli.Layer3Protocol = SAP_FIELD_ABSENT; - sock_addr.satm_bhli.HighLayerInfoType = SAP_FIELD_ABSENT; - if (ACE_OS::bind(get_handle(), - (struct sockaddr FAR *)&sock_addr, - sizeof(struct sockaddr_atm)) < 0) - { - ACE_OS::printf("Error binding local address: %d",WSAGetLastError()); - return -1; - } - - return 0; -#else - ACE_UNUSED_ARG(params); - return 0; -#endif /* ACE_HAS_FORE_ATM_XTI */ -} - -ACE_INLINE -int -ACE_ATM_Stream::close (void) -{ - ACE_TRACE ("ACE_ATM_Stream::close"); -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) - return stream_.close (); -#else - return 0; -#endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 */ -} - -ACE_INLINE -ATM_Stream& -ACE_ATM_Stream::get_stream (void) -{ - ACE_TRACE ("ACE_ATM_Stream::get_stream"); - return stream_; -} - -ACE_INLINE -ssize_t -ACE_ATM_Stream::recv (void *buf, - size_t n, - int *flags) const -{ - ACE_TRACE ("ACE_ATM_Stream::recv"); -#if defined (ACE_HAS_FORE_ATM_XTI) - return stream_.recv (buf, - n, - flags); -#elif defined (ACE_HAS_FORE_ATM_WS2) - return stream_.recv (buf, - n); -#else - ACE_UNUSED_ARG(buf); - ACE_UNUSED_ARG(n); - ACE_UNUSED_ARG(flags); - return (0); -#endif /* ACE_HAS_FORE_ATM_XTI */ -} - -ACE_INLINE -ssize_t -ACE_ATM_Stream::send_n (const void *buf, - size_t n, - int flags) const -{ - ACE_TRACE ("ACE_ATM_Stream::send_n"); -#if defined (ACE_HAS_FORE_ATM_XTI) - return stream_.send_n (buf, - n, - flags); -#elif defined (ACE_HAS_FORE_ATM_WS2) - return stream_.send_n (buf, - n, - flags); -#else - ACE_UNUSED_ARG(buf); - ACE_UNUSED_ARG(n); - ACE_UNUSED_ARG(flags); - return (0); -#endif /* ACE_HAS_FORE_ATM_XTI */ -} - diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp deleted file mode 100644 index be79daa6857..00000000000 --- a/ace/Acceptor.cpp +++ /dev/null @@ -1,1213 +0,0 @@ -#ifndef ACE_ACCEPTOR_CPP -#define ACE_ACCEPTOR_CPP - -#include "ace/ACE.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Acceptor.h" -#include "ace/Handle_Set.h" -#include "ace/Svc_Handler.h" -#include "ace/WFMO_Reactor.h" - - -ACE_RCSID (ace, - Acceptor, - "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Acceptor) - -template void -ACE_Acceptor::dump (void) const -{ - ACE_TRACE ("ACE_Acceptor::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->peer_acceptor_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template -ACE_Acceptor::operator ACE_PEER_ACCEPTOR & () const -{ - ACE_TRACE ("ACE_Acceptor::operator ACE_PEER_ACCEPTOR &"); - return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_; -} - -template ACE_PEER_ACCEPTOR & -ACE_Acceptor::acceptor (void) const -{ - ACE_TRACE ("ACE_Acceptor::acceptor"); - return ACE_const_cast (ACE_PEER_ACCEPTOR &, this->peer_acceptor_); -} - -// Returns ACE_HANDLE of the underlying Acceptor_Strategy. - -template ACE_HANDLE -ACE_Acceptor::get_handle (void) const -{ - ACE_TRACE ("ACE_Acceptor::get_handle"); - return this->peer_acceptor_.get_handle (); -} - -// Initialize the appropriate strategies for creation, passive -// connection acceptance, and concurrency, and then register -// with the Reactor and listen for connection requests at the -// designated . - -template int -ACE_Acceptor::open - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - ACE_Reactor *reactor, - int flags, - int use_select, - int reuse_addr) -{ - ACE_TRACE ("ACE_Acceptor::open"); - this->flags_ = flags; - this->use_select_ = use_select; - this->reuse_addr_ = reuse_addr; - this->peer_acceptor_addr_ = local_addr; - - // Must supply a valid Reactor to Acceptor::open()... - - if (reactor == 0) - { - errno = EINVAL; - return -1; - } - - if (this->peer_acceptor_.open (local_addr, reuse_addr) == -1) - return -1; - - // Set the peer acceptor's handle into non-blocking mode. This is a - // safe-guard against the race condition that can otherwise occur - // between the time when indicates that a passive-mode - // socket handle is "ready" and when we call . During this - // interval, the client can shutdown the connection, in which case, - // the call can hang! - if (this->accept_strategy_->acceptor ().enable (ACE_NONBLOCK) != 0) - return -1; - - // Initialize the concurrency strategy. - - if (con_s == 0) - { - ACE_NEW_RETURN (con_s, - CONCURRENCY_STRATEGY, - -1); - this->delete_concurrency_strategy_ = 1; - } - this->concurrency_strategy_ = con_s; - - // Initialize the scheduling strategy. - - if (sch_s == 0) - { - ACE_NEW_RETURN (sch_s, - SCHEDULING_STRATEGY, - -1); - this->delete_scheduling_strategy_ = 1; - } - this->scheduling_strategy_ = sch_s; - - this->use_select_ = use_select; - - return this->reactor ()->register_handler - (this, - ACE_Event_Handler::ACCEPT_MASK); -} - -// Simple constructor. - -template -ACE_Strategy_Acceptor::ACE_Strategy_Acceptor - (const ACE_TCHAR service_name[], - const ACE_TCHAR service_description[], - int use_select, - int reuse_addr) - : creation_strategy_ (0), - delete_creation_strategy_ (0), - accept_strategy_ (0), - delete_accept_strategy_ (0), - concurrency_strategy_ (0), - delete_concurrency_strategy_ (0), - scheduling_strategy_ (0), - delete_scheduling_strategy_ (0), - service_name_ (0), - service_description_ (0) -{ - ACE_TRACE ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor"); - - if (service_name != 0) - ACE_ALLOCATOR (this->service_name_, - ACE_OS::strdup (service_name)); - if (service_description != 0) - ACE_ALLOCATOR (this->service_description_, - ACE_OS::strdup (service_description)); - this->use_select_ = use_select; - this->reuse_addr_ = reuse_addr; -} - -template -ACE_Strategy_Acceptor::ACE_Strategy_Acceptor - (const ACE_PEER_ACCEPTOR_ADDR &addr, - ACE_Reactor *reactor, - ACE_Creation_Strategy *cre_s, - ACE_Accept_Strategy *acc_s, - ACE_Concurrency_Strategy *con_s, - ACE_Scheduling_Strategy *sch_s, - const ACE_TCHAR service_name[], - const ACE_TCHAR service_description[], - int use_select, - int reuse_addr) - : creation_strategy_ (0), - delete_creation_strategy_ (0), - accept_strategy_ (0), - delete_accept_strategy_ (0), - concurrency_strategy_ (0), - delete_concurrency_strategy_ (0), - scheduling_strategy_ (0), - delete_scheduling_strategy_ (0), - service_name_ (0), - service_description_ (0) -{ - ACE_TRACE ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor"); - - if (this->open (addr, - reactor, - cre_s, - acc_s, - con_s, - sch_s, - service_name, - service_description, - use_select, - reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor"))); -} - -// Perform termination activities when is removed from the -// . - -template int -ACE_Strategy_Acceptor::handle_close (ACE_HANDLE, - ACE_Reactor_Mask) -{ - ACE_TRACE ("ACE_Strategy_Acceptor::handle_close"); - // Guard against multiple closes. - if (this->reactor () != 0) - { - ACE_HANDLE handle = this->get_handle (); - - if (this->delete_creation_strategy_) - delete this->creation_strategy_; - this->delete_creation_strategy_ = 0; - this->creation_strategy_ = 0; - - if (this->delete_accept_strategy_) - delete this->accept_strategy_; - this->delete_accept_strategy_ = 0; - this->accept_strategy_ = 0; - - if (this->delete_concurrency_strategy_) - delete this->concurrency_strategy_; - this->delete_concurrency_strategy_ = 0; - this->concurrency_strategy_ = 0; - - if (this->delete_scheduling_strategy_) - delete this->scheduling_strategy_; - this->delete_scheduling_strategy_ = 0; - this->scheduling_strategy_ = 0; - - // We must use the obtained *before* we deleted the - // accept_strategy_... - - this->reactor ()->remove_handler - (handle, - ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL); - - // Set the Reactor to 0 so that we don't try to close down - // again. - this->reactor (0); - } - return 0; -} - -// Bridge method for creating a . The strategy for -// creating a are configured into the Acceptor via it's -// . The default is to create a new -// . However, subclasses can override this strategy to -// perform creation in any way that they like (such as -// creating subclass instances of , using a singleton, -// dynamically linking the handler, etc.). - -template int -ACE_Strategy_Acceptor::make_svc_handler (SVC_HANDLER *&sh) -{ - ACE_TRACE ("ACE_Strategy_Acceptor::make_svc_handler"); - return this->creation_strategy_->make_svc_handler (sh); -} - -// Bridge method for accepting the new connection into the -// . The default behavior delegates to the -// in the Acceptor_Strategy. - -template int -ACE_Strategy_Acceptor::accept_svc_handler - (SVC_HANDLER *svc_handler) -{ - ACE_TRACE ("ACE_Strategy_Acceptor::accept_svc_handler"); - return this->accept_strategy_->accept_svc_handler (svc_handler); -} - -// Bridge method for activating a with the appropriate -// concurrency strategy. The default behavior of this method is to -// activate the SVC_HANDLER by calling its open() method (which allows -// the SVC_HANDLER to define its own concurrency strategy). However, -// subclasses can override this strategy to do more sophisticated -// concurrency activations (such as creating the SVC_HANDLER as an -// "active object" via multi-threading or multi-processing). - -template int -ACE_Strategy_Acceptor::activate_svc_handler - (SVC_HANDLER *svc_handler) -{ - ACE_TRACE ("ACE_Strategy_Acceptor::activate_svc_handler"); - return this->concurrency_strategy_->activate_svc_handler - (svc_handler, - (void *) this); -} - -template -ACE_Strategy_Acceptor::~ACE_Strategy_Acceptor (void) -{ - ACE_TRACE ("ACE_Strategy_Acceptor::~ACE_Strategy_Acceptor"); - ACE_OS::free ((void *) this->service_name_); - ACE_OS::free ((void *) this->service_description_); - this->handle_close (); -} - -// Signal the server to shutdown gracefully. - -template int -ACE_Strategy_Acceptor::handle_signal (int, siginfo_t *, ucontext_t *) -{ - ACE_Reactor::end_event_loop (); - return 0; -} - -template int -ACE_Strategy_Acceptor::info (ACE_TCHAR **strp, - size_t length) const -{ - ACE_TRACE ("ACE_Strategy_Acceptor::info"); - - ACE_TCHAR buf[BUFSIZ]; - ACE_TCHAR service_addr_str[BUFSIZ]; - ACE_PEER_ACCEPTOR_ADDR addr; - - if (this->acceptor ().get_local_addr (addr) == -1) - return -1; - else if (addr.addr_to_string (service_addr_str, - sizeof service_addr_str) == -1) - return -1; - - // @@ Should add the protocol in... - ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t %s #%s\n"), - this->service_name_ == 0 - ? ACE_LIB_TEXT ("") - : this->service_name_, - service_addr_str, - this->service_description_ == 0 - ? ACE_LIB_TEXT ("") - : this->service_description_); - - if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) - return -1; - else - ACE_OS::strsncpy (*strp, buf, length); - return ACE_static_cast (int, ACE_OS::strlen (buf)); -} - -template int -ACE_Strategy_Acceptor::fini (void) -{ - ACE_TRACE ("ACE_Strategy_Acceptor::fini"); - return this->ACE_Strategy_Acceptor::handle_close (); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Oneshot_Acceptor) - -template void -ACE_Oneshot_Acceptor::dump (void) const -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nrestart_ = %d"), this->restart_)); - this->peer_acceptor_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_concurrency_strategy_ = %d"), - delete_concurrency_strategy_)); - this->concurrency_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template int -ACE_Oneshot_Acceptor::open - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - ACE_Reactor *reactor, - ACE_Concurrency_Strategy *con_s) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::open"); - this->reactor (reactor); - - // Initialize the concurrency strategy. - - if (con_s == 0) - { - ACE_NEW_RETURN (con_s, - ACE_Concurrency_Strategy, - -1); - this->delete_concurrency_strategy_ = 1; - } - this->concurrency_strategy_ = con_s; - - // Reuse the addr, even if it is already in use...! - return this->peer_acceptor_.open (local_addr, 1); -} - -template -ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor (void) - : delete_concurrency_strategy_ (0) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor"); - this->reactor (0); -} - -template -ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - ACE_Reactor *reactor, - ACE_Concurrency_Strategy *cs) - : delete_concurrency_strategy_ (0) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor"); - if (this->open (local_addr, reactor, cs) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor"))); -} - -template -ACE_Oneshot_Acceptor::~ACE_Oneshot_Acceptor (void) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::~ACE_Oneshot_Acceptor"); - this->handle_close (); -} - -template int -ACE_Oneshot_Acceptor::close (void) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::close"); - return this->handle_close (); -} - -template int -ACE_Oneshot_Acceptor::handle_close (ACE_HANDLE, - ACE_Reactor_Mask) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::handle_close"); - - // Guard against multiple closes. - if (this->delete_concurrency_strategy_) - { - delete this->concurrency_strategy_; - this->delete_concurrency_strategy_ = 0; - this->concurrency_strategy_ = 0; - - // Note that if we aren't actually registered with the - // ACE_Reactor then it's ok for this call to fail... - - if (this->reactor ()) - this->reactor ()->remove_handler - (this, - ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL); - - if (this->peer_acceptor_.close () == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("close\n"))); - } - return 0; -} - -template int -ACE_Oneshot_Acceptor::handle_timeout - (const ACE_Time_Value &tv, - const void *arg) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::handle_timeout"); - errno = ETIME; - - if (this->svc_handler_->handle_timeout (tv, arg) == -1) - this->svc_handler_->handle_close (this->svc_handler_->get_handle (), - ACE_Event_Handler::TIMER_MASK); - - // Since we aren't necessarily registered with the Reactor, don't - // bother to check the return value here... - if (this->reactor ()) - this->reactor ()->remove_handler (this, - ACE_Event_Handler::ACCEPT_MASK); - return 0; -} - -template int -ACE_Oneshot_Acceptor::cancel (void) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::cancel"); - return this->reactor () && this->reactor ()->cancel_timer (this); -} - -template int -ACE_Oneshot_Acceptor::register_handler - (SVC_HANDLER *svc_handler, - const ACE_Synch_Options &synch_options, - int restart) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::register_handler"); - // Can't do this if we don't have a Reactor. - if (this->reactor () == 0) - { - errno = EINVAL; - return -1; - } - else - { - this->svc_handler_ = svc_handler; - this->restart_ = restart; - ACE_Time_Value *tv = (ACE_Time_Value *) synch_options.time_value (); - - if (tv != 0 - && this->reactor ()->schedule_timer (this, - synch_options.arg (), - *tv) == 0) - return -1; - else - return this->reactor ()->register_handler - (this, - ACE_Event_Handler::ACCEPT_MASK); - } -} - -// Bridge method for activating a with the appropriate -// concurrency strategy. The default behavior of this method is to -// activate the SVC_HANDLER by calling its open() method (which allows -// the SVC_HANDLER to define its own concurrency strategy). However, -// subclasses can override this strategy to do more sophisticated -// concurrency activations (such as creating the SVC_HANDLER as an -// "active object" via multi-threading or multi-processing). - -template int -ACE_Oneshot_Acceptor::activate_svc_handler - (SVC_HANDLER *svc_handler) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::activate_svc_handler"); - return this->concurrency_strategy_->activate_svc_handler - (svc_handler, - (void *) this); -} - -// Factors out the code shared between the and -// methods. - -template int -ACE_Oneshot_Acceptor::shared_accept - (SVC_HANDLER *svc_handler, - ACE_PEER_ACCEPTOR_ADDR *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::shared_accept"); - if (svc_handler == 0) - return -1; - - // Accept connection into the Svc_Handler. - else if (this->peer_acceptor_.accept (svc_handler->peer (), // stream - remote_addr, // remote address - timeout, // timeout - restart, // restart - reset_new_handle // reset new handle - ) == -1) - { - // Check whether we just timed out or whether we failed... - if (!(errno == EWOULDBLOCK || errno == ETIME)) - // Close down handler to avoid memory leaks. - svc_handler->close (0); - return -1; - } - // Activate the using the designated concurrency - // strategy (note that this method becomes responsible for handling - // errors and freeing up the memory if things go awry...) - else - return this->activate_svc_handler (svc_handler); -} - -// Make a SVC_HANDLER, accept the connection into the SVC_HANDLER, and -// then activate the SVC_HANDLER. Note that SVC_HANDLER::open() -// decides what type of concurrency strategy to use. - -template int -ACE_Oneshot_Acceptor::accept - (SVC_HANDLER *svc_handler, - ACE_PEER_ACCEPTOR_ADDR *remote_addr, - const ACE_Synch_Options &synch_options, - int restart, - int reset_new_handle) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::accept"); - // Note that if timeout == ACE_Time_Value (x, y) where (x > 0 || y > - // 0) then this->connector_.connect() will block synchronously. If - // is set then we don't want this to happen (since we - // want the ACE_Reactor to do the timeout asynchronously). - // Therefore, we'll force this->connector_ to use ACE_Time_Value (0, - // 0) in this case... - - ACE_Time_Value *timeout; - int use_reactor = synch_options[ACE_Synch_Options::USE_REACTOR]; - - if (use_reactor) - timeout = (ACE_Time_Value *) &ACE_Time_Value::zero; - else - timeout = (ACE_Time_Value *) synch_options.time_value (); - - if (this->shared_accept (svc_handler, // stream - remote_addr, // remote address - timeout, // timeout - restart, // restart - reset_new_handle // reset new handler - ) == -1) - { - if (use_reactor && errno == EWOULDBLOCK) - // We couldn't accept right away, so let's wait in the - // . - this->register_handler (svc_handler, - synch_options, - restart); - return -1; - } - return 0; -} - -// Accepts one pending connection from a client (since we're the -// "oneshot" Acceptor). - -template int -ACE_Oneshot_Acceptor::handle_input (ACE_HANDLE) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::handle_input"); - int result = 0; - - // Cancel any timer that might be pending. - this->cancel (); - - // Try to find out if the implementation of the reactor that we are - // using requires us to reset the event association for the newly - // created handle. This is because the newly created handle will - // inherit the properties of the listen handle, including its event - // associations. - int reset_new_handle = this->reactor ()->uses_event_associations (); - - // There is a use-case whereby this object will be gone upon return - // from shared_accept - if the Svc_Handler deletes this Oneshot_Acceptor - // during the shared_accept/activation steps. So, do whatever we need - // to do with this object before calling shared_accept. - if (this->reactor ()) - this->reactor ()->remove_handler - (this, - ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL); - - if (this->shared_accept (this->svc_handler_, // stream - 0, // remote address - 0, // timeout - this->restart_, // restart - reset_new_handle // reset new handle - ) == -1) - result = -1; - - return result; -} - -// Hook called by the explicit dynamic linking facility. - -template int -ACE_Oneshot_Acceptor::init (int, ACE_TCHAR *[]) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::init"); - return -1; -} - -template int -ACE_Oneshot_Acceptor::fini (void) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::fini"); - return this->handle_close (); -} - -template int -ACE_Oneshot_Acceptor::info (ACE_TCHAR **strp, - size_t length) const -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::info"); - ACE_TCHAR buf[BUFSIZ]; - ACE_TCHAR addr_str[BUFSIZ]; - ACE_PEER_ACCEPTOR_ADDR addr; - - if (this->peer_acceptor_.get_local_addr (addr) == -1) - return -1; - else if (addr.addr_to_string (addr_str, sizeof addr_str) == -1) - return -1; - - ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t %s %s"), - ACE_LIB_TEXT ("ACE_Oneshot_Acceptor"), - addr_str, - ACE_LIB_TEXT ("#oneshot acceptor factory\n")); - - if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) - return -1; - else - ACE_OS::strsncpy (*strp, buf, length); - return ACE_static_cast (int, ACE_OS::strlen (buf)); -} - -template int -ACE_Oneshot_Acceptor::suspend (void) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::suspend"); - return this->reactor () && this->reactor ()->suspend_handler (this); -} - -template int -ACE_Oneshot_Acceptor::resume (void) -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::resume"); - return this->reactor () && this->reactor ()->resume_handler (this); -} - -// Returns ACE_HANDLE of the underlying peer_acceptor. - -template ACE_HANDLE -ACE_Oneshot_Acceptor::get_handle (void) const -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::get_handle"); - return this->peer_acceptor_.get_handle (); -} - -template ACE_PEER_ACCEPTOR & -ACE_Oneshot_Acceptor::acceptor (void) const -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::acceptor"); - return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_; -} - -template -ACE_Oneshot_Acceptor::operator ACE_PEER_ACCEPTOR & () const -{ - ACE_TRACE ("ACE_Oneshot_Acceptor::operator ACE_PEER_ACCEPTOR &"); - return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_; -} - -#endif /* ACE_ACCEPTOR_CPP */ diff --git a/ace/Acceptor.h b/ace/Acceptor.h deleted file mode 100644 index ab1b7053d24..00000000000 --- a/ace/Acceptor.h +++ /dev/null @@ -1,657 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Acceptor.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_ACCEPTOR_H -#define ACE_ACCEPTOR_H - -#include "ace/pre.h" - -#include "ace/Service_Object.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Strategies_T.h" -#include "ace/Synch_Options.h" - - -/** - * @class ACE_Acceptor - * - * @brief Abstract factory for creating a service handler - * (SVC_HANDLER), accepting into the SVC_HANDLER, and - * activating the SVC_HANDLER. - * - * Implements the basic strategy for passively establishing - * connections with clients. An ACE_Acceptor is parameterized - * by concrete types that conform to the interfaces of - * PEER_ACCEPTOR and SVC_HANDLER. The PEER_ACCEPTOR is - * instantiated with a transport mechanism that passively - * establishes connections. The SVC_HANDLER is instantiated - * with a concrete type that performs the application-specific - * service. An ACE_Acceptor inherits from ACE_Service_Object, - * which in turn inherits from ACE_Event_Handler. This enables - * the ACE_Reactor to dispatch the ACE_Acceptor's handle_input - * method when connection events occur. The handle_input method - * performs the ACE_Acceptor's default creation, connection - * establishment, and service activation strategies. These - * strategies can be overridden by subclasses individually or as - * a group. - */ -template -class ACE_Acceptor : public ACE_Service_Object -{ -public: - - // Useful STL-style traits. - typedef ACE_PEER_ACCEPTOR_ADDR addr_type; - typedef ACE_PEER_ACCEPTOR acceptor_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - - /// "Do-nothing" constructor. - ACE_Acceptor (ACE_Reactor * = 0, - int use_select = 1); - - /** - * Initialize and register with the Reactor and listen for - * connection requests at the designated . - * indicates how 's should be initialized prior to - * being activated. Right now, the only flag that is processed is - * , which enabled non-blocking I/O on the - * when it is opened. If is non-zero - * then in the - /// -loop. - int use_select_; - - /// Needed to reopen the socket if fails. - int reuse_addr_; -}; - -/** - * @class ACE_Strategy_Acceptor - * - * @brief Abstract factory for creating a service handler - * (SVC_HANDLER), accepting into the SVC_HANDLER, and activating - * the SVC_HANDLER. - * - * Implements a flexible and extensible set of strategies for - * passively establishing connections with clients. There are - * three main strategies: (1) creating a SVC_HANDLER, (2) - * passively accepting a new connection from a client into the - * SVC_HANDLER, and (3) activating the SVC_HANDLER with a - * particular concurrency mechanism. - */ -template -class ACE_Strategy_Acceptor - : public ACE_Acceptor -{ -public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy - creation_strategy_type; - typedef ACE_Accept_Strategy - accept_strategy_type; - typedef ACE_Concurrency_Strategy - concurrency_strategy_type; - typedef ACE_Scheduling_Strategy scheduling_strategy_type; - typedef ACE_Acceptor - base_type; - - // = Define some useful (old style) traits. - typedef ACE_Creation_Strategy CREATION_STRATEGY; - typedef ACE_Accept_Strategy ACCEPT_STRATEGY; - typedef ACE_Concurrency_Strategy CONCURRENCY_STRATEGY; - typedef ACE_Scheduling_Strategy SCHEDULING_STRATEGY; - - - - /// Default constructor. - ACE_Strategy_Acceptor (const ACE_TCHAR service_name[] = 0, - const ACE_TCHAR service_description[] = 0, - int use_select = 1, - int reuse_addr = 1); - - /** - * Initialize the appropriate strategies for creation, passive - * connection acceptance, and concurrency, and then register - * with the Reactor and listen for connection requests at the - * designated . - */ - ACE_Strategy_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - ACE_Reactor * = ACE_Reactor::instance (), - ACE_Creation_Strategy * = 0, - ACE_Accept_Strategy * = 0, - ACE_Concurrency_Strategy * = 0, - ACE_Scheduling_Strategy * = 0, - const ACE_TCHAR service_name[] = 0, - const ACE_TCHAR service_description[] = 0, - int use_select = 1, - int reuse_addr = 1); - - /** - * Open the contained @c PEER_ACCEPTOR object to begin listening, and - * register with the specified reactor for accept events. - * - * The @c PEER_ACCEPTOR handle is put into non-blocking mode as a - * safeguard against the race condition that can otherwise occur - * between the time when the passive-mode socket handle is "ready" - * and when the actual @c accept call is made. During this - * interval, the client can shutdown the connection, in which case, - * the call can hang. - * - * @param local_addr The address to listen at. - * @param reactor Pointer to the ACE_Reactor instance to register - * this object with. The default is the singleton. - * @param flags Flags to control what mode an accepted socket - * will be put into after it is accepted. The only - * legal value for this argument is @c ACE_NONBLOCK, - * which enables non-blocking mode on the accepted - * peer stream object in @c SVC_HANDLER. The default - * is 0. - * @param use_select Affects behavior when called back by the reactor - * when a connection can be accepted. If non-zero, - * this object will accept all pending connections, - * intead of just the one that triggered the reactor - * callback. Uses ACE_OS::select() internally to - * detect any remaining acceptable connections. - * The default is 1. - * @param reuse_addr Passed to the @c PEER_ACCEPTOR::open() method with - * @p local_addr. Generally used to request that the - * OS allow reuse of the listen port. The default is 1. - * - * @retval 0 Success - * @retval -1 Failure, @c errno contains an error code. - */ - virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - ACE_Reactor *reactor, - int flags = 0, - int use_select = 1, - int reuse_addr = 1); - - /** - * Initialize the appropriate strategies for creation, passive - * connection acceptance, and concurrency, and then register - * with the Reactor and listen for connection requests at the - * designated . - */ - virtual int open (const ACE_PEER_ACCEPTOR_ADDR &, - ACE_Reactor * = ACE_Reactor::instance (), - ACE_Creation_Strategy * = 0, - ACE_Accept_Strategy * =0, - ACE_Concurrency_Strategy * = 0, - ACE_Scheduling_Strategy * = 0, - const ACE_TCHAR *service_name = 0, - const ACE_TCHAR *service_description = 0, - int use_select = 1, - int reuse_addr = 1); - - /// Close down the Strategy_Acceptor's resources. - virtual ~ACE_Strategy_Acceptor (void); - - /// Return the underlying PEER_ACCEPTOR object. - virtual operator ACE_PEER_ACCEPTOR &() const; - - /// Return the underlying PEER_ACCEPTOR object. - virtual ACE_PEER_ACCEPTOR &acceptor (void) const; - - /// Returns the listening acceptor's . - virtual ACE_HANDLE get_handle (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - // = Service management hooks. - - /// This method delegates to the 's - /// method. - virtual int suspend (void); - - /// This method delegates to the 's - /// method. - virtual int resume (void); - - /// Calls when dynamically unlinked. - virtual int fini (void); - - /// Default version returns address info in . - virtual int info (ACE_TCHAR **buf, size_t) const; - - // = The following three methods define the 's strategies - // for creating, accepting, and activating 's, - // respectively. - - /** - * Bridge method for creating a . The strategy for - * creating a are configured into the Acceptor via - * it's . The default is to create a new - * if == 0, else is unchanged. However, - * subclasses can override this policy to perform - * creation in any way that they like (such as creating subclass - * instances of , using a singleton, dynamically - * linking the handler, etc.). Returns -1 on failure, else 0. - */ - virtual int make_svc_handler (SVC_HANDLER *&); - - /** - * Bridge method for accepting the new connection into the - * . The default behavior delegates to the - * in the . - */ - virtual int accept_svc_handler (SVC_HANDLER *svc_handler); - - /** - * Bridge method for activating a with the appropriate - * concurrency strategy. The default behavior of this method is to - * activate the by calling its method (which - * allows the to define its own concurrency strategy). - * However, subclasses can override this strategy to do more - * sophisticated concurrency activations (such as creating the - * as an "active object" via multi-threading or - * multi-processing). - */ - virtual int activate_svc_handler (SVC_HANDLER *svc_handler); - - // = Demultiplexing hooks. - /// Perform termination activities when is removed from the - /// . - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - - /// Handle SIGINT. - virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); - - // = These data members are "logically private" but are put in the - // protected part in case subclasses want to access them. - - // = Strategy objects. - - /// Creation strategy for an Acceptor. - CREATION_STRATEGY *creation_strategy_; - - /// 1 if created the creation strategy and thus should - /// delete it, else 0. - int delete_creation_strategy_; - - /// Accept strategy for an . - ACCEPT_STRATEGY *accept_strategy_; - - /// 1 if created the accept strategy and thus should delete - /// it, else 0. - int delete_accept_strategy_; - - /// Concurrency strategy for an . - CONCURRENCY_STRATEGY *concurrency_strategy_; - - /// 1 if created the concurrency strategy and thus should - /// delete it, else 0. - int delete_concurrency_strategy_; - - /// Scheduling strategy for an . - SCHEDULING_STRATEGY *scheduling_strategy_; - - /// 1 if created the scheduling strategy and thus should - /// delete it, else 0. - int delete_scheduling_strategy_; - - // = Service information objects. - - /// Name of the service. - ACE_TCHAR *service_name_; - - /// Description of the service. - ACE_TCHAR *service_description_; - - /// Address that the uses to listen for - /// connections. - ACE_PEER_ACCEPTOR_ADDR service_addr_; -}; - -/** - * @class ACE_Oneshot_Acceptor - * - * @brief Generic factory for passively connecting clients and creating - * exactly one service handler (SVC_HANDLER). - * - * This class works similarly to the regular , - * with the following differences: - * 1. This class doesn't automagically register with the - * since it expects to have its method - * called directly. However, it stashes the - * pointer away in case it's needed later to finish accepting - * a connection asynchronously. - * 2. The class doesn't need an (since - * the user supplies the SVC_HANDLER) or an - * (since this class only accepts one - * connection and then removes all traces of itself from the - * if it was registered for asynchronous - * accepts). - */ -template -class ACE_Oneshot_Acceptor : public ACE_Service_Object -{ -public: - - // Useful STL-style traits. - typedef ACE_PEER_ACCEPTOR_ADDR addr_type; - typedef ACE_PEER_ACCEPTOR acceptor_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - - /// Constructor. - ACE_Oneshot_Acceptor (void); - - /** - * Initialize the appropriate strategies for concurrency and then - * open the at the designated . Note - * that unlike the and , this - * method does NOT register acceptor with the at - * this point -- it just stashes the away in case it's - * needed later. - */ - ACE_Oneshot_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - ACE_Reactor *reactor = ACE_Reactor::instance (), - ACE_Concurrency_Strategy * = 0); - - /** - * Initialize the appropriate strategies for concurrency and then - * open the at the designated . Note - * that unlike the and , this - * method does NOT register acceptor with the at - * this point -- it just stashes the away in case it's - * needed later. - */ - int open (const ACE_PEER_ACCEPTOR_ADDR &, - ACE_Reactor *reactor = ACE_Reactor::instance (), - ACE_Concurrency_Strategy * = 0); - - /// Close down the . - virtual ~ACE_Oneshot_Acceptor (void); - - // = Explicit factory operation. - /// Create a , accept the connection into the - /// , and activate the . - virtual int accept (SVC_HANDLER * = 0, - ACE_PEER_ACCEPTOR_ADDR *remote_addr = 0, - const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, - int restart = 1, - int reset_new_handle = 0); - - /// Cancel a oneshot acceptor that was started asynchronously. - virtual int cancel (void); - - /// Return the underlying object. - virtual operator ACE_PEER_ACCEPTOR &() const; - - /// Return the underlying object. - virtual ACE_PEER_ACCEPTOR &acceptor (void) const; - - /// Close down the . - virtual int close (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /** - * Bridge method for activating a with the appropriate - * concurrency strategy. Default behavior is to activate the - * as a "passive object." However, subclasses can - * override this strategy to do more sophisticated concurrency - * activations (such as creating the as an "active - * object" via multi-threading or multi-processing). - */ - virtual int activate_svc_handler (SVC_HANDLER *svc_handler); - - /// Factors out the code shared between the and - /// methods. - int shared_accept (SVC_HANDLER *svc_handler, - ACE_PEER_ACCEPTOR_ADDR *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle); - - // = Demultiplexing hooks. - /// Returns the listening acceptor's . - virtual ACE_HANDLE get_handle (void) const; - - /// Perform termination activities when is removed from the - /// . - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - - /// Accept one connection from a client and activates the - /// SVC_HANDLER. - virtual int handle_input (ACE_HANDLE); - - /// Called when an acceptor times out... - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - - // = Dynamic linking hooks. - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int init (int argc, ACE_TCHAR *argv[]); - - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int fini (void); - - /// Default version returns address info in . - virtual int info (ACE_TCHAR **, size_t) const; - - // = Service management hooks. - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int suspend (void); - - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int resume (void); - -private: - /** - * Insert ourselves into the so that we can continue - * accepting this connection asynchronously. This method should NOT - * be called by developers directly. - */ - int register_handler (SVC_HANDLER *svc_handler, - const ACE_Synch_Options &options, - int restart); - - /// Hold the svc_handler_ across asynchrony boundaries. - SVC_HANDLER *svc_handler_; - - /// Hold the restart flag across asynchrony boundaries. - int restart_; - - /// Factory that establishes connections passively. - ACE_PEER_ACCEPTOR peer_acceptor_; - - /// Concurrency strategy for an Acceptor. - ACE_Concurrency_Strategy *concurrency_strategy_; - - /// 1 if Acceptor created the concurrency strategy and thus should - /// delete it, else 0. - int delete_concurrency_strategy_; -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_ACCEPTOR_H */ diff --git a/ace/Activation_Queue.cpp b/ace/Activation_Queue.cpp deleted file mode 100644 index 9a271c4d7ae..00000000000 --- a/ace/Activation_Queue.cpp +++ /dev/null @@ -1,109 +0,0 @@ -#include "ace/Activation_Queue.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Activation_Queue.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/Log_Msg.h" -#include "ace/Malloc_Base.h" - -ACE_RCSID (ace, - Activation_Queue, - "$Id$") - - -void -ACE_Activation_Queue::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("delete_queue_ = %d\n"), - this->delete_queue_)); - ACE_DEBUG ((LM_INFO, ACE_LIB_TEXT ("queue_: \n"))); - if (this->queue_) - this->queue_->dump(); - else - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(NULL)\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Activation_Queue::ACE_Activation_Queue (ACE_Message_Queue *new_queue, - ACE_Allocator *alloc, - ACE_Allocator *db_alloc) - : delete_queue_ (0) - , allocator_(alloc) - , data_block_allocator_(db_alloc) -{ - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - if (new_queue) - this->queue_ = new_queue; - else - { - ACE_NEW (this->queue_, - ACE_Message_Queue); - this->delete_queue_ = 1; - } -} - -ACE_Activation_Queue::~ACE_Activation_Queue (void) -{ - if (this->delete_queue_ != 0) - delete this->queue_; -} - -ACE_Method_Request * -ACE_Activation_Queue::dequeue (ACE_Time_Value *tv) -{ - ACE_Message_Block *mb; - - // Dequeue the message. - if (this->queue_->dequeue_head (mb, tv) != -1) - { - // Get the next . - ACE_Method_Request *mr = - ACE_reinterpret_cast (ACE_Method_Request *, - mb->base ()); - // Delete the message block. - mb->release (); - return mr; - } - else - return 0; -} - -int -ACE_Activation_Queue::enqueue (ACE_Method_Request *mr, - ACE_Time_Value *tv) -{ - ACE_Message_Block *mb; - - // We pass sizeof (*mr) here so that flow control will work - // correctly. Since we also pass note that no unnecessary - // memory is actually allocated -- just the size field is set. - ACE_NEW_MALLOC_RETURN (mb, - ACE_static_cast(ACE_Message_Block *, - this->allocator_->malloc (sizeof (ACE_Message_Block))), - ACE_Message_Block (sizeof (*mr), // size - ACE_Message_Block::MB_DATA, // type - 0, // cont - (char *) mr, // data - 0, // allocator - 0, // locking strategy - mr->priority (), // priority - ACE_Time_Value::zero, // execution time - ACE_Time_Value::max_time, // absolute time of deadline - this->data_block_allocator_, // data_block allocator - this->allocator_), // message_block allocator - -1); - - // Enqueue in priority order. - int result = this->queue_->enqueue_prio (mb, tv); - - // Free ACE_Message_Block if enqueue_prio failed. - if (result == -1) - ACE_DES_FREE (mb, this->allocator_->free, ACE_Message_Block); - - return result; -} diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h deleted file mode 100644 index b2c0cf6f383..00000000000 --- a/ace/Activation_Queue.h +++ /dev/null @@ -1,162 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Activation_Queue.h - * - * $Id$ - * - * @author Andres Kruse - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_ACTIVATION_QUEUE_H -#define ACE_ACTIVATION_QUEUE_H -#include "ace/pre.h" - -#include "ace/Synch_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Message_Queue.h" -#include "ace/Method_Request.h" - -// Be compatible with the terminology in the POSA2 book! -#define ACE_Activation_List ACE_Activation_Queue - -/** - * @class ACE_Activation_Queue - * - * @brief Reifies a method into a request. Subclasses typically - * represent necessary state and behavior. - * - * Maintains a priority-ordered queue of ACE_Method_Request objects. - * A scheduler class (often derived from ACE_Task) subsequently removes - * each method request and invokes its @c call() method. - * - * This class is discussed in depth in the Active Object chapter - * of POSA2. In that book, it is referred to as an Activation List. - * - * @sa ACE_Method_Request - */ -class ACE_Export ACE_Activation_Queue -{ -public: - // = Initialization and termination methods. - /// Constructor. - /** - * Initializes a new activation queue. - * - * @param new_queue The activation queue uses an ACE_Message_Queue to - * queue and order the method requests. If this argument - * is 0, a new ACE_Message_Queue is created for this - * object's use and will be deleted when this object is - * destroyed. If a non-zero pointer is supplied, the - * passed object will be used and will not be deleted when - * this object is destroyed. If an ACE_Task is being created - * to act as the scheduler, for instance, its - * ACE_Message_Queue pointer can be passed to this object. - * @param alloc Optional, the allocator to use when allocating - * ACE_Message_Block instances that wrap the method requests - * queued to this activation queue. Defaults to - * ACE_Allocator::instance(). - * @param db_alloc Optional, the allocator to use when allocating - * data blocks for the ACE_Message_Block instances that - * wrap the method requests queued to this activation queue. - * Defaults to ACE_Allocator::instance(). - */ - ACE_Activation_Queue (ACE_Message_Queue *new_queue = 0, - ACE_Allocator *alloc = 0, - ACE_Allocator *db_alloc = 0); - - /// Destructor. - virtual ~ACE_Activation_Queue (void); - - // = Activate Queue operations. - - /// Dequeue the next available ACE_Method_Request. - /** - * @param tv If 0, the method will block until a method request is - * available, else will wait until the absolute time specified - * in the referenced ACE_Time_Value. This method will return, - * earlier, however, if queue is closed, deactivated, or when - * a signal occurs. - * - * @retval Pointer to the dequeued ACE_Method_Request object. - * @retval 0 an error occurs; errno contains further information. If - * the specified timeout elapses, errno will be @c EWOULDBLOCK. - */ - ACE_Method_Request *dequeue (ACE_Time_Value *tv = 0); - - /// Enqueue the ACE_Method_Request in priority order. - /** - * The priority of the method request is obtained via the @c priority() - * method of the queued method request. Priority ordering is determined - * by the ACE_Message_Queue class; 0 is the lowest priority. - * - * @param new_method_request Pointer to the ACE_Method_Request object to - * queue. This object's @c priority() method is called to obtain - * the priority. - * @param tv If 0, the method will block until the method request can - * be queued, else will wait until the absolute time specified - * in the referenced ACE_Time_Value. This method will return, - * earlier, however, if queue is closed, deactivated, or when - * a signal occurs. - * - * @retval 0 on success. - * @retval -1 if an error occurs; errno contains further information. If - * the specified timeout elapses, errno will be @c EWOULDBLOCK. - */ - int enqueue (ACE_Method_Request *new_method_request, - ACE_Time_Value *tv = 0); - - /// Get the current number of method objects in the queue. - size_t method_count (void) const; - - /// Returns 1 if the queue is empty, 0 otherwise. - int is_empty (void) const; - - /// Returns 1 if the queue is full, 0 otherwise. - int is_full (void) const; - - /// Dump the state of an request. - void dump (void) const; - - /// Get a pointer to the underlying queue. - ACE_Message_Queue *queue (void) const; - - /// Set the pointer to the underlying queue. - void queue (ACE_Message_Queue *q); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Stores the . - ACE_Message_Queue *queue_; - - /// Keeps track of whether we need to delete the queue. - int delete_queue_; - -private: - /// Allocation strategy of the queue. - ACE_Allocator *allocator_; - - /// Allocation strategy of the message blocks. - ACE_Allocator *data_block_allocator_; - - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Activation_Queue &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Activation_Queue (const ACE_Activation_Queue &)) -}; - -#if defined (__ACE_INLINE__) -#include "ace/Activation_Queue.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_ACTIVATION_QUEUE_H */ - diff --git a/ace/Activation_Queue.i b/ace/Activation_Queue.i deleted file mode 100644 index b4b9283bced..00000000000 --- a/ace/Activation_Queue.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Activation_Queue.i - -ACE_INLINE size_t -ACE_Activation_Queue::method_count (void) const -{ - return queue_->message_count (); -} - -ACE_INLINE int -ACE_Activation_Queue::is_full (void) const -{ - return queue_->is_full (); -} - -ACE_INLINE int -ACE_Activation_Queue::is_empty (void) const -{ - return queue_->is_empty (); -} - -ACE_INLINE ACE_Message_Queue * -ACE_Activation_Queue::queue (void) const -{ - return queue_; -} - -ACE_INLINE void -ACE_Activation_Queue::queue (ACE_Message_Queue *q) -{ - queue_ = q; -} diff --git a/ace/Active_Map_Manager.cpp b/ace/Active_Map_Manager.cpp deleted file mode 100644 index a01fb45d9b0..00000000000 --- a/ace/Active_Map_Manager.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// $Id$ - -#include "ace/Active_Map_Manager.h" - -ACE_RCSID(ace, Active_Map_Manager, "$Id$") - -#if !defined (__ACE_INLINE__) -#include "ace/Active_Map_Manager.i" -#endif /* __ACE_INLINE__ */ - diff --git a/ace/Active_Map_Manager.h b/ace/Active_Map_Manager.h deleted file mode 100644 index 7c0ef680ef2..00000000000 --- a/ace/Active_Map_Manager.h +++ /dev/null @@ -1,110 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Active_Map_Manager.h - * - * $Id$ - * - * @author Irfan Pyarali - */ -//============================================================================= - - -#ifndef ACE_ACTIVE_MAP_MANAGER_H -#define ACE_ACTIVE_MAP_MANAGER_H -#include "ace/pre.h" - -#include "ace/OS_String.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Active_Map_Manager_Key - * - * @brief Key used in the Active Object Map. - * - * This key keeps information of the index and the generation - * count of the slot it represents. Since the index information - * is part of the key, lookups are super fast and predictable, - */ -class ACE_Export ACE_Active_Map_Manager_Key -{ -public: - /// Default constructor. - ACE_Active_Map_Manager_Key (void); - - /** - * Constructor given the and number. - * This is useful once the user has somehow recovered the - * and number from the client. - */ - ACE_Active_Map_Manager_Key (ACE_UINT32 slot_index, - ACE_UINT32 slot_generation); - - /// Get the . - ACE_UINT32 slot_index (void) const; - - /// Set the . - void slot_index (ACE_UINT32 i); - - /// Get the number. - ACE_UINT32 slot_generation (void) const; - - /// Set the number. - void slot_generation (ACE_UINT32 g); - - /// Size required to store information about active key. - static size_t size (void); - - /// Recover state of active key from . User must make sure - /// that encoded using the method. - void decode (const void *data); - - /// Encode state of the active key into . must be as - /// big as the value returned from . - void encode (void *data) const; - - /// Compare keys. - int operator== (const ACE_Active_Map_Manager_Key &rhs) const; - int operator!= (const ACE_Active_Map_Manager_Key &rhs) const; - - // = This really should be protected but because of template - // friends, they are not. - - /// Increment the number. - void increment_slot_generation_count (void); - -private: - - /** - * @brief Data for the Active Object Map Key. - * - * This separate structure makes it easier to manage copying - * the index and the generation to and from the user buffer. - * - */ - struct key_data - { - /// Slot index in the active map. - ACE_UINT32 slot_index_; - - /// Slot generation number of slot in the active map. - ACE_UINT32 slot_generation_; - }; - - /// Data for the Active Object Map Key. - key_data key_data_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Active_Map_Manager.i" -#endif /* __ACE_INLINE__ */ - -// Include the templates here. -#include "ace/Active_Map_Manager_T.h" - -#include "ace/post.h" -#endif /* ACE_ACTIVE_MAP_MANAGER_H */ diff --git a/ace/Active_Map_Manager.i b/ace/Active_Map_Manager.i deleted file mode 100644 index 0e73f7e50ec..00000000000 --- a/ace/Active_Map_Manager.i +++ /dev/null @@ -1,89 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -ACE_INLINE -ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (void) -{ - // If you change ~0, please change ACE_Map_Manager::free_list_id() - // accordingly. - this->key_data_.slot_index_ = ~0; - this->key_data_.slot_generation_ = 0; -} - -ACE_INLINE -ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (ACE_UINT32 slot_index, - ACE_UINT32 slot_generation) -{ - this->key_data_.slot_index_ = slot_index; - this->key_data_.slot_generation_ = slot_generation; -} - -ACE_INLINE ACE_UINT32 -ACE_Active_Map_Manager_Key::slot_index (void) const -{ - return this->key_data_.slot_index_; -} - -ACE_INLINE ACE_UINT32 -ACE_Active_Map_Manager_Key::slot_generation (void) const -{ - return this->key_data_.slot_generation_; -} - -ACE_INLINE int -ACE_Active_Map_Manager_Key::operator== (const ACE_Active_Map_Manager_Key &rhs) const -{ - return - this->key_data_.slot_index_ == rhs.key_data_.slot_index_ && - this->key_data_.slot_generation_ == rhs.key_data_.slot_generation_; -} - -ACE_INLINE int -ACE_Active_Map_Manager_Key::operator!= (const ACE_Active_Map_Manager_Key &rhs) const -{ - return !this->operator== (rhs); -} - -ACE_INLINE void -ACE_Active_Map_Manager_Key::slot_index (ACE_UINT32 i) -{ - this->key_data_.slot_index_ = i; -} - -ACE_INLINE void -ACE_Active_Map_Manager_Key::slot_generation (ACE_UINT32 g) -{ - this->key_data_.slot_generation_ = g; -} - -ACE_INLINE void -ACE_Active_Map_Manager_Key::increment_slot_generation_count (void) -{ - ++this->key_data_.slot_generation_; -} - -/* static */ -ACE_INLINE size_t -ACE_Active_Map_Manager_Key::size (void) -{ - return sizeof (ACE_UINT32) + sizeof (ACE_UINT32); -} - -ACE_INLINE void -ACE_Active_Map_Manager_Key::decode (const void *data) -{ - // Copy the information from the user buffer into the key. - ACE_OS_String::memcpy (&this->key_data_, - data, - sizeof this->key_data_); -} - -ACE_INLINE void -ACE_Active_Map_Manager_Key::encode (void *data) const -{ - // Copy the key data to the user buffer. - ACE_OS_String::memcpy (data, - &this->key_data_, - sizeof this->key_data_); -} diff --git a/ace/Active_Map_Manager_T.cpp b/ace/Active_Map_Manager_T.cpp deleted file mode 100644 index a544bc28fda..00000000000 --- a/ace/Active_Map_Manager_T.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ - -#ifndef ACE_ACTIVE_MAP_MANAGER_T_C -#define ACE_ACTIVE_MAP_MANAGER_T_C - -#include "ace/Active_Map_Manager_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Active_Map_Manager_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Active_Map_Manager_T, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Active_Map_Manager) - -#endif /* ACE_ACTIVE_MAP_MANAGER_T_C */ diff --git a/ace/Active_Map_Manager_T.h b/ace/Active_Map_Manager_T.h deleted file mode 100644 index b91d2fec51a..00000000000 --- a/ace/Active_Map_Manager_T.h +++ /dev/null @@ -1,205 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Active_Map_Manager_T.h - * - * $Id$ - * - * @author Irfan Pyarali - */ -//============================================================================= - - -#ifndef ACE_ACTIVE_MAP_MANAGER_T_H -#define ACE_ACTIVE_MAP_MANAGER_T_H -#include "ace/pre.h" - -#include "ace/Map_Manager.h" -#include "ace/Active_Map_Manager.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Active_Map_Manager - * - * @brief Define a map abstraction that associates system generated - * keys with user specified values. - * - * Since the key is system generated, searches are very fast and - * take a constant amount of time. - */ -template -class ACE_Active_Map_Manager : public ACE_Map_Manager -{ -public: - - // = Traits. - typedef ACE_Active_Map_Manager_Key key_type; - typedef T mapped_type; - - typedef ACE_Map_Entry ENTRY; - typedef ACE_Map_Iterator ITERATOR; - typedef ACE_Map_Reverse_Iterator REVERSE_ITERATOR; - - typedef ENTRY entry; - typedef ITERATOR iterator; - typedef REVERSE_ITERATOR reverse_iterator; - - // = Initialization and termination methods. - /// Initialize a with the . - ACE_Active_Map_Manager (ACE_Allocator *alloc = 0); - - /// Initialize a with entries. - ACE_Active_Map_Manager (size_t size, - ACE_Allocator *alloc = 0); - - /// Close down a and release dynamically - /// allocated resources. - ~ACE_Active_Map_Manager (void); - - /// Initialize a with size . - int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); - - /// Close down a and release dynamically - /// allocated resources. - int close (void); - - /// Add to the map, and the corresponding key produced by the - /// Active_Map_Manager is returned through . - int bind (const T &value, - ACE_Active_Map_Manager_Key &key); - - /// Add to the map. The user does not care about the - /// corresponding key produced by the Active_Map_Manager. - int bind (const T &value); - - /** - * Reserves a slot in the internal structure and returns the key and - * a pointer to the value. User should place their into - * <*internal_value>. This method is useful in reducing the number - * of copies required in some cases. Note that is - * only a temporary pointer and will change when the map resizes. - * Therefore, the user should use the pointer immediately and not - * hold on to it. - */ - int bind (ACE_Active_Map_Manager_Key &key, - T *&internal_value); - - /// Reassociate with . The function fails if is - /// not in the map. - int rebind (const ACE_Active_Map_Manager_Key &key, - const T &value); - - /** - * Reassociate with , storing the old value into the - * "out" parameter . The function fails if is not - * in the map. - */ - int rebind (const ACE_Active_Map_Manager_Key &key, - const T &value, - T &old_value); - - /** - * Reassociate with , storing the old key and value - * into the "out" parameter and . The function - * fails if is not in the map. - */ - int rebind (const ACE_Active_Map_Manager_Key &key, - const T &value, - ACE_Active_Map_Manager_Key &old_key, - T &old_value); - - /// Locate associated with . - int find (const ACE_Active_Map_Manager_Key &key, - T &value) const; - - /// Is in the map? - int find (const ACE_Active_Map_Manager_Key &key) const; - - /** - * Locate associated with . The value is returned via - * and hence a copy is saved. Note that - * is only a temporary pointer and will change when - * the map resizes. Therefore, the user should use the pointer - * immediately and not hold on to it. - */ - int find (const ACE_Active_Map_Manager_Key &key, - T *&internal_value) const; - - // Creates a key. User should place their into - // <*internal_value>. This method is useful in reducing the number - // of copies required in some cases. - - /// Remove from the map. - int unbind (const ACE_Active_Map_Manager_Key &key); - - /// Remove from the map, and return the associated with - /// . - int unbind (const ACE_Active_Map_Manager_Key &key, - T &value); - - /** - * Locate associated with . The value is returned via - * and hence a copy is saved. Note that - * is only a temporary pointer and will change when - * the map resizes or when this slot is reused. Therefore, the user - * should use the pointer immediately and not hold on to it. - */ - int unbind (const ACE_Active_Map_Manager_Key &key, - T *&internal_value); - - /// Return the current size of the map. - size_t current_size (void) const; - - /// Return the total size of the map. - size_t total_size (void) const; - - /// Returns a key that cannot be found in the map. - static const ACE_Active_Map_Manager_Key npos (void); - - /// Dump the state of an object. - void dump (void) const; - - // = STL styled iterator factory functions. - - /// Return forward iterator. - ACE_Map_Iterator begin (void); - ACE_Map_Iterator end (void); - - /// Return reverse iterator. - ACE_Map_Reverse_Iterator rbegin (void); - ACE_Map_Reverse_Iterator rend (void); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - - /// Private base class - typedef ACE_Map_Manager ACE_AMM_BASE; - -private: - - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Active_Map_Manager &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Active_Map_Manager (const ACE_Active_Map_Manager &)) -}; - -#if defined (__ACE_INLINE__) -#include "ace/Active_Map_Manager_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Active_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Active_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_ACTIVE_MAP_MANAGER_T_H */ diff --git a/ace/Active_Map_Manager_T.i b/ace/Active_Map_Manager_T.i deleted file mode 100644 index 981594c3dfc..00000000000 --- a/ace/Active_Map_Manager_T.i +++ /dev/null @@ -1,303 +0,0 @@ -// $Id$ - -template ACE_INLINE int -ACE_Active_Map_Manager::bind (ACE_Active_Map_Manager_Key &key, - T *&internal_value) -{ - ACE_UINT32 slot_index; - int result = this->next_free (slot_index); - - if (result == 0) - { - // Move from free list to occupied list - this->move_from_free_list_to_occupied_list (slot_index); - - // Reset the key. - this->search_structure_[slot_index].ext_id_.increment_slot_generation_count (); - this->search_structure_[slot_index].ext_id_.slot_index (slot_index); - - // Copy the key for the user. - key = this->search_structure_[slot_index].ext_id_; - - // This is where the user should place the value. - internal_value = &this->search_structure_[slot_index].int_id_; - - // Update the current size. - ++this->cur_size_; - } - - return result; -} - -template ACE_INLINE int -ACE_Active_Map_Manager::bind (const T &value, - ACE_Active_Map_Manager_Key &key) -{ - T *internal_value = 0; - int result = this->bind (key, - internal_value); - - if (result == 0) - { - // Store new value. - *internal_value = value; - } - - return result; -} - -template ACE_INLINE int -ACE_Active_Map_Manager::bind (const T &value) -{ - ACE_Active_Map_Manager_Key key; - return this->bind (value, key); -} - -template ACE_INLINE int -ACE_Active_Map_Manager::find (const ACE_Active_Map_Manager_Key &key, - T *&internal_value) const -{ - ACE_UINT32 slot_index = key.slot_index (); - ACE_UINT32 slot_generation = key.slot_generation (); - - if (slot_index > this->total_size_ || -#if defined (ACE_HAS_LAZY_MAP_MANAGER) - this->search_structure_[slot_index].free_ || -#endif /* ACE_HAS_LAZY_MAP_MANAGER */ - this->search_structure_[slot_index].ext_id_.slot_generation () != slot_generation || - this->search_structure_[slot_index].ext_id_.slot_index () == - (ACE_UINT32)this->free_list_id ()) - { - return -1; - } - else - { - // This is where the user value is. - internal_value = &this->search_structure_[slot_index].int_id_; - } - - return 0; -} - -template ACE_INLINE int -ACE_Active_Map_Manager::find (const ACE_Active_Map_Manager_Key &key) const -{ - T *internal_value = 0; - return this->find (key, - internal_value); -} - -template ACE_INLINE int -ACE_Active_Map_Manager::find (const ACE_Active_Map_Manager_Key &key, - T &value) const -{ - T *internal_value = 0; - int result = this->find (key, - internal_value); - - if (result == 0) - value = *internal_value; - - return result; -} - -template ACE_INLINE int -ACE_Active_Map_Manager::rebind (const ACE_Active_Map_Manager_Key &key, - const T &value) -{ - int result = this->find (key); - - if (result == 0) - { - // Store new value. - this->search_structure_[key.slot_index ()].int_id_ = value; - } - - return result; -} - -template ACE_INLINE int -ACE_Active_Map_Manager::rebind (const ACE_Active_Map_Manager_Key &key, - const T &value, - T &old_value) -{ - int result = this->find (key); - - if (result == 0) - { - // Copy old value. - old_value = this->search_structure_[key.slot_index ()].int_id_; - - // Store new value. - this->search_structure_[key.slot_index ()].int_id_ = value; - } - - return result; -} - -template ACE_INLINE int -ACE_Active_Map_Manager::rebind (const ACE_Active_Map_Manager_Key &key, - const T &value, - ACE_Active_Map_Manager_Key &old_key, - T &old_value) -{ - int result = this->find (key); - - if (result == 0) - { - // Copy old key. - old_key = this->search_structure_[key.slot_index ()].ext_id_; - - // Copy old value. - old_value = this->search_structure_[key.slot_index ()].int_id_; - - // Store new value. - this->search_structure_[key.slot_index ()].int_id_ = value; - } - - return result; -} - -template ACE_INLINE int -ACE_Active_Map_Manager::unbind (const ACE_Active_Map_Manager_Key &key, - T *&internal_value) -{ - int result = this->find (key, - internal_value); - - if (result == 0) - { - ACE_UINT32 slot_index = key.slot_index (); - -#if defined (ACE_HAS_LAZY_MAP_MANAGER) - - // - // In the case of lazy map managers, the movement of free slots - // from the occupied list to the free list is delayed until we - // run out of free slots in the free list. - // - - this->search_structure_[slot_index].free_ = 1; - -#else - - // Move from occupied list to free list. - this->move_from_occupied_list_to_free_list (slot_index); - -#endif /* ACE_HAS_LAZY_MAP_MANAGER */ - - // Reset the slot_index. This will tell us that this entry is free. - this->search_structure_[slot_index].ext_id_.slot_index (this->free_list_id ()); - - // Update the current size. - --this->cur_size_; - } - - return result; -} - -template ACE_INLINE int -ACE_Active_Map_Manager::unbind (const ACE_Active_Map_Manager_Key &key, - T &value) -{ - T *internal_value; - int result = this->unbind (key, - internal_value); - - if (result == 0) - { - // Copy old value. - value = *internal_value; - } - - return result; -} - -template ACE_INLINE int -ACE_Active_Map_Manager::unbind (const ACE_Active_Map_Manager_Key &key) -{ - T *internal_value; - return this->unbind (key, - internal_value); -} - -template ACE_INLINE -ACE_Active_Map_Manager::ACE_Active_Map_Manager (ACE_Allocator *alloc) - : ACE_AMM_BASE (alloc) -{ -} - -template ACE_INLINE -ACE_Active_Map_Manager::ACE_Active_Map_Manager (size_t size, - ACE_Allocator *alloc) - : ACE_AMM_BASE (size, - alloc) -{ -} - -template ACE_INLINE -ACE_Active_Map_Manager::~ACE_Active_Map_Manager (void) -{ -} - -template ACE_INLINE int -ACE_Active_Map_Manager::open (size_t length, - ACE_Allocator *alloc) -{ - return ACE_AMM_BASE::open (length, alloc); -} - -template ACE_INLINE int -ACE_Active_Map_Manager::close (void) -{ - return ACE_AMM_BASE::close (); -} - -template ACE_INLINE size_t -ACE_Active_Map_Manager::current_size (void) const -{ - return ACE_AMM_BASE::current_size (); -} - -template ACE_INLINE size_t -ACE_Active_Map_Manager::total_size (void) const -{ - return ACE_AMM_BASE::total_size (); -} - -/* static */ -template ACE_INLINE const ACE_Active_Map_Manager_Key -ACE_Active_Map_Manager::npos (void) -{ - return ACE_Active_Map_Manager_Key (~0, ~0); -} - -template ACE_INLINE void -ACE_Active_Map_Manager::dump (void) const -{ - ACE_AMM_BASE::dump (); -} - -template ACE_Map_Iterator -ACE_Active_Map_Manager::begin (void) -{ - return ACE_AMM_BASE::begin (); -} - -template ACE_INLINE ACE_Map_Iterator -ACE_Active_Map_Manager::end (void) -{ - return ACE_AMM_BASE::end (); -} - -template ACE_INLINE ACE_Map_Reverse_Iterator -ACE_Active_Map_Manager::rbegin (void) -{ - return ACE_AMM_BASE::rbegin (); -} - -template ACE_INLINE ACE_Map_Reverse_Iterator -ACE_Active_Map_Manager::rend (void) -{ - return ACE_AMM_BASE::rend (); -} diff --git a/ace/Addr.cpp b/ace/Addr.cpp deleted file mode 100644 index e523a0f2303..00000000000 --- a/ace/Addr.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// Addr.cpp -// $Id$ - -#include "ace/Addr.h" -#include "ace/Log_Msg.h" -#include "ace/OS.h" - -ACE_RCSID(ace, Addr, "$Id$") - -#if defined (ACE_HAS_BROKEN_SAP_ANY) -#if defined (sap_any) -#undef sap_any -// Note: this object requires static construction and destruction. -/* static */ -const ACE_Addr ace_sap_any (AF_ANY, -1); - -const ACE_Addr & -ACE_Addr::sap_any (void) -{ - return ace_sap_any; -} -#define sap_any sap_any() -#endif /* sap_any */ -#else -// Note: this object requires static construction and destruction. -/* static */ -const ACE_Addr ACE_Addr::sap_any (AF_ANY, -1); -#endif /* ACE_HAS_BROKEN_SAP_ANY */ - -#if !defined (__ACE_INLINE__) -#include "ace/Addr.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_Addr) - -void -ACE_Addr::dump (void) const -{ - ACE_TRACE ("ACE_Addr::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("addr_type_ = %d"), this->addr_type_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\naddr_size_ = %d"), this->addr_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// Initializes instance variables. - -void -ACE_Addr::base_set (int type, int size) -{ - this->addr_type_ = type; - this->addr_size_ = size; -} - -// Initializes instance variables. Note that 0 is an unspecified -// protocol family type... - -ACE_Addr::ACE_Addr (int type, int size) -{ - this->base_set (type, size); -} - -ACE_Addr::~ACE_Addr (void) -{ -} diff --git a/ace/Addr.h b/ace/Addr.h deleted file mode 100644 index 141093d28bf..00000000000 --- a/ace/Addr.h +++ /dev/null @@ -1,108 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Addr.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_ADDR_H -#define ACE_ADDR_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Addr - * - * @brief Defines the base class for the "address family independent" - * address format. - */ -class ACE_Export ACE_Addr -{ -public: - // = Initialization and termination methods. - /// Initializes instance variables. - ACE_Addr (int type = -1, - int size = -1); - - /// Destructor. - virtual ~ACE_Addr (void); - - // = Get/set the size of the address. - - /// Return the size of the address. - int get_size (void) const; - - /// Sets the size of the address. - void set_size (int size); - - // = Get/set the type of the address. - - /// Get the type of the address. - int get_type (void) const; - - /// Set the type of the address. - void set_type (int type); - - /// Return a pointer to the address. - virtual void *get_addr (void) const; - - /// Set a pointer to the address. - virtual void set_addr (void *, int len); - - // = Equality/inequality tests - /// Check for address equality. - int operator == (const ACE_Addr &sap) const; - - /// Check for address inequality. - int operator != (const ACE_Addr &sap) const; - - /// Initializes instance variables. - void base_set (int type, int size); - -#if defined (ACE_HAS_BROKEN_SAP_ANY) - /// Wild-card address. - static const ACE_Addr &sap_any (void); - - // This #define works around broken C++ compilers... -#define sap_any sap_any() -#else - /// Wild-card address. - static const ACE_Addr sap_any; -#endif /* ACE_HAS_BROKEN_SAP_ANY */ - - /// Returns a hash value. This should be overwritten by a subclass - /// that can produce a better hash value. - virtual unsigned long hash (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// e.g., AF_UNIX, AF_INET, AF_SPIPE, etc. - int addr_type_; - - /// Number of bytes in the address. - int addr_size_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Addr.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_ADDR_H */ diff --git a/ace/Addr.i b/ace/Addr.i deleted file mode 100644 index dd5bcf64599..00000000000 --- a/ace/Addr.i +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Addr.i - -// Return the address of the address. - -ACE_INLINE void * -ACE_Addr::get_addr (void) const -{ - return 0; -} - -ACE_INLINE void -ACE_Addr::set_addr (void *, int) -{ -} - -ACE_INLINE int -ACE_Addr::operator == (const ACE_Addr &sap) const -{ - return (sap.addr_type_ == this->addr_type_ && - sap.addr_size_ == this->addr_size_ ); -} - -ACE_INLINE int -ACE_Addr::operator != (const ACE_Addr &sap) const -{ - return (sap.addr_type_ != this->addr_type_ || - sap.addr_size_ != this->addr_size_ ); -} - -// Return the size of the address. - -ACE_INLINE int -ACE_Addr::get_size (void) const -{ - return this->addr_size_; -} - -// Sets the size of the address. - -ACE_INLINE void -ACE_Addr::set_size (int size) -{ - this->addr_size_ = size; -} - -// Return the type of the address. - -ACE_INLINE int -ACE_Addr::get_type (void) const -{ - return this->addr_type_; -} - -// Set the type of the address. - -ACE_INLINE void -ACE_Addr::set_type (int type) -{ - this->addr_type_ = type; -} - -ACE_INLINE unsigned long -ACE_Addr::hash (void) const -{ - return 0; -} diff --git a/ace/Arg_Shifter.cpp b/ace/Arg_Shifter.cpp deleted file mode 100644 index d174b4b0ef7..00000000000 --- a/ace/Arg_Shifter.cpp +++ /dev/null @@ -1,207 +0,0 @@ -#include "ace/Arg_Shifter.h" -#include "ace/OS_String.h" -#include "ace/OS_Errno.h" -#include "ace/OS_Memory.h" - -ACE_RCSID (ace, - Arg_Shifter, - "$Id$") - - -ACE_Arg_Shifter::ACE_Arg_Shifter (int& argc, - const ACE_TCHAR** argv, - const ACE_TCHAR** temp) - : argc_ (argc), - total_size_ (argc), - temp_ (temp), - argv_ (argv), - current_index_ (0), - back_ (argc - 1), - front_ (0) -{ - this->init (); -} - -ACE_Arg_Shifter::ACE_Arg_Shifter (int& argc, - ACE_TCHAR** argv, - ACE_TCHAR** temp) - : argc_ (argc), - total_size_ (argc), - temp_ ((const ACE_TCHAR **) temp), - argv_ ((const ACE_TCHAR **) argv), - current_index_ (0), - back_ (argc - 1), - front_ (0) -{ - this->init (); -} - -void -ACE_Arg_Shifter::init (void) -{ - // If not provided with one, allocate a temporary array. - if (this->temp_ == 0) - ACE_NEW (this->temp_, - const ACE_TCHAR *[this->total_size_]); - - if (this->temp_ != 0) - { - // Fill the temporary array. - this->argc_ = 0; - for (int i = 0; i < this->total_size_; i++) - { - this->temp_[i] = this->argv_[i]; - this->argv_[i] = 0; - } - } - else - { - // Allocation failed, prohibit iteration. - this->current_index_ = this->argc_; - this->front_ = this->argc_; - } -} - -ACE_Arg_Shifter::~ACE_Arg_Shifter (void) -{ - // Delete the temporary vector. - delete [] temp_; -} - -const ACE_TCHAR * -ACE_Arg_Shifter::get_current (void) const -{ - const ACE_TCHAR * retval = 0; - - if (this->is_anything_left ()) - retval = this->temp_[current_index_]; - - return retval; -} - -const ACE_TCHAR * -ACE_Arg_Shifter::get_the_parameter (const ACE_TCHAR *flag) -{ - // the return 0's abound because this method - // would otherwise be a deep if { } else { } - - // check to see if any arguments still exist - if (!this->is_anything_left()) - return 0; - - // check to see if the flag is the argument - int offset = this->cur_arg_strncasecmp (flag); - if (offset == -1) - return 0; - - if (offset == 0) - { - this->consume_arg (); - - if (!this->is_parameter_next()) - { - return 0; - } - } - // the paramter is in the middle somewhere... - return this->temp_[current_index_] + offset; -} - -int -ACE_Arg_Shifter::cur_arg_strncasecmp (const ACE_TCHAR *flag) -{ - // Check for a current argument - if (this->is_anything_left()) - { - size_t flag_length = ACE_OS_String::strlen (flag); - - // Check for presence of the flag - if (ACE_OS_String::strncasecmp(this->temp_[current_index_], - flag, - flag_length) == 0) - { - if (ACE_OS_String::strlen(temp_[current_index_]) == - flag_length) - { - // match and lengths are equal - return 0; - } - else - { - // matches, with more info to boot! - size_t remaining = ACE_OS_String::strspn - (this->temp_[current_index_] + flag_length, - ACE_LIB_TEXT (" ")) + flag_length; - return ACE_static_cast (int, remaining); - } - } - } - // failure - return -1; -} - -int -ACE_Arg_Shifter::consume_arg (int number) -{ - int retval = 0; - - // Stick knowns at the end of the vector (consumed). - if (this->is_anything_left() >= number) - { - for (int i = 0, j = this->back_ - (number - 1); - i < number; - ++i, ++j, ++this->current_index_) - this->argv_[j] = this->temp_[this->current_index_]; - - this->back_ -= number; - retval = 1; - } - - return retval; -} - -int -ACE_Arg_Shifter::ignore_arg (int number) -{ - int retval = 0; - - // Keep unknowns at the head of the vector. - if (this->is_anything_left () >= number) - { - for (int i = 0; - i < number; - i++, this->current_index_++, this->front_++) - this->argv_[this->front_] = this->temp_[this->current_index_]; - - retval = 1; - this->argc_ += number; - } - - return retval; -} - -int -ACE_Arg_Shifter::is_anything_left (void) const -{ - return this->total_size_ - this->current_index_; -} - -int -ACE_Arg_Shifter::is_option_next (void) const -{ - return this->is_anything_left () && - this->temp_[this->current_index_][0] == '-'; -} - -int -ACE_Arg_Shifter::is_parameter_next (void) const -{ - return this->is_anything_left () - && this->temp_[this->current_index_][0] != '-'; -} - -int -ACE_Arg_Shifter::num_ignored_args (void) const -{ - return this->front_; -} diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h deleted file mode 100644 index 2e58b471043..00000000000 --- a/ace/Arg_Shifter.h +++ /dev/null @@ -1,204 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -//============================================================================= -/** - * @file Arg_Shifter.h - * - * $Id$ - * - * @author Seth Widoff - */ -//============================================================================= - -#ifndef ACE_ARG_SHIFTER_H -#define ACE_ARG_SHIFTER_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Arg_Shifter - * - * @brief This ADT operates on a specified set of arguments (@a argv). - * As known arguments are scanned, they are shifted to the back of the - * @a argv vector, so deeper levels of argument parsing can locate the yet - * unprocessed arguments at the beginning of the vector. - * - * The @c ACE_Arg_Shifter copies the pointers of the @a argv vector - * into a temporary array. As the @c ACE_Arg_Shifter iterates over - * the copied vector, it places known arguments in the rear of the - * vector, leaving the unknown ones in the beginning. So, after having - * visited all the arguments in the temporary vector, @c ACE_Arg_Shifter - * has placed all the unknown arguments in their original order at - * the front of original @a argv. - */ -class ACE_Export ACE_Arg_Shifter -{ -public: - // = Initialization and termination methods. - /** - * Initialize the ACE_Arg_Shifter to the vector over which to - * iterate. Optionally, also provide the temporary array for - * use in shifting the arguments. If ACE_Arg_Shifter must allocate - * the temporary vector internally and dynamic allocation fails, the - * ACE_Arg_Shifter will set all indicators to end of the vector, - * forbidding iteration. Following iteration over @a argv, the - * @a argc value will be updated to contain the number of - * unconsumed arguments. - * @param argc The number of strings in @a argv. @a argc will be - * updated to reflect the number of unconsumed arguments. - * @param argv The argument vector to shift. The string pointers in - * the vector will be reordered to place the @a argc unconsumed - * arguments at the front of the vector. - * @param temp A vector of @c ACE_TCHAR pointers at least @a argc - * elements long. The vector will be used for argument shifting as - * the specified @a argv vector is consumed. The vector must not - * be modified while this object exists. If this argument is 0 - * (the default) the object will allocate and free the temporary - * vector transparently. - */ - ACE_Arg_Shifter (int& argc, - const ACE_TCHAR **argv, - const ACE_TCHAR **temp = 0); - - /// Same behavior as the preceding constructor, but without the - /// "const" qualifier. - ACE_Arg_Shifter (int& argc, - ACE_TCHAR **argv, - ACE_TCHAR **temp = 0); - - /// Destructor. - ~ACE_Arg_Shifter (void); - - /// Get the current head of the vector. - const ACE_TCHAR *get_current (void) const; - - /** - * If the matches the current_arg of arg shifter - * this method will attempt to return the associated - * parameter value - * - * Safe to call without checking that a current arg exists - * - * In the following examples, a pointer to the char* "value" is ret - * - * eg: main -foobar value, main -FooBar value - * main -FOOBARvalue - * - * all of the above will all match the == -FooBar - * and will return a char* to "value" - * - * main -foobar 4 would succeed and return a char* to "4" - * main -foobar -4 does not succeed (-4 is not a parameter) - * but instead, would return 0 - * - * 0 is returned: - * If the current argument does not match flag - * If there is no parameter found after a 'matched' flag - * - * If the flag is matched and the flag and paramter DO NOT RUN - * together, the flag is consumed, the parameter is returned, - * and the new current argument is the parameter value. - * ie '-foobarflag VALUE' leaves the new cur arg == "VALUE" - * - * If the flag is matched and the flag and parameter RUN - * together '-foobarflagVALUE', the flag is NOT consumed - * and the cur arg is left pointing to the entire flag/value pair - */ - const ACE_TCHAR *get_the_parameter (const ACE_TCHAR* flag); - - /** - * Check if the current argument matches (case insensitive) - * - * ------------------------------------------------------------ - * - * Case A: Perfect Match (case insensitive) - * 0 is returned. - * - * ie: when current_arg = "-foobar" or "-FOOBAR" or "-fooBAR" - * this->cur_arg_strncasecmp ("-FooBar); - * will return 0 - * - * ------------------------------------------------------------ - * - * Case B: Perfect Match (case insensitive) but the current_arg - * is longer than the flag. Returns a number equal to the index - * in the char* indicating the start of the extra characters - * - * ie: when current_arg = "-foobar98023" - * this->cur_arg_strncasecmp ("-FooBar); - * will return 7 - * - * Notice: this number will always be > 0 - * - * ------------------------------------------------------------ - * - * Case C: If neither of Case A or B is met (no match) - * then -1 is returned - */ - int cur_arg_strncasecmp (const ACE_TCHAR *flag); - - /// Consume @a number argument(s) by sticking them/it on the end of - /// the vector. - int consume_arg (int number = 1); - - /// Place @a number arguments in the same relative order ahead of the - /// known arguments in the vector. - int ignore_arg (int number = 1); - - /// Returns the number of args left to see in the vector. - int is_anything_left (void) const; - - /// Returns 1 if there's a next item in the vector and it begins with - /// '-'. - int is_option_next (void) const; - - /// Returns 1 if there's a next item in the vector and it doesn't - /// begin with '-'. - int is_parameter_next (void) const; - - /// Returns the number of irrelevant args seen. - int num_ignored_args (void) const; - -private: - /// Copy Constructor should not be used. - ACE_Arg_Shifter (const ACE_Arg_Shifter&); - - /// Assignment '=' operator should not be used. - ACE_Arg_Shifter operator= (const ACE_Arg_Shifter&); - - /// Refactor the constructor logic. - void init (void); - - /// The size of the argument vector. - int& argc_; - - /// The size of argv_. - int total_size_; - - /// The temporary array over which we traverse. - const ACE_TCHAR **temp_; - - /// The array in which the arguments are reordered. - const ACE_TCHAR **argv_; - - /// The element in we're currently examining. - int current_index_; - - /// The index of in which we'll stick the next unknown - /// argument. - int back_; - - /// The index of in which we'll stick the next known - /// argument. - int front_; -}; - -#include "ace/post.h" - -#endif /* ACE_ARG_SHIFTER_H */ diff --git a/ace/Argv_Type_Converter.cpp b/ace/Argv_Type_Converter.cpp deleted file mode 100644 index 23ea5dd90ef..00000000000 --- a/ace/Argv_Type_Converter.cpp +++ /dev/null @@ -1,200 +0,0 @@ -// $Id$ - -#include "ace/Argv_Type_Converter.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Argv_Type_Converter.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID (ace, - Argv_Type_Converter, - "$Id$") - -#include "ace/OS_String.h" -#include "ace/OS_Errno.h" - -#if defined (ACE_USES_WCHAR) -ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int &argc, wchar_t** argv) - : saved_argc_ (argc) - , char_argv_ (0) - , wchar_argv_ (argv) - , before_pass_argc_ (argc) - , original_type_ (1) - , wchar_passed_ (0) - , char_passed_ (0) -{ - this->initialize (); - - for (int i = 0; i < argc; ++i) - { - this->char_argv_[i] = - ACE_OS_String::strdup (ACE_TEXT_ALWAYS_CHAR (argv[i])); - } -} -#endif // ACE_USES_WCHAR - - -ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int &argc, char** argv) - : saved_argc_(argc) - , char_argv_(argv) -#if defined (ACE_USES_WCHAR) - , wchar_argv_(0) - , before_pass_argc_(argc) - , original_type_(0) - , wchar_passed_(0) - , char_passed_(0) -{ - this->initialize(); - - for (int i = 0; i < argc; ++i) - { - this->wchar_argv_[i] = - ACE_OS_String::strdup (ACE_TEXT_ANTI_TO_TCHAR (argv[i])); - } -} -#else -{ -} -#endif // ACE_USES_WCHAR - -ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void) -{ -#if defined (ACE_USES_WCHAR) - // selectively delete the 'copy' of argv - if (this->original_type_) - { - // if original type is wchar_t - if (this->char_passed_) - { - this->align_wchar_with_char(); - } - for (int i = 0; i < this->before_pass_argc_; ++i) - { - delete [] this->char_argv_[i]; - } - delete [] this->char_argv_; - } - else - { - // if original type is char - if (this->wchar_passed_) { - this->align_char_with_wchar (); - } - for (int i = 0; i < this->before_pass_argc_; ++i) - { - delete [] this->wchar_argv_[i]; - } - delete [] this->wchar_argv_; - } -#endif // ACE_USES_WCHAR -} - -#if defined (ACE_USES_WCHAR) -void -ACE_Argv_Type_Converter::initialize (void) -{ - if (this->original_type_) - { // make a copy of argv in 'char' type - // Create one more argv entry than original argc for the NULL. - ACE_NEW (char_argv_, char*[this->saved_argc_ + 1]); - this->char_argv_[saved_argc_] = 0; // last entry of argv is - // always a NULL - } - else - { // make a copy of argv in 'wchar_t' type - ACE_NEW (this->wchar_argv_, wchar_t*[this->saved_argc_ + 1]); - this->wchar_argv_[saved_argc_] = 0; - } -} - - -void -ACE_Argv_Type_Converter::align_char_with_wchar (void) -{ - int wchar_argv_index = 0; - wchar_t* match_argv = this->wchar_argv_[0]; // pick the initial entry - - while (wchar_argv_index < this->saved_argc_) - { - // if n'th entries of both argv lists are different - if (ACE_OS_String::strcmp(this->char_argv_[wchar_argv_index], - ACE_TEXT_ALWAYS_CHAR (match_argv)) != 0) - { - // loop through the wchar argv list entries that are after - // wchar_argv_index - for (int i = wchar_argv_index + 1; i < before_pass_argc_; ++i) - { - if (ACE_OS_String::strcmp (this->char_argv_[i], - ACE_TEXT_ALWAYS_CHAR (match_argv)) - == 0) - { - // swap the pointers in the char argv list - char* temp = this->char_argv_[wchar_argv_index]; - this->char_argv_[wchar_argv_index] = this->char_argv_[i]; - this->char_argv_[i] = temp; - break; - } - } - } - - // move to the next wchar argv list entry - match_argv = this->wchar_argv_[++wchar_argv_index]; - } - - this->cleanup (); -} - -void -ACE_Argv_Type_Converter::align_wchar_with_char (void) -{ - int char_argv_index = 0; - char* match_argv = this->char_argv_[0]; // pick the initial entry - - while (char_argv_index < saved_argc_) - { - // if n'th entries of both argv lists are different - if (ACE_OS_String::strcmp ( - ACE_TEXT_ALWAYS_CHAR (this->wchar_argv_[char_argv_index]), - match_argv) != 0) - { - // loop through the wchar argv list entries that are after - // wchar_argv_index - for (int i = char_argv_index + 1; i < this->before_pass_argc_; ++i) - { - if (ACE_OS_String::strcmp ( - ACE_TEXT_ALWAYS_CHAR(this->wchar_argv_[i]), - match_argv) == 0) { - // swap the pointers in the char argv list - wchar_t* temp = this->wchar_argv_[char_argv_index]; - this->wchar_argv_[char_argv_index] = this->wchar_argv_[i]; - this->wchar_argv_[i] = temp; - break; - } - } - } - - // move to the next wchar argv list entry - match_argv = this->char_argv_[++char_argv_index]; - } - - this->cleanup(); -} - -void -ACE_Argv_Type_Converter::cleanup (void) -{ - for (int i = this->saved_argc_; i < this->before_pass_argc_; ++i) - { - delete [] this->char_argv_[i]; - delete [] this->wchar_argv_[i]; - - this->char_argv_[i] = 0; - this->wchar_argv_[i] = 0; - } - - this->before_pass_argc_ = this->saved_argc_; - - this->wchar_passed_ = 0; - this->char_passed_ = 0; -} -#endif // ACE_USES_WCHAR diff --git a/ace/Argv_Type_Converter.h b/ace/Argv_Type_Converter.h deleted file mode 100644 index 5d662d57733..00000000000 --- a/ace/Argv_Type_Converter.h +++ /dev/null @@ -1,116 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Argv_Type_Converter.h - * - * $Id$ - * - * @author Si Mong Park - */ -//============================================================================= - -#ifndef ACE_ARGV_TYPE_CONVERTER_H -#define ACE_ARGV_TYPE_CONVERTER_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" -#include "ace/OS_Memory.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -/** - * @class ACE_Argv_Type_Converter - * - * @brief To convert 'char' input/command line parameter to 'wchar_t'. - * - * This class is to convert 'char' type command line paramter to - * wide-character (wchar_t) format and stores the copy of it. - * This is useful for all classes that use 'char**' argv but cannot - * be converted into 'ACE_TCHAR**' version. - * Note that the converted data will be lost upon destruction, so - * classes should use this class as their data member. - */ -class ACE_Export ACE_Argv_Type_Converter -{ -public: - - ACE_Argv_Type_Converter (int &argc, char** argv); - -#if defined (ACE_USES_WCHAR) - ACE_Argv_Type_Converter (int &argc, wchar_t** argv); -#endif // ACE_USES_WCHAR - - ~ACE_Argv_Type_Converter (void); - - /// Returns the pointer of converted command line. - ACE_TCHAR** get_TCHAR_argv (void); - - /// Returns the pointer of ASCII (char) command line. - char** get_ASCII_argv (void); - - /// Returns the number of sub paramters (argc). - int& get_argc (void); - -private: - - /// Copy Constructor should not be used. - ACE_Argv_Type_Converter (const ACE_Argv_Type_Converter&); - - /// Assignment '=' operator should not be used. - ACE_Argv_Type_Converter operator= (const ACE_Argv_Type_Converter&); - -#if defined (ACE_USES_WCHAR) - - /// Perform common initialization for two Ctor's. - void initialize (void); - - /// Align all entries in the char type argv list with wchar_t type - /// argv list. - void align_char_with_wchar (void); - - /// Align all entries in the wchar_t type argv list with char type - /// argv list. - void align_wchar_with_char (void); - - /// Clean up removed (comsumed) argv entries and reset the pass flags. - void cleanup (void); -#endif // ACE_USES_WCHAR - -private: - /// Original number of input paramter, same as 'argc'. - int &saved_argc_; - - /// Data member pointer that contains converted argv in ACE_ANTI_TCHAR. - char** char_argv_; - -#if defined (ACE_USES_WCHAR) - /// Data member pointer that contains converted argv in ACE_TCHAR. - wchar_t** wchar_argv_; - - /// argc value before any argv has been passed. - int before_pass_argc_; - - /// FALSE represents original argv passed in is char, and TRUE - /// represents wchar_t. - const int original_type_; - - /// TRUE indicates wchar_t type argv has been passed. - int wchar_passed_; - - /// TRUE indicates char type argv has been passed. - int char_passed_; -#endif /* ACE_USES_WCHAR */ -}; - -#if defined (__ACE_INLINE__) -#include "ace/Argv_Type_Converter.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_ARGV_TYPE_CONVERTER_H */ diff --git a/ace/Argv_Type_Converter.inl b/ace/Argv_Type_Converter.inl deleted file mode 100644 index 16c657ce864..00000000000 --- a/ace/Argv_Type_Converter.inl +++ /dev/null @@ -1,41 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - - -ACE_INLINE ACE_TCHAR** -ACE_Argv_Type_Converter::get_TCHAR_argv (void) -{ -#if defined (ACE_USES_WCHAR) - if (this->char_passed_) - { - this->align_wchar_with_char (); - } - - this->wchar_passed_ = true; - return this->wchar_argv_; -#else - return this->char_argv_; -#endif // ACE_USES_WCHAR -} - -ACE_INLINE char** -ACE_Argv_Type_Converter::get_ASCII_argv (void) -{ -#if defined (ACE_USES_WCHAR) - if (this->wchar_passed_) - { - this->align_char_with_wchar (); - } - - this->char_passed_ = 1; -#endif // ACE_USES_WCHAR - - return this->char_argv_; -} - -ACE_INLINE int& -ACE_Argv_Type_Converter::get_argc (void) -{ - return this->saved_argc_; -} diff --git a/ace/Array.h b/ace/Array.h deleted file mode 100644 index d699ae0fd47..00000000000 --- a/ace/Array.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Array.h - * - * $Id$ - * - * NOTE: this file has been deprecated and will soon go away. You - * should directly include "Containers_T.h" instead. - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_ARRAY_H -#define ACE_ARRAY_H -#include "ace/pre.h" - -#include "ace/Containers_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/post.h" -#endif /* ACE_ARRAY_H */ diff --git a/ace/Array_Base.cpp b/ace/Array_Base.cpp deleted file mode 100644 index 7914a135c2d..00000000000 --- a/ace/Array_Base.cpp +++ /dev/null @@ -1,204 +0,0 @@ -// $Id$ - -#ifndef ACE_ARRAY_BASE_C -#define ACE_ARRAY_BASE_C - -#include "ace/Malloc_Base.h" -#include "ace/Array_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Array_Base.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Array_Base, "$Id$") - - -// Dynamically initialize an array. - -template -ACE_Array_Base::ACE_Array_Base (size_t size, - ACE_Allocator *alloc) - : max_size_ (size), - cur_size_ (size), - allocator_ (alloc) -{ - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - if (size != 0) - { - ACE_ALLOCATOR (this->array_, - (T *) this->allocator_->malloc (size * sizeof (T))); - for (size_t i = 0; i < size; ++i) - new (&array_[i]) T; - } - else - this->array_ = 0; -} - -template -ACE_Array_Base::ACE_Array_Base (size_t size, - const T &default_value, - ACE_Allocator *alloc) - : max_size_ (size), - cur_size_ (size), - allocator_ (alloc) -{ - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - if (size != 0) - { - ACE_ALLOCATOR (this->array_, - (T *) this->allocator_->malloc (size * sizeof (T))); - for (size_t i = 0; i < size; ++i) - new (&array_[i]) T (default_value); - } - else - this->array_ = 0; -} - -// The copy constructor (performs initialization). - -template -ACE_Array_Base::ACE_Array_Base (const ACE_Array_Base &s) - : max_size_ (s.size ()), - cur_size_ (s.size ()), - allocator_ (s.allocator_) -{ - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_ALLOCATOR (this->array_, - (T *) this->allocator_->malloc (s.size () * sizeof (T))); - for (size_t i = 0; i < this->size (); i++) - new (&this->array_[i]) T (s.array_[i]); -} - -// Assignment operator (performs assignment). - -template void -ACE_Array_Base::operator= (const ACE_Array_Base &s) -{ - // Check for "self-assignment". - - if (this != &s) - { - if (this->max_size_ < s.size ()) - { - ACE_DES_ARRAY_FREE (this->array_, - this->max_size_, - this->allocator_->free, - T); - ACE_ALLOCATOR (this->array_, - (T *) this->allocator_->malloc (s.size () * sizeof (T))); - this->max_size_ = s.size (); - } - else - { - ACE_DES_ARRAY_NOFREE (this->array_, - s.size (), - T); - } - - this->cur_size_ = s.size (); - - for (size_t i = 0; i < this->size (); i++) - new (&this->array_[i]) T (s.array_[i]); - } -} - -// Set an item in the array at location slot. - -template int -ACE_Array_Base::set (const T &new_item, size_t slot) -{ - if (this->in_range (slot)) - { - this->array_[slot] = new_item; - return 0; - } - else - return -1; -} - -// Get an item in the array at location slot. - -template int -ACE_Array_Base::get (T &item, size_t slot) const -{ - if (this->in_range (slot)) - { - // Copies the item. If you don't want to copy, use operator [] - // instead (but then you'll be responsible for range checking). - item = this->array_[slot]; - return 0; - } - else - return -1; -} - -template int -ACE_Array_Base::max_size (size_t new_size) -{ - if (new_size > this->max_size_) - { - T *tmp; - - ACE_ALLOCATOR_RETURN (tmp, - (T *) this->allocator_->malloc (new_size * sizeof (T)), - -1); - for (size_t i = 0; i < this->cur_size_; ++i) - new (&tmp[i]) T (this->array_[i]); - - // Initialize the new portion of the array that exceeds the - // previously allocated section. - for (size_t j = this->cur_size_; j < new_size; j++) - new (&tmp[j]) T; - - ACE_DES_ARRAY_FREE (this->array_, - this->max_size_, - this->allocator_->free, - T); - this->array_ = tmp; - this->max_size_ = new_size; - this->cur_size_ = new_size; - } - - return 0; -} - -template int -ACE_Array_Base::size (size_t new_size) -{ - int r = this->max_size (new_size); - if (r != 0) - return r; - this->cur_size_ = new_size; - return 0; -} - -// **************************************************************** - -template int -ACE_Array_Iterator::next (T *&item) -{ - // ACE_TRACE ("ACE_Array_Iterator::next"); - - if (this->done ()) - { - item = 0; - return 0; - } - else - { - item = &array_[current_]; - return 1; - } -} - -#endif /* ACE_ARRAY_BASE_C */ diff --git a/ace/Array_Base.h b/ace/Array_Base.h deleted file mode 100644 index 5da6ea346ae..00000000000 --- a/ace/Array_Base.h +++ /dev/null @@ -1,210 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Array_Base.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_ARRAY_BASE_H -#define ACE_ARRAY_BASE_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Global_Macros.h" -#include "ace/OS.h" -#include "ace/Malloc_Base.h" - -// Forward declaration. -template class ACE_Array_Iterator; - -/** - * @class ACE_Array_Base - * - * @brief Implement a simple dynamic array - * - * This parametric class implements a simple dynamic array; - * resizing must be controlled by the user. No comparison or find - * operations are implemented. - */ -template -class ACE_Array_Base -{ -public: - - // Define a "trait" - typedef T TYPE; - typedef ACE_Array_Iterator ITERATOR; - - // = Initialization and termination methods. - - /// Dynamically create an uninitialized array. - ACE_Array_Base (size_t size = 0, - ACE_Allocator *alloc = 0); - - /// Dynamically initialize the entire array to the . - ACE_Array_Base (size_t size, - const T &default_value, - ACE_Allocator *alloc = 0); - - /** - * The copy constructor performs initialization by making an exact - * copy of the contents of parameter , i.e., *this == s will - * return true. - */ - ACE_Array_Base (const ACE_Array_Base &s); - - /** - * Assignment operator performs an assignment by making an exact - * copy of the contents of parameter , i.e., *this == s will - * return true. Note that if the of is >= than - * we can copy it without reallocating. However, if - * is < we must delete the , - * reallocate a new , and then copy the contents of . - */ - void operator= (const ACE_Array_Base &s); - - /// Clean up the array (e.g., delete dynamically allocated memory). - ~ACE_Array_Base (void); - - // = Set/get methods. - - /// Set item in the array at location . Doesn't - /// perform range checking. - T &operator [] (size_t slot); - - /// Get item in the array at location . Doesn't - /// perform range checking. - const T &operator [] (size_t slot) const; - - /// Set an item in the array at location . Returns - /// -1 if is not in range, else returns 0. - int set (const T &new_item, size_t slot); - - /** - * Get an item in the array at location . Returns -1 if - * is not in range, else returns 0. Note that this function - * copies the item. If you want to avoid the copy, you can use - * the const operator [], but then you'll be responsible for range checking. - */ - int get (T &item, size_t slot) const; - - /// Returns the of the array. - size_t size (void) const; - - /** - * Changes the size of the array to match . - * It copies the old contents into the new array. - * Return -1 on failure. - */ - int size (size_t new_size); - - /// Returns the of the array. - size_t max_size (void) const; - - /** - * Changes the size of the array to match . - * It copies the old contents into the new array. - * Return -1 on failure. - * It does not affect new_size - */ - int max_size (size_t new_size); - -private: - /// Returns 1 if is within range, i.e., 0 >= < - /// , else returns 0. - int in_range (size_t slot) const; - - /// Maximum size of the array, i.e., the total number of elements - /// in . - size_t max_size_; - - /** - * Current size of the array. This starts out being == to - * . However, if we are assigned a smaller array, then - * will become less than . The purpose of - * keeping track of both sizes is to avoid reallocating memory if we - * don't have to. - */ - size_t cur_size_; - - /// Pointer to the array's storage buffer. - T *array_; - - /// Allocation strategy of the ACE_Array_Base. - ACE_Allocator *allocator_; - - friend class ACE_Array_Iterator; -}; - -// **************************************************************** - -/** - * @class ACE_Array_Iterator - * - * @brief Implement an iterator over an ACE_Array. - * - * This iterator is safe in the face of array element deletions. - * But it is NOT safe if the array is resized (via the ACE_Array - * assignment operator) during iteration. That would be very - * odd, and dangerous. - */ -template -class ACE_Array_Iterator -{ -public: - // = Initialization method. - ACE_Array_Iterator (ACE_Array_Base &); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the Array. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the Array. Returns 0 when all the - /// items in the Array have been seen, else 1. - int advance (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Pointer to the current item in the iteration. - size_t current_; - - /// Pointer to the Array we're iterating over. - ACE_Array_Base &array_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Array_Base.inl" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Array_Base.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Array_Base.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_ARRAY_BASE_H */ diff --git a/ace/Array_Base.inl b/ace/Array_Base.inl deleted file mode 100644 index b682fec615f..00000000000 --- a/ace/Array_Base.inl +++ /dev/null @@ -1,84 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Clean up the array (e.g., delete dynamically allocated memory). - -template ACE_INLINE -ACE_Array_Base::~ACE_Array_Base (void) -{ - ACE_DES_ARRAY_FREE (this->array_, - this->max_size_, - this->allocator_->free, - T); -} - -template ACE_INLINE size_t -ACE_Array_Base::size (void) const -{ - return this->cur_size_; -} - -template ACE_INLINE size_t -ACE_Array_Base::max_size (void) const -{ - return this->max_size_; -} - -template ACE_INLINE int -ACE_Array_Base::in_range (size_t index) const -{ - return index < this->cur_size_; -} - -template ACE_INLINE T & -ACE_Array_Base::operator[] (size_t index) -{ - return this->array_[index]; -} - -template ACE_INLINE const T & -ACE_Array_Base::operator[] (size_t index) const -{ - return this->array_[index]; -} - -// **************************************************************** - -template ACE_INLINE void -ACE_Array_Iterator::dump (void) const -{ - // ACE_TRACE ("ACE_Array_Iterator::dump"); -} - -template ACE_INLINE -ACE_Array_Iterator::ACE_Array_Iterator (ACE_Array_Base &a) - : current_ (0), - array_ (a) -{ - // ACE_TRACE ("ACE_Array_Iterator::ACE_Array_Iterator"); -} - -template ACE_INLINE int -ACE_Array_Iterator::advance (void) -{ - // ACE_TRACE ("ACE_Array_Iterator::advance"); - - if (this->current_ < array_.size ()) - { - ++this->current_; - return 1; - } - else - { - // Already finished iterating. - return 0; - } -} - -template ACE_INLINE int -ACE_Array_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Array_Iterator::done"); - - return this->current_ >= array_.size (); -} diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp deleted file mode 100644 index 88c867ebada..00000000000 --- a/ace/Asynch_Acceptor.cpp +++ /dev/null @@ -1,461 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_ASYNCH_ACCEPTOR_C -#define ACE_ASYNCH_ACCEPTOR_C - -#include "ace/Asynch_Acceptor.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Asynch_Acceptor, "$Id$") - -#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) -// This only works on platforms that support async i/o. - -#include "ace/OS.h" -#include "ace/Log_Msg.h" -#include "ace/Message_Block.h" -#include "ace/INET_Addr.h" -#include "ace/SOCK_Stream.h" -#include "ace/Sock_Connect.h" -#include "ace/Trace.h" - -template -ACE_Asynch_Acceptor::ACE_Asynch_Acceptor (void) - : listen_handle_ (ACE_INVALID_HANDLE), - pass_addresses_ (0), - validate_new_connection_ (0), - reissue_accept_ (1), - bytes_to_read_ (0) -{ -} - -template -ACE_Asynch_Acceptor::~ACE_Asynch_Acceptor (void) -{ - //this->asynch_accept_.close (); - - // Close down the listen socket - // if (this->listen_handle_ != ACE_INVALID_HANDLE) - // ACE_OS::closesocket (this->listen_handle_); -} - -template int -ACE_Asynch_Acceptor::open (const ACE_INET_Addr &address, - size_t bytes_to_read, - int pass_addresses, - int backlog, - int reuse_addr, - ACE_Proactor *proactor, - int validate_new_connection, - int reissue_accept, - int number_of_initial_accepts) -{ - ACE_TRACE ("ACE_Asynch_Acceptor<>::open"); - - this->proactor (proactor); - this->pass_addresses_ = pass_addresses; - this->bytes_to_read_ = bytes_to_read; - this->validate_new_connection_ = validate_new_connection; - this->reissue_accept_ = reissue_accept; - - // Create the listener socket - this->listen_handle_ = ACE_OS::socket (address.get_type (), SOCK_STREAM, 0); - if (this->listen_handle_ == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_OS::socket")), - -1); - // Initialize the ACE_Asynch_Accept - if (this->asynch_accept_.open (*this, - this->listen_handle_, - 0, - this->proactor ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Accept::open")), - -1); - if (reuse_addr) - { - // Reuse the address - int one = 1; - if (ACE_OS::setsockopt (this->listen_handle_, - SOL_SOCKET, - SO_REUSEADDR, - (const char*) &one, - sizeof one) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_OS::setsockopt")), - -1); - } - - // If port is not specified, bind to any port. - static ACE_INET_Addr sa (ACE_sap_any_cast (const ACE_INET_Addr &)); - - if (address == sa && - ACE_Sock_Connect::bind_port (this->listen_handle_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::bind_port")), - -1); - - // Bind to the specified port. - if (ACE_OS::bind (this->listen_handle_, - ACE_reinterpret_cast (sockaddr *, - address.get_addr ()), - address.get_size ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "ACE_OS::bind"), - -1); - - // Start listening. - if (ACE_OS::listen (this->listen_handle_, backlog) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "ACE_OS::listen"), - -1); - - // For the number of . - if (number_of_initial_accepts == -1) - number_of_initial_accepts = backlog; - - for (int i = 0; i < number_of_initial_accepts; i++) - // Initiate accepts. - if (this->accept (bytes_to_read) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "ACE_Asynch_Acceptor::accept"), - -1); - return 0; -} - -template void -ACE_Asynch_Acceptor::set_handle (ACE_HANDLE listen_handle) -{ - ACE_TRACE ("ACE_Asynch_Acceptor<>::set_handle"); - - // Take ownership of the - this->listen_handle_ = listen_handle; - - // Reinitialize the ACE_Asynch_Accept - if (this->asynch_accept_.open (*this, - this->listen_handle_, - 0, - this->proactor ()) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Accept::open"))); -} - -template ACE_HANDLE -ACE_Asynch_Acceptor::get_handle (void) const -{ - return this->listen_handle_; -} - -template int -ACE_Asynch_Acceptor::accept (size_t bytes_to_read, const void *act) -{ - ACE_TRACE ("ACE_Asynch_Acceptor<>::accept"); - - ACE_Message_Block *message_block = 0; - size_t space_needed = bytes_to_read + 2 * this->address_size (); - - // Create a new message block big enough for the addresses and data - ACE_NEW_RETURN (message_block, - ACE_Message_Block (space_needed), - -1); - - // Initiate asynchronous accepts - if (this->asynch_accept_.accept (*message_block, - bytes_to_read, - ACE_INVALID_HANDLE, - act) == -1) - { - // Cleanup on error - message_block->release (); - return -1; - } - return 0; -} - -template void -ACE_Asynch_Acceptor::handle_accept (const ACE_Asynch_Accept::Result &result) -{ -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || defined (ACE_HAS_AIO_CALLS) - - ACE_TRACE ("ACE_Asynch_Acceptor<>::handle_accept"); - - // Variable for error tracking - int error = 0; - - // If the asynchronous accept fails. - if (!result.success () || - result.accept_handle() == ACE_INVALID_HANDLE ) - { - error = 1; - } - -#if !defined (ACE_HAS_AIO_CALLS) - // In order to use accept handle with other Window Sockets 1.1 - // functions, we call the setsockopt function with the - // SO_UPDATE_ACCEPT_CONTEXT option. This option initializes the - // socket so that other Windows Sockets routines to access the - // socket correctly. - if (!error && - ACE_OS::setsockopt (result.accept_handle (), - SOL_SOCKET, - SO_UPDATE_ACCEPT_CONTEXT, - (char *) &this->listen_handle_, - sizeof (this->listen_handle_)) == -1) - { - error = 1; - } -#endif /* ACE_HAS_AIO_CALLS */ - - // Parse address. - ACE_INET_Addr local_address; - ACE_INET_Addr remote_address; - if (!error && - (this->validate_new_connection_ || this->pass_addresses_)) - // Parse the addresses. - this->parse_address (result, - remote_address, - local_address); - - // Validate remote address - if (!error && - this->validate_new_connection_ && - (this->validate_connection (result, remote_address, local_address) == -1 - || this->validate_new_connection (remote_address) == -1)) - { - error = 1; - } - - HANDLER *new_handler = 0; - if (!error) - { - // The Template method - new_handler = this->make_handler (); - if (new_handler == 0) - { - error = 1; - } - } - - // If no errors - if (!error) - { - // Update the Proactor. - new_handler->proactor (this->proactor ()); - - // Pass the addresses - if (this->pass_addresses_) - new_handler->addresses (remote_address, - local_address); - - // Pass the ACT - if (result.act () != 0) - new_handler->act (result.act ()); - - // Set up the handler's new handle value - new_handler->handle (result.accept_handle ()); - - // Initiate the handler - new_handler->open (result.accept_handle (), - result.message_block ()); - } - - // On failure, no choice but to close the socket - if (error && - result.accept_handle() != ACE_INVALID_HANDLE ) - ACE_OS::closesocket (result.accept_handle ()); - - // Delete the dynamically allocated message_block - result.message_block ().release (); - - // Start off another asynchronous accept to keep the backlog going - if (this->should_reissue_accept ()) - this->accept (this->bytes_to_read_); -#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || defined (ACE_HAS_AIO_CALLS */ -} - -template int -ACE_Asynch_Acceptor::validate_connection - (const ACE_Asynch_Accept::Result& /* result */, - const ACE_INET_Addr& /* remote */, - const ACE_INET_Addr& /* local */) -{ - // Default implementation always validates the remote address. - return 0; -} - -template int -ACE_Asynch_Acceptor::validate_new_connection (const ACE_INET_Addr&) -{ - // Default implementation always validates the remote address. - return 0; -} - -template int -ACE_Asynch_Acceptor::cancel (void) -{ - ACE_TRACE ("ACE_Asynch_Acceptor<>::cancel"); - - // All I/O operations that are canceled will complete with the error - // ERROR_OPERATION_ABORTED. All completion notifications for the I/O - // operations will occur normally. -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \ - && ( (defined (_MSC_VER) && (_MSC_VER > 1020)) \ - || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))) - return (int) ::CancelIo (this->listen_handle_); -#else - //ACE_NOTSUP_RETURN (-1); - // Supported now - return this->asynch_accept_.cancel(); - -#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && ((defined (_MSC_VER) && (_MSC_VER > 1020)) || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))) */ -} - -template void -ACE_Asynch_Acceptor::parse_address (const - ACE_Asynch_Accept::Result &result, - ACE_INET_Addr &remote_address, - ACE_INET_Addr &local_address) -{ - ACE_TRACE ("ACE_Asynch_Acceptor<>::parse_address"); - -#if defined (ACE_HAS_AIO_CALLS) - - // Use an ACE_SOCK to get the addresses - it knows how to deal with - // ACE_INET_Addr objects and get IPv4/v6 addresses. - ACE_SOCK_Stream str (result.accept_handle ()); - str.get_local_addr (local_address); - str.get_remote_addr (remote_address); - -#elif (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) - - ACE_Message_Block &message_block = result.message_block (); - - sockaddr *local_addr = 0; - sockaddr *remote_addr = 0; - int local_size = 0; - int remote_size = 0; - - ::GetAcceptExSockaddrs (message_block.rd_ptr (), - ACE_static_cast (DWORD, this->bytes_to_read_), - ACE_static_cast (DWORD, this->address_size ()), - ACE_static_cast (DWORD, this->address_size ()), - &local_addr, - &local_size, - &remote_addr, - &remote_size); - - local_address.set (ACE_reinterpret_cast (sockaddr_in *, local_addr), - local_size); - remote_address.set (ACE_reinterpret_cast (sockaddr_in *, remote_addr), - remote_size); -#else - // just in case - errno = ENOTSUP; -#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */ - return; -} - -template ACE_HANDLE -ACE_Asynch_Acceptor::handle (void) const -{ - return this->listen_handle_; -} - -template void -ACE_Asynch_Acceptor::handle (ACE_HANDLE h) -{ - ACE_Handler::handle (h); -} - -template ACE_Asynch_Accept & -ACE_Asynch_Acceptor::asynch_accept (void) -{ - return this->asynch_accept_; -} - -template HANDLER * -ACE_Asynch_Acceptor::make_handler (void) -{ - // Default behavior - HANDLER *handler = 0; - ACE_NEW_RETURN (handler, - HANDLER, - 0); - return handler; -} - -/* static */ -template size_t -ACE_Asynch_Acceptor::address_size (void) -{ - return sizeof (sockaddr) + sizeof (sockaddr_in); -} - -template int -ACE_Asynch_Acceptor::pass_addresses (void) const -{ - return this->pass_addresses_; -} - -template void -ACE_Asynch_Acceptor::pass_addresses (int new_value) -{ - this->pass_addresses_ = new_value; -} - -template int -ACE_Asynch_Acceptor::validate_new_connection (void) const -{ - return this->validate_new_connection_; -} - -template void -ACE_Asynch_Acceptor::validate_new_connection (int new_value) -{ - this->validate_new_connection_ = new_value; -} - -template int -ACE_Asynch_Acceptor::reissue_accept (void) const -{ - return this->reissue_accept_; -} - -template void -ACE_Asynch_Acceptor::reissue_accept (int new_value) -{ - this->reissue_accept_ = new_value; -} - -template size_t -ACE_Asynch_Acceptor::bytes_to_read (void) const -{ - return this->bytes_to_read_; -} - -template void -ACE_Asynch_Acceptor::bytes_to_read (size_t new_value) -{ - this->bytes_to_read_ = new_value; -} - -template int -ACE_Asynch_Acceptor::should_reissue_accept (void) -{ - return this->reissue_accept_; -} - -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ -#endif /* ACE_ASYNCH_ACCEPTOR_C */ diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h deleted file mode 100644 index aadffaa11de..00000000000 --- a/ace/Asynch_Acceptor.h +++ /dev/null @@ -1,286 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Asynch_Acceptor.h - * - * $Id$ - * - * @author Irfan Pyarali (irfan@cs.wustl.edu) - */ -//============================================================================= - -#ifndef ACE_ASYNCH_ACCEPTOR_H -#define ACE_ASYNCH_ACCEPTOR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) -// This only works on platforms that support async i/o. - -#include "ace/Default_Constants.h" -#include "ace/Asynch_IO.h" - -// Forward declarations -class ACE_Message_Block; -class ACE_INET_Addr; - -/** - * @class ACE_Asynch_Acceptor - * - * @brief This class is an example of the Acceptor Pattern. This class - * will accept new connections and create new HANDLER to handle - * the new connections. - * - * Unlike the , however, this class is designed to - * be used asynchronously. - */ -template -class ACE_Asynch_Acceptor : public ACE_Handler -{ -public: - /// A do nothing constructor. - ACE_Asynch_Acceptor (void); - - /// Virtual destruction - virtual ~ACE_Asynch_Acceptor (void); - - /** - * @c open starts one or more asynchronous accept requests on a - * @a address. Each accept operation may optionally read an - * initial buffer from the new connection when accepted. - * - * @param address The address to listen/accept connections on. - * If the address does not specify a port, a random - * port is selected and bound. - * @param bytes_to_read Optional, specifies the maximum number of bytes - * to read with the accept. The buffer for the initial - * data is allocated internally and passed to the - * @c ACE_Service_Handler::open() hook method. It is - * legitimate only during the @c open() method and must - * be copied if required after @c open() returns. - * This pre-read function works only on Windows. - * @param pass_addresses Optional, a non-zero value indicates that - * the local and peer addresses should be passed to the - * associated @c ACE_Service_Handler::addresses() method - * after any call to @c validate_new_connection() and prior - * to the @c open() hook method call. - * @param backlog Optional, defaulting to @c ACE_DEFAULT_BACKLOG (which - * can be adjusted in your platform's @c config.h file). - * Specifies the listening backlog for the listening socket. - * @param reuse_addr Optional, indicates whether the @c SO_REUSEADDR - * option is set on the listening socket or not. - * @param proactor Optional, pointer to the @c ACE_Proactor to use for - * demultiplexing asynchronous accepts. If 0, the - * process's singleton @c ACE_Proactor is used. - * @param validate_new_connection Optional, if non-zero, this object's - * @c validate_connection() method is called after - * the accept completes, but before the service handler's - * @c open() hook method is called. If @c - * validate_connection() returns -1, the newly-accepted - * socket is immediately closed, and the @c addresses() - * method is not called. - * @param reissue_accept Optional, if non-zero (the default), a new - * asynchronous accept operation is started after each - * completion, whether the completion is for success or - * failure, and whether or not a successfully-accepted - * connection is subsequently refused. - * @param number_of_initial_accepts Optional, the number of asynchronous - * accepts that are started immediately. If -1 (the - * default), the value of @a backlog is used. - * - * @note On Windows, the peer address is only available at the time - * the connection is accepted. Therefore, if you require the peer - * address on Windows, do not rely on the - * @c ACE_SOCK::get_remote_addr() method - it won't work. You must - * supply a non-zero value for @a pass_addresses and obtain the - * peer address in the @c ACE_Service_Handler::addresses() method. - * - * @see ACE_INET_Addr - * @see ACE_Service_Handler - */ - virtual int open (const ACE_INET_Addr &address, - size_t bytes_to_read = 0, - int pass_addresses = 0, - int backlog = ACE_DEFAULT_BACKLOG, - int reuse_addr = 1, - ACE_Proactor *proactor = 0, - int validate_new_connection = 0, - int reissue_accept = 1, - int number_of_initial_accepts = -1); - - /// Get the underlying handle. - virtual ACE_HANDLE get_handle (void) const; - - /** - * Set the underlying listen handle. It is the user's responsibility - * to make sure that the old listen handle has been appropriately - * closed and the all outstanding asynchronous operations have - * either completed or have been canceled on the old listen handle. - */ - virtual void set_handle (ACE_HANDLE handle); - - /// This initiates a new asynchronous accept operation. - /** - * You need only call this method if the @a reissue_accept argument - * passed to @c open() was 0. - */ - virtual int accept (size_t bytes_to_read = 0, const void *act = 0); - - /** - * Cancels all pending accepts operations issued by this object. - * - * @note On Windows, only accept operations initiated by the calling thread - * are canceled. - */ - virtual int cancel (void); - - /** - * Template method to validate peer before service is opened. - * This method is called after a new connection is accepted if the - * @a validate_connection argument to @c open() was non-zero or - * the @c validate_new_connection() method is called to turn this - * feature on. The default implementation returns 0. Users can - * reimplement this method to perform validation of the peer - * using it's address, running an authentication procedure (such as - * SSL) or anything else necessary or desireable. The return value - * from this method determines whether or not ACE will continue - * opening the service or abort the connection. - * - * @param result Result of the connection acceptance. - * @param remote Peer's address. - * @param local Local address connection was accepted at. - * - * @retval -1 ACE_Asynch_Acceptor will close the connection, and - * the service will not be opened. - * @retval 0 Service opening will proceeed. - */ - virtual int validate_connection (const ACE_Asynch_Accept::Result& result, - const ACE_INET_Addr &remote, - const ACE_INET_Addr& local); - - /** - * @deprecated Use validate_connection() instead. Will be removed after - * ACE 5.3. - * - * Template method for address validation. - * - * This hook method is called after a connection is accepted if - * so specified on the call to the @c open() method. If this - * method returns -1, the connection is immediately closed and - * the service handler is not opened. - * - * The default implemenation always return 0. - */ - virtual int validate_new_connection (const ACE_INET_Addr &remote_address); - - /** - * Template method for deciding whether to reissue accept. - * - * This hook method is called after each accept completes to decide if - * another accept should be initiated. If the method returns a non-zero - * value, another accept is initiated. - * - * The default implemenation always returns the value passed as the - * @c open() method's @a reissue_accept argument. That value can also - * be changed using the @c reissue_accept() method. - */ - virtual int should_reissue_accept (void); - - // - // These are low level tweaking methods - // - - /// Get flag that indicates if parsing and passing of addresses to - /// the service_handler is necessary. - virtual int pass_addresses (void) const; - - /// Set flag that indicates if parsing and passing of addresses to - /// the service_handler is necessary. - virtual void pass_addresses (int new_value); - - /// Get flag that indicates if address validation is required. - virtual int validate_new_connection (void) const; - - /// Set flag that indicates if address validation is required. - virtual void validate_new_connection (int new_value); - - /// Get flag that indicates if a new accept should be reissued when a accept - /// completes. - virtual int reissue_accept (void) const; - - /// Set flag that indicates if a new accept should be reissued when a accept - /// completes. - virtual void reissue_accept (int new_value); - - /// Get bytes to be read with the call. - virtual size_t bytes_to_read (void) const; - - /// Set bytes to be read with the call. - virtual void bytes_to_read (size_t new_value); - - /// This is required by the AcceptEx call. - static size_t address_size (void); - -protected: - - /// This is called when an outstanding accept completes. - virtual void handle_accept (const ACE_Asynch_Accept::Result &result); - - /// Return the listen handle. - ACE_HANDLE handle (void) const; - /// Set the listen handle. - void handle (ACE_HANDLE h); - - /// This parses the address from read buffer. - void parse_address (const ACE_Asynch_Accept::Result &result, - ACE_INET_Addr &remote_address, - ACE_INET_Addr &local_address); - - /// Return the asynch accept object. - ACE_Asynch_Accept &asynch_accept (void); - - /** - * This is the template method used to create new handler. - * Subclasses must overwrite this method if a new handler creation - * strategy is required. - */ - virtual HANDLER *make_handler (void); - -private: - /// Handle used to listen for new connections. - ACE_HANDLE listen_handle_; - - /// used to make life easier :-) - ACE_Asynch_Accept asynch_accept_; - - /// Flag that indicates if parsing of addresses is necessary. - int pass_addresses_; - - /// Flag that indicates if address validation is required. - int validate_new_connection_; - - /// Flag that indicates if a new accept should be reissued when a - /// accept completes. - int reissue_accept_; - - /// Bytes to be read with the call. - size_t bytes_to_read_; -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Asynch_Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Asynch_Acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ -#include "ace/post.h" -#endif /* ACE_ASYNCH_ACCEPTOR_H */ diff --git a/ace/Asynch_Connector.cpp b/ace/Asynch_Connector.cpp deleted file mode 100644 index ce7df62330b..00000000000 --- a/ace/Asynch_Connector.cpp +++ /dev/null @@ -1,288 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_ASYNCH_CONNECTOR_C -#define ACE_ASYNCH_CONNECTOR_C - -#include "ace/Asynch_Connector.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Asynch_Connector, "$Id$") - -#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) -// This only works on platforms that support async I/O. - -#include "ace/Flag_Manip.h" -#include "ace/Log_Msg.h" -#include "ace/Message_Block.h" -#include "ace/INET_Addr.h" - - -template -ACE_Asynch_Connector::ACE_Asynch_Connector (void) - : pass_addresses_ (0), - validate_new_connection_ (0) -{ -} - -template -ACE_Asynch_Connector::~ACE_Asynch_Connector (void) -{ - //this->asynch_connect_.close (); -} - -template int -ACE_Asynch_Connector::open (int pass_addresses, - ACE_Proactor *proactor, - int validate_new_connection) -{ - this->proactor (proactor); - this->pass_addresses_ = pass_addresses; - this->validate_new_connection_ = validate_new_connection; - - // Initialize the ACE_Asynch_Connect - if (this->asynch_connect_.open (*this, - ACE_INVALID_HANDLE, - 0, - this->proactor ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Connect::open")), - -1); - return 0; -} - -template int -ACE_Asynch_Connector::connect (const ACE_INET_Addr & remote_sap, - const ACE_INET_Addr & local_sap, - int reuse_addr, - const void *act) -{ - // Initiate asynchronous connect - if (this->asynch_connect_.connect (ACE_INVALID_HANDLE, - remote_sap, - local_sap, - reuse_addr, - act) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Connect::connect")), - -1); - return 0; -} - -template void -ACE_Asynch_Connector::handle_connect (const ACE_Asynch_Connect::Result &result) -{ - // Variable for error tracking - int error = 0; - - // If the asynchronous connect fails. - if (!result.success () || - result.connect_handle () == ACE_INVALID_HANDLE) - { - error = 1; - } - - if (result.error () != 0) - { - error = 1; - } - - // set blocking mode - if (!error && - ACE_Flag_Manip::clr_flags - (result.connect_handle (), ACE_NONBLOCK) != 0) - { - error = 1; - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Connector::handle_connect : Set blocking mode"))); - } - - // Parse the addresses. - ACE_INET_Addr local_address; - ACE_INET_Addr remote_address; - if (!error && - (this->validate_new_connection_ || this->pass_addresses_)) - this->parse_address (result, - remote_address, - local_address); - - // Call validate_connection even if there was an error - it's the only - // way the application can learn the connect disposition. - if (this->validate_new_connection_ && - this->validate_connection (result, remote_address, local_address) == -1) - { - error = 1; - } - - HANDLER *new_handler = 0; - if (!error) - { - // The Template method - new_handler = this->make_handler (); - if (new_handler == 0) - { - error = 1; - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Connector::handle_connect : Making of new handler failed"))); - } - } - - // If no errors - if (!error) - { - // Update the Proactor. - new_handler->proactor (this->proactor ()); - - // Pass the addresses - if (this->pass_addresses_) - new_handler->addresses (remote_address, - local_address); - - // Pass the ACT - if (result.act () != 0) - new_handler->act (result.act ()); - - // Set up the handler's new handle value - new_handler->handle (result.connect_handle ()); - - ACE_Message_Block mb; - - // Initiate the handler with empty message block; - new_handler->open (result.connect_handle (), mb); - } - - // On failure, no choice but to close the socket - if (error && - result.connect_handle() != ACE_INVALID_HANDLE) - ACE_OS::closesocket (result.connect_handle ()); -} - -template int -ACE_Asynch_Connector::validate_connection - (const ACE_Asynch_Connect::Result &, - const ACE_INET_Addr & /* remote_address */, - const ACE_INET_Addr & /* local_address */) -{ - // Default implementation always validates the remote address. - return 0; -} - -template int -ACE_Asynch_Connector::cancel (void) -{ - return this->asynch_connect_.cancel (); -} - -template void -ACE_Asynch_Connector::parse_address (const ACE_Asynch_Connect::Result &result, - ACE_INET_Addr &remote_address, - ACE_INET_Addr &local_address) -{ - // Getting the addresses. - sockaddr_in local_addr; - sockaddr_in remote_addr; - - // Get the length. - int local_size = sizeof (local_addr); - int remote_size = sizeof (remote_addr); - - // Get the local address. - if (ACE_OS::getsockname (result.connect_handle (), - ACE_reinterpret_cast (sockaddr *, - &local_addr), - &local_size) < 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("ACE_Asynch_Connector:: failed"))); - - // Get the remote address. - if (ACE_OS::getpeername (result.connect_handle (), - ACE_reinterpret_cast (sockaddr *, - &remote_addr), - &remote_size) < 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("ACE_Asynch_Connector:: failed"))); - - // Set the addresses. - local_address.set (&local_addr, local_size); - remote_address.set (&remote_addr, remote_size); - -#if 0 - // @@ Just debugging. - char local_address_buf [BUFSIZ]; - char remote_address_buf [BUFSIZ]; - - if (local_address.addr_to_string (local_address_buf, - sizeof local_address_buf) == -1) - ACE_ERROR ((LM_ERROR, - "Error:%p:can't obtain local_address's address string")); - - ACE_DEBUG ((LM_DEBUG, - "ACE_Asynch_Connector::parse_address : "\ - "Local address %s\n", - local_address_buf)); - - if (remote_address.addr_to_string (remote_address_buf, - sizeof remote_address_buf) == -1) - ACE_ERROR ((LM_ERROR, - "Error:%p:can't obtain remote_address's address string")); - - ACE_DEBUG ((LM_DEBUG, - "ACE_Asynch_Connector::parse_address : "\ - "Remote address %s\n", - remote_address_buf)); -#endif /* 0 */ - - return; -} - - -template ACE_Asynch_Connect & -ACE_Asynch_Connector::asynch_connect (void) -{ - return this->asynch_connect_; -} - -template HANDLER * -ACE_Asynch_Connector::make_handler (void) -{ - // Default behavior - HANDLER *handler = 0; - ACE_NEW_RETURN (handler, HANDLER, 0); - return handler; -} - -template int -ACE_Asynch_Connector::pass_addresses (void) const -{ - return this->pass_addresses_; -} - -template void -ACE_Asynch_Connector::pass_addresses (int new_value) -{ - this->pass_addresses_ = new_value; -} - -template int -ACE_Asynch_Connector::validate_new_connection (void) const -{ - return this->validate_new_connection_; -} - -template void -ACE_Asynch_Connector::validate_new_connection (int new_value) -{ - this->validate_new_connection_ = new_value; -} - -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ -#endif /* ACE_ASYNCH_CONNECTOR_C */ diff --git a/ace/Asynch_Connector.h b/ace/Asynch_Connector.h deleted file mode 100644 index eeb3c3f3818..00000000000 --- a/ace/Asynch_Connector.h +++ /dev/null @@ -1,169 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Asynch_Connector.h - * - * $Id$ - * - * @author Alexander Libman - */ -//============================================================================= - -#ifndef ACE_ASYNCH_CONNECTOR_H -#define ACE_ASYNCH_CONNECTOR_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) -// This only works on platforms that support async i/o. - -#include "ace/Asynch_IO.h" -#include "ace/INET_Addr.h" - -// Forward declarations -class ACE_Message_Block; - -/** - * @class ACE_Asynch_Connector - * - * @brief This class is an example of the Connector pattern. This class - * will establish new connections and create new HANDLER objects to handle - * the new connections. - * - * Unlike the ACE_Connector, however, this class is designed to - * be used asynchronously with the ACE Proactor framework. - */ - -template -class ACE_Asynch_Connector : public ACE_Handler -{ -public: - - /// A do nothing constructor. - ACE_Asynch_Connector (void); - - /// Virtual destruction - virtual ~ACE_Asynch_Connector (void); - - /** - * This opens asynch connector - */ - virtual int open (int pass_addresses = 0, - ACE_Proactor *proactor = 0, - int validate_new_connection = 1); - - /// This initiates a new asynchronous connect - virtual int connect (const ACE_INET_Addr &remote_sap, - const ACE_INET_Addr &local_sap = - ACE_INET_Addr ((u_short)0), - int reuse_addr = 1, - const void *act = 0); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. - * - * @note On Windows, this method does not cancel connect operations - * issued by other threads. - * - * @note On POSIX, delegates cancelation to ACE_POSIX_Asynch_Connect. - */ - virtual int cancel (void); - - - /** - * Template method to validate peer before service is opened. - * This method is called when the connection attempt completes, - * whether it succeeded or failed, if the @a validate_connection - * argument to @c open() was non-zero or the @c validate_new_connection() - * method is called to turn this feature on. The default implementation - * returns 0. Users can (and probably should) reimplement this method - * to learn about the success or failure of the connection attempt. - * If the connection completed successfully, this method can be used to - * perform validation of the peer using it's address, running an - * authentication procedure (such as SSL) or anything else necessary or - * desireable. The return value from this method determines whether or - * not ACE will continue opening the service or abort the connection. - * - * @param result Result of the connection acceptance. Use - * result.success() to determine success or failure of - * the connection attempt. - * @param remote Peer's address. If the connection failed, this object - * is undefined. - * @param local Local address connection was completed from. If the - * connection failed, this object is undefined. - * - * @retval -1 ACE_Asynch_Connector will close the connection, and - * the service will not be opened. - * @retval 0 Service opening will proceeed. - * @return Return value is ignored if the connection attempt failed. - */ - virtual int validate_connection (const ACE_Asynch_Connect::Result& result, - const ACE_INET_Addr &remote, - const ACE_INET_Addr& local); - - // - // These are low level tweaking methods - // - - /// Set and get flag that indicates if parsing and passing of - /// addresses to the service_handler is necessary. - virtual int pass_addresses (void) const; - virtual void pass_addresses (int new_value); - - /// Set and get flag that indicates if address validation is - /// required. - virtual int validate_new_connection (void) const; - virtual void validate_new_connection (int new_value); - -protected: - - /// This is called when an outstanding accept completes. - virtual void handle_connect (const ACE_Asynch_Connect::Result &result); - - - /// This parses the address from read buffer. - void parse_address (const ACE_Asynch_Connect::Result &result, - ACE_INET_Addr &remote_address, - ACE_INET_Addr &local_address); - - /// Return the asynch Connect object. - ACE_Asynch_Connect & asynch_connect (void); - - /** - * This is the template method used to create new handler. - * Subclasses must overwrite this method if a new handler creation - * strategy is required. - */ - virtual HANDLER *make_handler (void); - -private: - - /// Asynch_Connect used to make life easier :-) - ACE_Asynch_Connect asynch_connect_; - - /// Flag that indicates if parsing of addresses is necessary. - int pass_addresses_; - - /// Flag that indicates if address validation is required. - int validate_new_connection_; - -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Asynch_Connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Asynch_Connector.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ -#include "ace/post.h" -#endif /* ACE_ASYNCH_CONNECTOR_H */ diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp deleted file mode 100644 index 25c7610c60a..00000000000 --- a/ace/Asynch_IO.cpp +++ /dev/null @@ -1,1452 +0,0 @@ -// $Id$ - -#include "ace/Asynch_IO.h" - -ACE_RCSID(ace, Asynch_IO, "$Id$") - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) -// This only works on platforms with Asynchronous IO - -#include "ace/Proactor.h" -#include "ace/Message_Block.h" -#include "ace/INET_Addr.h" -#include "ace/Asynch_IO_Impl.h" - -size_t -ACE_Asynch_Result::bytes_transferred (void) const -{ - return this->implementation ()->bytes_transferred (); -} - -const void * -ACE_Asynch_Result::act (void) const -{ - return this->implementation ()->act (); -} - -int -ACE_Asynch_Result::success (void) const -{ - return this->implementation ()->success (); -} - -const void * -ACE_Asynch_Result::completion_key (void) const -{ - return this->implementation ()->completion_key (); -} - -u_long -ACE_Asynch_Result::error (void) const -{ - return this->implementation ()->error (); -} - -ACE_HANDLE -ACE_Asynch_Result::event (void) const -{ - return this->implementation ()->event (); -} - -u_long -ACE_Asynch_Result::offset (void) const -{ - return this->implementation ()->offset (); -} - -u_long -ACE_Asynch_Result::offset_high (void) const -{ - return this->implementation ()->offset_high (); -} - -int -ACE_Asynch_Result::priority (void) const -{ - return this->implementation ()->priority (); -} - -int -ACE_Asynch_Result::signal_number (void) const -{ - return this->implementation ()->signal_number (); -} - -ACE_Asynch_Result::ACE_Asynch_Result (ACE_Asynch_Result_Impl *implementation) - : implementation_ (implementation) -{ -} - -ACE_Asynch_Result::~ACE_Asynch_Result (void) -{ - // Proactor deletes the implementation when the finishes. -} - -ACE_Asynch_Result_Impl * -ACE_Asynch_Result::implementation (void) const -{ - return this->implementation_; -} - -// ********************************************************************* - -int -ACE_Asynch_Operation::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - return this->implementation ()->open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_Asynch_Operation::cancel (void) -{ - return this->implementation ()->cancel (); -} - -ACE_Proactor * -ACE_Asynch_Operation::proactor (void) const -{ - return this->implementation ()->proactor (); -} - -ACE_Asynch_Operation_Impl * -ACE_Asynch_Operation::implementation (void) const -{ - return this->implementation_; -} - -ACE_Asynch_Operation::ACE_Asynch_Operation (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Operation::~ACE_Asynch_Operation (void) -{ - delete this->implementation_; - this->implementation_ = 0; -} - -void -ACE_Asynch_Operation::implementation (ACE_Asynch_Operation_Impl *implementation) -{ - this->implementation_ = implementation; -} - -ACE_Proactor * -ACE_Asynch_Operation::get_proactor (ACE_Proactor *user_proactor, - ACE_Handler &handler) const -{ - if (user_proactor == 0) - { - // Grab the singleton proactor if proactor> is zero - user_proactor = handler.proactor (); - if (user_proactor == 0) - user_proactor = ACE_Proactor::instance (); - } - - return user_proactor; -} - -// ************************************************************ - -ACE_Asynch_Read_Stream::ACE_Asynch_Read_Stream (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Read_Stream::~ACE_Asynch_Read_Stream (void) -{ -} - -int -ACE_Asynch_Read_Stream::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - // Get a proactor for/from the user. - proactor = this->get_proactor (proactor, handler); - - // Delete the old implementation. - delete this->implementation_; - this->implementation_ = 0; - - // Now let us get the implementation initialized. - ACE_Asynch_Read_Stream_Impl *implementation = proactor->create_asynch_read_stream (); - if (implementation == 0) - return -1; - - // Set the implementation class - this->implementation (implementation); - - // Call the method of the base class. - return ACE_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_Asynch_Read_Stream::read (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->read (message_block, - bytes_to_read, - act, - priority, - signal_number); -} - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) -int -ACE_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->readv (message_block, - bytes_to_read, - act, - priority, - signal_number); -} -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ - -ACE_Asynch_Read_Stream_Impl * -ACE_Asynch_Read_Stream::implementation (void) const -{ - return implementation_; -} - -void -ACE_Asynch_Read_Stream::implementation (ACE_Asynch_Read_Stream_Impl *implementation) -{ - this->implementation_ = implementation; - - // Init the base class' implementation also. - ACE_Asynch_Operation::implementation (this->implementation_); -} - -// ************************************************************ - -size_t -ACE_Asynch_Read_Stream::Result::bytes_to_read (void) const -{ - return this->implementation ()->bytes_to_read (); -} - -ACE_Message_Block & -ACE_Asynch_Read_Stream::Result::message_block (void) const -{ - return this->implementation ()->message_block (); -} - -ACE_HANDLE -ACE_Asynch_Read_Stream::Result::handle (void) const -{ - return this->implementation ()->handle (); -} - -ACE_Asynch_Read_Stream::Result::Result (ACE_Asynch_Read_Stream_Result_Impl *implementation) - : ACE_Asynch_Result (implementation), - implementation_ (implementation) -{ -} - -ACE_Asynch_Read_Stream::Result::~Result (void) -{ - // Proactor will delete the implementation after is - // finished. -} - -ACE_Asynch_Read_Stream_Result_Impl * -ACE_Asynch_Read_Stream::Result::implementation (void) const -{ - return this->implementation_; -} - -// *************************************************** - -ACE_Asynch_Write_Stream::ACE_Asynch_Write_Stream (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Write_Stream::~ACE_Asynch_Write_Stream (void) -{ -} - -int -ACE_Asynch_Write_Stream::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - // Get a proactor for/from the user. - proactor = this->get_proactor (proactor, handler); - - // Delete the old implementation. - delete this->implementation_; - this->implementation_ = 0; - - // Now let us get the implementation initialized. - ACE_Asynch_Write_Stream_Impl *implementation = proactor->create_asynch_write_stream (); - if (implementation == 0) - return -1; - - // Set the implementation class - this->implementation (implementation); - - // Call the method of the base class. - return ACE_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_Asynch_Write_Stream::write (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->write (message_block, - bytes_to_write, - act, - priority, - signal_number); -} - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) -int -ACE_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->writev (message_block, - bytes_to_write, - act, - priority, - signal_number); -} -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ - -ACE_Asynch_Write_Stream_Impl * -ACE_Asynch_Write_Stream::implementation (void) const -{ - return this->implementation_; -} - -void -ACE_Asynch_Write_Stream::implementation (ACE_Asynch_Write_Stream_Impl *implementation) -{ - this->implementation_ = implementation; - - // Init the base class' implementation also. - ACE_Asynch_Operation::implementation (this->implementation_); -} - -// ************************************************************ - -size_t -ACE_Asynch_Write_Stream::Result::bytes_to_write (void) const -{ - return this->implementation ()->bytes_to_write (); -} - -ACE_Message_Block & -ACE_Asynch_Write_Stream::Result::message_block (void) const -{ - return this->implementation ()->message_block (); -} - -ACE_HANDLE -ACE_Asynch_Write_Stream::Result::handle (void) const -{ - return this->implementation ()->handle (); -} - -ACE_Asynch_Write_Stream::Result::Result (ACE_Asynch_Write_Stream_Result_Impl *implementation) - : ACE_Asynch_Result (implementation), - implementation_ (implementation) -{ -} - -ACE_Asynch_Write_Stream::Result::~Result (void) -{ - // Proactor will delte the implementation when the call - // finishes. -} - -ACE_Asynch_Write_Stream_Result_Impl * -ACE_Asynch_Write_Stream::Result::implementation (void) const -{ - return this->implementation_; -} - -// ************************************************************ - -ACE_Asynch_Read_File::ACE_Asynch_Read_File (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Read_File::~ACE_Asynch_Read_File (void) -{ -} - -int -ACE_Asynch_Read_File::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - // Get a proactor for/from the user. - proactor = this->get_proactor (proactor, handler); - - // Delete the old implementation. - delete this->implementation_; - this->implementation_ = 0; - - // Now let us get the implementation initialized. - ACE_Asynch_Read_File_Impl *implementation = proactor->create_asynch_read_file (); - if (implementation == 0) - return -1; - - // Set the implementation class - this->implementation (implementation); - - // Call the method of the base class. - return ACE_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_Asynch_Read_File::read (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->read (message_block, - bytes_to_read, - offset, - offset_high, - act, - priority, - signal_number); -} - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) -int -ACE_Asynch_Read_File::readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->readv (message_block, - bytes_to_read, - offset, - offset_high, - act, - priority, - signal_number); -} -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - -ACE_Asynch_Read_File_Impl * -ACE_Asynch_Read_File::implementation (void) const -{ - return this->implementation_; -} - -void -ACE_Asynch_Read_File::implementation (ACE_Asynch_Read_File_Impl *implementation) -{ - this->implementation_ = implementation; - - // Set also the base class' implementation. - ACE_Asynch_Read_Stream::implementation (implementation); -} - -// ************************************************************ - -ACE_Asynch_Read_File::Result::Result (ACE_Asynch_Read_File_Result_Impl *implementation) - : ACE_Asynch_Read_Stream::Result (implementation), - implementation_ (implementation) -{ -} - -ACE_Asynch_Read_File::Result::~Result (void) -{ - // Proactor will delete the implementation when call - // completes. -} - -ACE_Asynch_Read_File_Result_Impl * -ACE_Asynch_Read_File::Result::implementation (void) const -{ - return this->implementation_; -} - -// ************************************************************ - -ACE_Asynch_Write_File::ACE_Asynch_Write_File (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Write_File::~ACE_Asynch_Write_File (void) -{ -} - -int -ACE_Asynch_Write_File::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - // Get a proactor for/from the user. - proactor = this->get_proactor (proactor, handler); - - // Delete the old implementation. - delete this->implementation_; - this->implementation_ = 0; - - // Now let us get the implementation initialized. - ACE_Asynch_Write_File_Impl *implementation = proactor->create_asynch_write_file (); - if (implementation == 0) - return -1; - - // Set the implementation class - this->implementation (implementation); - - // Call the method of the base class. - return ACE_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_Asynch_Write_File::write (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->write (message_block, - bytes_to_write, - offset, - offset_high, - act, - priority, - signal_number); -} - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) -int -ACE_Asynch_Write_File::writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->writev (message_block, - bytes_to_write, - offset, - offset_high, - act, - priority, - signal_number); -} -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - -ACE_Asynch_Write_File_Impl * -ACE_Asynch_Write_File::implementation (void) const -{ - return this->implementation_; -} - -void -ACE_Asynch_Write_File::implementation (ACE_Asynch_Write_File_Impl *implementation) -{ - this->implementation_ = implementation; - - // Init the base class' implementation also. - ACE_Asynch_Write_Stream::implementation (implementation); -} - -// ************************************************************ - -ACE_Asynch_Write_File::Result::Result (ACE_Asynch_Write_File_Result_Impl *implementation) - : ACE_Asynch_Write_Stream::Result (implementation), - implementation_ (implementation) -{ -} - -ACE_Asynch_Write_File::Result::~Result (void) -{ - // Proactor will delete the implementation when the call - // completes. -} - -ACE_Asynch_Write_File_Result_Impl * -ACE_Asynch_Write_File::Result::implementation (void) const -{ - return this->implementation_; -} - -// ********************************************************************* - -ACE_Asynch_Accept::ACE_Asynch_Accept (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Accept::~ACE_Asynch_Accept (void) -{ -} - -int -ACE_Asynch_Accept::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - // Get a proactor for/from the user. - proactor = this->get_proactor (proactor, handler); - - // Delete the old implementation. - delete this->implementation_; - this->implementation_ = 0; - - // Now let us get the implementation initialized. - ACE_Asynch_Accept_Impl *implementation = proactor->create_asynch_accept (); - if (implementation == 0) - return -1; - - // Set the implementation class - this->implementation (implementation); - - // Call the method of the base class. - return ACE_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_Asynch_Accept::accept (ACE_Message_Block &message_block, - size_t bytes_to_read, - ACE_HANDLE accept_handle, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->accept (message_block, - bytes_to_read, - accept_handle, - act, - priority, - signal_number); -} - -ACE_Asynch_Accept_Impl * -ACE_Asynch_Accept::implementation (void) const -{ - return this->implementation_; -} - -void -ACE_Asynch_Accept::implementation (ACE_Asynch_Accept_Impl *implementation) -{ - this->implementation_ = implementation; - // Set the implementation in the base class. - ACE_Asynch_Operation::implementation (implementation); -} - -// ************************************************************ - -size_t -ACE_Asynch_Accept::Result::bytes_to_read (void) const -{ - return this->implementation ()->bytes_to_read (); -} - -ACE_Message_Block & -ACE_Asynch_Accept::Result::message_block (void) const -{ - return this->implementation ()->message_block (); -} - -ACE_HANDLE -ACE_Asynch_Accept::Result::listen_handle (void) const -{ - return this->implementation ()->listen_handle (); -} - -ACE_HANDLE -ACE_Asynch_Accept::Result::accept_handle (void) const -{ - return this->implementation ()->accept_handle (); -} - -ACE_Asynch_Accept::Result::Result (ACE_Asynch_Accept_Result_Impl *implementation) - : ACE_Asynch_Result (implementation), - implementation_ (implementation) -{ -} - -ACE_Asynch_Accept::Result::~Result (void) -{ - // Proactor will delete the implementation when the call - // completes. -} - -ACE_Asynch_Accept_Result_Impl * -ACE_Asynch_Accept::Result::implementation (void) const -{ - return this->implementation_; -} - - - -// ********************************************************************* - -ACE_Asynch_Connect::ACE_Asynch_Connect (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Connect::~ACE_Asynch_Connect (void) -{ -} - -int -ACE_Asynch_Connect::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - // Get a proactor for/from the user. - proactor = this->get_proactor (proactor, handler); - - // Delete the old implementation. - delete this->implementation_; - this->implementation_ = 0; - - // Now let us get the implementation initialized. - ACE_Asynch_Connect_Impl *implementation = proactor->create_asynch_connect (); - if (implementation == 0) - return -1; - - // Set the implementation class - this->implementation (implementation); - - // Call the method of the base class. - return ACE_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_Asynch_Connect::connect (ACE_HANDLE connect_handle, - const ACE_Addr & remote_sap, - const ACE_Addr & local_sap, - int reuse_addr, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->connect (connect_handle, - remote_sap, - local_sap, - reuse_addr, - act, - priority, - signal_number); -} - -ACE_Asynch_Connect_Impl * -ACE_Asynch_Connect::implementation (void) const -{ - return this->implementation_; -} - -void -ACE_Asynch_Connect::implementation (ACE_Asynch_Connect_Impl *implementation) -{ - this->implementation_ = implementation; - // Set the implementation in the base class. - ACE_Asynch_Operation::implementation (implementation); -} - -// ************************************************************ - -ACE_Asynch_Connect::Result::Result (ACE_Asynch_Connect_Result_Impl *implementation) - : ACE_Asynch_Result (implementation), - implementation_ (implementation) -{ -} - -ACE_Asynch_Connect::Result::~Result (void) -{ - // Proactor will delete the implementation when the call - // completes. -} - -ACE_HANDLE -ACE_Asynch_Connect::Result::connect_handle (void) const -{ - return this->implementation ()->connect_handle (); -} - - -ACE_Asynch_Connect_Result_Impl * -ACE_Asynch_Connect::Result::implementation (void) const -{ - return this->implementation_; -} - -// ************************************************************ - -ACE_Asynch_Transmit_File::ACE_Asynch_Transmit_File (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Transmit_File::~ACE_Asynch_Transmit_File (void) -{ -} - -int -ACE_Asynch_Transmit_File::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - // Get a proactor for/from the user. - proactor = this->get_proactor (proactor, handler); - - // Delete the old implementation. - delete this->implementation_; - this->implementation_ = 0; - - // Now let us get the implementation initialized. - ACE_Asynch_Transmit_File_Impl *implementation = proactor->create_asynch_transmit_file (); - if (implementation == 0) - return -1; - - // Set the implementation class - this->implementation (implementation); - - // Call the method of the base class. - return ACE_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, - Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->transmit_file (file, - header_and_trailer, - bytes_to_write, - offset, - offset_high, - bytes_per_send, - flags, - act, - priority, - signal_number); -} - -ACE_Asynch_Transmit_File_Impl * -ACE_Asynch_Transmit_File::implementation (void) const -{ - return this->implementation_; -} - -void -ACE_Asynch_Transmit_File::implementation (ACE_Asynch_Transmit_File_Impl *implementation) -{ - this->implementation_ = implementation; - // Set the base class' implementation also. - ACE_Asynch_Operation::implementation (this->implementation_); -} - -// *********************************************************************************** - -ACE_HANDLE -ACE_Asynch_Transmit_File::Result::socket (void) const -{ - return this->implementation ()->socket (); -} - -ACE_HANDLE -ACE_Asynch_Transmit_File::Result::file (void) const -{ - return this->implementation ()->file (); -} - -ACE_Asynch_Transmit_File::Header_And_Trailer * -ACE_Asynch_Transmit_File::Result::header_and_trailer (void) const -{ - return this->implementation ()->header_and_trailer (); -} - -size_t -ACE_Asynch_Transmit_File::Result::bytes_to_write (void) const -{ - return this->implementation ()->bytes_to_write (); -} - -size_t -ACE_Asynch_Transmit_File::Result::bytes_per_send (void) const -{ - return this->implementation ()->bytes_per_send (); -} - -u_long -ACE_Asynch_Transmit_File::Result::flags (void) const -{ - return this->implementation ()->flags (); -} - -ACE_Asynch_Transmit_File::Result::Result (ACE_Asynch_Transmit_File_Result_Impl *implementation) - : ACE_Asynch_Result (implementation), - implementation_ (implementation) -{ -} - -ACE_Asynch_Transmit_File::Result::~Result (void) -{ -} - -ACE_Asynch_Transmit_File_Result_Impl * -ACE_Asynch_Transmit_File::Result::implementation (void) const -{ - return this->implementation_; -} - -// ************************************************************ - -ACE_Asynch_Transmit_File::Header_And_Trailer::Header_And_Trailer (ACE_Message_Block *header, - size_t header_bytes, - ACE_Message_Block *trailer, - size_t trailer_bytes) - : header_ (header), - header_bytes_ (header_bytes), - trailer_ (trailer), - trailer_bytes_ (trailer_bytes) -{ -} - -ACE_Asynch_Transmit_File::Header_And_Trailer::~Header_And_Trailer (void) -{ -} - -void -ACE_Asynch_Transmit_File::Header_And_Trailer::header_and_trailer (ACE_Message_Block *header, - size_t header_bytes, - ACE_Message_Block *trailer, - size_t trailer_bytes) -{ - this->header (header); - this->header_bytes (header_bytes); - this->trailer (trailer); - this->trailer_bytes (trailer_bytes); -} - -ACE_Message_Block * -ACE_Asynch_Transmit_File::Header_And_Trailer::header (void) const -{ - return this->header_; -} - -void -ACE_Asynch_Transmit_File::Header_And_Trailer::header (ACE_Message_Block *message_block) -{ - this->header_ = message_block; -} - -size_t -ACE_Asynch_Transmit_File::Header_And_Trailer::header_bytes (void) const -{ - return this->header_bytes_; -} - -void -ACE_Asynch_Transmit_File::Header_And_Trailer::header_bytes (size_t bytes) -{ - this->header_bytes_ = bytes; -} - -ACE_Message_Block * -ACE_Asynch_Transmit_File::Header_And_Trailer::trailer (void) const -{ - return this->trailer_; -} - -void -ACE_Asynch_Transmit_File::Header_And_Trailer::trailer (ACE_Message_Block *message_block) -{ - this->trailer_ = message_block; -} - -size_t -ACE_Asynch_Transmit_File::Header_And_Trailer::trailer_bytes (void) const -{ - return this->trailer_bytes_; -} - -void -ACE_Asynch_Transmit_File::Header_And_Trailer::trailer_bytes (size_t bytes) -{ - this->trailer_bytes_ = bytes; -} - -ACE_LPTRANSMIT_FILE_BUFFERS -ACE_Asynch_Transmit_File::Header_And_Trailer::transmit_buffers (void) -{ - // If both are zero, return zero - if (this->header_ == 0 && this->trailer_ == 0) - return 0; - else - { - // Something is valid - - // If header is valid, set the fields - if (this->header_ != 0) - { - this->transmit_buffers_.Head = this->header_->rd_ptr (); -#if defined(ACE_WIN64) - this->transmit_buffers_.HeadLength = - ACE_static_cast (DWORD, this->header_bytes_); -#else - this->transmit_buffers_.HeadLength = this->header_bytes_; -#endif /* ACE_WIN64 */ - } - else - { - this->transmit_buffers_.Head = 0; - this->transmit_buffers_.HeadLength = 0; - } - - // If trailer is valid, set the fields - if (this->trailer_ != 0) - { - this->transmit_buffers_.Tail = this->trailer_->rd_ptr (); -#if defined(ACE_WIN64) - this->transmit_buffers_.TailLength = - ACE_static_cast (DWORD, this->trailer_bytes_); -#else - this->transmit_buffers_.TailLength = this->trailer_bytes_; -#endif /* ACE_WIN64 */ - } - else - { - this->transmit_buffers_.Tail = 0; - this->transmit_buffers_.TailLength = 0; - } - - // Return the transmit buffers - return &this->transmit_buffers_; - } -} - -// ********************************************************************* - -ACE_Handler::ACE_Handler (void) - : proactor_ (0), handle_ (ACE_INVALID_HANDLE) -{ -} - -ACE_Handler::ACE_Handler (ACE_Proactor *d) - : proactor_ (d), handle_ (ACE_INVALID_HANDLE) -{ -} - -ACE_Handler::~ACE_Handler (void) -{ -} - -void -ACE_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result & /* result */) -{ -} - -void -ACE_Handler::handle_write_stream (const ACE_Asynch_Write_Stream::Result & /* result */) -{ -} - -void -ACE_Handler::handle_write_dgram (const ACE_Asynch_Write_Dgram::Result & /* result */) -{ -} - -void -ACE_Handler::handle_read_dgram (const ACE_Asynch_Read_Dgram::Result & /* result */) -{ -} - -void -ACE_Handler::handle_accept (const ACE_Asynch_Accept::Result & /* result */) -{ -} - -void -ACE_Handler::handle_connect (const ACE_Asynch_Connect::Result & /* result */) -{ -} - -void -ACE_Handler::handle_transmit_file (const ACE_Asynch_Transmit_File::Result & /* result */) -{ -} - -void -ACE_Handler::handle_read_file (const ACE_Asynch_Read_File::Result & /* result */) -{ -} - -void -ACE_Handler::handle_write_file (const ACE_Asynch_Write_File::Result & /* result */) -{ -} - -void -ACE_Handler::handle_time_out (const ACE_Time_Value & /* tv */, - const void * /* act */) -{ -} - -void -ACE_Handler::handle_wakeup (void) -{ -} - -ACE_Proactor * -ACE_Handler::proactor (void) -{ - return this->proactor_; -} - -void -ACE_Handler::proactor (ACE_Proactor *p) -{ - this->proactor_ = p; -} - -ACE_HANDLE -ACE_Handler::handle (void) const -{ - return this->handle_; -} - -void -ACE_Handler::handle (ACE_HANDLE h) -{ - this->handle_ = h; -} - -// ************************************************************ - -ACE_Service_Handler::ACE_Service_Handler (void) -{ -} - -ACE_Service_Handler::~ACE_Service_Handler (void) -{ -} - -void -ACE_Service_Handler::addresses (const ACE_INET_Addr & /* remote_address */, - const ACE_INET_Addr & /* local_address */ ) -{ -} - -void -ACE_Service_Handler::act (const void *) -{ -} - -void -ACE_Service_Handler::open (ACE_HANDLE, - ACE_Message_Block &) -{ -} - - -// ************************************************************ - -ACE_Asynch_Read_Dgram::ACE_Asynch_Read_Dgram (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Read_Dgram::~ACE_Asynch_Read_Dgram (void) -{ -} - -int -ACE_Asynch_Read_Dgram::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - // Get a proactor for/from the user. - proactor = this->get_proactor (proactor, handler); - - // Delete the old implementation. - delete this->implementation_; - this->implementation_ = 0; - - // Now let us get the implementation initialized. - ACE_Asynch_Read_Dgram_Impl *implementation = proactor->create_asynch_read_dgram (); - if (implementation == 0) - return -1; - - // Set the implementation class - this->implementation (implementation); - - // Call the method of the base class. - return ACE_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -ssize_t -ACE_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, - size_t &number_of_bytes_recvd, - int flags, - int protocol_family, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->recv (message_block, - number_of_bytes_recvd, - flags, - protocol_family, - act, - priority, - signal_number); -} - -ACE_Asynch_Read_Dgram_Impl * -ACE_Asynch_Read_Dgram::implementation (void) const -{ - return implementation_; -} - -void -ACE_Asynch_Read_Dgram::implementation (ACE_Asynch_Read_Dgram_Impl *implementation) -{ - this->implementation_ = implementation; - - // Init the bas class' implementation also. - ACE_Asynch_Operation::implementation(this->implementation_); -} - -// ************************************************************ - -int -ACE_Asynch_Read_Dgram::Result::remote_address (ACE_Addr& addr) const -{ - return this->implementation ()->remote_address (addr); -} - -ACE_Message_Block* -ACE_Asynch_Read_Dgram::Result::message_block (void) const -{ - return this->implementation ()->message_block (); -} - -int -ACE_Asynch_Read_Dgram::Result::flags (void) const -{ - return this->implementation ()->flags (); -} - -size_t -ACE_Asynch_Read_Dgram::Result::bytes_to_read (void) const -{ - return this->implementation ()->bytes_to_read (); -} - -ACE_HANDLE -ACE_Asynch_Read_Dgram::Result::handle (void) const -{ - return this->implementation ()->handle(); -} - -ACE_Asynch_Read_Dgram::Result::Result (ACE_Asynch_Read_Dgram_Result_Impl *implementation) -: ACE_Asynch_Result (implementation), - implementation_ (implementation) -{ -} - -ACE_Asynch_Read_Dgram::Result::~Result (void) -{ -} - -ACE_Asynch_Read_Dgram_Result_Impl * -ACE_Asynch_Read_Dgram::Result::implementation (void) const -{ - return this->implementation_; -} - -// ************************************************************ - - -ACE_Asynch_Write_Dgram::ACE_Asynch_Write_Dgram (void) - : implementation_ (0) -{ -} - -ACE_Asynch_Write_Dgram::~ACE_Asynch_Write_Dgram (void) -{ -} - -int -ACE_Asynch_Write_Dgram::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - // Get a proactor for/from the user. - proactor = this->get_proactor (proactor, handler); - - // Delete the old implementation. - delete this->implementation_; - this->implementation_ = 0; - - // Now let us get the implementation initialized. - ACE_Asynch_Write_Dgram_Impl *implementation = proactor->create_asynch_write_dgram (); - if (implementation == 0) - return -1; - - // Set the implementation class - this->implementation (implementation); - - // Call the method of the base class. - return ACE_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -ssize_t -ACE_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr& remote_addr, - const void *act, - int priority, - int signal_number) -{ - return this->implementation ()->send (message_block, - number_of_bytes_sent, - flags, - remote_addr, - act, - priority, - signal_number); -} - -ACE_Asynch_Write_Dgram_Impl * -ACE_Asynch_Write_Dgram::implementation (void) const -{ - return this->implementation_; -} - -void -ACE_Asynch_Write_Dgram::implementation (ACE_Asynch_Write_Dgram_Impl *implementation) -{ - this->implementation_ = implementation; - - // Init the base class' implementation also. - ACE_Asynch_Operation::implementation (this->implementation_); -} - -// ************************************************************ - -size_t -ACE_Asynch_Write_Dgram::Result::bytes_to_write (void) const -{ - return this->implementation ()->bytes_to_write (); -} - -ACE_Message_Block* -ACE_Asynch_Write_Dgram::Result::message_block () const -{ - return this->implementation ()->message_block (); -} - -int -ACE_Asynch_Write_Dgram::Result::flags (void) const -{ - return this->implementation ()->flags (); -} - -ACE_HANDLE -ACE_Asynch_Write_Dgram::Result::handle (void) const -{ - return this->implementation ()->handle (); -} - -ACE_Asynch_Write_Dgram_Result_Impl * -ACE_Asynch_Write_Dgram::Result::implementation (void) const -{ - return this->implementation_; -} - -ACE_Asynch_Write_Dgram::Result::Result (ACE_Asynch_Write_Dgram_Result_Impl *implementation) -: ACE_Asynch_Result (implementation), - implementation_ (implementation) -{ -} - -ACE_Asynch_Write_Dgram::Result::~Result (void) -{ -} - -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h deleted file mode 100644 index 14d2e3d22cf..00000000000 --- a/ace/Asynch_IO.h +++ /dev/null @@ -1,1608 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Asynch_IO.h - * - * $Id$ - * - * This works on Win32 (#if defined (ACE_WIN32) && !defined - * (ACE_HAS_WINCE)) platforms and on POSIX4 platforms with - * routines (#if defined (ACE_HAS_AIO_CALLS)) - * - * On Win32 platforms, the implementation of - * and are only - * supported if ACE_HAS_WINSOCK2 is defined or you are on WinNT 4.0 - * or higher. - * - * @author Irfan Pyarali - * @author Tim Harrison - * @author Alexander Babu Arulanthu - * @author Roger Tragin - * @author Alexander Libman - */ -//============================================================================= - -#ifndef ACE_ASYNCH_IO_H -#define ACE_ASYNCH_IO_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) - -#include "ace/OS.h" - -// Forward declarations -class ACE_Proactor; -class ACE_Handler; -class ACE_Message_Block; -class ACE_INET_Addr; -class ACE_Addr; - -// Forward declarations -class ACE_Asynch_Result_Impl; - -/** - * @class ACE_Asynch_Result - * - * @brief An interface base class which allows users access to common - * information related to an asynchronous operation. - * - * An interface base class from which you can obtain some basic - * information like the number of bytes transferred, the ACT - * associated with the asynchronous operation, indication of - * success or failure, etc. Subclasses may want to store more - * information that is particular to the asynchronous operation - * it represents. - */ -class ACE_Export ACE_Asynch_Result -{ - -public: - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This is the ACT associated with the handle on which the - * Asynch_Operation takes place. - * - * On WIN32, this returns the ACT associated with the handle when it - * was registered with the I/O completion port. - * - * @@ This is not implemented for POSIX4 platforms. Returns 0. - */ - const void *completion_key (void) const; - - /// Error value if the operation fails. - u_long error (void) const; - - /** - * On WIN32, this returns the event associated with the OVERLAPPED - * structure. - * - * This returns ACE_INVALID_HANDLE on POSIX4-Unix platforms. - */ - ACE_HANDLE event (void) const; - - /** - * This really makes sense only when doing file I/O. - * - * On WIN32, these are represented in the OVERLAPPED datastructure. - * - * @@ On POSIX4-Unix, offset_high should be supported using - * aiocb64. - */ - u_long offset (void) const; - u_long offset_high (void) const; - - /** - * Priority of the operation. - * - * On POSIX4-Unix, this is supported. Priority works like in - * Unix. Negative values are not allowed. 0 means priority of the - * operation same as the process priority. 1 means priority of the - * operation is one less than process. And so forth. - * - * On Win32, this is a no-op. - */ - int priority (void) const; - - /** - * POSIX4 real-time signal number to be used for the - * operation. ranges from ACE_SIGRTMIN to ACE_SIGRTMAX. By - * default, ACE_SIGRTMIN is used to issue calls. This is a no-op - * on non-POSIX4 systems and returns 0. - */ - int signal_number (void) const; - - - /// Destructor. - virtual ~ACE_Asynch_Result (void); - -protected: - /// Constructor. This implementation will not be deleted. The - /// implementation will be deleted by the Proactor. - ACE_Asynch_Result (ACE_Asynch_Result_Impl *implementation); - - /// Get the implementation class. - ACE_Asynch_Result_Impl *implementation (void) const; - - /// Implementation class. - ACE_Asynch_Result_Impl *implementation_; -}; - -// Forward declarations -class ACE_Asynch_Operation_Impl; - -/** - * @class ACE_Asynch_Operation - * - * @brief This is an interface base class for all asynch - * operations. The resposiblility of this class is to forward - * all methods to its delegation/implementation class, e.g., - * or . - * - * There are some attributes and functionality which is common - * to all asychronous operations. The delegation classes of this - * class will factor out this code. - */ -class ACE_Export ACE_Asynch_Operation -{ - -public: - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * (Attempts to) cancel the asynchronous operation pending against - * the registered with this Operation. - * - * All completion notifications for the I/O operations will occur - * normally. - * - * = Return Values: - * - * -1 : Operation failed. (can get only in POSIX). - * 0 : All the operations were cancelled. - * 1 : All the operations were already finished in this - * handle. Unable to cancel them. - * 2 : Atleast one of the requested operations cannot be - * cancelled. - * - * There is slight difference in the semantics between NT and POSIX - * platforms which is given below. - * - * = Win32 : - * - * cancels all pending accepts operations that were issued by the - * calling thread. The function does not cancel asynchronous - * operations issued by other threads. - * All I/O operations that are canceled will complete with the - * error ERROR_OPERATION_ABORTED. - * - * = POSIX: - * - * Attempts to cancel one or more asynchronous I/O requests - * currently outstanding against the registered in this - * operation. - * For requested operations that are successfully canceled, the - * associated error status is set to ECANCELED. - */ - int cancel (void); - - - // = Access methods. - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; - - /// Destructor. - virtual ~ACE_Asynch_Operation (void); - -protected: - /// Constructor. - ACE_Asynch_Operation (void); - - /// Return the underlying implementation class. - ACE_Asynch_Operation_Impl *implementation (void) const; - - /// Set the implementation class. - void implementation (ACE_Asynch_Operation_Impl *implementation); - - /// Get a proactor for/from the user - ACE_Proactor *get_proactor (ACE_Proactor *user_proactor, - ACE_Handler &handler) const; - - /// Implementation class. - ACE_Asynch_Operation_Impl *implementation_; -}; - -// Forward declarations -class ACE_Asynch_Read_Stream_Result_Impl; -class ACE_Asynch_Read_Stream_Impl; - -/** - * @class ACE_Asynch_Read_Stream - * - * @brief This class is a factory for starting off asynchronous reads - * on a stream. This class forwards all methods to its - * implementation class. - * - * Once is called, multiple asynchronous s can - * started using this class. An ACE_Asynch_Read_Stream::Result - * will be passed back to the when the asynchronous - * reads completes through the - * callback. - */ -class ACE_Export ACE_Asynch_Read_Stream : public ACE_Asynch_Operation -{ - -public: - /// A do nothing constructor. - ACE_Asynch_Read_Stream (void); - - /// Destructor - virtual ~ACE_Asynch_Read_Stream (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /** - * This starts off an asynchronous read. Upto will - * be read and stored in the . 's - * will be updated to reflect the added bytes if the read - * operation is successful completed. Priority of the - * operation is specified by . On POSIX4-Unix, this is - * supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, is a no-op. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - int read (ACE_Message_Block &message_block, - size_t num_bytes_to_read, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - /** - * Same as above but with scatter support, through chaining of composite - * message blocks using the continuation field. - */ - int readv (ACE_Message_Block &message_block, - size_t num_bytes_to_read, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ - - /// Return the underlying implementation class. - ACE_Asynch_Read_Stream_Impl *implementation (void) const; - -protected: - /// Set the implementation class. - void implementation (ACE_Asynch_Read_Stream_Impl *implementation); - - /// Implementation class that all methods will be forwarded to. - ACE_Asynch_Read_Stream_Impl *implementation_; - -public: -/** - * @class Result - * - * @brief This is the class which will be passed back to the - * when the asynchronous read completes. This class - * forwards all the methods to the implementation classes. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous read. - */ - class ACE_Export Result : public ACE_Asynch_Result - { - - /// The concrete implementation result classes only construct this - /// class. - friend class ACE_POSIX_Asynch_Read_Stream_Result; - friend class ACE_WIN32_Asynch_Read_Stream_Result; - - public: - /// The number of bytes which were requested at the start of the - /// asynchronous read. - size_t bytes_to_read (void) const; - - /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; - - /// I/O handle used for reading. - ACE_HANDLE handle (void) const; - - /// Get the implementation class. - ACE_Asynch_Read_Stream_Result_Impl *implementation (void) const; - - protected: - /// Constructor. - Result (ACE_Asynch_Read_Stream_Result_Impl *implementation); - - /// Destructor. - virtual ~Result (void); - - /// The implementation class. - ACE_Asynch_Read_Stream_Result_Impl *implementation_; - }; -}; - -// Forward declarations -class ACE_Asynch_Write_Stream_Impl; -class ACE_Asynch_Write_Stream_Result_Impl; - -/** - * @class ACE_Asynch_Write_Stream - * - * @brief This class is a factory for starting off asynchronous writes - * on a stream. This class forwards all methods to its - * implementation class. - * - * Once is called, multiple asynchronous s can - * started using this class. An ACE_Asynch_Write_Stream::Result - * will be passed back to the when the asynchronous - * write completes through the - * callback. - */ -class ACE_Export ACE_Asynch_Write_Stream : public ACE_Asynch_Operation -{ - -public: - /// A do nothing constructor. - ACE_Asynch_Write_Stream (void); - - /// Destructor. - virtual ~ACE_Asynch_Write_Stream (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /** - * This starts off an asynchronous write. Upto - * will be written from the . Upon successful completion - * of the write operation, 's is updated to - * reflect the data that was written. Priority of the - * operation is specified by . On POSIX4-Unix, this is - * supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, this argument is a no-op. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - int write (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - /** - * Same as above but with gather support, through chaining of composite - * message blocks using the continuation field. - */ - int writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - - /// Return the underlying implementation class. - ACE_Asynch_Write_Stream_Impl *implementation (void) const; - -protected: - /// Set the implementation class. - void implementation (ACE_Asynch_Write_Stream_Impl *implementation); - - /// Implementation class that all methods will be forwarded to. - ACE_Asynch_Write_Stream_Impl *implementation_; - -public: -/** - * @class Result - * - * @brief This is that class which will be passed back to the - * when the asynchronous write completes. This class - * forwards all the methods to the implementation class. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous write. - */ - class ACE_Export Result : public ACE_Asynch_Result - { - - /// The concrete implementation result classes only construct this - /// class. - friend class ACE_POSIX_Asynch_Write_Stream_Result; - friend class ACE_WIN32_Asynch_Write_Stream_Result; - - public: - /// The number of bytes which were requested at the start of the - /// asynchronous write. - size_t bytes_to_write (void) const; - - /// Message block that contains the data to be written. - ACE_Message_Block &message_block (void) const; - - /// I/O handle used for writing. - ACE_HANDLE handle (void) const; - - /// Get the implementation class. - ACE_Asynch_Write_Stream_Result_Impl *implementation (void) const; - - protected: - /// Constructor. - Result (ACE_Asynch_Write_Stream_Result_Impl *implementation); - - /// Destructor. - virtual ~Result (void); - - /// Implementation class. - ACE_Asynch_Write_Stream_Result_Impl *implementation_; - }; -}; - -// Forward declarations -class ACE_Asynch_Read_File_Impl; -class ACE_Asynch_Read_File_Result_Impl; - -/** - * @class ACE_Asynch_Read_File - * - * @brief This class is a factory for starting off asynchronous reads - * on a file. This class forwards all methods to its - * implementation class. - * - * Once is called, multiple asynchronous s can - * started using this class. An ACE_Asynch_Read_File::Result - * will be passed back to the when the asynchronous - * reads completes through the - * callback. - * This class differs slightly from ACE_Asynch_Read_Stream as it - * allows the user to specify an offset for the read. - */ -class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream -{ - -public: - /// A do nothing constructor. - ACE_Asynch_Read_File (void); - - /// Destructor. - virtual ~ACE_Asynch_Read_File (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /** - * This starts off an asynchronous read. Upto will - * be read and stored in the . The read will start - * at from the beginning of the file. Priority of the - * operation is specified by . On POSIX4-Unix, this is - * supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, this argument is a no-op. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - int read (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset = 0, - u_long offset_high = 0, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - /** - * Same as above but with scatter support, through chaining of composite - * message blocks using the continuation field. - * NOTE: In win32 Each data block payload must be at least the size of a system - * memory page and must be aligned on a system memory page size boundary - */ - int readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset = 0, - u_long offset_high = 0, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - - /// Return the underlying implementation class. - ACE_Asynch_Read_File_Impl *implementation (void) const; - -protected: - /// Set the implementation class. - void implementation (ACE_Asynch_Read_File_Impl *implementation); - - /// Delegation/implementation class that all methods will be - /// forwarded to. - ACE_Asynch_Read_File_Impl *implementation_; - -public: -/** - * @class Result - * - * @brief This is that class which will be passed back to the - * when the asynchronous read completes. This class - * forwards all the methods to the implementation class. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous read. - * This class differs slightly from - * ACE_Asynch_Read_Stream::Result as it calls back - * on the instead of - * . No additional state is - * required by this class as ACE_Asynch_Result can store the - * . - */ - class ACE_Export Result : public ACE_Asynch_Read_Stream::Result - { - - /// The concrete implementation result classes only construct this - /// class. - friend class ACE_POSIX_Asynch_Read_File_Result; - friend class ACE_WIN32_Asynch_Read_File_Result; - - public: - /// Get the implementation class. - ACE_Asynch_Read_File_Result_Impl *implementation (void) const; - - protected: - /// Constructor. This implementation will not be deleted. - Result (ACE_Asynch_Read_File_Result_Impl *implementation); - - /// Destructor. - virtual ~Result (void); - - /// The implementation class. - ACE_Asynch_Read_File_Result_Impl *implementation_; - - private: - /// Here just to provide an dummpy implementation, since the - /// one auto generated by MSVC is flagged as infinitely recursive - void operator= (Result &) {} - }; -}; - -// Forward declarations -class ACE_Asynch_Write_File_Impl; -class ACE_Asynch_Write_File_Result_Impl; - -/** - * @class ACE_Asynch_Write_File - * - * @brief This class is a factory for starting off asynchronous writes - * on a file. This class forwards all methods to its - * implementation class. - * - * Once is called, multiple asynchronous s can be - * started using this class. A ACE_Asynch_Write_File::Result - * will be passed back to the when the asynchronous - * writes completes through the - * callback. - * This class differs slightly from ACE_Asynch_Write_Stream as - * it allows the user to specify an offset for the write. - */ -class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream -{ - -public: - /// A do nothing constructor. - ACE_Asynch_Write_File (void); - - /// Destructor. - virtual ~ACE_Asynch_Write_File (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /** - * This starts off an asynchronous write. Upto - * will be written from the , starting at the - * block's . The write will go to the file, starting - * bytes from the beginning of the file. Priority of the - * operation is specified by . On POSIX4-Unix, this is - * supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, this is a no-op. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - int write (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset = 0, - u_long offset_high = 0, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - /** - * Same as above but with gather support, through chaining of composite - * message blocks using the continuation field. - * NOTE: In win32 Each data block payload must be at least the size of a system - * memory page and must be aligned on a system memory page size boundary - */ - int writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset = 0, - u_long offset_high = 0, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - - /// Return the underlying implementation class. - ACE_Asynch_Write_File_Impl *implementation (void) const; - -protected: - /// Set the implementation. - void implementation (ACE_Asynch_Write_File_Impl *implementation); - - /// Implementation object. - ACE_Asynch_Write_File_Impl *implementation_; - -public: -/** - * @class Result - * - * @brief This is that class which will be passed back to the - * when the asynchronous write completes. This class - * forwards all the methods to the implementation class. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous write. - * This class differs slightly from - * ACE_Asynch_Write_Stream::Result as it calls back - * on the instead - * of . No additional state - * is required by this class as ACE_Asynch_Result can store - * the . - */ - class ACE_Export Result : public ACE_Asynch_Write_Stream::Result - { - - /// The concrete implementation result classes only construct this - /// class. - friend class ACE_POSIX_Asynch_Write_File_Result; - friend class ACE_WIN32_Asynch_Write_File_Result; - - public: - /// Get the implementation class. - ACE_Asynch_Write_File_Result_Impl *implementation (void) const; - - protected: - /// Constructor. This implementation will not be deleted. - Result (ACE_Asynch_Write_File_Result_Impl *implementation); - - /// Destructor. - virtual ~Result (void); - - /// The implementation class. - ACE_Asynch_Write_File_Result_Impl *implementation_; - - private: - /// Here just to provide an dummpy implementation, since the - /// one auto generated by MSVC is flagged as infinitely recursive - void operator= (Result &) {}; - }; -}; - -// Forward declarations -class ACE_Asynch_Accept_Result_Impl; -class ACE_Asynch_Accept_Impl; - -/** - * @class ACE_Asynch_Accept - * - * @brief This class is a factory for starting off asynchronous accepts - * on a listen handle. This class forwards all methods to its - * implementation class. - * - * Once is called, multiple asynchronous s can - * started using this class. A ACE_Asynch_Accept::Result will - * be passed back to the when the asynchronous accept - * completes through the - * callback. - */ -class ACE_Export ACE_Asynch_Accept : public ACE_Asynch_Operation -{ - -public: - /// A do nothing constructor. - ACE_Asynch_Accept (void); - - /// Destructor. - virtual ~ACE_Asynch_Accept (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /** - * This starts off an asynchronous accept. The asynchronous accept - * call also allows any initial data to be returned to the - * . Upto will be read and stored in the - * . The will be used for the - * call. If ( == INVALID_HANDLE), a new - * handle will be created. Priority of the - * operation is specified by . On POSIX4-Unix, this is - * supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, this is a no-op. - * - * must be specified. This is because the address of - * the new connection is placed at the end of this buffer. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - int accept (ACE_Message_Block &message_block, - size_t bytes_to_read, - ACE_HANDLE accept_handle = ACE_INVALID_HANDLE, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - /// Return the underlying implementation class. - ACE_Asynch_Accept_Impl *implementation (void) const; - -protected: - /// Set the implementation class. - void implementation (ACE_Asynch_Accept_Impl *implementation); - - /// Delegation/implementation class that all methods will be - /// forwarded to. - ACE_Asynch_Accept_Impl *implementation_; - -public: -/** - * @class Result - * - * @brief This is that class which will be passed back to the - * when the asynchronous accept completes. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous accept. - */ - class ACE_Export Result : public ACE_Asynch_Result - { - - /// The concrete implementation result classes only construct this - /// class. - friend class ACE_POSIX_Asynch_Accept_Result; - friend class ACE_WIN32_Asynch_Accept_Result; - - public: - /// The number of bytes which were requested at the start of the - /// asynchronous accept. - size_t bytes_to_read (void) const; - - /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; - - /// I/O handle used for accepting new connections. - ACE_HANDLE listen_handle (void) const; - - /// I/O handle for the new connection. - ACE_HANDLE accept_handle (void) const; - - /// Get the implementation. - ACE_Asynch_Accept_Result_Impl *implementation (void) const; - - protected: - /// Contructor. Implementation will not be deleted. - Result (ACE_Asynch_Accept_Result_Impl *implementation); - - /// Destructor. - virtual ~Result (void); - - /// Impelmentation class. - ACE_Asynch_Accept_Result_Impl *implementation_; - }; -}; -// Forward declarations -class ACE_Asynch_Connect_Result_Impl; -class ACE_Asynch_Connect_Impl; - -/** - * @class ACE_Asynch_Connect - * - * @brief This class is a factory for starting off asynchronous connects - * This class forwards all methods to its implementation class. - * - * Once @c open is called, multiple asynchronous connect operationss can - * started using this class. A ACE_Asynch_Connect::Result will - * be passed back to the associated ACE_Handler when the asynchronous connect - * completes through the ACE_Handler::handle_connect() callback. - */ -class ACE_Export ACE_Asynch_Connect : public ACE_Asynch_Operation -{ - -public: - /// A do nothing constructor. - ACE_Asynch_Connect (void); - - /// Destructor. - virtual ~ACE_Asynch_Connect (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. - * - * @note @arg handle is ignored and should be @c ACE_INVALID_HANDLE. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /** - * This starts off an asynchronous Connect. - */ - int connect (ACE_HANDLE connect_handle, - const ACE_Addr & remote_sap, - const ACE_Addr & local_sap, - int reuse_addr, - const void *act=0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - /// Return the underlying implementation class. - ACE_Asynch_Connect_Impl *implementation (void) const; - -protected: - /// Set the implementation class. - void implementation (ACE_Asynch_Connect_Impl *implementation); - - /// Delegation/implementation class that all methods will be - /// forwarded to. - ACE_Asynch_Connect_Impl *implementation_; - -public: -/** - * @class Result - * - * @brief This is that class which will be passed back to the - * handler when the asynchronous connect completes. - * - * This class has all the information necessary for the - * handler to uniquely identify the completion of the - * asynchronous connect. - */ - class ACE_Export Result : public ACE_Asynch_Result - { - - /// The concrete implementation result classes only construct this - /// class. - friend class ACE_POSIX_Asynch_Connect_Result; - friend class ACE_WIN32_Asynch_Connect_Result; - - public: - - /// I/O handle for the connection. - ACE_HANDLE connect_handle (void) const; - - /// Get the implementation. - ACE_Asynch_Connect_Result_Impl *implementation (void) const; - - protected: - /// Contructor. Implementation will not be deleted. - Result (ACE_Asynch_Connect_Result_Impl *implementation); - - /// Destructor. - virtual ~Result (void); - - /// Impelmentation class. - ACE_Asynch_Connect_Result_Impl *implementation_; - }; -}; - -// Forward declarations -class ACE_Asynch_Transmit_File_Result_Impl; -class ACE_Asynch_Transmit_File_Impl; - -/** - * @class ACE_Asynch_Transmit_File - * - * @brief This class is a factory for starting off asynchronous - * transmit files on a stream. - * - * Once is called, multiple asynchronous s - * can started using this class. A - * ACE_Asynch_Transmit_File::Result will be passed back to the - * when the asynchronous transmit file completes - * through the callback. - * The transmit_file function transmits file data over a - * connected network connection. The function uses the operating - * system's cache manager to retrieve the file data. This - * function provides high-performance file data transfer over - * network connections. This function would be of great use in - * a Web Server, Image Server, etc. - */ -class ACE_Export ACE_Asynch_Transmit_File : public ACE_Asynch_Operation -{ - -public: - // Forward declarations - class Header_And_Trailer; - - /// A do nothing constructor. - ACE_Asynch_Transmit_File (void); - - /// Destructor. - virtual ~ACE_Asynch_Transmit_File (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /** - * This starts off an asynchronous transmit file. The is a - * handle to an open file. is a pointer to a - * data structure that contains pointers to data to send before and - * after the file data is sent. Set this parameter to 0 if you only - * want to transmit the file data. Upto will be - * written to the . If you want to send the entire file, - * let = 0. is the size of each - * block of data sent per send operation. Please read the Win32 - * documentation on what the flags should be. Priority of the - * operation is specified by . On POSIX4-Unix, this is - * supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, this is a no-op. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - int transmit_file (ACE_HANDLE file, - Header_And_Trailer *header_and_trailer = 0, - size_t bytes_to_write = 0, - u_long offset = 0, - u_long offset_high = 0, - size_t bytes_per_send = 0, - u_long flags = 0, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - /// Return the underlying implementation class. - ACE_Asynch_Transmit_File_Impl *implementation (void) const; - -protected: - /// Set the implementation. - void implementation (ACE_Asynch_Transmit_File_Impl *); - - /// The implementation class. - ACE_Asynch_Transmit_File_Impl *implementation_; - -public: -/** - * @class Result - * - * @brief This is that class which will be passed back to the - * when the asynchronous transmit file completes. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous transmit file. - */ - class ACE_Export Result : public ACE_Asynch_Result - { - - /// The concrete implementation result classes only construct this - /// class. - friend class ACE_POSIX_Asynch_Transmit_File_Result; - friend class ACE_WIN32_Asynch_Transmit_File_Result; - - public: - /// Socket used for transmitting the file. - ACE_HANDLE socket (void) const; - - /// File from which the data is read. - ACE_HANDLE file (void) const; - - /// Header and trailer data associated with this transmit file. - Header_And_Trailer *header_and_trailer (void) const; - - /// The number of bytes which were requested at the start of the - /// asynchronous transmit file. - size_t bytes_to_write (void) const; - - /// Number of bytes per send requested at the start of the transmit - /// file. - size_t bytes_per_send (void) const; - - /// Flags which were passed into transmit file. - u_long flags (void) const; - - /// Get the implementation class. - ACE_Asynch_Transmit_File_Result_Impl *implementation (void) const; - - protected: - /// Constructor. - Result (ACE_Asynch_Transmit_File_Result_Impl *implementation); - - /// Destructor. - virtual ~Result (void); - - /// The implementation class. - ACE_Asynch_Transmit_File_Result_Impl *implementation_; - }; - -/** - * @class Header_And_Trailer - * - * @brief The class defines a data structure that contains pointers - * to data to send before and after the file data is sent. - * - * This class provides a wrapper over TRANSMIT_FILE_BUFFERS - * and provided a consistent use of ACE_Message_Blocks. - */ - class ACE_Export Header_And_Trailer - { - - public: - /// Constructor. - Header_And_Trailer (ACE_Message_Block *header = 0, - size_t header_bytes = 0, - ACE_Message_Block *trailer = 0, - size_t trailer_bytes = 0); - - /// Destructor - virtual ~Header_And_Trailer (void); - - /// This method allows all the member to be set in one fell swoop. - void header_and_trailer (ACE_Message_Block *header = 0, - size_t header_bytes = 0, - ACE_Message_Block *trailer = 0, - size_t trailer_bytes = 0); - - /// Get header which goes before the file data. - ACE_Message_Block *header (void) const; - - /// Set header which goes before the file data. - void header (ACE_Message_Block *message_block); - - /// Get size of the header data. - size_t header_bytes (void) const; - - /// Set size of the header data. - void header_bytes (size_t bytes); - - /// Get trailer which goes after the file data. - ACE_Message_Block *trailer (void) const; - - /// Set trailer which goes after the file data. - void trailer (ACE_Message_Block *message_block); - - /// Get size of the trailer data. - size_t trailer_bytes (void) const; - - /// Set size of the trailer data. - void trailer_bytes (size_t bytes); - - /// Conversion routine. - ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers (void); - - protected: - /// Header data. - ACE_Message_Block *header_; - - /// Size of header data. - size_t header_bytes_; - - /// Trailer data. - ACE_Message_Block *trailer_; - - /// Size of trailer data. - size_t trailer_bytes_; - - /// Target data structure. - ACE_TRANSMIT_FILE_BUFFERS transmit_buffers_; - }; -}; - - -// Forward declarations -class ACE_Asynch_Read_Dgram_Result_Impl; -class ACE_Asynch_Read_Dgram_Impl; -class ACE_Addr; - -/** - * @class ACE_Asynch_Read_Dgram - * - * @brief This class is a factory for starting off asynchronous reads - * on a UDP socket. This class forwards all methods to its - * implementation class. - * - * Once is called, multiple asynchronous s can be - * started using this class. An ACE_Asynch_Read_Dgram::Result - * will be passed back to the when the asynchronous - * reads completes through the - * callback. - */ -class ACE_Export ACE_Asynch_Read_Dgram : public ACE_Asynch_Operation -{ - -public: - /// A do nothing constructor. - ACE_Asynch_Read_Dgram (void); - - /// Destructor - virtual ~ACE_Asynch_Read_Dgram (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /** This starts off an asynchronous read. Upto - * total_size()> will be read and stored in the - * . 's will be updated to reflect - * the added bytes if the read operation is successfully completed. - * Return code of 1 means immediate success and - * will contain number of bytes read. The - * method will still be called. Return code of 0 means the IO will - * complete proactively. Return code of -1 means there was an error, use - * errno to get the error code. - * - * Scatter/gather is supported on WIN32 by using the cont()> - * method. Up to ACE_IOV_MAX 's are supported. Upto - * size()> bytes will be read into each for - * a total of total_size()> bytes. All 's - * 's will be updated to reflect the added bytes for each - * - * - * Priority of the operation is specified by . On POSIX4-Unix, - * this is supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, is a no-op. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - ssize_t recv (ACE_Message_Block *message_block, - size_t &number_of_bytes_recvd, - int flags, - int protocol_family = PF_INET, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - /// Return the underlying implementation class. - ACE_Asynch_Read_Dgram_Impl *implementation (void) const; - -protected: - /// Set the implementation class. - void implementation (ACE_Asynch_Read_Dgram_Impl *implementation); - - /// Implementation class that all methods will be forwarded to. - ACE_Asynch_Read_Dgram_Impl *implementation_; - -public: -/** - * @class Result - * - * @brief This is the class which will be passed back to the - * when the asynchronous read completes. This class - * forwards all the methods to the implementation classes. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous read. - */ - class ACE_Export Result : public ACE_Asynch_Result - { - - /// The concrete implementation result classes only construct this - /// class. - friend class ACE_POSIX_Asynch_Read_Dgram_Result; - friend class ACE_WIN32_Asynch_Read_Dgram_Result; - - public: - - /// The number of bytes which were requested at the start of the - /// asynchronous read. - size_t bytes_to_read (void) const; - - /// Message block which contains the read data - ACE_Message_Block *message_block (void) const; - - /// The flags used in the read - int flags (void) const; - - /// The address of where the packet came from - int remote_address (ACE_Addr& addr) const; - - /// I/O handle used for reading. - ACE_HANDLE handle (void) const; - - /// Get the implementation class. - ACE_Asynch_Read_Dgram_Result_Impl *implementation (void) const; - - protected: - /// Constructor. - Result (ACE_Asynch_Read_Dgram_Result_Impl *implementation); - - /// Destructor. - virtual ~Result (void); - - /// The implementation class. - ACE_Asynch_Read_Dgram_Result_Impl *implementation_; - }; -}; - -// Forward declarations -class ACE_Asynch_Write_Dgram_Impl; -class ACE_Asynch_Write_Dgram_Result_Impl; - -/** - * @class ACE_Asynch_Write_Dgram - * - * @brief This class is a factory for starting off asynchronous writes - * on a UDP socket. This class forwards all methods to its - * implementation class. - * - * Once is called, multiple asynchronous s can - * started using this class. An ACE_Asynch_Write_Dgram::Result - * will be passed back to the when the asynchronous - * write completes through the - * callback. - */ -class ACE_Export ACE_Asynch_Write_Dgram : public ACE_Asynch_Operation -{ - -public: - /// A do nothing constructor. - ACE_Asynch_Write_Dgram (void); - - /// Destructor. - virtual ~ACE_Asynch_Write_Dgram (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /** This starts off an asynchronous send. Upto - * total_length()> will be sent. 's - * will be updated to reflect the sent bytes if the send operation - * is successfully completed. - * Return code of 1 means immediate success and - * is updated to number of bytes sent. The - * method will still be called. Return code of 0 means the IO will - * complete proactively. Return code of -1 means there was an error, use - * errno to get the error code. - * - * Scatter/gather is supported on WIN32 by using the cont()> - * method. Up to ACE_IOV_MAX 's are supported. Upto - * length()> bytes will be sent from each - * for a total of total_length()> bytes. All - * 's 's will be updated to reflect the bytes sent - * from each . - * - * Priority of the operation is specified by . On POSIX4-Unix, - * this is supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, this argument is a no-op. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - ssize_t send (ACE_Message_Block *message_block, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr& remote_addr, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - /// Return the underlying implementation class. - ACE_Asynch_Write_Dgram_Impl *implementation (void) const; - -protected: - /// Set the implementation class. - void implementation (ACE_Asynch_Write_Dgram_Impl *implementation); - - /// Implementation class that all methods will be forwarded to. - ACE_Asynch_Write_Dgram_Impl *implementation_; - -public: -/** - * @class Result - * - * @brief This is that class which will be passed back to the - * when the asynchronous write completes. This class - * forwards all the methods to the implementation class. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous write. - */ - class ACE_Export Result : public ACE_Asynch_Result - { - - /// The concrete implementation result classes only construct this - /// class. - friend class ACE_POSIX_Asynch_Write_Dgram_Result; - friend class ACE_WIN32_Asynch_Write_Dgram_Result; - - public: - - /// The number of bytes which were requested at the start of the - /// asynchronous write. - size_t bytes_to_write (void) const; - - /// Message block which contains the sent data - ACE_Message_Block *message_block (void) const; - - /// The flags using in the write - int flags (void) const; - - /// I/O handle used for writing. - ACE_HANDLE handle (void) const; - - /// Get the implementation class. - ACE_Asynch_Write_Dgram_Result_Impl *implementation (void) const; - - protected: - /// Constructor. - Result (ACE_Asynch_Write_Dgram_Result_Impl *implementation); - - /// Destructor. - virtual ~Result (void); - - /// Implementation class. - ACE_Asynch_Write_Dgram_Result_Impl *implementation_; - }; -}; - - -/** - * @class ACE_Handler - * - * @brief This base class defines the interface for receiving the - * results of asynchronous operations. - * - * Subclasses of this class will fill in appropriate methods. - */ -class ACE_Export ACE_Handler -{ -public: - /// A do nothing constructor. - ACE_Handler (void); - - /// A do nothing constructor which allows proactor to be set to \. - ACE_Handler (ACE_Proactor *p); - - /// Virtual destruction. - virtual ~ACE_Handler (void); - - /// This method will be called when an asynchronous read completes on - /// a stream. - virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result); - - /// This method will be called when an asynchronous write completes - /// on a UDP socket. - virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result); - - /// This method will be called when an asynchronous read completes on - /// a UDP socket. - virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result); - - /// This method will be called when an asynchronous write completes - /// on a stream. - virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); - - /// This method will be called when an asynchronous read completes on - /// a file. - virtual void handle_read_file (const ACE_Asynch_Read_File::Result &result); - - /// This method will be called when an asynchronous write completes - /// on a file. - virtual void handle_write_file (const ACE_Asynch_Write_File::Result &result); - - /// This method will be called when an asynchronous accept completes. - virtual void handle_accept (const ACE_Asynch_Accept::Result &result); - - /// This method will be called when an asynchronous connect completes. - virtual void handle_connect (const ACE_Asynch_Connect::Result &result); - - /// This method will be called when an asynchronous transmit file - /// completes. - virtual void handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result); - - /// Called when timer expires. was the requested time value and - /// is the ACT passed when scheduling the timer. - virtual void handle_time_out (const ACE_Time_Value &tv, - const void *act = 0); - - /** - * This is method works with the of the - * ACE_Proactor. A special is used to wake up - * all the threads that are blocking for completions. - */ - virtual void handle_wakeup (void); - - /// Get the proactor associated with this handler. - ACE_Proactor *proactor (void); - - /// Set the proactor. - void proactor (ACE_Proactor *p); - - /** - * Get the I/O handle used by this . This method will be - * called by the ACE_Asynch_* classes when an ACE_INVALID_HANDLE is - * passed to . - */ - virtual ACE_HANDLE handle (void) const; - - /// Set the ACE_HANDLE value for this Handler. - virtual void handle (ACE_HANDLE); - -protected: - /// The proactor associated with this handler. - ACE_Proactor *proactor_; - - /// The ACE_HANDLE in use with this handler. - ACE_HANDLE handle_; -}; - -// Forward declarations -class ACE_INET_Addr; - -// Forward declarations -template -class ACE_Asynch_Acceptor; - -/** - * @class ACE_Service_Handler - * - * @brief This base class defines the interface for the - * ACE_Asynch_Acceptor to call into when new connection are - * accepted. - * - * Subclasses of this class will fill in appropriate methods to - * define application specific behavior. - */ -class ACE_Export ACE_Service_Handler : public ACE_Handler -{ - - /// The Acceptor is the factory and therefore should have special - /// privileges. - friend class ACE_Asynch_Acceptor; - -public: - /// A do nothing constructor. - ACE_Service_Handler (void); - - /// Virtual destruction. - virtual ~ACE_Service_Handler (void); - - /** - * is called by ACE_Asynch_Acceptor to initialize a new - * instance of ACE_Service_Handler that has been created after the - * new connection is accepted. The handle for the new connection is - * passed along with the initial data that may have shown up. - */ - virtual void open (ACE_HANDLE new_handle, - ACE_Message_Block &message_block); - - // protected: - // This should be corrected after the correct semantics of the - // friend has been figured out. - - /// Called by ACE_Asynch_Acceptor to pass the addresses of the new - /// connections. - virtual void addresses (const ACE_INET_Addr &remote_address, - const ACE_INET_Addr &local_address); - - /// Called by ACE_Asynch_Acceptor to pass the act. - virtual void act (const void *); -}; - -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/ -#include "ace/post.h" -#endif /* ACE_ASYNCH_IO_H */ diff --git a/ace/Asynch_IO_Impl.cpp b/ace/Asynch_IO_Impl.cpp deleted file mode 100644 index 8f26d82ae4b..00000000000 --- a/ace/Asynch_IO_Impl.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// $Id$ - -#include "ace/Asynch_IO_Impl.h" - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) -// This only works on Win32 platforms and on Unix platforms supporting -// aio calls. -#include "ace/OS.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Asynch_IO_Impl.i" -#endif /* __ACE_INLINE__ */ - -ACE_Asynch_Result_Impl::~ACE_Asynch_Result_Impl (void) -{ -} - -ACE_Asynch_Operation_Impl::~ACE_Asynch_Operation_Impl (void) -{ -} - -ACE_Asynch_Read_Stream_Impl::~ACE_Asynch_Read_Stream_Impl (void) -{ -} - -ACE_Asynch_Read_Stream_Result_Impl::~ACE_Asynch_Read_Stream_Result_Impl (void) -{ -} - -ACE_Asynch_Write_Stream_Impl::~ACE_Asynch_Write_Stream_Impl (void) -{ -} - -ACE_Asynch_Write_Stream_Result_Impl::~ACE_Asynch_Write_Stream_Result_Impl (void) -{ -} - -ACE_Asynch_Read_File_Impl::~ACE_Asynch_Read_File_Impl (void) -{ -} - -ACE_Asynch_Write_File_Impl::~ACE_Asynch_Write_File_Impl (void) -{ -} - -ACE_Asynch_Read_File_Result_Impl::~ACE_Asynch_Read_File_Result_Impl (void) -{ -} - -ACE_Asynch_Write_File_Result_Impl::~ACE_Asynch_Write_File_Result_Impl (void) -{ -} - -ACE_Asynch_Accept_Result_Impl::~ACE_Asynch_Accept_Result_Impl (void) -{ -} - -ACE_Asynch_Connect_Result_Impl::~ACE_Asynch_Connect_Result_Impl (void) -{ -} - -ACE_Asynch_Accept_Impl::~ACE_Asynch_Accept_Impl (void) -{ -} - -ACE_Asynch_Connect_Impl::~ACE_Asynch_Connect_Impl (void) -{ -} - -ACE_Asynch_Transmit_File_Impl::~ACE_Asynch_Transmit_File_Impl (void) -{ -} - -ACE_Asynch_Transmit_File_Result_Impl::~ACE_Asynch_Transmit_File_Result_Impl (void) -{ -} - -ACE_Asynch_Read_Dgram_Impl::~ACE_Asynch_Read_Dgram_Impl (void) -{ -} - -ACE_Asynch_Read_Dgram_Impl::ACE_Asynch_Read_Dgram_Impl (void) -{ -} - -ACE_Asynch_Write_Dgram_Impl::~ACE_Asynch_Write_Dgram_Impl (void) -{ -} - -ACE_Asynch_Write_Dgram_Impl::ACE_Asynch_Write_Dgram_Impl (void) -{ -} - -//*********************************************** - -ACE_Asynch_Read_Dgram_Result_Impl::~ACE_Asynch_Read_Dgram_Result_Impl (void) -{ -} - -ACE_Asynch_Read_Dgram_Result_Impl::ACE_Asynch_Read_Dgram_Result_Impl (void) -{ -} - -//*********************************************** - -ACE_Asynch_Write_Dgram_Result_Impl::~ACE_Asynch_Write_Dgram_Result_Impl (void) -{ -} - -ACE_Asynch_Write_Dgram_Result_Impl::ACE_Asynch_Write_Dgram_Result_Impl (void) -{ -} - - - - -#endif /* ACE_WIN32 || ACE_HAS_WINCE */ diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h deleted file mode 100644 index f28823f4eb0..00000000000 --- a/ace/Asynch_IO_Impl.h +++ /dev/null @@ -1,820 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Asynch_IO_Impl.h - * - * $Id$ - * - * - * This class contains asbtract base classes for all the concrete - * implementation classes for the various asynchronous operations - * that are used with the Praoctor. - * - * - * @author Irfan Pyarali (irfan@cs.wustl.edu) - * @author Tim Harrison (harrison@cs.wustl.edu) - * @author Alexander Babu Arulanthu - * @author Roger Tragin - * @author Alexander Libman - */ -//============================================================================= - -#ifndef ACE_ASYNCH_IO_IMPL_H -#define ACE_ASYNCH_IO_IMPL_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) -// This only works on Win32 platforms and on Unix platforms supporting -// aio calls. - -#include "ace/Asynch_IO.h" - -// Forward declaration. -class ACE_Proactor_Impl; - -/** - * @class ACE_Asynch_Result_Impl - * - * @brief Abstract base class for the all the classes that provide - * concrete implementations for ACE_Asynch_Result. - * - */ -class ACE_Export ACE_Asynch_Result_Impl -{ -public: - virtual ~ACE_Asynch_Result_Impl (void); - - /// Number of bytes transferred by the operation. - virtual size_t bytes_transferred (void) const = 0; - - /// ACT associated with the operation. - virtual const void *act (void) const = 0; - - /// Did the operation succeed? - virtual int success (void) const = 0; - - /// This ACT is not the same as the ACT associated with the - /// asynchronous operation. - virtual const void *completion_key (void) const = 0; - - /// Error value if the operation fail. - virtual u_long error (void) const = 0; - - /// Event associated with the OVERLAPPED structure. - virtual ACE_HANDLE event (void) const = 0; - - /// This really make sense only when doing file I/O. - virtual u_long offset (void) const = 0; - virtual u_long offset_high (void) const = 0; - - /// Priority of the operation. - virtual int priority (void) const = 0; - - /** - * POSIX4 real-time signal number to be used for the - * operation. ranges from SIGRTMIN to SIGRTMAX. By - * default, SIGRTMIN is used to issue calls. This is a no-op - * on non-POSIX4 systems and returns 0. - */ - virtual int signal_number (void) const = 0; - - // protected: - // - // These two should really be protected. But sometimes it - // simplifies code to be able to "fake" a result. Use carefully. - /// This is called when the asynchronous operation completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error = 0) = 0; - - /// Post to the Proactor's completion port. - virtual int post_completion (ACE_Proactor_Impl *proactor) = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Result_Impl (void); -}; - -/** - * @class ACE_Asynch_Operation_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Operation. - */ -class ACE_Export ACE_Asynch_Operation_Impl -{ -public: - virtual ~ACE_Asynch_Operation_Impl (void); - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - virtual int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) = 0; - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - virtual int cancel (void) = 0; - - // = Access methods. - - /// Return the underlying proactor. - virtual ACE_Proactor* proactor (void) const = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Operation_Impl (void); -}; - -/** - * @class ACE_Asynch_Read_Stream_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Read_Stream - * - */ -class ACE_Export ACE_Asynch_Read_Stream_Impl : public virtual ACE_Asynch_Operation_Impl -{ -public: - virtual ~ACE_Asynch_Read_Stream_Impl (void); - - /// This starts off an asynchronous read. Upto will - /// be read and stored in the . - virtual int read (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) = 0; - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - /** - * Same as above but with scatter support, through chaining of composite - * message blocks using the continuation field. - */ - virtual int readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - -protected: - /// Do-nothing constructor. - ACE_Asynch_Read_Stream_Impl (void); -}; - -/** - * @class ACE_Asynch_Read_Stream_Result_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Read_Stream::Result class. - * - */ -class ACE_Export ACE_Asynch_Read_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl -{ -public: - virtual ~ACE_Asynch_Read_Stream_Result_Impl (void); - - /// The number of bytes which were requested at the start of the - /// asynchronous read. - virtual size_t bytes_to_read (void) const = 0; - - /// Message block which contains the read data. - virtual ACE_Message_Block &message_block (void) const = 0; - - /// I/O handle used for reading. - virtual ACE_HANDLE handle (void) const = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Read_Stream_Result_Impl (void); -}; - -/** - * @class ACE_Asynch_Write_Stream_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Write_Stream class. - * - */ -class ACE_Export ACE_Asynch_Write_Stream_Impl : public virtual ACE_Asynch_Operation_Impl -{ -public: - virtual ~ACE_Asynch_Write_Stream_Impl (void); - - /// This starts off an asynchronous write. Upto - /// will be written from the . - virtual int write (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) = 0; - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - /** - * Same as above but with gather support, through chaining of composite - * message blocks using the continuation field. - */ - virtual int writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - -protected: - /// Do-nothing constructor. - ACE_Asynch_Write_Stream_Impl (void); -}; - -/** - * @class ACE_Asynch_Write_Stream_Result_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Write_Stream::Result. - * - */ -class ACE_Export ACE_Asynch_Write_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl -{ -public: - virtual ~ACE_Asynch_Write_Stream_Result_Impl (void); - - /// The number of bytes which were requested at the start of the - /// asynchronous write. - virtual size_t bytes_to_write (void) const = 0; - - /// Message block that contains the data to be written. - virtual ACE_Message_Block &message_block (void) const = 0; - - /// I/O handle used for writing. - virtual ACE_HANDLE handle (void) const = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Write_Stream_Result_Impl (void); -}; - -/** - * @class ACE_Asynch_Read_File_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Read_File::Result. - * - */ -class ACE_Export ACE_Asynch_Read_File_Impl : public virtual ACE_Asynch_Read_Stream_Impl -{ -public: - virtual ~ACE_Asynch_Read_File_Impl (void); - - /** - * This starts off an asynchronous read. Upto will - * be read and stored in the . The read will start - * at from the beginning of the file. - */ - virtual int read (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) = 0; - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - /** - * Same as above but with scatter support, through chaining of composite - * message blocks using the continuation field. - * NOTE: In win32 Each data block payload must be at least the size of a system - * memory page and must be aligned on a system memory page size boundary - */ - virtual int readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - - // We don;t need to redefine the following function again because it - // has already been defined in ACE_Asynch_Read_Stream_Impl. But we - // still need it here to supress a overwriting pure virtual function - // warning in KAI compiler. - /// This starts off an asynchronous read. Upto will - /// be read and stored in the . - virtual int read (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) = 0; - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - /** - * Same as above but with scatter support, through chaining of composite - * message blocks using the continuation field. - */ - virtual int readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - -protected: - /// Do-nothing constructor. - ACE_Asynch_Read_File_Impl (void); -}; - -/** - * @class ACE_Asynch_Read_File_Result_Impl - * - * @brief This is the abstract base class for all the concrete - * implementation classes for ACE_Asynch_Read_File::Result. - * - */ -class ACE_Export ACE_Asynch_Read_File_Result_Impl : public virtual ACE_Asynch_Read_Stream_Result_Impl -{ -public: - /// Destructor. - virtual ~ACE_Asynch_Read_File_Result_Impl (void); - -protected: - /// Do-nothing constructor. - ACE_Asynch_Read_File_Result_Impl (void); -}; - -/** - * @class ACE_Asynch_Write_File_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Write_File. - * - */ -class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_Stream_Impl -{ -public: - virtual ~ACE_Asynch_Write_File_Impl (void); - - /** - * This starts off an asynchronous write. Upto - * will be write and stored in the . The write will - * start at from the beginning of the file. - */ - virtual int write (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) = 0; - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - /** - * Same as above but with gather support, through chaining of composite - * message blocks using the continuation field. - * NOTE: In win32 Each data block payload must be at least the size of a system - * memory page and must be aligned on a system memory page size boundary - */ - virtual int writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - - - // We don;t need to redefine the following function again because it - // has already been defined in ACE_Asynch_Write_Stream_Impl. But we - // still need it here to supress a overwriting pure virtual function - // warning in KAI compiler. - /// This starts off an asynchronous write. Upto - /// will be written from the . - virtual int write (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) = 0; - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - /** - * Same as above but with gather support, through chaining of composite - * message blocks using the continuation field. - */ - virtual int writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ - -protected: - /// Do-nothing constructor. - ACE_Asynch_Write_File_Impl (void); -}; - -/** - * @class ACE_Asynch_Write_File_Result_Impl - * - * @brief This is the abstract base class for all the concrete - * implementation classes that provide different implementations - * for the ACE_Asynch_Write_File::Result. - * - */ -class ACE_Export ACE_Asynch_Write_File_Result_Impl : public virtual ACE_Asynch_Write_Stream_Result_Impl -{ -public: - virtual ~ACE_Asynch_Write_File_Result_Impl (void); - -protected: - /// Do-nothing constructor. - ACE_Asynch_Write_File_Result_Impl (void); -}; - -/** - * @class ACE_Asynch_Accept_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Accept. - * - */ -class ACE_Export ACE_Asynch_Accept_Impl : public virtual ACE_Asynch_Operation_Impl -{ -public: - virtual ~ACE_Asynch_Accept_Impl (void); - - /** - * This starts off an asynchronous accept. The asynchronous accept - * call also allows any initial data to be returned to the - * . Upto will be read and stored in the - * . The will be used for the - * call. If ( == INVALID_HANDLE), a new - * handle will be created. - * - * must be specified. This is because the address of - * the new connection is placed at the end of this buffer. - */ - virtual int accept (ACE_Message_Block &message_block, - size_t bytes_to_read, - ACE_HANDLE accept_handle, - const void *act, - int priority, - int signal_number) = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Accept_Impl (void); -}; - -/** - * @class ACE_Asynch_Accept_Result_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Accept. - * - */ -class ACE_Export ACE_Asynch_Accept_Result_Impl : public virtual ACE_Asynch_Result_Impl -{ -public: - virtual ~ACE_Asynch_Accept_Result_Impl (void); - - /// The number of bytes which were requested at the start of the - /// asynchronous accept. - virtual size_t bytes_to_read (void) const = 0; - - /// Message block which contains the read data. - virtual ACE_Message_Block &message_block (void) const = 0; - - /// I/O handle used for accepting new connections. - virtual ACE_HANDLE listen_handle (void) const = 0; - - /// I/O handle for the new connection. - virtual ACE_HANDLE accept_handle (void) const = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Accept_Result_Impl (void); -}; - - -/** - * @class ACE_Asynch_Connect_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Connect. - * - */ -class ACE_Export ACE_Asynch_Connect_Impl : public virtual ACE_Asynch_Operation_Impl -{ -public: - virtual ~ACE_Asynch_Connect_Impl (void); - - /** - * This starts off an asynchronous connect - */ - virtual int connect (ACE_HANDLE connect_handle, - const ACE_Addr & remote_sap, - const ACE_Addr & local_sap, - int reuse_addr, - const void *act, - int priority, - int signal_number) = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Connect_Impl (void); -}; - -/** - * @class ACE_Asynch_Connect_Result_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Connect. - * - */ -class ACE_Export ACE_Asynch_Connect_Result_Impl : public virtual ACE_Asynch_Result_Impl -{ -public: - virtual ~ACE_Asynch_Connect_Result_Impl (void); - - /// I/O handle for the connection. - virtual ACE_HANDLE connect_handle (void) const = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Connect_Result_Impl (void); -}; - - -/** - * @class ACE_Asynch_Transmit_File_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Transmit_File. - * - */ -class ACE_Asynch_Transmit_File_Impl : public virtual ACE_Asynch_Operation_Impl -{ -public: - virtual ~ACE_Asynch_Transmit_File_Impl (void); - - /// This starts off an asynchronous transmit file. - virtual int transmit_file (ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - int priority, - int signal_number) = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Transmit_File_Impl (void); -}; - -/** - * @class ACE_Asynch_Transmit_File_Result_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Transmit_File::Result. - * - */ -class ACE_Export ACE_Asynch_Transmit_File_Result_Impl : public virtual ACE_Asynch_Result_Impl -{ -public: - virtual ~ACE_Asynch_Transmit_File_Result_Impl (void); - - /// Socket used for transmitting the file. - virtual ACE_HANDLE socket (void) const = 0; - - /// File from which the data is read. - virtual ACE_HANDLE file (void) const = 0; - - /// Header and trailer data associated with this transmit file. - virtual ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer (void) const = 0; - - /// The number of bytes which were requested at the start of the - /// asynchronous transmit file. - virtual size_t bytes_to_write (void) const = 0; - - /// Number of bytes per send requested at the start of the transmit - /// file. - virtual size_t bytes_per_send (void) const = 0; - - /// Flags which were passed into transmit file. - virtual u_long flags (void) const = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Transmit_File_Result_Impl (void); -}; - - -/** - * @class ACE_Asynch_Read_Dgram_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Read_Dgram - * - */ -class ACE_Export ACE_Asynch_Read_Dgram_Impl : public virtual ACE_Asynch_Operation_Impl -{ -public: - virtual ~ACE_Asynch_Read_Dgram_Impl (void); - - /** This starts off an asynchronous read. Upto - * total_size()> will be read and stored in the - * . 's will be updated to reflect - * the added bytes if the read operation is successful completed. - * Return code of 1 means immediate success and - * will contain number of bytes read. The - * method will still be called. Return code of 0 means the IO will - * complete proactively. Return code of -1 means there was an error, use - * errno to get the error code. - * - * Scatter/gather is supported on WIN32 by using the cont()> - * method. Up to ACE_IOV_MAX 's are supported. Upto - * size()> bytes will be read into each for - * a total of total_size()> bytes. All 's - * 's will be updated to reflect the added bytes for each - * - * - * Priority of the operation is specified by . On POSIX4-Unix, - * this is supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, is a no-op. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - virtual ssize_t recv (ACE_Message_Block *message_block, - size_t &number_of_bytes_recvd, - int flags, - int protocol_family, - const void *act, - int priority, - int signal_number) = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Read_Dgram_Impl (void); -}; - -/** - * @class ACE_Asynch_Read_Dgram_Result_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Read_Dgram::Result class. - * - */ -class ACE_Export ACE_Asynch_Read_Dgram_Result_Impl : public virtual ACE_Asynch_Result_Impl -{ -public: - virtual ~ACE_Asynch_Read_Dgram_Result_Impl (void); - - /// Message block which contains the read data - virtual ACE_Message_Block *message_block (void) const = 0; - - /// The number of bytes which were requested at the start of the - /// asynchronous read. - virtual size_t bytes_to_read (void) const = 0; - - /// The address of where the packet came from - virtual int remote_address (ACE_Addr& addr) const = 0; - - /// The flags used in the read - virtual int flags (void) const = 0; - - /// I/O handle used for reading. - virtual ACE_HANDLE handle (void) const = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Read_Dgram_Result_Impl (void); -}; - -/** - * @class ACE_Asynch_Write_Dgram_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Write_Dgram class. - * - */ -class ACE_Export ACE_Asynch_Write_Dgram_Impl : public virtual ACE_Asynch_Operation_Impl -{ -public: - virtual ~ACE_Asynch_Write_Dgram_Impl (void); - - /** This starts off an asynchronous send. Upto - * total_length()> will be sent. 's - * will be updated to reflect the sent bytes if the send operation - * is successful completed. - * Return code of 1 means immediate success and - * is updated to number of bytes sent. The - * method will still be called. Return code of 0 means the IO will - * complete proactively. Return code of -1 means there was an error, use - * errno to get the error code. - * - * Scatter/gather is supported on WIN32 by using the cont()> - * method. Up to ACE_IOV_MAX 's are supported. Upto - * length()> bytes will be sent from each - * for a total of total_length()> bytes. All - * 's 's will be updated to reflect the bytes sent - * from each . - * - * Priority of the operation is specified by . On POSIX4-Unix, - * this is supported. Works like in Unix. Negative values are not - * allowed. 0 means priority of the operation same as the process - * priority. 1 means priority of the operation is one less than - * process. And so forth. On Win32, this argument is a no-op. - * is the POSIX4 real-time signal number to be used - * for the operation. ranges from ACE_SIGRTMIN to - * ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. - */ - virtual ssize_t send (ACE_Message_Block *message_block, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr &addr, - const void *act, - int priority, - int signal_number) = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Write_Dgram_Impl (void); -}; - -/** - * @class ACE_Asynch_Write_Dgram_Result_Impl - * - * @brief Abstract base class for all the concrete implementation - * classes that provide different implementations for the - * ACE_Asynch_Write_Dgram::Result class. - * - */ -class ACE_Export ACE_Asynch_Write_Dgram_Result_Impl : public virtual ACE_Asynch_Result_Impl -{ -public: - virtual ~ACE_Asynch_Write_Dgram_Result_Impl (void); - - /// The number of bytes which were requested at the start of the - /// asynchronous write. - virtual size_t bytes_to_write (void) const = 0; - - /// Message block which contains the sent data - virtual ACE_Message_Block *message_block (void) const = 0; - - /// The flags using in the write - virtual int flags (void) const = 0; - - /// I/O handle used for writing. - virtual ACE_HANDLE handle (void) const = 0; - -protected: - /// Do-nothing constructor. - ACE_Asynch_Write_Dgram_Result_Impl (void); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Asynch_IO_Impl.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_AIO_CALLS || !ACE_HAS_WINCE && ACE_WIN32 */ -#include "ace/post.h" -#endif /* ACE_ASYNCH_IO_IMPL_H */ diff --git a/ace/Asynch_IO_Impl.i b/ace/Asynch_IO_Impl.i deleted file mode 100644 index 3d61fae7942..00000000000 --- a/ace/Asynch_IO_Impl.i +++ /dev/null @@ -1,100 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_Asynch_Result_Impl::ACE_Asynch_Result_Impl (void) -{ -} - -ACE_INLINE -ACE_Asynch_Operation_Impl::ACE_Asynch_Operation_Impl (void) -{ -} - -ACE_INLINE -ACE_Asynch_Read_Stream_Impl::ACE_Asynch_Read_Stream_Impl (void) - : ACE_Asynch_Operation_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Read_Stream_Result_Impl::ACE_Asynch_Read_Stream_Result_Impl (void) - : ACE_Asynch_Result_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Write_Stream_Impl::ACE_Asynch_Write_Stream_Impl (void) - : ACE_Asynch_Operation_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Write_Stream_Result_Impl::ACE_Asynch_Write_Stream_Result_Impl (void) - : ACE_Asynch_Result_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Read_File_Impl::ACE_Asynch_Read_File_Impl (void) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Read_Stream_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Read_File_Result_Impl::ACE_Asynch_Read_File_Result_Impl (void) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Read_Stream_Result_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Write_File_Impl::ACE_Asynch_Write_File_Impl (void) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Write_Stream_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Write_File_Result_Impl::ACE_Asynch_Write_File_Result_Impl (void) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Write_Stream_Result_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Accept_Impl::ACE_Asynch_Accept_Impl (void) - : ACE_Asynch_Operation_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Accept_Result_Impl::ACE_Asynch_Accept_Result_Impl (void) - : ACE_Asynch_Result_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Connect_Impl::ACE_Asynch_Connect_Impl (void) - : ACE_Asynch_Operation_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Connect_Result_Impl::ACE_Asynch_Connect_Result_Impl (void) - : ACE_Asynch_Result_Impl () -{ -} - - -ACE_INLINE -ACE_Asynch_Transmit_File_Impl::ACE_Asynch_Transmit_File_Impl (void) - : ACE_Asynch_Operation_Impl () -{ -} - -ACE_INLINE -ACE_Asynch_Transmit_File_Result_Impl::ACE_Asynch_Transmit_File_Result_Impl (void) - : ACE_Asynch_Result_Impl () -{ -} diff --git a/ace/Asynch_Pseudo_Task.cpp b/ace/Asynch_Pseudo_Task.cpp deleted file mode 100644 index 1e795b8c7e9..00000000000 --- a/ace/Asynch_Pseudo_Task.cpp +++ /dev/null @@ -1,313 +0,0 @@ -// $Id$ - -#include "ace/Asynch_Pseudo_Task.h" - -ACE_RCSID(ace, Asynch_Pseudo_Task, "$Id$") - -ACE_Asynch_Pseudo_Task::ACE_Asynch_Pseudo_Task() - : flg_active_ (0), - select_reactor_ (), // should be initialized before reactor_ - reactor_ (&select_reactor_, 0), // don't delete implementation - token_ (select_reactor_.lock ()), // we can use reactor token - finish_count_ (0) -{ -} - -ACE_Asynch_Pseudo_Task::~ACE_Asynch_Pseudo_Task() -{ - stop(); -} - -int -ACE_Asynch_Pseudo_Task::is_active (void) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - return flg_active_; -} - -int -ACE_Asynch_Pseudo_Task::start (void) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - - if (this->flg_active_) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Pseudo_Task::start already started")), - -1); - - if (this->reactor_.initialized () == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Pseudo_Task::start reactor is not initialized")), - -1); - - - if (this->activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Pseudo_Task::start failed")), - -1); - - this->flg_active_ = 1; - return 0; -} - -int -ACE_Asynch_Pseudo_Task::stop (void) -{ - { - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - - if (this->flg_active_ == 0) // already stopped - return 0; - - reactor_.end_reactor_event_loop (); - } - - int rc = this->wait (); - - if (rc != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Pseudo_Task::stop failed")), - -1); - - { - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - this->flg_active_ = 0; - - if (this->reactor_.initialized ()) - this->reactor_.close (); - - while (finish_count_ > 0) - { - ACE_MT (ace_mon.release ()); - finish_event_.wait (); - - ACE_MT (ace_mon.acquire ()); - finish_event_.reset (); - } - } - - return rc; -} - -int -ACE_Asynch_Pseudo_Task::lock_finish (void) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - finish_count_ ++; - return 0; -} - -int -ACE_Asynch_Pseudo_Task::unlock_finish (void) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - - --finish_count_; - finish_event_.signal (); - - return 0; -} - -int -ACE_Asynch_Pseudo_Task::svc (void) -{ -#if !defined (ACE_WIN32) - - sigset_t RT_signals; - - if (sigemptyset (&RT_signals) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Error:(%P | %t):%p\n"), - ACE_LIB_TEXT ("sigemptyset failed"))); - - int member = 0; - - for (int si = ACE_SIGRTMIN; si <= ACE_SIGRTMAX; si++) - { - member = sigismember (& RT_signals , si); - if (member == 1) - { - sigaddset (&RT_signals, si); - } - } - - if (ACE_OS::pthread_sigmask (SIG_BLOCK, &RT_signals, 0) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Error:(%P | %t):%p\n"), - ACE_LIB_TEXT ("pthread_sigmask failed"))); -#endif - - reactor_.owner (ACE_Thread::self()); - - reactor_.run_reactor_event_loop (); - - return 0; -} - - - -int -ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask, - int flg_suspend) -{ - // Return codes : - // 0 success - // -1 reactor errors - // -2 task not active - - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - - if (this->flg_active_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::register_io_handler \n") - ACE_LIB_TEXT ("task not active \n")), - -2); - - // Register the handler with the reactor. - int retval = this->reactor_.register_handler (handle, handler, mask); - - if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::register_io_handler \n") - ACE_LIB_TEXT ("register_handler failed \n")), - -1); - - if (flg_suspend == 0 ) - return 0; - - // Suspend the now. Enable only when the is issued - // by the application. - retval = this->reactor_.suspend_handler (handle); - - if (retval == -1) - { - this->reactor_.remove_handler (handle, - ACE_Event_Handler::ALL_EVENTS_MASK - | ACE_Event_Handler::DONT_CALL); - - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::register_io_handler \n") - ACE_LIB_TEXT ("suspend_handler failed \n")), - -1); - } - - return 0; -} - -int -ACE_Asynch_Pseudo_Task::remove_io_handler (ACE_HANDLE handle) -{ - // Return codes : - // 0 success - // -1 reactor errors - // -2 task not active - - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - - if (this->flg_active_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::remove_io_handler \n") - ACE_LIB_TEXT ("task not active \n")), - -2); - - int retval = - this->reactor_.remove_handler (handle , - ACE_Event_Handler::ALL_EVENTS_MASK - | ACE_Event_Handler::DONT_CALL); - if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::remove_io_handler \n") - ACE_LIB_TEXT ("remove_handler failed \n")), - -1); - - return 0; -} - -int -ACE_Asynch_Pseudo_Task::remove_io_handler (ACE_Handle_Set &set) -{ - // Return codes : - // 0 success - // -1 reactor errors - // -2 task not active - - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - - if (this->flg_active_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::remove_io_handler \n") - ACE_LIB_TEXT ("task not active \n")), - -2); - - int retval = - this->reactor_.remove_handler (set , - ACE_Event_Handler::ALL_EVENTS_MASK - | ACE_Event_Handler::DONT_CALL); - if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::remove_io_handler \n") - ACE_LIB_TEXT ("remove_handler failed \n")), - -1); - - return 0; -} - -int -ACE_Asynch_Pseudo_Task::suspend_io_handler (ACE_HANDLE handle) -{ - // Return codes : - // 0 success - // -1 reactor errors - // -2 task not active - - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - - if (this->flg_active_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::suspend_io_handler \n") - ACE_LIB_TEXT ("task not active \n")), - -2); - - int retval = this->reactor_.suspend_handler (handle); - - if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::suspend_io_handler \n") - ACE_LIB_TEXT ("suspend_handler failed \n")), - -1); - - return 0; -} - -int -ACE_Asynch_Pseudo_Task::resume_io_handler (ACE_HANDLE handle) -{ - // Return codes : - // 0 success - // -1 reactor errors - // -2 task not active - - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, this->token_, -1)); - - if (this->flg_active_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::resume_io_handler \n") - ACE_LIB_TEXT ("task not active \n")), - -2); - - int retval = this->reactor_.resume_handler (handle); - - if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_Asynch_Pseudo_Task::resume_io_handler \n") - ACE_LIB_TEXT ("resume_handler failed \n")), - -1); - - return 0; -} diff --git a/ace/Asynch_Pseudo_Task.h b/ace/Asynch_Pseudo_Task.h deleted file mode 100644 index 66d1866a664..00000000000 --- a/ace/Asynch_Pseudo_Task.h +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Asynch_Pseudo_Task.h - * - * $Id$ - * - * @author Alexander Libman - */ -//============================================================================= - -#ifndef ACE_ASYNCH_PSEUDO_TASK_H -#define ACE_ASYNCH_PSEUDO_TASK_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Reactor.h" -#include "ace/Select_Reactor.h" -#include "ace/Task.h" - - -/** - * @class ACE_Asynch_Pseudo_Task - * - */ -class ACE_Export ACE_Asynch_Pseudo_Task : public ACE_Task -{ - friend class ACE_POSIX_Asynch_Accept; - friend class ACE_POSIX_Asynch_Connect; - friend class ACE_WIN32_Asynch_Connect; - -public: - - ACE_Asynch_Pseudo_Task(); - virtual ~ACE_Asynch_Pseudo_Task(); - - int start (void); - int stop (void); - - virtual int svc (void); - - int is_active (void); - - int register_io_handler (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask, - int flg_suspend); - - int remove_io_handler (ACE_HANDLE handle); - int remove_io_handler (ACE_Handle_Set &set); - int resume_io_handler (ACE_HANDLE handle); - int suspend_io_handler (ACE_HANDLE handle); - -protected: - - int lock_finish (void); - int unlock_finish (void); - - int flg_active_; - - ACE_Select_Reactor select_reactor_; - // should be initialized before reactor_ - - ACE_Reactor reactor_; - - ACE_Lock &token_; - - int finish_count_; - ACE_Manual_Event finish_event_; -}; - -#include "ace/post.h" -#endif /* ACE_ASYNCH_PSEUDO_TASK_H */ diff --git a/ace/Atomic_Op.cpp b/ace/Atomic_Op.cpp deleted file mode 100644 index 371bb372ce4..00000000000 --- a/ace/Atomic_Op.cpp +++ /dev/null @@ -1,227 +0,0 @@ -// $Id$ - -#include "ace/Atomic_Op.h" -#include "ace/OS.h" - -ACE_RCSID(ace, Atomic_Op, "$Id$") - -#if !defined (__ACE_INLINE__) -#include "ace/Atomic_Op.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_HAS_BUILTIN_ATOMIC_OP) - -long (*ACE_Atomic_Op::increment_fn_) (volatile long *) = 0; -long (*ACE_Atomic_Op::decrement_fn_) (volatile long *) = 0; -long (*ACE_Atomic_Op::exchange_fn_) (volatile long *, long) = 0; -long (*ACE_Atomic_Op::exchange_add_fn_) (volatile long *, long) = 0; - -void -ACE_Atomic_Op::init_functions (void) -{ - if (ACE_OS::num_processors () == 1) - { - increment_fn_ = single_cpu_increment; - decrement_fn_ = single_cpu_decrement; - exchange_fn_ = single_cpu_exchange; - exchange_add_fn_ = single_cpu_exchange_add; - } - else - { - increment_fn_ = multi_cpu_increment; - decrement_fn_ = multi_cpu_decrement; - exchange_fn_ = multi_cpu_exchange; - exchange_add_fn_ = multi_cpu_exchange_add; - } -} - -void -ACE_Atomic_Op::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -#if defined (_MSC_VER) -// Disable "no return value" warning, as we will be putting -// the return values directly into the EAX register. -#pragma warning (push) -#pragma warning (disable: 4035) -#endif /* _MSC_VER */ - -long -ACE_Atomic_Op::single_cpu_increment (volatile long *value) -{ -#if defined (__GNUC__) && defined (ACE_HAS_PENTIUM) - long tmp = 1; - unsigned long addr = ACE_reinterpret_cast (unsigned long, value); - asm( "xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); - return tmp + 1; -#else /* __GNUC__ && ACE_HAS_PENTIUM */ - ACE_UNUSED_ARG (value); - ACE_NOTSUP_RETURN (-1); -#endif /* __GNUC__ && ACE_HAS_PENTIUM */ -} - -long -ACE_Atomic_Op::single_cpu_decrement (volatile long *value) -{ -#if defined (__GNUC__) && defined (ACE_HAS_PENTIUM) - long tmp = -1; - unsigned long addr = ACE_reinterpret_cast (unsigned long, value); - asm( "xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); - return tmp - 1; -#else /* __GNUC__ && ACE_HAS_PENTIUM */ - ACE_UNUSED_ARG (value); - ACE_NOTSUP_RETURN (-1); -#endif /* __GNUC__ && ACE_HAS_PENTIUM */ -} - -long -ACE_Atomic_Op::single_cpu_exchange ( - volatile long *value, - long rhs) -{ -#if defined (__GNUC__) && defined (ACE_HAS_PENTIUM) - unsigned long addr = ACE_reinterpret_cast (unsigned long, value); - asm( "xchg %0, (%1)" : "+r"(rhs) : "r"(addr) ); - return rhs; -#else /* __GNUC__ && ACE_HAS_PENTIUM */ - ACE_UNUSED_ARG (value); - ACE_UNUSED_ARG (rhs); - ACE_NOTSUP_RETURN (-1); -#endif /* __GNUC__ && ACE_HAS_PENTIUM */ -} - -long -ACE_Atomic_Op::single_cpu_exchange_add (volatile long *value, - long rhs) -{ -#if defined (__GNUC__) && defined (ACE_HAS_PENTIUM) - unsigned long addr = ACE_reinterpret_cast (unsigned long, value); - asm( "xadd %0, (%1)" : "+r"(rhs) : "r"(addr) ); - return rhs; -#elif defined (WIN32) && !defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) -# if defined (_MSC_VER) - __asm - { - mov eax, rhs - mov edx, value - xadd [edx], eax - } - // Return value is already in EAX register. -# elif defined (__BORLANDC__) - _EAX = rhs; - _EDX = ACE_reinterpret_cast (unsigned long, value); - __emit__(0x0F, 0xC1, 0x02); // xadd [edx], eax - // Return value is already in EAX register. -# else /* _MSC_VER */ - ACE_UNUSED_ARG (value); - ACE_UNUSED_ARG (rhs); - ACE_NOTSUP_RETURN (-1); -# endif /* _MSC_VER */ -#else /* __GNUC__ && ACE_HAS_PENTIUM */ - ACE_UNUSED_ARG (value); - ACE_UNUSED_ARG (rhs); - ACE_NOTSUP_RETURN (-1); -#endif /* __GNUC__ && ACE_HAS_PENTIUM */ -} - -long -ACE_Atomic_Op::multi_cpu_increment (volatile long *value) -{ -#if defined (__GNUC__) && defined (ACE_HAS_PENTIUM) - long tmp = 1; - unsigned long addr = ACE_reinterpret_cast (unsigned long, value); - asm( "lock ; xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); - return tmp + 1; -#else /* __GNUC__ && ACE_HAS_PENTIUM */ - ACE_UNUSED_ARG (value); - ACE_NOTSUP_RETURN (-1); -#endif /* __GNUC__ && ACE_HAS_PENTIUM */ -} - -long -ACE_Atomic_Op::multi_cpu_decrement (volatile long *value) -{ -#if defined (__GNUC__) && defined (ACE_HAS_PENTIUM) - long tmp = -1; - unsigned long addr = ACE_reinterpret_cast (unsigned long, value); - asm( "lock ; xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); - return tmp - 1; -#else /* __GNUC__ && ACE_HAS_PENTIUM */ - ACE_UNUSED_ARG (value); - ACE_NOTSUP_RETURN (-1); -#endif /* __GNUC__ && ACE_HAS_PENTIUM */ -} - -long -ACE_Atomic_Op::multi_cpu_exchange ( - volatile long *value, - long rhs) -{ -#if defined (__GNUC__) && defined (ACE_HAS_PENTIUM) - unsigned long addr = ACE_reinterpret_cast (unsigned long, value); - // The XCHG instruction automatically follows LOCK semantics - asm( "xchg %0, (%1)" : "+r"(rhs) : "r"(addr) ); - return rhs; -#else /* __GNUC__ && ACE_HAS_PENTIUM */ - ACE_UNUSED_ARG (value); - ACE_UNUSED_ARG (rhs); - ACE_NOTSUP_RETURN (-1); -#endif /* __GNUC__ && ACE_HAS_PENTIUM */ -} - -long -ACE_Atomic_Op::multi_cpu_exchange_add (volatile long *value, - long rhs) -{ -#if defined (__GNUC__) && defined (ACE_HAS_PENTIUM) - unsigned long addr = ACE_reinterpret_cast (unsigned long, value); - asm( "lock ; xadd %0, (%1)" : "+r"(rhs) : "r"(addr) ); - return rhs; -#elif defined (WIN32) && !defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) -# if defined (_MSC_VER) - __asm - { - mov eax, rhs - mov edx, value - lock xadd [edx], eax - } - // Return value is already in EAX register. -# elif defined (__BORLANDC__) - _EAX = rhs; - _EDX = ACE_reinterpret_cast (unsigned long, value); - __emit__(0xF0, 0x0F, 0xC1, 0x02); // lock xadd [edx], eax - // Return value is already in EAX register. -# else /* _MSC_VER */ - ACE_UNUSED_ARG (value); - ACE_UNUSED_ARG (rhs); - ACE_NOTSUP_RETURN (-1); -# endif /* _MSC_VER */ -#else /* __GNUC__ && ACE_HAS_PENTIUM */ - ACE_UNUSED_ARG (value); - ACE_UNUSED_ARG (rhs); - ACE_NOTSUP_RETURN (-1); -#endif /* __GNUC__ && ACE_HAS_PENTIUM */ -} - -#if defined (_MSC_VER) -#pragma warning (pop) -#endif /* _MSC_VER */ - -#endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ - -#if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -# if !defined (ACE_HAS_BUILTIN_ATOMIC_OP) -template class ACE_Atomic_Op; -# endif /* !ACE_HAS_BUILTIN_ATOMIC_OP */ -template class ACE_Atomic_Op_Ex; -# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# if !defined (ACE_HAS_BUILTIN_ATOMIC_OP) -# pragma instantiate ACE_Atomic_Op -# endif /* !ACE_HAS_BUILTIN_ATOMIC_OP */ -# pragma instantiate ACE_Atomic_Op_Ex -# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* ACE_HAS_THREADS */ diff --git a/ace/Atomic_Op.h b/ace/Atomic_Op.h deleted file mode 100644 index c84697b6e12..00000000000 --- a/ace/Atomic_Op.h +++ /dev/null @@ -1,163 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Atomic_Op.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_ATOMIC_OP_H -#define ACE_ATOMIC_OP_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" - - -// Include the templates here. -#include "ace/Atomic_Op_T.h" - -// Determine whether builtin atomic op support is -// available on this platform. -#if defined (ACE_HAS_THREADS) -# if defined (WIN32) -# if defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) -# define ACE_HAS_BUILTIN_ATOMIC_OP -# else /* ACE_HAS_INTERLOCKED_EXCHANGEADD */ - // Inline assembly emulation of InterlockedExchangeAdd - // is currently only implemented for MSVC (x86 only) and Borland. -# if (defined (_MSC_VER) && defined (_M_IX86)) || defined (__BORLANDC__) -# define ACE_HAS_BUILTIN_ATOMIC_OP -# endif /* _MSC_VER || __BORLANDC__ */ -# endif /* ACE_HAS_INTERLOCKED_EXCHANGEADD */ -# elif defined (__GNUC__) && defined (ACE_HAS_PENTIUM) -# define ACE_HAS_BUILTIN_ATOMIC_OP -# endif /* WIN32 */ -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_HAS_BUILTIN_ATOMIC_OP) -ACE_TEMPLATE_SPECIALIZATION -/** - * @class ACE_Atomic_Op - * - * @brief Specialization of ACE_Atomic_Op for platforms that - * support atomic integer operations. - * - * Specialization of ACE_Atomic_Op for platforms that support atomic - * integer operations. - */ -class ACE_Export ACE_Atomic_Op -{ -public: - /// Initialize to 0. - ACE_Atomic_Op (void); - - /// Initialize to c. - ACE_Atomic_Op (long c); - - /// Manage copying... - ACE_Atomic_Op (const ACE_Atomic_Op &c); - - /// Atomically pre-increment . - long operator++ (void); - - /// Atomically post-increment . - long operator++ (int); - - /// Atomically increment by rhs. - long operator+= (long rhs); - - /// Atomically pre-decrement . - long operator-- (void); - - /// Atomically post-decrement . - long operator-- (int); - - /// Atomically decrement by rhs. - long operator-= (long rhs); - - /// Atomically compare with rhs. - int operator== (long rhs) const; - - /// Atomically compare with rhs. - int operator!= (long rhs) const; - - /// Atomically check if greater than or equal to rhs. - int operator>= (long rhs) const; - - /// Atomically check if greater than rhs. - int operator> (long rhs) const; - - /// Atomically check if less than or equal to rhs. - int operator<= (long rhs) const; - - /// Atomically check if less than rhs. - int operator< (long rhs) const; - - /// Atomically assign rhs to . - void operator= (long rhs); - - /// Atomically assign to . - void operator= (const ACE_Atomic_Op &rhs); - - /// Explicitly return . - long value (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Explicitly return (by reference). - volatile long &value_i (void); - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - - /// Used during ACE object manager initialization to optimize the fast - /// atomic op implementation according to the number of CPUs. - static void init_functions (void); - -private: - // This function cannot be supported by this template specialization. - // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex - // template instead. - ACE_UNIMPLEMENTED_FUNC (ACE_Thread_Mutex &mutex (void)) - - /// Current object decorated by the atomic op. - volatile long value_; - - // Single-cpu atomic op implementations. - static long single_cpu_increment (volatile long *value); - static long single_cpu_decrement (volatile long *value); - static long single_cpu_exchange (volatile long *value, long rhs); - static long single_cpu_exchange_add (volatile long *value, long rhs); - - // Multi-cpu atomic op implementations. - static long multi_cpu_increment (volatile long *value); - static long multi_cpu_decrement (volatile long *value); - static long multi_cpu_exchange (volatile long *value, long rhs); - static long multi_cpu_exchange_add (volatile long *value, long rhs); - - // Pointers to selected atomic op implementations. - static long (*increment_fn_) (volatile long *); - static long (*decrement_fn_) (volatile long *); - static long (*exchange_fn_) (volatile long *, long); - static long (*exchange_add_fn_) (volatile long *, long); -}; -#endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ - - -#if defined (__ACE_INLINE__) -#include "ace/Atomic_Op.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /*ACE_ATOMIC_OP_H*/ diff --git a/ace/Atomic_Op.i b/ace/Atomic_Op.i deleted file mode 100644 index dfae7e33526..00000000000 --- a/ace/Atomic_Op.i +++ /dev/null @@ -1,150 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - - -#if defined (ACE_HAS_BUILTIN_ATOMIC_OP) - -ACE_INLINE -ACE_Atomic_Op::ACE_Atomic_Op (void) - : value_ (0) -{ -} - -ACE_INLINE -ACE_Atomic_Op::ACE_Atomic_Op (long c) - : value_ (c) -{ -} - -ACE_INLINE -ACE_Atomic_Op::ACE_Atomic_Op ( - const ACE_Atomic_Op &rhs) - : value_ (rhs.value_) -{ -} - -ACE_INLINE long -ACE_Atomic_Op::operator++ (void) -{ -#if defined (WIN32) - return ::InterlockedIncrement (ACE_const_cast (long *, &this->value_)); -#else /* WIN32 */ - return (*increment_fn_) (&this->value_); -#endif /* WIN32 */ -} - -ACE_INLINE long -ACE_Atomic_Op::operator++ (int) -{ - return ++*this - 1; -} - -ACE_INLINE long -ACE_Atomic_Op::operator-- (void) -{ -#if defined (WIN32) - return ::InterlockedDecrement (ACE_const_cast (long *, &this->value_)); -#else /* WIN32 */ - return (*decrement_fn_) (&this->value_); -#endif /* WIN32 */ -} - -ACE_INLINE long -ACE_Atomic_Op::operator-- (int) -{ - return --*this + 1; -} - -ACE_INLINE long -ACE_Atomic_Op::operator+= (long rhs) -{ -#if defined (WIN32) && defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) - return ::InterlockedExchangeAdd (ACE_const_cast (long *, &this->value_), - rhs) + rhs; -#else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ - return (*exchange_add_fn_) (&this->value_, rhs) + rhs; -#endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ -} - -ACE_INLINE long -ACE_Atomic_Op::operator-= (long rhs) -{ -#if defined (WIN32) && defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) - return ::InterlockedExchangeAdd (ACE_const_cast (long *, &this->value_), - -rhs) - rhs; -#else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ - return (*exchange_add_fn_) (&this->value_, -rhs) - rhs; -#endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ -} - -ACE_INLINE int -ACE_Atomic_Op::operator== (long rhs) const -{ - return (this->value_ == rhs); -} - -ACE_INLINE int -ACE_Atomic_Op::operator!= (long rhs) const -{ - return (this->value_ != rhs); -} - -ACE_INLINE int -ACE_Atomic_Op::operator>= (long rhs) const -{ - return (this->value_ >= rhs); -} - -ACE_INLINE int -ACE_Atomic_Op::operator> (long rhs) const -{ - return (this->value_ > rhs); -} - -ACE_INLINE int -ACE_Atomic_Op::operator<= (long rhs) const -{ - return (this->value_ <= rhs); -} - -ACE_INLINE int -ACE_Atomic_Op::operator< (long rhs) const -{ - return (this->value_ < rhs); -} - -ACE_INLINE void -ACE_Atomic_Op::operator= (long rhs) -{ -#if defined (WIN32) - ::InterlockedExchange (ACE_const_cast (long *, &this->value_), rhs); -#else /* WIN32 */ - (*exchange_fn_) (&this->value_, rhs); -#endif /* WIN32 */ -} - -ACE_INLINE void -ACE_Atomic_Op::operator= ( - const ACE_Atomic_Op &rhs) -{ -#if defined (WIN32) - ::InterlockedExchange (ACE_const_cast (long *, &this->value_), rhs.value_); -#else /* WIN32 */ - (*exchange_fn_) (&this->value_, rhs.value_); -#endif /* WIN32 */ -} - -ACE_INLINE long -ACE_Atomic_Op::value (void) const -{ - return this->value_; -} - -ACE_INLINE volatile long & -ACE_Atomic_Op::value_i (void) -{ - return this->value_; -} - -#endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ diff --git a/ace/Atomic_Op_T.cpp b/ace/Atomic_Op_T.cpp deleted file mode 100644 index e9c7f5a9cb4..00000000000 --- a/ace/Atomic_Op_T.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef ACE_ATOMIC_OP_T_C -#define ACE_ATOMIC_OP_T_C - -#include "ace/Atomic_Op_T.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Atomic_Op_T.i" -#endif /* __ACE_INLINE__ */ - - -ACE_ALLOC_HOOK_DEFINE(ACE_Atomic_Op_Ex) -ACE_ALLOC_HOOK_DEFINE(ACE_Atomic_Op) - -ACE_RCSID(ace, Atomic_Op_T, "$Id$") - -// ************************************************* -template ACE_LOCK & -ACE_Atomic_Op_Ex::mutex (void) -{ - // ACE_TRACE ("ACE_Atomic_Op_Ex::mutex"); - return this->mutex_; -} - -template void -ACE_Atomic_Op_Ex::dump (void) const -{ - // ACE_TRACE ("ACE_Atomic_Op_Ex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->mutex_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template -ACE_Atomic_Op_Ex::ACE_Atomic_Op_Ex - (ACE_LOCK &mtx) - : mutex_ (mtx), - value_ (0) -{ - // ACE_TRACE ("ACE_Atomic_Op_Ex::ACE_Atomic_Op_Ex"); -} - -template -ACE_Atomic_Op_Ex::ACE_Atomic_Op_Ex - (ACE_LOCK &mtx, const TYPE &c) - : mutex_ (mtx), - value_ (c) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::ACE_Atomic_Op_Ex"); -} - -// **************************************************************** - -template -ACE_Atomic_Op::ACE_Atomic_Op (void) - : impl_ (this->own_mutex_) -{ - // ACE_TRACE ("ACE_Atomic_Op::ACE_Atomic_Op"); -} - -template -ACE_Atomic_Op::ACE_Atomic_Op (const TYPE &c) - : impl_ (this->own_mutex_, c) -{ - // ACE_TRACE ("ACE_Atomic_Op::ACE_Atomic_Op"); -} - -template ACE_INLINE -ACE_Atomic_Op::ACE_Atomic_Op - (const ACE_Atomic_Op &rhs) - : impl_ (this->own_mutex_, rhs.value ()) -{ -// ACE_TRACE ("ACE_Atomic_Op::ACE_Atomic_Op"); -} - -#endif /* ACE_ATOMIC_OP_T_C */ diff --git a/ace/Atomic_Op_T.h b/ace/Atomic_Op_T.h deleted file mode 100644 index 47f9c9bce28..00000000000 --- a/ace/Atomic_Op_T.h +++ /dev/null @@ -1,254 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Atomic_Op_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_ATOMIC_OP_T_H -#define ACE_ATOMIC_OP_T_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" - - -/** - * @class ACE_Atomic_Op_Ex - * - * @brief Transparently parameterizes synchronization into basic - * arithmetic operations. - * - * This class is described in an article in the July/August 1994 - * issue of the C++ Report magazine. It implements a - * templatized version of the Decorator pattern from the GoF book. - * - * ACE_Atomic_Op_Ex objects must be constructed with a reference - * to an existing lock. A single lock can be shared between - * multiple ACE_Atomic_Op_Ex objects. If you do not require this - * ability consider using the ACE_Atomic_Op class instead, which - * may be able to take advantage of platform-specific - * optimisations to provide atomic operations without requiring a - * lock. - */ -template -class ACE_Atomic_Op_Ex -{ -public: - // = Initialization methods. - - /// Initialize to 0. - ACE_Atomic_Op_Ex (ACE_LOCK &mtx); - - /// Initialize to c. - ACE_Atomic_Op_Ex (ACE_LOCK &mtx, const TYPE &c); - - // = Accessors. - - /// Atomically pre-increment . - TYPE operator++ (void); - - /// Atomically post-increment . - TYPE operator++ (int); - - /// Atomically increment by rhs. - TYPE operator+= (const TYPE &rhs); - - /// Atomically pre-decrement . - TYPE operator-- (void); - - /// Atomically post-decrement . - TYPE operator-- (int); - - /// Atomically decrement by rhs. - TYPE operator-= (const TYPE &rhs); - - /// Atomically compare with rhs. - int operator== (const TYPE &rhs) const; - - /// Atomically compare with rhs. - int operator!= (const TYPE &rhs) const; - - /// Atomically check if greater than or equal to rhs. - int operator>= (const TYPE &rhs) const; - - /// Atomically check if greater than rhs. - int operator> (const TYPE &rhs) const; - - /// Atomically check if less than or equal to rhs. - int operator<= (const TYPE &rhs) const; - - /// Atomically check if less than rhs. - int operator< (const TYPE &rhs) const; - - /// Atomically assign rhs to . - void operator= (const TYPE &rhs); - - /// Atomically assign to . - void operator= (const ACE_Atomic_Op_Ex &rhs); - - /// Explicitly return . - TYPE value (void) const; - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - - /// Manage copying... - ACE_Atomic_Op_Ex (const ACE_Atomic_Op_Ex &); - - /** - * Returns a reference to the underlying . This makes it - * possible to acquire the lock explicitly, which can be useful in - * some cases if you instantiate the with an - * or . NOTE: the right - * name would be lock_, but HP/C++ will choke on that! - */ - ACE_LOCK &mutex (void); - - /** - * Explicitly return (by reference). This gives the user - * full, unrestricted access to the underlying value. This method - * will usually be used in conjunction with explicit access to the - * lock. Use with care ;-) - */ - TYPE &value_i (void); - -private: - /// Type of synchronization mechanism. - ACE_LOCK &mutex_; - - /// Current object decorated by the atomic op. - TYPE value_; -}; - -/** - * @class ACE_Atomic_Op - * - * @brief Transparently parameterizes synchronization into basic - * arithmetic operations. - * - * This class is described in an article in the July/August 1994 - * issue of the C++ Report magazine. It implements a - * templatized version of the Decorator pattern from the GoF book. - * - * Certain platforms may provide a template specialization for - * ACE_Atomic_Op that provides optimized - * atomic integer operations without actually requiring a mutex. - */ -template -class ACE_Atomic_Op -{ -public: - /// Initialize to 0. - ACE_Atomic_Op (void); - - /// Initialize to c. - ACE_Atomic_Op (const TYPE &c); - - /// Manage copying... - ACE_Atomic_Op (const ACE_Atomic_Op &c); - - /// Atomically assign rhs to . - void operator= (const TYPE &rhs); - - /// Atomically assign to . - void operator= (const ACE_Atomic_Op &rhs); - - /// Atomically pre-increment . - TYPE operator++ (void); - - /// Atomically post-increment . - TYPE operator++ (int); - - /// Atomically increment by rhs. - TYPE operator+= (const TYPE &rhs); - - /// Atomically pre-decrement . - TYPE operator-- (void); - - /// Atomically post-decrement . - TYPE operator-- (int); - - /// Atomically decrement by rhs. - TYPE operator-= (const TYPE &rhs); - - /// Atomically compare with rhs. - int operator== (const TYPE &rhs) const; - - /// Atomically compare with rhs. - int operator!= (const TYPE &rhs) const; - - /// Atomically check if greater than or equal to rhs. - int operator>= (const TYPE &rhs) const; - - /// Atomically check if greater than rhs. - int operator> (const TYPE &rhs) const; - - /// Atomically check if less than or equal to rhs. - int operator<= (const TYPE &rhs) const; - - /// Atomically check if less than rhs. - int operator< (const TYPE &rhs) const; - - /// Explicitly return . - TYPE value (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /** - * Returns a reference to the underlying . This makes it - * possible to acquire the lock explicitly, which can be useful in - * some cases if you instantiate the with an - * or . - * - * NOTE: This member function is deprecated and so may go away in - * the future. If you need access to the underlying mutex, consider - * using the ACE_Atomic_Op_Ex template instead. - */ - ACE_LOCK &mutex (void); - - /** - * Explicitly return (by reference). This gives the user - * full, unrestricted access to the underlying value. This method - * will usually be used in conjunction with explicit access to the - * lock. Use with care ;-) - */ - TYPE &value_i (void); - -private: - /// Type of synchronization mechanism. - ACE_LOCK own_mutex_; - - /// Underlying atomic op implementation. - ACE_Atomic_Op_Ex impl_; -}; - - -#if defined (__ACE_INLINE__) -#include "ace/Atomic_Op_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Atomic_Op_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Atomic_Op_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /*ACE_ATOMIC_OP_T_H*/ diff --git a/ace/Atomic_Op_T.i b/ace/Atomic_Op_T.i deleted file mode 100644 index 45d06384256..00000000000 --- a/ace/Atomic_Op_T.i +++ /dev/null @@ -1,262 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// -// ACE_Atomic_Op_Ex inline functions -// - -template ACE_INLINE TYPE -ACE_Atomic_Op_Ex::operator++ (void) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator++"); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_); - return ++this->value_; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op_Ex::operator+= (const TYPE &rhs) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator+="); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_); - return this->value_ += rhs; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op_Ex::operator-- (void) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator--"); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_); - return --this->value_; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op_Ex::operator-= (const TYPE &rhs) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator-="); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_); - return this->value_ -= rhs; -} - -template ACE_INLINE -ACE_Atomic_Op_Ex::ACE_Atomic_Op_Ex (const ACE_Atomic_Op_Ex &rhs) - : mutex_ (rhs.mutex_) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::ACE_Atomic_Op_Ex"); - *this = rhs; // Invoke the assignment operator. -} - -template ACE_INLINE TYPE -ACE_Atomic_Op_Ex::operator++ (int) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator++"); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_); - return this->value_++; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op_Ex::operator-- (int) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator--"); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_); - return this->value_--; -} - -template ACE_INLINE int -ACE_Atomic_Op_Ex::operator== (const TYPE &rhs) const -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator=="); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->mutex_, 0); - return this->value_ == rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op_Ex::operator!= (const TYPE &rhs) const -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator!="); - return !(*this == rhs); -} - -template ACE_INLINE int -ACE_Atomic_Op_Ex::operator>= (const TYPE &rhs) const -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator>="); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->mutex_, 0); - return this->value_ >= rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op_Ex::operator> (const TYPE &rhs) const -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator>"); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->mutex_, 0); - return this->value_ > rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op_Ex::operator<= (const TYPE &rhs) const -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator<="); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->mutex_, 0); - return this->value_ <= rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op_Ex::operator< (const TYPE &rhs) const -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator<"); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->mutex_, 0); - return this->value_ < rhs; -} - -template ACE_INLINE void -ACE_Atomic_Op_Ex::operator= (const ACE_Atomic_Op_Ex &rhs) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator="); - if (&rhs == this) - return; // Avoid deadlock... - ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_); - // This will call ACE_Atomic_Op_Ex::TYPE(), which will ensure the value - // of is acquired atomically. - - this->value_ = rhs.value (); -} - -template ACE_INLINE TYPE -ACE_Atomic_Op_Ex::value (void) const -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::value"); - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->mutex_, this->value_); - return this->value_; -} - -template ACE_INLINE TYPE & -ACE_Atomic_Op_Ex::value_i (void) -{ - // Explicitly return (by reference). This gives the user - // full, unrestricted access to the underlying value. This method - // will usually be used in conjunction with explicit access to the - // lock. Use with care ;-) - return this->value_; -} - -template ACE_INLINE void -ACE_Atomic_Op_Ex::operator= (const TYPE &rhs) -{ -// ACE_TRACE ("ACE_Atomic_Op_Ex::operator="); - ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_); - this->value_ = rhs; -} - -// -// ACE_Atomic_Op inline functions -// - -template ACE_INLINE void -ACE_Atomic_Op::operator= (const TYPE &i) -{ - this->impl_ = i; -} - -template ACE_INLINE void -ACE_Atomic_Op::operator= (const ACE_Atomic_Op &rhs) -{ - this->impl_ = rhs.impl_; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op::operator++ (void) -{ - return ++this->impl_; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op::operator++ (int) -{ - return this->impl_++; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op::operator+= (const TYPE &rhs) -{ - return this->impl_ += rhs; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op::operator-- (void) -{ - return --this->impl_; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op::operator-- (int) -{ - return this->impl_--; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op::operator-= (const TYPE &rhs) -{ - return this->impl_ -= rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op::operator== (const TYPE &rhs) const -{ - return this->impl_ == rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op::operator!= (const TYPE &rhs) const -{ - return this->impl_ != rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op::operator>= (const TYPE &rhs) const -{ - return this->impl_ >= rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op::operator> (const TYPE &rhs) const -{ - return this->impl_ > rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op::operator<= (const TYPE &rhs) const -{ - return this->impl_ <= rhs; -} - -template ACE_INLINE int -ACE_Atomic_Op::operator< (const TYPE &rhs) const -{ - return this->impl_ < rhs; -} - -template ACE_INLINE TYPE -ACE_Atomic_Op::value (void) const -{ - return this->impl_.value (); -} - -template ACE_INLINE void -ACE_Atomic_Op::dump (void) const -{ - this->impl_.dump (); - return; -} - -template ACE_INLINE ACE_LOCK & -ACE_Atomic_Op::mutex (void) -{ - return this->own_mutex_; -} - -template ACE_INLINE TYPE & -ACE_Atomic_Op::value_i (void) -{ - return this->impl_.value_i (); -} diff --git a/ace/Auto_IncDec_T.cpp b/ace/Auto_IncDec_T.cpp deleted file mode 100644 index 2ca06874a2e..00000000000 --- a/ace/Auto_IncDec_T.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// $Id$ - -#ifndef ACE_AUTO_INCDEC_T_C -#define ACE_AUTO_INCDEC_T_C - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_IncDec_T.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, Auto_IncDec_T, "Auto_IncDec_T.cpp, by Edan Ayal") - -#if !defined (__ACE_INLINE__) -#include "ace/Auto_IncDec_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_Auto_IncDec) - -template void -ACE_Auto_IncDec::dump (void) const -{ -// ACE_TRACE ("ACE_Auto_IncDec::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -#endif /* ACE_AUTO_INCDEC_T_C */ diff --git a/ace/Auto_IncDec_T.h b/ace/Auto_IncDec_T.h deleted file mode 100644 index 3d8ad8da17b..00000000000 --- a/ace/Auto_IncDec_T.h +++ /dev/null @@ -1,88 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Auto_IncDec_T.h - * - * $Id$ - * - * @author Edan Ayal - */ -//============================================================================= - - -#ifndef ACE_AUTO_INCDEC_T_H -#define ACE_AUTO_INCDEC_T_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Global_Macros.h" - -/** - * @class ACE_Auto_IncDec - * - * @brief This class automatically increments and decrements a - * parameterized counter. - * - * This data structure is meant to be used within a method, - * function, or scope. The actual parameter given for the - * template parameter - * must provide at least operators ++ and --. - */ -template -class ACE_Auto_IncDec -{ -public: - - /// Implicitly increment the counter. - ACE_Auto_IncDec (ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter); - - /// Implicitly decrement the counter. - ~ACE_Auto_IncDec (void); - - /// Dump the state of an object. - void dump (void) const; - -protected: - /// Reference to the counter - /// we're incrementing/decrementing. - ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter_; - -private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const - ACE_Auto_IncDec &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Auto_IncDec (const - ACE_Auto_IncDec &)) -}; - -#if defined (__ACE_INLINE__) -#include "ace/Auto_IncDec_T.i" -// On non-Win32 platforms, this code will be inlined -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Auto_IncDec_T.cpp" -// On Win32 platforms, this code will be included as template source -// code and will not be inlined. Therefore, we first turn off -// ACE_INLINE, set it to be nothing, include the code, and then turn -// ACE_INLINE back to its original setting. All this nonsense is -// necessary, since the generic template code that needs to be -// specialized cannot be inlined, else the compiler will ignore the -// specialization code. Also, the specialization code *must* be -// inlined or the compiler will ignore the specializations. -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Auto_IncDec_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_AUTO_INCDEC_T_H */ diff --git a/ace/Auto_IncDec_T.i b/ace/Auto_IncDec_T.i deleted file mode 100644 index 96658ed76c5..00000000000 --- a/ace/Auto_IncDec_T.i +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Implicitly and automatically increment the counter. - -template ACE_INLINE -ACE_Auto_IncDec::ACE_Auto_IncDec - (ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter) - : counter_ (counter) -{ - ++this->counter_; -} - -// Implicitly and automatically decrement the counter. - -template ACE_INLINE -ACE_Auto_IncDec::~ACE_Auto_IncDec (void) -{ - --this->counter_; -} - diff --git a/ace/Auto_Ptr.cpp b/ace/Auto_Ptr.cpp deleted file mode 100644 index 888a65d02e7..00000000000 --- a/ace/Auto_Ptr.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// Auto_Ptr.cpp -// $Id$ - -#if !defined (ACE_AUTO_PTR_C) -#define ACE_AUTO_PTR_C - -#include "ace/Auto_Ptr.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Auto_Ptr.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Auto_Ptr, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Ptr) - -template void -ACE_Auto_Basic_Ptr::dump (void) const -{ - ACE_TRACE ("ACE_Auto_Basic_Ptr::dump"); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Array_Ptr) - -template void -ACE_Auto_Basic_Array_Ptr::dump (void) const -{ - ACE_TRACE ("ACE_Auto_Basic_Array_Ptr::dump"); -} - -#if defined (__MINGW32__) -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ - (ACE_HAS_STANDARD_CPP_LIBRARY != 0) -# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template alloc; -# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate alloc -# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY != 0 */ -#endif /* __MINGW32__ */ - -#endif /* ACE_AUTO_PTR_C */ diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h deleted file mode 100644 index bc86ef1fd86..00000000000 --- a/ace/Auto_Ptr.h +++ /dev/null @@ -1,188 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Auto_Ptr.h - * - * $Id$ - * - * @author Doug Schmidt - * @author Irfan Pyarali - * @author Jack Reeves - * @author Dr. Harald M. Mueller - */ -//============================================================================= - -#ifndef ACE_AUTO_PTR_H -#define ACE_AUTO_PTR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Trace.h" - -#if defined (_MSC_VER) -// Suppress warning e.g. "return type for -// 'ACE_Auto_Array_Pointer::operator ->' is 'type *' (i.e., not a UDT -// or reference to a UDT. Will produce errors if applied using infix -// notation)" -# pragma warning(push) -# pragma warning(disable: 4284) -#endif /* _MSC_VER */ - -/** - * @class ACE_Auto_Basic_Ptr - * - * @brief Implements the draft C++ standard auto_ptr abstraction. - * This class allows one to work on non-object (basic) types - */ -template -class ACE_Auto_Basic_Ptr -{ -public: - // = Initialization and termination methods - ACE_EXPLICIT ACE_Auto_Basic_Ptr (X *p = 0) : p_ (p) {} - - ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr &ap); - ACE_Auto_Basic_Ptr &operator= (ACE_Auto_Basic_Ptr &rhs); - ~ACE_Auto_Basic_Ptr (void); - - // = Accessor methods. - X &operator *() const; - X *get (void) const; - X *release (void); - void reset (X *p = 0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - X *p_; -}; - -#if !defined (ACE_LACKS_AUTO_PTR) && \ - defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ - (ACE_HAS_STANDARD_CPP_LIBRARY != 0) -#include -#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) -using std::auto_ptr; -#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ -#else /* ACE_HAS_STANDARD_CPP_LIBRARY */ - -/** - * @class auto_ptr - * - * @brief Implements the draft C++ standard auto_ptr abstraction. - */ -template -class auto_ptr : public ACE_Auto_Basic_Ptr -{ -public: - // = Initialization and termination methods - ACE_EXPLICIT auto_ptr (X *p = 0) : ACE_Auto_Basic_Ptr (p) {} - - X *operator-> () const; -}; - -#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ - -/** - * @class ACE_Auto_Basic_Array_Ptr - * - * @brief Implements an extension to the draft C++ standard auto_ptr - * abstraction. This class allows one to work on non-object - * (basic) types that must be treated as an array, e.g., - * deallocated via "delete [] foo". - */ -template -class ACE_Auto_Basic_Array_Ptr -{ -public: - // = Initialization and termination methods. - ACE_EXPLICIT ACE_Auto_Basic_Array_Ptr (X *p = 0) : p_ (p) {} - - ACE_Auto_Basic_Array_Ptr (ACE_Auto_Basic_Array_Ptr &ap); - ACE_Auto_Basic_Array_Ptr &operator= (ACE_Auto_Basic_Array_Ptr &rhs); - ~ACE_Auto_Basic_Array_Ptr (void); - - // = Accessor methods. - X &operator* () const; - X &operator[] (int i) const; - X *get (void) const; - X *release (void); - void reset (X *p = 0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - X *p_; -}; - -/** - * @class ACE_Auto_Array_Ptr - * - * @brief Implements an extension to the draft C++ standard auto_ptr - * abstraction. - */ -template -class ACE_Auto_Array_Ptr : public ACE_Auto_Basic_Array_Ptr -{ -public: - // = Initialization and termination methods. - ACE_EXPLICIT ACE_Auto_Array_Ptr (X *p = 0) - : ACE_Auto_Basic_Array_Ptr (p) {} - - X *operator-> () const; -}; - -// Some platforms have an older version of auto_ptr -// support, which lacks reset, and cannot be disabled -// easily. Portability to these platforms requires -// use of the following ACE_AUTO_PTR_RESET macro. -# if defined (ACE_AUTO_PTR_LACKS_RESET) -# define ACE_AUTO_PTR_RESET(X,Y,Z) \ - do { \ - if (Y != X.get ()) \ - { \ - X.release (); \ - X = auto_ptr (Y); \ - } \ - } while (0) -# else /* ! ACE_AUTO_PTR_LACKS_RESET */ -# define ACE_AUTO_PTR_RESET(X,Y,Z) \ - do { \ - X.reset (Y); \ - } while (0) -# endif /* ACE_AUTO_PTR_LACKS_RESET */ - -#if defined (__ACE_INLINE__) -#include "ace/Auto_Ptr.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Auto_Ptr.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#if defined (_MSC_VER) -// Restore the warning state to what it was before entry. -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ACE_AUTO_PTR_H */ diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.i deleted file mode 100644 index 7fba5b4edfa..00000000000 --- a/ace/Auto_Ptr.i +++ /dev/null @@ -1,144 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Auto_Ptr.i - -template ACE_INLINE -ACE_Auto_Basic_Ptr::ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr &rhs) - : p_ (rhs.release ()) -{ - ACE_TRACE ("ACE_Auto_Basic_Ptr::ACE_Auto_Basic_Ptr"); -} - -template ACE_INLINE X * -ACE_Auto_Basic_Ptr::get (void) const -{ - ACE_TRACE ("ACE_Auto_Basic_Ptr::get"); - return this->p_; -} - -template ACE_INLINE X * -ACE_Auto_Basic_Ptr::release (void) -{ - ACE_TRACE ("ACE_Auto_Basic_Ptr::release"); - X *old = this->p_; - this->p_ = 0; - return old; -} - -template ACE_INLINE void -ACE_Auto_Basic_Ptr::reset (X *p) -{ - ACE_TRACE ("ACE_Auto_Basic_Ptr::reset"); - if (this->get () != p) - delete this->get (); - this->p_ = p; -} - -template ACE_INLINE ACE_Auto_Basic_Ptr & -ACE_Auto_Basic_Ptr::operator= (ACE_Auto_Basic_Ptr &rhs) -{ - ACE_TRACE ("ACE_Auto_Basic_Ptr::operator="); - if (this != &rhs) - { - this->reset (rhs.release ()); - } - return *this; -} - -template ACE_INLINE -ACE_Auto_Basic_Ptr::~ACE_Auto_Basic_Ptr (void) -{ - ACE_TRACE ("ACE_Auto_Basic_Ptr::~ACE_Auto_Basic_Ptr"); - delete this->get (); -} - -template ACE_INLINE X & -ACE_Auto_Basic_Ptr::operator *() const -{ - ACE_TRACE ("ACE_Auto_Basic_Ptr::operator *()"); - return *this->get (); -} - -#if defined (ACE_LACKS_AUTO_PTR) || \ - !defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - -template ACE_INLINE X * -auto_ptr::operator-> () const -{ - ACE_TRACE ("auto_ptr::operator->"); - return this->get (); -} - -#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ - -template ACE_INLINE X * -ACE_Auto_Basic_Array_Ptr::get (void) const -{ - ACE_TRACE ("ACE_Auto_Basic_Array_Ptr::get"); - return this->p_; -} - -template ACE_INLINE X * -ACE_Auto_Basic_Array_Ptr::release (void) -{ - ACE_TRACE ("ACE_Auto_Basic_Array_Ptr::release"); - X *old = this->p_; - this->p_ = 0; - return old; -} - -template ACE_INLINE void -ACE_Auto_Basic_Array_Ptr::reset (X *p) -{ - ACE_TRACE ("ACE_Auto_Basic_Array_Ptr::reset"); - if (this->get () != p) - delete [] this->get (); - this->p_ = p; -} - -template ACE_INLINE -ACE_Auto_Basic_Array_Ptr::ACE_Auto_Basic_Array_Ptr (ACE_Auto_Basic_Array_Ptr &rhs) - : p_ (rhs.release ()) -{ - ACE_TRACE ("ACE_Auto_Basic_Array_Ptr::ACE_Auto_Basic_Array_Ptr"); -} - -template ACE_INLINE ACE_Auto_Basic_Array_Ptr & -ACE_Auto_Basic_Array_Ptr::operator= (ACE_Auto_Basic_Array_Ptr &rhs) -{ - ACE_TRACE ("ACE_Auto_Basic_Array_Ptr::operator="); - if (this != &rhs) - { - this->reset (rhs.release ()); - } - return *this; -} - -template ACE_INLINE -ACE_Auto_Basic_Array_Ptr::~ACE_Auto_Basic_Array_Ptr (void) -{ - ACE_TRACE ("ACE_Auto_Basic_Array_Ptr::~ACE_Auto_Basic_Array_Ptr"); - delete [] this->get (); -} - -template ACE_INLINE X & -ACE_Auto_Basic_Array_Ptr::operator *() const -{ - return *this->get (); -} - -template ACE_INLINE X & -ACE_Auto_Basic_Array_Ptr::operator[](int i) const -{ - X *array = this->get (); - return array[i]; -} - -template ACE_INLINE X * -ACE_Auto_Array_Ptr::operator->() const -{ - return this->get (); -} - diff --git a/ace/Base_Thread_Adapter.cpp b/ace/Base_Thread_Adapter.cpp deleted file mode 100644 index b2f1326cf00..00000000000 --- a/ace/Base_Thread_Adapter.cpp +++ /dev/null @@ -1,125 +0,0 @@ -// $Id$ - -#include "ace/Base_Thread_Adapter.h" -#include "ace/OS.h" - -ACE_RCSID(ace, Base_Thread_Adapter, "$Id$") - -#if !defined (ACE_HAS_INLINED_OSCALLS) -# include "ace/Base_Thread_Adapter.inl" -#endif /* ACE_HAS_INLINED_OS_CALLS */ - -ACE_INIT_LOG_MSG_HOOK ACE_Base_Thread_Adapter::init_log_msg_hook_ = 0; -ACE_INHERIT_LOG_MSG_HOOK ACE_Base_Thread_Adapter::inherit_log_msg_hook_ = 0; -ACE_CLOSE_LOG_MSG_HOOK ACE_Base_Thread_Adapter::close_log_msg_hook_ = 0; -ACE_SYNC_LOG_MSG_HOOK ACE_Base_Thread_Adapter::sync_log_msg_hook_ = 0; -ACE_THR_DESC_LOG_MSG_HOOK ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_ = 0; - -ACE_Base_Thread_Adapter::ACE_Base_Thread_Adapter ( - ACE_THR_FUNC user_func, - void *arg, - ACE_THR_C_FUNC entry_point, - ACE_OS_Thread_Descriptor *td -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , ACE_SEH_EXCEPT_HANDLER selector - , ACE_SEH_EXCEPT_HANDLER handler -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - ) - : user_func_ (user_func) - , arg_ (arg) - , entry_point_ (entry_point) - , thr_desc_ (td) -{ - ACE_OS_TRACE ("ACE_Base_Thread_Adapter::ACE_Base_Thread_Adapter"); - - if (ACE_Base_Thread_Adapter::init_log_msg_hook_ != 0) - (*ACE_Base_Thread_Adapter::init_log_msg_hook_) ( - this->log_msg_attributes_ -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , selector - , handler -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - ); -} - -ACE_Base_Thread_Adapter::~ACE_Base_Thread_Adapter (void) -{ -} - -void -ACE_Base_Thread_Adapter::inherit_log_msg (void) -{ - if (ACE_Base_Thread_Adapter::inherit_log_msg_hook_ != 0) - (*ACE_Base_Thread_Adapter::inherit_log_msg_hook_)( - this->thr_desc_, - this->log_msg_attributes_); -} - -void -ACE_Base_Thread_Adapter::close_log_msg (void) -{ - if (ACE_Base_Thread_Adapter::close_log_msg_hook_ != 0) - (*ACE_Base_Thread_Adapter::close_log_msg_hook_) (); -} - -void -ACE_Base_Thread_Adapter::sync_log_msg (const ACE_TCHAR *prg) -{ - if (ACE_Base_Thread_Adapter::sync_log_msg_hook_ != 0) - (*ACE_Base_Thread_Adapter::sync_log_msg_hook_) (prg); -} - -ACE_OS_Thread_Descriptor * -ACE_Base_Thread_Adapter::thr_desc_log_msg (void) -{ - if (ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_ != 0) - return (*ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_) (); - return 0; -} - -// Run the thread entry point for the . This must -// be an extern "C" to make certain compilers happy... - -#if defined (ACE_PSOS) -extern "C" void -ace_thread_adapter (unsigned long args) -{ - ACE_OS_TRACE ("ace_thread_adapter"); - -#if defined (ACE_HAS_TSS_EMULATION) - // As early as we can in the execution of the new thread, allocate - // its local TS storage. Allocate it on the stack, to save dynamic - // allocation/dealloction. - void *ts_storage[ACE_TSS_Emulation::ACE_TSS_THREAD_KEYS_MAX]; - ACE_TSS_Emulation::tss_open (ts_storage); -#endif /* ACE_HAS_TSS_EMULATION */ - - ACE_Base_Thread_Adapter *thread_args = - ACE_static_cast(ACE_Base_Thread_Adapter *, args); - - // Invoke the user-supplied function with the args. - thread_args->invoke (); -} -#else /* ! defined (ACE_PSOS) */ -extern "C" ACE_THR_FUNC_RETURN -ace_thread_adapter (void *args) -{ - ACE_OS_TRACE ("ace_thread_adapter"); - -#if defined (ACE_HAS_TSS_EMULATION) - // As early as we can in the execution of the new thread, allocate - // its local TS storage. Allocate it on the stack, to save dynamic - // allocation/dealloction. - void *ts_storage[ACE_TSS_Emulation::ACE_TSS_THREAD_KEYS_MAX]; - ACE_TSS_Emulation::tss_open (ts_storage); -#endif /* ACE_HAS_TSS_EMULATION */ - - ACE_Base_Thread_Adapter *thread_args = - ACE_static_cast (ACE_Base_Thread_Adapter *, args); - - // Invoke the user-supplied function with the args. - ACE_THR_FUNC_RETURN status = thread_args->invoke (); - - return status; -} -#endif /* ACE_PSOS */ diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h deleted file mode 100644 index 7661e061206..00000000000 --- a/ace/Base_Thread_Adapter.h +++ /dev/null @@ -1,167 +0,0 @@ -//============================================================================= -/** - * @file Base_Thread_Adapter.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef ACE_BASE_THREAD_ADAPTER_H -#define ACE_BASE_THREAD_ADAPTER_H -#include "ace/pre.h" - -#include "ace/OS_Log_Msg_Attributes.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS_Export.h" - -// Run the thread entry point for the . This must -// be an extern "C" to make certain compilers happy... -#if defined (ACE_PSOS) -extern "C" void ace_thread_adapter (unsigned long args); -#else /* ! defined (ACE_PSOS) */ -extern "C" ACE_OS_Export ACE_THR_FUNC_RETURN ace_thread_adapter (void *args); -#endif /* ACE_PSOS */ - -/** - * @class ACE_OS_Thread_Descriptor - * - * @brief Parent class of all ACE_Thread_Descriptor classes. - * = - * Container for ACE_Thread_Descriptor members that are - * used in ACE_OS. - */ -class ACE_OS_Export ACE_OS_Thread_Descriptor -{ -public: - /// Get the thread creation flags. - long flags (void) const; - -protected: - /// For use by ACE_Thread_Descriptor. - ACE_OS_Thread_Descriptor (long flags = 0); - - /** - * Keeps track of whether this thread was created "detached" or not. - * If a thread is *not* created detached then if someone calls - * , we need to join with that thread (and - * close down the handle). - */ - long flags_; -}; - -/** - * @class ACE_Base_Thread_Adapter - * - * @brief Base class for all the Thread_Adapters. - * - * Converts a C++ function into a function that can be - * called from a thread creation routine - * (e.g., pthread_create() or _beginthreadex()) that expects an - * extern "C" entry point. This class also makes it possible to - * transparently provide hooks to register a thread with an - * ACE_Thread_Manager. - * This class is used in ACE_OS::thr_create(). In general, the - * thread that creates an object of this class is different from - * the thread that calls @c invoke() on this object. Therefore, - * the @c invoke() method is responsible for deleting itself. - */ -class ACE_OS_Export ACE_Base_Thread_Adapter -{ -public: - /// Constructor. - ACE_Base_Thread_Adapter (ACE_THR_FUNC user_func, - void *arg, - ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter, - ACE_OS_Thread_Descriptor *td = 0 -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , ACE_SEH_EXCEPT_HANDLER selector = 0 - , ACE_SEH_EXCEPT_HANDLER handler = 0 -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - ); - - /// Virtual method invoked by the thread entry point. - virtual ACE_THR_FUNC_RETURN invoke (void) = 0; - - /// Accessor for the C entry point function to the OS thread creation - /// routine. - ACE_THR_C_FUNC entry_point (void); - - /// Invoke the close_log_msg_hook, if it is present - static void close_log_msg (void); - - /// Invoke the sync_log_msg_hook, if it is present - static void sync_log_msg (const ACE_TCHAR *prog_name); - - /// Invoke the thr_desc_log_msg_hook, if it is present - static ACE_OS_Thread_Descriptor *thr_desc_log_msg (void); - -protected: - /// Destructor, making it private ensures that objects of this class - /// are allocated on the heap. - virtual ~ACE_Base_Thread_Adapter (void); - - /// Inherit the logging features if the parent thread has an - /// . - void inherit_log_msg (void); - -private: - /// The hooks to inherit and cleanup the Log_Msg attributes - static ACE_INIT_LOG_MSG_HOOK init_log_msg_hook_; - static ACE_INHERIT_LOG_MSG_HOOK inherit_log_msg_hook_; - static ACE_CLOSE_LOG_MSG_HOOK close_log_msg_hook_; - static ACE_SYNC_LOG_MSG_HOOK sync_log_msg_hook_; - static ACE_THR_DESC_LOG_MSG_HOOK thr_desc_log_msg_hook_; - - /// Set the Log_Msg hooks - static void set_log_msg_hooks (ACE_INIT_LOG_MSG_HOOK init_hook, - ACE_INHERIT_LOG_MSG_HOOK inherit_hook, - ACE_CLOSE_LOG_MSG_HOOK close_hook, - ACE_SYNC_LOG_MSG_HOOK sync_hook, - ACE_THR_DESC_LOG_MSG_HOOK thr_desc); - - /// Allow the ACE_Log_Msg class to set its hooks. - friend class ACE_Log_Msg; - -protected: - /// Thread startup function passed in by the user (C++ linkage). - ACE_THR_FUNC user_func_; - - /// Argument to thread startup function. - void *arg_; - - /// Entry point to the underlying OS thread creation call (C - /// linkage). - ACE_THR_C_FUNC entry_point_; - - /** - * Optional thread descriptor. Passing this pointer in will force - * the spawned thread to cache this location in and wait - * until fills in all information in thread - * descriptor. - */ - ACE_OS_Thread_Descriptor *thr_desc_; - - /// The ACE_Log_Msg attributes. - ACE_OS_Log_Msg_Attributes log_msg_attributes_; - - /// Friend declaration to avoid compiler warning: only defines a private - /// destructor and has no friends. - friend class ACE_Thread_Adapter_Has_Private_Destructor; -}; - -# if defined (ACE_HAS_INLINED_OSCALLS) -# if defined (ACE_INLINE) -# undef ACE_INLINE -# endif /* ACE_INLINE */ -# define ACE_INLINE inline -# include "ace/Base_Thread_Adapter.inl" -# endif /* ACE_HAS_INLINED_OSCALLS */ - -#include "ace/post.h" -#endif /* ACE_BASE_THREAD_ADAPTER_H */ diff --git a/ace/Base_Thread_Adapter.inl b/ace/Base_Thread_Adapter.inl deleted file mode 100644 index 1d0d6ba7a49..00000000000 --- a/ace/Base_Thread_Adapter.inl +++ /dev/null @@ -1,34 +0,0 @@ -// $Id$ - -ACE_INLINE long -ACE_OS_Thread_Descriptor::flags (void) const -{ - return flags_; -} - -ACE_INLINE -ACE_OS_Thread_Descriptor::ACE_OS_Thread_Descriptor (long flags) - : flags_ (flags) -{ -} - -ACE_INLINE void -ACE_Base_Thread_Adapter::set_log_msg_hooks ( - ACE_INIT_LOG_MSG_HOOK init_hook, - ACE_INHERIT_LOG_MSG_HOOK inherit_hook, - ACE_CLOSE_LOG_MSG_HOOK close_hook, - ACE_SYNC_LOG_MSG_HOOK sync_hook, - ACE_THR_DESC_LOG_MSG_HOOK thr_desc_hook) -{ - ACE_Base_Thread_Adapter::init_log_msg_hook_ = init_hook; - ACE_Base_Thread_Adapter::inherit_log_msg_hook_ = inherit_hook; - ACE_Base_Thread_Adapter::close_log_msg_hook_ = close_hook; - ACE_Base_Thread_Adapter::sync_log_msg_hook_ = sync_hook; - ACE_Base_Thread_Adapter::thr_desc_log_msg_hook_ = thr_desc_hook; -} - -ACE_INLINE ACE_THR_C_FUNC -ACE_Base_Thread_Adapter::entry_point (void) -{ - return this->entry_point_; -} diff --git a/ace/Based_Pointer_Repository.cpp b/ace/Based_Pointer_Repository.cpp deleted file mode 100644 index d3b5193610a..00000000000 --- a/ace/Based_Pointer_Repository.cpp +++ /dev/null @@ -1,127 +0,0 @@ -// $Id$ - -#include "ace/Map_Manager.h" -#include "ace/Based_Pointer_Repository.h" - -/** - * @class ACE_Based_Pointer_Repository_Rep - * - * @brief Implementation for the . - * - * Every memory pool in ACE binds it's mapping base address and - * the mapped size to this repository every time it maps/remaps a - * new chunk of memory successfully. - */ -class ACE_Based_Pointer_Repository_Rep -{ -public: - // Useful typedefs. - typedef ACE_Map_Manager MAP_MANAGER; - typedef ACE_Map_Iterator < void *, size_t, ACE_Null_Mutex> MAP_ITERATOR; - typedef ACE_Map_Entry MAP_ENTRY; - - /// Keeps track of the mapping between addresses and their associated - /// values. - MAP_MANAGER addr_map_; - - /// Synchronize concurrent access to the map. - ACE_SYNCH_MUTEX lock_; -}; - -ACE_Based_Pointer_Repository::ACE_Based_Pointer_Repository (void) -{ - ACE_TRACE ("ACE_Based_Pointer_Repository::ACE_Based_Pointer_Repository"); - ACE_NEW (this->rep_, - ACE_Based_Pointer_Repository_Rep); -} - -ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository (void) -{ - ACE_TRACE ("ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository"); - delete this->rep_; -} - -// Search for appropriate base address in repository - -int -ACE_Based_Pointer_Repository::find (void *addr, - void *&base_addr) -{ - ACE_TRACE ("ACE_Based_Pointer_Repository::find"); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->rep_->lock_, -1); - ACE_Based_Pointer_Repository_Rep::MAP_ENTRY *ce = 0; - - for (ACE_Based_Pointer_Repository_Rep::MAP_ITERATOR iter (this->rep_->addr_map_); - iter.next (ce) != 0; - iter.advance ()) - // Check to see if is within any of the regions. - if (addr >= ce->ext_id_ - && addr < ((char *) ce->ext_id_ + ce->int_id_)) - { - // Assign the base address. - base_addr = ce->ext_id_; - return 1; - } - - // Assume base address 0 (e.g., if new'ed). - base_addr = 0; - return 0; -} - -// Bind a new entry to the repository or update the size of an -// existing entry. - -int -ACE_Based_Pointer_Repository::bind (void *addr, - size_t size) -{ - ACE_TRACE ("ACE_Based_Pointer_Repository::bind"); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->rep_->lock_, -1); - - return this->rep_->addr_map_.rebind (addr, size); -} - -// Unbind a base from the repository. - -int -ACE_Based_Pointer_Repository::unbind (void *addr) -{ - ACE_TRACE ("ACE_Based_Pointer_Repository::unbind"); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->rep_->lock_, -1); - ACE_Based_Pointer_Repository_Rep::MAP_ENTRY *ce = 0; - - // Search for service handlers that requested notification. - - for (ACE_Based_Pointer_Repository_Rep::MAP_ITERATOR iter (this->rep_->addr_map_); - iter.next (ce) != 0; - iter.advance ()) - { - // Check to see if is within any of the regions and if - // so, unbind the key from the map. - if (addr >= ce->ext_id_ - && addr < ((char *) ce->ext_id_ + ce->int_id_)) - // Unbind base address. - return this->rep_->addr_map_.unbind (ce->ext_id_); - } - - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton ; -template class ACE_Map_Entry; -template class ACE_Map_Manager; -template class ACE_Map_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Iterator_Base; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton -#pragma instantiate ACE_Map_Entry -#pragma instantiate ACE_Map_Manager -#pragma instantiate ACE_Map_Iterator -#pragma instantiate ACE_Map_Reverse_Iterator -#pragma instantiate ACE_Map_Iterator_Base -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS)) -template ACE_Singleton * - ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h deleted file mode 100644 index 82c950838af..00000000000 --- a/ace/Based_Pointer_Repository.h +++ /dev/null @@ -1,79 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Based_Pointer_Repository.h - * - * $Id$ - * - * @author Dietrich Quehl - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_BASED_POINTER_REPOSITORY_H -#define ACE_BASED_POINTER_REPOSITORY_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -// Forward decl., using the "Cheshire Cat" technique. -class ACE_Based_Pointer_Repository_Rep; - -/** - * @class ACE_Based_Pointer_Repository - * - * @brief Maps pointers to the base address of the region to which each - * pointer belongs. - */ -class ACE_Export ACE_Based_Pointer_Repository -{ -public: - // = Use to allow locking while iterating. - - // = Initialization and termination methods. - ACE_Based_Pointer_Repository (void); - ~ACE_Based_Pointer_Repository (void); - - // = Search structure methods. - /** - * Return the appropriate region that contains . - * Returns 1 on success and 0 if the isn't contained in any - * region. - */ - int find (void *addr, - void *&base_addr); - - /// Bind a new entry to the repository or update the size of an - /// existing entry. Returns 0 on success and -1 on failure. - int bind (void *addr, - size_t size); - - /// Unbind from the repository the that is - /// contained within. - int unbind (void *addr); - -private: - - /// Use the "Cheshire-Cat" technique to hide the implementation in - /// order to avoid circular #include dependencies. - ACE_Based_Pointer_Repository_Rep *rep_; - -}; - -#include "ace/Singleton.h" - -/// Provide a Singleton access point to the based pointer repository. -typedef ACE_Singleton - ACE_BASED_POINTER_REPOSITORY; - -#include "ace/post.h" - -#endif /* ACE_BASED_POINTER_REPOSITORY_H */ diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp deleted file mode 100644 index 5bf6352b406..00000000000 --- a/ace/Based_Pointer_T.cpp +++ /dev/null @@ -1,114 +0,0 @@ -// $Id$ - -#ifndef ACE_BASED_POINTER_T_CPP -#define ACE_BASED_POINTER_T_CPP - -#include "ace/Based_Pointer_T.h" -#include "ace/Based_Pointer_Repository.h" -#include "ace/Log_Msg.h" - -# define ACE_TRACEX(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__)) - -#if !defined (__ACE_INLINE__) -#include "ace/Based_Pointer_T.i" -#endif /* __ACE_INLINE__ */ - -template -ACE_Based_Pointer::ACE_Based_Pointer (void) -{ - ACE_TRACE ("ACE_Based_Pointer::ACE_Based_Pointer"); -} - -template void -ACE_Based_Pointer_Basic::dump (void) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntarget_ = %d\n"), this->target_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base_offset_ = %d\n"), this->base_offset_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("computed pointer = %x\n"), (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this)))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template -ACE_Based_Pointer::ACE_Based_Pointer (CONCRETE *initial) - : ACE_Based_Pointer_Basic (initial) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic"); -} - -template -ACE_Based_Pointer::ACE_Based_Pointer (const void* base_addr, int) - : ACE_Based_Pointer_Basic (base_addr, 0) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic"); -} - -template -ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic (void) - : target_ (0), - base_offset_ (0) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic"); - void *base_addr = 0; - - // Find the base address associated with our pointer. Note - // that it's ok for to return 0, which simply indicates that - // the address is not in memory-mapped virtual address space. - ACE_BASED_POINTER_REPOSITORY::instance ()->find (this, - base_addr); - this->base_offset_ = (char *) this - (char *) base_addr; -} - -template -ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic (const void *base_addr, int) - : target_ (0), - base_offset_ (0) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic"); - this->base_offset_ = (char *) this - (char *) base_addr; -} - -template -ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic (CONCRETE *rhs) - : target_ (0), - base_offset_ (0) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic"); - - if (rhs == 0) - // Store a value of that indicate "NULL" pointer. - this->target_ = -1; - else - { - void *base_addr = 0; - - // Find the base address associated with the pointer. - // Note that it's ok for to return 0, which simply - // indicates that the address is not in memory-mapped virtual - // address space. - ACE_BASED_POINTER_REPOSITORY::instance ()->find (this, - base_addr); - this->base_offset_ = (char *) this - (char *) base_addr; - this->target_ = ((char *) rhs - (char *) base_addr); - } -} - -template -ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic (const ACE_Based_Pointer_Basic &) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic"); - - ACE_ASSERT (0); // not implemented. -} - -template -ACE_Based_Pointer::ACE_Based_Pointer (const ACE_Based_Pointer &rhs) - : ACE_Based_Pointer_Basic (rhs) -{ - ACE_TRACE ("ACE_Based_Pointer::ACE_Based_Pointer"); - ACE_ASSERT (0); // not implemented. -} - -#endif /* ACE_BASED_POINTER_T_CPP */ diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h deleted file mode 100644 index 4c0cdd9b183..00000000000 --- a/ace/Based_Pointer_T.h +++ /dev/null @@ -1,201 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Based_Pointer_T.h - * - * $Id$ - * - * @author Dietrich Quehl - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_BASED_POINTER_T_H -#define ACE_BASED_POINTER_T_H - -#include "ace/pre.h" - -#include "ace/config-all.h" -#include "ace/Trace.h" - -#if defined (_MSC_VER) -// Suppress warning e.g. "return type for -// 'ACE_Based_Pointer::operator ->' is 'long *' (i.e., not a UDT -// or reference to a UDT. Will produce errors if applied using infix -// notation)" -#pragma warning(disable: 4284) -#endif /* _MSC_VER */ - -/** - * @class ACE_Based_Pointer_Basic - * - * @brief A proxy that keeps track of the relative offset of a "pointer" - * from its base address. - * This class makes it possible to transparently use "pointers" in - * shared memory as easily as programming with pointers to local - * memory. In particular, we don't need to ensure that the base - * addresses of all the pointers are mapped into separate - * processes at the same absolute memory base address. - */ -template -class ACE_Based_Pointer_Basic -{ -public: - /** - * This constructor initializes the by asking the - * Singleton for the base address of - * the memory region within which it is instantiated. Two results - * are possible: - * - * 1. An has stored a base address/size pair and the - * new based-pointer instance is located between the base address and - * the base address + size - 1. In this case, the repository - * returns the base address. - * - * 2. No suitable address/size pair was found. The repository - * assumes an address in the regular (not mapped) virtual address - * space of the process and returns 0. In this case, the - * based-pointer uses its address as an offset to it's base - * address 0. - */ - ACE_Based_Pointer_Basic (void); - - /** - * Initialize this object using the pointer. This - * constructor initializes the by asking the - * Singleton for the base address of - * the memory region within which it is instantiated. Three results - * are possible: - * - * 1. An has stored a base address/size pair and the - * new based-pointer instance is located between the base address and - * the base address + size - 1. In this case, the repository - * returns the base address. - * - * 2. No suitable address/size pair was found. The repository - * assumes an address in the regular (not mapped) virtual address - * space of the process and returns 0. In this case, the - * based-pointer uses its address as an offset to its base - * address 0. - * - * 3. If is 0 then set the value of to -1, which - * indicates a "NULL" pointer. - */ - ACE_Based_Pointer_Basic (CONCRETE *initial); - - /// Copy constructor. - ACE_Based_Pointer_Basic (const ACE_Based_Pointer_Basic &); - - /// Constructor for know base address. is only used to - /// resolve overload ambiguity. - ACE_Based_Pointer_Basic (const void *base_addr, int o); - - /// Pseudo-assignment operator. - void operator = (CONCRETE *from); - - /// Pseudo-assignment operator. - void operator = (const ACE_Based_Pointer_Basic &); - - /// Dereference operator. - CONCRETE operator * (void) const; - - /// Less than operator. - int operator < (const ACE_Based_Pointer_Basic &) const; - - /// Less than or equal operator. - int operator <= (const ACE_Based_Pointer_Basic &) const; - - /// Greater than operator. - int operator > (const ACE_Based_Pointer_Basic &) const; - - /// Greater than or equal operator. - int operator >= (const ACE_Based_Pointer_Basic &) const; - - /// Equality operator. - int operator == (const ACE_Based_Pointer_Basic &) const; - - /// Inequality operator. - int operator != (const ACE_Based_Pointer_Basic &) const; - - /// Subscript operator. - CONCRETE operator [](int index) const; - - /// Increment operator. - void operator+= (int index); - - /// Returns the underlying memory address of the smart pointer. - operator CONCRETE *() const; - - /// Returns the underlying memory address of the smart pointer. - CONCRETE *addr (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /// Dump the state of the object. - void dump (void) const; - -protected: - long target_; - - /// Keep track of our offset from the base pointer. - long base_offset_; -}; - -/** - * @class ACE_Based_Pointer - * - * @brief A smart proxy that keeps track of the relative offset of a - * "pointer" from its base address. - * - * This class makes it possible to transparently use "pointers" in - * shared memory as easily as programming with pointers to local - * memory by overloading the C++ delegation operator ->(). - */ -template -class ACE_Based_Pointer : public ACE_Based_Pointer_Basic -{ -public: - // = Initialization method. - /// Constructor. See constructor for for - /// details. - ACE_Based_Pointer (void); - - /// Initialize this object using the pointer. See - /// constructor for for details. - ACE_Based_Pointer (CONCRETE *initial); - - /// Initialize this object with known . is - /// a dummy value used to resolve overload ambiguity and it - /// otherwise ignored. - ACE_Based_Pointer (const void *base_addr, int dummy); - - /// Copy constructor (not implemented yet). - ACE_Based_Pointer (const ACE_Based_Pointer &); - - /// Assignment operator. - void operator = (const ACE_Based_Pointer &); - - /// Pseudo-assignment operator. - void operator = (CONCRETE *from); - - /// The C++ "delegation operator". - CONCRETE *operator-> (void); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Based_Pointer_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Based_Pointer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Based_Pointer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_BASED_POINTER_T_H */ diff --git a/ace/Based_Pointer_T.i b/ace/Based_Pointer_T.i deleted file mode 100644 index 1d99f9ecaa8..00000000000 --- a/ace/Based_Pointer_T.i +++ /dev/null @@ -1,136 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#define ACE_COMPUTE_BASED_POINTER(P) (((char *) (P) - (P)->base_offset_) + (P)->target_) - -template ACE_INLINE CONCRETE * -ACE_Based_Pointer::operator->(void) -{ - ACE_TRACE ("ACE_Based_Pointer::operator->"); - return (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this)); -} - -template ACE_INLINE void -ACE_Based_Pointer_Basic::operator = (CONCRETE *rhs) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator ="); - if (rhs == 0) - // Store a value of that indicate "NULL" pointer. - this->target_ = -1; - else - this->target_ = ((char *) rhs - - ((char *) this - this->base_offset_)); -} - -template ACE_INLINE void -ACE_Based_Pointer::operator = (CONCRETE *rhs) -{ - ACE_TRACE ("ACE_Based_Pointer::operator ="); - if (rhs == 0) - // Store a value of that indicate "NULL" pointer. - this->target_ = -1; - else - this->target_ = ((char *) rhs - - ((char *) this - this->base_offset_)); -} - -template ACE_INLINE CONCRETE -ACE_Based_Pointer_Basic::operator *(void) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator *"); - return *ACE_reinterpret_cast (CONCRETE *, - ACE_COMPUTE_BASED_POINTER (this)); -} - -template ACE_INLINE CONCRETE * -ACE_Based_Pointer_Basic::addr (void) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::addr"); - - if (this->target_ == -1) - return 0; - else - return ACE_reinterpret_cast (CONCRETE *, - ACE_COMPUTE_BASED_POINTER (this)); -} - -template ACE_INLINE -ACE_Based_Pointer_Basic::operator CONCRETE *() const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator CONCRETE *()"); - - return this->addr (); -} - -template ACE_INLINE CONCRETE -ACE_Based_Pointer_Basic::operator [] (int index) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator []"); - CONCRETE *c = ACE_reinterpret_cast (CONCRETE *, - ACE_COMPUTE_BASED_POINTER (this)); - return c[index]; -} - -template ACE_INLINE void -ACE_Based_Pointer_Basic::operator += (int index) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator +="); - this->base_offset_ += (index * sizeof (CONCRETE)); -} - -template ACE_INLINE int -ACE_Based_Pointer_Basic::operator == (const ACE_Based_Pointer_Basic &rhs) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator =="); - return ACE_COMPUTE_BASED_POINTER (this) == ACE_COMPUTE_BASED_POINTER (&rhs); -} - -template ACE_INLINE int -ACE_Based_Pointer_Basic::operator != (const ACE_Based_Pointer_Basic &rhs) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator !="); - return !(*this == rhs); -} - -template ACE_INLINE int -ACE_Based_Pointer_Basic::operator < (const ACE_Based_Pointer_Basic &rhs) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator <"); - return ACE_COMPUTE_BASED_POINTER (this) < ACE_COMPUTE_BASED_POINTER (&rhs); -} - -template ACE_INLINE int -ACE_Based_Pointer_Basic::operator <= (const ACE_Based_Pointer_Basic &rhs) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator <="); - return ACE_COMPUTE_BASED_POINTER (this) <= ACE_COMPUTE_BASED_POINTER (&rhs); -} - -template ACE_INLINE int -ACE_Based_Pointer_Basic::operator > (const ACE_Based_Pointer_Basic &rhs) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator >"); - return ACE_COMPUTE_BASED_POINTER (this) > ACE_COMPUTE_BASED_POINTER (&rhs); -} - -template ACE_INLINE int -ACE_Based_Pointer_Basic::operator >= (const ACE_Based_Pointer_Basic &rhs) const -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator >="); - return ACE_COMPUTE_BASED_POINTER (this) >= ACE_COMPUTE_BASED_POINTER (&rhs); -} - -template ACE_INLINE void -ACE_Based_Pointer_Basic::operator= (const ACE_Based_Pointer_Basic &rhs) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::operator="); - *this = rhs.addr (); -} - -template ACE_INLINE void -ACE_Based_Pointer::operator= (const ACE_Based_Pointer &rhs) -{ - ACE_TRACE ("ACE_Based_Pointer::operator="); - *this = rhs.addr (); -} - diff --git a/ace/Basic_Stats.cpp b/ace/Basic_Stats.cpp deleted file mode 100644 index 00509d827ce..00000000000 --- a/ace/Basic_Stats.cpp +++ /dev/null @@ -1,73 +0,0 @@ -// $Id$ - -#include "ace/Basic_Stats.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Basic_Stats.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Basic_Stats, "$Id$") - -void -ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs) -{ - if (rhs.samples_count_ == 0) - return; - - if (this->samples_count_ == 0) - { - this->samples_count_ = rhs.samples_count_; - - this->min_ = rhs.min_; - this->max_ = rhs.max_; - this->sum_ = rhs.sum_; - this->sum2_ = rhs.sum2_; - - return; - } - this->samples_count_ += rhs.samples_count_; - - if (this->min_ > rhs.min_) - this->min_ = rhs.min_; - if (this->max_ < rhs.max_) - this->max_ = rhs.max_; - - this->sum_ += rhs.sum_; - this->sum2_ += rhs.sum2_; -} - -void -ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, - ACE_UINT32 sf) const -{ - if (this->samples_count () == 0u) - { - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s : no data collected\n"), msg)); - return; - } - - ACE_UINT64 avg = this->sum_ / this->samples_count_; - ACE_UINT64 dev = -#if defined ACE_LACKS_LONGLONG_T - ACE_static_cast (ACE_U_LongLong, - this->sum2_ / this->samples_count_) - - avg * ACE_U64_TO_U32(avg); -#else /* ! ACE_LACKS_LONGLONG_T */ - this->sum2_ / this->samples_count_ - avg * avg; -#endif /* ! ACE_LACKS_LONGLONG_T */ - - double l_min = ACE_CU64_TO_CU32 (this->min_) / sf; - double l_max = ACE_CU64_TO_CU32 (this->max_) / sf; - double l_avg = ACE_CU64_TO_CU32 (avg) / sf; - double l_dev = ACE_CU64_TO_CU32 (dev) / (sf * sf); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), - msg, - l_min, this->min_at_, - l_avg, - l_max, this->max_at_, - l_dev)); -} diff --git a/ace/Basic_Stats.h b/ace/Basic_Stats.h deleted file mode 100644 index 79fe5bc08ac..00000000000 --- a/ace/Basic_Stats.h +++ /dev/null @@ -1,87 +0,0 @@ - -//============================================================================= -/** - * @file Basic_Stats.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ -//============================================================================= - - -#ifndef ACE_BASIC_STATS_H -#define ACE_BASIC_STATS_H -#include "ace/pre.h" - -#include "ace/config-all.h" -#include "ace/Basic_Types.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Collect basic stats about a series of samples -/** - * Compute the average and standard deviation (aka jitter) for an - * arbitrary number of samples, using constant space. - * Normally used for latency statistics. - */ -class ACE_Export ACE_Basic_Stats -{ -public: - /// Constructor - /** - * The number of samples is pre-allocated, and cannot changes once - * the class is initialized. - */ - ACE_Basic_Stats (void); - - /// The number of samples received so far - ACE_UINT32 samples_count (void) const; - - /// Record one sample. - void sample (ACE_UINT64 value); - - /// Update the values to reflect the stats in @a rhs. - void accumulate (const ACE_Basic_Stats &rhs); - - /// Dump all the samples - /** - * Prints out the results, using @a msg as a prefix for each message and - * scaling all the numbers by @a scale_factor. The latter is useful because - * high resolution timer samples are acquired in clock ticks, but often - * presented in microseconds. - */ - void dump_results (const ACE_TCHAR *msg, - ACE_UINT32 scale_factor) const; - -private: - /// The number of samples - ACE_UINT32 samples_count_; - - /// The minimum value - ACE_UINT64 min_; - - /// The number of the sample that had the minimum value - ACE_UINT32 min_at_; - - /// The maximum value - ACE_UINT64 max_; - - /// The number of the sample that had the maximum value - ACE_UINT32 max_at_; - - /// The sum of all the values - ACE_UINT64 sum_; - - /// The sum of the square of all the values - ACE_UINT64 sum2_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Basic_Stats.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_BASIC_STATS_H */ diff --git a/ace/Basic_Stats.inl b/ace/Basic_Stats.inl deleted file mode 100644 index 4ed1baca459..00000000000 --- a/ace/Basic_Stats.inl +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_Basic_Stats::ACE_Basic_Stats (void) - : samples_count_ (0) - , min_ (0) - , min_at_ (0) - , max_ (0) - , max_at_ (0) - , sum_ (0) - , sum2_ (0) -{ -} - -ACE_INLINE ACE_UINT32 -ACE_Basic_Stats::samples_count (void) const -{ - return this->samples_count_; -} - -ACE_INLINE void -ACE_Basic_Stats::sample (ACE_UINT64 value) -{ - ++this->samples_count_; - - if (this->samples_count_ == 1u) - { - this->min_ = value; - this->min_at_ = this->samples_count_; - this->max_ = value; - this->max_at_ = this->samples_count_; - this->sum_ = value; -#if defined ACE_LACKS_LONGLONG_T - this->sum2_ = value * ACE_U64_TO_U32 (value); -#else /* ! ACE_LACKS_LONGLONG_T */ - this->sum2_ = value * value; -#endif /* ! ACE_LACKS_LONGLONG_T */ - } - else - { - if (this->min_ > value) - { - this->min_ = value; - this->min_at_ = this->samples_count_; - } - if (this->max_ < value) - { - this->max_ = value; - this->max_at_ = this->samples_count_; - } - - this->sum_ += value; -#if defined ACE_LACKS_LONGLONG_T - this->sum2_ += value * ACE_U64_TO_U32 (value); -#else /* ! ACE_LACKS_LONGLONG_T */ - this->sum2_ += value * value; -#endif /* ! ACE_LACKS_LONGLONG_T */ - } -} diff --git a/ace/Basic_Types.cpp b/ace/Basic_Types.cpp deleted file mode 100644 index f58419f09e8..00000000000 --- a/ace/Basic_Types.cpp +++ /dev/null @@ -1,131 +0,0 @@ -#include "ace/OS.h" - -#if !defined (__ACE_INLINE__) -# include "ace/Basic_Types.i" -#endif /* ! __ACE_INLINE__ */ - - -ACE_RCSID (ace, - Basic_Types, - "$Id$") - - -#if defined (ACE_LACKS_LONGLONG_T) -# include "ace/Log_Msg.h" -# if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -# include "ace/streams.h" -# endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - -void -ACE_U_LongLong::output (FILE *file) const -{ - if (h_ () > 0) - ACE_OS::fprintf (file, "0x%lx%0*lx", h_ (), 2 * sizeof l_ (), l_ ()); - else - ACE_OS::fprintf (file, "0x%lx", l_ ()); -} - - -ACE_TCHAR * -ACE_U_LongLong::as_string (ACE_TCHAR *output, - unsigned int base, - unsigned int uppercase) const -{ - if (*this == 0) - { - ACE_OS::strcpy(output, "0"); - } - else - { - switch(base) - { - case 8: - { - unsigned int index = 0; - int bshift = 31; - while(bshift >= 1) - { - unsigned int sval = (this->h_ () >> bshift) & 7; - if (sval > 0 || index != 0) - { - output[index] = sval + '0'; - index++; - } - bshift -= 3; - } - bshift = 30; - while(bshift >= 0) - { - unsigned int sval = (this->l_ () >> bshift) & 7; - // Combine the last bit of hi with the first 3-bit digit - if (bshift == 30) - { - sval |= (this->h_ () & 1) << 2; - } - if (sval > 0 || index != 0) - { - output[index] = sval + '0'; - index++; - } - bshift -= 3; - } - output[index] = '\0'; - break; - } - case 10: - { - ACE_OS::sprintf(output, "%.0f", *this / 1.0); - break; - } - case 16: - { - if (this->h_ () != 0) - { - ACE_OS::sprintf(output, - (uppercase ? "%lX%0*lX" : "%lx%0*lx"), - this->h_ (), 2 * sizeof this->l_ (), - this->l_ ()); - } - else - { - ACE_OS::sprintf(output, - (uppercase ? "%lX" : "%lx"), this->l_ ()); - - } - break; - } - default: - { - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Unsupported base = %u\n"), base)); - output[0] = '\0'; - } - } - } - - return output; -} - - -# if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -ostream& -operator<< (ostream& os, const ACE_U_LongLong& ll) -{ - unsigned long flags = os.setf(0); - char buffer[32]; - - if ((flags & ios::oct) != 0) - os << ll.as_string (buffer, 8); - else if ((flags & ios::hex) != 0) - os << ll.as_string (buffer, 16, (flags & ios::uppercase)); - else - os << ll.as_string (buffer); - return os; -} -# endif - - -#endif /* ACE_LACKS_LONGLONG_T */ - -// Explicit template instantiation file -#include "ace/Template_Instantiations.cpp" diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h deleted file mode 100644 index b7c0e7e44d4..00000000000 --- a/ace/Basic_Types.h +++ /dev/null @@ -1,668 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Basic_Types.h - * - * $Id$ - * - * @author David L. Levine - * - * #defines the list of preprocessor macros below. The config.h file can - * pre-define any of these to short-cut the definitions. This is usually - * only necessary if the preprocessor does all of its math using integers. - * - * Sizes of built-in types: - * - ACE_SIZEOF_CHAR - * - ACE_SIZEOF_WCHAR - * - ACE_SIZEOF_SHORT - * - ACE_SIZEOF_INT - * - ACE_SIZEOF_LONG - * - ACE_SIZEOF_LONG_LONG - * - ACE_SIZEOF_VOID_P - * - ACE_SIZEOF_FLOAT - * - ACE_SIZEOF_DOUBLE - * - ACE_SIZEOF_LONG_DOUBLE - * - * Wrappers for built-in types of specific sizes: - * - ACE_USHORT16 (For backward compatibility. Use ACE_UINT16 instead.) - * - ACE_INT16 - * - ACE_UINT16 - * - ACE_INT32 - * - ACE_UINT32 - * - ACE_UINT64 - * (Note: ACE_INT64 is not defined, because there is no ACE_LongLong for - * platforms that don't have a native 8-byte integer type.) - * - * Byte-order (endian-ness) determination: - * ACE_BYTE_ORDER, to either ACE_BIG_ENDIAN or ACE_LITTLE_ENDIAN - * - * - */ -//============================================================================= - -#ifndef ACE_BASIC_TYPES_H -# define ACE_BASIC_TYPES_H - -# include "ace/pre.h" - -# include "ace/config-all.h" - -# if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -# endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Pull in definitions -# include /**/ // Integer limits -# include /**/ // Floating point limits -# include /**/ // Other types - -# if defined(ACE_LACKS_LONGLONG_T) -# include /**/ // LynxOS requires this before stdio.h -# include /**/ // For long long emulation -# endif /* ACE_LACKS_LONGLONG_T */ - -# if !defined (ACE_LACKS_SYS_TYPES_H) -# include /**/ -# endif /* ACE_LACKS_SYS_TYPES_H */ - -# if !defined (ACE_LACKS_PARAM_H) -# include /**/ -# endif /* ACE_LACKS_PARAM_H */ - -# include "ace/ACE_export.h" - -// Pick up MAXPATHLEN without need of OS.h. -#if !defined (MAXPATHLEN) -# if defined (ACE_WIN32) -# define MAXPATHLEN _MAX_PATH -# elif defined (_POSIX_PATH_MAX) -# define MAXPATHLEN _POSIX_PATH_MAX -# else -# define MAXPATHLEN 1024 -# endif /* ACE_WIN32 */ -#endif /* MAXPATHLEN */ - -// A char always has 1 byte, by definition. -# define ACE_SIZEOF_CHAR 1 - -// Unfortunately, there isn't a portable way to determine the size of a wchar. -// So we just define them on a platform basis. -# if defined (ACE_HAS_WCHAR) -# if !defined (ACE_SIZEOF_WCHAR) -# if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) -# define ACE_SIZEOF_WCHAR sizeof (wchar_t) -# else -// 0 so the Basic_Types test will catch this. -# define ACE_SIZEOF_WCHAR 0 -# endif /* ACE_HAS_XPG4_MULTIBYTE_CHAR */ -# endif /* !ACE_SIZEOF_WCHAR */ -# endif /* ACE_HAS_WCHAR */ - -// The number of bytes in a short. -# if !defined (ACE_SIZEOF_SHORT) -# if (USHRT_MAX) == 255U -# define ACE_SIZEOF_SHORT 1 -# elif (USHRT_MAX) == 65535U -# define ACE_SIZEOF_SHORT 2 -# elif (USHRT_MAX) == 4294967295U -# define ACE_SIZEOF_SHORT 4 -# elif (USHRT_MAX) == 18446744073709551615U -# define ACE_SIZEOF_SHORT 8 -# else -# error: unsupported short size, must be updated for this platform! -# endif /* USHRT_MAX */ -# endif /* !defined (ACE_SIZEOF_SHORT) */ - -// The number of bytes in an int. -# if !defined (ACE_SIZEOF_INT) -# if (UINT_MAX) == 65535U -# define ACE_SIZEOF_INT 2 -# elif (UINT_MAX) == 4294967295U -# define ACE_SIZEOF_INT 4 -# elif (UINT_MAX) == 18446744073709551615U -# define ACE_SIZEOF_INT 8 -# else -# error: unsupported int size, must be updated for this platform! -# endif /* UINT_MAX */ -# endif /* !defined (ACE_SIZEOF_INT) */ - -// The number of bytes in a long. -// NOTE - since preprocessors only need to do integer math, this is a likely -// place for a preprocessor to not properly support being able to figure out -// the proper size. HP aC++ and GNU gcc have this difficulty so watch out. -# if !defined (ACE_SIZEOF_LONG) -# if (ULONG_MAX) == 65535UL -# define ACE_SIZEOF_LONG 2 -# elif ((ULONG_MAX) == 4294967295UL) -# define ACE_SIZEOF_LONG 4 -# elif ((ULONG_MAX) == 18446744073709551615UL) -# define ACE_SIZEOF_LONG 8 -# else -# error: unsupported long size, must be updated for this platform! -# endif /* ULONG_MAX */ -# endif /* !defined (ACE_SIZEOF_LONG) */ - -// The number of bytes in a long long. -# if !defined (ACE_SIZEOF_LONG_LONG) -# if defined (ACE_LACKS_LONGLONG_T) -# define ACE_SIZEOF_LONG_LONG 8 -# else /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ -# if ACE_SIZEOF_LONG == 8 -# define ACE_SIZEOF_LONG_LONG 8 - typedef unsigned long ACE_UINT64; -# elif defined (ULLONG_MAX) && !defined (__GNUG__) - // Some compilers use ULLONG_MAX and others, e.g. Irix, use - // ULONGLONG_MAX. -# if (ULLONG_MAX) == 18446744073709551615ULL -# define ACE_SIZEOF_LONG_LONG 8 -# elif (ULLONG_MAX) == 4294967295ULL -# define ACE_SIZEOF_LONG_LONG 4 -# else -# error Unsupported long long size needs to be updated for this platform -# endif - typedef unsigned long long ACE_UINT64; -# elif defined (ULONGLONG_MAX) && !defined (__GNUG__) - // Irix 6.x, for example. -# if (ULONGLONG_MAX) == 18446744073709551615ULL -# define ACE_SIZEOF_LONG_LONG 8 -# elif (ULONGLONG_MAX) == 4294967295ULL -# define ACE_SIZEOF_LONG_LONG 4 -# else -# error Unsupported long long size needs to be updated for this platform -# endif - typedef unsigned long long ACE_UINT64; -# else - // ACE_SIZEOF_LONG_LONG is not yet known, but the platform doesn't - // claim ACE_LACKS_LONGLONG_T, so assume it has 8-byte long longs. -# define ACE_SIZEOF_LONG_LONG 8 -# if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T) - // sun #defines u_longlong_t, maybe other platforms do also. - // Use it, at least with g++, so that its -pedantic doesn't - // complain about no ANSI C++ long long. - typedef u_longlong_t ACE_UINT64; -# else - // LynxOS 2.5.0 and Linux don't have u_longlong_t. - typedef unsigned long long ACE_UINT64; -# endif /* sun */ -# endif /* ULLONG_MAX && !__GNUG__ */ -# endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ -# endif /* !defined (ACE_SIZEOF_LONG_LONG) */ - -// The sizes of the commonly implemented types are now known. Set up -// typedefs for whatever we can. Some of these are needed for certain cases -// of ACE_UINT64, so do them before the 64-bit stuff. - -# if ACE_SIZEOF_SHORT == 2 - typedef short ACE_INT16; - typedef unsigned short ACE_UINT16; -# elif ACE_SIZEOF_INT == 2 - typedef int ACE_INT16; - typedef unsigned int ACE_UINT16; -# elif (ACE_SIZEOF_SHORT) == 4 && defined(_CRAYMPP) - // mpp cray - uses Alpha processors - // Use the real 32-bit quantity for ACE_INT32's, and use a "long" - // for ACE_INT16's. This gets around conflicts with size_t in some ACE - // method signatures, among other things. - typedef long ACE_INT16; - typedef unsigned long ACE_UINT16; - typedef short ACE_INT32; - typedef unsigned short ACE_UINT32; -# elif (ACE_SIZEOF_SHORT) == 8 && defined(_UNICOS) - // vector cray - hard 64-bit, all 64 bit types - typedef short ACE_INT16; - typedef unsigned short ACE_UINT16; -# else -# error Have to add to the ACE_UINT16 type setting -# endif - -typedef ACE_UINT16 ACE_USHORT16; - -// Define a generic byte for use in codecs -typedef unsigned char ACE_Byte; - -// Define a pseudo wide character type when wchar is not supported so we -// can support basic wide character string operations. - -# if defined (ACE_HAS_WCHAR) -# define ACE_WINT_T wint_t -# define ACE_WCHAR_T wchar_t -# else -# define ACE_WINT_T ACE_USHORT16 -# define ACE_WCHAR_T ACE_USHORT16 -# endif /* ACE_HAS_WCHAR */ - -# if ACE_SIZEOF_INT == 4 - typedef int ACE_INT32; - typedef unsigned int ACE_UINT32; -# if defined (__KCC) && !defined (ACE_LACKS_LONGLONG_T) - typedef unsigned long long ACE_UINT64; -# endif /* __KCC */ -# elif ACE_SIZEOF_LONG == 4 - typedef long ACE_INT32; - typedef unsigned long ACE_UINT32; -# elif (ACE_SIZEOF_INT) == 8 && defined(_UNICOS) - // vector cray - hard 64-bit, all 64 bit types -# if !defined(_CRAYMPP) - typedef int ACE_INT32; - typedef unsigned int ACE_UINT32; -# endif - typedef unsigned long long ACE_UINT64; -# else -# error Have to add to the ACE_UINT32 type setting -# endif - -// The number of bytes in a void *. -# ifndef ACE_SIZEOF_VOID_P -# define ACE_SIZEOF_VOID_P ACE_SIZEOF_LONG -# endif /* ACE_SIZEOF_VOID_P */ - -// Type for doing arithmetic on pointers ... as elsewhere, we assume -// that unsigned versions of a type are the same size as the signed -// version of the same type. -#if ACE_SIZEOF_VOID_P == ACE_SIZEOF_INT -# if defined (__SUNPRO_CC) - // For unknown reasons, Sun CC 5.0 won't allow a reintepret cast - // of a 64-bit pointer to a 64-bit int. - typedef unsigned long ptr_arith_t; -# else /* ! __SUNPRO_CC */ - typedef unsigned int ptr_arith_t; -# endif /* ! __SUNPRO_CC */ -#elif ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG - typedef unsigned long ptr_arith_t; -#elif ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG - typedef unsigned long long ptr_arith_t; -#else -# error "Can't find a suitable type for doing pointer arithmetic." -#endif /* ACE_SIZEOF_VOID_P */ - -// Byte-order (endian-ness) determination. -# if defined (BYTE_ORDER) -# if (BYTE_ORDER == LITTLE_ENDIAN) -# define ACE_LITTLE_ENDIAN 0x0123 -# define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN -# elif (BYTE_ORDER == BIG_ENDIAN) -# define ACE_BIG_ENDIAN 0x3210 -# define ACE_BYTE_ORDER ACE_BIG_ENDIAN -# else -# error: unknown BYTE_ORDER! -# endif /* BYTE_ORDER */ -# elif defined (_BYTE_ORDER) -# if (_BYTE_ORDER == _LITTLE_ENDIAN) -# define ACE_LITTLE_ENDIAN 0x0123 -# define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN -# elif (_BYTE_ORDER == _BIG_ENDIAN) -# define ACE_BIG_ENDIAN 0x3210 -# define ACE_BYTE_ORDER ACE_BIG_ENDIAN -# else -# error: unknown _BYTE_ORDER! -# endif /* _BYTE_ORDER */ -# elif defined (__BYTE_ORDER) -# if (__BYTE_ORDER == __LITTLE_ENDIAN) -# define ACE_LITTLE_ENDIAN 0x0123 -# define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN -# elif (__BYTE_ORDER == __BIG_ENDIAN) -# define ACE_BIG_ENDIAN 0x3210 -# define ACE_BYTE_ORDER ACE_BIG_ENDIAN -# else -# error: unknown __BYTE_ORDER! -# endif /* __BYTE_ORDER */ -# else /* ! BYTE_ORDER && ! __BYTE_ORDER */ - // We weren't explicitly told, so we have to figure it out . . . -# if defined (i386) || defined (__i386__) || defined (_M_IX86) || \ - defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__) ||\ - defined (ARM) || defined (_M_IA64) - // We know these are little endian. -# define ACE_LITTLE_ENDIAN 0x0123 -# define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN -# else - // Otherwise, we assume big endian. -# define ACE_BIG_ENDIAN 0x3210 -# define ACE_BYTE_ORDER ACE_BIG_ENDIAN -# endif -# endif /* ! BYTE_ORDER && ! __BYTE_ORDER */ - -#if defined (ACE_LACKS_LONGLONG_T) - // This throws away the high 32 bits. It's very unlikely that a - // pointer will be more than 32 bits wide if the platform does not - // support 64-bit integers. -# define ACE_LONGLONG_TO_PTR(PTR_TYPE, L) \ - ACE_reinterpret_cast (PTR_TYPE, L.lo ()) -#else /* ! ACE_LACKS_LONGLONG_T */ -# define ACE_LONGLONG_TO_PTR(PTR_TYPE, L) \ - ACE_reinterpret_cast (PTR_TYPE, ACE_static_cast (ptr_arith_t, L)) -#endif /* ! ACE_LACKS_LONGLONG_T */ - -// If the platform lacks a long long, define one. -# if defined (ACE_LACKS_LONGLONG_T) -# if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) -// Forward declaration for streams -# include "ace/iosfwd.h" -# else /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ -// Else they will get all the stream header files -# include "ace/streams.h" -# endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ - -/** - * @class ACE_U_LongLong - * - * @brief Unsigned long long for platforms that don't have one. - * - * Provide our own unsigned long long. This is intended to be - * use with ACE_High_Res_Timer, so the division operator assumes - * that the quotient fits into a u_long. - * Please note that the constructor takes (optionally) two values. - * The high one contributes 0x100000000 times its value. So, - * for example, (0, 2) is _not_ 20000000000, but instead - * 0x200000000. To emphasize this, the default values are expressed - * in hex, and output () dumps the value in hex. - */ - class ACE_Export ACE_U_LongLong - { - public: - // = Initialization and termination methods. - ACE_U_LongLong (const ACE_UINT32 lo = 0x0, const ACE_UINT32 hi = 0x0); - ACE_U_LongLong (const ACE_U_LongLong &); - ACE_U_LongLong &operator= (const ACE_U_LongLong &); - ACE_U_LongLong &operator= (const ACE_INT32 &); - ACE_U_LongLong &operator= (const ACE_UINT32 &); - ~ACE_U_LongLong (void); - - // = Overloaded relation operators. - int operator== (const ACE_U_LongLong &) const; - int operator== (const ACE_UINT32) const; - int operator!= (const ACE_U_LongLong &) const; - int operator!= (const ACE_UINT32) const; - int operator< (const ACE_U_LongLong &) const; - int operator< (const ACE_UINT32) const; - int operator<= (const ACE_U_LongLong &) const; - int operator<= (const ACE_UINT32) const; - int operator> (const ACE_U_LongLong &) const; - int operator> (const ACE_UINT32) const; - int operator>= (const ACE_U_LongLong &) const; - int operator>= (const ACE_UINT32) const; - - ACE_U_LongLong operator+ (const ACE_U_LongLong &) const; - ACE_U_LongLong operator+ (const ACE_UINT32) const; - ACE_U_LongLong operator- (const ACE_U_LongLong &) const; - ACE_U_LongLong operator- (const ACE_UINT32) const; - ACE_U_LongLong operator* (const ACE_UINT32) const; - ACE_U_LongLong &operator*= (const ACE_UINT32); - - ACE_U_LongLong operator<< (const unsigned int) const; - ACE_U_LongLong &operator<<= (const unsigned int); - ACE_U_LongLong operator>> (const unsigned int) const; - ACE_U_LongLong &operator>>= (const unsigned int); - - double operator/ (const double) const; - - ACE_U_LongLong &operator+= (const ACE_U_LongLong &); - ACE_U_LongLong &operator+= (const ACE_UINT32); - ACE_U_LongLong &operator-= (const ACE_U_LongLong &); - ACE_U_LongLong &operator-= (const ACE_UINT32); - ACE_U_LongLong &operator++ (); - ACE_U_LongLong &operator-- (); - const ACE_U_LongLong operator++ (int); - const ACE_U_LongLong operator-- (int); - ACE_U_LongLong &operator|= (const ACE_U_LongLong); - ACE_U_LongLong &operator|= (const ACE_UINT32); - ACE_U_LongLong &operator&= (const ACE_U_LongLong); - ACE_U_LongLong &operator&= (const ACE_UINT32); - - // Note that the following take ACE_UINT32 arguments. These are - // typical use cases, and easy to implement. But, they limit the - // return values to 32 bits as well. There are no checks for - // overflow. - ACE_UINT32 operator/ (const ACE_UINT32) const; - ACE_UINT32 operator% (const ACE_UINT32) const; - - // The following only operate on the lower 32 bits (they take only - // 32 bit arguments). - ACE_UINT32 operator| (const ACE_INT32) const; - ACE_UINT32 operator& (const ACE_INT32) const; - - // The following operators convert their arguments to - // ACE_UINT32. So, there may be information loss if they are - // used. - ACE_U_LongLong operator* (const ACE_INT32) const; - ACE_U_LongLong &operator*= (const ACE_INT32); - ACE_UINT32 operator/ (const ACE_INT32) const; -# if ACE_SIZEOF_INT == 4 - ACE_UINT32 operator/ (const unsigned long) const; - ACE_UINT32 operator/ (const long) const; -# else /* ACE_SIZEOF_INT != 4 */ - ACE_UINT32 operator/ (const unsigned int) const; - ACE_UINT32 operator/ (const int) const; -# endif /* ACE_SIZEOF_INT != 4 */ - - // = Helper methods. - /// Outputs the value to the FILE, in hex. - void output (FILE * = stdout) const; - - ACE_TCHAR *as_string (ACE_TCHAR *string, - unsigned int base = 10, - unsigned int uppercase = 0) const; - - ACE_UINT32 hi (void) const; - ACE_UINT32 lo (void) const; - - void hi (const ACE_UINT32 hi); - void lo (const ACE_UINT32 lo); - - private: - union - { - struct - { -# if defined (ACE_BIG_ENDIAN) - /// High 32 bits. - ACE_UINT32 hi_; - - /// Low 32 bits. - ACE_UINT32 lo_; -# else - /// Low 32 bits. - ACE_UINT32 lo_; - - /// High 32 bits. - ACE_UINT32 hi_; -# endif /* ! ACE_BIG_ENDIAN */ - - } data_; - - /// To ensure alignment on 8-byte boundary. - /** - * @note "double" isn't usually usable with - * ACE_LACKS_FLOATING_POINT, but this seems OK. - */ - double for_alignment_; - }; - - // NOTE: the following four accessors are inlined here in - // order to minimize the extent of the data_ struct. It's - // only used here; the .i and .cpp files use the accessors. - - /// Internal utility function to hide access through struct. - const ACE_UINT32 &h_ () const { return data_.hi_; } - - /// Internal utility function to hide access through struct. - ACE_UINT32 &h_ () { return data_.hi_; } - - /// Internal utility function to hide access through struct. - const ACE_UINT32 &l_ () const { return data_.lo_; } - - /// Internal utility function to hide access through struct. - ACE_UINT32 &l_ () { return data_.lo_; } - - // NOTE: the above four accessors are inlined here in - // order to minimize the extent of the data_ struct. It's - // only used here; the .i and .cpp files use the accessors. - - /// These functions are used to implement multiplication. - ACE_UINT32 ul_shift (ACE_UINT32 a, - ACE_UINT32 c_in, - ACE_UINT32 *c_out) const; - ACE_U_LongLong ull_shift (ACE_U_LongLong a, - ACE_UINT32 c_in, - ACE_UINT32 *c_out) const; - ACE_U_LongLong ull_add (ACE_U_LongLong a, - ACE_U_LongLong b, - ACE_UINT32 *carry) const; - ACE_U_LongLong ull_mult (ACE_U_LongLong a, - ACE_UINT32 b, - ACE_UINT32 *carry) const; - }; - - typedef ACE_U_LongLong ACE_UINT64; - -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - ostream &operator<< (ostream &, const ACE_U_LongLong &); -#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - -# endif /* ACE_LACKS_LONGLONG_T */ - -// Conversions from ACE_UINT64 to ACE_UINT32. ACE_CU64_TO_CU32 should -// be used on const ACE_UINT64's. -# if defined (ACE_LACKS_LONGLONG_T) -# define ACE_U64_TO_U32(n) ((n).lo ()) -# define ACE_CU64_TO_CU32(n) ((n).lo ()) -# else /* ! ACE_LACKS_LONGLONG_T */ -# define ACE_U64_TO_U32(n) (ACE_static_cast (ACE_UINT32, (n))) -# define ACE_CU64_TO_CU32(n) \ - (ACE_static_cast (ACE_CAST_CONST ACE_UINT32, (n))) -# endif /* ! ACE_LACKS_LONGLONG_T */ - -// 64-bit literals require special marking on some platforms. -# if defined (ACE_LACKS_LONGLONG_T) - // Can only specify 32-bit arguments. -# define ACE_UINT64_LITERAL(n) (ACE_U_LongLong (n)) - // This one won't really work, but it'll keep - // some compilers happy until we have better support -# define ACE_INT64_LITERAL(n) (ACE_U_LongLong (n)) -# elif defined (ACE_WIN32) -# if defined (__IBMCPP__) && (__IBMCPP__ >= 400) -# define ACE_UINT64_LITERAL(n) n ## LL -# define ACE_INT64_LITERAL(n) n ## LL -# elif defined (__MINGW32__) -# define ACE_UINT64_LITERAL(n) n ## ull -# define ACE_INT64_LITERAL(n) n ## ll -# else -# define ACE_UINT64_LITERAL(n) n ## ui64 -# define ACE_INT64_LITERAL(n) n ## i64 -# endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ -# else /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ -# define ACE_UINT64_LITERAL(n) n ## ull -# define ACE_INT64_LITERAL(n) n ## ll -# endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ - -#if !defined (ACE_UINT64_FORMAT_SPECIFIER) -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%llu") -#endif /* ACE_UINT64_FORMAT_SPECIFIER */ - -#if !defined (ACE_INT64_FORMAT_SPECIFIER) -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lld") -#endif /* ACE_INT64_FORMAT_SPECIFIER */ - -#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER) -# if defined (ACE_WIN64) -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -# else -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%d") -# endif /* ACE_WIN64 */ -#endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ - -#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER) -# if defined (ACE_WIN64) -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") -# else -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%u") -# endif /* ACE_WIN64 */ -#endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ - -// Cast from UINT64 to a double requires an intermediate cast to INT64 -// on some platforms. -# if defined (ACE_LACKS_LONGLONG_T) - // Only use the low 32 bits. -# define ACE_UINT64_DBLCAST_ADAPTER(n) ACE_U64_TO_U32 (n) -# elif defined (ACE_WIN32) -# define ACE_UINT64_DBLCAST_ADAPTER(n) ACE_static_cast (__int64, n) -# else /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ -# define ACE_UINT64_DBLCAST_ADAPTER(n) (n) -# endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ - - -// The number of bytes in a float. -# ifndef ACE_SIZEOF_FLOAT -# if FLT_MAX_EXP == 128 -# define ACE_SIZEOF_FLOAT 4 -# elif FLT_MAX_EXP == 1024 -# define ACE_SIZEOF_FLOAT 8 -# else -# error: unsupported float size, must be updated for this platform! -# endif /* FLT_MAX_EXP */ -# endif /* ACE_SIZEOF_FLOAT */ - -// The number of bytes in a double. -# ifndef ACE_SIZEOF_DOUBLE -# if DBL_MAX_EXP == 128 -# define ACE_SIZEOF_DOUBLE 4 -# elif DBL_MAX_EXP == 1024 -# define ACE_SIZEOF_DOUBLE 8 -# else -# error: unsupported double size, must be updated for this platform! -# endif /* DBL_MAX_EXP */ -# endif /* ACE_SIZEOF_DOUBLE */ - -// The number of bytes in a long double. -# ifndef ACE_SIZEOF_LONG_DOUBLE -# if LDBL_MAX_EXP == 128 -# define ACE_SIZEOF_LONG_DOUBLE 4 -# elif LDBL_MAX_EXP == 1024 -# define ACE_SIZEOF_LONG_DOUBLE 8 -# elif LDBL_MAX_EXP == 16384 -# if defined (LDBL_DIG) && LDBL_DIG == 18 -# if defined (__ia64) -# define ACE_SIZEOF_LONG_DOUBLE 16 -# else /* ! __ia64 */ -# define ACE_SIZEOF_LONG_DOUBLE 12 -# endif /* __ia64 */ -# else /* ! LDBL_DIG || LDBL_DIG != 18 */ -# define ACE_SIZEOF_LONG_DOUBLE 16 -# endif /* ! LDBL_DIG || LDBL_DIG != 18 */ -# else -# error: unsupported double size, must be updated for this platform! -# endif /* LDBL_MAX_EXP */ -# endif /* ACE_SIZEOF_LONG_DOUBLE */ - -// Max and min sizes for the ACE integer types. -#define ACE_CHAR_MAX 0x7F -#define ACE_CHAR_MIN -(ACE_CHAR_MAX)-1 -#define ACE_OCTET_MAX 0xFF -#define ACE_INT16_MAX 0x7FFF -#define ACE_INT16_MIN -(ACE_INT16_MAX)-1 -#define ACE_UINT16_MAX 0xFFFF -#define ACE_WCHAR_MAX ACE_UINT16_MAX -#define ACE_INT32_MAX 0x7FFFFFFF -#define ACE_INT32_MIN -(ACE_INT32_MAX)-1 -#define ACE_UINT32_MAX 0xFFFFFFFF -#define ACE_INT64_MAX ACE_INT64_LITERAL(0x7FFFFFFFFFFFFFFF) -#define ACE_INT64_MIN -(ACE_INT64_MAX)-1 -#define ACE_UINT64_MAX ACE_UINT64_LITERAL(0xFFFFFFFFFFFFFFFF) -// These use ANSI/IEEE format. -#define ACE_FLT_MAX 3.402823466e+38F -#define ACE_DBL_MAX 1.7976931348623158e+308 - -#if !defined (ACE_HAS_SSIZE_T) -# if defined (ACE_WIN64) - typedef SSIZE_T ssize_t; -# else - typedef int ssize_t; -# endif /* ACE_WIN64 */ -#endif /* ACE_HAS_SSIZE_T */ - -# if defined (__ACE_INLINE__) -# include "ace/Basic_Types.i" -# endif /* __ACE_INLINE__ */ - -# include "ace/post.h" -#endif /* ACE_BASIC_TYPES_H */ diff --git a/ace/Basic_Types.i b/ace/Basic_Types.i deleted file mode 100644 index ec6c5f2d664..00000000000 --- a/ace/Basic_Types.i +++ /dev/null @@ -1,529 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#if defined (ACE_LACKS_LONGLONG_T) - -ACE_INLINE -ACE_U_LongLong::ACE_U_LongLong (const ACE_UINT32 lo, const ACE_UINT32 hi) -{ - h_ () = hi; - l_ () = lo; -} - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::hi (void) const -{ - return h_ (); -} - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::lo (void) const -{ - return l_ (); -} - -ACE_INLINE void -ACE_U_LongLong::hi (const ACE_UINT32 hi) -{ - h_ () = hi; -} - -ACE_INLINE void -ACE_U_LongLong::lo (const ACE_UINT32 lo) -{ - l_ () = lo; -} - -ACE_INLINE -ACE_U_LongLong::~ACE_U_LongLong (void) -{ -} - -ACE_INLINE int -ACE_U_LongLong::operator== (const ACE_U_LongLong &n) const -{ - return h_ () == n.h_ () && l_ () == n.l_ (); -} - -ACE_INLINE int -ACE_U_LongLong::operator== (const ACE_UINT32 n) const -{ - return h_ () == 0 && l_ () == n; -} - -ACE_INLINE int -ACE_U_LongLong::operator!= (const ACE_U_LongLong &n) const -{ - return ! (*this == n); -} - -ACE_INLINE int -ACE_U_LongLong::operator!= (const ACE_UINT32 n) const -{ - return ! (*this == n); -} - -ACE_INLINE int -ACE_U_LongLong::operator< (const ACE_U_LongLong &n) const -{ - return h_ () < n.h_ () ? 1 - : h_ () > n.h_ () ? 0 - : l_ () < n.l_ (); -} - -ACE_INLINE int -ACE_U_LongLong::operator< (const ACE_UINT32 n) const -{ - return operator< (ACE_static_cast (const ACE_U_LongLong, n)); -} - -ACE_INLINE int -ACE_U_LongLong::operator<= (const ACE_U_LongLong &n) const -{ - return h_ () < n.h_ () ? 1 - : h_ () > n.h_ () ? 0 - : l_ () <= n.l_ (); -} - -ACE_INLINE int -ACE_U_LongLong::operator<= (const ACE_UINT32 n) const -{ - return operator<= (ACE_static_cast (const ACE_U_LongLong, n)); -} - -ACE_INLINE int -ACE_U_LongLong::operator> (const ACE_U_LongLong &n) const -{ - return h_ () > n.h_ () ? 1 - : h_ () < n.h_ () ? 0 - : l_ () > n.l_ (); -} - -ACE_INLINE int -ACE_U_LongLong::operator> (const ACE_UINT32 n) const -{ - return operator> (ACE_static_cast (const ACE_U_LongLong, n)); -} - -ACE_INLINE int -ACE_U_LongLong::operator>= (const ACE_U_LongLong &n) const -{ - return h_ () > n.h_ () ? 1 - : h_ () < n.h_ () ? 0 - : l_ () >= n.l_ (); -} - -ACE_INLINE int -ACE_U_LongLong::operator>= (const ACE_UINT32 n) const -{ - return operator>= (ACE_static_cast (const ACE_U_LongLong, n)); -} - -ACE_INLINE -ACE_U_LongLong::ACE_U_LongLong (const ACE_U_LongLong &n) -{ - h_ () = n.h_ (); - l_ () = n.l_ (); -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator= (const ACE_U_LongLong &n) -{ - h_ () = n.h_ (); - l_ () = n.l_ (); - - return *this; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator= (const ACE_INT32 &rhs) -{ - if (rhs >= 0) - { - l_ () = ACE_static_cast (ACE_UINT32, rhs); - h_ () = 0; - } - else - { - // We do not handle the case where a negative 32 bit integer is - // assigned to this representation of a 64 bit unsigned integer. - // The "undefined behavior" behavior performed by this - // implementation is to simply set all bits to zero. - l_ () = 0; - h_ () = 0; - } - - return *this; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator= (const ACE_UINT32 &rhs) -{ - l_ () = rhs; - h_ () = 0; - - return *this; -} - - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::operator+ (const ACE_U_LongLong &n) const -{ - ACE_U_LongLong ret (l_ () + n.l_ (), h_ () + n.h_ ()); - if (ret.l_ () < n.l_ ()) /* carry */ ++ret.h_ (); - - return ret; -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::operator+ (const ACE_UINT32 n) const -{ - return operator+ (ACE_static_cast (const ACE_U_LongLong, n)); -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::operator- (const ACE_U_LongLong &n) const -{ - ACE_U_LongLong ret (l_ () - n.l_ (), h_ () - n.h_ ()); - if (l_ () < n.l_ ()) /* borrow */ --ret.h_ (); - - return ret; -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::operator- (const ACE_UINT32 n) const -{ - return operator- (ACE_static_cast (const ACE_U_LongLong, n)); -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::operator<< (const u_int n) const -{ - const ACE_UINT32 carry_mask = l_ () >> (32 - n); - ACE_U_LongLong ret (n < 32 ? l_ () << n : 0, - n < 32 ? (h_ () << n) | carry_mask : carry_mask); - - return ret; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator<<= (const u_int n) -{ - const ACE_UINT32 carry_mask = l_ () >> (32 - n); - h_ () = n < 32 ? (h_ () << n) | carry_mask : carry_mask; - - // g++ 2.7.2.3/Solaris 2.5.1 doesn't modify l_ () if shifted by 32. - l_ () = n < 32 ? l_ () << n : 0; - - return *this; -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::operator>> (const u_int n) const -{ - const ACE_UINT32 carry_mask = h_ () << (32 - n); - ACE_U_LongLong ret (n < 32 ? (l_ () >> n) | carry_mask : 0, - n < 32 ? h_ () >> n : 0); - - return ret; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator>>= (const u_int n) -{ - const ACE_UINT32 carry_mask = h_ () << (32 - n); - l_ () = n < 32 ? (l_ () >> n) | carry_mask : carry_mask; - h_ () = n < 32 ? h_ () >> n : 0; - - return *this; -} - -ACE_INLINE double -ACE_U_LongLong::operator/ (const double n) const -{ - // See the derivation above in operator/ (const ACE_UINT32). - - return ((double) 0xffffffffu - n + 1.0) / n * h_ () + - (double) h_ () + (double) l_ () / n; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator+= (const ACE_U_LongLong &n) -{ - h_ () += n.h_ (); - l_ () += n.l_ (); - if (l_ () < n.l_ ()) /* carry */ ++h_ (); - - return *this; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator+= (const ACE_UINT32 n) -{ - return operator+= (ACE_static_cast (const ACE_U_LongLong, n)); -} - -#define ACE_HIGHBIT (~(~0UL >> 1)) - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::ul_shift (ACE_UINT32 a, ACE_UINT32 c_in, ACE_UINT32 *c_out) const -{ - const ACE_UINT32 b = (a << 1) | c_in; - *c_out = (*c_out << 1) + ((a & ACE_HIGHBIT) > 0); - - return b; -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::ull_shift (ACE_U_LongLong a, - ACE_UINT32 c_in, - ACE_UINT32 *c_out) const -{ - ACE_U_LongLong b; - - b.l_ () = (a.l_ () << 1) | c_in; - c_in = ((a.l_ () & ACE_HIGHBIT) > 0); - b.h_ () = (a.h_ () << 1) | c_in; - *c_out = (*c_out << 1) + ((a.h_ () & ACE_HIGHBIT) > 0); - - return b; -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::ull_add (ACE_U_LongLong a, ACE_U_LongLong b, ACE_UINT32 *carry) const -{ - ACE_U_LongLong r (0, 0); - ACE_UINT32 c1, c2, c3, c4; - - c1 = a.l_ () % 2; - c2 = b.l_ () % 2; - c3 = 0; - - r.l_ () = a.l_ ()/2 + b.l_ ()/2 + (c1+c2)/2; - r.l_ () = ul_shift (r.l_ (), (c1+c2)%2, &c3); - - c1 = a.h_ () % 2; - c2 = b.h_ () % 2; - c4 = 0; - - r.h_ () = a.h_ ()/2 + b.h_ ()/2 + (c1+c2+c3)/2; - r.h_ () = ul_shift (r.h_ (), (c1+c2+c3)%2, &c4); - - *carry = c4; - - return r; -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::ull_mult (ACE_U_LongLong a, ACE_UINT32 b, ACE_UINT32 *carry) const -{ - register ACE_UINT32 mask = ACE_HIGHBIT; - const ACE_U_LongLong zero (0, 0); - ACE_U_LongLong accum (0, 0); - ACE_UINT32 c; - - *carry = 0; - if (b > 0) - do - { - accum = ull_shift (accum, 0U, carry); - if (b & mask) - accum = ull_add (accum, a, &c); - else - accum = ull_add (accum, zero, &c); - *carry += c; - mask >>= 1; - } - while (mask > 0); - - return accum; -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::operator* (const ACE_UINT32 n) const -{ - ACE_UINT32 carry; // will throw the carry away - - return ull_mult (*this, n, &carry); -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator*= (const ACE_UINT32 n) -{ - ACE_UINT32 carry; // will throw the carry away - - return *this = ull_mult (*this, n, &carry); -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator-= (const ACE_U_LongLong &n) -{ - h_ () -= n.h_ (); - if (l_ () < n.l_ ()) /* borrow */ --h_ (); - l_ () -= n.l_ (); - - return *this; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator-= (const ACE_UINT32 n) -{ - return operator-= (ACE_static_cast (const ACE_U_LongLong, n)); -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator++ () -{ - ++l_ (); - if (l_ () == 0) /* carry */ ++h_ (); - - return *this; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator-- () -{ - if (l_ () == 0) /* borrow */ --h_ (); - --l_ (); - - return *this; -} - -ACE_INLINE const ACE_U_LongLong -ACE_U_LongLong::operator++ (int) -{ - // Post-increment operator should always be implemented in terms of - // the pre-increment operator to enforce consistent semantics. - ACE_U_LongLong temp (*this); - ++*this; - return temp; -} - -ACE_INLINE const ACE_U_LongLong -ACE_U_LongLong::operator-- (int) -{ - // Post-decrement operator should always be implemented in terms of - // the pre-decrement operator to enforce consistent semantics. - ACE_U_LongLong temp (*this); - --*this; - return temp; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator|= (const ACE_U_LongLong n) -{ - l_ () |= n.l_ (); - h_ () |= n.h_ (); - - return *this; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator|= (const ACE_UINT32 n) -{ - return operator|= (ACE_static_cast (const ACE_U_LongLong, n)); -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator&= (const ACE_U_LongLong n) -{ - l_ () &= n.l_ (); - h_ () &= n.h_ (); - - return *this; -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator&= (const ACE_UINT32 n) -{ - return operator&= (ACE_static_cast (const ACE_U_LongLong, n)); -} - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::operator/ (const ACE_UINT32 n) const -{ - // This takes advantage of the fact that the return type has only 32 - // bits. Replace 0x100000000 with 0xffffffff + 1 because the former - // has 33 bits. - // Quotient = (0x100000000u * hi_ + lo_) / n - // = ((0x100000000u - n + n) * hi_ + lo_) / n - // = ((0x100000000u - n) / n * hi_ + hi_ * n / n + lo_ / n - // = (0x100000000u - n) / n * hi_ + hi_ + lo_ / n - // = (0xffffffffu - n + 1) / n * hi_ + hi_ + lo_ / n - - return (0xffffffffu - n + 1) / n * h_ () + h_ () + l_ () / n; -} - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::operator% (const ACE_UINT32 n) const -{ - // Because the argument is an ACE_UINT32, the result can never be - // bigger than 32 bits. Replace 0x100000000 with 0xffffffff + 1 - // because the former has 33 bits. - // Mod = (0x100000000u * hi_ + lo_) % n - // = (0x100000000u % n * hi_ + lo_ % n) % n - // = ((0x100000000u - n) % n * hi_ + lo_ % n) % n - // = ((0xffffffffu - n + 1) % n * hi_ + lo_ % n) % n - - return ((0xffffffff - n + 1) % n * h_ () + l_ () % n) % n; -} - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::operator| (const ACE_INT32 n) const -{ - return l_ () | n; -} - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::operator& (const ACE_INT32 n) const -{ - return l_ () & n; -} - -ACE_INLINE ACE_U_LongLong -ACE_U_LongLong::operator* (const ACE_INT32 n) const -{ - return operator* ((ACE_UINT32) n); -} - -ACE_INLINE ACE_U_LongLong & -ACE_U_LongLong::operator*= (const ACE_INT32 n) -{ - return operator*= ((ACE_UINT32) n); -} - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::operator/ (const ACE_INT32 n) const -{ - return operator/ ((ACE_UINT32) n); -} - -#if ACE_SIZEOF_INT == 4 -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::operator/ (const u_long n) const -{ - return operator/ ((ACE_UINT32) n); -} - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::operator/ (const long n) const -{ - return operator/ ((ACE_UINT32) n); -} - -#else /* ACE_SIZEOF_INT != 4 */ -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::operator/ (const u_int n) const -{ - return operator/ ((ACE_UINT32) n); -} - -ACE_INLINE ACE_UINT32 -ACE_U_LongLong::operator/ (const int n) const -{ - return operator/ ((ACE_UINT32) n); -} -#endif /* ACE_SIZEOF_INT != 4 */ - -#endif /* ACE_LACKS_LONGLONG_T */ diff --git a/ace/Bound_Ptr.h b/ace/Bound_Ptr.h deleted file mode 100644 index a5b381c69e7..00000000000 --- a/ace/Bound_Ptr.h +++ /dev/null @@ -1,338 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Bound_Ptr.h - * - * $Id$ - * - * @author Christopher Kohlhoff - */ -//============================================================================= - -#ifndef ACE_BOUND_PTR_H -#define ACE_BOUND_PTR_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Auto_Ptr.h" - -/** - * @class ACE_Bound_Ptr_Counter - * - * @brief An ACE_Bound_Ptr_Counter object encapsulates an - * object reference count. - * - * Do not use this class directly, use ACE_Strong_Bound_Ptr or - * ACE_Weak_Bound_Ptr instead. - */ -template -class ACE_Bound_Ptr_Counter -{ -public: - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - ACE_Bound_Ptr_Counter (int init_obj_ref_count = 0); - ~ACE_Bound_Ptr_Counter (void); - - /// Create a ACE_Bound_Ptr_Counter and initialize the - /// reference count to indicate ownership by a strong pointer. - static ACE_Bound_Ptr_Counter *create_strong (void); - - /// Increase both the object and counter reference counts and return - /// the new object reference count. A return value of -1 indicates - /// that the object has already been destroyed. - static int attach_strong (ACE_Bound_Ptr_Counter *counter); - - /// Decreases both the object and counter reference counts and - /// deletes whichever has no more references. Returns the new object - /// reference count. - static int detach_strong (ACE_Bound_Ptr_Counter *counter); - - /// Create a ACE_Bound_Ptr_Counter and initialize the - /// reference count to indicate no ownership. - static ACE_Bound_Ptr_Counter *create_weak (void); - - /// Increase the counter reference count and return argument. - static void attach_weak (ACE_Bound_Ptr_Counter *counter); - - /// Decreases the counter reference count and deletes the counter if - /// it has no more references. - static void detach_weak (ACE_Bound_Ptr_Counter *counter); - - /// Determine whether the object has been deleted. - static int object_was_deleted (ACE_Bound_Ptr_Counter *counter); - -private: - - /// Allocate a new ACE_Bound_Ptr_Counter instance, - /// returning NULL if it cannot be created. - static ACE_Bound_Ptr_Counter *internal_create (int init_obj_ref_count); - -private: - - /// Reference count of underlying object. Is set to -1 once the - /// object has been destroyed to indicate to all weak pointers that - /// it is no longer valid. - int obj_ref_count_; - - /// Reference count of this counter. - int self_ref_count_; - - /// Mutex variable to synchronize access to the reference counts. - ACE_LOCK lock_; -}; - -// Forward decl. -template class ACE_Weak_Bound_Ptr; - -/** - * @class ACE_Strong_Bound_Ptr - * - * @brief This class implements support for a reference counted - * pointer. - * - * Assigning or copying instances of an ACE_Strong_Bound_Ptr will - * automatically increment the reference count of the underlying object. - * When the last instance of an ACE_Strong_Bound_Ptr that references a - * particular object is destroyed or overwritten, it will invoke delete - * on its underlying pointer. - */ -template -class ACE_Strong_Bound_Ptr -{ -public: - /// Constructor that initializes an ACE_Strong_Bound_Ptr to point to the - /// object \ immediately. - ACE_EXPLICIT ACE_Strong_Bound_Ptr (X *p = 0); - - /// Constructor that initializes an ACE_Strong_Bound_Ptr by stealing - /// ownership of an object from an auto_ptr. - ACE_EXPLICIT ACE_Strong_Bound_Ptr (auto_ptr p); - - /// Copy constructor binds and to the same object. - ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr &r); - - /// Constructor binds and to the same object. - ACE_Strong_Bound_Ptr (const ACE_Weak_Bound_Ptr &r); - - /// Destructor. - ~ACE_Strong_Bound_Ptr (void); - - /// Assignment operator that binds and to the same object. - void operator = (const ACE_Strong_Bound_Ptr &r); - - /// Assignment operator that binds and to the same object. - void operator = (const ACE_Weak_Bound_Ptr &r); - - /// Equality operator that returns 1 if both ACE_Strong_Bound_Ptr - /// instances point to the same underlying object. - /** - * @note It also returns 1 if both objects have just been - * instantiated and not used yet. - */ - int operator == (const ACE_Strong_Bound_Ptr &r) const; - - /// Equality operator that returns 1 if the ACE_Strong_Bound_Ptr and - /// ACE_Weak_Bound_Ptr objects point to the same underlying object. - /** - * - * @note It also returns 1 if both objects have just been - * instantiated and not used yet. - */ - int operator == (const ACE_Weak_Bound_Ptr &r) const; - - /// Equality operator that returns 1 if the ACE_Strong_Bound_Ptr and - /// the raw pointer point to the same underlying object. - int operator == (X *p) const; - - /// Inequality operator, which is the opposite of equality. - int operator != (const ACE_Strong_Bound_Ptr &r) const; - - /// Inequality operator, which is the opposite of equality. - int operator != (const ACE_Weak_Bound_Ptr &r) const; - - /// Inequality operator, which is the opposite of equality. - int operator != (X *p) const; - - /// Redirection operator - X *operator-> (void) const; - - /// Dereference operator - X &operator * (void) const; - - /// Get the pointer value. - X *get (void) const; - - /// Resets the ACE_Strong_Bound_Ptr to refer to a different - /// underlying object. - void reset (X *p = 0); - - /// Resets the ACE_Strong_Bound_Ptr to refer to a different - /// underlying object, ownership of which is stolen from the - /// auto_ptr. - void reset (auto_ptr p); - - /// Allows us to check for NULL on all ACE_Strong_Bound_Ptr - /// objects. - int null (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - friend class ACE_Weak_Bound_Ptr; - - /// The ACE_Bound_Ptr_Counter type. - typedef ACE_Bound_Ptr_Counter COUNTER; - - /// The reference counter. - COUNTER *counter_; - - /// The underlying object. - X *ptr_; -}; - -/** - * @class ACE_Weak_Bound_Ptr - * - * @brief This class implements support for a weak pointer that complements - * ACE_Strong_Bound_Ptr. - * - * Unlike ACE_Strong_Bound_Ptr, assigning or copying instances of an - * ACE_Weak_Bound_Ptr will not automatically increment the reference - * count of the underlying object. What ACE_Weak_Bound_Ptr does is - * preserve the knowledge that the object is in fact reference - * counted, and thus provides an alternative to raw pointers where - * non-ownership associations must be maintained. When the last - * instance of an ACE_Strong_Bound_Ptr that references a particular - * object is destroyed or overwritten, the corresponding - * ACE_Weak_Bound_Ptr instances are set to NULL. - */ -template -class ACE_Weak_Bound_Ptr -{ -public: - /// Constructor that initializes an ACE_Weak_Bound_Ptr to point to - /// the object \ immediately. - ACE_EXPLICIT ACE_Weak_Bound_Ptr (X *p = 0); - - /// Copy constructor binds and to the same object. - ACE_Weak_Bound_Ptr (const ACE_Weak_Bound_Ptr &r); - - /// Constructor binds and to the same object. - ACE_Weak_Bound_Ptr (const ACE_Strong_Bound_Ptr &r); - - /// Destructor. - ~ACE_Weak_Bound_Ptr (void); - - /// Assignment operator that binds and to the same object. - void operator = (const ACE_Weak_Bound_Ptr &r); - - /// Assignment operator that binds and to the same object. - void operator = (const ACE_Strong_Bound_Ptr &r); - - /// Equality operator that returns 1 if both ACE_Weak_Bound_Ptr - /// objects point to the same underlying object. - /** - * @note It also returns 1 if both objects have just been - * instantiated and not used yet. - */ - int operator == (const ACE_Weak_Bound_Ptr &r) const; - - /// Equality operator that returns 1 if the ACE_Weak_Bound_Ptr and - /// ACE_Strong_Bound_Ptr objects point to the same underlying - /// object. - /** - * @note It also returns 1 if both objects have just been - * instantiated and not used yet. - */ - int operator == (const ACE_Strong_Bound_Ptr &r) const; - - /// Equality operator that returns 1 if the ACE_Weak_Bound_Ptr and - /// the raw pointer point to the same underlying object. - int operator == (X *p) const; - - /// Inequality operator, which is the opposite of equality. - int operator != (const ACE_Weak_Bound_Ptr &r) const; - - /// Inequality operator, which is the opposite of equality. - int operator != (const ACE_Strong_Bound_Ptr &r) const; - - /// Inequality operator, which is the opposite of equality. - int operator != (X *p) const; - - /// Redirection operator. - /** - * It returns a temporary strong pointer and makes use of the - * chaining properties of operator-> to ensure that the underlying - * object does not disappear while you are using it. If you are - * certain of the lifetimes of the object, and do not want to incur - * the locking overhead, then use the unsafe_get method instead. - */ - ACE_Strong_Bound_Ptr operator-> (void) const; - - /// Obtain a strong pointer corresponding to this weak pointer. This - /// function is useful to create a temporary strong pointer for - /// conversion to a reference. - ACE_Strong_Bound_Ptr strong (void) const; - - /// Get the pointer value. Warning: this does not affect the - /// reference count of the underlying object, so it may disappear on - /// you while you are using it if you are not careful. - X *unsafe_get (void) const; - - /// Resets the ACE_Weak_Bound_Ptr to refer to a different underlying - /// object. - void reset (X *p = 0); - - /// Increment the reference count on the underlying object. - /** - * Returns the new reference count on the object. This function may - * be used to integrate the bound pointers into an external - * reference counting mechanism such as those used by COM or CORBA - * servants. - */ - int add_ref (void); - - /// Decrement the reference count on the underlying object, which is deleted - /// if the count has reached zero. - /** - * Returns the new reference count on the object. This function may - * be used to integrate the bound pointers into an external - * reference counting mechanism such as those used by COM or CORBA - * servants. - */ - int remove_ref (void); - - /// Allows us to check for NULL on all ACE_Weak_Bound_Ptr objects. - int null (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - friend class ACE_Strong_Bound_Ptr; - - /// The ACE_Bound_Ptr_Counter type. - typedef ACE_Bound_Ptr_Counter COUNTER; - - /// The reference counter. - COUNTER *counter_; - - /// The underlying object. - X *ptr_; -}; - -#include "ace/Bound_Ptr.i" - -#include "ace/post.h" - -#endif /* ACE_BOUND_PTR_H */ diff --git a/ace/Bound_Ptr.i b/ace/Bound_Ptr.i deleted file mode 100644 index 92229126592..00000000000 --- a/ace/Bound_Ptr.i +++ /dev/null @@ -1,481 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Bound_Ptr.i - -#include "Synch_T.h" - -template inline ACE_Bound_Ptr_Counter * -ACE_Bound_Ptr_Counter::internal_create (int init_obj_ref_count) -{ - ACE_Bound_Ptr_Counter *temp = 0; - ACE_NEW_RETURN (temp, - ACE_Bound_Ptr_Counter (init_obj_ref_count), - 0); - return temp; -} - -template inline ACE_Bound_Ptr_Counter * -ACE_Bound_Ptr_Counter::create_strong (void) -{ - // Set initial object reference count to 1. - ACE_Bound_Ptr_Counter *temp = internal_create (1); -#if defined (ACE_NEW_THROWS_EXCEPTIONS) - if (temp == 0) - ACE_throw_bad_alloc; -#else - ACE_ASSERT (temp != 0); -#endif /* ACE_NEW_THROWS_EXCEPTIONS */ - return temp; -} - - - -template inline int -ACE_Bound_Ptr_Counter::attach_strong (ACE_Bound_Ptr_Counter* counter) -{ - ACE_GUARD_RETURN (ACE_LOCK, guard, counter->lock_, -1); - - // Can't attach a strong pointer to an object that has already been deleted. - if (counter->obj_ref_count_ == -1) - return -1; - - int new_obj_ref_count = ++counter->obj_ref_count_; - ++counter->self_ref_count_; - - return new_obj_ref_count; -} - -template inline int -ACE_Bound_Ptr_Counter::detach_strong (ACE_Bound_Ptr_Counter* counter) -{ - ACE_Bound_Ptr_Counter *counter_del = 0; - int new_obj_ref_count; - - { - ACE_GUARD_RETURN (ACE_LOCK, guard, counter->lock_, -1); - - if ((new_obj_ref_count = --counter->obj_ref_count_) == 0) - // Change the object reference count to -1 to indicate that the - // object has been deleted, as opposed to a weak pointer that - // simply hasn't had any strong pointers created from it yet. - counter->obj_ref_count_ = -1; - - if (--counter->self_ref_count_ == 0) - // Since counter contains the lock held by the ACE_Guard, the - // guard needs to be released before freeing the memory holding - // the lock. So save the pointer to free, then release, then - // free. - counter_del = counter; - - } // Release the lock - - delete counter_del; - - return new_obj_ref_count; -} - -template inline ACE_Bound_Ptr_Counter * -ACE_Bound_Ptr_Counter::create_weak (void) -{ - // Set initial object reference count to 0. - - ACE_Bound_Ptr_Counter *temp = internal_create (0); -#if defined (ACE_NEW_THROWS_EXCEPTIONS) - if (temp == 0) - ACE_throw_bad_alloc; -#else - ACE_ASSERT (temp != 0); -#endif /* ACE_NEW_THROWS_EXCEPTIONS */ - return temp; -} - -template inline void -ACE_Bound_Ptr_Counter::attach_weak (ACE_Bound_Ptr_Counter* counter) -{ - ACE_GUARD (ACE_LOCK, guard, counter->lock_); - - ++counter->self_ref_count_; -} - -template inline void -ACE_Bound_Ptr_Counter::detach_weak (ACE_Bound_Ptr_Counter* counter) -{ - ACE_Bound_Ptr_Counter *counter_del = 0; - - { - ACE_GUARD (ACE_LOCK, guard, counter->lock_); - - if (--counter->self_ref_count_ == 0) - // Since counter contains the lock held by the ACE_Guard, the - // guard needs to be released before freeing the memory holding - // the lock. So save the pointer to free, then release, then - // free. - counter_del = counter; - - } // Release the lock - - delete counter_del; -} - -template inline int -ACE_Bound_Ptr_Counter::object_was_deleted (ACE_Bound_Ptr_Counter *counter) -{ - ACE_GUARD_RETURN (ACE_LOCK, guard, counter->lock_, 0); - - return counter->obj_ref_count_ == -1; -} - -template inline -ACE_Bound_Ptr_Counter::ACE_Bound_Ptr_Counter (int init_obj_ref_count) - : obj_ref_count_ (init_obj_ref_count), - self_ref_count_ (1) -{ -} - -template inline -ACE_Bound_Ptr_Counter::~ACE_Bound_Ptr_Counter (void) -{ -} - -template inline -ACE_Strong_Bound_Ptr::ACE_Strong_Bound_Ptr (X *p) - : counter_ (COUNTER::create_strong ()), - ptr_ (p) -{ -} - -template inline -ACE_Strong_Bound_Ptr::ACE_Strong_Bound_Ptr (auto_ptr p) - : counter_ (COUNTER::create_strong ()), - ptr_ (p.release()) -{ -} - -template inline -ACE_Strong_Bound_Ptr::ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr &r) - : counter_ (r.counter_), - ptr_ (r.ptr_) -{ - COUNTER::attach_strong (this->counter_); -} - -template inline -ACE_Strong_Bound_Ptr::ACE_Strong_Bound_Ptr (const ACE_Weak_Bound_Ptr &r) - : counter_ (r.counter_), - ptr_ (r.ptr_) -{ - // When creating a strong pointer from a weak one we can't assume that the - // underlying object still exists. Therefore we must check for a return value - // of -1, which indicates that the object has been destroyed. - if (COUNTER::attach_strong (this->counter_) == -1) - { - // Underlying object has already been deleted, so set this pointer to null. - this->counter_ = COUNTER::create_strong (); - this->ptr_ = 0; - } -} - -template inline -ACE_Strong_Bound_Ptr::~ACE_Strong_Bound_Ptr (void) -{ - if (COUNTER::detach_strong (this->counter_) == 0) - delete this->ptr_; -} - -template inline void -ACE_Strong_Bound_Ptr::operator = (const ACE_Strong_Bound_Ptr &rhs) -{ - // This will work if &r == this, by first increasing the ref count - - COUNTER *new_counter = rhs.counter_; - X* new_ptr = rhs.ptr_; - COUNTER::attach_strong (new_counter); - if (COUNTER::detach_strong (this->counter_) == 0) - delete this->ptr_; - this->counter_ = new_counter; - this->ptr_ = new_ptr; -} - -template inline void -ACE_Strong_Bound_Ptr::operator = (const ACE_Weak_Bound_Ptr &rhs) -{ - // This will work if &r == this, by first increasing the ref count - - COUNTER *new_counter = rhs.counter_; - X* new_ptr = rhs.ptr_; - - // When creating a strong pointer from a weak one we can't assume that the - // underlying object still exists. Therefore we must check for a return value - // of -1, which indicates that the object has been destroyed. - if (COUNTER::attach_strong (new_counter) == -1) - { - // Underlying object has already been deleted, so set this pointer to null. - new_counter = COUNTER::create_strong (); - new_ptr = 0; - } - - if (COUNTER::detach_strong (this->counter_) == 0) - delete this->ptr_; - this->counter_ = new_counter; - this->ptr_ = new_ptr; -} - -template inline int -ACE_Strong_Bound_Ptr::operator== (const ACE_Strong_Bound_Ptr &r) const -{ - return this->ptr_ == r.ptr_; -} - -template inline int -ACE_Strong_Bound_Ptr::operator== (const ACE_Weak_Bound_Ptr &r) const -{ - // Use the weak pointer's operator== since it will check for null. - return r == *this; -} - -template inline int -ACE_Strong_Bound_Ptr::operator== (X *p) const -{ - return this->ptr_ == p; -} - -template inline int -ACE_Strong_Bound_Ptr::operator!= (const ACE_Strong_Bound_Ptr &r) const -{ - return this->ptr_ != r.ptr_; -} - -template inline int -ACE_Strong_Bound_Ptr::operator!= (const ACE_Weak_Bound_Ptr &r) const -{ - // Use the weak pointer's operator!= since it will check for null. - return r != *this; -} - -template inline int -ACE_Strong_Bound_Ptr::operator!= (X *p) const -{ - return this->ptr_ != p; -} - -template inline X * -ACE_Strong_Bound_Ptr::operator-> (void) const -{ - return this->ptr_; -} - -template inline X & -ACE_Strong_Bound_Ptr::operator *() const -{ - return *this->ptr_; -} - -template inline X* -ACE_Strong_Bound_Ptr::get (void) const -{ - return this->ptr_; -} - -template inline int -ACE_Strong_Bound_Ptr::null (void) const -{ - return this->ptr_ == 0; -} - -template inline void -ACE_Strong_Bound_Ptr::reset (X *p) -{ - COUNTER *old_counter = this->counter_; - X* old_ptr = this->ptr_; - this->counter_ = COUNTER::create_strong (); - this->ptr_ = p; - if (COUNTER::detach_strong (old_counter) == 0) - delete old_ptr; -} - -template inline void -ACE_Strong_Bound_Ptr::reset (auto_ptr p) -{ - COUNTER *old_counter = this->counter_; - X* old_ptr = this->ptr_; - this->counter_ = COUNTER::create_strong (); - this->ptr_ = p.release (); - if (COUNTER::detach_strong (old_counter) == 0) - delete old_ptr; -} - -template inline -ACE_Weak_Bound_Ptr::ACE_Weak_Bound_Ptr (X *p) - : counter_ (COUNTER::create_weak ()), - ptr_ (p) -{ -} - -template inline -ACE_Weak_Bound_Ptr::ACE_Weak_Bound_Ptr (const ACE_Weak_Bound_Ptr &r) - : counter_ (r.counter_), - ptr_ (r.ptr_) -{ - COUNTER::attach_weak (this->counter_); -} - -template inline -ACE_Weak_Bound_Ptr::ACE_Weak_Bound_Ptr (const ACE_Strong_Bound_Ptr &r) - : counter_ (r.counter_), - ptr_ (r.ptr_) -{ - COUNTER::attach_weak (this->counter_); -} - -template inline -ACE_Weak_Bound_Ptr::~ACE_Weak_Bound_Ptr (void) -{ - COUNTER::detach_weak (this->counter_); -} - -template inline void -ACE_Weak_Bound_Ptr::operator = (const ACE_Weak_Bound_Ptr &rhs) -{ - // This will work if &rhs == this, by first increasing the ref count - COUNTER *new_counter = rhs.counter_; - COUNTER::attach_weak (new_counter); - COUNTER::detach_weak (this->counter_); - this->counter_ = new_counter; - this->ptr_ = rhs.ptr_; -} - -template inline void -ACE_Weak_Bound_Ptr::operator = (const ACE_Strong_Bound_Ptr &rhs) -{ - // This will work if &rhs == this, by first increasing the ref count - COUNTER *new_counter = rhs.counter_; - COUNTER::attach_weak (new_counter); - COUNTER::detach_weak (this->counter_); - this->counter_ = new_counter; - this->ptr_ = rhs.ptr_; -} - -template inline int -ACE_Weak_Bound_Ptr::operator== (const ACE_Weak_Bound_Ptr &r) const -{ - // A weak pointer must behave as though it is automatically set to null - // if the underlying object has been deleted. - if (COUNTER::object_was_deleted (this->counter_)) - return r.ptr_ == 0; - - return this->ptr_ == r.ptr_; -} - -template inline int -ACE_Weak_Bound_Ptr::operator== (const ACE_Strong_Bound_Ptr &r) const -{ - // A weak pointer must behave as though it is automatically set to null - // if the underlying object has been deleted. - if (COUNTER::object_was_deleted (this->counter_)) - return r.ptr_ == 0; - - return this->ptr_ == r.ptr_; -} - -template inline int -ACE_Weak_Bound_Ptr::operator== (X *p) const -{ - // A weak pointer must behave as though it is automatically set to null - // if the underlying object has been deleted. - if (COUNTER::object_was_deleted (this->counter_)) - return p == 0; - - return this->ptr_ == p; -} - -template inline int -ACE_Weak_Bound_Ptr::operator!= (const ACE_Weak_Bound_Ptr &r) const -{ - // A weak pointer must behave as though it is automatically set to null - // if the underlying object has been deleted. - if (COUNTER::object_was_deleted (this->counter_)) - return r.ptr_ != 0; - - return this->ptr_ != r.ptr_; -} - -template inline int -ACE_Weak_Bound_Ptr::operator!= (const ACE_Strong_Bound_Ptr &r) const -{ - // A weak pointer must behave as though it is automatically set to null - // if the underlying object has been deleted. - if (COUNTER::object_was_deleted (this->counter_)) - return r.ptr_ != 0; - - return this->ptr_ != r.ptr_; -} - -template inline int -ACE_Weak_Bound_Ptr::operator!= (X *p) const -{ - // A weak pointer must behave as though it is automatically set to null - // if the underlying object has been deleted. - if (COUNTER::object_was_deleted (this->counter_)) - return p != 0; - - return this->ptr_ != p; -} - -template inline ACE_Strong_Bound_Ptr -ACE_Weak_Bound_Ptr::operator-> (void) const -{ - return ACE_Strong_Bound_Ptr (*this); -} - -template inline ACE_Strong_Bound_Ptr -ACE_Weak_Bound_Ptr::strong (void) const -{ - return ACE_Strong_Bound_Ptr (*this); -} - -template inline X* -ACE_Weak_Bound_Ptr::unsafe_get (void) const -{ - // We do not check if the object has been deleted, since this operation - // is defined to be unsafe! - return this->ptr_; -} - -template inline int -ACE_Weak_Bound_Ptr::null (void) const -{ - // A weak pointer must behave as though it is automatically set to null - // if the underlying object has been deleted. - if (COUNTER::object_was_deleted (this->counter_)) - return 1; - - return this->ptr_ == 0; -} - -template inline void -ACE_Weak_Bound_Ptr::reset (X *p) -{ - COUNTER *old_counter = this->counter_; - this->counter_ = COUNTER::create_weak (); - this->ptr_ = p; - COUNTER::detach_weak (old_counter); -} - -template inline int -ACE_Weak_Bound_Ptr::add_ref () -{ - return COUNTER::attach_strong (counter_); -} - -template inline int -ACE_Weak_Bound_Ptr::remove_ref () -{ - int new_obj_ref_count = COUNTER::detach_strong (counter_); - if (new_obj_ref_count == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - return new_obj_ref_count; -} diff --git a/ace/CDR_Base.cpp b/ace/CDR_Base.cpp deleted file mode 100644 index 51e63f821a0..00000000000 --- a/ace/CDR_Base.cpp +++ /dev/null @@ -1,591 +0,0 @@ -#include "ace/CDR_Base.h" -#include "ace/Message_Block.h" - -#if !defined (__ACE_INLINE__) -# include "ace/CDR_Base.inl" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID (ace, - CDR_Base, - "$Id$") - -// -// See comments in CDR_Base.inl about optimization cases for swap_XX_array. -// - -void -ACE_CDR::swap_2_array (const char* orig, char* target, size_t n) -{ - // ACE_ASSERT(n > 0); The caller checks that n > 0 - - // Later, we try to read in 32 or 64 bit chunks, - // so make sure we don't do that for unaligned addresses. -#if ACE_SIZEOF_LONG == 8 - const char* const o8 = ACE_ptr_align_binary (orig, 8); - while (orig < o8 && n > 0) - { - ACE_CDR::swap_2 (orig, target); - orig += 2; - target += 2; - --n; - } -#else - const char* const o4 = ACE_ptr_align_binary (orig, 4); - // this is an _if_, not a _while_. The mistmatch can only be by 2. - if (orig != o4) - { - ACE_CDR::swap_2 (orig, target); - orig += 2; - target += 2; - --n; - } -#endif - if (n == 0) - return; - - // - // Loop unrolling. Here be dragons. - // - - // (n & (~3)) is the greatest multiple of 4 not bigger than n. - // In the while loop ahead, orig will move over the array by 8 byte - // increments (4 elements of 2 bytes). - // end marks our barrier for not falling outside. - const char* const end = orig + 2 * (n & (~3)); - - // See if we're aligned for writting in 64 or 32 bit chunks... -#if ACE_SIZEOF_LONG == 8 - if (target == ACE_ptr_align_binary (target, 8)) -#else - if (target == ACE_ptr_align_binary (target, 4)) -#endif - { - while (orig < end) - { -#if defined (ACE_HAS_PENTIUM) && defined (__GNUG__) - unsigned int a = - * ACE_reinterpret_cast (const unsigned int*, orig); - unsigned int b = - * ACE_reinterpret_cast (const unsigned int*, orig + 4); - asm ( "bswap %1" : "=r" (a) : "0" (a) ); - asm ( "bswap %1" : "=r" (b) : "0" (b) ); - asm ( "rol $16, %1" : "=r" (a) : "0" (a) ); - asm ( "rol $16, %1" : "=r" (b) : "0" (b) ); - * ACE_reinterpret_cast (unsigned int*, target) = a; - * ACE_reinterpret_cast (unsigned int*, target + 4) = b; -#elif defined(ACE_HAS_PENTIUM) \ - && (defined(_MSC_VER) || defined(__BORLANDC__)) \ - && !defined(ACE_LACKS_INLINE_ASSEMBLY) - __asm mov ecx, orig; - __asm mov edx, target; - __asm mov eax, [ecx]; - __asm mov ebx, 4[ecx]; - __asm bswap eax; - __asm bswap ebx; - __asm rol eax, 16; - __asm rol ebx, 16; - __asm mov [edx], eax; - __asm mov 4[edx], ebx; -#elif ACE_SIZEOF_LONG == 8 - // 64 bit architecture. - register unsigned long a = - * ACE_reinterpret_cast (const unsigned long*, orig); - - register unsigned long a1 = (a & 0x00ff00ff00ff00ffUL) << 8; - register unsigned long a2 = (a & 0xff00ff00ff00ff00UL) >> 8; - - a = (a1 | a2); - - * ACE_reinterpret_cast (unsigned long*, target) = a; -#else - register ACE_UINT32 a = - * ACE_reinterpret_cast (const ACE_UINT32*, orig); - register ACE_UINT32 b = - * ACE_reinterpret_cast (const ACE_UINT32*, orig + 4); - - register ACE_UINT32 a1 = (a & 0x00ff00ffU) << 8; - register ACE_UINT32 b1 = (b & 0x00ff00ffU) << 8; - register ACE_UINT32 a2 = (a & 0xff00ff00U) >> 8; - register ACE_UINT32 b2 = (b & 0xff00ff00U) >> 8; - - a = (a1 | a2); - b = (b1 | b2); - - * ACE_reinterpret_cast (ACE_UINT32*, target) = a; - * ACE_reinterpret_cast (ACE_UINT32*, target + 4) = b; -#endif - orig += 8; - target += 8; - } - } - else - { - // We're out of luck. We have to write in 2 byte chunks. - while (orig < end) - { -#if defined (ACE_HAS_PENTIUM) && defined (__GNUG__) - unsigned int a = - * ACE_reinterpret_cast (const unsigned int*, orig); - unsigned int b = - * ACE_reinterpret_cast (const unsigned int*, orig + 4); - asm ( "bswap %1" : "=r" (a) : "0" (a) ); - asm ( "bswap %1" : "=r" (b) : "0" (b) ); - // We're little endian. - * ACE_reinterpret_cast (unsigned short*, target + 2) - = (unsigned short) (a & 0xffff); - * ACE_reinterpret_cast (unsigned short*, target + 6) - = (unsigned short) (b & 0xffff); - asm ( "shrl $16, %1" : "=r" (a) : "0" (a) ); - asm ( "shrl $16, %1" : "=r" (b) : "0" (b) ); - * ACE_reinterpret_cast (unsigned short*, target + 0) - = (unsigned short) (a & 0xffff); - * ACE_reinterpret_cast (unsigned short*, target + 4) - = (unsigned short) (b & 0xffff); -#elif defined (ACE_HAS_PENTIUM) \ - && (defined (_MSC_VER) || defined (__BORLANDC__)) \ - && !defined (ACE_LACKS_INLINE_ASSEMBLY) - __asm mov ecx, orig; - __asm mov edx, target; - __asm mov eax, [ecx]; - __asm mov ebx, 4[ecx]; - __asm bswap eax; - __asm bswap ebx; - // We're little endian. - __asm mov 2[edx], ax; - __asm mov 6[edx], bx; - __asm shr eax, 16; - __asm shr ebx, 16; - __asm mov 0[edx], ax; - __asm mov 4[edx], bx; -#elif ACE_SIZEOF_LONG == 8 - // 64 bit architecture. - register unsigned long a = - * ACE_reinterpret_cast (const unsigned long*, orig); - - register unsigned long a1 = (a & 0x00ff00ff00ff00ffUL) << 8; - register unsigned long a2 = (a & 0xff00ff00ff00ff00UL) >> 8; - - a = (a1 | a2); - - ACE_UINT16 b1 = ACE_static_cast (ACE_UINT16, (a >> 48)); - ACE_UINT16 b2 = ACE_static_cast (ACE_UINT16, ((a >> 32) & 0xffff)); - ACE_UINT16 b3 = ACE_static_cast (ACE_UINT16, ((a >> 16) & 0xffff)); - ACE_UINT16 b4 = ACE_static_cast (ACE_UINT16, (a & 0xffff)); - -#if defined(ACE_LITTLE_ENDIAN) - * ACE_reinterpret_cast (ACE_UINT16*, target) = b4; - * ACE_reinterpret_cast (ACE_UINT16*, target + 2) = b3; - * ACE_reinterpret_cast (ACE_UINT16*, target + 4) = b2; - * ACE_reinterpret_cast (ACE_UINT16*, target + 6) = b1; -#else - * ACE_reinterpret_cast (ACE_UINT16*, target) = b1; - * ACE_reinterpret_cast (ACE_UINT16*, target + 2) = b2; - * ACE_reinterpret_cast (ACE_UINT16*, target + 4) = b3; - * ACE_reinterpret_cast (ACE_UINT16*, target + 6) = b4; -#endif -#else - register ACE_UINT32 a = - * ACE_reinterpret_cast (const ACE_UINT32*, orig); - register ACE_UINT32 b = - * ACE_reinterpret_cast (const ACE_UINT32*, orig + 4); - - register ACE_UINT32 a1 = (a & 0x00ff00ff) << 8; - register ACE_UINT32 b1 = (b & 0x00ff00ff) << 8; - register ACE_UINT32 a2 = (a & 0xff00ff00) >> 8; - register ACE_UINT32 b2 = (b & 0xff00ff00) >> 8; - - a = (a1 | a2); - b = (b1 | b2); - - ACE_UINT32 c1 = ACE_static_cast (ACE_UINT16, (a >> 16)); - ACE_UINT32 c2 = ACE_static_cast (ACE_UINT16, (a & 0xffff)); - ACE_UINT32 c3 = ACE_static_cast (ACE_UINT16, (b >> 16)); - ACE_UINT32 c4 = ACE_static_cast (ACE_UINT16, (b & 0xffff)); - -#if defined(ACE_LITTLE_ENDIAN) - * ACE_reinterpret_cast (ACE_UINT16*, target) = c2; - * ACE_reinterpret_cast (ACE_UINT16*, target + 2) = c1; - * ACE_reinterpret_cast (ACE_UINT16*, target + 4) = c4; - * ACE_reinterpret_cast (ACE_UINT16*, target + 6) = c3; -#else - * ACE_reinterpret_cast (ACE_UINT16*, target) = c1; - * ACE_reinterpret_cast (ACE_UINT16*, target + 2) = c2; - * ACE_reinterpret_cast (ACE_UINT16*, target + 4) = c3; - * ACE_reinterpret_cast (ACE_UINT16*, target + 6) = c4; -#endif -#endif - - orig += 8; - target += 8; - } - } - - // (n & 3) == (n % 4). - switch (n&3) { - case 3: - ACE_CDR::swap_2 (orig, target); - orig += 2; - target += 2; - case 2: - ACE_CDR::swap_2 (orig, target); - orig += 2; - target += 2; - case 1: - ACE_CDR::swap_2 (orig, target); - } -} - -void -ACE_CDR::swap_4_array (const char* orig, char* target, size_t n) -{ - // ACE_ASSERT(n > 0); The caller checks that n > 0 - -#if ACE_LONG_SIZE == 8 - // Later, we read from *orig in 64 bit chunks, - // so make sure we don't generate unaligned readings. - const char* const o8 = ACE_ptr_align_binary(orig, 8); - // The mistmatch can only be by 4. - if (orig != o8) - { - ACE_CDR::swap_4 (orig, target); - orig += 4; - target += 4; - --n; - } -#endif - if (n == 0) - return; - - // - // Loop unrolling. Here be dragons. - // - - // (n & (~3)) is the greatest multiple of 4 not bigger than n. - // In the while loop, orig will move over the array by 16 byte - // increments (4 elements of 4 bytes). - // ends marks our barrier for not falling outside. - const char* const end = orig + 4*(n & (~3)); - -#if ACE_LONG_SIZE == 8 - // 64 bits architecture. - // See if we can write in 8 byte chunks. - if (target == ACE_ptr_align_binary(target, 8)) - { - while (orig < end) - { - register unsigned long a = - * ACE_reinterpret_cast (const long*, orig); - register unsigned long b = - * ACE_reinterpret_cast (const long*, orig + 8); - - register unsigned long a84 = (a & 0x000000ff000000ffL) << 24; - register unsigned long b84 = (b & 0x000000ff000000ffL) << 24; - register unsigned long a73 = (a & 0x0000ff000000ff00L) << 8; - register unsigned long b73 = (b & 0x0000ff000000ff00L) << 8; - register unsigned long a62 = (a & 0x00ff000000ff0000L) >> 8; - register unsigned long b62 = (b & 0x00ff000000ff0000L) >> 8; - register unsigned long a51 = (a & 0xff000000ff000000L) >> 24; - register unsigned long b51 = (b & 0xff000000ff000000L) >> 24; - - a = (a84 | a73 | a62 | a51); - b = (b84 | b73 | b62 | b51); - - * ACE_reinterpret_cast (long*, target) = a; - * ACE_reinterpret_cast (long*, target + 8) = b; - - orig += 16; - target += 16; - } - } - else - { - // We are out of luck, we have to write in 4 byte chunks. - while (orig < end) - { - register unsigned long a = - * ACE_reinterpret_cast (const long*, orig); - register unsigned long b = - * ACE_reinterpret_cast (const long*, orig + 8); - - register unsigned long a84 = (a & 0x000000ff000000ffL) << 24; - register unsigned long b84 = (b & 0x000000ff000000ffL) << 24; - register unsigned long a73 = (a & 0x0000ff000000ff00L) << 8; - register unsigned long b73 = (b & 0x0000ff000000ff00L) << 8; - register unsigned long a62 = (a & 0x00ff000000ff0000L) >> 8; - register unsigned long b62 = (b & 0x00ff000000ff0000L) >> 8; - register unsigned long a51 = (a & 0xff000000ff000000L) >> 24; - register unsigned long b51 = (b & 0xff000000ff000000L) >> 24; - - a = (a84 | a73 | a62 | a51); - b = (b84 | b73 | b62 | b51); - - ACE_UINT32 c1 = ACE_static_cast (ACE_UINT32, (a >> 32)); - ACE_UINT32 c2 = ACE_static_cast (ACE_UINT32, (a & 0xffffffff)); - ACE_UINT32 c3 = ACE_static_cast (ACE_UINT32, (b >> 32)); - ACE_UINT32 c4 = ACE_static_cast (ACE_UINT32, (b & 0xffffffff)); - -#if defined(ACE_LITTLE_ENDIAN) - * ACE_reinterpret_cast (ACE_UINT32*, target + 0) = c2; - * ACE_reinterpret_cast (ACE_UINT32*, target + 4) = c1; - * ACE_reinterpret_cast (ACE_UINT32*, target + 8) = c4; - * ACE_reinterpret_cast (ACE_UINT32*, target + 12) = c3; -#else - * ACE_reinterpret_cast (ACE_UINT32*, target + 0) = c1; - * ACE_reinterpret_cast (ACE_UINT32*, target + 4) = c2; - * ACE_reinterpret_cast (ACE_UINT32*, target + 8) = c3; - * ACE_reinterpret_cast (ACE_UINT32*, target + 12) = c4; -#endif - orig += 16; - target += 16; - } - } - -#else /* ACE_LONG_SIZE != 8 */ - - while (orig < end) - { -#if defined(ACE_HAS_PENTIUM) && defined(__GNUG__) - register unsigned int a = - *ACE_reinterpret_cast (const unsigned int*, orig); - register unsigned int b = - *ACE_reinterpret_cast (const unsigned int*, orig + 4); - register unsigned int c = - *ACE_reinterpret_cast (const unsigned int*, orig + 8); - register unsigned int d = - *ACE_reinterpret_cast (const unsigned int*, orig + 12); - - asm ("bswap %1" : "=r" (a) : "0" (a)); - asm ("bswap %1" : "=r" (b) : "0" (b)); - asm ("bswap %1" : "=r" (c) : "0" (c)); - asm ("bswap %1" : "=r" (d) : "0" (d)); - - *ACE_reinterpret_cast (unsigned int*, target) = a; - *ACE_reinterpret_cast (unsigned int*, target + 4) = b; - *ACE_reinterpret_cast (unsigned int*, target + 8) = c; - *ACE_reinterpret_cast (unsigned int*, target + 12) = d; -#elif defined(ACE_HAS_PENTIUM) \ - && (defined(_MSC_VER) || defined(__BORLANDC__)) \ - && !defined(ACE_LACKS_INLINE_ASSEMBLY) - __asm mov eax, orig - __asm mov esi, target - __asm mov edx, [eax] - __asm mov ecx, 4[eax] - __asm mov ebx, 8[eax] - __asm mov eax, 12[eax] - __asm bswap edx - __asm bswap ecx - __asm bswap ebx - __asm bswap eax - __asm mov [esi], edx - __asm mov 4[esi], ecx - __asm mov 8[esi], ebx - __asm mov 12[esi], eax -#else - register ACE_UINT32 a = - * ACE_reinterpret_cast (const ACE_UINT32*, orig); - register ACE_UINT32 b = - * ACE_reinterpret_cast (const ACE_UINT32*, orig + 4); - register ACE_UINT32 c = - * ACE_reinterpret_cast (const ACE_UINT32*, orig + 8); - register ACE_UINT32 d = - * ACE_reinterpret_cast (const ACE_UINT32*, orig + 12); - - // Expect the optimizer reordering this A LOT. - // We leave it this way for clarity. - a = (a << 24) | ((a & 0xff00) << 8) | ((a & 0xff0000) >> 8) | (a >> 24); - b = (b << 24) | ((b & 0xff00) << 8) | ((b & 0xff0000) >> 8) | (b >> 24); - c = (c << 24) | ((c & 0xff00) << 8) | ((c & 0xff0000) >> 8) | (c >> 24); - d = (d << 24) | ((d & 0xff00) << 8) | ((d & 0xff0000) >> 8) | (d >> 24); - - * ACE_reinterpret_cast (ACE_UINT32*, target) = a; - * ACE_reinterpret_cast (ACE_UINT32*, target + 4) = b; - * ACE_reinterpret_cast (ACE_UINT32*, target + 8) = c; - * ACE_reinterpret_cast (ACE_UINT32*, target + 12) = d; -#endif - - orig += 16; - target += 16; - } - -#endif /* ACE_LONG_SIZE == 8 */ - - // (n & 3) == (n % 4). - switch (n&3) { - case 3: - ACE_CDR::swap_4 (orig, target); - orig += 4; - target += 4; - case 2: - ACE_CDR::swap_4 (orig, target); - orig += 4; - target += 4; - case 1: - ACE_CDR::swap_4 (orig, target); - } -} - -// -// We don't benefit from unrolling in swap_8_array and swap_16_array -// (swap_8 and swap_16 are big enough). -// -void -ACE_CDR::swap_8_array (const char* orig, char* target, size_t n) -{ - // ACE_ASSERT(n > 0); The caller checks that n > 0 - - const char* const end = orig + 8*n; - while (orig < end) - { - swap_8 (orig, target); - orig += 8; - target += 8; - } -} - -void -ACE_CDR::swap_16_array (const char* orig, char* target, size_t n) -{ - // ACE_ASSERT(n > 0); The caller checks that n > 0 - - const char* const end = orig + 16*n; - while (orig < end) - { - swap_16 (orig, target); - orig += 16; - target += 16; - } -} - -void -ACE_CDR::mb_align (ACE_Message_Block *mb) -{ - char *start = ACE_ptr_align_binary (mb->base (), - ACE_CDR::MAX_ALIGNMENT); - mb->rd_ptr (start); - mb->wr_ptr (start); -} - -int -ACE_CDR::grow (ACE_Message_Block *mb, size_t minsize) -{ - size_t newsize = - ACE_CDR::first_size (minsize + ACE_CDR::MAX_ALIGNMENT); - - if (newsize <= mb->size ()) - return 0; - - ACE_Data_Block *db = - mb->data_block ()->clone_nocopy (); - - if (db->size (newsize) == -1) - return -1; - - ACE_Message_Block tmp (db); - ACE_CDR::mb_align (&tmp); - - tmp.copy (mb->rd_ptr (), mb->length()); - mb->data_block (tmp.data_block ()->duplicate ()); - mb->rd_ptr (tmp.rd_ptr ()); - mb->wr_ptr (tmp.wr_ptr ()); - - // Remove the DONT_DELETE flags from mb - mb->clr_self_flags (ACE_Message_Block::DONT_DELETE); - - return 0; -} - -size_t -ACE_CDR::total_length (const ACE_Message_Block* begin, - const ACE_Message_Block* end) -{ - size_t l = 0; - // Compute the total size. - for (const ACE_Message_Block *i = begin; - i != end; - i = i->cont ()) - l += i->length (); - return l; -} - -void -ACE_CDR::consolidate (ACE_Message_Block *dst, - const ACE_Message_Block *src) -{ - if (src == 0) - return; - - size_t newsize = - ACE_CDR::first_size (ACE_CDR::total_length (src, 0) - + ACE_CDR::MAX_ALIGNMENT); - dst->size (newsize); - - // We must copy the contents of into the new buffer, but - // respecting the alignment. - ptrdiff_t srcalign = - ptrdiff_t(src->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT; - ptrdiff_t dstalign = - ptrdiff_t(dst->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT; - int offset = srcalign - dstalign; - if (offset < 0) - offset += ACE_CDR::MAX_ALIGNMENT; - dst->rd_ptr (offset); - dst->wr_ptr (dst->rd_ptr ()); - - for (const ACE_Message_Block* i = src; - i != 0; - i = i->cont ()) - { - dst->copy (i->rd_ptr (), i->length ()); - } -} - -#if defined (NONNATIVE_LONGLONG) -int -ACE_CDR::LongLong::operator== (const ACE_CDR::LongLong &rhs) const -{ - return this->h == rhs.h && this->l == rhs.l; -} - -int -ACE_CDR::LongLong::operator!= (const ACE_CDR::LongLong &rhs) const -{ - return this->l != rhs.l || this->h != rhs.h; -} -#endif /* NONNATIVE_LONGLONG */ - -#if defined (NONNATIVE_LONGDOUBLE) -int -ACE_CDR::LongDouble::operator== (const ACE_CDR::LongDouble &rhs) const -{ - return ACE_OS::memcmp (this->ld, rhs.ld, 16) == 0; -} - -int -ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const -{ - return ACE_OS::memcmp (this->ld, rhs.ld, 16) != 0; -} -#endif /* NONNATIVE_LONGDOUBLE */ - -#if defined(_UNICOS) && !defined(_CRAYMPP) -// placeholders to get things compiling -ACE_CDR::Float::Float (void) -{ -} - -ACE_CDR::Float::Float (const float & /* init */) -{ -} - -ACE_CDR::Float & -ACE_CDR::Float::operator= (const float & /* rhs */) -{ - return *this; -} - -int -ACE_CDR::Float::operator!= (const ACE_CDR::Float & /* rhs */) const -{ - return 0; -} -#endif /* _UNICOS */ diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h deleted file mode 100644 index aa9ad50644c..00000000000 --- a/ace/CDR_Base.h +++ /dev/null @@ -1,298 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CDR_Base.h - * - * $Id$ - * - * ACE Common Data Representation (CDR) basic types. - * - * The current implementation assumes that the host has 1-byte, - * 2-byte and 4-byte integral types, and that it has single - * precision and double precision IEEE floats. - * Those assumptions are pretty good these days, with Crays being - * the only known exception. - * - * - * @author TAO version by - * @author Aniruddha Gokhale - * @author Carlos O'Ryan - * @author ACE version by - * @author Jeff Parsons - * @author Istvan Buki - */ -//============================================================================= - - -#ifndef ACE_CDR_BASE_H -#define ACE_CDR_BASE_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Basic_Types.h" -#include "ace/OS.h" - - -class ACE_Message_Block; - -/** - * @class ACE_CDR - * - * @brief Keep constants and some routines common to both Output and - * Input CDR streams. - */ -class ACE_Export ACE_CDR -{ -public: - // = Constants defined by the CDR protocol. - // By defining as many of these constants as possible as enums we - // ensure they get inlined and avoid pointless static memory - // allocations. - - enum - { - // Note that some of these get reused as part of the standard - // binary format: unsigned is the same size as its signed cousin, - // float is LONG_SIZE, and double is LONGLONG_SIZE. - - OCTET_SIZE = 1, - SHORT_SIZE = 2, - LONG_SIZE = 4, - LONGLONG_SIZE = 8, - LONGDOUBLE_SIZE = 16, - - OCTET_ALIGN = 1, - SHORT_ALIGN = 2, - LONG_ALIGN = 4, - LONGLONG_ALIGN = 8, - /// @note the CORBA LongDouble alignment requirements do not - /// match its size... - LONGDOUBLE_ALIGN = 8, - - /// Maximal CDR 1.1 alignment: "quad precision" FP (i.e. "CDR::Long - /// double", size as above). - MAX_ALIGNMENT = 8, - - /// The default buffer size. - /** - * @todo We want to add options to control this - * default value, so this constant should be read as the default - * default value ;-) - */ - DEFAULT_BUFSIZE = ACE_DEFAULT_CDR_BUFSIZE, - - /// The buffer size grows exponentially until it reaches this size; - /// afterwards it grows linearly using the next constant - EXP_GROWTH_MAX = ACE_DEFAULT_CDR_EXP_GROWTH_MAX, - - /// Once exponential growth is ruled out the buffer size increases - /// in chunks of this size, note that this constants have the same - /// value right now, but it does not need to be so. - LINEAR_GROWTH_CHUNK = ACE_DEFAULT_CDR_LINEAR_GROWTH_CHUNK - }; - - /** - * Do byte swapping for each basic IDL type size. There exist only - * routines to put byte, halfword (2 bytes), word (4 bytes), - * doubleword (8 bytes) and quadword (16 byte); because those are - * the IDL basic type sizes. - */ - static void swap_2 (const char *orig, char *target); - static void swap_4 (const char *orig, char *target); - static void swap_8 (const char *orig, char *target); - static void swap_16 (const char *orig, char *target); - static void swap_2_array (const char *orig, - char *target, - size_t length); - static void swap_4_array (const char *orig, - char *target, - size_t length); - static void swap_8_array (const char *orig, - char *target, - size_t length); - static void swap_16_array (const char *orig, - char *target, - size_t length); - - /// Align the message block to ACE_CDR::MAX_ALIGNMENT, - /// set by the CORBA spec at 8 bytes. - static void mb_align (ACE_Message_Block *mb); - - /** - * Compute the size of the smallest buffer that can contain at least - * bytes. - * To understand how a "best fit" is computed look at the - * algorithm in the code. - * Basically the buffers grow exponentially, up to a certain point, - * then the buffer size grows linearly. - * The advantage of this algorithm is that is rapidly grows to a - * large value, but does not explode at the end. - */ - static size_t first_size (size_t minsize); - - /// Compute not the smallest, but the second smallest buffer that - /// will fir bytes. - static size_t next_size (size_t minsize); - - /** - * Increase the capacity of mb to contain at least bytes. - * If is zero the size is increased by an amount at least - * large enough to contain any of the basic IDL types. Return -1 on - * failure, 0 on success. - */ - static int grow (ACE_Message_Block *mb, size_t minsize); - - /// Copy a message block chain into a single message block, - /// preserving the alignment of the first message block of the - /// original stream, not the following message blocks. - static void consolidate (ACE_Message_Block *dst, - const ACE_Message_Block *src); - - static size_t total_length (const ACE_Message_Block *begin, - const ACE_Message_Block *end); - - // Definitions of the IDL basic types, for use in the CDR - // classes. The cleanest way to avoid complaints from all compilers - // is to define them all. -# if defined (CHORUS) && defined (ghs) && !defined (__STANDARD_CXX) - // This is non-compliant, but a nasty bout with - // Green Hills C++68000 1.8.8 forces us into it. - typedef unsigned long Boolean; -# else /* ! (CHORUS && ghs 1.8.8) */ - typedef unsigned char Boolean; -# endif /* ! (CHORUS && ghs 1.8.8) */ - - typedef unsigned char Octet; - typedef char Char; - typedef ACE_OS::WChar WChar; - typedef ACE_INT16 Short; - typedef ACE_UINT16 UShort; - typedef ACE_INT32 Long; - typedef ACE_UINT32 ULong; - typedef ACE_UINT64 ULongLong; - -# if (defined (_MSC_VER) && (_MSC_VER >= 900)) \ - || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)) - typedef __int64 LongLong; -# elif ACE_SIZEOF_LONG == 8 && !defined(_CRAYMPP) - typedef long LongLong; -# elif ACE_SIZEOF_LONG_LONG == 8 && !defined (ACE_LACKS_LONGLONG_T) -# if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T) && !defined (__KCC) - // sun #defines u_longlong_t, maybe other platforms do also. - // Use it, at least with g++, so that its -pedantic doesn't - // complain about no ANSI C++ long long. - typedef longlong_t LongLong; -# else - // LynxOS 2.5.0 and Linux don't have u_longlong_t. - typedef long long LongLong; -# endif /* sun */ -# else /* no native 64 bit integer type */ -# define NONNATIVE_LONGLONG - struct ACE_Export LongLong - { -# if defined (ACE_BIG_ENDIAN) - ACE_CDR::Long h; - ACE_CDR::Long l; -# else - ACE_CDR::Long l; - ACE_CDR::Long h; -# endif /* ! ACE_BIG_ENDIAN */ - - /** - * @name Overloaded Relation Operators. - * - * The canonical comparison operators. - */ - //@{ - int operator== (const LongLong &rhs) const; - int operator!= (const LongLong &rhs) const; - //@} - }; -# endif /* no native 64 bit integer type */ - -# if defined (NONNATIVE_LONGLONG) -# define ACE_CDR_LONGLONG_INITIALIZER {0,0} -# else -# define ACE_CDR_LONGLONG_INITIALIZER 0 -# endif /* NONNATIVE_LONGLONG */ - -# if ACE_SIZEOF_FLOAT == 4 - typedef float Float; -# else /* ACE_SIZEOF_FLOAT != 4 */ - struct Float - { -# if ACE_SIZEOF_INT == 4 - // Use unsigned int to get word alignment. - unsigned int f; -# else /* ACE_SIZEOF_INT != 4 */ - // Applications will probably have trouble with this. - char f[4]; -# if defined(_UNICOS) && !defined(_CRAYMPP) - Float (void); - Float (const float &init); - Float & operator= (const float &rhs); - int operator!= (const Float &rhs) const; -# endif /* _UNICOS */ -# endif /* ACE_SIZEOF_INT != 4 */ - }; -# endif /* ACE_SIZEOF_FLOAT != 4 */ - -# if ACE_SIZEOF_DOUBLE == 8 - typedef double Double; -# else /* ACE_SIZEOF_DOUBLE != 8 */ - struct Double - { -# if ACE_SIZEOF_LONG == 8 - // Use u long to get word alignment. - unsigned long f; -# else /* ACE_SIZEOF_INT != 8 */ - // Applications will probably have trouble with this. - char f[8]; -# endif /* ACE_SIZEOF_INT != 8 */ - }; -# endif /* ACE_SIZEOF_DOUBLE != 8 */ - - // 94-9-32 Appendix A defines a 128 bit floating point "long - // double" data type, with greatly extended precision and four - // more bits of exponent (compared to "double"). This is an IDL - // extension, not yet standard. - -# if ACE_SIZEOF_LONG_DOUBLE == 16 - typedef long double LongDouble; -# define ACE_CDR_LONG_DOUBLE_INITIALIZER 0 -# else -# define NONNATIVE_LONGDOUBLE -# define ACE_CDR_LONG_DOUBLE_INITIALIZER {{0}} - struct ACE_Export LongDouble - { - char ld[16]; - int operator== (const LongDouble &rhs) const; - int operator!= (const LongDouble &rhs) const; - // @@ also need other comparison operators. - }; -# endif /* ACE_SIZEOF_LONG_DOUBLE != 16 */ - -#if !defined (ACE_CDR_GIOP_MAJOR_VERSION) -# define ACE_CDR_GIOP_MAJOR_VERSION 1 -#endif /*ACE_CDR_GIOP_MAJOR_VERSION */ - -#if !defined (ACE_CDR_GIOP_MINOR_VERSION) -# define ACE_CDR_GIOP_MINOR_VERSION 2 -#endif /* ACE_CDR_GIOP_MINOR_VERSION */ -}; - -#if defined (__ACE_INLINE__) -# include "ace/CDR_Base.inl" -#endif /* __ACE_INLINE__ */ - - -#include "ace/post.h" - -#endif /* ACE_CDR_BASE_H */ diff --git a/ace/CDR_Base.inl b/ace/CDR_Base.inl deleted file mode 100644 index 613a7a64a38..00000000000 --- a/ace/CDR_Base.inl +++ /dev/null @@ -1,196 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// -// The ACE_CDR::swap_X and ACE_CDR::swap_X_array routines are broken -// in 4 cases for optimization: -// -// * x86 Pentium CPU + gnu g++ -// (ACE_HAS_PENTIUM && __GNUG__) -// => gcc x86 inline assembly. -// -// * x86 Pentium CPU and (_MSC_VER) or BORLAND C++) -// (ACE_HAS_PENTIUM && ( _MSC_VER || __BORLANDC__ ) -// => MSC x86 inline assembly. -// -// * 64 bit architecture -// (ACE_SIZEOF_LONG == 8) -// => shift/masks using 64bit words. -// -// * default -// (none of the above) -// => shift/masks using 32bit words. -// -// -// Some things you could find useful to know if you intend to mess -// with this optimizations for swaps: -// -// * MSVC++ don't assume register values are conserved between -// statements. So you can clobber any register you want, -// whenever you want (well not *anyone* really, see manual). -// The MSVC++ optimizer will try to pick different registers -// for the C++ statements sorrounding your asm block, and if -// it's not possible will use the stack. -// -// * If you clobber registers with asm statements in gcc, you -// better do it in an asm-only function, or save/restore them -// before/after in the stack. If not, sorrounding C statements -// could end using the same registers and big-badda-bum (been -// there, done that...). The big-badda-bum could happen *even -// if you specify the clobbered register in your asm's*. -// Even better, use gcc asm syntax for detecting the register -// asigned to a certain variable so you don't have to clobber any -// register directly. -// - -ACE_INLINE void -ACE_CDR::swap_2 (const char *orig, char* target) -{ -#if defined(ACE_HAS_PENTIUM) -# if defined(__GNUG__) - unsigned short a = - *ACE_reinterpret_cast(const unsigned short*, orig); - asm( "rolw $8, %0" : "=r" (a) : "0" (a) ); - *ACE_reinterpret_cast(unsigned short*, target) = a; -# elif (defined(_MSC_VER) || defined(__BORLANDC__)) \ - && !defined(ACE_LACKS_INLINE_ASSEMBLY) - __asm mov ebx, orig; - __asm mov ecx, target; - __asm mov ax, [ebx]; - __asm rol ax, 8; - __asm mov [ecx], ax; -# else - // For CISC Platforms this is faster than shift/masks. - target[1] = orig[0]; - target[0] = orig[1]; -# endif -#else - register ACE_UINT16 usrc = * ACE_reinterpret_cast(const ACE_UINT16*, orig); - register ACE_UINT16* udst = ACE_reinterpret_cast(ACE_UINT16*, target); - *udst = (usrc << 8) | (usrc >> 8); -#endif /* ACE_HAS_PENTIUM */ -} - -ACE_INLINE void -ACE_CDR::swap_4 (const char* orig, char* target) -{ -#if defined(ACE_HAS_PENTIUM) && defined(__GNUG__) - // We have ACE_HAS_PENTIUM, so we know the sizeof's. - register unsigned int j = - *ACE_reinterpret_cast(const unsigned int*, orig); - asm ("bswap %1" : "=r" (j) : "0" (j)); - *ACE_reinterpret_cast(unsigned int*, target) = j; -#elif defined(ACE_HAS_PENTIUM) \ - && (defined(_MSC_VER) || defined(__BORLANDC__)) \ - && !defined(ACE_LACKS_INLINE_ASSEMBLY) - __asm mov ebx, orig; - __asm mov ecx, target; - __asm mov eax, [ebx]; - __asm bswap eax; - __asm mov [ecx], eax; -#else - register ACE_UINT32 x = * ACE_reinterpret_cast(const ACE_UINT32*, orig); - x = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24); - * ACE_reinterpret_cast(ACE_UINT32*, target) = x; -#endif -} - -ACE_INLINE void -ACE_CDR::swap_8 (const char* orig, char* target) -{ -#if defined(ACE_HAS_PENTIUM) && defined(__GNUG__) - register unsigned int i = - *ACE_reinterpret_cast(const unsigned int*, orig); - register unsigned int j = - *ACE_reinterpret_cast(const unsigned int*, orig + 4); - asm ("bswap %1" : "=r" (i) : "0" (i)); - asm ("bswap %1" : "=r" (j) : "0" (j)); - *ACE_reinterpret_cast(unsigned int*, target + 4) = i; - *ACE_reinterpret_cast(unsigned int*, target) = j; -#elif defined(ACE_HAS_PENTIUM) \ - && (defined(_MSC_VER) || defined(__BORLANDC__)) \ - && !defined(ACE_LACKS_INLINE_ASSEMBLY) - __asm mov ecx, orig; - __asm mov edx, target; - __asm mov eax, [ecx]; - __asm mov ebx, 4[ecx]; - __asm bswap eax; - __asm bswap ebx; - __asm mov 4[edx], eax; - __asm mov [edx], ebx; -#elif ACE_SIZEOF_LONG == 8 - // 64 bit architecture. - register unsigned long x = - * ACE_reinterpret_cast(const unsigned long*, orig); - register unsigned long x84 = (x & 0x000000ff000000ffUL) << 24; - register unsigned long x73 = (x & 0x0000ff000000ff00UL) << 8; - register unsigned long x62 = (x & 0x00ff000000ff0000UL) >> 8; - register unsigned long x51 = (x & 0xff000000ff000000UL) >> 24; - x = (x84 | x73 | x62 | x51); - x = (x << 32) | (x >> 32); - *ACE_reinterpret_cast(unsigned long*, target) = x; -#else - register ACE_UINT32 x = - * ACE_reinterpret_cast(const ACE_UINT32*, orig); - register ACE_UINT32 y = - * ACE_reinterpret_cast(const ACE_UINT32*, orig + 4); - x = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24); - y = (y << 24) | ((y & 0xff00) << 8) | ((y & 0xff0000) >> 8) | (y >> 24); - * ACE_reinterpret_cast(ACE_UINT32*, target) = y; - * ACE_reinterpret_cast(ACE_UINT32*, target + 4) = x; -#endif -} - -ACE_INLINE void -ACE_CDR::swap_16 (const char* orig, char* target) -{ - swap_8 (orig + 8, target); - swap_8 (orig, target + 8); -} - -ACE_INLINE size_t -ACE_CDR::first_size (size_t minsize) -{ - if (minsize == 0) - return ACE_CDR::DEFAULT_BUFSIZE; - - size_t newsize = ACE_CDR::DEFAULT_BUFSIZE; - while (newsize < minsize) - { - if (newsize < ACE_CDR::EXP_GROWTH_MAX) - { - // We grow exponentially at the beginning, this is fast and - // reduces the number of allocations. - newsize *= 2; - } - else - { - // but continuing with exponential growth can result in over - // allocations and easily yield an allocation failure. - // So we grow linearly when the buffer is too big. - newsize += ACE_CDR::LINEAR_GROWTH_CHUNK; - } - } - return newsize; -} - -ACE_INLINE size_t -ACE_CDR::next_size (size_t minsize) -{ - size_t newsize = - ACE_CDR::first_size (minsize); - - if (newsize == minsize) - { - // If necessary increment the size - if (newsize < ACE_CDR::EXP_GROWTH_MAX) - newsize *= 2; - else - newsize += ACE_CDR::LINEAR_GROWTH_CHUNK; - } - - return newsize; -} - -// **************************************************************** diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp deleted file mode 100644 index 226c38c2806..00000000000 --- a/ace/CDR_Stream.cpp +++ /dev/null @@ -1,1617 +0,0 @@ -#include "ace/CDR_Stream.h" -#include "ace/SString.h" - -#if !defined (__ACE_INLINE__) -# include "ace/CDR_Stream.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID (ace, - CDR_Stream, - "$Id$") - - -// **************************************************************** - -int ACE_OutputCDR::wchar_maxbytes_ = sizeof (ACE_CDR::WChar); - -ACE_OutputCDR::ACE_OutputCDR (size_t size, - int byte_order, - ACE_Allocator *buffer_allocator, - ACE_Allocator *data_block_allocator, - ACE_Allocator *message_block_allocator, - size_t memcpy_tradeoff, - ACE_CDR::Octet major_version, - ACE_CDR::Octet minor_version) - : start_ ((size ? size : (size_t) ACE_CDR::DEFAULT_BUFSIZE) + ACE_CDR::MAX_ALIGNMENT, - ACE_Message_Block::MB_DATA, - 0, - 0, - buffer_allocator, - 0, - 0, - ACE_Time_Value::zero, - ACE_Time_Value::max_time, - data_block_allocator, - message_block_allocator), - current_is_writable_ (1), - current_alignment_ (0), - do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER), - good_bit_ (1), - memcpy_tradeoff_ (memcpy_tradeoff), - major_version_ (major_version), - minor_version_ (minor_version), - char_translator_ (0), - wchar_translator_ (0) - -{ - ACE_CDR::mb_align (&this->start_); - this->current_ = &this->start_; -} - -ACE_OutputCDR::ACE_OutputCDR (char *data, size_t size, - int byte_order, - ACE_Allocator *buffer_allocator, - ACE_Allocator *data_block_allocator, - ACE_Allocator *message_block_allocator, - size_t memcpy_tradeoff, - ACE_CDR::Octet major_version, - ACE_CDR::Octet minor_version) - : start_ (size, - ACE_Message_Block::MB_DATA, - 0, - data, - buffer_allocator, - 0, - 0, - ACE_Time_Value::zero, - ACE_Time_Value::max_time, - data_block_allocator, - message_block_allocator), - current_is_writable_ (1), - current_alignment_ (0), - do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER), - good_bit_ (1), - memcpy_tradeoff_ (memcpy_tradeoff), - major_version_ (major_version), - minor_version_ (minor_version), - char_translator_ (0), - wchar_translator_ (0) -{ - // We cannot trust the buffer to be properly aligned - ACE_CDR::mb_align (&this->start_); - this->current_ = &this->start_; -} - -ACE_OutputCDR::ACE_OutputCDR (ACE_Message_Block *data, - int byte_order, - size_t memcpy_tradeoff, - ACE_CDR::Octet major_version, - ACE_CDR::Octet minor_version) - : start_ (data->data_block ()->duplicate ()), - current_is_writable_ (1), - current_alignment_ (0), - do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER), - good_bit_ (1), - memcpy_tradeoff_ (memcpy_tradeoff), - major_version_ (major_version), - minor_version_ (minor_version), - char_translator_ (0), - wchar_translator_ (0) -{ - // We cannot trust the buffer to be properly aligned - ACE_CDR::mb_align (&this->start_); - this->current_ = &this->start_; -} - -/*static*/ void -ACE_OutputCDR::wchar_maxbytes (int maxbytes) -{ - ACE_OutputCDR::wchar_maxbytes_ = maxbytes; -} - -/*static*/ int -ACE_OutputCDR::wchar_maxbytes () -{ - return ACE_OutputCDR::wchar_maxbytes_; -} - -int -ACE_OutputCDR::grow_and_adjust (size_t size, - size_t align, - char*& buf) -{ - if (!this->current_is_writable_ - || this->current_->cont () == 0 - || this->current_->cont ()->size () < size + ACE_CDR::MAX_ALIGNMENT) - { - // Calculate the new buffer's length; if growing for encode, we - // don't grow in "small" chunks because of the cost. - size_t cursize = this->current_->size (); - if (this->current_->cont () != 0) - cursize = this->current_->cont ()->size (); - - size_t minsize = size + ACE_CDR::MAX_ALIGNMENT; - // Make sure that there is enough room for bytes, but - // also make it bigger than whatever our current size is. - if (minsize < cursize) - minsize = cursize; - - size_t newsize = - ACE_CDR::next_size (minsize); - - this->good_bit_ = 0; - ACE_Message_Block* tmp; - ACE_NEW_RETURN (tmp, - ACE_Message_Block (newsize, - ACE_Message_Block::MB_DATA, - 0, - 0, - this->current_->data_block ()->allocator_strategy (), - 0, - 0, - ACE_Time_Value::zero, - ACE_Time_Value::max_time, - this->current_->data_block ()->data_block_allocator ()), - -1); - this->good_bit_ = 1; - - // The new block must start with the same alignment as the - // previous block finished. - ptrdiff_t tmpalign = - ptrdiff_t(tmp->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT; - ptrdiff_t curalign = - ptrdiff_t(this->current_alignment_) % ACE_CDR::MAX_ALIGNMENT; - int offset = curalign - tmpalign; - if (offset < 0) - offset += ACE_CDR::MAX_ALIGNMENT; - tmp->rd_ptr (offset); - tmp->wr_ptr (tmp->rd_ptr ()); - - // grow the chain and set the current block. - tmp->cont (this->current_->cont ()); - this->current_->cont (tmp); - } - this->current_ = this->current_->cont (); - this->current_is_writable_ = 1; - - return this->adjust (size, align, buf); -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_wchar (ACE_CDR::WChar x) -{ - if (this->wchar_translator_ != 0) - return (this->good_bit_ = this->wchar_translator_->write_wchar (*this, x)); - if (ACE_OutputCDR::wchar_maxbytes_ == 0) - { - errno = EACCES; - return (this->good_bit_ = 0); - } - if (ACE_static_cast (ACE_CDR::Short, major_version_) == 1 - && ACE_static_cast (ACE_CDR::Short, minor_version_) == 2) - { - ACE_CDR::Octet len = ACE_static_cast (ACE_CDR::Octet, ACE_OutputCDR::wchar_maxbytes_); - if (this->write_1 (&len)) - { - if (ACE_OutputCDR::wchar_maxbytes_ == sizeof(ACE_CDR::WChar)) - return this->write_octet_array (ACE_reinterpret_cast - (const ACE_CDR::Octet*, &x), - ACE_static_cast (ACE_CDR::ULong, len)); - else - if (ACE_OutputCDR::wchar_maxbytes_ == 2) - { - ACE_CDR::Short sx = ACE_static_cast(ACE_CDR::Short,x); - return this->write_octet_array(ACE_reinterpret_cast - (const ACE_CDR::Octet*, &sx), - ACE_static_cast (ACE_CDR::ULong, len)); - } - else - { - ACE_CDR::Octet ox = ACE_static_cast(ACE_CDR::Octet,x); - return this->write_octet_array(ACE_reinterpret_cast - (const ACE_CDR::Octet*, &ox), - ACE_static_cast (ACE_CDR::ULong, len)); - } - } - } - else if (ACE_static_cast (ACE_CDR::Short, minor_version_) == 0) - { // wchar is not allowed with GIOP 1.0. - errno = EINVAL; - return (this->good_bit_ = 0); - } - if (ACE_OutputCDR::wchar_maxbytes_ == sizeof (ACE_CDR::WChar)) - return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong *, &x)); - else if (ACE_OutputCDR::wchar_maxbytes_ == 2) - { - ACE_CDR::Short sx = ACE_static_cast(ACE_CDR::Short,x); - return this->write_2 (ACE_reinterpret_cast (const ACE_CDR::UShort *, - &sx)); - } - ACE_CDR::Octet ox = ACE_static_cast (ACE_CDR::Octet,x); - return this->write_1 (ACE_reinterpret_cast (const ACE_CDR::Octet *, &ox)); -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_string (ACE_CDR::ULong len, - const ACE_CDR::Char *x) -{ - // @@ This is a slight violation of "Optimize for the common case", - // i.e. normally the translator will be 0, but OTOH the code is - // smaller and should be better for the cache ;-) ;-) - if (this->char_translator_ != 0) - return this->char_translator_->write_string (*this, len, x); - - if (len != 0) - { - if (this->write_ulong (len + 1)) - return this->write_char_array (x, len + 1); - } - else - { - // Be nice to programmers: treat nulls as empty strings not - // errors. (OMG-IDL supports languages that don't use the C/C++ - // notion of null v. empty strings; nulls aren't part of the OMG-IDL - // string model.) - if (this->write_ulong (1)) - return this->write_char (0); - } - - return (this->good_bit_ = 0); -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_string (const ACE_CString &x) -{ - // @@ Leave this method in here, not the `.i' file so that we don't - // have to unnecessarily pull in the `ace/SString.h' header. - return this->write_string (ACE_static_cast (ACE_CDR::ULong, x.length()), - x.c_str()); -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_wstring (ACE_CDR::ULong len, - const ACE_CDR::WChar *x) -{ - // @@ This is a slight violation of "Optimize for the common case", - // i.e. normally the translator will be 0, but OTOH the code is - // smaller and should be better for the cache ;-) ;-) - // What do we do for GIOP 1.2??? - if (this->wchar_translator_ != 0) - return this->wchar_translator_->write_wstring (*this, len, x); - if (ACE_OutputCDR::wchar_maxbytes_ == 0) - { - errno = EACCES; - return (this->good_bit_ = 0); - } - - if (ACE_static_cast (ACE_CDR::Short, this->major_version_) == 1 - && ACE_static_cast (ACE_CDR::Short, this->minor_version_) == 2) - { - if (x != 0) - { - //In GIOP 1.2 the length field contains the number of bytes - //the wstring occupies rather than number of wchars - //Taking sizeof might not be a good way! This is a temporary fix. - if (this->write_ulong (ACE_OutputCDR::wchar_maxbytes_ * len)) - return this->write_wchar_array (x, len); - } - else - //In GIOP 1.2 zero length wstrings are legal - return this->write_ulong (0); - } - - else - if (x != 0) - { - if (this->write_ulong (len + 1)) - return this->write_wchar_array (x, len + 1); - } - else if (this->write_ulong (1)) - return this->write_wchar (0); - return (this->good_bit_ = 0); -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb) -{ - // If the buffer is small and it fits in the current message - // block it is be cheaper just to copy the buffer. - for (const ACE_Message_Block* i = mb; - i != 0; - i = i->cont ()) - { - size_t length = i->length (); - - // If the mb does not own its data we are forced to make a copy. - if (ACE_BIT_ENABLED (i->flags (), - ACE_Message_Block::DONT_DELETE)) - { - if (! this->write_array (i->rd_ptr (), - ACE_CDR::OCTET_SIZE, - ACE_CDR::OCTET_ALIGN, - ACE_static_cast (ACE_CDR::ULong, length))) - return (this->good_bit_ = 0); - continue; - } - - if (length < this->memcpy_tradeoff_ - && this->current_->wr_ptr () + length < this->current_->end ()) - { - if (! this->write_array (i->rd_ptr (), - ACE_CDR::OCTET_SIZE, - ACE_CDR::OCTET_ALIGN, - ACE_static_cast (ACE_CDR::ULong, length))) - return (this->good_bit_ = 0); - continue; - } - - ACE_Message_Block* cont; - this->good_bit_ = 0; - ACE_NEW_RETURN (cont, - ACE_Message_Block (i->data_block ()->duplicate ()), - 0); - this->good_bit_ = 1; - - if (cont != 0) - { - if (this->current_->cont () != 0) - ACE_Message_Block::release (this->current_->cont ()); - cont->rd_ptr (i->rd_ptr ()); - cont->wr_ptr (i->wr_ptr ()); - - this->current_->cont (cont); - this->current_ = cont; - this->current_is_writable_ = 0; - this->current_alignment_ = - (this->current_alignment_ + cont->length ()) % ACE_CDR::MAX_ALIGNMENT; - } - else - { - this->good_bit_ = 0; - return 0; - } - } - return 1; -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_1 (const ACE_CDR::Octet *x) -{ - char *buf; - if (this->adjust (1, buf) == 0) - { - *ACE_reinterpret_cast(ACE_CDR::Octet*, buf) = *x; - return 1; - } - - return 0; -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_2 (const ACE_CDR::UShort *x) -{ - char *buf; - if (this->adjust (ACE_CDR::SHORT_SIZE, buf) == 0) - { -#if !defined (ACE_ENABLE_SWAP_ON_WRITE) - *ACE_reinterpret_cast(ACE_CDR::UShort*,buf) = *x; - return 1; -#else - if (!this->do_byte_swap_) - { - *ACE_reinterpret_cast (ACE_CDR::UShort *, buf) = *x; - return 1; - } - else - { - ACE_CDR::swap_2 (ACE_reinterpret_cast (const char*, x), buf); - return 1; - } -#endif /* ACE_ENABLE_SWAP_ON_WRITE */ - } - - return 0; -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_4 (const ACE_CDR::ULong *x) -{ - char *buf; - if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0) - { -#if !defined (ACE_ENABLE_SWAP_ON_WRITE) - *ACE_reinterpret_cast(ACE_CDR::ULong*,buf) = *x; - return 1; -#else - if (!this->do_byte_swap_) - { - *ACE_reinterpret_cast (ACE_CDR::ULong *, buf) = *x; - return 1; - } - else - { - ACE_CDR::swap_4 (ACE_reinterpret_cast (const char*, x), buf); - return 1; - } -#endif /* ACE_ENABLE_SWAP_ON_WRITE */ - } - - return 0; -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x) -{ - char *buf; - - if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0) - { -#if defined (__arm__) - // Convert to Intel format (12345678 => 56781234) - const char *orig = ACE_reinterpret_cast (const char *, x); - char *target = buf; - register ACE_UINT32 x = - *ACE_reinterpret_cast (const ACE_UINT32 *, orig); - register ACE_UINT32 y = - *ACE_reinterpret_cast (const ACE_UINT32 *, orig + 4); - *ACE_reinterpret_cast (ACE_UINT32 *, target) = y; - *ACE_reinterpret_cast (ACE_UINT32 *, target + 4) = x; - return 1; -#else -# if !defined (ACE_ENABLE_SWAP_ON_WRITE) - *ACE_reinterpret_cast (ACE_CDR::ULongLong *,buf) = *x; - return 1; -# else - if (!this->do_byte_swap_) - { - *ACE_reinterpret_cast (ACE_CDR::ULongLong *, buf) = *x; - return 1; - } - else - { - ACE_CDR::swap_8 (ACE_reinterpret_cast (const char*, x), buf); - return 1; - } -# endif /* ACE_ENABLE_SWAP_ON_WRITE */ -#endif /* !__arm__ */ - } - - return 0; -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_16 (const ACE_CDR::LongDouble *x) -{ - char* buf; - if (this->adjust (ACE_CDR::LONGDOUBLE_SIZE, - ACE_CDR::LONGDOUBLE_ALIGN, - buf) == 0) - { -#if !defined (ACE_ENABLE_SWAP_ON_WRITE) - *ACE_reinterpret_cast(ACE_CDR::LongDouble*,buf) = *x; - return 1; -#else - if (!this->do_byte_swap_) - { - *ACE_reinterpret_cast (ACE_CDR::LongDouble *, buf) = *x; - return 1; - } - else - { - ACE_CDR::swap_16 (ACE_reinterpret_cast (const char*, x), buf); - return 1; - } -#endif /* ACE_ENABLE_SWAP_ON_WRITE */ - } - - return 0; -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_wchar_array_i (const ACE_CDR::WChar *x, - ACE_CDR::ULong length) -{ - if (length == 0) - return 1; - char* buf; - size_t align = (ACE_OutputCDR::wchar_maxbytes_ == 2) ? - ACE_CDR::SHORT_ALIGN : - ACE_CDR::OCTET_ALIGN; - - if (this->adjust (ACE_OutputCDR::wchar_maxbytes_ * length, align, buf) == 0) - { - if (ACE_OutputCDR::wchar_maxbytes_ == 2) - { - ACE_CDR::UShort *sb = ACE_reinterpret_cast(ACE_CDR::UShort *, buf); - for (size_t i = 0; i < length; i++) -#if !defined (ACE_ENABLE_SWAP_ON_WRITE) - sb[i] = ACE_static_cast (ACE_CDR::UShort, x[i]); -#else - if (!this->do_byte_swap_) - sb[i] = ACE_static_cast (ACE_CDR::UShort, x[i]);; - else - { - ACE_CDR::UShort sx = ACE_static_cast (ACE_CDR::UShort, x[i]); - ACE_CDR::swap_2 (ACE_reinterpret_cast(char *,&sx),&buf[i*2]); - } -#endif /* ACE_DISABLE_SWAP_ON_READ */ - } - else - { - for (size_t i = 0; i < length; i++) - buf[i] = ACE_static_cast (ACE_CDR::Octet, x[i]); - } - return this->good_bit_; - } - return 0; -} - - -ACE_CDR::Boolean -ACE_OutputCDR::write_array (const void *x, - size_t size, - size_t align, - ACE_CDR::ULong length) -{ - if (length == 0) - return 1; - char *buf; - if (this->adjust (size * length, align, buf) == 0) - { -#if !defined (ACE_ENABLE_SWAP_ON_WRITE) - ACE_OS::memcpy (buf, x, size*length); - return 1; -#else - if (!this->do_byte_swap_ || size == 1) - { - ACE_OS::memcpy (buf, x, size*length); - return 1; - } - else - { - const char *source = ACE_reinterpret_cast (const char *, x); - switch (size) - { - case 2: - ACE_CDR::swap_2_array (source, buf, length); - return 1; - case 4: - ACE_CDR::swap_4_array (source, buf, length); - return 1; - case 8: - ACE_CDR::swap_8_array (source, buf, length); - return 1; - case 16: - ACE_CDR::swap_16_array (source, buf, length); - return 1; - default: - // TODO: print something? - this->good_bit_ = 0; - return 0; - } - } -#endif /* ACE_ENABLE_SWAP_ON_WRITE */ - } - this->good_bit_ = 0; - return 0; -} - -ACE_CDR::Boolean -ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x, - ACE_CDR::ULong length) -{ - // It is hard to optimize this, the spec requires that on the wire - // booleans be represented as a byte with value 0 or 1, but in - // memoery it is possible (though very unlikely) that a boolean has - // a non-zero value (different from 1). - // We resort to a simple loop. - const ACE_CDR::Boolean* end = x + length; - - for (const ACE_CDR::Boolean* i = x; - i != end && this->good_bit (); - ++i) - this->write_boolean (*i); - - return this->good_bit (); -} - -// **************************************************************** - -ACE_InputCDR::ACE_InputCDR (const char *buf, - size_t bufsiz, - int byte_order, - ACE_CDR::Octet major_version, - ACE_CDR::Octet minor_version) - : start_ (buf, bufsiz), - do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER), - good_bit_ (1), - major_version_ (major_version), - minor_version_ (minor_version), - char_translator_ (0), - wchar_translator_ (0) -{ - this->start_.wr_ptr (bufsiz); -} - -ACE_InputCDR::ACE_InputCDR (size_t bufsiz, - int byte_order, - ACE_CDR::Octet major_version, - ACE_CDR::Octet minor_version) - : start_ (bufsiz), - do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER), - good_bit_ (1), - major_version_ (major_version), - minor_version_ (minor_version), - char_translator_ (0), - wchar_translator_ (0) -{ -} - -ACE_InputCDR::ACE_InputCDR (const ACE_Message_Block *data, - int byte_order, - ACE_CDR::Octet major_version, - ACE_CDR::Octet minor_version) - : start_ (), - good_bit_ (1), - major_version_ (major_version), - minor_version_ (minor_version), - char_translator_ (0), - wchar_translator_ (0) - -{ - this->reset (data, byte_order); -} - -ACE_InputCDR::ACE_InputCDR (ACE_Data_Block *data, - ACE_Message_Block::Message_Flags flag, - int byte_order, - ACE_CDR::Octet major_version, - ACE_CDR::Octet minor_version) - : start_ (data, flag), - do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER), - good_bit_ (1), - major_version_ (major_version), - minor_version_ (minor_version), - char_translator_ (0), - wchar_translator_ (0) - -{ -} - -ACE_InputCDR::ACE_InputCDR (ACE_Data_Block *data, - ACE_Message_Block::Message_Flags flag, - size_t rd_pos, - size_t wr_pos, - int byte_order, - ACE_CDR::Octet major_version, - ACE_CDR::Octet minor_version) - : start_ (data, flag), - do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER), - good_bit_ (1), - major_version_ (major_version), - minor_version_ (minor_version), - char_translator_ (0), - wchar_translator_ (0) - -{ - // Set the read pointer - this->start_.rd_ptr (rd_pos); - - // Set the write pointer after doing a sanity check. - char* wrpos = this->start_.base () + wr_pos; - - if (this->start_.end () >= wrpos) - { - this->start_.wr_ptr (wr_pos); - } -} - - -ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs, - size_t size, - ACE_CDR::Long offset) - : start_ (rhs.start_, - ACE_CDR::MAX_ALIGNMENT), - do_byte_swap_ (rhs.do_byte_swap_), - good_bit_ (1), - major_version_ (rhs.major_version_), - minor_version_ (rhs.minor_version_), - char_translator_ (rhs.char_translator_), - wchar_translator_ (rhs.wchar_translator_) - -{ - // Align the base pointer assuming that the incoming stream is also - // aligned the way we are aligned - char *incoming_start = ACE_ptr_align_binary (rhs.start_.base (), - ACE_CDR::MAX_ALIGNMENT); - - size_t newpos = - (rhs.start_.rd_ptr() - incoming_start) + offset; - - if (newpos <= this->start_.space () - && newpos + size <= this->start_.space ()) - { - this->start_.rd_ptr (newpos); - this->start_.wr_ptr (newpos + size); - } - else - this->good_bit_ = 0; -} - -ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs, - size_t size) - : start_ (rhs.start_, - ACE_CDR::MAX_ALIGNMENT), - do_byte_swap_ (rhs.do_byte_swap_), - good_bit_ (1), - major_version_ (rhs.major_version_), - minor_version_ (rhs.minor_version_), - char_translator_ (rhs.char_translator_), - wchar_translator_ (rhs.wchar_translator_) - -{ - // Align the base pointer assuming that the incoming stream is also - // aligned the way we are aligned - char *incoming_start = ACE_ptr_align_binary (rhs.start_.base (), - ACE_CDR::MAX_ALIGNMENT); - - size_t newpos = - rhs.start_.rd_ptr() - incoming_start; - - if (newpos <= this->start_.space () - && newpos + size <= this->start_.space ()) - { - // Notice that ACE_Message_Block::duplicate may leave the - // wr_ptr() with a higher value that what we actually want. - this->start_.rd_ptr (newpos); - this->start_.wr_ptr (newpos + size); - - ACE_CDR::Octet byte_order; - this->read_octet (byte_order); - this->do_byte_swap_ = (byte_order != ACE_CDR_BYTE_ORDER); - } - else - this->good_bit_ = 0; -} - -ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs) - : start_ (rhs.start_, - ACE_CDR::MAX_ALIGNMENT), - do_byte_swap_ (rhs.do_byte_swap_), - good_bit_ (1), - major_version_ (rhs.major_version_), - minor_version_ (rhs.minor_version_), - char_translator_ (rhs.char_translator_), - wchar_translator_ (rhs.wchar_translator_) -{ - char *buf = ACE_ptr_align_binary (rhs.start_.base (), - ACE_CDR::MAX_ALIGNMENT); - - size_t rd_offset = rhs.start_.rd_ptr () - buf; - size_t wr_offset = rhs.start_.wr_ptr () - buf; - this->start_.rd_ptr (rd_offset); - this->start_.wr_ptr (wr_offset); -} - -ACE_InputCDR::ACE_InputCDR (ACE_InputCDR::Transfer_Contents x) - : start_ (x.rhs_.start_.data_block ()), - do_byte_swap_ (x.rhs_.do_byte_swap_), - good_bit_ (1), - major_version_ (x.rhs_.major_version_), - minor_version_ (x.rhs_.minor_version_), - char_translator_ (x.rhs_.char_translator_), - wchar_translator_ (x.rhs_.wchar_translator_) -{ - - this->start_.rd_ptr (x.rhs_.start_.rd_ptr ()); - this->start_.wr_ptr (x.rhs_.start_.wr_ptr ()); - - ACE_Data_Block* db = this->start_.data_block ()->clone_nocopy (); - (void) x.rhs_.start_.replace_data_block (db); -} - -ACE_InputCDR& -ACE_InputCDR::operator= (const ACE_InputCDR& rhs) -{ - if (this != &rhs) - { - this->start_.data_block (rhs.start_.data_block ()->duplicate ()); - this->start_.rd_ptr (rhs.start_.rd_ptr ()); - this->start_.wr_ptr (rhs.start_.wr_ptr ()); - this->do_byte_swap_ = rhs.do_byte_swap_; - this->good_bit_ = 1; - this->char_translator_ = rhs.char_translator_; - this->major_version_ = rhs.major_version_; - this->minor_version_ = rhs.minor_version_; - } - return *this; -} - -ACE_InputCDR::ACE_InputCDR (const ACE_OutputCDR& rhs, - ACE_Allocator* buffer_allocator, - ACE_Allocator* data_block_allocator, - ACE_Allocator* message_block_allocator) - : start_ (rhs.total_length () + ACE_CDR::MAX_ALIGNMENT, - ACE_Message_Block::MB_DATA, - 0, - 0, - buffer_allocator, - 0, - 0, - ACE_Time_Value::zero, - ACE_Time_Value::max_time, - data_block_allocator, - message_block_allocator), - do_byte_swap_ (rhs.do_byte_swap_), - good_bit_ (1), - major_version_ (rhs.major_version_), - minor_version_ (rhs.minor_version_), - char_translator_ (rhs.char_translator_), - wchar_translator_ (rhs.wchar_translator_) -{ - ACE_CDR::mb_align (&this->start_); - for (const ACE_Message_Block *i = rhs.begin (); - i != rhs.end (); - i = i->cont ()) - this->start_.copy (i->rd_ptr (), i->length ()); -} - -ACE_CDR::Boolean -ACE_InputCDR::skip_wchar (void) -{ - if (ACE_static_cast (ACE_CDR::Short, major_version_) == 1 - && ACE_static_cast (ACE_CDR::Short, minor_version_) == 2) - { - ACE_CDR::Octet len; - if (this->read_1 (&len)) - return this->skip_bytes (ACE_static_cast (size_t, len)); - } - else - { - ACE_CDR::WChar x; - if (sizeof (ACE_CDR::WChar) == 2) - return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort *,&x)); - else - return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong *,&x)); - } - - return (this->good_bit_ = 0); -} - -ACE_CDR::Boolean -ACE_InputCDR::read_wchar (ACE_CDR::WChar& x) -{ - if (this->wchar_translator_ != 0) - { - this->good_bit_ = this->wchar_translator_->read_wchar (*this,x); - return this->good_bit_; - } - if (ACE_OutputCDR::wchar_maxbytes_ == 0) - { - errno = EACCES; - return (this->good_bit_ = 0); - } - - if (ACE_OutputCDR::wchar_maxbytes_ == sizeof (ACE_CDR::WChar)) - { - if (ACE_static_cast (ACE_CDR::Short, major_version_) == 1 - && ACE_static_cast (ACE_CDR::Short, minor_version_) == 2) - { - ACE_CDR::Octet len; - - if (this->read_1 (&len)) - return this->read_octet_array - (ACE_reinterpret_cast (ACE_CDR::Octet*, &x), - ACE_static_cast (ACE_CDR::ULong, len)); - else - return (this->good_bit_ = 0); - } - - if (sizeof (ACE_CDR::WChar) == 2) - return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort *, &x)); - else - return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong *, &x)); - } - - if (ACE_static_cast (ACE_CDR::Short, major_version_) == 1 - && ACE_static_cast (ACE_CDR::Short, minor_version_) == 2) - { - ACE_CDR::Octet len; - - if (this->read_1 (&len)) - { - if (len == 2) - { - ACE_CDR::Short sx; - if (this->read_octet_array - (ACE_reinterpret_cast (ACE_CDR::Octet*, &sx), - ACE_static_cast (ACE_CDR::ULong, len))) - { - x = ACE_static_cast(ACE_CDR::WChar, sx); - return 1; - } - } - else - { - ACE_CDR::Octet ox; - if (this->read_octet_array - (ACE_reinterpret_cast (ACE_CDR::Octet*, &ox), - ACE_static_cast (ACE_CDR::ULong, len))) - { - x = ACE_static_cast(ACE_CDR::WChar, ox); - return 1; - } - } - } - } - else - { - if (ACE_OutputCDR::wchar_maxbytes_ == 2) - { - ACE_CDR::UShort sx; - if (this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort *, &sx))) - { - x = ACE_static_cast(ACE_CDR::WChar, sx); - return 1; - } - } - else - { - ACE_CDR::Octet ox; - if (this->read_1 (&ox)) - { - x = ACE_static_cast(ACE_CDR::WChar, ox); - return 1; - } - - } - } - return (this->good_bit_ = 0); -} - -ACE_CDR::Boolean -ACE_InputCDR::read_string (ACE_CDR::Char *&x) -{ - // @@ This is a slight violation of "Optimize for the common case", - // i.e. normally the translator will be 0, but OTOH the code is - // smaller and should be better for the cache ;-) ;-) - if (this->char_translator_ != 0) - { - this->good_bit_ = this->char_translator_->read_string (*this, x); - return this->good_bit_; - } - - ACE_CDR::ULong len; - - this->read_ulong (len); - // A check for the length being too great is done later in the - // call to read_char_array but we want to have it done before - // the memory is allocated. - if (len > 0 && len <= this->length()) - { - ACE_NEW_RETURN (x, - ACE_CDR::Char[len], - 0); - if (this->read_char_array (x, len)) - return 1; - - delete [] x; - } - else if (len == 0) - { - // Convert any null strings to empty strings since empty - // strings can cause crashes. (See bug 58.) - ACE_NEW_RETURN (x, - ACE_CDR::Char[1], - 0); - ACE_OS::strcpy (ACE_const_cast (char *&, x), ""); - return 1; - } - - x = 0; - return (this->good_bit_ = 0); -} - -ACE_CDR::Boolean -ACE_InputCDR::read_string (ACE_CString &x) -{ - ACE_CDR::Char *data; - if (this->read_string (data)) - { - x = data; - delete [] data; - return 1; - } - - x = ""; - return (this->good_bit_ = 0); -} - -ACE_CDR::Boolean -ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) -{ - // @@ This is a slight violation of "Optimize for the common case", - // i.e. normally the translator will be 0, but OTOH the code is - // smaller and should be better for the cache ;-) ;-) - if (this->wchar_translator_ != 0) - { - this->good_bit_ = this->wchar_translator_->read_wstring (*this, x); - return this->good_bit_; - } - if (ACE_OutputCDR::wchar_maxbytes_ == 0) - { - errno = EACCES; - return (this->good_bit_ = 0); - } - - ACE_CDR::ULong len; - if (!this->read_ulong (len)) - return 0; - - // A check for the length being too great is done later in the - // call to read_char_array but we want to have it done before - // the memory is allocated. - if (len > 0 && len <= this->length()) - { - - if (ACE_static_cast (ACE_CDR::Short, this->major_version_) == 1 - && ACE_static_cast (ACE_CDR::Short, this->minor_version_) == 2) - { - len /= ACE_OutputCDR::wchar_maxbytes_; - - //allocating one extra for the null character needed by applications - ACE_NEW_RETURN (x, - ACE_CDR::WChar [len + 1], - 0); - - if (this->read_wchar_array (x, len)) - { - - //Null character used by applications to find the end of - //the wstring - //Is this okay with the GIOP 1.2 spec?? - x[len] = '\x00'; - - return 1; - } - } - else - { - ACE_NEW_RETURN (x, - ACE_CDR::WChar [len], - 0); - - if (this->read_wchar_array (x, len)) - return 1; - } - - delete [] x; - } - else if (len == 0) - { - // Convert any null strings to empty strings since empty - // strings can cause crashes. (See bug 58.) - ACE_NEW_RETURN (x, - ACE_CDR::WChar[1], - 0); - x[0] = '\x00'; - return 1; - } - - this->good_bit_ = 0; - x = 0; - return 0; -} - -ACE_CDR::Boolean -ACE_InputCDR::read_array (void* x, - size_t size, - size_t align, - ACE_CDR::ULong length) -{ - if (length == 0) - return 1; - char* buf; - - if (this->adjust (size * length, align, buf) == 0) - { -#if defined (ACE_DISABLE_SWAP_ON_READ) - ACE_OS::memcpy (x, buf, size*length); -#else - if (!this->do_byte_swap_ || size == 1) - ACE_OS::memcpy (x, buf, size*length); - else - { - char *target = ACE_reinterpret_cast (char*, x); - switch (size) - { - case 2: - ACE_CDR::swap_2_array (buf, target, length); - break; - case 4: - ACE_CDR::swap_4_array (buf, target, length); - break; - case 8: - ACE_CDR::swap_8_array (buf, target, length); - break; - case 16: - ACE_CDR::swap_16_array (buf, target, length); - break; - default: - // TODO: print something? - this->good_bit_ = 0; - return 0; - } - } -#endif /* ACE_DISABLE_SWAP_ON_READ */ - return this->good_bit_; - } - return 0; -} - -ACE_CDR::Boolean -ACE_InputCDR::read_wchar_array_i (ACE_CDR::WChar* x, - ACE_CDR::ULong length) -{ - if (length == 0) - return 1; - char* buf; - size_t align = (ACE_OutputCDR::wchar_maxbytes_ == 2) ? - ACE_CDR::SHORT_ALIGN : - ACE_CDR::OCTET_ALIGN; - - if (this->adjust (ACE_OutputCDR::wchar_maxbytes_ * length, align, buf) == 0) - { - if (ACE_OutputCDR::wchar_maxbytes_ == 2) - { - ACE_CDR::UShort *sb = ACE_reinterpret_cast(ACE_CDR::UShort *, buf); - for (size_t i = 0; i < length; i++) -#if defined (ACE_DISABLE_SWAP_ON_READ) - x[i] = ACE_static_cast (ACE_CDR::WChar, sb[i]); -#else - if (!this->do_byte_swap_) - x[i] = ACE_static_cast (ACE_CDR::WChar, sb[i]); - else - { - ACE_CDR::UShort sx; - ACE_CDR::swap_2 (&buf[i*2], ACE_reinterpret_cast(char *,&sx)); - x[i] = ACE_static_cast (ACE_CDR::WChar,sx); - } -#endif /* ACE_DISABLE_SWAP_ON_READ */ - } - else - { - for (size_t i = 0; i < length; i++) - x[i] = ACE_static_cast (ACE_CDR::Octet, buf[i]); - } - return this->good_bit_; - } - return 0; -} - - -ACE_CDR::Boolean -ACE_InputCDR::read_boolean_array (ACE_CDR::Boolean *x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - // It is hard to optimize this, the spec requires that on the wire - // booleans be represented as a byte with value 0 or 1, but in - // memoery it is possible (though very unlikely) that a boolean has - // a non-zero value (different from 1). - // We resort to a simple loop. - for (ACE_CDR::ULong i = 0; i != length && this->good_bit_; ++i) - this->read_boolean (x[i]); - - return this->good_bit_; -} - -ACE_CDR::Boolean -ACE_InputCDR::read_1 (ACE_CDR::Octet *x) -{ - if (this->rd_ptr () < this->wr_ptr ()) - { - *x = *ACE_reinterpret_cast (ACE_CDR::Octet*,this->rd_ptr ()); - this->start_.rd_ptr (1); - return 1; - } - - this->good_bit_ = 0; - return 0; -} - -ACE_CDR::Boolean -ACE_InputCDR::read_2 (ACE_CDR::UShort *x) -{ - char *buf; - if (this->adjust (ACE_CDR::SHORT_SIZE, buf) == 0) - { -#if !defined (ACE_DISABLE_SWAP_ON_READ) - if (!this->do_byte_swap_) - *x = *ACE_reinterpret_cast (ACE_CDR::UShort*, buf); - else - ACE_CDR::swap_2 (buf, ACE_reinterpret_cast (char*, x)); -#else - *x = *ACE_reinterpret_cast(ACE_CDR::UShort*,buf); -#endif /* ACE_DISABLE_SWAP_ON_READ */ - return 1; - } - this->good_bit_ = 0; - return 0; -} - -ACE_CDR::Boolean -ACE_InputCDR::read_4 (ACE_CDR::ULong *x) -{ - char *buf; - if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0) - { -#if !defined (ACE_DISABLE_SWAP_ON_READ) - if (!this->do_byte_swap_) - *x = *ACE_reinterpret_cast (ACE_CDR::ULong*, buf); - else - ACE_CDR::swap_4 (buf, ACE_reinterpret_cast (char*, x)); -#else - *x = *ACE_reinterpret_cast(ACE_CDR::ULong*,buf); -#endif /* ACE_DISABLE_SWAP_ON_READ */ - return 1; - } - this->good_bit_ = 0; - return 0; -} - -ACE_CDR::Boolean -ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x) -{ - char *buf; - - if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0) - { -#if !defined (ACE_DISABLE_SWAP_ON_READ) -# if defined (__arm__) - if (!this->do_byte_swap_) - { - // Convert from Intel format (12345678 => 56781234) - const char *orig = buf; - char *target = ACE_reinterpret_cast (char *, x); - register ACE_UINT32 x = - *ACE_reinterpret_cast (const ACE_UINT32 *, orig); - register ACE_UINT32 y = - *ACE_reinterpret_cast (const ACE_UINT32 *, orig + 4); - *ACE_reinterpret_cast (ACE_UINT32 *, target) = y; - *ACE_reinterpret_cast (ACE_UINT32 *, target + 4) = x; - } - else - { - // Convert from Sparc format (12345678 => 43218765) - const char *orig = buf; - char *target = ACE_reinterpret_cast (char *, x); - register ACE_UINT32 x = - *ACE_reinterpret_cast (const ACE_UINT32 *, orig); - register ACE_UINT32 y = - *ACE_reinterpret_cast (const ACE_UINT32 *, orig + 4); - x = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24); - y = (y << 24) | ((y & 0xff00) << 8) | ((y & 0xff0000) >> 8) | (y >> 24); - *ACE_reinterpret_cast (ACE_UINT32 *, target) = x; - *ACE_reinterpret_cast (ACE_UINT32 *, target + 4) = y; - } -# else - if (!this->do_byte_swap_) - *x = *ACE_reinterpret_cast (ACE_CDR::ULongLong *, buf); - else - ACE_CDR::swap_8 (buf, ACE_reinterpret_cast (char *, x)); -# endif /* !__arm__ */ -#else - *x = *ACE_reinterpret_cast (ACE_CDR::ULongLong *, buf); -#endif /* ACE_DISABLE_SWAP_ON_READ */ - return 1; - } - - this->good_bit_ = 0; - return 0; -} - -ACE_CDR::Boolean -ACE_InputCDR::read_16 (ACE_CDR::LongDouble *x) -{ - char *buf; - if (this->adjust (ACE_CDR::LONGLONG_SIZE, - ACE_CDR::LONGLONG_ALIGN, - buf) == 0) - { -#if !defined (ACE_DISABLE_SWAP_ON_READ) - if (!this->do_byte_swap_) - *x = *ACE_reinterpret_cast (ACE_CDR::LongDouble *, buf); - else - ACE_CDR::swap_16 (buf, ACE_reinterpret_cast (char*, x)); -#else - *x = *ACE_reinterpret_cast(ACE_CDR::LongDouble*,buf); -#endif /* ACE_DISABLE_SWAP_ON_READ */ - return 1; - } - - this->good_bit_ = 0; - return 0; -} - -ACE_CDR::Boolean -ACE_InputCDR::skip_string (void) -{ - ACE_CDR::ULong len; - if (this->read_ulong (len)) - { - if (this->rd_ptr () + len <= this->wr_ptr ()) - { - this->rd_ptr (len); - return 1; - } - this->good_bit_ = 0; - } - return 0; -} - -ACE_CDR::Boolean -ACE_InputCDR::skip_wstring (void) -{ - ACE_CDR::Boolean continue_skipping = 1; - ACE_CDR::ULong len; - - continue_skipping = read_ulong (len); - - if (continue_skipping != 0 && len != 0) - { - if (ACE_static_cast (ACE_CDR::Short, this->major_version_) == 1 - && ACE_static_cast (ACE_CDR::Short, this->minor_version_) == 2) - continue_skipping = this->skip_bytes ((size_t)len); - else - while (continue_skipping != 0 && len--) - continue_skipping = this->skip_wchar (); - } - return continue_skipping; -} - -ACE_CDR::Boolean -ACE_InputCDR::skip_bytes (size_t len) -{ - if (this->rd_ptr () + len <= this->wr_ptr ()) - { - this->rd_ptr (len); - return 1; - } - this->good_bit_ = 0; - return 0; -} - -int -ACE_InputCDR::grow (size_t newsize) -{ - if (ACE_CDR::grow (&this->start_, newsize) == -1) - return -1; - - ACE_CDR::mb_align (&this->start_); - this->start_.wr_ptr (newsize); - return 0; -} - -void -ACE_InputCDR::reset (const ACE_Message_Block* data, - int byte_order) -{ - this->reset_byte_order (byte_order); - ACE_CDR::consolidate (&this->start_, data); -} - -void -ACE_InputCDR::steal_from (ACE_InputCDR &cdr) -{ - this->do_byte_swap_ = cdr.do_byte_swap_; - this->start_.data_block (cdr.start_.data_block ()->duplicate ()); - - // If the message block had a DONT_DELETE flags, just clear it off.. - this->start_.clr_self_flags (ACE_Message_Block::DONT_DELETE); - this->start_.rd_ptr (cdr.start_.rd_ptr ()); - - this->start_.wr_ptr (cdr.start_.wr_ptr ()); - this->major_version_ = cdr.major_version_; - this->minor_version_ = cdr.minor_version_; - cdr.reset_contents (); -} - -void -ACE_InputCDR::exchange_data_blocks (ACE_InputCDR &cdr) -{ - // Exchange byte orders - int byte_order = cdr.do_byte_swap_; - cdr.do_byte_swap_ = this->do_byte_swap_; - this->do_byte_swap_ = byte_order; - - // Get the destination read and write pointers - size_t drd_pos = - cdr.start_.rd_ptr () - cdr.start_.base (); - size_t dwr_pos = - cdr.start_.wr_ptr () - cdr.start_.base (); - - // Get the source read & write pointers - size_t srd_pos = - this->start_.rd_ptr () - this->start_.base (); - size_t swr_pos = - this->start_.wr_ptr () - this->start_.base (); - - // Exchange data_blocks. Dont release any of the data blocks. - ACE_Data_Block *dnb = - this->start_.replace_data_block (cdr.start_.data_block ()); - cdr.start_.replace_data_block (dnb); - - // Exchange the flags information.. - ACE_Message_Block::Message_Flags df = cdr.start_.self_flags (); - ACE_Message_Block::Message_Flags sf = this->start_.self_flags (); - - cdr.start_.clr_self_flags (df); - this->start_.clr_self_flags (sf); - - cdr.start_.set_self_flags (sf); - this->start_.set_self_flags (df); - - // Reset the pointers to zero before it is set again. - cdr.start_.reset (); - this->start_.reset (); - - // Set the read and write pointers. - if (cdr.start_.size () >= srd_pos) - cdr.start_.rd_ptr (srd_pos); - - if (cdr.start_.size () >= swr_pos) - cdr.start_.wr_ptr (swr_pos); - - if (this->start_.size () >= drd_pos) - this->start_.rd_ptr (drd_pos); - - if (this->start_.size () >= dwr_pos) - this->start_.wr_ptr (dwr_pos); - - ACE_CDR::Octet dmajor = cdr.major_version_; - ACE_CDR::Octet dminor = cdr.minor_version_; - - // Exchange the GIOP version info - cdr.major_version_ = this->major_version_; - cdr.minor_version_ = this->minor_version_; - - this->major_version_ = dmajor; - this->minor_version_ = dminor; -} - -ACE_Data_Block * -ACE_InputCDR::clone_from (ACE_InputCDR &cdr) -{ - this->do_byte_swap_ = cdr.do_byte_swap_; - - // Replace our data block by using the incoming CDR stream. - ACE_Data_Block *db = - this->start_.replace_data_block (cdr.start_.data_block ()->clone_nocopy ()); - - // Align the start_ message block. - ACE_CDR::mb_align (&this->start_); - - // Clear the DONT_DELETE flag if it has been set - this->start_.clr_self_flags (ACE_Message_Block::DONT_DELETE); - - // Get the read & write pointer positions in the incoming CDR - // streams - char *rd_ptr = cdr.start_.rd_ptr (); - char *wr_ptr = cdr.start_.wr_ptr (); - - // Now reset the incoming CDR stream - cdr.start_.reset (); - - // As we have reset the stream, try to align the underlying message - // block in the incoming stream - ACE_CDR::mb_align (&cdr.start_); - - // Get the read & write pointer positions again - char *nrd_ptr = cdr.start_.rd_ptr (); - char *nwr_ptr = cdr.start_.wr_ptr (); - - // Actual length of the stream is.. - // @todo: This will look idiotic, but we dont seem to have much of a - // choice. How do we calculate the length of the incoming stream? - // Calling the method before calling reset () would give us the - // wrong length of the stream that needs copying. So we do the - // calulation like this - // (1) We get the and positions of the incoming - // stream. - // (2) Then we reset the stream and then align it. - // (3) We get the and positions again. (Points #1 - // thru #3 has been done already) - // (4) The difference in the and positions gives - // us the following, the actual bytes traversed by the and - // . - // (5) The bytes traversed by the is the actual length of - // the stream. - - // Actual bytes traversed - size_t rd_bytes = rd_ptr - nrd_ptr; - size_t wr_bytes = wr_ptr - nwr_ptr; - - // Now do the copy - (void) ACE_OS::memcpy (this->start_.wr_ptr (), - cdr.start_.rd_ptr (), - wr_bytes); - - // Set the read pointer position to the same point as that was in - // cdr. - this->start_.rd_ptr (rd_bytes); - this->start_.wr_ptr (wr_bytes); - - // We have changed the read & write pointers for the incoming - // stream. Set them back to the positions that they were before.. - cdr.start_.rd_ptr (rd_bytes); - cdr.start_.wr_ptr (wr_bytes); - - this->major_version_ = cdr.major_version_; - this->minor_version_ = cdr.minor_version_; - - return db; -} - -ACE_Message_Block* -ACE_InputCDR::steal_contents (void) -{ - ACE_Message_Block* block = - this->start_.clone (); - this->start_.data_block (block->data_block ()->clone ()); - - // If at all our message had a DONT_DELETE flag set, just clear it - // off. - this->start_.clr_self_flags (ACE_Message_Block::DONT_DELETE); - - ACE_CDR::mb_align (&this->start_); - - return block; -} - -void -ACE_InputCDR::reset_contents (void) -{ - this->start_.data_block (this->start_.data_block ()->clone_nocopy - ()); - - // Reset the flags... - this->start_.clr_self_flags (ACE_Message_Block::DONT_DELETE); -} - -// -------------------------------------------------------------- - -#if defined (VXWORKS) && defined (ghs) -ACE_CDR::Boolean -ACE_OutputCDR::write_float (ACE_CDR::Float x) -{ - return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong*, &x)); -} - -ACE_CDR::Boolean -ACE_InputCDR::read_float (ACE_CDR::Float &x) -{ - return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*, &x)); -} -#endif /* VXWORKS && ghs */ - -ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, const ACE_CString &x) -{ - os.write_string (x); - return os.good_bit (); -} - -ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_CString &x) -{ - is.read_string (x); - return is.good_bit (); -} diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h deleted file mode 100644 index dd4983c99a6..00000000000 --- a/ace/CDR_Stream.h +++ /dev/null @@ -1,1239 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CDR_Stream.h - * - * $Id$ - * - * ACE Common Data Representation (CDR) marshaling and demarshaling - * classes. - * - * This implementation was inspired in the CDR class in SunSoft's - * IIOP engine, but has a completely different implementation and a - * different interface too. - * - * The current implementation assumes that the host has 1-byte, - * 2-byte and 4-byte integral types, and that it has single - * precision and double precision IEEE floats. - * Those assumptions are pretty good these days, with Crays beign - * the only known exception. - * - * @author TAO version by - * @author Aniruddha Gokhale - * @author Carlos O'Ryan - * @author ACE version by - * @author Jeff Parsons - * @author Istvan Buki - * @author Codeset translation by - * @author Jim Rogers - */ -//============================================================================= - -#ifndef ACE_CDR_STREAM_H -#define ACE_CDR_STREAM_H - -#include "ace/pre.h" - -#include "ace/CDR_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include "ace/Message_Block.h" - - -// Stuff used by the ACE CDR classes. -#if defined ACE_LITTLE_ENDIAN -# define ACE_CDR_BYTE_ORDER 1 -// little endian encapsulation byte order has value = 1 -#else /* ! ACE_LITTLE_ENDIAN */ -# define ACE_CDR_BYTE_ORDER 0 -// big endian encapsulation byte order has value = 0 -#endif /* ! ACE_LITTLE_ENDIAN */ - - -class ACE_Char_Codeset_Translator; -class ACE_WChar_Codeset_Translator; - -class ACE_InputCDR; - -/** - * @class ACE_OutputCDR - * - * @brief A CDR stream for writing, i.e. for marshalling. - * - * This class is based on the the CORBA spec for Java (98-02-29), - * java class omg.org.CORBA.portable.OutputStream. It diverts in - * a few ways: - * + Operations taking arrays don't have offsets, because in C++ - * it is easier to describe an array starting from x+offset. - * + Operations return an error status, because exceptions are - * not widely available in C++ (yet). - */ -class ACE_Export ACE_OutputCDR -{ -public: - /** - * The Codeset translators need access to some private members to - * efficiently marshal arrays - * For reading from an output CDR stream. - */ - friend class ACE_Char_Codeset_Translator; - friend class ACE_WChar_Codeset_Translator; - friend class ACE_InputCDR; - - /// Default constructor, allocates bytes in the internal - /// buffer, if == 0 it allocates the default size. - ACE_OutputCDR (size_t size = 0, - int byte_order = ACE_CDR_BYTE_ORDER, - ACE_Allocator* buffer_allocator = 0, - ACE_Allocator* data_block_allocator = 0, - ACE_Allocator* message_block_allocator = 0, - size_t memcpy_tradeoff = - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF, - ACE_CDR::Octet major_version = - ACE_CDR_GIOP_MAJOR_VERSION, - ACE_CDR::Octet minor_version = - ACE_CDR_GIOP_MINOR_VERSION); - - /// Build a CDR stream with an initial buffer, it will *not* remove - /// , since it did not allocated it. It's important to be careful - /// with the alignment of . - /** - * Create an output stream from an arbitrary buffer, care must be - * exercised with alignment, because this contructor will align if - * needed. In this case will not point to the start off the - * output stream. begin()->rd_prt() points to the start off the - * output stream. See ACE_ptr_align_binary() to properly align a - * pointer and use ACE_CDR::MAX_ALIGNMENT for the correct alignment. - */ - ACE_OutputCDR (char *data, - size_t size, - int byte_order = ACE_CDR_BYTE_ORDER, - ACE_Allocator* buffer_allocator = 0, - ACE_Allocator* data_block_allocator = 0, - ACE_Allocator* message_block_allocator = 0, - size_t memcpy_tradeoff= - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF, - ACE_CDR::Octet giop_major_version = - ACE_CDR_GIOP_MAJOR_VERSION, - ACE_CDR::Octet giop_minor_version = - ACE_CDR_GIOP_MINOR_VERSION); - - /// Build a CDR stream with an initial Message_Block chain, it will - /// *not* remove , since it did not allocate it. - ACE_OutputCDR (ACE_Message_Block *data, - int byte_order = ACE_CDR_BYTE_ORDER, - size_t memcpy_tradeoff= - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF, - ACE_CDR::Octet giop_major_version = - ACE_CDR_GIOP_MAJOR_VERSION, - ACE_CDR::Octet giop_minor_version = - ACE_CDR_GIOP_MINOR_VERSION); - - /// destructor - ~ACE_OutputCDR (void); - - /** - * Disambiguate overload when inserting booleans, octets, chars, and - * bounded strings. - */ - //@{ @name Helper classes - - struct ACE_Export from_boolean - { - from_boolean (ACE_CDR::Boolean b); - ACE_CDR::Boolean val_; - }; - - struct ACE_Export from_octet - { - from_octet (ACE_CDR::Octet o); - ACE_CDR::Octet val_; - }; - - struct ACE_Export from_char - { - from_char (ACE_CDR::Char c); - ACE_CDR::Char val_; - }; - - struct ACE_Export from_wchar - { - from_wchar (ACE_CDR::WChar wc); - ACE_CDR::WChar val_; - }; - - struct ACE_Export from_string - { - from_string (ACE_CDR::Char* s, - ACE_CDR::ULong b, - ACE_CDR::Boolean nocopy = 0); - from_string (const ACE_CDR::Char* s, - ACE_CDR::ULong b, - ACE_CDR::Boolean nocopy = 0); - ACE_CDR::Char *val_; - ACE_CDR::ULong bound_; - ACE_CDR::Boolean nocopy_; - }; - - struct ACE_Export from_wstring - { - from_wstring (ACE_CDR::WChar* ws, - ACE_CDR::ULong b, - ACE_CDR::Boolean nocopy = 0); - from_wstring (const ACE_CDR::WChar* ws, - ACE_CDR::ULong b, - ACE_CDR::Boolean nocopy = 0); - ACE_CDR::WChar *val_; - ACE_CDR::ULong bound_; - ACE_CDR::Boolean nocopy_; - }; - //@} - - // Return 0 on failure and 1 on success. - //@{ @name Write operations - ACE_CDR::Boolean write_boolean (ACE_CDR::Boolean x); - ACE_CDR::Boolean write_char (ACE_CDR::Char x); - ACE_CDR::Boolean write_wchar (ACE_CDR::WChar x); - ACE_CDR::Boolean write_octet (ACE_CDR::Octet x); - ACE_CDR::Boolean write_short (ACE_CDR::Short x); - ACE_CDR::Boolean write_ushort (ACE_CDR::UShort x); - ACE_CDR::Boolean write_long (ACE_CDR::Long x); - ACE_CDR::Boolean write_ulong (ACE_CDR::ULong x); - ACE_CDR::Boolean write_longlong (const ACE_CDR::LongLong &x); - ACE_CDR::Boolean write_ulonglong (const ACE_CDR::ULongLong &x); - ACE_CDR::Boolean write_float (ACE_CDR::Float x); - ACE_CDR::Boolean write_double (const ACE_CDR::Double &x); - ACE_CDR::Boolean write_longdouble (const ACE_CDR::LongDouble &x); - - /// For string we offer methods that accept a precomputed length. - ACE_CDR::Boolean write_string (const ACE_CDR::Char *x); - ACE_CDR::Boolean write_string (ACE_CDR::ULong len, - const ACE_CDR::Char *x); - ACE_CDR::Boolean write_string (const ACE_CString &x); - ACE_CDR::Boolean write_wstring (const ACE_CDR::WChar *x); - ACE_CDR::Boolean write_wstring (ACE_CDR::ULong length, - const ACE_CDR::WChar *x); - //@} - - /// Note: the portion written starts at and ends - /// at . - /// The length is *NOT* stored into the CDR stream. - //@{ @name Array write operations - ACE_CDR::Boolean write_boolean_array (const ACE_CDR::Boolean *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_char_array (const ACE_CDR::Char *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_wchar_array (const ACE_CDR::WChar* x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_octet_array (const ACE_CDR::Octet* x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_short_array (const ACE_CDR::Short *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_ushort_array (const ACE_CDR::UShort *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_long_array (const ACE_CDR::Long *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_ulong_array (const ACE_CDR::ULong *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_longlong_array (const ACE_CDR::LongLong* x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_ulonglong_array (const ACE_CDR::ULongLong *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_float_array (const ACE_CDR::Float *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_double_array (const ACE_CDR::Double *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean write_longdouble_array (const ACE_CDR::LongDouble* x, - ACE_CDR::ULong length); - - /// Write an octet array contained inside a MB, this can be optimized - /// to minimize copies. - ACE_CDR::Boolean write_octet_array_mb (const ACE_Message_Block* mb); - //@} - - /** - * Return 0 on failure and 1 on success. - */ - //@{ @name Append contents of own CDR stream to another - ACE_CDR::Boolean append_boolean (ACE_InputCDR &); - ACE_CDR::Boolean append_char (ACE_InputCDR &); - ACE_CDR::Boolean append_wchar (ACE_InputCDR &); - ACE_CDR::Boolean append_octet (ACE_InputCDR &); - ACE_CDR::Boolean append_short (ACE_InputCDR &); - ACE_CDR::Boolean append_ushort (ACE_InputCDR &); - ACE_CDR::Boolean append_long (ACE_InputCDR &); - ACE_CDR::Boolean append_ulong (ACE_InputCDR &); - ACE_CDR::Boolean append_longlong (ACE_InputCDR &); - ACE_CDR::Boolean append_ulonglong (ACE_InputCDR &); - ACE_CDR::Boolean append_float (ACE_InputCDR &); - ACE_CDR::Boolean append_double (ACE_InputCDR &); - ACE_CDR::Boolean append_longdouble (ACE_InputCDR &); - - ACE_CDR::Boolean append_wstring (ACE_InputCDR &); - ACE_CDR::Boolean append_string (ACE_InputCDR &); - //@} - - /// Returns 0 if an error has ocurred, the only expected error is to - /// run out of memory. - int good_bit (void) const; - - /// Reuse the CDR stream to write on the old buffer. - void reset (void); - - /// Add the length of each message block in the chain. - size_t total_length (void) const; - - /** - * Return the start of the message block chain for this CDR stream. - * NOTE: The complete CDR stream is represented by a chain of - * message blocks. - */ - const ACE_Message_Block *begin (void) const; - - /// Return the last message in the chain that is is use. - const ACE_Message_Block *end (void) const; - - /// Return the message block in chain. - const ACE_Message_Block *current (void) const; - - /** - * Access the underlying buffer (read only). NOTE: This - * method only returns a pointer to the first block in the - * chain. - */ - const char *buffer (void) const; - - /** - * Return the start and size of the internal buffer.NOTE: This - * method only returns information about the first block in the - * chain. - */ - size_t length (void) const; - - /** - * Utility function to allow the user more flexibility. - * Pads the stream up to the nearest -byte boundary. - * Argument MUST be a power of 2. - * Returns 0 on success and -1 on failure. - */ - int align_write_ptr (size_t alignment); - - /// Access the codeset translators. They can be null! - ACE_Char_Codeset_Translator *char_translator (void) const; - ACE_WChar_Codeset_Translator *wchar_translator (void) const; - - /// Set the char codeset translator. - void char_translator (ACE_Char_Codeset_Translator *); - /// Set the wchar codeset translator. - void wchar_translator (ACE_WChar_Codeset_Translator *); - - /// set the global size of serialized wchars. This may be different - /// than the size of a wchar_t. - static void wchar_maxbytes (int ); - - /// access the serialized size of wchars. - static int wchar_maxbytes (void); - - /** - * Return alignment of the wr_ptr(), with respect to the start of - * the CDR stream. This is not the same as the alignment of - * current->wr_ptr()! - */ - size_t current_alignment (void) const; - - /** - * Returns (in ) the next position in the buffer aligned to - * , it advances the Message_Block wr_ptr past the data - * (i.e., + ). If necessary it grows the Message_Block - * buffer. Sets the good_bit to 0 and returns a -1 on failure. - */ - int adjust (size_t size, - char *&buf); - - /// As above, but now the size and alignment requirements may be - /// different. - int adjust (size_t size, - size_t align, - char *&buf); - - /// If non-zero then this stream is writing in non-native byte order, - /// this is only meaningful if ACE_ENABLE_SWAP_ON_WRITE is defined. - int do_byte_swap (void) const; - - /// For use by a gateway, which creates the output stream for the - /// reply to the client in its native byte order, but which must - /// send the reply in the byte order of the target's reply to the - /// gateway. - void reset_byte_order (int byte_order); - - /// set GIOP version info - int set_version (ACE_CDR::Octet major, - ACE_CDR::Octet minor); - - /// Set the underlying GIOP version.. - int get_version (ACE_CDR::Octet &major, - ACE_CDR::Octet &minor); -private: - /// disallow copying... - ACE_OutputCDR (const ACE_OutputCDR& rhs); - ACE_OutputCDR& operator= (const ACE_OutputCDR& rhs); - - ACE_CDR::Boolean write_1 (const ACE_CDR::Octet *x); - ACE_CDR::Boolean write_2 (const ACE_CDR::UShort *x); - ACE_CDR::Boolean write_4 (const ACE_CDR::ULong *x); - ACE_CDR::Boolean write_8 (const ACE_CDR::ULongLong *x); - ACE_CDR::Boolean write_16 (const ACE_CDR::LongDouble *x); - - /** - * write an array of elements, each of bytes and the - * start aligned at a multiple of . The elements are assumed - * to be packed with the right alignment restrictions. It is mostly - * designed for buffers of the basic types. - * - * This operation uses ; as explained above it is expected - * that using assignment is faster that for one element, - * but for several elements should be more efficient, it - * could be interesting to find the break even point and optimize - * for that case, but that would be too platform dependent. - */ - ACE_CDR::Boolean write_array (const void *x, - size_t size, - size_t align, - ACE_CDR::ULong length); - - - ACE_CDR::Boolean write_wchar_array_i (const ACE_CDR::WChar* x, - ACE_CDR::ULong length); - - - /** - * Grow the CDR stream. When it returns contains a pointer to - * memory in the CDR stream, with at least bytes ahead of it - * and aligned to an boundary. It moved the to . - */ - int grow_and_adjust (size_t size, - size_t align, - char *&buf); - -private: - /// The start of the chain of message blocks. - ACE_Message_Block start_; - - /// The current block in the chain were we are writing. - ACE_Message_Block *current_; - - /** - * Is the current block writable. When we steal a buffer from the - * user and just chain it into the message block we are not supposed - * to write on it, even if it is past the start and end of the - * buffer. - */ - int current_is_writable_; - - /** - * The current alignment as measured from the start of the buffer. - * Usually this coincides with the alignment of the buffer in - * memory, but, when we chain another buffer this "quasi invariant" - * is broken. - * The current_alignment is used to readjust the buffer following - * the stolen message block. - */ - size_t current_alignment_; - - /** - * If not zero swap bytes at writing so the created CDR stream byte - * order does *not* match the machine byte order. The motivation - * for such a beast is that in some setting a few (fast) machines - * can be serving hundreds of slow machines with the opposite byte - * order, so it makes sense (as a load balancing device) to put the - * responsability in the writers. THIS IS NOT A STANDARD IN CORBA, - * USE AT YOUR OWN RISK - */ - int do_byte_swap_; - - /// Set to 0 when an error ocurrs. - int good_bit_; - - /// Break-even point for copying. - size_t memcpy_tradeoff_; - -protected: - /// GIOP version information - ACE_CDR::Octet major_version_; - ACE_CDR::Octet minor_version_; - - /// If not nil, invoke for translation of character and string data. - ACE_Char_Codeset_Translator *char_translator_; - ACE_WChar_Codeset_Translator *wchar_translator_; - - /** - * Some wide char codesets may be defined with a maximum number - * of bytes that is smaller than the size of a wchar_t. This means - * that the CDR cannot simply memcpy a block of wchars to and from - * the stream, but must instead realign the bytes appropriately. - * In cases when wchar i/o is not allowed, such as with GIOP 1.0, - * or not having a native wchar codeset defined, the maxbytes is - * set to zero, indicating no wchar data is allowed. - */ - static int wchar_maxbytes_; -}; - -// **************************************************************** - -/** - * @class ACE_InputCDR - * - * @brief A CDR stream for reading, i.e. for demarshalling. - * - * This class is based on the the CORBA spec for Java (98-02-29), - * java class omg.org.CORBA.portable.InputStream. It diverts in a - * few ways: - * + Operations to retrieve basic types take parameters by - * reference. - * + Operations taking arrays don't have offsets, because in C++ - * it is easier to describe an array starting from x+offset. - * + Operations return an error status, because exceptions are - * not widely available in C++ (yet). - */ -class ACE_Export ACE_InputCDR -{ -public: - /// The translator need privileged access to efficiently demarshal - /// arrays and the such - friend class ACE_Char_Codeset_Translator; - friend class ACE_WChar_Codeset_Translator; - - /** - * Create an input stream from an arbitrary buffer. The buffer must - * be properly aligned because this contructor will *not* work if - * the buffer is aligned unproperly.See ACE_ptr_align_binary() for - * instructions on how to align a pointer properly and use - * ACE_CDR::MAX_ALIGNMENT for the correct alignment. - */ - ACE_InputCDR (const char *buf, - size_t bufsiz, - int byte_order = ACE_CDR_BYTE_ORDER, - ACE_CDR::Octet major_version = - ACE_CDR_GIOP_MAJOR_VERSION, - ACE_CDR::Octet minor_version = - ACE_CDR_GIOP_MINOR_VERSION); - - /// Create an empty input stream. The caller is responsible for - /// putting the right data and providing the right alignment. - ACE_InputCDR (size_t bufsiz, - int byte_order = ACE_CDR_BYTE_ORDER, - ACE_CDR::Octet major_version = - ACE_CDR_GIOP_MAJOR_VERSION, - ACE_CDR::Octet minor_version = - ACE_CDR_GIOP_MINOR_VERSION); - - /// Create an input stream from an ACE_Message_Block - /** - * The alignment of the @arg data block is carried into the new - * ACE_InputCDR object. This constructor either increments the - * @arg data reference count, or copies the data (if it's a compound - * message block) so the caller can release the block immediately - * upon return. - */ - ACE_InputCDR (const ACE_Message_Block *data, - int byte_order = ACE_CDR_BYTE_ORDER, - ACE_CDR::Octet major_version = - ACE_CDR_GIOP_MAJOR_VERSION, - ACE_CDR::Octet minor_version = - ACE_CDR_GIOP_MINOR_VERSION); - - /// Create an input stream from an ACE_Data_Block. The - /// indicates whether the can be deleted by the CDR stream - /// or not - ACE_InputCDR (ACE_Data_Block *data, - ACE_Message_Block::Message_Flags flag = 0, - int byte_order = ACE_CDR_BYTE_ORDER, - ACE_CDR::Octet major_version = - ACE_CDR_GIOP_MAJOR_VERSION, - ACE_CDR::Octet minor_version = - ACE_CDR_GIOP_MINOR_VERSION); - - /// Create an input stream from an ACE_Data_Block. It also sets the - /// read and write pointers at the desired positions. This would be - /// helpful if the applications desires to create a new CDR stream - /// from a semi-processed datablock. - ACE_InputCDR (ACE_Data_Block *data, - ACE_Message_Block::Message_Flags flag, - size_t read_pointer_position, - size_t write_pointer_position, - int byte_order = ACE_CDR_BYTE_ORDER, - ACE_CDR::Octet major_version = - ACE_CDR_GIOP_MAJOR_VERSION, - ACE_CDR::Octet minor_version = - ACE_CDR_GIOP_MINOR_VERSION); - - /** - * These make a copy of the current stream state, but do not copy - * the internal buffer, so the same stream can be read multiple - * times efficiently. - */ - ACE_InputCDR (const ACE_InputCDR& rhs); - - ACE_InputCDR& operator= (const ACE_InputCDR& rhs); - - /// When interpreting indirected TypeCodes it is useful to make a - /// "copy" of the stream starting in the new position. - ACE_InputCDR (const ACE_InputCDR& rhs, - size_t size, - ACE_CDR::Long offset); - - /// This creates an encapsulated stream, the first byte must be (per - /// the spec) the byte order of the encapsulation. - ACE_InputCDR (const ACE_InputCDR& rhs, - size_t size); - - /// Create an input CDR from an output CDR. - ACE_InputCDR (const ACE_OutputCDR& rhs, - ACE_Allocator* buffer_allocator = 0, - ACE_Allocator* data_block_allocator = 0, - ACE_Allocator* message_block_allocator = 0); - - /// Helper class to transfer the contents from one input CDR to - /// another without requiring any extra memory allocations, data - /// copies or too many temporaries. - struct ACE_Export Transfer_Contents - { - Transfer_Contents (ACE_InputCDR &rhs); - - ACE_InputCDR &rhs_; - }; - /// Transfer the contents from to a new CDR - ACE_InputCDR (Transfer_Contents rhs); - - /// Destructor - ~ACE_InputCDR (void); - - /// Disambiguate overloading when extracting octets, chars, - /// booleans, and bounded strings - //@{ @name Helper classes - - struct ACE_Export to_boolean - { - to_boolean (ACE_CDR::Boolean &b); - ACE_CDR::Boolean &ref_; - }; - - struct ACE_Export to_char - { - to_char (ACE_CDR::Char &c); - ACE_CDR::Char &ref_; - }; - - struct ACE_Export to_wchar - { - to_wchar (ACE_CDR::WChar &wc); - ACE_CDR::WChar &ref_; - }; - - struct ACE_Export to_octet - { - to_octet (ACE_CDR::Octet &o); - ACE_CDR::Octet &ref_; - }; - - struct ACE_Export to_string - { - /// The constructor taking a non-const string is - /// now deprecated (C++ mapping 00-01-02), but we - /// keep it around for backward compatibility. - to_string (ACE_CDR::Char *&s, - ACE_CDR::ULong b); - to_string (const ACE_CDR::Char *&s, - ACE_CDR::ULong b); - const ACE_CDR::Char *&val_; - ACE_CDR::ULong bound_; - }; - - struct ACE_Export to_wstring - { - /// The constructor taking a non-const wstring is - /// now deprecated (C++ mapping 00-01-02), but we - /// keep it around for backward compatibility. - to_wstring (ACE_CDR::WChar *&ws, - ACE_CDR::ULong b); - to_wstring (const ACE_CDR::WChar *&ws, - ACE_CDR::ULong b); - const ACE_CDR::WChar *&val_; - ACE_CDR::ULong bound_; - }; - //@} - - /** - * Return 0 on failure and 1 on success. - */ - //@{ @name Read basic IDL types - ACE_CDR::Boolean read_boolean (ACE_CDR::Boolean& x); - ACE_CDR::Boolean read_char (ACE_CDR::Char &x); - ACE_CDR::Boolean read_wchar (ACE_CDR::WChar& x); - ACE_CDR::Boolean read_octet (ACE_CDR::Octet& x); - ACE_CDR::Boolean read_short (ACE_CDR::Short &x); - ACE_CDR::Boolean read_ushort (ACE_CDR::UShort &x); - ACE_CDR::Boolean read_long (ACE_CDR::Long &x); - ACE_CDR::Boolean read_ulong (ACE_CDR::ULong &x); - ACE_CDR::Boolean read_longlong (ACE_CDR::LongLong& x); - ACE_CDR::Boolean read_ulonglong (ACE_CDR::ULongLong& x); - ACE_CDR::Boolean read_float (ACE_CDR::Float &x); - ACE_CDR::Boolean read_double (ACE_CDR::Double &x); - ACE_CDR::Boolean read_longdouble (ACE_CDR::LongDouble &x); - - ACE_CDR::Boolean read_string (ACE_CDR::Char *&x); - ACE_CDR::Boolean read_string (ACE_CString &x); - ACE_CDR::Boolean read_wstring (ACE_CDR::WChar*& x); - //@} - - /** - * The buffer must be large enough to contain - * elements. - * Return 0 on failure and 1 on success. - */ - //@{ @name Read basic IDL types arrays - ACE_CDR::Boolean read_boolean_array (ACE_CDR::Boolean* x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_char_array (ACE_CDR::Char *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_wchar_array (ACE_CDR::WChar* x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_octet_array (ACE_CDR::Octet* x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_short_array (ACE_CDR::Short *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_ushort_array (ACE_CDR::UShort *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_long_array (ACE_CDR::Long *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_ulong_array (ACE_CDR::ULong *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_longlong_array (ACE_CDR::LongLong* x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_ulonglong_array (ACE_CDR::ULongLong* x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_float_array (ACE_CDR::Float *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_double_array (ACE_CDR::Double *x, - ACE_CDR::ULong length); - ACE_CDR::Boolean read_longdouble_array (ACE_CDR::LongDouble* x, - ACE_CDR::ULong length); - //@} - - /** - * Return 0 on failure and 1 on success. - */ - //@{ @name Skip elements - ACE_CDR::Boolean skip_boolean (void); - ACE_CDR::Boolean skip_char (void); - ACE_CDR::Boolean skip_wchar (void); - ACE_CDR::Boolean skip_octet (void); - ACE_CDR::Boolean skip_short (void); - ACE_CDR::Boolean skip_ushort (void); - ACE_CDR::Boolean skip_long (void); - ACE_CDR::Boolean skip_ulong (void); - ACE_CDR::Boolean skip_longlong (void); - ACE_CDR::Boolean skip_ulonglong (void); - ACE_CDR::Boolean skip_float (void); - ACE_CDR::Boolean skip_double (void); - ACE_CDR::Boolean skip_longdouble (void); - //@} - - /** - * The next field must be a string, this method skips it. It is - * useful in parsing a TypeCode. - * Return 0 on failure and 1 on success. - */ - ACE_CDR::Boolean skip_wstring (void); - ACE_CDR::Boolean skip_string (void); - - /// Skip bytes in the CDR stream. - /// Return 0 on failure and 1 on success. - ACE_CDR::Boolean skip_bytes (size_t n); - - /// returns zero if a problem has been detected. - int good_bit (void) const; - - /** - * Return the start of the message block chain for this CDR stream. - * NOTE: In the current implementation the chain has length 1, but - * we are planning to change that. - */ - const ACE_Message_Block* start (void) const; - - // = The following functions are useful to read the contents of the - // CDR stream from a socket or file. - - /** - * Grow the internal buffer, reset to the first byte in the - * new buffer that is properly aligned, and set to - * + newsize - */ - int grow (size_t newsize); - - /** - * After reading and partially parsing the contents the user can - * detect a change in the byte order, this method will let him - * change it. - */ - void reset_byte_order (int byte_order); - - /// Re-initialize the CDR stream, copying the contents of the chain - /// of message_blocks starting from . - void reset (const ACE_Message_Block *data, - int byte_order); - - /// Steal the contents from the current CDR. - ACE_Message_Block *steal_contents (void); - - /// Steal the contents of and make a shallow copy into this - /// stream. - void steal_from (ACE_InputCDR &cdr); - - /// Exchange data blocks with the caller of this method. The read - /// and write pointers are also exchanged. - /// Note: We now do only with the start_ message block. - void exchange_data_blocks (ACE_InputCDR &cdr); - - /// Copy the data portion from the to this cdr and return the - /// data content (ie. the ACE_Data_Block) from this CDR to the - /// caller. The caller is responsible for managing the memory of the - /// returned ACE_Data_Block. - ACE_Data_Block* clone_from (ACE_InputCDR &cdr); - - /// Re-initialize the CDR stream, forgetting about the old contents - /// of the stream and allocating a new buffer (from the allocators). - void reset_contents (void); - - /// Returns the current position for the rd_ptr.... - char* rd_ptr (void); - - /// Returns the current position for the wr_ptr.... - char* wr_ptr (void); - - /// Return how many bytes are left in the stream. - size_t length (void) const; - - /** - * Utility function to allow the user more flexibility. - * Skips up to the nearest -byte boundary. - * Argument MUST be a power of 2. - * Returns 0 on success and -1 on failure. - */ - int align_read_ptr (size_t alignment); - - /// If non-zero then this stream is writing in non-native byte order, - /// this is only meaningful if ACE_ENABLE_SWAP_ON_WRITE is defined. - int do_byte_swap (void) const; - - /// If returns 0, this returns ACE_CDR_BYTE_ORDER else - /// it returns !ACE_CDR_BYTE_ORDER. - int byte_order (void) const; - - /// Access the codeset translators. They can be nil! - ACE_Char_Codeset_Translator *char_translator (void) const; - ACE_WChar_Codeset_Translator *wchar_translator (void) const; - - /// Set the codeset translators. - void char_translator (ACE_Char_Codeset_Translator *); - void wchar_translator (ACE_WChar_Codeset_Translator *); - - /** - * Returns (in ) the next position in the buffer aligned to - * , it advances the Message_Block rd_ptr past the data - * (i.e., + ). Sets the good_bit to 0 and returns a -1 - * on failure. - */ - int adjust (size_t size, - char *&buf); - - /// As above, but now the size and alignment requirements may be - /// different. - int adjust (size_t size, - size_t align, - char *&buf); - - /// Set the underlying GIOP version.. - int set_version (ACE_CDR::Octet major, - ACE_CDR::Octet minor); - - /// Set the underlying GIOP version.. - int get_version (ACE_CDR::Octet &major, - ACE_CDR::Octet &minor); -protected: - /// The start of the chain of message blocks, even though in the - /// current version the chain always has length 1. - ACE_Message_Block start_; - - /// The CDR stream byte order does not match the one on the machine, - /// swapping is needed while reading. - int do_byte_swap_; - - /// set to 0 when an error occurs. - int good_bit_; - - /// The GIOP versions for this stream - ACE_CDR::Octet major_version_; - ACE_CDR::Octet minor_version_; - - /// If not nil, invoke for translation of character and string data. - ACE_Char_Codeset_Translator *char_translator_; - ACE_WChar_Codeset_Translator *wchar_translator_; - -private: - ACE_CDR::Boolean read_1 (ACE_CDR::Octet *x); - ACE_CDR::Boolean read_2 (ACE_CDR::UShort *x); - ACE_CDR::Boolean read_4 (ACE_CDR::ULong *x); - ACE_CDR::Boolean read_8 (ACE_CDR::ULongLong *x); - ACE_CDR::Boolean read_16 (ACE_CDR::LongDouble *x); - - // Several types can be read using the same routines, since TAO - // tries to use native types with known size for each CORBA type. - // We could use void* or char* to make the interface more - // consistent, but using native types let us exploit the strict - // alignment requirements of CDR streams and implement the - // operations using asignment. - - /** - * Read an array of elements, each of bytes and the - * start aligned at a multiple of . The elements are assumed - * to be packed with the right alignment restrictions. It is mostly - * designed for buffers of the basic types. - * - * This operation uses ; as explained above it is expected - * that using assignment is faster that for one element, - * but for several elements should be more efficient, it - * could be interesting to find the break even point and optimize - * for that case, but that would be too platform dependent. - */ - ACE_CDR::Boolean read_array (void* x, - size_t size, - size_t align, - ACE_CDR::ULong length); - - /** - * On those occasions when the native codeset for wchar is smaller than - * the size of a wchar_t, such as using UTF-16 with a 4-byte wchar_t, a - * special form of reading the array is needed. Actually, this should be - * a default translator. - */ - ACE_CDR::Boolean read_wchar_array_i (ACE_CDR::WChar * x, - ACE_CDR::ULong length); - - /// Move the rd_ptr ahead by bytes. - void rd_ptr (size_t offset); - - /// Points to the continuation field of the current message block. - char* end (void); -}; - -// **************************************************************** - -/** - * @class ACE_Char_Codeset_Translator - * - * @brief Codeset translation routines common to both Output and Input - * CDR streams. - * - * This class is a base class for defining codeset translation - * routines to handle the character set translations required by - * both CDR Input streams and CDR Output streams. - * - * Translators are reference counted. This allows for stateful as well - * as stateless translators. Stateless translators will be allocated - * once whereas CDR Streams own their own copy of a stateful translator. - */ -class ACE_Export ACE_Char_Codeset_Translator -{ -public: - virtual ~ACE_Char_Codeset_Translator () {}; - - /// Read a single character from the stream, converting from the - /// stream codeset to the native codeset - virtual ACE_CDR::Boolean read_char (ACE_InputCDR&, - ACE_CDR::Char&) = 0; - - /// Read a string from the stream, including the length, converting - /// the characters from the stream codeset to the native codeset - virtual ACE_CDR::Boolean read_string (ACE_InputCDR&, - ACE_CDR::Char *&) = 0; - - /// Read an array of characters from the stream, converting the - /// characters from the stream codeset to the native codeset. - virtual ACE_CDR::Boolean read_char_array (ACE_InputCDR&, - ACE_CDR::Char*, - ACE_CDR::ULong) = 0; - - /// Write a single character to the stream, converting from the - /// native codeset to the stream codeset - virtual ACE_CDR::Boolean write_char (ACE_OutputCDR&, - ACE_CDR::Char) = 0; - - /// Write a string to the stream, including the length, converting - /// from the native codeset to the stream codeset - virtual ACE_CDR::Boolean write_string (ACE_OutputCDR&, - ACE_CDR::ULong, - const ACE_CDR::Char*) = 0; - - /// Write an array of characters to the stream, converting from the - /// native codeset to the stream codeset - virtual ACE_CDR::Boolean write_char_array (ACE_OutputCDR&, - const ACE_CDR::Char*, - ACE_CDR::ULong) = 0; - - virtual ACE_CDR::ULong ncs () = 0; - virtual ACE_CDR::ULong tcs () = 0; -protected: - /// Children have access to low-level routines because they cannot - /// use read_char or something similar (it would recurse). - ACE_CDR::Boolean read_1 (ACE_InputCDR& input, - ACE_CDR::Octet *x); - ACE_CDR::Boolean write_1 (ACE_OutputCDR& output, - const ACE_CDR::Octet *x); - - /// Efficiently read elements of size each from - /// into ; the data must be aligned to . - ACE_CDR::Boolean read_array (ACE_InputCDR& input, - void* x, - size_t size, - size_t align, - ACE_CDR::ULong length); - - /** - * Efficiently write elements of size from into - * . Before inserting the elements enough padding is added - * to ensure that the elements will be aligned to in the - * stream. - */ - ACE_CDR::Boolean write_array (ACE_OutputCDR& output, - const void *x, - size_t size, - size_t align, - ACE_CDR::ULong length); - - /** - * Exposes the stream implementation of , this is useful in - * many cases to minimize memory allocations during marshaling. - * On success will contain a contiguous area in the CDR stream - * that can hold bytes aligned to . - * Results - */ - int adjust (ACE_OutputCDR& out, - size_t size, - size_t align, - char *&buf); - - /// Used by derived classes to set errors in the CDR stream. - void good_bit (ACE_OutputCDR& out, int bit); - - /// Obtain the CDR Stream's major & minor version values. - ACE_CDR::Octet major_version (ACE_InputCDR& input); - ACE_CDR::Octet minor_version (ACE_InputCDR& input); - ACE_CDR::Octet major_version (ACE_OutputCDR& output); - ACE_CDR::Octet minor_version (ACE_OutputCDR& output); -}; - -// **************************************************************** - -/** - * @class ACE_WChar_Codeset_Translator - * - * @brief Codeset translation routines common to both Output and Input - * CDR streams. - * - * This class is a base class for defining codeset translation - * routines to handle the character set translations required by - * both CDR Input streams and CDR Output streams. - */ -class ACE_Export ACE_WChar_Codeset_Translator -{ -public: - virtual ~ACE_WChar_Codeset_Translator () {} - - virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR&, - ACE_CDR::WChar&) = 0; - virtual ACE_CDR::Boolean read_wstring (ACE_InputCDR&, - ACE_CDR::WChar *&) = 0; - virtual ACE_CDR::Boolean read_wchar_array (ACE_InputCDR&, - ACE_CDR::WChar*, - ACE_CDR::ULong) = 0; - virtual ACE_CDR::Boolean write_wchar (ACE_OutputCDR&, - ACE_CDR::WChar) = 0; - virtual ACE_CDR::Boolean write_wstring (ACE_OutputCDR&, - ACE_CDR::ULong, - const ACE_CDR::WChar*) = 0; - virtual ACE_CDR::Boolean write_wchar_array (ACE_OutputCDR&, - const ACE_CDR::WChar*, - ACE_CDR::ULong) = 0; - - virtual ACE_CDR::ULong ncs () = 0; - virtual ACE_CDR::ULong tcs () = 0; -protected: - /// Children have access to low-level routines because they cannot - /// use read_char or something similar (it would recurse). - ACE_CDR::Boolean read_1 (ACE_InputCDR& input, - ACE_CDR::Octet *x); - ACE_CDR::Boolean read_2 (ACE_InputCDR& input, - ACE_CDR::UShort *x); - ACE_CDR::Boolean read_4 (ACE_InputCDR& input, - ACE_CDR::ULong *x); - ACE_CDR::Boolean write_1 (ACE_OutputCDR& output, - const ACE_CDR::Octet *x); - ACE_CDR::Boolean write_2 (ACE_OutputCDR& output, - const ACE_CDR::UShort *x); - ACE_CDR::Boolean write_4 (ACE_OutputCDR& output, - const ACE_CDR::ULong *x); - - /// Efficiently read elements of size each from - /// into ; the data must be aligned to . - ACE_CDR::Boolean read_array (ACE_InputCDR& input, - void* x, - size_t size, - size_t align, - ACE_CDR::ULong length); - - /** - * Efficiently write elements of size from into - * . Before inserting the elements enough padding is added - * to ensure that the elements will be aligned to in the - * stream. - */ - ACE_CDR::Boolean write_array (ACE_OutputCDR& output, - const void *x, - size_t size, - size_t align, - ACE_CDR::ULong length); - - /** - * Exposes the stream implementation of , this is useful in - * many cases to minimize memory allocations during marshaling. - * On success will contain a contiguous area in the CDR stream - * that can hold bytes aligned to . - * Results - */ - int adjust (ACE_OutputCDR& out, - size_t size, - size_t align, - char *&buf); - - /// Used by derived classes to set errors in the CDR stream. - void good_bit (ACE_OutputCDR& out, int bit); - - /// Obtain the CDR Stream's major & minor version values. - ACE_CDR::Octet major_version (ACE_InputCDR& input); - ACE_CDR::Octet minor_version (ACE_InputCDR& input); - ACE_CDR::Octet major_version (ACE_OutputCDR& output); - ACE_CDR::Octet minor_version (ACE_OutputCDR& output); - -}; - -// @@ These operators should not be inlined since they force SString.h -// to be included in this header. -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - const ACE_CString &x); - -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CString &x); - - -#if defined (__ACE_INLINE__) -# include "ace/CDR_Stream.i" -#else /* __ACE_INLINE__ */ - -// Not used by CORBA or TAO -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_CDR::Char x); -// CDR output operators for primitive types - -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_CDR::Short x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_CDR::UShort x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_CDR::Long x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_CDR::ULong x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_CDR::LongLong x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_CDR::ULongLong x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR& os, - ACE_CDR::LongDouble x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_CDR::Float x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_CDR::Double x); - -// CDR output operator from helper classes - -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_OutputCDR::from_boolean x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_OutputCDR::from_char x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_OutputCDR::from_wchar x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_OutputCDR::from_octet x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_OutputCDR::from_string x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - ACE_OutputCDR::from_wstring x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - const ACE_CDR::Char* x); -extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, - const ACE_CDR::WChar* x); - -// Not used by CORBA or TAO -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::Char &x); -// CDR input operators for primitive types - -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::Short &x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::UShort &x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::Long &x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::ULong &x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::LongLong &x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::ULongLong &x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::LongDouble &x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::Float &x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::Double &x); - -// CDR input operator from helper classes - -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_InputCDR::to_boolean x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_InputCDR::to_char x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_InputCDR::to_wchar x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_InputCDR::to_octet x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_InputCDR::to_string x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_InputCDR::to_wstring x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::Char*& x); -extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, - ACE_CDR::WChar*& x); - -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_CDR_STREAM_H */ diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i deleted file mode 100644 index 61b97320915..00000000000 --- a/ace/CDR_Stream.i +++ /dev/null @@ -1,1647 +0,0 @@ -// -*- C++ -*- -// $Id$ - -// **************************************************************** - -// implementing the special types -ACE_INLINE -ACE_OutputCDR::from_boolean::from_boolean (ACE_CDR::Boolean b) - : val_ (b) -{ -} - -ACE_INLINE -ACE_InputCDR::to_boolean::to_boolean (ACE_CDR::Boolean &b) - : ref_ (b) -{ -} - -ACE_INLINE -ACE_OutputCDR::from_octet::from_octet (ACE_CDR::Octet o) - : val_ (o) -{ -} - -ACE_INLINE -ACE_InputCDR::to_octet::to_octet (ACE_CDR::Octet &o) - : ref_ (o) -{ -} - -ACE_INLINE -ACE_OutputCDR::from_char::from_char (ACE_CDR::Char c) - : val_ (c) -{ -} - -ACE_INLINE -ACE_InputCDR::to_char::to_char (ACE_CDR::Char &c) - : ref_ (c) -{ -} - -ACE_INLINE -ACE_OutputCDR::from_wchar::from_wchar (ACE_CDR::WChar wc) - : val_ (wc) -{ -} - -ACE_INLINE -ACE_InputCDR::to_wchar::to_wchar (ACE_CDR::WChar &wc) - : ref_ (wc) -{ -} - -ACE_INLINE -ACE_OutputCDR::from_string::from_string (ACE_CDR::Char *s, - ACE_CDR::ULong b, - ACE_CDR::Boolean nocopy) - : val_ (s), - bound_ (b), - nocopy_ (nocopy) -{ -} - -ACE_INLINE -ACE_OutputCDR::from_string::from_string (const ACE_CDR::Char *s, - ACE_CDR::ULong b, - ACE_CDR::Boolean nocopy) - : val_ (ACE_const_cast (ACE_CDR::Char *, s)), - bound_ (b), - nocopy_ (nocopy) -{ -} - -ACE_INLINE -ACE_InputCDR::to_string::to_string (ACE_CDR::Char *&s, - ACE_CDR::ULong b) - : val_ (ACE_const_cast (const ACE_CDR::Char *&, s)), - bound_ (b) -{ -} - -ACE_INLINE -ACE_InputCDR::to_string::to_string (const ACE_CDR::Char *&s, - ACE_CDR::ULong b) - : val_ (s), - bound_ (b) -{ -} - -ACE_INLINE -ACE_OutputCDR::from_wstring::from_wstring (ACE_CDR::WChar *ws, - ACE_CDR::ULong b, - ACE_CDR::Boolean nocopy) - : val_ (ws), - bound_ (b), - nocopy_ (nocopy) -{ -} - -ACE_INLINE -ACE_OutputCDR::from_wstring::from_wstring (const ACE_CDR::WChar *ws, - ACE_CDR::ULong b, - ACE_CDR::Boolean nocopy) - : val_ (ACE_const_cast (ACE_CDR::WChar *, ws)), - bound_ (b), - nocopy_ (nocopy) -{ -} - -ACE_INLINE -ACE_InputCDR::to_wstring::to_wstring (ACE_CDR::WChar *&ws, - ACE_CDR::ULong b) - : val_ (ACE_const_cast (const ACE_CDR::WChar *&, ws)), - bound_ (b) -{ -} - -ACE_INLINE -ACE_InputCDR::to_wstring::to_wstring (const ACE_CDR::WChar *&ws, - ACE_CDR::ULong b) - : val_ (ws), - bound_ (b) -{ -} - -ACE_INLINE -ACE_InputCDR::Transfer_Contents::Transfer_Contents (ACE_InputCDR &rhs) - : rhs_ (rhs) -{ -} - -// **************************************************************** - -ACE_INLINE -ACE_OutputCDR::~ACE_OutputCDR (void) -{ - if (this->start_.cont () != 0) - { - ACE_Message_Block::release (this->start_.cont ()); - this->start_.cont (0); - } - this->current_ = 0; -} - -ACE_INLINE void -ACE_OutputCDR::reset (void) -{ - this->current_ = &this->start_; - this->current_is_writable_ = 1; - ACE_CDR::mb_align (&this->start_); - this->current_alignment_ = 0; - - // It is tempting not to remove the memory, but we need to do so to - // release any potential user buffers chained in the continuation - // field. - - ACE_Message_Block *cont = this->start_.cont (); - if (cont != 0) - { - ACE_Message_Block::release (cont); - this->start_.cont (0); - } - -} - -// Encode the CDR stream. - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_octet (ACE_CDR::Octet x) -{ - return this->write_1 (ACE_reinterpret_cast (const ACE_CDR::Octet *, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_boolean (ACE_CDR::Boolean x) -{ - return (ACE_CDR::Boolean) this->write_octet (x ? (ACE_CDR::Octet) 1 : (ACE_CDR::Octet) 0); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_char (ACE_CDR::Char x) -{ - if (this->char_translator_ == 0) - return this->write_1 (ACE_reinterpret_cast (const ACE_CDR::Octet*, &x)); - return this->char_translator_->write_char (*this, x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_short (ACE_CDR::Short x) -{ - return this->write_2 (ACE_reinterpret_cast (const ACE_CDR::UShort*, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_ushort (ACE_CDR::UShort x) -{ - return this->write_2 (ACE_reinterpret_cast (const ACE_CDR::UShort*, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_long (ACE_CDR::Long x) -{ - return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong*, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_ulong (ACE_CDR::ULong x) -{ - return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong*, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_longlong (const ACE_CDR::LongLong &x) -{ - return this->write_8 (ACE_reinterpret_cast (const ACE_CDR::ULongLong*, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_ulonglong (const ACE_CDR::ULongLong &x) -{ - return this->write_8 (ACE_reinterpret_cast (const ACE_CDR::ULongLong*,&x)); -} - -#if !defined (VXWORKS) || !defined (ghs) -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_float (ACE_CDR::Float x) -{ - return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong*, &x)); -} -#endif /* !VXWORKS || !ghs */ - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_double (const ACE_CDR::Double &x) -{ - return this->write_8 (ACE_reinterpret_cast (const ACE_CDR::ULongLong*, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_longdouble (const ACE_CDR::LongDouble &x) -{ - return this->write_16 (ACE_reinterpret_cast (const ACE_CDR::LongDouble*,&x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_string (const ACE_CDR::Char *x) -{ - if (x != 0) - { - ACE_CDR::ULong len = - ACE_static_cast (ACE_CDR::ULong, ACE_OS_String::strlen (x)); - return this->write_string (len, x); - } - return this->write_string (0, 0); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_wstring (const ACE_CDR::WChar *x) -{ - if (x != 0) - return this->write_wstring (ACE_OS::wslen (x), x); - return this->write_wstring (0, 0); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_char_array (const ACE_CDR::Char *x, - ACE_CDR::ULong length) -{ - if (this->char_translator_ == 0) - return this->write_array (x, - ACE_CDR::OCTET_SIZE, - ACE_CDR::OCTET_ALIGN, - length); - return this->char_translator_->write_char_array (*this, x, length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_wchar_array (const ACE_CDR::WChar* x, - ACE_CDR::ULong length) -{ - if (this->wchar_translator_) - return this->wchar_translator_->write_wchar_array (*this, x, length); - if (ACE_OutputCDR::wchar_maxbytes_ == 0) - { - errno = EACCES; - return (this->good_bit_ = 0); - } - if (ACE_OutputCDR::wchar_maxbytes_ == sizeof (ACE_CDR::WChar)) - return this->write_array (x, - sizeof (ACE_CDR::WChar), - sizeof (ACE_CDR::WChar) == 2 - ? ACE_CDR::SHORT_ALIGN - : ACE_CDR::LONG_ALIGN, - length); - return this->write_wchar_array_i (x,length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_octet_array (const ACE_CDR::Octet* x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::OCTET_SIZE, - ACE_CDR::OCTET_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_short_array (const ACE_CDR::Short *x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::SHORT_SIZE, - ACE_CDR::SHORT_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_ushort_array (const ACE_CDR::UShort *x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::SHORT_SIZE, - ACE_CDR::SHORT_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_long_array (const ACE_CDR::Long *x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::LONG_SIZE, - ACE_CDR::LONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_ulong_array (const ACE_CDR::ULong *x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::LONG_SIZE, - ACE_CDR::LONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_longlong_array (const ACE_CDR::LongLong *x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::LONGLONG_SIZE, - ACE_CDR::LONGLONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_ulonglong_array (const ACE_CDR::ULongLong *x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::LONGLONG_SIZE, - ACE_CDR::LONGLONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_float_array (const ACE_CDR::Float *x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::LONG_SIZE, - ACE_CDR::LONG_ALIGN, - length); -} - - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_double_array (const ACE_CDR::Double *x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::LONGLONG_SIZE, - ACE_CDR::LONGLONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::write_longdouble_array (const ACE_CDR::LongDouble* x, - ACE_CDR::ULong length) -{ - return this->write_array (x, - ACE_CDR::LONGDOUBLE_SIZE, - ACE_CDR::LONGDOUBLE_ALIGN, - length); -} - -ACE_INLINE int -ACE_OutputCDR::good_bit (void) const -{ - return this->good_bit_; -} - -ACE_INLINE int -ACE_OutputCDR::adjust (size_t size, - size_t align, - char*& buf) -{ - if (!this->current_is_writable_) - return this->grow_and_adjust (size, align, buf); - - size_t offset = - ACE_align_binary (this->current_alignment_, align) - - this->current_alignment_; - - buf = this->current_->wr_ptr () + offset; - char *end = buf + size; - - if (end <= this->current_->end () && - end >= buf) - { - this->current_alignment_ += offset + size; - this->current_->wr_ptr (end); - return 0; - } - - return this->grow_and_adjust (size, align, buf); -} - -ACE_INLINE int -ACE_OutputCDR::adjust (size_t size, char*& buf) -{ - return this->adjust (size, size, buf); -} - -ACE_INLINE int -ACE_OutputCDR::set_version (ACE_CDR::Octet major, ACE_CDR::Octet minor) -{ - this->major_version_ = major; - this->minor_version_ = minor; - return 0; -} - -ACE_INLINE int -ACE_OutputCDR::get_version (ACE_CDR::Octet &major, - ACE_CDR::Octet &minor) -{ - major = this->major_version_; - minor = this->minor_version_; - return 0; -} - - -ACE_INLINE const ACE_Message_Block* -ACE_OutputCDR::begin (void) const -{ - return &this->start_; -} - -ACE_INLINE const ACE_Message_Block* -ACE_OutputCDR::end (void) const -{ - return this->current_->cont (); -} - -ACE_INLINE const ACE_Message_Block* -ACE_OutputCDR::current (void) const -{ - return this->current_; -} - -ACE_INLINE size_t -ACE_OutputCDR::total_length (void) const -{ - return ACE_CDR::total_length (this->begin (), this->end ()); -} - -ACE_INLINE const char* -ACE_OutputCDR::buffer (void) const -{ - return this->start_.rd_ptr (); -} - -ACE_INLINE size_t -ACE_OutputCDR::length (void) const -{ - return this->start_.length (); -} - -ACE_INLINE int -ACE_OutputCDR::do_byte_swap (void) const -{ - return this->do_byte_swap_; -} - -ACE_INLINE void -ACE_OutputCDR::reset_byte_order (int byte_order) -{ - this->do_byte_swap_ = (byte_order != ACE_CDR_BYTE_ORDER); -} - -ACE_INLINE size_t -ACE_OutputCDR::current_alignment (void) const -{ - return this->current_alignment_; -} - -ACE_INLINE int -ACE_OutputCDR::align_write_ptr (size_t alignment) -{ - char *dummy; - return this->adjust (0, alignment, dummy); -} - -ACE_INLINE ACE_Char_Codeset_Translator * -ACE_OutputCDR::char_translator (void) const -{ - return this->char_translator_; -} - -ACE_INLINE ACE_WChar_Codeset_Translator * -ACE_OutputCDR::wchar_translator (void) const -{ - return this->wchar_translator_; -} - -ACE_INLINE void -ACE_OutputCDR::char_translator (ACE_Char_Codeset_Translator * ctran) -{ - this->char_translator_ = ctran; -} - -ACE_INLINE void -ACE_OutputCDR::wchar_translator (ACE_WChar_Codeset_Translator * wctran) -{ - this->wchar_translator_ = wctran; -} - -// **************************************************************** - -ACE_INLINE -ACE_InputCDR::~ACE_InputCDR (void) -{ -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_octet (ACE_CDR::Octet& x) -{ - return this->read_1 (&x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_boolean (ACE_CDR::Boolean& x) -{ - ACE_CDR::Octet tmp; - this->read_octet (tmp); - x = tmp ? (ACE_CDR::Boolean) 1 : (ACE_CDR::Boolean) 0; - return (ACE_CDR::Boolean) this->good_bit_; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_char (ACE_CDR::Char &x) -{ - if (this->char_translator_ == 0) - return this->read_1 (ACE_reinterpret_cast (ACE_CDR::Octet*, &x)); - return this->char_translator_->read_char (*this, x); -} - - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_short (ACE_CDR::Short &x) -{ - return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_ushort (ACE_CDR::UShort &x) -{ - return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*, &x)); -} - - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_long (ACE_CDR::Long &x) -{ - return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*, &x)); -} - - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_ulong (ACE_CDR::ULong &x) -{ - return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*, &x)); -} - - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_longlong (ACE_CDR::LongLong &x) -{ - return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_ulonglong (ACE_CDR::ULongLong &x) -{ - return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*,&x)); -} - -#if !defined (VXWORKS) || !defined (ghs) -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_float (ACE_CDR::Float &x) -{ - return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*, &x)); -} -#endif /* !VXWORKS || !ghs */ - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_double (ACE_CDR::Double &x) -{ - return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*, &x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_longdouble (ACE_CDR::LongDouble &x) -{ - return this->read_16 (ACE_reinterpret_cast (ACE_CDR::LongDouble*,&x)); -} - -ACE_INLINE size_t -ACE_InputCDR::length (void) const -{ - return this->start_.length (); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_char_array (ACE_CDR::Char* x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - if (this->char_translator_ == 0) - return this->read_array (x, - ACE_CDR::OCTET_SIZE, - ACE_CDR::OCTET_ALIGN, - length); - return this->char_translator_->read_char_array (*this, x, length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_wchar_array (ACE_CDR::WChar* x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_OutputCDR::wchar_maxbytes_ > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - if (this->wchar_translator_ != 0) - return this->wchar_translator_->read_wchar_array (*this, x, length); - if (ACE_OutputCDR::wchar_maxbytes_ != sizeof (ACE_CDR::WChar)) - return this->read_wchar_array_i (x, length); - return this->read_array (x, - sizeof (ACE_CDR::WChar), - sizeof (ACE_CDR::WChar) == 2 - ? ACE_CDR::SHORT_ALIGN - : ACE_CDR::LONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_octet_array (ACE_CDR::Octet* x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::OCTET_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - return this->read_array (x, - ACE_CDR::OCTET_SIZE, - ACE_CDR::OCTET_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_short_array (ACE_CDR::Short *x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::SHORT_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - return this->read_array (x, - ACE_CDR::SHORT_SIZE, - ACE_CDR::SHORT_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_ushort_array (ACE_CDR::UShort *x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::SHORT_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - return this->read_array (x, - ACE_CDR::SHORT_SIZE, - ACE_CDR::SHORT_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_long_array (ACE_CDR::Long *x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::LONG_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - return this->read_array (x, - ACE_CDR::LONG_SIZE, - ACE_CDR::LONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_ulong_array (ACE_CDR::ULong *x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::LONG_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - return this->read_array (x, - ACE_CDR::LONG_SIZE, - ACE_CDR::LONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_longlong_array (ACE_CDR::LongLong *x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::LONGLONG_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - return this->read_array (x, - ACE_CDR::LONGLONG_SIZE, - ACE_CDR::LONGLONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_ulonglong_array (ACE_CDR::ULongLong *x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::LONGLONG_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - return this->read_array (x, - ACE_CDR::LONGLONG_SIZE, - ACE_CDR::LONGLONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_float_array (ACE_CDR::Float *x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::LONG_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - return this->read_array (x, - ACE_CDR::LONG_SIZE, - ACE_CDR::LONG_ALIGN, - length); -} - - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_double_array (ACE_CDR::Double *x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::LONGLONG_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - - return this->read_array (x, - ACE_CDR::LONGLONG_SIZE, - ACE_CDR::LONGLONG_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::read_longdouble_array (ACE_CDR::LongDouble* x, - ACE_CDR::ULong length) -{ - // Make sure the length of the array isn't greater than the length of - // the stream. - if (length * ACE_CDR::LONGDOUBLE_SIZE > this->length()) - { - this->good_bit_ = 0; - return 0; - } - return this->read_array (x, - ACE_CDR::LONGDOUBLE_SIZE, - ACE_CDR::LONGDOUBLE_ALIGN, - length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_char (void) -{ - ACE_CDR::Char x; - return this->read_1 (ACE_reinterpret_cast (ACE_CDR::Octet*,&x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_octet (void) -{ - ACE_CDR::Octet x; - return this->read_1 (&x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_boolean (void) -{ - ACE_CDR::Octet tmp; - this->read_octet (tmp); - return (ACE_CDR::Boolean) this->good_bit_; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_short (void) -{ - ACE_CDR::Short x; - return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*,&x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_ushort (void) -{ - ACE_CDR::UShort x; - return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*,&x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_long (void) -{ - ACE_CDR::Long x; - return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*,&x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_ulong (void) -{ - ACE_CDR::ULong x; - return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*,&x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_longlong (void) -{ - ACE_CDR::LongLong x; - return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*,&x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_ulonglong (void) -{ - ACE_CDR::ULongLong x; - return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*,&x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_float (void) -{ - // Changing this removes the warning for GHS and it - // stops the compiler from getting an internal error. - ACE_CDR::ULong value; - return this->read_4 (&value); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_double (void) -{ - double x; - return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*,&x)); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_longdouble (void) -{ - ACE_CDR::LongDouble x; - return this->read_16 (ACE_reinterpret_cast (ACE_CDR::LongDouble*,&x)); -} - -ACE_INLINE char* -ACE_InputCDR::end (void) -{ - return this->start_.end (); -} - -ACE_INLINE void -ACE_InputCDR::rd_ptr (size_t offset) -{ - this->start_.rd_ptr (offset); -} - -ACE_INLINE char* -ACE_InputCDR::rd_ptr (void) -{ - return this->start_.rd_ptr (); -} - -ACE_INLINE char* -ACE_InputCDR::wr_ptr (void) -{ - return this->start_.wr_ptr (); -} - -ACE_INLINE int -ACE_InputCDR::adjust (size_t size, - size_t align, - char*& buf) -{ - buf = ACE_ptr_align_binary (this->rd_ptr (), align); - char *end = buf + size; - if (end <= this->wr_ptr ()) - { - this->start_.rd_ptr (end); - return 0; - } - - this->good_bit_ = 0; - return -1; -} - -ACE_INLINE int -ACE_InputCDR::adjust (size_t size, - char*& buf) -{ - return this->adjust (size, size, buf); -} - -ACE_INLINE const ACE_Message_Block* -ACE_InputCDR::start (void) const -{ - return &this->start_; -} - -ACE_INLINE int -ACE_InputCDR::good_bit (void) const -{ - return this->good_bit_; -} - -// **************************************************************** - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::Char x) -{ - os.write_char (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::Short x) -{ - os.write_short (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::UShort x) -{ - os.write_ushort (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::Long x) -{ - os.write_long (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::ULong x) -{ - os.write_ulong (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::LongLong x) -{ - os.write_longlong (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::ULongLong x) -{ - os.write_ulonglong (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::LongDouble x) -{ - os.write_longdouble (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::Float x) -{ - os.write_float (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_CDR::Double x) -{ - os.write_double (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, const ACE_CDR::Char *x) -{ - os.write_string (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, const ACE_CDR::WChar *x) -{ - os.write_wstring (x); - return (ACE_CDR::Boolean) os.good_bit (); -} - -// The following use the helper classes -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_boolean x) -{ - os.write_boolean (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_char x) -{ - os.write_char (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wchar x) -{ - os.write_wchar (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_octet x) -{ - os.write_octet (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x) -{ - ACE_CDR::ULong len = 0; - if (x.val_ != 0) - len = ACE_static_cast (ACE_CDR::ULong, ACE_OS_String::strlen (x.val_)); - os.write_string (len, x.val_); - return os.good_bit () && (len <= x.bound_); -} - -ACE_INLINE ACE_CDR::Boolean -operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wstring x) -{ - ACE_CDR::ULong len = 0;; - if (x.val_ != 0) - len = ACE_OS::wslen (x.val_); - os.write_wstring (len, x.val_); - return os.good_bit () && (len <= x.bound_); -} - -// **************************************************************** - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_CDR::Char &x) -{ - is.read_char (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_CDR::Short &x) -{ - is.read_short (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_CDR::UShort &x) -{ - is.read_ushort (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>>(ACE_InputCDR &is, ACE_CDR::Long &x) -{ - is.read_long (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_CDR::ULong &x) -{ - is.read_ulong (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR& is, ACE_CDR::LongLong &x) -{ - is.read_longlong (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR& is, ACE_CDR::ULongLong &x) -{ - is.read_ulonglong (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR& is, ACE_CDR::LongDouble &x) -{ - is.read_longdouble (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_CDR::Float &x) -{ - is.read_float (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_CDR::Double &x) -{ - is.read_double (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_CDR::Char *&x) -{ - is.read_string (x); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_CDR::WChar *&x) -{ - is.read_wstring (x); - return is.good_bit (); -} - -// The following use the helper classes -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_InputCDR::to_boolean x) -{ - is.read_boolean (x.ref_); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_InputCDR::to_char x) -{ - is.read_char (x.ref_); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_InputCDR::to_wchar x) -{ - is.read_wchar (x.ref_); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_InputCDR::to_octet x) -{ - is.read_octet (x.ref_); - return is.good_bit (); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_InputCDR::to_string x) -{ - is.read_string (ACE_const_cast (char *&, x.val_)); - // check if the bounds are satisfied - return (is.good_bit () && - (ACE_OS::strlen (x.val_) <= x.bound_)); -} - -ACE_INLINE ACE_CDR::Boolean -operator>> (ACE_InputCDR &is, ACE_InputCDR::to_wstring x) -{ - is.read_wstring (ACE_const_cast (ACE_CDR::WChar *&, x.val_)); - // check if the bounds are satisfied - return (is.good_bit () && - (ACE_OS::wslen (x.val_) <= x.bound_)); -} - -// *************************************************************************** -// We must define these methods here because they use the "read_*" inlined -// methods of the ACE_InputCDR class -// *************************************************************************** - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_boolean (ACE_InputCDR &stream) -{ - ACE_CDR::Boolean x; - return stream.read_boolean (x) ? this->write_boolean (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_char (ACE_InputCDR &stream) -{ - ACE_CDR::Char x; - return stream.read_char (x) ? this->write_char (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_wchar (ACE_InputCDR &stream) -{ - ACE_CDR::WChar x; - return stream.read_wchar (x) ? this->write_wchar (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_octet (ACE_InputCDR &stream) -{ - ACE_CDR::Octet x; - return stream.read_octet (x) ? this->write_octet (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_short (ACE_InputCDR &stream) -{ - ACE_CDR::Short x; - return stream.read_short (x) ? this->write_short (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_ushort (ACE_InputCDR &stream) -{ - ACE_CDR::UShort x; - return stream.read_ushort (x) ? this->write_ushort (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_long (ACE_InputCDR &stream) -{ - ACE_CDR::Long x; - return stream.read_long (x) ? this->write_long (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_ulong (ACE_InputCDR &stream) -{ - ACE_CDR::ULong x; - return stream.read_ulong (x) ? this->write_ulong (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_longlong (ACE_InputCDR &stream) -{ - ACE_CDR::LongLong x; - return stream.read_longlong (x) ? this->write_longlong (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_ulonglong (ACE_InputCDR &stream) -{ - ACE_CDR::ULongLong x; - return stream.read_ulonglong (x) ? this->write_ulonglong (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_float (ACE_InputCDR &stream) -{ - ACE_CDR::Float x; - return stream.read_float (x) ? this->write_float (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_double (ACE_InputCDR &stream) -{ - ACE_CDR::Double x; - return stream.read_double (x) ? this->write_double (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_longdouble (ACE_InputCDR &stream) -{ - ACE_CDR::LongDouble x; - return stream.read_longdouble (x) ? this->write_longdouble (x) : (ACE_CDR::Boolean) 0; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_string (ACE_InputCDR &stream) -{ - ACE_CDR::Char *x; - ACE_CDR::Boolean flag = - (stream.read_string (x) ? this->write_string (x) : (ACE_CDR::Boolean) 0); - delete [] x; - return flag; -} - -ACE_INLINE ACE_CDR::Boolean -ACE_OutputCDR::append_wstring (ACE_InputCDR &stream) -{ - ACE_CDR::WChar *x; - ACE_CDR::Boolean flag = - (stream.read_wstring (x) ? this->write_wstring (x) : (ACE_CDR::Boolean) 0); - delete [] x; - return flag; -} - -ACE_INLINE void -ACE_InputCDR::reset_byte_order (int byte_order) -{ - this->do_byte_swap_ = (byte_order != ACE_CDR_BYTE_ORDER); -} - -ACE_INLINE int -ACE_InputCDR::do_byte_swap (void) const -{ - return this->do_byte_swap_; -} - -ACE_INLINE int -ACE_InputCDR::byte_order (void) const -{ - if (this->do_byte_swap ()) - return !ACE_CDR_BYTE_ORDER; - else - return ACE_CDR_BYTE_ORDER; -} - -ACE_INLINE int -ACE_InputCDR::align_read_ptr (size_t alignment) -{ - char *buf = ACE_ptr_align_binary (this->rd_ptr (), - alignment); - - if (buf <= this->wr_ptr ()) - { - this->start_.rd_ptr (buf); - return 0; - } - - this->good_bit_ = 0; - return -1; -} - -ACE_INLINE int -ACE_InputCDR::set_version (ACE_CDR::Octet major, - ACE_CDR::Octet minor) -{ - this->major_version_ = major; - this->minor_version_ = minor; - return 0; -} - -ACE_INLINE int -ACE_InputCDR::get_version (ACE_CDR::Octet &major, - ACE_CDR::Octet &minor) -{ - major = this->major_version_; - minor = this->minor_version_; - return 0; -} - -ACE_INLINE ACE_Char_Codeset_Translator * -ACE_InputCDR::char_translator (void) const -{ - return this->char_translator_; -} - -ACE_INLINE ACE_WChar_Codeset_Translator * -ACE_InputCDR::wchar_translator (void) const -{ - return this->wchar_translator_; -} - - -ACE_INLINE void -ACE_InputCDR::char_translator (ACE_Char_Codeset_Translator * ctran) -{ - this->char_translator_ = ctran; -} - -ACE_INLINE void -ACE_InputCDR::wchar_translator (ACE_WChar_Codeset_Translator * wctran) -{ - this->wchar_translator_ = wctran; -} - -// **************************************************************** - -ACE_INLINE ACE_CDR::Boolean -ACE_Char_Codeset_Translator::read_1 (ACE_InputCDR& input, - ACE_CDR::Octet *x) -{ - return input.read_1 (x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_Char_Codeset_Translator::write_1 (ACE_OutputCDR& output, - const ACE_CDR::Octet *x) -{ - return output.write_1 (x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_Char_Codeset_Translator::read_array (ACE_InputCDR& in, - void* x, - size_t size, - size_t align, - ACE_CDR::ULong length) -{ - return in.read_array (x, size, align, length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_Char_Codeset_Translator::write_array (ACE_OutputCDR& out, - const void *x, - size_t size, - size_t align, - ACE_CDR::ULong length) -{ - return out.write_array(x, size, align, length); -} - -ACE_INLINE int -ACE_Char_Codeset_Translator::adjust (ACE_OutputCDR& out, - size_t size, - size_t align, - char *&buf) -{ - return out.adjust(size, align, buf); -} - -ACE_INLINE void -ACE_Char_Codeset_Translator::good_bit (ACE_OutputCDR& out, int bit) -{ - out.good_bit_ = bit; -} - -ACE_INLINE ACE_CDR::Octet -ACE_Char_Codeset_Translator::major_version (ACE_InputCDR& input) -{ - return input.major_version_; -} - -ACE_INLINE ACE_CDR::Octet -ACE_Char_Codeset_Translator::minor_version (ACE_InputCDR& input) -{ - return input.minor_version_; -} - -ACE_INLINE ACE_CDR::Octet -ACE_Char_Codeset_Translator::major_version (ACE_OutputCDR& output) -{ - return output.major_version_; -} - -ACE_INLINE ACE_CDR::Octet -ACE_Char_Codeset_Translator::minor_version (ACE_OutputCDR& output) -{ - return output.minor_version_; -} - -// **************************************************************** - -ACE_INLINE ACE_CDR::Boolean -ACE_WChar_Codeset_Translator::read_1 (ACE_InputCDR& input, - ACE_CDR::Octet *x) -{ - return input.read_1 (x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_WChar_Codeset_Translator::read_2 (ACE_InputCDR& input, - ACE_CDR::UShort *x) -{ - return input.read_2 (x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_WChar_Codeset_Translator::read_4 (ACE_InputCDR& input, - ACE_CDR::ULong *x) -{ - return input.read_4 (x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_WChar_Codeset_Translator::write_1 (ACE_OutputCDR& output, - const ACE_CDR::Octet *x) -{ - return output.write_1 (x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_WChar_Codeset_Translator::write_2 (ACE_OutputCDR& output, - const ACE_CDR::UShort *x) -{ - return output.write_2 (x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_WChar_Codeset_Translator::write_4 (ACE_OutputCDR& output, - const ACE_CDR::ULong *x) -{ - return output.write_4 (x); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_WChar_Codeset_Translator::read_array (ACE_InputCDR& in, - void* x, - size_t size, - size_t align, - ACE_CDR::ULong length) -{ - return in.read_array (x, size, align, length); -} - -ACE_INLINE ACE_CDR::Boolean -ACE_WChar_Codeset_Translator::write_array (ACE_OutputCDR& out, - const void *x, - size_t size, - size_t align, - ACE_CDR::ULong length) -{ - return out.write_array(x, size, align, length); -} - -ACE_INLINE int -ACE_WChar_Codeset_Translator::adjust (ACE_OutputCDR& out, - size_t size, - size_t align, - char *&buf) -{ - return out.adjust(size, align, buf); -} - -ACE_INLINE void -ACE_WChar_Codeset_Translator::good_bit (ACE_OutputCDR& out, int bit) -{ - out.good_bit_ = bit; -} - -ACE_INLINE ACE_CDR::Octet -ACE_WChar_Codeset_Translator::major_version (ACE_InputCDR& input) -{ - return input.major_version_; -} - -ACE_INLINE ACE_CDR::Octet -ACE_WChar_Codeset_Translator::minor_version (ACE_InputCDR& input) -{ - return input.minor_version_; -} - -ACE_INLINE ACE_CDR::Octet -ACE_WChar_Codeset_Translator::major_version (ACE_OutputCDR& output) -{ - return output.major_version_; -} - -ACE_INLINE ACE_CDR::Octet -ACE_WChar_Codeset_Translator::minor_version (ACE_OutputCDR& output) -{ - return output.minor_version_; -} diff --git a/ace/CE_Screen_Output.cpp b/ace/CE_Screen_Output.cpp deleted file mode 100644 index dd36a8385bb..00000000000 --- a/ace/CE_Screen_Output.cpp +++ /dev/null @@ -1,155 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "ace/CE_Screen_Output.h" -#if defined (ACE_HAS_WINCE) - -#include "ace/Log_Msg.h" - -ACE_CE_Screen_Output::ACE_CE_Screen_Output(HWND hEdit) -: handler_(hEdit) -, pFile_(0) -{ -} - -ACE_CE_Screen_Output::ACE_CE_Screen_Output() -: handler_(0) -, pFile_(0) -{ -} - -ACE_CE_Screen_Output::~ACE_CE_Screen_Output() -{ - if (pFile_ != 0) { - fclose(pFile_); - } -} - -void ACE_CE_Screen_Output::log(ACE_Log_Record &log_record) -{ - ACE_TCHAR verbose_msg[ACE_Log_Record::MAXVERBOSELOGMSGLEN]; - int result = log_record.format_msg (ACE_LIB_TEXT("WindozeCE"), // host name - 0, // verbose flag - verbose_msg); - - if (result == 0) - { - verbose_msg[ ACE_OS::strlen(verbose_msg) - 1 ] = 0; // CE does not like '\n' by itself. - *this << verbose_msg << endl; - } -} - -void ACE_CE_Screen_Output::SetOutputWindow(HWND hEdit) -{ - handler_ = hEdit; -} - -void ACE_CE_Screen_Output::clear() -{ - SetWindowText(handler_, 0); -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_TCHAR* output) -{ - int length = GetWindowTextLength(handler_); - SendMessage(handler_, EM_SETSEL, length, length); - SendMessage(handler_, EM_REPLACESEL, 0, (LPARAM)output); - - if (pFile_ != 0) - { - fwprintf(pFile_, L"%s", output); - } - - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_TCHAR* output) -{ - ACE_TCHAR* buffer = ACE_OS::strdup(output); - if (buffer != 0) - { - *this << buffer; - delete buffer; - } - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_ANTI_TCHAR* output) -{ - *this << ACE_TEXT_CHAR_TO_TCHAR(output); - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_ANTI_TCHAR* output) -{ - *this << ACE_TEXT_CHAR_TO_TCHAR(output); - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (char output) -{ - *this << (int)output; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned char output) -{ - *this << (int)output; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned short output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%u"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (int output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%d"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned int output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%du"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (float output) -{ - ACE_TCHAR buffer[20]; - swprintf(buffer, ACE_LIB_TEXT("%f"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (long output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%l"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned long output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%lu"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (FILE* pFile) -{ - pFile_ = pFile; - return *this; -} - -#endif // ACE_HAS_WINCE diff --git a/ace/CE_Screen_Output.h b/ace/CE_Screen_Output.h deleted file mode 100644 index 0571fe39b88..00000000000 --- a/ace/CE_Screen_Output.h +++ /dev/null @@ -1,103 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CE_Screen_Output.h - * - * $Id$ - * - * @author Si Mong Park - */ -//============================================================================= - -#ifndef ACE_CE_SCREEN_OUTPUT_H -#define ACE_CE_SCREEN_OUTPUT_H - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_WINCE) - -#include "ace/OS.h" -#include "ace/Log_Msg_Callback.h" -#include "ace/Log_Record.h" - -const ACE_TCHAR endl[] = ACE_LIB_TEXT("\r\n"); -const ACE_TCHAR tab[] = ACE_LIB_TEXT("\t"); - -/** - * @class ACE_CE_Screen_Output - * - * @brief Replacement of text output for Windows CE. - * - * This class allows standard text output to be displayed on - * text window for Windows CE. Generally, all ACE output will - * go through under CE if and only if user uses WindozeCE - * implementation by using main_ce instead of main. - * Also, for the easier debugging purpose, object pointer of - * this class can be gotten from ACE_Log_Msg::msg_callback() - * and then can be used directly by user just like cout stream. - */ -class ACE_Export ACE_CE_Screen_Output : public ACE_Log_Msg_Callback -{ -public: - - ACE_CE_Screen_Output (HWND hEdit); - - ACE_CE_Screen_Output (void); - - virtual ~ACE_CE_Screen_Output(); - - /// Implementation of pure virtual function from ACE_Log_Msg_Callback. - virtual void log (ACE_Log_Record &log_record); - - /// Interface to specify active window handle. - void SetOutputWindow (HWND hWnd); - - void clear (void); - - /// Stream insertion operator that performs actual print out. - /** - * @note This is the only one operator that performs output. All - * other perators convert the type and use this operator - * underneath. - */ - ACE_CE_Screen_Output& operator << (ACE_TCHAR*); - ACE_CE_Screen_Output& operator << (const ACE_TCHAR*); - - ACE_CE_Screen_Output& operator << (ACE_ANTI_TCHAR* output); - ACE_CE_Screen_Output& operator << (const ACE_ANTI_TCHAR* output); - - ACE_CE_Screen_Output& operator << (char output); - ACE_CE_Screen_Output& operator << (unsigned char output); - - ACE_CE_Screen_Output& operator << (unsigned short output); - - ACE_CE_Screen_Output& operator << (int output); - ACE_CE_Screen_Output& operator << (unsigned int output); - - ACE_CE_Screen_Output& operator << (float output); - - ACE_CE_Screen_Output& operator << (long output); - ACE_CE_Screen_Output& operator << (unsigned long output); - - ACE_CE_Screen_Output& operator << (FILE* pFile); - -private: - - ACE_CE_Screen_Output(ACE_CE_Screen_Output&); - -private: - - HWND handler_; - - /// FILE pointer that used to save output to file. This class does - /// not own the file handler pointer. - FILE* pFile_; -}; - -#endif // ACE_HAS_WINCE -#endif // ACE_CE_SCREEN_OUTPUT_H diff --git a/ace/CLASSIX/CLASSIX_Addr.cpp b/ace/CLASSIX/CLASSIX_Addr.cpp deleted file mode 100644 index faafc29109d..00000000000 --- a/ace/CLASSIX/CLASSIX_Addr.cpp +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Defines the ClassiX IPC address family address format. - -#define ACE_BUILD_DLL -#include "ace/CLASSIX/CLASSIX_Addr.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Addr.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Addr) diff --git a/ace/CLASSIX/CLASSIX_Addr.h b/ace/CLASSIX/CLASSIX_Addr.h deleted file mode 100644 index 21089659649..00000000000 --- a/ace/CLASSIX/CLASSIX_Addr.h +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ACE -// -// = FILENAME -// CLASSIX_Addr.h -// -// = AUTHOR -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_ADDR_H -#include "ace/pre.h" -#define ACE_CLASSIX_ADDR_H - -#include "ace/ACE.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Addr.h" - -#include -#include - -class ACE_Export ACE_CLASSIX_Addr : public ACE_Addr -{ - // = TITLE - // Defines the ClassiX IPC address format. - // - // = DESCRIPTION - // This class defines basic interfaces for "ACE-like" address for - // Chorus port. -public: - enum - { - ACE_CLASSIX_ADDR_UNKNOWN = ACE_INVALID_HANDLE, /* K_NONEPORT */ - ACE_CLASSIX_ADDR_DEFAULT = K_DEFAULTPORT, - AF_CLASSIX = AF_MAX + 1 - }; - - enum Addr_Type - { - PORT, // use Peer_Port - GROUP, // use Peer_Group - STAMP, // use peer_Stamp - DYNAMIC, // use Peer_Group - UNDEFINED - }; - - - /* -----------------------------------------------------*/ - // = INITIALIZATION - ACE_CLASSIX_Addr(int /* size of the underlying address structure*/); - virtual ~ACE_CLASSIX_Addr (void); - - - /* -----------------------------------------------------*/ - // = Direct initialization methods (useful after the object has been - // constructed). - // Returns 0 on success, -1 otherwise. - // - - /* -----------------------------------------------------*/ - // = ACCESS - // - virtual const KnUniqueId& get_id (void) const; - // Returns a reference to the unique identifier - - virtual ACE_HANDLE get_port_number(void) const; - virtual ACE_HANDLE get_handle(void) const; - // Returns the local port no( can be used as an ACE_HANDLE) - - virtual int is_configured(void) const; - // Returns 1, if address information is proper; Returns 0 otherwise - virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const; - // returns the type of the address - - // = HELPER - virtual void dump(void) const; - - ACE_ALLOC_HOOK_DECLARE; - // Declares the dynamic allocation hooks. - -private: -}; - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Addr.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_ADDR_H */ diff --git a/ace/CLASSIX/CLASSIX_Addr.i b/ace/CLASSIX/CLASSIX_Addr.i deleted file mode 100644 index 13cc5fd48e3..00000000000 --- a/ace/CLASSIX/CLASSIX_Addr.i +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// CLASSIX_Addr.i - -ACE_INLINE -ACE_CLASSIX_Addr::ACE_CLASSIX_Addr(int theSize) - : ACE_Addr (AF_CLASSIX, theSize) -{ -} - -ACE_INLINE -ACE_CLASSIX_Addr::~ACE_CLASSIX_Addr(void) -{ -} - -ACE_INLINE -const KnUniqueId& -ACE_CLASSIX_Addr::get_id(void) const -{ - return ACE_CLASSIX_OS::null_KnUniqueId(); -} - -ACE_INLINE -ACE_HANDLE -ACE_CLASSIX_Addr::get_handle(void) const -{ - return ACE_INVALID_HANDLE; -} - -ACE_INLINE -ACE_HANDLE -ACE_CLASSIX_Addr::get_port_number(void) const -{ - return get_handle(); -} - -ACE_INLINE -int -ACE_CLASSIX_Addr::is_configured(void) const -{ - return 0; -} - -ACE_INLINE -ACE_CLASSIX_Addr::Addr_Type -ACE_CLASSIX_Addr::is_type(void) const -{ - return ACE_CLASSIX_Addr::UNDEFINED; -} - -ACE_INLINE -void -ACE_CLASSIX_Addr::dump(void) const -{ -} diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.cpp b/ace/CLASSIX/CLASSIX_CLD_Connector.cpp deleted file mode 100644 index 1baf897b75b..00000000000 --- a/ace/CLASSIX/CLASSIX_CLD_Connector.cpp +++ /dev/null @@ -1,116 +0,0 @@ -// $Id$ -/* -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_CLD_Connector.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// -// ============================================================================ -*/ -#define ACE_BUILD_DLL -#include "ace/CLASSIX/CLASSIX_CLD_Connector.h" -#include "ace/CLASSIX/CLASSIX_Addr.h" - -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_CLD_Connector) - -#if !defined (__ACE_INLINE__) -#include "CLASSIX_CLD_Connector.i" -#endif /* __ACE_INLINE__ */ -/* ------------------------------------------------------------------------- */ - -ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector ( - ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms, - int protocol_family, - int protocol) -{ - ACE_TRACE ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector"); - if (this->connect (new_stream, remote_sap, timeout, local_sap, - reuse_addr, flags, perms, - protocol_family, protocol) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), ACE_TEXT - ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector"))); -} - -// Set up remote port information -int -ACE_CLASSIX_CLD_Connector::connect (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr & theRemote,/* remote_sap */ - ACE_Time_Value *, /* timeout */ - const ACE_Addr & theLocal, - int, /* reuse_addr */ - int theFlag, /* flags */ - int, /* perms */ - int theProtocolFamily, - int /* protocol */) - -{ - ACE_TRACE ("ACE_CLASSIX_CLD_Connector::connect"); - // - // Set up peer SAP - // - if (theRemote == ACE_Addr::sap_any || - new_stream.set_peer_sap(theRemote) != 0) - ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_CLD_Connector::connect()::" - "Invalid Connector SAP\n"), -1); - - // - // Set up local SAP - // - if (theLocal == ACE_Addr::sap_any) - { - // if local sap has not been configured - // create a port and use it as the local SAP - new_stream.open(); - } - else - { - // replace the local SAP information - new_stream.close(); - new_stream.open(theLocal); - } - - // - // Make the local SAP "selectable", if requested via the flag - // - if (new_stream.local_sap().is_configured() && - new_stream.peer_sap().is_configured() && /* remote sap info exist */ - theProtocolFamily == ACE_CLASSIX_Addr::AF_CLASSIX) - { - new_stream.control(); - // setup the default delivery mode, if applicable - if (theFlag & ACE_CLASSIX_CLD_Connector::ENABLE) - { - if (new_stream.selectable() == 0) - return 0; - else - return -1; - } - return 0; - } - else - { - return -1; - } -} - -void -ACE_CLASSIX_CLD_Connector::dump (void) const -{ - ACE_TRACE ("ACE_CLASSIX_CLD_Connector::dump"); -} - -/* ------------------------------------------------------------------------- */ diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.h b/ace/CLASSIX/CLASSIX_CLD_Connector.h deleted file mode 100644 index 324d484e65e..00000000000 --- a/ace/CLASSIX/CLASSIX_CLD_Connector.h +++ /dev/null @@ -1,134 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -/* -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_CLD_Connector.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ -*/ - -#ifndef ACE_CLASSIX_CLD_CONNECTOR_H -#include "ace/pre.h" -#define ACE_CLASSIX_CLD_CONNECTOR_H - -#include "ace/CLASSIX/CLASSIX_Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/* ------------------------------------------------------------------------- */ - -class ACE_CLASSIX_CLD_Connector - // = TITLE - // Defines an CLASSIX IPC connectionless connection factory for the - // template methods in . - // - // = DESCRIPTION - // This is used when a client needs to communicate with a server - // whose SAP address is known beforehand. - // - // Although there is a connection - // procedure, no connection is actually taken place - // between the client and server, since Chorus IPC does not have - // connection semantics. - // The connect procedure is necessary for - // compatibility with class. - // - // This class will simplify the client's - // program, since it provides connection-like communication - // mechanism. - // - // = NOTES - // The server in this case trusts everyone who lands on the - // server's SAP. - // - // = SEE ALSO - // ACE_CLASSIX_COD_Connector -{ - public: - // = Connect options - enum OPTIONS - { - // Do not enable the local SAP - // (so that the Reactor will not monitor the port) - ENABLE = 0x1 - }; - - // = Initialization routines. - ACE_CLASSIX_CLD_Connector (void); - // Default constructor. - - ACE_CLASSIX_CLD_Connector (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap - = ACE_Addr::sap_any, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family - = ACE_CLASSIX_Addr::AF_CLASSIX, - int protocol = 0); - // Emulates connection semantics so that it can be plugged into - // - // Actively connect local SAP and remote SAP togeter. - // Produce a if things go well. - // - // is the peer's address. In ACE_SOCK_Connector it refers to - // the acceptor's address. In connectionless mode, we do not have - // an acceptor. The address will be copied to the new stream - // if things goes well. - // - // If refers to any address, a port will be - // allocated and will be used as a local SAP. - // - // The rest parameters are there so that this class can be plugged into - // . - - virtual int connect (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap = ACE_Addr::sap_any, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, - int protocol = 0); - - // Factory method used in ::connect_svc_handler() - - // Initialization method when default constructor is used. - // See the comments for the corresponding constructor - - virtual int reset_new_handle (ACE_HANDLE handle); - // Factory method used in ACE_Connector::handle_output(). - // Meant for resetting any event associations on this handle - // Does nothig. - - // = HELPER - void dump(void) const; - - private: - - ACE_CLASSIX_CLD_Connector(ACE_CLASSIX_CLD_Connector const&); - ACE_CLASSIX_CLD_Connector const& operator=(ACE_CLASSIX_CLD_Connector const&); -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_CLD_Connector.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_CLD_CONNECTOR_H */ diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.i b/ace/CLASSIX/CLASSIX_CLD_Connector.i deleted file mode 100644 index 8592b7825d2..00000000000 --- a/ace/CLASSIX/CLASSIX_CLD_Connector.i +++ /dev/null @@ -1,24 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -// -// CLASSIX/CLD_Connector.i -/* ------------------------------------------------------------------------- */ - -// Do-nothing constructor... - -ACE_INLINE -ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector (void) -{ - ACE_TRACE ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector"); -} - -ACE_INLINE -int -ACE_CLASSIX_CLD_Connector::reset_new_handle (ACE_HANDLE /* handle */) -{ - return 0; -} - -/* ------------------------------------------------------------------------- */ - - diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp b/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp deleted file mode 100644 index b46d594c262..00000000000 --- a/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp +++ /dev/null @@ -1,199 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "CLASSIX_CO_Acceptor.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "CLASSIX_CO_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/Synch.h" - -ACE_ALLOC_HOOK_DEFINE (ACE_CLASSIX_CO_Acceptor) - -// General purpose routine for performing server creation. - -ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap, - int reuse_addr, - int protocol_family, - int backlog, - int protocol, - ACE_Reactor* theReactor) - : port_ (0), - reactor_ (theReactor) -{ - ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor"); - if (this->open (local_sap, reuse_addr, protocol_family, - backlog, protocol, theReactor) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_CLASSIX_CO_Acceptor"))); -} - -// General purpose routine for performing server creation. - -int -ACE_CLASSIX_CO_Acceptor::open (const ACE_Addr & theLocalSap, - int /* reuse_addr */, - int theProtocolFamily, - int /* backlog */, - int /* protocol */, - ACE_Reactor* theReactor) -{ - // make sure that the client requests for a "CLASSIX" family. - - if (theProtocolFamily != ACE_CLASSIX_Addr::AF_CLASSIX) - return -1; - - // Setup local address - - int error = 0; - if (theLocalSap == ACE_Addr::sap_any) - { - this->port_ = new ACE_CLASSIX_Port_Core (); - ACE_ASSERT (this->port_); - error = this->addr_.set (*this->port_); - } - else - error = this->addr_.set (theLocalSap); - - if (error != 0) - ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Acceptor::open ()::" - "Cannot setup address\n"), -1); - - // Make the port "selectable" - - if (this->addr_.selectable () != 0) - ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Acceptor::open ()::" - "Cannot enable port\n"), -1); - - this->reactor_ = theReactor; - return 0; -} - -// General purpose routine for accepting new connections. - -int -ACE_CLASSIX_CO_Acceptor::accept (ACE_CLASSIX_Stream &new_stream, - ACE_Addr *remote_addr, - ACE_Time_Value* /* timeout */, - int /* restart */, - int /* reset_new_handle */) const -{ - ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::accept"); - - // Get peer's address info - - size_t size = 0; - if (this->reactor_->current_info (this->get_handle (), size) - == -1) - ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Acceptor:.accept ()::" - "Cannot get peer addr\n"), -1); - - ACE_CLASSIX_CO_Acceptor::Peer_Union data; - ACE_CLASSIX_Msg rmsg (&data, sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union)); - if (size != sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union) - || ::ipcGetData (rmsg.get ()) != size) - ACE_ERROR_RETURN ((LM_ERROR, "%t" - "ACE_CLASSIX_CO_Acceptor::accept::ipcGetData (%d)\n", - size), - -1); - - // Set up Peer SAP - - int error = 0; - switch (data.type) - { - case ACE_CLASSIX_Addr::PORT: - error = new_stream.set_peer_sap (data.choose.port.peer); - break; - - case ACE_CLASSIX_Addr::GROUP: - error = new_stream.set_peer_sap (data.choose.group.peer); - break; - - case ACE_CLASSIX_Addr::STAMP: - error = new_stream.set_peer_sap (data.choose.stamp.peer); - break; - - case ACE_CLASSIX_Addr::DYNAMIC: - error = new_stream.set_peer_sap (data.choose.group.peer); - break; - - default: - ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Accept::accept ()::" - "Invalid peer address\n"), -1); - } - - if (error != 0) - ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Accept::accept ()::" - "cannot set peer address\n"), -1); - - // Set up local SAP & tell the peer - - data.type = ACE_CLASSIX_Addr::UNDEFINED; - - if (remote_addr != 0) - { - if (remote_addr->get_type () == ACE_CLASSIX_Addr::AF_CLASSIX && - ((ACE_CLASSIX_Addr*) remote_addr)->is_type == - ACE_CLASSIX_Addr::PORT) - { - new_stream.get_local_sap ().set (*remote_addr); - data.type = ACE_CLASSIX_Addr::PORT; - } - } - else - { - ACE_CLASSIX_Port_Core *port = new ACE_CLASSIX_Port_Core (); - if (new_stream.set_local_port (port) == 0) - data.type = ACE_CLASSIX_Addr::PORT;; - } - - data.choose.port.peer = - new_stream.get_local_sap ().get_addr ().get_id (); - - ACE_CLASSIX_Msg smsg (&data, sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union)); - - if (::ipcReply (smsg.get ()) != 0) - ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Accept::accept ()::" - "cannot deliver server address to peer\n"), -1); - - // Make new_stream's local SAP selectable. - if (new_stream.selectable () != 0) - return -1; - - return 0; -} - -int -ACE_CLASSIX_CO_Acceptor::close (void) -{ - ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::close"); - int result = 0; - - if (this->get_handle () != ACE_INVALID_HANDLE) - { - delete this->port_; - this->port_ = 0; - ((ACE_CLASSIX_Port) this->addr_.get_addr ()).clear (); - } - return 0; -} - - -int -ACE_CLASSIX_CO_Acceptor::get_local_addr (ACE_Addr &theAddr) const -{ - int size = theAddr.get_size (); - if (size < this->addr_.get_addr ().get_size ()) - return -1; - - return this->addr_.get_addr (theAddr); -} - -void -ACE_CLASSIX_CO_Acceptor::dump (void) const -{ - ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::dump"); -} diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.h b/ace/CLASSIX/CLASSIX_CO_Acceptor.h deleted file mode 100644 index b095b394ba7..00000000000 --- a/ace/CLASSIX/CLASSIX_CO_Acceptor.h +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ACE -// -// = FILENAME -// CLASSIX_CO_Acceptor.h -// -// = AUTHOR -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_CO_ACCEPTOR_H -#include "ace/pre.h" -#define ACE_CLASSIX_CO_ACCEPTOR_H - -#include "ace/CLASSIX/CLASSIX_Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Time_Value.h" - -class ACE_Export ACE_CLASSIX_CO_Acceptor -{ - // = TITLE - // Defines the format and interface for a connection - // oriented acceptor. - // - // = DESCRIPTION - // This class is the counter part of the - // class. It exchanges SAP information to set up a logical - // connection. - // - // Data format passed between a connector and this class uses - // Peer_Union structure. - // - // = SEE ALSO - // ACE_CLASSIX_Connector - // -public: - struct Peer_Port - { - KnUniqueId peer; - }; - - struct Peer_Group - { - KnCap peer; - }; - - struct Peer_Stamp - { - int peer; - }; - - struct Peer_Union - { - int type; - union - { - Peer_Port port; - Peer_Group group; - Peer_Stamp stamp; - }choose; - }; - - // = Initialization methods. - ACE_CLASSIX_CO_Acceptor (ACE_Reactor* = ACE_Reactor::instance()); - // Default constructor. - - ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, - int backlog = 0, - int protocol = 0, - ACE_Reactor* = ACE_Reactor::instance()); - // Initiate a passive mode socket. - - virtual ~ACE_CLASSIX_CO_Acceptor (void); - // Default dtor. - - int open (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, - int backlog = 5, - int protocol = 0, - ACE_Reactor* = ACE_Reactor::instance()); - // Initiate a passive mode socket. - int close (void); - // Closes down the listening port. - - // = Passive connection acceptance method. - int accept (ACE_CLASSIX_Stream &new_stream, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; - // Accept a new data transfer connection. A of 0 means - // block forever, a of {0, 0} means poll. == 1 - // means "restart if interrupted." - - // = ACCESS - ACE_HANDLE get_handle (void) const; - // Get the underlying descriptor. - int get_local_addr (ACE_Addr &) const; - // Return the local endpoint address in the referenced ACE_Addr. - // Returns 0 if successful, else -1. - - void reactor(ACE_Reactor*); - // reset the reactor - - // = META-TYPE info - typedef ACE_CLASSIX_Addr PEER_ADDR; - typedef ACE_CLASSIX_Stream PEER_STREAM; - - void dump (void) const; - // Dump the state of an object. - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -protected: - -private: - - ACE_CLASSIX_Port_Core *port_; - // optional port. - // If 0, default port is used. - ACE_CLASSIX_SAP addr_; - - ACE_Reactor *reactor_; - // for reference only. Does not own it -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/CLASSIX/CLASSIX_CO_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_CO_ACCEPTOR_H */ diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.i b/ace/CLASSIX/CLASSIX_CO_Acceptor.i deleted file mode 100644 index d15dedd007d..00000000000 --- a/ace/CLASSIX/CLASSIX_CO_Acceptor.i +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Do nothing routine for constructor. -ACE_INLINE -ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor (ACE_Reactor* theReactor) - : port_ (0), - reactor_ (theReactor) -{ - ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor"); -} - -ACE_INLINE -ACE_CLASSIX_CO_Acceptor::~ACE_CLASSIX_CO_Acceptor(void) -{ - delete this->port_; -} - -ACE_INLINE -void -ACE_CLASSIX_CO_Acceptor::reactor(ACE_Reactor* theReactor) -{ - this->reactor_ = theReactor; -} - -ACE_INLINE -ACE_HANDLE -ACE_CLASSIX_CO_Acceptor::get_handle(void) const -{ - return this->addr_.get_handle(); -} diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.cpp b/ace/CLASSIX/CLASSIX_CO_Connector.cpp deleted file mode 100644 index 12280142b2b..00000000000 --- a/ace/CLASSIX/CLASSIX_CO_Connector.cpp +++ /dev/null @@ -1,118 +0,0 @@ -// $Id$ -/* -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_CO_Connector.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ -*/ -#define ACE_BUILD_DLL -#include "ace/CLASSIX/CLASSIX_CO_Connector.h" -#include "ace/CLASSIX/CLASSIX_CO_Acceptor.h" - -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_CO_Connector) - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_CO_Connector.i" -#endif /* __ACE_INLINE__ */ -/* ------------------------------------------------------------------------- */ - -// Set up remote port information - -int -ACE_CLASSIX_CO_Connector::connect (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr & theAcceptor,/* acceptor */ - ACE_Time_Value * theTimeout, /* timeout */ - const ACE_Addr & theLocal, - int theReuse, - int theFlag, - int thePerm, - int theProtocolFamily, - int theProtocol) - -{ - // - // set up local SAP and connector info in - // - if (this->ACE_CLASSIX_CLD_Connector:: - connect(new_stream, - theAcceptor, - theTimeout, - theLocal, - theReuse, - theFlag & (~ACE_CLASSIX_CLD_Connector::ENABLE), - thePerm, - theProtocolFamily, - theProtocol) != 0) - return -1; - - // - // make a connection - // - // Tell the connector my own SAP - ACE_CLASSIX_CO_Acceptor::Peer_Union peer; - size_t size = sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union); - peer.type = ACE_CLASSIX_Addr::PORT; - peer.choose.port.peer = new_stream.local_sap().get_addr().get_id(); - - if (new_stream.send((void*) &peer, size) != size) - ACE_ERROR_RETURN((LM_ERROR, "%t|%P|%p\n", - "ACE_CLASSIX_Connector::connect()::send:"), -1); - // Wait for peer SAP information from the acceptor - if (new_stream.ipcRecv((void*) &peer, size, 0, theTimeout) != size) - ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Connector::connect()::" - "unable to receive connect response\n"), -1); - - int error = 0; - switch (peer.type) - { - case ACE_CLASSIX_Addr::PORT: - error = new_stream.set_peer_sap(peer.choose.port.peer); - break; - - case ACE_CLASSIX_Addr::GROUP: - error = new_stream.set_peer_sap(peer.choose.group.peer); - break; - - case ACE_CLASSIX_Addr::STAMP: - error = new_stream.set_peer_sap(peer.choose.stamp.peer); - break; - - case ACE_CLASSIX_Addr::DYNAMIC: - error = new_stream.set_peer_sap(peer.choose.group.peer); - break; - - default: - ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Connect::connect()::" - "Invalid peer address\n"), -1); - } - - if (error != 0) - ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Connector::connect()::" - "unable to receive connect response\n"), -1); - - - // - // Make the local SAP "selectable" - // - if (theFlag & ACE_CLASSIX_CO_Connector::ENABLE && - new_stream.selectable() != 0) - return -1; - - return 0; -} - -void -ACE_CLASSIX_CO_Connector::dump (void) const -{ - ACE_TRACE ("ACE_CLASSIX_CO_Connector::dump"); -} - -/* ------------------------------------------------------------------------- */ diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.h b/ace/CLASSIX/CLASSIX_CO_Connector.h deleted file mode 100644 index b59e04a72e2..00000000000 --- a/ace/CLASSIX/CLASSIX_CO_Connector.h +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -/* -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_CO_Connector.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ -*/ - -#ifndef ACE_CLASSIX_CO_CONNECTOR_H -#include "ace/pre.h" -#define ACE_CLASSIX_CO_CONNECTOR_H - -#include "ace/CLASSIX/CLASSIX_CLD_Connector.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/* ------------------------------------------------------------------------- */ - -class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector - // = TITLE - // Defines an CLASSIX IPC connection factory for the - // template methods in . - // - // = DESCRIPTION - // This is used when a client needs to communicate with a server - // whose SAP address is unknown. - // - // and exchanges - // address(SAP) information to establish a logical link. - // - // = NOTES - // There is no other identifier and sequence information - // passed between the acceptor and the connector. - // Some applications may need to have a - // reliable protocol for the connection setup procedure. - // - // = SEE ALSO - // ACE_CLASSIX_CLD_Connector - // ACE_CLASSIX_Acceptor - // -{ - public: - // = Initialization routines. - ACE_CLASSIX_CO_Connector (void); - // Default constructor. - - ACE_CLASSIX_CO_Connector (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap - = ACE_Addr::sap_any, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family - = ACE_CLASSIX_Addr::AF_CLASSIX, - int protocol = 0); - // Emulates connection semantics so that it can be plugged into - // - // Actively connect local SAP and remote SAP togeter. - // Produce a if things go well. - // - // is the peer's address. In ACE_SOCK_Connector it refers to - // the acceptor's address. In connectionless mode, we do not have - // an acceptor. The address will be copied to the new stream - // if things goes well. - // - // If refers to any address, a port will be - // allocated and will be used as a local SAP. - // - // The rest parameters are there so that this class can be plugged into - // . - - int connect (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap = ACE_Addr::sap_any, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, - int protocol = 0); - - // Factory method used in ::connect_svc_handler() - - // Initialization method when default constructor is used. - // See the comments for the corresponding constructor - - // = HELPER - void dump(void) const; - - - private: - - ACE_CLASSIX_CO_Connector(ACE_CLASSIX_CO_Connector const&); - ACE_CLASSIX_CO_Connector const& operator=(ACE_CLASSIX_CO_Connector const&); -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_CO_Connector.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_CO_CONNECTOR_H */ diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.i b/ace/CLASSIX/CLASSIX_CO_Connector.i deleted file mode 100644 index 7f28a66719f..00000000000 --- a/ace/CLASSIX/CLASSIX_CO_Connector.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -// -// CLASSIX_CO_Connector.i -/* ------------------------------------------------------------------------- */ - -ACE_INLINE -ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector ( - ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms, - int protocol_family, - int protocol) - : ACE_CLASSIX_CLD_Connector(new_stream, remote_sap, timeout, local_sap, - reuse_addr, flags, perms, - protocol_family, protocol) -{ - ACE_TRACE ("ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector"); -} - -// Do-nothing constructor... - -ACE_INLINE -ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector (void) - : ACE_CLASSIX_CLD_Connector() -{ - ACE_TRACE ("ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector"); -} - -/* ------------------------------------------------------------------------- */ - - diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp b/ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp deleted file mode 100644 index 112d25956b7..00000000000 --- a/ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// IPP -// -// = FILENAME -// CLASSIX/Dgram_Mcast.cpp -// -// = AUTHOR(S) -// Wei Chiang -// -// = COPYRIGHT -// Copyright 1998 Nokia Telecommunications -// -// ============================================================================ - -#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.i" -#endif /* __ACE_INLINE__ */ -/* ------------------------------------------------------------------------- */ -int -ACE_CLASSIX_Dgram_Mcast::set_saps(int theStamp, - const ACE_CLASSIX_Port& thePort) -{ - this->local_sap_.set_addr(thePort); - if (this->peer_sap_.set(theStamp) != 0) - { - errno = EADDRNOTAVAIL; - ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Dgram_Mcast- " - "failed to set up peer sap address \n"), -1); - } - else - { - this->dest_.target = this->peer_sap_.get_addr()->get_id(); - return 0; - } -} - - -int -ACE_CLASSIX_Dgram_Mcast::set_mode_(u_int theMode, int theSite) -{ - int result = K_EFAULT; - if (theMode <= K_FUNCXMODE && - (result =::uiSite(&this->dest_.coTarget, theSite)) == 0) - result = ::ipcTarget(&this->dest_.target, theMode); - - if (result != 0) - { - errno = ACE_CLASSIX_OS::convert_io_error(result); - result = -1; - } - return result; -} - -int -ACE_CLASSIX_Dgram_Mcast::set_mode_(u_int theMode) -{ - int result = K_EFAULT; - if (theMode <= K_FUNCXMODE ) - result = ::ipcTarget(&this->dest_.target, theMode); - - if (result < 0) - { - errno = ACE_CLASSIX_OS::convert_io_error(result); - result = -1; - } - return result; -} - - -void -ACE_CLASSIX_Dgram_Mcast::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Dgram_Mcast...\n")); - this->ACE_CLASSIX_Stream::dump(); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h deleted file mode 100644 index 35166b99ca0..00000000000 --- a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h +++ /dev/null @@ -1,94 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Dgram_Mcast.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_DGRAM_MCAST_H -#include "ace/pre.h" -#define ACE_CLASSIX_DGRAM_MCAST_H - -/* ------------------------------------------------------------------------- */ -#include - -class ACE_CLASSIX_Dgram_Mcast : public ACE_CLASSIX_Stream - // = TITLE - // Provides Dgram_Mcast interfaces for CLASSIX IPC communications. - // - // = DESCRIPTION - // This class represents multiple end-points for message delivery. - // All the remote ports are belong to the same group identified by - // a stamp. - // It uses the broadcast mode provided by ipcSend() to deliver - // messages. - // - // This class is most likely used in the server. - // -{ - public: - // = INITIALIZATION - ACE_CLASSIX_Dgram_Mcast(void); - // Default constructor, does not setup anything - - ACE_CLASSIX_Dgram_Mcast(int /* stamp */, - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance()); - // remote SAP = port group, local SAP = default port - - int set_saps(int /* stamp */, - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance()); - // remote SAP = port group, local SAP = default port - - //virtual ssize_t send (const void *, /* buf */ - // size_t /* n */) const; - - - // = HELPER - void dump (void) const; - // Dump the state of an object. - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - - protected: - - virtual int set_mode_(u_int = K_BROADMODE); /* theMode */ - // Sets the addressing mode with the current setting of coTarget - virtual int set_mode_(u_int, /* mode */ int /* site */); - // Sets the addressing mode as well as the coTarget - - // Site information for delivery mode, see - // Can be changed by control()/set_mode_() - int dest_site_; - - - private: - // Disable copy constructor - ACE_CLASSIX_Dgram_Mcast(ACE_CLASSIX_Dgram_Mcast const&); - ACE_CLASSIX_Dgram_Mcast const& operator=(ACE_CLASSIX_Dgram_Mcast const&); -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.i" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_DGRAM_MCAST_H */ diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.i b/ace/CLASSIX/CLASSIX_Dgram_Mcast.i deleted file mode 100644 index 5d9fd3df0d3..00000000000 --- a/ace/CLASSIX/CLASSIX_Dgram_Mcast.i +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -// -// ace/CLASSIX_Dgram_Mcast.i -/* ------------------------------------------------------------------------- */ -ACE_INLINE -ACE_CLASSIX_Dgram_Mcast::ACE_CLASSIX_Dgram_Mcast(void) - : ACE_CLASSIX_Stream() -{ -} - -ACE_INLINE -ACE_CLASSIX_Dgram_Mcast::ACE_CLASSIX_Dgram_Mcast (int theStamp, - const ACE_CLASSIX_Port& thePort) - : ACE_CLASSIX_Stream() -{ - this->set_saps(theStamp, thePort); -} - - -/* ------------------------------------------------------------------------- */ diff --git a/ace/CLASSIX/CLASSIX_Group.cpp b/ace/CLASSIX/CLASSIX_Group.cpp deleted file mode 100644 index cb0064d3298..00000000000 --- a/ace/CLASSIX/CLASSIX_Group.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Group.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#include "ace/CLASSIX/CLASSIX_Group.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Group.i" -#endif /* __ACE_INLINE__ */ -/* ------------------------------------------------------------------------- */ - -void -ACE_CLASSIX_Group::init_(void) -{ - this->clear_config_(); - this->addr_.group_.ui.uiHead = this->addr_.group_.ui.uiTail = 0; - this->addr_.group_.key.keyHead = this->addr_.group_.key.keyTail = 0; -} - -void -ACE_CLASSIX_Group::set_addr(void* theSrc, int theLen) -{ - if (theLen > this->get_size()) - return; - - ACE_OS::memcpy ((void *) &this->addr_, - (void *) theSrc, theLen); -} - -void -ACE_CLASSIX_Group::set_addr(const KnCap& thePeer) -{ - this->addr_.group_ = thePeer; - this->set_config_(); -} - - -int -ACE_CLASSIX_Group::insert(const ACE_CLASSIX_Port* thePort) -{ - if (this->is_configured()) - return ::grpPortInsert((KnCap*) &this->get_cap(), - (KnUniqueId*) &thePort->get_id()); - else - return K_EINVAL; -} - -int -ACE_CLASSIX_Group::remove(const ACE_CLASSIX_Port* thePort) -{ - if (this->is_configured()) - return ::grpPortRemove((KnCap*) &this->get_cap(), - (KnUniqueId*) &thePort->get_id()); - else - return K_EINVAL; -} - -void -ACE_CLASSIX_Group::dump(void) const -{ - ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Group...\n")); - char s[200]; - if (!this->is_configured()) - ACE_OS::sprintf(s, "Group has not been setup\n"); - else - { - const KnCap &group = this->get_cap(); - ACE_OS::sprintf (s, "id head = %d(%x), id tail = %d(%x)\n" - "key head = %d(%x) key tail = %d(%x)\n", - group.ui.uiHead, group.ui.uiHead, - group.ui.uiTail, group.ui.uiTail, - group.key.keyHead, group.key.keyHead, - group.key.keyTail, group.key.keyTail); - } - ACE_DEBUG ((LM_DEBUG, "\n%s", s)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} diff --git a/ace/CLASSIX/CLASSIX_Group.h b/ace/CLASSIX/CLASSIX_Group.h deleted file mode 100644 index 5c4c6dfabc5..00000000000 --- a/ace/CLASSIX/CLASSIX_Group.h +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX/Group.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_GROUP_H -#include "ace/pre.h" -#define ACE_CLASSIX_GROUP_H - -/* ------------------------------------------------------------------------- */ -#include "ace/CLASSIX/CLASSIX_Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/CLASSIX/CLASSIX_Port.h" - -class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr - // = TITLE - // Wrapper over Chorus's Group concept. - // - // = DESCRIPTION - // Provides interface to insert and remove ports in the group which is - // created based on a given KnCap. This" is the unique - // identifier of the group. - // - // = NOTE - // Chorus does not provide facility to remove a group from the system, - // nor explicitly create a group. - // As such, the wrapper allows users to freely change from one group - // to the other within the same instance. - // - // = SEE ALSO - // , - // -{ - public: - // = INITIALIZATION - ACE_CLASSIX_Group(void*, /* group id */ int /* len */); - // Sets up the group wrapper using the supplied group id. - ACE_CLASSIX_Group(const KnCap&); - // Sets up the group wrapper using the supplied KnCap - - // = ACCESS - int is_configured(void) const; - // Returns 1, if it contains valid group id; 0, otherwise. - virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const; - // returns GROUP type - void* get_addr(void) const; - // Returns the group id - virtual const KnUniqueId& get_id (void) const; - // Returns a reference to the unique identifier - virtual void set_addr(void* /* source */, int /* len */); - // Sets the group information according to the supplied data - // in raw format. - virtual void set_addr(const KnCap&); - // Sets the group information according to the supplied KnCap. - const KnCap& get_cap(void) const; - // Returns the capability to the supplied location - // If the address is not configured, the return value is unpredictable. - int insert(const ACE_CLASSIX_Port*); - int remove (const ACE_CLASSIX_Port*); - // Inserts/removes the specified port in to the group - // Returns 0, if successful; returns a negative value otherwise - - int operator == (const ACE_CLASSIX_Group &) const; - int operator != (const ACE_CLASSIX_Group &) const; - - // = HELPER - void dump(void) const; - - protected: - // = INITIALIZATION - ACE_CLASSIX_Group(); - // default constructor, does nothing but init. - - void init_(void); - // Initializes the structure. - - void set_config_(); - // Sets the group configured. - void clear_config_(); - // Sets the group not-configured. - - struct group_addr - { - int config_; // 1, if the following fields are valid - KnCap group_; - }; - group_addr addr_; - - private: - - // disable copy/assignment constructor - ACE_CLASSIX_Group(ACE_CLASSIX_Group const&); - ACE_CLASSIX_Group const& operator=(ACE_CLASSIX_Group const&); -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Group.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_GROUP_H */ diff --git a/ace/CLASSIX/CLASSIX_Group.i b/ace/CLASSIX/CLASSIX_Group.i deleted file mode 100644 index e3650502a10..00000000000 --- a/ace/CLASSIX/CLASSIX_Group.i +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_CLASSIX_Group::ACE_CLASSIX_Group() - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Group::group_addr)) -{ - this->init_(); -} - -ACE_INLINE -ACE_CLASSIX_Group::ACE_CLASSIX_Group(void* theSrc, int theLen) - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Group::group_addr)) -{ - this->set_addr(theSrc, theLen); -} - -ACE_INLINE -ACE_CLASSIX_Group::ACE_CLASSIX_Group(const KnCap& thePeer) - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Group::group_addr)) -{ - this->set_addr(thePeer); -} - -ACE_INLINE -void * -ACE_CLASSIX_Group::get_addr(void) const -{ - return (void*) &this->addr_; -} - -ACE_INLINE -const KnUniqueId& -ACE_CLASSIX_Group::get_id(void) const -{ - return this->addr_.group_.ui; -} - -ACE_INLINE -int -ACE_CLASSIX_Group::is_configured(void) const -{ - return this->addr_.config_ == 1; -} - -ACE_INLINE -ACE_CLASSIX_Addr::Addr_Type -ACE_CLASSIX_Group::is_type(void) const -{ - return ACE_CLASSIX_Addr::GROUP; -} - -ACE_INLINE -void -ACE_CLASSIX_Group::set_config_(void) -{ - this->addr_.config_ = 1; -} - -ACE_INLINE -void -ACE_CLASSIX_Group::clear_config_(void) -{ - this->addr_.config_ = 0; -} - -ACE_INLINE -const KnCap& -ACE_CLASSIX_Group::get_cap(void) const -{ - return this->addr_.group_; -} - -ACE_INLINE -int -ACE_CLASSIX_Group::operator ==(const ACE_CLASSIX_Group & theRhs) const -{ - return - this->is_configured() && - theRhs.is_configured() && - ((KnCap) (this->get_cap()) == (KnCap) (theRhs.get_cap())); -} - -ACE_INLINE -int -ACE_CLASSIX_Group::operator !=(const ACE_CLASSIX_Group & theRhs) const -{ - return !(*this == theRhs); -} diff --git a/ace/CLASSIX/CLASSIX_Group_Dynamic.cpp b/ace/CLASSIX/CLASSIX_Group_Dynamic.cpp deleted file mode 100644 index a0ecbe357e6..00000000000 --- a/ace/CLASSIX/CLASSIX_Group_Dynamic.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Group_Creator.cpp.1 -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// -// ============================================================================ - -#include "ace/CLASSIX/CLASSIX_Group_Dynamic.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Group_Dynamic.i" -#endif /* __ACE_INLINE__ */ diff --git a/ace/CLASSIX/CLASSIX_Group_Dynamic.h b/ace/CLASSIX/CLASSIX_Group_Dynamic.h deleted file mode 100644 index eb469fcf81a..00000000000 --- a/ace/CLASSIX/CLASSIX_Group_Dynamic.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Group_Dynamic.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_GROUP_DYNAMIC_H -#include "ace/pre.h" -#define ACE_CLASSIX_GROUP_DYNAMIC_H - -/* ------------------------------------------------------------------------- */ -#include "ace/CLASSIX/CLASSIX_Group.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_CLASSIX_Group_Dynamic : public ACE_CLASSIX_Group - // = TITLE - // Wrapper over Chorus's Group which is created dynamically and not named - // by a . - // - // = DESCRIPTION - // This is a subclass of . - // - // Its encapsulated group is created dynamically and the - // is the name as well as the unique identifier. - // - // = SEE ALSO - // , -{ - public: - - ACE_CLASSIX_Group_Dynamic(void); - // default constructor... create a group use Chorus IPC's K_DYNAMIC option - - virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const; - // returns Dynamic type - - private: - - ACE_CLASSIX_Group_Dynamic(ACE_CLASSIX_Group_Dynamic const&); - ACE_CLASSIX_Group_Dynamic const& operator=(ACE_CLASSIX_Group_Dynamic const&); -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Group_Dynamic.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_GROUP_DYNAMIC_H */ diff --git a/ace/CLASSIX/CLASSIX_Group_Dynamic.i b/ace/CLASSIX/CLASSIX_Group_Dynamic.i deleted file mode 100644 index a7974ce45c1..00000000000 --- a/ace/CLASSIX/CLASSIX_Group_Dynamic.i +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_CLASSIX_Group_Dynamic::ACE_CLASSIX_Group_Dynamic(void) -{ - if (::grpAllocate( K_DYNAMIC, &this->addr_.group_, 0) == 0) - this->set_config_(); -} - -ACE_INLINE -ACE_CLASSIX_Addr::Addr_Type -ACE_CLASSIX_Group_Dynamic::is_type(void) const -{ - return ACE_CLASSIX_Addr::DYNAMIC; -} diff --git a/ace/CLASSIX/CLASSIX_Group_Stamp.cpp b/ace/CLASSIX/CLASSIX_Group_Stamp.cpp deleted file mode 100644 index b1205ca66ec..00000000000 --- a/ace/CLASSIX/CLASSIX_Group_Stamp.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// ace/CLASSIX_Group_Stamp.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#include "ace/CLASSIX/CLASSIX_Group_Stamp.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Group_Stamp.i" -#endif /* __ACE_INLINE__ */ -/* ------------------------------------------------------------------------- */ -void -ACE_CLASSIX_Group_Stamp::set_addr(void* theStamp, int) -{ - // Get the group capability - this->stamp_ = *((u_int*)theStamp); - KnActorPrivilege actor; - actorPrivilege(K_MYACTOR, &actor, NULL); - if (::grpAllocate((actor == K_SUPACTOR) ? K_STATSYS : K_STATUSER, - &this->addr_.group_, - this->stamp_) < 0 ) - { - ACE_DEBUG((LM_DEBUG, "ACE_CLASSIX_Group_Stamp()::" - "group allocation failed\n")); - this->init_(); - this->stamp_ = ACE_CLASSIX_Group_Stamp::ILLEGAL_STAMP; - } - else - { - this->set_config_(); - } -} - -void -ACE_CLASSIX_Group_Stamp::dump(void) const -{ - ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Group_Stamp...\n")); - ACE_DEBUG ((LM_DEBUG, "\nStamp = %d\n", this->get_stamp())); - this->ACE_CLASSIX_Group::dump(); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} diff --git a/ace/CLASSIX/CLASSIX_Group_Stamp.h b/ace/CLASSIX/CLASSIX_Group_Stamp.h deleted file mode 100644 index f71149616d3..00000000000 --- a/ace/CLASSIX/CLASSIX_Group_Stamp.h +++ /dev/null @@ -1,90 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Group_Stamp.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_GROUP_STAMP_H -#include "ace/pre.h" -#define ACE_CLASSIX_GROUP_STAMP_H - -/* ------------------------------------------------------------------------- */ -#include "ace/CLASSIX/CLASSIX_Group.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_CLASSIX_Group_Stamp : public ACE_CLASSIX_Group - // = TITLE - // Wrapper over Chorus's Group using for naming the group. - // - // = DESCRIPTION - // This is a subclass of . - // - // Its encapsulated group is named by a . However, - // is still the unique identifier of the group. - // - // = NOTE - // As at the time of writing, The stamp is contained in the ui.uiTail - // field of . - // - // = SEE ALSO - // , - // -{ - public: - enum - { - ILLEGAL_STAMP = 0 - /* Have we defined the range of valid stamps? */ - }; - - // = INITIALIZATION - ACE_CLASSIX_Group_Stamp(); - // default constructor. Does not contain group information.. - ACE_CLASSIX_Group_Stamp(int /* stamp */); - // creates a group use the specfied stamp - virtual void set_addr(void*, /* pointer to the stamp */ - int = 0 /* not used */); - // Replaces the existing group according to the supplied stamp - - // = ACCESS - virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const; - // returns STAMP type - - int get_stamp() const; - // Returns the stamp - // If the address is not configured, the return value is unpredictable. - - // = HELPER - void dump(void) const; - - - - private: - u_int stamp_; - - // disable copy/assignment constructor - ACE_CLASSIX_Group_Stamp(ACE_CLASSIX_Group_Stamp const&); - ACE_CLASSIX_Group_Stamp const& operator=(ACE_CLASSIX_Group_Stamp const&); -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Group_Stamp.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_GROUP_STAMP_H */ diff --git a/ace/CLASSIX/CLASSIX_Group_Stamp.i b/ace/CLASSIX/CLASSIX_Group_Stamp.i deleted file mode 100644 index 0c03d8ab17a..00000000000 --- a/ace/CLASSIX/CLASSIX_Group_Stamp.i +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_CLASSIX_Group_Stamp::ACE_CLASSIX_Group_Stamp() - : ACE_CLASSIX_Group (), - stamp_ (0) -{ -} - -ACE_INLINE -ACE_CLASSIX_Group_Stamp::ACE_CLASSIX_Group_Stamp(int theStamp) - : ACE_CLASSIX_Group () -{ - this->set_addr(&theStamp); -} - -ACE_INLINE -int -ACE_CLASSIX_Group_Stamp::get_stamp() const -{ - return this->stamp_; - -// return this->addr_.group_.ui.uiTail; -} - -ACE_INLINE -ACE_CLASSIX_Addr::Addr_Type -ACE_CLASSIX_Group_Stamp::is_type(void) const -{ - return ACE_CLASSIX_Addr::STAMP; -} diff --git a/ace/CLASSIX/CLASSIX_OS.cpp b/ace/CLASSIX/CLASSIX_OS.cpp deleted file mode 100644 index 2ec4b6af6d8..00000000000 --- a/ace/CLASSIX/CLASSIX_OS.cpp +++ /dev/null @@ -1,117 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_OS.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#include "ace/CLASSIX/CLASSIX_OS.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_OS.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/CLASSIX/CLASSIX_Select_Reactor.h" - -/* ------------------------------------------------------------------------- */ - -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_OS) -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Msg) - -#if 0 -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Mgr) -ACE_CLASSIX_Mgr::ACE_CLASSIX_Mgr(void) -{ -} - -ACE_CLASSIX_Mgr::~ACE_CLASSIX_Mgr(void) -{ -} - -ACE_SYNCH_RECURSIVE_MUTEXT& -ACE_CLASSIX_Mgr::ref_lock(void) const; -{ - return port_lock_; -} -#endif -/* ------------------------------------------------------------------------- */ -KnUniqueId ACE_CLASSIX_OS::null_KnUniqueId_; -ACE_Recursive_Thread_Mutex ACE_CLASSIX_OS::lock_; - -ACE_CLASSIX_OS::ACE_CLASSIX_OS(void) -{ - // Create a actor-wide CLASSIX reactor - ACE_Reactor *r = - ACE_Reactor::instance - (new ACE_Reactor(new ACE_CLASSIX_Select_Reactor(), 1), 1); - delete r; - - // Fills in a null KnUniqueId so that it can be referenced when required - this->null_KnUniqueId_.uiHead = this->null_KnUniqueId_.uiTail = 0; -} - -ssize_t -ACE_CLASSIX_OS::convert_io_error(ssize_t theOriginal) -{ - switch (theOriginal) - { - case K_EFULL: - return ENOBUFS; - - case K_EINVAL: - return EFTYPE; - - case K_EFAULT: - return EFAULT; - - case K_ETOOMUCH: - return EMSGSIZE; - - case K_EUNKNOWN: - return EBADF; - - case K_ENOPORT: - return EBADF; - - case K_ETIMEOUT: - return ETIMEOUT; - - case K_EABORT: - return EINTR; - - default: - ACE_DEBUG((LM_DEBUG, "unknonw error: %d\n", theOriginal)); - return EFAULT; - } -} - - - -/* ------------------------------------------------------------------------- */ - -void -ACE_CLASSIX_Msg::dump(void) const -{ - ACE_DEBUG ((LM_INFO, ACE_BEGIN_DUMP, this)); - - char s[100]; - ACE_OS::sprintf (s, "flag = %x\n" - "body size = %d\t addr = %x\n" - "annex addr = %x\n" - "seq no = %d\n", - this->msg_.flags, - this->msg_.bodySize, this->msg_.bodyAddr, - this->msg_.annexAddr, - this->msg_.seqNum); - ACE_DEBUG ((LM_INFO, "%s", s)); - ACE_DEBUG ((LM_INFO, ACE_END_DUMP)); -} diff --git a/ace/CLASSIX/CLASSIX_OS.h b/ace/CLASSIX/CLASSIX_OS.h deleted file mode 100644 index 7f2118d5089..00000000000 --- a/ace/CLASSIX/CLASSIX_OS.h +++ /dev/null @@ -1,134 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_OS.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_OS_H -#include "ace/pre.h" -#define ACE_CLASSIX_OS_H - -/* ------------------------------------------------------------------------- */ -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Select_Reactor.h" -#include "ace/Singleton.h" -#include "ace/CLASSIX/CLASSIX_Port_Core.h" - -#include - - -#if 0 -class ACE_Export ACE_CLASSIX_Mgr - // = TITLE - // Class to manage resouces, especially static resources - // - // = DESCRIPTION - // It is intended that one per actor - // -{ - public: - friend ACE_Singleton; - - ACE_SYNCH_RECURSIVE_MUTEXT& ref_lock(const) const; - - protected: - // = Initialization - ACE_CLASSIX_Mgr(void); - // Only allow its fried to instantiate, since it is meant as a - // singleton class. - // This class shall be instanti - -private: - ACE_SYNCH_RECURSIVE_MUTEX *port_lock_; -}; -#endif - -class ACE_Export ACE_CLASSIX_OS -{ -public: - - ACE_CLASSIX_OS(); - - static const KnUniqueId& null_KnUniqueId(); - static ssize_t convert_io_error (ssize_t /* CLASSIX' error no */); - // conver CLASSIX's errno no to Posix no. - -protected: - -private: - friend class ACE_CLASSIX_Port_Core; - friend class ACE_CLASSIX_Port; - static ACE_Recursive_Thread_Mutex& get_lock_(void); - // Returns CLASSIX environment-wide lock - - static KnUniqueId null_KnUniqueId_; - // Null-filled KnUniqueId - - static ACE_Recursive_Thread_Mutex lock_; -}; - -/* ------------------------------------------------------------------------- */ - - -class ACE_CLASSIX_Msg - // = TITLE - // Class wrapper over Chorus's KnMsgDesc structure - // - // = DESCRIPTION - // Provides initialization and reset methods to construct a KnMsgDesc. - // - // The flags in the field of the KnMsgDesc structure is always - // set to 0. Therefore, the message body will always be copied and - // the message is assumed to be part of the user(kernel) address - // space when the caller is a USER(SUPERVISOR) thread. - // (Chorus may not support the options defined in the flag, so we - // choose not to use the flag, i.e. set it to null). - // - // The message annex is not used. - - // = SEE ALSO - // ipcSend(2) -{ - public: - // = initialization - ACE_CLASSIX_Msg(); - // default constructor - ACE_CLASSIX_Msg(const void * /* body address */, int /* msg length */); - - KnMsgDesc* get(void); - // get CLASSIX' message structure - void set (const void* /* body address */, int /* msg length*/); - // Reset the message. The original message will be overwritten. - - void dump(void) const; - - ACE_ALLOC_HOOK_DECLARE; - // declare the dynamic allocation hooks - - private: - KnMsgDesc msg_; -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_OS.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_OS_H */ diff --git a/ace/CLASSIX/CLASSIX_OS.i b/ace/CLASSIX/CLASSIX_OS.i deleted file mode 100644 index d5ded0cc75a..00000000000 --- a/ace/CLASSIX/CLASSIX_OS.i +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -/* ------------------------------------------------------------------------- */ -ACE_INLINE -const KnUniqueId& -ACE_CLASSIX_OS::null_KnUniqueId(void) -{ - return null_KnUniqueId_; -} - - -ACE_INLINE -ACE_Recursive_Thread_Mutex& -ACE_CLASSIX_OS::get_lock_(void) -{ - return lock_; -} - -/* ------------------------------------------------------------------------- */ -ACE_INLINE -ACE_CLASSIX_Msg::ACE_CLASSIX_Msg(void) -{ - // Make a null-filled message - this->msg_.flags = 0; - this->msg_.bodySize = 0; - this->msg_.bodyAddr = 0; - this->msg_.annexAddr = 0; - this->msg_.seqNum = 0; -} - -ACE_INLINE -ACE_CLASSIX_Msg::ACE_CLASSIX_Msg(const void* theBuf, int theLen) -{ - this->msg_.flags = 0; - this->msg_.annexAddr = 0; - this->msg_.seqNum = 0; - - this->msg_.bodySize = theLen; - this->msg_.bodyAddr = (VmAddr) theBuf; -} - -ACE_INLINE -void -ACE_CLASSIX_Msg::set(const void* theBuf, int theLen) -{ - this->msg_.bodySize = theLen; - this->msg_.bodyAddr = (VmAddr) theBuf; -} - -ACE_INLINE -KnMsgDesc* -ACE_CLASSIX_Msg::get(void) -{ - return &this->msg_; -} diff --git a/ace/CLASSIX/CLASSIX_Peer_SAP.cpp b/ace/CLASSIX/CLASSIX_Peer_SAP.cpp deleted file mode 100644 index 9dbddf9c0b1..00000000000 --- a/ace/CLASSIX/CLASSIX_Peer_SAP.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Peer_SAP.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#include "ace/CLASSIX/CLASSIX_Peer_SAP.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Peer_SAP.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/CLASSIX/CLASSIX_Group_Stamp.h" -/* ------------------------------------------------------------------------- */ -int -ACE_CLASSIX_Peer_SAP::set(const ACE_CLASSIX_Port_Core& thePeer) -{ - delete this->peer_addr_; - this->peer_addr_ = new ACE_CLASSIX_Port (thePeer); - ACE_ASSERT(this->peer_addr_); - return 0; -} - -int -ACE_CLASSIX_Peer_SAP::set(const ACE_Addr& thePeer) -{ - delete this->peer_addr_; - this->peer_addr_ = new ACE_CLASSIX_Port (thePeer); - ACE_ASSERT(this->peer_addr_); - return 0; -} - -int -ACE_CLASSIX_Peer_SAP::set(const KnUniqueId& thePeer) -{ - delete this->peer_addr_; - this->peer_addr_ = new ACE_CLASSIX_Port (thePeer); - ACE_ASSERT(this->peer_addr_); - return 0; -} - -int -ACE_CLASSIX_Peer_SAP::set(const KnCap& thePeer) -{ - delete this->peer_addr_; - this->peer_addr_ = new ACE_CLASSIX_Group (thePeer); - ACE_ASSERT(this->peer_addr_); - return 0; -} - -int -ACE_CLASSIX_Peer_SAP::set(int theStamp) -{ - delete this->peer_addr_; - this->peer_addr_ = new ACE_CLASSIX_Group_Stamp (theStamp); - ACE_ASSERT(this->peer_addr_); - return 0; -} - -void -ACE_CLASSIX_Peer_SAP::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Peer_SAP...\n")); - if (this->peer_addr_) - this->peer_addr_->dump(); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} diff --git a/ace/CLASSIX/CLASSIX_Peer_SAP.h b/ace/CLASSIX/CLASSIX_Peer_SAP.h deleted file mode 100644 index 93e65996763..00000000000 --- a/ace/CLASSIX/CLASSIX_Peer_SAP.h +++ /dev/null @@ -1,108 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Peer_SAP.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_PEER_SAP_H -#include "ace/pre.h" -#define ACE_CLASSIX_PEER_SAP_H - -/* ------------------------------------------------------------------------- */ -#include -#include - -class ACE_CLASSIX_Peer_SAP - // = TITLE - // Class implementing the peer SAP. - // - // = DESCRIPTION - // - // In CLASSIX, a local SAP is always a port, a peer SAP can be - // a port or a group of port. This class is for peer SAP and - // is for local SAP. - // - // = SEE ALSO - // -{ - public: - // = INITIALIZATION - ACE_CLASSIX_Peer_SAP(void); - // Default constructor. - // Needs to be initialized by a set() operation. - ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port_Core&);/* peer port */ - - ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port&);/* peer port address */ - ACE_CLASSIX_Peer_SAP(const ACE_Addr&); /* peer port address */ - - ACE_CLASSIX_Peer_SAP(const KnUniqueId&); /* peer port address */ - ACE_CLASSIX_Peer_SAP(const KnCap&); /* peer group address */ - ACE_CLASSIX_Peer_SAP(int /* stamp */); /* stamp for peer group */ - - ~ACE_CLASSIX_Peer_SAP(void); - - int set(const ACE_CLASSIX_Port_Core&); /* peer port */ - - int set(const ACE_Addr&); /* peer port address */ - - int set(const KnUniqueId&); /* peer port address */ - int set(const KnCap&); /* peer group address */ - int set(int /* stamp */); /* stamp for the peer group */ - - // = ACCESS - const ACE_CLASSIX_Addr* get_addr(void) const; - // Returns peer's address, either a port or a group of ports - int is_configured(void) const; - // Returns 1, if address information is proper; Returns 0 otherwise - - // = CONTROL -#if 0 - int control(u_int = K_BROADMODE); - int control(u_int, /* mode */ int /* site */ ); - // Interface for CLASSIX' send mode -#endif - // = HELPER - void dump (void) const; - // Dump the state of an object. - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - - protected: -#if 0 - virtual set_mode_(u_int = K_BROADMODE); /* theMode */ - // Sets the addressing mode with the current setting of coTarget - virtual set_mode_(u_int, /* mode */ int /* site */); - // Sets the addressing mode as well as the coTarget -#endif - ACE_CLASSIX_Addr *peer_addr_; - - private: - // Disable copy constructor - ACE_CLASSIX_Peer_SAP(ACE_CLASSIX_Peer_SAP const&); - ACE_CLASSIX_Peer_SAP const& operator=(ACE_CLASSIX_Peer_SAP const&); -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Peer_SAP.i" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_PEER_SAP_H */ diff --git a/ace/CLASSIX/CLASSIX_Peer_SAP.i b/ace/CLASSIX/CLASSIX_Peer_SAP.i deleted file mode 100644 index a10bcfd12b5..00000000000 --- a/ace/CLASSIX/CLASSIX_Peer_SAP.i +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(void) - : peer_addr_ (0) -{ -} - -ACE_INLINE -ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port_Core& - thePeer) - : peer_addr_ (0) -{ - this->set(thePeer); -} - -ACE_INLINE -ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port& thePeer) - : peer_addr_ (0) -{ - this->set(thePeer); -} - -ACE_INLINE -ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(const ACE_Addr& thePeer) - : peer_addr_ (0) -{ - this->set(thePeer); -} - -ACE_INLINE -ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(const KnUniqueId& thePeer) - : peer_addr_ (0) -{ - this->set(thePeer); -} - -ACE_INLINE -ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(int theStamp) - : peer_addr_ (0) -{ - this->set(theStamp); -} - -ACE_INLINE -ACE_CLASSIX_Peer_SAP::~ACE_CLASSIX_Peer_SAP(void) -{ - delete this->peer_addr_; -} - - -ACE_INLINE -const ACE_CLASSIX_Addr* -ACE_CLASSIX_Peer_SAP::get_addr(void) const -{ - return this->peer_addr_; -} - -ACE_INLINE -int -ACE_CLASSIX_Peer_SAP::is_configured(void) const -{ - if (this->peer_addr_) - return this->peer_addr_->is_configured(); - else - return 0; -} - -#if 0 -ACE_INLINE -int -ACE_CLASSIX_Peer_SAP::control(u_int theMode) -{ - return this->peer_addr_->set_mode_(theMode); -} - -ACE_INLINE -int -ACE_CLASSIX_Peer_SAP::control(u_int theMode, int theSite) -{ - return this->set_mode_(theMode, theSite); -} - - -ACE_INLINE -int -ACE_CLASSIX_Peer_SAP::set_mode_(u_int) -{ - return K_EFAULT; -} - -ACE_INLINE -int -ACE_CLASSIX_Peer_SAP::set_mode_(u_int, int) -{ - return K_EFAULT; -} -#endif diff --git a/ace/CLASSIX/CLASSIX_Port.cpp b/ace/CLASSIX/CLASSIX_Port.cpp deleted file mode 100644 index e819e1abcfd..00000000000 --- a/ace/CLASSIX/CLASSIX_Port.cpp +++ /dev/null @@ -1,129 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Defines the ClassiX IPC address family address format. - -#define ACE_BUILD_DLL -#include "ace/CLASSIX/CLASSIX_Port.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Port.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Port) - - -ACE_CLASSIX_Port::ACE_CLASSIX_Port(void* thePort, int theLen) - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr)) -{ - if (thePort && theLen == this->get_size()) - { - ACE_CLASSIX_Port_Core::Addr *port = - (ACE_CLASSIX_Port_Core::Addr*) thePort; - this->addr_.handle = port->handle; - this->addr_.id = port->id; - } - else - { - this->clear(); - } -} - -ACE_CLASSIX_Port::ACE_CLASSIX_Port(ACE_Addr const& theAddr) - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr)) -{ - if (theAddr.get_size() == this->get_size() && - theAddr.get_type() == this->get_type()) - this->set_(theAddr); - else - this->clear(); -} - -void -ACE_CLASSIX_Port::clear(void) -{ - this->addr_.handle = ACE_CLASSIX_ADDR_UNKNOWN; - this->addr_.id.uiHead = this->addr_.id.uiTail = 0; -} - -int -ACE_CLASSIX_Port::set_(const ACE_Addr& theAddr) -{ - ACE_CLASSIX_Port_Core::Addr *src = - ((ACE_CLASSIX_Port_Core::Addr*) theAddr.get_addr()); - this->addr_.id = src->id; - this->addr_.handle = src->handle; - - return 0; -} - -int -ACE_CLASSIX_Port::set(const KnUniqueId& thePort) -{ - int no = ::portLi((KnUniqueId*) &thePort); - - // update the port no only if the no is valid - if (no < 0) - // Assume this is a remote port - no = ACE_INVALID_HANDLE; - - this->addr_.handle = no; - this->addr_.id = thePort; - return 0; -} - -int -ACE_CLASSIX_Port::set_handle(ACE_HANDLE thePort) -{ - if (thePort == ACE_INVALID_HANDLE && - ::portUi(&this->addr_.id, thePort) < 0) - return -1; - - this->addr_.handle = thePort; - return 0; -} - -void -ACE_CLASSIX_Port::set_addr(void* theSrc, int theLen) -{ - // Remove self owned first and Make sure no memory overflow - if (theSrc && theLen > this->get_size()) - return; - - ACE_OS::memcpy ((void *) &this->addr_, - (void *) theSrc, theLen); - -} - -ACE_CLASSIX_Port const& -ACE_CLASSIX_Port::operator =(ACE_Addr const& theAddr) -{ - if (theAddr.get_size() == this->get_size() && - theAddr.get_type() == this->get_type()) - { - - this->set_(theAddr); - } - return *this; -} - -int -ACE_CLASSIX_Port::addr_to_string (ACE_TCHAR s[], size_t) const -{ - ACE_OS::sprintf (s, ACE_TEXT ("%d:%d"), - ACE_TEXT_CHAR_TO_TCHAR (::agetId()), - this->get_port_number ()); -} - -void -ACE_CLASSIX_Port::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Port...\n")); - ACE_Addr::dump(); - char s[100]; - ACE_OS::sprintf (s, "handle = %d;\tid head = %x, id tail = %x\n", - this->get_handle(), - this->get_id().uiHead, this->get_id().uiTail); - ACE_DEBUG ((LM_DEBUG, "%s", s)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} diff --git a/ace/CLASSIX/CLASSIX_Port.h b/ace/CLASSIX/CLASSIX_Port.h deleted file mode 100644 index 94402bf16ca..00000000000 --- a/ace/CLASSIX/CLASSIX_Port.h +++ /dev/null @@ -1,162 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Port.h -// -// = AUTHOR -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_PORT_H -#include "ace/pre.h" -#define ACE_CLASSIX_PORT_H - -#include "ace/Singleton.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/CLASSIX/CLASSIX_OS.h" -#include "ace/CLASSIX/CLASSIX_Addr.h" - - -class ACE_Export ACE_CLASSIX_Port : public ACE_CLASSIX_Addr -{ - // = TITLE - // Defines the ClassiX IPC Port address format for "ACE Socket" like - // interfaces - // - // = DESCRIPTION - // The port address contains two fields: - // a global unique identifier and a local identifier. - // The global unique identifier is also referred to as the port address - // and the local identifier as the port no. - // - // = NOTE - // In Chorus, one can always convert from a port unique identifier to - // a port no and vice versa. This class is implemented based on this - // premise. - // - // = SEE ALSO - // , - // -public: - /* -----------------------------------------------------*/ - // = Initialization methods. - ACE_CLASSIX_Port (); - // Default constructor. - // The address corresponds to the default port of the actor. - - ACE_CLASSIX_Port (const ACE_CLASSIX_Port &); - // Copy constructor. - ACE_CLASSIX_Port (const ACE_Addr &); - // Copy constructor. - - ACE_CLASSIX_Port (const ACE_CLASSIX_Port_Core&); - // Creates an from - - ACE_CLASSIX_Port (const KnUniqueId& /* port_id */); - // Creates an from the given - - ACE_CLASSIX_Port (ACE_HANDLE /* port_no */); - // Creates an from the given - - ACE_CLASSIX_Port (void* /* location */, int /* length */); - // Create an from the address in raw format. - - ACE_CLASSIX_Port const& operator =(ACE_Addr const&); - - - /* -----------------------------------------------------*/ - // = ACCESS - - virtual int addr_to_string (ACE_TCHAR addr[], size_t) const; - // Transform the current address into string format, - // which is in the form "actor-id:port-number" - - int set (const KnUniqueId& /* port_id */); - // Sets the from a - - virtual void set_addr (void * /* addr location */, - int /* len */); - // Set the address as the one pointed to by the location pointer. - // The address contains bytes. - // Would prefer to return the status, but the base class uses void. - int set_handle (ACE_HANDLE /* port_no */); - // Sets the field from a - - virtual void *get_addr (void) const; - // Returns a pointer to the address:, - // - virtual const KnUniqueId& get_id (void) const; - // Returns a reference to the port id. - virtual ACE_HANDLE get_handle (void) const; - // Returns the port no. - int is_configured(void) const; - // Returns 1, if address information is proper; Returns 0 otherwise - virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const; - // returns PORT type - - /* -----------------------------------------------------*/ - // = Control - // - virtual int enable(int /* receive priority */) const; - // Puts the port into the set of monitored ports. - virtual int disable(void) const; - // Removes the port from the set of monitored ports. - virtual void clear(void); - // Remove port information - - /* -----------------------------------------------------*/ - // = Comparison - // - int operator == (const ACE_CLASSIX_Port &) const; - // Compare two addresses for equality. The addresses are considered - // equal if they have the same content in the KnUniqueId address structure. - - int operator != (const ACE_CLASSIX_Port &) const; - // Compare two addresses for inequality. - - /* -----------------------------------------------------*/ - // = Helper - // - void dump (void) const; - // Dump the state of an object. - - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -private: - /* -----------------------------------------------------*/ - // = Direct initialization methods (useful after the object has been - // constructed). - // Will create/reset the port only if the port no was - // Returns 0 on success, -1 otherwise. - // - - int set_ (const ACE_Addr &); - // Sets the from another . - - - -private: - ACE_CLASSIX_Port_Core::Addr addr_; -}; - -/* ------------------------------------------------------------------------- */ -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Port.i" -#endif /* __ACE_INLINE__ */ - - -#include "ace/post.h" -#endif /* ACE_CLASSIX_PORT_H */ diff --git a/ace/CLASSIX/CLASSIX_Port.i b/ace/CLASSIX/CLASSIX_Port.i deleted file mode 100644 index 762f6ec5794..00000000000 --- a/ace/CLASSIX/CLASSIX_Port.i +++ /dev/null @@ -1,112 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_CLASSIX_Port::ACE_CLASSIX_Port(void) - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr)) -{ - this->set_handle(K_DEFAULTPORT); -} - -ACE_INLINE -ACE_CLASSIX_Port::ACE_CLASSIX_Port(const ACE_CLASSIX_Port& theSrc) - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr)) -{ - this->set_(theSrc); -} - -ACE_INLINE -ACE_CLASSIX_Port::ACE_CLASSIX_Port(const KnUniqueId& thePort) - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr)) -{ - this->set(thePort); -} - -ACE_INLINE -ACE_CLASSIX_Port::ACE_CLASSIX_Port(ACE_HANDLE thePort) - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr)) -{ - this->set_handle(thePort); -} - -ACE_INLINE -ACE_CLASSIX_Port::ACE_CLASSIX_Port(const ACE_CLASSIX_Port_Core& thePort) - : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr)) -{ - this->addr_.handle = thePort.get_handle(); - this->addr_.id = thePort.get_id(); -} - -ACE_INLINE -ACE_HANDLE -ACE_CLASSIX_Port::get_handle(void) const -{ - return this->addr_.handle; -} - -ACE_INLINE -const KnUniqueId& -ACE_CLASSIX_Port::get_id(void) const -{ - return this->addr_.id; -} - -ACE_INLINE -void * -ACE_CLASSIX_Port::get_addr(void) const -{ - return (void*) &this->addr_; -} - -ACE_INLINE -int -ACE_CLASSIX_Port::is_configured(void) const -{ - return (this->addr_.handle != ACE_CLASSIX_ADDR_UNKNOWN); -} - -ACE_INLINE -ACE_CLASSIX_Addr::Addr_Type -ACE_CLASSIX_Port::is_type(void) const -{ - return ACE_CLASSIX_Addr::PORT; -} - -ACE_INLINE -int -ACE_CLASSIX_Port::enable(int thePriority) const -{ - if (ACE_Reactor::instance()->notify() == 0) - return ::portEnable(K_MYACTOR, this->get_handle(), thePriority); - else - return -1; -} - -ACE_INLINE -int -ACE_CLASSIX_Port::disable(void) const -{ - if (ACE_Reactor::instance()->notify() == 0) - return ::portDisable(K_MYACTOR, this->get_handle()); - else - return -1; -} - -// Compare two addresses for equality. -ACE_INLINE -int -ACE_CLASSIX_Port::operator==(const ACE_CLASSIX_Port &theSrc) const -{ - return - this->ACE_Addr::operator == (theSrc) && - this->addr_.id.uiHead == theSrc.addr_.id.uiHead && - this->addr_.id.uiTail == theSrc.addr_.id.uiTail && - this->addr_.handle == theSrc.addr_.handle; -} - -ACE_INLINE -int -ACE_CLASSIX_Port::operator != (const ACE_CLASSIX_Port &sap) const -{ - return !((*this) == sap); -} diff --git a/ace/CLASSIX/CLASSIX_Port_Core.cpp b/ace/CLASSIX/CLASSIX_Port_Core.cpp deleted file mode 100644 index 4d1903939b9..00000000000 --- a/ace/CLASSIX/CLASSIX_Port_Core.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Port_Core.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#include "ace/CLASSIX/CLASSIX_Port_Core.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Port_Core.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/Synch_T.h" -#include "ace/CLASSIX/CLASSIX_OS.h" -/* ------------------------------------------------------------------------- */ - -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Port_Core) - -ACE_CLASSIX_Port_Core::ACE_CLASSIX_Port_Core(void) -{ - if ((this->addr_.handle = ::portCreate(K_MYACTOR, &this->addr_.id)) < 0) - this->clear_config_(); - else - { - this->set_config_(); - } -} - -ACE_CLASSIX_Port_Core::~ACE_CLASSIX_Port_Core(void) -{ - if (this->is_configured()) - if (int result = ::portDelete(K_MYACTOR, this->get_handle()) < 0) - ACE_ERROR((LM_DEBUG, - "ACE_CLASSIX_Port_Core::~ACE_CLASSIX_PORT_CORE()- " - "failed to delete port, error = %d", result)); -} - -void -ACE_CLASSIX_Port_Core::clear_config_(void) -{ - this->config_ = 0; - this->addr_.id.uiHead = this->addr_.id.uiTail = 0; - this->addr_.handle = ACE_INVALID_HANDLE; -} - - -void -ACE_CLASSIX_Port_Core::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Port_Core...\n")); - char s[100]; - if (!this->is_configured()) - ACE_OS::sprintf(s, "Port has not been allocated\n"); - else - ACE_OS::sprintf (s, "handle = %d;\tid head = %x, id tail = %x\n", - this->get_handle(), - this->get_id().uiHead, this->get_id().uiTail); - ACE_DEBUG ((LM_DEBUG, "%s", s)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} diff --git a/ace/CLASSIX/CLASSIX_Port_Core.h b/ace/CLASSIX/CLASSIX_Port_Core.h deleted file mode 100644 index beef0356c63..00000000000 --- a/ace/CLASSIX/CLASSIX_Port_Core.h +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Port_Core.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_PORT_CORE_H -#include "ace/pre.h" -#define ACE_CLASSIX_PORT_CORE_H - -/* ------------------------------------------------------------------------- */ -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include - - -/* ------------------------------------------------------------------------- */ -class ACE_Export ACE_CLASSIX_Port_Core -{ - // = TITLE - // Defines interfaces for allocation/deallocation of a Chorus - // IPC port - // - // = DESCRIPTION - // This class allocates a port in the constructor and deallocates it in - // the destructor. - -public: - /* -----------------------------------------------------*/ - // = Initialization methods. - ACE_CLASSIX_Port_Core (void); - // Allocates a port from the OS - // - virtual ~ACE_CLASSIX_Port_Core (void); - // Deallocates the port from the OS. - - virtual const KnUniqueId& get_id (void) const; - // Returns a reference to the port id. - virtual ACE_HANDLE get_handle (void) const; - // Returns the port no(used as an ACE_HANDLE) - virtual void* get_addr(void) const; - // Returns a pointer to the location containing the raw - // address of the port. - int is_configured(void) const; - // Returns 1, if the port has been successfully created. - -#if 0 - int enable(int /* priority */) const; - int disable (int) const; - // Puts/Removes the port into/from the set of monitored ports. -#endif - /* -----------------------------------------------------*/ - // = Helper - // - void dump (void) const; - // Dump the state of an object. - - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - - struct Addr - { - KnUniqueId id; // port address: unique identifier - ACE_HANDLE handle;// port no: local identifier. - - }; - -protected: - void clear_config_(); - // Indicates that port has been allocated. - void set_config_(); - - ACE_CLASSIX_Port_Core::Addr addr_; - int config_; // Sets to 1, if configured; - // 0 otherwise -private: - // Disallow copy constructor/assignment - ACE_CLASSIX_Port_Core(ACE_CLASSIX_Port_Core const&); - ACE_CLASSIX_Port_Core const& operator =(ACE_CLASSIX_Port_Core const&); -}; -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Port_Core.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_PORT_CORE_H */ diff --git a/ace/CLASSIX/CLASSIX_Port_Core.i b/ace/CLASSIX/CLASSIX_Port_Core.i deleted file mode 100644 index 7fd3694d8de..00000000000 --- a/ace/CLASSIX/CLASSIX_Port_Core.i +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -void -ACE_CLASSIX_Port_Core::set_config_(void) -{ - this->config_ = 1; -} - -ACE_INLINE -int -ACE_CLASSIX_Port_Core::is_configured(void) const -{ - return this->config_ == 1; -} - - -ACE_INLINE -ACE_HANDLE -ACE_CLASSIX_Port_Core::get_handle(void) const -{ - return this->addr_.handle; -} - -ACE_INLINE -const KnUniqueId& -ACE_CLASSIX_Port_Core::get_id(void) const -{ - return this->addr_.id; -} - -ACE_INLINE -void* -ACE_CLASSIX_Port_Core::get_addr(void) const -{ - return (void*) (&this->addr_); -} diff --git a/ace/CLASSIX/CLASSIX_Port_Default.cpp b/ace/CLASSIX/CLASSIX_Port_Default.cpp deleted file mode 100644 index e18d55971e2..00000000000 --- a/ace/CLASSIX/CLASSIX_Port_Default.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Defines the ClassiX IPC address family address format. - -#define ACE_BUILD_DLL -#include "ace/CLASSIX/CLASSIX_Port_Default.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Port_Default.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Port_Default) - -/* ------------------------------------------------------------------------- */ -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Singleton; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiation ACE_Singleton - -#endif diff --git a/ace/CLASSIX/CLASSIX_Port_Default.h b/ace/CLASSIX/CLASSIX_Port_Default.h deleted file mode 100644 index ce237daceb3..00000000000 --- a/ace/CLASSIX/CLASSIX_Port_Default.h +++ /dev/null @@ -1,80 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Port_Default.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_PORT_DEFAULT_H -#include "ace/pre.h" -#define ACE_CLASSIX_PORT_DEFAULT_H - -#include "ace/Singleton.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/CLASSIX/CLASSIX_Port.h" - -class ACE_CLASSIX_Port_Default : public ACE_CLASSIX_Port -{ - // = TITLE - // Implements the address wrapper of an actor's default port. - // - // = DESCRIPTION - // This corresponds to the address of an actor's default port - // which does not change - // in the life time of the actor. Therefore the address information - // in this class can not be modified once it is created. - // - // Each actor has one and only one default port. Therefore an instance - // of this class is a singleton. The protected constructor and the - // friendship with the ACE_Singleton preventys this class from being - // instantiated by other classes. - // - // = NOTE - // - // = SEE ALSO - // - // - friend class ACE_Singleton; - - /* -----------------------------------------------------*/ - // = Access - virtual void set_addr(void*, int); - ACE_CLASSIX_Port const& operator =(ACE_CLASSIX_Port const&); - ACE_CLASSIX_Port const& operator =(ACE_Addr const&); - // Does nothing...The default port's address cannot be changed - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -protected: - /* -----------------------------------------------------*/ - // = Initialization methods. - ACE_CLASSIX_Port_Default (); - // Wrapper for the Actor's default port -}; - - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Port_Default.i" -#endif /* __ACE_INLINE__ */ - -/* ------------------------------------------------------------------------- */ -typedef ACE_Singleton - ACE_CLASSIX_DEFAULT_PORT; -/* ------------------------------------------------------------------------- */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_PORT_DEFAULT_H */ diff --git a/ace/CLASSIX/CLASSIX_Port_Default.i b/ace/CLASSIX/CLASSIX_Port_Default.i deleted file mode 100644 index fac497bace0..00000000000 --- a/ace/CLASSIX/CLASSIX_Port_Default.i +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_CLASSIX_Port_Default::ACE_CLASSIX_Port_Default(void) - : ACE_CLASSIX_Port() -{ -} - -ACE_INLINE -void -ACE_CLASSIX_Port_Default::set_addr(void*, int) -{ -} - -ACE_INLINE -ACE_CLASSIX_Port const& -ACE_CLASSIX_Port_Default::operator =(ACE_CLASSIX_Port const&) -{ - return *this; -} - -ACE_INLINE -ACE_CLASSIX_Port const& -ACE_CLASSIX_Port_Default::operator =(ACE_Addr const&) -{ - return *this; -} diff --git a/ace/CLASSIX/CLASSIX_SAP.cpp b/ace/CLASSIX/CLASSIX_SAP.cpp deleted file mode 100644 index 55a9c8183a0..00000000000 --- a/ace/CLASSIX/CLASSIX_SAP.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_SAP.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#include "ace/CLASSIX/CLASSIX_SAP.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_SAP.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_SAP) -/* ------------------------------------------------------------------------- */ -int -ACE_CLASSIX_SAP::get_addr(ACE_Addr& theAddr) const -{ - if (theAddr.get_size() < this->local_addr_.get_size() || - theAddr.get_type() != this->local_addr_.get_type()) - { - return -1; - } - else - { - theAddr.set_addr(this->local_addr_.get_addr(), - this->local_addr_.get_size()); - return 0; - } -} - -void -ACE_CLASSIX_SAP::set_addr(const ACE_Addr& theAddr) -{ - this->local_addr_.set_addr(theAddr.get_addr(), theAddr.get_size()); -} - - -void -ACE_CLASSIX_SAP::set_addr(const ACE_CLASSIX_Port_Core& thePort) -{ - this->local_addr_.set_addr(thePort.get_addr(), - sizeof (ACE_CLASSIX_Port_Core::Addr)); -} - -int -ACE_CLASSIX_SAP::set(const KnUniqueId& theId) -{ - return this->local_addr_.set(theId); -} - -void -ACE_CLASSIX_SAP::set_handle(ACE_HANDLE theHandle) -{ - if (this->local_addr_.set_handle(theHandle) == -1) - ACE_DEBUG((LM_DEBUG, "ACE_CLASSIX_SAP::set_handle()::" - "Handle invalid\n")); -} - -int -ACE_CLASSIX_SAP::set(const ACE_Addr& theAddr) -{ - this->set_addr(theAddr); - return 0; -} - -int -ACE_CLASSIX_SAP::open(const ACE_Addr& theAddr) -{ - this->set_addr(theAddr); - return 0; -} - - -int -ACE_CLASSIX_SAP::set(const ACE_CLASSIX_Port_Core& thePort) -{ - this->set_addr(thePort); - return 0; -} - - -int -ACE_CLASSIX_SAP::open(const ACE_CLASSIX_Port_Core* thePort) -{ - if (thePort) - { - this->set_addr(ACE_CLASSIX_Port(*thePort)); - return 0; - } - else - return -1; -} - -int -ACE_CLASSIX_SAP::close(void) -{ - // Disable receiving - this->unselectable(); - //*** Do something to flush out potential messages on the local port - // e.g. have a separte thread call ipcReceive on each disabled SAP. - - this->local_addr_.clear(); - return 0; -} - -int -ACE_CLASSIX_SAP::selectable(int thePriority) -{ - if (!this->enabled_) - { - int result = this->local_addr_.enable(thePriority); - if (result == 0) - this->enabled_ = 1; - return result; - } - else - return 0; -} - -int -ACE_CLASSIX_SAP::unselectable(int) -{ - if (this->enabled_) - { - int result = this->local_addr_.disable(); - if (result == 0) - this->enabled_ = 0; - return result; - } - else - return 0; -} - - -void -ACE_CLASSIX_SAP::dump(void) const -{ - ACE_DEBUG ((LM_INFO, "ACE_CLASSIX_SAP...\n")); - - this->local_addr_.dump(); - - ACE_DEBUG ((LM_INFO, ACE_END_DUMP)); -} diff --git a/ace/CLASSIX/CLASSIX_SAP.h b/ace/CLASSIX/CLASSIX_SAP.h deleted file mode 100644 index c8c5df0e18e..00000000000 --- a/ace/CLASSIX/CLASSIX_SAP.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_SAP.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_SAP_H -#include "ace/pre.h" -#define ACE_CLASSIX_SAP_H - -/* ------------------------------------------------------------------------- */ -#include "ace/CLASSIX/CLASSIX_Port.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_CLASSIX_SAP - // = TITLE - // Class implementing the SAP over a Chorus port. - // - // = DESCRIPTION - // A SAP has a port which is referred to as the local port. - // This class provides methods to manipulate this port. - // - // The SAP will always put the port in DISABLED state on exit. - // - // In CLASSIX, a local SAP is always a port, a peer SAP can be - // a port or a group of port. This class is for local SAP and - // is for peer SAP. - // - // = SEE ALSO - // - // -{ - public: - enum - { - DEFAULT_PRIORITY = 10 - }; - - // = INITIALIZATION - ACE_CLASSIX_SAP(void); - // Creates a SAP, using the address of the actor's default port. - ACE_CLASSIX_SAP(const ACE_Addr&); - // Creates a SAP, using the specified address as the local address. - virtual ~ACE_CLASSIX_SAP(void); - - // = ACCESS - void set_addr(const ACE_Addr&); - void set_addr(const ACE_CLASSIX_Port_Core&); - // Sets the based on the given address information. - // The caller should make sure that the original address can be removed! - int set(const ACE_Addr&); - // Returns 0, if successful; returns -1, otherwise - // same as set_addr(const ACE_Addr&); - int set(const ACE_CLASSIX_Port_Core&); - // Returns 0, if successful; returns -1, otherwise - // same as void set_addr(const ACE_CLASSIX_Port_Core&); - int set (const KnUniqueId&); - // Returns 0, if successful; returns -1, otherwise - - void set_handle (ACE_HANDLE /* port_no */); - // Sets the port address according to - - int get_addr(ACE_Addr& /* return_addr */) const; - // Returns address information to the supplied location. - // if successful, return 0 and the return_addr parameter contains the - // address info. - // Otherwise, return -1 - const ACE_CLASSIX_Port& get_addr(void) const; - // Returns a reference to the address information - ACE_HANDLE get_handle(void) const; - // Get handles that the Reactor uses - virtual int is_configured(void) const; - // Returns 1, if address information is proper; Returns 0 otherwise - int is_selectable(void) const; - // Retruns 1, if the local SAP is enabled. - - // = CONTROL - int selectable(int = ACE_CLASSIX_SAP::DEFAULT_PRIORITY /* priority */); - // Puts the SAP in the ENABLED state so that data the port associated - // with its local addess can be monitored by the CLASSIX's Reactor. - - int unselectable(int = 0 /* not used */); - // Makes the SAP DISABLED and therefore the SAP can not be monitored - // by the CLASSIX's Reactor.. - int open(const ACE_Addr&); - int open(const ACE_CLASSIX_Port_Core*); - // Sets the address information according to the supplied port - // Returns 0 on success; returns -1 otherwise - int close(void); - // removes the port information - // Returns 0 on success (always); returns -1 otherwise - - void clear(void); - // erase local port info - -#if 0 - int control(u_int = K_BROADMODE); - int control(u_int, /* mode */ int /* site */ ); - // Interface for CLASSIX' send mode -#endif - - - // = HELPER - void dump(void) const; - // dump the state of an object - - ACE_ALLOC_HOOK_DECLARE; - // declare the dynamic allocation hooks - - protected: -#if 0 - virtual set_mode_(u_int = K_BROADMODE); /* theMode */ - // Sets the addressing mode with the current setting of coTarget - virtual set_mode_(u_int, /* mode */ int /* site */); - // Sets the addressing mode as well as the coTarget -#endif - // Disable copy constructor/assignment - ACE_CLASSIX_SAP(ACE_CLASSIX_SAP const&); - ACE_CLASSIX_SAP const& operator=(ACE_CLASSIX_SAP const&); - - ACE_CLASSIX_Port local_addr_; - int enabled_; // 1 if enabled, 0 if disabled (Default) -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_SAP.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_SAP_H */ diff --git a/ace/CLASSIX/CLASSIX_SAP.i b/ace/CLASSIX/CLASSIX_SAP.i deleted file mode 100644 index 105570b363b..00000000000 --- a/ace/CLASSIX/CLASSIX_SAP.i +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_CLASSIX_SAP::ACE_CLASSIX_SAP(void) - :local_addr_ (), - enabled_ (0) -{ -} - -ACE_INLINE -ACE_CLASSIX_SAP::ACE_CLASSIX_SAP(const ACE_Addr& theAddr) - :local_addr_ (theAddr.get_addr(), theAddr.get_size()), - enabled_ (0) -{ -} - -ACE_INLINE -ACE_CLASSIX_SAP::~ACE_CLASSIX_SAP(void) -{ - this->unselectable(); -} - -ACE_INLINE -const ACE_CLASSIX_Port& -ACE_CLASSIX_SAP::get_addr(void) const -{ - return this->local_addr_; -} - - -ACE_INLINE -ACE_HANDLE -ACE_CLASSIX_SAP::get_handle(void) const -{ - return this->local_addr_.get_handle(); -} - -ACE_INLINE -int -ACE_CLASSIX_SAP::is_configured(void) const -{ - return this->local_addr_.is_configured(); -} - -ACE_INLINE -int -ACE_CLASSIX_SAP::is_selectable(void) const -{ - return this->enabled_ == 1; -} - -ACE_INLINE -void -ACE_CLASSIX_SAP::clear(void) -{ - this->local_addr_.clear(); -} diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp deleted file mode 100644 index 960e76358aa..00000000000 --- a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp +++ /dev/null @@ -1,337 +0,0 @@ -// $Id$ -/* -// ============================================================================ -// -// = LIBRARY -// ACE -// -// = FILENAME -// CLASSIX_Reactor.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ -*/ -#include "ace/CLASSIX/CLASSIX_Select_Reactor.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Select_Reactor.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/CLASSIX/CLASSIX_OS.h" -/* ------------------------------------------------------------------------- */ -int -ACE_CLASSIX_Select_Reactor::wait_for_multiple_events -(ACE_Select_Reactor_Handle_Set &theDispatchSet, - ACE_Time_Value *max_wait_time) -{ - - ACE_Time_Value timer_buf (0); - ACE_Time_Value *this_timeout = &timer_buf; - - int number_of_active_handles = this->any_ready (theDispatchSet); - - // If there are any bits enabled in the then we'll - // handle those first, otherwise we'll block in select(). - - if (number_of_active_handles == 0) - { - int port = K_ANYENABLED; - do - { - // Monitor all enabled ports - // CLASSIX uses -1 rathre than 0 for blocked receive - int msec = -1; - if (this->timer_queue_->calculate_timeout (max_wait_time, - this_timeout) != 0) - { - if ((msec = this_timeout->msec()) == 0) - { - msec = -1; - this_timeout = 0; - } - } - else - this_timeout = 0; - - ACE_CLASSIX_Msg rmsg(0, 0); - port = K_ANYENABLED; - ssize_t size = ::ipcReceive(rmsg.get(), &port, msec); -#if 0 - ACE_DEBUG((LM_DEBUG, - "(%t)ACE_CLASSIX_Select_Reactor::" - "return from ipcReceive():ret = %d" - ", port = %d, timeout = %d\n", - size, port, msec)); -#endif - if (size >= 0) - { - // Is 0 valid ??? - // Keep info about which handler this message is for and - // its size. - if (this->set_current_info_(port, size) == 0) - { - theDispatchSet.rd_mask_.set_bit(port); - number_of_active_handles = 1; - } - else - { - ACE_DEBUG((LM_DEBUG, - "Synchronization problem in Reactor???\n")); - number_of_active_handles = -1; - errno = K_EFAULT; - } - } - else - { - // make the current message information invalid - this->set_current_info_(ACE_INVALID_HANDLE, 0); - if ((errno = size) == K_ETIMEOUT) - number_of_active_handles = 0; - else - number_of_active_handles = -1; - } - } - while (number_of_active_handles == -1 && - this->handle_error_ (port) > 0); - } - // Return the number of events to dispatch. - return number_of_active_handles; -} - -int -ACE_CLASSIX_Select_Reactor::set_current_info_(ACE_HANDLE thePort, - size_t theSize) -{ - ACE_MT(ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, ace_mon, - this->token_, -1)); - - this->current_handle_ = thePort; - this->current_msg_size_ = theSize; - return 0; -} - -int -ACE_CLASSIX_Select_Reactor::current_info(ACE_HANDLE thePort, - size_t& theSize) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, - ace_mon, this->token_, -1)); - - if (this->current_handle_ == thePort) - { - theSize = this->current_msg_size_; - this->current_msg_size_ = 0; - this->current_handle_ = ACE_INVALID_HANDLE; - return 0; - } - else - { - theSize = 0; - return -1; - } -} - -int -ACE_CLASSIX_Select_Reactor::handle_error_ (int thePort) -{ - - // The thread has been aborted - if (errno == K_EABORT) - return this->restart_; - // No port or a (Chorus) handler is attached to the port - else if (errno == K_ENOPORT || errno == K_EINVAL) - return this->check_handles_ (thePort); - else - return -1; -} - -int -ACE_CLASSIX_Select_Reactor::check_handles_ (int thePort) -{ - ACE_TRACE ("ACE_CLASSIX_Select_Reactor::check_handles_"); - if (thePort == K_ANYENABLED) - return -1; - else - // Don't know how to check if a Chorus port has been disabled or deleted. - return 0; -} - -/* ------------------------------------------------------------------------- */ -void -ACE_CLASSIX_Select_Reactor_Notify::dump (void) const -{ - ACE_TRACE ("ACE_CLASSIX_Select_Reactor_Notify::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_CLASSIX_select_reactor_ = %x"), - this->select_reactor_)); - this->notification_sap_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -int -ACE_CLASSIX_Select_Reactor_Notify::open (ACE_Reactor_Impl *theReactor, - ACE_Timer_Queue*, - int the_disable_notify_pipe) -{ - if (the_disable_notify_pipe == 0) - { - this->select_reactor_ = ACE_dynamic_cast - (ACE_CLASSIX_Select_Reactor *, theReactor); - - if (this->notification_sap_.open (&this->notification_port_) != 0 || - this->notification_sap_.selectable() != 0) - return -1; - - return this->select_reactor_->register_handler - (this->notification_sap_.get_handle (), - this, - ACE_Event_Handler::READ_MASK); - } - else - { - this->select_reactor_ = 0; - } -} - -ssize_t -ACE_CLASSIX_Select_Reactor_Notify::notify (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask, - ACE_Time_Value *timeout) -{ - ACE_Notification_Buffer buffer (eh, mask); - ACE_CLASSIX_Msg msg(&buffer, sizeof (buffer)); - KnIpcDest dest; - dest.target = this->notification_sap_.get_addr().get_id(); - - ssize_t n = ipcSend (msg.get(), K_DEFAULTPORT, &dest); - if (n < 0) - ACE_DEBUG((LM_DEBUG, "ipcSend() error = %d\n", n)); - return n == 0 ? 0 : -1; -} - -// Handles pending threads (if any) that are waiting to unblock the -// Select_Reactor. - -int -ACE_CLASSIX_Select_Reactor_Notify::dispatch_notifications ( - int & number_of_active_handles, - const ACE_Handle_Set &rd_mask) -{ - ACE_TRACE ("(%t) ACE_CLASSIX_Select_Reactor_Notify::dispatch_notifications"); - - ACE_HANDLE read_handle = - this->notification_sap_.get_handle (); - - if (rd_mask.is_set (read_handle)) - { - number_of_active_handles--; - return this->handle_input (read_handle); - } - else - return 0; -} - -// Special trick to unblock select() when updates occur in somewhere -// other than the main ACE_Select_Reactor thread. All we do is write data to -// a pipe that the ACE_Select_Reactor is listening on. Thanks to Paul -// Stephenson for suggesting this approach. - -int -ACE_CLASSIX_Select_Reactor_Notify::handle_input (ACE_HANDLE handle) -{ - // Precondition: this->select_reactor_.token_.current_owner () == - // ACE_Thread::self (); - - if (handle != this->notification_sap_.get_handle()) - { - ACE_DEBUG((LM_DEBUG, "ACE_CLASSIX_Select_Reator_Notify::" - "handle_input() Not my handle\n")); - return 0; - } - - ssize_t n = 0; - size_t n1= 0; - - int number_dispatched = 0; - - ACE_Notification_Buffer buffer; - ACE_CLASSIX_Msg rmsg(&buffer, sizeof (buffer)); - - if (this->select_reactor_->current_info(handle, n1) == -1 || - n1 != sizeof buffer) - { - // I'm not quite sure what to do at this point. It's - // probably best just to return -1. - ACE_DEBUG((LM_DEBUG, - "ACE_CLASSIX_Select_Reactor_Notify:: " - "read not expected by the reactor\n", n1)); - return -1; - } - - while ((n = ::ipcGetData(rmsg.get())) > 0) - { - if (n != sizeof buffer) - { - // I'm not sure quite what to do at this point. It's - // probably best just to return -1. - ACE_DEBUG((LM_DEBUG, - "ACE_CLASSIX_Select_Reactor_Notify::ipcGetDAta() " - "incorrect read(%d)\n", n)); - return -1; - } - - // If eh == 0 then another thread is unblocking the ACE_Select_Reactor - // to update the ACE_Select_Reactor's internal structures. Otherwise, - // we need to dispatch the appropriate handle_* method on the - // ACE_Event_Handler pointer we've been passed. - if (buffer.eh_ != 0) - { - int result = 0; - - switch (buffer.mask_) - { - case ACE_Event_Handler::READ_MASK: - case ACE_Event_Handler::ACCEPT_MASK: - result = buffer.eh_->handle_input (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::WRITE_MASK: - result = buffer.eh_->handle_output (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::EXCEPT_MASK: - result = buffer.eh_->handle_exception (ACE_INVALID_HANDLE); - break; - default: - // Should we bail out if we get an invalid mask? - ACE_ERROR ((LM_ERROR, ACE_TEXT ("invalid mask = %d\n"), buffer.mask_)); - } - if (result == -1) - buffer.eh_->handle_close (ACE_INVALID_HANDLE, - ACE_Event_Handler::EXCEPT_MASK); - } - - number_dispatched++; - - // Bail out if we've reached the . Note that - // by default is -1, so we'll loop until all - // the notifications in the pipe have been dispatched. - if (number_dispatched == this->select_reactor_->max_notify_iterations()) - break; - } - - // Reassign number_dispatched to -1 if things have gone seriously - // wrong. - if (n < 0) - number_dispatched = -1; - - - // Enqueue ourselves into the list of waiting threads. When we - // reacquire the token we'll be off and running again with ownership - // of the token. The postcondition of this call is that - // this->select_reactor_.token_.current_owner () == ACE_Thread::self (); - this->select_reactor_->renew(); - return number_dispatched; -} -/* ------------------------------------------------------------------------- */ diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.h b/ace/CLASSIX/CLASSIX_Select_Reactor.h deleted file mode 100644 index 98063a60c1f..00000000000 --- a/ace/CLASSIX/CLASSIX_Select_Reactor.h +++ /dev/null @@ -1,209 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -/* -// ============================================================================ -// -// = LIBRARY -// ACE -// -// = FILENAME -// CLASSIX_Reactor.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ -*/ - -#ifndef ACE_CLASSIX_REACTOR_H -#include "ace/pre.h" -#define ACE_CLASSIX_REACTOR_H - -/* ------------------------------------------------------------------------- */ -#include "ace/Timer_Queue.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Select_Reactor.h" -#include "ace/Message_Block.h" -#include "ace/CLASSIX/CLASSIX_SAP.h" - -class ACE_CLASSIX_Select_Reactor; - -class ACE_Export ACE_CLASSIX_Select_Reactor_Notify : - public ACE_Reactor_Notify -{ - // = TITLE - // Unblock the from its event loop. - // - // = DESCRIPTION - // This replaces class. - // Instead of using pipe, this class uses an Chorus IPC port to - // trigger the unblock event. - // -public: - // = Initialization and termination methods. - ACE_CLASSIX_Select_Reactor_Notify(void); - ~ACE_CLASSIX_Select_Reactor_Notify(void); - - virtual int open (ACE_Reactor_Impl *, - ACE_Timer_Queue * = 0, - int = 0 /* dusable_notify_pip */); - // Enables the notification port and register it with the reactor - virtual int close (void); - // Disables the notification port - - int dispatch_notifications (int &number_of_active_handles, - const ACE_Handle_Set &rd_mask); - // Handles pending threads (if any) that are waiting to unblock the - // Select_Reactor. - - ssize_t notify (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value * = 0); - // Called by a thread when it wants to unblock the Select_Reactor. - // This wakeups the if currently blocked in - // select()/poll(). Pass over both the *and* the - // to allow the caller to dictate which - // method the will invoke. The - // indicates how long to blocking trying to notify the - // . If == 0, the caller will block until - // action is possible, else will wait until the relative time - // specified in * elapses). - - virtual int handle_input (ACE_HANDLE handle); - // Called back by the Select_Reactor when a thread wants to unblock us. - - virtual void max_notify_iterations (int); - // Set the maximum number of times that the - // method will iterate - // Always 1. - - virtual int max_notify_iterations (void); - // Get the maximum number of times that the - // method will iterate. - // Always 1 - - void dump (void) const; - // Dump the state of an object. - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -private: - ACE_CLASSIX_Select_Reactor *select_reactor_; - // Keep a back pointer to the . If this value - // if NULL then the has been initialized with - // . - ACE_CLASSIX_Port_Core notification_port_; // CLASSIX' IPC port - ACE_CLASSIX_SAP notification_sap_; - // The HANDLE that the Select_Reactor is listening on and - // the HANDLE that threads wanting the attention of the - // Select_Reactor will write t are the same. - // It can be seen that the notification port is implicitly connected to the - // port from where the notification is written. In many cases, it will be - // the actor's default port. -}; - -class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor - // = TITLE - // Implementing a Reactor for monitoring incoming data - // - // = DESCRIPTION - // This class redefines the wait_for_events() method of - // class. - // - // The wait_for_events() method uses ipcReceive() to monitor - // all ENABLED ports for incoming messages. The ipcReceive() is - // set up such that it will find out the size of the message but will - // not read the message. The Chorus OS provides an ipcGetData() - // to read the message that has just been detected on the same - // thread. - // Once a message is detected on a particular - // port, the reactor will invoke the port handler's - // handle_input() method on the same thread. It is important that - // handle_input() shall immediately retrieve(use ipcGetData()) - // the message on the same - // thread and it shall not hold up this thread in the handle_input() - // routine for too long. This will allow the Reactor to respond to - // events more quickly. - // - // = NOTE - // Since chorus does not allow ipcReceive to monitor a subset of - // ENABLED ports. One cannot have two ACE_CLASSIX_Select_Reactors - // in one actor. - // -{ - public: - - - // = CURRENT MESSAGE - // The following message should be called in the handler's - // handle_input() routine. - // The handle_input() routine should not hold the reactor for too long. - virtual int current_info(ACE_HANDLE /* port */, - size_t& /* msg size */); - // Retruns the current messageage to the caleer if the supplied - // handle id is the same as the - // Returns 0, if constains the size of the message - // that the handler shall read. - // Returns -1, if the caller is not the expected handler. - - protected: - // = INITIALIZATION - ACE_CLASSIX_Select_Reactor (ACE_Timer_Queue * = 0); - // Initializes with the handler - // repository of the default size. - - ACE_CLASSIX_Select_Reactor (size_t size, - int restart = 0, - ACE_Timer_Queue * = 0); - // Initializes with the handler repository of - // size . - - // multiplexer - virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &, - ACE_Time_Value *); - // Wait for events to occur. - - virtual int set_current_info_(ACE_HANDLE /* handle */, - size_t /* size of data */); - // record the handler and the size of the message that the handler shall - // read next. - - - // ACE_Recursive_Thread_Mutex lock_current_; - // lock for data relating to the current message. - // use token lock - - size_t current_msg_size_; - // size of the message that has just been detected. - - ACE_HANDLE current_handle_; - // handler id of the current address. - - friend class ACE_CLASSIX_Select_Reactor_Notify; - friend class ACE_CLASSIX_OS; - // for constructors - - private: - int handle_error_(int /* port handle */); - // Takes corrective action when errors occur. - int check_handles_(int /* port handle */); - // Makes sure the handler is valid. - - ACE_CLASSIX_Select_Reactor(ACE_CLASSIX_Select_Reactor const&); - ACE_CLASSIX_Select_Reactor const& operator=(ACE_CLASSIX_Select_Reactor const&); -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Select_Reactor.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_REACTOR_H */ diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.i b/ace/CLASSIX/CLASSIX_Select_Reactor.i deleted file mode 100644 index af4e995cb87..00000000000 --- a/ace/CLASSIX/CLASSIX_Select_Reactor.i +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -// -// CLASSIX/Reactor.i -/* ------------------------------------------------------------------------- */ - -/* ------------------------------------------------------------------------- */ -ACE_INLINE -ACE_CLASSIX_Select_Reactor_Notify::ACE_CLASSIX_Select_Reactor_Notify(void) - : ACE_Reactor_Notify() -{ -} - -ACE_INLINE -ACE_CLASSIX_Select_Reactor_Notify::~ACE_CLASSIX_Select_Reactor_Notify(void) -{ -} - -ACE_INLINE -ACE_CLASSIX_Select_Reactor::ACE_CLASSIX_Select_Reactor( - ACE_Timer_Queue *theTimeQ) - : ACE_Select_Reactor(0, theTimeQ, 0, - new ACE_CLASSIX_Select_Reactor_Notify()), - current_msg_size_ (0), - current_handle_ (ACE_INVALID_HANDLE) -{ -} - -ACE_INLINE -ACE_CLASSIX_Select_Reactor::ACE_CLASSIX_Select_Reactor ( - size_t theSize, - int theRs, - ACE_Timer_Queue *theTimeQ) - : ACE_Select_Reactor (theSize, theRs, 0, theTimeQ, 0, - new ACE_CLASSIX_Select_Reactor_Notify() ), - current_msg_size_ (0), - current_handle_ (ACE_INVALID_HANDLE) -{ -} - -ACE_INLINE -int -ACE_CLASSIX_Select_Reactor_Notify::close (void) -{ - // deregister handle ??? - return this->notification_sap_.close (); -} - -ACE_INLINE -void -ACE_CLASSIX_Select_Reactor_Notify::max_notify_iterations (int iterations) -{ -} - -ACE_INLINE -int -ACE_CLASSIX_Select_Reactor_Notify::max_notify_iterations (void) -{ - return 1; -} - - -/* ------------------------------------------------------------------------- */ diff --git a/ace/CLASSIX/CLASSIX_Stream.cpp b/ace/CLASSIX/CLASSIX_Stream.cpp deleted file mode 100644 index 5d1ba095853..00000000000 --- a/ace/CLASSIX/CLASSIX_Stream.cpp +++ /dev/null @@ -1,362 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Stream.cpp -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#include "ace/CLASSIX/CLASSIX_Stream.h" - -#if !defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Stream.i" -#endif /* __ACE_INLINE__ */ -/* ------------------------------------------------------------------------- */ -ACE_CLASSIX_Stream::ACE_CLASSIX_Stream(void) - : local_sap_ (), - local_sap_closed_ (0), - local_port_ (0), - peer_sap_ (), - peer_sap_closed_ (1) -// dest_site_ (-1) -{ -} - -ACE_CLASSIX_Stream::ACE_CLASSIX_Stream - (const ACE_CLASSIX_Port_Core& thePeer, - const ACE_CLASSIX_Port& theLocal) - : local_sap_ (theLocal), - local_sap_closed_ (0), - local_port_ (0), - peer_sap_ (thePeer), - peer_sap_closed_ (1) -// dest_site_ (-1) -{ - this->dest_.target = this->peer_sap_.get_addr()->get_id(); -} - -ACE_CLASSIX_Stream::ACE_CLASSIX_Stream(const ACE_CLASSIX_Port& thePeer, - const ACE_CLASSIX_Port& theLocal) - : local_sap_ (theLocal), - local_sap_closed_(0), - local_port_ (0), - peer_sap_ (thePeer), - peer_sap_closed_ (1) -// dest_site_ (-1) -{ - this->dest_.target = this->peer_sap_.get_addr()->get_id(); -} - - -ACE_CLASSIX_Stream::ACE_CLASSIX_Stream(const KnUniqueId& thePeer, - const ACE_CLASSIX_Port& theLocal) - : local_sap_ (theLocal), - local_sap_closed_(0), - local_port_ (0), - peer_sap_ (thePeer), - peer_sap_closed_ (1) -// dest_site_ (-1) -{ - this->dest_.target = this->peer_sap_.get_addr()->get_id(); -} - -int -ACE_CLASSIX_Stream::set_local_port(ACE_CLASSIX_Port_Core* thePort) -{ - delete this->local_port_; - if (this->local_sap_.open(thePort) == 0) - { - this->local_port_ = thePort; - return 0; - } - else - { - this->local_port_ = 0; - this->local_sap_.clear(); - return -1; - } -} - -int -ACE_CLASSIX_Stream::open(void) -{ - this->dest_.target = this->peer_sap_.get_addr()->get_id(); - this->open_writer(); - - if (!this->local_sap().is_configured() || - this->local_sap().get_handle() == - ACE_CLASSIX_DEFAULT_PORT::instance()->get_handle()) - { - delete this->local_port_; - ACE_NEW_RETURN(this->local_port_, ACE_CLASSIX_Port_Core(), -1); - return this->local_sap_.open(this->local_port_); - } - - return 0; -} - -int -ACE_CLASSIX_Stream::open(const ACE_Addr& theAddr) -{ - this->dest_.target = this->peer_sap_.get_addr()->get_id(); - this->open_writer(); - - if (!this->local_sap().is_configured() || - this->local_sap().get_handle() == - ACE_CLASSIX_DEFAULT_PORT::instance()->get_handle()) - { - delete this->local_port_; - if (theAddr.get_size() != this->local_sap().get_addr().get_size()) - return -1; - return this->local_sap_.open(theAddr); - } - return 0; -} - -int -ACE_CLASSIX_Stream::close_writer(void) -{ - if (this->peer_sap_closed_ == 0) - { - if (this->send_n(0, 0) < 0) - ACE_DEBUG((LM_DEBUG, "failed to send a zero byte msg\n")); - this->peer_sap_closed_ = 1; - } - return 0; -} - -void -ACE_CLASSIX_Stream::open_writer(void) -{ - this->peer_sap_closed_ = 0; -} - -int -ACE_CLASSIX_Stream::close(void) -{ - this->close_writer(); - - this->local_sap_.close(); - if (this->local_port_) - { - delete this->local_port_; - this->local_port_ = 0; - } - this->dest_.target = ACE_CLASSIX_OS::null_KnUniqueId(); - return 0; -} - -void -ACE_CLASSIX_Stream::set_target_() -{ - this->dest_.target = this->peer_sap_.get_addr()->get_id(); -} - -int -ACE_CLASSIX_Stream::set_peer_sap(const ACE_Addr& theAddr) -{ - if (this->peer_sap_.set(theAddr) == 0) - { - this->set_target_(); - return 0; - } - return -1; -} - -int -ACE_CLASSIX_Stream::set_peer_sap(const ACE_CLASSIX_Port_Core& theAddr) -{ - if (this->peer_sap_.set(theAddr) == 0) - { - this->set_target_(); - return 0; - } - return -1; -} - -int -ACE_CLASSIX_Stream::set_peer_sap(const KnUniqueId& theAddr) -{ - if (this->peer_sap_.set(theAddr) == 0) - { - this->set_target_(); - return 0; - } - return -1; -} - -int -ACE_CLASSIX_Stream::set_peer_sap(const KnCap& theAddr) -{ - if (this->peer_sap_.set(theAddr) == 0) - { - this->set_target_(); - return 0; - } - return -1; -} - -ssize_t -ACE_CLASSIX_Stream::send_n(const void* theBuf, size_t theLen, int theFlags) -{ - if (!this->is_writer_closed()) - { - this->set_mode_(theFlags); - return this->send_n(theBuf, theLen); - } - else - return 0; -} - -ssize_t -ACE_CLASSIX_Stream::send_n(const void* theBuf, size_t theLen) const -{ - if (!this->is_writer_closed()) - { - ACE_CLASSIX_Msg msg(theBuf, theLen); - int result = 0; - if ((result = ::ipcSend((KnMsgDesc*) msg.get(), - this->local_sap().get_handle(), - (KnIpcDest*) &this->dest_)) == 0) - return theLen; - else - { - errno = ACE_CLASSIX_OS::convert_io_error(result); - return -1; - } - } - else - { - return 0; - } -} - -ssize_t -ACE_CLASSIX_Stream::reply(const void* theBuf, size_t theLen) const -{ - if (!this->is_writer_closed()) - { - ACE_CLASSIX_Msg msg(theBuf, theLen); - if (int result = ::ipcReply((KnMsgDesc*) msg.get()) == 0) - return theLen; - else - { - errno = ACE_CLASSIX_OS::convert_io_error(result); - return -1; - } - } - else - return 0; -} - -ssize_t -ACE_CLASSIX_Stream::ipcRecv(void* theBuf, size_t theLen, - int theFlag, ACE_Time_Value* theTimeout) const -{ - if (!this->is_reader_closed()) - { - // In chorus environment, a negative value means block - // until recv is possible - int timeout = theTimeout == 0 ? -1 : theTimeout->msec(); - if (timeout == 0) - timeout = -1; - - if (theFlag & MSG_PEEK) - { - theBuf = 0; - theLen = 0; - } - - ACE_CLASSIX_Msg rmsg(theBuf, theLen); - int handle = this->local_sap().get_handle(); - int result = ::ipcReceive((KnMsgDesc*) rmsg.get(), &handle, - timeout); - if (result < 0) - { - errno = ACE_CLASSIX_OS::convert_io_error(result); - return -1; - } - else - return result; - } - else - { - errno = ENOTCONN; - return -1; - } -} - -ssize_t -ACE_CLASSIX_Stream::ipcRecv_n(void* theBuf, size_t theLen, - int theFlag, ACE_Time_Value* theTimeout) const -{ - // Timeout value applies to each around of receive. - // ....Should be adjusted after each round! - int len = 0; - void *next = theBuf; - size_t more = theLen; - for (int n = 0; - more > 0; - len += n, next += n, more -=n) - { - if ((n = this->ipcRecv(next, more, theFlag, theTimeout)) == -1) - break; - } - return len; -} - -ssize_t -ACE_CLASSIX_Stream::recv(void* theBuf, int theLen) const -{ - if (!this->is_reader_closed()) - { - ACE_CLASSIX_Msg rmsg(theBuf, theLen); - int result = ::ipcGetData(rmsg.get()); - if (result >= 0) - return result; - else if (result == K_EINVAL) - errno = EWOULDBLOCK; - else - errno = EFAULT; - - return -1; - } - else - return 0; -} - - - -void -ACE_CLASSIX_Stream::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Stream...\n")); - ACE_DEBUG ((LM_DEBUG, "...local sap(%s)\n", - this->is_writer_closed() == 1 ? "closed" : "opened")); - if (this->local_port_) - ACE_DEBUG ((LM_DEBUG, "\towns the local port(%x)\n", - this->local_port_)); - this->local_sap().dump(); - - ACE_DEBUG ((LM_DEBUG, "...Peer sap(%s & %s)\n", - this->is_reader_closed() == 1 ? "closed" : "opened", - this->is_selectable() ? "enabled" : "disabled")); - this->peer_sap().dump(); - ACE_DEBUG((LM_DEBUG, "Dest- Target\n head = %x tail = %x\n", - this->dest_.target.uiHead, - this->dest_.target.uiTail - /* this->dest_site_ */)); - ACE_DEBUG((LM_DEBUG, "Dest- coTarget\n head = %x tail = %x\n", - this->dest_.coTarget.uiHead, - this->dest_.coTarget.uiTail - /* this->dest_site_ */)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} diff --git a/ace/CLASSIX/CLASSIX_Stream.h b/ace/CLASSIX/CLASSIX_Stream.h deleted file mode 100644 index 0ebced26877..00000000000 --- a/ace/CLASSIX/CLASSIX_Stream.h +++ /dev/null @@ -1,272 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// CLASSIX_Stream.h -// -// = AUTHOR(S) -// Nokia Telecommunications -// -// ============================================================================ - -#ifndef ACE_CLASSIX_STREAM_H -#include "ace/pre.h" -#define ACE_CLASSIX_STREAM_H - -/* ------------------------------------------------------------------------- */ -#include "ace/CLASSIX/CLASSIX_SAP.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/CLASSIX/CLASSIX_Peer_SAP.h" -#include "ace/CLASSIX/CLASSIX_Port_Default.h" - -class ACE_CLASSIX_Stream - // = TITLE - // Provides the stream interface for CLASSIX IPC communications. - // - // = DESCRIPTION - // This classes provides a stream wrapper over CLASSIX' - // IPC. It is designed to be an alternative to Stream type of - // communication in the UNIX AF_INET environment. - // - // To the user, the stream is connection-oriented. The stream - // is implemented on top of IPC, it is connectionless and its - // reliability is as good as what the raw IPC can offer. - // - // Since CLASSIX IPC is not intended to go across wide area network, - // it can be seen as an - // alternative to AF_INET's connection oriented stream, even though - // the CLASSIX IPC is connectionless. - // - // This class contains a local sap, peer sap and data holding - // delivery mode information. - // - // When a stream is created, the peer SAP information must be provided. - // The local SAP information may be provided in the constructor or - // open(). The local SAP information given in open() overrides the - // existing one. If the local SAP address is not given at all, it will - // allocate a port and use it as the local SAP. - // -{ - public: - ACE_CLASSIX_Stream(void); - // Default constructor, does not setup anything - ACE_CLASSIX_Stream(const ACE_CLASSIX_Port_Core&, /* remote port */ - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance()); /* local address */ - - ACE_CLASSIX_Stream(const ACE_CLASSIX_Port&, /* remote port address */ - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */ - - ACE_CLASSIX_Stream(const KnUniqueId&, /* remote port address */ - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */ - - // = IO - // Returns -1, if fault has occured during receive. errno contains - // the error condition. - // Returns no of bytes received/sent, otherwise. - // - virtual ssize_t send_n (const void *, /* buf */ - size_t, /* n */ - int /* flags */); - // Sends exactly n bytes (keep trying until n bytes are sent) - virtual ssize_t send_n (const void *, /* buf */ size_t /* n */) const; - // Sends n bytes(keep trying until n bytes are sent) - // Uses the current addressing mode - virtual ssize_t send (const void *, /* buf */ - size_t, /* n */ - int /* flags */); - // Sends n bytes. Same as send_n(buf, n, flag) - virtual ssize_t send (const void *, /* buf */ - size_t /* n */) const; - // Sends n bytes. same as send_n(buf, n). - virtual ssize_t reply (const void *, /* buf */ - size_t /* n */) const; - // Sends n bytes to the sender of the cureent thread's current message. - - ssize_t ipcRecv (void *, /* buffer */ - size_t, /* length */ - int = 0, /* flag: 0 or MSG_PEEK */ - ACE_Time_Value* = 0) const; /* timeout */ - // Recv an byte buffer - // Wait up to amount of time to receive up to bytes - // into from (uses the call). If times - // out a -1 is returned with . If it succeeds the - // number of bytes received is returned. - // If == 0, the caller - // will block until action is possible, else will wait until the - // relative time specified in * elapses). - ssize_t ipcRecv_n (void *, /* buffer */ - size_t, /* length */ - int = 0, /* flag: 0 or MSG_PEEK */ - ACE_Time_Value* = 0) const; /* timeout */ - // Continue until receives n bytes of data or an error has occurred. - // Retruns the no of bytes actually received. - // If it is less than expected, errno contains error info. - - ssize_t peek(ACE_Time_Value* = 0 /* timeout */) const; - // It is the same as recv(0, 0, MSG_PEEK, timeout) - // This must be followd by get_data() in order to read the peeked message - ssize_t recv(void* /*buf */, int /* len */) const; - // Gets data which have been peeked - ssize_t recv_n(void* /*buf */, int /* len */) const; - // Gets data which have been peeked - - // = ACCESS - virtual ACE_HANDLE get_handle (void) const; - // virtual void set_handle (ACE_HANDLE); - virtual void set_handle(ACE_HANDLE); - // set the local port's address according to the supplied handle - - const ACE_CLASSIX_SAP& local_sap(void) const; - // Returns read-only local sap - const ACE_CLASSIX_Peer_SAP& peer_sap(void) const; - // Returns read-only peer sap - int get_remote_addr (ACE_Addr & /* dest */) const; - // Returns 0, if the remote address has been setup, else -1. - // The parameter is not changed. - // This method is here for compatability with SOCK_Stream. - // Since the remote addr may be a port or a group and since the - // address formats are different between a port and a group, the caller - // cannot provide an appropriate buffer for recording the address. The - // parameter is therefore not used. - - - const ACE_CLASSIX_Port& local_addr(void) const; - // Returns local address in format - - int is_selectable(void) const; - // Retruns 1, if the local SAP is enabled. - int is_writer_closed(void) const; - // Retruns 1, if writer side is closed. - int is_reader_closed(void) const; - // Retruns 1, if reader side is closed. - - - // = CONTROL - int set_peer_sap(const ACE_Addr&); - // Returns 0, if successful; returns -1, otherwise - // same as set_addr(const ACE_Addr&); - int set_peer_sap(const ACE_CLASSIX_Port_Core&); - // Returns 0, if successful; returns -1, otherwise - // same as void set_addr(const ACE_CLASSIX_Port_Core&); - int set_peer_sap (const KnUniqueId&); - // Returns 0, if successful; returns -1, otherwise - int set_peer_sap (const KnCap&); - // Returns 0, if successful; returns -1, otherwise - - virtual int enable(int) const; - virtual int disable(int) const; - // These two methods do nothing. They are here to maintain the same - // interface as other type of Stream class, e.g. ACE_SOCK_Stream - - int selectable(int = ACE_CLASSIX_SAP::DEFAULT_PRIORITY); - int unselectable(void); - // Enables/Disables the local port to be monitored (by a CLASSIX reactor) - // Default = DISABLED - virtual void open_writer(void); - virtual int close_writer(void); - // Closes down the writer - // Returns -1, if it fails; returns 0, otherwise - // Subclass can overwrite this with sophisticated mechanism, such as - // exchange protocol information with the peer. - virtual int close_reader(void); - // Closes down the writer - // Returns -1, if it fails; returns 0, otherwise - // Subclass can overwrite this with sophisticated mechanism, such as - // exchange protocol information with the peer. - - virtual int open(void); - // for local SAP... - // Creates a port and uses it as a SAP. - // A port can be created if the local_sap is not configured or - // it is configured and the local_sap uses the actor's default port. - // Returns -1, if it fails; returns 0, otherwise - virtual int open(const ACE_Addr&); - // for local SAP... - // Uses the supplied port information for the local SAP. - virtual int close(void); - // for local SAP... - // Deletes the optional local port and clears the local SAP infomration. - - // = OPTIONS - int control(u_int = K_BROADMODE); - int control(u_int, /* mode */ int /* site */ ); - // Interface for CLASSIX' send mode - - // = HELPER - void dump (void) const; - // Dump the state of an object. - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - - protected: - friend class ACE_CLASSIX_CLD_Connector; - friend class ACE_CLASSIX_CO_Connector; - friend class ACE_CLASSIX_CO_Acceptor; - ACE_CLASSIX_SAP& get_local_sap(void); - // Returns local sap - ACE_CLASSIX_Peer_SAP& get_peer_sap(void); - // Returns peer sap - int set_local_port(ACE_CLASSIX_Port_Core*); - // Uses the supplied port as the local port and assumes the ownership - // of the port. The existing local port, if any, will be deleted. - // Returns 0, if it is successful. - // Returns -1, otherwise. The setting of the original local port - // will be erased. - - void set_target_(void); - // set the delivery target structure using the existing peer information - - virtual int set_mode_(u_int = K_BROADMODE); /* theMode */ - // Sets the addressing mode with the current setting of coTarget - virtual int set_mode_(u_int, /* mode */ int /* site */); - // Sets the addressing mode as well as the coTarget - - ACE_CLASSIX_SAP local_sap_; - int local_sap_closed_; - // 0 if it's not closed(default), - // 1 if it's closed. - ACE_CLASSIX_Port_Core *local_port_; - // if non-zero, it will be - // deleted on exit. - - ACE_CLASSIX_Peer_SAP peer_sap_; - int peer_sap_closed_; - // 0 if it's not closed(default), - // 1 if it's closed. - - // Mode applied destination address - // Can be changed by control()/set_mode_() - // Mode is applicable in IPC classes other than the Stream class. - // It is here since it is the destination format used by ipcSend. - - // with/without additional site information - // int dest_site_; - KnIpcDest dest_; - - private: - // Disable copy constructor - ACE_CLASSIX_Stream(ACE_CLASSIX_Stream const&); - ACE_CLASSIX_Stream const& operator=(ACE_CLASSIX_Stream const&); -}; - -/* ------------------------------------------------------------------------- */ - -#if defined (__ACE_INLINE__) -#include "ace/CLASSIX/CLASSIX_Stream.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CLASSIX_Stream_H */ diff --git a/ace/CLASSIX/CLASSIX_Stream.i b/ace/CLASSIX/CLASSIX_Stream.i deleted file mode 100644 index a876a3d78c9..00000000000 --- a/ace/CLASSIX/CLASSIX_Stream.i +++ /dev/null @@ -1,182 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_CLASSIX_Stream::~ACE_CLASSIX_Stream(void) -{ - this->close(); -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::control(u_int theMode) -{ - return this->set_mode_(theMode); -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::control(u_int theMode, int theSite) -{ - return this->set_mode_(theMode, theSite); -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::set_mode_(u_int theMode) -{ - return 0; -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::set_mode_(u_int theMode, int theSite) -{ - return 0; -} - -ACE_INLINE -ssize_t -ACE_CLASSIX_Stream::peek(ACE_Time_Value* theTimeout) const -{ - return this->ipcRecv(0, 0, MSG_PEEK, theTimeout); -} - -ACE_INLINE -ssize_t -ACE_CLASSIX_Stream::send(const void *theBuf, size_t theLen) const -{ - return this->send_n(theBuf, theLen); -} - -ACE_INLINE -ssize_t -ACE_CLASSIX_Stream::send(const void *theBuf,size_t theLen, int theFlag) -{ - return this->send_n(theBuf, theLen, theFlag); -} - -ACE_INLINE -ssize_t -ACE_CLASSIX_Stream::recv_n(void* theBuf, int theLen) const -{ - return this->recv_n(theBuf, theLen); -} - -ACE_INLINE -ACE_HANDLE -ACE_CLASSIX_Stream::get_handle(void) const -{ - return this->local_sap_.get_handle(); -} - -ACE_INLINE -void -ACE_CLASSIX_Stream::set_handle(ACE_HANDLE theHandle) -{ - this->local_sap_.set_handle(theHandle); -} - -ACE_INLINE -const ACE_CLASSIX_SAP& -ACE_CLASSIX_Stream::local_sap(void) const -{ - return this->local_sap_; -} - -ACE_INLINE -const ACE_CLASSIX_Peer_SAP& -ACE_CLASSIX_Stream::peer_sap(void) const -{ - return this->peer_sap_; -} - -ACE_INLINE -ACE_CLASSIX_SAP& -ACE_CLASSIX_Stream::get_local_sap(void) -{ - return this->local_sap_; -} - -ACE_INLINE -ACE_CLASSIX_Peer_SAP& -ACE_CLASSIX_Stream::get_peer_sap(void) -{ - return this->peer_sap_; -} - -ACE_INLINE -const ACE_CLASSIX_Port& -ACE_CLASSIX_Stream::local_addr(void) const -{ - return this->local_sap_.get_addr(); -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::selectable(int thePriority) -{ - return this->local_sap_.selectable(thePriority); -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::unselectable(void) -{ - return this->local_sap_.unselectable(); -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::is_selectable(void) const -{ - return this->local_sap_.is_selectable(); -} - - -ACE_INLINE -int -ACE_CLASSIX_Stream::is_writer_closed(void) const -{ - - return (this->peer_sap_closed_ == 1); -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::close_reader(void) -{ - this->local_sap_closed_ = 1; - return 0; -} - - -ACE_INLINE -int -ACE_CLASSIX_Stream::is_reader_closed(void) const -{ - - return this->local_sap_closed_ == 1; -} - - -ACE_INLINE -int -ACE_CLASSIX_Stream::enable(int) const -{ - return 0; -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::disable(int) const -{ - return 0; -} - -ACE_INLINE -int -ACE_CLASSIX_Stream::get_remote_addr(ACE_Addr&) const -{ - return this->peer_sap_closed_ == 0; -} diff --git a/ace/CLASSIX/Makefile b/ace/CLASSIX/Makefile deleted file mode 100644 index a207ce3da0e..00000000000 --- a/ace/CLASSIX/Makefile +++ /dev/null @@ -1,544 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the entire ACE release -#---------------------------------------------------------------------------- - -MAKEFILE = Makefile -LIB = libCLASSIX.a - -FILES = \ - CLASSIX_OS \ - CLASSIX_Select_Reactor \ - CLASSIX_Addr \ - CLASSIX_Port_Core \ - CLASSIX_Port \ - CLASSIX_Port_Default \ - CLASSIX_Group \ - CLASSIX_Group_Stamp \ - CLASSIX_Group_Dynamic \ - CLASSIX_SAP \ - CLASSIX_Peer_SAP \ - CLASSIX_Stream \ - CLASSIX_Dgram_Mcast \ - CLASSIX_CO_Acceptor \ - CLASSIX_CO_Connector \ - CLASSIX_CLD_Connector - -DEFS = $(addsuffix .h,$(FILES)) Svc_Conf_Tokens.h -DEFS += $(addsuffix .i,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -BUILD = $(VLIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -#### Disable installs in this ($(ACE_ROOT)/ace) directory, because this -#### is the (default) destination of installs anyways. And this will prevent -#### creation of a link from the ACE library to itself when the build of -#### the ACE library fails. -INSTALL = -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#### Setting ACELIB to null allows it to be used for building shared libraries, -#### including libACE.$(SOEXT,) on certain platforms. -ACELIB = - - -ifeq ($(SUPPRESS_DASH_G),1) -#### Build this target without -g on some platforms. - $(COMPILE-NO_DASH_G.cc) -o $@ $< -endif # SUPPRESS_DASH_G - -ifeq ($(CHORUS),1) - ifeq ($(CC),$(GHS_DIR)/build -driver ch68) - #### Build this target without -g, because it causes ghs 1.8.8 to core - #### dump. - $(VDIR)Select_Reactor.o .obj/Select_Reactor.so .shobj/Select_Reactor.o .shobj/Select_Reactor.so: - $(COMPILE-NO_DASH_G.cc) -o $@ $< - endif # CC -endif # CHORUS - -ifneq ($(GHS),) - ifeq ($(CPU),86) - $(VDIR)gethrtime.$(OBJEXT): - make $@ ghs=0 - endif # 86 -endif # GHS - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/CLASSIX_OS.o .obj/CLASSIX_OS.so .shobj/CLASSIX_OS.o .shobj/CLASSIX_OS.so: CLASSIX_OS.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Select_Reactor.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_SAP.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_SAP.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Select_Reactor.i -.obj/CLASSIX_Select_Reactor.o .obj/CLASSIX_Select_Reactor.so .shobj/CLASSIX_Select_Reactor.o .shobj/CLASSIX_Select_Reactor.so: CLASSIX_Select_Reactor.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Select_Reactor.h \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_SAP.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_SAP.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Select_Reactor.i -.obj/CLASSIX_Addr.o .obj/CLASSIX_Addr.so .shobj/CLASSIX_Addr.o .shobj/CLASSIX_Addr.so: CLASSIX_Addr.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i -.obj/CLASSIX_Port_Core.o .obj/CLASSIX_Port_Core.so .shobj/CLASSIX_Port_Core.o .shobj/CLASSIX_Port_Core.so: CLASSIX_Port_Core.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i -.obj/CLASSIX_Port.o .obj/CLASSIX_Port.so .shobj/CLASSIX_Port.o .shobj/CLASSIX_Port.so: CLASSIX_Port.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i -.obj/CLASSIX_Port_Default.o .obj/CLASSIX_Port_Default.so .shobj/CLASSIX_Port_Default.o .shobj/CLASSIX_Port_Default.so: CLASSIX_Port_Default.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Default.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Core.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_OS.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port_Default.i -.obj/CLASSIX_Group.o .obj/CLASSIX_Group.so .shobj/CLASSIX_Group.o .shobj/CLASSIX_Group.so: CLASSIX_Group.cpp \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Group.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Addr.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.h \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Port.i \ - $(ACE_ROOT)/ace/CLASSIX/CLASSIX_Group.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h deleted file mode 100644 index 7e76e2fa941..00000000000 --- a/ace/CORBA_macros.h +++ /dev/null @@ -1,547 +0,0 @@ -// -*- C++ -*- - -// ============================================================================ -/** - * @file CORBA_macros.h - * - * $Id$ - * - * Writing code that is portable between platforms with or without - * native C++ exceptions is hard. The following macros offer some - * help on this task, mostly oriented to making the ORB code and the - * IDL generated code portable. - * - * @author Nanbor Wang - * @author Aniruddha Gokhale - * @author Carlos O'Ryan , et al. - */ -// ============================================================================ - -// Macros for handling CORBA exceptions. - -#ifndef ACE_CORBA_MACROS_H -#define ACE_CORBA_MACROS_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -# if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -# endif /* ACE_LACKS_PRAGMA_ONCE */ - -#define ACE_ENV_POLLUTE_NAMES - -#include "ace/Exception_Macros.h" - -// If you wish to you use these macros for emulating exceptions on -// platforms which lack native exception support, you need to do the -// following: -// 1. Define a class Exception. You can name it as you please. This class -// should be at the root of the inheritance hierarchy of all the -// exceptions used in your application. It should define at a minimum -// the following pure virtual methods: -// a) _downcast () - Which allows narrowing of the base exception type to a -// derived type. -// b) _raise() - Which throws an exception of type Exception. -// -// Classes which derive from these should implement these operations. -// -// 2. Define a class Environment. You can name it as you please. This class -// is an exception holder. This class is always on the stack. It should -// support at a minimum the following methods: -// a) exception() - Which returns the Exception held in the current -// Environment. -// b) exception (Exception* foo) - Which replaces/sets the Exception -// held in the current Environment with foo. -// b) clear() - Which resets a particular instance of Environment. -// c) A copy constructor and an assignment operator. -// -// Note that the above description assumes that you use the following -// macros only within a particular domain. For example, if your -// application has to interoperate across domains, then you need to define -// an exception adapter to translate exceptions from one domain to -// exceptions in the other. Please refer to Stroustrup's book on how to do -// this. If your use case is this complex, you would be better off with -// going with native exceptions rather than emulated exceptions, though -// the macros should still work if you defined your adapter class as -// ACE_EXCEPTION_TYPE. - - -// The following macros assume that an environment variable is passed -// in/out of each function that can throw an exception. The type of the -// environment variable is defined by ACE_ENV_TYPE. - -#if !defined (ACE_ENV_TYPE) -# define ACE_ENV_TYPE CORBA::Environment -#endif /* ACE_ENV_TYPE */ - -// The name of the variable is defined by ACE_TRY_ENV. Below is the name -// that we use by default. If you wish to change it you can redefine -// ACE_TRY_ENV to change the default name. Also ACE_ADOPT_ENV allows the -// use of non-standard name within a scope. - -#if !defined (ACE_TRY_ENV) -# define ACE_TRY_ENV _ACE_CORBA_Environment_variable -#endif /* ACE_TRY_ENV */ - -// The base type of Exception from which all the other exception types are -// derived. You can set this to any type as you please. By default, it is -// set to CORBA::Exception. - -#if !defined (ACE_EXCEPTION_TYPE) -# define ACE_EXCEPTION_TYPE CORBA::Exception -#endif /* ACE_EXCEPTION_TYPE */ - -// This method is used to get the default value of the Environment -// variable. In the case of TAO, this variable is part of the TSS ORB -// resources and the method TAO_default_environment() returns the -// Environment variable. - -#if !defined (ACE_DEFAULT_GET_ENV_METHOD) -# define ACE_DEFAULT_GET_ENV_METHOD TAO_default_environment -#endif /* ACE_DEFAULT_GET_ENV_METHOD */ - -// This is the exception caught by ACE_CATCHANY. -#if !defined (ACE_ANY_EXCEPTION) -# define ACE_ANY_EXCEPTION ex -#endif /* ACE_ANY_EXCEPTION */ - -// Declare a new environment variable on the stack. The type of the -// environment variable is determined by ACE_ENV_TYPE. -#define ACE_DECLARE_NEW_ENV \ - ACE_ENV_TYPE ACE_TRY_ENV - -// Provided for backward compatibility purposes. Don't use it in new code. -// Use the definition above along with defining ACE_ENV_TYPE. - -#if defined (ACE_ENV_POLLUTE_NAMES) -# define ACE_DECLARE_NEW_CORBA_ENV ACE_ENV_TYPE ACE_TRY_ENV -#endif /* ACE_ENV_POLLUTE_NAMES */ - -#if defined (ACE_USES_NATIVE_EXCEPTIONS) -// ----------------------------------------------------------------- - -// Provided for backward compatibility purposes. Don't use it in new code. -#if defined (ACE_ENV_POLLUTE_NAMES) -# define ACE_ADOPT_CORBA_ENV(ENV) -#endif /* ACE_ENV_POLLUTE_NAMES */ - -#define ACE_ADOPT_ENV (ENV) - -// No need to check. Native exceptions handle the control flow -// automatically when an exception occurs. -# define ACE_CHECK - -// Used when the function requires a return value. -# define ACE_CHECK_RETURN(RETV) - -// ACE_THROW_INT should not be used by the user. -# define ACE_THROW_INT(EXCEPTION) \ - throw EXCEPTION - -// Throwing an exception is easy. These two macros should _NOT_ be -// used within try blocks. -# define ACE_THROW(EXCEPTION) \ - throw EXCEPTION - -// Throwing an exception when the function reqires a return value. -# if defined (WIN32) || defined (__HP_aCC) -# define ACE_THROW_RETURN(EXCEPTION, RETV) \ - do \ - { \ - throw EXCEPTION; \ - return RETV; \ - } while (0) -# else /* WIN32 */ -# define ACE_THROW_RETURN(EXCEPTION,RETV) \ - throw EXCEPTION -# endif /* WIN32 */ - -// For compilers with native exceptions, we can simply use try to try. ;-) -// do {} while (0) is required to avoid compilation warnings. -# define ACE_TRY \ - do \ - { \ - try \ - { -# define ACE_TRY_NEW_ENV \ - do \ - { \ - ACE_ENV_TYPE ACE_TRY_ENV; \ - try \ - { -# define ACE_TRY_EX(LABEL) \ - do \ - { \ - try \ - { - -// No need to check for exceptions within try block for compilers with -// native exceptions. -# define ACE_TRY_CHECK -# define ACE_TRY_CHECK_EX(LABEL) - -// Likewise, throwing exceptions within try blocks is easy. -# define ACE_TRY_THROW(EXCEPTION) throw EXCEPTION -# define ACE_TRY_THROW_EX(EXCEPTION,LABEL) throw EXCEPTION - -// Same thing for catch. -# define ACE_CATCH(EXCEPTION,VAR) \ - } \ - catch (EXCEPTION & VAR) \ - { \ - ACE_UNUSED_ARG (VAR); - -# define ACE_CATCHANY \ - ACE_CATCH(ACE_EXCEPTION_TYPE, ACE_ANY_EXCEPTION) - -# define ACE_CATCHALL \ - } \ - catch (...) \ - { - -# if defined (ACE_HAS_DEPRECATED_ACE_RETHROW) -# define ACE_RETHROW throw -# endif /* ACE_HAS_DEPRECATED_ACE_RETHROW */ - -// Rethrowing the exception from catch blocks. -# define ACE_RE_THROW throw -# define ACE_RE_THROW_EX(LABEL) throw - -// Close the catch block. -# define ACE_ENDTRY \ - } \ - } while (0) - -#else /* ! ACE_USES_NATIVE_EXCEPTIONS */ -// ----------------------------------------------------------------- - -// When handling compilers without native exceptions, things get a bit -// hairy. Exceptions are simulated using ACE_ENV_TYPE. The trick here is to -// make sure the flow-of-control can simulate the case when native -// exceptions occur... - -#if defined (ACE_ENV_POLLUTE_NAMES) -# define ACE_ADOPT_CORBA_ENV(ENV) ACE_ENV_TYPE &ACE_TRY_ENV = ENV -#endif /* ACE_ENV_POLLUTE_NAMES */ - -# define ACE_ADOPT_ENV(ENV) ACE_ENV_TYPE &ACE_TRY_ENV = ENV - -// Follow every statement that could throw exceptions with ACE_CHECK or -// ACE_CHECK_RETURN. These two macros should _NOT_ be used within try -// blocks. Use ACE_TRY_CHECK or ACE_TRY_CHECK_EX instead. -# define ACE_CHECK \ - if (ACE_TRY_ENV . exception () != 0) \ - return -// When function requires a return value -# define ACE_CHECK_RETURN(RETV) \ - if (ACE_TRY_ENV . exception () != 0) \ - return RETV - -// ACE_THROW_INT should not be used by the user. -# define ACE_THROW_INT(EXCEPTION) ACE_TRY_ENV.exception (new EXCEPTION) - -// Throwing exceptions will inevitably cause a return from the current -// function. These two macros should _NOT_ be used within try blocks. Use -// ACE_TRY_THROW or ACE_TRY_THROW_EX instead. -# define ACE_THROW(EXCEPTION) \ - do \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - return; \ - } while (0) - -# define ACE_THROW_RETURN(EXCEPTION,RETV) \ - do \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - return RETV; \ - } while (0) - -// ACE_TRY sets up flags to control program flow. ACE_TRY_FLAG acts like a -// one-shot flip-flop. When an exception occurs (detected using -// ACE_TRY_CHECK,) ACE_TRY_FLAG will be reset and the control goes back -// into ACE_TRY_LABEL. Since ACE_TRY_FLAG is reset, the try block won't get -// executed again and the control proceeds to the following catch blocks. -// ACE_EXCEPTION_NOT_CAUGHT flag is used to prevent catching an exception -// twice. This macro assumes there's already an ACE_ENV_TYPE variable -// ACE_TRY_ENV defined (which should be the case normally) -# define ACE_TRY \ - do { \ - int ACE_TRY_FLAG = 1; \ - int ACE_EXCEPTION_NOT_CAUGHT = 1; \ - ACE_TRY_LABEL: \ - if (ACE_TRY_FLAG) \ - do { - -// ACE_TRY_NEW_ENV functions like the macro ACE_TRY but defines a new -// ACE_ENV_TYPE variable ACE_TRY_ENV. It is most often used in the outer -// most function where no ACE_TRY_ENV is available. -# define ACE_TRY_NEW_ENV \ - do { \ - ACE_ENV_TYPE ACE_TRY_ENV;\ - int ACE_TRY_FLAG = 1; \ - int ACE_EXCEPTION_NOT_CAUGHT = 1; \ - ACE_TRY_LABEL: \ - if (ACE_TRY_FLAG) \ - do { - -// ACE_TRY_EX works exactly like ACE_TRY macro except the label used in the -// try block is customizable to avoid name clashing. It should be used when -// nested try blocks or multiple try blocks are required, in the same -// function. -# define ACE_TRY_EX(LABEL) \ - do { \ - int ACE_TRY_FLAG = 1; \ - int ACE_EXCEPTION_NOT_CAUGHT = 1; \ - ACE_TRY_LABEL ## LABEL: \ - if (ACE_TRY_FLAG) \ - do { - -// Check for exceptions within try blocks. -# define ACE_TRY_CHECK \ - { \ - if (ACE_TRY_ENV.exception () != 0) \ - { \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL; \ - } \ - } - -// Checking exception within EX try blocks. -# define ACE_TRY_CHECK_EX(LABEL) \ - { \ - if (ACE_TRY_ENV.exception () != 0) \ - { \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL ## LABEL; \ - } \ - } - -// Throwing exception within TRY blocks. -# define ACE_TRY_THROW(EXCEPTION) \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL; \ - } - -# define ACE_TRY_THROW_EX(EXCEPTION,LABEL) \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL ## LABEL; \ - } - -// When exceptions occur or try block finishes execution without exception, -// control will continue in the catch block. This macro first checks if -// there's any uncaught exception left. If all the conditions are met, we -// have caught an exception. It then resets ACE_EXCEPTION_NOT_CAUGHT to -// prevent subsequent catch blocks from catching the same exception again, -// and extracts out the underlying exception in ACE_TRY_ENV. We also make a -// copy of ACE_TRY_ENV in ACE_CAUGHT_ENV, in case we want to rethrow the -// exception. ACE_TRY_ENV is cleared out after the exception is caught so -// you should not use ACE_TRY_ENV within the catch block(You should use the -// exception directly). -# define ACE_CATCH(TYPE,VAR) \ - } while (0); \ - do \ - if (ACE_TRY_ENV.exception () != 0 && ACE_EXCEPTION_NOT_CAUGHT && \ - TYPE::_downcast(ACE_TRY_ENV.exception ()) != 0) \ - { \ - ACE_ENV_TYPE ACE_CAUGHT_ENV = ACE_TRY_ENV;\ - ACE_EXCEPTION_NOT_CAUGHT = 0; \ - TYPE &VAR = *TYPE::_downcast (ACE_CAUGHT_ENV.exception ()); \ - ACE_UNUSED_ARG (VAR); \ - ACE_TRY_ENV.clear (); - -// ACE_CATCHANY uses ACE_CATCH to catch all exceptions derived from -// ACE_EXCEPTION_TYPE -# define ACE_CATCHANY ACE_CATCH (ACE_EXCEPTION_TYPE, ACE_ANY_EXCEPTION) - -// Since there's no other exception for compilers without exception -// support, we simply catch all ACE_EXCEPTION_TYPE exceptions for -// ACE_CATCHALL. -# define ACE_CATCHALL ACE_CATCHANY - -# if defined (ACE_HAS_DEPRECATED_ACE_RETHROW) -# define ACE_RETHROW \ - do \ - ACE_TRY_ENV = ACE_CAUGHT_ENV; \ - while (0) -# endif /* ACE_HAS_DEPRECATED_ACE_RETHROW */ - -// Rethrowing exception within catch blocks. Notice that we depend on the -// ACE_CHECK/ACE_CHECK_RETURN following the ACE_ENDTRY, or ACE_TRY_CHECK/ -// ACE_TRY_CHECK_EX following the ACE_ENDTRY when the catch block is within -// another try block, to do the "Right Thing[TM]." -# define ACE_RE_THROW \ - do {\ - ACE_TRY_ENV = ACE_CAUGHT_ENV; \ - goto ACE_TRY_LABEL; \ - } while (0) -# define ACE_RE_THROW_EX(LABEL) \ - do {\ - ACE_TRY_ENV = ACE_CAUGHT_ENV; \ - goto ACE_TRY_LABEL ## LABEL; \ - } while (0) - -// Close the try block. Since exceptions may not get caught, and exceptions -// can also be rethrown from the catch block, it's always a good idea to -// follow ACE_ENDTRY with ACE_CHECK or ACE_TRY_CHECK (depending on the -// context.) -# define ACE_ENDTRY \ - } while (0); \ - } while (0) - -#endif /* ! ACE_CORBA_HAS_EXCEPTIONS */ - -// ACE_HAS_EXCEPTIONS is not the same as ACE_NEW_THROWS_EXCEPTIONS. -#if defined(ACE_NEW_THROWS_EXCEPTIONS) - -# define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \ - do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \ - } while (0) - -#else /* ! ACE_NEW_THROWS_EXCEPTIONS */ - -# define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \ - do { POINTER = new CONSTRUCTOR; \ - if (POINTER == 0) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \ - } while (0) - -#endif /* ACE_NEW_THROWS_EXCEPTIONS */ - -# define ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ - ACE_Guard< MUTEX > OBJ (LOCK); \ - if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION); - -# define ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ - ACE_Read_Guard< MUTEX > OBJ (LOCK); \ - if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION); - -# define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ - ACE_Write_Guard< MUTEX > OBJ (LOCK); \ - if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION); - -//@{ -/** - * @name Native C++ exceptions portability macros. - * - * The following macros are used to write code portable between platforms - * with and without native C++ exception support. Their main goal is to - * hide the presence of the ACE_ENV_TYPE argument, but they collaborate - * with the ACE_TRY_* macros to emulate the try/catch blocks. - */ - -/// Define a macro to emit code only when ACE_ENV_TYPE is used -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) -# define ACE_ENV_EMIT_CODE(X) X -#else -# define ACE_ENV_EMIT_CODE(X) -#endif /* ACE_USES_NATIVE_EXCEPTIONS && ! ACE_ENV_BKWD_COMPAT */ - -/// Another macro to emit code only when ACE_ENV_TYPE is used -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) -# define ACE_ENV_EMIT_CODE2(X,Y) X,Y -#else -# define ACE_ENV_EMIT_CODE2(X,Y) -#endif /* ACE_USES_NATIVE_EXCEPTIONS && ! ACE_ENV_BKWD_COMPAT */ - -/// Helper macro -#define ACE_ENV_EMIT_DUMMY - -/// Declare a ACE_ENV_TYPE argument as the last argument of a -/// function -/** - * Normally this macro is used as follows: - * - * void my_funct (int x, int y ACE_ENV_ARG_DECL); - * - * Its purpose is to provide developers (and users) with a mechanism to - * write code that is portable to platforms with and without native C++ - * exceptions. - */ -#define ACE_ENV_ARG_DECL \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_ENV_TYPE &ACE_TRY_ENV) - -/// Declare a ACE_ENV_TYPE argument with the default value obtained from -/// the ORB/application. -/** - * It is similar to ACE_ENV_ARG_DECL. The name of the default environment - * getter method needs to be changed when switching ORBs or when used with - * another application. - */ -#define ACE_ENV_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_ENV_TYPE &ACE_TRY_ENV = \ - ACE_DEFAULT_GET_ENV_METHOD ()) - -/// Declare a ACE_ENV_TYPE argument that is not used by the -/// function definition. -/** - * Similar to ACE_ENV_ARG_DECL, but the formal parameter name is dropped to - * avoid warnings about unused parameters - */ -#define ACE_ENV_ARG_DECL_NOT_USED \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_ENV_TYPE &) - -/// Declare a ACE_ENV_TYPE argument for methods that do not take any other -/// parameters -#define ACE_ENV_SINGLE_ARG_DECL \ - ACE_ENV_EMIT_CODE(ACE_ENV_TYPE &ACE_TRY_ENV) - -/// Declare a ACE_ENV_TYPE argument with a default value for methods that -/// do not take any other parameters. The name of the default environment -/// getter method needs to be changed when switching ORBs or when used in -/// another application. -#define ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_EMIT_CODE(ACE_ENV_TYPE &ACE_TRY_ENV = \ - ACE_DEFAULT_GET_ENV_METHOD ()) - -/// Declare a ACE_ENV_TYPE argument for methods which don't use it. -#define ACE_ENV_SINGLE_ARG_DECL_NOT_USED \ - ACE_ENV_EMIT_CODE(ACE_ENV_TYPE &) - -/// Use the ACE_ENV_TYPE argument in a nested call -#define ACE_ENV_ARG_PARAMETER \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_TRY_ENV) - -/// Use the ACE_ENV_TYPE argument in a nested call, assuming that the -/// called function takes only the ACE_TRY_ENV argument. -#define ACE_ENV_SINGLE_ARG_PARAMETER \ - ACE_ENV_EMIT_CODE(ACE_TRY_ENV) - -/// Eliminate unused argument warnings about ACE_TRY_ENV -#define ACE_ENV_ARG_NOT_USED \ - ACE_ENV_EMIT_CODE(ACE_UNUSED_ARG(ACE_TRY_ENV)) -//@} - -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) -// This thing can be moved above when we drop ACE_ENV_BKWD_COMPAT. -# define ACE_ENV_RAISE(ex) ACE_TRY_ENV.exception (ex) -#else -# define ACE_ENV_RAISE(ex) (ex)->_raise () -#endif /* ACE_CORBA_HAS_EXCEPTIONS */ - -// ============================================================ - -// Print out a TAO exception. This is not CORBA compliant. -# define ACE_PRINT_TAO_EXCEPTION(EX,INFO) \ - EX._tao_print_exception (INFO) - -// Print out a CORBA exception. There is not portable way to -// dump a CORBA exception. If you are using other ORB implementation, -// redefine the macro to get what you want. -# if !defined ACE_PRINT_EXCEPTION -# define ACE_PRINT_EXCEPTION(EX,INFO) ACE_PRINT_TAO_EXCEPTION(EX,INFO) -# endif /* ACE_PRINT_EXCEPTION */ - -#include "ace/post.h" - -#endif /* ACE_CORBA_MACROS_H */ diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp deleted file mode 100644 index 9460c2df16d..00000000000 --- a/ace/Cache_Map_Manager_T.cpp +++ /dev/null @@ -1,420 +0,0 @@ -// $Id$ - -#ifndef ACE_CACHE_MAP_MANAGER_T_C -#define ACE_CACHE_MAP_MANAGER_T_C - -#include "ace/Cache_Map_Manager_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#define ACE_LACKS_PRAGMA_ONCE -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Malloc.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Cache_Map_Manager_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Cache_Map_Manager_T, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Manager) - -#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) - -ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Iterator) - -ACE_ALLOC_HOOK_DEFINE(ACE_Cache_Map_Reverse_Iterator) - -#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES -#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES - -#else - -#define ACE_T1 class KEY, class VALUE, class MAP, class CACHING_STRATEGY, class ATTRIBUTES -#define ACE_T2 KEY, VALUE, MAP, CACHING_STRATEGY, ATTRIBUTES - -#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */ - -template -ACE_Cache_Map_Manager::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_s, - size_t size, - ACE_Allocator *alloc) - : caching_strategy_ (caching_s) -{ - if (this->open (size, alloc) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager"))); - -} - -template -ACE_Cache_Map_Manager::~ACE_Cache_Map_Manager (void) -{ - this->close (); -} - -template int -ACE_Cache_Map_Manager::open (size_t length, - ACE_Allocator *alloc) -{ - return this->map_.open (length, - alloc); -} - -template int -ACE_Cache_Map_Manager::close (void) -{ - return this->map_.close (); -} - -template int -ACE_Cache_Map_Manager::bind (const KEY &key, - const VALUE &value) -{ - // Insert an entry which has the and the which - // is the combination of the and the attributes of the - // caching strategy. - CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); - - int bind_result = this->map_.bind (key, - cache_value); - - if (bind_result != -1) - { - - int result = this->caching_strategy_.notify_bind (bind_result, - cache_value.second ()); - - if (result == -1) - { - - this->map_.unbind (key); - - // Unless the notification goes thru the bind operation is - // not complete. - bind_result = -1; - - } - - } - - return bind_result; -} - - -template int -ACE_Cache_Map_Manager::rebind (const KEY &key, - const VALUE &value) -{ - CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); - - int rebind_result = this->map_.rebind (key, - cache_value); - - if (rebind_result != -1) - { - - int result = this->caching_strategy_.notify_rebind (rebind_result, - cache_value.second ()); - - if (result == -1) - { - - // Make sure the unbind operation is done only when the - // notification fails after a bind which is denoted by - // rebind_result = 0 - if (rebind_result == 0) - this->map_.unbind (key); - - // Unless the notification goes thru the rebind operation is - // not complete. - rebind_result = -1; - - } - - } - - return rebind_result; -} - - -template int -ACE_Cache_Map_Manager::rebind (const KEY &key, - const VALUE &value, - VALUE &old_value) -{ - CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); - - CACHE_VALUE old_cache_value (old_value, - this->caching_strategy_.attributes ()); - - int rebind_result = this->map_.rebind (key, - cache_value, - old_cache_value); - - if (rebind_result != -1) - { - - int result = this->caching_strategy_.notify_rebind (rebind_result, - cache_value.second ()); - - if (result == -1) - { - - // Make sure the unbind operation is done only when the - // notification fails after a bind which is denoted by - // rebind_result = 0 - if (rebind_result == 0) - this->map_.unbind (key); - - // Unless the notification goes thru the rebind operation is - // not complete. - rebind_result = -1; - - } - else - { - - old_value = old_cache_value.first (); - - } - - } - - return rebind_result; -} - -template int -ACE_Cache_Map_Manager::rebind (const KEY &key, - const VALUE &value, - KEY &old_key, - VALUE &old_value) -{ - CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); - - CACHE_VALUE old_cache_value (old_value, - this->caching_strategy_.attributes ()); - - int rebind_result = this->map_.rebind (key, - cache_value, - old_key, - old_cache_value); - - if (rebind_result != -1) - { - - int result = this->caching_strategy_.notify_rebind (rebind_result, - cache_value.second ()); - - if (result == -1) - { - - // Make sure the unbind operation is done only when the - // notification fails after a bind which is denoted by - // rebind_result = 0 - if (rebind_result == 0) - this->map_.unbind (key); - - // Unless the notification goes thru the rebind operation is - // not complete. - rebind_result = -1; - - } - else - { - - old_value = old_cache_value.first (); - - } - - } - - return rebind_result; -} - -template int -ACE_Cache_Map_Manager::trybind (const KEY &key, - VALUE &value) -{ - CACHE_VALUE cache_value (value, - this->caching_strategy_.attributes ()); - - int trybind_result = this->map_.trybind (key, - cache_value); - - if (trybind_result != -1) - { - - int result = this->caching_strategy_.notify_trybind (trybind_result, - cache_value.second ()); - - if (result == -1) - { - - // If the entry has got inserted into the map, it is removed - // due to failure. - if (trybind_result == 0) - this->map_.unbind (key); - - trybind_result = -1; - - } - else - { - - // If an attempt is made to bind an existing entry the value - // is overwritten with the value from the map. - if (trybind_result == 1) - value = cache_value.first (); - - } - - } - - return trybind_result; -} - -template int -ACE_Cache_Map_Manager::find (const KEY &key, - VALUE &value) -{ - // Lookup the key and populate the . - CACHE_VALUE cache_value; - - int find_result = this->map_.find (key, - cache_value); - - if (find_result != -1) - { - - int result = this->caching_strategy_.notify_find (find_result, - cache_value.second ()); - - // Unless the find and notification operations go thru, this - // method is not successful. - if (result == -1) - find_result = -1; - else - { - - // Since the has now changed after the - // notification, we need to bind to the map again. - int rebind_result = this->map_.rebind (key, - cache_value); - if (rebind_result == -1) - find_result = -1; - else - value = cache_value.first (); - - } - - } - - return find_result; -} - -template int -ACE_Cache_Map_Manager::find (const KEY &key) -{ - // Lookup the key and populate the . - CACHE_VALUE cache_value; - - int find_result = this->map_.find (key, - cache_value); - - if (find_result != -1) - { - - int result = this->caching_strategy_.notify_find (find_result, - cache_value.second ()); - - // Unless the find and notification operations go thru, this - // method is not successful. - if (result == -1) - find_result = -1; - else - { - - // Since the has now changed after the - // notification, we need to bind to the map again. - int rebind_result = this->map_.rebind (key, - cache_value); - - if (rebind_result == -1) - find_result = -1; - - } - - } - - return find_result; -} - - -template int -ACE_Cache_Map_Manager::unbind (const KEY &key) -{ - // Remove the entry from the cache. - CACHE_VALUE cache_value; - - int unbind_result = this->map_.unbind (key, - cache_value); - - if (unbind_result != -1) - { - - int result = this->caching_strategy_.notify_unbind (unbind_result, - cache_value.second ()); - - if (result == -1) - unbind_result = -1; - - } - - return unbind_result; -} - -template int -ACE_Cache_Map_Manager::unbind (const KEY &key, - VALUE &value) -{ - // Remove the entry from the cache. - CACHE_VALUE cache_value; - - int unbind_result = this->map_.unbind (key, - cache_value); - - if (unbind_result != -1) - { - - int result = this->caching_strategy_.notify_unbind (unbind_result, - cache_value.second ()); - - if (result == -1) - unbind_result = -1; - else - value = cache_value.first (); - - } - - return unbind_result; -} - - -template void -ACE_Cache_Map_Manager::dump (void) const -{ - this->map_.dump (); - - this->caching_strategy_.dump (); -} - -#undef ACE_T1 -#undef ACE_T2 - -#endif /* ACE_CACHE_MAP_MANAGER_T_C */ diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h deleted file mode 100644 index 7b5a3052463..00000000000 --- a/ace/Cache_Map_Manager_T.h +++ /dev/null @@ -1,428 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Cache_Map_Manager_T.h - * - * $Id$ - * - * @author Kirthika Parameswaran - */ -//============================================================================= - -#ifndef ACE_CACHE_MAP_MANAGER_T_H -#define ACE_CACHE_MAP_MANAGER_T_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Default_Constants.h" -#include "ace/Global_Macros.h" -#include "ace/Pair_T.h" - -// Forward declaration. -class ACE_Allocator; - -#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) - -#define ACE_Cache_Map_Iterator ACMI -#define ACE_Cache_Map_Reverse_Iterator ACMRI - -template -class ACE_Cache_Map_Iterator; - -template -class ACE_Cache_Map_Reverse_Iterator; - -#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES -#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES - -#else - -#define ACE_T1 class KEY, class VALUE, class MAP, class CACHING_STRATEGY, class ATTRIBUTES -#define ACE_T2 KEY, VALUE, MAP, CACHING_STRATEGY, ATTRIBUTES - -#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */ - -// For linkers that cant grok long names. -#define ACE_Cache_Map_Manager ACMM - -/** - * @class ACE_Cache_Map_Manager - * - * @brief Defines a abstraction that will purge entries from a map. - * - * The will manage the map it contains - * and provide purging on demand from the map. The strategy for - * caching is decided by the user and provided to the Cache - * Manager. The Cache Manager acts as a agent and communicates - * between the Map and the Strategy for purging entries from the - * map. - * No locking mechanism provided since locking at this level - * isn't efficient. Locking has to be provided by the - * application. - */ -template -class ACE_Cache_Map_Manager -{ -public: - - // = Traits. - typedef KEY key_type; - typedef VALUE mapped_type; - typedef MAP map_type; - typedef CACHING_STRATEGY caching_strategy_type; - -#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) - - typedef ITERATOR_IMPL ITERATOR_IMPLEMENTATION; - typedef REVERSE_ITERATOR_IMPL REVERSE_ITERATOR_IMPLEMENTATION; - - friend class ACE_Cache_Map_Iterator; - friend class ACE_Cache_Map_Reverse_Iterator; - - // = ACE-style iterator typedefs. - typedef ACE_Cache_Map_Iterator - ITERATOR; - typedef ACE_Cache_Map_Reverse_Iterator - REVERSE_ITERATOR; - - // = STL-style iterator typedefs. - typedef ITERATOR - iterator; - typedef REVERSE_ITERATOR - reverse_iterator; - -#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */ - - /** - * The actual value mapped to the key in the map. The - * are used by the strategy and is transparent to the user of this - * class. - */ - typedef ACE_Pair CACHE_VALUE; - - // = Initialization and termination methods. - - /// Initialize a with and - /// entries. - ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_strategy, - size_t size = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); - - /// Close down a and release dynamically allocated - /// resources. - virtual ~ACE_Cache_Map_Manager (void); - - /// Initialize a cache with size . - int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); - - /// Close down a cache and release dynamically allocated resources. - int close (void); - - /** - * Associate with . If is already in the MAP - * then the ENTRY is not changed. Returns 0 if a new entry is bound - * successfully, returns 1 if an attempt is made to bind an existing - * entry, and returns -1 if failures occur. - */ - int bind (const KEY &key, - const VALUE &value); - - /** - * Lookup entry in the cache. If it is not found, returns -1. - * If the is located in the MAP object, the CACHING_STRATEGY is - * notified of it via notify_find (int result, ATTRIBUTES &attribute). - * If notify_find also returns 0 (success), then this function returns - * 0 (success) and sets the cached value in . - */ - int find (const KEY &key, - VALUE &value); - - /** - * Lookup entry in the cache. If it is not found, returns -1. - * If the is located in the MAP object, the CACHING_STRATEGY is - * notified of it via notify_find (int result, ATTRIBUTES &attribute). - * If notify_find also returns 0 (success), then this function returns - * 0 (success). - */ - int find (const KEY &key); - - /** - * Reassociate the with . If the already exists - * in the cache then returns 1, on a new bind returns 0 and returns - * -1 in case of any failures. - */ - int rebind (const KEY &key, - const VALUE &value); - - /** - * Reassociate with , storing the old value into the - * "out" parameter . The function fails if is not - * in the cache for caches that do not allow user specified keys. - * However, for caches that allow user specified keys, if the key is - * not in the cache, a new / association is created. - */ - int rebind (const KEY &key, - const VALUE &value, - VALUE &old_value); - - /** - * Reassociate with , storing the old key and value - * into the "out" parameters and . The - * function fails if is not in the cache for caches that do - * not allow user specified keys. However, for caches that allow - * user specified keys, if the key is not in the cache, a new - * / association is created. - */ - int rebind (const KEY &key, - const VALUE &value, - KEY &old_key, - VALUE &old_value); - - /** - * Associate with if and only if is not in the - * cache. If is already in the cache, then the - * parameter is overwritten with the existing value in the - * cache. Returns 0 if a new / association is created. - * Returns 1 if an attempt is made to bind an existing entry. This - * function fails for maps that do not allow user specified keys. - */ - int trybind (const KEY &key, - VALUE &value); - - /// Remove from the cache. - int unbind (const KEY &key); - - /// Remove from the cache, and return the associated with - /// . - int unbind (const KEY &key, - VALUE &value); - - /// Remove entries from the cache depending upon the strategy. - int purge (void); - - /// Return the current size of the cache. - size_t current_size (void) const; - - /// Return the total size of the cache. - size_t total_size (void) const; - - /// Dumps the state of the object. - void dump (void) const; - -#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) - - // = STL styled iterator factory functions. - - /// Return forward iterator. - ITERATOR begin (void); - ITERATOR end (void); - - /// Return reverse iterator. - REVERSE_ITERATOR rbegin (void); - REVERSE_ITERATOR rend (void); - -#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */ - - /// The map managed by the Cache_Map_Manager. - MAP &map (void); - - /// The caching strategy used on the cache. - CACHING_STRATEGY &caching_strategy (void); - -protected: - - /// The underlying map which needs to be cached. - MAP map_; - - /// The strategy to be followed for caching entries in the map. - CACHING_STRATEGY &caching_strategy_; - -private: - - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Cache_Map_Manager &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Cache_Map_Manager (const ACE_Cache_Map_Manager &)) - -}; - -#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) - -/** - * @class ACE_Cache_Map_Iterator - * - * @brief Defines a iterator for the Cache_Map_Manager. - * - * Implementation to be provided by the iterator of the map - * managed by the ACE_Cache_Map_Manager. - */ -template -class ACE_Cache_Map_Iterator -{ - -public: - - // = Traits. - /// The actual value mapped to the key in the cache. The - /// are used by the strategy and is transperant to the cache user. - typedef ACE_Reference_Pair - value_type; - typedef ACE_Pair - CACHE_VALUE; - - // = Initialisation and termination methods. - - ACE_Cache_Map_Iterator (const IMPLEMENTATION &iterator_impl); - - /// Copy constructor. - ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator &rhs); - - virtual ~ACE_Cache_Map_Iterator (void); - - // = Iteration methods. - - /// assignment operator. - ACE_Cache_Map_Iterator &operator= - (const ACE_Cache_Map_Iterator &rhs); - - /// Comparision operators. - int operator== (const ACE_Cache_Map_Iterator &rhs) const; - int operator!= (const ACE_Cache_Map_Iterator &rhs) const; - - /// Returns a reference to the internal element is pointing - /// to. - ACE_Reference_Pair operator* (void) const; - - // = STL styled iteration, compare, and reference functions. - - /// Prefix advance - ACE_Cache_Map_Iterator &operator++ (void); - - /// Postfix advance. - ACE_Cache_Map_Iterator operator++ (int); - - /// Prefix reverse. - ACE_Cache_Map_Iterator &operator-- (void); - - /// Postfix reverse. - ACE_Cache_Map_Iterator operator-- (int); - - /// Returns the iterator of the internal map in the custody of the - /// Cache_Map_Manager. - IMPLEMENTATION &iterator_implementation (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// The actual iterator which iterates internally on the map - /// belonging to the Cache_Map_Manager. - IMPLEMENTATION iterator_implementation_; -}; - -/** - * @class ACE_Cache_Map_Reverse_Iterator - * - * @brief Defines a reverse iterator for the Cache_Map_Manager. - * - * Implementation to be provided by the reverse iterator of the map - * managed by thr Cache_Map_manager. - */ -template -class ACE_Cache_Map_Reverse_Iterator -{ -public: - - // = Traits. - /// The actual value mapped to the key in the cache. The - /// are used by the strategy and is transperant to the cache user. - typedef ACE_Reference_Pair value_type; - typedef ACE_Pair CACHE_VALUE; - - // = Initialisation and termination methods. - - ACE_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl); - - /// Copy constructor. - ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator &rhs); - - ~ACE_Cache_Map_Reverse_Iterator (void); - - // = Iteration methods. - - /// Assignment operator. - ACE_Cache_Map_Reverse_Iterator &operator= - (const ACE_Cache_Map_Reverse_Iterator &rhs); - - /// Comparision operators. - int operator== (const ACE_Cache_Map_Reverse_Iterator &rhs) const; - int operator!= (const ACE_Cache_Map_Reverse_Iterator &rhs) const; - - /// Returns a reference to the internal element is pointing - /// to. - ACE_Reference_Pair operator* (void) const; - - // = STL styled iteration, compare, and reference functions. - - /// Prefix advance - ACE_Cache_Map_Reverse_Iterator &operator++ (void); - - /// Postfix advance. - ACE_Cache_Map_Reverse_Iterator operator++ (int); - - /// Prefix reverse. - ACE_Cache_Map_Reverse_Iterator &operator-- (void); - - /// Postfix reverse. - ACE_Cache_Map_Reverse_Iterator operator-- (int); - - /// Returns the iterator of the internal map in the custody of the - /// Cache_Map_Manager. - REVERSE_IMPLEMENTATION &iterator_implementation (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// The actual iterator which iterates internally on the map - /// belonging to the Cache_Map_Manager. - REVERSE_IMPLEMENTATION reverse_iterator_implementation_; -}; - -#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */ - -#undef ACE_T1 -#undef ACE_T2 - -#if defined (__ACE_INLINE__) -#include "ace/Cache_Map_Manager_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Cache_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cache_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_CACHE_MAP_MANAGER_T_H */ diff --git a/ace/Cache_Map_Manager_T.i b/ace/Cache_Map_Manager_T.i deleted file mode 100644 index ab90786fe1b..00000000000 --- a/ace/Cache_Map_Manager_T.i +++ /dev/null @@ -1,273 +0,0 @@ -/* -*- C++ -*- */ -//$Id$ - -#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) - -#define ACE_T1 class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES -#define ACE_T2 KEY, VALUE, MAP, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES - -#else - -#define ACE_T1 class KEY, class VALUE, class MAP, class CACHING_STRATEGY, class ATTRIBUTES -#define ACE_T2 KEY, VALUE, MAP, CACHING_STRATEGY, ATTRIBUTES - -#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */ - -template ACE_INLINE int -ACE_Cache_Map_Manager::purge (void) -{ - return this->caching_strategy ().caching_utility ().clear_cache (this->map_, - this->caching_strategy ().purge_percent ()); -} - -template ACE_INLINE size_t -ACE_Cache_Map_Manager::current_size (void) const -{ - return this->map_.current_size (); -} - -template ACE_INLINE size_t -ACE_Cache_Map_Manager::total_size (void) const -{ - return this->map_.total_size (); -} - -template ACE_INLINE MAP & -ACE_Cache_Map_Manager::map (void) -{ - return this->map_; -} - -template ACE_INLINE CACHING_STRATEGY & -ACE_Cache_Map_Manager::caching_strategy (void) -{ - return this->caching_strategy_; -} - -#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) - -template ACE_INLINE ACE_Cache_Map_Iterator -ACE_Cache_Map_Manager::begin (void) -{ - return ITERATOR (this->map_.begin ()); -} - -template ACE_INLINE ACE_Cache_Map_Iterator -ACE_Cache_Map_Manager::end (void) -{ - return ITERATOR (this->map_.end ()); -} - -template ACE_INLINE ACE_Cache_Map_Reverse_Iterator -ACE_Cache_Map_Manager::rbegin (void) -{ - return REVERSE_ITERATOR (this->map_.rbegin ()); -} -template ACE_INLINE ACE_Cache_Map_Reverse_Iterator -ACE_Cache_Map_Manager::rend (void) -{ - return REVERSE_ITERATOR (this->map_.rend ()); -} - -#undef ACE_T1 -#undef ACE_T2 - -//////////////////////////////////////////////////////////////////////////////// - -#define ACE_T1 class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES -#define ACE_T2 KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES - -template ACE_INLINE -ACE_Cache_Map_Iterator::ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator &rhs) - : iterator_implementation_ (rhs.iterator_implementation_) -{ -} - -template ACE_INLINE -ACE_Cache_Map_Iterator::~ACE_Cache_Map_Iterator (void) -{ -} - -template ACE_INLINE ACE_Cache_Map_Iterator & -ACE_Cache_Map_Iterator::operator= (const ACE_Cache_Map_Iterator &rhs) -{ - this->iterator_implementation_ = rhs.iterator_implementation_; - return *this; -} - -template ACE_INLINE int -ACE_Cache_Map_Iterator::operator== (const ACE_Cache_Map_Iterator &rhs) const -{ - return this->iterator_implementation_ == rhs.iterator_implementation_; -} - -template ACE_INLINE int -ACE_Cache_Map_Iterator::operator!= (const ACE_Cache_Map_Iterator &rhs) const -{ - return this->iterator_implementation_ != rhs.iterator_implementation_; -} - -template ACE_INLINE ACE_Reference_Pair -ACE_Cache_Map_Iterator::operator* (void) const -{ - value_type retn ((*this->iterator_implementation_).ext_id_, - (*this->iterator_implementation_).int_id_.first ()); - return retn; -} - -template ACE_INLINE -ACE_Cache_Map_Iterator & -ACE_Cache_Map_Iterator::operator++ (void) -{ - ++this->iterator_implementation_; - return *this; -} - -template ACE_INLINE -ACE_Cache_Map_Iterator -ACE_Cache_Map_Iterator::operator++ (int) -{ - ACE_Cache_Map_Iterator retn = *this; - ++this->iterator_implementation_; - return retn; -} - -template ACE_INLINE -ACE_Cache_Map_Iterator & -ACE_Cache_Map_Iterator::operator-- (void) -{ - --this->iterator_implementation_; - return *this; -} - -template ACE_INLINE -ACE_Cache_Map_Iterator -ACE_Cache_Map_Iterator::operator-- (int) -{ - ACE_Cache_Map_Iterator retn = *this; - --this->iterator_implementation_; - return retn; -} - - -template ACE_INLINE void -ACE_Cache_Map_Iterator::dump (void) const -{ - this->iterator_implementation_.dump (); -} - -template ACE_INLINE -ACE_Cache_Map_Iterator::ACE_Cache_Map_Iterator (const IMPLEMENTATION &iterator_impl) - : iterator_implementation_ (iterator_impl) -{ -} - -template ACE_INLINE IMPLEMENTATION & -ACE_Cache_Map_Iterator::iterator_implementation (void) -{ - return this->iterator_implementation_; -} - -#undef ACE_T1 -#undef ACE_T2 - -//////////////////////////////////////////////////////////////////////////////// - -#define ACE_T1 class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES -#define ACE_T2 KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES - -template ACE_INLINE -ACE_Cache_Map_Reverse_Iterator::ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator &rhs) - : reverse_iterator_implementation_ (rhs.reverse_iterator_implementation_) -{ -} - -template ACE_INLINE -ACE_Cache_Map_Reverse_Iterator::~ACE_Cache_Map_Reverse_Iterator (void) -{ -} - -template ACE_INLINE ACE_Cache_Map_Reverse_Iterator & -ACE_Cache_Map_Reverse_Iterator::operator= (const ACE_Cache_Map_Reverse_Iterator &rhs) -{ - this->reverse_iterator_implementation_ = rhs.reverse_iterator_implementation_; - return *this; -} - -template ACE_INLINE int -ACE_Cache_Map_Reverse_Iterator::operator== (const ACE_Cache_Map_Reverse_Iterator &rhs) const -{ - return this->reverse_iterator_implementation_ == rhs.reverse_iterator_implementation_; -} - -template ACE_INLINE int -ACE_Cache_Map_Reverse_Iterator::operator!= (const ACE_Cache_Map_Reverse_Iterator &rhs) const -{ - return this->reverse_iterator_implementation_ != rhs.reverse_iterator_implementation_; -} - -template ACE_INLINE ACE_Reference_Pair -ACE_Cache_Map_Reverse_Iterator::operator* (void) const -{ - value_type retv ((*this->reverse_iterator_implementation_).ext_id_, - (*this->reverse_iterator_implementation_).int_id_.first ()); - return retv; -} - -template ACE_INLINE -ACE_Cache_Map_Reverse_Iterator & -ACE_Cache_Map_Reverse_Iterator::operator++ (void) -{ - ++this->reverse_iterator_implementation_; - return *this; -} - -template ACE_INLINE -ACE_Cache_Map_Reverse_Iterator -ACE_Cache_Map_Reverse_Iterator::operator++ (int) -{ - ACE_Cache_Map_Reverse_Iterator retn = *this; - ++this->reverse_iterator_implementation_; - return retn; -} - -template ACE_INLINE -ACE_Cache_Map_Reverse_Iterator & -ACE_Cache_Map_Reverse_Iterator::operator-- (void) -{ - --this->reverse_iterator_implementation_; - return *this; -} - -template ACE_INLINE -ACE_Cache_Map_Reverse_Iterator -ACE_Cache_Map_Reverse_Iterator::operator-- (int) -{ - ACE_Cache_Map_Reverse_Iterator retn = *this; - --this->reverse_iterator_implementation_; - return retn; -} - - -template ACE_INLINE void -ACE_Cache_Map_Reverse_Iterator::dump (void) const -{ - this->reverse_iterator_implementation_.dump (); -} - -template ACE_INLINE -ACE_Cache_Map_Reverse_Iterator::ACE_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl) - : reverse_iterator_implementation_(iterator_impl) -{ -} - -template ACE_INLINE REVERSE_IMPLEMENTATION & -ACE_Cache_Map_Reverse_Iterator::iterator_implementation (void) -{ - return this->reverse_iterator_implementation_; -} - -#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */ - -#undef ACE_T1 -#undef ACE_T2 diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp deleted file mode 100644 index 0086f9d001f..00000000000 --- a/ace/Cached_Connect_Strategy_T.cpp +++ /dev/null @@ -1,775 +0,0 @@ -//$Id$ - -#ifndef CACHED_CONNECT_STRATEGY_T_C -#define CACHED_CONNECT_STRATEGY_T_C - -#include "ace/Cached_Connect_Strategy_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#define ACE_LACKS_PRAGMA_ONCE -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/ACE.h" -#include "ace/Service_Repository.h" -#include "ace/Synch.h" -#include "ace/Service_Types.h" -#include "ace/Thread_Manager.h" -#include "ace/WFMO_Reactor.h" -#include "ace/Pair_T.h" - -ACE_RCSID(ace, Cached_Connect_Strategy_T, "$Id$") - -#define ACE_T1 class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX -#define ACE_T2 SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX - -template -ACE_Cached_Connect_Strategy_Ex::ACE_Cached_Connect_Strategy_Ex -(CACHING_STRATEGY &caching_s, - ACE_Creation_Strategy *cre_s, - ACE_Concurrency_Strategy *con_s, - ACE_Recycling_Strategy *rec_s, - MUTEX *lock, - int delete_lock) - : CCSBASE (cre_s, con_s, rec_s, lock, delete_lock), - connection_cache_ (caching_s) -{ - if (this->open (cre_s, con_s, rec_s) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Cached_Connect_Strategy_Ex\n"))); -} - -template -ACE_Cached_Connect_Strategy_Ex::~ACE_Cached_Connect_Strategy_Ex (void) -{ - cleanup (); -} - - -template int -ACE_Cached_Connect_Strategy_Ex::check_hint_i -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - ACE_Hash_Map_Entry, ACE_Pair > *&entry, - int &found) -{ - ACE_UNUSED_ARG (remote_addr); - ACE_UNUSED_ARG (timeout); - ACE_UNUSED_ARG (local_addr); - ACE_UNUSED_ARG (reuse_addr); - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (perms); - - found = 0; - - // Get the recycling act for the svc_handler - CONNECTION_CACHE_ENTRY *possible_entry = (CONNECTION_CACHE_ENTRY *) sh->recycling_act (); - - // Check to see if the hint svc_handler has been closed down - if (possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED) - { - // If close, decrement refcount - if (possible_entry->ext_id_.decrement () == 0) - { - // If refcount goes to zero, close down the svc_handler - possible_entry->int_id_.first ()->recycler (0, 0); - possible_entry->int_id_.first ()->close (); - this->purge_i (possible_entry); - } - - // Hint not successful - found = 0; - - // Reset hint - sh = 0; - } - - // If hint is not closed, see if it is connected to the correct - // address and is recyclable - else if ((possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE || - possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE) && - possible_entry->ext_id_.subject () == remote_addr) - { - // Hint successful - found = 1; - - // Tell the that it should prepare itself for - // being recycled. - this->prepare_for_recycling (sh); - - // - // Update the caching attributes directly since we don't do a - // find() on the cache map. - // - - // Indicates successful find. - int find_result = 0; - - int result = this->caching_strategy ().notify_find (find_result, - possible_entry->int_id_.second ()); - - if (result == -1) - return result; - } - else - { - // This hint will not be used. - possible_entry->ext_id_.decrement (); - - // Hint not successful - found = 0; - - // If is not connected to the correct address or is busy, - // we will not use it. - sh = 0; - } - - if (found) - entry = possible_entry; - - return 0; -} - -template int -ACE_Cached_Connect_Strategy_Ex::find_or_create_svc_handler_i -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - ACE_Hash_Map_Entry, ACE_Pair > *&entry, - int &found) -{ - REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr); - - // Try to find the address in the cache. Only if we don't find it - // do we create a new and connect it with the server. - while (this->find (search_addr, entry) != -1) - { - // We found a cached svc_handler. - // Get the cached - sh = entry->int_id_.first (); - - // Is the connection clean? - int state_result = - ACE::handle_ready (sh->peer ().get_handle (), - &ACE_Time_Value::zero, - 1, // read ready - 0, // write ready - 1);// exception ready - - if (state_result == 1) - { - - if (sh->close () == -1) - return -1; - - sh = 0; - - // Cycle it once again.. - } - else if ((state_result == -1) && (errno == ETIME)) - { - // Found!!! - // Set the flag - found = 1; - - // Tell the that it should prepare itself for - // being recycled. - if (this->prepare_for_recycling (sh) == -1) - return -1; - - return 0; - } - else - { - return -1; - } - } - - // Not found... - - // Set the flag - found = 0; - - // We need to use a temporary variable here since we are not - // allowed to change because other threads may use this - // when we let go of the lock during the OS level connect. - // - // Note that making a new svc_handler, connecting remotely, - // binding to the map, and assigning of the hint and recycler - // should be atomic to the outside world. - SVC_HANDLER *potential_handler = 0; - - // Create a new svc_handler - if (this->make_svc_handler (potential_handler) == -1) - return -1; - - // Connect using the svc_handler. - if (this->cached_connect (potential_handler, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms) == -1) - { - // Close the svc handler. - potential_handler->close (0); - - return -1; - } - else - { - // Insert the new SVC_HANDLER instance into the cache. - if (this->connection_cache_.bind (search_addr, - potential_handler, - entry) == -1) - { - // Close the svc handler and reset . - potential_handler->close (0); - - return -1; - } - - // Everything succeeded as planned. Assign to - // . - sh = potential_handler; - - // Set the recycler and the recycling act - - this->assign_recycler (sh, this, entry); - } - - return 0; -} - -template int -ACE_Cached_Connect_Strategy_Ex::cached_connect (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - // Actively establish the connection. This is a timed blocking - // connect. - if (this->new_connection (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms) == -1) - { - // If connect() failed because of timeouts, we have to reject - // the connection entirely. This is necessary since currently - // there is no way for the non-blocking connects to complete and - // for the to notify the cache of the completion of - // connect(). - - if (errno == EWOULDBLOCK) - errno = ENOTSUP; - else if (ACE::out_of_handles (errno)) - { - // If the connect failed due to the process running out of - // file descriptors then, auto_purging of some connections - // are done from the CONNECTION_CACHE. This frees the - // descriptors which get used in the connect process and - // hence the same method is called again! - if (this->purge_connections () == -1) - return -1; - - // Try connecting again. - if (this->new_connection (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms) == -1) - { - if (errno == EWOULDBLOCK) - errno = ENOTSUP; - return -1; - } - } - else - { - return -1; - } - } - - return 0; - -} - - -template int -ACE_Cached_Connect_Strategy_Ex::connect_svc_handler_i -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - int& found) -{ - CONNECTION_CACHE_ENTRY *entry = 0; - - // Check if the user passed a hint svc_handler - if (sh != 0) - { - - int result = this->check_hint_i (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms, - entry, - found); - if (result != 0) - return result; - } - - // If not found - if (!found) - { - int result = this->find_or_create_svc_handler_i (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms, - entry, - found); - - if (result != 0) - return result; - - } - - // For all successful cases: mark the in the cache - // as being . Therefore recyclable is BUSY. - entry->ext_id_.recycle_state (ACE_RECYCLABLE_BUSY); - - // And increment the refcount - entry->ext_id_.increment (); - - return 0; -} - - -template int -ACE_Cached_Connect_Strategy_Ex::cache_i (const void *recycling_act) -{ - // The wonders and perils of ACT - CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act; - - // Mark the in the cache as not being . - // Therefore recyclable is IDLE. - entry->ext_id_.recycle_state (ACE_RECYCLABLE_IDLE_AND_PURGABLE); - - return 0; -} - -template int -ACE_Cached_Connect_Strategy_Ex::recycle_state_i (const void *recycling_act, - ACE_Recyclable_State new_state) -{ - // The wonders and perils of ACT - CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act; - - // Mark the in the cache as not being . - // Therefore recyclable is IDLE. - entry->ext_id_.recycle_state (new_state); - - return 0; -} - -template ACE_Recyclable_State -ACE_Cached_Connect_Strategy_Ex::recycle_state_i (const void *recycling_act) const -{ - // The wonders and perils of ACT - CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act; - - // Mark the in the cache as not being . - // Therefore recyclable is IDLE. - return entry->ext_id_.recycle_state (); -} - -template int -ACE_Cached_Connect_Strategy_Ex::purge_i (const void *recycling_act) -{ - // The wonders and perils of ACT - CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act; - - return this->connection_cache_.unbind (entry); -} - - -template int -ACE_Cached_Connect_Strategy_Ex::mark_as_closed_i (const void *recycling_act) -{ - // The wonders and perils of ACT - CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act; - - // Mark the in the cache as CLOSED. - entry->ext_id_.recycle_state (ACE_RECYCLABLE_CLOSED); - - return 0; -} - -template int -ACE_Cached_Connect_Strategy_Ex::cleanup_hint_i (const void *recycling_act, - void **act_holder) -{ - // Reset the <*act_holder> in the confines and protection of the - // lock. - if (act_holder) - *act_holder = 0; - - // The wonders and perils of ACT - CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act; - - // Decrement the refcount on the . - int refcount = entry->ext_id_.decrement (); - - // If the svc_handler state is closed and the refcount == 0, call - // close() on svc_handler. - if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED && - refcount == 0) - { - entry->int_id_.first ()->recycler (0, 0); - entry->int_id_.first ()->close (); - this->purge_i (entry); - } - - return 0; -} - -template int -ACE_Cached_Connect_Strategy_Ex::purge_connections (void) -{ - return this->connection_cache_.purge (); -} - -template CACHING_STRATEGY & -ACE_Cached_Connect_Strategy_Ex::caching_strategy (void) -{ - return this->connection_cache_.caching_strategy (); -} - -template int -ACE_Cached_Connect_Strategy_Ex::find (ACE_Refcounted_Hash_Recyclable &search_addr, - ACE_Hash_Map_Entry, ACE_Pair > *&entry) -{ - typedef ACE_Hash_Map_Bucket_Iterator, - ACE_Hash, - ACE_Equal_To, - ACE_Null_Mutex> - CONNECTION_CACHE_BUCKET_ITERATOR; - - CONNECTION_CACHE_BUCKET_ITERATOR iterator (this->connection_cache_.map (), - search_addr); - - CONNECTION_CACHE_BUCKET_ITERATOR end (this->connection_cache_.map (), - search_addr, - 1); - - for (; - iterator != end; - ++iterator) - { - REFCOUNTED_HASH_RECYCLABLE_ADDRESS &addr = (*iterator).ext_id_; - - if (addr.recycle_state () != ACE_RECYCLABLE_IDLE_AND_PURGABLE && - addr.recycle_state () != ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE) - continue; - - if (addr.subject () != search_addr.subject ()) - continue; - - entry = &(*iterator); - - // - // Update the caching attributes directly since we don't do a - // find() on the cache map. - // - - // Indicates successful find. - int find_result = 0; - - int result = this->caching_strategy ().notify_find (find_result, - entry->int_id_.second ()); - - if (result == -1) - return result; - - return 0; - } - - return -1; -} - -template void -ACE_Cached_Connect_Strategy_Ex::cleanup (void) -{ - // Excluded other threads from changing the cache while we cleanup - ACE_GUARD (MUTEX, ace_mon, *this->lock_); - // Close down all cached service handlers. -#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) - - typedef ACE_Hash_Map_Iterator_Ex, - ACE_Hash, - ACE_Equal_To, - ACE_Null_Mutex> - CONNECTION_MAP_ITERATOR; - - // CONNECTION_MAP_ITERATOR end = this->connection_cache_.map ().end (); - CONNECTION_MAP_ITERATOR iter = this->connection_cache_.map ().begin (); - - - while (iter != this->connection_cache_.map ().end ()) - { - if ((*iter).int_id_.first () != 0) - { - // save entry for future use - CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) - (*iter).int_id_.first ()->recycling_act (); - - // close handler - (*iter).int_id_.first ()->recycler (0, 0); - (*iter).int_id_.first ()->close (); - - // remember next iter - CONNECTION_MAP_ITERATOR next_iter = iter; - ++next_iter; - - // purge the item from the hash - this->purge_i (entry); - - // assign next iter - iter = next_iter; - } - else - ++iter; - } -#else /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */ - ACE_TYPENAME CONNECTION_CACHE::ITERATOR iter = - this->connection_cache_.begin (); - while (iter != this->connection_cache_.end ()) - { - if ((*iter).second () != 0) - { - // save entry for future use - CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) - (*iter).second ()->recycling_act (); - - // close handler - (*iter).second ()->recycler (0, 0); - (*iter).second ()->close (); - - // remember next iter - ACE_TYPENAME CONNECTION_CACHE::ITERATOR next_iter = iter; - ++next_iter; - - // purge the item from the hash - this->purge_i (entry); - - // assign next iter - iter = next_iter; - } - else - ++iter; - } -#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */ - -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Cached_Connect_Strategy_Ex) -///////////////////////////////////////////////////////////////////////// - -template -ACE_Bounded_Cached_Connect_Strategy::ACE_Bounded_Cached_Connect_Strategy -(size_t max_size, - CACHING_STRATEGY &caching_s, - ACE_Creation_Strategy *cre_s, - ACE_Concurrency_Strategy *con_s, - ACE_Recycling_Strategy *rec_s, - MUTEX *lock, - int delete_lock) - : CCSEBASE (caching_s, cre_s, con_s, rec_s, lock, delete_lock), - max_size_ (max_size) -{ -} - -template -ACE_Bounded_Cached_Connect_Strategy::~ACE_Bounded_Cached_Connect_Strategy(void) -{ -} - -template -int -ACE_Bounded_Cached_Connect_Strategy::find_or_create_svc_handler_i -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - ACE_Hash_Map_Entry, - ACE_Pair > *&entry, - int &found) -{ - - REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr); - - // Try to find the address in the cache. Only if we don't find it - // do we create a new and connect it with the server. - while (this->find (search_addr, entry) != -1) - { - // We found a cached svc_handler. - // Get the cached - sh = entry->int_id_.first (); - - // Is the connection clean? - int state_result= ACE::handle_ready (sh->peer ().get_handle (), - &ACE_Time_Value::zero, - 1, // read ready - 0, // write ready - 1);// exception ready - - if (state_result == 1) - { - // The connection was disconnected during idle. - // close the svc_handler down. - if (sh->close () == -1) - { - ACE_ASSERT (0); - return -1; - } - sh = 0; - // and rotate once more... - } - else if ((state_result == -1) && (errno == ETIME)) - { - // Found!!! - // Set the flag - found = 1; - - // Tell the that it should prepare itself for - // being recycled. - if (this->prepare_for_recycling (sh) == -1) - { - ACE_ASSERT (0); - return -1; - } - - return 0; - } - else // some other return value or error... - { - ACE_ASSERT (0); // just to see it coming - - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%t)ACE_Bounded_Cached_Connect_Strategy<>::") - ACE_LIB_TEXT ("find_or_create_svc_handler_i - ") - ACE_LIB_TEXT ("error polling server socket state.\n"))); - - return -1; - } - } - - // Not found... - - // Set the flag - found = 0; - - // Check the limit of handlers... - if ((this->max_size_ > 0) && - (this->connection_cache_.current_size () >= this->max_size_)) - { - // Try to purge idle connections - if (this->purge_connections () == -1) - return -1; - - // Check limit again. - if (this->connection_cache_.current_size () >= this->max_size_) - // still too much! - return -1; - - // OK, we have room now... - } - - // We need to use a temporary variable here since we are not - // allowed to change because other threads may use this - // when we let go of the lock during the OS level connect. - // - // Note that making a new svc_handler, connecting remotely, - // binding to the map, and assigning of the hint and recycler - // should be atomic to the outside world. - SVC_HANDLER *potential_handler = 0; - - // Create a new svc_handler - if (this->make_svc_handler (potential_handler) == -1) - return -1; - - // Connect using the svc_handler. - if (this->cached_connect (potential_handler, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms) == -1) - { - // Close the svc handler. - potential_handler->close (0); - return -1; - } - else - { - // Insert the new SVC_HANDLER instance into the cache. - if (this->connection_cache_.bind (search_addr, - potential_handler, - entry) == -1) - { - // Close the svc handler and reset . - potential_handler->close (0); - - return -1; - } - - // Everything succeeded as planned. Assign to - // . - sh = potential_handler; - - // Set the recycler and the recycling act - this->assign_recycler (sh, this, entry); - } - - return 0; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Cached_Connect_Strategy) - -#undef ACE_T1 -#undef ACE_T2 - -#endif /* CACHED_CONNECT_STRATEGY_T_C */ diff --git a/ace/Cached_Connect_Strategy_T.h b/ace/Cached_Connect_Strategy_T.h deleted file mode 100644 index 67a04d90fe8..00000000000 --- a/ace/Cached_Connect_Strategy_T.h +++ /dev/null @@ -1,260 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Cached_Connect_Strategy_T.h - * - * $Id$ - * - * @author Kirthika Parameswaran - */ -//============================================================================= - -#ifndef CACHED_CONNECT_STRATEGY_T_H -#define CACHED_CONNECT_STRATEGY_T_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Strategies_T.h" -#include "ace/Hash_Cache_Map_Manager_T.h" -#include "ace/Caching_Strategies_T.h" -#include "ace/Functor_T.h" -#include "ace/Pair_T.h" -#include "ace/Synch.h" - -// For linkers which cant grok long names... -#define ACE_Cached_Connect_Strategy_Ex ACCSE - -/** - * @class ACE_Cached_Connect_Strategy_Ex - * - * @brief A connection strategy which caches connections to peers - * (represented by instances), thereby allowing - * subsequent re-use of unused, but available, connections. - * - * is intended to be used as a - * plug-in connection strategy for . - * It's added value is re-use of established connections and - * tweaking the role of the cache as per the caching strategy. - */ -template -class ACE_Cached_Connect_Strategy_Ex - : public ACE_Cached_Connect_Strategy -{ -public: - /// Constructor - ACE_Cached_Connect_Strategy_Ex ( - CACHING_STRATEGY &caching_s, - ACE_Creation_Strategy *cre_s = 0, - ACE_Concurrency_Strategy *con_s = 0, - ACE_Recycling_Strategy *rec_s = 0, - MUTEX *lock = 0, - int delete_lock = 0); - - /// Destructor - virtual ~ACE_Cached_Connect_Strategy_Ex (void); - - /// Explicit purging of connection entries from the connection cache. - virtual int purge_connections (void); - - /// Mark as closed (non-locking version). This is used during the cleanup of the - /// connections purged. - virtual int mark_as_closed_i (const void *recycling_act); - - /** - * Since g++ version < 2.8 arent happy with templates, this special - * method had to be devised to avoid memory leaks and perform - * cleanup of the . - */ - void cleanup (void); - - // = Typedefs for managing the map - typedef ACE_Refcounted_Hash_Recyclable - REFCOUNTED_HASH_RECYCLABLE_ADDRESS; - typedef ACE_Hash_Cache_Map_Manager, - ACE_Equal_To, - CACHING_STRATEGY, - ATTRIBUTES> - CONNECTION_CACHE; - typedef ACE_TYPENAME CONNECTION_CACHE::CACHE_ENTRY CONNECTION_CACHE_ENTRY; - typedef ACE_TYPENAME CONNECTION_CACHE::key_type KEY; - typedef ACE_TYPENAME CONNECTION_CACHE::mapped_type VALUE; - - typedef ACE_Recyclable_Handler_Cleanup_Strategy, - ACE_Hash_Map_Manager_Ex, - ACE_Hash, - ACE_Equal_To, - MUTEX> > - CLEANUP_STRATEGY; - - typedef ACE_Cached_Connect_Strategy - CCSBASE; - - // = Accessor. - CACHING_STRATEGY &caching_strategy (void); - -protected: - - /// Find an idle handle. - int find (ACE_Refcounted_Hash_Recyclable &search_addr, - ACE_Hash_Map_Entry, ACE_Pair > *&entry); - - /// Remove from cache (non-locking version). - virtual int purge_i (const void *recycling_act); - - /// Add to cache (non-locking version). - virtual int cache_i (const void *recycling_act); - - /// Get/Set (non-locking version). - virtual int recycle_state_i (const void *recycling_act, - ACE_Recyclable_State new_state); - virtual ACE_Recyclable_State recycle_state_i (const void *recycling_act) const; - - /// Cleanup hint and reset <*act_holder> to zero if . - virtual int cleanup_hint_i (const void *recycling_act, - void **act_holder); - - // = Helpers - int check_hint_i (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - ACE_Hash_Map_Entry, ACE_Pair > *&entry, - int &found); - - virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - ACE_Hash_Map_Entry, ACE_Pair > *&entry, - int &found); - - virtual int connect_svc_handler_i (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - int &found); - - /** - * Connection of the svc_handler with the remote host. This method - * also encapsulates the connection done with auto_purging under the - * hood. If the connect failed due to the process running out of - * file descriptors then, auto_purging of some connections are done - * from the CONNECTION_CACHE. This frees the descriptors which get - * used in the connect process and hence the connect operation can - * succeed. - */ - virtual int cached_connect (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - - /// Table that maintains the cache of connected s. - CONNECTION_CACHE connection_cache_; -}; - -///////////////////////////////////////////////////////////////////////////// - -// For linkers which cant grok long names... -#define ACE_Bounded_Cached_Connect_Strategy ABCCS - -/** - * @class ACE_Bounded_Cached_Connect_Strategy - * - * @brief A connection strategy which caches connections to peers - * (represented by instances), thereby allowing - * subsequent re-use of unused, but available, connections. - * This strategy should be used when the cache is bounded by - * maximum size. - * - * is intended to be used as a - * plug-in connection strategy for . - * It's added value is re-use of established connections and - * tweaking the role of the cache as per the caching strategy. - * Thanks to Edan Ayal for contributing this - * class and Susan Liebeskind for - * brainstorming about it. - */ -template -class ACE_Bounded_Cached_Connect_Strategy - : public ACE_Cached_Connect_Strategy_Ex -{ - - typedef ACE_Cached_Connect_Strategy_Ex - CCSEBASE; - - // = Typedefs for managing the map - typedef ACE_Refcounted_Hash_Recyclable - REFCOUNTED_HASH_RECYCLABLE_ADDRESS; - -public: - - /// Constructor - ACE_Bounded_Cached_Connect_Strategy (size_t max_size, - CACHING_STRATEGY &caching_s, - ACE_Creation_Strategy *cre_s = 0, - ACE_Concurrency_Strategy *con_s = 0, - ACE_Recycling_Strategy *rec_s = 0, - MUTEX *lock = 0, - int delete_lock = 0); - - /// Destructor - virtual ~ACE_Bounded_Cached_Connect_Strategy (void); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - - virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - ACE_Hash_Map_Entry, - ACE_Pair > *&entry, - int &found); - -protected: - - /// max items in the cache, used as a bound for the creation of svc_handlers. - size_t max_size_; -}; - - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Cached_Connect_Strategy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cached_Connect_Strategy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* CACHED_CONNECT_STRATEGY_T_H */ diff --git a/ace/Caching_Strategies_T.cpp b/ace/Caching_Strategies_T.cpp deleted file mode 100644 index 0d4f389c966..00000000000 --- a/ace/Caching_Strategies_T.cpp +++ /dev/null @@ -1,57 +0,0 @@ -//$Id$ - -#ifndef CACHING_STRATEGIES_T_C -#define CACHING_STRATEGIES_T_C - -#include "ace/Caching_Strategies_T.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Caching_Strategies_T.i" -#endif /* __ACE_INLINE__ */ - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#define ACE_LACKS_PRAGMA_ONCE -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Caching_Strategies_T, "$Id$") - -template -ACE_Caching_Strategy::~ACE_Caching_Strategy (void) -{ -} - -////////////////////////////////////////////////////////////////////////////////// - -template -ACE_LRU_Caching_Strategy::ACE_LRU_Caching_Strategy (void) - : timer_ (0), - purge_percent_ (10) -{ -} - -//////////////////////////////////////////////////////////////////////////////////////////////// - -template -ACE_LFU_Caching_Strategy::ACE_LFU_Caching_Strategy (void) - : purge_percent_ (10) -{ -} - -//////////////////////////////////////////////////////////////////////////////////////////////// - -template -ACE_FIFO_Caching_Strategy::ACE_FIFO_Caching_Strategy (void) - : order_ (0), - purge_percent_ (10) -{ -} - -//////////////////////////////////////////////////////////////////////////////////////////////// - -ACE_ALLOC_HOOK_DEFINE(ACE_LRU_Caching_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_LFU_Caching_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Caching_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_Null_Caching_Strategy) - -#endif /* CACHING_STRATEGIES_T_C */ diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h deleted file mode 100644 index c637119087c..00000000000 --- a/ace/Caching_Strategies_T.h +++ /dev/null @@ -1,548 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Caching_Strategies_T.h - * - * $Id$ - * - * @author Kirthika Parameswaran - */ -//============================================================================= - -#ifndef ACE_CACHING_STRATEGIES_H -#define ACE_CACHING_STRATEGIES_H - -#include "ace/pre.h" - -#include "ace/config-all.h" -#include "ace/Caching_Utility_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined(_MSC_VER) -#pragma warning(disable:4503) -#endif /* _MSC_VER */ - -// For linkers that cant grok long names. -#define ACE_Caching_Strategy ACS - -/** - * @class ACE_Caching_Strategy - * - * @brief This class is an abstract base class for a caching strategy. - * - * This class consists of all the interfaces a caching strategy should - * have and is used in association with the - * ACE_Caching_Strategy_Adaptor. - */ -template -class ACE_Caching_Strategy -{ -public: - /// Destructor. - virtual ~ACE_Caching_Strategy (void); - - /// Accessor method for the timer attributes. - virtual ATTRIBUTES attributes (void) = 0; - - /// Get the percentage of entries to purge. - virtual double purge_percent (void) = 0; - - /// Set the percentage of entries to purge. - virtual void purge_percent (double percentage) = 0; - - // = Strategy related Operations - - /// This method acts as a notification about the CONTAINERs bind - /// method call. - virtual int notify_bind (int result, - const ATTRIBUTES &attr) = 0; - - /// This method acts as a notification about the CONTAINERs find - /// method call - virtual int notify_find (int result, - ATTRIBUTES &attr) = 0; - - /// This method acts as a notification about the CONTAINERs unbind - /// method call - virtual int notify_unbind (int result, - const ATTRIBUTES &attr) = 0; - - /// This method acts as a notification about the CONTAINERs trybind - /// method call - virtual int notify_trybind (int result, - ATTRIBUTES &attr) = 0; - - /// This method acts as a notification about the CONTAINERs rebind - /// method call - virtual int notify_rebind (int result, - const ATTRIBUTES &attr) = 0; - - /// Purge the cache. - virtual CACHING_UTILITY &caching_utility (void) = 0; - - /// Dumps the state of the object. - virtual void dump (void) const = 0; -}; - -////////////////////////////////////////////////////////////////////////// - -#define ACE_Caching_Strategy_Adapter ACSA - -/** - * @class ACE_Caching_Strategy_Adapter - * - * @brief This class follows the Adaptor pattern and is used to provide - * External Polymorphism by deriving from ACE_Caching_Strategy. - * - * This class simply delegates all requests to the - * IMPLEMNETATION object within. This class should be passed in - * place of the the abstract base ACE_Caching_Strategy class as - * part of the External Polymorphism pattern. - */ -template -class ACE_Caching_Strategy_Adapter - : public ACE_Caching_Strategy -{ - -public: - - /// Constructor. - ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation = 0, - int delete_implementation = 0); - - /// Destructor. - ~ACE_Caching_Strategy_Adapter (void); - - /// Accessor method for the timer attributes. - ATTRIBUTES attributes (void); - - /// Get the percentage of entries to purge. - double purge_percent (void); - - /// Set the percentage of entries to purge. - void purge_percent (double percentage); - - // = Strategy related Operations - - /// This method acts as a notification about the CONTAINERs bind - /// method call. - int notify_bind (int result, - const ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs find - /// method call - int notify_find (int result, - ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs unbind - /// method call - int notify_unbind (int result, - const ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs trybind - /// method call - int notify_trybind (int result, - ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs rebind - /// method call - int notify_rebind (int result, - const ATTRIBUTES &attr); - - /// Accessor to the implementation. - IMPLEMENTATION &implementation (void); - - /// Purge the cache. - CACHING_UTILITY &caching_utility (void); - - /// Dumps the state of the object. - void dump (void) const; - -private: - - /// Implementation class. - IMPLEMENTATION *implementation_; - - /// Do we need to delete the implementation? - int delete_implementation_; -}; - -////////////////////////////////////////////////////////////////////////// -#define ACE_LRU_Caching_Strategy ALRU - -/** - * @class ACE_LRU_Caching_Strategy - * - * @brief Defines a Least Recently Used strategy which will decide on - * the item to be removed from the cache. - * - * This is a strategy which makes use of a virtual timer which - * is updated whenever an item is inserted or looked up in the - * container. When the need of purging entries arises, the items - * with the lowest timer values are removed. - * Explanation of the template parameter list: - * CONTAINER is any map with entries of type . - * The ATTRIBUTES are the deciding factor for purging of entries - * and should logically be included with the VALUE. Some ways of - * doing this are: As being a member of the VALUE or VALUE being - * ACE_Pair. The CACHING_UTILITY is the - * class which can be plugged in and which decides the entries - * to purge. - */ -template -class ACE_LRU_Caching_Strategy -{ -public: - - // Traits. - typedef ATTRIBUTES CACHING_ATTRIBUTES; - - // = Initialisation and termination. - - /** - * The is the map in which the entries reside. The - * timer attribute is initialed to zero in this constructor. And - * the field denotes the percentage of the entries - * in the cache which can be purged automagically and by default is - * set to 10%. - */ - ACE_LRU_Caching_Strategy (void); - - // = Operations of the strategy. - - /// Accessor method for the timer attributes. - ATTRIBUTES attributes (void); - - /// Get the percentage of entries to purge. - double purge_percent (void); - - /// Set the percentage of entries to purge. - void purge_percent (double percentage); - - // = Strategy related Operations - - /// This method acts as a notification about the CONTAINERs bind - /// method call. - int notify_bind (int result, - const ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs find - /// method call - int notify_find (int result, - ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs unbind - /// method call - int notify_unbind (int result, - const ATTRIBUTES &attr); - - - /// This method acts as a notification about the CONTAINERs trybind - /// method call - int notify_trybind (int result, - ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs rebind - /// method call - int notify_rebind (int result, - const ATTRIBUTES &attr); - - /// Purge the cache. - CACHING_UTILITY &caching_utility (void); - - /// Dumps the state of the object. - void dump (void) const; - -private: - - /// This element is the one which is the deciding factor for purging - /// of an ITEM. - ATTRIBUTES timer_; - - /// The level about which the purging will happen automagically. - double purge_percent_; - - /// This is the helper class which will decide and expunge entries - /// from the cache. - CACHING_UTILITY caching_utility_; -}; - -////////////////////////////////////////////////////////////////////////// -#define ACE_LFU_Caching_Strategy ALFU - -/** - * @class ACE_LFU_Caching_Strategy - * - * @brief Defines a Least Frequently Used strategy for which will decide on - * the item to be removed from the cache. - * - * A attribute is tagged to each item which increments whenever - * the item is bound or looked up in the cache. Thus it denotes - * the frequency of use. According to the value of the attribute - * the item is removed from the CONTAINER i.e cache. - * Explanation of the template parameter list: - * CONTAINER is any map with entries of type . - * The ATTRIBUTES are the deciding factor for purging of entries - * and should logically be included with the VALUE. Some ways of - * doing this are: As being a member of the VALUE or VALUE being - * ACE_Pair. The CACHING_UTILITY is the - * class which can be plugged in and which decides the entries - * to purge. - */ -template -class ACE_LFU_Caching_Strategy -{ - -public: - - // Traits. - typedef ATTRIBUTES CACHING_ATTRIBUTES; - - // = Initialisation and termination methods. - - /** - * The is the map in which the entries reside. The - * timer attribute is initialed to zero in this constructor. And - * the field denotes the percentage of the entries - * in the cache which can be purged automagically and by default is - * set to 10%. - */ - ACE_LFU_Caching_Strategy (void); - - // = Strategy methods. - - /// Access the attributes. - ATTRIBUTES attributes (void); - - /// Get the percentage of entries to purge. - double purge_percent (void); - - /// Set the percentage of entries to purge. - void purge_percent (double percentage); - - // = Strategy related Operations - - /// This method acts as a notification about the CONTAINERs bind - /// method call. - int notify_bind (int result, - const ATTRIBUTES &attr); - - /// Lookup notification. - int notify_find (int result, - ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs unbind - /// method call - int notify_unbind (int result, - const ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs trybind - /// method call - int notify_trybind (int result, - ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs rebind - /// method call - int notify_rebind (int result, - const ATTRIBUTES &attr); - - /// Purge the cache. - CACHING_UTILITY &caching_utility (void); - - /// Dumps the state of the object. - void dump (void) const; - -private: - - /// The level about which the purging will happen automagically. - double purge_percent_; - - /// This is the helper class which will decide and expunge entries - /// from the cache. - CACHING_UTILITY caching_utility_; -}; - -///////////////////////////////////////////////////////////// -#define ACE_FIFO_Caching_Strategy AFIFO - -/** - * @class ACE_FIFO_Caching_Strategy - * - * @brief The First In First Out strategy is implemented wherein each - * item is ordered. - * - * The order tag of each item is used to decide the item to be - * removed from the cache. The items with least order are removed. - * Explanation of the template parameter list: - * CONTAINER is any map with entries of type . - * The ATTRIBUTES are the deciding factor for purging of entries - * and should logically be included with the VALUE. Some ways of - * doing this are: As being a member of the VALUE or VALUE being - * ACE_Pair. The CACHING_UTILITY is the - * class which can be plugged in and which decides the entries - * to purge. - */ -template -class ACE_FIFO_Caching_Strategy -{ - -public: - - typedef ATTRIBUTES CACHING_ATTRIBUTES; - - // = Initialisation and termination. - - /** - * The is the map in which the entries reside. The - * timer attribute is initialed to zero in this constructor. And - * the field denotes the percentage of the entries - * in the cache which can be purged automagically and by default is - * set to 10%. - */ - ACE_FIFO_Caching_Strategy (void); - - // = Strategy methods. - - /// Accessor method. - ATTRIBUTES attributes (void); - - /// Get the percentage of entries to purge. - double purge_percent (void); - - /// Set the percentage of entries to purge. - void purge_percent (double percentage); - - // = Strategy related Operations - - /// Notification for an item getting bound into the cache. - int notify_bind (int result, - const ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs find - /// method call - int notify_find (int result, - ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs unbind - /// method call - int notify_unbind (int result, - const ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs trybind - /// method call - int notify_trybind (int result, - ATTRIBUTES &attr); - - /// Notification for an item getting bound again into the cache. - int notify_rebind (int result, - const ATTRIBUTES &attr); - - /// Purge the cache. - CACHING_UTILITY &caching_utility (void); - - /// Dumps the state of the object. - void dump (void) const; - -private: - - /// The order is the deciding factor for the item to be removed from - /// the cache. - ATTRIBUTES order_; - - /// The level about which the purging will happen automagically. - double purge_percent_; - - /// This is the helper class which will decide and expunge entries - /// from the cache. - CACHING_UTILITY caching_utility_; -}; - -////////////////////////////////////////////////////////////////////// -#define ACE_Null_Caching_Strategy ANULL - -/** - * @class ACE_Null_Caching_Strategy - * - * @brief The is a special caching strategy which doesnt have the purging - * feature. - * - * No purging provided. To be used when purging might be too expensive - * an operation. - */ -template -class ACE_Null_Caching_Strategy -{ - -public: - - // = Traits. - typedef ATTRIBUTES CACHING_ATTRIBUTES; - - // = Strategy methods. All are NO_OP methods!!! - - /// Accessor method. - ATTRIBUTES attributes (void); - - /// Get the percentage of entries to purge. - double purge_percent (void); - - /// Set the percentage of entries to purge. - void purge_percent (double percentage); - - // = Strategy related Operations - - /// Notification for an item getting bound into the cache. - int notify_bind (int result, - const ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs find - /// method call - int notify_find (int result, - ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs unbind - /// method call - int notify_unbind (int result, - const ATTRIBUTES &attr); - - /// This method acts as a notification about the CONTAINERs trybind - /// method call - int notify_trybind (int result, - ATTRIBUTES &attr); - - /// Notification for an item getting bound again into the cache. - int notify_rebind (int result, - const ATTRIBUTES &attr); - - /// Purge the cache. - CACHING_UTILITY &caching_utility (void); - - /// Dumps the state of the object. - void dump (void) const; - -private: - - /// This is the helper class which will decide and expunge entries - /// from the cache. - CACHING_UTILITY caching_utility_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Caching_Strategies_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Caching_Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Caching_Strategies_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_CACHING_STRATEGIES_H */ diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.i deleted file mode 100644 index b57b9fc4f38..00000000000 --- a/ace/Caching_Strategies_T.i +++ /dev/null @@ -1,448 +0,0 @@ -/* -*-C++-*- */ -//$Id$ - -////////////////////////////////////////////////////////////////////////////////// - -template ACE_INLINE -ACE_Caching_Strategy_Adapter::ACE_Caching_Strategy_Adapter (IMPLEMENTATION *implementation, - int delete_implementation) - : implementation_ (implementation), - delete_implementation_ (delete_implementation) -{ - if (this->implementation_ == 0) - { - ACE_NEW (this->implementation_, - IMPLEMENTATION); - this->delete_implementation_ = 1; - } -} - -template ACE_INLINE -ACE_Caching_Strategy_Adapter::~ACE_Caching_Strategy_Adapter (void) -{ - if (this->delete_implementation_) - { - delete this->implementation_; - this->delete_implementation_ = 0; - this->implementation_ = 0; - } -} - -template ACE_INLINE ATTRIBUTES -ACE_Caching_Strategy_Adapter::attributes (void) -{ - return this->implementation_->attributes (); -} - -template ACE_INLINE double -ACE_Caching_Strategy_Adapter::purge_percent (void) -{ - return this->implementation_->purge_percent (); -} - -template ACE_INLINE void -ACE_Caching_Strategy_Adapter::purge_percent (double percentage) -{ - this->implementation_->purge_percent (percentage); -} - -template ACE_INLINE int -ACE_Caching_Strategy_Adapter::notify_bind (int result, - const ATTRIBUTES &attr) -{ - return this->implementation_->notify_bind (result, - attr); -} - -template ACE_INLINE int -ACE_Caching_Strategy_Adapter::notify_find (int result, - ATTRIBUTES &attr) -{ - return this->implementation_->notify_find (result, - attr); -} - -template ACE_INLINE int -ACE_Caching_Strategy_Adapter::notify_unbind (int result, - const ATTRIBUTES &attr) -{ - return this->implementation_->notify_unbind (result, - attr); -} - -template ACE_INLINE int -ACE_Caching_Strategy_Adapter::notify_trybind (int result, - ATTRIBUTES &attr) -{ - return this->implementation_->notify_trybind (result, - attr); -} - -template ACE_INLINE int -ACE_Caching_Strategy_Adapter::notify_rebind (int result, - const ATTRIBUTES &attr) -{ - return this->implementation_->notify_rebind (result, - attr); -} - -template ACE_INLINE IMPLEMENTATION & -ACE_Caching_Strategy_Adapter::implementation (void) -{ - return *this->implementation_; -} - -template ACE_INLINE CACHING_UTILITY & -ACE_Caching_Strategy_Adapter::caching_utility (void) -{ - return this->implementation_->caching_utility (); -} - -template ACE_INLINE void -ACE_Caching_Strategy_Adapter::dump (void) const -{ - ACE_TRACE ("ACE_Caching_Strategy_Adapter::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -////////////////////////////////////////////////////////////////////////////////// - -template ACE_INLINE ATTRIBUTES -ACE_LRU_Caching_Strategy::attributes (void) -{ - return this->timer_; -} - -template ACE_INLINE double -ACE_LRU_Caching_Strategy::purge_percent (void) -{ - return this->purge_percent_; -} - -template ACE_INLINE void -ACE_LRU_Caching_Strategy::purge_percent (double percentage) -{ - this->purge_percent_ = percentage; -} - -template ACE_INLINE int -ACE_LRU_Caching_Strategy::notify_bind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - if (result == 0) - ++this->timer_; - - return result; -} - -template ACE_INLINE int -ACE_LRU_Caching_Strategy::notify_find (int result, - ATTRIBUTES &attr) -{ - if (result == 0) - { - attr = this->timer_; - ++this->timer_; - } - - return result; -} - -template ACE_INLINE int -ACE_LRU_Caching_Strategy::notify_unbind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - return result; -} - -template ACE_INLINE int -ACE_LRU_Caching_Strategy::notify_trybind (int result, - ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_LRU_Caching_Strategy::notify_rebind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - if (result == 0) - ++this->timer_; - - return result; -} - -template ACE_INLINE CACHING_UTILITY & -ACE_LRU_Caching_Strategy::caching_utility (void) -{ - return this->caching_utility_; -} - -template ACE_INLINE void -ACE_LRU_Caching_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_LRU_Caching_Strategy::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("timer_ = %d "), this->timer_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -////////////////////////////////////////////////////////////////////////////////// - -template ACE_INLINE ATTRIBUTES -ACE_LFU_Caching_Strategy::attributes (void) -{ - return 0; -} - -template ACE_INLINE double -ACE_LFU_Caching_Strategy::purge_percent (void) -{ - return this->purge_percent_; -} - -template ACE_INLINE void -ACE_LFU_Caching_Strategy::purge_percent (double percentage) -{ - this->purge_percent_ = percentage; -} - -template ACE_INLINE int -ACE_LFU_Caching_Strategy::notify_bind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_LFU_Caching_Strategy::notify_find (int result, - ATTRIBUTES &attr) -{ - if (result == 0) - ++attr; - - return result; -} - -template ACE_INLINE int -ACE_LFU_Caching_Strategy::notify_trybind (int result, - ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_LFU_Caching_Strategy::notify_rebind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_LFU_Caching_Strategy::notify_unbind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE CACHING_UTILITY & -ACE_LFU_Caching_Strategy::caching_utility (void) -{ - return this->caching_utility_; -} - -template ACE_INLINE void -ACE_LFU_Caching_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_LFU_Caching_Strategy::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -////////////////////////////////////////////////////////////////////////////////////// - -template ACE_INLINE ATTRIBUTES -ACE_FIFO_Caching_Strategy::attributes (void) -{ - return this->order_; -} - -template ACE_INLINE double -ACE_FIFO_Caching_Strategy::purge_percent (void) -{ - return this->purge_percent_; -} - -template ACE_INLINE void -ACE_FIFO_Caching_Strategy::purge_percent (double percentage) -{ - this->purge_percent_ = percentage; -} - -template ACE_INLINE int -ACE_FIFO_Caching_Strategy::notify_bind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - if (result == 0) - ++this->order_; - - return result; -} - -template ACE_INLINE int -ACE_FIFO_Caching_Strategy::notify_find (int result, - ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_FIFO_Caching_Strategy::notify_unbind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_FIFO_Caching_Strategy::notify_trybind (int result, - ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_FIFO_Caching_Strategy::notify_rebind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - if (result == 0) - ++this->order_; - - return result; -} - -template ACE_INLINE CACHING_UTILITY & -ACE_FIFO_Caching_Strategy::caching_utility (void) -{ - return this->caching_utility_; -} - -template ACE_INLINE void -ACE_FIFO_Caching_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("order_ = %d "), this->order_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -////////////////////////////////////////////////////////////////////////////////// - -template ACE_INLINE ATTRIBUTES -ACE_Null_Caching_Strategy::attributes (void) -{ - return 0; -} - -template ACE_INLINE double -ACE_Null_Caching_Strategy::purge_percent (void) -{ - return 0; -} - -template ACE_INLINE void -ACE_Null_Caching_Strategy::purge_percent (double percentage) -{ - ACE_UNUSED_ARG (percentage); -} - -template ACE_INLINE int -ACE_Null_Caching_Strategy::notify_bind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_Null_Caching_Strategy::notify_find (int result, - ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_Null_Caching_Strategy::notify_unbind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_Null_Caching_Strategy::notify_trybind (int result, - ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE int -ACE_Null_Caching_Strategy::notify_rebind (int result, - const ATTRIBUTES &attr) -{ - ACE_UNUSED_ARG (attr); - - return result; -} - -template ACE_INLINE CACHING_UTILITY & -ACE_Null_Caching_Strategy::caching_utility (void) -{ - return this->caching_utility_; -} - -template ACE_INLINE void -ACE_Null_Caching_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Null_Caching_Strategy::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -////////////////////////////////////////////////////////////////////////////////// diff --git a/ace/Caching_Utility_T.cpp b/ace/Caching_Utility_T.cpp deleted file mode 100644 index 351255c1dfa..00000000000 --- a/ace/Caching_Utility_T.cpp +++ /dev/null @@ -1,502 +0,0 @@ -// $Id$ - -#ifndef CACHING_UTILITY_T_C -#define CACHING_UTILITY_T_C - -#include "ace/Caching_Utility_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#define ACE_LACKS_PRAGMA_ONCE -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Min_Max.h" -#include "ace/OS_Memory.h" -// #include "ace/Strategies.h" -#include "ace/Recyclable.h" - -ACE_RCSID(ace, Caching_Utility_T, "$Id$") - -////////////////////////////////////////////////////////////////////////////// - -template -ACE_Pair_Caching_Utility::ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) - : cleanup_strategy_ (cleanup_strategy), - delete_cleanup_strategy_ (delete_cleanup_strategy) -{ - if (cleanup_strategy == 0) - { - ACE_NEW (this->cleanup_strategy_, - CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; - } -} - -template -ACE_Pair_Caching_Utility::~ACE_Pair_Caching_Utility (void) -{ - if (this->delete_cleanup_strategy_) - delete this->cleanup_strategy_; -} - -template int -ACE_Pair_Caching_Utility::clear_cache (CONTAINER &container, - double purge_percent) -{ - // Check that the purge_percent is non-zero. - if (purge_percent == 0) - return 0; - - // Get the number of entries in the container. - size_t current_map_size = container.current_size (); - - // Also whether the number of entries in the cache! - // Oops! then there is no way out but exiting. So return an error. - if (current_map_size == 0) - return 0; - - // Calculate the no of entries to remove from the cache depending - // upon the . - size_t entries_to_remove - = ACE_MAX (ACE_static_cast (size_t, 1), - ACE_static_cast (size_t, - ACE_static_cast(double, purge_percent) - / 100 * current_map_size)); - KEY *key_to_remove = 0; - VALUE *value_to_remove = 0; - - for (size_t i = 0; i < entries_to_remove ; ++i) - { - this->minimum (container, - key_to_remove, - value_to_remove); - - // Simply verifying that the key is non-zero. - // This is important for strategies where the minimum - // entry cant be found due to constraints on the type of entry - // to remove. - if (key_to_remove == 0) - return 0; - - if (this->cleanup_strategy_->cleanup (container, - key_to_remove, - value_to_remove) == -1) - return -1; - - } - - return 0; -} - -template void -ACE_Pair_Caching_Utility::minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove) -{ - // Starting values. - ITERATOR iter = container.begin (); - ITERATOR end = container.end (); - ATTRIBUTES min = (*iter).int_id_.second (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - - // The iterator moves thru the container searching for the entry - // with the lowest ATTRIBUTES. - for (++iter; - iter != end; - ++iter) - { - if (min > (*iter).int_id_.second ()) - { - // Ah! an item with lower ATTTRIBUTES... - min = (*iter).int_id_.second (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - } - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////// - -template -ACE_Recyclable_Handler_Caching_Utility::ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) - : cleanup_strategy_ (cleanup_strategy), - delete_cleanup_strategy_ (delete_cleanup_strategy) -{ - if (cleanup_strategy == 0) - { - ACE_NEW (this->cleanup_strategy_, - CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; - } -} - -template -ACE_Recyclable_Handler_Caching_Utility::~ACE_Recyclable_Handler_Caching_Utility (void) -{ - if (this->delete_cleanup_strategy_) - delete this->cleanup_strategy_; -} - -template int -ACE_Recyclable_Handler_Caching_Utility::clear_cache (CONTAINER &container, - double purge_percent) -{ - // Check that the purge_percent is non-zero. - if (purge_percent == 0) - return 0; - - // Get the number of entries in the container. - size_t current_map_size = container.current_size (); - - // Also whether the number of entries in the cache is just one! - // Oops! then there is no way out but exiting. So return an error. - // if (current_map_size <= 1) - if (current_map_size == 0) - return 0; - - // Calculate the no of entries to remove from the cache depending - // upon the . - size_t entries_to_remove - = ACE_MAX (ACE_static_cast (size_t, 1), - ACE_static_cast(size_t, - ACE_static_cast(double, purge_percent) - / 100 * current_map_size)); - - KEY *key_to_remove = 0; - VALUE *value_to_remove = 0; - - for (size_t i = 0; i < entries_to_remove ; ++i) - { - this->minimum (container, - key_to_remove, - value_to_remove); - - // Simply verifying that the key is non-zero. - // This is important for strategies where the minimum - // entry cant be found due to constraints on the type of entry - // to remove. - if (key_to_remove == 0) - return 0; - - if (this->cleanup_strategy_->cleanup (container, - key_to_remove, - value_to_remove) == -1) - return -1; - } - - return 0; -} - -template void -ACE_Recyclable_Handler_Caching_Utility::minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove) -{ - // Starting values. - ITERATOR end = container.end (); - ITERATOR iter = container.begin (); - ATTRIBUTES min = (*iter).int_id_.second (); - key_to_remove = 0; - value_to_remove = 0; - // Found the minimum entry to be purged? - int found = 0; - - // The iterator moves thru the container searching for the entry - // with the lowest ATTRIBUTES. - for (; - iter != end; - ++iter) - { - // If the entry isnt IDLE_AND_PURGABLE continue until you reach - // the first entry which can be purged. This is the minimum with - // which you will compare the rest of the purgable entries. - if ((*iter).ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE || - (*iter).ext_id_.recycle_state () == ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE) - { - if (found == 0) - { - min = (*iter).int_id_.second (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - found = 1; - } - else - { - // Ah! an entry with lower ATTTRIBUTES... - if (min > (*iter).int_id_.second ()) - { - min = (*iter).int_id_.second (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - } - } - } - } -} - -//////////////////////////////////////////////////////////////////////////////// - -template -ACE_Refcounted_Recyclable_Handler_Caching_Utility::ACE_Refcounted_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) - : cleanup_strategy_ (cleanup_strategy), - delete_cleanup_strategy_ (delete_cleanup_strategy), - marked_as_closed_entries_ (0) -{ - if (cleanup_strategy == 0) - { - ACE_NEW (this->cleanup_strategy_, - CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; - } -} - -template -ACE_Refcounted_Recyclable_Handler_Caching_Utility::~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void) -{ - if (this->delete_cleanup_strategy_) - delete this->cleanup_strategy_; -} - -template int -ACE_Refcounted_Recyclable_Handler_Caching_Utility::clear_cache (CONTAINER &container, - double purge_percent) -{ - // Check that the purge_percent is non-zero. - if (purge_percent == 0) - return 0; - - // Get the number of entries in the container which can be considered for purging. - size_t available_entries = container.current_size () - this->marked_as_closed_entries_; - - // Also whether the number of entries in the cache zero. - // Oops! then there is no way out but exiting. - if (available_entries <= 0) - return 0; - - // Calculate the no of entries to remove from the cache depending - // upon the . - size_t entries_to_remove - = ACE_MAX (ACE_static_cast (size_t, 1), - ACE_static_cast(size_t, - ACE_static_cast(double, purge_percent) - / 100 * available_entries)); - - if (entries_to_remove >= available_entries || - entries_to_remove == 0) - entries_to_remove = available_entries - 1; - - KEY *key_to_remove = 0; - VALUE *value_to_remove = 0; - - for (size_t i = 0; i < entries_to_remove ; ++i) - { - this->minimum (container, - key_to_remove, - value_to_remove); - - // Simply verifying that the key is non-zero. - // This is important for strategies where the minimum - // entry cant be found due to constraints on the type of entry - // to remove. - if (key_to_remove == 0) - return 0; - - if (this->cleanup_strategy_->cleanup (container, - key_to_remove, - value_to_remove) == -1) - return -1; - - ++this->marked_as_closed_entries_; - } - - return 0; -} - -template void -ACE_Refcounted_Recyclable_Handler_Caching_Utility::minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove) -{ - // Starting values. - ITERATOR end = container.end (); - ITERATOR iter = container.begin (); - ATTRIBUTES min = (*iter).int_id_.second (); - key_to_remove = 0; - value_to_remove = 0; - // Found the minimum entry to be purged? - int found = 0; - - // The iterator moves thru the container searching for the entry - // with the lowest ATTRIBUTES. - for (; - iter != end; - ++iter) - { - // If the entry isnt IDLE_AND_PURGABLE continue until you reach - // the first entry which can be purged. This is the minimum with - // which you will compare the rest of the purgable entries. - if ((*iter).ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE || - (*iter).ext_id_.recycle_state () == ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE) - { - if (found == 0) - { - min = (*iter).int_id_.second (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - found = 1; - } - else - { - // Ah! an entry with lower ATTTRIBUTES... - if (min > (*iter).int_id_.second ()) - { - min = (*iter).int_id_.second (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - } - } - } - } -} - -//////////////////////////////////////////////////////////////////////////////// - -template -ACE_Handler_Caching_Utility::ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) - : cleanup_strategy_ (cleanup_strategy), - delete_cleanup_strategy_ (delete_cleanup_strategy) -{ - if (cleanup_strategy == 0) - { - ACE_NEW (this->cleanup_strategy_, - CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; - } -} - -template -ACE_Handler_Caching_Utility::~ACE_Handler_Caching_Utility (void) -{ - if (this->delete_cleanup_strategy_) - delete this->cleanup_strategy_; -} - -template int -ACE_Handler_Caching_Utility::clear_cache (CONTAINER &container, - double purge_percent) -{ - // Check that the purge_percent is non-zero. - if (purge_percent == 0) - return 0; - - // Get the number of entries in the container. - size_t current_map_size = container.current_size (); - - // Also whether the number of entries in the cache is just one! - // Oops! then there is no way out but exiting. So return an error. - if (current_map_size == 0) - return 0; - - // Calculate the no of entries to remove from the cache depending - // upon the . - size_t entries_to_remove - = ACE_MAX (ACE_static_cast (size_t, 1), - ACE_static_cast(size_t, - ACE_static_cast(double, purge_percent) - / 100 * current_map_size)); - - KEY *key_to_remove = 0; - VALUE *value_to_remove = 0; - - for (size_t i = 0; i < entries_to_remove ; ++i) - { - this->minimum (container, - key_to_remove, - value_to_remove); - - if (this->cleanup_strategy_->cleanup (container, - key_to_remove, - value_to_remove) == -1) - return -1; - } - - return 0; -} - -template void -ACE_Handler_Caching_Utility::minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove) -{ - // Starting values. - ITERATOR iter = container.begin (); - ITERATOR end = container.end (); - ATTRIBUTES min = (*iter).int_id_->caching_attributes (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - - // The iterator moves thru the container searching for the entry - // with the lowest ATTRIBUTES. - for (++iter; - iter != end; - ++iter) - { - if (min > (*iter).int_id_->caching_attributes () && - (*iter).int_id_->active () != 1) - { - // Ah! an item with lower ATTTRIBUTES... - min = (*iter).int_id_->caching_attributes (); - key_to_remove = &(*iter).ext_id_; - value_to_remove = &(*iter).int_id_; - } - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////// - -template -ACE_Null_Caching_Utility::ACE_Null_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy, - int delete_cleanup_strategy) - : cleanup_strategy_ (cleanup_strategy), - delete_cleanup_strategy_ (delete_cleanup_strategy) -{ - if (cleanup_strategy == 0) - { - ACE_NEW (this->cleanup_strategy_, - CLEANUP_STRATEGY); - this->delete_cleanup_strategy_ = 1; - } -} - -template -ACE_Null_Caching_Utility::~ACE_Null_Caching_Utility (void) -{ - if (this->delete_cleanup_strategy_) - delete this->cleanup_strategy_; -} - -template int -ACE_Null_Caching_Utility::clear_cache (CONTAINER &container, - double purge_percent) -{ - ACE_UNUSED_ARG (container); - ACE_UNUSED_ARG (purge_percent); - - return 0; -} - -template void -ACE_Null_Caching_Utility::minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove) -{ - ACE_UNUSED_ARG (container); - ACE_UNUSED_ARG (key_to_remove); - ACE_UNUSED_ARG (value_to_remove); -} - -#endif /* CACHING_UTILITY_T_C */ diff --git a/ace/Caching_Utility_T.h b/ace/Caching_Utility_T.h deleted file mode 100644 index 8201934fba4..00000000000 --- a/ace/Caching_Utility_T.h +++ /dev/null @@ -1,343 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Caching_Utility_T.h - * - * $Id$ - * - * @author Kirthika Parameswaran - */ -//============================================================================= - -#ifndef ACE_CACHING_UTILITY_H -#define ACE_CACHING_UTILITY_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Global_Macros.h" -#include "ace/Cleanup_Strategies_T.h" - -// For linkers that cant grok long names. -#define ACE_Pair_Caching_Utility APUTIL - -/** - * @class ACE_Pair_Caching_Utility - * - * @brief Defines a helper class for the Caching Strategies. - * - * This class defines the methods commonly used by the different - * caching strategies. For instance: method which - * decides and purges the entry from the container. Note: This - * class helps in the caching_strategies using a container - * containing entries of > - * kind. The attributes helps in deciding the entries to be - * purged. The Cleanup_Strategy is the callback class to which the - * entries to be cleaned up will be delegated. - */ -template -class ACE_Pair_Caching_Utility -{ -public: - - typedef ACE_Cleanup_Strategy CLEANUP_STRATEGY; - - /// Constructor. - ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); - - /// Destructor. - ~ACE_Pair_Caching_Utility (void); - - /** - * Purge entries from the . The Cleanup_Strategy will do the actual - * job of cleanup once the entries to be cleaned up are decided. - */ - int clear_cache (CONTAINER &container, - double purge_percent); - -protected: - - /// Find the entry with minimum caching attributes. - void minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove); - - /// The cleanup strategy which can be used to destroy the entries of - /// the container. - CLEANUP_STRATEGY *cleanup_strategy_; - - /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; - - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Pair_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Pair_Caching_Utility (const ACE_Pair_Caching_Utility &)) -}; - -//////////////////////////////////////////////////////////////////////////////// -#define ACE_Recyclable_Handler_Caching_Utility ARHUTIL - -/** - * @class ACE_Recyclable_Handler_Caching_Utility - * - * @brief Defines a helper class for the Caching Strategies. - * - * This class defines the methods commonly used by the different - * caching strategies. For instance: method which - * decides and purges the entry from the container. Note: This - * class helps in the caching_strategies using a container - * containing entries of kind. The attributes - * helps in deciding the entries to be purged. The - * Cleanup_Strategy is the callback class to which the entries to - * be cleaned up will be delegated. - */ -template -class ACE_Recyclable_Handler_Caching_Utility -{ - -public: - - typedef ACE_Recyclable_Handler_Cleanup_Strategy CLEANUP_STRATEGY; - typedef ACE_Cleanup_Strategy CLEANUP_STRATEGY_BASE; - - /// Constructor. - ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); - - /// Destructor. - ~ACE_Recyclable_Handler_Caching_Utility (void); - - /** - * Purge entries from the . The Cleanup_Strategy will do - * the actual job of cleanup once the entries to be cleaned up are - * decided. - */ - int clear_cache (CONTAINER &container, - double purge_percent); - -protected: - - /// Find the entry with minimum caching attributes. - void minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove); - - /// This is the default Cleanup Strategy for this utility. - CLEANUP_STRATEGY_BASE *cleanup_strategy_; - - /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; - -private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Recyclable_Handler_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Recyclable_Handler_Caching_Utility (const ACE_Recyclable_Handler_Caching_Utility &)) -}; - -/////////////////////////////////////////////////////////////////////////// -#define ACE_Refcounted_Recyclable_Handler_Caching_Utility ARRHUTIL - -/** - * @class ACE_Refcounted_Recyclable_Handler_Caching_Utility - * - * @brief Defines a helper class for the Caching Strategies. - * - * This class defines the methods commonly used by the different - * caching strategies. For instance: clear_cache () method which - * decides and purges the entry from the container. Note: This - * class helps in the caching_strategies using a container - * containing entries of kind. The attributes helps in - * deciding the entries to be purged. The Cleanup_Strategy is the - * callback class to which the entries to be cleaned up will be - * delegated. - */ -template -class ACE_Refcounted_Recyclable_Handler_Caching_Utility -{ - -public: - - typedef ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy CLEANUP_STRATEGY; - typedef ACE_Cleanup_Strategy CLEANUP_STRATEGY_BASE; - - /// Constructor. - ACE_Refcounted_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); - - /// Destructor. - ~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void); - - /** - * Purge entries from the . The Cleanup_Strategy will do - * the actual job of cleanup once the entries to be cleaned up are - * decided. - */ - int clear_cache (CONTAINER &container, - double purge_percent); - -protected: - - /// Find the entry with minimum caching attributes. - void minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove); - - /// This is the default Cleanup Strategy for this utility. - CLEANUP_STRATEGY_BASE *cleanup_strategy_; - - /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; - - /** - * This figure denotes the number of entries are there in the - * container which have been marked as closed already but might - * not have been unbound from the container. - */ - size_t marked_as_closed_entries_; - -private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Refcounted_Recyclable_Handler_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Refcounted_Recyclable_Handler_Caching_Utility (const ACE_Refcounted_Recyclable_Handler_Caching_Utility &)) -}; - -//////////////////////////////////////////////////////////////////////////////////////// - -/** - * @class ACE_Handler_Caching_Utility - * - * @brief Defines a helper class for the Caching Strategies. - * - * This class defines the methods commonly used by the different - * caching strategies. For instance: method which - * decides and purges the entry from the container. Note: This - * class helps in the caching_strategies using a container - * containing entries of kind where the HANDLER - * contains the caching attributes which help in deciding the - * entries to be purged. The Cleanup_Strategy is the callback - * class to which the entries to be cleaned up will be delegated. - */ -template -class ACE_Handler_Caching_Utility -{ -public: - - typedef ACE_Handler_Cleanup_Strategy CLEANUP_STRATEGY; - typedef ACE_Cleanup_Strategy CLEANUP_STRATEGY_BASE; - - /// Constructor. - ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); - - /// Destructor. - ~ACE_Handler_Caching_Utility (void); - - /** - * Purge entries from the . The Cleanup_Strategy will do - * the actual job of cleanup once the entries to be cleaned up are - * decided. - */ - int clear_cache (CONTAINER &container, - double purge_percent); - -protected: - - /** - * Find the entry with minimum caching attributes. This is handler - * specific since this utility is to be used very specifically for - * handler who have caching_attributes for server side acched - * connection management. - */ - void minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove); - - /// The cleanup strategy which can be used to destroy the entries of - /// the container. - CLEANUP_STRATEGY_BASE *cleanup_strategy_; - - /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; - -private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Handler_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Handler_Caching_Utility (const ACE_Handler_Caching_Utility &)) -}; - -/////////////////////////////////////////////////////////////////////////// -#define ACE_Null_Caching_Utility ANUTIL -/** - * @class ACE_Null_Caching_Utility - * - * @brief Defines a dummy helper class for the Caching Strategies. - * - * This class defines the methods commonly used by the different - * caching strategies. For instance: method which - * decides and purges the entry from the container. Note: This - * class is be used with the Null_Caching_Strategy. The - * Cleanup_Strategy is the callback class to which the entries to - * be cleaned up will be delegated. - */ -template -class ACE_Null_Caching_Utility -{ -public: - - typedef ACE_Null_Cleanup_Strategy CLEANUP_STRATEGY; - typedef ACE_Cleanup_Strategy CLEANUP_STRATEGY_BASE; - - /// Constructor. - ACE_Null_Caching_Utility (ACE_Cleanup_Strategy *cleanup_strategy = 0, - int delete_cleanup_strategy = 0); - - /// Destructor. - ~ACE_Null_Caching_Utility (void); - - /** - * Purge entries from the . The Cleanup_Strategy will do - * the actual job of cleanup once the entries to be cleaned up are - * decided. Note: Here it is a no-op. - */ - int clear_cache (CONTAINER &container, - double purge_percent); - -protected: - - /** - * Find the entry with minimum caching attributes. This is handler - * specific since this utility is to be used very specifically for - * handler who have caching_attributes for server side acched - * connection management.Note: Here it is a no-op. - */ - void minimum (CONTAINER &container, - KEY *&key_to_remove, - VALUE *&value_to_remove); - - /// The cleanup strategy which can be used to destroy the entries of - /// the container. - CLEANUP_STRATEGY_BASE *cleanup_strategy_; - - /// Whether the cleanup_strategy should be destroyed or not. - int delete_cleanup_strategy_; - -private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Null_Caching_Utility &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Null_Caching_Utility (const ACE_Null_Caching_Utility &)) -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Caching_Utility_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Caching_Utility_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_CACHING_UTILITY_H */ diff --git a/ace/Capabilities.cpp b/ace/Capabilities.cpp deleted file mode 100644 index 9f5db74fc7d..00000000000 --- a/ace/Capabilities.cpp +++ /dev/null @@ -1,367 +0,0 @@ -#include "ace/Capabilities.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Capabilities.i" -#endif /* !__ACE_INLINE__ */ - - -ACE_RCSID (ace, - Capabilities, - "$Id$") - - -#define ACE_ESC ((ACE_TCHAR)0x1b) - - -ACE_CapEntry::~ACE_CapEntry (void) -{ -} - -ACE_Capabilities::ACE_Capabilities (void) - : caps_ () -{ -} - -ACE_Capabilities::~ACE_Capabilities (void) -{ - this->resetcaps (); -} - -const ACE_TCHAR * -ACE_Capabilities::parse (const ACE_TCHAR *buf, ACE_TString &cap) -{ - while (*buf != ACE_LIB_TEXT ('\0') && *buf != ACE_LIB_TEXT (',')) - { - if (*buf == ACE_LIB_TEXT ('\\')) - { - buf++; - if (*buf == ACE_LIB_TEXT ('E') || *buf == ACE_LIB_TEXT ('e')) - { - cap += ACE_ESC; - buf++; - continue; - } - else if (*buf == ACE_LIB_TEXT ('r')) - { - cap += ACE_LIB_TEXT ('\r'); - buf++; - continue; - } - else if (*buf == ACE_LIB_TEXT ('n')) - { - cap += ACE_LIB_TEXT ('\n'); - buf++; - continue; - } - else if (*buf == ACE_LIB_TEXT ('t')) - { - cap += ACE_LIB_TEXT ('\t'); - buf++; - continue; - } - else if (*buf == ACE_LIB_TEXT ('\\')) - { - cap += *buf++; - continue; - } - if (isdigit(*buf)) - { - // @@ UNICODE Does this work with unicode? - int oc = 0; - for (int i = 0; - i < 3 && *buf && isdigit (*buf); - i++) - oc = oc * 8 + (*buf++ - ACE_LIB_TEXT ('0')); - - cap += (ACE_TCHAR) oc; - continue; - } - } - cap += *buf++; - } - return buf; -} - -const ACE_TCHAR * -ACE_Capabilities::parse (const ACE_TCHAR *buf, int &cap) -{ - int n = 0; - - while (*buf && isdigit (*buf)) - n = n * 10 + (*buf++ - ACE_LIB_TEXT ('0')); - - cap = n; - - return buf; -} - -void -ACE_Capabilities::resetcaps (void) -{ - for (MAP::ITERATOR iter (this->caps_); - !iter.done (); - iter.advance ()) - { - MAP::ENTRY *entry; - iter.next (entry); - delete entry->int_id_; - } - - this->caps_.close (); - this->caps_.open (); -} - -int -ACE_Capabilities::fillent (const ACE_TCHAR *buf) -{ - this->resetcaps (); - while (*buf) - { - ACE_TString s; - int n; - ACE_TString name; - ACE_CapEntry *ce; - - // Skip blanks - while (*buf && isspace(*buf)) buf++; - // If we get end of line return - - if (*buf == ACE_LIB_TEXT ('\0')) - break; - - if (*buf == ACE_LIB_TEXT ('#')) - { - while (*buf && *buf != ACE_LIB_TEXT ('\n')) - buf++; - if (*buf == ACE_LIB_TEXT ('\n')) - buf++; - continue; - } - while(*buf && *buf != ACE_LIB_TEXT ('=') - && *buf!= ACE_LIB_TEXT ('#') - && *buf != ACE_LIB_TEXT (',')) - name += *buf++; - - // If name is null. - switch (*buf) - { - case ACE_LIB_TEXT ('='): - // String property - buf = this->parse (buf + 1, s); - ACE_NEW_RETURN (ce, - ACE_StringCapEntry (s), - -1); - if (this->caps_.bind (name, ce) == -1) - { - delete ce; - return -1; - } - break; - case ACE_LIB_TEXT ('#'): - // Integer property - buf = this->parse (buf + 1, n); - ACE_NEW_RETURN (ce, - ACE_IntCapEntry (n), - -1); - if (this->caps_.bind (name, ce) == -1) - { - delete ce; - return -1; - } - break; - case ACE_LIB_TEXT (','): - // Boolean - ACE_NEW_RETURN (ce, - ACE_BoolCapEntry (1), - -1); - if (this->caps_.bind (name, ce) == -1) - { - delete ce; - return -1; - } - break; - default: - return 0; - } - - if (*buf++ != ACE_LIB_TEXT (',')) - return -1; - } - - return 0; -} - -int -ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line) -{ - for (;;) - { - // Skip blanks or irrelevant characters - while (*line && isspace(*line)) - line++; - - // End of line reached - if (*line == ACE_LIB_TEXT ('\0')) - break; - - // Build the entry name - ACE_TString nextname; - while (*line && *line != ACE_LIB_TEXT ('|') && *line != ACE_LIB_TEXT (',')) - nextname += *line++; - - // We have found the required entry? - if (ACE_OS::strcmp (nextname.c_str (), name) == 0) - return 1; - - // Skip puntuaction char if neccesary. - if (*line == ACE_LIB_TEXT ('|') || *line == ACE_LIB_TEXT (',')) - line++; - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Invalid entry\n"))); - break; - } - } - return 0; -} - -int -ACE_Capabilities::getline (FILE *fp, ACE_TString &line) -{ - int ch; - - line.set (0, 0); - - while ((ch = fgetc (fp)) != EOF && ch != ACE_LIB_TEXT ('\n')) - line += (ACE_TCHAR) ch; - - if (ch == EOF && line.length () == 0) - return -1; - else - return 0; -} - -int -ACE_Capabilities::getval (const ACE_TCHAR *keyname, ACE_TString &val) -{ - ACE_CapEntry* cap; - if (this->caps_.find (keyname, cap) == -1) - return -1; - - ACE_StringCapEntry *scap = - ACE_dynamic_cast (ACE_StringCapEntry *, cap); - if (scap == 0) - return -1; - - val = scap->getval (); - return 0; -} - -int -ACE_Capabilities::getval (const ACE_TCHAR *keyname, int &val) -{ - ACE_CapEntry *cap; - if (this->caps_.find (keyname, cap) == -1) - return -1; - - ACE_IntCapEntry *icap = - ACE_dynamic_cast (ACE_IntCapEntry *, cap); - if (icap != 0) - { - val = icap->getval (); - return 0; - } - - ACE_BoolCapEntry *bcap = - ACE_dynamic_cast (ACE_BoolCapEntry *, cap); - - if (bcap == 0) - return -1; - - val = bcap->getval (); - return 0; -} - -#if !defined (ACE_IS_SPLITTING) -static int -is_empty (const ACE_TCHAR *line) -{ - while (*line && isspace (*line)) - line++; - - return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#'); -} - -static int -is_line (const ACE_TCHAR *line) -{ - while (*line && isspace (*line)) - line++; - - return *line != ACE_LIB_TEXT ('\0'); -} -#endif /* !ACE_IS_SPLITTING */ - -int -ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name) -{ - FILE *fp = ACE_OS::fopen (fname, ACE_LIB_TEXT ("r")); - - if (fp == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Can't open %s file\n"), - fname), - -1); - - int done; - ACE_TString line; - - while (!(done = (this->getline (fp, line) == -1)) - && is_empty (line.c_str ())) - continue; - - while (!done) - { - ACE_TString newline; - ACE_TString description; - - while (!(done = (this->getline (fp, newline) == -1))) - if (is_line (newline.c_str ())) - description += newline; - else - break; - - if (this->is_entry (name, line.c_str())) - { - ACE_OS::fclose (fp); - return this->fillent (description.c_str ()); - } - - line = newline; - while (!done && is_empty (line.c_str ())) - done = this->getline (fp, line) == -1; - } - - ACE_OS::fclose (fp); - return -1; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Entry; -template class ACE_Hash_Map_Manager_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash; -template class ACE_Equal_To; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Entry -#pragma instantiate ACE_Hash_Map_Manager_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Hash -#pragma instantiate ACE_Equal_To -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Capabilities.h b/ace/Capabilities.h deleted file mode 100644 index 550a2fb71c2..00000000000 --- a/ace/Capabilities.h +++ /dev/null @@ -1,211 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Capabilities.h - * - * $Id$ - * - * @author Arturo Montes - */ -//============================================================================= - - -#ifndef ACE_CAPABILITIES_H -#define ACE_CAPABILITIES_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" -#include "ace/Hash_Map_Manager_T.h" -#include "ace/Containers.h" -#include "ace/SString.h" - -/** - * @class ACE_CapEntry - * - * @brief This class is the base class for all ACE Capabilities entry - * subclasses. - * - * This class is not instantiable and does not provide accessors - * or methods. If you want to add a new kind of attribute subclass - * this class and dynamic_cast to proper subclass. - */ -class ACE_Export ACE_CapEntry -{ -public: - - virtual ~ACE_CapEntry (void); - -protected: - - enum - { - ACE_INTCAP = 0, - ACE_STRINGCAP = 1, - ACE_BOOLCAP = 2 - }; - - ACE_CapEntry (int captype); - -protected: - - int captype_; - -}; - -/** - * @class ACE_IntCapEntry - * - * @brief This class implement the ACE Integer Capability subclass. - * - * This is a container class for ACE Capabilities integer container - * values. - */ -class ACE_Export ACE_IntCapEntry : public ACE_CapEntry -{ -public: - ACE_IntCapEntry (int val); - int getval (void) const; - -protected: - int val_; -}; - -/** - * @class ACE_StringCapEntry - * - * @brief This class implement the ACE String Capability subclass. - * - * This is a container class for ACE Capabilities String container - * values. - */ -class ACE_Export ACE_StringCapEntry : public ACE_CapEntry -{ -public: - ACE_StringCapEntry (const ACE_TString &val); - ACE_TString getval (void) const; - -protected: - ACE_TString val_; -}; - -/** - * @class ACE_BoolCapEntry - * - * @brief This class implement the ACE Bool Capability subclass. - * - * This is a container class for ACE Capabilities bool container - * values. - */ -class ACE_Export ACE_BoolCapEntry : public ACE_CapEntry -{ -public: - ACE_BoolCapEntry (int val); - int getval (void) const; - -protected: - int val_; -}; - -/** - * @class ACE_Capabilities - * - * @brief This class implement the ACE Capabilities. - * - * This is a container class for ACE Capabilities - * values. Currently exist three different capability values: - * (integer), (bool) and - * (String). An is a - * unordered set of pair = (, *). Where - * the first component is the name of capability and the second - * component is a pointer to the capability value container. A - * is a container for , the - * has a name in the file, as a termcap file. - */ -class ACE_Export ACE_Capabilities -{ -public: - - typedef ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> MAP; - - /// The Constructor - ACE_Capabilities (void); - - /// The Destructor - ~ACE_Capabilities(void); - -public: - - /// Get a string entry. - int getval (const ACE_TCHAR *ent, ACE_TString &val); - - /// Get an integer entry. - int getval (const ACE_TCHAR *ent, int &val); - - /// Get the ACE_Capabilities name from FILE fname and load the - /// associated capabitily entries in map. - int getent (const ACE_TCHAR *fname, const ACE_TCHAR *name); - -protected: - - /// Parse an integer property - const ACE_TCHAR *parse (const ACE_TCHAR *buf, int &cap); - - /// Parse a string property - const ACE_TCHAR *parse (const ACE_TCHAR *buf, ACE_TString &cap); - - /// Fill the ACE_Capabilities with description in ent. - int fillent(const ACE_TCHAR *ent); - - /// Parse a cap entry - int parseent (const ACE_TCHAR *name, ACE_TCHAR *line); - - /// Get a line from FILE input stream - int getline (FILE* fp, - ACE_TString &line); - - /// Is a valid entry - int is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line); - - /// Reset the set of capabilities - void resetcaps (void); - -private: - - /// This is the set of ACE_CapEntry. - MAP caps_; - -}; - -#if defined (ACE_IS_SPLITTING) -int -is_empty (const ACE_TCHAR *line) -{ - while (*line && isspace (*line)) - line++; - - return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#'); -} - -int -is_line (const ACE_TCHAR *line) -{ - while (*line && isspace (*line)) - line++; - - return *line != ACE_LIB_TEXT ('\0'); -} -#endif /* ACE_IS_SPLITTING */ - -#if defined (__ACE_INLINE__) -#include "ace/Capabilities.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* __ACE_CAPABILITIES_H__ */ diff --git a/ace/Capabilities.i b/ace/Capabilities.i deleted file mode 100644 index ca168c0491a..00000000000 --- a/ace/Capabilities.i +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -ACE_INLINE -ACE_CapEntry::ACE_CapEntry (int captype) - : captype_ (captype) -{ -} - -ACE_INLINE -ACE_IntCapEntry::ACE_IntCapEntry (int val) - : ACE_CapEntry (ACE_INTCAP), - val_ (val) -{ -} - -ACE_INLINE int -ACE_IntCapEntry::getval (void) const -{ - return val_; -} - -ACE_INLINE -ACE_StringCapEntry::ACE_StringCapEntry (const ACE_TString &val) - : ACE_CapEntry (ACE_STRINGCAP), - val_ (val) -{ -} - -ACE_INLINE ACE_TString -ACE_StringCapEntry::getval (void) const -{ - return val_; -} - -ACE_INLINE -ACE_BoolCapEntry::ACE_BoolCapEntry (int val) - : ACE_CapEntry (ACE_BOOLCAP), - val_(val) -{ -} - -ACE_INLINE int -ACE_BoolCapEntry::getval (void) const -{ - return val_; -} diff --git a/ace/Cleanup_Strategies_T.cpp b/ace/Cleanup_Strategies_T.cpp deleted file mode 100644 index 84b20f9035a..00000000000 --- a/ace/Cleanup_Strategies_T.cpp +++ /dev/null @@ -1,89 +0,0 @@ -//$Id$ - -#ifndef CLEANUP_STRATEGIES_T_C -#define CLEANUP_STRATEGIES_T_C - -#include "ace/Cleanup_Strategies_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#define ACE_LACKS_PRAGMA_ONCE -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Cleanup_Strategies_T, "$Id$") - -//////////////////////////////////////////////////////////////////////////// - -template int -ACE_Cleanup_Strategy::cleanup (CONTAINER &container, - KEY *key, - VALUE *value) -{ - ACE_UNUSED_ARG (value); - - return container.unbind (*key); -} - -//////////////////////////////////////////////////////////////////////////// - -template int -ACE_Recyclable_Handler_Cleanup_Strategy::cleanup (CONTAINER &container, - KEY *key, - VALUE *) -{ - VALUE value; - - if (container.unbind (*key, value) == -1) - return -1; - - value.first ()->recycler (0, 0); - - value.first ()->close (); - - return 0; -} - -///////////////////////////////////////////////////////////////////////////// - -template int -ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy::cleanup (CONTAINER &, - KEY *, - VALUE *value) -{ - return value->first ()->handle_close_i (); -} - -//////////////////////////////////////////////////////////////////////////// - -template int -ACE_Handler_Cleanup_Strategy::cleanup (CONTAINER &container, - KEY *key, - VALUE *value) -{ - // Remove the item from cache only if the handler isnt in use. - if ((*value)->active () == 0) - { - (*value)->close (); - - if (container.unbind (*key) == -1) - return -1; - - } - - return 0; -} - -//////////////////////////////////////////////////////////////////////////// - -template int -ACE_Null_Cleanup_Strategy::cleanup (CONTAINER &container, - KEY *key, - VALUE *value) -{ - ACE_UNUSED_ARG (container); - ACE_UNUSED_ARG (key); - ACE_UNUSED_ARG (value); - - return 0; -} - -#endif /* CLEANUP_STRATEGIES_T_C */ diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h deleted file mode 100644 index 935b0271753..00000000000 --- a/ace/Cleanup_Strategies_T.h +++ /dev/null @@ -1,148 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Cleanup_Strategies_T.h - * - * $Id$ - * - * @author Kirthika Parameswaran - */ -//============================================================================= - - -#ifndef CLEANUP_STRATEGIES_H -#define CLEANUP_STRATEGIES_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// For linkers that cant grok long names. -#define ACE_Cleanup_Strategy ACLE - -/** - * @class ACE_Cleanup_Strategy - * - * @brief Defines a default strategy to be followed for cleaning up - * entries from a map which is the container. - * - * By default the entry to be cleaned up is removed from the - * container. - */ -template -class ACE_Cleanup_Strategy -{ - -public: - - /// The method which will do the cleanup of the entry in the container. - virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value); -}; - -////////////////////////////////////////////////////////////////////// -#define ACE_Recyclable_Handler_Cleanup_Strategy ARHCLE - -/** - * @class ACE_Recyclable_Handler_Cleanup_Strategy - * - * @brief Defines a strategy to be followed for cleaning up - * entries which are svc_handlers from a container. - * - * The entry to be cleaned up is removed from the container. - * Here, since we are dealing with svc_handlers specifically, we - * perform a couple of extra operations. Note: To be used when - * the handler is recyclable. - */ -template -class ACE_Recyclable_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy -{ - -public: - - /// The method which will do the cleanup of the entry in the container. - virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value); -}; - -////////////////////////////////////////////////////////////////////// -#define ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy ARRHCLE - -/** - * @class ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy - * - * @brief Defines a strategy to be followed for cleaning up - * entries which are svc_handlers from a container. - * - * The entry to be cleaned up is removed from the container. - * Here, since we are dealing with recyclable svc_handlers with - * addresses which are refcountable specifically, we perform a - * couple of extra operations and do so without any locking. - */ -template -class ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy -{ - -public: - - /// The method which will do the cleanup of the entry in the container. - virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value); -}; - -////////////////////////////////////////////////////////////////////// - -/** - * @class ACE_Handler_Cleanup_Strategy - * - * @brief Defines a strategy to be followed for cleaning up - * entries which are svc_handlers from a container. - * - * The entry to be cleaned up is removed from the container. - * Here, since we are dealing with svc_handlers specifically, we - * perform a couple of extra operations. Note: This cleanup strategy - * should be used in the case when the handler has the caching - * attributes. - */ -template -class ACE_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy -{ - -public: - - /// The method which will do the cleanup of the entry in the container. - virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value); -}; - -////////////////////////////////////////////////////////////////////// -#define ACE_Null_Cleanup_Strategy ANCLE - -/** - * @class ACE_Null_Cleanup_Strategy - * - * @brief Defines a do-nothing implementation of the cleanup strategy. - * - * This class simply does nothing at all! Can be used to nullify - * the effect of the Cleanup Strategy. - */ -template -class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy -{ - -public: - - /// The dummy cleanup method. - virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value); -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Cleanup_Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cleanup_Strategies_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* CLEANUP_STRATEGIES_H */ diff --git a/ace/Codecs.cpp b/ace/Codecs.cpp deleted file mode 100644 index 8d0aad7555d..00000000000 --- a/ace/Codecs.cpp +++ /dev/null @@ -1,210 +0,0 @@ -#include "ace/OS.h" -#include "ace/Codecs.h" -#include "ace/Log_Msg.h" - -ACE_RCSID (ace, - Codecs, - "$Id$") - -const ACE_Byte ACE_Base64::alphabet_[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - -const ACE_Byte ACE_Base64::pad_ = '='; - -int ACE_Base64::init_ = 0; - -int ACE_Base64::max_columns_ = 72; - -ACE_Byte ACE_Base64::decoder_[256]; - -ACE_Byte ACE_Base64::member_[256]; - -ACE_Byte* -ACE_Base64::encode (const ACE_Byte* input, - const size_t input_len, - size_t* output_len) -{ - if (!ACE_Base64::init_) - ACE_Base64::init(); - - if (!input) - return 0; - - ACE_Byte* result = 0; - - size_t length = ((input_len + 2) / 3) * 4; - size_t num_lines = length / ACE_Base64::max_columns_ + 1; - length += num_lines + 1; - ACE_NEW_RETURN (result, ACE_Byte[length], 0); - - int char_count = 0; - int bits = 0; - size_t pos = 0; - int cols = 0; - - for (size_t i = 0; i < input_len; ++i) - { - bits += input[i]; - char_count++; - - if (char_count == 3) - { - result[pos++] = ACE_Base64::alphabet_[bits >> 18]; - result[pos++] = ACE_Base64::alphabet_[(bits >> 12) & 0x3f]; - result[pos++] = ACE_Base64::alphabet_[(bits >> 6) & 0x3f]; - result[pos++] = ACE_Base64::alphabet_[bits & 0x3f]; - cols += 4; - if (cols == ACE_Base64::max_columns_) { - result[pos++] = '\n'; - cols = 0; - } - bits = 0; - char_count = 0; - } - else - { - bits <<= 8; - } - } - - if (char_count != 0) - { - bits <<= (16 - (8 * char_count)); - result[pos++] = ACE_Base64::alphabet_[bits >> 18]; - result[pos++] = ACE_Base64::alphabet_[(bits >> 12) & 0x3f]; - if (char_count == 1) - { - result[pos++] = pad_; - result[pos++] = pad_; - } - else - { - result[pos++] = ACE_Base64::alphabet_[(bits >> 6) & 0x3f]; - result[pos++] = pad_; - } - if (cols > 0) - result[pos++] = '\n'; - } - result[pos] = 0; - *output_len = pos; - return result; -} - -size_t -ACE_Base64::length (const ACE_Byte* input) -{ - if (!ACE_Base64::init_) - ACE_Base64::init(); - - ACE_Byte* ptr = ACE_const_cast (ACE_Byte*, input); - while (*ptr != 0 && - (member_[*(ptr)] == 1 || *ptr == pad_ - || ACE_OS_String::ace_isspace (*ptr))) - ptr++; - size_t len = ptr - input; - len = ((len + 3) / 4) * 3 + 1 ; - return len; -} - -ACE_Byte* -ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) -{ - if (!ACE_Base64::init_) - ACE_Base64::init(); - - if (!input) - return 0; - - size_t result_len = ACE_Base64::length (input); - ACE_Byte* result = 0; - ACE_NEW_RETURN (result, ACE_Byte[result_len], 0); - - ACE_Byte* ptr = ACE_const_cast (ACE_Byte*, input); - while (*ptr != 0 && - (member_[*(ptr)] == 1 || *ptr == pad_ - || ACE_OS_String::ace_isspace (*ptr))) - ptr++; - size_t input_len = ptr - input; - - int char_count = 0; - int bits = 0; - size_t pos = 0; - - size_t i = 0; - for (; i < input_len; ++i) - { - if (input[i] == pad_) - break; - if (!ACE_Base64::member_[input[i]]) - continue; - bits += decoder_[input[i]]; - char_count++; - - if (char_count == 4) - { - result[pos++] = bits >> 16; - result[pos++] = (bits >> 8) & 0xff; - result[pos++] = bits & 0xff; - bits = 0; - char_count = 0; - } - else - { - bits <<= 6; - } - } - - int errors = 0; - if ( i == input_len) - { - if (char_count) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Decoding incomplete: atleast %d bits truncated\n"), - (4 - char_count) * 6)); - errors++; - } - } - else - { - switch (char_count) - { - case 1: - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("Decoding incomplete: atleast 2 bits missing\n"))); - errors++; - break; - case 2: - result[pos++] = bits >> 10; - break; - case 3: - result[pos++] = bits >> 16; - result[pos++] = (bits >> 8) & 0xff; - break; - } - } - - if (errors) - { - delete[] result; - return 0; - } - result[pos] = 0; - *output_len = pos; - return result; -} - -void -ACE_Base64::init () -{ - if (!ACE_Base64::init_) - { - for (ACE_Byte i = 0; i < sizeof (ACE_Base64::alphabet_); ++i) - { - ACE_Base64::decoder_[ACE_Base64::alphabet_[i]] = i; - ACE_Base64::member_[ACE_Base64::alphabet_[i]] = 1; - } - ACE_Base64::init_ = 1; - } - return; -} diff --git a/ace/Codecs.h b/ace/Codecs.h deleted file mode 100644 index 7e25cee826e..00000000000 --- a/ace/Codecs.h +++ /dev/null @@ -1,110 +0,0 @@ -// -*- C++ -*- - -/** - * @file Codecs.h - * - * $Id$ - * - * @author Krishnakumar B - * - * Codecs is a generic wrapper for various encoding and decoding - * mechanisms. Currently it includes Base64 content transfer-encoding as - * specified by RFC 2045, Multipurpose Internet Mail Extensions (MIME) Part - * One: Format of Internet Message Bodies. - * - */ - -#ifndef ACE_CODECS_H -#define ACE_CODECS_H -#include "ace/pre.h" - -#include "ace/Basic_Types.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Base64 - * - * @brief Encode/Decode a stream of bytes according to Base64 encoding. - * - * This class provides methods to encode or decode a stream of bytes - * to/from Base64 encoding. It doesn't convert the input stream to a - * canonical form before encoding. - * - */ -class ACE_Export ACE_Base64 -{ - friend class ace_dewarn_gplusplus; -public: - - //@{ - - /** - * Encodes a stream of bytes to Base64 data - * - * @param input Binary data in byte stream. - * @param input_len Length of the byte stream. - * @param output_len Length of the encoded Base64 byte stream. - * @return Encoded Base64 data in byte stream or NULL if input data cannot - * be encoded. - */ - - static ACE_Byte* encode (const ACE_Byte* input, - const size_t input_len, - size_t* output_len); - /** - * Decodes a stream of Base64 to bytes data - * - * @param input Encoded Base64 data in byte stream. - * @param output_len Length of the binary byte stream. - * @return Binary data in byte stream or NULL if input data cannot - * be encoded. - */ - static ACE_Byte* decode (const ACE_Byte* input, - size_t* output_len); - - /** - * Return the length of the encoded input data - * - * @param input Encoded Base64 data in byte stream. - * @return Length of the encoded Base64 data. - * - */ - static size_t length (const ACE_Byte* input); - - //@} - -private: - - /// Initialize the tables for encoding/decoding. - static void init(); - - // Prevent construction in any form - ACE_UNIMPLEMENTED_FUNC (ACE_Base64 ()) - ACE_UNIMPLEMENTED_FUNC (ACE_Base64 (const ACE_Base64&)) - - /// Symbols which form the Base64 alphabet (Defined as per RFC 2045) - static const ACE_Byte alphabet_[]; - - /// Alphabet used for decoding i.e decoder_[alphabet_[i = 0..63]] = i - static ACE_Byte decoder_[]; - - /// Alphabet used to check valid range of encoded input i.e - /// member_[alphabet_[0..63]] = 1 - static ACE_Byte member_[]; - - /// The padding character used in the encoding - static const ACE_Byte pad_; - - /// Boolean to denote whether initialization is complete - static int init_; - - /// Number of columns per line of encoded output (Can have a max value of 76) - static int max_columns_; - -}; - -#include "ace/post.h" -#endif /* ACE_CODECS_H */ diff --git a/ace/Codeset_IBM1047.cpp b/ace/Codeset_IBM1047.cpp deleted file mode 100644 index e529f1b15ee..00000000000 --- a/ace/Codeset_IBM1047.cpp +++ /dev/null @@ -1,309 +0,0 @@ -// -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// Codeset_IBM1047.cpp -// -// = DESCRIPTION -// Defines the arrays required to convert between ISO8859 (aka -// Latin/1) and IBM1047 (aka EBCDIC). -// -// = AUTHOR -// Jim Rogers (jrogers@viasoft.com) -// -// ============================================================================ - -#include "ace/Codeset_IBM1047.h" - -#if defined(ACE_MVS) - -ACE_RCSID(ace, Codeset_IBM1047, "$Id$") - -// **************************************************************** - -ACE_IBM1047_ISO8859::ACE_IBM1047_ISO8859 (void) -{ -} - -ACE_IBM1047_ISO8859::~ACE_IBM1047_ISO8859 (void) -{ -} - -ACE_CDR::ULong -ACE_IBM1047_ISO8859::ncs () -{ - return 0x10020417; -} - -ACE_CDR::ULong -ACE_IBM1047_ISO8859::tcs () -{ - return 0x00010001; -} - -ACE_CDR::Boolean -ACE_IBM1047_ISO8859::read_char (ACE_InputCDR &in, - ACE_CDR::Char &x) -{ - if (this->read_1 (in, ACE_reinterpret_cast (ACE_CDR::Octet*, &x))) - { - x = ACE_to_IBM1047[x]; - return 1; - } - return 0; -} - -ACE_CDR::Boolean -ACE_IBM1047_ISO8859::read_string (ACE_InputCDR& in, - ACE_CDR::Char *& x) -{ - ACE_CDR::ULong len; - - in.read_ulong (len); - - if (len > 0) - { - ACE_NEW_RETURN (x, - ACE_CDR::Char[len], - 0); - - if (this->read_char_array (in, x, len)) - return 1; - - delete [] x; - } - - x = 0; - return 0; -} - -ACE_CDR::Boolean -ACE_IBM1047_ISO8859::read_char_array (ACE_InputCDR& in, - ACE_CDR::Char* x, - ACE_CDR::ULong len) -{ - if (this->read_array (in, - x, - ACE_CDR::OCTET_SIZE, - ACE_CDR::OCTET_ALIGN, - len)) - { - for (ACE_CDR::ULong i = 0; i != len; ++i) - x[i] = ACE_to_IBM1047[x[i]]; - - return 1; - } - - return 0; -} - -ACE_CDR::Boolean -ACE_IBM1047_ISO8859::write_char (ACE_OutputCDR& out, - ACE_CDR::Char x) -{ - return this->write_1 (out, - ACE_reinterpret_cast (const ACE_CDR::Octet*, - &ACE_from_IBM1047[x])); -} - -ACE_CDR::Boolean -ACE_IBM1047_ISO8859::write_string (ACE_OutputCDR& out, - ACE_CDR::ULong len, - const ACE_CDR::Char* x) -{ - if (out.write_ulong (len + 1)) - return this->write_char_array (out, x, len + 1); - return 0; -} - -ACE_CDR::Boolean -ACE_IBM1047_ISO8859::write_char_array (ACE_OutputCDR& out, - const ACE_CDR::Char* x, - ACE_CDR::ULong len) -{ - char *buf; - if (this->adjust (out, len, 1, buf) == 0) - { - ACE_OS::memcpy (buf, x, len); - - for (ACE_CDR::ULong i = 0; i != len; ++i) - buf[i] = ACE_from_IBM1047[buf[i]]; - - return 1; - } - - this->good_bit(out, 0); - return 0; -} - -// **************************************************************** - -ACE_ISO8859_IBM1047::ACE_ISO8859_IBM1047 (void) -{ -} - -ACE_ISO8859_IBM1047::~ACE_ISO8859_IBM1047 (void) -{ -} - -ACE_CDR::ULong -ACE_ISO8859_IBM1047::ncs () -{ - return 0x00010001; -} - -ACE_CDR::ULong -ACE_ISO8859_IBM1047::tcs () -{ - return 0x10020417; -} - - -ACE_CDR::Boolean -ACE_ISO8859_IBM1047::read_char (ACE_InputCDR& in, - ACE_CDR::Char& x) -{ - if (this->read_1 (in, ACE_reinterpret_cast (ACE_CDR::Octet*, &x))) - { - x = ACE_from_IBM1047[x]; - return 1; - } - return 0; -} - -ACE_CDR::Boolean -ACE_ISO8859_IBM1047::read_string (ACE_InputCDR &in, - ACE_CDR::Char *&x) -{ - ACE_CDR::ULong len; - - in.read_ulong (len); - - if (len > 0) - { - ACE_NEW_RETURN (x, - ACE_CDR::Char[len], - 0); - - if (this->read_char_array (in, x, len)) - return 1; - - delete [] x; - } - - x = 0; - return 0; -} - -ACE_CDR::Boolean -ACE_ISO8859_IBM1047::read_char_array (ACE_InputCDR &in, - ACE_CDR::Char *x, - ACE_CDR::ULong len) -{ - if (this->read_array (in, - x, - ACE_CDR::OCTET_SIZE, - ACE_CDR::OCTET_ALIGN, - len)) - { - for (ACE_CDR::ULong i = 0; i != len; ++i) - x[i] = ACE_from_IBM1047[x[i]]; - - return 1; - } - - return 0; -} - -ACE_CDR::Boolean -ACE_ISO8859_IBM1047::write_char (ACE_OutputCDR &out, - ACE_CDR::Char x) -{ - return this->write_1 (out, - ACE_reinterpret_cast (const ACE_CDR::Octet *, - &ACE_to_IBM1047[x])); -} - -ACE_CDR::Boolean -ACE_ISO8859_IBM1047::write_string (ACE_OutputCDR& out, - ACE_CDR::ULong len, - const ACE_CDR::Char* x) -{ - if (out.write_ulong (len + 1)) - return this->write_char_array (out, x, len + 1); - else - return 0; -} - -ACE_CDR::Boolean -ACE_ISO8859_IBM1047::write_char_array (ACE_OutputCDR &out, - const ACE_CDR::Char *x, - ACE_CDR::ULong len) -{ - char *buf; - - if (this->adjust (out, len, 1, buf) == 0) - { - ACE_OS::memcpy (buf, x, len); - - for (ACE_CDR::ULong i = 0; i != len; ++i) - buf[i] = ACE_to_IBM1047[buf[i]]; - - return 1; - } - - this->good_bit (out, 0); - return 0; -} - -// **************************************************************** - -char ACE_to_IBM1047[257] = -{ - "\x00\x01\x02\x03\x37\x2D\x2E\x2F\x16\x05\x25\x0B\x0C\x0D\x0E\x0F" // 00-0F - "\x10\x11\x12\x13\x3C\x3D\x32\x26\x18\x19\x3F\x27\x22\x1D\x35\x1F" // 10-1F - "\x40\x5A\x7F\x7B\x5B\x6C\x50\x7D\x4D\x5D\x5C\x4E\x6B\x60\x4B\x61" // 20-2F - "\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\x7A\x5E\x4C\x7E\x6E\x6F" // 30-3F - "\x7C\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xD1\xD2\xD3\xD4\xD5\xD6" // 40-4F - "\xD7\xD8\xD9\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xAD\xE0\xBD\x5F\x6D" // 50-5F - "\x79\x81\x82\x83\x84\x85\x86\x87\x88\x89\x91\x92\x93\x94\x95\x96" // 60-6F - "\x97\x98\x99\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xC0\x4F\xD0\xA1\x07" // 70-7F - "\x43\x20\x21\x1C\x23\xEB\x24\x9B\x71\x28\x38\x49\x90\xBA\xEC\xDF" // 80-8F - "\x45\x29\x2A\x9D\x72\x2B\x8A\x9A\x67\x56\x64\x4A\x53\x68\x59\x46" // 90-9F - "\xEA\xDA\x2C\xDE\x8B\x55\x41\xFE\x58\x51\x52\x48\x69\xDB\x8E\x8D" // A0-AF - "\x73\x74\x75\xFA\x15\xB0\xB1\xB3\xB4\xB5\x6A\xB7\xB8\xB9\xCC\xBC" // B0-BF - "\xAB\x3E\x3B\x0A\xBF\x8F\x3A\x14\xA0\x17\xCB\xCA\x1A\x1B\x9C\x04" // C0-CF - "\x34\xEF\x1E\x06\x08\x09\x77\x70\xBE\xBB\xAC\x54\x63\x65\x66\x62" // D0-DF - "\x30\x42\x47\x57\xEE\x33\xB6\xE1\xCD\xED\x36\x44\xCE\xCF\x31\xAA" // E0-EF - "\xFC\x9E\xAE\x8C\xDD\xDC\x39\xFB\x80\xAF\xFD\x78\x76\xB2\x9F\xFF" // F0-FF -}; - -char ACE_from_IBM1047[257] = -{ - "\x00\x01\x02\x03\xCF\x09\xD3\x7F\xD4\xD5\xC3\x0B\x0C\x0D\x0E\x0F" // 00-0F - "\x10\x11\x12\x13\xC7\xB4\x08\xC9\x18\x19\xCC\xCD\x83\x1D\xD2\x1F" // 10-1F - "\x81\x82\x1C\x84\x86\x0A\x17\x1B\x89\x91\x92\x95\xA2\x05\x06\x07" // 20-2F - "\x20\xEE\x16\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\xC1\x1A" // 30-3F - "\x20\xA6\xE1\x80\xEB\x90\x9F\xE2\xAB\x8B\x9B\x2E\x3C\x28\x2B\x7C" // 40-4F - "\x26\xA9\xAA\x9C\xDB\xA5\x99\xE3\xA8\x9E\x21\x24\x2A\x29\x3B\x5E" // 50-5F - "\x2D\x2F\xDF\xDC\x9A\xDD\xDE\x98\x9D\xAC\xBA\x2C\x25\x5F\x3E\x3F" // 60-6F - "\xD7\x88\x94\xB0\xB1\xB2\xFC\xD6\xFB\x60\x3A\x23\x40\x27\x3D\x22" // 70-7F - "\xF8\x61\x62\x63\x64\x65\x66\x67\x68\x69\x96\xA4\xF3\xAF\xAE\xC5" // 80-8F - "\x8C\x6A\x6B\x6C\x6D\x6E\x6F\x70\x71\x72\x97\x87\xCE\x93\xF1\xFE" // 90-9F - "\xC8\x7E\x73\x74\x75\x76\x77\x78\x79\x7A\xEF\xC0\xDA\x5B\xF2\xF9" // A0-AF - "\xB5\xB6\xFD\xB7\xB8\xB9\xE6\xBB\xBC\xBD\x8D\xD9\xBF\x5D\xD8\xC4" // B0-BF - "\x7B\x41\x42\x43\x44\x45\x46\x47\x48\x49\xCB\xCA\xBE\xE8\xEC\xED" // C0-CF - "\x7D\x4A\x4B\x4C\x4D\x4E\x4F\x50\x51\x52\xA1\xAD\xF5\xF4\xA3\x8F" // D0-DF - "\x5C\xE7\x53\x54\x55\x56\x57\x58\x59\x5A\xA0\x85\x8E\xE9\xE4\xD1" // E0-EF - "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\xB3\xF7\xF0\xFA\xA7\xFF" // F0-FF -}; - -#elif defined (__HP_aCC) -// Make aC++ stop complaining about an empty translation unit -static int shut_up_aCC = 0; -#endif /* ACE_MVS */ diff --git a/ace/Codeset_IBM1047.h b/ace/Codeset_IBM1047.h deleted file mode 100644 index a9a10739836..00000000000 --- a/ace/Codeset_IBM1047.h +++ /dev/null @@ -1,126 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Codeset_IBM1047.h - * - * $Id$ - * - * Declares the arrays required to convert between ISO8859 (aka - * Latin/1) and IBM1047 (aka EBCDIC). - * - * - * @author Jim Rogers (jrogers@viasoft.com) - */ -//============================================================================= - - -#ifndef ACE_CODESET_IMB1047_H -#define ACE_CODESET_IMB1047_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined(ACE_MVS) - -#include "ace/CDR_Stream.h" - -extern ACE_Export char ACE_to_IBM1047[257]; -extern ACE_Export char ACE_from_IBM1047[257]; - -// **************************************************************** - -/** - * @class ACE_IBM1047_ISO8859 - * - * @brief Codeset translation specialization. - * - * This class performs the codeset translation: - * - Native: IBM_1047 (i.e. EBCDIC) - * - Stream: ISO-8859 (i.e. Latin/1) - */ -class ACE_Export ACE_IBM1047_ISO8859 : public ACE_Char_Codeset_Translator -{ -public: - /// A do nothing constructor. - ACE_IBM1047_ISO8859 (void); - - /// Virtual destruction - virtual ~ACE_IBM1047_ISO8859 (void); - - // = Documented in $ACE_ROOT/ace/CDR_Stream.h - virtual ACE_CDR::Boolean read_char (ACE_InputCDR &, - ACE_CDR::Char &); - virtual ACE_CDR::Boolean read_string (ACE_InputCDR &, - ACE_CDR::Char *&); - virtual ACE_CDR::Boolean read_char_array (ACE_InputCDR &, - ACE_CDR::Char *, - ACE_CDR::ULong); - virtual ACE_CDR::Boolean write_char (ACE_OutputCDR &, - ACE_CDR::Char); - virtual ACE_CDR::Boolean write_string (ACE_OutputCDR &, - ACE_CDR::ULong, - const ACE_CDR::Char *); - virtual ACE_CDR::Boolean write_char_array (ACE_OutputCDR &, - const ACE_CDR::Char *, - ACE_CDR::ULong); - - /// return the native codeset ID as defined in the OSF code and character - /// set registry, 0x10020417 - virtual ACE_CDR::ULong ncs (); - /// return the translated codeset ID as defined in the OSF code and character - /// set registry, 0x00010001 - virtual ACE_CDR::ULong tcs (); -}; - -/** - * @class ACE_ISO8859_IBM1047 - * - * @brief Codeset translation specialization. - * - * This class performs the codeset translation: - * - Native: ISO-8859 (i.e. Latin/1) - * - Stream: IBM-1047 (i.e. EBCDIC) - */ -class ACE_Export ACE_ISO8859_IBM1047 : public ACE_Char_Codeset_Translator -{ -public: - /// A do nothing constructor. - ACE_ISO8859_IBM1047 (void); - - /// Virtual destruction - virtual ~ACE_ISO8859_IBM1047 (void); - - // = Documented in $ACE_ROOT/ace/CDR_Stream.h - virtual ACE_CDR::Boolean read_char (ACE_InputCDR &, - ACE_CDR::Char &); - virtual ACE_CDR::Boolean read_string (ACE_InputCDR &, - ACE_CDR::Char *&); - virtual ACE_CDR::Boolean read_char_array (ACE_InputCDR &, - ACE_CDR::Char *, - ACE_CDR::ULong); - virtual ACE_CDR::Boolean write_char (ACE_OutputCDR &, - ACE_CDR::Char); - virtual ACE_CDR::Boolean write_string (ACE_OutputCDR &, - ACE_CDR::ULong, - const ACE_CDR::Char *); - virtual ACE_CDR::Boolean write_char_array (ACE_OutputCDR &, - const ACE_CDR::Char *, - ACE_CDR::ULong); - - /// return the native codeset ID as defined in the OSF code and character - /// set registry, 0x00010001 - virtual ACE_CDR::ULong ncs (); - /// return the translated codeset ID as defined in the OSF code and character - /// set registry, 0x10020417 - virtual ACE_CDR::ULong tcs (); -}; - -#endif /* ACE_MVS */ - -#include "ace/post.h" -#endif /* ACE_CODESET_IMB1047_H */ diff --git a/ace/Codeset_Registry.cpp b/ace/Codeset_Registry.cpp deleted file mode 100644 index be7df8bc8d9..00000000000 --- a/ace/Codeset_Registry.cpp +++ /dev/null @@ -1,106 +0,0 @@ -//============================================================================= -/** - * @file Codeset_Registry.cpp - * - * $Id$ - * - * emulated codset regstry functions - * - * - * @author Phil Mesnier - */ -//============================================================================= - -#include "ace/Codeset_Registry.h" - -// $Id$ - -#if !defined (__ACE_INLINE__) -#include "ace/Codeset_Registry.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Codeset_Registry, "$Id$"); - - -int -ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale, - ACE_CDR::ULong &codeset_id, - ACE_CDR::UShort *num_sets, - ACE_CDR::UShort **char_sets) -{ - registry_entry* element = 0; - for (size_t i = 0; element == 0 && i < num_registry_entries_; i++) - if (ACE_OS::strcmp(registry_db_[i].loc_name_,locale.c_str()) == 0) - element = ®istry_db_[i]; - if (element == 0) - return 0; - codeset_id = element->codeset_id_; - if (num_sets != 0) - *num_sets = element->num_sets_; - if (char_sets != 0) - { - ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0); - ACE_OS::memcpy (element->char_sets_, - *char_sets, - element->num_sets_ * sizeof (ACE_CDR::UShort)); - } - return 1; -} - -int -ACE_Codeset_Registry::registry_to_locale_i (ACE_CDR::ULong codeset_id, - ACE_CString &locale, - ACE_CDR::UShort *num_sets, - ACE_CDR::UShort **char_sets) -{ - registry_entry* element = 0; - for (size_t i = 0; element == 0 && i < num_registry_entries_; i++) - if (codeset_id == registry_db_[i].codeset_id_) - element = ®istry_db_[i]; - if (element == 0) - return 0; - locale.set(element->loc_name_); - if (num_sets != 0) - *num_sets = element->num_sets_; - if (char_sets != 0) - { - ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0); - ACE_OS::memcpy (element->char_sets_, - *char_sets, - element->num_sets_ * sizeof (ACE_CDR::UShort)); - } - return 1; -} - -int -ACE_Codeset_Registry::is_compatible_i (ACE_CDR::ULong codeset_id, - ACE_CDR::ULong other) -{ - registry_entry* lhs = 0; - registry_entry* rhs = 0; - for (size_t i = 0; (lhs == 0 || rhs == 0) && i < num_registry_entries_; i++) - { - if (codeset_id == registry_db_[i].codeset_id_) - lhs = ®istry_db_[i]; - if (other == registry_db_[i].codeset_id_) - rhs = ®istry_db_[i]; - } - - if (lhs == 0 || rhs == 0) - return 0; - - for (ACE_CDR::UShort l = 0; l < lhs->num_sets_; l++) - for (ACE_CDR::UShort r = 0; r < rhs->num_sets_; r++) - if (rhs->char_sets_[r] == lhs->char_sets_[l]) - return 1; - return 0; -} - -ACE_CDR::Short -ACE_Codeset_Registry::get_max_bytes_i (ACE_CDR::ULong codeset_id) -{ - for (size_t i = 0; i < num_registry_entries_; i++) - if (codeset_id == registry_db_[i].codeset_id_) - return registry_db_[i].max_bytes_; - return 0; -} diff --git a/ace/Codeset_Registry.h b/ace/Codeset_Registry.h deleted file mode 100644 index 6f7ad62ac7d..00000000000 --- a/ace/Codeset_Registry.h +++ /dev/null @@ -1,99 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file Codeset_Registry.h - * - * $Id$ - * - * ACE wrapper around access functions for the OSF's DCE codeset registry - * access functions - * - * For environments that intrinsicly support the DCE defined access functions, - * the methods in this class are simply wrappers. On other platforms, emulation - * is provided. The motivation for this class is to support interoperability - * via translators and the CDR streams, primarily in TAO, but this capability - * is not restricted to CORBA. - * - * The emulated functionalty supports Open Group RFC #40, currently RFC 40.2, - * www.opengroup.org/tech/rfc/rfc40.2.html - * - * @author Phil Mesnier - */ -//============================================================================= - -#ifndef ACE_CODESET_REGISTRY_H -#define ACE_CODESET_REGISTRY_H - -#include "ace/pre.h" -#include "ace/SString.h" -#include "ace/CDR_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_DCE_CODESET_REGISTRY) -#include /**/ -#endif /* ACE_HAS_DCE_CODESET_REGISTRY */ - -class ACE_Export ACE_Codeset_Registry -{ -public: - - // based on a locale string, find the registry value and optional codeset - // collection. This wraps the dce_cs_loc_to_rgy function, or emulates it. - static int locale_to_registry (const ACE_CString &locale, - ACE_CDR::ULong &codeset_id, - ACE_CDR::UShort * = 0, - ACE_CDR::UShort ** = 0); - - // based on a registry value, find the locale string and optional codeset - // collection. This wraps the dce_cs_rgy_to_loc function, or emulates it. - static int registry_to_locale (ACE_CDR::ULong codeset_id, - ACE_CString &locale, - ACE_CDR::UShort * = 0, - ACE_CDR::UShort ** = 0); - - // tell if two codesets are compatible. This wraps the - //rpc_cs_char_set_compat_check function. - static int is_compatible (ACE_CDR::ULong codeset_id, - ACE_CDR::ULong other); - - // return the max number of bytes required to represent a single character. - // This wraps the rpc_rgy_get_max_bytes function. - static ACE_CDR::Short get_max_bytes (ACE_CDR::ULong codeset_id); - - enum {max_charsets_ = 5}; -protected: - typedef struct { - const char * desc_; - const char * loc_name_; - ACE_CDR::ULong codeset_id_; - ACE_CDR::UShort num_sets_; - ACE_CDR::UShort char_sets_[max_charsets_]; - ACE_CDR::UShort max_bytes_; - } registry_entry; - -private: - static size_t num_registry_entries_; - static registry_entry registry_db_[]; - - static int locale_to_registry_i (const ACE_CString &locale, - ACE_CDR::ULong &codeset_id, - ACE_CDR::UShort * = 0, - ACE_CDR::UShort ** = 0); - static int registry_to_locale_i (ACE_CDR::ULong codeset_id, - ACE_CString &locale, - ACE_CDR::UShort * = 0, - ACE_CDR::UShort ** = 0); - static int is_compatible_i (ACE_CDR::ULong codeset_id, - ACE_CDR::ULong other); - static ACE_CDR::Short get_max_bytes_i (ACE_CDR::ULong codeset_id); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Codeset_Registry.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_CODESET_REGISTRY_H */ diff --git a/ace/Codeset_Registry.inl b/ace/Codeset_Registry.inl deleted file mode 100644 index 47aaf7280ca..00000000000 --- a/ace/Codeset_Registry.inl +++ /dev/null @@ -1,98 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file Codeset_Registry.inl - * - * $Id$ - * - * ACE wrapper around access functions for the OSF's DCE codeset registry - * access functions - the inline functions either call the system supplied - * DCE based codeset regsitry function, or calls the emulation - * - * - * @author Phil Mesnier - */ -//============================================================================= - -ACE_INLINE -int -ACE_Codeset_Registry::locale_to_registry(const ACE_CString &locale, - ACE_CDR::ULong &codeset_id, - ACE_CDR::UShort *num_sets, - ACE_CDR::UShort **char_sets) -{ -#if defined (ACE_HAS_DCE_CODESET_REGISTRY) - error_status_t result; - dce_cs_loc_to_rgy (locale.c_str(), - &codeset_id, - num_sets, - char_sets, - &result); - return (result == dce_cs_c_ok) ? 1 : 0; -#else - return ACE_Codeset_Registry::locale_to_registry_i (locale, - codeset_id, - num_sets, - char_sets); -#endif /* ACE_HAS_DCE_CODESET_REGISTRY */ -} - -// based on a registry value, find the locale string and optional codeset -// collection. This wraps the dce_cs_rgy_to_loc function, or emulates it. -ACE_INLINE -int -ACE_Codeset_Registry::registry_to_locale(ACE_CDR::ULong codeset_id, - ACE_CString &locale, - ACE_CDR::UShort *num_sets, - ACE_CDR::UShort **char_sets) -{ -#if defined (ACE_HAS_DCE_CODESET_REGISTRY) - error_status_t result; - char *buffer; - dce_cs_rgy_to_loc (codeset_id, - &buffer, - num_sets, - char_sets, - &result); - locale.set(buffer); // does a copy :-( - free (buffer); - return (result == dce_cs_c_ok) ? 1 : 0; -#else - return ACE_Codeset_Registry::registry_to_locale_i (codeset_id, - locale, - num_sets, - char_sets); -#endif /* ACE_HAS_DCE_CODESET_REGISTRY */ -} - -// tell if two codesets are compatible. This wraps the -//rpc_cs_char_set_compat_check function. -ACE_INLINE -int -ACE_Codeset_Registry::is_compatible (ACE_CDR::ULong codeset_id, - ACE_CDR::ULong other) -{ -#if defined (ACE_HAS_DCE_CODESET_REGISTRY) - error_status_t result; - rpc_cs_char_set_compat_check(codeset_id,other,&result); - return (result == rpc_s_ok) ? 1 : 0; -#else - return ACE_Codeset_Registry::is_compatible_i (codeset_id,other); -#endif /* ACE_HAS_DCE_CODESET_REGISTRY */ -} - -// return the max number of bytes required to represent a single character. -// This wraps the rpc_rgy_get_max_bytes function. -ACE_INLINE -ACE_CDR::Short -ACE_Codeset_Registry::get_max_bytes (ACE_CDR::ULong codeset_id) -{ -#if defined (ACE_HAS_DCE_CODESET_REGISTRY) - error_status_t result; - short max_bytes; - rpc_rgy_get_max_bytes(codeset_id,&max_bytes,&result); - return (result == rpc_s_ok) ? (short)max_bytes : 0; -#else - return ACE_Codeset_Registry::get_max_bytes_i (codeset_id); -#endif /* ACE_HAS_DCE_CODESET_REGISTRY */ -} diff --git a/ace/Codeset_Registry_db.cpp b/ace/Codeset_Registry_db.cpp deleted file mode 100644 index 7386ba39e5e..00000000000 --- a/ace/Codeset_Registry_db.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* $Id$ - * Codeset registry DB, generated Fri Feb 28 21:01:30 2003 - * source: code_set_registry1.2g.txt - * - * To populate the registry_db, construct a codeset registry text file based - * on the OSF's Character and Code Set Registry. See DCE RFC 40.1 for details - * on obtaining the full text for the current registry. Once you have composed - * a text file containing all the desired codeset information, build and run - * mkcsregdb. The source is in $ACE_ROOT/apps/mkcsregdb. It will generate a new - * copy of this file, with the registry_db_ array properly initialized. - */ - -#include "ace/Codeset_Registry.h" - -ACE_Codeset_Registry::registry_entry -ACE_Codeset_Registry::registry_db_[] = -{ - {"ISO 8859-1:1987; Latin Alphabet No. 1","ASCII",0x00010001,1,{0x0011},1}, - {"IBM-1047 (CCSID 01047); Latin-1 Open System","EBCDIC",0x10020417,1,{0x0011},1}, - {"ISO/IEC 10646-1:1993; UCS-4, Level 1","UCS-4",0x00010104,1,{0x1000},4}, - {"ISO/IEC 10646-1:1993; UTF-16, UCS Transformation Format 16-bit form","Unicode",0x00010109,1,{0x1000},2} -}; - -size_t ACE_Codeset_Registry::num_registry_entries_ = 4; diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp deleted file mode 100644 index e478e1c6eb3..00000000000 --- a/ace/Configuration.cpp +++ /dev/null @@ -1,2149 +0,0 @@ -// $Id$ -#include "ace/Configuration.h" -#include "ace/Auto_Ptr.h" - -// Can remove this when import_config and export_config are removed from -// ACE_Configuration. They're deprecated at ACE 5.2. -#include "ace/Configuration_Import_Export.h" - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#if defined (ACE_HAS_THREADS) -// ACE_SYNCH_MUTEX should not be used in the template instantiations -// because the resulting template instantiation for the -// single-threaded case already exists in ACE. -template class ACE_Allocator_Adapter >; -template class ACE_Malloc; -template class ACE_Malloc_T; -#endif /* ACE_HAS_THREADS */ -template class ACE_Hash_Map_Entry; -template class ACE_Hash_Map_Entry; -template class ACE_Hash_Map_Entry; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; - - -// Added to fix problems in SunOS CC5.0 -template class ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Equal_To; -template class ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash; - -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; - -template class ACE_Hash_Map_With_Allocator; -template class ACE_Hash_Map_With_Allocator; -template class ACE_Hash_Map_With_Allocator; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#if defined (ACE_HAS_THREADS) -// ACE_SYNCH_MUTEX should not be used in the template instantiations -// because the resulting template instantiation for the -// single-threaded case already exists in ACE. -#pragma instantiate ACE_Allocator_Adapter > -#pragma instantiate ACE_Malloc -#pragma instantiate ACE_Malloc_T -#endif /* ACE_HAS_THREADS */ -#pragma instantiate ACE_Hash_Map_Entry -#pragma instantiate ACE_Hash_Map_Entry -#pragma instantiate ACE_Hash_Map_Entry -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Equal_To -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex> -#pragma instantiate ACE_Hash - -#pragma instantiate ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_With_Allocator -#pragma instantiate ACE_Hash_Map_With_Allocator -#pragma instantiate ACE_Hash_Map_With_Allocator - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -ACE_Section_Key_Internal::ACE_Section_Key_Internal (void) - : ref_count_ (0) -{ -} - -ACE_Section_Key_Internal::~ACE_Section_Key_Internal (void) -{ -} - -int -ACE_Section_Key_Internal::add_ref (void) -{ - ++ref_count_; - return 0; -} - -int -ACE_Section_Key_Internal::dec_ref (void) -{ - if (!--ref_count_) - delete this; - return 0; -} - -ACE_Configuration_Section_Key::ACE_Configuration_Section_Key (void) - : key_ (0) -{ -} - -ACE_Configuration_Section_Key::~ACE_Configuration_Section_Key (void) -{ - if (key_) - key_->dec_ref (); -} - -ACE_Configuration_Section_Key::ACE_Configuration_Section_Key (ACE_Section_Key_Internal* key) - : key_ (key) -{ - if (key_) - key_->add_ref (); -} - -ACE_Configuration_Section_Key::ACE_Configuration_Section_Key (const ACE_Configuration_Section_Key& rhs) - : key_ (rhs.key_) -{ - if (key_) - key_->add_ref (); -} - -ACE_Configuration_Section_Key& -ACE_Configuration_Section_Key::operator= (const ACE_Configuration_Section_Key& rhs) -{ - if (this != &rhs) - { - if (key_) - key_->dec_ref (); - - key_ = rhs.key_; - - if (key_) - key_->add_ref (); - } - return *this; -} - -////////////////////////////////////////////////////////////////////////////// - -ACE_Configuration::ACE_Configuration (void) - : root_ () -{ -} - -ACE_Configuration::~ACE_Configuration (void) -{ -} - -ACE_Section_Key_Internal* -ACE_Configuration::get_internal_key (const ACE_Configuration_Section_Key& key) -{ - return key.key_; -} - -int -ACE_Configuration::expand_path (const ACE_Configuration_Section_Key& key, - const ACE_TString& path_in, - ACE_Configuration_Section_Key& key_out, - int create) -{ - // Make a copy of key - ACE_Configuration_Section_Key current_section = key; - ACE_Auto_Basic_Array_Ptr pData (path_in.rep ()); - ACE_Tokenizer parser (pData.get ()); - parser.delimiter_replace ('\\', '\0'); - parser.delimiter_replace ('/', '\0'); - - for (ACE_TCHAR *temp = parser.next (); - temp != 0; - temp = parser.next ()) - { - // Open the section - if (open_section (current_section, - temp, - create, - key_out)) - return -1; - - current_section = key_out; - } - - return 0; - -} - -// import_config and export_config are here for backward compatibility, -// and have been deprecated. -int -ACE_Configuration::export_config (const ACE_TCHAR* filename) -{ - ACE_Registry_ImpExp exporter (*this); - return exporter.export_config (filename); -} - -int -ACE_Configuration::import_config (const ACE_TCHAR* filename) -{ - ACE_Registry_ImpExp importer (*this); - return importer.import_config (filename); -} - -int -ACE_Configuration::validate_name (const ACE_TCHAR* name, int allow_path) -{ - // Invalid character set - const ACE_TCHAR* reject = - allow_path ? ACE_LIB_TEXT ("][") : ACE_LIB_TEXT ("\\]["); - - // Position of the first invalid character or terminating null. - size_t pos = ACE_OS_String::strcspn (name, reject); - - // Check if it is an invalid character. - if (name[pos] != ACE_LIB_TEXT ('\0')) - { - errno = EINVAL; - return -1; - } - - // The first character can never be a path separator. - if (name[0] == ACE_LIB_TEXT ('\\')) - { - errno = EINVAL; - return -1; - } - - // Validate length. - if (pos == 0 || pos > 255) - { - errno = ENAMETOOLONG; - return -1; - } - - return 0; -} - - -const ACE_Configuration_Section_Key& -ACE_Configuration::root_section (void) const -{ - return root_; -} - -/** - * Determine if the contents of this object is the same as the - * contents of the object on the right hand side. - * Returns 1 (True) if they are equal and 0 (False) if they are not equal - */ -int ACE_Configuration::operator== (const ACE_Configuration& rhs) const -{ - int rc = 1; - int sectionIndex = 0; - ACE_TString sectionName; - ACE_Configuration *nonconst_this = ACE_const_cast (ACE_Configuration*, this); - ACE_Configuration &nonconst_rhs = ACE_const_cast (ACE_Configuration&, rhs); - - const ACE_Configuration_Section_Key& rhsRoot = rhs.root_section (); - ACE_Configuration_Section_Key rhsSection; - ACE_Configuration_Section_Key thisSection; - - // loop through each section in this object - while ((rc) && (!nonconst_this->enumerate_sections (this->root_, - sectionIndex, - sectionName))) - { - // find that section in the rhs object - if (nonconst_rhs.open_section (rhsRoot, - sectionName.c_str (), - 0, - rhsSection) != 0) - { - // If the rhs object does not contain the section then we are - // not equal. - rc = 0; - } - else if (nonconst_this->open_section (this->root_, - sectionName.c_str (), - 0, - thisSection) != 0) - { - // if there is some error opening the section in this object - rc = 0; - } - else - { - // Well the sections match - int valueIndex = 0; - ACE_TString valueName; - VALUETYPE valueType; - VALUETYPE rhsType; - - // Enumerate each value in this section - while ((rc) && nonconst_this->enumerate_values (thisSection, - valueIndex, - valueName, - valueType)) - { - // look for the same value in the rhs section - if (nonconst_rhs.find_value (rhsSection, - valueName.c_str (), - rhsType) != 0) - { - // We're not equal if the same value cannot - // be found in the rhs object. - rc = 0; - } - else if (valueType != rhsType) - { - // we're not equal if the types do not match. - rc = 0; - } - else - { - // finally compare values. - if (valueType == STRING) - { - ACE_TString thisString, rhsString; - if (nonconst_this->get_string_value (thisSection, - valueName.c_str (), - thisString) != 0) - { - // we're not equal if we cannot get this string - rc = 0; - } - else if (nonconst_rhs.get_string_value (rhsSection, - valueName.c_str (), - rhsString) != 0) - { - // we're not equal if we cannot get rhs string - rc = 0; - } - rc = thisString == rhsString; - } - else if (valueType == INTEGER) - { - u_int thisInt, rhsInt; - if (nonconst_this->get_integer_value (thisSection, - valueName.c_str (), - thisInt) != 0) - { - // we're not equal if we cannot get this int - rc = 0; - } - else if (nonconst_rhs.get_integer_value (rhsSection, - valueName.c_str (), - rhsInt) != 0) - { - // we're not equal if we cannot get rhs int - rc = 0; - } - rc = thisInt == rhsInt; - } - else if (valueType == BINARY) - { - void* thisData = 0; - void* rhsData = 0; - size_t thisLength, rhsLength; - if (nonconst_this->get_binary_value (thisSection, - valueName.c_str (), - thisData, - thisLength) != 0) - { - // we're not equal if we cannot get this data - rc = 0; - } - else if (nonconst_rhs.get_binary_value (rhsSection, - valueName.c_str (), - rhsData, - rhsLength) != 0) - { - // we're not equal if we cannot get this data - rc = 0; - } - - rc = thisLength == rhsLength; - // are the length's the same? - - if (rc) - { - unsigned char* thisCharData = (unsigned char*)thisData; - unsigned char* rhsCharData = (unsigned char*)rhsData; - // yes, then check each element - for (size_t count = 0; - (rc) && (count < thisLength); - count++) - { - rc = (* (thisCharData + count) == * (rhsCharData + count)); - } - - delete [] thisCharData; - delete [] rhsCharData; - }// end if the length's match - - - } - // We should never have valueTypes of INVALID, therefore - // we're not comparing them. How would we since we have - // no get operation for invalid types. - // So, if we have them, we guess they are equal. - - }// end else if values match. - - valueIndex++; - - }// end value while loop - - // look in the rhs for values not in this - valueIndex = 0; - while ((rc) && - (!nonconst_rhs.enumerate_values (rhsSection, - valueIndex, - valueName, - rhsType))) - { - // look for the same value in this section - if (nonconst_this->find_value (thisSection, - valueName.c_str (), - valueType) != 0) - { - // We're not equal if the same value cannot - // be found in the rhs object. - rc = 0; - } - valueIndex++; - }// end while for rhs values not in this. - - }// end else if sections match. - - sectionIndex++; - - }// end section while loop - - // Finally, make sure that there are no sections in rhs that do not - // exist in this - sectionIndex = 0; - while ((rc) - && (!nonconst_rhs.enumerate_sections (rhsRoot, - sectionIndex, - sectionName))) - { - // find the section in this - if (nonconst_this->open_section (this->root_, - sectionName.c_str (), - 0, - thisSection) != 0) - { - // if there is some error opening the section in this object - rc = 0; - } - else if (nonconst_rhs.open_section (rhsRoot, - sectionName.c_str (), - 0, - rhsSection) != 0) - { - // If the rhs object does not contain the section then we - // are not equal. - rc = 0; - } - sectionIndex++; - } - return rc; -} - - -////////////////////////////////////////////////////////////////////////////// - -#if defined (WIN32) - -static const int ACE_DEFAULT_BUFSIZE = 256; - -ACE_Section_Key_Win32::ACE_Section_Key_Win32 (HKEY hKey) - : hKey_ (hKey) -{ -} - -ACE_Section_Key_Win32::~ACE_Section_Key_Win32 (void) -{ - ::RegCloseKey (hKey_); -} - -////////////////////////////////////////////////////////////////////////////// - -int -ACE_Configuration_Win32Registry::operator== (const ACE_Configuration_Win32Registry &rhs) const -{ - ACE_UNUSED_ARG (rhs); - return 1; -} - -int -ACE_Configuration_Win32Registry::operator!= (const ACE_Configuration_Win32Registry &rhs) const -{ - ACE_UNUSED_ARG (rhs); - return 1; -} - -ACE_Configuration_Win32Registry::ACE_Configuration_Win32Registry (HKEY hKey) -{ - ACE_Section_Key_Win32 *temp; - - ACE_NEW (temp, ACE_Section_Key_Win32 (hKey)); - - root_ = ACE_Configuration_Section_Key (temp); -} - - -ACE_Configuration_Win32Registry::~ACE_Configuration_Win32Registry (void) -{ -} - -int -ACE_Configuration_Win32Registry::open_section (const ACE_Configuration_Section_Key& base, - const ACE_TCHAR* sub_section, - int create, - ACE_Configuration_Section_Key& result) -{ - if (validate_name (sub_section, 1)) - return -1; - - HKEY base_key; - if (load_key (base, base_key)) - return -1; - - HKEY result_key; - if (ACE_TEXT_RegOpenKeyEx (base_key, - sub_section, - 0, - KEY_ALL_ACCESS, - &result_key) != ERROR_SUCCESS) - { - if (!create) - return -1; - - if (ACE_TEXT_RegCreateKeyEx (base_key, - sub_section, - 0, - 0, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - 0, - &result_key, - 0 - ) != ERROR_SUCCESS) - return -1; - } - - ACE_Section_Key_Win32 *temp; - - ACE_NEW_RETURN (temp, ACE_Section_Key_Win32 (result_key), -1); - result = ACE_Configuration_Section_Key (temp); - return 0; -} - -int -ACE_Configuration_Win32Registry::remove_section (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* sub_section, - int recursive) -{ - if (validate_name (sub_section)) - return -1; - - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - if (recursive) - { - ACE_Configuration_Section_Key section; - if (open_section (key, sub_section, 0, section)) - return -1; - - HKEY sub_key; - if (load_key (section, sub_key)) - return -1; - - ACE_TCHAR name_buffer[ACE_DEFAULT_BUFSIZE]; - DWORD buffer_size = ACE_DEFAULT_BUFSIZE; - // Note we don't increment the index because the - // enumeration becomes invalid if we change the - // subkey, which we do when we delete it. By leaving - // it 0, we always delete the top entry - while (ACE_TEXT_RegEnumKeyEx (sub_key, - 0, - name_buffer, - &buffer_size, - 0, - 0, - 0, - 0) == ERROR_SUCCESS) - { - remove_section (section, name_buffer, 1); - buffer_size = ACE_DEFAULT_BUFSIZE; - } - } - -#if (ACE_HAS_WINNT4 != 0) - if (ACE_TEXT_RegDeleteKey (base_key, sub_section) != ERROR_SUCCESS) - return -1; -#else - if (!recursive) - { - ACE_Configuration_Section_Key section; - if (open_section (key, sub_section, 0, section)) - return -1; - - HKEY sub_key; - if (load_key (section, sub_key)) - return -1; - - ACE_TCHAR name_buffer[ACE_DEFAULT_BUFSIZE]; - DWORD buffer_size = ACE_DEFAULT_BUFSIZE; - // Check for a an entry under the sub_key - if (ACE_TEXT_RegEnumKeyEx (sub_key, - 0, - name_buffer, - &buffer_size, - 0, - 0, - 0, - 0) == ERROR_SUCCESS) - return -1; - } - if (ACE_TEXT_RegDeleteKey (base_key, sub_section) != ERROR_SUCCESS) - return -1; -#endif - - return 0; -} - -int -ACE_Configuration_Win32Registry::enumerate_values (const ACE_Configuration_Section_Key& key, - int index, - ACE_TString& name, - VALUETYPE& type) -{ - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - ACE_TCHAR name_buffer[ACE_DEFAULT_BUFSIZE]; - DWORD buffer_size = ACE_DEFAULT_BUFSIZE; - DWORD value_type; - - int rc = ACE_TEXT_RegEnumValue (base_key, - index, - name_buffer, - &buffer_size, - 0, - &value_type, - 0, - 0); - if (rc == ERROR_NO_MORE_ITEMS) - return 1; - else if (rc != ERROR_SUCCESS) - return -1; - - name = name_buffer; - - switch (value_type) - { - case REG_BINARY: - type = BINARY; - break; - case REG_SZ: - type = STRING; - break; - case REG_DWORD: - type = INTEGER; - break; - default: - type = INVALID; - } - - return 0; -} - -int -ACE_Configuration_Win32Registry::enumerate_sections (const ACE_Configuration_Section_Key& key, - int index, - ACE_TString& name) -{ - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - ACE_TCHAR name_buffer[ACE_DEFAULT_BUFSIZE]; - DWORD buffer_size = ACE_DEFAULT_BUFSIZE; - int rc = ACE_TEXT_RegEnumKeyEx (base_key, - index, - name_buffer, - &buffer_size, - 0, - 0, - 0, - 0); - if (rc == ERROR_NO_MORE_ITEMS) - return 1; - else if (rc != ERROR_MORE_DATA && rc != ERROR_SUCCESS) - return -1; - - name = name_buffer; - - return 0; -} - -int -ACE_Configuration_Win32Registry::set_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const ACE_TString& value) -{ - if (validate_name (name)) - return -1; - - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - DWORD len = ACE_static_cast (DWORD, value.length () + 1); - len *= sizeof (ACE_TCHAR); - if (ACE_TEXT_RegSetValueEx (base_key, - name, - 0, - REG_SZ, - (BYTE *) value.fast_rep (), - len) - != ERROR_SUCCESS) - return -1; - - return 0; -} - -int -ACE_Configuration_Win32Registry::set_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int value) -{ - if (validate_name (name)) - return -1; - - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - if (ACE_TEXT_RegSetValueEx (base_key, - name, - 0, - REG_DWORD, - (BYTE *) &value, - sizeof (value)) != ERROR_SUCCESS) - return -1; - - return 0; -} - -int -ACE_Configuration_Win32Registry::set_binary_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const void* data, - size_t length) -{ - if (validate_name (name)) - return -1; - - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - if (ACE_TEXT_RegSetValueEx (base_key, - name, - 0, - REG_BINARY, - (BYTE *) data, - ACE_static_cast (DWORD, length)) - != ERROR_SUCCESS) - return -1; - - return 0; -} - -int -ACE_Configuration_Win32Registry::get_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - ACE_TString& value) -{ - if (validate_name (name)) - return -1; - - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - // Get the size of the binary data from windows - DWORD buffer_length = 0; - DWORD type; - if (ACE_TEXT_RegQueryValueEx (base_key, - name, - 0, - &type, - (BYTE *) 0, - &buffer_length) != ERROR_SUCCESS) - return -1; - - if (type != REG_SZ) - { - errno = 0; ACE_OS::last_error (ERROR_INVALID_DATATYPE); - return -1; - } - - ACE_TCHAR *temp = 0; - ACE_NEW_RETURN (temp, - ACE_TCHAR[buffer_length], - -1); - - ACE_Auto_Basic_Array_Ptr buffer (temp); - - if (ACE_TEXT_RegQueryValueEx (base_key, - name, - 0, - &type, - (BYTE *) buffer.get (), - &buffer_length) != ERROR_SUCCESS) - { - return -1; - } - - value = buffer.get (); - return 0; -} - -int -ACE_Configuration_Win32Registry::get_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int& value) -{ - if (validate_name (name)) - return -1; - - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - DWORD length = sizeof (value); - DWORD type; - if (ACE_TEXT_RegQueryValueEx (base_key, - name, - 0, - &type, - (BYTE *) &value, - &length) != ERROR_SUCCESS) - return -1; - - if (type != REG_DWORD) - { - errno = 0; ACE_OS::last_error (ERROR_INVALID_DATATYPE); - return -1; - } - - return 0; -} - -int -ACE_Configuration_Win32Registry::get_binary_value (const ACE_Configuration_Section_Key &key, - const ACE_TCHAR *name, - void *&data, - size_t &length) -{ - if (validate_name (name)) - return -1; - - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - // Get the size of the binary data from windows - DWORD buffer_length = 0; - DWORD type; - if (ACE_TEXT_RegQueryValueEx (base_key, - name, - 0, - &type, - (BYTE *) 0, - &buffer_length) != ERROR_SUCCESS) - return -1; - - if (type != REG_BINARY) - { - errno = 0; ACE_OS::last_error (ERROR_INVALID_DATATYPE); - return -1; - } - - length = buffer_length; - - ACE_NEW_RETURN (data, BYTE[length], -1); - - if (ACE_TEXT_RegQueryValueEx (base_key, - name, - 0, - &type, - (BYTE *) data, - &buffer_length) != ERROR_SUCCESS) - { - delete [] (BYTE *) data; - data = 0; - return -1; - } - - return 0; -} - -int -ACE_Configuration_Win32Registry::find_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - VALUETYPE& type_out) -{ - if (validate_name (name)) - return -1; - - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - DWORD buffer_length=0; - DWORD type; - int result=ACE_TEXT_RegQueryValueEx (base_key, - name, - 0, - &type, - 0, - &buffer_length); - if (result != ERROR_SUCCESS) - return -1; - - switch (type) - { - case REG_SZ: - type_out = STRING; - break; - case REG_DWORD: - type_out = INTEGER; - break; - case REG_BINARY: - type_out = BINARY; - break; - default: - return -1; // unknown type - } - - return 0; -} - -int -ACE_Configuration_Win32Registry::remove_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name) -{ - if (validate_name (name)) - return -1; - - HKEY base_key; - if (load_key (key, base_key)) - return -1; - - if (ACE_TEXT_RegDeleteValue (base_key, name) != ERROR_SUCCESS) - return -1; - - return 0; -} - - -int -ACE_Configuration_Win32Registry::load_key (const ACE_Configuration_Section_Key& key, - HKEY& hKey) -{ - ACE_Section_Key_Win32* pKey = ACE_dynamic_cast (ACE_Section_Key_Win32*, - get_internal_key (key)); - if (!pKey) - return -1; - - hKey = pKey->hKey_; - return 0; -} - -HKEY -ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, - const ACE_TCHAR* path, - int create) -{ - HKEY result = 0; - // Make a copy of hKey -#if defined (ACE_HAS_WINCE) - if (::RegOpenKeyEx (hKey, 0, 0, 0, &result) != ERROR_SUCCESS) -#else - if (::RegOpenKey (hKey, 0, &result) != ERROR_SUCCESS) -#endif // ACE_HAS_WINCE - return 0; - - // recurse through the path - ACE_TCHAR *temp_path = 0; - ACE_NEW_RETURN (temp_path, - ACE_TCHAR[ACE_OS::strlen (path) + 1], - 0); - ACE_Auto_Basic_Array_Ptr pData (temp_path); - ACE_OS::strcpy (pData.get (), path); - ACE_Tokenizer parser (pData.get ()); - parser.delimiter_replace ('\\', '\0'); - parser.delimiter_replace ('/', '\0'); - - for (ACE_TCHAR *temp = parser.next (); - temp != 0; - temp = parser.next ()) - { - // Open the key - HKEY subkey; - -#if defined (ACE_HAS_WINCE) - if (ACE_TEXT_RegOpenKeyEx (result, - temp, - 0, - 0, - &subkey) != ERROR_SUCCESS) -#else - if (ACE_TEXT_RegOpenKey (result, - temp, - &subkey) != ERROR_SUCCESS) -#endif // ACE_HAS_WINCE - { - // try creating it - if (!create || ACE_TEXT_RegCreateKeyEx (result, - temp, - 0, - 0, - 0, - KEY_ALL_ACCESS, - 0, - &subkey, -#if defined (__MINGW32__) - (PDWORD) 0 -#else - 0 -#endif /* __MINGW32__ */ - ) != ERROR_SUCCESS) - { - // error - ::RegCloseKey (result); - return 0; - } - } - // release our open key handle - ::RegCloseKey (result); - result = subkey; - } - - return result; -} - -#endif /* WIN_32 */ - -/////////////////////////////////////////////////////////////// - -ACE_Configuration_Value_IntId::ACE_Configuration_Value_IntId (void) - : type_ (ACE_Configuration::INVALID), - length_ (0) -{ - this->data_.ptr_ = 0; -} - -ACE_Configuration_Value_IntId::ACE_Configuration_Value_IntId (ACE_TCHAR* string) - : type_ (ACE_Configuration::STRING), - length_ (0) -{ - this->data_.ptr_ = string; -} - -ACE_Configuration_Value_IntId::ACE_Configuration_Value_IntId (u_int integer) - : type_ (ACE_Configuration::INTEGER), - length_ (0) -{ - this->data_.int_ = integer; -} - -ACE_Configuration_Value_IntId::ACE_Configuration_Value_IntId (void* data, size_t length) - : type_ (ACE_Configuration::BINARY), - length_ (length) -{ - this->data_.ptr_ = data; -} - -ACE_Configuration_Value_IntId::ACE_Configuration_Value_IntId (const ACE_Configuration_Value_IntId& rhs) - : type_ (rhs.type_), - data_ (rhs.data_), - length_ (rhs.length_) -{ -} - -ACE_Configuration_Value_IntId::~ACE_Configuration_Value_IntId (void) -{ -} - -ACE_Configuration_Value_IntId& ACE_Configuration_Value_IntId::operator= (const ACE_Configuration_Value_IntId& rhs) -{ - if (this != &rhs) - { - type_ = rhs.type_; - data_ = rhs.data_; - length_ = rhs.length_; - } - return *this; -} - -void -ACE_Configuration_Value_IntId::free (ACE_Allocator *alloc) -{ - if (this->type_ == ACE_Configuration::STRING - || this->type_ == ACE_Configuration::BINARY) - alloc->free (data_.ptr_); - // Do nothing in other cases... -} - -ACE_Configuration_ExtId::ACE_Configuration_ExtId (void) - : name_ (0) -{ -} - -ACE_Configuration_ExtId::ACE_Configuration_ExtId (const ACE_TCHAR* name) - : name_ (name) -{ -} - -ACE_Configuration_ExtId::ACE_Configuration_ExtId (const ACE_Configuration_ExtId& rhs) - : name_ (rhs.name_) -{ -} - -ACE_Configuration_ExtId::~ACE_Configuration_ExtId (void) -{ -} - -ACE_Configuration_ExtId& ACE_Configuration_ExtId::operator= (const ACE_Configuration_ExtId& rhs) -{ - if (this != &rhs) - name_ = rhs.name_; - - return *this; -} - -int -ACE_Configuration_ExtId::operator == (const ACE_Configuration_ExtId& rhs) const -{ - return (ACE_OS::strcmp (name_, rhs.name_) == 0); -} - -int -ACE_Configuration_ExtId::operator != (const ACE_Configuration_ExtId& rhs) const -{ - return (ACE_OS::strcmp (name_, rhs.name_) != 0); -} - -u_long -ACE_Configuration_ExtId::hash (void) const -{ - ACE_TString temp (name_, 0, 0); - return temp.hash (); -} - -const ACE_TCHAR* -ACE_Configuration_ExtId::name (void) -{ - return name_; -} - -void -ACE_Configuration_ExtId::free (ACE_Allocator *alloc) -{ - alloc->free ((void *) (name_)); -} - -/////////////////////////////////////////////////////////////////////// - -ACE_Configuration_Section_IntId::ACE_Configuration_Section_IntId (void) - : value_hash_map_ (0), - section_hash_map_ (0) -{ -} - -ACE_Configuration_Section_IntId::ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map, SUBSECTION_MAP* section_hash_map) - : value_hash_map_ (value_hash_map), - section_hash_map_ (section_hash_map) -{ -} - -ACE_Configuration_Section_IntId::ACE_Configuration_Section_IntId (const ACE_Configuration_Section_IntId& rhs) - : value_hash_map_ (rhs.value_hash_map_), - section_hash_map_ (rhs.section_hash_map_) -{ - -} - -ACE_Configuration_Section_IntId::~ACE_Configuration_Section_IntId () -{ -} - -ACE_Configuration_Section_IntId& -ACE_Configuration_Section_IntId::operator= (const ACE_Configuration_Section_IntId& rhs) -{ - if (this != &rhs) - { - value_hash_map_ = rhs.value_hash_map_; - section_hash_map_ = rhs.section_hash_map_; - } - return *this; -} - -void -ACE_Configuration_Section_IntId::free (ACE_Allocator *alloc) -{ - alloc->free ((void *) (value_hash_map_)); - alloc->free ((void *) (section_hash_map_)); -} - -ACE_Configuration_Section_Key_Heap::ACE_Configuration_Section_Key_Heap (const ACE_TCHAR* path) - : path_ (0), - value_iter_ (0), - section_iter_ (0) -{ - path_ = ACE_OS::strdup (path); -} - -ACE_Configuration_Section_Key_Heap::~ACE_Configuration_Section_Key_Heap () -{ - delete value_iter_; - delete section_iter_; - ACE_OS::free (path_); -} - -////////////////////////////////////////////////////////////////////////////// - -ACE_Configuration_Heap::ACE_Configuration_Heap (void) - : allocator_ (0), - index_ (0), - default_map_size_ (0) -{ - ACE_Configuration_Section_Key_Heap *temp = 0; - - ACE_NEW (temp, ACE_Configuration_Section_Key_Heap (ACE_LIB_TEXT (""))); - root_ = ACE_Configuration_Section_Key (temp); -} - -ACE_Configuration_Heap::~ACE_Configuration_Heap (void) -{ - if (allocator_) - allocator_->sync (); - - delete allocator_; -} - -int -ACE_Configuration_Heap::open (int default_map_size) -{ - default_map_size_ = default_map_size; - // Create the allocator with the appropriate options. - // The name used for the lock is the same as one used - // for the file. - ACE_NEW_RETURN (this->allocator_, - HEAP_ALLOCATOR (), - -1); - return create_index (); -} - - -int -ACE_Configuration_Heap::open (const ACE_TCHAR* file_name, - void* base_address, - int default_map_size) -{ - default_map_size_ = default_map_size; - - // Make sure that the file name is of the legal length. - if (ACE_OS::strlen (file_name) >= MAXNAMELEN + MAXPATHLEN) - { - errno = ENAMETOOLONG; - return -1; - } - -#if !defined (CHORUS) - ACE_MMAP_Memory_Pool::OPTIONS options (base_address); -#else - // Use base address == 0, don't use a fixed address. - ACE_MMAP_Memory_Pool::OPTIONS options (0, - 0, - 0, - ACE_CHORUS_LOCAL_NAME_SPACE_T_SIZE); -#endif /* CHORUS */ - - // Create the allocator with the appropriate options. The name used - // for the lock is the same as one used for the file. - ACE_NEW_RETURN (this->allocator_, - PERSISTENT_ALLOCATOR (file_name, - file_name, - &options), - -1); - -#if !defined (ACE_LACKS_ACCESS) - // Now check if the backing store has been created successfully. - if (ACE_OS::access (file_name, F_OK) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("create_index\n")), - -1); -#endif /* ACE_LACKS_ACCESS */ - - return create_index (); -} - -int -ACE_Configuration_Heap::create_index (void) -{ - void *section_index = 0; - - // This is the easy case since if we find hash table in the - // memory-mapped file we know it's already initialized. - if (this->allocator_->find (ACE_CONFIG_SECTION_INDEX, section_index) == 0) - this->index_ = (SECTION_MAP *) section_index; - - // Create a new (because we've just created a new - // memory-mapped file). - else - { - size_t index_size = sizeof (SECTION_MAP); - section_index = this->allocator_->malloc (index_size); - - if (section_index == 0 - || create_index_helper (section_index) == -1 - || this->allocator_->bind (ACE_CONFIG_SECTION_INDEX, - section_index) == -1) - { - // Attempt to clean up. - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("create_index\n"))); - this->allocator_->remove (); - return -1; - } - // Add the root section - return new_section (ACE_LIB_TEXT (""), root_); - } - return 0; -} - -int -ACE_Configuration_Heap::create_index_helper (void *buffer) -{ - ACE_ASSERT (this->allocator_); - this->index_ = new (buffer) SECTION_MAP (this->allocator_); - return 0; -} - -int -ACE_Configuration_Heap::load_key (const ACE_Configuration_Section_Key& key, - ACE_TString& name) -{ - ACE_ASSERT (this->allocator_); - ACE_Configuration_Section_Key_Heap* pKey = - ACE_dynamic_cast (ACE_Configuration_Section_Key_Heap*, - get_internal_key (key)); - - if (!pKey) - { - return -1; - } - - ACE_TString temp (pKey->path_, 0, 0); - name.assign_nocopy (temp); - return 0; -} - - -int -ACE_Configuration_Heap::add_section (const ACE_Configuration_Section_Key& base, - const ACE_TCHAR* sub_section, - ACE_Configuration_Section_Key& result) -{ - ACE_ASSERT (this->allocator_); - ACE_TString section; - if (load_key (base, section)) - return -1; - - // Find the base section - ACE_Configuration_ExtId ExtId (section.fast_rep ()); - ACE_Configuration_Section_IntId IntId; - if (index_->find (ExtId, IntId, allocator_)) - return -1; - - // See if this section already exists - ACE_Configuration_ExtId SubSectionExtId (sub_section); - int ignored = 0; - - if (!IntId.section_hash_map_->find (SubSectionExtId, ignored, allocator_)) - { - // already exists! - errno = EEXIST; - return -1; - } - - // Create the new section name - // only prepend a separater if were not at the root - if (section.length ()) - section += ACE_LIB_TEXT ("\\"); - - section += sub_section; - - // Add it to the base section - ACE_TCHAR* pers_name = (ACE_TCHAR *) allocator_->malloc ((ACE_OS::strlen (sub_section) + 1) * sizeof (ACE_TCHAR)); - ACE_OS::strcpy (pers_name, sub_section); - ACE_Configuration_ExtId SSExtId (pers_name); - if (IntId.section_hash_map_->bind (SSExtId, ignored, allocator_)) - { - allocator_->free (pers_name); - return -1; - } - return (new_section (section, result)); -} - -int -ACE_Configuration_Heap::new_section (const ACE_TString& section, - ACE_Configuration_Section_Key& result) -{ - ACE_ASSERT (this->allocator_); - // Create a new section and add it to the global list - - // Allocate memory for items to be stored in the table. - size_t section_len = section.length () + 1; - ACE_TCHAR *ptr = (ACE_TCHAR*) this->allocator_->malloc (section_len * sizeof (ACE_TCHAR)); - - int return_value = -1; - - if (ptr == 0) - return -1; - else - { - // Populate memory with data. - ACE_OS::strcpy (ptr, section.fast_rep ()); - - void *value_hash_map = 0; - size_t map_size = sizeof (VALUE_MAP); - value_hash_map = this->allocator_->malloc (map_size); - - // If allocation failed ... - if (value_hash_map == 0) - return -1; - - // Initialize allocated hash map through placement new. - if (value_open_helper (default_map_size_, value_hash_map ) == -1) - { - this->allocator_->free (value_hash_map ); - return -1; - } - - // create the section map - void* section_hash_map = 0; - map_size = sizeof (SUBSECTION_MAP); - section_hash_map = this->allocator_->malloc (map_size); - - // If allocation failed - if (section_hash_map == 0) - return -1; - - // initialize allocated hash map through placement new - if (section_open_helper (default_map_size_, section_hash_map) == -1) - { - this->allocator_->free (value_hash_map ); - this->allocator_->free (section_hash_map); - return -1; - } - - ACE_Configuration_ExtId name (ptr); - ACE_Configuration_Section_IntId entry ((VALUE_MAP*) value_hash_map, - (SUBSECTION_MAP*) section_hash_map); - - // Do a normal bind. This will fail if there's already an - // entry with the same name. - return_value = this->index_->bind (name, entry, this->allocator_); - - if (return_value == 1) - { - // Entry already existed so bind failed. Free our dynamically - // allocated memory. - this->allocator_->free ((void *) ptr); - return return_value; - } - - if (return_value == -1) - // Free our dynamically allocated memory. - this->allocator_->free ((void *) ptr); - else - // If bind () succeed, it will automatically sync - // up the map manager entry. However, we must sync up our - // name/value memory. - this->allocator_->sync (ptr, section_len); - - } - - // set the result - ACE_Configuration_Section_Key_Heap *temp; - ACE_NEW_RETURN (temp, - ACE_Configuration_Section_Key_Heap (ptr), - -1); - result = ACE_Configuration_Section_Key (temp); - return return_value; -} - -int -ACE_Configuration_Heap::value_open_helper (size_t hash_table_size, - void *buffer) -{ - ACE_ASSERT (this->allocator_); - new (buffer) VALUE_MAP (hash_table_size, this->allocator_); - return 0; -} - -int -ACE_Configuration_Heap::section_open_helper (size_t hash_table_size, - void *buffer) -{ - ACE_ASSERT (this->allocator_); - new (buffer) SUBSECTION_MAP (hash_table_size, this->allocator_); - return 0; -} - -int -ACE_Configuration_Heap::open_section (const ACE_Configuration_Section_Key& base, - const ACE_TCHAR* sub_section, - int create, - ACE_Configuration_Section_Key& result) -{ - ACE_ASSERT (this->allocator_); - if (validate_name (sub_section, 1)) // 1 == allow_path - return -1; - - result = base; - - for (const ACE_TCHAR* separator; - (separator = ACE_OS_String::strchr (sub_section, ACE_TEXT ('\\'))) != 0; - ) - { - ACE_TString simple_section (sub_section, separator - sub_section); - int ret_val = - open_simple_section (result, simple_section.c_str (), create, result); - if (ret_val) - return ret_val; - sub_section = separator + 1; - } - - return open_simple_section (result, sub_section, create, result); -} - -int -ACE_Configuration_Heap::open_simple_section (const ACE_Configuration_Section_Key& base, - const ACE_TCHAR* sub_section, - int create, - ACE_Configuration_Section_Key& result) -{ - ACE_TString section (0, 0, 0); - - if (load_key (base, section)) - { - return -1; - } - - // Only add the \\ if were not at the root - if (section.length ()) - { - section += ACE_LIB_TEXT ("\\"); - } - - section += sub_section; - - // resolve the section - ACE_Configuration_ExtId ExtId (section.fast_rep ()); - ACE_Configuration_Section_IntId IntId; - - if (index_->find (ExtId, IntId, allocator_)) - { - if (!create) - { - errno = ENOENT; - return -1; - } - - return add_section (base, sub_section, result); - } - - ACE_Configuration_Section_Key_Heap *temp; - ACE_NEW_RETURN (temp, - ACE_Configuration_Section_Key_Heap (section.fast_rep ()), - -1); - result = ACE_Configuration_Section_Key (temp); - return 0; -} - -int -ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* sub_section, - int recursive) -{ - ACE_ASSERT (this->allocator_); - if (validate_name (sub_section)) - return -1; - - ACE_TString section; - if (load_key (key, section)) - return -1; - - // Find this key - ACE_Configuration_ExtId ParentExtId (section.fast_rep ()); - ACE_Configuration_Section_IntId ParentIntId; - if (index_->find (ParentExtId, ParentIntId, allocator_)) - return -1;// no parent key - - // Find this subkey - if (section.length ()) - section += ACE_LIB_TEXT ("\\"); - - section += sub_section; - ACE_Configuration_ExtId SectionExtId (section.fast_rep ()); - SECTION_HASH::ENTRY* section_entry; - SECTION_HASH* hashmap = index_; - if (hashmap->find (SectionExtId, section_entry)) - return -1; - - if (recursive) - { - ACE_Configuration_Section_Key section; - if (open_section (key, sub_section, 0, section)) - return -1; - - int index = 0; - ACE_TString name; - while (!enumerate_sections (section, index, name)) - { - if (remove_section (section, name.fast_rep (), 1)) - return -1; - - index++; - } - } - - // Now make sure we dont have any subkeys - if (section_entry->int_id_.section_hash_map_->current_size ()) - { - errno = ENOTEMPTY; - return -1; - } - - // Now remove subkey from parent key - ACE_Configuration_ExtId SubSExtId (sub_section); - SUBSECTION_HASH::ENTRY* subsection_entry; - if (((SUBSECTION_HASH*)ParentIntId.section_hash_map_)-> - find (SubSExtId, subsection_entry)) - return -1; - - if (ParentIntId.section_hash_map_->unbind (SubSExtId, allocator_)) - return -1; - - subsection_entry->ext_id_.free (allocator_); - - // Remember the pointers so we can free them after we unbind - ACE_Configuration_ExtId ExtIdToFree (section_entry->ext_id_); - ACE_Configuration_Section_IntId IntIdToFree (section_entry->int_id_); - - // iterate over all values and free memory - VALUE_HASH* value_hash_map = section_entry->int_id_.value_hash_map_; - VALUE_HASH::ITERATOR value_iter = value_hash_map->begin (); - while (!value_iter.done ()) - { - VALUE_HASH::ENTRY* value_entry; - if (!value_iter.next (value_entry)) - return 1; - - value_entry->ext_id_.free (allocator_); - value_entry->int_id_.free (allocator_); - - value_iter.advance (); - } - - // remove it - if (index_->unbind (SectionExtId, allocator_)) - return -1; - - value_hash_map->close (); - section_entry->int_id_.section_hash_map_->close (allocator_); - - // Free the memory - ExtIdToFree.free (allocator_); - IntIdToFree.free (allocator_); - - return 0; -} - -int -ACE_Configuration_Heap::enumerate_values (const ACE_Configuration_Section_Key& key, - int index, - ACE_TString& name, - VALUETYPE& type) -{ - ACE_ASSERT (this->allocator_); - ACE_Configuration_Section_Key_Heap* pKey = - ACE_dynamic_cast (ACE_Configuration_Section_Key_Heap*, - get_internal_key (key)); - if (!pKey) - return -1; - - name = pKey->path_; - - // resolve the section - ACE_Configuration_ExtId ExtId (pKey->path_); - ACE_Configuration_Section_IntId IntId; - if (index_->find (ExtId, IntId, allocator_)) - return -1; - - // Handle iterator resets - if (index == 0) - { - ACE_Hash_Map_Manager_Ex, - ACE_Equal_To, - ACE_Null_Mutex>* hash_map = IntId.value_hash_map_; - delete pKey->value_iter_; - - ACE_NEW_RETURN (pKey->value_iter_, - VALUE_HASH::ITERATOR (hash_map->begin ()), - -1); - } - - // Get the next entry - ACE_Hash_Map_Entry* entry; - - if (!pKey->value_iter_->next (entry)) - return 1; - - // Return the value of the iterator and advance it - name = entry->ext_id_.name_; - type = entry->int_id_.type_; - pKey->value_iter_->advance (); - - return 0; -} - -int -ACE_Configuration_Heap::enumerate_sections (const ACE_Configuration_Section_Key& key, - int index, - ACE_TString& name) -{ - ACE_ASSERT (this->allocator_); - // cast to a heap section key - ACE_Configuration_Section_Key_Heap* pKey = - ACE_dynamic_cast (ACE_Configuration_Section_Key_Heap*, - get_internal_key (key)); - if (!pKey) - return -1; // not a heap key! - - // resolve the section - ACE_Configuration_ExtId ExtId (pKey->path_); - ACE_Configuration_Section_IntId IntId; - if (index_->find (ExtId, IntId, allocator_)) - return -1; // unknown section - - // Handle iterator resets - if (index == 0) - { - if (pKey->section_iter_) - delete pKey->section_iter_; - - ACE_NEW_RETURN (pKey->section_iter_, - SUBSECTION_HASH::ITERATOR (IntId.section_hash_map_->begin ()), - -1); - } - - // Get the next entry - ACE_Hash_Map_Entry* entry; - if (!pKey->section_iter_->next (entry)) - return 1; - - // Return the value of the iterator and advance it - pKey->section_iter_->advance (); - name = entry->ext_id_.name_; - - return 0; -} - -int -ACE_Configuration_Heap::set_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const ACE_TString& value) -{ - ACE_ASSERT (this->allocator_); - if (validate_name (name)) - return -1; - - ACE_TString section; - if (load_key (key, section)) - return -1; - - ACE_Configuration_ExtId section_ext (section.fast_rep ()); - ACE_Configuration_Section_IntId section_int; - if (index_->find (section_ext, section_int, allocator_)) - return -1; - - // Get the entry for this item (if it exists) - VALUE_HASH::ENTRY* entry; - ACE_Configuration_ExtId item_name (name); - if (section_int.value_hash_map_->VALUE_HASH::find (item_name, entry) == 0) - { - // found item, replace it - // Free the old value - entry->int_id_.free (allocator_); - // Allocate the new value in this heap - ACE_TCHAR* pers_value = - (ACE_TCHAR *) allocator_->malloc ((value.length () + 1) * sizeof (ACE_TCHAR)); - ACE_OS::strcpy (pers_value, value.fast_rep ()); - ACE_Configuration_Value_IntId new_value_int (pers_value); - entry->int_id_ = new_value_int; - } - else - { - // it doesn't exist, bind it - ACE_TCHAR* pers_name = - (ACE_TCHAR *) allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); - ACE_OS::strcpy (pers_name, name); - ACE_TCHAR* pers_value = - (ACE_TCHAR *) allocator_->malloc ((value.length () + 1) * sizeof (ACE_TCHAR)); - ACE_OS::strcpy (pers_value, value.fast_rep ()); - ACE_Configuration_ExtId item_name (pers_name); - ACE_Configuration_Value_IntId item_value (pers_value); - if (section_int.value_hash_map_->bind (item_name, item_value, allocator_)) - { - allocator_->free (pers_value); - allocator_->free (pers_name); - return -1; - } - return 0; - } - - return 0; -} - -int -ACE_Configuration_Heap::set_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int value) -{ - ACE_ASSERT (this->allocator_); - if (validate_name (name)) - return -1; - - // Get the section name from the key - ACE_TString section; - if (load_key (key, section)) - return -1; - - // Find this section - ACE_Configuration_ExtId section_ext (section.fast_rep ()); - ACE_Configuration_Section_IntId section_int; - if (index_->find (section_ext, section_int, allocator_)) - return -1; // section does not exist - - // Get the entry for this item (if it exists) - VALUE_HASH::ENTRY* entry; - ACE_Configuration_ExtId item_name (name); - if (section_int.value_hash_map_->VALUE_HASH::find (item_name, entry) == 0) - { - // found item, replace it - ACE_Configuration_Value_IntId new_value_int (value); - entry->int_id_ = new_value_int; - } - else - { - // it doesn't exist, bind it - ACE_TCHAR* pers_name = - (ACE_TCHAR *) allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); - ACE_OS::strcpy (pers_name, name); - ACE_Configuration_ExtId item_name (pers_name); - ACE_Configuration_Value_IntId item_value (value); - if (section_int.value_hash_map_->bind (item_name, item_value, allocator_)) - { - allocator_->free (pers_name); - return -1; - } - return 0; - } - - return 0; -} - -int -ACE_Configuration_Heap::set_binary_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const void* data, - size_t length) -{ - ACE_ASSERT (this->allocator_); - if (validate_name (name)) - return -1; - - // Get the section name from the key - ACE_TString section; - if (load_key (key, section)) - return -1; - - // Find this section - ACE_Configuration_ExtId section_ext (section.fast_rep ()); - ACE_Configuration_Section_IntId section_int; - if (index_->find (section_ext, section_int, allocator_)) - return -1; // section does not exist - - // Get the entry for this item (if it exists) - VALUE_HASH::ENTRY* entry; - ACE_Configuration_ExtId item_name (name); - if (section_int.value_hash_map_->VALUE_HASH::find (item_name, entry) == 0) - { - // found item, replace it - // Free the old value - entry->int_id_.free (allocator_); - // Allocate the new value in this heap - ACE_TCHAR* pers_value = (ACE_TCHAR *) allocator_->malloc (length); - ACE_OS::memcpy (pers_value, data, length); - ACE_Configuration_Value_IntId new_value_int (pers_value, length); - entry->int_id_ = new_value_int; - } - else - { - // it doesn't exist, bind it - ACE_TCHAR* pers_name = - (ACE_TCHAR *) allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); - ACE_OS::strcpy (pers_name, name); - ACE_TCHAR* pers_value = (ACE_TCHAR *) allocator_->malloc (length); - ACE_OS::memcpy (pers_value, data, length); - ACE_Configuration_ExtId item_name (pers_name); - ACE_Configuration_Value_IntId item_value (pers_value, length); - if (section_int.value_hash_map_->bind (item_name, item_value, allocator_)) - { - allocator_->free (pers_value); - allocator_->free (pers_name); - return -1; - } - return 0; - } - - return 0; -} - -int -ACE_Configuration_Heap::get_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - ACE_TString& value) -{ - ACE_ASSERT (this->allocator_); - if (validate_name (name)) - return -1; - - // Get the section name from the key - ACE_TString section; - if (load_key (key, section)) - return -1; - - // Find this section - ACE_Configuration_ExtId ExtId (section.fast_rep ()); - ACE_Configuration_Section_IntId IntId; - if (index_->find (ExtId, IntId, allocator_)) - return -1; // section does not exist - - // See if it exists first - ACE_Configuration_ExtId VExtId (name); - ACE_Configuration_Value_IntId VIntId; - if (IntId.value_hash_map_->find (VExtId, VIntId, allocator_)) - return -1; // unknown value - - // Check type - if (VIntId.type_ != ACE_Configuration::STRING) - { - errno = ENOENT; - return -1; - } - - // everythings ok, return the data - value = ACE_static_cast (ACE_TCHAR*, VIntId.data_.ptr_); - return 0; -} - -int -ACE_Configuration_Heap::get_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int& value) -{ - ACE_ASSERT (this->allocator_); - - if (this->validate_name (name) != 0) - { - return -1; - } - - // Get the section name from the key - ACE_TString section (0, 0, 0); - - if (this->load_key (key, section) != 0) - { - return -1; - } - - // Find this section - ACE_Configuration_ExtId ExtId (section.fast_rep ()); - ACE_Configuration_Section_IntId IntId; - - if (index_->find (ExtId, IntId, allocator_) != 0) - { - return -1; // section does not exist - } - - - // See if it exists first - ACE_Configuration_ExtId VExtId (name); - ACE_Configuration_Value_IntId VIntId; - - if (IntId.value_hash_map_->find (VExtId, VIntId, allocator_) != 0) - { - return -1; // unknown value - } - - // Check type - if (VIntId.type_ != ACE_Configuration::INTEGER) - { - errno = ENOENT; - return -1; - } - - // Everythings ok, return the data - value = VIntId.data_.int_; - return 0; -} - -int -ACE_Configuration_Heap::get_binary_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - void*& data, - size_t& length) -{ - ACE_ASSERT (this->allocator_); - if (validate_name (name)) - return -1; - - // Get the section name from the key - ACE_TString section; - if (load_key (key, section)) - return -1; - - // Find this section - ACE_Configuration_ExtId ExtId (section.fast_rep ()); - ACE_Configuration_Section_IntId IntId; - if (index_->find (ExtId, IntId, allocator_)) - return -1; // section does not exist - - ACE_Configuration_ExtId VExtId (name); - ACE_Configuration_Value_IntId VIntId; - // See if it exists first - if (IntId.value_hash_map_->find (VExtId, VIntId, allocator_)) - return -1; // unknown value - - // Check type - if (VIntId.type_ != ACE_Configuration::BINARY) - { - errno = ENOENT; - return -1; - } - - // Make a copy - ACE_NEW_RETURN (data, char[VIntId.length_], -1); - ACE_OS::memcpy (data, VIntId.data_.ptr_, VIntId.length_); - length = VIntId.length_; - return 0; -} - -int -ACE_Configuration_Heap::find_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - VALUETYPE& type_out) -{ - ACE_ASSERT (this->allocator_); - if (validate_name (name)) - return -1; - - // Get the section name from the key - ACE_TString section; - if (load_key (key, section)) - return -1; - - // Find this section - ACE_Configuration_ExtId ExtId (section.fast_rep ()); - ACE_Configuration_Section_IntId IntId; - if (index_->find (ExtId, IntId, allocator_)) - return -1; // section does not exist - - // Find it - ACE_Configuration_ExtId ValueExtId (name); - VALUE_HASH::ENTRY* value_entry; - if (((VALUE_HASH *) IntId.value_hash_map_)->find (ValueExtId, value_entry)) - return -1; // value does not exist - - type_out = value_entry->int_id_.type_; - return 0; -} - -int -ACE_Configuration_Heap::remove_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name) -{ - ACE_ASSERT (this->allocator_); - if (validate_name (name)) - return -1; - - // Get the section name from the key - ACE_TString section; - if (load_key (key, section)) - return -1; - - // Find this section - ACE_Configuration_ExtId ExtId (section.fast_rep ()); - ACE_Configuration_Section_IntId IntId; - if (index_->find (ExtId, IntId, allocator_)) - return -1; // section does not exist - - // Find it - ACE_Configuration_ExtId ValueExtId (name); - VALUE_HASH::ENTRY* value_entry; - if (((VALUE_HASH *) IntId.value_hash_map_)->find (ValueExtId, value_entry)) - return -1; - - // free it - value_entry->ext_id_.free (allocator_); - value_entry->int_id_.free (allocator_); - - // Unbind it - if (IntId.value_hash_map_->unbind (ValueExtId, allocator_)) - return -1; - - return 0; -} diff --git a/ace/Configuration.h b/ace/Configuration.h deleted file mode 100644 index 1932e84dcb5..00000000000 --- a/ace/Configuration.h +++ /dev/null @@ -1,871 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Configuration.h - * - * $Id$ - * - * @author Chris Hafey - * - * The ACE configuration API provides a portable abstraction for - * program configuration similar to the Microsoft Windows registry. - * The API supports a tree based hierarchy of configuration sections. Each - * section contains other sections or values. Values may contain string, - * unsigned integer and binary data. - * - * @note These classes are not thread safe, if multiple threads use these - * classes, you are responsible for serializing access. - * - * For examples of using this class, see: - * -# The test code in ACE_wrappers/test - * -# wxConfigViewer, a Windows like Registry Editor for ACE_Configuration - * -# TAO's IFR, it makes extensive use of ACE_Configuration - * - * @todo Templatize this class with an ACE_LOCK to provide thread safety - * - */ -//============================================================================= - -#ifndef ACE_CONFIGURATION_H -#define ACE_CONFIGURATION_H -#include "ace/pre.h" - -#include "ace/SString.h" -#include "ace/Hash_Map_With_Allocator_T.h" -#include "ace/Malloc.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// configurable parameters - -#if !defined (ACE_CONFIG_SECTION_INDEX) -# define ACE_CONFIG_SECTION_INDEX "Config_Section_Index" -#endif /* ! ACE_CONFIG_SECTION_INDEX */ - -#if !defined (ACE_DEFAULT_CONFIG_SECTION_SIZE) -#define ACE_DEFAULT_CONFIG_SECTION_SIZE 16 -#endif /* ACE_DEFAULT_CONFIG_SECTION_SIZE */ - -/** - * @class ACE_Section_Key_Internal - * - * @internal - * - * @brief A base class for internal handles to section keys for - * configuration implementations - * - * Implementations subclass this base class to represent a - * section key. - * - */ -class ACE_Export ACE_Section_Key_Internal -{ -public: - /// Virtual destructor, make sure descendants are virtual! - virtual ~ACE_Section_Key_Internal (void); - - /// Increment reference count - virtual int add_ref (void); - - /// Decrement reference count. Will delete this if count gets to 0 - virtual int dec_ref (void); -protected: - ACE_Section_Key_Internal (void); - ACE_Section_Key_Internal (const ACE_Section_Key_Internal& rhs); - ACE_Section_Key_Internal& operator= (ACE_Section_Key_Internal& rhs); - - u_int ref_count_; -}; - -/** - * @class ACE_Configuration_Section_Key - * - * @brief Reference counted wrapper for ACE_Section_Key_Internal. - * - * Reference counted wrapper class for the abstract internal - * section key. A user gets one of these to represent a section - * in the configuration database. - */ -class ACE_Export ACE_Configuration_Section_Key -{ - friend class ACE_Configuration; -public: - /// Default constructor. - ACE_Configuration_Section_Key (void); - - /// Constructor that initializes to a pointer to a concrete internal key. - /** - * @param key The section key to reference. Calls add_ref() with @a key. - */ - ACE_EXPLICIT ACE_Configuration_Section_Key (ACE_Section_Key_Internal *key); - - /// Copy constructor, increments the reference count on the key. - ACE_Configuration_Section_Key (const ACE_Configuration_Section_Key &rhs); - - /// Destructor, decrements reference count on the referenced key. - ~ACE_Configuration_Section_Key (void); - - /// Assignment operator, increments reference count for this object - /// and decrements it on @a rhs. - ACE_Configuration_Section_Key & - operator= (const ACE_Configuration_Section_Key &rhs); -private: - ACE_Section_Key_Internal *key_; -}; - -/** - * @class ACE_Configuration - * - * @internal - * - * @brief Base class for configuration databases - * - * This class provides an interface for configuration databases. A concrete - * class is required that implements the interface. - * - * @sa ACE_Configuration_Heap - * @sa ACE_Configuration_Win32Registry - */ -class ACE_Export ACE_Configuration -{ -public: - /// Enumeration for the various types of values we can store. - enum VALUETYPE - { - STRING, - INTEGER, - BINARY, - INVALID - }; - - /// Destructor - virtual ~ACE_Configuration (void); - - /// Obtain a reference to the root section of this configuration. - /* - * @return Reference to the configuration's root section. Note that - * it is a const reference. - */ - virtual const ACE_Configuration_Section_Key& root_section (void) const; - - /** - * Opens a named section in an existing section. - * - * @param base Existing section in which to open the named section. - * @param sub_section Name of the section to open. - * @param create If zero, the named section must exist. If non-zero, - * the named section will be created if it does not exist. - * @param result Reference; receives the section key for the new - * section. - * - * @retval 0 for success. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int open_section (const ACE_Configuration_Section_Key &base, - const ACE_TCHAR *sub_section, - int create, - ACE_Configuration_Section_Key& result) = 0; - - /// Removes a named section. - /** - * @param key Section key to remove the named section from. - * @param sub_section Name of the section to remove. - * @param recursive If non zero, any subkeys below @a sub_section are - * removed as well. - * - * @retval 0 for success. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int remove_section (const ACE_Configuration_Section_Key &key, - const ACE_TCHAR *sub_section, - int recursive) = 0; - - /** - * Enumerates through the values in a section. - * - * @param key Section key to iterate through. - * @param index Iteration position. Must be zero on the first call to - * iterate through @a key. Increment @a index by one on each - * successive call to this method. - * @param name Receives the value's name. - * @param type Receives the value's data type. - * - * @note You may not delete or add values while enumerating. If the - * section is modified during enumeration, results are undefined; - * you must restart the enumeration from index 0. - * - * @retval 0 for success, @a name and @a type are valid. - * @retval 1 there are no more values in the section. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int enumerate_values (const ACE_Configuration_Section_Key& key, - int index, - ACE_TString& name, - VALUETYPE& type) = 0; - - /** - * Enumerates through the subsections in a section. - * - * @param key Section key to iterate through. - * @param index Iteration position. Must be zero on the first call to - * iterate through @a key. Increment @a index by one on each - * successive call to this method. - * @param name Receives the subsection's name. - * - * @note You may not modify the @a key section while enumerating. If the - * section is modified during enumeration, results are undefined; - * you must restart the enumeration from index 0. - * - * @retval 0 for success, @a name has a valid name. - * @retval 1 there are no more subsections in the section. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int enumerate_sections (const ACE_Configuration_Section_Key& key, - int index, ACE_TString& name) = 0; - - /// Sets a string-typed value. - /** - * @param key Configuration section to set the value in. - * @param name Name of the configuration value to set. If a value with - * the specified name exists, it is replaced. - * @param value The string to set the configuration value to. - * - * @retval 0 for success. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int set_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const ACE_TString& value) = 0; - - /// Sets a integer-typed value. - /** - * @param key Configuration section to set the value in. - * @param name Name of the configuration value to set. If a value with - * the specified name exists, it is replaced. - * @param value The integer to set the configuration value to. - * - * @retval 0 for success. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int set_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int value) = 0; - - /// Sets a binary-typed value. - /** - * @param key Configuration section to set the value in. - * @param name Name of the configuration value to set. If a value with - * the specified name exists, it is replaced. - * @param data Pointer to the binary data for the value. - * @param length Number of bytes for the new value. - * - * @retval 0 for success. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int set_binary_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const void* data, - size_t length) = 0; - - /// Gets a string-typed value. - /** - * @param key Configuration section to get the value from. - * @param name Name of the configuration value to get. - * @param value Receives the configuration value if it exists and - * has type STRING. - * - * @retval 0 for success. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int get_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - ACE_TString& value) = 0; - - /// Gets an integer-typed value. - /** - * @param key Configuration section to get the value from. - * @param name Name of the configuration value to get. - * @param value Receives the configuration value if it exists and - * has type INTEGER. - * - * @retval 0 for success. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int get_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int& value) = 0; - - /// Gets a binary-typed value. - /** - * @param key Configuration section to get the value from. - * @param name Name of the configuration value to get. - * @param data Receives a pointer to memory holding the binary data - * for the value. This method allocates the memory pointed - * to using operator new[]. The caller is responsible for - * freeing the memory using operator delete[]. - * @param length Receives the number of bytes in the value. - * - * @retval 0 for success; caller is responsible for freeing the - * returned memory. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int get_binary_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - void*& data, - size_t& length) = 0; - - /** - * Retrieves the type of a named configuration value. - * - * @param key Configuration section to look up the name in. - * @param name Name of the configuration value to get the type of. - * @param type Receives the data type of the named value, if it exists. - * - * @retval 0 for success. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int find_value(const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - VALUETYPE& type) = 0; - - /// Removes a named value. - /** - * @param key Configuration section to remove the named value from. - * @param name Name of the configuration value to remove. - * - * @retval 0 for success. - * @retval -1 for error; ACE_OS::last_error() retrieves error code. - */ - virtual int remove_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name) = 0; - - /** - * Expands to from . If create is true, - * the subsections are created. Returns 0 on success, non zero on - * error The path consists of sections separated by the backslash - * '\' or forward slash '/'. - * Returns 0 on success, -1 if is valid. must be < 255 characters - * and not contain the path separator '\', brackets [] or = (maybe - * just restrict to alphanumeric?) returns non zero if name is not - * valid. The path separator is allowed, except for the first character, - * if is true. - */ - int validate_name (const ACE_TCHAR* name, int allow_path = 0); - - // Not used - ACE_Configuration (const ACE_Configuration& rhs); - ACE_Configuration& operator= (const ACE_Configuration& rhs); - - - ACE_Configuration_Section_Key root_; -}; - -#if defined (ACE_WIN32) - -/** - * @class ACE_Section_Key_Win32 - * - * @brief The Win32 registry implementation of an internal section key. - * - * Holds the HKEY for a section (registry key). - */ -class ACE_Export ACE_Section_Key_Win32 : public ACE_Section_Key_Internal -{ -public: - /// Constructor based on an HKEY - ACE_Section_Key_Win32 (HKEY hKey); - - HKEY hKey_; - -protected: - /// Destructor - invokes - virtual ~ACE_Section_Key_Win32 (void); - - // Not used - ACE_Section_Key_Win32 (const ACE_Section_Key_Win32& rhs); - ACE_Section_Key_Win32& operator= (const ACE_Section_Key_Win32& rhs); -}; - -/** - * @class ACE_Configuration_Win32Registry - * - * @brief The win32 registry implementation of a configuration database - * - * The win32 implementation basically makes calls through to the - * registry functions. The API is very similar so very little - * work must be done - */ -class ACE_Export ACE_Configuration_Win32Registry : public ACE_Configuration -{ -public: - - /** - * Constructor for registry configuration database. hKey is the - * base registry key to attach to. This class takes ownership of - * hKey, it will invoke on it upon destruction. - */ - ACE_EXPLICIT ACE_Configuration_Win32Registry (HKEY hKey); - - /// Destructor - virtual ~ACE_Configuration_Win32Registry (void); - - virtual int open_section (const ACE_Configuration_Section_Key& base, - const ACE_TCHAR* sub_section, - int create, - ACE_Configuration_Section_Key& result); - - virtual int remove_section (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* sub_section, - int recursive); - - virtual int enumerate_values (const ACE_Configuration_Section_Key& key, - int index, - ACE_TString& name, - VALUETYPE& type); - - virtual int enumerate_sections (const ACE_Configuration_Section_Key& key, - int index, - ACE_TString& name); - - virtual int set_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const ACE_TString& value); - - virtual int set_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int value); - - virtual int set_binary_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const void* data, - size_t length); - - virtual int get_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - ACE_TString& value); - - virtual int get_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int& value); - - virtual int get_binary_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - void*& data, - size_t& length); - - virtual int find_value(const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - VALUETYPE& type); - - /// Removes the the value from . returns non zero on error - virtual int remove_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name); - - /** - * This method traverses through . It is useful when - * you want the HKEY for a specific registry key, especially when - * initializing this implementation. Caller is responsible for - * closeing this key when it is no longer used. If create is 1 - * (default) the keys are create if they don't already exist. - * Returns 0 on error - */ - static HKEY resolve_key (HKEY hKey, - const ACE_TCHAR* path, - int create = 1); - virtual int operator== (const ACE_Configuration_Win32Registry &rhs) const; - virtual int operator!= (const ACE_Configuration_Win32Registry &rhs) const; - -protected: - - /// Gets the HKEY for a configuration section - int load_key (const ACE_Configuration_Section_Key& key, HKEY& hKey); - - // Not used - ACE_Configuration_Win32Registry (void); - ACE_Configuration_Win32Registry (const ACE_Configuration_Win32Registry& rhs); - ACE_Configuration_Win32Registry& operator= (const ACE_Configuration_Win32Registry& rhs); -}; -#endif /* ACE_WIN32 */ - -// ACE_Allocator version - -typedef ACE_Allocator_Adapter > - PERSISTENT_ALLOCATOR; -typedef ACE_Allocator_Adapter > - HEAP_ALLOCATOR; - -/** - * @class ACE_Configuration_ExtId - * - * @brief External ID for the section and value hash - * - * Contains a pointer to the section or value name. - */ -class ACE_Export ACE_Configuration_ExtId -{ -public: - /// Defeault ctor - ACE_Configuration_ExtId (void); - - /// Named constructor - ACE_EXPLICIT ACE_Configuration_ExtId (const ACE_TCHAR* name); - - /// Copy ctor - ACE_Configuration_ExtId (const ACE_Configuration_ExtId& rhs); - - /// destructor - ~ACE_Configuration_ExtId (void); - - /// Assignment operator - ACE_Configuration_ExtId& operator= (const ACE_Configuration_ExtId& rhs); - - /// Equality comparison operator (must match name_). - int operator== (const ACE_Configuration_ExtId &rhs) const; - - /// Inequality comparison operator. - int operator!= (const ACE_Configuration_ExtId &rhs) const; - - /// Frees the name of the value. needed since we don't know the - /// allocator name_ was created in - void free (ACE_Allocator *alloc); - - /// function is required in order for this class to be usable by - /// ACE_Hash_Map_Manager. - u_long hash (void) const; - - // = Data members. - - const ACE_TCHAR * name_; - - // Accessors - const ACE_TCHAR *name (void); -}; - -typedef ACE_Hash_Map_With_Allocator - SUBSECTION_MAP; -typedef ACE_Hash_Map_Manager_Ex, - ACE_Equal_To, - ACE_Null_Mutex> - SUBSECTION_HASH; - -// Deprecated typedef. Use the SUBSECTION_HASH::ENTRY trait instead. -typedef SUBSECTION_HASH::ENTRY SUBSECTION_ENTRY; - -/** - * @class ACE_Configuration_Value_IntId - * - * @brief The section hash table internal value class - * - * This class is present as the internal portion of a section's - * value hash table It may store string, integer or binary data. - */ -class ACE_Export ACE_Configuration_Value_IntId -{ -public: - /// Default constructor - ACE_Configuration_Value_IntId (void); - - /// String constructor, takes ownership of string - ACE_EXPLICIT ACE_Configuration_Value_IntId (ACE_TCHAR* string); - - /// Integer constructor - ACE_EXPLICIT ACE_Configuration_Value_IntId (u_int integer); - - /// Binary constructor, takes ownership of data - ACE_Configuration_Value_IntId (void* data, size_t length); - - /// Copy ctor - ACE_Configuration_Value_IntId (const ACE_Configuration_Value_IntId& rhs); - - /// Destructor - ~ACE_Configuration_Value_IntId (void); - - /// Assignment operator - ACE_Configuration_Value_IntId& operator= ( - const ACE_Configuration_Value_IntId& rhs); - - void free (ACE_Allocator *alloc); - - // = Data members. - - /** - * Points to the string value or binary data or IS the integer - * Length is only used when type_ == BINARY - */ - ACE_Configuration::VALUETYPE type_; - union { - void * ptr_; - u_int int_; - } data_; - size_t length_; -}; - -typedef ACE_Hash_Map_With_Allocator - VALUE_MAP; -typedef ACE_Hash_Map_Manager_Ex, - ACE_Equal_To, - ACE_Null_Mutex> - VALUE_HASH; - -// Deprecated typedef. Use the VALUE_HASH::ENTRY trait instead. -typedef VALUE_HASH::ENTRY VALUE_ENTRY; - -/** - * @class ACE_Configuration_Section_IntId - * - * @brief The internal ID for a section hash table - * - * Contains a hash table containing value name/values - */ -class ACE_Export ACE_Configuration_Section_IntId -{ -public: - /// Default ctor - ACE_Configuration_Section_IntId (void); - - /// Named ctor - ACE_EXPLICIT ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map, - SUBSECTION_MAP* section_hash_map); - - /// Copy ctor - ACE_Configuration_Section_IntId (const ACE_Configuration_Section_IntId& rhs); - - /// Destructor - ~ACE_Configuration_Section_IntId (void); - - /// Assignment operator - ACE_Configuration_Section_IntId& operator= ( - const ACE_Configuration_Section_IntId& rhs); - - /// Frees the hash table and all its values - void free (ACE_Allocator *alloc); - - // = Data Members. - VALUE_MAP* value_hash_map_; - - SUBSECTION_MAP* section_hash_map_; -}; - -typedef ACE_Hash_Map_With_Allocator - SECTION_MAP; -typedef ACE_Hash_Map_Manager_Ex, - ACE_Equal_To, - ACE_Null_Mutex> - SECTION_HASH; - -// Deprecated typedef. Use the SECTION_HASH::ENTRY trait instead. -typedef SECTION_HASH::ENTRY SECTION_ENTRY; - -/** - * @class ACE_Configuration_Section_Key_Heap - * - * @brief Internal section key class for heap based configuration - * database. - * - * Contains a value iterator and full path name of section. - */ -class ACE_Export ACE_Configuration_Section_Key_Heap - : public ACE_Section_Key_Internal -{ -public: - /// Constructor based on the full path of the section - ACE_Configuration_Section_Key_Heap (const ACE_TCHAR* path); - - /// The path itself - ACE_TCHAR* path_; - - /// The value iterator - VALUE_HASH::ITERATOR* value_iter_; - - /// The sub section iterator - SUBSECTION_HASH::ITERATOR* section_iter_; -protected: - /// Destructor - will delete the iterators - virtual ~ACE_Configuration_Section_Key_Heap (void); - - // Not used - ACE_Configuration_Section_Key_Heap (const ACE_Configuration_Section_Key_Heap& rhs); - ACE_Configuration_Section_Key_Heap& operator= (const ACE_Configuration_Section_Key_Heap& rhs); -}; - -/** - * @class ACE_Configuration_Heap - * - * @brief The concrete implementation of a allocator based - * configuration database - * - * This class uses ACE's Allocators to manage a memory - * representation of a configuraiton database. A persistent heap - * may be used to store configurations persistently - * - * Note: Before using this class you must call one of the open methods. - * - * @todo - * - Need to investigate what happens if memory mapped file gets mapped to - * a location different than it was created with. - */ -class ACE_Export ACE_Configuration_Heap : public ACE_Configuration -{ -public: - - /// Default ctor - ACE_Configuration_Heap (void); - - /// Destructor - virtual ~ACE_Configuration_Heap (void); - - /// Opens a configuration based on a file name - int open (const ACE_TCHAR* file_name, - void* base_address = ACE_DEFAULT_BASE_ADDR, - int default_map_size = ACE_DEFAULT_CONFIG_SECTION_SIZE); - - /// Opens a heap based configuration - int open (int default_map_size = ACE_DEFAULT_CONFIG_SECTION_SIZE); - - virtual int open_section (const ACE_Configuration_Section_Key& base, - const ACE_TCHAR* sub_section, - int create, ACE_Configuration_Section_Key& result); - - virtual int remove_section (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* sub_section, - int recursive); - - virtual int enumerate_values (const ACE_Configuration_Section_Key& key, - int index, - ACE_TString& name, - VALUETYPE& type); - - virtual int enumerate_sections (const ACE_Configuration_Section_Key& key, - int index, - ACE_TString& name); - - virtual int set_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const ACE_TString& value); - - virtual int set_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int value); - - virtual int set_binary_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - const void* data, - size_t length); - - virtual int get_string_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - ACE_TString& value); - - virtual int get_integer_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - u_int& value); - - virtual int get_binary_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - void* &data, - size_t &length); - - virtual int find_value(const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - VALUETYPE& type); - - /// Removes the the value from . returns non zero on error - virtual int remove_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name); - -private: - /// may not contain path separators - int open_simple_section (const ACE_Configuration_Section_Key &base, - const ACE_TCHAR *sub_section, - int create, ACE_Configuration_Section_Key &result); - /// Adds a new section - int add_section (const ACE_Configuration_Section_Key &base, - const ACE_TCHAR *sub_section, - ACE_Configuration_Section_Key &result); - - /// Helper for the method. - int create_index (void); - - /// Helper for create_index() method: places hash table into an - /// allocated space. - int create_index_helper (void *buffer); - - int value_open_helper (size_t hash_table_size, void *buffer); - - int section_open_helper (size_t hash_table_size, void *buffer); - - int load_key (const ACE_Configuration_Section_Key& key, ACE_TString& name); - - int new_section (const ACE_TString& section, - ACE_Configuration_Section_Key& result); - - ACE_Configuration_Heap (const ACE_Configuration_Heap& rhs); - ACE_Configuration_Heap& operator= (const ACE_Configuration_Heap& rhs); - - ACE_Allocator *allocator_; - SECTION_MAP *index_; - int default_map_size_; -}; - -#include "ace/post.h" -#endif /* ACE_CONFIGURATION_H */ diff --git a/ace/Configuration_Import_Export.cpp b/ace/Configuration_Import_Export.cpp deleted file mode 100644 index cc128d45b93..00000000000 --- a/ace/Configuration_Import_Export.cpp +++ /dev/null @@ -1,608 +0,0 @@ -// $Id$ - -#include "ace/Configuration_Import_Export.h" - -ACE_Config_ImpExp_Base::ACE_Config_ImpExp_Base (ACE_Configuration& config) - : config_ (config) -{ -} - -ACE_Config_ImpExp_Base::~ACE_Config_ImpExp_Base (void) -{ -} - -ACE_Registry_ImpExp::ACE_Registry_ImpExp (ACE_Configuration& config) - : ACE_Config_ImpExp_Base (config) -{ -} - -ACE_Registry_ImpExp::~ACE_Registry_ImpExp (void) -{ -} - -// Imports the configuration database from filename. -// No existing data is removed. -int -ACE_Registry_ImpExp::import_config (const ACE_TCHAR* filename) -{ - if (0 == filename) - { - errno = EINVAL; - return -1; - } - FILE* in = ACE_OS::fopen (filename, ACE_LIB_TEXT ("r")); - if (!in) - return -1; - - // @@ XXX - change this to a dynamic buffer - ACE_TCHAR buffer[4096]; - ACE_Configuration_Section_Key section; - while (ACE_OS::fgets (buffer, 4096, in)) - { - // Check for a comment - if (buffer[0] == ACE_LIB_TEXT (';') || buffer[0] == ACE_LIB_TEXT ('#')) - continue; - - if (buffer[0] == ACE_LIB_TEXT ('[')) - { - // We have a new section here, strip out the section name - ACE_TCHAR* end = ACE_OS::strrchr (buffer, ACE_LIB_TEXT (']')); - if (!end) - { - ACE_OS::fclose (in); - return -3; - } - *end = 0; - - if (config_.expand_path (config_.root_section (), buffer + 1, section, 1)) - { - ACE_OS::fclose (in); - return -3; - } - continue; - } // end if firs char is a [ - - if (buffer[0] == ACE_LIB_TEXT ('"')) - { - // we have a value - ACE_TCHAR* end = ACE_OS::strchr (buffer+1, '"'); - if (!end) // no closing quote, not a value so just skip it - continue; - - // null terminate the name - *end = 0; - ACE_TCHAR* name = buffer + 1; - end+=2; - // determine the type - if (*end == '\"') - { - // string type - // truncate trailing " - ++end; - ACE_TCHAR* trailing = ACE_OS::strrchr (end, '"'); - if (trailing) - *trailing = 0; - if (config_.set_string_value (section, name, end)) - { - ACE_OS::fclose (in); - return -4; - } - } - else if (ACE_OS::strncmp (end, ACE_LIB_TEXT ("dword:"), 6) == 0) - { - // number type - ACE_TCHAR* endptr = 0; - u_int value = ACE_OS::strtoul (end + 6, &endptr, 16); - if (config_.set_integer_value (section, name, value)) - { - ACE_OS::fclose (in); - return -4; - } - } - else if (ACE_OS::strncmp (end, ACE_LIB_TEXT ("hex:"), 4) == 0) - { - // binary type - size_t string_length = ACE_OS::strlen (end + 4); - // divide by 3 to get the actual buffer length - size_t length = string_length / 3; - size_t remaining = length; - u_char* data = 0; - ACE_NEW_RETURN (data, - u_char[length], - -1); - u_char* out = data; - ACE_TCHAR* inb = end + 4; - ACE_TCHAR* endptr = 0; - while (remaining) - { - u_char charin = (u_char) ACE_OS::strtoul (inb, &endptr, 16); - *out = charin; - ++out; - --remaining; - inb += 3; - } - if (config_.set_binary_value (section, name, data, length)) - { - ACE_OS::fclose (in); - return -4; - } - } - else - { - // invalid type, ignore - continue; - } - }// end if first char is a " - else - { - // if the first character is not a ", [, ;, or # we may be - // processing a file in the old format. - // Try and process the line as such and if it fails, - // return an error - int rc; - if ((rc = process_previous_line_format (buffer, section)) != 0) - { - ACE_OS::fclose (in); - return rc; - } - } // end if maybe old format - } // end while fgets - - if (ferror (in)) - { - ACE_OS::fclose (in); - return -1; - } - - ACE_OS::fclose (in); - return 0; -} - -// This method exports the entire configuration database to . -// Once the file is opened this method calls 'export_section' passing -// the root section. -int -ACE_Registry_ImpExp::export_config (const ACE_TCHAR* filename) -{ - if (0 == filename) - { - errno = EINVAL; - return -1; - } - int result = -1; - - FILE* out = ACE_OS::fopen (filename, ACE_LIB_TEXT ("w")); - if (out) - { - result = this->export_section (config_.root_section (), - ACE_LIB_TEXT (""), - out); - ACE_OS::fclose (out); - } - return result; -} - -// Method provided by derived classes in order to write one section -// to the file specified. Called by export_config when exporting -// the entire configuration object. - -int -ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& section, - const ACE_TString& path, - FILE* out) -{ - // don't export the root - if (path.length ()) - { - // Write out the section header - ACE_TString header = ACE_LIB_TEXT ("["); - header += path; - header += ACE_LIB_TEXT ("]"); - header += ACE_LIB_TEXT (" \n"); - if (ACE_OS::fputs (header.fast_rep (), out) < 0) - return -1; - // Write out each value - int index = 0; - ACE_TString name; - ACE_Configuration::VALUETYPE type; - ACE_TString line; - ACE_TCHAR int_value[32]; - ACE_TCHAR bin_value[3]; - void* binary_data; - size_t binary_length; - ACE_TString string_value; - while (!config_.enumerate_values (section, index, name, type)) - { - line = ACE_LIB_TEXT ("\"") + name + ACE_LIB_TEXT ("\"="); - switch (type) - { - case ACE_Configuration::INTEGER: - { - u_int value; - if (config_.get_integer_value (section, name.fast_rep (), value)) - return -2; - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), value); - line += ACE_LIB_TEXT ("dword:"); - line += int_value; - break; - } - case ACE_Configuration::STRING: - { - if (config_.get_string_value (section, - name.fast_rep (), - string_value)) - return -2; - line += ACE_LIB_TEXT ("\""); - line += string_value + ACE_LIB_TEXT ("\""); - break; - } -#ifdef _WIN32 - case ACE_Configuration::INVALID: - break; // JDO added break. Otherwise INVALID is processed - // like BINARY. If that's correct, please remove the - // break and these comments -#endif - case ACE_Configuration::BINARY: - { - // not supported yet - maybe use BASE64 codeing? - if (config_.get_binary_value (section, - name.fast_rep (), - binary_data, - binary_length)) - return -2; - line += ACE_LIB_TEXT ("hex:"); - unsigned char* ptr = (unsigned char*)binary_data; - while (binary_length) - { - if (ptr != binary_data) - { - line += ACE_LIB_TEXT (","); - } - ACE_OS::sprintf (bin_value, ACE_LIB_TEXT ("%02x"), *ptr); - line += bin_value; - --binary_length; - ++ptr; - } - delete [] (char*) binary_data; - break; - } - default: - return -3; - } - line += ACE_LIB_TEXT ("\n"); - if (ACE_OS::fputs (line.fast_rep (), out) < 0) - return -4; - index++; - } - } - // Export all sub sections - int index = 0; - ACE_TString name; - ACE_Configuration_Section_Key sub_key; - ACE_TString sub_section; - while (!config_.enumerate_sections (section, index, name)) - { - ACE_TString sub_section (path); - if (path.length ()) - sub_section += ACE_LIB_TEXT ("\\"); - sub_section += name; - if (config_.open_section (section, name.fast_rep (), 0, sub_key)) - return -5; - if (export_section (sub_key, sub_section.fast_rep (), out)) - return -6; - index++; - } - return 0; -} - -// -// This method read the line format origionally used in ACE 5.1 -// -int -ACE_Registry_ImpExp::process_previous_line_format (ACE_TCHAR* buffer, - ACE_Configuration_Section_Key& section) -{ - // Chop any cr/lf at the end of the line. - ACE_TCHAR *endp = ACE_OS_String::strpbrk (buffer, ACE_LIB_TEXT ("\r\n")); - if (endp != 0) - *endp = '\0'; - - // assume this is a value, read in the value name - ACE_TCHAR* end = ACE_OS::strchr (buffer, '='); - if (end) // no =, not a value so just skip it - { - // null terminate the name - *end = 0; - end++; - // determine the type - if (*end == '\"') - { - // string type - if(config_.set_string_value (section, buffer, end + 1)) - return -4; - } - else if (*end == '#') - { - // number type - u_int value = ACE_OS::atoi (end + 1); - if (config_.set_integer_value (section, buffer, value)) - return -4; - } - } - return 0; -} // end read_previous_line_format - - -ACE_Ini_ImpExp::ACE_Ini_ImpExp (ACE_Configuration& config) - : ACE_Config_ImpExp_Base (config) -{ -} - -ACE_Ini_ImpExp::~ACE_Ini_ImpExp (void) -{ -} - -// Method to read file and populate object. -int -ACE_Ini_ImpExp::import_config (const ACE_TCHAR* filename) -{ - if (0 == filename) - { - errno = EINVAL; - return -1; - } - FILE* in = ACE_OS::fopen (filename, ACE_LIB_TEXT ("r")); - if (!in) - return -1; - - // @@ Make this a dynamic size! - ACE_TCHAR buffer[4096]; - ACE_Configuration_Section_Key section; - while (ACE_OS::fgets (buffer, sizeof buffer, in)) - { - ACE_TCHAR *line = this->squish (buffer); - // Check for a comment and blank line - if (line[0] == ACE_LIB_TEXT (';') || - line[0] == ACE_LIB_TEXT ('#') || - line[0] == '\0') - continue; - - if (line[0] == ACE_LIB_TEXT ('[')) - { - // We have a new section here, strip out the section name - ACE_TCHAR* end = ACE_OS::strrchr (line, ACE_LIB_TEXT (']')); - if (!end) - { - ACE_OS::fclose (in); - return -3; - } - *end = 0; - - if (config_.expand_path (config_.root_section (), - line + 1, - section, - 1)) - { - ACE_OS::fclose (in); - return -3; - } - - continue; - } - - // We have a line; name ends at equal sign. - ACE_TCHAR *end = ACE_OS::strchr (line, ACE_LIB_TEXT ('=')); - if (end == 0) // No '=' - { - ACE_OS::fclose (in); - return -3; - } - *end++ = '\0'; - ACE_TCHAR *name = this->squish (line); - if (ACE_OS::strlen (name) == 0) // No name; just an '=' - { - ACE_OS::fclose (in); - return -3; - } - - // Now find the start of the value - ACE_TCHAR *value = this->squish (end); - size_t value_len = ACE_OS::strlen (value); - if (value_len > 0) - { - // ACE 5.2 (and maybe earlier) exported strings may be enclosed - // in quotes. If string is quote-delimited, strip the quotes. - // Newer exported files don't have quote delimiters. - if (value[0] == ACE_LIB_TEXT ('"') && - value[value_len - 1] == ACE_LIB_TEXT ('"')) - { - // Strip quotes off both ends. - value[value_len - 1] = '\0'; - value++; - } - } - - if (config_.set_string_value (section, name, value)) - { - ACE_OS::fclose (in); - return -4; - } - } // end while fgets - - if (ferror (in)) - { - ACE_OS::fclose (in); - return -1; - } - - ACE_OS::fclose (in); - return 0; -} - -// This method exports the entire configuration database to . -// Once the file is opened this method calls 'export_section' passing -// the root section. -int -ACE_Ini_ImpExp::export_config (const ACE_TCHAR* filename) -{ - if (0 == filename) - { - errno = EINVAL; - return -1; - } - int result = -1; - - FILE* out = ACE_OS::fopen (filename, ACE_LIB_TEXT ("w")); - if (out) - { - result = this->export_section (config_.root_section (), - ACE_LIB_TEXT (""), - out); - ACE_OS::fclose (out); - } - return result; -} - -// Method provided by derived classes in order to write one section to the -// file specified. Called by export_config when exporting the entire -// configuration objet - -int -ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, - const ACE_TString& path, - FILE* out) -{ - // don't export the root - if (path.length ()) - { - // Write out the section header - ACE_TString header = ACE_LIB_TEXT ("["); - header += path; - header += ACE_LIB_TEXT ("]\n"); - if (ACE_OS::fputs (header.fast_rep (), out) < 0) - return -1; - // Write out each value - int index = 0; - ACE_TString name; - ACE_Configuration::VALUETYPE type; - ACE_TString line; - ACE_TCHAR int_value[32]; - ACE_TCHAR bin_value[3]; - void* binary_data; - size_t binary_length; - ACE_TString string_value; - while (!config_.enumerate_values (section, index, name, type)) - { - line = name + ACE_LIB_TEXT ("="); - switch (type) - { - case ACE_Configuration::INTEGER: - { - u_int value; - if (config_.get_integer_value (section, name.fast_rep (), value)) - return -2; - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), value); - line += int_value; - break; - } - case ACE_Configuration::STRING: - { - if (config_.get_string_value (section, - name.fast_rep (), - string_value)) - return -2; - line += string_value; - break; - } -#ifdef _WIN32 - case ACE_Configuration::INVALID: - break; // JDO added break. Otherwise INVALID is processed - // like BINARY. If that's correct, please remove the - // break and these comments -#endif - case ACE_Configuration::BINARY: - { - // not supported yet - maybe use BASE64 codeing? - if (config_.get_binary_value (section, - name.fast_rep (), - binary_data, - binary_length)) - return -2; - line += ACE_LIB_TEXT ("\""); - unsigned char* ptr = (unsigned char*)binary_data; - while (binary_length) - { - if (ptr != binary_data) - { - line += ACE_LIB_TEXT (","); - } - ACE_OS::sprintf (bin_value, ACE_LIB_TEXT ("%02x"), *ptr); - line += bin_value; - --binary_length; - ++ptr; - } - line += ACE_LIB_TEXT ("\""); - delete [] (char *) binary_data; - break; - } - default: - return -3; - - }// end switch on type - - line += ACE_LIB_TEXT ("\n"); - if (ACE_OS::fputs (line.fast_rep (), out) < 0) - return -4; - index++; - }// end while enumerating values - } - // Export all sub sections - int index = 0; - ACE_TString name; - ACE_Configuration_Section_Key sub_key; - ACE_TString sub_section; - while (!config_.enumerate_sections (section, index, name)) - { - ACE_TString sub_section (path); - if (path.length ()) - sub_section += ACE_LIB_TEXT ("\\"); - sub_section += name; - if (config_.open_section (section, name.fast_rep (), 0, sub_key)) - return -5; - if (export_section (sub_key, sub_section.fast_rep (), out)) - return -6; - index++; - } - return 0; - -} - -// Method to squish leading and trailing whitespaces from a string. -// Whitespace is defined as: spaces (' '), tabs ('\t') or end-of-line -// (cr/lf). The terminating nul is moved up to expunge trailing -// whitespace and the returned pointer points at the first -// non-whitespace character in the string, which may be the nul -// terminator if the string is all whitespace. - -ACE_TCHAR * -ACE_Ini_ImpExp::squish (ACE_TCHAR *src) -{ - ACE_TCHAR *cp; - - if (src == 0) - return 0; - - // Start at the end and work backwards over all whitespace. - for (cp = src + ACE_OS_String::strlen (src) - 1; - cp != src; - --cp) - if (!ACE_OS_String::ace_isspace (*cp)) - break; - cp[1] = '\0'; // Chop trailing whitespace - - // Now start at the beginning and move over all whitespace. - for (cp = src; ACE_OS_String::ace_isspace (*cp); ++cp) - continue; - - return cp; -} diff --git a/ace/Configuration_Import_Export.h b/ace/Configuration_Import_Export.h deleted file mode 100644 index 921eba5f8c5..00000000000 --- a/ace/Configuration_Import_Export.h +++ /dev/null @@ -1,211 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Configuration_Import_Export.h - * - * $Id$ - * - * @author Jerry D. Odenwelder Jr. - * Chris Hafey - * - * Classes defined in this file provide the ability to import and export - * ACE Configuration objects to/from disk files. The base class - * ACE_Config_ImpExp_Base provides the common functionality and the derived - * classes implement the import/export functionality for the specific format. - * - * @todo - * - Add locking for thread safety. - * - Provide ability to read file in one format and write in another. - * - See todo's in each class - */ -//============================================================================= - -#ifndef ACE_CONFIGURATION_IMPORT_EXPORT_H -#define ACE_CONFIGURATION_IMPORT_EXPORT_H -#include "ace/pre.h" - -#include "ace/Configuration.h" -#include "ace/SString.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Config_ImpExp_Base - * - * @brief Base class for file import/export configuration. - * - * This class provides base functionality for configuration objects - * that are persisted in files. It takes an ACE_Configuration - * object that it populates with the data read. - * - */ -class ACE_Export ACE_Config_ImpExp_Base -{ -public: - /// Constructor taking the ACE_Configuration to import/export to - ACE_Config_ImpExp_Base (ACE_Configuration& config); - - /** - * Destructor - */ - virtual ~ACE_Config_ImpExp_Base (void); - - /** - * Imports the configuration database from @a filename. - * No existing data is removed. - */ - virtual int import_config (const ACE_TCHAR* filename) = 0; - - /** - * This method exports the entire configuration database to @a filename. - * Once the file is opened this method calls 'export_section' passing - * the root section. - */ - virtual int export_config (const ACE_TCHAR* filename) = 0; - -protected: - ACE_Configuration &config_; - -private: - ACE_Config_ImpExp_Base (const ACE_Config_ImpExp_Base&); - ACE_Config_ImpExp_Base& operator= (const ACE_Config_ImpExp_Base&); -}; - -/** - * @class ACE_Registry_ImpExp - * - * @brief Configuration object that imports/exports data to a file formatted - * using the Win32 Registry file export format. This format looks like - * [Section] - * "key"="String Data" - * "key"=dword: numeric data - * "key"=hex: binary data - * - * @todo - * - Add dynamic buffer when importing. currently it will not allow - * importing of values greater than a fixed ammount (4096 bytes) - * - */ -class ACE_Export ACE_Registry_ImpExp : public ACE_Config_ImpExp_Base -{ -public: - /// Construction - ACE_Registry_ImpExp (ACE_Configuration&); - - /// Destruction. - virtual ~ACE_Registry_ImpExp (void); - - /** - * Imports the configuration database from filename. - * No existing data is removed. - */ - virtual int import_config (const ACE_TCHAR* filename); - - /** - * This method exports the entire configuration database to @a filename. - * Once the file is opened this method calls export_section() passing - * the root section. - */ - virtual int export_config (const ACE_TCHAR* filename); - -private: - int export_section (const ACE_Configuration_Section_Key& section, - const ACE_TString& path, - FILE* out); - - int process_previous_line_format (ACE_TCHAR* buffer, - ACE_Configuration_Section_Key& section); - - ACE_Registry_ImpExp ( const ACE_Registry_ImpExp&); - ACE_Registry_ImpExp& operator= ( const ACE_Registry_ImpExp&); -}; - -/** - * @class ACE_Ini_ImpExp - * - * @brief Imports the configuration database from filename as strings. - * Allows non-typed values. (no #, dword: hex:, etc. prefixes) and - * skips whitespace (tabs and spaces) as in standard .ini and .conf - * files. Values (to right of equal sign) can be double quote - * delimited to embed tabs and spaces in the string. - * Caller must convert string to type. - * - * This method allows for lines in the .ini or .conf file like this: - * - * TimeToLive = 100 - * Delay = FALSE - * Flags = FF34 - * Heading = "ACE - Adaptive Communication Environment" - * - * (note leading whitespace (tabs) in examples below) - * - * SeekIndex = 14 - * TraceLevel = 6 # Can comment lines like this - * Justification = left_justified - * - * The caller can then retrieve the string with the regular - * function and convert the string to the - * desired data type. - * - * @todo - * - Strings with embedded newlines cause the import to fail - * - Strings with embedded quotes " cause the import to fail - * - Importing/exporting for values in the root section does not work - * - Add dynamic buffer when importing. currently it will not allow - * importing of values greater than a fixed ammount (4096 bytes) -*/ -class ACE_Export ACE_Ini_ImpExp : public ACE_Config_ImpExp_Base -{ -public: - /** - * Construction - */ - ACE_Ini_ImpExp (ACE_Configuration&); - - /** - * Destructor - */ - virtual ~ACE_Ini_ImpExp (void); - - /** - * Imports the configuration database from filename. - * No existing data is removed. - */ - virtual int import_config (const ACE_TCHAR* filename); - - /** - * This method exports the entire configuration database to @a filename. - * Once the file is opened this method calls export_section() passing - * the root section. - */ - virtual int export_config (const ACE_TCHAR* filename); - -private: - /** - * Method provided by derived classes in order to write one section - * to the file specified. Called by export_config() when exporting - * the entire configuration object. - */ - int export_section (const ACE_Configuration_Section_Key& section, - const ACE_TString& path, - FILE* out); - - /** - * Method to squish leading and trailing whitespaces in a string. - * Whitespace is defined as: spaces (' '), tabs ('\\t') or cr/lf. - * Returns a pointer to the first non-whitespace character in the - * buffer provided, or a pointer to the terminating null if the string - * is all whitespace. The terminating null is moved forward to the - * first character past the last non-whitespace. - */ - ACE_TCHAR *squish (ACE_TCHAR *src); - - ACE_Ini_ImpExp (const ACE_Ini_ImpExp&); - ACE_Ini_ImpExp& operator= (const ACE_Ini_ImpExp&); -}; - -#include "ace/post.h" -#endif /* ACE_CONFIGURATION_IMPORT_EXPORT_H */ diff --git a/ace/Connection_Recycling_Strategy.cpp b/ace/Connection_Recycling_Strategy.cpp deleted file mode 100644 index 351dde2ea52..00000000000 --- a/ace/Connection_Recycling_Strategy.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "ace/Connection_Recycling_Strategy.h" - - -ACE_RCSID(ace, Connection_Recycling_Strategy, "$Id$") - - -ACE_Connection_Recycling_Strategy::ACE_Connection_Recycling_Strategy (void) -{ -} - -ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void) -{ -} diff --git a/ace/Connection_Recycling_Strategy.h b/ace/Connection_Recycling_Strategy.h deleted file mode 100644 index 71a328e7d10..00000000000 --- a/ace/Connection_Recycling_Strategy.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Connection_Recycling_Strategy.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= -#ifndef ACE_CONNECTION_RECYCLING_STRATEGY_H -#define ACE_CONNECTION_RECYCLING_STRATEGY_H -#include "ace/pre.h" - -#include "ace/Recyclable.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - - - -/** - * @class ACE_Connection_Recycling_Strategy - * - * @brief Defines the interface for a connection recycler. - */ - -class ACE_Export ACE_Connection_Recycling_Strategy -{ -public: - /// Virtual Destructor - virtual ~ACE_Connection_Recycling_Strategy (void); - - /// Remove from cache. - virtual int purge (const void *recycling_act) = 0; - - /// Add to cache. - virtual int cache (const void *recycling_act) = 0; - - virtual int recycle_state (const void *recycling_act, - ACE_Recyclable_State new_state) = 0; - - /// Get/Set . - virtual ACE_Recyclable_State recycle_state (const void *recycling_act) const = 0; - - /// Mark as closed. - virtual int mark_as_closed (const void *recycling_act) = 0; - - /// Mark as closed.(non-locking version) - virtual int mark_as_closed_i (const void *recycling_act) = 0; - - /// Cleanup hint and reset <*act_holder> to zero if . - virtual int cleanup_hint (const void *recycling_act, - void **act_holder = 0) = 0; - -protected: - /// Default ctor. - ACE_Connection_Recycling_Strategy (void); -}; - - - -#include "ace/post.h" -#endif /*ACE_CONNECTION_RECYCLING_STRATEGY*/ diff --git a/ace/Connector.cpp b/ace/Connector.cpp deleted file mode 100644 index 52651212c74..00000000000 --- a/ace/Connector.cpp +++ /dev/null @@ -1,1079 +0,0 @@ -#ifndef ACE_CONNECTOR_CPP -#define ACE_CONNECTOR_CPP - -#include "ace/Connector.h" -#include "ace/Svc_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID (ace, - Connector, - "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Connector) - -template void -ACE_Connector::dump (void) const -{ - ACE_TRACE ("ACE_Connector::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nclosing_ = %d"), this->closing_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = %d"), this->flags_)); - this->handler_map_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// Bridge method for creating a SVC_HANDLER. The strategy for -// creating a SVC_HANDLER are configured into the Acceptor via it's -// . The default is to create a new SVC_HANDLER. -// However, subclasses can override this strategy to perform -// SVC_HANDLER creation in any way that they like (such as creating -// subclass instances of SVC_HANDLER, using a singleton, dynamically -// linking the handler, etc.). - -template int -ACE_Connector::make_svc_handler (SVC_HANDLER *&sh) -{ - ACE_TRACE ("ACE_Connector::make_svc_handler"); - - if (sh == 0) - ACE_NEW_RETURN (sh, - SVC_HANDLER, - -1); - - // Set the reactor of the newly created to the same - // reactor that this is using. - sh->reactor (this->reactor ()); - return 0; -} - -template int -ACE_Connector::activate_svc_handler (SVC_HANDLER *svc_handler) -{ - ACE_TRACE ("ACE_Connector::activate_svc_handler"); - // No errors initially - int error = 0; - - // See if we should enable non-blocking I/O on the 's - // peer. - if (ACE_BIT_ENABLED (this->flags_, ACE_NONBLOCK) != 0) - { - if (svc_handler->peer ().enable (ACE_NONBLOCK) == -1) - error = 1; - } - // Otherwise, make sure it's disabled by default. - else if (svc_handler->peer ().disable (ACE_NONBLOCK) == -1) - error = 1; - - // We are connected now, so try to open things up. - if (error || svc_handler->open ((void *) this) == -1) - { - // Make sure to close down the to avoid descriptor - // leaks. - svc_handler->close (0); - return -1; - } - else - return 0; -} - -template ACE_PEER_CONNECTOR & -ACE_Connector::connector (void) const -{ - return ACE_const_cast (ACE_PEER_CONNECTOR &, this->connector_); -} - -template int -ACE_Connector::connect_svc_handler ( - SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_Connector::connect_svc_handler"); - - return this->connector_.connect (svc_handler->peer (), - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms); -} - -template int -ACE_Connector::connect_svc_handler ( - SVC_HANDLER *&svc_handler, - SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_Connector::connect_svc_handler"); - - sh_copy = svc_handler; - return this->connector_.connect (svc_handler->peer (), - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms); -} - -template int -ACE_Connector::open (ACE_Reactor *r, int flags) -{ - ACE_TRACE ("ACE_Connector::open"); - this->reactor (r); - this->flags_ = flags; - this->closing_ = 0; - return 0; -} - -template -ACE_Connector::ACE_Connector (ACE_Reactor *r, int flags) - : handler_map_ (ACE_CONNECTOR_HANDLER_MAP_SIZE) - , connector_ () - , closing_ (0) - , flags_ (0) - , mutex_ () -{ - ACE_TRACE ("ACE_Connector::ACE_Connector"); - (void) this->open (r, flags); -} - -template -ACE_Svc_Tuple::ACE_Svc_Tuple ( - SVC_HANDLER *sh, - ACE_HANDLE handle, - const void *arg, - long id) - : svc_handler_ (sh), - handle_ (handle), - arg_ (arg), - cancellation_id_ (id), - refcount_ (1) -{ - ACE_TRACE ("ACE_Svc_Tuple::ACE_Svc_Tuple"); -} - -template -ACE_Svc_Tuple::~ACE_Svc_Tuple (void) -{ -} - -template SVC_HANDLER * -ACE_Svc_Tuple::svc_handler (void) -{ - ACE_TRACE ("ACE_Svc_Tuple::svc_handler"); - return this->svc_handler_; -} - -template const void * -ACE_Svc_Tuple::arg (void) -{ - ACE_TRACE ("ACE_Svc_Tuple::arg"); - return this->arg_; -} - -template void -ACE_Svc_Tuple::arg (const void *v) -{ - ACE_TRACE ("ACE_Svc_Tuple::arg"); - this->arg_ = v; -} - -template ACE_HANDLE -ACE_Svc_Tuple::handle (void) -{ - ACE_TRACE ("ACE_Svc_Tuple::handle"); - return this->handle_; -} - -template void -ACE_Svc_Tuple::handle (ACE_HANDLE h) -{ - ACE_TRACE ("ACE_Svc_Tuple::handle"); - this->handle_ = h; -} - -template long -ACE_Svc_Tuple::cancellation_id (void) -{ - ACE_TRACE ("ACE_Svc_Tuple::cancellation_id"); - return this->cancellation_id_; -} - -template void -ACE_Svc_Tuple::cancellation_id (long id) -{ - ACE_TRACE ("ACE_Svc_Tuple::cancellation_id"); - this->cancellation_id_ = id; -} - -template long -ACE_Svc_Tuple::incr_refcount (void) -{ - ACE_TRACE ("ACE_Svc_Tuple::incr_refcount"); - return ++this->refcount_; -} - -template long -ACE_Svc_Tuple::decr_refcount (void) -{ - ACE_TRACE ("ACE_Svc_Tuple::decr_refcount"); - if (--this->refcount_ > 0) - return this->refcount_; - - ACE_ASSERT (this->refcount_ == 0); - - delete this; - - return 0; -} - -template void -ACE_Svc_Tuple::dump (void) const -{ - ACE_TRACE ("ACE_Svc_Tuple::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("svc_handler_ = %x"), this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\narg_ = %x"), this->arg_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncancellation_id_ = %d"), this->cancellation_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// This method is called if a connection times out before completing. -// In this case, we call our cleanup_AST() method to cleanup the -// descriptor from the ACE_Connector's table. - -template int -ACE_Connector::handle_timeout ( - const ACE_Time_Value &tv, - const void *arg) -{ - ACE_TRACE ("ACE_Connector::handle_timeout"); - AST *ast = 0; - - if (this->cleanup_AST (((AST *) arg)->handle (), - ast) == -1) - { - // Matches the creation time refcount for AST, which is 1 - this->decr_ast_refcount ((AST *) arg); - return -1; - } - else - { - ACE_ASSERT (((AST *) arg) == ast); - - // We may need this seemingly unnecessary assignment to work - // around a bug with MSVC++? - SVC_HANDLER *sh = ast->svc_handler (); - - // Forward to the SVC_HANDLER the that was passed in as a - // magic cookie during ACE_Connector::connect(). This gives the - // SVC_HANDLER an opportunity to take corrective action (e.g., - // wait a few milliseconds and try to reconnect again. - int result = sh->handle_timeout (tv, ast->arg ()); - - // Matches the creation time refcount for AST, which is 1. - this->decr_ast_refcount (ast); - - if (result == -1) - sh->handle_close (sh->get_handle (), - ACE_Event_Handler::TIMER_MASK); - - return 0; - } -} - -template int -ACE_Connector::cleanup_AST ( - ACE_HANDLE handle, - ACE_Svc_Tuple *&ast) -{ - ACE_TRACE ("ACE_Connector::cleanup_AST"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, - ace_mon, - this->mutex_, - -1)); - - // Locate the ACE_Svc_Handler corresponding to the socket - // descriptor. - if (this->handler_map_.unbind (handle, ast) == -1) - { - // Error, entry not found in map. - errno = ENOENT; - return -1; - } - - // Matches incr_refcount () in create_AST () after registering - // with the map. - ast->decr_refcount (); - - // Try to remove from ACE_Timer_Queue but if it's not there we - // ignore the error. - if (this->reactor ()->cancel_timer (ast->cancellation_id ())) - { - // Matches incr_refcount () in create_AST () after registering - // the timer - ast->decr_refcount (); - } - - - ACE_Reactor_Mask m = - ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL; - - // Remove ACE_HANDLE from ACE_Reactor. - if (this->reactor ()->remove_handler (handle, m) == 0) - { - // Matches incr_refcount () in create_AST () after registering - // with the Reactor. - ast->decr_refcount (); - } - return 0; -} - -// Called when a failure occurs during asynchronous connection -// establishment. Simply delegate all work to this->handle_output(). - -template int -ACE_Connector::handle_input (ACE_HANDLE h) -{ - ACE_TRACE ("ACE_Connector::handle_input"); - AST *ast = 0; - - if (this->cleanup_AST (h, ast) != -1) - { - ACE_ASSERT (ast != 0); - ast->svc_handler ()->close (0); - - // Matches the creation time refcount for AST, which is 1 - this->decr_ast_refcount (ast); - } - - return 0; // Already removed from the ACE_Reactor. -} - -// Finalize a connection established in non-blocking mode. When a -// non-blocking connect *succeeds* the descriptor becomes enabled for -// writing... Likewise, it is generally the case that when a -// non-blocking connect *fails* the descriptor becomes enabled for -// reading. - -template int -ACE_Connector::handle_output (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Connector::handle_output"); - AST *ast = 0; - - if (this->cleanup_AST (handle, ast) == -1) - { - return 0; - } - ACE_ASSERT (ast != 0); // This shouldn't happen! - - // Try to find out if the reactor uses event associations for the - // handles it waits on. If so we need to reset it. - int reset_new_handle = this->reactor ()->uses_event_associations (); - - if (reset_new_handle) - this->connector_.reset_new_handle (handle); - - // Transfer ownership of the ACE_HANDLE to the SVC_HANDLER. - ast->svc_handler ()->set_handle (handle); - - ACE_PEER_CONNECTOR_ADDR raddr; - - // Check to see if we're connected. - if (ast->svc_handler ()->peer ().get_remote_addr (raddr) != -1) - this->activate_svc_handler (ast->svc_handler ()); - else // Somethings gone wrong, so close down... - { -#if defined (ACE_WIN32) - // ACE_DEBUG ((LM_DEBUG, "errno %d; Sleeping to retry get_remote_addr\n", errno)); - // Win32 (at least prior to Windows 2000) has a timing problem. - // If you check to see if the connection has completed too fast, - // it will fail - so wait 35 milliseconds to let it catch up. - ACE_Time_Value tv (0, ACE_NON_BLOCKING_BUG_DELAY); - ACE_OS::sleep (tv); - if (ast->svc_handler ()->peer ().get_remote_addr (raddr) != -1) - this->activate_svc_handler (ast->svc_handler ()); - else // do the svc handler close below... -#endif /* ACE_WIN32 */ - ast->svc_handler ()->close (0); - } - // Matches the creation time refcount for AST, which is 1 - this->decr_ast_refcount (ast); - return 0; -} - -template int -ACE_Connector::resume_handler (void) -{ - return ACE_Event_Handler::ACE_EVENT_HANDLER_NOT_RESUMED; -} - -template int -ACE_Connector::handle_exception (ACE_HANDLE h) -{ - ACE_TRACE ("ACE_Connector::handle_exception"); - - // On Win32, the except mask must also be set for asynchronous - // connects. - - return this->handle_output (h); -} - -// Initiate connection to peer. - -template int -ACE_Connector::connect ( - SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - const ACE_Synch_Options &synch_options, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - return this->connect_i (sh, - 0, - remote_addr, - synch_options, - local_addr, - reuse_addr, - flags, - perms); -} - -template int -ACE_Connector::connect ( - SVC_HANDLER *&sh, - SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - const ACE_Synch_Options &synch_options, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - return this->connect_i (sh, - &sh_copy, - remote_addr, - synch_options, - local_addr, - reuse_addr, - flags, - perms); -} - -template int -ACE_Connector::connect_i ( - SVC_HANDLER *&sh, - SVC_HANDLER **sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - const ACE_Synch_Options &synch_options, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_Connector::connect_i"); - - // If the user hasn't supplied us with a we'll use the - // factory method to create one. Otherwise, things will remain as - // they are... - if (this->make_svc_handler (sh) == -1) - return -1; - - ACE_Time_Value *timeout; - int use_reactor = synch_options[ACE_Synch_Options::USE_REACTOR]; - - if (use_reactor) - timeout = (ACE_Time_Value *) &ACE_Time_Value::zero; - else - timeout = (ACE_Time_Value *) synch_options.time_value (); - - int result; - if (sh_copy == 0) - result = this->connect_svc_handler (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms); - else - result = this->connect_svc_handler (sh, - *sh_copy, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms); - - // Delegate to connection strategy. - if (result == -1) - { - if (use_reactor && errno == EWOULDBLOCK) - { - // If the connection hasn't completed and we are using - // non-blocking semantics then register ourselves with the - // ACE_Reactor so that it will call us back when the - // connection is complete or we timeout, whichever comes - // first... - int result; - - if (sh_copy == 0) - result = this->create_AST (sh, synch_options); - else - result = this->create_AST (*sh_copy, synch_options); - - // If for some reason the call failed, then - // will be set to the new error. If the call - // succeeds, however, we need to make sure that - // remains set to . - if (result == 0) - errno = EWOULDBLOCK; - } - else - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - // Make sure to close down the service handler to avoid - // handle leaks. - if (sh_copy == 0) - { - if (sh) - sh->close (0); - } - else if (*sh_copy) - (*sh_copy)->close (0); - } - return -1; - } - else - // Activate immediately if we are connected. - return this->activate_svc_handler (sh); -} - -// Initiate connection to peer. - -template int -ACE_Connector::connect_n ( - size_t n, - SVC_HANDLER *sh[], - ACE_PEER_CONNECTOR_ADDR remote_addrs[], - ACE_TCHAR *failed_svc_handlers, - const ACE_Synch_Options &synch_options) -{ - int result = 0; - - for (size_t i = 0; i < n; i++) - { - if (this->connect (sh[i], remote_addrs[i], synch_options) == -1 - && !(synch_options[ACE_Synch_Options::USE_REACTOR] - && errno == EWOULDBLOCK)) - { - result = -1; - if (failed_svc_handlers != 0) - // Mark this entry as having failed. - failed_svc_handlers[i] = 1; - } - else if (failed_svc_handlers != 0) - // Mark this entry as having succeeded. - failed_svc_handlers[i] = 0; - } - - return result; -} - -// Cancel a that was started asynchronously. -template int -ACE_Connector::cancel (SVC_HANDLER *sh) -{ - ACE_TRACE ("ACE_Connector::cancel"); - MAP_ITERATOR mi (this->handler_map_); - - for (MAP_ENTRY *me = 0; - mi.next (me) != 0; - mi.advance ()) - if (me->int_id_->svc_handler () == sh) - { - AST *ast = 0; - - if (this->cleanup_AST (me->ext_id_, ast) != -1) - this->decr_ast_refcount (ast); - - return 0; - } - - return -1; -} - -// Register the pending SVC_HANDLER with the map so that it can be -// activated later on when the connection complets. - -template int -ACE_Connector::create_AST ( - SVC_HANDLER *sh, - const ACE_Synch_Options &synch_options) -{ - ACE_TRACE ("ACE_Connector::create_AST"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, - ace_mon, - this->mutex_, - -1)); - - ACE_HANDLE handle = sh->get_handle (); - AST *ast; - - // AST is created with a refcount - ACE_NEW_RETURN (ast, - AST (sh, - handle, - synch_options.arg (), -1), - -1); - - // Register this with the reactor for connection events. - ACE_Reactor_Mask mask = ACE_Event_Handler::CONNECT_MASK; - - // Bind ACE_Svc_Tuple with the ACE_HANDLE we're trying to connect. - if (this->handler_map_.bind (handle, ast) == -1) - goto fail1; - - // Increment the refcount of the AST to indicate registration with - // the map. - ast->incr_refcount (); - - if (this->reactor ()->register_handler (handle, - this, - mask) == -1) - goto fail2; - - // Increment the refcount of the AST. This increment is for access - // from the Reactor. Though we register with the Reactor, - // every dispatch from the Reactor actually looks for and - // hence the refcount increment. - (void) ast->incr_refcount (); - - { - // If we're starting connection under timer control then we need to - // schedule a timeout with the ACE_Reactor. - ACE_Time_Value *tv = - ACE_const_cast (ACE_Time_Value *, - synch_options.time_value ()); - if (tv != 0) - { - int cancellation_id = - this->reactor ()->schedule_timer - (this, - (const void *) ast, - *tv); - if (cancellation_id == -1) - goto fail3; - - // Increment the refcount of the AST. This increment is for access - // from the timer queue. The same argument used for Rector - // registration holds true here too. - (void) ast->incr_refcount (); - - ast->cancellation_id (cancellation_id); - return 0; - } - } - return 0; // Ok, everything worked just fine... - - // Undo previous actions using the ol' "goto label and fallthru" - // trick... -fail3: - this->reactor ()->remove_handler - (this, mask | ACE_Event_Handler::DONT_CALL); - /* FALLTHRU */ -fail2: - this->handler_map_.unbind (handle); - /* FALLTHRU */ -fail1: - - // Close the svc_handler - sh->close (0); - - ast->decr_refcount (); - return -1; -} - -// Terminate the Client ACE_Connector by iterating over any -// unconnected ACE_Svc_Handler's and removing them from the -// ACE_Reactor. Note that we can't call handle_close() back at this -// point since we own these things and we'll just get called -// recursively! - -template int -ACE_Connector::close (void) -{ - ACE_TRACE ("ACE_Connector::close"); - return this->handle_close (); -} - -template int -ACE_Connector::handle_close (ACE_HANDLE, ACE_Reactor_Mask) -{ - ACE_TRACE ("ACE_Connector::handle_close"); - - if (this->reactor () != 0 && this->closing_ == 0) - { - // We're closing down now, so make sure not to call ourselves - // recursively via other calls to handle_close() (e.g., from the - // Timer_Queue). - this->closing_ = 1; - - for (;;) - { - // Create an iterator. - MAP_ITERATOR iterator = this->handler_map_.begin (); - - // If we reach the end of the map, break the loop. - if (iterator == this->handler_map_.end ()) - break; - - // Get the first handle. - ACE_HANDLE handle = (*iterator).ext_id_; - - // Clean it up. - AST *ast = 0; - int r = this->cleanup_AST (handle, ast); - - // Close the svc_handler. - if (r != -1) - { - ACE_ASSERT (ast != 0); - ast->svc_handler ()->close (0); - - // Zap the ast. - this->decr_ast_refcount (ast); - } - - - } - } - - return 0; -} - -template int -ACE_Connector::fini (void) -{ - ACE_TRACE ("ACE_Connector::fini"); - - // Make sure to call close here since our destructor might not be - // called if we're being dynamically linked via the svc.conf. - this->handler_map_.close (); - - // Make sure we call our handle_close(), not a subclass's! - return ACE_Connector::handle_close (); -} - -// Hook called by the explicit dynamic linking facility. - -template int -ACE_Connector::init (int, ACE_TCHAR *[]) -{ - ACE_TRACE ("ACE_Connector::init"); - return -1; -} - -template int -ACE_Connector::suspend (void) -{ - ACE_TRACE ("ACE_Connector::suspend"); - return -1; -} - -template int -ACE_Connector::resume (void) -{ - ACE_TRACE ("ACE_Connector::resume"); - return -1; -} - -template int -ACE_Connector::info (ACE_TCHAR **strp, size_t length) const -{ - ACE_TRACE ("ACE_Connector::info"); - ACE_TCHAR buf[BUFSIZ]; - - ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t %s"), - ACE_LIB_TEXT ("ACE_Connector"), - ACE_LIB_TEXT ("# connector factory\n")); - - if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) - return -1; - else - ACE_OS::strsncpy (*strp, buf, length); - return ACE_static_cast (int, ACE_OS::strlen (buf)); -} - -template -ACE_Connector::~ACE_Connector (void) -{ - ACE_TRACE ("ACE_Connector::~ACE_Connector"); - // We will call our handle_close(), not a subclass's, due to the way - // that C++ destructors work. - this->handle_close (); -} - -template long -ACE_Connector::incr_ast_refcount ( - ACE_Svc_Tuple *ast) -{ - ACE_TRACE ("ACE_Connector::incr_ast_refcount"); - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, - ace_mon, - this->mutex_, - -1)); - - return ast->incr_refcount (); -} - -template long -ACE_Connector::decr_ast_refcount ( - ACE_Svc_Tuple *ast) -{ - ACE_TRACE ("ACE_Connector::decr_ast_refcount"); - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, - ace_mon, - this->mutex_, - -1)); - - return ast->decr_refcount (); -} - -/***********************************************************/ -template int -ACE_Strategy_Connector::open (ACE_Reactor *r, int flags) -{ - ACE_TRACE ("ACE_Strategy_Connector::open"); - return this->open (r, 0, 0, 0, flags); -} - -template int -ACE_Strategy_Connector::open - (ACE_Reactor *r, - ACE_Creation_Strategy *cre_s, - ACE_Connect_Strategy *conn_s, - ACE_Concurrency_Strategy *con_s, - int flags) -{ - ACE_TRACE ("ACE_Strategy_Connector::open"); - - this->reactor (r); - - // @@ Not implemented yet. - // this->flags_ = flags; - ACE_UNUSED_ARG (flags); - - // Initialize the creation strategy. - - // First we decide if we need to clean up. - if (this->creation_strategy_ != 0 && - this->delete_creation_strategy_ != 0 && - cre_s != 0) - { - delete this->creation_strategy_; - this->creation_strategy_ = 0; - this->delete_creation_strategy_ = 0; - } - - if (cre_s != 0) - this->creation_strategy_ = cre_s; - else if (this->creation_strategy_ == 0) - { - ACE_NEW_RETURN (this->creation_strategy_, - CREATION_STRATEGY, - -1); - this->delete_creation_strategy_ = 1; - } - - - // Initialize the accept strategy. - - if (this->connect_strategy_ != 0 && - this->delete_connect_strategy_ != 0 && - conn_s != 0) - { - delete this->connect_strategy_; - this->connect_strategy_ = 0; - this->delete_connect_strategy_ = 0; - } - - if (conn_s != 0) - this->connect_strategy_ = conn_s; - else if (this->connect_strategy_ == 0) - { - ACE_NEW_RETURN (this->connect_strategy_, - CONNECT_STRATEGY, - -1); - this->delete_connect_strategy_ = 1; - } - - // Initialize the concurrency strategy. - - if (this->concurrency_strategy_ != 0 && - this->delete_concurrency_strategy_ != 0 && - con_s != 0) - { - delete this->concurrency_strategy_; - this->concurrency_strategy_ = 0; - this->delete_concurrency_strategy_ = 0; - } - - if (con_s != 0) - this->concurrency_strategy_ = con_s; - else if (this->concurrency_strategy_ == 0) - { - ACE_NEW_RETURN (this->concurrency_strategy_, - CONCURRENCY_STRATEGY, - -1); - this->delete_concurrency_strategy_ = 1; - } - - return 0; -} - -template -ACE_Strategy_Connector::ACE_Strategy_Connector - (ACE_Reactor *reactor, - ACE_Creation_Strategy *cre_s, - ACE_Connect_Strategy *conn_s, - ACE_Concurrency_Strategy *con_s, - int flags) - : creation_strategy_ (0), - delete_creation_strategy_ (0), - connect_strategy_ (0), - delete_connect_strategy_ (0), - concurrency_strategy_ (0), - delete_concurrency_strategy_ (0) -{ - ACE_TRACE ("ACE_Connector::ACE_Strategy_Connector"); - - if (this->open (reactor, cre_s, conn_s, con_s, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector"))); -} - -template -ACE_Strategy_Connector::~ACE_Strategy_Connector (void) -{ - ACE_TRACE ("ACE_Strategy_Connector::~ACE_Strategy_Connector"); - - // Close down - this->close (); -} - -template int -ACE_Strategy_Connector::close (void) -{ - if (this->delete_creation_strategy_) - delete this->creation_strategy_; - this->delete_creation_strategy_ = 0; - this->creation_strategy_ = 0; - - if (this->delete_connect_strategy_) - delete this->connect_strategy_; - this->delete_connect_strategy_ = 0; - this->connect_strategy_ = 0; - - if (this->delete_concurrency_strategy_) - delete this->concurrency_strategy_; - this->delete_concurrency_strategy_ = 0; - this->concurrency_strategy_ = 0; - - return SUPER::close (); -} - -template int -ACE_Strategy_Connector::make_svc_handler (SVC_HANDLER *&sh) -{ - return this->creation_strategy_->make_svc_handler (sh); -} - -template int -ACE_Strategy_Connector::connect_svc_handler - (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - return this->connect_strategy_->connect_svc_handler (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms); -} - -template int -ACE_Strategy_Connector::connect_svc_handler - (SVC_HANDLER *&sh, - SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - return this->connect_strategy_->connect_svc_handler (sh, - sh_copy, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms); -} - -template int -ACE_Strategy_Connector::activate_svc_handler (SVC_HANDLER *svc_handler) -{ - return this->concurrency_strategy_->activate_svc_handler (svc_handler, this); -} - -template ACE_Creation_Strategy * -ACE_Strategy_Connector::creation_strategy (void) const -{ - return this->creation_strategy_; -} - -template ACE_Connect_Strategy * -ACE_Strategy_Connector::connect_strategy (void) const -{ - return this->connect_strategy_; -} - -template ACE_Concurrency_Strategy * -ACE_Strategy_Connector::concurrency_strategy (void) const -{ - return this->concurrency_strategy_; -} - -#endif /* ACE_CONNECTOR_C */ diff --git a/ace/Connector.h b/ace/Connector.h deleted file mode 100644 index 8fd528e383a..00000000000 --- a/ace/Connector.h +++ /dev/null @@ -1,583 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Connector.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_CONNECTOR_H -#define ACE_CONNECTOR_H - -#include "ace/pre.h" - -#include "ace/Service_Object.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Map_Manager.h" -#include "ace/Strategies_T.h" -#include "ace/Synch_Options.h" - - -/** - * @class ACE_Svc_Tuple - * - * @brief Holds the ACE_Svc_Handler and its argument and - * until an asynchronous connection completes. - * - * This is a no-brainer... - */ -template -class ACE_Svc_Tuple -{ -public: - - // = Initialization methods. - ACE_Svc_Tuple (SVC_HANDLER *, - ACE_HANDLE, - const void * = 0, - long timer_id = -1); - - /// Get SVC_HANDLER. - SVC_HANDLER *svc_handler (void); - - // = Get/set handle. - /// Get handle. - ACE_HANDLE handle (void); - - /// Set handle. - void handle (ACE_HANDLE); - - // = Get/set argument. - /// Get argument. - const void *arg (void); - - /// Set argument. - void arg (const void *); - - // = Set/get timer cancellation handle. - /// Get cancellation id. - long cancellation_id (void); - - /// Set cancellation id. - void cancellation_id (long timer_id); - - /// Increment and decrement refcount within the context of the lock - /// on the ACE_Connector - long incr_refcount (void); - - long decr_refcount (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Prevent direct deletion - ~ACE_Svc_Tuple (void); - -private: - /// Associated SVC_HANDLER. - SVC_HANDLER *svc_handler_; - - /// IPC that we are trying to connect. - ACE_HANDLE handle_; - - /// Associated argument. - const void *arg_; - - /// Associated cancellation id. - long cancellation_id_; - - /// Reference count manipulated within the context of the connector - /// lock. - /// @@ TODO: Things will change after 5.3 goes out of the way. - long refcount_; -}; - -/** - * @class ACE_Connector - * - * @brief Generic factory for actively connecting clients and creating - * service handlers (SVC_HANDLERs). - * - * Implements the strategy for actively establishing connections - * with clients. An ACE_Connector is parameterized by concrete - * types that conform to the interfaces of PEER_CONNECTOR and - * SVC_HANDLER. The PEER_CONNECTOR is instantiated with a - * transport mechanism that passively establishes connections. - * The SVC_HANDLER is instantiated with a concrete type that - * performs the application-specific service. An ACE_Connector - * inherits from ACE_Service_Object, which in turn inherits from - * ACE_Event_Handler. This enables the ACE_Reactor to dispatch - * the ACE_Connector's handle_output method when connections - * complete asynchronously. The handle_output method performs - * the connector's active connection establishment and service - * activation strategy. - */ -template -class ACE_Connector : public ACE_Service_Object -{ -public: - - // Useful STL-style traits. - typedef ACE_TYPENAME SVC_HANDLER::addr_type addr_type; - typedef ACE_PEER_CONNECTOR connector_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - - - // typedef ACE_TYPENAME ACE_PEER_CONNECTOR_ADDR PEER_ADDR; -#if defined (ACE_HAS_TYPENAME_KEYWORD) - typedef ACE_PEER_CONNECTOR_ADDR ACE_PEER_ADDR_TYPEDEF; -#endif /* ACE_HAS_TYPENAME_KEYWORD */ - - typedef ACE_TYPENAME _ACE_PEER_CONNECTOR::PEER_ADDR - ACE_TYPENAME_ACE_PEER_CONNECTOR_PEER_ADDR; - - /** - * Initialize a connector. @a flags indicates how 's - * should be initialized prior to being activated. Right now, the - * only flag that is processed is , which enabled - * non-blocking I/O on the when it is opened. - */ - ACE_Connector (ACE_Reactor *r = ACE_Reactor::instance (), - int flags = 0); - - /** - * Initialize a connector. @a flags indicates how 's - * should be initialized prior to being activated. Right now, the - * only flag that is processed is , which enabled - * non-blocking I/O on the when it is opened. - */ - virtual int open (ACE_Reactor *r = ACE_Reactor::instance (), - int flags = 0); - - /// Shutdown a connector and release resources. - virtual ~ACE_Connector (void); - - // = Connection establishment methods. - - /** - * Initiate connection of to peer at - * using . If the caller wants to designate the - * selected they can (and can also insist that the - * be reused by passing a value == - * 1). and can be used to pass any flags that are - * needed to perform specific operations such as opening a file - * within connect with certain permissions. If the connection fails - * the hook on the will be called - * automatically to prevent resource leaks. - */ - virtual int connect (SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, - const ACE_PEER_CONNECTOR_ADDR &local_addr - = (ACE_TYPENAME_ACE_PEER_CONNECTOR_PEER_ADDR &) ACE_PEER_CONNECTOR_ADDR_ANY, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); - - /** - * This is a variation on the previous method. On cached - * connectors the variable can be used as a hint - * for future lookups. Since this variable is modified in the - * context of the internal cache its use is thread-safe. But the - * actual svc_handler for the current connection is returned in the - * second parameter . If the connection fails the - * hook on the will be called automatically to - * prevent resource leaks. - */ - virtual int connect (SVC_HANDLER *&svc_handler_hint, - SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, - const ACE_PEER_CONNECTOR_ADDR &local_addr - = (ACE_TYPENAME_ACE_PEER_CONNECTOR_PEER_ADDR &) ACE_PEER_CONNECTOR_ADDR_ANY, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); - - /** - * Initiate connection of to peers at - * using . Returns -1 if failure - * occurs and 0 otherwise. If is non-NULL, a - * 1 is placed in the corresponding index of - * for each that failed to connect, else a 0 is - * placed in that index. - */ - virtual int connect_n (size_t n, - SVC_HANDLER *svc_handlers[], - ACE_PEER_CONNECTOR_ADDR remote_addrs[], - ACE_TCHAR *failed_svc_handlers = 0, - const ACE_Synch_Options &synch_options = - ACE_Synch_Options::defaults); - - /** - * Cancel a that was started asynchronously. Note that - * this is the only case when the Connector does not actively close - * the . It is left up to the caller of to - * decide the fate of the . - */ - virtual int cancel (SVC_HANDLER *svc_handler); - - /// Close down the Connector - virtual int close (void); - - /// Return the underlying PEER_CONNECTOR object. - virtual ACE_PEER_CONNECTOR &connector (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - // = Helpful typedefs. - - typedef ACE_Svc_Tuple - AST; - - typedef ACE_Map_Manager *, ACE_SYNCH_RW_MUTEX> - MAP_MANAGER; - typedef ACE_Map_Iterator *, ACE_SYNCH_RW_MUTEX> - MAP_ITERATOR; - typedef ACE_Map_Entry *> - MAP_ENTRY; - - // = The following two methods define the Connector's strategies for - // creating, connecting, and activating SVC_HANDLER's, respectively. - - /** - * Bridge method for creating a SVC_HANDLER. The default is to - * create a new SVC_HANDLER only if == 0, else is - * unchanged. However, subclasses can override this policy to - * perform SVC_HANDLER creation in any way that they like (such as - * creating subclass instances of SVC_HANDLER, using a singleton, - * dynamically linking the handler, etc.). Returns -1 if failure, - * else 0. - */ - virtual int make_svc_handler (SVC_HANDLER *&sh); - - /** - * Bridge method for connecting the to the - * . The default behavior delegates to the - * . - */ - virtual int connect_svc_handler (SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - virtual int connect_svc_handler (SVC_HANDLER *&svc_handler, - SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - - /** - * Bridge method for activating a with the appropriate - * concurrency strategy. The default behavior of this method is to - * activate the SVC_HANDLER by calling its method (which - * allows the SVC_HANDLER to define its own concurrency strategy). - * However, subclasses can override this strategy to do more - * sophisticated concurrency activations (such as creating the - * SVC_HANDLER as an "active object" via multi-threading or - * multi-processing). - */ - virtual int activate_svc_handler (SVC_HANDLER *svc_handler); - - /// Called by ACE_Reactor when asynchronous connections fail. - virtual int handle_input (ACE_HANDLE); - - /// Called by ACE_Reactor when asynchronous connections succeed. - virtual int handle_output (ACE_HANDLE); - - virtual int resume_handler (void); - - /// Called by ACE_Reactor when asynchronous connections complete (on - /// some platforms only). - virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE); - - // = Dynamic linking hooks. - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int init (int argc, ACE_TCHAR *argv[]); - - /// Calls to shutdown the Connector gracefully. - virtual int fini (void); - - /// Default version returns address info in . - virtual int info (ACE_TCHAR **, size_t) const; - - // = Demultiplexing hooks. - /** - * Terminate the Client ACE_Connector by iterating over any - * unconnected ACE_Svc_Handler's and removing them from the - * ACE_Reactor. - */ - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - - /// This method is called if a connection times out before - /// completing. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - - // = Service management hooks. - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int suspend (void); - - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int resume (void); - - /// Creates and inserts an ACE_Svc_Tuple into the . - /// so that we can continue accepting this connection asynchronously. - int create_AST (SVC_HANDLER *, - const ACE_Synch_Options &); - - /// Cleanup the and returns the appropriate - /// ACE_Svc_Tuple (which is 0 if there is no associated tuple). - int cleanup_AST (ACE_HANDLE handle, AST *&ast); - - /// Implementation the methods. - virtual int connect_i (SVC_HANDLER *&svc_handler, - SVC_HANDLER **sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - const ACE_Synch_Options &synch_options, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - - - /// Helper method for manipulating the refcount on AST. It holds the - /// lock before manipulating the refcount on AST. - /// @@ TODO: Needs to be out after 5.3 - long incr_ast_refcount (AST *ast); - long decr_ast_refcount (AST *ast); - - /// Lookup table that maps an I/O handle to a SVC_HANDLER *. - MAP_MANAGER handler_map_; -private: - /// This is the concrete connector factory (it keeps no state so the - /// is reentrant). - ACE_PEER_CONNECTOR connector_; - - /// Keeps track of whether we are in the process of closing (required - /// to avoid circular calls to ). - char closing_; - - /** - * Flags that indicate how 's should be initialized - * prior to being activated. Right now, the only flag that is - * processed is , which enabled non-blocking I/O on - * the when it is opened. - */ - int flags_; - - /// Lock to synchronize access to the internal state of the - /// connector. - /// @@TODO: This needs to go after 1.3 - ACE_SYNCH_MUTEX mutex_; -}; - -/** - * @class ACE_Strategy_Connector - * - * @brief Abstract factory for creating a service handler - * (SVC_HANDLER), connecting the SVC_HANDLER, and activating the - * SVC_HANDLER. - * - * Implements a flexible and extensible set of strategies for - * actively establishing connections with clients. There are - * three main strategies: (1) creating a SVC_HANDLER, (2) - * actively initiating a new connection from the client, - * and (3) activating the SVC_HANDLER with a - * particular concurrency mechanism after the connection is established. - */ -template -class ACE_Strategy_Connector - : public ACE_Connector -{ -public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy - creation_strategy_type; - typedef ACE_Connect_Strategy - connect_strategy_type; - typedef ACE_Concurrency_Strategy - concurrency_strategy_type; - typedef ACE_Connector - base_type; - - // = Define some useful (old style) traits. - typedef ACE_Creation_Strategy - CREATION_STRATEGY; - typedef ACE_Connect_Strategy - CONNECT_STRATEGY; - typedef ACE_Concurrency_Strategy - CONCURRENCY_STRATEGY; - typedef ACE_Connector - SUPER; - - /** - * Initialize a connector. indicates how 's - * should be initialized prior to being activated. Right now, the - * only flag that is processed is , which enabled - * non-blocking I/O on the when it is opened. - */ - ACE_Strategy_Connector (ACE_Reactor *r = ACE_Reactor::instance (), - ACE_Creation_Strategy * = 0, - ACE_Connect_Strategy * = 0, - ACE_Concurrency_Strategy * = 0, - int flags = 0); - - /** - * Initialize a connector. indicates how 's - * should be initialized prior to being activated. Right now, the - * only flag that is processed is , which enabled - * non-blocking I/O on the when it is opened. - * Default strategies would be created and used. - */ - virtual int open (ACE_Reactor *r, - int flags); - - /** - * Initialize a connector. indicates how 's - * should be initialized prior to being activated. Right now, the - * only flag that is processed is , which enabled - * non-blocking I/O on the when it is opened. - */ - virtual int open (ACE_Reactor *r = ACE_Reactor::instance (), - ACE_Creation_Strategy * = 0, - ACE_Connect_Strategy * = 0, - ACE_Concurrency_Strategy * = 0, - int flags = 0); - - /// Shutdown a connector and release resources. - virtual ~ACE_Strategy_Connector (void); - - /// Close down the Connector - virtual int close (void); - - // = Strategies accessors - virtual ACE_Creation_Strategy *creation_strategy (void) const; - virtual ACE_Connect_Strategy *connect_strategy (void) const; - virtual ACE_Concurrency_Strategy *concurrency_strategy (void) const; - -protected: - // = The following three methods define the 's strategies - // for creating, connecting, and activating 's, - // respectively. - - /** - * Bridge method for creating a . The strategy for - * creating a are configured into the Connector via - * it's . The default is to create a new - * only if == 0, else is unchanged. - * However, subclasses can override this policy to perform - * creation in any way that they like (such as - * creating subclass instances of , using a singleton, - * dynamically linking the handler, etc.). Returns -1 if failure, - * else 0. - */ - virtual int make_svc_handler (SVC_HANDLER *&sh); - - /** - * Bridge method for connecting the new connection into the - * . The default behavior delegates to the - * in the . - */ - virtual int connect_svc_handler (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - - /** - * Bridge method for connecting the new connection into the - * . The default behavior delegates to the - * in the . - * is used to obtain a copy of the pointer, but that - * can be kept in the stack; the motivation is a bit too long to - * include here, but basically we want to modify safely, using - * the internal locks in the Connect_Strategy, while saving a TSS - * copy in , usually located in the stack. - */ - virtual int connect_svc_handler (SVC_HANDLER *&sh, - SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - - /** - * Bridge method for activating a with the appropriate - * concurrency strategy. The default behavior of this method is to - * activate the by calling its method (which - * allows the to define its own concurrency strategy). - * However, subclasses can override this strategy to do more - * sophisticated concurrency activations (such as creating the - * as an "active object" via multi-threading or - * multi-processing). - */ - virtual int activate_svc_handler (SVC_HANDLER *svc_handler); - - // = Strategy objects. - - /// Creation strategy for an . - CREATION_STRATEGY *creation_strategy_; - - /// 1 if created the creation strategy and thus should - /// delete it, else 0. - int delete_creation_strategy_; - - /// Connect strategy for a . - CONNECT_STRATEGY *connect_strategy_; - - /// 1 if created the connect strategy and thus should - /// delete it, else 0. - int delete_connect_strategy_; - - /// Concurrency strategy for an . - CONCURRENCY_STRATEGY *concurrency_strategy_; - - /// 1 if created the concurrency strategy and thus should - /// delete it, else 0. - int delete_concurrency_strategy_; -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Connector.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_CONNECTOR_H */ diff --git a/ace/Containers.cpp b/ace/Containers.cpp deleted file mode 100644 index 2d6815e3c35..00000000000 --- a/ace/Containers.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -#include "ace/Containers.h" - -ACE_RCSID (ace, - Containers, - "$Id$") - -#if !defined (__ACE_INLINE__) -#include "ace/Containers.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Double_Linked_List; -template class ACE_Double_Linked_List_Iterator_Base; -template class ACE_Double_Linked_List_Iterator; -template class ACE_Double_Linked_List_Reverse_Iterator; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Double_Linked_List -#pragma instantiate ACE_Double_Linked_List_Iterator_Base -#pragma instantiate ACE_Double_Linked_List_Iterator -#pragma instantiate ACE_Double_Linked_List_Reverse_Iterator -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/ace/Containers.h b/ace/Containers.h deleted file mode 100644 index 512df2cc55d..00000000000 --- a/ace/Containers.h +++ /dev/null @@ -1,73 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Containers.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_CONTAINERS_H -#define ACE_CONTAINERS_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -template -class ACE_Double_Linked_List; - -template -class ACE_Double_Linked_List_Iterator_Base; -template -class ACE_Double_Linked_List_Iterator; -template -class ACE_Double_Linked_List_Reverse_Iterator; - -/** - * @class ACE_DLList_Node - * - * @brief Base implementation of element in a DL list. Needed for - * ACE_Double_Linked_List. - */ -class ACE_Export ACE_DLList_Node -{ -public: - friend class ACE_Double_Linked_List; - friend class ACE_Double_Linked_List_Iterator_Base; - friend class ACE_Double_Linked_List_Iterator; - friend class ACE_Double_Linked_List_Reverse_Iterator; - - ACE_DLList_Node (void *&i, - ACE_DLList_Node *n = 0, - ACE_DLList_Node *p = 0); - ~ACE_DLList_Node (void); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - void *item_; - - ACE_DLList_Node *next_; - ACE_DLList_Node *prev_; - -protected: - ACE_DLList_Node (void); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Containers.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/Containers_T.h" - -#include "ace/post.h" - -#endif /* ACE_CONTAINERS_H */ diff --git a/ace/Containers.i b/ace/Containers.i deleted file mode 100644 index 1312f2a47a6..00000000000 --- a/ace/Containers.i +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_DLList_Node::ACE_DLList_Node (void) - : item_ (0), - next_ (0), - prev_ (0) -{ -} - -ACE_INLINE -ACE_DLList_Node::ACE_DLList_Node (void *&i, - ACE_DLList_Node *n, - ACE_DLList_Node *p) - : item_ (i), - next_ (n), - prev_ (p) -{ -} - -ACE_INLINE -ACE_DLList_Node::~ACE_DLList_Node (void) -{ -} diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp deleted file mode 100644 index 94f79ea66bc..00000000000 --- a/ace/Containers_T.cpp +++ /dev/null @@ -1,1878 +0,0 @@ -// $Id$ - -#ifndef ACE_CONTAINERS_T_C -#define ACE_CONTAINERS_T_C - -#include "ace/Log_Msg.h" -#include "ace/Malloc_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Containers.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Containers_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Containers_T, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Stack) - -template void -ACE_Bounded_Stack::dump (void) const -{ - ACE_TRACE ("ACE_Bounded_Stack::dump"); -} - -template -ACE_Bounded_Stack::ACE_Bounded_Stack (size_t size) - : size_ (size), - top_ (0) -{ - ACE_NEW (this->stack_, - T[size]); - ACE_TRACE ("ACE_Bounded_Stack::ACE_Bounded_Stack"); -} - -template -ACE_Bounded_Stack::ACE_Bounded_Stack (const ACE_Bounded_Stack &s) - : size_ (s.size_), - top_ (s.top_) -{ - ACE_NEW (this->stack_, - T[s.size_]); - - ACE_TRACE ("ACE_Bounded_Stack::ACE_Bounded_Stack"); - - for (size_t i = 0; i < this->top_; i++) - this->stack_[i] = s.stack_[i]; -} - -template void -ACE_Bounded_Stack::operator= (const ACE_Bounded_Stack &s) -{ - ACE_TRACE ("ACE_Bounded_Stack::operator="); - - if (&s != this) - { - if (this->size_ < s.size_) - { - delete [] this->stack_; - ACE_NEW (this->stack_, - T[s.size_]); - this->size_ = s.size_; - } - this->top_ = s.top_; - - for (size_t i = 0; i < this->top_; i++) - this->stack_[i] = s.stack_[i]; - } -} - -template -ACE_Bounded_Stack::~ACE_Bounded_Stack (void) -{ - ACE_TRACE ("ACE_Bounded_Stack::~ACE_Bounded_Stack"); - delete [] this->stack_; -} - -// ---------------------------------------- - -ACE_ALLOC_HOOK_DEFINE(ACE_Fixed_Stack) - -template void -ACE_Fixed_Stack::dump (void) const -{ - ACE_TRACE ("ACE_Fixed_Stack::dump"); -} - -template -ACE_Fixed_Stack::ACE_Fixed_Stack (void) - : size_ (ACE_SIZE), - top_ (0) -{ - ACE_TRACE ("ACE_Fixed_Stack::ACE_Fixed_Stack"); -} - -template -ACE_Fixed_Stack::ACE_Fixed_Stack (const ACE_Fixed_Stack &s) - : size_ (s.size_), - top_ (s.top_) -{ - ACE_TRACE ("ACE_Fixed_Stack::ACE_Fixed_Stack"); - for (size_t i = 0; i < this->top_; i++) - this->stack_[i] = s.stack_[i]; -} - -template void -ACE_Fixed_Stack::operator= (const ACE_Fixed_Stack &s) -{ - ACE_TRACE ("ACE_Fixed_Stack::operator="); - - if (&s != this) - { - this->top_ = s.top_; - - for (size_t i = 0; i < this->top_; i++) - this->stack_[i] = s.stack_[i]; - } -} - -template -ACE_Fixed_Stack::~ACE_Fixed_Stack (void) -{ - ACE_TRACE ("ACE_Fixed_Stack::~ACE_Fixed_Stack"); -} - -//---------------------------------------- - -ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Stack) - -template void -ACE_Unbounded_Stack::dump (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Stack::dump"); -} - -template -ACE_Unbounded_Stack::ACE_Unbounded_Stack (ACE_Allocator *alloc) - : head_ (0), - cur_size_ (0), - allocator_ (alloc) -{ - // ACE_TRACE ("ACE_Unbounded_Stack::ACE_Unbounded_Stack"); - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (ACE_Node *) this->allocator_->malloc (sizeof (ACE_Node)), - ACE_Node); - this->head_->next_ = this->head_; -} - -template void -ACE_Unbounded_Stack::delete_all_nodes (void) -{ - // ACE_TRACE ("ACE_Unbounded_Stack::delete_all_nodes"); - - while (this->is_empty () == 0) - { - ACE_Node *temp = this->head_->next_; - this->head_->next_ = temp->next_; - ACE_DES_FREE_TEMPLATE (temp, this->allocator_->free, - ACE_Node, ); - } - - this->cur_size_ = 0; - - ACE_ASSERT (this->head_ == this->head_->next_ - && this->is_empty ()); -} - -template void -ACE_Unbounded_Stack::copy_all_nodes (const ACE_Unbounded_Stack &s) -{ - // ACE_TRACE ("ACE_Unbounded_Stack::copy_all_nodes"); - - ACE_ASSERT (this->head_ == this->head_->next_); - - ACE_Node *temp = this->head_; - - for (ACE_Node *s_temp = s.head_->next_; - s_temp != s.head_; - s_temp = s_temp->next_) - { - ACE_Node *nptr = temp->next_; - ACE_NEW_MALLOC (temp->next_, - (ACE_Node *) this->allocator_->malloc (sizeof (ACE_Node)), - ACE_Node (s_temp->item_, nptr)); - temp = temp->next_; - } - this->cur_size_ = s.cur_size_; -} - -template -ACE_Unbounded_Stack::ACE_Unbounded_Stack (const ACE_Unbounded_Stack &s) - : head_ (0), - cur_size_ (0), - allocator_ (s.allocator_) -{ - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (ACE_Node *) this->allocator_->malloc (sizeof (ACE_Node)), - ACE_Node); - this->head_->next_ = this->head_; - - // ACE_TRACE ("ACE_Unbounded_Stack::ACE_Unbounded_Stack"); - this->copy_all_nodes (s); -} - -template void -ACE_Unbounded_Stack::operator= (const ACE_Unbounded_Stack &s) -{ - // ACE_TRACE ("ACE_Unbounded_Stack::operator="); - - if (this != &s) - { - this->delete_all_nodes (); - this->copy_all_nodes (s); - } -} - -template -ACE_Unbounded_Stack::~ACE_Unbounded_Stack (void) -{ - // ACE_TRACE ("ACE_Unbounded_Stack::~ACE_Unbounded_Stack"); - - this->delete_all_nodes (); - ACE_DES_FREE_TEMPLATE (head_, - this->allocator_->free, - ACE_Node, - ); -} - -template int -ACE_Unbounded_Stack::push (const T &new_item) -{ - // ACE_TRACE ("ACE_Unbounded_Stack::push"); - - ACE_Node *temp; - - ACE_NEW_MALLOC_RETURN (temp, - ACE_static_cast(ACE_Node *, - this->allocator_->malloc (sizeof (ACE_Node))), - ACE_Node (new_item, this->head_->next_), - -1); - this->head_->next_ = temp; - this->cur_size_++; - return 0; -} - -template int -ACE_Unbounded_Stack::pop (T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Stack::pop"); - - if (this->is_empty ()) - return -1; - else - { - ACE_Node *temp = this->head_->next_; - item = temp->item_; - this->head_->next_ = temp->next_; - - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_Node, - ); - this->cur_size_--; - return 0; - } -} - -template int -ACE_Unbounded_Stack::find (const T &item) const -{ - // ACE_TRACE ("ACE_Unbounded_Stack::find"); - // Set into the dummy node. - this->head_->item_ = item; - - ACE_Node *temp = this->head_->next_; - - // Keep looping until we find the item. - while (!(temp->item_ == item)) - temp = temp->next_; - - // If we found the dummy node then it's not really there, otherwise, - // it is there. - return temp == this->head_ ? -1 : 0; -} - -template int -ACE_Unbounded_Stack::insert (const T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Stack::insert"); - - if (this->find (item) == 0) - return 1; - else - return this->push (item); -} - -template int -ACE_Unbounded_Stack::remove (const T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Stack::remove"); - - // Insert the item to be founded into the dummy node. - this->head_->item_ = item; - - ACE_Node *curr = this->head_; - - while (!(curr->next_->item_ == item)) - curr = curr->next_; - - if (curr->next_ == this->head_) - return -1; // Item was not found. - else - { - ACE_Node *temp = curr->next_; - // Skip over the node that we're deleting. - curr->next_ = temp->next_; - this->cur_size_--; - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_Node, - ); - return 0; - } -} - -//-------------------------------------------------- -ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator_Base) - -template -ACE_Double_Linked_List_Iterator_Base::ACE_Double_Linked_List_Iterator_Base (const ACE_Double_Linked_List &dll) - : current_ (0), dllist_ (&dll) -{ - // Do nothing -} - -template -ACE_Double_Linked_List_Iterator_Base::ACE_Double_Linked_List_Iterator_Base (const ACE_Double_Linked_List_Iterator_Base &iter) - : current_ (iter.current_), - dllist_ (iter.dllist_) -{ - // Do nothing -} - - -template T * -ACE_Double_Linked_List_Iterator_Base::next (void) const -{ - return this->not_done (); -} - -template int -ACE_Double_Linked_List_Iterator_Base::next (T *&ptr) const -{ - ptr = this->not_done (); - return ptr ? 1 : 0; -} - - -template int -ACE_Double_Linked_List_Iterator_Base::done (void) const -{ - return this->not_done () ? 0 : 1; -} - -template T & -ACE_Double_Linked_List_Iterator_Base::operator* (void) const -{ - return *(this->not_done ()); -} - -// @@ Is this a valid retasking? Make sure to check with Purify and -// whatnot that we're not leaking memory or doing any other screwing things. -template void -ACE_Double_Linked_List_Iterator_Base::reset (ACE_Double_Linked_List &dll) -{ - current_ = 0; - dllist_ = &dll; -} - - template int -ACE_Double_Linked_List_Iterator_Base::go_head (void) -{ - this->current_ = ACE_static_cast (T*, dllist_->head_->next_); - return this->current_ ? 1 : 0; -} - -template int -ACE_Double_Linked_List_Iterator_Base::go_tail (void) -{ - this->current_ = ACE_static_cast (T*, dllist_->head_->prev_); - return this->current_ ? 1 : 0; -} - -template T * -ACE_Double_Linked_List_Iterator_Base::not_done (void) const -{ - if (this->current_ != this->dllist_->head_) - return this->current_; - else - return 0; -} - -template T * -ACE_Double_Linked_List_Iterator_Base::do_advance (void) -{ - if (this->not_done ()) - { - this->current_ = ACE_static_cast (T*, this->current_->next_); - return this->not_done (); - } - else - return 0; -} - -template T * -ACE_Double_Linked_List_Iterator_Base::do_retreat (void) -{ - if (this->not_done ()) - { - this->current_ = ACE_static_cast (T*, this->current_->prev_); - return this->not_done (); - } - else - return 0; -} - -template void -ACE_Double_Linked_List_Iterator_Base::dump_i (void) const -{ - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_ = %x"), this->current_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -//-------------------------------------------------- -ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator) - -template -ACE_Double_Linked_List_Iterator::ACE_Double_Linked_List_Iterator (const ACE_Double_Linked_List &dll) - : ACE_Double_Linked_List_Iterator_Base (dll) -{ - this->current_ = ACE_static_cast (T*, dll.head_->next_); - // Advance current_ out of the null area and onto the first item in - // the list -} - -template void -ACE_Double_Linked_List_Iterator::reset (ACE_Double_Linked_List &dll) -{ - this->ACE_Double_Linked_List_Iterator_Base ::reset (dll); - this->current_ = ACE_static_cast (T*, dll.head_->next_); - // Advance current_ out of the null area and onto the first item in - // the list -} - -template int -ACE_Double_Linked_List_Iterator::first (void) -{ - return this->go_head (); -} - -template int -ACE_Double_Linked_List_Iterator::advance (void) -{ - return this->do_advance () ? 1 : 0; -} - -template T* -ACE_Double_Linked_List_Iterator::advance_and_remove (int dont_remove) -{ - T* item = 0; - if (dont_remove) - this->do_advance (); - else - { - item = this->next (); - this->do_advance (); - // It seems dangerous to remove nodes in an iterator, but so it goes... - ACE_Double_Linked_List *dllist = ACE_const_cast (ACE_Double_Linked_List *, this->dllist_); - dllist->remove (item); - } - return item; -} - -template void -ACE_Double_Linked_List_Iterator::dump (void) const -{ - this->dump_i (); -} - -// Prefix advance. - -template -ACE_Double_Linked_List_Iterator & -ACE_Double_Linked_List_Iterator::operator++ (void) -{ - this->do_advance (); - return *this; -} - - -// Postfix advance. - -template -ACE_Double_Linked_List_Iterator -ACE_Double_Linked_List_Iterator::operator++ (int) -{ - ACE_Double_Linked_List_Iterator retv (*this); - this->do_advance (); - return retv; -} - - -// Prefix reverse. - -template -ACE_Double_Linked_List_Iterator & -ACE_Double_Linked_List_Iterator::operator-- (void) -{ - this->do_retreat (); - return *this; -} - - -// Postfix reverse. - -template -ACE_Double_Linked_List_Iterator -ACE_Double_Linked_List_Iterator::operator-- (int) -{ - ACE_Double_Linked_List_Iterator retv (*this); - this->do_retreat (); - return retv; -} - - -//-------------------------------------------------- -ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Reverse_Iterator) - - template -ACE_Double_Linked_List_Reverse_Iterator::ACE_Double_Linked_List_Reverse_Iterator (ACE_Double_Linked_List &dll) - : ACE_Double_Linked_List_Iterator_Base (dll) -{ - this->current_ = ACE_static_cast (T*, dll.head_->prev_); - // Advance current_ out of the null area and onto the last item in - // the list -} - -template void -ACE_Double_Linked_List_Reverse_Iterator::reset (ACE_Double_Linked_List &dll) -{ - this->ACE_Double_Linked_List_Iterator_Base ::reset (dll); - this->current_ = ACE_static_cast (T*, dll.head_->prev_); - // Advance current_ out of the null area and onto the last item in - // the list -} - -template int -ACE_Double_Linked_List_Reverse_Iterator::first (void) -{ - return this->go_tail (); -} - -template int -ACE_Double_Linked_List_Reverse_Iterator::advance (void) -{ - return this->do_retreat () ? 1 : 0; -} - -template T* -ACE_Double_Linked_List_Reverse_Iterator::advance_and_remove (int dont_remove) -{ - T* item = 0; - if (dont_remove) - this->do_retreat (); - else - { - item = this->next (); - this->do_retreat (); - // It seems dangerous to remove nodes in an iterator, but so it goes... - ACE_Double_Linked_List *dllist = ACE_const_cast (ACE_Double_Linked_List *, this->dllist_); - dllist->remove (item); - } - return item; -} - -template void -ACE_Double_Linked_List_Reverse_Iterator::dump (void) const -{ - this->dump_i (); -} - -// Prefix advance. - -template -ACE_Double_Linked_List_Reverse_Iterator & -ACE_Double_Linked_List_Reverse_Iterator::operator++ (void) -{ - this->do_retreat (); - return *this; -} - - -// Postfix advance. - -template -ACE_Double_Linked_List_Reverse_Iterator -ACE_Double_Linked_List_Reverse_Iterator::operator++ (int) -{ - ACE_Double_Linked_List_Reverse_Iterator retv (*this); - this->do_retreat (); - return retv; -} - - -// Prefix reverse. - -template -ACE_Double_Linked_List_Reverse_Iterator & -ACE_Double_Linked_List_Reverse_Iterator::operator-- (void) -{ - this->do_advance (); - return *this; -} - - -// Postfix reverse. - -template -ACE_Double_Linked_List_Reverse_Iterator -ACE_Double_Linked_List_Reverse_Iterator::operator-- (int) -{ - ACE_Double_Linked_List_Reverse_Iterator retv (*this); - this->do_advance (); - return retv; -} - - -ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List) - - template -ACE_Double_Linked_List:: ACE_Double_Linked_List (ACE_Allocator *alloc) - : size_ (0), allocator_ (alloc) -{ - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (T *) this->allocator_->malloc (sizeof (T)), - T); - this->init_head (); -} - -template -ACE_Double_Linked_List::ACE_Double_Linked_List (const ACE_Double_Linked_List &cx) - : allocator_ (cx.allocator_) -{ - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (T *) this->allocator_->malloc (sizeof (T)), - T); - this->init_head (); - this->copy_nodes (cx); - this->size_ = cx.size_; -} - -template void -ACE_Double_Linked_List::operator= (const ACE_Double_Linked_List &cx) -{ - if (this != &cx) - { - this->delete_nodes (); - this->copy_nodes (cx); - } -} - -template -ACE_Double_Linked_List::~ACE_Double_Linked_List (void) -{ - this->delete_nodes (); - - ACE_DES_FREE (head_, - this->allocator_->free, - T); - - this->head_ = 0; -} - -template int -ACE_Double_Linked_List::is_empty (void) const -{ - return this->size () ? 0 : 1; -} - -template int -ACE_Double_Linked_List::is_full (void) const -{ - return 0; // We have no bound. -} - -template T * -ACE_Double_Linked_List::insert_tail (T *new_item) -{ - // Insert it before , i.e., at tail. - this->insert_element (new_item, 1); - return new_item; -} - -template T * -ACE_Double_Linked_List::insert_head (T *new_item) -{ - this->insert_element (new_item); // Insert it after , i.e., at head. - return new_item; -} - -template T * -ACE_Double_Linked_List::delete_head (void) -{ - T *temp; - - if (this->is_empty ()) - return 0; - - temp = ACE_static_cast (T *, - this->head_->next_); - // Detach it from the list. - this->remove_element (temp); - return temp; -} - -template T * -ACE_Double_Linked_List::delete_tail (void) -{ - T *temp; - - if (this->is_empty ()) - return 0; - - temp = ACE_static_cast (T *, - this->head_->prev_); - // Detach it from the list. - this->remove_element (temp); - return temp; -} - -template void -ACE_Double_Linked_List::reset (void) -{ - this->delete_nodes (); -} - -template int -ACE_Double_Linked_List::get (T *&item, size_t slot) -{ - ACE_Double_Linked_List_Iterator iter (*this); - - for (size_t i = 0; - i < slot && !iter.done (); - i++) - iter.advance (); - - item = iter.next (); - return item ? 0 : -1; -} - -template size_t -ACE_Double_Linked_List::size (void) const -{ - return this->size_; -} - -template void -ACE_Double_Linked_List::dump (void) const -{ - // Dump the state of an object. -} - -#if 0 -template T * -ACE_Double_Linked_List::find (const T &item) -{ - for (ACE_Double_Linked_List_Iterator iter (*this); - !iter.done (); - iter.advance ()) - { - T *temp = iter.next (); - - if (*temp == item) - return temp; - } - - return 0; -} - -template int -ACE_Double_Linked_List::remove (const T &item) -{ - T *temp = this->find (item); - - if (temp != 0) - return this->remove (temp); - else - return -1; -} -#endif /* 0 */ - -template int -ACE_Double_Linked_List::remove (T *n) -{ - return this->remove_element (n); -} - -template void -ACE_Double_Linked_List::delete_nodes (void) -{ - while (! this->is_empty ()) - { - T * temp = ACE_static_cast (T*, this->head_->next_); - this->remove_element (temp); - ACE_DES_FREE (temp, - this->allocator_->free, - T); - } -} - -template void -ACE_Double_Linked_List::copy_nodes (const ACE_Double_Linked_List &c) -{ - for (ACE_Double_Linked_List_Iterator iter (c); - !iter.done (); - iter.advance ()) - { - T* temp = 0; - ACE_NEW_MALLOC (temp, - (T *)this->allocator_->malloc (sizeof (T)), - T (*iter.next ())); - this->insert_tail (temp); - } -} - -template void -ACE_Double_Linked_List::init_head (void) -{ - this->head_->next_ = this->head_; - this->head_->prev_ = this->head_; -} - -template int -ACE_Double_Linked_List::insert_element (T *new_item, - int before, - T *old_item) -{ - if (old_item == 0) - old_item = this->head_; - - if (before) - old_item = ACE_static_cast (T *, - old_item->prev_); - - new_item->next_ = old_item->next_; - new_item->next_->prev_ = new_item; - new_item->prev_ = old_item; - old_item->next_ = new_item; - this->size_++; - return 0; // Well, what will cause errors here? -} - -template int -ACE_Double_Linked_List::remove_element (T *item) -{ - // Notice that you have to ensure that item is an element of this - // list. We can't do much checking here. - - if (item == this->head_ || item->next_ == 0 - || item->prev_ == 0 || this->size () == 0) // Can't remove head - return -1; - - item->prev_->next_ = item->next_; - item->next_->prev_ = item->prev_; - item->next_ = item->prev_ = 0; // reset pointers to prevent double removal. - this->size_--; - return 0; -} - -//-------------------------------------------------- - -ACE_ALLOC_HOOK_DEFINE(ACE_Fixed_Set) - - template size_t -ACE_Fixed_Set::size (void) const -{ - return this->cur_size_; -} - -template size_t -ACE_Bounded_Set::size (void) const -{ - ACE_TRACE ("ACE_Bounded_Set::size"); - return this->cur_size_; -} - -template void -ACE_Fixed_Set::dump (void) const -{ - ACE_TRACE ("ACE_Fixed_Set::dump"); -} - -template -ACE_Fixed_Set::~ACE_Fixed_Set (void) -{ - ACE_TRACE ("ACE_Fixed_Set::~ACE_Fixed_Set"); - this->cur_size_ = 0; -} - -template -ACE_Fixed_Set::ACE_Fixed_Set (const ACE_Fixed_Set &fs) - : cur_size_ (fs.cur_size_) -{ - ACE_TRACE ("ACE_Fixed_Set::ACE_Fixed_Set"); - - for (size_t i = 0; i < this->cur_size_; i++) - this->search_structure_[i] = fs.search_structure_[i]; -} - -template void -ACE_Fixed_Set::operator= (const ACE_Fixed_Set &fs) -{ - ACE_TRACE ("ACE_Fixed_Set::operator="); - - if (this != &fs) - { - this->cur_size_ = fs.cur_size_; - - for (size_t i = 0; i < this->cur_size_; i++) - this->search_structure_[i] = fs.search_structure_[i]; - } -} - -template -ACE_Fixed_Set::ACE_Fixed_Set (void) - : cur_size_ (0), - max_size_ (ACE_SIZE) -{ - ACE_TRACE ("ACE_Fixed_Set::ACE_Fixed_Set"); - for (size_t i = 0; i < this->max_size_; i++) - this->search_structure_[i].is_free_ = 1; -} - -template int -ACE_Fixed_Set::find (const T &item) const -{ - ACE_TRACE ("ACE_Fixed_Set::find"); - - for (size_t i = 0; i < this->cur_size_; i++) - if (this->search_structure_[i].item_ == item - && this->search_structure_[i].is_free_ == 0) - return 0; - - return -1; -} - -template int -ACE_Fixed_Set::insert (const T &item) -{ - ACE_TRACE ("ACE_Fixed_Set::insert"); - ssize_t first_free = -1; // Keep track of first free slot. - size_t i; - - for (i = 0; i < this->cur_size_; i++) - // First, make sure we don't allow duplicates. - - if (this->search_structure_[i].item_ == item - && this->search_structure_[i].is_free_ == 0) - return 1; - else if (this->search_structure_[i].is_free_ - && first_free == -1) - first_free = i; - - // If we found a free spot let's reuse it. - if (first_free > -1) - { - this->search_structure_[first_free].item_ = item; - this->search_structure_[first_free].is_free_ = 0; - return 0; - } - // Insert at the end of the active portion. - else if (i < this->max_size_) - { - this->search_structure_[i].item_ = item; - this->search_structure_[i].is_free_ = 0; - this->cur_size_++; - return 0; - } - else /* No more room! */ - { - errno = ENOMEM; - return -1; - } -} - -template int -ACE_Fixed_Set::remove (const T &item) -{ - ACE_TRACE ("ACE_Fixed_Set::remove"); - - for (size_t i = 0; i < this->cur_size_; i++) - if (this->search_structure_[i].item_ == item) - { - // Mark this entry as being free. - this->search_structure_[i].is_free_ = 1; - - // If we just unbound the highest entry, then we need to - // figure out where the next highest active entry is. - if (i + 1 == this->cur_size_) - { - while (i > 0 - && this->search_structure_[--i].is_free_) - continue; - - if (i == 0 - && this->search_structure_[i].is_free_) - this->cur_size_ = 0; - else - this->cur_size_ = i + 1; - } - return 0; - } - - return -1; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Fixed_Set_Iterator) - - template void -ACE_Fixed_Set_Iterator::dump (void) const -{ - ACE_TRACE ("ACE_Fixed_Set_Iterator::dump"); -} - -template -ACE_Fixed_Set_Iterator::ACE_Fixed_Set_Iterator (ACE_Fixed_Set &s) - : s_ (s), - next_ (-1) -{ - ACE_TRACE ("ACE_Fixed_Set_Iterator::ACE_Fixed_Set_Iterator"); - this->advance (); -} - -template int -ACE_Fixed_Set_Iterator::advance (void) -{ - ACE_TRACE ("ACE_Fixed_Set_Iterator::advance"); - - for (++this->next_; - ACE_static_cast(size_t, this->next_) < this->s_.cur_size_ - && this->s_.search_structure_[this->next_].is_free_; - ++this->next_) - continue; - - return ACE_static_cast(size_t, this->next_) < this->s_.cur_size_; -} - -template int -ACE_Fixed_Set_Iterator::first (void) -{ - ACE_TRACE ("ACE_Fixed_Set_Iterator::first"); - - next_ = -1; - return this->advance (); -} - -template int -ACE_Fixed_Set_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Fixed_Set_Iterator::done"); - - return ACE_static_cast (ACE_CAST_CONST size_t, this->next_) >= - this->s_.cur_size_; -} - -template int -ACE_Fixed_Set_Iterator::next (T *&item) -{ - ACE_TRACE ("ACE_Fixed_Set_Iterator::next"); - if (ACE_static_cast (size_t, this->next_) < this->s_.cur_size_) - { - item = &this->s_.search_structure_[this->next_].item_; - return 1; - } - else - return 0; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Fixed_Set_Const_Iterator) - - template void -ACE_Fixed_Set_Const_Iterator::dump (void) const -{ - ACE_TRACE ("ACE_Fixed_Set_Const_Iterator::dump"); -} - -template -ACE_Fixed_Set_Const_Iterator::ACE_Fixed_Set_Const_Iterator (const ACE_Fixed_Set &s) - : s_ (s), - next_ (-1) -{ - ACE_TRACE ("ACE_Fixed_Set_Const_Iterator::ACE_Fixed_Set_Const_Iterator"); - this->advance (); -} - -template int -ACE_Fixed_Set_Const_Iterator::advance (void) -{ - ACE_TRACE ("ACE_Fixed_Set_Const_Iterator::advance"); - - for (++this->next_; - ACE_static_cast(size_t, this->next_) < this->s_.cur_size_ - && this->s_.search_structure_[this->next_].is_free_; - ++this->next_) - continue; - - return ACE_static_cast(size_t, this->next_) < this->s_.cur_size_; -} - -template int -ACE_Fixed_Set_Const_Iterator::first (void) -{ - ACE_TRACE ("ACE_Fixed_Set_Const_Iterator::first"); - - next_ = -1; - return this->advance (); -} - -template int -ACE_Fixed_Set_Const_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Fixed_Set_Const_Iterator::done"); - - return ACE_static_cast (ACE_CAST_CONST size_t, this->next_) >= - this->s_.cur_size_; -} - -template int -ACE_Fixed_Set_Const_Iterator::next (T *&item) -{ - ACE_TRACE ("ACE_Fixed_Set_Const_Iterator::next"); - if (ACE_static_cast (size_t, this->next_) < this->s_.cur_size_) - { - item = &this->s_.search_structure_[this->next_].item_; - return 1; - } - else - return 0; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Set) - - template void -ACE_Bounded_Set::dump (void) const -{ - ACE_TRACE ("ACE_Bounded_Set::dump"); -} - -template -ACE_Bounded_Set::~ACE_Bounded_Set (void) -{ - ACE_TRACE ("ACE_Bounded_Set::~ACE_Bounded_Set"); - delete [] this->search_structure_; -} - -template -ACE_Bounded_Set::ACE_Bounded_Set (void) - : cur_size_ (0), - max_size_ (ACE_static_cast(size_t, ACE_Bounded_Set::DEFAULT_SIZE)) -{ - ACE_TRACE ("ACE_Bounded_Set::ACE_Bounded_Set"); - - ACE_NEW (this->search_structure_, - ACE_TYPENAME ACE_Bounded_Set::Search_Structure[this->max_size_]); - - for (size_t i = 0; i < this->max_size_; i++) - this->search_structure_[i].is_free_ = 1; -} - -template -ACE_Bounded_Set::ACE_Bounded_Set (const ACE_Bounded_Set &bs) - : cur_size_ (bs.cur_size_), - max_size_ (bs.max_size_) -{ - ACE_TRACE ("ACE_Bounded_Set::ACE_Bounded_Set"); - - ACE_NEW (this->search_structure_, - ACE_TYPENAME ACE_Bounded_Set::Search_Structure[this->max_size_]); - - for (size_t i = 0; i < this->cur_size_; i++) - this->search_structure_[i] = bs.search_structure_[i]; -} - -template void -ACE_Bounded_Set::operator= (const ACE_Bounded_Set &bs) -{ - ACE_TRACE ("ACE_Bounded_Set::operator="); - - if (this != &bs) - { - if (this->max_size_ < bs.cur_size_) - { - delete [] this->search_structure_; - ACE_NEW (this->search_structure_, - ACE_TYPENAME ACE_Bounded_Set::Search_Structure[bs.cur_size_]); - this->max_size_ = bs.cur_size_; - } - - this->cur_size_ = bs.cur_size_; - - for (size_t i = 0; i < this->cur_size_; i++) - this->search_structure_[i] = bs.search_structure_[i]; - } -} - -template -ACE_Bounded_Set::ACE_Bounded_Set (size_t size) - : cur_size_ (0), - max_size_ (size) -{ - ACE_TRACE ("ACE_Bounded_Set::ACE_Bounded_Set"); - ACE_NEW (this->search_structure_, - ACE_TYPENAME ACE_Bounded_Set::Search_Structure[size]); - - for (size_t i = 0; i < this->max_size_; i++) - this->search_structure_[i].is_free_ = 1; -} - -template int -ACE_Bounded_Set::find (const T &item) const -{ - ACE_TRACE ("ACE_Bounded_Set::find"); - - for (size_t i = 0; i < this->cur_size_; i++) - if (this->search_structure_[i].item_ == item - && this->search_structure_[i].is_free_ == 0) - return 0; - - return -1; -} - -template int -ACE_Bounded_Set::insert (const T &item) -{ - ACE_TRACE ("ACE_Bounded_Set::insert"); - int first_free = -1; // Keep track of first free slot. - size_t i; - - for (i = 0; i < this->cur_size_; i++) - // First, make sure we don't allow duplicates. - - if (this->search_structure_[i].item_ == item - && this->search_structure_[i].is_free_ == 0) - return 1; - else if (this->search_structure_[i].is_free_ && first_free == -1) - first_free = i; - - if (first_free > -1) // If we found a free spot let's reuse it. - { - this->search_structure_[first_free].item_ = item; - this->search_structure_[first_free].is_free_ = 0; - return 0; - } - else if (i < this->max_size_) // Insert at the end of the active portion. - { - this->search_structure_[i].item_ = item; - this->search_structure_[i].is_free_ = 0; - this->cur_size_++; - return 0; - } - else /* No more room! */ - { - errno = ENOMEM; - return -1; - } -} - -template int -ACE_Bounded_Set::remove (const T &item) -{ - ACE_TRACE ("ACE_Bounded_Set::remove"); - for (size_t i = 0; i < this->cur_size_; i++) - if (this->search_structure_[i].item_ == item) - { - // Mark this entry as being free. - this->search_structure_[i].is_free_ = 1; - - // If we just unbound the highest entry, then we need to - // figure out where the next highest active entry is. - if (i + 1 == this->cur_size_) - { - while (i > 0 && this->search_structure_[--i].is_free_) - continue; - - if (i == 0 && this->search_structure_[i].is_free_) - this->cur_size_ = 0; - else - this->cur_size_ = i + 1; - } - return 0; - } - - return -1; -} - -#if defined (__Lynx__) -// LynxOS 3.0.0 native g++ compiler raises internal error with this inline. -template int -ACE_Bounded_Set::is_full (void) const -{ - ACE_TRACE ("ACE_Bounded_Set::is_full"); - return this->cur_size_ == this->max_size_; -} -#endif /* __Lynx__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Set_Iterator) - - template void -ACE_Bounded_Set_Iterator::dump (void) const -{ - ACE_TRACE ("ACE_Bounded_Set_Iterator::dump"); -} - -template -ACE_Bounded_Set_Iterator::ACE_Bounded_Set_Iterator (ACE_Bounded_Set &s) - : s_ (s), - next_ (-1) -{ - ACE_TRACE ("ACE_Bounded_Set_Iterator::ACE_Bounded_Set_Iterator"); - this->advance (); -} - -template int -ACE_Bounded_Set_Iterator::advance (void) -{ - ACE_TRACE ("ACE_Bounded_Set_Iterator::advance"); - - for (++this->next_; - ACE_static_cast(size_t, this->next_) < this->s_.cur_size_ - && this->s_.search_structure_[this->next_].is_free_; - ++this->next_) - continue; - - return ACE_static_cast(size_t, this->next_) < this->s_.cur_size_; -} - -template int -ACE_Bounded_Set_Iterator::first (void) -{ - ACE_TRACE ("ACE_Bounded_Set_Iterator::first"); - - next_ = -1; - return this->advance (); -} - -template int -ACE_Bounded_Set_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Bounded_Set_Iterator::done"); - - return ACE_static_cast (ACE_CAST_CONST size_t, this->next_) >= - this->s_.cur_size_; -} - -template int -ACE_Bounded_Set_Iterator::next (T *&item) -{ - ACE_TRACE ("ACE_Bounded_Set_Iterator::next"); - if (ACE_static_cast(size_t, this->next_) < this->s_.cur_size_) - { - item = &this->s_.search_structure_[this->next_].item_; - return 1; - } - else - return 0; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_DNode) - - template -ACE_DNode::ACE_DNode (const T &i, ACE_DNode *n, ACE_DNode *p) - : next_ (n), prev_ (p), item_ (i) -{ -} - -# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) -template -ACE_DNode::~ACE_DNode (void) -{ -} -# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ - -// **************************************************************** - -template void -ACE_Unbounded_Stack_Iterator::dump (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Stack_Iterator::dump"); -} - -template -ACE_Unbounded_Stack_Iterator::ACE_Unbounded_Stack_Iterator (ACE_Unbounded_Stack &q) - : current_ (q.head_->next_), - stack_ (q) -{ - // ACE_TRACE ("ACE_Unbounded_Stack_Iterator::ACE_Unbounded_Stack_Iterator"); -} - -template int -ACE_Unbounded_Stack_Iterator::advance (void) -{ - // ACE_TRACE ("ACE_Unbounded_Stack_Iterator::advance"); - this->current_ = this->current_->next_; - return this->current_ != this->stack_.head_; -} - -template int -ACE_Unbounded_Stack_Iterator::first (void) -{ - // ACE_TRACE ("ACE_Unbounded_Stack_Iterator::first"); - this->current_ = this->stack_.head_->next_; - return this->current_ != this->stack_.head_; -} - -template int -ACE_Unbounded_Stack_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Unbounded_Stack_Iterator::done"); - - return this->current_ == this->stack_.head_; -} - -template int -ACE_Unbounded_Stack_Iterator::next (T *&item) -{ - // ACE_TRACE ("ACE_Unbounded_Stack_Iterator::next"); - if (this->current_ == this->stack_.head_) - return 0; - else - { - item = &this->current_->item_; - return 1; - } -} - - -ACE_ALLOC_HOOK_DEFINE(ACE_Ordered_MultiSet) - - - template -ACE_Ordered_MultiSet::ACE_Ordered_MultiSet (ACE_Allocator *alloc) - : head_ (0) - , tail_ (0) - , cur_size_ (0) - , allocator_ (alloc) -{ - // ACE_TRACE ("ACE_Ordered_MultiSet::ACE_Ordered_MultiSet"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); -} - -template -ACE_Ordered_MultiSet::ACE_Ordered_MultiSet (const ACE_Ordered_MultiSet &us) - : head_ (0) - , tail_ (0) - , cur_size_ (0) - , allocator_ (us.allocator_) -{ - ACE_TRACE ("ACE_Ordered_MultiSet::ACE_Ordered_MultiSet"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - this->copy_nodes (us); -} - -template -ACE_Ordered_MultiSet::~ACE_Ordered_MultiSet (void) -{ - // ACE_TRACE ("ACE_Ordered_MultiSet::~ACE_Ordered_MultiSet"); - - this->delete_nodes (); -} - - -template void -ACE_Ordered_MultiSet::operator= (const ACE_Ordered_MultiSet &us) -{ - ACE_TRACE ("ACE_Ordered_MultiSet::operator="); - - if (this != &us) - { - this->delete_nodes (); - this->copy_nodes (us); - } -} - - -template int -ACE_Ordered_MultiSet::insert (const T &item) -{ - // ACE_TRACE ("ACE_Ordered_MultiSet::insert"); - - return this->insert_from (item, this->head_, 0); -} - -template int -ACE_Ordered_MultiSet::insert (const T &new_item, - ITERATOR &iter) -{ - // ACE_TRACE ("ACE_Ordered_MultiSet::insert using iterator"); - - return this->insert_from (new_item, iter.current_, &iter.current_); -} - -template int -ACE_Ordered_MultiSet::remove (const T &item) -{ - // ACE_TRACE ("ACE_Ordered_MultiSet::remove"); - - ACE_DNode *node = 0; - - int result = locate (item, 0, node); - - // if we found the node, remove from list and free it - if (node && (result == 0)) - { - if (node->prev_) - node->prev_->next_ = node->next_; - else - head_ = node->next_; - - if (node->next_) - node->next_->prev_ = node->prev_; - else - tail_ = node->prev_; - - this->cur_size_--; - - ACE_DES_FREE_TEMPLATE (node, - this->allocator_->free, - ACE_DNode, - ); - return 0; - } - - return -1; -} - -template int -ACE_Ordered_MultiSet::find (const T &item, - ITERATOR &iter) const -{ - // search an occurance of item, using iterator's current position as a hint - ACE_DNode *node = iter.current_; - int result = locate (item, node, node); - - // if we found the node, update the iterator and indicate success - if (node && (result == 0)) - { - iter.current_ = node; - return 0; - } - - return -1; -} - - - -template void -ACE_Ordered_MultiSet::reset (void) -{ - ACE_TRACE ("reset"); - - this->delete_nodes (); -} - -template void -ACE_Ordered_MultiSet::dump (void) const -{ - // ACE_TRACE ("ACE_Ordered_MultiSet::dump"); - // - // ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); - // - // T *item = 0; - // size_t count = 1; - // - // for (ACE_Ordered_MultiSet_Iterator iter (*(ACE_Ordered_MultiSet *) this); - // iter.next (item) != 0; - // iter.advance ()) - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %d\n"), count++)); - // - // ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template int -ACE_Ordered_MultiSet::insert_from (const T &item, ACE_DNode *position, - ACE_DNode **new_position) -{ - // ACE_TRACE ("ACE_Ordered_MultiSet::insert_from"); - - // create a new node - ACE_DNode *temp; - ACE_NEW_MALLOC_RETURN (temp, - ACE_static_cast(ACE_DNode*, - this->allocator_->malloc (sizeof (ACE_DNode))), - ACE_DNode (item), - -1); - // obtain approximate location of the node - int result = locate (item, position, position); - - // if there are nodes in the multiset - if (position) - { - switch (result) - { - // insert after the approximate position - case -1: - - // if there is a following node - if (position->next_) - { - // link up with the following node - position->next_->prev_ = temp; - temp->next_ = position->next_; - } - else - // appending to the end of the set - tail_ = temp; - - // link up with the preceeding node - temp->prev_ = position; - position->next_ = temp; - - break; - - // insert before the position - case 0: - case 1: - - // if there is a preceeding node - if (position->prev_) - { - // link up with the preceeding node - position->prev_->next_ = temp; - temp->prev_ = position->prev_; - } - else - // prepending to the start of the set - head_ = temp; - - // link up with the preceeding node - temp->next_ = position; - position->prev_ = temp; - - break; - - default: - return -1; - } - } - else - { - // point the head and tail to the new node. - this->head_ = temp; - this->tail_ = temp; - } - - this->cur_size_++; - if (new_position) - *new_position = temp; - - return 0; -} - -template int -ACE_Ordered_MultiSet::locate (const T &item, ACE_DNode *start_position, - ACE_DNode *&new_position) const -{ - if (! start_position) - start_position = this->head_; - - // If starting before the item, move forward until at or just before - // item. - while (start_position && start_position->item_ < item && - start_position->next_) - start_position = start_position->next_; - - // If starting after the item, move back until at or just after item - while (start_position && item < start_position->item_ && - start_position->prev_) - start_position = start_position->prev_; - - // Save the (approximate) location in the passed pointer. - new_position = start_position; - - // Show the location is after (1), before (-1) , or at (0) the item - if (!new_position) - return 1; - else if (item < new_position->item_) - return 1; - else if (new_position->item_ < item) - return -1; - else - return 0; -} - -// Looks for first occurance of in the ordered set, using the -// passed starting position as a hint: if there is such an instance, -// it updates the new_position pointer to point to one such node and -// returns 0; if there is no such node, then if there is a node before -// where the item would have been, it updates the new_position pointer -// to point to this node and returns -1; if there is no such node, -// then if there is a node after where the item would have been, it -// updates the new_position pointer to point to this node (or 0 if -// there is no such node) and returns 1; - -template void -ACE_Ordered_MultiSet::copy_nodes (const ACE_Ordered_MultiSet &us) -{ - ACE_DNode *insertion_point = this->head_; - - for (ACE_DNode *curr = us.head_; - curr != 0; - curr = curr->next_) - this->insert_from (curr->item_, insertion_point, &insertion_point); -} - -template void -ACE_Ordered_MultiSet::delete_nodes (void) -{ - // iterate through list, deleting nodes - for (ACE_DNode *curr = this->head_; - curr != 0; - ) - { - ACE_DNode *temp = curr; - curr = curr->next_; - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_DNode, - ); - } - - this->head_ = 0; - this->tail_ = 0; - this->cur_size_ = 0; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Ordered_MultiSet_Iterator) - -template -ACE_Ordered_MultiSet_Iterator::ACE_Ordered_MultiSet_Iterator (ACE_Ordered_MultiSet &s) - : current_ (s.head_), - set_ (s) -{ - // ACE_TRACE ("ACE_Ordered_MultiSet_Iterator::ACE_Ordered_MultiSet_Iterator"); -} - -template int -ACE_Ordered_MultiSet_Iterator::next (T *&item) const -{ - // ACE_TRACE ("ACE_Ordered_MultiSet_Iterator::next"); - if (this->current_) - { - item = &this->current_->item_; - return 1; - } - - return 0; -} - -template T& -ACE_Ordered_MultiSet_Iterator::operator* (void) -{ - //ACE_TRACE ("ACE_Ordered_MultiSet_Iterator::operator*"); - T *retv = 0; - - int result = this->next (retv); - ACE_ASSERT (result != 0); - ACE_UNUSED_ARG (result); - - return *retv; -} - -ACE_ALLOC_HOOK_DEFINE (ACE_DLList_Node) - -template T * -ACE_DLList::insert_tail (T *new_item) -{ - ACE_DLList_Node *temp1, *temp2; - ACE_NEW_MALLOC_RETURN (temp1, - ACE_static_cast(ACE_DLList_Node *, - this->allocator_->malloc (sizeof (ACE_DLList_Node))), - ACE_DLList_Node ((void *&)new_item), - 0); - temp2 = ACE_DLList_Base::insert_tail (temp1); - return (T *) (temp2 ? temp2->item_ : 0); -} - -template T * -ACE_DLList::insert_head (T *new_item) -{ - ACE_DLList_Node *temp1; - ACE_NEW_MALLOC_RETURN (temp1, - (ACE_DLList_Node *) this->allocator_->malloc (sizeof (ACE_DLList_Node)), - ACE_DLList_Node ((void *&)new_item), 0); - ACE_DLList_Node *temp2 = - ACE_DLList_Base::insert_head (temp1); - return (T *) (temp2 ? temp2->item_ : 0); -} - -template T * -ACE_DLList::delete_head (void) -{ - ACE_DLList_Node *temp1 = ACE_DLList_Base::delete_head (); - T *temp2 = (T *) (temp1 ? temp1->item_ : 0); - ACE_DES_FREE (temp1, - this->allocator_->free, - ACE_DLList_Node); - - return temp2; -} - -template T * -ACE_DLList::delete_tail (void) -{ - ACE_DLList_Node *temp1 = ACE_DLList_Base::delete_tail (); - T *temp2 = (T *) (temp1 ? temp1->item_ : 0); - ACE_DES_FREE (temp1, - this->allocator_->free, - ACE_DLList_Node); - return temp2; -} - -// **************************************************************** - -// Compare this array with for equality. - -template int -ACE_Array::operator== (const ACE_Array &s) const -{ - if (this == &s) - return 1; - else if (this->size () != s.size ()) - return 0; - - for (size_t slot = 0; slot < s.size (); slot++) - if ((*this)[slot] != s[slot]) - return 0; - - return 1; -} - -// **************************************************************** - - -#endif /* ACE_CONTAINERS_T_C */ diff --git a/ace/Containers_T.h b/ace/Containers_T.h deleted file mode 100644 index 1cd1e016d92..00000000000 --- a/ace/Containers_T.h +++ /dev/null @@ -1,1995 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Containers_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_CONTAINERS_T_H -#define ACE_CONTAINERS_T_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Need by ACE_DLList_Node. -#include "ace/Containers.h" - -// Shared with "ace/Unbounded_Set.h" -#include "ace/Node.h" - -// Backwards compatibility, please include "ace/Array_Base.h" directly. -#include "ace/Array_Base.h" - -// Backwards compatibility, please include "ace/Unbounded_Set.h" directly. -#include "ace/Unbounded_Set.h" - -// Backwards compatibility, please include "ace/Unbounded_Queue.h" directly. -#include "ace/Unbounded_Queue.h" - -class ACE_Allocator; - - -/** - * @class ACE_Bounded_Stack - * - * @brief Implement a generic LIFO abstract data type. - * - * This implementation of a Stack uses a bounded array - * that is allocated dynamically. The Stack interface - * provides the standard constant time push, pop, and top - * operations. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Dynamic array - * - Duplicates allowed? - * Yes - * - Random access allowed? - * No - * - Search speed - * N/A - * - Insert/replace speed - * N/A - * - Iterator still valid after change to container? - * N/A - * - Frees memory for removed elements? - * No - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * - */ -template -class ACE_Bounded_Stack -{ -public: - // = Initialization, assignment, and termination methods. - - /// Initialize a new empty stack with the provided size.. - /** - * Initialize and allocate space for a new Bounded_Stack with the provided - * size. - */ - ACE_Bounded_Stack (size_t size); - - /// Initialize the stack to be a copy of the stack provided. - /** - * Initialize the stack to be an exact copy of the Bounded_Stack provided - * as a parameter. - */ - ACE_Bounded_Stack (const ACE_Bounded_Stack &s); - - /// Assignment operator - /** - * Perform a deep copy operation using the Bounded_Stack parameter. If the - * capacity of the lhs isn't sufficient for the rhs, then the underlying data - * structure will be reallocated to accomadate the larger number of elements. - */ - void operator= (const ACE_Bounded_Stack &s); - - /// Perform actions needed when stack goes out of scope. - /** - * Deallocate the memory used by the Bounded_Stack. - */ - ~ACE_Bounded_Stack (void); - - // = Classic Stack operations. - - ///Add an element to the top of the stack. - /** - * Place a new item on top of the stack. Returns -1 if the stack - * is already full, 0 if the stack is not already full, and -1 if - * failure occurs. - */ - int push (const T &new_item); - - ///Remove an item from the top of stack. - /** - * Remove and return the top stack item. Returns -1 if the stack is - * already empty, 0 if the stack is not already empty, and -1 if - * failure occurs. - */ - int pop (T &item); - - ///Examine the contents of the top of stack. - /** - * Return top stack item without removing it. Returns -1 if the - * stack is already empty, 0 if the stack is not already empty, and - * -1 if failure occurs. - */ - int top (T &item) const; - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, otherwise returns 0. - /** - * Performs constant time check to determine if the stack is empty. - */ - int is_empty (void) const; - - /// Returns 1 if the container is full, otherwise returns 0. - /** - * Performs constant time check to determine if the stack is at capacity. - */ - int is_full (void) const; - - /// The number of items in the stack. - /** - * Return the number of items currently in the stack. - */ - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Size of the dynamically allocated data. - size_t size_; - - /// Keeps track of the current top of stack. - size_t top_; - - /// Holds the stack's contents. - T *stack_; -}; - -//---------------------------------------- - - -/** - * @class ACE_Fixed_Stack - * - * @brief Implement a generic LIFO abstract data type. - * - * This implementation of a Stack uses a fixed array - * with the size fixed at instantiation time. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Fixed array - * - Duplicates allowed? - * Yes - * - Random access allowed? - * No - * - Search speed - * N/A - * - Insert/replace speed - * N/A - * - Iterator still valid after change to container? - * N/A - * - Frees memory for removed elements? - * No - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * - */ -template -class ACE_Fixed_Stack -{ -public: - // = Initialization, assignment, and termination methods. - /// Initialize a new stack so that it is empty. - /** - * Initialize an empty stack. - */ - ACE_Fixed_Stack (void); - - /// The copy constructor (performs initialization). - /** - * Initialize the stack and copy the provided stack into the current stack. - */ - ACE_Fixed_Stack (const ACE_Fixed_Stack &s); - - /// Assignment operator (performs assignment). - /** - * Perform a deep copy of the provided stack. - */ - void operator= (const ACE_Fixed_Stack &s); - - /// Perform actions needed when stack goes out of scope. - /** - * Destroy the stack. - */ - ~ACE_Fixed_Stack (void); - - // = Classic Stack operations. - - ///Constant time placement of element on top of stack. - /** - * Place a new item on top of the stack. Returns -1 if the stack - * is already full, 0 if the stack is not already full, and -1 if - * failure occurs. - */ - int push (const T &new_item); - - ///Constant time removal of top of stack. - /** - * Remove and return the top stack item. Returns -1 if the stack is - * already empty, 0 if the stack is not already empty, and -1 if - * failure occurs. - */ - int pop (T &item); - - ///Constant time examination of top of stack. - /** - * Return top stack item without removing it. Returns -1 if the - * stack is already empty, 0 if the stack is not already empty, and - * -1 if failure occurs. - */ - int top (T &item) const; - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, otherwise returns 0. - /** - * Performs constant time check to see if stack is empty. - */ - int is_empty (void) const; - - /// Returns 1 if the container is full, otherwise returns 0. - /** - * Performs constant time check to see if stack is full. - */ - int is_full (void) const; - - /// The number of items in the stack. - /** - * Constant time access to the current size of the stack. - */ - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Size of the allocated data. - size_t size_; - - /// Keeps track of the current top of stack. - size_t top_; - - /// Holds the stack's contents. - T stack_[ACE_SIZE]; -}; - -//---------------------------------------- - -template class ACE_Ordered_MultiSet; -template class ACE_Ordered_MultiSet_Iterator; - -/** - * @class ACE_DNode - * - * @brief Implementation element in a bilinked list. - */ -template -class ACE_DNode -{ - friend class ACE_Ordered_MultiSet; - friend class ACE_Ordered_MultiSet_Iterator; - -public: - -# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) - /// This isn't necessary, but it keeps some compilers happy. - ~ACE_DNode (void); -# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */ - -private: - - // = Initialization methods - ACE_DNode (const T &i, ACE_DNode *n = 0, ACE_DNode *p = 0); - - /// Pointer to next element in the list of s. - ACE_DNode *next_; - - /// Pointer to previous element in the list of s. - ACE_DNode *prev_; - - /// Current value of the item in this node. - T item_; -}; - - - -/** - * @class ACE_Unbounded_Stack - * - * @brief Implement a generic LIFO abstract data type. - * - * This implementation of an unbounded Stack uses a linked list. - * If you use the or methods you should keep - * in mind that duplicate entries aren't allowed. In general, - * therefore, you should avoid the use of these methods since - * they aren't really part of the ADT stack. The stack is implemented - * as a doubly linked list. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Double linked list - * - Duplicates allowed? - * No - * - Random access allowed? - * No - * - Search speed - * Linear - * - Insert/replace speed - * Linear - * - Iterator still valid after change to container? - * Yes - * - Frees memory for removed elements? - * Yes - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * - */ -template -class ACE_Unbounded_Stack -{ -public: - friend class ACE_Unbounded_Stack_Iterator; - - // Trait definition. - typedef ACE_Unbounded_Stack_Iterator ITERATOR; - - // = Initialization, assignment, and termination methods. - /// Initialize a new stack so that it is empty. Use user defined - /// allocation strategy if specified. - /** - * Initialize an empty stack using the user specified allocation strategy - * if provided. - */ - ACE_Unbounded_Stack (ACE_Allocator *alloc = 0); - - /// The copy constructor (performs initialization). - /** - * Initialize this stack to be an exact copy of . - */ - ACE_Unbounded_Stack (const ACE_Unbounded_Stack &s); - - /// Assignment operator (performs assignment). - /** - * Perform a deep copy of the rhs into the lhs. - */ - void operator= (const ACE_Unbounded_Stack &s); - - /// Perform actions needed when stack goes out of scope. - /** - * Destroy the underlying list for the stack. - */ - ~ACE_Unbounded_Stack (void); - - // = Classic Stack operations. - - - ///Push an element onto the top of stack. - /** - * Place a new item on top of the stack. Returns -1 if the stack - * is already full, 0 if the stack is not already full, and -1 if - * failure occurs. - */ - int push (const T &new_item); - - ///Pop the top element of the stack. - /** - * Remove and return the top stack item. Returns -1 if the stack is - * already empty, 0 if the stack is not already empty, and -1 if - * failure occurs. - */ - int pop (T &item); - - ///Examine the top of the stack. - /** - * Return top stack item without removing it. Returns -1 if the - * stack is already empty, 0 if the stack is not already empty, and - * -1 if failure occurs. - */ - int top (T &item) const; - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, otherwise returns 0. - /** - * Constant time check to see if the stack is empty. - */ - int is_empty (void) const; - - /// Returns 1 if the container is full, otherwise returns 0. - /** - * Always resturns 0 since the stack is unbounded. - */ - int is_full (void) const; - - // = Auxiliary methods (not strictly part of the Stack ADT). - - ///Linear Insert of an item. - /** - * Insert into the Stack at the head (but doesn't allow - * duplicates). Returns -1 if failures occur, 1 if item is already - * present (i.e., no duplicates are allowed), else 0. - */ - int insert (const T &new_item); - - /// Remove @a item from the Stack. Returns 0 if it removes the item, - /// -1 if it can't find the item, and -1 if a failure occurs. - /** - * Linear remove operation. - */ - int remove (const T &item); - - /// Finds if @a item occurs the set. Returns 0 if finds, else -1. - /** - * Linear find operation. - */ - int find (const T &item) const; - - /// The number of items in the stack. - /** - * Constant time access to the current stack size. - */ - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Delete all the nodes in the stack. - void delete_all_nodes (void); - - /// Copy all nodes from to . - void copy_all_nodes (const ACE_Unbounded_Stack &s); - - /// Head of the linked list of Nodes. - ACE_Node *head_; - - /// Current size of the stack. - size_t cur_size_; - - /// Allocation strategy of the stack. - ACE_Allocator *allocator_; -}; - -/** - * @class ACE_Unbounded_Stack_Iterator - * - * @brief Implement an iterator over an unbounded Stack. - */ -template -class ACE_Unbounded_Stack_Iterator -{ -public: - // = Initialization method. - /// Move to the first element in the . - ACE_Unbounded_Stack_Iterator (ACE_Unbounded_Stack &stack); - - // = Iteration methods. - - /// Pass back the @a next_item that hasn't been seen in the Stack. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the Stack. Returns 0 when all the - /// items in the Stack have been seen, else 1. - int advance (void); - - /// Move to the first element in the Stack. Returns 0 if the - /// Stack is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Pointer to the current node in the iteration. - ACE_Node *current_; - - /// Pointer to the Stack we're iterating over. - ACE_Unbounded_Stack &stack_; -}; - -template -class ACE_Double_Linked_List; - -/** - * @class ACE_Double_Linked_List_Iterator_Base - * - * @brief Implements a common base class for iterators for a double - * linked list ADT - */ -template -class ACE_Double_Linked_List_Iterator_Base -{ -public: - // = Iteration methods. - - /// Passes back the under the iterator. Returns 0 if the - /// iteration has completed, otherwise 1 - int next (T *&) const; - - /** - * @deprecated Return the address of next (current) unvisited item in - * the list. 0 if there is no more element available. - */ - T *next (void) const; - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// STL-like iterator dereference operator: returns a reference - /// to the node underneath the iterator. - T & operator* (void) const ; - - /** - * Retasks the iterator to iterate over a new - * Double_Linked_List. This allows clients to reuse an iterator - * without incurring the constructor overhead. If you do use this, - * be aware that if there are more than one reference to this - * iterator, the other "clients" may be very bothered when their - * iterator changes. @@ Here be dragons. Comments? - */ - void reset (ACE_Double_Linked_List &); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - // = Initialization methods. - - /// Constructor - ACE_Double_Linked_List_Iterator_Base (const ACE_Double_Linked_List &); - - /// Copy constructor. - ACE_Double_Linked_List_Iterator_Base (const - ACE_Double_Linked_List_Iterator_Base - &iter); - - // = Iteration methods. - /** - * Move to the first element of the list. Returns 0 if the list is - * empty, else 1. Note: the head of the ACE_DLList is actually a - * null entry, so the first element is actually the 2n'd entry - */ - int go_head (void); - - /// Move to the last element of the list. Returns 0 if the list is - /// empty, else 1. - int go_tail (void); - - /** - * Check if we reach the end of the list. Can also be used to get - * the *current* element in the list. Return the address of the - * current item if there are still elements left , 0 if we run out - * of element. - */ - T *not_done (void) const ; - - /// Advance to the next element in the list. Return the address of the - /// next element if there are more, 0 otherwise. - T *do_advance (void); - - /// Retreat to the previous element in the list. Return the address - /// of the previous element if there are more, 0 otherwise. - T *do_retreat (void); - - /// Dump the state of an object. - void dump_i (void) const; - - /// Remember where we are. - T *current_; - - const ACE_Double_Linked_List *dllist_; -}; - -/** - * @class ACE_Double_Linked_List_Iterator - * - * @brief Implements an iterator for a double linked list ADT - * - * Iterate thru the double-linked list. This class provides - * an interface that let users access the internal element - * addresses directly. Notice must declare - * ACE_Double_Linked_List, - * ACE_Double_Linked_List_Iterator_Base and - * ACE_Double_Linked_List_Iterator as friend classes and class T - * should also have data members T* next_ and T* prev_. - */ -template -class ACE_Double_Linked_List_Iterator : public ACE_Double_Linked_List_Iterator_Base -{ -public: - // = Initialization method. - ACE_Double_Linked_List_Iterator (const ACE_Double_Linked_List &); - - /** - * Retasks the iterator to iterate over a new - * Double_Linked_List. This allows clients to reuse an iterator - * without incurring the constructor overhead. If you do use this, - * be aware that if there are more than one reference to this - * iterator, the other "clients" may be very bothered when their - * iterator changes. - * @@ Here be dragons. Comments? - */ - void reset (ACE_Double_Linked_List &); - - /// Move to the first element in the list. Returns 0 if the - /// list is empty, else 1. - int first (void); - - /// Move forward by one element in the list. Returns 0 when all the - /// items in the list have been seen, else 1. - int advance (void); - - /** - * Advance the iterator while removing the original item from the - * list. Return a pointer points to the original (removed) item. - * If equals 0, this function behaves like - * but return 0 (NULL) instead. - */ - T* advance_and_remove (int dont_remove); - - // = STL-style iteration methods - - /// Prefix advance. - ACE_Double_Linked_List_Iterator & operator++ (void); - - /// Postfix advance. - ACE_Double_Linked_List_Iterator operator++ (int); - - /// Prefix reverse. - ACE_Double_Linked_List_Iterator & operator-- (void); - - /// Postfix reverse. - ACE_Double_Linked_List_Iterator operator-- (int); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -/** - * @class ACE_Double_Linked_List_Reverse_Iterator - * - * @brief Implements a reverse iterator for a double linked list ADT - * - * Iterate backwards over the double-linked list. This class - * provide an interface that let users access the internal - * element addresses directly, which seems to break the - * encapsulation. Notice must declare - * ACE_Double_Linked_List, - * ACE_Double_Linked_List_Iterator_Base and - * ACE_Double_Linked_List_Iterator as friend classes and class T - * should also have data members T* next_ and T* prev_. - */ -template -class ACE_Double_Linked_List_Reverse_Iterator : public ACE_Double_Linked_List_Iterator_Base -{ -public: - // = Initialization method. - ACE_Double_Linked_List_Reverse_Iterator (ACE_Double_Linked_List &); - - /** - * Retasks the iterator to iterate over a new - * Double_Linked_List. This allows clients to reuse an iterator - * without incurring the constructor overhead. If you do use this, - * be aware that if there are more than one reference to this - * iterator, the other "clients" may be very bothered when their - * iterator changes. - * @@ Here be dragons. Comments? - */ - void reset (ACE_Double_Linked_List &); - - /// Move to the first element in the list. Returns 0 if the - /// list is empty, else 1. - int first (void); - - /// Move forward by one element in the list. Returns 0 when all the - /// items in the list have been seen, else 1. - int advance (void); - - /** - * Advance the iterator while removing the original item from the - * list. Return a pointer points to the original (removed) item. - * If equals 0, this function behaves like - * but return 0 (NULL) instead. - */ - T* advance_and_remove (int dont_remove); - - // = STL-style iteration methods - - /// Prefix advance. - ACE_Double_Linked_List_Reverse_Iterator & operator++ (void); - - /// Postfix advance. - ACE_Double_Linked_List_Reverse_Iterator operator++ (int); - - /// Prefix reverse. - ACE_Double_Linked_List_Reverse_Iterator & operator-- (void); - - /// Postfix reverse. - ACE_Double_Linked_List_Reverse_Iterator operator-- (int); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - - -/** - * @class ACE_Double_Linked_List - * - * @brief A double-linked list implementation. - * - * This implementation of an unbounded double-linked list uses a - * circular linked list with a dummy node. It is pretty much - * like the except that it allows removing - * of a specific element from a specific location. - * Notice that this class is an implementation of a very simple - * data structure. This is *NOT* a container class. You can use the - * class to implement other contains classes but it is *NOT* a - * general purpose container class. - * The parameter class *MUST* have members T* prev and T* next - * and users of this class are responsible to follow the general - * rules of using double-linked lists to maintaining the list - * integrity. - * If you need a double linked container class, use the DLList - * class which is a container but delegates to the Double_Linked_List - * class. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Double Linked List - * - Duplicates allowed? - * Yes - * - Random access allowed? - * No - * - Search speed - * N/A - * - Insert/replace speed - * Linear - * - Iterator still valid after change to container? - * Yes - * - Frees memory for removed elements? - * No - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * - */ -template -class ACE_Double_Linked_List -{ -public: - friend class ACE_Double_Linked_List_Iterator_Base; - friend class ACE_Double_Linked_List_Iterator; - friend class ACE_Double_Linked_List_Reverse_Iterator; - - // Trait definition. - typedef ACE_Double_Linked_List_Iterator ITERATOR; - typedef ACE_Double_Linked_List_Reverse_Iterator REVERSE_ITERATOR; - - // = Initialization and termination methods. - /// construction. Use user specified allocation strategy - /// if specified. - /** - * Initialize an empy list using the allocation strategy specified by the user. - * If none is specified, then use default allocation strategy. - */ - ACE_Double_Linked_List (ACE_Allocator *alloc = 0); - - /// Copy constructor. - /** - * Create a double linked list that is a copy of the provided - * parameter. - */ - ACE_Double_Linked_List (const ACE_Double_Linked_List &); - - /// Assignment operator. - /** - * Perform a deep copy of the provided list by first deleting the nodes of the - * lhs and then copying the nodes of the rhs. - */ - void operator= (const ACE_Double_Linked_List &); - - /// Destructor. - /** - * Clean up the memory allocated for the nodes of the list. - */ - ~ACE_Double_Linked_List (void); - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, 0 otherwise. - /** - * Performs constant time check to determine if the list is empty. - */ - int is_empty (void) const; - - /// The list is unbounded, so this always returns 0. - /** - * Since the list is unbounded, the method simply returns 0. - */ - int is_full (void) const; - - // = Classic queue operations. - - /// Adds to the tail of the list. Returns the new item - /// that was inserted. - /** - * Provides constant time insertion at the end of the list structure. - */ - T *insert_tail (T *new_item); - - /// Adds to the head of the list.Returns the new item that - /// was inserted. - /** - * Provides constant time insertion at the head of the list. - */ - T *insert_head (T *new_item); - - ///Removes the head of the list and returns a pointer to that item. - /** - * Removes and returns the first in the list. Returns - * internal node's address on success, 0 if the queue was empty. - * This method will *not* free the internal node. - */ - T* delete_head (void); - - ///Removes the tail of the list and returns a pointer to that item. - /** - * Removes and returns the last in the list. Returns - * internal nodes's address on success, 0 if the queue was - * empty. This method will *not* free the internal node. - */ - T *delete_tail (void); - - // = Additional utility methods. - - ///Empty the list. - /** - * Reset the to be empty. - * Notice that since no one is interested in the items within, - * This operation will delete all items. - */ - void reset (void); - - /// Get the th element in the set. Returns -1 if the element - /// isn't in the range {0.. - 1}, else 0. - /** - * Iterates through the list to the desired index and assigns the provides pointer - * with the address of the node occupying that index. - */ - int get (T *&item, size_t slot = 0); - - /// The number of items in the queue. - /** - * Constant time call to return the current size of the list. - */ - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Use DNode address directly. - /** - * Constant time removal of an item from the list using it's address. - */ - int remove (T *n); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Delete all the nodes in the list. - /** - * Removes and deallocates memory for all of the list nodes. - */ - void delete_nodes (void); - - /// Copy nodes from into this list. - /** - * Copy the elements of the provided list by allocated new nodes and assigning - * them with the proper data. - */ - void copy_nodes (const ACE_Double_Linked_List &rhs); - - /// Setup header pointer. Called after we create the head node in ctor. - /** - * Initialize the head pointer so that the list has a dummy node. - */ - void init_head (void); - - ///Constant time insert a new item into the list structure. - /** - * Insert a @a new_item into the list. It will be added before - * or after @a old_item. Default is to insert the new item *after* - * . Return 0 if succeed, -1 if error occured. - */ - int insert_element (T *new_item, - int before = 0, - T *old_item = 0); - - ///Constant time delete an item from the list structure. - /** - * Remove @a item from the list. Return 0 if succeed, -1 otherwise. - * Notice that this function checks if item is and either its - * or is NULL. The function resets item's and - * to 0 to prevent clobbering the double-linked list if a user - * tries to remove the same node again. - */ - int remove_element (T *item); - - /// Head of the circular double-linked list. - T *head_; - - /// Size of this list. - size_t size_; - - /// Allocation Strategy of the queue. - ACE_Allocator *allocator_; -}; - - -template class ACE_DLList; -template class ACE_DLList_Iterator; -template class ACE_DLList_Reverse_Iterator; - -typedef ACE_Double_Linked_List ACE_DLList_Base; - -//typedef ACE_Double_Linked_List_Iterator -// ACE_DLList_Iterator_Base; -//typedef ACE_Double_Linked_List_Reverse_Iterator -// ACE_DLList_Reverse_Iterator_Base; -//@@ These two typedefs (inherited from James Hu's original design) -// have been removed because Sun CC 4.2 had problems with it. I guess -// having the DLList_Iterators inheriting from a class which is -// actually a typedef leads to problems. #define'ing rather than -// typedef'ing worked, but as per Carlos's reccomendation, I'm just -// replacing all references to the base classes with their actual -// type. Matt Braun (6/15/99) - -/** - * @class ACE_DLList - * - * @brief A double-linked list container class. - * - * This implementation uses ACE_Double_Linked_List to perform - * the logic behind this container class. It delegates all of its - * calls to ACE_Double_Linked_List. - */ -template -class ACE_DLList : public ACE_DLList_Base -{ - friend class ACE_DLList_Node; - friend class ACE_Double_Linked_List_Iterator; - friend class ACE_DLList_Iterator; - friend class ACE_DLList_Reverse_Iterator; - -public: - - /// Delegates to ACE_Double_Linked_List. - void operator= (const ACE_DLList &l); - - // = Classic queue operations. - - /// Delegates to ACE_Double_Linked_List. - T *insert_tail (T *new_item); - - /// Delegates to ACE_Double_Linked_List. - T *insert_head (T *new_item); - - /// Delegates to ACE_Double_Linked_List. - T *delete_head (void); - - /// Delegates to ACE_Double_Linked_List. - T *delete_tail (void); - - // = Additional utility methods. - - /** - * Delegates to , but where - * returns the node as the item, this get - * returns the contents of the node in item. - */ - int get (T *&item, size_t slot = 0); - - /// Delegates to ACE_Double_Linked_List. - void dump (void) const; - - /// Delegates to ACE_Double_Linked_List. - int remove (ACE_DLList_Node *n); - - - // = Initialization and termination methods. - - /// Delegates to ACE_Double_Linked_List. - ACE_DLList (ACE_Allocator *alloc = 0); - - /// Delegates to ACE_Double_Linked_List. - ACE_DLList (const ACE_DLList &l); - - /// Deletes the list starting from the head. - ~ACE_DLList (void); -}; - -/** - * @class ACE_DLList_Iterator - * - * @brief A double-linked list container class iterator. - * - * This implementation uses ACE_Double_Linked_List_Iterator to - * perform the logic behind this container class. It delegates - * all of its calls to ACE_Double_Linked_List_Iterator. - */ -template -class ACE_DLList_Iterator : public ACE_Double_Linked_List_Iterator -{ - - friend class ACE_DLList; - friend class ACE_DLList_Node; - -public: - - // = Initialization method. - ACE_DLList_Iterator (ACE_DLList &l); - - /** - * Retasks the iterator to iterate over a new - * Double_Linked_List. This allows clients to reuse an iterator - * without incurring the constructor overhead. If you do use this, - * be aware that if there are more than one reference to this - * iterator, the other "clients" may be very bothered when their - * iterator changes. - * @@ Here be dragons. Comments? - */ - void reset (ACE_DLList &l); - - // = Iteration methods. - /// Move forward by one element in the list. Returns 0 when all the - /// items in the list have been seen, else 1. - int advance (void); - - /// Pass back the that hasn't been seen in the list. - /// Returns 0 when all items have been seen, else 1. - int next (T *&); - - /** - * @deprecated Delegates to ACE_Double_Linked_List_Iterator, except that - * whereas the Double_Linked_List version of next returns the node, this next - * returns the contents of the node - */ - T *next (void) const; - - /** - * Removes the current item (i.e., ) from the list. - * Note that DLList iterators do not support - * directly (defined in its base class) and you will need to - * release the element returned by it. - */ - int remove (void); - - /// Delegates to ACE_Double_Linked_List_Iterator. - void dump (void) const; - -private: - ACE_DLList *list_; -}; - -/** - * @class ACE_DLList_Reverse_Iterator - * - * @brief A double-linked list container class iterator. - * - * This implementation uses ACE_Double_Linked_List_Iterator to - * perform the logic behind this container class. It delegates - * all of its calls to ACE_Double_Linked_List_Iterator. - */ -template -class ACE_DLList_Reverse_Iterator : public ACE_Double_Linked_List_Reverse_Iterator -{ - - friend class ACE_DLList; - friend class ACE_DLList_Node; - -public: - - // = Initialization method. - ACE_DLList_Reverse_Iterator (ACE_DLList &l); - - /** - * Retasks the iterator to iterate over a new - * Double_Linked_List. This allows clients to reuse an iterator - * without incurring the constructor overhead. If you do use this, - * be aware that if there are more than one reference to this - * iterator, the other "clients" may be very bothered when their - * iterator changes. - * @@ Here be dragons. Comments? - */ - void reset (ACE_DLList &l); - - // = Iteration methods. - /// Move forward by one element in the list. Returns 0 when all the - /// items in the list have been seen, else 1. - int advance (void); - - /// Pass back the that hasn't been seen in the list. - /// Returns 0 when all items have been seen, else 1. - int next (T *&); - - /// @deprecated Delegates to ACE_Double_Linked_List_Iterator. - T *next (void) const; - - /// Removes the current item (i.e., ) from the list. - /// Note that DLList iterators do not support - /// directly (defined in its base class) and you will need to - /// release the element returned by it. - int remove (void); - - /// Delegates to ACE_Double_Linked_List_Iterator. - void dump (void) const; - -private: - ACE_DLList *list_; -}; - -// Forward declaration. -template -class ACE_Fixed_Set; - -/** - * @class ACE_Fixed_Set_Iterator - * - * @brief Iterates through an unordered set. - * - * This implementation of an unordered set uses a fixed array. - * Allows deletions while iteration is occurring. - */ -template -class ACE_Fixed_Set_Iterator -{ -public: - // = Initialization method. - ACE_Fixed_Set_Iterator (ACE_Fixed_Set &s); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the Set. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int advance (void); - - /// Move to the first element in the set. Returns 0 if the - /// set is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Set we are iterating over. - ACE_Fixed_Set &s_; - - /// How far we've advanced over the set. - ssize_t next_; -}; - -/** - * @class ACE_Fixed_Set_Const_Iterator - * - * @brief Iterates through a const unordered set. - * - * This implementation of an unordered set uses a fixed array. - */ -template -class ACE_Fixed_Set_Const_Iterator -{ -public: - // = Initialization method. - ACE_Fixed_Set_Const_Iterator (const ACE_Fixed_Set &s); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the Set. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int advance (void); - - /// Move to the first element in the set. Returns 0 if the - /// set is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Set we are iterating over. - const ACE_Fixed_Set &s_; - - /// How far we've advanced over the set. - ssize_t next_; -}; - - -/** - * @class ACE_Fixed_Set - * - * @brief Implement a simple unordered set of with maximum . - * - * This implementation of an unordered set uses a fixed array. - * It does not allow duplicate members. The set provides linear insertion/deletion - * operations. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Fixed array - * - Duplicates allowed? - * No - * - Random access allowed? - * No - * - Search speed - * Linear - * - Insert/replace speed - * Linear - * - Iterator still valid after change to container? - * Yes - * - Frees memory for removed elements? - * No - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * -# operator== - * - */ -template -class ACE_Fixed_Set -{ -public: - friend class ACE_Fixed_Set_Iterator; - friend class ACE_Fixed_Set_Const_Iterator; - - // Trait definition. - typedef ACE_Fixed_Set_Iterator ITERATOR; - typedef ACE_Fixed_Set_Iterator CONST_ITERATOR; - - // = Initialization and termination methods. - /// Default Constructor. - /** - * Creates an empy set - */ - ACE_Fixed_Set (void); - - /// Copy constructor. - /** - * Initializes a set to be a copy of the set parameter. - */ - ACE_Fixed_Set (const ACE_Fixed_Set &); - - /// Assignment operator. - /** - * Deep copy of one set to another. - */ - void operator= (const ACE_Fixed_Set &); - - /// Destructor. - /** - * Destroys a set. - */ - ~ACE_Fixed_Set (void); - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, otherwise returns 0. - /** - * Performs constant time check to determine if a set is empty. - */ - int is_empty (void) const; - - /// Returns 1 if the container is full, otherwise returns 0. - /** - * Performs a constant time check to see if the set is full. - */ - int is_full (void) const; - - // = Classic unordered set operations. - - ///Linear time insertion of an item unique to the set. - /** - * Insert @a new_item into the set (doesn't allow duplicates). - * Returns -1 if failures occur, 1 if item is already present, else - * 0. - */ - int insert (const T &new_item); - - ///Linear time removal operation of an item. - /** - * Remove first occurrence of from the set. Returns 0 if - * it removes the item, -1 if it can't find the item, and -1 if a - * failure occurs. Removal doesn't reclaim memory for the @a item. - */ - int remove (const T &item); - - /// Finds if @a item occurs in the set. Returns 0 if finds, else -1. - /** - * Performs a linear find operation for the specified @a item. - */ - int find (const T &item) const; - - /// Size of the set. - /** - * Returns the current size of the set. - */ - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Holds the contents of the set. - struct - { - /// Item in the set. - T item_; - - /// Keeps track of whether this item is in use or not. - int is_free_; - } search_structure_[ACE_SIZE]; - - /// Current size of the set. - size_t cur_size_; - - /// Maximum size of the set. - size_t max_size_; -}; - -// Forward declaration. -template -class ACE_Bounded_Set; - -/** - * @class ACE_Bounded_Set_Iterator - * - * @brief Iterates through an unordered set. - * - * This implementation of an unordered set uses a Bounded array. - * Allows deletions while iteration is occurring. - */ -template -class ACE_Bounded_Set_Iterator -{ -public: - // = Initialization method. - ACE_Bounded_Set_Iterator (ACE_Bounded_Set &s); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the Set. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int advance (void); - - /// Move to the first element in the set. Returns 0 if the - /// set is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Set we are iterating over. - ACE_Bounded_Set &s_; - - /// How far we've advanced over the set. - ssize_t next_; -}; - - -/** - * @class ACE_Bounded_Set - * - * @brief Implement a simple unordered set of with maximum - * set at creation time. - * - * This implementation of an unordered set uses a Bounded array. - * This implementation does not allow duplicates. It provides - * linear insert/remove/find operations. Insertion/removal does not - * invalidate iterators, but caution should be taken to ensure - * expected behavior. Once initialized, the object has a maximum size - * which can only be increased by the assignment of another larger Bounded_Set. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Bounded array which can grow via assignment - * - Duplicates allowed? - * No - * - Random access allowed? - * No - * - Search speed - * Linear - * - Insert/replace speed - * Linear - * - Iterator still valid after change to container? - * Yes - * - Frees memory for removed elements? - * No - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * -# operator== - * - */ -template -class ACE_Bounded_Set -{ -public: - friend class ACE_Bounded_Set_Iterator; - - // Trait definition. - typedef ACE_Bounded_Set_Iterator ITERATOR; - - enum - { - DEFAULT_SIZE = 10 - }; - - // = Initialization and termination methods. - /// Construct a Bounded_Set using the default size. - /** - * The default constructor initializes the Bounded_Set to a maximum size - * specified by the DEFAULT_SIZE. - */ - ACE_Bounded_Set (void); - - /// Construct a Bounded_Set with the provided sizeB. - /** - * Initialize the Bounded_Set to have a maximum size equal to the size - * parameter specified. - */ - ACE_Bounded_Set (size_t size); - - /// Construct a Bounded_Set that is a copy of the provides Bounded_Set. - /** - * Initialize the Bounded_Set to be a copy of the Bounded_Set parameter. - */ - ACE_Bounded_Set (const ACE_Bounded_Set &); - - /// Assignment operator. - /** - * The assignment will make a deep copy of the Bounded_Set provided. If the - * rhs has more elements than the capacity of the lhs, then the lhs will be - * deleted and reallocated to accomadate the larger number of elements. - */ - void operator= (const ACE_Bounded_Set &); - - /// Destructor - /** - * Clean up the underlying dynamically allocated memory that is used by - * the Bounded_Set. - */ - ~ACE_Bounded_Set (void); - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, otherwise returns 0. - /** - * A constant time check is performed to determine if the Bounded_Set is - * empty. - */ - int is_empty (void) const; - - /// Returns 1 if the container is full, otherwise returns 0. - /** - * Performs a constant time check to determine if the Bounded_Set is at - * capacity. - */ - int is_full (void) const; - - // = Classic unordered set operations. - - ///Inserts a new element unique to the set. - /** - * Insert @a new_item into the set (doesn't allow duplicates) in linear - * time. - * Returns -1 if failures occur, 1 if item is already present, else - * 0. - */ - int insert (const T &new_item); - - ///Finds the specified element and removes it from the set. - /** - * Remove first occurrence of @a item from the set. Returns 0 if it - * removes the item, -1 if it can't find the item, and -1 if a - * failure occurs. The linear remove operation does not reclaim the - * memory associated with the removed item. - */ - int remove (const T &item); - - /// Finds if @a item occurs in the set. Returns 0 if finds, else -1. - /** - * find preforms a linear search for and returns 0 on successful - * find and -1 otherwise. - */ - int find (const T &item) const; - - /// Size of the set. - /** - * Returns a size_t representing the current size of the set. - */ - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - struct Search_Structure - { - /// Item in the set. - T item_; - - /// Keeps track of whether this item is in use or not. - int is_free_; - }; - - /// Holds the contents of the set. - Search_Structure *search_structure_; - - /// Current size of the set. - size_t cur_size_; - - /// Maximum size of the set. - size_t max_size_; -}; - -/** - * @class ACE_Ordered_MultiSet_Iterator - * - * @brief Implement a bidirectional iterator over an ordered multiset. - * This class template requires that < operator semantics be - * defined for the parameterized type , but does not impose - * any restriction on how that ordering operator is implemented. - */ -template -class ACE_Ordered_MultiSet_Iterator -{ -public: - friend class ACE_Ordered_MultiSet; - - // = Initialization method. - ACE_Ordered_MultiSet_Iterator (ACE_Ordered_MultiSet &s); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the ordered multiset. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item) const; - - /// Repositions the iterator at the first item in the ordered multiset - /// Returns 0 if the list is empty else 1. - int first (void); - - /// Repositions the iterator at the last item in the ordered multiset - /// Returns 0 if the list is empty else 1. - int last (void); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int advance (void); - - /// Move backward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int retreat (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Returns a reference to the internal element is pointing to. - T& operator* (void); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - /// Pointer to the current node in the iteration. - ACE_DNode *current_; - - /// Pointer to the set we're iterating over. - ACE_Ordered_MultiSet &set_; -}; - - -/** - * @class ACE_Ordered_MultiSet - * - * @brief Implement a simple ordered multiset of of unbounded size - * that allows duplicates. This class template requires that < - * operator semantics be defined for the parameterized type , but - * does not impose any restriction on how that ordering operator is - * implemented. The set is implemented as a linked list. - * - * - * Requirements and Performance Characteristics - * - Internal Structure - * Double linked list - * - Duplicates allowed? - * Yes - * - Random access allowed? - * No - * - Search speed - * Linear - * - Insert/replace speed - * Linear - * - Iterator still valid after change to container? - * Yes - * - Frees memory for removed elements? - * Yes - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * -# operator== - * -# operator< - * - * - */ -template -class ACE_Ordered_MultiSet -{ -public: - friend class ACE_Ordered_MultiSet_Iterator; - - // Trait definition. - typedef ACE_Ordered_MultiSet_Iterator ITERATOR; - - // = Initialization and termination methods. - /// Constructor. Use user specified allocation strategy - /// if specified. - /** - * Initialize the set using the allocation strategy specified. If none, use the - * default strategy. - */ - ACE_Ordered_MultiSet (ACE_Allocator *alloc = 0); - - /// Copy constructor. - /** - * Initialize the set to be a copy of the provided set. - */ - ACE_Ordered_MultiSet (const ACE_Ordered_MultiSet &); - - /// Destructor. - /** - * Delete the nodes of the set. - */ - ~ACE_Ordered_MultiSet (void); - - /// Assignment operator. - /** - * Delete the nodes in lhs, and copy the nodes from the rhs. - */ - void operator= (const ACE_Ordered_MultiSet &); - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, otherwise returns 0. - /** - * Constant time check to determine if the set is empty. - */ - int is_empty (void) const; - - /// Size of the set. - /** - * Constant time check to determine the size of the set. - */ - size_t size (void) const; - - // = Classic unordered set operations. - - /// Insert @a new_item into the ordered multiset. - /// Returns -1 if failures occur, else 0. - /** - * Linear time, order preserving insert into the set beginning at the head. - */ - int insert (const T &new_item); - - ///Linear time insert beginning at the point specified by the provided iterator. - /** - * Insert @a new_item into the ordered multiset, starting its search at - * the node pointed to by the iterator, and if insertion was successful, - * updates the iterator to point to the newly inserted node. - * Returns -1 if failures occur, else 0. - */ - int insert (const T &new_item, ITERATOR &iter); - - /// Remove first occurrence of @a item from the set. Returns 0 if - /// it removes the item, -1 if it can't find the item. - /** - * Linear time search operation which removes the item from the set if found . - */ - int remove (const T &item); - - ///Linear find operation. - /** - * Finds first occurrence of @a item in the multiset, using the iterator's - * current position as a hint to improve performance. If find succeeds, - * it positions the iterator at that node and returns 0, or if it cannot - * locate the node, it leaves the iterator alone and just returns -1. - */ - int find (const T &item, ITERATOR &iter) const; - - /// Reset the ACE_Ordered_MultiSet to be empty. - /** - * Delete the nodes inside the set. - */ - void reset (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - /** - * Insert @a item, starting its search at the position given, - * and if successful updates the passed pointer to point to - * the newly inserted item's node. - */ - int insert_from (const T &item, ACE_DNode *start_position, - ACE_DNode **new_position); - - /** - * Looks for first occurance of @a item in the ordered set, using the - * passed starting position as a hint: if there is such an instance, it - * updates the new_position pointer to point to this node and returns 0; - * if there is no such node, then if there is a node before where the - * item would have been, it updates the new_position pointer to point - * to this node and returns -1; if there is no such node, then if there - * is a node after where the item would have been, it updates the - * new_position pointer to point to this node (or 0 if there is no such - * node) and returns 1; - */ - int locate (const T &item, ACE_DNode *start_position, - ACE_DNode *&new_position) const; - - /// Delete all the nodes in the Set. - void delete_nodes (void); - - /// Copy nodes into this set. - void copy_nodes (const ACE_Ordered_MultiSet &); - - /// Head of the bilinked list of Nodes. - ACE_DNode *head_; - - /// Head of the bilinked list of Nodes. - ACE_DNode *tail_; - - /// Current size of the set. - size_t cur_size_; - - /// Allocation strategy of the set. - ACE_Allocator *allocator_; -}; - -// **************************************************************** - -/** - * @class ACE_Array - * - * @brief A dynamic array class. - * - * This class extends ACE_Array_Base, adding comparison operators. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Dynamic array - * - Duplicates allowed? - * Yes - * - Random access allowed? - * Yes - * - Search speed - * N/A - * - Insert/replace speed - * O(1) - * - Iterator still valid after change to container? - * - In general, yes. - * - If array size is changed during iteration, no. - * - Frees memory for removed elements? - * No - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * -# operator!= - * - * @sa ACE_Array_Base. This class inherits its operations and requirements. - */ -template -class ACE_Array : public ACE_Array_Base -{ -public: - // Define a "trait" - typedef T TYPE; - - typedef ACE_Array_Iterator ITERATOR; - - // = Exceptions. - - // = Initialization and termination methods. - - /// Dynamically create an uninitialized array. - /** - * Initialize an empty array of the specified size using the provided - * allocation strategy. - */ - ACE_Array (size_t size = 0, - ACE_Allocator* alloc = 0); - - /// Dynamically initialize the entire array to the . - /** - * Initialize an array the given size placing the default_value in each index. - */ - ACE_Array (size_t size, - const T &default_value, - ACE_Allocator* alloc = 0); - - ///Copy constructor. - /** - * The copy constructor performs initialization by making an exact - * copy of the contents of parameter , i.e., *this == s will - * return true. - */ - ACE_Array (const ACE_Array &s); - - ///Assignment operator - /** - * Assignment operator performs an assignment by making an exact - * copy of the contents of parameter , i.e., *this == s will - * return true. Note that if the of is >= than - * we can copy it without reallocating. However, if - * is < we must delete the , - * reallocate a new , and then copy the contents of . - */ - void operator= (const ACE_Array &s); - - // = Compare operators - - ///Equality comparison operator. - /** - * Compare this array with for equality. Two arrays are equal - * if their 's are equal and all the elements from 0 .. - * are equal. - */ - int operator== (const ACE_Array &s) const; - - ///Inequality comparison operator. - /** - * Compare this array with for inequality such that <*this> != - * is always the complement of the boolean return value of - * <*this> == . - */ - int operator!= (const ACE_Array &s) const; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Containers_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Containers_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Containers_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_CONTAINERS_T_H */ diff --git a/ace/Containers_T.i b/ace/Containers_T.i deleted file mode 100644 index 6ec7895fce2..00000000000 --- a/ace/Containers_T.i +++ /dev/null @@ -1,469 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Containers.i - -template ACE_INLINE int -ACE_Bounded_Stack::is_empty (void) const -{ - ACE_TRACE ("ACE_Bounded_Stack::is_empty"); - return this->top_ == 0; -} - -template ACE_INLINE int -ACE_Bounded_Stack::is_full (void) const -{ - ACE_TRACE ("ACE_Bounded_Stack::is_full"); - return this->top_ >= this->size_; -} - -template ACE_INLINE int -ACE_Bounded_Stack::push (const T &new_item) -{ - ACE_TRACE ("ACE_Bounded_Stack::push"); - if (this->is_full () == 0) - { - this->stack_[this->top_++] = new_item; - return 0; - } - else - return -1; -} - -template ACE_INLINE int -ACE_Bounded_Stack::pop (T &item) -{ - ACE_TRACE ("ACE_Bounded_Stack::pop"); - if (this->is_empty () == 0) - { - item = this->stack_[--this->top_]; - return 0; - } - else - return -1; -} - -template ACE_INLINE int -ACE_Bounded_Stack::top (T &item) const -{ - ACE_TRACE ("ACE_Bounded_Stack::top"); - if (this->is_empty () == 0) - { - item = this->stack_[this->top_ - 1]; - return 0; - } - else - return -1; -} - -template ACE_INLINE size_t -ACE_Bounded_Stack::size (void) const -{ - return this->size_; -} - -//---------------------------------------- - -template ACE_INLINE int -ACE_Fixed_Stack::is_empty (void) const -{ - ACE_TRACE ("ACE_Fixed_Stack::is_empty"); - return this->top_ == 0; -} - -template ACE_INLINE int -ACE_Fixed_Stack::is_full (void) const -{ - ACE_TRACE ("ACE_Fixed_Stack::is_full"); - return this->top_ >= this->size_; -} - -template ACE_INLINE int -ACE_Fixed_Stack::push (const T &new_item) -{ - ACE_TRACE ("ACE_Fixed_Stack::push"); - if (this->is_full () == 0) - { - this->stack_[this->top_++] = new_item; - return 0; - } - else - return -1; -} - -template ACE_INLINE int -ACE_Fixed_Stack::pop (T &item) -{ - ACE_TRACE ("ACE_Fixed_Stack::pop"); - if (this->is_empty () == 0) - { - item = this->stack_[--this->top_]; - return 0; - } - else - return -1; -} - -template ACE_INLINE int -ACE_Fixed_Stack::top (T &item) const -{ - ACE_TRACE ("ACE_Fixed_Stack::top"); - if (this->is_empty () == 0) - { - item = this->stack_[this->top_ - 1]; - return 0; - } - else - return -1; -} - -template ACE_INLINE size_t -ACE_Fixed_Stack::size (void) const -{ - return this->size_; -} - -template ACE_INLINE int -ACE_Unbounded_Stack::is_empty (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Stack::is_empty"); - return this->head_ == this->head_->next_; -} - -template ACE_INLINE int -ACE_Unbounded_Stack::top (T &item) const -{ - ACE_TRACE ("ACE_Unbounded_Stack::top"); - if (this->is_empty () == 0) - { - item = this->head_->next_->item_; - return 0; - } - else - return -1; -} - -template ACE_INLINE int -ACE_Unbounded_Stack::is_full (void) const -{ - ACE_TRACE ("ACE_Unbounded_Stack::is_full"); - return 0; // ??? -} - -template ACE_INLINE size_t -ACE_Unbounded_Stack::size (void) const -{ - return this->cur_size_; -} - -// --- - - -// --- - -template ACE_INLINE int -ACE_Fixed_Set::is_empty (void) const -{ - ACE_TRACE ("ACE_Fixed_Set::is_empty"); - return this->cur_size_ == 0; -} - -template ACE_INLINE int -ACE_Fixed_Set::is_full (void) const -{ - ACE_TRACE ("ACE_Fixed_Set::is_full"); - return this->cur_size_ == this->max_size_; -} - -// --- - -template ACE_INLINE int -ACE_Bounded_Set::is_empty (void) const -{ - ACE_TRACE ("ACE_Bounded_Set::is_empty"); - return this->cur_size_ == 0; -} - -#if !defined (__Lynx__) - // LynxOS 3.0.0 native g++ compiler raises internal error with this inline. -template ACE_INLINE int -ACE_Bounded_Set::is_full (void) const -{ - ACE_TRACE ("ACE_Bounded_Set::is_full"); - return this->cur_size_ == this->max_size_; -} -#endif /* ! __Lynx__ */ - -// -- - -template ACE_INLINE int -ACE_Ordered_MultiSet_Iterator::first (void) -{ - ACE_TRACE ("ACE_Ordered_MultiSet_Iterator::first"); - current_ = set_.head_; - - return (current_ ? 1 : 0); -} - -template ACE_INLINE int -ACE_Ordered_MultiSet_Iterator::last (void) -{ - ACE_TRACE ("ACE_Ordered_MultiSet_Iterator::last"); - current_ = set_.tail_; - - return (current_ ? 1 : 0); -} - -template ACE_INLINE int -ACE_Ordered_MultiSet_Iterator::advance (void) -{ - ACE_TRACE ("ACE_Ordered_MultiSet_Iterator::advance"); - - current_ = current_ ? current_->next_ : 0; - - return (current_ ? 1 : 0); -} - -template ACE_INLINE int -ACE_Ordered_MultiSet_Iterator::retreat (void) -{ - ACE_TRACE ("ACE_Ordered_MultiSet_Iterator::retreat"); - - current_ = current_ ? current_->prev_ : 0; - - return (current_ ? 1 : 0); -} - -template ACE_INLINE int -ACE_Ordered_MultiSet_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Ordered_MultiSet_Iterator::done"); - - return (current_ ? 0 : 1); -} - -template ACE_INLINE void -ACE_Ordered_MultiSet_Iterator::dump (void) const -{ -// ACE_TRACE ("ACE_Ordered_MultiSet_Iterator::dump"); -} - - - -// -- - -template ACE_INLINE int -ACE_Ordered_MultiSet::is_empty (void) const -{ - ACE_TRACE ("ACE_Ordered_MultiSet::is_empty"); - return this->cur_size_ > 0 ? 0 : 1; -} - -template ACE_INLINE size_t -ACE_Ordered_MultiSet::size (void) const -{ -// ACE_TRACE ("ACE_Ordered_MultiSet::size"); - return this->cur_size_; -} - -// **************************************************************** - -template ACE_INLINE -ACE_Array::ACE_Array (size_t size, - ACE_Allocator *alloc) - : ACE_Array_Base (size, alloc) -{ -} - -template ACE_INLINE -ACE_Array::ACE_Array (size_t size, - const T &default_value, - ACE_Allocator *alloc) - : ACE_Array_Base (size, default_value, alloc) -{ -} - -// The copy constructor (performs initialization). - -template ACE_INLINE -ACE_Array::ACE_Array (const ACE_Array &s) - : ACE_Array_Base (s) -{ -} - -// Assignment operator (performs assignment). - -template ACE_INLINE void -ACE_Array::operator= (const ACE_Array &s) -{ - // Check for "self-assignment". - - if (this != &s) - this->ACE_Array_Base::operator= (s); -} - -// Compare this array with for inequality. - -template ACE_INLINE int -ACE_Array::operator!= (const ACE_Array &s) const -{ - return !(*this == s); -} - -// **************************************************************** - - -// **************************************************************** - -template ACE_INLINE void -ACE_DLList::operator= (const ACE_DLList &l) -{ - *(ACE_DLList_Base *) this = l; -} - -template ACE_INLINE int -ACE_DLList::get (T *&item, size_t index) -{ - ACE_DLList_Node *node; - int result = ACE_DLList_Base::get (node, index); - if (result != -1) - item = (T *) node->item_; - return result; -} - -template ACE_INLINE void -ACE_DLList::dump (void) const -{ - ACE_DLList_Base::dump (); -} - -template ACE_INLINE int -ACE_DLList::remove (ACE_DLList_Node *n) -{ - int result = ACE_DLList_Base::remove (n); - ACE_DES_FREE (n, - this->allocator_->free, - ACE_DLList_Node); - return result; -} - -template ACE_INLINE -ACE_DLList::ACE_DLList (ACE_Allocator *alloc ) - : ACE_DLList_Base (alloc) -{ -} - -template ACE_INLINE -ACE_DLList::ACE_DLList (const ACE_DLList &l) - : ACE_DLList_Base ((ACE_DLList &) l) -{ -} - -template ACE_INLINE -ACE_DLList::~ACE_DLList (void) -{ - while (this->delete_head ()) ; -} - -template ACE_INLINE int -ACE_DLList_Iterator::remove (void) -{ - ACE_DLList_Node *temp = this->ACE_Double_Linked_List_Iterator ::next (); - this->ACE_Double_Linked_List_Iterator ::advance (); - return list_->remove (temp); -} - -template ACE_INLINE -ACE_DLList_Iterator::ACE_DLList_Iterator (ACE_DLList &l) - : ACE_Double_Linked_List_Iterator ((ACE_DLList_Base &)l), - list_ (&l) -{ -} - -template ACE_INLINE void -ACE_DLList_Iterator::reset (ACE_DLList &l) -{ - list_ = &l; - this->ACE_Double_Linked_List_Iterator ::reset ((ACE_DLList_Base &)l); -} - -template ACE_INLINE int -ACE_DLList_Iterator::next (T *&ptr) -{ - ACE_DLList_Node *temp = - ACE_Double_Linked_List_Iterator ::next (); - if (temp) - ptr = (T *) temp->item_; - return temp ? 1 : 0; -} - -template ACE_INLINE T * -ACE_DLList_Iterator::next (void) const -{ - ACE_DLList_Node *temp = ACE_Double_Linked_List_Iterator ::next (); - return (T *) (temp ? temp->item_ : 0); -} - -template ACE_INLINE int -ACE_DLList_Iterator::advance (void) -{ - return this->ACE_Double_Linked_List_Iterator ::advance (); -} - -template ACE_INLINE void -ACE_DLList_Iterator::dump (void) const -{ - ACE_Double_Linked_List_Iterator ::dump (); -} - - -template ACE_INLINE int -ACE_DLList_Reverse_Iterator::remove (void) -{ - ACE_DLList_Node *temp = ACE_Double_Linked_List_Reverse_Iterator ::next (); - this->ACE_Double_Linked_List_Reverse_Iterator ::advance (); - return list_->remove (temp); -} - -template ACE_INLINE -ACE_DLList_Reverse_Iterator::ACE_DLList_Reverse_Iterator (ACE_DLList &l) - : ACE_Double_Linked_List_Reverse_Iterator ((ACE_DLList_Base &)l), - list_ (&l) -{ -} - -template ACE_INLINE void -ACE_DLList_Reverse_Iterator::reset (ACE_DLList &l) -{ - list_ = &l; - this->ACE_Double_Linked_List_Reverse_Iterator ::reset ((ACE_DLList_Base &)l); -} - -template ACE_INLINE int -ACE_DLList_Reverse_Iterator::advance (void) -{ - return ACE_Double_Linked_List_Reverse_Iterator ::advance (); -} - -template ACE_INLINE int -ACE_DLList_Reverse_Iterator::next (T *&ptr) -{ - ACE_DLList_Node *temp = - ACE_Double_Linked_List_Reverse_Iterator ::next (); - ptr = (T *) temp->item_; - return ptr ? 1 : 0; -} - -template ACE_INLINE T * -ACE_DLList_Reverse_Iterator::next (void) const -{ - ACE_DLList_Node *temp = ACE_Double_Linked_List_Reverse_Iterator ::next (); - return (T *) (temp ? temp->item_ : 0); -} - - -template ACE_INLINE void -ACE_DLList_Reverse_Iterator::dump (void) const -{ - ACE_Double_Linked_List_Reverse_Iterator ::dump (); -} diff --git a/ace/Copy_Disabled.cpp b/ace/Copy_Disabled.cpp deleted file mode 100644 index 26c3d36834e..00000000000 --- a/ace/Copy_Disabled.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- C++ -*- */ -/** - * @file Copy_Disabled.cpp - * - * $Id$ - * - * @author Carlos O'Ryan - */ - -#include "ace/Copy_Disabled.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Copy_Disabled, "$Id$") - -ACE_Copy_Disabled::ACE_Copy_Disabled (void) -{ -} - diff --git a/ace/Copy_Disabled.h b/ace/Copy_Disabled.h deleted file mode 100644 index d408c013b86..00000000000 --- a/ace/Copy_Disabled.h +++ /dev/null @@ -1,60 +0,0 @@ -// -*- C++ -*- - -//=========================================================================== -/** - * @file Copy_Disabled.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ -//=========================================================================== - -#ifndef ACE_COPY_DISABLED_H -#define ACE_COPY_DISABLED_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Copy_Disabled - * - * @brief Helper class to disable copy construction and assignment - * - * Classes used to control OS and other resources are not "canonical", - * i.e. they have their copy constructor and assignment operators - * disabled. - * This is often done by making the copy constructor and assignment - * operators private, effectively disallowing copying by clients of - * the class (including derived classes). If the copy constructor and - * assingment operators are left unimplemented then the class itself - * cannot make any copies of its instances, because it would result in - * link errors. - * - * To use this class simply use private inheritance: - * - * class Foo : private ACE_Copy_Disabled - * { - * // code here - * }; - * - */ -class ACE_Export ACE_Copy_Disabled -{ -public: - /// Default constructor - ACE_Copy_Disabled (void); - -private: - ACE_Copy_Disabled (const ACE_Copy_Disabled &); - ACE_Copy_Disabled &operator= (const ACE_Copy_Disabled &); -}; - -#include "ace/post.h" - -#endif /* ACE_COPY_DISABLED_H */ diff --git a/ace/DEV.cpp b/ace/DEV.cpp deleted file mode 100644 index 0aa66003edb..00000000000 --- a/ace/DEV.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// DEV.cpp -// $Id$ - - -#include "ace/DEV.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV.i" -#endif - -ACE_RCSID(ace, DEV, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_DEV) - -void -ACE_DEV::dump (void) const -{ - ACE_TRACE ("ACE_DEV::dump"); -} - -// This is the do-nothing constructor. - -ACE_DEV::ACE_DEV (void) -{ - ACE_TRACE ("ACE_DEV::ACE_DEV"); -} - -// Close the device - -int -ACE_DEV::close (void) -{ - ACE_TRACE ("ACE_DEV::close"); - int result = ACE_OS::close (this->get_handle ()); - this->set_handle (ACE_INVALID_HANDLE); - return result; -} diff --git a/ace/DEV.h b/ace/DEV.h deleted file mode 100644 index 46213ececdf..00000000000 --- a/ace/DEV.h +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file DEV.h - * - * $Id$ - * - * @author Gerhard Lenzer - */ -//============================================================================= - - -#ifndef ACE_DEV_H -#define ACE_DEV_H -#include "ace/pre.h" - -#include "ace/IO_SAP.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/DEV_Addr.h" - -// The following is necessary since many C++ compilers don't support -// typedef'd types inside of classes used as formal template -// arguments... ;-(. Luckily, using the C++ preprocessor I can hide -// most of this nastiness! - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -#define ACE_DEV_CONNECTOR ACE_DEV_Connector -#define ACE_DEV_STREAM ACE_DEV_Stream -#else /* TEMPLATES are broken (must be a cfront-based compiler...) */ -#define ACE_DEV_CONNECTOR ACE_DEV_Connector, ACE_DEV_Addr -#define ACE_DEV_STREAM ACE_DEV_Stream, ACE_DEV_Addr -#endif /* ACE_TEMPLATE_TYPEDEFS */ - -/** - * @class ACE_DEV - * - * @brief Defines the member functions for the base class of the - * ACE_DEV abstraction. - */ -class ACE_Export ACE_DEV : public ACE_IO_SAP -{ -public: - /// Close down the DEVICE - int close (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /** - * Disable signal - * This is here to prevent Win32 from - * disabling SPIPE using socket calls - */ - int disable (int signum) const ; - -protected: - /// Ensure that this class is an abstract base class - ACE_DEV (void); -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV.i" -#endif - -#include "ace/post.h" -#endif /* ACE_DEV_H */ diff --git a/ace/DEV.i b/ace/DEV.i deleted file mode 100644 index 529824f129c..00000000000 --- a/ace/DEV.i +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// DEV.i - -ASYS_INLINE int -ACE_DEV::disable (int signum) const -{ -#if defined (ACE_WIN32) - ACE_UNUSED_ARG (signum) ; - return 0 ; -#else /* ACE_WIN32 */ - return ACE_IO_SAP::disable (signum) ; -#endif /* ACE_WIN32 */ -} diff --git a/ace/DEV_Addr.cpp b/ace/DEV_Addr.cpp deleted file mode 100644 index 43dde161857..00000000000 --- a/ace/DEV_Addr.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// DEV_Addr.cpp -// $Id$ - -#include "ace/DEV_Addr.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/DEV_Addr.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, DEV_Addr, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Addr) - -void -ACE_DEV_Addr::dump (void) const -{ - ACE_TRACE ("ACE_DEV_Addr::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("devname_ = %s"), this->devname_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// Do nothing constructor. - -ACE_DEV_Addr::ACE_DEV_Addr (void) - : ACE_Addr (AF_DEV, sizeof this->devname_) -{ - ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr"); - - (void) ACE_OS::memset ((void *) &this->devname_, - 0, sizeof this->devname_); -} - -int -ACE_DEV_Addr::set (const ACE_DEV_Addr &sa) -{ - this->base_set (sa.get_type (), sa.get_size ()); - - if (sa.get_type () == AF_ANY) - (void) ACE_OS::memset ((void *) &this->devname_, - 0, - sizeof this->devname_); - else - (void) ACE_OS::memcpy ((void *) &this->devname_, - (void *) &sa.devname_, - sa.get_size ()); - return 0; -} - -// Copy constructor. - -ACE_DEV_Addr::ACE_DEV_Addr (const ACE_DEV_Addr &sa) - : ACE_Addr (AF_DEV, sizeof this->devname_) -{ - ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr"); - - this->set (sa); -} - -ACE_DEV_Addr::ACE_DEV_Addr (const ACE_TCHAR *devname) - : ACE_Addr (AF_DEV, sizeof this->devname_) -{ - ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr"); - - this->set (devname); -} - -ACE_DEV_Addr & -ACE_DEV_Addr::operator= (const ACE_DEV_Addr &sa) -{ - ACE_TRACE ("ACE_DEV_Addr::operator="); - - if (this != &sa) - (void) ACE_OS::memcpy ((void *) &this->devname_, - (void *) &sa.devname_, - sa.get_size ()); - return *this; -} - diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h deleted file mode 100644 index a549fb74b6d..00000000000 --- a/ace/DEV_Addr.h +++ /dev/null @@ -1,86 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file DEV_Addr.h - * - * $Id$ - * - * @author Gerhard Lenzer and Douglas C. Schmidt - */ -//========================================================================== - - -#ifndef ACE_DEV_ADDR_H -#define ACE_DEV_ADDR_H - -#include "ace/pre.h" - -#include "ace/Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -/** - * @class ACE_DEV_Addr - * - * @brief Defines device address family address format. - */ -class ACE_Export ACE_DEV_Addr : public ACE_Addr -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_DEV_Addr (void); - - /// Copy constructor. - ACE_DEV_Addr (const ACE_DEV_Addr &sa); - - /// Acts like a copy constructor. - int set (const ACE_DEV_Addr &sa); - - /// Create a ACE_DEV_Addr from a device name. - ACE_EXPLICIT ACE_DEV_Addr (const ACE_TCHAR *devname); - - /// Create a ACE_Addr from a ACE_DEV pathname. - void set (const ACE_TCHAR *devname); - - /// Assignment operator. - ACE_DEV_Addr &operator= (const ACE_DEV_Addr &); - - /// Return a pointer to the address. - virtual void *get_addr (void) const; - - /// Transform the current address into string format. - virtual int addr_to_string (ACE_TCHAR *addr, size_t) const; - - /// Compare two addresses for equality. - int operator == (const ACE_DEV_Addr &SAP) const; - - /// Compare two addresses for inequality. - int operator != (const ACE_DEV_Addr &SAP) const; - - /// Return the path name used for the rendezvous point. - const ACE_TCHAR *get_path_name (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Name of the device. - ACE_TCHAR devname_[MAXNAMLEN + 1]; -}; - -#if defined (__ACE_INLINE__) -#include "ace/DEV_Addr.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_DEV_ADDR_H */ diff --git a/ace/DEV_Addr.i b/ace/DEV_Addr.i deleted file mode 100644 index 3be347d99b9..00000000000 --- a/ace/DEV_Addr.i +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/SString.h" - -ACE_INLINE void -ACE_DEV_Addr::set (const ACE_TCHAR *devname) -{ - ACE_TRACE ("ACE_DEV_Addr::set"); - - this->ACE_Addr::base_set - (AF_DEV, ACE_static_cast (int, ACE_OS::strlen (devname))); - ACE_OS::strsncpy (this->devname_, devname, MAXNAMLEN); -} - -// Transform the current address into string format. - -ACE_INLINE int -ACE_DEV_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const -{ - ACE_TRACE ("ACE_DEV_Addr::addr_to_string"); - - ACE_OS::strsncpy (s, this->devname_, len); - return 0; -} - -// Return a pointer to the address. - -ACE_INLINE void * -ACE_DEV_Addr::get_addr (void) const -{ - ACE_TRACE ("ACE_DEV_Addr::get_addr"); - - return (void *) &this->devname_; -} - -// Compare two addresses for equality. - -ACE_INLINE int -ACE_DEV_Addr::operator == (const ACE_DEV_Addr &sap) const -{ - ACE_TRACE ("ACE_DEV_Addr::operator =="); - - return ACE_OS::strcmp (this->devname_, sap.devname_) == 0; -} - -// Compare two addresses for inequality. - -ACE_INLINE int -ACE_DEV_Addr::operator != (const ACE_DEV_Addr &sap) const -{ - ACE_TRACE ("ACE_DEV_Addr::operator !="); - - return !((*this) == sap); // This is lazy, of course... ;-). -} - -// Return the path name used for the rendezvous point. - -ACE_INLINE const ACE_TCHAR * -ACE_DEV_Addr::get_path_name (void) const -{ - ACE_TRACE ("ACE_DEV_Addr::get_path_name"); - - return this->devname_; -} diff --git a/ace/DEV_Connector.cpp b/ace/DEV_Connector.cpp deleted file mode 100644 index 35463c05aaf..00000000000 --- a/ace/DEV_Connector.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// DEV_Connector.cpp -// $Id$ - -#include "ace/DEV_Connector.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV_Connector.i" -#endif - -ACE_RCSID(ace, DEV_Connector, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector) - -void -ACE_DEV_Connector::dump (void) const -{ - ACE_TRACE ("ACE_DEV_Connector::dump"); -} - -ACE_DEV_Connector::ACE_DEV_Connector (void) -{ - ACE_TRACE ("ACE_DEV_Connector::ACE_DEV_Connector"); -} - -int -ACE_DEV_Connector::connect (ACE_DEV_IO &new_io, - const ACE_DEV_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &, - int, - int flags, - int perms) -{ - ACE_TRACE ("ACE_DEV_Connector::connect"); - - ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout, - remote_sap.get_path_name (), - flags, perms); - new_io.set_handle (handle); - new_io.addr_ = remote_sap; // class copy. - return handle == ACE_INVALID_HANDLE ? -1 : 0; -} - diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h deleted file mode 100644 index c43e726cd59..00000000000 --- a/ace/DEV_Connector.h +++ /dev/null @@ -1,104 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file DEV_Connector.h - * - * $Id$ - * - * @author Gerhard Lenzer and Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_DEV_CONNECTOR_H -#define ACE_DEV_CONNECTOR_H -#include "ace/pre.h" - -#include "ace/DEV_IO.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_DEV_Connector - * - * @brief Defines an active connection factory for the ACE_DEV wrappers. - */ -class ACE_Export ACE_DEV_Connector -{ -public: - /// Default constructor. - ACE_DEV_Connector (void); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the maximum amount of time to wait before timing out. If the - * time expires before the connection is made . The - * is the value of local address to bind to. If it's - * the default value of then the user is letting - * the OS do the binding. If == 1 then the - * is reused, even if it hasn't been cleanedup yet. - * The and arguments are passed down to the - * method. - */ - ACE_DEV_Connector (ACE_DEV_IO &new_io, - const ACE_DEV_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the maximum amount of time to wait before timing out. If the - * time expires before the connection is made . The - * is the value of local address to bind to. If it's - * the default value of then the user is letting - * the OS do the binding. If == 1 then the - * is reused, even if it hasn't been cleanedup yet. - * The and arguments are passed down to the - * method. - */ - int connect (ACE_DEV_IO &new_io, - const ACE_DEV_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); - - /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - // = Meta-type info - typedef ACE_DEV_Addr PEER_ADDR; - typedef ACE_DEV_IO PEER_STREAM; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV_Connector.i" -#endif - -#include "ace/post.h" -#endif /* ACE_DEV_CONNECTOR_H */ diff --git a/ace/DEV_Connector.i b/ace/DEV_Connector.i deleted file mode 100644 index 8b2af2372f0..00000000000 --- a/ace/DEV_Connector.i +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Creates a Local ACE_DEV. - -ASYS_INLINE -ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, - const ACE_DEV_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_DEV_Connector::ACE_DEV_Connector"); - if (this->connect (new_io, remote_sap, timeout, local_sap, - reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE - && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("address %s, %p\n"), - remote_sap.get_path_name (), ACE_LIB_TEXT ("ACE_DEV_IO"))); -} - -ASYS_INLINE int -ACE_DEV_Connector::reset_new_handle (ACE_HANDLE handle) -{ - ACE_UNUSED_ARG (handle); - // Nothing to do here since the handle is not a socket - return 0; -} - diff --git a/ace/DEV_IO.cpp b/ace/DEV_IO.cpp deleted file mode 100644 index 221dc888e35..00000000000 --- a/ace/DEV_IO.cpp +++ /dev/null @@ -1,126 +0,0 @@ -// DEV_IO.cpp -// $Id$ - -#include "ace/DEV_IO.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV_IO.i" -#endif - -ACE_RCSID(ace, DEV_IO, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_DEV_IO) - -// Return the local endpoint address. - -int -ACE_DEV_IO::get_local_addr (ACE_DEV_Addr &addr) const -{ - ACE_TRACE ("ACE_DEV_IO::get_local_addr"); - - addr = this->addr_; - return 0; -} - -// Return the address of the remotely connected peer (if there is -// one). - -int -ACE_DEV_IO::get_remote_addr (ACE_DEV_Addr &addr) const -{ - ACE_TRACE ("ACE_DEV_IO::get_remote_addr"); - addr = this->addr_; - return 0; -} - -void -ACE_DEV_IO::dump (void) const -{ - ACE_TRACE ("ACE_DEV_IO::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->addr_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// Simple-minded do nothing constructor. - -ACE_DEV_IO::ACE_DEV_IO (void) -{ - ACE_TRACE ("ACE_DEV_IO::ACE_DEV_IO"); -} - -// Send N char *ptrs and int lengths. Note that the char *'s precede -// the ints (basically, an varargs version of writev). The count N is -// the *total* number of trailing arguments, *not* a couple of the -// number of tuple pairs! - -ssize_t -ACE_DEV_IO::send (size_t n, ...) const -{ - ACE_TRACE ("ACE_DEV_IO::send"); - va_list argp; - int total_tuples = ACE_static_cast (int, (n / 2)); - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::writev (this->get_handle (), iovp, total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} - -// This is basically an interface to ACE_OS::readv, that doesn't use the -// struct iovec explicitly. The ... can be passed as an arbitrary -// number of (char *ptr, int len) tuples. However, the count N is the -// *total* number of trailing arguments, *not* a couple of the number -// of tuple pairs! - -ssize_t -ACE_DEV_IO::recv (size_t n, ...) const -{ - ACE_TRACE ("ACE_DEV_IO::recv"); - va_list argp; - int total_tuples = ACE_static_cast (int, (n / 2)); - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::readv (this->get_handle (), iovp, total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} - diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h deleted file mode 100644 index b0b593fb280..00000000000 --- a/ace/DEV_IO.h +++ /dev/null @@ -1,135 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file DEV_IO.h - * - * $Id$ - * - * @author Gerhard Lenzer - * @author Douglas C. Schmidt - */ -//============================================================================= - - -#ifndef ACE_DEV_IO_H -#define ACE_DEV_IO_H -#include "ace/pre.h" - -#include "ace/DEV.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/ACE.h" - - -/** - * @class ACE_DEV_IO - * - * @brief Read/Write operations on Devices. - */ -class ACE_Export ACE_DEV_IO : public ACE_DEV -{ -public: - friend class ACE_DEV_Connector; - - /// Default constructor. - ACE_DEV_IO (void); - - // = Various send operations. - /// send upto bytes in . - ssize_t send (const void *buf, size_t n) const; - - /// Recv upto bytes in . - ssize_t recv (void *buf, size_t n) const; - - /// Send n bytes, keep trying until n are sent. - ssize_t send_n (const void *buf, size_t n) const; - - /// Recv n bytes, keep trying until n are received. - ssize_t recv_n (void *buf, size_t n) const; - -#if defined (ACE_HAS_STREAM_PIPES) - /// Recv bytes via STREAM pipes using "band" mode. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *band, - int *flags) const; - - /// Send bytes via STREAM pipes using "band" mode. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int band, - int flags) const; - - /// Recv and via STREAM pipes. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *flags) const; - - /// Send and via STREAM pipes. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int flags = 0) const; -#endif /* ACE_HAS_STREAM_PIPES */ - - /// Send iovecs via <::writev>. - ssize_t send (const iovec iov[], size_t n) const; - - /// Recv iovecs via <::readv>. - ssize_t recv (iovec iov[], size_t n) const; - - /** - * Send N char *ptrs and int lengths. Note that the char *'s - * precede the ints (basically, an varargs version of writev). The - * count N is the *total* number of trailing arguments, *not* a - * couple of the number of tuple pairs! - */ - ssize_t send (size_t n, ...) const; - - /** - * This is an interface to ::readv, that doesn't use the struct - * iovec explicitly. The ... can be passed as an arbitrary number - * of (char *ptr, int len) tuples. However, the count N is the - * *total* number of trailing arguments, *not* a couple of the - * number of tuple pairs! - */ - ssize_t recv (size_t n, ...) const; - - /// Send bytes via Win32 WriteFile using overlapped I/O. - ssize_t send (const void *buf, size_t n, ACE_OVERLAPPED *overlapped) const; - - /// Recv bytes via Win32 ReadFile using overlapped I/O. - ssize_t recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const; - - /// Dump the state of an object. - void dump (void) const; - - // = The following two methods are no-ops to keep the - // happy. - /// Return the local endpoint address. - int get_local_addr (ACE_DEV_Addr &) const; - - /// Return the address of the remotely connected peer (if there is - /// one). - int get_remote_addr (ACE_DEV_Addr &) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - // = Meta-type info - typedef ACE_DEV_Addr PEER_ADDR; - -private: - /// Address of device we are connected to. - ACE_DEV_Addr addr_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV_IO.i" -#endif - -#include "ace/post.h" -#endif /* ACE_DEV_IO_H */ diff --git a/ace/DEV_IO.i b/ace/DEV_IO.i deleted file mode 100644 index 0e18eee81ba..00000000000 --- a/ace/DEV_IO.i +++ /dev/null @@ -1,101 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// DEV_IO.i - -// Send exactly N bytes from BUF to this device. Keeping trying until -// this many bytes are sent. - -ASYS_INLINE ssize_t -ACE_DEV_IO::send_n (const void *buf, size_t n) const -{ - ACE_TRACE ("ACE_DEV_IO::send_n"); - return ACE::write_n (this->get_handle (), buf, n); -} - -// Receive exactly N bytes from this file into BUF. Keep trying until -// this many bytes are received. - -ASYS_INLINE ssize_t -ACE_DEV_IO::recv_n (void *buf, size_t n) const -{ - ACE_TRACE ("ACE_DEV_IO::recv_n"); - return ACE::read_n (this->get_handle (), buf, n); -} - -ASYS_INLINE ssize_t -ACE_DEV_IO::send (const void *buf, size_t n) const -{ - ACE_TRACE ("ACE_DEV_IO::send"); - return ACE_OS::write (this->get_handle (), (const char *) buf, n); -} - -ASYS_INLINE ssize_t -ACE_DEV_IO::recv (void *buf, size_t n) const -{ - ACE_TRACE ("ACE_DEV_IO::recv"); - return ACE_OS::read (this->get_handle (), (char *) buf, n); -} - -ASYS_INLINE ssize_t -ACE_DEV_IO::send (const iovec iov[], size_t n) const -{ - ACE_TRACE ("ACE_DEV_IO::send"); - return ACE_OS::writev (this->get_handle (), iov, ACE_static_cast (int, n)); -} - -ASYS_INLINE ssize_t -ACE_DEV_IO::recv (iovec iov[], size_t n) const -{ - ACE_TRACE ("ACE_DEV_IO::recv"); - return ACE_OS::readv (this->get_handle (), iov, ACE_static_cast (int, n)); -} - -ASYS_INLINE ssize_t -ACE_DEV_IO::send (const void *buf, size_t n, - ACE_OVERLAPPED *overlapped) const -{ - ACE_TRACE ("ACE_DEV_IO::send"); - return ACE_OS::write (this->get_handle (), - (const char *) buf, n, - overlapped); -} - -ASYS_INLINE ssize_t -ACE_DEV_IO::recv (void *buf, size_t n, - ACE_OVERLAPPED *overlapped) const -{ - ACE_TRACE ("ACE_DEV_IO::recv"); - return ACE_OS::read (this->get_handle (), (char *) buf, n, - overlapped); -} - -#if defined (ACE_HAS_STREAM_PIPES) -ASYS_INLINE ssize_t -ACE_DEV_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const -{ - ACE_TRACE ("ACE_DEV_IO::recv"); - return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); -} - -ASYS_INLINE ssize_t -ACE_DEV_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const -{ - ACE_TRACE ("ACE_DEV_IO::send"); - return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); -} - -ASYS_INLINE ssize_t -ACE_DEV_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const -{ - ACE_TRACE ("ACE_DEV_IO::recv"); - return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); -} - -ASYS_INLINE ssize_t -ACE_DEV_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const -{ - ACE_TRACE ("ACE_DEV_IO::send"); - return ACE_OS::putmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); -} -#endif /* ACE_HAS_STREAM_PIPES */ diff --git a/ace/DLL.cpp b/ace/DLL.cpp deleted file mode 100644 index a07a9ff5c99..00000000000 --- a/ace/DLL.cpp +++ /dev/null @@ -1,220 +0,0 @@ -// DLL.cpp -// $Id$ - -#include "ace/DLL.h" - -#include "ace/Log_Msg.h" -#include "ace/ACE.h" -#include "ace/DLL_Manager.h" - -ACE_RCSID(ace, DLL, "$Id$") - -// Default constructor. Also, by default, the object will be closed -// before it is destroyed. - -ACE_DLL::ACE_DLL (int close_on_destruction) - : open_mode_ (0), - dll_name_ (0), - close_on_destruction_ (close_on_destruction), - dll_handle_ (0), - error_ (0) -{ - ACE_TRACE ("ACE_DLL::ACE_DLL (int)"); -} - -ACE_DLL::ACE_DLL (const ACE_DLL &rhs) -{ - ACE_TRACE ("ACE_DLL::ACE_DLL (const ACE_DLL &)"); - - // Have to do this since open() calls close()... - this->dll_handle_ = 0; - this->dll_name_ = 0; - this->close_on_destruction_ = 1; - this->error_ = 0; - - if (rhs.dll_name_) - // This will automatically up the refcount. - if (this->open (rhs.dll_name_, rhs.open_mode_, this->close_on_destruction_) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL::copy_ctor: error: %s\n"), - this->error ())); -} - -// If the library name and the opening mode are specified than on -// object creation the library is implicitly opened. - -ACE_DLL::ACE_DLL (const ACE_TCHAR *dll_name, - int open_mode, - int close_on_destruction) - : open_mode_ (open_mode), - dll_name_ (0), - close_on_destruction_ (close_on_destruction), - dll_handle_ (0), - error_ (0) -{ - ACE_TRACE ("ACE_DLL::ACE_DLL"); - - if (this->open (dll_name, this->open_mode_, close_on_destruction) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL::open: error calling open: %s\n"), - this->error ())); -} - -// The library is closed before the class gets destroyed depending on -// the close_on_destruction value specified which is stored in -// close_on_destruction_. - -ACE_DLL::~ACE_DLL (void) -{ - ACE_TRACE ("ACE_DLL::~ACE_DLL"); - - this->close (); -} - -// This method opens the library based on the mode specified using the -// ACE_SHLIB_HANDLE which is obtained on making the ACE_OS::dlopen call. -// The default mode is: -// RTLD_LAZY Only references to data symbols are relocate when the -// object is first loaded. -// The other modes include: -// RTLD_NOW All necessary relocations are performed when the -// object is first loaded. -// RTLD_GLOBAL The object symbols are made available for the -// relocation processing of any other object. - -int -ACE_DLL::open (const ACE_TCHAR *dll_filename, - int open_mode, - int close_on_destruction) -{ - ACE_TRACE ("ACE_DLL::open"); - - return open_i (dll_filename, open_mode, close_on_destruction); -} - -int -ACE_DLL::open_i (const ACE_TCHAR *dll_filename, - int open_mode, - int close_on_destruction, - ACE_SHLIB_HANDLE handle) -{ - ACE_TRACE ("ACE_DLL::open_i"); - - this->error_ = 0; - - if (!dll_filename) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL::open_i: dll_name: %s\n"), - this->dll_name_), - -1); - - if (this->dll_handle_) - { - // If we have a good handle and its the same name, just return. - if (ACE_OS_String::strcmp (this->dll_name_, dll_filename) == 0) - return 0; - else - this->close (); - } - if (!this->dll_name_) - { - this->dll_name_ = ACE::strnew (dll_filename); - } - this->open_mode_ = open_mode; - this->close_on_destruction_ = close_on_destruction; - - this->dll_handle_ = ACE_DLL_Manager::instance()->open_dll (this->dll_name_, - this->open_mode_, - handle); - - if (!this->dll_handle_) - this->error_ = 1; - - return this->error_ ? -1 : 0; -} - -// The symbol refernce of the name specified is obtained. - -void * -ACE_DLL::symbol (const ACE_TCHAR *sym_name, int ignore_errors) -{ - ACE_TRACE ("ACE_DLL::symbol"); - - this->error_ = 0; - - void *sym = this->dll_handle_->symbol (sym_name, ignore_errors); - - if (!sym) - this->error_ = 1; - - return sym; -} - -// The library is closed using the ACE_SHLIB_HANDLE obejct. i.e. The -// shared object is now disassociated form the current process. - -int -ACE_DLL::close (void) -{ - ACE_TRACE ("ACE_DLL::close"); - int retval = 0; - - if (this->close_on_destruction_ && this->dll_name_ && - (retval = ACE_DLL_Manager::instance ()->close_dll (this->dll_name_)) != 0) - this->error_ = 1; - - // Even if close_dll() failed, go ahead and cleanup. - this->dll_handle_ = 0; - delete[] this->dll_name_; - this->dll_name_ = 0; - this->close_on_destruction_ = 0; - - return retval; -} - -// This method is used return the last error of a library operation. - -ACE_TCHAR * -ACE_DLL::error (void) const -{ - ACE_TRACE ("ACE_DLL::error"); - if (this->error_) - return ACE_const_cast (ACE_TCHAR *, - ACE_LIB_TEXT ("Error: check log for details.")); - - return 0; -} - -// Return the handle to the user either temporarily or forever, thus -// orphaning it. If 0 means the user wants the handle forever and if 1 -// means the user temporarily wants to take the handle. - -ACE_SHLIB_HANDLE -ACE_DLL::get_handle (int become_owner) const -{ - ACE_TRACE ("ACE_DLL::get_handle"); - - ACE_SHLIB_HANDLE handle = ACE_SHLIB_INVALID_HANDLE; - - if (this->dll_handle_) - handle = this->dll_handle_->get_handle (become_owner); - - return handle; -} - -// Set the handle for the DLL. By default, the object will be closed -// before it is destroyed. - -int -ACE_DLL::set_handle (ACE_SHLIB_HANDLE handle, - int close_on_destruction) -{ - ACE_TRACE ("ACE_DLL::set_handle"); - - // Create a unique name. Note that this name is only quaranteed - // to be unique for the life of this object. - ACE_TCHAR temp[ACE_UNIQUE_NAME_LEN]; - ACE_OS::unique_name (this, temp, ACE_UNIQUE_NAME_LEN); - - return this->open_i (temp, 1, close_on_destruction, handle); -} diff --git a/ace/DLL.h b/ace/DLL.h deleted file mode 100644 index 07648499831..00000000000 --- a/ace/DLL.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file DLL.h - * - * $Id$ - * - * @author Kirthika Parameswaran - */ -//============================================================================= - - -#ifndef ACE_DLL_H -#define ACE_DLL_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_DLL_Handle; - -/** - * @class ACE_DLL - * - * @brief Provides an abstract interface for handling various DLL - * operations. - * - * This class is an wrapper over the various methods for utilizing - * a dynamically linked library (DLL), which is called a shared - * library on some platforms. Operations open(), close(), and - * symbol() have been implemented to help opening/closing and - * extracting symbol information from a DLL, respectively. - */ -class ACE_Export ACE_DLL -{ -public: - // = Initialization and termination methods. - - /// Default constructor. By default, the close() operation on the - /// object will be invoked before it is destroyed. - ACE_DLL (int close_on_destruction = 1); - - /** - * This constructor opens and dynamically links @a dll_name. The - * default mode is , which loads identifier symbols but - * not the symbols for functions, which are loaded dynamically - * on-demand. Other supported modes include: , which - * performs all necessary relocations when @a dll_name is first - * loaded and , which makes symbols available for - * relocation processing of any other DLLs. - */ - ACE_DLL (const ACE_TCHAR *dll_name, - int open_mode = ACE_DEFAULT_SHLIB_MODE, - int close_on_destruction = 1); - - /// Copy constructor. - ACE_DLL (const ACE_DLL &); - - /** - * This method opens and dynamically links @a dll_name. The default - * mode is , which loads identifier symbols but not the - * symbols for functions, which are loaded dynamically on-demand. - * Other supported modes include: , which performs all - * necessary relocations when @a dll_name>is first loaded and - * , which makes symbols available for relocation - * processing of any other DLLs. - * @param dll_name The name of the dll. - * @param open_mode How the dll is opened. - * @param close_on_destruction Close the handle in the destructor. - * @retval -1 On failure - * @retval 0 On success. - */ - int open (const ACE_TCHAR *dll_name, - int open_mode = ACE_DEFAULT_SHLIB_MODE, - int close_on_destruction = 1); - - /// Call to close the DLL object. - int close (void); - - /** - * Called when the DLL object is destroyed -- invokes close() if the - * flag is set in the constructor or open() - * method. - */ - ~ACE_DLL (void); - - /// If @a symbol_name is in the symbol table of the DLL a pointer to - /// the @a symbol_name is returned. Otherwise, returns 0. Setting - /// ignore_errors = 1 allows you to probe a dll without generating - /// error messages in the log. Handy for determining the capabilities - /// of a library. - void *symbol (const ACE_TCHAR *symbol_name, int ignore_errors = 0); - - /// Returns a pointer to a string explaining that an error occured. You - /// will need to consult the error log for the actual error string - /// returned by the OS. - ACE_TCHAR *error (void) const; - - /** - * Return the handle to the caller. If @a become_owner is non-0 then - * caller assumes ownership of the handle and the ACE_DLL object - * won't call close() when it goes out of scope, even if - * is set. - */ - ACE_SHLIB_HANDLE get_handle (int become_owner = 0) const; - - /// Set the handle for the DLL object. By default, the close() operation on - /// the object will be invoked before it is destroyed. - int set_handle (ACE_SHLIB_HANDLE handle, int close_on_destruction = 1); - -private: - - int open_i (const ACE_TCHAR *dll_name, - int open_mode = ACE_DEFAULT_SHLIB_MODE, - int close_on_destruction = 1, - ACE_SHLIB_HANDLE handle = 0); - - - /// Open mode. - int open_mode_; - - /// Keep track of the name of the loaded dll, so it can be used - /// to remove framework components, singletons that live in the dll, - /// prior to unloading the dll in the close() method. - ACE_TCHAR *dll_name_; - - /// This flag keeps track of whether we should close the handle - /// automatically when the destructor runs. - int close_on_destruction_; - - ACE_DLL_Handle *dll_handle_; - - /// Flag to record if the last operation had an error. - int error_; - - // = Disallow copying and assignment since we don't handle these. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_DLL &)) -}; - -#include "ace/post.h" -#endif /* ACE_DLL_H */ diff --git a/ace/DLL_Manager.cpp b/ace/DLL_Manager.cpp deleted file mode 100644 index 93f6e4889a9..00000000000 --- a/ace/DLL_Manager.cpp +++ /dev/null @@ -1,496 +0,0 @@ -// DLL_Manager.cpp -// $Id$ - -#include "ace/DLL_Manager.h" - -#include "ace/Log_Msg.h" -#include "ace/ACE.h" -#include "ace/Framework_Component.h" - -#include "ace/OS.h" -#include "ace/Lib_Find.h" -#include "ace/Object_Manager.h" - -ACE_RCSID(ace, DLL, "$Id$") - -/******************************************************************/ - -sig_atomic_t ACE_DLL_Handle::open_called_ = 0; - -ACE_DLL_Handle::ACE_DLL_Handle (void) - : refcount_ (0), - dll_name_ (0), - handle_ (ACE_SHLIB_INVALID_HANDLE) -{ - ACE_TRACE ("ACE_DLL_Handle::ACE_DLL_Handle"); -} - -ACE_DLL_Handle::~ACE_DLL_Handle (void) -{ - ACE_TRACE ("ACE_DLL_Handle::~ACE_DLL_Handle"); - this->close (1); - delete[] this->dll_name_; -} - -const ACE_TCHAR * -ACE_DLL_Handle::dll_name (void) const -{ - ACE_TRACE ("ACE_DLL_Handle::dll_name"); - return this->dll_name_; -} - -int -ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, - int open_mode, - ACE_SHLIB_HANDLE handle) -{ - ACE_TRACE ("ACE_DLL_Handle::open"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - //ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("dll_name: %s; open_mode: %d \n"), - // dll_name, - // open_mode)); - - if (this->dll_name_) - { - // Once dll_name_ has been set, it can't be changed.. - if (ACE_OS_String::strcmp (this->dll_name_, dll_name) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Handle::open: error, ") - ACE_LIB_TEXT ("tried to reopen %s with name %s\n"), - this->dll_name_, dll_name), - -1); - } - else - this->dll_name_ = ACE::strnew (dll_name); - - if (!this->open_called_) - this->open_called_ = 1; - - // If it hasn't been loaded yet, go ahead and do that now. - if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) - { - if (handle) - this->handle_ = handle; - else - { - if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_DLL_Handle::open: calling dlopen on ") - ACE_LIB_TEXT ("\"%s\"\n"), dll_name)); - // Find out where the library is - ACE_TCHAR dll_pathname[MAXPATHLEN + 1]; - - // Transform the pathname into the appropriate dynamic link library - // by searching the ACE_LD_SEARCH_PATH. - ACE_Lib_Find::ldfind (dll_name, - dll_pathname, - (sizeof dll_pathname / sizeof (ACE_TCHAR))); - - // The ACE_SHLIB_HANDLE object is obtained. - this->handle_ = ACE_OS::dlopen (dll_pathname, - open_mode); - -#if defined (AIX) - if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) - { - // AIX often puts the shared library file (most often named shr.o) - // inside an archive library. If this is an archive library - // name, then try appending [shr.o] and retry. - if (0 != ACE_OS_String::strstr (dll_pathname, ACE_LIB_TEXT (".a"))) - { - ACE_OS_String::strcat (dll_pathname, ACE_LIB_TEXT ("(shr.o)")); - open_mode |= RTLD_MEMBER; - this->handle_ = ACE_OS::dlopen (dll_pathname, open_mode); - } - } -#endif /* AIX */ - - if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager_Ex::open: Invalid handle: %s\n"), - this->error ()->c_str ()), - -1); - } - } - } - - ++this->refcount_; - return 0; -} - -int -ACE_DLL_Handle::close (int unload) -{ - ACE_TRACE ("ACE_DLL_Handle::close"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - int retval = 0; - - // Since we don't actually unload the dll as soon as the refcount - // reaches zero, we need to make sure we don't decrement it below - // zero. - if (this->refcount_ > 0) - --this->refcount_; - else - this->refcount_ = 0; - - if (this->refcount_ == 0 && - this->handle_ != ACE_SHLIB_INVALID_HANDLE && - unload == 1) - { - if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_DLL_Handle::close: unloading %s\n"), - this->dll_name_)); - // First remove any associated Framework Components. - ACE_Framework_Repository * frPtr= ACE_Framework_Repository::instance (); - - if (frPtr) - { - frPtr->remove_dll_components (this->dll_name_); - } - - retval = ACE_OS::dlclose (this->handle_); - this->handle_ = ACE_SHLIB_INVALID_HANDLE; - } - - if (retval != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Handle::close error: \"%s\"."), - this->error ()->c_str ()), - retval); - return retval; -} - -sig_atomic_t -ACE_DLL_Handle::refcount (void) const -{ - return this->refcount_; -} - -void * -ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, int ignore_errors) -{ - ACE_TRACE ("ACE_DLL_Handle::symbol"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - ACE_Auto_Array_Ptr auto_name (ACE_Lib_Find::ldname (sym_name)); - - void *sym = ACE_OS::dlsym (this->handle_, auto_name.get ()); - - // Linux says that the symbol could be null and that it isn't an error. - // So you should check the error message also, but since null symbols - // won't do us much good anyway, let's still report an error. - if (!sym && ignore_errors != 1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Handle::symbol (\"%s\") \"%s\"."), - auto_name.get (), this->error ()->c_str ()), - 0); - - return sym; -} - -ACE_SHLIB_HANDLE -ACE_DLL_Handle::get_handle (int become_owner) -{ - ACE_TRACE ("ACE_DLL_Handle::get_handle"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - ACE_SHLIB_HANDLE handle = ACE_SHLIB_INVALID_HANDLE; - - if (this->refcount_ == 0 && become_owner != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Handle::get_handle: ") - ACE_LIB_TEXT ("cannot become owner, refcount == 0.\n")), - ACE_SHLIB_INVALID_HANDLE); - else if (become_owner != 0) - { - handle = this->handle_; - if (--this->refcount_ == 0) - this->handle_ = ACE_SHLIB_INVALID_HANDLE; - } - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_DLL_Handle::get_handle: ") - ACE_LIB_TEXT ("handle %s, refcount %d\n"), - this->handle_ == ACE_SHLIB_INVALID_HANDLE ? - ACE_LIB_TEXT ("invalid") : ACE_LIB_TEXT ("valid"), - this->refcount_)); - - return handle; -} - -// This method is used return the last error of a library operation. - -auto_ptr -ACE_DLL_Handle::error (void) -{ - ACE_TRACE ("ACE_DLL_Handle::error"); - const ACE_TCHAR *error = ACE_OS::dlerror (); - auto_ptr str - (new ACE_TString (error ? error : ACE_LIB_TEXT ("no error"))); - return str; -} - -/******************************************************************/ - -// Pointer to the Singleton instance. -ACE_DLL_Manager *ACE_DLL_Manager::instance_ = 0; - - -ACE_DLL_Manager * -ACE_DLL_Manager::instance (int size) -{ - ACE_TRACE ("ACE_DLL_Manager::instance"); - - if (ACE_DLL_Manager::instance_ == 0) - { - // Perform Double-Checked Locking Optimization. - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance (), 0)); - if (ACE_DLL_Manager::instance_ == 0) - { - ACE_NEW_RETURN (ACE_DLL_Manager::instance_, - ACE_DLL_Manager (size), - 0); - } - } - - return ACE_DLL_Manager::instance_; -} - -void -ACE_DLL_Manager::close_singleton (void) -{ - ACE_TRACE ("ACE_DLL_Manager::close_singleton"); - - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance ())); - - delete ACE_DLL_Manager::instance_; - ACE_DLL_Manager::instance_ = 0; -} - -ACE_DLL_Manager::ACE_DLL_Manager (int size) - : handle_vector_ (0), - current_size_ (0), - total_size_ (0), - unload_policy_ (ACE_DLL_UNLOAD_POLICY_PER_DLL) -{ - ACE_TRACE ("ACE_DLL_Manager::ACE_DLL_Manager"); - - if (this->open (size) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager ctor failed to allocate ") - ACE_LIB_TEXT ("handle_vector_.\n"))); -} - -ACE_DLL_Manager::~ACE_DLL_Manager (void) -{ - ACE_TRACE ("ACE_DLL_Manager::~ACE_DLL_Manager"); - - if (this->close () != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager dtor failed to close ") - ACE_LIB_TEXT ("properly.\n"))); -} - -ACE_DLL_Handle * -ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name, - int open_mode, - ACE_SHLIB_HANDLE handle) -{ - ACE_TRACE ("ACE_DLL_Manager::open_dll"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - ACE_DLL_Handle *dll_handle = this->find_dll (dll_name); - if (!dll_handle) - { - if (this->current_size_ < this->total_size_) - { - ACE_NEW_RETURN (dll_handle, - ACE_DLL_Handle, - 0); - - this->handle_vector_[this->current_size_] = dll_handle; - this->current_size_++; - } - } - - if (dll_handle) - { - if (dll_handle->open (dll_name, open_mode, handle) != 0) - { - // Don't worry about freeing the memory right now, since - // the handle_vector_ will be cleaned up automatically later. - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager::open_dll: Could not ") - ACE_LIB_TEXT ("open dll.\n")), - 0); - } - } - return dll_handle; -} - -int -ACE_DLL_Manager::close_dll (const ACE_TCHAR *dll_name) -{ - ACE_TRACE ("ACE_DLL_Manager::close_dll"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - ACE_DLL_Handle *handle = this->find_dll (dll_name); - if (handle) - { - return this->unload_dll (handle, 0); - } - - return -1; -} - -u_long -ACE_DLL_Manager::unload_policy (void) const -{ - ACE_TRACE ("ACE_DLL_Manager::unload_policy"); - return this->unload_policy_; -} - -void -ACE_DLL_Manager::unload_policy (u_long unload_policy) -{ - ACE_TRACE ("ACE_DLL_Manager::unload_policy"); - ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_)); - - u_long old_policy = this->unload_policy_; - this->unload_policy_ = unload_policy; - - // If going from LAZY to EAGER or from PER_DLL to PER_PROCESS|EAGER, - // call close(1) on all the ACE_DLL_Handle objects with refcount == 0 - // which will force those that are still loaded to be unloaded. - if (this->handle_vector_) - if (( ACE_BIT_ENABLED (old_policy, ACE_DLL_UNLOAD_POLICY_LAZY) && - ACE_BIT_DISABLED (this->unload_policy_, ACE_DLL_UNLOAD_POLICY_LAZY) ) || - ( ACE_BIT_DISABLED (this->unload_policy_, ACE_DLL_UNLOAD_POLICY_LAZY) && - ACE_BIT_ENABLED (old_policy, ACE_DLL_UNLOAD_POLICY_PER_DLL) && - ACE_BIT_DISABLED (this->unload_policy_, ACE_DLL_UNLOAD_POLICY_PER_DLL) )) - { - for (int i = this->current_size_ - 1; i >= 0; i--) - { - if (this->handle_vector_[i] && - this->handle_vector_[i]->refcount () == 0) - this->handle_vector_[i]->close (1); - } - } -} - -int -ACE_DLL_Manager::open (int size) -{ - ACE_TRACE ("ACE_DLL_Manager::open"); - - ACE_DLL_Handle **temp; - - ACE_NEW_RETURN (temp, - ACE_DLL_Handle *[size], - -1); - - this->handle_vector_ = temp; - this->total_size_ = size; - return 0; -} - -int -ACE_DLL_Manager::close (void) -{ - ACE_TRACE ("ACE_DLL_Manager::close"); - - int force_close = 1; - - if (this->handle_vector_ != 0) - { - // Delete components in reverse order. - for (int i = this->current_size_ - 1; i >= 0; i--) - { - if (this->handle_vector_[i]) - { - ACE_DLL_Handle *s = ACE_const_cast (ACE_DLL_Handle *, - this->handle_vector_[i]); - this->handle_vector_[i] = 0; - this->unload_dll (s, force_close); - delete s; - } - } - - delete [] this->handle_vector_; - this->handle_vector_ = 0; - this->current_size_ = 0; - } - return 0; -} - -ACE_DLL_Handle * -ACE_DLL_Manager::find_dll (const ACE_TCHAR *dll_name) const -{ - ACE_TRACE ("ACE_DLL_Manager::find_dll"); - - int i; - for (i = 0; i < this->current_size_; i++) - if (this->handle_vector_[i] && - ACE_OS_String::strcmp (this->handle_vector_[i]->dll_name (), dll_name) == 0) - { - return this->handle_vector_[i]; - } - - return 0; -} - -int -ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) -{ - ACE_TRACE ("ACE_DLL_Manager::unload_dll"); - - if (dll_handle) - { - int unload = force_unload; - if (unload == 0) - { - // apply strategy - if (ACE_BIT_DISABLED (this->unload_policy_, - ACE_DLL_UNLOAD_POLICY_PER_DLL)) - { - unload = ACE_BIT_DISABLED (this->unload_policy_, - ACE_DLL_UNLOAD_POLICY_LAZY); - } - else - { - // Declare the type of the symbol: - typedef int (*dll_unload_policy)(void); - dll_unload_policy the_policy = 0; - void *unload_policy_ptr = - dll_handle->symbol (ACE_TEXT ("_get_dll_unload_policy"), 1); - ptrdiff_t temp_p = - ACE_reinterpret_cast (ptrdiff_t, unload_policy_ptr); - the_policy = - ACE_reinterpret_cast (dll_unload_policy, temp_p); - if (the_policy != 0) - unload = ACE_BIT_DISABLED (the_policy (), - ACE_DLL_UNLOAD_POLICY_LAZY); - else - unload = ACE_BIT_DISABLED (this->unload_policy_, - ACE_DLL_UNLOAD_POLICY_LAZY); - } - } - - if (dll_handle->close (unload) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager::unload error.\n")), - -1); - } - else - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager::unload_dll called with ") - ACE_LIB_TEXT ("null pointer.\n")), - -1); - - return 0; -} diff --git a/ace/DLL_Manager.h b/ace/DLL_Manager.h deleted file mode 100644 index 136f3fa8d8a..00000000000 --- a/ace/DLL_Manager.h +++ /dev/null @@ -1,248 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file DLL_Manager.h - * - * $Id$ - * - * @author Don Hinton - */ -//============================================================================= - - -#ifndef ACE_DLL_MANAGER_H -#define ACE_DLL_MANAGER_H -#include "ace/pre.h" - -#include "ace/OS.h" -#include "ace/Synch_T.h" -#include "ace/Auto_Ptr.h" -#include "ace/SString.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#define ACE_DEFAULT_DLL_MANAGER_SIZE 1024 - -/** - * @class ACE_DLL_Handle - * - * @brief Provides an abstract interface for handling various DLL - * operations. - * - * This class is an wrapper over the various methods for utilizing - * a dynamically linked library (DLL), which is called a shared - * library on some platforms. It is refcounted and managed by - * ACE_DLL_Manager, so there will only be a single instance of this - * class for each dll loaded, no matter how many instances of ACE_DLL - * an application has open. Operations , , and - * have been implemented to help opening/closing and - * extracting symbol information from a DLL, respectively. - * - * Most of this class came from the original ACE_DLL class. - * ACE_DLL is now just an interface that passed all it's calls - * either directly or via ACE_DLL_Manager to this class for - * execution. - * - */ -class ACE_Export ACE_DLL_Handle -{ -public: - - /// Default construtor. - ACE_DLL_Handle (void); - - /// Destructor. - ~ACE_DLL_Handle (void); - - /// Returns the name of the shared library (without prefixes or suffixes). - const ACE_TCHAR *dll_name () const; - - /** - * This method opens and dynamically links . The default - * mode is , which loads identifier symbols but not the - * symbols for functions, which are loaded dynamically on-demand. - * Other supported modes include: , which performs all - * necessary relocations when is first loaded and - * , which makes symbols available for relocation - * processing of any other DLLs. Returns -1 on failure and 0 on - * success. - */ - int open (const ACE_TCHAR *dll_name, - int open_mode, - ACE_SHLIB_HANDLE handle); - - /// Call to close the DLL object. If unload = 0, it only decrements - /// the refcount, but if unload = 1, then it will actually unload - /// the library when the refcount == 0; - int close (int unload = 0); - - /// Return the current refcount. - sig_atomic_t refcount (void) const; - - /// If is in the symbol table of the DLL a pointer to - /// the is returned. Otherwise, returns 0. Set the - /// ignore_errors flag to supress logging errors if symbol_name isn't - /// found. This is nice if you just want to probe a dll to see what's - /// available, since missing functions in that case aren't really errors. - void *symbol (const ACE_TCHAR *symbol_name, int ignore_errors = 0); - - /** - * Return the handle to the caller. If is non-0 then - * caller assumes ownership of the handle so we decrement the retcount. - */ - ACE_SHLIB_HANDLE get_handle (int become_owner = 0); - -private: - /// Returns a pointer to a string explaining why or - /// failed. This is used internal to print out the error to the log, - /// but since this object is shared, we can't store or return the error - /// to the caller. - auto_ptr error (void); - - // Keep track of how many ACE_DLL objects have a reference to this - // dll. - sig_atomic_t refcount_; - - /// Name of the shared library. - ACE_TCHAR *dll_name_; - - /// Handle to the actual library loaded by the OS. - ACE_SHLIB_HANDLE handle_; - - /// Keeps track of whether or not open() has ever been called. This - /// helps get around problem on Linux, and perhaps other OS's, that - /// seg-fault if dlerror() is called before the ld library has been - /// initialized by a call to dlopen(). - static sig_atomic_t open_called_; - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - /// Synchronization variable for the MT_SAFE Repository - ACE_Thread_Mutex lock_; -#endif /* ACE_MT_SAFE */ - - // = Disallow copying and assignment since we don't handle these. - ACE_UNIMPLEMENTED_FUNC (ACE_DLL_Handle (const ACE_DLL_Handle &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_DLL_Handle &)) - -}; - -class ACE_Framework_Repository; - -/** - * @class ACE_DLL_Manager - * - * @brief This class is a singleton and serves as a factory and - * repository for instances of ACE_DLL_Handle. - * - * This class is a singleton whose lifetime is managed by the - * ACE_Framework_Repository. Although it is normally meant to be - * used directly only by ACE_DLL, applications can call the unload_policy() - * methods in order get/set the the dll unload policy. Unload policies include - * per_process/per-dll and eager/lazy. Dlls can export set their own policy - * by using the ACE_DLL_UNLOAD_POLICY macro found in config-all.h. If a dll - * choses to set an unload policy, it will be used when the per-dll policy - * (the default) is in effect. If the per-dll policy is in effect and a dll - * has not chosen to set a policy, the current per-process policy will be - * used. - * - * The following policy macros are provided in config-all.h: - * - * ACE_DLL_UNLOAD_POLICY_PER_PROCESS - Per-process policy that unloads dlls - * eagerly. - * - * ACE_DLL_UNLOAD_POLICY_PER_DLL - Apply policy on a per-dll basis. If the - * dll doesn't use one of the macros below, the current per-process policy - * will be used. - * - * ACE_DLL_UNLOAD_POLICY_LAZY - Don't unload dll when refcount reaches - * zero, i.e., wait for either an explicit unload request or program exit. - * - * ACE_DLL_UNLOAD_POLICY_DEFAULT - Default policy allows dlls to control - * their own destinies, but will unload those that don't make a choice eagerly. - * - */ -class ACE_Export ACE_DLL_Manager -{ -public: - // This if to silence the compiler warnings, even though ACE_Framework_Repository - // always uses the instance method. - friend class ACE_Framework_Repository; - - enum - { - DEFAULT_SIZE = ACE_DEFAULT_DLL_MANAGER_SIZE - }; - - /// Return a unique instance - static ACE_DLL_Manager *instance (int size = ACE_DLL_Manager::DEFAULT_SIZE); - - /// Factory for ACE_DLL_Handle objects. If one already exits, - /// its refcount is incremented. - ACE_DLL_Handle *open_dll (const ACE_TCHAR *dll_name, - int openmode, - ACE_SHLIB_HANDLE handle); - - /// Close the underlying dll. Decrements the refcount. - int close_dll (const ACE_TCHAR *dll_name); - - /// Returns the current per-process UNLOAD_POLICY. - u_long unload_policy (void) const; - - /// Set the per-process UNLOAD_POLICY. If the policy is changed from - /// LAZY to EAGER, then it will also unload any dlls with zero - /// refcounts. - void unload_policy (u_long unload_policy); - -protected: - // Allocate handle_vector_. - int open (int size); - - // Close all open dlls and deallocate memory. - int close (void); - - // Find dll in handle_vector_. - ACE_DLL_Handle *find_dll (const ACE_TCHAR *dll_name) const; - - // Applies strategy for unloading dll. - int unload_dll (ACE_DLL_Handle *dll_handle, int force_unload = 0); - -private: - /// Default constructor. - ACE_DLL_Manager (int size = ACE_DLL_Manager::DEFAULT_SIZE); - - /// Destructor. - ~ACE_DLL_Manager (void); - - /// Close the singleton instance. - static void close_singleton (void); - - /// Vector containing all loaded handle objects. - ACE_DLL_Handle **handle_vector_; - - /// Current number of handles. - int current_size_; - - /// Maximum number of handles. - int total_size_; - - /// Unload strategy. - u_long unload_policy_; - - /// Pointer to a process-wide . - static ACE_DLL_Manager *instance_; - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - /// Synchronization variable for the MT_SAFE Repository - ACE_Thread_Mutex lock_; -#endif /* ACE_MT_SAFE */ - - // = Disallow copying and assignment since we don't handle these. - ACE_UNIMPLEMENTED_FUNC (ACE_DLL_Manager (const ACE_DLL_Manager &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_DLL_Manager &)) -}; - -#include "ace/post.h" -#endif /* ACE_DLL_MANAGER_H */ diff --git a/ace/Date_Time.cpp b/ace/Date_Time.cpp deleted file mode 100644 index 7eaa91b3f15..00000000000 --- a/ace/Date_Time.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// Date_Time.cpp -// $Id$ - -#include "ace/Date_Time.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Date_Time.i" -#endif - -ACE_RCSID(ace, Date_Time, "$Id$") diff --git a/ace/Date_Time.h b/ace/Date_Time.h deleted file mode 100644 index 4343059a2f3..00000000000 --- a/ace/Date_Time.h +++ /dev/null @@ -1,121 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file Date_Time.h - * - * $Id$ - * - * @author Tim Harrison (harrison@cs.wustl.edu) (and he's darn proud of this ;-)) - * - */ -//========================================================================== - -#ifndef ACE_DATE_TIME_H -#define ACE_DATE_TIME_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -/** - * @class ACE_Date_Time - * - * @brief System independent representation of date and time. - */ -class ACE_Export ACE_Date_Time -{ -public: - /// Constructor initializes current time/date info. - ACE_Date_Time (void); - - /// Constructor initializes with the given ACE_Time_Value - ACE_EXPLICIT ACE_Date_Time (const ACE_Time_Value& timevalue); - - /// Constructor with init values, no check for validy - /// Set/get portions of ACE_Date_Time, no check for validity. - ACE_Date_Time (long day, - long month = 0, - long year = 0, - long hour = 0, - long minute = 0, - long second = 0, - long microsec = 0, - long wday = 0); - - /// Update to the current time/date. - void update (void); - - /// Update to the given ACE_Time_Value - void update (const ACE_Time_Value& timevalue); - - /// Get day. - long day (void) const; - - /// Set day. - void day (long day); - - /// Get month. - long month (void) const; - - /// Set month. - void month (long month); - - /// Get year. - long year (void) const; - - /// Set year. - void year (long year); - - /// Get hour. - long hour (void) const; - - /// Set hour. - void hour (long hour); - - /// Get minute. - long minute (void) const; - - /// Set minute. - void minute (long minute); - - /// Get second. - long second (void) const; - - /// Set second. - void second (long second); - - /// Get microsec. - long microsec (void) const; - - /// Set microsec. - void microsec (long microsec); - - /// Get weekday. - long weekday (void) const; - - /// Set weekday. - void weekday (long wday); - -private: - long day_; - long month_; - long year_; - long hour_; - long minute_; - long second_; - long microsec_; - long wday_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Date_Time.i" -#endif - -#include "ace/post.h" -#endif /* ACE_DATE_TIME_H */ diff --git a/ace/Date_Time.i b/ace/Date_Time.i deleted file mode 100644 index 2480a88001a..00000000000 --- a/ace/Date_Time.i +++ /dev/null @@ -1,194 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Date_Time.i - -ASYS_INLINE void -ACE_Date_Time::update (void) -{ - ACE_TRACE ("ACE_Date_Time::update"); - - update(ACE_OS::gettimeofday ()); -} - -ASYS_INLINE void -ACE_Date_Time::update (const ACE_Time_Value& timevalue) -{ - time_t time = timevalue.sec (); - struct tm tm_time; - ACE_OS::localtime_r (&time, &tm_time); - this->day_ = tm_time.tm_mday; - this->month_ = tm_time.tm_mon + 1; // localtime's months are 0-11 - this->year_ = tm_time.tm_year + 1900; // localtime reports years since 1900 - this->hour_ = tm_time.tm_hour; - this->minute_ = tm_time.tm_min; - this->second_ = tm_time.tm_sec; - this->microsec_ = timevalue.usec (); - this->wday_ = tm_time.tm_wday; -} - -ASYS_INLINE -ACE_Date_Time::ACE_Date_Time (void) -{ - ACE_TRACE ("ACE_Date_Time::ACE_Date_Time"); - this->update (); -} - -ASYS_INLINE -ACE_Date_Time::ACE_Date_Time (const ACE_Time_Value& timevalue) -{ - ACE_TRACE ("ACE_Date_Time::ACE_Date_Time: timevalue"); - this->update (timevalue); -} - -// Constructor with init values, no check for validy -ASYS_INLINE -ACE_Date_Time::ACE_Date_Time (long day, - long month, - long year, - long hour, - long minute, - long second, - long microsec, - long wday) - : day_ (day), - month_ (month), - year_ (year), - hour_ (hour), - minute_ (minute), - second_ (second), - microsec_ (microsec), - wday_ (wday) -{ - ACE_TRACE ("ACE_Date_Time::ACE_Date_Time"); -} - -// set/get portions of ACE_Date_Time, no check for validy - -// get day -ASYS_INLINE long -ACE_Date_Time::day (void) const -{ - ACE_TRACE ("ACE_Date_Time::day"); - return day_; -} - -// set day -ASYS_INLINE void -ACE_Date_Time::day (long day) -{ - ACE_TRACE ("ACE_Date_Time::day"); - day_ = day; -} - -// get month -ASYS_INLINE long -ACE_Date_Time::month (void) const -{ - ACE_TRACE ("ACE_Date_Time::month"); - return month_; -} - -// set month -ASYS_INLINE void -ACE_Date_Time::month (long month) -{ - ACE_TRACE ("ACE_Date_Time::month"); - month_ = month; -} - -// get year -ASYS_INLINE long -ACE_Date_Time::year (void) const -{ - ACE_TRACE ("ACE_Date_Time::year"); - return year_; -} - -// set year -ASYS_INLINE void -ACE_Date_Time::year (long year) -{ - ACE_TRACE ("ACE_Date_Time::year"); - year_ = year; -} - -// get hour -ASYS_INLINE long -ACE_Date_Time::hour (void) const -{ - ACE_TRACE ("ACE_Date_Time::hour"); - return hour_; -} - -// set hour -ASYS_INLINE void -ACE_Date_Time::hour (long hour) -{ - ACE_TRACE ("ACE_Date_Time::hour"); - hour_ = hour; -} - -// get minute -ASYS_INLINE long -ACE_Date_Time::minute (void) const -{ - ACE_TRACE ("ACE_Date_Time::minute"); - return minute_; -} - -// set minute -ASYS_INLINE void -ACE_Date_Time::minute (long minute) -{ - ACE_TRACE ("ACE_Date_Time::minute"); - minute_ = minute; -} - -// get second -ASYS_INLINE long -ACE_Date_Time::second (void) const -{ - ACE_TRACE ("ACE_Date_Time::second"); - return second_; -} - -// set second -ASYS_INLINE void -ACE_Date_Time::second (long second) -{ - ACE_TRACE ("ACE_Date_Time::second"); - second_ = second; -} - -// get microsec -ASYS_INLINE long -ACE_Date_Time::microsec (void) const -{ - ACE_TRACE ("ACE_Date_Time::microsec"); - return microsec_; -} - -// set microsec -ASYS_INLINE void -ACE_Date_Time::microsec (long microsec) -{ - ACE_TRACE ("ACE_Date_Time::microsec"); - microsec_ = microsec; -} - -// get wday -ASYS_INLINE long -ACE_Date_Time::weekday (void) const -{ - ACE_TRACE ("ACE_Date_Time::weekday"); - return wday_; -} - -// set wday -ASYS_INLINE void -ACE_Date_Time::weekday (long wday) -{ - ACE_TRACE ("ACE_Date_Time::weekday"); - wday_ = wday; -} diff --git a/ace/Default_Constants.h b/ace/Default_Constants.h deleted file mode 100644 index 3780d186d2f..00000000000 --- a/ace/Default_Constants.h +++ /dev/null @@ -1,389 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Default_Constants.h - * - * $Id$ - * - * @author Douglas C. Schmidt - * @author Jesper S. M|ller - * @author and a cast of thousands... - * - * This one is split from the famous OS.h - */ -//============================================================================= - -#ifndef ACE_DEFAULT_CONSTANTS_H -#define ACE_DEFAULT_CONSTANTS_H -#include "ace/pre.h" - -// Included just keep compilers that see #pragma dierctive first -// happy. -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -// Define the default constants for ACE. Many of these are used for -// the ACE tests and applications. You can change these values by -// defining the macros in your config.h file. -# if !defined (ACE_DEFAULT_CLOSE_ALL_HANDLES) -# define ACE_DEFAULT_CLOSE_ALL_HANDLES 1 -# endif /* ACE_DEFAULT_CLOSE_ALL_HANDLES */ - -// The maximum length for a fully qualified Internet name. -# if !defined(ACE_MAX_FULLY_QUALIFIED_NAME_LEN) -# define ACE_MAX_FULLY_QUALIFIED_NAME_LEN 256 -# endif /* ACE_MAX_FULLY_QUALIFIED_NAME_LEN */ - -#if !defined (ACE_DEFAULT_PAGEFILE_POOL_BASE) -#define ACE_DEFAULT_PAGEFILE_POOL_BASE (void *) 0 -#endif /* ACE_DEFAULT_PAGEFILE_POOL_BASE */ - -#if !defined (ACE_DEFAULT_PAGEFILE_POOL_SIZE) -#define ACE_DEFAULT_PAGEFILE_POOL_SIZE (size_t) 0x01000000 -#endif /* ACE_DEFAULT_PAGEFILE_POOL_SIZE */ - -#if !defined (ACE_DEFAULT_PAGEFILE_POOL_CHUNK) -#define ACE_DEFAULT_PAGEFILE_POOL_CHUNK (size_t) 0x00010000 -#endif /* ACE_DEFAULT_PAGEFILE_POOL_CHUNK */ - -#if !defined (ACE_DEFAULT_PAGEFILE_POOL_NAME) -#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_LIB_TEXT ("Default_ACE_Pagefile_Memory_Pool") -#endif /* ACE_DEFAULT_PAGEFILE_POOL_NAME */ - -#if !defined (ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY) -#define ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY 0 -#endif /* ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY */ - -#if !defined (ACE_DEFAULT_SERVICE_REPOSITORY_SIZE) -#define ACE_DEFAULT_SERVICE_REPOSITORY_SIZE 1024 -#endif /* ACE_DEFAULT_SERVICE_REPOSITORY_SIZE */ - -#if !defined (ACE_REACTOR_NOTIFICATION_ARRAY_SIZE) -#define ACE_REACTOR_NOTIFICATION_ARRAY_SIZE 1024 -#endif /* ACE_REACTOR_NOTIFICATION_ARRAY_SIZE */ - -# if !defined (ACE_DEFAULT_TIMEOUT) -# define ACE_DEFAULT_TIMEOUT 5 -# endif /* ACE_DEFAULT_TIMEOUT */ - -# if !defined (ACE_DEFAULT_BACKLOG) -# define ACE_DEFAULT_BACKLOG 5 -# endif /* ACE_DEFAULT_BACKLOG */ - -# if !defined (ACE_DEFAULT_THREADS) -# define ACE_DEFAULT_THREADS 1 -# endif /* ACE_DEFAULT_THREADS */ - -// The following 3 defines are used in the IP multicast and broadcast tests. -# if !defined (ACE_DEFAULT_BROADCAST_PORT) -# define ACE_DEFAULT_BROADCAST_PORT 20000 -# endif /* ACE_DEFAULT_BROADCAST_PORT */ - -# if !defined (ACE_DEFAULT_MULTICAST_PORT) -# define ACE_DEFAULT_MULTICAST_PORT 20001 -# endif /* ACE_DEFAULT_MULTICAST_PORT */ - -# if !defined (ACE_DEFAULT_MULTICAST_ADDR) -// This address MUST be within the range for host group addresses: -// 224.0.0.0 to 239.255.255.255. -# define ACE_DEFAULT_MULTICAST_ADDR "224.9.9.2" -# endif /* ACE_DEFAULT_MULTICAST_ADDR */ - -// Default port number for HTTP. -# if !defined (ACE_DEFAULT_HTTP_SERVER_PORT) -# define ACE_DEFAULT_HTTP_SERVER_PORT 80 -# endif /* ACE_DEFAULT_HTTP_SERVER_PORT */ - -// Used in many IPC_SAP tests -# if !defined (ACE_DEFAULT_SERVER_PORT) -# define ACE_DEFAULT_SERVER_PORT 20002 -# endif /* ACE_DEFAULT_SERVER_PORT */ - -# if !defined (ACE_DEFAULT_HTTP_PORT) -# define ACE_DEFAULT_HTTP_PORT 80 -# endif /* ACE_DEFAULT_HTTP_PORT */ - -# if !defined (ACE_DEFAULT_MAX_SOCKET_BUFSIZ) -# define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65536 -# endif /* ACE_DEFAULT_MAX_SOCKET_BUFSIZ */ - -# if !defined (ACE_DEFAULT_SERVER_PORT_STR) -# define ACE_DEFAULT_SERVER_PORT_STR "20002" -# endif /* ACE_DEFAULT_SERVER_PORT_STR */ - -// Used for the Service_Directory test -# if !defined (ACE_DEFAULT_SERVICE_PORT) -# define ACE_DEFAULT_SERVICE_PORT 20003 -# endif /* ACE_DEFAULT_SERVICE_PORT */ - -// Used for the ACE_Thread_Spawn test -# if !defined (ACE_DEFAULT_THR_PORT ) -# define ACE_DEFAULT_THR_PORT 20004 -# endif /* ACE_DEFAULT_THR_PORT */ - -// Used for tests -# if !defined (ACE_DEFAULT_LOCAL_PORT) -# define ACE_DEFAULT_LOCAL_PORT 20005 -# endif /* ACE_DEFAULT_LOCAL_PORT */ - -// Used for Connector tests -# if !defined (ACE_DEFAULT_LOCAL_PORT_STR) -# define ACE_DEFAULT_LOCAL_PORT_STR "20005" -# endif /* ACE_DEFAULT_LOCAL_PORT_STR */ - -// Used for the name server. -# if !defined (ACE_DEFAULT_NAME_SERVER_PORT) -# define ACE_DEFAULT_NAME_SERVER_PORT 20006 -# endif /* ACE_DEFAULT_NAME_SERVER_PORT */ - -# if !defined (ACE_DEFAULT_NAME_SERVER_PORT_STR) -# define ACE_DEFAULT_NAME_SERVER_PORT_STR "20006" -# endif /* ACE_DEFAULT_NAME_SERVER_PORT_STR */ - -// Used for the token server. -# if !defined (ACE_DEFAULT_TOKEN_SERVER_PORT) -# define ACE_DEFAULT_TOKEN_SERVER_PORT 20007 -# endif /* ACE_DEFAULT_TOKEN_SERVER_PORT */ - -# if !defined (ACE_DEFAULT_TOKEN_SERVER_PORT_STR) -# define ACE_DEFAULT_TOKEN_SERVER_PORT_STR "20007" -# endif /* ACE_DEFAULT_TOKEN_SERVER_PORT_STR */ - -// Used for the logging server. -# if !defined (ACE_DEFAULT_LOGGING_SERVER_PORT) -# define ACE_DEFAULT_LOGGING_SERVER_PORT 20008 -# endif /* ACE_DEFAULT_LOGGING_SERVER_PORT */ - -# if !defined (ACE_DEFAULT_LOGGING_SERVER_PORT_STR) -# define ACE_DEFAULT_LOGGING_SERVER_PORT_STR "20008" -# endif /* ACE_DEFAULT_LOGGING_SERVER_PORT_STR */ - -// Used for the logging server. -# if !defined (ACE_DEFAULT_THR_LOGGING_SERVER_PORT) -# define ACE_DEFAULT_THR_LOGGING_SERVER_PORT 20008 -# endif /* ACE_DEFAULT_THR_LOGGING_SERVER_PORT */ - -# if !defined (ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR) -# define ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR "20008" -# endif /* ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR */ - -// Used for the time server. -# if !defined (ACE_DEFAULT_TIME_SERVER_PORT) -# define ACE_DEFAULT_TIME_SERVER_PORT 20009 -# endif /* ACE_DEFAULT_TIME_SERVER_PORT */ - -# if !defined (ACE_DEFAULT_TIME_SERVER_PORT_STR) -# define ACE_DEFAULT_TIME_SERVER_PORT_STR "20009" -# endif /* ACE_DEFAULT_TIME_SERVER_PORT_STR */ - -# if !defined (ACE_DEFAULT_TIME_SERVER_STR) -# define ACE_DEFAULT_TIME_SERVER_STR "ACE_TS_TIME" -# endif /* ACE_DEFAULT_TIME_SERVER_STR */ - -// Used by the FIFO tests and the Client_Logging_Handler netsvc. -# if !defined (ACE_DEFAULT_RENDEZVOUS) -# if defined (ACE_HAS_STREAM_PIPES) -# define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("/tmp/fifo.ace") -# else -# define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("localhost:20010") -# endif /* ACE_HAS_STREAM_PIPES */ -# endif /* ACE_DEFAULT_RENDEZVOUS */ - -// Used for the UNIX syslog logging interface to ACE_Log_Msg. -# ifndef ACE_DEFAULT_SYSLOG_FACILITY -# define ACE_DEFAULT_SYSLOG_FACILITY LOG_USER -# endif /* ACE_DEFAULT_SYSLOG_FACILITY */ - -# if !defined (ACE_DEFAULT_LOGGER_KEY) - -# if defined (ACE_HAS_STREAM_PIPES) -# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon") -# else -# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("localhost:20012") -# endif /* ACE_HAS_STREAM_PIPES */ -# endif /* ACE_DEFAULT_LOGGER_KEY */ - -// The way to specify the local host for loopback IP. This is usually -// "localhost" but it may need changing on some platforms. -# if !defined (ACE_LOCALHOST) -# define ACE_LOCALHOST ACE_LIB_TEXT ("localhost") -# endif - -# if !defined (ACE_DEFAULT_SERVER_HOST) -# define ACE_DEFAULT_SERVER_HOST ACE_LOCALHOST -# endif /* ACE_DEFAULT_SERVER_HOST */ - -// Default shared memory key -# if !defined (ACE_DEFAULT_SHM_KEY) -# define ACE_DEFAULT_SHM_KEY 1234 -# endif /* ACE_DEFAULT_SHM_KEY */ - -// Default segment size used by SYSV shared memory (128 K) -# if !defined (ACE_DEFAULT_SEGMENT_SIZE) -# define ACE_DEFAULT_SEGMENT_SIZE 1024 * 128 -# endif /* ACE_DEFAULT_SEGMENT_SIZE */ - -// Maximum number of SYSV shared memory segments -// (does anyone know how to figure out the right values?!) -# if !defined (ACE_DEFAULT_MAX_SEGMENTS) -# define ACE_DEFAULT_MAX_SEGMENTS 6 -# endif /* ACE_DEFAULT_MAX_SEGMENTS */ - -// Name of the map that's stored in shared memory. -# if !defined (ACE_NAME_SERVER_MAP) -# define ACE_NAME_SERVER_MAP "Name Server Map" -# endif /* ACE_NAME_SERVER_MAP */ - -// Default file permissions. -# if !defined (ACE_DEFAULT_FILE_PERMS) -# if defined (ACE_WIN32) -# if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1) -# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE | \ - FILE_SHARE_DELETE) -# else -# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE) -# endif /* ACE_HAS_WINNT4 */ -# elif defined (VXWORKS) -# define ACE_DEFAULT_FILE_PERMS (S_IRUSR | S_IWUSR| S_IRGRP| S_IROTH) -# else -# define ACE_DEFAULT_FILE_PERMS 0644 -# endif /* ACE_WIN32 */ -# endif /* ACE_DEFAULT_FILE_PERMS */ - -// Default directory permissions. -# if !defined (ACE_DEFAULT_DIR_PERMS) -# define ACE_DEFAULT_DIR_PERMS 0755 -# endif /* ACE_DEFAULT_DIR_PERMS */ - -# if !defined (ACE_DEFAULT_TIMEPROBE_TABLE_SIZE) -# define ACE_DEFAULT_TIMEPROBE_TABLE_SIZE 8 * 1024 -# endif /* ACE_DEFAULT_TIMEPROBE_TABLE_SIZE */ - -// Default size of the ACE Map_Manager. -# if !defined (ACE_DEFAULT_MAP_SIZE) -# define ACE_DEFAULT_MAP_SIZE 1024 -# endif /* ACE_DEFAULT_MAP_SIZE */ - -// Defaults for ACE Timer Wheel -# if !defined (ACE_DEFAULT_TIMER_WHEEL_SIZE) -# define ACE_DEFAULT_TIMER_WHEEL_SIZE 1024 -# endif /* ACE_DEFAULT_TIMER_WHEEL_SIZE */ - -# if !defined (ACE_DEFAULT_TIMER_WHEEL_RESOLUTION) -# define ACE_DEFAULT_TIMER_WHEEL_RESOLUTION 100 -# endif /* ACE_DEFAULT_TIMER_WHEEL_RESOLUTION */ - -// Default size for ACE Timer Hash table -# if !defined (ACE_DEFAULT_TIMER_HASH_TABLE_SIZE) -# define ACE_DEFAULT_TIMER_HASH_TABLE_SIZE 1024 -# endif /* ACE_DEFAULT_TIMER_HASH_TABLE_SIZE */ - -// Defaults for the ACE Free List -# if !defined (ACE_DEFAULT_FREE_LIST_PREALLOC) -# define ACE_DEFAULT_FREE_LIST_PREALLOC 0 -# endif /* ACE_DEFAULT_FREE_LIST_PREALLOC */ - -# if !defined (ACE_DEFAULT_FREE_LIST_LWM) -# define ACE_DEFAULT_FREE_LIST_LWM 0 -# endif /* ACE_DEFAULT_FREE_LIST_LWM */ - -# if !defined (ACE_DEFAULT_FREE_LIST_HWM) -# define ACE_DEFAULT_FREE_LIST_HWM 25000 -# endif /* ACE_DEFAULT_FREE_LIST_HWM */ - -# if !defined (ACE_DEFAULT_FREE_LIST_INC) -# define ACE_DEFAULT_FREE_LIST_INC 100 -# endif /* ACE_DEFAULT_FREE_LIST_INC */ - -# if !defined (ACE_UNIQUE_NAME_LEN) -# define ACE_UNIQUE_NAME_LEN 100 -# endif /* ACE_UNIQUE_NAME_LEN */ - -# if !defined (ACE_MAX_DGRAM_SIZE) - // This is just a guess. 8k is the normal limit on - // most machines because that's what NFS expects. -# define ACE_MAX_DGRAM_SIZE 8192 -# endif /* ACE_MAX_DGRAM_SIZE */ - -# if !defined (ACE_DEFAULT_ARGV_BUFSIZ) -# define ACE_DEFAULT_ARGV_BUFSIZ 1024 * 4 -# endif /* ACE_DEFAULT_ARGV_BUFSIZ */ - -// A free list which create more elements when there aren't enough -// elements. -# define ACE_FREE_LIST_WITH_POOL 1 - -// A simple free list which doen't allocate/deallocate elements. -# define ACE_PURE_FREE_LIST 2 - - -# if defined (ACE_WIN32) - -#define ACE_MAX_USERID 32 - -// This is necessary to work around bugs with Win32 non-blocking -// connects... -# if !defined (ACE_NON_BLOCKING_BUG_DELAY) -# define ACE_NON_BLOCKING_BUG_DELAY 35000 -# endif /* ACE_NON_BLOCKING_BUG_DELAY */ -# endif /*ACE_WIN32*/ - -// Max size of an ACE Log Record data buffer. This can be reset in -// the config.h file if you'd like to increase or decrease the size. -# if !defined (ACE_MAXLOGMSGLEN) -# define ACE_MAXLOGMSGLEN 4 * 1024 -# endif /* ACE_MAXLOGMSGLEN */ - -// Max size of an ACE Token. -# define ACE_MAXTOKENNAMELEN 40 - -// Max size of an ACE Token client ID. -# define ACE_MAXCLIENTIDLEN MAXHOSTNAMELEN + 20 - -/** - * @name Default values to control CDR classes memory allocation strategies - */ -//@{ - -/// Control the initial size of all CDR buffers, application -/// developers may want to optimize this value to fit their request -/// size -#if !defined (ACE_DEFAULT_CDR_BUFSIZE) -# define ACE_DEFAULT_CDR_BUFSIZE 512 -#endif /* ACE_DEFAULT_CDR_BUFSIZE */ - -/// Stop exponential growth of CDR buffers to avoid overallocation -#if !defined (ACE_DEFAULT_CDR_EXP_GROWTH_MAX) -# define ACE_DEFAULT_CDR_EXP_GROWTH_MAX 65536 -#endif /* ACE_DEFAULT_CDR_EXP_GROWTH_MAX */ - -/// Control CDR buffer growth after maximum exponential growth is -/// reached -#if !defined (ACE_DEFAULT_CDR_LINEAR_GROWTH_CHUNK) -# define ACE_DEFAULT_CDR_LINEAR_GROWTH_CHUNK 65536 -#endif /* ACE_DEFAULT_CDR_LINEAR_GROWTH_CHUNK */ -//@} - -/// Control the zero-copy optimizations for octet sequences -/** - * Large octet sequences can be sent without any copies by chaining - * them in the list of message blocks that represent a single CDR - * stream. However, if the octet sequence is too small the zero copy - * optimizations actually hurt performance. Octet sequences smaller - * than this value will be copied. - */ -#if !defined (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF) -#define ACE_DEFAULT_CDR_MEMCPY_TRADEOFF 256 -#endif /* ACE_DEFAULT_CDR_MEMCPY_TRADEOFF */ - -#if !defined (ACE_CONNECTOR_HANDLER_MAP_SIZE) -const unsigned int ACE_CONNECTOR_HANDLER_MAP_SIZE = 16; -#endif /*ACE_CONNECTOR_HANDLER_MAP_SIZE*/ - -#include "ace/post.h" -#endif /*ACE_DEFAULT_CONSTANTS_H*/ diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp deleted file mode 100644 index e301d1e9940..00000000000 --- a/ace/Dev_Poll_Reactor.cpp +++ /dev/null @@ -1,2430 +0,0 @@ -// -*- C++ -*- - -#include "ace/Dev_Poll_Reactor.h" - -ACE_RCSID (ace, - Dev_Poll_Reactor, - "$Id$") - -#if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL) - -# if defined (ACE_HAS_EVENT_POLL) && defined (linux) - -// #undef POLLIN -// #undef POLLPRI -// #undef POLLOUT -// #undef POLLERR -// #undef POLLHUP -// #undef POLLNVAL - -# include /**/ - //# include - // @@ UGLY HACK ... REMOVE ME - // and conflict. -# define POLLREMOVE 0x1000 -# include /**/ - -# elif defined (ACE_HAS_DEV_POLL) - -# if defined (sun) -# include /**/ -# elif defined (linux) -# include /**/ -# endif /* sun */ - -# endif /* ACE_HAS_DEV_POLL */ - - -#if !defined (__ACE_INLINE__) -# include "ace/Dev_Poll_Reactor.inl" -#endif /* __ACE_INLINE__ */ - - -#include "ace/Handle_Set.h" -#include "ace/Reactor.h" -#include "ace/Timer_Heap.h" -#include "ace/ACE.h" - - -ACE_Dev_Poll_Reactor_Notify::ACE_Dev_Poll_Reactor_Notify (void) - : dp_reactor_ (0) - , notification_pipe_ () - , max_notify_iterations_ (-1) -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - , alloc_queue_ () - , notify_queue_ () - , free_queue_ () - , notify_queue_lock_ () -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ -{ -} - -int -ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r, - ACE_Timer_Queue * /* timer_queue */, - int disable_notify_pipe) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::open"); - - if (disable_notify_pipe == 0) - { - this->dp_reactor_ = ACE_dynamic_cast (ACE_Dev_Poll_Reactor *, r); - - if (this->dp_reactor_ == 0) - { - errno = EINVAL; - return -1; - } - - if (this->notification_pipe_.open () == -1) - return -1; - -#if defined (F_SETFD) - // close-on-exec - ACE_OS::fcntl (this->notification_pipe_.read_handle (), F_SETFD, 1); - ACE_OS::fcntl (this->notification_pipe_.write_handle (), F_SETFD, 1); -#endif /* F_SETFD */ - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - ACE_Notification_Buffer *temp; - - ACE_NEW_RETURN (temp, - ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE], - -1); - - if (this->alloc_queue_.enqueue_head (temp) == -1) - return -1; - - for (size_t i = 0; i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE; ++i) - if (free_queue_.enqueue_head (temp + i) == -1) - return -1; - -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ - - // Set the read handle into non-blocking mode since we need to - // perform a "speculative" read when determining if their are - // notifications to dispatch. - if (ACE::set_flags (this->notification_pipe_.read_handle (), - ACE_NONBLOCK) == -1) - return -1; - } - - return 0; -} - -int -ACE_Dev_Poll_Reactor_Notify::close (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::close"); - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - // Free up the dynamically allocated resources. - ACE_Notification_Buffer **b; - - for (ACE_Unbounded_Queue_Iterator alloc_iter (this->alloc_queue_); - alloc_iter.next (b) != 0; - alloc_iter.advance ()) - { - delete [] *b; - *b = 0; - } - - this->alloc_queue_.reset (); - this->notify_queue_.reset (); - this->free_queue_.reset (); -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ - - return this->notification_pipe_.close (); -} - -ssize_t -ACE_Dev_Poll_Reactor_Notify::notify (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::notify"); - - // Just consider this method a "no-op" if there's no - // ACE_Dev_Poll_Reactor configured. - if (this->dp_reactor_ == 0) - return 0; - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - ACE_Notification_Buffer buffer (eh, mask); - // int notification_required = 0; - - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1); - - // No pending notifications. - - // We will send notify for every message.. - // if (this->notify_queue_.is_empty ()) - // notification_required = 1; - - ACE_Notification_Buffer *temp = 0; - - if (free_queue_.dequeue_head (temp) == -1) - { - // Grow the queue of available buffers. - ACE_Notification_Buffer *temp1; - - ACE_NEW_RETURN (temp1, - ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE], - -1); - - if (this->alloc_queue_.enqueue_head (temp1) == -1) - return -1; - - // Start at 1 and enqueue only - // (ACE_REACTOR_NOTIFICATION_ARRAY_SIZE - 1) elements since - // the first one will be used right now. - for (size_t i = 1; - i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE; - ++i) - this->free_queue_.enqueue_head (temp1 + i); - - temp = temp1; - } - - ACE_ASSERT (temp != 0); - *temp = buffer; - - if (notify_queue_.enqueue_tail (temp) == -1) - return -1; - - // Let us send a notify for every message - // if (notification_required) - ssize_t n = ACE::send (this->notification_pipe_.write_handle (), - (char *) &buffer, - sizeof buffer, - timeout); - if (n == -1) - return -1; - - return 0; -#else - ACE_Notification_Buffer buffer (eh, mask); - - ssize_t n = ACE::send (this->notification_pipe_.write_handle (), - (char *) &buffer, - sizeof buffer, - timeout); - if (n == -1) - return -1; - - return 0; -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ -} - -int -ACE_Dev_Poll_Reactor_Notify::dispatch_notifications ( - int & /* number_of_active_handles */, - ACE_Handle_Set & /* rd_mask */) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::dispatch_notifications"); - - // This method is unimplemented in the ACE_Dev_Poll_Reactor. - // Instead, the notification handler is invoked as part of the IO - // event set. Doing so alters the some documented semantics that - // state that the notifications are handled before IO events. - // Enforcing such semantics does not appear to be beneficial, and - // also serves to slow down event dispatching particularly with this - // ACE_Dev_Poll_Reactor. - -#if 0 - ACE_HANDLE read_handle = - this->notification_pipe_.read_handle (); - - // Note that we do not check if the handle has received any events. - // Instead a non-blocking "speculative" read is performed. If the - // read returns with errno == EWOULDBLOCK then no notifications are - // dispatched. See ACE_Dev_Poll_Reactor_Notify::read_notify_pipe() - // for details. - if (read_handle != ACE_INVALID_HANDLE) - { - number_of_active_handles--; - - return this->handle_input (read_handle); - } - else - return 0; -#else - ACE_NOTSUP_RETURN (-1); -#endif /* 0 */ -} - -int -ACE_Dev_Poll_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, - ACE_Notification_Buffer &buffer) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::read_notify_pipe"); - - // This is a (non-blocking) "speculative" read, i.e., we attempt to - // read even if no event was polled on the read handle. A - // speculative read is necessary since notifications must be - // dispatched before IO events. We can avoid the speculative read - // by "walking" the array of pollfd structures returned from - // `/dev/poll' or `/dev/epoll' but that is potentially much more - // expensive than simply checking for an EWOULDBLOCK. - - ssize_t n = ACE::recv (handle, (char *) &buffer, sizeof buffer); - - if (n > 0) - { - // Check to see if we've got a short read. - if (n != sizeof buffer) - { - ssize_t remainder = sizeof buffer - n; - - // If so, try to recover by reading the remainder. If this - // doesn't work we're in big trouble since the input stream - // won't be aligned correctly. I'm not sure quite what to - // do at this point. It's probably best just to return -1. - if (ACE::recv (handle, - ((char *) &buffer) + n, - remainder) != remainder) - return -1; - } - - - return 1; - } - - // Return -1 if things have gone seriously wrong. - if (n <= 0 && (errno != EWOULDBLOCK && errno != EAGAIN)) - return -1; - - return n; -} - - -int -ACE_Dev_Poll_Reactor_Notify::handle_input (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::handle_input"); - - // @@ We may end up dispatching this event handler twice: once when - // performing the speculative read on the notification pipe - // handle, and once more when dispatching the IO events. - - // Precondition: this->select_reactor_.token_.current_owner () == - // ACE_Thread::self (); - - int number_dispatched = 0; - int result = 0; - ACE_Notification_Buffer buffer; - - while ((result = this->read_notify_pipe (handle, buffer)) > 0) - { - // Dispatch the buffer - // NOTE: We count only if we made any dispatches ie. upcalls. - if (this->dispatch_notify (buffer) > 0) - number_dispatched++; - - // Bail out if we've reached the . Note that - // by default is -1, so we'll loop until all - // the notifications in the pipe have been dispatched. - if (number_dispatched == this->max_notify_iterations_) - break; - } - - if ((result == -1 && (errno != EWOULDBLOCK || errno != EAGAIN)) - || result == 0) - { - // Reassign number_dispatched to -1 if things have gone - // seriously wrong. - number_dispatched = -1; - } - - // Enqueue ourselves into the list of waiting threads. When we - // reacquire the token we'll be off and running again with ownership - // of the token. The postcondition of this call is that - // == . - //this->select_reactor_->renew (); - - return number_dispatched; -} - -ACE_HANDLE -ACE_Dev_Poll_Reactor_Notify::notify_handle (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::notify_handle"); - - return this->notification_pipe_.read_handle (); -} - -int -ACE_Dev_Poll_Reactor_Notify::is_dispatchable (ACE_Notification_Buffer &) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::is_dispatchable"); - - ACE_NOTSUP_RETURN (-1); -} - -int -ACE_Dev_Poll_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::dispatch_notify"); - - int result = 0; - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - // Dispatch all messages that are in the . - { - // We acquire the lock in a block to make sure we're not - // holding the lock while delivering callbacks... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1); - - ACE_Notification_Buffer *temp; - - if (notify_queue_.is_empty ()) - return 0; - else if (notify_queue_.dequeue_head (temp) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("dequeue_head")), - -1); - buffer = *temp; - if (free_queue_.enqueue_head (temp) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("enqueue_head")), - -1); - } - - // If eh == 0 then another thread is unblocking the - // ACE_Dev_Poll_Reactor to update the ACE_Dev_Poll_Reactor's - // internal structures. Otherwise, we need to dispatch the - // appropriate handle_* method on the ACE_Event_Handler - // pointer we've been passed. - if (buffer.eh_ != 0) - { - - switch (buffer.mask_) - { - case ACE_Event_Handler::READ_MASK: - case ACE_Event_Handler::ACCEPT_MASK: - result = buffer.eh_->handle_input (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::WRITE_MASK: - result = buffer.eh_->handle_output (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::EXCEPT_MASK: - result = buffer.eh_->handle_exception (ACE_INVALID_HANDLE); - break; - default: - // Should we bail out if we get an invalid mask? - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("invalid mask = %d\n"), - buffer.mask_)); - } - if (result == -1) - buffer.eh_->handle_close (ACE_INVALID_HANDLE, - ACE_Event_Handler::EXCEPT_MASK); - } -#else - // If eh == 0 then another thread is unblocking the - // ACE_Dev_Poll_Reactor to update the ACE_Dev_Poll_Reactor's - // internal structures. Otherwise, we need to dispatch the - // appropriate handle_* method on the ACE_Event_Handler - // pointer we've been passed. - if (buffer.eh_ != 0) - { - switch (buffer.mask_) - { - case ACE_Event_Handler::READ_MASK: - case ACE_Event_Handler::ACCEPT_MASK: - result = buffer.eh_->handle_input (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::WRITE_MASK: - result = buffer.eh_->handle_output (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::EXCEPT_MASK: - result = buffer.eh_->handle_exception (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::QOS_MASK: - result = buffer.eh_->handle_qos (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::GROUP_QOS_MASK: - result = buffer.eh_->handle_group_qos (ACE_INVALID_HANDLE); - break; - default: - // Should we bail out if we get an invalid mask? - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("invalid mask = %d\n"), - buffer.mask_)); - } - if (result == -1) - buffer.eh_->handle_close (ACE_INVALID_HANDLE, - ACE_Event_Handler::EXCEPT_MASK); - } - -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ - - return 1; -} - -void -ACE_Dev_Poll_Reactor_Notify::max_notify_iterations (int iterations) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::max_notify_iterations"); - - // Must always be > 0 or < 0 to optimize the loop exit condition. - if (iterations == 0) - iterations = 1; - - this->max_notify_iterations_ = iterations; -} - -int -ACE_Dev_Poll_Reactor_Notify::max_notify_iterations (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::max_notify_iterations"); - - return this->max_notify_iterations_; -} - -int -ACE_Dev_Poll_Reactor_Notify::purge_pending_notifications ( - ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::purge_pending_notifications"); - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1); - - if (this->notify_queue_.is_empty ()) - return 0; - - ACE_Notification_Buffer *temp; - ACE_Unbounded_Queue local_queue; - - size_t queue_size = this->notify_queue_.size (); - int number_purged = 0; - size_t i; - for (i = 0; i < queue_size; ++i) - { - if (-1 == this->notify_queue_.dequeue_head (temp)) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("dequeue_head")), - -1); - - // If this is not a Reactor notify (it is for a particular - // handler), and it matches the specified handler (or purging - // all), and applying the mask would totally eliminate the - // notification, then release it and count the number purged. - if ((0 != temp->eh_) && - (0 == eh || eh == temp->eh_) && - ACE_BIT_DISABLED (temp->mask_, ~mask)) // The existing - // notification mask - // is left with - // nothing when - // applying the mask. - { - if (this->free_queue_.enqueue_head (temp) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("enqueue_head")), - -1); - ++number_purged; - } - else - { - // To preserve it, move it to the local_queue. - // But first, if this is not a Reactor notify (it is for a - // particular handler), and it matches the specified handler - // (or purging all), then apply the mask. - if ((0 != temp->eh_) && - (0 == eh || eh == temp->eh_)) - ACE_CLR_BITS(temp->mask_, mask); - if (-1 == local_queue.enqueue_head (temp)) - return -1; - } - } - - if (this->notify_queue_.size ()) - { - // Should be empty! - ACE_ASSERT (0); - return -1; - } - - // Now put it back in the notify queue. - queue_size = local_queue.size (); - for (i = 0; i < queue_size; ++i) - { - if (-1 == local_queue.dequeue_head (temp)) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("dequeue_head")), - -1); - - if (-1 == this->notify_queue_.enqueue_head (temp)) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("enqueue_head")), - -1); - } - - return number_purged; - -#else /* defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) */ - ACE_UNUSED_ARG (eh); - ACE_UNUSED_ARG (mask); - ACE_NOTSUP_RETURN (-1); -#endif /* defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) */ -} - -void -ACE_Dev_Poll_Reactor_Notify::dump (void) const -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("dp_reactor_ = 0x%x"), - this->dp_reactor_)); - this->notification_pipe_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// ----------------------------------------------------------------- - -ACE_Dev_Poll_Reactor_Handler_Repository:: -ACE_Dev_Poll_Reactor_Handler_Repository (void) - : max_size_ (0), - handlers_ (0) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::ACE_Dev_Poll_Reactor_Handler_Repository"); -} - -int -ACE_Dev_Poll_Reactor_Handler_Repository::invalid_handle ( - ACE_HANDLE handle) const -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::invalid_handle"); - - if (handle < 0 || handle >= this->max_size_) - { - errno = EINVAL; - return 1; - } - else - return 0; -} - -int -ACE_Dev_Poll_Reactor_Handler_Repository::handle_in_range ( - ACE_HANDLE handle) const -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::handle_in_range"); - - if (handle >= 0 && handle < this->max_size_) - return 1; - else - { - errno = EINVAL; - return 0; - } -} - -int -ACE_Dev_Poll_Reactor_Handler_Repository::open (size_t size) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::open"); - - this->max_size_ = size; - - // Try to allocate the memory. - ACE_NEW_RETURN (this->handlers_, - ACE_Dev_Poll_Event_Tuple[size], - -1); - - // Try to increase the number of handles if is greater than - // the current limit. - return ACE::set_handle_limit (size); -} - -int -ACE_Dev_Poll_Reactor_Handler_Repository::unbind_all (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::unbind_all"); - - // Unbind all of the event handlers. - for (int handle = 0; - handle < this->max_size_; - ++handle) - this->unbind (handle); - - return 0; -} - -int -ACE_Dev_Poll_Reactor_Handler_Repository::close (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::close"); - - if (this->handlers_ != 0) - { - this->unbind_all (); - - delete [] this->handlers_; - this->handlers_ = 0; - } - - return 0; -} - -ACE_Event_Handler * -ACE_Dev_Poll_Reactor_Handler_Repository::find (ACE_HANDLE handle, - size_t *index_p) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::find"); - - ACE_Event_Handler *eh = 0; - - // Only bother to search for the if it's in range. - if (this->handle_in_range (handle)) - { - eh = this->handlers_[handle].event_handler; - - if (eh != 0 && index_p != 0) - *index_p = handle; - else - errno = ENOENT; - } - - return eh; -} - -int -ACE_Dev_Poll_Reactor_Handler_Repository::bind ( - ACE_HANDLE handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::bind"); - - if (handle == ACE_INVALID_HANDLE) - handle = event_handler->get_handle (); - - if (this->invalid_handle (handle)) - return -1; - - this->handlers_[handle].event_handler = event_handler; - this->handlers_[handle].mask = mask; - - return 0; -} - -int -ACE_Dev_Poll_Reactor_Handler_Repository::unbind (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::unbind"); - - if (this->find (handle) == 0) - return -1; - - this->handlers_[handle].event_handler = 0; - this->handlers_[handle].mask = ACE_Event_Handler::NULL_MASK; - this->handlers_[handle].suspended = 0; - - return 0; -} - -// ----------------------------------------------------------------- - -ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - int disable_notify_pipe, - ACE_Reactor_Notify *notify, - int mask_signals) - : initialized_ (0) - , poll_fd_ (ACE_INVALID_HANDLE) - , size_ (0) - // , ready_set_ () -#if defined (ACE_HAS_EVENT_POLL) - , mmap_ (0) -#else - , dp_fds_ (0) -#endif /* ACE_HAS_EVENT_POLL */ - , start_pfds_ (0) - , end_pfds_ (0) - , deactivated_ (0) - , lock_ () - , lock_adapter_ (lock_) - , timer_queue_ (0) - , delete_timer_queue_ (0) - , signal_handler_ (0) - , delete_signal_handler_ (0) - , notify_handler_ (0) - , delete_notify_handler_ (0) - , mask_signals_ (mask_signals) - , restart_ (0) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor"); - - if (this->open (ACE::max_handles (), - 0, - sh, - tq, - disable_notify_pipe, - notify) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Dev_Poll_Reactor::open ") - ACE_LIB_TEXT ("failed inside ") - ACE_LIB_TEXT ("ACE_Dev_Poll_Reactor::CTOR"))); -} - -ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size, - int rs, - ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - int disable_notify_pipe, - ACE_Reactor_Notify *notify, - int mask_signals) - : initialized_ (0) - , poll_fd_ (ACE_INVALID_HANDLE) - , size_ (0) - // , ready_set_ () -#if defined (ACE_HAS_EVENT_POLL) - , mmap_ (0) -#else - , dp_fds_ (0) -#endif /* ACE_HAS_EVENT_POLL */ - , start_pfds_ (0) - , end_pfds_ (0) - , deactivated_ (0) - , lock_ () - , lock_adapter_ (lock_) - , timer_queue_ (0) - , delete_timer_queue_ (0) - , signal_handler_ (0) - , delete_signal_handler_ (0) - , notify_handler_ (0) - , delete_notify_handler_ (0) - , mask_signals_ (mask_signals) - , restart_ (0) -{ - if (this->open (size, - rs, - sh, - tq, - disable_notify_pipe, - notify) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Dev_Poll_Reactor::open ") - ACE_LIB_TEXT ("failed inside ACE_Dev_Poll_Reactor::CTOR"))); -} - -ACE_Dev_Poll_Reactor::~ACE_Dev_Poll_Reactor (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::~ACE_Dev_Poll_Reactor"); - - (void) this->close (); -} - -int -ACE_Dev_Poll_Reactor::open (size_t size, - int restart, - ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - int disable_notify_pipe, - ACE_Reactor_Notify *notify) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::open"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - // Can't initialize ourselves more than once. - if (this->initialized_ > 0) - return -1; - - this->restart_ = restart; - this->signal_handler_ = sh; - this->timer_queue_ = tq; - this->notify_handler_ = notify; - - int result = 0; - - // Allows the signal handler to be overridden. - if (this->signal_handler_ == 0) - { - ACE_NEW_RETURN (this->signal_handler_, - ACE_Sig_Handler, - -1); - - if (this->signal_handler_ == 0) - result = -1; - else - this->delete_signal_handler_ = 1; - } - - // Allows the timer queue to be overridden. - if (result != -1 && this->timer_queue_ == 0) - { - ACE_NEW_RETURN (this->timer_queue_, - ACE_Timer_Heap, - -1); - - if (this->timer_queue_ == 0) - result = -1; - else - this->delete_timer_queue_ = 1; - } - - // Allows the Notify_Handler to be overridden. - if (result != -1 && this->notify_handler_ == 0) - { - ACE_NEW_RETURN (this->notify_handler_, - ACE_Dev_Poll_Reactor_Notify, - -1); - - if (this->notify_handler_ == 0) - result = -1; - else - this->delete_notify_handler_ = 1; - } - -#if defined (ACE_HAS_EVENT_POLL) - - // Open the `/dev/epoll' character device. - this->poll_fd_ = ACE_OS::open ("/dev/epoll", O_RDWR); - if (this->poll_fd_ == ACE_INVALID_HANDLE) - result = -1; - - // Set the maximum number of file descriptors to expect. - if (result != -1 - && ACE_OS::ioctl (this->poll_fd_, EP_ALLOC, (void *) size) == 0) - { - // Map an area of memory to which results will be fed. - void *mm = ACE_OS::mmap (0, - EP_MAP_SIZE (size), - PROT_READ | PROT_WRITE, - MAP_PRIVATE, - this->poll_fd_, - 0); - - if (mm == (void *) MAP_FAILED) - result = -1; - else - this->mmap_ = ACE_static_cast (char *, mm); - } -#else - - // Allocate the array before opening the device to avoid a potential - // resource leak if allocation fails. - ACE_NEW_RETURN (this->dp_fds_, - pollfd[size], - -1); - - // Open the `/dev/poll' character device. - this->poll_fd_ = ACE_OS::open ("/dev/poll", O_RDWR); - if (this->poll_fd_ == ACE_INVALID_HANDLE) - result = -1; - -#endif /* ACE_HAS_EVENT_POLL */ - - if (result != -1 && this->handler_rep_.open (size) == -1) - result = -1; - - // Registration of the notification handler must be done after the - // /dev/poll device has been fully initialized. - else if (this->notify_handler_->open (this, - 0, - disable_notify_pipe) == -1 - || this->register_handler_i ( - this->notify_handler_->notify_handle (), - this->notify_handler_, - ACE_Event_Handler::READ_MASK) == -1) - result = -1; - - this->size_ = size; - - if (result != -1) - // We're all set to go. - this->initialized_ = 1; - else - // This will close down all the allocated resources properly. - (void) this->close (); - - return result; -} - -int -ACE_Dev_Poll_Reactor::current_info (ACE_HANDLE, size_t & /* size */) -{ - ACE_NOTSUP_RETURN (-1); -} - - -int -ACE_Dev_Poll_Reactor::set_sig_handler (ACE_Sig_Handler *signal_handler) -{ - if (this->delete_signal_handler_ && this->signal_handler_) - delete this->signal_handler_; - - this->signal_handler_ = signal_handler; - this->delete_signal_handler_ = 0; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::set_timer_queue (ACE_Timer_Queue *tq) -{ - // @note This method is deprecated. - - return this->timer_queue (tq); -} - -int -ACE_Dev_Poll_Reactor::timer_queue (ACE_Timer_Queue *tq) -{ - if (this->delete_timer_queue_ && this->timer_queue_) - delete this->timer_queue_; - - this->timer_queue_ = tq; - this->delete_timer_queue_ = 0; - - return 0; - -} - -ACE_Timer_Queue * -ACE_Dev_Poll_Reactor::timer_queue (void) const -{ - return this->timer_queue_; -} - -int -ACE_Dev_Poll_Reactor::close (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::close"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - int result = 0; - -#if defined (ACE_HAS_EVENT_POLL) - if (this->mmap_ != 0) - { - (void) ACE_OS::munmap (this->mmap_, EP_MAP_SIZE (this->size_)); - this->mmap_ = 0; - } -#else - delete [] this->dp_fds_; - this->dp_fds_ = 0; -#endif /* ACE_HAS_EVENT_POLL */ - - if (this->poll_fd_ != ACE_INVALID_HANDLE) - { -#if defined (ACE_HAS_EVENT_POLL) - (void) ACE_OS::ioctl (this->poll_fd_, EP_FREE, 0); -#endif /* ACE_HAS_EVENT_POLL */ - result = ACE_OS::close (this->poll_fd_); - } - - if (this->delete_signal_handler_) - { - delete this->signal_handler_; - this->signal_handler_ = 0; - this->delete_signal_handler_ = 0; - } - - (void) this->handler_rep_.close (); - - if (this->delete_timer_queue_) - { - delete this->timer_queue_; - this->timer_queue_ = 0; - this->delete_timer_queue_ = 0; - } - - if (this->notify_handler_ != 0) - this->notify_handler_->close (); - - if (this->delete_notify_handler_) - { - delete this->notify_handler_; - this->notify_handler_ = 0; - this->delete_notify_handler_ = 0; - } - - this->poll_fd_ = ACE_INVALID_HANDLE; - this->start_pfds_ = 0; - this->end_pfds_ = 0; - this->initialized_ = 0; - - return result; -} - -int -ACE_Dev_Poll_Reactor::work_pending (const ACE_Time_Value & max_wait_time) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::work_pending"); - - // Stash the current time - // - // The destructor of this object will automatically compute how much - // time elapsed since this method was called. - ACE_Time_Value mwt (max_wait_time); - ACE_MT (ACE_Countdown_Time countdown (&mwt)); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - // Update the countdown to reflect time waiting for the mutex. - ACE_MT (countdown.update ()); - - return this->work_pending_i (&mwt); -} - -int -ACE_Dev_Poll_Reactor::work_pending_i (ACE_Time_Value * max_wait_time) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::work_pending_i"); - - if (this->deactivated_) - return 0; - - if (this->start_pfds_ != this->end_pfds_) - return 1; // We still have work_pending() do not poll for - // additional events. - - ACE_Time_Value timer_buf (0); - ACE_Time_Value *this_timeout = 0; - - this_timeout = this->timer_queue_->calculate_timeout (max_wait_time, - &timer_buf); - - // Check if we have timers to fire. - int timers_pending = - ((this_timeout != 0 && max_wait_time == 0) - || (this_timeout != 0 && max_wait_time != 0 - && *this_timeout != *max_wait_time) ? 1 : 0); - - long timeout = - (this_timeout == 0 ? -1 /* Infinity */ : this_timeout->msec ()); - -#if defined (ACE_HAS_EVENT_POLL) - - struct evpoll evp; - - evp.ep_timeout = timeout; // Milliseconds - evp.ep_resoff = 0; - - // Poll for events - int nfds = ACE_OS::ioctl (this->poll_fd_, EP_POLL, &evp); - - // Retrieve the results from the memory map. - this->start_pfds_ = - ACE_reinterpret_cast (struct pollfd *, - this->mmap_ + evp.ep_resoff); - -#else - - struct dvpoll dvp; - - dvp.dp_fds = this->dp_fds_; - dvp.dp_nfds = this->size_; - dvp.dp_timeout = timeout; // Milliseconds - - // Poll for events - int nfds = ACE_OS::ioctl (this->poll_fd_, DP_POLL, &dvp); - - // Retrieve the results from the pollfd array. - this->start_pfds_ = dvp.dp_fds; - -#endif /* ACE_HAS_EVENT_POLL */ - - // If nfds == 0 then end_pfds_ == start_pfds_ meaning that there is - // no work pending. If nfds > 0 then there is work pending. - // Otherwise an error occurred. - if (nfds > -1) - this->end_pfds_ = this->start_pfds_ + nfds; - - // If timers are pending, override any timeout from the poll. - return (nfds == 0 && timers_pending != 0 ? 1 : nfds); -} - - -int -ACE_Dev_Poll_Reactor::handle_events (ACE_Time_Value *max_wait_time) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::handle_events"); - - // Stash the current time - // - // The destructor of this object will automatically compute how much - // time elapsed since this method was called. - ACE_MT (ACE_Countdown_Time countdown (max_wait_time)); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - if (this->deactivated_) - return -1; - - // Update the countdown to reflect time waiting for the mutex. - ACE_MT (countdown.update ()); - - return this->handle_events_i (max_wait_time); -} - -int -ACE_Dev_Poll_Reactor::handle_events_i (ACE_Time_Value *max_wait_time) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::handle_events_i"); - - int result = 0; - // int active_handle_count = 0; - - // Poll for events - // - // If the underlying ioctl() call was interrupted via the interrupt - // signal (i.e. returned -1 with errno == EINTR) then the loop will - // be restarted if so desired. - do - { - result = this->work_pending_i (max_wait_time); - } - while (result == -1 && this->restart_ != 0 && errno == EINTR); - - if (result == 0 || (result == -1 && errno == ETIME)) - return 0; - else if (result == -1) - return -1; - - // Dispatch the events, if any. - return this->dispatch (); -} - -int -ACE_Dev_Poll_Reactor::dispatch (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::dispatch"); - - int io_handlers_dispatched = 0; - int other_handlers_dispatched = 0; - int signal_occurred = 0; - - // The following do/while loop keeps dispatching as long as there - // are still active handles. Note that the only way we should ever - // iterate more than once through this loop is if signals occur - // while we're dispatching other handlers. - - do - { - // Note that we keep track of changes to our state. If any of - // the dispatch_*() methods below return -1 it means that the - // "interest set" state has changed as the result of an - // ACE_Event_Handler being dispatched. This means that we - // need to bail out and rerun the poll loop since our existing - // notion of handles in dispatch set may no longer be correct. - // - // In the beginning, our state starts out unchanged. After - // every iteration (i.e., due to signals), our state starts out - // unchanged again. - - // this->state_changed_ = 0; - - // Perform the Template Method for dispatching all the handlers. - - // First check for interrupts. - if (0 /* active_handle_count == -1 */) - { - // Bail out -- we got here since the poll (i.e. ioctl()) was - // interrupted. - if (ACE_Sig_Handler::sig_pending () != 0) - { - ACE_Sig_Handler::sig_pending (0); - -#if 0 - // If any HANDLES in the are activated as a - // result of signals they should be dispatched since - // they may be time critical... - pfds = this->ready_set_.pfds; - active_handle_count = this->ready_set_.nfds; -#endif /* 0 */ - - // Record the fact that the Reactor has dispatched a - // handle_signal() method. We need this to return the - // appropriate count below. - signal_occurred = 1; - } - else - return -1; - } - - // Handle timers early since they may have higher latency - // constraints than I/O handlers. Ideally, the order of - // dispatching should be a strategy... - else if (this->dispatch_timer_handlers (other_handlers_dispatched) == -1) - // State has changed or timer queue has failed, exit loop. - break; - - // Check to see if there are no more I/O handles left to - // dispatch AFTER we've handled the timers. - else if (0 /* active_handle_count == 0 */) - return io_handlers_dispatched - + other_handlers_dispatched - + signal_occurred; - -#if 0 - // Next dispatch the notification handlers (if there are any to - // dispatch). These are required to handle multiple threads - // that are trying to update the Reactor. - else if (this->dispatch_notification_handlers ( - dispatch_set, - active_handle_count, - other_handlers_dispatched) == -1) - // State has changed or a serious failure has occured, so exit - // loop. - break; -#endif /* 0 */ - - // Finally, dispatch the I/O handlers. - else if (this->dispatch_io_events (io_handlers_dispatched) == -1) - // State has changed, so exit loop. - break; - } - while (0 /* active_handle_count > 0 */); - - return io_handlers_dispatched + other_handlers_dispatched + signal_occurred; -} - -int -ACE_Dev_Poll_Reactor::dispatch_timer_handlers ( - int &number_of_timers_cancelled) -{ - // Release the lock during the upcall. - ACE_Reverse_Lock reverse_lock (this->lock_); - ACE_GUARD_RETURN (ACE_Reverse_Lock, - reverse_guard, - reverse_lock, - -1); - - number_of_timers_cancelled += this->timer_queue_->expire (); - - return 0; -} - -#if 0 -int -ACE_Dev_Poll_Reactor::dispatch_notification_handlers ( - ACE_Select_Reactor_Handle_Set &dispatch_set, - int &number_of_active_handles, - int &number_of_handlers_dispatched) -{ - // Check to see if the ACE_HANDLE associated with the - // Dev_Poll_Reactor's notify hook is enabled. If so, it means that - // one or more other threads are trying to update the - // ACE_Dev_Poll_Reactor's internal tables or the notify pipe is - // enabled. We'll handle all these threads and notifications, and - // then break out to continue the event loop. - - int n = - this->notify_handler_->dispatch_notifications (number_of_active_handles, - dispatch_set.rd_mask_); - - if (n == -1) - return -1; - else - number_of_handlers_dispatched += n; - - return /* this->state_changed_ ? -1 : */ 0; -} -#endif /* 0 */ - -int -ACE_Dev_Poll_Reactor::dispatch_io_events (int &io_handlers_dispatched) -{ - // Since the underlying event demultiplexing mechansim (`/dev/poll' - // or '/dev/epoll') is stateful, and since only one result buffer is - // used, all pending events (i.e. those retrieved from a previous - // poll) must be dispatched before any additional event can be - // polled. As such, the Dev_Poll_Reactor keeps track of the - // progress of events that have been dispatched. - - // Dispatch the events. - // - // The semantics of this loop in the presence of multiple threads is - // non-trivial. this->start_pfds_ will be incremented each time an - // event handler is dispatched, which may be done across multiple - // threads. Multiple threads may change the loop variables. Care - // must be taken to only change those variables with the reactor - // lock held. - // - // Notice that pfds only contains file descriptors that have - // received events. - for (struct pollfd *& pfds = this->start_pfds_; - pfds < this->end_pfds_; - /* Nothing to do before next loop iteration */) - { - const ACE_HANDLE handle = pfds->fd; - const short revents = pfds->revents; - - // Increment the pointer to the next pollfd element before we - // release the lock. Otherwise event handlers end up being - // dispatched multiple times for the same poll. - ++pfds; - - ACE_Event_Handler *eh = this->handler_rep_.find (handle); - - { - // Modify the reference count in an exception-safe way. - ACE_Dev_Poll_Handler_Guard (this->handler_rep_, handle); - - // Release the lock during the upcall. - ACE_Reverse_Lock reverse_lock (this->lock_); - ACE_GUARD_RETURN (ACE_Reverse_Lock, - reverse_guard, - reverse_lock, - -1); - - // Dispatch all output events. - if (ACE_BIT_ENABLED (revents, POLLOUT)) - { - int status = - this->upcall (eh, &ACE_Event_Handler::handle_output, handle); - - if (status < 0) - { - // Note that the lock is reacquired in - // remove_handler(). - return this->remove_handler (handle, - ACE_Event_Handler::WRITE_MASK); - } - - io_handlers_dispatched++; - } - - // Dispatch all "high priority" (e.g. out-of-band data) events. - if (ACE_BIT_ENABLED (revents, POLLPRI)) - { - int status = - this->upcall (eh, &ACE_Event_Handler::handle_exception, handle); - - if (status < 0) - { - // Note that the lock is reacquired in - // remove_handler(). - return this->remove_handler (handle, - ACE_Event_Handler::EXCEPT_MASK); - } - - io_handlers_dispatched++; - } - - // Dispatch all input events. - if (ACE_BIT_ENABLED (revents, POLLIN)) - { - int status = - this->upcall (eh, &ACE_Event_Handler::handle_input, handle); - - if (status < 0) - { - // Note that the lock is reacquired in - // remove_handler(). - return this->remove_handler (handle, - ACE_Event_Handler::READ_MASK); - } - - io_handlers_dispatched++; - } - } // The reactor lock is reacquired upon leaving this scope. - } - - return 0; -} - -int -ACE_Dev_Poll_Reactor::alertable_handle_events (ACE_Time_Value *max_wait_time) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::alertable_handle_events"); - - return this->handle_events (max_wait_time); -} - -int -ACE_Dev_Poll_Reactor::handle_events (ACE_Time_Value &max_wait_time) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::handle_events"); - - return this->handle_events (&max_wait_time); -} - -int -ACE_Dev_Poll_Reactor::alertable_handle_events (ACE_Time_Value &max_wait_time) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::alertable_handle_events"); - - return this->handle_events (max_wait_time); -} - -int -ACE_Dev_Poll_Reactor::deactivated (void) -{ - return this->deactivated_; -} - -void -ACE_Dev_Poll_Reactor::deactivate (int do_stop) -{ - this->deactivated_ = do_stop; - this->wakeup_all_threads (); -} - -int -ACE_Dev_Poll_Reactor::register_handler (ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->register_handler_i (handler->get_handle (), - handler, - mask); -} - -int -ACE_Dev_Poll_Reactor::register_handler (ACE_HANDLE handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->register_handler_i (handle, - event_handler, - mask); -}; - -int -ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler_i"); - - if (handle == ACE_INVALID_HANDLE - || mask == ACE_Event_Handler::NULL_MASK - || this->handler_rep_.find (handle) != 0) - { - errno = EINVAL; - return -1; - } - - // Add the event handler to the repository. - if (this->handler_rep_.bind (handle, event_handler, mask) != 0) - return -1; - - struct pollfd pfd; - - pfd.fd = handle; - pfd.events = this->reactor_mask_to_poll_event (mask); - pfd.revents = 0; - - // Add file descriptor to the "interest set." - if (ACE_OS::write (this->poll_fd_, &pfd, sizeof (pfd)) != sizeof (pfd)) - { - (void) this->handler_rep_.unbind (handle); - - return -1; - } - - // Note the fact that we've changed the state of the wait_set_, - // which is used by the dispatching loop to determine whether it can - // keep going or if it needs to reconsult select(). - // this->state_changed_ = 1; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::register_handler ( - ACE_HANDLE /* event_handle */, - ACE_HANDLE /* io_handle */, - ACE_Event_Handler * /* event_handler */, - ACE_Reactor_Mask /* mask */) -{ - ACE_NOTSUP_RETURN (-1); -} - -int -ACE_Dev_Poll_Reactor::register_handler (const ACE_Handle_Set &handle_set, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler"); - - ACE_Handle_Set_Iterator handle_iter (handle_set); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - // @@ It might be more efficient to construct a pollfd array and - // pass it to the write() call in register_handler_i() only once, - // instead of calling write() (a system call) once for each file - // descriptor. - - for (ACE_HANDLE h = handle_iter (); - h != ACE_INVALID_HANDLE; - h = handle_iter ()) - if (this->register_handler_i (h, event_handler, mask) == -1) - return -1; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp, - ACE_Event_Handler **old_sh, - ACE_Sig_Action *old_disp) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler"); - - return this->signal_handler_->register_handler (signum, - new_sh, - new_disp, - old_sh, - old_disp); -} - -int -ACE_Dev_Poll_Reactor::register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler"); - - int result = 0; - -#if (ACE_NSIG > 0) && !defined (CHORUS) - - for (int s = 1; s < ACE_NSIG; ++s) - if (sigset.is_member (s) - && this->signal_handler_->register_handler (s, - new_sh, - new_disp) == -1) - result = -1; - -#else /* ACE_NSIG <= 0 || CHORUS */ - - ACE_UNUSED_ARG (sigset); - ACE_UNUSED_ARG (new_sh); - ACE_UNUSED_ARG (new_disp); - -#endif /* ACE_NSIG <= 0 || CHORUS */ - - return result; -} - -int -ACE_Dev_Poll_Reactor::remove_handler (ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->remove_handler_i (handler->get_handle (), mask); -} - -int -ACE_Dev_Poll_Reactor::remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->remove_handler_i (handle, mask); -} - -int -ACE_Dev_Poll_Reactor::remove_handler_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler_i"); - - - ACE_Event_Handler *eh = this->handler_rep_.find (handle); - - if (eh == 0 - || this->mask_ops_i (handle, mask, ACE_Reactor::CLR_MASK) != 0) - return -1; - - // If there are no longer any outstanding events on the given handle - // then remove it from the handler repository. - if (this->handler_rep_.mask (handle) == ACE_Event_Handler::NULL_MASK - && this->handler_rep_.unbind (handle) != 0) - return -1; - - if (ACE_BIT_DISABLED (mask, ACE_Event_Handler::DONT_CALL)) - (void) eh->handle_close (handle, mask); - - // Note the fact that we've changed the state of the wait_set, - // i.e. the "interest set," which is used by the dispatching loop to - // determine whether it can keep going or if it needs to reconsult - // /dev/poll or /dev/epoll. - // this->state_changed_ = 1; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::remove_handler (const ACE_Handle_Set &handle_set, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler"); - - ACE_Handle_Set_Iterator handle_iter (handle_set); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - // @@ It might be more efficient to construct a pollfd array and - // pass it to the write() call in register_handler_i() only once, - // instead of calling write() (a system call) once for each file - // descriptor. - - for (ACE_HANDLE h = handle_iter (); - h != ACE_INVALID_HANDLE; - h = handle_iter ()) - if (this->remove_handler_i (h, mask) == -1) - return -1; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp, - int sigkey) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler"); - - return this->signal_handler_->remove_handler (signum, - new_disp, - old_disp, - sigkey); -} - -int -ACE_Dev_Poll_Reactor::remove_handler (const ACE_Sig_Set &sigset) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler"); - - int result = 0; - -#if (ACE_NSIG > 0) && !defined (CHORUS) - - for (int s = 1; s < ACE_NSIG; ++s) - if (sigset.is_member (s) - && this->signal_handler_->remove_handler (s) == -1) - result = -1; - -#else /* ACE_NSIG <= 0 || CHORUS */ - - ACE_UNUSED_ARG (sigset); - -#endif /* ACE_NSIG <= 0 || CHORUS */ - - return result; -} - -int -ACE_Dev_Poll_Reactor::suspend_handler (ACE_Event_Handler *event_handler) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handler"); - - if (event_handler == 0) - { - errno = EINVAL; - return -1; - } - - ACE_HANDLE handle = event_handler->get_handle (); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->suspend_handler_i (handle); -} - -int -ACE_Dev_Poll_Reactor::suspend_handler (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handler"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->suspend_handler_i (handle); -} - -int -ACE_Dev_Poll_Reactor::suspend_handler (const ACE_Handle_Set &handles) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handler"); - - ACE_Handle_Set_Iterator handle_iter (handles); - ACE_HANDLE h; - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - while ((h = handle_iter ()) != ACE_INVALID_HANDLE) - if (this->suspend_handler_i (h) == -1) - return -1; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::suspend_handlers (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handlers"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - size_t len = this->handler_rep_.size (); - - for (size_t i = 0; i < len; ++i) - if (this->handler_rep_.suspended (i) == 0 - && this->suspend_handler_i (i) != 0) - return -1; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::suspend_handler_i (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handler_i"); - - if (this->handler_rep_.find (handle) == 0) - return -1; - - if (this->handler_rep_.suspended (handle)) - return 0; // Already suspended. @@ Should this be an error? - - struct pollfd pfd[1]; - - pfd[0].fd = handle; - pfd[0].events = POLLREMOVE; - pfd[0].revents = 0; - - // Remove the handle from the "interest set." - // - // Note that the associated event handler is still in the handler - // repository, but no events will be polled on the given handle thus - // no event will be dispatched to the event handler. - if (ACE_OS::write (this->poll_fd_, pfd, sizeof (pfd)) != sizeof (pfd)) - return -1; - - this->handler_rep_.suspend (handle); - - return 0; -} - -int -ACE_Dev_Poll_Reactor::resume_handler (ACE_Event_Handler *event_handler) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handler"); - - if (event_handler == 0) - { - errno = EINVAL; - return -1; - } - - ACE_HANDLE handle = event_handler->get_handle (); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->resume_handler_i (handle); -} - -int -ACE_Dev_Poll_Reactor::resume_handler (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handler"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->resume_handler_i (handle); -} - -int -ACE_Dev_Poll_Reactor::resume_handler (const ACE_Handle_Set &handles) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handler"); - - ACE_Handle_Set_Iterator handle_iter (handles); - ACE_HANDLE h; - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - while ((h = handle_iter ()) != ACE_INVALID_HANDLE) - if (this->resume_handler_i (h) == -1) - return -1; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::resume_handlers (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handlers"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - size_t len = this->handler_rep_.size (); - - for (size_t i = 0; i < len; ++i) - if (this->handler_rep_.suspended (i) - && this->resume_handler_i (i) != 0) - return -1; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::resume_handler_i (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handler_i"); - - if (this->handler_rep_.find (handle) == 0 - && this->handler_rep_.suspended (handle) == 0) - return -1; - - ACE_Reactor_Mask mask = this->handler_rep_.mask (handle); - - if (mask == ACE_Event_Handler::NULL_MASK) - return -1; - - struct pollfd pfd[1]; - - pfd[0].fd = handle; - pfd[0].events = this->reactor_mask_to_poll_event (mask); - pfd[0].revents = 0; - - // Place the handle back in to the "interest set." - // - // Events for the given handle will once again be polled. - if (ACE_OS::write (this->poll_fd_, pfd, sizeof (pfd)) != sizeof (pfd)) - return -1; - - this->handler_rep_.resume (handle); - - return 0; -} - -int -ACE_Dev_Poll_Reactor::resumable_handler (void) -{ - // @@ Is this correct? - - return 0; -} - -int -ACE_Dev_Poll_Reactor::uses_event_associations (void) -{ - // Since the Dev_Poll_Reactor does not do any event associations, - // this method always return zero. - return 0; -} - -long -ACE_Dev_Poll_Reactor::schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::schedule_timer"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->timer_queue_->schedule ( - event_handler, - arg, - this->timer_queue_->gettimeofday () + delay, - interval); -} - -int -ACE_Dev_Poll_Reactor::reset_timer_interval (long timer_id, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::reset_timer_interval"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->timer_queue_->reset_interval (timer_id, interval); -} - -int -ACE_Dev_Poll_Reactor::cancel_timer (ACE_Event_Handler *event_handler, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::cancel_timer"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return (this->timer_queue_ == 0 - ? 0 - : this->timer_queue_->cancel (event_handler, - dont_call_handle_close)); -} - -int -ACE_Dev_Poll_Reactor::cancel_timer (long timer_id, - const void **arg, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::cancel_timer"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return (this->timer_queue_ == 0 - ? 0 - : this->timer_queue_->cancel (timer_id, - arg, - dont_call_handle_close)); -} - -int -ACE_Dev_Poll_Reactor::schedule_wakeup (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::schedule_wakeup"); - - return this->mask_ops (eh->get_handle (), mask, ACE_Reactor::ADD_MASK); -} - -int -ACE_Dev_Poll_Reactor::schedule_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::schedule_wakeup"); - - return this->mask_ops (handle, mask, ACE_Reactor::ADD_MASK); -} - -int -ACE_Dev_Poll_Reactor::cancel_wakeup (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::cancel_wakeup"); - - return this->mask_ops (eh->get_handle (), mask, ACE_Reactor::CLR_MASK); -} - -int -ACE_Dev_Poll_Reactor::cancel_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::cancel_wakeup"); - - return this->mask_ops (handle, mask, ACE_Reactor::CLR_MASK); -} - -int -ACE_Dev_Poll_Reactor::notify (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::notify"); - - ssize_t n = 0; - - // Pass over both the Event_Handler *and* the mask to allow the - // caller to dictate which Event_Handler method the receiver - // invokes. Note that this call can timeout. - - n = this->notify_handler_->notify (eh, mask, timeout); - - return n == -1 ? -1 : 0; -} - -void -ACE_Dev_Poll_Reactor::max_notify_iterations (int iterations) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::max_notify_iterations"); - - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_)); - - this->notify_handler_->max_notify_iterations (iterations); -} - -int -ACE_Dev_Poll_Reactor::max_notify_iterations (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::max_notify_iterations"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->notify_handler_->max_notify_iterations (); -} - -int -ACE_Dev_Poll_Reactor::purge_pending_notifications (ACE_Event_Handler * eh, - ACE_Reactor_Mask mask) -{ - if (this->notify_handler_ == 0) - return 0; - - return this->notify_handler_->purge_pending_notifications (eh, mask); -} - -int -ACE_Dev_Poll_Reactor::handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::handler"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - ACE_Event_Handler *h = this->handler_rep_.find (handle); - - if (h != 0 - && ACE_BIT_CMP_MASK (this->handler_rep_.mask (handle), - mask, // Compare all bits in the mask - mask)) - { - if (event_handler != 0) - *event_handler = h; - - return 0; - } - - return -1; -} - -int -ACE_Dev_Poll_Reactor::handler (int signum, - ACE_Event_Handler **eh) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::handler"); - - ACE_Event_Handler *handler = this->signal_handler_->handler (signum); - - if (handler == 0) - return -1; - else if (eh != 0) - *eh = handler; - - return 0; -} - -int -ACE_Dev_Poll_Reactor::initialized (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::initialized"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->initialized_; -} - -size_t -ACE_Dev_Poll_Reactor::size (void) const -{ - return this->size_; -} - -ACE_Lock & -ACE_Dev_Poll_Reactor::lock (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::lock"); - - return this->lock_adapter_; -} - -void -ACE_Dev_Poll_Reactor::wakeup_all_threads (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::wakeup_all_threads"); - -#if 0 - // Send a notification, but don't block if there's no one to receive - // it. - this->notify (0, - ACE_Event_Handler::NULL_MASK, - (ACE_Time_Value *) &ACE_Time_Value::zero); -#endif /* 0 */ -} - -int -ACE_Dev_Poll_Reactor::owner (ACE_thread_t /* new_owner */, - ACE_thread_t * /* old_owner */) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::owner"); - - // There is no need to set the owner of the event loop. Multiple - // threads may invoke the event loop simulataneously. - - return 0; -} - -int -ACE_Dev_Poll_Reactor::owner (ACE_thread_t * /* owner */) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::owner"); - - // There is no need to set the owner of the event loop. Multiple - // threads may invoke the event loop simulataneously. - - return 0; -} - -int -ACE_Dev_Poll_Reactor::restart (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::restart"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->restart_; -} - -int -ACE_Dev_Poll_Reactor::restart (int r) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::restart"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - int current_value = this->restart_; - this->restart_ = r; - return current_value; -} - -void -ACE_Dev_Poll_Reactor::requeue_position (int) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::requeue_position"); -} - -int -ACE_Dev_Poll_Reactor::requeue_position (void) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::requeue_position"); - - ACE_NOTSUP_RETURN (-1); -} - -int -ACE_Dev_Poll_Reactor::mask_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->mask_ops_i (event_handler->get_handle (), mask, ops); -} - -int -ACE_Dev_Poll_Reactor::mask_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops"); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - return this->mask_ops_i (handle, mask, ops); -} - -int -ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops_i"); - - if (this->handler_rep_.handle_in_range (handle) == 0) - return -1; - - // Block out all signals until method returns. - ACE_Sig_Guard sb; - - ACE_Reactor_Mask old_mask = this->handler_rep_.mask (handle); - ACE_Reactor_Mask new_mask = old_mask; - - // Perform GET, CLR, SET, and ADD operations on the interest/wait - // set and the suspend set (if necessary). - // - // GET = 1, Retrieve current value - // SET = 2, Set value of bits to new mask (changes the entire mask) - // ADD = 3, Bitwise "or" the value into the mask (only changes - // enabled bits) - // CLR = 4 Bitwise "and" the negation of the value out of the mask - // (only changes enabled bits) - // - // Returns the original mask. - - switch (ops) - { - case ACE_Reactor::GET_MASK: - // The work for this operation is done in all cases at the - // begining of the function. - return old_mask; - - case ACE_Reactor::CLR_MASK: - ACE_CLR_BITS (new_mask, mask); - break; - - case ACE_Reactor::SET_MASK: - new_mask = mask; - break; - - case ACE_Reactor::ADD_MASK: - ACE_SET_BITS (new_mask, mask); - break; - - default: - return -1; - } - - /// Reset the mask for the given handle. - this->handler_rep_.mask (handle, new_mask); - - if (this->handler_rep_.suspended (handle) == 0) - { - // Only attempt to alter events for the handle from the - // "interest set" if it hasn't been suspended. - - short events = this->reactor_mask_to_poll_event (new_mask); - -#if defined (sun) - // Apparently events cannot be updated on-the-fly on Solaris so - // remove the existing events, and then add the new ones. - struct pollfd pfd[2]; - - pfd[0].fd = handle; - pfd[0].events = POLLREMOVE; - pfd[0].revents = 0; - pfd[1].fd = (events == POLLREMOVE ? ACE_INVALID_HANDLE : handle); - pfd[1].events = events; - pfd[1].revents = 0; -#else - pollfd pfd[1]; - - pfd[0].fd = handle; - pfd[0].events = events; - pfd[0].revents = 0; -#endif /* sun */ - - // Change the events associated with the given file descriptor. - if (ACE_OS::write (this->poll_fd_, - pfd, - sizeof (pfd)) != sizeof (pfd)) - return -1; - } - - return old_mask; -} - -int -ACE_Dev_Poll_Reactor::ready_ops (ACE_Event_Handler * /* event_handler */, - ACE_Reactor_Mask /* mask */, - int /* ops */) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::ready_ops"); - - // Since the Dev_Poll_Reactor uses the poll result buffer, the - // ready_set cannot be directly manipulated outside of the event - // loop. - ACE_NOTSUP_RETURN (-1); -} - -int -ACE_Dev_Poll_Reactor::ready_ops (ACE_HANDLE /* handle */, - ACE_Reactor_Mask /* mask */, - int /* ops */) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::ready_ops"); - - // Since the Dev_Poll_Reactor uses the poll result buffer, the - // ready_set cannot be directly manipulated outside of the event - // loop. - ACE_NOTSUP_RETURN (-1); -} - -void -ACE_Dev_Poll_Reactor::dump (void) const -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("restart_ = %d\n"), this->restart_)); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("initialized_ = %d"), - this->initialized_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("poll_fd_ = %d"), this->poll_fd_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("size_ = %u"), this->size_)); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("deactivated_ = %d"), - this->deactivated_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -short -ACE_Dev_Poll_Reactor::reactor_mask_to_poll_event (ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor::reactor_mask_to_poll_event"); - - if (mask == ACE_Event_Handler::NULL_MASK) - return POLLREMOVE; // No event. Remove from interest set. - - short events = 0; - - // READ, ACCEPT, and CONNECT flag will place the handle in the - // read set. - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK) - || ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK) - || ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)) - { - ACE_SET_BITS (events, POLLIN); - } - - // WRITE and CONNECT flag will place the handle in the write set. - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK) - || ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)) - { - ACE_SET_BITS (events, POLLOUT); - } - - // EXCEPT flag will place the handle in the except set. - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK)) - { - ACE_SET_BITS (events, POLLPRI); - } - - return events; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Lock_Adapter; -template class ACE_Reverse_Lock; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Lock_Adapter -#pragma instantiate ACE_Reverse_Lock; - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_HAS_EVENT_POLL || ACE_HAS_DEV_POLL */ diff --git a/ace/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h deleted file mode 100644 index 5461f3d66fb..00000000000 --- a/ace/Dev_Poll_Reactor.h +++ /dev/null @@ -1,1175 +0,0 @@ -// -*- C++ -*- - -// ========================================================================= -/** - * @file Dev_Poll_Reactor.h - * - * $Id$ - * - * EXPERIMENTAL /dev/poll (or Linux /dev/epoll) based Reactor - * implementation. - * - * @author Ossama Othman - */ -// ========================================================================= - - -#ifndef ACE_DEV_POLL_REACTOR_H -#define ACE_DEV_POLL_REACTOR_H - -#include "ace/pre.h" - -#include "ace/Reactor_Impl.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined (ACE_HAS_EVENT_POLL) && defined (ACE_HAS_DEV_POLL) -# error ACE_HAS_EVENT_POLL and ACE_HAS_DEV_POLL are mutually exclusive. -#endif /* ACE_HAS_EVENT_POLL && defined ACE_HAS_DEV_POLL */ - - -#if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL) - -#include "ace/Pipe.h" - -// Forward declarations -class ACE_Sig_Handler; -class ACE_Dev_Poll_Reactor; - -/** - * @class ACE_Dev_Poll_Event_Tuple - * - * @brief Class that associates specific event mask with a given event - * handler. - * - * This class merely provides a means to associate an event mask - * with an event handler. Such an association is needed since it is - * not possible to retrieve the event mask from the "interest set" - * stored in the `/dev/poll' or `/dev/epoll' driver. Without this - * external association, it would not be possible keep track of the - * event mask for a given event handler when suspending it or resuming - * it. - * - * @note An ACE_Handle_Set is not used since the number of handles may - * exceed its capacity (ACE_DEFAULT_SELECT_REACTOR_SIZE). - */ -class ACE_Dev_Poll_Event_Tuple -{ -public: - - /// Constructor. - ACE_Dev_Poll_Event_Tuple (void); - -public: - - /// The event handler. - ACE_Event_Handler *event_handler; - - /// The event mask for the above event handler. - ACE_Reactor_Mask mask; - - /// Flag that states whether or not the event handler is suspended. - char suspended; - - /// The number of outstanding upcalls occurring on the above event - /// handler. - /** - * @todo The reference count should really be maintained within the - * event handler. This approach was taken to allow for - * backward compatibility and quick implementation. One - * approach for maintaining backward compatibility while - * implementing reference counting within the event handler is - * to create an ACE_Ref_Counted_Event_Handler "mix-in" class - * that concrete ACE_Event_Handlers can inherit from - * (i.e. multiple inheritance). Thus, legacy non-reference - * counted event handlers need not pay for reference counting - * resources. - */ - unsigned long refcount; - -}; - -// --------------------------------------------------------------------- - -#if 0 -/** - * @class ACE_Dev_Poll_Ready_Set - * - * @brief Class that contains the list of "ready" file descriptors. - * - * This class points to an array of pollfd structures corresponding to - * "ready" file descriptors, such as those corresponding to event - * handlers that request an additional callback after being initially - * dispatched (i.e. return a value greater than zero). - * @par - * The idea is to store the "ready" set in an existing area of memory - * that already contains pollfd instances. Doing so is safe since the - * "ready" set is dispatched before polling for additional events, - * thus avoiding being potentially overwritten during the event poll. - * @par - * When the "ready" set is dispatched, all that needs to be done is to - * iterate over the contents of the array. There is no need to "walk" - * the array in search of ready file descriptors since the array by - * design only contains ready file descriptors. As such, this - * implementation of a ready set is much more efficient in the - * presence of a large number of file descriptors in terms of both - * time and space than the one used in the Select_Reactor, for - * example. - */ -class ACE_Dev_Poll_Ready_Set -{ -public: - - /// Constructor. - ACE_Dev_Poll_Ready_Set (void); - -public: - - /// The array containing the pollfd structures corresponding to the - /// "ready" file descriptors. - struct pollfd *pfds; - - /// The number of "ready" file descriptors in the above array. - int nfds; - -}; -#endif /* 0 */ - -// --------------------------------------------------------------------- - -/** - * @class ACE_Dev_Poll_Reactor_Notify - * - * @brief Event handler used for unblocking the ACE_Dev_Poll_Reactor - * from its event loop. - * - * This event handler is used internally by the ACE_Dev_Poll_Reactor - * as a means to allow a thread other then the one running the event - * loop to unblock the event loop. - */ -class ACE_Dev_Poll_Reactor_Notify : public ACE_Reactor_Notify -{ -public: - - /// Constructor - ACE_Dev_Poll_Reactor_Notify (void); - - /** - * @name Initialization and Termination Methods - * - * Methods called when initializing and terminating this event - * handler. - */ - virtual int open (ACE_Reactor_Impl *, - ACE_Timer_Queue *timer_queue = 0, - int disable_notify = 0); - virtual int close (void); - - /** - * Called by a thread when it wants to unblock the Reactor_Impl. - * This wakeups the Reactor_Impl if currently blocked. Pass over - * both the Event_Handler *and* the mask to allow the caller to - * dictate which Event_Handler method the Reactor_Impl will - * invoke. The ACE_Time_Value indicates how long to blocking - * trying to notify the Reactor_Impl. If timeout == 0, the - * caller will block until action is possible, else will wait until - * the relative time specified in *timeout elapses). - */ - virtual ssize_t notify (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value * = 0); - - /// Unimplemented method required by pure virtual method in abstract - /// base class. - /** - * This method's interface is not very compatibile with this - * Reactor's design. It's not clear why this method is pure virtual - * either. - */ - virtual int dispatch_notifications (int &number_of_active_handles, - ACE_Handle_Set &rd_mask); - - /// Returns the ACE_HANDLE of the notify pipe on which the reactor - /// is listening for notifications so that other threads can unblock - /// the Reactor_Impl. - virtual ACE_HANDLE notify_handle (void); - - /// Verify whether the buffer has dispatchable info or not. - virtual int is_dispatchable (ACE_Notification_Buffer &buffer); - - /// Handle one of the notify call on the handle. This could be - /// because of a thread trying to unblock the Reactor_Impl. - virtual int dispatch_notify (ACE_Notification_Buffer &buffer); - - /// Read one of the notify call on the handle into the - /// buffer. This could be because of a thread trying to unblock - /// the Reactor_Impl. - virtual int read_notify_pipe (ACE_HANDLE handle, - ACE_Notification_Buffer &buffer); - - /// Called back by the ACE_Dev_Poll_Reactor when a thread wants to - /// unblock us. - virtual int handle_input (ACE_HANDLE handle); - - /** - * Set the maximum number of times that the handle_input method - * will iterate and dispatch the ACE_Event_Handlers that are - * passed in via the notify queue before breaking out of the event - * loop. By default, this is set to -1, which means "iterate until - * the queue is empty." Setting this to a value like "1 or 2" will - * increase "fairness" (and thus prevent starvation) at the expense - * of slightly higher dispatching overhead. - */ - virtual void max_notify_iterations (int); - - /** - * Get the maximum number of times that the handle_input method - * will iterate and dispatch the ACE_Event_Handlers that are - * passed in via the notify queue before breaking out of its event - * loop. - */ - virtual int max_notify_iterations (void); - - /** - * Purge any notifications pending in this reactor for the specified - * ACE_Event_Handler object. Returns the number of notifications - * purged. Returns -1 on error. - */ - virtual int purge_pending_notifications ( - ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - - - - /// Dump the state of an object. - virtual void dump (void) const; - -protected: - - /** - * Keep a back pointer to the ACE_Dev_Poll_Reactor. If this value - * if NULL then the ACE_Dev_Poll_Reactor has been initialized with - * disable_notify_pipe. - */ - ACE_Dev_Poll_Reactor *dp_reactor_; - - /** - * Contains the ACE_HANDLE the ACE_Dev_Poll_Reactor is listening - * on, as well as the ACE_HANDLE that threads wanting the attention - * of the ACE_Dev_Poll_Reactor will write to. - */ - ACE_Pipe notification_pipe_; - - /** - * Keeps track of the maximum number of times that the - * ACE_Dev_Poll_Reactor_Notify::handle_input method will iterate and - * dispatch the ACE_Event_Handlers that are passed in via the - * notify pipe before breaking out of its recv loop. By default, - * this is set to -1, which means "iterate until the pipe is empty." - */ - int max_notify_iterations_; - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - /** - * @name Reactor Notification Attributes - * - * This configuration queues up notifications in separate buffers - * that are in user-space, rather than stored in a pipe in the OS - * kernel. The kernel-level notifications are used only to trigger - * the Reactor to check its notification queue. This enables many - * more notifications to be stored than would otherwise be the - * case. - */ - //@{ - - /// Keeps track of allocated arrays of type - /// ACE_Notification_Buffer. - ACE_Unbounded_Queue alloc_queue_; - - /// Keeps track of all pending notifications. - ACE_Unbounded_Queue notify_queue_; - - /// Keeps track of all free buffers. - ACE_Unbounded_Queue free_queue_; - - /// Synchronization for handling of queues. - ACE_SYNCH_MUTEX notify_queue_lock_; - - //@} -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ - -}; - -// --------------------------------------------------------------------- - -/** - * @class ACE_Dev_Poll_Reactor_Handler_Repository - * - * @brief Used to map ACE_HANDLEs onto the appropriate - * ACE_Event_Handler *. - * - * This class is simply a container that maps a handle to its - * corresponding event handler. It is not meant for use outside of - * the Dev_Poll_Reactor. - */ -class ACE_Dev_Poll_Reactor_Handler_Repository -{ -public: - - /// Constructor. - ACE_Dev_Poll_Reactor_Handler_Repository (void); - - /// Initialize a repository of the appropriate . - int open (size_t size); - - /// Close down the repository. - int close (void); - - /** - * @name Repository Manipulation Operations - * - * Methods used to search and modify the handler repository. - */ - //@{ - - /** - * Return the ACE_Event_Handler associated with ACE_HANDLE. If - * index_p is non-zero, then return the index location of the - * handle, if found. - */ - ACE_Event_Handler *find (ACE_HANDLE handle, size_t *index_p = 0); - - /// Set the event mask for event handler associated with the given - /// handle. - void mask (ACE_HANDLE handle, ACE_Reactor_Mask mask); - - /// Retrieve the event mask for the event handler associated with - /// the given handle. - ACE_Reactor_Mask mask (ACE_HANDLE handle); - - /// Mark the event handler associated with the given handle as - /// "suspended." - void suspend (ACE_HANDLE handle); - - /// Mark the event handler associated with the given handle as - /// "resumed." - void resume (ACE_HANDLE handle); - - /// Is the event handler for the given handle suspended? - int suspended (ACE_HANDLE handle) const; - - /// Bind the ACE_Event_Handler to the ACE_HANDLE with the - /// appropriate ACE_Reactor_Mask settings. - int bind (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); - - /// Remove the binding of ACE_HANDLE in accordance with the . - int unbind (ACE_HANDLE handle); - - /// Remove all the (ACE_HANDLE, ACE_Event_Handler) tuples. - int unbind_all (void); - - /// Increase the reference count on the event handler corresponding - /// to the given file descriptor. - /** - * @return Returns the updated reference count. - */ - unsigned long add_ref (ACE_HANDLE handle); - - /// Decrease the reference count on the event handler corresponding - /// to the given file descriptor. - /** - * @return Returns the updated reference count. - */ - unsigned long remove_ref (ACE_HANDLE handle); - //@} - - /** - * @name Sanity Checking - * - * Methods used to prevent "out-of-range" errors when indexing the - * underlying handler array. - */ - //@{ - - // Check the to make sure it's a valid ACE_HANDLE that - // within the range of legal handles (i.e., greater than or equal to - // zero and less than max_size_). - int invalid_handle (ACE_HANDLE handle) const; - - // Check the handle to make sure it's a valid ACE_HANDLE that is - // within the range of currently registered handles (i.e., greater - // than or equal to zero and less than max_handlep1_). - int handle_in_range (ACE_HANDLE handle) const; - - //@} - - /// Returns the current table size. - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - /// Maximum number of handles. - int max_size_; - - /// The underlying array of event handlers. - /** - * The array of event handlers is directly indexed directly using - * an ACE_HANDLE value. This is Unix-specific. - */ - ACE_Dev_Poll_Event_Tuple *handlers_; - -}; - -// --------------------------------------------------------------------- - -/** - * @class ACE_Dev_Poll_Reactor - * - * @brief A `/dev/poll' or `/dev/epoll' based Reactor implemenatation. - * - * @note This reactor is EXPERIMENTAL. - * - * The ACE_Dev_Poll_Reactor uses the `/dev/poll' or '/dev/epoll' - * character devices to demultiplex events on a given set of file - * descriptors. Unlike select(), `/dev/poll' and `/dev/epoll' have no - * hard-coded limit on the number of file descriptors that may be - * handled at any given time. As such, the ACE_Dev_Poll_Reactor can - * generally handle a much larger number of file descriptors than - * select()-based reactors. Furthermore, since `/dev/poll' and - * `/dev/epoll' both return a set of file descriptors that are active, - * there is no need to "walk" the set of file descriptors to determine - * which ones are active, such as what is done with the select() and - * poll() system calls. All returned file descriptors are active. - * This makes event dispatching very efficient. - * - * @note In general, this reactor may only be used to demultiplex - * events on sockets. Demultiplexing events on pipes, for - * example may not work. This is due to a limitation in the - * underlying `/dev/poll' device driver. - * - * @note It is only possible to achieve millisecond timeout - * resolutions with the ACE_Dev_Poll_Reactor. However, the - * timeout resolution for timers is independent of the reactors - * timeout resolution. As such, it may be possible to achieve - * sub-millisecond timeout resolutions for timers but that is - * entirely platform dependent. - */ -class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl -{ -public: - - /// Initialize ACE_Dev_Poll_Reactor with the default size. - /** - * The default size for the ACE_Dev_Poll_Reactor is the maximum - * number of open file descriptors for the process. - */ - ACE_Dev_Poll_Reactor (ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int disable_notify_pipe = 0, - ACE_Reactor_Notify *notify = 0, - int mask_signals = 1); - - /// Initialize ACE_Dev_Poll_Reactor with size "size." - /** - * @note On Unix platforms, the size parameter should be as large as - * the maximum number of file descriptors allowed for a given - * process. This is necessary since a file descriptor is used - * to directly index the array of event handlers maintained by - * the Reactor's handler repository. Direct indexing is used - * for efficiency reasons. If the size parameter is less than - * the process maximum, then the process maximum will be - * decreased in order to prevent potential access violations. - */ - ACE_Dev_Poll_Reactor (size_t size, - int restart = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int disable_notify_pipe = 0, - ACE_Reactor_Notify *notify = 0, - int mask_signals = 1); - - /// Close down and release all resources. - virtual ~ACE_Dev_Poll_Reactor (void); - - /// Initialization. - virtual int open (size_t size, - int restart = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int disable_notify_pipe = 0, - ACE_Reactor_Notify * = 0); - - /** - * Returns 0, if the size of the current message has been put in - * size. Returns -1, if not. ACE_HANDLE allows the reactor to - * check if the caller is valid. - */ - virtual int current_info (ACE_HANDLE, size_t & /* size */); - - /// Use a user specified signal handler instead. - virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); - - /// Set a user specified timer queue. - /** - * @note This method is deprecated. - * @see timer_queue - */ - virtual int set_timer_queue (ACE_Timer_Queue *tq); - - /// Set a user-specified timer queue. - virtual int timer_queue (ACE_Timer_Queue *tq); - - /// Return the current ACE_Timer_Queue. - virtual ACE_Timer_Queue *timer_queue (void) const; - - /// Close down and release all resources. - virtual int close (void); - - // = Event loop drivers. - /** - * Returns non-zero if there are I/O events "ready" for dispatching, - * but does not actually dispatch the event handlers. By default, - * don't block while checking this, i.e., "poll". - * - * @note It is only possible to achieve millisecond timeout - * resolutions with the ACE_Dev_Poll_Reactor. - */ - virtual int work_pending ( - const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); - - /** - * This event loop driver blocks for up to max_wait_time before - * returning. It will return earlier if events occur. Note that - * max_wait_time can be 0, in which case this method blocks - * indefinitely until events occur. - * @par - * max_wait_time is decremented to reflect how much time this call - * took. For instance, if a time value of 3 seconds is passed to - * handle_events and an event occurs after 2 seconds, - * max_wait_time will equal 1 second. This can be used if an - * application wishes to handle events for some fixed amount of - * time. - * @par - * Returns the total number of ACE_Event_Handlers that were - * dispatched, 0 if the max_wait_time elapsed without dispatching - * any handlers, or -1 if an error occurs. - * @par - * The only difference between alertable_handle_events and - * handle_events is that in the alertable case, the event loop - * will return when the system queues an I/O completion routine or - * an Asynchronous Procedure Call. - * - * @note It is only possible to achieve millisecond timeout - * resolutions with the ACE_Dev_Poll_Reactor. - */ - virtual int handle_events (ACE_Time_Value *max_wait_time = 0); - virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0); - - /** - * This method is just like the one above, except the - * max_wait_time value is a reference and can therefore never be - * NULL. - * - * @note It is only possible to achieve millisecond timeout - * resolutions with the ACE_Dev_Poll_Reactor. - */ - virtual int handle_events (ACE_Time_Value &max_wait_time); - virtual int alertable_handle_events (ACE_Time_Value &max_wait_time); - - // = Event handling control. - - /** - * Return the status of Reactor. If this function returns 0, the - * reactor is actively handling events. If it returns non-zero, - * handle_events() and handle_alertable_events() return -1 - * immediately. - */ - virtual int deactivated (void); - - /** - * Control whether the Reactor will handle any more incoming events - * or not. If do_stop == 1, the Reactor will be disabled. By - * default, a reactor is in active state and can be - * deactivated/reactived as desired. - */ - virtual void deactivate (int do_stop); - - // = Register and remove Handlers. - - /// Register event_handler with mask. The I/O handle will always - /// come from get_handle on the event_handler. - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /// Register event_handler with mask. The I/O handle is provided - /// through the io_handle parameter. - virtual int register_handler (ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /** - * Register an that will be notified when - * is signaled. specifies the network events - * that the is interested in. - */ - virtual int register_handler (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /// Register with all the in the . - virtual int register_handler (const ACE_Handle_Set &handles, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /** - * Register to handle the signal using the - * . Returns the that was previously registered - * (if any), along with the of the signal handler. - */ - virtual int register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0, - ACE_Event_Handler **old_sh = 0, - ACE_Sig_Action *old_disp = 0); - - /// Registers to handle a set of signals using the - /// . - virtual int register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0); - - /** - * Removes . Note that the I/O handle will be - * obtained using method of . If - * == then the - * method of the is not invoked. - */ - virtual int remove_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /** - * Removes . If == - * then the method of the associated - * is not invoked. - */ - virtual int remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask); - - /** - * Removes all handles in . If == - * then the method of - * the associated s is not invoked. - */ - virtual int remove_handler (const ACE_Handle_Set &handle_set, - ACE_Reactor_Mask mask); - - /** - * Remove the ACE_Event_Handler currently associated with . - * Install the new disposition (if given) and return the previous - * disposition (if desired by the caller). Returns 0 on success and - * -1 if is invalid. - */ - virtual int remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp = 0, - int sigkey = -1); - - /// Calls for every signal in . - virtual int remove_handler (const ACE_Sig_Set &sigset); - - // = Suspend and resume Handlers. - - /// Suspend event_handler temporarily. Use - /// ACE_Event_Handler::get_handle() to get the handle. - virtual int suspend_handler (ACE_Event_Handler *event_handler); - - /// Suspend handle temporarily. - virtual int suspend_handler (ACE_HANDLE handle); - - /// Suspend all handles in handle set temporarily. - virtual int suspend_handler (const ACE_Handle_Set &handles); - - /// Suspend all handles temporarily. - virtual int suspend_handlers (void); - - /// Resume event_handler. Use ACE_Event_Handler::get_handle() to - /// get the handle. - virtual int resume_handler (ACE_Event_Handler *event_handler); - - /// Resume handle. - virtual int resume_handler (ACE_HANDLE handle); - - /// Resume all handles in handle set. - virtual int resume_handler (const ACE_Handle_Set &handles); - - /// Resume all handles. - virtual int resume_handlers (void); - - /// Does the reactor allow the application to resume the handle on - /// its own, i.e., can it pass on the control of handle resumption to - /// the application. - virtual int resumable_handler (void); - - /// Return 1 if we any event associations were made by the reactor - /// for the handles that it waits on, 0 otherwise. - virtual int uses_event_associations (void); - - // = Timer management. - - /** - * Schedule an ACE_Event_Handler that will expire after an amount - * of time. The return value of this method, a timer_id value, - * uniquely identifies the event_handler in the ACE_Reactor's - * internal list of timers. - * This timer_id value can be used to cancel the timer - * with the cancel_timer() call. - * - * @see cancel_timer() - * @see reset_timer_interval() - * - * @param event_handler event handler to schedule on reactor - * @param arg argument passed to the handle_timeout() method of event_handler - * @param delay time interval after which the timer will expire - * @param interval time interval after which the timer will be automatically rescheduled - * @return -1 on failure, a timer_id value on success - */ - virtual long schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero); - - /** - * Resets the interval of the timer represented by to - * , which is specified in relative time to the current - * . If is equal to - * , the timer will become a non-rescheduling - * timer. Returns 0 if successful, -1 if not. - */ - virtual int reset_timer_interval (long timer_id, - const ACE_Time_Value &interval); - - /// Cancel all Event_Handlers that match the address of - /// . Returns number of handlers cancelled. - virtual int cancel_timer (ACE_Event_Handler *event_handler, - int dont_call_handle_close = 1); - - /** - * Cancel the single Event_Handler that matches the value - * (which was returned from the schedule method). If arg is - * non-NULL then it will be set to point to the ``magic cookie'' - * argument passed in when the Event_Handler was registered. This - * makes it possible to free up the memory and avoid memory leaks. - * Returns 1 if cancellation succeeded and 0 if the - * wasn't found. - */ - virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1); - - // = High-level Event_Handler scheduling operations - - /// Add to the 's entry. - /// must already have been registered. - virtual int schedule_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_added); - - /// Add to the 's entry. - /// associated with must already have been registered. - virtual int schedule_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_added); - - /// Clear from the 's entry. - virtual int cancel_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_cleared); - - /// Clear from the 's entry. - virtual int cancel_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_cleared); - - // = Notification methods. - - /** - * Notify of event. The - * indicates how long to blocking trying to notify. If == - * 0, the caller will block until action is possible, else will wait - * until the relative time specified in elapses). - */ - virtual int notify (ACE_Event_Handler *event_handler = 0, - ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value * = 0); - - /** - * Set the maximum number of times that ACE_Reactor_Impl will - * iterate and dispatch the that are passed in - * via the notify queue before breaking out of its - * loop. By default, this is set to - * -1, which means "iterate until the queue is empty." Setting this - * to a value like "1 or 2" will increase "fairness" (and thus - * prevent starvation) at the expense of slightly higher dispatching - * overhead. - */ - virtual void max_notify_iterations (int); - - /** - * Get the maximum number of times that the ACE_Reactor_Impl will - * iterate and dispatch the that are passed in - * via the notify queue before breaking out of its - * loop. - */ - virtual int max_notify_iterations (void); - - /** - * Purge any notifications pending in this reactor for the specified - * object. Returns the number of notifications - * purged. Returns -1 on error. - */ - virtual int purge_pending_notifications (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - - /** - * Check to see if is associated with a valid Event_Handler - * bound to . Return the associated with this - * if != 0. - */ - virtual int handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler = 0); - - /** - * Check to see if is associated with a valid Event_Handler - * bound to a signal. Return the associated with - * this if != 0. - */ - virtual int handler (int signum, - ACE_Event_Handler ** = 0); - - /// Returns true if Reactor has been successfully initialized, else - /// false. - virtual int initialized (void); - - /// Returns the current size of the Reactor's internal descriptor - /// table. - virtual size_t size (void) const; - - /// Returns a reference to the Reactor's internal lock. - virtual ACE_Lock &lock (void); - - /// Wake up all threads waiting in the event loop. - virtual void wakeup_all_threads (void); - - /// Transfers ownership of Reactor_Impl to the new_owner. - /** - * @note There is no need to set the owner of the event loop for the - * ACE_Dev_Poll_Reactor. Multiple threads may invoke the - * event loop simulataneously. As such, this method is a - * no-op. - */ - virtual int owner (ACE_thread_t new_owner, ACE_thread_t *old_owner = 0); - - /// Return the ID of the "owner" thread. - /** - * @note There is no need to set the owner of the event loop for the - * ACE_Dev_Poll_Reactor. Multiple threads may invoke the - * event loop simulataneously. As such, this method is a - * no-op. - */ - virtual int owner (ACE_thread_t *owner); - - /// Get the existing restart value. - virtual int restart (void); - - /// Set a new value for restart and return the original value. - /** - * @param r If zero, then the event loop will not be automatically - * restarted if the underlying poll is interrupted via the - * INTR (interrupt) signal. - * - * @return Returns the previous "restart" value. - */ - virtual int restart (int r); - - /// Set position of the owner thread. - /** - * @note This is currently a no-op. - */ - virtual void requeue_position (int); - - /// Get position of the owner thread. - /** - * @note This is currently a no-op. - */ - virtual int requeue_position (void); - - /** - * @name Low-level wait_set mask manipulation methods - * - * Low-level methods to manipulate the event/reactor mask associated - * with a handle and event handler when polling for events. - * @par - * The "interest set," i.e. the wait set, can be directly - * manipulated with these methods. - */ - //@{ - - /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the - /// event_handler and mask. - virtual int mask_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops); - - /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the handle - /// and mask. - virtual int mask_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops); - - //@} - - /** - * @name Low-level ready_set mask manipulation methods - * - * These methods are unimplemented. - */ - //@{ - - /// GET/SET/ADD/CLR the ready "bit" bound with the event_handler - /// and mask. - virtual int ready_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops); - - /// GET/SET/ADD/CLR the ready "bit" bound with the handle and mask. - virtual int ready_ops (ACE_HANDLE handle, - ACE_Reactor_Mask, - int ops); - - //@} - - /// Dump the state of an object. - virtual void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - - /// Non-locking version of wait_pending(). - /** - * Returns non-zero if there are I/O events "ready" for dispatching, - * but does not actually dispatch the event handlers. By default, - * don't block while checking this, i.e., "poll". - * - * @note It is only possible to achieve millisecond timeout - * resolutions with the ACE_Dev_Poll_Reactor. - */ - int work_pending_i (ACE_Time_Value *max_wait_time); - - /// Poll for events and return the number of event handlers that - /// were dispatched. - /** - * This is a helper method called by all handle_events() methods. - */ - int handle_events_i (ACE_Time_Value *max_wait_time); - - /// Perform the upcall with the given event handler method. - int upcall (ACE_Event_Handler *event_handler, - int (ACE_Event_Handler::*callback)(ACE_HANDLE), - ACE_HANDLE handle); - - /** - * Dispatch ACE_Event_Handlers for time events, I/O events, and - * signal events. Returns the total number of ACE_Event_Handlers - * that were dispatched or -1 if something goes wrong. - */ - int dispatch (void); - - /// - int dispatch_timer_handlers (int &number_of_handlers_dispatched); - - /// Dispatch all IO related events to their corresponding event - /// handlers. - int dispatch_io_events (int &io_handlers_dispatched); - - /// Register the given event handler with the reactor. - int register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - - /// Remove the event handler associated with the given handle and - /// event mask from the "interest set." - int remove_handler_i (ACE_HANDLE handle, ACE_Reactor_Mask mask); - - /// Temporarily remove the given handle from the "interest set." - int suspend_handler_i (ACE_HANDLE handle); - - /// Place the given handle that was temporarily removed from the - /// "interest set," i.e that was suspended, back in to the interest - /// set. The given handle will once again be polled for events. - int resume_handler_i (ACE_HANDLE handle); - - /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the handle - /// and mask. This internal helper method acquires no lock. - int mask_ops_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops); - - /// Convert a reactor mask to its corresponding poll() event mask. - short reactor_mask_to_poll_event (ACE_Reactor_Mask mask); - -protected: - - /// Has the reactor been initialized. - char initialized_; - - /// The file descriptor associated with the open `/dev/poll' or - /// `/dev/epoll' device. - /** - * All interactions with the `/dev/poll' or `/dev/epoll' device are - * done through this file descriptor. - */ - ACE_HANDLE poll_fd_; - - /// The maximum number of file descriptors over which demultiplexing - /// will occur. - size_t size_; - - /// Track HANDLES we are interested in for various events that must - /// be dispatched *without* polling. - /// ACE_Dev_Poll_Ready_Set ready_set_; - -#if defined (ACE_HAS_EVENT_POLL) - /// The memory map that `/dev/epoll' will feed its results to. - char *mmap_; -#else - /// The pollfd array that `/dev/poll' will feed its results to. - struct pollfd *dp_fds_; -#endif /* ACE_HAS_EVENT_POLL */ - - /// Pointer to the next pollfd array element that contains the next - /// event to be dispatched. - struct pollfd *start_pfds_; - - /// The last element in the pollfd array plus one. - /** - * The loop that dispatches IO events stops when this->start_pfds == - * this->end_pfds_. - */ - struct pollfd *end_pfds_; - - /// This flag is used to keep track of whether we are actively handling - /// events or not. - sig_atomic_t deactivated_; - - /// Lock used for synchronization of reactor state. - ACE_SYNCH_MUTEX lock_; - - /// Adapter used to return internal lock to outside world. - ACE_Lock_Adapter lock_adapter_; - - /// The repository that contains all registered event handlers. - ACE_Dev_Poll_Reactor_Handler_Repository handler_rep_; - - /// Defined as a pointer to allow overriding by derived classes... - ACE_Timer_Queue *timer_queue_; - - /// Keeps track of whether we should delete the timer queue (if we - /// didn't create it, then we don't delete it). - int delete_timer_queue_; - - /// Handle signals without requiring global/static variables. - ACE_Sig_Handler *signal_handler_; - - /// Keeps track of whether we should delete the signal handler (if we - /// didn't create it, then we don't delete it). - int delete_signal_handler_; - - /// Callback object that unblocks the if it's - /// sleeping. - ACE_Reactor_Notify *notify_handler_; - - /// Keeps track of whether we need to delete the notify handler (if - /// we didn't create it, then we don't delete it). - int delete_notify_handler_; - - /// Flag that determines if signals are masked during event - /// dispatching. - /** - * If 0 then the Reactor will not mask the signals during the event - * dispatching. This is useful for applications that do not - * register any signal handlers and want to reduce the overhead - * introduce by the kernel level locks required to change the mask. - */ - int mask_signals_; - - /// Restart the handle_events event loop method automatically when - /// polling function in use (ioctl() in this case) is interrupted - /// via an EINTR signal. - int restart_; - -}; - - -/** - * @class ACE_Dev_Poll_Handler_Guard - * - * @brief Class used to make event handler reference count - * manipulation exception-safe. - * - * This class makes the reference count manipulation that occurs - * during an upcall exception-safe. Prior to dispatching the event - * handler, the reference count is increased. Once the upcall for the - * given event handler is complete, its reference count will be decreased. - */ -class ACE_Dev_Poll_Handler_Guard -{ -public: - - /// Constructor - /** - * The constructor increments the reference count on the event - * handler corresponding to the given handle. - */ - ACE_Dev_Poll_Handler_Guard ( - ACE_Dev_Poll_Reactor_Handler_Repository &repository, - ACE_HANDLE handle); - - /// Destructor - /** - * The destructor decrements the reference count on the event - * handler corresponding to the given handle. - */ - ~ACE_Dev_Poll_Handler_Guard (void); - -private: - - /// Reference to the handler repository containing the event handler - /// used during the upcall. - ACE_Dev_Poll_Reactor_Handler_Repository &repository_; - - /// Handle corresponding to the event being dispatched. - ACE_HANDLE handle_; - -}; - - -#if defined (__ACE_INLINE__) -# include "ace/Dev_Poll_Reactor.inl" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_EVENT_POLL || ACE_HAS_DEV_POLL */ - -#include "ace/post.h" - -#endif /* ACE_DEV_POLL_REACTOR_H */ diff --git a/ace/Dev_Poll_Reactor.inl b/ace/Dev_Poll_Reactor.inl deleted file mode 100644 index 74ff5c2dc2a..00000000000 --- a/ace/Dev_Poll_Reactor.inl +++ /dev/null @@ -1,201 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -ACE_INLINE -ACE_Dev_Poll_Event_Tuple::ACE_Dev_Poll_Event_Tuple (void) - : event_handler (0), - mask (ACE_Event_Handler::NULL_MASK), - suspended (0), - refcount (1) -{ -} - -// --------------------------------------------------------------------- - -#if 0 -ACE_INLINE -ACE_Dev_Poll_Ready_Set::ACE_Dev_Poll_Ready_Set (void) - : pfds (0), - nfds (0) -{ -} -#endif /* 0 */ - -// --------------------------------------------------------------------- - -ACE_INLINE void -ACE_Dev_Poll_Reactor_Handler_Repository::mask (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::mask"); - - // Only bother to search for the handle if it's in range. - if (this->handle_in_range (handle)) - this->handlers_[handle].mask = mask; -} - -ACE_INLINE ACE_Reactor_Mask -ACE_Dev_Poll_Reactor_Handler_Repository::mask (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::mask"); - - ACE_Reactor_Mask mask = ACE_Event_Handler::NULL_MASK; - - // Only bother to search for the handle if it's in range. - if (this->handle_in_range (handle)) - mask = this->handlers_[handle].mask; - - if (mask == ACE_Event_Handler::NULL_MASK) - errno = ENOENT; - - return mask; -} - -ACE_INLINE void -ACE_Dev_Poll_Reactor_Handler_Repository::suspend (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::suspend"); - - // Only bother to search for the handle if it's in range. - if (this->handle_in_range (handle)) - this->handlers_[handle].suspended = 1; -} - -ACE_INLINE void -ACE_Dev_Poll_Reactor_Handler_Repository::resume (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::resume"); - - // Only bother to search for the handle if it's in range. - if (this->handle_in_range (handle)) - this->handlers_[handle].suspended = 0; -} - -ACE_INLINE int -ACE_Dev_Poll_Reactor_Handler_Repository::suspended (ACE_HANDLE handle) const -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::suspended"); - - if (this->handle_in_range (handle)) - return this->handlers_[handle].suspended; - - return -1; -} - -ACE_INLINE size_t -ACE_Dev_Poll_Reactor_Handler_Repository::size (void) const -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::size"); - - return this->max_size_; -} - -ACE_INLINE unsigned long -ACE_Dev_Poll_Reactor_Handler_Repository::add_ref (ACE_HANDLE handle) -{ - // ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::add_ref"); - - // Caller provides synchronization - - if (this->handle_in_range (handle)) - return this->handlers_[handle].refcount++; - - return 0; -} - -ACE_INLINE unsigned long -ACE_Dev_Poll_Reactor_Handler_Repository::remove_ref (ACE_HANDLE handle) -{ - // ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::remove_ref"); - - // Caller provides synchronization - - if (this->handle_in_range (handle)) - { - unsigned long & refcount = this->handlers_[handle].refcount; - - ACE_ASSERT (refcount > 0); - - refcount--; - - if (refcount != 0) - return refcount; - - // Reference count dropped to zero. Remove the event handler - // from the repository. - this->unbind (handle); - } - - return 0; -} - -// ----------------------------------------------------------------- - -ACE_INLINE -ACE_Dev_Poll_Handler_Guard::ACE_Dev_Poll_Handler_Guard ( - ACE_Dev_Poll_Reactor_Handler_Repository &repository, - ACE_HANDLE handle) - : repository_ (repository), - handle_ (handle) -{ - // Caller must provide synchronization. - - (void) repository.add_ref (handle); - - /** - * @todo Suspend the handler so that other threads will not cause - * an event that is already in an upcall from being dispatched - * again. - * - * @note The naive approach would be to simply call - * suspend_handler_i() on the reactor. However, that would - * cause a system call (write()) to occur. Obviously this - * can potentially have an adverse affect on performance. - * Ideally, the handler would only be marked as "suspended" in - * the handler repository. If an event arrives for a - * suspended handler that event can be "queued" in a - * "handle readiness queue." "Queued" is quoted since a real - * queue need not be used since duplicate events can be - * coalesced, thus avoiding unbounded queue growth. Event - * coalescing is already done by Linux's event poll driver - * (/dev/epoll) so Solaris' poll driver (/dev/poll) is the - * main concern here. The largest the queue can be is the - * same size as the number of handlers stored in the handler - * repository. - */ -} - -ACE_INLINE -ACE_Dev_Poll_Handler_Guard::~ACE_Dev_Poll_Handler_Guard (void) -{ - // Caller must provide synchronization. - - (void) this->repository_.remove_ref (this->handle_); - - /** - * @todo Resume the handler so that other threads will be allowed to - * dispatch the handler. - */ -} - -// --------------------------------------------------------------------- - -ACE_INLINE int -ACE_Dev_Poll_Reactor::upcall (ACE_Event_Handler *event_handler, - int (ACE_Event_Handler::*callback)(ACE_HANDLE), - ACE_HANDLE handle) -{ - // If the handler returns positive value (requesting a reactor - // callback) just call back as many times as the handler requests - // it. Other threads are off handling other things. - int status = 0; - - do - { - status = (event_handler->*callback) (handle); - } - while (status > 0); - - return status; -} diff --git a/ace/Dirent.cpp b/ace/Dirent.cpp deleted file mode 100644 index d8a283a7368..00000000000 --- a/ace/Dirent.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// $Id$ - -#include "ace/Dirent.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Dirent.i" -#else -#if defined (__hpux) && !defined (__GNUG__) -static int shut_up_aCC = 0; -#endif /* HPUX && !g++ */ -#endif /* __ACE_INLINE__ */ diff --git a/ace/Dirent.h b/ace/Dirent.h deleted file mode 100644 index 65ee1198b80..00000000000 --- a/ace/Dirent.h +++ /dev/null @@ -1,118 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Dirent.h - * - * $Id$ - * - * Define a portable C++ interface to ACE_OS_Dirent directory-entry - * manipulation. - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_DIRENT_H -#define ACE_DIRENT_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS_Dirent.h" - -/** - * @class ACE_Dirent - * - * @brief Define a portable C++ directory-entry iterator based on the POSIX API. - */ -class ACE_Export ACE_Dirent -{ -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_Dirent (void); - - /// Constructor calls - ACE_EXPLICIT ACE_Dirent (const ACE_TCHAR *dirname); - - /// Opens the directory named by filename and associates a directory - /// stream with it. - int open (const ACE_TCHAR *filename); - - /// Destructor calls . - ~ACE_Dirent (void); - - /// Closes the directory stream and frees the structure. - void close (void); - - // = Iterator methods. - /** - * Returns a pointer to a structure representing the directory entry - * at the current position in the directory stream to which dirp - * refers, and positions the directory stream at the next entry, - * except on read-only filesystems. It returns a NULL pointer upon - * reaching the end of the directory stream, or upon detecting an - * invalid location in the directory. shall not return - * directory entries containing empty names. It is unspecified - * whether entries are returned for dot or dot-dot. The pointer - * returned by points to data that may be overwritten by - * another call to on the same directory stream. This - * data shall not be overwritten by another call to on a - * different directory stream. may buffer several - * directory entries per actual read operation; marks for - * update the st_atime field of the directory each time the - * directory is actually read. - */ - dirent *read (void); - - /** - * Has the equivalent functionality as except that an - * and buffer must be supplied by the caller to - * store the result. - */ - int read (struct dirent *entry, - struct dirent **result); - - // = Manipulators. - /// Returns the current location associated with the directory - /// stream. - long tell (void); - - /** - * Sets the position of the next operation on the - * directory stream. The new position reverts to the position - * associated with the directory stream at the time the - * operation that provides loc was performed. Values returned by - * are good only for the lifetime of the pointer from - * which they are derived. If the directory is closed and then - * reopened, the value may be invalidated due to - * undetected directory compaction. It is safe to use a previous - * value immediately after a call to and before - * any calls to readdir. - */ - void seek (long loc); - - /** - * Resets the position of the directory stream to the beginning of - * the directory. It also causes the directory stream to refer to - * the current state of the corresponding directory, as a call to - * would. - */ - void rewind (void); - -private: - /// Pointer to the directory stream. - ACE_DIR *dirp_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Dirent.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_DIRENT_H */ diff --git a/ace/Dirent.i b/ace/Dirent.i deleted file mode 100644 index 4c731311c29..00000000000 --- a/ace/Dirent.i +++ /dev/null @@ -1,95 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Log_Msg.h" - -ACE_INLINE int -ACE_Dirent::open (const ACE_TCHAR *dirname) -{ - // If the directory stream is already open, close it to prevent - // possible resource leaks. - - if (this->dirp_ != 0) - { - ACE_OS_Dirent::closedir (this->dirp_); - this->dirp_ = 0; - } - - this->dirp_ = ACE_OS_Dirent::opendir (dirname); - - if (this->dirp_ == 0) - return -1; - else - return 0; -} - -ACE_INLINE -ACE_Dirent::ACE_Dirent (void) - : dirp_ (0) -{ -} - -ACE_INLINE -ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname) - : dirp_ (0) -{ - if (this->open (dirname) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("Dirent::Dirent"))); -} - -ACE_INLINE -ACE_Dirent::~ACE_Dirent (void) -{ - if (this->dirp_ != 0) - ACE_OS_Dirent::closedir (this->dirp_); -} - -ACE_INLINE dirent * -ACE_Dirent::read (void) -{ - return this->dirp_ ? ACE_OS_Dirent::readdir (this->dirp_) : 0; -} - -ACE_INLINE int -ACE_Dirent::read (struct dirent *entry, - struct dirent **result) -{ - return this->dirp_ - ? ACE_OS_Dirent::readdir_r (this->dirp_, entry, result) - : 0; -} - -ACE_INLINE void -ACE_Dirent::close (void) -{ - if (this->dirp_ != 0) - { - ACE_OS_Dirent::closedir (this->dirp_); - - // Prevent double closure - this->dirp_ = 0; - } -} - -ACE_INLINE void -ACE_Dirent::rewind (void) -{ - if (this->dirp_) - ACE_OS_Dirent::rewinddir (this->dirp_); -} - -ACE_INLINE void -ACE_Dirent::seek (long loc) -{ - if (this->dirp_) - ACE_OS_Dirent::seekdir (this->dirp_, loc); -} - -ACE_INLINE long -ACE_Dirent::tell (void) -{ - return this->dirp_ ? ACE_OS_Dirent::telldir (this->dirp_) : 0; -} - diff --git a/ace/Dirent_Selector.cpp b/ace/Dirent_Selector.cpp deleted file mode 100644 index bef6c40a8d1..00000000000 --- a/ace/Dirent_Selector.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// $Id$ - -#include "ace/OS.h" -#include "ace/Dirent_Selector.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Dirent_Selector.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID (ace, - Dirent_Selector, - "$Id$") - -// Construction/Destruction - -ACE_Dirent_Selector::ACE_Dirent_Selector (void) - : namelist_ (0), - n_ (0) -{ -} - -ACE_Dirent_Selector::~ACE_Dirent_Selector (void) -{ -} - -int -ACE_Dirent_Selector::open (const ACE_TCHAR *dir, - int (*sel)(const dirent *d), - int (*cmp) (const dirent **d1, - const dirent **d2)) -{ - n_ = ACE_OS::scandir (dir, &this->namelist_, sel, cmp); - return n_; -} - -int -ACE_Dirent_Selector::close (void) -{ - for (--n_; n_>=0; --n_) - ACE_OS::free (this->namelist_[n_]); - - ACE_OS::free (this->namelist_); - return 0; -} diff --git a/ace/Dirent_Selector.h b/ace/Dirent_Selector.h deleted file mode 100644 index c5a1cb31d6f..00000000000 --- a/ace/Dirent_Selector.h +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Dirent_Selector.h - * - * $Id$ - * - * Define a portable C++ interface to the method. - * - * @author Rich Newman - */ -//============================================================================= - -#ifndef ACE_DIRENT_SELECTOR_H -#define ACE_DIRENT_SELECTOR_H -#include "ace/pre.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/ACE_export.h" - -/** - * @class ACE_Dirent_Selector - * - * @brief Define a portable C++ directory-entry iterator based on the - * POSIX scandir API. - */ -class ACE_Export ACE_Dirent_Selector -{ -public: - /// Constructor - ACE_Dirent_Selector (void); - - /// Destructor. - virtual ~ACE_Dirent_Selector (void); - - /// Return the length of the list of matching directory entries. - int length (void) const; - - /// Return the entry at @a index. - dirent *operator[] (const int index) const; - - /// Free up resources. - int close (void); - - /// Open the directory @a dir and populate the array with - /// directory entries that match the @a selector and @a comparator. - int open (const ACE_TCHAR *dir, - int (*selector)(const dirent *d) = 0, - int (*comparator)(const dirent **d1, const dirent **d2) = 0); - -protected: - /// Ptr to the namelist array. - dirent **namelist_; - - /// # of entries in the array. - int n_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Dirent_Selector.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_DIRENT_SELECTOR_H */ diff --git a/ace/Dirent_Selector.inl b/ace/Dirent_Selector.inl deleted file mode 100644 index 577c4db4584..00000000000 --- a/ace/Dirent_Selector.inl +++ /dev/null @@ -1,15 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -ACE_INLINE int -ACE_Dirent_Selector::length (void) const -{ - return n_; -} - -ACE_INLINE dirent * -ACE_Dirent_Selector::operator[] (const int n) const -{ - return this->namelist_[n]; -} diff --git a/ace/Dump.cpp b/ace/Dump.cpp deleted file mode 100644 index 52786c00d99..00000000000 --- a/ace/Dump.cpp +++ /dev/null @@ -1,136 +0,0 @@ -// $Id$ - -#include "ace/Synch_T.h" -#include "ace/Dump.h" -#include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, Dump, "$Id$") - -// Implementations (very simple for now...) - -ACE_Dumpable::~ACE_Dumpable (void) -{ - ACE_TRACE ("ACE_Dumpable::~ACE_Dumpable"); -} - -ACE_Dumpable::ACE_Dumpable (const void *this_ptr) - : this_ (this_ptr) -{ - ACE_TRACE ("ACE_Dumpable::ACE_Dumpable"); -} - -ACE_Dumpable_Ptr::ACE_Dumpable_Ptr (const ACE_Dumpable *dumper) - : dumper_ (dumper) -{ - ACE_TRACE ("ACE_Dumpable_Ptr::ACE_Dumpable_Ptr"); -} - -const ACE_Dumpable * -ACE_Dumpable_Ptr::operator->() const -{ - ACE_TRACE ("ACE_Dumpable_Ptr::operator->"); - return this->dumper_; -} - -void -ACE_Dumpable_Ptr::operator= (const ACE_Dumpable *dumper) const -{ - ACE_TRACE ("ACE_Dumpable_Ptr::operator="); - if (this->dumper_ != dumper) - { - delete (ACE_Dumpable *) this->dumper_; - ((ACE_Dumpable_Ptr *) this)->dumper_ = dumper; - } -} - -ACE_ODB::ACE_ODB (void) - // Let the Tuple default constructor initialize object_table_ - : current_size_ (0) -{ - ACE_TRACE ("ACE_ODB::ACE_ODB"); -} - -ACE_ODB * -ACE_ODB::instance (void) -{ - ACE_TRACE ("ACE_ODB::instance"); - - if (ACE_ODB::instance_ == 0) - { - ACE_MT (ACE_Thread_Mutex *lock = - ACE_Managed_Object::get_preallocated_object - (ACE_Object_Manager::ACE_DUMP_LOCK); - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0)); - - if (ACE_ODB::instance_ == 0) - ACE_NEW_RETURN (ACE_ODB::instance_, - ACE_ODB, - 0); - } - - return ACE_ODB::instance_; -} - -void -ACE_ODB::dump_objects (void) -{ - ACE_TRACE ("ACE_ODB::dump_objects"); - for (int i = 0; i < this->current_size_; i++) - { - if (this->object_table_[i].this_ != 0) - // Dump the state of the object. - this->object_table_[i].dumper_->dump (); - } -} - -// This method registers a new . It detects -// duplicates and simply overwrites them. - -void -ACE_ODB::register_object (const ACE_Dumpable *dumper) -{ - ACE_TRACE ("ACE_ODB::register_object"); - int i; - int slot = 0; - - for (i = 0; i < this->current_size_; i++) - { - if (this->object_table_[i].this_ == 0) - slot = i; - else if (this->object_table_[i].this_ == dumper->this_) - { - slot = i; - break; - } - } - - if (i == this->current_size_) - { - slot = this->current_size_++; - ACE_ASSERT (this->current_size_ < ACE_ODB::MAX_TABLE_SIZE); - } - this->object_table_[slot].this_ = dumper->this_; - this->object_table_[slot].dumper_ = dumper; -} - -void -ACE_ODB::remove_object (const void *this_ptr) -{ - ACE_TRACE ("ACE_ODB::remove_object"); - int i; - - for (i = 0; i < this->current_size_; i++) - { - if (this->object_table_[i].this_ == this_ptr) - break; - } - - if (i < this->current_size_) - { - this->object_table_[i].this_ = 0; - this->object_table_[i].dumper_ = 0; - } -} - -ACE_ODB *ACE_ODB::instance_ = 0; diff --git a/ace/Dump.h b/ace/Dump.h deleted file mode 100644 index b08d2d8d728..00000000000 --- a/ace/Dump.h +++ /dev/null @@ -1,168 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Dump.h - * - * $Id$ - * - * - * A prototype mechanism that allow all ACE objects to be registered - * with a central in-memory "database" that can dump the state of all - * live ACE objects (e.g., from within a debugger). - * - * The macros which allow easy registration and removal of objects to be - * dumped (ACE_REGISTER_OBJECT and ACE_REMOVE_OBJECT) are turned into - * no-ops by compiling with the ACE_NDEBUG macro defined. This allows - * usage to be removed in "release mode" builds without changing code. - * - * There are several interesting aspects to this design: - * - * 1. It uses the External Polymorphism pattern to avoid having to - * derive all ACE classes from a common base class that has virtual - * methods (this is crucial to avoid unnecessary overhead). In - * addition, there is no additional space added to ACE objects - * (this is crucial to maintain binary layout compatibility). - * - * 2. This mechanism can be conditionally compiled in order to - * completely disable this feature entirely. Moreover, by - * using macros there are relatively few changes to ACE code. - * - * 3. This mechanism copes with single-inheritance hierarchies of - * dumpable classes. In such cases we typically want only one - * dump, corresponding to the most derived instance. Thanks to - * Christian Millour (chris@etca.fr) for illustrating how to do - * this. Note, however, that this scheme doesn't generalize to - * work with multiple-inheritance or virtual base classes. - * - * Future work includes: - * - * 1. Using a dynamic object table rather than a static table - * - * 2. Adding support to allow particular classes of objects to - * be selectively dumped. - * - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_DUMP_H -#define ACE_DUMP_H -#include "ace/pre.h" - -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Dumpable - * - * @brief Base class that defines a uniform interface for all object - * dumping. - */ -class ACE_Export ACE_Dumpable -{ -public: - friend class ACE_ODB; - friend class ACE_Dumpable_Ptr; - - /// Constructor. - ACE_Dumpable (const void *); - - /// This pure virtual method must be filled in by a subclass. - virtual void dump (void) const = 0; - -protected: - virtual ~ACE_Dumpable (void); - -private: - /// Pointer to the object that is being stored. - const void *this_; -}; - -/** - * @class ACE_Dumpable_Ptr - * - * @brief A smart pointer stored in the in-memory object database - * ACE_ODB. The pointee (if any) is deleted when reassigned. - */ -class ACE_Export ACE_Dumpable_Ptr -{ -public: - ACE_Dumpable_Ptr (const ACE_Dumpable *dumper = 0); - const ACE_Dumpable *operator->() const; - void operator= (const ACE_Dumpable *dumper) const; - -private: - /// "Real" pointer to the underlying abstract base class - /// pointer that does the real work. - const ACE_Dumpable *dumper_; -}; - -/** - * @class ACE_ODB - * - * @brief This is the object database (ODB) that keeps track of all - * live ACE objects. - */ -class ACE_Export ACE_ODB -{ -public: - /// @todo This is clearly inadequate and should be dynamic... - enum {MAX_TABLE_SIZE = 100000}; - - /// Iterates through the entire set of registered objects and - /// dumps their state. - void dump_objects (void); - - /// Add the tuple to the list of registered ACE objects. - void register_object (const ACE_Dumpable *dumper); - - /// Use to locate and remove the associated from the - /// list of registered ACE objects. - void remove_object (const void *this_); - - /// Interface to the Singleton instance of the object database. - static ACE_ODB *instance (void); - -private: - ACE_ODB (void); // Ensure we have a Singleton... - - struct Tuple - { - /// Pointer to the object that is registered. - const void *this_; - - /// Smart pointer to the ACE_Dumpable object associated with this_. - /// This uses an ACE_Dumpable_Ptr, instead of a bare pointer, to - /// cope with hierarchies of dumpable classes. In such cases we - /// typically want only one dump, corresponding to the most derived - /// instance. To achieve this, the handle registered for the - /// subobject corresponding to the base class is destroyed (hence - /// on destruction of the subobject its handle won't exist anymore - /// and we'll have to check for that). - const ACE_Dumpable_Ptr dumper_; - - Tuple (void) : dumper_(0) {} - }; - - /// Singleton instance of this class. - static ACE_ODB *instance_; - - /// The current implementation is very simple-minded and will be - /// changed to be dynamic. - Tuple object_table_[ACE_ODB::MAX_TABLE_SIZE]; - - /// Current size of . - int current_size_; -}; - -// Include the templates classes at this point. -#include "ace/Dump_T.h" - -#include "ace/post.h" -#endif /* ACE_DUMP_H */ diff --git a/ace/Dump_T.cpp b/ace/Dump_T.cpp deleted file mode 100644 index 97386d4ba31..00000000000 --- a/ace/Dump_T.cpp +++ /dev/null @@ -1,41 +0,0 @@ -// Dump_T.cpp -// $Id$ - -#ifndef ACE_DUMP_T_C -#define ACE_DUMP_T_C - -#include "ace/Dump_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Dump_T, "$Id$") - -template -ACE_Dumpable_Adapter::~ACE_Dumpable_Adapter (void) -{ - ACE_TRACE ("ACE_Dumpable_Adapter::~ACE_Dumpable_Adapter"); -} - -template -ACE_Dumpable_Adapter::ACE_Dumpable_Adapter (const Concrete *t) - : ACE_Dumpable ((const void *) t), this_ (t) -{ - ACE_TRACE ("ACE_Dumpable_Adapter::ACE_Dumpable_Adapter"); -} - -template Concrete * -ACE_Dumpable_Adapter::operator->() const -{ - return (Concrete *) this->this_; -} - -template void -ACE_Dumpable_Adapter::dump (void) const -{ - ACE_TRACE ("ACE_Dumpable_Adapter::dump"); - this->this_->dump (); -} - -#endif /* ACE_DUMP_T_C */ diff --git a/ace/Dump_T.h b/ace/Dump_T.h deleted file mode 100644 index be283889da9..00000000000 --- a/ace/Dump_T.h +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Dump_T.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_DUMP_T_H -#define ACE_DUMP_T_H -#include "ace/pre.h" - -#include "ace/Dump.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Dumpable_Adapter - * - * @brief This class inherits the interface of the abstract ACE_Dumpable - * class and is instantiated with the implementation of the - * concrete component class . - * - * This design is similar to the Adapter and Decorator patterns - * from the ``Gang of Four'' book. Note that - * need not inherit from a common class since ACE_Dumpable - * provides the uniform virtual interface! - */ -template -class ACE_Dumpable_Adapter : public ACE_Dumpable -{ -public: - // = Initialization and termination methods. - ACE_Dumpable_Adapter (const Concrete *t); - ~ACE_Dumpable_Adapter (void); - - /// Concrete dump method (simply delegates to the method of - /// ). - virtual void dump (void) const; - - /// Delegate to methods in the Concrete class. - Concrete *operator->() const; - -private: - /// Pointer to of . - const Concrete *this_; -}; - -// Some useful macros for conditionally compiling this feature... -#if defined (ACE_NDEBUG) -#define ACE_REGISTER_OBJECT(CLASS) -#define ACE_REMOVE_OBJECT -#else -#define ACE_REGISTER_OBJECT(CLASS) \ - ACE_ODB::instance ()->register_object \ - (new ACE_Dumpable_Adapter (this)); -#define ACE_REMOVE_OBJECT \ - ACE_ODB::instance ()->remove_object \ - ((void *) this); -#endif /* ACE_NDEBUG */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Dump_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Dump_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_DUMP_T_H */ diff --git a/ace/Dynamic.cpp b/ace/Dynamic.cpp deleted file mode 100644 index 4042cd56402..00000000000 --- a/ace/Dynamic.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// Dynamic.cpp -// $Id$ - -#include "ace/Dynamic.h" -#include "ace/Singleton.h" -#include "ace/Synch_T.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Dynamic.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Dynamic, "$Id$") - -ACE_Dynamic::ACE_Dynamic (void) - : is_dynamic_ (0) -{ - ACE_TRACE ("ACE_Dynamic::ACE_Dynamic"); -} - -/* static */ ACE_Dynamic * -ACE_Dynamic::instance (void) -{ - return ACE_TSS_Singleton::instance (); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_TSS_Singleton; -# if (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) - template class ACE_TSS; -# endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */ - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_TSS_Singleton - -# if (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) - #pragma instantiate ACE_TSS -# endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */ - -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS)) -template ACE_TSS_Singleton * - ACE_TSS_Singleton::singleton_; - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Dynamic.h b/ace/Dynamic.h deleted file mode 100644 index 6c248b4f5a9..00000000000 --- a/ace/Dynamic.h +++ /dev/null @@ -1,71 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file Dynamic.h - * - * $Id$ - * - * @author Doug Schmidt - * @author Irfan Pyarali. - */ -//========================================================================== - -#ifndef ACE_DYNAMIC_H -#define ACE_DYNAMIC_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Dynamic - * - * @brief Checks to see if an object was dynamically allocated. - * - * This class holds the pointer in a thread-safe manner between - * the call to operator new and the call to the constructor. - */ -class ACE_Export ACE_Dynamic -{ -public: - // = Initialization and termination method. - /// Constructor. - ACE_Dynamic (void); - - /// Destructor. - ~ACE_Dynamic (void); - - /** - * Sets a flag that indicates that the object was dynamically - * created. This method is usually called in operator new and then - * checked and reset in the constructor. - */ - void set (void); - - /// 1 if we were allocated dynamically, else 0. - int is_dynamic (void); - - /// Resets state flag. - void reset (void); - - static ACE_Dynamic *instance (void); - -private: - /** - * Flag that indicates that the object was dynamically created. This - * method is usually called in operator new and then checked and - * reset in the constructor. - */ - int is_dynamic_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Dynamic.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_DYNAMIC_H */ diff --git a/ace/Dynamic.i b/ace/Dynamic.i deleted file mode 100644 index 9d1595441d6..00000000000 --- a/ace/Dynamic.i +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Dynamic.i - -ACE_INLINE -ACE_Dynamic::~ACE_Dynamic (void) -{ - // ACE_TRACE ("ACE_Dynamic::~ACE_Dynamic"); -} - -ACE_INLINE void -ACE_Dynamic::set (void) -{ - // ACE_TRACE ("ACE_Dynamic::set"); - this->is_dynamic_ = 1; -} - -ACE_INLINE int -ACE_Dynamic::is_dynamic () -{ - // ACE_TRACE ("ACE_Dynamic::is_dynamic"); - return this->is_dynamic_; -} - -ACE_INLINE void -ACE_Dynamic::reset (void) -{ - // ACE_TRACE ("ACE_Dynamic::reset"); - this->is_dynamic_ = 0; -} diff --git a/ace/Dynamic_Service.cpp b/ace/Dynamic_Service.cpp deleted file mode 100644 index d475bd5a17b..00000000000 --- a/ace/Dynamic_Service.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// Dynamic_Service.cpp -// $Id$ - -#ifndef ACE_DYNAMIC_SERVICE_C -#define ACE_DYNAMIC_SERVICE_C - -#include "ace/Dynamic_Service.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Object.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Dynamic_Service.i" -#endif /* __ACE_INLINE__ */ - -template TYPE * -ACE_Dynamic_Service::instance (const ACE_TCHAR *name) -{ - ACE_Service_Object *svc_obj = - ACE_static_cast (ACE_Service_Object *, ACE_Dynamic_Service_Base::instance (name)); - return ACE_dynamic_cast (TYPE *, svc_obj); -} - -ACE_RCSID(ace, Dynamic_Service, "$Id$") - -#endif /* ACE_DYNAMIC_SERVICE_C */ diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h deleted file mode 100644 index 55d45bdae78..00000000000 --- a/ace/Dynamic_Service.h +++ /dev/null @@ -1,64 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Dynamic_Service.h - * - * $Id$ - * - * @author Prashant Jain - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_DYNAMIC_SERVICE_H -#define ACE_DYNAMIC_SERVICE_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Dynamic_Service_Base.h" - -class ACE_Service_Object; - -/** - * @class ACE_Dynamic_Service - * - * @brief Provides a general interface to retrieve arbitrary objects - * from the ACE service repository. - * - * Uses "name" for lookup in the ACE service repository. Obtains - * the object and returns it as the appropriate type. - */ -template -class ACE_Dynamic_Service : public ACE_Dynamic_Service_Base -{ -public: - /// Return instance using to search the Service_Repository. - static TYPE*instance (const ACE_TCHAR *name); - -#if defined (ACE_USES_WCHAR) - static TYPE* instance (const ACE_ANTI_TCHAR *name); -#endif // ACE_USES_WCHAR -}; - -#if defined (__ACE_INLINE__) -#include "ace/Dynamic_Service.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Dynamic_Service.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("Dynamic_Service.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_DYNAMIC_SERVICE_H */ diff --git a/ace/Dynamic_Service.i b/ace/Dynamic_Service.i deleted file mode 100644 index f2ebfc81e1b..00000000000 --- a/ace/Dynamic_Service.i +++ /dev/null @@ -1,10 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#if defined (ACE_USES_WCHAR) -template ACE_INLINE TYPE * -ACE_Dynamic_Service::instance (const ACE_ANTI_TCHAR *name) -{ - return instance (ACE_TEXT_CHAR_TO_TCHAR (name)); -} -#endif // ACE_USES_WCHAR diff --git a/ace/Dynamic_Service_Base.cpp b/ace/Dynamic_Service_Base.cpp deleted file mode 100644 index ab4b1bc5a62..00000000000 --- a/ace/Dynamic_Service_Base.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "ace/Dynamic_Service_Base.h" -#include "ace/Service_Config.h" -#include "ace/Service_Repository.h" -#include "ace/Service_Types.h" -#include "ace/Log_Msg.h" - - -ACE_RCSID (ace, - Dynamic_Service_Base, - "$Id$") - - -void -ACE_Dynamic_Service_Base::dump (void) const -{ - ACE_TRACE ("ACE_Dynamic_Service_Base::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// Get the instance using . - -void * -ACE_Dynamic_Service_Base::instance (const ACE_TCHAR *name) -{ - ACE_TRACE ("ACE_Dynamic_Service_Base::instance"); - const ACE_Service_Type *svc_rec; - - if (ACE_Service_Repository::instance ()->find (name, - &svc_rec) == -1) - return 0; - - const ACE_Service_Type_Impl *type = svc_rec->type (); - - if (type == 0) - return 0; - - void *obj = type->object (); - return obj; -} diff --git a/ace/Dynamic_Service_Base.h b/ace/Dynamic_Service_Base.h deleted file mode 100644 index 4a67ce2ea3a..00000000000 --- a/ace/Dynamic_Service_Base.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Dynamic_Service_Base.h - * - * $Id$ - * - * @author Prashant Jain - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_DYNAMIC_SERVICE_BASE_H -#define ACE_DYNAMIC_SERVICE_BASE_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -/** - * @class ACE_Dynamic_Service_Base - * - * @brief Base class for all ACE_Dynamic_Service instantiations. - * - * Factors out common code shared by all ACE_Dynamic_Service - * instantiations, this avoid code bloat. - */ -class ACE_Export ACE_Dynamic_Service_Base -{ -public: - /// Dump the current static of the object - void dump (void) const; - -protected: - /// Return instance using to search the Service_Repository. - static void* instance (const ACE_TCHAR *name); -}; - -#include "ace/post.h" -#endif /* ACE_DYNAMIC_SERVICE_BASE_H */ diff --git a/ace/Dynamic_Service_Base.i b/ace/Dynamic_Service_Base.i deleted file mode 100644 index 6318deb79a0..00000000000 --- a/ace/Dynamic_Service_Base.i +++ /dev/null @@ -1,2 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ diff --git a/ace/Env_Value_T.cpp b/ace/Env_Value_T.cpp deleted file mode 100644 index d99819ec6b9..00000000000 --- a/ace/Env_Value_T.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#if !defined (ACE_ENV_VALUE_T_C) -#define ACE_ENV_VALUE_T_C - -#include "ace/Env_Value_T.h" - -#if ! defined (__ACE_INLINE__) -#include "ace/Env_Value_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Env_Value_T, "$Id$") - -#endif /* ACE_ENV_VALUE_T_C */ diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h deleted file mode 100644 index b13843d8451..00000000000 --- a/ace/Env_Value_T.h +++ /dev/null @@ -1,161 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Env_Value_T.h - * - * $Id$ - * - * Template to encapsulate getting a value from an environment variable - * and using a supplied default value if not in the environment. - * - * - * @author Chris Cleeland (derived from work by Carlos O'Ryan) - */ -//============================================================================= - -#ifndef ACE_ENV_VALUE_T_H -#define ACE_ENV_VALUE_T_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -/** - * @class ACE_Env_Value - * - * @brief Enviroment Variable Value - * - * Reads a variable from the user enviroment, providing a default - * value. - */ -template -class ACE_Env_Value -{ -public: - /** - * Default constructor which isn't bound to a specific environment - * variable name or a default value. Before being useful it must - * 'd. - */ - ACE_Env_Value (void); - - /// Constructor that calls . - ACE_Env_Value (const ACE_TCHAR *varname, - const T &vardefault); - - /// Destroy the value. - ~ACE_Env_Value (void); - - /// Returns the value as type T. - operator T (void); - - /// The constructor, read from the environment, using - /// as its value if it is not defined. - void open (const ACE_TCHAR *varname, const T &defval); - - /// Returns the name of the variable being tracked. - const ACE_TCHAR *varname (void) const; - -private: - /// Disallow copying and assignment. - ACE_UNIMPLEMENTED_FUNC (ACE_Env_Value(const ACE_Env_Value &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Env_Value operator=(const ACE_Env_Value &)) - - void fetch_value (void); - - const ACE_TCHAR *varname_; - T value_; -}; - -template void ACE_Convert (const ACE_TCHAR *s, T &t); -// Function to convert a string into type . - -#if defined (__ACE_INLINE__) -#include "ace/Env_Value_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Env_Value_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - - -// Default calls a CTOR on type T of the form 'T::T(const char*)', but -// users can feel free to create their own specialized conversion -// functions if necessary, as shown below. Note that for 'char*' the -// default is used because a simple cast will be performed and no -// conversion will be necessary. - -template inline void -ACE_Convert (const ACE_TCHAR *s, T &t) -{ - t = T (s); -} - -inline void -ACE_Convert (const ACE_TCHAR *s, ACE_TCHAR *&v) -{ - v = (ACE_TCHAR *) s; -} - -inline void -ACE_Convert (const ACE_TCHAR *s, const ACE_TCHAR *&v) -{ - v = (const ACE_TCHAR *) s; -} - -inline void -ACE_Convert (const ACE_TCHAR *s, short &si) -{ - si = ACE_static_cast (short, ACE_OS::strtol (s, 0, 10)); -} - -inline void -ACE_Convert (const ACE_TCHAR *s, u_short &us) -{ - us = ACE_static_cast (u_short, ACE_OS::strtol (s, 0, 10)); -} - -inline void -ACE_Convert (const ACE_TCHAR *s, u_int &i) -{ - i = ACE_static_cast (u_int, - ACE_OS::strtol (s, 0, 10)); -} - -inline void -ACE_Convert (const ACE_TCHAR *s, long &l) -{ - l = ACE_OS::strtol (s, 0, 10); -} - -inline void -ACE_Convert (const ACE_TCHAR *s, int &i) -{ - i = ACE_static_cast (int, ACE_OS::strtol (s, 0, 10)); -} - -inline void -ACE_Convert (const ACE_TCHAR *s, u_long &ul) -{ - ul = ACE_OS::strtoul (s, 0, 10); -} - -inline void -ACE_Convert (const ACE_TCHAR *s, double &d) -{ - d = ACE_OS::strtod (s, 0); -} - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Env_Value_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_ENV_VALUE_T_H */ diff --git a/ace/Env_Value_T.i b/ace/Env_Value_T.i deleted file mode 100644 index 9f98f0fdb45..00000000000 --- a/ace/Env_Value_T.i +++ /dev/null @@ -1,51 +0,0 @@ -// $Id$ - -template ACE_INLINE -ACE_Env_Value::operator T (void) -{ - return value_; -} - -template ACE_INLINE -ACE_Env_Value::ACE_Env_Value (void) - : varname_ (0) -{ -} - -template ACE_INLINE -ACE_Env_Value::ACE_Env_Value (const ACE_TCHAR *varname, - const T &defval) - : varname_ (varname), - value_(defval) -{ - this->fetch_value (); -} - -template ACE_INLINE void -ACE_Env_Value::open (const ACE_TCHAR *varname, - const T &defval) -{ - varname_ = varname; - value_ = defval; - this->fetch_value (); -} - -template ACE_INLINE void -ACE_Env_Value::fetch_value (void) -{ - const ACE_TCHAR *env = ACE_OS::getenv (varname_); - - if (env != 0) - ACE_Convert (env, value_); -} - -template ACE_INLINE const ACE_TCHAR* -ACE_Env_Value::varname (void) const -{ - return varname_; -} - -template ACE_INLINE -ACE_Env_Value::~ACE_Env_Value (void) -{ -} diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp deleted file mode 100644 index 11b1c48b38e..00000000000 --- a/ace/Event_Handler.cpp +++ /dev/null @@ -1,248 +0,0 @@ -// Event_Handler.cpp -// $Id$ - -#include "ace/Event_Handler.h" -#include "ace/Message_Block.h" -#include "ace/OS_Errno.h" -#include "ace/Reactor.h" -#include "ace/Thread_Manager.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Event_Handler.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Event_Handler, "$Id$") - -// Implement conceptually abstract virtual functions in the base class -// so derived classes don't have to implement unused ones. - -ACE_Event_Handler::ACE_Event_Handler (ACE_Reactor *r, - int p) - : priority_ (p), - reactor_ (r) -{ - // ACE_TRACE ("ACE_Event_Handler::ACE_Event_Handler"); -} - -ACE_Event_Handler::~ACE_Event_Handler (void) -{ - // ACE_TRACE ("ACE_Event_Handler::~ACE_Event_Handler"); - if (this->reactor_ != 0) - { - ACE_Errno_Guard guard (errno); // purge may get ENOTSUP - this->reactor_->purge_pending_notifications (this); - } -} - -// Gets the file descriptor associated with this I/O device. - -ACE_HANDLE -ACE_Event_Handler::get_handle (void) const -{ - ACE_TRACE ("ACE_Event_Handler::get_handle"); - return ACE_INVALID_HANDLE; -} - -// Sets the file descriptor associated with this I/O device. - -void -ACE_Event_Handler::set_handle (ACE_HANDLE) -{ - ACE_TRACE ("ACE_Event_Handler::set_handle"); -} - -// Gets the priority of this handler. - -int -ACE_Event_Handler::priority (void) const -{ - ACE_TRACE ("ACE_Event_Handler::priority"); - return this->priority_; -} - -// Sets the priority - -void -ACE_Event_Handler::priority (int priority) -{ - ACE_TRACE ("ACE_Event_Handler::priority"); - this->priority_ = priority; -} - -// Called when the object is about to be removed from the Dispatcher -// tables. - -int -ACE_Event_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) -{ - ACE_TRACE ("ACE_Event_Handler::handle_close"); - return -1; -} - -// Called when input becomes available on fd. - -int -ACE_Event_Handler::handle_input (ACE_HANDLE) -{ - ACE_TRACE ("ACE_Event_Handler::handle_input"); - return -1; -} - -// Called when output is possible on fd. - -int -ACE_Event_Handler::handle_output (ACE_HANDLE) -{ - ACE_TRACE ("ACE_Event_Handler::handle_output"); - return -1; -} - -// Called when urgent data is available on fd. - -int -ACE_Event_Handler::handle_exception (ACE_HANDLE) -{ - ACE_TRACE ("ACE_Event_Handler::handle_exception"); - return -1; -} - -// Called when timer expires, TV stores the current time. - -int -ACE_Event_Handler::handle_timeout (const ACE_Time_Value &, const void *) -{ - ACE_TRACE ("ACE_Event_Handler::handle_timeout"); - return -1; -} - -// Called when a monitored Process exits - -int -ACE_Event_Handler::handle_exit (ACE_Process *) -{ - ACE_TRACE ("ACE_Event_Handler::handle_exit"); - return -1; -} - -// Called when a registered signal occurs. - -int -ACE_Event_Handler::handle_signal (int, siginfo_t *, ucontext_t *) -{ - ACE_TRACE ("ACE_Event_Handler::handle_signal"); - return -1; -} - -int -ACE_Event_Handler::resume_handler (void) -{ - ACE_TRACE ("ACE_Event_Handler::resume_handler"); - - // Return a default value and allow the reactor to take care of - // resuming the handler - return ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER; -} - - -int -ACE_Event_Handler::handle_qos (ACE_HANDLE) -{ - ACE_TRACE ("ACE_Event_Handler::handle_qos"); - return -1; -} - -int -ACE_Event_Handler::handle_group_qos (ACE_HANDLE) -{ - ACE_TRACE ("ACE_Event_Handler::handle_group_qos"); - return -1; -} - -void -ACE_Event_Handler::reactor (ACE_Reactor *reactor) -{ - ACE_TRACE ("ACE_Event_Handler::reactor"); - this->reactor_ = reactor; -} - -ACE_Reactor * -ACE_Event_Handler::reactor (void) const -{ - ACE_TRACE ("ACE_Event_Handler::reactor"); - return this->reactor_; -} - -#if !defined (ACE_HAS_WINCE) - -ACE_THR_FUNC_RETURN -ACE_Event_Handler::read_adapter (void *args) -{ - ACE_Event_Handler *this_ptr = (ACE_Event_Handler *) args; - - ACE_HANDLE handle = this_ptr->get_handle (); - if (handle == ACE_INVALID_HANDLE) - handle = ACE_STDIN; - - while (this_ptr->handle_input (handle) != -1) - continue; - - this_ptr->handle_close (handle, - ACE_Event_Handler::READ_MASK); - this_ptr->reactor ()->notify (); - - return 0; -} - -int -ACE_Event_Handler::register_stdin_handler (ACE_Event_Handler *eh, - ACE_Reactor *reactor, - ACE_Thread_Manager *thr_mgr, - int flags) -{ -#if defined (ACE_WIN32) || defined (ACE_PSOS) - ACE_UNUSED_ARG (reactor); - - eh->reactor (reactor); - return thr_mgr->spawn (&read_adapter, (void *) eh, flags); -#else - // Keep compilers happy. - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (thr_mgr); - return reactor->register_handler (ACE_STDIN, - eh, - ACE_Event_Handler::READ_MASK); -#endif /* ACE_WIN32 || ACE_PSOS */ -} - -int -ACE_Event_Handler::remove_stdin_handler (ACE_Reactor *reactor, - ACE_Thread_Manager *thr_mgr) -{ -#if defined (ACE_WIN32) - ACE_UNUSED_ARG (reactor); - ACE_UNUSED_ARG (thr_mgr); - - // What should we do here? - ACE_NOTSUP_RETURN (-1); -#else - // Keep compilers happy. - ACE_UNUSED_ARG (thr_mgr); - return reactor->remove_handler (ACE_STDIN, - ACE_Event_Handler::READ_MASK); -#endif /* ACE_WIN32 */ -} - -#endif /* ACE_HAS_WINCE */ - -ACE_Notification_Buffer::ACE_Notification_Buffer (void) -{ - ACE_TRACE ("ACE_Notification_Buffer::ACE_Notification_Buffer"); -} - -ACE_Notification_Buffer::ACE_Notification_Buffer (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) - : eh_ (eh), - mask_ (mask) -{ - ACE_TRACE ("ACE_Notification_Buffer::ACE_Notification_Buffer"); -} diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h deleted file mode 100644 index e5f0df47427..00000000000 --- a/ace/Event_Handler.h +++ /dev/null @@ -1,237 +0,0 @@ -/* -*- C++ -*- */ - -//========================================================================== -/** - * @file Event_Handler.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//========================================================================== - -#ifndef ACE_EVENT_HANDLER_H -#define ACE_EVENT_HANDLER_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -// Forward declaration. -class ACE_Message_Block; -class ACE_Reactor; -class ACE_Thread_Manager; -class ACE_Process; - -typedef u_long ACE_Reactor_Mask; - -/** - * @class ACE_Event_Handler - * - * @brief Provides an abstract interface for handling various types of - * I/O, timer, and signal events. - * - * Subclasses read/write input/output on an I/O descriptor, - * handle an exception raised on an I/O descriptor, handle a - * timer's expiration, or handle a signal. - */ -class ACE_Export ACE_Event_Handler -{ -public: - enum - { - LO_PRIORITY = 0, - HI_PRIORITY = 10, - NULL_MASK = 0, -#if defined (ACE_USE_POLL) - READ_MASK = POLLIN, - WRITE_MASK = POLLOUT, - EXCEPT_MASK = POLLPRI, -#else /* USE SELECT */ - READ_MASK = (1 << 0), - WRITE_MASK = (1 << 1), - EXCEPT_MASK = (1 << 2), -#endif /* ACE_USE_POLL */ - ACCEPT_MASK = (1 << 3), - CONNECT_MASK = (1 << 4), - TIMER_MASK = (1 << 5), - QOS_MASK = (1 << 6), - GROUP_QOS_MASK = (1 << 7), - SIGNAL_MASK = (1 << 8), - ALL_EVENTS_MASK = READ_MASK | - WRITE_MASK | - EXCEPT_MASK | - ACCEPT_MASK | - CONNECT_MASK | - TIMER_MASK | - QOS_MASK | - GROUP_QOS_MASK | - SIGNAL_MASK, - RWE_MASK = READ_MASK | - WRITE_MASK | - EXCEPT_MASK, - DONT_CALL = (1 << 9) - }; - - /// Destructor is virtual to enable proper cleanup. - virtual ~ACE_Event_Handler (void); - - /// Get the I/O handle. - virtual ACE_HANDLE get_handle (void) const; - - /// Set the I/O handle. - virtual void set_handle (ACE_HANDLE); - - // = Get/set priority - - // Priorities run from MIN_PRIORITY (which is the "lowest priority") - // to MAX_PRIORITY (which is the "highest priority"). - /// Get the priority of the Event_Handler. - virtual int priority (void) const; - - /// Set the priority of the Event_Handler. - virtual void priority (int priority); - - /// Called when input events occur (e.g., connection or data). - virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE); - - /// Called when output events are possible (e.g., when flow control - /// abates or non-blocking connection completes). - virtual int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE); - - /// Called when an exceptional events occur (e.g., SIGURG). - virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE); - - /** - * Called when timer expires. represents the current - * time that the was selected for timeout - * dispatching and is the asynchronous completion token that - * was passed in when was invoked. - */ - virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act = 0); - - /// Called when a process exits. - virtual int handle_exit (ACE_Process *); - - /// Called when a method returns -1 or when the - /// method is called on an . The - /// indicates which event has triggered the - /// method callback on a particular . - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); - - /// Called when object is signaled by OS (either via UNIX signals or - /// when a Win32 object becomes signaled). - virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); - - enum - { - /// The handler is not resumed at all. Could lead to deadlock.. - ACE_EVENT_HANDLER_NOT_RESUMED = -1, - /// The reactor takes responsibility of resuming the handler and - /// is the default - ACE_REACTOR_RESUMES_HANDLER = 0, - /// The application takes responsibility of resuming the handler - ACE_APPLICATION_RESUMES_HANDLER - }; - /* Called to figure out whether the handler needs to resumed by the - * reactor or the application can take care of it. The default - * value of 0 would be returned which would allow the reactor to - * take care of resumption of the handler. The application can - * return a value more than zero and decide to resume the handler - * themseleves. - */ - // @@ NOTE: This method is only useful for the ACE_TP_Reactor. Sad - // that we have to have this method in a class that is supposed to - // be used across different componets in ACE. - virtual int resume_handler (void); - - virtual int handle_qos (ACE_HANDLE = ACE_INVALID_HANDLE); - virtual int handle_group_qos (ACE_HANDLE = ACE_INVALID_HANDLE); - - // = Accessors to set/get the various event demultiplexors. - /// Set the event demultiplexors. - virtual void reactor (ACE_Reactor *reactor); - - /// Get the event demultiplexors. - virtual ACE_Reactor *reactor (void) const; - -#if !defined (ACE_HAS_WINCE) - /** - * Used to read from non-socket ACE_HANDLEs in our own thread to - * work around Win32 limitations that don't allow us to 'able on - * Win32. - */ - static int register_stdin_handler (ACE_Event_Handler *eh, - ACE_Reactor *reactor, - ACE_Thread_Manager *thr_mgr, - int flags = THR_DETACHED); - - /// Performs the inverse of the method. - static int remove_stdin_handler (ACE_Reactor *reactor, - ACE_Thread_Manager *thr_mgr); -#endif /* ACE_HAS_WINCE */ - -protected: - /// Force ACE_Event_Handler to be an abstract base class. - ACE_Event_Handler (ACE_Reactor * = 0, - int priority = ACE_Event_Handler::LO_PRIORITY); - -private: - - /// Priority of this Event_Handler. - int priority_; - - /// Pointer to the various event demultiplexors. - ACE_Reactor *reactor_; -}; - -/** - * @class ACE_Notification_Buffer - * - * @brief Simple wrapper for passing s and - * s between threads. - */ -class ACE_Export ACE_Notification_Buffer -{ -public: - ACE_Notification_Buffer (void); - - ACE_Notification_Buffer (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - - /// Default dtor. - ~ACE_Notification_Buffer (void); - - /// Pointer to the Event_Handler that will be dispatched - /// by the main event loop. - ACE_Event_Handler *eh_; - - /// Mask that indicates which method to call. - ACE_Reactor_Mask mask_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Event_Handler.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_EVENT_HANDLER_H */ diff --git a/ace/Event_Handler.i b/ace/Event_Handler.i deleted file mode 100644 index 6ecccb4b1db..00000000000 --- a/ace/Event_Handler.i +++ /dev/null @@ -1,10 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Event_Handler.i - -ACE_INLINE -ACE_Notification_Buffer::~ACE_Notification_Buffer (void) -{ -} - diff --git a/ace/Event_Handler_T.cpp b/ace/Event_Handler_T.cpp deleted file mode 100644 index f0efd27b43f..00000000000 --- a/ace/Event_Handler_T.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// Event_Handler_T.cpp -// $Id$ - -#ifndef EVENT_HANDLER_T_C -#define EVENT_HANDLER_T_C - -#include "ace/Event_Handler_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Event_Handler_T, "$Id$") - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - -#if !defined (__ACE_INLINE__) -#include "ace/Event_Handler_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_Event_Handler_T) - -template void -ACE_Event_Handler_T::dump (void) const -{ - ACE_TRACE ("ACE_Event_Handler_T::dump"); -} - -template -ACE_Event_Handler_T::~ACE_Event_Handler_T (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::~ACE_Event_Handler_T"); - if (this->delete_handler_) - delete this->op_handler_; -} - -template -ACE_Event_Handler_T::ACE_Event_Handler_T (T *op_handler, int delete_handler, - GET_HANDLE get_handle, - IO_HANDLER input_h, - CL_HANDLER close_h, - SIG_HANDLER sig_h, - TO_HANDLER timeout_h, - IO_HANDLER output_h, - SET_HANDLE set_handle, - IO_HANDLER except_h) - : op_handler_ (op_handler), - input_handler_ (input_h), - output_handler_ (output_h), - except_handler_ (except_h), - to_handler_ (timeout_h), - cl_handler_ (close_h), - sig_handler_ (sig_h), - delete_handler_ (delete_handler), - set_handle_ (set_handle), - get_handle_ (get_handle) -{ - ACE_TRACE ("ACE_Event_Handler_T::ACE_Event_Handler_T"); -} - -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - -#endif /* EVENT_HANDLER_T_C */ diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h deleted file mode 100644 index 7dfc34f4ee6..00000000000 --- a/ace/Event_Handler_T.h +++ /dev/null @@ -1,187 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Event_Handler_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_EVENT_HANDLER_T_H -#define ACE_EVENT_HANDLER_T_H -#include "ace/pre.h" - -#include "ace/Event_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - -/** - * @class ACE_Event_Handler_T - * - * @brief Enable a class that doesn't inherit from the - * ACE_Event_Handler to be incorporated into the ACE_Reactor - * framework. Thanks to Greg Lavender (g.lavender@isode.com) - * for sharing this idea. - * - * It is sometimes the case that an application has a hierarchy - * of operation dispatcher classes that have their own - * inheritance hierarchy but also would like to integrate with - * the ACE_Reactor. Rather than adopt a "mixin" approach, it is - * often cleaner to define a template as a subclass of - * ACE_Event_Handler and paramterize it with an operation - * dispatcher type. - * When constructing an instantiation of the ACE_Event_Handler_T - * object, a set of pointers to member functions must be - * provided so that when one of the handle_* methods is called - * by the ACE_Reactor, the appropriate method is called on the - * underlying operations object. This is done since in some - * cases it is useful to map any event that happens to the same - * method on an object. - * The ACE_Event_Handler_T template is instantiated by an - * operations object and registered with the ACE_Reactor, and it - * then calls the appropriate op_handler. So, it's basically - * just another level of indirection in event dispatching. The - * coupling betweent the ultimate handler of the event and the - * ACE_Event_Handler class is relaxed a bit by have this - * intermediate object of type around. The - * client object can then dynamically change the bindings for - * the various handlers so that during the life of one of the - * operation objects, it can change how it wants events to be - * handled. It just instantiates a new instance of the template - * with different bindings and reregisters this new object with - * the ACE_Reactor. - */ -template -class ACE_Event_Handler_T : public ACE_Event_Handler -{ -public: - // = Typedefs to simplify pointer-to-member-function registration. - - // Get/set the underlying handle. - typedef ACE_HANDLE (T::*GET_HANDLE) (void) const; - typedef void (T::*SET_HANDLE) (ACE_HANDLE); - - /// Handle I/O events. - typedef int (T::*IO_HANDLER) (ACE_HANDLE); - - /// Handle timeout events. - typedef int (T::*TO_HANDLER) (const ACE_Time_Value &, const void *); - - /// Handle close events. - typedef int (T::*CL_HANDLER) (ACE_HANDLE, ACE_Reactor_Mask); - - /// = Initialization and termination methods. - typedef int (T::*SIG_HANDLER) (int, siginfo_t*, ucontext_t*); - - /// Initialize the op_handler. - ACE_Event_Handler_T (T *op_handler, - int delete_handler, - GET_HANDLE get_handle = 0, - IO_HANDLER input = 0, - CL_HANDLER close = 0, - SIG_HANDLER sig = 0, - TO_HANDLER timeout = 0, - IO_HANDLER output = 0, - SET_HANDLE set_handle = 0, - IO_HANDLER except = 0); - - /// Close down and delete the - ~ACE_Event_Handler_T (void); - - // = Override all the ACE_Event_Handler methods. - - // These methods all delegate down to the operations handler. - virtual ACE_HANDLE get_handle (void) const; - virtual void set_handle (ACE_HANDLE); - virtual int handle_input (ACE_HANDLE fd = -1); - virtual int handle_output (ACE_HANDLE fd = -1); - virtual int handle_exception (ACE_HANDLE fd = -1); - virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); - virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask); - virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); - - // = Get/set the operations handler. - T *op_handler (void); - void op_handler (T *); - - // = Get/set the target pointer-to-method used for dispatching. - - GET_HANDLE handle_get (void); - void handle_get (GET_HANDLE); - - SET_HANDLE handle_set (void); - void handle_set (SET_HANDLE); - - IO_HANDLER input_handler (void); - void input_handler (IO_HANDLER); - - IO_HANDLER output_handler (void); - void output_handler (IO_HANDLER); - - IO_HANDLER except_handler (void); - void except_handler (IO_HANDLER); - - TO_HANDLER to_handler (void); - void to_handler (TO_HANDLER); - - CL_HANDLER cl_handler (void); - void cl_handler (CL_HANDLER); - - SIG_HANDLER sig_handler (void); - void sig_handler (SIG_HANDLER); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Pointer to the object that handles all the delegated operations. - T *op_handler_; - - // = Handle input, output, and exception events. - IO_HANDLER input_handler_; - IO_HANDLER output_handler_; - IO_HANDLER except_handler_; - - /// Handle timeout events. - TO_HANDLER to_handler_; - - /// Handle close events. - CL_HANDLER cl_handler_; - - /// Handle signal events. - SIG_HANDLER sig_handler_; - - /// Keeps track of whether we need to delete the handler in the - /// destructor. - int delete_handler_; - - // = Get/set underlying handle. - SET_HANDLE set_handle_; - GET_HANDLE get_handle_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Event_Handler_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Event_Handler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Event_Handler_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ -#include "ace/post.h" -#endif /* ACE_EVENT_HANDLER_H */ diff --git a/ace/Event_Handler_T.i b/ace/Event_Handler_T.i deleted file mode 100644 index 31d030c555f..00000000000 --- a/ace/Event_Handler_T.i +++ /dev/null @@ -1,185 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -template ACE_INLINE void -ACE_Event_Handler_T::op_handler (T *op) -{ - ACE_TRACE ("ACE_Event_Handler_T::op_handler"); - this->op_handler_ = op; -} - -template ACE_INLINE T * -ACE_Event_Handler_T::op_handler (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::op_handler"); - return this->op_handler_; -} - -template ACE_INLINE ACE_HANDLE -ACE_Event_Handler_T::get_handle (void) const -{ - ACE_TRACE ("ACE_Event_Handler_T::get_handle"); - return this->get_handle_ == 0 ? ACE_INVALID_HANDLE : (this->op_handler_->*get_handle_) (); -} - -template ACE_INLINE void -ACE_Event_Handler_T::set_handle (ACE_HANDLE h) -{ - ACE_TRACE ("ACE_Event_Handler_T::set_handle"); - if (this->set_handle_ != 0) - (this->op_handler_->*set_handle_) (h); -} - -template ACE_INLINE int -ACE_Event_Handler_T::handle_input (ACE_HANDLE fd) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_input"); - return this->input_handler_ == 0 ? 0 : (this->op_handler_->*input_handler_) (fd); -} - -template ACE_INLINE int -ACE_Event_Handler_T::handle_output (ACE_HANDLE fd) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_output"); - return this->output_handler_ == 0 ? 0 : (this->op_handler_->*output_handler_) (fd); -} - -template ACE_INLINE int -ACE_Event_Handler_T::handle_exception (ACE_HANDLE fd) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_exception"); - return this->except_handler_ == 0 ? 0 : (this->op_handler_->*except_handler_) (fd); -} - -template ACE_INLINE int -ACE_Event_Handler_T::handle_timeout (const ACE_Time_Value &tv, const void *arg) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_timeout"); - return this->to_handler_ == 0 ? 0 : (this->op_handler_->*to_handler_) (tv, arg); -} - -template ACE_INLINE int -ACE_Event_Handler_T::handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_close"); - return this->cl_handler_ == 0 ? 0 : (this->op_handler_->*cl_handler_) (fd, close_mask); -} - -template ACE_INLINE int -ACE_Event_Handler_T::handle_signal (int signum, siginfo_t *s, ucontext_t *u) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_signal"); - return this->sig_handler_ == 0 ? 0 : (this->op_handler_->*sig_handler_) (signum, s, u); -} - -template ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T::GET_HANDLE -ACE_Event_Handler_T::handle_get (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_get"); - return this->get_handle_; -} - -template ACE_INLINE void -ACE_Event_Handler_T::handle_get (ACE_TYPENAME ACE_Event_Handler_T::GET_HANDLE h) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_get"); - this->get_handle_ = h; -} - -template ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T::SET_HANDLE -ACE_Event_Handler_T::handle_set (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_set"); - return this->set_handle_; -} - -template ACE_INLINE void -ACE_Event_Handler_T::handle_set (ACE_TYPENAME ACE_Event_Handler_T::SET_HANDLE h) -{ - ACE_TRACE ("ACE_Event_Handler_T::handle_set"); - this->set_handle_ = h; -} - -template ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T::IO_HANDLER -ACE_Event_Handler_T::input_handler (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::input_handler"); - return this->input_handler_; -} - -template ACE_INLINE void -ACE_Event_Handler_T::input_handler (ACE_TYPENAME ACE_Event_Handler_T::IO_HANDLER h) -{ - ACE_TRACE ("ACE_Event_Handler_T::input_handler"); - this->input_handler_ = h; -} - -template ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T::IO_HANDLER -ACE_Event_Handler_T::output_handler (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::output_handler"); - return this->output_handler_; -} - -template ACE_INLINE void -ACE_Event_Handler_T::output_handler (ACE_TYPENAME ACE_Event_Handler_T::IO_HANDLER h) -{ - ACE_TRACE ("ACE_Event_Handler_T::output_handler"); - this->output_handler_ = h; -} - -template ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T::IO_HANDLER -ACE_Event_Handler_T::except_handler (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::except_handler"); - return this->except_handler_; -} - -template ACE_INLINE void -ACE_Event_Handler_T::except_handler (ACE_TYPENAME ACE_Event_Handler_T::IO_HANDLER h) -{ - ACE_TRACE ("ACE_Event_Handler_T::except_handler"); - this->except_handler_ = h; -} - -template ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T::TO_HANDLER -ACE_Event_Handler_T::to_handler (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::to_handler"); - return this->to_handler_; -} - -template ACE_INLINE void -ACE_Event_Handler_T::to_handler (ACE_TYPENAME ACE_Event_Handler_T::TO_HANDLER h) -{ - ACE_TRACE ("ACE_Event_Handler_T::to_handler"); - this->to_handler_ = h; -} - -template ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T::CL_HANDLER -ACE_Event_Handler_T::cl_handler (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::cl_handler"); - return this->cl_handler_; -} - -template ACE_INLINE void -ACE_Event_Handler_T::cl_handler (ACE_TYPENAME ACE_Event_Handler_T::CL_HANDLER h) -{ - ACE_TRACE ("ACE_Event_Handler_T::cl_handler"); - this->cl_handler_ = h; -} - -template ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T::SIG_HANDLER -ACE_Event_Handler_T::sig_handler (void) -{ - ACE_TRACE ("ACE_Event_Handler_T::sig_handler"); - return this->sig_handler_; -} - -template ACE_INLINE void -ACE_Event_Handler_T::sig_handler (ACE_TYPENAME ACE_Event_Handler_T::SIG_HANDLER h) -{ - ACE_TRACE ("ACE_Event_Handler_T::sig_handler"); - this->sig_handler_ = h; -} diff --git a/ace/Exception_Macros.h b/ace/Exception_Macros.h deleted file mode 100644 index 115bb37f797..00000000000 --- a/ace/Exception_Macros.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- - -// ============================================================================ -/** - * @file Exception_Macros.h - * - * $Id$ - * - * Writing code that is portable between platforms with or without - * native C++ exceptions is hard. The following macros offer some - * help on this task. - * - * @author Nanbor Wang - * @author Aniruddha Gokhale - * @author Carlos O'Ryan - * @author Krishnakumar B , et al. - */ -// ============================================================================ - -// Macros for handling exceptions. - -#ifndef ACE_EXCEPTION_MACROS_H -#define ACE_EXCEPTION_MACROS_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -# if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -# endif /* ACE_LACKS_PRAGMA_ONCE */ - -// By default, if the compiler supports native exception handling, assume -// CORBA also support native exception handling. But it can be disabled by -// defining ACE_CORBA_HAS_EXCEPTIONS=0. If the compiler does not support -// exceptions handling, make sure native exception handling is disabled. -#if defined (ACE_HAS_EXCEPTIONS) -# if defined (ACE_CORBA_HAS_EXCEPTIONS) -# if (ACE_CORBA_HAS_EXCEPTIONS == 0) -# undef ACE_USES_NATIVE_EXCEPTIONS -# else /* ACE_CORBA_HAS_EXCEPTIONS != 0 */ -# define ACE_USES_NATIVE_EXCEPTIONS -# endif /* ACE_CORBA_HAS_EXCEPTIONS == 0 */ -# else -# define ACE_USES_NATIVE_EXCEPTIONS -# define ACE_CORBA_HAS_EXCEPTIONS -# endif /* ACE_CORBA_HAS_EXCEPTIONS */ -#else /* ! ACE_HAS_EXCEPTIONS */ -# undef ACE_CORBA_HAS_EXCEPTIONS -# undef ACE_USES_NATIVE_EXCEPTIONS -#endif /* ACE_HAS_EXCEPTIONS */ - -#include "ace/post.h" - -#endif /* ACE_EXCEPTION_MACROS_H */ diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp deleted file mode 100644 index 99016a7e93d..00000000000 --- a/ace/FIFO.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// FIFO.cpp -// $Id$ - -#include "ace/FIFO.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/FIFO.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, FIFO, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_FIFO) - -void -ACE_FIFO::dump (void) const -{ - ACE_TRACE ("ACE_FIFO::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rendezvous_ = %s"), this->rendezvous_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -int -ACE_FIFO::open (const ACE_TCHAR *r, int flags, int perms, - LPSECURITY_ATTRIBUTES sa) -{ - ACE_TRACE ("ACE_FIFO::open"); - ACE_OS::strsncpy (this->rendezvous_, r, MAXPATHLEN); - -#if defined (ACE_PSOS_DIAB_MIPS) - if ( ACE_OS::mkfifo (this->rendezvous_, perms) == -1 - && !(errno == EEXIST)) - return -1; -#else - if ((flags & O_CREAT) != 0 - && ACE_OS::mkfifo (this->rendezvous_, perms) == -1 - && !(errno == EEXIST)) - return -1; -#endif - - this->set_handle (ACE_OS::open (this->rendezvous_, flags, 0, sa)); - return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0; -} - -ACE_FIFO::ACE_FIFO (const ACE_TCHAR *fifo_name, - int flags, - int perms, - LPSECURITY_ATTRIBUTES sa) -{ - ACE_TRACE ("ACE_FIFO::ACE_FIFO"); - if (this->open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO"))); -} - -ACE_FIFO::ACE_FIFO (void) -{ -// ACE_TRACE ("ACE_FIFO::ACE_FIFO"); -} - -int -ACE_FIFO::close (void) -{ - ACE_TRACE ("ACE_FIFO::close"); - int result = 0; - - if (this->get_handle () != ACE_INVALID_HANDLE) - { - result = ACE_OS::close (this->get_handle ()); - this->set_handle (ACE_INVALID_HANDLE); - } - return result; -} diff --git a/ace/FIFO.h b/ace/FIFO.h deleted file mode 100644 index fd94e7026bc..00000000000 --- a/ace/FIFO.h +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- C++ -*- */ - -//========================================================================== -/** - * @file FIFO.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//========================================================================== - - -#ifndef ACE_FIFO_H -#define ACE_FIFO_H -#include "ace/pre.h" - -#include "ace/IPC_SAP.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_FIFO - * - * @brief Abstract base class for UNIX FIFOs - * - * UNIX FIFOs are also known Named Pipes, which are totally - * unrelated to Win32 Named Pipes. If you want to use a local - * IPC mechanism that will be portable to both UNIX and Win32, - * take a look at the classes. - */ -class ACE_Export ACE_FIFO : public ACE_IPC_SAP -{ -public: - /// Open up the named pipe on the in accordance with the - /// flags. - int open (const ACE_TCHAR *rendezvous, int flags, int perms, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Close down the ACE_FIFO without removing the rendezvous point. - int close (void); - - /// Close down the ACE_FIFO and remove the rendezvous point from the - /// file system. - int remove (void); - - /// Return the local address of this endpoint. - int get_local_addr (const ACE_TCHAR *&rendezvous) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - // = Make these protected to ensure that the class is "abstract." - /// Default constructor. - ACE_FIFO (void); - - /// Open up the named pipe on the in accordance with the - /// flags. - ACE_FIFO (const ACE_TCHAR *rendezvous, int flags, int perms, - LPSECURITY_ATTRIBUTES sa = 0); - -private: - /// Rendezvous point in the file system. - ACE_TCHAR rendezvous_[MAXPATHLEN + 1]; -}; - -#if defined (__ACE_INLINE__) -#include "ace/FIFO.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_FIFO_H */ diff --git a/ace/FIFO.i b/ace/FIFO.i deleted file mode 100644 index d640bb8141f..00000000000 --- a/ace/FIFO.i +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// FIFO.i - -ACE_INLINE int -ACE_FIFO::get_local_addr (const ACE_TCHAR *&r) const -{ - ACE_TRACE ("ACE_FIFO::get_local_addr"); - r = this->rendezvous_; - return 0; -} - -ACE_INLINE int -ACE_FIFO::remove (void) -{ - ACE_TRACE ("ACE_FIFO::remove"); - int result = this->close (); - return ACE_OS::unlink (this->rendezvous_) == -1 || result == -1 ? -1 : 0; -} diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp deleted file mode 100644 index 7b10a89e017..00000000000 --- a/ace/FIFO_Recv.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// FIFO_Recv.cpp -// $Id$ - -#include "ace/FIFO_Recv.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Recv.i" -#endif - -ACE_RCSID(ace, FIFO_Recv, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv) - -void -ACE_FIFO_Recv::dump (void) const -{ - ACE_TRACE ("ACE_FIFO_Recv::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_FIFO::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("aux_handle_ = %d"), this->aux_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -int -ACE_FIFO_Recv::close (void) -{ - ACE_TRACE ("ACE_FIFO_Recv::close"); - int result = ACE_FIFO::close (); - - if (this->aux_handle_ != ACE_INVALID_HANDLE) - return ACE_OS::close (this->aux_handle_); - else - return result; -} - -// Note that persistent means "open fifo for writing, as well as -// reading." This ensures that the fifo never gets EOF, even if there -// aren't any writers at the moment! - -int -ACE_FIFO_Recv::open (const ACE_TCHAR *fifo_name, - int flags, - int perms, - int persistent, - LPSECURITY_ATTRIBUTES sa) -{ - ACE_TRACE ("ACE_FIFO_Recv::open"); - - if (ACE_FIFO::open (fifo_name, ACE_NONBLOCK | flags, perms, sa) == -1) - return -1; - else if (this->disable (ACE_NONBLOCK) == -1) - return -1; - else if (persistent - && (this->aux_handle_ = ACE_OS::open (fifo_name, O_WRONLY, 0, sa)) == ACE_INVALID_HANDLE) - return -1; - else - return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0; -} - -ACE_FIFO_Recv::ACE_FIFO_Recv (void) - : aux_handle_ (ACE_INVALID_HANDLE) -{ - ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv"); -} - -ACE_FIFO_Recv::ACE_FIFO_Recv (const ACE_TCHAR *fifo_name, - int flags, - int perms, - int persistent, - LPSECURITY_ATTRIBUTES sa) - : aux_handle_ (ACE_INVALID_HANDLE) -{ - ACE_TRACE ("ACE_FIFO_Recv::ACE_FIFO_Recv"); - - if (this->ACE_FIFO_Recv::open (fifo_name, - flags, - perms, - persistent, - sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Recv"))); -} diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h deleted file mode 100644 index e0c9766cd46..00000000000 --- a/ace/FIFO_Recv.h +++ /dev/null @@ -1,80 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file FIFO_Recv.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//========================================================================== - - -#ifndef ACE_FIFO_RECV_H -#define ACE_FIFO_RECV_H - -#include "ace/pre.h" - -#include "ace/FIFO.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/ACE.h" - -/** - * @class ACE_FIFO_Recv - * - * @brief Receiver side of the bytestream C++ wrapper for UNIX - * FIFOs. - */ -class ACE_Export ACE_FIFO_Recv : public ACE_FIFO -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_FIFO_Recv (void); - - /// Open up a bytestream named pipe for reading. - ACE_FIFO_Recv (const ACE_TCHAR *rendezvous, - int flags = O_CREAT | O_RDONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - int persistent = 1, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Open up a bytestream named pipe for reading. - int open (const ACE_TCHAR *rendezvous, - int flags = O_CREAT | O_RDONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - int persistent = 1, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Close down the named pipe. - int close (void); - - /// Recv of up to bytes. - ssize_t recv (void *buf, size_t len); - - /// Recv of exactly bytes (block until done). - ssize_t recv_n (void *buf, size_t len); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Auxiliary handle that is used to implement persistent FIFOs. - ACE_HANDLE aux_handle_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Recv.i" -#endif - -#include "ace/post.h" - -#endif /* ACE_FIFO_RECV_H */ diff --git a/ace/FIFO_Recv.i b/ace/FIFO_Recv.i deleted file mode 100644 index 693b2a944fe..00000000000 --- a/ace/FIFO_Recv.i +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// FIFO_Recv.i - -ASYS_INLINE ssize_t -ACE_FIFO_Recv::recv (void *buf, size_t len) -{ - ACE_TRACE ("ACE_FIFO_Recv::recv"); - return ACE_OS::read (this->get_handle (), (char *) buf, len); -} - -ASYS_INLINE ssize_t -ACE_FIFO_Recv::recv_n (void *buf, size_t n) -{ - ACE_TRACE ("ACE_FIFO_Recv::recv_n"); - return ACE::recv_n (this->get_handle (), buf, n); -} diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp deleted file mode 100644 index 714cc43986f..00000000000 --- a/ace/FIFO_Recv_Msg.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// FIFO_Recv_Msg.cpp -// $Id$ - -#include "ace/FIFO_Recv_Msg.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Recv_Msg.i" -#endif - -ACE_RCSID(ace, FIFO_Recv_Msg, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv_Msg) - -void -ACE_FIFO_Recv_Msg::dump (void) const -{ - ACE_TRACE ("ACE_FIFO_Recv_Msg::dump"); - ACE_FIFO_Recv::dump (); -} - -// Note that persistent means "open FIFO for writing, as well as -// reading." This ensures that the FIFO never gets EOF, even if there -// aren't any writers at the moment! - -int -ACE_FIFO_Recv_Msg::open (const ACE_TCHAR *fifo_name, - int flags, - int perms, - int persistent, - LPSECURITY_ATTRIBUTES sa) -{ - ACE_TRACE ("ACE_FIFO_Recv_Msg::open"); - - return ACE_FIFO_Recv::open (fifo_name, - flags, - perms, - persistent, - sa); -} - -ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (void) -{ - ACE_TRACE ("ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg"); -} - -ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ACE_TCHAR *fifo_name, - int flags, - int perms, - int persistent, - LPSECURITY_ATTRIBUTES sa) -{ - ACE_TRACE ("ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg"); - - if (this->ACE_FIFO_Recv_Msg::open (fifo_name, - flags, - perms, - persistent, - sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Recv_Msg"))); -} diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h deleted file mode 100644 index 493ab63e436..00000000000 --- a/ace/FIFO_Recv_Msg.h +++ /dev/null @@ -1,131 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file FIFO_Recv_Msg.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_FIFO_RECV_MSG_H -#define ACE_FIFO_RECV_MSG_H -#include "ace/pre.h" - -#include "ace/FIFO_Recv.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_FIFO_Recv_Msg - * - * @brief Receiver side for the record oriented C++ wrapper for UNIX FIFOs. - * - * This method works slightly differently on platforms with the - * @c ACE_HAS_STREAM_PIPES configuration setting than those without. - * With ACE_HAS_STREAM_PIPES, the @c getmsg() system function is used - * and it preserves message boundaries internally. Without - * @c ACE_HAS_STREAM_PIPES, the message boundaries are emulated by - * this class and ACE_FIFO_Send_Msg cooperating. The sending class - * first writes an integer number of bytes in the message, then the - * message. ACE_FIFO_Recv_Msg reads the count, then the data. - * The operational differences occur primarily when a message is larger - * than what a caller of this class requests. See recv() for details. - */ -class ACE_Export ACE_FIFO_Recv_Msg : public ACE_FIFO_Recv -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_FIFO_Recv_Msg (void); - - /// Open up a record-oriented named pipe for reading. - ACE_FIFO_Recv_Msg (const ACE_TCHAR *rendezvous, - int flags = O_CREAT | O_RDONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - int persistent = 1, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Open up a record-oriented named pipe for reading. - int open (const ACE_TCHAR *rendezvous, - int flags = O_CREAT | O_RDONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - int persistent = 1, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Receive a message based on attributes in an ACE_Str_Buf. - /** - * @param msg Reference to an ACE_Str_Buf whose @c buf member points - * to the memory to receive the data and @c maxlen member - * contains the maximum number of bytes to receive. - * On return after successfully reading data, the - * @c len member contains the number of bytes received and - * placed in the buffer pointed to by @c msg.buf. - * - * @retval -1 Error; consult @c errno for specific error number. - * @return If the @c ACE_HAS_STREAM_PIPES configuration setting is - * defined, the return value is the number of bytes received - * in the message and will be the same as @c buf.len. - * The return value from the @c getmsg() system function - * is discarded. - * If @c ACE_HAS_STREAM_PIPES is not defined, the number - * of bytes in the message read from the FIFO is returned. - * If the message is larger than the maximum length - * requested in @c msg.maxlen, the return value reflects - * the entire message length, and the @c msg.len member - * reflects how many bytes were actually placed in the - * caller's buffer. Any part of the message longer than - * @c msg.maxlen is discarded. - */ - ssize_t recv (ACE_Str_Buf &msg); - - /// Receive a message based on buffer pointer and maximum size. - /** - * @param buf Pointer to the memory to receive the data. - * @param len The maximum number of bytes to receive. - * - * @retval -1 Error; consult @c errno for specific error number. - * @return The number of bytes received in the message. For messages - * that are larger than the requested maximum size, the - * behavior is different depending on the @c ACE_HAS_STREAM_PIPES - * configuration setting. With @c ACE_HAS_STREAM_PIPES, - * the return value will be the same as @arg len (this is - * also possible if the message is exactly the same length - * as @arg len, and the two cases are indistinguishable). - * Without @c ACE_HAS_STREAM_PIPES, the return value is - * the total length of the message, including bytes in - * excess of @arg len. The excess bytes are discarded. - */ - ssize_t recv (void *buf, size_t len); - -#if defined (ACE_HAS_STREAM_PIPES) - /// Recv and message via Stream pipes. - ssize_t recv (ACE_Str_Buf *data, - ACE_Str_Buf *cntl, - int *flags); - - /// Recv and message via Stream pipes in "band" mode. - ssize_t recv (int *band, - ACE_Str_Buf *data, - ACE_Str_Buf *cntl, - int *flags); -#endif /* ACE_HAS_STREAM_PIPES */ - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Recv_Msg.i" -#endif - -#include "ace/post.h" -#endif /* ACE_FIFO_RECV_MSG_H */ diff --git a/ace/FIFO_Recv_Msg.i b/ace/FIFO_Recv_Msg.i deleted file mode 100644 index 8ba99042003..00000000000 --- a/ace/FIFO_Recv_Msg.i +++ /dev/null @@ -1,101 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// FIFO_Recv_Msg.i - -ASYS_INLINE ssize_t -ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) -{ - ACE_TRACE ("ACE_FIFO_Recv_Msg::recv"); -#if defined (ACE_HAS_STREAM_PIPES) - int i = 0; - if (ACE_OS::getmsg (this->get_handle (), - (strbuf *) 0, - (strbuf *) &recv_msg, - &i) == -1) - return -1; - else - return recv_msg.len; -#else /* Do the ol' 2-read trick... */ - if (ACE_OS::read (this->get_handle (), - (char *) &recv_msg.len, - sizeof recv_msg.len) != sizeof recv_msg.len) - return -1; - else - { - size_t remaining = ACE_static_cast (size_t, recv_msg.len); - size_t requested = ACE_static_cast (size_t, recv_msg.maxlen); - ssize_t recv_len = ACE_OS::read (this->get_handle (), - (char *) recv_msg.buf, - ACE_MIN (remaining, requested)); - if (recv_len == -1) - return -1; - // Tell caller what's really in the buffer. - recv_msg.len = ACE_static_cast (int, recv_len); - - // If there are more bytes remaining in the message, read them and - // throw them away. Leaving them in the FIFO would make it difficult - // to find the start of the next message in the fifo. - // Since the ACE_HAS_STREAM_PIPES version of this method doesn't - // return getmsg()'s indication of "data remaining", don't worry about - // saving the indication here either to read the remainder later. - size_t total_msg_size = remaining; - remaining -= recv_len; - while (remaining > 0) - { - const size_t throw_away = 1024; - char dev_null[throw_away]; - recv_len = ACE_OS::read (this->get_handle (), - dev_null, - ACE_MIN (remaining, throw_away)); - if (recv_len == -1) - break; - remaining -= recv_len; - } - return total_msg_size; - } -#endif /* ACE_HAS_STREAM_PIPES */ -} - -ASYS_INLINE ssize_t -ACE_FIFO_Recv_Msg::recv (void *buf, size_t max_len) -{ - ACE_TRACE ("ACE_FIFO_Recv_Msg::recv"); - ACE_Str_Buf recv_msg ((char *) buf, 0, ACE_static_cast (int, max_len)); - - return this->recv (recv_msg); -} - -#if defined (ACE_HAS_STREAM_PIPES) -ASYS_INLINE ssize_t -ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf *data, - ACE_Str_Buf *cntl, - int *flags) -{ - ACE_TRACE ("ACE_FIFO_Recv_Msg::recv"); - if (ACE_OS::getmsg (this->get_handle (), - (strbuf *) cntl, - (strbuf *) data, - flags) == -1) - return -1; - else - return (cntl == 0 ? 0 : cntl->len) + (data == 0 ? 0 : data->len); -} - -ASYS_INLINE ssize_t -ACE_FIFO_Recv_Msg::recv (int *band, - ACE_Str_Buf *data, - ACE_Str_Buf *cntl, - int *flags) -{ - ACE_TRACE ("ACE_FIFO_Recv_Msg::recv"); - if (ACE_OS::getpmsg (this->get_handle (), - (strbuf *) cntl, - (strbuf *) data, - band, - flags) == -1) - return -1; - else - return (cntl == 0 ? 0 : cntl->len) + (data == 0 ? 0 : data->len); -} -#endif /* ACE_HAS_STREAM_PIPES */ diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp deleted file mode 100644 index a51a16f5f96..00000000000 --- a/ace/FIFO_Send.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// FIFO_Send.cpp -// $Id$ - -#include "ace/FIFO_Send.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Send.i" -#endif - -ACE_RCSID(ace, FIFO_Send, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send) - -void -ACE_FIFO_Send::dump (void) const -{ - ACE_TRACE ("ACE_FIFO_Send::dump"); - ACE_FIFO::dump (); -} - -ACE_FIFO_Send::ACE_FIFO_Send (void) -{ -// ACE_TRACE ("ACE_FIFO_Send::ACE_FIFO_Send"); -} - -int -ACE_FIFO_Send::open (const ACE_TCHAR *rendezvous_name, - int flags, - int perms, - LPSECURITY_ATTRIBUTES sa) -{ - ACE_TRACE ("ACE_FIFO_Send::open"); - return ACE_FIFO::open (rendezvous_name, - flags | O_WRONLY, - perms, - sa); -} - -ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name, - int flags, - int perms, - LPSECURITY_ATTRIBUTES sa) -{ - ACE_TRACE ("ACE_FIFO_Send::ACE_FIFO_Send"); - if (this->ACE_FIFO_Send::open (fifo_name, - flags, - perms, - sa) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); -} diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h deleted file mode 100644 index 3f553deb88b..00000000000 --- a/ace/FIFO_Send.h +++ /dev/null @@ -1,70 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file FIFO_Send.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//========================================================================== - - -#ifndef ACE_FIFO_SEND_H -#define ACE_FIFO_SEND_H - -#include "ace/pre.h" - -#include "ace/FIFO.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/ACE.h" - -/** - * @class ACE_FIFO_Send - * - * @brief Sender side for the bytestream C++ wrapper for UNIX FIFOs - */ -class ACE_Export ACE_FIFO_Send : public ACE_FIFO -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_FIFO_Send (void); - - /// Open up a bytestream named pipe for writing. - ACE_FIFO_Send (const ACE_TCHAR *rendezvous, - int flags = O_WRONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Open up a bytestream named pipe for writing. - int open (const ACE_TCHAR *rendezvous, - int flags = O_WRONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Send of up to bytes. - ssize_t send (const void *buf, size_t len); - - /// Send of exactly bytes (block until done). - ssize_t send_n (const void *buf, size_t len); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Send.i" -#endif - -#include "ace/post.h" - -#endif /* ACE_FIFO_SEND_H */ diff --git a/ace/FIFO_Send.i b/ace/FIFO_Send.i deleted file mode 100644 index c7e20eae8d2..00000000000 --- a/ace/FIFO_Send.i +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// FIFO_Send.i - -ASYS_INLINE ssize_t -ACE_FIFO_Send::send (const void *buf, size_t len) -{ - ACE_TRACE ("ACE_FIFO_Send::send"); - return ACE_OS::write (this->get_handle (), (const char *) buf, len); -} - -ASYS_INLINE ssize_t -ACE_FIFO_Send::send_n (const void *buf, size_t n) -{ - ACE_TRACE ("ACE_FIFO_Send::send_n"); - return ACE::send_n (this->get_handle (), buf, n); -} diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp deleted file mode 100644 index 8d380c07d5e..00000000000 --- a/ace/FIFO_Send_Msg.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// $Id$ - -#include "ace/FIFO_Send_Msg.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Send_Msg.i" -#endif - -ACE_RCSID(ace, FIFO_Send_Msg, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send_Msg) - -void -ACE_FIFO_Send_Msg::dump (void) const -{ - ACE_TRACE ("ACE_FIFO_Send_Msg::dump"); - ACE_FIFO_Send::dump (); -} - -ssize_t -ACE_FIFO_Send_Msg::send (const ACE_Str_Buf &send_msg) -{ - // ACE_TRACE ("ACE_FIFO_Send_Msg::send"); -#if defined (ACE_HAS_STREAM_PIPES) - if (ACE_OS::putmsg (this->get_handle (), - (strbuf *) 0, - (strbuf *) &send_msg, - 0) == -1) - return -1; - else - return send_msg.len; -#else - iovec iov[2]; - - iov[0].iov_base = (char *) &send_msg.len; - iov[0].iov_len = sizeof send_msg.len; - - iov[1].iov_base = (char *) send_msg.buf; - iov[1].iov_len = ACE_static_cast (size_t, send_msg.len); - - ssize_t sent = ACE_OS::writev (this->get_handle (), iov, 2); - if (sent > 0) - sent -= iov[0].iov_len; // Don't count the length we added. - return sent; -#endif /* ACE_HAS_STREAM_PIPES */ -} - -ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (void) -{ -// ACE_TRACE ("ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg"); -} - -int -ACE_FIFO_Send_Msg::open (const ACE_TCHAR *fifo_name, - int flags, - int perms, - LPSECURITY_ATTRIBUTES sa) -{ - ACE_TRACE ("ACE_FIFO_Send_Msg::open"); - return ACE_FIFO_Send::open (fifo_name, flags | O_WRONLY, perms, sa); -} - -ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ACE_TCHAR *fifo_name, - int flags, - int perms, - LPSECURITY_ATTRIBUTES sa) -{ - ACE_TRACE ("ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg"); - if (this->ACE_FIFO_Send_Msg::open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Send_Msg"))); -} diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h deleted file mode 100644 index cc4ae785e41..00000000000 --- a/ace/FIFO_Send_Msg.h +++ /dev/null @@ -1,80 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file FIFO_Send_Msg.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_FIFO_SEND_MSG_H -#define ACE_FIFO_SEND_MSG_H -#include "ace/pre.h" - -#include "ace/FIFO_Send.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_FIFO_Send_Msg - * - * @brief Sender side for the Record oriented C++ wrapper for UNIX - * FIFOs. - */ -class ACE_Export ACE_FIFO_Send_Msg : public ACE_FIFO_Send -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_FIFO_Send_Msg (void); - - /// Open up a record-oriented named pipe for writing. - ACE_FIFO_Send_Msg (const ACE_TCHAR *rendezvous, - int flags = O_WRONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Open up a record-oriented named pipe for writing. - int open (const ACE_TCHAR *rendezvous, - int flags = O_WRONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Send of up to bytes. - ssize_t send (const ACE_Str_Buf &msg); - - /// Send of exactly bytes (block until done). - ssize_t send (const void *buf, size_t len); - -#if defined (ACE_HAS_STREAM_PIPES) - /// Send and message via Stream pipes. - ssize_t send (const ACE_Str_Buf *data, - const ACE_Str_Buf *cntl = 0, - int flags = 0); - - /// Send and message via Stream pipes in "band" mode. - ssize_t send (int band, - const ACE_Str_Buf *data, - const ACE_Str_Buf *cntl = 0, - int flags = MSG_BAND); -#endif /* ACE_HAS_STREAM_PIPES */ - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Send_Msg.i" -#endif - -#include "ace/post.h" -#endif /* ACE_FIFO_SEND_MSG_H */ diff --git a/ace/FIFO_Send_Msg.i b/ace/FIFO_Send_Msg.i deleted file mode 100644 index 6e420151c39..00000000000 --- a/ace/FIFO_Send_Msg.i +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// FIFO_Send_Msg.i - -ASYS_INLINE ssize_t -ACE_FIFO_Send_Msg::send (const void *buf, size_t len) -{ - ACE_TRACE ("ACE_FIFO_Send_Msg::send"); - ACE_Str_Buf send_msg ((char *) buf, ACE_static_cast (int, len)); - - return this->send (send_msg); -} - -#if defined (ACE_HAS_STREAM_PIPES) -ASYS_INLINE ssize_t -ACE_FIFO_Send_Msg::send (const ACE_Str_Buf *data, - const ACE_Str_Buf *cntl, - int flags) -{ - ACE_TRACE ("ACE_FIFO_Send_Msg::send"); - if (ACE_OS::putmsg (this->get_handle (), - (strbuf *) cntl, - (strbuf *) data, - flags) == -1) - return-1; - else - return (cntl == 0 ? 0 : cntl->len) + (data == 0 ? 0 : data->len); -} - -ASYS_INLINE ssize_t -ACE_FIFO_Send_Msg::send (int band, - const ACE_Str_Buf *data, - const ACE_Str_Buf *cntl, - int flags) -{ - ACE_TRACE ("ACE_FIFO_Send_Msg::send"); - - if (ACE_OS::putpmsg (this->get_handle (), - (strbuf *) cntl, - (strbuf *) data, - band, - flags) == -1) - return -1; - else - return (cntl == 0 ? 0 : cntl->len) + (data == 0 ? 0 : data->len); -} -#endif /* ACE_HAS_STREAM_PIPES */ diff --git a/ace/FILE.cpp b/ace/FILE.cpp deleted file mode 100644 index ea5c7b950ec..00000000000 --- a/ace/FILE.cpp +++ /dev/null @@ -1,156 +0,0 @@ -// FILE.cpp -// $Id$ - -/* Defines the member functions for the base class of the ACE_IO_SAP - ACE_FILE abstraction. */ - -#include "ace/FILE.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE.i" -#endif - -ACE_RCSID(ace, FILE, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_FILE) - -void -ACE_FILE::dump (void) const -{ - ACE_TRACE ("ACE_FILE::dump"); - ACE_IO_SAP::dump (); -} - -// This is the do-nothing constructor. - -ACE_FILE::ACE_FILE (void) -{ - ACE_TRACE ("ACE_FILE::ACE_FILE"); -} - -// Close the file - -int -ACE_FILE::close (void) -{ - ACE_TRACE ("ACE_FILE::close"); - int result = 0; - - if (this->get_handle () != ACE_INVALID_HANDLE) - { - result = ACE_OS::close (this->get_handle ()); - this->set_handle (ACE_INVALID_HANDLE); - } - return result; -} - -int -ACE_FILE::get_info (ACE_FILE_Info *finfo) -{ - ACE_TRACE ("ACE_FILE::get_info"); - ACE_stat filestatus; - - int result = ACE_OS::fstat (this->get_handle (), - &filestatus); - - if (result == 0) - { - finfo->mode_ = filestatus.st_mode; - finfo->nlink_ = filestatus.st_nlink; - finfo->size_ = filestatus.st_size; - } - - return result; -} - -int -ACE_FILE::get_info (ACE_FILE_Info &finfo) -{ - ACE_TRACE ("ACE_FILE::get_info"); - - return this->get_info (&finfo); -} - -int -ACE_FILE::truncate (off_t length) -{ - ACE_TRACE ("ACE_FILE::truncate"); - return ACE_OS::ftruncate (this->get_handle(), length); -} - -off_t -ACE_FILE::seek (off_t offset, int startpos) -{ - return ACE_OS::lseek (this->get_handle (), - offset, - startpos); -} - -off_t -ACE_FILE::position (long offset, int startpos) -{ - ACE_TRACE ("ACE_FILE::position"); - return this->seek (offset, startpos); -} - -off_t -ACE_FILE::tell (void) -{ - ACE_TRACE ("ACE_FILE::tell"); - return ACE_OS::lseek (this->get_handle (), 0, SEEK_CUR); -} - -off_t -ACE_FILE::position (void) -{ - ACE_TRACE ("ACE_FILE::position"); - return this->tell (); -} - -// Return the local endpoint address. - -int -ACE_FILE::get_local_addr (ACE_Addr &addr) const -{ - ACE_TRACE ("ACE_FILE::get_local_addr"); - - // Perform the downcast since had better be an - // . - ACE_FILE_Addr *file_addr = - ACE_dynamic_cast (ACE_FILE_Addr *, &addr); - - if (file_addr == 0) - return -1; - else - { - *file_addr = this->addr_; - return 0; - } -} - -// Return the same result as . - -int -ACE_FILE::get_remote_addr (ACE_Addr &addr) const -{ - ACE_TRACE ("ACE_FILE::get_remote_addr"); - - return this->get_local_addr (addr); -} - -int -ACE_FILE::remove (void) -{ - ACE_TRACE ("ACE_FILE::remove"); - - this->close (); - return ACE_OS::unlink (this->addr_.get_path_name ()); -} - -int -ACE_FILE::unlink (void) -{ - ACE_TRACE ("ACE_FILE::unlink"); - - return ACE_OS::unlink (this->addr_.get_path_name ()); -} diff --git a/ace/FILE.h b/ace/FILE.h deleted file mode 100644 index 6a0a9dcae9c..00000000000 --- a/ace/FILE.h +++ /dev/null @@ -1,143 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file FILE.h - * - * $Id$ - * - * @author Gerhard Lenzer - */ -//============================================================================= - -#ifndef ACE_FILE_H -#define ACE_FILE_H -#include "ace/pre.h" - -#include "ace/IO_SAP.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/FILE_Addr.h" - -// The following is necessary since many C++ compilers don't support -// typedef'd types inside of classes used as formal template -// arguments... ;-(. Luckily, using the C++ preprocessor I can hide -// most of this nastiness! - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -#define ACE_FILE_CONNECTOR ACE_FILE_Connector -#define ACE_FILE_STREAM ACE_FILE_IO -#else /* TEMPLATES are broken (must be a cfront-based compiler...) */ -#define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr -#define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr -#endif /* ACE_TEMPLATE_TYPEDEFS */ - -/** - * @class ACE_FILE_Info - * - * @brief Abstracts basic OS FILE information. - */ -class ACE_Export ACE_FILE_Info -{ -public: - /// Mode of file - mode_t mode_; - - /// No of links - nlink_t nlink_; - - /// Size of file - off_t size_; -}; - -/** - * @class ACE_FILE - * - * @brief Defines the core methods of the ACE_FILE abstraction. - */ -class ACE_Export ACE_FILE : public ACE_IO_SAP -{ -public: - /// Close the ACE_FILE handle without removing the ACE_FILE from - /// the file system. - int close (void); - - /// Close and remove the ACE_FILE from the file system. - int remove (void); - - /// Remove the ACE_FILE from the file system without closing the - /// ACE_FILE handle. - int unlink (void); - - /// Get information on this ACE_FILE. - int get_info (ACE_FILE_Info *finfo); - - /// Get information on this . - int get_info (ACE_FILE_Info &finfo); - - /// Set filesize to length byte. - int truncate (off_t length); - - /** - * Sets the file pointer as follows: - * o If is , the pointer is set to - * bytes. - * - * o If is , the pointer is set to its - * current location plus . - * - * o If is , the pointer is set to the size - * of the file plus offset. - * Same as , but is deprecated. - */ - off_t seek (off_t offset, - int whence = SEEK_CUR); - off_t position (long offset, int startpos); - - /// Return an offset for the file handle. - off_t tell (void); - - /** - * @deprecated - * Same as tell(), but position() is deprecated. - */ - off_t position (void); - - /** - * Disable signal @a signum - * This is here to prevent Win32 from - * disabling SPIPE using socket calls - */ - int disable (int signum) const ; - - /// Return the local endpoint address in the referenced ACE_Addr. - /// Returns 0 if successful, else -1. - int get_local_addr (ACE_Addr &) const; - - /// Return the same thing as get_local_addr(). - int get_remote_addr (ACE_Addr &) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Ensure that this class is only created by the - /// ACE_FILE_Connector. - ACE_FILE (void); - - /// File we are "connected" with... - ACE_FILE_Addr addr_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" -#endif /* ACE_FILE_H */ diff --git a/ace/FILE.i b/ace/FILE.i deleted file mode 100644 index cf1f4986479..00000000000 --- a/ace/FILE.i +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// FILE.i - -ASYS_INLINE int -ACE_FILE::disable (int signum) const -{ -#if defined (ACE_WIN32) - ACE_UNUSED_ARG (signum) ; - return 0 ; -#else /* ACE_WIN32 */ - return ACE_IO_SAP::disable (signum) ; -#endif /* ACE_WIN32 */ -} - diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp deleted file mode 100644 index 8a8357bf65e..00000000000 --- a/ace/FILE_Addr.cpp +++ /dev/null @@ -1,113 +0,0 @@ -// $Id$ - -#include "ace/FILE_Addr.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/FILE_Addr.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, FILE_Addr, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Addr) - -ACE_FILE_Addr::ACE_FILE_Addr (void) - : ACE_Addr (AF_FILE, sizeof this->filename_ / sizeof (ACE_TCHAR)) -{ - this->filename_[0] = '\0'; -} - -int -ACE_FILE_Addr::set (const ACE_FILE_Addr &sa) -{ - if (sa.get_type () == AF_ANY) - { -#if defined (ACE_DEFAULT_TEMP_FILE) - // Create a temporary file. - ACE_OS::strcpy (this->filename_, - ACE_DEFAULT_TEMP_FILE); -#else /* ACE_DEFAULT_TEMP_FILE */ - if (ACE_Lib_Find::get_temp_dir (this->filename_, - MAXPATHLEN - 15) == -1) - // -15 for ace-file-XXXXXX - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Temporary path too long, ") - ACE_LIB_TEXT ("defaulting to current directory\n"))); - this->filename_[0] = 0; - } - - // Add the filename to the end - ACE_OS::strcat (this->filename_, ACE_LIB_TEXT ("ace-fileXXXXXX")); - -#endif /* ACE_DEFAULT_TEMP_FILE */ - - if (ACE_OS::mktemp (this->filename_) == 0) - return -1; - this->base_set (AF_FILE, - ACE_static_cast (int, - ACE_OS::strlen (this->filename_) + 1)); - } - else - { - (void) ACE_OS::strsncpy (this->filename_, - sa.filename_, - sa.get_size ()); - - this->base_set (sa.get_type (), - sa.get_size ()); - } - return 0; -} - -// Copy constructor. - -ACE_FILE_Addr::ACE_FILE_Addr (const ACE_FILE_Addr &sa) - : ACE_Addr (AF_FILE, sizeof this->filename_) -{ - this->set (sa); -} - -int -ACE_FILE_Addr::set (const ACE_TCHAR *filename) -{ - this->ACE_Addr::base_set (AF_FILE, - ACE_static_cast (int, - ACE_OS::strlen (filename) + 1)); - (void) ACE_OS::strsncpy (this->filename_, - filename, - sizeof this->filename_ / sizeof (ACE_TCHAR)); - return 0; -} - -ACE_FILE_Addr & -ACE_FILE_Addr::operator= (const ACE_FILE_Addr &sa) -{ - if (this != &sa) - this->set (sa); - return *this; -} - -// Create a ACE_Addr from a ACE_FILE pathname. - -ACE_FILE_Addr::ACE_FILE_Addr (const ACE_TCHAR *filename) -{ - this->set (filename); -} - -int -ACE_FILE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const -{ - ACE_OS::strsncpy (s, this->filename_, len); - return 0; -} - -void -ACE_FILE_Addr::dump (void) const -{ - ACE_TRACE ("ACE_FILE_Addr::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("filename_ = %s"), this->filename_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h deleted file mode 100644 index b0307e6f856..00000000000 --- a/ace/FILE_Addr.h +++ /dev/null @@ -1,85 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file FILE_Addr.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - - -#ifndef ACE_FILE_ADDR_H -#define ACE_FILE_ADDR_H -#include "ace/pre.h" - -#include "ace/Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Flag_Manip.h" - -/** - * @class ACE_FILE_Addr - * - * @brief Defines the FILE address family address format. - */ -class ACE_Export ACE_FILE_Addr : public ACE_Addr -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_FILE_Addr (void); - - /// Copy constructor. - ACE_FILE_Addr (const ACE_FILE_Addr &sa); - - /// Acts like a copy constructor. If == ACE_Addr::sap_any then - /// create a temporary filename using . - int set (const ACE_FILE_Addr &sa); - - /// Create a ACE_FILE_Addr from a pathname. - ACE_EXPLICIT ACE_FILE_Addr (const ACE_TCHAR *filename); - - /// Create a ACE_FILE_Addr from a pathname. - int set (const ACE_TCHAR *filename); - - /// Assignment operator. - ACE_FILE_Addr &operator= (const ACE_FILE_Addr &); - - /// Return a pointer to the address. - virtual void *get_addr (void) const; - - /// Transform the current address into string format. - virtual int addr_to_string (ACE_TCHAR *addr, size_t) const; - - /// Compare two addresses for equality. - int operator == (const ACE_FILE_Addr &SAP) const; - - /// Compare two addresses for inequality. - int operator != (const ACE_FILE_Addr &SAP) const; - - /// Return the path name used for the rendezvous point. - const ACE_TCHAR *get_path_name (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Name of the file. - ACE_TCHAR filename_[MAXNAMLEN + 1]; -}; - -#if defined (__ACE_INLINE__) -#include "ace/FILE_Addr.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_FILE_ADDR_H */ diff --git a/ace/FILE_Addr.i b/ace/FILE_Addr.i deleted file mode 100644 index 6acce0515b8..00000000000 --- a/ace/FILE_Addr.i +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// FILE_Addr.i - -// Do nothing constructor. - -// Transform the current address into string format. - -#include "ace/SString.h" - -// Return the address. - -ACE_INLINE void * -ACE_FILE_Addr::get_addr (void) const -{ - return (void *) &this->filename_; -} - -// Compare two addresses for equality. - -ACE_INLINE int -ACE_FILE_Addr::operator == (const ACE_FILE_Addr &sap) const -{ - return ACE_OS::strcmp (this->filename_, sap.filename_) == 0; -} - -// Compare two addresses for inequality. - -ACE_INLINE int -ACE_FILE_Addr::operator != (const ACE_FILE_Addr &sap) const -{ - return !((*this) == sap); // This is lazy, of course... ;-) -} - -// Return the path name used for the rendezvous point. - -ACE_INLINE const ACE_TCHAR * -ACE_FILE_Addr::get_path_name (void) const -{ - return this->filename_; -} - diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp deleted file mode 100644 index d858fc68c5f..00000000000 --- a/ace/FILE_Connector.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// FILE_Connector.cpp -// $Id$ - -#include "ace/FILE_Connector.h" -#include "ace/Handle_Ops.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE_Connector.i" -#endif - -ACE_RCSID(ace, FILE_Connector, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Connector) - -void -ACE_FILE_Connector::dump (void) const -{ - ACE_TRACE ("ACE_FILE_Connector::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_FILE_Connector::ACE_FILE_Connector (void) -{ - ACE_TRACE ("ACE_FILE_Connector::ACE_FILE_Connector"); -} - -int -ACE_FILE_Connector::connect (ACE_FILE_IO &new_io, - const ACE_FILE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &, - int, - int flags, - int perms) -{ - ACE_TRACE ("ACE_FILE_Connector::connect"); - ACE_ASSERT (new_io.get_handle () == ACE_INVALID_HANDLE); - - ACE_HANDLE handle = ACE_INVALID_HANDLE; - - // Check to see if caller has requested that we create the filename. - if (ACE_reinterpret_cast (const ACE_Addr &, - ACE_const_cast (ACE_FILE_Addr &, - remote_sap)) == ACE_Addr::sap_any) - { - // Create a new temporary file. -#ifdef ACE_LACKS_MKSTEMP - new_io.addr_ = - ACE_FILE_Addr (ACE_sap_any_cast (ACE_FILE_Addr &)); // class copy. -#else - // Use ACE_OS::mkstemp() if it is available since it avoids a - // race condition, and subsequently a security hole due to that - // race condition (specifically, a denial-of-service attack). - // - // However, using mkstemp() prevents us from doing a timed open - // since it opens the file for us. Better to avoid the race - // condition. - char filename[] = "ace-file-XXXXXX"; - - handle = ACE_OS::mkstemp (filename); // mkstemp() replaces "XXXXXX" - - if (handle == ACE_INVALID_HANDLE - || new_io.addr_.set (filename) != 0) - return -1; - - new_io.set_handle (handle); - - return 0; -#endif /* ACE_LACKS_MKSTEMP */ - } - else - new_io.addr_ = remote_sap; // class copy. - - handle = ACE_Handle_Ops::handle_timed_open (timeout, - new_io.addr_.get_path_name (), - flags, - perms); - - new_io.set_handle (handle); - return handle == ACE_INVALID_HANDLE ? -1 : 0; -} diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h deleted file mode 100644 index 859872b45d1..00000000000 --- a/ace/FILE_Connector.h +++ /dev/null @@ -1,110 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file FILE_Connector.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - -#ifndef ACE_FILE_CONNECTOR_H -#define ACE_FILE_CONNECTOR_H -#include "ace/pre.h" - -#include "ace/FILE_IO.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_FILE_Connector - * - * @brief Defines an active connection factory for the ACE_FILE wrappers. - * - * Note that the O_APPEND flag is only partly supported on Win32. If - * you specify O_APPEND, then the file pointer will be positioned at - * the end of the file initially during open, but it is not - * re-positioned at the end prior to each write, as specified by - * POSIX. This is generally good enough for typical situations, but - * it is ``not quite right'' in its semantics. - */ -class ACE_Export ACE_FILE_Connector -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_FILE_Connector (void); - - /** - * Actively ``connect'' and produce a object - * if things go well. The is the file that we are - * trying to create/open. If it's the default value of - * then the user is letting the OS create the - * filename (via ). The is the amount of - * time to wait to create/open the file. If it's 0 then we block - * indefinitely. If *timeout == {0, 0} then the file is created - * using non-blocking mode. In this case, if the create/open can't - * be done immediately the value of -1 is returned with . If *timeout > {0, 0} then this is the maximum amount of - * time to wait before timing out. If the time expires before the - * connection is made . The and - * parameters are ignored. The and - * arguments are passed down to the method. - */ - ACE_FILE_Connector (ACE_FILE_IO &new_io, - const ACE_FILE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR | O_CREAT, - int perms = ACE_DEFAULT_FILE_PERMS); - - /** - * Actively ``connect'' and produce a object - * if things go well. The is the file that we are - * trying to create/open. If it's the default value of - * then the user is letting the OS create the - * filename (via ). The is the amount of - * time to wait to create/open the file. If it's 0 then we block - * indefinitely. If *timeout == {0, 0} then the file is created - * using non-blocking mode. In this case, if the create/open can't - * be done immediately the value of -1 is returned with . If *timeout > {0, 0} then this is the maximum amount of - * time to wait before timing out. If the time expires before the - * connection is made . The and - * parameters are ignored. The and - * arguments are passed down to the method. - */ - int connect (ACE_FILE_IO &new_io, - const ACE_FILE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR | O_CREAT, - int perms = ACE_DEFAULT_FILE_PERMS); - - /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - // = Meta-type "trait" information. - typedef ACE_FILE_Addr PEER_ADDR; - typedef ACE_FILE_IO PEER_STREAM; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE_Connector.i" -#endif - -#include "ace/post.h" -#endif /* ACE_FILE_CONNECTOR_H */ diff --git a/ace/FILE_Connector.i b/ace/FILE_Connector.i deleted file mode 100644 index ccb5985899f..00000000000 --- a/ace/FILE_Connector.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// FILE_Connector.i - -// Creates a Local ACE_FILE. - -ASYS_INLINE -ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, - const ACE_FILE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_FILE_Connector::ACE_FILE_Connector"); - if (this->connect (new_io, remote_sap, timeout, local_sap, - reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE - && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("address %s, %p\n"), - remote_sap.get_path_name (), - ACE_LIB_TEXT ("ACE_FILE_IO"))); -} - -ASYS_INLINE int -ACE_FILE_Connector::reset_new_handle (ACE_HANDLE handle) -{ - ACE_UNUSED_ARG (handle); - // Nothing to do here since the handle is not a socket - return 0; -} diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp deleted file mode 100644 index 3ae1137bd71..00000000000 --- a/ace/FILE_IO.cpp +++ /dev/null @@ -1,133 +0,0 @@ -// FILE_IO.cpp -// $Id$ - -#include "ace/FILE_IO.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE_IO.i" -#endif - -ACE_RCSID(ace, FILE_IO, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_FILE_IO) - -void -ACE_FILE_IO::dump (void) const -{ - ACE_TRACE ("ACE_FILE_IO::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->addr_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// Simple-minded do nothing constructor. - -ACE_FILE_IO::ACE_FILE_IO (void) -{ - ACE_TRACE ("ACE_FILE_IO::ACE_FILE_IO"); -} - -// Send N char *ptrs and int lengths. Note that the char *'s precede -// the ints (basically, an varargs version of writev). The count N is -// the *total* number of trailing arguments, *not* a couple of the -// number of tuple pairs! - -ssize_t -ACE_FILE_IO::send (size_t n, ...) const -{ - ACE_TRACE ("ACE_FILE_IO::send"); - va_list argp; - int total_tuples = (ACE_static_cast (int, n)) / 2; - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::writev (this->get_handle (), - iovp, - total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} - -// This is basically an interface to ACE_OS::readv, that doesn't use -// the struct iovec explicitly. The ... can be passed as an arbitrary -// number of (char *ptr, int len) tuples. However, the count N is the -// *total* number of trailing arguments, *not* a couple of the number -// of tuple pairs! - -ssize_t -ACE_FILE_IO::recv (size_t n, ...) const -{ - ACE_TRACE ("ACE_FILE_IO::recv"); - va_list argp; - int total_tuples = ACE_static_cast (int, (n / 2)); - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::readv (this->get_handle (), - iovp, - total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} - -// Allows a client to read from a file without having to provide a -// buffer to read. This method determines how much data is in the -// file, allocates a buffer of this size, reads in the data, and -// returns the number of bytes read. - -ssize_t -ACE_FILE_IO::recvv (iovec *io_vec) -{ - ACE_TRACE ("ACE_FILE_IO::recvv"); - - io_vec->iov_base = 0; - long length = ACE_OS::filesize (this->get_handle ()); - - if (length > 0) - { - ACE_NEW_RETURN (io_vec->iov_base, - char[length], - -1); - io_vec->iov_len = this->recv_n (io_vec->iov_base, - length); - return io_vec->iov_len; - } - else - return length; -} diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h deleted file mode 100644 index d7bfcf63290..00000000000 --- a/ace/FILE_IO.h +++ /dev/null @@ -1,160 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file FILE_IO.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_FILE_IO_H -#define ACE_FILE_IO_H -#include "ace/pre.h" - -#include "ace/FILE.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/FILE_Addr.h" - -// Used in the FILE_IO.h file... -#include "ace/ACE.h" - -// Forward decl. -class ACE_Message_Block; - -/** - * @class ACE_FILE_IO - * - * @brief Read/Write operations on Files - */ -class ACE_Export ACE_FILE_IO : public ACE_FILE -{ -public: - friend class ACE_FILE_Connector; - - // = Initialization method. - /// Default constructor. - ACE_FILE_IO (void); - - /// send upto bytes in . - ssize_t send (const void *buf, size_t n) const; - - /// Recv upto bytes in . - ssize_t recv (void *buf, size_t n) const; - - /// Send n bytes, keep trying until n are sent. - ssize_t send_n (const void *buf, size_t n) const; - - /// Send all the s chained through their and - /// pointers. This call uses the underlying OS gather-write - /// operation to reduce the domain-crossing penalty. - ssize_t send_n (const ACE_Message_Block *message_block, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); - - /// Recv n bytes, keep trying until n are received. - ssize_t recv_n (void *buf, size_t n) const; - -#if defined (ACE_HAS_STREAM_PIPES) - /// Send bytes via STREAM pipes. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int flags = 0) const; - - /// Recv bytes via STREAM pipes. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *flags) const; - - /// Send bytes via STREAM pipes using "band" mode. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int band, - int flags) const; - - /// Recv bytes via STREAM pipes using "band" mode. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *band, - int *flags) const; - -#endif /* ACE_HAS_STREAM_PIPES */ - - /// Send iovecs via <::writev>. - ssize_t send (const iovec iov[], int n) const; - - /// Recv iovecs via <::readv>. - ssize_t recv (iovec iov[], int n) const; - - /** - * Send N char *ptrs and int lengths. Note that the char *'s - * precede the ints (basically, an varargs version of writev). The - * count N is the *total* number of trailing arguments, *not* a - * couple of the number of tuple pairs! - */ - ssize_t send (size_t n, ...) const; - - /** - * This is an interface to ::readv, that doesn't use the struct - * iovec explicitly. The ... can be passed as an arbitrary number - * of (char *ptr, int len) tuples. However, the count N is the - * *total* number of trailing arguments, *not* a couple of the - * number of tuple pairs! - */ - ssize_t recv (size_t n, ...) const; - - /// Send bytes via Win32 WriteFile using overlapped I/O. - ssize_t send (const void *buf, - size_t n, - ACE_OVERLAPPED *overlapped) const; - - /// Recv bytes via Win32 ReadFile using overlapped I/O. - ssize_t recv (void *buf, - size_t n, - ACE_OVERLAPPED *overlapped) const; - - /// Send an of size to the file. - ssize_t sendv (const iovec iov[], - int n) const; - - /** - * Allows a client to read from a file without having to provide a - * buffer to read. This method determines how much data is in the - * file, allocates a buffer of this size, reads in the data, and - * returns the number of bytes read. The caller is responsible for - * deleting the member in the field of using - * delete [] io_vec->iov_base. - */ - ssize_t recvv (iovec *io_vec); - - /// Send an of size to the file. Will block until all - /// bytes are sent or an error occurs. - ssize_t sendv_n (const iovec iov[], - int n) const; - - /// Receive an of size to the file. - ssize_t recvv_n (iovec iov[], - int n) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - // = Meta-type info - typedef ACE_FILE_Addr PEER_ADDR; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE_IO.i" -#endif /* !defined (ACE_LACKS_INLINE_FUNCTIONS) */ - -#include "ace/post.h" -#endif /* ACE_FILE_IO_H */ diff --git a/ace/FILE_IO.i b/ace/FILE_IO.i deleted file mode 100644 index c987b604413..00000000000 --- a/ace/FILE_IO.i +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// FILE_IO.i - -ASYS_INLINE ssize_t -ACE_FILE_IO::sendv_n (const iovec iov[], int n) const -{ - ACE_TRACE ("ACE_FILE_IO::sendv_n"); - return ACE::writev_n (this->get_handle (), - iov, - n); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::send_n (const ACE_Message_Block *message_block, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) -{ - ACE_TRACE ("ACE_FILE_IO::send_n"); - ACE_UNUSED_ARG (timeout); - return ACE::write_n (this->get_handle (), - message_block, - bytes_transferred); -} - -// Recv an n byte message from the file. - -ASYS_INLINE ssize_t -ACE_FILE_IO::recvv_n (iovec iov[], int n) const -{ - ACE_TRACE ("ACE_FILE_IO::recvv_n"); - // @@ Carlos, can you please update this to call the - // new ACE::recvv_n() method that you write? - return ACE_OS::readv (this->get_handle (), - iov, - n); -} - -// Send an of size to the file. - -ASYS_INLINE ssize_t -ACE_FILE_IO::sendv (const iovec iov[], int n) const -{ - ACE_TRACE ("ACE_FILE_IO::sendv"); - return ACE_OS::writev (this->get_handle (), iov, n); -} - -// Send exactly N bytes from BUF to this file. Keeping trying until -// this many bytes are sent. - -ASYS_INLINE ssize_t -ACE_FILE_IO::send_n (const void *buf, size_t n) const -{ - ACE_TRACE ("ACE_FILE_IO::send_n"); - return ACE::write_n (this->get_handle (), buf, n); -} - -// Receive exactly N bytes from this file into BUF. Keep trying until -// this many bytes are received. - -ASYS_INLINE ssize_t -ACE_FILE_IO::recv_n (void *buf, size_t n) const -{ - ACE_TRACE ("ACE_FILE_IO::recv_n"); - return ACE::read_n (this->get_handle (), buf, n); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::send (const void *buf, size_t n) const -{ - ACE_TRACE ("ACE_FILE_IO::send"); - return ACE_OS::write (this->get_handle (), (const char *) buf, n); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::recv (void *buf, size_t n) const -{ - ACE_TRACE ("ACE_FILE_IO::recv"); - return ACE_OS::read (this->get_handle (), (char *) buf, n); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::send (const iovec iov[], int n) const -{ - ACE_TRACE ("ACE_FILE_IO::send"); - return ACE_OS::writev (this->get_handle (), iov, n); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::recv (iovec iov[], int n) const -{ - ACE_TRACE ("ACE_FILE_IO::recv"); - return ACE_OS::readv (this->get_handle (), iov, n); -} - -#if defined (ACE_HAS_STREAM_PIPES) -ASYS_INLINE ssize_t -ACE_FILE_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const -{ - ACE_TRACE ("ACE_FILE_IO::recv"); - return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const -{ - ACE_TRACE ("ACE_FILE_IO::send"); - return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const -{ - ACE_TRACE ("ACE_FILE_IO::recv"); - return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const -{ - ACE_TRACE ("ACE_FILE_IO::send"); - return ACE_OS::putmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::send (const void *buf, size_t n, - ACE_OVERLAPPED *overlapped) const -{ - ACE_TRACE ("ACE_FILE_IO::send"); - return ACE_OS::write (this->get_handle (), - (const char *) buf, n, - overlapped); -} - -ASYS_INLINE ssize_t -ACE_FILE_IO::recv (void *buf, size_t n, - ACE_OVERLAPPED *overlapped) const -{ - ACE_TRACE ("ACE_FILE_IO::recv"); - return ACE_OS::read (this->get_handle (), (char *) buf, n, - overlapped); -} - -#endif /* ACE_HAS_STREAM_PIPES */ diff --git a/ace/File_Lock.cpp b/ace/File_Lock.cpp deleted file mode 100644 index 7f9c3048aa7..00000000000 --- a/ace/File_Lock.cpp +++ /dev/null @@ -1,78 +0,0 @@ -// $Id$ - -#include "ace/File_Lock.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/File_Lock.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, File_Lock, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_File_Lock) - -void -ACE_File_Lock::dump (void) const -{ -// ACE_TRACE ("ACE_File_Lock::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h, - int unlink_in_destructor) - : removed_ (0), - unlink_in_destructor_ (unlink_in_destructor) -{ -// ACE_TRACE ("ACE_File_Lock::ACE_File_Lock"); - if (ACE_OS::flock_init (&this->lock_) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_File_Lock::ACE_File_Lock"))); - this->set_handle (h); -} - -ACE_File_Lock::ACE_File_Lock (const ACE_TCHAR *name, - int flags, - mode_t perms, - int unlink_in_destructor) - : unlink_in_destructor_ (unlink_in_destructor) -{ -// ACE_TRACE ("ACE_File_Lock::ACE_File_Lock"); - - if (this->open (name, flags, perms) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p %s\n"), - ACE_LIB_TEXT ("ACE_File_Lock::ACE_File_Lock"), - name)); -} - -int -ACE_File_Lock::open (const ACE_TCHAR *name, - int flags, - mode_t perms) -{ -// ACE_TRACE ("ACE_File_Lock::open"); - this->removed_ = 0; - return ACE_OS::flock_init (&this->lock_, flags, name, perms); -} - -ACE_File_Lock::~ACE_File_Lock (void) -{ -// ACE_TRACE ("ACE_File_Lock::~ACE_File_Lock"); - this->remove (this->unlink_in_destructor_); -} - -// These are instantiated both with and without ACE_HAS_THREADS. - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -// template class ACE_Guard; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -// #pragma instantiate ACE_Guard - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/File_Lock.h b/ace/File_Lock.h deleted file mode 100644 index afc549a0ff0..00000000000 --- a/ace/File_Lock.h +++ /dev/null @@ -1,164 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file File_Lock.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_FILE_LOCK_H -#define ACE_FILE_LOCK_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_File_Lock - * - * @brief A wrapper around the UNIX file locking mechanism. - * - * Allows us to "adapt" the UNIX file locking mechanisms to work - * with all of our Guard stuff... - */ -class ACE_Export ACE_File_Lock -{ -public: - /** - * Set the of the File_Lock to . Note that this - * constructor assumes ownership of the and will close it - * down in . If you want the to stay open when - * is called make sure to call on the . - * If you don't want the file unlinked in the destructor pass a - * zero value for . - */ - ACE_File_Lock (ACE_HANDLE handle = ACE_INVALID_HANDLE, - int unlink_in_destructor = 1); - - /// Open the with and and set the result - /// to . If you don't want the file unlinked in the - /// destructor pass a zero value for . - ACE_File_Lock (const ACE_TCHAR *filename, - int flags, - mode_t mode = 0, - int unlink_in_destructor = 1); - - /// Open the with and and set the result to - /// . - int open (const ACE_TCHAR *filename, - int flags, - mode_t mode = 0); - - /// Remove a File lock by releasing it and closing down the . - ~ACE_File_Lock (void); - - /// Remove a File lock by releasing it and closing down the - /// . If is non-0 then we unlink the file. - int remove (int unlink_file = 1); - - /** - * Note, for interface uniformity with other synchronization - * wrappers we include the method. This is implemented as - * a write-lock to be on the safe-side... - */ - int acquire (short whence = 0, off_t start = 0, off_t len = 1); - - /** - * Note, for interface uniformity with other synchronization - * wrappers we include the method. This is implemented - * as a write-lock to be on the safe-side... Returns -1 on failure. - * If we "failed" because someone else already had the lock, - * is set to . - */ - int tryacquire (short whence = 0, off_t start = 0, off_t len = 1); - - /// Unlock a readers/writer lock. - int release (short whence = 0, off_t start = 0, off_t len = 1); - - /// Acquire a write lock, but block if any readers or a - /// writer hold the lock. - int acquire_write (short whence = 0, off_t start = 0, off_t len = 1); - - /** - * Conditionally acquire a write lock (i.e., won't block). Returns - * -1 on failure. If we "failed" because someone else already had - * the lock, is set to . - */ - int tryacquire_write (short whence = 0, off_t start = 0, off_t len = 1); - - /** - * Conditionally upgrade to a write lock (i.e., won't block). Returns - * -1 on failure. If we "failed" because someone else already had - * the lock, is set to . - */ - int tryacquire_write_upgrade (short whence = 0, - off_t start = 0, - off_t len = 1); - - /** - * Acquire a read lock, but block if a writer hold the lock. - * Returns -1 on failure. If we "failed" because someone else - * already had the lock, is set to . - */ - int acquire_read (short whence = 0, off_t start = 0, off_t len = 1); - - /** - * Conditionally acquire a read lock (i.e., won't block). Returns - * -1 on failure. If we "failed" because someone else already had - * the lock, is set to . - */ - int tryacquire_read (short whence = 0, off_t start = 0, off_t len = 1); - - /// Get underlying for the file. - ACE_HANDLE get_handle (void) const; - - /** - * Set underlying . Note that this method assumes - * ownership of the and will close it down in . If - * you want the to stay open when is called make - * sure to call on the before closing it. You are - * responsible for the closing the existing before - * overwriting it. - */ - void set_handle (ACE_HANDLE); - - /// Dump state of the object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Locking structure for OS record locks. - ACE_OS::ace_flock_t lock_; - - /// Keeps track of whether has been called yet to avoid - /// multiple calls, e.g., explicitly and implicitly in the - /// destructor. This flag isn't protected by a lock, so make sure - /// that you don't have multiple threads simultaneously calling - /// on the same object, which is a bad idea anyway... - int removed_; - - /// Keeps track of whether to unlink the underlying file in the - /// destructor. - int unlink_in_destructor_; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_File_Lock &); - ACE_File_Lock (const ACE_File_Lock &); -}; - -#if defined (__ACE_INLINE__) -#include "ace/File_Lock.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_FILE_LOCK_H */ diff --git a/ace/File_Lock.inl b/ace/File_Lock.inl deleted file mode 100644 index a0dc79dcc7b..00000000000 --- a/ace/File_Lock.inl +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE int -ACE_File_Lock::acquire_read (short whence, off_t start, off_t len) -{ -// ACE_TRACE ("ACE_File_Lock::acquire_read"); - return ACE_OS::flock_rdlock (&this->lock_, whence, start, len); -} - -ACE_INLINE int -ACE_File_Lock::tryacquire_read (short whence, off_t start, off_t len) -{ -// ACE_TRACE ("ACE_File_Lock::tryacquire_read"); - return ACE_OS::flock_tryrdlock (&this->lock_, whence, start, len); -} - -ACE_INLINE int -ACE_File_Lock::tryacquire_write (short whence, off_t start, off_t len) -{ -// ACE_TRACE ("ACE_File_Lock::tryacquire_write"); - return ACE_OS::flock_trywrlock (&this->lock_, whence, start, len); -} - -ACE_INLINE int -ACE_File_Lock::tryacquire_write_upgrade (short whence, off_t start, off_t len) -{ -// ACE_TRACE ("ACE_File_Lock::tryacquire_write_upgrade"); - return ACE_OS::flock_trywrlock (&this->lock_, whence, start, len); -} - -ACE_INLINE int -ACE_File_Lock::tryacquire (short whence, off_t start, off_t len) -{ -// ACE_TRACE ("ACE_File_Lock::tryacquire"); - return this->tryacquire_write (whence, start, len); -} - -ACE_INLINE int -ACE_File_Lock::acquire_write (short whence, off_t start, off_t len) -{ -// ACE_TRACE ("ACE_File_Lock::acquire_write"); - return ACE_OS::flock_wrlock (&this->lock_, whence, start, len); -} - -ACE_INLINE int -ACE_File_Lock::acquire (short whence, off_t start, off_t len) -{ -// ACE_TRACE ("ACE_File_Lock::acquire"); - return this->acquire_write (whence, start, len); -} - -ACE_INLINE int -ACE_File_Lock::release (short whence, off_t start, off_t len) -{ -// ACE_TRACE ("ACE_File_Lock::release"); - return ACE_OS::flock_unlock (&this->lock_, whence, start, len); -} - -ACE_INLINE int -ACE_File_Lock::remove (int unlink_file) -{ -// ACE_TRACE ("ACE_File_Lock::remove"); - - int result = 0; - - if (this->removed_ == 0) - { - this->removed_ = 1; - result = ACE_OS::flock_destroy (&this->lock_, - unlink_file); - } - return result; -} - -ACE_INLINE ACE_HANDLE -ACE_File_Lock::get_handle (void) const -{ -// ACE_TRACE ("ACE_File_Lock::get_handle"); - return this->lock_.handle_; -} - -ACE_INLINE void -ACE_File_Lock::set_handle (ACE_HANDLE h) -{ -// ACE_TRACE ("ACE_File_Lock::set_handle"); - this->lock_.handle_ = h; - this->removed_ = 0; -} diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp deleted file mode 100644 index cd41b9f8e46..00000000000 --- a/ace/Filecache.cpp +++ /dev/null @@ -1,769 +0,0 @@ -// $Id$ - -#include "ace/Filecache.h" -#include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, Filecache, "$Id$") - -#if defined (ACE_WIN32) -// Specifies no sharing flags. -#define R_MASK ACE_DEFAULT_OPEN_PERMS -#define W_MASK 0 -#else -#define R_MASK S_IRUSR|S_IRGRP|S_IROTH -#define W_MASK S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR|S_IWGRP|S_IWOTH -#endif /* __BORLANDC__ */ - -#if defined (ACE_WIN32) -// See if you can get rid of some of these. -#define READ_FLAGS (FILE_FLAG_SEQUENTIAL_SCAN | \ - FILE_FLAG_OVERLAPPED | \ - O_RDONLY) -// static const int RCOPY_FLAGS = (FILE_FLAG_SEQUENTIAL_SCAN | -// O_RDONLY); -#define WRITE_FLAGS (FILE_FLAG_SEQUENTIAL_SCAN | \ - FILE_FLAG_OVERLAPPED | \ - O_RDWR | O_CREAT | O_TRUNC) -// static const int WCOPY_FLAGS = (FILE_FLAG_SEQUENTIAL_SCAN | -// O_RDWR | O_CREAT | O_TRUNC); -#else -#define READ_FLAGS O_RDONLY -// static const int RCOPY_FLAGS = O_RDONLY; -#define WRITE_FLAGS (O_RDWR | O_CREAT | O_TRUNC) -// static const int WCOPY_FLAGS = O_RDWR | O_CREAT | O_TRUNC; -#endif /* ACE_WIN32 */ - -// static data members -ACE_Filecache *ACE_Filecache::cvf_ = 0; - -void -ACE_Filecache_Handle::init (void) -{ - this->file_ = 0; - this->handle_ = ACE_INVALID_HANDLE; -} - -ACE_Filecache_Handle::ACE_Filecache_Handle (void) - : file_ (0), handle_ (0), mapit_ (0) -{ - this->init (); -} - -ACE_Filecache_Handle::ACE_Filecache_Handle (const ACE_TCHAR *filename, - ACE_Filecache_Flag mapit) - : file_ (0), handle_ (0), mapit_ (mapit) -{ - this->init (); - // Fetch the file from the Virtual_Filesystem let the - // Virtual_Filesystem do the work of cache coherency. - - // Filecache will also do the acquire, since it holds the lock at - // that time. - this->file_ = ACE_Filecache::instance ()->fetch (filename, mapit); -} - -ACE_Filecache_Handle::ACE_Filecache_Handle (const ACE_TCHAR *filename, - int size, - ACE_Filecache_Flag mapit) - : file_ (0), handle_ (0), mapit_ (mapit) -{ - this->init (); - - if (size == 0) - ACE_Filecache::instance ()->remove (filename); - else - { - // Since this is being opened for a write, simply create a new - // ACE_Filecache_Object now, and let the destructor add it into CVF - // later - - // Filecache will also do the acquire, since it holds the lock at - // that time. - this->file_ = ACE_Filecache::instance ()->create (filename, size); - } -} - -ACE_Filecache_Handle::~ACE_Filecache_Handle (void) -{ - if (this->handle_ != ACE_INVALID_HANDLE) - // this was dup ()'d - ACE_OS::close (this->handle_); - - ACE_Filecache::instance ()->finish (this->file_); -} - -void * -ACE_Filecache_Handle::address (void) const -{ - return this->file_ == 0 ? 0 : this->file_->address (); -} - -ACE_HANDLE -ACE_Filecache_Handle::handle (void) const -{ - if (this->handle_ == ACE_INVALID_HANDLE && this->file_ != 0) - { - ACE_Filecache_Handle *mutable_this = - (ACE_Filecache_Handle *) this; - mutable_this->handle_ = ACE_OS::dup (this->file_->handle ()); - } - return this->handle_; -} - -int -ACE_Filecache_Handle::error (void) const -{ - if (this->file_ == 0) - return -1; - else - return this->file_->error (); -} - -off_t -ACE_Filecache_Handle::size (void) const -{ - if (this->file_ == 0) - return -1; - else - return this->file_->size (); -} - -// ------------------ -// ACE_Filecache_Hash -// ------------------ - -#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) - -#define ACE_Filecache_Hash \ - ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> -#define ACE_Filecache_Hash_Entry \ - ACE_Hash_Map_Entry - -ACE_TEMPLATE_SPECIALIZATION -ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (const ACE_TCHAR *const &ext_id, - ACE_Filecache_Object *const &int_id, - ACE_Filecache_Hash_Entry *next, - ACE_Filecache_Hash_Entry *prev) - : ext_id_ (ext_id ? ACE_OS::strdup (ext_id) : ACE_OS::strdup (ACE_LIB_TEXT (""))), - int_id_ (int_id), - next_ (next), - prev_ (prev) -{ -} - -ACE_TEMPLATE_SPECIALIZATION -ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next, - ACE_Filecache_Hash_Entry *prev) - : ext_id_ (0), - next_ (next), - prev_ (prev) -{ -} - -ACE_TEMPLATE_SPECIALIZATION -ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void) -{ - ACE_OS::free ((void *) ext_id_); -} - -// We need these template specializations since KEY is defined as a -// ACE_TCHAR*, which doesn't have a hash() or equal() method defined on it. - -ACE_TEMPLATE_SPECIALIZATION -unsigned long -ACE_Filecache_Hash::hash (const ACE_TCHAR *const &ext_id) -{ - return ACE::hash_pjw (ext_id); -} - -ACE_TEMPLATE_SPECIALIZATION -int -ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1, const ACE_TCHAR *const &id2) -{ - return ACE_OS::strcmp (id1, id2) == 0; -} - -#undef ACE_Filecache_Hash -#undef ACE_Filecache_Hash_Entry - -#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ - - -// ------------- -// ACE_Filecache -// ------------- - -ACE_Filecache * -ACE_Filecache::instance (void) -{ - // Double check locking pattern. - if (ACE_Filecache::cvf_ == 0) - { - ACE_SYNCH_RW_MUTEX &lock = - *ACE_Managed_Object::get_preallocated_object - (ACE_Object_Manager::ACE_FILECACHE_LOCK); - ACE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, ace_mon, lock, 0); - - // @@ James, please check each of the ACE_NEW_RETURN calls to - // make sure that it is safe to return if allocation fails. - if (ACE_Filecache::cvf_ == 0) - ACE_NEW_RETURN (ACE_Filecache::cvf_, - ACE_Filecache, - 0); - } - - return ACE_Filecache::cvf_; -} - -ACE_Filecache::ACE_Filecache (void) - : size_ (ACE_DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE), - hash_ (this->size_) -{ -} - -ACE_Filecache::~ACE_Filecache (void) -{ -} - -ACE_Filecache_Object * -ACE_Filecache::insert_i (const ACE_TCHAR *filename, - ACE_SYNCH_RW_MUTEX &filelock, - int mapit) -{ - ACE_Filecache_Object *handle = 0; - - if (this->hash_.find (filename, handle) == -1) - { - ACE_NEW_RETURN (handle, - ACE_Filecache_Object (filename, filelock, 0, mapit), - 0); - - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (%t) CVF: creating %s\n"), filename)); - - if (this->hash_.bind (filename, handle) == -1) - { - delete handle; - handle = 0; - } - } - else - handle = 0; - - return handle; -} - -ACE_Filecache_Object * -ACE_Filecache::remove_i (const ACE_TCHAR *filename) -{ - ACE_Filecache_Object *handle = 0; - - // Disassociate file from the cache. - if (this->hash_.unbind (filename, handle) == 0) - { - handle->stale_ = 1; - - // Try a lock. If it succeds, we can delete it now. - // Otherwise, it will clean itself up later. - if (handle->lock_.tryacquire_write () == 0) - { - delete handle; - handle = 0; - } - } - else - handle = 0; - - return handle; -} - -ACE_Filecache_Object * -ACE_Filecache::update_i (const ACE_TCHAR *filename, - ACE_SYNCH_RW_MUTEX &filelock, - int mapit) -{ - ACE_Filecache_Object *handle = 0; - - handle = this->remove_i (filename); - handle = this->insert_i (filename, filelock, mapit); - - return handle; -} - -int -ACE_Filecache::find (const ACE_TCHAR *filename) -{ - return this->hash_.find (filename); -} - - -ACE_Filecache_Object * -ACE_Filecache::remove (const ACE_TCHAR *filename) -{ - ACE_Filecache_Object *handle = 0; - - u_long loc = ACE::hash_pjw (filename) % this->size_; - ACE_SYNCH_RW_MUTEX &hashlock = this->hash_lock_[loc]; - // ACE_SYNCH_RW_MUTEX &filelock = this->file_lock_[loc]; - - if (this->hash_.find (filename, handle) != -1) - { - ACE_WRITE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, - ace_mon, - hashlock, - 0); - - return this->remove_i (filename); - } - - return 0; -} - - -ACE_Filecache_Object * -ACE_Filecache::fetch (const ACE_TCHAR *filename, int mapit) -{ - ACE_Filecache_Object *handle = 0; - - u_long loc = ACE::hash_pjw (filename) % this->size_; - ACE_SYNCH_RW_MUTEX &hashlock = this->hash_lock_[loc]; - ACE_SYNCH_RW_MUTEX &filelock = this->file_lock_[loc]; - - filelock.acquire_read (); - - if (this->hash_.find (filename, handle) == -1) - { - ACE_WRITE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, - ace_mon, - hashlock, - 0); - - // Second check in the method call - handle = this->insert_i (filename, filelock, mapit); - - if (handle == 0) - filelock.release (); - } - else - { - if (handle->update ()) - { - { - // Double check locking pattern - ACE_WRITE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, - ace_mon, - hashlock, - 0); - - // Second check in the method call - handle = this->update_i (filename, filelock, mapit); - - if (handle == 0) - filelock.release (); - } - } - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (%t) CVF: found %s\n"), filename)); - } - - return handle; -} - -ACE_Filecache_Object * -ACE_Filecache::create (const ACE_TCHAR *filename, int size) -{ - ACE_Filecache_Object *handle = 0; - - u_long loc = ACE::hash_pjw (filename) % this->size_; - ACE_SYNCH_RW_MUTEX &filelock = this->file_lock_[loc]; - - ACE_NEW_RETURN (handle, - ACE_Filecache_Object (filename, size, filelock), - 0); - handle->acquire (); - - return handle; -} - -ACE_Filecache_Object * -ACE_Filecache::finish (ACE_Filecache_Object *&file) -{ - if (file == 0) - return file; - - u_long loc = ACE::hash_pjw (file->filename_) % this->size_; - ACE_SYNCH_RW_MUTEX &hashlock = this->hash_lock_[loc]; - - if (file != 0) - switch (file->action_) - { - case ACE_Filecache_Object::ACE_WRITING: - { - ACE_WRITE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, - ace_mon, - hashlock, - 0); - - file->release (); - - this->remove_i (file->filename_); -#if 0 - int result = this->hash_.bind (file->filename (), file); - - if (result == 0) - file->acquire (); -#else - // Last one using a stale file is resposible for deleting it. - if (file->stale_) - { - // Try a lock. If it succeds, we can delete it now. - // Otherwise, it will clean itself up later. - if (file->lock_.tryacquire_write () == 0) - { - delete file; - file = 0; - } - } -#endif - } - - break; - default: - file->release (); - - // Last one using a stale file is resposible for deleting it. - if (file->stale_) - { - // Try a lock. If it succeds, we can delete it now. - // Otherwise, it will clean itself up later. - if (file->lock_.tryacquire_write () == 0) - { - delete file; - file = 0; - } - } - - break; - } - - return file; -} - -void -ACE_Filecache_Object::init (void) -{ - this->filename_[0] = '\0'; - this->handle_ = ACE_INVALID_HANDLE; - this->error_ = ACE_SUCCESS; - this->tempname_ = 0; - this->size_ = 0; - - ACE_OS::memset (&(this->stat_), 0, sizeof (this->stat_)); -} - -ACE_Filecache_Object::ACE_Filecache_Object (void) - : tempname_ (0), - mmap_ (), - handle_ (0), - // stat_ (), - size_ (0), - action_ (0), - error_ (0), - stale_ (0), - // sa_ (), - junklock_ (), - lock_ (junklock_) -{ - this->init (); -} - -ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, - ACE_SYNCH_RW_MUTEX &lock, - LPSECURITY_ATTRIBUTES sa, - int mapit) - : tempname_ (0), - mmap_ (), - handle_ (0), - // stat_ (), - size_ (0), - action_ (0), - error_ (0), - stale_ (0), - sa_ (sa), - junklock_ (), - lock_ (lock) -{ - this->init (); - - // ASSERT strlen(filename) < sizeof (this->filename_) - ACE_OS::strcpy (this->filename_, filename); - this->action_ = ACE_Filecache_Object::ACE_READING; - // place ourselves into the READING state - - // Can we access the file? - if (ACE_OS::access (this->filename_, R_OK) == -1) - { - this->error_i (ACE_Filecache_Object::ACE_ACCESS_FAILED); - return; - } - - // Can we stat the file? - if (ACE_OS::stat (this->filename_, &this->stat_) == -1) - { - this->error_i (ACE_Filecache_Object::ACE_STAT_FAILED); - return; - } - - this->size_ = this->stat_.st_size; - this->tempname_ = this->filename_; - - // Can we open the file? - this->handle_ = ACE_OS::open (this->tempname_, - READ_FLAGS, R_MASK, this->sa_); - if (this->handle_ == ACE_INVALID_HANDLE) - { - this->error_i (ACE_Filecache_Object::ACE_OPEN_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::ctor: open")); - return; - } - - if (mapit) - { - // Can we map the file? - if (this->mmap_.map (this->handle_, -1, - PROT_READ, ACE_MAP_PRIVATE, 0, 0, this->sa_) != 0) - { - this->error_i (ACE_Filecache_Object::ACE_MEMMAP_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::ctor: map")); - ACE_OS::close (this->handle_); - this->handle_ = ACE_INVALID_HANDLE; - return; - } - } - - // Ok, finished! - this->action_ = ACE_Filecache_Object::ACE_READING; -} - -ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, - off_t size, - ACE_SYNCH_RW_MUTEX &lock, - LPSECURITY_ATTRIBUTES sa) - : stale_ (0), - sa_ (sa), - lock_ (lock) -{ - this->init (); - - this->size_ = size; - ACE_OS::strcpy (this->filename_, filename); - this->action_ = ACE_Filecache_Object::ACE_WRITING; - - // Can we access the file? - if (ACE_OS::access (this->filename_, R_OK|W_OK) == -1 - // Does it exist? - && ACE_OS::access (this->filename_, F_OK) != -1) - { - // File exists, but we cannot access it. - this->error_i (ACE_Filecache_Object::ACE_ACCESS_FAILED); - return; - } - - this->tempname_ = this->filename_; - - // Can we open the file? - this->handle_ = ACE_OS::open (this->tempname_, WRITE_FLAGS, W_MASK, this->sa_); - if (this->handle_ == ACE_INVALID_HANDLE) - { - this->error_i (ACE_Filecache_Object::ACE_OPEN_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::acquire: open")); - return; - } - - // Can we write? - if (ACE_OS::pwrite (this->handle_, "", 1, this->size_ - 1) != 1) - { - this->error_i (ACE_Filecache_Object::ACE_WRITE_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::acquire: write")); - ACE_OS::close (this->handle_); - return; - } - - // Can we map? - if (this->mmap_.map (this->handle_, this->size_, PROT_RDWR, MAP_SHARED, - 0, 0, this->sa_) != 0) - { - this->error_i (ACE_Filecache_Object::ACE_MEMMAP_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::acquire: map")); - ACE_OS::close (this->handle_); - } - - // Ok, done! -} - -ACE_Filecache_Object::~ACE_Filecache_Object (void) -{ - if (this->error_ == ACE_SUCCESS) - { - this->mmap_.unmap (); - ACE_OS::close (this->handle_); - this->handle_ = ACE_INVALID_HANDLE; - } -} - -int -ACE_Filecache_Object::acquire (void) -{ - return this->lock_.tryacquire_read (); -} - -int -ACE_Filecache_Object::release (void) -{ - if (this->action_ == ACE_WRITING) - { - // We are safe since only one thread has a writable Filecache_Object - -#if 0 - ACE_HANDLE original = ACE_OS::open (this->filename_, WRITE_FLAGS, W_MASK, - this->sa_); - if (original == ACE_INVALID_HANDLE) - this->error_ = ACE_Filecache_Object::ACE_OPEN_FAILED; - else if (ACE_OS::write (original, this->mmap_.addr (), - this->size_) == -1) - { - this->error_ = ACE_Filecache_Object::ACE_WRITE_FAILED; - ACE_OS::close (original); - ACE_OS::unlink (this->filename_); - } - else if (ACE_OS::stat (this->filename_, &this->stat_) == -1) - this->error_ = ACE_Filecache_Object::ACE_STAT_FAILED; -#endif - - this->mmap_.unmap (); - ACE_OS::close (this->handle_); - this->handle_ = ACE_INVALID_HANDLE; - -#if 0 - // Leave the file in an acquirable state. - this->handle_ = ACE_OS::open (this->tempname_, READ_FLAGS, R_MASK); - if (this->handle_ == ACE_INVALID_HANDLE) - { - this->error_i (ACE_Filecache_Object::ACE_OPEN_FAILED, - "ACE_Filecache_Object::acquire: open"); - } - else if (this->mmap_.map (this->handle_, -1, - PROT_READ, - ACE_MAP_PRIVATE, - 0, - 0, - this->sa_) != 0) - { - this->error_i (ACE_Filecache_Object::ACE_MEMMAP_FAILED, - "ACE_Filecache_Object::acquire: map"); - ACE_OS::close (this->handle_); - this->handle_ = ACE_INVALID_HANDLE; - } - - this->action_ = ACE_Filecache_Object::ACE_READING; -#endif - } - - return this->lock_.release (); -} - -int -ACE_Filecache_Object::error (void) const -{ - // The existence of the object means a read lock is being held. - return this->error_; -} - -int -ACE_Filecache_Object::error_i (int error_value, const ACE_TCHAR *s) -{ - s = s; - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p.\n"), s)); - this->error_ = error_value; - return error_value; -} - -const ACE_TCHAR * -ACE_Filecache_Object::filename (void) const -{ - // The existence of the object means a read lock is being held. - return this->filename_; -} - -off_t -ACE_Filecache_Object::size (void) const -{ - // The existence of the object means a read lock is being held. - return this->size_; -} - -ACE_HANDLE -ACE_Filecache_Object::handle (void) const -{ - // The existence of the object means a read lock is being held. - return this->handle_; -} - -void * -ACE_Filecache_Object::address (void) const -{ - // The existence of the object means a read lock is being held. - return this->mmap_.addr (); -} - -int -ACE_Filecache_Object::update (void) const -{ - // The existence of the object means a read lock is being held. - int result; - ACE_stat statbuf; - - if (ACE_OS::stat (this->filename_, &statbuf) == -1) - result = 1; - else - // non-portable code may follow -#if defined (ACE_HAS_WINCE) - // Yup, non-portable... there's probably a way to safely implement - // difftime() on WinCE, but for now, this will have to do. It flags - // every file as having changed since cached. - result = 1; -#else - result = ACE_OS::difftime (this->stat_.st_mtime, statbuf.st_mtime) < 0; -#endif /* ACE_HAS_WINCE */ - - return result; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) -template class ACE_Hash_Map_Entry; -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -#else -template class ACE_Hash_Map_Entry; -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) -#pragma instantiate ACE_Hash_Map_Entry -#pragma instantiate ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> -#else -#pragma instantiate ACE_Hash_Map_Entry -#pragma instantiate ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> -#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Filecache.h b/ace/Filecache.h deleted file mode 100644 index 0bcd8264b79..00000000000 --- a/ace/Filecache.h +++ /dev/null @@ -1,360 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Filecache.h - * - * $Id$ - * - * @author James Hu - */ -//============================================================================= - - -#ifndef ACE_FILECACHE_H -#define ACE_FILECACHE_H - -#include "ace/pre.h" - -#include "ace/Mem_Map.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch_T.h" -#include "ace/Hash_Map_Manager_T.h" -#include "ace/SString.h" - -enum ACE_Filecache_Flag -{ - ACE_NOMAP = 0, - ACE_MAPIT = 1 -}; - -class ACE_Filecache_Object; - -/** - * @class ACE_Filecache_Handle - * - * @brief Abstraction over a real file. This is meant to be the entry - * point into the Cached Virtual Filesystem. - * - * This is a cached filesystem implementation based loosely on the - * implementation of JAWS_File. The interfaces will be nearly the - * same. The under-the-hood implementation should hopefully be a - * much faster thing. - * These will be given their own implementations later. For now, we - * borrow the implementation provided by JAWS. - * On creation, the cache is checked, and reference count is - * incremented. On destruction, reference count is decremented. If - * the reference count is 0, the file is removed from the cache. - * E.g. 1, - * { - * ACE_Filecache_Handle foo("foo.html"); - * this->peer ().send (foo.address (), foo.size ()); - * } - * E.g. 2, - * { - * ACE_Filecache_Handle foo("foo.html"); - * io->transmitfile (foo.handle (), this->peer ().handle ()); - * } - * E.g. 3, - * { - * ACE_Filecache_Handle foo("foo.html", content_length); - * this->peer ().recv (foo.address (), content_length); - * } - * TODO: - */ -class ACE_Export ACE_Filecache_Handle -{ - // (1) Get rid of the useless copying of files when reading. - // Although it does make sure the file you send isn't being changed, - // it doesn't make sure the file is in a sensible state before - // sending it. - // - // Alternative: if the file get's trashed while it is being shipped, - // let the client request the file again. The cache should have an - // updated copy by that point. - // - // (2) Use hashing for locating files. This means I need a hastable - // implementation with buckets. - // - // (3) Only lock when absolutely necessary. JAWS_Virtual_Filesystem was - // rather conservative, but for some reason it still ran into problems. - // Since this design should be simpler, problems should be easier to spot. - // -public: - - /// Query cache for file, and acquire it. Assumes the file is being - /// opened for reading. - ACE_Filecache_Handle (const ACE_TCHAR *filename, - ACE_Filecache_Flag mapit = ACE_MAPIT); - - /** - * Create new entry, and acquire it. Presence of SIZE assumes the - * file is being opened for writing. If SIZE is zero, assumes the - * file is to be removed from the cache. - */ - ACE_Filecache_Handle (const ACE_TCHAR *filename, - int size, - ACE_Filecache_Flag mapit = ACE_MAPIT); - - /// Closes any open handles, release acquired file. - ~ACE_Filecache_Handle (void); - - /// Base address of memory mapped file. - void *address (void) const; - - /// A handle (e.g., UNIX file descriptor, or NT file handle). - ACE_HANDLE handle (void) const; - - /// Any associated error in handle creation and acquisition. - int error (void) const; - - /// The size of the file. - off_t size (void) const; - -protected: - /// Default do nothing constructor. Prevent it from being called. - ACE_Filecache_Handle (void); - - /// Common initializations for constructors. - void init (void); - -public: - /// These come from ACE_Filecache_Object, which is an internal class. - enum - { - ACE_SUCCESS = 0, - ACE_ACCESS_FAILED, - ACE_OPEN_FAILED, - ACE_COPY_FAILED, - ACE_STAT_FAILED, - ACE_MEMMAP_FAILED, - ACE_WRITE_FAILED - }; - -private: - /// A reference to the low level instance. - ACE_Filecache_Object *file_; - - /// A 'd version of the one from . - ACE_HANDLE handle_; - - int mapit_; -}; - -#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) - -typedef ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> - ACE_Filecache_Hash; - -typedef ACE_Hash_Map_Entry ACE_Filecache_Hash_Entry; - -#else - -typedef ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> - ACE_Filecache_Hash; - -typedef ACE_Filecache_Hash::ENTRY ACE_Filecache_Hash_Entry; - -#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ - - -/** - * @class ACE_Filecache - * - * @brief A hash table holding the information about entry point into - * the Cached Virtual Filesystem. On insertion, the reference - * count is incremented. On destruction, reference count is - * decremented. - */ -class ACE_Export ACE_Filecache -{ -public: - /// Singleton pattern. - static ACE_Filecache *instance (void); - - ~ACE_Filecache (void); - - /// Returns 0 if the file associated with ``filename'' is in the cache, - /// or -1 if not. - int find (const ACE_TCHAR *filename); - - /// Return the file associated with ``filename'' if it is in the cache, - /// or create if not. - ACE_Filecache_Object *fetch (const ACE_TCHAR *filename, int mapit = 1); - - /// Remove the file associated with ``filename'' from the cache. - ACE_Filecache_Object *remove (const ACE_TCHAR *filename); - - /// Create a new Filecache_Object, returns it. - ACE_Filecache_Object *create (const ACE_TCHAR *filename, int size); - - /// Release an acquired Filecache_Object, returns it again or NULL if it - /// was deleted. - ACE_Filecache_Object *finish (ACE_Filecache_Object *&new_file); - -protected: - ACE_Filecache_Object *insert_i (const ACE_TCHAR *filename, - ACE_SYNCH_RW_MUTEX &filelock, - int mapit); - ACE_Filecache_Object *remove_i (const ACE_TCHAR *filename); - ACE_Filecache_Object *update_i (const ACE_TCHAR *filename, - ACE_SYNCH_RW_MUTEX &filelock, - int mapit); - -public: - - enum - { - /// For this stupid implementation, use an array. Someday, use a - /// balanced search tree, or real hash table. - ACE_DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE = 512, - - /// This determines the highwater mark in megabytes for the cache. - /// This will be ignored for now. - ACE_DEFAULT_VIRTUAL_FILESYSTEM_CACHE_SIZE = 20 - }; - -protected: - /// Prevent it from being called. - ACE_Filecache (void); - -private: - int size_; - - /// The hash table - ACE_Filecache_Hash hash_; - - /// The reference to the instance - static ACE_Filecache *cvf_; - - // = Synchronization variables. - ACE_SYNCH_RW_MUTEX hash_lock_[ACE_DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE]; - ACE_SYNCH_RW_MUTEX file_lock_[ACE_DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE]; -}; - -/** - * @class ACE_Filecache_Object - * - * @brief Abstraction over a real file. This is what the Virtual - * Filesystem contains. This class is not intended for general - * consumption. Please consult a physician before attempting to - * use this class. - */ -class ACE_Export ACE_Filecache_Object -{ -public: - friend class ACE_Filecache; - - /// Creates a file for reading. - ACE_Filecache_Object (const ACE_TCHAR *filename, - ACE_SYNCH_RW_MUTEX &lock, - LPSECURITY_ATTRIBUTES sa = 0, - int mapit = 1); - - /// Creates a file for writing. - ACE_Filecache_Object (const ACE_TCHAR *filename, - off_t size, - ACE_SYNCH_RW_MUTEX &lock, - LPSECURITY_ATTRIBUTES sa = 0); - - /// Only if reference count is zero should this be called. - ~ACE_Filecache_Object (void); - - /// Increment the reference_count_. - int acquire (void); - - /// Decrement the reference_count_. - int release (void); - - // = error_ accessors - int error (void) const; - int error (int error_value, - const ACE_TCHAR *s = ACE_LIB_TEXT ("ACE_Filecache_Object")); - - /// filename_ accessor - const ACE_TCHAR *filename (void) const; - - /// handle_ accessor. - ACE_HANDLE handle (void) const; - - /// Base memory address for memory mapped file. - void *address (void) const; - - /// size_ accessor. - off_t size (void) const; - - /// True if file on disk is newer than cached file. - int update (void) const; - -protected: - /// Prevent from being called. - ACE_Filecache_Object (void); - - /// Common initialization code, - void init (void); - -private: - /// Internal error logging method, no locking. - int error_i (int error_value, - const ACE_TCHAR *s = ACE_LIB_TEXT ("ACE_Filecache_Object")); - -public: - - enum Creation_States - { - ACE_READING = 1, - ACE_WRITING = 2 - }; - - enum Error_Conditions - { - ACE_SUCCESS = 0, - ACE_ACCESS_FAILED, - ACE_OPEN_FAILED, - ACE_COPY_FAILED, - ACE_STAT_FAILED, - ACE_MEMMAP_FAILED, - ACE_WRITE_FAILED - }; - -private: - /// The temporary file name and the real file name. The real file is - /// copied into the temporary file for safety reasons. - ACE_TCHAR *tempname_; - ACE_TCHAR filename_[MAXPATHLEN + 1]; - - /// Holds the memory mapped version of the temporary file. - ACE_Mem_Map mmap_; - - /// The descriptor to the temporary file. - ACE_HANDLE handle_; - - /// Used to compare against the real file to test if an update is needed. - ACE_stat stat_; - off_t size_; - - /// Status indicators. - int action_; - int error_; - - /// If set to 1, means the object is flagged for removal. - int stale_; - - /// Security attribute object. - LPSECURITY_ATTRIBUTES sa_; - - /// The default initializer - ACE_SYNCH_RW_MUTEX junklock_; - - /// Provides a bookkeeping mechanism for users of this object. - ACE_SYNCH_RW_MUTEX &lock_; -}; - - -#include "ace/post.h" - -#endif /* ACE_FILECACHE_H */ diff --git a/ace/FlReactor.cpp b/ace/FlReactor.cpp deleted file mode 100644 index 4ef65a42cc3..00000000000 --- a/ace/FlReactor.cpp +++ /dev/null @@ -1,331 +0,0 @@ -// $Id$ - -#include "ace/FlReactor.h" - -ACE_RCSID(ace, FlReactor, "$Id$") - -#if defined (ACE_HAS_FL) - -#include "ace/Synch_T.h" -#include /**/ - -ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor) - -// Must be called with lock held -ACE_FlReactor::ACE_FlReactor (size_t size, - int restart, - ACE_Sig_Handler *h) - : ACE_Select_Reactor (size, restart, h) -{ - // When the ACE_Select_Reactor is constructed it creates the notify - // pipe and registers it with the register_handler_i() method. The - // FlReactor overloads this method BUT because the - // register_handler_i occurs when constructing the base class - // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i() - // is called not the FlReactor register_handler_i(). This means - // that the notify pipe is registered with the ACE_Select_Reactor - // event handling code not the FlReactor and so notfications don't - // work. To get around this we simply close and re-opened the - // notification handler in the constructor of the FlReactor. - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - this->notify_handler_->close (); - this->notify_handler_->open (this, 0); -#endif /* ACE_MT_SAFE */ -} - -ACE_FlReactor::~ACE_FlReactor (void) -{ -} - -// This is just the from ace/Reactor.cpp -// but we use the Fl functions to wait for an event, not , just use the Fl mechanism - // to wait for one or more events... - - // Wait for something to happen. - double t = 0; - if (max_wait_time != 0) - t = max_wait_time->sec () + max_wait_time->usec () / 1000000.0F; - - while (t > 0) { - t = Fl::wait (t); - } - - // Reset the width, in case it changed during the upcalls. - width = this->handler_rep_.max_handlep1 (); - - // Now actually read the result needed by the - // using . - */ - ACE_Handle_Set (const ACE_FD_SET_TYPE &mask); - - // = Methods for manipulating bitsets. - /// Initialize the bitmask to all 0s and reset the associated fields. - void reset (void); - - /** - * Checks whether is enabled. No range checking is - * performed so must be less than - * . - */ - int is_set (ACE_HANDLE handle) const; - - /// Enables the . No range checking is performed so - /// must be less than . - void set_bit (ACE_HANDLE handle); - - /// Disables the . No range checking is performed so - /// must be less than . - void clr_bit (ACE_HANDLE handle); - - /// Returns a count of the number of enabled bits. - int num_set (void) const; - - /// Returns the number of the large bit. - ACE_HANDLE max_set (void) const; - - /** - * Rescan the underlying up to handle to find the new - * (highest bit set) and (how many bits set) values. - * This is useful for evaluating the changes after the handle set has - * been manipulated in some way other than member functions; for example, - * after . - return ACE_OS::select(width, - wait_set.rd_mask_, - wait_set.wr_mask_, - wait_set.ex_mask_, - (ACE_Time_Value *) &ACE_Time_Value::zero); -} - -int -ACE_QtReactor::register_handler_i (ACE_HANDLE handle , - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_QtReactor::register_handler_i"); - - int result; - if ((result = ACE_Select_Reactor::register_handler_i(handle, - handler, - mask )) - == -1) - return -1; - - if (ACE_BIT_ENABLED(mask, ACE_Event_Handler::READ_MASK) || - ACE_BIT_ENABLED( mask, ACE_Event_Handler::ACCEPT_MASK)) - { - // We check for any unused handles. - MAP::ITERATOR read_iter = this->read_notifier_.end (); - QSocketNotifier *qsock_read_notifier = 0; - - // We check whether we have a data against the present - // handle. If so we need to unbind the data. - if ((this->read_notifier_.find (handle, - qsock_read_notifier) != -1)) - { - if (qsock_read_notifier != (*read_iter).int_id_) - { - this->read_notifier_.unbind (handle, - qsock_read_notifier); - delete qsock_read_notifier; - } - } - - ACE_NEW_RETURN (qsock_read_notifier, - QSocketNotifier (int(handle), QSocketNotifier::Read), - -1); - - this->read_notifier_.bind (handle, - qsock_read_notifier); - - QObject::connect (qsock_read_notifier, - SIGNAL (activated (int)), - this, - SLOT (read_event (int))) ; - } - - if (ACE_BIT_ENABLED( mask, ACE_Event_Handler::WRITE_MASK) || - ACE_BIT_ENABLED( mask, ACE_Event_Handler::ACCEPT_MASK) || - ACE_BIT_ENABLED( mask, ACE_Event_Handler::CONNECT_MASK)) - { - // We check for any unused handles. - MAP::ITERATOR write_iter = this->write_notifier_.end (); - QSocketNotifier *qsock_write_notifier = 0; - - // We check whether we have a data against the present - // handle. If so we need to unbind the data. - if ((this->write_notifier_.find (handle, - qsock_write_notifier) != -1)) - { - if (qsock_write_notifier != (*write_iter).int_id_) - { - this->write_notifier_.unbind (handle, - qsock_write_notifier); - delete qsock_write_notifier; - } - } - - ACE_NEW_RETURN (qsock_write_notifier, - QSocketNotifier (int(handle), QSocketNotifier::Write), - -1); - - this->write_notifier_.bind (handle, - qsock_write_notifier); - - QObject::connect (qsock_write_notifier, - SIGNAL (activated (int)), - this, - SLOT (write_event (int))); - } - - if (ACE_BIT_ENABLED( mask, - ACE_Event_Handler::EXCEPT_MASK)) - { - // We check for any unused handles. - MAP::ITERATOR excpt_iter = this->exception_notifier_.end (); - QSocketNotifier *qsock_excpt_notifier = 0; - - // We check whether we have a data against the present - // handle. If so we need to unbind the data. - if ((this->exception_notifier_.find (handle, - qsock_excpt_notifier) != -1)) - { - if (qsock_excpt_notifier != (*excpt_iter).int_id_) - { - this->exception_notifier_.unbind (handle, - qsock_excpt_notifier); - delete qsock_excpt_notifier; - } - } - - ACE_NEW_RETURN (qsock_excpt_notifier, - QSocketNotifier (int(handle), QSocketNotifier::Exception), - -1); - - this->exception_notifier_.bind (handle, - qsock_excpt_notifier); - - QObject::connect (qsock_excpt_notifier, - SIGNAL (activated (int)), - this, - SLOT (exception_event (int))) ; - } - - return 0; -} - -int -ACE_QtReactor::register_handler_i (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - return ACE_Select_Reactor::register_handler_i(handles, - handler, - mask); -} - -int ACE_QtReactor::remove_handler_i (ACE_HANDLE handle , - ACE_Reactor_Mask mask ) -{ - ACE_TRACE ("ACE_QtReactor::remove_handler_i"); - - QSocketNotifier *qsock_notifier = 0; - - // Looks for the handle in the maps and removes them. - MAP::ITERATOR iter = this->read_notifier_.end (); - - if ((this->read_notifier_.find (handle, - qsock_notifier) != -1)) - { - this->read_notifier_.unbind (handle, - qsock_notifier); - delete qsock_notifier; - } - - iter = this->write_notifier_.end (); - if ((this->write_notifier_.find (handle, - qsock_notifier) != -1)) - { - this->write_notifier_.unbind (handle, - qsock_notifier); - delete qsock_notifier; - } - - iter = this->exception_notifier_.end (); - if ((this->exception_notifier_.find (handle, - qsock_notifier) != -1)) - { - this->exception_notifier_.unbind (handle, - qsock_notifier); - delete qsock_notifier; - } - - // Now let the reactor do its work. - return ACE_Select_Reactor::remove_handler_i (handle, mask); -} - - -int -ACE_QtReactor::remove_handler_i (const ACE_Handle_Set &handles, - ACE_Reactor_Mask mask) -{ - return ACE_Select_Reactor::remove_handler_i (handles, - mask); -} - -// The following functions ensure that there is an Qt timeout for the -// first timeout in the Reactor's Timer_Queue. - -void -ACE_QtReactor::reset_timeout (void) -{ - if (this->qtime_ != 0) - { - delete this->qtime_; - this->qtime_ = 0; - } - - ACE_Time_Value *max_wait_time = - this->timer_queue_->calculate_timeout (0) ; - - if (max_wait_time) - { - ACE_NEW (this->qtime_, - QTimer); - - QObject::connect (qtime_, - SIGNAL (timeout ()), - this, - SLOT (timeout_event ())); - - qtime_->start(max_wait_time->msec(), 1); - } - -} - - -long -ACE_QtReactor::schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_QtReactor::schedule_timer"); - ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, - ace_mon, - this->token_, - -1)); - - long result; - if ((result = ACE_Select_Reactor::schedule_timer(event_handler, - arg, - delay, - interval)) == -1 ) - return -1; - else - { - this->reset_timeout (); - return result; - } -} - -int -ACE_QtReactor::cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_QtReactor::cancel_timer"); - - if (ACE_Select_Reactor::cancel_timer (handler, - dont_call_handle_close ) == -1 ) - return -1 ; - else - { - this->reset_timeout( ) ; - return 0 ; - } -} - -int ACE_QtReactor::cancel_timer (long timer_id, - const void **arg, - int dont_call_handle_close ) -{ - ACE_TRACE( "ACE_QtReactor::cancel_timer" ) ; - - if (ACE_Select_Reactor::cancel_timer (timer_id, - arg, - dont_call_handle_close ) == -1 ) - return -1 ; - else - { - this->reset_timeout( ) ; - return 0 ; - } -} - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Map_Entry; -template class ACE_Map_Manager; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Iterator; -template class ACE_Map_Reverse_Iterator; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Map_Entry -#pragma instantiate ACE_Map_Manager -#pragma instantiate ACE_Map_Iterator_Base -#pragma instantiate ACE_Map_Iterator -#pragma instantiate ACE_Map_Reverse_Iterator -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /*ACE_HAS_QT */ diff --git a/ace/QtReactor.h b/ace/QtReactor.h deleted file mode 100644 index 1af6335ed12..00000000000 --- a/ace/QtReactor.h +++ /dev/null @@ -1,154 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file QtReactor.h - * - * $Id$ - * - * @author Hamish Friedlander - * @author Balachandran Natarajan - */ -//============================================================================= - -#ifndef ACE_QTREACTOR_H -#define ACE_QTREACTOR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_QT) - -#include "ace/Select_Reactor.h" -#include "ace/Map_Manager.h" - -// Qttoolkit specific includes. -#include /**/ -#include /**/ -#include /**/ -#include /**/ - -/** - * @class ACE_QtReactor - * - * @brief An object-oriented event demultiplexor and event handler - * dispatcher that uses the Qt Library. This class declaration - * also uses the extension facilities provided by the Qt. So, - * readers of the class declaration should not be upset with - * the appearence of the Keywords like Q_OBJECT, private slots - * etc. They are specific to Qt which uses these as a call back - * methods implementation mechanism. - */ -class ACE_Export ACE_QtReactor : public QObject, public ACE_Select_Reactor -{ - - Q_OBJECT - - public: - // = Initialization and termination methods. - ACE_QtReactor (QApplication *qapp = NULL, - size_t size = DEFAULT_SIZE, - int restart = 0, - ACE_Sig_Handler *handler = 0); - - virtual ~ACE_QtReactor (void); - - void qapplication (QApplication *qapp); - - // = Timer operations. - virtual long schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval); - - virtual int cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close = 1); - - virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1); - - protected: - - // = Register timers/handles with Qt - - /// Register a single . - virtual int register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); - - /// Register a set of with Qt. - virtual int register_handler_i (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); - - - /// Remove the associated with this . - virtual int remove_handler_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask); - - /// Remove a set of . - virtual int remove_handler_i (const ACE_Handle_Set &handles, - ACE_Reactor_Mask mask); - - /// Wait for events to occur. - virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set, - ACE_Time_Value *max_wait_time); - - virtual int QtWaitForMultipleEvents (int width, - ACE_Select_Reactor_Handle_Set &wait_set, - ACE_Time_Value *max_wait_time); - - // Wait for Qt events to occur - - /// Some Qt stuff that we need to have - QApplication *qapp_ ; - - /// Typedef of a map. - typedef ACE_Map_Manager MAP; - - /// A notifier for a read - MAP read_notifier_; - - /// A write notifier - MAP write_notifier_; - - /// An exception notifier - MAP exception_notifier_; - - /// The timer class that would provide timer-sgnals & single-shot timers - QTimer *qtime_ ; - - private: - /// This method ensures there's an Qt timeout for the first timeout - /// in the Reactor's Timer_Queue. - void reset_timeout (void); - - /// Deny access since member-wise won't work... - ACE_QtReactor (const ACE_QtReactor &); - ACE_QtReactor &operator= (const ACE_QtReactor &); - - private slots: - - // These are all part of the communication mechanism adopted in Qt. - /// Dispatch a Read Event - void read_event (int FD); - - /// Dispatch a Write Event - void write_event (int FD); - - /// Dispatch an exception event - void exception_event (int FD); - - /// Dispach a timeout event - void timeout_event (void); -}; - -#endif /*ACE_HAS_QT */ - -#include "ace/post.h" -#endif /* ACE_QTREACTOR_H */ diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp deleted file mode 100644 index 9d9bc2d9b94..00000000000 --- a/ace/RB_Tree.cpp +++ /dev/null @@ -1,1126 +0,0 @@ -// $Id$ - -// RB_Tree.cpp - -#ifndef ACE_RB_TREE_C -#define ACE_RB_TREE_C - -#include "ace/RB_Tree.h" -#include "ace/SString.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/RB_Tree.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, RB_Tree, "$Id$") - -// Constructor. - -template -ACE_RB_Tree_Node::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t) - : k_ (k), - t_ (t), - color_ (RED), - parent_ (0), - left_ (0), - right_ (0) -{ - ACE_TRACE ("ACE_RB_Tree_Node::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t)"); -} - - -// Destructor. - -template -ACE_RB_Tree_Node::~ACE_RB_Tree_Node (void) -{ - ACE_TRACE ("ACE_RB_Tree_Node::~ACE_RB_Tree_Node"); - - // Delete left sub-tree. - delete left_; - - // Delete right sub_tree. - delete right_; -} - -// Constructor. - -template -ACE_RB_Tree::ACE_RB_Tree (ACE_Allocator *alloc) - : allocator_ (alloc), - root_ (0), - current_size_ (0) -{ - ACE_TRACE ("ACE_RB_Tree::" - "ACE_RB_Tree (ACE_Allocator *alloc)"); - if (this->open (alloc) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n"))); -} - -// Copy constructor. - -template -ACE_RB_Tree::ACE_RB_Tree (const ACE_RB_Tree &rbt) - : allocator_ (rbt.allocator_), - root_ (0), - current_size_ (0) -{ - ACE_TRACE ("ACE_RB_Tree::" - "ACE_RB_Tree (const ACE_RB_Tree &rbt)"); - ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_); - - // Make a deep copy of the passed tree. - ACE_RB_Tree_Iterator iter(rbt); - - for (iter.first (); - - iter.is_done () == 0; iter.next ()) - insert_i (*(iter.key ()), - *(iter.item ())); -} - -// Destructor. - -template -ACE_RB_Tree::~ACE_RB_Tree () -{ - ACE_TRACE ("ACE_RB_Tree::~ACE_RB_Tree"); - - // Use the locked public method, to be totally safe, as the class - // can be used with an allocator and placement new. - this->close (); -} - -// Assignment operator. - -template void -ACE_RB_Tree::operator = (const ACE_RB_Tree &rbt) -{ - ACE_TRACE ("ACE_RB_Tree::operator ="); - ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_); - - if (this != &rbt) - { - // Clear out the existing tree. - close_i (); - - // Make a deep copy of the passed tree. - ACE_RB_Tree_Iterator iter(rbt); - - for (iter.first (); - iter.is_done () == 0; - iter.next ()) - insert_i (*(iter.key ()), - *(iter.item ())); - - // Use the same allocator as the rhs. - allocator_ = rbt.allocator_; - } -} -// Less than comparison function for keys, default functor -// implementation returns 1 if k1 < k2, 0 otherwise. - -template int -ACE_RB_Tree::lessthan (const EXT_ID &k1, const EXT_ID &k2) -{ - ACE_TRACE ("ACE_RB_Tree::lessthan"); - return this->compare_keys_ (k1, k2); -} - -// Method for right rotation of the tree about a given node. - -template void -ACE_RB_Tree::RB_rotate_right (ACE_RB_Tree_Node *x) -{ - ACE_TRACE ("ACE_RB_Tree::RB_rotate_right"); - - if (!x) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: x is a null pointer in ") - ACE_LIB_TEXT ("ACE_RB_Tree::RB_rotate_right\n"))); - else if (! (x->left())) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: x->left () is a null pointer in ") - ACE_LIB_TEXT ("ACE_RB_Tree::RB_rotate_right\n"))); - else - { - ACE_RB_Tree_Node * y; - y = x->left (); - x->left (y->right ()); - if (y->right ()) - y->right ()->parent (x); - y->parent (x->parent ()); - if (x->parent ()) - { - if (x == x->parent ()->right ()) - x->parent ()->right (y); - else - x->parent ()->left (y); - } - else - root_ = y; - y->right (x); - x->parent (y); - } -} - -// Method for left rotation of the tree about a given node. - -template void -ACE_RB_Tree::RB_rotate_left (ACE_RB_Tree_Node * x) -{ - ACE_TRACE ("ACE_RB_Tree::RB_rotate_left"); - - if (! x) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: x is a null pointer in ") - ACE_LIB_TEXT ("ACE_RB_Tree::RB_rotate_left\n"))); - else if (! (x->right())) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: x->right () is a null pointer ") - ACE_LIB_TEXT ("in ACE_RB_Tree::RB_rotate_left\n"))); - else - { - ACE_RB_Tree_Node * y; - y = x->right (); - x->right (y->left ()); - if (y->left ()) - y->left ()->parent (x); - y->parent (x->parent ()); - if (x->parent ()) - { - if (x == x->parent ()->left ()) - x->parent ()->left (y); - else - x->parent ()->right (y); - } - else - root_ = y; - y->left (x); - x->parent (y); - } -} - -// Method for restoring Red-Black properties after a specific deletion case. - -template void -ACE_RB_Tree:: -RB_delete_fixup (ACE_RB_Tree_Node *x, - ACE_RB_Tree_Node *parent) -{ - ACE_TRACE ("ACE_RB_Tree::RB_delete_fixup"); - - while (x != this->root_ - && (!x - || x->color () == ACE_RB_Tree_Node_Base::BLACK)) - { - if (x == parent->left ()) - { - ACE_RB_Tree_Node *w = parent->right (); - if (w && w->color () == ACE_RB_Tree_Node_Base::RED) - { - w->color (ACE_RB_Tree_Node_Base::BLACK); - parent->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_left (parent); - w = parent->right (); - } - // CLR pp. 263 says that nil nodes are implicitly colored BLACK - if (w - && (!w->left () - || w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) - && (!w->right () - || w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)) - { - w->color (ACE_RB_Tree_Node_Base::RED); - x = parent; - parent = x->parent (); - } - else - { - // CLR pp. 263 says that nil nodes are implicitly colored BLACK - if (w - && (!w->right () - || w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)) - { - if (w->left ()) - w->left ()->color (ACE_RB_Tree_Node_Base::BLACK); - w->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_right (w); - w = parent->right (); - } - if (w) - { - w->color (parent->color ()); - if (w->right ()) - w->right ()->color (ACE_RB_Tree_Node_Base::BLACK); - } - parent->color (ACE_RB_Tree_Node_Base::BLACK); - RB_rotate_left (parent); - x = root_; - } - } - else - { - ACE_RB_Tree_Node *w = parent->left (); - if (w && w->color () == ACE_RB_Tree_Node_Base::RED) - { - w->color (ACE_RB_Tree_Node_Base::BLACK); - parent->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_right (parent); - w = parent->left (); - } - // CLR pp. 263 says that nil nodes are implicitly colored BLACK - if (w - && (!w->left () - || w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) - && (!w->right () - || w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)) - { - w->color (ACE_RB_Tree_Node_Base::RED); - x = parent; - parent = x->parent (); - } - else - { - // CLR pp. 263 says that nil nodes are implicitly colored BLACK - if (w - && (!w->left () - || w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK)) - { - w->color (ACE_RB_Tree_Node_Base::RED); - if (w->right ()) - w->right ()->color (ACE_RB_Tree_Node_Base::BLACK); - RB_rotate_left (w); - w = parent->left (); - } - if (w) - { - w->color (parent->color ()); - if (w->left ()) - w->left ()->color (ACE_RB_Tree_Node_Base::BLACK); - } - parent->color (ACE_RB_Tree_Node_Base::BLACK); - RB_rotate_right (parent); - x = root_; - } - } - } - - if (x) - x->color (ACE_RB_Tree_Node_Base::BLACK); -} - -// Return a pointer to a matching node if there is one, a pointer to -// the node under which to insert the item if the tree is not empty -// and there is no such match, or 0 if the tree is empty. - -template ACE_RB_Tree_Node * -ACE_RB_Tree::find_node (const EXT_ID &k, ACE_RB_Tree_Base::RB_SearchResult &result) -{ - ACE_TRACE ("ACE_RB_Tree::find_node"); - - // Start at the root. - ACE_RB_Tree_Node *current = root_; - - while (current) - { - // While there are more nodes to examine. - if (this->lessthan (current->key (), k)) - { - // If the search key is greater than the current node's key. - if (current->right ()) - // If the right subtree is not empty, search to the right. - current = current->right (); - else - { - // If the right subtree is empty, we're done searching, - // and are positioned to the left of the insertion point. - result = LEFT; - break; - } - } - else if (this->lessthan (k, current->key ())) - { - // Else if the search key is less than the current node's key. - if (current->left ()) - // If the left subtree is not empty, search to the left. - current = current->left (); - else - { - // If the left subtree is empty, we're done searching, - // and are positioned to the right of the insertion point. - result = RIGHT; - break; - } - } - else - { - // If the keys match exactly, we're done as well. - result = EXACT; - break; - } - } - - return current; -} - -// Rebalance the tree after insertion of a node. - -template void -ACE_RB_Tree::RB_rebalance (ACE_RB_Tree_Node * x) -{ - ACE_TRACE ("ACE_RB_Tree::RB_rebalance"); - - ACE_RB_Tree_Node *y = 0; - - while (x && - x->parent () - && x->parent ()->color () == ACE_RB_Tree_Node_Base::RED) - { - if (! x->parent ()->parent ()) - { - // If we got here, something is drastically wrong! - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: parent's parent is null in ") - ACE_LIB_TEXT ("ACE_RB_Tree::RB_rebalance\n"))); - return; - } - - if (x->parent () == x->parent ()->parent ()->left ()) - { - y = x->parent ()->parent ()->right (); - if (y && y->color () == ACE_RB_Tree_Node_Base::RED) - { - // Handle case 1 (see CLR book, pp. 269). - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - y->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); - x = x->parent ()->parent (); - } - else - { - if (x == x->parent ()->right ()) - { - // Transform case 2 into case 3 (see CLR book, pp. 269). - x = x->parent (); - RB_rotate_left (x); - } - - // Handle case 3 (see CLR book, pp. 269). - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_right (x->parent ()->parent ()); - } - } - else - { - y = x->parent ()->parent ()->left (); - if (y && y->color () == ACE_RB_Tree_Node_Base::RED) - { - // Handle case 1 (see CLR book, pp. 269). - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - y->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); - x = x->parent ()->parent (); - } - else - { - if (x == x->parent ()->left ()) - { - // Transform case 2 into case 3 (see CLR book, pp. 269). - x = x->parent (); - RB_rotate_right (x); - } - - // Handle case 3 (see CLR book, pp. 269). - x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK); - x->parent ()->parent ()->color (ACE_RB_Tree_Node_Base::RED); - RB_rotate_left (x->parent ()->parent ()); - } - } - } -} - -// Method to find the successor node of the given node in the tree. - -template ACE_RB_Tree_Node * -ACE_RB_Tree::RB_tree_successor (ACE_RB_Tree_Node *x) const -{ - ACE_TRACE ("ACE_RB_Tree::RB_tree_successor"); - - if (x == 0) - return 0; - - if (x->right ()) - return RB_tree_minimum (x->right ()); - - ACE_RB_Tree_Node *y = x->parent (); - while ((y) && (x == y->right ())) - { - x = y; - y = y->parent (); - } - - return y; -} - -// Method to find the predecessor node of the given node in the tree. - -template ACE_RB_Tree_Node * -ACE_RB_Tree::RB_tree_predecessor (ACE_RB_Tree_Node *x) const -{ - ACE_TRACE ("ACE_RB_Tree::RB_tree_predecessor"); - if (x == 0) - return 0; - - if (x->left ()) - return RB_tree_maximum (x->left ()); - - ACE_RB_Tree_Node *y = x->parent (); - - while ((y) && (x == y->left ())) - { - x = y; - y = y->parent (); - } - - return y; -} - -// Method to find the minimum node of the subtree rooted at the given node. - -template ACE_RB_Tree_Node * -ACE_RB_Tree::RB_tree_minimum (ACE_RB_Tree_Node *x) const -{ - ACE_TRACE ("ACE_RB_Tree::RB_tree_minimum"); - - while ((x) && (x->left ())) - x = x->left (); - - return x; -} - -// Method to find the maximum node of the subtree rooted at the given node. - -template ACE_RB_Tree_Node * -ACE_RB_Tree::RB_tree_maximum (ACE_RB_Tree_Node *x) const -{ - ACE_TRACE ("ACE_RB_Tree::RB_tree_maximum"); - - while ((x) && (x->right ())) - x = x->right (); - - return x; -} - -// Close down an RB_Tree. this method should only be called with -// locks already held. - -template int -ACE_RB_Tree::close_i () -{ - ACE_TRACE ("ACE_RB_Tree::close_i"); - - delete root_; - current_size_ = 0; - root_ = 0; - - return 0; -} - -// Returns a pointer to the item corresponding to the given key, or 0 -// if it cannot find the key in the tree. This method should only be -// called with locks already held. - -template int -ACE_RB_Tree::find_i (const EXT_ID &k, - ACE_RB_Tree_Node* &entry, int find_exact) -{ - ACE_TRACE ("ACE_RB_Tree::find_i"); - - // Try to find a match. - RB_SearchResult result = LEFT; - ACE_RB_Tree_Node *current = find_node (k, result); - - if (current) - { - // Found a match - if (!find_exact || result == EXACT) - entry = current; // Assign the entry for any match. - return (result == EXACT ? 0 : -1); - } - else - // The node is not there. - return -1; -} - -// Inserts a *copy* of the key and the item into the tree: both the -// key type EXT_ID and the item type INT_ID must have well defined -// semantics for copy construction and < comparison. This method -// returns a pointer to the inserted item copy, or 0 if an error -// occurred. NOTE: if an identical key already exists in the tree, no -// new item is created, and the returned pointer addresses the -// existing item associated with the existing key. This method should -// only be called with locks already held. - -template INT_ID * -ACE_RB_Tree::insert_i (const EXT_ID &k, const INT_ID &t) -{ - ACE_TRACE ("ACE_RB_Tree::insert_i (const EXT_ID &k, const INT_ID &t)"); - - // Find the closest matching node, if there is one. - RB_SearchResult result = LEFT; - ACE_RB_Tree_Node *current = find_node (k, result); - if (current) - { - // If the keys match, just return a pointer to the node's item. - if (result == EXACT) - return ¤t->item (); - - // Otherwise if we're to the left of the insertion point, insert - // into the right subtree. - else if (result == LEFT) - { - if (current->right ()) - { - // If there is already a right subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nright subtree already present in ") - ACE_LIB_TEXT ("ACE_RB_Tree::insert_i\n")), - 0); - } - else - { - // The right subtree is empty: insert new node there. - ACE_RB_Tree_Node *tmp = 0; - - ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node) (k, t), - 0); - current->right (tmp); - - // If the node was successfully inserted, set its - // parent, rebalance the tree, color the root black, and - // return a pointer to the inserted item. - INT_ID *item = &(current->right ()->item ()); - current->right ()->parent (current); - RB_rebalance (current->right ()); - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - return item; - } - } - // Otherwise, we're to the right of the insertion point, so - // insert into the left subtree. - else // (result == RIGHT) - { - if (current->left ()) - // If there is already a left subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nleft subtree already present in ") - ACE_LIB_TEXT ("ACE_RB_Tree::insert_i\n")), - 0); - else - { - // The left subtree is empty: insert new node there. - ACE_RB_Tree_Node *tmp = 0; - ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node) (k, t), - 0); - current->left (tmp); - - // If the node was successfully inserted, set its - // parent, rebalance the tree, color the root black, and - // return a pointer to the inserted item. - INT_ID *item = ¤t->left ()->item (); - current->left ()->parent (current); - RB_rebalance (current->left ()); - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - return item; - } - } - } - else - { - // The tree is empty: insert at the root and color the root - // black. - ACE_NEW_RETURN (root_, - (ACE_RB_Tree_Node) (k, t), - 0); - if (root_) - { - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - return &root_->item (); - } - } - return 0; -} - -// Inserts a *copy* of the key and the item into the tree: both the -// key type EXT_ID and the item type INT_ID must have well defined -// semantics for copy construction. The default implementation also -// requires that the key type support well defined < semantics. This -// method passes back a pointer to the inserted (or existing) node, -// and the search status. If the node already exists, the method -// returns 1. If the node does not exist, and a new one is -// successfully created, and the method returns 0. If there was an -// error, the method returns -1. - -template int -ACE_RB_Tree::insert_i (const EXT_ID &k, - const INT_ID &t, - ACE_RB_Tree_Node *&entry) -{ - ACE_TRACE ("ACE_RB_Tree::insert_i (const EXT_ID &k, const INT_ID &t, " - "ACE_RB_Tree_Node *&entry)"); - - // Find the closest matching node, if there is one. - RB_SearchResult result = LEFT; - ACE_RB_Tree_Node *current = find_node (k, result); - if (current) - { - // If the keys match, just return a pointer to the node's item. - if (result == EXACT) - { - entry = current; - return 1; - } - // Otherwise if we're to the left of the insertion - // point, insert into the right subtree. - else if (result == LEFT) - { - if (current->right ()) - { - // If there is already a right subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nright subtree already present in ") - ACE_LIB_TEXT ("ACE_RB_Tree::insert_i\n")), - -1); - } - else - { - // The right subtree is empty: insert new node there. - ACE_RB_Tree_Node *tmp = 0; - ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node) (k, t), - -1); - current->right (tmp); - - // If the node was successfully inserted, set its parent, rebalance - // the tree, color the root black, and return a pointer to the - // inserted item. - entry = current->right (); - current->right ()->parent (current); - RB_rebalance (current->right ()); - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - return 0; - } - } - // Otherwise, we're to the right of the insertion point, so - // insert into the left subtree. - else // (result == RIGHT) - { - if (current->left ()) - // If there is already a left subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nleft subtree already present in ") - ACE_LIB_TEXT ("ACE_RB_Tree::insert_i\n")), - -1); - else - { - // The left subtree is empty: insert new node there. - ACE_RB_Tree_Node *tmp = 0; - ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node) (k, t), - -1); - current->left (tmp); - // If the node was successfully inserted, set its - // parent, rebalance the tree, color the root black, and - // return a pointer to the inserted item. - entry = current->left (); - current->left ()->parent (current); - RB_rebalance (current->left ()); - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - return 0; - } - } - } - else - { - // The tree is empty: insert at the root and color the root black. - ACE_NEW_RETURN (root_, - (ACE_RB_Tree_Node) (k, t), - -1); - root_->color (ACE_RB_Tree_Node_Base::BLACK); - ++current_size_; - entry = root_; - return 0; - } -} - -// Removes the item associated with the given key from the tree and -// destroys it. Returns 1 if it found the item and successfully -// destroyed it, 0 if it did not find the item, or -1 if an error -// occurred. This method should only be called with locks already -// held. - -template int -ACE_RB_Tree::remove_i (const EXT_ID &k, INT_ID &i) -{ - ACE_TRACE ("ACE_RB_Tree::remove_i (const EXT_ID &k, INT_ID &i)"); - - // Find a matching node, if there is one. - ACE_RB_Tree_Node *z; - RB_SearchResult result = LEFT; - z = find_node (k, result); - - // If there is a matching node: remove and destroy it. - if (z && result == EXACT) - { - // Return the internal id stored in the deleted node. - i = z->item (); - return -1 == this->remove_i (z) ? -1 : 1; - } - else - { - // No matching node was found: return 0. - return 0; - } -} - -/// Recursive function to dump the state of an object. -template void -ACE_RB_Tree:: -dump_i (ACE_RB_Tree_Node *node) const -{ - if (node) - { - dump_node_i (*node); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ndown left\n"))); - this->dump_i (node->left ()); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nup left\n"))); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ndown right\n"))); - this->dump_i (node->right ()); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nup right\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nNULL POINTER (BLACK)\n"))); - } -} - - -/// Function to dump node itself. Does not show parameterized node contents -/// in its basic form, but template specialization can be used to -/// provide definitions for various EXT_ID and INT_ID types. - -template void -ACE_RB_Tree:: -dump_node_i (ACE_RB_Tree_Node &node) const -{ - const char * color_str = (node.color () == ACE_RB_Tree_Node_Base::RED) - ? "RED" : "BLACK"; - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" color=[%s]\n"), color_str)); -} - -/// Tests the red-black invariant(s) throughout the whole tree. - -template int -ACE_RB_Tree::test_invariant (void) -{ - ACE_TRACE ("ACE_RB_Tree::test_invariant"); - ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - // Recurse from the root, starting with the measured black height at - // 0, and the expected black height at -1, which will cause the - // count from first measured path to a leaf to be used as the - // expected one from that point onward (the key is to check - // consistency). - int expected_black_height = -1; - if (this->test_invariant_recurse (this->root_, expected_black_height, 0) == 0) - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("invariant holds\n"))); - return 0; - } - - return -1; -} - -/// Recursive function to test the red-black invariant(s) at all nodes in a subtree. - -template int -ACE_RB_Tree::test_invariant_recurse (ACE_RB_Tree_Node *x, - int & expected_black_height, - int measured_black_height) -{ - ACE_TRACE ("ACE_RB_Tree::test_invariant_recurse"); - - if (!x) - { - // Count each leaf (zero pointer) as a black node (per CLR algorithm description). - ++measured_black_height; - - if (expected_black_height == -1) - { - expected_black_height = measured_black_height; - } - else if (expected_black_height != measured_black_height) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("\nexpected_black_height = %d but ") - ACE_LIB_TEXT ("\nmeasured_black_height = %d in ") - ACE_LIB_TEXT ("ACE_RB_Tree::test_invariant_recurse\n"), - expected_black_height, measured_black_height), - -1); - } - - return 0; - } - - // Check the invariant that a red node cannot have a red child. - if (x->color () == ACE_RB_Tree_Node_Base::RED) - { - if (x->left () && x->left ()->color () == ACE_RB_Tree_Node_Base::RED) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nRED parent has RED left child in ") - ACE_LIB_TEXT ("ACE_RB_Tree::test_invariant_recurse\n")), - -1); - } - - if (x->right () && x->right ()->color () == ACE_RB_Tree_Node_Base::RED) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nRED parent has RED right child in ") - ACE_LIB_TEXT ("ACE_RB_Tree::test_invariant_recurse\n")), - -1); - } - } - else - { - // Count each black node traversed. - ++measured_black_height; - } - - return (test_invariant_recurse (x->left (), expected_black_height, measured_black_height) == 0) - ? test_invariant_recurse (x->right (), expected_black_height, measured_black_height) - : -1; -} - -template int -ACE_RB_Tree::remove_i (ACE_RB_Tree_Node *z) -{ - ACE_TRACE ("ACE_RB_Tree::remove_i (ACE_RB_Tree_Node *z)"); - - // Delete the node and reorganize the tree to satisfy the Red-Black - // properties. - - ACE_RB_Tree_Node *x; - ACE_RB_Tree_Node *y; - ACE_RB_Tree_Node *parent; - - if (z->left () && z->right ()) - y = RB_tree_successor (z); - else - y = z; - - if (y->left ()) - x = y->left (); - else - x = y->right (); - - parent = y->parent (); - if (x) - { - x->parent (parent); - } - - if (parent) - { - if (y == parent->left ()) - parent->left (x); - else - parent->right (x); - } - else - this->root_ = x; - - if (y != z) - { - // Copy the elements of y into z. - z->key () = y->key (); - z->item () = y->item (); - } - - // CLR pp. 263 says that nil nodes are implicitly colored BLACK - if (!y || y->color () == ACE_RB_Tree_Node_Base::BLACK) - RB_delete_fixup (x, parent); - - y->parent (0); - y->right (0); - y->left (0); - delete y; - --current_size_; - - return 0; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Iterator_Base) - -// Constructor. - -template -ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree &tree, int set_first) - : tree_ (&tree), node_ (0) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base (ACE_RB_Tree, int)"); - - // Position the iterator at the first (or last) node in the tree. - if (set_first) - node_ = tree_->RB_tree_minimum (tree_->root_); - else - node_ = tree_->RB_tree_maximum (tree_->root_); -} - -template -ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree &tree, ACE_RB_Tree_Node* entry) - : tree_ (&tree), node_ (0) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base(const ACE_RB_Tree &tree, ACE_RB_Tree_Node* entry)"); - node_ = entry; -} - -template -ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base (const EXT_ID& key,ACE_RB_Tree &tree) - : tree_ (&tree), node_ (0) -{ - ACE_TRACE("ACE_RB_Tree_Iterator_Base (ACE_RB_Tree &tree, const EXT_ID& key)"); - ACE_RB_Tree_Node* entry; - tree.find_i(key, entry); - node_ = entry; -} - -// Copy constructor. - -template -ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base &iter) - : tree_ (iter.tree_), - node_ (iter.node_) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base (ACE_RB_Tree_Iterator_Base)"); -} - -// Assignment operator. - -template void -ACE_RB_Tree_Iterator_Base::operator= (const ACE_RB_Tree_Iterator_Base &iter) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::operator="); - if (this != &iter) - { - tree_ = iter.tree_; - node_ = iter.node_; - } -} - -// Destructor. - -template -ACE_RB_Tree_Iterator_Base::~ACE_RB_Tree_Iterator_Base () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::~ACE_RB_Tree_Iterator_Base"); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Iterator) - -// Constructor. - -template -ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator (const ACE_RB_Tree &tree, - int set_first) - : ACE_RB_Tree_Iterator_Base (tree, set_first) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator"); -} - -template -ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator (const ACE_RB_Tree &tree, - ACE_RB_Tree_Node* entry) - : ACE_RB_Tree_Iterator_Base (tree,entry) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator"); -} - -template -ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator (const EXT_ID& key,ACE_RB_Tree &tree) - : ACE_RB_Tree_Iterator_Base(key,tree) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator"); -} - -// Destructor. - -template -ACE_RB_Tree_Iterator::~ACE_RB_Tree_Iterator () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::~ACE_RB_Tree_Iterator"); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Reverse_Iterator) - -// Constructor. - -template -ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator (const ACE_RB_Tree &tree, int set_last) - : ACE_RB_Tree_Iterator_Base (tree, set_last ? 0 : 1) -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator"); -} - -template -ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator (const ACE_RB_Tree &tree, ACE_RB_Tree_Node* entry) - : ACE_RB_Tree_Iterator_Base (tree,entry) -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator"); -} - -template -ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator (const EXT_ID& key,ACE_RB_Tree &tree) - : ACE_RB_Tree_Iterator_Base(key,tree) -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator"); -} - -// Destructor. - -template -ACE_RB_Tree_Reverse_Iterator::~ACE_RB_Tree_Reverse_Iterator () -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::~ACE_RB_Tree_Reverse_Iterator"); -} - - -#endif /* !defined (ACE_RB_TREE_C) */ diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h deleted file mode 100644 index 26dd97e2fb1..00000000000 --- a/ace/RB_Tree.h +++ /dev/null @@ -1,863 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file RB_Tree.h - * - * $Id$ - * - * @author Chris Gill - */ -//============================================================================= - - -#ifndef ACE_RB_TREE_H -#define ACE_RB_TREE_H -#include "ace/pre.h" - -#include "ace/Global_Macros.h" -#include "ace/Functor.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward decl. -template -class ACE_RB_Tree_Iterator_Base; - -// Forward decl. -template -class ACE_RB_Tree_Iterator; - -// Forward decl. -template -class ACE_RB_Tree_Reverse_Iterator; - -// Forward decl. -class ACE_Allocator; - -class ACE_RB_Tree_Node_Base -{ -public: - enum RB_Tree_Node_Color {RED, BLACK}; -}; - -/** - * @class ACE_RB_Tree_Node - * - * @brief Implements a node in a Red-Black Tree ADT. - */ -template -class ACE_RB_Tree_Node : public ACE_RB_Tree_Node_Base -{ -public: - // = Initialization and termination methods. - - /// Constructor. - ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t); - - /// Destructor. - ~ACE_RB_Tree_Node (void); - - /// Key accessor. - EXT_ID &key (void); - - /// Item accessor. - INT_ID &item (void); - - /// Set color of the node. - void color (RB_Tree_Node_Color c); - - /// Get color of the node. - RB_Tree_Node_Color color (void); - - /// Accessor for node's parent pointer. - ACE_RB_Tree_Node *parent (void); - - /// Mutator for node's parent pointer. - void parent (ACE_RB_Tree_Node * p); - - /// Accessor for node's left child pointer. - ACE_RB_Tree_Node *left (void); - - /// Mutator for node's left child pointer. - void left (ACE_RB_Tree_Node *l); - - /// Accessor for node's right child pointer. - ACE_RB_Tree_Node *right (void); - - /// Mutator for node's right child pointer - void right (ACE_RB_Tree_Node * r); - -private: - - /// The key. - EXT_ID k_; - - /// The item. - INT_ID t_; - - /// Color of the node. - RB_Tree_Node_Color color_; - - /// Pointer to node's parent. - ACE_RB_Tree_Node *parent_; - - /// Pointer to node's left child. - ACE_RB_Tree_Node *left_; - - /// Pointer to node's right child. - ACE_RB_Tree_Node *right_; -}; - -class ACE_RB_Tree_Base -{ -public: - /// Search result enumeration. - enum RB_SearchResult {LEFT, EXACT, RIGHT}; -}; - -/** - * @class ACE_RB_Tree - * - * @brief Implements a Red-Black Tree ADT, according to T. H. Corman, - * C. E. Leiserson, and R. L. Rivest, "Introduction to Algorithms" - * 1990, MIT, chapter 14. - * - * A number of Changes have been made to this class template - * in order to conform to the ACE_Hash_Map_Manager_Ex - * interface. All previously supported public methods are - * still part of this class. However, these are marked as - * DEPRECATED and will be removed from this class in - * a future version of ACE. Please migrate your code - * to the appropriate public methods indicated in the - * method deprecation comments. - * This class uses an to allocate memory. The - * user can make this a persistent class by providing an - * with a persistable memory pool. - * - * Requirements and Performance Characteristics - * - Internal Structure: - * Binary tree - * - Duplicates allowed? - * No - * - Random access allowed? - * No - * - Search speed: - * Log(n) - * - Insert/replace speed: - * Log(n) - * - Iterator still valid after change to container? - * Yes, except if the iterated-over element is removed. - * - Frees memory for removed elements? - * Yes - * - Items inserted by: - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * -# operator== - * -# operator< - */ -template -class ACE_RB_Tree : public ACE_RB_Tree_Base -{ - -public: - friend class ACE_RB_Tree_Iterator_Base; - friend class ACE_RB_Tree_Iterator; - friend class ACE_RB_Tree_Reverse_Iterator; - - typedef EXT_ID KEY; - typedef INT_ID VALUE; - typedef ACE_RB_Tree_Node ENTRY; - - // = ACE-style iterator typedefs. - typedef ACE_RB_Tree_Iterator ITERATOR; - typedef ACE_RB_Tree_Reverse_Iterator REVERSE_ITERATOR; - - // = STL-style iterator typedefs. - typedef ACE_RB_Tree_Iterator iterator; - typedef ACE_RB_Tree_Reverse_Iterator reverse_iterator; - - // = Initialization and termination methods. - - /// Constructor. - ACE_RB_Tree (ACE_Allocator *alloc = 0); - - /// Copy constructor. - ACE_RB_Tree (const ACE_RB_Tree &rbt); - - /// Initialize an RB Tree. - int open (ACE_Allocator *alloc = 0); - - /// Close down an RB_Tree and release dynamically allocated - /// resources. - int close (void); - - /// Destructor. - virtual ~ACE_RB_Tree (void); - - // = insertion, removal, and search methods. - - /** - * Associate with . If is already in the - * tree then the is not changed. Returns 0 if a - * new entry is bound successfully, returns 1 if an attempt is made - * to bind an existing entry, and returns -1 if failures occur. - */ - int bind (const EXT_ID &item, - const INT_ID &int_id); - - /** - * Same as a normal bind, except the tree entry is also passed back - * to the caller. The entry in this case will either be the newly - * created entry, or the existing one. - */ - int bind (const EXT_ID &ext_id, - const INT_ID &int_id, - ACE_RB_Tree_Node *&entry); - - - /** - * Associate with if and only if is not - * in the tree. If is already in the tree then the - * parameter is assigned the existing value in the tree. Returns 0 - * if a new entry is bound successfully, returns 1 if an attempt is - * made to bind an existing entry, and returns -1 if failures occur. - */ - int trybind (const EXT_ID &ext_id, - INT_ID &int_id); - - /** - * Same as a normal trybind, except the tree entry is also passed - * back to the caller. The entry in this case will either be the - * newly created entry, or the existing one. - */ - int trybind (const EXT_ID &ext_id, - INT_ID &int_id, - ACE_RB_Tree_Node *&entry); - - /** - * Reassociate with . If is not in the - * tree then behaves just like . Returns 0 if a new entry is - * bound successfully, returns 1 if an existing entry was rebound, - * and returns -1 if failures occur. - */ - int rebind (const EXT_ID &ext_id, - const INT_ID &int_id); - - /** - * Same as a normal rebind, except the tree entry is also passed back - * to the caller. The entry in this case will either be the newly - * created entry, or the existing one. - */ - int rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - ACE_RB_Tree_Node *&entry); - - /** - * Associate with . If is not in the tree - * then behaves just like . Otherwise, store the old value of - * into the "out" parameter and rebind the new parameters. - * Returns 0 if a new entry is bound successfully, returns 1 if an - * existing entry was rebound, and returns -1 if failures occur. - */ - int rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - INT_ID &old_int_id); - - /** - * Same as a normal rebind, except the tree entry is also passed back - * to the caller. The entry in this case will either be the newly - * created entry, or the existing one. - */ - int rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - INT_ID &old_int_id, - ACE_RB_Tree_Node *&entry); - - /** - * Associate with . If is not in the tree - * then behaves just like . Otherwise, store the old values - * of and into the "out" parameters and rebind the - * new parameters. This is very useful if you need to have an - * atomic way of updating and you also need - * full control over memory allocation. Returns 0 if a new entry is - * bound successfully, returns 1 if an existing entry was rebound, - * and returns -1 if failures occur. - */ - int rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - EXT_ID &old_ext_id, - INT_ID &old_int_id); - - /** - * Same as a normal rebind, except the tree entry is also passed back - * to the caller. The entry in this case will either be the newly - * created entry, or the existing one. - */ - int rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - EXT_ID &old_ext_id, - INT_ID &old_int_id, - ACE_RB_Tree_Node *&entry); - - /// Locate and pass out parameter via . If found, - /// return 0, returns -1 if not found. - int find (const EXT_ID &ext_id, - INT_ID &int_id); - - /// Locate and pass out parameter via . If found, - /// return 0, returns -1 if not found. - int find (const EXT_ID &ext_id, - ACE_RB_Tree_Node *&entry); - - /** - * Unbind (remove) the from the tree. Don't return the - * to the caller (this is useful for collections where the - * s are *not* dynamically allocated...) - */ - int unbind (const EXT_ID &ext_id); - - /// Break any association of . Returns the value of - /// in case the caller needs to deallocate memory. - int unbind (const EXT_ID &ext_id, - INT_ID &int_id); - - /** - * Remove entry from tree. This method should be used with *extreme* - * caution, and only for optimization purposes. The node being passed - * in had better have been allocated by the tree that is unbinding it. - */ - int unbind (ACE_RB_Tree_Node *entry); - - // = Public helper methods. - - /// Returns the current number of nodes in the tree. - size_t current_size (void) const; - - /// Assignment operator. - void operator= (const ACE_RB_Tree &rbt); - - /// Less than comparison function for keys, using comparison functor. - virtual int lessthan (const EXT_ID &k1, const EXT_ID &k2); - - /** - * Returns a reference to the underlying . This makes it - * possible to acquire the lock explicitly, which can be useful in - * some cases if you instantiate the with an - * or , or if you need to - * guard the state of an iterator. NOTE: the right name would be - * , but HP/C++ will choke on that! - */ - ACE_LOCK &mutex (void); - - /// Dump the state of an object. - void dump (void) const; - - // = STL styled iterator factory functions. - - /// Return forward iterator positioned at first node in tree. - ACE_RB_Tree_Iterator begin (void); - - /// Return forward iterator positioned at last node in tree. - ACE_RB_Tree_Iterator end (void); - - /// Return reverse iterator positioned at last node in tree. - ACE_RB_Tree_Reverse_Iterator rbegin (void); - - /// Return reverse iterator positioned at first node in tree. - ACE_RB_Tree_Reverse_Iterator rend (void); - - /// Recursively tests the invariant red-black properties at each - /// node of the tree. Returns 0 if invariant holds, else -1. - /// This method is computationally expensive, and should only be - /// called for testing purposes, and not in code that depends on the - /// algorithmic complexity bounds provided by the other methods. - int test_invariant (void); - - // = DEPRECATED methods. - // Please migrate your code to use the new methods instead - - /** - * Returns a pointer to the item corresponding to the - * given key, or 0 if it cannot find the key in the tree. - * - * @deprecated signature will change to become - * int find (const EXT_ID &ext_id); which will return - * 0 if the is in the tree, otherwise -1. - */ - INT_ID* find (const EXT_ID &k); - - /** - * Inserts a *copy* of the key and the item into the tree: both the - * key type EXT_ID and the item type INT_ID must have well defined semantics - * for copy construction. The default implementation also requires that - * the key type support well defined < semantics. This method returns a - * pointer to the inserted item copy, or 0 if an error occurred. - * NOTE: if an identical key already exists in the tree, no new item - * is created, and the returned pointer addresses the existing item - * associated with the existing key. - * @deprecated - */ - INT_ID* insert (const EXT_ID &k, const INT_ID &t); - - /** - * Removes the item associated with the given key from the tree and - * destroys it. Returns 1 if it found the item and successfully - * destroyed it, 0 if it did not find the item, or -1 if an error - * occurred. - * @deprecated - */ - int remove (const EXT_ID &k); - - /// @deprecated - /// Destroys all nodes and sets the root pointer null. - void clear (void); - -protected: - - // = Protected methods. These should only be called with locks held. - - /// Recursively tests the invariant red-black properties at each - /// node of the tree. Returns 0 if invariant holds, else -1. - int test_invariant_recurse (ACE_RB_Tree_Node * x, - int & expected_black_height, - int measured_black_height); - - /// Method for right rotation of the tree about a given node. - void RB_rotate_right (ACE_RB_Tree_Node * x); - - /// Method for left rotation of the tree about a given node. - void RB_rotate_left (ACE_RB_Tree_Node * x); - - /// Method for restoring Red-Black properties after deletion. - void RB_delete_fixup (ACE_RB_Tree_Node * x, - ACE_RB_Tree_Node * parent); - - /// Method to find the successor node of the given node in the tree. - ACE_RB_Tree_Node * - RB_tree_successor (ACE_RB_Tree_Node *x) const; - - /// Method to find the predecessor node of the given node in the - /// tree. - ACE_RB_Tree_Node * - RB_tree_predecessor (ACE_RB_Tree_Node *x) const; - - /// Method to find the minimum node of the subtree rooted at the - /// given node. - ACE_RB_Tree_Node * - RB_tree_minimum (ACE_RB_Tree_Node *x) const; - - /// Method to find the maximum node of the subtree rooted at the - /// given node. - ACE_RB_Tree_Node * - RB_tree_maximum (ACE_RB_Tree_Node *x) const; - - /** - * Returns a pointer to a matching node if there is one, a pointer - * to the node under which to insert the item if the tree is not - * empty and there is no such match, or 0 if the tree is empty. - * It stores the result of the search in the result argument: - * LEFT if the node is to the left of the node to be inserted, - * RIGHT if the node is to the right of the node to be inserted, - * or EXACT if an exactly matching node already exists. - */ - ACE_RB_Tree_Node *find_node (const EXT_ID &k, - ACE_RB_Tree_Base::RB_SearchResult &result); - - /// Rebalance the tree after insertion of a node. - void RB_rebalance (ACE_RB_Tree_Node * x); - - /// Close down an RB_Tree. this method should - /// only be called with locks already held. - int close_i (void); - - /** - * Retrieves a pointer to the item corresponding to the - * given key. If find_exact==1, find the exact match node. Otherwise just find a match node - * returns 0 for success, or -1 if it cannot find the key in the tree. - */ - int find_i (const EXT_ID &ext_id, ACE_RB_Tree_Node* &entry, int find_exact = 1); - - /** - * Inserts a *copy* of the key and the item into the tree: both the - * key type EXT_ID and the item type INT_ID must have well defined semantics - * for copy construction. The default implementation also requires that - * the key type support well defined < semantics. This method returns a - * pointer to the inserted item copy, or 0 if an error occurred. - * NOTE: if an identical key already exists in the tree, no new item - * is created, and the returned pointer addresses the existing item - * associated with the existing key. - */ - INT_ID* insert_i (const EXT_ID &k, const INT_ID &t); - - /** - * Inserts a *copy* of the key and the item into the tree: both the - * key type EXT_ID and the item type INT_ID must have well defined semantics - * for copy construction. The default implementation also requires that - * the key type support well defined < semantics. This method passes back - * a pointer to the inserted (or existing) node, and the search status. If - * the node already exists, the method returns 1. If the node does not - * exist, and a new one is successfully created, and the method returns 0. - * If there was an error, the method returns -1. - */ - int insert_i (const EXT_ID &k, const INT_ID &t, - ACE_RB_Tree_Node *&entry); - - /** - * Removes the item associated with the given key from the tree and - * destroys it. Returns 1 if it found the item and successfully - * destroyed it, 0 if it did not find the item, or -1 if an error - * occurred. Returns the stored internal id in the second argument. - */ - int remove_i (const EXT_ID &k, INT_ID &i); - - /// Removes the item associated with the given key from the tree and - /// destroys it. - int remove_i (ACE_RB_Tree_Node *z); - - /// Recursive function to dump the state of an object. - void dump_i (ACE_RB_Tree_Node *node) const; - - /// Function to dump node contents. Does nothing in its - /// basic form, but template specialization can be used to - /// provide definitions for various EXT_ID and INT_ID types. - void dump_node_i (ACE_RB_Tree_Node &node) const; - -private: - - // = Private members. - - /// Pointer to a memory allocator. - ACE_Allocator *allocator_; - - /// Synchronization variable for the MT_SAFE . - ACE_LOCK lock_; - - /// The root of the tree. - ACE_RB_Tree_Node *root_; - - /// Comparison functor for comparing nodes in the tree. - COMPARE_KEYS compare_keys_; - - /// The current number of nodes in the tree. - size_t current_size_; -}; - -/** - * @class ACE_RB_Tree_Iterator_Base - * - * @brief Implements a common base class for iterators for a Red-Black Tree ADT. - */ -template -class ACE_RB_Tree_Iterator_Base -{ - -public: - - /// Assignment operator: copies both the tree reference and the position in the tree. - void operator= (const ACE_RB_Tree_Iterator_Base &iter); - - // = Iteration methods. - - /// Returns 1 when the iteration has completed, otherwise 0. - int done (void) const; - - /// STL-like iterator dereference operator: returns a reference - /// to the node underneath the iterator. - ACE_RB_Tree_Node & operator* (void) const; - - /// Returns a const reference to the tree over which we're iterating. - const ACE_RB_Tree &tree (void); - - /// Comparison operator: returns 1 if both iterators point to the same position, otherwise 0. - int operator== (const ACE_RB_Tree_Iterator_Base &) const; - - /// Comparison operator: returns 1 if the iterators point to different positions, otherwise 0. - int operator!= (const ACE_RB_Tree_Iterator_Base &) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - - // = Initialization and termination methods. - - /// Create the singular iterator. No valid iterator can be equal to - /// it, it is illegal to dereference a singular iterator, etc. etc. - ACE_RB_Tree_Iterator_Base (void); - - /** - * Constructor. Takes an ACE_RB_Tree over which to iterate, and - * an integer indicating (if non-zero) to position the iterator - * at the first element in the tree (if this integer is 0, the - * iterator is positioned at the last element in the tree). - */ - ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree &tree, - int set_first); - - /** - * Constructor. Takes an ACE_RB_Tree over which to iterate, and - * a pointer to a node in the tree. - */ - ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree &tree, - ACE_RB_Tree_Node* entry); - - /** - * Constructor. Takes an ACE_RB_Tree over which to iterate, and a key. - * The key must come first to distinguish the case of EXT_ID == int. - */ - ACE_RB_Tree_Iterator_Base (const EXT_ID& key, - ACE_RB_Tree &tree); - - /// Copy constructor. - ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base &iter); - - /// Destructor. - ~ACE_RB_Tree_Iterator_Base (void); - - // = Internal methods - - /// Move forward by one element in the tree. Returns 0 when - /// there are no more elements in the tree, otherwise 1. - int forward_i (void); - - /// Move back by one element in the tree. Returns 0 when - /// there are no more elements in the tree, otherwise 1. - int reverse_i (void); - - /// Dump the state of an object. - void dump_i (void) const; - - // = Protected members. - - /// Reference to the ACE_RB_Tree over which we're iterating. - const ACE_RB_Tree *tree_; - - /// Pointer to the node currently under the iterator. - ACE_RB_Tree_Node *node_; - -}; - -/** - * @class ACE_RB_Tree_Iterator - * - * @brief Implements an iterator for a Red-Black Tree ADT. - */ -template -class ACE_RB_Tree_Iterator : public ACE_RB_Tree_Iterator_Base -{ - -public: - - // = Initialization and termination methods. - /** - * Create the singular iterator. - * It is illegal to deference the iterator, no valid iterator is - * equal to a singular iterator, etc. etc. - */ - ACE_RB_Tree_Iterator (void); - - /** - * Constructor. Takes an ACE_RB_Tree over which to iterate, and - * an integer indicating (if non-zero) to position the iterator - * at the first element in the tree (if this integer is 0, the - * iterator is positioned at the last element in the tree). - */ - ACE_RB_Tree_Iterator (const ACE_RB_Tree &tree, - int set_first = 1); - /** - * Constructor. Takes an ACE_RB_Tree over which to iterate - * and a pointer to a node in the tree. - */ - ACE_RB_Tree_Iterator (const ACE_RB_Tree &tree, - ACE_RB_Tree_Node* entry); - - /** - * Constructor. Takes an ACE_RB_Tree over which to iterate, and a key; - * the key comes first in order to distinguish the case of EXT_ID == int. - */ - ACE_RB_Tree_Iterator (const EXT_ID &key, - ACE_RB_Tree &tree); - - /// Destructor. - ~ACE_RB_Tree_Iterator (void); - - // = ACE-style iteration methods. - - /// Move forward by one element in the tree. Returns - /// 0 when all elements have been seen, else 1. - int advance (void); - - /// Dump the state of an object. - void dump (void) const; - - // = STL-style iteration methods. - - /// Prefix advance. - ACE_RB_Tree_Iterator & operator++ (void); - - /// Postfix advance. - ACE_RB_Tree_Iterator operator++ (int); - - /// Prefix reverse. - ACE_RB_Tree_Iterator & operator-- (void); - - /// Postfix reverse. - ACE_RB_Tree_Iterator operator-- (int); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /** - * Passes back the under the iterator. Returns 0 if - * the iteration has completed, otherwise 1. This method must - * be declared and defined in both the derived forward and - * reverse iterator classes rather than in the base iterator - * class because of a method signature resolution problem - * caused by the existence of the deprecated next (void) - * method in the derived forward iterator class. When that - * deprecated method is removed, this method should be removed - * from the derived classes and placed in the base class. - */ - int next (ACE_RB_Tree_Node *&next_entry) const; - - // = DEPRECATED methods. Please migrate your code to use the new methods instead - - /// @deprecated - /// Accessor for key of node under iterator (if any). - EXT_ID *key (void); - - /// @deprecated - /// Accessor for item of node under iterator (if any). - INT_ID *item (void); - - /// @deprecated - /// Move to the first item in the iteration (and in the tree). - int first (void); - - /// @deprecated - /// Move to the last item in the iteration (and in the tree). - int last (void); - - /// @deprecated - /// Move to the next item in the iteration (and in the tree). - int next (void); - - /// @deprecated - /// Move to the previous item in the iteration (and in the tree). - int previous (void); - - /** - * @deprecated: use the base class method instead. - * Returns 0 if the iterator is positioned over a valid ACE_RB_Tree - * node, returns 1 if not. - */ - int is_done (void); - -}; - -/** - * @class ACE_RB_Tree_Reverse_Iterator - * - * @brief Implements a reverse iterator for a Red-Black Tree ADT. - */ -template -class ACE_RB_Tree_Reverse_Iterator : public ACE_RB_Tree_Iterator_Base -{ - -public: - - // = Initialization and termination methods. - /** - * Create the singular iterator. - * It is illegal to deference the iterator, no valid iterator is - * equal to a singular iterator, etc. etc. - */ - ACE_RB_Tree_Reverse_Iterator (void); - - /** - * Constructor. Takes an ACE_RB_Tree over which to iterate, and - * an integer indicating (if non-zero) to position the iterator - * at the last element in the tree (if this integer is 0, the - * iterator is positioned at the first element in the tree). - */ - ACE_RB_Tree_Reverse_Iterator (const ACE_RB_Tree &tree, - int set_last = 1); - - /** - * Constructor. Takes an ACE_RB_Tree over which to iterate, and - * a point to a node in the tree. - */ - ACE_RB_Tree_Reverse_Iterator (const ACE_RB_Tree &tree, - ACE_RB_Tree_Node* entry); - - /** - * Constructor. Takes an ACE_RB_Tree over which to iterate, and a key; - * the key comes first in order to distinguish the case of EXT_ID == int. - */ - ACE_RB_Tree_Reverse_Iterator (const EXT_ID &key, - ACE_RB_Tree &tree); - - /// Destructor. - ~ACE_RB_Tree_Reverse_Iterator (void); - - // = ACE-style iteration methods. - - /// Move forward by one element in the tree. Returns - /// 0 when all elements have been seen, else 1. - int advance (void); - - /// Dump the state of an object. - void dump (void) const; - - // = STL-style iteration methods. - - /// Prefix advance. - ACE_RB_Tree_Reverse_Iterator & operator++ (void); - - /// Postfix advance. - ACE_RB_Tree_Reverse_Iterator operator++ (int); - - /// Prefix reverse. - ACE_RB_Tree_Reverse_Iterator & operator-- (void); - - /// Postfix reverse. - ACE_RB_Tree_Reverse_Iterator operator-- (int); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /** - * Passes back the under the iterator. Returns 0 if - * the iteration has completed, otherwise 1. This method must - * be declared and defined in both the derived forward and - * reverse iterator classes rather than in the base iterator - * class because of a method signature resolution problem - * caused by the existence of the deprecated next (void) - * method in the derived forward iterator class. When that - * deprecated method is removed, this method should be removed - * from the derived classes and placed in the base class. - */ - int next (ACE_RB_Tree_Node *&next_entry) const; - -}; - -#if defined (__ACE_INLINE__) -#include "ace/RB_Tree.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/RB_Tree.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("RB_Tree.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ! defined (ACE_RB_TREE_H) */ diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i deleted file mode 100644 index ed0a93fbb7e..00000000000 --- a/ace/RB_Tree.i +++ /dev/null @@ -1,1152 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Synch.h" -#include "ace/Malloc.h" - -///////////////////////////////////////////////////// -// template class ACE_RB_Tree_Node // -///////////////////////////////////////////////////// - -// Key accessor. - -template -ACE_INLINE EXT_ID & -ACE_RB_Tree_Node::key () -{ - ACE_TRACE ("ACE_RB_Tree_Node::key"); - return k_; -} - - -// Item accessor. - -template -ACE_INLINE INT_ID & -ACE_RB_Tree_Node::item () -{ - ACE_TRACE ("ACE_RB_Tree_Node:item"); - return t_; -} - - -// Set color of the node. - -template -ACE_INLINE void -ACE_RB_Tree_Node::color (ACE_RB_Tree_Node_Base::RB_Tree_Node_Color c) -{ - ACE_TRACE ("ACE_RB_Tree_Node::color mutator"); - color_ = c; -} - - -// Get color of the node. - -template -ACE_INLINE ACE_RB_Tree_Node_Base::RB_Tree_Node_Color -ACE_RB_Tree_Node::color () -{ - ACE_TRACE ("ACE_RB_Tree_Node::color accessor"); - return color_; -} - - -// Accessor for node's parent pointer. - -template -ACE_INLINE ACE_RB_Tree_Node * -ACE_RB_Tree_Node::parent () -{ - ACE_TRACE ("ACE_RB_Tree_Node::parent accessor"); - return parent_; -} - - -// Mutator for node's parent pointer. - -template -ACE_INLINE void -ACE_RB_Tree_Node::parent (ACE_RB_Tree_Node * p) -{ - ACE_TRACE ("ACE_RB_Tree_Node::parent mutator"); - parent_ = p; -} - - - -// Accessor for node's left child pointer. - -template -ACE_INLINE ACE_RB_Tree_Node * -ACE_RB_Tree_Node::left () -{ - ACE_TRACE ("ACE_RB_Tree_Node::left accessor"); - return left_; -} - - -// Mutator for node's left child pointer. - -template -ACE_INLINE void -ACE_RB_Tree_Node::left (ACE_RB_Tree_Node * l) -{ - ACE_TRACE ("ACE_RB_Tree_Node::left mutator"); - left_ = l; -} - - -// Accessor for node's right child pointer. - -template -ACE_INLINE ACE_RB_Tree_Node * -ACE_RB_Tree_Node::right () -{ - ACE_TRACE ("ACE_RB_Tree_Node::right accessor"); - return right_; -} - - -// Mutator for node's right child pointer. - -template -ACE_INLINE void -ACE_RB_Tree_Node::right (ACE_RB_Tree_Node * r) -{ - ACE_TRACE ("ACE_RB_Tree_Node::right mutator"); - right_ = r; -} - - - -//////////////////////////////////////////////////////////////////////// -// template class ACE_RB_Tree // -//////////////////////////////////////////////////////////////////////// - - -// Initialize an RB Tree. - -template -ACE_INLINE int -ACE_RB_Tree::open (ACE_Allocator *alloc) -{ - ACE_TRACE ("ACE_RB_Tree::open"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - // Calling this->close_i () ensures we release previously allocated - // memory before allocating new memory. - this->close_i (); - - // If we were passed an allocator use it, - // otherwise use the default instance. - - if (alloc == 0) - alloc = ACE_Allocator::instance (); - - this->allocator_ = alloc; - - return 0; -} - -// Close down an RB_Tree and release dynamically allocated -// resources. - -template -ACE_INLINE int -ACE_RB_Tree::close (void) -{ - ACE_TRACE ("ACE_RB_Tree::close"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - return this->close_i (); -} - - -// Associate with . If is already in the -// tree then the is not changed. Returns 0 if a -// new entry is bound successfully, returns 1 if an attempt is made -// to bind an existing entry, and returns -1 if failures occur. - -template -ACE_INLINE int -ACE_RB_Tree::bind (const EXT_ID &ext_id, - const INT_ID &int_id) -{ - ACE_TRACE ("ACE_RB_Tree::bind (const EXT_ID &item, const INT_ID &int_id)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - ACE_RB_Tree_Node *entry; - return this->insert_i (ext_id, int_id, entry); -} - - -// Same as a normal bind, except the tree entry is also passed back -// to the caller. The entry in this case will either be the newly -// created entry, or the existing one. - -template -ACE_INLINE int -ACE_RB_Tree::bind (const EXT_ID &ext_id, - const INT_ID &int_id, - ACE_RB_Tree_Node *&entry) -{ - ACE_TRACE ("ACE_RB_Tree::bind (const EXT_ID &ext_id, const INT_ID &int_id, " - "ACE_RB_Tree_Node *&entry)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - return this->insert_i (ext_id, int_id, entry); -} - - -// Associate with if and only if is not -// in the tree. If is already in the tree then the -// parameter is assigned the existing value in the tree. Returns 0 -// if a new entry is bound successfully, returns 1 if an attempt is -// made to bind an existing entry, and returns -1 if failures occur. - -template -ACE_INLINE int -ACE_RB_Tree::trybind (const EXT_ID &ext_id, - INT_ID &int_id) -{ - ACE_TRACE ("ACE_RB_Tree::trybind (const EXT_ID &ext_id, INT_ID &int_id)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - ACE_RB_Tree_Node *entry; - int result = this->insert_i (ext_id, int_id, entry); - - if (result == 1) - { - int_id = entry->item (); - } - - return result; -} - - -// Same as a normal trybind, except the tree entry is also passed -// back to the caller. The entry in this case will either be the -// newly created entry, or the existing one. - -template -ACE_INLINE int -ACE_RB_Tree::trybind (const EXT_ID &ext_id, - INT_ID &int_id, - ACE_RB_Tree_Node *&entry) -{ - ACE_TRACE ("ACE_RB_Tree::trybind (const EXT_ID &ext_id, INT_ID &int_id, " - "ACE_RB_Tree_Node *&entry)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - int result = this->insert_i (ext_id, int_id, entry); - - if (result == 1) - { - int_id = entry->item (); - } - - - return result; -} - - -// Reassociate with . If is not in the -// tree then behaves just like . Returns 0 if a new entry is -// bound successfully, returns 1 if an existing entry was rebound, -// and returns -1 if failures occur. - -template -ACE_INLINE int -ACE_RB_Tree::rebind (const EXT_ID &ext_id, - const INT_ID &int_id) -{ - ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - ACE_RB_Tree_Node *entry; - int result = this->insert_i (ext_id, int_id, entry); - - if (result == 1) - { - entry->key () = ext_id; - entry->item () = int_id; - } - - return result; -} - - -// Same as a normal rebind, except the tree entry is also passed back -// to the caller. The entry in this case will either be the newly -// created entry, or the existing one. - -template -ACE_INLINE int -ACE_RB_Tree::rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - ACE_RB_Tree_Node *&entry) -{ - ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id, " - "ACE_RB_Tree_Node *&entry)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - int result = this->insert_i (ext_id, int_id, entry); - - if (result == 1) - { - entry->key () = ext_id; - entry->item () = int_id; - } - - return result; -} - - -// Associate with . If is not in the tree -// then behaves just like . Otherwise, store the old value of -// into the "out" parameter and rebind the new parameters. -// Returns 0 if a new entry is bound successfully, returns 1 if an -// existing entry was rebound, and returns -1 if failures occur. - -template -ACE_INLINE int -ACE_RB_Tree::rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - INT_ID &old_int_id) -{ - ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, " - "const INT_ID &int_id, INT_ID &old_int_id)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - ACE_RB_Tree_Node *entry; - int result = this->insert_i (ext_id, int_id, entry); - - if (result == 1) - { - old_int_id = entry->item (); - entry->key () = ext_id; - entry->item () = int_id; - } - - return result; -} - - -// Same as a normal rebind, except the tree entry is also passed back -// to the caller. The entry in this case will either be the newly -// created entry, or the existing one. - -template -ACE_INLINE int -ACE_RB_Tree::rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - INT_ID &old_int_id, - ACE_RB_Tree_Node *&entry) -{ - ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id," - "INT_ID &old_int_id, ACE_RB_Tree_Node *&entry)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - int result = this->insert_i (ext_id, int_id, entry); - - if (result == 1) - { - old_int_id = entry->item (); - entry->key () = ext_id; - entry->item () = int_id; - } - - return result; -} - - -// Associate with . If is not in the tree -// then behaves just like . Otherwise, store the old values -// of and into the "out" parameters and rebind the -// new parameters. This is very useful if you need to have an -// atomic way of updating and you also need -// full control over memory allocation. Returns 0 if a new entry is -// bound successfully, returns 1 if an existing entry was rebound, -// and returns -1 if failures occur. - -template -ACE_INLINE int -ACE_RB_Tree::rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - EXT_ID &old_ext_id, - INT_ID &old_int_id) -{ - ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id," - "EXT_ID &old_ext_id, INT_ID &old_int_id)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - ACE_RB_Tree_Node *entry; - int result = this->insert_i (ext_id, int_id, entry); - - if (result == 1) - { - old_ext_id = entry->key (); - old_int_id = entry->item (); - entry->key () = ext_id; - entry->item () = int_id; - } - - return result; -} - - -// Same as a normal rebind, except the tree entry is also passed back -// to the caller. The entry in this case will either be the newly -// created entry, or the existing one. - -template -ACE_INLINE int -ACE_RB_Tree::rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - EXT_ID &old_ext_id, - INT_ID &old_int_id, - ACE_RB_Tree_Node *&entry) -{ - ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id, " - "EXT_ID &old_ext_id, INT_ID &old_int_id, " - "ACE_RB_Tree_Node *&entry)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - int result = this->insert_i (ext_id, int_id, entry); - - if (result == 1) - { - old_ext_id = entry->key (); - old_int_id = entry->item (); - entry->key () = ext_id; - entry->item () = int_id; - } - - return result; -} - - -// Locate and pass out parameter via . If found, -// return 0, returns -1 if not found. - -template -ACE_INLINE int -ACE_RB_Tree::find (const EXT_ID &ext_id, - INT_ID &int_id) -{ - ACE_TRACE ("ACE_RB_Tree::find (const EXT_ID &ext_id, INT_ID &int_id)"); - ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - ACE_RB_Tree_Node *entry = 0; - - int result = this->find_i (ext_id, entry); - if (result == 0) - { - int_id = entry->item (); - } - - return result; -} - -// Locate and pass out parameter via . If found, -// return 0, returns -1 if not found. - -template -ACE_INLINE int -ACE_RB_Tree::find (const EXT_ID &ext_id, - ACE_RB_Tree_Node *&entry) -{ - ACE_TRACE ("ACE_RB_Tree::find (const EXT_ID &ext_id, ACE_RB_Tree_Node *&entry)"); - ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - return this->find_i (ext_id, entry); -} - - -// Unbind (remove) the from the tree. Don't return the -// to the caller (this is useful for collections where the -// s are *not* dynamically allocated...). - -template -ACE_INLINE int -ACE_RB_Tree::unbind (const EXT_ID &ext_id) -{ - ACE_TRACE ("ACE_RB_Tree::unbind (const EXT_ID &ext_id)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - INT_ID int_id; - int result = this->remove_i (ext_id, int_id); - - // Remap the return codes from the internal method: this - // is maintained this way in support of deprecated methods, - // and will be cleaned up when these methods are removed. - switch (result) - { - case 1: - // If the node was found and deleted, return success. - return 0; - case 0: - // If nothing was found, set errno and break. - errno = ENOENT; - break; - case -1: - // If an error happened, just break. - break; - } - - // Return an error if we didn't already return success. - return -1; -} - - -// Break any association of . Returns the value of -// in case the caller needs to deallocate memory. - -template -ACE_INLINE int -ACE_RB_Tree::unbind (const EXT_ID &ext_id, - INT_ID &int_id) -{ - ACE_TRACE ("ACE_RB_Tree::unbind (const EXT_ID &ext_id, INT_ID &int_id)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - int result = this->remove_i (ext_id, int_id); - - // Remap the return codes from the internal method: this - // is maintained this way in support of deprecated methods, - // and will be cleaned up when these methods are removed. - switch (result) - { - case 1: - // If the node was found and deleted, return success. - return 0; - case 0: - // If nothing was found, set errno and break. - errno = ENOENT; - break; - case -1: - // If an error happened, just break. - break; - } - - // Return an error if we didn't already return success. - return -1; -} - - -// Remove entry from the tree. This method should be used with *extreme* -// caution, and only for optimization purposes. The node being passed -// in had better have been allocated by the tree that is unbinding it. -template -ACE_INLINE int -ACE_RB_Tree::unbind (ACE_RB_Tree_Node *entry) -{ - ACE_TRACE ("ACE_RB_Tree::unbind (ACE_RB_Tree_Node *entry)"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - return this->remove_i (entry); -} - - -// Returns a reference to the underlying . This makes it -// possible to acquire the lock explicitly, which can be useful in -// some cases if you instantiate the with an -// or , or if you need to -// guard the state of an iterator. NOTE: the right name would be -// , but HP/C++ will choke on that! - -template -ACE_INLINE ACE_LOCK & -ACE_RB_Tree::mutex (void) -{ - ACE_TRACE ("ACE_RB_Tree::mutex"); - return this->lock_; -} - - -// Dump the state of an object. - -template -ACE_INLINE void -ACE_RB_Tree::dump (void) const -{ - ACE_TRACE ("ACE_RB_Tree::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncurrent_size_ = %d\n"), this->current_size_)); - this->allocator_->dump (); - this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nDumping nodes from root\n"))); - this->dump_i (this->root_); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - - -// Return forward iterator positioned at first node in tree. - -template -ACE_INLINE ACE_RB_Tree_Iterator -ACE_RB_Tree::begin (void) -{ - ACE_TRACE ("ACE_RB_Tree::begin"); - - return ACE_RB_Tree_Iterator (*this); -} - - -// Return forward iterator positioned at last node in tree. - -template -ACE_INLINE ACE_RB_Tree_Iterator -ACE_RB_Tree::end (void) -{ - ACE_TRACE ("ACE_RB_Tree::end"); - - return ACE_RB_Tree_Iterator (); -} - - -// Return reverse iterator positioned at last node in tree. - -template -ACE_INLINE ACE_RB_Tree_Reverse_Iterator -ACE_RB_Tree::rbegin (void) -{ - ACE_TRACE ("ACE_RB_Tree::rbegin"); - - return ACE_RB_Tree_Reverse_Iterator (*this); -} - - -// Return reverse iterator positioned at first node in tree. - -template -ACE_INLINE ACE_RB_Tree_Reverse_Iterator -ACE_RB_Tree::rend (void) -{ - ACE_TRACE ("ACE_RB_Tree::rend"); - - return ACE_RB_Tree_Reverse_Iterator (); -} - - -// Returns a pointer to the item corresponding to the given key, -// or 0 if it cannot find the key in the tree. DEPRECATED. - -template -ACE_INLINE INT_ID* -ACE_RB_Tree::find (const EXT_ID &k) -{ - ACE_TRACE ("ACE_RB_Tree::find (const EXT_ID &k)"); - - // The reinterpret cast is to ensure that when this deprecated method is removed, and - // is replaced (as planned) by a find method that takes the same argument signature - // but returns an int, that the compiler will cough if this return macro is not - // changed to just return an int (whose value will be -1). Please leave this as is. - ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, ACE_reinterpret_cast(INT_ID*, 0L)); - - ACE_RB_Tree_Node *entry; - int result = this->find_i (k, entry); - return (result == 0) ? &(entry->item ()) : 0; -} - -// Inserts a *copy* of the key and the item into the tree: -// both the key type EXT_ID and the item type INT_ID must have well -// defined semantics for copy construction and < comparison. -// This method returns a pointer to the inserted item copy, -// or 0 if an error occurred. NOTE: if an identical key -// already exists in the tree, no new item is created, and -// the returned pointer addresses the existing item -// associated with the existing key. DEPRECATED. - -template -ACE_INLINE INT_ID* -ACE_RB_Tree::insert (const EXT_ID &k, const INT_ID &t) -{ - ACE_TRACE ("ACE_RB_Tree::insert"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, ACE_reinterpret_cast(INT_ID*, 0L)); - - return this->insert_i (k, t); -} - - -// Removes the item associated with the given key from the -// tree and destroys it. Returns 1 if it found the item -// and successfully destroyed it, 0 if it did not find the -// item, or -1 if an error occurred. DEPRECATED. - -template -ACE_INLINE int -ACE_RB_Tree::remove (const EXT_ID &k) -{ - ACE_TRACE ("ACE_RB_Tree::remove"); - ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - INT_ID i; - return this->remove_i (k, i); -} - - -// Destroys all nodes and sets the root pointer null. DEPRECATED - -template -ACE_INLINE void -ACE_RB_Tree::clear () -{ - ACE_TRACE ("ACE_RB_Tree::clear"); - ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_); - - this->close_i (); -} - -// Returns the current number of nodes in the tree. - -template -ACE_INLINE size_t -ACE_RB_Tree::current_size () const -{ - ACE_TRACE ("ACE_RB_Tree::current_size"); - return current_size_; -} - - -/////////////////////////////////////////////////////////////////////// -// template class // -// ACE_RB_Tree_Iterator_Base // -/////////////////////////////////////////////////////////////////////// - -template -ACE_INLINE -ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base (void) - : tree_ (0), node_ (0) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base (void)"); -} - -// Returns 1 when the iteration has completed, otherwise 0. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator_Base::done (void) const -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::done"); - - return node_ ? 0 : 1; -} - - -// STL-like iterator dereference operator: returns a reference -// to the node underneath the iterator. - -template -ACE_INLINE ACE_RB_Tree_Node & -ACE_RB_Tree_Iterator_Base::operator* (void) const -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::operator*"); - return *(this->node_); -} - - -// Returns a reference to the tree over which we're iterating. - -template ACE_INLINE const ACE_RB_Tree & -ACE_RB_Tree_Iterator_Base::tree (void) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::tree"); - return *tree_; -} - - -// Comparison operator: returns 1 if both iterators point to the same position, otherwise 0. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator_Base::operator== - (const ACE_RB_Tree_Iterator_Base &rbt) const -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::operator=="); - return (this->node_ == rbt.node_) ? 1 : 0; -} - - -// Comparison operator: returns 1 if the iterators point to different positions, otherwise 0. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator_Base::operator!= - (const ACE_RB_Tree_Iterator_Base &rbt) const -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::operator!="); - return (this->node_ == rbt.node_) ? 0 : 1; -} - - -// Move forward by one element in the tree. Returns 0 when -// there are no more elements in the tree, otherwise 1. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator_Base::forward_i (void) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::forward_i"); - - if (node_) - { - node_ = tree_->RB_tree_successor (node_); - } - - return node_ ? 1 : 0; -} - - -// Move back by one element in the tree. Returns 0 when -// there are no more elements in the tree, otherwise 1. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator_Base::reverse_i (void) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::reverse_i"); - - if (node_) - { - node_ = tree_->RB_tree_predecessor (node_); - } - - return node_ ? 1 : 0; -} - - -// Dump the state of an object. - -template -ACE_INLINE void -ACE_RB_Tree_Iterator_Base::dump_i (void) const -{ - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::dump_i"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnode_ = %x\n"), this->node_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - - -////////////////////////////////////////////////////////////////// -// template class // -// ACE_RB_Tree_Iterator // -////////////////////////////////////////////////////////////////// - -template -ACE_INLINE -ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator (void) - : ACE_RB_Tree_Iterator_Base () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator (void)"); -} - -// Move forward by one element in the tree. Returns -// 0 when all elements have been seen, else 1. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator::advance (void) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::advance"); - - return this->forward_i (); -} - - -// Dump the state of an object. - -template -ACE_INLINE void -ACE_RB_Tree_Iterator::dump (void) const -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::dump"); - - this->dump_i (); -} - - -// Prefix advance. - -template -ACE_INLINE ACE_RB_Tree_Iterator & -ACE_RB_Tree_Iterator::operator++ (void) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator operator++ (void)"); - - this->forward_i (); - return *this; -} - - -// Postfix advance. - -template -ACE_INLINE ACE_RB_Tree_Iterator -ACE_RB_Tree_Iterator::operator++ (int) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator operator++ (int)"); - - ACE_RB_Tree_Iterator retv (*this); - ++*this; - return retv; -} - - -// Prefix reverse. - -template -ACE_INLINE ACE_RB_Tree_Iterator & -ACE_RB_Tree_Iterator::operator-- (void) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator operator-- (void)"); - - this->reverse_i (); - return *this; -} - - -// Postfix reverse. - -template -ACE_INLINE ACE_RB_Tree_Iterator -ACE_RB_Tree_Iterator::operator-- (int) -{ - ACE_TRACE ("ACE_RB_Tree_Iterator operator-- (int)"); - - ACE_RB_Tree_Iterator retv (*this); - --*this; - return retv; -} - - -// Passes back the under the iterator. Returns 0 if -// the iteration has completed, otherwise 1. This method must -// be declared and defined in both the derived forward and -// reverse iterator classes rather than in the base iterator -// class because of a method signature resolution problem -// caused by the existence of the deprecated next (void) -// method in the derived forward iterator class. When that -// deprecated method is removed, this method should be removed -// from the derived classes and placed in the base class. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator::next (ACE_RB_Tree_Node *&next_entry) const -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::next"); - - if (this->node_) - { - next_entry = this->node_; - return 1; - } - - return 0; -} - - -// Accessor for key of node under iterator (if any). DEPRECATED. - -template -ACE_INLINE EXT_ID * -ACE_RB_Tree_Iterator::key () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::key"); - return this->node_ ? (&(this->node_->key ())) : 0; -} - - -// Accessor for item of node under iterator (if any). DEPRECATED. - -template -ACE_INLINE INT_ID * -ACE_RB_Tree_Iterator::item () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::item"); - return this->node_ ? (&(this->node_->item ())) : 0; -} - - -// Move to the first item in the tree. DEPRECATED. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator::first () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::first"); - this->node_ = this->tree_->RB_tree_minimum (this->tree_->root_); - return this->node_ ? 1 : 0; -} - - -// Move to the last item in the tree. DEPRECATED. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator::last () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::last"); - this->node_ = this->tree_->RB_tree_maximum (this->tree_->root_); - return this->node_ ? 1 : 0; -} - - -// Moves to the next item in the tree, -// returns 1 if there is a next item, 0 otherwise. DEPRECATED. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator::next () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::next"); - this->node_ = this->tree_->RB_tree_successor (this->node_); - return this->node_ ? 1 : 0; -} - - -// Moves to the previous item in the tree, -// returns 1 if there is a previous item, 0 otherwise. DEPRECATED. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator::previous () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::previous"); - this->node_ = this->tree_->RB_tree_predecessor (this->node_); - return this->node_ ? 1 : 0; -} - - -// Returns 0 if the iterator is positioned over a valid ACE_RB_Tree -// node, returns 1 if not. DEPRECATED. - -template -ACE_INLINE int -ACE_RB_Tree_Iterator::is_done () -{ - ACE_TRACE ("ACE_RB_Tree_Iterator::is_done"); - return this->node_ ? 0 : 1; -} - - -////////////////////////////////////////////////////////////////////////// -// template class // -// ACE_RB_Tree_Reverse_Iterator // -////////////////////////////////////////////////////////////////////////// - - -template -ACE_INLINE -ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator (void) - : ACE_RB_Tree_Iterator_Base () -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator (void)"); -} - -// Move forward by one element in the tree. Returns -// 0 when all elements have been seen, else 1. - -template -ACE_INLINE int -ACE_RB_Tree_Reverse_Iterator::advance (void) -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::advance"); - - return this->reverse_i (); -} - - -// Dump the state of an object. - -template -ACE_INLINE void -ACE_RB_Tree_Reverse_Iterator::dump (void) const -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::dump"); - - this->dump_i (); -} - - -// Prefix advance. - -template -ACE_INLINE ACE_RB_Tree_Reverse_Iterator & -ACE_RB_Tree_Reverse_Iterator::operator++ (void) -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::operator++ (void)"); - - this->reverse_i (); - return *this; -} - - -// Postfix advance. - -template -ACE_INLINE ACE_RB_Tree_Reverse_Iterator -ACE_RB_Tree_Reverse_Iterator::operator++ (int) -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::operator++ (int)"); - - ACE_RB_Tree_Reverse_Iterator retv (*this); - ++*this; - return retv; -} - - -// Prefix reverse. - -template -ACE_INLINE ACE_RB_Tree_Reverse_Iterator & -ACE_RB_Tree_Reverse_Iterator::operator-- (void) -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::operator-- (void)"); - - this->forward_i (); - return *this; -} - - -// Postfix reverse. - -template -ACE_INLINE ACE_RB_Tree_Reverse_Iterator -ACE_RB_Tree_Reverse_Iterator::operator-- (int) -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::operator-- (int)"); - - ACE_RB_Tree_Reverse_Iterator retv (*this); - --*this; - return retv; -} - - -// Passes back the under the iterator. Returns 0 if -// the iteration has completed, otherwise 1. This method must -// be declared and defined in both the derived forward and -// reverse iterator classes rather than in the base iterator -// class because of a method signature resolution problem -// caused by the existence of the deprecated next (void) -// method in the derived forward iterator class. When that -// deprecated method is removed, this method should be removed -// from the derived classes and placed in the base class. - -template -ACE_INLINE int -ACE_RB_Tree_Reverse_Iterator::next (ACE_RB_Tree_Node *&next_entry) const -{ - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::next"); - - if (this->node_) - { - next_entry = this->node_; - return 1; - } - - return 0; -} diff --git a/ace/README b/ace/README deleted file mode 100644 index e21894fbb75..00000000000 --- a/ace/README +++ /dev/null @@ -1,1603 +0,0 @@ -// $Id$ - -ACE Portability Macros ----------------------- - -The following describes the meaning of the C++ compiler macros that -can be set in the config*.h file. When you port ACE to a new platform -and/or C++ compiler, make sure that you check to see which of these -need to be defined. It's helpful to check the various config*.h files -in this directory to see what's already been defined. If you need to -add new macros, please send them to me and I'll add them to this file. - -Eventually, most of this information should be auto-discovered via GNU -autoconf, which Ossama Othman is working on, at -http://www.cs.wustl.edu/~othman/aceconf/. - -Macro Description ------ ----------- - -ACE_CAST_CONST Used to work around broken - SunCC ANSI casts that require - an extra const. -ACE_DEFINES_DEFAULT_WIN32_SECURITY_ATTRIBUTES - Win32 only. Users want to use - a predefined security - attributes defined in - ACE_OS::default_win32_security_attributes - as the default security - object. -ACE_DISABLE_DEBUG_DLL_CHECK Define this if you don't want - debug version ACE search for - debug version DLLs first - before looking for the DLL - names specified. -ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER - Application will allocate its - own object manager. This - implicitly defines - ACE_HAS_NONSTATIC_OBJECT_MANAGER. - Usually used with MFC - applications. -ACE_MAIN Renames "main (int, char *[])", - for platforms such as g++/VxWorks - that don't allow "main". Requires - the use of - ACE_HAS_NONSTATIC_OBJECT_MANAGER. -ACE_MT_SAFE Compile using multi-thread libraries -ACE_NDEBUG Turns off debugging features -ACE_NEW_THROWS_EXCEPTIONS Compiler's 'new' throws exception on - failure (ANSI C++ behavior). -ACE_NLOGGING Turns off the LM_DEBUG and - LM_ERROR logging macros... -ACE_NTRACE Turns off the tracing feature. -ACE_PAGE_SIZE Defines the page size of the - system (not used on Win32 or - with ACE_HAS_GETPAGESIZE). -ACE_REDEFINES_XTI_FUNCTIONS Platform redefines the t_... names (UnixWare) -ACE_SELECT_USES_INT Platform uses int for select() - rather than fd_set -ACE_TEMPLATES_REQUIRE_PRAGMA Compiler's template mechanism - must use a pragma This is used - for AIX's C++ compiler. -ACE_TEMPLATES_REQUIRE_SOURCE Compiler's template mechanim - must see source code (i.e., - .cpp files). This is used for - GNU G++. -ACE_TIMER_SKEW If a timed ::select () can return - early, then ACE_TIMER_SKEW is the - maximum adjustment, in microseconds, - that ACE_Timer_Queue uses to - compensate for the early return. -ACE_TLI_TCP_DEVICE Device the platform uses for TCP on - TLI. Only needed if not /dev/tcp. -ACE_USE_POLL The OS platform supports the - poll() event demultiplexor -ACE_USES_ASM_SYMBOL_IN_DLSYM Platform uses assembly symbols - instead of C symbols in - dlsym() -ACE_USES_STATIC_MFC When linking MFC as a static library is desired -ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB Platform has its standard c++ - library in the namespace std. -ACE_WSOCK_VERSION A parameter list indicating - the version of WinSock (e.g., - "1, 1" is version 1.1). - -ACE_HAS_AIO_CALLS Platform supports POSIX aio* calls. - Corresponds to _POSIX_ASYNCHRONOUS_IO - constant in . -ACE_HAS_ALT_CUSERID Use ACE's alternate cuserid() - implementation since a system - cuserid() may not exist, or it - is not desirable to use it. - The implementation requires - ACE_LACKS_PWD_FUNCTIONS to be - undefined and that the - geteuid() system call exists. -ACE_HAS_ANSI_CASTS Platform supports new C++ - style casts (dynamic_cast, - static_cast, reinterpret_cast - and const_cast) -ACE_DEFAULT_THREAD_KEYS Number of TSS keys, with - ACE_HAS_TSS_EMULATION _only_. - Defaults to 64. -ACE_DEFAULT_LD_SEARCH_PATH Specify the platform default search - paths. This macro should only be - defined on platforms that don't - support environment variables at all - (i.e., Windows CE.) -ACE_THREADS_DONT_INHERIT_LOG_MSG Specify this if you don't want - threads to inherit parent - thread's ACE_Log_Msg - properties. -ACE_THREAD_MANAGER_USES_SAFE_SPAWN Disable the "check before lock" feature - in ACE_Thread_Manager. Defining this - macro avoids a potential race condition - on platforms with aggressive read/write - reordering. -ACE_HAS_GNUG_PRE_2_8 Compiling with g++ prior to - version 2.8.0. -ACE_HAS_PRIOCNTL OS has priocntl (2). -ACE_HAS_RECURSIVE_MUTEXES Mutexes are inherently recursive (e.g., Win32) -ACE_HAS_RECV_TIMEDWAIT Platform has the MIT pthreads - APIs for -ACE_HAS_RECVFROM_TIMEDWAIT timed send/recv operations -ACE_HAS_RECVMSG_TIMEDWAIT -ACE_HAS_RLIMIT_RESOURCE_ENUM Platform has enum instead of - int for first argument to - ::{get,set}rlimit (). The - value of this macro is the - enum definition, e.g., enum - __rlimit_resource, for Linux - glibc 2.0. -ACE_HAS_RUSAGE_WHO_ENUM Platform has enum instead of - int for first argument to - ::getrusage (). The value of - this macro is the enum - definition, e.g., enum - __rusage_who, for Linux glibc - 2.0. -ACE_HAS_SEND_TIMEDWAIT -ACE_HAS_SENDTO_TIMEDWAIT -ACE_HAS_SENDMSG_TIMEDWAIT -ACE_HAS_STDARG_THR_DEST Platform has void (*)(...) - prototype for - pthread_key_create() - destructor (e.g., LynxOS). -ACE_HAS_SNPRINTF Platform offers snprintf(). -ACE_HAS_STL_MAP_CONFLICT Used when users want to - compile ACE with STL and STL - map class conflicts with - map struct. -ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS Platform/compiler supports - Win32 structural exceptions -ACE_HAS_READ_TIMEDWAIT -ACE_HAS_READV_TIMEDWAIT -ACE_HAS_WRITE_TIMEDWAIT -ACE_HAS_WRITEV_TIMEDWAIT -ACE_HAS_4_4BSD_SENDMSG_RECVMSG Platform has BSD 4.4 - sendmsg()/recvmsg() APIs. -ACE_HAS_P_READ_WRITE Platform has pread() and - pwrite() support -ACE_HAS_64BIT_LONGS Platform has 64bit longs and - 32bit ints. NOTE: this macro - is deprecated. Instead, use - ACE_SIZEOF_LONG == 8. -ACE_HAS_AIX_BROKEN_SOCKET_HEADER Platform, such as AIX4, needs - to wrap #include of - sys/socket.h with - #undef/#define of - __cplusplus. -ACE_HAS_AIX_HI_RES_TIMER Platform has AIX4 - ::read_real_time () -ACE_HAS_ALLOCA Compiler/platform supports - alloca() -ACE_HAS_ALLOCA_H Compiler/platform has - -ACE_HAS_ALPHA_TIMER CPU is an Alpha, with the rpcc - instruction to read the tick timer. - Limited to 32 bits, so not recommended. -ACE_HAS_AUTOMATIC_INIT_FINI Compiler/platform correctly - calls init()/fini() for shared - libraries -ACE_HAS_BIG_FD_SET Compiler/platform has typedef - u_long fdmask (e.g., Linux and - SCO). -ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - Compiler handles explicit calling of - template destructor correctly. See - "ace/OS.h" for details. -ACE_HAS_BROKEN_ACCEPT_ADDR Platform can't correctly deal - with a NULL addr to accept() - (e.g, VxWorks). -ACE_HAS_BROKEN_NAMESPACES Compiler/platform doesn't - support namespaces (or the - support is not fully - implemented.) -ACE_HAS_BROKEN_BITSHIFT Compiler has integer overflow - problem with bit-shift - operations. -ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS Compiler can't handle const char * - as rvalue in conditional operator. -ACE_HAS_BROKEN_CONVERSIONS Compiler can't handle calls - like foo->operator T *() -ACE_HAS_BROKEN_CTIME Compiler/platform uses macro - for ctime (e.g., MVS) -ACE_HAS_BROKEN_DGRAM_SENDV Platform sendv() does not work - properly with datagrams, - i.e. it fails when the iovec - size is IOV_MAX. -ACE_HAS_BROKEN_ENUMS Compiler can't handle large - enums (e.g., HP/UX C++) -ACE_HAS_BROKEN_HPUX_TEMPLATES Earlier versions of HP/UX C++ - are damned... -ACE_HAS_BROKEN_MAP_FAILED Platform doesn't cast MAP_FAILED - to a void *. -ACE_HAS_BROKEN_MSG_H Platform headers don't support - prototypes -ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the - mmap(2) header files with - extern "C". -ACE_HAS_BROKEN_NESTED_TEMPLATES MSVC has trouble with defining - STL containers for nested - structs and classes -ACE_HAS_BROKEN_POSIX_TIME Platform defines struct - timespec in -ACE_HAS_BROKEN_RANDR OS/compiler's header files are - inconsistent with libC - definition of rand_r(). -ACE_HAS_BROKEN_READV() OS/Compiler's header files are - not consistent with readv() - definition. -ACE_HAS_BROKEN_SAP_ANY Compiler can't handle the - static ACE_Addr::sap_any - construct. -ACE_HAS_BROKEN_SENDMSG OS/compiler omits the const - from the sendmsg() prototype. -ACE_HAS_BROKEN_SETRLIMIT OS/compiler omits the const - from the rlimit parameter in - the setrlimit() prototype. -ACE_HAS_BROKEN_T_ERROR Compiler/platform has the wrong - prototype for t_error(), i.e., - t_error(char *) rather than - t_error(const char *). -ACE_HAS_BROKEN_TIMESPEC_MEMBERS platform define struct - timespec members as ts_sec and - ts_nsec instead of tv_sec and - tv_nsec. This is highly - non-portable. Currently only - FreeBSD 2.1.x uses it. -ACE_HAS_BROKEN_WRITEV OS/compiler omits the const - from the iovec parameter in - the writev() prototype. -ACE_HAS_BROKEN_XTI_MACROS OS header files have some - problems with XTI (HP/UX 11). -ACE_HAS_BSTRING Platform has - (which contains bzero() - prototype) -ACE_HAS_BYTESEX_H Platform has . -ACE_HAS_CANCEL_IO Platform supports the Win32 - CancelIO() function (WinNT 4.0 - and beyond). -ACE_HAS_CHARPTR_DL OS/platform uses char * for - dlopen/dlsym args, rather than - const char *. -ACE_HAS_CHARPTR_SOCKOPT OS/platform uses char * for - sockopt, rather than const - char * -ACE_HAS_CHARPTR_SPRINTF sprintf() returns char * - rather than int (e.g., SunOS - 4.x) -ACE_HAS_CLOCK_GETTIME Platform supports POSIX 1.b - clock_gettime () -ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES Prototypes for both signal() - and struct sigaction are - consistent. -ACE_HAS_CPLUSPLUS_HEADERS Compiler/platform has - correctly prototyped header - files -ACE_HAS_CYGWIN32_SOCKET_H Platform has cygwin32 socket.h -ACE_HAS_DIRENT Compiler/platform has Dirent - iterator functions -ACE_HAS_DLFCN_H_BROKEN_EXTERN_C For platforms, e.g., RedHat - 4.2/Linux 2.0.30/Alpha, that - don't declare dl* functions as - extern "C" in dlfcn.h. -ACE_HAS_DLL Build ACE using the frigging - PC DLL nonsense... -ACE_HAS_EXCEPTIONS Compiler supports C++ - exception handling -ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS Compiler does not call - unexpected exception handler - if exception not listed in - exception specification is - thrown. In particular, the - exception specification is not - respected. -ACE_HAS_EXPLICIT_KEYWORD Compiler support explicit constructors. -ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION Compiler's template - instantiation mechanism - supports the use of explicit - C++ specializations for all - used templates. This is also - used for GNU G++ if you don't - use the "repo" patches. -ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT When a base-class is a - specialization of a class template - then this class template must be - explicitly exported -ACE_HAS_GETPAGESIZE Platform supports - getpagesize() call (otherwise, - ACE_PAGE_SIZE must be defined, - except on Win32) -ACE_HAS_GETRUSAGE Platform supports the - getrusage() system call. -ACE_HAS_GETRUSAGE_PROTO Platform has a getrusage () - prototype in sys/resource.h - that differs from the one in - ace/OS.i. -ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS GNUC 2.7.3 mistakenly - takes the template definition - as the place where an inline - function of an argument class - is first used. -ACE_HAS_BROKEN_EXTENDED_TEMPLATES GNU CC < 2.8 is broken for - template classes. This label - shortens the template parameter - list by removing the iterator - functionality in the - Cache_Map_Manager class. -ACE_HAS_GNU_CSTRING_H Denotes that GNU has cstring.h - as standard which redefines - memchr() -ACE_HAS_GPERF The GPERF utility is compiled - for this platform -ACE_HAS_GETIFADDRS This platform has ifaddrs.h and - the getifaddrs() function. This - is used in preference to - the SIOCGIFCONF ioctl call, since - it is much simpler and supports - IPv6 and non-IP interfaces better. -ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT Optimize - ACE_Handle_Set::count_bits for - select() operations (common - case) -ACE_HAS_LLSEEK Platform supports llseek. -ACE_HAS_HI_RES_TIMER Compiler/platform supports - SunOS high resolution timers -ACE_HAS_IDTYPE_T Compiler/platform supports - idtype_t. -ACE_HAS_INLINED_OSCALLS Inline all the static class OS - methods to remove call - overhead -ACE_HAS_IP_MULTICAST Platform supports IP multicast -ACE_HAS_IPV6 Platform supports IPv6. -ACE_USES_IPV4_IPV6_MIGRATION Enable IPv6 support in ACE on - platforms that don't have IPv6 - turned on by default. -ACE_HAS_IRIX62_THREADS Platform supports the very odd - IRIX 6.2 threads... -ACE_HAS_NONSTATIC_OBJECT_MANAGER Causes the ACE_Object_Manager - instance to be created in main - (int, char *[]), instead of as - a static (global) instance. -ACE_HAS_THR_KEYDELETE Platform supports - thr_keydelete (e.g,. UNIXWARE) -ACE_HAS_THR_MINSTACK Platform calls thr_minstack() - rather than thr_min_stack() - (e.g., Tandem). -ACE_HAS_LIMITED_RUSAGE_T The rusage_t structure has - only two fields. -ACE_HAS_LIMITED_SELECT The select is unable to deal with - large file descriptors. -ACE_HAS_LOG_MSG_NT_EVENT_LOG Platform supports Windows NT event - log so we can create an - ACE_Log_Msg_Backend to log to it. -ACE_HAS_LONG_MAP_FAILED Platform defines MAP_FAILED as - a long constant. -ACE_HAS_MALLOC_STATS Enabled malloc statistics - collection. -ACE_HAS_MEMCHR Use native implementation of memchr. -ACE_HAS_MINIMAL_ACE_OS Disables some #includes in ace/OS.*. -ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION Avoid #including ace/streams.h - in OS.h. Users must include - ace/streams.h, , or - explicitly in - their code. Some platforms, - such as g++/VxWorks, have - trouble compiling templates - and iostreams header because - of static variables in the - stream headers. This flag - will also avoid extra - compilation and runtime - overheads on some platforms. -ACE_HAS_MFC Platform supports Microsoft - Foundation Classes -ACE_HAS_MSG Platform supports recvmsg and - sendmsg -ACE_HAS_MT_SAFE_MKTIME Platform supports MT safe - mktime() call (do any of - them?) -ACE_HAS_MUTABLE_KEYWORD Compiler supports mutable. -ACE_HAS_MUTEX_TIMEOUTS Compiler supports timed mutex - acquisitions - (e.g. pthread_mutex_timedlock()). -ACE_HAS_NEW_NOTHROW Compiler offers new (nothrow). -ACE_HAS_NONCONST_GETBY Platform uses non-const char * - in calls to gethostbyaddr, - gethostbyname, getservbyname -ACE_HAS_NONCONST_MSGSND Platform has a non-const - parameter to msgsend() (e.g., - SCO). -ACE_HAS_NONCONST_SELECT_TIMEVAL Platform's select() uses - non-const timeval* (only found - on Linux right now) -ACE_HAS_OLD_MALLOC Compiler/platform uses old - malloc()/free() prototypes - (ugh) -ACE_HAS_ONLY_SCHED_OTHER Platform, e.g., Solaris 2.5, - only supports SCHED_OTHER - POSIX scheduling policy. -ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R Uses ctime_r & asctime_r with - only two parameters - vs. three. -ACE_HAS_OSF_TIMOD_H Platform supports the OSF TLI - timod STREAMS module -ACE_HAS_3_PARAM_WCSTOK Platform has 3-parameter version - of wcstok(), which was added in - 1994 in the ISO C standard Normative - Addendum 1. Other standards like XPG4 - define a 2 parameter wcstok(). -ACE_HAS_PENTIUM Platform is an Intel Pentium - microprocessor. -ACE_HAS_POLL Platform contains -ACE_HAS_POSITION_INDEPENDENT_POINTERS Platform supports - "position-independent" features - provided by ACE_Based_Pointer<>. -ACE_HAS_POSIX_MESSAGE_PASSING Platform supports POSIX message queues. - Corresponds to _POSIX_MESSAGE_PASSING - constant in . -ACE_HAS_POSIX_NONBLOCK Platform supports POSIX - O_NONBLOCK semantics -ACE_HAS_POSIX_REALTIME_SIGNALS Platform supports POSIX RT signals. - Corresponds to _POSIX_REALTIME_SIGNALS - constant in . -ACE_HAS_POSIX_SEM Platform supports POSIX - real-time semaphores (e.g., - VxWorks and Solaris). Corresponds - to _POSIX_SEMAPHORES constant - in -ACE_HAS_POSIX_TIME Platform supports the POSIX - struct timespec type -ACE_HAS_PROC_FS Platform supports the /proc - file system and defines tid_t - in -ACE_HAS_POWERPC_TIMER Platform supports PowerPC - time-base register. -ACE_HAS_PRUSAGE_T Platform supports the - prusage_t struct -ACE_HAS_PTHREADS Platform supports POSIX - Pthreads, of one form or - another. This macro says the - platform has a pthreads - variety - should also define - one of the below to say which - one. Also may need some - ACE_HAS_... thing for - extensions. -ACE_HAS_PTHREADS_DRAFT4 Platform's 'Pthreads' is .4a draft 4 -ACE_HAS_PTHREADS_DRAFT6 Platform's 'Pthreads' is .4a draft 6 -ACE_HAS_PTHREADS_DRAFT7 Platform's 'Pthreads' is .1c draft 7 -ACE_HAS_PTHREADS_STD Platform supports POSIX.1c-1995 threads - (This is the final standard - Pthreads). -ACE_HAS_PTHREADS_UNIX98_EXT Platform has the UNIX98 extensions to - Pthreads (susp/cont, rwlocks) -ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP Platform has pthread_condattr_setkind_np(). -ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP Platform has - pthread_mutexattr_setkind_np(). -ACE_HAS_PTHREAD_PROCESS_ENUM pthread.h declares an enum with - PTHREAD_PROCESS_PRIVATE and - PTHREAD_PROCESS_SHARED values. -ACE_HAS_PTHREAD_SETSTACK Platform has pthread_attr_setstack(). -ACE_HAS_PURIFY Purify'ing. Set by wrapper_macros.GNU. -ACE_HAS_QUANTIFY Quantify'ing. Set by wrapper_macros.GNU. -ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS Platform will recurse - infinitely on thread exits - from TSS cleanup routines - (e.g., AIX). -ACE_HAS_REENTRANT_FUNCTIONS Platform supports reentrant - functions (i.e., all the POSIX - *_r functions). -ACE_HAS_XPG4_MULTIBYTE_CHAR Platform has support for - multi-byte character support - compliant with the XPG4 - Worldwide Portability - Interface wide-character - classification. -ACE_HAS_REGEX Platform supports the POSIX - regular expression library -ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE For OpenBSD: The dlsym call - segfaults when passed an invalid - handle. Other platforms handle - this more gracefully. -ACE_HAS_SELECT_H Platform has special header for select(). -ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL For Win32: Use Select_Reactor - as default implementation of - Reactor instead of - WFMO_Reactor. -ACE_HAS_SEMUN Compiler/platform defines a - union semun for SysV shared - memory -ACE_HAS_SET_T_ERRNO Platform has a function to set - t_errno (e.g., Tandem). -ACE_HAS_SIGINFO_T Platform supports SVR4 - extended signals -ACE_HAS_SIGSUSPEND Platform supports sigsuspend() -ACE_HAS_SIGISMEMBER_BUG Platform has bug with - sigismember() (HP/UX 11). -ACE_HAS_SIG_MACROS Platform/compiler has macros - for sig{empty,fill,add,del}set - (e.g., SCO and FreeBSD) -ACE_HAS_SIGNAL_OBJECT_AND_WAIT Platform supports the Win32 - SignalObjectAndWait() function - (WinNT 4.0 and beyond). -ACE_HAS_SIGNAL_SAFE_OS_CALLS Automatically restart OS - system calls when EINTR occurs -ACE_HAS_SIGWAIT Platform/compiler has the - sigwait(2) prototype -ACE_HAS_SIG_ATOMIC_T Compiler/platform defines the - sig_atomic_t typedef -ACE_HAS_SIG_C_FUNC Compiler requires extern "C" - functions for signals. -ACE_HAS_SIN_LEN Platform supports new BSD - inet_addr len field. -ACE_HAS_SIZET_SOCKET_LEN OS/compiler uses size_t * - rather than int * for socket - lengths -ACE_HAS_SOCKADDR_MSG_NAME Platform requires (struct - sockaddr *) for msg_name field - of struct msghdr. -ACE_HAS_SOCKIO_H Compiler/platform provides the - sockio.h file -ACE_HAS_SOCKLEN_T Platform provides socklen_t - type, such as Linux with - glibc2. -ACE_HAS_SPARCWORKS_401_SIGNALS Compiler has brain-damaged - SPARCwork SunOS 4.x signal - prototype... -ACE_HAS_SSIZE_T Compiler supports the ssize_t - typedef -ACE_HAS_STRPTIME Enables ACE_OS::strptime (). -ACE_HAS_STHREADS Platform supports Solaris - threads -ACE_HAS_STANDARD_CPP_LIBRARY Platform/compiler supports - Standard C++ Library -ACE_HAS_STRBUF_T Compiler/platform supports - struct strbuf -ACE_HAS_STRDUP_EMULATION Platform/compiler lacks - strdup() (e.g., VxWorks, - Chorus, WinCE) -ACE_HAS_STRNLEN Platform supports strnlen(3). -ACE_HAS_STREAMS Platform supports STREAMS -ACE_HAS_STREAM_PIPES Platform supports STREAM pipes -ACE_HAS_STRERROR Compiler/platform supports strerror () -ACE_HAS_STRICT Use the STRICT compilation mode on Win32. -ACE_HAS_STRING_CLASS Platform/Compiler supports a - String class (e.g., GNU or - Win32). -ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange - hostent API for socket *_r() - calls -ACE_HAS_SUNOS4_GETTIMEOFDAY SunOS 4 style prototype. -ACE_HAS_SUNOS4_SIGNAL_T Compiler has horrible SunOS - 4.x signal handlers... -ACE_HAS_SVR4_DYNAMIC_LINKING Compiler/platform supports - SVR4 dynamic linking semantics -ACE_HAS_SVR4_GETTIMEOFDAY Compiler/platform supports - SVR4 gettimeofday() prototype -ACE_HAS_SVR4_SIGNAL_T Compiler/platform supports - SVR4 signal typedef -ACE_HAS_SVR4_TLI Compiler/platform supports - SVR4 TLI (in particular, - T_GETNAME stuff)... -ACE_HAS_SYSCALL_GETRUSAGE HP/UX has an undefined syscall - for GETRUSAGE... -ACE_HAS_SYSCALL_H Compiler/platform contains the - file. -ACE_HAS_SYSENT_H Platform provides - header -ACE_HAS_SYSINFO Platform supports system - configuration information -ACE_HAS_SYSV_IPC Platform supports System V IPC - (most versions of UNIX, but - not Win32) -ACE_HAS_SYS_ERRLIST Platform/compiler supports - _sys_errlist symbol -ACE_HAS_SYS_FILIO_H Platform provides - header -ACE_HAS_SYS_SIGLIST Compiler/platform supports - _sys_siglist array -ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA Compiler's template - instantiation mechanism - supports the use of "#pragma - instantiate". Edison Design - Group compilers, e.g., SGI C++ - and Green Hills 1.8.8 and - later, support this. -ACE_HAS_TEMPLATE_SPECIALIZATION Compiler implements template - specialization -ACE_HAS_TEMPLATE_TYPEDEFS Compiler implements templates - that support typedefs inside - of classes used as formal - arguments to a template - class. -ACE_HAS_TERM_IOCTLS Platform has terminal ioctl - flags like TCGETS and TCSETS. -ACE_HAS_LAZY_MAP_MANAGER ACE supports lazy Map Managers - that allow deletion of entries - during active iteration. -ACE_HAS_THREADS Platform supports threads -ACE_HAS_THREAD_SAFE_ACCEPT Platform allows multiple - threads to call accept() on - the same port (e.g., WinNT). -ACE_HAS_THREAD_SELF Platform has thread_self() - rather than pthread_self() - (e.g., DCETHREADS and AIX) -ACE_HAS_THREAD_SPECIFIC_STORAGE Compiler/platform has - thread-specific storage -ACE_HAS_THR_C_DEST The pthread_keycreate() - routine *must* take extern C - functions. -ACE_HAS_THR_C_FUNC The pthread_create() routine - *must* take extern C - functions. -ACE_HAS_TIMEZONE_GETTIMEOFDAY Platform/compiler supports - timezone * as second parameter - to gettimeofday() -ACE_HAS_TIMOD_H Platform supports TLI timod - STREAMS module -ACE_HAS_TIUSER_H Platform supports TLI tiuser - header -ACE_HAS_TLI Platform supports TLI. Also - see ACE_TLI_TCP_DEVICE. -ACE_HAS_TLI_PROTOTYPES Platform provides TLI function - prototypes -ACE_HAS_TSS_EMULATION ACE provides TSS emulation. - See also - ACE_DEFAULT_THREAD_KEYS. -ACE_HAS_UALARM Platform supports ualarm() -ACE_HAS_UCONTEXT_T Platform supports ucontext_t - (which is used in the extended - signal API). -ACE_HAS_UNION_WAIT The wait() system call takes a - (union wait *) rather than int - * -ACE_HAS_UNIXWARE_SVR4_SIGNAL_T Has inconsistent SVR4 signal - stuff, but not the same as the - other platforms -ACE_HAS_USING_KEYWORD Compiler supports the new - using keyword for C++ - namespaces. -ACE_HAS_VERBOSE_NOTSUP Prints out console message in - ACE_NOTSUP. Useful for - tracking down origin of - ACE_NOTSUP. -ACE_HAS_VOIDPTR_MMAP Platform requires void * for - mmap(). -ACE_HAS_VOIDPTR_SOCKOPT OS/compiler uses void * arg 4 - setsockopt() rather than const - char * -ACE_HAS_WCSNLEN Platform supports wcsnlen(3). -ACE_HAS_WIN32_TRYLOCK The Win32 platform support - TryEnterCriticalSection() - (WinNT 4.0 and beyond) -ACE_HAS_WINSOCK2 The Win32 platform supports - WinSock 2.0 -ACE_HAS_XLI Platform has the XLI version - of TLI -ACE_HAS_XT Platform has Xt and Motif -ACE_HAS_XTI Platform has XTI - (X/Open-standardized superset - of TLI). Implies ACE_HAS_TLI - but uses a different header - file. -ACE_LACKS_ACCESS Platform lacks access() (e.g., - VxWorks and Chorus) -ACE_LACKS_ACE_IOSTREAM Platform can not build - ace/IOStream{,_T}.cpp. This - does not necessarily mean that - the platform does not support - iostreams. -ACE_LACKS_AUTO_MMAP_REPLACEMENT No system support for replacing any - previous mappings. -ACE_LACKS_BSEARCH Compiler/platform lacks the - standard C library bsearch() - function -ACE_LACKS_CLEARERR Platform lacks the clearerr system - call. -ACE_LACKS_CMSG_DATA_MACRO Platform has - ACE_HAS_4_4BSD_SENDMSG_RECVMSG but does - not define CMSG_DATA (cmsg) macro. -ACE_LACKS_CMSG_DATA_MEMBER Platform has - ACE_HAS_4_4BSD_SENDMSG_RECVMSG but its - cmsghdr structure does not contain - an 'unsigned char cmsg_data[0]' - member. (This may be - 'unsigned char __cmsg_data[0]' on some - platforms, in which case we need - another macro.) -ACE_LACKS_COND_TIMEDWAIT_RESET pthread_cond_timedwait does - *not* reset the time argument - when the lock is acquired. -ACE_LACKS_CONST_STRBUF_PTR Platform uses struct strbuf * - rather than const struct - strbuf * (e.g., HP/UX 10.x) -ACE_LACKS_CONST_TIMESPEC_PTR Platform forgot const in - cond_timewait (e.g., HP/UX). -ACE_LACKS_COND_T Platform lacks condition - variables (e.g., Win32 and - VxWorks) -ACE_LACKS_CONDATTR_PSHARED Platform has no implementation - of - pthread_condattr_setpshared(), - even though it supports - pthreads! -ACE_LACKS_DIFFTIME Platform lacks difftime() implementation -ACE_LACKS_FCNTL Platform lacks POSIX-style fcntl (). -ACE_LACKS_FSYNC Platform lacks fsync(). -ACE_LACKS_INLINE_FUNCTIONS Platform can't handle "inline" - keyword correctly. -ACE_LACKS_EXEC Platform lacks the exec() - family of system calls (e.g., - Win32, VxWorks, Chorus) -ACE_LACKS_FILELOCKS Platform lacks file locking - mechanism -ACE_LACKS_FLOATING_POINT Platform does not support - floating point operations - (e.g., certain Chorus hardware - platforms) -ACE_LACKS_FORK Platform lacks the fork() - system call (e.g., Win32, - VxWorks, Chorus) -ACE_LACKS_GETOPT_PROTO Platform lacks the getopt() - prototype (e.g., LynxOS) -ACE_LACKS_GETPGID Platform lacks getpgid() call - (e.g., Win32, Chorus, and - FreeBSD). -ACE_LACKS_GETSERVBYNAME Platforms lacks - getservbyname() (e.g., VxWorks - and Chorus). -ACE_LACKS_INET_ATON Platform lacks the inet_aton() - function. -ACE_LACKS_IOSTREAMS_TOTALLY Iostreams are not supported - adequately on the given platform. -ACE_LACKS_IOSTREAM_FX iostream header does not - declare ipfx (), opfx (), - etc. -ACE_LACKS_KEY_T Platform lacks key_t (e.g., - Chorus, VxWorks, Win32) -ACE_LACKS_LINEBUFFERED_STREAMBUF Platform lacks streambuf - "linebuffered ()". -ACE_LACKS_LONGLONG_T Compiler/platform does no - supports the unsigned long - long datatype. -ACE_LACKS_LSTAT Platform lacks the lstat() function. -ACE_LACKS_MADVISE Platform lacks madvise() - (e.g., Linux) -ACE_LACKS_MALLOC_H Platform lacks malloc.h -ACE_LACKS_MEMORY_H Platform lacks memory.h (e.g., - VxWorks and Chorus) -ACE_LACKS_MKFIFO Platform lacks mkfifo() e.g., - VxWorks, Chorus, pSoS, and WinNT. -ACE_LACKS_MKTEMP ACE has no mktemp() -ACE_LACKS_MMAP The platform doesn't have - mmap(2) (e.g., SCO UNIX). -ACE_LACKS_MODE_MASKS Platform/compiler doesn't have - open() mode masks. -ACE_LACKS_MPROTECT The platform doesn't have - mprotect(2) (e.g., EPLX real - time OS from CDC (based on - LYNX)) -ACE_LACKS_MSG_ACCRIGHTS Platform defines ACE_HAS_MSG, - but lacks msg_accrights{,len}. -ACE_LACKS_MSG_WFMO Platform lacks - MsgWaitForMultipleObjects - (only needs to be defined when - ACE_WIN32 is also defined). -ACE_LACKS_MSGBUF_T Platform lacks struct msgbuf - (e.g., NT and MSV). -ACE_LACKS_MSYNC Platform lacks msync() (e.g., - Linux) -ACE_LACKS_MUTEXATTR_PSHARED Platform lacks - pthread_mutexattr_setpshared(). -ACE_LACKS_NAMED_POSIX_SEM Platform lacks named POSIX - semaphores (e.g., Chorus) -ACE_LACKS_NETDB_REENTRANT_FUNCTIONS Platform does not support - reentrant netdb functions - (getprotobyname_r, - getprotobynumber_r, - gethostbyaddr_r, - gethostbyname_r, - getservbyname_r). -ACE_LACKS_NEW_H OS doesn't have, or we don't want to - use, new.h. -ACE_LACKS_NULL_PTHREAD_STATUS OS requires non-null status pointer - for ::pthread_join (). -ACE_LACKS_PARAM_H Platform lacks - (e.g., MVS) -ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filtering - of multicast dgrams at the socket level. - If == 1, ACE_SOCK_Dgram_Mcast will bind - the first joined multicast group to the - socket, and all future joins on that - socket will fail with an error. -ACE_LACKS_POSIX_PROTOTYPES Platform lacks POSIX - prototypes for certain System - V functions like shared memory - and message queues. -ACE_LACKS_PRAGMA_ONCE Compiler complains about #pragma once -ACE_LACKS_PRI_T Platform lacks pri_t (e.g., - Tandem NonStop UNIX). -ACE_LACKS_PTHREAD_CANCEL Platform lacks - pthread_cancel(). -ACE_LACKS_PTHREAD_SIGMASK Platform lacks pthread_sigmask (). -ACE_LACKS_PTHREAD_THR_SIGSETMASK Platform lacks - pthread_thr_sigsetmask (e.g., - MVS, HP/UX, and OSF/1 3.2) -ACE_LACKS_PWD_REENTRANT_FUNCTIONS Platform lacks getpwnam_r() - methods (e.g., SGI 6.2). -ACE_LACKS_QSORT Compiler/platform lacks the - standard C library qsort() - function -ACE_LACKS_RAND_REENTRANT_FUNCTIONS Platform lacks rand_r() -ACE_LACKS_READLINK Platform lacks the readlink() function. -ACE_LACKS_READV Platform doesn't define readv, - so use our own -ACE_LACKS_RENAME Platform lacks rename(). -ACE_LACKS_RLIMIT Platform/compiler lacks - {get,set}rlimit() function - (e.g., VxWorks, Chorus, and - SCO UNIX) -ACE_LACKS_RLIMIT_PROTOTYPE Platform/compiler lacks - {get,set}rlimit() prototypes - (e.g., Tandem) -ACE_LACKS_RTTI Compiler does not support - dynamic_cast. Usually used - with ACE_HAS_ANSI_CASTS. -ACE_LACKS_READDIR_R Platform uses ACE_HAS_DIRENT - but does not have readdir_r - (). -ACE_LACKS_RECVMSG Platform lacks recvmsg() - (e.g., Linux) -ACE_LACKS_RWLOCK_T Platform lacks readers/writer - locks. -ACE_LACKS_SBRK Platform lacks a working - sbrk() (e.g., Win32 and - VxWorks) -ACE_LACKS_SEEKDIR Platform uses ACE_HAS_DIRENT - but does not have seekdir (). -ACE_LACKS_SEMBUF_T Platform lacks struct sembuf - (e.g., Win32 and VxWorks) -ACE_LACKS_SETDETACH Platform lacks - pthread_attr_setdetachstate() - (e.g., HP/UX 10.x) -ACE_LACKS_SETSCHED Platform lacks - pthread_attr_setsched() - (e.g. MVS) -ACE_LACKS_SIGACTION Platform lacks struct - sigaction (e.g., Win32 and - Chorus) -ACE_LACKS_SIGNED_CHAR Platform lacks "signed char" - type (broken!) -ACE_LACKS_SIGSET Platform lacks signal sets - (e.g., Chorus and Win32) -ACE_LACKS_SOME_POSIX_PROTOTYPES Platform lacks POSIX - prototypes for certain System - V functions like shared memory - and message queues. -ACE_LACKS_NATIVE_STRPTIME Platform/compiler lacks the strptime() - function. -ACE_LACKS_STRRCHR Platform/compiler lacks - strrchr () function. -ACE_LACKS_WCSRCHR Platform/compiler lacks wcsrchr () - function -ACE_LACKS_SYS_NERR Platforms/compiler lacks the - sys_nerr variable (e.g., - VxWorks and MVS). -ACE_LACKS_SYSTIME_H doesn't automatically - #include /**/ -ACE_LACKS_SYSV_MSG_H Platform lacks sys/msg.h - (e.g., Chorus and VxWorks) -ACE_LACKS_SENDMSG Platform lacks sendmsg() - (e.g., Linux) -ACE_LACKS_SI_ADDR Platform lacks the si_addr - field of siginfo_t (e.g., - VxWorks and HP/UX 10.x) -ACE_LACKS_SYSV_SHMEM Platform lacks System V shared - memory (e.g., Win32 and - VxWorks) -ACE_LACKS_SIGINFO_H Platform lacks the siginfo.h - include file (e.g., MVS) -ACE_LACKS_SOCKET_BUFSIZ Platform doesn't support - SO_SNDBUF/SO_RCVBUF -ACE_LACKS_SOCKETPAIR Platform lacks the - socketpair() call (e.g., SCO - UNIX) -ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES Compiler doesn't support - static data member templates -ACE_LACKS_STRCASECMP Compiler/platform lacks - strcasecmp() (e.g., DG/UX, - UNIXWARE, VXWORKS) -ACE_LACKS_STRRECVFD Platform doesn't define struct - strrecvfd. -ACE_LACKS_SYSCALL Platform doesn't have - syscall() prototype -ACE_LACKS_T_ERRNO Header files lack t_errno for - TLI -ACE_LACKS_TCP_H Platform doesn't have - netinet/tcp.h -ACE_LACKS_TCP_NODELAY OS does not support TCP_NODELAY. -ACE_LACKS_TELLDIR Platform uses ACE_HAS_DIRENT - but does not have telldir (). -ACE_LACKS_THREAD_STACK_SIZE Platform lacks - pthread_attr_setstacksize() - (e.g., Linux pthreads) -ACE_LACKS_TIMEDWAIT_PROTOTYPES MIT pthreads platform lacks - the timedwait prototypes -ACE_LACKS_TIMESPEC_T Platform does not define - timepec_t as a typedef for - struct timespec. -ACE_LACKS_TRUNCATE Platform doesn't have truncate() - (e.g., vxworks) -ACE_LACKS_U_LONGLONG_T Platform does not have - u_longlong_t typedef, and - "sun" is defined. -ACE_LACKS_UALARM_PROTOTYPE Platform/compiler lacks the - ualarm() prototype (e.g., - Solaris) -ACE_LACKS_CHAR_RIGHT_SHIFTS Compiler does not have any istream - operator>> for chars, u_chars, or - signed chars. -ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS Compiler does not have - operator>> (istream &, u_char *) or - operator>> (istream &, signed char *) -ACE_LACKS_UCONTEXT_H Platform lacks the ucontext.h - file -ACE_LACKS_UNBUFFERED_STREAMBUF Platform lacks streambuf - "unbuffered ()". -ACE_LACKS_UNISTD_H Platform lacks the unistd.h - file (e.g., VxWorks and Win32) -ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX - domain sockets -ACE_LACKS_UNIX_SIGNALS Platform lacks full signal - support (e.g., Win32 and - Chorus). -ACE_LACKS_UTSNAME_T Platform lacks struct utsname - (e.g., Win32 and VxWorks) -ACE_LACKS_WILDCARD_BIND The bind() call will not - select the port if it's 0. - -ACE_LACKS_WRITEV Platform doesn't define - writev, so use our own - -ACE_LEGACY_MODE When defined, it will enable some code that is - used to provide some support for backwards - compatibility. - -ACE_NEEDS_DEV_IO_CONVERSION Necessary with some compilers - to pass ACE_TTY_IO as - parameter to DEV_Connector. -ACE_NEEDS_FUNC_DEFINITIONS Compiler requires a definition - for a "hidden" function, e.g., - a private, unimplemented copy - constructor or assignment - operator. The SGI C++ - compiler needs this, in - template classes, with - ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA. -ACE_NEEDS_HUGE_THREAD_STACKSIZE Required by platforms with small default stacks. -ACE_NEEDS_LWP_PRIO_SET OS has LWPs, and when the - priority of a bound thread is - set, then the LWP priority - must be set also. -ACE_NEEDS_SCHED_H Platform needs to #include - - to get thread scheduling - defs. - -ACE_NO_WIN32_LEAN_AND_MEAN If this is set, then ACE does not - define WIN32_LEAN_AND_MEAN before - including . Needed for - code that uses non-lean Win32 - facilities such as COM. - -ACE_ONLY_LATEST_AND_GREATEST A macro that indicates that the "latest and greatest" - features of ACE/TAO should be turned on. It has been - replaced by ACE_LEGACY_MODE, which has the opposite - meaning but serves the same purpose. - -ACE_WSTRING_HAS_USHORT_SUPPORT If a platform has wchar_t as a separate type, - then ACE_WString doesn't have a constructor that - understands an ACE_USHORT16 string. So this - macro enables one. (mostly used my ACE Name Space). - -ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK - Under QNX/RTP the objects preallocated - in ACE_OS_Object_Manager cannot be - destroyed after a fork() call. - Since these objects are only destroyed - at application shutdown we take the - simpler approach of not destroying - them at all. - Both QNX/RTP and LynxOS suffer from - this problem. ----------------------------------------- - -The following macros determine the svc.conf file format ACE uses. - -Macro Description ------ ----------- -ACE_HAS_CLASSIC_SVC_CONF This macro forces ACE to use the classic - svc.conf format. - -ACE_HAS_XML_SVC_CONF This macro forces ACE to use the XML - svc.conf format. - -ACE_USES_CLASSIC_SVC_CONF This macro should be defined as 0 or 1, depending - on the preferred svc.conf file format. - Defining this macro to 0 means ACE will use XML - svc.conf file format. Defining it to 1 will - force ACE to use the classic svc.conf format. - ** This macro takes precedence over previous - ** two macros. ----------------------------------------- -The following is a partial list of where some of these macros are used -in the code. This list was originally compiled by Jam Hamidi -(jh1@core01.osi.com). It is now hopelessly out of date. Hopefully, -someone will come along and update it.... - -ACE_HAS_ALLOCA: ---------------- - - Used in: - libsrc/IPC_SAP/SOCK_SAP/SOCK_Connect.C - for allocation of iovp -A - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Msg.C - for alocation of iovp - - In solaris: - alloca() allocates size bytes of space in the stack frame of - the caller, and returns a pointer to the allocated block. - This temporary space is automatically freed when the caller - returns. Note: if the allocated block is beyond the current - stack limit, the resulting behavior is undefined. - - In HPUX: - no equivalent. - - Notes: - in HPUX it has to do new and delete. Affects performance. - - -ACE_HAS_AUTOMATIC_INIT_FINI: ----------------------------- - - Used in: - libsrc/Service_Configurator/Service_Repository.i - libsrc/Service_Configurator/Parse_Node.i - include/Parse_Node.i - include/Service_Repository.i - - In solaris: - _init() initializes a loadable module. It is called before - any other routine in a loadable module. - _info() returns information about a loadable module. - _fini() should return the return value from mod_remove(9F). - This flag if set, doesn't do anything. If not set, forces - _init() and _fini() to be executed as is: - dlsym ((char *) handle, "_fini"). - - In HPUX: - don't set. - Maybe have to look into shl_load( ), shl_definesym( ), - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - Means Service Configurator won't be available. - TBA. - - -ACE_HAS_CPLUSPLUS_HEADERS: --------------------------- - - Used In: - ace/OS.h - - HPUX: - set it. - - Notes: - If this is not defined, libc.h and osfcn.h get included. - Only needed for older compiler/OS platforms that don't - provide standard C++ header files in /usr/include. - -ACE_HAS_HI_RES_TIMER: ---------------------- - - Used In: - libsrc/Misc/High_Res_Timer.h - libsrc/Misc/High_Res_Timer.C - include/High_Res_Timer.h - - In Solaris, - C++ wrapper around gethrtime(), which returns a long long. - gethrtime() returns the current high-resolution real time. - Time is expressed as nanoseconds since some arbitrary time - in the past; it is not correlated in any way to the time of - day, and thus is not subject to resetting, drifting, etc. - - In HPUX - look into: getclock(), reltimer(), getitimer() - maybe even vtimes structure vm_utime, vm_stime ? - - Notes: - TBA - - -ACE_LACKS_T_ERRNO: -------------------- - - Used In: - ace/OS.h - - HPUX: - set it. - - Notes: - if set, adds: - extern int t_errno; - - -ACE_HAS_POSIX_NONBLOCK: ------------------------ - - Used in: - ace/OS.h - - HPUX: - set it. - - Notes: - if defined, sets ACE_NONBLOCK and O_NONBLOCK - O_NONBLOCK is used in libsrc/Misc/misc.C to do a - fcntl (fd, F_SETFL, opt) - ACE_NONBLOCK is used in libsrc/IPC_SAP/FIFO_SAP/FIFO_Recv.C in the - disable member function and options passed to the open function - in libsrc/IPC_SAP/FIFO_SAP/FIFO.C - - -ACE_HAS_PROC_FS: ----------------- - - Used in: - ace/OS.h - libsrc/Misc/Profile_Timer.i - - Notes: - if set, includes - the PIOCUSAGE define is used in Profile_Timer. - - Solaris: - procfs.h defines things for the prpsinfo structure (basically to - do a "ps" from inside a program). - - HPUX: - don't set: obviously a different mechanism. - Look into /usr/include/sys/proc.h. The structure is proc. The - pointer to the kernel's proc table may be obtained by - extern struct proc *proc, *procNPROC; - extern int nproc; - - -ACE_HAS_PRUSAGE_T: ------------------- - - Used in: - libsrc/Misc/Profile_Timer.h - libsrc/Misc/Profile_Timer.C - - Notes: - If defined, declares the Profile_Timer class that does start(), - stop() and basically gets real_time, user_time, system_time for - an interval. - This stuff is highly non-portable. - - HPUX: - don't set - - -ACE_HAS_SEMUN: --------------- - - Used in: - libsrc/Semaphores/Semaphore_Simple.h - - Notes: - if not defined, defines semun as: - union semun { - int val; /* value for SETVAL */ - struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ - ushort *array; /* array for GETALL & SETALL */ - }; - - HPUX: - don't set. - in /usr/include/sem.h: - /* The fourth argument to semctl() varies depending on the value of - its first argument. If desired, "union semun" can be declared - by the user, but this is not necessary since the individual - member can just be passed as the argument. */ - - -ACE_HAS_SIG_ATOMIC_T: ---------------------- - - Used in: - ace/OS.h - - Notes: - if not defined, does a: - typedef int sig_atomic_t; - This is used in the Reactor and service configurator. - - HPUX: - set it. - in /usr/include/sys/signal.h: - typedef unsigned int sig_atomic_t; - - -ACE_HAS_SSIZE_T: ----------------- - - Used in: - ace/OS.h - - Notes: - if not defined, does a - typedef int ssize_t; - used mostly in IPC_SAP. (don't confuse with size_t). - - HPUX: - set it. - in /usr/include/sys/types.h - - -ACE_HAS_STRBUF_T: ------------------ - - Used in: - include/Str_Buf.h - - Notes: - if not defined, declares the strbuf structure as: - struct strbuf - { - int maxlen; /* no. of bytes in buffer */ - int len; /* no. of bytes returned */ - void *buf; /* pointer to data */ - }; - - Solaris: - defined in /usr/include/sys/stropts.h - Sys V.4 Streams. - uses strbuf as parameter to putmsg, putpmsg: - int putmsg(int fildes, const struct strbuf *ctlptr, - const struct strbuf *dataptr, int flags); - - HPUX: - don't set. - no SYS V.4 streams. - - -ACE_HAS_STREAMS: ----------------- - - Used In: - ace/OS.h - libsrc/IPC_SAP/SOCK_SAP/LSOCK.C - - Notes: - if defined, includes - - HPUX: - don't set. - no SYS V.4 streams. - - -ACE_HAS_STREAM_PIPES: ---------------------- - - Used in: - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Msg.h - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Msg.C - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Listener.h - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Listener.C - libsrc/IPC_SAP/SPIPE_SAP/SPIPE.h - libsrc/IPC_SAP/SPIPE_SAP/SPIPE.C - libsrc/IPC_SAP/FIFO_SAP/FIFO_Send_Msg.h - libsrc/IPC_SAP/FIFO_SAP/FIFO_Send_Msg.C - libsrc/IPC_SAP/FIFO_SAP/FIFO_Send_Msg.i - libsrc/IPC_SAP/FIFO_SAP/FIFO_Recv_Msg.h - libsrc/IPC_SAP/FIFO_SAP/FIFO_Recv_Msg.C - libsrc/IPC_SAP/FIFO_SAP/FIFO_Recv_Msg.i - - Notes: - if not set, won't be able to use the SPIPE class (IPC_SAP) with - rendezvous handles. - - HPUX: - don't set. - No sysV.4 streams. - - -ACE_HAS_STRERROR: ------------------ - - Used in: - ace/OS.h - - Notes: - if not defined, does a: - #define strerror(err) sys_errlist[err] - - Solaris: - /usr/include/string.h - - HPUX: - set it. - in /usr/include/sys/errno.h and string.h - extern char *strerror (int); - - -ACE_HAS_SVR4_DYNAMIC_LINKING: ------------------------------ - - Used in: - ace/OS.h - tests/Service_Configurator/CCM_App.C - - Notes: - if defined, includes - with dlopen(), dlsym(), etc.. - - HPUX: - don't set. - has its own: - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - - -ACE_HAS_SVR4_GETTIMEOFDAY: --------------------------- - - Used in: - ace/OS.h - libsrc/Reactor/Timer_Queue.i - - Notes: - has to do with gettimeofday (). - - Solaris: - gettimeofday (struct timeval *tp) - - HPUX: - don't set. - it has gettimeofday (struct timeval *tp, struct timezone *tzp); - most calls do a: - #if defined (ACE_HAS_SVR4_GETTIMEOFDAY) - ::gettimeofday (&cur_time); - #else - ::gettimeofday (&cur_time, 0); - #endif /* ACE_HAS_SVR4_GETTIMEOFDAY */ - - -ACE_HAS_POLL: ------------- - Used in: - ace/OS.h - - Notes: - #if defined (ACE_HAS_POLL) - #include /**/ - #endif /* ACE_HAS_POLL */ - -ACE_USE_POLL_IMPLEMENTATION: ------------------- - - Used in: - ace/OS.h - - Notes: - Use the poll() event demultiplexor rather than select(). - - HPUX: - set it. - - -ACE_HAS_SVR4_SIGNAL_T: ----------------------- - - Used in: - ace/OS.h - - Notes: - #if defined (ACE_HAS_SVR4_SIGNAL_T) - typedef void (*SignalHandler)(int); - typedef void (*SignalHandlerV)(void); - #elif defined (ACE_HAS_SIGNALHANDLERV_INT_ARG) - typedef void (*SignalHandler)(int); - typedef void (*SignalHandlerV)(int); - #else - #define SignalHandler SIG_PF - typedef void (*SignalHandlerV)(...); - #endif /* ACE_HAS_SVR4_SIGNAL_T */ - - HPUX: - set it. - - -ACE_HAS_SVR4_TLI: ------------------ - - Used in: - libsrc/IPC_SAP/TLI_SAP/TLI.C - libsrc/IPC_SAP/TLI_SAP/TLI.h - libsrc/IPC_SAP/TLI_SAP/TLI_Stream.C - - Notes: - TLI is the transport layer calls as in: t_bind(), t_open(), t_unbind(), - t_optmgmt(), ... in SunOS and Solaris. - - HPUX: - don't set. - Not supported. - - -ACE_HAS_SYS_FILIO_H: --------------------- - - Used in: - ace/OS.h - - Notes: - if not defined, includes . - didn't find any reference to anything in this file in the ACE code. - - Solaris: - filio.h defines FIOCLEX, FIOASYNC, ... as _IO('f', 1), .. - for FIOLFS,.. solaris has this to say: - /* - * ioctl's for Online: DiskSuite. - * WARNING - the support for these ioctls may be withdrawn - * in the future OS releases. - */ - - HPUX: - defines FIOASYNC and some other ones, - defines some like FIOCLEX. - some are never defined. - use #ifdef HP-UX to modify sysincludes.h - - -ACE_HAS_SYS_SIGLIST: --------------------- - - Used in: - ace/OS.h - libsrc/Log_Msg/Log_Msg.C - - Notes: - if not defined, does a: - extern const char **_sys_siglist; - - Solaris: - This is an array holding signal descriptions. - - HPUX: - don't set. - Some additional work is required. In libsrc/Log_Msg/Log_Msg.C, - sys_siglist is used regardless of ACE_HAS_SYS_SIGLIST. - have to add #ifdefs to remove them. - - -ACE_HAS_TEMPLATE_TYPEDEFS: --------------------------- - - Used in: - libsrc/ASX/*.[Chi] - - Notes: - cfront-based C++ compilers don't implement templates that support - classes with typedefs of other types as formal arguments. This - typedef uses the C++ preprocessor to work around this problem. - -ACE_HAS_THREADS: ----------------- - - Used in: - libsrc/Service_Configurator/Svc_Conf.y.C - libsrc/Service_Configurator/Thread_Spawn.i - libsrc/Threads/Synch.C - libsrc/Threads/Synch.i - libsrc/Threads/Thr_Manager.i - libsrc/ASX/STREAM.C - libsrc/ASX/Queue.C - libsrc/ASX/Module.C - libsrc/ASX/Stream_Modules.C - libsrc/ASX/Multiplexor.C - libsrc/ASX/Message_List.C - include/Message_List.h - include/Module.h - include/Multiplexor.h - include/Queue.h - include/STREAM.h - include/Stream_Modules.h - include/Service_Types.h - include/Thread_Spawn.h - include/Synch.h - include/Thr_Manager.h - - Notes: - We use Message_List.h even in a non-threaded environment. - our XOMessageList.h does this by #ifdefs around Threaded things. - - HPUX: - not until 10.0. - - -ACE_HAS_THREAD_T: ------------------ - - Used in: - ace/OS.h - - Notes: - #if !defined (ACE_HAS_THREAD_T) - typedef int thread_t; - #endif /* !ACE_HAS_THREAD_T */ - - HPUX: - don't set. - - -ACE_HAS_TIMOD_H: ----------------- - - Used in: - ace/OS.h - - Notes: - if defined, include - - Solaris: - timod is a STREAMS module for use with the Transport Inter- - face (TI) functions of the Network Services library. The - timod module converts a set of ioctl(2) calls into STREAMS - messages that may be consumed by a transport protocol pro- - vider that supports the Transport Interface. This allows a - user to initiate certain TI functions as atomic operations. - - HPUX: - don't set. - - -ACE_HAS_TIUSER_H: ------------------ - - Used in: - ace/OS.h - - Notes: - if set, includes - - Solaris: - in conjunction with t_bind, t_accept, etc.. transport layer. - - HPUX: - don't set. - - -ACE_USE_POLL_IMPLEMENTATION: ----------------------------- - - Used in: - libsrc/Reactor/Reactor.i - include/Event_Handler.h - ace/OS.h - include/Reactor.h - - Notes: - in the reactor, use poll instead of select. In general, - good thing to have set. diff --git a/ace/RMCast/Makefile b/ace/RMCast/Makefile deleted file mode 100644 index 403728fc1ec..00000000000 --- a/ace/RMCast/Makefile +++ /dev/null @@ -1,2051 +0,0 @@ -#---------------------------------------------------------------------------- -# -# $Id$ -# -#---------------------------------------------------------------------------- - -MAKEFILE = Makefile -LIB = libACE_RMCast.a -SHLIB = libACE_RMCast.$(SOEXT) - -FILES= \ - RMCast \ - RMCast_Ack_Worker \ - RMCast_Fork \ - RMCast_Fragment \ - RMCast_IO_UDP \ - RMCast_Membership \ - RMCast_Module \ - RMCast_Module_Factory \ - RMCast_Partial_Message \ - RMCast_Proxy \ - RMCast_Reassembly \ - RMCast_Receiver_Module \ - RMCast_Reliable_Factory \ - RMCast_Reordering \ - RMCast_Resend_Handler \ - RMCast_Resend_Worker \ - RMCast_Retransmission \ - RMCast_Sequencer \ - RMCast_Singleton_Factory \ - RMCast_UDP_Event_Handler \ - RMCast_UDP_Proxy \ - RMCast_UDP_Reliable_Receiver \ - RMCast_UDP_Reliable_Sender - -LIBS=$(ACELIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -LSRC = $(addsuffix .cpp,$(FILES)) - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -ifeq ($(shared_libs),1) -ifneq ($(SHLIB),) -CPPFLAGS += -DACE_RMCAST_BUILD_DLL -endif -endif - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/RMCast.o .obj/RMCast.so .shobj/RMCast.o .shobj/RMCast.so: RMCast.cpp RMCast.h $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i - -.obj/RMCast_Ack_Worker.o .obj/RMCast_Ack_Worker.so .shobj/RMCast_Ack_Worker.o .shobj/RMCast_Ack_Worker.so: RMCast_Ack_Worker.cpp RMCast_Ack_Worker.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Retransmission.h \ - RMCast_Module.h RMCast.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ - RMCast_Worker.cpp $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ - RMCast_Copy_On_Write.cpp $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i RMCast_Retransmission.i \ - RMCast_Ack_Worker.i $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp - -.obj/RMCast_Fork.o .obj/RMCast_Fork.so .shobj/RMCast_Fork.o .shobj/RMCast_Fork.so: RMCast_Fork.cpp RMCast_Fork.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i RMCast_Fork.i - -.obj/RMCast_Fragment.o .obj/RMCast_Fragment.so .shobj/RMCast_Fragment.o .shobj/RMCast_Fragment.so: RMCast_Fragment.cpp RMCast_Fragment.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h RMCast_Fragment.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h - -.obj/RMCast_IO_UDP.o .obj/RMCast_IO_UDP.so .shobj/RMCast_IO_UDP.o .shobj/RMCast_IO_UDP.so: RMCast_IO_UDP.cpp RMCast_IO_UDP.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RMCast_IO_UDP.i \ - RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ - RMCast_Module_Factory.h RMCast_Module_Factory.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp - -.obj/RMCast_Membership.o .obj/RMCast_Membership.so .shobj/RMCast_Membership.o .shobj/RMCast_Membership.so: RMCast_Membership.cpp RMCast_Membership.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp RMCast_Membership.i \ - RMCast_Proxy.h RMCast_Proxy.i - -.obj/RMCast_Module.o .obj/RMCast_Module.so .shobj/RMCast_Module.o .shobj/RMCast_Module.so: RMCast_Module.cpp RMCast_Module.h \ - $(ACE_ROOT)/ace/pre.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i - -.obj/RMCast_Module_Factory.o .obj/RMCast_Module_Factory.so .shobj/RMCast_Module_Factory.o .shobj/RMCast_Module_Factory.so: RMCast_Module_Factory.cpp \ - RMCast_Module_Factory.h $(ACE_ROOT)/ace/pre.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module_Factory.i - -.obj/RMCast_Partial_Message.o .obj/RMCast_Partial_Message.so .shobj/RMCast_Partial_Message.o .shobj/RMCast_Partial_Message.so: RMCast_Partial_Message.cpp \ - RMCast_Partial_Message.h $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - RMCast_Partial_Message.i - -.obj/RMCast_Proxy.o .obj/RMCast_Proxy.so .shobj/RMCast_Proxy.o .shobj/RMCast_Proxy.so: RMCast_Proxy.cpp RMCast_Proxy.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i RMCast_Proxy.i - -.obj/RMCast_Reassembly.o .obj/RMCast_Reassembly.so .shobj/RMCast_Reassembly.o .shobj/RMCast_Reassembly.so: RMCast_Reassembly.cpp RMCast_Reassembly.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RMCast_Reassembly.i \ - RMCast_Partial_Message.h $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - RMCast_Partial_Message.i - -.obj/RMCast_Receiver_Module.o .obj/RMCast_Receiver_Module.so .shobj/RMCast_Receiver_Module.o .shobj/RMCast_Receiver_Module.so: RMCast_Receiver_Module.cpp \ - RMCast_Receiver_Module.h $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i RMCast_Receiver_Module.i RMCast_Proxy.h RMCast_Proxy.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl - -.obj/RMCast_Reliable_Factory.o .obj/RMCast_Reliable_Factory.so .shobj/RMCast_Reliable_Factory.o .shobj/RMCast_Reliable_Factory.so: RMCast_Reliable_Factory.cpp \ - RMCast_Reliable_Factory.h $(ACE_ROOT)/ace/pre.h \ - RMCast_Module_Factory.h RMCast.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module_Factory.i RMCast_Reliable_Factory.i \ - RMCast_Receiver_Module.h RMCast_Module.h RMCast_Module.i \ - RMCast_Receiver_Module.i RMCast_Reassembly.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RMCast_Reassembly.i \ - RMCast_Reordering.h $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp RMCast_Reordering.i - -.obj/RMCast_Reordering.o .obj/RMCast_Reordering.so .shobj/RMCast_Reordering.o .shobj/RMCast_Reordering.so: RMCast_Reordering.cpp RMCast_Reordering.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i RMCast_Reordering.i \ - RMCast_Proxy.h RMCast_Proxy.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp - -.obj/RMCast_Resend_Handler.o .obj/RMCast_Resend_Handler.so .shobj/RMCast_Resend_Handler.o .shobj/RMCast_Resend_Handler.so: RMCast_Resend_Handler.cpp \ - RMCast_Resend_Handler.h $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Event_Handler.i RMCast_Resend_Handler.i \ - RMCast_Retransmission.h RMCast_Module.h RMCast.h RMCast.i \ - RMCast_Module.i RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ - RMCast_Worker.cpp $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ - RMCast_Copy_On_Write.cpp $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i RMCast_Retransmission.i - -.obj/RMCast_Resend_Worker.o .obj/RMCast_Resend_Worker.so .shobj/RMCast_Resend_Worker.o .shobj/RMCast_Resend_Worker.so: RMCast_Resend_Worker.cpp RMCast_Resend_Worker.h \ - $(ACE_ROOT)/ace/pre.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ - RMCast_Worker.cpp $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ - RMCast_Copy_On_Write.cpp RMCast_Resend_Worker.i RMCast_Module.h \ - RMCast_Module.i - -.obj/RMCast_Retransmission.o .obj/RMCast_Retransmission.so .shobj/RMCast_Retransmission.o .shobj/RMCast_Retransmission.so: RMCast_Retransmission.cpp \ - RMCast_Retransmission.h $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ - RMCast_Worker.cpp $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ - RMCast_Copy_On_Write.cpp $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i RMCast_Retransmission.i \ - RMCast_Proxy.h RMCast_Proxy.i RMCast_Ack_Worker.h RMCast_Ack_Worker.i \ - RMCast_Resend_Worker.h RMCast_Resend_Worker.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp - -.obj/RMCast_Sequencer.o .obj/RMCast_Sequencer.so .shobj/RMCast_Sequencer.o .shobj/RMCast_Sequencer.so: RMCast_Sequencer.cpp RMCast_Sequencer.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h RMCast_Sequencer.i - -.obj/RMCast_Singleton_Factory.o .obj/RMCast_Singleton_Factory.so .shobj/RMCast_Singleton_Factory.o .shobj/RMCast_Singleton_Factory.so: RMCast_Singleton_Factory.cpp \ - RMCast_Singleton_Factory.h $(ACE_ROOT)/ace/pre.h \ - RMCast_Module_Factory.h RMCast.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module_Factory.i RMCast_Singleton_Factory.i - -.obj/RMCast_UDP_Event_Handler.o .obj/RMCast_UDP_Event_Handler.so .shobj/RMCast_UDP_Event_Handler.o .shobj/RMCast_UDP_Event_Handler.so: RMCast_UDP_Event_Handler.cpp \ - RMCast_UDP_Event_Handler.h $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Event_Handler.i \ - RMCast_UDP_Event_Handler.i RMCast_IO_UDP.h RMCast_Module.h RMCast.h \ - RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RMCast_IO_UDP.i \ - RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ - RMCast_Module_Factory.h RMCast_Module_Factory.i - -.obj/RMCast_UDP_Proxy.o .obj/RMCast_UDP_Proxy.so .shobj/RMCast_UDP_Proxy.o .shobj/RMCast_UDP_Proxy.so: RMCast_UDP_Proxy.cpp RMCast_UDP_Proxy.h \ - $(ACE_ROOT)/ace/pre.h RMCast_Proxy.h RMCast_Module.h \ - RMCast.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module.i RMCast_Proxy.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i RMCast_UDP_Proxy.i \ - RMCast_IO_UDP.h $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RMCast_IO_UDP.i \ - RMCast_Module_Factory.h RMCast_Module_Factory.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp - -.obj/RMCast_UDP_Reliable_Receiver.o .obj/RMCast_UDP_Reliable_Receiver.so .shobj/RMCast_UDP_Reliable_Receiver.o .shobj/RMCast_UDP_Reliable_Receiver.so: RMCast_UDP_Reliable_Receiver.cpp \ - RMCast_UDP_Reliable_Receiver.h $(ACE_ROOT)/ace/pre.h \ - RMCast_Singleton_Factory.h RMCast_Module_Factory.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module_Factory.i RMCast_Singleton_Factory.i \ - RMCast_Reliable_Factory.h RMCast_Reliable_Factory.i RMCast_IO_UDP.h \ - RMCast_Module.h RMCast_Module.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RMCast_IO_UDP.i \ - RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ - RMCast_UDP_Reliable_Receiver.i RMCast_UDP_Event_Handler.h \ - RMCast_UDP_Event_Handler.i - -.obj/RMCast_UDP_Reliable_Sender.o .obj/RMCast_UDP_Reliable_Sender.so .shobj/RMCast_UDP_Reliable_Sender.o .shobj/RMCast_UDP_Reliable_Sender.so: RMCast_UDP_Reliable_Sender.cpp \ - RMCast_UDP_Reliable_Sender.h $(ACE_ROOT)/ace/pre.h \ - RMCast_Singleton_Factory.h RMCast_Module_Factory.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ - RMCast_Module_Factory.i RMCast_Singleton_Factory.i RMCast_IO_UDP.h \ - RMCast_Module.h RMCast_Module.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RMCast_IO_UDP.i \ - RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ - RMCast_Sequencer.h RMCast_Sequencer.i RMCast_Retransmission.h \ - RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ - RMCast_Worker.cpp RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ - $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp RMCast_Retransmission.i \ - RMCast_Membership.h $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp RMCast_Membership.i \ - RMCast_Fragment.h RMCast_Fragment.i RMCast_Fork.h RMCast_Fork.i \ - RMCast_UDP_Reliable_Sender.i RMCast_UDP_Event_Handler.h \ - RMCast_UDP_Event_Handler.i RMCast_Resend_Handler.h \ - RMCast_Resend_Handler.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ace/RMCast/Makefile.bor b/ace/RMCast/Makefile.bor deleted file mode 100644 index f0bad3ca7f2..00000000000 --- a/ace/RMCast/Makefile.bor +++ /dev/null @@ -1,44 +0,0 @@ - -# -# Makefile for building the ACE RMCast library with Borland C++Builder -# - -NAME = ACE_RMCast - -OBJFILES = \ - $(OBJDIR)\RMCast.obj \ - $(OBJDIR)\RMCast_Ack_Worker.obj \ - $(OBJDIR)\RMCast_Fork.obj \ - $(OBJDIR)\RMCast_Fragment.obj \ - $(OBJDIR)\RMCast_IO_UDP.obj \ - $(OBJDIR)\RMCast_Membership.obj \ - $(OBJDIR)\RMCast_Module.obj \ - $(OBJDIR)\RMCast_Module_Factory.obj \ - $(OBJDIR)\RMCast_Fragment.obj \ - $(OBJDIR)\RMCast_Reassembly.obj \ - $(OBJDIR)\RMCast_Partial_Message.obj \ - $(OBJDIR)\RMCast_Proxy.obj \ - $(OBJDIR)\RMCast_Receiver_Module.obj \ - $(OBJDIR)\RMCast_Reliable_Factory.obj \ - $(OBJDIR)\RMCast_Reordering.obj \ - $(OBJDIR)\RMCast_Resend_Handler.obj \ - $(OBJDIR)\RMCast_Resend_Worker.obj \ - $(OBJDIR)\RMCast_Retransmission.obj \ - $(OBJDIR)\RMCast_Sequencer.obj \ - $(OBJDIR)\RMCast_Singleton_Factory.obj \ - $(OBJDIR)\RMCast_UDP_Event_Handler.obj \ - $(OBJDIR)\RMCast_UDP_Proxy.obj \ - $(OBJDIR)\RMCast_UDP_Reliable_Receiver.obj \ - $(OBJDIR)\RMCast_UDP_Reliable_Sender.obj - - -CFLAGS = $(ACE_CFLAGS) $(ACE_RMCAST_CFLAGS) -DACE_RMCAST_BUILD_DLL - -LIBFILES = $(ACE_LIB) - -CPPDIR = . - -INCDIR_NAME = ace\RMCast -INCLUDES = *.h *.i RMCast_Copy_On_Write.cpp RMCast_Worker.cpp - -!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> diff --git a/ace/RMCast/README b/ace/RMCast/README deleted file mode 100644 index 2dd0c5d9cfc..00000000000 --- a/ace/RMCast/README +++ /dev/null @@ -1,57 +0,0 @@ -# $Id$ - - This directory will contain a simple, small-scale reliable -multicast framework for ACE. The framework is based on the ASX -components of the ACE library: the protocol is implemented as a stack -of interchangeable "modules", each one in charge of a very small task. -For example, one module implements fragmentation and reassembly, other -modules implement retransmission, send ACK and NAK messages, and -maintain receiver membership. - - The modules are replaced to achieve different levels of -reliability. For example, the retransmission module can be either the -"Best_Effort", "Semi_Reliable" or "Reliable" implementation. In the -first case no retransmissions are performed, but lost messages are -detected and reported to the receiver. The "Semi_Reliable" case -messages are held for a pre-specified amount of time, and -re-transmited if requested, but it is possible to loose some messages -if multiple re-transmissions fail. As in the "Best_Effort" case the -lost messages are detected and flagged to the application. Finally -in the "Reliable" mode the senders are flowed controlled until enough -messages are successfully transmitted. - - In general the stack looks like this: - - -SENDER: - ----------------------------------------------------------------- -Buffering : Save lost messages -Retransmission : Retransmit ----------------------------------------------------------------- -Fragmentation : Fragment messages in smaller chunks -Reassembly : and ensure that the IOVMAX limit is not - : reached ----------------------------------------------------------------- -Tranport : Encapsulate the specific transport media - : such as TCP/IP, ATM, or shared memory - : Demuxes incoming data to the right chain - : Change control messages and data messages - : to the right dynamic types. ----------------------------------------------------------------- - -RECEIVER: - ----------------------------------------------------------------- -Lost detection : Detect lost messages and send control - : messages back ----------------------------------------------------------------- -Reassembly : Reassemble messages, fragment control -Fragmentation : data ----------------------------------------------------------------- -Transport : Group membership, ACT reception, - : handle keep-alive messages... ----------------------------------------------------------------- - - -@@ TODO: Piggybacking... diff --git a/ace/RMCast/RMCast.cpp b/ace/RMCast/RMCast.cpp deleted file mode 100644 index 92ea637e481..00000000000 --- a/ace/RMCast/RMCast.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// $Id$ - -#include "RMCast.h" - -#if !defined (__ACE_INLINE__) -#include "RMCast.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast, "$Id$") diff --git a/ace/RMCast/RMCast.dsp b/ace/RMCast/RMCast.dsp deleted file mode 100644 index 48e992ca997..00000000000 --- a/ace/RMCast/RMCast.dsp +++ /dev/null @@ -1,389 +0,0 @@ -# Microsoft Developer Studio Project File - Name="RMCast" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=RMCast - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "RMCast.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "RMCast.mak" CFG="RMCast - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "RMCast - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "RMCast - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "RMCast - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "DLL\Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RMCAST_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_RMCAST_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ace.lib /nologo /dll /machine:I386 /out:"..\..\bin\ACE_RMCast.dll" /libpath:".." - -!ELSEIF "$(CFG)" == "RMCast - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "DLL\Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RMCAST_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_RMCAST_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\bin\ACE_RMCastd.dll" /pdbtype:sept /libpath:".." - -!ENDIF - -# Begin Target - -# Name "RMCast - Win32 Release" -# Name "RMCast - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\RMCast.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Ack_Worker.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Fork.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Fragment.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_IO_UDP.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Membership.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Module.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Module_Factory.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Partial_Message.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Proxy.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Reassembly.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Receiver_Module.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Reliable_Factory.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Reordering.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Resend_Handler.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Resend_Worker.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Retransmission.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Sequencer.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Singleton_Factory.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Event_Handler.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Proxy.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Reliable_Receiver.cpp -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Reliable_Sender.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\RMCast.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Ack_Worker.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Export.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Fork.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Fragment.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_IO_UDP.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Membership.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Module.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Module_Factory.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Partial_Message.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Proxy.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Reassembly.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Receiver_Module.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Reliable_Factory.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Reordering.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Resend_Handler.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Resend_Worker.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Retransmission.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Sequencer.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Singleton_Factory.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Event_Handler.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Proxy.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Reliable_Receiver.h -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Reliable_Sender.h -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "i" -# Begin Source File - -SOURCE=.\RMCast.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Ack_Worker.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Fork.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Fragment.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_IO_UDP.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Membership.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Module.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Module_Factory.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Partial_Message.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Proxy.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Reassembly.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Receiver_Module.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Reliable_Factory.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Reordering.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Resend_Handler.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Resend_Worker.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Retransmission.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Sequencer.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_Singleton_Factory.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Event_Handler.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Proxy.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Reliable_Receiver.i -# End Source File -# Begin Source File - -SOURCE=.\RMCast_UDP_Reliable_Sender.i -# End Source File -# End Group -# Begin Group "Template Files" - -# PROP Default_Filter "" -# End Group -# End Target -# End Project diff --git a/ace/RMCast/RMCast.dsw b/ace/RMCast/RMCast.dsw deleted file mode 100644 index a322ca31785..00000000000 --- a/ace/RMCast/RMCast.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "RMCast"=.\RMCast.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ace/RMCast/RMCast.h b/ace/RMCast/RMCast.h deleted file mode 100644 index 22afdebe3ce..00000000000 --- a/ace/RMCast/RMCast.h +++ /dev/null @@ -1,261 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// RMCast.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_H -#define ACE_RMCAST_H -#include "ace/pre.h" - -#include "ace/OS.h" -#include "RMCast_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_Message_Block; -class ACE_RMCast_Proxy; - -// LynxOS 3.X defines the following macro -#if defined(MT_DATA) -#undef MT_DATA -#endif /* MT_DATA */ - -//! The RMCast namespace -/*! - Several simple data structures and enums are shared by all the - RMCast components, this is the place where we put them by default. -*/ -class ACE_RMCast_Export ACE_RMCast -{ -public: - - //! The message types - /*! - Each message includes a type field in the header used by the - receiver to correctly parse it. - Classes with the same name as the message type describe the actual - format of the message. - */ - enum Message_Type - { - // Sender initiated - MT_POLL, - MT_ACK_JOIN, - MT_ACK_LEAVE, - MT_DATA, - // Receiver initiated - MT_JOIN, - MT_LEAVE, - MT_ACK, - MT_LAST - }; - - //! Simle enum used to describe the state transitions for senders - /*! - State transition (and actions) for the senders. - This configuration is pesimistic, any invalid message is cause - enough to reclaim all the resources. This partially addresses - situations where either accidentally or intentionally a sender is - multicasting packets to the wrong group. - - - NON_EXISTENT JOINED
    - ------------------------------------------
    - POLL NON_EXISTENT NON_EXISTENT
    - Destroy Destroy
    -
    - ACK NON_EXISTENT JOINED
    - Noop Process/Ack
    -
    - JOIN JOINED NON_EXISTENT
    - Send/Join_Ack Send/Join_Ack
    -
    - LEAVE NON_EXISTENT NON_EXISTENT
    - Send/Leave_Ack Send/Leave_Ack
    - Destroy
    -
    - ACK_JOIN NON_EXISTENT NON_EXISTENT
    - Noop Destroy
    -
    - ACK_LEAVE NON_EXISTENT NON_EXISTENT
    - Noop Destroy
    -
    - SEND_DATA NON_EXISTENT NON_EXISTENT
    - Noop Destroy
    -
    - */ - enum Sender_State - { - SS_NON_EXISTENT, - SS_JOINED - }; - - - // These structures define the basic layout of the messages. - - //! This is the main message sent by senders - /*! - - +---------+----------------------+
    - | 8 bits | DATA |
    - +---------+----------------------+
    - | 32 bits | sequence_number |
    - +---------+----------------------+
    - | 32 bits | message_size |
    - +---------+----------------------+
    - | 32 bits | fragment_offset |
    - +---------+----------------------+
    - ? ? ? ? ? | 32 bits | payload_size |
    - ? ? ? ? ? +---------+----------------------+
    - | | payload |
    - +---------+----------------------+
    -
    - */ - struct Data - { - // Source ID is implicit in recvfrom()... - ACE_UINT32 sequence_number; - ACE_UINT32 total_size; - ACE_UINT32 fragment_offset; - - // @@ TODO: we may want to add optional fields, such as: - // - Polling clients for their status - // - Sending the range of messages in the queue - // - If we are using authentic group communication we may - // piggyback the ACK / NAK messages - - ACE_Message_Block *payload; - - //! Pass the proxy source between layers - ACE_RMCast_Proxy *source; - }; - - /*! - - +---------+----------------------+
    - | 8 bits | MT_POLL |
    - +---------+----------------------+
    -
    - */ - struct Poll - { - //! Pass the proxy source between layers - ACE_RMCast_Proxy *source; - }; - - //! Receivers accept new members using this message - /*! - - +---------+----------------------+
    - | 8 bits | MT_ACK_JOIN |
    - +---------+----------------------+
    - | 32 bits | next_sequence_number |
    - +---------+----------------------+
    -
    - */ - struct Ack_Join - { - ACE_UINT32 next_sequence_number; - - //! Pass the proxy source between layers - ACE_RMCast_Proxy *source; - }; - - //! Senders acknowledge when receivers try to leave - /*! - - +---------+----------------------+
    - | 8 bits | ACK_LEAVE |
    - +---------+----------------------+
    -
    - */ - struct Ack_Leave - { - //! Pass the proxy source between layers - ACE_RMCast_Proxy *source; - }; - - //! Provide feedback to the sender about messages received and sent - //! so far. - /*! - * - * This message is used to provide feedback information to senders. - * It contains two sequence numbers: - * - \param next_expected: is the sequence number of the next message - * expected, i.e. (next_expected-1) is the last message received - * without any losses before it. - * - \param highest_received: is the highest sequence number among - * all the messages successfully received. - * In other words, all messages lost (if any) are in the range: - * [next_expected,highest_received) - * - * - * +---------+----------------------+
    - * | 8 bits | MT_ACK |
    - * +---------+----------------------+
    - * | 32 bits | next_expected |
    - * +---------+----------------------+
    - * | 32 bits | highest_received |
    - * +---------+----------------------+
    - *
    - */ - struct Ack - { - //! The last message received without any losses before it. - ACE_UINT32 next_expected; - - //! The last message successfully received - ACE_UINT32 highest_received; - - //! Pass the proxy source between layers - ACE_RMCast_Proxy *source; - }; - - //! Receivers send this message to indicate they want to join - /* - - +---------+----------------------+
    - | 8 bits | MT_JOIN |
    - +---------+----------------------+
    -
    - */ - struct Join - { - //! Pass the proxy source between layers - ACE_RMCast_Proxy *source; - }; - - //! Receivers send this message to disconnect gracefully - /*! - - +---------+----------------------+
    - | 8 bits | MT_LEAVE |
    - +---------+----------------------+
    -
    - */ - struct Leave - { - //! Pass the proxy source between layers - ACE_RMCast_Proxy *source; - }; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_H */ diff --git a/ace/RMCast/RMCast.i b/ace/RMCast/RMCast.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/RMCast/RMCast.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/RMCast/RMCast_Ack_Worker.cpp b/ace/RMCast/RMCast_Ack_Worker.cpp deleted file mode 100644 index d9843ebe93b..00000000000 --- a/ace/RMCast/RMCast_Ack_Worker.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_Ack_Worker.h" -#include "ace/Message_Block.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Ack_Worker.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Ack_Worker, "$Id$") - -int -ACE_RMCast_Ack_Worker::work (ACE_UINT32 const & key, - ACE_RMCast::Data const &item) -{ - if (key >= this->ack_.next_expected) - return 0; - // ACE_DEBUG ((LM_DEBUG, - // " Retransmission::ack - message %d erased\n", - // key)); - ACE_Message_Block::release (item.payload); - return this->messages_->unbind_i (this->ace_mon_, key); -} diff --git a/ace/RMCast/RMCast_Ack_Worker.h b/ace/RMCast/RMCast_Ack_Worker.h deleted file mode 100644 index 565ef7feed8..00000000000 --- a/ace/RMCast/RMCast_Ack_Worker.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_RMCAST_ACK_WORKER_H -#define ACE_RMCAST_ACK_WORKER_H -#include "ace/pre.h" - -#include "RMCast_Retransmission.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Process an Ack message in the ACE_RMCast_Retransmission module -/** - * The retransmission module uses internal iterators, thus it needs to - * create helper Worker classes to process some messages. - */ -class ACE_RMCast_Ack_Worker - : public ACE_RMCast_Worker -{ -public: - ACE_RMCast_Ack_Worker (ACE_RMCast::Ack &ack, - ACE_RMCast_Retransmission::Messages::Write_Guard &g, - ACE_RMCast_Retransmission::Messages *messages); - - virtual int work (ACE_UINT32 const & key, - ACE_RMCast::Data const &item); - -private: - ACE_RMCast_Ack_Worker (const ACE_RMCast_Ack_Worker&); - ACE_RMCast_Ack_Worker& operator= (const ACE_RMCast_Ack_Worker&); - -private: - ACE_RMCast::Ack &ack_; - - ACE_RMCast_Retransmission::Messages::Write_Guard &ace_mon_; - - ACE_RMCast_Retransmission::Messages *messages_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Ack_Worker.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_ACK_WORKER_H */ diff --git a/ace/RMCast/RMCast_Ack_Worker.i b/ace/RMCast/RMCast_Ack_Worker.i deleted file mode 100644 index 54d94d21167..00000000000 --- a/ace/RMCast/RMCast_Ack_Worker.i +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Ack_Worker:: -ACE_RMCast_Ack_Worker (ACE_RMCast::Ack &ack, - ACE_RMCast_Retransmission::Messages::Write_Guard &g, - ACE_RMCast_Retransmission::Messages *messages) - : ack_ (ack) - , ace_mon_ (g) - , messages_ (messages) -{ -} diff --git a/ace/RMCast/RMCast_Copy_On_Write.cpp b/ace/RMCast/RMCast_Copy_On_Write.cpp deleted file mode 100644 index 39bf16f88a2..00000000000 --- a/ace/RMCast/RMCast_Copy_On_Write.cpp +++ /dev/null @@ -1,199 +0,0 @@ -// $Id$ - -#ifndef ACE_RMCAST_COPY_ON_WRITE_CPP -#define ACE_RMCAST_COPY_ON_WRITE_CPP - -#include "RMCast_Copy_On_Write.h" - -#if ! defined (__ACE_INLINE__) -#include "RMCast_Copy_On_Write.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(RMCast, RMCast_Copy_On_Write, "$Id$") - -template void -ACE_RMCast_Copy_On_Write_Collection::_incr_refcnt (void) -{ - // LOCKING: no locking is required, the caller grabs the mutex. - this->refcount_++; -} - -template void -ACE_RMCast_Copy_On_Write_Collection::_decr_refcnt (void) -{ - // LOCKING: no locking is required, the caller grabs the mutex. - { - this->refcount_--; - if (this->refcount_ != 0) - return; - } - //@@ TODO: If this wrapper is going to be completely general some - // kind of functor has to be provided to remove the elements in the - // collection, in case the are no self-managed - - delete this; -} - -// **************************************************************** - -template -ACE_RMCast_Copy_On_Write:: - ACE_RMCast_Copy_On_Write (void) - : ACE_RMCast_Copy_On_Write_Container () -{ -} - -template -ACE_RMCast_Copy_On_Write:: - ~ACE_RMCast_Copy_On_Write (void) -{ - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); - - while (this->pending_writes_ != 0) - this->cond_.wait (); - - this->collection_->_decr_refcnt (); - this->collection_ = 0; -} - -template int -ACE_RMCast_Copy_On_Write:: - for_each (ACE_RMCast_Worker *worker) -{ - Read_Guard ace_mon (*this); - - ITERATOR end = ace_mon.collection->collection.end (); - for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i) - { - int r = worker->work ((*i).key (), (*i).item ()); - if (r == 1) - return 0; // Abort loop, but no error - if (r == -1) - return -1; - } - return 0; -} - -template KEY -ACE_RMCast_Copy_On_Write::first_key (void) -{ - Read_Guard ace_mon (*this); - ITERATOR end = ace_mon.collection->collection.end (); - ITERATOR begin = ace_mon.collection->collection.begin (); - if (begin == end) - { - return KEY (); - } - return (*begin).key (); -} - -template int -ACE_RMCast_Copy_On_Write::empty (void) -{ - Read_Guard ace_mon (*this); - ITERATOR end = ace_mon.collection->collection.end (); - ITERATOR begin = ace_mon.collection->collection.begin (); - - return end == begin; -} - -template int -ACE_RMCast_Copy_On_Write::bind (KEY const & k, - ITEM const & i) -{ - Write_Guard ace_mon (*this); - - return this->bind_i (ace_mon, k, i); -} - -template int -ACE_RMCast_Copy_On_Write::unbind (KEY const & k) -{ - Write_Guard ace_mon (*this); - - return this->unbind_i (ace_mon, k); -} - -template int -ACE_RMCast_Copy_On_Write::bind_i (Write_Guard &ace_mon, - KEY const & k, - ITEM const & i) -{ - return ace_mon.copy->collection.bind (k, i); -} - -template int -ACE_RMCast_Copy_On_Write::unbind_i (Write_Guard &ace_mon, - KEY const & k) -{ - return ace_mon.copy->collection.unbind (k); -} - -// **************************************************************** - -template -ACE_RMCast_Copy_On_Write_Container::ACE_RMCast_Copy_On_Write_Container (void) - : pending_writes_ (0) - , writing_ (0) - , cond_ (mutex_) -{ - ACE_NEW (this->collection_, Collection); -} - -// **************************************************************** - -template -ACE_RMCast_Copy_On_Write_Write_Guard:: - ACE_RMCast_Copy_On_Write_Write_Guard (Container &container) - : copy (0) - , mutex (container.mutex_) - , cond (container.cond_) - , pending_writes (container.pending_writes_) - , writing_flag (container.writing_) - , collection (container.collection_) -{ - { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex); - - this->pending_writes++; - - while (this->writing_flag != 0) - this->cond.wait (); - - this->writing_flag = 1; - } - - // Copy outside the mutex, because it may take a long time. - // Nobody can change it, because it is protected by the - // writing_flag. - - // First initialize it (with the correct reference count - ACE_NEW (this->copy, Collection); - // Copy the contents - this->copy->collection = this->collection->collection; -} - -template -ACE_RMCast_Copy_On_Write_Write_Guard:: - ~ACE_RMCast_Copy_On_Write_Write_Guard (void) -{ - Collection *tmp = 0; - { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex); - - tmp = this->collection; - this->collection = this->copy; - this->writing_flag = 0; - this->pending_writes--; - - this->cond.signal (); - } - // Delete outside the mutex, because it may take a long time. - // @@ Is this right? What happens if several readers are still - // using the old copy? - tmp->_decr_refcnt (); -} - -// **************************************************************** - -#endif /* ACE_RMCAST_COPY_ON_WRITE_CPP */ diff --git a/ace/RMCast/RMCast_Copy_On_Write.h b/ace/RMCast/RMCast_Copy_On_Write.h deleted file mode 100644 index 99f9c8ce14d..00000000000 --- a/ace/RMCast/RMCast_Copy_On_Write.h +++ /dev/null @@ -1,212 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_RMCAST_COPY_ON_WRITE_H -#define ACE_RMCAST_COPY_ON_WRITE_H -#include "ace/pre.h" - -#include "RMCast_Worker.h" -#include "ace/Synch.h" - -//! A wrapper to implement reference counted collections -template -class ACE_RMCast_Copy_On_Write_Collection -{ -public: - //! Constructor - ACE_RMCast_Copy_On_Write_Collection (void); - - //! Increment the reference count - void _incr_refcnt (void); - - //! Decrement the reference count - void _decr_refcnt (void); - - //! The actual collection - COLLECTION collection; - -private: - //! The reference count - ACE_UINT32 refcount_; -}; - -// **************************************************************** - -template -class ACE_RMCast_Copy_On_Write_Read_Guard; - -template -class ACE_RMCast_Copy_On_Write_Write_Guard; - -//! Base class for the Copy_On_Write collection, used to simplify the -//! declaration of the Write_Guard -template -class ACE_RMCast_Copy_On_Write_Container -{ -public: - //! Constructor - ACE_RMCast_Copy_On_Write_Container (void); - - //! Let the Write_Guard access the internal fields. - friend class ACE_RMCast_Copy_On_Write_Write_Guard; - - //! Let the Read_Guard access the internal fields. - friend class ACE_RMCast_Copy_On_Write_Read_Guard; - - //! A shorter name for the actual collection type - typedef ACE_RMCast_Copy_On_Write_Collection Collection; - -protected: - //! Number of pending writes - int pending_writes_; - - //! If non-zero then a thread is changing the collection. - /*! - * Many threads can use the collection simulatenously, but only one - * change it. - */ - int writing_; - - //! A mutex to serialize access to the collection pointer. - ACE_SYNCH_MUTEX mutex_; - - //! A condition variable to wait to synchronize multiple writers. - ACE_SYNCH_CONDITION cond_; - - //! The collection, with reference counting added - Collection *collection_; -}; - -// **************************************************************** - -//! Implement a read guard for a reference counted collection -template -class ACE_RMCast_Copy_On_Write_Read_Guard -{ -public: - typedef ACE_RMCast_Copy_On_Write_Collection Collection; - typedef ACE_RMCast_Copy_On_Write_Container Container; - - //! Constructor - ACE_RMCast_Copy_On_Write_Read_Guard (Container &container); - - //! Destructor - ~ACE_RMCast_Copy_On_Write_Read_Guard (void); - - //! A reference to the collection - Collection *collection; - -private: - //! Synchronization - ACE_SYNCH_MUTEX &mutex_; -}; - -// **************************************************************** - -//! Implement the write guard for a reference counted collecion -/*! - * This helper class atomically increments the reference count of a - * ACE_RMCast_Copy_On_Write_Collection and reads the current - * collection in the Copy_On_Write class. - */ -template -class ACE_RMCast_Copy_On_Write_Write_Guard -{ -public: - typedef ACE_RMCast_Copy_On_Write_Collection Collection; - typedef ACE_RMCast_Copy_On_Write_Container Container; - - //! Constructor - ACE_RMCast_Copy_On_Write_Write_Guard (Container &container); - - //! Destructor - ~ACE_RMCast_Copy_On_Write_Write_Guard (void); - - //! The collection - Collection *copy; - -private: - //! Keep a reference to the mutex - ACE_SYNCH_MUTEX &mutex; - - //! Keep a reference to the condition variable - ACE_SYNCH_CONDITION &cond; - - //! Use a reference to update the pending writes count - int &pending_writes; - - //! Use a reference to update the writing flag - int &writing_flag; - - //! Use this reference to update the collection once the - //! modifications are finished. - Collection *&collection; -}; - - -// **************************************************************** - -//! Implement a copy on write wrapper for a map-like collection -/* - * - * WARNING: This class may be moved away in the future, I'm - * investigating how it could be converted into a reusable component - * in ACE. I won't make promises on when will that happen, but I - * won't promise that it will stay here either. - * - */ -template -class ACE_RMCast_Copy_On_Write : public ACE_RMCast_Copy_On_Write_Container -{ -public: - //! The Read_Guard trait - typedef ACE_RMCast_Copy_On_Write_Read_Guard Read_Guard; - - //! The Write_Guard trait - typedef ACE_RMCast_Copy_On_Write_Write_Guard Write_Guard; - - //! The underlying collection type - typedef ACE_RMCast_Copy_On_Write_Collection Collection; - - //! Constructor - ACE_RMCast_Copy_On_Write (void); - - //! Destructor - ~ACE_RMCast_Copy_On_Write (void); - - //! Iterate over all the elements invoking \param worker on each one. - int for_each (ACE_RMCast_Worker *worker); - - //! Get the first key - KEY first_key (void); - - /// Return non-zero if the collection is empty - int empty (void); - - //! Add a new element - int bind (KEY const & key, ITEM const & item); - - //! Remove an element - int unbind (KEY const & key); - - //! Bind assuming the Write_Guard is held - int bind_i (Write_Guard &guard, KEY const & key, ITEM const & item); - - //! Unbind assuming the Write_Guard is held - int unbind_i (Write_Guard &guard, KEY const & key); -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Copy_On_Write.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "RMCast_Copy_On_Write.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("RMCast_Copy_On_Write.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_COPY_ON_WRITE_H */ diff --git a/ace/RMCast/RMCast_Copy_On_Write.i b/ace/RMCast/RMCast_Copy_On_Write.i deleted file mode 100644 index 3c069c84eb6..00000000000 --- a/ace/RMCast/RMCast_Copy_On_Write.i +++ /dev/null @@ -1,34 +0,0 @@ -// $Id$ - -template ACE_INLINE -ACE_RMCast_Copy_On_Write_Collection:: - ACE_RMCast_Copy_On_Write_Collection (void) - : refcount_ (1) -{ -} - -// **************************************************************** - -template ACE_INLINE -ACE_RMCast_Copy_On_Write_Read_Guard:: - ACE_RMCast_Copy_On_Write_Read_Guard (Container &container) - : collection (0) - , mutex_ (container.mutex_) -{ - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); - this->collection = container.collection_; - this->collection->_incr_refcnt (); -} - -template ACE_INLINE -ACE_RMCast_Copy_On_Write_Read_Guard:: - ~ACE_RMCast_Copy_On_Write_Read_Guard (void) -{ - if (this->collection != 0) - { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); - this->collection->_decr_refcnt (); - } -} - -// **************************************************************** diff --git a/ace/RMCast/RMCast_Export.h b/ace/RMCast/RMCast_Export.h deleted file mode 100644 index 51257c4d682..00000000000 --- a/ace/RMCast/RMCast_Export.h +++ /dev/null @@ -1,44 +0,0 @@ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by -// generate_export_file.pl -// ------------------------------ -#if !defined (ACE_RMCAST_EXPORT_H) -#define ACE_RMCAST_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL) -# define ACE_RMCAST_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */ - -#if !defined (ACE_RMCAST_HAS_DLL) -#define ACE_RMCAST_HAS_DLL 1 -#endif /* ! ACE_RMCAST_HAS_DLL */ - -#if defined (ACE_RMCAST_HAS_DLL) -# if (ACE_RMCAST_HAS_DLL == 1) -# if defined (ACE_RMCAST_BUILD_DLL) -# define ACE_RMCast_Export ACE_Proper_Export_Flag -# define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else -# define ACE_RMCast_Export ACE_Proper_Import_Flag -# define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_RMCAST_BUILD_DLL */ -# else -# define ACE_RMCast_Export -# define ACE_RMCAST_SINGLETON_DECLARATION(T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ! ACE_RMCAST_HAS_DLL == 1 */ -#else -# define ACE_RMCast_Export -# define ACE_RMCAST_SINGLETON_DECLARATION(T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_RMCAST_HAS_DLL */ - -#endif /* ACE_RMCAST_EXPORT_H */ - -// End of auto generated file. diff --git a/ace/RMCast/RMCast_Fork.cpp b/ace/RMCast/RMCast_Fork.cpp deleted file mode 100644 index 928d34cb411..00000000000 --- a/ace/RMCast/RMCast_Fork.cpp +++ /dev/null @@ -1,112 +0,0 @@ -// $Id$ - -#include "RMCast_Fork.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Fork.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Fork, "$Id$") - -ACE_RMCast_Fork::~ACE_RMCast_Fork (void) -{ -} - -int -ACE_RMCast_Fork::open (void) -{ - int r = this->ACE_RMCast_Module::open (); - if (r != 0) - return r; - if (this->secondary () != 0) - return this->secondary ()->open (); - return 0; -} - -int -ACE_RMCast_Fork::close (void) -{ - int r = this->ACE_RMCast_Module::close (); - if (r != 0) - return r; - if (this->secondary () != 0) - return this->secondary ()->close (); - return 0; -} - -int -ACE_RMCast_Fork::data (ACE_RMCast::Data &data) -{ - int r = this->ACE_RMCast_Module::data (data); - if (r != 0) - return r; - if (this->secondary () != 0) - return this->secondary ()->data (data); - return 0; -} - -int -ACE_RMCast_Fork::poll (ACE_RMCast::Poll &poll) -{ - int r = this->ACE_RMCast_Module::poll (poll); - if (r != 0) - return r; - if (this->secondary () != 0) - return this->secondary ()->poll (poll); - return 0; -} - -int -ACE_RMCast_Fork::ack_join (ACE_RMCast::Ack_Join &ack_join) -{ - int r = this->ACE_RMCast_Module::ack_join (ack_join); - if (r != 0) - return r; - if (this->secondary () != 0) - return this->secondary ()->ack_join (ack_join); - return 0; -} - -int -ACE_RMCast_Fork::ack_leave (ACE_RMCast::Ack_Leave &ack_leave) -{ - int r = this->ACE_RMCast_Module::ack_leave (ack_leave); - if (r != 0) - return r; - if (this->secondary () != 0) - return this->secondary ()->ack_leave (ack_leave); - return 0; -} - -int -ACE_RMCast_Fork::ack (ACE_RMCast::Ack &ack) -{ - int r = this->ACE_RMCast_Module::ack (ack); - if (r != 0) - return r; - if (this->secondary () != 0) - return this->secondary ()->ack (ack); - return 0; -} - -int -ACE_RMCast_Fork::join (ACE_RMCast::Join &join) -{ - int r = this->ACE_RMCast_Module::join (join); - if (r != 0) - return r; - if (this->secondary () != 0) - return this->secondary ()->join (join); - return 0; -} - -int -ACE_RMCast_Fork::leave (ACE_RMCast::Leave &leave) -{ - int r = this->ACE_RMCast_Module::leave (leave); - if (r != 0) - return r; - if (this->secondary () != 0) - return this->secondary ()->leave (leave); - return 0; -} diff --git a/ace/RMCast/RMCast_Fork.h b/ace/RMCast/RMCast_Fork.h deleted file mode 100644 index 5fd216d68f3..00000000000 --- a/ace/RMCast/RMCast_Fork.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_RMCAST_FORK_H -#define ACE_RMCAST_FORK_H -#include "ace/pre.h" - -#include "RMCast_Module.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Fork messages to multiple destinations -/** - * In some instances the messages must be sent to multiple - * destinations, this module is a generic component to duplicate such - * messages. - */ -class ACE_RMCast_Export ACE_RMCast_Fork : public ACE_RMCast_Module -{ -public: - //! Constructor - ACE_RMCast_Fork (void); - - //! Destructor - virtual ~ACE_RMCast_Fork (void); - - /// Set the control module, all incoming control messages go to it - void secondary (ACE_RMCast_Module *module); - - /// Return the current control module - ACE_RMCast_Module *secondary (void) const; - - virtual int open (void); - virtual int close (void); - virtual int data (ACE_RMCast::Data &); - virtual int poll (ACE_RMCast::Poll &); - virtual int ack_join (ACE_RMCast::Ack_Join &); - virtual int ack_leave (ACE_RMCast::Ack_Leave &); - virtual int ack (ACE_RMCast::Ack &); - virtual int join (ACE_RMCast::Join &); - virtual int leave (ACE_RMCast::Leave &); - -private: - /// The control module - ACE_RMCast_Module *secondary_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Fork.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_FORK_H */ diff --git a/ace/RMCast/RMCast_Fork.i b/ace/RMCast/RMCast_Fork.i deleted file mode 100644 index bbcd4f23ae1..00000000000 --- a/ace/RMCast/RMCast_Fork.i +++ /dev/null @@ -1,21 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Fork::ACE_RMCast_Fork (void) - : ACE_RMCast_Module () - , secondary_ (0) -{ -} - -ACE_INLINE void -ACE_RMCast_Fork::secondary (ACE_RMCast_Module *module) -{ - this->secondary_ = module; -} - - -ACE_INLINE ACE_RMCast_Module * -ACE_RMCast_Fork::secondary (void) const -{ - return this->secondary_; -} diff --git a/ace/RMCast/RMCast_Fragment.cpp b/ace/RMCast/RMCast_Fragment.cpp deleted file mode 100644 index 7da6f4bf1a5..00000000000 --- a/ace/RMCast/RMCast_Fragment.cpp +++ /dev/null @@ -1,188 +0,0 @@ -// $Id$ - -#include "RMCast_Fragment.h" -#include "ace/Message_Block.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "RMCast_Fragment.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Fragment, "$Id$") - -ACE_RMCast_Fragment:: -ACE_RMCast_Fragment (void) - : ACE_RMCast_Module () - , max_fragment_size_ (ACE_RMCAST_DEFAULT_FRAGMENT_SIZE) -{ -} - -ACE_RMCast_Fragment::~ACE_RMCast_Fragment (void) -{ -} - -int -ACE_RMCast_Fragment::data (ACE_RMCast::Data &received_data) -{ - if (this->next () == 0) - return 0; - - // The Data object sent downstream - ACE_RMCast::Data data = received_data; - - ACE_Message_Block *mb = data.payload; - - // @@ We should keep the total size precomputed - data.total_size = mb->total_length (); - - // We must leave room for the header -#if defined (ACE_HAS_BROKEN_DGRAM_SENDV) - const int ACE_RMCAST_WRITEV_MAX = ACE_IOV_MAX - 2; -#else - const int ACE_RMCAST_WRITEV_MAX = ACE_IOV_MAX - 1; -#endif /* ACE_HAS_BROKEN_DGRAM_SENDV */ - - // Assume the header will be included on each fragment, so readuce - // the maximum amount of memory allowed on each fragment.... - const size_t fragment_header_size = 1 + 3 * sizeof(ACE_UINT32); - - const size_t max_fragment_payload = - this->max_fragment_size_ - fragment_header_size; - - // Iterate over all the message blocks in the chain. If there is - // enough data to send an MTU then it is sent immediately. - // The last fragment is sent with whatever data remains. - // A single fragment can expand multiple message blocks, put - // together in an array, it is also possible that a single - // message block requires multiple fragments... so the code below is - // as simple as possible, but not any simpler ;-) - - - // The first piece of each fragment is a header that contains: - // - A sequence number for reassembly, this is unrelated to - // the sequence number for re-transmission. - // NOTE: yes, this increases the bandwidth requires by 4 bytes on - // each message, I don't think this is a big deal. - // - A fragment offset for reassembly. - // - The total size of the message, so the reassembly layer knows - // when a complete message has been received. - - // Complete the initialization of the structure - - data.fragment_offset = 0; - - // The underlying transport layer can only tolerate so many elements - // in a chain, so we must count them and send a fragment if we are - // going over the limit. - - ACE_Message_Block blocks[ACE_RMCAST_WRITEV_MAX]; - - - // How many elements of the array are in use... - int iovcnt = 0; - - // The size of the current message, adding the size of all its - // message blocks. - size_t fragment_size = 0; - - for (ACE_Message_Block* b = mb; b != 0; b = b->cont ()) - { - ACE_Message_Block *current_block = &blocks[iovcnt]; - - // Add the block to the vector... - - current_block->data_block (b->data_block ()->duplicate ()); - current_block->rd_ptr (b->rd_ptr ()); - current_block->wr_ptr (b->wr_ptr ()); - current_block->cont (0); - - // Set the continuation field - if (iovcnt != 0) - blocks[iovcnt-1].cont (current_block); - - size_t current_block_length = current_block->length (); - - // Recompute the state of the fragment - fragment_size += current_block_length; - iovcnt++; - - while (fragment_size >= max_fragment_payload) - { - // We have filled a fragment. It is possible that we need - // to split the last message block in multiple fragments, - // thus the loop above... - - // First adjust the last message block to exactly fit in the - // fragment: - size_t last_sent_mb_len = - max_fragment_payload - (fragment_size - current_block_length); - - // Send only enough data of the last message block to fill - // the fragment... - current_block->wr_ptr (current_block->rd_ptr () - + last_sent_mb_len); - - data.payload = blocks; - if (this->next ()->data (data) == -1) - return -1; - - // adjust the offset - data.fragment_offset += max_fragment_payload; - - // Now compute how much data is left in the last message - // block, to check if we should continue sending it... - current_block_length -= last_sent_mb_len; - if (current_block_length == 0) - { - // No more data from this message block, just continue - // the outer loop... - iovcnt = 0; - fragment_size = 0; - blocks[0].cont (0); - break; // while - } - - // There is some data left, we try to send it in a single - // fragment, if it is still too big the beginning of this - // loop will adjust things. - - // We must put the data in the right place in the array.. - char *rd_ptr = current_block->rd_ptr () + last_sent_mb_len; - char *wr_ptr = rd_ptr + current_block_length; - blocks[0].data_block (current_block->replace_data_block (0)); - - // And determine what segment of the data will be sent.. - blocks[0].rd_ptr (rd_ptr); - blocks[0].wr_ptr (wr_ptr); - blocks[0].cont (0); - - // Adjust the state of the fragment - fragment_size = current_block_length; - iovcnt = 1; - - // Notice that if is too big the start of - // this loop will continue the fragmentation. - } - - // It is also possible to fill up the iovec array before the - // fragment is completed, in this case we must send whatever we - // have: - if (iovcnt == ACE_RMCAST_WRITEV_MAX) - { - if (this->next ()->data (data) == -1) - return -1; - - iovcnt = 0; - fragment_size = 0; - blocks[0].cont (0); - } - } - - if (iovcnt == 0) - return 0; - - return this->next ()->data (data); -} diff --git a/ace/RMCast/RMCast_Fragment.h b/ace/RMCast/RMCast_Fragment.h deleted file mode 100644 index eed08c92517..00000000000 --- a/ace/RMCast/RMCast_Fragment.h +++ /dev/null @@ -1,62 +0,0 @@ -// $Id$ - -#ifndef ACE_RMCAST_FRAGMENT_H -#define ACE_RMCAST_FRAGMENT_H -#include "ace/pre.h" - -#include "RMCast_Module.h" -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -//! Default fragment size -#ifndef ACE_RMCAST_DEFAULT_FRAGMENT_SIZE -# define ACE_RMCAST_DEFAULT_FRAGMENT_SIZE 1024 -#endif /* ACE_RMCAST_DEFAULT_FRAGMENT_SIZE */ - -//! Fragmentation module -/*! - * Some transports cannot send very big messages, for example UDP - * imposes a limit of 64K, and in practice the limit is even more - * strict than that. - * This class decomposes a message into multiple fragments, using an - * application defined maximum size. - */ -class ACE_RMCast_Export ACE_RMCast_Fragment : public ACE_RMCast_Module -{ -public: - //! Constructor - ACE_RMCast_Fragment (void); - - //! Destructor - virtual ~ACE_RMCast_Fragment (void); - - //! Accessor for the max_fragment size. - /*! There is no modifier, the maximum fragment size is obtained - * using feedback from the lower layers (transport?) - * @@TODO We have not implemented the feedback mechanisms yet! - */ - size_t max_fragment_size (void) const; - - /*! - * Only data messages need fragmentation, the control messages are - * all small enough for all the transports that I know about. - * Well, actually for CAN-Bus (Controller Area Network), they may be - * too big, because the max payload there is 8 bytes, but we don't - * play with those in ACE. - */ - virtual int data (ACE_RMCast::Data &data); - -private: - //! Current fragment size limit - size_t max_fragment_size_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Fragment.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_FRAGMENT_H */ diff --git a/ace/RMCast/RMCast_Fragment.i b/ace/RMCast/RMCast_Fragment.i deleted file mode 100644 index 8e628093b8c..00000000000 --- a/ace/RMCast/RMCast_Fragment.i +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -ACE_INLINE size_t -ACE_RMCast_Fragment::max_fragment_size (void) const -{ - return this->max_fragment_size_; -} diff --git a/ace/RMCast/RMCast_IO_UDP.cpp b/ace/RMCast/RMCast_IO_UDP.cpp deleted file mode 100644 index 315d5c11f82..00000000000 --- a/ace/RMCast/RMCast_IO_UDP.cpp +++ /dev/null @@ -1,458 +0,0 @@ -// $Id$ - -#include "RMCast_IO_UDP.h" -#include "RMCast_UDP_Proxy.h" -#include "RMCast_Module_Factory.h" - -#include "ace/Handle_Set.h" -#include "ace/Reactor.h" -#include "ace/Message_Block.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_IO_UDP.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_IO_UDP, "RMCast_IO_UDP.cpp,v 1.12 2000/12/20 22:00:33 oci Exp") - -ACE_RMCast_IO_UDP::~ACE_RMCast_IO_UDP (void) -{ -} - -int -ACE_RMCast_IO_UDP::init (const ACE_INET_Addr &mcast_group, - const ACE_Addr &local, - int protocol_family, - int protocol, - int reuse_addr) -{ - this->mcast_group_ = mcast_group; - - ACE_SOCK_Dgram &dgram = this->dgram_; - return dgram.open (local, protocol_family, protocol, reuse_addr); -} - -int -ACE_RMCast_IO_UDP::subscribe (const ACE_INET_Addr &mcast_addr, - int reuse_addr, - const ACE_TCHAR *net_if, - int protocol_family, - int protocol) -{ - this->mcast_group_ = mcast_addr; - return this->dgram_.subscribe (mcast_addr, - reuse_addr, - net_if, - protocol_family, - protocol); -} - -int -ACE_RMCast_IO_UDP::handle_events (ACE_Time_Value *tv) -{ - ACE_HANDLE h = this->dgram_.get_handle (); - if (h == ACE_INVALID_HANDLE) - return -1; - - ACE_Handle_Set handle_set; - handle_set.set_bit (h); - - ACE_Countdown_Time countdown (tv); - - int r = ACE_OS::select (int(h) + 1, - handle_set, 0, 0, - tv); - if (r == -1) - { - if (errno == EINTR) - return 0; - else - return -1; - } - else if (r == 0) - { - return 0; - } - - return this->handle_input (h); -} - -int -ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE) -{ - // @@ We should use a system constant instead of this literal - const int max_udp_packet_size = 65536; - char buffer[max_udp_packet_size]; - - ACE_INET_Addr from_address; - ssize_t r = - this->dgram_.recv (buffer, sizeof(buffer), from_address); - - if (r == -1) - { - // @@ LOG?? - ACE_ERROR ((LM_ERROR, - "RMCast_IO_UDP::handle_input () - error in recv %p\n", - ACE_TEXT (""))); - return -1; - } - - // ACE_HEX_DUMP ((LM_DEBUG, buffer, 16, "Receiver::handle_input")); - - // @@ Locking! - - int type = buffer[0]; - - if (type < 0 || type >= ACE_RMCast::MT_LAST) - { - // @@ Log: invalid message type!! - // @@ TODO: should we return -1? The socket is still valid, it - // makes little sense to destroy it just because one remote - // sender is sending invalid messages. Maybe we should - // strategize this too, and report the problem to the - // application, this could indicate a misconfiguration or - // something worse... - - // In any case the proxy should be destroyed, its peer is making - // something really wrong. - ACE_RMCast_UDP_Proxy *proxy; - if (this->map_.unbind (from_address, proxy) == 0) - { - this->factory_->destroy (proxy->next ()); - delete proxy; - } - return 0; - } - - ACE_RMCast_UDP_Proxy *proxy; - if (this->map_.find (from_address, proxy) != 0) - { - //ACE_DEBUG ((LM_DEBUG, - // "IO_UDP::handle_input - new proxy from <%s:%d>\n", - // from_address.get_host_addr (), - // from_address.get_port_number ())); - - // @@ We should validate the message *before* creating the - // object, all we need is some sort of validation strategy, a - // different one for the receiver and another one for the - // sender. - -#if 0 - if (type == ACE_RMCast::MT_ACK - || type == ACE_RMCast::MT_JOIN - || type == ACE_RMCast::MT_LEAVE - || type == ACE_RMCast::MT_ACK_LEAVE) - { - // All these message types indicate a problem, the should be - // generated by receivers, not received by them. - return 0; - } -#endif /* 0 */ - ACE_RMCast_Module *module = this->factory_->create (); - if (module == 0) - { - // @@ LOG?? - // Try to continue working, maybe the module can be created - // later. - return 0; - } - // This is necessary to satisfy the xgcc for Lynx on Solaris - // by including the code directly causes : - // RMCast_IO_UDP.cpp:202: error: internal error--unrecognizable insn: - // (insn 1510 1507 524 (set (mem:SI (plus:SI (reg:SI 28 r28) - // (const_int 65536))) - // (reg:SI 0 r0)) -1 (insn_list 528 (insn_list 1507 (nil))) - // (nil)) - // /usr/lynx/home2/jose/98r2/src/gcc/toplev.c:1489: Internal compiler error in function fatal_insn - // to be thrown at the end of the function. - if ((proxy = allocate_and_bind_proxy(module,from_address)) == 0) - return 0; - } - - // Have the proxy process the message and do the right thing. - if (proxy->receive_message (buffer, r) != 0) - { - (void) this->map_.unbind (from_address); - this->factory_->destroy (proxy->next ()); - delete proxy; - } - - return 0; -} - -ACE_HANDLE -ACE_RMCast_IO_UDP::get_handle (void) const -{ - return this->dgram_.get_handle (); -} - -int -ACE_RMCast_IO_UDP::data (ACE_RMCast::Data &data) -{ - return this->send_data (data, this->mcast_group_); -} - -int -ACE_RMCast_IO_UDP::poll (ACE_RMCast::Poll &poll) -{ - return this->send_poll (poll, this->mcast_group_); -} - -int -ACE_RMCast_IO_UDP::ack_join (ACE_RMCast::Ack_Join &ack_join) -{ - return this->send_ack_join (ack_join, this->mcast_group_); -} - -int -ACE_RMCast_IO_UDP::ack_leave (ACE_RMCast::Ack_Leave &ack_leave) -{ - return this->send_ack_leave (ack_leave, this->mcast_group_); -} - -int -ACE_RMCast_IO_UDP::ack (ACE_RMCast::Ack &ack) -{ - return this->send_ack (ack, this->mcast_group_); -} - -int -ACE_RMCast_IO_UDP::join (ACE_RMCast::Join &join) -{ - return this->send_join (join, this->mcast_group_); -} - -int -ACE_RMCast_IO_UDP::leave (ACE_RMCast::Leave &leave) -{ - return this->send_leave (leave, this->mcast_group_); -} - -int -ACE_RMCast_IO_UDP::send_data (ACE_RMCast::Data &data, - const ACE_INET_Addr &to) -{ - //ACE_DEBUG ((LM_DEBUG, - // "IO_UDP::send_data - pushing out to <%s:%d>\n", - // to.get_host_addr (), - // to.get_port_number ())); - - // The first message block contains the header - // @@ TODO: We could keep the header pre-initialized, and only - // update the portions that do change... - ACE_UINT32 tmp; - char header[1 + 3 * sizeof(ACE_UINT32)]; - header[0] = ACE_RMCast::MT_DATA; - - tmp = ACE_HTONL (data.sequence_number); - ACE_OS::memcpy (header + 1, - &tmp, sizeof(ACE_UINT32)); - tmp = ACE_HTONL (data.total_size); - ACE_OS::memcpy (header + 1 + sizeof(ACE_UINT32), - &tmp, sizeof(ACE_UINT32)); - tmp = ACE_HTONL (data.fragment_offset); - ACE_OS::memcpy (header + 1 + 2 * sizeof(ACE_UINT32), - &tmp, sizeof(ACE_UINT32)); - - iovec iov[ACE_IOV_MAX]; - int iovcnt = 1; - - iov[0].iov_base = header; - iov[0].iov_len = sizeof(header); - - ACE_Message_Block *mb = data.payload; - - for (const ACE_Message_Block *i = mb; i != 0; i = i->cont ()) - { - iov[iovcnt].iov_base = i->rd_ptr (); - iov[iovcnt].iov_len = i->length (); - iovcnt++; - if (iovcnt >= IOV_MAX) - return -1; - } - - // @@ This pacing stuff here reduced the number of packet lost in - // loopback tests, but it should be taken out for real applications - // (or at least made configurable!) - ACE_Time_Value tv (0, 10000); - ACE_OS::sleep (tv); - - // ACE_SOCK_MCast_Dgram disallows sending, but it actually works. - ACE_SOCK_Dgram &dgram = this->dgram_; - - if (dgram.send (iov, iovcnt, to) == -1) - return -1; - -#if 0 - ACE_HEX_DUMP ((LM_DEBUG, - (char*)iov[0].iov_base, - iov[0].iov_len, - "Sending")); -#endif - - return 0; -} - -int -ACE_RMCast_IO_UDP::send_poll (ACE_RMCast::Poll &, - const ACE_INET_Addr &to) -{ - //ACE_DEBUG ((LM_DEBUG, - // "IO_UDP::send_poll - pushing out to <%s:%d>\n", - // to.get_host_addr (), - // to.get_port_number ())); - - // @@ TODO: We could keep the header pre-initialized, and only - // update the portions that do change... - char header[16]; - header[0] = ACE_RMCast::MT_POLL; - - // ACE_SOCK_MCast_Dgram disallows sending, but it actually works. - ACE_SOCK_Dgram &dgram = this->dgram_; - - if (dgram.send (header, 1, to) == -1) - return -1; - - return 0; -} - -int -ACE_RMCast_IO_UDP::send_ack_join (ACE_RMCast::Ack_Join &ack_join, - const ACE_INET_Addr &to) -{ - //ACE_DEBUG ((LM_DEBUG, - // "IO_UDP::send_ack_join - pushing out to <%s:%d>\n", - // to.get_host_addr (), - // to.get_port_number ())); - - // @@ TODO: We could keep the header pre-initialized, and only - // update the portions that do change... - char header[16]; - header[0] = ACE_RMCast::MT_ACK_JOIN; - - ACE_UINT32 tmp = ACE_HTONL (ack_join.next_sequence_number); - ACE_OS::memcpy (header + 1, - &tmp, sizeof(ACE_UINT32)); - // ACE_SOCK_MCast_Dgram disallows sending, but it actually works. - ACE_SOCK_Dgram &dgram = this->dgram_; - - if (dgram.send (header, 1 + sizeof(ACE_UINT32), to) == -1) - return -1; - - return 0; -} - -int -ACE_RMCast_IO_UDP::send_ack_leave (ACE_RMCast::Ack_Leave &, - const ACE_INET_Addr &to) -{ - //ACE_DEBUG ((LM_DEBUG, - // "IO_UDP::send_ack_leave - pushing out to <%s:%d>\n", - // to.get_host_addr (), - // to.get_port_number ())); - - // @@ TODO: We could keep the header pre-initialized, and only - // update the portions that do change... - char header[16]; - header[0] = ACE_RMCast::MT_ACK_LEAVE; - - // ACE_SOCK_MCast_Dgram disallows sending, but it actually works. - ACE_SOCK_Dgram &dgram = this->dgram_; - - if (dgram.send (header, 1, to) == -1) - return -1; - - return 0; -} - -int -ACE_RMCast_IO_UDP::send_ack (ACE_RMCast::Ack &ack, - const ACE_INET_Addr &to) -{ - //ACE_DEBUG ((LM_DEBUG, - // "IO_UDP::send_ack - pushing (%d:%d) out to <%s:%d>\n", - // ack.next_expected, - // ack.highest_received, - // to.get_host_addr (), - // to.get_port_number ())); - - // @@ TODO: We could keep the header pre-initialized, and only - // update the portions that do change... - char header[16]; - header[0] = ACE_RMCast::MT_ACK; - - ACE_UINT32 tmp = ACE_HTONL (ack.next_expected); - ACE_OS::memcpy (header + 1, - &tmp, sizeof(ACE_UINT32)); - tmp = ACE_HTONL (ack.highest_received); - ACE_OS::memcpy (header + 1 + sizeof(ACE_UINT32), - &tmp, sizeof(ACE_UINT32)); - - // ACE_SOCK_MCast_Dgram disallows sending, but it actually works. - ACE_SOCK_Dgram &dgram = this->dgram_; - - if (dgram.send (header, 1 + 2*sizeof(ACE_UINT32), to) == -1) - return -1; - - return 0; -} - -int -ACE_RMCast_IO_UDP::send_join (ACE_RMCast::Join &, - const ACE_INET_Addr &to) -{ - //ACE_DEBUG ((LM_DEBUG, - // "IO_UDP::send_join - pushing out to <%s:%d>\n", - // to.get_host_addr (), - // to.get_port_number ())); - - // @@ TODO: We could keep the header pre-initialized, and only - // update the portions that do change... - char header[16]; - header[0] = ACE_RMCast::MT_JOIN; - - // ACE_SOCK_MCast_Dgram disallows sending, but it actually works. - ACE_SOCK_Dgram &dgram = this->dgram_; - - if (dgram.send (header, 1, to) == -1) - return -1; - - return 0; -} - -int -ACE_RMCast_IO_UDP::send_leave (ACE_RMCast::Leave &, - const ACE_INET_Addr &to) -{ - //ACE_DEBUG ((LM_DEBUG, - // "IO_UDP::send_leave - pushing out to <%s:%d>\n", - // to.get_host_addr (), - // to.get_port_number ())); - - // @@ TODO: We could keep the header pre-initialized, and only - // update the portions that do change... - char header[16]; - header[0] = ACE_RMCast::MT_LEAVE; - - // ACE_SOCK_MCast_Dgram disallows sending, but it actually works. - ACE_SOCK_Dgram &dgram = this->dgram_; - - if (dgram.send (header, 1, to) == -1) - return -1; - - return 0; -} - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Manager; -template class ACE_Hash_Map_Manager_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator; -template class ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry; -template class ACE_Equal_To; -template class ACE_Hash; - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/RMCast/RMCast_IO_UDP.h b/ace/RMCast/RMCast_IO_UDP.h deleted file mode 100644 index 7b9d2440517..00000000000 --- a/ace/RMCast/RMCast_IO_UDP.h +++ /dev/null @@ -1,138 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = DESCRIPTION -// Encapsulate the I/O layer for a UDP based receiver -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_IO_UDP_H -#define ACE_RMCAST_IO_UDP_H -#include "ace/pre.h" - -#include "RMCast_Module.h" -#include "ace/SOCK_Dgram_Mcast.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" -#include "ace/INET_Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_RMCast_UDP_Proxy; -class ACE_RMCast_Module_Factory; -class ACE_Time_Value; - -class ACE_RMCast_Export ACE_RMCast_IO_UDP : public ACE_RMCast_Module -{ -public: - //! Constructor - /*! - * The argument is used to create the modules for each - * proxy that process incoming messages. The class does *not* assume - * ownership of , the caller owns it. But it does assume - * ownership of the modules returned by the factory, and it may ask - * the factory to release them eventually. - */ - ACE_RMCast_IO_UDP (ACE_RMCast_Module_Factory *factory); - - //! Destructor - ~ACE_RMCast_IO_UDP (void); - - /// Open the internal socket, but only to send multicast data. - /** - * It is not clear to me if this is a valid configuration. Maybe it - * would be a problem to expose two separate, incompatible - * interfaces (check the subscribe() method). However, the - * alternative would be to implement almost identical class for - * outgoing and incoming UDP I/O - */ - int init (const ACE_INET_Addr &mcast_group, - const ACE_Addr &local, - int protocol_family = PF_INET, - int protocol = 0, - int reuse_addr = 0); - - //! Join a new multicast group - /*! - * Start receiving data for the multicast group. - * Please read the documentation of ACE_SOCK_Dgram_Mcast for more - * details. - */ - int subscribe (const ACE_INET_Addr &mcast_addr, - int reuse_addr = 1, - const ACE_TCHAR *net_if = 0, - int protocol_family = PF_INET, - int protocol = 0); - - // The class can be used with a Reactor or using blocking I/O - // depending on what method of the following two is called. - - //! Wait for events for the period . If is zero it blocks - //! forever. - int handle_events (ACE_Time_Value *tv = 0); - - //! There is data to read, read it and process it. - int handle_input (ACE_HANDLE h); - - //! Obtain the handle for the underlying socket - ACE_HANDLE get_handle (void) const; - - //@{ - //! Send the message to the ACE_INET_Addr argument. - /*! - * These methods are used in the implementation of the - * ACE_RMCast_UDP_Proxy objects and the implementation of the - * inherited ACE_RMCast_Module methods in this class. - */ - int send_data (ACE_RMCast::Data &, const ACE_INET_Addr &); - int send_poll (ACE_RMCast::Poll &, const ACE_INET_Addr &); - int send_ack_join (ACE_RMCast::Ack_Join &, const ACE_INET_Addr &); - int send_ack_leave (ACE_RMCast::Ack_Leave &, const ACE_INET_Addr &); - int send_ack (ACE_RMCast::Ack &, const ACE_INET_Addr &); - int send_join (ACE_RMCast::Join &, const ACE_INET_Addr &); - int send_leave (ACE_RMCast::Leave &, const ACE_INET_Addr &); - //@} - - // Please read the documentation in ACE_RMCast_Module for more details - virtual int data (ACE_RMCast::Data &); - virtual int poll (ACE_RMCast::Poll &); - virtual int ack_join (ACE_RMCast::Ack_Join &); - virtual int ack_leave (ACE_RMCast::Ack_Leave &); - virtual int ack (ACE_RMCast::Ack &); - virtual int join (ACE_RMCast::Join &); - virtual int leave (ACE_RMCast::Leave &); - -private: - - // This is necessary to satisfy the stupid xgcc for Lynx on Solaris - // The compiler barfs up lisp code errors - ACE_RMCast_UDP_Proxy *allocate_and_bind_proxy (ACE_RMCast_Module *module, - const ACE_INET_Addr &); - - //! The factory used to create the modules attached to each proxy - ACE_RMCast_Module_Factory *factory_; - - //! The multicast group we subscribe and send to - ACE_INET_Addr mcast_group_; - - //! The socket used to receive and send data - ACE_SOCK_Dgram_Mcast dgram_; - - //! Use a Hash_Map to maintain the collection of proxies - typedef ACE_Hash_Map_Manager Map; - //! The collection of proxies - Map map_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_IO_UDP.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_IO_UDP_H */ diff --git a/ace/RMCast/RMCast_IO_UDP.i b/ace/RMCast/RMCast_IO_UDP.i deleted file mode 100644 index 99c1524d3a6..00000000000 --- a/ace/RMCast/RMCast_IO_UDP.i +++ /dev/null @@ -1,36 +0,0 @@ -// $Id$ - -#include "RMCast_UDP_Proxy.h" -#include "RMCast_Module_Factory.h" - -ACE_INLINE -ACE_RMCast_IO_UDP:: - ACE_RMCast_IO_UDP (ACE_RMCast_Module_Factory *factory) - : factory_ (factory) -{ -} - - -// Workaround failure in gcc for lynx hosted on solaris -// see ACE_RMCast_IO_UDP::handle_input() for more details -ACE_INLINE ACE_RMCast_UDP_Proxy * -ACE_RMCast_IO_UDP::allocate_and_bind_proxy (ACE_RMCast_Module *module, - const ACE_INET_Addr& from_address) -{ - ACE_RMCast_UDP_Proxy *proxy; - ACE_NEW_RETURN (proxy, - ACE_RMCast_UDP_Proxy(this, - from_address), - 0); - proxy->next (module); - - if (this->map_.bind (from_address, proxy) != 0) - { - // @@ LOG?? - return 0; - } - - return proxy; -} - - diff --git a/ace/RMCast/RMCast_Membership.cpp b/ace/RMCast/RMCast_Membership.cpp deleted file mode 100644 index 91c9b1a9cea..00000000000 --- a/ace/RMCast/RMCast_Membership.cpp +++ /dev/null @@ -1,184 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_Membership.h" -#include "RMCast_Proxy.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Membership.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Membership, "$Id$") - -ACE_RMCast_Membership::~ACE_RMCast_Membership (void) -{ -} - -int -ACE_RMCast_Membership::has_members (void) -{ - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - - Proxy_Iterator end = this->proxies_.end (); - Proxy_Iterator i = this->proxies_.begin (); - return (i != end); -} - -int -ACE_RMCast_Membership::ack (ACE_RMCast::Ack &ack) -{ - //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack (%d:%d)\n", - // ack.next_expected, ack.highest_received)); - - ACE_RMCast::Ack next_ack; - { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - if (ack.next_expected < this->next_expected_) - { - // @@ This violates an invariant of the class, shouldn't - // happen... - //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack[2]\n")); - return 0; - } - else if (ack.next_expected == this->next_expected_) - { - // Nothing new, just continue.... - //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack[3]\n")); - return 0; - } - - int r = this->compute_ack_i (ack.source, next_ack); - if (r < 0) - return r; - if (r == 1) - return 0; - } - - //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack[4] (%d:%d)\n", - // next_ack.next_expected, next_ack.highest_received)); - - return this->ACE_RMCast_Module::ack (next_ack); -} - -int -ACE_RMCast_Membership::join (ACE_RMCast::Join &join) -{ - if (join.source == 0) - return 0; - - { - // ACE_DEBUG ((LM_DEBUG, - // "RMCast_Membership::join - %d\n", - // long(join.source))); - - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - if (this->proxies_.insert (join.source) == -1) - return -1; - } - (void) this->generate_ack (join.source); - - return this->ACE_RMCast_Module::join (join); -} - -int -ACE_RMCast_Membership::leave (ACE_RMCast::Leave &leave) -{ - if (leave.source == 0) - return 0; - - { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - (void) this->proxies_.remove (leave.source); - } - (void) this->generate_ack (leave.source); - - return this->ACE_RMCast_Module::leave (leave); -} - -int -ACE_RMCast_Membership::generate_ack (ACE_RMCast_Proxy *proxy) -{ - ACE_RMCast::Ack next_ack; - { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - int r = this->compute_ack_i (proxy, next_ack); - if (r < 0) - return r; - if (r == 1) - return 0; - } - - //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack[6] (%d:%d)\n", - // next_ack.next_expected, next_ack.highest_received)); - - return this->ACE_RMCast_Module::ack (next_ack); -} - -int -ACE_RMCast_Membership::compute_ack_i (ACE_RMCast_Proxy *source, - ACE_RMCast::Ack &next_ack) -{ - Proxy_Iterator end = this->proxies_.end (); - Proxy_Iterator i = this->proxies_.begin (); - if (i == end) - return 1; - - //ACE_DEBUG ((LM_DEBUG, - // "RMCast_Membership::generate_ack[1] - %d -> (%d:%d)\n", - // long(*i), - // (*i)->next_expected (), - // (*i)->highest_received ())); - - ACE_UINT32 next_expected = (*i)->next_expected (); - ACE_UINT32 highest_received = (*i)->highest_received (); - ++i; - - for (; i != end; ++i) - { - // ACE_DEBUG ((LM_DEBUG, - // "RMCast_Membership::generate_ack[2] - %d -> (%d:%d)\n", - // long(*i), - // (*i)->next_expected (), - // (*i)->highest_received ())); - - ACE_UINT32 s = (*i)->next_expected (); - if (s < next_expected) - next_expected = s; - ACE_UINT32 r = (*i)->highest_received (); - if (r > highest_received) - highest_received = r; - } -#if 0 - // @@TODO: this is an important feature, disabled until it is - // fully debugged - if (this->next_expected_ >= next_expected - || this->highest_received_ >= highest_received) - { - // No change.... - ACE_DEBUG ((LM_DEBUG, - "RMCast_Membership::generate_ack[3]\n")); - return 1; - } -#endif /* 0 */ - this->next_expected_ = next_expected; - this->highest_received_ = highest_received; - next_ack.source = source; - next_ack.next_expected = this->next_expected_; - next_ack.highest_received = this->highest_received_; - - //ACE_DEBUG ((LM_DEBUG, - // "RMCast_Membership::generate_ack[4] - (%d:%d)\n", - // next_ack.next_expected, - // next_ack.highest_received)); - - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Unbounded_Set; -template class ACE_Unbounded_Set_Iterator; -template class ACE_Node; - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/RMCast/RMCast_Membership.h b/ace/RMCast/RMCast_Membership.h deleted file mode 100644 index 07f9aab593c..00000000000 --- a/ace/RMCast/RMCast_Membership.h +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// RMCast_Membership.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_MEMBERSHIP_H -#define ACE_RMCAST_MEMBERSHIP_H -#include "ace/pre.h" - -#include "RMCast_Module.h" -#include "ace/Containers.h" -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_RMCast_Proxy; - -/// Track peer membership -/** - * Reliable senders of events need to know exactly how many peers are - * receiving the events, and how many events has each peer received so - * far. - * This class uses the Join, Leave and Ack messages to build that - * information, it also summarizes the Ack events and propagate only - * the global info to the upper layer. - */ -class ACE_RMCast_Export ACE_RMCast_Membership : public ACE_RMCast_Module -{ -public: - /// Constructor - ACE_RMCast_Membership (void); - - /// Destructor - virtual ~ACE_RMCast_Membership (void); - - /// Return 1 if there are still members in the group - int has_members (void); - - /// Receive an process an Ack message - /** - * After receiving the Ack message we find out what is the lowest - * sequence number received in order among all the acks received by - * the proxies in the collection. We also find out what is the - * highest sequence number received by any proxy. - * We only propagate that information back to the upper layer, and - * then only if there are any news since the last Ack. - */ - virtual int ack (ACE_RMCast::Ack &); - - /// Add a new member to the collection, using the field in - /// the Join message - virtual int join (ACE_RMCast::Join &); - - /// Remove a member from the collection, using the field in - /// the Join message - virtual int leave (ACE_RMCast::Leave &); - -private: - /// Generate an Ack message, normally due to changes in the - /// collection, such as new proxys joining or leaving - int generate_ack (ACE_RMCast_Proxy *proxy); - - /// Compute an Ack message to propagate to the upper layers. - int compute_ack_i (ACE_RMCast_Proxy *source, - ACE_RMCast::Ack &next_ack); - -protected: - /// Use an unbounded set to maintain the collection of proxies. - typedef ACE_Unbounded_Set Proxy_Collection; - typedef ACE_Unbounded_Set_Iterator Proxy_Iterator; - - /// The collection of proxies - Proxy_Collection proxies_; - - /// The smallest value of \param next_expected for all the proxies - ACE_UINT32 next_expected_; - - /// The highest value of \param highest_received for all the proxies - ACE_UINT32 highest_received_; - - /// Synchronization - ACE_SYNCH_MUTEX mutex_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Membership.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_MEMBERSHIP_H */ diff --git a/ace/RMCast/RMCast_Membership.i b/ace/RMCast/RMCast_Membership.i deleted file mode 100644 index b513c2d5141..00000000000 --- a/ace/RMCast/RMCast_Membership.i +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Membership::ACE_RMCast_Membership (void) - : next_expected_ (0) - , highest_received_ (0) -{ -} diff --git a/ace/RMCast/RMCast_Module.cpp b/ace/RMCast/RMCast_Module.cpp deleted file mode 100644 index 727ef631d9d..00000000000 --- a/ace/RMCast/RMCast_Module.cpp +++ /dev/null @@ -1,102 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_Module.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Module.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Module, "$Id$") - -ACE_RMCast_Module::~ACE_RMCast_Module (void) -{ -} - -int -ACE_RMCast_Module::next (ACE_RMCast_Module *next) -{ - if (this->next_ != 0 && next != 0) - return 1; - this->next_ = next; - return 0; -} - -ACE_RMCast_Module * -ACE_RMCast_Module::next (void) const -{ - return this->next_; -} - -int -ACE_RMCast_Module::open (void) -{ - if (this->next () != 0) - return this->next ()->open (); - return 0; -} - -int -ACE_RMCast_Module::close (void) -{ - if (this->next () != 0) - return this->next ()->close (); - return 0; -} - -int -ACE_RMCast_Module::data (ACE_RMCast::Data &data) -{ - if (this->next () != 0) - return this->next ()->data (data); - return 0; -} - -int -ACE_RMCast_Module::poll (ACE_RMCast::Poll &poll) -{ - if (this->next () != 0) - return this->next ()->poll (poll); - return 0; -} - -int -ACE_RMCast_Module::ack_join (ACE_RMCast::Ack_Join &ack_join) -{ - if (this->next () != 0) - return this->next ()->ack_join (ack_join); - return 0; -} - -int -ACE_RMCast_Module::ack_leave (ACE_RMCast::Ack_Leave &ack_leave) -{ - if (this->next () != 0) - return this->next ()->ack_leave (ack_leave); - return 0; -} - -int -ACE_RMCast_Module::ack (ACE_RMCast::Ack &ack) -{ - if (this->next () != 0) - return this->next ()->ack (ack); - return 0; -} - -int -ACE_RMCast_Module::join (ACE_RMCast::Join &join) -{ - if (this->next () != 0) - return this->next ()->join (join); - return 0; -} - -int -ACE_RMCast_Module::leave (ACE_RMCast::Leave &leave) -{ - if (this->next () != 0) - return this->next ()->leave (leave); - return 0; -} diff --git a/ace/RMCast/RMCast_Module.h b/ace/RMCast/RMCast_Module.h deleted file mode 100644 index d362dac2366..00000000000 --- a/ace/RMCast/RMCast_Module.h +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// RMCast_Module.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_MODULE_H -#define ACE_RMCAST_MODULE_H -#include "ace/pre.h" - -#include "RMCast.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_Message_Block; -class ACE_Time_Value; - -//! Reliable Multicast Module -/*! - The reliable multicast protocol is implemented as a stack of - "Modules" each one performing one specific task. In short, this is - an instance of the pipes-and-filters architectural pattern. -*/ -class ACE_RMCast_Export ACE_RMCast_Module -{ -public: - //! Constructor - ACE_RMCast_Module (void); - - //! Destructor - virtual ~ACE_RMCast_Module (void); - - //! Modifier for the next element in the stack - virtual int next (ACE_RMCast_Module *next); - - //! Accesor for the next element in the stack - virtual ACE_RMCast_Module* next (void) const; - - //! Initialize the module, setting up the next module - virtual int open (void); - - //! Close the module. - virtual int close (void); - - //! Push data through the stack - virtual int data (ACE_RMCast::Data &); - - //! Push a polling request through the stack - virtual int poll (ACE_RMCast::Poll &); - - //! Push a message to ack a join request through the stack - virtual int ack_join (ACE_RMCast::Ack_Join &); - - //! Push a message to ack a leave request through the stack - virtual int ack_leave (ACE_RMCast::Ack_Leave &); - - //! Push an ack mesage through the stack - virtual int ack (ACE_RMCast::Ack &); - - //! Push a join message through the stack - virtual int join (ACE_RMCast::Join &); - - //! Push a leave message through the stack - virtual int leave (ACE_RMCast::Leave &); - -private: - //! The next element in the stack - ACE_RMCast_Module *next_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Module.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_MODULE_H */ diff --git a/ace/RMCast/RMCast_Module.i b/ace/RMCast/RMCast_Module.i deleted file mode 100644 index af299d706e3..00000000000 --- a/ace/RMCast/RMCast_Module.i +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Module::ACE_RMCast_Module (void) - : next_ (0) -{ -} diff --git a/ace/RMCast/RMCast_Module_Factory.cpp b/ace/RMCast/RMCast_Module_Factory.cpp deleted file mode 100644 index b749048a78c..00000000000 --- a/ace/RMCast/RMCast_Module_Factory.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// $Id$ - -#include "RMCast_Module_Factory.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Module_Factory.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Module_Factory, "$Id$") - -ACE_RMCast_Module_Factory::~ACE_RMCast_Module_Factory (void) -{ -} diff --git a/ace/RMCast/RMCast_Module_Factory.h b/ace/RMCast/RMCast_Module_Factory.h deleted file mode 100644 index 97e6ce29235..00000000000 --- a/ace/RMCast/RMCast_Module_Factory.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// RMCast_Module_Factory.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_MODULE_FACTORY_H -#define ACE_RMCAST_MODULE_FACTORY_H -#include "ace/pre.h" - -#include "RMCast.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_RMCast_Module; -class ACE_RMCast_IO_UDP; - -//! Create Module stacks -/*! - * Different application will probably require different - * configurations in their Module stack, some will just want best - * effort semantics. Others will use Reliable communication with a - * maximum retransmission time. Furthermore, applications may want to - * receive messages in send order, or just as soon as they are - * received. - * Obviously most applications will want to change want happens once a - * message is completely received. - * - * To achieve all this flexibility the IO layer uses this factory to - * create the full stack of Modules corresponding to a single - * consumer. - * To keep the complexity under control the intention is to create - * helper Factories, such as Reliable_Module_Factory where - * applications only need to customize a few features. - */ -class ACE_RMCast_Export ACE_RMCast_Module_Factory -{ -public: - //! Destructor - virtual ~ACE_RMCast_Module_Factory (void); - - //! Create a new proxy - virtual ACE_RMCast_Module *create (void) = 0; - - //! Destroy a proxy - /*! - * Some factories may allocate modules from a pool, or return the - * same module for all proxies. Consequently, only the factory - * knows how to destroy them. - */ - virtual void destroy (ACE_RMCast_Module *) = 0; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Module_Factory.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_MODULE_FACTORY_H */ diff --git a/ace/RMCast/RMCast_Module_Factory.i b/ace/RMCast/RMCast_Module_Factory.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/RMCast/RMCast_Module_Factory.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/RMCast/RMCast_Partial_Message.cpp b/ace/RMCast/RMCast_Partial_Message.cpp deleted file mode 100644 index 5de2e660a11..00000000000 --- a/ace/RMCast/RMCast_Partial_Message.cpp +++ /dev/null @@ -1,215 +0,0 @@ -// $Id$ - -#include "RMCast_Partial_Message.h" - -#if !defined (__ACE_INLINE__) -#include "RMCast_Partial_Message.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Partial_Message, "$Id$") - -ACE_RMCast_Partial_Message:: -ACE_RMCast_Partial_Message (ACE_UINT32 message_size) - : max_hole_count_ (ACE_RMCAST_DEFAULT_HOLE_COUNT), - hole_count_ (1) -{ - ACE_NEW (this->hole_list_, - ACE_RMCast_Partial_Message::Hole[this->max_hole_count_]); - this->hole_list_[0].start = 0; - this->hole_list_[0].end = message_size; - - this->message_body_.size (message_size); - this->message_body_.wr_ptr (message_size); -} - -ACE_RMCast_Partial_Message:: -~ACE_RMCast_Partial_Message (void) -{ - delete[] this->hole_list_; -} - -int -ACE_RMCast_Partial_Message::fragment_received (ACE_UINT32 message_size, - ACE_UINT32 offset, - ACE_Message_Block *mb) -{ - if (this->message_body_.length () != message_size) - { - // ACE_DEBUG ((LM_DEBUG, - // "Partial_Message::fragment_received - " - // "invalid message length\n")); - return -1; - } - - // Just copy the data... - char *rd_ptr = this->message_body_.rd_ptr () + offset; - size_t total_length = 0; - { - for (const ACE_Message_Block *i = mb; i != 0; i = i->cont ()) - { - if (rd_ptr + i->length () > this->message_body_.wr_ptr ()) - { - // ACE_DEBUG ((LM_DEBUG, - // "Partial_Message::fragment_received - " - // "invalid payload length\n")); - return -1; - } - ACE_OS::memcpy (rd_ptr, i->rd_ptr (), i->length ()); - rd_ptr += i->length (); - total_length += i->length (); - } - } - - // The algorithm works like this: - // - // For each hole we determine if there is an intersection between - // the hole and the incoming fragment. If there is none we do - // nothing (actually since the holes are ordered we can stop the - // iteration if the - - ACE_UINT32 start = offset; - ACE_UINT32 end = offset + total_length; - - while (start != end && this->hole_count_ != 0) - { - for (size_t i = 0; i < this->hole_count_; ++i) - { - Hole& hole = this->hole_list_[i]; - - // First check if the new data insersects the hole... - if (end <= hole.start) - return 0; - if (start >= hole.end) - { - if (i == this->hole_count_ - 1) - return 0; - else - continue; - } - - // The hole and the new fragment intersect, we have to - // update the hole list. - // - // There are only three cases for the value: - // start < hole.start - // start == hole.start - // hole.start < start < hole.end - // - // But the code for both start == hole.start and start < - // hole.start is identical.... - - if (start <= hole.start) - { - if (end < hole.end) - { - // NOTE: hole.start < end, because of previous test - - // In this case we shrink the hole, but it is not - // removed! - hole.start = end; - return 0; - } - else // end >= hole.end - { - start = hole.end; - // We remove the hole, and continue the iteration... - if (this->remove_hole (i) == -1) - return -1; - break; - } - } - else // hole.start < start < hole.end - { - if (end >= hole.end) - { - // Just adjust the size of the hole... - ACE_UINT32 tmp = hole.end; - hole.end = start; - start = tmp; - break; - } - else // if (end < hole.end) - { - // Nasty, we need to insert a new hole... - if (this->insert_hole (i, end, hole.end) == -1) - return -1; - // and change the old hole... - // NOTE: we have to refetch it because the array may - // have been reallocated! - this->hole_list_[i].end = start; - return 0; - } - } - } - } - return 0; - // @@ OLD COMMENTS, the algorithm has changed since! - // There are several cases: - // - // 1) The fragment is completely contained in data already received, - // nothing changes in this case. - // - // 2) Part of the fragment is contained in data already received and - // part is new data: - // 2.1) The new data closes a hole, remove it from the list - // 2.2) The beginning of the new fragment is the new data, reduce - // the size of the hole - // 2.3) The end of the new fragment is the new data, increment - // the size of the received block - // - // 3) The fragment is completely contained in a hole - // 3.1) It closes the hole, remove it from the list - // 3.2) It starts at the beginning of a hole, grow the received - // block - // 3.3) It ends at the end of a hole, reduce the hole size - // 3.4) It is in the middle of a hole, insert a new hole - // -} - -int -ACE_RMCast_Partial_Message::insert_hole (size_t i, - ACE_UINT32 start, - ACE_UINT32 end) -{ - // ACE_DEBUG ((LM_DEBUG, - // "Partial_Message::insert_hole %d = [%d,%d]\n", - // i, start, end)); - if (this->hole_count_ + 1 > this->max_hole_count_) - { - this->max_hole_count_ *= 2; - Hole *tmp; - ACE_NEW_RETURN (tmp, Hole[this->max_hole_count_], -1); - for (size_t j = 0; j != this->hole_count_; ++j) - { - tmp[j] = this->hole_list_[j]; - } - delete[] this->hole_list_; - this->hole_list_ = tmp; - } - if (this->hole_count_ != 0) - { - for (size_t j = this->hole_count_ - 1; j >= i + 1; --j) - { - this->hole_list_[j+1] = this->hole_list_[j]; - } - } - - this->hole_list_[i + 1].start = start; - this->hole_list_[i + 1].end = end; - this->hole_count_++; - - return 0; -} - -int -ACE_RMCast_Partial_Message::remove_hole (size_t i) -{ - // ACE_DEBUG ((LM_DEBUG, - // "Partial_Message::remove_hole %d\n", - // i)); - for (size_t j = i; j != this->hole_count_ - 1; ++j) - this->hole_list_[j] = this->hole_list_[j + 1]; - - this->hole_count_--; - return 0; -} diff --git a/ace/RMCast/RMCast_Partial_Message.h b/ace/RMCast/RMCast_Partial_Message.h deleted file mode 100644 index 88fa9ab2f1a..00000000000 --- a/ace/RMCast/RMCast_Partial_Message.h +++ /dev/null @@ -1,102 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = DESCRIPTION -// Helper class used in the reassembly layer of the realiable -// multicast library. -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_PARTIAL_MESSAGE_H -#define ACE_RMCAST_PARTIAL_MESSAGE_H -#include "ace/pre.h" - -#include "RMCast_Export.h" -#include "ace/Task.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#ifndef ACE_RMCAST_DEFAULT_HOLE_COUNT -#define ACE_RMCAST_DEFAULT_HOLE_COUNT 16 -#endif /* ACE_RMCAST_DEFAULT_HOLE_COUNT */ - -//! Represent a partially received message in the -//! ACE_RMCast_Reassembly module -/*! - * This class provides temporary storage for the fragments as they are - * received in the ACE_RMCast_Reassembly module. It also keeps track - * of what portions of the message are still missing. - */ -class ACE_RMCast_Export ACE_RMCast_Partial_Message -{ -public: - //! Constructor, reserve enough memory for the complete message - ACE_RMCast_Partial_Message (ACE_UINT32 message_size); - - //! Destructor - ~ACE_RMCast_Partial_Message (void); - - //! Process a fragment - /*! - * A fragment starting at has been received, copy the - * fragment contents and update the list of holes. - */ - int fragment_received (ACE_UINT32 message_size, - ACE_UINT32 offset, - ACE_Message_Block *mb); - - //! Return 1 if the message is complete - int is_complete (void) const; - - //! Return the body of the message, the memory is *not* owned by the - //! caller - ACE_Message_Block *message_body (void); - -private: - //! Insert a new hole into the list - /*! - * The class keeps an array to represent the missing portions of the - * message. This method inserts a new hole, i.e. a new element in - * the array at index . The and arguments represent - * the offsets of the missing portion of the message. - */ - int insert_hole (size_t i, - ACE_UINT32 start, - ACE_UINT32 end); - - //! Remove a hole from the list - int remove_hole (size_t i); - -private: - //! Maintain the message storage - ACE_Message_Block message_body_; - - //! Represent a missing portion of a message - struct Hole - { - //! Offset where the missing portion of the message starts - ACE_UINT32 start; - //! Offset where the missing portion of the message ends - ACE_UINT32 end; - }; - - //! Implement a growing array of Hole structures - //@{ - Hole *hole_list_; - size_t max_hole_count_; - size_t hole_count_; - //@} -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Partial_Message.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_PARTIAL_MESSAGE_H */ diff --git a/ace/RMCast/RMCast_Partial_Message.i b/ace/RMCast/RMCast_Partial_Message.i deleted file mode 100644 index 7be89aa1932..00000000000 --- a/ace/RMCast/RMCast_Partial_Message.i +++ /dev/null @@ -1,15 +0,0 @@ -// $Id$ - -ACE_INLINE int -ACE_RMCast_Partial_Message::is_complete (void) const -{ - return (this->hole_count_ == 0) - || (this->hole_count_ == 1 - && this->hole_list_[0].start == this->hole_list_[0].end); -} - -ACE_INLINE ACE_Message_Block * -ACE_RMCast_Partial_Message::message_body (void) -{ - return &this->message_body_; -} diff --git a/ace/RMCast/RMCast_Proxy.cpp b/ace/RMCast/RMCast_Proxy.cpp deleted file mode 100644 index 2257f9a2bd7..00000000000 --- a/ace/RMCast/RMCast_Proxy.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_Proxy.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Proxy.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Proxy, "$Id$") - -ACE_RMCast_Proxy::~ACE_RMCast_Proxy (void) -{ -} - -ACE_UINT32 -ACE_RMCast_Proxy::next_expected (void) const -{ - return this->next_expected_; -} - -ACE_UINT32 -ACE_RMCast_Proxy::highest_received (void) const -{ - return this->highest_received_; -} - -int -ACE_RMCast_Proxy::ack (ACE_RMCast::Ack &ack) -{ - this->next_expected_ = ack.next_expected; - this->highest_received_ = ack.highest_received; - return this->ACE_RMCast_Module::ack (ack); -} - -int -ACE_RMCast_Proxy::reply_ack_join (ACE_RMCast::Ack_Join &ack_join) -{ - if (this->next_expected_ < ack_join.next_sequence_number) - { - this->next_expected_ = ack_join.next_sequence_number; - this->highest_received_ = ack_join.next_sequence_number; - } - return 0; -} diff --git a/ace/RMCast/RMCast_Proxy.h b/ace/RMCast/RMCast_Proxy.h deleted file mode 100644 index d774efe4b2c..00000000000 --- a/ace/RMCast/RMCast_Proxy.h +++ /dev/null @@ -1,102 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// RMCast_Proxy.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_PROXY_H -#define ACE_RMCAST_PROXY_H -#include "ace/pre.h" - -#include "RMCast_Module.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_Message_Block; -class ACE_Time_Value; - -//! Local representation for remote peers -/*! - Both senders and receivers in the multicast group need to maintain - explicit representations of their "peers". For example, a sender - needs to know the list of all the receivers and what messages they - have reported as successfully received. - Likewise, the receiver needs to maintain separate state for each - remote sender, and must be able to disconnect from all of them - gracefully when needed. - The RMCast_Proxy class is an opaque representation of such a peer, - and hides all the networking details from the rest of the system. -*/ -class ACE_RMCast_Export ACE_RMCast_Proxy : public ACE_RMCast_Module -{ -public: - //! Constructor - ACE_RMCast_Proxy (void); - // Constructor - - //! Destructor - virtual ~ACE_RMCast_Proxy (void); - - //! Return the next sequence number expected by the peer. Only - //! applies to remote receiver proxies. - /*! - * Please read the documentation in ACE_RMCast::Ack - */ - virtual ACE_UINT32 next_expected (void) const; - - //! Return the highest sequence number successfully received. - //! Only applies to remote receiver proxies. - /*! - * Please read the documentation in ACE_RMCast::Ack - */ - virtual ACE_UINT32 highest_received (void) const; - - //@{ - //! Send messages directly to the peer. - /*! - * Send a message directly to the peer, i.e. the message is not - * sent through the multicast group and it may not be processed by - * all the layers in the stack. - */ - virtual int reply_data (ACE_RMCast::Data &) = 0; - virtual int reply_poll (ACE_RMCast::Poll &) = 0; - virtual int reply_ack_join (ACE_RMCast::Ack_Join &); - virtual int reply_ack_leave (ACE_RMCast::Ack_Leave &) = 0; - virtual int reply_ack (ACE_RMCast::Ack &) = 0; - virtual int reply_join (ACE_RMCast::Join &) = 0; - virtual int reply_leave (ACE_RMCast::Leave &) = 0; - //@} - - /*! - * Proxies process the ACK sequence numbers to cache the ack - * information from the peer. - */ - virtual int ack (ACE_RMCast::Ack &); - -private: - //@{ - //! Cache the sequence numbers reported from the remote peer using - //! Ack messages - ACE_UINT32 next_expected_; - ACE_UINT32 highest_received_; - //@} -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Proxy.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_PROXY_H */ diff --git a/ace/RMCast/RMCast_Proxy.i b/ace/RMCast/RMCast_Proxy.i deleted file mode 100644 index 6fee09fe9e5..00000000000 --- a/ace/RMCast/RMCast_Proxy.i +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Proxy::ACE_RMCast_Proxy (void) - : next_expected_ (0) - , highest_received_ (0) -{ -} diff --git a/ace/RMCast/RMCast_Reassembly.cpp b/ace/RMCast/RMCast_Reassembly.cpp deleted file mode 100644 index d20b72d88c5..00000000000 --- a/ace/RMCast/RMCast_Reassembly.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// $Id$ - -#include "RMCast_Reassembly.h" -#include "RMCast_Partial_Message.h" -#include "ace/Message_Block.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "RMCast_Reassembly.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Reassembly, "$Id$") - -ACE_RMCast_Reassembly:: -ACE_RMCast_Reassembly (void) - : ACE_RMCast_Module () -{ -} - -ACE_RMCast_Reassembly::~ACE_RMCast_Reassembly (void) -{ - (void) this->close_i (); -} - -/** - * - * We cleanup the resources in the destructor - */ -int -ACE_RMCast_Reassembly::close () -{ - this->close_i (); - return this->ACE_RMCast_Module::close (); -} - -int -ACE_RMCast_Reassembly::data (ACE_RMCast::Data &data) -{ - if (this->next () == 0) - return 0; - - // ACE_DEBUG ((LM_DEBUG, - // "Reassembly::data - %d,%d,%d\n", - // data.sequence_number, - // data.total_size, - // data.fragment_offset)); - - if (data.payload->length () + data.fragment_offset > data.total_size) - { - ACE_ERROR ((LM_ERROR, - "RMCast_Reassembly::data - invalid size\n")); - return -1; // Corrupt message? - } - - ACE_RMCast_Partial_Message *message; - - { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - if (this->messages_.find (data.sequence_number, message) == -1) - { - ACE_NEW_RETURN (message, - ACE_RMCast_Partial_Message (data.total_size), - -1); - - // ACE_DEBUG ((LM_DEBUG, - // "Reassembly::data - new message\n")); - if (this->messages_.bind (data.sequence_number, - message) == -1) - return -1; // Internal error? - } - - if (message->fragment_received (data.total_size, - data.fragment_offset, - data.payload) == -1) - { - // ACE_DEBUG ((LM_DEBUG, - // "Error in fragment_received\n")); - return -1; - } - - if (!message->is_complete ()) - { - // ACE_DEBUG ((LM_DEBUG, - // "Reassembly::data - message still incomplete\n")); - return 0; - } - - if (this->messages_.unbind (data.sequence_number) == -1) - { - // ACE_DEBUG ((LM_DEBUG, - // "Reassembly::data - message now complete\n")); - return -1; - } - } - - // Push the message... - ACE_RMCast::Data downstream_data; - downstream_data.source = data.source; - downstream_data.sequence_number = data.sequence_number; - downstream_data.total_size = message->message_body ()->length (); - downstream_data.fragment_offset = 0; - downstream_data.payload = message->message_body (); - - int r = this->next ()->data (downstream_data); - - delete message; - - return r; -} - -void -ACE_RMCast_Reassembly::close_i (void) -{ - for (Message_Map_Iterator i = this->messages_.begin (); - i != this->messages_.end (); - ++i) - { - ACE_RMCast_Partial_Message *message = (*i).int_id_; - if (message != 0) - delete message; - } - this->messages_.unbind_all (); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Manager; -template class ACE_Hash_Map_Manager_Ex,ACE_Equal_To,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator; -template class ACE_Hash_Map_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex >; -template class ACE_Hash_Map_Reverse_Iterator_Ex,ACE_Equal_To,ACE_Null_Mutex >; -template class ACE_Hash_Map_Iterator_Base_Ex,ACE_Equal_To,ACE_Null_Mutex >; -template class ACE_Hash_Map_Entry; - -template class ACE_Less_Than; - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/RMCast/RMCast_Reassembly.h b/ace/RMCast/RMCast_Reassembly.h deleted file mode 100644 index a9ebb480ac3..00000000000 --- a/ace/RMCast/RMCast_Reassembly.h +++ /dev/null @@ -1,73 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = DESCRIPTION -// The reassembly task for the reliable multicast library -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_REASSEMBLY_H -#define ACE_RMCAST_REASSEMBLY_H -#include "ace/pre.h" - -#include "RMCast_Module.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_RMCast_Partial_Message; - -//! Reassemble multiple data fragments into a single data message -/*! - Data messages may not fit in a single MTU in the transport layer, in - that case the application configure a RMCast_Fragment module on the - sender side. On the receiver side this layer reassemble the - messages sent from a single source, and passes the messages - up the stream. -*/ -class ACE_RMCast_Export ACE_RMCast_Reassembly : public ACE_RMCast_Module -{ -public: - //! Constructor - ACE_RMCast_Reassembly (void); - - //! Destructor - virtual ~ACE_RMCast_Reassembly (void); - - // = The ACE_RMCast_Module methods - virtual int close (void); - virtual int data (ACE_RMCast::Data &data); - -private: - /// Cleanup resources, but do not close the other modules in the - /// stack - void close_i (void); - -private: - //! A mutex used to synchronize all the internal operations. - ACE_SYNCH_MUTEX mutex_; - typedef - ACE_Hash_Map_Manager - Message_Map; - typedef - ACE_Hash_Map_Iterator - Message_Map_Iterator; - - //! A map, indexed by sequence number, of the partially received - //! messages. - Message_Map messages_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Reassembly.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_REASSEMBLY_H */ diff --git a/ace/RMCast/RMCast_Reassembly.i b/ace/RMCast/RMCast_Reassembly.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/RMCast/RMCast_Reassembly.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/RMCast/RMCast_Receiver_Module.cpp b/ace/RMCast/RMCast_Receiver_Module.cpp deleted file mode 100644 index 2d08ca4bb02..00000000000 --- a/ace/RMCast/RMCast_Receiver_Module.cpp +++ /dev/null @@ -1,157 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_Receiver_Module.h" -#include "RMCast_Proxy.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Receiver_Module.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Receiver_Module, "$Id$") - -ACE_RMCast_Receiver_Module::~ACE_RMCast_Receiver_Module (void) -{ -} - -int -ACE_RMCast_Receiver_Module::data (ACE_RMCast::Data &data) -{ - switch (this->state_) - { - case RS_NON_EXISTENT: - case RS_JOINING: - if (data.source != 0) - { - //ACE_DEBUG ((LM_DEBUG, - // "Receiver_Module::data - joining\n")); - - this->state_ = RS_JOINING; - ACE_RMCast::Join join; - if (data.source->reply_join (join) != 0) - this->leaving (data.source); - } - break; - - case RS_JOINED: - // ACE_DEBUG ((LM_DEBUG, - // "Receiver_Module::data - joined\n")); - if (this->ACE_RMCast_Module::data (data) != 0) - this->leaving (data.source); - break; - - default: - case RS_LEAVING: - this->leaving (data.source); - break; - } - return 0; -} - -int -ACE_RMCast_Receiver_Module::poll (ACE_RMCast::Poll &poll) -{ - switch (this->state_) - { - case RS_NON_EXISTENT: - case RS_JOINING: - if (poll.source != 0) - { - this->state_ = RS_JOINING; - ACE_RMCast::Join join; - if (poll.source->reply_join (join) != 0) - this->leaving (poll.source); - } - break; - - case RS_JOINED: - if (this->ACE_RMCast_Module::poll (poll) != 0) - this->leaving (poll.source); - - default: - case RS_LEAVING: - this->leaving (poll.source); - break; - } - return 0; -} - -int -ACE_RMCast_Receiver_Module::ack_join (ACE_RMCast::Ack_Join &ack_join) -{ - switch (this->state_) - { - case RS_NON_EXISTENT: - if (ack_join.source != 0) - { - //ACE_DEBUG ((LM_DEBUG, - // "Receiver_Module::ack_join - joining\n")); - - this->state_ = RS_JOINING; - ACE_RMCast::Join join; - if (ack_join.source->reply_join (join) != 0) - this->leaving (ack_join.source); - } - break; - - case RS_JOINING: - case RS_JOINED: - //ACE_DEBUG ((LM_DEBUG, - // "Receiver_Module::ack_join - joined\n")); - - this->state_ = RS_JOINED; - if (this->ACE_RMCast_Module::ack_join (ack_join) != 0) - this->leaving (ack_join.source); - break; - - default: - case RS_LEAVING: - this->leaving (ack_join.source); - break; - } - return 0; -} - -int -ACE_RMCast_Receiver_Module::ack_leave (ACE_RMCast::Ack_Leave &ack_leave) -{ - //ACE_DEBUG ((LM_DEBUG, - // "Receiver_Module::ack_leave\n")); - - (void) this->ACE_RMCast_Module::ack_leave (ack_leave); - - // Returning -1 should remove the Proxy from the local set - return -1; -} - -int -ACE_RMCast_Receiver_Module::ack (ACE_RMCast::Ack &) -{ - return -1; -} - -int -ACE_RMCast_Receiver_Module::join (ACE_RMCast::Join &) -{ - return -1; -} - -int -ACE_RMCast_Receiver_Module::leave (ACE_RMCast::Leave &) -{ - return -1; -} - -void -ACE_RMCast_Receiver_Module::leaving (ACE_RMCast_Proxy *proxy) -{ - this->state_ = RS_LEAVING; - if (proxy != 0) - { - ACE_RMCast::Leave leave; - (void) proxy->reply_leave (leave); - } - (void) this->close (); -} diff --git a/ace/RMCast/RMCast_Receiver_Module.h b/ace/RMCast/RMCast_Receiver_Module.h deleted file mode 100644 index 35ae8c642c7..00000000000 --- a/ace/RMCast/RMCast_Receiver_Module.h +++ /dev/null @@ -1,108 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace/RMCast -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_RECEIVER_MODULE_H -#define ACE_RMCAST_RECEIVER_MODULE_H -#include "ace/pre.h" - -#include "RMCast_Module.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Keep track of the receiver module. -/** - * A receiver proxy must reject invalid messages and communicate with - * the sender to join and leave the multicast group. - * - * This module performs all the task related to - * - */ -class ACE_RMCast_Export ACE_RMCast_Receiver_Module : public ACE_RMCast_Module -{ -public: - //! Constructor - ACE_RMCast_Receiver_Module (void); - - //! Destructor - virtual ~ACE_RMCast_Receiver_Module (void); - - virtual int data (ACE_RMCast::Data &); - virtual int poll (ACE_RMCast::Poll &); - virtual int ack_join (ACE_RMCast::Ack_Join &); - virtual int ack_leave (ACE_RMCast::Ack_Leave &); - virtual int ack (ACE_RMCast::Ack &); - virtual int join (ACE_RMCast::Join &); - virtual int leave (ACE_RMCast::Leave &); - - /// Simple enum used to describe the receiver state transitions - /** - * Receivers go through several states before they can fully accept - * messages, the following comments describe those states, as well as - * the possible transitions - * This configuration is pesimistic, any invalid message is cause - * enough to reclaim all the resources. This partially addresses - * situations where either accidentally or intentionally a sender is - * multicasting packets to the wrong group. - - - NON_EXISTENT JOINING JOINED LEAVING
    - ----------------------------------------------------------------
    -
    - DATA JOINING JOINING JOINED LEAVING
    - Send/Join Send/Join Recv/Data Send/Leave
    -
    - POLL JOINING JOINING JOINED LEAVING
    - Send/Join Send/Join Send/Ack Send/Leave
    -
    - ACK_JOIN JOINING JOINED JOINED LEAVING
    - Send/Join Receive Msg Receive Msg Send/Leave
    -
    - ACK_LEAVE NON_EXISTENT NON_EXISTENT NON_EXISTENT NON_EXISTENT
    - Noop Destroy Destroy Destroy
    -
    - ACK NON_EXISTENT NON_EXISTENT NON_EXISTENT NON_EXISTENT
    - Noop Destroy Destroy Destroy
    -
    - JOIN NON_EXISTENT NON_EXISTENT NON_EXISTENT NON_EXISTENT
    - Noop Destroy Destroy Destroy
    -
    - LEAVE NON_EXISTENT NON_EXISTENT NON_EXISTENT NON_EXISTENT
    - Noop Destroy Destroy Destroy
    -
    -
    - */ - enum Receiver_State - { - RS_NON_EXISTENT, - RS_JOINING, - RS_JOINED, - RS_LEAVING - }; - -private: - /// Enter the leaving state, prepare for termination - void leaving (ACE_RMCast_Proxy *proxy); - -private: - /// The current state of the receiver - int state_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Receiver_Module.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_RECEIVER_MODULE_H */ diff --git a/ace/RMCast/RMCast_Receiver_Module.i b/ace/RMCast/RMCast_Receiver_Module.i deleted file mode 100644 index 6662f7f048a..00000000000 --- a/ace/RMCast/RMCast_Receiver_Module.i +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Receiver_Module::ACE_RMCast_Receiver_Module (void) - : state_ (ACE_RMCast_Receiver_Module::RS_NON_EXISTENT) -{ -} diff --git a/ace/RMCast/RMCast_Reliable_Factory.cpp b/ace/RMCast/RMCast_Reliable_Factory.cpp deleted file mode 100644 index 6140c685153..00000000000 --- a/ace/RMCast/RMCast_Reliable_Factory.cpp +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ - -#include "RMCast_Reliable_Factory.h" -#include "RMCast_Receiver_Module.h" -#include "RMCast_Reassembly.h" -#include "RMCast_Reordering.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Reliable_Factory.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Reliable_Factory, "$Id$") - -ACE_RMCast_Reliable_Factory::~ACE_RMCast_Reliable_Factory (void) -{ -} - -ACE_RMCast_Module* -ACE_RMCast_Reliable_Factory::create (void) -{ - ACE_RMCast_Module *receiver; - ACE_NEW_RETURN (receiver, ACE_RMCast_Receiver_Module, 0); - - ACE_RMCast_Module *reassembly; - ACE_NEW_RETURN (reassembly, ACE_RMCast_Reassembly, 0); - - ACE_RMCast_Module *reordering; - ACE_NEW_RETURN (reordering, ACE_RMCast_Reordering, 0); - - ACE_RMCast_Module *user = this->factory_->create (); - if (user == 0) - { - delete receiver; - delete reordering; - delete reassembly; - return 0; - } - receiver->next (reassembly); - reassembly->next (reordering); - reordering->next (user); - return receiver; -} - -void -ACE_RMCast_Reliable_Factory::destroy (ACE_RMCast_Module *receiver) -{ - ACE_RMCast_Module *reassembly = receiver->next (); - ACE_RMCast_Module *reordering = reassembly->next (); - ACE_RMCast_Module *user = reordering->next (); - this->factory_->destroy (user); - delete reordering; - delete reassembly; - delete receiver; -} diff --git a/ace/RMCast/RMCast_Reliable_Factory.h b/ace/RMCast/RMCast_Reliable_Factory.h deleted file mode 100644 index 0115344c7e3..00000000000 --- a/ace/RMCast/RMCast_Reliable_Factory.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// RMCast_Reliable_Factory.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_RELIABLE_FACTORY_H -#define ACE_RMCAST_RELIABLE_FACTORY_H -#include "ace/pre.h" - -#include "RMCast_Module_Factory.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Implement an ACE_RMCast_Module_Factory that "creates" a single -/// object. -/** - * Many applications (and even some internal components), will use a - * single ACE_RMCast_Module to process all the events, for example, a - * receiver may decide to use the same ACE_RMCast_Module to process - * all incoming events, instead of using one per remote sender. - */ -class ACE_RMCast_Export ACE_RMCast_Reliable_Factory : public ACE_RMCast_Module_Factory -{ -public: - /// Constructor - ACE_RMCast_Reliable_Factory (ACE_RMCast_Module_Factory *factory); - - //! Destructor - virtual ~ACE_RMCast_Reliable_Factory (void); - - /** - * The create() method will return always @c reliable. - */ - virtual ACE_RMCast_Module *create (void); - virtual void destroy (ACE_RMCast_Module *); - -private: - /// Delegate on another factory to create the user module - ACE_RMCast_Module_Factory *factory_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Reliable_Factory.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_RELIABLE_FACTORY_H */ diff --git a/ace/RMCast/RMCast_Reliable_Factory.i b/ace/RMCast/RMCast_Reliable_Factory.i deleted file mode 100644 index 47ba22754ec..00000000000 --- a/ace/RMCast/RMCast_Reliable_Factory.i +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Reliable_Factory:: - ACE_RMCast_Reliable_Factory (ACE_RMCast_Module_Factory *factory) - : factory_ (factory) -{ -} diff --git a/ace/RMCast/RMCast_Reordering.cpp b/ace/RMCast/RMCast_Reordering.cpp deleted file mode 100644 index 5a81a360783..00000000000 --- a/ace/RMCast/RMCast_Reordering.cpp +++ /dev/null @@ -1,178 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_Reordering.h" -#include "RMCast_Proxy.h" -#include "ace/Message_Block.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Reordering.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Reordering, "$Id$") - -ACE_RMCast_Reordering::~ACE_RMCast_Reordering (void) -{ -} - -int -ACE_RMCast_Reordering::close (void) -{ - Messages_Iterator i = this->messages_.begin (); - Messages_Iterator end = this->messages_.end (); - - while (i != end) - { - ACE_Message_Block::release ((*i).item ().payload); - this->messages_.unbind ((*i).key ()); - i = this->messages_.begin (); - } - return this->ACE_RMCast_Module::close (); -} - -int -ACE_RMCast_Reordering::data (ACE_RMCast::Data &data) -{ - int must_ack = 0; - int result = 0; - ACE_RMCast::Ack ack; - - //ACE_DEBUG ((LM_DEBUG, "Received message (%d)\n", data.sequence_number)); - { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - - if (data.sequence_number < this->next_expected_) - { - // Old message. Ack with the current status (look at the end - // of this block). - must_ack = 1; - - //ACE_DEBUG ((LM_DEBUG, ".... old message is ignored\n")); - } - - else if (data.sequence_number == this->next_expected_) - { - //ACE_DEBUG ((LM_DEBUG, ".... message is in order, received\n")); - - // Accept the message, the current thread will dispatch it, so - // it is marked as accepted (using the field). - // Any other thread will not push that message because now it - // is "old". - - this->next_expected_++; - - // Right message, process as many messages as possible from - // the queue, then ack the right level... - - // NOTE: we cannot release the mutex while dispatching - // events, otherwise: how do we stop other threads from - // delivering messages out of order? I.E. what if the - // next thread receives the next message? - if (this->next () != 0) - { - result = this->next ()->data (data); - } - - // After delivering one message there may be more messages - // pending - if (result == 0) - result = this->push_queued_messages (); - - //@@ This should be strategized, for example, only Ack if - // there is a message out of order or something, otherwise - // continue with happiness. That works well for "optimistic - // models". - must_ack = 1; - } - - else - { - //ACE_DEBUG ((LM_DEBUG, ".... message out of sequence, saved\n")); - - // Out of sequence. - if (this->highest_received_ < data.sequence_number) - { - this->highest_received_ = data.sequence_number; - } - ACE_RMCast::Data new_data = data; - new_data.payload = ACE_Message_Block::duplicate (data.payload); - (void) this->messages_.bind (data.sequence_number, new_data); - // re-ack, otherwise save it and ack. - } - - ack.next_expected = this->next_expected_; - ack.highest_received = this->highest_received_; - } - - if (must_ack && data.source != 0) - (void) data.source->reply_ack (ack); - - return result; -} - -int -ACE_RMCast_Reordering::ack_join (ACE_RMCast::Ack_Join &ack_join) -{ - //ACE_DEBUG ((LM_DEBUG, "RMCast_Reordering::ack_join - <%d,%d>\n", - // this->next_expected_, - // ack_join.next_sequence_number)); - - { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - if (this->next_expected_ >= ack_join.next_sequence_number) - { - // Nothing to do in this case... - return 0; - } - - Messages_Iterator i = this->messages_.begin (); - Messages_Iterator end = this->messages_.end (); - - while (i != end - && (*i).key () < ack_join.next_sequence_number) - { - ACE_Message_Block::release ((*i).item ().payload); - this->messages_.unbind ((*i).key ()); - i = this->messages_.begin (); - } - - this->next_expected_ = ack_join.next_sequence_number; - if (this->highest_received_ < ack_join.next_sequence_number) - this->highest_received_ = ack_join.next_sequence_number; - - this->push_queued_messages (); - } - - return 0; -} - -int -ACE_RMCast_Reordering::push_queued_messages (void) -{ - Messages_Iterator i = this->messages_.begin (); - Messages_Iterator end = this->messages_.end (); - - while (i != end - && (*i).key () == this->next_expected_) - { - int r = 0; - if (this->next () != 0) - { - ACE_RMCast::Data data = (*i).item (); - r = this->next ()->data (data); - } - - ACE_Message_Block::release ((*i).item ().payload); - this->messages_.unbind ((*i).key ()); - i = this->messages_.begin (); - this->next_expected_++; - if (r != 0) - return r; - } - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/RMCast/RMCast_Reordering.h b/ace/RMCast/RMCast_Reordering.h deleted file mode 100644 index 5647e35a585..00000000000 --- a/ace/RMCast/RMCast_Reordering.h +++ /dev/null @@ -1,96 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace/RMCast -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_REORDERING_H -#define ACE_RMCAST_REORDERING_H -#include "ace/pre.h" - -#include "RMCast_Module.h" -#include "ace/RB_Tree.h" -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_RMCast_Proxy; - -/// Pass messages up in sent order -/** - * Some applications require receivers to process messages in the same - * order that messages are sent. This module buffers out of order - * messages and only delivers a message if: - * - All the previous messages have been delivered. - * - The sender sends a notification that previous messages will not - * be resent. - * - * The module also sends the Ack feedback to the sender. - * - * NOTE: This is not the same as causal or total ordering, that could - * be implemented someday, but requires a lot more than what we have - * right now. - * - */ -class ACE_RMCast_Export ACE_RMCast_Reordering : public ACE_RMCast_Module -{ -public: - /// Constructor - ACE_RMCast_Reordering (void); - - /// Destructor - virtual ~ACE_RMCast_Reordering (void); - - /// Use a Red-Black Tree to keep the queue of messages - //@{ - typedef ACE_RB_Tree,ACE_Null_Mutex> Messages; - typedef ACE_RB_Tree_Iterator,ACE_Null_Mutex> Messages_Iterator; - //@} - - /// Remove messages still pending - virtual int close (void); - - /// Process a Data message. - /** - * Process a Data message, sending the right Ack message back. - * The message is passed up only if it is in order. - */ - virtual int data (ACE_RMCast::Data &); - - /// During the join process the server informs us of the next - /// expected message - virtual int ack_join (ACE_RMCast::Ack_Join &); - -private: - /// Push any messages that are pending in the queue - int push_queued_messages (void); - -protected: - /// The reordering buffer - Messages messages_; - - /// The smallest value of \param next_expected for all the proxies - ACE_UINT32 next_expected_; - - /// The highest value of \param highest_received for all the proxies - ACE_UINT32 highest_received_; - - /// Synchronization - ACE_SYNCH_MUTEX mutex_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Reordering.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_REORDERING_H */ diff --git a/ace/RMCast/RMCast_Reordering.i b/ace/RMCast/RMCast_Reordering.i deleted file mode 100644 index ccbf852bc67..00000000000 --- a/ace/RMCast/RMCast_Reordering.i +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Reordering::ACE_RMCast_Reordering (void) - : next_expected_ (0) - , highest_received_ (0) -{ -} diff --git a/ace/RMCast/RMCast_Resend_Handler.cpp b/ace/RMCast/RMCast_Resend_Handler.cpp deleted file mode 100644 index c8597b301f0..00000000000 --- a/ace/RMCast/RMCast_Resend_Handler.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// $Id$ - -#include "RMCast_Resend_Handler.h" -#include "RMCast_Retransmission.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Resend_Handler.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Resend_Handler, "$Id$") - -ACE_RMCast_Resend_Handler::~ACE_RMCast_Resend_Handler (void) -{ -} - -int -ACE_RMCast_Resend_Handler::handle_timeout (const ACE_Time_Value &, - const void *) -{ - (void) this->retransmission_->resend_all (); - return 0; -} diff --git a/ace/RMCast/RMCast_Resend_Handler.h b/ace/RMCast/RMCast_Resend_Handler.h deleted file mode 100644 index 0d2ec0fe13c..00000000000 --- a/ace/RMCast/RMCast_Resend_Handler.h +++ /dev/null @@ -1,44 +0,0 @@ -// $Id$ - -#ifndef ACE_RMCAST_RESEND_HANDLER_H -#define ACE_RMCAST_RESEND_HANDLER_H -#include "ace/pre.h" - -#include "RMCast_Export.h" -#include "ace/Event_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_RMCast_Retransmission; - -/// Implement an adapter to resend messages in the -/// ACE_RMCast_Retransmission layer, but based on Reactor based -/// timeouts. -class ACE_RMCast_Export ACE_RMCast_Resend_Handler : public ACE_Event_Handler -{ -public: - /// Constructor, save io_udp as the Adaptee in the Adapter pattern. - ACE_RMCast_Resend_Handler (ACE_RMCast_Retransmission *retransmission); - - /// Destructor - ~ACE_RMCast_Resend_Handler (void); - - //@{ - //! Documented in ACE_Event_Handler class - virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act = 0); - //@} - -private: - //! The adaptee - ACE_RMCast_Retransmission *retransmission_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Resend_Handler.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_RESEND_HANDLER_H */ diff --git a/ace/RMCast/RMCast_Resend_Handler.i b/ace/RMCast/RMCast_Resend_Handler.i deleted file mode 100644 index 9ad6cd8870d..00000000000 --- a/ace/RMCast/RMCast_Resend_Handler.i +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Resend_Handler:: -ACE_RMCast_Resend_Handler (ACE_RMCast_Retransmission *r) - : retransmission_ (r) -{ -} diff --git a/ace/RMCast/RMCast_Resend_Worker.cpp b/ace/RMCast/RMCast_Resend_Worker.cpp deleted file mode 100644 index a4acbeff0cd..00000000000 --- a/ace/RMCast/RMCast_Resend_Worker.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_Resend_Worker.h" -#include "RMCast_Module.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Resend_Worker.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Resend_Worker, "$Id$") - -int -ACE_RMCast_Resend_Worker::work (ACE_UINT32 const & key, - ACE_RMCast::Data const &item) -{ - if (key > this->max_sequence_number_) - return 0; - //ACE_DEBUG ((LM_DEBUG, - // "RMCast_Resend_Worker::work - message %d resent\n", - // key)); - - ACE_RMCast::Data data = item; - int r = this->next_->data (data); - if (r != 0) - return r; - this->n++; - - return 1; // @@ Stop after the first message... -} diff --git a/ace/RMCast/RMCast_Resend_Worker.h b/ace/RMCast/RMCast_Resend_Worker.h deleted file mode 100644 index 03fd81e2a05..00000000000 --- a/ace/RMCast/RMCast_Resend_Worker.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_RMCAST_RESEND_WORKER_H -#define ACE_RMCAST_RESEND_WORKER_H -#include "ace/pre.h" - -#include "RMCast.h" -#include "RMCast_Copy_On_Write.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_RMCast_Module; - -/// Process an Ack message in the ACE_RMCast_Retransmission module -/** - * The retransmission module uses internal iterators, thus it needs to - * create helper Worker classes to process some messages. - */ -class ACE_RMCast_Resend_Worker - : public ACE_RMCast_Worker -{ -public: - ACE_RMCast_Resend_Worker (ACE_RMCast_Module *next, - ACE_UINT32 max_sequence_number); - - virtual int work (ACE_UINT32 const & key, - ACE_RMCast::Data const &item); - - int n; - -private: - ACE_RMCast_Module *next_; - - ACE_UINT32 max_sequence_number_; - -private: - ACE_RMCast_Resend_Worker (const ACE_RMCast_Resend_Worker&); - ACE_RMCast_Resend_Worker& operator= (const ACE_RMCast_Resend_Worker&); -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Resend_Worker.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_RESEND_WORKER_H */ diff --git a/ace/RMCast/RMCast_Resend_Worker.i b/ace/RMCast/RMCast_Resend_Worker.i deleted file mode 100644 index d609c27f006..00000000000 --- a/ace/RMCast/RMCast_Resend_Worker.i +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -ACE_INLINE - -ACE_RMCast_Resend_Worker:: -ACE_RMCast_Resend_Worker (ACE_RMCast_Module *next, - ACE_UINT32 max_sequence_number) - : n (0) - , next_ (next) - , max_sequence_number_ (max_sequence_number) -{ -} diff --git a/ace/RMCast/RMCast_Retransmission.cpp b/ace/RMCast/RMCast_Retransmission.cpp deleted file mode 100644 index 7b626a4ef7d..00000000000 --- a/ace/RMCast/RMCast_Retransmission.cpp +++ /dev/null @@ -1,134 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_Retransmission.h" -#include "RMCast_Proxy.h" -#include "RMCast_Ack_Worker.h" -#include "RMCast_Resend_Worker.h" -#include "ace/Message_Block.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Retransmission.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Retransmission, "$Id$") - -ACE_RMCast_Retransmission::~ACE_RMCast_Retransmission (void) -{ -} - -int -ACE_RMCast_Retransmission::resend (ACE_UINT32 max_sequence_number) -{ - if (this->next () == 0) - return 0; - - ACE_RMCast_Resend_Worker worker (this->next (), max_sequence_number); - - if (this->messages_.for_each (&worker) == -1) - return -1; - - return worker.n; -} - -int -ACE_RMCast_Retransmission::resend_all (void) -{ - if (this->next () == 0) - return 0; - - ACE_RMCast_Resend_Worker worker (this->next (), ACE_UINT32_MAX); - - if (this->messages_.for_each (&worker) == -1) - return -1; - - return worker.n; -} - -int -ACE_RMCast_Retransmission::has_data (void) -{ - return !this->messages_.empty (); -} - -int -ACE_RMCast_Retransmission::close (void) -{ - // @@ - return 0; -} - -int -ACE_RMCast_Retransmission::data (ACE_RMCast::Data &data) -{ - if (this->next () == 0) - return 0; - - int r = this->next ()->data (data); - if (r == 0) - { - ACE_RMCast::Data copy = data; - copy.payload = ACE_Message_Block::duplicate (data.payload); - r = this->messages_.bind (data.sequence_number, copy); - } - return r; -} - -int -ACE_RMCast_Retransmission::join (ACE_RMCast::Join &join) -{ - if (join.source == 0) - return 0; - - ACE_RMCast::Ack_Join ack_join; - ack_join.source = 0; - ack_join.next_sequence_number = this->messages_.first_key (); - - (void) join.source->reply_ack_join (ack_join); - - // @@ We should force a full retransmission of all the messages! - - return 0; -} - -int -ACE_RMCast_Retransmission::leave (ACE_RMCast::Leave &leave) -{ - if (leave.source == 0) - return 0; - - ACE_RMCast::Ack_Leave ack_leave; - ack_leave.source = 0; - - (void) leave.source->reply_ack_leave (ack_leave); - - return 0; -} - -int -ACE_RMCast_Retransmission::ack (ACE_RMCast::Ack &ack) -{ - Messages::Write_Guard ace_mon (this->messages_); - - ACE_RMCast_Ack_Worker worker (ack, ace_mon, &this->messages_); - - return this->messages_.for_each (&worker); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_RB_Tree,ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base,ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator,ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator,ACE_Null_Mutex>; -template class ACE_RB_Tree_Node; - -template class ACE_RMCast_Copy_On_Write; -template class ACE_RMCast_Copy_On_Write_Container; -template class ACE_RMCast_Copy_On_Write_Write_Guard; -template class ACE_RMCast_Copy_On_Write_Read_Guard; -template class ACE_RMCast_Copy_On_Write_Collection; -template class ACE_RMCast_Worker; - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/RMCast/RMCast_Retransmission.h b/ace/RMCast/RMCast_Retransmission.h deleted file mode 100644 index 89b431917b3..00000000000 --- a/ace/RMCast/RMCast_Retransmission.h +++ /dev/null @@ -1,120 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// RMCast_Retransmission.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_RETRANSMISSION_H -#define ACE_RMCAST_RETRANSMISSION_H -#include "ace/pre.h" - -#include "RMCast_Module.h" -#include "RMCast_Copy_On_Write.h" -#include "ace/RB_Tree.h" -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Store messages for retransmission in reliable configurations -/** - * Reliable configurations of the RMCast framework need to store - * messages on the sender side to resend them if one or more clients - * do not receive them successfully. - */ -class ACE_RMCast_Export ACE_RMCast_Retransmission : public ACE_RMCast_Module -{ -public: - // = Initialization and termination methods. - /// Constructor - ACE_RMCast_Retransmission (void); - - /// Destructor - virtual ~ACE_RMCast_Retransmission (void); - - /// Use a Red-Black Tree to keep the queue of messages - typedef ACE_RB_Tree,ACE_Null_Mutex> Collection; - typedef ACE_RB_Tree_Iterator,ACE_Null_Mutex> Collection_Iterator; - - /// The messages are stored in the Copy_On_Write wrapper to provide - /// an efficient, but thread safe interface. - typedef ACE_RMCast_Copy_On_Write Messages; - - /// Resend messages - /** - * Resends all the messages up to \param max_sequence_number - * Returns the number of messages sent, or -1 if there where any - * errors. - */ - int resend (ACE_UINT32 max_sequence_number); - - /// Resend all messages - /** - * Resends all the messages currently in the queue. - */ - int resend_all (void); - - /// Return 0 if there is no pending data to send - int has_data (void); - - /// Cleanup all the stored messages - virtual int close (void); - - /// Pass the message downstream, but also save it in the - /// retransmission queue - /** - * Sequence number are assigned by the ACE_RMCast_Fragmentation - * class, consequently this class first passes the message - * downstream, to obtain the sequence number and then stores the - * message for later retransmission. - */ - virtual int data (ACE_RMCast::Data &data); - - /// Process an Ack message from the remote receivers. - /** - * Normally this Ack message will be a summary of all the Ack - * messages received by the ACE_RMCast_Membership class - */ - virtual int ack (ACE_RMCast::Ack &); - - /// Detect when new members join the group and Ack_Join them - /** - * When a new receiver joins the group this module sends an Ack_Join - * message with the next sequence number that the receiver should - * expect. - * The sequence number is obtained from the current list of cached - * messages. - */ - virtual int join (ACE_RMCast::Join &); - - /// A receiver is leaving - /** - * Normally the ACE_RMCast_Membership module could do this, but, - * because this module processes the Join messages, it seems more - * natural to process the Leave messages too. - */ - virtual int leave (ACE_RMCast::Leave &); - -protected: - - /// The retransmission buffer - Messages messages_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Retransmission.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_RETRANSMISSION_H */ diff --git a/ace/RMCast/RMCast_Retransmission.i b/ace/RMCast/RMCast_Retransmission.i deleted file mode 100644 index e67b41120ce..00000000000 --- a/ace/RMCast/RMCast_Retransmission.i +++ /dev/null @@ -1,6 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Retransmission::ACE_RMCast_Retransmission (void) -{ -} diff --git a/ace/RMCast/RMCast_Sequencer.cpp b/ace/RMCast/RMCast_Sequencer.cpp deleted file mode 100644 index f8bc0e6c57d..00000000000 --- a/ace/RMCast/RMCast_Sequencer.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_Sequencer.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Sequencer.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Sequencer, "$Id$") - -ACE_RMCast_Sequencer::~ACE_RMCast_Sequencer (void) -{ -} - -int -ACE_RMCast_Sequencer::data (ACE_RMCast::Data &data) -{ - { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - data.sequence_number = this->sequence_number_generator_++; - } - return this->ACE_RMCast_Module::data (data); -} diff --git a/ace/RMCast/RMCast_Sequencer.h b/ace/RMCast/RMCast_Sequencer.h deleted file mode 100644 index 321d778853e..00000000000 --- a/ace/RMCast/RMCast_Sequencer.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace/RMCast -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_SEQUENCER_H -#define ACE_RMCAST_SEQUENCER_H -#include "ace/pre.h" - -#include "RMCast_Module.h" -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Assign sequence numbers to outgoing messages -/** - * On the sender side we must assign sequence numbers to the messages - * before they are put in the retransmission queue. - */ -class ACE_RMCast_Export ACE_RMCast_Sequencer : public ACE_RMCast_Module -{ -public: - /// Constructor - ACE_RMCast_Sequencer (void); - - /// Destructor - virtual ~ACE_RMCast_Sequencer (void); - - virtual int data (ACE_RMCast::Data &); - -protected: - /// Create the sequence numbers - ACE_UINT32 sequence_number_generator_; - - /// Synchronization - ACE_SYNCH_MUTEX mutex_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Sequencer.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_SEQUENCER_H */ diff --git a/ace/RMCast/RMCast_Sequencer.i b/ace/RMCast/RMCast_Sequencer.i deleted file mode 100644 index e7b7ff0f492..00000000000 --- a/ace/RMCast/RMCast_Sequencer.i +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Sequencer::ACE_RMCast_Sequencer (void) - : sequence_number_generator_ (0) -{ -} diff --git a/ace/RMCast/RMCast_Singleton_Factory.cpp b/ace/RMCast/RMCast_Singleton_Factory.cpp deleted file mode 100644 index 403b87060e2..00000000000 --- a/ace/RMCast/RMCast_Singleton_Factory.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -#include "RMCast_Singleton_Factory.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_Singleton_Factory.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_Singleton_Factory, "$Id$") - -ACE_RMCast_Singleton_Factory::~ACE_RMCast_Singleton_Factory (void) -{ -} - -ACE_RMCast_Module* -ACE_RMCast_Singleton_Factory::create (void) -{ - return this->singleton_; -} - -void -ACE_RMCast_Singleton_Factory::destroy (ACE_RMCast_Module *) -{ -} diff --git a/ace/RMCast/RMCast_Singleton_Factory.h b/ace/RMCast/RMCast_Singleton_Factory.h deleted file mode 100644 index 09bfa96be6d..00000000000 --- a/ace/RMCast/RMCast_Singleton_Factory.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// RMCast_Singleton_Factory.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_SINGLETON_FACTORY_H -#define ACE_RMCAST_SINGLETON_FACTORY_H -#include "ace/pre.h" - -#include "RMCast_Module_Factory.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Implement an ACE_RMCast_Module_Factory that "creates" a single -/// object. -/** - * Many applications (and even some internal components), will use a - * single ACE_RMCast_Module to process all the events, for example, a - * receiver may decide to use the same ACE_RMCast_Module to process - * all incoming events, instead of using one per remote sender. - */ -class ACE_RMCast_Export ACE_RMCast_Singleton_Factory : public ACE_RMCast_Module_Factory -{ -public: - /// Constructor - /** - * @param singleton This object is returned by any call to - * create(). - */ - ACE_RMCast_Singleton_Factory (ACE_RMCast_Module *singleton); - - //! Destructor - virtual ~ACE_RMCast_Singleton_Factory (void); - - virtual ACE_RMCast_Module *create (void); - virtual void destroy (ACE_RMCast_Module *); - -private: - /// The singleton object - ACE_RMCast_Module *singleton_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Singleton_Factory.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_SINGLETON_FACTORY_H */ diff --git a/ace/RMCast/RMCast_Singleton_Factory.i b/ace/RMCast/RMCast_Singleton_Factory.i deleted file mode 100644 index a45837dfa93..00000000000 --- a/ace/RMCast/RMCast_Singleton_Factory.i +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_Singleton_Factory:: - ACE_RMCast_Singleton_Factory (ACE_RMCast_Module *singleton) - : singleton_ (singleton) -{ -} diff --git a/ace/RMCast/RMCast_UDP_Event_Handler.cpp b/ace/RMCast/RMCast_UDP_Event_Handler.cpp deleted file mode 100644 index 963928845f7..00000000000 --- a/ace/RMCast/RMCast_UDP_Event_Handler.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// -// $Id$ -// - -#include "RMCast_UDP_Event_Handler.h" -#include "RMCast_IO_UDP.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Event_Handler.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_UDP_Event_Handler, "$Id$") - -ACE_RMCast_UDP_Event_Handler::~ACE_RMCast_UDP_Event_Handler (void) -{ -} - -ACE_HANDLE -ACE_RMCast_UDP_Event_Handler::get_handle (void) const -{ - return this->io_udp_->get_handle (); -} - -int -ACE_RMCast_UDP_Event_Handler::handle_input (ACE_HANDLE h) -{ - return this->io_udp_->handle_input (h); -} - -int -ACE_RMCast_UDP_Event_Handler::handle_timeout (const ACE_Time_Value &, - const void *) -{ - // @@ return this->io_udp_->handle_timeout (); - return 0; -} diff --git a/ace/RMCast/RMCast_UDP_Event_Handler.h b/ace/RMCast/RMCast_UDP_Event_Handler.h deleted file mode 100644 index 2a6e7c45d42..00000000000 --- a/ace/RMCast/RMCast_UDP_Event_Handler.h +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -#ifndef ACE_RMCAST_UDP_EVENT_HANDLER_H -#define ACE_RMCAST_UDP_EVENT_HANDLER_H -#include "ace/pre.h" - -#include "RMCast_Export.h" -#include "ace/Event_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_RMCast_IO_UDP; -class ACE_INET_Addr; - -//! Implement an Adapter for the ACE_RMCast_IO_UDP class -/*! - * Applications may wish to use the ACE_Reactor to demultiplex I/O - * events for an ACE_RMCast_IO_UDP object. However other application - * may choose to make ACE_RMCast_IO_UDP active, or they may dedicate - * their own threads for its events. - * To avoid couplin ACE_RMCast_IO_UDP with the Reactor we don't make - * it derived from ACE_Event_Handler or any other class in the Reactor - * framework, instead, this simple Adapter can forward the Reactor - * messages to an ACE_RMCast_IO_UDP object. - */ -class ACE_RMCast_Export ACE_RMCast_UDP_Event_Handler : public ACE_Event_Handler -{ -public: - //! Constructor, save io_udp as the Adaptee in the Adapter pattern. - ACE_RMCast_UDP_Event_Handler (ACE_RMCast_IO_UDP *io_udp); - - //! Destructor - /*! - * Notice that this class does not own the ACE_RMCast_IO_UDP - * adaptee, so it does not destroy it. - */ - ~ACE_RMCast_UDP_Event_Handler (void); - - //@{ - //! Documented in ACE_Event_Handler class - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE); - virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act = 0); - //@} - -private: - //! The adaptee - ACE_RMCast_IO_UDP *io_udp_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_UDP_Event_Handler.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_UDP_EVENT_HANDLER_H */ diff --git a/ace/RMCast/RMCast_UDP_Event_Handler.i b/ace/RMCast/RMCast_UDP_Event_Handler.i deleted file mode 100644 index 99b4c0ac7e5..00000000000 --- a/ace/RMCast/RMCast_UDP_Event_Handler.i +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -ACE_INLINE -ACE_RMCast_UDP_Event_Handler:: -ACE_RMCast_UDP_Event_Handler (ACE_RMCast_IO_UDP *io) - : io_udp_ (io) -{ -} diff --git a/ace/RMCast/RMCast_UDP_Proxy.cpp b/ace/RMCast/RMCast_UDP_Proxy.cpp deleted file mode 100644 index c84b8c0f2ef..00000000000 --- a/ace/RMCast/RMCast_UDP_Proxy.cpp +++ /dev/null @@ -1,186 +0,0 @@ -// $Id$ - -#include "RMCast_UDP_Proxy.h" -#include "RMCast_Module.h" -#include "RMCast_IO_UDP.h" -#include "ace/Message_Block.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Proxy.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_UDP_Proxy, "$Id$") - -ACE_RMCast_UDP_Proxy::ACE_RMCast_UDP_Proxy (ACE_RMCast_IO_UDP *io_udp, - const ACE_INET_Addr &addr) - : io_udp_ (io_udp) - , peer_addr_ (addr) -{ -} - -ACE_RMCast_UDP_Proxy::~ACE_RMCast_UDP_Proxy (void) -{ -} - -int -ACE_RMCast_UDP_Proxy::receive_message (char *buffer, size_t size) -{ - int type = buffer[0]; - - // @@ What should we do with invalid messages like this? - // - if (type < 0 || type >= ACE_RMCast::MT_LAST) - return 0; - - if (type == ACE_RMCast::MT_POLL) - { - ACE_RMCast::Poll poll; - poll.source = this; - return this->poll (poll); - } - - else if (type == ACE_RMCast::MT_ACK_JOIN) - { - ACE_RMCast::Ack_Join ack_join; - ack_join.source = this; - - const size_t header_size = 1 + sizeof(ACE_UINT32); - if (size < header_size) - { - // The message is too small - return 0; - } - - ACE_UINT32 tmp; - - ACE_OS::memcpy (&tmp, buffer + 1, - sizeof(tmp)); - ack_join.next_sequence_number = ACE_NTOHL (tmp); - return this->ack_join (ack_join); - } - - else if (type == ACE_RMCast::MT_ACK_LEAVE) - { - ACE_RMCast::Ack_Leave ack_leave; - ack_leave.source = this; - return this->ack_leave (ack_leave); - } - - else if (type == ACE_RMCast::MT_DATA) - { - ACE_RMCast::Data data; - data.source = this; - const size_t header_size = 1 + 3 * sizeof(ACE_UINT32); - if (size < header_size) - { - // The message is too small - return 0; - } - - ACE_UINT32 tmp; - - ACE_OS::memcpy (&tmp, buffer + 1, - sizeof(tmp)); - data.sequence_number = ACE_NTOHL (tmp); - - ACE_OS::memcpy (&tmp, buffer + 1 + sizeof(tmp), - sizeof(tmp)); - data.total_size = ACE_NTOHL (tmp); - - ACE_OS::memcpy (&tmp, buffer + 1 + 2 * sizeof(tmp), - sizeof(tmp)); - data.fragment_offset = ACE_NTOHL (tmp); - - // Pass it up the module... - ACE_Message_Block *mb; - ACE_NEW_RETURN (mb, ACE_Message_Block, -1); - mb->size (size - header_size); - mb->copy (buffer + header_size, size - header_size); - - data.payload = mb; - return this->data (data); - } - - else if (type == ACE_RMCast::MT_JOIN) - { - ACE_RMCast::Join join; - join.source = this; - return this->join (join); - } - - else if (type == ACE_RMCast::MT_LEAVE) - { - ACE_RMCast::Leave leave; - leave.source = this; - return this->leave (leave); - } - - else if (type == ACE_RMCast::MT_ACK) - { - ACE_RMCast::Ack ack; - ack.source = this; - - const size_t header_size = 1 + sizeof(ACE_UINT32); - if (size < header_size) - { - // The message is too small - return 0; - } - - ACE_UINT32 tmp; - - ACE_OS::memcpy (&tmp, buffer + 1, - sizeof(tmp)); - ack.next_expected = ACE_NTOHL (tmp); - ACE_OS::memcpy (&tmp, buffer + 1 + sizeof(ACE_UINT32), - sizeof(tmp)); - ack.highest_received = ACE_NTOHL (tmp); - - return this->ack (ack); - } - - return 0; -} - -int -ACE_RMCast_UDP_Proxy::reply_data (ACE_RMCast::Data &data) -{ - return this->io_udp_->send_data (data, this->peer_addr_); -} - -int -ACE_RMCast_UDP_Proxy::reply_poll (ACE_RMCast::Poll &poll) -{ - return this->io_udp_->send_poll (poll, this->peer_addr_); -} - -int -ACE_RMCast_UDP_Proxy::reply_ack_join (ACE_RMCast::Ack_Join &ack_join) -{ - (void) this->ACE_RMCast_Proxy::reply_ack_join (ack_join); - return this->io_udp_->send_ack_join (ack_join, this->peer_addr_); -} - -int -ACE_RMCast_UDP_Proxy::reply_ack_leave (ACE_RMCast::Ack_Leave &ack_leave) -{ - return this->io_udp_->send_ack_leave (ack_leave, this->peer_addr_); -} - -int -ACE_RMCast_UDP_Proxy::reply_ack (ACE_RMCast::Ack &ack) -{ - return this->io_udp_->send_ack (ack, this->peer_addr_); -} - -int -ACE_RMCast_UDP_Proxy::reply_join (ACE_RMCast::Join &join) -{ - return this->io_udp_->send_join (join, this->peer_addr_); -} - -int -ACE_RMCast_UDP_Proxy::reply_leave (ACE_RMCast::Leave &leave) -{ - return this->io_udp_->send_leave (leave, this->peer_addr_); -} diff --git a/ace/RMCast/RMCast_UDP_Proxy.h b/ace/RMCast/RMCast_UDP_Proxy.h deleted file mode 100644 index 29e9816168d..00000000000 --- a/ace/RMCast/RMCast_UDP_Proxy.h +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// RMCast_UDP_Proxy.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ - -#ifndef ACE_RMCAST_UDP_PROXY_H -#define ACE_RMCAST_UDP_PROXY_H -#include "ace/pre.h" - -#include "RMCast_Proxy.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/INET_Addr.h" - -class ACE_RMCast_IO_UDP; - -/// Define the proxy implementation for UDP based communication -/** - * Proxy objects are transport specific, they are responsible for - * storing the remote peer addressing information. - * This class implements the UDP version of a proxy. - */ -class ACE_RMCast_Export ACE_RMCast_UDP_Proxy : public ACE_RMCast_Proxy -{ -public: - /// Constructor - /** - * The \param io_udp argument is kept to send the replys through the - * right socket. - * The \param peer_addr is the address used byu the peer to receive - * responses. - */ - ACE_RMCast_UDP_Proxy (ACE_RMCast_IO_UDP *io_udp, - const ACE_INET_Addr &peer_addr); - - /// Destructor - virtual ~ACE_RMCast_UDP_Proxy (void); - - /// Receive a message, parse and send it upstream in the right - /// format. - int receive_message (char *buffer, size_t size); - - /// Make the peer address available - const ACE_INET_Addr &peer_addr (void) const; - - //@{ - /** - * Implement the ACE_RMCast_Proxy methods, in this case we use the - * @var io_udp_ object to send the data, using the address of our - * remote peer. - */ - virtual int reply_data (ACE_RMCast::Data &); - virtual int reply_poll (ACE_RMCast::Poll &); - virtual int reply_ack_join (ACE_RMCast::Ack_Join &); - virtual int reply_ack_leave (ACE_RMCast::Ack_Leave &); - virtual int reply_ack (ACE_RMCast::Ack &); - virtual int reply_join (ACE_RMCast::Join &); - virtual int reply_leave (ACE_RMCast::Leave &); - //@} - -private: - /// The IO facade - ACE_RMCast_IO_UDP *io_udp_; - - /// The remote peer's address - ACE_INET_Addr peer_addr_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_UDP_Proxy.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_UDP_PROXY_H */ diff --git a/ace/RMCast/RMCast_UDP_Proxy.i b/ace/RMCast/RMCast_UDP_Proxy.i deleted file mode 100644 index b7a85e78ce2..00000000000 --- a/ace/RMCast/RMCast_UDP_Proxy.i +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -ACE_INLINE const ACE_INET_Addr& -ACE_RMCast_UDP_Proxy::peer_addr (void) const -{ - return this->peer_addr_; -} diff --git a/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp b/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp deleted file mode 100644 index 9057281cc52..00000000000 --- a/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// $Id$ - -#include "RMCast_UDP_Reliable_Receiver.h" -#include "RMCast_UDP_Event_Handler.h" -#include "ace/Reactor.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Reliable_Receiver.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_UDP_Reliable_Receiver, "$Id$") - -ACE_RMCast_UDP_Reliable_Receiver::ACE_RMCast_UDP_Reliable_Receiver (ACE_RMCast_Module *user_module) - : user_factory_ (user_module) - , factory_ (&user_factory_) - , io_udp_ (&factory_) -{ -} - -ACE_RMCast_UDP_Reliable_Receiver::~ACE_RMCast_UDP_Reliable_Receiver (void) -{ -} - -void -ACE_RMCast_UDP_Reliable_Receiver::reactive_incoming_messages (ACE_Reactor *reactor) -{ - ACE_RMCast_UDP_Event_Handler *eh; - ACE_NEW (eh, ACE_RMCast_UDP_Event_Handler (&this->io_udp_)); - - /// @@ TODO Make sure it is removed from the Reactor at some point - (void) reactor->register_handler (eh, ACE_Event_Handler::READ_MASK); -} diff --git a/ace/RMCast/RMCast_UDP_Reliable_Receiver.h b/ace/RMCast/RMCast_UDP_Reliable_Receiver.h deleted file mode 100644 index 902da503737..00000000000 --- a/ace/RMCast/RMCast_UDP_Reliable_Receiver.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_RMCAST_UDP_RELIABLE_RECEIVER_H -#define ACE_RMCAST_UDP_RELIABLE_RECEIVER_H -#include "ace/pre.h" - -#include "RMCast_Singleton_Factory.h" -#include "RMCast_Reliable_Factory.h" -#include "RMCast_IO_UDP.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_Reactor; - -class ACE_RMCast_Export ACE_RMCast_UDP_Reliable_Receiver : public ACE_RMCast_Module -{ -public: - /// Constructor - ACE_RMCast_UDP_Reliable_Receiver (ACE_RMCast_Module *user_control); - - /// Destructor - virtual ~ACE_RMCast_UDP_Reliable_Receiver (void); - - /// Open the UDP I/O module. - int init (const ACE_INET_Addr &mcast_group); - - /// Use the reactor to handle incoming messages - void reactive_incoming_messages (ACE_Reactor *reactor); - -private: - /// All the proxys give their messages to user module - ACE_RMCast_Singleton_Factory user_factory_; - - /// This factory creates the per-proxy stack - ACE_RMCast_Reliable_Factory factory_; - - /// Handle all the UDP I/O - ACE_RMCast_IO_UDP io_udp_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_UDP_Reliable_Receiver.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_UDP_RELIABLE_RECEIVER_H */ diff --git a/ace/RMCast/RMCast_UDP_Reliable_Receiver.i b/ace/RMCast/RMCast_UDP_Reliable_Receiver.i deleted file mode 100644 index 01b2ebe2cad..00000000000 --- a/ace/RMCast/RMCast_UDP_Reliable_Receiver.i +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -ACE_INLINE int -ACE_RMCast_UDP_Reliable_Receiver::init (const ACE_INET_Addr &mcast_group) -{ - return this->io_udp_.subscribe (mcast_group); -} diff --git a/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp b/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp deleted file mode 100644 index befab142320..00000000000 --- a/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// $Id$ - -#include "RMCast_UDP_Reliable_Sender.h" -#include "RMCast_UDP_Event_Handler.h" -#include "RMCast_Resend_Handler.h" -#include "ace/Reactor.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_UDP_Reliable_Sender.i" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID(ace, RMCast_UDP_Reliable_Sender, "$Id$") - -ACE_RMCast_UDP_Reliable_Sender::ACE_RMCast_UDP_Reliable_Sender (ACE_RMCast_Module *user_control) - : user_control_ (user_control) - - // We use a singleton factory, all proxys send their messages to the - // retransmission module. There should be only control messages - // coming back, so this is OK. - , factory_ (&membership_) - , io_udp_ (&factory_) -{ - // Control messages are received by the membership module and passed - // up to the both the retransmission and user modules, we use a fork - // module to do that - this->membership_.next (&this->fork_); - - this->fork_.next (&this->retransmission_); - this->fork_.secondary (user_control); - - // Messages are passed down to the sequencer module - this->next (&this->sequencer_); - - // then to the retransmission module - this->sequencer_.next (&this->retransmission_); - - // Then fork the messages, at this point control messages are sent - // back to the user, other messages continue down to the - // fragmentation layer. - this->retransmission_.next (&this->fragment_); - - // The fragmentation layer delegates all messages to the UDP I/O - // module, that sends every message back to the application. - this->fragment_.next (&this->io_udp_); -} - -ACE_RMCast_UDP_Reliable_Sender::~ACE_RMCast_UDP_Reliable_Sender (void) -{ -} - -void -ACE_RMCast_UDP_Reliable_Sender::reactive_incoming_messages (ACE_Reactor *reactor) -{ - ACE_RMCast_UDP_Event_Handler *eh; - ACE_NEW (eh, ACE_RMCast_UDP_Event_Handler (&this->io_udp_)); - - /// @@ TODO Make sure it is removed from the Reactor at some point - (void) reactor->register_handler (eh, ACE_Event_Handler::READ_MASK); -} - -void -ACE_RMCast_UDP_Reliable_Sender::reactive_resends (ACE_Reactor *reactor, - const ACE_Time_Value &period) -{ - ACE_RMCast_Resend_Handler *eh; - ACE_NEW (eh, ACE_RMCast_Resend_Handler (&this->retransmission_)); - - /// @@ TODO make sure it is removed from the Reactor at some point - (void) reactor->schedule_timer (eh, 0, period, period); -} diff --git a/ace/RMCast/RMCast_UDP_Reliable_Sender.h b/ace/RMCast/RMCast_UDP_Reliable_Sender.h deleted file mode 100644 index 488859a8e2f..00000000000 --- a/ace/RMCast/RMCast_UDP_Reliable_Sender.h +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_RMCAST_UDP_RELIABLE_SENDER_H -#define ACE_RMCAST_UDP_RELIABLE_SENDER_H -#include "ace/pre.h" - -#include "RMCast_Singleton_Factory.h" -#include "RMCast_IO_UDP.h" -#include "RMCast_Sequencer.h" -#include "RMCast_Retransmission.h" -#include "RMCast_Membership.h" -#include "RMCast_Fragment.h" -#include "RMCast_Fork.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_Reactor; - -class ACE_RMCast_Export ACE_RMCast_UDP_Reliable_Sender : public ACE_RMCast_Module -{ -public: - /// Constructor - ACE_RMCast_UDP_Reliable_Sender (ACE_RMCast_Module *user_control); - - /// Destructor - virtual ~ACE_RMCast_UDP_Reliable_Sender (void); - - /// Open the UDP I/O module. - int init (const ACE_INET_Addr &mcast_group); - - /// Use the reactor to handle incoming messages - void reactive_incoming_messages (ACE_Reactor *reactor); - - /// Use the reactor to periodically resend messages - void reactive_resends (ACE_Reactor *reactor, - const ACE_Time_Value &period); - - /// Check if there is still some messages to send, return 0 if not. - int has_data (void); - - /// Check if there are any members still connected - int has_members (void); - -private: - /// The application-level control module - ACE_RMCast_Module *user_control_; - - /// Assign sequence numbers - ACE_RMCast_Sequencer sequencer_; - - /// The retransmission module - ACE_RMCast_Retransmission retransmission_; - - /// All the proxys give their messages to the retransmission module - ACE_RMCast_Singleton_Factory factory_; - - /// Handle all the UDP I/O - ACE_RMCast_IO_UDP io_udp_; - - /// The membership module - ACE_RMCast_Membership membership_; - - /// The fragmentation module - ACE_RMCast_Fragment fragment_; - - /// Redirect control messages to the user supplied module - ACE_RMCast_Fork fork_; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_UDP_Reliable_Sender.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RMCAST_UDP_RELIABLE_SENDER_H */ diff --git a/ace/RMCast/RMCast_UDP_Reliable_Sender.i b/ace/RMCast/RMCast_UDP_Reliable_Sender.i deleted file mode 100644 index 93868a86ede..00000000000 --- a/ace/RMCast/RMCast_UDP_Reliable_Sender.i +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -ACE_INLINE int -ACE_RMCast_UDP_Reliable_Sender::init (const ACE_INET_Addr &mcast_group) -{ - return this->io_udp_.init (mcast_group, ACE_Addr::sap_any); -} - -ACE_INLINE int -ACE_RMCast_UDP_Reliable_Sender::has_data (void) -{ - return this->retransmission_.has_data (); -} - -ACE_INLINE int -ACE_RMCast_UDP_Reliable_Sender::has_members (void) -{ - return this->membership_.has_members (); -} diff --git a/ace/RMCast/RMCast_Worker.cpp b/ace/RMCast/RMCast_Worker.cpp deleted file mode 100644 index 06254b8c0f6..00000000000 --- a/ace/RMCast/RMCast_Worker.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#ifndef ACE_RMCAST_WORKER_CPP -#define ACE_RMCAST_WORKER_CPP - -#include "RMCast_Worker.h" - -#if ! defined (__ACE_INLINE__) -#include "RMCast_Worker.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(RMCast, RMCast_Worker, "$Id$") - -template -ACE_RMCast_Worker::~ACE_RMCast_Worker (void) -{ -} - -#endif /* ACE_RMCAST_WORKER_CPP */ diff --git a/ace/RMCast/RMCast_Worker.h b/ace/RMCast/RMCast_Worker.h deleted file mode 100644 index d3eb3032ebc..00000000000 --- a/ace/RMCast/RMCast_Worker.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -// - -#ifndef ACE_RMCAST_WORKER_H -#define ACE_RMCAST_WORKER_H - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -template -class ACE_RMCast_Worker -{ -public: - virtual ~ACE_RMCast_Worker (void); - - virtual int work (KEY const & key, - ITEM const & item) = 0; -}; - -#if defined (__ACE_INLINE__) -#include "RMCast_Worker.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "RMCast_Worker.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("RMCast_Worker.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* ACE_RMCAST_WORKER_H */ diff --git a/ace/RMCast/RMCast_Worker.i b/ace/RMCast/RMCast_Worker.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/RMCast/RMCast_Worker.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/RMCast/rmcast.mpc b/ace/RMCast/rmcast.mpc deleted file mode 100644 index 70c94e05251..00000000000 --- a/ace/RMCast/rmcast.mpc +++ /dev/null @@ -1,7 +0,0 @@ -project : acelib, core { - depends = ace - sharedname = ACE_RMCast - dllflags = ACE_RMCAST_BUILD_DLL - libout = .. - include_dir = ace/RMCast -} diff --git a/ace/RW_Process_Mutex.cpp b/ace/RW_Process_Mutex.cpp deleted file mode 100644 index 1b0aee4eb28..00000000000 --- a/ace/RW_Process_Mutex.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -#include "ace/RW_Process_Mutex.h" -#include "ace/Log_Msg.h" -#include "ace/ACE.h" - -ACE_RCSID(ace, RW_Process_Mutex, "$Id$") - -#if !defined (__ACE_INLINE__) -#include "ace/RW_Process_Mutex.inl" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_RW_Process_Mutex) - -const ACE_TCHAR * -ACE_RW_Process_Mutex::unique_name (void) -{ - ACE::unique_name (this, this->name_, ACE_UNIQUE_NAME_LEN); - return this->name_; -} - -ACE_RW_Process_Mutex::ACE_RW_Process_Mutex (const ACE_TCHAR *name, - int flags) - : lock_ (name ? name : this->unique_name (), flags -#if defined (ACE_WIN32) - , ACE_DEFAULT_OPEN_PERMS) -#else - , S_IRUSR | S_IWUSR) -#endif /* ACE_WIN32 */ -{ -// ACE_TRACE ("ACE_RW_Process_Mutex::ACE_RW_Process_Mutex"); -} - -ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex (void) -{ -// ACE_TRACE ("ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex"); -} - -void -ACE_RW_Process_Mutex::dump (void) const -{ -// ACE_TRACE ("ACE_RW_Process_Mutex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// -// These are instantiated both with and without ACE_HAS_THREADS. -// -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -// template class ACE_Guard; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -// #pragma instantiate ACE_Guard - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/RW_Process_Mutex.h b/ace/RW_Process_Mutex.h deleted file mode 100644 index 77500d19aa3..00000000000 --- a/ace/RW_Process_Mutex.h +++ /dev/null @@ -1,114 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file RW_Process_Mutex.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_RW_PROCESS_MUTEX_H -#define ACE_RW_PROCESS_MUTEX_H -#include "ace/pre.h" - -#include "ace/File_Lock.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_RW_Process_Mutex - * - * @brief Wrapper for readers/writer locks that exist across processes. - * - * Note that because this class uses the - * as its implementation it only can be reliably - * used between separate processes, rather than threads in the - * same process. This isn't a limitation of ACE, it's simply - * the file lock semantics on UNIX and Win32. - */ -class ACE_Export ACE_RW_Process_Mutex -{ -public: - /// Create a readers/writer , passing in the optional - /// . If not specified, a name is generated. - ACE_RW_Process_Mutex (const ACE_TCHAR *name = 0, - int flags = O_CREAT|O_RDWR); - - ~ACE_RW_Process_Mutex (void); - - /** - * Explicitly destroy the mutex. Note that only one thread should - * call this method since it doesn't protect against race - * conditions. - */ - int remove (void); - - /// Acquire lock ownership (wait on queue if necessary). - int acquire (void); - - /** - * Conditionally acquire lock (i.e., don't wait on queue). Returns - * -1 on failure. If we "failed" because someone else already had - * the lock, is set to . - */ - int tryacquire (void); - - /// Release lock and unblock a thread at head of queue. - int release (void); - - /// Acquire lock ownership (wait on queue if necessary). - int acquire_read (void); - - /// Acquire lock ownership (wait on queue if necessary). - int acquire_write (void); - - /** - * Conditionally acquire a lock (i.e., won't block). Returns -1 on - * failure. If we "failed" because someone else already had the - * lock, is set to . - */ - int tryacquire_read (void); - - /** - * Conditionally acquire a lock (i.e., won't block). Returns -1 on - * failure. If we "failed" because someone else already had the - * lock, is set to . - */ - int tryacquire_write (void); - - /// Attempt to upgrade a read lock to a write lock. Returns 0 on - /// success, -1 on failure. - int tryacquire_write_upgrade (void); - - /// Return the underlying lock. - const ACE_File_Lock &lock (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// If the user does not provide a name we generate a unique name in - /// this buffer. - ACE_TCHAR name_[ACE_UNIQUE_NAME_LEN]; - - /// Create and return the unique name. - const ACE_TCHAR *unique_name (void); - - /// We need this to get the readers/writer semantics... - ACE_File_Lock lock_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/RW_Process_Mutex.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_RW_PROCESS_MUTEX_H */ diff --git a/ace/RW_Process_Mutex.inl b/ace/RW_Process_Mutex.inl deleted file mode 100644 index cc59bb9fc17..00000000000 --- a/ace/RW_Process_Mutex.inl +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Explicitly destroy the mutex. -ACE_INLINE int -ACE_RW_Process_Mutex::remove (void) -{ - return this->lock_.remove (); -} - -// Acquire lock ownership (wait on priority queue if necessary). -ACE_INLINE int -ACE_RW_Process_Mutex::acquire (void) -{ - return this->lock_.acquire (); -} - -// Conditionally acquire lock (i.e., don't wait on queue). -ACE_INLINE int -ACE_RW_Process_Mutex::tryacquire (void) -{ - return this->lock_.tryacquire (); -} - -// Release lock and unblock a thread at head of priority queue. -ACE_INLINE int -ACE_RW_Process_Mutex::release (void) -{ - return this->lock_.release (); -} - -// Acquire lock ownership (wait on priority queue if necessary). -ACE_INLINE int -ACE_RW_Process_Mutex::acquire_read (void) -{ - return this->lock_.acquire_read (); -} - -// Acquire lock ownership (wait on priority queue if necessary). -ACE_INLINE int -ACE_RW_Process_Mutex::acquire_write (void) -{ - return this->lock_.acquire_write (); -} - -// Conditionally acquire a lock (i.e., won't block). -ACE_INLINE int -ACE_RW_Process_Mutex::tryacquire_read (void) -{ - return this->lock_.tryacquire_read (); -} - -// Conditionally acquire a lock (i.e., won't block). -ACE_INLINE int -ACE_RW_Process_Mutex::tryacquire_write (void) -{ - return this->lock_.tryacquire_write (); -} - -// Conditionally upgrade a lock (i.e., won't block). -ACE_INLINE int -ACE_RW_Process_Mutex::tryacquire_write_upgrade (void) -{ - return this->lock_.tryacquire_write_upgrade (); -} - -ACE_INLINE const ACE_File_Lock & -ACE_RW_Process_Mutex::lock (void) const -{ -// ACE_TRACE ("ACE_RW_Process_Mutex::lock"); - return this->lock_; -} diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp deleted file mode 100644 index 18922660461..00000000000 --- a/ace/Reactor.cpp +++ /dev/null @@ -1,314 +0,0 @@ -// $Id$ - -#include "ace/Reactor.h" -#include "ace/Reactor_Impl.h" -#include "ace/Handle_Set.h" -//#if !defined (ACE_HAS_WINCE) -# if !defined (ACE_LACKS_ACE_SVCCONF) -# include "ace/Service_Config.h" -# endif /* !ACE_LACKS_ACE_SVCCONF */ -# if defined (ACE_WIN32) -# include "ace/WFMO_Reactor.h" -# include "ace/Msg_WFMO_Reactor.h" -# endif /* ACE_WIN32 */ -//#endif /* ! ACE_HAS_WINCE */ -#include "ace/Select_Reactor.h" -#include "ace/TP_Reactor.h" -#include "ace/Object_Manager.h" -#include "ace/Framework_Component.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Reactor.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Reactor, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Reactor) - -ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl, - int delete_implementation) - : implementation_ (0), - delete_implementation_ (delete_implementation) -{ - this->implementation (impl); - - if (this->implementation () == 0) - { -#if !defined (ACE_WIN32) \ - || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \ - || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \ - || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) - #if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) - ACE_NEW (impl, - ACE_TP_Reactor); - #else - ACE_NEW (impl, - ACE_Select_Reactor); - #endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */ -#else /* We are on Win32 and we have winsock and ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL is not defined */ - #if defined (ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL) - ACE_NEW (impl, - ACE_Msg_WFMO_Reactor); - #else - ACE_NEW (impl, - ACE_WFMO_Reactor); - #endif /* ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL */ -#endif /* !defined (ACE_WIN32) || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) */ - this->implementation (impl); - this->delete_implementation_ = 1; - } -} - -ACE_Reactor::~ACE_Reactor (void) -{ - if (this->delete_implementation_) - delete this->implementation (); -} - -// Process-wide ACE_Reactor. -ACE_Reactor *ACE_Reactor::reactor_ = 0; - -// Controls whether the Reactor is deleted when we shut down (we can -// only delete it safely if we created it!) -int ACE_Reactor::delete_reactor_ = 0; - -ACE_Reactor * -ACE_Reactor::instance (void) -{ - ACE_TRACE ("ACE_Reactor::instance"); - - if (ACE_Reactor::reactor_ == 0) - { - // Perform Double-Checked Locking Optimization. - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance (), 0)); - - if (ACE_Reactor::reactor_ == 0) - { - ACE_NEW_RETURN (ACE_Reactor::reactor_, - ACE_Reactor, - 0); - ACE_Reactor::delete_reactor_ = 1; - ACE_REGISTER_FRAMEWORK_COMPONENT(ACE_Reactor, ACE_Reactor::reactor_) - } - } - return ACE_Reactor::reactor_; -} - -ACE_Reactor * -ACE_Reactor::instance (ACE_Reactor *r, - int delete_reactor) -{ - ACE_TRACE ("ACE_Reactor::instance"); - - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance (), 0)); - ACE_Reactor *t = ACE_Reactor::reactor_; - if (delete_reactor != 0) - ACE_Reactor::delete_reactor_ = 1; - else - // We can't safely delete it since we don't know who created it! - ACE_Reactor::delete_reactor_ = 0; - - ACE_Reactor::reactor_ = r; - - // We can't register the Reactor singleton as a framework component twice. - // Therefore we test to see if we had an existing reactor instance, which - // if so means it must have already been registered. - if (t == 0) - ACE_REGISTER_FRAMEWORK_COMPONENT(ACE_Reactor, ACE_Reactor::reactor_); - - return t; -} - -void -ACE_Reactor::close_singleton (void) -{ - ACE_TRACE ("ACE_Reactor::close_singleton"); - - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance ())); - - if (ACE_Reactor::delete_reactor_) - { - delete ACE_Reactor::reactor_; - ACE_Reactor::reactor_ = 0; - ACE_Reactor::delete_reactor_ = 0; - } -} - -const ACE_TCHAR * -ACE_Reactor::dll_name (void) -{ - return ACE_LIB_TEXT ("ACE"); -} - -const ACE_TCHAR * -ACE_Reactor::name (void) -{ - return ACE_LIB_TEXT ("ACE_Reactor"); -} - -int -ACE_Reactor::check_reconfiguration (ACE_Reactor *) -{ -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) - if (ACE_Service_Config::reconfig_occurred ()) - { - ACE_Service_Config::reconfigure (); - return 1; - } -#endif /* ! ACE_HAS_WINCE || ! ACE_LACKS_ACE_SVCCONF */ - return 0; -} - -int -ACE_Reactor::run_reactor_event_loop (REACTOR_EVENT_HOOK eh) -{ - ACE_TRACE ("ACE_Reactor::run_reactor_event_loop"); - - if (this->reactor_event_loop_done ()) - return 0; - - while (1) - { - int result = this->implementation_->handle_events (); - - if (eh != 0 && (*eh)(this)) - continue; - else if (result == -1 && this->implementation_->deactivated ()) - return 0; - else if (result == -1) - return -1; - } - - ACE_NOTREACHED (return 0;) -} - -int -ACE_Reactor::run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK eh) -{ - ACE_TRACE ("ACE_Reactor::run_alertable_reactor_event_loop"); - - if (this->reactor_event_loop_done ()) - return 0; - - while (1) - { - int result = this->implementation_->alertable_handle_events (); - - if (eh != 0 && (*eh)(this)) - continue; - else if (result == -1 && this->implementation_->deactivated ()) - return 0; - else if (result == -1) - return -1; - } - - ACE_NOTREACHED (return 0;) -} - -int -ACE_Reactor::run_reactor_event_loop (ACE_Time_Value &tv, - REACTOR_EVENT_HOOK eh) -{ - ACE_TRACE ("ACE_Reactor::run_reactor_event_loop"); - - if (this->reactor_event_loop_done ()) - return 0; - - while (1) - { - int result = this->implementation_->handle_events (tv); - - if (eh != 0 && (*eh) (this)) - continue; - else if (result == -1) - { - if (this->implementation_->deactivated ()) - result = 0; - return result; - } - else if (result == 0) - { - // The method timed out without dispatching - // anything. Because of rounding and conversion errors and - // such, it could be that the wait loop (WFMO, select, etc.) - // timed out, but the timer queue said it wasn't quite ready - // to expire a timer. In this case, the ACE_Time_Value we - // passed into handle_events won't have quite been reduced - // to 0, and we need to go around again. If we are all the - // way to 0, just return, as the entire time the caller - // wanted to wait has been used up. - if (tv.usec () > 0) - continue; - return 0; - } - // Else there were some events dispatched; go around again - } - - ACE_NOTREACHED (return 0;) -} - -int -ACE_Reactor::run_alertable_reactor_event_loop (ACE_Time_Value &tv, - REACTOR_EVENT_HOOK eh) -{ - ACE_TRACE ("ACE_Reactor::run_alertable_reactor_event_loop"); - - if (this->reactor_event_loop_done ()) - return 0; - - for (;;) - { - int result = this->implementation_->alertable_handle_events (tv); - - if (eh != 0 && (*eh)(this)) - continue; - else if (result == -1 && this->implementation_->deactivated ()) - return 0; - else if (result <= 0) - return result; - } - - ACE_NOTREACHED (return 0;) -} - -int -ACE_Reactor::end_reactor_event_loop (void) -{ - ACE_TRACE ("ACE_Reactor::end_reactor_event_loop"); - - this->implementation_->deactivate (1); - - return 0; -} - -void -ACE_Reactor::reset_reactor_event_loop (void) -{ - ACE_TRACE ("ACE_Reactor::reset_reactor_event_loop"); - - this->implementation_->deactivate (0); -} - - -int -ACE_Reactor::resumable_handler (void) -{ - return this->implementation ()->resumable_handler (); -} - -void -ACE_Reactor::dump (void) const -{ - ACE_TRACE ("ACE_Reactor::dump"); - - implementation_->dump (); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Framework_Component_T; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Framework_Component_T -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Reactor.h b/ace/Reactor.h deleted file mode 100644 index d7f91a6df46..00000000000 --- a/ace/Reactor.h +++ /dev/null @@ -1,703 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Reactor.h - * - * $Id$ - * - * @author Irfan Pyarali - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_REACTOR_H -#define ACE_REACTOR_H -#include "ace/pre.h" - -class ACE_Reactor_Impl; - -// Need the class def for ACE_Handle_Set to compile references to it in -// programs. -#include "ace/Handle_Set.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Timer Queue is a complicated template class. A simple forward -// declaration will not work -#include "ace/Timer_Queue.h" - -// Event_Handler.h contains the definition of ACE_Reactor_Mask -#include "ace/Event_Handler.h" - -// We are using 4 or 5 signal classes, we could forward declare -// them.... But Timer_Queue_T.h includes Signal.h, so I don't think -// forward declaration will be useful here -#include "ace/Signal.h" - -/** - * @class ACE_Reactor - * - * @brief The responsibility of this class is to forward all methods to - * its delegation/implementation class, e.g., - * or . - */ -class ACE_Export ACE_Reactor -{ -public: - /// Operations on the "ready" mask and the "dispatch" mask. - enum - { - /// Retrieve current value of the the "ready" mask or the - /// "dispatch" mask. - GET_MASK = 1, - /// Set value of bits to new mask (changes the entire mask). - SET_MASK = 2, - /// Bitwise "or" the value into the mask (only changes enabled - /// bits). - ADD_MASK = 3, - /// Bitwise "and" the negation of the value out of the mask (only - /// changes enabled bits). - CLR_MASK = 4 - }; - - /** - * You can add a hook to various run_event methods and the hook will - * be called after handling every reactor event. If this function - * returns 0, will check for the return - * value of . If it is -1, the - * will return (pre-maturely.) - */ - typedef int (*REACTOR_EVENT_HOOK)(ACE_Reactor *); - - /// Get pointer to a process-wide . - static ACE_Reactor *instance (void); - - /** - * Set pointer to a process-wide and return existing - * pointer. If != 0 then we'll delete the Reactor - * at destruction time. - */ - static ACE_Reactor *instance (ACE_Reactor *, - int delete_reactor = 0); - - /// Delete the dynamically allocated Singleton - static void close_singleton (void); - - /// Name of the dll in which the dll lives. - static const ACE_TCHAR *dll_name (void); - - /// Name of the component--ACE_Reactor in this case. - static const ACE_TCHAR *name (void); - - // = Singleton reactor event loop management methods. - - // Note that these method ONLY work on the "Singleton Reactor," - // i.e., the one returned from . - /** - * Run the event loop until the - * - * method returns -1 or the method is invoked. - * Note that this method can only be used by the singleton - * . Thus, to run another reactor use - * . - * - * @deprecated Use ACE_Reactor::instance()->run_reactor_event_loop() instead - */ - static int run_event_loop (void); - static int run_alertable_event_loop (void); - - /** - * Run the event loop until the or - * methods returns -1, the - * method is invoked, or the - * expires. Note that this method can only be used by the singleton - * . Thus, to run another reactor use - * . - * - * @deprecated Use ACE_Reactor::instance()->run_reactor_event_loop() instead - */ - static int run_event_loop (ACE_Time_Value &tv); - static int run_alertable_event_loop (ACE_Time_Value &tv); - - /** - * Instruct the to terminate its event loop - * and notifies the so that it can wake up - * and close down gracefully. Note that this method can only be - * used by the singleton . Thus, to - * terminate another reactor, use - * . - * - * @deprecated Use ACE_Reactor::instance()->end_reactor_event_loop() instead - */ - static int end_event_loop (void); - - /** - * Report if the 's event loop is finished. - * Note that this method can only be used by the singleton - * . Thus, to check another reactor use - * . - * - * @deprecated Use ACE_Reactor::instance()->reactor_event_loop_done() instead - */ - static int event_loop_done (void); - - /** - * Resets the static so that the - * method can be restarted. Note that this method - * can only be used by the singleton . Thus, - * to reset another reactor use . - * - * @deprecated Use ACE_Reactor::instance()->reset_reactor_event_loop() - * instead - */ - static void reset_event_loop (void); - - /** - * The singleton reactor is used by the . - * Therefore, we must check for the reconfiguration request and - * handle it after handling an event. - */ - static int check_reconfiguration (ACE_Reactor *); - - // = Reactor event loop management methods. - - // These methods work with an instance of a reactor. - /** - * Run the event loop until the - * - * method returns -1 or the method is invoked. - */ - virtual int run_reactor_event_loop (REACTOR_EVENT_HOOK = 0); - virtual int run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK = 0); - - /** - * Run the event loop until the or - * methods returns -1, the - * method is invoked, or the - * expires. - */ - virtual int run_reactor_event_loop (ACE_Time_Value &tv, - REACTOR_EVENT_HOOK = 0); - virtual int run_alertable_reactor_event_loop (ACE_Time_Value &tv, - REACTOR_EVENT_HOOK = 0); - - /** - * Instruct the Reactor to terminate its event loop and notifies the - * Reactor so that it can wake up and deactivate - * itself. Deactivating the Reactor would allow the Reactor to be - * shutdown gracefully. Internally the Reactor calls deactivate () - * on the underlying implementation. - * Any queued notifications remain queued on return from this method. - * If the event loop is restarted in the future, the notifications - * will be dispatched then. If the reactor is closed or deleted without - * further dispatching, the notifications will be lost. - */ - virtual int end_reactor_event_loop (void); - - /// Indicate if the Reactor's event loop has been ended. - virtual int reactor_event_loop_done (void); - - /// Resets the static so that the - /// method can be restarted. - virtual void reset_reactor_event_loop (void); - - /** - * Create the Reactor using . The flag - * tells the Reactor whether or not to - * delete the on destruction. - */ - ACE_Reactor (ACE_Reactor_Impl *implementation = 0, - int delete_implementation = 0); - - /// Close down and release all resources. - /** - * Any notifications that remain queued on this reactor instance are - * lost. - */ - virtual ~ACE_Reactor (void); - - /** - * Initialize the to manage . - * If is non-0 then the 's - * method will be restarted automatically when occurs. If - * or are non-0 they are used as the - * signal handler and timer queue, respectively. - */ - virtual int open (size_t max_number_of_handles, - int restart = 0, - ACE_Sig_Handler *signal_handler = 0, - ACE_Timer_Queue *timer_queue = 0); - - /// Use a user specified signal handler instead. - virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); - - // = The following method is deprecated. - /// @deprecated Use instead. - /// Set a user specified timer queue. - virtual int set_timer_queue (ACE_Timer_Queue *tq); - - /// Set a user-specified timer queue. - virtual int timer_queue (ACE_Timer_Queue *tq); - - /// Return the current . - virtual ACE_Timer_Queue *timer_queue (void) const; - - /// Close down and release all resources. - virtual int close (void); - - // = Event loop drivers. - - /** - * Returns non-zero if there are I/O events "ready" for dispatching, - * but does not actually dispatch the event handlers. By default, - * don't block while checking this, i.e., "poll". - */ - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); - - /** - * This event loop driver blocks for up to before - * returning. It will return earlier if events occur. Note that - * can be 0, in which case this method blocks - * indefinitely until events occur. - * - * is decremented to reflect how much time this call - * took. For instance, if a time value of 3 seconds is passed to - * handle_events and an event occurs after 2 seconds, - * will equal 1 second. This can be used if an - * application wishes to handle events for some fixed amount of - * time. - * - * Returns the total number of timers and I/O s - * that were dispatched, 0 if the elapsed without - * dispatching any handlers, or -1 if an error occurs. - * - * The only difference between and - * is that in the alertable case, the eventloop will - * return when the system queues an I/O completion routine or an - * Asynchronous Procedure Call. - */ - virtual int handle_events (ACE_Time_Value *max_wait_time = 0); - virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0); - - /** - * This method is just like the one above, except the - * value is a reference and can therefore never be - * NULL. - * - * The only difference between and - * is that in the alertable case, the eventloop will - * return when the system queues an I/O completion routine or an - * Asynchronous Procedure Call. - */ - virtual int handle_events (ACE_Time_Value &max_wait_time); - virtual int alertable_handle_events (ACE_Time_Value &max_wait_time); - - // = Register and remove Handlers. - - /// Register with . The I/O handle will always - /// come from on the . - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /// Register with . The I/O handle is provided - /// through the parameter. - virtual int register_handler (ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - -#if defined (ACE_WIN32) - /** - * Register an that will be notified when - * is signaled. Since no event mask is passed - * through this interface, it is assumed that the - * being passed in is an event handle and not an I/O handle. - * - * Originally this interface was available for all platforms, but - * because ACE_HANDLE is an int on non-Win32 platforms, compilers - * are not able to tell the difference between - * register_handler(ACE_Event_Handler*,ACE_Reactor_Mask) and - * register_handler(ACE_Event_Handler*,ACE_HANDLE). Therefore, we - * have restricted this method to Win32 only. - */ - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_HANDLE event_handle = ACE_INVALID_HANDLE); -#endif /* ACE_WIN32 */ - - /** - * Register an that will be notified when - * is signaled. specifies the network events - * that the is interested in. - */ - virtual int register_handler (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /// Register with all the in the . - virtual int register_handler (const ACE_Handle_Set &handles, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /** - * Register to handle the signal using the - * . Returns the that was previously registered - * (if any), along with the of the signal handler. - */ - virtual int register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0, - ACE_Event_Handler **old_sh = 0, - ACE_Sig_Action *old_disp = 0); - - /// Registers to handle a set of signals using the - /// . - virtual int register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0); - - /** - * Removes . Note that the I/O handle will be - * obtained using method of . If - * includes then the - * method of the is not invoked. - */ - virtual int remove_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /** - * Removes the associated with . If - * includes then the - * method of the associated is not - * invoked. - */ - virtual int remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask); - - /** - * Removes all handles in . If == - * then the method of - * the associated s is not invoked. - */ - virtual int remove_handler (const ACE_Handle_Set &handle_set, - ACE_Reactor_Mask mask); - - /** - * Remove the ACE_Event_Handler currently associated with . - * Install the new disposition (if given) and return the previous - * disposition (if desired by the caller). Returns 0 on success and - * -1 if is invalid. - */ - virtual int remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp = 0, - int sigkey = -1); - - /// Calls for every signal in . - virtual int remove_handler (const ACE_Sig_Set &sigset); - - // = Suspend and resume Handlers. - - /// Suspend temporarily. Use - /// to get the handle. - virtual int suspend_handler (ACE_Event_Handler *event_handler); - - /// Suspend temporarily. - virtual int suspend_handler (ACE_HANDLE handle); - - /// Suspend all in handle set temporarily. - virtual int suspend_handler (const ACE_Handle_Set &handles); - - /// Suspend all temporarily. - virtual int suspend_handlers (void); - - /// Resume . Use to - /// get the handle. - virtual int resume_handler (ACE_Event_Handler *event_handler); - - /// Resume . - virtual int resume_handler (ACE_HANDLE handle); - - /// Resume all in handle set. - virtual int resume_handler (const ACE_Handle_Set &handles); - - /// Resume all . - virtual int resume_handlers (void); - - /// Does the reactor allow the application to resume the handle on - /// its own ie. can it pass on the control of handle resumption to - /// the application. A positive value indicates that the handlers - /// are application resumable. A value of 0 indicates otherwise. - virtual int resumable_handler (void); - - // = Timer management. - - /** - * Schedule an ACE_Event_Handler that will expire after an amount - * of time. The return value of this method, a timer_id value, - * uniquely identifies the event_handler in the ACE_Reactor's - * internal list of timers. - * This timer_id value can be used to cancel the timer - * with the cancel_timer() call. - * - * @see cancel_timer() - * @see reset_timer_interval() - * - * @param event_handler event handler to schedule on reactor - * @param arg argument passed to the handle_timeout() method of event_handler - * @param delay time interval after which the timer will expire - * @param interval time interval after which the timer will be automatically rescheduled - * @return -1 on failure, a timer_id value on success - */ - virtual long schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero); - - /** - * Resets the interval of the timer represented by to - * , which is specified in relative time to the current - * . If is equal to - * , the timer will become a non-rescheduling - * timer. Returns 0 if successful, -1 if not. - */ - virtual int reset_timer_interval (long timer_id, - const ACE_Time_Value &interval); - - /// Cancel all s that match the address of - /// . Returns number of handlers cancelled. - virtual int cancel_timer (ACE_Event_Handler *event_handler, - int dont_call_handle_close = 1); - - /** - * Cancel the single that matches the - * value, which was returned from the schedule method. If arg is - * non-NULL then it will be set to point to the ``magic cookie'' - * argument passed in when the Event_Handler was registered. This - * makes it possible to free up the memory and avoid memory leaks. - * Returns 1 if cancellation succeeded and 0 if the - * wasn't found. - */ - virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1); - - // = High-level Event_Handler scheduling operations - - /// Add to the 's entry. - /// must already have been registered. - /// Note that this call does not cause the Reactor to re-examine - /// its set of handlers - the new masks will be noticed the next - /// time the Reactor waits for activity. If there is no other - /// activity expected, or you need immediate re-examination of - /// the wait masks, either call ACE_Reactor::notify after this - /// call, or use ACE_Reactor::register_handler instead. - virtual int schedule_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_added); - - /// Add to the 's entry. - /// associated with must already have been registered. - /// Note that this call does not cause the Reactor to re-examine - /// its set of handlers - the new masks will be noticed the next - /// time the Reactor waits for activity. If there is no other - /// activity expected, or you need immediate re-examination of - /// the wait masks, either call ACE_Reactor::notify after this - /// call, or use ACE_Reactor::register_handler instead. - virtual int schedule_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_added); - - /// Clear from the 's entry. - /// Note that this call does not cause the Reactor to re-examine - /// its set of handlers - the new masks will be noticed the next - /// time the Reactor waits for activity. If there is no other - /// activity expected, or you need immediate re-examination of - /// the wait masks, either call ACE_Reactor::notify after this - /// call, or use ACE_Reactor::register_handler instead. - virtual int cancel_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_cleared); - - /// Clear from the 's entry. - /// Note that this call does not cause the Reactor to re-examine - /// its set of handlers - the new masks will be noticed the next - /// time the Reactor waits for activity. If there is no other - /// activity expected, or you need immediate re-examination of - /// the wait masks, either call ACE_Reactor::notify after this - /// call, or use ACE_Reactor::register_handler instead. - virtual int cancel_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_cleared); - - // = Notification methods. - - /** - * Notify of event. The - * indicates how long to blocking trying to notify. If == - * 0, the caller will block until action is possible, else will wait - * until the relative time specified in elapses). Note that - * can only be one of the pre-defined - * masks, e.g., , , or . - */ - virtual int notify (ACE_Event_Handler *event_handler = 0, - ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value *tv = 0); - - /** - * Set the maximum number of times that ACE_Reactor will - * iterate and dispatch the that are passed in - * via the notify queue before breaking out of its - * loop. By default, this is set to - * -1, which means "iterate until the queue is empty." Setting this - * to a value like "1 or 2" will increase "fairness" (and thus - * prevent starvation) at the expense of slightly higher dispatching - * overhead. - */ - virtual void max_notify_iterations (int iterations); - - /** - * Get the maximum number of times that the ACE_Reactor will - * iterate and dispatch the that are passed in - * via the notify queue before breaking out of its - * loop. - */ - virtual int max_notify_iterations (void); - - /** - * Purge any notifications pending in this reactor for the specified - * object. If == 0, all notifications for all - * handlers are removed (but not any notifications posted just to wake up - * the reactor itself). Returns the number of notifications purged. - * Returns -1 on error. - */ - virtual int purge_pending_notifications (ACE_Event_Handler *, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - - // = Assorted helper methods. - - /** - * Check to see if is associated with a valid Event_Handler - * bound to . Return the associated with this - * if != 0. - */ - virtual int handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler = 0); - - /** - * Check to see if is associated with a valid Event_Handler - * bound to a signal. Return the associated with - * this if != 0. - */ - virtual int handler (int signum, - ACE_Event_Handler **event_handler = 0); - - /// Returns true if Reactor has been successfully initialized, else - /// false. - virtual int initialized (void); - - /// Returns the current size of the Reactor's internal descriptor - /// table. - virtual size_t size (void) const; - - /// Returns a reference to the Reactor's internal lock. - virtual ACE_Lock &lock (void); - - /// Wake up all threads in waiting in the event loop - virtual void wakeup_all_threads (void); - - /// Transfers ownership of Reactor to the . - virtual int owner (ACE_thread_t new_owner, - ACE_thread_t *old_owner = 0); - - /// Return the ID of the "owner" thread. - virtual int owner (ACE_thread_t *owner); - - /// Set position of the owner thread. - virtual void requeue_position (int position); - - /// Get position of the owner thread. - virtual int requeue_position (void); - - /// Get the existing restart value. - virtual int restart (void); - - /// Set a new value for restart and return the original value. - virtual int restart (int r); - - // = Low-level wait_set mask manipulation methods. - - /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the - /// and . - virtual int mask_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops); - - /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the - /// and . - virtual int mask_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops); - - // = Low-level ready_set mask manipulation methods. - /// GET/SET/ADD/CLR the ready "bit" bound with the - /// and . - virtual int ready_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops); - - /// GET/SET/ADD/CLR the ready "bit" bound with the and . - virtual int ready_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops); - - /// Get the implementation class - virtual ACE_Reactor_Impl *implementation (void) const; - - /** - * Returns 0, if the size of the current message has been put in - * returns -1, if not. ACE_HANDLE allows the reactor to - * check if the caller is valid. Used for CLASSIX Reactor - * implementation. - */ - virtual int current_info (ACE_HANDLE handle, - size_t &msg_size); - - /// Return 1 if we any event associations were made by the reactor - /// for the handles that it waits on, 0 otherwise. - virtual int uses_event_associations (void); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /// Dump the state of the object. - void dump (void) const; - -protected: - /// Set the implementation class. - virtual void implementation (ACE_Reactor_Impl *implementation); - - /// Delegation/implementation class that all methods will be - /// forwarded to. - ACE_Reactor_Impl *implementation_; - - /// Flag used to indicate whether we are responsible for cleaning up - /// the implementation instance - int delete_implementation_; - - /// Pointer to a process-wide singleton. - static ACE_Reactor *reactor_; - - /// Must delete the singleton if non-0. - static int delete_reactor_; - - /// Deny access since member-wise won't work... - ACE_Reactor (const ACE_Reactor &); - ACE_Reactor &operator = (const ACE_Reactor &); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Reactor.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_REACTOR_H */ diff --git a/ace/Reactor.i b/ace/Reactor.i deleted file mode 100644 index 9324bdcfe43..00000000000 --- a/ace/Reactor.i +++ /dev/null @@ -1,675 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Reactor_Impl.h" -#include "ace/Handle_Set.h" - -ACE_INLINE ACE_Reactor_Impl * -ACE_Reactor::implementation (void) const -{ - return this->implementation_; -} - -ACE_INLINE void -ACE_Reactor::implementation (ACE_Reactor_Impl *impl) -{ - this->implementation_ = impl; -} - -ACE_INLINE int -ACE_Reactor::current_info (ACE_HANDLE handle, - size_t &size) -{ - return this->implementation ()->current_info (handle, size); -} - -// Run the event loop until the method -// returns -1 or the method is invoked. - -ACE_INLINE int -ACE_Reactor::run_event_loop (void) -{ - ACE_TRACE ("ACE_Reactor::run_event_loop"); - ACE_Reactor *r = ACE_Reactor::instance (); - - if (r == 0) - return -1; - - return r->run_reactor_event_loop (ACE_Reactor::check_reconfiguration); -} - -// Run the event loop until the -// method returns -1, the method -// is invoked, or the expires. - -ACE_INLINE int -ACE_Reactor::run_event_loop (ACE_Time_Value &tv) -{ - ACE_TRACE ("ACE_Reactor::run_event_loop"); - ACE_Reactor *r = ACE_Reactor::instance (); - - if (r == 0) - return -1; - - return r->run_reactor_event_loop - (tv, ACE_Reactor::check_reconfiguration); -} - -// Run the event loop until the method -// returns -1 or the method is invoked. - -ACE_INLINE int -ACE_Reactor::run_alertable_event_loop (void) -{ - ACE_TRACE ("ACE_Reactor::run_alertable_event_loop"); - ACE_Reactor *r = ACE_Reactor::instance (); - - if (r == 0) - return -1; - - return r->run_alertable_reactor_event_loop (ACE_Reactor::check_reconfiguration); -} - -// Run the event loop until the -// method returns -1, the method -// is invoked, or the expires. - -ACE_INLINE int -ACE_Reactor::run_alertable_event_loop (ACE_Time_Value &tv) -{ - ACE_TRACE ("ACE_Reactor::run_alertable_event_loop"); - ACE_Reactor *r = ACE_Reactor::instance (); - - if (r == 0) - return -1; - - return r->run_alertable_reactor_event_loop - (tv, ACE_Reactor::check_reconfiguration); -} - -ACE_INLINE void -ACE_Reactor::reset_event_loop (void) -{ - ACE_TRACE ("ACE_Reactor::reset_event_loop"); - - ACE_Reactor::instance ()->reset_reactor_event_loop (); -} - -ACE_INLINE int -ACE_Reactor::end_event_loop (void) -{ - ACE_TRACE ("ACE_Reactor::end_event_loop"); - ACE_Reactor::instance ()->end_reactor_event_loop (); - - return 0; -} - -ACE_INLINE int -ACE_Reactor::reactor_event_loop_done (void) -{ - ACE_TRACE ("ACE_Reactor::reactor_event_loop_done"); - return this->implementation_->deactivated (); -} - -ACE_INLINE int -ACE_Reactor::event_loop_done (void) -{ - ACE_TRACE ("ACE_Reactor::event_loop_done"); - return ACE_Reactor::instance ()->reactor_event_loop_done (); -} - -ACE_INLINE int -ACE_Reactor::open (size_t size, - int restart, - ACE_Sig_Handler *signal_handler, - ACE_Timer_Queue *timer_queue) -{ - return this->implementation ()->open (size, - restart, - signal_handler, - timer_queue); -} -ACE_INLINE int -ACE_Reactor::set_sig_handler (ACE_Sig_Handler *signal_handler) -{ - return this->implementation ()->set_sig_handler (signal_handler); -} - -ACE_INLINE int -ACE_Reactor::timer_queue (ACE_Timer_Queue *tq) -{ - return this->implementation ()->timer_queue (tq); -} - -ACE_INLINE int -ACE_Reactor::set_timer_queue (ACE_Timer_Queue *tq) -{ - return this->timer_queue (tq); -} - -ACE_INLINE ACE_Timer_Queue * -ACE_Reactor::timer_queue (void) const -{ - ACE_Reactor_Impl *impl = this->implementation_; - return impl->timer_queue (); -} - -ACE_INLINE int -ACE_Reactor::close (void) -{ - return this->implementation ()->close (); -} - -ACE_INLINE int -ACE_Reactor::work_pending (const ACE_Time_Value &max_wait_time) -{ - return this->implementation ()->work_pending (max_wait_time); -} - -ACE_INLINE int -ACE_Reactor::handle_events (ACE_Time_Value *max_wait_time) -{ - return this->implementation ()->handle_events (max_wait_time); -} - -ACE_INLINE int -ACE_Reactor::alertable_handle_events (ACE_Time_Value *max_wait_time) -{ - return this->implementation ()->alertable_handle_events (max_wait_time); -} - -ACE_INLINE int -ACE_Reactor::handle_events (ACE_Time_Value &max_wait_time) -{ - return this->implementation ()->handle_events (max_wait_time); -} - -ACE_INLINE int -ACE_Reactor::alertable_handle_events (ACE_Time_Value &max_wait_time) -{ - return this->implementation ()->alertable_handle_events (max_wait_time); -} - - -ACE_INLINE int -ACE_Reactor::register_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - // Remember the old reactor. - ACE_Reactor *old_reactor = event_handler->reactor (); - - // Assign *this* to the . - event_handler->reactor (this); - - int result = this->implementation ()->register_handler (event_handler, - mask); - if (result == -1) - // Reset the old reactor in case of failures. - event_handler->reactor (old_reactor); - - return result; -} - -ACE_INLINE int -ACE_Reactor::register_handler (ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - // Remember the old reactor. - ACE_Reactor *old_reactor = event_handler->reactor (); - - // Assign *this* to the . - event_handler->reactor (this); - - int result = this->implementation ()->register_handler (io_handle, - event_handler, - mask); - if (result == -1) - // Reset the old reactor in case of failures. - event_handler->reactor (old_reactor); - - return result; -} - -#if defined (ACE_WIN32) - -ACE_INLINE int -ACE_Reactor::register_handler (ACE_Event_Handler *event_handler, - ACE_HANDLE event_handle) -{ - // Remember the old reactor. - ACE_Reactor *old_reactor = event_handler->reactor (); - - // Assign *this* to the . - event_handler->reactor (this); - - int result = this->implementation ()->register_handler (event_handler, - event_handle); - if (result == -1) - // Reset the old reactor in case of failures. - event_handler->reactor (old_reactor); - - return result; -} - -#endif /* ACE_WIN32 */ - -ACE_INLINE int -ACE_Reactor::register_handler (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - // Remember the old reactor. - ACE_Reactor *old_reactor = event_handler->reactor (); - - // Assign *this* to the . - event_handler->reactor (this); - - int result = this->implementation ()->register_handler (event_handle, - io_handle, - event_handler, - mask); - if (result == -1) - // Reset the old reactor in case of failures. - event_handler->reactor (old_reactor); - - return result; -} - -ACE_INLINE int -ACE_Reactor::register_handler (const ACE_Handle_Set &handles, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - // Remember the old reactor. - ACE_Reactor *old_reactor = event_handler->reactor (); - - // Assign *this* to the . - event_handler->reactor (this); - - int result = this->implementation ()->register_handler (handles, - event_handler, - mask); - if (result == -1) - // Reset the old reactor in case of failures. - event_handler->reactor (old_reactor); - - return result; -} - -ACE_INLINE int -ACE_Reactor::register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp, - ACE_Event_Handler **old_sh, - ACE_Sig_Action *old_disp) -{ - return this->implementation ()->register_handler (signum, - new_sh, - new_disp, - old_sh, - old_disp); -} - -ACE_INLINE int -ACE_Reactor::register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp) -{ - return this->implementation ()->register_handler (sigset, - new_sh, - new_disp); -} - -ACE_INLINE int -ACE_Reactor::remove_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - return this->implementation ()->remove_handler (event_handler, - mask); -} - -ACE_INLINE int -ACE_Reactor::remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - return this->implementation ()->remove_handler (handle, - mask); -} - -ACE_INLINE int -ACE_Reactor::remove_handler (const ACE_Handle_Set &handle_set, - ACE_Reactor_Mask mask) -{ - return this->implementation ()->remove_handler (handle_set, - mask); -} - -ACE_INLINE int -ACE_Reactor::remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp, - int sigkey) -{ - return this->implementation ()->remove_handler (signum, - new_disp, - old_disp, - sigkey); -} - -ACE_INLINE int -ACE_Reactor::remove_handler (const ACE_Sig_Set &sigset) -{ - return this->implementation ()->remove_handler (sigset); -} - - -ACE_INLINE int -ACE_Reactor::suspend_handler (ACE_Event_Handler *event_handler) -{ - return this->implementation ()->suspend_handler (event_handler); -} - -ACE_INLINE int -ACE_Reactor::suspend_handler (ACE_HANDLE handle) -{ - return this->implementation ()->suspend_handler (handle); -} - -ACE_INLINE int -ACE_Reactor::suspend_handler (const ACE_Handle_Set &handles) -{ - return this->implementation ()->suspend_handler (handles); -} - -ACE_INLINE int -ACE_Reactor::suspend_handlers (void) -{ - return this->implementation ()->suspend_handlers (); -} - -ACE_INLINE int -ACE_Reactor::resume_handler (ACE_Event_Handler *event_handler) -{ - return this->implementation ()->resume_handler (event_handler); -} - -ACE_INLINE int -ACE_Reactor::resume_handler (ACE_HANDLE handle) -{ - return this->implementation ()->resume_handler (handle); -} - -ACE_INLINE int -ACE_Reactor::resume_handler (const ACE_Handle_Set &handles) -{ - return this->implementation ()->resume_handler (handles); -} - -ACE_INLINE int -ACE_Reactor::resume_handlers (void) -{ - return this->implementation ()->resume_handlers (); -} - - -ACE_INLINE int -ACE_Reactor::reset_timer_interval - (long timer_id, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Reactor::reset_timer_interval"); - - return this->implementation ()->reset_timer_interval - (timer_id, - interval); -} - -ACE_INLINE long -ACE_Reactor::schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delta, - const ACE_Time_Value &interval) -{ - // Remember the old reactor. - ACE_Reactor *old_reactor = event_handler->reactor (); - - // Assign *this* to the . - event_handler->reactor (this); - - int result = this->implementation ()->schedule_timer (event_handler, - arg, - delta, - interval); - if (result == -1) - // Reset the old reactor in case of failures. - event_handler->reactor (old_reactor); - - return result; -} - -ACE_INLINE int -ACE_Reactor::cancel_timer (ACE_Event_Handler *event_handler, - int dont_call_handle_close) -{ - return this->implementation ()->cancel_timer (event_handler, - dont_call_handle_close); -} - -ACE_INLINE int -ACE_Reactor::cancel_timer (long timer_id, - const void **arg, - int dont_call_handle_close) -{ - return this->implementation ()->cancel_timer (timer_id, - arg, - dont_call_handle_close); -} - -ACE_INLINE int -ACE_Reactor::schedule_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_added) -{ - // Remember the old reactor. - ACE_Reactor *old_reactor = event_handler->reactor (); - - // Assign *this* to the . - event_handler->reactor (this); - - int result = this->implementation ()->schedule_wakeup (event_handler, - masks_to_be_added); - if (result == -1) - // Reset the old reactor in case of failures. - event_handler->reactor (old_reactor); - - return result; -} - -ACE_INLINE int -ACE_Reactor::schedule_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_added) -{ - return implementation ()->schedule_wakeup (handle, - masks_to_be_added); -} - -ACE_INLINE int -ACE_Reactor::cancel_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_cleared) -{ - return this->implementation ()->cancel_wakeup (event_handler, - masks_to_be_cleared); -} - -ACE_INLINE int -ACE_Reactor::cancel_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_cleared) -{ - return this->implementation ()->cancel_wakeup (handle, - masks_to_be_cleared); -} - - -ACE_INLINE int -ACE_Reactor::notify (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - ACE_Time_Value *tv) -{ - // First, try to remember this reactor in the event handler, in case - // the event handler goes away before the notification is delivered. - if (event_handler != 0 && event_handler->reactor () == 0) - event_handler->reactor (this); - return this->implementation ()->notify (event_handler, - mask, - tv); -} - -ACE_INLINE void -ACE_Reactor::max_notify_iterations (int iterations) -{ - this->implementation ()->max_notify_iterations (iterations); -} - -ACE_INLINE int -ACE_Reactor::max_notify_iterations (void) -{ - return this->implementation ()->max_notify_iterations (); -} - -ACE_INLINE int -ACE_Reactor::purge_pending_notifications (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) -{ - return this->implementation ()->purge_pending_notifications (eh, mask); -} - -ACE_INLINE int -ACE_Reactor::handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler) -{ - return this->implementation ()->handler (handle, - mask, - event_handler); -} - -ACE_INLINE int -ACE_Reactor::handler (int signum, - ACE_Event_Handler **event_handler) -{ - return this->implementation ()->handler (signum, - event_handler); -} - -ACE_INLINE int -ACE_Reactor::initialized (void) -{ - return this->implementation ()->initialized (); -} - -ACE_INLINE ACE_Lock & -ACE_Reactor::lock (void) -{ - return this->implementation ()->lock (); -} - -ACE_INLINE void -ACE_Reactor::wakeup_all_threads (void) -{ - this->implementation ()->wakeup_all_threads (); -} - -ACE_INLINE int -ACE_Reactor::owner (ACE_thread_t new_owner, - ACE_thread_t *old_owner) -{ - return this->implementation ()->owner (new_owner, - old_owner); -} - -ACE_INLINE int -ACE_Reactor::owner (ACE_thread_t *owner) -{ - return this->implementation ()->owner (owner); -} - -ACE_INLINE int -ACE_Reactor::restart (void) -{ - return this->implementation ()->restart (); -} - -ACE_INLINE int -ACE_Reactor::restart (int r) -{ - return this->implementation ()->restart (r); -} - -ACE_INLINE void -ACE_Reactor::requeue_position (int position) -{ - this->implementation ()->requeue_position (position); -} - -ACE_INLINE int -ACE_Reactor::requeue_position (void) -{ - return this->implementation ()->requeue_position (); -} - - -ACE_INLINE int -ACE_Reactor::mask_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops) -{ - return this->implementation ()->mask_ops (event_handler, - mask, - ops); -} - -ACE_INLINE int -ACE_Reactor::mask_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops) -{ - return this->implementation ()->mask_ops (handle, - mask, - ops); -} - -ACE_INLINE int -ACE_Reactor::ready_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops) -{ - return this->implementation ()->ready_ops (event_handler, - mask, - ops); -} - -ACE_INLINE int -ACE_Reactor::ready_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops) -{ - return this->implementation ()->ready_ops (handle, - mask, - ops); -} - -ACE_INLINE size_t -ACE_Reactor::size (void) const -{ - return this->implementation ()->size (); -} - -ACE_INLINE int -ACE_Reactor::uses_event_associations (void) -{ - return this->implementation ()->uses_event_associations (); -} - - - diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h deleted file mode 100644 index 5ff0d2bcfb0..00000000000 --- a/ace/Reactor_Impl.h +++ /dev/null @@ -1,562 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Reactor_Impl.h - * - * $Id$ - * - * @author Irfan Pyarali - */ -//============================================================================= - - -#ifndef ACE_REACTOR_IMPL_H -#define ACE_REACTOR_IMPL_H -#include "ace/pre.h" - -// Timer Queue is a complicated template class. A simple forward -// declaration will not work -#include "ace/Timer_Queue.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Event_Handler.h contains the definition of ACE_Reactor_Mask -#include "ace/Event_Handler.h" - -// We are using 4 or 5 signal classes, we could forward declare -// them.... But Timer_Queue_T.h includes Signal.h, so I don't think -// forward declaration will be useful here -#include "ace/Signal.h" - -// Forward decls -class ACE_Handle_Set; -class ACE_Reactor_Impl; - -/** - * @class ACE_Reactor_Notify - * - * @brief Abstract class for unblocking an from its - * event loop. - */ -class ACE_Export ACE_Reactor_Notify : public ACE_Event_Handler -{ -public: - // = Initialization and termination methods. - virtual int open (ACE_Reactor_Impl *, - ACE_Timer_Queue *timer_queue = 0, - int disable_notify = 0) = 0; - virtual int close (void) = 0; - - /** - * Called by a thread when it wants to unblock the . - * This wakeups the if currently blocked. Pass over - * both the *and* the to allow the caller to - * dictate which method the will - * invoke. The indicates how long to blocking - * trying to notify the . If == 0, the - * caller will block until action is possible, else will wait until - * the relative time specified in * elapses). - */ - virtual int notify (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value * = 0) = 0; - - /// Handles pending threads (if any) that are waiting to unblock the - /// . - virtual int dispatch_notifications (int &number_of_active_handles, - ACE_Handle_Set &rd_mask) = 0; - - /// Returns the ACE_HANDLE of the notify pipe on which the reactor - /// is listening for notifications so that other threads can unblock - /// the - virtual ACE_HANDLE notify_handle (void) = 0; - - /// Verify whether the buffer has dispatchable info or not. - virtual int is_dispatchable (ACE_Notification_Buffer &buffer)= 0; - - /// Handle one of the notify call on the . This could be - /// because of a thread trying to unblock the - virtual int dispatch_notify (ACE_Notification_Buffer &buffer) = 0; - - /// Read one of the notify call on the into the - /// . This could be because of a thread trying to unblock - /// the - virtual int read_notify_pipe (ACE_HANDLE handle, - ACE_Notification_Buffer &buffer) = 0; - /** - * Set the maximum number of times that the method - * will iterate and dispatch the that are - * passed in via the notify queue before breaking out of the event - * loop. By default, this is set to -1, which means "iterate until - * the queue is empty." Setting this to a value like "1 or 2" will - * increase "fairness" (and thus prevent starvation) at the expense - * of slightly higher dispatching overhead. - */ - virtual void max_notify_iterations (int) = 0; - - /** - * Get the maximum number of times that the method - * will iterate and dispatch the that are - * passed in via the notify queue before breaking out of its event - * loop. - */ - virtual int max_notify_iterations (void) = 0; - - /** - * Purge any notifications pending in this reactor for the specified - * object. Returns the number of notifications - * purged. Returns -1 on error. - */ - virtual int purge_pending_notifications (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) = 0; - - /// Dump the state of an object. - virtual void dump (void) const = 0; -}; - -/** - * @class ACE_Reactor_Impl - * - * @brief An abstract class for implementing the Reactor Pattern. - */ -class ACE_Export ACE_Reactor_Impl -{ -public: - /// Close down and release all resources. - virtual ~ACE_Reactor_Impl (void) {} - - /// Initialization. - virtual int open (size_t size, - int restart = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int disable_notify_pipe = 0, - ACE_Reactor_Notify * = 0) = 0; - - /** - * Returns 0, if the size of the current message has been put in - * Returns -1, if not. ACE_HANDLE allows the reactor to - * check if the caller is valid. - */ - virtual int current_info (ACE_HANDLE, size_t & /* size */) = 0; - - /// Use a user specified signal handler instead. - virtual int set_sig_handler (ACE_Sig_Handler *signal_handler) = 0; - - /// @deprecated The following method is deprecated. Use instead. - /// Set a user specified timer queue. - virtual int set_timer_queue (ACE_Timer_Queue *tq) = 0; - - /// Set a user-specified timer queue. - virtual int timer_queue (ACE_Timer_Queue *tq) = 0; - - /// Return the current . - virtual ACE_Timer_Queue *timer_queue (void) const = 0; - - /// Close down and release all resources. - virtual int close (void) = 0; - - // = Event loop drivers. - /** - * Returns non-zero if there are I/O events "ready" for dispatching, - * but does not actually dispatch the event handlers. By default, - * don't block while checking this, i.e., "poll". - */ - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero) = 0; - - /** - * This event loop driver blocks for up to before - * returning. It will return earlier if events occur. Note that - * can be 0, in which case this method blocks - * indefinitely until events occur. - * - * is decremented to reflect how much time this call - * took. For instance, if a time value of 3 seconds is passed to - * handle_events and an event occurs after 2 seconds, - * will equal 1 second. This can be used if an - * application wishes to handle events for some fixed amount of - * time. - * - * Returns the total number of s that were - * dispatched, 0 if the elapsed without dispatching - * any handlers, or -1 if an error occurs. - * - * The only difference between and - * is that in the alertable case, the eventloop will - * return when the system queues an I/O completion routine or an - * Asynchronous Procedure Call. - */ - virtual int handle_events (ACE_Time_Value *max_wait_time = 0) = 0; - virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0) = 0; - - /** - * This method is just like the one above, except the - * value is a reference and can therefore never be - * NULL. - * - * The only difference between and - * is that in the alertable case, the eventloop will - * return when the system queues an I/O completion routine or an - * Asynchronous Procedure Call. - */ - virtual int handle_events (ACE_Time_Value &max_wait_time) = 0; - virtual int alertable_handle_events (ACE_Time_Value &max_wait_time) = 0; - - // = Event handling control. - - /** - * Return the status of Reactor. If this function returns 0, the reactor is - * actively handling events. If it returns non-zero, and - * return -1 immediately. - */ - virtual int deactivated (void) = 0; - - /** - * Control whether the Reactor will handle any more incoming events or not. - * If == 1, the Reactor will be disabled. By default, a reactor - * is in active state and can be deactivated/reactived as wish. - */ - virtual void deactivate (int do_stop) = 0; - - // = Register and remove Handlers. - - /// Register with . The I/O handle will always - /// come from on the . - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) = 0; - - /// Register with . The I/O handle is provided - /// through the parameter. - virtual int register_handler (ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) = 0; - -#if defined (ACE_WIN32) - - // Originally this interface was available for all platforms, but - // because ACE_HANDLE is an int on non-Win32 platforms, compilers - // are not able to tell the difference between - // register_handler(ACE_Event_Handler*,ACE_Reactor_Mask) and - // register_handler(ACE_Event_Handler*,ACE_HANDLE). Therefore, we - // have restricted this method to Win32 only. - - /** - * Register an that will be notified when - * is signaled. Since no event mask is passed - * through this interface, it is assumed that the - * being passed in is an event handle and not an I/O handle. - */ - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_HANDLE event_handle = ACE_INVALID_HANDLE) = 0; - -#endif /* ACE_WIN32 */ - - /** - * Register an that will be notified when - * is signaled. specifies the network events - * that the is interested in. - */ - virtual int register_handler (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) = 0; - - /// Register with all the in the . - virtual int register_handler (const ACE_Handle_Set &handles, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) = 0; - - /** - * Register to handle the signal using the - * . Returns the that was previously registered - * (if any), along with the of the signal handler. - */ - virtual int register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0, - ACE_Event_Handler **old_sh = 0, - ACE_Sig_Action *old_disp = 0) = 0; - - /// Registers to handle a set of signals using the - /// . - virtual int register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0) = 0; - - /** - * Removes . Note that the I/O handle will be - * obtained using method of . If - * == then the - * method of the is not invoked. - */ - virtual int remove_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) = 0; - - /** - * Removes . If == - * then the method of the associated - * is not invoked. - */ - virtual int remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask) = 0; - - /** - * Removes all handles in . If == - * then the method of - * the associated s is not invoked. - */ - virtual int remove_handler (const ACE_Handle_Set &handle_set, - ACE_Reactor_Mask mask) = 0; - - /** - * Remove the ACE_Event_Handler currently associated with . - * Install the new disposition (if given) and return the previous - * disposition (if desired by the caller). Returns 0 on success and - * -1 if is invalid. - */ - virtual int remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp = 0, - int sigkey = -1) = 0; - - /// Calls for every signal in . - virtual int remove_handler (const ACE_Sig_Set &sigset) = 0; - - // = Suspend and resume Handlers. - - /// Suspend temporarily. Use - /// to get the handle. - virtual int suspend_handler (ACE_Event_Handler *event_handler) = 0; - - /// Suspend temporarily. - virtual int suspend_handler (ACE_HANDLE handle) = 0; - - /// Suspend all in handle set temporarily. - virtual int suspend_handler (const ACE_Handle_Set &handles) = 0; - - /// Suspend all temporarily. - virtual int suspend_handlers (void) = 0; - - /// Resume . Use to - /// get the handle. - virtual int resume_handler (ACE_Event_Handler *event_handler) = 0; - - /// Resume . - virtual int resume_handler (ACE_HANDLE handle) = 0; - - /// Resume all in handle set. - virtual int resume_handler (const ACE_Handle_Set &handles) = 0; - - /// Resume all . - virtual int resume_handlers (void) = 0; - - /// Does the reactor allow the application to resume the handle on - /// its own ie. can it pass on the control of handle resumption to - /// the application - virtual int resumable_handler (void) = 0; - - /// Return 1 if we any event associations were made by the reactor - /// for the handles that it waits on, 0 otherwise. - virtual int uses_event_associations (void) = 0; - - // If we need to reset handles returned from accept/connect. - - // = Timer management. - - /** - * Schedule an ACE_Event_Handler that will expire after an amount - * of time. The return value of this method, a timer_id value, - * uniquely identifies the event_handler in the ACE_Reactor's - * internal list of timers. - * This timer_id value can be used to cancel the timer - * with the cancel_timer() call. - * - * @see cancel_timer() - * @see reset_timer_interval() - * - * @param event_handler event handler to schedule on reactor - * @param arg argument passed to the handle_timeout() method of event_handler - * @param delay time interval after which the timer will expire - * @param interval time interval after which the timer will be automatically rescheduled - * @return -1 on failure, a timer_id value on success - */ - virtual long schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0; - - /** - * Resets the interval of the timer represented by to - * , which is specified in relative time to the current - * . If is equal to - * , the timer will become a non-rescheduling - * timer. Returns 0 if successful, -1 if not. - */ - virtual int reset_timer_interval (long timer_id, - const ACE_Time_Value &interval) = 0; - - /// Cancel all Event_Handlers that match the address of - /// . Returns number of handlers cancelled. - virtual int cancel_timer (ACE_Event_Handler *event_handler, - int dont_call_handle_close = 1) = 0; - - /** - * Cancel the single Event_Handler that matches the value - * (which was returned from the schedule method). If arg is - * non-NULL then it will be set to point to the ``magic cookie'' - * argument passed in when the Event_Handler was registered. This - * makes it possible to free up the memory and avoid memory leaks. - * Returns 1 if cancellation succeeded and 0 if the - * wasn't found. - */ - virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1) = 0; - - // = High-level Event_Handler scheduling operations - - /// Add to the 's entry. - /// must already have been registered. - virtual int schedule_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_added) = 0; - - /// Add to the 's entry. - /// associated with must already have been registered. - virtual int schedule_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_added) = 0; - - /// Clear from the 's entry. - virtual int cancel_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_cleared) = 0; - - /// Clear from the 's entry. - virtual int cancel_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_cleared) = 0; - - // = Notification methods. - - /** - * Notify of event. The - * indicates how long to blocking trying to notify. If == - * 0, the caller will block until action is possible, else will wait - * until the relative time specified in elapses). - */ - virtual int notify (ACE_Event_Handler *event_handler = 0, - ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value * = 0) = 0; - - /** - * Set the maximum number of times that ACE_Reactor_Impl will - * iterate and dispatch the that are passed in - * via the notify queue before breaking out of its - * loop. By default, this is set to - * -1, which means "iterate until the queue is empty." Setting this - * to a value like "1 or 2" will increase "fairness" (and thus - * prevent starvation) at the expense of slightly higher dispatching - * overhead. - */ - virtual void max_notify_iterations (int) = 0; - - /** - * Get the maximum number of times that the ACE_Reactor_Impl will - * iterate and dispatch the that are passed in - * via the notify queue before breaking out of its - * loop. - */ - virtual int max_notify_iterations (void) = 0; - - /** - * Purge any notifications pending in this reactor for the specified - * object. Returns the number of notifications - * purged. Returns -1 on error. - */ - virtual int purge_pending_notifications (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) = 0; - - /** - * Check to see if is associated with a valid Event_Handler - * bound to . Return the associated with this - * if != 0. - */ - virtual int handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler = 0) = 0; - - /** - * Check to see if is associated with a valid Event_Handler - * bound to a signal. Return the associated with - * this if != 0. - */ - virtual int handler (int signum, - ACE_Event_Handler ** = 0) = 0; - - /// Returns true if Reactor has been successfully initialized, else - /// false. - virtual int initialized (void) = 0; - - /// Returns the current size of the Reactor's internal descriptor - /// table. - virtual size_t size (void) const = 0; - - /// Returns a reference to the Reactor's internal lock. - virtual ACE_Lock &lock (void) = 0; - - /// Wake up all threads in waiting in the event loop - virtual void wakeup_all_threads (void) = 0; - - /// Transfers ownership of Reactor_Impl to the . - virtual int owner (ACE_thread_t new_owner, ACE_thread_t *old_owner = 0) = 0; - - /// Return the ID of the "owner" thread. - virtual int owner (ACE_thread_t *owner) = 0; - - /// Get the existing restart value. - virtual int restart (void) = 0; - - /// Set a new value for restart and return the original value. - virtual int restart (int r) = 0; - - /// Set position of the owner thread. - virtual void requeue_position (int) = 0; - - /// Get position of the owner thread. - virtual int requeue_position (void) = 0; - - // = Low-level wait_set mask manipulation methods. - - /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the - /// and . - virtual int mask_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops) = 0; - - /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the - /// and . - virtual int mask_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops) = 0; - - // = Low-level ready_set mask manipulation methods. - /// GET/SET/ADD/CLR the ready "bit" bound with the - /// and . - virtual int ready_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops) = 0; - - /// GET/SET/ADD/CLR the ready "bit" bound with the and . - virtual int ready_ops (ACE_HANDLE handle, - ACE_Reactor_Mask, - int ops) = 0; - - /// Dump the state of an object. - virtual void dump (void) const = 0; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#include "ace/post.h" -#endif /* ACE_REACTOR_IMPL_H */ diff --git a/ace/Reactor_Notification_Strategy.cpp b/ace/Reactor_Notification_Strategy.cpp deleted file mode 100644 index c902f30b929..00000000000 --- a/ace/Reactor_Notification_Strategy.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "ace/Reactor_Notification_Strategy.h" -#include "ace/Reactor.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Reactor_Notification_Strategy.inl" -#endif /* __ACE_INLINE __ */ - -ACE_RCSID(ace, Reactor_Notification_Strategy, "$Id$") - -ACE_Reactor_Notification_Strategy::ACE_Reactor_Notification_Strategy (ACE_Reactor *reactor, - ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) - : ACE_Notification_Strategy (eh, mask), - reactor_ (reactor) -{ -} - -ACE_Reactor_Notification_Strategy::~ACE_Reactor_Notification_Strategy (void) -{ -} - -int -ACE_Reactor_Notification_Strategy::notify (void) -{ - return this->reactor_->notify (this->eh_, this->mask_); -} - -int -ACE_Reactor_Notification_Strategy::notify (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) -{ - return this->reactor_->notify (eh, mask); -} diff --git a/ace/Reactor_Notification_Strategy.h b/ace/Reactor_Notification_Strategy.h deleted file mode 100644 index fdd6ecb48f5..00000000000 --- a/ace/Reactor_Notification_Strategy.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Reactor_Notification_Strategy.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= -#ifndef ACE_REACTOR_NOTIFICATION_STRATEGY_H -#define ACE_REACTOR_NOTIFICATION_STRATEGY_H -#include "ace/pre.h" - -#include "ace/Notification_Strategy.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Reactor_Notification_Strategy - * - * @brief Used to notify an ACE_Reactor - * - * Integrates the notification into the - * method. - */ -class ACE_Export ACE_Reactor_Notification_Strategy : public ACE_Notification_Strategy -{ -public: - ACE_Reactor_Notification_Strategy (ACE_Reactor *reactor, - ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - - /// Default dtor. - virtual ~ACE_Reactor_Notification_Strategy (void); - - virtual int notify (void); - - virtual int notify (ACE_Event_Handler *, - ACE_Reactor_Mask mask); - - /// Get the reactor - ACE_Reactor *reactor (void); - - /// Set the reactor - void reactor (ACE_Reactor *r); - -protected: - /// The Reactor - ACE_Reactor *reactor_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Reactor_Notification_Strategy.inl" -#endif /* __ACE_INLINE __ */ - -#include "ace/post.h" -#endif /*ACE_REACTOR_NOTIFICATION_STRATEGY_H */ diff --git a/ace/Reactor_Notification_Strategy.inl b/ace/Reactor_Notification_Strategy.inl deleted file mode 100644 index b9fb2811526..00000000000 --- a/ace/Reactor_Notification_Strategy.inl +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -ACE_INLINE ACE_Reactor * -ACE_Reactor_Notification_Strategy::reactor (void) -{ - return this->reactor_; -} - -ACE_INLINE void -ACE_Reactor_Notification_Strategy::reactor (ACE_Reactor *r) -{ - this->reactor_ = r; -} diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp deleted file mode 100644 index 5f38190caa6..00000000000 --- a/ace/Read_Buffer.cpp +++ /dev/null @@ -1,165 +0,0 @@ -// $Id$ - -#include "ace/Read_Buffer.h" -#include "ace/Log_Msg.h" -#include "ace/Malloc_Base.h" -#include "ace/Service_Config.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Read_Buffer.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Read_Buffer, "$Id$") - -void -ACE_Read_Buffer::dump (void) const -{ - ACE_TRACE ("ACE_Read_Buffer::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("size_ = %d"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\noccurrences_ = %d"), this->occurrences_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nstream_ = %x"), this->stream_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nallocator_ = %x"), this->allocator_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp, - int close_on_delete, - ACE_Allocator *alloc) - : stream_ (fp), - close_on_delete_ (close_on_delete), - allocator_ (alloc) -{ - ACE_TRACE ("ACE_Read_Buffer::ACE_Read_Buffer"); - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); -} - -#if !defined (ACE_HAS_WINCE) -ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle, - int close_on_delete, - ACE_Allocator *alloc) - : stream_ (ACE_OS::fdopen (handle, ACE_LIB_TEXT ("r"))), - close_on_delete_ (close_on_delete), - allocator_ (alloc) -{ - ACE_TRACE ("ACE_Read_Buffer::ACE_Read_Buffer"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); -} -#endif // ACE_HAS_WINCE - -ACE_Read_Buffer::~ACE_Read_Buffer (void) -{ - ACE_TRACE ("ACE_Read_Buffer::~ACE_Read_Buffer"); - - if (this->close_on_delete_) - ACE_OS::fclose (this->stream_); -} - -// Input: term the character to terminate on -// search the character to search for -// replace the character with which to replace search -// Output: a buffer containing the contents of stream -// Method: call the recursive helper function read_helper - -char * -ACE_Read_Buffer::read (int term, int search, int replace) -{ - ACE_TRACE ("ACE_Read_Buffer::read"); - this->occurrences_ = 0; - this->size_ = 0; - return this->rec_read (term, search, replace); -} - -// Input: term the termination character -// search the character to search for -// replace the character with which to replace search -// Purpose: read in a file to a buffer using only a single dynamic -// allocation. -// Method: read until the local buffer is full and then recurse. -// Must continue until the termination character is reached. -// Allocate the final buffer based on the number of local -// buffers read and as the recursive calls bottom out, -// copy them in reverse order into the allocated buffer. - -char * -ACE_Read_Buffer::rec_read (int term, int search, int replace) -{ - ACE_TRACE ("ACE_Read_Buffer::rec_read"); - // This is our temporary workspace. - char buf[BUFSIZ]; - - int c = EOF; - size_t slot = 0; - int done = 0; - - // Read in the file char by char - while (slot < BUFSIZ) - { - c = getc (this->stream_); - - // Don't insert EOF into the buffer... - if (c == EOF) - { - ungetc (c, this->stream_); - break; - } - else if (c == term) - done = 1; - - // Check for possible substitutions. - if (c == search) - { - this->occurrences_++; - - if (replace >= 0) - c = replace; - } - - buf[slot++] = (char) c; - - // Substitutions must be made before checking for termination. - if (done) - break; - } - - // Increment the number of bytes. - this->size_ += slot; - - // Don't bother going any farther if the total size is 0. - if (this->size_ == 0) - return 0; - - char *result; - - // Recurse, when the recursion bottoms out, allocate the result - // buffer. - if (done || c == EOF) - { - // Use the allocator to acquire the memory. The + 1 allows - // space for the null terminator. - result = (char *) this->allocator_->malloc (this->size_ + 1); - - if (result == 0) - { - errno = ENOMEM; - return 0; - } - result += this->size_; - - // Null terminate the buffer. - *result = '\0'; - } - else if ((result = this->rec_read (term, search, replace)) == 0) - return 0; - - // Copy buf into the appropriate location starting from end of - // buffer. Peter says this is confusing and that we should use - // memcpy() ;-) - for (size_t j = slot; j > 0; j--) - *--result = buf[j - 1]; - - return result; -} diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h deleted file mode 100644 index f2d77add242..00000000000 --- a/ace/Read_Buffer.h +++ /dev/null @@ -1,122 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file Read_Buffer.h - * - * $Id$ - * - * @author Douglas C. Schmidt - * @author Seth Widoff - */ -//========================================================================== - -#ifndef ACE_READ_BUFFER_H -#define ACE_READ_BUFFER_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -class ACE_Allocator; - -/** - * @class ACE_Read_Buffer - * - * @brief Efficiently reads an artibrarily large buffer from an input - * stream up to and including a termination character. Also - * performs search/replace on single occurrences a character in - * the buffer using the principles of Integrated Layer - * Processing. - * - * This implementation is optimized to do a single dynamic - * allocation and make only one copy of the data. It uses - * recursion and the run-time stack to accomplish this - * efficiently. - */ -class ACE_Export ACE_Read_Buffer -{ -public: - // = Initialization and termination methods. - /// Read from a FILE *. - ACE_Read_Buffer (FILE *fp, - int close_on_delete = 0, - ACE_Allocator * = 0); - -#if !defined (ACE_HAS_WINCE) - // Note that ACE_HANDLE = FILE under CE. - - /// Read from an open HANDLE. - ACE_Read_Buffer (ACE_HANDLE handle, - int close_on_delete = 0, - ACE_Allocator * = 0); -#endif // ACE_HAS_WINCE - - /// Closes the FILE *. - ~ACE_Read_Buffer (void); - - /** - * Returns a pointer dynamically allocated with - * to data from the input stream up to (and - * including) the . If is >= 0 then all - * occurrences of the value are substituted with the - * value. The last of the byte of data is a 0, so that - * can be used on it. The caller is responsible for - * freeing the pointer returned from this method using the - * . - */ - char *read (int terminator = EOF, - int search = '\n', - int replace = '\0'); - - /// Returns the number of characters replaced during a . - size_t replaced (void) const; - - /// Returns the size of the allocated buffer obtained during a - /// , not including the null terminator. - size_t size (void) const; - - /// Returns a pointer to its allocator. - ACE_Allocator *alloc (void) const; - - /// Dump the state of the object. - void dump (void) const; - -private: - /// Recursive helper method that does the work... - char *rec_read (int term, int search, int replace); - - /// The total number of characters in the buffer. - size_t size_; - - /// The total number of characters replaced. - size_t occurrences_; - - /// The stream we are reading from. - FILE *stream_; - - /// Keeps track of whether we should close the FILE in the - /// destructor. - int close_on_delete_; - - /// Pointer to the allocator. - ACE_Allocator *allocator_; - - // = Disallow copying and assignment... - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Read_Buffer &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Read_Buffer (const ACE_Read_Buffer &)) -}; - -#if defined (__ACE_INLINE__) -# include "ace/Read_Buffer.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_READ_BUFFER_H */ diff --git a/ace/Read_Buffer.i b/ace/Read_Buffer.i deleted file mode 100644 index 3534c62db2e..00000000000 --- a/ace/Read_Buffer.i +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Accessor to the number of bytes in the buffer. - -ACE_INLINE size_t -ACE_Read_Buffer::size (void) const -{ - ACE_TRACE ("ACE_Read_Buffer::size"); - return this->size_; -} - -// The total number of characters replaced. - -ACE_INLINE size_t -ACE_Read_Buffer::replaced (void) const -{ - ACE_TRACE ("ACE_Read_Buffer::replaced"); - return this->occurrences_; -} - -ACE_INLINE ACE_Allocator * -ACE_Read_Buffer::alloc (void) const -{ - ACE_TRACE ("ACE_Read_Buffer::alloc"); - return this->allocator_; -} - diff --git a/ace/Recyclable.cpp b/ace/Recyclable.cpp deleted file mode 100644 index 483852486f1..00000000000 --- a/ace/Recyclable.cpp +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ -#include "ace/Recyclable.h" - - -#if !defined (__ACE_INLINE__) -#include "ace/Recyclable.inl" -#endif /* __ACE_INLINE __ */ - -ACE_RCSID(ace, Recyclable, "$Id$") - - -ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state) - : recycle_state_ (initial_state) -{ -} - -ACE_Recyclable::~ACE_Recyclable (void) -{ -} diff --git a/ace/Recyclable.h b/ace/Recyclable.h deleted file mode 100644 index a269a3684bb..00000000000 --- a/ace/Recyclable.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Recyclable.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= -#ifndef ACE_RECYCLABLE_H -#define ACE_RECYCLABLE_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -/// States of a recyclable object. -enum ACE_Recyclable_State -{ - /// Idle and can be purged. - ACE_RECYCLABLE_IDLE_AND_PURGABLE, - - /// Idle but cannot be purged. - ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE, - - /// Can be purged, but is not idle (mostly for debugging). - ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE, - - /// Busy (i.e., cannot be recycled or purged). - ACE_RECYCLABLE_BUSY, - - /// Closed. - ACE_RECYCLABLE_CLOSED, - - /// Unknown state. - ACE_RECYCLABLE_UNKNOWN -}; - -/** - * @class ACE_Recyclable - * - * @brief - * - * - */ -class ACE_Export ACE_Recyclable -{ -public: - /// Destructor. - virtual ~ACE_Recyclable (void); - - /// Get the recyclable bit - ACE_Recyclable_State recycle_state (void) const; - - /// Set the recyclable bit - void recycle_state (ACE_Recyclable_State new_state); - -protected: - /// Protected constructor. - ACE_Recyclable (ACE_Recyclable_State initial_state); - - /// Our state. - ACE_Recyclable_State recycle_state_; -}; - - -#if defined (__ACE_INLINE__) -#include "ace/Recyclable.inl" -#endif /* __ACE_INLINE __ */ - -#include "ace/post.h" -#endif /*ACE_RECYCLABLE_STATE_H*/ diff --git a/ace/Recyclable.inl b/ace/Recyclable.inl deleted file mode 100644 index c9a4318b2dc..00000000000 --- a/ace/Recyclable.inl +++ /dev/null @@ -1,19 +0,0 @@ -/* -*- C++ -*- */ -//$Id$ - - - -ACE_INLINE ACE_Recyclable_State -ACE_Recyclable::recycle_state (void) const -{ - return this->recycle_state_; -} - -ACE_INLINE void -ACE_Recyclable::recycle_state (ACE_Recyclable_State new_state) -{ - if (this->recycle_state_ == ACE_RECYCLABLE_CLOSED) - return; - - this->recycle_state_ = new_state; -} diff --git a/ace/Refcountable.cpp b/ace/Refcountable.cpp deleted file mode 100644 index 19c95cb990a..00000000000 --- a/ace/Refcountable.cpp +++ /dev/null @@ -1,8 +0,0 @@ -//$Id$ -#include "ace/Refcountable.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Refcountable.inl" -#endif /* __ACE_INLINE __ */ - -ACE_RCSID(ace, Refcountable, "$Id$") diff --git a/ace/Refcountable.h b/ace/Refcountable.h deleted file mode 100644 index 1e622876887..00000000000 --- a/ace/Refcountable.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Refcountable.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= -#ifndef ACE_REFCOUNTABLE_H -#define ACE_REFCOUNTABLE_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -/** - * @class ACE_Refcountable - * - * @brief - * - * - */ -class ACE_Export ACE_Refcountable -{ -public: - /// Destructor. - virtual ~ACE_Refcountable (void); - - // = Increment/Decrement refcount - int increment (void); - int decrement (void); - - /// Returns the current refcount. - int refcount (void) const; - -protected: - /// Protected constructor. - ACE_Refcountable (int refcount); - - /// Current refcount. - int refcount_; -}; - - -#if defined (__ACE_INLINE__) -#include "ace/Refcountable.inl" -#endif /* __ACE_INLINE __ */ - -#include "ace/post.h" -#endif /*ACE_REFCOUNTABLE_H*/ diff --git a/ace/Refcountable.inl b/ace/Refcountable.inl deleted file mode 100644 index e36d0992705..00000000000 --- a/ace/Refcountable.inl +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- C++ -*- */ -//$Id$ -ACE_INLINE -ACE_Refcountable::ACE_Refcountable (int refcount) - : refcount_ (refcount) -{ -} - -ACE_INLINE -ACE_Refcountable::~ACE_Refcountable (void) -{ -} - -ACE_INLINE int -ACE_Refcountable::increment (void) -{ - return ++this->refcount_; -} - -ACE_INLINE int -ACE_Refcountable::decrement (void) -{ - return --this->refcount_; -} - -ACE_INLINE int -ACE_Refcountable::refcount (void) const -{ - return this->refcount_; -} diff --git a/ace/Refcounted_Auto_Ptr.h b/ace/Refcounted_Auto_Ptr.h deleted file mode 100644 index 8ab5afd2535..00000000000 --- a/ace/Refcounted_Auto_Ptr.h +++ /dev/null @@ -1,193 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Refcounted_Auto_Ptr.h - * - * $Id$ - * - * @author John Tucker - */ -//============================================================================= - -#ifndef ACE_REFCOUNTED_AUTO_PTR_H -#define ACE_REFCOUNTED_AUTO_PTR_H -#include "ace/pre.h" - -#include "ace/OS.h" -#include "ace/Auto_Ptr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward decl. -template class ACE_Refcounted_Auto_Ptr_Rep; -template class ACE_Refcounted_Auto_Ptr; - -/** - * @class ACE_Refcounted_Auto_Ptr - * - * @brief This class implements support for a reference counted auto_ptr. - * Assigning or copying instances of an ACE_Refcounted_Auto_Ptr - * will automatically increment the reference count. When the last - * instance that references a ACE_Refcounted_Auto_Ptr instance is - * destroyed or overwritten, it will invoke delete on its underlying - * pointer. - */ -template -class ACE_Refcounted_Auto_Ptr -{ -public: - - // = Initialization and termination methods. - - /// Constructor that initializes an @c ACE_Refcounted_Auto_Ptr to - /// point to the result immediately. - ACE_Refcounted_Auto_Ptr (X *p = 0); - - /// Copy constructor binds the created object and @c r to the same - /// @c ACE_Refcounted_Auto_Ptr_Rep. An @c ACE_Refcounted_Auto_Ptr_Rep - /// is created if necessary. - ACE_Refcounted_Auto_Ptr (const ACE_Refcounted_Auto_Ptr &r); - - /// Destructor. - virtual ~ACE_Refcounted_Auto_Ptr (void); - - /// Assignment operator that binds the current object and @c r to the same - /// @c ACE_Refcounted_Auto_Ptr_Rep. An @c ACE_Refcounted_Auto_Ptr_Rep - /// is created if necessary. - void operator = (const ACE_Refcounted_Auto_Ptr &r); - - /// Equality operator that returns 1 if both - /// ACE_Refcounted_Auto_Ptr objects point to the same - /// ACE_Refcounted_Auto_Ptr_Rep object. Attention: It - /// also returns 1 if both objects have just been instantiated and - /// not used yet. - int operator == (const ACE_Refcounted_Auto_Ptr &r) const; - - /// Inequality operator, which is the opposite of equality. - int operator != (const ACE_Refcounted_Auto_Ptr &r) const; - - /// Redirection operator - X *operator-> (void) const; - - // = Accessor methods. - - X &operator *() const; - - /// Sets the pointer value to 0 and returns its old value. - X *release (void); - - /// Invokes delete on the previous pointer value and then sets the - /// pointer value to the specified value. - void reset (X *p = 0); - - /// Get the pointer value. - X *get (void) const; - - /// Get the reference count value. - int count (void) const; - - // = Utility method. - - /// Allows us to check for NULL on all ACE_Refcounted_Auto_Ptr objects. - int null (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// the ACE_Refcounted_Auto_Ptr_Rep - typedef ACE_Refcounted_Auto_Ptr_Rep AUTO_REFCOUNTED_PTR_REP; - - /// Protect operations on the . - AUTO_REFCOUNTED_PTR_REP *rep_; -}; - -/** - * @class ACE_Refcounted_Auto_Ptr_Rep - * - * @brief An ACE_Refcounted_Auto_Ptr_Rep object - * encapsulates a pointer to an object of type X. It is pointed to by - * ACE_Refcounted_Auto_Ptr object[s] and only accessible - * through them. - */ -template -class ACE_Refcounted_Auto_Ptr_Rep -{ -private: - friend class ACE_Refcounted_Auto_Ptr; - - /// Sets the pointer value to 0 and returns its old value. - X *release (void); - - /// Invokes delete on the previous pointer value and then - /// sets the pointer value to the specified value. - void reset (X *p = 0); - - /// Get the pointer value. - X *get (void) const; - - /// Get the reference count value. - int count (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - // = Encapsulate reference count and object lifetime of instances. - // These methods must go after the others to work around a bug with - // Borland's C++ Builder... - - /// Allocate a new ACE_Refcounted_Auto_Ptr_Rep instance, - /// returning NULL if it cannot be created. - static ACE_Refcounted_Auto_Ptr_Rep *internal_create (X *p); - - /// Create a ACE_Refcounted_Auto_Ptr_Rep and initialize - /// the reference count. - static ACE_Refcounted_Auto_Ptr_Rep *create (X *p); - - /// Increase the reference count and return argument. Uses the - /// attribute "ace_lock_" to synchronize reference count updating. - /// - /// Precondition (rep != 0). - static ACE_Refcounted_Auto_Ptr_Rep *attach (ACE_Refcounted_Auto_Ptr_Rep *&rep); - - /// Decreases the reference count and and deletes rep if there are no - /// more references to rep. - /// - /// Precondition (rep != 0) - static void detach (ACE_Refcounted_Auto_Ptr_Rep *&rep); - - /// Decreases the rep's reference count and and deletes rep if there - /// are no more references to rep. Then assigns new_rep to rep. - /// - /// Precondition (rep != 0 && new_rep != 0) - static void assign (ACE_Refcounted_Auto_Ptr_Rep *&rep, - ACE_Refcounted_Auto_Ptr_Rep *new_rep); - - /// Pointer to the result. - ACE_Auto_Basic_Ptr ptr_; - - /// Reference count. - int ref_count_; - - // = Mutex variable to protect the . - - /// Synchronization variable for the MT_SAFE . - ACE_LOCK lock_; - -private: - /// Allows us to check for NULL on all ACE_Refcounted_Auto_Ptr objects. - int null (void) const; - - // = Constructor and destructor private. - ACE_Refcounted_Auto_Ptr_Rep (X *p = 0); - ~ACE_Refcounted_Auto_Ptr_Rep (void); -}; - -#include "ace/Refcounted_Auto_Ptr.i" - -#include "ace/post.h" -#endif /* ACE_REFCOUNTED_AUTO_PTR_H */ - diff --git a/ace/Refcounted_Auto_Ptr.i b/ace/Refcounted_Auto_Ptr.i deleted file mode 100644 index 412659688f0..00000000000 --- a/ace/Refcounted_Auto_Ptr.i +++ /dev/null @@ -1,223 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Refcounted_Auto_Ptr.i - -#include "Synch_T.h" -#include "ace/Log_Msg.h" - -template inline int -ACE_Refcounted_Auto_Ptr_Rep::count (void) const -{ - ACE_GUARD_RETURN (ACE_LOCK, guard, ACE_const_cast (ACE_LOCK &, this->lock_), 0); - return this->ref_count_; -} - -template inline int -ACE_Refcounted_Auto_Ptr::count (void) const -{ - return this->rep_->count (); -} - -template inline int -ACE_Refcounted_Auto_Ptr_Rep::null (void) const -{ - ACE_GUARD_RETURN (ACE_LOCK, guard, - ACE_const_cast (ACE_LOCK&, this->lock_), 0); - - return this->ptr_.get() == 0; -} - -template inline int -ACE_Refcounted_Auto_Ptr::null (void) const -{ - return this->rep_->null (); -} - -template inline ACE_Refcounted_Auto_Ptr_Rep * -ACE_Refcounted_Auto_Ptr_Rep::internal_create (X *p) -{ - ACE_Refcounted_Auto_Ptr_Rep *temp = 0; - ACE_NEW_RETURN (temp, - (ACE_Refcounted_Auto_Ptr_Rep) (p), - 0); - return temp; -} - -template inline ACE_Refcounted_Auto_Ptr_Rep * -ACE_Refcounted_Auto_Ptr_Rep::create (X *p) -{ - // Yes set ref count to zero. - ACE_Refcounted_Auto_Ptr_Rep *temp = internal_create (p); -#if defined (ACE_NEW_THROWS_EXCEPTIONS) - if (temp == 0) - ACE_throw_bad_alloc; -#else - ACE_ASSERT (temp != 0); -#endif /* ACE_NEW_THROWS_EXCEPTIONS */ - return temp; -} - -template inline ACE_Refcounted_Auto_Ptr_Rep * -ACE_Refcounted_Auto_Ptr_Rep::attach (ACE_Refcounted_Auto_Ptr_Rep*& rep) -{ - ACE_ASSERT (rep != 0); - - ACE_GUARD_RETURN (ACE_LOCK, guard, rep->lock_, rep); - - ++rep->ref_count_; - - return rep; -} - -template inline void -ACE_Refcounted_Auto_Ptr_Rep::detach (ACE_Refcounted_Auto_Ptr_Rep*& rep) -{ - ACE_ASSERT (rep != 0); - ACE_Refcounted_Auto_Ptr_Rep *rep_del = 0; - - { - ACE_GUARD (ACE_LOCK, guard, rep->lock_); - - if (rep->ref_count_-- == 0) - // Since rep contains the lock held by the ACE_Guard, the guard - // needs to be released before freeing the memory holding the - // lock. So save the pointer to free, then release, then free. - rep_del = rep; - } // Release the lock - if (0 != rep_del) - delete rep; -} - -template inline void -ACE_Refcounted_Auto_Ptr_Rep::assign (ACE_Refcounted_Auto_Ptr_Rep*& rep, - ACE_Refcounted_Auto_Ptr_Rep* new_rep) -{ - ACE_ASSERT (rep != 0); - ACE_ASSERT (new_rep != 0); - - ACE_Refcounted_Auto_Ptr_Rep *old = 0; - { - // detached old last for exception safety - ACE_GUARD (ACE_LOCK, guard, rep->lock_); - old = rep; - rep = new_rep; - - if (old->ref_count_-- > 0) - return; - - } // The lock is released before deleting old rep object below. - - delete old; -} - -template inline -ACE_Refcounted_Auto_Ptr_Rep::ACE_Refcounted_Auto_Ptr_Rep (X *p) - : ptr_ (p), - ref_count_ (0) -{ -} - -template inline -ACE_Refcounted_Auto_Ptr_Rep::~ACE_Refcounted_Auto_Ptr_Rep (void) -{ -} - -template inline X * -ACE_Refcounted_Auto_Ptr_Rep::release (void) -{ - ACE_GUARD_RETURN (ACE_LOCK, guard, this->lock_, 0); - - return this->ptr_.release (); -} - -template inline void -ACE_Refcounted_Auto_Ptr_Rep::reset (X *p) -{ - ACE_GUARD (ACE_LOCK, guard, this->lock_); - - this->ptr_.reset (p); -} - -template inline X * -ACE_Refcounted_Auto_Ptr_Rep::get (void) const -{ - ACE_GUARD_RETURN (ACE_LOCK, guard, ACE_const_cast (ACE_LOCK &, this->lock_), 0); - - return this->ptr_.get (); -} - -template inline -ACE_Refcounted_Auto_Ptr::ACE_Refcounted_Auto_Ptr (X *p) - : rep_ (AUTO_REFCOUNTED_PTR_REP::create (p)) -{ -} - -template inline -ACE_Refcounted_Auto_Ptr::ACE_Refcounted_Auto_Ptr (const ACE_Refcounted_Auto_Ptr &r) - : rep_ (AUTO_REFCOUNTED_PTR_REP::attach (((ACE_Refcounted_Auto_Ptr &) r).rep_)) -{ -} - -template inline -ACE_Refcounted_Auto_Ptr::~ACE_Refcounted_Auto_Ptr (void) -{ - AUTO_REFCOUNTED_PTR_REP::detach (rep_); -} - -template inline int -ACE_Refcounted_Auto_Ptr::operator== (const ACE_Refcounted_Auto_Ptr &r) const -{ - return r.rep_ == this->rep_; -} - -template inline int -ACE_Refcounted_Auto_Ptr::operator!= (const ACE_Refcounted_Auto_Ptr &r) const -{ - return r.rep_ != this->rep_; -} - -template inline X * -ACE_Refcounted_Auto_Ptr::operator-> (void) const -{ - return this->rep_->get(); -} - -template inline X & -ACE_Refcounted_Auto_Ptr::operator *() const -{ - return *this->rep_->get (); -} - -template inline X* -ACE_Refcounted_Auto_Ptr::get (void) const -{ - // We return the ACE_Future_rep. - return this->rep_->get (); -} - -template inline X * -ACE_Refcounted_Auto_Ptr::release (void) -{ - return this->rep_->release (); -} - -template inline void -ACE_Refcounted_Auto_Ptr::reset (X *p) -{ - this->rep_->reset (p); -} - -template inline void -ACE_Refcounted_Auto_Ptr::operator = (const ACE_Refcounted_Auto_Ptr &rhs) -{ - // assignment: - // - // bind to the same as . - - // This will work if &r == this, by first increasing the ref count - ACE_Refcounted_Auto_Ptr &r = (ACE_Refcounted_Auto_Ptr &) rhs; - AUTO_REFCOUNTED_PTR_REP::assign (this->rep_, - AUTO_REFCOUNTED_PTR_REP::attach (r.rep_)); -} - diff --git a/ace/Registry.cpp b/ace/Registry.cpp deleted file mode 100644 index e09443e075c..00000000000 --- a/ace/Registry.cpp +++ /dev/null @@ -1,1147 +0,0 @@ -// $Id$ - -#include "ace/Registry.h" - -ACE_RCSID(ace, Registry, "$Id$") - -#if defined (ACE_WIN32) - -// Funky macro to deal with strange error passing semantics -// of Win32 Reg*() functions -#define ACE_REGISTRY_CALL_RETURN(X) \ - do { \ - if (X != ERROR_SUCCESS) \ - { \ - errno = X; \ - return -1; \ - } \ - else \ - return 0; \ - } while (0) - - -// Separator for components in a name -/* static */ -const ACE_TCHAR *ACE_Registry::STRING_SEPARATOR = ACE_LIB_TEXT ("\\"); - -int -ACE_Registry::Name_Component::operator== (const Name_Component &rhs) const -{ - return - rhs.id_ == this->id_ && - rhs.kind_ == this->kind_; -} - -int -ACE_Registry::Name_Component::operator!= (const Name_Component &rhs) const -{ - return !this->operator== (rhs); -} - -// Simple binding constructor -ACE_Registry::Binding::Binding () - : name_ (), - type_ (INVALID) -{ -} - - -// Binding constructor -// (Name version) -ACE_Registry::Binding::Binding (const Name &name, - Binding_Type type) - : name_ (ACE_Registry::make_string (name)), - type_ (type) -{ -} - - -// Binding constructor -// (String version) -ACE_Registry::Binding::Binding (const ACE_TString &name, - Binding_Type type) - : name_ (name), - type_ (type) -{ -} - - -int -ACE_Registry::Binding::operator== (const Binding &rhs) const -{ - return - rhs.name_ == this->name_ && - rhs.type_ == this->type_; -} - -int -ACE_Registry::Binding::operator!= (const Binding &rhs) const -{ - return !this->operator== (rhs); -} - -// Name accessor -// (Name version) -void -ACE_Registry::Binding::name (Name &name) -{ - name = ACE_Registry::make_name (this->name_); -} - - -// Name accessors -// (String version) -void -ACE_Registry::Binding::name (ACE_TString &name) -{ - name = this->name_; -} - - -// Name accessors -// (String version) -ACE_TString -ACE_Registry::Binding::name (void) -{ - return this->name_; -} - - -// Type accessor -ACE_Registry::Binding_Type -ACE_Registry::Binding::type (void) -{ - return this->type_; -} - - -// Simple object constructor -ACE_Registry::Object::Object (void *data, - u_long size, - u_long type) - : data_ (data), - size_ (size), - type_ (type) -{ -} - -// Object accessors and set methods -void -ACE_Registry::Object::data (void *data) -{ - this->data_ = data; -} - - -void * -ACE_Registry::Object::data (void) const -{ - return this->data_; -} - - -void -ACE_Registry::Object::size (u_long size) -{ - this->size_ = size; -} - - -u_long -ACE_Registry::Object::size (void) const -{ - return this->size_; -} - - -void -ACE_Registry::Object::type (u_long type) -{ - this->type_ = type; -} - - -u_long -ACE_Registry::Object::type (void) const -{ - return this->type_; -} - - -// Simple context constructor -ACE_Registry::Naming_Context::Naming_Context (void) - : key_ ((HKEY) 0), - parent_key_ ((HKEY) 0), - name_ () -{ -} - - -// Context constructor -ACE_Registry::Naming_Context::Naming_Context (const HKEY &key) - : key_ (key), - parent_key_ ((HKEY) 0), - name_ () -{ -} - - -ACE_Registry::Naming_Context::Naming_Context (const Naming_Context &rhs) - : key_ (rhs.key_), - parent_key_ (rhs.parent_key_), - name_ (rhs.name_) -{ - // This is incorrect. - // Rather than copying key, we should call ::DuplicateHandle() - // But since this is private (and not used), I don't care much -} - - -const ACE_Registry::Naming_Context & -ACE_Registry::Naming_Context::operator= (const Naming_Context &rhs) -{ - ACE_UNUSED_ARG(rhs); - - // Not implemented - return *this; -} - - -// Destructor -ACE_Registry::Naming_Context::~Naming_Context () -{ - this->close (); -} - - -// Insert with into context -// (Name version) -int -ACE_Registry::Naming_Context::bind_new (const Name &name, - const Object &object) -{ - return this->bind_new (ACE_Registry::make_string (name), object); -} - - -// Insert with into context -// (String version) -int -ACE_Registry::Naming_Context::bind_new (const ACE_TString &name, - const Object &object) -{ - // temporary object - Object temp; - long result = this->resolve (name, temp); - if (result == 0) - // resolve succeeded - result = -1; - else - // resolve failed - result = this->bind (name, object); - return result; -} - - -// Insert or update with into context -// (Name version) -int -ACE_Registry::Naming_Context::bind (const Name &name, - const Object &object) -{ - return this->bind (ACE_Registry::make_string (name), object); -} - - -// Insert or update with into context -// (String version) -int -ACE_Registry::Naming_Context::bind (const ACE_TString &name, - const Object &object) -{ - long result = ACE_TEXT_RegSetValueEx (this->key_, - name.c_str (), - 0, - object.type (), - (const BYTE *) object.data (), - object.size ()); - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Update with in context -// (Name version) -int -ACE_Registry::Naming_Context::rebind (const Name &name, - const Object &new_object) -{ - return this->rebind (ACE_Registry::make_string (name), new_object); -} - - -// Update with in context -// (String version) -int -ACE_Registry::Naming_Context::rebind (const ACE_TString &name, - const Object &new_object) -{ - Object old_object; - // find the old one first - long result = this->resolve (name, old_object); - if (result == 0) - // no need to delete first - result = this->bind (name, new_object); - return result; -} - - -// Find with in context -// (Name version) -int -ACE_Registry::Naming_Context::resolve (const Name &name, - Object &object) -{ - return this->resolve (ACE_Registry::make_string (name), object); -} - - -// Find with in context -// (String version) -int -ACE_Registry::Naming_Context::resolve (const ACE_TString &name, - Object &object) -{ - // Get object state - u_long type; - void *data = object.data (); - u_long size = object.size (); - - long result = ACE_TEXT_RegQueryValueEx (this->key_, - name.c_str (), - 0, - &type, - (BYTE *)data, - &size); - if (result == ERROR_SUCCESS) - { - // Reset object state - // No need to set object.data() - object.type (type); - object.size (size); - } - - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Remove object with in context -// (Name version) -int -ACE_Registry::Naming_Context::unbind (const Name &name) -{ - return this->unbind (ACE_Registry::make_string (name)); -} - - -// Remove object with in context -// (String version) -int -ACE_Registry::Naming_Context::unbind (const ACE_TString &name) -{ - long result = ACE_TEXT_RegDeleteValue (this->key_, - name.c_str ()); - - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Create new relative to context -// This method may not mean a lot in this implementation -int -ACE_Registry::Naming_Context::new_context (Naming_Context &naming_context) -{ - // Make sure that we reset the state and close keys - return naming_context.close (); -} - - -// Insert with relative to context -// (Name version) -int -ACE_Registry::Naming_Context::bind_new_context (const Name &name, - Naming_Context &naming_context, - u_long persistence, - u_long security_access, - LPSECURITY_ATTRIBUTES security_attributes) -{ - return this->bind_new_context (ACE_Registry::make_string (name), - naming_context, - persistence, - security_access, - security_attributes); -} - - -// Insert with relative to context -// (String version) -int -ACE_Registry::Naming_Context::bind_new_context (const ACE_TString &name, - Naming_Context &naming_context, - u_long persistence, - u_long security_access, - LPSECURITY_ATTRIBUTES security_attributes) -{ - u_long reason; - - long result = ACE_TEXT_RegCreateKeyEx (this->key_, - name.c_str (), - 0, - 0, - persistence, - security_access, - security_attributes, - &naming_context.key_, - &reason); - if (result == ERROR_SUCCESS) - // If create succeeds - { - if (reason == REG_CREATED_NEW_KEY) - // If new key: success - { - // Set the correct parent - naming_context.parent (this->key_); - // Set the correct name - naming_context.name (name); - } - else - // reason == REG_OPENED_EXISTING_KEY - // Failed to make new key - { - // reset result to failure - result = -1; - // Close the key first - ::RegCloseKey (naming_context.key_); - // Reset key - naming_context.key_ = (HKEY) 0; - } - } - - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Insert or update with relative to context -// (Name version) -int -ACE_Registry::Naming_Context::bind_context (const Name &name, - /* const */ Naming_Context &naming_context, - u_long persistence, - u_long security_access, - LPSECURITY_ATTRIBUTES security_attributes) -{ - return this->bind_context (ACE_Registry::make_string (name), - naming_context, - persistence, - security_access, - security_attributes); -} - - -// Insert or update with relative to context -// (String version) -int -ACE_Registry::Naming_Context::bind_context (const ACE_TString &name, - /* const */ Naming_Context &naming_context, - u_long persistence, - u_long security_access, - LPSECURITY_ATTRIBUTES security_attributes) -{ - u_long reason; - - long result = ACE_TEXT_RegCreateKeyEx (this->key_, - name.c_str (), - 0, - 0, - persistence, - security_access, - security_attributes, - &naming_context.key_, - &reason); - if (result == ERROR_SUCCESS) - { - // Set the correct parent - naming_context.parent (this->key_); - // Set the correct name - naming_context.name (name); - } - - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Rename to -// (Name version) -int -ACE_Registry::Naming_Context::rebind_context (const Name &name, - /* const */ Naming_Context &new_naming_context) -{ - return this->rebind_context (ACE_Registry::make_string (name), - new_naming_context); -} - - -// Rename to -// (String version) -int -ACE_Registry::Naming_Context::rebind_context (const ACE_TString &name, - /* const */ Naming_Context &new_naming_context) -{ - Naming_Context old_naming_context; - // find the old one first - long result = this->resolve_context (name, - old_naming_context); - if (result == 0) - { - // naming_context is found: delete entry - result = this->unbind_context (name); - if (result == 0) - { - // successful deletion; rebind - // beware of race conditions here - // (lets resolve this later) - result = this->bind_new_context (name, new_naming_context); - } - } - return result; -} - - -// Remove naming_context with from context -// (Name version) -int -ACE_Registry::Naming_Context::unbind_context (const Name &name) -{ - return this->unbind_context (ACE_Registry::make_string (name)); -} - - -// Remove naming_context with from context -// (String version) -int -ACE_Registry::Naming_Context::unbind_context (const ACE_TString &name) -{ - long result = ACE_TEXT_RegDeleteKey (this->key_, - name.c_str ()); - - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Find with in context -// (Name version) -int -ACE_Registry::Naming_Context::resolve_context (const Name &name, - Naming_Context &naming_context, - u_long security_access) -{ - return this->resolve_context (ACE_Registry::make_string (name), - naming_context, - security_access); -} - - -// Find with in context -// (String version) -int -ACE_Registry::Naming_Context::resolve_context (const ACE_TString &name, - Naming_Context &naming_context, - u_long security_access) -{ - long result = ACE_TEXT_RegOpenKeyEx (this->key_, - name.c_str (), - 0, - security_access, - &naming_context.key_); - if (result == ERROR_SUCCESS) - { - // set the correct parent - naming_context.parent (this->key_); - // set the correct name - naming_context.name (name); - } - - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Same as unbind_context() with as naming_context -int -ACE_Registry::Naming_Context::destroy (void) -{ - // hopefully the parent_key_ is still open - long result = ACE_TEXT_RegDeleteKey (this->parent_key_, - this->name_.c_str ()); - - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Sync content of context to disk -int -ACE_Registry::Naming_Context::flush (void) -{ - long result = ::RegFlushKey (this->key_); - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Close the handle of the context -int -ACE_Registry::Naming_Context::close (void) -{ - long result = this->key_ ? ::RegCloseKey (this->key_) : ERROR_SUCCESS; - ACE_REGISTRY_CALL_RETURN (result); -} - - -// Convert a to a -ACE_TString -ACE_Registry::make_string (const Name &const_name) -{ - ACE_TString string; - Name &name = ACE_const_cast (Name &, const_name); - - // Iterator through the components of name - for (Name::iterator iterator = name.begin (); - iterator != name.end (); - iterator++) - { - if (iterator != name.begin ()) - // If this is not the first component, we will add separators - string += ACE_Registry::STRING_SEPARATOR; - const Name_Component &component = *iterator; - // Add to string - string += component.id_; - } - - return string; -} - - -// Convert a to a -ACE_Registry::Name -ACE_Registry::make_name (const ACE_TString &string) -{ - ssize_t new_position = 0; - ssize_t last_position = 0; - Name name; - - // Rememeber: NPOS is -1 - while (new_position != ACE_TString::npos) - { - Name_Component component; - // Find the separator - new_position = string.find (ACE_Registry::STRING_SEPARATOR, new_position); - if (new_position != ACE_TString::npos) - // If we have not gone past the end - { - // Get the substring - component.id_ = string.substr (last_position, - new_position - last_position); - // Skip past the seperator - new_position += - ACE_OS_String::strlen (ACE_Registry::STRING_SEPARATOR); - } - else - { - // Get the last substring - component.id_ = string.substr (last_position); - } - // Update positions - last_position = new_position; - // Insert component into name - name.insert (component); - } - - return name; -} - - -// Set key -void -ACE_Registry::Naming_Context::key (HKEY key) -{ - this->key_ = key; -} - - -// Get key -HKEY -ACE_Registry::Naming_Context::key (void) -{ - return this->key_; -} - - -// Set parent -void -ACE_Registry::Naming_Context::parent (HKEY parent) -{ - this->parent_key_ = parent; -} - - -// Get parent -HKEY -ACE_Registry::Naming_Context::parent (void) -{ - return this->parent_key_; -} - - -// Set name -// (Name version) -void -ACE_Registry::Naming_Context::name (const Name &name) -{ - this->name_ = ACE_Registry::make_string (name); -} - - -// Get name -// (Name version) -void -ACE_Registry::Naming_Context::name (Name &name) -{ - name = ACE_Registry::make_name (this->name_); -} - - -// Set name -// (String version) -void -ACE_Registry::Naming_Context::name (const ACE_TString &name) -{ - this->name_ = name; -} - - -// Get name -// (String version) -ACE_TString -ACE_Registry::Naming_Context::name (void) -{ - return this->name_; -} - - -// Get name -// (String version) -void -ACE_Registry::Naming_Context::name (ACE_TString &name) -{ - name = this->name_; -} - - -// listing function: iterator creator -// This is useful when there are many objects and contexts -// in context and you only want to look at a few entries -// at a time -int -ACE_Registry::Naming_Context::list (u_long how_many, - Binding_List &list, - Binding_Iterator &iter) -{ - // Empty list - static const ACE_Registry::Binding_List empty_list; - // Make sure that the list is empty - list = empty_list; - - // Correctly initalize the iterator - iter.reset (); - - // Make sure that the iterator uses naming context - iter.naming_context (*this); - - // Start iterations from the objects - iter.current_enumeration (iter.object_iteration_); - - // Get the next values - long result = iter.next_n (how_many, - list); - return result; -} - - -// listing function: iterator creator -// This gives back a listing of all entries in context. -int -ACE_Registry::Naming_Context::list (Binding_List &list) -{ - // Empty list - static const ACE_Registry::Binding_List empty_list; - // Make sure that the list is empty - list = empty_list; - - // Create an iterator - ACE_Registry::Binding_Iterator iterator; - - // Make sure that the iterator uses naming context - iterator.naming_context (*this); - - // Start iterations from the objects - iterator.current_enumeration (iterator.object_iteration_); - - long result = 0; - while (1) - { - ACE_Registry::Binding binding; - result = iterator.next_one (binding); - if (result == 0) - list.insert (binding); - else - break; - } - return 0; -} - - -// Default constructor -ACE_Registry::Binding_Iterator::Binding_Iterator () - : object_iteration_ (*this), - context_iteration_ (*this), - iteration_complete_ (*this) -{ - this->reset (); -} - - -void -ACE_Registry::Binding_Iterator::reset () -{ - this->current_enumeration_ = &this->iteration_complete_; - this->iteration_complete_.reset (); - this->object_iteration_.reset (); - this->context_iteration_.reset (); -} - - -void -ACE_Registry::Binding_Iterator::Iteration_State::reset () -{ - this->index_ = 0; -} - - -ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State (Binding_Iterator &iter) - : parent_ (&iter), - index_ (0) -{ -} - - -ACE_Registry::Binding_Iterator::Object_Iteration::Object_Iteration (Binding_Iterator &iter) - : Iteration_State (iter) -{ -} - - -ACE_Registry::Binding_Iterator::Context_Iteration::Context_Iteration (Binding_Iterator &iter) - : Iteration_State (iter) -{ -} - - -ACE_Registry::Binding_Iterator::Iteration_Complete::Iteration_Complete (Binding_Iterator &iter) - : Iteration_State (iter) -{ -} - - -// Next entry -int -ACE_Registry::Binding_Iterator::next_one (Binding &binding) -{ - u_long how_many = 1; - Binding_List list; - - // Get next n (where n is one) - long result = this->next_n (how_many, list); - - if (result == 0) - // Success - binding = (*list.begin ()); - - return result; -} - - -// Next entries -int -ACE_Registry::Binding_Iterator::next_n (u_long how_many, - Binding_List &list) -{ - // Empty list - static const ACE_Registry::Binding_List empty_list; - // Make sure that the list is empty - list = empty_list; - - return this->current_enumeration_->next_n (how_many, list); -} - - -// Destroy iterator -int -ACE_Registry::Binding_Iterator::destroy (void) -{ - this->reset (); - return 0; -} - - -// Set/Get naming_context -void -ACE_Registry::Binding_Iterator::naming_context (Naming_Context &naming_context) -{ - this->naming_context_ = &naming_context; -} - - -ACE_Registry::Naming_Context & -ACE_Registry::Binding_Iterator::naming_context (void) -{ - return *this->naming_context_; -} - - -// Set/Get current enumeration -void -ACE_Registry::Binding_Iterator::current_enumeration (Iteration_State ¤t_enumeration) -{ - this->current_enumeration_ = ¤t_enumeration; -} - - -ACE_Registry::Binding_Iterator::Iteration_State & -ACE_Registry::Binding_Iterator::current_enumeration (void) -{ - return *this->current_enumeration_; -} - - -int -ACE_Registry::Binding_Iterator::Object_Iteration::next_n (u_long how_many, - Binding_List &list) -{ - // Make a copy - u_long requested = how_many; - - // While there are more entries to be added to the list - while (how_many > 0) - { - ACE_TCHAR string [ACE_Registry::Naming_Context::MAX_OBJECT_NAME_SIZE]; - u_long size = sizeof string / sizeof (ACE_TCHAR); - long result = ACE_TEXT_RegEnumValue (this->parent_->naming_context ().key (), - this->index_, - string, - &size, - 0, - 0, - 0, - 0); - switch (result) - { - case ERROR_SUCCESS: - // Object found - { - // Readjust counters - this->index_++; - how_many--; - - // Add to list - // Create binding - Binding binding (string, OBJECT); - // Add to binding list - list.insert (binding); - } - // Continue to add to list - break; - - case ERROR_NO_MORE_ITEMS: - // Enumeration of objects complete - // Reset index - this->index_ = 0; - - // Current enumeration will become CONTEXTS - this->parent_->current_enumeration (this->parent_->context_iteration_); - result = this->parent_->current_enumeration ().next_n (how_many, - list); - // If we were able to add objects - if (requested != how_many) - return 0; - else - return result; - - default: - // Strange error - // Reset index - this->index_ = 0; - // Current enumeration will become COMPLETE - this->parent_->current_enumeration (this->parent_->iteration_complete_); - // strange error - return -1; - } - } - // If we reach here, all of pairs were added to the list - // Since more entries may be available - // current enumeration will remain OBJECTS - return 0; -} - - -int -ACE_Registry::Binding_Iterator::Context_Iteration::next_n (u_long how_many, - Binding_List &list) -{ - // Make a copy - u_long requested = how_many; - - // While there are more entries to be added to the list - while (how_many > 0) - { - ACE_TCHAR string [ACE_Registry::Naming_Context::MAX_CONTEXT_NAME_SIZE]; - u_long size = sizeof string / sizeof (ACE_TCHAR); - long result = ACE_TEXT_RegEnumKeyEx (this->parent_->naming_context (). key (), - this->index_, - string, - &size, - 0, - 0, - 0, - 0); - switch (result) - { - case ERROR_SUCCESS: - // Object found - { - // Readjust counters - this->index_++; - how_many--; - - // Add to list - // Create binding - Binding binding (string, CONTEXT); - // Add to binding list - list.insert (binding); - } - // Continue to add to list - break; - - case ERROR_NO_MORE_ITEMS: - // Enumeration of objects complete - - /* FALL THROUGH */ - - default: - // Strange error - - // Reset index - this->index_ = 0; - // Current enumeration will become CONTEXTS - this->parent_->current_enumeration (this->parent_->iteration_complete_); - - // If we were able to add contexts - if (requested != how_many) - return 0; - else - return -1; - } - } - // If we reach here, all of pairs were added to the list - // Since more entries may be available - // current enumeration will remain CONTEXTS - return 0; -} - - -int -ACE_Registry::Binding_Iterator::Iteration_Complete::next_n (u_long how_many, - Binding_List &list) -{ - ACE_UNUSED_ARG(list); - ACE_UNUSED_ARG(how_many); - - // No more values - return -1; -} - - -// Factory method to connect to predefined registries -// This method works for both remote and local machines -// However, for remote machines CLASSES_ROOT and CURRENT_USER -// types are not allowed -/* static */ -int -ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_context, - HKEY predefined, - const ACE_TCHAR *machine_name) -{ -#if defined (ACE_HAS_WINCE) - return -1; -#else - long result = -1; - - if (machine_name != 0 && ACE_OS::strcmp (ACE_LIB_TEXT ("localhost"), machine_name) == 0) - machine_name = 0; - - if (predefined == HKEY_LOCAL_MACHINE || predefined == HKEY_USERS) - result = ACE_TEXT_RegConnectRegistry (ACE_const_cast(ACE_TCHAR *, machine_name), - predefined, - &naming_context.key_); - if (predefined == HKEY_CURRENT_USER || predefined == HKEY_CLASSES_ROOT) - // Make sure that for these types, the machine is local - if (machine_name == 0 || - ACE_Predefined_Naming_Contexts::is_local_host (machine_name)) - { - naming_context.key_ = predefined; - result = 0; - } - else - result = -1; - - ACE_REGISTRY_CALL_RETURN (result); -#endif // ACE_HAS_WINCE -} - -// Check if is the local host -/* static */ -int -ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name) -{ - ACE_TCHAR local_host[MAXHOSTNAMELEN]; - int result = ACE_OS::hostname (local_host, sizeof local_host / sizeof (ACE_TCHAR)); - if (result == 0) - result = !ACE_OS::strcmp (local_host, machine_name); - else - result = 0; - return result; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node; -template class ACE_Unbounded_Set; -template class ACE_Unbounded_Set_Iterator; -template class ACE_Node; -template class ACE_Unbounded_Set; -template class ACE_Unbounded_Set_Iterator; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node -#pragma instantiate ACE_Unbounded_Set -#pragma instantiate ACE_Unbounded_Set_Iterator -#pragma instantiate ACE_Node -#pragma instantiate ACE_Unbounded_Set -#pragma instantiate ACE_Unbounded_Set_Iterator -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_WIN32 */ diff --git a/ace/Registry.h b/ace/Registry.h deleted file mode 100644 index 59a3c238b31..00000000000 --- a/ace/Registry.h +++ /dev/null @@ -1,568 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Registry.h - * - * $Id$ - * - * @author Irfan Pyarali (irfan@cs.wustl.edu) - */ -//============================================================================= - - -#ifndef ACE_REGISTRY_H -#define ACE_REGISTRY_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_WIN32) -// This only works on Win32 platforms - -#include "ace/Containers.h" -#include "ace/SString.h" - -/** - * @class ACE_Registry - * - * @brief A Name Server implementation - * - * The registry interface is inspired by the interface - * specified in the CORBA Naming Service Specification. - * The implementation is done through Win32 functions. - * Other than providing an OO wrapper for the Win32 - * functions, ACE_Registry provides an abstraction for iteration - * over the elements of the Registry. - */ -class ACE_Export ACE_Registry -{ -public: - - /// International string - struct ACE_Export Name_Component - { - ACE_TString id_; - ACE_TString kind_; - - int operator== (const Name_Component &rhs) const; - int operator!= (const Name_Component &rhs) const; - // Comparison - }; - // The field is used, - // but the field is currently ignored - - /// A Name is an ordered collections of components (ids) - typedef ACE_Unbounded_Set Name; - - /// Separator for components in a name - static const ACE_TCHAR *STRING_SEPARATOR; - - /// Convert a to a - static ACE_TString make_string (const Name &name); - - /// Convert a to a - static Name make_name (const ACE_TString &string); - - /// There are two types of bindings - enum Binding_Type {INVALID, OBJECT, CONTEXT}; - - struct ACE_Export Binding - { - /// Empty (default) constructor - Binding (void); - - /// Constructor - /// (Name version) - Binding (const Name &binding_name, - Binding_Type binding_type); - - /// Constructor - /// (String version) - Binding (const ACE_TString &binding_name, - Binding_Type binding_type); - - int operator== (const Binding &rhs) const; - int operator!= (const Binding &rhs) const; - // Comparison - - /// Name accessor - /// (Name version) - void name (Name &name); - - /// Set Name (String version) - void name (ACE_TString &name); - - /// Get Name (String version) - ACE_TString name (void); - - /// Type accessor - Binding_Type type (void); - - private: - /// A binding has a name - ACE_TString name_; - - /// .... and a type - Binding_Type type_; - }; - - // A list of bindings - typedef ACE_Unbounded_Set Binding_List; - - // Forward declaration of iterator - class Binding_Iterator; - - /** - * @class Object - * - * @brief An object representation - * - * In CORBA, all objects inherit from (CORBA::Object). - * For the registry, this is used as a wrapper for an - * instance of a built-in data type. - * Think about an object as being similar to a file - * in a file system. - */ - class ACE_Export Object - { - public: - /// Default constructor - Object (void *data = 0, - u_long size = 0, - u_long type = REG_NONE); - - /// Set data - void data (void *data); - - /// Get data - void *data (void) const; - - /// Set size - void size (u_long size); - - /// Get size - u_long size (void) const; - - /// Set type - void type (u_long type); - - /// Get type - u_long type (void) const; - - private: - /// Pointer to data - void *data_; - - /// Size of the data - u_long size_; - - /// Type of data - u_long type_; - }; - - /** - * @class Naming_Context - * - * @brief An context representation - * - * Think about a context as being similar to a directory - * in a file system. - */ - class ACE_Export Naming_Context - { - public: - /// Friend factory - friend class ACE_Predefined_Naming_Contexts; - - enum { - /// Max sizes of names - /// (Not too sure about this value) - MAX_OBJECT_NAME_SIZE = BUFSIZ, - - /// Max size of context name - MAX_CONTEXT_NAME_SIZE = MAXPATHLEN + 1 - }; - - /// Empty constructor: keys will be NULL - Naming_Context (void); - - /// Constructor: key_ will be set to - Naming_Context (const HKEY &key); - - /// Destructor will call . - ~Naming_Context (void); - - // The following interfaces are for objects - - /** - * Insert with into context - * This will fail if already exists - * (Name version) - */ - int bind_new (const Name &name, - const Object &object); - - /** - * Insert with into context - * This will fail if already exists - * (String version) - */ - int bind_new (const ACE_TString &name, - const Object &object); - - /** - * Insert or update with into context - * This will not fail if already exists - * (Name version) - */ - int bind (const Name &name, - const Object &object); - - /** - * Insert or update with into context - * This will not fail if already exists - * (String version) - */ - int bind (const ACE_TString &name, - const Object &object); - - /// Update with in context - /// (Name version) - int rebind (const Name &name, - const Object &object); - - /// Update with in context - int rebind (const ACE_TString &name, - const Object &object); - - /// Find with in context - /// (Name version) - int resolve (const Name &name, - Object &object); - - /// Find with in context - int resolve (const ACE_TString &name, - Object &object); - - /// Delete object with in context - /// (Name version) - int unbind (const Name &name); - - /// Delete object with in context - int unbind (const ACE_TString &name); - - - // The following interfaces are for Naming Context - - /// Create new - int new_context (Naming_Context &naming_context); - - /** - * Insert with relative to context - * This will fail if already exists - * (Name version) - */ - int bind_new_context (const Name &name, - Naming_Context &naming_context, - u_long persistence = REG_OPTION_NON_VOLATILE, - u_long security_access = KEY_ALL_ACCESS, - LPSECURITY_ATTRIBUTES security_attributes = 0); - - /// Insert with relative to context - /// This will fail if already exists - int bind_new_context (const ACE_TString &name, - Naming_Context &naming_context, - u_long persistence = REG_OPTION_NON_VOLATILE, - u_long security_access = KEY_ALL_ACCESS, - LPSECURITY_ATTRIBUTES security_attributes = 0); - - /** - * Insert or update with relative to context - * This will not fail if already exists - * (Name version) - */ - int bind_context (const Name &name, - /* const */ Naming_Context &naming_context, - u_long persistence = REG_OPTION_NON_VOLATILE, - u_long security_access = KEY_ALL_ACCESS, - LPSECURITY_ATTRIBUTES security_attributes = 0); - - /// Insert or update with relative to context - /// This will not fail if already exists - int bind_context (const ACE_TString &name, - /* const */ Naming_Context &naming_context, - u_long persistence = REG_OPTION_NON_VOLATILE, - u_long security_access = KEY_ALL_ACCESS, - LPSECURITY_ATTRIBUTES security_attributes = 0); - - /// Rename to - /// (Name version) - int rebind_context (const Name &name, - /* const */ Naming_Context &naming_context); - - /// Rename to - int rebind_context (const ACE_TString &name, - /* const */ Naming_Context &naming_context); - - /// Find with in context - /// (Name version) - int resolve_context (const Name &name, - Naming_Context &naming_context, - u_long security_access = KEY_ALL_ACCESS); - - /// Find with in context - int resolve_context (const ACE_TString &name, - Naming_Context &naming_context, - u_long security_access = KEY_ALL_ACCESS); - - /// Remove naming_context with from context - /// (Name version) - int unbind_context (const Name &name); - - /// Remove naming_context with from context - int unbind_context (const ACE_TString &name); - - /// Same as with as naming_context - int destroy (void); - - /** - * listing function: iterator creator - * This is useful when there are many objects and contexts - * in context and you only want to look at a few entries - * at a time - */ - int list (u_long how_many, - Binding_List &list, - Binding_Iterator &iterator); - - /// listing function: iterator creator - /// This gives back a listing of all entries in context. - int list (Binding_List &list); - - - // Some other necessary functions which are - // not part of the CORBA interface - - /// Sync content of context to disk - int flush (void); - - /// Close the handle of the context - /// Note: does not call - int close (void); - - - // Accessors - - /// Get key - HKEY key (void); - - // void parent (HKEY parent); - /// Get parent - HKEY parent (void); - - /// Get name - /// (Name version) - void name (Name &name); - - /// Set name (String version) - void name (ACE_TString &name); - - /// Get name (String version) - ACE_TString name (void); - - protected: - /// Set key - void key (HKEY key); - - /// Set parent - void parent (HKEY parent); - - /// Set name - /// (Name version) - void name (const Name &name); - - /// Set name - /// (String version) - void name (const ACE_TString &name); - - private: - /// Disallow copy constructors - Naming_Context (const Naming_Context &rhs); - - /// Disallow assignment - const Naming_Context &operator= (const Naming_Context &rhs); - - /// Key for self - HKEY key_; - - /// Key for parent - HKEY parent_key_; - - /// Name of self - ACE_TString name_; - }; - - /** - * @class Binding_Iterator - * - * @brief An iterator - * - * Useful when iteratorating over a few entries at a time - */ - class ACE_Export Binding_Iterator - { - public: - /// Friend factory - friend class Naming_Context; - - /// Default constructor - Binding_Iterator (void); - - /// Next entry - int next_one (Binding &binding); - - /// Next entries - int next_n (u_long how_many, - Binding_List &list); - - /// Cleanup - int destroy (void); - - /// Reset the internal state of the iterator - void reset (void); - - /// Get naming_context that the iterator is iterating over - Naming_Context &naming_context (void); - - private: - - /// Set naming_context that the iterator is iterating over - void naming_context (Naming_Context& naming_context); - - /// Reference to context - Naming_Context *naming_context_; - - public: - // This should really be private - // But the compiler is broken - - /** - * @class Iteration_State - * - * Base class for state - */ - class ACE_Export Iteration_State - { - public: - /// Constructor - Iteration_State (Binding_Iterator &iterator); - - /// Next entries - virtual int next_n (u_long how_many, - Binding_List &list) = 0; - - /// Reset state - void reset (void); - - protected: - /// Pointer to parent iterator - Binding_Iterator *parent_; - - u_long index_; - }; - - private: - class ACE_Export Object_Iteration : public Iteration_State - { - public: - Object_Iteration (Binding_Iterator &iterator); - - /// Next entries - int next_n (u_long how_many, - Binding_List &list); - }; - - class ACE_Export Context_Iteration : public Iteration_State - { - public: - Context_Iteration (Binding_Iterator &iterator); - - /// Next entries - int next_n (u_long how_many, - Binding_List &list); - }; - - class ACE_Export Iteration_Complete : public Iteration_State - { - public: - Iteration_Complete (Binding_Iterator &iterator); - - /// Next entries - int next_n (u_long how_many, - Binding_List &list); - }; - - /// Friend states - friend class Iteration_State; - friend class Object_Iteration; - friend class Context_Iteration; - friend class Iteration_Complete; - - /// Instances of all states - Object_Iteration object_iteration_; - Context_Iteration context_iteration_; - Iteration_Complete iteration_complete_; - - /// Pointer to current state - Iteration_State *current_enumeration_; - - /// Set current_enumeration - void current_enumeration (Iteration_State& current_enumeration); - - /// Get current_enumeration - Iteration_State ¤t_enumeration (void); - }; -}; - -/** - * @class ACE_Predefined_Naming_Contexts - * - * @brief A factory for predefined registries, which exist by default - * on Win32 platforms - * - * This factory can connect to both local and remote - * predefined registries. - */ -class ACE_Export ACE_Predefined_Naming_Contexts -{ -public: - /** - * Factory method for connecting to predefined registries. This - * method works for both remote and local machines. However, for - * remote machines, HKEY_CLASSES_ROOT and HKEY_CURRENT_USER types - * are not allowed - */ - static int connect (ACE_Registry::Naming_Context &naming_context, - HKEY predefined = HKEY_LOCAL_MACHINE, - const ACE_TCHAR *machine_name = 0); - -private: - /// Check if is the local host - static int is_local_host (const ACE_TCHAR *machine_name); -}; - -// Fix me! Shouldn't have to define this stuff - -#if defined (ACE_HAS_BROKEN_NESTED_TEMPLATES) - typedef ACE_Registry::Name_Component Name_Component; - typedef ACE_Registry::Binding Binding; -#endif /* ACE_HAS_BROKEN_NESTED_TEMPLATES */ - -#endif /* ACE_WIN32 */ -#include "ace/post.h" -#endif /* ACE_REGISTRY_H */ diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp deleted file mode 100644 index 98bf76cc2a2..00000000000 --- a/ace/Registry_Name_Space.cpp +++ /dev/null @@ -1,288 +0,0 @@ -// $Id$ - -#include "ace/Registry_Name_Space.h" - -ACE_RCSID(ace, Registry_Name_Space, "$Id$") - -#if (defined (ACE_WIN32) && defined (UNICODE)) -// This only works on Win32 platforms when UNICODE is turned on - -ACE_Registry_Name_Space::ACE_Registry_Name_Space (void) -{ -} - -ACE_Registry_Name_Space::ACE_Registry_Name_Space (ACE_Name_Options *name_options) -{ - if (this->open (name_options) != 0) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Registry_Name_Space::open"))); -} - - -ACE_Registry_Name_Space::~ACE_Registry_Name_Space (void) -{ -} - - -int -ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) -{ - const ACE_TCHAR *host = name_options->nameserver_host (); - ACE_Registry::Naming_Context predefined; - - int result = ACE_Predefined_Naming_Contexts::connect (predefined, - HKEY_LOCAL_MACHINE, - host); - if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Predefined_Naming_Context::connect")), - result); - else - { - // Directory - ACE_TString name = name_options->namespace_dir (); - // Separator - name += ACE_Registry::STRING_SEPARATOR; - // Filename - name += name_options->database (); - - // Create new context or bind to existing one - result = predefined.bind_context (name, - this->context_); - if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); - } - return 0; -} - - -int -ACE_Registry_Name_Space::bind (const ACE_NS_WString &name, - const ACE_NS_WString &value, - const char *type) -{ - ACE_UNUSED_ARG(type); - - // Pointer to data - const ACE_WSTRING_TYPE *data = value.fast_rep (); - - // Size - u_long size = value.length () * sizeof (ACE_WSTRING_TYPE); - - // Represent value as an ACE_Registry::Object - ACE_Registry::Object object ((void *) data, - size, - REG_SZ); - // Add new / pair -#if defined ACE_USES_WCHAR - return this->context_.bind (name.fast_rep(), - object); -#else - return this->context_.bind (name.char_rep(), - object); -#endif /* ACE_HAS_WCHAR */ -} - - -int -ACE_Registry_Name_Space::rebind (const ACE_NS_WString &name, - const ACE_NS_WString &value, - const char *type) -{ - ACE_UNUSED_ARG(type); - - // Pointer to data - const ACE_WSTRING_TYPE *data = value.fast_rep (); - - // Size - u_long size = value.length () * sizeof (ACE_WSTRING_TYPE); - - // Represent value as an ACE_Registry::Object - ACE_Registry::Object object ((void *) data, - size, - REG_SZ); - // Add new / pair -#if defined (ACE_USES_WCHAR) - return this->context_.rebind (name.fast_rep (), - object); -#else - return this->context_.rebind (name.char_rep (), - object); -#endif /* ACE_USES_WCHAR */ -} - - -int -ACE_Registry_Name_Space::unbind (const ACE_NS_WString &name) -{ -#if defined (ACE_USES_WCHAR) - return this->context_.unbind (name.fast_rep ()); -#else - return this->context_.unbind (name.char_rep ()); -#endif /* ACE_USES_WCHAR */ -} - - -int -ACE_Registry_Name_Space::resolve (const ACE_NS_WString &name, - ACE_NS_WString &value, - char *&type) -{ - ACE_UNUSED_ARG(type); - - // This object will be used to query the size of the data. - // Note: The query_object.data will be null for this invocation. - ACE_Registry::Object query_object; - int result = -#if defined (ACE_USES_WCHAR) - this->context_.resolve (name.fast_rep (), query_object); -#else - this->context_.resolve (name.char_rep (), query_object); -#endif /* ACE_USES_WCHAR */ - if (result != 0) - return result; - - // Resize the value passed by the user - // Note: -1 is used because the size includes the null terminator - value.resize ((query_object.size () - 1) / sizeof (ACE_WSTRING_TYPE)); - - // Represent new space as an ACE_Registry::Object - ACE_Registry::Object object ((void *) value.fast_rep (), - query_object.size (), - REG_SZ); - -#if defined (ACE_USES_WCHAR) - result = this->context_.resolve (name.fast_rep (), object); -#else - result = this->context_.resolve (name.char_rep (), object); -#endif /* ACE_USES_WCHAR */ - if (object.size () != query_object.size ()) - return -1; - if (result != 0) - return result; - - return 0; -} - - -int -ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_BINDING_SET binding_set; - int result = this->list_name_entries (binding_set, - pattern); - if (result != 0) - return result; - - ACE_BINDING_ITERATOR iterator (binding_set); - - for (ACE_Name_Binding *entry = 0; - iterator.next (entry) !=0; - iterator.advance()) - { - set.insert (entry->name_); - } - return 0; -} - - -int -ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_BINDING_SET binding_set; - int result = this->list_name_entries (binding_set, - pattern); - if (result != 0) - return result; - - ACE_BINDING_ITERATOR iterator (binding_set); - - for (ACE_Name_Binding *entry = 0; - iterator.next (entry) !=0; - iterator.advance()) - { - set.insert (entry->value_); - } - return 0; -} - - -int -ACE_Registry_Name_Space::list_types (ACE_WSTRING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_UNUSED_ARG(set); - ACE_UNUSED_ARG(pattern); - - return 0; -} - - -int -ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_UNUSED_ARG(pattern); - - ACE_Registry::Binding_List list; - int result = this->context_.list (list); - if (result != 0) - return result; - - // Iterator through all entries - for (ACE_Registry::Binding_List::iterator i = list.begin (); - i != list.end (); - i++) - { - // Yeeesss! STL rules! - ACE_Registry::Binding &binding = *i; - - if (binding.type () == ACE_Registry::OBJECT) - { - // Key - ACE_TString string = binding.name (); - ACE_NS_WString key (string.c_str ()); - - // Value - ACE_NS_WString value; - char *type = 0; - result = this->resolve (key, - value, - type); - if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Registry::Naming_Context::resolve")), result); - - // Complete binding - ACE_Name_Binding binding (key, value, type); - set.insert (binding); - } - } - return 0; -} - - -int -ACE_Registry_Name_Space::list_value_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern) -{ - return this->list_name_entries (set, pattern); -} - - -int -ACE_Registry_Name_Space::list_type_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern) -{ - return this->list_name_entries (set, pattern); -} - - -void -ACE_Registry_Name_Space::dump (void) const -{ -} - - -#endif /* ACE_WIN32 && UNICODE */ diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h deleted file mode 100644 index 075c2643f56..00000000000 --- a/ace/Registry_Name_Space.h +++ /dev/null @@ -1,134 +0,0 @@ -/*-*- C++ -*- */ - -//============================================================================= -/** - * @file Registry_Name_Space.h - * - * $Id$ - * - * @author Irfan Pyarali (irfan@cs.wustl.edu) - */ -//============================================================================= - - -#ifndef ACE_REGISTRY_NAME_SPACE_H -#define ACE_REGISTRY_NAME_SPACE_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if (defined (ACE_WIN32) && defined (UNICODE)) -// This only works on Win32 platforms when UNICODE is turned on - -#include "ace/Registry.h" -#include "ace/Naming_Context.h" -#include "ace/Name_Space.h" - -/** - * @class ACE_Registry_Name_Space - * - * @brief Interface to a Name Server Database which is maintained by - * the Win32 Registry. Allows to add, change, remove and - * resolve NameBindings. - * - * Manages a Naming Service for a registry name space which - * includes bindings for all contexts. All strings are stored in - * wide character format. A Name Binding consists of a name - * (that's the key), a value string. There is no type string - * support in this Name Space. - */ -class ACE_Export ACE_Registry_Name_Space : public ACE_Name_Space -{ -public: - - /// Constructor - ACE_Registry_Name_Space (void); - - /// Contacts and opens the registry on the specified server - ACE_Registry_Name_Space (ACE_Name_Options *name_options); - - /// Destructor - ~ACE_Registry_Name_Space (void); - - /// Contacts and opens the registry on the specified server - int open (ACE_Name_Options *name_options); - - /// Bind a new name to a naming context (Wide character strings). - int bind (const ACE_NS_WString &name_in, - const ACE_NS_WString &value_in, - const char *type_in = ""); - - /** - * Overwrite the value or type of an existing name in a - * ACE_Name_Space or bind a new name to the context, if it didn't - * exist yet. (Wide charcter strings interface). - */ - int rebind (const ACE_NS_WString &name_in, - const ACE_NS_WString &value_in, - const char *type_in = ""); - - /// Delete a name from a ACE_Name_Space (Wide charcter strings - /// Interface). - int unbind (const ACE_NS_WString &name_in); - - /// Get value and type of a given name binding (Wide chars). The - /// caller is responsible for deleting both and ! - int resolve (const ACE_NS_WString &name_in, - ACE_NS_WString &value_out, - char *&type_out); - - /// Get a set of names matching a specified pattern (wchars). Matching - /// means the names must begin with the pattern string. - int list_names (ACE_WSTRING_SET &set_out, - const ACE_NS_WString &pattern_in); - - /// Get a set of values matching a specified pattern (wchars). Matching - /// means the values must begin with the pattern string. - int list_values (ACE_WSTRING_SET &set_out, - const ACE_NS_WString &pattern_in); - - /// Get a set of types matching a specified pattern (wchars). Matching - /// means the types must begin with the pattern string. - int list_types (ACE_WSTRING_SET &set_out, - const ACE_NS_WString &pattern_in); - - /** - * Get a set of names matching a specified pattern (wchars). Matching - * means the names must begin with the pattern string. Returns the - * complete binding associated each pattern match. - */ - int list_name_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern); - - /** - * Get a set of values matching a specified pattern (wchars). Matching - * means the values must begin with the pattern string. Returns the - * complete binding associated each pattern match. - */ - int list_value_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern); - - /** - * Get a set of types matching a specified pattern (wchars). Matching - * means the types must begin with the pattern string. Returns the - * complete binding associated each pattern match. - */ - int list_type_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern); - - /// Dump the state of the object - void dump (void) const; - -private: - - /// current context - ACE_Registry::Naming_Context context_; -}; - -#endif /* ACE_WIN32 && UNICODE */ -#include "ace/post.h" -#endif /* ACE_REGISTRY_NAME_SPACE_H */ diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp deleted file mode 100644 index 2973d2099e4..00000000000 --- a/ace/Remote_Name_Space.cpp +++ /dev/null @@ -1,379 +0,0 @@ -// Remote_Name_Space.cpp -// $Id$ - -#include "ace/Remote_Name_Space.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, Remote_Name_Space, "$Id$") - -int -ACE_Remote_Name_Space::open (const ACE_TCHAR *servername, u_short port) -{ - ACE_TRACE ("ACE_Remote_Name_Space::open"); - ACE_INET_Addr servaddr; - - // Initialize Addr - if (servaddr.set (port, servername) == -1) - return -1; - - // Connect to Name Server process. - if (this->ns_proxy_.open (servaddr) == -1) - return -1; - - return 0; -} - -ACE_Remote_Name_Space::ACE_Remote_Name_Space (void) -{ - ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"); -} - -ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ACE_TCHAR *hostname, - u_short port) -{ - ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"); - if (this->open (hostname, port) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"))); -} - -int -ACE_Remote_Name_Space::bind (const ACE_NS_WString &name, - const ACE_NS_WString &value, - const char *type) -{ - ACE_TRACE ("ACE_Remote_Name_Space::bind"); - ACE_Auto_Basic_Array_Ptr name_urep (name.ushort_rep ()); - ACE_Auto_Basic_Array_Ptr value_urep (value.ushort_rep ()); - ACE_UINT32 name_len = - ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_USHORT16)); - ACE_UINT32 value_len = - ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_USHORT16)); - ACE_UINT32 type_len = - ACE_static_cast (ACE_UINT32, ACE_OS_String::strlen (type)); - ACE_Name_Request request (ACE_Name_Request::BIND, - name_urep.get (), - name_len, - value_urep.get (), - value_len, - type, - type_len); - return this->ns_proxy_.request_reply (request); -} - -int -ACE_Remote_Name_Space::rebind (const ACE_NS_WString &name, - const ACE_NS_WString &value, - const char *type) -{ - ACE_TRACE ("ACE_Remote_Name_Space::rebind"); - ACE_Auto_Basic_Array_Ptr name_urep (name.ushort_rep ()); - ACE_Auto_Basic_Array_Ptr value_urep (value.ushort_rep ()); - ACE_UINT32 name_len = - ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_USHORT16)); - ACE_UINT32 value_len = - ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_USHORT16)); - ACE_UINT32 type_len = - ACE_static_cast (ACE_UINT32, ACE_OS_String::strlen (type)); - ACE_Name_Request request (ACE_Name_Request::REBIND, - name_urep.get (), - name_len, - value_urep.get (), - value_len, - type, - type_len); - return this->ns_proxy_.request_reply (request); -} - -int -ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name, - ACE_NS_WString &value, - char *&type) -{ - ACE_TRACE ("ACE_Remote_Name_Space::resolve"); - ACE_Auto_Basic_Array_Ptr name_urep (name.ushort_rep ()); - ACE_UINT32 name_len = - ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_USHORT16)); - ACE_Name_Request request (ACE_Name_Request::RESOLVE, - name_urep.get (), - name_len, - 0, 0, 0, 0); - - if (this->ns_proxy_.send_request (request) == -1) - return -1; - - ACE_Name_Request reply; - - if (this->ns_proxy_.recv_reply (reply) == -1) - return -1; - - ACE_NS_WString temp (reply.value (), reply.value_len () / sizeof (ACE_USHORT16)); - value = temp; - ACE_NEW_RETURN (type, - char[reply.type_len () + 1], - -1); - ACE_OS::strcpy (type, reply.type ()); - return 0; -} - -int -ACE_Remote_Name_Space::unbind (const ACE_NS_WString &name) -{ - ACE_TRACE ("ACE_Remote_Name_Space::unbind"); - ACE_Auto_Basic_Array_Ptr name_urep (name.ushort_rep ()); - ACE_UINT32 name_len = - ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_USHORT16)); - ACE_Name_Request request (ACE_Name_Request::UNBIND, - name_urep.get (), - name_len, - 0, 0, 0, 0); - return this->ns_proxy_.request_reply (request); -} - -int -ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_TRACE ("ACE_Remote_Name_Space::list_names"); - ACE_Auto_Basic_Array_Ptr pattern_urep (pattern.ushort_rep ()); - ACE_UINT32 pattern_len = - ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16)); - ACE_Name_Request request (ACE_Name_Request::LIST_NAMES, - pattern_urep.get (), - pattern_len, - 0, 0, 0, 0); - if (this->ns_proxy_.send_request (request) == -1) - return -1; - - ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); - - while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_names")), - -1); - if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - ACE_NS_WString name (reply.name (), - reply.name_len () / sizeof (ACE_USHORT16)); - set.insert (name); - } - } - return 0; -} - -int -ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_TRACE ("ACE_Remote_Name_Space::list_values"); - ACE_Auto_Basic_Array_Ptr pattern_urep (pattern.ushort_rep ()); - ACE_UINT32 pattern_len = - ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16)); - ACE_Name_Request request (ACE_Name_Request::LIST_VALUES, - pattern_urep.get (), - pattern_len, - 0, 0, 0, 0); - if (this->ns_proxy_.send_request (request) == -1) - return -1; - - ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); - - while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), - -1); - if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - ACE_NS_WString value (reply.value (), - reply.value_len () / sizeof (ACE_USHORT16)); - set.insert (value); - } - } - - return 0; -} - -int -ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_TRACE ("ACE_Remote_Name_Space::list_types"); - ACE_Auto_Basic_Array_Ptr pattern_urep (pattern.ushort_rep ()); - ACE_UINT32 pattern_len = - ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16)); - ACE_Name_Request request (ACE_Name_Request::LIST_TYPES, - pattern_urep.get (), - pattern_len, - 0, 0, 0, 0); - - if (this->ns_proxy_.send_request (request) == -1) - return -1; - - ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); - - while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), - -1); - if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - ACE_NS_WString type (reply.type ()); - set.insert (type); - } - } - - return 0; -} - -int -ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_TRACE ("ACE_Remote_Name_Space::list_name_entries"); - ACE_Auto_Basic_Array_Ptr pattern_urep (pattern.ushort_rep ()); - ACE_UINT32 pattern_len = - ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16)); - ACE_Name_Request request (ACE_Name_Request::LIST_NAME_ENTRIES, - pattern_urep.get (), - pattern_len, - 0, 0, 0, 0); - - if (this->ns_proxy_.send_request (request) == -1) - return -1; - - ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); - - while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_names")), - -1); - if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - ACE_NS_WString name (reply.name (), - reply.name_len () / sizeof (ACE_USHORT16)); - ACE_NS_WString value (reply.value (), - reply.value_len () / sizeof (ACE_USHORT16)); - ACE_Name_Binding entry (name, - value, - reply.type ()); - if (set.insert (entry) == -1) - return -1; - } - } - return 0; -} - -int -ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_TRACE ("ACE_Remote_Name_Space::list_value_entries"); - ACE_Auto_Basic_Array_Ptr pattern_urep (pattern.ushort_rep ()); - ACE_UINT32 pattern_len = - ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16)); - ACE_Name_Request request (ACE_Name_Request::LIST_VALUE_ENTRIES, - pattern_urep.get (), - pattern_len, - 0, 0, 0, 0); - - if (this->ns_proxy_.send_request (request) == -1) - return -1; - - ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); - - while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), - -1); - if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - ACE_NS_WString name (reply.name (), - reply.name_len () / sizeof (ACE_USHORT16)); - ACE_NS_WString value (reply.value (), - reply.value_len () / sizeof (ACE_USHORT16)); - ACE_Name_Binding entry (name, - value, - reply.type()); - if (set.insert (entry) == -1) - return -1; - } - } - return 0; -} - -int -ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern) -{ - ACE_TRACE ("ACE_Remote_Name_Space::list_type_entries"); - ACE_Auto_Basic_Array_Ptr pattern_urep (pattern.ushort_rep ()); - ACE_UINT32 pattern_len = - ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16)); - ACE_Name_Request request (ACE_Name_Request::LIST_TYPE_ENTRIES, - pattern_urep.get (), - pattern_len, - 0, 0, 0, 0); - - if (this->ns_proxy_.send_request (request) == -1) - return -1; - - ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0); - - while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), - -1); - if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) - { - ACE_NS_WString name (reply.name (), - reply.name_len () / sizeof (ACE_USHORT16)); - ACE_NS_WString value (reply.value (), - reply.value_len () / sizeof (ACE_USHORT16)); - ACE_Name_Binding entry (name, - value, - reply.type ()); - if (set.insert (entry) == -1) - return -1; - } - } - return 0; -} - -ACE_Remote_Name_Space::~ACE_Remote_Name_Space (void) -{ - ACE_TRACE ("ACE_Remote_Name_Space::~ACE_Remote_Name_Space"); -} - -void -ACE_Remote_Name_Space::dump (void) const -{ - ACE_TRACE ("ACE_Remote_Name_Space::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->ns_proxy_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Auto_Basic_Array_Ptr; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Auto_Basic_Array_Ptr -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h deleted file mode 100644 index 3ae6d37a34d..00000000000 --- a/ace/Remote_Name_Space.h +++ /dev/null @@ -1,142 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file Remote_Name_Space.h - * - * $Id$ - * - * @author Prashant Jain - */ -//========================================================================== - - -#ifndef ACE_REMOTE_NAME_SPACE_H -#define ACE_REMOTE_NAME_SPACE_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include "ace/Name_Proxy.h" -#include "ace/Name_Space.h" - -typedef ACE_Unbounded_Set ACE_WSTRING_SET; - -/** - * @class ACE_Remote_Name_Space - * - * @brief Maintaining accesses Remote Name Server Database. Allows to - * add NameBindings, change them, remove them and resolve - * NameBindings. - * - * Manages a Naming Service for a remote name space which - * includes bindings for net_local naming context. All strings - * are stored in wide character format. A Name Binding consists - * of a name (that's the key), a value string and an optional - * type string (no wide chars). - */ -class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space -{ -public: - // = Initialization and termination methods. - /// "Do-nothing" constructor. - ACE_Remote_Name_Space (void); - - /** - * Specifies the scope of this namespace, opens and memory-maps the - * associated file (if accessible) or contacts the dedicated name - * server process for NET_LOCAL namespace. - */ - ACE_Remote_Name_Space (const ACE_TCHAR *hostname, u_short port); - - /** - * Specifies the scope of this namespace, opens and memory-maps the - * associated file (if accessible) or contacts the dedicated name - * server process for NET_LOCAL namespace. - */ - int open (const ACE_TCHAR *servername, u_short port); - - /// destructor, do some cleanup :TBD: last dtor should "compress" - /// file - ~ACE_Remote_Name_Space (void); - - /// Bind a new name to a naming context (Wide character strings). - virtual int bind (const ACE_NS_WString &name_in, - const ACE_NS_WString &value_in, - const char *type_in = ""); - - /** - * Overwrite the value or type of an existing name in a - * ACE_Remote_Name_Space or bind a new name to the context, if it - * didn't exist yet. (Wide charcter strings interface). - */ - virtual int rebind (const ACE_NS_WString &name_in, - const ACE_NS_WString &value_in, - const char *type_in = ""); - - /// Delete a name from a ACE_Remote_Name_Space (Wide charcter strings - /// Interface). - virtual int unbind (const ACE_NS_WString &name_in); - - /// Get value and type of a given name binding (Wide chars). The - /// caller is responsible for deleting both and ! - virtual int resolve (const ACE_NS_WString &name_in, - ACE_NS_WString &value_out, - char *&type_out); - - /// Get a set of names matching a specified pattern (wchars). Matching - /// means the names must begin with the pattern string. - virtual int list_names (ACE_WSTRING_SET &set_out, - const ACE_NS_WString &pattern_in); - - /// Get a set of values matching a specified pattern (wchars). Matching - /// means the values must begin with the pattern string. - virtual int list_values (ACE_WSTRING_SET &set_out, - const ACE_NS_WString &pattern_in); - - /// Get a set of types matching a specified pattern (wchars). Matching - /// means the types must begin with the pattern string. - virtual int list_types (ACE_WSTRING_SET &set_out, - const ACE_NS_WString &pattern_in); - - /** - * Get a set of names matching a specified pattern (wchars). Matching - * means the names must begin with the pattern string. Returns the - * complete binding associated each pattern match. - */ - virtual int list_name_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern); - - /** - * Get a set of values matching a specified pattern (wchars). Matching - * means the values must begin with the pattern string. Returns the - * complete binding associated each pattern match. - */ - virtual int list_value_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern); - - /** - * Get a set of types matching a specified pattern (wchars). Matching - * means the types must begin with the pattern string. Returns the - * complete binding associated each pattern match. - */ - virtual int list_type_entries (ACE_BINDING_SET &set, - const ACE_NS_WString &pattern); - - /// Dump the state of the object. - virtual void dump (void) const; - -private: - /// Interface to Name server process for NET_LOCAL namespace. - ACE_Name_Proxy ns_proxy_; -}; - -#include "ace/post.h" - -#endif /* ACE_REMOTE_NAME_SPACE_H */ diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp deleted file mode 100644 index 86aec7547d8..00000000000 --- a/ace/Remote_Tokens.cpp +++ /dev/null @@ -1,438 +0,0 @@ -// Remote_Tokens.cpp -// $Id$ - -#include "ace/Remote_Tokens.h" -#include "ace/Singleton.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Remote_Tokens.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -ACE_RCSID(ace, Remote_Tokens, "$Id$") - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -#define ACE_TSS_CONNECTION_MUTEX ACE_Thread_Mutex -#else -#define ACE_TSS_CONNECTION_MUTEX ACE_Null_Mutex -#endif /* ACE_MT_SAFE */ - -// Make a typedef to simplify access to the Singleton below. -typedef ACE_Singleton ACE_Token_Connections; - -// Initialize the statics from ACE_TSS_Connection; -ACE_INET_Addr ACE_TSS_Connection::server_address_; - -// ************************************************************ - -void -ACE_TSS_Connection::set_server_address (const ACE_INET_Addr &server_address) -{ - ACE_TRACE ("ACE_TSS_Connection::set_server_address"); - server_address_ = server_address; -} - -// Necessary to make some compilers work... -ACE_TSS_Connection::ACE_TSS_Connection (void) -{ - ACE_TRACE ("ACE_TSS_Connection::ACE_TSS_Connection"); -} - -ACE_TSS_Connection::~ACE_TSS_Connection (void) -{ - ACE_TRACE ("ACE_TSS_Connection::~ACE_TSS_Connection"); -} - -ACE_SOCK_Stream * -ACE_TSS_Connection::get_connection (void) -{ - return ACE_TSS::operator-> (); -} - -ACE_SOCK_Stream * -ACE_TSS_Connection::make_TSS_TYPE (void) const -{ - ACE_TRACE ("ACE_TSS_Connection::make_TSS_TYPE"); - - ACE_SOCK_Connector connector; - ACE_SOCK_Stream *stream = 0; - - ACE_NEW_RETURN (stream, - ACE_SOCK_Stream, - 0); - - if (connector.connect (*stream, server_address_) == -1) - { - delete stream; - errno = ECONNREFUSED; - return 0; - } - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TSS_Connection new connection\n"))); - return stream; -} - -ACE_TSS_Connection::operator ACE_SOCK_Stream *(void) -{ - return this->get_connection (); -} - -void -ACE_TSS_Connection::dump (void) const -{ - ACE_TRACE ("ACE_TSS_Connection::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TSS_Connection::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("server_address_\n"))); - server_address_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); - ACE_TSS::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy (void) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy"); -} - -ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy (void) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy"); -} - -int -ACE_Remote_Token_Proxy::open (const ACE_TCHAR *name, - int ignore_deadlock, - int debug) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::open"); - ignore_shadow_deadlock_ = ignore_deadlock; - return ACE_Token_Proxy::open (name, 0, debug); -} - -void -ACE_Remote_Token_Proxy::set_server_address (const ACE_INET_Addr &server_address) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::set_server_address"); - ACE_Token_Connections::instance ()->set_server_address (server_address); -} - -int -ACE_Remote_Token_Proxy::initiate_connection (void) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::initiate_connection"); - if (token_ == 0) - { - errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1); - } - - ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); - return peer == 0 ? 0 : 1; -} - -// Do the work of sending a request and getting a reply. - -int -ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, - ACE_Synch_Options &) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::request_reply"); - void *buffer; - ssize_t length; - - if ((length = request.encode (buffer)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("encode failed")), -1); - - ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); - - if (peer == 0) - return -1; - - // Transmit request via a blocking send. - - if (peer->send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("send_n failed")), -1); - else - { - ACE_Token_Reply reply; - - // Receive reply via blocking read. - - if (peer->recv (&reply, sizeof reply) != sizeof reply) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("recv failed")), -1); - - if (reply.decode () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("decode failed")), -1); - - errno = int (reply.errnum ()); - if (errno != 0) - ACE_RETURN (-1); - else - return 0; - } -} - -int -ACE_Remote_Token_Proxy::acquire (int notify, - void (*sleep_hook)(void *), - ACE_Synch_Options &options) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::acquire"); - - // First grab the local shadow mutex. - if (ACE_Token_Proxy::acquire (notify, - sleep_hook, - ACE_Synch_Options::asynch) == -1) - { - // Acquire failed, deal with it... - switch (errno) - { - case EWOULDBLOCK : - // Whoah, we detected wouldblock via the shadow mutex! - if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) shadow: acquire will block, owner is %s\n"), - this->token_->owner_id ())); - // No error, but would block, - break; - - case EDEADLK : - if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) shadow: deadlock detected\n"))); - - if (ignore_shadow_deadlock_) - break; - else - { - errno = EDEADLK; - ACE_RETURN (-1); - } - - default : - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%t) %p shadow acquire failed\n"), - ACE_LIB_TEXT ("ACE_Remote_Token_Proxy")), - -1); - } - } - - ACE_Token_Request request (token_->type (), - this->type (), - ACE_Token_Request::ACQUIRE, - this->name (), - this->client_id (), - options); - - request.notify (notify); - - int result = this->request_reply (request, options); - - if (result == -1) - { - // Update the local shadow copy. - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("error on remote acquire, releasing shadow mutex.\n"))); - ACE_Token_Proxy::release (); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) acquired %s remotely.\n"), this->name ())); - // Our shadow call may have failed. However, it's still a race - // to the remote server. If we beat the client which holds the - // local token, we need to fix things locally to reflect the - // actual ownership. All that should happen is that our waiter - // is moved to the front of the waiter list. - token_->make_owner (waiter_); - } - - return result; -} - -int -ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *)) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::tryacquire"); - - // If we can detect locally that the tryacquire will fail, there is - // no need to go remote. - if (ACE_Token_Proxy::tryacquire (sleep_hook) == -1) - { - if (debug_) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("shadow try acquire failed\n"))); - } - - return -1; - } - - ACE_Token_Request request (token_->type (), - this->type (), - ACE_Token_Request::TRY_ACQUIRE, - this->name (), - this->client_id (), - ACE_Synch_Options::synch); - - return this->request_reply (request, - ACE_Synch_Options::synch); -} - -int -ACE_Remote_Token_Proxy::renew (int requeue_position, - ACE_Synch_Options &options) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::renew"); - - if (ACE_Token_Proxy::renew (requeue_position, - ACE_Synch_Options::asynch) == -1) - { - // Check for error. - if (errno != EWOULDBLOCK) - return -1; - else if (debug_) - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) shadow: renew would block. owner %s.\n"), - this->token_->owner_id ())); - } - - ACE_Token_Request request (token_->type (), - this->type (), - ACE_Token_Request::RENEW, - this->name (), - this->client_id (), - options); - - request.requeue_position (requeue_position); - - int result = this->request_reply (request, options); - - if (result == -1) - { - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - ACE_Token_Proxy::release (); - } - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p error on remote renew, releasing shadow mutex.\n"), - ACE_LIB_TEXT ("ACE_Remote_Token_Proxy")), -1); - } - else - { - if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) renewed %s remotely.\n"), this->name ())); - // Make sure that the local shadow reflects our new ownership. - token_->make_owner (waiter_); - return result; - } -} - -int -ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::release"); - - ACE_Token_Request request (token_->type (), - this->type (), - ACE_Token_Request::RELEASE, - this->name (), - this->client_id (), - options); - - int result = this->request_reply (request, options); - if (result == 0) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) released %s remotely.\n"), this->name ())); - - // whether success or failure, we're going to release the shadow. - // If race conditions exist such that we are no longer the owner, - // this release will perform a remove. - if (ACE_Token_Proxy::release () == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("(%t) shadow: release failed\n"))); - - return result; -} - -int -ACE_Remote_Token_Proxy::remove (ACE_Synch_Options &) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::remove"); - return 0; -} - -void -ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::token_acquired"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) shadow token %s acquired\n"), - this->client_id (), - this->name ())); - // ACE_Token_Proxy::token_acquired (vp); -} - -const ACE_TCHAR* -ACE_Remote_Token_Proxy::owner_id (void) -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owner_id called\n"))); - // @@ special operation - return 0; -} - -void -ACE_Remote_Token_Proxy::dump (void) const -{ - ACE_TRACE ("ACE_Remote_Token_Proxy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Tokens::dump:\n") - ACE_LIB_TEXT (" ignore_shadow_deadlock_ = %d\n"), - ignore_shadow_deadlock_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); - ACE_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -void -ACE_Remote_Mutex::dump (void) const -{ - ACE_TRACE ("ACE_Remote_Mutex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Remote_Mutex::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); - ACE_Remote_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -void -ACE_Remote_RLock::dump (void) const -{ - ACE_TRACE ("ACE_Remote_RLock::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Remote_RLock::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); - ACE_Remote_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -void -ACE_Remote_WLock::dump (void) const -{ - ACE_TRACE ("ACE_Remote_WLock::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Remote_WLock::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); - ACE_Remote_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_TSS ; -template class ACE_Singleton ; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_TSS -#pragma instantiate ACE_Singleton -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_HAS_TOKENS_LIBRARY */ diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h deleted file mode 100644 index 1d3931db4d0..00000000000 --- a/ace/Remote_Tokens.h +++ /dev/null @@ -1,316 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Remote_Tokens.h - * - * $Id$ - * - * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) - * @author Tim Harrison (harrison@cs.wustl.edu) - */ -//============================================================================= - -#ifndef ACE_REMOTE_MUTEX_H -#define ACE_REMOTE_MUTEX_H -#include "ace/pre.h" - -#include "ace/INET_Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK_Connector.h" -#include "ace/SOCK_Stream.h" -#include "ace/Synch_Options.h" -#include "ace/Local_Tokens.h" -#include "ace/Token_Request_Reply.h" - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -/** - * @class ACE_Remote_Token_Proxy - * - * @brief Proxy for acquiring, renewing, and releasing a distributed - * synchronization token. - * - * The Remote_Token_Proxy class implements the mechanisms for - * distributed token operations. It is similar to the - * ACE_Token_Proxy. - * = BUGS - * Distributed sleep_hooks have not been implemented. - * is not implemented. - */ -class ACE_Export ACE_Remote_Token_Proxy : public ACE_Token_Proxy -{ -public: - /// Null construction. - ACE_Remote_Token_Proxy (void); - - /// Death. - virtual ~ACE_Remote_Token_Proxy (void); - - /** - * Same as Token_Proxy. is the string uniquely identifying - * the token. can be 1 to disable deadlock - * notifications. prints debug messages. - */ - int open (const ACE_TCHAR *name, - int ignore_deadlock = 0, - int debug = 0); - - - /** - * Open a connection with the token server. This only need be used - * when the user wishes to explicitly open a connection to check if - * the server exists. Connections are stored in the - * ACE_Token_Connections singleton as thread-specific data. That - * is, every thread has only one connection that is used for all - * remote tokens. - */ - int initiate_connection (void); - - /** - * Acquire the distributed token. If notify is specified and the - * token is already held, the owner is notified. options contains - * the timeout value for the acquire call. The timer is kept at the - * token server. Asynchronous operations are not supported. - * Returns 0 on success, -1 on failure with == problem. - */ - virtual int acquire (int notify = 0, - void (*sleep_hook)(void *) = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::synch); - - /** - * Try to acquire the distributed token. If the token is already - * held, the call returns without queueing the caller as a waiter. - * Returns 0 on success (the token was acquired), and -1 with - * EWOULDBLOCK if the token was already held. - */ - virtual int tryacquire (void (*sleep_hook)(void *) = 0); - - /** - * Renew the token by offering to release it if there are any other - * waiters, otherwise get the token back immediately. This renew - * has the same semantics as ACE_Local_Mutex release. It is - * semantically equivalent to followed by , but - * it is faster. options contains the timeout value used if renew - * blocks. As with acquire, the timer is maintained at the token - * server. If there are waiters and requeue_position == -1, the - * caller is queued at the rear of the waiter list. Otherwise, - * requeue_position specifies the number of waiters to "let by" - * before reacquiring the token (effectively, the position in the - * waiter list.) - */ - virtual int renew (int requeue_position = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::synch); - - /** - * Release the distributed token. Similar to ACE_Local_Mutex, if the - * caller is not the owner, it is removed from the waiter list (if - * applicable.) Returns 0 on success, -1 on failure with == - * problem. - */ - virtual int release (ACE_Synch_Options &options = - ACE_Synch_Options::synch); - - /// Become interface compliant for ACE_Guard<>. This has no - /// functionality. - virtual int remove (ACE_Synch_Options &options = - ACE_Synch_Options::synch); - - /// Override the default to do nothing. - virtual void token_acquired (ACE_TPQ_Entry *); - - /// The client id of the current token holder - virtual const ACE_TCHAR* owner_id (void); - - /** - * Sets the server address for all instances of ACE_Remote_Token_Proxy - * If this isn't called, the environment variable TOKEN_SERVER is - * checked for the server address. If that is not specified, all - * ACE_Remote_** operations will fail. - */ - static void set_server_address (const ACE_INET_Addr &server_address); - - /// Dump the state of the class. - void dump (void) const; - -protected: - - /// If shadows report deadlock, go remote anyway - int ignore_shadow_deadlock_; - - /// Perform the request and wait for the reply. - int request_reply (ACE_Token_Request &request, - ACE_Synch_Options &options); -}; - -/** - * @class ACE_Remote_Mutex - * - * @brief Proxy for acquiring, renewing, and releasing a distributed - * mutex. - * - * This is the remote equivalent to ACE_Local_Mutex. The - * Remote_Mutex class offers methods for acquiring, renewing, and - * releasing a distributed synchronization mutex. Similar to - * ACE_Local_Mutex, ACE_Remote_Token_Proxy offers recursive - * acquisition, FIFO waiter ordering, and deadlock detection. It - * depends on the Token Server for its distributed synchronization - * semantics. - */ -class ACE_Export ACE_Remote_Mutex : public ACE_Remote_Token_Proxy -{ -public: - /// Null creation. Remote_Token_Proxy::open must be called. - ACE_Remote_Mutex (void); - - /// Calls Remote_Token_Proxy::open for you. - ACE_Remote_Mutex (const ACE_TCHAR *token_name, - int ignore_deadlock = 0, - int debug = 0); - - /// Dump the state of the class. - void dump (void) const; - - /// Return deep copy. - virtual ACE_Token_Proxy *clone (void) const; - -protected: - /// Make the correct type of ACE_Tokens. - /// This is called by the ACE_Token_Manager. - virtual ACE_Tokens *create_token (const ACE_TCHAR *name); -}; - -/** - * @class ACE_Remote_RLock - * - * @brief Proxy for acquiring, renewing, and releasing a distributed - * readers lock. - * - * This is the remote equivalent to ACE_Local_RLock. Multiple - * readers can hold the lock simultaneously when no writers have - * the lock. Alternatively, when a writer holds the lock, no other - * participants (readers or writers) may hold the lock. - * ACE_Remote_RLock depends on the ACE Token Server for its - * distributed synchronization semantics. - */ -class ACE_Export ACE_Remote_RLock : public ACE_Remote_Token_Proxy -{ -public: - ACE_Remote_RLock (void); - - ACE_Remote_RLock (const ACE_TCHAR *token_name, - int ignore_deadlock = 0, - int debug = 0); - - ACE_Remote_RLock (const ACE_Remote_RLock &mutex); - - /// Dump the state of the class. - void dump (void) const; - - /// Returns ACE_RW_Token::RLOCK; - virtual int type (void) const; - - /// Return deep copy. - virtual ACE_Token_Proxy *clone (void) const; - -protected: - /// Make the correct type of ACE_Tokens. This is called by the Token - /// Manager. - virtual ACE_Tokens *create_token (const ACE_TCHAR *name); -}; - -/** - * @class ACE_Remote_WLock - * - * @brief Proxy for acquiring, renewing, and releasing a distributed - * writers lock. - * - * Shields applications from details of interacting with the - * ACE_Token_Server. The token_name_ is just the string that the - * Token Server uses to identify the token. The client_id_ (also - * used by the Token Server,) identifies the owner of the token and - * is used for deadlock detection. - */ -class ACE_Export ACE_Remote_WLock : public ACE_Remote_Token_Proxy -{ -public: - ACE_Remote_WLock (void); - - ACE_Remote_WLock (const ACE_TCHAR *token_name, - int ignore_deadlock = 0, - int debug = 0); - - ACE_Remote_WLock (const ACE_Remote_WLock &mutex); - - /// Dump the state of the class. - void dump (void) const; - - /// Returns ACE_RW_Token::WLOCK; - virtual int type (void) const; - - /// Return deep copy. - virtual ACE_Token_Proxy *clone (void) const; - -protected: - /// Make the correct type of ACE_Tokens. This is called by the Token - /// Manager. - virtual ACE_Tokens *create_token (const ACE_TCHAR *name); -}; - -/** - * @class ACE_TSS_Connection - * - * @brief Class for providing a connection per thread. - * - * ACE_TSS_Connection provides a single access point for all - * threads to access thread-specific connections. This prevents - * resource-sharing problems such as thread serialization. - */ -class ACE_Export ACE_TSS_Connection : public ACE_TSS -{ -public: - // Necessary to make some compilers work... - ACE_TSS_Connection (void); - ~ACE_TSS_Connection (void); - - /// Retrieve the thread's connection - ACE_SOCK_Stream *get_connection (void); - - /// Factory Method that creates a new SOCK Stream. - virtual ACE_SOCK_Stream *make_TSS_TYPE (void) const; - - /// Inheritence and operator overloading don't mix. Redefine this - /// from ACE_TSS so that we can use it. - operator ACE_SOCK_Stream *(void); - - /// Set the server address. - static void set_server_address (const ACE_INET_Addr &server_address); - - /// Dump the state of the class. - void dump (void) const; - -protected: - /// The address of the Token Server used by all instances of - /// Token_Proxy. - static ACE_INET_Addr server_address_; - -private: - /// Private: should not be used - ACE_TSS_Connection (const ACE_TSS_Connection &); - void operator= (const ACE_TSS_Connection &); -}; - -#endif /* ACE_HAS_TOKENS_LIBRARY */ - -#if defined (__ACE_INLINE__) -#include "ace/Remote_Tokens.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_REMOTE_TOKEN_H */ diff --git a/ace/Remote_Tokens.i b/ace/Remote_Tokens.i deleted file mode 100644 index f0cc90e5105..00000000000 --- a/ace/Remote_Tokens.i +++ /dev/null @@ -1,122 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -ACE_INLINE -ACE_Remote_Mutex::ACE_Remote_Mutex (void) -{ - ACE_TRACE ("ACE_Remote_Mutex::ACE_Remote_Mutex"); -} - -ACE_INLINE -ACE_Remote_Mutex::ACE_Remote_Mutex (const ACE_TCHAR *token_name, - int ignore_deadlock, - int debug) -{ - ACE_TRACE ("ACE_Remote_Mutex::ACE_Remote_Mutex"); - this->open (token_name, ignore_deadlock, debug); -} - -ACE_INLINE ACE_Token_Proxy * -ACE_Remote_Mutex::clone (void) const -{ - ACE_Token_Proxy *temp; - ACE_NEW_RETURN (temp, - ACE_Remote_Mutex (this->name (), - ignore_deadlock_, - debug_), - 0); - return temp; -} - -ACE_INLINE ACE_Tokens * -ACE_Remote_Mutex::create_token (const ACE_TCHAR *name) -{ - ACE_Tokens *temp; - ACE_NEW_RETURN (temp, - ACE_Mutex_Token (name), - 0); - return temp; -} - -// ************************************************************ - -ACE_INLINE -ACE_Remote_RLock::ACE_Remote_RLock (const ACE_TCHAR *token_name, - int ignore_deadlock, - int debug) -{ - ACE_TRACE ("ACE_Remote_RLock::ACE_Remote_RLock"); - this->open (token_name, ignore_deadlock, debug); -} - -ACE_INLINE ACE_Tokens * -ACE_Remote_RLock::create_token (const ACE_TCHAR *name) -{ - ACE_Tokens *temp = 0; - ACE_NEW_RETURN (temp, - ACE_RW_Token (name), - 0); - return temp; -} - -ACE_INLINE int -ACE_Remote_RLock::type (void) const -{ - return ACE_RW_Token::READER; -} - -ACE_INLINE ACE_Token_Proxy * -ACE_Remote_RLock::clone (void) const -{ - ACE_Token_Proxy *temp = 0; - ACE_NEW_RETURN (temp, - ACE_Remote_RLock (this->name (), - ignore_deadlock_, - debug_), - 0); - return temp; -} - -// ************************************************************ - -ACE_INLINE -ACE_Remote_WLock::ACE_Remote_WLock (const ACE_TCHAR *token_name, - int ignore_deadlock, - int debug) -{ - ACE_TRACE ("ACE_Remote_WLock::ACE_Remote_WLock"); - this->open (token_name, ignore_deadlock, debug); -} - - -ACE_INLINE ACE_Tokens * -ACE_Remote_WLock::create_token (const ACE_TCHAR *name) -{ - ACE_Tokens *temp = 0; - ACE_NEW_RETURN (temp, - ACE_RW_Token (name), - 0); - return temp; -} - -ACE_INLINE int -ACE_Remote_WLock::type (void) const -{ - return ACE_RW_Token::WRITER; -} - -ACE_INLINE ACE_Token_Proxy * -ACE_Remote_WLock::clone (void) const -{ - ACE_Token_Proxy *temp = 0; - ACE_NEW_RETURN (temp, - ACE_Remote_WLock (this->name (), - ignore_deadlock_, - debug_), - 0); - return temp; -} - -#endif /* ACE_HAS_TOKENS_LIBRARY */ diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp deleted file mode 100644 index 333ff6c16b5..00000000000 --- a/ace/SOCK.cpp +++ /dev/null @@ -1,182 +0,0 @@ -// SOCK.cpp -// $Id$ - -#include "ace/SOCK.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK.i" -#endif - -ACE_RCSID(ace, SOCK, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK) - -void -ACE_SOCK::dump (void) const -{ - ACE_TRACE ("ACE_SOCK::dump"); -} - -ACE_SOCK::ACE_SOCK (void) -{ - // ACE_TRACE ("ACE_SOCK::ACE_SOCK"); -} - -// Returns information about the remote peer endpoint (if there is -// one). - -int -ACE_SOCK::get_remote_addr (ACE_Addr &sa) const -{ - ACE_TRACE ("ACE_SOCK::get_remote_addr"); - - int len = sa.get_size (); - sockaddr *addr = ACE_reinterpret_cast (sockaddr *, - sa.get_addr ()); - - if (ACE_OS::getpeername (this->get_handle (), - addr, - &len) == -1) - return -1; - - sa.set_size (len); - sa.set_type (addr->sa_family); - return 0; -} - -int -ACE_SOCK::get_local_addr (ACE_Addr &sa) const -{ - ACE_TRACE ("ACE_SOCK::get_local_addr"); - - int len = sa.get_size (); - sockaddr *addr = ACE_reinterpret_cast (sockaddr *, - sa.get_addr ()); - - if (ACE_OS::getsockname (this->get_handle (), - addr, - &len) == -1) - return -1; - - sa.set_type (addr->sa_family); - sa.set_size (len); - return 0; -} - -// Close down a ACE_SOCK. - -int -ACE_SOCK::close (void) -{ - ACE_TRACE ("ACE_SOCK::close"); - int result = 0; - - if (this->get_handle () != ACE_INVALID_HANDLE) - { - result = ACE_OS::closesocket (this->get_handle ()); - this->set_handle (ACE_INVALID_HANDLE); - } - return result; -} - -int -ACE_SOCK::open (int type, - int protocol_family, - int protocol, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK::open"); - int one = 1; - - this->set_handle (ACE_OS::socket (protocol_family, - type, - protocol)); - - if (this->get_handle () == ACE_INVALID_HANDLE) - return -1; - else if (protocol_family != PF_UNIX - && reuse_addr - && this->set_option (SOL_SOCKET, - SO_REUSEADDR, - &one, - sizeof one) == -1) - { - this->close (); - return -1; - } - return 0; -} - -// General purpose constructor for performing server ACE_SOCK -// creation. - -ACE_SOCK::ACE_SOCK (int type, - int protocol_family, - int protocol, - int reuse_addr) -{ - // ACE_TRACE ("ACE_SOCK::ACE_SOCK"); - if (this->open (type, - protocol_family, - protocol, - reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK"))); -} - -int -ACE_SOCK::open (int type, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK::open"); - - this->set_handle (ACE_OS::socket (protocol_family, - type, - protocol, - protocolinfo, - g, - flags)); - int one = 1; - - if (this->get_handle () == ACE_INVALID_HANDLE) - return -1; - else if (reuse_addr - && this->set_option (SOL_SOCKET, - SO_REUSEADDR, - &one, - sizeof one) == -1) - { - this->close (); - return -1; - } - else - return 0; -} - -ACE_SOCK::ACE_SOCK (int type, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr) -{ - // ACE_TRACE ("ACE_SOCK::ACE_SOCK"); - if (this->open (type, - protocol_family, - protocol, - protocolinfo, - g, - flags, - reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK"))); -} diff --git a/ace/SOCK.h b/ace/SOCK.h deleted file mode 100644 index 427a7f85bb1..00000000000 --- a/ace/SOCK.h +++ /dev/null @@ -1,121 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_SOCK_H -#define ACE_SOCK_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Addr.h" -#include "ace/IPC_SAP.h" -#include "ace/OS.h" - -/** - * @class ACE_SOCK - * - * @brief An abstract class that forms the basis for more specific - * classes, such as and . - * Do not instantiate this class. - * - * This class provides functions that are common to all of the - * classes. provides the ability to get - * and set socket options, get the local and remote addresses, - * and open and close a socket handle. - */ -class ACE_Export ACE_SOCK : public ACE_IPC_SAP -{ -public: - /// Default ctor/dtor. - ~ACE_SOCK (void); - - /// Wrapper around the system call. - int set_option (int level, - int option, - void *optval, - int optlen) const; - - /// Wrapper around the system call. - int get_option (int level, - int option, - void *optval, - int *optlen) const; - - /// Close down the socket handle. - int close (void); - - /// Return the local endpoint address in the referenced . - /// Returns 0 if successful, else -1. - int get_local_addr (ACE_Addr &) const; - - /** - * Return the address of the remotely connected peer (if there is - * one), in the referenced . Returns 0 if successful, else - * -1. - */ - int get_remote_addr (ACE_Addr &) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /// Wrapper around the BSD-style system call (no QoS). - int open (int type, - int protocol_family, - int protocol, - int reuse_addr); - - /// Wrapper around the QoS-enabled function. - int open (int type, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr); - -protected: - /// Constructor with arguments to call the BSD-style system - /// call (no QoS). - ACE_SOCK (int type, - int protocol_family, - int protocol = 0, - int reuse_addr = 0); - - /// Constructor with arguments to call the QoS-enabled - /// function. - ACE_SOCK (int type, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr); - - /// Default constructor is protected to prevent instances of this class - /// from being defined. - ACE_SOCK (void); - -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" -#endif /* ACE_SOCK_H */ diff --git a/ace/SOCK.i b/ace/SOCK.i deleted file mode 100644 index 78b17d3e36e..00000000000 --- a/ace/SOCK.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SOCK.i - -ASYS_INLINE -ACE_SOCK::~ACE_SOCK (void) -{ - // ACE_TRACE ("ACE_SOCK::~ACE_SOCK"); -} - -ASYS_INLINE int -ACE_SOCK::set_option (int level, - int option, - void *optval, - int optlen) const -{ - ACE_TRACE ("ACE_SOCK::set_option"); - return ACE_OS::setsockopt (this->get_handle (), level, - option, (char *) optval, optlen); -} - -// Provides access to the ACE_OS::getsockopt system call. - -ASYS_INLINE int -ACE_SOCK::get_option (int level, - int option, - void *optval, - int *optlen) const -{ - ACE_TRACE ("ACE_SOCK::get_option"); - return ACE_OS::getsockopt (this->get_handle (), level, - option, (char *) optval, optlen); -} diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp deleted file mode 100644 index a07834ba6bc..00000000000 --- a/ace/SOCK_Acceptor.cpp +++ /dev/null @@ -1,403 +0,0 @@ -// SOCK_Acceptor.cpp -// $Id$ - -#include "ace/SOCK_Acceptor.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_HAS_WINCE) -#include "ace/OS_QoS.h" -#endif // ACE_HAS_WINCE - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/Synch.h" - -ACE_RCSID(ace, SOCK_Acceptor, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Acceptor) - -// Do nothing routine for constructor. - -ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (void) -{ - ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor"); -} - -// Performs the timed accept operation. - -int -ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, - int restart, - int &in_blocking_mode) const -{ - ACE_TRACE ("ACE_SOCK_Acceptor::shared_accept_start"); - - ACE_HANDLE handle = this->get_handle (); - - // Handle the case where we're doing a timed . - if (timeout != 0) - { - if (ACE::handle_timed_accept (handle, - timeout, - restart) == -1) - return -1; - else - { - in_blocking_mode = ACE_BIT_DISABLED (ACE::get_flags (handle), - ACE_NONBLOCK); - // Set the handle into non-blocking mode if it's not already - // in it. - if (in_blocking_mode - && ACE::set_flags (handle, - ACE_NONBLOCK) == -1) - return -1; - } - } - - return 0; -} - -int -ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream, - int in_blocking_mode, - int reset_new_handle) const -{ - ACE_TRACE ("ACE_SOCK_Acceptor::shared_accept_finish ()"); - - ACE_HANDLE new_handle = new_stream.get_handle (); - - // Check to see if we were originally in blocking mode, and if so, - // set the 's handle and handle to be in blocking - // mode. - if (in_blocking_mode) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - - // Only disable ACE_NONBLOCK if we weren't in non-blocking mode - // originally. - ACE::clr_flags (this->get_handle (), - ACE_NONBLOCK); - ACE::clr_flags (new_handle, - ACE_NONBLOCK); - } - -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - if (reset_new_handle) - // Reset the event association inherited by the new handle. - ::WSAEventSelect ((SOCKET) new_handle, 0, 0); -#else - ACE_UNUSED_ARG (reset_new_handle); -#endif /* ACE_WIN32 */ - - return new_handle == ACE_INVALID_HANDLE ? -1 : 0; -} - -// General purpose routine for accepting new connections. - -int -ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, - ACE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const -{ - ACE_TRACE ("ACE_SOCK_Acceptor::accept"); - - int in_blocking_mode = 0; - if (this->shared_accept_start (timeout, - restart, - in_blocking_mode) == -1) - return -1; - else - { - // On Win32 the third parameter to must be a NULL - // pointer if we want to ignore the client's address. - int *len_ptr = 0; - sockaddr *addr = 0; - int len = 0; - - if (remote_addr != 0) - { - len = remote_addr->get_size (); - len_ptr = &len; - addr = (sockaddr *) remote_addr->get_addr (); - } - - do - new_stream.set_handle (ACE_OS::accept (this->get_handle (), - addr, - len_ptr)); - while (new_stream.get_handle () == ACE_INVALID_HANDLE - && restart != 0 - && errno == EINTR - && timeout == 0); - - // Reset the size of the addr, so the proper UNIX/IPv4/IPv6 family - // is known. - if (new_stream.get_handle () != ACE_INVALID_HANDLE - && remote_addr != 0) - { - remote_addr->set_size (len); - remote_addr->set_type (addr->sa_family); - } - } - - return this->shared_accept_finish (new_stream, - in_blocking_mode, - reset_new_handle); -} - -#if !defined (ACE_HAS_WINCE) -int -ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, - ACE_Accept_QoS_Params qos_params, - ACE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const -{ - ACE_TRACE ("ACE_SOCK_Acceptor::accept"); - - int in_blocking_mode = 0; - if (this->shared_accept_start (timeout, - restart, - in_blocking_mode) == -1) - return -1; - else - { - // On Win32 the third parameter to must be a NULL - // pointer if we want to ignore the client's address. - int *len_ptr = 0; - int len = 0; - sockaddr *addr = 0; - - if (remote_addr != 0) - { - len = remote_addr->get_size (); - len_ptr = &len; - addr = (sockaddr *) remote_addr->get_addr (); - } - - do - new_stream.set_handle (ACE_OS::accept (this->get_handle (), - addr, - len_ptr, - qos_params)); - while (new_stream.get_handle () == ACE_INVALID_HANDLE - && restart != 0 - && errno == EINTR - && timeout == 0); - - // Reset the size of the addr, which is only necessary for UNIX - // domain sockets. - if (new_stream.get_handle () != ACE_INVALID_HANDLE - && remote_addr != 0) - remote_addr->set_size (len); - } - - return this->shared_accept_finish (new_stream, - in_blocking_mode, - reset_new_handle); -} -#endif // ACE_HAS_WINCE - -void -ACE_SOCK_Acceptor::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_Acceptor::dump"); -} - -int -ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap, - int protocol_family, - int backlog) -{ - ACE_TRACE ("ACE_SOCK_Acceptor::shared_open"); - int error = 0; - -#if defined (ACE_HAS_IPV6) - ACE_ASSERT (protocol_family == PF_INET || protocol_family == PF_INET6); - - if (protocol_family == PF_INET6) - { - sockaddr_in6 local_inet6_addr; - ACE_OS::memset (ACE_reinterpret_cast (void *, - &local_inet6_addr), - 0, - sizeof local_inet6_addr); - - if (local_sap == ACE_Addr::sap_any) - { - local_inet6_addr.sin6_family = AF_INET6; - local_inet6_addr.sin6_port = 0; - local_inet6_addr.sin6_addr = in6addr_any; - } - else - local_inet6_addr = *ACE_reinterpret_cast (sockaddr_in6 *, - local_sap.get_addr ()); - - // We probably don't need a bind_port written here. - // There are currently no supported OS's that define - // ACE_LACKS_WILDCARD_BIND. - if (ACE_OS::bind (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - &local_inet6_addr), - sizeof local_inet6_addr) == -1) - error = 1; - } - else -#endif - if (protocol_family == PF_INET) - { - sockaddr_in local_inet_addr; - ACE_OS::memset (ACE_reinterpret_cast (void *, - &local_inet_addr), - 0, - sizeof local_inet_addr); - - if (local_sap == ACE_Addr::sap_any) - { - local_inet_addr.sin_port = 0; - } - else - local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *, - local_sap.get_addr ()); - if (local_inet_addr.sin_port == 0) - { - if (ACE::bind_port (this->get_handle ()) == -1) - error = 1; - } - else if (ACE_OS::bind (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - &local_inet_addr), - sizeof local_inet_addr) == -1) - error = 1; - } - else if (ACE_OS::bind (this->get_handle (), - (sockaddr *) local_sap.get_addr (), - local_sap.get_size ()) == -1) - error = 1; - - if (error != 0 - || ACE_OS::listen (this->get_handle (), - backlog) == -1) - { - error = 1; - this->close (); - } - - return error ? -1 : 0; -} - -int -ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Acceptor::open"); - - if (protocol_family == PF_UNSPEC) - protocol_family = local_sap.get_type (); - - if (ACE_SOCK::open (SOCK_STREAM, - protocol_family, - protocol, - protocolinfo, - g, - flags, - reuse_addr) == -1) - return -1; - else - return this->shared_open (local_sap, - protocol_family, - backlog); -} - -ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor"); - if (this->open (local_sap, - protocolinfo, - g, - flags, - reuse_addr, - protocol_family, - backlog, - protocol) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Acceptor"))); -} - -// General purpose routine for performing server ACE_SOCK creation. - -int -ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Acceptor::open"); - - if (local_sap != ACE_Addr::sap_any) - protocol_family = local_sap.get_type (); - else if (protocol_family == PF_UNSPEC) - { -#if defined (ACE_HAS_IPV6) - protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET; -#else - protocol_family = PF_INET; -#endif /* ACE_HAS_IPV6 */ - } - - if (ACE_SOCK::open (SOCK_STREAM, - protocol_family, - protocol, - reuse_addr) == -1) - return -1; - else - return this->shared_open (local_sap, - protocol_family, - backlog); -} - -// General purpose routine for performing server ACE_SOCK creation. - -ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor"); - if (this->open (local_sap, - reuse_addr, - protocol_family, - backlog, - protocol) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Acceptor"))); -} - -int -ACE_SOCK_Acceptor::close (void) -{ - return ACE_SOCK::close (); -} diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h deleted file mode 100644 index 9c580b41da7..00000000000 --- a/ace/SOCK_Acceptor.h +++ /dev/null @@ -1,173 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK_Acceptor.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_SOCK_ACCEPTOR_H -#define ACE_SOCK_ACCEPTOR_H -#include "ace/pre.h" - -#include "ace/SOCK_Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Time_Value.h" - -/** - * @class ACE_SOCK_Acceptor - * - * @brief Defines a factory that creates new s passively. - * - * The has its own "passive-mode" socket. - * This serves as a factory to create so-called "data-mode" - * sockets, which are what the encapsulates. - * Therefore, by inheriting from , - * gets its very own socket. - */ -class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK -{ -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_SOCK_Acceptor (void); - - /** - * Initialize a passive-mode BSD-style acceptor socket (no QoS). - * is the address that we're going to listen for - * connections on. If is 1 then we'll use the - * to reuse this address. - */ - ACE_SOCK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /// Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 - /// on success and -1 on failure. - ACE_SOCK_Acceptor (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /** - * Initialize a passive-mode BSD-style acceptor socket (no QoS). - * is the address that we're going to listen for - * connections on. If is 1 then we'll use the - * to reuse this address. Returns 0 on success and - * -1 on failure. - */ - int open (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /// Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 - /// on success and -1 on failure. - int open (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /// Close the socket. Returns 0 on success and -1 on failure. - int close (void); - - /// Default dtor. - ~ACE_SOCK_Acceptor (void); - - // = Passive connection methods. - /** - * Accept a new connection. A of 0 - * means block forever, a of {0, 0} means poll. - * == 1 means "restart if interrupted," i.e., if errno == EINTR. - * Note that inherits the "blocking mode" of - * , i.e., if acceptor factory is in - * non-blocking mode, the will be in non-blocking mode - * and vice versa. - */ - int accept (ACE_SOCK_Stream &new_stream, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; - -#if !defined (ACE_HAS_WINCE) - /** - * Accept a new connection using the QoS - * information in . A of 0 means block - * forever, a of {0, 0} means poll. == 1 means - * "restart if interrupted," i.e., if errno == EINTR. Note that - * inherits the "blocking mode" of - * , i.e., if acceptor factory is in - * non-blocking mode, the will be in non-blocking mode - * and vice versa. - */ - int accept (ACE_SOCK_Stream &new_stream, - ACE_Accept_QoS_Params qos_params, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; -#endif // ACE_HAS_WINCE - - // = Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - typedef ACE_SOCK_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Perform operations that must occur before is - /// called. - int shared_accept_start (ACE_Time_Value *timeout, - int restart, - int &in_blocking_mode) const; - - /// Perform operations that must occur after is - /// called. - int shared_accept_finish (ACE_SOCK_Stream new_stream, - int in_blocking_mode, - int reset_new_handle) const; - - /** - * This method factors out the common code and is called by - * both the QoS-enabled method and the BSD-style - * method. - */ - int shared_open (const ACE_Addr &local_sap, - int protocol_family, - int backlog); - -private: - /// Do not allow this function to percolate up to this interface... - int get_remote_addr (ACE_Addr &) const; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" -#endif /* ACE_SOCK_ACCEPTOR_H */ diff --git a/ace/SOCK_Acceptor.i b/ace/SOCK_Acceptor.i deleted file mode 100644 index 0ba44700809..00000000000 --- a/ace/SOCK_Acceptor.i +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SOCK_Acceptor.i - -ASYS_INLINE -ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor (void) -{ - ACE_TRACE ("ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor"); -} - - diff --git a/ace/SOCK_CODgram.cpp b/ace/SOCK_CODgram.cpp deleted file mode 100644 index 217257158fe..00000000000 --- a/ace/SOCK_CODgram.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// SOCK_CODgram.cpp -// $Id$ - -#include "ace/SOCK_CODgram.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_CODgram.i" -#endif - -ACE_RCSID(ace, SOCK_CODgram, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_CODgram) - -void -ACE_SOCK_CODgram::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_CODgram::dump"); -} - -// Here's the general-purpose constructor. - -ACE_SOCK_CODgram::ACE_SOCK_CODgram (const ACE_Addr &remote, const ACE_Addr &local, - int protocol_family, int protocol, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_CODgram::ACE_SOCK_CODgram"); - if (this->open (remote, local, - protocol_family, protocol, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SOCK_CODgram"))); -} - -/* This is the general-purpose open routine. Note that it performs - a different set of functions depending on the LOCAL and REMOTE - addresses passed to it. Here's the basic logic: - - 1. remote == ACE_Addr::sap_any && local == ACE_Addr::sap_any - if protocol_family == PF_INET then - bind the local address to a randomly generated port number... - - 2. remote == ACE_Addr::sap_any && local != ACE_Addr::sap_any - we are just binding the local address - (used primarily by servers) - - 3. remote != ACE_Addr::sap_any && local == ACE_Addr::sap_any - we are connecting to the remote address - (used primarily by clients) - - 4. remote != ACE_Addr::sap_any && local != ACE_Addr::sap_any - we are binding to the local address - and connecting to the remote address -*/ - -int -ACE_SOCK_CODgram::open (const ACE_Addr &remote, const ACE_Addr &local, - int protocol_family, int protocol, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_CODgram::open"); - if (ACE_SOCK::open (SOCK_DGRAM, protocol_family, - protocol, reuse_addr) == -1) - return -1; - else - { - int error = 0; - - if (local == ACE_Addr::sap_any && remote == ACE_Addr::sap_any) - { - // Assign an arbitrary port number from the transient range!! - - if (protocol_family == PF_INET - && ACE::bind_port (this->get_handle ()) == -1) - error = 1; - } - // We are binding just the local address. - else if (local != ACE_Addr::sap_any && remote == ACE_Addr::sap_any) - { - if (ACE_OS::bind (this->get_handle (), (sockaddr *) local.get_addr (), - local.get_size ()) == -1) - error = 1; - } - // We are connecting to the remote address. - else if (local == ACE_Addr::sap_any && remote != ACE_Addr::sap_any) - { - if (ACE_OS::connect (this->get_handle (), (sockaddr *) remote.get_addr (), - remote.get_size ()) == -1) - error = 1; - } - // We are binding to the local address and connecting to the - // remote addresses. - else - { - if (ACE_OS::bind (this->get_handle (), (sockaddr *) local.get_addr (), - local.get_size ()) == -1 - || ACE_OS::connect (this->get_handle (), (sockaddr *) remote.get_addr (), - remote.get_size ()) == -1) - error = 1; - } - if (error) - { - this->close (); - this->set_handle (ACE_INVALID_HANDLE); - } - return error ? -1 : 0; - } -} diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h deleted file mode 100644 index 0e653e4e2d1..00000000000 --- a/ace/SOCK_CODgram.h +++ /dev/null @@ -1,73 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK_CODgram.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_SOCK_CODGRAM_H -#define ACE_SOCK_CODGRAM_H -#include "ace/pre.h" - -#include "ace/SOCK_IO.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Addr.h" -#include "ace/INET_Addr.h" - -/** - * @class ACE_SOCK_CODgram - * - * @brief Defines the member functions for the ACE_SOCK connected - * datagram abstraction. - */ -class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_SOCK_CODgram (void); - - ACE_SOCK_CODgram (const ACE_Addr &remote_sap, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int protocol_family = ACE_PROTOCOL_FAMILY_INET, - int protocol = 0, - int reuse_addr = 0); - - /// Default dtor. - ~ACE_SOCK_CODgram (void); - - // Initiate a connected dgram. - - /// Initiate a connected dgram. - int open (const ACE_Addr &remote_sap, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int protocol_family = ACE_PROTOCOL_FAMILY_INET, - int protocol = 0, - int reuse_addr = 0); - - // = Meta-type info. - typedef ACE_INET_Addr PEER_ADDR; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_CODgram.i" -#endif - -#include "ace/post.h" -#endif /* ACE_SOCK_CODGRAM_H */ diff --git a/ace/SOCK_CODgram.i b/ace/SOCK_CODgram.i deleted file mode 100644 index 7dd5b40a1d6..00000000000 --- a/ace/SOCK_CODgram.i +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SOCK_CODgram.i - -ASYS_INLINE -ACE_SOCK_CODgram::ACE_SOCK_CODgram (void) -{ - ACE_TRACE ("ACE_SOCK_CODgram::ACE_SOCK_CODgram"); -} - -ASYS_INLINE -ACE_SOCK_CODgram::~ACE_SOCK_CODgram (void) -{ - ACE_TRACE ("ACE_SOCK_CODgram::~ACE_SOCK_CODgram"); -} - - diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp deleted file mode 100644 index 7f2b54fba2e..00000000000 --- a/ace/SOCK_Connector.cpp +++ /dev/null @@ -1,326 +0,0 @@ -// SOCK_Connector.cpp -// $Id$ - -#include "ace/SOCK_Connector.h" -#include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_HAS_WINCE) -#include "ace/OS_QoS.h" -#endif // ACE_HAS_WINCE - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Connector.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -ACE_RCSID(ace, SOCK_Connector, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Connector) - -void -ACE_SOCK_Connector::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_Connector::dump"); -} - -int -ACE_SOCK_Connector::shared_open (ACE_SOCK_Stream &new_stream, - int protocol_family, - int protocol, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_Connector::shared_open"); - - // Only open a new socket if we don't already have a valid handle. - if (new_stream.get_handle () == ACE_INVALID_HANDLE - && new_stream.open (SOCK_STREAM, - protocol_family, - protocol, - reuse_addr) == -1) - return -1; - else - return 0; -} - -int -ACE_SOCK_Connector::shared_open (ACE_SOCK_Stream &new_stream, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_Connector::shared_open"); - - // Only open a new socket if we don't already have a valid handle. - if (new_stream.get_handle () == ACE_INVALID_HANDLE - && new_stream.open (SOCK_STREAM, - protocol_family, - protocol, - protocolinfo, - g, - flags, - reuse_addr) == -1) - return -1; - else - return 0; -} - -int -ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap) -{ - ACE_TRACE ("ACE_SOCK_Connector::shared_connect_start"); - - if (local_sap != ACE_Addr::sap_any) - { - sockaddr *laddr = ACE_reinterpret_cast (sockaddr *, - local_sap.get_addr ()); - int size = local_sap.get_size (); - - if (ACE_OS::bind (new_stream.get_handle (), - laddr, - size) == -1) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - new_stream.close (); - return -1; - } - } - - // Enable non-blocking, if required. - if (timeout != 0 - && new_stream.enable (ACE_NONBLOCK) == -1) - return -1; - else - return 0; -} - -int -ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, - const ACE_Time_Value *timeout, - int result) -{ - ACE_TRACE ("ACE_SOCK_Connector::shared_connect_finish"); - // Save/restore errno. - ACE_Errno_Guard error (errno); - - if (result == -1 && timeout != 0) - { - // Check whether the connection is in progress. - if (error == EINPROGRESS || error == EWOULDBLOCK) - { - // This expression checks if we were polling. - if (timeout->sec () == 0 - && timeout->usec () == 0) - error = EWOULDBLOCK; - // Wait synchronously using timeout. - else if (this->complete (new_stream, - 0, - timeout) == -1) - error = errno; - else - return 0; - } - } - - // EISCONN is treated specially since this routine may be used to - // check if we are already connected. - if (result != -1 || error == EISCONN) - // Start out with non-blocking disabled on the . - new_stream.disable (ACE_NONBLOCK); - else if (!(error == EWOULDBLOCK || error == ETIMEDOUT)) - new_stream.close (); - - return result; -} - -// Actively connect and produce a new ACE_SOCK_Stream if things go well... - -int -ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int /* flags */, - int /* perms */, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Connector::connect"); - - if (this->shared_open (new_stream, - remote_sap.get_type (), - protocol, - reuse_addr) == -1) - return -1; - else if (this->shared_connect_start (new_stream, - timeout, - local_sap) == -1) - return -1; - - int result = ACE_OS::connect (new_stream.get_handle (), - ACE_reinterpret_cast (sockaddr *, - remote_sap.get_addr ()), - remote_sap.get_size ()); - - return this->shared_connect_finish (new_stream, - timeout, - result); -} - -#if !defined (ACE_HAS_WINCE) -int -ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - ACE_Protocol_Info * protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int /* perms */) -{ - ACE_TRACE ("ACE_SOCK_Connector::connect"); - - if (this->shared_open (new_stream, - remote_sap.get_type (), - 0, - protocolinfo, - g, - flags, - reuse_addr) == -1) - return -1; - else if (this->shared_connect_start (new_stream, - timeout, - local_sap) == -1) - return -1; - - int result = ACE_OS::connect (new_stream.get_handle (), - ACE_reinterpret_cast (sockaddr *, - remote_sap.get_addr ()), - remote_sap.get_size (), - qos_params); - - return this->shared_connect_finish (new_stream, - timeout, - result); -} -#endif // ACE_HAS_WINCE - -// Try to complete a non-blocking connection. - -int -ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, - ACE_Addr *remote_sap, - const ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_SOCK_Connector::complete"); - ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), - tv); - // We failed to get connected. - if (h == ACE_INVALID_HANDLE) - { -#if defined (ACE_WIN32) - // Win32 has a timing problem - if you check to see if the - // connection has completed too fast, it will fail - so wait - // microseconds to let it catch up - // then retry to see if it's a real failure. - ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY); - ACE_OS::sleep (time); - h = ACE::handle_timed_complete (new_stream.get_handle (), - tv); - if (h == ACE_INVALID_HANDLE) - { -#endif /* ACE_WIN32 */ - // Save/restore errno. - ACE_Errno_Guard error (errno); - new_stream.close (); - return -1; -#if defined (ACE_WIN32) - } -#endif /* ACE_WIN32 */ - } - - if (remote_sap != 0) - { - int len = remote_sap->get_size (); - sockaddr *addr = ACE_reinterpret_cast (sockaddr *, - remote_sap->get_addr ()); - if (ACE_OS::getpeername (h, - addr, - &len) == -1) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - new_stream.close (); - return -1; - } - } - - // Start out with non-blocking disabled on the . - new_stream.disable (ACE_NONBLOCK); - return 0; -} - -ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector"); - - if (this->connect (new_stream, - remote_sap, - timeout, - local_sap, - reuse_addr, - flags, - perms, - protocol) == -1 - && timeout != 0 - && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); -} - -#if !defined (ACE_HAS_WINCE) -ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int perms) -{ - ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector"); - - if (this->connect (new_stream, - remote_sap, - qos_params, - timeout, - local_sap, - protocolinfo, - g, - flags, - reuse_addr, - perms) == -1 - && timeout != 0 - && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); -} -#endif // ACE_HAS_WINCE diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h deleted file mode 100644 index 514abebd05c..00000000000 --- a/ace/SOCK_Connector.h +++ /dev/null @@ -1,320 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK_Connector.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - -#ifndef ACE_SOCK_CONNECTOR_H -#define ACE_SOCK_CONNECTOR_H -#include "ace/pre.h" - -#include "ace/SOCK_Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Time_Value.h" - -/** - * @class ACE_SOCK_Connector - * - * @brief Defines a factory that actively connects to a remote IP - * address and TCP port, creating a new @c ACE_SOCK_Stream object. - * - * The @c ACE_SOCK_Connector doesn't have a socket of its own, - * i.e., it simply "borrows" the one from the @c ACE_SOCK_Stream - * that's being connected. The reason for this is that the - * underlying socket API doesn't use a factory socket to connect - * data mode sockets. Therefore, there's no need to inherit - * @c ACE_SOCK_Connector from @c ACE_SOCK. A nice side-effect of - * this is that @c ACE_SOCK_Connector objects do not store state so - * they can be used reentrantly in multithreaded programs. - */ -class ACE_Export ACE_SOCK_Connector -{ -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_SOCK_Connector (void); - - /** - * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream - * object if the connection succeeds. - * - * @param new_stream The @c ACE_SOCK_Stream object that will be connected - * to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol = 0); - -#if !defined (ACE_HAS_WINCE) - /** - * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream - * object if the connection succeeds. - * - * @param new_stream The @c ACE_SOCK_Stream object that will be connected - * to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param qos_params Contains QoS parameters that are passed to the - * IntServ (RSVP) and DiffServ protocols. - * @see ACE_QoS_Params. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - ACE_Protocol_Info *protocolinfo = 0, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, - int reuse_addr = 0, - int perms = 0); -#endif // ACE_HAS_WINCE - - /** - * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream - * object if the connection succeeds. - * - * @param new_stream The @c ACE_SOCK_Stream object that will be connected - * to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - int connect (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol = 0); - -#if !defined (ACE_HAS_WINCE) - /** - * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream - * object if the connection succeeds. - * - * @param new_stream The @c ACE_SOCK_Stream object that will be connected - * to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param qos_params Contains QoS parameters that are passed to the - * IntServ (RSVP) and DiffServ protocols. - * @see ACE_QoS_Params. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - int connect (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - ACE_Protocol_Info *protocolinfo = 0, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, - int reuse_addr = 0, - int perms = 0); -#endif // ACE_HAS_WINCE - - /// Default dtor. - ~ACE_SOCK_Connector (void); - - // = Completion routine. - /** - * Try to complete a nonblocking connection that was begun by a - * previous call to connect with a {0, 0} ACE_Time_Value timeout. - * @see connect(). - * - * @param new_stream The @c ACE_SOCK_Stream object that will be connected - * to the peer. - * @param remote_sap If non-0, it points to the @c ACE_INET_Addr object - * that will contain the address of the connected peer. - * @param timeout Same values and return value possibilites as for - * connect(). @see connect(). - */ - int complete (ACE_SOCK_Stream &new_stream, - ACE_Addr *remote_sap = 0, - const ACE_Time_Value *timeout = 0); - - /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); - - // = Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - typedef ACE_SOCK_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Perform operations that ensure the socket is opened using - /// BSD-style semantics (no QoS). - int shared_open (ACE_SOCK_Stream &new_stream, - int protocol_family, - int protocol, - int reuse_addr); - - /// Perform operations that ensure the socket is opened using - /// QoS-enabled semantics. - int shared_open (ACE_SOCK_Stream &new_stream, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr); - - /// Perform operations that must be called before . - int shared_connect_start (ACE_SOCK_Stream &new_stream, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap); - - /// Perform operations that must be called after . - int shared_connect_finish (ACE_SOCK_Stream &new_stream, - const ACE_Time_Value *timeout, - int result); -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Connector.i" -#endif - -#include "ace/post.h" -#endif /* ACE_SOCK_CONNECTOR_H */ diff --git a/ace/SOCK_Connector.i b/ace/SOCK_Connector.i deleted file mode 100644 index 35108219086..00000000000 --- a/ace/SOCK_Connector.i +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SOCK_Connector.i - -// This constructor is used by a client when it wants to connect to -// the specified REMOTE_SAP address using a blocking open. - -ASYS_INLINE -ACE_SOCK_Connector::~ACE_SOCK_Connector (void) -{ - ACE_TRACE ("ACE_SOCK_Connector::~ACE_SOCK_Connector"); -} - -// Do-nothing constructor... - -ASYS_INLINE -ACE_SOCK_Connector::ACE_SOCK_Connector (void) -{ - ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector"); -} - -ASYS_INLINE int -ACE_SOCK_Connector::reset_new_handle (ACE_HANDLE handle) -{ -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - // Reset the event association - return ::WSAEventSelect ((SOCKET) handle, - 0, - 0); -#else /* !defined ACE_HAS_WINSOCK2 */ - ACE_UNUSED_ARG (handle); - return 0; -#endif /* ACE_WIN32 */ -} diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp deleted file mode 100644 index d9814ed508b..00000000000 --- a/ace/SOCK_Dgram.cpp +++ /dev/null @@ -1,542 +0,0 @@ -#include "ace/SOCK_Dgram.h" -#include "ace/Handle_Set.h" -#include "ace/Synch.h" -#include "ace/Log_Msg.h" -#include "ace/INET_Addr.h" -#include "ace/ACE.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Dgram.i" -#endif - -ACE_RCSID (ace, - SOCK_Dgram, - "$Id$") - -ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Dgram) - -void -ACE_SOCK_Dgram::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::dump"); -} - -// Allows a client to read from a socket without having to provide a -// buffer to read. This method determines how much data is in the -// socket, allocates a buffer of this size, reads in the data, and -// returns the number of bytes read. - -ssize_t -ACE_SOCK_Dgram::recv (iovec *io_vec, - ACE_Addr &addr, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::recv"); -#if defined (FIONREAD) - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - - // Check the status of the current socket to make sure there's data - // to recv (or time out). - int select_width; -# if defined (ACE_WIN64) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -# else - select_width = int (this->get_handle ()) + 1; -# endif /* ACE_WIN64 */ - switch (ACE_OS::select (select_width, - handle_set, - 0, 0, - timeout)) - { - case -1: - return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: - // Goes fine, fallthrough to get data - break; - } - - sockaddr *saddr = (sockaddr *) addr.get_addr (); - int addr_len = addr.get_size (); - u_long inlen; - - if (ACE_OS::ioctl (this->get_handle (), - FIONREAD, (u_long *) &inlen) == -1) - return -1; - else if (inlen > 0) - { - ACE_NEW_RETURN (io_vec->iov_base, - char[inlen], - -1); - io_vec->iov_len = ACE_OS::recvfrom (this->get_handle (), - (char *) io_vec->iov_base, - inlen, - flags, - (sockaddr *) saddr, - &addr_len); - addr.set_size (addr_len); - return io_vec->iov_len; - } - else - return 0; -#else - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (addr); - ACE_UNUSED_ARG (io_vec); - ACE_UNUSED_ARG (timeout); - ACE_NOTSUP_RETURN (-1); -#endif /* FIONREAD */ -} - -// Here's the shared open function. Note that if we are using the -// PF_INET protocol family and the address of LOCAL == the address of -// the special variable SAP_ANY then we are going to arbitrarily bind -// to a portnumber. - -int -ACE_SOCK_Dgram::shared_open (const ACE_Addr &local, - int protocol_family) -{ - ACE_TRACE ("ACE_SOCK_Dgram::shared_open"); - int error = 0; - - if (local == ACE_Addr::sap_any) - { - if (protocol_family == PF_INET -#if defined (ACE_HAS_IPV6) - || protocol_family == PF_INET6 -#endif /* ACE_HAS_IPV6 */ - ) - { - if (ACE::bind_port (this->get_handle ()) == -1) - error = 1; - } - } - else if (ACE_OS::bind (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - local.get_addr ()), - local.get_size ()) == -1) - error = 1; - - if (error != 0) - this->close (); - - return error ? -1 : 0; -} - -int -ACE_SOCK_Dgram::open (const ACE_Addr &local, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr) -{ - if (ACE_SOCK::open (SOCK_DGRAM, - protocol_family, - protocol, - protocolinfo, - g, - flags, - reuse_addr) == -1) - return -1; - else if (this->shared_open (local, - protocol_family) == -1) - return -1; - else - return 0; -} - -// Here's the general-purpose open routine. - -int -ACE_SOCK_Dgram::open (const ACE_Addr &local, - int protocol_family, - int protocol, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_Dgram::open"); - - if (local != ACE_Addr::sap_any) - protocol_family = local.get_type (); - else if (protocol_family == PF_UNSPEC) - { -#if defined (ACE_HAS_IPV6) - protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET; -#else - protocol_family = PF_INET; -#endif /* ACE_HAS_IPV6 */ - } - - if (ACE_SOCK::open (SOCK_DGRAM, - protocol_family, - protocol, - reuse_addr) == -1) - return -1; - else - return this->shared_open (local, - protocol_family); -} - -// Here's the general-purpose constructor used by a connectionless -// datagram ``server''... - -ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, - int protocol_family, - int protocol, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram"); - - if (this->open (local, - protocol_family, - protocol, - reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Dgram"))); -} - -ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram"); - if (this->open (local, - protocol_family, - protocol, - protocolinfo, - g, - flags, - reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Dgram"))); -} - -#if defined (ACE_HAS_MSG) -// Send an iovec of size N to ADDR as a datagram (connectionless -// version). - -ssize_t -ACE_SOCK_Dgram::send (const iovec iov[], - int n, - const ACE_Addr &addr, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::send"); - msghdr send_msg; - - send_msg.msg_iov = (iovec *) iov; - send_msg.msg_iovlen = n; -#if defined (ACE_HAS_SOCKADDR_MSG_NAME) - send_msg.msg_name = (struct sockaddr *) addr.get_addr (); -#else - send_msg.msg_name = (char *) addr.get_addr (); -#endif /* ACE_HAS_SOCKADDR_MSG_NAME */ - send_msg.msg_namelen = addr.get_size (); - -#if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG) - send_msg.msg_control = 0; - send_msg.msg_controllen = 0; - send_msg.msg_flags = 0; -#else - send_msg.msg_accrights = 0; - send_msg.msg_accrightslen = 0; -#endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */ - - return ACE_OS::sendmsg (this->get_handle (), - &send_msg, - flags); -} - -// Recv an iovec of size N to ADDR as a datagram (connectionless -// version). - -ssize_t -ACE_SOCK_Dgram::recv (iovec iov[], - int n, - ACE_Addr &addr, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::recv"); - msghdr recv_msg; - - recv_msg.msg_iov = (iovec *) iov; - recv_msg.msg_iovlen = n; -#if defined (ACE_HAS_SOCKADDR_MSG_NAME) - recv_msg.msg_name = (struct sockaddr *) addr.get_addr (); -#else - recv_msg.msg_name = (char *) addr.get_addr (); -#endif /* ACE_HAS_SOCKADDR_MSG_NAME */ - recv_msg.msg_namelen = addr.get_size (); - -#if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG) - recv_msg.msg_control = 0 ; - recv_msg.msg_controllen = 0 ; -#else - recv_msg.msg_accrights = 0; - recv_msg.msg_accrightslen = 0; -#endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */ - - ssize_t status = ACE_OS::recvmsg (this->get_handle (), - &recv_msg, - flags); - addr.set_size (recv_msg.msg_namelen); - return status; -} - -#else /* ACE_HAS_MSG */ - -// Send an iovec of size N to ADDR as a datagram (connectionless -// version). - -ssize_t -ACE_SOCK_Dgram::send (const iovec iov[], - int n, - const ACE_Addr &addr, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::send"); - - size_t length = 0; - int i; - - // Determine the total length of all the buffers in . - for (i = 0; i < n; i++) -#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530)) - // The iov_len is unsigned in Borland. If we go ahead and try the - // if, it will emit a warning. - if (iov[i].iov_len < 0) - return -1; - else -#endif - length += iov[i].iov_len; - - char *buf; - -#if defined (ACE_HAS_ALLOCA) - buf = alloca (length); -#else - ACE_NEW_RETURN (buf, - char[length], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - char *ptr = buf; - - for (i = 0; i < n; i++) - { - ACE_OS::memcpy (ptr, iov[i].iov_base, iov[i].iov_len); - ptr += iov[i].iov_len; - } - - ssize_t result = ACE_SOCK_Dgram::send (buf, length, addr, flags); -#if !defined (ACE_HAS_ALLOCA) - delete [] buf; -#endif /* !defined (ACE_HAS_ALLOCA) */ - return result; -} - -// Recv an iovec of size N to ADDR as a datagram (connectionless -// version). - -ssize_t -ACE_SOCK_Dgram::recv (iovec iov[], - int n, - ACE_Addr &addr, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::recv"); - - ssize_t length = 0; - int i; - - for (i = 0; i < n; i++) -#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530)) - // The iov_len is unsigned in Borland. If we go ahead and try the - // if, it will emit a warning. - if (iov[i].iov_len < 0) - return -1; - else -#endif - length += iov[i].iov_len; - - char *buf; - -#if defined (ACE_HAS_ALLOCA) - buf = alloca (length); -#else - ACE_NEW_RETURN (buf, - char[length], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - length = ACE_SOCK_Dgram::recv (buf, length, addr, flags); - - if (length != -1) - { - char *ptr = buf; - int copyn = length; - - for (i = 0; - i < n && copyn > 0; - i++) - { - ACE_OS::memcpy (iov[i].iov_base, ptr, - // iov_len is int on some platforms, size_t on others - copyn > (int) iov[i].iov_len - ? (size_t) iov[i].iov_len - : (size_t) copyn); - ptr += iov[i].iov_len; - copyn -= iov[i].iov_len; - } - } - -#if !defined (ACE_HAS_ALLOCA) - delete [] buf; -#endif /* !defined (ACE_HAS_ALLOCA) */ - return length; -} - -#endif /* ACE_HAS_MSG */ - -ssize_t -ACE_SOCK_Dgram::recv (void *buf, - size_t n, - ACE_Addr &addr, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - - // Check the status of the current socket. - int select_width; -#if defined (ACE_WIN64) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -#else - select_width = int (this->get_handle ()) + 1; -#endif /* ACE_WIN64 */ - switch (ACE_OS::select (select_width, - handle_set, - 0, - 0, - timeout)) - { - case -1: - return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: - // Goes fine, call to get data - return this->recv (buf, n, addr, flags); - } -} - -ssize_t -ACE_SOCK_Dgram::send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - - // Check the status of the current socket. - int select_width; -#if defined (ACE_WIN64) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -#else - select_width = int (this->get_handle ()) + 1; -#endif /* ACE_WIN64 */ - switch (ACE_OS::select (select_width, - 0, - handle_set, - 0, - timeout)) - { - case -1: - return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: - // Goes fine, call to transmit the data. - return this->send (buf, n, addr, flags); - } -} - -void -ACE_SOCK_Dgram::set_nic (const char *option_value) -{ - /* The first step would be to get the interface address for the - nic_name specified */ - ip_mreq multicast_address; - ACE_INET_Addr mcast_addr; -#if defined (ACE_WIN32) - // This port number is not necessary, just convenient - ACE_INET_Addr interface_addr; - if (interface_addr.set (mcast_addr.get_port_number (), - option_value) == -1) - return; - multicast_address.imr_interface.s_addr = - htonl (interface_addr.get_ip_address ()); -#else - ifreq if_address; - -#if defined (ACE_PSOS) - // Look up the interface by number, not name. - if_address.ifr_ifno = ACE_OS::atoi (option_value); -#else - ACE_OS::strcpy (if_address.ifr_name, option_value); -#endif /* defined (ACE_PSOS) */ - - if (ACE_OS::ioctl (this->get_handle (), - SIOCGIFADDR, - &if_address) == -1) - return; - - /* Cast this into the required format */ - sockaddr_in *socket_address; - socket_address = ACE_reinterpret_cast(sockaddr_in *, - &if_address.ifr_addr); - multicast_address.imr_interface.s_addr = socket_address->sin_addr.s_addr; -#endif /* ACE_WIN32 */ - - /* - * Now. I got the interface address for the 'nic' specified. - * Use that to set the nic option. - */ - - this->ACE_SOCK::set_option (IPPROTO_IP, - IP_MULTICAST_IF, - &multicast_address.imr_interface.s_addr, - sizeof (struct in_addr)); -} diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h deleted file mode 100644 index b8a6af6a1bc..00000000000 --- a/ace/SOCK_Dgram.h +++ /dev/null @@ -1,217 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK_Dgram.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_SOCK_DGRAM_H -#define ACE_SOCK_DGRAM_H -#include "ace/pre.h" - -#include "ace/SOCK.h" -#include "ace/INET_Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Addr.h" - -/** - * @class ACE_SOCK_Dgram - * - * @brief Defines the member functions for the ACE_SOCK datagram - * abstraction. - */ -class ACE_Export ACE_SOCK_Dgram : public ACE_SOCK -{ -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_SOCK_Dgram (void); - - /// This is a BSD-style method (i.e., no QoS) for initiating a socket - /// dgram that will accept datagrams at the address. - ACE_SOCK_Dgram (const ACE_Addr &local, - int protocol_family = ACE_PROTOCOL_FAMILY_INET, - int protocol = 0, - int reuse_addr = 0); - - /** - * This is a QoS-enabed method for initiating a socket dgram that - * will accept datagrams at the address. The - * are passed to . - */ - ACE_SOCK_Dgram (const ACE_Addr &local, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, - int reuse_addr = 0); - - /// This is a BSD-style method (i.e., no QoS) for initiating a socket - /// dgram that will accept datagrams at the address. - int open (const ACE_Addr &local, - int protocol_family = ACE_PROTOCOL_FAMILY_INET, - int protocol = 0, - int reuse_addr = 0); - - /** - * This is a QoS-enabed method for initiating a socket dgram that - * will accept datagrams at the address. The - * are passed to . - */ - int open (const ACE_Addr &local, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, - int reuse_addr = 0); - - /// Default dtor. - ~ACE_SOCK_Dgram (void); - - // = Data transfer routines. - /// Send an byte to the datagram socket (uses ). - ssize_t send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags = 0) const; - - /// Receive an byte from the datagram socket (uses - /// ). - ssize_t recv (void *buf, - size_t n, - ACE_Addr &addr, - int flags = 0) const; - - /** - * Allows a client to read from a socket without having to provide a - * buffer to read. This method determines how much data is in the - * socket, allocates a buffer of this size, reads in the data, and - * returns the number of bytes read. The caller is responsible for - * deleting the member in the field of using the - * ``delete []'' syntax. - */ - ssize_t recv (iovec *io_vec, - ACE_Addr &addr, - int flags = 0, - const ACE_Time_Value *timeout = 0) const; - - /// Send an of size to the datagram socket (uses - /// ). - ssize_t send (const iovec iov[], - int n, - const ACE_Addr &addr, - int flags = 0) const; - - /// Recv an of size to the datagram socket (uses - /// ). - ssize_t recv (iovec iov[], - int n, - ACE_Addr &addr, - int flags = 0) const; - - /** - * Wait up to amount of time to receive a datagram into - * . The indicates how long to blocking - * trying to receive. If == 0, the caller will block - * until action is possible, else will wait until the relative time - * specified in * elapses). If times out a -1 is - * returned with . If it succeeds the number of - * bytes received is returned. - */ - ssize_t recv (void *buf, - size_t n, - ACE_Addr &addr, - int flags, - const ACE_Time_Value *timeout) const; - - /** - * Wait up to amount of time to send a datagram to - * . The indicates how long to blocking - * trying to receive. If == 0, the caller will block - * until action is possible, else will wait until the relative time - * specified in * elapses). If times out a -1 is - * returned with . If it succeeds the number of - * bytes sent is returned. - */ - ssize_t send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags, - const ACE_Time_Value *timeout) const; - - /// Send worth of to using overlapped - /// I/O (uses ). Returns 0 on success. - ssize_t send (const iovec buffers[], - int buffer_count, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr &addr, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const; - - /// Recv worth of from using - /// overlapped I/O (uses ). Returns 0 on success. - ssize_t recv (iovec buffers[], - int buffer_count, - size_t &number_of_bytes_recvd, - int &flags, - ACE_Addr &addr, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const; - - /// Send an byte to the datagram socket (uses ). - ssize_t send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const; - - /// Receive an byte from the datagram socket (uses - /// ). - ssize_t recv (void *buf, - size_t n, - ACE_Addr &addr, - int flags, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const; - - // = Meta-type info. - typedef ACE_INET_Addr PEER_ADDR; - - /// Dump the state of an object. - void dump (void) const; - - void set_nic (const char *option_value); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Open is shared by this and by . - int shared_open (const ACE_Addr &local, - int protocol_family); - -private: - /// Do not allow this function to percolate up to this interface... - int get_remote_addr (ACE_Addr &) const; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Dgram.i" -#endif - -#include "ace/post.h" -#endif /* ACE_SOCK_DGRAM_H */ diff --git a/ace/SOCK_Dgram.i b/ace/SOCK_Dgram.i deleted file mode 100644 index 6f5ca45bf27..00000000000 --- a/ace/SOCK_Dgram.i +++ /dev/null @@ -1,158 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SOCK_Dgram.i - -// Here's the simple-minded constructor. - -ASYS_INLINE -ACE_SOCK_Dgram::ACE_SOCK_Dgram (void) -{ - ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram"); -} - -ASYS_INLINE -ACE_SOCK_Dgram::~ACE_SOCK_Dgram (void) -{ - ACE_TRACE ("ACE_SOCK_Dgram::~ACE_SOCK_Dgram"); -} - -// an N byte datagram to (connectionless version). - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::send"); - sockaddr *saddr = (sockaddr *) addr.get_addr (); - int len = addr.get_size (); - return ACE_OS::sendto (this->get_handle (), - (const char *) buf, - n, - flags, - (struct sockaddr *) saddr, - len); -} - -// an n byte datagram (connectionless version). - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::recv (void *buf, - size_t n, - ACE_Addr &addr, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::recv"); - sockaddr *saddr = (sockaddr *) addr.get_addr (); - int addr_len = addr.get_size (); - - ssize_t status = ACE_OS::recvfrom (this->get_handle (), - (char *) buf, - n, - flags, - (sockaddr *) saddr, - &addr_len); - addr.set_size (addr_len); - return status; -} - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::send (const iovec buffers[], - int buffer_count, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr &addr, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::send"); - sockaddr *saddr = (sockaddr *) addr.get_addr (); - int len = addr.get_size (); - return ACE_OS::sendto (this->get_handle (), - buffers, - buffer_count, - number_of_bytes_sent, - flags, - (const sockaddr *) saddr, - len, - overlapped, - func); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::recv (iovec buffers[], - int buffer_count, - size_t &number_of_bytes_recvd, - int &flags, - ACE_Addr &addr, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::recv"); - sockaddr *saddr = (sockaddr *) addr.get_addr (); - int addr_len = addr.get_size (); - - ssize_t status = ACE_OS::recvfrom (this->get_handle (), - buffers, - buffer_count, - number_of_bytes_recvd, - flags, - (sockaddr *) saddr, - &addr_len, - overlapped, - func); - addr.set_size (addr_len); - return status; -} - -// an N byte datagram to (connectionless version). - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::send"); - - iovec buffer[1]; - buffer[0].iov_len = ACE_static_cast (u_long, n); // Betting on < 4G - buffer[0].iov_base = (char *) buf; - size_t number_of_bytes_sent = 0; - return this->send (buffer, - 1, - number_of_bytes_sent, - flags, - addr, - overlapped, - func); -} - -// an n byte datagram (connectionless version). - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram::recv (void *buf, - size_t n, - ACE_Addr &addr, - int flags, - ACE_OVERLAPPED *overlapped, - ACE_OVERLAPPED_COMPLETION_FUNC func) const -{ - ACE_TRACE ("ACE_SOCK_Dgram::recv"); - - iovec buffer[1]; - buffer[0].iov_len = ACE_static_cast (u_long, n); // Betting on < 4G - buffer[0].iov_base = (char *) buf; - size_t number_of_bytes_recvd = 0; - return this->recv (buffer, - 1, - number_of_bytes_recvd, - flags, - addr, - overlapped, - func); -} diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp deleted file mode 100644 index 107344e657f..00000000000 --- a/ace/SOCK_Dgram_Bcast.cpp +++ /dev/null @@ -1,334 +0,0 @@ -// $Id$ - -#include "ace/SOCK_Dgram_Bcast.h" -#include "ace/Log_Msg.h" -#include "ace/ACE.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Dgram_Bcast.i" -#endif - -ACE_RCSID(ace, SOCK_Dgram_Bcast, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Bcast) - -ACE_Bcast_Node::ACE_Bcast_Node (ACE_INET_Addr &addr, - ACE_Bcast_Node *next) - : bcast_addr_ (addr), - next_ (next) -{ - ACE_TRACE ("ACE_Bcast_Node::ACE_Bcast_Node"); -} - -void -ACE_SOCK_Dgram_Bcast::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::dump"); -} - -// Close up and release resources. - -int -ACE_SOCK_Dgram_Bcast::close (void) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::close"); - - ACE_Bcast_Node *temp = this->if_list_; - - // Release the dynamically allocated memory. - - while (temp != 0) - { - ACE_Bcast_Node *hold = temp->next_; - delete temp; - temp = hold; - } - - // Shut down the descriptor. - return ACE_SOCK::close (); -} - -// Here's the simple-minded constructor. - -ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (void) - : if_list_ (0) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast"); -} - -// Here's the general-purpose constructor used by a connectionless -// datagram ``server''... - -ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, - int protocol_family, - int protocol, - int reuse_addr, - const ACE_TCHAR *host_name) - : ACE_SOCK_Dgram (local, protocol_family, protocol, reuse_addr), - if_list_ (0) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast"); - - if (this->mk_broadcast (host_name) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Dgram_Bcast"))); -} - -// Here's the general-purpose open routine. - -int -ACE_SOCK_Dgram_Bcast::open (const ACE_Addr &local, - int protocol_family, - int protocol, - int reuse_addr, - const ACE_TCHAR *host_name) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::open"); - - if (this->ACE_SOCK_Dgram::open (local, protocol_family, - protocol, reuse_addr) == -1) - return -1; - - return this->mk_broadcast (host_name); -} - -// Make broadcast available for Datagram socket. - -int -ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::mk_broadcast"); - - int one = 1; - - if (ACE_OS::setsockopt (this->get_handle (), - SOL_SOCKET, - SO_BROADCAST, - (char *) &one, - sizeof one) == -1) - return -1; - -#if !defined (ACE_WIN32) - ACE_HANDLE s = this->get_handle (); - - char buf[BUFSIZ]; - struct ifconf ifc; - - ifc.ifc_len = sizeof buf; - ifc.ifc_buf = buf; - - // Get interface structure and initialize the addresses using UNIX - // techniques. - if (ACE_OS::ioctl (s, - SIOCGIFCONF, - (char *) &ifc) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)"), - ACE_INVALID_HANDLE); - - struct ifreq *ifr = ifc.ifc_req; - - struct sockaddr_in host_addr; - - //Get host ip address - if (host_name) - { - hostent *hp = ACE_OS::gethostbyname (host_name); - - if (hp == 0) - return -1; - else -#if defined(_UNICOS) - { - ACE_UINT64 haddr; // a place to put the address - char * haddrp = (char *) &haddr; // convert to char pointer - ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length); - host_addr.sin_addr.s_addr = haddr; - } -#else /* ! _UNICOS */ - ACE_OS::memcpy ((char *) &host_addr.sin_addr.s_addr, - (char *) hp->h_addr, - hp->h_length); -#endif /* ! _UNICOS */ - } - - for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; -#if !defined(CHORUS_4) && !defined(AIX) - n--, ifr++) -#else - n--, - ((ifr->ifr_addr.sa_len <= sizeof (struct sockaddr)) ? - ifr++ : - ifr = (struct ifreq *) - (ifr->ifr_addr.sa_len + (caddr_t) &ifr->ifr_addr))) -#endif /* CHORUS_4 */ - { - // Compare host ip address with interface ip address. - if (host_name) - { - struct sockaddr_in if_addr; - - ACE_OS::memcpy (&if_addr, - &ifr->ifr_addr, - sizeof if_addr); - - if (host_addr.sin_addr.s_addr != if_addr.sin_addr.s_addr) - continue; - } - - if (ifr->ifr_addr.sa_family != AF_INET) - { - // Note that some systems seem to generate 0 (AF_UNDEF) for - // the sa_family, even when there are no errors! Thus, we - // only print an error if this is not the case, or if we're - // in "debugging" mode. - if (ifr->ifr_addr.sa_family != 0 - || ACE::debug () > 0) - ACE_DEBUG ((LM_DEBUG, - "warning %p: sa_family: %d\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET", - ifr->ifr_addr.sa_family)); - continue; - } - - struct ifreq flags = *ifr; - struct ifreq if_req = *ifr; - - if (ACE_OS::ioctl (s, - SIOCGIFFLAGS, - (char *) &flags) == -1) - { - ACE_ERROR ((LM_ERROR, "%p\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)")); - continue; - } - - if (ACE_BIT_ENABLED (flags.ifr_flags, - IFF_UP) == 0) - { - ACE_ERROR ((LM_ERROR, "%p\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up")); - continue; - } - - if (ACE_BIT_ENABLED (flags.ifr_flags, - IFF_LOOPBACK)) - continue; - - if (ACE_BIT_ENABLED (flags.ifr_flags, - IFF_BROADCAST)) - { - if (ACE_OS::ioctl (s, - SIOCGIFBRDADDR, - (char *) &if_req) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)")); - else - { - ACE_INET_Addr addr (ACE_reinterpret_cast (sockaddr_in *, - &if_req.ifr_broadaddr), - sizeof if_req.ifr_broadaddr); - ACE_NEW_RETURN (this->if_list_, - ACE_Bcast_Node (addr, - this->if_list_), - -1); - } - } - else - ACE_ERROR ((LM_ERROR, "%p\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface.")); - } -#else - ACE_UNUSED_ARG (host_name); - - ACE_INET_Addr addr (u_short (0), - ACE_UINT32 (INADDR_BROADCAST)); - ACE_NEW_RETURN (this->if_list_, - ACE_Bcast_Node (addr, - this->if_list_), - -1); -#endif /* !ACE_WIN32 */ - return this->if_list_ == 0 ? -1 : 0; -} - -// Broadcast the datagram to every interface. Returns the average -// number of bytes sent. - -ssize_t -ACE_SOCK_Dgram_Bcast::send (const void *buf, - size_t n, - u_short port_number, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send"); - size_t iterations = 0; - ssize_t total_bytes = 0; - - if (this->if_list_ == 0) - return -1; - - for (ACE_Bcast_Node *temp = this->if_list_; - temp != 0; - temp = temp->next_) - { - temp->bcast_addr_.set_port_number (port_number); - - ssize_t bytes_sent = ACE_SOCK_Dgram::send (buf, - n, - temp->bcast_addr_, - flags); - - if (bytes_sent == -1) - return -1; - else - total_bytes += bytes_sent; - - iterations++; - } - - return iterations == 0 ? 0 : total_bytes / iterations; -} - -#if defined (ACE_HAS_MSG) -// Broadcast datagram to every interfaces. - -ssize_t -ACE_SOCK_Dgram_Bcast::send (const iovec iov[], - int n, - u_short /* port_number */, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send"); - - if (this->if_list_ == 0) - return -1; - - // Send the message to every interface. - - for (ACE_Bcast_Node *temp = this->if_list_; - temp != 0; - temp = temp->next_) - if (ACE_SOCK_Dgram::send (iov, - n, - temp->bcast_addr_, - flags) == -1) - return -1; - - return 0; -} - -// Broadcast an iovec of size N to ADDR as a datagram (note that addr -// must be preassigned to the broadcast address of the subnet...). - -ssize_t -ACE_SOCK_Dgram_Bcast::send (const iovec iov[], - int n, - const ACE_Addr &addr, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send"); - - return ACE_SOCK_Dgram::send (iov, n, addr, flags); -} -#endif /* ACE_HAS_MSG */ diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h deleted file mode 100644 index 52b8ec1546b..00000000000 --- a/ace/SOCK_Dgram_Bcast.h +++ /dev/null @@ -1,135 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK_Dgram_Bcast.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_SOCK_DGRAM_BCAST_H -#define ACE_SOCK_DGRAM_BCAST_H -#include "ace/pre.h" - -#include "ace/INET_Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK_Dgram.h" - -/** - * @class ACE_Bcast_Node - * - * @brief Linked list of broadcast interfaces. - */ -class ACE_Export ACE_Bcast_Node -{ -public: - /// Default constructor. - ACE_Bcast_Node (ACE_INET_Addr &, - ACE_Bcast_Node *); - - /// Destructor. - ~ACE_Bcast_Node (void); - - /// Broadcast address for the interface. - ACE_INET_Addr bcast_addr_; - - /// Pointer to the next interface in the chain. - ACE_Bcast_Node *next_; -}; - -/** - * @class ACE_SOCK_Dgram_Bcast - * - * @brief Defines the member functions for the ACE_SOCK datagram - * abstraction. - */ -class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram -{ -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_SOCK_Dgram_Bcast (void); - - ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, - int protocol_family = PF_INET, - int protocol = 0, - int reuse_addr = 0, - const ACE_TCHAR *host_name = 0); - - /// Default dtor. - ~ACE_SOCK_Dgram_Bcast (void); - - // Initiate a connectionless datagram broadcast endpoint. - - /// Initiate a connectionless datagram broadcast endpoint. - int open (const ACE_Addr &local, - int protocol_family = PF_INET, - int protocol = 0, - int reuse_addr = 0, - const ACE_TCHAR *host_name = 0); - - /// Close up and release dynamically allocated resources. - int close (void); - - /// Broadcast the datagram to every interface. Returns the average - /// number of bytes sent. - ssize_t send (const void *buf, - size_t n, - u_short portnum, - int flags = 0) const; - - /// Broadcast the datagrams to every interface. Returns the - /// average number of bytes sent. - ssize_t send (const iovec iov[], - int n, - u_short portnum, - int flags = 0) const; - - /// Broadcast an N byte datagram to ADDR (note that addr must be - /// preassigned to the broadcast address of the subnet...). - ssize_t send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags = 0) const; - - /** - * Broadcast an of size to as a datagram (note - * that addr must be preassigned to the broadcast address of the - * subnet...) - */ - ssize_t send (const iovec iov[], - int n, - const ACE_Addr &addr, - int flags = 0) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Make broadcast available for Datagram socket. - int mk_broadcast (const ACE_TCHAR *host_name); - - /// Points to the head of the list of broadcast interfaces. - ACE_Bcast_Node *if_list_; - - /// Do not allow this function to percolate up to this interface... - int get_remote_addr (ACE_Addr &) const; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Dgram_Bcast.i" -#endif - -#include "ace/post.h" -#endif /* ACE_SOCK_DGRAM_BCAST_H */ diff --git a/ace/SOCK_Dgram_Bcast.i b/ace/SOCK_Dgram_Bcast.i deleted file mode 100644 index 71800445f30..00000000000 --- a/ace/SOCK_Dgram_Bcast.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SOCK_Dgram_Bcast.i - -ASYS_INLINE -ACE_Bcast_Node::~ACE_Bcast_Node (void) -{ -} - -ASYS_INLINE -ACE_SOCK_Dgram_Bcast::~ACE_SOCK_Dgram_Bcast (void) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::~ACE_SOCK_Dgram_Bcast"); -} - -// Broadcast an N byte datagram to ADDR (note that addr must be -// preassigned to the broadcast address of the subnet...) - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram_Bcast::send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram_Bcast::send"); - - sockaddr *saddr = (sockaddr *) addr.get_addr (); - int len = addr.get_size (); - return ACE_OS::sendto (this->get_handle (), (const char *) buf, n, flags, - (struct sockaddr *) saddr, len); -} - - diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp deleted file mode 100644 index de41a4790fd..00000000000 --- a/ace/SOCK_Dgram_Mcast.cpp +++ /dev/null @@ -1,683 +0,0 @@ -// SOCK_Dgram_Mcast.cpp - -#include "ace/SOCK_Dgram_Mcast.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Dgram_Mcast.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -ACE_RCSID (ace, - SOCK_Dgram_Mcast, - "$Id$") - -#include "ace/Log_Msg.h" - -// This is a workaround for platforms with non-standard -// definitions of the ip_mreq structure -#if ! defined (IMR_MULTIADDR) -#define IMR_MULTIADDR imr_multiaddr -#endif /* ! defined (IMR_MULTIADDR) */ - -// Helper (inline) functions. -class ACE_SDM_helpers -{ -public: - // Convert ACE_INET_Addr to string, using local formatting rules. - - static void addr_to_string (const ACE_INET_Addr &ip_addr, - ACE_TCHAR *ret_string, // results here. - size_t len, - int clip_portnum) // clip port# info? - { - if (ip_addr.addr_to_string (ret_string, len, 1) == -1) - { - ACE_OS_String::strcpy (ret_string, ACE_LIB_TEXT ("")); - } - else - { - ACE_TCHAR *pc; - if (clip_portnum - && (pc = ACE_OS_String::strchr (ret_string, ACE_LIB_TEXT (':')))) - *pc = ACE_LIB_TEXT ('\0'); // clip port# info. - } - } - // op== for ip_mreq structs. - static int is_equal (const ip_mreq &m1, const ip_mreq &m2) - { - return m1.IMR_MULTIADDR.s_addr == m2.IMR_MULTIADDR.s_addr - && m1.imr_interface.s_addr == m2.imr_interface.s_addr; - } -}; - -ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Dgram_Mcast) - -void -ACE_SOCK_Dgram_Mcast::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - -# if defined (ACE_SOCK_DGRAM_MCAST_DUMPABLE) - ACE_TCHAR addr_string[MAXNAMELEN + 1]; - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nOptions: bindaddr=%s, nulliface=%s\n"), - ACE_BIT_ENABLED (this->opts_, OPT_BINDADDR_YES) ? - ACE_LIB_TEXT ("") : ACE_LIB_TEXT (""), - ACE_BIT_ENABLED (this->opts_, OPT_NULLIFACE_ALL) ? - ACE_LIB_TEXT ("") : ACE_LIB_TEXT (""))); - - // Show default send addr, port#, and interface. - ACE_SDM_helpers::addr_to_string (this->send_addr_, addr_string, - sizeof addr_string, 0); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Send addr=%s iface=%s\n"), - addr_string, - this->send_net_if_ ? this->send_net_if_ - : ACE_LIB_TEXT (""))); - - // Show list of subscribed addresses. - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Subscription list:\n"))); - - ACE_MT (ACE_GUARD (ACE_SDM_LOCK, guard, this->subscription_list_lock_)); - subscription_list_iter_t iter (this->subscription_list_); - for ( ; !iter.done (); iter.advance ()) - { - ACE_TCHAR iface_string[MAXNAMELEN + 1]; - ip_mreq *pm = iter.next (); - - // Get subscribed address (w/out port# info - not relevant). - ACE_INET_Addr ip_addr (ACE_static_cast (u_short, 0), - ACE_NTOHL (pm->IMR_MULTIADDR.s_addr)); - ACE_SDM_helpers::addr_to_string (ip_addr, addr_string, - sizeof addr_string, 1); - - // Get interface address/specification. - ACE_INET_Addr if_addr (ACE_static_cast (u_short, 0), - ACE_NTOHL (pm->imr_interface.s_addr)); - ACE_SDM_helpers::addr_to_string (if_addr, iface_string, - sizeof iface_string, 1); - if (ACE_OS_String::strcmp (iface_string, ACE_LIB_TEXT ("0.0.0.0")) == 0) - // Receives on system default iface. (Note that null_iface_opt_ - // option processing has already occurred.) - ACE_OS_String::strcpy (iface_string, ACE_LIB_TEXT ("")); - - // Dump info. - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\taddr=%s iface=%s\n"), - addr_string, - iface_string)); - } -# endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// Constructor. -ACE_SOCK_Dgram_Mcast::ACE_SOCK_Dgram_Mcast - (ACE_SOCK_Dgram_Mcast::options opts) - : opts_ (opts), - send_net_if_ (0) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::ACE_SOCK_Dgram_Mcast"); -} - -// Destructor. -ACE_SOCK_Dgram_Mcast::~ACE_SOCK_Dgram_Mcast (void) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::~ACE_SOCK_Dgram_Mcast"); - - // Free memory and optionally unsubscribe from currently subscribed group(s). - delete [] this->send_net_if_; - this->clear_subs_list (); -} - -int -ACE_SOCK_Dgram_Mcast::open (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::open"); - - // Only perform the initialization if we haven't been opened - // earlier. - // No sanity check? We should probably flag an error if the user - // makes multiple calls to open(). - if (this->get_handle () != ACE_INVALID_HANDLE) - return 0; - - // Invoke lower-layer ::open. - if (ACE_SOCK::open (SOCK_DGRAM, - mcast_addr.get_type (), - 0, // always use 0 - reuse_addr) == -1) - return -1; - - return open_i (mcast_addr, net_if, reuse_addr); -} - -int -ACE_SOCK_Dgram_Mcast::open_i (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::open_i"); - // ACE_SOCK::open calls this if reuse_addr is set, so we only need to - // process port reuse option. - if (reuse_addr) - { -#if defined (SO_REUSEPORT) - int one = 1; - if (this->ACE_SOCK::set_option (SOL_SOCKET, - SO_REUSEPORT, - &one, - sizeof one) == -1) - return -1; -#endif /* SO_REUSEPORT */ - } - - // Create an address/port# to bind the socket to. Use mcast_addr to - // initialize bind_addy to pick up the correct protocol family. If - // OPT_BINDADDR_YES is set, then we're done. Else use mcast_addr's - // port number and use the "any" address. - ACE_INET_Addr bind_addy (mcast_addr); - if (ACE_BIT_DISABLED (this->opts_, OPT_BINDADDR_YES)) - { - // Bind to "any" address and explicit port#. - if (bind_addy.set (mcast_addr.get_port_number ()) == -1) - return -1; - } - - // Bind to the address (which may be INADDR_ANY) and port# (which may be 0) - if (ACE_SOCK_Dgram::shared_open (bind_addy, bind_addy.get_type ()) == -1) - return -1; - - // Cache the actual bound address (which may be INADDR_ANY) - // and the actual bound port# (which will be a valid, non-zero port#). - ACE_INET_Addr bound_addy; - if (this->get_local_addr (bound_addy) == -1) - { - // (Unexpected failure - should be bound to something) - if (bound_addy.set (bind_addy) == -1) - { - // (Shouldn't happen - bind_addy is a valid addy; punt.) - return -1; - } - } - - this->send_addr_ = mcast_addr; - this->send_addr_.set_port_number (bound_addy.get_port_number ()); - if (net_if) - { -#if defined (IP_MULTICAST_IF) && (IP_MULTICAST_IF != 0) - ip_mreq send_mreq; - if (this->make_multicast_ifaddr (&send_mreq, - mcast_addr, - net_if) == -1) - return -1; - if (this->ACE_SOCK::set_option (IPPROTO_IP, - IP_MULTICAST_IF, - &(send_mreq.imr_interface), - sizeof send_mreq.imr_interface) == -1) - return -1; - this->send_net_if_ = new ACE_TCHAR[ACE_OS_String::strlen (net_if) + 1]; - ACE_OS_String::strcpy (this->send_net_if_, net_if); -#else - // Send interface option not supported - ignore it. - // (We may have been invoked by ::subscribe, so we have to allow - // a non-null interface parameter in this function.) - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Send interface specification not ") - ACE_LIB_TEXT ("supported - IGNORED.\n"))); -#endif // IP_MULTICAST_IF - } - - return 0; -} - -int -ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_ifs"); - - if (ACE_BIT_ENABLED (this->opts_, OPT_NULLIFACE_ALL) - && net_if == 0) - { - // Subscribe on all local multicast-capable network interfaces, by - // doing recursive calls with specific interfaces. - - ACE_INET_Addr *if_addrs = 0; - size_t if_cnt; - - if (ACE_Sock_Connect::get_ip_interfaces (if_cnt, if_addrs) != 0) - return -1; - - size_t nr_subscribed = 0; - - if (if_cnt < 2) - { - if (this->subscribe (mcast_addr, - reuse_addr, - ACE_LIB_TEXT ("0.0.0.0")) == 0) - ++nr_subscribed; - } - else - { - // Iterate through all the interfaces, figure out which ones - // offer multicast service, and subscribe to them. - while (if_cnt > 0) - { - --if_cnt; - - // Convert to 0-based for indexing, next loop check. - if (if_addrs[if_cnt].get_ip_address () == INADDR_LOOPBACK) - continue; - if (this->subscribe (mcast_addr, - reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) - ++nr_subscribed; - } - } - - delete [] if_addrs; - - if (nr_subscribed == 0) - { - errno = ENODEV; - return -1; - } - - // 1 indicates a "short-circuit" return. This handles the - // recursive behavior of checking all the interfaces. - return 1; - } - - // Validate passed multicast addr and iface specifications. - if (this->make_multicast_ifaddr (0, - mcast_addr, - net_if) == -1) - return -1; - - return 0; -} - -// Subscribe and add address/iface to subscription list if successful. -int -ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr, - int reuse_addr, - const ACE_TCHAR *net_if, - int protocol_family, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe"); - - ACE_UNUSED_ARG (protocol_family); - ACE_UNUSED_ARG (protocol); - - return this->join (mcast_addr,reuse_addr, net_if); -} - -int -ACE_SOCK_Dgram_Mcast::join (const ACE_INET_Addr &mcast_addr, - int reuse_addr, - const ACE_TCHAR *net_if) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::join"); - ACE_INET_Addr subscribe_addr = mcast_addr; - - // If port# is 0, insert bound port# if it is set. (To satisfy lower-level - // port# validation.) - u_short def_port_number = this->send_addr_.get_port_number (); - if (subscribe_addr.get_port_number () == 0 - && def_port_number != 0) - { - subscribe_addr.set_port_number (def_port_number); - } - - // Check for port# different than bound port#. - u_short sub_port_number = mcast_addr.get_port_number (); - if (sub_port_number != 0 - && def_port_number != 0 - && sub_port_number != def_port_number) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Subscribed port# (%u) different than bound ") - ACE_LIB_TEXT ("port# (%u).\n"), - (u_int) sub_port_number, - (u_int) def_port_number)); - errno = ENXIO; - return -1; - } - - // If bind_addr_opt_ is enabled, check for address different than - // bound address. - if (ACE_BIT_ENABLED (this->opts_, OPT_BINDADDR_YES) - && this->send_addr_.get_ip_address () != INADDR_ANY - && this->send_addr_.get_ip_address () != mcast_addr.get_ip_address ()) - { - ACE_TCHAR sub_addr_string[MAXNAMELEN + 1]; - ACE_TCHAR bound_addr_string[MAXNAMELEN + 1]; - ACE_SDM_helpers::addr_to_string (mcast_addr, sub_addr_string, - sizeof sub_addr_string, 1); - ACE_SDM_helpers::addr_to_string (this->send_addr_, bound_addr_string, - sizeof bound_addr_string, 1); - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Subscribed address (%s) different than ") - ACE_LIB_TEXT ("bound address (%s).\n"), - sub_addr_string, - bound_addr_string)); - errno = ENXIO; - return -1; - } - - // Attempt subscription. - int result = this->subscribe_i (subscribe_addr, reuse_addr, net_if); - -#if defined (ACE_SOCK_DGRAM_MCAST_DUMPABLE) - if (result == 0) - { - // Add this addr/iface info to the list of subscriptions. - // (Assumes this is unique addr/iface combo - most systems don't allow - // re-sub to same addr/iface.) - ip_mreq *pmreq = new ip_mreq; - // (should not fail) - if (this->make_multicast_ifaddr (pmreq, subscribe_addr, net_if) != -1) - { - ACE_MT (ACE_GUARD_RETURN (ACE_SDM_LOCK, guard, - this->subscription_list_lock_, -1)); - this->subscription_list_.insert_tail (pmreq); - return 0; - } - // this still isn't really right. If ACE_GUARD_RETURN fails, we leak. - // Need to add one of Chris' fancy ace auto pointers (bound?). - delete pmreq; - } -#endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ - - return result >= 0 ? 0 : result; -} - -// Attempt subscribe and return status. -int -ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr, - int reuse_addr, - const ACE_TCHAR *net_if) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_i"); - ip_mreq mreq; - - // Open the socket IFF this is the first ::subscribe and ::open - // was not explicitly invoked. - if (this->open (mcast_addr, - net_if, - reuse_addr) == -1) - return -1; - - // Only do this if net_if == 0, i.e., INADDR_ANY - if (net_if == 0) - { - int result = this->subscribe_ifs (mcast_addr, - net_if, - reuse_addr); - // Check for error or "short-circuit" return. - if (result != 0) - return result; - } - - // Create multicast addr/if struct. - if (this->make_multicast_ifaddr (&mreq, mcast_addr, net_if) == -1) - return -1; - - // Tell IP stack to pass messages sent to this group. - // Note, this is not IPv6 compliant. - else if (this->ACE_SOCK::set_option (IPPROTO_IP, - IP_ADD_MEMBERSHIP, - &mreq, - sizeof mreq) == -1) - return -1; - - return 0; -} - -int -ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_ifs"); - - - if (ACE_BIT_ENABLED (this->opts_, OPT_NULLIFACE_ALL) - && net_if == 0) - { - // Unsubscribe on all local multicast-capable network interfaces, by - // doing recursive calls with specific interfaces. - - ACE_INET_Addr *if_addrs = 0; - size_t if_cnt; - - // NOTE - doesn't always get all of the - // interfaces. In particular, it may not get a PPP interface. This - // is a limitation of the way works with - // old versions of MSVC. The reliable way of getting the interface list - // is available only with MSVC 5 and newer. - if (ACE_Sock_Connect::get_ip_interfaces (if_cnt, if_addrs) != 0) - return -1; - - size_t nr_unsubscribed = 0; - - if (if_cnt < 2) - { - if (this->leave (mcast_addr, - ACE_LIB_TEXT ("0.0.0.0")) == 0) - ++nr_unsubscribed; - } - else - { - while (if_cnt > 0) - { - --if_cnt; - // Convert to 0-based for indexing, next loop check - if (if_addrs[if_cnt].get_ip_address () == INADDR_LOOPBACK) - continue; - if (this->leave (mcast_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) - ++nr_unsubscribed; - } - } - - delete [] if_addrs; - - if (nr_unsubscribed == 0) - { - errno = ENODEV; - return -1; - } - - return 1; - } - - return 0; -} - - -// Unsubscribe, and remove address from subscription list. -// Note: If there are duplicate entries, only finds the first in the list (this -// is a defined restriction - most environments don't allow duplicates to be -// created.) -int -ACE_SOCK_Dgram_Mcast::unsubscribe (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if, - int protocol_family, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe"); - - ACE_UNUSED_ARG (protocol_family); - ACE_UNUSED_ARG (protocol); - - return this->leave (mcast_addr, net_if); -} - -int -ACE_SOCK_Dgram_Mcast::leave (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::leave"); - // Unsubscribe. - int result = this->unsubscribe_i (mcast_addr, - net_if); - -#if defined (ACE_SOCK_DGRAM_MCAST_DUMPABLE) - // (Unconditionally) Remove this addr/if from subscription list. - // (Addr/if is removed even if unsubscribe failed) - ip_mreq tgt_mreq; - if (this->make_multicast_ifaddr (&tgt_mreq, - mcast_addr, - net_if) != -1) - { - ACE_MT (ACE_GUARD_RETURN (ACE_SDM_LOCK, guard, - this->subscription_list_lock_, -1)); - subscription_list_iter_t iter (this->subscription_list_); - for (; !iter.done (); iter.advance ()) - { - ip_mreq *pm = iter.next (); - if (ACE_SDM_helpers::is_equal (*pm, tgt_mreq)) - { - iter.remove (); - delete pm; - break; - } - } - } -#endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ - - return result >= 0 ? 0 : result; -} - -// Attempt unsubscribe and return status. -int -ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_i"); - - int result = this->unsubscribe_ifs (mcast_addr, - net_if); - - // Check for error or "short-circuit" return. - if (result != 0) - return result; - - // Validate addr/if specifications and create addr/if struct. - ip_mreq mreq; - if (this->make_multicast_ifaddr (&mreq, mcast_addr, net_if) == -1) - { - return -1; - } - // Tell network device driver to stop reading datagrams with the - // . - // Note, this is not IPv6 friendly... - else if (ACE_SOCK::set_option (IPPROTO_IP, - IP_DROP_MEMBERSHIP, - &mreq, - sizeof mreq) == -1) - { - return -1; - } - - return 0; -} - -int -ACE_SOCK_Dgram_Mcast::unsubscribe (void) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe"); - - // Can't implement this reliably without keeping an expensive list, - // and can't close the socket since the caller may want to continue - // using the socket to send() or join() new groups. Even if we - // wanted to be clever and reopen the socket, we'd need to know what - // options had been set, and reset them--and we have no way of doing - // that either. :-( - // Should this return -1? - ACE_ERROR_RETURN ((LM_INFO, - ACE_LIB_TEXT ("ACE_SOCK_Dgram_Mcast::unsubscribe (void) ") - ACE_LIB_TEXT ("has been deprecated. You must either ") - ACE_LIB_TEXT ("close to socket to unsubscribe to all ") - ACE_LIB_TEXT ("or unsubscribe to each individually.\n")), - 0); -} - -int -ACE_SOCK_Dgram_Mcast::clear_subs_list (void) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::clear_subs_list"); - int result = 0; - -#if defined (ACE_SOCK_DGRAM_MCAST_DUMPABLE) - ACE_MT (ACE_GUARD_RETURN (ACE_SDM_LOCK, guard, - this->subscription_list_lock_, -1)); - subscription_list_iter_t iter (this->subscription_list_); - for (; !iter.done (); /*Hack: Do _not_ ::advance after remove*/) - { - ip_mreq *pm = iter.next (); - iter.remove (); - delete pm; - } -#endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ - return result; -} - -int -ACE_SOCK_Dgram_Mcast::make_multicast_ifaddr (ip_mreq *ret_mreq, - const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::make_multicast_ifaddr"); - ip_mreq lmreq; // Scratch copy. - if (net_if != 0) - { -#if defined (ACE_WIN32) - // This port number is not necessary, just convenient - ACE_INET_Addr interface_addr; - if (interface_addr.set (mcast_addr.get_port_number (), net_if) == -1) - return -1; - lmreq.imr_interface.s_addr = - ACE_HTONL (interface_addr.get_ip_address ()); -#else - ifreq if_address; - -#if defined (ACE_PSOS) - // Look up the interface by number, not name. - if_address.ifr_ifno = ACE_OS::atoi (net_if); -#else - ACE_OS_String::strcpy (if_address.ifr_name, net_if); -#endif /* defined (ACE_PSOS) */ - - if (ACE_OS::ioctl (this->get_handle (), - SIOCGIFADDR, - &if_address) == -1) - return -1; - - sockaddr_in *socket_address; - socket_address = ACE_reinterpret_cast (sockaddr_in*, - &if_address.ifr_addr); - lmreq.imr_interface.s_addr = socket_address->sin_addr.s_addr; -#endif /* ACE_WIN32 */ - } - else - lmreq.imr_interface.s_addr = INADDR_ANY; - - lmreq.IMR_MULTIADDR.s_addr = ACE_HTONL (mcast_addr.get_ip_address ()); - - // Set return info, if requested. - if (ret_mreq) - *ret_mreq = lmreq; - - return 0; -} - diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h deleted file mode 100644 index e9e3970a800..00000000000 --- a/ace/SOCK_Dgram_Mcast.h +++ /dev/null @@ -1,422 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK_Dgram_Mcast.h - * - * $Id$ - * - * @author Irfan Pyrali - * @author Tim Harrison - * @author Douglas C. Schmidt - * @author Bill Fulton - * @author and Don Hinton - */ -//============================================================================= - - -#ifndef ACE_SOCK_DGRAM_MCAST_H -#define ACE_SOCK_DGRAM_MCAST_H -#include "ace/pre.h" - -#include "ace/SOCK_Dgram.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/INET_Addr.h" - -#if defined (ACE_SOCK_DGRAM_MCAST_DUMPABLE) -# include "ace/Containers_T.h" -# include "ace/Synch_T.h" -# if !defined (ACE_SDM_LOCK) -# define ACE_SDM_LOCK ACE_SYNCH_MUTEX -# endif /* ACE_SDM_LOCK */ -#endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ - -/** - * @class ACE_SOCK_Dgram_Mcast - * - * @brief Defines the ACE socket wrapper for UDP/IP multicast. - * - * Supports multiple simultaneous subscriptions, unsubscription from one or - * all subscriptions, and independent send/recv address and interface - * specifications. Template parameters and/or ctor arguments determine - * per-instance optional functionality. - * - * Note that multicast semantics and implementation details are _very_ - * environment-specific; this class is just a wrapper around the underlying - * implementation and does not try to normalize the concept of multicast - * communications. - * - * Usage Notes: - * - Send and Recv addresses and network interfaces, but not port#, are - * independent. While this instance is open, 1 send interface (and a default - * send address) is in effect and 0, 1, or multiple recv addresses/interfaces - * are in effect. - * - The first / invocation defines the network interface - * and default address used for all sends by this instance, defines the - * port# and optionally the multicast address bound to the underlying - * socket, and defines the (one) port# that is used for all subscribes - * (subsequent subscribes must pass the same port# or '0'). - * - The default loopback state is not explicitly set; the environment will - * determine the default state. Note that some environments (e.g. some Win32) - * do not allow the default to be changed, and that the semantics of - * loopback control are environment dependent (e.g. sender vs receiver - * control). - * - In general, due to multicast design and implementation quirks/bugs, it is - * difficult to tell which address a received message was sent to or which - * interface it was received on (even if only one subscription is active). - * However; there are filtering options that can be applied, to narrow it - * down considerably. - * - * Interface specification notes (for and ): - * - If net_if == 0, the null_iface_opt option determines whether only the - * system "default" interface or all interfaces is affected. Specifying - * "all" interfaces is supported only for environments for which - * is properly implemented. - * - Multiple subscriptions for the same address but different interfaces is - * normally supported, but re-subscription to an address/interface that is - * already subscribed is normally not allowed. - * - The interface specification syntax is environment-specific. - * UNIX systems will normally use device specifications such as "le0" or - * "elxl1", while other systems will use the IP address of the interface. - * Some platforms, such as pSoS, support only cardinal numbers as network - * interface specifications; for these platforms, just give these numbers in - * alphanumeric form and will convert them into numbers via - * . - */ -class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram -{ -public: - - /** - * @brief Option parameters. - * - * These control per-instance optional functionality. They are set via - * optional constructor arguments. - * Note: Certain option values are not valid for all environments (see - * comments in source file for environment-specific restrictions). Default - * values are always valid values for the compilation environment. - */ - enum options - { - // Define whether a specific (multicast) address (in addition to the port#) - // is bound to the socket. - // Notes: - // - Effect of doing this is stack/environment dependent, but in most - // environments can be used to filter out unwanted unicast, broadcast, and - // (other) multicast messages sent to the same port#. - // - Some IP stacks (e.g. some Win32) do not support binding multicast - // addresses. Using this option will always cause an error. - // - It's not strictly possible for user code to do this level of filtering - // w/out the bind; some environments support ways to determine which address - // a message was sent _to_, but this class interface does not support access - // to that info. - // - The address (and port#) passed to (or the first , if - // is not explicitly invoked) is the one that is bound. - // - /// Disable address bind. (Bind only port.) - // Note that this might seem odd, but we need a way to distinquish between - // default behavior, which might or might not be to bind, and explicitely - // choosing to bind or not to bind--which "is the question." ;-) - OPT_BINDADDR_NO = 0, - /// Enable address bind. (Bind port and address.) - OPT_BINDADDR_YES = 1, - /// Default value for BINDADDR option. (Environment-dependent.) -#if defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING) \ - && (ACE_LACKS_PERFECT_MULTICAST_FILTERING == 1) - // Platforms that don't support perfect filtering. Note that perfect - // filtering only really applies to multicast traffic, not unicast - // or broadcast. - DEFOPT_BINDADDR = OPT_BINDADDR_YES, -# else - // At least some Win32 OS's can not bind mcast addr, so disable it. - // General-purpose default behavior is 'disabled', since effect is - // environment-specific and side-effects might be surprising. - DEFOPT_BINDADDR = OPT_BINDADDR_NO, -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING = 1) */ - // - /// Define the interpretation of 'NULL' as a recv interface specification. - // If the interface part of a multicast address specification is NULL, it - // will be interpreted to mean either "the default interface" or "all - // interfaces", depending on the setting of this option. - // Notes: - // - The 'nulliface_all' option can not be used in environments which do - // not fully support the method - // (e.g. non-Windows). - // If it is, using NULL for iface will _always_ fail. - // - The default behavior in most IP stacks is to use the 'default' interface, - // where 'default' has rather ad-hoc semantics. - // - This applies only to receives, not sends (which always use only one - // interface; NULL means use the "system default" interface). - // Supported values: - /// If (net_if==NULL), use default interface. - // Note that this might seem odd, but we need a way to distinquish between - // default behavior, which might or might not be to bind, and explicitely - // choosing to bind or not to bind--which "is the question." ;-) - OPT_NULLIFACE_ONE = 0, - /// If (net_if==NULL), use all mcast interfaces. - OPT_NULLIFACE_ALL = 2, - /// Default value for NULLIFACE option. (Environment-dependent.) -#ifdef ACE_WIN32 - // This is the (ad-hoc) legacy behavior for Win32/WinSock. - // Notice: Older version of WinSock/MSVC may not get all multicast-capable - // interfaces (e.g. PPP interfaces). - DEFOPT_NULLIFACE = OPT_NULLIFACE_ALL, -#else - // General-purpose default behavior (as per legacy behavior). - DEFOPT_NULLIFACE = OPT_NULLIFACE_ONE, -#endif /* ACE_WIN32 */ - /// All default options. - DEFOPTS = DEFOPT_BINDADDR | DEFOPT_NULLIFACE - }; - - // = Initialization routines. - - /// Ctor - Create an unitialized instance and define per-instance optional - /// functionality. - /** - * You must invoke or , to create/bind a socket and define - * operational parameters, before performing any I/O with this instance. - */ - ACE_SOCK_Dgram_Mcast (options opts = DEFOPTS); - - /// Dtor - Release all resources and implicitly or explicitly unsubscribe - /// from all currently subscribed groups. - /** - * The OPT_DTORUNSUB_YES_ option defines whether an explicit is - * done by the destructor. If not, most systems will automatically - * unsubscribe upon the close of the socket. - */ - ~ACE_SOCK_Dgram_Mcast (void); - - /// Explicitly open/bind the socket and define the network interface - /// and default multicast address used for sending messages. - /** - * This method is optional; if not explicitly invoked, it is invoked by - * the first , using the subscribed address/port# and network - * interface paramters. - * The parameter defines the default send address/port# and - * also the port# and, if the OPT_BINDADDR_YES option is used, - * the multicast address that is bound to this socket. - * If the parameter != 0, it defines the network interface - * used for all sends by this instance, otherwise the system "default" - * interface is used. (The parameter is ignored if this - * feature is not supported by the envriornment.) - * The port# in may be 0, in which case a system-assigned - * (ephemeral) port# is used for sending and receiving. - * If != 0, the SO_REUSEADDR option and, if it is supported, - * the SO_REUSEPORT option are enabled. - * - * Returns: -1 if the call fails. Failure can occur due to problems with - * the address, port#, and/or interface parameters or during system open() - * or socket option processing. - */ - int open (const ACE_INET_Addr &mcast_addr, // Bound & sendto address. - const ACE_TCHAR *net_if = 0, // Net interface for sends. - int reuse_addr = 1); // Reuse addr/port sock opt. - - // = Multicast group subscribe/unsubscribe routines. - - /// Join a multicast group on a given interface (or all interfaces, if - /// supported). - /** - * The given group is joined on the specified interface. If option - * OPT_NULLIFACE_ALL is used and is = 0, the group is joined on - * all multicast capable interfaces (IFF supported). Multiple subscriptions - * to various address and interface combinations are supported and tracked. - * If this is the first invocation of , and was not - * previously invoked, will be invoked using for binding - * the socket and as the interface for . - * - * Returns: -1 if the call fails. Failure can occur due to problems with - * the address, port#, and/or interface parameters or during the subscription - * attempt. Once bind() has been invoked (by the first or - * ), returns errno of ENXIO if the port# is not 0 and does not - * match the bound port#, or if OPT_BINDADDR_YES option is used - * and the address does not match the bound address. Returns errno of - * ENODEV if the addr/port#/interface parameters appeared valid, but no - * subscription(s) succeeded. An error is unconditionally returned if - * option OPT_NULLIFACE_ALL is used, is NULL, and - * is not implemented in this - * environment. - * - * Note that the optional parameter does not apply to - * subscriptions; it is only used if is implicitly invoked (see above). - * - * NOTICE - This method has been deprecated, please use join() instead. In - * addition, the following paramters have also been deprecated: - * and have no effect. - */ - int subscribe (const ACE_INET_Addr &mcast_addr, - int reuse_addr = 1, // (see above) - const ACE_TCHAR *net_if = 0, - int protocol_family = PF_INET, - int protocol = 0); - - // join() replaces subscribe() and uses the mcast_addr to determine - // protocol_family, and protocol which we always pass as 0 anyway. - int join (const ACE_INET_Addr &mcast_addr, - int reuse_addr = 1, // (see above) - const ACE_TCHAR *net_if = 0); - - - /// Leave a multicast group on a given interface (or all interfaces, if - /// supported). - /** - * The specified group/interface combination is unsubscribed. If option - * OPT_NULLIFACE_ALL is used and is = 0, the group is unsubscribed - * from all interfaces (IFF supported). - * - * Returns: -1 if the unsubscribe failed. Most environments will return -1 - * if there was no active subscription for this address/interface combination. - * An error is unconditionally returned if option OPT_NULLIFACE_ALL is used, - * is = 0, and is not - * implemented in this environment (_even if_ the specifies a - * non- NULL ). - * - * NOTICE - This method has been deprecated. Please use leave() instead. - * In addition, and have no effect. - */ - int unsubscribe (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if = 0, - int protocol_family = PF_INET, - int protocol = 0); - - // leave() replaces unsubscribe() and uses mcast_addr to determine - // protocol_family, and protocol which we always pass as 0 anyway. - int leave (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if = 0); - - /// Unsubscribe all current subscriptions. - /** - * Unsubscribe all active group/interface subscriptions (if any). - * - * Returns -1 if any unsubscribe failed, 0 if there are no errors or no - * current subscriptions. - * - * This method has been deprecated. Since a list of groups is not - * maintained (except when ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined), - * it isn't possible to unsubscribe to all the groups without closing - * the socket. Therefore, if applications wish to unsubscribe to all - * groups without closing the socket, they much keep track of the - * subscriptions and call the above unsubscribe () for each. - */ - int unsubscribe (void); - - // = Data transfer routines. - - /// Send bytes in , using the multicast address and network interface - /// defined by the first or . - ssize_t send (const void *buf, - size_t n, - int flags = 0) const; - - /// Send , using the multicast address and network interface - /// defined by the first or . - ssize_t send (const iovec iov[], - int n, - int flags = 0) const; - - // = Options. - - /// Set a socket option. - /** - * Set an ip option that takes a char as input, such as - * or . This is just a more concise, nice interface to a - * subset of possible calls, but only works for - * IPPROTO_IP or IPPROTO_IPV6 level options. Use - * directly to set anything else. - * \deprecated { This method has been deprecated since it cannot be used - * easily with with IPv6 options.} - * Returns 0 on success, -1 on failure. - */ - int set_option (int option, - char optval); - - /// Dump the state of an object. - /** - * Logs the setting of all options, the bound address, the send address and - * interface, and the list of current subscriptions. - */ - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - /// Subscribe to a multicast address on one or more network interface(s). - /// (No QoS support.) - int subscribe_ifs (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if, - int reuse_addr); - - /// Do subscription processing w/out updating the subscription list. - // (Layered method for processing). - int subscribe_i (const ACE_INET_Addr &mcast_addr, - int reuse_addr = 1, - const ACE_TCHAR *net_if = 0); - - /// Unsubscribe from a multicast address on one or more network interface(s). - int unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if = 0); - - /// Do unsubscription processing w/out udpating subscription list. - // (Layered method for processing). - int unsubscribe_i (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if = 0); - -protected: - - /// Contains common open functionality so that inheriting classes can - /// reuse it. - int open_i (const ACE_INET_Addr &mcast_addr, // Bound & sendto address. - const ACE_TCHAR *net_if = 0, // Net interface for sends. - int reuse_addr = 1); - - /// Create a multicast addr/if pair, in format useful for system calls. - /// If mreq param is NULL, just verify the passed addr/interface specs. - int make_multicast_ifaddr (ip_mreq *mreq, // Put result here, if != NULL. - const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if); - - /// Create a multicast addr/if pair. This method factors out common - /// code called by and . - int make_multicast_ifaddr_i (ip_mreq* mreq, // Put result here, if != NULL. - const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if = ACE_LIB_TEXT ("le0")); - - /// Empty the dynamic subscription list. - int clear_subs_list (void); - -private: - - /// Per-instance options.. - int opts_; - - /// Multicast address to which local methods send datagrams. - ACE_INET_Addr send_addr_; - /// Network interface to which all methods send multicast datagrams. - ACE_TCHAR *send_net_if_; - -#if defined (ACE_SOCK_DGRAM_MCAST_DUMPABLE) - typedef ACE_DLList subscription_list_t; - typedef ACE_DLList_Iterator subscription_list_iter_t; - /// List of currently subscribed addr/iface pairs (and assc. types). - ACE_MUTABLE subscription_list_t subscription_list_; - /// Lock used to protect subscription list. - ACE_MUTABLE ACE_SDM_LOCK subscription_list_lock_; - // (Lock type does not need to support recursive locking.) -#endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ - -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Dgram_Mcast.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" -#endif /* ACE_SOCK_DGRAM_MCAST_H */ diff --git a/ace/SOCK_Dgram_Mcast.i b/ace/SOCK_Dgram_Mcast.i deleted file mode 100644 index 32ee9e7e426..00000000000 --- a/ace/SOCK_Dgram_Mcast.i +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ASYS_INLINE int -ACE_SOCK_Dgram_Mcast::set_option (int option, - char optval) -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::set_option"); - - if (this->get_handle () == ACE_INVALID_HANDLE) - return -1; - - int level = IPPROTO_IP; -#if defined (IPPROTO_IPV6) - if (this->send_addr_.get_type () == PF_INET6) - level = IPPROTO_IPV6; -#endif /* IPPROTO_IPV6 */ - - return this->ACE_SOCK::set_option (level, - option, - &optval, - sizeof (optval)); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram_Mcast::send (const void *buf, - size_t n, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::send"); - return this->ACE_SOCK_Dgram::send (buf, - n, - this->send_addr_, - flags); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Dgram_Mcast::send (const iovec iov[], - int n, - int flags) const -{ - ACE_TRACE ("ACE_SOCK_Dgram_Mcast::send"); - return this->ACE_SOCK_Dgram::send (iov, - n, - this->send_addr_, - flags); -} diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp deleted file mode 100644 index 34ec0ca9fae..00000000000 --- a/ace/SOCK_IO.cpp +++ /dev/null @@ -1,165 +0,0 @@ -// SOCK_IO.cpp -// $Id$ - -#include "ace/SOCK_IO.h" -#include "ace/Handle_Set.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_IO.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -ACE_RCSID(ace, SOCK_IO, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_IO) - -void -ACE_SOCK_IO::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_IO::dump"); -} - -// Allows a client to read from a socket without having to provide -// a buffer to read. This method determines how much data is in the -// socket, allocates a buffer of this size, reads in the data, and -// returns the number of bytes read. - -ssize_t -ACE_SOCK_IO::recvv (iovec *io_vec, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::recvv"); -#if defined (FIONREAD) - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - - io_vec->iov_base = 0; - - // Check the status of the current socket. - int select_width; -# if defined (ACE_WIN64) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -# else - select_width = int (this->get_handle ()) + 1; -# endif /* ACE_WIN64 */ - switch (ACE_OS::select (select_width, - handle_set, - 0, 0, - timeout)) - { - case -1: - return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: - // Goes fine, fallthrough to get data - break; - } - - u_long inlen; - - if (ACE_OS::ioctl (this->get_handle (), - FIONREAD, - (u_long *) &inlen) == -1) - return -1; - else if (inlen > 0) - { - ACE_NEW_RETURN (io_vec->iov_base, - char[inlen], - -1); - io_vec->iov_len = this->recv (io_vec->iov_base, - inlen); - return io_vec->iov_len; - } - else - return 0; -#else - ACE_UNUSED_ARG (io_vec); - ACE_UNUSED_ARG (timeout); - ACE_NOTSUP_RETURN (-1); -#endif /* FIONREAD */ -} - -// Send N char *ptrs and int lengths. Note that the char *'s precede -// the ints (basically, an varargs version of writev). The count N is -// the *total* number of trailing arguments, *not* a couple of the -// number of tuple pairs! - -ssize_t -ACE_SOCK_IO::send (size_t n, ...) const -{ - ACE_TRACE ("ACE_SOCK_IO::send"); - - va_list argp; - int total_tuples = ACE_static_cast (int, n) / 2; - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::sendv (this->get_handle (), - iovp, - total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} - -// This is basically an interface to ACE_OS::readv, that doesn't use -// the struct iovec_Base explicitly. The ... can be passed as an arbitrary -// number of (char *ptr, int len) tuples. However, the count N is the -// *total* number of trailing arguments, *not* a couple of the number -// of tuple pairs! - -ssize_t -ACE_SOCK_IO::recv (size_t n, ...) const -{ - ACE_TRACE ("ACE_SOCK_IO::recv"); - - va_list argp; - int total_tuples = ACE_static_cast (int, (n / 2)); - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::recvv (this->get_handle (), - iovp, - total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h deleted file mode 100644 index 67b4be8a5d8..00000000000 --- a/ace/SOCK_IO.h +++ /dev/null @@ -1,147 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file SOCK_IO.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//========================================================================== - -#ifndef ACE_SOCK_IO_H -#define ACE_SOCK_IO_H - -#include "ace/pre.h" - -#include "ace/SOCK.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/ACE.h" - -/** - * @class ACE_SOCK_IO - * - * @brief Defines the methods for the ACE socket wrapper I/O routines - * (e.g., send/recv). - * - * - * If == 0, then the call behaves as a normal - * send/recv call, i.e., for blocking sockets, the call will - * block until action is possible; for non-blocking sockets, - * EWOULDBLOCK will be returned if no action is immediately - * possible. - * If != 0, the call will wait until the relative time - * specified in * elapses. - * Errors are reported by -1 and 0 return values. If the - * operation times out, -1 is returned with . - * If it succeeds the number of bytes transferred is returned. - * Methods with the extra argument will always result in - * getting called. Methods without the extra - * argument will result in getting called on Win32 - * platforms, and getting called on non-Win32 platforms. - */ -class ACE_Export ACE_SOCK_IO : public ACE_SOCK -{ -public: - // = Initialization and termination methods. - - /// Constructor. - ACE_SOCK_IO (void); - - /// Destructor. - ~ACE_SOCK_IO (void); - - /// Recv an byte buffer from the connected socket. - ssize_t recv (void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout = 0) const; - - /// Recv an byte buffer from the connected socket. - ssize_t recv (void *buf, - size_t n, - const ACE_Time_Value *timeout = 0) const; - - /// Recv an of size from the connected socket. - ssize_t recvv (iovec iov[], - int n, - const ACE_Time_Value *timeout = 0) const; - - /// Same as above. Deprecated. - ssize_t recv (iovec iov[], - size_t n, - const ACE_Time_Value *timeout = 0) const; - - /** - * Allows a client to read from a socket without having to provide a - * buffer to read. This method determines how much data is in the - * socket, allocates a buffer of this size, reads in the data, and - * returns the number of bytes read. The caller is responsible for - * deleting the member in the field of using - * delete [] io_vec->iov_base. - */ - ssize_t recvv (iovec *io_vec, - const ACE_Time_Value *timeout = 0) const; - - /// Same as above. Deprecated. - ssize_t recv (iovec *io_vec, - const ACE_Time_Value *timeout = 0) const; - - /// Recv varargs messages to the connected socket. - ssize_t recv (size_t n, - ...) const; - - /// Recv bytes via Win32 using overlapped I/O. - ssize_t recv (void *buf, - size_t n, - ACE_OVERLAPPED *overlapped) const; - - /// Send an byte buffer to the connected socket. - ssize_t send (const void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout = 0) const; - - /// Send an byte buffer to the connected socket. - ssize_t send (const void *buf, - size_t n, - const ACE_Time_Value *timeout = 0) const; - - /// Send an of size to the connected socket. - ssize_t sendv (const iovec iov[], - int n, - const ACE_Time_Value *timeout = 0) const; - - /// Same as above. Deprecated. - ssize_t send (const iovec iov[], - size_t n, - const ACE_Time_Value *timeout = 0) const; - - /// Send varargs messages to the connected socket. - ssize_t send (size_t n, - ...) const; - - /// Send bytes via Win32 using overlapped I/O. - ssize_t send (const void *buf, - size_t n, - ACE_OVERLAPPED *overlapped) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_IO.i" -#endif - -#include "ace/post.h" - -#endif /* ACE_SOCK_IO_H */ diff --git a/ace/SOCK_IO.i b/ace/SOCK_IO.i deleted file mode 100644 index f8f91016330..00000000000 --- a/ace/SOCK_IO.i +++ /dev/null @@ -1,149 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SOCK_IO.i - -// Send an n byte message to the connected socket. - -ASYS_INLINE -ACE_SOCK_IO::ACE_SOCK_IO (void) -{ - // ACE_TRACE ("ACE_SOCK_IO::ACE_SOCK_IO"); -} - -ASYS_INLINE -ACE_SOCK_IO::~ACE_SOCK_IO (void) -{ - // ACE_TRACE ("ACE_SOCK_IO::~ACE_SOCK_IO"); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::recv (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::recv"); - return ACE::recv (this->get_handle (), - buf, - len, - flags, - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::recv (void *buf, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::recv"); - return ACE::recv (this->get_handle (), - buf, - len, - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::recvv (iovec iov[], - int n, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::recvv"); - return ACE::recvv (this->get_handle (), - iov, - n, - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::recv (iovec iov[], - size_t n, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::recv"); - return this->recvv (iov, - ACE_static_cast (int, n), - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::recv (iovec *io_vec, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::recv"); - return this->recvv (io_vec, - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::recv (void *buf, - size_t n, - ACE_OVERLAPPED *overlapped) const -{ - ACE_TRACE ("ACE_SOCK_IO::recv"); - return ACE_OS::read (this->get_handle (), - (char *) buf, - n, - overlapped); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::send (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::send"); - return ACE::send (this->get_handle (), - buf, - len, - flags, - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::send (const void *buf, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::send"); - return ACE::send (this->get_handle (), - buf, - len, - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::sendv (const iovec iov[], - int n, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::sendv"); - return ACE::sendv (this->get_handle (), - iov, - n, - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::send (const iovec iov[], - size_t n, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_IO::send"); - return this->sendv (iov, - ACE_static_cast (int, n), - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_IO::send (const void *buf, - size_t n, - ACE_OVERLAPPED *overlapped) const -{ - ACE_TRACE ("ACE_SOCK_IO::send"); - return ACE_OS::write (this->get_handle (), - (const char *) buf, - n, - overlapped); -} diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp deleted file mode 100644 index a6622889215..00000000000 --- a/ace/SOCK_SEQPACK_Acceptor.cpp +++ /dev/null @@ -1,513 +0,0 @@ -// SOCK_SEQPACK_Acceptor.cpp -// $Id$ - -#include "ace/SOCK_SEQPACK_Acceptor.h" - -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_SEQPACK_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/Synch.h" -#include "ace/Auto_Ptr.h" - -ACE_RCSID(ace, SOCK_SEQPACK_Acceptor, "SOCK_SEQPACK_Acceptor.cpp,v 4.30 2002/03/08 23:18:09 spark Exp") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Acceptor) - -// Do nothing routine for constructor. - -ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (void) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor"); -} - -// Performs the timed accept operation. - -int -ACE_SOCK_SEQPACK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, - int restart, - int &in_blocking_mode) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_accept_start"); - - ACE_HANDLE handle = this->get_handle (); - - // Handle the case where we're doing a timed . - if (timeout != 0) - { - if (ACE::handle_timed_accept (handle, - timeout, - restart) == -1) - return -1; - else - { - in_blocking_mode = ACE_BIT_DISABLED (ACE::get_flags (handle), - ACE_NONBLOCK); - // Set the handle into non-blocking mode if it's not already - // in it. - if (in_blocking_mode - && ACE::set_flags (handle, - ACE_NONBLOCK) == -1) - return -1; - } - } - - return 0; -} - -int -ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish (ACE_SOCK_SEQPACK_Association new_association, - int in_blocking_mode, - int reset_new_handle) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish ()"); - - ACE_HANDLE new_handle = new_association.get_handle (); - - // Check to see if we were originally in blocking mode, and if so, - // set the 's handle and handle to be in blocking - // mode. - if (in_blocking_mode) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - - // Only disable ACE_NONBLOCK if we weren't in non-blocking mode - // originally. - ACE::clr_flags (this->get_handle (), - ACE_NONBLOCK); - ACE::clr_flags (new_handle, - ACE_NONBLOCK); - } - -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - if (reset_new_handle) - // Reset the event association inherited by the new handle. - ::WSAEventSelect ((SOCKET) new_handle, 0, 0); -#else - ACE_UNUSED_ARG (reset_new_handle); -#endif /* ACE_WIN32 */ - - return new_handle == ACE_INVALID_HANDLE ? -1 : 0; -} - -// General purpose routine for accepting new connections. - -int -ACE_SOCK_SEQPACK_Acceptor::accept (ACE_SOCK_SEQPACK_Association &new_association, - ACE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::accept"); - - int in_blocking_mode = 0; - if (this->shared_accept_start (timeout, - restart, - in_blocking_mode) == -1) - return -1; - else - { - // On Win32 the third parameter to must be a NULL - // pointer if we want to ignore the client's address. - int *len_ptr = 0; - sockaddr *addr = 0; - int len = 0; - - if (remote_addr != 0) - { - len = remote_addr->get_size (); - len_ptr = &len; - addr = (sockaddr *) remote_addr->get_addr (); - } - - do - new_association.set_handle (ACE_OS::accept (this->get_handle (), - addr, - len_ptr)); - while (new_association.get_handle () == ACE_INVALID_HANDLE - && restart != 0 - && errno == EINTR - && timeout == 0); - - // Reset the size of the addr, so the proper UNIX/IPv4/IPv6 family - // is known. - if (new_association.get_handle () != ACE_INVALID_HANDLE - && remote_addr != 0) - { - remote_addr->set_size (len); - remote_addr->set_type (addr->sa_family); - } - } - - return this->shared_accept_finish (new_association, - in_blocking_mode, - reset_new_handle); -} - -void -ACE_SOCK_SEQPACK_Acceptor::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::dump"); -} - -int -ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Addr &local_sap, - int protocol_family, - int backlog) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_open"); - int error = 0; - -#if defined (ACE_HAS_IPV6) - ACE_ASSERT (protocol_family == PF_INET || protocol_family == PF_INET6); - - if (protocol_family == PF_INET6) - { - sockaddr_in6 local_inet6_addr; - ACE_OS::memset (ACE_reinterpret_cast (void *, - &local_inet6_addr), - 0, - sizeof local_inet6_addr); - - if (local_sap == ACE_Addr::sap_any) - { - local_inet6_addr.sin6_family = AF_INET6; - local_inet6_addr.sin6_port = 0; - local_inet6_addr.sin6_addr = in6addr_any; - } - else - local_inet6_addr = *ACE_reinterpret_cast (sockaddr_in6 *, - local_sap.get_addr ()); - - // We probably don't need a bind_port written here. - // There are currently no supported OS's that define - // ACE_LACKS_WILDCARD_BIND. - if (ACE_OS::bind (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - &local_inet6_addr), - sizeof local_inet6_addr) == -1) - error = 1; - } - else -#endif - if (protocol_family == PF_INET) - { - sockaddr_in local_inet_addr; - ACE_OS::memset (ACE_reinterpret_cast (void *, - &local_inet_addr), - 0, - sizeof local_inet_addr); - - if (local_sap == ACE_Addr::sap_any) - { - local_inet_addr.sin_port = 0; - } - else - local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *, - local_sap.get_addr ()); - if (local_inet_addr.sin_port == 0) - { - if (ACE::bind_port (this->get_handle ()) == -1) - error = 1; - } - else if (ACE_OS::bind (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - &local_inet_addr), - sizeof local_inet_addr) == -1) - error = 1; - } - else if (ACE_OS::bind (this->get_handle (), - (sockaddr *) local_sap.get_addr (), - local_sap.get_size ()) == -1) - error = 1; - - if (error != 0 - || ACE_OS::listen (this->get_handle (), - backlog) == -1) - { - error = 1; - this->close (); - } - - return error ? -1 : 0; -} - -// Multihomed version of same. - -int -ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sap, - int protocol_family, - int backlog) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_open"); - int error = 0; - - // TODO: Add multi-address support to IPV6 -#if defined (ACE_HAS_IPV6) - ACE_ASSERT (protocol_family == PF_INET || protocol_family == PF_INET6); - - if (protocol_family == PF_INET6) - { - sockaddr_in6 local_inet6_addr; - ACE_OS::memset (ACE_reinterpret_cast (void *, - &local_inet6_addr), - 0, - sizeof local_inet6_addr); - - if (local_sap == ACE_Addr::sap_any) - { - local_inet6_addr.sin6_family = AF_INET6; - local_inet6_addr.sin6_port = 0; - local_inet6_addr.sin6_addr = in6addr_any; - } - else - local_inet6_addr = *ACE_reinterpret_cast (sockaddr_in6 *, - local_sap.get_addr ()); - - // We probably don't need a bind_port written here. - // There are currently no supported OS's that define - // ACE_LACKS_WILDCARD_BIND. - if (ACE_OS::bind (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - &local_inet6_addr), - sizeof local_inet6_addr) == -1) - error = 1; - } - else -#endif - if (protocol_family == PF_INET) - { - sockaddr_in local_inet_addr; - ACE_OS::memset (ACE_reinterpret_cast (void *, - &local_inet_addr), - 0, - sizeof local_inet_addr); - - if (local_sap.ACE_Addr::operator== (ACE_Addr::sap_any)) - { - local_inet_addr.sin_port = 0; - } - else - local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *, - local_sap.get_addr ()); - if (local_inet_addr.sin_port == 0) - { - if (ACE::bind_port (this->get_handle ()) == -1) - error = 1; - } - else - { - // The total number of addresses is the number of secondary - // addresses plus one. - size_t num_addresses = local_sap.get_num_secondary_addresses() + 1; - - // Create an array of sockaddr_in to hold the underlying - // representations of the primary and secondary - // addresses. - sockaddr_in* local_inet_addrs = 0; - ACE_NEW_NORETURN(local_inet_addrs, - sockaddr_in[num_addresses]); - - if (!local_inet_addrs) - error = 1; - else - { - // Populate the array by invoking the get_addresses method - // on the Multihomed_INET_Addr - local_sap.get_addresses(local_inet_addrs, - num_addresses); - - // Call bind - if (ACE_OS::bind (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - local_inet_addrs), - (sizeof local_inet_addr)*num_addresses) == -1) - error = 1; - } - - delete [] local_inet_addrs; - } - } - else if (ACE_OS::bind (this->get_handle (), - (sockaddr *) local_sap.get_addr (), - local_sap.get_size ()) == -1) - error = 1; - - if (error != 0 - || ACE_OS::listen (this->get_handle (), - backlog) == -1) - { - error = 1; - this->close (); - } - - return error ? -1 : 0; -} - -int -ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::open"); - - if (protocol_family == PF_UNSPEC) - protocol_family = local_sap.get_type (); - - - if (ACE_SOCK::open (SOCK_SEQPACKET, - protocol_family, - protocol, - protocolinfo, - g, - flags, - reuse_addr) == -1) - return -1; - else - return this->shared_open (local_sap, - protocol_family, - backlog); -} - -ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor"); - if (this->open (local_sap, - protocolinfo, - g, - flags, - reuse_addr, - protocol_family, - backlog, - protocol) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); -} - -// General purpose routine for performing server ACE_SOCK creation. - -int -ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Addr &local_sap, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::open"); - - if (local_sap != ACE_Addr::sap_any) - protocol_family = local_sap.get_type (); - else if (protocol_family == PF_UNSPEC) - { -#if defined (ACE_HAS_IPV6) - protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET; -#else - protocol_family = PF_INET; -#endif /* ACE_HAS_IPV6 */ - } - - if (ACE_SOCK::open (SOCK_SEQPACKET, - protocol_family, - protocol, - reuse_addr) == -1) - return -1; - else - return this->shared_open (local_sap, - protocol_family, - backlog); -} - -// Multihomed version of same. - -int -ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Multihomed_INET_Addr &local_sap, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::open"); - - if (local_sap.ACE_Addr::operator!= (ACE_Addr::sap_any)) - protocol_family = local_sap.get_type (); - else if (protocol_family == PF_UNSPEC) - { -#if defined (ACE_HAS_IPV6) - protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET; -#else - protocol_family = PF_INET; -#endif /* ACE_HAS_IPV6 */ - } - - if (ACE_SOCK::open (SOCK_SEQPACKET, - protocol_family, - protocol, - reuse_addr) == -1) - return -1; - else - return this->shared_open (local_sap, - protocol_family, - backlog); -} - -// General purpose routine for performing server ACE_SOCK creation. - -ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor"); - if (this->open (local_sap, - reuse_addr, - protocol_family, - backlog, - protocol) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); -} - -// Multihomed version of same. - -ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Multihomed_INET_Addr &local_sap, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor"); - if (this->open (local_sap, - reuse_addr, - protocol_family, - backlog, - protocol) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); -} - -int -ACE_SOCK_SEQPACK_Acceptor::close (void) -{ - return ACE_SOCK::close (); -} - diff --git a/ace/SOCK_SEQPACK_Acceptor.h b/ace/SOCK_SEQPACK_Acceptor.h deleted file mode 100644 index baf3e3a1779..00000000000 --- a/ace/SOCK_SEQPACK_Acceptor.h +++ /dev/null @@ -1,185 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK_SEQPACK_Acceptor.h - * - * $Id$ - * @author Patrick J. Lardieri - * @author based on SOCK_STREAM_Acceptor - * by Douglas C. Schmidt - * - */ -//============================================================================= - -#ifndef ACE_SOCK_SEQ_ACCEPTOR_H -#define ACE_SOCK_SEQ_ACCEPTOR_H - -#include "ace/pre.h" -#include "ace/config.h" -#include "ace/ACE_export.h" - -#include "ace/SOCK_SEQPACK_Association.h" -#include "ace/Multihomed_INET_Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Time_Value.h" - -/** - * @class ACE_SOCK_SEQPACK_Acceptor - * - * @brief Defines a factory that creates new s passively. - * - * The has its own "passive-mode" socket. - * This serves as a factory to create so-called "data-mode" - * sockets, which are what the encapsulates. - * Therefore, by inheriting from , - * gets its very own socket. - */ -class ACE_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK -{ -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_SOCK_SEQPACK_Acceptor (void); - - /** - * Initialize a passive-mode BSD-style acceptor socket (no QoS). - * is the address that we're going to listen for - * connections on. If is 1 then we'll use the - * to reuse this address. - */ - ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /// Multihomed version of same - - ACE_SOCK_SEQPACK_Acceptor (const ACE_Multihomed_INET_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /// Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 - /// on success and -1 on failure. - ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - - /** - * Initialize a passive-mode BSD-style acceptor socket (no QoS). - * is the address that we're going to listen for - * connections on. If is 1 then we'll use the - * to reuse this address. Returns 0 on success and - * -1 on failure. - */ - int open (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /// Multihomed version of same - - int open (const ACE_Multihomed_INET_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - - /// Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 - /// on success and -1 on failure. - int open (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /// Close the socket. Returns 0 on success and -1 on failure. - int close (void); - - /// Default dtor. - ~ACE_SOCK_SEQPACK_Acceptor (void); - - // = Passive connection methods. - /** - * Accept a new connection. A of 0 - * means block forever, a of {0, 0} means poll. - * == 1 means "restart if interrupted," i.e., if errno == EINTR. - * Note that inherits the "blocking mode" of - * , i.e., if acceptor factory is in - * non-blocking mode, the will be in non-blocking mode - * and vice versa. - */ - int accept (ACE_SOCK_SEQPACK_Association &new_association, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; - - // = Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - typedef ACE_SOCK_SEQPACK_Association PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Perform operations that must occur before is - /// called. - int shared_accept_start (ACE_Time_Value *timeout, - int restart, - int &in_blocking_mode) const; - - /// Perform operations that must occur after is - /// called. - int shared_accept_finish (ACE_SOCK_SEQPACK_Association new_association, - int in_blocking_mode, - int reset_new_handle) const; - - /** - * This method factors out the common code and is called by - * both the QoS-enabled method and the BSD-style - * method. - */ - int shared_open (const ACE_Addr &local_sap, - int protocol_family, - int backlog); - - /// Multihomed version of same. - - int shared_open (const ACE_Multihomed_INET_Addr &local_sap, - int protocol_family, - int backlog); - -private: - /// Do not allow this function to percolate up to this interface... - int get_remote_addr (ACE_Addr &) const; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_SEQPACK_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" - -#endif /* ACE_SOCK_SEQ_ACCEPTOR_H */ diff --git a/ace/SOCK_SEQPACK_Acceptor.i b/ace/SOCK_SEQPACK_Acceptor.i deleted file mode 100644 index 73421d31d0c..00000000000 --- a/ace/SOCK_SEQPACK_Acceptor.i +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SOCK_SEQPACK_Acceptor.i - -ASYS_INLINE -ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor (void) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor"); -} - - diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp deleted file mode 100644 index 9a672f73126..00000000000 --- a/ace/SOCK_SEQPACK_Association.cpp +++ /dev/null @@ -1,173 +0,0 @@ -// SOCK_SEQPACK_Association.cpp - -#include /**/ "ace/SOCK_SEQPACK_Association.h" -#include /**/ "ace/Auto_Ptr.h" -#include /**/ "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include /**/ "ace/SOCK_SEQPACK_Association.i" -#endif - -ACE_RCSID(ace, SOCK_SEQPACK_Association, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Association) - -void -ACE_SOCK_SEQPACK_Association::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::dump"); -} - -int -ACE_SOCK_SEQPACK_Association::close (void) -{ -#if defined (ACE_WIN32) - // We need the following call to make things work correctly on - // Win32, which requires use to do a before doing the - // close in order to avoid losing data. Note that we don't need to - // do this on UNIX since it doesn't have this "feature". Moreover, - // this will cause subtle problems on UNIX due to the way that - // fork() works. - this->close_writer (); -#endif /* ACE_WIN32 */ - // Close down the socket. - return ACE_SOCK::close (); -} - -int -ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &size) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::get_local_addrs"); - - /* - We will be calling ACE_OS::getsockname, which accepts (and - potentially modifies) two reference parameters: - - 1. a sockaddr_in* that points to a buffer - 2. an int* that points to the size of this buffer - - The OpenSS7 implementation of SCTP copies an array of ipv4 - sockaddr_in into the buffer. Then, if the size of the buffer is - greater than the size used, the size parameter is reduced - accordingly. - - */ - - // The array of sockaddr_in will be stored in an ACE_Auto_Array_Ptr, - // which causes dynamically-allocated memory to be released as soon - // as the ACE_Auto_Array_Ptr goes out of scope. - ACE_Auto_Array_Ptr addr_structs; - - // Allocate memory for this array. Return -1 if the memory cannot - // be allocated. (This activity requires a temporary variable---a - // bare sockaddr_in* --- because ACE_NEW_RETURN cannot act directory on - // an ACE_Auto_Array_Ptr.) - { - sockaddr_in *addr_structs_bootstrap = 0; - ACE_NEW_RETURN(addr_structs_bootstrap, - sockaddr_in[size], - -1); - addr_structs.reset(addr_structs_bootstrap); - } - - // Physical size of this array is its logical size multiplied by - // the physical size of one of its elements. - int physical_size = size * sizeof(sockaddr_in); - - /* Clear the array */ - ACE_OS::memset(addr_structs.get(), - 0, - physical_size); - - /* Populate the array with real values from the getsockname system - call. The variables addr_structs and phycisal_size are - modified. */ - if (ACE_OS::getsockname (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - addr_structs.get()), - &physical_size) == -1) - return -1; - - /* Calculate the NEW physical size of the array */ - size = physical_size / sizeof (sockaddr_in); - - /* Copy each sockaddr_in to the address structure of an ACE_Addr from - the passed-in array */ - for (size_t i = 0; i < size; ++i) { - - addrs[i].set_addr(&(addr_structs[i]), sizeof(sockaddr_in)); - addrs[i].set_type(addr_structs[i].sin_family); - addrs[i].set_size(sizeof(sockaddr_in)); - } - - return 0; -} - -int -ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &size) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::get_remote_addrs"); - - /* - We will be calling ACE_OS::getpeername, which accepts (and - potentially modifies) two reference parameters: - - 1. a sockaddr_in* that points to a buffer - 2. an int* that points to the size of this buffer - - The OpenSS7 implementation of SCTP copies an array of ipv4 - sockaddr_in into the buffer. Then, if the size of the buffer is - greater than the size used, the size parameter is reduced - accordingly. - - */ - - // The array of sockaddr_in will be stored in an ACE_Auto_Array_Ptr, - // which causes dynamically-allocated memory to be released as soon - // as the ACE_Auto_Array_Ptr goes out of scope. - ACE_Auto_Array_Ptr addr_structs; - - // Allocate memory for this array. Return -1 if the memory cannot - // be allocated. (This activity requires a temporary variable---a - // bare sockaddr_in* --- because ACE_NEW_RETURN cannot act directory on - // an ACE_Auto_Array_Ptr.) - { - sockaddr_in *addr_structs_bootstrap = 0; - ACE_NEW_RETURN(addr_structs_bootstrap, - sockaddr_in[size], - -1); - addr_structs.reset(addr_structs_bootstrap); - } - - // Physical size of this array is its logical size multiplied by - // the physical size of one of its elements. - int physical_size = size * sizeof(sockaddr_in); - - /* Clear the array */ - ACE_OS::memset(addr_structs.get(), - 0, - physical_size); - - /* Populate the array with real values from the getpeername system - call. The variables addr_structs and phycisal_size are - modified. */ - if (ACE_OS::getpeername (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - addr_structs.get()), - &physical_size) == -1) - return -1; - - /* Calculate the NEW physical size of the array */ - size = physical_size / sizeof (sockaddr_in); - - /* Copy each sockaddr_in to the address structure of an ACE_Addr from - the passed-in array */ - for (size_t i = 0; i < size; ++i) { - - addrs[i].set_addr(&(addr_structs[i]), sizeof(sockaddr_in)); - addrs[i].set_type(addr_structs[i].sin_family); - addrs[i].set_size(sizeof(sockaddr_in)); - } - - return 0; -} diff --git a/ace/SOCK_SEQPACK_Association.h b/ace/SOCK_SEQPACK_Association.h deleted file mode 100644 index 3e285573615..00000000000 --- a/ace/SOCK_SEQPACK_Association.h +++ /dev/null @@ -1,192 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * - * @file SOCK_SEQPACK_Association.h - * - * $Id$ - * - * @author Patrick J. Lardieri - * @author based on SOCK_Stream - * by Douglas C. Schmidt - * - */ -//============================================================================= - -#ifndef ACE_SOCK_SEQPACK_ASSOCIATION_H -#define ACE_SOCK_SEQPACK_ASSOCIATION_H - -#include "ace/pre.h" -#include "ace/config.h" -#include "ace/ACE_export.h" - -#include "ace/SOCK_IO.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/INET_Addr.h" - -// Forward declarations. -class ACE_Message_Block; - -/** - * @class ACE_SOCK_SEQPACK_Association - * - * @brief Defines the methods in the abstraction. - * - * This adds additional wrapper methods atop the - * class. - * - * is the buffer to write from or receive into. - * is the number of bytes to transfer. - * The parameter in the following methods indicates how - * long to blocking trying to transfer data. If == 0, - * then the call behaves as a normal send/recv call, i.e., for - * blocking sockets, the call will block until action is possible; - * for non-blocking sockets, EWOULDBLOCK will be returned if no - * action is immediately possible. - * If != 0, the call will wait for data to arrive no longer - * than the relative time specified in *. - * The "_n()" I/O methods keep looping until all the data has been - * transferred. These methods also work for sockets in non-blocking - * mode i.e., they keep looping on EWOULDBLOCK. is used - * to make sure we keep making progress, i.e., the same timeout - * value is used for every I/O operation in the loop and the timeout - * is not counted down. - * The return values for the "*_n()" methods match the return values - * from the non "_n()" methods and are specified as follows: - * - On complete transfer, the number of bytes transferred is returned. - * - On timeout, -1 is returned, errno == ETIME. - * - On error, -1 is returned, errno is set to appropriate error. - * - On EOF, 0 is returned, errno is irrelevant. - * - * On partial transfers, i.e., if any data is transferred before - * timeout/error/EOF, will contain the number of - * bytes transferred. - * Methods with parameter are I/O vector variants of the I/O - * operations. - * Methods with the extra argument will always result in - * getting called. Methods without the extra argument - * will result in getting called on Win32 platforms, and - * getting called on non-Win32 platforms. - */ -class ACE_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO -{ -public: - // Initialization and termination methods. - /// Constructor. - ACE_SOCK_SEQPACK_Association (void); - - /// Constructor (sets the underlying with ). - ACE_SOCK_SEQPACK_Association (ACE_HANDLE h); - - /// Destructor. - ~ACE_SOCK_SEQPACK_Association (void); - - /** - * Return local endpoint addresses in the referenced array of - * , which should have the specified . If the - * number of local endpoint addresses is less than , then - * will be set to this number. If successful, the method - * returns 0, otherwise returns -1. - */ - int get_local_addrs (ACE_INET_Addr *addrs, size_t &size) const; - - /** - * Return remote endpoint addresses in the referenced array of - * , which should have the specified . If the - * number of remote endpoint addresses is less than , then - * will be set to this number. If successful, the method - * returns 0, otherwise returns -1. - */ - int get_remote_addrs (ACE_INET_Addr *addrs, size_t &size) const; - - // = I/O functions. - - /// Try to recv exactly bytes into from the connected socket. - ssize_t recv_n (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Try to recv exactly bytes into from the connected socket. - ssize_t recv_n (void *buf, - size_t len, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Receive an of size from the connected socket. - ssize_t recvv_n (iovec iov[], - size_t iovcnt, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Try to send exactly bytes from to the connection socket. - ssize_t send_n (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Try to send exactly bytes from to the connected socket. - ssize_t send_n (const void *buf, - size_t len, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Send all the s chained through their and - /// pointers. This call uses the underlying OS gather-write - /// operation to reduce the domain-crossing penalty. - ssize_t send_n (const ACE_Message_Block *message_block, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Send an of size to the connected socket. - ssize_t sendv_n (const iovec iov[], - size_t iovcnt, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - // = Send/receive ``urgent'' data (see TCP specs...). - ssize_t send_urg (const void *ptr, - size_t len = sizeof (char), - const ACE_Time_Value *timeout = 0) const; - - ssize_t recv_urg (void *ptr, - size_t len = sizeof (char), - const ACE_Time_Value *timeout = 0) const; - - // = Selectively close endpoints. - /// Close down the reader. - int close_reader (void); - - /// Close down the writer. - int close_writer (void); - - /** - * Close down the socket (we need this to make things work correctly - * on Win32, which requires use to do a before doing - * the close to avoid losing data). */ - int close (void); - - // = Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_SEQPACK_Association.i" -#endif - -#include "ace/post.h" - -#endif /* ACE_SOCK_SEQPACK_ASSOCIATION_H */ diff --git a/ace/SOCK_SEQPACK_Association.i b/ace/SOCK_SEQPACK_Association.i deleted file mode 100644 index bcb837d40b8..00000000000 --- a/ace/SOCK_SEQPACK_Association.i +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- C++ -*- */ -// SOCK_SEQPACK_Association.i -// $Id$ - -#include "ace/SOCK_SEQPACK_Association.h" - -ASYS_INLINE -ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association (void) -{ - // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association"); -} - -ASYS_INLINE -ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association (ACE_HANDLE h) -{ - // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association"); - this->set_handle (h); -} - -ASYS_INLINE -ACE_SOCK_SEQPACK_Association::~ACE_SOCK_SEQPACK_Association (void) -{ - // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::~ACE_SOCK_SEQPACK_Association"); -} - -ASYS_INLINE int -ACE_SOCK_SEQPACK_Association::close_reader (void) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::close_reader"); - if (this->get_handle () != ACE_INVALID_HANDLE) - return ACE_OS::shutdown (this->get_handle (), ACE_SHUTDOWN_READ); - else - return 0; -} - -// Shut down just the writing end of a ACE_SOCK. - -ASYS_INLINE int -ACE_SOCK_SEQPACK_Association::close_writer (void) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::close_writer"); - if (this->get_handle () != ACE_INVALID_HANDLE) - return ACE_OS::shutdown (this->get_handle (), ACE_SHUTDOWN_WRITE); - else - return 0; -} - -ASYS_INLINE ssize_t -ACE_SOCK_SEQPACK_Association::recv_n (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::recv_n"); - return ACE::recv_n (this->get_handle (), - buf, - len, - flags, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_SEQPACK_Association::recv_n (void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::recv_n"); - return ACE::recv_n (this->get_handle (), - buf, - len, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_SEQPACK_Association::recvv_n (iovec iov[], - size_t n, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::recvv_n"); - return ACE::recvv_n (this->get_handle (), - iov, - n, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_SEQPACK_Association::send_n (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::send_n"); - return ACE::send_n (this->get_handle (), - buf, - len, - flags, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_SEQPACK_Association::send_n (const void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::send_n"); - return ACE::send_n (this->get_handle (), - buf, - len, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_SEQPACK_Association::sendv_n (const iovec iov[], - size_t n, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::sendv_n"); - return ACE::sendv_n (this->get_handle (), - iov, - n, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_SEQPACK_Association::send_n (const ACE_Message_Block *message_block, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::send_n"); - return ACE::send_n (this->get_handle (), - message_block, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_SEQPACK_Association::send_urg (const void *ptr, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::send_urg"); - return ACE::send (this->get_handle (), - ptr, - len, - MSG_OOB, - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_SEQPACK_Association::recv_urg (void *ptr, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Association::recv_urg"); - return ACE::recv (this->get_handle (), - ptr, - len, - MSG_OOB, - timeout); -} diff --git a/ace/SOCK_SEQPACK_Connector.cpp b/ace/SOCK_SEQPACK_Connector.cpp deleted file mode 100644 index 1fe36508a41..00000000000 --- a/ace/SOCK_SEQPACK_Connector.cpp +++ /dev/null @@ -1,365 +0,0 @@ -// SOCK_SEQPACK_Connector.cpp -// $Id$ - -#include "ace/SOCK_SEQPACK_Connector.h" - -#include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_SEQPACK_Connector.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -ACE_RCSID(ace, SOCK_SEQPACK_Connector, "SOCK_SEQPACK_Connector.cpp,v 4.35 2002/03/08 23:18:09 spark Exp") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Connector) - -void -ACE_SOCK_SEQPACK_Connector::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::dump"); -} - -int -ACE_SOCK_SEQPACK_Connector::shared_open (ACE_SOCK_SEQPACK_Association &new_association, - int protocol_family, - int protocol, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_open"); - - - - // Only open a new socket if we don't already have a valid handle. - if (new_association.get_handle () == ACE_INVALID_HANDLE - - && new_association.open (SOCK_SEQPACKET, - protocol_family, - protocol, - reuse_addr) == -1) - return -1; - else - return 0; -} - -int -ACE_SOCK_SEQPACK_Connector::shared_open (ACE_SOCK_SEQPACK_Association &new_association, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_open"); - - // Only open a new socket if we don't already have a valid handle. - if (new_association.get_handle () == ACE_INVALID_HANDLE - && new_association.open (SOCK_SEQPACKET, - protocol_family, - protocol, - protocolinfo, - g, - flags, - reuse_addr) == -1) - return -1; - else - return 0; -} - -int -ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_connect_start"); - - if (local_sap != ACE_Addr::sap_any) - { - sockaddr *laddr = ACE_reinterpret_cast (sockaddr *, - local_sap.get_addr ()); - size_t size = local_sap.get_size (); - - if (ACE_OS::bind (new_association.get_handle (), - laddr, - size) == -1) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - new_association.close (); - return -1; - } - } - - // Enable non-blocking, if required. - if (timeout != 0 - && new_association.enable (ACE_NONBLOCK) == -1) - return -1; - else - return 0; -} - -// Multihomed version of same -int -ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Time_Value *timeout, - const ACE_Multihomed_INET_Addr &local_sap) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_connect_start"); - - if (local_sap.ACE_Addr::operator!= (ACE_Addr::sap_any)) - { - // The total number of addresses is the number of secondary - // addresses plus one. - size_t num_addresses = local_sap.get_num_secondary_addresses() + 1; - - // Create an array of sockaddr_in to hold the underlying - // representations of the primary and secondary - // addresses. - sockaddr_in* local_inet_addrs = 0; - ACE_NEW_NORETURN(local_inet_addrs, - sockaddr_in[num_addresses]); - if (!local_inet_addrs) - return -1; - - // Populate the array by invoking the get_addresses method on - // the Multihomed_INET_Addr - local_sap.get_addresses(local_inet_addrs, num_addresses); - - // Call bind - if (ACE_OS::bind (new_association.get_handle (), - ACE_reinterpret_cast (sockaddr *, - local_inet_addrs), - (sizeof (sockaddr_in))*num_addresses) == -1) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - new_association.close (); - return -1; - } - - delete [] local_inet_addrs; - } - - // Enable non-blocking, if required. - if (timeout != 0 - && new_association.enable (ACE_NONBLOCK) == -1) - return -1; - else - return 0; -} - -int -ACE_SOCK_SEQPACK_Connector::shared_connect_finish (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Time_Value *timeout, - int result) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_connect_finish"); - // Save/restore errno. - ACE_Errno_Guard error (errno); - - if (result == -1 && timeout != 0) - { - // Check whether the connection is in progress. - if (error == EINPROGRESS || error == EWOULDBLOCK) - { - // This expression checks if we were polling. - if (timeout->sec () == 0 - && timeout->usec () == 0) - error = EWOULDBLOCK; - // Wait synchronously using timeout. - else if (this->complete (new_association, - 0, - timeout) == -1) - error = errno; - else - return 0; - } - } - - // EISCONN is treated specially since this routine may be used to - // check if we are already connected. - if (result != -1 || error == EISCONN) - // Start out with non-blocking disabled on the . - new_association.disable (ACE_NONBLOCK); - else if (!(error == EWOULDBLOCK || error == ETIMEDOUT)) - new_association.close (); - - return result; -} - -// Actively connect and produce a new ACE_SOCK_SEQPACK_Association if things go well... - - -int -ACE_SOCK_SEQPACK_Connector::connect (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int /* flags */, - int /* perms */, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::connect"); - - if (this->shared_open (new_association, - remote_sap.get_type (), - protocol, - reuse_addr) == -1) - return -1; - else if (this->shared_connect_start (new_association, - timeout, - local_sap) == -1) - return -1; - - int result = ACE_OS::connect (new_association.get_handle (), - ACE_reinterpret_cast (sockaddr *, - remote_sap.get_addr ()), - remote_sap.get_size ()); - - return this->shared_connect_finish (new_association, - timeout, - result); -} - -// Multihomed version of same -int -ACE_SOCK_SEQPACK_Connector::connect (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Multihomed_INET_Addr &local_sap, - int reuse_addr, - int /* flags */, - int /* perms */, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::connect"); - - if (this->shared_open (new_association, - remote_sap.get_type (), - protocol, - reuse_addr) == -1) - return -1; - else if (this->shared_connect_start (new_association, - timeout, - local_sap) == -1) - return -1; - - int result = ACE_OS::connect (new_association.get_handle (), - ACE_reinterpret_cast (sockaddr *, - remote_sap.get_addr ()), - remote_sap.get_size ()); - - return this->shared_connect_finish (new_association, - timeout, - result); -} - -// Try to complete a non-blocking connection. - -int -ACE_SOCK_SEQPACK_Connector::complete (ACE_SOCK_SEQPACK_Association &new_association, - ACE_Addr *remote_sap, - const ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::complete"); - ACE_HANDLE h = ACE::handle_timed_complete (new_association.get_handle (), - tv); - // We failed to get connected. - if (h == ACE_INVALID_HANDLE) - { -#if defined (ACE_WIN32) - // Win32 has a timing problem - if you check to see if the - // connection has completed too fast, it will fail - so wait - // microseconds to let it catch up - // then retry to see if it's a real failure. - ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY); - ACE_OS::sleep (time); - h = ACE::handle_timed_complete (new_association.get_handle (), - tv); - if (h == ACE_INVALID_HANDLE) - { -#endif /* ACE_WIN32 */ - // Save/restore errno. - ACE_Errno_Guard error (errno); - new_association.close (); - return -1; -#if defined (ACE_WIN32) - } -#endif /* ACE_WIN32 */ - } - - if (remote_sap != 0) - { - int len = remote_sap->get_size (); - sockaddr *addr = ACE_reinterpret_cast (sockaddr *, - remote_sap->get_addr ()); - if (ACE_OS::getpeername (h, - addr, - &len) == -1) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - new_association.close (); - return -1; - } - } - - // Start out with non-blocking disabled on the . - new_association.disable (ACE_NONBLOCK); - return 0; -} - -ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); - - if (this->connect (new_association, - remote_sap, - timeout, - local_sap, - reuse_addr, - flags, - perms, - protocol) == -1 - && timeout != 0 - && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); -} - -// Multihomed version of same -ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Multihomed_INET_Addr &local_sap, - int reuse_addr, - int flags, - int perms, - int protocol) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); - - if (this->connect (new_association, - remote_sap, - timeout, - local_sap, - reuse_addr, - flags, - perms, - protocol) == -1 - && timeout != 0 - && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); -} diff --git a/ace/SOCK_SEQPACK_Connector.h b/ace/SOCK_SEQPACK_Connector.h deleted file mode 100644 index 36c16bce31e..00000000000 --- a/ace/SOCK_SEQPACK_Connector.h +++ /dev/null @@ -1,240 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK_SEQPACK_Connector.h - * - * $Id$ - * - * @author Patrick J. Lardieri - * @author based on SOCK_STREAM_Connector - * by Douglas C. Schmidt - * - */ -//============================================================================= - -#ifndef ACE_SOCK_SEQPACK_CONNECTOR_H -#define ACE_SOCK_SEQPACK_CONNECTOR_H - -#include "ace/pre.h" -#include "ace/config.h" -#include "ace/ACE_export.h" - -#include "ace/SOCK_SEQPACK_Association.h" -#include "ace/Multihomed_INET_Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Time_Value.h" - -/** - * @class ACE_SOCK_SEQPACK_Connector - * - * @brief Defines a factory that actively connects to a remote IP - * address and TCP port, creating a new @c ACE_SOCK_SEQPACK_Association object. - * - * The @c ACE_SOCK_SEQPACK_Connector doesn't have a socket of its own, - * i.e., it simply "borrows" the one from the @c ACE_SOCK_SEQPACK_Association - * that's being connected. The reason for this is that the - * underlying socket API doesn't use a factory socket to connect - * data mode sockets. Therefore, there's no need to inherit - * @c ACE_SOCK_SEQPACK_Connector from @c ACE_SOCK. A nice side-effect of - * this is that @c ACE_SOCK_SEQPACK_Connector objects do not store state so - * they can be used reentrantly in multithreaded programs. - */ -class ACE_Export ACE_SOCK_SEQPACK_Connector -{ -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_SOCK_SEQPACK_Connector (void); - - /** - * Actively connect to a peer, producing a connected @c ACE_SOCK_SEQPACK_Association - * object if the connection succeeds. - * - * @param new_association The @c ACE_SOCK_SEQPACK_Association object that will be connected - * to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol = 0); - - ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Multihomed_INET_Addr &local_sap, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol = 0); - - /** - * Actively connect to a peer, producing a connected @c ACE_SOCK_SEQPACK_Association - * object if the connection succeeds. - * - * @param new_association The @c ACE_SOCK_SEQPACK_Association object that will be connected - * to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - int connect (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol = 0); - - int connect (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Multihomed_INET_Addr &local_sap, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol = 0); - - /// Default dtor. - ~ACE_SOCK_SEQPACK_Connector (void); - - // = Completion routine. - /** - * Try to complete a nonblocking connection that was begun by a - * previous call to connect with a {0, 0} ACE_Time_Value timeout. - * @see connect(). - * - * @param new_association The @c ACE_SOCK_SEQPACK_Association object that will be connected - * to the peer. - * @param remote_sap If non-0, it points to the @c ACE_INET_Addr object - * that will contain the address of the connected peer. - * @param timeout Same values and return value possibilites as for - * connect(). @see connect(). - */ - int complete (ACE_SOCK_SEQPACK_Association &new_association, - ACE_Addr *remote_sap = 0, - const ACE_Time_Value *timeout = 0); - - /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); - - // = Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - typedef ACE_SOCK_SEQPACK_Association PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Perform operations that ensure the socket is opened using - /// BSD-style semantics (no QoS). - int shared_open (ACE_SOCK_SEQPACK_Association &new_association, - int protocol_family, - int protocol, - int reuse_addr); - - /// Perform operations that ensure the socket is opened using - /// QoS-enabled semantics. - int shared_open (ACE_SOCK_SEQPACK_Association &new_association, - int protocol_family, - int protocol, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr); - - /// Perform operations that must be called before . - int shared_connect_start (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap); - - int shared_connect_start (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Time_Value *timeout, - const ACE_Multihomed_INET_Addr &local_sap); - - /// Perform operations that must be called after . - int shared_connect_finish (ACE_SOCK_SEQPACK_Association &new_association, - const ACE_Time_Value *timeout, - int result); -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_SEQPACK_Connector.i" -#endif - -#include "ace/post.h" - -#endif /* ACE_SOCK_SEQPACK_CONNECTOR_H */ diff --git a/ace/SOCK_SEQPACK_Connector.i b/ace/SOCK_SEQPACK_Connector.i deleted file mode 100644 index 319308bf30d..00000000000 --- a/ace/SOCK_SEQPACK_Connector.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- C++ -*- */ -// SOCK_SEQPACK_Connector.i -// $Id$ - -// This constructor is used by a client when it wants to connect to -// the specified REMOTE_SAP address using a blocking open. - -ASYS_INLINE -ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector (void) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector"); -} - -// Do-nothing constructor... - -ASYS_INLINE -ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (void) -{ - ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); -} - -ASYS_INLINE int -ACE_SOCK_SEQPACK_Connector::reset_new_handle (ACE_HANDLE handle) -{ -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - // Reset the event association - return ::WSAEventSelect ((SOCKET) handle, - NULL, - 0); -#else /* !defined ACE_HAS_WINSOCK2 */ - ACE_UNUSED_ARG (handle); - return 0; -#endif /* ACE_WIN32 */ -} diff --git a/ace/SOCK_Stream.cpp b/ace/SOCK_Stream.cpp deleted file mode 100644 index cd9be127aaa..00000000000 --- a/ace/SOCK_Stream.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// SOCK_Stream.cpp -// $Id$ - -#include "ace/SOCK_Stream.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Stream.i" -#endif - -ACE_RCSID(ace, SOCK_Stream, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Stream) - -void -ACE_SOCK_Stream::dump (void) const -{ - ACE_TRACE ("ACE_SOCK_Stream::dump"); -} - -int -ACE_SOCK_Stream::close (void) -{ -#if defined (ACE_WIN32) - // We need the following call to make things work correctly on - // Win32, which requires use to do a before doing the - // close in order to avoid losing data. Note that we don't need to - // do this on UNIX since it doesn't have this "feature". Moreover, - // this will cause subtle problems on UNIX due to the way that - // fork() works. - this->close_writer (); -#endif /* ACE_WIN32 */ - // Close down the socket. - return ACE_SOCK::close (); -} - diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h deleted file mode 100644 index 4e671edae15..00000000000 --- a/ace/SOCK_Stream.h +++ /dev/null @@ -1,167 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SOCK_Stream.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_SOCK_STREAM_H -#define ACE_SOCK_STREAM_H -#include "ace/pre.h" - -#include "ace/SOCK_IO.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/INET_Addr.h" - -// Forward declarations. -class ACE_Message_Block; - -/** - * @class ACE_SOCK_Stream - * - * @brief Defines the methods in the abstraction. - * - * This adds additional wrapper methods atop the - * class. - * - * is the buffer to write from or receive into. - * is the number of bytes to transfer. - * The parameter in the following methods indicates how - * long to blocking trying to transfer data. If == 0, - * then the call behaves as a normal send/recv call, i.e., for - * blocking sockets, the call will block until action is possible; - * for non-blocking sockets, EWOULDBLOCK will be returned if no - * action is immediately possible. - * If != 0, the call will wait for data to arrive no longer - * than the relative time specified in *. - * The "_n()" I/O methods keep looping until all the data has been - * transferred. These methods also work for sockets in non-blocking - * mode i.e., they keep looping on EWOULDBLOCK. is used - * to make sure we keep making progress, i.e., the same timeout - * value is used for every I/O operation in the loop and the timeout - * is not counted down. - * The return values for the "*_n()" methods match the return values - * from the non "_n()" methods and are specified as follows: - * - On complete transfer, the number of bytes transferred is returned. - * - On timeout, -1 is returned, errno == ETIME. - * - On error, -1 is returned, errno is set to appropriate error. - * - On EOF, 0 is returned, errno is irrelevant. - * - * On partial transfers, i.e., if any data is transferred before - * timeout/error/EOF, will contain the number of - * bytes transferred. - * Methods with parameter are I/O vector variants of the I/O - * operations. - * Methods with the extra argument will always result in - * getting called. Methods without the extra argument - * will result in getting called on Win32 platforms, and - * getting called on non-Win32 platforms. - */ -class ACE_Export ACE_SOCK_Stream : public ACE_SOCK_IO -{ -public: - // Initialization and termination methods. - /// Constructor. - ACE_SOCK_Stream (void); - - /// Constructor (sets the underlying with ). - ACE_SOCK_Stream (ACE_HANDLE h); - - /// Destructor. - ~ACE_SOCK_Stream (void); - - // = I/O functions. - - /// Try to recv exactly bytes into from the connected socket. - ssize_t recv_n (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Try to recv exactly bytes into from the connected socket. - ssize_t recv_n (void *buf, - size_t len, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Receive an of size from the connected socket. - ssize_t recvv_n (iovec iov[], - int iovcnt, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Try to send exactly bytes from to the connection socket. - ssize_t send_n (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Try to send exactly bytes from to the connected socket. - ssize_t send_n (const void *buf, - size_t len, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Send all the s chained through their and - /// pointers. This call uses the underlying OS gather-write - /// operation to reduce the domain-crossing penalty. - ssize_t send_n (const ACE_Message_Block *message_block, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Send an of size to the connected socket. - ssize_t sendv_n (const iovec iov[], - int iovcnt, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - // = Send/receive ``urgent'' data (see TCP specs...). - ssize_t send_urg (const void *ptr, - size_t len = sizeof (char), - const ACE_Time_Value *timeout = 0) const; - - ssize_t recv_urg (void *ptr, - size_t len = sizeof (char), - const ACE_Time_Value *timeout = 0) const; - - // = Selectively close endpoints. - /// Close down the reader. - int close_reader (void); - - /// Close down the writer. - int close_writer (void); - - /** - * Close down the socket (we need this to make things work correctly - * on Win32, which requires use to do a before doing - * the close to avoid losing data). - */ - int close (void); - - // = Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Stream.i" -#endif - -#include "ace/post.h" -#endif /* ACE_SOCK_STREAM_H */ diff --git a/ace/SOCK_Stream.i b/ace/SOCK_Stream.i deleted file mode 100644 index f13d0ca24ff..00000000000 --- a/ace/SOCK_Stream.i +++ /dev/null @@ -1,171 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/SOCK_Stream.h" - -ASYS_INLINE -ACE_SOCK_Stream::ACE_SOCK_Stream (void) -{ - // ACE_TRACE ("ACE_SOCK_Stream::ACE_SOCK_Stream"); -} - -ASYS_INLINE -ACE_SOCK_Stream::ACE_SOCK_Stream (ACE_HANDLE h) -{ - // ACE_TRACE ("ACE_SOCK_Stream::ACE_SOCK_Stream"); - this->set_handle (h); -} - -ASYS_INLINE -ACE_SOCK_Stream::~ACE_SOCK_Stream (void) -{ - // ACE_TRACE ("ACE_SOCK_Stream::~ACE_SOCK_Stream"); -} - -ASYS_INLINE int -ACE_SOCK_Stream::close_reader (void) -{ - ACE_TRACE ("ACE_SOCK_Stream::close_reader"); - if (this->get_handle () != ACE_INVALID_HANDLE) - return ACE_OS::shutdown (this->get_handle (), ACE_SHUTDOWN_READ); - else - return 0; -} - -// Shut down just the writing end of a ACE_SOCK. - -ASYS_INLINE int -ACE_SOCK_Stream::close_writer (void) -{ - ACE_TRACE ("ACE_SOCK_Stream::close_writer"); - if (this->get_handle () != ACE_INVALID_HANDLE) - return ACE_OS::shutdown (this->get_handle (), ACE_SHUTDOWN_WRITE); - else - return 0; -} - -ASYS_INLINE ssize_t -ACE_SOCK_Stream::recv_n (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_Stream::recv_n"); - return ACE::recv_n (this->get_handle (), - buf, - len, - flags, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Stream::recv_n (void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_Stream::recv_n"); - return ACE::recv_n (this->get_handle (), - buf, - len, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Stream::recvv_n (iovec iov[], - int n, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_Stream::recvv_n"); - return ACE::recvv_n (this->get_handle (), - iov, - n, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Stream::send_n (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_Stream::send_n"); - return ACE::send_n (this->get_handle (), - buf, - len, - flags, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Stream::send_n (const void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_Stream::send_n"); - return ACE::send_n (this->get_handle (), - buf, - len, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Stream::sendv_n (const iovec iov[], - int n, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_Stream::sendv_n"); - return ACE::sendv_n (this->get_handle (), - iov, - n, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Stream::send_n (const ACE_Message_Block *message_block, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SOCK_Stream::send_n"); - return ACE::send_n (this->get_handle (), - message_block, - timeout, - bytes_transferred); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Stream::send_urg (const void *ptr, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_Stream::send_urg"); - return ACE::send (this->get_handle (), - ptr, - len, - MSG_OOB, - timeout); -} - -ASYS_INLINE ssize_t -ACE_SOCK_Stream::recv_urg (void *ptr, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SOCK_Stream::recv_urg"); - return ACE::recv (this->get_handle (), - ptr, - len, - MSG_OOB, - timeout); -} diff --git a/ace/SPIPE.cpp b/ace/SPIPE.cpp deleted file mode 100644 index 0f2be4cc65d..00000000000 --- a/ace/SPIPE.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// SPIPE.cpp -// $Id$ - -#include "ace/SPIPE.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE.i" -#endif - -ACE_RCSID(ace, SPIPE, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE) - -// This is the do-nothing constructor. - -ACE_SPIPE::ACE_SPIPE (void) -{ - // ACE_TRACE ("ACE_SPIPE::ACE_SPIPE"); -} - -void -ACE_SPIPE::dump (void) const -{ - ACE_TRACE ("ACE_SPIPE::dump"); -} - -// Close down a ACE_SPIPE. - -int -ACE_SPIPE::get_local_addr (ACE_SPIPE_Addr &local_sap) const -{ - ACE_TRACE ("ACE_SPIPE::get_local_addr"); - local_sap = this->local_addr_; - return 0; -} - -// Close down the STREAM pipe without removing the rendezvous point. - -int -ACE_SPIPE::close (void) -{ - ACE_TRACE ("ACE_SPIPE::close"); - int result = 0; - - if (this->get_handle () != ACE_INVALID_HANDLE) - { - result = ACE_OS::close (this->get_handle ()); - this->set_handle (ACE_INVALID_HANDLE); - } - return result; -} - -// Close down the STREAM pipe and remove the rendezvous point from the -// file system. - -int -ACE_SPIPE::remove (void) -{ - ACE_TRACE ("ACE_SPIPE::remove"); - int result = this->close (); - return ACE_OS::unlink (this->local_addr_.get_path_name ()) == -1 || result == -1 ? -1 : 0; -} - diff --git a/ace/SPIPE.h b/ace/SPIPE.h deleted file mode 100644 index 04e06d71011..00000000000 --- a/ace/SPIPE.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SPIPE.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_SPIPE_H -#define ACE_SPIPE_H -#include "ace/pre.h" - -#include "ace/IPC_SAP.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SPIPE_Addr.h" - -/** - * @class ACE_SPIPE - * - * @brief Defines the member functions for the base class of the - * ACE_SPIPE abstraction. - * - * ACE_SPIPE was designed as a wrapper facade for STREAM pipes. On - * Windows, however, ACE_SPIPE is a wrapper for Named Pipes. Therefore, - * on Windows, it is better to use the ACE_Proactor or blocking operations - * in lieu of using the ACE_Reactor. - * - * @sa ACE_SPIPE_Acceptor for additional notes on use with ACE_Reactor - * on Windows. - * - * @warning Windows: Works only on Windows NT 4 and higher. - * @warning Works on non-Windows platforms only when @c ACE_HAS_STREAM_PIPES - * is defined. - */ -class ACE_Export ACE_SPIPE : public ACE_IPC_SAP -{ -public: - /// Close down the SPIPE without removing the rendezvous point. - /** - * Closes the underlying pipe handle and sets this object's handle value - * to @c ACE_INVALID_HANDLE. - * @return 0 for success; -1 for failure. If a failure occurs, further - * error information is available from ACE_OS::last_error(). - */ - int close (void); - - /// Close down the SPIPE and remove the rendezvous point from - /// the file system. - /** - * @return 0 for success; -1 for failure. If a failure occurs, further - * error information is available from ACE_OS::last_error(). - */ - int remove (void); - - /// Return the local address of this endpoint. - /** - * Returns the local address of the SPIPE's endpoint in @arg addr. - * @return 0 for success; -1 for failure. If a failure occurs, further - * error information is available from ACE_OS::last_error(). - */ - int get_local_addr (ACE_SPIPE_Addr &) const; - - /** - * Disable signal @arg signum. - * @note This reimplements the inherited method from - * ACE_IPC_SAP. Since the signal actions do not make any sense on - * Windows, this method intercepts the call and NOPs it. On non-Windows, - * it is passed through to ACE_IPC_SAP::disable(). - */ - int disable (int signum) const ; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Ensure that this class is an abstract base class - ACE_SPIPE (void); - - /// Our local address. - ACE_SPIPE_Addr local_addr_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE.i" -#endif - -#include "ace/post.h" -#endif /* ACE_SPIPE_H */ diff --git a/ace/SPIPE.i b/ace/SPIPE.i deleted file mode 100644 index fd205ab76df..00000000000 --- a/ace/SPIPE.i +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SPIPE.i - -ASYS_INLINE int -ACE_SPIPE::disable (int signum) const -{ -#if defined (ACE_WIN32) - ACE_UNUSED_ARG (signum) ; - return 0 ; -#else /* ACE_WIN32 */ - return ACE_IPC_SAP::disable (signum) ; -#endif /* ACE_WIN32 */ -} - diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp deleted file mode 100644 index 49be0efb68f..00000000000 --- a/ace/SPIPE_Acceptor.cpp +++ /dev/null @@ -1,295 +0,0 @@ -// SPIPE_Acceptor.cpp -// $Id$ - -#include "ace/SPIPE_Acceptor.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, SPIPE_Acceptor, "$Id$") - -ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (void) -#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - : sa_ (0), pipe_handle_ (ACE_INVALID_HANDLE) -#endif /* ACE_WIN32 */ -{ - ACE_TRACE ("ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor"); -} - -int -ACE_SPIPE_Acceptor::remove (void) -{ - ACE_TRACE ("ACE_SPIPE_Acceptor::remove"); -#if defined (ACE_HAS_STREAM_PIPES) - int result = this->close (); - - // Remove the underlying file. - return ACE_OS::unlink (this->local_addr_.get_path_name ()) == -1 - || result == -1 ? -1 : 0; -#else - this->close (); - return 0; -#endif -} - -ACE_ALLOC_HOOK_DEFINE (ACE_SPIPE_Acceptor) - -void -ACE_SPIPE_Acceptor::dump (void) const -{ - ACE_TRACE ("ACE_SPIPE_Acceptor::dump"); -} - -// General purpose routine for performing server ACE_SPIPE creation. - -int -ACE_SPIPE_Acceptor::open (const ACE_SPIPE_Addr &local_sap, - int reuse_addr, - int perms, - LPSECURITY_ATTRIBUTES sa, - int pipe_mode) -{ - ACE_TRACE ("ACE_SPIPE_Acceptor::open"); - ACE_UNUSED_ARG (reuse_addr); - - this->local_addr_ = local_sap; - this->set_handle (ACE_INVALID_HANDLE); -#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - this->sa_ = sa; - this->pipe_mode_ = pipe_mode; -#else - ACE_UNUSED_ARG (sa); - ACE_UNUSED_ARG (pipe_mode); -#endif /* ACE_WIN32 */ - - return this->create_new_instance (perms); -} - -int -ACE_SPIPE_Acceptor::create_new_instance (int perms) -{ -#if defined (ACE_HAS_STREAM_PIPES) - ACE_HANDLE spipe[2]; - char module[] = "connld"; - - ACE_HANDLE handle = ACE_OS::creat (this->local_addr_.get_path_name (), - perms); - if (handle == ACE_INVALID_HANDLE) - return -1; - else if (ACE_OS::close (handle) == -1) - return -1; - else if (ACE_OS::pipe (spipe) == -1) - return -1; - else if (ACE_OS::ioctl (spipe[0], - I_PUSH, - module) == -1) - return -1; - else if (ACE_OS::fattach (spipe[0], - this->local_addr_.get_path_name ()) == -1) - return -1; - - this->set_handle (spipe[1]); - return 0; - -#elif (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - // Create a new instance of the Named Pipe (WIN32). A new instance - // of the named pipe must be created for every client process. If - // an instance of the named pipe that is already connected to a - // client process is reused with a new client process, - // ::ConnectNamedPipe () would fail. - - ACE_UNUSED_ARG (perms); - ACE_TRACE ("ACE_SPIPE_Acceptor::create_new_instance"); - int status; - - // Create a new instance of the named pipe - this->pipe_handle_ = -#if defined (ACE_USES_WCHAR) - ::CreateNamedPipeW ( -#else /* ACE_USES_WCHAR */ - ::CreateNamedPipeA ( -#endif /* ACE_USES_WCHAR */ - this->local_addr_.get_path_name (), - PIPE_ACCESS_DUPLEX - | FILE_FLAG_OVERLAPPED, - pipe_mode_, - PIPE_UNLIMITED_INSTANCES, - 1024 * 10, - 1024 * 10, - ACE_DEFAULT_TIMEOUT, - this->sa_); - - if (this->pipe_handle_ == ACE_INVALID_HANDLE) - return -1; - else - { - // Start the Connect (analogous to listen () for a socket). - // Completion is noted by the event being signalled. If a - // client connects before this call, the error status will be - // ERROR_PIPE_CONNECTED. If the client also disconnects before - // this call, the error status will be ERROR_NO_DATA. In both - // cases, that fact is remembered via already_connected_ and - // noted when the user calls accept(). Else the error status - // should be ERROR_IO_PENDING and the OS will signal the event - // when it's done. - this->already_connected_ = 0; - this->set_handle (this->event_.handle ()); - this->overlapped_.hEvent = this->event_.handle (); - this->event_.reset (); - - BOOL result = ::ConnectNamedPipe (this->pipe_handle_, - &this->overlapped_); - ACE_UNUSED_ARG (result); - // ConnectNamePipe is suppose to always - // "fail" when passed in overlapped i/o - ACE_ASSERT (!result); - - status = ::GetLastError (); - switch (status) - { - case ERROR_IO_PENDING: - break; - case ERROR_PIPE_CONNECTED: - case ERROR_NO_DATA: - this->already_connected_ = 1; - // Set the associated event as signaled so any reactors or - // proactors waiting for this will respond. - this->event_.signal (); - break; - default: - ACE_ASSERT (FALSE); // An undocumented error was returned. - this->close (); // Sets handle to ACE_INVALID_HANDLE. - break; - } - } - return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0; -#else - ACE_UNUSED_ARG (perms); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_STREAM_PIPES */ -} - -int -ACE_SPIPE_Acceptor::close (void) -{ - ACE_TRACE ("ACE_SPIPE_Acceptor::close"); - -#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - // Substitute the pipe handle back in so it's closed properly. - this->set_handle (this->pipe_handle_); - this->pipe_handle_ = ACE_INVALID_HANDLE; -#endif /* ACE_WIN32 */ - - // This behavior is shared by UNIX and Win32... - int result = this->ACE_SPIPE::close (); - this->set_handle (ACE_INVALID_HANDLE); - -#if defined (ACE_HAS_STREAM_PIPES) - ACE_OS::fdetach (this->local_addr_.get_path_name ()); -#endif /* ACE_HAS_STREAM_PIPES */ - return result; -} - -ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, - int reuse_addr, - int perms, - LPSECURITY_ATTRIBUTES sa, - int pipe_mode) -{ - ACE_TRACE ("ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor"); - - if (this->open (local_sap, reuse_addr, perms, sa, pipe_mode) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SPIPE_Acceptor"))); -} - -// General purpose routine for accepting new connections. - -int -ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io, - ACE_SPIPE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle) -{ - ACE_TRACE ("ACE_SPIPE_Acceptor::accept"); - ACE_UNUSED_ARG (reset_new_handle); - -#if defined (ACE_HAS_STREAM_PIPES) - strrecvfd r_handle; - - // Note that if THIS->MILLI_SECOND_DELAY == -1 we block on - // ACE_OS::ioctl (). Otherwise, we will wait for the desired number - // of milli seconds using ACE_OS::poll. - - if (timeout != 0 && - ACE::handle_timed_accept (this->get_handle (), - timeout, - restart) == -1) - return -1; - else if (ACE_OS::ioctl (this->get_handle (), - I_RECVFD, - &r_handle) == -1) - return -1; - - new_io.set_handle (r_handle.fd); - new_io.local_addr_ = this->local_addr_; - new_io.remote_addr_.set_size (sizeof r_handle.gid + sizeof r_handle.uid); - new_io.remote_addr_.group_id (r_handle.gid); - new_io.remote_addr_.user_id (r_handle.uid); - - // This is for compatibility with ACE_SOCK_Acceptor and - // ACE_TLI_Acceptor. - if (remote_addr != 0) - *remote_addr = new_io.remote_addr_; - - return 0; -#elif (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - ACE_UNUSED_ARG (restart); - ACE_UNUSED_ARG (remote_addr); - - // Check to see if we have a valid pipe - if (this->pipe_handle_ == ACE_INVALID_HANDLE) - return -1; - - // open () started the Connect in asynchronous mode. Wait for the event - // in the OVERLAPPED structure to be signalled, then grab the status. - if (this->already_connected_ == 0) - { - if (timeout != 0) - { - ACE_Time_Value abstime (ACE_OS::gettimeofday () + *timeout); - if (this->event_.wait (&abstime) == -1) - return -1; - } - else - if (this->event_.wait () == -1) - return -1; - - // Should be here with the ConnectNamedPipe operation complete. - // Steal the already_connected_ flag to record the results. - DWORD unused; - this->already_connected_ = ::GetOverlappedResult (this->pipe_handle_, - &this->overlapped_, - &unused, - FALSE); - } - - if (this->already_connected_) - { - new_io.set_handle (this->pipe_handle_); - this->pipe_handle_ = ACE_INVALID_HANDLE; - new_io.local_addr_ = this->local_addr_; - - // Create a new instance of the pipe for the next connection. - this->create_new_instance (); - return 0; - } - return -1; -#else - ACE_UNUSED_ARG (restart); - ACE_UNUSED_ARG (timeout); - ACE_UNUSED_ARG (remote_addr); - ACE_UNUSED_ARG (new_io); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_STREAM_PIPES */ -} diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h deleted file mode 100644 index 581c1ced67a..00000000000 --- a/ace/SPIPE_Acceptor.h +++ /dev/null @@ -1,164 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SPIPE_Acceptor.h - * - * $Id$ - * - * @author Douglas C. Schmidt - * @author Prashant Jain - */ -//============================================================================= - - -#ifndef ACE_SPIPE_ACCEPTOR_H -#define ACE_SPIPE_ACCEPTOR_H -#include "ace/pre.h" - -#include "ace/SPIPE_Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_WIN32) -#include "ace/Synch.h" -#endif /* ACE_WIN32 */ - -/** - * @class ACE_SPIPE_Acceptor - * - * @brief A factory class that produces ACE_SPIPE_Stream objects. - * - * ACE_SPIPE_Acceptor is a factory class that accepts SPIPE connections. - * Each accepted connection produces an ACE_SPIPE_Stream object. - * - * @warning Windows: Works only on Windows NT 4 and higher. To use this - * class with the ACE_Reactor framework, note that the handle to - * demultiplex on is an event handle and should be registered with the - * ACE_Reactor::register_handler (ACE_Event_Handler *, ACE_HANDLE) method. - * - * @warning Works on non-Windows platforms only when @c ACE_HAS_STREAM_PIPES - * is defined. - * - */ -class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE -{ -public: - // = Initialization and termination methods. - /// Default constructor. - ACE_SPIPE_Acceptor (void); - - /// Initiate a passive-mode STREAM pipe listener. - /** - * @param local_sap The name of the pipe instance to open and listen on. - * @param reuse_addr Optional, and ignored. Needed for API compatibility - * with other acceptor classes. - * @param perms Optional, the protection mask to create the pipe - * with. Ignored on Windows. - * @param sa Optional, ignored on non-Windows. The - * SECURITY_ATTRIBUTES to create the named pipe - * instances with. This pointer is remembered and - * reused on each new named pipe instance, so only - * pass a value that remains valid as long as this - * object does. - * @param pipe_mode Optional, ignored on non-Windows. The NT pipe - * mode used when creating the pipe. - */ - ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, - int reuse_addr = 1, - int perms = ACE_DEFAULT_FILE_PERMS, - LPSECURITY_ATTRIBUTES sa = 0, - int pipe_mode = PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); - - /// Initiate a passive-mode STREAM pipe listener. - /** - * @param local_sap The name of the pipe instance to open and listen on. - * @param reuse_addr Optional, and ignored. Needed for API compatibility - * with other acceptor classes. - * @param perms Optional, the protection mask to create the pipe - * with. Ignored on Windows. - * @param sa Optional, ignored on non-Windows. The - * SECURITY_ATTRIBUTES to create the named pipe - * instances with. This pointer is remembered and - * reused on each new named pipe instance, so only - * pass a value that remains valid as long as this - * object does. - * @param pipe_mode Optional, ignored on non-Windows. The NT pipe - * mode used when creating the pipe. - * - * @retval 0 for success. - * @retval -1 for failure. - */ - int open (const ACE_SPIPE_Addr &local_sap, - int reuse_addr = 1, - int perms = ACE_DEFAULT_FILE_PERMS, - LPSECURITY_ATTRIBUTES sa = 0, - int pipe_mode = PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); - - /// Close down the passive-mode STREAM pipe listener. - int close (void); - - /// Remove the underlying mounted pipe from the file system. - int remove (void); - - // = Passive connection acceptance method. - /** - * Accept a new data transfer connection. - * - * @param ipc_sap_spipe The ACE_SPIPE_Stream to initialize with the - * newly-accepted pipe. - * @param remote_addr Optional, accepts the address of the peer. - * @param timeout 0 means block forever, {0, 0} means poll. - * @param restart 1 means "restart if interrupted." - * - * @retval 0 for success. - * @retval -1 for failure. - */ - int accept (ACE_SPIPE_Stream &ipc_sap_spipe, - ACE_SPIPE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0); - - // = Meta-type info - typedef ACE_SPIPE_Addr PEER_ADDR; - typedef ACE_SPIPE_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Create a new instance of an SPIPE. - int create_new_instance (int perms = 0); - -#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - // On Windows, the SECURITY_ATTRIBUTES specified for the initial accept - // operation is reused on all subsequent pipe instances as well. - LPSECURITY_ATTRIBUTES sa_; - - // On Windows, the pipe mode to create the pipe in. This can be in - // either a bytestream-oriented mode or a message-oriented mode. - DWORD pipe_mode_; - - // On Windows, the handle maintained in the ACE_IPC_SAP class is the - // event handle from event_. The pipe handle is useless for telling - // when a pipe connect is done/ready, and it changes on each pipe - // acceptance, quite unlike other acceptor-type classes in ACE. - // This allows the get_handle()-obtained handle to be used for - // registering with the reactor (albeit for signal, not input) - // to tell when a pipe accept is done. - ACE_OVERLAPPED overlapped_; - ACE_Manual_Event event_; - ACE_HANDLE pipe_handle_; - int already_connected_; -#endif /* ACE_WIN32 */ - -}; - -#include "ace/post.h" -#endif /* ACE_SPIPE_ACCEPTOR_H */ diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp deleted file mode 100644 index 958024ad949..00000000000 --- a/ace/SPIPE_Addr.cpp +++ /dev/null @@ -1,142 +0,0 @@ -// SPIPE_Addr.cpp -// $Id$ - -#include "ace/SPIPE_Addr.h" - -#if !defined (__ACE_INLINE__) -#include "ace/SPIPE_Addr.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, SPIPE_Addr, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Addr) - -void -ACE_SPIPE_Addr::dump (void) const -{ -} - -// Set a pointer to the address. -void -ACE_SPIPE_Addr::set_addr (void *addr, int len) -{ - ACE_TRACE ("ACE_SPIPE_Addr::set_addr"); - - this->ACE_Addr::base_set (AF_SPIPE, len); - ACE_OS::memcpy ((void *) &this->SPIPE_addr_, - (void *) addr, - len); -} - -// Do nothing constructor. - -ACE_SPIPE_Addr::ACE_SPIPE_Addr (void) - : ACE_Addr (AF_SPIPE, sizeof this->SPIPE_addr_) -{ - (void) ACE_OS::memset ((void *) &this->SPIPE_addr_, - 0, - sizeof this->SPIPE_addr_); -} - -// Transform the string into the current addressing format. - -int -ACE_SPIPE_Addr::string_to_addr (const ACE_TCHAR *addr) -{ - return this->set (addr); -} - -int -ACE_SPIPE_Addr::set (const ACE_SPIPE_Addr &sa) -{ - this->base_set (sa.get_type (), sa.get_size ()); - - if (sa.get_type () == AF_ANY) - (void) ACE_OS::memset ((void *) &this->SPIPE_addr_, - 0, - sizeof this->SPIPE_addr_); - else - (void) ACE_OS::memcpy ((void *) &this->SPIPE_addr_, (void *) - &sa.SPIPE_addr_, - sa.get_size ()); - return 0; -} - -// Copy constructor. - -ACE_SPIPE_Addr::ACE_SPIPE_Addr (const ACE_SPIPE_Addr &sa) - : ACE_Addr (AF_SPIPE, sizeof this->SPIPE_addr_) -{ - this->set (sa); -} - -int -ACE_SPIPE_Addr::set (const ACE_TCHAR *addr, - gid_t gid, - uid_t uid) -{ - int len = sizeof (this->SPIPE_addr_.uid_); - len += sizeof (this->SPIPE_addr_.gid_); - -#if defined (ACE_WIN32) - const ACE_TCHAR *colonp = ACE_OS::strchr (addr, ':'); - ACE_TCHAR temp[BUFSIZ]; - - if (colonp == 0) // Assume it's a local name. - { - ACE_OS::strcpy (temp, ACE_LIB_TEXT ( "\\\\.\\pipe\\")); - ACE_OS::strcat (temp, addr); - } - else - { - - if (ACE_OS::strncmp (addr, - ACE_LIB_TEXT ("localhost"), - ACE_OS::strlen ("localhost")) == 0) - // change "localhost" to "." - ACE_OS::strcpy (temp, ACE_LIB_TEXT ("\\\\.")); - else - { - ACE_OS::strcpy (temp, ACE_LIB_TEXT ("\\\\")); - - ACE_TCHAR *t; - - // We need to allocate a duplicate so that we can write a - // NUL character into it. - ACE_ALLOCATOR_RETURN (t, ACE_OS::strdup (addr), -1); - - t[colonp - addr] = ACE_LIB_TEXT ('\0'); - ACE_OS::strcat (temp, t); - - ACE_OS::free (t); - } - - ACE_OS::strcat (temp, ACE_LIB_TEXT ("\\pipe\\")); - ACE_OS::strcat (temp, colonp + 1); - } - len += ACE_static_cast (int, ACE_OS_String::strlen (temp)); - this->ACE_Addr::base_set (AF_SPIPE, len); - - ACE_OS_String::strcpy (this->SPIPE_addr_.rendezvous_, temp); -#else - this->ACE_Addr::base_set (AF_SPIPE, - ACE_OS::strlen (addr) + 1 + len); - ACE_OS::strsncpy (this->SPIPE_addr_.rendezvous_, - addr, - sizeof this->SPIPE_addr_.rendezvous_); -#endif /* ACE_WIN32 */ - this->SPIPE_addr_.gid_ = gid == 0 ? ACE_OS::getgid () : gid; - this->SPIPE_addr_.uid_ = uid == 0 ? ACE_OS::getuid () : uid; - return 0; -} - -// Create a ACE_Addr from a ACE_SPIPE pathname. - -ACE_SPIPE_Addr::ACE_SPIPE_Addr (const ACE_TCHAR *addr, - gid_t gid, - uid_t uid) - : ACE_Addr (AF_SPIPE, sizeof this->SPIPE_addr_) -{ - this->set (addr, gid, uid); -} - diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h deleted file mode 100644 index cff741219e8..00000000000 --- a/ace/SPIPE_Addr.h +++ /dev/null @@ -1,118 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file SPIPE_Addr.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//========================================================================== - - -#ifndef ACE_SPIPE_ADDR_H -#define ACE_SPIPE_ADDR_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Addr.h" -#include "ace/OS.h" - -/** - * @class ACE_SPIPE_Addr - * - * @brief Defines the SVR4 STREAM pipe address family address format. - */ -class ACE_Export ACE_SPIPE_Addr : public ACE_Addr -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_SPIPE_Addr (void); - - /// Copy constructor. - ACE_SPIPE_Addr (const ACE_SPIPE_Addr &sa); - - /// Create a ACE_SPIPE_Addr from a rendezvous point in the file - /// system. - ACE_SPIPE_Addr (const ACE_TCHAR *rendezvous_point, gid_t = 0, uid_t = 0); - - /// Acts like a copy constructor... - int set (const ACE_SPIPE_Addr &sa); - - /// Create a ACE_SPIPE_Addr from a rendezvous point in the file - /// system. - int set (const ACE_TCHAR *rendezvous_point, gid_t = 0, uid_t = 0); - - /// Return a pointer to the address. - virtual void *get_addr (void) const; - - /// Set a pointer to the underlying network address. - virtual void set_addr (void *addr, int len); - - /// Transform the current address into string format. - virtual int addr_to_string (ACE_TCHAR *addr, size_t) const; - - /// Transform the string into the current addressing format. - virtual int string_to_addr (const ACE_TCHAR *addr); - - // = Equality/inequality tests - /// Check for equality. - int operator == (const ACE_SPIPE_Addr &SAP) const; - - /// Check for inequality - int operator != (const ACE_SPIPE_Addr &SAP) const; - - // = SPIPE-specific address operations - /// Pathname of rendezvous point in file system. - const ACE_TCHAR *get_path_name (void) const; - - /// Get user id. - uid_t user_id (void) const; - - /// Set user id. - void user_id (uid_t uid); - - /// Set group ids. - void group_id (gid_t gid); - - /// Get group ids. - gid_t group_id (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Contains security attributes. - struct SPIPE_Addr - { - /// Group id. - gid_t gid_; - - /// User id. - uid_t uid_; - - /// Pathname in the file system. - ACE_TCHAR rendezvous_[MAXNAMLEN + 1]; - - } SPIPE_addr_; - // Contents of an SPIPE address. -}; - -#if defined (__ACE_INLINE__) -#include "ace/SPIPE_Addr.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_SPIPE_ADDR_H */ diff --git a/ace/SPIPE_Addr.i b/ace/SPIPE_Addr.i deleted file mode 100644 index e6af565b53b..00000000000 --- a/ace/SPIPE_Addr.i +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SPIPE_Addr.i - -#include "ace/SString.h" - -// Transform the current address into string format. - -ACE_INLINE int -ACE_SPIPE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const -{ - ACE_OS::strsncpy (s, - this->SPIPE_addr_.rendezvous_, - len); - return 0; -} - -// Return the address. - -ACE_INLINE void * -ACE_SPIPE_Addr::get_addr (void) const -{ - return (void *) &this->SPIPE_addr_; -} - -// Compare two addresses for equality. - -ACE_INLINE int -ACE_SPIPE_Addr::operator == (const ACE_SPIPE_Addr &sap) const -{ - return ACE_OS::strcmp (this->SPIPE_addr_.rendezvous_, - sap.SPIPE_addr_.rendezvous_ ) == 0; -} - -// Compare two addresses for inequality. - -ACE_INLINE int -ACE_SPIPE_Addr::operator != (const ACE_SPIPE_Addr &sap) const -{ - return !((*this) == sap); // This is lazy, of course... ;-) -} - -// Return the path name used for the rendezvous point. - -ACE_INLINE const ACE_TCHAR * -ACE_SPIPE_Addr::get_path_name (void) const -{ - return this->SPIPE_addr_.rendezvous_; -} - -ACE_INLINE uid_t -ACE_SPIPE_Addr::user_id (void) const -{ - return this->SPIPE_addr_.uid_; -} - -ACE_INLINE void -ACE_SPIPE_Addr::user_id (uid_t uid) -{ - this->SPIPE_addr_.uid_ = uid; -} - -ACE_INLINE gid_t -ACE_SPIPE_Addr::group_id (void) const -{ - return this->SPIPE_addr_.gid_; -} - -ACE_INLINE void -ACE_SPIPE_Addr::group_id (gid_t gid) -{ - this->SPIPE_addr_.gid_ = gid; -} diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp deleted file mode 100644 index 60954a4a6d3..00000000000 --- a/ace/SPIPE_Connector.cpp +++ /dev/null @@ -1,154 +0,0 @@ -// SPIPE_Connector.cpp -// $Id$ - -#include "ace/SPIPE_Connector.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE_Connector.i" -#endif - -ACE_RCSID(ace, SPIPE_Connector, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Connector) - -// Creates a Local ACE_SPIPE. - -ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, - const ACE_SPIPE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr & local_sap, - int reuse_addr, - int flags, - int perms, - LPSECURITY_ATTRIBUTES sa, - int pipe_mode) -{ - ACE_TRACE ("ACE_SPIPE_Connector::ACE_SPIPE_Connector"); - if (this->connect (new_io, remote_sap, timeout, local_sap, - reuse_addr, flags, perms, sa, pipe_mode) == -1 - && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("address %s, %p\n"), - remote_sap.get_path_name (), ACE_LIB_TEXT ("ACE_SPIPE_Connector"))); -} - -void -ACE_SPIPE_Connector::dump (void) const -{ - ACE_TRACE ("ACE_SPIPE_Connector::dump"); -} - -ACE_SPIPE_Connector::ACE_SPIPE_Connector (void) -{ - ACE_TRACE ("ACE_SPIPE_Connector::ACE_SPIPE_Connector"); -} - -int -ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, - const ACE_SPIPE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr & /* local_sap */, - int /* reuse_addr */, - int flags, - int perms, - LPSECURITY_ATTRIBUTES sa, - int pipe_mode) -{ - ACE_TRACE ("ACE_SPIPE_Connector::connect"); - // Make darn sure that the O_CREAT flag is not set! -#if ! defined (ACE_PSOS_DIAB_MIPS) - ACE_CLR_BITS (flags, O_CREAT); -# endif /* !ACE_PSOS_DIAB_MIPS */ - - ACE_HANDLE handle; - - ACE_UNUSED_ARG (pipe_mode); -#if defined (ACE_WIN32) && \ - !defined (ACE_HAS_PHARLAP) && !defined (ACE_HAS_WINCE) - // We need to allow for more than one attempt to connect, - // calculate the absolute time at which we give up. - ACE_Time_Value absolute_time; - if (timeout != 0) - absolute_time = ACE_OS::gettimeofday () + *timeout; - - // Loop until success or failure. - for (;;) - { - handle = ACE_OS::open (remote_sap.get_path_name(), flags, perms, sa); - if (handle != ACE_INVALID_HANDLE) - // Success! - break; - - // Check if we have a busy pipe condition. - if (::GetLastError() != ERROR_PIPE_BUSY) - // Nope, this is a failure condition. - break; - - // This will hold the time out value used in the ::WaitNamedPipe - // call. - DWORD time_out_value; - - // Check if we are to block until we connect. - if (timeout == 0) - // Wait for as long as it takes. - time_out_value = NMPWAIT_WAIT_FOREVER; - else - { - // Calculate the amount of time left to wait. - ACE_Time_Value relative_time (absolute_time - ACE_OS::gettimeofday ()); - // Check if we have run out of time. - if (relative_time <= ACE_Time_Value::zero) - { - // Mimick the errno value returned by - // ACE_Handle_Ops::handle_timed_open. - if (*timeout == ACE_Time_Value::zero) - errno = EWOULDBLOCK; - else - errno = ETIMEDOUT; - // Exit the connect loop with the failure. - break; - } - // Get the amount of time remaining for ::WaitNamedPipe. - time_out_value = relative_time.msec (); - - } - - // Wait for the named pipe to become available. - ACE_TEXT_WaitNamedPipe (remote_sap.get_path_name (), - time_out_value); - - // Regardless of the return value, we'll do one more attempt to - // connect to see if it is now available and to return - // consistent error values. - } - - // Set named pipe mode if we have a valid handle. - if (handle != ACE_INVALID_HANDLE) - { - // Check if we are changing the pipe mode from the default. - if (pipe_mode != (PIPE_READMODE_BYTE | PIPE_WAIT)) - { - DWORD dword_pipe_mode = pipe_mode; - if (!::SetNamedPipeHandleState (handle, - &dword_pipe_mode, - 0, - 0)) - { - // We were not able to put the pipe into the requested - // mode. - ACE_OS::close (handle); - handle = ACE_INVALID_HANDLE; - } - } - } -#else /* ACE_WIN32 && !ACE_HAS_PHARLAP */ - handle = ACE_Handle_Ops::handle_timed_open (timeout, - remote_sap.get_path_name (), - flags, perms, sa); -#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP || ACE_HAS_WINCE */ - - new_io.set_handle (handle); - new_io.remote_addr_ = remote_sap; // class copy. - - return handle == ACE_INVALID_HANDLE ? -1 : 0; -} diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h deleted file mode 100644 index 4e533d6f290..00000000000 --- a/ace/SPIPE_Connector.h +++ /dev/null @@ -1,113 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SPIPE_Connector.h - * - * $Id$ - * - * @author Doug Schmidt - * @author Prashant Jain - */ -//============================================================================= - -#ifndef ACE_SPIPE_CONNECTOR_H -#define ACE_SPIPE_CONNECTOR_H -#include "ace/pre.h" - -#include "ace/SPIPE_Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_SPIPE_Connector - * - * @brief Defines an active connection factory for . - * On Windows this is mapped to Named Pipes, whereas on UNIX it is - * mapped to STREAM pipes. - */ -class ACE_Export ACE_SPIPE_Connector -{ -public: - // = Initialization method. - /// Default constructor. - ACE_SPIPE_Connector (void); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the maximum amount of time to wait before timing out. If the - * time expires before the connection is made . The - * is the value of local address to bind to. If it's - * the default value of then the user is letting - * the OS do the binding. If == 1 then the - * is reused, even if it hasn't been cleanedup yet. - * The and arguments are passed down to the - * method. The argument is only used in NT and is used to - * establish the NT pipe mode. - */ - ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, - const ACE_SPIPE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0, - LPSECURITY_ATTRIBUTES sa = 0, - int pipe_mode = PIPE_READMODE_MESSAGE | PIPE_WAIT); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the maximum amount of time to wait before timing out. If the - * time expires before the connection is made . The - * is the value of local address to bind to. If it's - * the default value of then the user is letting - * the OS do the binding. If == 1 then the - * is reused, even if it hasn't been cleanedup yet. - * The and arguments are passed down to the - * method. The argument is only used in NT and is used to - * establish the NT pipe mode. - */ - int connect (ACE_SPIPE_Stream &new_io, - const ACE_SPIPE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0, - LPSECURITY_ATTRIBUTES sa = 0, - int pipe_mode = PIPE_READMODE_MESSAGE | PIPE_WAIT); - - /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); - - // = Meta-type info - typedef ACE_SPIPE_Addr PEER_ADDR; - typedef ACE_SPIPE_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE_Connector.i" -#endif - -#include "ace/post.h" -#endif /* ACE_SPIPE_CONNECTOR_H */ diff --git a/ace/SPIPE_Connector.i b/ace/SPIPE_Connector.i deleted file mode 100644 index 9ce4c1a7855..00000000000 --- a/ace/SPIPE_Connector.i +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SPIPE_Connector.i - -ASYS_INLINE int -ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE handle) -{ - ACE_UNUSED_ARG (handle); - // Nothing to do here since the handle is not a socket - return 0; -} - diff --git a/ace/SPIPE_Stream.cpp b/ace/SPIPE_Stream.cpp deleted file mode 100644 index 20385f02c33..00000000000 --- a/ace/SPIPE_Stream.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// SPIPE_Stream.cpp -// $Id$ - -#include "ace/SPIPE_Stream.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE_Stream.i" -#endif - -ACE_RCSID(ace, SPIPE_Stream, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Stream) - -void -ACE_SPIPE_Stream::dump (void) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::dump"); -} - -// Simple-minded do nothing constructor. - -ACE_SPIPE_Stream::ACE_SPIPE_Stream (void) -{ - // ACE_TRACE ("ACE_SPIPE_Stream::ACE_SPIPE_Stream"); -} - -// Send N char *ptrs and int lengths. Note that the char *'s precede -// the ints (basically, an varargs version of writev). The count N is -// the *total* number of trailing arguments, *not* a couple of the -// number of tuple pairs! - -ssize_t -ACE_SPIPE_Stream::send (size_t n, ...) const -{ - // ACE_TRACE ("ACE_SPIPE_Stream::send"); - va_list argp; - int total_tuples = ACE_static_cast (int, (n / 2)); - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::writev (this->get_handle (), iovp, total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} - -// This is basically an interface to ACE_OS::readv, that doesn't use -// the struct iovec explicitly. The ... can be passed as an arbitrary -// number of (char *ptr, int len) tuples. However, the count N is the -// *total* number of trailing arguments, *not* a couple of the number -// of tuple pairs! - -ssize_t -ACE_SPIPE_Stream::recv (size_t n, ...) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recv"); - va_list argp; - int total_tuples = ACE_static_cast (int, (n / 2)); - iovec *iovp; -#if defined (ACE_HAS_ALLOCA) - iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else - ACE_NEW_RETURN (iovp, - iovec[total_tuples], - -1); -#endif /* !defined (ACE_HAS_ALLOCA) */ - - va_start (argp, n); - - for (int i = 0; i < total_tuples; i++) - { - iovp[i].iov_base = va_arg (argp, char *); - iovp[i].iov_len = va_arg (argp, int); - } - - ssize_t result = ACE_OS::readv (this->get_handle (), iovp, total_tuples); -#if !defined (ACE_HAS_ALLOCA) - delete [] iovp; -#endif /* !defined (ACE_HAS_ALLOCA) */ - va_end (argp); - return result; -} diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h deleted file mode 100644 index 340a0dccc4c..00000000000 --- a/ace/SPIPE_Stream.h +++ /dev/null @@ -1,166 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SPIPE_Stream.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_SPIPE_STREAM_H -#define ACE_SPIPE_STREAM_H -#include "ace/pre.h" - -#include "ace/SPIPE.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SPIPE_Addr.h" -#include "ace/ACE.h" - -/** - * @class ACE_SPIPE_Stream - * - * @brief Defines the methods in the abstraction. - * - * is the buffer to write from or receive into. - * is the number of bytes to transfer. - * - * The "_n()" I/O methods keep looping until all the data has been - * transferred. These methods also work for sockets in non-blocking - * mode i.e., they keep looping on EWOULDBLOCK. - * - * The return values for the "*_n()" methods match the return values - * from the non "_n()" methods and are specified as follows: - * - The number of bytes transferred is returned. - * - On error, -1 is returned, errno is set to appropriate error. - * - On EOF, 0 is returned, errno is irrelevant. - * - * Methods with parameter are I/O vector variants of the I/O - * operations. - * - * The and operations use "message" semantics rather - * than "bytestream" semantics. - */ -class ACE_Export ACE_SPIPE_Stream : public ACE_SPIPE -{ -public: - friend class ACE_SPIPE_Acceptor; - friend class ACE_SPIPE_Connector; - - // = Initialization method. - /// Default constructor. - ACE_SPIPE_Stream (void); - - /// Obtain the address of whom we are connected with. - int get_remote_addr (ACE_SPIPE_Addr &remote_sap) const; - - /// Send an open FD to another process. - int send_handle (ACE_HANDLE handle) const; - - /// Recv an open FD from another process. - int recv_handle (ACE_HANDLE &handle) const; - - /// Recv an open FD from another process. - int recv_handle (strrecvfd &recvfd) const; - - /// Send bytes, keep trying until are sent. - ssize_t send_n (const void *buf, size_t len) const; - - /// Recv bytes, keep trying until are received. - ssize_t recv_n (void *buf, size_t len) const; - - /// Send bytes via STREAM pipes using "band" mode. - ssize_t send (const void *buf, size_t len) const; - - /// Recv bytes via STREAM pipes using "band" mode. - ssize_t recv (void *buf, size_t len) const; - - /// Send and via STREAM pipes. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int flags = 0) const; - - /// Recv and via STREAM pipes. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *flags) const; - - /// Send bytes via STREAM pipes using "band" mode. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int band, - int flags) const; - - /// Recv bytes via STREAM pipes using "band" mode. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *band, - int *flags) const; - - /// Send iovecs via the OS "gather-write" operation. - ssize_t send (const iovec iov[], int len) const; - - /// Recv iovecs via the OS "scatter-read" operation. - ssize_t recv (iovec iov[], int len) const; - - /** - * Send N char *ptrs and int lengths. Note that the char *'s - * precede the ints (basically, an varargs version of writev). The - * count N is the *total* number of trailing arguments, *not* a - * couple of the number of tuple pairs! - */ - ssize_t send (size_t len, ...) const; - - /** - * This is an interface to ::readv, that doesn't use the struct - * iovec explicitly. The ... can be passed as an arbitrary number - * of (char *ptr, int len) tuples. However, the count N is the - * *total* number of trailing arguments, *not* a couple of the - * number of tuple pairs! - */ - ssize_t recv (size_t len, ...) const; - - /// Send bytes via Win32 using overlapped I/O. - ssize_t send (const void *buf, size_t len, ACE_OVERLAPPED *overlapped) const; - - /// Recv bytes via Win32 using overlapped I/O. - ssize_t recv (void *buf, size_t len, ACE_OVERLAPPED *overlapped) const; - - /// Send an of size to the stream. - ssize_t sendv (const iovec iov[], - int len) const; - - /// Send an of size to the stream. Will block until all - /// bytes are sent or an error occurs. - ssize_t sendv_n (const iovec iov[], - int len) const; - - /// Receive an of size to the stream. - ssize_t recvv_n (iovec iov[], - int len) const; - - // = Meta-type info - typedef ACE_SPIPE_Addr PEER_ADDR; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - ACE_SPIPE_Addr remote_addr_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE_Stream.i" -#endif - -#include "ace/post.h" -#endif /* ACE_SPIPE_STREAM_H */ diff --git a/ace/SPIPE_Stream.i b/ace/SPIPE_Stream.i deleted file mode 100644 index c52523d28b7..00000000000 --- a/ace/SPIPE_Stream.i +++ /dev/null @@ -1,267 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SPIPE_Stream.i - -// Create an ACE_SPIPE_Stream. - -ASYS_INLINE int -ACE_SPIPE_Stream::get_remote_addr (ACE_SPIPE_Addr &remote_sap) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::get_remote_addr"); - remote_sap = this->remote_addr_; - return 0; -} - -// Send exactly N bytes from BUF to this socket. Keeping trying until -// this many bytes are sent. - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::send_n (const void *buf, size_t n) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::send_n"); - return ACE::write_n (this->get_handle (), buf, n); -} - -// Receive exactly N bytes from this socket into BUF. Keep trying -// until this many bytes are received. - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::recv_n (void *buf, size_t n) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recv_n"); - return ACE::read_n (this->get_handle (), buf, n); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::send (const void *buf, size_t n) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::send"); - return ACE_OS::write (this->get_handle (), (const char *) buf, n); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::recv (void *buf, size_t n) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recv"); - return ACE_OS::read (this->get_handle (), (char *) buf, n); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::send"); - return ACE_OS::putmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recv"); - return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::send"); - return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recv"); - return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::send (const iovec iov[], int n) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::send"); - return ACE_OS::writev (this->get_handle (), iov, n); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::recv (iovec iov[], int n) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recv"); - return ACE_OS::readv (this->get_handle (), iov, n); -} - -// This routine sends an open file descriptor to this socket. - -ASYS_INLINE int -ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::send_handle"); -#if defined (ACE_HAS_STREAM_PIPES) - return ACE_OS::ioctl (this->get_handle (), I_SENDFD, (void *) handle); -#elif defined (ACE_WIN32) && \ - (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) && \ - !defined (ACE_HAS_WINCE) /* CE4 has WS2 but not WSADuplicateSocket */ - DWORD procID; - WSAPROTOCOL_INFO protInfo; - ssize_t res; - res = this->recv(&procID, sizeof(procID)); - if (res != sizeof(procID)) - { - if(res != -1) - errno = ENXIO; - return -1; - } - if (::WSADuplicateSocket ((SOCKET)handle, procID, &protInfo) == -1) - { - ACE_OS::set_errno_to_wsa_last_error(); - return -1; - } - res = this->send(&protInfo, sizeof(protInfo)); - if (res != sizeof(protInfo)) - { - if(res != -1) - errno = ENXIO; - return -1; - } - // This is just for synchronization, we will ignore the data - res = this->recv(&procID, sizeof(procID)); - if (res != sizeof(procID)) - { - if(res != -1) - errno = ENXIO; - return -1; - } - return 0; -#else - handle = handle; - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_STREAM_PIPES */ -} - -// This file receives an open file descriptor from this socket. - -ASYS_INLINE int -ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recv_handle"); -#if defined (ACE_HAS_STREAM_PIPES) - strrecvfd recvfd; - - if (ACE_OS::ioctl (this->get_handle (), I_RECVFD, (void *) &recvfd) == -1) - return -1; - else - { - handle = recvfd.fd; - return 0; - } -#elif defined (ACE_WIN32) && \ - (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) - pid_t procID = ACE_OS::getpid(); - WSAPROTOCOL_INFO protInfo; - ssize_t res; - res = this->send(&procID, sizeof(procID)); - if (res != sizeof(procID)) - { - if(res != -1) - errno = ENXIO; - return -1; - } - res = this->recv(&protInfo, sizeof(protInfo)); - if (res != sizeof(protInfo)) - { - if(res != -1) - errno = ENXIO; - return -1; - } - handle = ACE_OS::socket (FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO, - &protInfo, 0, 0); - if (handle == ACE_INVALID_HANDLE) - { - return -1; - } - // Since it does not matter what the data is, just send something to - // synchronize the end of the exchange - res = this->send(&procID, sizeof(procID)); - if (res != sizeof(procID)) - { - if(res != -1) - errno = ENXIO; - return -1; - } - return 0; -#else - handle = handle; - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_STREAM_PIPES */ -} - -// This file receives an open file descriptor from this socket and -// also passes back the information about the address... - -ASYS_INLINE int -ACE_SPIPE_Stream::recv_handle (strrecvfd &recvfd) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recv_handle"); -#if defined (ACE_HAS_STREAM_PIPES) - return ACE_OS::ioctl (this->get_handle (), I_RECVFD, (void *) &recvfd); -#else - ACE_UNUSED_ARG (recvfd); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_STREAM_PIPES */ -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::send (const void *buf, size_t n, - ACE_OVERLAPPED *overlapped) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::send"); - return ACE_OS::write (this->get_handle (), - (const char *) buf, n, - overlapped); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::recv (void *buf, size_t n, - ACE_OVERLAPPED *overlapped) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recv"); - return ACE_OS::read (this->get_handle (), - (char *) buf, n, - overlapped); -} - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::sendv_n (const iovec iov[], - int n) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::sendv_n"); - return ACE::writev_n (this->get_handle (), - iov, - n); -} - -// Recv an n byte message from the Stream. - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::recvv_n (iovec iov[], - int n) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::recvv_n"); - // @@ Carlos, can you please update this to call the - // new ACE::recvv_n() method that you write? - return ACE_OS::readv (this->get_handle (), - iov, - n); -} - -// Send an of size to the Stream. - -ASYS_INLINE ssize_t -ACE_SPIPE_Stream::sendv (const iovec iov[], - int n) const -{ - ACE_TRACE ("ACE_SPIPE_Stream::sendv"); - return ACE_OS::writev (this->get_handle (), - iov, - n); -} - diff --git a/ace/SSL/ACE_SSL.dsp b/ace/SSL/ACE_SSL.dsp deleted file mode 100644 index 8302562a4c2..00000000000 --- a/ace/SSL/ACE_SSL.dsp +++ /dev/null @@ -1,182 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ACE_SSL" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ACE_SSL - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ACE_SSL.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ACE_SSL.mak" CFG="ACE_SSL - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ACE_SSL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ACE_SSL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ACE_SSL - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\DLL\Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_SSL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "ACE_SSL_BUILD_DLL" /FD /c -# SUBTRACT CPP /X /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ace.lib libeay32.lib ssleay32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\bin\ACE_SSL.dll" /libpath:"../" - -!ELSEIF "$(CFG)" == "ACE_SSL - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\DLL\Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_SSL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ACE_SSL_BUILD_DLL" /FD /c -# SUBTRACT CPP /Fr /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib libeay32.lib ssleay32.lib /nologo /dll /debug /machine:I386 /out:"..\..\bin\ACE_SSLd.dll" /libpath:"../" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "ACE_SSL - Win32 Release" -# Name "ACE_SSL - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\SSL_Asynch_BIO.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_Asynch_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_Context.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Stream.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm" -# Begin Source File - -SOURCE=.\SSL_Asynch_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_Context.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_Export.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\sslconf.h -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "i;inl" -# Begin Source File - -SOURCE=.\SSL_Context.inl -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Stream.i -# End Source File -# End Group -# End Target -# End Project diff --git a/ace/SSL/ACE_SSL.dsw b/ace/SSL/ACE_SSL.dsw deleted file mode 100644 index bc356cd9b28..00000000000 --- a/ace/SSL/ACE_SSL.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ACE_SSL"=.\ACE_SSL.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ace/SSL/ACE_SSL_LIB.dsp b/ace/SSL/ACE_SSL_LIB.dsp deleted file mode 100644 index 194af6d9115..00000000000 --- a/ace/SSL/ACE_SSL_LIB.dsp +++ /dev/null @@ -1,174 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ACE_SSL_LIB" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=ACE_SSL_LIB - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ACE_SSL_LIB.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ACE_SSL_LIB.mak" CFG="ACE_SSL_LIB - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ACE_SSL_LIB - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "ACE_SSL_LIB - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/StentorSoft/ACE_Wrappers/ace/SSL", WYQDAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ACE_SSL_LIB - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\LIB\Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_LIB" /D "ACE_AS_STATIC_LIBS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"ACE_SSLs.lib" - -!ELSEIF "$(CFG)" == "ACE_SSL_LIB - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\LIB\Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_LIB" /D "ACE_AS_STATIC_LIBS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"ACE_SSLsd.lib" - -!ENDIF - -# Begin Target - -# Name "ACE_SSL_LIB - Win32 Release" -# Name "ACE_SSL_LIB - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\SSL_Asynch_BIO.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_Context.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Stream.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm" -# Begin Source File - -SOURCE=.\SSL_Asynch_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_Context.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_Export.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\sslconf.h -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "i;inl" -# Begin Source File - -SOURCE=.\SSL_Context.inl -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK.i -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\SSL_SOCK_Stream.i -# End Source File -# End Group -# End Target -# End Project diff --git a/ace/SSL/ACE_SSL_LIB.dsw b/ace/SSL/ACE_SSL_LIB.dsw deleted file mode 100644 index f783011b55b..00000000000 --- a/ace/SSL/ACE_SSL_LIB.dsw +++ /dev/null @@ -1,41 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ACE_SSL"=.\ACE_SSL.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ACE_SSL_LIB"=.\ACE_SSL_LIB.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ace/SSL/Makefile b/ace/SSL/Makefile deleted file mode 100644 index 99e532e033d..00000000000 --- a/ace/SSL/Makefile +++ /dev/null @@ -1,648 +0,0 @@ -#---------------------------------------------------------------------------- -# -# $Id$ -# -#---------------------------------------------------------------------------- - -ifndef ACE_ROOT -default: - @echo 'You must set ACE_ROOT' -endif # ! ACE_ROOT - -MAKEFILE = Makefile -LIBNAME = libACE_SSL -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) - -FILES = \ - SSL_Context \ - SSL_SOCK \ - SSL_SOCK_Acceptor \ - SSL_SOCK_Connector \ - SSL_SOCK_Stream \ - SSL_Asynch_Stream \ - SSL_Asynch_BIO - -LSRC = $(addsuffix .cpp,$(FILES)) - -LIBS = $(ACELIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -ifneq ($(ssl),) - CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS) - LIBS += $(PLATFORM_SSL_LIBS) - LDFLAGS += $(PLATFORM_SSL_LDFLAGS) -endif # ssl - -#---------------------------------------------------------------------------- -# Local targets (and local hacks) -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/SSL_Context.o .obj/SSL_Context.so .shobj/SSL_Context.o .shobj/SSL_Context.so: SSL_Context.cpp SSL_Context.h \ - $(ACE_ROOT)/ace/pre.h SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/String_Base.i sslconf.h SSL_Context.inl \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Framework_Component_T.inl - -.obj/SSL_SOCK.o .obj/SSL_SOCK.so .shobj/SSL_SOCK.o .shobj/SSL_SOCK.so: SSL_SOCK.cpp SSL_SOCK.h $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i - -.obj/SSL_SOCK_Acceptor.o .obj/SSL_SOCK_Acceptor.so .shobj/SSL_SOCK_Acceptor.o .shobj/SSL_SOCK_Acceptor.so: SSL_SOCK_Acceptor.cpp SSL_SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/pre.h SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl SSL_SOCK_Stream.h SSL_SOCK.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/SOCK_Stream.i SSL_SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/OS_QoS.h SSL_SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/Handle_Set.h - -.obj/SSL_SOCK_Connector.o .obj/SSL_SOCK_Connector.so .shobj/SSL_SOCK_Connector.o .shobj/SSL_SOCK_Connector.so: SSL_SOCK_Connector.cpp SSL_SOCK_Connector.h \ - $(ACE_ROOT)/ace/pre.h SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl SSL_SOCK_Stream.h SSL_SOCK.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/SOCK_Stream.i SSL_SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/OS_QoS.h SSL_SOCK_Connector.i \ - $(ACE_ROOT)/ace/Handle_Set.h - -.obj/SSL_SOCK_Stream.o .obj/SSL_SOCK_Stream.so .shobj/SSL_SOCK_Stream.o .shobj/SSL_SOCK_Stream.so: SSL_SOCK_Stream.cpp \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h SSL_SOCK_Stream.h \ - SSL_Export.h SSL_SOCK.h $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/SOCK_Stream.i SSL_SOCK_Stream.i - -.obj/SSL_Asynch_Stream.o .obj/SSL_Asynch_Stream.so .shobj/SSL_Asynch_Stream.o .shobj/SSL_Asynch_Stream.so: SSL_Asynch_Stream.cpp SSL_Asynch_Stream.h \ - $(ACE_ROOT)/ace/pre.h SSL_Context.h SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/Message_Block_T.i SSL_Asynch_BIO.h \ - $(ACE_ROOT)/ace/POSIX_Proactor.h \ - $(ACE_ROOT)/ace/Proactor_Impl.h \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Pipe.h $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Asynch_Pseudo_Task.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor_T.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.h \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ - $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Proactor.h \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(ACE_ROOT)/ace/Timer_Wheel.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.cpp - -.obj/SSL_Asynch_BIO.o .obj/SSL_Asynch_BIO.so .shobj/SSL_Asynch_BIO.o .shobj/SSL_Asynch_BIO.so: SSL_Asynch_BIO.cpp SSL_Asynch_BIO.h \ - $(ACE_ROOT)/ace/pre.h SSL_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl SSL_Asynch_Stream.h \ - SSL_Context.h $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/Message_Block_T.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ace/SSL/Makefile.bor b/ace/SSL/Makefile.bor deleted file mode 100644 index 4ac97d0ab86..00000000000 --- a/ace/SSL/Makefile.bor +++ /dev/null @@ -1,28 +0,0 @@ - -# -# Makefile for building the ACE SSL library with Borland C++Builder -# - -!ifdef SSL_ROOT -NAME = ACE_SSL -!endif - -OBJFILES = \ - $(OBJDIR)\SSL_Context.obj \ - $(OBJDIR)\SSL_SOCK.obj \ - $(OBJDIR)\SSL_SOCK_Acceptor.obj \ - $(OBJDIR)\SSL_SOCK_Connector.obj \ - $(OBJDIR)\SSL_SOCK_Stream.obj \ - $(OBJDIR)\SSL_Asynch_Stream.obj \ - $(OBJDIR)\SSL_Asynch_BIO.obj - -CFLAGS = $(ACE_CFLAGS) $(SSL_CFLAGS) $(ACE_SSL_CFLAGS) -DACE_SSL_BUILD_DLL - -LIBFILES = $(ACE_LIB) $(SSL_LIB) - -CPPDIR = . - -INCDIR_NAME = ace\SSL -INCLUDES = *.h *.i *.inl - -!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp deleted file mode 100644 index f55daf14e76..00000000000 --- a/ace/SSL/SSL_Asynch_BIO.cpp +++ /dev/null @@ -1,199 +0,0 @@ -// -*- C++ -*- - -#include "SSL_Asynch_BIO.h" -#include "SSL_Asynch_Stream.h" - -ACE_RCSID (ACE_SSL, - SSL_Asynch_BIO, - "$Id$") - -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) - -#define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) - -static BIO_METHOD methods_ACE = - { - BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, - "ACE_Asynch_BIO", - ACE_Asynch_BIO_write, - ACE_Asynch_BIO_read, - ACE_Asynch_BIO_puts, - NULL, /* ACE_Asynch_BIO_gets, */ - ACE_Asynch_BIO_ctrl, - ACE_Asynch_BIO_new, - ACE_Asynch_BIO_free, - NULL - }; - -BIO_METHOD * -BIO_s_ACE_Asynch (void) -{ - return (&methods_ACE); -} - -BIO * -BIO_new_ACE_Asynch (void *ssl_asynch_stream) -{ - BIO * pBIO = BIO_new (BIO_s_ACE_Asynch ()); - - if (pBIO) - BIO_ctrl (pBIO, - BIO_C_SET_FILE_PTR, - 0, - ssl_asynch_stream); - - return pBIO; -} - -int -ACE_Asynch_BIO_new (BIO *pBIO) -{ - pBIO->init = 0; // not initialized - pBIO->num = 0; // still zero ( we can use it ) - pBIO->ptr = 0; // will be pointer to ACE_SSL_Asynch_Stream - pBIO->flags = 0; // - - return 1; -} - -int -ACE_Asynch_BIO_free (BIO *pBIO) -{ - if (pBIO == 0) - return 0; - - if (pBIO->shutdown) - { - pBIO->ptr = 0; - pBIO->init = 0; - pBIO->num = 0; - pBIO->flags = 0; - } - - return 1; -} - -int -ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len) -{ - BIO_clear_retry_flags (pBIO); - - ACE_SSL_Asynch_Stream * p_stream = - ACE_static_cast (ACE_SSL_Asynch_Stream *, pBIO->ptr); - - if (pBIO->init == 0 || p_stream == 0) - return -1; - - if (buf == 0) - return -1; - - if (len <= 0 ) - return -1; - - BIO_clear_retry_flags (pBIO); - - int errval = 0; - - int retval = - p_stream->ssl_bio_read (buf, - ACE_static_cast (size_t, len), - errval); - - if (retval >= 0) - return retval; - - if (errval == EINPROGRESS) - BIO_set_retry_read (pBIO); - - return -1; -} - -int -ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len) -{ - BIO_clear_retry_flags (pBIO); - - ACE_SSL_Asynch_Stream * p_stream = - ACE_static_cast (ACE_SSL_Asynch_Stream *, pBIO->ptr); - - if (pBIO->init == 0 || p_stream == 0) - return -1; - - if (buf == 0) - return -1; - - if (len <= 0) - return -1; - - BIO_clear_retry_flags (pBIO); - - int errval = 0; - - int retval = - p_stream->ssl_bio_write (buf, - ACE_static_cast (size_t, len), - errval); - - if (retval >= 0) - return retval; - - if (errval == EINPROGRESS) - BIO_set_retry_write (pBIO); - - return -1; -} - -long -ACE_Asynch_BIO_ctrl (BIO * pBIO, int cmd, long num, void *ptr) -{ - long ret = 1; - - switch (cmd) - { - case BIO_C_SET_FILE_PTR: - pBIO->shutdown = ACE_static_cast (int, num); - pBIO->ptr = ptr; - pBIO->init = 1; - break; - - case BIO_CTRL_INFO: - ret = 0; - break; - - case BIO_CTRL_GET_CLOSE: - ret = pBIO->shutdown; - break; - - case BIO_CTRL_SET_CLOSE: - pBIO->shutdown = ACE_static_cast (int, num); - break; - - case BIO_CTRL_PENDING: - case BIO_CTRL_WPENDING: - ret = 0; - break; - - case BIO_CTRL_DUP: - case BIO_CTRL_FLUSH: - ret = 1; - break; - - default: - ret = 0; - break; - } - - return ret; -} - - -int -ACE_Asynch_BIO_puts (BIO *pBIO, const char *str) -{ - int n = ACE_OS::strlen (str); - - return ACE_Asynch_BIO_write (pBIO, str, n); -} - -#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 || - ACE_HAS_AIO_CALLS) */ diff --git a/ace/SSL/SSL_Asynch_BIO.h b/ace/SSL/SSL_Asynch_BIO.h deleted file mode 100644 index c903417fb1e..00000000000 --- a/ace/SSL/SSL_Asynch_BIO.h +++ /dev/null @@ -1,51 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SSL_Asynch_BIO.h - * - * $Id$ - * - * @author Alexander Libman - * @author Ossama Othman - * - */ -//============================================================================= - -#ifndef ACE_SSL_ASYNCH_BIO_H -#define ACE_SSL_ASYNCH_BIO_H - -#include "ace/pre.h" - -#include "SSL_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include - -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) - -/** - * @name OpenSSL BIO Helper Methods for use with ACE's Asynchronous - * SSL I/O support. - */ -//@{ -extern "C" -{ - int ACE_Asynch_BIO_write (BIO *pBIO, const char *buf, int len); - int ACE_Asynch_BIO_read (BIO *pBIO, char *buf, int len); - int ACE_Asynch_BIO_puts (BIO *pBIO, const char *str); - long ACE_Asynch_BIO_ctrl (BIO *pBIO, int cmd, long arg1, void *arg2); - int ACE_Asynch_BIO_new (BIO *pBIO); - int ACE_Asynch_BIO_free (BIO *pBIO); -} -//@} - -#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL (ACE_WIN32 || - ACE_HAS_AIO_CALLS) */ - -#include "ace/post.h" - -#endif /* ACE_SSL_ASYNCH_BIO_H */ diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp deleted file mode 100644 index 160b86a466b..00000000000 --- a/ace/SSL/SSL_Asynch_Stream.cpp +++ /dev/null @@ -1,1124 +0,0 @@ -// -*- C++ -*- - -#include "SSL_Asynch_Stream.h" - -ACE_RCSID (ACE_SSL, - SSL_Asynch_Stream, - "$Id$") - -// This only works on platforms with Asynchronous IO support. -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) - - -#if defined (ACE_WIN32) - -# define A_RESULT ACE_WIN32_Asynch_Result -# define ARS_RESULT ACE_WIN32_Asynch_Read_Stream_Result -# define AWS_RESULT ACE_WIN32_Asynch_Write_Stream_Result - -# define ERR_CANCELED ERROR_OPERATION_ABORTED - -# include "ace/WIN32_Proactor.h" - -#else - -# define A_RESULT ACE_POSIX_Asynch_Result -# define ARS_RESULT ACE_POSIX_Asynch_Read_Stream_Result -# define AWS_RESULT ACE_POSIX_Asynch_Write_Stream_Result - -# define ERR_CANCELED ECANCELED - -# include "ace/POSIX_Proactor.h" - -#endif /* ACE_WIN32 */ - -#include "ace/Proactor.h" - -#include - -// ************************************************************ -// SSL Asynchronous Write Result -// ************************************************************ - -class ACE_SSL_Export ACE_SSL_Asynch_Write_Stream_Result: - public AWS_RESULT -{ - /// Factory class will have special permissions. - friend class ACE_SSL_Asynch_Stream; - -protected: - - ACE_SSL_Asynch_Write_Stream_Result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number); -}; - -ACE_SSL_Asynch_Write_Stream_Result::ACE_SSL_Asynch_Write_Stream_Result - (ACE_Handler & handler, - ACE_HANDLE handle, - ACE_Message_Block & message_block, - size_t bytes_to_write, - const void * act, - ACE_HANDLE event, - int priority, - int signal_number - ) - : AWS_RESULT (handler, - handle, - message_block, - bytes_to_write, - act, - event, - priority, - signal_number - ) -{ -} - -// ************************************************************ -// SSL Asynchronous Read Result -// ************************************************************ -class ACE_SSL_Export ACE_SSL_Asynch_Read_Stream_Result: - public ARS_RESULT -{ - /// Factory class will have special permissions. - friend class ACE_SSL_Asynch_Stream; - -protected: - - ACE_SSL_Asynch_Read_Stream_Result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number); -}; - - - -ACE_SSL_Asynch_Read_Stream_Result::ACE_SSL_Asynch_Read_Stream_Result - (ACE_Handler & handler, - ACE_HANDLE handle, - ACE_Message_Block & message_block, - size_t bytes_to_read, - const void * act, - ACE_HANDLE event, - int priority, - int signal_number - ) - : ARS_RESULT (handler, - handle, - message_block, - bytes_to_read, - act, - event, - priority, - signal_number - ) -{ -} - - -// ************************************************************ -// Faked Result. It is used for close notification -// ************************************************************ -class ACE_SSL_Asynch_Result : public A_RESULT -{ -public: - ACE_SSL_Asynch_Result (ACE_Handler & handler); - - void complete (size_t bytes_transferred, - int success, - const void * completion_key, - u_long error); -}; - -ACE_SSL_Asynch_Result::ACE_SSL_Asynch_Result - (ACE_Handler & handler) - : A_RESULT (handler, - 0, // act, - ACE_INVALID_HANDLE, - 0, // Offset - 0, // OffsetHigh - 0, // Priority - ACE_SIGRTMIN //signal_number - ) -{ -} - -void -ACE_SSL_Asynch_Result::complete (size_t /* bytes_transferred */, - int /* success */, - const void * /* completion_key */, - u_long /* error */) -{ - this->handler_.handle_wakeup (); -} - -// ************************************************************ -// ACE_SSL_Asynch_Stream Constructor / Desctructor -// ************************************************************ -ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream ( - ACE_SSL_Asynch_Stream::Stream_Type s_type, - ACE_SSL_Context * context) - : type_ (s_type), - handle_ (ACE_INVALID_HANDLE), - proactor_ (0), - ext_handler_ (0), - ext_read_result_ (0), - ext_write_result_(0), - flags_ (0), - ssl_ (0), - bio_ (0), - bio_istream_ (), - bio_inp_msg_ (), - bio_inp_errno_(0), - bio_inp_flag_ (0), - bio_ostream_ (), - bio_out_msg_ (), - bio_out_errno_(0), - bio_out_flag_ (0), - mutex_ () -{ - ACE_TRACE ("ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream"); - // was honestly copied from ACE_SSL_SOCK_Stream :) - - ACE_SSL_Context * ctx = - (context == 0 ? ACE_SSL_Context::instance () : context); - - this->ssl_ = ::SSL_new (ctx->context ()); - - if (this->ssl_ == 0) - ACE_ERROR - ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("- cannot allocate new SSL structure") - )); - - ::SSL_set_verify (this->ssl_, - ctx->default_verify_mode (), - 0); -} - -ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) -{ - ACE_TRACE ("ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream"); - - - // It is safe to delete stream if all notifications are received, - // i.e., state is SF_DELETE_ENABLE or if proactor event loop is - // done. - if (this->flags_ & SF_STREAM_OPEN) // open - if ((this->flags_ & SF_DELETE_ENABLE) == 0) // but .. - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("ACE_SSL_Asynch_Stream::DTOR-") - ACE_TEXT("possible access violation ") - ACE_TEXT("if proactor still handles events\n"))); - - ::SSL_free (this->ssl_); - this->ssl_ = 0; - - // Was honestly copied from ACE_SSL_SOCK_Stream :) - - // @@ Question: should we reference count the Context object or - // leave that to the application developer? We do not reference - // count reactors (for example) and following some simple rules - // seems to work fine! -} - -// ************************************************************ -// close () -// returns : -// 0 - Stream is in the state SF_DELETE_ENABLE, -// so it is safe to delete stream -// -1 - Stream has pending AIO requests, -// close should be repeated later one more -// ************************************************************ - -int -ACE_SSL_Asynch_Stream::close (void) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); - - if ((flags_ & SF_STREAM_OPEN) == 0) // not open - flags_ |= SF_DELETE_ENABLE; - - if (flags_ & SF_DELETE_ENABLE) - return 0; - - flags_ |= SF_REQ_SHUTDOWN; - - this->do_SSL_state_machine (); - - return -1; -} - -// ************************************************************ -// Asynch_Operation interface -// cancel -// ************************************************************ -int -ACE_SSL_Asynch_Stream::cancel (void) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); - - if ((flags_ & SF_STREAM_OPEN) == 0) // not open - return 1; // AIO_ALLDONE - - // attempt to cancel internal, i.e. user's read/write - int rc_r_int = bio_istream_.cancel(); - int rc_w_int = bio_ostream_.cancel(); - - // attempt to cancel external, i.e. bio_ssl read/write - int rc_r_ext = notify_read (0, ERR_CANCELED); - int rc_w_ext = notify_read (0, ERR_CANCELED); - - if (rc_r_int < 0 || rc_w_int < 0 - && rc_r_ext < 0 || rc_w_ext < 0) - return -1; // at least one error - - if (rc_r_int == 1 && rc_w_int == 1 - && rc_r_ext == 1 && rc_w_ext == 1) - return 1; // AIO_ALLDONE - - if (rc_r_int == 2 || rc_w_int == 2 - && rc_r_ext == 2 || rc_w_ext == 2) - return 2; // AIO_NOT_CANCELED , at least one not canceled - - return 0; // AIO_CANCELED, at least will be one notification -} - -// ************************************************************ -// Asynch_Operation interface -// open -// ************************************************************ -int -ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, - ACE_HANDLE handle, - const void * completion_key, - ACE_Proactor * proactor) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); - - if (this->flags_ & SF_STREAM_OPEN) - ACE_ERROR_RETURN - ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- already opened")), - -1); - - if (this->ssl_ == 0) - ACE_ERROR_RETURN - ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- SSL structure is absent")), - -1); - - if (handle == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN - ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- invalid handle")), - -1); - - - // Get a proactor for/from the user. - this->proactor_ = this->get_proactor (proactor, handler); - this->ext_handler_ = & handler; - this->handle_ = handle; - - // Open internal input stream - if (this->bio_istream_.open (*this, // real callbacks to this - handle, - completion_key, - this->proactor_) != 0) - return -1; - - // Open internal output stream - if (this->bio_ostream_.open (*this, // real callbacks to this - handle, - completion_key, - this->proactor_) != 0) - return -1; - - this->bio_ = ::BIO_new_ACE_Asynch (this); - - if (this->bio_ == 0) - ACE_ERROR_RETURN - ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- cannot allocate new BIO structure")), - -1); - - ::SSL_set_bio (this->ssl_ , this->bio_ , this->bio_); - - switch (this->type_) - { - case ST_CLIENT: - ::SSL_set_connect_state (this->ssl_); - break; - - case ST_SERVER: - ::SSL_set_accept_state (this->ssl_); - break; - - default: - ACE_ERROR_RETURN - ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- invalid stream type")), - -1); - } - - this->flags_ |= SF_STREAM_OPEN; - - this->do_SSL_state_machine (); - - return 0; -} - -void -ACE_SSL_Asynch_Stream::open (ACE_HANDLE new_handle, - ACE_Message_Block &block) -{ - ACE_Service_Handler::open (new_handle, - block); -} - -// ************************************************************ -// Asynch_Operation interface -// read -// ************************************************************ -int -ACE_SSL_Asynch_Stream::read (ACE_Message_Block & message_block, - size_t bytes_to_read, - const void * act, - int priority, - int signal_number) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); - - if ((this->flags_ & SF_STREAM_OPEN) == 0) // not open - return -1; - - if (this->flags_ & SF_REQ_SHUTDOWN) - return -1; - - // only one read operation is allowed now - // later it will be possible to make a queue - - if (this->ext_read_result_ != 0) - return -1; - - // create result for future notification - ACE_NEW_RETURN (this->ext_read_result_, - ACE_SSL_Asynch_Read_Stream_Result ( - *this->ext_handler_, - this->handle_, - message_block, - bytes_to_read, - act, - this->proactor_->get_handle(), - priority, - signal_number), - -1); - - this->do_SSL_state_machine (); // ignore return code - - return 0; -} - -// ************************************************************ -// Asynch_Operation interface -// write -// ************************************************************ -int -ACE_SSL_Asynch_Stream::write (ACE_Message_Block & message_block, - size_t bytes_to_write, - const void * act, - int priority, - int signal_number) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); - - if ((this->flags_ & SF_STREAM_OPEN) == 0) // not open - return -1; - - if (this->flags_ & SF_REQ_SHUTDOWN) - return -1; - - // only one read operation is allowed now - // later it will be possible to make a queue - - if (this->ext_write_result_ != 0) - return -1; - - // create result for future notification - ACE_NEW_RETURN (this->ext_write_result_, - ACE_SSL_Asynch_Write_Stream_Result ( - *this->ext_handler_, - this->handle_, - message_block, - bytes_to_write, - act, - this->proactor_->get_handle(), - priority, - signal_number), - -1); - - this->do_SSL_state_machine (); - - return 0; -} - -// ************************************************************ -// Main SSL engine -// ************************************************************ -int -ACE_SSL_Asynch_Stream::do_SSL_state_machine (void) -{ - // this protected member should be called - // with locked mutex_ - - int retval = this->do_SSL_handshake (); - - if (retval == 0) // handshake in progress ? - return 0; - - if (retval < 0) - this->flags_ |= SF_REQ_SHUTDOWN; - - this->do_SSL_read (); // execute user read request - this->do_SSL_write (); // execute user write request - - if ((this->flags_ & SF_REQ_SHUTDOWN) == 0) // Do we have any errors - return 0; - - this->do_SSL_shutdown (); - - this->notify_close (); - - return 0; -} - -// ************************************************************ -// do_SSL_shutdown -// return code: -// 1 SSL shutdown is finished already, success -// 0 SSL shutdown in progress -// -1 failure -// ************************************************************ -int -ACE_SSL_Asynch_Stream::do_SSL_shutdown (void) -{ - if (this->flags_ & SF_SHUTDOWN_DONE) // already done - return 1; - - this->flags_ |= SF_REQ_SHUTDOWN; - - // if we have any uncompleted user requests - // than cancel its - this->notify_read (0, ERR_CANCELED); - this->notify_write (0, ERR_CANCELED); - - int retval = ::SSL_shutdown (this->ssl_); - - int status = ::SSL_get_error (this->ssl_, retval); - - switch (status) - { - case SSL_ERROR_NONE: - case SSL_ERROR_ZERO_RETURN: - case SSL_ERROR_SYSCALL: - retval = 1; - break; - - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - case SSL_ERROR_WANT_CONNECT: - // case SSL_ERROR_WANT_ACCEPT: - case SSL_ERROR_WANT_X509_LOOKUP: - return 0; - - default: - this->print_error (status, - ACE_TEXT ("Shutdown error")); - retval = -1; - break; - } - - this->flags_ |= SF_SHUTDOWN_DONE; - - return retval; -} - -// ************************************************************ -// Do SSL handshake if necessary -// return code: -// 1 SSL handshake is finished already, success -// 0 SSL handshake in progress -// -1 failure -// ************************************************************ -int -ACE_SSL_Asynch_Stream::do_SSL_handshake (void) -{ - if (SSL_is_init_finished (this->ssl_)) - return 1; - - if (this->flags_ & SF_REQ_SHUTDOWN) - return -1; - - int retval = -1; - - switch (this->type_) - { - case ST_CLIENT: - retval = ::SSL_connect (this->ssl_); - break; - - case ST_SERVER: - retval = ::SSL_accept (this->ssl_); - break; - - default: - ACE_ERROR_RETURN - ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("- invalid stream type")), - -1); - } - - int status = ::SSL_get_error (this->ssl_, retval); - - switch (status) - { - case SSL_ERROR_NONE: - break; - - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - case SSL_ERROR_WANT_CONNECT: - //case SSL_ERROR_WANT_ACCEPT: - case SSL_ERROR_WANT_X509_LOOKUP: - return 0; - - case SSL_ERROR_ZERO_RETURN: - case SSL_ERROR_SYSCALL: - default: - this->print_error (status, - ACE_TEXT ("Handshake error")); - return -1; - } - - return 1; -} - -// ************************************************************ -// Perform SSL_read call if necessary and notify user -// ************************************************************ -int -ACE_SSL_Asynch_Stream::do_SSL_read (void) -{ - if (this->ext_read_result_ == 0) // nothing to do - return 0; - - if (this->flags_ & SF_REQ_SHUTDOWN) - { - this->notify_read (0, ERR_CANCELED); - return -1; - } - - ACE_Message_Block & mb = this->ext_read_result_->message_block (); - size_t bytes_req = this->ext_read_result_->bytes_to_read (); - - int bytes_trn = ::SSL_read (this->ssl_, - mb.rd_ptr (), - bytes_req); - - int status = ::SSL_get_error (this->ssl_, bytes_trn); - - switch (status) - { - case SSL_ERROR_NONE: - this->notify_read (bytes_trn, 0); - return 1; - - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - return 0; - - case SSL_ERROR_ZERO_RETURN: - this->notify_read (0, 0); - return 1; - - case SSL_ERROR_SYSCALL: - if (bytes_trn == 0) - { - this->notify_read (0, 0); - return 1; - } - // If not an EOF, then fall through to "default" case. - - default: - break; - } - - this->notify_read (0, EFAULT); - this->print_error (status, - ACE_TEXT ("SSL_read error")); - - return -1; -} - -// ************************************************************ -// Perform SSL_write call if necessary and notify user -// ************************************************************ -int -ACE_SSL_Asynch_Stream::do_SSL_write (void) -{ - if (this->ext_write_result_ == 0) // nothing to do - return 0; - - if (this->flags_ & SF_REQ_SHUTDOWN) - { - this->notify_write (0, ERR_CANCELED); - return -1; - } - - ACE_Message_Block & mb = this->ext_write_result_->message_block (); - size_t bytes_req = this->ext_write_result_->bytes_to_write (); - - int bytes_trn = ::SSL_write (this->ssl_, - mb.rd_ptr (), - bytes_req); - - int status = ::SSL_get_error (this->ssl_, bytes_trn); - - switch (status) - { - case SSL_ERROR_NONE: - this->notify_write (bytes_trn, 0); - return 1; - - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - return 0; - - case SSL_ERROR_ZERO_RETURN: - this->notify_write (bytes_trn, 0); - return 1; - - case SSL_ERROR_SYSCALL: - default: - break; - } - - this->notify_write(0, EFAULT); - this->print_error (status, - ACE_TEXT ("SSL_write error")); - - return -1; -} - -// ************************************************************ -// notify external user handler that -// it is now to safe destroy stream -// Return code looks like cancel() return code -// 0 - notified NOTIFIED -// 1 - nothing to notify ALLDONE -// 2 - unable to notify NOT NOTIFIED -// ************************************************************ -int -ACE_SSL_Asynch_Stream::notify_close (void) -{ - if (this->flags_ & SF_CLOSE_NTF_SENT) // already sent - return 1; - - if ((this->flags_ & SF_SHUTDOWN_DONE) == 0) // only after shutdown - return 2; // too early , we will do later - - if (this->pending_BIO_count () != 0) // wait for all internal IO - return 2; // too early , we will do later - - // create result for future notification - ACE_SSL_Asynch_Result * close_result = 0; - - ACE_NEW_RETURN (close_result, - ACE_SSL_Asynch_Result (*this), - 2); - //@@ Not exception safe! - - int retval = - close_result->post_completion (this->proactor_->implementation ()); - - if (retval == 0) - { - this->flags_ |= SF_CLOSE_NTF_SENT; - return 0; - } - - delete close_result; - return 2; -} - -// ************************************************************ -// notify external user handler about user write completion -// Return code looks like cancel() return code -// 0 - notified NOTIFIED/CANCELED -// 1 - nothing to notify ALLDONE -// 2 - unable to notify NOT NOTIFIED/CANCELED -// ************************************************************ - -int -ACE_SSL_Asynch_Stream::notify_read (int bytes_transferred, - int error) -{ - if (ext_read_result_ == 0) //nothing to notify - return 1; - - ext_read_result_->set_bytes_transferred (bytes_transferred); - ext_read_result_->set_error (error); - - int retval = ext_read_result_->post_completion - (proactor_->implementation()); - - if (retval == 0) - { - ext_read_result_ = 0; - return 0; // success - } - - return 2; // unable to notify -} - -// ************************************************************ -// notify external user handler about user write completion -// Return code looks like cancel() return code -// 0 - notified NOTIFIED/CANCELED -// 1 - nothing to notify ALLDONE -// 2 - unable to notify NOT NOTIFIED/CANCELED -// ************************************************************ - -int -ACE_SSL_Asynch_Stream::notify_write (int bytes_transferred, - int error) -{ - if (this->ext_write_result_ == 0) //nothing to notify - return 1; - - this->ext_write_result_->set_bytes_transferred (bytes_transferred); - this->ext_write_result_->set_error (error); - - int retval = - this->ext_write_result_->post_completion ( - this->proactor_->implementation ()); - - if (retval == 0) - { - this->ext_write_result_ = 0; - return 0; // success - } - - return 2; // unable to notify -} - -// ************************************************************ -// Print SSL errors -// ************************************************************ -void -ACE_SSL_Asynch_Stream::print_error (int err_ssl, - const ACE_TCHAR * pText) -{ - ACE_DEBUG ((LM_DEBUG, - "SSL-error:%d %s\n" , - err_ssl, - pText)); - -#if OPENSSL_VERSION_NUMBER >= 0x0090601fL - // OpenSSL < 0.9.6a doesn't have ERR_error_string_n() function. - unsigned long lerr = 0; - char buf[1024]; - - while ((lerr = ERR_get_error()) != 0) - { - ERR_error_string_n (lerr, buf, sizeof buf); - - ACE_DEBUG ((LM_DEBUG, "%s\n", buf)); - } -#endif /* OPENSSL_VERSION_NUMBER */ -} - -// ************************************************************ -// BIO helper functions -// SSL library will ask BIO to do raw I/O -// BIO will call us to do this -// ************************************************************ -int -ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf, - size_t len, - int & errval) -{ - // We do not have to acquire mutex - // as we called already with locked mutex - // from do_SSL_state_machine() - - errval = 0; - - size_t cur_len = this->bio_inp_msg_.length (); - - if (cur_len > 0) // there are more data buffered - { - const char * rd_ptr = this->bio_inp_msg_.rd_ptr (); - - if (cur_len > len) - cur_len = len; - - ACE_OS::memcpy (buf, rd_ptr, cur_len); - - this->bio_inp_msg_.rd_ptr (cur_len); // go ahead - - return cur_len; - } - - if (this->bio_inp_errno_ != 0) // if was error - it is permanent ! - { - errval = this->bio_inp_errno_; - return -1; - } - - if (this->bio_inp_flag_ & BF_EOS) // End of stream - return 0; - - errval = EINPROGRESS; // SSL will try later - - if (this->bio_inp_flag_ & BF_AIO) // we are busy - return -1; - - if (this->bio_inp_msg_.size (len) != 0) - { - ACE_ERROR - ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("error in ACE_Message_Block::size() ") - )); - - errval = EINVAL; - return -1; - } - - char * base = this->bio_inp_msg_.base (); - - this->bio_inp_msg_.rd_ptr (base); - this->bio_inp_msg_.wr_ptr (base); - - if (this->bio_istream_.read ( - bio_inp_msg_, // message block - len, // priority - 0, // act - 0, // priority - ACE_SIGRTMIN // default signal - ) == -1) - { - ACE_ERROR - ((LM_ERROR, - ACE_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("attempt read failed") - )); - - errval = EINVAL; // may be leave EINPROGRESS ?? - return -1; // to try later - } - - this->bio_inp_flag_ |= BF_AIO; // AIO is active - - return -1; -} - - -int -ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, - size_t len, - int & errval) -{ - // We do not have to acquire mutex - // as we called already with locked mutex - // from do_SSL_state_machine - - errval = 0; - - if (this->bio_out_flag_ & BF_AIO) // sorry, we are busy - { - errval = EINPROGRESS; // try later - return -1; - } - - if (this->bio_out_errno_ != 0) // no recovery - { - errval = this->bio_out_errno_; - return -1; - } - - if (this->bio_out_msg_.size (len) != 0) - { - ACE_ERROR - ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("error in ACE_Message_Block::size() ") - )); - - errval = EINVAL; - return -1; - } - - char * base = this->bio_out_msg_.base (); - - this->bio_out_msg_.rd_ptr (base); - this->bio_out_msg_.wr_ptr (base); - - if (this->bio_out_msg_.copy (buf, len) == -1) - { - ACE_ERROR - ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("error in ACE_Message_Block::copy() ") - )); - - errval = EINVAL; - return -1; - } - - - if (this->bio_ostream_.write ( - this->bio_out_msg_, // message block - len, // priority - 0, // act - 0, // priority - ACE_SIGRTMIN // default signal - ) == -1) - { - ACE_ERROR - ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("attempt write failed") - )); - - errval = EINVAL; // may be leave EINPROGRESS ?? - return -1; // to try later - } - - this->bio_out_flag_ |= BF_AIO; // AIO is active - errval = 0; // Ok, go ahead - - return len; -} - -// ************************************************************ -// Internal IO handlers -// virtual from ACE_Service_Handler -// ************************************************************ -void -ACE_SSL_Asynch_Stream::handle_write_stream ( - const ACE_Asynch_Write_Stream::Result &result) -{ - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_)); - - this->bio_out_flag_ &= ~BF_AIO; - - ACE_Message_Block & mb = result.message_block (); - - size_t bytes_req = result.bytes_to_write (); - size_t bytes_trn = result.bytes_transferred (); - u_long errval = result.error (); - size_t len = bytes_req - bytes_trn; - - if (errval != 0) // error ? - this->bio_out_errno_ = errval; // save error code - else if (len > 0) // TCP/IP overloaded ? - { // continue, rd_ptr at right place - if (this->bio_ostream_.write ( - mb, // message block - len, // priority - 0, // act - 0, // priority - ACE_SIGRTMIN // default signal - ) == 0) - { - this->bio_out_flag_ |= BF_AIO; - return; - } - - ACE_ERROR - ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("attempt write failed") - )); - - this->bio_out_errno_ = EINVAL; - } - - this->do_SSL_state_machine (); - - return; -} - -void -ACE_SSL_Asynch_Stream::handle_read_stream ( - const ACE_Asynch_Read_Stream::Result &result) -{ - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_)); - - this->bio_inp_flag_ &= ~BF_AIO; - - size_t bytes_trn = result.bytes_transferred (); - u_long errval = result.error (); - - if (errval != 0) // error ? - this->bio_inp_errno_ = errval; // save error code - else if (bytes_trn == 0) // end of stream ? - this->bio_inp_flag_ |= BF_EOS; // set flag EOS - - this->do_SSL_state_machine (); - - return; -} - -void -ACE_SSL_Asynch_Stream::handle_wakeup (void) -{ - ACE_Handler * user_handler = 0; - - { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_)); - - this->flags_ |= SF_DELETE_ENABLE; - - user_handler = this->ext_handler_; - } - - if (user_handler != 0) - user_handler->handle_wakeup(); -} - -int -ACE_SSL_Asynch_Stream::pending_BIO_count (void) -{ - int ret = 0; - - if (this->bio_inp_flag_ & BF_AIO) - ret++; - - if (this->bio_out_flag_ & BF_AIO) - return ret++; - - return ret; -} - -#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 || - ACE_HAS_AIO_CALLS) */ diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h deleted file mode 100644 index 106f3a76eee..00000000000 --- a/ace/SSL/SSL_Asynch_Stream.h +++ /dev/null @@ -1,242 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SSL_Asynch_Stream.h - * - * $Id$ - * - * @author Alexander Libman - * - */ -//============================================================================= - -#ifndef ACE_SSL_ASYNCH_STREAM_H -#define ACE_SSL_ASYNCH_STREAM_H - -#include "ace/pre.h" -#include "SSL_Context.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) - -#include "ace/Asynch_IO_Impl.h" -#include "ace/Message_Block.h" - -#include "SSL_Asynch_BIO.h" - -extern "C" -{ - BIO_METHOD * BIO_s_ACE_Asynch (void); - BIO * BIO_new_ACE_Asynch (void *ssl_asynch_stream); -} - - -/// Forward declarations -class ACE_SSL_Asynch_Stream; -class ACE_SSL_Asynch_Result; -class ACE_SSL_Export ACE_SSL_Asynch_Read_Stream_Result; -class ACE_SSL_Export ACE_SSL_Asynch_Write_Stream_Result; - - -/** - * @class ACE_SSL_Asynch_Stream - * - * @brief This class is a factory for starting off asynchronous reads - * on a stream. This class forwards all methods to its - * implementation class. - * @par - * Once open() is called, multiple asynchronous read()s can - * started using this class. An ACE_SSL_Asynch_Stream::Result - * will be passed back to the @param handler when the asynchronous - * reads completes through the ACE_Handler::handle_read_stream - * callback. - */ -class ACE_SSL_Export ACE_SSL_Asynch_Stream - : public ACE_Asynch_Operation, - public ACE_Service_Handler -{ - friend int ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len); - friend int ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len); - -public: - - enum Stream_Type - { - ST_CLIENT = 0x0001, - ST_SERVER = 0x0002 - }; - - - /// The constructor. - ACE_SSL_Asynch_Stream (Stream_Type s_type = ST_SERVER, - ACE_SSL_Context * context = 0); - - /// Destructor - virtual ~ACE_SSL_Asynch_Stream (void); - - int cancel(void); - - int close (void); - - int open (ACE_Handler &handler, - ACE_HANDLE handle = ACE_INVALID_HANDLE, - const void *completion_key = 0, - ACE_Proactor *proactor = 0); - - /// NOTE: This method has been specifically put in place so that - /// compilers like the borland doesnt get confused between the above - /// open () call with the one in the ACE_Service_Handler, from which - /// this class is derived from.. - void open (ACE_HANDLE new_handle, - ACE_Message_Block &message_block); - - int read (ACE_Message_Block &message_block, - size_t num_bytes_to_read, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - int write (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act = 0, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - -protected: - - /// virtual from ACE_Service_Handler - - /// This method is called when BIO write request is completed. It - /// processes the IO completion and calls do_SSL_state_machine(). - virtual void handle_write_stream - (const ACE_Asynch_Write_Stream::Result &result); - - /// This method is called when BIO read request is completed. It - /// processes the IO completion and calls do_SSL_state_machine(). - virtual void handle_read_stream - (const ACE_Asynch_Read_Stream::Result &result); - - /// This method is called when all SSL sessions are closed and no - /// more pending AIOs exist. It also calls users handle_wakeup(). - virtual void handle_wakeup (void); - - /** - * @name SSL State Machine - */ - //@{ - int do_SSL_state_machine (void); - int do_SSL_handshake (void); - int do_SSL_read (void); - int do_SSL_write(void); - int do_SSL_shutdown(void); - //@} - - void print_error (int err_ssl, - const ACE_TCHAR *pText); - - int pending_BIO_count (void); - - /// This method is called to notify user handler when user's read in - /// done. - int notify_read (int bytes_transferred, int error); - - /// This method is called to notify user handler when user's write - /// in done. - int notify_write (int bytes_transferred, int error); - - /// This method is called to notify ourself that SSL session is - /// shutdown and that there is no more I/O activity now and in the - /// future. - int notify_close(void); - - /** - * @name BIO Helpers - */ - //@{ - int ssl_bio_read (char * buf, size_t len, int & errval); - int ssl_bio_write (const char * buf, size_t len, int & errval); - //@} - -protected: - - /// Stream Type ST_CLIENT/ST_SERVER - Stream_Type type_; - - /// The real file/socket handle - ACE_HANDLE handle_; - - /// The proactor - ACE_Proactor * proactor_; - - /// External,i.e user handler - ACE_Handler * ext_handler_; - - /// External, i.e. read result faked for user - ACE_SSL_Asynch_Read_Stream_Result * ext_read_result_ ; - - /// External, i.e. write result faked for user - ACE_SSL_Asynch_Write_Stream_Result * ext_write_result_ ; - - /// Stream state/flags - enum Stream_Flag - { - SF_STREAM_OPEN = 0x0001, /// istream_ open OK - SF_REQ_SHUTDOWN = 0x0002, /// request to SSL shutdown - SF_SHUTDOWN_DONE = 0x0004, /// SSL shutdown finished - SF_CLOSE_NTF_SENT = 0x0008, /// Close notification sent - SF_DELETE_ENABLE = 0x0010 /// Stream can be safely destroyed - }; - - int flags_; - - /// The SSL session. - SSL * ssl_; - - /// The BIO implementation - BIO * bio_; - - /// The real streams which work under the ssl connection. - /// BIO performs I/O via this streams - - enum BIO_Flag // internal IO flags - { - BF_EOS = 0x01, // end of stream - BF_AIO = 0x02 // real AIO in progress - }; - - /** - * @name Internal stream, buffer and info for BIO read - */ - //@{ - ACE_Asynch_Read_Stream bio_istream_; - ACE_Message_Block bio_inp_msg_; - int bio_inp_errno_; - int bio_inp_flag_; - //@} - - /** - * @name Internal stream, buffer and info for BIO write - */ - //@{ - ACE_Asynch_Write_Stream bio_ostream_; - ACE_Message_Block bio_out_msg_; - int bio_out_errno_; - int bio_out_flag_; - //@} - - /// Mutex to protect work - ACE_SYNCH_MUTEX mutex_; - -}; - - -#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 || - ACE_HAS_AIO_CALLS) */ - -#include "ace/post.h" - -#endif /* ACE_SSL_ASYNCH_STREAM_H */ diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp deleted file mode 100644 index f93618d0b0c..00000000000 --- a/ace/SSL/SSL_Context.cpp +++ /dev/null @@ -1,539 +0,0 @@ -// -*- C++ -*- - -#include "SSL_Context.h" - -#include "sslconf.h" - -#if !defined(__ACE_INLINE__) -#include "SSL_Context.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/Synch.h" -#include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" -#include "ace/Singleton.h" - -#include -#include -#include - -ACE_RCSID (ACE_SSL, - SSL_Context, - "$Id$") - -#ifdef ACE_HAS_THREADS -ACE_mutex_t * ACE_SSL_Context::lock_ = 0; -#endif /* ACE_HAS_THREADS */ - - -int ACE_SSL_Context::library_init_count_ = 0; - -ACE_SSL_Context::ACE_SSL_Context (void) - : context_ (0), - mode_ (-1), - default_verify_mode_ (SSL_VERIFY_NONE), - have_ca_ (0) -{ - ACE_SSL_Context::ssl_library_init (); -} - -ACE_SSL_Context::~ACE_SSL_Context (void) -{ - if (this->context_) - { - ::SSL_CTX_free (this->context_); - this->context_ = 0; - } - - ACE_SSL_Context::ssl_library_fini (); -} - -ACE_SSL_Context * -ACE_SSL_Context::instance (void) -{ - return ACE_Singleton::instance (); -} - -void -ACE_SSL_Context::ssl_library_init (void) -{ - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, - ace_ssl_mon, - *ACE_Static_Object_Lock::instance ())); - - if (ACE_SSL_Context::library_init_count_ == 0) - { - // Initialize the locking callbacks before initializing anything - // else. -#ifdef ACE_HAS_THREADS - int num_locks = ::CRYPTO_num_locks (); - - ACE_NEW (ACE_SSL_Context::lock_, - ACE_mutex_t[num_locks]); - - for (int i = 0; i < num_locks; ++i) - { - // rwlock_init(&(ACE_SSL_Context::lock_[i]), USYNC_THREAD, - // 0); - if (ACE_OS::mutex_init (&(ACE_SSL_Context::lock_[i]), - USYNC_THREAD) != 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Context::ssl_library_init ") - ACE_TEXT ("- %p\n"), - ACE_TEXT ("mutex_init"))); - } - -# if !defined (WIN32) - // This call isn't necessary on some platforms. See the CRYPTO - // library's threads(3) man page for details. - ::CRYPTO_set_id_callback (ACE_SSL_thread_id); -# endif /* WIN32 */ - ::CRYPTO_set_locking_callback (ACE_SSL_locking_callback); -#endif /* ACE_HAS_THREADS */ - - ::SSLeay_add_ssl_algorithms (); - ::SSL_load_error_strings (); - - // Seed the random number generator. Note that the random - // number generator can be seeded more than once to "stir" its - // state. - -#ifdef WIN32 - // Seed the random number generator by sampling the screen. - ::RAND_screen (); -#endif /* WIN32 */ - -#if OPENSSL_VERSION_NUMBER >= 0x00905100L - // OpenSSL < 0.9.5 doesn't have EGD support. - - const char *egd_socket_file = - ACE_OS::getenv (ACE_SSL_EGD_FILE_ENV); - - if (egd_socket_file != 0) - (void) this->egd_file (egd_socket_file); -#endif /* OPENSSL_VERSION_NUMBER */ - - const char *rand_file = - ACE_OS::getenv (ACE_SSL_RAND_FILE_ENV); - - if (rand_file != 0) - (void) this->seed_file (rand_file); - - // Initialize the mutexes that will be used by the SSL and - // crypto library. - - } - - ACE_SSL_Context::library_init_count_++; -} - -void -ACE_SSL_Context::ssl_library_fini (void) -{ - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, - ace_ssl_mon, - *ACE_Static_Object_Lock::instance ())); - - ACE_SSL_Context::library_init_count_--; - if (ACE_SSL_Context::library_init_count_ == 0) - { - ::ERR_free_strings (); - ::EVP_cleanup (); - - // Clean up the locking callbacks after everything else has been - // cleaned up. -#ifdef ACE_HAS_THREADS - int num_locks = ::CRYPTO_num_locks (); - - ::CRYPTO_set_locking_callback (0); - for (int i = 0; i < num_locks; ++i) - ACE_OS::mutex_destroy (&(ACE_SSL_Context::lock_[i])); - - delete [] ACE_SSL_Context::lock_; -#endif /* ACE_HAS_THREADS */ - } -} - -int -ACE_SSL_Context::set_mode (int mode) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, - ace_ssl_mon, - *ACE_Static_Object_Lock::instance (), - -1)); - - if (this->context_ != 0) - return -1; - - SSL_METHOD *method = 0; - - switch (mode) - { - case ACE_SSL_Context::SSLv2_client: - method = ::SSLv2_client_method (); - break; - case ACE_SSL_Context::SSLv2_server: - method = ::SSLv2_server_method (); - break; - case ACE_SSL_Context::SSLv2: - method = ::SSLv2_method (); - break; - case ACE_SSL_Context::SSLv3_client: - method = ::SSLv3_client_method (); - break; - case ACE_SSL_Context::SSLv3_server: - method = ::SSLv3_server_method (); - break; - case ACE_SSL_Context::SSLv3: - method = ::SSLv3_method (); - break; - case ACE_SSL_Context::SSLv23_client: - method = ::SSLv23_client_method (); - break; - case ACE_SSL_Context::SSLv23_server: - method = ::SSLv23_server_method (); - break; - case ACE_SSL_Context::SSLv23: - method = ::SSLv23_method (); - break; - case ACE_SSL_Context::TLSv1_client: - method = ::TLSv1_client_method (); - break; - case ACE_SSL_Context::TLSv1_server: - method = ::TLSv1_server_method (); - break; - case ACE_SSL_Context::TLSv1: - method = ::TLSv1_method (); - break; - default: - method = ::SSLv3_method (); - break; - } - - this->context_ = ::SSL_CTX_new (method); - if (this->context_ == 0) - return -1; - - this->mode_ = mode; - - // Load the trusted certificate authority (default) certificate - // locations. But do not return -1 on error, doing so confuses CTX - // allocation (severe error) with the less important loading of CA - // certificate location error. If it is important for your - // application then call ACE_SSL_Context::have_trusted_ca(), - // immediately following this call to set_mode(). - (void) this->load_trusted_ca (); - - return 0; -} - -int -ACE_SSL_Context::load_trusted_ca (const char* ca_file, const char* ca_dir) -{ - this->check_context (); - - if (ca_file == 0) - { - // Use the default environment settings. - ca_file = ACE_OS::getenv (ACE_SSL_CERT_FILE_ENV); - if (ca_file == 0) - ca_file = ACE_DEFAULT_SSL_CERT_FILE; - } - - if (ca_dir == 0) - { - // Use the default environment settings. - ca_dir = ACE_OS::getenv (ACE_SSL_CERT_DIR_ENV); - if (ca_dir == 0) - ca_dir = ACE_DEFAULT_SSL_CERT_DIR; - } - - // NOTE: SSL_CTX_load_verify_locations() returns 0 on error. - if (::SSL_CTX_load_verify_locations (this->context_, - ca_file, - ca_dir) <= 0) - { - if (ACE::debug ()) - ACE_SSL_Context::report_error (); - return -1; - } - else - { - this->have_ca_++; - - // for TLS/SSL servers scan all certificates in ca_file and list - // then as acceptable CAs when requesting a client certificate. - if (mode_ == SSLv23 - || mode_ == SSLv23_server - || mode_ == TLSv1 - || mode_ == TLSv1_server - || mode_ == SSLv3 - || mode_ == SSLv3_server - || mode_ == SSLv2 - || mode_ == SSLv2_server) - { - STACK_OF (X509_NAME) * cert_names; - cert_names = ::SSL_CTX_get_client_CA_list(this->context_); - - if (cert_names == 0) - { - // Set the first certificate authorith list. - cert_names = ::SSL_load_client_CA_file (ca_file); - if (cert_names != 0 ) - ::SSL_CTX_set_client_CA_list (this->context_, - cert_names); - } - else - { - // Add new certificate names to the list. - if (!::SSL_add_file_cert_subjects_to_stack (cert_names, - ca_file)) - cert_names = 0; - } - - if (cert_names == 0) - { - if (ACE::debug ()) - ACE_SSL_Context::report_error (); - return -1; - } - - // @todo - // If warranted do the same for ca_dir when the function - // SSL_add_dir_cert_subjects_to_stack() is portable to - // WIN32, VMS, MAC_OS_pre_X (nb. it is not defined for those - // platforms by OpenSSL). - } - } - - return 0; -} - - -int -ACE_SSL_Context::private_key (const char *file_name, - int type) -{ - if (this->private_key_.type () != -1) - return 0; - - this->check_context (); - - this->private_key_ = ACE_SSL_Data_File (file_name, type); - - if (::SSL_CTX_use_PrivateKey_file (this->context_, - this->private_key_.file_name (), - this->private_key_.type ()) <= 0) - return -1; - else - return this->verify_private_key (); -} - -int -ACE_SSL_Context::verify_private_key (void) -{ - this->check_context (); - - return (::SSL_CTX_check_private_key (this->context_) <= 0 ? -1 : 0); -} - -int -ACE_SSL_Context::certificate (const char *file_name, - int type) -{ - if (this->certificate_.type () != -1) - return 0; - - this->certificate_ = ACE_SSL_Data_File (file_name, type); - - this->check_context (); - - if (::SSL_CTX_use_certificate_file (this->context_, - this->certificate_.file_name (), - this->certificate_.type ()) <= 0) - return -1; - else - return 0; -} - -void -ACE_SSL_Context::set_verify_peer (int strict, int once, int depth) -{ - this->check_context (); - - // Setup the peer verififcation mode. - - int verify_mode = SSL_VERIFY_PEER; - if (once) - verify_mode |= SSL_VERIFY_CLIENT_ONCE; - if (strict) - verify_mode |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; - - // set the default verify mode - this->default_verify_mode (verify_mode); - - // Set the max certificate depth but later let the verify_callback - // catch the depth error by adding one to the required depth. - if (depth > 0) - ::SSL_CTX_set_verify_depth (this->context_, depth + 1); -} - - -int -ACE_SSL_Context::random_seed (const char * seed) -{ - ::RAND_seed (seed, ACE_OS::strlen (seed)); - -#if OPENSSL_VERSION_NUMBER >= 0x00905100L - // RAND_status() returns 1 if the PRNG has enough entropy. - return (::RAND_status () == 1 ? 0 : -1); -#else - return 0; // Ugly, but OpenSSL <= 0.9.4 doesn't have RAND_status(). -#endif /* OPENSSL_VERSION_NUMBER >= 0x00905100L */ -} - -int -ACE_SSL_Context::egd_file (const char * socket_file) -{ -#if OPENSSL_VERSION_NUMBER < 0x00905100L - // OpenSSL < 0.9.5 doesn't have EGD support. - ACE_UNUSED_ARG (socket_file); - ACE_NOTSUP_RETURN (-1); -#else - // RAND_egd() returns the amount of entropy used to seed the random - // number generator. The actually value should be greater than 16, - // i.e. 128 bits. - if (::RAND_egd (socket_file) > 0) - return 0; - else - return -1; -#endif /* OPENSSL_VERSION_NUMBER >= 0x00905100L */ -} - -int -ACE_SSL_Context::seed_file (const char * seed_file, long bytes) -{ - // RAND_load_file() returns the number of bytes used to seed the - // random number generator. - if (::RAND_load_file (seed_file, bytes) > 0) - return 0; - else - return -1; -} - -void -ACE_SSL_Context::report_error (unsigned long error_code) -{ - if (error_code == 0) - return; - - char error_string[256]; - - (void) ::ERR_error_string (error_code, error_string); - - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"), - error_code, - error_string)); -} - -void -ACE_SSL_Context::report_error (void) -{ - unsigned long error = ::ERR_get_error (); - ACE_SSL_Context::report_error (error); - ACE_OS::last_error (error); -} - -int -ACE_SSL_Context::dh_params (const char *file_name, - int type) -{ - if (this->dh_params_.type () != -1) - return 0; - - this->dh_params_ = ACE_SSL_Data_File (file_name, type); - - this->check_context (); - - { - // For now we only support PEM encodings - if (this->dh_params_.type () != SSL_FILETYPE_PEM) - return -1; - - // Swiped from Rescorla's examples and the OpenSSL s_server.c app - DH *ret=0; - BIO *bio = 0; - - if ((bio = ::BIO_new_file (this->dh_params_.file_name (), "r")) == NULL) - return -1; - - ret = PEM_read_bio_DHparams (bio, NULL, NULL, NULL); - BIO_free (bio); - - if (ret == 0) - return -1; - - if(::SSL_CTX_set_tmp_dh (this->context_, ret) < 0) - return -1; - DH_free (ret); - } - - return 0; -} - -// **************************************************************** - -#ifdef ACE_HAS_THREADS - -void -ACE_SSL_locking_callback (int mode, - int type, - const char * /* file */, - int /* line */) -{ - // #ifdef undef - // fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n", - // CRYPTO_thread_id(), - // (mode&CRYPTO_LOCK)?"l":"u", - // (type&CRYPTO_READ)?"r":"w",file,line); - // #endif - // /* - // if (CRYPTO_LOCK_SSL_CERT == type) - // fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n", - // CRYPTO_thread_id(), - // mode,file,line); - // */ - if (mode & CRYPTO_LOCK) - ACE_OS::mutex_lock (&(ACE_SSL_Context::lock_[type])); - else - ACE_OS::mutex_unlock (&(ACE_SSL_Context::lock_[type])); -} - - - -unsigned long -ACE_SSL_thread_id (void) -{ - return (unsigned long) ACE_OS::thr_self (); -} -#endif /* ACE_HAS_THREADS */ - -// **************************************************************** - - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Singleton; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Singleton - -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) - -template ACE_Singleton * - ACE_Singleton::singleton_; - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/SSL/SSL_Context.h b/ace/SSL/SSL_Context.h deleted file mode 100644 index 6188f17e840..00000000000 --- a/ace/SSL/SSL_Context.h +++ /dev/null @@ -1,360 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SSL_Context.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ -//============================================================================= - - -#ifndef ACE_SSL_CONTEXT_H -#define ACE_SSL_CONTEXT_H - -#include "ace/pre.h" - -#include "SSL_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include "ace/Synch.h" - -#include - -#ifdef ACE_HAS_THREADS -extern "C" -{ - - /// Mutex locking/unlocking callback for OpenSSL multithread - /// support. - void ACE_SSL_locking_callback (int mode, - int type, - const char * file, - int line); - - /// Return the current thread ID. OpenSSL uses this on platforms - /// that need it. - unsigned long ACE_SSL_thread_id (void); -} -#endif /* ACE_HAS_THREADS */ - - -class ACE_SSL_Export ACE_SSL_Data_File -{ -public: - - /// Default constructor - ACE_SSL_Data_File (void); - - /// Contructor from a file name and the file type. - ACE_SSL_Data_File (const char *file_name, - int type = SSL_FILETYPE_PEM); - - /// The file name - const char *file_name (void) const; - - /// The type - int type (void) const; - -private: - - /// The file name - ACE_CString file_name_; - - /// The type, used by the SSL library to parse the file contents. - int type_; -}; - -// **************************************************************** - - -/** - * @class ACE_SSL_Context - * - * @brief A wrapper for the OpenSSL SSL_CTX related functions. - * - * This class provides a wrapper for the SSL_CTX data structure. - * Since most applications have a single SSL_CTX structure, this class - * can be used as a singleton. - */ -class ACE_SSL_Export ACE_SSL_Context -{ - friend void ACE_SSL_locking_callback (int, int, const char *, int); - -public: - - enum { - INVALID_METHOD = -1, - SSLv2_client = 1, - SSLv2_server, - SSLv2, - SSLv3_client, - SSLv3_server, - SSLv3, - SSLv23_client, - SSLv23_server, - SSLv23, - TLSv1_client, - TLSv1_server, - TLSv1 - }; - - /// Constructor - ACE_SSL_Context (void); - - /// Destructor - ~ACE_SSL_Context (void); - - /// The Singleton context, the SSL components use the singleton if - /// nothing else is available. - static ACE_SSL_Context *instance (void); - - /** - * Set the CTX mode. The mode can be set only once, afterwards the - * function has no effect and returns -1. - * Once the mode is set the underlying SSL_CTX is initialized and - * the class can be used. - * If the mode is not set, then the class automatically initializes - * itself to the default mode. - */ - int set_mode (int mode = ACE_SSL_Context::SSLv23); - - int get_mode (void) const; - - /// Get the SSL context - SSL_CTX *context (void); - - /// Get the file name and file format used for the private key - int private_key_type (void) const; - const char *private_key_file_name (void) const; - - /// Set the private key file. - /** - * @note This method should only be called after a certificate has - * been set since key verification is performed against the - * certificate, among other things. - */ - int private_key (const char *file_name, - int type = SSL_FILETYPE_PEM); - - /// Verify that the private key is valid. - /** - * @note This method should only be called after a certificate has - * been set since key verification is performed against the - * certificate, among other things. - */ - int verify_private_key (void); - - /// Get the file name and file format used for the certificate file - int certificate_type (void) const; - const char *certificate_file_name (void) const; - - /// Set the certificate file. - int certificate (const char *file_name, - int type = SSL_FILETYPE_PEM); - - - /** - * Load the location of the trusted certification authority - * certificates. Note that CA certificates are stored in PEM format - * as a sequence of certificates in or as a set of - * individual certificates in (or both). - * - * Note this method is called by set_mode() to load the default - * environment settings for and , if any. This - * allows for automatic service configuration (and backward - * compatibility with previous versions. - * - * Note that the underlying SSL function will add valid file and - * directory names to the load location lists maintained as part of - * the SSL_CTX table. (... It therefore dosn't make sense to keep a - * copy of the file and path name of the most recently added - * or . - * - * @return 0 for success or -1 on error. - * - * @see OpenSSL manual SSL_CTX_load_verify_locations(3) for a - * detailed description of the CA file and directory requirements - * and processing. - */ - int load_trusted_ca(const char* ca_file = 0, const char* ca_dir = 0); - - /** - Test whether any CA locations have been successfully loaded and - return the number of successful attempts. - - @return >0 This value indicates the number of successful CA load - attempts . - @return 0 If all CA load attempts have failed. - */ - int have_trusted_ca(void) const; - - - /** - * @todo Complete this documentation where elipses(...) are used - * - * @doc Use this method when certificate chain verification is - * required. The default server behaviour is SSL_VERIFY_NONE - * i.e. client certicates are requested for verified. This method - * can be used to configure server to request client certificates - * and perform the certificate verification. If is set - * true the client connection is rejected when certificate - * verification fails. Otherwise the session is accepted with a - * warning, which is the default behaviour. If is set true - * (default), certificates are requested only once per session. - * The last parameter can be used to set the verification - * depth. - * - * Note for verification to work correctly there should be a valid - * CA name list set using load_trusted_ca(). - * - * @see OpenSSL documentation of SSL_CTX_set_verify(3) for details of - * the verification process. - * - * @see OpenSSL documentation ... set_verify_depth(3) ... - * - * Note that this method overrides the use of the - * default_verify_mode() method. - */ - void set_verify_peer (int strict = 0, - int once = 1, - int depth = 0); - - - /// TODO: a implementation that will lookup the CTX table for the list - /// of files and paths etc. - /// Query the location of trusted certification authority - /// certificates. - // const char* ca_file_name(void) const; - // const char* ca_dir_name(void) const; - - - - /** - * Set and query the default verify mode for this context, it is - * inherited by all the ACE_SSL objects created using the context. - * It can be overriden on a per-ACE_SSL object. - */ - void default_verify_mode (int mode); - int default_verify_mode (void) const; - - /** - * @name OpenSSL Random Number Generator Seed Related Methods - * - * These are methods that can be used to seed OpenSSL's - * pseudo-random number generator. These methods can be called more - * than once. - */ - //@{ - /// Seed the underlying random number generator. This value should - /// have at least 128 bits of entropy. - int random_seed (const char * seed); - - /// Set the Entropy Gathering Daemon (EGD) UNIX domain socket file to - /// read random seed values from. - int egd_file (const char * socket_file); - - /** - * Set the file that contains the random seed value state, and the - * amount of bytes to read. "-1" bytes causes the entire file to be - * read. - */ - int seed_file (const char * seed_file, long bytes = -1); - //@} - - /// Print SSL error corresponding to the given error code. - static void report_error (unsigned long error_code); - - /// Print the last SSL error for the current thread. - static void report_error (void); - - /** - * @name Diffie-Hellman (DH) Parameters - * - * When using DSS-based certificates, Diffie-Hellman keys need to be - * exchanged. These must be provided in the form of DH key - * generation parameters loaded in, or as fixed keys hardcoded into - * the code itself. ACE_SSL supports loaded parameters. - * - */ - //@{ - /** - * Load Diffie-Hellman parameters from file_name. The specified file can be - * a standalone file containing only DH parameters (e.g., as created - * by openssl dhparam), or it can be a certificate which has - * a PEM-encoded set of DH params concatenated on to i. - */ - int dh_params (const char *file_name, int type = SSL_FILETYPE_PEM); - const char *dh_params_file_name () const; - int dh_params_file_type () const; - //@} - -private: - - /// Verify if the context has been initialized or not. - void check_context (void); - - /// @@ More to document - void ssl_library_init (); - void ssl_library_fini (); - - // = Prevent assignment and initialization. - //@{ - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_SSL_Context &)) - ACE_UNIMPLEMENTED_FUNC (ACE_SSL_Context (const ACE_SSL_Context &)) - //@} - -private: - // @@ Carlos, I protected this variable with an ACE_GUARD, just like - // what we do for the orb_init_count_ variable in - // tao/ORB.cpp. The code isn't pretty but it should suffice - // until the SSL context is stored in a Singleton. - // -Ossama - - /// The SSL_CTX structure - SSL_CTX *context_; - - /// Cache the mode so we can answer fast - int mode_; - - /// The private key, certificate, and Diffie-Hellman paramters files - ACE_SSL_Data_File private_key_; - ACE_SSL_Data_File certificate_; - ACE_SSL_Data_File dh_params_; - - /// The default verify mode. - int default_verify_mode_; - - /// count of successful CA load attempts - int have_ca_; - - /// Reference count of the number of times the ACE_SSL_Context was - /// initialized. - static int library_init_count_; - - // @@ This should also be done with a singleton, otherwise it is not - // thread safe and/or portable to some weird platforms... - -#ifdef ACE_HAS_THREADS - /// Array of mutexes used internally by OpenSSL when the SSL - /// application is multithreaded. - static ACE_mutex_t * lock_; - - // @@ This should also be managed by a singleton. -#endif - -}; - -#if defined(__ACE_INLINE__) -#include "SSL_Context.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_SSL_CONTEXT_H */ diff --git a/ace/SSL/SSL_Context.inl b/ace/SSL/SSL_Context.inl deleted file mode 100644 index 9008591e1c9..00000000000 --- a/ace/SSL/SSL_Context.inl +++ /dev/null @@ -1,106 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - - -ACE_INLINE -ACE_SSL_Data_File::ACE_SSL_Data_File (void) - : type_ (-1) -{ -} - -ACE_INLINE -ACE_SSL_Data_File::ACE_SSL_Data_File (const char *file_name, - int type) - : file_name_ (file_name), - type_ (type) -{ -} - -ACE_INLINE const char * -ACE_SSL_Data_File::file_name (void) const -{ - return this->file_name_.c_str (); -} - -ACE_INLINE int -ACE_SSL_Data_File::type (void) const -{ - return this->type_; -} - -// **************************************************************** - -ACE_INLINE void -ACE_SSL_Context::check_context (void) -{ - if (this->context_ == 0) - this->set_mode (); -} - -ACE_INLINE SSL_CTX * -ACE_SSL_Context::context (void) -{ - this->check_context (); - return this->context_; -} - -ACE_INLINE int -ACE_SSL_Context::private_key_type (void) const -{ - return this->private_key_.type (); -} - -ACE_INLINE const char* -ACE_SSL_Context::private_key_file_name (void) const -{ - return this->private_key_.file_name (); -} - -ACE_INLINE int -ACE_SSL_Context::certificate_type (void) const -{ - return this->certificate_.type (); -} - -ACE_INLINE const char* -ACE_SSL_Context::certificate_file_name (void) const -{ - return this->certificate_.file_name (); -} - -ACE_INLINE int -ACE_SSL_Context::dh_params_file_type (void) const -{ - return this->dh_params_.type (); -} - -ACE_INLINE const char* -ACE_SSL_Context::dh_params_file_name (void) const -{ - return this->dh_params_.file_name (); -} - -ACE_INLINE void -ACE_SSL_Context::default_verify_mode (int mode) -{ - this->default_verify_mode_ = mode; -} - -ACE_INLINE int -ACE_SSL_Context::default_verify_mode (void) const -{ - return this->default_verify_mode_; -} - -ACE_INLINE int -ACE_SSL_Context::get_mode (void) const -{ - return this->mode_; -} - -ACE_INLINE int -ACE_SSL_Context::have_trusted_ca (void) const -{ - return this->have_ca_; -} diff --git a/ace/SSL/SSL_Export.h b/ace/SSL/SSL_Export.h deleted file mode 100644 index ec478095d18..00000000000 --- a/ace/SSL/SSL_Export.h +++ /dev/null @@ -1,44 +0,0 @@ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by -// generate_export_file.pl -// ------------------------------ -#if !defined (ACE_SSL_EXPORT_H) -#define ACE_SSL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_SSL_HAS_DLL) -# define ACE_SSL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACE_SSL_HAS_DLL */ - -#if !defined (ACE_SSL_HAS_DLL) -#define ACE_SSL_HAS_DLL 1 -#endif /* ! ACE_SSL_HAS_DLL */ - -#if defined (ACE_SSL_HAS_DLL) -# if (ACE_SSL_HAS_DLL == 1) -# if defined (ACE_SSL_BUILD_DLL) -# define ACE_SSL_Export ACE_Proper_Export_Flag -# define ACE_SSL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_SSL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else -# define ACE_SSL_Export ACE_Proper_Import_Flag -# define ACE_SSL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_SSL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_SSL_BUILD_DLL */ -# else -# define ACE_SSL_Export -# define ACE_SSL_SINGLETON_DECLARATION(T) -# define ACE_SSL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ! ACE_SSL_HAS_DLL == 1 */ -#else -# define ACE_SSL_Export -# define ACE_SSL_SINGLETON_DECLARATION(T) -# define ACE_SSL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_SSL_HAS_DLL */ - -#endif /* ACE_SSL_EXPORT_H */ - -// End of auto generated file. diff --git a/ace/SSL/SSL_SOCK.cpp b/ace/SSL/SSL_SOCK.cpp deleted file mode 100644 index 4a2f37e3fc1..00000000000 --- a/ace/SSL/SSL_SOCK.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - - -#include "SSL_SOCK.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK.i" -#endif - -ACE_RCSID (ACE_SSL, - SSL_SOCK, - "$Id$") - - -ACE_SSL_SOCK::ACE_SSL_SOCK (void) -{ - ACE_TRACE ("ACE_SSL_SOCK::ACE_SSL_SOCK"); -} - -ACE_SSL_SOCK::~ACE_SSL_SOCK (void) -{ - ACE_TRACE ("ACE_SSL_SOCK::~ACE_SSL_SOCK"); -} - -int -ACE_SSL_SOCK::enable (int value) const -{ - ACE_TRACE ("ACE_SSL_SOCK::enable"); - - switch (value) - { -#ifdef SIGURG - case SIGURG: - case ACE_SIGURG: -#endif /* SIGURG */ - case SIGIO: - case ACE_SIGIO: - case ACE_CLOEXEC: - ACE_NOTSUP_RETURN (-1); - case ACE_NONBLOCK: - return ACE_IPC_SAP::enable (value); - default: - return -1; - } -} - -int -ACE_SSL_SOCK::disable (int value) const -{ - ACE_TRACE("ACE_SSL_SOCK::disable"); - switch (value) - { -#ifdef SIGURG - case SIGURG: - case ACE_SIGURG: -#endif /* SIGURG */ - case SIGIO: - case ACE_SIGIO: - case ACE_CLOEXEC: - ACE_NOTSUP_RETURN (-1); - case ACE_NONBLOCK: - return ACE_IPC_SAP::disable (value); - default: - return -1; - } -} diff --git a/ace/SSL/SSL_SOCK.h b/ace/SSL/SSL_SOCK.h deleted file mode 100644 index 17a8e6c50bd..00000000000 --- a/ace/SSL/SSL_SOCK.h +++ /dev/null @@ -1,94 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SSL_SOCK.h - * - * $Id$ - * - * @author Ossama Othman - */ -//============================================================================= - - -#ifndef ACE_SSL_SOCK_H -#define ACE_SSL_SOCK_H - -#include "ace/pre.h" - -#include "SSL_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK.h" - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -# define ACE_SSL_SOCK_ACCEPTOR ACE_SSL_SOCK_Acceptor -# define ACE_SSL_SOCK_CONNECTOR ACE_SSL_SOCK_Connector -# define ACE_SSL_SOCK_STREAM ACE_SSL_SOCK_Stream -#else -# define ACE_SSL_SOCK_ACCEPTOR ACE_SSL_SOCK_Acceptor, ACE_INET_Addr -# define ACE_SSL_SOCK_CONNECTOR ACE_SSL_SOCK_Connector, ACE_INET_Addr -# define ACE_SSL_SOCK_STREAM ACE_SSL_SOCK_Stream, ACE_INET_Addr -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - -/** - * @class ACE_SSL_SOCK - * - * @brief An abstract class that forms the basis for more specific - * classes, such as "ACE_SSL_SOCK_Acceptor" and - * "ACE_SSL_SOCK_Stream". Do not instantiate this class. - * - * This class provides functions that are common to all of the - * ACE_SSL_SOCK_* classes. ACE_SSL_SOCK provides the ability - * to get and set socket options, get the local and remote - * addresses, and close the socket. - */ -class ACE_SSL_Export ACE_SSL_SOCK : public ACE_SOCK -{ -public: - - /// Default destructor. - ~ACE_SSL_SOCK (void); - - /** - * Override ACE_SOCK base class implementations with these SSL - * specific ones. - */ - //@{ - int set_option (int level, - int option, - void *optval, - int optlen) const; - int get_option (int level, - int option, - void *optval, - int *optlen) const; - int enable (int value) const; - int disable (int value) const; - void set_handle (ACE_HANDLE); - ACE_HANDLE get_handle (void) const; - int control (int cmd, void *arg) const; - //@} - -protected: - - /// Default constructor is private to prevent instances of this class - /// from being defined. - ACE_SSL_SOCK (void); - -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" - -#endif /* ACE_SSL_SOCK_H */ - - - - diff --git a/ace/SSL/SSL_SOCK.i b/ace/SSL/SSL_SOCK.i deleted file mode 100644 index dc21bfbdba1..00000000000 --- a/ace/SSL/SSL_SOCK.i +++ /dev/null @@ -1,64 +0,0 @@ -// -*- C++ -*- -// $Id$ - -ASYS_INLINE void -ACE_SSL_SOCK::set_handle (ACE_HANDLE fd) -{ - this->ACE_SOCK::set_handle (fd); -} - -ASYS_INLINE ACE_HANDLE -ACE_SSL_SOCK::get_handle (void) const -{ - // return this->ssl_ ? (ACE_HANDLE) ::SSL_get_fd (this->ssl_) : ACE_INVALID_HANDLE; - return this->ACE_SOCK::get_handle (); -} - - -ASYS_INLINE int -ACE_SSL_SOCK::control (int cmd, void *arg) const -{ - return ACE_OS::ioctl (this->get_handle (), cmd, arg); -} - -ASYS_INLINE int -ACE_SSL_SOCK::set_option (int level, - int option, - void *optval, - int optlen) const -{ -// switch (option) -// { -// case SO_SNDBUF: -// return ::BIO_set_write_buffer_size (this->io_bio_, *((int *) optval)); -// case SO_RCVCBUF: -// return ::BIO_set_read_buffer_size (this->io_bio_, *((int *) optval)); -// default: - return ACE_OS::setsockopt (this->get_handle (), - level, - option, (char *) optval, - optlen); -// } -} - -// Provides access to the ACE_OS::getsockopt system call. - -ASYS_INLINE int -ACE_SSL_SOCK::get_option (int level, - int option, - void *optval, - int *optlen) const -{ -// switch (option) -// { -// case SO_SNDBUF: -// return ::BIO_get_write_buffer_size (this->io_bio_, *((int *) optval)); -// case SO_RCVCBUF: -// return ::BIO_get_read_buffer_size (this->io_bio_, *((int *) optval)); -// default: - return ACE_OS::getsockopt (this->get_handle (), - level, - option, (char *) optval, - optlen); -// } -} diff --git a/ace/SSL/SSL_SOCK_Acceptor.cpp b/ace/SSL/SSL_SOCK_Acceptor.cpp deleted file mode 100644 index 92b6ab7da76..00000000000 --- a/ace/SSL/SSL_SOCK_Acceptor.cpp +++ /dev/null @@ -1,243 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - - -#include "SSL_SOCK_Acceptor.h" - -#include "ace/Handle_Set.h" -#include "ace/OS_Errno.h" -#include "ace/Log_Msg.h" - -ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor) - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -ACE_RCSID (ACE_SSL, - SSL_SOCK_Acceptor, - "$Id$") - -ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void) -{ - ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor"); -} - - -int -ACE_SSL_SOCK_Acceptor::ssl_accept (ACE_SSL_SOCK_Stream &new_stream, - ACE_Time_Value *timeout) const -{ - SSL *ssl = new_stream.ssl (); - - if (SSL_is_init_finished (ssl)) - return 0; - - if (!SSL_in_accept_init (ssl)) - ::SSL_set_accept_state (ssl); - - ACE_HANDLE handle = new_stream.get_handle (); - - // We're going to call SSL_accept, optionally doing ACE::select and - // retrying the SSL_accept, until the SSL handshake is done or - // it fails. - // To get the timeout affect, set the socket to nonblocking mode - // before beginning if there is a timeout specified. If the timeout - // is 0 (wait as long as it takes) then don't worry about the blocking - // status; we'll block in SSL_accept if the socket is blocking, and - // block in ACE::select if not. - int reset_blocking_mode = 0; - if (timeout != 0) - { - reset_blocking_mode = ACE_BIT_DISABLED (ACE::get_flags (handle), - ACE_NONBLOCK); - // Set the handle into non-blocking mode if it's not already - // in it. - if (reset_blocking_mode - && ACE::set_flags (handle, - ACE_NONBLOCK) == -1) - return -1; - } - - // Take into account the time between each select() call below. - ACE_Countdown_Time countdown (timeout); - - int status; - do - { - // These handle sets are used to set up for whatever SSL_accept - // says it wants next. They're reset on each pass around the loop. - ACE_Handle_Set rd_handle; - ACE_Handle_Set wr_handle; - - status = ::SSL_accept (ssl); - switch (::SSL_get_error (ssl, status)) - { - case SSL_ERROR_NONE: - status = 0; // To tell caller about success - break; // Done - - case SSL_ERROR_WANT_WRITE: - wr_handle.set_bit (handle); - status = 1; // Wait for more activity - break; - - case SSL_ERROR_WANT_READ: - rd_handle.set_bit (handle); - status = 1; // Wait for more activity - break; - - case SSL_ERROR_ZERO_RETURN: - // The peer has notified us that it is shutting down via - // the SSL "close_notify" message so we need to - // shutdown, too. - status = -1; - break; - - case SSL_ERROR_SYSCALL: - // On some platforms (e.g. MS Windows) OpenSSL does not - // store the last error in errno so explicitly do so. - // - // Explicitly check for EWOULDBLOCK since it doesn't get - // converted to an SSL_ERROR_WANT_{READ,WRITE} on some - // platforms. If SSL_accept failed outright, though, don't - // bother checking more. This can happen if the socket gets - // closed during the handshake. - if (ACE_OS::set_errno_to_last_error () == EWOULDBLOCK && - status == -1) - { - // Although the SSL_ERROR_WANT_READ/WRITE isn't getting - // set correctly, the read/write state should be valid. - // Use that to decide what to do. - status = 1; // Wait for more activity - if (SSL_want_write (ssl)) - wr_handle.set_bit (handle); - else if (SSL_want_read (ssl)) - rd_handle.set_bit (handle); - else - status = -1; // Doesn't want anything - bail out - } - else - status = -1; - break; - - default: - ACE_SSL_Context::report_error (); - status = -1; - break; - } - - if (status == 1) - { - // Must have at least one handle to wait for at this point. - ACE_ASSERT (rd_handle.num_set() == 1 || wr_handle.num_set () == 1); - status = ACE::select (int (handle) + 1, - &rd_handle, - &wr_handle, - 0, - timeout); - - (void) countdown.update (); - - // 0 is timeout, so we're done. - // -1 is error, so we're done. - // Could be both handles set (same handle in both masks) so - // set to 1. - if (status >= 1) - status = 1; - else // Timeout or failure - status = -1; - } - - } while (status == 1 && !SSL_is_init_finished (ssl)); - - if (reset_blocking_mode) - { - ACE_Errno_Guard eguard (errno); - ACE::clr_flags (handle, ACE_NONBLOCK); - } - - return (status == -1 ? -1 : 0); - -} - -// General purpose routine for accepting new connections. -// Since our underlying acceptor is of the plain old ACE_SOCK_Acceptor -// variety, get the basic socket setup done with it, then take care of -// the SSL handshake if the socket is accepted. -int -ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream, - ACE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Acceptor::accept"); - - // Take into account the time to complete the basic TCP handshake - // and the SSL handshake. - ACE_Countdown_Time countdown (timeout); - - ACE_SOCK_Stream temp_stream; - if (-1 == this->acceptor_.accept (temp_stream, - remote_addr, - timeout, - restart, - reset_new_handle)) - return -1; - - (void) countdown.update (); - - new_stream.set_handle (temp_stream.get_handle ()); - temp_stream.set_handle (ACE_INVALID_HANDLE); - - if (this->ssl_accept (new_stream, timeout) == -1) - { - new_stream.close (); - new_stream.set_handle (ACE_INVALID_HANDLE); - return -1; - } - - return 0; - -} - -int -ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream, - ACE_Accept_QoS_Params qos_params, - ACE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Acceptor::accept"); - - // Take into account the time to complete the basic TCP handshake - // and the SSL handshake. - ACE_Countdown_Time countdown (timeout); - - ACE_SOCK_Stream temp_stream; - if (-1 == this->acceptor_.accept (temp_stream, - qos_params, - remote_addr, - timeout, - restart, - reset_new_handle)) - return -1; - - (void) countdown.update (); - - new_stream.set_handle (temp_stream.get_handle ()); - temp_stream.set_handle (ACE_INVALID_HANDLE); - - if (this->ssl_accept (new_stream, timeout) == -1) - { - new_stream.close (); - new_stream.set_handle (ACE_INVALID_HANDLE); - return -1; - } - - return 0; - -} diff --git a/ace/SSL/SSL_SOCK_Acceptor.h b/ace/SSL/SSL_SOCK_Acceptor.h deleted file mode 100644 index fa0b10ee425..00000000000 --- a/ace/SSL/SSL_SOCK_Acceptor.h +++ /dev/null @@ -1,194 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SSL_SOCK_Acceptor.h - * - * $Id$ - * - * @author John Heitmann - * @author Chris Zimman - * @author Ossama Othman - */ -//============================================================================= - - -#ifndef ACE_SSL_SOCK_ACCEPTOR_H -#define ACE_SSL_SOCK_ACCEPTOR_H - -#include "ace/pre.h" - -#include "SSL_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "SSL_SOCK_Stream.h" - -#include "ace/SOCK_Acceptor.h" -#include "ace/OS_QoS.h" - -/** - * @class ACE_SSL_SOCK_Acceptor - * - * @brief Defines a factory that creates new @c ACE_SSL_SOCK_Stream - * objects passively. - * - * The ACE_SSL_SOCK_Acceptor has its own @c ACE_SOCK_Acceptor - * which handles the basic socket acceptance. This class is a - * wrapper which adds the SSL acceptance handshake handling. - * Since SSL is record oriented, some additional steps must be taken - * after the basic socket acceptance to complete the SSL handshake that - * takes place at session establishment. - * - * @note The user must currently ensure that only one thread services - * a given SSL session at any given time since some underlying - * SSL implementations, such as OpenSSL, are not entirely - * thread-safe or reentrant. - */ -class ACE_SSL_Export ACE_SSL_SOCK_Acceptor : public ACE_SSL_SOCK -{ -public: - - /// Default constructor. - ACE_SSL_SOCK_Acceptor (void); - - /// Default destructor. - ~ACE_SSL_SOCK_Acceptor (void); - - /** - * Initiate a passive mode SSL/BSD-style acceptor socket. - * @param local_sap The address that we're going to listen for - * connections on. If this is @c ACE_Addr::sap_any, - * this socket listens on an the "any" IP address - * and selects an unused port. To find out what port - * was selected, call this object's - * @c ACE_SOCK::get_local_addr(ACE_Addr&) method - * upon return. - */ - ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /** - * Initiate a passive-mode QoS-enabled acceptor socket. - * @param local_sap The address that we're going to listen for - * connections on. If this is @c ACE_Addr::sap_any, - * this socket listens on an the "any" IP address - * and selects an unused port. To find out what port - * was selected, call this object's - * @c ACE_SOCK::get_local_addr(ACE_Addr&) method - * upon return. - */ - ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /** - * Initiate a passive mode SSL/BSD-style acceptor socket. - * @param local_sap The address that we're going to listen for - * connections on. If this is @c ACE_Addr::sap_any, - * this socket listens on an the "any" IP address - * and selects an unused port. To find out what port - * was selected, call this object's - * @c ACE_SOCK::get_local_addr(ACE_Addr&) method - * upon return. - * - * @return 0 if success; -1 for failure (errno contains error code). - */ - int open (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); - - /// Close the listening socket. - int close (void); - - /** - * @name Passive Connection "accept" Methods - * - * These are the canonical methods exposed by the Acceptor pattern. - */ - //@{ - /** - * Accept a new ACE_SSL_SOCK_Stream connection. On successful return, - * the socket has been accepted and the SSL handshake has been completed. - * @param new_stream The @c ACE_SSL_SOCK_Stream object that will receive - * the new SSL socket. - * @param remote_addr Pointer to an @c ACE_INET_Addr object that will - * receive the address of the peer that connected. - * @param timeout The maximum time to wait for the combined socket - * acceptance and handshake completion. 0 means - * block forever, a timeout of {0, 0} means poll. - * @param restart 1 means "restart if interrupted," that is, - * if errno == EINTR. - * - * @return 0 if success; -1 for failure (errno contains error code). - */ - int accept (ACE_SSL_SOCK_Stream &new_stream, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; - - /** - * Accept a new ACE_SSL_SOCK_Stream connection using the RVSP QoS - * information in qos_params. - * @param new_stream The @c ACE_SSL_SOCK_Stream object that will receive - * the new SSL socket. - * @param remote_addr Pointer to an @c ACE_INET_Addr object that will - * receive the address of the peer that connected. - * @param timeout The maximum time to wait for the combined socket - * acceptance and handshake completion. 0 means - * block forever, a timeout of {0, 0} means poll. - * @param restart 1 means "restart if interrupted," that is, - * if errno == EINTR. - * - * @return 0 if success; -1 for failure (errno contains error code). - */ - int accept (ACE_SSL_SOCK_Stream &new_stream, - ACE_Accept_QoS_Params qos_params, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; - //@} - - /// Meta-type info - //@{ - typedef ACE_INET_Addr PEER_ADDR; - typedef ACE_SSL_SOCK_Stream PEER_STREAM; - //@} - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - - /// Complete SSL passive connection establishment. - int ssl_accept (ACE_SSL_SOCK_Stream &new_stream, - ACE_Time_Value *timeout) const; - -private: - - /// The BSD-socket workhorse - ACE_SOCK_Acceptor acceptor_; - -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" - -#endif /* ACE_SSL_SOCK_ACCEPTOR_H */ diff --git a/ace/SSL/SSL_SOCK_Acceptor.i b/ace/SSL/SSL_SOCK_Acceptor.i deleted file mode 100644 index 69c0fb60372..00000000000 --- a/ace/SSL/SSL_SOCK_Acceptor.i +++ /dev/null @@ -1,82 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - - -ASYS_INLINE -ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (void) - : acceptor_ () -{ - ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor"); -} - -ASYS_INLINE -ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) - : acceptor_ (local_sap, - reuse_addr, - protocol_family, - backlog, - protocol) -{ - ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor"); - - this->set_handle (this->acceptor_.get_handle ()); -} - -ASYS_INLINE -ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) - : acceptor_ (local_sap, - protocolinfo, - g, - flags, - reuse_addr, - protocol_family, - backlog, - protocol) -{ - ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor"); - - this->set_handle (this->acceptor_.get_handle ()); -} - -ASYS_INLINE int -ACE_SSL_SOCK_Acceptor::open (const ACE_Addr &local_sap, - int reuse_addr, - int protocol_family, - int backlog, - int protocol) -{ - ACE_TRACE ("ACE_SSL_SOCK_Acceptor::open"); - if (this->acceptor_.open (local_sap, - reuse_addr, - protocol_family, - backlog, - protocol) != 0) - return -1; - else - this->set_handle (this->acceptor_.get_handle ()); - - return 0; -} - -ASYS_INLINE int -ACE_SSL_SOCK_Acceptor::close (void) -{ - ACE_TRACE ("ACE_SSL_SOCK_Acceptor::close ()"); - - int result = this->acceptor_.close (); - this->set_handle (ACE_INVALID_HANDLE); - - return result; -} diff --git a/ace/SSL/SSL_SOCK_Connector.cpp b/ace/SSL/SSL_SOCK_Connector.cpp deleted file mode 100644 index 80d6dcb7835..00000000000 --- a/ace/SSL/SSL_SOCK_Connector.cpp +++ /dev/null @@ -1,404 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "SSL_SOCK_Connector.h" - -#include "ace/Handle_Set.h" -#include "ace/INET_Addr.h" -#include "ace/Synch_T.h" -#include "ace/Log_Msg.h" - -#include - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Connector.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -ACE_RCSID (ACE_SSL, - SSL_SOCK_Connector, - "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Connector) - - -ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector (void) -{ - ACE_TRACE ("ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector"); -} - -int -ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream, - const ACE_Time_Value *timeout) -{ - SSL *ssl = new_stream.ssl (); - - if (SSL_is_init_finished (ssl)) - return 0; - - // Check if a connection is already pending for the given SSL - // structure. - if (!SSL_in_connect_init (ssl)) - ::SSL_set_connect_state (ssl); - - ACE_HANDLE handle = new_stream.get_handle (); - - // We're going to call SSL_connect, optionally doing ACE::select and - // retrying the SSL_connect, until the SSL handshake is done or - // it fails. - // To get the timeout affect, set the socket to nonblocking mode - // before beginning if there is a timeout specified. If the timeout - // is 0 (wait as long as it takes) then don't worry about the blocking - // status; we'll block in SSL_connect if the socket is blocking, and - // block in ACE::select if not. - int reset_blocking_mode = 0; - if (timeout != 0) - { - reset_blocking_mode = ACE_BIT_DISABLED (ACE::get_flags (handle), - ACE_NONBLOCK); - // Set the handle into non-blocking mode if it's not already - // in it. - if (reset_blocking_mode - && ACE::set_flags (handle, - ACE_NONBLOCK) == -1) - return -1; - } - - ACE_Time_Value t; - if (timeout != 0) - t = *timeout; // Need a non-const copy. - - // Take into account the time between each select() call below. - ACE_Countdown_Time countdown ((timeout == 0 ? 0 : &t)); - - int status; - do - { - // These handle sets are used to set up for whatever SSL_connect - // says it wants next. They're reset on each pass around the loop. - ACE_Handle_Set rd_handle; - ACE_Handle_Set wr_handle; - - status = ::SSL_connect (ssl); - switch (::SSL_get_error (ssl, status)) - { - case SSL_ERROR_NONE: - // Start out with non-blocking disabled on the SSL stream. - new_stream.disable (ACE_NONBLOCK); - status = 0; // To tell caller about success - break; // Done - - case SSL_ERROR_WANT_WRITE: - wr_handle.set_bit (handle); - status = 1; // Wait for more activity - break; - - case SSL_ERROR_WANT_READ: - rd_handle.set_bit (handle); - status = 1; // Wait for more activity - break; - - case SSL_ERROR_ZERO_RETURN: - // The peer has notified us that it is shutting down via - // the SSL "close_notify" message so we need to - // shutdown, too. - status = -1; - break; - - case SSL_ERROR_SYSCALL: - // On some platforms (e.g. MS Windows) OpenSSL does not - // store the last error in errno so explicitly do so. - // - // Explicitly check for EWOULDBLOCK since it doesn't get - // converted to an SSL_ERROR_WANT_{READ,WRITE} on some - // platforms. If SSL_connect failed outright, though, don't - // bother checking more. This can happen if the socket gets - // closed during the handshake. - if (ACE_OS::set_errno_to_last_error () == EWOULDBLOCK && - status == -1) - { - // Although the SSL_ERROR_WANT_READ/WRITE isn't getting - // set correctly, the read/write state should be valid. - // Use that to decide what to do. - status = 1; // Wait for more activity - if (SSL_want_write (ssl)) - wr_handle.set_bit (handle); - else if (SSL_want_read (ssl)) - rd_handle.set_bit (handle); - else - status = -1; // Doesn't want anything - bail out - } - else - status = -1; - break; - - default: - ACE_SSL_Context::report_error (); - status = -1; - break; - } - - if (status == 1) - { - // Must have at least one handle to wait for at this point. - ACE_ASSERT (rd_handle.num_set() == 1 || wr_handle.num_set () == 1); - status = ACE::select (int (handle) + 1, - &rd_handle, - &wr_handle, - 0, - timeout); - - (void) countdown.update (); - - // 0 is timeout, so we're done. - // -1 is error, so we're done. - // Could be both handles set (same handle in both masks) so set to 1. - if (status >= 1) - status = 1; - else // Timeout or socket failure - status = -1; - } - - } while (status == 1 && !SSL_is_init_finished (ssl)); - - if (reset_blocking_mode) - { - ACE_Errno_Guard eguard (errno); - ACE::clr_flags (handle, ACE_NONBLOCK); - } - - return (status == -1 ? -1 : 0); - -} - -int -ACE_SSL_SOCK_Connector::connect (ACE_SSL_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_SSL_SOCK_Connector::connect"); - - // Take into account the time to complete the basic TCP handshake - // and the SSL handshake. - ACE_Time_Value time_copy; - ACE_Countdown_Time countdown (&time_copy); - if (timeout != 0) - { - time_copy += *timeout; - countdown.start (); - } - - int result = - this->connector_.connect (new_stream.peer (), - remote_sap, - timeout, - local_sap, - reuse_addr, - flags, - perms); - - int error = 0; - if (result == -1) - error = errno; // Save us some TSS accesses. - - // Obtain the handle from the underlying SOCK_Stream and set it in - // the SSL_SOCK_Stream. Note that the case where a connection is in - // progress is also handled. In that case, the handle must also be - // set in the SSL_SOCK_Stream so that the correct handle is returned - // when performing non-blocking connect()s. - if (new_stream.get_handle () == ACE_INVALID_HANDLE - && (result == 0 - || (result == -1 && (error == EWOULDBLOCK - || error == EINPROGRESS)))) - new_stream.set_handle (new_stream.peer ().get_handle ()); - - if (result == -1) - return result; - - // If using a timeout, update the countdown timer to reflect the time - // spent on the connect itself, then pass the remaining time to - // ssl_connect to bound the time on the handshake. - if (timeout != 0) - { - countdown.update (); - timeout = &time_copy; - } - - result = this->ssl_connect (new_stream, timeout); - - if (result == -1) - new_stream.close (); - - return result; -} - -int -ACE_SSL_SOCK_Connector::connect (ACE_SSL_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int perms) -{ - ACE_TRACE ("ACE_SSL_SOCK_Connector::connect"); - - // Take into account the time to complete the basic TCP handshake - // and the SSL handshake. - ACE_Time_Value time_copy; - ACE_Countdown_Time countdown (&time_copy); - if (timeout != 0) - { - time_copy += *timeout; - countdown.start (); - } - - int result = this->connector_.connect (new_stream.peer (), - remote_sap, - qos_params, - timeout, - local_sap, - protocolinfo, - g, - flags, - reuse_addr, - perms); - - int error = 0; - if (result == -1) - error = errno; // Save us some TSS accesses. - - // Obtain the handle from the underlying SOCK_Stream and set it in - // the SSL_SOCK_Stream. Note that the case where a connection is in - // progress is also handled. In that case, the handle must also be - // set in the SSL_SOCK_Stream so that the correct handle is returned - // when performing non-blocking connect()s. - if (new_stream.get_handle () == ACE_INVALID_HANDLE - && (result == 0 - || (result == -1 && (error == EWOULDBLOCK - || error == EINPROGRESS)))) - new_stream.set_handle (new_stream.peer ().get_handle ()); - - if (result == -1) - return result; - - // If using a timeout, update the countdown timer to reflect the time - // spent on the connect itself, then pass the remaining time to - // ssl_connect to bound the time on the handshake. - if (timeout != 0) - { - countdown.update (); - timeout = &time_copy; - } - - result = this->ssl_connect (new_stream, timeout); - - if (result == -1) - new_stream.close (); - - return result; -} - -// Try to complete a non-blocking connection. - -int -ACE_SSL_SOCK_Connector::complete (ACE_SSL_SOCK_Stream &new_stream, - ACE_Addr *remote_sap, - const ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_SSL_SOCK_Connector::complete"); - - // Take into account the time to complete the basic TCP handshake - // and the SSL handshake. - ACE_Time_Value time_copy; - ACE_Countdown_Time countdown (&time_copy); - if (tv != 0) - { - time_copy += *tv; - countdown.start (); - } - - // Only attempt to complete the TCP connection if it that hasn't - // already been done. - ACE_INET_Addr raddr; - if (new_stream.peer ().get_remote_addr (raddr) != 0 - && this->connector_.complete (new_stream.peer (), - remote_sap, - tv) == -1) - return -1; - - // The handle in the SSL_SOCK_Stream should have already been set in - // the connect() method. - - // If using a timeout, update the countdown timer to reflect the time - // spent on the connect itself, then pass the remaining time to - // ssl_connect to bound the time on the handshake. - if (tv != 0) - { - countdown.update (); - tv = &time_copy; - } - - if (this->ssl_connect (new_stream, tv) == -1) - { - new_stream.close (); - return -1; - } - - return 0; - -} - - -ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector ( - ACE_SSL_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms) - : connector_ () -{ - ACE_TRACE ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector"); - this->connect (new_stream, - remote_sap, - timeout, - local_sap, - reuse_addr, - flags, - perms); -} - -ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector ( - ACE_SSL_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, - const ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int perms) - : connector_ () -{ - ACE_TRACE ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector"); - - this->connect (new_stream, - remote_sap, - qos_params, - timeout, - local_sap, - protocolinfo, - g, - flags, - reuse_addr, - perms); -} diff --git a/ace/SSL/SSL_SOCK_Connector.h b/ace/SSL/SSL_SOCK_Connector.h deleted file mode 100644 index c5d9e4f7134..00000000000 --- a/ace/SSL/SSL_SOCK_Connector.h +++ /dev/null @@ -1,315 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SSL_SOCK_Connector.h - * - * $Id$ - * - * @author Ossama Othman - * @author Carlos O'Ryan - * @author John Heitmann - * @author Chris Zimman - */ -//============================================================================= - - -#ifndef ACE_SSL_SOCK_CONNECTOR_H -#define ACE_SSL_SOCK_CONNECTOR_H - -#include "ace/pre.h" - -#include "SSL_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "SSL_SOCK_Stream.h" - -#include "ace/SOCK_Connector.h" -#include "ace/OS_QoS.h" - -/** - * @class ACE_SSL_SOCK_Connector - * - * @brief Defines a factory that creates new s - * actively. - * - * The ACE_SSL_SOCK_Connector doesn't have a socket of its own, - * i.e., it simply "borrows" the one from the ACE_SSL_SOCK_Stream - * that's being connected. The reason for this is that the - * underlying socket API doesn't use a "factory" socket to connect - * "data-mode" sockets. Therefore, there's no need to inherit - * ACE_SSL_SOCK_Connector from ACE_SSL_SOCK. - * - * Since SSL is record-oriented, some additional work is done after - * the plain socket is connected. - * - * @note The user must currently ensure that only one thread services - * a given SSL session at any given time since some underlying - * SSL implementations, such as OpenSSL, are not entirely - * thread-safe or reentrant. - */ -class ACE_SSL_Export ACE_SSL_SOCK_Connector -{ - -public: - - /// Default constructor. - ACE_SSL_SOCK_Connector (void); - - /** - * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream - * object if the connection succeeds. This method performs both the - * initial socket connect and the SSL handshake. - * - * @param new_stream The @c ACE_SSL_SOCK_Stream object that will be - * connected to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - ACE_SSL_SOCK_Connector (ACE_SSL_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0); - - /** - * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream - * object if the connection succeeds. This method performs both the - * initial socket connect and the SSL handshake. - * - * @param new_stream The @c ACE_SSL_SOCK_Stream object that will be - * connected to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param qos_params Contains QoS parameters that are passed to the - * IntServ (RSVP) and DiffServ protocols. - * @see ACE_QoS_Params. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - ACE_SSL_SOCK_Connector (ACE_SSL_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - ACE_Protocol_Info *protocolinfo = 0, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, - int reuse_addr = 0, - int perms = 0); - - /// Default dtor. - ~ACE_SSL_SOCK_Connector (void); - - /** - * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream - * object if the connection succeeds. This method performs both the - * initial socket connect and the SSL handshake. - * - * @param new_stream The @c ACE_SSL_SOCK_Stream object that will be - * connected to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - int connect (ACE_SSL_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0); - - /** - * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream - * object if the connection succeeds. This method performs both the - * initial socket connect and the SSL handshake. - * - * @param new_stream The @c ACE_SSL_SOCK_Stream object that will be - * connected to the peer. - * @param remote_sap The address that we are trying to connect to. - * The protocol family of @c remote_sap is used for - * the connected socket. That is, if @c remote_sap - * contains an IPv6 address, a socket with family - * PF_INET6 will be used, else it will be PF_INET. - * @param qos_params Contains QoS parameters that are passed to the - * IntServ (RSVP) and DiffServ protocols. - * @see ACE_QoS_Params. - * @param timeout Pointer to an @c ACE_Time_Value object with amount - * of time to wait to connect. If the pointer is 0 - * then the call blocks until the connection attempt - * is complete, whether it succeeds or fails. If - * *timeout == {0, 0} then the connection is done - * using nonblocking mode. In this case, if the - * connection can't be made immediately, this method - * returns -1 and errno == EWOULDBLOCK. - * If *timeout > {0, 0} then this is the maximum amount - * of time to wait before timing out; if the specified - * amount of time passes before the connection is made, - * this method returns -1 and errno == ETIME. Note - * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter - * case, errno will be ETIMEDOUT. - * @param local_sap (optional) The local address to bind to. If it's - * the default value of @c ACE_Addr::sap_any then the - * OS will choose an unused port. - * @param reuse_addr (optional) If the value is 1, the local address - * (@c local_sap) is reused, even if it hasn't been - * cleaned up yet. - * @param flags Ignored. - * @param perms Ignored. - * - * @return Returns 0 if the connection succeeds. If it fails, - * -1 is returned and errno contains a specific error - * code. - */ - int connect (ACE_SSL_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_QoS_Params qos_params, - const ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - ACE_Protocol_Info *protocolinfo = 0, - ACE_SOCK_GROUP g = 0, - u_long flags = 0, - int reuse_addr = 0, - int perms = 0); - - /** - * Try to complete a non-blocking connection. - * If connection completion is successful then contains - * the connected ACE_SSL_SOCK_Stream. If is non-NULL - * then it will contain the address of the connected peer. - */ - int complete (ACE_SSL_SOCK_Stream &new_stream, - ACE_Addr *remote_sap = 0, - const ACE_Time_Value *timeout = 0); - - /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); - - /// Meta-type info - //@{ - typedef ACE_INET_Addr PEER_ADDR; - typedef ACE_SSL_SOCK_Stream PEER_STREAM; - //@} - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - - /// Complete non-blocking SSL active connection. - int ssl_connect (ACE_SSL_SOCK_Stream &new_stream, - const ACE_Time_Value *timeout); - -private: - - /// The class that does all of the non-secure socket connection. - /// It is default contructed, and subsequently used by connect(). - ACE_SOCK_Connector connector_; - -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Connector.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" - -#endif /* ACE_SSL_SOCK_CONNECTOR_H */ - diff --git a/ace/SSL/SSL_SOCK_Connector.i b/ace/SSL/SSL_SOCK_Connector.i deleted file mode 100644 index 60cfd9db89b..00000000000 --- a/ace/SSL/SSL_SOCK_Connector.i +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SSL_SOCK_Connector.i - -ASYS_INLINE -ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (void) - : connector_ () -{ - ACE_TRACE ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector"); -} - -ASYS_INLINE int -ACE_SSL_SOCK_Connector::reset_new_handle (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_SSL_SOCK_Connector::reset_new_handle"); - return this->connector_.reset_new_handle (handle); -} - -ASYS_INLINE void -ACE_SSL_SOCK_Connector::dump (void) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Connector::dump"); - this->connector_.dump (); -} diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp deleted file mode 100644 index 578051416d9..00000000000 --- a/ace/SSL/SSL_SOCK_Stream.cpp +++ /dev/null @@ -1,565 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#include "ace/Handle_Set.h" -#include "ace/Log_Msg.h" - -#include - -#include "SSL_SOCK_Stream.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Stream.i" -#endif - -ACE_RCSID (ACE_SSL, - SSL_SOCK_Stream, - "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Stream) - -ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context) - : ssl_ (0), - stream_ () -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream"); - - ACE_SSL_Context * ctx = - (context == 0 ? ACE_SSL_Context::instance () : context); - - this->ssl_ = ::SSL_new (ctx->context ()); - - if (this->ssl_ != 0) - { - ::SSL_set_verify (this->ssl_, - ctx->default_verify_mode (), - 0); - } - else - { - ACE_ERROR ((LM_ERROR, - "(%P|%t) ACE_SSL_SOCK_Stream " - "- cannot allocate new SSL structure %p\n", - ACE_TEXT (""))); - } -} - -ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream (void) -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream"); - - ::SSL_free (this->ssl_); - this->ssl_ = 0; - - // @@ Question: should we reference count the Context object or - // leave that to the application developer? We do not reference - // count reactors (for example) and following some simple rules - // seems to work fine! -} - -ssize_t -ACE_SSL_SOCK_Stream::sendv (const iovec iov[], - size_t n, - const ACE_Time_Value *max_wait_time) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::sendv"); - - // There is subtle problem in this method that occurs when using - // non-blocking IO. The semantics of a non-blocking scatter write - // (sendv()) are not possible to retain with the emulation in this - // method. - - ssize_t bytes_sent = 0; - - ACE_Time_Value t; - ACE_Time_Value *timeout = - ACE_const_cast (ACE_Time_Value *, max_wait_time); - - if (max_wait_time != 0) - { - // Make a copy since ACE_Countdown_Time modifies the - // ACE_Time_Value. - t = *max_wait_time; - timeout = &t; - } - - // Take into account the time between each send. - ACE_Countdown_Time countdown (timeout); - - for (size_t i = 0; i < n; ++i) - { - ssize_t result = this->send (iov[i].iov_base, - iov[i].iov_len, - timeout); - - if (result == -1) - { - // There is a subtle difference in behaviour depending on - // whether or not any data was sent. If no data was sent, - // then always return -1. Otherwise return bytes_sent. - // This gives the caller an opportunity to keep track of - // which data was actually sent. - if (bytes_sent > 0) - break; - else - return -1; - } - else - { - bytes_sent += result; - - // Do not continue on to the next loop iteration if the - // amount of data sent was less than the amount data given. - // This avoids a subtle problem where "holes" in the data - // stream would occur if partial sends of a given buffer in - // the iovec array occured. - if (ACE_static_cast (size_t, result) < iov[i].iov_len) - break; - } - - (void) countdown.update (); - } - - return bytes_sent; -} - -ssize_t -ACE_SSL_SOCK_Stream::recvv (iovec *io_vec, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recvv"); - - // From ACE_SOCK_IO::recvv(). -#if defined (FIONREAD) - ACE_Handle_Set handle_set; - handle_set.reset (); - handle_set.set_bit (this->get_handle ()); - - io_vec->iov_base = 0; - - // Check the status of the current socket. - switch (ACE_OS::select (int (this->get_handle ()) + 1, - handle_set, - 0, 0, - timeout)) - { - case -1: - return -1; - /* NOTREACHED */ - case 0: - errno = ETIME; - return -1; - /* NOTREACHED */ - default: - // Goes fine, fallthrough to get data - break; - } - - u_long inlen; - - - if (ACE_OS::ioctl (this->get_handle (), - FIONREAD, - (u_long *) &inlen) == -1) - return -1; - else if (inlen > 0) - { - ACE_NEW_RETURN (io_vec->iov_base, - char[inlen], - -1); - io_vec->iov_len = this->recv (io_vec->iov_base, - inlen); - return io_vec->iov_len; - } - else - return 0; -#else - ACE_UNUSED_ARG (io_vec); - ACE_UNUSED_ARG (timeout); - ACE_NOTSUP_RETURN (-1); -#endif /* FIONREAD */ -} - -ssize_t -ACE_SSL_SOCK_Stream::send (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::send"); - - // If SSL has data in the buffer, i.e. SSL_pending() returns a - // non-zero value, then don't block on select(). - if (timeout == 0 || ::SSL_pending (this->ssl_)) - return this->send (buf, len, flags); - - int val = 0; - if (ACE::enter_send_timedwait (this->get_handle (), - timeout, - val) == -1) - return -1; - - ssize_t bytes_transferred = this->send (buf, len, flags); - - ACE::restore_non_blocking_mode (this->get_handle (), val); - - return bytes_transferred; -} - -ssize_t -ACE_SSL_SOCK_Stream::recv (void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recv"); - - return this->recv_i (buf, n, flags, timeout); -} - - -ssize_t -ACE_SSL_SOCK_Stream::send (size_t n, ...) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::send"); - - size_t total_tuples = n / 2; - - va_list argp; - va_start (argp, n); - - ssize_t bytes_sent = 0; - - // NOTE: This method used to fill an IO vector (e.g. iovec) and then - // send it using a scatter write (sendv()). However, it is - // not possible to emulate a non-blocking scatter write over - // SSL. As such, there is no point in attempting to use - // scatter writes over SSL. - for (size_t i = 0; i < total_tuples; ++i) - { - ssize_t result = this->send (va_arg (argp, char *), - va_arg (argp, ssize_t)); - - if (result == -1) - { - // There is a subtle difference in behaviour depending on - // whether or not any data was sent. If no data was sent, - // then always return -1. Otherwise return bytes_sent. - // This gives the caller an opportunity to keep track of - // which data was actually sent. - if (bytes_sent > 0) - break; - else - { - va_end (argp); - return -1; - } - } - else - bytes_sent += result; - } - - va_end (argp); - - return bytes_sent; -} - -ssize_t -ACE_SSL_SOCK_Stream::recv (size_t n, ...) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recv"); - - size_t total_tuples = n / 2; - - va_list argp; - va_start (argp, n); - - ssize_t bytes_recv = 0; - - for (size_t i = 0; i < total_tuples; ++i) - { - ssize_t result = this->recv (va_arg (argp, char *), - va_arg (argp, ssize_t)); - - if (result == -1) - { - // There is a subtle difference in behaviour depending on - // whether or not any data was received. If no data was - // received, then always return -1. Otherwise return - // bytes_received. This gives the caller an opportunity to - // keep track of which data was actually received. - if (bytes_recv > 0) - break; - else - { - va_end (argp); - return -1; - } - } - else - bytes_recv += result; - } - - va_end (argp); - - return bytes_recv; -} - -ssize_t -ACE_SSL_SOCK_Stream::send_n (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bt) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::send_n"); - - // No support for send flags in SSL. - if (flags != 0) - ACE_NOTSUP_RETURN (-1); - - /* This code mimics ACE::send_n */ - // Total number of bytes written. - size_t temp = 0; - size_t &bytes_transferred = ((bt == 0) ? temp : *bt); - - // Actual number of bytes written in each attempt - ssize_t n = 0; - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - n = this->send ((const char*) buf + bytes_transferred, - len - bytes_transferred, - flags, - timeout); - - if (n < 0) - { - if (errno == EWOULDBLOCK) - { - // If blocked, try again. - n = 0; - continue; - } - else - return -1; - } - else if (n == 0) - break; - } - - return bytes_transferred; -} - -ssize_t -ACE_SSL_SOCK_Stream::recv_n (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bt) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_n"); - - if (flags != 0) - { - if ((flags | MSG_PEEK) != MSG_PEEK) - ACE_NOTSUP_RETURN (-1); - } - - size_t temp = 0; - size_t &bytes_transferred = ((bt == 0) ? temp : *bt); - - ssize_t n = 0; - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - n = this->recv ((char*) buf + bytes_transferred, - len - bytes_transferred, - flags, - timeout); - - if (n < 0) - { - if (errno == EWOULDBLOCK) - { - // If blocked, try again. - n = 0; - continue; - } - else - return -1; - } - else if (n == 0) - break; - } - - return bytes_transferred; -} - -ssize_t -ACE_SSL_SOCK_Stream::recv_n (void *buf, int len, int flags) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_n"); - - if (flags != 0) - { - if ((flags | MSG_PEEK) != MSG_PEEK) - ACE_NOTSUP_RETURN (-1); - } - - ssize_t bytes_transferred = 0; - ssize_t n = 0; - - for (bytes_transferred = 0; - bytes_transferred < len; - bytes_transferred += n) - { - n = this->recv ((char*) buf + bytes_transferred, - len - bytes_transferred, - flags); - - if (n < 0) - { - if (errno == EWOULDBLOCK) - { - // If blocked, try again. - n = 0; - continue; - } - else - return -1; - } - else if (n == 0) - break; - } - - return bytes_transferred; -} - -ssize_t -ACE_SSL_SOCK_Stream::send_n (const void *buf, int len, int flags) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::send_n"); - - // Send flags are unsupported in SSL - if (flags != 0) - ACE_NOTSUP_RETURN (-1); - - /* The following code mimics */ - size_t bytes_transferred = 0; - ssize_t n = 0; - - for (bytes_transferred = 0; - bytes_transferred < (size_t) len; - bytes_transferred += n) - { - n = this->send ((const char*) buf + bytes_transferred, - len - bytes_transferred, - flags); - - if (n < 0) - { - if (errno == EWOULDBLOCK) - { - // If blocked, try again. - n = 0; - continue; - } - else - return -1; - } - else if (n == 0) - break; - } - - return bytes_transferred; -} - -ssize_t -ACE_SSL_SOCK_Stream::sendv_n (const iovec iov[], size_t iovcnt) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::sendv_n"); - - ssize_t bytes_sent = 0; - - for (size_t i = 0; i < iovcnt; ++i) - { - ssize_t result = this->send_n (iov[i].iov_base, - iov[i].iov_len); - - - if (result == -1) - { - // There is a subtle difference in behaviour depending on - // whether or not any data was sent. If no data was sent, - // then always return -1. Otherwise return bytes_sent. - // This gives the caller an opportunity to keep track of - // which data was actually sent. - if (bytes_sent > 0) - break; - else - return -1; - } - else - bytes_sent += result; - } - - return bytes_sent; -} - -ssize_t -ACE_SSL_SOCK_Stream::recvv_n (iovec iov[], size_t iovcnt) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recvv_n"); - - ssize_t bytes_read = 0; - - for (size_t i = 0; i < iovcnt; ++i) - { - ssize_t result = this->recv_n (iov[i].iov_base, - iov[i].iov_len); - - if (result == -1) - { - // There is a subtle difference in behaviour depending on - // whether or not any data was read. If no data was read, - // then always return -1. Otherwise return bytes_read. - // This gives the caller an opportunity to keep track of - // which data was actually read. - if (bytes_read > 0) - break; - else - return -1; - } - else - bytes_read += result; - } - - return bytes_read; -} - -int -ACE_SSL_SOCK_Stream::get_remote_addr (ACE_Addr &addr) const -{ - // Some applications use get_remote_addr() as a way of determining - // whether or not a connection has been established. In SSL's case, - // the remote addr will be available once the TCP handshake has been - // complete. Despite that fact, the SSL connection may not have - // been completed. In such a case, a successful return from - // get_remote_addr() would be misleading. - - if (SSL_is_init_finished (this->ssl_)) - return this->ACE_SSL_SOCK::get_remote_addr (addr); - - if (this->get_handle () == ACE_INVALID_HANDLE) - errno = EBADF; - else - errno = ENOTCONN; - - return -1; -} diff --git a/ace/SSL/SSL_SOCK_Stream.h b/ace/SSL/SSL_SOCK_Stream.h deleted file mode 100644 index 06e5a4bd889..00000000000 --- a/ace/SSL/SSL_SOCK_Stream.h +++ /dev/null @@ -1,308 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SSL_SOCK_Stream.h - * - * $Id$ - * - * @author Ossama Othman - * @author Carlos O'Ryan - * @author John Heitmann - */ -//============================================================================= - - -#ifndef ACE_SSL_SOCK_STREAM_H -#define ACE_SSL_SOCK_STREAM_H - -#include "ace/pre.h" - -#include "SSL_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include - -#include "SSL_SOCK.h" -#include "SSL_Context.h" - -#include "ace/SOCK_Stream.h" - - -/** - * @class ACE_SSL_SOCK_Stream - * - * @brief Defines methods in the ACE_SSL_SOCK_Stream abstraction. - * - * This class encapsulates the methods and functionality necessary to - * send and receive data over TLS/SSL. - * @par - * Since SSL is record-oriented, some additional steps must be taken - * to make the ACE_SSL_SOCK_Stream interact properly with the - * Reactor (if one is used) when performing non-blocking IO. In - * particular, if ::SSL_pending (ssl), where "ssl" is a pointer to the - * SSL data structure returned from ACE_SSL_SOCK_Stream::ssl(), - * returns a non-zero value then the event handler that calls the IO - * methods in this class should return a value greater than zero to - * force the Reactor to invoke the event handler before polling for - * additional events (e.g. blocking on select()). - * - * @note The user must currently ensure that only one thread services - * a given SSL session at any given time since underlying SSL - * implementations, such as OpenSSL, are not entirely - * thread-safe or reentrant. - */ -class ACE_SSL_Export ACE_SSL_SOCK_Stream : public ACE_SSL_SOCK -{ -public: - - /// Constructor - ACE_SSL_SOCK_Stream (ACE_SSL_Context *context = - ACE_SSL_Context::instance ()); - - /// Destructor - ~ACE_SSL_SOCK_Stream (void); - - /// Send an n byte buffer to the ssl socket using the semantics of - /// send(3n). - /** - * ACE_SSL supports no flags for sending at this time. - */ - ssize_t send (const void *buf, - size_t n, - int flags) const; - - /// Recv an n byte buffer from the ssl socket using the semantics of - /// recv(3n). - /** - * ACE_SSL supports MSG_PEEK, but no other flags at this time. - */ - ssize_t recv (void *buf, - size_t n, - int flags) const; - - /// Send an n byte buffer to the ssl socket using the semantics of - /// write(2). - ssize_t send (const void *buf, - size_t n) const; - - /// Recv an n byte buffer from the ssl socket using the semantics of - /// read(2). - ssize_t recv (void *buf, - size_t n) const; - - /// Send an iovec of size n to the ssl socket. - /** - * Note that it is not possible to perform a "scattered" write with - * the underlying OpenSSL implementation. As such, the expected - * semantics are not fully reproduced with this implementation. - */ - ssize_t sendv (const iovec iov[], - size_t n, - const ACE_Time_Value *timeout = 0) const; - - /** - * Allows a client to read from a socket without having to provide a - * buffer to read. This method determines how much data is in the - * socket, allocates a buffer of this size, reads in the data, and - * returns the number of bytes read. The caller is responsible for - * deleting the member in the iov_base field of io_vec using - * delete [] io_vec->iov_base. - */ - ssize_t recvv (iovec *io_vec, - const ACE_Time_Value *timeout = 0) const; - - /** - * Wait to timeout amount of time to send up to n bytes into buf - * (uses the send() call). If send() times out -1 is returned with - * errno == ETIME. If it succeeds the number of bytes sent is - * returned. No flags are supported. - */ - ssize_t send (const void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout) const; - - /** - * Wait up to timeout amount of time to receive up to n bytes into - * buf (uses the recv() call). If recv() times out -1 is returned - * with errno == ETIME. If it succeeds the number of bytes received - * is returned. MSG_PEEK is the only supported flag. - */ - ssize_t recv (void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout) const; - - /** - * Wait to to timeout amount of time to send up to n bytes into - * buf (uses the send() call). If send() times out - * a -1 is returned with errno == ETIME. If it succeeds the - * number of bytes sent is returned. - */ - ssize_t send (const void *buf, - size_t n, - const ACE_Time_Value *timeout) const; - - /** - * Wait up to timeout amount of time to receive up to n bytes - * into buf (uses the recv() call). If recv() times - * out a -1 is returned with errno == ETIME. If it succeeds the - * number of bytes received is returned. - */ - ssize_t recv (void *buf, - size_t n, - const ACE_Time_Value *timeout) const; - - /// Send n varargs messages to the connected ssl socket. - ssize_t send (size_t n, - ...) const; - - /// Recv n varargs messages to the connected ssl socket. - ssize_t recv (size_t n, - ...) const; - - /// Send n bytes, keep trying until n are sent. - ssize_t send_n (const void *buf, int n) const; - - /// Recv n bytes, keep trying until n are received. - ssize_t recv_n (void *buf, int n) const; - - /** - * @note In the following four methods, only MSG_PEEK is supported - * for recv_n(), and no flags are supported for send_n(). - */ - //@{ - /// Send n bytes, keep trying until n are sent. - ssize_t send_n (const void *buf, int n, int flags) const; - - /// Recv n bytes, keep trying until n are sent. - ssize_t recv_n (void *buf, int n, int flags) const; - - /** - * Try to send exactly len bytes into buf (uses the send() call). - * If send() blocks for longer than timeout the number of bytes - * actually sent is returned with errno == ETIME. If a timeout does - * not occur, send_n() return len (i.e., the number of bytes - * requested to be sent). - */ - ssize_t send_n (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred = 0) const; - - /** - * Try to receive exactly len bytes into buf (uses the recv() call). - * The ACE_Time_Value indicates how long to blocking trying to - * receive. If timeout == 0, the caller will block until action is - * possible, else will wait until the relative time specified in - * timeout elapses). If recv() blocks for longer than timeout the - * number of bytes actually read is returned with errno == ETIME. - * If a timeout does not occur, recv_n return len (i.e., the number - * of bytes requested to be read). - */ - ssize_t recv_n (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred = 0) const; - //@} - - /** - * Send an iovec of size n to the connected socket. Will block - * until all bytes are sent or an error occurs. - */ - ssize_t sendv_n (const iovec iov[], - size_t n) const; - - /// Receive an iovec of size n to the connected socket. - ssize_t recvv_n (iovec iov[], - size_t n) const; - - - /** - * Selectively close endpoints. - */ - //@{ - /// Close down the reader. - int close_reader (void); - - /// Close down the writer. - int close_writer (void); - //@} - - ///Close down the socket. - int close (void); - - /// Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /// Overridden set_handle() method. - /** - * Only an ACE_SSL_SOCK_Acceptor or ACE_SSL_SOCK_Connector should - * access this method since some state in the underlying "ssl_" data - * structure is set during SSL connection establishment. - */ - void set_handle (ACE_HANDLE fd); - - /// Return a pointer to the underlying SSL structure. - SSL *ssl (void) const; - - /** - * Return the address of the remotely connected peer (if there is - * one), in the referenced . Returns 0 if successful, else - * -1. - * - * @note If the TCP connection has been completed but the SSL - * connection has not been completed yet, -1 will be - * returned. - */ - int get_remote_addr (ACE_Addr &) const; - - /// Return the underlying ACE_SOCK_Stream which ACE_SSL runs atop of. - ACE_SOCK_Stream & peer (void); - -protected: - - /// Underlying send() helper method common to all public send() - /// methods. - ssize_t send_i (const void *buf, - size_t n, - int flags) const; - - /// Underlying send() helper method common to all public send() - /// methods. - ssize_t recv_i (void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout) const; - -private: - - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_SSL_SOCK_Stream &)) - ACE_UNIMPLEMENTED_FUNC (ACE_SSL_SOCK_Stream (const ACE_SSL_SOCK_Stream &)) - -protected: - - /// The SSL session. - SSL *ssl_; - - /// The stream which works under the ssl connection. - ACE_SOCK_Stream stream_; - -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "SSL_SOCK_Stream.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#include "ace/post.h" - -#endif /* ACE_SSL_SOCK_STREAM_H */ diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i deleted file mode 100644 index 4cbd184837a..00000000000 --- a/ace/SSL/SSL_SOCK_Stream.i +++ /dev/null @@ -1,317 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -ASYS_INLINE void -ACE_SSL_SOCK_Stream::set_handle (ACE_HANDLE fd) -{ - if (this->ssl_ == 0 || fd == ACE_INVALID_HANDLE) - { - this->ACE_SSL_SOCK::set_handle (ACE_INVALID_HANDLE); - return; - } - else - { - (void) ::SSL_set_fd (this->ssl_, (int) fd); - this->ACE_SSL_SOCK::set_handle (fd); - this->stream_.set_handle (fd); - } -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::send_i (const void *buf, - size_t n, - int flags) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::send_i"); - - // NOTE: Caller must provide thread-synchronization. - - // No send flags are supported in SSL. - if (flags != 0) - ACE_NOTSUP_RETURN (-1); - - int bytes_sent = ::SSL_write (this->ssl_, - ACE_static_cast (const char *, buf), - n); - - switch (::SSL_get_error (this->ssl_, bytes_sent)) - { - case SSL_ERROR_NONE: - return bytes_sent; - - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - errno = EWOULDBLOCK; - - return -1; - - case SSL_ERROR_ZERO_RETURN: - // The peer has notified us that it is shutting down via the SSL - // "close_notify" message so we need to shutdown, too. - (void) ::SSL_shutdown (this->ssl_); - - return bytes_sent; - - case SSL_ERROR_SYSCALL: - if (bytes_sent == 0) - // An EOF occured but the SSL "close_notify" message was not - // sent. This is a protocol error, but we ignore it. - return 0; - - // If not an EOF, then fall through to "default" case. - - // On some platforms (e.g. MS Windows) OpenSSL does not store - // the last error in errno so explicitly do so. - ACE_OS::set_errno_to_last_error (); - - break; - - default: - // Reset errno to prevent previous values (e.g. EWOULDBLOCK) - // from being associated with fatal SSL errors. - errno = 0; - - ACE_SSL_Context::report_error (); - - break; - } - - return -1; -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::send (const void *buf, - size_t n, - int flags) const -{ - return this->send_i (buf, n, flags); -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::recv_i (void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_i"); - - // NOTE: Caller must provide thread-synchronization. - - int bytes_read = 0; - const ACE_HANDLE handle = this->get_handle (); - - // Value for current I/O mode (blocking/non-blocking) - int val = 0; - - if (timeout != 0) - ACE::record_and_set_non_blocking_mode (handle, - val); - - // Only block on select() with a timeout if no data in the - // internal OpenSSL buffer is pending read completion for - // the same reasons stated above, i.e. all data must be read - // before blocking on select(). - if (timeout != 0 - && !::SSL_pending (this->ssl_)) - { - if (ACE::enter_recv_timedwait (handle, - timeout, - val) == -1) - return -1; - } - - if (flags) - { - if (ACE_BIT_ENABLED (flags, MSG_PEEK)) - bytes_read = ::SSL_peek (this->ssl_, - ACE_static_cast (char *, buf), - n); - else - ACE_NOTSUP_RETURN (-1); - } - else - { - bytes_read = ::SSL_read (this->ssl_, - ACE_static_cast (char *, buf), - n); - } - - int status = ::SSL_get_error (this->ssl_, bytes_read); - switch (status) - { - case SSL_ERROR_NONE: - if (timeout != 0) - ACE::restore_non_blocking_mode (handle, val); - - return bytes_read; - - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - errno = EWOULDBLOCK; - - return -1; - - case SSL_ERROR_ZERO_RETURN: - if (timeout != 0) - ACE::restore_non_blocking_mode (handle, val); - - // The peer has notified us that it is shutting down via the SSL - // "close_notify" message so we need to shutdown, too. - (void) ::SSL_shutdown (this->ssl_); - - return bytes_read; - - case SSL_ERROR_SYSCALL: - if (bytes_read == 0) - // An EOF occured but the SSL "close_notify" message was not - // sent. This is a protocol error, but we ignore it. - return 0; - - // If not an EOF, then fall through to "default" case. - - // On some platforms (e.g. MS Windows) OpenSSL does not store - // the last error in errno so explicitly do so. - ACE_OS::set_errno_to_last_error (); - - break; - - default: - // Reset errno to prevent previous values (e.g. EWOULDBLOCK) - // from being associated with a fatal SSL error. - errno = 0; - - ACE_SSL_Context::report_error (); - - break; - } - - return -1; -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::recv (void *buf, - size_t n, - int flags) const -{ - return this->recv_i (buf, n, flags, 0); -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::send (const void *buf, - size_t n) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::send"); - - return this->send_i (buf, n, 0); -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::recv (void *buf, - size_t n) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recv"); - - return this->recv_i (buf, n, 0, 0); -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::send (const void *buf, - size_t len, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::send"); - return this->send (buf, len, 0, timeout); -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::recv (void *buf, - size_t n, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recv"); - return this->recv (buf, n, 0, timeout); -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::recv_n (void *buf, int buf_size) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_n"); - return this->recv_n (buf, buf_size, 0); -} - -ASYS_INLINE ssize_t -ACE_SSL_SOCK_Stream::send_n (const void *buf, int len) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::send_n"); - return this->send_n (buf, len, 0); -} - -ASYS_INLINE int -ACE_SSL_SOCK_Stream::close_reader (void) -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::close_reader"); - return this->stream_.close_reader (); -} - -ASYS_INLINE int -ACE_SSL_SOCK_Stream::close_writer (void) -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::close_writer"); - return this->stream_.close_writer (); -} - -ASYS_INLINE int -ACE_SSL_SOCK_Stream::close (void) -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::close"); - - if (this->ssl_ == 0 || this->get_handle () == ACE_INVALID_HANDLE) - return 0; // SSL_SOCK_Stream was never opened. - - // SSL_shutdown() returns 1 on successful shutdown of the SSL - // connection, not 0. - int status = ::SSL_shutdown (this->ssl_); - - switch (::SSL_get_error (this->ssl_, status)) - { - case SSL_ERROR_NONE: - case SSL_ERROR_SYSCALL: // Ignore this error condition. - - // Reset the SSL object to allow another connection to be made - // using this ACE_SSL_SOCK_Stream instance. This prevents the - // previous SSL session state from being associated with the new - // SSL session/connection. - (void) ::SSL_clear (this->ssl_); - this->set_handle (ACE_INVALID_HANDLE); - return this->stream_.close (); - - case SSL_ERROR_WANT_READ: - case SSL_ERROR_WANT_WRITE: - errno = EWOULDBLOCK; - break; - - default: - ACE_SSL_Context::report_error (); - - ACE_Errno_Guard error (errno); // Save/restore errno - (void) this->stream_.close (); - - return -1; - } - - return -1; -} - -ASYS_INLINE ACE_SOCK_Stream & -ACE_SSL_SOCK_Stream::peer (void) -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::peer"); - return this->stream_; -} - -ASYS_INLINE SSL * -ACE_SSL_SOCK_Stream::ssl (void) const -{ - return this->ssl_; -} diff --git a/ace/SSL/ssl.mpc b/ace/SSL/ssl.mpc deleted file mode 100644 index e1f2657286e..00000000000 --- a/ace/SSL/ssl.mpc +++ /dev/null @@ -1,8 +0,0 @@ -project : acelib, core { - ssl = 1 - depends = ace - sharedname = ACE_SSL - dllflags = ACE_SSL_BUILD_DLL - libout = .. - include_dir = ace/SSL -} diff --git a/ace/SSL/sslconf.h b/ace/SSL/sslconf.h deleted file mode 100644 index ae9f155befb..00000000000 --- a/ace/SSL/sslconf.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file sslconf.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ -//============================================================================= - - -#ifndef ACE_SSLCONF_H -#define ACE_SSLCONF_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_DEFAULT_SSL_CERT_FILE) -# ifdef WIN32 -# define ACE_DEFAULT_SSL_CERT_FILE "cert.pem" -# else -# define ACE_DEFAULT_SSL_CERT_FILE "/etc/ssl/cert.pem" -# endif /* WIN32 */ -#endif /* ACE_DEFAULT_SSL_CERT_FILE */ - -#if !defined (ACE_DEFAULT_SSL_CERT_DIR) -# ifdef WIN32 -# define ACE_DEFAULT_SSL_CERT_DIR "certs" -# else -# define ACE_DEFAULT_SSL_CERT_DIR "/etc/ssl/certs" -# endif /* WIN32 */ -#endif /* ACE_DEFAULT_SSL_CERT_DIR */ - -#if !defined (ACE_SSL_CERT_FILE_ENV) -#define ACE_SSL_CERT_FILE_ENV "SSL_CERT_FILE" -#endif /* ACE_SSL_CERT_FILE_ENV */ - -#if !defined (ACE_SSL_CERT_DIR_ENV) -#define ACE_SSL_CERT_DIR_ENV "SSL_CERT_DIR" -#endif /* ACE_SSL_CERT_DIR_ENV */ - -#if !defined (ACE_SSL_EGD_FILE_ENV) -#define ACE_SSL_EGD_FILE_ENV "SSL_EGD_FILE" -#endif /* ACE_SSL_EGD_FILE_ENV */ - -#if !defined (ACE_SSL_RAND_FILE_ENV) -#define ACE_SSL_RAND_FILE_ENV "SSL_RAND_FILE" -#endif /* ACE_SSL_RAND_FILE_ENV */ - -#include "ace/post.h" - -#endif /* ACE_SSLCONF_H */ diff --git a/ace/SString.cpp b/ace/SString.cpp deleted file mode 100644 index d4536025dc7..00000000000 --- a/ace/SString.cpp +++ /dev/null @@ -1,552 +0,0 @@ -// $Id$ - -#include "ace/Malloc.h" -#if !defined (ACE_HAS_WINCE) -//# include "ace/Service_Config.h" -#endif /* !ACE_HAS_WINCE */ -#include "ace/SString.h" -#include "ace/Auto_Ptr.h" - -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -# include "ace/streams.h" -#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - -#if !defined (__ACE_INLINE__) -#include "ace/SString.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, SString, "SString.cpp,v 4.61 2001/03/04 00:55:30 brunsch Exp") - -ACE_Tokenizer::ACE_Tokenizer (ACE_TCHAR *buffer) - : buffer_ (buffer), - index_ (0), - preserves_index_ (0), - delimiter_index_ (0) -{ -} - -int -ACE_Tokenizer::delimiter (ACE_TCHAR d) -{ - if (delimiter_index_ == MAX_DELIMITERS) - return -1; - - delimiters_[delimiter_index_].delimiter_ = d; - delimiters_[delimiter_index_].replace_ = 0; - delimiter_index_++; - return 0; -} - -int -ACE_Tokenizer::delimiter_replace (ACE_TCHAR d, - ACE_TCHAR replacement) -{ - // Make it possible to replace delimiters on-the-fly, e.g., parse - // string until certain token count and then copy rest of the - // original string. - for (int i = 0; i < delimiter_index_; i++) - if (delimiters_[i].delimiter_ == d) - { - delimiters_[i].replacement_ = replacement; - delimiters_[i].replace_ = 1; - return 0; - } - - if (delimiter_index_ >= MAX_DELIMITERS) - return -1; - - delimiters_[delimiter_index_].delimiter_ = d; - delimiters_[delimiter_index_].replacement_ = replacement; - delimiters_[delimiter_index_].replace_ = 1; - delimiter_index_++; - return 0; -} - -int -ACE_Tokenizer::preserve_designators (ACE_TCHAR start, - ACE_TCHAR stop, - int strip) -{ - if (preserves_index_ == MAX_PRESERVES) - return -1; - - preserves_[preserves_index_].start_ = start; - preserves_[preserves_index_].stop_ = stop; - preserves_[preserves_index_].strip_ = strip; - preserves_index_++; - return 0; -} - -int -ACE_Tokenizer::is_delimiter (ACE_TCHAR d, - int &replace, - ACE_TCHAR &r) -{ - replace = 0; - - for (int x = 0; x < delimiter_index_; x++) - if (delimiters_[x].delimiter_ == d) - { - if (delimiters_[x].replace_) - { - r = delimiters_[x].replacement_; - replace = 1; - } - return 1; - } - - return 0; -} - -int -ACE_Tokenizer::is_preserve_designator (ACE_TCHAR start, - ACE_TCHAR &stop, - int &strip) -{ - for (int x = 0; x < preserves_index_; x++) - if (preserves_[x].start_ == start) - { - stop = preserves_[x].stop_; - strip = preserves_[x].strip_; - return 1; - } - - return 0; -} - -ACE_TCHAR * -ACE_Tokenizer::next (void) -{ - // Check if the previous pass was the last one in the buffer. - if (index_ == -1) - { - index_ = 0; - return 0; - } - - ACE_TCHAR replacement; - int replace; - ACE_TCHAR *next_token; - - // Skip all leading delimiters. - for (;;) - { - // Check for end of string. - if (buffer_[index_] == '\0') - { - // If we hit EOS at the start, return 0. - index_ = 0; - return 0; - } - - if (this->is_delimiter (buffer_[index_], - replace, - replacement)) - index_++; - else - break; - } - - // When we reach this point, buffer_[index_] is a non-delimiter and - // not EOS - the start of our next_token. - next_token = buffer_ + index_; - - // A preserved region is it's own token. - ACE_TCHAR stop; - int strip; - if (this->is_preserve_designator (buffer_[index_], - stop, - strip)) - { - while (++index_) - { - if (buffer_[index_] == '\0') - { - index_ = -1; - goto EXIT_LABEL; - } - - if (buffer_[index_] == stop) - break; - } - - if (strip) - { - // Skip start preserve designator. - next_token += 1; - // Zap the stop preserve designator. - buffer_[index_] = '\0'; - // Increment to the next token. - index_++; - } - - goto EXIT_LABEL; - } - - // Step through finding the next delimiter or EOS. - for (;;) - { - // Advance pointer. - index_++; - - // Check for delimiter. - if (this->is_delimiter (buffer_[index_], - replace, - replacement)) - { - // Replace the delimiter. - if (replace != 0) - buffer_[index_] = replacement; - - // Move the pointer up and return. - index_++; - goto EXIT_LABEL; - } - - // A preserve designator signifies the end of this token. - if (this->is_preserve_designator (buffer_[index_], - stop, - strip)) - goto EXIT_LABEL; - - // Check for end of string. - if (buffer_[index_] == '\0') - { - index_ = -1; - goto EXIT_LABEL; - } - } - -EXIT_LABEL: - return next_token; -} - -// ************************************************************ - -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -ACE_OSTREAM_TYPE & -operator<< (ACE_OSTREAM_TYPE &os, const ACE_CString &cs) -{ - if (cs.fast_rep () != 0) - os << cs.fast_rep (); - return os; -} - -ACE_OSTREAM_TYPE & -operator<< (ACE_OSTREAM_TYPE &os, const ACE_WString &ws) -{ - // @@ Need to figure out how to print the "wide" string - // on platforms that don't support "wide" strings. -#if defined (ACE_HAS_WCHAR) - os << ACE_Wide_To_Ascii (ws.fast_rep ()).char_rep (); -#else - ACE_UNUSED_ARG (ws); - os << "(*non-printable string*)"; -#endif - return os; -} - -ACE_OSTREAM_TYPE & -operator<< (ACE_OSTREAM_TYPE &os, const ACE_SString &ss) -{ - if (ss.fast_rep () != 0) - os << ss.fast_rep (); - return os; -} -#endif /* !ACE_LACKS_IOSTREAM_TOTALLY */ - -char * -ACE_NS_WString::char_rep (void) const -{ - ACE_TRACE ("ACE_NS_WString::char_rep"); - if (this->len_ <= 0) - return 0; - else - { - char *t; - - ACE_NEW_RETURN (t, - char[this->len_ + 1], - 0); - - for (size_t i = 0; i < this->len_; i++) - // Note that this cast may lose data if wide chars are - // actually used! - t[i] = char (this->rep_[i]); - - t[this->len_] = '\0'; - return t; - } -} - -ACE_USHORT16 * -ACE_NS_WString::ushort_rep (void) const -{ - ACE_TRACE ("ACE_NS_WString::ushort_rep"); - if (this->len_ <= 0) - return 0; - else - { - ACE_USHORT16 *t; - - ACE_NEW_RETURN (t, - ACE_USHORT16[this->len_ + 1], - 0); - - for (size_t i = 0; i < this->len_; i++) - // Note that this cast may lose data if wide chars are - // actually used! - t[i] = (ACE_USHORT16)this->rep_[i]; - - t[this->len_] = 0; - return t; - } -} - -const int ACE_SString::npos = -1; - -ACE_ALLOC_HOOK_DEFINE(ACE_SString) - -ACE_NS_WString::ACE_NS_WString (const char *s, - ACE_Allocator *alloc) - : ACE_WString (alloc) -{ - if (s == 0) - return; - - this->len_ = this->buf_len_ = ACE_OS_String::strlen (s); - - if (this->buf_len_ == 0) - return; - - ACE_ALLOCATOR (this->rep_, - (ACE_WSTRING_TYPE *) - this->allocator_->malloc ((this->buf_len_ + 1) * - sizeof (ACE_WSTRING_TYPE))); - this->release_ = 1; - for (size_t i = 0; i <= this->buf_len_; i++) - this->rep_[i] = s[i]; -} - -#if defined (ACE_WSTRING_HAS_USHORT_SUPPORT) -ACE_NS_WString::ACE_NS_WString (const ACE_USHORT16 *s, - size_t len, - ACE_Allocator *alloc) - : ACE_WString (alloc) -{ - if (s == 0) - return; - - this->buf_len_ = len; - - if (this->buf_len_ == 0) - return; - - ACE_ALLOCATOR (this->rep_, - (ACE_WSTRING_TYPE *) - this->allocator_->malloc ((this->buf_len_) * - sizeof (ACE_WSTRING_TYPE))); - this->release_ = 1; - for (size_t i = 0; i < this->buf_len_; i++) - this->rep_[i] = s[i]; -} -#endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */ - -void -ACE_SString::dump (void) const -{ - ACE_TRACE ("ACE_SString::dump"); -} - -// Copy constructor. - -ACE_SString::ACE_SString (const ACE_SString &s) - : allocator_ (s.allocator_), - len_ (s.len_) -{ - ACE_TRACE ("ACE_SString::ACE_SString"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - this->rep_ = (char *) this->allocator_->malloc (s.len_ + 1); - ACE_OS::memcpy ((void *) this->rep_, - (const void *) s.rep_, - this->len_); - this->rep_[this->len_] = '\0'; -} - -// Default constructor. - -ACE_SString::ACE_SString (ACE_Allocator *alloc) - : allocator_ (alloc), - len_ (0), - rep_ (0) - -{ - ACE_TRACE ("ACE_SString::ACE_SString"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - this->len_ = 0; - this->rep_ = (char *) this->allocator_->malloc (this->len_ + 1); - this->rep_[this->len_] = '\0'; -} - -// Set the underlying pointer (does not copy memory). - -void -ACE_SString::rep (char *s) -{ - ACE_TRACE ("ACE_SString::rep"); - - this->rep_ = s; - - if (s == 0) - this->len_ = 0; - else - this->len_ = ACE_OS::strlen (s); -} - -// Constructor that actually copies memory. - -ACE_SString::ACE_SString (const char *s, - ACE_Allocator *alloc) - : allocator_ (alloc) -{ - ACE_TRACE ("ACE_SString::ACE_SString"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - if (s == 0) - { - this->len_ = 0; - this->rep_ = (char *) this->allocator_->malloc (this->len_ + 1); - this->rep_[this->len_] = '\0'; - } - else - { - this->len_ = ACE_OS::strlen (s); - this->rep_ = (char *) this->allocator_->malloc (this->len_ + 1); - ACE_OS::strcpy (this->rep_, s); - } -} - -ACE_SString::ACE_SString (char c, - ACE_Allocator *alloc) - : allocator_ (alloc) -{ - ACE_TRACE ("ACE_SString::ACE_SString"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - this->len_ = 1; - this->rep_ = (char *) this->allocator_->malloc (this->len_ + 1); - this->rep_[0] = c; - this->rep_[this->len_] = '\0'; -} - -// Constructor that actually copies memory. - -ACE_SString::ACE_SString (const char *s, - size_t len, - ACE_Allocator *alloc) - : allocator_ (alloc) -{ - ACE_TRACE ("ACE_SString::ACE_SString"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - if (s == 0) - { - this->len_ = 0; - this->rep_ = (char *) this->allocator_->malloc (this->len_ + 1); - this->rep_[this->len_] = '\0'; - } - else - { - this->len_ = len; - this->rep_ = (char *) this->allocator_->malloc (this->len_ + 1); - ACE_OS::memcpy (this->rep_, s, len); - this->rep_[len] = '\0'; // Make sure to NUL terminate this! - } -} - -// Assignment operator (does copy memory). - -ACE_SString & -ACE_SString::operator= (const ACE_SString &s) -{ - ACE_TRACE ("ACE_SString::operator="); - // Check for identify. - - if (this != &s) - { - // Only reallocate if we don't have enough space... - if (this->len_ < s.len_) - { - this->allocator_->free (this->rep_); - this->rep_ = (char *) this->allocator_->malloc (s.len_ + 1); - } - this->len_ = s.len_; - ACE_OS::strcpy (this->rep_, s.rep_); - } - - return *this; -} - -// Return substring. -ACE_SString -ACE_SString::substring (size_t offset, - ssize_t length) const -{ - ACE_SString nill; - size_t count = length; - - // case 1. empty string - if (len_ == 0) - return nill; - - // case 2. start pos l - if (offset >= len_) - return nill; - - // get all remaining bytes - if (length == -1) - count = len_ - offset; - - return ACE_SString (&rep_[offset], count, this->allocator_); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_String_Base; -template ACE_String_Base operator + (const ACE_String_Base &, - const ACE_String_Base &); -template ACE_String_Base operator + (const ACE_String_Base &, - const char *); -template ACE_String_Base operator + (const char *, - const ACE_String_Base &); -template class ACE_String_Base; -template ACE_String_Base operator + (const ACE_String_Base &, - const ACE_String_Base &); -template ACE_String_Base operator + (const ACE_String_Base &, - const ACE_WSTRING_TYPE *); -template ACE_String_Base operator + (const ACE_WSTRING_TYPE *, - const ACE_String_Base &); -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_String_Base -#pragma instantiate ACE_String_Base operator + (const ACE_String_Base &, const ACE_String_Base &) -#pragma instantiate ACE_String_Base operator + (const ACE_String_Base &, const char *) -#pragma instantiate ACE_String_Base operator + (const char *,ACE_String_Base &) -#pragma instantiate ACE_String_Base -#pragma instantiate ACE_String_Base operator + (const ACE_String_Base &, const ACE_String_Base &) -#pragma instantiate ACE_String_Base operator + (const ACE_String_Base &, const ACE_WSTRING_TYPE *) -#pragma instantiate ACE_String_Base operator + (const ACE_WSTRING_TYPE *,ACE_String_Base &) -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS)) -template char ACE_String_Base::NULL_String_; -template ACE_WSTRING_TYPE ACE_String_Base::NULL_String_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/SString.h b/ace/SString.h deleted file mode 100644 index 0454c2ceef8..00000000000 --- a/ace/SString.h +++ /dev/null @@ -1,484 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SString.h - * - * $Id$ - * - * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) - */ -//============================================================================= - -#ifndef ACE_SSTRING_H -#define ACE_SSTRING_H -#include "ace/pre.h" - -#include "ace/String_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -typedef ACE_WCHAR_T ACE_WSTRING_TYPE; - -#if !defined (ACE_DEFAULT_GROWSIZE) -#define ACE_DEFAULT_GROWSIZE 32 -#endif /* ACE_DEFAULT_GROWSIZE */ - -typedef ACE_String_Base ACE_CString; - -typedef ACE_String_Base ACE_WString; - -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -ACE_Export ACE_OSTREAM_TYPE &operator << (ACE_OSTREAM_TYPE &, const ACE_CString &); -ACE_Export ACE_OSTREAM_TYPE &operator << (ACE_OSTREAM_TYPE &, const ACE_WString &); -#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class ACE_Export ACE_String_Base; -template class ACE_Export ACE_String_Base; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -/** - * @brief This class retain the backward compatibility for - * Naming_Conext and related classes. The only addition to - * ACE_WString is a very naive "wchar" to "char" conversion function. - */ -class ACE_Export ACE_NS_WString : public ACE_WString -{ -public: - /// Default constructor. - ACE_NS_WString (ACE_Allocator *alloc = 0); - - /// Constructor that copies @a s into dynamically allocated memory. - ACE_NS_WString (const char *s, - ACE_Allocator *alloc = 0); - - /// Constructor that copies @a s into dynamically allocated memory. - ACE_NS_WString (const ACE_WSTRING_TYPE *s, - ACE_Allocator *alloc = 0); - -#if defined (ACE_WSTRING_HAS_USHORT_SUPPORT) - /// Constructor that takes in a ushort16 string (mainly used by the - /// ACE Name_Space classes) - ACE_NS_WString (const ACE_USHORT16 *s, - size_t len, - ACE_Allocator *alloc = 0); -#endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */ - - /// Constructor that copies @a len ACE_WSTRING_TYPE's of @a s into dynamically - /// allocated memory (will NUL terminate the result). - ACE_NS_WString (const ACE_WSTRING_TYPE *s, - size_t len, - ACE_Allocator *alloc = 0); - - /// Constructor that dynamically allocates memory for @a len + 1 - /// ACE_WSTRING_TYPE characters. The newly created memory is set memset to 0. - ACE_NS_WString (size_t len, ACE_Allocator *alloc = 0); - - /// Copy constructor. - ACE_NS_WString (const ACE_NS_WString &s); - - /// Constructor that copies @a c into dynamically allocated memory. - ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc = 0); - - /// Transform into a copy of the ASCII character representation. - /// (caller must delete) - char *char_rep (void) const; - - /// Transform into a copy of a USHORT16 representation (caller must - /// delete). Note, behavior is undefined when sizeof (wchar_t) != 2. - ACE_USHORT16 *ushort_rep (void) const; -}; - -ACE_INLINE ACE_Export -ACE_NS_WString operator + (const ACE_NS_WString &, - const ACE_NS_WString &); -/** - * @class ACE_SString - * - * @brief A very Simple String ACE_SString class. This is not a - * general-purpose string class, and you should probably consider - * using ACE_CString is you don't understand why this class - * exists... - * - * This class is optimized for efficiency, so it doesn't provide - * any internal locking. - * CAUTION: This class is only intended for use with applications - * that understand how it works. In particular, its destructor - * does not deallocate its memory when it is destroyed... We need - * this class since the ACE_Map_Manager requires an object that - * supports the operator == and operator !=. This class uses an - * ACE_Allocator to allocate memory. The user can make this a - * persistant class by providing an ACE_Allocator with a - * persistable memory pool. - */ -class ACE_Export ACE_SString -{ -public: - /// No position constant - static const int npos; - - /// Default constructor. - ACE_SString (ACE_Allocator *alloc = 0); - - /// Constructor that copies @a s into dynamically allocated memory. - ACE_SString (const char *s, ACE_Allocator *alloc = 0); - - /// Constructor that copies @a len chars of @s into dynamically - /// allocated memory (will NUL terminate the result). - ACE_SString (const char *s, size_t len, ACE_Allocator *alloc = 0); - - /// Copy constructor. - ACE_SString (const ACE_SString &); - - /// Constructor that copies @a c into dynamically allocated memory. - ACE_SString (char c, ACE_Allocator *alloc = 0); - - /// Default destructor. - ~ACE_SString (void); - - /// Return the character in the string (doesn't perform - /// bounds checking). - char operator [] (size_t slot) const; - - /// Return the character by reference in the string - /// (doesn't perform bounds checking). - char &operator [] (size_t slot); - - /// Assignment operator (does copy memory). - ACE_SString &operator = (const ACE_SString &); - - /** - * Return a substring given an offset and length, if length == -1 - * use rest of str return empty substring if offset or offset/length - * are invalid - */ - ACE_SString substring (size_t offset, ssize_t length = -1) const; - - /// Same as substring - ACE_SString substr (size_t offset, ssize_t length = -1) const; - - /// Returns a hash value for this string. - u_long hash (void) const; - - /// Return the length of the string. - size_t length (void) const; - - /// Set the underlying pointer. Since this does not copy memory or - /// delete existing memory use with extreme caution!!! - void rep (char *s); - - /// Get the underlying pointer. - const char *rep (void) const; - - /// Get the underlying pointer. - const char *fast_rep (void) const; - - /// Same as STL String's and . - const char *c_str (void) const; - - /// Comparison operator that will match substrings. Returns the - /// slot of the first location that matches, else -1. - int strstr (const ACE_SString &s) const; - - /// Find starting at pos. Returns the slot of the first - /// location that matches (will be >= pos), else npos. - int find (const ACE_SString &str, int pos = 0) const; - - /// Find starting at pos. Returns the slot of the first - /// location that matches (will be >= pos), else npos. - int find (const char *s, int pos = 0) const; - - /// Find starting at pos. Returns the slot of the first - /// location that matches (will be >= pos), else npos. - int find (char c, int pos = 0) const; - - /// Find starting at pos (counting from the end). Returns the - /// slot of the first location that matches, else npos. - int rfind (char c, int pos = npos) const; - - /// Equality comparison operator (must match entire string). - int operator == (const ACE_SString &s) const; - - /// Less than comparison operator. - int operator < (const ACE_SString &s) const; - - /// Greater than comparison operator. - int operator > (const ACE_SString &s) const; - - /// Inequality comparison operator. - int operator != (const ACE_SString &s) const; - - /// Performs a -style comparison. - int compare (const ACE_SString &s) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Pointer to a memory allocator. - ACE_Allocator *allocator_; - - /// Length of the ACE_SString (not counting the trailing '\0'). - size_t len_; - - /// Pointer to data. - char *rep_; -}; - -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -ACE_Export ACE_OSTREAM_TYPE &operator << (ACE_OSTREAM_TYPE &, const ACE_SString &); -#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - -// This allows one to use W or C String based on the Unicode -// setting -#if defined (ACE_USES_WCHAR) -typedef ACE_WString ACE_TString; -#else /* ACE_USES_WCHAR */ -typedef ACE_CString ACE_TString; -#endif /* ACE_USES_WCHAR */ - - -// ************************************************************ - -/** - * @class ACE_Tokenizer - * - * @brief Tokenizer - * - * Tokenizes a buffer. Allows application to set delimiters and - * preserve designators. Does not allow special characters, yet - * (e.g., printf ("\"like a quoted string\"")). - */ -class ACE_Export ACE_Tokenizer -{ -public: - /** - * \a buffer will be parsed. Notice that ACE_Tokenizer will modify - * \a buffer if you use delimiter_replace or - * preserve_designators to do character substitution. - * NOTE: You should NOT pass a constant string or string literal - * to this constructor, since ACE_Tokenizer will try to modify - * the string. - * \sa preserve_designators - * \sa preserve_designators - */ - ACE_Tokenizer (ACE_TCHAR *buffer); - - /** - * \a d is a delimiter. - * \return Returns 0 on success, -1 if there is no memory left. - * - * Example: - * \verbatim - char buf[30]; - ACE_OS::strcpy(buf, "William/Joseph/Hagins"); - - ACE_Tokenizer tok (buf); - tok.delimiter ('/'); - for (char *p = tok.next (); p; p = tok.next ()) - cout << p << endl; - \endverbatim - * - * This will print out: - * \verbatim - William/Joseph/Hagins - Joseph/Hagins - Hagins \endverbatim - */ - int delimiter (ACE_TCHAR d); - - /** - * \a d is a delimiter and, when found, will be replaced by - * \a replacement. - * \return 0 on success, -1 if there is no memory left. - * - * Example: - * \verbatim - char buf[30]; - ACE_OS::strcpy(buf, "William/Joseph/Hagins"); - - ACE_Tokenizer tok (buf); - tok.delimiter_replace ('/', 0); - for (char *p = tok.next (); p; p = tok.next ()) - cout << p << endl; - \endverbatim - * - * This will print out: - * \verbatim - William - Joseph - Hagins \endverbatim - */ - int delimiter_replace (ACE_TCHAR d, ACE_TCHAR replacement); - - /** - * Extract string between a pair of designator characters. - * For instance, quotes, or '(' and ')'. - * \a start specifies the begin designator. - * \a stop specifies the end designator. - * \a strip If \a strip == 1, then the preserve - * designators will be stripped from the tokens returned by next. - * \return 0 on success, -1 if there is no memory left. - * - * Example with strip = 0: - * \verbatim - char buf[30]; - ACE_OS::strcpy(buf, "William(Joseph)Hagins"); - - ACE_Tokenizer tok (buf); - tok.preserve_designators ('(', ')', 0); - for (char *p = tok.next (); p; p = tok.next ()) - cout << p << endl; - \endverbatim - * - * This will print out: - * \verbatim - William(Joseph)Hagins - (Joseph)Hagins - )Hagins \endverbatim - * - * Example with strip = 1: - * \verbatim - char buf[30]; - ACE_OS::strcpy(buf, "William(Joseph)Hagins"); - - ACE_Tokenizer tok (buf); - tok.preserve_designators ('(', ')', 1); - for (char *p = tok.next (); p; p = tok.next ()) - cout << p << endl; - \endverbatim - * - * This will print out: - * \verbatim - William - Joseph - Hagins \endverbatim - */ - int preserve_designators (ACE_TCHAR start, ACE_TCHAR stop, int strip=1); - - /// Returns the next token. - ACE_TCHAR *next (void); - - enum { - MAX_DELIMITERS=16, - MAX_PRESERVES=16 - }; - -protected: - /// Returns 1 if is a delimiter, 0 otherwise. If should be - /// replaced with , is set to 1, otherwise 0. - int is_delimiter (ACE_TCHAR d, int &replace, ACE_TCHAR &r); - - /** - * If is a start preserve designator, returns 1 and sets - * to the stop designator. Returns 0 if is not a - * preserve designator. - */ - int is_preserve_designator (ACE_TCHAR start, ACE_TCHAR &stop, int &strip); - - ACE_TCHAR *buffer_; - int index_; - - /** - * @class Preserve_Entry - * - * @brief Preserve Entry - * - * Defines a set of characters that designate an area that - * should not be parsed, but should be treated as a complete - * token. For instance, in: (this is a preserve region), start - * would be a left paren -(- and stop would be a right paren - * -)-. The strip determines whether the designators should be - * removed from the token. - */ - class Preserve_Entry - { - public: - /** - * E.g., "(". - * E.g., ")". - * Whether the designators should be removed from the token. - */ - ACE_TCHAR start_; - ACE_TCHAR stop_; - int strip_; - }; - - /// The application can specify MAX_PRESERVES preserve designators. - Preserve_Entry preserves_[MAX_PRESERVES]; - - /// Pointer to the next free spot in preserves_. - int preserves_index_; - - /** - * @class Delimiter_Entry - * - * @brief Delimiter Entry - * - * Describes a delimiter for the tokenizer. - */ - class Delimiter_Entry - { - public: - /** - * Most commonly a space ' '. - * What occurrences of delimiter_ should be replaced with. - * Whether replacement_ should be used. This should be replaced - * with a technique that sets replacement_ = delimiter by - * default. I'll do that next iteration. - */ - ACE_TCHAR delimiter_; - ACE_TCHAR replacement_; - int replace_; - }; - - /// The tokenizer allows MAX_DELIMITERS number of delimiters. - Delimiter_Entry delimiters_[MAX_DELIMITERS]; - - /// Pointer to the next free space in delimiters_. - int delimiter_index_; -}; - -// **************************************************************** - -/** - * @class ACE_Auto_String_Free - * - * @brief Simple class to automatically de-allocate strings - * - * Keeps a pointer to a string and deallocates it (using - * ) on its destructor. - * If you need to delete using "delete[]" the - * ACE_Auto_Array_Ptr is your choice. - * The class plays the same role as auto_ptr<> - */ -class ACE_Export ACE_Auto_String_Free -{ -public: - ACE_EXPLICIT ACE_Auto_String_Free (char* p = 0); - ACE_Auto_String_Free (ACE_Auto_String_Free &rhs); - ACE_Auto_String_Free& operator= (ACE_Auto_String_Free &rhs); - ~ACE_Auto_String_Free (void); - - char* operator* () const; - char operator[] (int i) const; - char* get (void) const; - char* release (void); - void reset (char* p = 0); - -private: - char* p_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/SString.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_SSTRING_H */ diff --git a/ace/SString.i b/ace/SString.i deleted file mode 100644 index 2ba1558848b..00000000000 --- a/ace/SString.i +++ /dev/null @@ -1,284 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Malloc_Base.h" - -ACE_INLINE -ACE_NS_WString::ACE_NS_WString (ACE_Allocator *alloc) - : ACE_WString (alloc) -{ -} - -ACE_INLINE -ACE_NS_WString::ACE_NS_WString (const ACE_WSTRING_TYPE *s, - size_t len, - ACE_Allocator *alloc) - : ACE_WString (s, len, alloc) -{ -} - -ACE_INLINE -ACE_NS_WString::ACE_NS_WString (const ACE_WSTRING_TYPE *s, - ACE_Allocator *alloc) - : ACE_WString (s, alloc) -{ -} - -ACE_INLINE -ACE_NS_WString::ACE_NS_WString (size_t len, ACE_Allocator *alloc) - : ACE_WString (len, 0, alloc) -{ -} - -ACE_INLINE -ACE_NS_WString::ACE_NS_WString (const ACE_NS_WString &s) - : ACE_WString (s) -{ -} - -ACE_INLINE -ACE_NS_WString::ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc) - : ACE_WString (c, alloc) -{ -} - -ACE_INLINE ACE_NS_WString -operator+ (const ACE_NS_WString &s, const ACE_NS_WString &t) -{ - ACE_NS_WString temp (s); - temp += t; - return temp; -} - -ACE_INLINE -ACE_SString::~ACE_SString (void) -{ -} - -ACE_INLINE ACE_SString -ACE_SString::substr (size_t offset, - ssize_t length) const -{ - return this->substring (offset, length); -} - -// Return the character in the string. - -ACE_INLINE char -ACE_SString::operator[] (size_t slot) const -{ - ACE_TRACE ("ACE_SString::operator[]"); - return this->rep_[slot]; -} - -// Return the character in the string by reference. - -ACE_INLINE char & -ACE_SString::operator[] (size_t slot) -{ - ACE_TRACE ("ACE_SString::operator[]"); - return this->rep_[slot]; -} - -// Get the underlying pointer (does not make a copy, so beware!). - -ACE_INLINE const char * -ACE_SString::rep (void) const -{ - ACE_TRACE ("ACE_SString::rep"); - return this->rep_; -} - -// Get the underlying pointer (does not make a copy, so beware!). - -ACE_INLINE const char * -ACE_SString::fast_rep (void) const -{ - ACE_TRACE ("ACE_SString::fast_rep"); - return this->rep_; -} - -// Get the underlying pointer (does not make a copy, so beware!). - -ACE_INLINE const char * -ACE_SString::c_str (void) const -{ - ACE_TRACE ("ACE_SString::c_str"); - return this->rep_; -} - -// Comparison operator. - -ACE_INLINE int -ACE_SString::operator== (const ACE_SString &s) const -{ - ACE_TRACE ("ACE_SString::operator=="); - return this->len_ == s.len_ - && ACE_OS::strcmp (this->rep_, s.rep_) == 0; -} - -// Less than comparison operator. - -ACE_INLINE int -ACE_SString::operator < (const ACE_SString &s) const -{ - ACE_TRACE ("ACE_SString::operator <"); - - return (this->rep_ && s.rep_) - ? ACE_OS::strcmp (this->rep_, s.rep_) < 0 - : ((s.rep_) ? 1 : 0 ); -} - -// Greater than comparison operator. - -ACE_INLINE int -ACE_SString::operator > (const ACE_SString &s) const -{ - ACE_TRACE ("ACE_SString::operator >"); - - return (this->rep_ && s.rep_) - ? ACE_OS::strcmp (this->rep_, s.rep_) > 0 - : ((this->rep_) ? 1 : 0 ); -} - -// Comparison operator. - -ACE_INLINE int -ACE_SString::operator!= (const ACE_SString &s) const -{ - ACE_TRACE ("ACE_SString::operator!="); - return !(*this == s); -} - -ACE_INLINE int -ACE_SString::compare (const ACE_SString &s) const -{ - ACE_TRACE ("ACE_SString::compare"); - return ACE_OS::strcmp (this->rep_, s.rep_); -} - -ACE_INLINE int -ACE_SString::find (const char *s, int pos) const -{ - char *substr = this->rep_ + pos; - char *pointer = ACE_OS::strstr (substr, s); - if (pointer == 0) - return ACE_SString::npos; - else - return pointer - this->rep_; -} - -ACE_INLINE int -ACE_SString::find (char c, int pos) const -{ - char *substr = this->rep_ + pos; - char *pointer = ACE_OS::strchr (substr, c); - if (pointer == 0) - return ACE_SString::npos; - else - return pointer - this->rep_; -} - -ACE_INLINE int -ACE_SString::strstr (const ACE_SString &s) const -{ - ACE_TRACE ("ACE_SString::strstr"); - - return this->find (s.rep_); -} - -ACE_INLINE int -ACE_SString::find (const ACE_SString &str, int pos) const -{ - return this->find (str.rep_, pos); -} - -ACE_INLINE int -ACE_SString::rfind (char c, int pos) const -{ - if (pos == ACE_SString::npos) - pos = ACE_static_cast (int, this->len_); - - for (int i = pos - 1; i >= 0; i--) - if (this->rep_[i] == c) - return i; - - return ACE_SString::npos; -} - -ACE_INLINE u_long -ACE_SString::hash (void) const -{ - return ACE::hash_pjw (this->rep_); -} - -ACE_INLINE size_t -ACE_SString::length (void) const -{ - ACE_TRACE ("ACE_SString::length"); - return this->len_; -} - -ACE_INLINE -ACE_Auto_String_Free::ACE_Auto_String_Free (char* p) - : p_ (p) -{ -} - -ACE_INLINE -ACE_Auto_String_Free::ACE_Auto_String_Free (ACE_Auto_String_Free& rhs) - : p_ (rhs.p_) -{ - rhs.p_ = 0; -} - -ACE_INLINE void -ACE_Auto_String_Free::reset (char* p) -{ - if (this->p_ != 0) - ACE_OS::free (this->p_); - this->p_ = p; -} - -ACE_INLINE ACE_Auto_String_Free& -ACE_Auto_String_Free::operator= (ACE_Auto_String_Free& rhs) -{ - if (this != &rhs) - { - this->reset (rhs.p_); - rhs.p_ = 0; - } - return *this; -} - -ACE_INLINE -ACE_Auto_String_Free::~ACE_Auto_String_Free (void) -{ - this->reset (0); -} - -ACE_INLINE char* -ACE_Auto_String_Free::operator* (void) const -{ - return this->p_; -} - -ACE_INLINE char -ACE_Auto_String_Free::operator[] (int i) const -{ - return this->p_[i]; -} - -ACE_INLINE char* -ACE_Auto_String_Free::get (void) const -{ - return this->p_; -} - -ACE_INLINE char* -ACE_Auto_String_Free::release (void) -{ - char* p = this->p_; - this->p_ = 0; - return p; -} diff --git a/ace/SUN_Proactor.cpp b/ace/SUN_Proactor.cpp deleted file mode 100644 index b3d374d1f12..00000000000 --- a/ace/SUN_Proactor.cpp +++ /dev/null @@ -1,313 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/SUN_Proactor.h" - -#if defined (ACE_HAS_AIO_CALLS) && defined (sun) - -#include "ace/Task_T.h" -#include "ace/Log_Msg.h" -#include "ace/Object_Manager.h" - -#if !defined (__ACE_INLINE__) -#include "ace/SUN_Proactor.i" -#endif /* __ACE_INLINE__ */ - -ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations) - : ACE_POSIX_AIOCB_Proactor (max_aio_operations, - ACE_POSIX_Proactor::PROACTOR_SUN), - condition_ (mutex_) -{ - // To provide correct virtual calls. - create_notify_manager (); - - // we should start pseudo-asynchronous accept task - // one per all future acceptors - - this->get_asynch_pseudo_task ().start (); -} - -// Destructor. -ACE_SUN_Proactor::~ACE_SUN_Proactor (void) -{ - this->close (); -} - -int -ACE_SUN_Proactor::handle_events (ACE_Time_Value &wait_time) -{ - // Decrement with the amount of time spent in the method - ACE_Countdown_Time countdown (&wait_time); - return this->handle_events_i (&wait_time); -} - -int -ACE_SUN_Proactor::handle_events (void) -{ - return this->handle_events_i (0); -} - -int ACE_SUN_Proactor::wait_for_start (ACE_Time_Value * abstime) -{ -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, mutex_, -1)); - - if (this->num_started_aio_ != 0) // double check - return 0; - - return this->condition_.wait (abstime); - -#else - - return 0; // or -1 ??? - -#endif /* ACE_MT_SAFE */ -} - -int -ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta) -{ - int retval = 0; - aio_result_t *result = 0; - - if (0 == delta) - { - if (this->num_started_aio_ == 0) - this->wait_for_start (0); - - result = aiowait (0); - } - else - { - if (this->num_started_aio_ == 0) - { - // Decrement delta with the amount of time spent waiting - ACE_Countdown_Time countdown (delta); - ACE_Time_Value tv (*delta); - tv += ACE_OS::gettimeofday (); - if (this->wait_for_start (&tv) == -1) - return -1; - } - struct timeval delta_tv = *delta; - result = aiowait (&delta_tv); - } - - if (result == 0) - { - // timeout, do nothing, - // we should process "post_completed" queue - } - else if (ACE_reinterpret_cast (long, result) == -1) - { - // Check errno for EINVAL,EAGAIN,EINTR ?? - switch (errno) - { - case EINTR : // aiowait() was interrupted by a signal. - case EINVAL: // there are no outstanding asynchronous I/O requests. - break; // we should process "post_completed" queue - - default: // EFAULT - ACE_ERROR_RETURN ((LM_ERROR, - "%N:%l:(%P | %t)::%p \nNumAIO=%d\n", - "ACE_SUN_Proactor::handle_events: aiowait failed", - num_started_aio_), - -1); - } - } - else - { - int error_status = 0; - size_t transfer_count = 0; - - ACE_POSIX_Asynch_Result *asynch_result = - find_completed_aio (result, - error_status, - transfer_count); - - if (asynch_result != 0) - { - // Call the application code. - this->application_specific_code (asynch_result, - transfer_count, - 0, // No completion key. - error_status); // Error - retval++; - } - } - - // process post_completed results - retval += this->process_result_queue (); - - return retval > 0 ? 1 : 0 ; - -} - -int -ACE_SUN_Proactor::get_result_status (ACE_POSIX_Asynch_Result* asynch_result, - int &error_status, - size_t &transfer_count) -{ - - // Get the error status of the aio_ operation. - error_status = asynch_result->aio_resultp.aio_errno; - ssize_t op_return = asynch_result->aio_resultp.aio_return; - - // ****** from Sun man pages ********************* - // Upon completion of the operation both aio_return and aio_errno - // are set to reflect the result of the operation. - // AIO_INPROGRESS is not a value used by the system - // so the client may detect a change in state - // by initializing aio_return to this value. - - if (error_status == EINPROGRESS || op_return == AIO_INPROGRESS) - return 0; // not completed - - if (op_return < 0) - transfer_count = 0; // zero bytes transferred - else - transfer_count = ACE_static_cast (size_t, op_return); - - return 1; // completed -} - -ACE_POSIX_Asynch_Result * -ACE_SUN_Proactor::find_completed_aio (aio_result_t *result, - int &error_status, - size_t &transfer_count) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, mutex_, 0)); - - size_t ai; - error_status = -1; - transfer_count = 0; - - // we call find_completed_aio always with result != 0 - - for (ai = 0; ai < aiocb_list_max_size_; ai++) - if (aiocb_list_[ai] != 0 && //check for non zero - result == &aiocb_list_[ai]->aio_resultp) - break; - - if (ai >= aiocb_list_max_size_) // not found - return 0; // means somebody else uses aio directly!!! - - ACE_POSIX_Asynch_Result *asynch_result = result_list_[ai]; - - if (this->get_result_status (asynch_result, - error_status, - transfer_count) == 0) - { // should never be - ACE_ERROR ((LM_ERROR, - "%N:%l:(%P | %t)::%p\n", - "ACE_SUN_Proactor::find_completed_aio:" - "should never be !!!\n")); - return 0; - } - - aiocb_list_[ai] = 0; - result_list_[ai] = 0; - aiocb_list_cur_size_--; - - num_started_aio_--; - - start_deferred_aio (); - //make attempt to start deferred AIO - //It is safe as we are protected by mutex_ - - return asynch_result; -} - -// start_aio_i has new return codes -// 0 successful start -// 1 try later, OS queue overflow -// -1 invalid request and other errors - -int -ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) -{ - ACE_TRACE ("ACE_SUN_Proactor::start_aio_i"); - - int ret_val; - const ACE_TCHAR *ptype; - - // ****** from Sun man pages ********************* - // Upon completion of the operation both aio_return and aio_errno - // are set to reflect the result of the operation. - // AIO_INPROGRESS is not a value used by the system - // so the client may detect a change in state - // by initializing aio_return to this value. - result->aio_resultp.aio_return = AIO_INPROGRESS; - result->aio_resultp.aio_errno = EINPROGRESS; - - // Start IO - switch (result->aio_lio_opcode) - { - case LIO_READ : - ptype = ACE_LIB_TEXT ("read"); - ret_val = aioread (result->aio_fildes, - (char *) result->aio_buf, - result->aio_nbytes, - result->aio_offset, - SEEK_SET, - &result->aio_resultp); - break; - - case LIO_WRITE : - ptype = ACE_LIB_TEXT ("write"); - ret_val = aiowrite (result->aio_fildes, - (char *) result->aio_buf, - result->aio_nbytes, - result->aio_offset, - SEEK_SET, - &result->aio_resultp); - break; - - default: - ptype = ACE_LIB_TEXT ("?????"); - ret_val = -1; - break; - } - - if (ret_val == 0) - { - this->num_started_aio_++; - if (this->num_started_aio_ == 1) // wake up condition - this->condition_.broadcast (); - } - else // if (ret_val == -1) - { - if (errno == EAGAIN || errno == ENOMEM) // Defer - retry this later. - ret_val = 1; - else - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t)::start_aio: aio%s %p\n"), - ptype, - ACE_LIB_TEXT ("queueing failed\n"))); - } - - return ret_val; -} - -int -ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result) -{ - ACE_TRACE ("ACE_SUN_Proactor::cancel_aiocb"); - int rc = ::aiocancel (&result->aio_resultp); - if (rc == 0) // AIO_CANCELED - { - // after aiocancel Sun does not notify us - // so we should send notification - // to save POSIX behavoir. - // Also we should do this for deffered aio's - - result->set_error (ECANCELED); - result->set_bytes_transferred (0); - this->putq_result (result); - return 0; - } - - return 2; -} - -#endif /* ACE_HAS_AIO_CALLS && sun */ diff --git a/ace/SUN_Proactor.h b/ace/SUN_Proactor.h deleted file mode 100644 index 4df6be7a416..00000000000 --- a/ace/SUN_Proactor.h +++ /dev/null @@ -1,126 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SUN_Proactor.h - * - * $Id$ - * - * @author Alexander Libman - */ -//============================================================================= - -#ifndef ACE_SUN_PROACTOR_H -#define ACE_SUN_PROACTOR_H - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_AIO_CALLS) && defined (sun) - -#include "ace/POSIX_Proactor.h" -#include /**/ // Sun native aio calls - -/** - * @class ACE_SUN_Proactor - * - * @brief Implementation of the fast and reliable Proactor - * for SunOS 5.6, 5.7, etc. - * - * This proactor, based on , - * works with Sun native interface for aio calls. - * POSIX_API Native SUN_API - * aio_read aioread - * aio_write aiowrite - * aio_suspend aiowait - * aio_error aio_result_t.errno - * aio_return aio_result_t.return - * On Solaris, the Sun native implementation is more - * reliable and efficient than POSIX implementation. - * There is a problem of lost RT signals with POSIX, if we start - * more than SIGQUEUEMAX asynchronous operations at the same - * time. - * The Sun it is not the standard POSX , instead, - * it has the following structure: - * typedef struct aiocb - * { - * int aio_fildes; File descriptor - * void *aio_buf; buffer location - * size_t aio_nbytes; length of transfer - * off_t aio_offset; file offset - * int aio_reqprio; request priority offset - * sigevent aio_sigevent; signal number and offset - * int aio_lio_opcode; listio operation - * aio_result_t aio_resultp; results - * int aio_state; state flag for List I/O - * int aio__pad[1]; extension padding - * }; - */ -class ACE_Export ACE_SUN_Proactor : public ACE_POSIX_AIOCB_Proactor -{ - -public: - virtual Proactor_Type get_impl_type (void); - - /// Destructor. - virtual ~ACE_SUN_Proactor (void); - - /// Constructor defines max number asynchronous operations that can - /// be started at the same time. - ACE_SUN_Proactor (size_t max_aio_operations = ACE_AIO_DEFAULT_SIZE); - -protected: - /** - * Dispatch a single set of events. If elapses before - * any events occur, return 0. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (ACE_Time_Value &wait_time); - - /** - * Block indefinitely until at least one event is dispatched. - * Dispatch a single set of events. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (void); - - /// Internal completion detection and dispatching. - int handle_events_i (ACE_Time_Value *delta); - - /// Initiate an aio operation. - virtual int start_aio_i (ACE_POSIX_Asynch_Result *result); - - /// Check AIO for completion, error and result status - /// Return: 1 - AIO completed , 0 - not completed yet - virtual int get_result_status (ACE_POSIX_Asynch_Result* asynch_result, - int &error_status, - size_t &transfer_count); - - /// Extract the results of aio. - ACE_POSIX_Asynch_Result *find_completed_aio (aio_result_t *result, - int &error_status, - size_t &transfer_count); - - /// From ACE_POSIX_AIOCB_Proactor. - /// Attempt to cancel running request - virtual int cancel_aiocb (ACE_POSIX_Asynch_Result *result); - - /// Specific Sun aiowait - int wait_for_start (ACE_Time_Value * abstime); - - /// Condition variable . - /// used to wait the first AIO start - ACE_SYNCH_CONDITION condition_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/SUN_Proactor.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_AIO_CALLS && sun */ -#endif /* ACE_SUN_PROACTOR_H*/ diff --git a/ace/SUN_Proactor.i b/ace/SUN_Proactor.i deleted file mode 100644 index 545841223aa..00000000000 --- a/ace/SUN_Proactor.i +++ /dev/null @@ -1,8 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_POSIX_Proactor::Proactor_Type ACE_SUN_Proactor::get_impl_type (void) -{ - return PROACTOR_SUN; -} diff --git a/ace/SV_Message.cpp b/ace/SV_Message.cpp deleted file mode 100644 index fef83458651..00000000000 --- a/ace/SV_Message.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// SV_Message.cpp -// $Id$ - -#include "ace/SV_Message.h" - -#if !defined (__ACE_INLINE__) -#include "ace/SV_Message.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, SV_Message, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message) - -void -ACE_SV_Message::dump (void) const -{ - ACE_TRACE ("ACE_SV_Message::dump"); -} - diff --git a/ace/SV_Message.h b/ace/SV_Message.h deleted file mode 100644 index 9cb4e26c0e8..00000000000 --- a/ace/SV_Message.h +++ /dev/null @@ -1,64 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file SV_Message.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//========================================================================== - - -#ifndef ACE_SV_MESSAGE_H -#define ACE_SV_MESSAGE_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -/** - * @class ACE_SV_Message - * - * @brief Defines the header file for the C++ wrapper for message queues. - */ -class ACE_Export ACE_SV_Message -{ -public: - /// Constructor - ACE_SV_Message (long type = 0); - - /// Destructor - ~ACE_SV_Message (void); - - /// Get the message type. - long type (void) const; - - /// Set the message type. - void type (long); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Type of the message. - long type_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/SV_Message.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_SV_MESSAGE_H */ diff --git a/ace/SV_Message.i b/ace/SV_Message.i deleted file mode 100644 index 8c08e41d151..00000000000 --- a/ace/SV_Message.i +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SV_Message.i - -ACE_INLINE -ACE_SV_Message::ACE_SV_Message (long t) - : type_ (t) -{ - ACE_TRACE ("ACE_SV_Message::ACE_SV_Message"); -} - -ACE_INLINE -ACE_SV_Message::~ACE_SV_Message (void) -{ - ACE_TRACE ("ACE_SV_Message::~ACE_SV_Message"); -} - -ACE_INLINE long -ACE_SV_Message::type (void) const -{ - ACE_TRACE ("ACE_SV_Message::type"); - return this->type_; -} - -ACE_INLINE void -ACE_SV_Message::type (long t) -{ - ACE_TRACE ("ACE_SV_Message::type"); - this->type_ = t; -} diff --git a/ace/SV_Message_Queue.cpp b/ace/SV_Message_Queue.cpp deleted file mode 100644 index d9f924e82eb..00000000000 --- a/ace/SV_Message_Queue.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// SV_Message_Queue.cpp -// $Id$ - -#include "ace/SV_Message_Queue.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Message_Queue.i" -#endif - -ACE_RCSID(ace, SV_Message_Queue, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message_Queue) - -void -ACE_SV_Message_Queue::dump (void) const -{ - ACE_TRACE ("ACE_SV_Message_Queue::dump"); -} - -ACE_SV_Message_Queue::ACE_SV_Message_Queue (void) -{ - ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"); -} - -ACE_SV_Message_Queue::~ACE_SV_Message_Queue (void) -{ - ACE_TRACE ("ACE_SV_Message_Queue::~ACE_SV_Message_Queue"); -} - -ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id, - int create, - int perms) -{ - ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"); - if (this->open (external_id, create, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"))); -} diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h deleted file mode 100644 index 92055767e3a..00000000000 --- a/ace/SV_Message_Queue.h +++ /dev/null @@ -1,98 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file SV_Message_Queue.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//=========================================================================== - -#ifndef ACE_SV_MESSAGE_QUEUE_H -#define ACE_SV_MESSAGE_QUEUE_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SV_Message.h" - -/** - * @class ACE_SV_Message_Queue - * - * @brief Defines the header file for the C++ wrapper for System V IPC - * message queues. - */ -class ACE_Export ACE_SV_Message_Queue -{ -public: - // = Useful symbolic constants. - enum - { - ACE_CREATE = IPC_CREAT, - ACE_OPEN = 0, - ACE_NOWAIT = IPC_NOWAIT - }; - - // = Initialization and termination methods. - /// Open a message queue using the . - ACE_SV_Message_Queue (void); - ACE_SV_Message_Queue (key_t external_id, - int create = ACE_SV_Message_Queue::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); - int open (key_t external_id, - int create = ACE_SV_Message_Queue::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); - - ~ACE_SV_Message_Queue (void); - - /// Close down this instance of the message queue without removing it - /// from the system. - int close (void); - - /// Close down and remove the message queue from the system. - int remove (void); - - // = Message transfer methods. - int recv (ACE_SV_Message &mb, - int length, - long mtype = 0, - int mflags = 0); - - int send (const ACE_SV_Message &mb, - int length, - int mflags = 0); - - /// Access the underlying control operations. - int control (int option, void *arg = 0); - - /// Get the underly internal id. - int get_id (void) const; - - /// Set the underly internal id. - void set_id (int); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Returned from the underlying system call. - int internal_id_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Message_Queue.i" -#endif - -#include "ace/post.h" - -#endif /* ACE_SV_MESSAGE_QUEUE_H */ diff --git a/ace/SV_Message_Queue.i b/ace/SV_Message_Queue.i deleted file mode 100644 index 65c092136f7..00000000000 --- a/ace/SV_Message_Queue.i +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SV_Message_Queue.i - -#include "ace/SV_Message_Queue.h" - -// Open a message queue using the . - -ASYS_INLINE int -ACE_SV_Message_Queue::open (key_t external_id, int create, int perms) -{ - ACE_TRACE ("ACE_SV_Message_Queue::open"); - return this->internal_id_ = ACE_OS::msgget (external_id, create | perms); -} - -// What does it mean to close a message queue?! - -ASYS_INLINE int -ACE_SV_Message_Queue::close (void) -{ - ACE_TRACE ("ACE_SV_Message_Queue::close"); - this->internal_id_ = -1; - return 1; -} - -ASYS_INLINE int -ACE_SV_Message_Queue::control (int option, void *arg) -{ - ACE_TRACE ("ACE_SV_Message_Queue::control"); - return ACE_OS::msgctl (this->internal_id_, option, - (msqid_ds *) arg); -} - -ASYS_INLINE int -ACE_SV_Message_Queue::remove (void) -{ - ACE_TRACE ("ACE_SV_Message_Queue::remove"); - int result = this->control (IPC_RMID); - this->internal_id_ = -1; - return result; -} - -ASYS_INLINE int -ACE_SV_Message_Queue::get_id (void) const -{ - ACE_TRACE ("ACE_SV_Message_Queue::get_id"); - return this->internal_id_; -} - -ASYS_INLINE void -ACE_SV_Message_Queue::set_id (int id) -{ - ACE_TRACE ("ACE_SV_Message_Queue::set_id"); - this->internal_id_ = id; -} - -ASYS_INLINE int -ACE_SV_Message_Queue::recv (ACE_SV_Message &mb, - int length, - long type, - int mflags) -{ - ACE_TRACE ("ACE_SV_Message_Queue::recv"); - return ACE_OS::msgrcv (this->internal_id_, (void *) &mb, - length, type, mflags); -} - -ASYS_INLINE int -ACE_SV_Message_Queue::send (const ACE_SV_Message &mb, - int length, - int mflags) -{ - ACE_TRACE ("ACE_SV_Message_Queue::send"); - return ACE_OS::msgsnd (this->internal_id_, (void *) &mb, - length, mflags); -} - diff --git a/ace/SV_Semaphore_Complex.cpp b/ace/SV_Semaphore_Complex.cpp deleted file mode 100644 index 4c751da24cb..00000000000 --- a/ace/SV_Semaphore_Complex.cpp +++ /dev/null @@ -1,252 +0,0 @@ -// SV_Semaphore_Complex.cpp -// $Id$ - -#include "ace/SV_Semaphore_Complex.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Semaphore_Complex.i" -#endif - -ACE_RCSID(ace, SV_Semaphore_Complex, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SV_Semaphore_Complex) - -void -ACE_SV_Semaphore_Complex::dump (void) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::dump"); -} - -// initial value of process -const int ACE_SV_Semaphore_Complex::BIGCOUNT_ = 10000; - -// Define the ACE_SV_Semaphore operation arrays for the semop() calls. -sembuf ACE_SV_Semaphore_Complex::op_lock_[2] = -{ - {0, 0, 0}, // Wait for [0] (lock) to equal 0 - {0, 1, SEM_UNDO}, // then increment [0] to 1 - this locks it. - // UNDO to release the lock if processes exit - // before explicitly unlocking. -}; - -sembuf ACE_SV_Semaphore_Complex::op_endcreate_[2] = -{ - {1, -1, SEM_UNDO}, // Decrement [1] (proc counter) with undo on - // exit, UNDO to adjust proc counter if - // process exits before explicitly calling close() - {0, -1, SEM_UNDO}, // the decrement [0] (lock) back to 0 -}; - -sembuf ACE_SV_Semaphore_Complex::op_open_[1] = -{ - {1, -1, SEM_UNDO}, // Decrement [1] (proc counter) with undo on - // exit. -}; - -sembuf ACE_SV_Semaphore_Complex::op_close_[3] = -{ - {0, 0, 0}, // Wait for [0] (lock) to equal 0 - {0, 1, SEM_UNDO}, // then increment [0] to 1 - this lock it - {1, 1, SEM_UNDO}, // then increment [1] (proc counter) -}; - -sembuf ACE_SV_Semaphore_Complex::op_unlock_[1] = -{ - {0, -1, SEM_UNDO}, // Decrement [0] (lock) back to 0 -}; - -// Open or create an array of SV_Semaphores. We return 0 if all is OK, else -1. - -int -ACE_SV_Semaphore_Complex::open (key_t k, - int create, - int initial_value, - u_short nsems, - int perms) -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::open"); - if (k == IPC_PRIVATE) - return -1; - - this->key_ = k; - - // Must include a count for the 2 additional semaphores we use - // internally. - this->sem_number_ = nsems + 2; - - if (create == ACE_SV_Semaphore_Complex::ACE_CREATE) - { - int result; - - do - { - this->internal_id_ = ACE_OS::semget - (this->key_, - (u_short) 2 + nsems, - perms | ACE_SV_Semaphore_Complex::ACE_CREATE); - - if (this->internal_id_ == -1) - return -1; // permission problem or tables full - - // When the is created, we know - // that the value of all 3 members is 0. Get a lock on the - // by waiting for [0] to equal 0, - // then increment it. - - // There is a race condition here. There is the possibility - // that between the above and the below, - // another process can call out function which can - // remove the if that process is the last - // one using it. Therefor we handle the error condition of - // an invalid ID specifically below, and - // if it does happen, we just go back and create it again. - result = ACE_OS::semop (this->internal_id_, - &ACE_SV_Semaphore_Complex::op_lock_[0], - 2); - } - while (result == -1 && (errno == EINVAL || errno == EIDRM)); - - if (result == -1) - return -1; - - // Get the value of the process counter. If it equals 0, then no - // one has initialized the ACE_SV_Semaphore yet. - - int semval = ACE_SV_Semaphore_Simple::control (GETVAL, 0, 1); - - if (semval == -1) - return this->init (); - else if (semval == 0) - { - // We should initialize by doing a SETALL, but that would - // clear the adjust value that we set when we locked the - // ACE_SV_Semaphore above. Instead we do system calls to - // initialize [1], as well as all the nsems SV_Semaphores. - - if (ACE_SV_Semaphore_Simple::control (SETVAL, - ACE_SV_Semaphore_Complex::BIGCOUNT_, - 1) == -1) - return -1; - else - for (int i = 0; i < nsems; i++) - if (this->control (SETVAL, initial_value, i) == -1) - return -1; - } - - // Decrement the process counter and then release the lock. - return ACE_OS::semop (this->internal_id_, - &ACE_SV_Semaphore_Complex::op_endcreate_[0], - 2); - } - else - { - this->internal_id_ = ACE_OS::semget (this->key_, 2 + nsems, 0); - if (this->internal_id_ == -1) - return -1; // doesn't exist or tables full - - // Decrement the process counter. We don't need a lock to do this. - if (ACE_OS::semop (this->internal_id_, - &ACE_SV_Semaphore_Complex::op_open_[0], 1) < 0) - return this->init (); - return 0; - } -} - -int -ACE_SV_Semaphore_Complex::open (const char *name, - int flags, - int initial_value, - u_short nsems, - int perms) -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::open"); - return this->open (ACE_SV_Semaphore_Simple::name_2_key (name), - flags, initial_value, nsems, perms); -} - -// Close a ACE_SV_Semaphore. Unlike the remove above, this function -// is for a process to call before it exits, when it is done with the -// ACE_SV_Semaphore. We "decrement" the counter of processes using -// the ACE_SV_Semaphore, and if this was the last one, we can remove -// the ACE_SV_Semaphore. - -int -ACE_SV_Semaphore_Complex::close (void) -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::close"); - int semval; - - if (this->key_ == (key_t) - 1 || this->internal_id_ == -1) - return -1; - - // The following semop() first gets a lock on the ACE_SV_Semaphore, - // then increments [1] - the process number. - - if (ACE_OS::semop (this->internal_id_, - &ACE_SV_Semaphore_Complex::op_close_[0], - 3) == -1) - return -1; - - // Now that we have a lock, read the value of the process counter to - // see if this is the last reference to the ACE_SV_Semaphore. There - // is a race condition here - see the comments in create (). - - if ((semval = ACE_SV_Semaphore_Simple::control (GETVAL, 0, 1)) == -1) - return -1; - - if (semval > ACE_SV_Semaphore_Complex::BIGCOUNT_) - return -1; - else if (semval == ACE_SV_Semaphore_Complex::BIGCOUNT_) - return this->remove (); - else - { - int result = ACE_OS::semop (this->internal_id_, - &ACE_SV_Semaphore_Complex::op_unlock_[0], 1); - this->init (); - return result; - } -} - -ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (key_t k, - int flags, - int initial_value, - u_short nsems, - int perms) -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex"); - if (this->open (k, flags, initial_value, nsems, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore_Complex"))); -} - -ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, - int flags, - int initial_value, - u_short nsems, - int perms) -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex"); - - key_t key; - - if (name == 0) - key = ACE_DEFAULT_SEM_KEY; - else - key = this->name_2_key (name); - - if (this->open (key, flags, initial_value, nsems, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore_Complex"))); -} - -ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex (void) -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex"); - if (this->internal_id_ >= 0) - this->close (); -} - -ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (void) -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex"); - this->init (); -} diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h deleted file mode 100644 index d89c855cc69..00000000000 --- a/ace/SV_Semaphore_Complex.h +++ /dev/null @@ -1,155 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file SV_Semaphore_Complex.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_SV_SEMAPHORE_COMPLEX_H -#define ACE_SV_SEMAPHORE_COMPLEX_H -#include "ace/pre.h" - -#include "ace/SV_Semaphore_Simple.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_SV_Semaphore_Complex - * - * @brief This is a more complex semaphore wrapper that handles race - * conditions for initialization correctly... - * - * This code is a port to C++, inspired by: W. Richard Stevens - * from his book: UNIX Network Programming (Prentice Hall, ISBN - * 0-13-949876-1 - 1990). We provide a simpler and easier to - * understand interface to the System V Semaphore system calls. - * We create and use a 2 + n-member set for the requested - * . The first member, [0], is a - * counter used to know when all processes have finished with - * the . The counter is initialized - * to a large number, decremented on every create or open and - * incremented on every close. This way we can use the "adjust" - * feature provided by System V so that any process that exit's - * without calling is accounted for. It doesn't help us - * if the last process does this (as we have no way of getting - * control to remove the ) but it - * will work if any process other than the last does an exit - * (intentional or unintentional). - * The second member, [1], of the semaphore is used as a lock - * variable to avoid any race conditions in the and - * functions. - * The members beyond [1] are actual semaphore values in the - * array of semaphores, which may be sized by the user in the - * constructor. - */ -class ACE_Export ACE_SV_Semaphore_Complex : private ACE_SV_Semaphore_Simple -{ -public: - enum - { - ACE_CREATE = IPC_CREAT, - ACE_OPEN = 0 - }; - - // = Initialization and termination methods. - ACE_SV_Semaphore_Complex (void); - ACE_SV_Semaphore_Complex (key_t key, - int create = ACE_SV_Semaphore_Complex::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - ACE_SV_Semaphore_Complex (const char *name, - int create = ACE_SV_Semaphore_Complex::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - ~ACE_SV_Semaphore_Complex (void); - - /// Open or create an array of SV_Semaphores. We return 0 if all is - /// OK, else -1. - int open (const char *name, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - - /// Open or create an array of SV_Semaphores. We return 0 if all is - /// OK, else -1. - int open (key_t key, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - - /** - * Close an ACE_SV_Semaphore. Unlike the method, this - * method is for a process to call before it exits, when it is done - * with the ACE_SV_Semaphore. We "decrement" the counter of - * processes using the ACE_SV_Semaphore, and if this was the last - * one, we can remove the ACE_SV_Semaphore. - */ - int close (void); - - // = Semaphore acquire and release methods. - - /// Acquire the semaphore. - int acquire (u_short n = 0, int flags = 0) const; - - /// Acquire a semaphore for reading. - int acquire_read (u_short n = 0, int flags = 0) const; - - /// Acquire a semaphore for writing - int acquire_write (u_short n = 0, int flags = 0) const; - - /// Try to acquire the semaphore. - int tryacquire (u_short n = 0, int flags = 0) const; - - /// Try to acquire the semaphore for reading. - int tryacquire_read (u_short n = 0, int flags = 0) const; - - /// Try to acquire the semaphore for writing. - int tryacquire_write (u_short n = 0, int flags = 0) const; - - /// Release the semaphore. - int release (u_short n = 0, int flags = 0) const; - - // = Semaphore operation methods. - int op (int val, u_short n = 0, int flags = 0) const; - int op (sembuf op_vec[], u_short n) const; - - // = Semaphore control methods. - int control (int cmd, semun arg, u_short n = 0) const; - int control (int cmd, int value = 0, u_short n = 0) const; - - // = Upgrade access control... - ACE_USING ACE_SV_Semaphore_Simple::get_id; - ACE_USING ACE_SV_Semaphore_Simple::remove; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - static const int BIGCOUNT_; - static sembuf op_lock_[2]; - static sembuf op_endcreate_[2]; - static sembuf op_open_[1]; - static sembuf op_close_[3]; - static sembuf op_unlock_[1]; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Semaphore_Complex.i" -#endif - -#include "ace/post.h" -#endif /* ACE_SV_SEMAPHORE_COMPLEX_H */ diff --git a/ace/SV_Semaphore_Complex.i b/ace/SV_Semaphore_Complex.i deleted file mode 100644 index 82ce23bbbef..00000000000 --- a/ace/SV_Semaphore_Complex.i +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SV_Semaphore_Complex.i - -#include "ace/Trace.h" - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::acquire (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire"); - return ACE_SV_Semaphore_Simple::acquire ((u_short) n + 2, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::acquire_read (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_read"); - return this->acquire (n, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::acquire_write (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_write"); - return this->acquire (n, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::tryacquire (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire"); - return ACE_SV_Semaphore_Simple::tryacquire ((u_short) n + 2, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::tryacquire_read (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_read"); - return this->tryacquire (n, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::tryacquire_write (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_write"); - return this->tryacquire (n, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::release (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::release"); - return ACE_SV_Semaphore_Simple::release ((u_short) n + 2, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::op (int val, u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::op"); - return ACE_SV_Semaphore_Simple::op (val, (u_short) n + 2, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::op (sembuf op_vec[], u_short n) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::op"); - return ACE_SV_Semaphore_Simple::op (op_vec, (u_short) n + 2); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::control (int cmd, semun arg, u_short n) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::control"); - return ACE_SV_Semaphore_Simple::control (cmd, arg, (u_short) n + 2); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Complex::control (int cmd, int value, u_short n) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Complex::control"); - return ACE_SV_Semaphore_Simple::control (cmd, value, (u_short) n + 2); -} diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp deleted file mode 100644 index b6bd6ca7386..00000000000 --- a/ace/SV_Semaphore_Simple.cpp +++ /dev/null @@ -1,212 +0,0 @@ -#include "ace/SV_Semaphore_Simple.h" -#include "ace/Log_Msg.h" -#include "ace/ACE.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Semaphore_Simple.i" -#endif - -ACE_RCSID (ace, - SV_Semaphore_Simple, - "$Id$") - -ACE_ALLOC_HOOK_DEFINE (ACE_SV_Semaphore_Simple) - - -void -ACE_SV_Semaphore_Simple::dump (void) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::dump"); -} - -int -ACE_SV_Semaphore_Simple::control (int cmd, - int value, - u_short semnum) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::control"); - if (this->internal_id_ == -1) - return -1; - else - { - semun semctl_arg; - - semctl_arg.val = value; - return ACE_OS::semctl (this->internal_id_, - semnum, - cmd, - semctl_arg); - } -} - -int -ACE_SV_Semaphore_Simple::init (key_t k, int i) -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::init"); - this->key_ = k; - this->internal_id_ = i; - return 0; -} - -// General ACE_SV_Semaphore operation. Increment or decrement by a -// specific amount (positive or negative; amount can`t be zero). - -int -ACE_SV_Semaphore_Simple::op (int val, u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::op"); - sembuf op_op; - - op_op.sem_num = n; - op_op.sem_flg = flags; - - if (this->internal_id_ == -1) - return -1; - else if ((op_op.sem_op = val) == 0) - return -1; - else - return ACE_OS::semop (this->internal_id_, &op_op, 1); -} - -// Open or create one or more SV_Semaphores. We return 0 if all is -// OK, else -1. - -int -ACE_SV_Semaphore_Simple::open (key_t k, - int flags, - int initial_value, - u_short n, - int perms) -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::open"); - union semun ivalue; - - if (k == IPC_PRIVATE || k == ACE_static_cast (key_t, ACE_INVALID_SEM_KEY)) - return -1; - - ivalue.val = initial_value; - this->key_ = k; - this->sem_number_ = n; - - this->internal_id_ = ACE_OS::semget (this->key_, n, perms | flags); - - if (this->internal_id_ == -1) - return -1; - - if (ACE_BIT_ENABLED (flags, IPC_CREAT)) - for (int i = 0; i < n; i++) - if (ACE_OS::semctl (this->internal_id_, i, SETVAL, ivalue) == -1) - return -1; - - return 0; -} - -ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k, - int flags, - int initial_value, - u_short n, - int perms) - : key_ (k) -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"); - if (this->open (k, flags, initial_value, n, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore"))); -} - -// Convert name to key. This function is used internally to create keys -// for the semaphores. -// -// The method for generating names is a 32 bit CRC, but still we -// measured close to collition ratio of nearly 0.1% for -// ACE::unique_name()-like strings. - -key_t -ACE_SV_Semaphore_Simple::name_2_key (const char *name) -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::name_2_key"); - - if (name == 0) - { - errno = EINVAL; - return ACE_static_cast (key_t, ACE_INVALID_SEM_KEY); - } - - // Basically "hash" the values in the . This won't - // necessarily guarantee uniqueness of all keys. - // But (IMHO) CRC32 is good enough for most purposes (Carlos) -#if defined (ACE_WIN64) - // The cast below is legit... -# pragma warning(push) -# pragma warning(disable : 4312) -#endif /* ACE_WIN64 */ - return (key_t) ACE::crc32 (name); -#if defined (ACE_WIN64) -# pragma warning(pop) -#endif /* ACE_WIN64 */ -} - -// Open or create a ACE_SV_Semaphore. We return 1 if all is OK, else -// 0. - -int -ACE_SV_Semaphore_Simple::open (const char *name, - int flags, - int initial_value, - u_short n, - int perms) -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::open"); - - key_t key; - - if (name == 0) - key = ACE_DEFAULT_SEM_KEY; - else - key = this->name_2_key (name); - - return this->open (key, flags, initial_value, n, perms); -} - -ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, - int flags, - int initial_value, - u_short n, - int perms) -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"); - if (this->open (name, - flags, - initial_value, - n, - perms) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); -} - -ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void) -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple"); - this->close (); -} - -ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (void) -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"); - this->init (); -} - -// Remove all SV_Semaphores associated with a particular key. This -// call is intended to be called from a server, for example, when it -// is being shut down, as we do an IPC_RMID on the ACE_SV_Semaphore, -// regardless of whether other processes may be using it or not. Most -// other processes should use close() below. - -int -ACE_SV_Semaphore_Simple::remove (void) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::remove"); - int result = this->control (IPC_RMID); - ((ACE_SV_Semaphore_Simple *) this)->init (); - return result; -} diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h deleted file mode 100644 index 34cfdd179a0..00000000000 --- a/ace/SV_Semaphore_Simple.h +++ /dev/null @@ -1,162 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file SV_Semaphore_Simple.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//========================================================================== - -#ifndef ACE_SV_SEMAPHORE_SIMPLE_H -#define ACE_SV_SEMAPHORE_SIMPLE_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -/** - * @class ACE_SV_Semaphore_Simple - * - * @brief This is a simple semaphore package that assumes there are - * no race conditions for initialization (i.e., the order of - * process startup must be well defined). - */ -class ACE_Export ACE_SV_Semaphore_Simple -{ -public: - enum - { - ACE_CREATE = IPC_CREAT, - ACE_EXCL = IPC_EXCL, - ACE_OPEN = 0 - }; - - // = Initialization and termination methods. - ACE_SV_Semaphore_Simple (void); - ACE_SV_Semaphore_Simple (key_t key, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - ACE_SV_Semaphore_Simple (const char *name, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - ~ACE_SV_Semaphore_Simple (void); - - int open (const char *name, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - - /// Open or create one or more SV_Semaphores. We return 0 if all is - /// OK, else -1. - int open (key_t key, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - - /// Close a ACE_SV_Semaphore, marking it as invalid for subsequent - /// operations... - int close (void); - - /** - * Remove all SV_Semaphores associated with a particular key. This - * call is intended to be called from a server, for example, when it - * is being shut down, as we do an IPC_RMID on the ACE_SV_Semaphore, - * regardless of whether other processes may be using it or not. - * Most other processes should use below. - */ - int remove (void) const; - - // = Semaphore acquire and release methods. - /** - * Wait until a ACE_SV_Semaphore's value is greater than 0, the - * decrement it by 1 and return. Dijkstra's P operation, Tannenbaums - * DOWN operation. - */ - int acquire (u_short n = 0, int flags = 0) const; - - /// Acquire a semaphore for reading. - int acquire_read (u_short n = 0, int flags = 0) const; - - /// Acquire a semaphore for writing - int acquire_write (u_short n = 0, int flags = 0) const; - - /// Non-blocking version of . - int tryacquire (u_short n = 0, int flags = 0) const; - - /// Try to acquire the semaphore for reading. - int tryacquire_read (u_short n = 0, int flags = 0) const; - - /// Try to acquire the semaphore for writing. - int tryacquire_write (u_short n = 0, int flags = 0) const; - - /// Increment ACE_SV_Semaphore by one. Dijkstra's V operation, - /// Tannenbaums UP operation. - int release (u_short n = 0, int flags = 0) const; - - // = Semaphore operation methods. - /// General ACE_SV_Semaphore operation. Increment or decrement by a - /// specific amount (positive or negative; amount can`t be zero). - int op (int val, u_short semnum = 0, int flags = SEM_UNDO) const; - - /// General ACE_SV_Semaphore operation on an array of SV_Semaphores. - int op (sembuf op_vec[], u_short nsems) const; - - // = Semaphore control methods. - int control (int cmd, semun arg, u_short n = 0) const; - int control (int cmd, int value = 0, u_short n = 0) const; - - /// Get underlying internal id. - int get_id (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Semaphore key. - key_t key_; - - /// Internal ID to identify the semaphore group within this process. - int internal_id_; - - /// Number of semaphores we're creating. - int sem_number_; - - /** - * Convert name to key This function is used internally to create - * keys for the semaphores. A valid name contains letters and - * digits only and MUST start with a letter. - * - * The method for generating names is not very sophisticated, so - * caller should not pass strings which match each other for the first - * LUSED characters when he wants to get a different key. - */ - int init (key_t k = ACE_static_cast (key_t, ACE_INVALID_SEM_KEY), - int i = -1); - key_t name_2_key (const char *name); -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SV_Semaphore_Simple.i" -#endif - -#include "ace/post.h" - -#endif /* _SV_SEMAPHORE_SIMPLE_H */ diff --git a/ace/SV_Semaphore_Simple.i b/ace/SV_Semaphore_Simple.i deleted file mode 100644 index e18acd95a84..00000000000 --- a/ace/SV_Semaphore_Simple.i +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SV_Semaphore_Simple.i - -#include "ace/Trace.h" - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::control (int cmd, - semun arg, - u_short n) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::control"); - return this->internal_id_ == -1 ? - -1 : ACE_OS::semctl (this->internal_id_, n, cmd, arg); -} - -// Close a ACE_SV_Semaphore, marking it as invalid for subsequent -// operations... - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::close (void) -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::close"); - return this->init (); -} - -// General ACE_SV_Semaphore operation on an array of SV_Semaphores. - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::op (sembuf op_vec[], u_short n) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::op"); - return this->internal_id_ == -1 - ? -1 : ACE_OS::semop (this->internal_id_, op_vec, n); -} - -// Wait until a ACE_SV_Semaphore's value is greater than 0, the -// decrement it by 1 and return. Dijkstra's P operation, Tannenbaums -// DOWN operation. - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::acquire (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire"); - return this->op (-1, n, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::acquire_read (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_read"); - return this->acquire (n, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::acquire_write (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_write"); - return this->acquire (n, flags); -} - -// Non-blocking version of acquire(). - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::tryacquire (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire"); - return this->op (-1, n, flags | IPC_NOWAIT); -} - -// Non-blocking version of acquire(). - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::tryacquire_read (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_read"); - return this->tryacquire (n, flags); -} - -// Non-blocking version of acquire(). - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::tryacquire_write (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_write"); - return this->tryacquire (n, flags); -} - -// Increment ACE_SV_Semaphore by one. Dijkstra's V operation, -// Tannenbaums UP operation. - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::release (u_short n, int flags) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::release"); - return this->op (1, n, flags); -} - -ASYS_INLINE int -ACE_SV_Semaphore_Simple::get_id (void) const -{ - ACE_TRACE ("ACE_SV_Semaphore_Simple::get_id"); - return this->internal_id_; -} - diff --git a/ace/SV_Shared_Memory.cpp b/ace/SV_Shared_Memory.cpp deleted file mode 100644 index dfa73d99c67..00000000000 --- a/ace/SV_Shared_Memory.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// SV_Shared_Memory.cpp -// $Id$ - -#include "ace/SV_Shared_Memory.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/SV_Shared_Memory.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, SV_Shared_Memory, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_SV_Shared_Memory) - -void -ACE_SV_Shared_Memory::dump (void) const -{ - ACE_TRACE ("ACE_SV_Shared_Memory::dump"); -} - -// Creates a shared memory segment of SIZE bytes and *does* attach to -// this segment. - -int -ACE_SV_Shared_Memory::open_and_attach (key_t external_id, - size_t sz, - int create, - int perms, - void *virtual_addr, - int flags) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::open_and_attach"); - if (this->open (external_id, sz, create, perms) == -1) - return -1; - else if (this->attach (virtual_addr, flags) == -1) - return -1; - else - return 0; -} - -// Constructor interface to this->open_and_attach () member function. - -ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id, - size_t sz, - int create, - int perms, - void *virtual_addr, - int flags) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); - if (this->open_and_attach (external_id, sz, create, - perms, virtual_addr, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); -} - -// The "do nothing" constructor. - -ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (void) - : internal_id_ (0), - size_ (0), - segment_ptr_ (0) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); -} - -// Added this constructor to accept an internal id, the one generated -// when a server constructs with the key IPC_PRIVATE. The client can -// be passed ACE_SV_Shared_Memory::internal_id via a socket and call -// this construtor to attach the existing segment. This prevents -// having to hard-code a key in advance. Courtesy of Marvin Wolfthal -// (maw@fsg.com). - -ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id, - int flags) - : internal_id_ (int_id), - size_ (0) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); - if (this->attach (0, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); -} diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h deleted file mode 100644 index c66823c85ae..00000000000 --- a/ace/SV_Shared_Memory.h +++ /dev/null @@ -1,116 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file SV_Shared_Memory.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//========================================================================== - -#ifndef ACE_SV_SHARED_MEMORY_H -#define ACE_SV_SHARED_MEMORY_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -/** - * @class ACE_SV_Shared_Memory - * - * @brief This is a wrapper for System V shared memory. - */ -class ACE_Export ACE_SV_Shared_Memory -{ -public: - enum - { - ACE_CREATE = IPC_CREAT, - ACE_OPEN = 0 - }; - - // = Initialization and termination methods. - ACE_SV_Shared_Memory (void); - ACE_SV_Shared_Memory (key_t external_id, - size_t size, - int create, - int perms = ACE_DEFAULT_FILE_PERMS, - void *virtual_addr = 0, - int flags = 0); - - ACE_SV_Shared_Memory (ACE_HANDLE internal_id, - int flags = 0); - - int open (key_t external_id, - size_t size, - int create = ACE_SV_Shared_Memory::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); - - int open_and_attach (key_t external_id, - size_t size, - int create = ACE_SV_Shared_Memory::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS, - void *virtual_addr = 0, - int flags = 0); - - /// Attach this shared memory segment. - int attach (void *virtual_addr = 0, - int flags =0); - - /// Detach this shared memory segment. - int detach (void); - - /// Remove this shared memory segment. - int remove (void); - - /// Forward to underlying System V . - int control (int cmd, void *buf); - - // = Segment-related info. - void *get_segment_ptr (void) const; - size_t get_segment_size (void) const; - - /// Return the ID of the shared memory segment (i.e., an ACE_HANDLE). - ACE_HANDLE get_id (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - enum - { - /// Most restrictive alignment. - ALIGN_WORDB = 8 - }; - - /// Internal identifier. - ACE_HANDLE internal_id_; - - /// Size of the mapped segment. - size_t size_; - - /// Pointer to the beginning of the segment. - void *segment_ptr_; - - /// Round up to an appropriate page size. - size_t round_up (size_t len); -}; - -#if defined (__ACE_INLINE__) -#include "ace/SV_Shared_Memory.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_SV_SHARED_MEMORY_H */ diff --git a/ace/SV_Shared_Memory.i b/ace/SV_Shared_Memory.i deleted file mode 100644 index 3e7bf1db6ef..00000000000 --- a/ace/SV_Shared_Memory.i +++ /dev/null @@ -1,114 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// SV_Shared_Memory.i - -#include "ace/SV_Shared_Memory.h" - -ACE_INLINE size_t -ACE_SV_Shared_Memory::round_up (size_t len) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::round_up"); - return (len + ACE_SV_Shared_Memory::ALIGN_WORDB - 1) & ~(ACE_SV_Shared_Memory::ALIGN_WORDB - 1); -} - -// Creates a shared memory segment of SIZE bytes. Does *not* attach -// this memory segment... - -ACE_INLINE int -ACE_SV_Shared_Memory::open (key_t external_id, size_t sz, int create, int perms) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::open"); -#if defined (ACE_WIN32) - ACE_UNUSED_ARG(perms); - ACE_UNUSED_ARG(create); - ACE_UNUSED_ARG(sz); - ACE_UNUSED_ARG(external_id); - ACE_NOTSUP_RETURN (-1); -#else - this->segment_ptr_ = 0; - this->size_ = sz; - - this->internal_id_ = ACE_OS::shmget (external_id, sz, create | perms); - - return this->internal_id_ == -1 ? -1 : 0; -#endif /* ACE_WIN32 */ -} - -// Attachs to the shared memory segment. - -ACE_INLINE int -ACE_SV_Shared_Memory::attach (void *virtual_addr, int flags) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::attach"); -#if defined (ACE_WIN32) - ACE_UNUSED_ARG(flags); - ACE_UNUSED_ARG(virtual_addr); - ACE_NOTSUP_RETURN (-1); -#else - this->segment_ptr_ = ACE_OS::shmat (this->internal_id_, virtual_addr, flags); - return this->segment_ptr_ == (void *) -1 ? -1 : 0; -#endif /* ACE_WIN32 */ -} - -// Interface to the underlying shared memory control function. - -ACE_INLINE int -ACE_SV_Shared_Memory::control (int cmd, void *buf) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::control"); -#if defined (ACE_WIN32) - ACE_UNUSED_ARG(cmd); - ACE_UNUSED_ARG(buf); - - ACE_NOTSUP_RETURN (-1); -#else - return ACE_OS::shmctl (this->internal_id_, cmd, (struct shmid_ds *) buf); -#endif /* ACE_WIN32 */ -} - -// The overall size of the segment. - -ACE_INLINE size_t -ACE_SV_Shared_Memory::get_segment_size (void) const -{ - ACE_TRACE ("ACE_SV_Shared_Memory::get_segment_size"); - return this->size_; -} - -// Removes the shared memory segment. - -ACE_INLINE int -ACE_SV_Shared_Memory::remove (void) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::remove"); -#if defined (ACE_WIN32) - ACE_NOTSUP_RETURN (-1); -#else - return ACE_OS::shmctl (this->internal_id_, IPC_RMID, 0); -#endif /* ACE_WIN32 */ -} - -// Detach the current binding between this->segment_ptr and the shared -// memory segment. - -ACE_INLINE int -ACE_SV_Shared_Memory::detach (void) -{ - ACE_TRACE ("ACE_SV_Shared_Memory::detach"); - return ACE_OS::shmdt (this->segment_ptr_); -} - -ACE_INLINE void * -ACE_SV_Shared_Memory::get_segment_ptr (void) const -{ - ACE_TRACE ("ACE_SV_Shared_Memory::get_segment_ptr"); - return this->segment_ptr_; -} - -ACE_INLINE ACE_HANDLE -ACE_SV_Shared_Memory::get_id (void) const -{ - ACE_TRACE ("ACE_SV_Shared_Memory::get_id"); - return this->internal_id_; -} diff --git a/ace/Sample_History.cpp b/ace/Sample_History.cpp deleted file mode 100644 index 38bc4507776..00000000000 --- a/ace/Sample_History.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// $Id$ - -#include "ace/Sample_History.h" -#include "ace/Basic_Stats.h" -#include "ace/Log_Msg.h" -#include "ace/OS.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Sample_History.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Sample_History, "$Id$") - -ACE_Sample_History::ACE_Sample_History (size_t max_samples) - : max_samples_ (max_samples) - , sample_count_ (0) -{ - ACE_NEW(this->samples_, ACE_UINT64[this->max_samples_]); -} - -ACE_Sample_History::~ACE_Sample_History (void) -{ - delete[] this->samples_; -} - -size_t -ACE_Sample_History::max_samples (void) const -{ - return this->max_samples_; -} - -size_t -ACE_Sample_History::sample_count (void) const -{ - return this->sample_count_; -} - -void -ACE_Sample_History::dump_samples (const ACE_TCHAR *msg, - ACE_UINT32 scale_factor) const -{ - for (size_t i = 0; i != this->sample_count_; ++i) - { - ACE_UINT64 x = this->samples_[i] / scale_factor; - ACE_UINT32 val = ACE_CU64_TO_CU32 (x); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s: %d %u\n"), msg, i, val)); - } -} - -void -ACE_Sample_History::collect_basic_stats (ACE_Basic_Stats &stats) const -{ - for (size_t i = 0; i != this->sample_count_; ++i) - { - stats.sample (this->samples_[i]); - } -} diff --git a/ace/Sample_History.h b/ace/Sample_History.h deleted file mode 100644 index d2b0d03d929..00000000000 --- a/ace/Sample_History.h +++ /dev/null @@ -1,86 +0,0 @@ - -//============================================================================= -/** - * @file Sample_History.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ -//============================================================================= - - -#ifndef ACE_SAMPLE_HISTORY_H -#define ACE_SAMPLE_HISTORY_H -#include "ace/pre.h" - -#include "ace/config-all.h" -#include "ace/Basic_Types.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_Basic_Stats; - -/// Save multiple samples in an array -/** - * Save multiple samples (usually latency numbers), into an array, and - * later print them in several formats. - */ -class ACE_Export ACE_Sample_History -{ -public: - /// Constructor - /** - * The number of samples is pre-allocated, and cannot changes once - * the class is initialized. - */ - ACE_Sample_History (size_t max_samples); - - /// Destructor - ~ACE_Sample_History (void); - - /// Record one sample. - /** - * Return 0 on success, -1 if the sample could not be stored - */ - int sample (ACE_UINT64 value); - - /// Returns the maximum number of samples - size_t max_samples (void) const; - - /// Returns the current number of samples - size_t sample_count (void) const; - - /// Dump all the samples - /** - * Prints out all the samples, using @a msg as a prefix for each - * message. - */ - void dump_samples (const ACE_TCHAR *msg, - ACE_UINT32 scale_factor) const; - - /// Collect the summary for all the samples - void collect_basic_stats (ACE_Basic_Stats &) const; - - /// Get a sample - ACE_UINT64 get_sample (size_t i) const; - -private: - /// The maximum number of samples - size_t max_samples_; - - /// The current number of samples - size_t sample_count_; - - /// The samples - ACE_UINT64 *samples_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Sample_History.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_SAMPLE_HISTORY_H */ diff --git a/ace/Sample_History.inl b/ace/Sample_History.inl deleted file mode 100644 index e3882a28bc3..00000000000 --- a/ace/Sample_History.inl +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ - -ACE_INLINE int -ACE_Sample_History::sample (ACE_UINT64 value) -{ - if (this->sample_count_ >= this->max_samples_) - return -1; - - this->samples_[this->sample_count_++] = value; - return 0; -} - -ACE_INLINE ACE_UINT64 -ACE_Sample_History::get_sample (size_t i) const -{ - if (this->sample_count_ <= i) - return 0; - - return this->samples_[i]; -} diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp deleted file mode 100644 index 0dd45f79fd1..00000000000 --- a/ace/Sched_Params.cpp +++ /dev/null @@ -1,321 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ACE -// -// = FILENAME -// Sched_Params.cpp -// -// = CREATION DATE -// 28 January 1997 -// -// = AUTHOR -// David Levine -// -// ============================================================================ - -#include "ace/Sched_Params.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Sched_Params.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Sched_Params, "$Id$") - -int -ACE_Sched_Params::priority_min (const Policy policy, - const int scope) -{ -#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (scope); - - // Assume that ACE_SCHED_OTHER indicates TS class, and that other - // policies indicate RT class. - - // Call ACE_OS::priority_control only for processes (lightweight - // or otherwise). Calling ACE_OS::priority_control for thread - // priorities gives incorrect results. - if (scope == ACE_SCOPE_PROCESS || scope == ACE_SCOPE_LWP) - { - if (policy == ACE_SCHED_OTHER) - { - // Get the priority class ID and attributes. - pcinfo_t pcinfo; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcinfo, 0, sizeof pcinfo); - ACE_OS::strcpy (pcinfo.pc_clname, "TS"); - - if (ACE_OS::priority_control (P_ALL /* ignored */, - P_MYID /* ignored */, - PC_GETCID, - (char *) &pcinfo) == -1) - // Just hope that priority range wasn't configured from -1 - // .. 1 - return -1; - - // OK, now we've got the class ID in pcinfo.pc_cid. In - // addition, the maximum configured time-share priority is in - // ((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri. The minimum - // priority is just the negative of that. - - return -((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri; - } - else - return 0; - } - else - { - // Here we handle the case for ACE_SCOPE_THREAD. Calling - // ACE_OS::priority_control for thread scope gives incorrect - // results. - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_THR_PRI_FIFO_MIN; - case ACE_SCHED_RR: - return ACE_THR_PRI_RR_MIN; - case ACE_SCHED_OTHER: - default: - return ACE_THR_PRI_OTHER_MIN; - } - } -#elif defined (ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED) - - switch (scope) - { - case ACE_SCOPE_THREAD: - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_THR_PRI_FIFO_MIN; - case ACE_SCHED_RR: - return ACE_THR_PRI_RR_MIN; -#if !defined (CHORUS) // SCHED_OTHRE and SCHED_RR have same value - case ACE_SCHED_OTHER: -#endif /* CHORUS */ - default: - return ACE_THR_PRI_OTHER_MIN; - } - - case ACE_SCOPE_PROCESS: - default: - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_PROC_PRI_FIFO_MIN; - case ACE_SCHED_RR: - return ACE_PROC_PRI_RR_MIN; -#if !defined (CHORUS) // SCHED_OTHRE and SCHED_RR have same value - case ACE_SCHED_OTHER: -#endif /* CHORUS */ - default: - return ACE_PROC_PRI_OTHER_MIN; - } - } - -#elif defined (ACE_HAS_WTHREADS) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - return THREAD_PRIORITY_IDLE; -#elif defined (VXWORKS) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - return 255; -#else - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PRIOCNTL && defined (ACE_HAS_STHREADS) */ -} - -int -ACE_Sched_Params::priority_max (const Policy policy, - const int scope) -{ -#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (scope); - - // Call ACE_OS::priority_control only for processes (lightweight - // or otherwise). Calling ACE_OS::priority_control for thread - // priorities gives incorrect results. - if (scope == ACE_SCOPE_PROCESS || scope == ACE_SCOPE_LWP) - { - // Assume that ACE_SCHED_OTHER indicates TS class, and that other - // policies indicate RT class. - - // Get the priority class ID and attributes. - pcinfo_t pcinfo; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcinfo, 0, sizeof pcinfo); - ACE_OS::strcpy (pcinfo.pc_clname, - policy == ACE_SCHED_OTHER ? "TS" : "RT"); - - if (ACE_OS::priority_control (P_ALL /* ignored */, - P_MYID /* ignored */, - PC_GETCID, - (char *) &pcinfo) == -1) - return -1; - - // OK, now we've got the class ID in pcinfo.pc_cid. In addition, - // the maximum configured real-time priority is in ((rtinfo_t *) - // pcinfo.pc_clinfo)->rt_maxpri, or similarly for the TS class. - - return policy == ACE_SCHED_OTHER - ? ((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri - : ((rtinfo_t *) pcinfo.pc_clinfo)->rt_maxpri; - } - else - { - // Here we handle the case for ACE_SCOPE_THREAD. Calling - // ACE_OS::priority_control for thread scope gives incorrect - // results. - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_THR_PRI_FIFO_MAX; - case ACE_SCHED_RR: - return ACE_THR_PRI_RR_MAX; - case ACE_SCHED_OTHER: - default: - return ACE_THR_PRI_OTHER_MAX; - } - } -#elif defined(ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED) - - switch (scope) - { - case ACE_SCOPE_THREAD: - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_THR_PRI_FIFO_MAX; - case ACE_SCHED_RR: - return ACE_THR_PRI_RR_MAX; -#if !defined (CHORUS) // SCHED_OTHRE and SCHED_RR have same value - case ACE_SCHED_OTHER: -#endif /* CHORUS */ - default: - return ACE_THR_PRI_OTHER_MAX; - } - - case ACE_SCOPE_PROCESS: - default: - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_PROC_PRI_FIFO_MAX; - case ACE_SCHED_RR: - return ACE_PROC_PRI_RR_MAX; -#if !defined (CHORUS) // SCHED_OTHRE and SCHED_RR have same value - case ACE_SCHED_OTHER: -#endif /* CHORUS */ - default: - return ACE_PROC_PRI_OTHER_MAX; - } - } - -#elif defined (ACE_HAS_WTHREADS) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - return THREAD_PRIORITY_TIME_CRITICAL; -#elif defined (VXWORKS) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - return 0; -#else - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PRIOCNTL && defined (ACE_HAS_STHREADS) */ -} - -int -ACE_Sched_Params::next_priority (const Policy policy, - const int priority, - const int scope) -{ -#if defined (VXWORKS) - return priority > priority_max (policy, scope) - ? priority - 1 - : priority_max (policy, scope); -#elif defined (ACE_HAS_WTHREADS) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - switch (priority) - { - case THREAD_PRIORITY_IDLE: - return THREAD_PRIORITY_LOWEST; - case THREAD_PRIORITY_LOWEST: - return THREAD_PRIORITY_BELOW_NORMAL; - case THREAD_PRIORITY_BELOW_NORMAL: - return THREAD_PRIORITY_NORMAL; - case THREAD_PRIORITY_NORMAL: - return THREAD_PRIORITY_ABOVE_NORMAL; - case THREAD_PRIORITY_ABOVE_NORMAL: - return THREAD_PRIORITY_HIGHEST; - case THREAD_PRIORITY_HIGHEST: - return THREAD_PRIORITY_TIME_CRITICAL; - case THREAD_PRIORITY_TIME_CRITICAL: - return THREAD_PRIORITY_TIME_CRITICAL; - default: - return priority; // unknown priority: should never get here - } -#elif defined(ACE_HAS_THREADS) && !defined(ACE_LACKS_SETSCHED) - // including STHREADS, and PTHREADS - const int max = priority_max (policy, scope); - return priority < max ? priority + 1 : max; -#else - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - ACE_UNUSED_ARG (priority); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_THREADS */ -} - -int -ACE_Sched_Params::previous_priority (const Policy policy, - const int priority, - const int scope) -{ -#if defined (VXWORKS) - return priority < priority_min (policy, scope) - ? priority + 1 - : priority_min (policy, scope); -#elif defined (ACE_HAS_WTHREADS) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - switch (priority) - { - case THREAD_PRIORITY_IDLE: - return THREAD_PRIORITY_IDLE; - case THREAD_PRIORITY_LOWEST: - return THREAD_PRIORITY_IDLE; - case THREAD_PRIORITY_BELOW_NORMAL: - return THREAD_PRIORITY_LOWEST; - case THREAD_PRIORITY_NORMAL: - return THREAD_PRIORITY_BELOW_NORMAL; - case THREAD_PRIORITY_ABOVE_NORMAL: - return THREAD_PRIORITY_NORMAL; - case THREAD_PRIORITY_HIGHEST: - return THREAD_PRIORITY_ABOVE_NORMAL; - case THREAD_PRIORITY_TIME_CRITICAL: - return THREAD_PRIORITY_HIGHEST; - default: - return priority; // unknown priority: should never get here - } -#elif defined (ACE_HAS_THREADS) && !defined(ACE_LACKS_SETSCHED) - // including STHREADS and PTHREADS - const int min = priority_min (policy, scope); - - return priority > min ? priority - 1 : min; -#else - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - ACE_UNUSED_ARG (priority); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_THREADS */ -} diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h deleted file mode 100644 index deef4a50eb1..00000000000 --- a/ace/Sched_Params.h +++ /dev/null @@ -1,225 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Sched_Params.h - * - * $Id$ - * - * @author David Levine - * @author Carlos O'Ryan - */ -//============================================================================= - -#ifndef ACE_SCHED_PARAMS_H -#define ACE_SCHED_PARAMS_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Sched_Params - * - * @brief Container for scheduling-related parameters. - * - * ACE_Sched_Params are passed via to the - * OS to specify scheduling parameters. These parameters include - * scheduling policy, such as FIFO (ACE_SCHED_FIFO), round-robin - * (ACE_SCHED_RR), or an implementation-defined "OTHER" - * (ACE_SCHED_OTHER), to which many systems default; priority; - * and a time-slice quantum for round-robin scheduling. A - * "scope" parameter specifies whether the ACE_Sched_Params - * applies to the current process, current lightweight process - * (LWP) (on Solaris), or current thread. Please see the "NOTE" - * below about not all combinations of parameters being legal on - * a particular platform. - * For the case of thread priorities, it is intended that - * usually be called from
    before - * any threads have been spawned. If spawned threads inherit - * their parent's priority (I think that's the default behavior - * for all of our platforms), then this sets the default base - * priority. Individual thread priorities can be adjusted as - * usual using or via the ACE_Thread - * interface. See the parameter descriptions in the private: - * section below. - * NOTE: this class does not do any checking of parameters. It - * is just a container class. If it is constructed with values - * that are not supported on a platform, the call to - * will fail by returning -1 with EINVAL - * (available through ). - */ -class ACE_Export ACE_Sched_Params -{ - // NOTE: Solaris 2.5.x threads in the RT class must set the - // priority of their LWP. The only way to do that through ACE is - // for the RT thread itself to call with - // it's own priority. - - // OS Scheduling parameters are complicated and often confusing. - // Many thanks to Thilo Kielmann - // for his careful review of - // this class design, thoughtful comments, and assistance with - // implementation, especially for PTHREADS platforms. Please - // send any comments or corrections to the ACE developers. -public: - typedef int Policy; - - // = Initialization and termination methods. - /// Constructor. - ACE_Sched_Params (const Policy policy, - const ACE_Sched_Priority priority, - const int scope = ACE_SCOPE_THREAD, - const ACE_Time_Value &quantum = ACE_Time_Value::zero); - - /// Termination. - ~ACE_Sched_Params (void); - - // = Get/Set methods: - - // = Get/Set policy - Policy policy (void) const; - void policy (const Policy); - - // = Get/Set priority. - ACE_Sched_Priority priority (void) const; - void priority (const ACE_Sched_Priority); - - // = Get/Set scope. - int scope (void) const; - void scope(const int); - - // = Get/Set quantum. - const ACE_Time_Value &quantum (void) const; - void quantum (const ACE_Time_Value &); - - // = Accessors for OS-specific priorities. - // These return priority values for ACE_SCHED_OTHER if the Policy value - // is invalid. - static int priority_min (const Policy, - const int scope = ACE_SCOPE_THREAD); - static int priority_max (const Policy, - const int scope = ACE_SCOPE_THREAD); - - /** - * The next higher priority. "Higher" refers to scheduling priority, - * not to the priority value itself. (On some platforms, higher scheduling - * priority is indicated by a lower priority value.) If "priority" is - * already the highest priority (for the specified policy), then it is - * returned. - */ - static int next_priority (const Policy, - const int priority, - const int scope = ACE_SCOPE_THREAD); - - /** - * The previous, lower priority. "Lower" refers to scheduling priority, - * not to the priority value itself. (On some platforms, lower scheduling - * priority is indicated by a higher priority value.) If "priority" is - * already the lowest priority (for the specified policy), then it is - * returned. - */ - static int previous_priority (const Policy, - const int priority, - const int scope = ACE_SCOPE_THREAD); - -private: - /// Scheduling policy. - Policy policy_; - - /// Default : for setting the priority for the process, LWP, - /// or thread, as indicated by the scope_ parameter. - ACE_Sched_Priority priority_; - - /** - * must be one of the following: - * ACE_SCOPE_PROCESS: sets the scheduling policy for the - * process, and the process priority. On some platforms, - * such as Win32, the scheduling policy can _only_ be - * set at process scope. - * ACE_SCOPE_LWP: lightweight process scope, only used with - * Solaris threads. - * ACE_SCOPE_THREAD: sets the scheduling policy for the thread, - * if the OS supports it, such as with Posix threads, and the - * thread priority. - * NOTE: I don't think that these are the same as POSIX - * contention scope. POSIX users who are interested in, - * and understand, contention scope will have to set it - * by using system calls outside of ACE. - */ - int scope_; - - /** - * The is for time slicing. An ACE_Time_Value of 0 has - * special significance: it means time-slicing is disabled; with - * that, a thread that is running on a CPU will continue to run - * until it blocks or is preempted. Currently ignored if the OS - * doesn't directly support time slicing, such as on VxWorks, or - * setting the quantum (can that be done on Win32?). - */ - ACE_Time_Value quantum_; -}; - -/** - * @class ACE_Sched_Priority_Iterator - * - * @brief An iterator over the OS-defined scheduling priorities. - * - * The order of priorities (numeric value vs. importance) is OS - * dependant, it can be the case that the priorities are not even - * contigous. This class permits iteration over priorities using - * the iterator pattern. - */ -class ACE_Export ACE_Sched_Priority_Iterator -{ -public: - /// Initialize the iterator, the arguments define the scheduling - /// policy and scope for the priorities (see ACE_Sched_Param). - ACE_Sched_Priority_Iterator (const ACE_Sched_Params::Policy &policy, - int scope = ACE_SCOPE_THREAD); - - /// Default dtor. - ~ACE_Sched_Priority_Iterator (void); - - /// Check if there are more priorities. - int more (void) const; - - /// Return the current priority. - int priority (void) const; - - /// Move to the next priority. - /// The iteration is from lowest to highest importance. - void next (void); - - /// Accessor for the scheduling policy over which we are iterating. - const ACE_Sched_Params::Policy &policy (void) const; - - /// Accessor for the scheduling - int scope (void) const; - -private: - /// The Scheduling policy (FIFO, RR, etc.) and scheduling scope - /// (PROCESS, SYSTEM) we are iterating on. - ACE_Sched_Params::Policy policy_; - int scope_; - - /// The current priority. - int priority_; - - /** - * This is set to 1 when there are no more priorities. Cannot easily - * compare against the highest priority on platforms were priorities - * are non-contigous or descending. - */ - int done_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Sched_Params.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_SCHED_PARAMS_H */ diff --git a/ace/Sched_Params.i b/ace/Sched_Params.i deleted file mode 100644 index 041f9cb1648..00000000000 --- a/ace/Sched_Params.i +++ /dev/null @@ -1,136 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ACE -// -// = FILENAME -// Sched_Params.i -// -// = CREATION DATE -// 28 January 1997 -// -// = AUTHOR -// David Levine -// -// ============================================================================ - -ACE_INLINE -ACE_Sched_Params::ACE_Sched_Params ( - const Policy policy, - const ACE_Sched_Priority priority, - const int scope, - const ACE_Time_Value &quantum) - : policy_ (policy), - priority_ (priority), - scope_ (scope), - quantum_ (quantum) -{ -} - -ACE_INLINE ACE_Sched_Params::~ACE_Sched_Params (void) -{ -} - -ACE_INLINE ACE_Sched_Params::Policy -ACE_Sched_Params::policy (void) const -{ - return this->policy_; -} - -ACE_INLINE void -ACE_Sched_Params::policy (const ACE_Sched_Params::Policy policy) -{ - this->policy_ = policy; -} - -ACE_INLINE ACE_Sched_Priority -ACE_Sched_Params::priority (void) const -{ - return this->priority_; -} - -ACE_INLINE void -ACE_Sched_Params::priority (const ACE_Sched_Priority priority) -{ - this->priority_ = priority; -} - -ACE_INLINE int -ACE_Sched_Params::scope (void) const -{ - return this->scope_; -} - -ACE_INLINE void -ACE_Sched_Params::scope (const int scope) -{ - this->scope_ = scope; -} - -ACE_INLINE const ACE_Time_Value & -ACE_Sched_Params::quantum (void) const -{ - return this->quantum_; -} - -ACE_INLINE void -ACE_Sched_Params::quantum (const ACE_Time_Value &quant) -{ - this->quantum_ = quant; -} - -ACE_INLINE const ACE_Sched_Params::Policy & -ACE_Sched_Priority_Iterator::policy (void) const -{ - return this->policy_; -} - -ACE_INLINE int -ACE_Sched_Priority_Iterator::scope (void) const -{ - return this->scope_; -} - -ACE_INLINE -ACE_Sched_Priority_Iterator::ACE_Sched_Priority_Iterator (const ACE_Sched_Params::Policy &policy, - int scope) - : policy_ (policy), - scope_ (scope), - priority_ (0), - done_ (0) -{ - priority_ = ACE_Sched_Params::priority_min (this->policy (), this->scope ()); -} - -ACE_INLINE -ACE_Sched_Priority_Iterator::~ACE_Sched_Priority_Iterator (void) -{ -} - -ACE_INLINE int -ACE_Sched_Priority_Iterator::more (void) const -{ - return !this->done_; -} - -ACE_INLINE int -ACE_Sched_Priority_Iterator::priority (void) const -{ - return this->priority_; -} - -ACE_INLINE void -ACE_Sched_Priority_Iterator::next (void) -{ - if (this->done_) - return; - - int old_priority = this->priority_; - priority_ = ACE_Sched_Params::next_priority (this->policy (), - this->priority (), - this->scope ()); - this->done_ = old_priority == priority_; -} diff --git a/ace/Select_Reactor.cpp b/ace/Select_Reactor.cpp deleted file mode 100644 index 168b2cc969b..00000000000 --- a/ace/Select_Reactor.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// $Id$ - -#include "ace/Select_Reactor.h" - -ACE_RCSID(ace, Select_Reactor, "$Id$") - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -template class ACE_Select_Reactor_Token_T; -template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T >; -template class ACE_Lock_Adapter< ACE_Select_Reactor_Token_T >; -template class ACE_Guard< ACE_Select_Reactor_Token_T >; -# else -template class ACE_Select_Reactor_Token_T; -template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T >; -template class ACE_Lock_Adapter< ACE_Select_Reactor_Token_T >; -# endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -# pragma instantiate ACE_Select_Reactor_Token_T -# pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T > -# pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T > -# pragma instantiate ACE_Guard< ACE_Select_Reactor_Token_T > -# else -# pragma instantiate ACE_Select_Reactor_Token_T -# pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T > -# pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T > -# endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h deleted file mode 100644 index 3a490c82ae2..00000000000 --- a/ace/Select_Reactor.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Select_Reactor.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_SELECT_REACTOR_H -#define ACE_SELECT_REACTOR_H -#include "ace/pre.h" - -#include "ace/Select_Reactor_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -typedef ACE_Select_Reactor_Token_T ACE_Select_Reactor_Token; - -typedef ACE_Select_Reactor_T ACE_Select_Reactor; -ACE_TEMPLATE_SPECIALIZATION - -/** - * @class ACE_Guard< ACE_Select_Reactor_Token_T > - * - * @brief Template specialization of for the - * . - * - * This specialization is useful since it helps to speedup - * performance of the "Null_Mutex" considerably. - */ -class ACE_Export ACE_Guard< ACE_Select_Reactor_Token_T > -{ -public: - // = Initialization and termination methods. - ACE_Guard (ACE_Select_Reactor_Token_T &) {} - ACE_Guard (ACE_Select_Reactor_Token_T &, int) {} - ~ACE_Guard (void) {} - - int acquire (void) { return 0; } - int tryacquire (void) { return 0; } - int release (void) { return 0; } - int locked (void) { return 1; } - int remove (void) { return 0; } - void dump (void) const {} - -private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Guard< ACE_Select_Reactor_Token_T > &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Guard (const ACE_Guard< ACE_Select_Reactor_Token_T > &)) -}; - -#include "ace/post.h" -#endif /* ACE_SELECT_REACTOR_H */ diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp deleted file mode 100644 index f0e71bcffc3..00000000000 --- a/ace/Select_Reactor_Base.cpp +++ /dev/null @@ -1,1157 +0,0 @@ -// $Id$ - -#include "ace/Select_Reactor_Base.h" -#include "ace/Reactor.h" -#include "ace/Thread.h" -#include "ace/Synch_T.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Connector.h" -#include "ace/Timer_Heap.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Select_Reactor_Base.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Select_Reactor_Base, "$Id$") - -#if defined (ACE_WIN32) -#define ACE_SELECT_REACTOR_HANDLE(H) (this->event_handlers_[(H)].handle_) -#define ACE_SELECT_REACTOR_EVENT_HANDLER(THIS,H) ((THIS)->event_handlers_[(H)].event_handler_) -#else -#define ACE_SELECT_REACTOR_HANDLE(H) (H) -#define ACE_SELECT_REACTOR_EVENT_HANDLER(THIS,H) ((THIS)->event_handlers_[(H)]) -#endif /* ACE_WIN32 */ - -// Performs sanity checking on the ACE_HANDLE. - -int -ACE_Select_Reactor_Handler_Repository::invalid_handle (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::invalid_handle"); -#if defined (ACE_WIN32) - // It's too expensive to perform more exhaustive validity checks on - // Win32 due to the way that they implement SOCKET HANDLEs. - if (handle == ACE_INVALID_HANDLE) -#else /* !ACE_WIN32 */ - if (handle < 0 || handle >= this->max_size_) -#endif /* ACE_WIN32 */ - { - errno = EINVAL; - return 1; - } - else - return 0; -} - -// Performs sanity checking on the ACE_HANDLE. - -int -ACE_Select_Reactor_Handler_Repository::handle_in_range (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::handle_in_range"); -#if defined (ACE_WIN32) - // It's too expensive to perform more exhaustive validity checks on - // Win32 due to the way that they implement SOCKET HANDLEs. - if (handle != ACE_INVALID_HANDLE) -#else /* !ACE_WIN32 */ - if (handle >= 0 && handle < this->max_handlep1_) -#endif /* ACE_WIN32 */ - return 1; - else - { - errno = EINVAL; - return 0; - } -} - -size_t -ACE_Select_Reactor_Handler_Repository::max_handlep1 (void) -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::max_handlep1"); - - return this->max_handlep1_; -} - -int -ACE_Select_Reactor_Handler_Repository::open (size_t size) -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::open"); - this->max_size_ = size; - this->max_handlep1_ = 0; - -#if defined (ACE_WIN32) - // Try to allocate the memory. - ACE_NEW_RETURN (this->event_handlers_, - ACE_Event_Tuple[size], - -1); - - // Initialize the ACE_Event_Handler * to { ACE_INVALID_HANDLE, 0 }. - for (size_t h = 0; h < size; h++) - { - ACE_SELECT_REACTOR_HANDLE (h) = ACE_INVALID_HANDLE; - ACE_SELECT_REACTOR_EVENT_HANDLER (this, h) = 0; - } -#else - // Try to allocate the memory. - ACE_NEW_RETURN (this->event_handlers_, - ACE_Event_Handler *[size], - -1); - - // Initialize the ACE_Event_Handler * to NULL. - for (size_t h = 0; h < size; h++) - ACE_SELECT_REACTOR_EVENT_HANDLER (this, h) = 0; -#endif /* ACE_WIN32 */ - - // Try to increase the number of handles if is greater than - // the current limit. - return ACE::set_handle_limit (ACE_static_cast (int, size)); -} - -// Initialize a repository of the appropriate . - -ACE_Select_Reactor_Handler_Repository::ACE_Select_Reactor_Handler_Repository (ACE_Select_Reactor_Impl &select_reactor) - : select_reactor_ (select_reactor), - max_size_ (0), - max_handlep1_ (0), - event_handlers_ (0) -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::ACE_Select_Reactor_Handler_Repository"); -} - -int -ACE_Select_Reactor_Handler_Repository::unbind_all (void) -{ - // Unbind all of the s. - for (int handle = 0; - handle < this->max_handlep1_; - handle++) - this->unbind (ACE_SELECT_REACTOR_HANDLE (handle), - ACE_Event_Handler::ALL_EVENTS_MASK); - - return 0; -} - -int -ACE_Select_Reactor_Handler_Repository::close (void) -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::close"); - - if (this->event_handlers_ != 0) - { - this->unbind_all (); - - delete [] this->event_handlers_; - this->event_handlers_ = 0; - } - return 0; -} - -// Return the associated with the . - -ACE_Event_Handler * -ACE_Select_Reactor_Handler_Repository::find (ACE_HANDLE handle, - size_t *index_p) -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::find"); - - ACE_Event_Handler *eh = 0; - ssize_t i; - - // Only bother to search for the if it's in range. - if (this->handle_in_range (handle)) - { -#if defined (ACE_WIN32) - i = 0; - - for (; i < this->max_handlep1_; i++) - if (ACE_SELECT_REACTOR_HANDLE (i) == handle) - { - eh = ACE_SELECT_REACTOR_EVENT_HANDLER (this, i); - break; - } -#else - i = handle; - - eh = ACE_SELECT_REACTOR_EVENT_HANDLER (this, handle); -#endif /* ACE_WIN32 */ - } - else - // g++ can't figure out that won't be used below if the handle - // is out of range, so keep it happy by defining here . . . - i = 0; - - if (eh != 0) - { - if (index_p != 0) - *index_p = i; - } - else - errno = ENOENT; - - return eh; -} - -// Bind the to the . - -int -ACE_Select_Reactor_Handler_Repository::bind (ACE_HANDLE handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::bind"); - - if (handle == ACE_INVALID_HANDLE) - handle = event_handler->get_handle (); - - if (this->invalid_handle (handle)) - return -1; - -#if defined (ACE_WIN32) - int assigned_slot = -1; - - for (ssize_t i = 0; i < this->max_handlep1_; i++) - { - // Found it, so let's just reuse this location. - if (ACE_SELECT_REACTOR_HANDLE (i) == handle) - { - assigned_slot = i; - break; - } - // Here's the first free slot, so let's take it. - else if (ACE_SELECT_REACTOR_HANDLE (i) == ACE_INVALID_HANDLE - && assigned_slot == -1) - assigned_slot = i; - } - - if (assigned_slot > -1) - // We found a free spot, let's reuse it. - { - ACE_SELECT_REACTOR_HANDLE (assigned_slot) = handle; - ACE_SELECT_REACTOR_EVENT_HANDLER (this, assigned_slot) = event_handler; - } - else if (this->max_handlep1_ < this->max_size_) - { - // Insert at the end of the active portion. - ACE_SELECT_REACTOR_HANDLE (this->max_handlep1_) = handle; - ACE_SELECT_REACTOR_EVENT_HANDLER (this, this->max_handlep1_) = event_handler; - this->max_handlep1_++; - } - else - { - // No more room at the inn! - errno = ENOMEM; - return -1; - } -#else - ACE_SELECT_REACTOR_EVENT_HANDLER (this, handle) = event_handler; - - if (this->max_handlep1_ < handle + 1) - this->max_handlep1_ = handle + 1; -#endif /* ACE_WIN32 */ - - if (this->select_reactor_.is_suspended_i (handle)) - { - this->select_reactor_.bit_ops (handle, - mask, - this->select_reactor_.suspend_set_, - ACE_Reactor::ADD_MASK); - } - else - { - this->select_reactor_.bit_ops (handle, - mask, - this->select_reactor_.wait_set_, - ACE_Reactor::ADD_MASK); - - // Note the fact that we've changed the state of the , - // which is used by the dispatching loop to determine whether it can - // keep going or if it needs to reconsult select(). - this->select_reactor_.state_changed_ = 1; - } - - /* - // @@NOTE: We used to do this in earlier versions of ACE+TAO. But - // this is totally wrong.. - // Clear any suspend masks for it too. - this->select_reactor_.bit_ops (handle, - mask, - this->select_reactor_.suspend_set_, - ACE_Reactor::CLR_MASK); - */ - - return 0; -} - -// Remove the binding of . - -int -ACE_Select_Reactor_Handler_Repository::unbind (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::unbind"); - - size_t slot; - ACE_Event_Handler *eh = this->find (handle, &slot); - - if (eh == 0) - return -1; - - // Clear out the bits in the Select_Reactor's wait_set. - this->select_reactor_.bit_ops (handle, - mask, - this->select_reactor_.wait_set_, - ACE_Reactor::CLR_MASK); - - // And suspend_set. - this->select_reactor_.bit_ops (handle, - mask, - this->select_reactor_.suspend_set_, - ACE_Reactor::CLR_MASK); - - // Note the fact that we've changed the state of the , - // which is used by the dispatching loop to determine whether it can - // keep going or if it needs to reconsult select(). - this->select_reactor_.state_changed_ = 1; - - // Close down the unless we've been instructed not - // to. - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::DONT_CALL) == 0) - eh->handle_close (handle, mask); - - // If there are no longer any outstanding events on this - // then we can totally shut down the Event_Handler. - - int has_any_wait_mask = - (this->select_reactor_.wait_set_.rd_mask_.is_set (handle) - || this->select_reactor_.wait_set_.wr_mask_.is_set (handle) - || this->select_reactor_.wait_set_.ex_mask_.is_set (handle)); - int has_any_suspend_mask = - (this->select_reactor_.suspend_set_.rd_mask_.is_set (handle) - || this->select_reactor_.suspend_set_.wr_mask_.is_set (handle) - || this->select_reactor_.suspend_set_.ex_mask_.is_set (handle)); - - if (!has_any_wait_mask - && !has_any_suspend_mask - && (this->find (handle, &slot) == eh)) -#if defined (ACE_WIN32) - { - ACE_SELECT_REACTOR_HANDLE (slot) = ACE_INVALID_HANDLE; - ACE_SELECT_REACTOR_EVENT_HANDLER (this, slot) = 0; - - if (this->max_handlep1_ == (int) slot + 1) - { - // We've deleted the last entry (i.e., i + 1 == the current - // size of the array), so we need to figure out the last - // valid place in the array that we should consider in - // subsequent searches. - - int i; - - for (i = this->max_handlep1_ - 1; - i >= 0 && ACE_SELECT_REACTOR_HANDLE (i) == ACE_INVALID_HANDLE; - i--) - continue; - - this->max_handlep1_ = i + 1; - } - } -#else - { - ACE_SELECT_REACTOR_EVENT_HANDLER (this, handle) = 0; - - if (this->max_handlep1_ == handle + 1) - { - // We've deleted the last entry, so we need to figure out - // the last valid place in the array that is worth looking - // at. - ACE_HANDLE wait_rd_max = this->select_reactor_.wait_set_.rd_mask_.max_set (); - ACE_HANDLE wait_wr_max = this->select_reactor_.wait_set_.wr_mask_.max_set (); - ACE_HANDLE wait_ex_max = this->select_reactor_.wait_set_.ex_mask_.max_set (); - - ACE_HANDLE suspend_rd_max = this->select_reactor_.suspend_set_.rd_mask_.max_set (); - ACE_HANDLE suspend_wr_max = this->select_reactor_.suspend_set_.wr_mask_.max_set (); - ACE_HANDLE suspend_ex_max = this->select_reactor_.suspend_set_.ex_mask_.max_set (); - - // Compute the maximum of six values. - this->max_handlep1_ = wait_rd_max; - if (this->max_handlep1_ < wait_wr_max) - this->max_handlep1_ = wait_wr_max; - if (this->max_handlep1_ < wait_ex_max) - this->max_handlep1_ = wait_ex_max; - - if (this->max_handlep1_ < suspend_rd_max) - this->max_handlep1_ = suspend_rd_max; - if (this->max_handlep1_ < suspend_wr_max) - this->max_handlep1_ = suspend_wr_max; - if (this->max_handlep1_ < suspend_ex_max) - this->max_handlep1_ = suspend_ex_max; - - this->max_handlep1_++; - } - } -#endif /* ACE_WIN32 */ - - return 0; -} - -ACE_Select_Reactor_Handler_Repository_Iterator::ACE_Select_Reactor_Handler_Repository_Iterator - (const ACE_Select_Reactor_Handler_Repository *s) - : rep_ (s), - current_ (-1) -{ - this->advance (); -} - -// Pass back the that hasn't been seen in the Set. -// Returns 0 when all items have been seen, else 1. - -int -ACE_Select_Reactor_Handler_Repository_Iterator::next (ACE_Event_Handler *&next_item) -{ - int result = 1; - - if (this->current_ >= this->rep_->max_handlep1_) - result = 0; - else - next_item = ACE_SELECT_REACTOR_EVENT_HANDLER (this->rep_, - this->current_); - return result; -} - -int -ACE_Select_Reactor_Handler_Repository_Iterator::done (void) const -{ - return this->current_ >= this->rep_->max_handlep1_; -} - -// Move forward by one element in the set. - -int -ACE_Select_Reactor_Handler_Repository_Iterator::advance (void) -{ - if (this->current_ < this->rep_->max_handlep1_) - this->current_++; - - while (this->current_ < this->rep_->max_handlep1_) - if (ACE_SELECT_REACTOR_EVENT_HANDLER (this->rep_, this->current_) != 0) - return 1; - else - this->current_++; - - return this->current_ < this->rep_->max_handlep1_; -} - -// Dump the state of an object. - -void -ACE_Select_Reactor_Handler_Repository_Iterator::dump (void) const -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository_Iterator::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rep_ = %u"), this->rep_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_ = %d"), this->current_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -void -ACE_Select_Reactor_Handler_Repository::dump (void) const -{ - ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) max_handlep1_ = %d, max_size_ = %d\n"), - this->max_handlep1_, this->max_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("["))); - - ACE_Event_Handler *eh = 0; - - for (ACE_Select_Reactor_Handler_Repository_Iterator iter (this); - iter.next (eh) != 0; - iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (eh = %x, eh->handle_ = %d)"), - eh, eh->get_handle ())); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" ]"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_Handler_Repository_Iterator) - -ACE_Select_Reactor_Notify::ACE_Select_Reactor_Notify (void) - : max_notify_iterations_ (-1) -{ -} - -void -ACE_Select_Reactor_Notify::max_notify_iterations (int iterations) -{ - // Must always be > 0 or < 0 to optimize the loop exit condition. - if (iterations == 0) - iterations = 1; - - this->max_notify_iterations_ = iterations; -} - -int -ACE_Select_Reactor_Notify::max_notify_iterations (void) -{ - return this->max_notify_iterations_; -} - -// purge_pending_notifications -// Removes all entries from the notify_queue_ and each one that -// matches is put on the free_queue_. The rest are saved on a -// local queue and copied back to the notify_queue_ at the end. -// Returns the number of entries removed. Returns -1 on error. -// ACE_NOTSUP_RETURN if ACE_HAS_REACTOR_NOTIFICATION_QUEUE is not defined. -int -ACE_Select_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask ) -{ - ACE_TRACE ("ACE_Select_Reactor_Notify::purge_pending_notifications"); - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1); - - if (this->notify_queue_.is_empty ()) - return 0; - - ACE_Notification_Buffer *temp; - ACE_Unbounded_Queue local_queue; - - size_t queue_size = this->notify_queue_.size (); - int number_purged = 0; - size_t i; - for (i = 0; i < queue_size; ++i) - { - if (-1 == this->notify_queue_.dequeue_head (temp)) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("dequeue_head")), - -1); - - // If this is not a Reactor notify (it is for a particular handler), - // and it matches the specified handler (or purging all), - // and applying the mask would totally eliminate the notification, then - // release it and count the number purged. - if ((0 != temp->eh_) && - (0 == eh || eh == temp->eh_) && - ACE_BIT_DISABLED (temp->mask_, ~mask)) // the existing notificationmask - // is left with nothing when - // applying the mask - { - if (-1 == this->free_queue_.enqueue_head (temp)) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("enqueue_head")), - -1); - ++number_purged; - } - else - { - // To preserve it, move it to the local_queue. - // But first, if this is not a Reactor notify (it is for a particularhandler), - // and it matches the specified handler (or purging all), then - // apply the mask - if ((0 != temp->eh_) && - (0 == eh || eh == temp->eh_)) - ACE_CLR_BITS(temp->mask_, mask); - if (-1 == local_queue.enqueue_head (temp)) - return -1; - } - } - - if (this->notify_queue_.size ()) - { // should be empty! - ACE_ASSERT (0); - return -1; - } - - // now put it back in the notify queue - queue_size = local_queue.size (); - for (i = 0; i < queue_size; ++i) - { - if (-1 == local_queue.dequeue_head (temp)) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("dequeue_head")), - -1); - - if (-1 == this->notify_queue_.enqueue_head (temp)) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("enqueue_head")), - -1); - } - - return number_purged; - -#else /* defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) */ - ACE_UNUSED_ARG (eh); - ACE_UNUSED_ARG (mask); - ACE_NOTSUP_RETURN (-1); -#endif /* defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) */ -} - -void -ACE_Select_Reactor_Notify::dump (void) const -{ - ACE_TRACE ("ACE_Select_Reactor_Notify::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("select_reactor_ = %x"), this->select_reactor_)); - this->notification_pipe_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -int -ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r, - ACE_Timer_Queue *, - int disable_notify_pipe) -{ - ACE_TRACE ("ACE_Select_Reactor_Notify::open"); - - if (disable_notify_pipe == 0) - { - this->select_reactor_ = - ACE_dynamic_cast (ACE_Select_Reactor_Impl *, r); - - if (select_reactor_ == 0) - { - errno = EINVAL; - return -1; - } - - if (this->notification_pipe_.open () == -1) - return -1; -#if defined (F_SETFD) - ACE_OS::fcntl (this->notification_pipe_.read_handle (), F_SETFD, 1); - ACE_OS::fcntl (this->notification_pipe_.write_handle (), F_SETFD, 1); -#endif /* F_SETFD */ - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - ACE_Notification_Buffer *temp; - - ACE_NEW_RETURN (temp, - ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE], - -1); - - if (this->alloc_queue_.enqueue_head (temp) == -1) - { - delete [] temp; - return -1; - } - - for (size_t i = 0; i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE; i++) - if (free_queue_.enqueue_head (temp + i) == -1) - return -1; - -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ - - // There seems to be a Win32 bug with this... Set this into - // non-blocking mode. - if (ACE::set_flags (this->notification_pipe_.read_handle (), - ACE_NONBLOCK) == -1) - return -1; - else - return this->select_reactor_->register_handler - (this->notification_pipe_.read_handle (), - this, - ACE_Event_Handler::READ_MASK); - } - else - { - this->select_reactor_ = 0; - return 0; - } -} - -int -ACE_Select_Reactor_Notify::close (void) -{ - ACE_TRACE ("ACE_Select_Reactor_Notify::close"); - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - // Free up the dynamically allocated resources. - ACE_Notification_Buffer **b; - - for (ACE_Unbounded_Queue_Iterator alloc_iter (this->alloc_queue_); - alloc_iter.next (b) != 0; - alloc_iter.advance ()) - { - delete [] *b; - *b = 0; - } - - this->alloc_queue_.reset (); - this->notify_queue_.reset (); - this->free_queue_.reset (); -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ - - return this->notification_pipe_.close (); -} - -int -ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_Select_Reactor_Notify::notify"); - - // Just consider this method a "no-op" if there's no - // configured. - if (this->select_reactor_ == 0) - return 0; - - ACE_Notification_Buffer buffer (eh, mask); - -#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - // Artificial scope to limit the duration of the mutex. - { - // int notification_required = 0; - - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1); - - // No pending notifications. - - // We will send notify for every message.. - // if (this->notify_queue_.is_empty ()) - // notification_required = 1; - - ACE_Notification_Buffer *temp = 0; - - if (free_queue_.dequeue_head (temp) == -1) - { - // Grow the queue of available buffers. - ACE_Notification_Buffer *temp1; - - ACE_NEW_RETURN (temp1, - ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE], - -1); - - if (this->alloc_queue_.enqueue_head (temp1) == -1) - { - delete [] temp1; - return -1; - } - - // Start at 1 and enqueue only - // (ACE_REACTOR_NOTIFICATION_ARRAY_SIZE - 1) elements since - // the first one will be used right now. - for (size_t i = 1; - i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE; - i++) - this->free_queue_.enqueue_head (temp1 + i); - - temp = temp1; - } - - ACE_ASSERT (temp != 0); - *temp = buffer; - - if (notify_queue_.enqueue_tail (temp) == -1) - return -1; - } -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ - - ssize_t n = ACE::send (this->notification_pipe_.write_handle (), - (char *) &buffer, - sizeof buffer, - timeout); - if (n == -1) - return -1; - - return 0; -} - -// Handles pending threads (if any) that are waiting to unblock the -// Select_Reactor. - -int -ACE_Select_Reactor_Notify::dispatch_notifications (int &number_of_active_handles, - ACE_Handle_Set &rd_mask) -{ - ACE_TRACE ("ACE_Select_Reactor_Notify::dispatch_notifications"); - - ACE_HANDLE read_handle = - this->notification_pipe_.read_handle (); - - if (read_handle != ACE_INVALID_HANDLE - && rd_mask.is_set (read_handle)) - { - number_of_active_handles--; - rd_mask.clr_bit (read_handle); - return this->handle_input (read_handle); - } - else - return 0; -} - - -ACE_HANDLE -ACE_Select_Reactor_Notify::notify_handle (void) -{ - ACE_TRACE ("ACE_Select_Reactor_Notify::notify_handle"); - - return this->notification_pipe_.read_handle (); -} - - -// Special trick to unblock or - * when updates occur other than in the main - * thread. To do this, we signal an - * auto-reset event the is listening on. - * If an and is - * passed to , the appropriate method is - * dispatched in the context of the thread. - */ -class ACE_Export ACE_Select_Reactor_Notify : public ACE_Reactor_Notify -{ -public: - /// Constructor. - ACE_Select_Reactor_Notify (void); - - /// Destructor. - ~ACE_Select_Reactor_Notify (void); - - // = Initialization and termination methods. - /// Initialize. - virtual int open (ACE_Reactor_Impl *, - ACE_Timer_Queue * = 0, - int disable_notify_pipe = 0); - - /// Destroy. - virtual int close (void); - - /** - * Called by a thread when it wants to unblock the - * . This wakeups the if - * currently blocked in . - ACE_Select_Reactor_Handle_Set wait_set_; - - /// Tracks handles that are currently suspended. - ACE_Select_Reactor_Handle_Set suspend_set_; - - /// Track HANDLES we are interested in for various events that must - /// be dispatched *without* going through is interrupted via . - int restart_; - - /** - * Position that the main ACE_Select_Reactor thread is requeued in - * the list of waiters during a callback. If this value == - * -1 we are requeued at the end of the list. Else if it's 0 then - * we are requeued at the front of the list. Else if it's > 1 then - * that indicates the number of waiters to skip over. - */ - int requeue_position_; - - /// True if we've been initialized yet... - int initialized_; - - /// The original thread that created this Select_Reactor. - ACE_thread_t owner_; - - /** - * True if state has changed during dispatching of - * , else false. This is used to determine - * whether we need to make another trip through the - * 's loop. - */ - int state_changed_; - - /// Controls/access whether the notify handler should renew the - /// Select_Reactor's token or not. - int supress_notify_renew (void); - void supress_notify_renew (int sr); - -private: - /// Determine whether we should renew Select_Reactor's token after handling - /// the notification message. - int supress_renew_; - - /// Deny access since member-wise won't work... - ACE_Select_Reactor_Impl (const ACE_Select_Reactor_Impl &); - ACE_Select_Reactor_Impl &operator = (const ACE_Select_Reactor_Impl &); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Select_Reactor_Base.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_SELECT_REACTOR_BASE_H */ diff --git a/ace/Select_Reactor_Base.i b/ace/Select_Reactor_Base.i deleted file mode 100644 index f04446e2e86..00000000000 --- a/ace/Select_Reactor_Base.i +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Reactor.h" - -ACE_INLINE -ACE_Event_Tuple::~ACE_Event_Tuple (void) -{ -} - -ACE_INLINE -ACE_Select_Reactor_Notify::~ACE_Select_Reactor_Notify (void) -{ -} - -ACE_INLINE -ACE_Select_Reactor_Handler_Repository::~ACE_Select_Reactor_Handler_Repository (void) -{ -} - -ACE_INLINE -ACE_Select_Reactor_Handler_Repository_Iterator::~ACE_Select_Reactor_Handler_Repository_Iterator (void) -{ -} - -ACE_INLINE size_t -ACE_Select_Reactor_Handler_Repository::size (void) const -{ - return this->max_size_; -} - -ACE_INLINE -ACE_Event_Tuple::ACE_Event_Tuple (void) -: handle_ (ACE_INVALID_HANDLE), - event_handler_ (0) -{ -} - -ACE_INLINE -ACE_Event_Tuple::ACE_Event_Tuple (ACE_Event_Handler* eh, - ACE_HANDLE h) -: handle_ (h), - event_handler_ (eh) -{ -} - -ACE_INLINE int -ACE_Event_Tuple::operator== (const ACE_Event_Tuple &rhs) const -{ - return this->handle_ == rhs.handle_; -} - -ACE_INLINE int -ACE_Event_Tuple::operator!= (const ACE_Event_Tuple &rhs) const -{ - return !(*this == rhs); -} - -ACE_INLINE -ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl () - : handler_rep_ (*this), - timer_queue_ (0), - delete_timer_queue_ (0), - delete_signal_handler_ (0), - delete_notify_handler_ (0), - requeue_position_ (-1), // Requeue at end of waiters by default. - initialized_ (0), - state_changed_ (0), - supress_renew_ (0) -{ -} - -ACE_INLINE int -ACE_Select_Reactor_Impl::purge_pending_notifications (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) -{ - if (this->notify_handler_ == 0) - return 0; - else - return this->notify_handler_->purge_pending_notifications (eh, mask); -} - -ACE_INLINE int -ACE_Select_Reactor_Impl::supress_notify_renew (void) -{ - return this->supress_renew_; -} - -ACE_INLINE void -ACE_Select_Reactor_Impl::supress_notify_renew (int sr) -{ - this->supress_renew_ = sr; -} diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp deleted file mode 100644 index 78c3a3ada1f..00000000000 --- a/ace/Select_Reactor_T.cpp +++ /dev/null @@ -1,1517 +0,0 @@ -// $Id$ - -#ifndef ACE_SELECT_REACTOR_T_C -#define ACE_SELECT_REACTOR_T_C - -#include "ace/Select_Reactor_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/ACE.h" -#include "ace/Log_Msg.h" -#include "ace/Thread.h" -#include "ace/Timer_Heap.h" - -// @@ The latest version of SunCC can't grok the code if we put inline -// function here. Therefore, we temporarily disable the code here. -// We shall turn this back on once we know the problem gets fixed. -#if 1 // !defined (__ACE_INLINE__) -#include "ace/Select_Reactor_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Select_Reactor_T, "$Id$") - - ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_T) - -#if defined (ACE_WIN32) -#define ACE_SELECT_REACTOR_HANDLE(H) (this->event_handlers_[(H)].handle_) -#define ACE_SELECT_REACTOR_EVENT_HANDLER(THIS,H) ((THIS)->event_handlers_[(H)].event_handler_) -#else -#define ACE_SELECT_REACTOR_HANDLE(H) (H) -#define ACE_SELECT_REACTOR_EVENT_HANDLER(THIS,H) ((THIS)->event_handlers_[(H)]) -#endif /* ACE_WIN32 */ - - template int -ACE_Select_Reactor_T::any_ready - (ACE_Select_Reactor_Handle_Set &wait_set) -{ - ACE_TRACE ("ACE_Select_Reactor_T::any_ready"); - - if (this->mask_signals_) - { -#if !defined (ACE_WIN32) - // Make this call signal safe. - ACE_Sig_Guard sb; -#endif /* ACE_WIN32 */ - - return this->any_ready_i (wait_set); - } - return this->any_ready_i (wait_set); -} - - template int -ACE_Select_Reactor_T::any_ready_i - (ACE_Select_Reactor_Handle_Set &wait_set) -{ - int number_ready = this->ready_set_.rd_mask_.num_set () - + this->ready_set_.wr_mask_.num_set () - + this->ready_set_.ex_mask_.num_set (); - - if (number_ready > 0 && &wait_set != &(this->ready_set_)) - { - wait_set.rd_mask_ = this->ready_set_.rd_mask_; - wait_set.wr_mask_ = this->ready_set_.wr_mask_; - wait_set.ex_mask_ = this->ready_set_.ex_mask_; - - this->ready_set_.rd_mask_.reset (); - this->ready_set_.wr_mask_.reset (); - this->ready_set_.ex_mask_.reset (); - } - - return number_ready; -} - -template int -ACE_Select_Reactor_T::handler_i (int signum, - ACE_Event_Handler **eh) -{ - ACE_TRACE ("ACE_Select_Reactor_T::handler_i"); - ACE_Event_Handler *handler = this->signal_handler_->handler (signum); - - if (handler == 0) - return -1; - else if (eh != 0) - *eh = handler; - return 0; -} - -template int -ACE_Select_Reactor_T::initialized (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::initialized"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, 0)); - return this->initialized_; -} - -template int -ACE_Select_Reactor_T::owner (ACE_thread_t tid, - ACE_thread_t *o_id) -{ - ACE_TRACE ("ACE_Select_Reactor_T::owner"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - - if (o_id) - *o_id = this->owner_; - - this->owner_ = tid; - - return 0; -} - -template int -ACE_Select_Reactor_T::owner (ACE_thread_t *t_id) -{ - ACE_TRACE ("ACE_Select_Reactor_T::owner"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - *t_id = this->owner_; - return 0; -} - -template int -ACE_Select_Reactor_T::restart (void) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->restart_; -} - -template int -ACE_Select_Reactor_T::restart (int r) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - int current_value = this->restart_; - this->restart_ = r; - return current_value; -} - -template void -ACE_Select_Reactor_T::requeue_position (int rp) -{ - ACE_TRACE ("ACE_Select_Reactor_T::requeue_position"); - ACE_MT (ACE_GUARD (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_)); -#if defined (ACE_WIN32) - ACE_UNUSED_ARG (rp); - // Must always requeue ourselves "next" on Win32. - this->requeue_position_ = 0; -#else - this->requeue_position_ = rp; -#endif /* ACE_WIN32 */ -} - -template int -ACE_Select_Reactor_T::requeue_position (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::requeue_position"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->requeue_position_; -} - -template void -ACE_Select_Reactor_T::max_notify_iterations (int iterations) -{ - ACE_TRACE ("ACE_Select_Reactor_T::max_notify_iterations"); - ACE_MT (ACE_GUARD (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_)); - - this->notify_handler_->max_notify_iterations (iterations); -} - -template int -ACE_Select_Reactor_T::max_notify_iterations (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::max_notify_iterations"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->notify_handler_->max_notify_iterations (); -} - -// Enqueue ourselves into the list of waiting threads. -template void -ACE_Select_Reactor_T::renew (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::renew"); -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - if (this->supress_notify_renew () == 0) - this->token_.renew (this->requeue_position_); -#endif /* defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) */ -} - -template void -ACE_Select_Reactor_Token_T::dump (void) const -{ - ACE_TRACE ("ACE_Select_Reactor_Token_T::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template -ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token_T - (ACE_Select_Reactor_Impl &r, - int s_queue) - : select_reactor_ (&r) -{ - ACE_TRACE ("ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token"); - - this->queueing_strategy (s_queue); -} - -template -ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token_T (int s_queue) - : select_reactor_ (0) -{ - ACE_TRACE ("ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token"); - - this->queueing_strategy (s_queue); -} - -template -ACE_Select_Reactor_Token_T::~ACE_Select_Reactor_Token_T (void) -{ - ACE_TRACE ("ACE_Select_Reactor_Token_T::~ACE_Select_Reactor_Token_T"); -} - -template ACE_Select_Reactor_Impl & -ACE_Select_Reactor_Token_T::select_reactor (void) -{ - return *this->select_reactor_; -} - -template void -ACE_Select_Reactor_Token_T::select_reactor - (ACE_Select_Reactor_Impl &select_reactor) -{ - this->select_reactor_ = &select_reactor; -} - -// Used to wakeup the Select_Reactor. - -template void -ACE_Select_Reactor_Token_T::sleep_hook (void) -{ - ACE_TRACE ("ACE_Select_Reactor_Token_T::sleep_hook"); - if (this->select_reactor_->notify () == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("sleep_hook failed"))); -} - -template int -ACE_Select_Reactor_T::notify (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_Select_Reactor_T::notify"); - - ssize_t n = 0; - - // Pass over both the Event_Handler *and* the mask to allow the - // caller to dictate which Event_Handler method the receiver - // invokes. Note that this call can timeout. - - n = this->notify_handler_->notify (eh, mask, timeout); - return n == -1 ? -1 : 0; -} - -template int -ACE_Select_Reactor_T::resume_handler (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Select_Reactor_T::resume_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->resume_i (handle); -} - -template int -ACE_Select_Reactor_T::suspend_handler (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Select_Reactor_T::suspend_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->suspend_i (handle); -} - -template int -ACE_Select_Reactor_T::suspend_handlers (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::suspend_handlers"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - - ACE_Event_Handler *eh = 0; - - for (ACE_Select_Reactor_Handler_Repository_Iterator iter (&this->handler_rep_); - iter.next (eh) != 0; - iter.advance ()) - this->suspend_i (eh->get_handle ()); - - return 0; -} - -template int -ACE_Select_Reactor_T::resume_handlers (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::resume_handlers"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - - ACE_Event_Handler *eh = 0; - - for (ACE_Select_Reactor_Handler_Repository_Iterator iter (&this->handler_rep_); - iter.next (eh) != 0; - iter.advance ()) - this->resume_i (eh->get_handle ()); - - return 0; -} - -template int -ACE_Select_Reactor_T::register_handler - (ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::register_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->register_handler_i (handler->get_handle (), handler, mask); -} - -template int -ACE_Select_Reactor_T::register_handler - (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::register_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->register_handler_i (handle, handler, mask); -} - -template int -ACE_Select_Reactor_T::register_handler - (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::register_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->register_handler_i (handles, handler, mask); -} - -template int -ACE_Select_Reactor_T::handler - (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **handler) -{ - ACE_TRACE ("ACE_Select_Reactor_T::handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->handler_i (handle, mask, handler); -} - -template int -ACE_Select_Reactor_T::remove_handler - (const ACE_Handle_Set &handles, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::remove_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->remove_handler_i (handles, mask); -} - -template int -ACE_Select_Reactor_T::remove_handler - (ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::remove_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->remove_handler_i (handler->get_handle (), mask); -} - -template int -ACE_Select_Reactor_T::remove_handler - (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::remove_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->remove_handler_i (handle, mask); -} - -// Performs operations on the "ready" bits. - -template int -ACE_Select_Reactor_T::ready_ops - (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops) -{ - ACE_TRACE ("ACE_Select_Reactor_T::ready_ops"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->bit_ops (handle, - mask, - this->ready_set_, - ops); -} - -template int -ACE_Select_Reactor_T::open - (size_t size, - int restart, - ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - int disable_notify_pipe, - ACE_Reactor_Notify *notify) -{ - ACE_TRACE ("ACE_Select_Reactor_T::open"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - - // Can't initialize ourselves more than once. - if (this->initialized_ > 0) - return -1; - - this->owner_ = ACE_Thread::self (); - this->restart_ = restart; - this->signal_handler_ = sh; - this->timer_queue_ = tq; - this->notify_handler_ = notify; - - int result = 0; - - // Allows the signal handler to be overridden. - if (this->signal_handler_ == 0) - { - ACE_NEW_RETURN (this->signal_handler_, - ACE_Sig_Handler, - -1); - - if (this->signal_handler_ == 0) - result = -1; - else - this->delete_signal_handler_ = 1; - } - - // Allows the timer queue to be overridden. - if (result != -1 && this->timer_queue_ == 0) - { - ACE_NEW_RETURN (this->timer_queue_, - ACE_Timer_Heap, - -1); - - if (this->timer_queue_ == 0) - result = -1; - else - this->delete_timer_queue_ = 1; - } - - // Allows the Notify_Handler to be overridden. - if (result != -1 && this->notify_handler_ == 0) - { - ACE_NEW_RETURN (this->notify_handler_, - ACE_Select_Reactor_Notify, - -1); - - if (this->notify_handler_ == 0) - result = -1; - else - this->delete_notify_handler_ = 1; - } - - if (result != -1 && this->handler_rep_.open (size) == -1) - result = -1; - else if (this->notify_handler_->open (this, - 0, - disable_notify_pipe) == -1) - result = -1; - - if (result != -1) - // We're all set to go. - this->initialized_ = 1; - else - // This will close down all the allocated resources properly. - this->close (); - - return result; -} - -template int -ACE_Select_Reactor_T::set_sig_handler - (ACE_Sig_Handler *signal_handler) -{ - if (this->signal_handler_ != 0 && this->delete_signal_handler_ != 0) - delete this->signal_handler_; - this->signal_handler_ = signal_handler; - this->delete_signal_handler_ = 0; - return 0; -} - -template ACE_Timer_Queue * -ACE_Select_Reactor_T::timer_queue (void) const -{ - return this->timer_queue_; -} - -template int -ACE_Select_Reactor_T::timer_queue - (ACE_Timer_Queue *tq) -{ - if (this->timer_queue_ != 0 && this->delete_timer_queue_ != 0) - delete this->timer_queue_; - this->timer_queue_ = tq; - this->delete_timer_queue_ = 0; - return 0; -} - -template int -ACE_Select_Reactor_T::set_timer_queue - (ACE_Timer_Queue *tq) -{ - return this->timer_queue (tq); -} - -template -ACE_Select_Reactor_T::ACE_Select_Reactor_T - (ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - int disable_notify_pipe, - ACE_Reactor_Notify *notify, - int mask_signals, - int s_queue) - : token_ (*this, s_queue), - lock_adapter_ (token_), - deactivated_ (0), - mask_signals_ (mask_signals) -{ - ACE_TRACE ("ACE_Select_Reactor_T::ACE_Select_Reactor_T"); - - // First try to open the Reactor with the hard-coded default. - if (this->open (ACE_Select_Reactor_T::DEFAULT_SIZE, - 0, - sh, - tq, - disable_notify_pipe, - notify) == -1) - { - // The hard-coded default Reactor size failed, so attempt to - // determine the size at run-time by checking the process file - // descriptor limit on platforms that support this feature. - - // There is no need to deallocate resources from previous open() - // call since the open() method deallocates any resources prior - // to exiting if an error was encountered. - - // Set the default reactor size to be the current limit on the - // number of file descriptors available to the process. This - // size is not necessarily the maximum limit. - if (this->open (ACE::max_handles (), - 0, - sh, - tq, - disable_notify_pipe, - notify) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Select_Reactor_T::open ") - ACE_LIB_TEXT ("failed inside ") - ACE_LIB_TEXT ("ACE_Select_Reactor_T::CTOR"))); - } -} - -// Initialize ACE_Select_Reactor_T. - -template -ACE_Select_Reactor_T::ACE_Select_Reactor_T - (size_t size, - int rs, - ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - int disable_notify_pipe, - ACE_Reactor_Notify *notify, - int mask_signals, - int s_queue) - : token_ (*this, s_queue), - lock_adapter_ (token_), - deactivated_ (0), - mask_signals_ (mask_signals) -{ - ACE_TRACE ("ACE_Select_Reactor_T::ACE_Select_Reactor_T"); - - if (this->open (size, - rs, - sh, - tq, - disable_notify_pipe, - notify) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Select_Reactor_T::open ") - ACE_LIB_TEXT ("failed inside ACE_Select_Reactor_T::CTOR"))); -} - -// Close down the ACE_Select_Reactor_T instance, detaching any -// remaining Event_Handers. This had better be called from the main -// event loop thread... - -template int -ACE_Select_Reactor_T::close (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::close"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - - if (this->delete_signal_handler_) - { - delete this->signal_handler_; - this->signal_handler_ = 0; - this->delete_signal_handler_ = 0; - } - - this->handler_rep_.close (); - - if (this->delete_timer_queue_) - { - delete this->timer_queue_; - this->timer_queue_ = 0; - this->delete_timer_queue_ = 0; - } - - if (this->notify_handler_ != 0) - this->notify_handler_->close (); - - if (this->delete_notify_handler_) - { - delete this->notify_handler_; - this->notify_handler_ = 0; - this->delete_notify_handler_ = 0; - } - - this->initialized_ = 0; - - return 0; -} - -template int -ACE_Select_Reactor_T::current_info - (ACE_HANDLE, size_t &) -{ - return -1; -} - -template -ACE_Select_Reactor_T::~ACE_Select_Reactor_T (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::~ACE_Select_Reactor_T"); - this->close (); -} - -template int -ACE_Select_Reactor_T::remove_handler_i - (const ACE_Handle_Set &handles, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::remove_handler_i"); - ACE_HANDLE h; - - ACE_Handle_Set_Iterator handle_iter (handles); - - while ((h = handle_iter ()) != ACE_INVALID_HANDLE) - if (this->remove_handler_i (h, mask) == -1) - return -1; - - return 0; -} - -template int -ACE_Select_Reactor_T::register_handler_i - (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::register_handler_i"); - ACE_HANDLE h; - - ACE_Handle_Set_Iterator handle_iter (handles); - while ((h = handle_iter ()) != ACE_INVALID_HANDLE) - if (this->register_handler_i (h, handler, mask) == -1) - return -1; - - return 0; -} - -template int -ACE_Select_Reactor_T::register_handler - (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp) -{ - ACE_TRACE ("ACE_Select_Reactor_T::register_handler"); - - int result = 0; - -#if (ACE_NSIG > 0) && !defined (CHORUS) - for (int s = 1; s < ACE_NSIG; s++) - if (sigset.is_member (s) - && this->signal_handler_->register_handler (s, - new_sh, - new_disp) == -1) - result = -1; -#else /* ACE_NSIG <= 0 || CHORUS */ - ACE_UNUSED_ARG (sigset); - ACE_UNUSED_ARG (new_sh); - ACE_UNUSED_ARG (new_disp); -#endif /* ACE_NSIG <= 0 || CHORUS */ - return result; -} - -template int -ACE_Select_Reactor_T::remove_handler - (const ACE_Sig_Set &sigset) -{ - ACE_TRACE ("ACE_Select_Reactor_T::remove_handler"); - int result = 0; - -#if (ACE_NSIG > 0) && !defined (CHORUS) - for (int s = 1; s < ACE_NSIG; s++) - if (sigset.is_member (s) - && this->signal_handler_->remove_handler (s) == -1) - result = -1; -#else /* ACE_NSIG <= 0 || CHORUS */ - ACE_UNUSED_ARG (sigset); -#endif /* ACE_NSIG <= 0 || CHORUS */ - - return result; -} - -template int -ACE_Select_Reactor_T::cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_Select_Reactor_T::cancel_timer"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - - if (this->timer_queue_ != 0) - return this->timer_queue_->cancel (handler, dont_call_handle_close); - else - return 0; -} - -template int -ACE_Select_Reactor_T::cancel_timer (long timer_id, - const void **arg, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_Select_Reactor_T::cancel_timer"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - - if (this->timer_queue_ != 0) - return this->timer_queue_->cancel (timer_id, - arg, - dont_call_handle_close); - else - return 0; -} - -template long -ACE_Select_Reactor_T::schedule_timer - (ACE_Event_Handler *handler, - const void *arg, - const ACE_Time_Value &delay_time, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Select_Reactor_T::schedule_timer"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - - return this->timer_queue_->schedule - (handler, - arg, - timer_queue_->gettimeofday () + delay_time, - interval); -} - -template int -ACE_Select_Reactor_T::reset_timer_interval - (long timer_id, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Select_Reactor_T::reset_timer_interval"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - - return this->timer_queue_->reset_interval (timer_id, interval); -} - -// Main event loop driver that blocks for before -// returning (will return earlier if I/O or signal events occur). - -template int -ACE_Select_Reactor_T::handle_events - (ACE_Time_Value &max_wait_time) -{ - ACE_TRACE ("ACE_Select_Reactor_T::handle_events"); - - return this->handle_events (&max_wait_time); -} - -template int -ACE_Select_Reactor_T::handle_error (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::handle_error"); - if (errno == EINTR) - return this->restart_; -#if defined (__MVS__) || defined (ACE_WIN32) || defined (VXWORKS) - // On MVS Open Edition and Win32, there can be a number of failure - // codes on a bad socket, so check_handles on anything other than - // EINTR. VxWorks doesn't even bother to always set errno on error - // in select (specifically, it doesn't return EBADF for bad FDs). - else - return this->check_handles (); -#else -# if defined (ACE_PSOS) - else if (errno == EBADS) - return this->check_handles (); -# else - else if (errno == EBADF) - return this->check_handles (); -# endif /* ACE_PSOS */ - else - return -1; -#endif /* __MVS__ || ACE_WIN32 */ -} - -template void -ACE_Select_Reactor_T::notify_handle - (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Handle_Set &ready_mask, - ACE_Event_Handler *event_handler, - ACE_EH_PTMF ptmf) -{ - ACE_TRACE ("ACE_Select_Reactor_T::notify_handle"); - // Check for removed handlers. - if (event_handler == 0) - return; - - int status = (event_handler->*ptmf) (handle); - - if (status < 0) - this->remove_handler_i (handle, mask); - else if (status > 0) - ready_mask.set_bit (handle); -} - -// Perform GET, CLR, SET, and ADD operations on the select() -// Handle_Sets. -// -// GET = 1, Retrieve current value -// SET = 2, Set value of bits to new mask (changes the entire mask) -// ADD = 3, Bitwise "or" the value into the mask (only changes -// enabled bits) -// CLR = 4 Bitwise "and" the negation of the value out of the mask -// (only changes enabled bits) -// -// Returns the original mask. - -template int -ACE_Select_Reactor_T::mask_ops - (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops) -{ - ACE_TRACE ("ACE_Select_Reactor_T::mask_ops"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - return this->bit_ops (handle, mask, - this->wait_set_, - ops); -} - -// Must be called with locks held. - -template int -ACE_Select_Reactor_T::handler_i - (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **handler) -{ - ACE_TRACE ("ACE_Select_Reactor_T::handler_i"); - ACE_Event_Handler *h = this->handler_rep_.find (handle); - - if (h == 0) - return -1; - else - { - if ((ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK) - || ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK)) - && this->wait_set_.rd_mask_.is_set (handle) == 0) - return -1; - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK) - && this->wait_set_.wr_mask_.is_set (handle) == 0) - return -1; - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK) - && this->wait_set_.ex_mask_.is_set (handle) == 0) - return -1; - } - - if (handler != 0) - *handler = h; - return 0; -} - -// Must be called with locks held - -template int -ACE_Select_Reactor_T::resume_i (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Select_Reactor_T::resume_i"); - if (this->handler_rep_.find (handle) == 0) - return -1; - - if (this->suspend_set_.rd_mask_.is_set (handle)) - { - this->wait_set_.rd_mask_.set_bit (handle); - this->suspend_set_.rd_mask_.clr_bit (handle); - } - if (this->suspend_set_.wr_mask_.is_set (handle)) - { - this->wait_set_.wr_mask_.set_bit (handle); - this->suspend_set_.wr_mask_.clr_bit (handle); - } - if (this->suspend_set_.ex_mask_.is_set (handle)) - { - this->wait_set_.ex_mask_.set_bit (handle); - this->suspend_set_.ex_mask_.clr_bit (handle); - } - return 0; -} - -// Must be called with locks held - -template int -ACE_Select_Reactor_T::suspend_i (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Select_Reactor_T::suspend_i"); - if (this->handler_rep_.find (handle) == 0) - return -1; - - if (this->wait_set_.rd_mask_.is_set (handle)) - { - this->suspend_set_.rd_mask_.set_bit (handle); - this->wait_set_.rd_mask_.clr_bit (handle); - } - if (this->wait_set_.wr_mask_.is_set (handle)) - { - this->suspend_set_.wr_mask_.set_bit (handle); - this->wait_set_.wr_mask_.clr_bit (handle); - } - if (this->wait_set_.ex_mask_.is_set (handle)) - { - this->suspend_set_.ex_mask_.set_bit (handle); - this->wait_set_.ex_mask_.clr_bit (handle); - } - return 0; -} - -// Must be called with locks held - -template int -ACE_Select_Reactor_T::is_suspended_i (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Select_Reactor_T::is_suspended_i"); - if (this->handler_rep_.find (handle) == 0) - return 0; - - return this->suspend_set_.rd_mask_.is_set (handle) || - this->suspend_set_.wr_mask_.is_set (handle) || - this->suspend_set_.ex_mask_.is_set (handle) ; - -} - -// Must be called with locks held - -template int -ACE_Select_Reactor_T::register_handler_i - (ACE_HANDLE handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::register_handler_i"); - - // Insert the tuple into the Handler - // Repository. - return this->handler_rep_.bind (handle, event_handler, mask); -} - -template int -ACE_Select_Reactor_T::remove_handler_i - (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Select_Reactor_T::remove_handler_i"); - - // Unbind this handle. - return this->handler_rep_.unbind (handle, mask); -} - -template int -ACE_Select_Reactor_T::work_pending - (const ACE_Time_Value &max_wait_time) -{ - ACE_TRACE ("ACE_Select_Reactor_T::work_pending"); - - ACE_Time_Value mwt (max_wait_time); - ACE_MT (ACE_Countdown_Time countdown (&mwt)); - - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, - ace_mon, - this->token_, - -1)); - - if (this->deactivated_) - return 0; - - // Update the countdown to reflect time waiting for the mutex. - ACE_MT (countdown.update ()); - - ACE_Time_Value timer_buf (0); - ACE_Time_Value *this_timeout = - this->timer_queue_->calculate_timeout (&mwt, &timer_buf); - - // Check if we have timers to fire. - int timers_pending = - (this_timeout != 0 && *this_timeout != max_wait_time ? 1 : 0); - - u_long width = (u_long) this->handler_rep_.max_handlep1 (); - - ACE_Select_Reactor_Handle_Set fd_set; - fd_set.rd_mask_ = this->wait_set_.rd_mask_; - fd_set.wr_mask_ = this->wait_set_.wr_mask_; - fd_set.ex_mask_ = this->wait_set_.ex_mask_; - - int nfds = ACE_OS::select (int (width), - fd_set.rd_mask_, - fd_set.wr_mask_, - fd_set.ex_mask_, - this_timeout); - - // If timers are pending, override any timeout from the select() - // call. - return (nfds == 0 && timers_pending != 0 ? 1 : nfds); -} - -// Must be called with lock held. - -template int -ACE_Select_Reactor_T::wait_for_multiple_events - (ACE_Select_Reactor_Handle_Set &dispatch_set, - ACE_Time_Value *max_wait_time) -{ - ACE_TRACE ("ACE_Select_Reactor_T::wait_for_multiple_events"); - u_long width = 0; - ACE_Time_Value timer_buf (0); - ACE_Time_Value *this_timeout; - - int number_of_active_handles = this->any_ready (dispatch_set); - - // If there are any bits enabled in the then we'll - // handle those first, otherwise we'll block in was interrupted. - if (ACE_Sig_Handler::sig_pending () != 0) - { - ACE_Sig_Handler::sig_pending (0); - - // If any HANDLES in the are activated as a - // result of signals they should be dispatched since - // they may be time critical... - active_handle_count = this->any_ready (dispatch_set); - - // Record the fact that the Reactor has dispatched a - // handle_signal() method. We need this to return the - // appropriate count below. - signal_occurred = 1; - } - else - return -1; - } - - // Handle timers early since they may have higher latency - // constraints than I/O handlers. Ideally, the order of - // dispatching should be a strategy... - else if (this->dispatch_timer_handlers (other_handlers_dispatched) == -1) - // State has changed or timer queue has failed, exit loop. - break; - - // Check to see if there are no more I/O handles left to - // dispatch AFTER we've handled the timers... - else if (active_handle_count == 0) - return io_handlers_dispatched - + other_handlers_dispatched - + signal_occurred; - - // Next dispatch the notification handlers (if there are any to - // dispatch). These are required to handle multi-threads that - // are trying to update the . - - else if (this->dispatch_notification_handlers - (dispatch_set, - active_handle_count, - other_handlers_dispatched) == -1) - // State has changed or a serious failure has occured, so exit - // loop. - break; - - // Finally, dispatch the I/O handlers. - else if (this->dispatch_io_handlers - (dispatch_set, - active_handle_count, - io_handlers_dispatched) == -1) - // State has changed, so exit loop. - break; - } - while (active_handle_count > 0); - - return io_handlers_dispatched + other_handlers_dispatched + signal_occurred; -} - -template int -ACE_Select_Reactor_T::release_token (void) -{ -#if defined (ACE_WIN32) - this->token_.release (); - return (int) EXCEPTION_CONTINUE_SEARCH; -#else - return 0; -#endif /* ACE_WIN32 */ -} - -template int -ACE_Select_Reactor_T::handle_events - (ACE_Time_Value *max_wait_time) -{ - ACE_TRACE ("ACE_Select_Reactor_T::handle_events"); - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - - // Stash the current time -- the destructor of this object will - // automatically compute how much time elapsed since this method was - // called. - ACE_Countdown_Time countdown (max_wait_time); - - ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1); - - if (ACE_OS::thr_equal (ACE_Thread::self (), - this->owner_) == 0 || this->deactivated_) - return -1; - - // Update the countdown to reflect time waiting for the mutex. - countdown.update (); -#else - if (this->deactivated_) - return -1; -#endif /* ACE_MT_SAFE */ - - return this->handle_events_i (max_wait_time); -} - -template int -ACE_Select_Reactor_T::handle_events_i - (ACE_Time_Value *max_wait_time) -{ - int result = -1; - - ACE_SEH_TRY - { - ACE_Select_Reactor_Handle_Set dispatch_set; - - int number_of_active_handles = - this->wait_for_multiple_events (dispatch_set, - max_wait_time); - - result = this->dispatch (number_of_active_handles, - dispatch_set); - } - ACE_SEH_EXCEPT (this->release_token ()) - { - // As it stands now, we catch and then rethrow all Win32 - // structured exceptions so that we can make sure to release the - // lock correctly. - } - - this->state_changed_ = 1; - - return result; -} - -template int -ACE_Select_Reactor_T::check_handles (void) -{ - ACE_TRACE ("ACE_Select_Reactor_T::check_handles"); - -#if defined (ACE_WIN32) || defined (__MVS__) || defined (ACE_PSOS) || defined (VXWORKS) - ACE_Time_Value time_poll = ACE_Time_Value::zero; - ACE_Handle_Set rd_mask; -#endif /* ACE_WIN32 || MVS || ACE_PSOS || VXWORKS */ - - ACE_Event_Handler *eh = 0; - int result = 0; - - for (ACE_Select_Reactor_Handler_Repository_Iterator iter (&this->handler_rep_); - iter.next (eh) != 0; - iter.advance ()) - { - ACE_HANDLE handle = eh->get_handle (); - - // Skip back to the beginning of the loop if the HANDLE is - // invalid. - if (handle == ACE_INVALID_HANDLE) - continue; - -#if defined (ACE_WIN32) || defined (__MVS__) || defined (ACE_PSOS) || defined (VXWORKS) - // Win32 needs to do the check this way because fstat won't work on - // a socket handle. MVS Open Edition needs to do it this way because, - // even though the docs say to check a handle with either select or - // fstat, the fstat method always says the handle is ok. - // pSOS needs to do it this way because file handles and socket handles - // are maintained by separate pieces of the system. VxWorks needs the select - // variant since fstat always returns an error on socket FDs. - rd_mask.set_bit (handle); - - int select_width; -# if defined (ACE_WIN64) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -# else - select_width = int (handle) + 1; -# endif /* ACE_WIN64 */ - - if (ACE_OS::select (select_width, - rd_mask, 0, 0, - &time_poll) < 0) - { - result = 1; - this->remove_handler_i (handle, - ACE_Event_Handler::ALL_EVENTS_MASK); - } - rd_mask.clr_bit (handle); -#else /* !ACE_WIN32 && !MVS && !ACE_PSOS */ - struct stat temp; - - if (ACE_OS::fstat (handle, &temp) == -1) - { - result = 1; - this->remove_handler_i (handle, - ACE_Event_Handler::ALL_EVENTS_MASK); - } -#endif /* ACE_WIN32 || MVS || ACE_PSOS */ - } - - return result; -} - -template void -ACE_Select_Reactor_T::dump (void) const -{ - ACE_TRACE ("ACE_Select_Reactor_T::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - this->timer_queue_->dump (); - this->handler_rep_.dump (); - this->signal_handler_->dump (); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("delete_signal_handler_ = %d\n"), - this->delete_signal_handler_)); - - ACE_HANDLE h; - - for (ACE_Handle_Set_Iterator handle_iter_wr (this->wait_set_.wr_mask_); - (h = handle_iter_wr ()) != ACE_INVALID_HANDLE; - ++handle_iter_wr) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("write_handle = %d\n"), h)); - - for (ACE_Handle_Set_Iterator handle_iter_rd (this->wait_set_.rd_mask_); - (h = handle_iter_rd ()) != ACE_INVALID_HANDLE; - ++handle_iter_rd) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("read_handle = %d\n"), h)); - - for (ACE_Handle_Set_Iterator handle_iter_ex (this->wait_set_.ex_mask_); - (h = handle_iter_ex ()) != ACE_INVALID_HANDLE; - ++handle_iter_ex) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("except_handle = %d\n"), h)); - - for (ACE_Handle_Set_Iterator handle_iter_wr_ready (this->ready_set_.wr_mask_); - (h = handle_iter_wr_ready ()) != ACE_INVALID_HANDLE; - ++handle_iter_wr_ready) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("write_handle_ready = %d\n"), h)); - - for (ACE_Handle_Set_Iterator handle_iter_rd_ready (this->ready_set_.rd_mask_); - (h = handle_iter_rd_ready ()) != ACE_INVALID_HANDLE; - ++handle_iter_rd_ready) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("read_handle_ready = %d\n"), h)); - - for (ACE_Handle_Set_Iterator handle_iter_ex_ready (this->ready_set_.ex_mask_); - (h = handle_iter_ex_ready ()) != ACE_INVALID_HANDLE; - ++handle_iter_ex_ready) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("except_handle_ready = %d\n"), h)); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("restart_ = %d\n"), this->restart_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nrequeue_position_ = %d\n"), this->requeue_position_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ninitialized_ = %d\n"), this->initialized_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nowner_ = %d\n"), this->owner_)); - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - this->notify_handler_->dump (); - this->token_.dump (); -#endif /* ACE_MT_SAFE */ - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} -#endif /* ACE_SELECT_REACTOR_T_C */ diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h deleted file mode 100644 index ca51ff20d0d..00000000000 --- a/ace/Select_Reactor_T.h +++ /dev/null @@ -1,778 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Select_Reactor_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_SELECT_REACTOR_T_H -#define ACE_SELECT_REACTOR_T_H -#include "ace/pre.h" - -#include "ace/Select_Reactor_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Select_Reactor_Token_T - * - * @brief Used as a synchronization mechanism to coordinate concurrent - * access to a Select_Reactor object. - * - * This class is used to make the - * thread-safe. By default, the thread that runs the - * loop holds the token, even when it is blocked - * in the call and gets - * ``re-acquired'' as soon as the - * there would be a good chance that the could have - * been modified while the . Thus, it is not critical to change the - * . The implementation of the mechanism - * provided by the enables the - * default owner to be the thread that executes the dispatch - * loop. - */ -template -class ACE_Select_Reactor_Token_T : public ACE_SELECT_REACTOR_MUTEX -{ -public: - - ACE_Select_Reactor_Token_T (ACE_Select_Reactor_Impl &r, - int s_queue = ACE_SELECT_TOKEN::FIFO); - ACE_Select_Reactor_Token_T (int s_queue = ACE_SELECT_TOKEN::FIFO); - virtual ~ACE_Select_Reactor_Token_T (void); - - /// Called just before the ACE_Event_Handler goes to sleep. - virtual void sleep_hook (void); - - /// Get the select_reactor implementation - ACE_Select_Reactor_Impl &select_reactor (void); - - /// Set the select_reactor implementation - void select_reactor (ACE_Select_Reactor_Impl &); - - /// Dump the state of an object. - virtual void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - ACE_Select_Reactor_Impl *select_reactor_; -}; - -/** - * @class ACE_Select_Reactor_T - * - * @brief An object oriented event demultiplexor and event handler - * dispatcher. - * - * The is an object-oriented event - * demultiplexor and event handler dispatcher. The sources of - * events that the waits for and dispatches - * includes I/O events, signals, and timer events. All public - * methods acquire the main lock and - * call down to private or protected methods, which assume that - * the lock is held and so therefore don't (re)acquire the lock. - */ -template -class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl -{ -public: - - // = Initialization and termination methods. - - /// If is non-0 then the reactor will - /// not create a notification pipe, which will save two I/O handles - /// but will elide the feature. If is - /// 1 the reactor is "signal-safe" when dispatching handlers to - /// signal events, whereas if is 0 the reactor will - /// be more efficient, but not signal-safe (which may be perfectly - /// fine if your application doesn't use the reactor to handle signals). - ACE_Select_Reactor_T (ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int disable_notify_pipe = 0, - ACE_Reactor_Notify *notify = 0, - int mask_signals = 1, - int s_queue = ACE_SELECT_TOKEN::FIFO); - - /// Initialize @c ACE_Select_Reactor with size @arg size. - /// If @arg disable_notify_pipe is non-0 then the reactor will - /// not create a notification pipe, which will save two I/O handles - /// but will elide the notification feature. If @arg mask_signals is - /// 1 the reactor is "signal-safe" when dispatching handlers to - /// signal events, whereas if @arg mask_signals is 0 the reactor will - /// be more efficient, but not signal-safe (which may be perfectly - /// fine if your application doesn't use the reactor to handle signals). - /** - * @note On Unix platforms, the size parameter should be as large as - * the maximum number of file descriptors allowed for a given - * process. This is necessary since a file descriptor is used - * to directly index the array of event handlers maintained by - * the Reactor's handler repository. Direct indexing is used - * for efficiency reasons. - */ - ACE_Select_Reactor_T (size_t size, - int restart = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int disable_notify_pipe = 0, - ACE_Reactor_Notify *notify = 0, - int mask_signals = 1, - int s_queue = ACE_SELECT_TOKEN::FIFO); - - /** - * Initialize the @c ACE_Select_Reactor to manage - * @arg max_number_of_handles. If @arg restart is non-0 then the - * @c ACE_Reactor's @c handle_events method will be restarted - * automatically when @c EINTR occurs. If @arg signal_handler or - * @arg timer_queue are non-0 they are used as the signal handler and - * timer queue, respectively. If @arg disable_notify_pipe is non-0 the - * notification pipe is not created, thereby saving two I/O handles. - * - * @note On Unix platforms, the maximum_number_of_handles parameter - * should be as large as the maximum number of file - * descriptors allowed for a given process. This is necessary - * since a file descriptor is used to directly index the array - * of event handlers maintained by the Reactor's handler - * repository. Direct indexing is used for efficiency - * reasons. - */ - virtual int open (size_t max_number_of_handles = DEFAULT_SIZE, - int restart = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int disable_notify_pipe = 0, - ACE_Reactor_Notify * = 0); - - /// Returns -1 (not used in this implementation); - virtual int current_info (ACE_HANDLE, size_t & /* size */); - - /// Use a user specified signal handler instead. - virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); - - /// @deprecated The following method is deprecated. Use instead. - /// Set a user specified timer queue. - virtual int set_timer_queue (ACE_Timer_Queue *tq); - - /// Set a user-specified timer queue. - virtual int timer_queue (ACE_Timer_Queue *tq); - - /// Return the current . - virtual ACE_Timer_Queue *timer_queue (void) const; - - /// Close down the select_reactor and release all of its resources. - virtual int close (void); - - /// Close down the select_reactor and release all of its resources. - virtual ~ACE_Select_Reactor_T (void); - - // = Event loop drivers. - - /** - * Returns non-zero if there are I/O events "ready" for dispatching, - * but does not actually dispatch the event handlers. By default, - * don't block while checking this, i.e., "poll". - */ - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); - - /** - * This event loop driver that blocks for before - * returning. It will return earlier if timer events, I/O events, - * or signal events occur. Note that can be 0, in - * which case this method blocks indefinitely until events occur. - * - * is decremented to reflect how much time this call - * took. For instance, if a time value of 3 seconds is passed to - * handle_events and an event occurs after 2 seconds, - * will equal 1 second. This can be used if an - * application wishes to handle events for some fixed amount of - * time. - * - * Returns the total number of I/O and Timer s - * that were dispatched, 0 if the elapsed without - * dispatching any handlers, or -1 if something goes wrong. - * - * Current is identical to - * . - */ - virtual int handle_events (ACE_Time_Value *max_wait_time = 0); - virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0); - - /** - * This method is just like the one above, except the - * value is a reference and can therefore never be - * NULL. - * - * Current is identical to - * . - */ - virtual int handle_events (ACE_Time_Value &max_wait_time); - virtual int alertable_handle_events (ACE_Time_Value &max_wait_time); - - // = Event handling control. - - /** - * Return the status of Reactor. If this function returns 0, the reactor is - * actively handling events. If it returns non-zero, and - * return -1 immediately. - */ - virtual int deactivated (void); - - /** - * Control whether the Reactor will handle any more incoming events or not. - * If == 1, the Reactor will be disabled. By default, a reactor - * is in active state and can be deactivated/reactived as wish. - */ - virtual void deactivate (int do_stop); - - // = Register and remove s. - /** - * Register a with a particular . Note that the - * will call to - * extract the underlying I/O handle. - */ - virtual int register_handler (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - - /** - * Register a with a particular . Note that since the - * is given the Select_Reactor will *not* call - * to extract the underlying I/O - * handle. - */ - virtual int register_handler (ACE_HANDLE handle, - ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - -#if defined (ACE_WIN32) - - // Originally this interface was available for all platforms, but - // because ACE_HANDLE is an int on non-Win32 platforms, compilers - // are not able to tell the difference between - // register_handler(ACE_Event_Handler*,ACE_Reactor_Mask) and - // register_handler(ACE_Event_Handler*,ACE_HANDLE). Therefore, we - // have restricted this method to Win32 only. - - /// Not implemented. - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_HANDLE event_handle = ACE_INVALID_HANDLE); - -#endif /* ACE_WIN32 */ - - /// Not implemented. - virtual int register_handler (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /// Register with all the in the . - virtual int register_handler (const ACE_Handle_Set &handles, - ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - - /** - * Register to handle the signal using the - * . Returns the that was previously registered - * (if any), along with the of the signal handler. - */ - virtual int register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0, - ACE_Event_Handler **old_sh = 0, - ACE_Sig_Action *old_disp = 0); - - /// Registers to handle a set of signals using the - /// . - virtual int register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0); - - /** - * Removes the binding of from the Select_Reactor. If - * there are no more bindings for this then it is removed from - * the Select_Reactor. Note that the Select_Reactor will call - * to extract the underlying I/O - * handle. - */ - virtual int remove_handler (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - - /** - * Removes the bind of whose handle is - * from the Select_Reactor. If there are no more bindings - * for this then it is removed from the Select_Reactor. - */ - virtual int remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask); - - /** - * Removes all the bindings for handles in the - * bind of . If there are no more bindings for any - * of these handlers then they are removed from the Select_Reactor. - */ - virtual int remove_handler (const ACE_Handle_Set &handle_set, - ACE_Reactor_Mask); - - /** - * Remove the ACE_Event_Handler currently associated with . - * is ignored in this implementation since there is only - * one instance of a signal handler. Install the new disposition - * (if given) and return the previous disposition (if desired by the - * caller). Returns 0 on success and -1 if is invalid. - */ - virtual int remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp = 0, - int sigkey = -1); - - /// Calls for every signal in . - virtual int remove_handler (const ACE_Sig_Set &sigset); - - // = Suspend and resume Handlers. - - /// Temporarily suspend the associated with . - virtual int suspend_handler (ACE_Event_Handler *eh); - - /// Temporarily suspend the associated with . - virtual int suspend_handler (ACE_HANDLE handle); - - /// Suspend all in handle set temporarily. - virtual int suspend_handler (const ACE_Handle_Set &handles); - - /// Suspend all the in the Select_Reactor. - virtual int suspend_handlers (void); - - /// Resume a temporarily suspend associated with - /// . - virtual int resume_handler (ACE_Event_Handler *eh); - - /// Resume a temporarily suspended associated with - /// . - virtual int resume_handler (ACE_HANDLE handle); - - /// Resume all in handle set. - virtual int resume_handler (const ACE_Handle_Set &handles); - - /// Resume all the in the Select_Reactor. - virtual int resume_handlers (void); - - /** - * Return 1 if we any event associations were made by the reactor - * for the handles that it waits on, 0 otherwise. Since the - * Select_Reactor does not do any event associations, this function - * always return 0. - */ - virtual int uses_event_associations (void); - - // = Timer management. - /** - * Schedule an ACE_Event_Handler that will expire after an amount - * of time. The return value of this method, a timer_id value, - * uniquely identifies the event_handler in the ACE_Reactor's - * internal list of timers. - * This timer_id value can be used to cancel the timer - * with the cancel_timer() call. - * - * @see cancel_timer() - * @see reset_timer_interval() - * - * @param event_handler Event handler to schedule on reactor - * @param arg Argument passed to the handle_timeout() method of event_handler - * @param delay Time interval after which the timer will expire - * @param interval Time interval after which the timer will be automatically rescheduled - * @return -1 on failure, a timer_id value on success - */ - virtual long schedule_timer (ACE_Event_Handler * event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero); - - /** - * Resets the interval of the timer represented by to - * , which is specified in relative time to the current - * . If is equal to - * , the timer will become a non-rescheduling - * timer. Returns 0 if successful, -1 if not. - */ - virtual int reset_timer_interval (long timer_id, - const ACE_Time_Value &interval); - - /** - * Cancel all that match the address of - * . If is 0 then the - * method of will be invoked. - * Returns number of handler's cancelled. - */ - virtual int cancel_timer (ACE_Event_Handler *event_handler, - int dont_call_handle_close = 1); - - /** - * Cancel the single that matches the - * value (which was returned from the method). If arg is - * non-NULL then it will be set to point to the ``magic cookie'' - * argument passed in when the was registered. This - * makes it possible to free up the memory and avoid memory leaks. - * If is 0 then the method - * of will be invoked. Returns 1 if cancellation - * succeeded and 0 if the wasn't found. - */ - virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1); - - // = High-level Event_Handler scheduling operations - - /// ADD the dispatch MASK "bit" bound with the and the . - virtual int schedule_wakeup (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - - /// ADD the dispatch MASK "bit" bound with the and the . - virtual int schedule_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask mask); - - /// CLR the dispatch MASK "bit" bound with the and the . - virtual int cancel_wakeup (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - - /// CLR the dispatch MASK "bit" bound with the and the . - virtual int cancel_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask mask); - - // = Notification methods. - /** - * Called by a thread when it wants to unblock the Select_Reactor. - * This wakeups the if currently blocked in - * indicates that a passive-mode - // socket handle is "ready" and when we call . During this - // interval, the client can shutdown the connection, in which case, - // the call can hang! - this->peer_acceptor_.enable (ACE_NONBLOCK); - return 0; -} - -template -ACE_Accept_Strategy::ACE_Accept_Strategy - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - int reuse_addr, - ACE_Reactor *reactor) - : reactor_ (reactor) -{ - ACE_TRACE ("ACE_Accept_Strategy::ACE_Accept_Strategy"); - - if (this->open (local_addr, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("open"))); -} - -template int -ACE_Accept_Strategy::accept_svc_handler - (SVC_HANDLER *svc_handler) -{ - ACE_TRACE ("ACE_Accept_Strategy::accept_svc_handler"); - - // Try to find out if the implementation of the reactor that we are - // using requires us to reset the event association for the newly - // created handle. This is because the newly created handle will - // inherit the properties of the listen handle, including its event - // associations. - int reset_new_handle = this->reactor_->uses_event_associations (); - - if (this->peer_acceptor_.accept (svc_handler->peer (), // stream - 0, // remote address - 0, // timeout - 1, // restart - reset_new_handle // reset new handler - ) == -1) - { - // Close down handler to avoid memory leaks. - svc_handler->close (0); - - return -1; - } - else - return 0; -} - -template int -ACE_Connect_Strategy::connect_svc_handler -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_Connect_Strategy::connect_svc_handler"); - - return this->connector_.connect (sh->peer (), - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms); -} - -template int -ACE_Connect_Strategy::connect_svc_handler -(SVC_HANDLER *&sh, - SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_Connect_Strategy::connect_svc_handler"); - - int result = - this->connector_.connect (sh->peer (), - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms); - sh_copy = sh; - return result; -} - -template int -ACE_Process_Strategy::open (size_t n_processes, - ACE_Event_Handler *acceptor, - ACE_Reactor *reactor, - int avoid_zombies) -{ - ACE_TRACE ("ACE_Process_Strategy::open"); - this->n_processes_ = n_processes; - this->acceptor_ = acceptor; - this->reactor_ = reactor; - this->flags_ = avoid_zombies; - - return 0; -} - -template int -ACE_Process_Strategy::activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg) -{ - ACE_TRACE ("ACE_Process_Strategy::activate_svc_handler"); - - // If is non-0 then we won't create zombies. - switch (ACE::fork (ACE_LIB_TEXT ("child"), this->flags_)) - { - case -1: - svc_handler->destroy (); - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("fork")), - -1); - /* NOTREACHED */ - case 0: // In child process. - - // Close down the SOCK_Acceptor's handle since we don't need to - // keep it open. - if (this->acceptor_ != 0) - // Ignore the return value here... - (void) this->reactor_->remove_handler (this->acceptor_, - ACE_Event_Handler::ACCEPT_MASK); - - // Call up to our ancestor in the inheritance to do the - // SVC_HANDLER initialization. - return this->inherited::activate_svc_handler (svc_handler, arg); - /* NOTREACHED */ - default: // In parent process. - // We need to close down the here because it's - // running in the child. - svc_handler->destroy (); - return 0; - } -} - -template -ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy -(creation_strategy_type *cre_s, - ACE_Concurrency_Strategy *con_s, - ACE_Recycling_Strategy *rec_s, - MUTEX *lock, - int delete_lock) - : lock_ (lock), - delete_lock_ (delete_lock), - reverse_lock_ (0), - creation_strategy_ (0), - delete_creation_strategy_ (0), - concurrency_strategy_ (0), - delete_concurrency_strategy_ (0), - recycling_strategy_ (0), - delete_recycling_strategy_ (0) -{ - // Create a new lock if necessary. - if (this->lock_ == 0) - { - ACE_NEW (this->lock_, - MUTEX); - - this->delete_lock_ = 1; - } - - ACE_NEW (this->reverse_lock_, - REVERSE_MUTEX (*this->lock_)); - - if (this->open (cre_s, - con_s, - rec_s) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy"))); -} - -template -ACE_Cached_Connect_Strategy::~ACE_Cached_Connect_Strategy (void) -{ - if (this->delete_lock_) - delete this->lock_; - - delete this->reverse_lock_; - - if (this->delete_creation_strategy_) - delete this->creation_strategy_; - this->delete_creation_strategy_ = 0; - this->creation_strategy_ = 0; - - if (this->delete_concurrency_strategy_) - delete this->concurrency_strategy_; - this->delete_concurrency_strategy_ = 0; - this->concurrency_strategy_ = 0; - - if (this->delete_recycling_strategy_) - delete this->recycling_strategy_; - this->delete_recycling_strategy_ = 0; - this->recycling_strategy_ = 0; - - // Close down all cached service handlers. - CONNECTION_MAP_ENTRY *entry; - for (CONNECTION_MAP_ITERATOR iterator (connection_map_); - iterator.next (entry); - iterator.advance ()) - { - entry->int_id_->recycler (0, 0); - entry->int_id_->close (); - } -} - -template int -ACE_Cached_Connect_Strategy::open -(creation_strategy_type *cre_s, - ACE_Concurrency_Strategy *con_s, - ACE_Recycling_Strategy *rec_s) -{ - // Initialize the creation strategy. - - // First we decide if we need to clean up. - if (this->creation_strategy_ != 0 && - this->delete_creation_strategy_ != 0 && - cre_s != 0) - { - delete this->creation_strategy_; - this->creation_strategy_ = 0; - this->delete_creation_strategy_ = 0; - } - - if (cre_s != 0) - this->creation_strategy_ = cre_s; - else if (this->creation_strategy_ == 0) - { - ACE_NEW_RETURN (this->creation_strategy_, - CREATION_STRATEGY, -1); - this->delete_creation_strategy_ = 1; - } - - // Initialize the concurrency strategy. - - if (this->concurrency_strategy_ != 0 && - this->delete_concurrency_strategy_ != 0 && - con_s != 0) - { - delete this->concurrency_strategy_; - this->concurrency_strategy_ = 0; - this->delete_concurrency_strategy_ = 0; - } - - if (con_s != 0) - this->concurrency_strategy_ = con_s; - else if (this->concurrency_strategy_ == 0) - { - ACE_NEW_RETURN (this->concurrency_strategy_, - CONCURRENCY_STRATEGY, -1); - this->delete_concurrency_strategy_ = 1; - } - - // Initialize the recycling strategy. - - if (this->recycling_strategy_ != 0 && - this->delete_recycling_strategy_ != 0 && - rec_s != 0) - { - delete this->recycling_strategy_; - this->recycling_strategy_ = 0; - this->delete_recycling_strategy_ = 0; - } - - if (rec_s != 0) - this->recycling_strategy_ = rec_s; - else if (this->recycling_strategy_ == 0) - { - ACE_NEW_RETURN (this->recycling_strategy_, - RECYCLING_STRATEGY, -1); - this->delete_recycling_strategy_ = 1; - } - - return 0; -} - -template int -ACE_Cached_Connect_Strategy::check_hint_i -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - CONNECTION_MAP_ENTRY *&entry, - int &found) -{ - ACE_UNUSED_ARG (remote_addr); - ACE_UNUSED_ARG (timeout); - ACE_UNUSED_ARG (local_addr); - ACE_UNUSED_ARG (reuse_addr); - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (perms); - - found = 0; - - // Get the recycling act for the svc_handler - CONNECTION_MAP_ENTRY *possible_entry = (CONNECTION_MAP_ENTRY *) sh->recycling_act (); - - // Check to see if the hint svc_handler has been closed down - if (possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED) - { - // If close, decrement refcount - if (possible_entry->ext_id_.decrement () == 0) - { - // If refcount goes to zero, close down the svc_handler - possible_entry->int_id_->recycler (0, 0); - possible_entry->int_id_->close (); - this->purge_i (possible_entry); - } - - // Hint not successful - found = 0; - - // Reset hint - sh = 0; - } - - // If hint is not closed, see if it is connected to the correct - // address and is recyclable - else if ((possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE || - possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE) && - possible_entry->ext_id_.subject () == remote_addr) - { - // Hint successful - found = 1; - - // Tell the that it should prepare itself for - // being recycled. - this->prepare_for_recycling (sh); - } - else - { - // This hint will not be used. - possible_entry->ext_id_.decrement (); - - // Hint not successful - found = 0; - - // If is not connected to the correct address or is busy, - // we will not use it. - sh = 0; - } - - if (found) - entry = possible_entry; - - return 0; -} - -template int -ACE_Cached_Connect_Strategy::find_or_create_svc_handler_i -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - CONNECTION_MAP_ENTRY *&entry, - int &found) -{ - // Explicit type conversion - REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr); - - // Try to find the address in the cache. Only if we don't find it - // do we create a new and connect it with the server. - if (this->find (search_addr, entry) == -1) - { - // Set the flag - found = 0; - - // We need to use a temporary variable here since we are not - // allowed to change because other threads may use this - // when we let go of the lock during the OS level connect. - // - // Note that making a new svc_handler, connecting remotely, - // binding to the map, and assigning of the hint and recycler - // should be atomic to the outside world. - SVC_HANDLER *potential_handler = 0; - - // Create a new svc_handler - if (this->make_svc_handler (potential_handler) == -1) - return -1; - - // Actively establish the connection. This is a timed blocking - // connect. - if (this->new_connection (potential_handler, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms) == -1) - { - // If connect() failed because of timeouts, we have to - // reject the connection entirely. This is necessary since - // currently there is no way for the non-blocking connects - // to complete and for the to notify the cache - // of the completion of connect(). - if (errno == EWOULDBLOCK) - errno = ENOTSUP; - - // Close the svc handler. - potential_handler->close (0); - - return -1; - } - else - { - // Insert the new SVC_HANDLER instance into the cache. - if (this->connection_map_.bind (search_addr, - potential_handler, - entry) == -1) - { - // Close the svc handler. - potential_handler->close (0); - - return -1; - } - - // Everything succeeded as planned. Assign to . - sh = potential_handler; - - // Set the recycler and the recycling act - this->assign_recycler (sh, this, entry); - } - } - else - // We found a cached svc_handler. - { - // Set the flag - found = 1; - - // Get the cached - sh = entry->int_id_; - - // Tell the that it should prepare itself for - // being recycled. - this->prepare_for_recycling (sh); - } - - return 0; -} - -template int -ACE_Cached_Connect_Strategy::new_connection -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - // Yow, Reverse Guard! Let go of the lock for the duration of the - // actual connect. This will allow other threads to hack on the - // connection cache while this thread creates the new connection. - ACE_GUARD_RETURN (REVERSE_MUTEX, ace_mon, *this->reverse_lock_, -1); - - return this->CONNECT_STRATEGY::connect_svc_handler (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms); -} - -template int -ACE_Cached_Connect_Strategy::connect_svc_handler -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - int found = 0; - - // This artificial scope is required since we need to let go of the - // lock *before* registering the newly created handler with the - // Reactor. - { - // Synchronization is required here as the setting of the - // recyclable state must be done atomically with the finding and - // binding of the service handler in the cache. - ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1); - - int result = this->connect_svc_handler_i (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms, - found); - if (result != 0) - return result; - - } - - // If it is a new connection, activate it. - // - // Note: This activation is outside the scope of the lock of the - // cached connector. This is necessary to avoid subtle deadlock - // conditions with this lock and the Reactor lock. - - if (!found) - { - if (this->activate_svc_handler (sh) == -1) - { - // If an error occurs while activating the handler, the - // method will close the handler. - // This in turn will remove this entry from the internal - // table. - - // Synchronization is required here as the setting of the - // handler to zero must be done atomically with the users of - // the cache. - ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1); - - // Reset handler. - sh = 0; - - return -1; - } - } - - return 0; -} - -template int -ACE_Cached_Connect_Strategy::connect_svc_handler -(SVC_HANDLER *&sh, - SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms) -{ - int found = 0; - - // This artificial scope is required since we need to let go of the - // lock *before* registering the newly created handler with the - // Reactor. - { - // Synchronization is required here as the setting of the - // recyclable state must be done atomically with the finding and - // binding of the service handler in the cache. - ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1); - - int result = this->connect_svc_handler_i (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms, - found); - sh_copy = sh; - - if (result != 0) - return result; - - } - - // If it is a new connection, activate it. - // - // Note: This activation is outside the scope of the lock of the - // cached connector. This is necessary to avoid subtle deadlock - // conditions with this lock and the Reactor lock. - - if (!found) - { - if (this->activate_svc_handler (sh_copy) == -1) - { - // If an error occurs while activating the handler, the - // method will close the handler. - // This in turn will remove this entry from the internal - // table. - - // Synchronization is required here as the setting of the - // handler to zero must be done atomically with the users of - // the cache. - ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1); - - // Reset handler. - sh = 0; - sh_copy = 0; - - return -1; - } - } - - return 0; -} - -template int -ACE_Cached_Connect_Strategy::connect_svc_handler_i -(SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - int& found) -{ - CONNECTION_MAP_ENTRY *entry = 0; - - // Check if the user passed a hint svc_handler - if (sh != 0) - { - int result = this->check_hint_i (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms, - entry, - found); - if (result != 0) - return result; - } - - // If not found - if (!found) - { - int result = this->find_or_create_svc_handler_i (sh, - remote_addr, - timeout, - local_addr, - reuse_addr, - flags, - perms, - entry, - found); - if (result != 0) - return result; - } - - // For all successful cases: mark the in the cache - // as being . Therefore recyclable is BUSY. - entry->ext_id_.recycle_state (ACE_RECYCLABLE_BUSY); - - // And increment the refcount - entry->ext_id_.increment (); - - return 0; -} - -template int -ACE_Cached_Connect_Strategy::cache (const void *recycling_act) -{ - // Synchronization is required here as the setting of the recyclable - // state must be done atomically with respect to other threads that - // are querying the cache. - ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1); - - return this->cache_i (recycling_act); -} - -template int -ACE_Cached_Connect_Strategy::cache_i (const void *recycling_act) -{ - // The wonders and perils of ACT - CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act; - - // Mark the in the cache as not being . - // Therefore recyclable is IDLE. - entry->ext_id_.recycle_state (ACE_RECYCLABLE_IDLE_AND_PURGABLE); - - return 0; -} - -template int -ACE_Cached_Connect_Strategy::recycle_state (const void *recycling_act, - ACE_Recyclable_State new_state) -{ - // Synchronization is required here as the setting of the recyclable - // state must be done atomically with respect to other threads that - // are querying the cache. - ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1); - - return this->recycle_state_i (recycling_act, - new_state); -} - -template int -ACE_Cached_Connect_Strategy::recycle_state_i (const void *recycling_act, - ACE_Recyclable_State new_state) -{ - // The wonders and perils of ACT - CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act; - - // Mark the in the cache as not being . - // Therefore recyclable is IDLE. - entry->ext_id_.recycle_state (new_state); - - return 0; -} - -template ACE_Recyclable_State -ACE_Cached_Connect_Strategy::recycle_state (const void *recycling_act) const -{ - // Const cast. - SELF *fake_this = ACE_const_cast (SELF *, this); - - // Synchronization is required here. - ACE_GUARD_RETURN (MUTEX, ace_mon, *fake_this->lock_, ACE_RECYCLABLE_UNKNOWN); - - return this->recycle_state_i (recycling_act); -} - -template ACE_Recyclable_State -ACE_Cached_Connect_Strategy::recycle_state_i (const void *recycling_act) const -{ - // The wonders and perils of ACT - CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act; - - // Mark the in the cache as not being . - // Therefore recyclable is IDLE. - return entry->ext_id_.recycle_state (); -} - -template int -ACE_Cached_Connect_Strategy::purge (const void *recycling_act) -{ - // Excluded other threads from changing cache while we take this - // entry out. - ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1); - - return this->purge_i (recycling_act); -} - -template int -ACE_Cached_Connect_Strategy::purge_i (const void *recycling_act) -{ - // The wonders and perils of ACT - CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act; - - return this->connection_map_.unbind (entry); -} - -template int -ACE_Cached_Connect_Strategy::mark_as_closed (const void *recycling_act) -{ - // Excluded other threads from changing cache while we take this - // entry out. - ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1); - - return this->mark_as_closed_i (recycling_act); -} - -template int -ACE_Cached_Connect_Strategy::mark_as_closed_i (const void *recycling_act) -{ - // The wonders and perils of ACT - CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act; - - // Mark the in the cache as CLOSED. - entry->ext_id_.recycle_state (ACE_RECYCLABLE_CLOSED); - - return 0; -} - -template int -ACE_Cached_Connect_Strategy::cleanup_hint (const void *recycling_act, - void **act_holder) -{ - // Excluded other threads from changing cache while we take this - // entry out. - ACE_GUARD_RETURN (MUTEX, ace_mon, *this->lock_, -1); - - return this->cleanup_hint_i (recycling_act, - act_holder); -} - -template int -ACE_Cached_Connect_Strategy::cleanup_hint_i (const void *recycling_act, - void **act_holder) -{ - // Reset the <*act_holder> in the confines and protection of the - // lock. - if (act_holder) - *act_holder = 0; - - // The wonders and perils of ACT - CONNECTION_MAP_ENTRY *entry = (CONNECTION_MAP_ENTRY *) recycling_act; - - // Decrement the refcount on the . - int refcount = entry->ext_id_.decrement (); - - // If the svc_handler state is closed and the refcount == 0, call - // close() on svc_handler. - if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED && - refcount == 0) - { - entry->int_id_->recycler (0, 0); - entry->int_id_->close (); - this->purge_i (entry); - } - - return 0; -} - -template ACE_Creation_Strategy * -ACE_Cached_Connect_Strategy::creation_strategy (void) const -{ - return this->creation_strategy_; -} - -template ACE_Recycling_Strategy * -ACE_Cached_Connect_Strategy::recycling_strategy (void) const -{ - return this->recycling_strategy_; -} - -template ACE_Concurrency_Strategy * -ACE_Cached_Connect_Strategy::concurrency_strategy (void) const -{ - return this->concurrency_strategy_; -} - -template int -ACE_Cached_Connect_Strategy::find ( - REFCOUNTED_HASH_RECYCLABLE_ADDRESS &search_addr, - CONNECTION_MAP_ENTRY *&entry) -{ - typedef ACE_Hash_Map_Bucket_Iterator, - ACE_Equal_To, - ACE_Null_Mutex> - CONNECTION_MAP_BUCKET_ITERATOR; - - CONNECTION_MAP_BUCKET_ITERATOR iterator (this->connection_map_, - search_addr); - - CONNECTION_MAP_BUCKET_ITERATOR end (this->connection_map_, - search_addr, - 1); - - for (; - iterator != end; - ++iterator) - { - REFCOUNTED_HASH_RECYCLABLE_ADDRESS &addr = (*iterator).ext_id_; - - if (addr.recycle_state () != ACE_RECYCLABLE_IDLE_AND_PURGABLE && - addr.recycle_state () != ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE) - continue; - - if (addr.subject () != search_addr.subject ()) - continue; - - entry = &(*iterator); - return 0; - } - - return -1; -} - -template void -ACE_DLL_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_DLL_Strategy::dump"); -} - -template void -ACE_Concurrency_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Concurrency_Strategy::dump"); -} - -template void -ACE_Reactive_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Reactive_Strategy::dump"); -} - -template void -ACE_Thread_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Thread_Strategy::dump"); -} - -template void -ACE_Accept_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Accept_Strategy::dump"); -} - -template void -ACE_Connect_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Connect_Strategy::dump"); -} - -template void -ACE_Process_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Process_Strategy::dump"); -} - -template void -ACE_Scheduling_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Scheduling_Strategy::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template void -ACE_Schedule_All_Reactive_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy::dump"); - - ACE_Scheduling_Strategy::dump (); -} - -template void -ACE_Schedule_All_Threaded_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy::dump"); - - ACE_Scheduling_Strategy::dump (); -} - -template ACE_INLINE void -ACE_Singleton_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Singleton_Strategy::dump"); -} - -template void -ACE_Creation_Strategy::dump (void) const -{ - ACE_TRACE ("ACE_Creation_Strategy::dump"); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Creation_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_Singleton_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_DLL_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_Concurrency_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_Connect_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_Process_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_Accept_Strategy) -ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Strategy) - -#endif /* ACE_STRATEGIES_T_CPP */ diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h deleted file mode 100644 index aeef4908030..00000000000 --- a/ace/Strategies_T.h +++ /dev/null @@ -1,1073 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Strategies_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_STRATEGIES_T_H -#define ACE_STRATEGIES_T_H - -#include "ace/pre.h" - -#include "ace/Hash_Map_Manager_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Reactor.h" -#include "ace/Thread_Manager.h" -#include "ace/Connection_Recycling_Strategy.h" -#include "ace/Refcountable.h" -#include "ace/Hashable.h" -#include "ace/Recyclable.h" - - -// Needed for broken linkers that can't grok long symbols. -#define ACE_Refcounted_Hash_Recyclable ARHR - - -class ACE_Service_Repository; - -/** - * @class ACE_Recycling_Strategy - * - * @brief Defines the interface (and default implementation) for - * specifying a recycling strategy for a SVC_HANDLER. - * - * Acts as a consular to the Svc_Handler, preparing it for the - * tough times ahead when the Svc_Handler will be recycled. - */ -template -class ACE_Recycling_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_TYPENAME SVC_HANDLER::addr_type addr_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - - /// Virtual Destructor - virtual ~ACE_Recycling_Strategy (void); - - /// Tell the Svc_Handler something about the recycler, so that it can - /// reach the recycler when necessary. - virtual int assign_recycler (SVC_HANDLER *svc_handler, - ACE_Connection_Recycling_Strategy *recycler, - const void *recycling_act); - - /// This allows us to prepare the svc_handler for recycling. - virtual int prepare_for_recycling (SVC_HANDLER *svc_handler); -}; - -/** - * @class ACE_Creation_Strategy - * - * @brief Defines the interface for specifying a creation strategy for - * a SVC_HANDLER. - * - * The default behavior is to make a new SVC_HANDLER. However, - * subclasses can override this strategy to perform SVC_HANDLER - * creation in any way that they like (such as creating subclass - * instances of SVC_HANDLER, using a singleton, dynamically - * linking the handler, etc.). - */ -template -class ACE_Creation_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_TYPENAME SVC_HANDLER::addr_type addr_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - - // = Initialization and termination methods. - - /// Default constructor. - ACE_Creation_Strategy (ACE_Thread_Manager * = 0, - ACE_Reactor * = ACE_Reactor::instance ()); - - /// An ACE_Thread_Manager is useful when creating active objects and - /// the ACE_Reactor is used to initialize the service handler's reactor. - int open (ACE_Thread_Manager * = 0, - ACE_Reactor * = ACE_Reactor::instance ()); - - virtual ~ACE_Creation_Strategy (void); - - // = Factory method. - /** - * Create a SVC_HANDLER with the appropriate creation strategy. The - * default behavior of this method is to make a new if - * == 0 (passing in the ), else is - * unchanged. Returns -1 on failure, else 0. - */ - virtual int make_svc_handler (SVC_HANDLER *&sh); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Pointer to a thread manager. - ACE_Thread_Manager *thr_mgr_; - - /// Pointer to an ACE_Reactor. - ACE_Reactor *reactor_; -}; - -/** - * @class ACE_Singleton_Strategy - * - * @brief Defines the interface for specifying a creation strategy for - * a that always returns the same (i.e., - * it's a Singleton). - * - * Note that this class takes over the ownership of the - * SVC_HANDLER passed into it as a parameter and it becomes - * responsible for deleting this object. - */ -template -class ACE_Singleton_Strategy : public ACE_Creation_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy base_type; - - // = Initialization and termination methods. - ACE_Singleton_Strategy (SVC_HANDLER * = 0, - ACE_Thread_Manager * = 0); - int open (SVC_HANDLER *, - ACE_Thread_Manager * = 0); - virtual ~ACE_Singleton_Strategy (void); - - // = Factory method. - /// Create a Singleton SVC_HANDLER by always returning the same - /// SVC_HANDLER. Returns -1 on failure, else 0. - virtual int make_svc_handler (SVC_HANDLER *&); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Pointer to the Singleton svc_handler. - SVC_HANDLER *svc_handler_; - - /// Keep track of whether we need to delete the . - int delete_svc_handler_; -}; - -/** - * @class ACE_DLL_Strategy - * - * @brief Defines the interface for specifying a creation strategy for - * a SVC_HANDLER based on dynamic linking of the SVC_HANDLER. - */ -template -class ACE_DLL_Strategy : public ACE_Creation_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy base_type; - - // = Intialization and termination methods. - - /// "Do-nothing" constructor. - ACE_DLL_Strategy (void); - - /// Initialize the DLL strategy based upon the service's DLL - /// information contained in the string. - ACE_DLL_Strategy (const char dll_name[], - const char factory_function[], - const char svc_name[], - ACE_Service_Repository *, - ACE_Thread_Manager * = 0); - - /// Initialize the DLL strategy based upon the service's DLL - /// information contained in the string. - int open (const char dll_name[], - const char factory_function[], - const char svc_name[], - ACE_Service_Repository *, - ACE_Thread_Manager * = 0); - - // = Factory method. - /// Create a SVC_HANDLER by dynamically linking it from a DLL. - /// Returns -1 on failure, else 0. - virtual int make_svc_handler (SVC_HANDLER *&); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - typedef ACE_Creation_Strategy inherited; - - /// Name of the DLL to dynamically link. - char dll_name_[MAXPATHLEN + 1]; - - /// Name of the factory function in the shared library to use to - /// obtain a pointer to the new SVC_HANDLER. - char factory_function_[MAXPATHLEN + 1]; - - /// Name of the service. - char svc_name_[MAXNAMELEN + 1]; - - /// Pointer to the . - ACE_Service_Repository *svc_rep_; -}; - -/** - * @class ACE_Concurrency_Strategy - * - * @brief Defines the interface for specifying a concurrency strategy - * for a SVC_HANDLER. - * - * Default behavior is to activate the SVC_HANDLER by calling - * its method (which allows the SVC_HANDLER to define its - * own concurrency strategy). However, subclasses can override - * this default strategy to do more sophisticated concurrency - * activations (such as creating the SVC_HANDLER as an active - * object via multi-threading or multi-processing). - */ -template -class ACE_Concurrency_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_TYPENAME SVC_HANDLER::addr_type addr_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - - /// Constructor - ACE_Concurrency_Strategy (int flags = 0); - - // = Factory method. - /** - * Activate the with an appropriate concurrency - * strategy. The default behavior of this method is to activate the - * SVC_HANDLER by calling its method (which allows the - * SVC_HANDLER to define its own concurrency strategy). - */ - virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); - - virtual ~ACE_Concurrency_Strategy (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - - /// Flags that are parsed to set options for the connected - /// . - int flags_; -}; - -/** - * @class ACE_Reactive_Strategy - * - * @brief Defines the interface for specifying a Reactive concurrency - * strategy for a SVC_HANDLER. - * - * This class provides a strategy that registers the - * with a . - */ -template -class ACE_Reactive_Strategy : public ACE_Concurrency_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Concurrency_Strategy base_type; - - // = Intialization and termination methods. - /// "Do-nothing constructor" - ACE_Reactive_Strategy (int flags = 0); - - /// Initialize the strategy. - ACE_Reactive_Strategy (ACE_Reactor *reactor, - ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK, - int flags = 0); - - /// Initialize the strategy. - virtual int open (ACE_Reactor *reactor, - ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK, - int flags = 0); - - /// Destructor. - virtual ~ACE_Reactive_Strategy (void); - - // = Factory method. - /// Activate the by registering it with the - /// and then calling it's hook. - virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - typedef ACE_Concurrency_Strategy inherited; - - /// Pointer to the Reactor we'll use to register the . - ACE_Reactor *reactor_; - - /// The mask that we pass to the when we register the - /// . - ACE_Reactor_Mask mask_; -}; - -/** - * @class ACE_Thread_Strategy - * - * @brief Defines the interface for specifying a concurrency strategy - * for a based on multithreading. - * - * This class provides a strategy that manages the creation of - * threads to handle requests from clients concurrently. It - * behaves as a "thread factory", spawning threads "on-demand" - * to run the service specified by a user-supplied - * . - */ -template -class ACE_Thread_Strategy : public ACE_Concurrency_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Concurrency_Strategy base_type; - - // = Intialization and termination methods. - /// "Do-nothing constructor" - ACE_Thread_Strategy (int flags = 0); - - /// Initialize the strategy. - ACE_Thread_Strategy (ACE_Thread_Manager *tm, - long thr_flags, - int n_threads = 1, - int flags = 0); - - /// Initialize the strategy. - virtual int open (ACE_Thread_Manager *tm, - long thr_flags, - int n_threads = 1, - int flags = 0); - - virtual ~ACE_Thread_Strategy (void); - - // = Factory method. - /** - * Activate the with an appropriate concurrency - * strategy. This method activates the SVC_HANDLER by first calling - * its method and then calling its method to turn - * it into an active object. - */ - virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - typedef ACE_Concurrency_Strategy inherited; - - /// Thread manager for this class (must be provided). - ACE_Thread_Manager *thr_mgr_; - - /// Flags to pass into the method. - long thr_flags_; - - /// Number of threads to spawn. - int n_threads_; -}; - -/** - * @class ACE_Process_Strategy - * - * @brief Defines the interface for specifying a concurrency strategy - * for a based on multiprocessing. - * - * This class provides a strategy that manages the creation of - * processes to handle requests from clients concurrently. It - * behaves as a "process factory", using to fork - * threads "on-demand" to run the service specified by a - * user-supplied in a separate process. - */ -template -class ACE_Process_Strategy : public ACE_Concurrency_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Concurrency_Strategy base_type; - - // = Intialization and termination methods. - - /// Initialize the strategy. If is non-0 then set a - /// flag to to avoid zombies. - ACE_Process_Strategy (size_t n_processes = 1, - ACE_Event_Handler *acceptor = 0, - ACE_Reactor * = 0, - int avoid_zombies = 0); - - /// Initialize the strategy. If is non-0 then set a - /// flag to to avoid zombies. - virtual int open (size_t n_processes = 1, - ACE_Event_Handler *acceptor = 0, - ACE_Reactor * = 0, - int avoid_zombies = 0); - - virtual ~ACE_Process_Strategy (void); - - // = Factory method. - /** - * Activate the with an appropriate concurrency - * strategy. This method activates the SVC_HANDLER by first forking - * and then calling the method of the SVC_HANDLER in the - * child. - */ - virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - typedef ACE_Concurrency_Strategy inherited; - - /// Number of processes to spawn. - size_t n_processes_; - - /** - * This is the in the parent is listening on. We need to - * make sure that we remove it from the Reactor and close it down in - * the child. - */ - ACE_Event_Handler *acceptor_; - - /** - * This is the the child is using in conjunction with the - * . We need to remove the from this - * in the child. - */ - ACE_Reactor *reactor_; -}; - -/** - * @class ACE_Accept_Strategy - * - * @brief Defines the interface for specifying a passive connection - * acceptance strategy for a SVC_HANDLER. - * - * This class provides a strategy that manages passive - * connection acceptance of a client. - */ -template -class ACE_Accept_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_PEER_ACCEPTOR_ADDR addr_type; - typedef ACE_PEER_ACCEPTOR acceptor_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - - // = Initialization and termination methods. - /// Default constructor. - ACE_Accept_Strategy (ACE_Reactor *reactor = ACE_Reactor::instance ()); - - /// Initialize the with . - ACE_Accept_Strategy (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - int restart = 0, - ACE_Reactor *reactor = ACE_Reactor::instance ()); - - /// Initialize the with , indicating - /// whether to if it's already in use. - virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - int reuse_addr = 0); - - /// Return the underlying ACE_HANDLE of the . - virtual ACE_HANDLE get_handle (void) const; - - /// Return a reference to the . - virtual ACE_PEER_ACCEPTOR &acceptor (void) const; - - virtual ~ACE_Accept_Strategy (void); - - // = Factory method. - /// The default behavior delegates to the method of the - /// PEER_ACCEPTOR. - virtual int accept_svc_handler (SVC_HANDLER *); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Factory that establishes connections passively. - ACE_PEER_ACCEPTOR peer_acceptor_; - - /// Pointer to the reactor used by the Acceptor. - ACE_Reactor *reactor_; - - /// Needed to reopen the socket if fails. - int reuse_addr_; - - /// Needed to reopen the socket if fails. - ACE_PEER_ACCEPTOR_ADDR peer_acceptor_addr_; -}; - -/** - * @class ACE_Connect_Strategy - * - * @brief Defines the interface for specifying an active - * connection establishment strategy for a SVC_HANDLER. - * - * This class provides a strategy that manages active - * connection establishment to a server. - */ -template -class ACE_Connect_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_PEER_CONNECTOR_ADDR addr_type; - typedef ACE_PEER_CONNECTOR connector_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - - // = Initialization and termination methods. - /// Default constructor. - ACE_Connect_Strategy (void); - - /// Return a reference to the . - virtual ACE_PEER_CONNECTOR &connector (void) const; - - virtual ~ACE_Connect_Strategy (void); - - // = Factory method. - /// The default behavior delegates to the method of the - /// . - virtual int connect_svc_handler (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - - /** - * The default behavior delegates to the method of the - * . - * Please check the documentation in Connector.h for more details. - */ - virtual int connect_svc_handler (SVC_HANDLER *&sh, - SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Factory that establishes connections actively. - ACE_PEER_CONNECTOR connector_; -}; - -/** - * @class ACE_Scheduling_Strategy - * - * @brief Defines the interface for specifying how to suspend and - * resume a service . - * - * This class provides a strategy that allows arbitrarily - * sophisticated service suspension and resumption. The default - * behavior is to do nothing... - */ -template -class ACE_Scheduling_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_TYPENAME SVC_HANDLER::addr_type addr_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - - // = Initialization and termination methods. - - /// Constructor - ACE_Scheduling_Strategy (SVC_HANDLER * = 0); - - /// Destructor - virtual ~ACE_Scheduling_Strategy (void); - - // = Scheduling methods - - /// Suspend hook. - virtual int suspend (void); - - /// Resume hook. - virtual int resume (void); - - /// Dump the state of the object. - virtual void dump (void) const; -}; - -/** - * @class ACE_Schedule_All_Reactive_Strategy - * - * @brief Defines the interface for specifying how to suspend and - * resume a single-threaded reactive service . - * - * This class provides a strategy that suspends and resumes all - * the Event_Handlers in a Reactor in one fell swoop. - */ -template -class ACE_Schedule_All_Reactive_Strategy - : public ACE_Scheduling_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Scheduling_Strategy base_type; - - // = Initialization and termination methods. - /// Constructor - ACE_Schedule_All_Reactive_Strategy (SVC_HANDLER * = 0); - - // = Scheduling methods - - /// Suspend hook. - virtual int suspend (void); - - /// Resume hook. - virtual int resume (void); - - /// Dump the state of the object. - virtual void dump (void) const; - -protected: - - /// Reactor - ACE_Reactor *reactor_; -}; - -/** - * @class ACE_Schedule_All_Threaded_Strategy - * - * @brief Defines the interface for specifying how to suspend and - * resume a multithreaded service . - * - * This class provides a strategy that suspends and resumes all - * the Event_Handlers controlled by a Thread_Manager in one fell swoop. - */ -template -class ACE_Schedule_All_Threaded_Strategy - : public ACE_Scheduling_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Scheduling_Strategy base_type; - - // = Initialization and termination methods. - /// Constructor - ACE_Schedule_All_Threaded_Strategy (SVC_HANDLER * = 0); - - // = Scheduling methods - - /// Suspend hook. - virtual int suspend (void); - - /// Resume hook. - virtual int resume (void); - - /// Dump the state of the object. - virtual void dump (void) const; - -protected: - - /// Thread Manager - ACE_Thread_Manager *thr_mgr_; -}; - -/** - * @class ACE_NOOP_Creation_Strategy - * - * @brief Implements a no-op creation strategy in order to defer - * decisions regarding creation to some later point in time, such - * as in connect or accept strategy. - * - * An example of the use of this is in the - * , which only returns a single - * connection for a given endpoint. - */ -template -class ACE_NOOP_Creation_Strategy : public ACE_Creation_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy base_type; - - /// This is a no-op. - virtual int make_svc_handler (SVC_HANDLER *&); -}; - -/** - * @class ACE_NOOP_Concurrency_Strategy - * - * @brief Implements a no-op activation strategy in order to avoid - * calling open on a svc_handler multiple times. - * - * An example of the use of this is in the - * , which reuses svc_handlers. - * Therefore we don't want to call open on the recycled - * svc_handler more than once. - */ -template -class ACE_NOOP_Concurrency_Strategy - : public ACE_Concurrency_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Concurrency_Strategy base_type; - - // = Factory method. - /// This is a no-op. - virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); -}; - -template -class ACE_Refcounted_Hash_Recyclable : public ACE_Refcountable, - public ACE_Hashable, - public ACE_Recyclable -{ -public: - /// Default constructor. - ACE_Refcounted_Hash_Recyclable (void); - - /// Constructor. - ACE_Refcounted_Hash_Recyclable (const T &t, - int refcount = 0, - ACE_Recyclable_State state = ACE_RECYCLABLE_UNKNOWN); - - /// Destructor - virtual ~ACE_Refcounted_Hash_Recyclable (void); - - /// Compares two instances. - int operator== (const ACE_Refcounted_Hash_Recyclable &rhs) const; - int operator!= (const ACE_Refcounted_Hash_Recyclable &rhs) const; - - T &subject (); - -protected: - /// Computes and returns hash value. - u_long hash_i (void) const; - - T t_; -}; - -/** - * @class ACE_Cached_Connect_Strategy - * - * @brief A connection strategy which caches connections to peers - * (represented by instances), thereby allowing - * subsequent re-use of unused, but available, connections. - * - * is intended to be used as a - * plug-in connection strategy for . - * It's added value is re-use of established connections. - */ -template -class ACE_Cached_Connect_Strategy - : public ACE_Connection_Recycling_Strategy, - public ACE_Connect_Strategy -{ -public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy - creation_strategy_type; - typedef ACE_Connect_Strategy - connect_strategy_type; - typedef ACE_Concurrency_Strategy - concurrency_strategy_type; - typedef ACE_Recycling_Strategy recycling_strategy_type; - - // = Define some useful (old style) traits. - typedef ACE_Creation_Strategy - CREATION_STRATEGY; - typedef ACE_Concurrency_Strategy - CONCURRENCY_STRATEGY; - typedef ACE_Recycling_Strategy - RECYCLING_STRATEGY; - - // = Super class - typedef ACE_Connect_Strategy - CONNECT_STRATEGY; - - - typedef ACE_Cached_Connect_Strategy SELF; - - /// Constructor - ACE_Cached_Connect_Strategy (ACE_Creation_Strategy *cre_s = 0, - ACE_Concurrency_Strategy *con_s = 0, - ACE_Recycling_Strategy *rec_s = 0, - MUTEX *mutex = 0, - int delete_mutex = 0); - - /// Destructor - virtual ~ACE_Cached_Connect_Strategy (void); - - /// This methods allow you to change the strategies used by the - /// cached connector. - virtual int open (ACE_Creation_Strategy *cre_s, - ACE_Concurrency_Strategy *con_s, - ACE_Recycling_Strategy *rec_s); - - /// Template method for making a new - virtual int make_svc_handler (SVC_HANDLER *&sh); - - /// Template method for activating a new - virtual int activate_svc_handler (SVC_HANDLER *svc_handler); - - /// Template method for setting the recycler information of the - /// svc_handler. - virtual int assign_recycler (SVC_HANDLER *svc_handler, - ACE_Connection_Recycling_Strategy *recycler, - const void *recycling_act); - - /// Template method for preparing the svc_handler for recycling. - virtual int prepare_for_recycling (SVC_HANDLER *svc_handler); - - /** - * Checks to see if there is already a in the cache - * connected to the . If so, we return this pointer. - * Otherwise we establish the connection, put it into the cache, and - * return the pointer. <[NOTE]>: the <{reuse_addr}> - * argument does NOT control re-use of addresses in the cache. - * Rather, if the underlying protocol requires a "dead time" prior - * to re-use of its addresses (TCP is a classic example of this), - * <{and}> the protocol provides a means by which to defeat the dead - * time, setting this argument to non-zero will defeat the dead-time - * requirement. <{Dev. Note: We might want to consider enhancing - * the interface at some point so that this also controls re-use of - * the cache.}> - */ - virtual int connect_svc_handler (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - virtual int connect_svc_handler (SVC_HANDLER *&sh, - SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - - /// Remove from cache. - virtual int purge (const void *recycling_act); - - /// Add to cache. - virtual int cache (const void *recycling_act); - - /// Get/Set . - virtual int recycle_state (const void *recycling_act, - ACE_Recyclable_State new_state); - virtual ACE_Recyclable_State recycle_state (const void *recycling_act) const; - - /// Mark as closed. - virtual int mark_as_closed (const void *recycling_act); - - /** - * Mark as closed (non-locking version). This method needs to be public - * as it is used in the cleanup of handlers where teh locked version causes - * a deadlock. - */ - virtual int mark_as_closed_i (const void *recycling_act); - - /// Cleanup hint and reset <*act_holder> to zero if . - virtual int cleanup_hint (const void *recycling_act, - void **act_holder = 0); - - // = Traits for managing the map - typedef ACE_Refcounted_Hash_Recyclable - REFCOUNTED_HASH_RECYCLABLE_ADDRESS; - typedef ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> - CONNECTION_MAP; - - typedef ACE_TYPENAME CONNECTION_MAP::ITERATOR CONNECTION_MAP_ITERATOR; - typedef ACE_TYPENAME CONNECTION_MAP::ENTRY CONNECTION_MAP_ENTRY; - - typedef ACE_Reverse_Lock REVERSE_MUTEX; - - // = Strategy accessors - virtual ACE_Creation_Strategy *creation_strategy (void) const; - virtual ACE_Recycling_Strategy *recycling_strategy (void) const; - virtual ACE_Concurrency_Strategy *concurrency_strategy (void) const; - -protected: - - /// Creates a new connection. - virtual int new_connection (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); - - /// Find an idle handle. - int find (REFCOUNTED_HASH_RECYCLABLE_ADDRESS &search_addr, - CONNECTION_MAP_ENTRY *&entry); - - /// Remove from cache (non-locking version). - virtual int purge_i (const void *recycling_act); - - /// Add to cache (non-locking version). - virtual int cache_i (const void *recycling_act); - - /// Set (non-locking version). - virtual int recycle_state_i (const void *recycling_act, - ACE_Recyclable_State new_state); - - /// Get (non-locking version). - virtual ACE_Recyclable_State recycle_state_i (const void *recycling_act) const; - - /// Cleanup hint and reset <*act_holder> to zero if . - virtual int cleanup_hint_i (const void *recycling_act, - void **act_holder); - - // = Helpers - int check_hint_i (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - CONNECTION_MAP_ENTRY *&entry, - int &found); - - int find_or_create_svc_handler_i (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - CONNECTION_MAP_ENTRY *&entry, - int &found); - - virtual int connect_svc_handler_i ( - SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms, - int &found); - - /// Table that maintains the cache of connected s. - CONNECTION_MAP connection_map_; - - /// Mutual exclusion for this object. - MUTEX *lock_; - - /// Mutual exclusion for this object. - int delete_lock_; - - /// Reverse lock. - REVERSE_MUTEX *reverse_lock_; - - // = Strategy objects. - - /// Creation strategy for an . - CREATION_STRATEGY *creation_strategy_; - - /// 1 if created the creation strategy and thus should - /// delete it, else 0. - int delete_creation_strategy_; - - /// Concurrency strategy for an . - CONCURRENCY_STRATEGY *concurrency_strategy_; - - /// 1 if created the concurrency strategy and thus should - /// delete it, else 0. - int delete_concurrency_strategy_; - - /// Recycling strategy for an . - RECYCLING_STRATEGY *recycling_strategy_; - - /// 1 if created the recycling strategy and thus should - /// delete it, else 0. - int delete_recycling_strategy_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Strategies_T.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Strategies_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - - -#endif /* ACE_STRATEGIES_T_H */ diff --git a/ace/Strategies_T.i b/ace/Strategies_T.i deleted file mode 100644 index 41582fc6e95..00000000000 --- a/ace/Strategies_T.i +++ /dev/null @@ -1,443 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -template ASYS_INLINE -ACE_Recycling_Strategy::~ACE_Recycling_Strategy (void) -{ -} - -template ASYS_INLINE int -ACE_Recycling_Strategy::assign_recycler (SVC_HANDLER *svc_handler, - ACE_Connection_Recycling_Strategy *recycler, - const void *recycling_act) -{ - svc_handler->recycler (recycler, recycling_act); - return 0; -} - -template ASYS_INLINE int -ACE_Recycling_Strategy::prepare_for_recycling (SVC_HANDLER *svc_handler) -{ - return svc_handler->recycle (); -} - -template ASYS_INLINE -ACE_Singleton_Strategy::ACE_Singleton_Strategy (SVC_HANDLER *sh, - ACE_Thread_Manager *tm) - : svc_handler_ (0), - delete_svc_handler_ (1) -{ - ACE_TRACE ("ACE_Singleton_Strategy::ACE_Singleton_Strategy"); - if (this->open (sh, tm) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Singleton_Strategy"))); -} - -template ASYS_INLINE -ACE_Singleton_Strategy::~ACE_Singleton_Strategy (void) -{ - ACE_TRACE ("ACE_Singleton_Strategy::~ACE_Singleton_Strategy"); - if (this->delete_svc_handler_ != 0) - delete this->svc_handler_; -} - -// Create a Singleton SVC_HANDLER by always returning the same -// SVC_HANDLER. - -template ASYS_INLINE int -ACE_Singleton_Strategy::make_svc_handler (SVC_HANDLER *&sh) -{ - ACE_TRACE ("ACE_Singleton_Strategy::make_svc_handler"); - sh = this->svc_handler_; - return 0; -} - -template ASYS_INLINE int -ACE_Creation_Strategy::open (ACE_Thread_Manager *thr_mgr, - ACE_Reactor *reactor) -{ - ACE_TRACE ("ACE_Creation_Strategy::open"); - this->thr_mgr_ = thr_mgr; - this->reactor_ = reactor; - return 0; -} - -template ASYS_INLINE -ACE_Creation_Strategy::ACE_Creation_Strategy (ACE_Thread_Manager *thr_mgr, - ACE_Reactor *reactor) -{ - ACE_TRACE ("ACE_Creation_Strategy::ACE_Creation_Strategy"); - if (this->open (thr_mgr, reactor) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Creation_Strategy"))); -} - -// Default behavior is to make a new SVC_HANDLER, passing in the -// Thread_Manager (if any). - -template ASYS_INLINE int -ACE_Creation_Strategy::make_svc_handler (SVC_HANDLER *&sh) -{ - ACE_TRACE ("ACE_Creation_Strategy::make_svc_handler"); - - if (sh == 0) - ACE_NEW_RETURN (sh, SVC_HANDLER (this->thr_mgr_), -1); - sh->reactor (this->reactor_); - return 0; -} - -template ASYS_INLINE -ACE_Creation_Strategy::~ACE_Creation_Strategy (void) -{ - ACE_TRACE ("ACE_Creation_Strategy::~ACE_Creation_Strategy"); -} - -template ASYS_INLINE -ACE_DLL_Strategy::ACE_DLL_Strategy (const char dll_name[], - const char factory_function[], - const char svc_name[], - ACE_Service_Repository *svc_rep, - ACE_Thread_Manager *thr_mgr) -{ - ACE_TRACE ("ACE_DLL_Strategy::ACE_DLL_Strategy"); - if (this->open (dll_name, - factory_function, - svc_name, - svc_rep, - thr_mgr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("open"))); -} - -template ASYS_INLINE -ACE_DLL_Strategy::ACE_DLL_Strategy (void) -{ - ACE_TRACE ("ACE_DLL_Strategy::ACE_DLL_Strategy"); -} - -template ASYS_INLINE -ACE_Concurrency_Strategy::ACE_Concurrency_Strategy (int flags) - : flags_ (flags) -{ - ACE_TRACE ("ACE_Concurrency_Strategy::~ACE_Concurrency_Strategy"); -} - -template ASYS_INLINE -ACE_Concurrency_Strategy::~ACE_Concurrency_Strategy (void) -{ - ACE_TRACE ("ACE_Concurrency_Strategy::~ACE_Concurrency_Strategy"); -} - -template ASYS_INLINE -ACE_Reactive_Strategy::ACE_Reactive_Strategy (ACE_Reactor *reactor, - ACE_Reactor_Mask mask, - int flags) -{ - ACE_TRACE ("ACE_Reactive_Strategy::ACE_Reactive_Strategy"); - - if (this->open (reactor, - mask, - flags) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Reactive_Strategy::ACE_Reactive_Strategy"))); -} - -template ASYS_INLINE -ACE_Reactive_Strategy::ACE_Reactive_Strategy (int flags) - : ACE_Concurrency_Strategy (flags), - reactor_ (0), - mask_ (ACE_Event_Handler::NULL_MASK) -{ - ACE_TRACE ("ACE_Reactive_Strategy::ACE_Reactive_Strategy"); -} - -template ASYS_INLINE -ACE_Reactive_Strategy::~ACE_Reactive_Strategy (void) -{ - ACE_TRACE ("ACE_Reactive_Strategy::~ACE_Reactive_Strategy"); -} - -template ASYS_INLINE -ACE_Thread_Strategy::ACE_Thread_Strategy (ACE_Thread_Manager *thr_mgr, - long thr_flags, - int n_threads, - int flags) -{ - ACE_TRACE ("ACE_Thread_Strategy::ACE_Thread_Strategy"); - - if (this->open (thr_mgr, - thr_flags, - n_threads, - flags) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Thread_Strategy::ACE_Thread_Strategy"))); -} - -template ASYS_INLINE -ACE_Thread_Strategy::ACE_Thread_Strategy (int flags) - : ACE_Concurrency_Strategy (flags), - thr_mgr_ (0), - thr_flags_ (0), - n_threads_ (1) -{ - ACE_TRACE ("ACE_Thread_Strategy::ACE_Thread_Strategy"); -} - -template ASYS_INLINE -ACE_Thread_Strategy::~ACE_Thread_Strategy (void) -{ - ACE_TRACE ("ACE_Thread_Strategy::~ACE_Thread_Strategy"); -} - -template ASYS_INLINE -ACE_Accept_Strategy::ACE_Accept_Strategy (ACE_Reactor *reactor) - : reactor_ (reactor) -{ - ACE_TRACE ("ACE_Accept_Strategy::ACE_Accept_Strategy"); -} - -template ASYS_INLINE ACE_HANDLE -ACE_Accept_Strategy::get_handle (void) const -{ - ACE_TRACE ("ACE_Accept_Strategy::get_handle"); - return this->peer_acceptor_.get_handle (); -} - -template ASYS_INLINE ACE_PEER_ACCEPTOR & -ACE_Accept_Strategy::acceptor (void) const -{ - ACE_TRACE ("ACE_Accept_Strategy::acceptor"); - return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_; -} - -template ASYS_INLINE -ACE_Accept_Strategy::~ACE_Accept_Strategy (void) -{ - ACE_TRACE ("ACE_Accept_Strategy::~ACE_Accept_Strategy"); - - // Close the underlying acceptor. - this->peer_acceptor_.close (); -} - -template ASYS_INLINE ACE_PEER_CONNECTOR & -ACE_Connect_Strategy::connector (void) const -{ - ACE_TRACE ("ACE_Connect_Strategy::connector"); - return (ACE_PEER_CONNECTOR &) this->connector_; -} - -template ASYS_INLINE -ACE_Connect_Strategy::ACE_Connect_Strategy (void) -{ - ACE_TRACE ("ACE_Connect_Strategy::ACE_Connect_Strategy"); -} - -template ASYS_INLINE -ACE_Connect_Strategy::~ACE_Connect_Strategy (void) -{ - ACE_TRACE ("ACE_Connect_Strategy::~ACE_Connect_Strategy"); -} - -template ASYS_INLINE -ACE_Process_Strategy::ACE_Process_Strategy (size_t n_processes, - ACE_Event_Handler *acceptor, - ACE_Reactor *reactor, - int avoid_zombies) -{ - ACE_TRACE ("ACE_Process_Strategy::ACE_Process_Strategy"); - if (this->open (n_processes, - acceptor, - reactor, - avoid_zombies) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Process_Strategy"))); -} - -template ASYS_INLINE -ACE_Process_Strategy::~ACE_Process_Strategy (void) -{ - ACE_TRACE ("ACE_Process_Strategy::~ACE_Process_Strategy"); -} - -template ASYS_INLINE -ACE_Scheduling_Strategy::ACE_Scheduling_Strategy (SVC_HANDLER *) -{ - ACE_TRACE ("ACE_Scheduling_Strategy::ACE_Scheduling_Strategy"); -} - -template ASYS_INLINE -ACE_Scheduling_Strategy::~ACE_Scheduling_Strategy (void) -{ - ACE_TRACE ("ACE_Scheduling_Strategy::~ACE_Scheduling_Strategy"); -} - -template ASYS_INLINE int -ACE_Scheduling_Strategy::suspend (void) -{ - ACE_TRACE ("ACE_Scheduling_Strategy::suspend"); - return -1; -} - -template ASYS_INLINE int -ACE_Scheduling_Strategy::resume (void) -{ - ACE_TRACE ("ACE_Scheduling_Strategy::resume"); - return -1; -} - -template ASYS_INLINE -ACE_Schedule_All_Reactive_Strategy::ACE_Schedule_All_Reactive_Strategy - (SVC_HANDLER *scheduler) - : ACE_Scheduling_Strategy (scheduler) -{ - ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy::ACE_Schedule_All_Reactive_Strategy"); - - if (scheduler == 0 || scheduler->reactor () == 0) - this->reactor_ = ACE_Reactor::instance (); - else - this->reactor_ = scheduler->reactor (); -} - -template ASYS_INLINE int -ACE_Schedule_All_Reactive_Strategy::suspend (void) -{ - ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy::suspend"); - return this->reactor_->suspend_handlers (); -} - -template ASYS_INLINE int -ACE_Schedule_All_Reactive_Strategy::resume (void) -{ - ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy::resume"); - return this->reactor_->resume_handlers (); -} - -template ASYS_INLINE -ACE_Schedule_All_Threaded_Strategy::ACE_Schedule_All_Threaded_Strategy - (SVC_HANDLER *scheduler) - : ACE_Scheduling_Strategy (scheduler) -{ - ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy::ACE_Schedule_All_Threaded_Strategy"); - - if (scheduler == 0 || scheduler->thr_mgr () == 0) - this->thr_mgr_ = ACE_Thread_Manager::instance (); - else - this->thr_mgr_ = scheduler->thr_mgr (); -} - -template ASYS_INLINE int -ACE_Schedule_All_Threaded_Strategy::suspend (void) -{ - ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy::suspend"); - return this->thr_mgr_->suspend_all (); -} - -template ASYS_INLINE int -ACE_Schedule_All_Threaded_Strategy::resume (void) -{ - ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy::resume"); - return this->thr_mgr_->resume_all (); -} - -template ASYS_INLINE -ACE_Refcounted_Hash_Recyclable::ACE_Refcounted_Hash_Recyclable (void) - : ACE_Refcountable (0), - ACE_Hashable (), - ACE_Recyclable (ACE_RECYCLABLE_UNKNOWN), - t_ () -{ -} - -template ASYS_INLINE -ACE_Refcounted_Hash_Recyclable::ACE_Refcounted_Hash_Recyclable (const T &t, - int refcount, - ACE_Recyclable_State state) - : ACE_Refcountable (refcount), - ACE_Hashable (), - ACE_Recyclable (state), - t_ (t) -{ -} - -template ASYS_INLINE -ACE_Refcounted_Hash_Recyclable::~ACE_Refcounted_Hash_Recyclable (void) -{ -} - -template ASYS_INLINE u_long -ACE_Refcounted_Hash_Recyclable::hash_i (void) const -{ - return this->t_.hash (); -} - -template ASYS_INLINE T & -ACE_Refcounted_Hash_Recyclable::subject (void) -{ - return this->t_; -} - -template ASYS_INLINE int -ACE_Refcounted_Hash_Recyclable::operator== (const ACE_Refcounted_Hash_Recyclable &rhs) const -{ - return this->recycle_state () == rhs.recycle_state () && - this->t_ == rhs.t_; -} - -template ASYS_INLINE int -ACE_Refcounted_Hash_Recyclable::operator!= (const ACE_Refcounted_Hash_Recyclable &rhs) const -{ - return !this->operator== (rhs); -} - -template ASYS_INLINE int -ACE_NOOP_Creation_Strategy::make_svc_handler (SVC_HANDLER *&) -{ - ACE_TRACE ("ACE_NOOP_Creation_Strategy::make_svc_handler"); - return 0; -} - -template ASYS_INLINE int -ACE_NOOP_Concurrency_Strategy::activate_svc_handler (SVC_HANDLER *, - void *) -{ - ACE_TRACE ("ACE_NOOP_Concurrency_Strategy::activate_svc_handler"); - return 0; -} - -template ASYS_INLINE int -ACE_Cached_Connect_Strategy::make_svc_handler - (SVC_HANDLER *&sh) -{ - return this->creation_strategy_->make_svc_handler (sh); -} - -template ASYS_INLINE int -ACE_Cached_Connect_Strategy::activate_svc_handler - (SVC_HANDLER *svc_handler) -{ - return this->concurrency_strategy_->activate_svc_handler (svc_handler); -} - -template ASYS_INLINE int -ACE_Cached_Connect_Strategy::assign_recycler - (SVC_HANDLER *svc_handler, - ACE_Connection_Recycling_Strategy *recycler, - const void *recycling_act) -{ - return this->recycling_strategy_->assign_recycler (svc_handler, - recycler, - recycling_act); -} - -template ASYS_INLINE int -ACE_Cached_Connect_Strategy::prepare_for_recycling - (SVC_HANDLER *svc_handler) -{ - return this->recycling_strategy_->prepare_for_recycling (svc_handler); -} diff --git a/ace/Stream.cpp b/ace/Stream.cpp deleted file mode 100644 index fb9ba6e09b3..00000000000 --- a/ace/Stream.cpp +++ /dev/null @@ -1,614 +0,0 @@ -// Stream.cpp -// $Id$ - -#ifndef ACE_STREAM_C -#define ACE_STREAM_C - -//#include "ace/Module.h" -#include "ace/Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Stream_Modules.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Stream.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Stream, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Stream) - -// Give some idea of what the heck is going on in a stream! - -template void -ACE_Stream::dump (void) const -{ - ACE_TRACE ("ACE_Stream::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------- module links --------\n"))); - - for (ACE_Module *mp = this->stream_head_; - ; - mp = mp->next ()) - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("module name = %s\n"), mp->name ())); - if (mp == this->stream_tail_) - break; - } - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------- writer links --------\n"))); - - ACE_Task *tp; - - for (tp = this->stream_head_->writer (); - ; - tp = tp->next ()) - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("writer queue name = %s\n"), tp->name ())); - tp->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------\n"))); - if (tp == this->stream_tail_->writer () - || (this->linked_us_ - && tp == this->linked_us_->stream_head_->reader ())) - break; - } - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------- reader links --------\n"))); - for (tp = this->stream_tail_->reader (); ; tp = tp->next ()) - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("reader queue name = %s\n"), tp->name ())); - tp->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------\n"))); - if (tp == this->stream_head_->reader () - || (this->linked_us_ - && tp == this->linked_us_->stream_head_->writer ())) - break; - } -} - -template int -ACE_Stream::push (ACE_Module *new_top) -{ - ACE_TRACE ("ACE_Stream::push"); - if (this->push_module (new_top, - this->stream_head_->next (), - this->stream_head_) == -1) - return -1; - else - return 0; -} - -template int -ACE_Stream::put (ACE_Message_Block *mb, ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_Stream::put"); - return this->stream_head_->writer ()->put (mb, tv); -} - -template int -ACE_Stream::get (ACE_Message_Block *&mb, ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_Stream::get"); - return this->stream_head_->reader ()->getq (mb, tv); -} - -// Return the "top" ACE_Module in a ACE_Stream, skipping over the -// stream_head. - -template int -ACE_Stream::top (ACE_Module *&m) -{ - ACE_TRACE ("ACE_Stream::top"); - if (this->stream_head_->next () == this->stream_tail_) - return -1; - else - { - m = this->stream_head_->next (); - return 0; - } -} - -template int -ACE_Stream::insert (const ACE_TCHAR *prev_name, - ACE_Module *mod) -{ - ACE_TRACE ("ACE_Stream::insert"); - - for (ACE_Module *prev_mod = this->stream_head_; - prev_mod != 0; - prev_mod = prev_mod->next ()) - if (ACE_OS::strcmp (prev_mod->name (), prev_name) == 0) - { - ACE_Module *next_mod = prev_mod->next (); - - // We can't insert a module below . - if (next_mod == 0) - return -1; - - mod->link (next_mod); - prev_mod->link (mod); - - if (mod->reader ()->open (mod->arg ()) == -1) - return -1; - - if (mod->writer ()->open (mod->arg ()) == -1) - return -1; - - return 0; - } - - return -1; -} - -template int -ACE_Stream::replace (const ACE_TCHAR *replace_name, - ACE_Module *mod, - int flags) -{ - ACE_TRACE ("ACE_Stream::replace"); - ACE_Module *prev_mod = 0; - - for (ACE_Module *rep_mod = this->stream_head_; - rep_mod != 0; - rep_mod = rep_mod->next ()) - if (ACE_OS::strcmp (rep_mod->name (), replace_name) == 0) - { - ACE_Module *next_mod = rep_mod->next (); - - if (next_mod) - mod->link (next_mod); - else // In case the is . - { - mod->writer ()->next (0); - mod->next (0); - this->stream_tail_ = mod; - } - - if (prev_mod) - prev_mod->link (mod); - else // In case the is . - { - mod->reader ()->next (0); - this->stream_head_ = mod; - } - - if (mod->reader ()->open (mod->arg ()) == -1) - return -1; - - if (mod->writer ()->open (mod->arg ()) == -1) - return -1; - - if (flags != ACE_Module::M_DELETE_NONE) - { - rep_mod->close (flags); - delete rep_mod; - } - - return 0; - } - else - prev_mod = rep_mod; - - return -1; -} - -// Remove the "top" ACE_Module in a ACE_Stream, skipping over the -// stream_head. - -template int -ACE_Stream::pop (int flags) -{ - ACE_TRACE ("ACE_Stream::pop"); - if (this->stream_head_->next () == this->stream_tail_) - return -1; - else - { - // Skip over the ACE_Stream head. - ACE_Module *top_mod = this->stream_head_->next (); - ACE_Module *new_top = top_mod->next (); - - this->stream_head_->next (new_top); - - // Close the top ACE_Module. - - top_mod->close (flags); - - // Don't delete the Module unless the flags request this. - if (flags != ACE_Module::M_DELETE_NONE) - delete top_mod; - - this->stream_head_->writer ()->next (new_top->writer ()); - new_top->reader ()->next (this->stream_head_->reader ()); - return 0; - } -} - -// Remove a named ACE_Module from an arbitrary place in the -// ACE_Stream. - -template int -ACE_Stream::remove (const ACE_TCHAR *name, - int flags) -{ - ACE_TRACE ("ACE_Stream::remove"); - ACE_Module *prev = 0; - - for (ACE_Module *mod = this->stream_head_; - mod != 0; - mod = mod->next ()) - if (ACE_OS::strcmp (mod->name (), name) == 0) - { - if (prev == 0) // Deleting ACE_Stream Head - this->stream_head_->link (mod->next ()); - else - prev->link (mod->next ()); - - // Don't delete the Module unless the flags request this. - if (flags != ACE_Module::M_DELETE_NONE) - { - // Close down the module and release the memory. - mod->close (flags); - delete mod; - } - - return 0; - } - else - prev = mod; - - return -1; -} - -template ACE_Module * -ACE_Stream::find (const ACE_TCHAR *name) -{ - ACE_TRACE ("ACE_Stream::find"); - for (ACE_Module *mod = this->stream_head_; - mod != 0; - mod = mod->next ()) - if (ACE_OS::strcmp (mod->name (), name) == 0) - return mod; - - return 0; -} - -// Actually push a module onto the stack... - -template int -ACE_Stream::push_module (ACE_Module *new_top, - ACE_Module *current_top, - ACE_Module *head) -{ - ACE_TRACE ("ACE_Stream::push_module"); - ACE_Task *nt_reader = new_top->reader (); - ACE_Task *nt_writer = new_top->writer (); - ACE_Task *ct_reader = 0; - ACE_Task *ct_writer = 0; - - if (current_top) - { - ct_reader = current_top->reader (); - ct_writer = current_top->writer (); - ct_reader->next (nt_reader); - } - - nt_writer->next (ct_writer); - - if (head) - { - if (head != new_top) - head->link (new_top); - } - else - nt_reader->next (0); - - new_top->next (current_top); - - if (nt_reader->open (new_top->arg ()) == -1) - return -1; - - if (nt_writer->open (new_top->arg ()) == -1) - return -1; - return 0; -} - -template int -ACE_Stream::open (void *a, - ACE_Module *head, - ACE_Module *tail) -{ - ACE_TRACE ("ACE_Stream::open"); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); - - ACE_Task *h1 = 0, *h2 = 0; - ACE_Task *t1 = 0, *t2 = 0; - - if (head == 0) - { - ACE_NEW_RETURN (h1, - ACE_Stream_Head, - -1); - ACE_NEW_RETURN (h2, - ACE_Stream_Head, - -1); - ACE_NEW_RETURN (head, - ACE_Module (ACE_LIB_TEXT ("ACE_Stream_Head"), - h1, h2, - a, - M_DELETE), - -1); - } - - if (tail == 0) - { - ACE_NEW_RETURN (t1, - ACE_Stream_Tail, - -1); - ACE_NEW_RETURN (t2, - ACE_Stream_Tail, - -1); - ACE_NEW_RETURN (tail, - ACE_Module (ACE_LIB_TEXT ("ACE_Stream_Tail"), - t1, t2, - a, - M_DELETE), - -1); - } - - // Make sure *all* the allocation succeeded! - if (head == 0 && (h1 == 0 || h2 == 0) - || tail == 0 && (t1 == 0 || t2 == 0)) - { - delete h1; - delete h2; - delete t1; - delete t2; - delete head; - delete tail; - errno = ENOMEM; - return -1; - } - - this->stream_head_ = head; - this->stream_tail_ = tail; - - if (this->push_module (this->stream_tail_) == -1) - return -1; - else if (this->push_module (this->stream_head_, - this->stream_tail_, - this->stream_head_) == -1) - return -1; - - return 0; -} - -template int -ACE_Stream::close (int flags) -{ - ACE_TRACE ("ACE_Stream::close"); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); - - if (this->stream_head_ != 0 - && this->stream_tail_ != 0) - { - // Don't bother checking return value here. - this->unlink_i (); - - int result = 0; - - // Remove and cleanup all the intermediate modules. - - while (this->stream_head_->next () != this->stream_tail_) - if (this->pop (flags) == -1) - result = -1; - - // Clean up the head and tail of the stream. - if (this->stream_head_->close (flags) == -1) - result = -1; - if (this->stream_tail_->close (flags) == -1) - result = -1; - - // Cleanup the memory. - delete this->stream_head_; - delete this->stream_tail_; - - this->stream_head_ = 0; - this->stream_tail_ = 0; - - // Tell all threads waiting on the close that we are done. - this->final_close_.broadcast (); - return result; - } - return 0; -} - -template int -ACE_Stream::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, - void *a) -{ - ACE_TRACE ("ACE_Stream::control"); - ACE_IO_Cntl_Msg ioc (cmd); - - ACE_Message_Block *db; - - // Try to create a data block that contains the user-supplied data. - ACE_NEW_RETURN (db, - ACE_Message_Block (sizeof (int), - ACE_Message_Block::MB_IOCTL, - 0, - (char *) a), - -1); - // Try to create a control block that contains the control - // field and a pointer to the data block in 's continuation - // field. - ACE_Message_Block *cb = 0; - - ACE_NEW_RETURN (cb, - ACE_Message_Block (sizeof ioc, - ACE_Message_Block::MB_IOCTL, - db, - (char *) &ioc), - -1); - // @@ Michael: The old semantic assumed that cb returns == 0 - // if no memory was available. We will now return immediately - // without release (errno is set to ENOMEM by the macro). - - // If we can't allocate then we need to delete db and return - // -1. - if (cb == 0) - { - db->release (); - errno = ENOMEM; - return -1; - } - - int result; - - if (this->stream_head_->writer ()->put (cb) == -1) - result = -1; - else if (this->stream_head_->reader ()->getq (cb) == -1) - result = -1; - else - result = ((ACE_IO_Cntl_Msg *) cb->rd_ptr ())->rval (); - - // This will also release db if it's reference count == 0. - cb->release (); - - return result; -} - -// Link two streams together at their bottom-most Modules (i.e., the -// one just above the Stream tail). Note that all of this is premised -// on the fact that the Stream head and Stream tail are non-NULL... -// This must be called with locks held. - -template int -ACE_Stream::link_i (ACE_Stream &us) -{ - ACE_TRACE ("ACE_Stream::link_i"); - this->linked_us_ = &us; - // Make sure the other side is also linked to us! - us.linked_us_ = this; - - ACE_Module *my_tail = this->stream_head_; - - if (my_tail == 0) - return -1; - - // Locate the module just above our Stream tail. - while (my_tail->next () != this->stream_tail_) - my_tail = my_tail->next (); - - ACE_Module *other_tail = us.stream_head_; - - if (other_tail == 0) - return -1; - - // Locate the module just above the other Stream's tail. - while (other_tail->next () != us.stream_tail_) - other_tail = other_tail->next (); - - // Reattach the pointers so that the two streams are linked! - my_tail->writer ()->next (other_tail->reader ()); - other_tail->writer ()->next (my_tail->reader ()); - return 0; -} - -template int -ACE_Stream::link (ACE_Stream &us) -{ - ACE_TRACE ("ACE_Stream::link"); - - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); - - return this->link_i (us); -} - -// Must be called with locks held... - -template int -ACE_Stream::unlink_i (void) -{ - ACE_TRACE ("ACE_Stream::unlink_i"); - - // Only try to unlink if we are in fact still linked! - - if (this->linked_us_ != 0) - { - ACE_Module *my_tail = this->stream_head_; - - // Only relink if we still exist! - if (my_tail) - { - // Find the module that's just before our stream tail. - while (my_tail->next () != this->stream_tail_) - my_tail = my_tail->next (); - - // Restore the writer's next() link to our tail. - my_tail->writer ()->next (this->stream_tail_->writer ()); - } - - ACE_Module *other_tail = - this->linked_us_->stream_head_; - - // Only fiddle with the other side if it in fact still remains. - if (other_tail != 0) - { - while (other_tail->next () != this->linked_us_->stream_tail_) - other_tail = other_tail->next (); - - other_tail->writer ()->next (this->linked_us_->stream_tail_->writer ()); - - } - - // Make sure the other side is also aware that it's been unlinked! - this->linked_us_->linked_us_ = 0; - - this->linked_us_ = 0; - return 0; - } - else - return -1; -} - -template int -ACE_Stream::unlink (void) -{ - ACE_TRACE ("ACE_Stream::unlink"); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); - return this->unlink_i (); -} - -template -ACE_Stream::ACE_Stream (void * a, - ACE_Module *head, - ACE_Module *tail) - : linked_us_ (0), - final_close_ (this->lock_) -{ - ACE_TRACE ("ACE_Stream::ACE_Stream"); - if (this->open (a, head, tail) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Stream::open (%s, %s)\n"), - head->name (), tail->name ())); -} - -template -ACE_Stream::~ACE_Stream (void) -{ - ACE_TRACE ("ACE_Stream::~ACE_Stream"); - - if (this->stream_head_ != 0) - this->close (); -} - -template -ACE_Stream_Iterator::ACE_Stream_Iterator (const ACE_Stream &sr) - : next_ (sr.stream_head_) -{ - ACE_TRACE ("ACE_Stream_Iterator::ACE_Stream_Iterator"); -} - -#endif /* ACE_STREAM_C */ diff --git a/ace/Stream.h b/ace/Stream.h deleted file mode 100644 index b5bcbe002d9..00000000000 --- a/ace/Stream.h +++ /dev/null @@ -1,233 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file Stream.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//========================================================================== - -#ifndef ACE_STREAM_H -#define ACE_STREAM_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/IO_Cntl_Msg.h" -#include "ace/Message_Block.h" -#include "ace/Time_Value.h" -#include "ace/Module.h" - -// Forward decls. -template class ACE_Stream_Iterator; - -/** - * @class ACE_Stream - * - * @brief This class is the primary abstraction for the ASX framework. - * It is moduled after System V Stream. - * - * A Stream consists of a stack of , each of which - * contains two . Even though the methods in this - * class are virtual, this class isn't really intended for - * subclassing unless you know what you are doing. In - * particular, the destructor calls , which - * won't be overridden properly unless you call it in a subclass - * destructor. - */ -template -class ACE_Stream -{ -public: - friend class ACE_Stream_Iterator; - - enum - { - /// Indicates that deletes the Tasks. Don't change this - /// value without updating the same enum in class ACE_Module... - M_DELETE = 3 - }; - - // = Initializatation and termination methods. - /** - * Create a Stream consisting of and as the Stream - * head and Stream tail, respectively. If these are 0 then the - * and are used, respectively. - * is the value past in to the methods of the tasks. - */ - ACE_Stream (void *arg = 0, - ACE_Module *head = 0, - ACE_Module *tail = 0); - - /** - * Create a Stream consisting of and as the Stream - * head and Stream tail, respectively. If these are 0 then the - * and are used, respectively. - * is the value past in to the methods of the tasks. - */ - virtual int open (void *arg, - ACE_Module *head = 0, - ACE_Module *tail = 0); - - /// Close down the stream and release all the resources. - virtual int close (int flags = M_DELETE); - - /// Close down the stream and release all the resources. - virtual ~ACE_Stream (void); - - // = ACE_Stream plumbing operations - - /// Add a new module right below the Stream head. - virtual int push (ACE_Module *mod); - - /// Remove the right below the Stream head and close it down. - virtual int pop (int flags = M_DELETE); - - /// Return the top module on the stream (right below the stream - /// head). - virtual int top (ACE_Module *&mod); - - /// Insert a new module below the named module . - virtual int insert (const ACE_TCHAR *prev_name, - ACE_Module *mod); - - /// Replace the named module with a new module . - virtual int replace (const ACE_TCHAR *replace_name, - ACE_Module *mod, - int flags = M_DELETE); - - /// Remove the named module from the stream. This bypasses the - /// strict LIFO ordering of and . - virtual int remove (const ACE_TCHAR *mod, - int flags = M_DELETE); - - /// Return current stream head. - virtual ACE_Module *head (void); - - /// Return current stream tail. - virtual ACE_Module *tail (void); - - /// Find a particular ACE_Module. - virtual ACE_Module *find (const ACE_TCHAR *mod); - - /// Create a pipe between two Streams. - virtual int link (ACE_Stream &); - - /// Remove a pipe formed between two Streams. - virtual int unlink (void); - - // = Blocking data transfer operations - /** - * Send the message down the stream, starting at the Module - * below the Stream head. Wait for upto amount of - * absolute time for the operation to complete (or block forever if - * == 0). - */ - virtual int put (ACE_Message_Block *mb, - ACE_Time_Value *timeout = 0); - - /** - * Read the message that is stored in the stream head. - * Wait for upto amount of absolute time for the operation - * to complete (or block forever if == 0). - */ - virtual int get (ACE_Message_Block *&mb, - ACE_Time_Value *timeout = 0); - - /// Send control message down the stream. - virtual int control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, - void *args); - - /// Synchronize with the final close of the stream. - virtual int wait (void); - - /// Dump the state of an object. - virtual void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Actually perform the unlinking of two Streams (must be called - /// with locks held). - int unlink_i (void); - - /// Actually perform the linking of two Streams (must be called with - /// locks held). - int link_i (ACE_Stream &); - - /// Must a new module onto the Stream. - int push_module (ACE_Module *, - ACE_Module * = 0, - ACE_Module * = 0); - - /// Pointer to the head of the stream. - ACE_Module *stream_head_; - - /// Pointer to the tail of the stream. - ACE_Module *stream_tail_; - - /// Pointer to an adjoining linked stream. - ACE_Stream *linked_us_; - - // = Synchronization objects used for thread-safe streams. - /// Protect the stream against race conditions. - ACE_SYNCH_MUTEX_T lock_; - - /// Use to tell all threads waiting on the close that we are done. - ACE_SYNCH_CONDITION_T final_close_; -}; - -/** - * @class ACE_Stream_Iterator - * - * @brief Iterate through an . - */ -template -class ACE_Stream_Iterator -{ -public: - // = Initialization method. - ACE_Stream_Iterator (const ACE_Stream &sr); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the set. - /// Returns 0 when all items have been seen, else 1. - int next (const ACE_Module *&next_item); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int advance (void); - -private: - /// Next that we haven't yet seen. - ACE_Module *next_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Stream.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Stream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Stream.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_STREAM_H */ diff --git a/ace/Stream.i b/ace/Stream.i deleted file mode 100644 index 42a4989eff0..00000000000 --- a/ace/Stream.i +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Stream.i - -template ACE_INLINE ACE_Module * -ACE_Stream::head (void) -{ - ACE_TRACE ("ACE_Stream::head"); - return this->stream_head_; -} - -template ACE_INLINE ACE_Module * -ACE_Stream::tail (void) -{ - ACE_TRACE ("ACE_Stream::tail"); - return this->stream_tail_; -} - -template ACE_INLINE int -ACE_Stream::wait (void) -{ - ACE_TRACE ("ACE_Stream::wait"); - return this->final_close_.wait (); -} - -template ACE_INLINE int -ACE_Stream_Iterator::next (const ACE_Module *&mod) -{ - ACE_TRACE ("ACE_Stream_Iterator::next"); - mod = this->next_; - return this->next_ != 0; -} - -template ACE_INLINE int -ACE_Stream_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Stream_Iterator::done"); - return this->next_ == 0; -} - -template int -ACE_Stream_Iterator::advance (void) -{ - ACE_TRACE ("ACE_Stream_Iterator::advance"); - this->next_ = this->next_->next (); - return this->next_ != 0; -} - diff --git a/ace/Stream_Modules.cpp b/ace/Stream_Modules.cpp deleted file mode 100644 index 84527422c72..00000000000 --- a/ace/Stream_Modules.cpp +++ /dev/null @@ -1,371 +0,0 @@ -// Stream_Modules.cpp -// $Id$ - -#ifndef ACE_STREAM_MODULES_C -#define ACE_STREAM_MODULES_C - -#include "ace/Stream_Modules.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Stream_Modules, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Stream_Head) - -template -ACE_Stream_Head::ACE_Stream_Head (void) -{ - ACE_TRACE ("ACE_Stream_Head::ACE_Stream_Head"); -} - -template -ACE_Stream_Head::~ACE_Stream_Head (void) -{ - ACE_TRACE ("ACE_Stream_Head::~ACE_Stream_Head"); -} - -template void -ACE_Stream_Head::dump (void) const -{ - ACE_TRACE ("ACE_Stream_Head::dump"); -} - -// ACE_Module that act as the head and tail of a Stream. - -template int -ACE_Stream_Head::open (void *) -{ - ACE_TRACE ("ACE_Stream_Head::open"); - return 0; -} - -template int -ACE_Stream_Head::close (u_long) -{ - ACE_TRACE ("ACE_Stream_Head::close"); - return 0; -} - -template int -ACE_Stream_Head::svc (void) -{ - ACE_TRACE ("ACE_Stream_Head::svc"); - return -1; -} - -template int -ACE_Stream_Head::control (ACE_Message_Block *mb) -{ - ACE_TRACE ("ACE_Stream_Head::control"); - ACE_IO_Cntl_Msg *ioc = (ACE_IO_Cntl_Msg *) mb->rd_ptr (); - ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd; - - switch (cmd = ioc->cmd ()) - { - case ACE_IO_Cntl_Msg::SET_LWM: - case ACE_IO_Cntl_Msg::SET_HWM: - this->water_marks (cmd, *(size_t *) mb->cont ()->rd_ptr ()); - ioc->rval (0); - break; - default: - return 0; - } - return ioc->rval (); -} - -// Performs canonical flushing at the ACE_Stream Head. - -template int -ACE_Stream_Head::canonical_flush (ACE_Message_Block *mb) -{ - ACE_TRACE ("ACE_Stream_Head::canonical_flush"); - char *cp = mb->rd_ptr (); - - if (ACE_BIT_ENABLED (*cp, ACE_Task_Flags::ACE_FLUSHR)) - { - this->flush (ACE_Task_Flags::ACE_FLUSHALL); - ACE_CLR_BITS (*cp, ACE_Task_Flags::ACE_FLUSHR); - } - - if (ACE_BIT_ENABLED (*cp, ACE_Task_Flags::ACE_FLUSHW)) - return this->reply (mb); - else - mb->release (); - return 0; -} - -template int -ACE_Stream_Head::put (ACE_Message_Block *mb, - ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_Stream_Head::put"); - int res = 0; - - if (mb->msg_type () == ACE_Message_Block::MB_IOCTL - && (res = this->control (mb)) == -1) - return res; - - if (this->is_writer ()) - return this->put_next (mb, tv); - else // this->is_reader () - { - switch (mb->msg_type ()) - { - case ACE_Message_Block::MB_FLUSH: - return this->canonical_flush (mb); - default: - break; - } - - return this->putq (mb, tv); - } -} - -template int -ACE_Stream_Head::init (int, ACE_TCHAR *[]) -{ - ACE_TRACE ("ACE_Stream_Head::init"); - return 0; -} - -template int -ACE_Stream_Head::info (ACE_TCHAR **strp, size_t length) const -{ - ACE_TRACE ("ACE_Stream_Head::info"); - const ACE_TCHAR *name = this->name (); - - if (*strp == 0 && (*strp = ACE_OS::strdup (name)) == 0) - return -1; - else - ACE_OS::strsncpy (*strp, name, length); - return ACE_static_cast (int, ACE_OS_String::strlen (name)); -} - -template int -ACE_Stream_Head::fini (void) -{ - ACE_TRACE ("ACE_Stream_Head::fini"); - return 0; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Stream_Tail) - -template -ACE_Stream_Tail::ACE_Stream_Tail (void) -{ - ACE_TRACE ("ACE_Stream_Tail::ACE_Stream_Tail"); -} - -template -ACE_Stream_Tail::~ACE_Stream_Tail (void) -{ - ACE_TRACE ("ACE_Stream_Tail::~ACE_Stream_Tail"); -} - -template void -ACE_Stream_Tail::dump (void) const -{ - ACE_TRACE ("ACE_Stream_Tail::dump"); -} - -template int -ACE_Stream_Tail::open (void *) -{ - ACE_TRACE ("ACE_Stream_Tail::open"); - return 0; -} - -template int -ACE_Stream_Tail::close (u_long) -{ - ACE_TRACE ("ACE_Stream_Tail::close"); - return 0; -} - -template int -ACE_Stream_Tail::svc (void) -{ - ACE_TRACE ("ACE_Stream_Tail::svc"); - return -1; -} - -template int -ACE_Stream_Tail::control (ACE_Message_Block *mb) -{ - ACE_TRACE ("ACE_Stream_Tail::control"); - ACE_IO_Cntl_Msg *ioc = (ACE_IO_Cntl_Msg *) mb->rd_ptr (); - ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd; - - switch (cmd = ioc->cmd ()) - { - case ACE_IO_Cntl_Msg::SET_LWM: - case ACE_IO_Cntl_Msg::SET_HWM: - { - size_t wm_size = *(size_t *) mb->cont ()->rd_ptr (); - - this->water_marks (cmd, wm_size); - this->sibling ()->water_marks (cmd, wm_size); - ioc->rval (0); - break; - } - default: - mb->msg_type (ACE_Message_Block::MB_IOCNAK); - } - return this->reply (mb); -} - -// Perform flush algorithm as though we were the driver. - -template int -ACE_Stream_Tail::canonical_flush (ACE_Message_Block *mb) -{ - ACE_TRACE ("ACE_Stream_Tail::canonical_flush"); - char *cp = mb->rd_ptr (); - - if (ACE_BIT_ENABLED (*cp, ACE_Task_Flags::ACE_FLUSHW)) - { - this->flush (ACE_Task_Flags::ACE_FLUSHALL); - ACE_CLR_BITS (*cp, ACE_Task_Flags::ACE_FLUSHW); - } - - if (ACE_BIT_ENABLED (*cp, ACE_Task_Flags::ACE_FLUSHR)) - { - this->sibling ()->flush (ACE_Task_Flags::ACE_FLUSHALL); - return this->reply (mb); - } - else - mb->release (); - - return 0; -} - -template int -ACE_Stream_Tail::put (ACE_Message_Block *mb, - ACE_Time_Value *) -{ - ACE_TRACE ("ACE_Stream_Tail::put"); - - if (this->is_writer ()) - { - switch (mb->msg_type ()) - { - case ACE_Message_Block::MB_IOCTL: - return this->control (mb); - /* NOTREACHED */ - default: - mb->release (); - return 0; - /* NOTREACHED */ - } - } - - return -1; -} - -template int -ACE_Stream_Tail::init (int, ACE_TCHAR *[]) -{ - ACE_TRACE ("ACE_Stream_Tail::init"); - return 0; -} - -template int -ACE_Stream_Tail::info (ACE_TCHAR **strp, size_t length) const -{ - ACE_TRACE ("ACE_Stream_Tail::info"); - const ACE_TCHAR *name = this->name (); - - if (*strp == 0 && (*strp = ACE_OS::strdup (name)) == 0) - return -1; - else - ACE_OS::strsncpy (*strp, name, length); - return ACE_static_cast (int, ACE_OS_String::strlen (name)); -} - -template int -ACE_Stream_Tail::fini (void) -{ - ACE_TRACE ("ACE_Stream_Tail::fini"); - return 0; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Thru_Task) - -template -ACE_Thru_Task::ACE_Thru_Task (void) -{ - ACE_TRACE ("ACE_Thru_Task::ACE_Thru_Task"); -} - -template -ACE_Thru_Task::~ACE_Thru_Task (void) -{ - ACE_TRACE ("ACE_Thru_Task::~ACE_Thru_Task"); -} - -template void -ACE_Thru_Task::dump (void) const -{ - ACE_TRACE ("ACE_Thru_Task::dump"); -} - -template int -ACE_Thru_Task::open (void *) -{ - ACE_TRACE ("ACE_Thru_Task::open"); - return 0; -} - -template int -ACE_Thru_Task::close (u_long) -{ - ACE_TRACE ("ACE_Thru_Task::close"); - return 0; -} - -template int -ACE_Thru_Task::svc (void) -{ - ACE_TRACE ("ACE_Thru_Task::svc"); - return -1; -} - -template int -ACE_Thru_Task::put (ACE_Message_Block *msg, - ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_Thru_Task::put"); - return this->put_next (msg, tv); -} - -template int -ACE_Thru_Task::init (int, ACE_TCHAR *[]) -{ - ACE_TRACE ("ACE_Thru_Task::init"); - return 0; -} - -template int -ACE_Thru_Task::info (ACE_TCHAR **strp, - size_t length) const -{ - ACE_TRACE ("ACE_Thru_Task::info"); - const ACE_TCHAR *name = this->name (); - - if (*strp == 0 && (*strp = ACE_OS::strdup (name)) == 0) - return -1; - else - ACE_OS::strsncpy (*strp, name, length); - return ACE_static_cast (int, ACE_OS_String::strlen (name)); -} - -template int -ACE_Thru_Task::fini (void) -{ - ACE_TRACE ("ACE_Thru_Task::fini"); - return 0; -} - -#endif /* ACE_STREAM_MODULES_C */ diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h deleted file mode 100644 index 536db22e65e..00000000000 --- a/ace/Stream_Modules.h +++ /dev/null @@ -1,143 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Stream_Modules.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -// This needs to go outside of the #if !defined() block. Don't ask... -#include "ace/Task.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#ifndef ACE_STREAM_MODULES -#define ACE_STREAM_MODULES -#include "ace/pre.h" - -/** - * @class ACE_Stream_Head - * - * @brief Standard module that acts as the head of a ustream. - */ -template -class ACE_Stream_Head : public ACE_Task -{ -public: - /// Construction - ACE_Stream_Head (void); - - /// Destruction - ~ACE_Stream_Head (void); - - // = ACE_Task hooks - virtual int open (void *a = 0); - virtual int close (u_long flags = 0); - virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0); - virtual int svc (void); - - // = Dynamic linking hooks - virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int info (ACE_TCHAR **info_string, size_t length) const; - virtual int fini (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Performs canonical flushing at the ACE_Stream Head. - int control (ACE_Message_Block *); - int canonical_flush (ACE_Message_Block *); -}; - -/** - * @class ACE_Stream_Tail - * - * @brief Standard module that acts as the head of a ustream. - */ -template -class ACE_Stream_Tail : public ACE_Task -{ -public: - /// Construction - ACE_Stream_Tail (void); - - /// Destruction - ~ACE_Stream_Tail (void); - - // = ACE_Task hooks - virtual int open (void *a = 0); - virtual int close (u_long flags = 0); - virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0); - virtual int svc (void); - - // = Dynamic linking hooks - virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int info (ACE_TCHAR **info_string, size_t length) const; - virtual int fini (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Performs canonical flushing at the ACE_Stream tail. - int control (ACE_Message_Block *); - int canonical_flush (ACE_Message_Block *); -}; - -/** - * @class ACE_Thru_Task - * - * @brief Standard module that acts as a "no op", simply passing on all - * data to its adjacent neighbor. - */ -template -class ACE_Thru_Task : public ACE_Task -{ -public: - /// Construction - ACE_Thru_Task (void); - - /// Destruction - ~ACE_Thru_Task (void); - - // = ACE_Task hooks - virtual int open (void *a = 0); - virtual int close (u_long flags = 0); - virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0); - virtual int svc (void); - - // = Dynamic linking hooks - virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int info (ACE_TCHAR **info_string, size_t length) const; - virtual int fini (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Stream_Modules.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Stream_Modules.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_STREAM_MODULES */ diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp deleted file mode 100644 index e5e8bec0e67..00000000000 --- a/ace/String_Base.cpp +++ /dev/null @@ -1,183 +0,0 @@ -// $Id$ - -#include "ace/Malloc.h" -#include "ace/String_Base.h" -#include "ace/Auto_Ptr.h" - -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -# include "ace/streams.h" -#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - -#if !defined (__ACE_INLINE__) -#include "ace/String_Base.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, String_Base, "String_Base.cpp,v 4.61 2001/03/04 00:55:30 brunsch Exp") - -ACE_ALLOC_HOOK_DEFINE(ACE_String_Base) - -template -CHAR ACE_String_Base::NULL_String_ = '\0'; - -// this method might benefit from a little restructuring. -template void -ACE_String_Base::set (const CHAR *s, - size_t len, - int release) -{ - // Case 1. Going from memory to more memory - size_t new_buf_len = len + 1; - if (s != 0 && len != 0 && release && this->buf_len_ < new_buf_len) - { - CHAR *temp; - ACE_ALLOCATOR (temp, - (CHAR *) this->allocator_->malloc (new_buf_len * sizeof (CHAR))); - - if (this->release_) - this->allocator_->free (this->rep_); - - this->rep_ = temp; - this->buf_len_ = new_buf_len; - this->release_ = 1; - this->len_ = len; - ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR)); - // NUL terminate. - this->rep_[len] = '\0'; - } - - // Case 2. No memory allocation is necessary. - else - { - // Free memory if necessary and figure out future ownership - if (!release || s == 0 || len == 0) - { - if (this->release_) - { - this->allocator_->free (this->rep_); - this->release_ = 0; - } - } - // else - stay with whatever value for release_ we have. - - // Populate data. - if (s == 0 || len == 0) - { - this->buf_len_ = 0; - this->len_ = 0; - this->rep_ = &ACE_String_Base::NULL_String_; - } - else if (!release) - { - this->buf_len_ = len; - this->len_ = len; - this->rep_ = (CHAR *) s; - } - else - { - ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR)); - // NUL terminate. - this->rep_[len] = 0; - this->len_ = len; - } - } -} - -// Return substring. -template ACE_String_Base -ACE_String_Base::substring (size_t offset, - ssize_t length) const -{ - ACE_String_Base nill; - size_t count = length; - - // case 1. empty string - if (this->len_ == 0) - return nill; - - // case 2. start pos past our end - if (offset >= this->len_) - return nill; - // No length == empty string. - else if (length == 0) - return nill; - // Get all remaining bytes. - else if (length == -1 || count > (this->len_ - offset)) - count = this->len_ - offset; - - return ACE_String_Base (&this->rep_[offset], - count, - this->allocator_); -} - -// Concat operator (does copy memory). - -template ACE_String_Base & -ACE_String_Base::operator+= (const ACE_String_Base &s) -{ - ACE_TRACE ("ACE_String_Base::operator+="); - - if (s.len_ > 0) - { - size_t new_buf_len = this->len_ + s.len_ + 1; - - // case 1. No memory allocation needed. - if (this->buf_len_ >= new_buf_len) - // Copy in data from new string. - ACE_OS::memcpy (this->rep_ + this->len_, - s.rep_, - s.len_ * sizeof (CHAR)); - // case 2. Memory reallocation is needed - else - { - CHAR *t = 0; - - ACE_ALLOCATOR_RETURN (t, - (CHAR *) this->allocator_->malloc (new_buf_len * - sizeof (CHAR)), - *this); - - // Copy memory from old string into new string. - ACE_OS::memcpy (t, - this->rep_, - this->len_ * sizeof (CHAR)); - - ACE_OS::memcpy (t + this->len_, - s.rep_, - s.len_ * sizeof (CHAR)); - - if (this->release_) - this->allocator_->free (this->rep_); - - this->release_ = 1; - this->rep_ = t; - this->buf_len_ = new_buf_len; - } - - this->len_ += s.len_; - this->rep_[this->len_] = '\0'; - } - - return *this; -} - -template void -ACE_String_Base::resize (size_t len, CHAR c) -{ - ACE_TRACE ("ACE_String_Base::resize"); - - // Only reallocate if we don't have enough space... - if (this->buf_len_ <= len) - { - if (this->buf_len_ != 0) - this->allocator_->free (this->rep_); - - this->rep_ = (CHAR *) - this->allocator_->malloc ((len + 1) * sizeof (CHAR)); - this->buf_len_ = len + 1; - } - - this->len_ = 0; - ACE_OS::memset (this->rep_, - c, - this->buf_len_ * sizeof (CHAR)); -} diff --git a/ace/String_Base.h b/ace/String_Base.h deleted file mode 100644 index ff86f26a44c..00000000000 --- a/ace/String_Base.h +++ /dev/null @@ -1,439 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file String_Base.h - * - * $Id$ - * - * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef ACE_STRING_BASE_H -#define ACE_STRING_BASE_H -#include "ace/pre.h" - -#include "ace/ACE.h" -#include "ace/String_Base_Const.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward decl. -class ACE_Allocator; - -/** - * @class ACE_String_Base - * - * @brief This class provides a wrapper facade for C strings. - * - * This class uses an ACE_Allocator to allocate memory. The - * user can make this a persistant class by providing an - * ACE_Allocator with a persistable memory pool. This class is - * optimized for efficiency, so it doesn't provide any internal - * locking. - * NOTE: if an instance of this class is constructed from or - * assigned an empty string (with first element of '\0'), then it - * is not allocated new space. Instead, its internal - * representation is set equal to a global empty string. - * CAUTION: in cases when ACE_String_Base is constructed from a - * provided buffer with the release parameter set to 0, - * ACE_String_Base is not guaranteed to be '\0' terminated. - */ -template class ACE_String_Base : public ACE_String_Base_Const -{ -public: - /** - * Default constructor. - * - * @param alloc ACE_Allocator associated with string - * @return Default ACE_String_Base string. - */ - ACE_String_Base (ACE_Allocator * alloc = 0); - - /** - * Constructor that copies @a s into dynamically allocated memory. - * If @a release is non-0 then the @a ACE_Allocator is responsible for - * freeing this memory. Memory is _not_ allocated/freed if @a release - * is 0. - * - * @param s Zero terminated input string - * @param alloc ACE_Allocator associated with string - * @param release Allocator responsible(1)/not reponsible(0) for - * freeing memory. - * @return ACE_String_Base containing const CHAR *s - */ - ACE_String_Base (const CHAR * s, - ACE_Allocator * alloc = 0, - int release = 1); - - /** - * Constructor that copies @a len CHARs of @a s into dynamically - * allocated memory (will zero terminate the result). If @a release - * is non-0 then the @a ACE_allocator is responsible for freeing this - * memory. Memory is _not_ allocated/freed if @a release is 0. - * - * @param s Non-zero terminated input string - * @param len Length of non-zero terminated input string - * @param alloc ACE_Allocator associated with string - * @param release Allocator responsible(1)/not reponsible(0) for - * freeing memory. - * @return ACE_String_Base containing const CHAR *s - */ - ACE_String_Base (const CHAR * s, - size_t len, - ACE_Allocator * alloc = 0, - int release = 1); - - /** - * Copy constructor. - * - * @param s Input ACE_String_Base string to copy - * @return Copy of input string @a s - */ - ACE_String_Base (const ACE_String_Base < CHAR > &s); - - /** - * Constructor that copies @a c into dynamically allocated memory. - * - * @param c Single input character. - * @param alloc ACE_Allocator associated with string - * @return ACE_String_Base containing CHAR 'c' - */ - ACE_String_Base (CHAR c, - ACE_Allocator * alloc = 0); - - /** - * Constructor that dynamically allocate @a len long of char array - * and initialize it to @a c using @a alloc to allocate the memory. - * - * @param len Length of character array 'c' - * @param c Input character array - * @param alloc ACE_Allocator associated with string - * @return ACE_String_Base containing character array 'c' - */ - ACE_String_Base (size_t len, - CHAR c = 0, - ACE_Allocator * alloc = 0); - - /** - * Deletes the memory... - */ - ~ACE_String_Base (void); - - /** - * Return the character in the string (doesn't perform - * bounds checking). - * - * @param slot Index of the desired character - * @return The character at index @a slot - */ - const CHAR & operator[] (size_t slot) const; - - /** - * Return the character by reference in the string - * (doesn't perform bounds checking). - * - * @param slot Index of the desired character - * @return The character at index @a slot - */ - CHAR & operator[] (size_t slot); - - /** - * Assignment operator (does copy memory). - * - * @param s Input ACE_String_Base string to assign to this object. - * @return Return a copy of the this string. - */ - ACE_String_Base < CHAR > &operator = (const ACE_String_Base < CHAR > &s); - - /** - * Assignment alternative method (does not copy memory). - * - * @param s Input ACE_String_Base string to assign to this object. - * @return Return this string. - */ - ACE_String_Base < CHAR > &assign_nocopy (const ACE_String_Base < CHAR > &s); - - /** - * Copy @a s into this @a ACE_String_Base. Memory is _not_ - * allocated/freed if @a release is 0. - * - * @param s Null terminated input string - * @param release Allocator responsible(1)/not reponsible(0) for - * freeing memory. - */ - void set (const CHAR * s, int release = 1); - - /** - * Copy @a len bytes of @a s (will zero terminate the result). - * Memory is _not_ allocated/freed if @a release is 0. - * - * @param s Non-zero terminated input string - * @param len Length of input string 's' - * @param release Allocator responsible(1)/not reponsible(0) for - * freeing memory. - */ - void set (const CHAR * s, size_t len, int release); - - /** - * Clear this string. Memory is _not_ freed if is 0. - * - * @param release Memory is freed if 1 or not if 0. - */ - void clear (int release = 0); - - /** - * Return a substring given an offset and length, if length == -1 - * use rest of str. Return empty substring if offset or - * offset/length are invalid. - * - * @param offset Index of first desired character of the substring. - * @param length How many characters to return starting at the offset. - * @return The string containing the desired substring - */ - ACE_String_Base < CHAR > substring (size_t offset, - ssize_t length = -1) const; - - /** - * Same as . - * - * @param offset Index of first desired character of the substring. - * @param length How many characters to return starting at the offset. - * @return The string containing the desired substring - */ - ACE_String_Base < CHAR > substr (size_t offset, ssize_t length = -1) const; - - /** - * Concat operator (copies memory). - * - * @param s Input ACE_String_Base string to concatenate to another string. - * @return The combined string (input append to the end of the old). New - * string is zero terminated. - */ - ACE_String_Base < CHAR > &operator += (const ACE_String_Base < CHAR > &s); - - /** - * Returns a hash value for this string. - * - * @return Hash value of string - */ - u_long hash (void) const; - - /** - * Return the length of the string. - * - * @return Length of stored string - */ - size_t length (void) const; - - /** - * Get a copy of the underlying representation. - * - * This method allocates memory for a copy of the string and returns - * a pointer to the new area. The caller is responsible for freeing - * the memory when finished; use delete [] - * - * @return Pointer reference to the string data. Returned string is - * zero terminated. - */ - CHAR *rep (void) const; - - /** - * Get at the underlying representation directly! - * _Don't_ even think about casting the result to (char *) and modifying it, - * if it has length 0! - * - * @return Pointer reference to the stored string data. No guarantee is - * that the string is zero terminated. - * - */ - const CHAR *fast_rep (void) const; - - /** - * Same as STL String's and . - */ - const CHAR *c_str (void) const; - - /** - * Comparison operator that will match substrings. Returns the - * slot of the first location that matches, else -1. - * - * @param s Input ACE_String_Base string - * @return Integer index value of the first location of string @a s or - * -1 (not found). - */ - ssize_t strstr (const ACE_String_Base &s) const; - - /** - * Find starting at pos. Returns the slot of the first - * location that matches (will be >= pos), else npos. - * - * @param str Input ACE_String_Base string to search for in stored string. - * @param pos Starting index position to start searching for string @a str. - * @return Index value of the first location of string @a str else npos. - */ - ssize_t find (const ACE_String_Base &str, size_t pos = 0) const; - - /** - * Find @a s starting at pos. Returns the slot of the first - * location that matches (will be >= pos), else npos. - * - * @param s non-zero input string to search for in stored string. - * @param pos Starting index position to start searching for string @a str. - * @return Index value of the first location of string @a str else npos. - */ - ssize_t find (const CHAR *s, size_t pos = 0) const; - - /** - * Find @a c starting at pos. Returns the slot of the first - * location that matches (will be >= pos), else npos. - * - * @param c Input character to search for in stored string. - * @param pos Starting index position to start searching for string @a str. - * @return Index value of the first location of string @a str else npos. - */ - ssize_t find (CHAR c, size_t pos = 0) const; - - /** - * Find @a c starting at pos (counting from the end). Returns the - * slot of the first location that matches, else npos. - * - * @param c Input character to search for in stored string. - * @param pos Starting index position to start searching for string @a str. - * @return Index value of the first location of string @a str else npos. - */ - ssize_t rfind (CHAR c, ssize_t pos = npos) const; - - /** - * Equality comparison operator (must match entire string). - * - * @param s Input ACE_String_Base string to compare against stored string. - * @return Integer value of result (1 = found, 0 = not found). - */ - int operator == (const ACE_String_Base &s) const; - - /** - * Less than comparison operator. - * - * @param s Input ACE_String_Base string to compare against stored string. - * @return Integer value of result (1 = less than, 0 = greater than or - * equal). - */ - int operator < (const ACE_String_Base &s) const; - - /** - * Greater than comparison operator. - * - * @param s Input ACE_String_Base string to compare against stored string. - * @return Integer value of result (1 = greater than, 0 = less than or - * equal). - */ - int operator > (const ACE_String_Base &s) const; - - /** - * Inequality comparison operator. - * - * @param s Input ACE_String_Base string to compare against stored string. - * @return Integer value of result (1 = not equal, 0 = equal). - */ - int operator != (const ACE_String_Base &s) const; - - /** - * Performs a strncmp comparison. - * - * @param s Input ACE_String_Base string to compare against stored string. - * @return Integer value of result (less than 0, 0, greater than 0) - * depending on how input string @a s is to the stored string. - */ - int compare (const ACE_String_Base &s) const; - - /** - * Dump the state of an object. - */ - void dump (void) const; - - /** - * This method is designed for high-performance. Please use with - * care ;-) If the current size of the string is less than , - * the string is resized to the new length. The data is zero'd - * out after this operation. - * - * @param len New string size - * @param c New input string - */ - void resize (size_t len, CHAR c = 0); - - /** - * Declare the dynamic allocation hooks. - */ - ACE_ALLOC_HOOK_DECLARE; - -protected: - /** - * Pointer to a memory allocator. - */ - ACE_Allocator * allocator_; - - /** - * Length of the ACE_String_Base data (not counting the trailing '\0'). - */ - size_t len_; - - /** - * Length of the ACE_String_Base data buffer. Keeping track of the - * length allows to avoid unnecessary dynamic allocations. - */ - size_t buf_len_; - - /** - * Pointer to data. - */ - CHAR *rep_; - - /** - * Flag that indicates if we own the memory - */ - int release_; - - /** - * Represents the "NULL" string to simplify the internal logic. - */ - static CHAR NULL_String_; -}; - -template < class CHAR > ACE_INLINE - ACE_String_Base < CHAR > operator + (const ACE_String_Base < CHAR > &, - const ACE_String_Base < CHAR > &); -template < class CHAR > ACE_INLINE - ACE_String_Base < CHAR > operator + (const ACE_String_Base < CHAR > &, - const CHAR *); -template < class CHAR > ACE_INLINE - ACE_String_Base < CHAR > operator + (const CHAR *, - const ACE_String_Base < CHAR > &); - -template < class CHAR > ACE_INLINE - ACE_String_Base < CHAR > operator + (const ACE_String_Base < CHAR > &t, - const CHAR c); - -template < class CHAR > ACE_INLINE - ACE_String_Base < CHAR > operator + (const CHAR c, - const ACE_String_Base < CHAR > &t); - -#if defined (__ACE_INLINE__) -#include "ace/String_Base.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/String_Base.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("String_Base.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_STRING_BASE_H */ diff --git a/ace/String_Base.i b/ace/String_Base.i deleted file mode 100644 index a78112d93b4..00000000000 --- a/ace/String_Base.i +++ /dev/null @@ -1,370 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Malloc_Base.h" - -// Default constructor. - -template ACE_INLINE -ACE_String_Base::ACE_String_Base (ACE_Allocator *alloc) - : allocator_ (alloc ? alloc : ACE_Allocator::instance ()), - len_ (0), - buf_len_ (0), - rep_ (&ACE_String_Base::NULL_String_), - release_ (0) -{ - ACE_TRACE ("ACE_String_Base::ACE_String_Base"); -} - -// Constructor that actually copies memory. - -template ACE_INLINE -ACE_String_Base::ACE_String_Base (const CHAR *s, - ACE_Allocator *alloc, - int release) - : allocator_ (alloc ? alloc : ACE_Allocator::instance ()), - len_ (0), - buf_len_ (0), - rep_ (0), - release_ (0) -{ - ACE_TRACE ("ACE_String_Base::ACE_String_Base"); - - size_t length; - if (s != 0) - length = ACE_OS::strlen (s); - else - length = 0; - - this->set (s, length, release); -} - -template ACE_INLINE -ACE_String_Base::ACE_String_Base (CHAR c, - ACE_Allocator *alloc) - : allocator_ (alloc ? alloc : ACE_Allocator::instance ()), - len_ (0), - buf_len_ (0), - rep_ (0), - release_ (0) -{ - ACE_TRACE ("ACE_String_Base::ACE_String_Base"); - - this->set (&c, 1, 1); -} - -// Constructor that actually copies memory. - -template ACE_INLINE -ACE_String_Base::ACE_String_Base (const CHAR *s, - size_t len, - ACE_Allocator *alloc, - int release) - : allocator_ (alloc ? alloc : ACE_Allocator::instance ()), - len_ (0), - buf_len_ (0), - rep_ (0), - release_ (0) -{ - ACE_TRACE ("ACE_String_Base::ACE_String_Base"); - - this->set (s, len, release); -} - -// Copy constructor. - -template ACE_INLINE -ACE_String_Base::ACE_String_Base (const ACE_String_Base &s) - : allocator_ (s.allocator_ ? s.allocator_ : ACE_Allocator::instance ()), - len_ (0), - buf_len_ (0), - rep_ (0), - release_ (0) -{ - ACE_TRACE ("ACE_String_Base::ACE_String_Base"); - - this->set (s.rep_, s.len_, 1); -} - -template ACE_INLINE -ACE_String_Base::ACE_String_Base (size_t len, CHAR c, ACE_Allocator *alloc) - : allocator_ (alloc ? alloc : ACE_Allocator::instance ()), - len_ (0), - buf_len_ (0), - rep_ (0), - release_ (0) -{ - ACE_TRACE ("ACE_String_Base::ACE_String_Base"); - - this->resize (len, c); -} - -template ACE_INLINE -ACE_String_Base::~ACE_String_Base (void) -{ - ACE_TRACE ("ACE_String_Base::~ACE_String_Base"); - - this->set (0, 0, 0); -} - -template ACE_INLINE void -ACE_String_Base::dump (void) const -{ - ACE_TRACE ("ACE_String_Base::dump"); -} - -// Assignment operator (does copy memory). -template ACE_INLINE ACE_String_Base & -ACE_String_Base::operator= (const ACE_String_Base &s) -{ - ACE_TRACE ("ACE_String_Base::operator="); - - // Check for identify. - if (this != &s) - { - this->set (s.rep_, s.len_, 1); - } - - return *this; -} - -// Assignment method (does not copy memory) -template ACE_INLINE ACE_String_Base & -ACE_String_Base::assign_nocopy (const ACE_String_Base &s) -{ - this->set (s.rep_, s.len_, 0); - return *this; -} - -template ACE_INLINE void -ACE_String_Base::set (const CHAR *s, int release) -{ - size_t length; - if (s != 0) - length = ACE_OS::strlen (s); - else - length = 0; - - this->set (s, length, release); -} - -template ACE_INLINE size_t -ACE_String_Base::length (void) const -{ - ACE_TRACE ("ACE_String_Base::length"); - return this->len_; -} - -template ACE_INLINE void -ACE_String_Base::clear (int release) -{ - this->set(0, 0, release); -} - -template ACE_INLINE ACE_String_Base -ACE_String_Base::substr (size_t offset, - ssize_t length) const -{ - return this->substring (offset, length); -} - -// Return the character in the string. - -template ACE_INLINE const CHAR & -ACE_String_Base::operator[] (size_t slot) const -{ - ACE_TRACE ("ACE_String_Base::operator[]"); - return this->rep_[slot]; -} - -// Return the character in the string by reference. - -template ACE_INLINE CHAR & -ACE_String_Base::operator[] (size_t slot) -{ - ACE_TRACE ("ACE_String_Base::operator[]"); - return this->rep_[slot]; -} - -// Get a copy of the underlying representation. - -template ACE_INLINE CHAR * -ACE_String_Base::rep (void) const -{ - ACE_TRACE ("ACE_String_Base::rep"); - - CHAR *new_string; - ACE_NEW_RETURN (new_string, CHAR[this->len_ + 1], 0); - ACE_OS::strsncpy (new_string, this->rep_, this->len_+1); - - return new_string; -} - -template ACE_INLINE const CHAR * -ACE_String_Base::fast_rep (void) const -{ - return this->rep_; -} - -template ACE_INLINE const CHAR * -ACE_String_Base::c_str (void) const -{ - return this->rep_; -} - -template ACE_INLINE int -ACE_String_Base::compare (const ACE_String_Base &s) const -{ - ACE_TRACE ("ACE_String_Base::compare"); - - // Pick smaller of the two lengths and perform the comparison. - size_t smaller_length = ace_min (this->len_, s.len_); - - int result = ACE_OS::memcmp (this->rep_, - s.rep_, - smaller_length * sizeof (CHAR)); - - if (!result) - result = ACE_static_cast (int, (this->len_ - s.len_)); - return result; -} - - -// Comparison operator. - -template ACE_INLINE int -ACE_String_Base::operator== (const ACE_String_Base &s) const -{ - ACE_TRACE ("ACE_String_Base::operator=="); - - return compare (s) == 0; -} - -// Less than comparison operator. - -template ACE_INLINE int -ACE_String_Base::operator < (const ACE_String_Base &s) const -{ - ACE_TRACE ("ACE_String_Base::operator <"); - return compare (s) < 0; -} - -// Greater than comparison operator. - -template ACE_INLINE int -ACE_String_Base::operator > (const ACE_String_Base &s) const -{ - ACE_TRACE ("ACE_String_Base::operator >"); - return compare (s) > 0; -} - - -// Comparison operator. - -template ACE_INLINE int -ACE_String_Base::operator!= (const ACE_String_Base &s) const -{ - ACE_TRACE ("ACE_String_Base::operator!="); - return !(*this == s); -} - -template ACE_INLINE ssize_t -ACE_String_Base::find (const CHAR *s, size_t pos) const -{ - CHAR *substr = this->rep_ + pos; - size_t len = ACE_OS::strlen (s); - CHAR *pointer = ACE_OS::strnstr (substr, s, len); - if (pointer == 0) - return ACE_String_Base::npos; - else - return pointer - this->rep_; -} - -template ACE_INLINE ssize_t -ACE_String_Base::find (CHAR c, size_t pos) const -{ - CHAR *substr = this->rep_ + pos; - CHAR *pointer = ACE_OS::strnchr (substr, c, this->len_ - pos); - if (pointer == 0) - return ACE_String_Base::npos; - else - return pointer - this->rep_; -} - -template ACE_INLINE ssize_t -ACE_String_Base::find (const ACE_String_Base&str, size_t pos) const -{ - return this->find (str.rep_, pos); -} - -template ACE_INLINE ssize_t -ACE_String_Base::strstr (const ACE_String_Base &s) const -{ - ACE_TRACE ("ACE_String_Base::strstr"); - - return this->find (s.rep_); -} - -template ACE_INLINE ssize_t -ACE_String_Base::rfind (CHAR c, ssize_t pos) const -{ - if (pos == npos || pos > ACE_static_cast (ssize_t, this->len_)) - pos = ACE_static_cast (ssize_t, this->len_); - - for (ssize_t i = pos - 1; i >= 0; i--) - if (this->rep_[i] == c) - return i; - - return ACE_String_Base::npos; -} - -template ACE_INLINE u_long -ACE_String_Base::hash (void) const -{ - return ACE::hash_pjw ((ACE_reinterpret_cast (char *, - ACE_const_cast (CHAR *, - this->rep_))), - this->len_ * sizeof (CHAR)); -} - -template ACE_INLINE ACE_String_Base -operator+ (const ACE_String_Base &s, const ACE_String_Base &t) -{ - ACE_String_Base temp (s); - temp += t; - return temp; -} - -template ACE_INLINE ACE_String_Base -operator+ (const CHAR *s, const ACE_String_Base &t) -{ - ACE_String_Base temp (s); - temp += t; - return temp; -} - -template ACE_INLINE ACE_String_Base -operator+ (const ACE_String_Base &s, const CHAR *t) -{ - ACE_String_Base temp (s); - temp += t; - return temp; -} - -template ACE_INLINE -ACE_String_Base operator + (const ACE_String_Base &t, - const CHAR c) -{ - ACE_String_Base temp (t); - temp += c; - return temp; -} - -template ACE_INLINE -ACE_String_Base operator + (const CHAR c, - const ACE_String_Base &t) -{ - ACE_String_Base temp (c); - temp += t; - return temp; -} diff --git a/ace/String_Base_Const.cpp b/ace/String_Base_Const.cpp deleted file mode 100644 index bf66b2cf873..00000000000 --- a/ace/String_Base_Const.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// $Id$ - -#include "ace/String_Base_Const.h" - -ssize_t ACE_String_Base_Const::npos = -1; diff --git a/ace/String_Base_Const.h b/ace/String_Base_Const.h deleted file mode 100644 index d0dd5b744a1..00000000000 --- a/ace/String_Base_Const.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file String_Base_Const.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - -#ifndef ACE_STRING_BASE_CONST_H -#define ACE_STRING_BASE_CONST_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" -#include "ace/Basic_Types.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -/** - * @class ACE_String_Base_Const - * - * @brief This class defines a constant for ACE_String_Base to - * circumvent a bug in SunCC 6.0. - */ -class ACE_Export ACE_String_Base_Const -{ -public: - static ssize_t npos; -}; - -#include "ace/post.h" -#endif /* ACE_STRING_BASE_CONST_H */ diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h deleted file mode 100644 index 5b1d50b7dc4..00000000000 --- a/ace/Svc_Conf.h +++ /dev/null @@ -1,205 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Svc_Conf.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_SVC_CONF_H -#define ACE_SVC_CONF_H - -#include "ace/pre.h" - -// Globally visible macros, type decls, and extern var decls for -// Service Configurator utility. - -#include "ace/Obstack.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Service_Config.h" -#include "ace/Parse_Node.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 1) - -// Forward declarations. -struct ace_yy_buffer_state; - -// The following yylex() declarations require support for reentrant -// parser generation (e.g. from GNU Bison). -#if defined (DEBUGGING) -#if defined (ACE_YY_DECL) -#undef ACE_YY_DECL -#endif /* ACE_YY_DECL */ -#define ACE_YY_DECL extern "C" char *ace_yylex (ACE_YYSTYPE *ace_yylval, void *ACE_YYLEX_PARAM) -#else -#define ACE_YY_DECL extern "C" int ace_yylex (ACE_YYSTYPE *ace_yylval, void *ACE_YYLEX_PARAM) -#endif /* DEBUGGING */ - -extern void ace_yy_delete_buffer (ace_yy_buffer_state *buffer); - -/** - * @class ACE_Svc_Conf_Param - * - * @brief An instance of this object will be passed down to the - * yyparse() and yylex() functions. - * - * This class retains the state for a given parse/scan. It primarily - * makes it possible to hold the static object lock in the scanner - * for as short a period of time as possible. The resulting finer - * grained locking prevents deadlocks from occuring when scanning a - * `svc.conf' file and activating an ACE_Task, for example, as a - * result of processing the directives in that file. - */ -class ACE_Svc_Conf_Param -{ -public: - - enum SVC_CONF_PARAM_TYPE - { - /// The lexer will scan a file containing one or more directives. - SVC_CONF_FILE, - - /// The lexer will scan a string containing a directive. - SVC_CONF_DIRECTIVE - }; - - /// Constructor - ACE_Svc_Conf_Param (FILE *file) - : type (SVC_CONF_FILE), - yyerrno (0), - yylineno (1), - buffer (0), - obstack () - { - source.file = file; - } - - /// Constructor - ACE_Svc_Conf_Param (const ACE_TCHAR *directive) - : type (SVC_CONF_DIRECTIVE), - yyerrno (0), - yylineno (1), - buffer (0), - obstack () - { - source.directive = directive; - } - - ~ACE_Svc_Conf_Param (void) - { - ace_yy_delete_buffer (this->buffer); - } - -public: - - union - { - /// FILE stream from which directives will be scanned and parsed. - FILE *file; - - /// String containing directive that will be scanned and parsed. - const ACE_TCHAR *directive; - - } source; - - /// Discriminant use to determine which union member to use. - SVC_CONF_PARAM_TYPE type; - - /// Keeps track of the number of errors encountered so far. - int yyerrno; - - /// Keeps track of the current line number for error-handling routine. - int yylineno; - - /// Lexer buffer that corresponds to the current Service - /// Configurator file/direct scan. - ace_yy_buffer_state *buffer; - - /// Obstack used for efficient memory allocation when - /// parsing/scanning a service configurator directive. - ACE_Obstack_T obstack; - -}; - -// Parameter that is passed down to the yyparse() function, and -// eventually to yylex(). -#define ACE_YYPARSE_PARAM ace_svc_conf_parameter -#define ACE_YYLEX_PARAM ACE_YYPARSE_PARAM - -#define ACE_SVC_CONF_PARAM (ACE_static_cast (ACE_Svc_Conf_Param *, ACE_YYLEX_PARAM)) - -// The following definition for the ACE_YYSTYPE must occur before -// ACE_YY_DECL is declared since ACE_YY_DECL expands to function -// prototypes that use ACE_YYSTYPE. -typedef union -{ - int type_; - ACE_Location_Node *location_node_; - ACE_Parse_Node *parse_node_; - ACE_Static_Node *static_node_; - ACE_Service_Type *svc_record_; - ACE_TCHAR *ident_; -} ACE_YYSTYPE; - -// Forward declaration -struct ace_yy_buffer_state; - -/// Create and push a new lexer buffer on to the buffer stack for use -/// when scanning the given file. -void ace_yy_push_buffer (FILE *file, - ace_yy_buffer_state *&buffer); - -/// Create and push a new lexer buffer on to the buffer stack for use -/// when scanning the given directive. -void ace_yy_push_buffer (const ACE_TCHAR *directive, - ace_yy_buffer_state *&buffer); - -/// Pop the current lexer buffer off of the buffer stack and -/// deallocate it. -void ace_yy_pop_buffer (ace_yy_buffer_state *buf); - -/// Performs the parsing -#ifdef ACE_YYPARSE_PARAM -int ace_yyparse (void *); -#else -int ace_yyparse (void); -#endif - -/// Performs the lexical analysis -ACE_YY_DECL; - -/// Name of input stream -extern FILE *ace_yyin; - -/// Error handling routine required by YACC or BISON -void ace_yyerror (int yyerrno, int yylineno, const ACE_TCHAR *); - -/// Holds the lexeme for the current token -extern ACE_TCHAR *ace_yytext; - -/// Holds the length of the lexeme for the current token -extern int ace_yyleng; - -#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ - -/// Factory that creates a new ACE_Service_Type_Impl. -extern ACE_Service_Type_Impl * -ace_create_service_type (const ACE_TCHAR *, - int, - void *, - unsigned int, - ACE_Service_Object_Exterminator = 0); - - -#include "ace/post.h" - -#endif /* ACE_SVC_CONF_H */ diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l deleted file mode 100644 index dd17bf2160f..00000000000 --- a/ace/Svc_Conf.l +++ /dev/null @@ -1,134 +0,0 @@ -%{ -// $Id$ -// Sample lexical analysis for regular expression subset. Must be -// compiled with FLEX and an ANSI C++ compiler. - -// Lexical tokens values defined by YACC. -#include "ace/Svc_Conf.h" -#include "ace/Svc_Conf_Tokens.h" -#include "ace/Svc_Conf_Lexer_Guard.h" - -ACE_RCSID (ace, - Svc_Conf_l, - "$Id$") - -#define token(x) x -%} - -%s PARAMETERS -%s NORMAL - -letter [a-zA-Z_] -letter_or_digit [a-zA-Z_0-9] -digit [0-9] -ident {letter}{letter_or_digit}* -pathname ([A-Za-z\%]:)?[a-zA-Z_0-9/\%\.\\~-]+ -symbol [ -~] -string (\"{symbol}*\"|\'{symbol}*\') -white_space [ \t] -newline \n -carrage_retn \r -other . - -%% - -^#{other}*$ ; /* EMPTY */ -dynamic { return token (ACE_DYNAMIC); } -static { return token (ACE_STATIC); } -suspend { return token (ACE_SUSPEND); } -resume { return token (ACE_RESUME); } -remove { return token (ACE_REMOVE); } -stream { return token (ACE_USTREAM); } -Module { return token (ACE_MODULE_T); } -Service_Object { return token (ACE_SVC_OBJ_T); } -STREAM { return token (ACE_STREAM_T); } -active { return token (ACE_ACTIVE); } -inactive { return token (ACE_INACTIVE); } -":" { return token (':'); } -"*" { return token ('*'); } -"(" { return token ('('); } -")" { return token (')'); } -"{" { return token ('{'); } -"}" { return token ('}'); } -{string} { - // Remove trailing quote character (' or ") - ACE_TCHAR *s = ACE_OS::strrchr (yytext, yytext[0]); - - ACE_ASSERT (s != 0); - // Eliminate the opening and closing double or - // single quotes. - *s = '\0'; - yyleng -= 1; - yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (yytext + 1, yyleng); - return token (ACE_STRING); } -{ident} { - yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (yytext, yyleng); - return token (ACE_IDENT); - } -{pathname} { - yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (yytext, yyleng); - return token (ACE_PATHNAME); - } -{white_space}+ ; /* EMPTY */ -{carrage_retn} ; /* EMPTY */ -{newline} { ACE_SVC_CONF_PARAM->yylineno++; } -{other} { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("unknown character = (%d"), - *yytext)); - if (ACE_OS::ace_isprint (*yytext)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *yytext)); - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n"))); - } -<> { yyterminate (); } -%% -int -yywrap (void) -{ - ACE_OS::fflush (yyin); - yytext[0] = '#'; - yyleng = 0; - - return 1; -} - -void -yy_push_buffer (FILE *file, yy_buffer_state *&buffer) -{ - // External synchronization is required. - - if (buffer == 0) - buffer = yy_create_buffer (file, YY_BUF_SIZE); - - yy_switch_to_buffer (buffer); -} - -void -yy_push_buffer (const ACE_TCHAR *directive, yy_buffer_state *&buffer) -{ - // External synchronization is required. - - // yyparse() may invoke yylex() multiple times when parsing - // a single directive. Prevent a new buffer from created during - // each call to yylex(). - if (YY_CURRENT_BUFFER != 0 - && directive == YY_CURRENT_BUFFER->yy_ch_buf) - return; - - if (buffer == 0) - { - // yy_scan_string() already switches the buffer so there is - // no need to explicitly make the switch. - buffer = yy_scan_string (directive); - } - else - yy_switch_to_buffer (buffer); -} - -void -yy_pop_buffer (yy_buffer_state *buffer) -{ - // External synchronization is required. - - yy_switch_to_buffer (buffer); -} diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y deleted file mode 100644 index 002d4d59b00..00000000000 --- a/ace/Svc_Conf.y +++ /dev/null @@ -1,436 +0,0 @@ -%{ -// $Id$ - -#include "ace/Svc_Conf.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 1) - -#include "ace/ARGV.h" -#include "ace/Module.h" -#include "ace/Stream.h" -#include "ace/Service_Types.h" - - -ACE_RCSID (ace, - Svc_Conf_y, - "$Id$") - - -// Prototypes. -static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, - ACE_Static_Node *svc_type, - int & yyerrno); -static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, - const ACE_TCHAR *svc_name, - int & yyerrno); - -#define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext) - -// Force the pretty debugging code to compile. -// #define YYDEBUG 1 - -%} - -%token ACE_DYNAMIC ACE_STATIC ACE_SUSPEND ACE_RESUME ACE_REMOVE ACE_USTREAM -%token ACE_MODULE_T ACE_STREAM_T ACE_SVC_OBJ_T ACE_ACTIVE ACE_INACTIVE -%token ACE_PATHNAME ACE_IDENT ACE_STRING - -%start svc_config_entries - -%type ACE_IDENT ACE_STRING ACE_PATHNAME pathname parameters_opt -%type type status -%type dynamic static suspend resume remove module_list stream -%type stream_modules module svc_config_entry -%type stream_ops -%type svc_location -%type svc_initializer - -// Generate a pure (reentrant) parser -- GNU Bison only -%pure_parser - -%% - -svc_config_entries - : svc_config_entries svc_config_entry - { - if ($2 != 0) - { - $2->apply (ACE_SVC_CONF_PARAM->yyerrno); delete $2; - } - ACE_SVC_CONF_PARAM->obstack.release (); - } - | svc_config_entries error - { - ACE_SVC_CONF_PARAM->obstack.release (); - } - | /* EMPTY */ - ; - -svc_config_entry - : dynamic - | static - | suspend - | resume - | remove - | stream - ; - -dynamic - : ACE_DYNAMIC svc_location parameters_opt - { - if ($2 != 0) - $$ = new ACE_Dynamic_Node ($2, $3); - else - $$ = 0; - } - ; - -static - : ACE_STATIC ACE_IDENT parameters_opt - { - $$ = new ACE_Static_Node ($2, $3); - } - ; - -suspend - : ACE_SUSPEND ACE_IDENT - { - $$ = new ACE_Suspend_Node ($2); - } - ; - -resume - : ACE_RESUME ACE_IDENT - { - $$ = new ACE_Resume_Node ($2); - } - ; - -remove - : ACE_REMOVE ACE_IDENT - { - $$ = new ACE_Remove_Node ($2); - } - ; - -stream - : ACE_USTREAM stream_ops stream_modules - { - $$ = new ACE_Stream_Node ($2, $3); - } - | ACE_USTREAM ACE_IDENT { $$ = new ACE_Static_Node ($2); } stream_modules - { - $$ = new ACE_Dummy_Node ($3, $4); - } - ; - -stream_ops - : dynamic - { - } - | static - { - } - ; - -stream_modules - : '{' - { - // Initialize left context... - $$ = $0; - } - module_list '}' - { - $$ = $3; - } - | /* EMPTY */ { $$ = 0; } - ; - -module_list - : module_list module - { - if ($2 != 0) - { - $2->link ($1); - $$ = $2; - } - } - | /* EMPTY */ { $$ = 0; } - ; - -module - : dynamic - { - ACE_Static_Node *svc_type = $1; - - if (svc_type != 0) - { - ACE_Static_Node *module = $-1; - - ACE_ARGV args (svc_type->parameters ()); - ACE_Module_Type *mt = ace_get_module (module, - svc_type, - ACE_SVC_CONF_PARAM->yyerrno); - ACE_Stream_Type *st = - ACE_dynamic_cast (ACE_Stream_Type *, - ACE_const_cast (ACE_Service_Type_Impl *, - module->record ()->type ())); - - if (mt->init (args.argc (), args.argv ()) == -1 - || st->push (mt) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("dynamic initialization failed for Module %s\n"), - svc_type->name ())); - ACE_SVC_CONF_PARAM->yyerrno++; - } - } - } - | static - { - ACE_Module_Type *mt = ace_get_module ($-1, - $1->name (), - ACE_SVC_CONF_PARAM->yyerrno); - - if (((ACE_Stream_Type *) ($-1)->record ()->type ())->push (mt) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Problem with static\n"))); - ACE_SVC_CONF_PARAM->yyerrno++; - } - } - | suspend - { - ACE_Module_Type *mt = ace_get_module ($-1, - $1->name (), - ACE_SVC_CONF_PARAM->yyerrno); - if (mt != 0) - mt->suspend (); - } - | resume - { - ACE_Module_Type *mt = ace_get_module ($-1, - $1->name (), - ACE_SVC_CONF_PARAM->yyerrno); - if (mt != 0) - mt->resume (); - } - | remove - { - ACE_Static_Node *stream = $-1; - ACE_Static_Node *module = $1; - ACE_Module_Type *mt = ace_get_module (stream, - module->name (), - ACE_SVC_CONF_PARAM->yyerrno); - - ACE_Stream_Type *st = - ACE_dynamic_cast (ACE_Stream_Type *, - ACE_const_cast (ACE_Service_Type_Impl *, - stream->record ()->type ())); - if (mt != 0 && st->remove (mt) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), - module->name (), - stream->name ())); - ACE_SVC_CONF_PARAM->yyerrno++; - } - } - ; - -svc_location - : ACE_IDENT type svc_initializer status - { - u_int flags - = ACE_Service_Type::DELETE_THIS - | ($3->dispose () == 0 ? 0 : ACE_Service_Type::DELETE_OBJ); - ACE_Service_Object_Exterminator gobbler = 0; - void *sym = $3->symbol (ACE_SVC_CONF_PARAM->yyerrno, &gobbler); - - if (sym != 0) - { - ACE_Service_Type_Impl *stp - = ACE_Service_Config::create_service_type_impl ($1, - $2, - sym, - flags, - gobbler); - if (stp == 0) - ++ACE_SVC_CONF_PARAM->yyerrno; - - $$ = new ACE_Service_Type ($1, - stp, - $3->dll (), - $4); - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Unable to find service: %s\n"), - $1)); - ++ACE_SVC_CONF_PARAM->yyerrno; - $$ = 0; - } - delete $3; - } - ; - -status - : ACE_ACTIVE - { - $$ = 1; - } - | ACE_INACTIVE - { - $$ = 0; - } - | /* EMPTY */ - { - $$ = 1; - } - ; - -svc_initializer - : pathname ':' ACE_IDENT - { - $$ = new ACE_Object_Node ($1, $3); - } - | pathname ':' ACE_IDENT '(' ')' - { - $$ = new ACE_Function_Node ($1, $3); - } - | ':' ACE_IDENT '(' ')' - { - $$ = new ACE_Static_Function_Node ($2); - } - ; - -type - : ACE_MODULE_T '*' - { - $$ = ACE_MODULE_T; - } - | ACE_SVC_OBJ_T '*' - { - $$ = ACE_SVC_OBJ_T; - } - | ACE_STREAM_T '*' - { - $$ = ACE_STREAM_T; - } - ; - -parameters_opt - : ACE_STRING - | /* EMPTY */ { $$ = 0; } - ; - -pathname - : ACE_PATHNAME - | ACE_IDENT - | ACE_STRING - ; - -%% -// Prints the error string to standard output. Cleans up the error -// messages. - -void -yyerror (int yyerrno, int yylineno, const ACE_TCHAR *s) -{ -#if defined (ACE_NLOGGING) - ACE_UNUSED_ARG (yyerrno); - ACE_UNUSED_ARG (yylineno); - ACE_UNUSED_ARG (s); -#endif /* ACE_NLOGGING */ - - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("[error %d] on line %d: %s\n"), - yyerrno, - yylineno, - s)); -} - -// Note that SRC_REC represents left context, which is the STREAM * -// record. - -static ACE_Module_Type * -ace_get_module (ACE_Static_Node *str_rec, - const ACE_TCHAR *svc_name, - int & yyerrno) -{ - const ACE_Service_Type *sr = str_rec->record (); - const ACE_Service_Type_Impl *type = sr->type (); - ACE_Stream_Type *st = sr == 0 - ? 0 - : ACE_dynamic_cast (ACE_Stream_Type *, - ACE_const_cast (ACE_Service_Type_Impl *, - type)); - ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name); - - if (sr == 0 || st == 0 || mt == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"), - svc_name, - str_rec->name ())); - yyerrno++; - } - - return mt; -} - -static ACE_Module_Type * -ace_get_module (ACE_Static_Node *str_rec, - ACE_Static_Node *svc_type, - int & yyerrno) -{ - const ACE_Service_Type *sr = str_rec->record (); - const ACE_Service_Type_Impl *type = sr->type (); - ACE_Stream_Type *st = sr == 0 ? 0 : (ACE_Stream_Type *) type; - const ACE_Service_Type *sv = svc_type->record (); - type = sv->type (); - ACE_Module_Type *mt = (ACE_Module_Type *) type; - const ACE_TCHAR *module_type_name = svc_type->name (); - - if (sr == 0 || st == 0 || mt == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), - module_type_name, - str_rec->name ())); - yyerrno++; - } - - // Make sure that the Module has the same name as the - // Module_Type object from the svc.conf file. - ACE_Module *mp = (ACE_Module *) mt->object (); - - if (ACE_OS::strcmp (mp->name (), module_type_name) != 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), - module_type_name, - mp->name ())); - mp->name (module_type_name); - } - - return mt; -} - -#if defined (DEBUGGING) -// Main driver program. - -int -main (int argc, char *argv[]) -{ - ACE_Svc_Conf_Param param (stdin); - - // Try to reopen any filename argument to use YYIN. - if (argc > 1 && (yyin = freopen (argv[1], "r", stdin)) == 0) - (void) ACE_OS::fprintf (stderr, ACE_LIB_TEXT ("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1); - - return ::yyparse (¶m); -} -#endif /* DEBUGGING */ -#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ diff --git a/ace/Svc_Conf_Lexer_Guard.cpp b/ace/Svc_Conf_Lexer_Guard.cpp deleted file mode 100644 index c5d79aa1f32..00000000000 --- a/ace/Svc_Conf_Lexer_Guard.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// -*- C++ -*- - -#include "ace/Svc_Conf_Lexer_Guard.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 1) - -#include "ace/Svc_Conf.h" - -ACE_RCSID (ace, - Svc_Conf_Lexer_Guard, - "$Id$") - -ACE_Svc_Conf_Lexer_Guard::ACE_Svc_Conf_Lexer_Guard (ACE_Svc_Conf_Param *param) - : buffer_ (0) -{ - // External synchronization is required. - - // Note that allocation/deallocation is done once during the - // processing of a service configurator directive. Memory - // managements is done at a higher level, not in this class. This - // is necessary to prevent an allocation/deallocation from occurring - // when parsing/scanning each token. - - if (param->type == ACE_Svc_Conf_Param::SVC_CONF_FILE) - ::ace_yy_push_buffer (param->source.file, param->buffer); - else - ::ace_yy_push_buffer (param->source.directive, - param->buffer); - - this->buffer_ = param->buffer; -} - -ACE_Svc_Conf_Lexer_Guard::~ACE_Svc_Conf_Lexer_Guard (void) -{ - // External synchronization is required. - - ::ace_yy_pop_buffer (this->buffer_); -} -#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ diff --git a/ace/Svc_Conf_Lexer_Guard.h b/ace/Svc_Conf_Lexer_Guard.h deleted file mode 100644 index 4e68bb60ed5..00000000000 --- a/ace/Svc_Conf_Lexer_Guard.h +++ /dev/null @@ -1,79 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Svc_Conf_Lexer_Guard.h - * - * $Id$ - * - * @author Ossama Othman - */ -//============================================================================= - -#ifndef ACE_SVC_CONF_LEXER_GUARD_H -#define ACE_SVC_CONF_LEXER_GUARD_H - -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/// Forward declarations -class ACE_Svc_Conf_Param; - -struct ace_yy_buffer_state; - -/** - * @class ACE_Svc_Conf_Lexer_Guard - * - * @brief "Guard" that ensures lexer buffer switching is - * exception-safe. - * - * Buffers are switched, if necessary, each time a token is - * parsed/scanned. The buffer switching must be synchronized - * externally. This class performs no synchronization. - * - * @note Note that allocation/deallocation is done once during the - * processing of a service configurator directive. Memory - * managements is done at a higher level, not in this class. - * This is necessary to prevent an allocation/deallocation from - * occurring when parsing/scanning each token. - */ -class ACE_Svc_Conf_Lexer_Guard -{ -public: - - /// Constructor - /** - * Switches buffers, if necessary, when token scanning first - * begins. Allocation of the buffer will also occur if one has not - * already been allocated. This operation effectively pushes a - * buffer on to a stack. - */ - ACE_Svc_Conf_Lexer_Guard (ACE_Svc_Conf_Param *param); - - /// Destructor - /** - * Switches buffers, if necessary when token scanning completes. No - * buffer deallocation occurs here. Buffers are deallocated when - * parsing of the entire directive is done, not when scanning of a - * single token is done. This operation effective pops a buffer off - * of a stack. - */ - ~ACE_Svc_Conf_Lexer_Guard (void); - -private: - - /// Lexer buffer that corresponds to the current Service - /// Configurator file/direct scan. - ace_yy_buffer_state *buffer_; - -}; - - -#include "ace/post.h" - -#endif /* ACE_SVC_CONF_LEXER_GUARD_H */ diff --git a/ace/Svc_Conf_Tokens.h b/ace/Svc_Conf_Tokens.h deleted file mode 100644 index 6fe46126fef..00000000000 --- a/ace/Svc_Conf_Tokens.h +++ /dev/null @@ -1,21 +0,0 @@ -// $Id$ -#ifndef BISON_SVC_CONF_TAB_H -# define BISON_SVC_CONF_TAB_H - -# define ACE_DYNAMIC 257 -# define ACE_STATIC 258 -# define ACE_SUSPEND 259 -# define ACE_RESUME 260 -# define ACE_REMOVE 261 -# define ACE_USTREAM 262 -# define ACE_MODULE_T 263 -# define ACE_STREAM_T 264 -# define ACE_SVC_OBJ_T 265 -# define ACE_ACTIVE 266 -# define ACE_INACTIVE 267 -# define ACE_PATHNAME 268 -# define ACE_IDENT 269 -# define ACE_STRING 270 - - -#endif /* not BISON_SVC_CONF_TAB_H */ diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp deleted file mode 100644 index f232996aca9..00000000000 --- a/ace/Svc_Conf_l.cpp +++ /dev/null @@ -1,1855 +0,0 @@ -#define ACE_YY_NO_UNPUT - -/* A lexical scanner generated by flex */ - -/* Scanner skeleton version: - * $Header$ - */ - -#define FLEX_SCANNER -#define ACE_YY_FLEX_MAJOR_VERSION 2 -#define ACE_YY_FLEX_MINOR_VERSION 5 - -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif -#endif - - -#ifdef __cplusplus - -#include "ace/OS.h" -#include "ace/Object_Manager.h" - -/* Use prototypes in function declarations. */ -#define ACE_YY_USE_PROTOS - -/* The "const" storage-class-modifier is valid. */ -#define ACE_YY_USE_CONST - -#else /* ! __cplusplus */ - -#if __STDC__ - -#define ACE_YY_USE_PROTOS -#define ACE_YY_USE_CONST - -#endif /* __STDC__ */ -#endif /* ! __cplusplus */ - -#if (ACE_USES_CLASSIC_SVC_CONF == 1) - -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include /**/ -#include /**/ -#define ACE_YY_USE_CONST -#define ACE_YY_USE_PROTOS -#endif - -#ifdef ACE_YY_USE_CONST -#define ace_yyconst const -#else -#define ace_yyconst -#endif - - -#ifdef ACE_YY_USE_PROTOS -#define ACE_YY_PROTO(proto) proto -#else -#define ACE_YY_PROTO(proto) () -#endif - -/* Returned upon end-of-file. */ -#define ACE_YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define ACE_YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN ace_yy_start = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The ACE_YYSTATE alias is for lex - * compatibility. - */ -#define ACE_YY_START ((ace_yy_start - 1) / 2) -#define ACE_YYSTATE ACE_YY_START - -/* Action number for EOF rule of a given start state. */ -#define ACE_YY_STATE_EOF(state) (ACE_YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define ACE_YY_NEW_FILE ace_yyrestart( ace_yyin ) - -#define ACE_YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#define ACE_YY_BUF_SIZE 16384 - -typedef struct ace_yy_buffer_state *ACE_YY_BUFFER_STATE; - -extern int ace_yyleng; -extern FILE *ace_yyin, *ace_yyout; - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * ace_yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the ace_yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - -#define ace_yyless(n) \ - do \ - { \ - /* Undo effects of setting up ace_yytext. */ \ - *ace_yy_cp = ace_yy_hold_char; \ - ACE_YY_RESTORE_ACE_YY_MORE_OFFSET \ - ace_yy_c_buf_p = ace_yy_cp = ace_yy_bp + n - ACE_YY_MORE_ADJ; \ - ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */ \ - } \ - while ( 0 ) - -#if 0 -#define unput(c) ace_yyunput( c, ace_yytext_ptr ) -#endif /* 0 */ - -/* The following is because we cannot portably get our hands on size_t - * (without autoconf's help, which isn't available because we want - * flex-generated scanners to compile on their own). - */ -typedef unsigned int ace_yy_size_t; - - -struct ace_yy_buffer_state - { - FILE *ace_yy_input_file; - - ACE_TCHAR *ace_yy_ch_buf; /* input buffer */ - ACE_TCHAR *ace_yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - ace_yy_size_t ace_yy_buf_size; - - /* Number of characters read into ace_yy_ch_buf, not including EOB - * characters. - */ - int ace_yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int ace_yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int ace_yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int ace_yy_at_bol; - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int ace_yy_fill_buffer; - - int ace_yy_buffer_status; -#define ACE_YY_BUFFER_NEW 0 -#define ACE_YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as ACE_YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via ace_yyrestart()), so that the user can continue scanning by - * just pointing ace_yyin at a new input file. - */ -#define ACE_YY_BUFFER_EOF_PENDING 2 - }; - -static ACE_YY_BUFFER_STATE ace_yy_current_buffer = 0; - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - */ -#define ACE_YY_CURRENT_BUFFER ace_yy_current_buffer - - -/* ace_yy_hold_char holds the character lost when ace_yytext is formed. */ -static ACE_TCHAR ace_yy_hold_char; - -static int ace_yy_n_chars; /* number of characters read into ace_yy_ch_buf */ - - -int ace_yyleng; - -/* Points to current character in buffer. */ -static ACE_TCHAR *ace_yy_c_buf_p = (ACE_TCHAR *) 0; -static int ace_yy_init = 1; /* whether we need to initialize */ -static int ace_yy_start = 0; /* start state number */ - -/* Flag which is used to allow ace_yywrap()'s to do buffer switches - * instead of setting up a fresh ace_yyin. A bit of a hack ... - */ -static int ace_yy_did_buffer_switch_on_eof; - -void ace_yyrestart ACE_YY_PROTO(( FILE *input_file )); - -void ace_yy_switch_to_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE new_buffer )); -void ace_yy_load_buffer_state ACE_YY_PROTO(( void )); -ACE_YY_BUFFER_STATE ace_yy_create_buffer ACE_YY_PROTO(( FILE *file, int size )); -void ace_yy_delete_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b )); -void ace_yy_init_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b, FILE *file )); -void ace_yy_flush_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b )); -#define ACE_YY_FLUSH_BUFFER ace_yy_flush_buffer( ace_yy_current_buffer ) - -ACE_YY_BUFFER_STATE ace_yy_scan_buffer ACE_YY_PROTO(( ACE_TCHAR *base, ace_yy_size_t size )); -ACE_YY_BUFFER_STATE ace_yy_scan_string ACE_YY_PROTO(( ace_yyconst ACE_TCHAR *ace_yy_str )); -ACE_YY_BUFFER_STATE ace_yy_scan_bytes ACE_YY_PROTO(( ace_yyconst ACE_TCHAR *bytes, int len )); - -static void *ace_yy_flex_alloc ACE_YY_PROTO(( ace_yy_size_t )); -static void *ace_yy_flex_realloc ACE_YY_PROTO(( void *, ace_yy_size_t )); -static void ace_yy_flex_free ACE_YY_PROTO(( void * )); - -#define ace_yy_new_buffer ace_yy_create_buffer - -#define ace_yy_set_interactive(is_interactive) \ - { \ - if ( ! ace_yy_current_buffer ) \ - ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \ - ace_yy_current_buffer->ace_yy_is_interactive = is_interactive; \ - } - -#define ace_yy_set_bol(at_bol) \ - { \ - if ( ! ace_yy_current_buffer ) \ - ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \ - ace_yy_current_buffer->ace_yy_at_bol = at_bol; \ - } - -#define ACE_YY_AT_BOL() (ace_yy_current_buffer->ace_yy_at_bol) - -typedef ACE_TCHAR ACE_YY_CHAR; -FILE *ace_yyin = (FILE *) 0, *ace_yyout = (FILE *) 0; -typedef int ace_yy_state_type; -extern ACE_TCHAR *ace_yytext; -#define ace_yytext_ptr ace_yytext - -static ace_yy_state_type ace_yy_get_previous_state ACE_YY_PROTO(( void )); -static ace_yy_state_type ace_yy_try_NUL_trans ACE_YY_PROTO(( ace_yy_state_type current_state )); -static int ace_yy_get_next_buffer ACE_YY_PROTO(( void )); -static void ace_yy_fatal_error ACE_YY_PROTO(( ace_yyconst ACE_TCHAR msg[] )); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up ace_yytext. - */ -#define ACE_YY_DO_BEFORE_ACTION \ - ace_yytext_ptr = ace_yy_bp; \ - ace_yyleng = (int) (ace_yy_cp - ace_yy_bp); \ - ace_yy_hold_char = *ace_yy_cp; \ - *ace_yy_cp = '\0'; \ - ace_yy_c_buf_p = ace_yy_cp; - -#define ACE_YY_NUM_RULES 26 -#define ACE_YY_END_OF_BUFFER 27 -static ace_yyconst short int ace_yy_accept[108] = - { 0, - 0, 0, 0, 0, 0, 0, 27, 25, 22, 24, - 23, 25, 21, 25, 15, 16, 14, 21, 13, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 17, 18, - 25, 22, 0, 19, 21, 0, 0, 19, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 0, 1, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 8, 10, 20, 11, 20, 20, 6, - 5, 3, 7, 20, 20, 2, 20, 4, 20, 12, - - 20, 20, 20, 20, 20, 9, 0 - } ; - -static ace_yyconst int ace_yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 5, 6, 7, 8, 6, 9, 6, 10, 11, - 12, 13, 6, 6, 14, 14, 14, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 16, 6, 6, - 6, 6, 6, 6, 17, 18, 18, 18, 19, 18, - 18, 18, 18, 18, 18, 18, 20, 18, 21, 18, - 18, 22, 23, 24, 18, 18, 18, 18, 18, 18, - 6, 14, 6, 6, 25, 6, 26, 27, 28, 29, - - 30, 18, 18, 18, 31, 32, 18, 33, 34, 35, - 36, 37, 18, 38, 39, 40, 41, 42, 18, 18, - 43, 18, 44, 6, 45, 14, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static ace_yyconst int ace_yy_meta[46] = - { 0, - 1, 1, 1, 1, 2, 2, 2, 2, 3, 2, - 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 2, 2 - } ; - -static ace_yyconst short int ace_yy_base[113] = - { 0, - 0, 127, 0, 118, 0, 117, 124, 438, 44, 438, - 438, 115, 100, 93, 438, 438, 438, 86, 438, 38, - 39, 42, 48, 51, 54, 60, 64, 68, 438, 438, - 98, 81, 86, 82, 72, 71, 71, 61, 76, 82, - 90, 91, 101, 104, 105, 114, 118, 124, 58, 438, - 133, 136, 145, 148, 151, 157, 166, 167, 175, 179, - 183, 189, 197, 203, 207, 216, 215, 219, 228, 227, - 231, 237, 250, 254, 262, 263, 272, 273, 282, 283, - 286, 292, 301, 302, 311, 314, 315, 323, 324, 332, - 333, 336, 344, 345, 348, 354, 362, 363, 366, 372, - - 375, 381, 384, 387, 390, 396, 438, 429, 56, 431, - 47, 434 - } ; - -static ace_yyconst short int ace_yy_def[113] = - { 0, - 107, 1, 1, 1, 1, 1, 107, 107, 107, 107, - 107, 108, 109, 110, 107, 107, 107, 109, 107, 111, - 111, 111, 111, 111, 111, 111, 111, 111, 107, 107, - 112, 107, 108, 108, 109, 109, 110, 110, 111, 111, - 111, 111, 111, 111, 111, 111, 111, 111, 112, 107, - 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, - 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, - 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, - 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, - 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, - - 111, 111, 111, 111, 111, 111, 0, 107, 107, 107, - 107, 107 - } ; - -static ace_yyconst short int ace_yy_nxt[484] = - { 0, - 8, 9, 10, 11, 9, 8, 12, 8, 13, 14, - 15, 16, 17, 18, 18, 19, 20, 20, 20, 21, - 20, 20, 22, 20, 23, 24, 20, 20, 25, 20, - 26, 20, 20, 20, 20, 20, 20, 27, 28, 20, - 20, 20, 20, 29, 30, 32, 35, 35, 32, 39, - 35, 35, 35, 36, 36, 35, 35, 36, 35, 35, - 50, 35, 35, 107, 35, 41, 36, 35, 35, 36, - 38, 42, 35, 35, 40, 36, 35, 35, 43, 36, - 38, 35, 32, 36, 35, 32, 107, 107, 34, 35, - 35, 107, 34, 46, 45, 35, 44, 107, 35, 35, - - 50, 107, 38, 35, 35, 107, 107, 47, 48, 35, - 51, 52, 35, 35, 35, 36, 107, 35, 35, 107, - 107, 34, 35, 107, 31, 31, 35, 35, 53, 107, - 56, 35, 35, 107, 31, 107, 107, 35, 55, 107, - 54, 35, 107, 59, 35, 107, 35, 57, 107, 35, - 107, 107, 58, 35, 63, 60, 35, 107, 35, 35, - 107, 35, 61, 107, 35, 35, 107, 107, 107, 107, - 35, 107, 107, 62, 35, 35, 66, 107, 65, 35, - 35, 107, 107, 35, 67, 107, 64, 35, 35, 107, - 107, 35, 35, 107, 107, 107, 35, 35, 107, 107, - - 107, 68, 35, 107, 107, 35, 107, 69, 71, 107, - 35, 35, 107, 74, 70, 35, 35, 107, 107, 72, - 35, 73, 107, 35, 35, 107, 107, 35, 35, 35, - 107, 107, 35, 75, 107, 35, 35, 107, 107, 35, - 35, 35, 107, 107, 35, 35, 107, 107, 76, 77, - 35, 107, 107, 107, 78, 107, 82, 81, 35, 107, - 79, 80, 35, 35, 107, 107, 83, 35, 107, 107, - 35, 35, 107, 85, 107, 35, 35, 107, 107, 84, - 35, 35, 107, 107, 107, 35, 35, 107, 107, 86, - 35, 35, 87, 107, 35, 35, 35, 107, 107, 35, - - 35, 107, 88, 89, 107, 35, 107, 107, 107, 35, - 35, 90, 91, 92, 35, 35, 107, 107, 107, 35, - 107, 107, 35, 35, 35, 93, 107, 35, 35, 107, - 107, 35, 35, 107, 107, 94, 35, 35, 107, 107, - 35, 35, 107, 95, 35, 35, 35, 107, 107, 35, - 96, 107, 35, 35, 107, 107, 35, 35, 35, 107, - 107, 35, 35, 107, 107, 97, 107, 35, 107, 107, - 35, 35, 99, 98, 35, 35, 35, 107, 107, 35, - 35, 107, 107, 35, 107, 35, 101, 107, 35, 35, - 107, 100, 35, 107, 35, 35, 107, 35, 35, 107, - - 35, 102, 107, 35, 35, 107, 107, 107, 107, 35, - 107, 107, 103, 104, 105, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 106, - 33, 33, 37, 37, 49, 49, 49, 7, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107 - } ; - -static ace_yyconst short int ace_yy_chk[484] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 9, 20, 21, 9, 111, - 22, 20, 21, 20, 21, 22, 23, 22, 109, 24, - 49, 23, 25, 23, 24, 22, 24, 25, 26, 25, - 38, 22, 27, 26, 21, 26, 28, 27, 24, 27, - 37, 28, 32, 28, 39, 32, 36, 35, 34, 39, - 40, 39, 33, 27, 26, 40, 25, 40, 41, 42, - - 31, 18, 14, 41, 42, 41, 42, 28, 28, 43, - 40, 41, 44, 45, 43, 13, 43, 44, 45, 44, - 45, 12, 46, 7, 6, 4, 47, 46, 42, 46, - 45, 47, 48, 47, 2, 0, 0, 48, 44, 48, - 43, 51, 0, 47, 52, 0, 51, 46, 51, 52, - 0, 52, 46, 53, 52, 47, 54, 0, 53, 55, - 53, 54, 48, 54, 55, 56, 55, 0, 0, 0, - 56, 0, 56, 51, 57, 58, 55, 0, 54, 57, - 58, 57, 58, 59, 56, 0, 53, 60, 59, 0, - 59, 61, 60, 0, 60, 0, 61, 62, 61, 0, - - 0, 57, 62, 0, 62, 63, 0, 58, 60, 0, - 63, 64, 63, 63, 59, 65, 64, 0, 64, 61, - 65, 62, 65, 67, 66, 0, 0, 68, 67, 66, - 67, 66, 68, 64, 68, 70, 69, 0, 0, 71, - 70, 69, 70, 69, 71, 72, 71, 0, 65, 66, - 72, 0, 72, 0, 67, 0, 71, 70, 73, 0, - 68, 69, 74, 73, 0, 73, 72, 74, 0, 74, - 75, 76, 0, 74, 0, 75, 76, 75, 76, 73, - 77, 78, 0, 0, 0, 77, 78, 77, 78, 75, - 79, 80, 76, 0, 81, 79, 80, 79, 80, 81, - - 82, 81, 77, 78, 0, 82, 0, 82, 0, 83, - 84, 79, 80, 81, 83, 84, 83, 84, 0, 85, - 0, 0, 86, 87, 85, 82, 85, 86, 87, 86, - 87, 88, 89, 0, 0, 83, 88, 89, 88, 89, - 90, 91, 0, 86, 92, 90, 91, 90, 91, 92, - 88, 92, 93, 94, 0, 0, 95, 93, 94, 93, - 94, 95, 96, 95, 0, 89, 0, 96, 0, 96, - 97, 98, 95, 94, 99, 97, 98, 97, 98, 99, - 100, 99, 0, 101, 0, 100, 99, 100, 101, 102, - 101, 97, 103, 0, 102, 104, 102, 103, 105, 103, - - 104, 101, 104, 105, 106, 105, 0, 0, 0, 106, - 0, 106, 102, 103, 104, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 105, - 108, 108, 110, 110, 112, 112, 112, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107 - } ; - -static ace_yy_state_type ace_yy_last_accepting_state; -static ACE_TCHAR *ace_yy_last_accepting_cpos; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define ace_yymore() ace_yymore_used_but_not_detected -#define ACE_YY_MORE_ADJ 0 -#define ACE_YY_RESTORE_ACE_YY_MORE_OFFSET -ACE_TCHAR *ace_yytext; -#define INITIAL 0 -// $Id$ -// Sample lexical analysis for regular expression subset. Must be -// compiled with FLEX and an ANSI C++ compiler. - -// Lexical tokens values defined by YACC. -#include "ace/Svc_Conf.h" -#include "ace/Svc_Conf_Tokens.h" -#include "ace/Svc_Conf_Lexer_Guard.h" - -ACE_RCSID (ace, - Svc_Conf_l, - "$Id$") - -#define token(x) x -#define PARAMETERS 1 - -#define NORMAL 2 - - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef ACE_YY_SKIP_ACE_YYWRAP -#ifdef __cplusplus -extern "C" int ace_yywrap ACE_YY_PROTO(( void )); -#else -extern int ace_yywrap ACE_YY_PROTO(( void )); -#endif -#endif - -#ifndef ACE_YY_NO_UNPUT -static void ace_yyunput ACE_YY_PROTO(( int c, ACE_TCHAR *buf_ptr )); -#endif - -#ifndef ace_yytext_ptr -static void ace_yy_flex_strncpy ACE_YY_PROTO(( ACE_TCHAR *, ace_yyconst ACE_TCHAR *, int )); -#endif - -#ifdef ACE_YY_NEED_STRLEN -static int ace_yy_flex_strlen ACE_YY_PROTO(( ace_yyconst ACE_TCHAR * )); -#endif - -#ifndef ACE_YY_NO_INPUT -#ifdef __cplusplus -static int ace_yyinput ACE_YY_PROTO(( void )); -#else -static int input ACE_YY_PROTO(( void )); -#endif -#endif - -#if ACE_YY_STACK_USED -static int ace_yy_start_stack_ptr = 0; -static int ace_yy_start_stack_depth = 0; -static int *ace_yy_start_stack = 0; -#ifndef ACE_YY_NO_PUSH_STATE -static void ace_yy_push_state ACE_YY_PROTO(( int new_state )); -#endif -#ifndef ACE_YY_NO_POP_STATE -static void ace_yy_pop_state ACE_YY_PROTO(( void )); -#endif -#ifndef ACE_YY_NO_TOP_STATE -static int ace_yy_top_state ACE_YY_PROTO(( void )); -#endif - -#else -#define ACE_YY_NO_PUSH_STATE 1 -#define ACE_YY_NO_POP_STATE 1 -#define ACE_YY_NO_TOP_STATE 1 -#endif - -#ifdef ACE_YY_MALLOC_DECL -ACE_YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include /**/ -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef ACE_YY_READ_BUF_SIZE -#define ACE_YY_READ_BUF_SIZE 8192 -#endif - -/* Copy whatever the last rule matched to the standard output. */ - -#ifndef ACE_SVC_CONF_ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ACE_SVC_CONF_ECHO (void) fwrite( ace_yytext, ace_yyleng, 1, ace_yyout ) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or ACE_YY_NULL, - * is returned in "result". - */ -#ifndef ACE_YY_INPUT -#define ACE_YY_INPUT(buf,result,max_size) \ - if ( ace_yy_current_buffer->ace_yy_is_interactive ) \ - { \ - int c = '*', n; \ - for ( n = 0; n < max_size && \ - (c = getc( ace_yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (ACE_TCHAR) c; \ - if ( c == '\n' ) \ - buf[n++] = (ACE_TCHAR) c; \ - if ( c == EOF && ferror( ace_yyin ) ) \ - ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("input in flex scanner failed") ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, sizeof (ACE_TCHAR), max_size, ace_yyin))==0 && ferror(ace_yyin)) \ - { \ - if( errno != EINTR) \ - { \ - ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("input in flex scanner failed") ); \ - break; \ - } \ - errno=0; \ - clearerr(ace_yyin); \ - } \ - } -#endif - -/* No semi-colon after return; correct usage is to write "ace_yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef ace_yyterminate -#define ace_yyterminate() return ACE_YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef ACE_YY_START_STACK_INCR -#define ACE_YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef ACE_YY_FATAL_ERROR -#define ACE_YY_FATAL_ERROR(msg) ace_yy_fatal_error( msg ) -#endif - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef ACE_YY_DECL -#define ACE_YY_DECL int ace_yylex ACE_YY_PROTO(( void )) -#endif - -/* Code executed at the beginning of each rule, after ace_yytext and ace_yyleng - * have been set up. - */ -#ifndef ACE_YY_USER_ACTION -#define ACE_YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef ACE_YY_BREAK -#define ACE_YY_BREAK break; -#endif - -#define ACE_YY_RULE_SETUP \ - if ( ace_yyleng > 0 ) \ - ace_yy_current_buffer->ace_yy_at_bol = \ - (ace_yytext[ace_yyleng - 1] == '\n'); \ - ACE_YY_USER_ACTION - -ACE_YY_DECL - { - register ace_yy_state_type ace_yy_current_state; - register ACE_TCHAR *ace_yy_cp=0, *ace_yy_bp=0; - register int ace_yy_act; - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, - ace_mon, - *ACE_Static_Object_Lock::instance (), - -1)); - - ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM); - - if ( ace_yy_init ) - { - ace_yy_init = 0; - -#ifdef ACE_YY_USER_INIT - ACE_YY_USER_INIT; -#endif - - if ( ! ace_yy_start ) - ace_yy_start = 1; /* first start state */ - - if ( ! ace_yyin ) - ace_yyin = stdin; - - if ( ! ace_yyout ) - ace_yyout = stdout; - - if ( ! ace_yy_current_buffer ) - ace_yy_current_buffer = - ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); - - ace_yy_load_buffer_state(); - } - - while ( 1 ) /* loops until end-of-file is reached */ - { - ace_yy_cp = ace_yy_c_buf_p; - - /* Support of ace_yytext. */ - *ace_yy_cp = ace_yy_hold_char; - - /* ace_yy_bp points to the position in ace_yy_ch_buf of the start of - * the current run. - */ - ace_yy_bp = ace_yy_cp; - - ace_yy_current_state = ace_yy_start; - ace_yy_current_state += ACE_YY_AT_BOL(); -ace_yy_match: - do - { - register ACE_YY_CHAR ace_yy_c = ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)]; - if ( ace_yy_accept[ace_yy_current_state] ) - { - ace_yy_last_accepting_state = ace_yy_current_state; - ace_yy_last_accepting_cpos = ace_yy_cp; - } - while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state ) - { - ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state]; - if ( ace_yy_current_state >= 108 ) - ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c]; - } - ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c]; - ++ace_yy_cp; - } - while ( ace_yy_base[ace_yy_current_state] != 438 ); - -ace_yy_find_action: - ace_yy_act = ace_yy_accept[ace_yy_current_state]; - if ( ace_yy_act == 0 ) - { /* have to back up */ - ace_yy_cp = ace_yy_last_accepting_cpos; - ace_yy_current_state = ace_yy_last_accepting_state; - ace_yy_act = ace_yy_accept[ace_yy_current_state]; - } - - ACE_YY_DO_BEFORE_ACTION; - - -do_action: /* This label is used only to access EOF actions. */ - - - switch ( ace_yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of ACE_YY_DO_BEFORE_ACTION */ - *ace_yy_cp = ace_yy_hold_char; - ace_yy_cp = ace_yy_last_accepting_cpos; - ace_yy_current_state = ace_yy_last_accepting_state; - goto ace_yy_find_action; - -case 1: -*ace_yy_cp = ace_yy_hold_char; /* undo effects of setting up ace_yytext */ -ace_yy_c_buf_p = ace_yy_cp -= 1; -ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */ -ACE_YY_RULE_SETUP -; /* EMPTY */ - ACE_YY_BREAK -case 2: -ACE_YY_RULE_SETUP -{ return token (ACE_DYNAMIC); } - // ACE_YY_BREAK -case 3: -ACE_YY_RULE_SETUP -{ return token (ACE_STATIC); } - // ACE_YY_BREAK -case 4: -ACE_YY_RULE_SETUP -{ return token (ACE_SUSPEND); } - // ACE_YY_BREAK -case 5: -ACE_YY_RULE_SETUP -{ return token (ACE_RESUME); } - // ACE_YY_BREAK -case 6: -ACE_YY_RULE_SETUP -{ return token (ACE_REMOVE); } - // ACE_YY_BREAK -case 7: -ACE_YY_RULE_SETUP -{ return token (ACE_USTREAM); } - // ACE_YY_BREAK -case 8: -ACE_YY_RULE_SETUP -{ return token (ACE_MODULE_T); } - // ACE_YY_BREAK -case 9: -ACE_YY_RULE_SETUP -{ return token (ACE_SVC_OBJ_T); } - // ACE_YY_BREAK -case 10: -ACE_YY_RULE_SETUP -{ return token (ACE_STREAM_T); } - // ACE_YY_BREAK -case 11: -ACE_YY_RULE_SETUP -{ return token (ACE_ACTIVE); } - // ACE_YY_BREAK -case 12: -ACE_YY_RULE_SETUP -{ return token (ACE_INACTIVE); } - // ACE_YY_BREAK -case 13: -ACE_YY_RULE_SETUP -{ return token (':'); } - // ACE_YY_BREAK -case 14: -ACE_YY_RULE_SETUP -{ return token ('*'); } - // ACE_YY_BREAK -case 15: -ACE_YY_RULE_SETUP -{ return token ('('); } - // ACE_YY_BREAK -case 16: -ACE_YY_RULE_SETUP -{ return token (')'); } - // ACE_YY_BREAK -case 17: -ACE_YY_RULE_SETUP -{ return token ('{'); } - // ACE_YY_BREAK -case 18: -ACE_YY_RULE_SETUP -{ return token ('}'); } - // ACE_YY_BREAK -case 19: -ACE_YY_RULE_SETUP -{ - // Remove tailaing quote character (' or ") - ACE_TCHAR *s = ACE_OS::strrchr (ace_yytext, ace_yytext[0]); - - ACE_ASSERT (s != 0); - // Eliminate the opening and closing double or - // single quotes. - *s = '\0'; - ace_yyleng -= 1; - ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext + 1, ace_yyleng); - return token (ACE_STRING); } -// ACE_YY_BREAK -case 20: -ACE_YY_RULE_SETUP -{ - ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng); - return token (ACE_IDENT); - } -// ACE_YY_BREAK -case 21: -ACE_YY_RULE_SETUP -{ - ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng); - return token (ACE_PATHNAME); - } -// ACE_YY_BREAK -case 22: -ACE_YY_RULE_SETUP -; /* EMPTY */ - ACE_YY_BREAK -case 23: -ACE_YY_RULE_SETUP -; /* EMPTY */ - ACE_YY_BREAK -case 24: -ACE_YY_RULE_SETUP -{ ACE_SVC_CONF_PARAM->yylineno++; } - ACE_YY_BREAK -case 25: -ACE_YY_RULE_SETUP -{ - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("unknown character = (%d"), - *ace_yytext)); - if (ACE_OS::ace_isprint (*ace_yytext)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *ace_yytext)); - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n"))); - } - ACE_YY_BREAK -case ACE_YY_STATE_EOF(INITIAL): -case ACE_YY_STATE_EOF(PARAMETERS): -case ACE_YY_STATE_EOF(NORMAL): -{ ace_yyterminate (); } - ACE_YY_BREAK -case 26: -ACE_YY_RULE_SETUP -ACE_SVC_CONF_ECHO; - ACE_YY_BREAK - - case ACE_YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB ACE_TCHAR. */ - int ace_yy_amount_of_matched_text = (int) (ace_yy_cp - ace_yytext_ptr) - 1; - - /* Undo the effects of ACE_YY_DO_BEFORE_ACTION. */ - *ace_yy_cp = ace_yy_hold_char; - ACE_YY_RESTORE_ACE_YY_MORE_OFFSET - - if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed ace_yyin at a new source and called - * ace_yylex(). If so, then we have to assure - * consistency between ace_yy_current_buffer and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars; - ace_yy_current_buffer->ace_yy_input_file = ace_yyin; - ace_yy_current_buffer->ace_yy_buffer_status = ACE_YY_BUFFER_NORMAL; - } - - /* Note that here we test for ace_yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since ace_yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( ace_yy_c_buf_p <= &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] ) - { /* This was really a NUL. */ - ace_yy_state_type ace_yy_next_state; - - ace_yy_c_buf_p = ace_yytext_ptr + ace_yy_amount_of_matched_text; - - ace_yy_current_state = ace_yy_get_previous_state(); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * ace_yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - ace_yy_next_state = ace_yy_try_NUL_trans( ace_yy_current_state ); - - ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ; - - if ( ace_yy_next_state ) - { - /* Consume the NUL. */ - ace_yy_cp = ++ace_yy_c_buf_p; - ace_yy_current_state = ace_yy_next_state; - goto ace_yy_match; - } - - else - { - ace_yy_cp = ace_yy_c_buf_p; - goto ace_yy_find_action; - } - } - - else switch ( ace_yy_get_next_buffer() ) - { - case EOB_ACT_END_OF_FILE: - { - ace_yy_did_buffer_switch_on_eof = 0; - - if ( ace_yywrap() ) - { - /* Note: because we've taken care in - * ace_yy_get_next_buffer() to have set up - * ace_yytext, we can now set up - * ace_yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * ACE_YY_NULL, it'll still work - another - * ACE_YY_NULL will get returned. - */ - ace_yy_c_buf_p = ace_yytext_ptr + ACE_YY_MORE_ADJ; - - ace_yy_act = ACE_YY_STATE_EOF(ACE_YY_START); - goto do_action; - } - - else - { - if ( ! ace_yy_did_buffer_switch_on_eof ) - ACE_YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - ace_yy_c_buf_p = - ace_yytext_ptr + ace_yy_amount_of_matched_text; - - ace_yy_current_state = ace_yy_get_previous_state(); - - ace_yy_cp = ace_yy_c_buf_p; - ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ; - goto ace_yy_match; - - case EOB_ACT_LAST_MATCH: - ace_yy_c_buf_p = - &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars]; - - ace_yy_current_state = ace_yy_get_previous_state(); - - ace_yy_cp = ace_yy_c_buf_p; - ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ; - goto ace_yy_find_action; - } - break; - } - - default: - ACE_YY_FATAL_ERROR( - ACE_LIB_TEXT("fatal flex scanner internal error--no action found") ); - } /* end of action switch */ - } /* end of scanning one token */ - } /* end of ace_yylex */ - - -/* ace_yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ - -static int ace_yy_get_next_buffer() - { - register ACE_TCHAR *dest = ace_yy_current_buffer->ace_yy_ch_buf; - register ACE_TCHAR *source = ace_yytext_ptr; - register int number_to_move, i; - int ret_val; - - if ( ace_yy_c_buf_p > &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] ) - ACE_YY_FATAL_ERROR( - ACE_LIB_TEXT("fatal flex scanner internal error--end of buffer missed") ); - - if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( ace_yy_c_buf_p - ace_yytext_ptr - ACE_YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) (ace_yy_c_buf_p - ace_yytext_ptr) - 1; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars = 0; - - else - { - int num_to_read = - ace_yy_current_buffer->ace_yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ -#ifdef ACE_YY_USES_REJECT - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT") ); -#else - - /* just a shorter name for the current buffer */ - ACE_YY_BUFFER_STATE b = ace_yy_current_buffer; - - int ace_yy_c_buf_p_offset = - (int) (ace_yy_c_buf_p - b->ace_yy_ch_buf); - - if ( b->ace_yy_is_our_buffer ) - { - int new_size = b->ace_yy_buf_size * 2; - - if ( new_size <= 0 ) - b->ace_yy_buf_size += b->ace_yy_buf_size / 8; - else - b->ace_yy_buf_size *= 2; - - b->ace_yy_ch_buf = (ACE_TCHAR *) - /* Include room in for 2 EOB chars. */ - ace_yy_flex_realloc( (void *) b->ace_yy_ch_buf, - (b->ace_yy_buf_size + 2)*sizeof(ACE_TCHAR)); - } - else - /* Can't grow it, we don't own it. */ - b->ace_yy_ch_buf = 0; - - if ( ! b->ace_yy_ch_buf ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( - "fatal error - scanner input buffer overflow") ); - - ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset]; - - num_to_read = ace_yy_current_buffer->ace_yy_buf_size - - number_to_move - 1; -#endif - } - - if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE ) - num_to_read = ACE_YY_READ_BUF_SIZE/sizeof (ACE_TCHAR); - - /* Read in more data. */ - ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]), - ace_yy_n_chars, num_to_read ); - - ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars; - } - - if ( ace_yy_n_chars == 0 ) - { - if ( number_to_move == ACE_YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - ace_yyrestart( ace_yyin ); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - ace_yy_current_buffer->ace_yy_buffer_status = - ACE_YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - ace_yy_n_chars += number_to_move; - ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] = ACE_YY_END_OF_BUFFER_CHAR; - ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] = ACE_YY_END_OF_BUFFER_CHAR; - - ace_yytext_ptr = &ace_yy_current_buffer->ace_yy_ch_buf[0]; - - return ret_val; - } - - -/* ace_yy_get_previous_state - get the state just before the EOB ACE_TCHAR was reached */ - -static ace_yy_state_type ace_yy_get_previous_state() - { - register ace_yy_state_type ace_yy_current_state; - register ACE_TCHAR *ace_yy_cp; - - ace_yy_current_state = ace_yy_start; - ace_yy_current_state += ACE_YY_AT_BOL(); - - for ( ace_yy_cp = ace_yytext_ptr + ACE_YY_MORE_ADJ; ace_yy_cp < ace_yy_c_buf_p; ++ace_yy_cp ) - { - register ACE_YY_CHAR ace_yy_c = (*ace_yy_cp ? ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)] : 1); - if ( ace_yy_accept[ace_yy_current_state] ) - { - ace_yy_last_accepting_state = ace_yy_current_state; - ace_yy_last_accepting_cpos = ace_yy_cp; - } - while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state ) - { - ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state]; - if ( ace_yy_current_state >= 108 ) - ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c]; - } - ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c]; - } - - return ace_yy_current_state; - } - - -/* ace_yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = ace_yy_try_NUL_trans( current_state ); - */ - -#ifdef ACE_YY_USE_PROTOS -static ace_yy_state_type ace_yy_try_NUL_trans( ace_yy_state_type ace_yy_current_state ) -#else -static ace_yy_state_type ace_yy_try_NUL_trans( ace_yy_current_state ) -ace_yy_state_type ace_yy_current_state; -#endif - { - register int ace_yy_is_jam; - register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p; - - register ACE_YY_CHAR ace_yy_c = 1; - if ( ace_yy_accept[ace_yy_current_state] ) - { - ace_yy_last_accepting_state = ace_yy_current_state; - ace_yy_last_accepting_cpos = ace_yy_cp; - } - while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state ) - { - ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state]; - if ( ace_yy_current_state >= 108 ) - ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c]; - } - ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c]; - ace_yy_is_jam = (ace_yy_current_state == 107); - - return ace_yy_is_jam ? 0 : ace_yy_current_state; - } - - -#ifndef ACE_YY_NO_UNPUT -#ifdef ACE_YY_USE_PROTOS -static void ace_yyunput( int c, register ACE_TCHAR *ace_yy_bp ) -#else -static void ace_yyunput( c, ace_yy_bp ) -int c; -register ACE_TCHAR *ace_yy_bp; -#endif - { - register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p; - - /* undo effects of setting up ace_yytext */ - *ace_yy_cp = ace_yy_hold_char; - - if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 ) - { /* need to shift things up to make room */ - /* +2 for EOB chars. */ - register int number_to_move = ace_yy_n_chars + 2; - register ACE_TCHAR *dest = &ace_yy_current_buffer->ace_yy_ch_buf[ - ace_yy_current_buffer->ace_yy_buf_size + 2]; - register ACE_TCHAR *source = - &ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]; - - while ( source > ace_yy_current_buffer->ace_yy_ch_buf ) - *--dest = *--source; - - ace_yy_cp += (int) (dest - source); - ace_yy_bp += (int) (dest - source); - ace_yy_current_buffer->ace_yy_n_chars = - ace_yy_n_chars = ace_yy_current_buffer->ace_yy_buf_size; - - if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "flex scanner push-back overflow") ); - } - - *--ace_yy_cp = (ACE_TCHAR) c; - - - ace_yytext_ptr = ace_yy_bp; - ace_yy_hold_char = *ace_yy_cp; - ace_yy_c_buf_p = ace_yy_cp; - } -#endif /* ifndef ACE_YY_NO_UNPUT */ - - -#ifdef __cplusplus -static int ace_yyinput() -#else -static int input() -#endif - { - int c; - - *ace_yy_c_buf_p = ace_yy_hold_char; - - if ( *ace_yy_c_buf_p == ACE_YY_END_OF_BUFFER_CHAR ) - { - /* ace_yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( ace_yy_c_buf_p < &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] ) - /* This was really a NUL. */ - *ace_yy_c_buf_p = '\0'; - - else - { /* need more input */ - int offset = ace_yy_c_buf_p - ace_yytext_ptr; - ++ace_yy_c_buf_p; - - switch ( ace_yy_get_next_buffer() ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because ace_yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - ace_yyrestart( ace_yyin ); - - /* fall through */ - - case EOB_ACT_END_OF_FILE: - { - if ( ace_yywrap() ) - return EOF; - - if ( ! ace_yy_did_buffer_switch_on_eof ) - ACE_YY_NEW_FILE; -#ifdef __cplusplus - return ace_yyinput(); -#else - return input(); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - ace_yy_c_buf_p = ace_yytext_ptr + offset; - break; - } - } - } - - c = *(unsigned char *) ace_yy_c_buf_p; /* cast for 8-bit char's */ - *ace_yy_c_buf_p = '\0'; /* preserve ace_yytext */ - ace_yy_hold_char = *++ace_yy_c_buf_p; - - ace_yy_current_buffer->ace_yy_at_bol = (c == '\n'); - - return c; - } - - -#ifdef ACE_YY_USE_PROTOS -void ace_yyrestart( FILE *input_file ) -#else -void ace_yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! ace_yy_current_buffer ) - ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); - - ace_yy_init_buffer( ace_yy_current_buffer, input_file ); - ace_yy_load_buffer_state(); - } - - -#ifdef ACE_YY_USE_PROTOS -void ace_yy_switch_to_buffer( ACE_YY_BUFFER_STATE new_buffer ) -#else -void ace_yy_switch_to_buffer( new_buffer ) -ACE_YY_BUFFER_STATE new_buffer; -#endif - { - if ( ace_yy_current_buffer == new_buffer ) - return; - - if ( ace_yy_current_buffer ) - { - /* Flush out information for old buffer. */ - *ace_yy_c_buf_p = ace_yy_hold_char; - ace_yy_current_buffer->ace_yy_buf_pos = ace_yy_c_buf_p; - ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars; - } - - ace_yy_current_buffer = new_buffer; - ace_yy_load_buffer_state(); - - /* We don't actually know whether we did this switch during - * EOF (ace_yywrap()) processing, but the only time this flag - * is looked at is after ace_yywrap() is called, so it's safe - * to go ahead and always set it. - */ - ace_yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef ACE_YY_USE_PROTOS -void ace_yy_load_buffer_state( void ) -#else -void ace_yy_load_buffer_state() -#endif - { - ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars; - ace_yytext_ptr = ace_yy_c_buf_p = ace_yy_current_buffer->ace_yy_buf_pos; - ace_yyin = ace_yy_current_buffer->ace_yy_input_file; - ace_yy_hold_char = *ace_yy_c_buf_p; - } - - -#ifdef ACE_YY_USE_PROTOS -ACE_YY_BUFFER_STATE ace_yy_create_buffer( FILE *file, int size ) -#else -ACE_YY_BUFFER_STATE ace_yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { - ACE_YY_BUFFER_STATE b; - - b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) ); - if ( ! b ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") ); - - b->ace_yy_buf_size = size; - - /* ace_yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2 ) * sizeof (ACE_TCHAR)); - if ( ! b->ace_yy_ch_buf ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") ); - - b->ace_yy_is_our_buffer = 1; - - ace_yy_init_buffer( b, file ); - - return b; - } - - -#ifdef ACE_YY_USE_PROTOS -void ace_yy_delete_buffer( ACE_YY_BUFFER_STATE b ) -#else -void ace_yy_delete_buffer( b ) -ACE_YY_BUFFER_STATE b; -#endif - { - if ( ! b ) - return; - - if ( b == ace_yy_current_buffer ) - ace_yy_current_buffer = (ACE_YY_BUFFER_STATE) 0; - - if ( b->ace_yy_is_our_buffer ) - ace_yy_flex_free( (void *) b->ace_yy_ch_buf ); - - ace_yy_flex_free( (void *) b ); - } - -#ifndef ACE_YY_ALWAYS_INTERACTIVE -#ifndef ACE_YY_NEVER_INTERACTIVE -extern int nop_isatty ACE_YY_PROTO(( int )); -#endif -#endif - -#ifndef ACE_YY_ALWAYS_INTERACTIVE -#ifndef ACE_YY_NEVER_INTERACTIVE -extern int nop_isatty ACE_YY_PROTO(( int )); -#endif -#endif - -#ifdef ACE_YY_USE_PROTOS -void ace_yy_init_buffer( ACE_YY_BUFFER_STATE b, FILE *file ) -#else -void ace_yy_init_buffer( b, file ) -ACE_YY_BUFFER_STATE b; -FILE *file; -#endif - - - { - ace_yy_flush_buffer( b ); - - b->ace_yy_input_file = file; - b->ace_yy_fill_buffer = 1; - -#if ACE_YY_ALWAYS_INTERACTIVE - b->ace_yy_is_interactive = 1; -#else -#if ACE_YY_NEVER_INTERACTIVE - b->ace_yy_is_interactive = 0; -#else - b->ace_yy_is_interactive = file ? (ACE_OS::isatty( fileno (file) ) > 0) : 0; -#endif -#endif - } - - -#ifdef ACE_YY_USE_PROTOS -void ace_yy_flush_buffer( ACE_YY_BUFFER_STATE b ) -#else -void ace_yy_flush_buffer( b ) -ACE_YY_BUFFER_STATE b; -#endif - - { - if ( ! b ) - return; - - b->ace_yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->ace_yy_ch_buf[0] = ACE_YY_END_OF_BUFFER_CHAR; - b->ace_yy_ch_buf[1] = ACE_YY_END_OF_BUFFER_CHAR; - - b->ace_yy_buf_pos = &b->ace_yy_ch_buf[0]; - - b->ace_yy_at_bol = 1; - b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW; - - if ( b == ace_yy_current_buffer ) - ace_yy_load_buffer_state(); - } - - -#ifndef ACE_YY_NO_SCAN_BUFFER -#ifdef ACE_YY_USE_PROTOS -ACE_YY_BUFFER_STATE ace_yy_scan_buffer( ACE_TCHAR *base, ace_yy_size_t size ) -#else -ACE_YY_BUFFER_STATE ace_yy_scan_buffer( base, size ) -ACE_TCHAR *base; -ace_yy_size_t size; -#endif - { - ACE_YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != ACE_YY_END_OF_BUFFER_CHAR || - base[size-1] != ACE_YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) ); - if ( ! b ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_buffer()" )); - - b->ace_yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->ace_yy_buf_pos = b->ace_yy_ch_buf = base; - b->ace_yy_is_our_buffer = 0; - b->ace_yy_input_file = 0; - b->ace_yy_n_chars = b->ace_yy_buf_size; - b->ace_yy_is_interactive = 0; - b->ace_yy_at_bol = 1; - b->ace_yy_fill_buffer = 0; - b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW; - - ace_yy_switch_to_buffer( b ); - - return b; - } -#endif - - -#ifndef ACE_YY_NO_SCAN_STRING -#ifdef ACE_YY_USE_PROTOS -ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yyconst ACE_TCHAR *ace_yy_str ) -#else -ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yy_str ) -ace_yyconst ACE_TCHAR *ace_yy_str; -#endif - { - int len; - for ( len = 0; ace_yy_str[len]; ++len ) - ; - - return ace_yy_scan_bytes( ace_yy_str, len ); - } -#endif - - -#ifndef ACE_YY_NO_SCAN_BYTES -#ifdef ACE_YY_USE_PROTOS -ACE_YY_BUFFER_STATE ace_yy_scan_bytes( ace_yyconst ACE_TCHAR *bytes, int len ) -#else -ACE_YY_BUFFER_STATE ace_yy_scan_bytes( bytes, len ) -ace_yyconst ACE_TCHAR *bytes; -int len; -#endif - { - ACE_YY_BUFFER_STATE b; - ACE_TCHAR *buf; - ace_yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; - buf = (ACE_TCHAR *) ace_yy_flex_alloc( n * sizeof (ACE_TCHAR)); - if ( ! buf ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_bytes()" )); - - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; - - buf[len] = buf[len+1] = ACE_YY_END_OF_BUFFER_CHAR; - - b = ace_yy_scan_buffer( buf, n ); - if ( ! b ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "bad buffer in ace_yy_scan_bytes()") ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->ace_yy_is_our_buffer = 1; - - return b; - } -#endif - - -#ifndef ACE_YY_NO_PUSH_STATE -#ifdef ACE_YY_USE_PROTOS -static void ace_yy_push_state( int new_state ) -#else -static void ace_yy_push_state( new_state ) -int new_state; -#endif - { - if ( ace_yy_start_stack_ptr >= ace_yy_start_stack_depth ) - { - ace_yy_size_t new_size; - - ace_yy_start_stack_depth += ACE_YY_START_STACK_INCR; - new_size = ace_yy_start_stack_depth * sizeof( int ); - - if ( ! ace_yy_start_stack ) - ace_yy_start_stack = (int *) ace_yy_flex_alloc( new_size ); - - else - ace_yy_start_stack = (int *) ace_yy_flex_realloc( - (void *) ace_yy_start_stack, new_size ); - - if ( ! ace_yy_start_stack ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( - "out of memory expanding start-condition stack" )); - } - - ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START; - - BEGIN(new_state); - } -#endif - - -#ifndef ACE_YY_NO_POP_STATE -static void ace_yy_pop_state() - { - if ( --ace_yy_start_stack_ptr < 0 ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "start-condition stack underflow" )); - - BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]); - } -#endif - - -#ifndef ACE_YY_NO_TOP_STATE -static int ace_yy_top_state() - { - return ace_yy_start_stack[ace_yy_start_stack_ptr - 1]; - } -#endif - -#ifndef ACE_YY_EXIT_FAILURE -#define ACE_YY_EXIT_FAILURE 2 -#endif - -#ifdef ACE_YY_USE_PROTOS -static void ace_yy_fatal_error( ace_yyconst ACE_TCHAR msg[] ) -#else -static void ace_yy_fatal_error( msg ) -ACE_TCHAR msg[]; -#endif - { - (void) ACE_OS::fprintf( stderr, ACE_LIB_TEXT("%s\n"), msg ); - exit( ACE_YY_EXIT_FAILURE ); - } - - - -/* Redefine ace_yyless() so it works in section 3 code. */ - -#undef ace_yyless -#define ace_yyless(n) \ - do \ - { \ - /* Undo effects of setting up ace_yytext. */ \ - ace_yytext[ace_yyleng] = ace_yy_hold_char; \ - ace_yy_c_buf_p = ace_yytext + n; \ - ace_yy_hold_char = *ace_yy_c_buf_p; \ - *ace_yy_c_buf_p = '\0'; \ - ace_yyleng = n; \ - } \ - while ( 0 ) - - -/* Internal utility routines. */ - -#ifndef ace_yytext_ptr -#ifdef ACE_YY_USE_PROTOS -static void ace_yy_flex_strncpy( ACE_TCHAR *s1, ace_yyconst ACE_TCHAR *s2, int n ) -#else -static void ace_yy_flex_strncpy( s1, s2, n ) -ACE_TCHAR *s1; -ace_yyconst ACE_TCHAR *s2; -int n; -#endif - { - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; - } -#endif - -#ifdef ACE_YY_NEED_STRLEN -#ifdef ACE_YY_USE_PROTOS -static int ace_yy_flex_strlen( ace_yyconst ACE_TCHAR *s ) -#else -static int ace_yy_flex_strlen( s ) -ace_yyconst ACE_TCHAR *s; -#endif - { - register int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; - } -#endif - - -#ifdef ACE_YY_USE_PROTOS -static void *ace_yy_flex_alloc( ace_yy_size_t size ) -#else -static void *ace_yy_flex_alloc( size ) -ace_yy_size_t size; -#endif - { - return (void *) malloc( size ); - } - -#ifdef ACE_YY_USE_PROTOS -static void *ace_yy_flex_realloc( void *ptr, ace_yy_size_t size ) -#else -static void *ace_yy_flex_realloc( ptr, size ) -void *ptr; -ace_yy_size_t size; -#endif - { - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); - } - -#ifdef ACE_YY_USE_PROTOS -static void ace_yy_flex_free( void *ptr ) -#else -static void ace_yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ACE_MALLOC_T (ptr) ); - } - -#if ACE_YY_MAIN -int main() - { - ace_yylex(); - return 0; - } -#endif - -int -ace_yywrap (void) -{ - ACE_OS::fflush (ace_yyin); - ace_yytext[0] = '#'; - ace_yyleng = 0; - - return 1; -} - -void -ace_yy_push_buffer (FILE *file, ace_yy_buffer_state *&buffer) -{ - // External synchronization is required. - - if (buffer == 0) - buffer = ace_yy_create_buffer (file, ACE_YY_BUF_SIZE); - - ace_yy_switch_to_buffer (buffer); -} - -void -ace_yy_push_buffer (const ACE_TCHAR *directive, ace_yy_buffer_state *&buffer) -{ - // External synchronization is required. - - // ace_yyparse() may invoke ace_yylex() multiple times when parsing - // a single directive. Prevent a new buffer from created during - // each call to ace_yylex(). - if (ACE_YY_CURRENT_BUFFER != 0 - && directive == ACE_YY_CURRENT_BUFFER->ace_yy_ch_buf) - return; - - if (buffer == 0) - { - // ace_yy_scan_string() already switches the buffer so there is - // no need to explicitly make the switch. - buffer = ace_yy_scan_string (directive); - } - else - ace_yy_switch_to_buffer (buffer); -} - -void -ace_yy_pop_buffer (ace_yy_buffer_state *buffer) -{ - // External synchronization is required. - - ace_yy_switch_to_buffer (buffer); -} - -#endif /* ACE_USES_CLASSIC_SVC_CONF = 1 */ diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp deleted file mode 100644 index c89c43fb9d9..00000000000 --- a/ace/Svc_Conf_y.cpp +++ /dev/null @@ -1,1567 +0,0 @@ -/* A Bison parser, made from Svc_Conf.y - by GNU bison 1.35. */ - -#define ACE_YYBISON 1 /* Identify Bison output. */ - -# define ACE_DYNAMIC 257 -# define ACE_STATIC 258 -# define ACE_SUSPEND 259 -# define ACE_RESUME 260 -# define ACE_REMOVE 261 -# define ACE_USTREAM 262 -# define ACE_MODULE_T 263 -# define ACE_STREAM_T 264 -# define ACE_SVC_OBJ_T 265 -# define ACE_ACTIVE 266 -# define ACE_INACTIVE 267 -# define ACE_PATHNAME 268 -# define ACE_IDENT 269 -# define ACE_STRING 270 - - -// $Id$ - -#include "ace/Svc_Conf.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 1) - -#include "ace/ARGV.h" -#include "ace/Module.h" -#include "ace/Stream.h" -#include "ace/Service_Types.h" - - -ACE_RCSID (ace, - Svc_Conf_y, - "$Id$") - - -// Prototypes. -static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, - ACE_Static_Node *svc_type, - int & ace_yyerrno); -static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec, - const ACE_TCHAR *svc_name, - int & ace_yyerrno); - -#define ACE_YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = '\0', ace_yytext) - -// Force the pretty debugging code to compile. -// #define ACE_YYDEBUG 1 - -#ifndef ACE_YYDEBUG -# define ACE_YYDEBUG 0 -#endif - - - -#define ACE_YYFINAL 66 -#define ACE_YYFLAG -32768 -#define ACE_YYNTBASE 23 - -/* ACE_YYTRANSLATE(ACE_YYLEX) -- Bison token number corresponding to ACE_YYLEX. */ -#define ACE_YYTRANSLATE(x) ((unsigned)(x) <= 270 ? ace_yytranslate[x] : 43) - -/* ACE_YYTRANSLATE[ACE_YYLEX] -- Bison token number corresponding to ACE_YYLEX. */ -static const ACE_TCHAR ace_yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 20, 21, 22, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 19, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 17, 2, 18, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16 -}; - -#if ACE_YYDEBUG -static const short ace_yyprhs[] = -{ - 0, 0, 3, 6, 7, 9, 11, 13, 15, 17, - 19, 23, 27, 30, 33, 36, 40, 41, 46, 48, - 50, 51, 56, 57, 60, 61, 63, 65, 67, 69, - 71, 76, 78, 80, 81, 85, 91, 96, 99, 102, - 105, 107, 108, 110, 112 -}; -static const short ace_yyrhs[] = -{ - 23, 24, 0, 23, 1, 0, 0, 25, 0, 26, - 0, 27, 0, 28, 0, 29, 0, 30, 0, 3, - 37, 41, 0, 4, 15, 41, 0, 5, 15, 0, - 6, 15, 0, 7, 15, 0, 8, 32, 33, 0, - 0, 8, 15, 31, 33, 0, 25, 0, 26, 0, - 0, 17, 34, 35, 18, 0, 0, 35, 36, 0, - 0, 25, 0, 26, 0, 27, 0, 28, 0, 29, - 0, 15, 40, 39, 38, 0, 12, 0, 13, 0, - 0, 42, 19, 15, 0, 42, 19, 15, 20, 21, - 0, 19, 15, 20, 21, 0, 9, 22, 0, 11, - 22, 0, 10, 22, 0, 16, 0, 0, 14, 0, - 15, 0, 16, 0 -}; - -#endif - -#if ACE_YYDEBUG -/* ACE_YYRLINE[ACE_YYN] -- source line where rule number ACE_YYN was defined. */ -static const short ace_yyrline[] = -{ - 0, 51, 59, 63, 67, 68, 69, 70, 71, 72, - 76, 86, 93, 100, 107, 114, 118, 118, 125, 128, - 134, 134, 143, 147, 155, 159, 186, 199, 207, 215, - 239, 276, 280, 284, 291, 295, 299, 306, 310, 314, - 321, 322, 326, 327, 328 -}; -#endif - - -#if (ACE_YYDEBUG) || defined ACE_YYERROR_VERBOSE - -/* ACE_YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ -static const ACE_TCHAR *const ace_yytname[] = -{ - ACE_LIB_TEXT ("$"), - ACE_LIB_TEXT ("error"), - ACE_LIB_TEXT ("$undefined."), - ACE_LIB_TEXT ("ACE_DYNAMIC"), - ACE_LIB_TEXT ("ACE_STATIC"), - ACE_LIB_TEXT ("ACE_SUSPEND"), - ACE_LIB_TEXT ("ACE_RESUME"), - ACE_LIB_TEXT ("ACE_REMOVE"), - ACE_LIB_TEXT ("ACE_USTREAM"), - ACE_LIB_TEXT ("ACE_MODULE_T",) - ACE_LIB_TEXT ("ACE_STREAM_T"), - ACE_LIB_TEXT ("ACE_SVC_OBJ_T"), - ACE_LIB_TEXT ("ACE_ACTIVE"), - ACE_LIB_TEXT ("ACE_INACTIVE",) - ACE_LIB_TEXT ("ACE_PATHNAME"), - ACE_LIB_TEXT ("ACE_IDENT"), - ACE_LIB_TEXT ("ACE_STRING"), - ACE_LIB_TEXT ("'{'"), - ACE_LIB_TEXT ("'}'"), - ACE_LIB_TEXT ("':'"), - ACE_LIB_TEXT ("'('"), - ACE_LIB_TEXT ("')'"), - ACE_LIB_TEXT ("'*'"), - ACE_LIB_TEXT ("svc_config_entries"), - ACE_LIB_TEXT ("svc_config_entry"), - ACE_LIB_TEXT ("dynamic",) - ACE_LIB_TEXT ("static"), - ACE_LIB_TEXT ("suspend"), - ACE_LIB_TEXT ("resume"), - ACE_LIB_TEXT ("remove"), - ACE_LIB_TEXT ("stream"), - ACE_LIB_TEXT ("@1"), - ACE_LIB_TEXT ("stream_ops",) - ACE_LIB_TEXT ("stream_modules"), - ACE_LIB_TEXT ("@2"), - ACE_LIB_TEXT ("module_list"), - ACE_LIB_TEXT ("module"), - ACE_LIB_TEXT ("svc_location",) - ACE_LIB_TEXT ("status"), - ACE_LIB_TEXT ("svc_initializer"), - ACE_LIB_TEXT ("type"), - ACE_LIB_TEXT ("parameters_opt"), - ACE_LIB_TEXT ("pathname"), - 0 -}; -#endif - -/* ACE_YYR1[ACE_YYN] -- Symbol number of symbol that rule ACE_YYN derives. */ -static const short ace_yyr1[] = -{ - 0, 23, 23, 23, 24, 24, 24, 24, 24, 24, - 25, 26, 27, 28, 29, 30, 31, 30, 32, 32, - 34, 33, 33, 35, 35, 36, 36, 36, 36, 36, - 37, 38, 38, 38, 39, 39, 39, 40, 40, 40, - 41, 41, 42, 42, 42 -}; - -/* ACE_YYR2[ACE_YYN] -- Number of symbols composing right hand side of rule ACE_YYN. */ -static const short ace_yyr2[] = -{ - 0, 2, 2, 0, 1, 1, 1, 1, 1, 1, - 3, 3, 2, 2, 2, 3, 0, 4, 1, 1, - 0, 4, 0, 2, 0, 1, 1, 1, 1, 1, - 4, 1, 1, 0, 3, 5, 4, 2, 2, 2, - 1, 0, 1, 1, 1 -}; - -/* ACE_YYDEFACT[S] -- default rule to reduce with in state S when ACE_YYTABLE - doesn't specify something else to do. Zero means the default is an - error. */ -static const short ace_yydefact[] = -{ - 3, 0, 2, 0, 0, 0, 0, 0, 0, 1, - 4, 5, 6, 7, 8, 9, 0, 41, 41, 12, - 13, 14, 16, 18, 19, 22, 0, 0, 0, 0, - 40, 10, 11, 22, 20, 15, 37, 39, 38, 42, - 43, 44, 0, 33, 0, 17, 24, 0, 31, 32, - 30, 0, 0, 0, 34, 21, 25, 26, 27, 28, - 29, 23, 36, 0, 35, 0, 0 -}; - -static const short ace_yydefgoto[] = -{ - 1, 9, 10, 11, 12, 13, 14, 15, 33, 25, - 35, 46, 52, 61, 17, 50, 43, 29, 31, 44 -}; - -static const short ace_yypact[] = -{ - -32768, 20,-32768, 1, 3, 7, 14, 18, 4,-32768, - -32768,-32768,-32768,-32768,-32768,-32768, 21, 19, 19,-32768, - -32768,-32768,-32768,-32768,-32768, -2, 12, 15, 16, -5, - -32768,-32768,-32768, -2,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768, 24, 0, 17,-32768,-32768, 22,-32768,-32768, - -32768, 25, -1, 26, 23,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768, 27,-32768, 41,-32768 -}; - -static const short ace_yypgoto[] = -{ - -32768,-32768, -8, -7, -6, -3, 2,-32768,-32768,-32768, - 28,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 32,-32768 -}; - - -#define ACE_YYLAST 61 - - -static const short ace_yytable[] = -{ - 23, 24, 3, 4, 5, 6, 7, 3, 4, 39, - 40, 41, 48, 49, 42, 34, 16, 55, 18, 22, - 65, 2, 19, 3, 4, 5, 6, 7, 8, 20, - 26, 27, 28, 21, 36, 30, 51, 37, 38, 47, - 54, 66, 53, 63, 56, 57, 58, 62, 64, 59, - 32, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 45 -}; - -static const short ace_yycheck[] = -{ - 8, 8, 3, 4, 5, 6, 7, 3, 4, 14, - 15, 16, 12, 13, 19, 17, 15, 18, 15, 15, - 0, 1, 15, 3, 4, 5, 6, 7, 8, 15, - 9, 10, 11, 15, 22, 16, 19, 22, 22, 15, - 15, 0, 20, 20, 52, 52, 52, 21, 21, 52, - 18, -1, -1, -1, 52, -1, -1, -1, -1, -1, - -1, 33 -}; -#define ACE_YYPURE 1 - -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ - -/* Skeleton output parser for bison, - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software - Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* This is the parser code that is written into each bison parser when - the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -/* All symbols defined below should begin with ace_yy or ACE_YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -#if ! defined (ace_yyoverflow) || defined (ACE_YYERROR_VERBOSE) - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# if ACE_YYSTACK_USE_ALLOCA -# define ACE_YYSTACK_ALLOC alloca -# else -# ifndef ACE_YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define ACE_YYSTACK_ALLOC alloca -# else -# ifdef __GNUC__ -# define ACE_YYSTACK_ALLOC __builtin_alloca -# endif -# endif -# endif -# endif - -# ifdef ACE_YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define ACE_YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define ACE_YYSIZE_T size_t -# endif -# define ACE_YYSTACK_ALLOC malloc -# define ACE_YYSTACK_FREE free -# endif -#endif /* ! defined (ace_yyoverflow) || defined (ACE_YYERROR_VERBOSE) */ - - -#if (! defined (ace_yyoverflow) \ - && (! defined (__cplusplus) \ - || (ACE_YYLTYPE_IS_TRIVIAL && ACE_YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union ace_yyalloc -{ - short ace_yyss; - ACE_YYSTYPE ace_yyvs; -# if ACE_YYLSP_NEEDED - ACE_YYLTYPE ace_yyls; -# endif -}; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define ACE_YYSTACK_GAP_MAX (sizeof (union ace_yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# if ACE_YYLSP_NEEDED -# define ACE_YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (ACE_YYSTYPE) + sizeof (ACE_YYLTYPE)) \ - + 2 * ACE_YYSTACK_GAP_MAX) -# else -# define ACE_YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (ACE_YYSTYPE)) \ - + ACE_YYSTACK_GAP_MAX) -# endif - -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef ACE_YYCOPY -# if 1 < __GNUC__ -# define ACE_YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define ACE_YYCOPY(To, From, Count) \ - do \ - { \ - register ACE_YYSIZE_T ace_yyi; \ - for (ace_yyi = 0; ace_yyi < (Count); ace_yyi++) \ - (To)[ace_yyi] = (From)[ace_yyi]; \ - } \ - while (0) -# endif -# endif - -/* Relocate STACK from its old location to the new one. The - local variables ACE_YYSIZE and ACE_YYSTACKSIZE give the old and new number of - elements in the stack, and ACE_YYPTR gives the new location of the - stack. Advance ACE_YYPTR to a properly aligned location for the next - stack. */ -# define ACE_YYSTACK_RELOCATE(Stack) \ - do \ - { \ - ACE_YYSIZE_T ace_yynewbytes; \ - ACE_YYCOPY (&ace_yyptr->Stack, Stack, ace_yysize); \ - Stack = &ace_yyptr->Stack; \ - ace_yynewbytes = ace_yystacksize * sizeof (*Stack) + ACE_YYSTACK_GAP_MAX; \ - ace_yyptr += ace_yynewbytes / sizeof (*ace_yyptr); \ - } \ - while (0) - -#endif - - -#if ! defined (ACE_YYSIZE_T) && defined (__SIZE_TYPE__) -# define ACE_YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (ACE_YYSIZE_T) && defined (size_t) -# define ACE_YYSIZE_T size_t -#endif -#if ! defined (ACE_YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define ACE_YYSIZE_T size_t -# endif -#endif -#if ! defined (ACE_YYSIZE_T) -# define ACE_YYSIZE_T unsigned int -#endif - -#define ace_yyerrok (ace_yyerrstatus = 0) -#define ace_yyclearin (ace_yychar = ACE_YYEMPTY) -#define ACE_YYEMPTY -2 -#define ACE_YYEOF 0 -#define ACE_YYACCEPT goto ace_yyacceptlab -#define ACE_YYABORT goto ace_yyabortlab -#define ACE_YYERROR goto ace_yyerrlab1 -/* Like ACE_YYERROR except do call ace_yyerror. This remains here temporarily - to ease the transition to the new meaning of ACE_YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ -#define ACE_YYFAIL goto ace_yyerrlab -#define ACE_YYRECOVERING() (!!ace_yyerrstatus) -#define ACE_YYBACKUP(Token, Value) \ -do \ - if (ace_yychar == ACE_YYEMPTY && ace_yylen == 1) \ - { \ - ace_yychar = (Token); \ - ace_yylval = (Value); \ - ace_yychar1 = ACE_YYTRANSLATE (ace_yychar); \ - ACE_YYPOPSTACK; \ - goto ace_yybackup; \ - } \ - else \ - { \ - ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ACE_LIB_TEXT ("syntax error: cannot back up")); \ - ACE_YYERROR; \ - } \ -while (0) - -#define ACE_YYTERROR 1 -#define ACE_YYERRCODE 256 - - -/* ACE_YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). - - When ACE_YYLLOC_DEFAULT is run, CURRENT is set the location of the - first token. By default, to implement support for ranges, extend - its range to the last symbol. */ - -#ifndef ACE_YYLLOC_DEFAULT -# define ACE_YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.last_line = Rhs[N].last_line; \ - Current.last_column = Rhs[N].last_column; -#endif - - -/* ACE_YYLEX -- calling `ace_yylex' with the right arguments. */ - -#if ACE_YYPURE -# if ACE_YYLSP_NEEDED -# ifdef ACE_YYLEX_PARAM -# define ACE_YYLEX ace_yylex (&ace_yylval, &ace_yylloc, ACE_YYLEX_PARAM) -# else -# define ACE_YYLEX ace_yylex (&ace_yylval, &ace_yylloc) -# endif -# else /* !ACE_YYLSP_NEEDED */ -# ifdef ACE_YYLEX_PARAM -# define ACE_YYLEX ace_yylex (&ace_yylval, ACE_YYLEX_PARAM) -# else -# define ACE_YYLEX ace_yylex (&ace_yylval) -# endif -# endif /* !ACE_YYLSP_NEEDED */ -#else /* !ACE_YYPURE */ -# define ACE_YYLEX ace_yylex () -#endif /* !ACE_YYPURE */ - - -/* Enable debugging if requested. */ -#if ACE_YYDEBUG - -# ifndef ACE_YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define ACE_YYFPRINTF ACE_OS::fprintf -# endif - -# define ACE_YYDPRINTF(Args) \ -do { \ - if (ace_yydebug) \ - ACE_YYFPRINTF Args; \ -} while (0) -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int ace_yydebug; -#else /* !ACE_YYDEBUG */ -# define ACE_YYDPRINTF(Args) -#endif /* !ACE_YYDEBUG */ - -/* ACE_YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef ACE_YYINITDEPTH -# define ACE_YYINITDEPTH 200 -#endif - -/* ACE_YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - SIZE_MAX < ACE_YYSTACK_BYTES (ACE_YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ - -#if ACE_YYMAXDEPTH == 0 -# undef ACE_YYMAXDEPTH -#endif - -#ifndef ACE_YYMAXDEPTH -# define ACE_YYMAXDEPTH 10000 -#endif - -#ifdef ACE_YYERROR_VERBOSE - -# ifndef ace_yystrlen -# if defined (__GLIBC__) && defined (_STRING_H) -# define ace_yystrlen strlen -# else -/* Return the length of ACE_YYSTR. */ -static ACE_YYSIZE_T -# if defined (__STDC__) || defined (__cplusplus) -ace_yystrlen (const ACE_TCHAR *ace_yystr) -# else -ace_yystrlen (ace_yystr) - const ACE_TCHAR *ace_yystr; -# endif -{ - register const ACE_TCHAR *ace_yys = ace_yystr; - - while (*ace_yys++ != '\0') - continue; - - return ace_yys - ace_yystr - 1; -} -# endif -# endif - -# ifndef ace_yystpcpy -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) -# define ace_yystpcpy stpcpy -# else -/* Copy ACE_YYSRC to ACE_YYDEST, returning the address of the terminating '\0' in - ACE_YYDEST. */ -static char * -# if defined (__STDC__) || defined (__cplusplus) -ace_yystpcpy (ACE_TCHAR *ace_yydest, const ACE_TCHAR *ace_yysrc) -# else -ace_yystpcpy (ace_yydest, ace_yysrc) - ACE_TCHAR *ace_yydest; - const ACE_TCHAR *ace_yysrc; -# endif -{ - register ACE_TCHAR *ace_yyd = ace_yydest; - register const ACE_TCHAR *ace_yys = ace_yysrc; - - while ((*ace_yyd++ = *ace_yys++) != '\0') - continue; - - return ace_yyd - 1; -} -# endif -# endif -#endif - - - -/* The user can define ACE_YYPARSE_PARAM as the name of an argument to be passed - into ace_yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ - -#ifdef ACE_YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) -# define ACE_YYPARSE_PARAM_ARG void *ACE_YYPARSE_PARAM -# define ACE_YYPARSE_PARAM_DECL -# else -# define ACE_YYPARSE_PARAM_ARG ACE_YYPARSE_PARAM -# define ACE_YYPARSE_PARAM_DECL void *ACE_YYPARSE_PARAM; -# endif -#else /* !ACE_YYPARSE_PARAM */ -# define ACE_YYPARSE_PARAM_ARG -# define ACE_YYPARSE_PARAM_DECL -#endif /* !ACE_YYPARSE_PARAM */ - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -# ifdef ACE_YYPARSE_PARAM -int ace_yyparse (void *); -# else -int ace_yyparse (void); -# endif -#endif - -/* ACE_YY_DECL_VARIABLES -- depending whether we use a pure parser, - variables are global, or local to ACE_YYPARSE. */ - -#define ACE_YY_DECL_NON_LSP_VARIABLES \ -/* The lookahead symbol. */ \ -int ace_yychar; \ - \ -/* The semantic value of the lookahead symbol. */ \ -ACE_YYSTYPE ace_yylval; \ - \ -/* Number of parse errors so far. */ \ -int ace_yynerrs; - -#if ACE_YYLSP_NEEDED -# define ACE_YY_DECL_VARIABLES \ -ACE_YY_DECL_NON_LSP_VARIABLES \ - \ -/* Location data for the lookahead symbol. */ \ -ACE_YYLTYPE ace_yylloc; -#else -# define ACE_YY_DECL_VARIABLES \ -ACE_YY_DECL_NON_LSP_VARIABLES -#endif - - -/* If nonreentrant, generate the variables here. */ - -#if !ACE_YYPURE -ACE_YY_DECL_VARIABLES -#endif /* !ACE_YYPURE */ - -int -ace_yyparse (ACE_YYPARSE_PARAM_ARG) - ACE_YYPARSE_PARAM_DECL -{ - /* If reentrant, generate the variables here. */ -#if ACE_YYPURE - ACE_YY_DECL_VARIABLES -#endif /* !ACE_YYPURE */ - - register int ace_yystate; - register int ace_yyn; - int ace_yyresult; - /* Number of tokens to shift before error messages enabled. */ - int ace_yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ - int ace_yychar1 = 0; - - /* Three stacks and their tools: - `ace_yyss': related to states, - `ace_yyvs': related to semantic values, - `ace_yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow ace_yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - short ace_yyssa[ACE_YYINITDEPTH]; - short *ace_yyss = ace_yyssa; - register short *ace_yyssp; - - /* The semantic value stack. */ - ACE_YYSTYPE ace_yyvsa[ACE_YYINITDEPTH]; - ACE_YYSTYPE *ace_yyvs = ace_yyvsa; - register ACE_YYSTYPE *ace_yyvsp; - -#if ACE_YYLSP_NEEDED - /* The location stack. */ - ACE_YYLTYPE ace_yylsa[ACE_YYINITDEPTH]; - ACE_YYLTYPE *ace_yyls = ace_yylsa; - ACE_YYLTYPE *ace_yylsp; -#endif - -#if ACE_YYLSP_NEEDED -# define ACE_YYPOPSTACK (ace_yyvsp--, ace_yyssp--, ace_yylsp--) -#else -# define ACE_YYPOPSTACK (ace_yyvsp--, ace_yyssp--) -#endif - - ACE_YYSIZE_T ace_yystacksize = ACE_YYINITDEPTH; - - - /* The variables used to return semantic value and location from the - action routines. */ - ACE_YYSTYPE ace_yyval; -#if ACE_YYLSP_NEEDED - ACE_YYLTYPE ace_yyloc; -#endif - - /* When reducing, the number of symbols on the RHS of the reduced - rule. */ - int ace_yylen; - - ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Starting parse\n"))); - - ace_yystate = 0; - ace_yyerrstatus = 0; - ace_yynerrs = 0; - ace_yychar = ACE_YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - ace_yyssp = ace_yyss; - ace_yyvsp = ace_yyvs; -#if ACE_YYLSP_NEEDED - ace_yylsp = ace_yyls; -#endif - goto ace_yysetstate; - -/*------------------------------------------------------------. -| ace_yynewstate -- Push a new state, which is found in ace_yystate. | -`------------------------------------------------------------*/ - ace_yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. - */ - ace_yyssp++; - - ace_yysetstate: - *ace_yyssp = ace_yystate; - - if (ace_yyssp >= ace_yyss + ace_yystacksize - 1) - { - /* Get the current used size of the three stacks, in elements. */ - ACE_YYSIZE_T ace_yysize = ace_yyssp - ace_yyss + 1; - -#ifdef ace_yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - ACE_YYSTYPE *ace_yyvs1 = ace_yyvs; - short *ace_yyss1 = ace_yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. */ -# if ACE_YYLSP_NEEDED - ACE_YYLTYPE *ace_yyls1 = ace_yyls; - /* This used to be a conditional around just the two extra args, - but that might be undefined if ace_yyoverflow is a macro. */ - ace_yyoverflow (ACE_LIB_TEXT ("parser stack overflow"), - &ace_yyss1, ace_yysize * sizeof (*ace_yyssp), - &ace_yyvs1, ace_yysize * sizeof (*ace_yyvsp), - &ace_yyls1, ace_yysize * sizeof (*ace_yylsp), - &ace_yystacksize); - ace_yyls = ace_yyls1; -# else - ace_yyoverflow (ACE_LIB_TEXT ("parser stack overflow"), - &ace_yyss1, ace_yysize * sizeof (*ace_yyssp), - &ace_yyvs1, ace_yysize * sizeof (*ace_yyvsp), - &ace_yystacksize); -# endif - ace_yyss = ace_yyss1; - ace_yyvs = ace_yyvs1; - } -#else /* no ace_yyoverflow */ -# ifndef ACE_YYSTACK_RELOCATE - goto ace_yyoverflowlab; -# else - /* Extend the stack our own way. */ - if (ace_yystacksize >= ACE_YYMAXDEPTH) - goto ace_yyoverflowlab; - ace_yystacksize *= 2; - if (ace_yystacksize > ACE_YYMAXDEPTH) - ace_yystacksize = ACE_YYMAXDEPTH; - - { - short *ace_yyss1 = ace_yyss; - union ace_yyalloc *ace_yyptr = - (union ace_yyalloc *) ACE_YYSTACK_ALLOC (ACE_YYSTACK_BYTES (ace_yystacksize)); - if (! ace_yyptr) - goto ace_yyoverflowlab; - ACE_YYSTACK_RELOCATE (ace_yyss); - ACE_YYSTACK_RELOCATE (ace_yyvs); -# if ACE_YYLSP_NEEDED - ACE_YYSTACK_RELOCATE (ace_yyls); -# endif -# undef ACE_YYSTACK_RELOCATE - if (ace_yyss1 != ace_yyssa) - ACE_YYSTACK_FREE (ace_yyss1); - } -# endif -#endif /* no ace_yyoverflow */ - - ace_yyssp = ace_yyss + ace_yysize - 1; - ace_yyvsp = ace_yyvs + ace_yysize - 1; -#if ACE_YYLSP_NEEDED - ace_yylsp = ace_yyls + ace_yysize - 1; -#endif - - ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Stack size increased to %lu\n"), - (unsigned long int) ace_yystacksize)); - - if (ace_yyssp >= ace_yyss + ace_yystacksize - 1) - ACE_YYABORT; - } - - ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Entering state %d\n"), ace_yystate)); - - goto ace_yybackup; - - -/*-----------. -| ace_yybackup. | -`-----------*/ -ace_yybackup: - -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* ace_yyresume: */ - - /* First try to decide what to do without reference to lookahead token. */ - - ace_yyn = ace_yypact[ace_yystate]; - if (ace_yyn == ACE_YYFLAG) - goto ace_yydefault; - - /* Not known => get a lookahead token if don't already have one. */ - - /* ace_yychar is either ACE_YYEMPTY or ACE_YYEOF - or a valid token in external form. */ - - if (ace_yychar == ACE_YYEMPTY) - { - ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Reading a token: "))); - ace_yychar = ACE_YYLEX; - } - - /* Convert token to internal form (in ace_yychar1) for indexing tables with */ - - if (ace_yychar <= 0) /* This means end of input. */ - { - ace_yychar1 = 0; - ace_yychar = ACE_YYEOF; /* Don't call ACE_YYLEX any more */ - - ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Now at end of input.\n"))); - } - else - { - ace_yychar1 = ACE_YYTRANSLATE (ace_yychar); - -#if ACE_YYDEBUG - /* We have to keep this `#if ACE_YYDEBUG', since we use variables - which are defined only if `ACE_YYDEBUG' is set. */ - if (ace_yydebug) - { - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("Next token is %d (%s"), - ace_yychar, ace_yytname[ace_yychar1]); - /* Give the individual parser a way to print the precise - meaning of a token, for further debugging info. */ -# ifdef ACE_YYPRINT - ACE_YYPRINT (stderr, ace_yychar, ace_yylval); -# endif - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT (")\n")); - } -#endif - } - - ace_yyn += ace_yychar1; - if (ace_yyn < 0 || ace_yyn > ACE_YYLAST || ace_yycheck[ace_yyn] != ace_yychar1) - goto ace_yydefault; - - ace_yyn = ace_yytable[ace_yyn]; - - /* ace_yyn is what to do for this token type in this state. - Negative => reduce, -ace_yyn is rule number. - Positive => shift, ace_yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (ace_yyn < 0) - { - if (ace_yyn == ACE_YYFLAG) - goto ace_yyerrlab; - ace_yyn = -ace_yyn; - goto ace_yyreduce; - } - else if (ace_yyn == 0) - goto ace_yyerrlab; - - if (ace_yyn == ACE_YYFINAL) - ACE_YYACCEPT; - - /* Shift the lookahead token. */ - ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Shifting token %d (%s), "), - ace_yychar, ace_yytname[ace_yychar1])); - - /* Discard the token being shifted unless it is eof. */ - if (ace_yychar != ACE_YYEOF) - ace_yychar = ACE_YYEMPTY; - - *++ace_yyvsp = ace_yylval; -#if ACE_YYLSP_NEEDED - *++ace_yylsp = ace_yylloc; -#endif - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (ace_yyerrstatus) - ace_yyerrstatus--; - - ace_yystate = ace_yyn; - goto ace_yynewstate; - - -/*-----------------------------------------------------------. -| ace_yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -ace_yydefault: - ace_yyn = ace_yydefact[ace_yystate]; - if (ace_yyn == 0) - goto ace_yyerrlab; - goto ace_yyreduce; - - -/*-----------------------------. -| ace_yyreduce -- Do a reduction. | -`-----------------------------*/ -ace_yyreduce: - /* ace_yyn is the number of a rule to reduce with. */ - ace_yylen = ace_yyr2[ace_yyn]; - - /* If ACE_YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. - - Otherwise, the following line sets ACE_YYVAL to the semantic value of - the lookahead token. This behavior is undocumented and Bison - users should not rely upon it. Assigning to ACE_YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that ACE_YYVAL may be used uninitialized. */ - ace_yyval = ace_yyvsp[1-ace_yylen]; - -#if ACE_YYLSP_NEEDED - /* Similarly for the default location. Let the user run additional - commands if for instance locations are ranges. */ - ace_yyloc = ace_yylsp[1-ace_yylen]; - ACE_YYLLOC_DEFAULT (ace_yyloc, (ace_yylsp - ace_yylen), ace_yylen); -#endif - -#if ACE_YYDEBUG - /* We have to keep this `#if ACE_YYDEBUG', since we use variables which - are defined only if `ACE_YYDEBUG' is set. */ - if (ace_yydebug) - { - int ace_yyi; - - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("Reducing via rule %d (line %d), "), - ace_yyn, ace_yyrline[ace_yyn]); - - /* Print the symbols being reduced, and their result. */ - for (ace_yyi = ace_yyprhs[ace_yyn]; ace_yyrhs[ace_yyi] > 0; ace_yyi++) - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("%s "), ace_yytname[ace_yyrhs[ace_yyi]]); - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT (" -> %s\n"), ace_yytname[ace_yyr1[ace_yyn]]); - } -#endif - - switch (ace_yyn) { - -case 1: -{ - if (ace_yyvsp[0].parse_node_ != 0) - { - ace_yyvsp[0].parse_node_->apply (ACE_SVC_CONF_PARAM->yyerrno); delete ace_yyvsp[0].parse_node_; - } - ACE_SVC_CONF_PARAM->obstack.release (); - ; - break;} -case 2: -{ - ACE_SVC_CONF_PARAM->obstack.release (); - ; - break;} -case 10: -{ - if (ace_yyvsp[-1].svc_record_ != 0) - ace_yyval.parse_node_ = new ACE_Dynamic_Node (ace_yyvsp[-1].svc_record_, ace_yyvsp[0].ident_); - else - ace_yyval.parse_node_ = 0; - ; - break;} -case 11: -{ - ace_yyval.parse_node_ = new ACE_Static_Node (ace_yyvsp[-1].ident_, ace_yyvsp[0].ident_); - ; - break;} -case 12: -{ - ace_yyval.parse_node_ = new ACE_Suspend_Node (ace_yyvsp[0].ident_); - ; - break;} -case 13: -{ - ace_yyval.parse_node_ = new ACE_Resume_Node (ace_yyvsp[0].ident_); - ; - break;} -case 14: -{ - ace_yyval.parse_node_ = new ACE_Remove_Node (ace_yyvsp[0].ident_); - ; - break;} -case 15: -{ - ace_yyval.parse_node_ = new ACE_Stream_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_); - ; - break;} -case 16: -{ ace_yyval.static_node_ = new ACE_Static_Node (ace_yyvsp[0].ident_); ; - break;} -case 17: -{ - ace_yyval.parse_node_ = new ACE_Dummy_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_); - ; - break;} -case 18: -{ - ; - break;} -case 19: -{ - ; - break;} -case 20: -{ - // Initialize left context... - ace_yyval.static_node_ = ace_yyvsp[-1].static_node_; - ; - break;} -case 21: -{ - ace_yyval.parse_node_ = ace_yyvsp[-1].parse_node_; - ; - break;} -case 22: -{ ace_yyval.parse_node_ = 0; ; - break;} -case 23: -{ - if (ace_yyvsp[0].parse_node_ != 0) - { - ace_yyvsp[0].parse_node_->link (ace_yyvsp[-1].parse_node_); - ace_yyval.parse_node_ = ace_yyvsp[0].parse_node_; - } - ; - break;} -case 24: -{ ace_yyval.parse_node_ = 0; ; - break;} -case 25: -{ - ACE_Static_Node *svc_type = ace_yyvsp[0].static_node_; - - if (svc_type != 0) - { - ACE_Static_Node *module = ace_yyvsp[-2].static_node_; - - ACE_ARGV args (svc_type->parameters ()); - ACE_Module_Type *mt = ace_get_module (module, - svc_type, - ACE_SVC_CONF_PARAM->yyerrno); - ACE_Stream_Type *st = - ACE_dynamic_cast (ACE_Stream_Type *, - ACE_const_cast (ACE_Service_Type_Impl *, - module->record ()->type ())); - - if (mt->init (args.argc (), args.argv ()) == -1 - || st->push (mt) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("dynamic initialization failed for Module %s\n"), - svc_type->name ())); - ACE_SVC_CONF_PARAM->yyerrno++; - } - } - ; - break;} -case 26: -{ - ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_, - ace_yyvsp[0].static_node_->name (), - ACE_SVC_CONF_PARAM->yyerrno); - - if (((ACE_Stream_Type *) (ace_yyvsp[-2].static_node_)->record ()->type ())->push (mt) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Problem with static\n"))); - ACE_SVC_CONF_PARAM->yyerrno++; - } - ; - break;} -case 27: -{ - ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_, - ace_yyvsp[0].static_node_->name (), - ACE_SVC_CONF_PARAM->yyerrno); - if (mt != 0) - mt->suspend (); - ; - break;} -case 28: -{ - ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_, - ace_yyvsp[0].static_node_->name (), - ACE_SVC_CONF_PARAM->yyerrno); - if (mt != 0) - mt->resume (); - ; - break;} -case 29: -{ - ACE_Static_Node *stream = ace_yyvsp[-2].static_node_; - ACE_Static_Node *module = ace_yyvsp[0].static_node_; - ACE_Module_Type *mt = ace_get_module (stream, - module->name (), - ACE_SVC_CONF_PARAM->yyerrno); - - ACE_Stream_Type *st = - ACE_dynamic_cast (ACE_Stream_Type *, - ACE_const_cast (ACE_Service_Type_Impl *, - stream->record ()->type ())); - if (mt != 0 && st->remove (mt) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), - module->name (), - stream->name ())); - ACE_SVC_CONF_PARAM->yyerrno++; - } - ; - break;} -case 30: -{ - u_int flags - = ACE_Service_Type::DELETE_THIS - | (ace_yyvsp[-1].location_node_->dispose () == 0 ? 0 : ACE_Service_Type::DELETE_OBJ); - ACE_Service_Object_Exterminator gobbler = 0; - void *sym = ace_yyvsp[-1].location_node_->symbol (ACE_SVC_CONF_PARAM->yyerrno, &gobbler); - - if (sym != 0) - { - ACE_Service_Type_Impl *stp - = ACE_Service_Config::create_service_type_impl (ace_yyvsp[-3].ident_, - ace_yyvsp[-2].type_, - sym, - flags, - gobbler); - if (stp == 0) - ++ACE_SVC_CONF_PARAM->yyerrno; - - ace_yyval.svc_record_ = new ACE_Service_Type (ace_yyvsp[-3].ident_, - stp, - ace_yyvsp[-1].location_node_->dll (), - ace_yyvsp[0].type_); - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Unable to find service: %s\n"), - ace_yyvsp[-3].ident_)); - ++ACE_SVC_CONF_PARAM->yyerrno; - ace_yyval.svc_record_ = 0; - } - delete ace_yyvsp[-1].location_node_; - ; - break;} -case 31: -{ - ace_yyval.type_ = 1; - ; - break;} -case 32: -{ - ace_yyval.type_ = 0; - ; - break;} -case 33: -{ - ace_yyval.type_ = 1; - ; - break;} -case 34: -{ - ace_yyval.location_node_ = new ACE_Object_Node (ace_yyvsp[-2].ident_, ace_yyvsp[0].ident_); - ; - break;} -case 35: -{ - ace_yyval.location_node_ = new ACE_Function_Node (ace_yyvsp[-4].ident_, ace_yyvsp[-2].ident_); - ; - break;} -case 36: -{ - ace_yyval.location_node_ = new ACE_Static_Function_Node (ace_yyvsp[-2].ident_); - ; - break;} -case 37: -{ - ace_yyval.type_ = ACE_MODULE_T; - ; - break;} -case 38: -{ - ace_yyval.type_ = ACE_SVC_OBJ_T; - ; - break;} -case 39: -{ - ace_yyval.type_ = ACE_STREAM_T; - ; - break;} -case 41: -{ ace_yyval.ident_ = 0; ; - break;} -} - - - - ace_yyvsp -= ace_yylen; - ace_yyssp -= ace_yylen; -#if ACE_YYLSP_NEEDED - ace_yylsp -= ace_yylen; -#endif - -#if ACE_YYDEBUG - if (ace_yydebug) - { - short *ace_yyssp1 = ace_yyss - 1; - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("state stack now")); - while (ace_yyssp1 != ace_yyssp) - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT (" %d"), *++ace_yyssp1); - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("\n")); - } -#endif - - *++ace_yyvsp = ace_yyval; -#if ACE_YYLSP_NEEDED - *++ace_yylsp = ace_yyloc; -#endif - - /* Now `shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - - ace_yyn = ace_yyr1[ace_yyn]; - - ace_yystate = ace_yypgoto[ace_yyn - ACE_YYNTBASE] + *ace_yyssp; - if (ace_yystate >= 0 && ace_yystate <= ACE_YYLAST && ace_yycheck[ace_yystate] == *ace_yyssp) - ace_yystate = ace_yytable[ace_yystate]; - else - ace_yystate = ace_yydefgoto[ace_yyn - ACE_YYNTBASE]; - - goto ace_yynewstate; - - -/*------------------------------------. -| ace_yyerrlab -- here on detecting error | -`------------------------------------*/ -ace_yyerrlab: - /* If not already recovering from an error, report this error. */ - if (!ace_yyerrstatus) - { - ++ace_yynerrs; - -#ifdef ACE_YYERROR_VERBOSE - ace_yyn = ace_yypact[ace_yystate]; - - if (ace_yyn > ACE_YYFLAG && ace_yyn < ACE_YYLAST) - { - ACE_YYSIZE_T ace_yysize = 0; - ACE_TCHAR *ace_yymsg; - int ace_yyx, ace_yycount; - - ace_yycount = 0; - /* Start ACE_YYX at -ACE_YYN if negative to avoid negative indexes in - ACE_YYCHECK. */ - for (ace_yyx = ace_yyn < 0 ? -ace_yyn : 0; - ace_yyx < (int) (sizeof (ace_yytname) / sizeof (ACE_TCHAR *)); ace_yyx++) - if (ace_yycheck[ace_yyx + ace_yyn] == ace_yyx) - ace_yysize += ace_yystrlen (ace_yytname[ace_yyx]) + 15, ace_yycount++; - ace_yysize += ace_yystrlen (ACE_LIB_TEXT ("parse error, unexpected ")) + 1; - ace_yysize += ace_yystrlen (ace_yytname[ACE_YYTRANSLATE (ace_yychar)]); - ace_yymsg = (ACE_TCHAR *) ACE_YYSTACK_ALLOC (ace_yysize); - if (ace_yymsg != 0) - { - ACE_TCHAR *ace_yyp = ace_yystpcpy (ace_yymsg, ACE_LIB_TEXT ("parse error, unexpected ")); - ace_yyp = ace_yystpcpy (ace_yyp, ace_yytname[ACE_YYTRANSLATE (ace_yychar)]); - - if (ace_yycount < 5) - { - ace_yycount = 0; - for (ace_yyx = ace_yyn < 0 ? -ace_yyn : 0; - ace_yyx < (int) (sizeof (ace_yytname) / sizeof (ACE_TCHAR *)); - ace_yyx++) - if (ace_yycheck[ace_yyx + ace_yyn] == ace_yyx) - { - const ACE_TCHAR *ace_yyq = ! ace_yycount ? ACE_LIB_TEXT (", expecting ") : ACE_LIB_TEXT (" or "); - ace_yyp = ace_yystpcpy (ace_yyp, ace_yyq); - ace_yyp = ace_yystpcpy (ace_yyp, ace_yytname[ace_yyx]); - ace_yycount++; - } - } - ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ace_yymsg); - ACE_YYSTACK_FREE (ace_yymsg); - } - else - ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ACE_LIB_TEXT ("parse error; also virtual memory exhausted")); - } - else -#endif /* defined (ACE_YYERROR_VERBOSE) */ - ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ACE_LIB_TEXT ("parse error")); - } - goto ace_yyerrlab1; - - -/*--------------------------------------------------. -| ace_yyerrlab1 -- error raised explicitly by an action | -`--------------------------------------------------*/ -ace_yyerrlab1: - if (ace_yyerrstatus == 3) - { - /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - - /* return failure if at end of input */ - if (ace_yychar == ACE_YYEOF) - ACE_YYABORT; - ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Discarding token %d (%s).\n"), - ace_yychar, ace_yytname[ace_yychar1])); - ace_yychar = ACE_YYEMPTY; - } - - /* Else will try to reuse lookahead token after shifting the error - token. */ - - ace_yyerrstatus = 3; /* Each real token shifted decrements this */ - - goto ace_yyerrhandle; - - -/*-------------------------------------------------------------------. -| ace_yyerrdefault -- current state does not do anything special for the | -| error token. | -`-------------------------------------------------------------------*/ -ace_yyerrdefault: -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ - - /* If its default is to accept any token, ok. Otherwise pop it. */ - ace_yyn = ace_yydefact[ace_yystate]; - if (ace_yyn) - goto ace_yydefault; -#endif - - -/*---------------------------------------------------------------. -| ace_yyerrpop -- pop the current state because it cannot handle the | -| error token | -`---------------------------------------------------------------*/ -ace_yyerrpop: - if (ace_yyssp == ace_yyss) - ACE_YYABORT; - ace_yyvsp--; - ace_yystate = *--ace_yyssp; -#if ACE_YYLSP_NEEDED - ace_yylsp--; -#endif - -#if ACE_YYDEBUG - if (ace_yydebug) - { - short *ace_yyssp1 = ace_yyss - 1; - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("Error: state stack now")); - while (ace_yyssp1 != ace_yyssp) - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT (" %d"), *++ace_yyssp1); - ACE_YYFPRINTF (stderr, ACE_LIB_TEXT ("\n")); - } -#endif - -/*--------------. -| ace_yyerrhandle. | -`--------------*/ -ace_yyerrhandle: - ace_yyn = ace_yypact[ace_yystate]; - if (ace_yyn == ACE_YYFLAG) - goto ace_yyerrdefault; - - ace_yyn += ACE_YYTERROR; - if (ace_yyn < 0 || ace_yyn > ACE_YYLAST || ace_yycheck[ace_yyn] != ACE_YYTERROR) - goto ace_yyerrdefault; - - ace_yyn = ace_yytable[ace_yyn]; - if (ace_yyn < 0) - { - if (ace_yyn == ACE_YYFLAG) - goto ace_yyerrpop; - ace_yyn = -ace_yyn; - goto ace_yyreduce; - } - else if (ace_yyn == 0) - goto ace_yyerrpop; - - if (ace_yyn == ACE_YYFINAL) - ACE_YYACCEPT; - - ACE_YYDPRINTF ((stderr, ACE_LIB_TEXT ("Shifting error token, "))); - - *++ace_yyvsp = ace_yylval; -#if ACE_YYLSP_NEEDED - *++ace_yylsp = ace_yylloc; -#endif - - ace_yystate = ace_yyn; - goto ace_yynewstate; - - -/*-------------------------------------. -| ace_yyacceptlab -- ACE_YYACCEPT comes here. | -`-------------------------------------*/ -ace_yyacceptlab: - ace_yyresult = 0; - goto ace_yyreturn; - -/*-----------------------------------. -| ace_yyabortlab -- ACE_YYABORT comes here. | -`-----------------------------------*/ -ace_yyabortlab: - ace_yyresult = 1; - goto ace_yyreturn; - -/*---------------------------------------------. -| ace_yyoverflowab -- parser overflow comes here. | -`---------------------------------------------*/ -ace_yyoverflowlab: - ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ACE_LIB_TEXT ("parser stack overflow")); - ace_yyresult = 2; - /* Fall through. */ - -ace_yyreturn: -#ifndef ace_yyoverflow - if (ace_yyss != ace_yyssa) - ACE_YYSTACK_FREE (ace_yyss); -#endif - return ace_yyresult; -} - -// Prints the error string to standard output. Cleans up the error -// messages. - -void -ace_yyerror (int ace_yyerrno, int ace_yylineno, const ACE_TCHAR *s) -{ -#if defined (ACE_NLOGGING) - ACE_UNUSED_ARG (ace_yyerrno); - ACE_UNUSED_ARG (ace_yylineno); - ACE_UNUSED_ARG (s); -#endif /* ACE_NLOGGING */ - - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("[error %d] on line %d: %s\n"), - ace_yyerrno, - ace_yylineno, - s)); -} - -// Note that SRC_REC represents left context, which is the STREAM * -// record. - -static ACE_Module_Type * -ace_get_module (ACE_Static_Node *str_rec, - const ACE_TCHAR *svc_name, - int & ace_yyerrno) -{ - const ACE_Service_Type *sr = str_rec->record (); - const ACE_Service_Type_Impl *type = sr->type (); - ACE_Stream_Type *st = sr == 0 - ? 0 - : ACE_dynamic_cast (ACE_Stream_Type *, - ACE_const_cast (ACE_Service_Type_Impl *, - type)); - ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name); - - if (sr == 0 || st == 0 || mt == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"), - svc_name, - str_rec->name ())); - ace_yyerrno++; - } - - return mt; -} - -static ACE_Module_Type * -ace_get_module (ACE_Static_Node *str_rec, - ACE_Static_Node *svc_type, - int & ace_yyerrno) -{ - const ACE_Service_Type *sr = str_rec->record (); - const ACE_Service_Type_Impl *type = sr->type (); - ACE_Stream_Type *st = sr == 0 ? 0 : (ACE_Stream_Type *) type; - const ACE_Service_Type *sv = svc_type->record (); - type = sv->type (); - ACE_Module_Type *mt = (ACE_Module_Type *) type; - const ACE_TCHAR *module_type_name = svc_type->name (); - - if (sr == 0 || st == 0 || mt == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), - module_type_name, - str_rec->name ())); - ace_yyerrno++; - } - - // Make sure that the Module has the same name as the - // Module_Type object from the svc.conf file. - ACE_Module *mp = (ACE_Module *) mt->object (); - - if (ACE_OS::strcmp (mp->name (), module_type_name) != 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), - module_type_name, - mp->name ())); - mp->name (module_type_name); - } - - return mt; -} - -#if defined (DEBUGGING) -// Main driver program. - -int -main (int argc, char *argv[]) -{ - ACE_Svc_Conf_Param param (stdin); - - // Try to reopen any filename argument to use ACE_YYIN. - if (argc > 1 && (ace_yyin = freopen (argv[1], "r", stdin)) == 0) - (void) ACE_OS::ACE_OS::fprintf (stderr, ACE_LIB_TEXT ("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1); - - return ::ace_yyparse (¶m); -} -#endif /* DEBUGGING */ -#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp deleted file mode 100644 index d16028e7078..00000000000 --- a/ace/Svc_Handler.cpp +++ /dev/null @@ -1,509 +0,0 @@ -// $Id$ - -#ifndef ACE_SVC_HANDLER_C -#define ACE_SVC_HANDLER_C - -#include "ace/Svc_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Object_Manager.h" -#include "ace/Connection_Recycling_Strategy.h" - -#include "ace/Dynamic.h" - -ACE_RCSID(ace, Svc_Handler, "$Id$") - -#define PR_ST_1 ACE_PEER_STREAM_1 -#define PR_ST_2 ACE_PEER_STREAM_2 - -template void * -ACE_Svc_Handler::operator new (size_t, - void *p) -{ - ACE_TRACE ("ACE_Svc_Handler::operator new (NOOP, 2 parameters)"); - return p; -} - -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) -template void -ACE_Svc_Handler::operator delete (void *, - void *) -{ - ACE_TRACE ("ACE_Svc_Handler::operator delete (NOOP, 2 parameters)"); - return; -} -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ - -template void * -ACE_Svc_Handler::operator new (size_t n) -{ - ACE_TRACE ("ACE_Svc_Handler::operator new"); - - ACE_Dynamic *const dynamic_instance = ACE_Dynamic::instance (); - - if (dynamic_instance == 0) - { - // If this ACE_ASSERT fails, it may be due to running of out TSS - // keys. Try using ACE_HAS_TSS_EMULATION, or increasing - // ACE_DEFAULT_THREAD_KEYS if already using TSS emulation. - ACE_ASSERT (dynamic_instance != 0); - - ACE_throw_bad_alloc; - } - else - { - // Allocate the memory and store it (usually in thread-specific - // storage, depending on config flags). - dynamic_instance->set (); - - return ::new char[n]; - } -} - -#if defined (ACE_HAS_NEW_NOTHROW) -template void * -ACE_Svc_Handler::operator new (size_t n, - const ACE_nothrow_t&) -{ - ACE_TRACE ("ACE_Svc_Handler::operator new(nothrow)"); - - ACE_Dynamic *const dynamic_instance = ACE_Dynamic::instance (); - - if (dynamic_instance == 0) - { - // If this ACE_ASSERT fails, it may be due to running of out TSS - // keys. Try using ACE_HAS_TSS_EMULATION, or increasing - // ACE_DEFAULT_THREAD_KEYS if already using TSS emulation. - ACE_ASSERT (dynamic_instance != 0); - - return 0; - } - else - { - // Allocate the memory and store it (usually in thread-specific - // storage, depending on config flags). - dynamic_instance->set (); - - return ::new(ACE_nothrow) char[n]; - } -} -#endif /* ACE_HAS_NEW_NOTHROW */ - -template void -ACE_Svc_Handler::destroy (void) -{ - ACE_TRACE ("ACE_Svc_Handler::destroy"); - - // Only delete ourselves if we're not owned by a module and have - // been allocated dynamically. - if (this->mod_ == 0 && this->dynamic_ && this->closing_ == 0) - // Will call the destructor, which automatically calls . - // Note that if we are *not* allocated dynamically then the - // destructor will call automatically when it gets run - // during cleanup. - delete this; -} - -template void -ACE_Svc_Handler::operator delete (void *obj) -{ - ACE_TRACE ("ACE_Svc_Handler::operator delete"); - // You cannot delete a 'void*' (X3J16/95-0087 5.3.5.3), but we know - // the pointer was created using new char[] (see operator new code), - // so we use a cast: - char *tmp = (char *) obj; - ::delete [] tmp; -} - -// Default constructor. - -template -ACE_Svc_Handler::ACE_Svc_Handler (ACE_Thread_Manager *tm, - ACE_Message_Queue *mq, - ACE_Reactor *reactor) - : ACE_Task (tm, mq), - closing_ (0), - recycler_ (0), - recycling_act_ (0) -{ - ACE_TRACE ("ACE_Svc_Handler::ACE_Svc_Handler"); - - this->reactor (reactor); - - // This clever idiom transparently checks if we were allocated - // dynamically. This information is used by the method to - // decide if we need to delete ... The idiom is based on a - // paper by Michael van Rooyen (mrooyen@cellnet.co.uk) that appeared - // in the April '96 issue of the C++ Report. We've spruced it up to - // work correctly in multi-threaded programs by using our ACE_TSS - // class. - this->dynamic_ = ACE_Dynamic::instance ()->is_dynamic (); - - if (this->dynamic_ != 0) - // Make sure to reset the flag. - ACE_Dynamic::instance ()->reset (); -} - -// Default behavior for a ACE_Svc_Handler object is to be registered -// with the ACE_Reactor (thereby ensuring single threading). - -template int -ACE_Svc_Handler::open (void *) -{ - ACE_TRACE ("ACE_Svc_Handler::open"); -#if defined (ACE_DEBUGGING) - ACE_TCHAR buf[BUFSIZ]; - ACE_PEER_STREAM_ADDR client_addr; - - if (this->peer_.get_remote_addr (client_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("get_remote_addr")), - -1); - else if (client_addr.addr_to_string (buf, sizeof buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("can't obtain peer's address")), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("connected to %s on fd %d\n"), - buf, - this->peer_.get_handle ())); -#endif /* ACE_DEBUGGING */ - if (this->reactor () - && this->reactor ()->register_handler - (this, - ACE_Event_Handler::READ_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("unable to register client handler")), - -1); - return 0; -} - -// Perform termination activities. - -template void -ACE_Svc_Handler::shutdown (void) -{ - ACE_TRACE ("ACE_Svc_Handler::shutdown"); - - // Deregister this handler with the ACE_Reactor. - if (this->reactor ()) - { - ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK | - ACE_Event_Handler::DONT_CALL; - - // Make sure there are no timers. - this->reactor ()->cancel_timer (this); - - if (this->peer ().get_handle () != ACE_INVALID_HANDLE) - // Remove self from reactor. - this->reactor ()->remove_handler (this, mask); - } - - // Remove self from the recycler. - if (this->recycler ()) - this->recycler ()->purge (this->recycling_act_); - - this->peer ().close (); -} - -template void -ACE_Svc_Handler::cleanup_hint (void **act_holder) -{ - ACE_TRACE ("ACE_Svc_Handler::cleanup_hint"); - - // Remove as hint. - if (this->recycler ()) - this->recycler ()->cleanup_hint (this->recycling_act_, - act_holder); -} - -template void -ACE_Svc_Handler::dump (void) const -{ - ACE_TRACE ("ACE_Svc_Handler::dump"); - - this->peer_.dump (); - ACE_DEBUG ((LM_DEBUG, - "dynamic_ = %d\n", - this->dynamic_)); - ACE_DEBUG ((LM_DEBUG, - "closing_ = %d\n", - this->closing_)); - ACE_DEBUG ((LM_DEBUG, - "recycler_ = %d\n", - this->recycler_)); - ACE_DEBUG ((LM_DEBUG, - "recycling_act_ = %d\n", - this->recycling_act_)); -} - -template ACE_PEER_STREAM & -ACE_Svc_Handler::peer (void) const -{ - ACE_TRACE ("ACE_Svc_Handler::peer"); - return (ACE_PEER_STREAM &) this->peer_; -} - -// Extract the underlying I/O descriptor. - -template ACE_HANDLE -ACE_Svc_Handler::get_handle (void) const -{ - ACE_TRACE ("ACE_Svc_Handler::get_handle"); - return this->peer_.get_handle (); -} - -// Set the underlying I/O descriptor. - -template void -ACE_Svc_Handler::set_handle (ACE_HANDLE h) -{ - ACE_TRACE ("ACE_Svc_Handler::set_handle"); - this->peer_.set_handle (h); -} - -template -ACE_Svc_Handler::~ACE_Svc_Handler (void) -{ - ACE_TRACE ("ACE_Svc_Handler::~ACE_Svc_Handler"); - - if (this->closing_ == 0) - { - // We're closing down now, so make sure not to call ourselves - // recursively via other calls to handle_close() (e.g., from the - // Timer_Queue). - this->closing_ = 1; - - this->shutdown (); - } -} - -template int -ACE_Svc_Handler::handle_close (ACE_HANDLE, - ACE_Reactor_Mask) -{ - ACE_TRACE ("ACE_Svc_Handler::handle_close"); - - this->destroy (); - return 0; -} - -template int -ACE_Svc_Handler::handle_timeout (const ACE_Time_Value &, - const void *) -{ - ACE_TRACE ("ACE_Svc_Handler::handle_timeout"); - return this->handle_close (); -} - -template int -ACE_Svc_Handler::close (u_long) -{ - ACE_TRACE ("ACE_Svc_Handler::close"); - return this->handle_close (); -} - -template int -ACE_Svc_Handler::init (int argc, ACE_TCHAR *argv[]) -{ - ACE_TRACE ("ACE_Svc_Handler::init"); - ACE_UNUSED_ARG (argc); - ACE_UNUSED_ARG (argv); - return -1; -} - -template int -ACE_Svc_Handler::fini (void) -{ - ACE_TRACE ("ACE_Svc_Handler::fini"); - return -1; -} - -template int -ACE_Svc_Handler::info (ACE_TCHAR **, size_t) const -{ - ACE_TRACE ("ACE_Svc_Handler::info"); - return -1; -} - -template int -ACE_Svc_Handler::idle (u_long flags) -{ - if (this->recycler ()) - return this->recycler ()->cache (this->recycling_act_); - else - return this->close (flags); -} - -template int -ACE_Svc_Handler::recycle_state (ACE_Recyclable_State new_state) -{ - if (this->recycler ()) - return this->recycler ()->recycle_state (this->recycling_act_, - new_state); - - return 0; -} - -template ACE_Recyclable_State -ACE_Svc_Handler::recycle_state (void) const -{ - if (this->recycler ()) - return this->recycler ()->recycle_state (this->recycling_act_); - - return ACE_RECYCLABLE_UNKNOWN; -} - -template void -ACE_Svc_Handler::recycler (ACE_Connection_Recycling_Strategy *recycler, - const void *recycling_act) -{ - ACE_TRACE ("ACE_Svc_Handler::recycler"); - this->recycler_ = recycler; - this->recycling_act_ = recycling_act; -} - -template ACE_Connection_Recycling_Strategy * -ACE_Svc_Handler::recycler (void) const -{ - ACE_TRACE ("ACE_Svc_Handler::recycler"); - return this->recycler_; -} - -template const void * -ACE_Svc_Handler::recycling_act (void) const -{ - ACE_TRACE ("ACE_Svc_Handler::recycling_act"); - return this->recycling_act_; -} - -template int -ACE_Svc_Handler::recycle (void *) -{ - ACE_TRACE ("ACE_Svc_Handler::recycle"); - // By default, the object is ready and willing to be recycled. - return 0; -} - -template -ACE_Buffered_Svc_Handler::~ACE_Buffered_Svc_Handler (void) -{ - this->flush (); -} - -template -ACE_Buffered_Svc_Handler::ACE_Buffered_Svc_Handler (ACE_Thread_Manager *tm, - ACE_Message_Queue *mq, - ACE_Reactor *reactor, - size_t maximum_buffer_size, - ACE_Time_Value *timeout) - : ACE_Svc_Handler (tm, mq, reactor), - maximum_buffer_size_ (maximum_buffer_size), - current_buffer_size_ (0), - timeoutp_ (timeout) -{ - ACE_TRACE ("ACE_Buffered_Svc_Handler::ACE_Buffered_Svc_Handler"); - - if (this->timeoutp_ != 0) - { - this->interval_ = *timeout; - this->next_timeout_ = ACE_OS::gettimeofday () + this->interval_; - } -} - -template int -ACE_Buffered_Svc_Handler::put (ACE_Message_Block *mb, - ACE_Time_Value *tv) -{ - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->msg_queue ()->lock (), -1); - - // Enqueue onto the message queue. - if (this->putq (mb, tv) == -1) - return -1; - else - { - // Update the current number of bytes on the queue. - this->current_buffer_size_ += mb->total_size (); - - // Flush the buffer when the number of bytes exceeds the maximum - // buffer size or when the timeout period has elapsed. - if (this->current_buffer_size_ >= this->maximum_buffer_size_ - || (this->timeoutp_ != 0 - && this->next_timeout_ <= ACE_OS::gettimeofday ())) - return this->flush_i (); - else - return 0; - } -} - -// Flush the buffer. - -template int -ACE_Buffered_Svc_Handler::flush (void) -{ - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->msg_queue ()->lock (), -1); - - return this->flush_i (); -} - -template int -ACE_Buffered_Svc_Handler::flush_i (void) -{ - ACE_Message_Queue_Iterator iterator (*this->msg_queue ()); - ACE_Message_Block *mblk; - int result = 0; - - // Get the first so that we can write everything - // out via the . - if (iterator.next (mblk) != 0) - result = this->peer ().send_n (mblk); - - // This method assumes the caller holds the queue's lock! - if (result != -1) - this->msg_queue ()->flush_i (); - - if (this->timeoutp_ != 0) - // Update the next timeout period by adding the interval. - this->next_timeout_ += this->interval_; - - this->current_buffer_size_ = 0; - - return result; -} - -template void -ACE_Buffered_Svc_Handler::dump (void) const -{ - ACE_TRACE ("ACE_Buffered_Svc_Handler::dump"); - - ACE_Buffered_Svc_Handler::dump (); - ACE_DEBUG ((LM_DEBUG, - "maximum_buffer_size_ = %d\n", - this->maximum_buffer_size_)); - ACE_DEBUG ((LM_DEBUG, - "current_buffer_size_ = %d\n", - this->current_buffer_size_)); - if (this->timeoutp_ != 0) - ACE_DEBUG ((LM_DEBUG, - "next_timeout_.sec = %d, next_timeout_.usec = %d\n", - this->next_timeout_.sec (), - this->next_timeout_.usec ())); -} - -template int -ACE_Buffered_Svc_Handler::handle_timeout (const ACE_Time_Value &, - const void *) -{ - ACE_TRACE ("ACE_Buffered_Svc_Handler::handle_timeout"); - return 0; -} - -#undef PR_ST_1 -#undef PR_ST_2 -#endif /* ACE_SVC_HANDLER_C */ diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h deleted file mode 100644 index 56a107212ab..00000000000 --- a/ace/Svc_Handler.h +++ /dev/null @@ -1,333 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Svc_Handler.h - * - * $Id$ - * - * @author Douglas Schmidt - * @author Irfan Pyarali - */ -//============================================================================= - -#ifndef ACE_SVC_HANDLER_H -#define ACE_SVC_HANDLER_H - -#include "ace/pre.h" - -// Forward decls. -class ACE_Connection_Recycling_Strategy; - -#include "ace/Synch_Options.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Task.h" -#include "ace/Service_Config.h" -#include "ace/Recyclable.h" - -/** - * @class ACE_Svc_Handler - * - * @brief Defines the interface for a service that exchanges data with - * its connected peer. - * - * This class provides a well-defined interface that the - * Acceptor and Connector pattern factories use as their target. - * Typically, client applications will subclass ACE_Svc_Handler - * and do all the interesting work in the subclass. One thing - * that the ACE_Svc_Handler does contain is a PEER_STREAM - * endpoint that is initialized by an ACE_Acceptor or - * ACE_Connector when a connection is established successfully. - * This endpoint is used to exchange data between a - * ACE_Svc_Handler and the peer it is connected with. - */ -template -class ACE_Svc_Handler : public ACE_Task -{ -public: - - // Useful STL-style traits. - typedef ACE_PEER_STREAM_ADDR addr_type; - typedef ACE_PEER_STREAM stream_type; - - /** - * Constructor initializes the and by passing them - * down to the base class. The is passed to - * the . - */ - ACE_Svc_Handler (ACE_Thread_Manager *thr_mgr = 0, - ACE_Message_Queue *mq = 0, - ACE_Reactor *reactor = ACE_Reactor::instance ()); - - /// Destructor. - virtual ~ACE_Svc_Handler (void); - - /// Activate the client handler. This is typically called by the - /// or . - virtual int open (void * = 0); - - /** - * Object termination hook -- application-specific cleanup code goes - * here. This function is called by the idle() function if the object - * does not have a ACE_Connection_Recycling_Strategy associated with it. - * Also, due to this class's derivation from , is - * also called when a thread activated with this object exits. See - * for further details. The default action of this - * function is to call with the default arguments. - */ - virtual int close (u_long flags = 0); - - /** - * Call this method if you want to recycling the - * instead of closing it. If the object does not have a recycler, - * it will be closed. - */ - virtual int idle (u_long flags = 0); - - /** - * Call this method if you want to get/set the state of the - * . If the object does not have a recycler, this call - * will have no effect (and the accessor will return - * ACE_RECYCLABLE_UNKNOWN). - */ - virtual ACE_Recyclable_State recycle_state (void) const; - virtual int recycle_state (ACE_Recyclable_State new_state); - - /** - * When the svc_handle is no longer needed around as a hint, call - * this method. In addition, reset <*act_holder> to zero if - * . - */ - virtual void cleanup_hint (void **act_holder = 0); - - // = Dynamic linking hooks. - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int init (int argc, ACE_TCHAR *argv[]); - - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int fini (void); - - /// Default version does no work and returns -1. Must be overloaded - /// by application developer to do anything meaningful. - virtual int info (ACE_TCHAR **info_string, size_t length) const; - - // = Demultiplexing hooks. - - /** - * Perform termination activities on the SVC_HANDLER. The default - * behavior is to close down the (to avoid descriptor leaks) - * and to this object (to avoid memory leaks)! If you - * don't want this behavior make sure you override this method... - */ - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - - /// Default behavior when timeouts occur is to close down the - /// by calling . - virtual int handle_timeout (const ACE_Time_Value &time, - const void *); - - /// Get the underlying handle associated with the . - virtual ACE_HANDLE get_handle (void) const; - - /// Set the underlying handle associated with the . - virtual void set_handle (ACE_HANDLE); - - /// Returns the underlying PEER_STREAM. Used by - /// and factories - ACE_PEER_STREAM &peer (void) const; - - /// Overloaded new operator. This method unobtrusively records if a - /// is allocated dynamically, which allows it to clean - /// itself up correctly whether or not it's allocated statically or - /// dynamically. - void *operator new (size_t n); - -#if defined (ACE_HAS_NEW_NOTHROW) - /// Overloaded new operator, nothrow_t variant. Unobtrusively records if a - /// is allocated dynamically, which allows it to clean - /// itself up correctly whether or not it's allocated statically or - /// dynamically. - void *operator new (size_t n, const ACE_nothrow_t&); -#endif - - /// This operator permits "placement new" on a per-object basis. - void * operator new (size_t n, - void *p); - - /** - * Call this to free up dynamically allocated - * (otherwise you will get memory leaks). In general, you should - * call this method rather than since this method knows - * whether or not the object was allocated dynamically, and can act - * accordingly (i.e., deleting it if it was allocated dynamically). - */ - virtual void destroy (void); - - /** - * This really should be private so that users are forced to call - * . Unfortunately, the C++ standard doesn't allow there - * to be a public new and a private delete. It is a bad idea to - * call this method directly, so use instead, unless you - * know for sure that you've allocated the object dynamically. - */ - void operator delete (void *); - -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) - /** - * This operator is necessary to complement the class-specific - * operator new above. Unfortunately, it's not portable to all C++ - * compilers... - */ - void operator delete (void *, void *); -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ - - /// Close down the descriptor and unregister from the Reactor - void shutdown (void); - - /// Dump the state of an object. - void dump (void) const; - -public: - - // = The following methods are not suppose to be public. - - // Because friendship is *not* inherited in C++, these methods have - // to be public. - - // = Accessors to set/get the connection recycler. - - /// Set the recycler and the that is used during - /// purging and caching. - virtual void recycler (ACE_Connection_Recycling_Strategy *recycler, - const void *recycling_act); - - /// Get the recycler. - virtual ACE_Connection_Recycling_Strategy *recycler (void) const; - - /// Get the recycling act. - virtual const void *recycling_act (void) const; - - /** - * Upcall made by the recycler when it is about to recycle the - * connection. This gives the object a chance to prepare itself for - * recycling. Return 0 if the object is ready for recycling, -1 on - * failures. - */ - virtual int recycle (void * = 0); - -protected: - /// Maintain connection with client. - ACE_PEER_STREAM peer_; - - /// Have we been dynamically created? - int dynamic_; - - /// Keeps track of whether we are in the process of closing (required - /// to avoid circular calls to ). - char closing_; - - /// Pointer to the connection recycler. - ACE_Connection_Recycling_Strategy *recycler_; - - /// Asynchronous Completion Token (ACT) to be used to when talking to - /// the recycler. - const void *recycling_act_; -}; - -/** - * @class ACE_Buffered_Svc_Handler - * - * @brief Defines the interface for a service that exchanges data with - * its connected peer and supports buffering. - * - * The buffering feature makes it possible to queue up - * in an until (1) the - * queue is "full" or (2) a period of time elapses, at which - * point the queue is "flushed" via to the peer. - */ -template -class ACE_Buffered_Svc_Handler : public ACE_Svc_Handler -{ -public: - // = Initialization and termination methods. - /** - * Constructor initializes the and by passing them - * down to the base class. The is passed to - * the . The and - * are used to determine at what point to flush - * the . By default, there's no buffering at all. The - * value is interpreted to be in a unit that's - * relative to the current time returned by . - */ - ACE_Buffered_Svc_Handler (ACE_Thread_Manager *thr_mgr = 0, - ACE_Message_Queue *mq = 0, - ACE_Reactor *reactor = ACE_Reactor::instance (), - size_t max_buffer_size = 0, - ACE_Time_Value *relative_timeout = 0); - - /// Destructor, which calls . - virtual ~ACE_Buffered_Svc_Handler (void); - - /** - * Insert the chain rooted at - * into the with the designated . The - * method will be called if this causes the number of - * bytes to exceed the maximum buffer size or if the timeout period - * has elapsed. - */ - virtual int put (ACE_Message_Block *message_block, - ACE_Time_Value *timeout = 0); - - /// Flush the , which writes all the queued - /// s to the . - virtual int flush (void); - - /// This method is not currently implemented -- this is where the - /// integration with the would occur. - virtual int handle_timeout (const ACE_Time_Value &time, - const void *); - - /// Dump the state of an object. - void dump (void) const; - -protected: - /// Implement the flush operation on the , which - /// writes all the queued s to the . - /// Assumes that the caller holds the lock. - virtual int flush_i (void); - - /// Maximum size the can be before we have to flush - /// the buffer. - size_t maximum_buffer_size_; - - /// Current size in bytes of the contents. - size_t current_buffer_size_; - - /// Timeout value used to control when the buffer is flushed. - ACE_Time_Value next_timeout_; - - /// Interval of the timeout. - ACE_Time_Value interval_; - - /// Timeout pointer. - ACE_Time_Value *timeoutp_; -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Svc_Handler.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Svc_Handler.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_SVC_HANDLER_H */ diff --git a/ace/Swap.cpp b/ace/Swap.cpp deleted file mode 100644 index 4f62e72ade6..00000000000 --- a/ace/Swap.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- C++ -*- */ -/** - * @file Swap.cpp - * - * $Id$ - * - * @author Carlos O'Ryan - */ - -#ifndef ACE_SWAP_C -#define ACE_SWAP_C - -#include "ace/Swap.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Swap.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Swap, "$Id$") - -#endif /* ACE_SWAP_C */ diff --git a/ace/Swap.h b/ace/Swap.h deleted file mode 100644 index 0915eba17b2..00000000000 --- a/ace/Swap.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- C++ -*- */ -/** - * @file Swap.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ - -#ifndef ACE_SWAP_H -#define ACE_SWAP_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Swap - * - * @brief Defines a function to swap two variables. - * - */ -template class ACE_Swap -{ -public: - /// Swap two variables - static void swap (T &lhs, T &rhs); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Swap.inl" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Swap.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Swap.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_FUNCTOR_H */ diff --git a/ace/Swap.inl b/ace/Swap.inl deleted file mode 100644 index b1139ca3ffb..00000000000 --- a/ace/Swap.inl +++ /dev/null @@ -1,15 +0,0 @@ -/** - * @file Swap.inl - * - * $Id$ - * - * @author Carlos O'Ryan - */ - -template ACE_INLINE void -ACE_Swap::swap (T &lhs, T& rhs) -{ - T tmp = lhs; - lhs = rhs; - rhs = tmp; -} diff --git a/ace/Synch.cpp b/ace/Synch.cpp deleted file mode 100644 index b77a48d00af..00000000000 --- a/ace/Synch.cpp +++ /dev/null @@ -1,1010 +0,0 @@ -#ifndef ACE_SYNCH_C -#define ACE_SYNCH_C - -#include "ace/Thread.h" -#include "ace/ACE.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" -#include "ace/Log_Msg.h" - - -ACE_RCSID (ace, - Synch, - "$Id$") - - -#if !defined (__ACE_INLINE__) -#include "ace/Synch.i" -#endif /* __ACE_INLINE__ */ - - -ACE_ALLOC_HOOK_DEFINE(ACE_Null_Mutex) - -ACE_Lock::~ACE_Lock (void) -{ -} - -ACE_Adaptive_Lock::ACE_Adaptive_Lock (void) - : lock_ (0) -{ -} - -ACE_Adaptive_Lock::~ACE_Adaptive_Lock (void) -{ -} - -int -ACE_Adaptive_Lock::remove (void) -{ - return this->lock_->remove (); -} - -int -ACE_Adaptive_Lock::acquire (void) -{ - return this->lock_->acquire (); -} - -int -ACE_Adaptive_Lock::tryacquire (void) -{ - return this->lock_->tryacquire (); -} - -int -ACE_Adaptive_Lock::release (void) -{ - return this->lock_->release (); -} - -int -ACE_Adaptive_Lock::acquire_read (void) -{ - return this->lock_->acquire_read (); -} - -int -ACE_Adaptive_Lock::acquire_write (void) -{ - return this->lock_->acquire_write (); -} - -int -ACE_Adaptive_Lock::tryacquire_read (void) -{ - return this->lock_->tryacquire_read (); -} - -int -ACE_Adaptive_Lock::tryacquire_write (void) -{ - return this->lock_->tryacquire_write (); -} - -int -ACE_Adaptive_Lock::tryacquire_write_upgrade (void) -{ - return this->lock_->tryacquire_write_upgrade (); -} - -void -ACE_Adaptive_Lock::dump (void) const -{ - // return this->lock_->dump (); -} - -ACE_TSS_Adapter::ACE_TSS_Adapter (void *object, ACE_THR_DEST f) - : ts_obj_ (object), - func_ (f) -{ - // ACE_TRACE ("ACE_TSS_Adapter::ACE_TSS_Adapter"); -} - -void -ACE_TSS_Adapter::cleanup (void) -{ - // ACE_TRACE ("ACE_TSS_Adapter::cleanup"); - (*this->func_)(this->ts_obj_); // call cleanup routine for ts_obj_ -} - -extern "C" void -ACE_TSS_C_cleanup (void *object) -{ - // ACE_TRACE ("ACE_TSS_C_cleanup"); - if (object != 0) - { - ACE_TSS_Adapter *tss_adapter = (ACE_TSS_Adapter *) object; - // Perform cleanup on the real TS object. - tss_adapter->cleanup (); - // Delete the adapter object. - delete tss_adapter; - } -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Semaphore) - -void -ACE_Semaphore::dump (void) const -{ -// ACE_TRACE ("ACE_Semaphore::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Semaphore::ACE_Semaphore (u_int count, - int type, - const ACE_TCHAR *name, - void *arg, - int max) - : removed_ (0) -{ -// ACE_TRACE ("ACE_Semaphore::ACE_Semaphore"); -#if defined(ACE_LACKS_UNNAMED_SEMAPHORE) -// if the user does not provide a name, we generate a unique name here - ACE_TCHAR iname[ACE_UNIQUE_NAME_LEN]; - if (name == 0) - ACE::unique_name (this, iname, ACE_UNIQUE_NAME_LEN); - if (ACE_OS::sema_init (&this->semaphore_, count, type, - name ? name : iname, - arg, max) != 0) -#else - if (ACE_OS::sema_init (&this->semaphore_, count, type, - name, arg, max) != 0) -#endif - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Semaphore::ACE_Semaphore"))); -} - -ACE_Semaphore::~ACE_Semaphore (void) -{ -// ACE_TRACE ("ACE_Semaphore::~ACE_Semaphore"); - - this->remove (); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Mutex) - -void -ACE_Mutex::dump (void) const -{ -// ACE_TRACE ("ACE_Mutex::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); -#if defined (CHORUS) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lockname_ = %s\n"), this->lockname_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("process_lock_ = %x\n"), this->process_lock_)); -#endif /* CHORUS */ - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, - ACE_mutexattr_t *arg, mode_t mode) - : -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) - process_lock_ (0), - lockname_ (0), -#endif /* CHORUS */ - removed_ (0) -{ - // ACE_TRACE ("ACE_Mutex::ACE_Mutex"); - - // These platforms need process-wide mutex to be in shared memory. -#if defined (CHORUS) || defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) - if (type == USYNC_PROCESS) - { - // Let's see if the shared memory entity already exists. - ACE_HANDLE fd = ACE_OS::shm_open (name, O_RDWR | O_CREAT | O_EXCL, mode); - if (fd == ACE_INVALID_HANDLE) - { - if (errno == EEXIST) - fd = ACE_OS::shm_open (name, O_RDWR | O_CREAT, mode); - else - return; - } - else - { - // We own this shared memory object! Let's set its size. - if (ACE_OS::ftruncate (fd, - sizeof (ACE_mutex_t)) == -1) - { - ACE_OS::close (fd); - return; - } - this->lockname_ = ACE_OS::strdup (name); - if (this->lockname_ == 0) - { - ACE_OS::close (fd); - return; - } - } - - this->process_lock_ = - (ACE_mutex_t *) ACE_OS::mmap (0, - sizeof (ACE_mutex_t), - PROT_RDWR, - MAP_SHARED, - fd, - 0); - ACE_OS::close (fd); - if (this->process_lock_ == MAP_FAILED) - return; - - if (this->lockname_ - && ACE_OS::mutex_init (this->process_lock_, - type, - name, - arg) != 0) - return; - } - // It is ok to fall through into the below if the - // USYNC_PROCESS flag is not enabled. -#else - ACE_UNUSED_ARG (mode); -#endif /* CHORUS */ - - if (ACE_OS::mutex_init (&this->lock_, - type, - name, - arg) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Mutex::ACE_Mutex"))); -} - -ACE_Mutex::~ACE_Mutex (void) -{ -// ACE_TRACE ("ACE_Mutex::~ACE_Mutex"); - this->remove (); -} - -ACE_Event::ACE_Event (int manual_reset, - int initial_state, - int type, - const ACE_TCHAR *name, - void *arg) - : removed_ (0) -{ - if (ACE_OS::event_init (&this->handle_, - manual_reset, - initial_state, - type, - name, - arg) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Event::ACE_Event"))); -} - -ACE_Event::~ACE_Event (void) -{ - this->remove (); -} - -int -ACE_Event::remove (void) -{ - int result = 0; - if (this->removed_ == 0) - { - this->removed_ = 1; - result = ACE_OS::event_destroy (&this->handle_); - } - return result; -} - -ACE_event_t -ACE_Event::handle (void) const -{ - return this->handle_; -} - -void -ACE_Event::handle (ACE_event_t new_handle) -{ - this->handle_ = new_handle; -} - -int -ACE_Event::wait (void) -{ - return ACE_OS::event_wait (&this->handle_); -} - -int -ACE_Event::wait (const ACE_Time_Value *abstime, int use_absolute_time) -{ - return ACE_OS::event_timedwait (&this->handle_, - (ACE_Time_Value *) abstime, - use_absolute_time); -} - -int -ACE_Event::signal (void) -{ - return ACE_OS::event_signal (&this->handle_); -} - -int -ACE_Event::pulse (void) -{ - return ACE_OS::event_pulse (&this->handle_); -} - -int -ACE_Event::reset (void) -{ - return ACE_OS::event_reset (&this->handle_); -} - -void -ACE_Event::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Manual_Event::ACE_Manual_Event (int initial_state, - int type, - const char *name, - void *arg) - : ACE_Event (1, - initial_state, - type, - ACE_TEXT_CHAR_TO_TCHAR (name), - arg) -{ -} - -#if defined (ACE_HAS_WCHAR) -ACE_Manual_Event::ACE_Manual_Event (int initial_state, - int type, - const wchar_t *name, - void *arg) - : ACE_Event (1, - initial_state, - type, - ACE_TEXT_WCHAR_TO_TCHAR (name), - arg) -{ -} -#endif /* ACE_HAS_WCHAR */ - -void -ACE_Manual_Event::dump (void) const -{ - ACE_Event::dump (); -} - -ACE_Auto_Event::ACE_Auto_Event (int initial_state, - int type, - const char *name, - void *arg) - : ACE_Event (0, - initial_state, - type, - ACE_TEXT_CHAR_TO_TCHAR (name), - arg) -{ -} - -#if defined (ACE_HAS_WCHAR) -ACE_Auto_Event::ACE_Auto_Event (int initial_state, - int type, - const wchar_t *name, - void *arg) - : ACE_Event (0, - initial_state, - type, - ACE_TEXT_WCHAR_TO_TCHAR (name), - arg) -{ -} -#endif /* ACE_HAS_WCHAR */ - -void -ACE_Auto_Event::dump (void) const -{ - ACE_Event::dump (); -} - -#if defined (ACE_HAS_THREADS) - -ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Mutex_Guard) - -void -ACE_Thread_Semaphore::dump (void) const -{ -// ACE_TRACE ("ACE_Thread_Semaphore::dump"); - - ACE_Semaphore::dump (); -} - -ACE_Thread_Semaphore::ACE_Thread_Semaphore (u_int count, - const ACE_TCHAR *name, - void *arg, - int max) - : ACE_Semaphore (count, USYNC_THREAD, name, arg, max) -{ -// ACE_TRACE ("ACE_Thread_Semaphore::ACE_Thread_Semaphore"); -} - -#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES) -void -ACE_Thread_Mutex_Guard::dump (void) const -{ -// ACE_TRACE ("ACE_Thread_Mutex_Guard::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} -#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ - -ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_TCHAR *name, - ACE_mutexattr_t *arg) - : removed_ (0) -{ - // ACE_TRACE ("ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex"); -#if defined (ACE_HAS_FSU_PTHREADS) && ! defined (ACE_WIN32) - // Initialize FSU pthreads package. If called more than once, - // pthread_init does nothing and so does no harm. - pthread_init (); -#endif /* ACE_HAS_FSU_PTHREADS && ! ACE_WIN32 */ - if (ACE_OS::recursive_mutex_init (&this->recursive_mutex_, - name, - arg) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("recursive_mutex_init"))); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Recursive_Thread_Mutex) - -ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex (void) -{ - // ACE_TRACE ("ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex"); - this->remove (); -} - -int -ACE_Recursive_Thread_Mutex::remove (void) -{ -// ACE_TRACE ("ACE_Recursive_Thread_Mutex::remove"); - int result = 0; - if (this->removed_ == 0) - { - this->removed_ = 1; - result = ACE_OS::recursive_mutex_destroy (&this->recursive_mutex_); - } - return result; -} - -// The counter part of the following two functions for Win32 are -// located in file Synch.i -ACE_thread_t -ACE_Recursive_Thread_Mutex::get_thread_id (void) -{ - // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_thread_id"); -#if defined (ACE_HAS_RECURSIVE_MUTEXES) - // @@ The structure CriticalSection in Win32 doesn't hold the thread - // handle of the thread that owns the lock. However it is still not - // clear at this point how to translate a thread handle to its - // corresponding thread id. - errno = ENOTSUP; - return ACE_OS::NULL_thread; -#else - ACE_thread_t owner_id; - ACE_OS::mutex_lock (&this->recursive_mutex_.nesting_mutex_); - owner_id = this->recursive_mutex_.owner_id_; - ACE_OS::mutex_unlock (&this->recursive_mutex_.nesting_mutex_); - return owner_id; -#endif /* ACE_WIN32 */ -} - -int -ACE_Recursive_Thread_Mutex::get_nesting_level (void) -{ - // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level"); -#if defined (ACE_HAS_WINCE) || defined (VXWORKS) || defined (ACE_PSOS) - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_HAS_RECURSIVE_MUTEXES) -# if defined (ACE_WIN32) - // This is really a Win32-ism... - return this->recursive_mutex_.RecursionCount; -# else - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_RECURSIVE_MUTEXES */ -#else - int nesting_level = 0; - ACE_OS::mutex_lock (&this->recursive_mutex_.nesting_mutex_); - nesting_level = this->recursive_mutex_.nesting_level_; - ACE_OS::mutex_unlock (&this->recursive_mutex_.nesting_mutex_); - return nesting_level; -#endif /* !ACE_HAS_WINCE */ -} - -ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &) -{ -} - -int -ACE_Recursive_Thread_Mutex::acquire (void) -{ - return ACE_OS::recursive_mutex_lock (&this->recursive_mutex_); -} - -int -ACE_Recursive_Thread_Mutex::release (void) -{ - return ACE_OS::recursive_mutex_unlock (&this->recursive_mutex_); -} - -int -ACE_Recursive_Thread_Mutex::tryacquire (void) -{ - return ACE_OS::recursive_mutex_trylock (&this->recursive_mutex_); -} - -void -ACE_Recursive_Thread_Mutex::dump (void) const -{ -// ACE_TRACE ("ACE_Recursive_Thread_Mutex::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Condition_Thread_Mutex) - -void -ACE_Condition_Thread_Mutex::dump (void) const -{ -// ACE_TRACE ("ACE_Condition_Thread_Mutex::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); -#if defined (ACE_WIN32) - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("waiters = %d\n"), - this->cond_.waiters ())); -#endif /* ACE_WIN32 */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex &m, - const ACE_TCHAR *name, - void *arg) - : mutex_ ((ACE_Thread_Mutex &) m), - removed_ (0) -{ -#if defined (ACE_HAS_FSU_PTHREADS) -// Initialize FSU pthreads package. -// If called more than once, pthread_init does nothing -// and so does no harm. - pthread_init (); -#endif /* ACE_HAS_FSU_PTHREADS */ - -// ACE_TRACE ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"); - if (ACE_OS::cond_init (&this->cond_, - (short) USYNC_THREAD, - name, - arg) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); -} - -ACE_Condition_Thread_Mutex:: -ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex &m, - ACE_Condition_Attributes &attributes, - const ACE_TCHAR *name, - void *arg) - : mutex_ ((ACE_Thread_Mutex &) m), - removed_ (0) -{ -#if defined (ACE_HAS_FSU_PTHREADS) -// Initialize FSU pthreads package. -// If called more than once, pthread_init does nothing -// and so does no harm. - pthread_init (); -#endif /* ACE_HAS_FSU_PTHREADS */ - -// ACE_TRACE ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"); - if (ACE_OS::cond_init (&this->cond_, attributes.attributes_, - name, arg) != 0) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); -} - -ACE_Condition_Thread_Mutex::~ACE_Condition_Thread_Mutex (void) -{ -// ACE_TRACE ("ACE_Condition_Thread_Mutex::~ACE_Condition_Thread_Mutex"); - this->remove (); -} - -// Peform an "alertable" timed wait. If the argument == 0 -// then we do a regular , else we do a timed wait for up to -// using the function. - -int -ACE_Condition_Thread_Mutex::wait (void) -{ -// ACE_TRACE ("ACE_Condition_Thread_Mutex::wait"); - return ACE_OS::cond_wait (&this->cond_, &this->mutex_.lock_); -} - -int -ACE_Condition_Thread_Mutex::wait (ACE_Thread_Mutex &mutex, - const ACE_Time_Value *abstime) -{ -// ACE_TRACE ("ACE_Condition_Thread_Mutex::wait"); - return ACE_OS::cond_timedwait (&this->cond_, - &mutex.lock_, - (ACE_Time_Value *) abstime); -} - -int -ACE_Condition_Thread_Mutex::wait (const ACE_Time_Value *abstime) -{ -// ACE_TRACE ("ACE_Condition_Thread_Mutex::wait"); - return this->wait (this->mutex_, abstime); -} - -int -ACE_Condition_Thread_Mutex::signal (void) -{ -// ACE_TRACE ("ACE_Condition_Thread_Mutex::signal"); - return ACE_OS::cond_signal (&this->cond_); -} - -int -ACE_Condition_Thread_Mutex::broadcast (void) -{ -// ACE_TRACE ("ACE_Condition_Thread_Mutex::broadcast"); - return ACE_OS::cond_broadcast (&this->cond_); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Sub_Barrier) - -void -ACE_Sub_Barrier::dump (void) const -{ -// ACE_TRACE ("ACE_Sub_Barrier::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->barrier_finished_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("running_threads_ = %d"), this->running_threads_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Sub_Barrier::ACE_Sub_Barrier (u_int count, - ACE_Thread_Mutex &lock, - const ACE_TCHAR *name, - void *arg) - : barrier_finished_ (lock, name, arg), - running_threads_ (count) -{ -// ACE_TRACE ("ACE_Sub_Barrier::ACE_Sub_Barrier"); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Barrier) -ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Barrier) -ACE_ALLOC_HOOK_DEFINE(ACE_Process_Barrier) - -void -ACE_Barrier::dump (void) const -{ -// ACE_TRACE ("ACE_Barrier::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_generation_ = %d"), this->current_generation_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncount_ = %d"), this->count_)); - this->sub_barrier_1_.dump (); - this->sub_barrier_2_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Barrier::ACE_Barrier (u_int count, - const ACE_TCHAR *name, - void *arg) - : lock_ (name, (ACE_mutexattr_t *) arg), - current_generation_ (0), - count_ (count), - sub_barrier_1_ (count, lock_, name, arg), - sub_barrier_2_ (count, lock_, name, arg) -{ -// ACE_TRACE ("ACE_Barrier::ACE_Barrier"); - this->sub_barrier_[0] = &this->sub_barrier_1_; - this->sub_barrier_[1] = &this->sub_barrier_2_; -} - -int -ACE_Barrier::wait (void) -{ -// ACE_TRACE ("ACE_Barrier::wait"); - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1); - - ACE_Sub_Barrier *sbp = - this->sub_barrier_[this->current_generation_]; - - // Check for shutdown... - if (sbp == 0) - return -1; - - if (sbp->running_threads_ == 1) - { - // We're the last running thread, so swap generations and tell - // all the threads waiting on the barrier to continue on their - // way. - - sbp->running_threads_ = this->count_; - // Swap generations. - this->current_generation_ = 1 - this->current_generation_; - sbp->barrier_finished_.broadcast (); - } - else - { - --sbp->running_threads_; - - // Block until all the other threads wait(). - while (sbp->running_threads_ != this->count_) - sbp->barrier_finished_.wait (); - } - - return 0; -} - -ACE_Thread_Barrier::ACE_Thread_Barrier (u_int count, const ACE_TCHAR *name) - : ACE_Barrier (count, name) -{ -// ACE_TRACE ("ACE_Thread_Barrier::ACE_Thread_Barrier"); -} - -void -ACE_Thread_Barrier::dump (void) const -{ -// ACE_TRACE ("ACE_Thread_Barrier::dump"); - ACE_Barrier::dump (); -} - -#if 0 -ACE_Process_Barrier::ACE_Process_Barrier (u_int count, const ACE_TCHAR *name) - : ACE_Barrier (count, USYNC_PROCESS, name) -{ -// ACE_TRACE ("ACE_Process_Barrier::ACE_Process_Barrier"); -} - -void -ACE_Process_Barrier::dump (void) const -{ -// ACE_TRACE ("ACE_Process_Barrier::dump"); - ACE_Barrier::dump (); -} - -template void -ACE_Process_Condition::dump (void) const -{ -// ACE_TRACE ("ACE_Process_Condition::dump"); - - ACE_Condition::dump (); -} - -template -ACE_Process_Condition::ACE_Process_Condition (MUTEX &m, - const ACE_TCHAR *name, - void *arg) - : ACE_Condition (m, USYNC_PROCESS, name, arg) -{ -// ACE_TRACE ("ACE_Process_Condition::ACE_Process_Condition"); -} -#endif /* 0 */ - -ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Mutex) - -void -ACE_Thread_Mutex::dump (void) const -{ -// ACE_TRACE ("ACE_Thread_Mutex::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Thread_Mutex::~ACE_Thread_Mutex (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::~ACE_Thread_Mutex"); - this->remove (); -} - -ACE_Thread_Mutex::ACE_Thread_Mutex (const ACE_TCHAR *name, ACE_mutexattr_t *arg) - : removed_ (0) -{ -// ACE_TRACE ("ACE_Thread_Mutex::ACE_Thread_Mutex"); - - if (ACE_OS::thread_mutex_init (&this->lock_, - USYNC_THREAD, - name, - arg) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Thread_Mutex::ACE_Thread_Mutex"))); -} - -void -ACE_RW_Mutex::dump (void) const -{ -// ACE_TRACE ("ACE_RW_Mutex::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_RW_Mutex::ACE_RW_Mutex (int type, const ACE_TCHAR *name, void *arg) - : removed_ (0) -{ -// ACE_TRACE ("ACE_RW_Mutex::ACE_RW_Mutex"); - if (ACE_OS::rwlock_init (&this->lock_, type, name, arg) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_RW_Mutex::ACE_RW_Mutex"))); -} - -ACE_RW_Mutex::~ACE_RW_Mutex (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::~ACE_RW_Mutex"); - this->remove (); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_RW_Thread_Mutex) - -ACE_RW_Thread_Mutex::ACE_RW_Thread_Mutex (const ACE_TCHAR *name, - void *arg) - : ACE_RW_Mutex (USYNC_THREAD, name, arg) -{ -// ACE_TRACE ("ACE_RW_Thread_Mutex::ACE_RW_Thread_Mutex"); -} - -void -ACE_RW_Thread_Mutex::dump (void) const -{ -// ACE_TRACE ("ACE_RW_Thread_Mutex::dump"); - ACE_RW_Mutex::dump (); -} - - -//ACE_TEMPLATE_METHOD_SPECIALIZATION -int -ACE_Condition::remove (void) -{ - return ACE_OS::cond_destroy (&this->cond_); -} - -void -ACE_Condition::dump (void) const -{ -// ACE_TRACE ("ACE_Condition::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - // No dump method for ACE_cond_t even in emulated mode. - // cond_.dump (); - this->mutex_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -//ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_Condition::~ACE_Condition (void) -{ - this->remove (); -} - -//ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_Condition::ACE_Condition (ACE_Recursive_Thread_Mutex &m) - : mutex_ (m) -{ - ACE_OS::cond_init (&this->cond_); -} - -//ACE_TEMPLATE_METHOD_SPECIALIZATION -int -ACE_Condition::wait (const ACE_Time_Value *abstime) -{ - return this->wait (this->mutex_, abstime); -} - -//ACE_TEMPLATE_METHOD_SPECIALIZATION -int -ACE_Condition::wait (ACE_Recursive_Thread_Mutex &mutex, - const ACE_Time_Value *abstime) -{ - ACE_recursive_mutex_state mutex_state_holder; - ACE_recursive_thread_mutex_t &recursive_mutex = mutex.mutex (); - - if (ACE_OS::recursive_mutex_cond_unlock (&recursive_mutex, - mutex_state_holder) == -1) - return -1; - - // We wait on the condition, specifying the nesting mutex. For platforms - // with ACE_HAS_RECURSIVE_MUTEXES, this is the recursive mutex itself, - // and is the same as recursive_mutex, above. The caller should have been - // holding the lock on entry to this method, and it is still held. - // For other platforms, this is the nesting mutex that guards the - // ACE_recursive_mutex_t internals, and recursive_mutex_cond_unlock() - // returned with the lock held, but waiters primed and waiting to be - // released. At cond_wait below, the mutex will be released. - // On return, it will be reacquired. - const int result = abstime == 0 - ? ACE_OS::cond_wait (&this->cond_, - &mutex.get_nesting_mutex ()) - : ACE_OS::cond_timedwait (&this->cond_, - &mutex.get_nesting_mutex (), - (ACE_Time_Value *) abstime); - // We are holding the mutex, whether the wait succeeded or failed. - // Stash errno (in case it failed) and then we need to reset the - // recursive mutex state to what it was on entry to this method. - // Resetting it may require a wait for another thread to release - // the ACE_recursive_thread_mutex_t if this is a platform without - // ACE_HAS_RECURSIVE_MUTEXES, and recursive_mutex_cond_relock() takes - // care of that. - { - ACE_Errno_Guard error (errno); - ACE_OS::recursive_mutex_cond_relock (&recursive_mutex, - mutex_state_holder); - } - - return result; -} - -//ACE_TEMPLATE_METHOD_SPECIALIZATION -int -ACE_Condition::signal (void) -{ - return ACE_OS::cond_signal (&this->cond_); -} - -//ACE_TEMPLATE_METHOD_SPECIALIZATION -int -ACE_Condition::broadcast (void) -{ - return ACE_OS::cond_broadcast (&this->cond_); -} - -//ACE_TEMPLATE_METHOD_SPECIALIZATION -ACE_Recursive_Thread_Mutex & -ACE_Condition::mutex (void) -{ - return this->mutex_; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -// These are only instantiated with ACE_HAS_THREADS. -template class ACE_Guard; -template class ACE_Guard; -template class ACE_Read_Guard; -template class ACE_Read_Guard; -template class ACE_Write_Guard; -template class ACE_Write_Guard; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -// These are only instantiated with ACE_HAS_THREADS. -#pragma instantiate ACE_Guard -#pragma instantiate ACE_Guard -#pragma instantiate ACE_Read_Guard -#pragma instantiate ACE_Read_Guard -#pragma instantiate ACE_Write_Guard -#pragma instantiate ACE_Write_Guard -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_HAS_THREADS */ -#endif /* ACE_SYNCH_C */ diff --git a/ace/Synch.h b/ace/Synch.h deleted file mode 100644 index 9ffdae37683..00000000000 --- a/ace/Synch.h +++ /dev/null @@ -1,1864 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file Synch.h - * - * $Id$ - * - * Wrapper Facades for various synchronization mechanisms. - * - * @author Douglas C. Schmidt - */ -//========================================================================== - -#ifndef ACE_SYNCH_H -#define ACE_SYNCH_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - - -/** - * @class ACE_Lock - * - * @brief This is the abstract base class that contains the uniform - * locking API that is supported by all the ACE synchronization - * mechanisms. - * - * This class is typically used in conjunction with the - * in order to provide a polymorphic - * interface to the ACE synchronization mechanisms (e.g., - * , , , etc). Note that - * the reason that all of ACE doesn't use polymorphic locks is - * that (1) they add ~20% extra overhead for virtual function - * calls and (2) objects with virtual functions can't be placed - * into shared memory. - */ -class ACE_Export ACE_Lock -{ -public: - /// CE needs a default ctor here. - ACE_Lock (void); - - /// Noop virtual destructor - virtual ~ACE_Lock (void); - - /** - * Explicitly destroy the lock. Note that only one thread should - * call this method since it doesn't protect against race - * conditions. - */ - virtual int remove (void) = 0; - - /// Block the thread until the lock is acquired. Returns -1 on - /// failure. - virtual int acquire (void) = 0; - - /** - * Conditionally acquire the lock (i.e., won't block). Returns -1 - * on failure. If we "failed" because someone else already had the - * lock, is set to . - */ - virtual int tryacquire (void) = 0; - - /// Release the lock. Returns -1 on failure. - virtual int release (void) = 0; - - /** - * Block until the thread acquires a read lock. If the locking - * mechanism doesn't support read locks then this just calls - * . Returns -1 on failure. - */ - virtual int acquire_read (void) = 0; - - /** - * Block until the thread acquires a write lock. If the locking - * mechanism doesn't support read locks then this just calls - * . Returns -1 on failure. - */ - virtual int acquire_write (void) = 0; - - /** - * Conditionally acquire a read lock. If the locking mechanism - * doesn't support read locks then this just calls . - * Returns -1 on failure. If we "failed" because someone else - * already had the lock, is set to . - */ - virtual int tryacquire_read (void) = 0; - - /** - * Conditionally acquire a write lock. If the locking mechanism - * doesn't support read locks then this just calls . - * Returns -1 on failure. If we "failed" because someone else - * already had the lock, is set to . - */ - virtual int tryacquire_write (void) = 0; - - /** - * Conditionally try to upgrade a lock held for read to a write lock. - * If the locking mechanism doesn't support read locks then this just - * calls . Returns 0 on success, -1 on failure. - */ - virtual int tryacquire_write_upgrade (void) = 0; -}; - -/** - * @class ACE_Adaptive_Lock - * - * @brief An adaptive general locking class that defers the decision of - * lock type to run time. - * - * This class, as ACE_Lock, provide a set of general locking APIs. - * However, it defers our decision of what kind of lock to use - * to the run time and delegates all locking operations to the actual - * lock. Users must define a constructor in their subclass to - * initialize . - */ -class ACE_Export ACE_Adaptive_Lock : public ACE_Lock -{ -public: - /// You must also override the destructor function to match with how - /// you construct the underneath . - virtual ~ACE_Adaptive_Lock (void); - - // = Lock/unlock operations. - - virtual int remove (void); - virtual int acquire (void); - virtual int tryacquire (void); - virtual int release (void); - virtual int acquire_read (void); - virtual int acquire_write (void); - virtual int tryacquire_read (void); - virtual int tryacquire_write (void); - virtual int tryacquire_write_upgrade (void); - void dump (void) const; - -protected: - /** - * Create and initialize create the actual lcok used in the class. - * The default constructor simply set the to 0 (null). You - * must overwrite this method for this class to work. - */ - ACE_Adaptive_Lock (void); - - ACE_Lock *lock_; -}; - -/** - * @class ACE_Semaphore - * - * @brief Wrapper for Dijkstra style general semaphores. - */ -class ACE_Export ACE_Semaphore -{ -public: - // = Initialization and termination. - /// Initialize the semaphore, with initial value of "count". - ACE_Semaphore (u_int count = 1, // By default make this unlocked. - int type = USYNC_THREAD, - const ACE_TCHAR *name = 0, - void * = 0, - int max = 0x7fffffff); - - /// Implicitly destroy the semaphore. - ~ACE_Semaphore (void); - - /** - * Explicitly destroy the semaphore. Note that only one thread - * should call this method since it doesn't protect against race - * conditions. - */ - int remove (void); - - /// Block the thread until the semaphore count becomes - /// greater than 0, then decrement it. - int acquire (void); - - /** - * Block the thread until the semaphore count becomes greater than 0 - * (at which point it is decremented) or until times out (in - * which case -1 is returned and == ). Note that - * is assumed to be in "absolute" rather than "relative" time. The - * value of is updated upon return to show the actual - * (absolute) acquisition time. - * - * NOTE: Solaris threads do not support timed semaphores. - * Therefore, if you're running on Solaris you might want to - * consider using the ACE POSIX pthreads implementation instead, - * which can be enabled by compiling ACE with - * -DACE_HAS_PTHREADS, rather than -DACE_HAS_STHREADS or - * -DACE_HAS_POSIX_SEM. */ - int acquire (ACE_Time_Value &tv); - - /** - * If == 0 then call directly. Otherwise, Block - * the thread until the semaphore count becomes greater than 0 - * (at which point it is decremented) or until times out (in - * which case -1 is returned and == ). Note that - * <*tv> is assumed to be in "absolute" rather than "relative" time. - * The value of <*tv> is updated upon return to show the actual - * (absolute) acquisition time. - * - * NOTE: Solaris threads do not support timed semaphores. - * Therefore, if you're running on Solaris you might want to - * consider using the ACE POSIX pthreads implementation instead, - * which can be enabled by compiling ACE with - * -DACE_HAS_PTHREADS, rather than -DACE_HAS_STHREADS or - * -DACE_HAS_POSIX_SEM. */ - int acquire (ACE_Time_Value *tv); - - /** - * Conditionally decrement the semaphore if count is greater than 0 - * (i.e., won't block). Returns -1 on failure. If we "failed" - * because someone else already had the lock, is set to - * . - */ - int tryacquire (void); - - /// Increment the semaphore by 1, potentially unblocking a waiting - /// thread. - int release (void); - - /// Increment the semaphore by , potentially - /// unblocking waiting threads. - int release (u_int release_count); - - /** - * Acquire semaphore ownership. This calls and is only - * here to make the interface consistent with the - * other synchronization APIs. - */ - int acquire_read (void); - - /** - * Acquire semaphore ownership. This calls and is only - * here to make the interface consistent with the - * other synchronization APIs. - */ - int acquire_write (void); - - /** - * Conditionally acquire semaphore (i.e., won't block). This calls - * and is only here to make the - * interface consistent with the other synchronization APIs. - * Returns -1 on failure. If we "failed" because someone else - * already had the lock, is set to . - */ - int tryacquire_read (void); - - /** - * Conditionally acquire semaphore (i.e., won't block). This calls - * and is only here to make the - * interface consistent with the other synchronization APIs. - * Returns -1 on failure. If we "failed" because someone else - * already had the lock, is set to . - */ - int tryacquire_write (void); - - /** - * This is only here to make the - * interface consistent with the other synchronization APIs. - * Assumes the caller has already acquired the semaphore using one of - * the above calls, and returns 0 (success) always. - */ - int tryacquire_write_upgrade (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /// Return the underlying lock. - const ACE_sema_t &lock (void) const; - -protected: - ACE_sema_t semaphore_; - - /// Keeps track of whether has been called yet to avoid - /// multiple calls, e.g., explicitly and implicitly in the - /// destructor. This flag isn't protected by a lock, so make sure - /// that you don't have multiple threads simultaneously calling - /// on the same object, which is a bad idea anyway... - int removed_; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Semaphore &); - ACE_Semaphore (const ACE_Semaphore &); -}; - -/** - * @class ACE_Null_Semaphore - * - * @brief Implement a do nothing , i.e., all the methods are - * no ops. - * - * Although the methods are no-ops, the return values are different for - * the blocking as opposed to timed acquires. The blocking version of - * acquire() is often used to serialize access to a critical section, - * whereas the timed version is often used to wait for another thread - * to update some condition or change some shared state. When using an - * ACE_Null_Semaphore, however, there's no other thread involved to - * change a state or condition (otherwise, a null semaphore would be - * inappropriate). Returning an error value signifies that the - * state or condition has not been (and can't be) changed, which is - * consistent with the behavior of the threaded case where a timeout - * occurs before the state or condition is changed. - */ -class ACE_Export ACE_Null_Semaphore -{ -public: - ACE_Null_Semaphore (u_int count = 1, // By default make this unlocked. - int type = USYNC_THREAD, - const ACE_TCHAR *name = 0, - void * = 0, - int max = 0x7fffffff); - ~ACE_Null_Semaphore (void); - /// Return 0. - int remove (void); - - /// Return 0. - int acquire (void); - - /// Return -1 with == . - int acquire (ACE_Time_Value &); - - /// Return -1 with == . - int acquire (ACE_Time_Value *); - - /// Return 0. - int tryacquire (void); - - /// Return 0. - int release (void); - - /// Return 0. - int release (size_t); - - /// Return 0. - int acquire_write (void); - - /// Return 0. - int tryacquire_write (void); - - /// Return 0. - int tryacquire_write_upgrade (void); - - /// Return 0. - int acquire_read (void); - - /// Return 0. - int tryacquire_read (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -/** - * @class ACE_RW_Mutex - * - * @brief Wrapper for readers/writer locks. - * - * These are most useful for applications that have many more - * parallel readers than writers... - */ -class ACE_Export ACE_RW_Mutex -{ -public: - /// Initialize a readers/writer lock. - ACE_RW_Mutex (int type = USYNC_THREAD, - const ACE_TCHAR *name = 0, - void *arg = 0); - - /// Implicitly destroy a readers/writer lock - ~ACE_RW_Mutex (void); - - /** - * Explicitly destroy a readers/writer lock. Note that only one - * thread should call this method since it doesn't protect against - * race conditions. - */ - int remove (void); - - /// Acquire a read lock, but block if a writer hold the lock. - int acquire_read (void); - - /// Acquire a write lock, but block if any readers or a - /// writer hold the lock. - int acquire_write (void); - - /** - * Conditionally acquire a read lock (i.e., won't block). Returns - * -1 on failure. If we "failed" because someone else already had - * the lock, is set to . - */ - int tryacquire_read (void); - - /// Conditionally acquire a write lock (i.e., won't block). - int tryacquire_write (void); - - /** - * Conditionally upgrade a read lock to a write lock. This only - * works if there are no other readers present, in which case the - * method returns 0. Otherwise, the method returns -1 and sets - * to . Note that the caller of this method *must* - * already possess this lock as a read lock (but this condition is - * not checked by the current implementation). - */ - int tryacquire_write_upgrade (void); - - /** - * Note, for interface uniformity with other synchronization - * wrappers we include the method. This is implemented as - * a write-lock to safe... - */ - int acquire (void); - - /** - * Note, for interface uniformity with other synchronization - * wrappers we include the method. This is implemented - * as a write-lock to be safe... Returns -1 on failure. If we - * "failed" because someone else already had the lock, is - * set to . - */ - int tryacquire (void); - - /// Unlock a readers/writer lock. - int release (void); - - /// Return the underlying lock. - const ACE_rwlock_t &lock (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Readers/writer lock. - ACE_rwlock_t lock_; - - /// Keeps track of whether has been called yet to avoid - /// multiple calls, e.g., explicitly and implicitly in the - /// destructor. This flag isn't protected by a lock, so make sure - /// that you don't have multiple threads simultaneously calling - /// on the same object, which is a bad idea anyway... - int removed_; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_RW_Mutex &); - ACE_RW_Mutex (const ACE_RW_Mutex &); -}; - -/** - * @class ACE_Mutex - * - * @brief wrapper (valid in same process or across - * processes (depending on TYPE flag)). - */ -class ACE_Export ACE_Mutex -{ -public: - /// Initialize the mutex. - ACE_Mutex (int type = USYNC_THREAD, - const ACE_TCHAR *name = 0, - ACE_mutexattr_t *arg = 0, - mode_t mode = ACE_DEFAULT_FILE_PERMS); - - /// Implicitly destroy the mutex. - ~ACE_Mutex (void); - - /** - * Explicitly destroy the mutex. Note that only one thread should - * call this method since it doesn't protect against race - * conditions. - */ - int remove (void); - - /// Acquire lock ownership (wait on queue if necessary). - int acquire (void); - - /** - * Block the thread until the mutex is acquired or times out, - * in which case -1 is returned and == . Note that - * is assumed to be in "absolute" rather than "relative" time. - * The value of is updated upon return to show the actual - * (absolute) acquisition time. - */ - int acquire (ACE_Time_Value &tv); - - /** - * If == 0 then call directly. Otherwise, block - * the thread until the mutex is acquired or times out, in - * which case -1 is returned and == . Note that - * <*tv> is assumed to be in "absolute" rather than "relative" time. - * The value of <*tv> is updated upon return to show the actual - * (absolute) acquisition time. */ - int acquire (ACE_Time_Value *tv); - - /** - * Conditionally acquire lock (i.e., don't wait on queue). Returns - * -1 on failure. If we "failed" because someone else already had - * the lock, is set to . - */ - int tryacquire (void); - - /// Release lock and unblock a thread at head of queue. - int release (void); - - /** - * Acquire mutex ownership. This calls and is only - * here to make the interface consistent with the - * other synchronization APIs. - */ - int acquire_read (void); - - /** - * Acquire mutex ownership. This calls and is only - * here to make the interface consistent with the - * other synchronization APIs. - */ - int acquire_write (void); - - /** - * Conditionally acquire mutex (i.e., won't block). This calls - * and is only here to make the interface - * consistent with the other synchronization APIs. Returns -1 on - * failure. If we "failed" because someone else already had the - * lock, is set to . - */ - int tryacquire_read (void); - - /** - * Conditionally acquire mutex (i.e., won't block). This calls - * and is only here to make the interface - * consistent with the other synchronization APIs. Returns -1 on - * failure. If we "failed" because someone else already had the - * lock, is set to . - */ - int tryacquire_write (void); - - /** - * This is only here for consistency with the other synchronization - * APIs and usability with Lock adapters. Assumes the caller already has - * acquired the mutex and returns 0 in all cases. - */ - int tryacquire_write_upgrade (void); - - /// Return the underlying mutex. - const ACE_mutex_t &lock (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - // = This should be protected but some C++ compilers complain... -public: -#if defined (CHORUS) || defined(ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) - /// This lock resides in shared memory. - ACE_mutex_t *process_lock_; - - /** - * Remember the name of the mutex if we created it so we can unlink - * it when we go away (only the actor that initialized the memory - * can destroy it). - */ - const ACE_TCHAR *lockname_; -#endif /* CHORUS || ACE_HAS_PTHREADS */ - - /// Mutex type supported by the OS. - ACE_mutex_t lock_; - - /// Keeps track of whether has been called yet to avoid - /// multiple calls, e.g., explicitly and implicitly in the - /// destructor. This flag isn't protected by a lock, so make sure - /// that you don't have multiple threads simultaneously calling - /// on the same object, which is a bad idea anyway... - int removed_; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Mutex &); - ACE_Mutex (const ACE_Mutex &); -}; - -/** - * @class ACE_Null_Barrier - * - * @brief Implements "NULL barrier synchronization". - */ -class ACE_Export ACE_Null_Barrier -{ -public: - /// Initialize the barrier to synchronize threads. - ACE_Null_Barrier (u_int, - const char * = 0, - void * = 0); - - /// Default dtor. - ~ACE_Null_Barrier (void); - - /// Block the caller until all threads have called and - /// then allow all the caller threads to continue in parallel. - int wait (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Null_Barrier &); - ACE_Null_Barrier (const ACE_Null_Barrier &); -}; - -/** - * @class ACE_Null_Mutex - * - * @brief Implement a do nothing , i.e., all the methods are - * no ops. - */ -class ACE_Export ACE_Null_Mutex -{ -public: - ACE_Null_Mutex (const ACE_TCHAR * = 0); - ~ACE_Null_Mutex (void); - /// Return 0. - int remove (void); - - /// Return 0. - int acquire (void); - - /// Return -1 with == . - int acquire (ACE_Time_Value &timeout); - - /// Return -1 with == . - int acquire (ACE_Time_Value *timeout); - - /// Return 0. - int tryacquire (void); - - /// Return 0. - int release (void); - - /// Return 0. - int acquire_write (void); - - /// Return 0. - int tryacquire_write (void); - - /// Return 0. - int tryacquire_write_upgrade (void); - - /// Return 0. - int acquire_read (void); - - /// Return 0. - int tryacquire_read (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - int lock_; // A dummy lock. -}; - -class ACE_Export ACE_Noop_Token : public ACE_Null_Mutex -{ -public: - /// Queueing strategy - enum QUEUEING_STRATEGY - { - FIFO = -1, - LIFO = 0 - }; - - /// Get queueing strategy. - int queueing_strategy (void); - - /// Set queueing strategy. - void queueing_strategy (int queueing_strategy); - - int renew (int = 0, ACE_Time_Value * =0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -/** - * @class ACE_Null_Condition - * - * @brief Implement a do nothing variable wrapper, - * i.e., all methods are no ops. This class is necessary since - * some C++ compilers are *very* lame... - */ -class ACE_Export ACE_Null_Condition -{ -public: - ACE_Null_Condition (const ACE_Null_Mutex &m, - const ACE_TCHAR * = 0, - void * = 0); - ~ACE_Null_Condition (void); - - /// Returns 0. - int remove (void); - - /// Returns -1 with == . - int wait (const ACE_Time_Value * = 0); - - /// Returns -1 with == . - int wait (ACE_Null_Mutex &m, - const ACE_Time_Value * = 0); - - /// Returns 0. - int signal (void); - - /// Returns 0. - int broadcast (void); - ACE_Null_Mutex &mutex (void); - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -protected: - ACE_Null_Mutex &mutex_; // Reference to mutex lock. - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Null_Condition &); - ACE_Null_Condition (const ACE_Null_Condition &); -}; - -#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES) -/** - * @class ACE_Null_Mutex_Guard - * - * @brief This data structure is meant to be used within a method or - * function... It performs automatic aquisition and release of - * an ACE_Null_Mutex. - * - * This class is obsolete and should be replaced by - * ACE_Guard. - */ -class ACE_Export ACE_Null_Mutex_Guard -{ -public: - ACE_Null_Mutex_Guard (ACE_Null_Mutex &); - ~ACE_Null_Mutex_Guard (void); - int remove (void); - int locked (void); - int acquire (void); - int tryacquire (void); - int release (void); - void dump (void) const; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Null_Mutex_Guard &); - ACE_Null_Mutex_Guard (const ACE_Null_Mutex_Guard &); -}; -#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ - -/** - * @class ACE_TSS_Adapter - * - * @brief This class encapsulates a TSS object and its associated - * C++ destructor function. It is used by the ACE_TSS... - * methods (in Synch_T.cpp) in order to allow an extern - * "C" cleanup routine to be used. Needed by the "frigging" - * MVS C++ compiler. - * - * Objects of this class are stored in thread specific - * storage. ts_obj_ points to the "real" object and - * func_ is a pointer to the C++ cleanup function for ts_obj_. - */ -class ACE_Export ACE_TSS_Adapter -{ -public: - /// Initialize the adapter. - ACE_TSS_Adapter (void *object, ACE_THR_DEST f); - - /// Default dtor. - ~ACE_TSS_Adapter (void); - - /// Perform the cleanup operation. - void cleanup (void); - -//private: - - /// The real TS object. - void *ts_obj_; - - /// The real cleanup routine for ts_obj; - ACE_THR_DEST func_; -}; - -/** - * @class ACE_Event - * - * @brief A wrapper around the Win32 event locking mechanism. - * - * Portable implementation of an Event mechanism, which is native to - * Win32, but must be emulated on UNIX. All platforms support - * process-scope locking support. However, only Win32 platforms - * support global naming and system-scope locking support. - */ -class ACE_Export ACE_Event -{ -public: - /// Constructor that creates event. - ACE_Event (int manual_reset = 0, - int initial_state = 0, - int type = USYNC_THREAD, - const ACE_TCHAR *name = 0, - void *arg = 0); - - /// Implicitly destroy the event variable. - ~ACE_Event (void); - - /** - * Explicitly destroy the event variable. Note that only one thread - * should call this method since it doesn't protect against race - * conditions. - */ - int remove (void); - - /// Underlying handle to event. - ACE_event_t handle (void) const; - - /** - * Set the underlying handle to event. Note that this method assumes - * ownership of the and will close it down in . If - * you want the to stay open when is called make - * sure to call on the before closing it. You are - * responsible for the closing the existing before - * overwriting it. - */ - void handle (ACE_event_t new_handle); - - /** - * if MANUAL reset - * sleep till the event becomes signaled - * event remains signaled after wait() completes. - * else AUTO reset - * sleep till the event becomes signaled - * event resets wait() completes. - */ - int wait (void); - - /// Same as wait() above, but this one can be timed - /// is absolute time-of-day if if - /// is non-0, else it is relative time. - int wait (const ACE_Time_Value *abstime, - int use_absolute_time = 1); - - /** - * if MANUAL reset - * wake up all waiting threads - * set to signaled state - * else AUTO reset - * if no thread is waiting, set to signaled state - * if thread(s) are waiting, wake up one waiting thread and - * reset event - */ - int signal (void); - - /** - * if MANUAL reset - * wakeup all waiting threads and - * reset event - * else AUTO reset - * wakeup one waiting thread (if present) and - * reset event - */ - int pulse (void); - - /// Set to nonsignaled state. - int reset (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// The underlying handle. - ACE_event_t handle_; - - /// Keeps track of whether has been called yet to avoid - /// multiple calls, e.g., explicitly and implicitly in the - /// destructor. This flag isn't protected by a lock, so make sure - /// that you don't have multiple threads simultaneously calling - /// on the same object, which is a bad idea anyway... - int removed_; - -private: - // = Prevent copying. - ACE_Event (const ACE_Event& event); - const ACE_Event &operator= (const ACE_Event &rhs); -}; - -/** - * @class ACE_Manual_Event - * - * @brief Manual Events. - * - * Specialization of Event mechanism which wakes up all waiting - * thread on . All platforms support process-scope locking - * support. However, only Win32 platforms support global naming and - * system-scope locking support. - */ -class ACE_Export ACE_Manual_Event : public ACE_Event -{ -public: - /// constructor which will create manual event - ACE_Manual_Event (int initial_state = 0, - int type = USYNC_THREAD, - const char *name = 0, - void *arg = 0); - -#if defined (ACE_HAS_WCHAR) - /// constructor which will create manual event (wchar_t version) - ACE_Manual_Event (int initial_state, - int type, - const wchar_t *name, - void *arg = 0); -#endif /* ACE_HAS_WCHAR */ - - /// Default dtor. - ~ACE_Manual_Event (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks - ACE_ALLOC_HOOK_DECLARE; -}; - -/** - * @class ACE_Auto_Event - * - * @brief Auto Events. - * - * Specialization of Event mechanism which wakes up one waiting - * thread on . All platforms support process-scope locking - * support. However, only Win32 platforms support global naming and - * system-scope locking support. - */ -class ACE_Export ACE_Auto_Event : public ACE_Event -{ -public: - /// constructor which will create auto event - ACE_Auto_Event (int initial_state = 0, - int type = USYNC_THREAD, - const char *name = 0, - void *arg = 0); - -#if defined (ACE_HAS_WCHAR) - /// constructor which will create auto event (wchar_t version) - ACE_Auto_Event (int initial_state, - int type, - const wchar_t *name, - void *arg = 0); -#endif /* ACE_HAS_WCHAR */ - - /// Default dtor. - ~ACE_Auto_Event (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks - ACE_ALLOC_HOOK_DECLARE; -}; - -// ACE platform supports some form of threading. -#if !defined (ACE_HAS_THREADS) -/** - * @class ACE_Barrier - * - * @brief This is a no-op to make ACE "syntactically consistent." - */ -class ACE_Barrier -{ -public: - ACE_Barrier (u_int, const ACE_TCHAR * = 0, void * = 0) {} - ~ACE_Barrier (void) {} - int wait (void) { ACE_NOTSUP_RETURN (-1); } - void dump (void) const {} -}; -#else - /** - * @class ACE_Thread_Mutex - * - * @brief ACE_Thread_Mutex wrapper (only valid for threads in the same - * process). - * - * This implementation is optimized for locking threads that are - * in the same process. It maps to s on NT - * and with set to on UNIX. - * ACE_Thread_Mutex is recursive on some platforms (like - * Win32). However, on most platforms (like Solaris) it is not - * recursive. To be totally safe and portable, developers - * should use when they need a - * recursive mutex. - */ -class ACE_Export ACE_Thread_Mutex -{ - friend class ACE_Condition_Thread_Mutex; -public: - /// Constructor. - ACE_Thread_Mutex (const ACE_TCHAR *name = 0, - ACE_mutexattr_t *attributes = 0); - - /// Implicitly destroy the mutex. - ~ACE_Thread_Mutex (void); - - /** - * Explicitly destroy the mutex. Note that only one thread should - * call this method since it doesn't protect against race - * conditions. - */ - int remove (void); - - /// Acquire lock ownership (wait on queue if necessary). - int acquire (void); - - /** - * Block the thread until we acquire the mutex or until times - * out, in which case -1 is returned with == . Note - * that is assumed to be in "absolute" rather than "relative" - * time. The value of is updated upon return to show the - * actual (absolute) acquisition time. - */ - int acquire (ACE_Time_Value &tv); - - /** - * If == 0 the call directly. Otherwise, Block the - * thread until we acquire the mutex or until times out, in - * which case -1 is returned with == . Note that - * <*tv> is assumed to be in "absolute" rather than "relative" time. - * The value of <*tv> is updated upon return to show the actual - * (absolute) acquisition time. - */ - int acquire (ACE_Time_Value *tv); - - /** - * Conditionally acquire lock (i.e., don't wait on queue). Returns - * -1 on failure. If we "failed" because someone else already had - * the lock, is set to . - */ - int tryacquire (void); - - /// Release lock and unblock a thread at head of queue. - int release (void); - - /** - * Acquire mutex ownership. This calls and is only here - * to make the interface consistent with the - * other synchronization APIs. - */ - int acquire_read (void); - - /** - * Acquire mutex ownership. This calls and is only here - * to make the interface consistent with the - * other synchronization APIs. - */ - int acquire_write (void); - - /** - * Conditionally acquire mutex (i.e., won't block). This calls - * and is only here to make the - * interface consistent with the other synchronization APIs. - * Returns -1 on failure. If we "failed" because someone else - * already had the lock, is set to . - */ - int tryacquire_read (void); - - /** - * Conditionally acquire mutex (i.e., won't block). This calls - * and is only here to make the - * interface consistent with the other synchronization APIs. - * Returns -1 on failure. If we "failed" because someone else - * already had the lock, is set to . - */ - int tryacquire_write (void); - - /** - * This is only here to make the - * interface consistent with the other synchronization APIs. - * Assumes the caller has already acquired the mutex using one of - * the above calls, and returns 0 (success) always. - */ - int tryacquire_write_upgrade (void); - - /// Return the underlying mutex. - const ACE_thread_mutex_t &lock (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - // protected: - /// Mutex type that supports single-process locking efficiently. - ACE_thread_mutex_t lock_; - - /// Keeps track of whether has been called yet to avoid - /// multiple calls, e.g., explicitly and implicitly in the - /// destructor. This flag isn't protected by a lock, so make sure - /// that you don't have multiple threads simultaneously calling - /// on the same object, which is a bad idea anyway... - int removed_; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Thread_Mutex &); - ACE_Thread_Mutex (const ACE_Thread_Mutex &); -}; - -#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES) -/** - * @class ACE_Thread_Mutex_Guard - * - * @brief This data structure is meant to be used within a method or - * function... It performs automatic aquisition and release of - * an . - * - * This class is obsolete and should be replaced by - * ACE_Guard. - */ -class ACE_Export ACE_Thread_Mutex_Guard -{ -public: - /// Implicitly and automatically acquire the lock. - ACE_Thread_Mutex_Guard (ACE_Thread_Mutex &m, int block = 1); - - /// Implicitly release the lock. - ~ACE_Thread_Mutex_Guard (void); - - /// 1 if locked, 0 if couldn't acquire the lock (errno will contain - /// the reason for this). - int locked (void); - - /** - * Explicitly release the lock. Note that only one thread should - * call this method since it doesn't protect against race - * conditions. - */ - int remove (void); - - /// Explicitly acquire the lock. - int acquire (void); - - /** - * Conditionally acquire the lock (i.e., won't block). Returns -1 - * on failure. If we "failed" because someone else already had the - * lock, is set to . - */ - int tryacquire (void); - - /// Explicitly release the lock. - int release (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Reference to the mutex. - ACE_Thread_Mutex &lock_; - - /// Keeps track of whether we acquired the lock or failed. - int owner_; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Thread_Mutex_Guard &); - ACE_Thread_Mutex_Guard (const ACE_Thread_Mutex_Guard &); -}; -#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ - -class ACE_Export ACE_Condition_Attributes -{ -public: - /// Constructor - ACE_Condition_Attributes (int type = ACE_DEFAULT_SYNCH_TYPE); - - /// Destructor - ~ACE_Condition_Attributes (void); - -private: - friend class ACE_Condition_Thread_Mutex; - - /// The attributes - ACE_condattr_t attributes_; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Condition_Attributes &); - ACE_Condition_Attributes (const ACE_Condition_Attributes &); -}; - -/** - * @class ACE_Condition_Thread_Mutex - * - * @brief ACE_Condition variable wrapper written using ACE_Mutexes This - * allows threads to block until shared data changes state. - * A condition variable enables threads to atomically block and - * test the condition under the protection of a mutual exclu- - * sion lock (mutex) until the condition is satisfied. That is, - * the mutex must have been held by the thread before calling - * wait or signal on the condition. If the condition is false, - * a thread blocks on a condition variable and atomically - * releases the mutex that is waiting for the condition to - * change. If another thread changes the condition, it may wake - * up waiting threads by signaling the associated condition - * variable. The waiting threads, upon awakening, reacquire the - * mutex and re-evaluate the condition. - * - * This should be an instantiation of ACE_Condition but problems - * with compilers precludes this... - */ -class ACE_Export ACE_Condition_Thread_Mutex -{ -public: - /// Initialize the condition variable. - ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex &m, - const ACE_TCHAR *name = 0, - void *arg = 0); - - /// Initialize the condition variable. - ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex &m, - ACE_Condition_Attributes &attributes, - const ACE_TCHAR *name = 0, - void *arg = 0); - - /// Implicitly destroy the condition variable. - ~ACE_Condition_Thread_Mutex (void); - - /** - * Explicitly destroy the condition variable. Note that only one - * thread should call this method since it doesn't protect against - * race conditions. - */ - int remove (void); - - /** - * Block on condition, or until absolute time-of-day has passed. If - * abstime == 0 use "blocking" semantics. Else, if - * != 0 and the call times out before the condition is signaled - * returns -1 and sets errno to ETIME. - */ - int wait (const ACE_Time_Value *abstime); - - /// Block on condition. - int wait (void); - - /** - * Block on condition or until absolute time-of-day has passed. If - * abstime == 0 use "blocking" wait() semantics on the - * passed as a parameter (this is useful if you need to store the - * in shared memory). Else, if != 0 and the - * call times out before the condition is signaled returns -1 - * and sets errno to ETIME. - */ - int wait (ACE_Thread_Mutex &mutex, const ACE_Time_Value *abstime = 0); - - /// Signal one waiting thread. - int signal (void); - - /// Signal *all* waiting threads. - int broadcast (void); - - /// Returns a reference to the underlying mutex; - ACE_Thread_Mutex &mutex (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Condition variable. - ACE_cond_t cond_; - - /// Reference to mutex lock. - ACE_Thread_Mutex &mutex_; - - /// Keeps track of whether has been called yet to avoid - /// multiple calls, e.g., explicitly and implicitly in the - /// destructor. This flag isn't protected by a lock, so make sure - /// that you don't have multiple threads simultaneously calling - /// on the same object, which is a bad idea anyway... - int removed_; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Condition_Thread_Mutex &); - ACE_Condition_Thread_Mutex (const ACE_Condition_Thread_Mutex &); -}; - -/** - * @class ACE_Recursive_Thread_Mutex - * - * @brief Implement a C++ wrapper that allows nested acquisition and - * release of a mutex that occurs in the same thread. - */ -class ACE_Export ACE_Recursive_Thread_Mutex -{ -public: - /// Initialize a recursive mutex. - ACE_Recursive_Thread_Mutex (const ACE_TCHAR *name = 0, - ACE_mutexattr_t *arg = 0); - - /// Implicitly release a recursive mutex. - ~ACE_Recursive_Thread_Mutex (void); - - /** - * Implicitly release a recursive mutex. Note that only one thread - * should call this method since it doesn't protect against race - * conditions. - */ - int remove (void); - - /** - * Acquire a recursive mutex (will increment the nesting level and - * not deadmutex if the owner of the mutex calls this method more - * than once). - */ - int acquire (void); - - /** - * Conditionally acquire a recursive mutex (i.e., won't block). - * Returns -1 on failure. If we "failed" because someone else - * already had the lock, is set to . - */ - int tryacquire (void); - - /** - * Acquire mutex ownership. This calls and is only - * here to make the interface consistent - * with the other synchronization APIs. - */ - int acquire_read (void); - - /** - * Acquire mutex ownership. This calls and is only - * here to make the interface consistent - * with the other synchronization APIs. - */ - int acquire_write (void); - - /** - * Conditionally acquire mutex (i.e., won't block). This calls - * and is only here to make the - * interface consistent with the other - * synchronization APIs. Returns -1 on failure. If we "failed" - * because someone else already had the lock, is set to - * . - */ - int tryacquire_read (void); - - /** - * Conditionally acquire mutex (i.e., won't block). This calls - * and is only here to make the - * interface consistent with the other - * synchronization APIs. Returns -1 on failure. If we "failed" - * because someone else already had the lock, is set to - * . - */ - int tryacquire_write (void); - - /** - * This is only here to make the - * interface consistent with the other synchronization APIs. - * Assumes the caller has already acquired the mutex using one of - * the above calls, and returns 0 (success) always. - */ - int tryacquire_write_upgrade (void); - - /** - * Releases a recursive mutex (will not release mutex until all the - * nesting level drops to 0, which means the mutex is no longer - * held). - */ - int release (void); - - /// Return the id of the thread that currently owns the mutex. - ACE_thread_t get_thread_id (void); - - /** - * Return the nesting level of the recursion. When a thread has - * acquired the mutex for the first time, the nesting level == 1. - * The nesting level is incremented every time the thread acquires - * the mutex recursively. - */ - int get_nesting_level (void); - - /// Returns a reference to the recursive mutex; - ACE_recursive_thread_mutex_t &mutex (void); - - /// Returns a reference to the recursive mutex's internal mutex; - ACE_thread_mutex_t &get_nesting_mutex (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - // = This method should *not* be public (they hold no locks...) - void set_thread_id (ACE_thread_t t); - - /// Recursive mutex. - ACE_recursive_thread_mutex_t recursive_mutex_; - - /// Keeps track of whether has been called yet to avoid - /// multiple calls, e.g., explicitly and implicitly in the - /// destructor. This flag isn't protected by a lock, so make sure - /// that you don't have multiple threads simultaneously calling - /// on the same object, which is a bad idea anyway... - int removed_; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Recursive_Thread_Mutex &); - ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &); -}; - -/** - * @class ACE_RW_Thread_Mutex - * - * @brief Wrapper for readers/writer locks that exist within a process. - */ -class ACE_Export ACE_RW_Thread_Mutex : public ACE_RW_Mutex -{ -public: - ACE_RW_Thread_Mutex (const ACE_TCHAR *name = 0, - void *arg = 0); - - /// Default dtor. - ~ACE_RW_Thread_Mutex (void); - - /** - * Conditionally upgrade a read lock to a write lock. This only - * works if there are no other readers present, in which case the - * method returns 0. Otherwise, the method returns -1 and sets - * to . Note that the caller of this method *must* - * already possess this lock as a read lock (but this condition is - * not checked by the current implementation). - */ - int tryacquire_write_upgrade (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -/** - * @class ACE_Thread_Semaphore - * - * @brief Wrapper for Dijkstra style general semaphores that work - * only within one process. - */ -class ACE_Export ACE_Thread_Semaphore : public ACE_Semaphore -{ -public: - /// Initialize the semaphore, with an initial value of , - /// maximum value of , and unlocked by default. - ACE_Thread_Semaphore (u_int count = 1, // By default make this unlocked. - const ACE_TCHAR *name = 0, - void * = 0, - int max = 0x7FFFFFFF); - - /// Default dtor. - ~ACE_Thread_Semaphore (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -struct ACE_Export ACE_Sub_Barrier -{ - // = Initialization. - ACE_Sub_Barrier (u_int count, - ACE_Thread_Mutex &lock, - const ACE_TCHAR *name = 0, - void *arg = 0); - - ~ACE_Sub_Barrier (void); - - /// True if this generation of the barrier is done. - ACE_Condition_Thread_Mutex barrier_finished_; - - /// Number of threads that are still running. - int running_threads_; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -/** - * @class ACE_Barrier - * - * @brief Implements "barrier synchronization". - * - * This class allows number of threads to synchronize - * their completion of (one round of) a task, which is known as - * "barrier synchronization". After all the threads call - * on the barrier they are all atomically released and can begin a new - * round. - * - * This implementation uses a "sub-barrier generation numbering" - * scheme to avoid overhead and to ensure that all threads wait to - * leave the barrier correct. This code is based on an article from - * SunOpsis Vol. 4, No. 1 by Richard Marejka - * (Richard.Marejka@canada.sun.com). - */ -class ACE_Export ACE_Barrier -{ -public: - /// Initialize the barrier to synchronize threads. - ACE_Barrier (u_int count, - const ACE_TCHAR *name = 0, - void *arg = 0); - - /// Default dtor. - ~ACE_Barrier (void); - - /// Block the caller until all threads have called and - /// then allow all the caller threads to continue in parallel. - int wait (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Serialize access to the barrier state. - ACE_Thread_Mutex lock_; - - /// Either 0 or 1, depending on whether we are the first generation - /// of waiters or the next generation of waiters. - int current_generation_; - - /// Total number of threads that can be waiting at any one time. - int count_; - - /** - * We keep two , one for the first "generation" of - * waiters, and one for the next "generation" of waiters. This - * efficiently solves the problem of what to do if all the first - * generation waiters don't leave the barrier before one of the - * threads calls wait() again (i.e., starts up the next generation - * barrier). - */ - ACE_Sub_Barrier sub_barrier_1_; - ACE_Sub_Barrier sub_barrier_2_; - ACE_Sub_Barrier *sub_barrier_[2]; - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Barrier &); - ACE_Barrier (const ACE_Barrier &); -}; - -#if 0 -// The following two classes are commented out since there doesn't -// appear to be a portable and robust means of implementing this -// functionality across platforms. If you know of a portable and -// robust way to implement this functionality please let us know. - -/** - * @class ACE_Process_Condition - * - * @brief ACE_Condition variable wrapper that works across processes. - */ -class ACE_Export ACE_Process_Condition -{ -public: - ACE_Process_Condition (MUTEX &m, const ACE_TCHAR *name = 0, void *arg = 0); - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. -}; -#endif /* 0 */ - -#if 0 -/** - * @class ACE_Process_Barrier - * - * @brief Implements "barrier synchronization" using ACE_Process_Mutexes! - * - * This class is just a simple wrapper for ACE_Barrier that - * selects the USYNC_PROCESS variant for the locks. - */ -class ACE_Export ACE_Process_Barrier : public ACE_Barrier -{ -public: - /// Create a Process_Barrier, passing in the optional . - ACE_Process_Barrier (u_int count, const ACE_TCHAR *name = 0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; -#endif /* 0 */ - -/** - * @class ACE_Thread_Barrier - * - * @brief Implements "barrier synchronization" using ACE_Thread_Mutexes! - * - * This class is just a simple wrapper for ACE_Barrier that - * selects the USYNC_THREAD variant for the locks. - */ -class ACE_Export ACE_Thread_Barrier : public ACE_Barrier -{ -public: - /// Create a Thread_Barrier, passing in the optional . - ACE_Thread_Barrier (u_int count, const ACE_TCHAR *name = 0); - - /// Default dtor. - ~ACE_Thread_Barrier (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; -#endif /* ACE_HAS_THREADS */ - -#if defined (__ACE_INLINE__) -#include "ace/Synch.i" -#endif /* __ACE_INLINE__ */ - -// Include the templates here. -#include "ace/Synch_T.h" - -template -class ACE_Guard; - -ACE_TEMPLATE_SPECIALIZATION -/** - * @class ACE_Guard - * - * @brief Template specialization of for the - * . - * - * This specialization is useful since it helps to speedup - * performance of the "Null_Mutex" considerably. - */ -class ACE_Export ACE_Guard -{ -public: - // = Initialization and termination methods. - ACE_Guard (ACE_Null_Mutex &) {} - ACE_Guard (ACE_Null_Mutex &, int) {} - ACE_Guard (ACE_Null_Mutex &, int, int) {} -#if defined (ACE_WIN32) - ~ACE_Guard (void) {} -#endif /* ACE_WIN32 */ - - int acquire (void) { return 0; } - int tryacquire (void) { return 0; } - int release (void) { return 0; } - void disown (void) {} - int locked (void) { return 1; } - int remove (void) { return 0; } - void dump (void) const {} - -private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Guard &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Guard (const ACE_Guard &)) -}; - -template -class ACE_Write_Guard; - -ACE_TEMPLATE_SPECIALIZATION -/** - * @class ACE_Write_Guard - * - */ -class ACE_Export ACE_Write_Guard : public ACE_Guard -{ -public: - ACE_Write_Guard (ACE_Null_Mutex &m) - : ACE_Guard (m) {} - ACE_Write_Guard (ACE_Null_Mutex &m, int blocked) - : ACE_Guard (m, blocked) {} - - int acquire_write (void) { return 0; } - int acquire (void) { return 0; } - int tryacquire_write (void) { return 0; } - int tryacquire (void) { return 0; } - void dump (void) const {} -}; - -template -class ACE_Read_Guard; - -ACE_TEMPLATE_SPECIALIZATION -/** - * @class ACE_Read_Guard - * - */ -class ACE_Export ACE_Read_Guard : public ACE_Guard -{ -public: - ACE_Read_Guard (ACE_Null_Mutex &m) - : ACE_Guard (m) {} - ACE_Read_Guard (ACE_Null_Mutex &m, int blocked) - : ACE_Guard (m, blocked) {} - - int acquire_read (void) { return 0; } - int acquire (void) { return 0; } - int tryacquire_read (void) { return 0; } - int tryacquire (void) { return 0; } - void dump (void) const {} -}; - -#if defined (ACE_HAS_THREADS) - -template -class ACE_Condition; - -ACE_TEMPLATE_SPECIALIZATION -/** - * @class ACE_Condition - * - * @brief ACE_Condition template specialization written using - * @a ACE_Recursive_Thread_Mutex. This allows threads to block until - * shared data changes state using recursive mutexes. - */ -class ACE_Export ACE_Condition -{ -public: - /// Initialize the condition variable with a recursive mutex. - ACE_Condition (ACE_Recursive_Thread_Mutex &m); - - /// Implicitly destroy the condition variable. - ~ACE_Condition (void); - - /** - * Explicitly destroy the condition variable. Note that only one - * thread should call this method since it doesn't protect against - * race conditions. - */ - int remove (void); - - /** - * Block on condition, or until absolute time-of-day has passed. If - * abstime == 0 use "blocking" semantics. Else, if - * != 0 and the call times out before the condition is signaled - * returns -1 and sets errno to ETIME. - */ - int wait (const ACE_Time_Value *abstime = 0); - - /** - * Block on condition or until absolute time-of-day has passed. If - * abstime == 0 use "blocking" wait() semantics on the recursive @a mutex - * passed as a parameter (this is useful if you need to store the - * in shared memory). Else, if != 0 and the - * call times out before the condition is signaled returns -1 - * and sets errno to ETIME. - */ - int wait (ACE_Recursive_Thread_Mutex &mutex, - const ACE_Time_Value *abstime = 0); - - /// Signal one waiting thread. - int signal (void); - - /// Signal *all* waiting threads. - int broadcast (void); - - /// Returns a reference to the underlying mutex; - ACE_Recursive_Thread_Mutex &mutex (void); - - /// Dump the state of an object. - void dump (void) const; - -private: - /// A normal (i.e., non-recursive) condition variable. - ACE_cond_t cond_; - - /// Reference to the recursive mutex. - ACE_Recursive_Thread_Mutex &mutex_; - - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Condition &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Condition (const ACE_Condition &)) -}; - -class ACE_Export ACE_Condition_Recursive_Thread_Mutex - : public ACE_Condition -{ -public: - /// Initialize the condition variable with a recursive mutex. - ACE_Condition_Recursive_Thread_Mutex (ACE_Recursive_Thread_Mutex &m): - ACE_Condition (m) {} -}; -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_LEGACY_MODE) -# include "ace/File_Lock.h" -# include "ace/Process_Semaphore.h" -# include "ace/Process_Mutex.h" -# include "ace/RW_Process_Mutex.h" -# include "ace/Test_and_Set.h" -#endif /* ACE_LEGACY_MODE */ - -#include "ace/post.h" -#endif /* ACE_SYNCH_H */ diff --git a/ace/Synch.i b/ace/Synch.i deleted file mode 100644 index 6162ff77333..00000000000 --- a/ace/Synch.i +++ /dev/null @@ -1,1002 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -ACE_INLINE -ACE_Lock::ACE_Lock (void) -{ -} - -ACE_INLINE const ACE_rwlock_t & -ACE_RW_Mutex::lock (void) const -{ -// ACE_TRACE ("ACE_RW_Mutex::lock"); - return this->lock_; -} - -ACE_INLINE int -ACE_RW_Mutex::remove (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::remove"); - int result = 0; - if (this->removed_ == 0) - { - this->removed_ = 1; - result = ACE_OS::rwlock_destroy (&this->lock_); - } - return result; -} - -ACE_INLINE int -ACE_RW_Mutex::acquire_read (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::acquire_read"); - return ACE_OS::rw_rdlock (&this->lock_); -} - -ACE_INLINE int -ACE_RW_Mutex::acquire_write (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::acquire_write"); - return ACE_OS::rw_wrlock (&this->lock_); -} - -ACE_INLINE int -ACE_RW_Mutex::acquire (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::acquire"); - return ACE_OS::rw_wrlock (&this->lock_); -} - -ACE_INLINE int -ACE_RW_Mutex::tryacquire_read (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::tryacquire_read"); - return ACE_OS::rw_tryrdlock (&this->lock_); -} - -ACE_INLINE int -ACE_RW_Mutex::tryacquire_write (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::tryacquire_write"); - return ACE_OS::rw_trywrlock (&this->lock_); -} - -ACE_INLINE int -ACE_RW_Mutex::tryacquire_write_upgrade (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::tryacquire_write_upgrade"); - return ACE_OS::rw_trywrlock_upgrade (&this->lock_); -} - -ACE_INLINE int -ACE_RW_Mutex::tryacquire (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::tryacquire"); - return this->tryacquire_write (); -} - -ACE_INLINE int -ACE_RW_Mutex::release (void) -{ -// ACE_TRACE ("ACE_RW_Mutex::release"); - return ACE_OS::rw_unlock (&this->lock_); -} - -#if defined (ACE_HAS_THREADS) -ACE_INLINE int -ACE_RW_Thread_Mutex::tryacquire_write_upgrade (void) -{ -// ACE_TRACE ("ACE_RW_Thread_Mutex::tryacquire_write_upgrade"); - return ACE_OS::rw_trywrlock_upgrade (&this->lock_); -} -#endif /* ACE_HAS_THREADS */ - -ACE_INLINE int -ACE_Mutex::acquire_read (void) -{ -// ACE_TRACE ("ACE_Mutex::acquire_read"); -#if defined (CHORUS) - if (this->process_lock_) - return ACE_OS::mutex_lock (this->process_lock_); -#endif /* CHORUS */ - return ACE_OS::mutex_lock (&this->lock_); -} - -ACE_INLINE int -ACE_Mutex::acquire_write (void) -{ -// ACE_TRACE ("ACE_Mutex::acquire_write"); -#if defined (CHORUS) - if (this->process_lock_) - return ACE_OS::mutex_lock (this->process_lock_); -#endif /* CHORUS */ - return ACE_OS::mutex_lock (&this->lock_); -} - -ACE_INLINE int -ACE_Mutex::tryacquire_read (void) -{ -// ACE_TRACE ("ACE_Mutex::tryacquire_read"); -#if defined (CHORUS) - if (this->process_lock_) - return ACE_OS::mutex_trylock (this->process_lock_); -#endif /* CHORUS */ - return ACE_OS::mutex_trylock (&this->lock_); -} - -ACE_INLINE const ACE_mutex_t & -ACE_Mutex::lock (void) const -{ -// ACE_TRACE ("ACE_Mutex::lock"); -#if defined (CHORUS) - if (this->process_lock_) - return *this->process_lock_; -#endif /* CHORUS */ - return this->lock_; -} - -ACE_INLINE int -ACE_Mutex::tryacquire_write (void) -{ -// ACE_TRACE ("ACE_Mutex::tryacquire_write"); -#if defined (CHORUS) - if (this->process_lock_) - return ACE_OS::mutex_trylock (this->process_lock_); -#endif /* CHORUS */ - return ACE_OS::mutex_trylock (&this->lock_); -} - -ACE_INLINE int -ACE_Mutex::tryacquire_write_upgrade (void) -{ -// ACE_TRACE ("ACE_Mutex::tryacquire_write_upgrade"); - return 0; -} - -ACE_INLINE int -ACE_Mutex::acquire (void) -{ -// ACE_TRACE ("ACE_Mutex::acquire"); -#if defined (CHORUS) - if (this->process_lock_) - return ACE_OS::mutex_lock (this->process_lock_); -#endif /* CHORUS */ - return ACE_OS::mutex_lock (&this->lock_); -} - -ACE_INLINE int -ACE_Mutex::acquire (ACE_Time_Value &tv) -{ - // ACE_TRACE ("ACE_Mutex::acquire"); - return ACE_OS::mutex_lock (&this->lock_, tv); -} - -ACE_INLINE int -ACE_Mutex::acquire (ACE_Time_Value *tv) -{ - // ACE_TRACE ("ACE_Mutex::acquire"); - return ACE_OS::mutex_lock (&this->lock_, tv); -} - -ACE_INLINE int -ACE_Mutex::tryacquire (void) -{ -// ACE_TRACE ("ACE_Mutex::tryacquire"); -#if defined (CHORUS) - if (this->process_lock_) - return ACE_OS::mutex_trylock (this->process_lock_); -#endif /* CHORUS */ - return ACE_OS::mutex_trylock (&this->lock_); -} - -ACE_INLINE int -ACE_Mutex::release (void) -{ -// ACE_TRACE ("ACE_Mutex::release"); -#if defined (CHORUS) - if (this->process_lock_) - return ACE_OS::mutex_unlock (this->process_lock_); -#endif /* CHORUS */ - return ACE_OS::mutex_unlock (&this->lock_); -} - -ACE_INLINE int -ACE_Mutex::remove (void) -{ -// ACE_TRACE ("ACE_Mutex::remove"); -#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) - int result = 0; - // In the case of a interprocess mutex, the owner is the first - // process that created the shared memory object. In this case, the - // lockname_ pointer will be non-zero (points to allocated memory - // for the name). Owner or not, the memory needs to be unmapped - // from the process. If we are the owner, the file used for - // shm_open needs to be deleted as well. - if (this->process_lock_) - { - if (this->removed_ == 0) - { - this->removed_ = 1; - - // Only destroy the lock if we're the ones who initialized - // it. - if (!this->lockname_) - ACE_OS::munmap ((void *) this->process_lock_, - sizeof (ACE_mutex_t)); - else - { - result = ACE_OS::mutex_destroy (this->process_lock_); - ACE_OS::munmap ((void *) this->process_lock_, - sizeof (ACE_mutex_t)); - ACE_OS::shm_unlink (this->lockname_); - ACE_OS::free (ACE_static_cast (void *, - ACE_const_cast (ACE_TCHAR *, - this->lockname_))); - } - } - } - return result; -#else /* !CHORUS */ - int result = 0; - if (this->removed_ == 0) - { - this->removed_ = 1; - result = ACE_OS::mutex_destroy (&this->lock_); - } - return result; -#endif /* CHORUS */ -} - -ACE_INLINE const ACE_sema_t & -ACE_Semaphore::lock (void) const -{ -// ACE_TRACE ("ACE_Semaphore::lock"); - return this->semaphore_; -} - -ACE_INLINE int -ACE_Semaphore::remove (void) -{ -// ACE_TRACE ("ACE_Semaphore::remove"); - int result = 0; - if (this->removed_ == 0) - { - this->removed_ = 1; - result = ACE_OS::sema_destroy (&this->semaphore_); - } - return result; -} - -ACE_INLINE int -ACE_Semaphore::acquire (void) -{ -// ACE_TRACE ("ACE_Semaphore::acquire"); - return ACE_OS::sema_wait (&this->semaphore_); -} - -ACE_INLINE int -ACE_Semaphore::acquire (ACE_Time_Value &tv) -{ -// ACE_TRACE ("ACE_Semaphore::acquire"); - return ACE_OS::sema_wait (&this->semaphore_, tv); -} - -ACE_INLINE int -ACE_Semaphore::acquire (ACE_Time_Value *tv) -{ -// ACE_TRACE ("ACE_Semaphore::acquire"); - return ACE_OS::sema_wait (&this->semaphore_, tv); -} - -ACE_INLINE int -ACE_Semaphore::tryacquire (void) -{ -// ACE_TRACE ("ACE_Semaphore::tryacquire"); - return ACE_OS::sema_trywait (&this->semaphore_); -} - -ACE_INLINE int -ACE_Semaphore::release (void) -{ -// ACE_TRACE ("ACE_Semaphore::release"); - return ACE_OS::sema_post (&this->semaphore_); -} - -ACE_INLINE int -ACE_Semaphore::release (u_int release_count) -{ -// ACE_TRACE ("ACE_Semaphore::release"); - return ACE_OS::sema_post (&this->semaphore_, release_count); -} - -// Acquire semaphore ownership. This calls and is only -// here to make the interface consistent with the -// other synchronization APIs. - -ACE_INLINE int -ACE_Semaphore::acquire_read (void) -{ - return this->acquire (); -} - -// Acquire semaphore ownership. This calls and is only -// here to make the interface consistent with the -// other synchronization APIs. - -ACE_INLINE int -ACE_Semaphore::acquire_write (void) -{ - return this->acquire (); -} - -// Conditionally acquire semaphore (i.e., won't block). This calls -// and is only here to make the -// interface consistent with the other synchronization APIs. - -ACE_INLINE int -ACE_Semaphore::tryacquire_read (void) -{ - return this->tryacquire (); -} - -// Conditionally acquire semaphore (i.e., won't block). This calls -// and is only here to make the -// interface consistent with the other synchronization APIs. - -ACE_INLINE int -ACE_Semaphore::tryacquire_write (void) -{ - return this->tryacquire (); -} - -// This is only here to make the interface consistent -// with the other synchronization APIs. Assumes the caller has -// already acquired the semaphore using one of the above calls, and -// returns 0 (success) always. -ACE_INLINE int -ACE_Semaphore::tryacquire_write_upgrade (void) -{ - return 0; -} - -// Null ACE_Semaphore implementation - -ACE_INLINE -ACE_Null_Semaphore::ACE_Null_Semaphore (u_int, - int, - const ACE_TCHAR *, - void *, - int) -{ -} - -ACE_INLINE -ACE_Null_Semaphore::~ACE_Null_Semaphore (void) -{ -} - -ACE_INLINE int -ACE_Null_Semaphore::remove (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Semaphore::acquire (ACE_Time_Value &) -{ - errno = ETIME; - return -1; -} - -ACE_INLINE int -ACE_Null_Semaphore::acquire (ACE_Time_Value *) -{ - errno = ETIME; - return -1; -} - -ACE_INLINE int -ACE_Null_Semaphore::acquire (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Semaphore::tryacquire (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Semaphore::release (size_t) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Semaphore::release (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Semaphore::acquire_write (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Semaphore::tryacquire_write (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Semaphore::tryacquire_write_upgrade (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Semaphore::acquire_read (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Semaphore::tryacquire_read (void) -{ - return 0; -} - -ACE_INLINE void -ACE_Null_Semaphore::dump (void) const -{ -} - -#if defined (ACE_HAS_THREADS) - -ACE_INLINE const ACE_thread_mutex_t & -ACE_Thread_Mutex::lock (void) const -{ -// ACE_TRACE ("ACE_Thread_Mutex::lock"); - return this->lock_; -} - -ACE_INLINE int -ACE_Thread_Mutex::acquire_read (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::acquire_read"); - return ACE_OS::thread_mutex_lock (&this->lock_); -} - -ACE_INLINE int -ACE_Thread_Mutex::acquire_write (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::acquire_write"); - return ACE_OS::thread_mutex_lock (&this->lock_); -} - -ACE_INLINE int -ACE_Thread_Mutex::tryacquire_read (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::tryacquire_read"); - return ACE_OS::thread_mutex_trylock (&this->lock_); -} - -ACE_INLINE int -ACE_Thread_Mutex::tryacquire_write (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::tryacquire_write"); - return ACE_OS::thread_mutex_trylock (&this->lock_); -} - -ACE_INLINE int -ACE_Thread_Mutex::tryacquire_write_upgrade (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::tryacquire_write_upgrade"); - return 0; -} - -ACE_INLINE int -ACE_Thread_Mutex::acquire (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::acquire"); - return ACE_OS::thread_mutex_lock (&this->lock_); -} - -ACE_INLINE int -ACE_Thread_Mutex::acquire (ACE_Time_Value &tv) -{ - // ACE_TRACE ("ACE_Thread_Mutex::acquire"); - return ACE_OS::thread_mutex_lock (&this->lock_, tv); -} - -ACE_INLINE int -ACE_Thread_Mutex::acquire (ACE_Time_Value *tv) -{ - // ACE_TRACE ("ACE_Thread_Mutex::acquire"); - return ACE_OS::thread_mutex_lock (&this->lock_, tv); -} - -ACE_INLINE int -ACE_Thread_Mutex::tryacquire (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::tryacquire"); - return ACE_OS::thread_mutex_trylock (&this->lock_); -} - -ACE_INLINE int -ACE_Thread_Mutex::release (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::release"); - return ACE_OS::thread_mutex_unlock (&this->lock_); -} - -ACE_INLINE int -ACE_Thread_Mutex::remove (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex::remove"); - int result = 0; - if (this->removed_ == 0) - { - this->removed_ = 1; - result = ACE_OS::thread_mutex_destroy (&this->lock_); - } - return result; -} - -#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES) -ACE_INLINE int -ACE_Thread_Mutex_Guard::locked (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex_Guard::locked"); - return this->owner_ != -1; -} - -// Explicitly acquire the lock. - -ACE_INLINE int -ACE_Thread_Mutex_Guard::acquire (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex_Guard::acquire"); - return this->owner_ = this->lock_.acquire (); -} - -// Conditionally acquire the lock (i.e., won't block). - -ACE_INLINE int -ACE_Thread_Mutex_Guard::tryacquire (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex_Guard::tryacquire"); - return this->owner_ = this->lock_.tryacquire (); -} - -// Implicitly and automatically acquire the lock. - -ACE_INLINE -ACE_Thread_Mutex_Guard::ACE_Thread_Mutex_Guard (ACE_Thread_Mutex &m, - int block) - : lock_ (m) -{ -// ACE_TRACE ("ACE_Thread_Mutex_Guard::ACE_Thread_Mutex_Guard"); - if (block) - this->acquire (); - else - this->tryacquire (); -} - -// Explicitly release the lock. - -ACE_INLINE int -ACE_Thread_Mutex_Guard::release (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex_Guard::release"); - if (this->owner_ != -1) - { - this->owner_ = -1; - return this->lock_.release (); - } - else - return 0; -} - -// Implicitly release the lock. - -ACE_INLINE -ACE_Thread_Mutex_Guard::~ACE_Thread_Mutex_Guard (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex_Guard::~ACE_Thread_Mutex_Guard"); - this->release (); -} - -// Explicitly release the lock. - -ACE_INLINE int -ACE_Thread_Mutex_Guard::remove (void) -{ -// ACE_TRACE ("ACE_Thread_Mutex_Guard::remove"); - this->owner_ = -1; - return this->release (); -} -#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ - -ACE_INLINE -ACE_Condition_Attributes::ACE_Condition_Attributes (int type) -{ - (void) ACE_OS::condattr_init (this->attributes_, type); -} - -ACE_INLINE -ACE_Condition_Attributes::~ACE_Condition_Attributes (void) -{ - ACE_OS::condattr_destroy (this->attributes_); -} - -ACE_INLINE int -ACE_Condition_Thread_Mutex::remove (void) -{ -// ACE_TRACE ("ACE_Condition_Thread_Mutex::remove"); - - // is called in a loop if the condition variable is - // BUSY. This avoids a condition where a condition is signaled and - // because of some timing problem, the thread that is to be signaled - // has called the cond_wait routine after the signal call. Since - // the condition signal is not queued in any way, deadlock occurs. - - int result = 0; - - if (this->removed_ == 0) - { - this->removed_ = 1; - - while ((result = ACE_OS::cond_destroy (&this->cond_)) == -1 - && errno == EBUSY) - { - ACE_OS::cond_broadcast (&this->cond_); - ACE_OS::thr_yield (); - } - } - return result; -} - -ACE_INLINE ACE_Thread_Mutex & -ACE_Condition_Thread_Mutex::mutex (void) -{ -// ACE_TRACE ("ACE_Condition_Thread_Mutex::mutex"); - return this->mutex_; -} - -ACE_INLINE ACE_recursive_thread_mutex_t & -ACE_Recursive_Thread_Mutex::mutex (void) -{ - return recursive_mutex_; -} - -ACE_INLINE ACE_thread_mutex_t & -ACE_Recursive_Thread_Mutex::get_nesting_mutex (void) -{ -#if defined (ACE_HAS_RECURSIVE_MUTEXES) - return ACE_static_cast (ACE_thread_mutex_t &, - recursive_mutex_); -#else - return recursive_mutex_.nesting_mutex_; -#endif /* ACE_HAS_RECURSIVE_MUTEXES */ -} - -ACE_INLINE void -ACE_Recursive_Thread_Mutex::set_thread_id (ACE_thread_t t) -{ -// ACE_TRACE ("ACE_Recursive_Thread_Mutex::set_thread_id"); -#if defined (ACE_HAS_RECURSIVE_MUTEXES) - ACE_UNUSED_ARG (t); -#else /* ! ACE_HAS_RECURSIVE_MUTEXES */ - this->recursive_mutex_.owner_id_ = t; -#endif /* ! ACE_HAS_RECURSIVE_MUTEXES */ -} - -ACE_INLINE int -ACE_Recursive_Thread_Mutex::acquire_read (void) -{ - return this->acquire (); -} - -ACE_INLINE int -ACE_Recursive_Thread_Mutex::acquire_write (void) -{ - return this->acquire (); -} - -ACE_INLINE int -ACE_Recursive_Thread_Mutex::tryacquire_read (void) -{ - return this->tryacquire (); -} - -ACE_INLINE int -ACE_Recursive_Thread_Mutex::tryacquire_write (void) -{ - return this->tryacquire (); -} - -ACE_INLINE int -ACE_Recursive_Thread_Mutex::tryacquire_write_upgrade (void) -{ - return 0; -} - -#endif /* ACE_HAS_THREADS */ - -ACE_INLINE -ACE_Null_Barrier::ACE_Null_Barrier (u_int, - const char *, - void *) -{ -} - -ACE_INLINE -ACE_Null_Barrier::~ACE_Null_Barrier (void) -{ -} - -ACE_INLINE int -ACE_Null_Barrier::wait (void) -{ - return 0; -} - -ACE_INLINE void -ACE_Null_Barrier::dump (void) const -{ -} - -ACE_INLINE -ACE_Null_Mutex::ACE_Null_Mutex (const ACE_TCHAR *) - : lock_ (0) -{ -} - -ACE_INLINE -ACE_Null_Mutex::~ACE_Null_Mutex (void) -{ -} - -ACE_INLINE int -ACE_Null_Mutex::remove (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex::acquire (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex::acquire (ACE_Time_Value &) -{ - errno = ETIME; - return -1; -} - -ACE_INLINE int -ACE_Null_Mutex::acquire (ACE_Time_Value *) -{ - errno = ETIME; - return -1; -} - -ACE_INLINE int -ACE_Null_Mutex::tryacquire (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex::release (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex::acquire_write (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex::tryacquire_write (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex::tryacquire_write_upgrade (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex::acquire_read (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex::tryacquire_read (void) -{ - return 0; -} - -ACE_INLINE void -ACE_Null_Mutex::dump (void) const -{ -} - -ACE_INLINE int -ACE_Noop_Token::queueing_strategy (void) -{ - return -1; -} - -ACE_INLINE void -ACE_Noop_Token::queueing_strategy (int /* queueing_strategy */) -{ -} - -ACE_INLINE int -ACE_Noop_Token::renew (int, ACE_Time_Value *) -{ - return 0; -} - -ACE_INLINE void -ACE_Noop_Token::dump (void) const -{ -} - - -ACE_INLINE -ACE_Null_Condition::ACE_Null_Condition (const ACE_Null_Mutex &m, - const ACE_TCHAR *, - void*) - : mutex_ ((ACE_Null_Mutex &) m) -{ -} - -ACE_INLINE ACE_Null_Condition::~ACE_Null_Condition (void) -{ -} - -ACE_INLINE int ACE_Null_Condition::remove (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Condition::wait (const ACE_Time_Value *) -{ - errno = ETIME; - return -1; -} - -ACE_INLINE int -ACE_Null_Condition::wait (ACE_Null_Mutex &, - const ACE_Time_Value *) -{ - errno = ETIME; - return -1; -} - -ACE_INLINE int -ACE_Null_Condition::signal (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Condition::broadcast (void) -{ - return 0; -} - -ACE_INLINE ACE_Null_Mutex & -ACE_Null_Condition::mutex (void) -{ - return this->mutex_; -} - -ACE_INLINE void -ACE_Null_Condition::dump (void) const -{ -} - -#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES) -ACE_INLINE -ACE_Null_Mutex_Guard::ACE_Null_Mutex_Guard (ACE_Null_Mutex &) -{ -} - -ACE_INLINE -ACE_Null_Mutex_Guard::~ACE_Null_Mutex_Guard (void) -{ -} - -ACE_INLINE int -ACE_Null_Mutex_Guard::remove (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex_Guard::locked (void) -{ - return 1; -} - -ACE_INLINE int -ACE_Null_Mutex_Guard::acquire (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex_Guard::tryacquire (void) -{ - return 0; -} - -ACE_INLINE int -ACE_Null_Mutex_Guard::release (void) -{ - return 0; -} - -ACE_INLINE void -ACE_Null_Mutex_Guard::dump (void) const -{ -} -#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ - -ACE_INLINE -ACE_TSS_Adapter::~ACE_TSS_Adapter (void) -{ -} - -ACE_INLINE -ACE_Manual_Event::~ACE_Manual_Event (void) -{ -} - -ACE_INLINE -ACE_Auto_Event::~ACE_Auto_Event (void) -{ -} - -#if defined (ACE_HAS_THREADS) -ACE_INLINE -ACE_RW_Thread_Mutex::~ACE_RW_Thread_Mutex (void) -{ -} - -ACE_INLINE -ACE_Thread_Semaphore::~ACE_Thread_Semaphore (void) -{ -} - -ACE_INLINE -ACE_Sub_Barrier::~ACE_Sub_Barrier (void) -{ -} - -ACE_INLINE -ACE_Barrier::~ACE_Barrier (void) -{ -} - -ACE_INLINE -ACE_Thread_Barrier::~ACE_Thread_Barrier (void) -{ -} -#endif /* ACE_HAS_THREADS */ diff --git a/ace/Synch_Options.cpp b/ace/Synch_Options.cpp deleted file mode 100644 index 0c7a1ba1951..00000000000 --- a/ace/Synch_Options.cpp +++ /dev/null @@ -1,108 +0,0 @@ -#include "ace/Synch_Options.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Synch_Options.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/Trace.h" - -ACE_RCSID (ace, - Synch_Options, - "$Id$") - - -ACE_ALLOC_HOOK_DEFINE (ACE_Synch_Options) - -void -ACE_Synch_Options::dump (void) const -{ - ACE_TRACE ("ACE_Synch_Options::dump"); -} - -// Static initialization. -// Note: these three objects require static construction and destruction. - -/* static */ -ACE_Synch_Options ACE_Synch_Options::defaults; - -/* static */ -ACE_Synch_Options ACE_Synch_Options::synch; - -/* static */ -ACE_Synch_Options ACE_Synch_Options::asynch (ACE_Synch_Options::USE_REACTOR); - -ACE_Synch_Options::ACE_Synch_Options (unsigned long options, - const ACE_Time_Value &timeout, - const void *arg) -{ - // ACE_TRACE ("ACE_Synch_Options::ACE_Synch_Options"); - this->set (options, timeout, arg); -} - -void -ACE_Synch_Options::set (unsigned long options, - const ACE_Time_Value &timeout, - const void *arg) -{ - // ACE_TRACE ("ACE_Synch_Options::set"); - this->options_ = options; - this->timeout_ = (ACE_Time_Value &) timeout; - - // Whoa, possible dependence on static initialization here. This - // function is called during initialization of the statics above. - // But, ACE_Time_Value::zero is a static object. Very fortunately, - // its bits have a value of 0. - if (this->timeout_ != ACE_Time_Value::zero) - ACE_SET_BITS (this->options_, ACE_Synch_Options::USE_TIMEOUT); - - this->arg_ = arg; -} - -int -ACE_Synch_Options::operator[] (unsigned long option) const -{ - ACE_TRACE ("ACE_Synch_Options::operator[]"); - return (this->options_ & option) != 0; -} - -void -ACE_Synch_Options::operator= (unsigned long option) -{ - ACE_TRACE ("ACE_Synch_Options::operator="); - this->options_ |= option; -} - -const ACE_Time_Value & -ACE_Synch_Options::timeout (void) const -{ - ACE_TRACE ("ACE_Synch_Options::timeout"); - return this->timeout_; -} - -void -ACE_Synch_Options::timeout (const ACE_Time_Value &tv) -{ - ACE_TRACE ("ACE_Synch_Options::timeout"); - this->timeout_ = tv; -} - -const ACE_Time_Value * -ACE_Synch_Options::time_value (void) const -{ - ACE_TRACE ("ACE_Synch_Options::time_value"); - return (*this)[USE_TIMEOUT] ? &this->timeout_ : 0; -} - -const void * -ACE_Synch_Options::arg (void) const -{ - ACE_TRACE ("ACE_Synch_Options::arg"); - return this->arg_; -} - -void -ACE_Synch_Options::arg (const void *a) -{ - ACE_TRACE ("ACE_Synch_Options::arg"); - this->arg_ = a; -} diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h deleted file mode 100644 index 858f0ccebe3..00000000000 --- a/ace/Synch_Options.h +++ /dev/null @@ -1,158 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file Synch_Options.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//========================================================================== - -#ifndef ACE_SYNCH_OPTIONS_H -#define ACE_SYNCH_OPTIONS_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Time_Value.h" - - -/** - * @class ACE_Synch_Options - * - * @brief Contains the values of options used to determine the - * synchronous and asynchronous behavior. - * - * Values support the following behavior (TV == "timeout" - * and UR == "use ACE_Reactor"): - * - * - * | Parameters | Description - * | - * |TV | UR | - * |-----|----------|------------------------------- - * | | - * |NULL | yes | infinite timeout (using ACE_Reactor) - * | | - * |time | yes | try asynch transaction for - * | | the specified time (using ACE_Reactor) - * | | - * |0,0 | yes | poll; try, if EWOULDBLOCK, - * | | then return immediately - * | | (using ACE_Reactor) - * | | - * |NULL | no | block forever (don't use ACE_Reactor) - * | | - * |time | no | do a blocking transaction - * | | for the specified time - * | | (don't use ACE_Reactor) - * | | - * |0,0 | no | poll; but do not initiate a - * | | nonblocking transaction - * | | (don't use ACE_Reactor) - * - */ -class ACE_Export ACE_Synch_Options -{ -public: - /// Options flags for controlling synchronization. - /** - * Note that these flags can be bit-wise "or'd" together if both - * options are desired. - */ - enum - { - /// Use the Reactor. - USE_REACTOR = 01, - /// Interprete the Time_Value. - USE_TIMEOUT = 02 - }; - - // = Initialization methods. - /// Initialize the Synch_Options based on parameters. - ACE_Synch_Options (unsigned long options = 0, - const ACE_Time_Value &timeout = ACE_Time_Value::zero, - const void *arg = 0); - - /// Default dtor. - ~ACE_Synch_Options (void); - - /// Initialize the Synch_Options based on parameters. - void set (unsigned long options = 0, - const ACE_Time_Value &timeout = ACE_Time_Value::zero, - const void *arg = 0); - - /// Get method for determining which options are enabled. - int operator[] (unsigned long option) const; - - /// Set method for enabling certain options. - void operator= (unsigned long option); - - /// Returns the "magic cookie" argument. - const void *arg (void) const; - - /// Set the "magic cookie" argument. - void arg (const void *); - - /// Returns a reference to the . This value only makes - /// sense if (*this)[USE_TIMEOUT] is true. - const ACE_Time_Value &timeout (void) const; - - /// Set the . - void timeout (const ACE_Time_Value &tv); - - /** - * Returns the address of the timeout if - * (*this)[USE_TIMEOUT] is true, else 0. This should be used with - * care, e.g., the timeout pointer should not be stored in a manner - * that will lead to dangling pointers... - */ - const ACE_Time_Value *time_value (void) const; - - // = Static data members (singletons) - - /// This is the default setting for options, which will block - /// synchronously. - static ACE_Synch_Options defaults; - - /// This is the default synchronous setting. - static ACE_Synch_Options synch; - - /// This is the default asynchronous setting. - static ACE_Synch_Options asynch; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Keeps track of the enabled options. - unsigned long options_; - - /// Amount of time to wait for timeouts. - ACE_Time_Value timeout_; - - /** - * "Magic cookie" always passed in as an argument to the ACE_Reactor's - * method. Used to communicate values for - * asynchronous programming. - */ - const void *arg_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Synch_Options.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_SYNCH_OPTIONS_H */ diff --git a/ace/Synch_Options.i b/ace/Synch_Options.i deleted file mode 100644 index 3c16b199ac8..00000000000 --- a/ace/Synch_Options.i +++ /dev/null @@ -1,9 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Synch_Options.i - -ACE_INLINE -ACE_Synch_Options::~ACE_Synch_Options (void) -{ -} diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp deleted file mode 100644 index 827927fa874..00000000000 --- a/ace/Synch_T.cpp +++ /dev/null @@ -1,892 +0,0 @@ -// $Id$ - -#ifndef ACE_SYNCH_T_C -#define ACE_SYNCH_T_C - -#include "ace/Thread.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch_T.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, Synch_T, "$Id$") - -#if !defined (__ACE_INLINE__) -#include "ace/Synch_T.i" -#endif /* __ACE_INLINE__ */ - -// This constructor isn't inlined, because SunPRO C++ 4.2 + patch -// 104631-07 has trouble compiling TAO with it inline. -template -ACE_Lock_Adapter::ACE_Lock_Adapter (void) - : lock_ (0), - delete_lock_ (1) -{ - ACE_NEW (this->lock_, - ACE_LOCKING_MECHANISM); -} - -template -ACE_Reverse_Lock::~ACE_Reverse_Lock (void) -{ -} -// **************************************************************** -// ACE_ALLOC_HOOK_DEFINE(ACE_Guard) - -template void -ACE_Guard::dump (void) const -{ -// ACE_TRACE ("ACE_Guard::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("mutex_ = %x\n"), this->lock_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owner_ = %d\n"), this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// ACE_ALLOC_HOOK_DEFINE(ACE_Write_Guard) - -template void -ACE_Write_Guard::dump (void) const -{ -// ACE_TRACE ("ACE_Write_Guard::dump"); - ACE_Guard::dump (); -} - -// ACE_ALLOC_HOOK_DEFINE(ACE_Read_Guard) - -template void -ACE_Read_Guard::dump (void) const -{ -// ACE_TRACE ("ACE_Read_Guard::dump"); - ACE_Guard::dump (); -} - -#if defined (ACE_HAS_THREADS) - -ACE_ALLOC_HOOK_DEFINE(ACE_Condition) - -template void -ACE_Condition::dump (void) const -{ -// ACE_TRACE ("ACE_Condition::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); -#if defined (CHORUS) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("condname_ = %s\n"), this->condname_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("process_cond_ = %x\n"), this->process_cond_)); -#endif /* CHORUS */ - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template -ACE_Thread_Condition::ACE_Thread_Condition (MUTEX &m, - const ACE_TCHAR *name, - void *arg) - : ACE_Condition (m, USYNC_THREAD, name, arg) -{ -// ACE_TRACE ("ACE_Thread_Condition::ACE_Thread_Condition"); -} - -template void -ACE_Thread_Condition::dump (void) const -{ -// ACE_TRACE ("ACE_Thread_Condition::dump"); - - ACE_Condition::dump (); -} - -template -ACE_Condition::ACE_Condition (MUTEX &m, - int type, - const ACE_TCHAR *name, - void *arg) - : -#if defined (CHORUS) - process_cond_(0), - condname_ (0), -#endif /* CHORUS */ - mutex_ (m) -{ - -#if defined(CHORUS) - if (type == USYNC_PROCESS) - { - // Let's see if the shared memory entity already exists. - ACE_HANDLE fd = ACE_OS::shm_open (name, - O_RDWR | O_CREAT | O_EXCL, - ACE_DEFAULT_FILE_PERMS); - if (fd == ACE_INVALID_HANDLE) - { - if (errno == EEXIST) - fd = ACE_OS::shm_open (name, - O_RDWR | O_CREAT, - ACE_DEFAULT_FILE_PERMS); - else - return; - } - else - { - // We own this shared memory object! Let's set its size. - if (ACE_OS::ftruncate (fd, - sizeof (ACE_mutex_t)) == -1) - { - ACE_OS::close (fd); - return; - } - this->condname_ = ACE_OS::strdup (name); - if (this->condname_ == 0) - { - ACE_OS::close (fd); - return; - } - } - - this->process_cond_ = - (ACE_cond_t *) ACE_OS::mmap (0, - sizeof (ACE_cond_t), - PROT_RDWR, - MAP_SHARED, - fd, - 0); - ACE_OS::close (fd); - if (this->process_cond_ == MAP_FAILED) - return; - - if (this->condname_ - && ACE_OS::cond_init (this->process_cond_, - type, - name, - arg) != 0) - return; - } - // It is ok to fall through into the below if the - // USYNC_PROCESS flag is not enabled. -#endif /* CHORUS */ - - // ACE_TRACE ("ACE_Condition::ACE_Condition"); - - if (ACE_OS::cond_init (&this->cond_, - (short) type, - name, - arg) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Condition::ACE_Condition"))); -} - -template -ACE_Condition::~ACE_Condition (void) -{ - // ACE_TRACE ("ACE_Condition::~ACE_Condition"); - - if (this->remove () == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Condition::~ACE_Condition"))); -} - -template int -ACE_Condition::wait (void) -{ - // ACE_TRACE ("ACE_Condition::wait"); -#if defined (CHORUS) - if (this->process_cond_ != 0) - return ACE_OS::cond_wait (this->process_cond_, - &this->mutex_.lock_); -#endif /* CHORUS */ - return ACE_OS::cond_wait (&this->cond_, - &this->mutex_.lock_); -} - -template int -ACE_Condition::wait (MUTEX &mutex, - const ACE_Time_Value *abstime) -{ -// ACE_TRACE ("ACE_Condition::wait"); - if (abstime == 0) - return this->wait (); - else - { -#if defined (CHORUS) - if (this->process_cond_ != 0) - return ACE_OS::cond_timedwait (this->process_cond_, - &mutex_.lock_, - (ACE_Time_Value *) abstime); -#endif /* CHORUS */ - return ACE_OS::cond_timedwait (&this->cond_, - &mutex.lock_, - (ACE_Time_Value *) abstime); - } -} - -// Peform an "alertable" timed wait. If the argument ABSTIME == 0 -// then we do a regular cond_wait(), else we do a timed wait for up to -// ABSTIME using the Solaris cond_timedwait() function. - -template int -ACE_Condition::wait (const ACE_Time_Value *abstime) -{ -// ACE_TRACE ("ACE_Condition::wait"); - return this->wait (this->mutex_, abstime); -} -#endif /* ACE_HAS_THREADS */ - -ACE_ALLOC_HOOK_DEFINE(ACE_TSS) - -template -ACE_TSS::~ACE_TSS (void) -{ - // We can't call until *all* of the threads - // that are using that key have done an . - // Otherwise, we'll end up with "dangling TSS pointers." - ACE_OS::thr_key_detach (this); -} - -template TYPE * -ACE_TSS::operator-> () const -{ - return this->ts_get (); -} - -template -ACE_TSS::operator TYPE *(void) const -{ - return this->ts_get (); -} - -template TYPE * -ACE_TSS::make_TSS_TYPE (void) const -{ - TYPE *temp = 0; - ACE_NEW_RETURN (temp, - TYPE, - 0); - return temp; -} - -template void -ACE_TSS::dump (void) const -{ -// ACE_TRACE ("ACE_TSS::dump"); -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->keylock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %d\n"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nonce_ = %d"), this->once_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ -} - -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) -#if defined (ACE_HAS_THR_C_DEST) -extern "C" void ACE_TSS_C_cleanup(void *); // defined in Synch.cpp -#endif /* ACE_HAS_THR_C_DEST */ - -template void -ACE_TSS::cleanup (void *ptr) -{ - // Cast this to the concrete TYPE * so the destructor gets called. - delete (TYPE *) ptr; -} - -template int -ACE_TSS::ts_init (void) const -{ - // Insure that we are serialized! - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->keylock_, 0); - - // Use the Double-Check pattern to make sure we only create the key - // once! - if (this->once_ == 0) - { - if (ACE_Thread::keycreate (ACE_const_cast (ACE_thread_key_t *, &this->key_), -#if defined (ACE_HAS_THR_C_DEST) - &ACE_TSS_C_cleanup, -#else - &ACE_TSS::cleanup, -#endif /* ACE_HAS_THR_C_DEST */ - (void *) this) != 0) - return -1; // Major problems, this should *never* happen! - else - { - // This *must* come last to avoid race conditions! Note that - // we need to "cast away const..." - * ACE_const_cast (int*, &this->once_) = 1; - return 0; - } - } - - return -1; -} - -template -ACE_TSS::ACE_TSS (TYPE *ts_obj) - : once_ (0), - key_ (ACE_OS::NULL_key) -{ - // If caller has passed us a non-NULL TYPE *, then we'll just use - // this to initialize the thread-specific value. Thus, subsequent - // calls to operator->() will return this value. This is useful - // since it enables us to assign objects to thread-specific data - // that have arbitrarily complex constructors! - - if (ts_obj != 0) - { - if (this->ts_init () == -1) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - // What should we do if this call fails?! -#if defined (ACE_HAS_WINCE) - ::MessageBox (0, - L"ACE_Thread::keycreate() failed!", - L"ACE_TSS::ACE_TSS", - MB_OK); -#else - ACE_OS::fprintf (stderr, - "ACE_Thread::keycreate() failed!"); -#endif /* ACE_HAS_WINCE */ - return; - } - -#if defined (ACE_HAS_THR_C_DEST) - // Encapsulate a ts_obj and it's destructor in an - // ACE_TSS_Adapter. - ACE_TSS_Adapter *tss_adapter; - ACE_NEW (tss_adapter, - ACE_TSS_Adapter ((void *) ts_obj, - ACE_TSS::cleanup)); - - // Put the adapter in thread specific storage - if (ACE_Thread::setspecific (this->key_, - (void *) tss_adapter) != 0) - { - delete tss_adapter; - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Thread::setspecific() failed!"))); - } -#else - if (ACE_Thread::setspecific (this->key_, - (void *) ts_obj) != 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Thread::setspecific() failed!"))); -#endif /* ACE_HAS_THR_C_DEST */ - } -} - -template TYPE * -ACE_TSS::ts_get (void) const -{ - if (this->once_ == 0) - // Create and initialize thread-specific ts_obj. - this->ts_init (); - - TYPE *ts_obj = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - - // Get the adapter from thread-specific storage - if (ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter) == -1) - return 0; // This should not happen! - - // Check to see if this is the first time in for this thread. - if (tss_adapter == 0) -#else - // Get the ts_obj from thread-specific storage. Note that no locks - // are required here... - if (ACE_Thread::getspecific (this->key_, - (void **) &ts_obj) == -1) - return 0; // This should not happen! - - // Check to see if this is the first time in for this thread. - if (ts_obj == 0) -#endif /* ACE_HAS_THR_C_DEST */ - { - // Allocate memory off the heap and store it in a pointer in - // thread-specific storage (on the stack...). - - ts_obj = this->make_TSS_TYPE (); - - if (ts_obj == 0) - return 0; - -#if defined (ACE_HAS_THR_C_DEST) - // Encapsulate a ts_obj and it's destructor in an - // ACE_TSS_Adapter. - ACE_NEW_RETURN (tss_adapter, - ACE_TSS_Adapter (ts_obj, - ACE_TSS::cleanup), 0); - - // Put the adapter in thread specific storage - if (ACE_Thread::setspecific (this->key_, - (void *) tss_adapter) != 0) - { - delete tss_adapter; - delete ts_obj; - return 0; // Major problems, this should *never* happen! - } -#else - // Store the dynamically allocated pointer in thread-specific - // storage. - if (ACE_Thread::setspecific (this->key_, - (void *) ts_obj) != 0) - { - delete ts_obj; - return 0; // Major problems, this should *never* happen! - } -#endif /* ACE_HAS_THR_C_DEST */ - } - -#if defined (ACE_HAS_THR_C_DEST) - // Return the underlying ts object. - return (TYPE *) tss_adapter->ts_obj_; -#else - return ts_obj; -#endif /* ACE_HAS_THR_C_DEST */ -} - -// Get the thread-specific object for the key associated with this -// object. Returns 0 if the ts_obj has never been initialized, -// otherwise returns a pointer to the ts_obj. - -template TYPE * -ACE_TSS::ts_object (void) const -{ - // Ensure that we are serialized! - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->keylock_, 0); - - if (this->once_ == 0) // Return 0 if we've never been initialized. - return 0; - - TYPE *ts_obj = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - - // Get the tss adapter from thread-specific storage - if (ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter) == -1) - return 0; // This should not happen! - else if (tss_adapter != 0) - // Extract the real TS object. - ts_obj = (TYPE *) tss_adapter->ts_obj_; -#else - if (ACE_Thread::getspecific (this->key_, - (void **) &ts_obj) == -1) - return 0; // This should not happen! -#endif /* ACE_HAS_THR_C_DEST */ - - return ts_obj; -} - -template TYPE * -ACE_TSS::ts_object (TYPE *new_ts_obj) -{ - // Note, we shouldn't hold the keylock at this point because - // does it for us and we'll end up with deadlock - // otherwise... - if (this->once_ == 0) - // Create and initialize thread-specific ts_obj. - this->ts_init (); - - // Ensure that we are serialized! - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->keylock_, 0); - - TYPE *ts_obj = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - - if (ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter) == -1) - return 0; // This should not happen! - - if (tss_adapter != 0) - { - ts_obj = (TYPE *) tss_adapter->ts_obj_; - delete tss_adapter; // don't need this anymore - } - - ACE_NEW_RETURN (tss_adapter, - ACE_TSS_Adapter ((void *) new_ts_obj, - ACE_TSS::cleanup), - 0); - - if (ACE_Thread::setspecific (this->key_, - (void *) tss_adapter) == -1) - { - delete tss_adapter; - return ts_obj; // This should not happen! - } -#else - if (ACE_Thread::getspecific (this->key_, - (void **) &ts_obj) == -1) - return 0; // This should not happen! - if (ACE_Thread::setspecific (this->key_, - (void *) new_ts_obj) == -1) - return ts_obj; // This should not happen! -#endif /* ACE_HAS_THR_C_DEST */ - - return ts_obj; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_TSS_Guard) - -template void -ACE_TSS_Guard::dump (void) const -{ -// ACE_TRACE ("ACE_TSS_Guard::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %d"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template void -ACE_TSS_Guard::init_key (void) -{ -// ACE_TRACE ("ACE_TSS_Guard::init_key"); - - this->key_ = ACE_OS::NULL_key; - ACE_Thread::keycreate (&this->key_, -#if defined (ACE_HAS_THR_C_DEST) - &ACE_TSS_C_cleanup, -#else - &ACE_TSS_Guard::cleanup, -#endif /* ACE_HAS_THR_C_DEST */ - (void *) this); -} - -template -ACE_TSS_Guard::ACE_TSS_Guard (void) -{ -// ACE_TRACE ("ACE_TSS_Guard::ACE_TSS_Guard"); - this->init_key (); -} - -template int -ACE_TSS_Guard::release (void) -{ -// ACE_TRACE ("ACE_TSS_Guard::release"); - - ACE_Guard *guard = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter); - guard = (ACE_Guard *)tss_adapter->ts_obj_; -#else - ACE_Thread::getspecific (this->key_, - (void **) &guard); -#endif /* ACE_HAS_THR_C_DEST */ - - return guard->release (); -} - -template int -ACE_TSS_Guard::remove (void) -{ -// ACE_TRACE ("ACE_TSS_Guard::remove"); - - ACE_Guard *guard = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter); - guard = (ACE_Guard *) tss_adapter->ts_obj_; -#else - ACE_Thread::getspecific (this->key_, - (void **) &guard); -#endif /* ACE_HAS_THR_C_DEST */ - - return guard->remove (); -} - -template -ACE_TSS_Guard::~ACE_TSS_Guard (void) -{ -// ACE_TRACE ("ACE_TSS_Guard::~ACE_TSS_Guard"); - - ACE_Guard *guard = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter); - guard = (ACE_Guard *) tss_adapter->ts_obj_; -#else - ACE_Thread::getspecific (this->key_, - (void **) &guard); -#endif /* ACE_HAS_THR_C_DEST */ - - // Make sure that this pointer is NULL when we shut down... - ACE_Thread::setspecific (this->key_, 0); - ACE_Thread::keyfree (this->key_); - // Destructor releases lock. - delete guard; -} - -template void -ACE_TSS_Guard::cleanup (void *ptr) -{ -// ACE_TRACE ("ACE_TSS_Guard::cleanup"); - - // Destructor releases lock. - delete (ACE_Guard *) ptr; -} - -template -ACE_TSS_Guard::ACE_TSS_Guard (ACE_LOCK &lock, int block) -{ -// ACE_TRACE ("ACE_TSS_Guard::ACE_TSS_Guard"); - - this->init_key (); - ACE_Guard *guard; - ACE_NEW (guard, - ACE_Guard (lock, - block)); - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter; - ACE_NEW (tss_adapter, - ACE_TSS_Adapter ((void *) guard, - ACE_TSS_Guard::cleanup)); - ACE_Thread::setspecific (this->key_, - (void *) tss_adapter); -#else - ACE_Thread::setspecific (this->key_, - (void *) guard); -#endif /* ACE_HAS_THR_C_DEST */ -} - -template int -ACE_TSS_Guard::acquire (void) -{ -// ACE_TRACE ("ACE_TSS_Guard::acquire"); - - ACE_Guard *guard = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter); - guard = (ACE_Guard *) tss_adapter->ts_obj_; -#else - ACE_Thread::getspecific (this->key_, - (void **) &guard); -#endif /* ACE_HAS_THR_C_DEST */ - - return guard->acquire (); -} - -template int -ACE_TSS_Guard::tryacquire (void) -{ -// ACE_TRACE ("ACE_TSS_Guard::tryacquire"); - - ACE_Guard *guard = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter); - guard = (ACE_Guard *) tss_adapter->ts_obj_; -#else - ACE_Thread::getspecific (this->key_, - (void **) &guard); -#endif /* ACE_HAS_THR_C_DEST */ - - return guard->tryacquire (); -} - -template -ACE_TSS_Write_Guard::ACE_TSS_Write_Guard (ACE_LOCK &lock, - int block) -{ -// ACE_TRACE ("ACE_TSS_Write_Guard::ACE_TSS_Write_Guard"); - - this->init_key (); - ACE_Guard *guard; - ACE_NEW (guard, - ACE_Write_Guard (lock, - block)); - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter; - ACE_NEW (tss_adapter, - ACE_TSS_Adapter ((void *) guard, - ACE_TSS_Guard::cleanup)); - ACE_Thread::setspecific (this->key_, - (void *) tss_adapter); -#else - ACE_Thread::setspecific (this->key_, - (void *) guard); -#endif /* ACE_HAS_THR_C_DEST */ -} - -template int -ACE_TSS_Write_Guard::acquire (void) -{ -// ACE_TRACE ("ACE_TSS_Write_Guard::acquire"); - - ACE_Write_Guard *guard = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter); - guard = (ACE_Guard *) tss_adapter->ts_obj_; -#else - ACE_Thread::getspecific (this->key_, - (void **) &guard); -#endif /* ACE_HAS_THR_C_DEST */ - - return guard->acquire_write (); -} - -template int -ACE_TSS_Write_Guard::tryacquire (void) -{ -// ACE_TRACE ("ACE_TSS_Write_Guard::tryacquire"); - - ACE_Write_Guard *guard = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter); - guard = (ACE_Guard *) tss_adapter->ts_obj_; -#else - ACE_Thread::getspecific (this->key_, - (void **) &guard); -#endif /* ACE_HAS_THR_C_DEST */ - - return guard->tryacquire_write (); -} - -template int -ACE_TSS_Write_Guard::acquire_write (void) -{ -// ACE_TRACE ("ACE_TSS_Write_Guard::acquire_write"); - - return this->acquire (); -} - -template int -ACE_TSS_Write_Guard::tryacquire_write (void) -{ -// ACE_TRACE ("ACE_TSS_Write_Guard::tryacquire_write"); - - return this->tryacquire (); -} - -template void -ACE_TSS_Write_Guard::dump (void) const -{ -// ACE_TRACE ("ACE_TSS_Write_Guard::dump"); - ACE_TSS_Guard::dump (); -} - -template -ACE_TSS_Read_Guard::ACE_TSS_Read_Guard (ACE_LOCK &lock, int block) -{ -// ACE_TRACE ("ACE_TSS_Read_Guard::ACE_TSS_Read_Guard"); - - this->init_key (); - ACE_Guard *guard; - ACE_NEW (guard, - ACE_Read_Guard (lock, - block)); -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter; - ACE_NEW (tss_adapter, - ACE_TSS_Adapter ((void *)guard, - ACE_TSS_Guard::cleanup)); - ACE_Thread::setspecific (this->key_, - (void *) tss_adapter); -#else - ACE_Thread::setspecific (this->key_, - (void *) guard); -#endif /* ACE_HAS_THR_C_DEST */ -} - -template int -ACE_TSS_Read_Guard::acquire (void) -{ -// ACE_TRACE ("ACE_TSS_Read_Guard::acquire"); - - ACE_Read_Guard *guard = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter); - guard = (ACE_Guard *) tss_adapter->ts_obj_; -#else - ACE_Thread::getspecific (this->key_, - (void **) &guard); -#endif /* ACE_HAS_THR_C_DEST */ - - return guard->acquire_read (); -} - -template int -ACE_TSS_Read_Guard::tryacquire (void) -{ -// ACE_TRACE ("ACE_TSS_Read_Guard::tryacquire"); - - ACE_Read_Guard *guard = 0; - -#if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = 0; - ACE_Thread::getspecific (this->key_, - (void **) &tss_adapter); - guard = (ACE_Guard *) tss_adapter->ts_obj_; -#else - ACE_Thread::getspecific (this->key_, - (void **) &guard); -#endif /* ACE_HAS_THR_C_DEST */ - - return guard->tryacquire_read (); -} - -template int -ACE_TSS_Read_Guard::acquire_read (void) -{ -// ACE_TRACE ("ACE_TSS_Read_Guard::acquire_read"); - - return this->acquire (); -} - -template int -ACE_TSS_Read_Guard::tryacquire_read (void) -{ -// ACE_TRACE ("ACE_TSS_Read_Guard::tryacquire_read"); - - return this->tryacquire (); -} - -template void -ACE_TSS_Read_Guard::dump (void) const -{ -// ACE_TRACE ("ACE_TSS_Read_Guard::dump"); - ACE_TSS_Guard::dump (); -} - - -#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ - -#endif /* ACE_SYNCH_T_C */ diff --git a/ace/Synch_T.h b/ace/Synch_T.h deleted file mode 100644 index 4725c6064c6..00000000000 --- a/ace/Synch_T.h +++ /dev/null @@ -1,909 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Synch_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_SYNCH_T_H -#define ACE_SYNCH_T_H -#include "ace/pre.h" -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward decl -class ACE_Time_Value; - -/** - * @class ACE_Lock_Adapter - * - * @brief This is an adapter that allows applications to transparently - * combine the abstract base class (which contains - * pure virtual methods) with any of the other concrete ACE - * synchronization classes (e.g., , , - * , etc.). - * - * This class uses a form of the Adapter pattern. - */ -template -class ACE_Lock_Adapter : public ACE_Lock -{ -public: - typedef ACE_LOCKING_MECHANISM ACE_LOCK; - - // = Initialization/Finalization methods. - - /// Constructor. All locking requests will be forwarded to . - ACE_Lock_Adapter (ACE_LOCKING_MECHANISM &lock); - - /// Constructor. Since no lock is provided by the user, one will be - /// created internally. - ACE_Lock_Adapter (void); - - /// Destructor. If was not passed in by the user, it will be - /// deleted. - virtual ~ACE_Lock_Adapter (void); - - // = Lock accessors. - /// Block the thread until the lock is acquired. - virtual int acquire (void); - - /// Conditionally acquire the lock (i.e., won't block). - virtual int tryacquire (void); - - /// Release the lock. - virtual int release (void); - - /** - * Block until the thread acquires a read lock. If the locking - * mechanism doesn't support read locks then this just calls - * . - */ - virtual int acquire_read (void); - - /** - * Block until the thread acquires a write lock. If the locking - * mechanism doesn't support read locks then this just calls - * . - */ - virtual int acquire_write (void); - - /// Conditionally acquire a read lock. If the locking mechanism - /// doesn't support read locks then this just calls . - virtual int tryacquire_read (void); - - /// Conditionally acquire a write lock. If the locking mechanism - /// doesn't support read locks then this just calls . - virtual int tryacquire_write (void); - - /** - * Conditionally try to upgrade a lock held for read to a write lock. - * If the locking mechanism doesn't support read locks then this just - * calls . Returns 0 on success, -1 on failure. - */ - virtual int tryacquire_write_upgrade (void); - - /// Explicitly destroy the lock. - virtual int remove (void); - -private: - /// The concrete locking mechanism that all the methods delegate to. - ACE_LOCKING_MECHANISM *lock_; - - /// This flag keep track of whether we are responsible for deleting - /// the lock - int delete_lock_; -}; - -/** - * @class ACE_Acquire_Method - * - * @brief An enum class. - * - * These enums should have been inside the reverse lock class, but - * some lame compilers cannot handle enums inside template classes. - * - * The METHOD_TYPE is used to indicate which acquire() method will be - * called on the real lock when the release() method is called on the - * reverse lock. REGULAR indicated the acquire() method, READ - * indicates the acquire_read() method, and WRITE indicates the - * acquire_write() method. Note that the try_*() methods are not - * represented here because we have to make sure that the release() - * method on the reverse lock acquires a lock on the real lock. - **/ -class ACE_Acquire_Method -{ -public: - enum METHOD_TYPE - { - ACE_REGULAR, - ACE_READ, - ACE_WRITE - }; -}; - -/** - * @class ACE_Reverse_Lock - * - * @brief A reverse (or anti) lock. - * - * This is an interesting adapter class that changes a lock into - * a reverse lock, i.e., on this class calls - * on the lock, and on this class calls on - * the lock. - * One motivation for this class is when we temporarily want to - * release a lock (which we have already acquired) but then - * reacquire it soon after. An alternative design would be to - * add a Anti_Guard or Reverse_Guard class which would - * on construction and destruction. However, there - * are *many* varieties of the Guard class and this design - * choice would lead to at least 6 new classes. One new - * ACE_Reverse_Lock class seemed more reasonable. - */ -template -class ACE_Reverse_Lock : public ACE_Lock -{ -public: - - typedef ACE_LOCKING_MECHANISM ACE_LOCK; - - // = Initialization/Finalization methods. - - /// Constructor. All locking requests will be forwarded to . - ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock, - ACE_Acquire_Method::METHOD_TYPE acquire_method = ACE_Acquire_Method::ACE_REGULAR); - - /// Destructor. If was not passed in by the user, it will be - /// deleted. - virtual ~ACE_Reverse_Lock (void); - - // = Lock accessors. - /// Release the lock. - virtual int acquire (void); - - /// Release the lock. - virtual int tryacquire (void); - - /// Acquire the lock. - virtual int release (void); - - /// Release the lock. - virtual int acquire_read (void); - - /// Release the lock. - virtual int acquire_write (void); - - /// Release the lock. - virtual int tryacquire_read (void); - - /// Release the lock. - virtual int tryacquire_write (void); - - /// Release the lock. - virtual int tryacquire_write_upgrade (void); - - /// Explicitly destroy the lock. - virtual int remove (void); - -private: - /// The concrete locking mechanism that all the methods delegate to. - ACE_LOCKING_MECHANISM &lock_; - - /// This indicates what kind of acquire method will be called. - ACE_Acquire_Method::METHOD_TYPE acquire_method_; -}; - -/** - * @class ACE_TSS - * - * @brief Allows objects that are "physically" in thread specific - * storage (i.e., private to a thread) to be accessed as though - * they were "logically" global to a program. - * - * This class is a wrapper around the OS thread library - * thread-specific functions. It uses the > to - * shield applications from the details of accessing - * thread-specific storage. - * - * NOTE: For maximal portability, cannot be a built-in type, - * but instead should be a user-defined class (some compilers will - * allow a built-in type, others won't). See template class - * ACE_TSS_Type_Adapter, below, for adapting built-in types to work - * with ACE_TSS. - */ -template -class ACE_TSS -{ -public: - // = Initialization and termination methods. - - /** - * If caller has passed us a non-NULL ts_obj *, then we'll just use - * this to initialize the thread-specific value (but only for the - * calling thread). Thus, subsequent calls to > in this - * thread will return this value. This is useful since it enables - * us to assign objects to thread-specific data that have - * arbitrarily complex constructors. - */ - ACE_TSS (TYPE *ts_obj = 0); - - /// Deregister with thread-key administration. - virtual ~ACE_TSS (void); - - // = Accessors. - - /** - * Get the thread-specific object for the key associated with this - * object. Returns 0 if the data has never been initialized, - * otherwise returns a pointer to the data. - */ - TYPE *ts_object (void) const; - - /// Set the thread-specific object for the key associated with this - /// object. - TYPE *ts_object (TYPE *); - - /// Use a "smart pointer" to get the thread-specific object - /// associated with the . - TYPE *operator-> () const; - - /// Return or create and return the calling threads TYPE object. - operator TYPE *(void) const; - - /// Hook for construction parameters. - virtual TYPE *make_TSS_TYPE (void) const; - - // = Utility methods. - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -protected: - /// Actually implements the code that retrieves the object from - /// thread-specific storage. - TYPE *ts_get (void) const; - - /// Factors out common code for initializing TSS. This must NOT be - /// called with the lock held... - int ts_init (void) const; - -#if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) - /// This implementation only works for non-threading systems... - TYPE *type_; -#else - /// Avoid race conditions during initialization. - ACE_Thread_Mutex keylock_; - - /// "First time in" flag. - int once_; - - /// Key for the thread-specific error data. - ACE_thread_key_t key_; - - /// "Destructor" that deletes internal TYPE * when thread exits. - static void cleanup (void *ptr); -#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ - // = Disallow copying... - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS (const ACE_TSS &)) -}; - -/** - * @class ACE_TSS_Type_Adapter - * - * @brief Adapter that allows built-in types to be used with ACE_TSS. - * - * Wraps a value of a built-in type, providing conversions to - * and from the type. Example use with ACE_TSS: - * ACE_TSS > i; - * *i = 37; - * ACE_OS::fprintf (stderr, "%d\n", *i); - * Unfortunately, though, some compilers have trouble with the - * implicit type conversions. This seems to work better: - * ACE_TSS > i; - * i->operator int & () = 37; - * ACE_OS::fprintf (stderr, "%d\n", i->operator int ()); - */ -template -class ACE_TSS_Type_Adapter -{ -public: - /// Constructor. Inlined here so that it should _always_ be inlined. - ACE_TSS_Type_Adapter (const TYPE value = 0): value_ (value) {} - - /// TYPE conversion. Inlined here so that it should _always_ be - /// inlined. - operator TYPE () const { return value_; }; - - /// TYPE & conversion. Inlined here so that it should _always_ be - /// inlined. - operator TYPE &() { return value_; }; - -private: - /// The wrapped value. - TYPE value_; -}; - -/** - * @class ACE_Guard - * - * @brief This data structure is meant to be used within a method or - * function... It performs automatic aquisition and release of - * a parameterized synchronization object . - * - * The class given as an actual parameter must provide at - * the very least the , , , and - * methods. - */ -template -class ACE_Guard -{ -public: - - // = Initialization and termination methods. - ACE_Guard (ACE_LOCK &l); - - /// Implicitly and automatically acquire (or try to acquire) the - /// lock. If is non-0 then the , else - /// it. - ACE_Guard (ACE_LOCK &l, int block); - - /// Initialise the guard without implicitly acquiring the lock. The - /// parameter indicates whether the guard should release - /// the lock implicitly on destruction. The parameter is - /// ignored and is used here to disambiguate with the preceding - /// constructor. - ACE_Guard (ACE_LOCK &l, int block, int become_owner); - - /// Implicitly release the lock. - ~ACE_Guard (void); - - // = Lock accessors. - - /// Explicitly acquire the lock. - int acquire (void); - - /// Conditionally acquire the lock (i.e., won't block). - int tryacquire (void); - - /// Explicitly release the lock, but only if it is held! - int release (void); - - /// Relinquish ownership of the lock so that it is not released - /// implicitly in the destructor. - void disown (void); - - // = Utility methods. - /// 1 if locked, 0 if couldn't acquire the lock - /// (errno will contain the reason for this). - int locked (void) const; - - /// Explicitly remove the lock. - int remove (void); - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -protected: - - /// Helper, meant for subclass only. - ACE_Guard (ACE_LOCK *lock): lock_ (lock) {} - - /// Pointer to the ACE_LOCK we're guarding. - ACE_LOCK *lock_; - - /// Keeps track of whether we acquired the lock or failed. - int owner_; - -private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Guard &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Guard (const ACE_Guard &)) -}; - -/** - * @class ACE_Write_Guard - * - * @brief This class is similar to class , though it - * acquires/releases a write lock automatically (naturally, the - * it is instantiated with must support the appropriate - * API). - */ -template -class ACE_Write_Guard : public ACE_Guard -{ -public: - // = Initialization method. - - /// Implicitly and automatically acquire a write lock. - ACE_Write_Guard (ACE_LOCK &m); - - /// Implicitly and automatically acquire (or try to acquire) a write - /// lock. - ACE_Write_Guard (ACE_LOCK &m, int block); - - // = Lock accessors. - - /// Explicitly acquire the write lock. - int acquire_write (void); - - /// Explicitly acquire the write lock. - int acquire (void); - - /// Conditionally acquire the write lock (i.e., won't block). - int tryacquire_write (void); - - /// Conditionally acquire the write lock (i.e., won't block). - int tryacquire (void); - - // = Utility methods. - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. -}; - -/** - * @class ACE_Read_Guard - * - * @brief This class is similar to class , though it - * acquires/releases a read lock automatically (naturally, the - * it is instantiated with must support the appropriate - * API). - */ -template -class ACE_Read_Guard : public ACE_Guard -{ -public: - // = Initialization methods. - - /// Implicitly and automatically acquire a read lock. - ACE_Read_Guard (ACE_LOCK& m); - - /// Implicitly and automatically acquire (or try to acquire) a read - /// lock. - ACE_Read_Guard (ACE_LOCK &m, int block); - - // = Lock accessors. - - /// Explicitly acquire the read lock. - int acquire_read (void); - - /// Explicitly acquire the read lock. - int acquire (void); - - /// Conditionally acquire the read lock (i.e., won't block). - int tryacquire_read (void); - - /// Conditionally acquire the read lock (i.e., won't block). - int tryacquire (void); - - // = Utility methods. - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. -}; - -#if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) - -#define ACE_TSS_Guard ACE_Guard -#define ACE_TSS_Write_GUARD ACE_Write_Guard -#define ACE_TSS_Read_GUARD ACE_Read_Guard - -#else - /* ACE platform supports some form of threading and - thread-specific storage. */ - -/** - * @class ACE_TSS_Guard - * - * @brief This data structure is meant to be used within a method or - * function... It performs automatic aquisition and release of - * a synchronization object. Moreover, it ensures that the lock - * is released even if a thread exits via ! - */ -template -class ACE_TSS_Guard -{ -public: - // = Initialization and termination methods. - - /// Implicitly and automatically acquire the thread-specific lock. - ACE_TSS_Guard (ACE_LOCK &lock, int block = 1); - - /// Implicitly release the thread-specific lock. - ~ACE_TSS_Guard (void); - - // = Lock accessors. - - /// Explicitly acquire the thread-specific lock. - int acquire (void); - - /// Conditionally acquire the thread-specific lock (i.e., won't - /// block). - int tryacquire (void); - - /// Explicitly release the thread-specific lock. - int release (void); - - // = Utility methods. - /// Explicitly release the thread-specific lock. - int remove (void); - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -protected: - /// Helper, meant for subclass only. - ACE_TSS_Guard (void); - - /// Initialize the key. - void init_key (void); - - /// Called when thread exits to clean up the lock. - static void cleanup (void *ptr); - - /// Thread-specific key... - ACE_thread_key_t key_; - -private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Guard &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Guard (const ACE_TSS_Guard &)) -}; - -/** - * @class ACE_TSS_Write_Guard - * - * @brief This class is similar to class ACE_TSS_Guard, though it - * acquires/releases a write-lock automatically (naturally, the - * ACE_LOCK it is instantiated with must support the appropriate - * API). - */ -template -class ACE_TSS_Write_Guard : public ACE_TSS_Guard -{ -public: - // = Initialization method. - - /// Implicitly and automatically acquire the thread-specific write lock. - ACE_TSS_Write_Guard (ACE_LOCK &lock, int block = 1); - - // = Lock accessors. - - /// Explicitly acquire the thread-specific write lock. - int acquire_write (void); - - /// Explicitly acquire the thread-specific write lock. - int acquire (void); - - /// Conditionally acquire the thread-specific write lock (i.e., won't block). - int tryacquire_write (void); - - /// Conditionally acquire the thread-specific write lock (i.e., won't block). - int tryacquire (void); - - // = Utility methods. - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. -}; - -/** - * @class ACE_TSS_Read_Guard - * - * @brief This class is similar to class , though it - * acquires/releases a read lock automatically (naturally, the - * it is instantiated with must support the - * appropriate API). - */ -template -class ACE_TSS_Read_Guard : public ACE_TSS_Guard -{ -public: - // = Initialization method. - /// Implicitly and automatically acquire the thread-specific read lock. - ACE_TSS_Read_Guard (ACE_LOCK &lock, int block = 1); - - // = Lock accessors. - /// Explicitly acquire the thread-specific read lock. - int acquire_read (void); - - /// Explicitly acquire the thread-specific read lock. - int acquire (void); - - /// Conditionally acquire the thread-specific read lock (i.e., won't - /// block). - int tryacquire_read (void); - - /// Conditionally acquire the thread-specific read lock (i.e., won't - /// block). - int tryacquire (void); - - // = Utility methods. - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. -}; -#endif /* !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */ - -#if defined (ACE_HAS_THREADS) /* ACE platform supports some form of threading. */ - -/** - * @class ACE_Condition - * - * @brief ACE_Condition variable wrapper, which allows threads to block - * until shared data changes state. - * - * A condition variable enables threads to atomically block and - * test the condition under the protection of a mutual exclu- - * sion lock (mutex) until the condition is satisfied. That is, - * the mutex must have been held by the thread before calling - * wait or signal on the condition. If the condition is false, - * a thread blocks on a condition variable and atomically - * releases the mutex that is waiting for the condition to - * change. If another thread changes the condition, it may wake - * up waiting threads by signaling the associated condition - * variable. The waiting threads, upon awakening, reacquire the - * mutex and re-evaluate the condition. - * Note, you can only parameterize with - * @a ACE_Thread_Mutex, @a ACE_Recursive_Thread_Mutex, or @a ACE_Null_Mutex. - */ -template -class ACE_Condition -{ -public: - // = Initialiation and termination methods. - /// Initialize the condition variable. - ACE_Condition (MUTEX &m, int type = USYNC_THREAD, - const ACE_TCHAR *name = 0, void *arg = 0); - - /// Implicitly destroy the condition variable. - ~ACE_Condition (void); - - // = Lock accessors. - /** - * Block on condition, or until absolute time-of-day has passed. If - * abstime == 0 use "blocking" semantics. Else, if - * != 0 and the call times out before the condition is signaled - * returns -1 and sets errno to ETIME. - */ - int wait (const ACE_Time_Value *abstime); - - /// Block on condition. - int wait (void); - - /** - * Block on condition or until absolute time-of-day has passed. If - * abstime == 0 use "blocking" wait() semantics on the - * passed as a parameter (this is useful if you need to store the - * in shared memory). Else, if != 0 and the - * call times out before the condition is signaled returns -1 - * and sets errno to ETIME. - */ - int wait (MUTEX &mutex, const ACE_Time_Value *abstime = 0); - - /// Signal one waiting thread. - int signal (void); - - /// Signal *all* waiting threads. - int broadcast (void); - - // = Utility methods. - /// Explicitly destroy the condition variable. - int remove (void); - - /// Returns a reference to the underlying mutex_; - MUTEX &mutex (void); - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -protected: -#if defined (CHORUS) - /// This condition resides in shared memory. - ACE_cond_t *process_cond_; - - /** - * Remember the name of the condition if we created it so we can - * unlink it when we go away (only the actor that initialized the - * memory can destroy it). - */ - const ACE_TCHAR *condname_; -#endif /* CHORUS */ - - /// Condition variable. - ACE_cond_t cond_; - - /// Reference to mutex lock. - MUTEX &mutex_; - -private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Condition &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Condition (const ACE_Condition &)) -}; - -/** - * @class ACE_Thread_Condition - * - * @brief ACE_Condition variable wrapper that works within processes. - * - * A condition variable enables threads to atomically block and - * test the condition under the protection of a mutual exclu- - * sion lock (mutex) until the condition is satisfied. That is, - * the mutex must have been held by the thread before calling - * wait or signal on the condition. If the condition is false, - * a thread blocks on a condition variable and atomically - * releases the mutex that is waiting for the condition to - * change. If another thread changes the condition, it may wake - * up waiting threads by signaling the associated condition - * variable. The waiting threads, upon awakening, reacquire the - * mutex and re-evaluate the condition. - */ -template -class ACE_Thread_Condition : public ACE_Condition -{ -public: - // = Initialization method. - ACE_Thread_Condition (MUTEX &m, const ACE_TCHAR *name = 0, void *arg = 0); - - /// Dump the state of an object. - void dump (void) const; - - // ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. -}; - -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - -/** - * @class ACE_NULL_SYNCH - * - * @brief Implement a do nothing Synchronization wrapper that - * typedefs the and to the Null* versions. - */ -class ACE_Export ACE_NULL_SYNCH -{ -public: - typedef ACE_Null_Mutex MUTEX; - typedef ACE_Null_Mutex NULL_MUTEX; - typedef ACE_Null_Mutex PROCESS_MUTEX; - typedef ACE_Null_Mutex RECURSIVE_MUTEX; - typedef ACE_Null_Mutex RW_MUTEX; - typedef ACE_Null_Condition CONDITION; - typedef ACE_Null_Condition RECURSIVE_CONDITION; - typedef ACE_Null_Semaphore SEMAPHORE; - typedef ACE_Null_Mutex NULL_SEMAPHORE; -}; - -#if defined (ACE_HAS_THREADS) - -class ACE_Process_Mutex; -class ACE_Condition_Recursive_Thread_Mutex; - -/** - * @class ACE_MT_SYNCH - * - * @brief Implement a default thread safe synchronization wrapper that - * typedefs the and to the - * and versions. Note that this - * should be a template, but SunC++ 4.0.1 complains about - * this... - */ -class ACE_Export ACE_MT_SYNCH -{ -public: - typedef ACE_Thread_Mutex MUTEX; - typedef ACE_Null_Mutex NULL_MUTEX; - typedef ACE_Process_Mutex PROCESS_MUTEX; - typedef ACE_Recursive_Thread_Mutex RECURSIVE_MUTEX; - typedef ACE_RW_Thread_Mutex RW_MUTEX; - typedef ACE_Condition_Thread_Mutex CONDITION; - typedef ACE_Condition_Recursive_Thread_Mutex RECURSIVE_CONDITION; - typedef ACE_Thread_Semaphore SEMAPHORE; - typedef ACE_Null_Semaphore NULL_SEMAPHORE; -}; - -#endif /* ACE_HAS_THREADS */ - -#define ACE_SYNCH_MUTEX ACE_SYNCH::MUTEX -#define ACE_SYNCH_NULL_MUTEX ACE_SYNCH::NULL_MUTEX -#define ACE_SYNCH_RECURSIVE_MUTEX ACE_SYNCH::RECURSIVE_MUTEX -#define ACE_SYNCH_RW_MUTEX ACE_SYNCH::RW_MUTEX -#define ACE_SYNCH_CONDITION ACE_SYNCH::CONDITION -#define ACE_SYNCH_RECURSIVE_CONDITION ACE_SYNCH::RECURSIVE_CONDITION -#define ACE_SYNCH_NULL_SEMAPHORE ACE_SYNCH::NULL_SEMAPHORE -#define ACE_SYNCH_SEMAPHORE ACE_SYNCH::SEMAPHORE - -#else /* !ACE_HAS_TEMPLATE_TYPEDEFS */ - -#if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) -#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition, ACE_Null_Mutex -#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex, ACE_Thread_Semaphore -#else -#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition -#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex -#endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ - -#if defined (ACE_HAS_THREADS) - -#define ACE_SYNCH_MUTEX ACE_Thread_Mutex -#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_RECURSIVE_MUTEX ACE_Recursive_Thread_Mutex -#define ACE_SYNCH_RW_MUTEX ACE_RW_Thread_Mutex -#define ACE_SYNCH_CONDITION ACE_Condition_Thread_Mutex -#define ACE_SYNCH_RECURSIVE_CONDITION ACE_Condition_Recursive_Thread_Mutex -#define ACE_SYNCH_SEMAPHORE ACE_Thread_Semaphore -#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Semaphore - -#else /* ACE_HAS_THREADS */ - -#define ACE_SYNCH_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_RECURSIVE_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_RW_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_CONDITION ACE_Null_Condition -#define ACE_SYNCH_RECURSIVE_CONDITION ACE_Null_Condition -#define ACE_SYNCH_SEMAPHORE ACE_Null_Semaphore -#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Mutex - -#endif /* ACE_HAS_THREADS */ -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - -// These are available on *all* platforms -#define ACE_SYNCH_PROCESS_SEMAPHORE ACE_Process_Semaphore -#define ACE_SYNCH_PROCESS_MUTEX ACE_Process_Mutex - -#if defined (ACE_HAS_THREADS) -#define ACE_SYNCH ACE_MT_SYNCH -#else /* ACE_HAS_THREADS */ -#define ACE_SYNCH ACE_NULL_SYNCH -#endif /* ACE_HAS_THREADS */ - -#if defined (__ACE_INLINE__) -#include "ace/Synch_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Synch_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Synch_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_SYNCH_T_H */ diff --git a/ace/Synch_T.i b/ace/Synch_T.i deleted file mode 100644 index 50cd0a710e9..00000000000 --- a/ace/Synch_T.i +++ /dev/null @@ -1,452 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Thread.h" - -template ACE_INLINE int -ACE_Guard::acquire (void) -{ - return this->owner_ = this->lock_->acquire (); -} - -template ACE_INLINE int -ACE_Guard::tryacquire (void) -{ - return this->owner_ = this->lock_->tryacquire (); -} - -template ACE_INLINE int -ACE_Guard::release (void) -{ - if (this->owner_ == -1) - return -1; - else - { - this->owner_ = -1; - return this->lock_->release (); - } -} - -template ACE_INLINE -ACE_Guard::ACE_Guard (ACE_LOCK &l) - : lock_ (&l), - owner_ (0) -{ - this->acquire (); -} - -template ACE_INLINE -ACE_Guard::ACE_Guard (ACE_LOCK &l, int block) - : lock_ (&l), - owner_ (0) -{ - if (block) - this->acquire (); - else - this->tryacquire (); -} - -template ACE_INLINE -ACE_Guard::ACE_Guard (ACE_LOCK &l, int block, int become_owner) - : lock_ (&l), - owner_ (become_owner == 0 ? -1 : 0) -{ - ACE_UNUSED_ARG (block); -} - -// Implicitly and automatically acquire (or try to acquire) the -// lock. - -template ACE_INLINE -ACE_Guard::~ACE_Guard (void) -{ - this->release (); -} - -template ACE_INLINE int -ACE_Guard::locked (void) const -{ - return this->owner_ != -1; -} - -template ACE_INLINE int -ACE_Guard::remove (void) -{ - return this->lock_->remove (); -} - -template ACE_INLINE void -ACE_Guard::disown (void) -{ - this->owner_ = -1; -} - -template ACE_INLINE -ACE_Write_Guard::ACE_Write_Guard (ACE_LOCK &m) - : ACE_Guard (&m) -{ - this->acquire_write (); -} - -template ACE_INLINE int -ACE_Write_Guard::acquire_write (void) -{ - return this->owner_ = this->lock_->acquire_write (); -} - -template ACE_INLINE int -ACE_Write_Guard::acquire (void) -{ - return this->owner_ = this->lock_->acquire_write (); -} - -template ACE_INLINE int -ACE_Write_Guard::tryacquire_write (void) -{ - return this->owner_ = this->lock_->tryacquire_write (); -} - -template ACE_INLINE int -ACE_Write_Guard::tryacquire (void) -{ - return this->owner_ = this->lock_->tryacquire_write (); -} - -template ACE_INLINE -ACE_Write_Guard::ACE_Write_Guard (ACE_LOCK &m, - int block) - : ACE_Guard (&m) -{ - if (block) - this->acquire_write (); - else - this->tryacquire_write (); -} - -template ACE_INLINE int -ACE_Read_Guard::acquire_read (void) -{ - return this->owner_ = this->lock_->acquire_read (); -} - -template ACE_INLINE int -ACE_Read_Guard::acquire (void) -{ - return this->owner_ = this->lock_->acquire_read (); -} - -template ACE_INLINE int -ACE_Read_Guard::tryacquire_read (void) -{ - return this->owner_ = this->lock_->tryacquire_read (); -} - -template ACE_INLINE int -ACE_Read_Guard::tryacquire (void) -{ - return this->owner_ = this->lock_->tryacquire_read (); -} - -template ACE_INLINE -ACE_Read_Guard::ACE_Read_Guard (ACE_LOCK &m) - : ACE_Guard (&m) -{ - this->acquire_read (); -} - -template ACE_INLINE -ACE_Read_Guard::ACE_Read_Guard (ACE_LOCK &m, - int block) - : ACE_Guard (&m) -{ - if (block) - this->acquire_read (); - else - this->tryacquire_read (); -} - -template ACE_INLINE -ACE_Lock_Adapter::ACE_Lock_Adapter (ACE_LOCKING_MECHANISM &lock) - : lock_ (&lock), - delete_lock_ (0) -{ -} - -template ACE_INLINE -ACE_Lock_Adapter::~ACE_Lock_Adapter (void) -{ - if (this->delete_lock_) - delete this->lock_; -} - -// Explicitly destroy the lock. -template ACE_INLINE int -ACE_Lock_Adapter::remove (void) -{ - return this->lock_->remove (); -} - -// Block the thread until the lock is acquired. -template ACE_INLINE int -ACE_Lock_Adapter::acquire (void) -{ - return this->lock_->acquire (); -} - -// Conditionally acquire the lock (i.e., won't block). - -template ACE_INLINE int -ACE_Lock_Adapter::tryacquire (void) -{ - return this->lock_->tryacquire (); -} - -// Release the lock. - -template ACE_INLINE int -ACE_Lock_Adapter::release (void) -{ - return this->lock_->release (); -} - -// Block until the thread acquires a read lock. If the locking -// mechanism doesn't support read locks then this just calls -// . - -template ACE_INLINE int -ACE_Lock_Adapter::acquire_read (void) -{ - return this->lock_->acquire_read (); -} - -// Block until the thread acquires a write lock. If the locking -// mechanism doesn't support read locks then this just calls -// . - -template ACE_INLINE int -ACE_Lock_Adapter::acquire_write (void) -{ - return this->lock_->acquire_write (); -} - -// Conditionally acquire a read lock. If the locking mechanism -// doesn't support read locks then this just calls . - -template ACE_INLINE int -ACE_Lock_Adapter::tryacquire_read (void) -{ - return this->lock_->tryacquire_read (); -} - -// Conditionally acquire a write lock. If the locking mechanism -// doesn't support write locks then this just calls . - -template ACE_INLINE int -ACE_Lock_Adapter::tryacquire_write (void) -{ - return this->lock_->tryacquire_write (); -} - -// Conditionally try to upgrade a lock held for read to a write lock. -// If the locking mechanism doesn't support read locks then this just -// calls . Returns 0 on success, -1 on failure. - -template ACE_INLINE int -ACE_Lock_Adapter::tryacquire_write_upgrade (void) -{ - return this->lock_->tryacquire_write_upgrade (); -} - -template ACE_INLINE -ACE_Reverse_Lock::ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock, - ACE_Acquire_Method::METHOD_TYPE acquire_method) - : lock_ (lock), - acquire_method_ (acquire_method) -{ -} - -// Explicitly destroy the lock. -template ACE_INLINE int -ACE_Reverse_Lock::remove (void) -{ - return this->lock_.remove (); -} - -// Release the lock. -template ACE_INLINE int -ACE_Reverse_Lock::acquire (void) -{ - return this->lock_.release (); -} - -// Release the lock. -template ACE_INLINE int -ACE_Reverse_Lock::tryacquire (void) -{ - ACE_NOTSUP_RETURN (-1); -} - -// Acquire the lock. -template ACE_INLINE int -ACE_Reverse_Lock::release (void) -{ - if (this->acquire_method_ == ACE_Acquire_Method::ACE_READ) - return this->lock_.acquire_read (); - else if (this->acquire_method_ == ACE_Acquire_Method::ACE_WRITE) - return this->lock_.acquire_write (); - else - return this->lock_.acquire (); -} - -// Release the lock. -template ACE_INLINE int -ACE_Reverse_Lock::acquire_read (void) -{ - ACE_NOTSUP_RETURN (-1); -} - -// Release the lock. -template ACE_INLINE int -ACE_Reverse_Lock::acquire_write (void) -{ - ACE_NOTSUP_RETURN (-1); -} - -// Release the lock. -template ACE_INLINE int -ACE_Reverse_Lock::tryacquire_read (void) -{ - ACE_NOTSUP_RETURN (-1); -} - -// Release the lock. -template ACE_INLINE int -ACE_Reverse_Lock::tryacquire_write (void) -{ - ACE_NOTSUP_RETURN (-1); -} - -// Release the lock. -template ACE_INLINE int -ACE_Reverse_Lock::tryacquire_write_upgrade (void) -{ - ACE_NOTSUP_RETURN (-1); -} - -#if defined (ACE_HAS_THREADS) - -template ACE_INLINE int -ACE_Condition::remove (void) -{ - // ACE_TRACE ("ACE_Condition::remove"); - - // cond_destroy() is called in a loop if the condition variable is - // BUSY. This avoids a condition where a condition is signaled and - // because of some timing problem, the thread that is to be signaled - // has called the cond_wait routine after the signal call. Since - // the condition signal is not queued in any way, deadlock occurs. - - int result = 0; - -#if defined (CHORUS) - // Are we the owner? - if (this->process_cond_ && this->condname_) - { - // Only destroy the condition if we're the ones who initialized - // it. - while ((result = ACE_OS::cond_destroy (this->process_cond_)) == -1 - && errno == EBUSY) - { - ACE_OS::cond_broadcast (this->process_cond_); - ACE_OS::thr_yield (); - } - ACE_OS::munmap (this->process_cond_, - sizeof (ACE_cond_t)); - ACE_OS::shm_unlink (this->condname_); - ACE_OS::free (ACE_static_cast (void *, - ACE_const_cast (ACE_TCHAR *, - this->condname_))); - } - else if (this->process_cond_) - { - ACE_OS::munmap (this->process_cond_, - sizeof (ACE_cond_t)); - result = 0; - } - else -#endif /* CHORUS */ - - while ((result = ACE_OS::cond_destroy (&this->cond_)) == -1 - && errno == EBUSY) - { - ACE_OS::cond_broadcast (&this->cond_); - ACE_OS::thr_yield (); - } - - return result; -} - -template ACE_INLINE MUTEX & -ACE_Condition::mutex (void) -{ - // ACE_TRACE ("ACE_Condition::mutex"); - return this->mutex_; -} - -template ACE_INLINE int -ACE_Condition::signal (void) -{ -// ACE_TRACE ("ACE_Condition::signal"); -#if defined (CHORUS) - if (this->process_cond_ != 0) - return ACE_OS::cond_signal (this->process_cond_); -#endif /* CHORUS */ - return ACE_OS::cond_signal (&this->cond_); -} - -template ACE_INLINE int -ACE_Condition::broadcast (void) -{ -// ACE_TRACE ("ACE_Condition::broadcast"); -#if defined (CHORUS) - if (this->process_cond_ != 0) - return ACE_OS::cond_broadcast (this->process_cond_); -#endif /* CHORUS */ - return ACE_OS::cond_broadcast (&this->cond_); -} - -#endif /* ACE_HAS_THREADS */ - -#if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) -template ACE_INLINE -ACE_TSS::ACE_TSS (TYPE *type) - : type_ (type) -{ -} - -template ACE_INLINE int -ACE_TSS::ts_init (void) const -{ - return 0; -} - -template ACE_INLINE TYPE * -ACE_TSS::ts_object (void) const -{ - return this->type_; -} - -template ACE_INLINE TYPE * -ACE_TSS::ts_object (TYPE *type) -{ - this->type_ = type; - return this->type_; -} - -template ACE_INLINE TYPE * -ACE_TSS::ts_get (void) const -{ - return this->type_; -} - -#endif /* ! (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */ diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp deleted file mode 100644 index 9e2f2b69380..00000000000 --- a/ace/System_Time.cpp +++ /dev/null @@ -1,141 +0,0 @@ -// System_Time.cpp -// $Id$ - -#include "ace/System_Time.h" - -ACE_RCSID(ace, System_Time, "$Id$") - -ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname) - : delta_time_ (0) -{ - ACE_TRACE ("ACE_System_Time::ACE_System_Time"); - - // Only create a new unique filename for the memory pool file - // if the user didn't supply one... - if (poolname == 0) - { -#if defined (ACE_DEFAULT_BACKING_STORE) - // Create a temporary file. - ACE_OS::strcpy (this->poolname_, - ACE_DEFAULT_BACKING_STORE); -#else /* ACE_DEFAULT_BACKING_STORE */ - if (ACE_Lib_Find::get_temp_dir (this->poolname_, - MAXPATHLEN - 17) == -1) - // -17 for ace-malloc-XXXXXX - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Temporary path too long, ") - ACE_LIB_TEXT ("defaulting to current directory\n"))); - this->poolname_[0] = 0; - } - - // Add the filename to the end - ACE_OS::strcat (this->poolname_, ACE_LIB_TEXT ("ace-malloc-XXXXXX")); - -#endif /* ACE_DEFAULT_BACKING_STORE */ - } - else - ACE_OS::strsncpy (this->poolname_, - poolname, - (sizeof this->poolname_ / sizeof (ACE_TCHAR))); - - ACE_NEW (this->shmem_, - ALLOCATOR (this->poolname_)); -} - -ACE_System_Time::~ACE_System_Time (void) -{ - ACE_TRACE ("ACE_System_Time::~ACE_System_Time"); - delete this->shmem_; -} - -// Get the local system time. - -int -ACE_System_Time::get_local_system_time (ACE_UINT32 &time_out) -{ - ACE_TRACE ("ACE_System_Time::get_local_system_time"); - time_out = ACE_OS::time (0); - return 0; -} - -int -ACE_System_Time::get_local_system_time (ACE_Time_Value &time_out) -{ - ACE_TRACE ("ACE_System_Time::get_local_system_time"); - time_out.sec (ACE_OS::time (0)); - return 0; -} - -// Get the system time of the central time server. - -int -ACE_System_Time::get_master_system_time (ACE_UINT32 &time_out) -{ - ACE_TRACE ("ACE_System_Time::get_master_system_time"); - - if (this->delta_time_ == 0) - { - // Try to find it - void * temp; - if (this->shmem_->find (ACE_DEFAULT_TIME_SERVER_STR, temp) == -1) - { - // No time entry in shared memory (meaning no Clerk exists) - // so return the local time of the host. - return this->get_local_system_time (time_out); - } - else - // Extract the delta time. - this->delta_time_ = (long *) temp; - } - - ACE_UINT32 local_time; - - // If delta_time is positive, it means that the system clock is - // ahead of our local clock so add delta to the local time to get an - // approximation of the system time. Else if delta time is negative, - // it means that our local clock is ahead of the system clock, so - // return the last local time stored (to avoid time conflicts). - if (*this->delta_time_ >=0 ) - { - this->get_local_system_time (local_time); - time_out = local_time + (ACE_UINT32) *this->delta_time_; - } - else - // Return the last local time. Note that this is stored as the - // second field in shared memory. - time_out = *(this->delta_time_ + 1); - return 0; -} - -int -ACE_System_Time::get_master_system_time (ACE_Time_Value &time_out) -{ - ACE_TRACE ("ACE_System_Time::get_master_system_time"); - ACE_UINT32 to; - if (this->get_master_system_time (to) == -1) - return -1; - time_out.sec (to); - return 0; -} - -// Synchronize local system time with the central time server using -// specified mode (currently unimplemented). - -int -ACE_System_Time::sync_local_system_time (ACE_System_Time::Sync_Mode) -{ - ACE_TRACE ("ACE_System_Time::sync_local_system_time"); - ACE_NOTSUP_RETURN (-1); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Malloc_T; -template class ACE_Malloc; -template class ACE_Allocator_Adapter >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Malloc_T -#pragma instantiate ACE_Malloc -#pragma instantiate ACE_Allocator_Adapter > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/ace/System_Time.h b/ace/System_Time.h deleted file mode 100644 index b8755481ff3..00000000000 --- a/ace/System_Time.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- C++ -*- */ - - -//============================================================================= -/** - * @file System_Time.h - * - * $Id$ - * - * @author Prashant Jain - * @author Tim H. Harrison and Douglas C. Schmidt - */ -//============================================================================= - - -#ifndef ACE_SYSTEM_TIME_H -#define ACE_SYSTEM_TIME_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Memory_Pool.h" -#include "ace/Malloc_T.h" - -/** - * @class ACE_System_Time - * - * @brief Defines the timer services of the OS interface to access the - * system time either on the local host or on the central time - * server in the network. - */ -class ACE_Export ACE_System_Time -{ -public: - /** - * Enumeration types to specify mode of synchronization with master - * clock. Jump will set local system time directly (thus possibly - * producing time gaps or ambiguous local system times. Adjust will - * smoothly slow down or speed up the local system clock to reach - * the system time of the master clock. - */ - enum Sync_Mode { Jump, Adjust }; - - /// Default constructor. - ACE_System_Time (const ACE_TCHAR *poolname = 0); - - /// Default destructor. - ~ACE_System_Time (void); - - /// Get the local system time, i.e., the value returned by - /// . - static int get_local_system_time (ACE_UINT32 &time_out); - - /// Get the local system time, i.e., the value returned by - /// . - static int get_local_system_time (ACE_Time_Value &time_out); - - /// Get the system time of the central time server. - int get_master_system_time (ACE_UINT32 &time_out); - - /// Get the system time of the central time server. - int get_master_system_time (ACE_Time_Value &time_out); - - /// Synchronize local system time with the central time server using - /// specified mode. - int sync_local_system_time (ACE_System_Time::Sync_Mode mode); - -private: - typedef ACE_Malloc MALLOC; - typedef ACE_Allocator_Adapter ALLOCATOR; - - /// Our allocator (used for obtaining system time from shared memory). - ALLOCATOR *shmem_; - - /// The name of the pool used by the allocator. - ACE_TCHAR poolname_[MAXPATHLEN + 1]; - - /// Pointer to delta time kept in shared memory. - long *delta_time_; -}; - -#include "ace/post.h" -#endif /* ACE_SYSTEM_TIME_H */ diff --git a/ace/TLI.cpp b/ace/TLI.cpp deleted file mode 100644 index 056bc09a0a3..00000000000 --- a/ace/TLI.cpp +++ /dev/null @@ -1,195 +0,0 @@ -// $Id$ - -// Defines the member functions for the base class of the ACE_TLI -// abstraction. - -#include "ace/TLI.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, TLI, "$Id$") - -#if defined (ACE_HAS_TLI) - -#if !defined (__ACE_INLINE__) -#include "ace/TLI.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_TLI) - -void -ACE_TLI::dump (void) const -{ - ACE_TRACE ("ACE_TLI::dump"); -} - -ACE_TLI::ACE_TLI (void) -{ - ACE_TRACE ("ACE_TLI::ACE_TLI"); -#if defined (ACE_HAS_SVR4_TLI) -// Solaris 2.4 ACE_TLI option handling is broken. Thus, we must do -// the memory allocation ourselves... Thanks to John P. Hearn -// (jph@ccrl.nj.nec.com) for the help. - - this->so_opt_req.opt.maxlen = sizeof (opthdr) + sizeof (long); - ACE_NEW (this->so_opt_req.opt.buf, - char[this->so_opt_req.opt.maxlen]); - - this->so_opt_ret.opt.maxlen = sizeof (opthdr) + sizeof (long); - ACE_NEW (this->so_opt_ret.opt.buf, - char[this->so_opt_ret.opt.maxlen]); - - if (this->so_opt_ret.opt.buf == 0) - { - delete [] this->so_opt_req.opt.buf; - this->so_opt_req.opt.buf = 0; - return; - } -#endif /* ACE_HAS_SVR4_TLI */ -} - -ACE_HANDLE -ACE_TLI::open (const char device[], int oflag, struct t_info *info) -{ - ACE_TRACE ("ACE_TLI::open"); - if (oflag == 0) - oflag = O_RDWR; - this->set_handle (ACE_OS::t_open ((char *) device, oflag, info)); - - return this->get_handle (); -} - -ACE_TLI::~ACE_TLI (void) -{ - ACE_TRACE ("ACE_TLI::~ACE_TLI"); -#if defined (ACE_HAS_SVR4_TLI) - if (this->so_opt_req.opt.buf) - { - delete [] this->so_opt_req.opt.buf; - delete [] this->so_opt_ret.opt.buf; - this->so_opt_req.opt.buf = 0; - this->so_opt_ret.opt.buf = 0; - } -#endif /* ACE_HAS_SVR4_TLI */ -} - -ACE_TLI::ACE_TLI (const char device[], int oflag, struct t_info *info) -{ - ACE_TRACE ("ACE_TLI::ACE_TLI"); - if (this->open (device, oflag, info) == ACE_INVALID_HANDLE) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_TLI::ACE_TLI"))); -} - -int -ACE_TLI::get_local_addr (ACE_Addr &sa) const -{ - ACE_TRACE ("ACE_TLI::get_local_addr"); -#if defined (ACE_HAS_SVR4_TLI) - struct netbuf name; - - name.maxlen = sa.get_size (); - name.buf = (char *) sa.get_addr (); - - if (ACE_OS::ioctl (this->get_handle (), TI_GETMYNAME, &name) == -1) -/* if (ACE_OS::t_getname (this->get_handle (), &name, LOCALNAME) == -1) */ - return -1; - else - return 0; -#else /* SunOS4 */ - ACE_UNUSED_ARG (sa); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_SVR4_TLI */ -} - -int -ACE_TLI::close (void) -{ - ACE_TRACE ("ACE_TLI::close"); - int result = 0; // Geisler: result must be int - - if (this->get_handle () != ACE_INVALID_HANDLE) - { - result = ACE_OS::t_close (this->get_handle ()); - this->set_handle (ACE_INVALID_HANDLE); - } - return result; -} - -int -ACE_TLI::set_option (int level, int option, void *optval, int optlen) -{ - ACE_TRACE ("ACE_TLI::set_option"); -#if defined (ACE_HAS_SVR4_TLI) - /* Set up options for ACE_TLI */ - - struct opthdr *opthdr = 0; /* See for details on this format */ - - this->so_opt_req.flags = T_NEGOTIATE; - this->so_opt_req.opt.len = sizeof *opthdr + OPTLEN (optlen); - - if (this->so_opt_req.opt.len > this->so_opt_req.opt.maxlen) - { -#if !defined (ACE_HAS_SET_T_ERRNO) - t_errno = TBUFOVFLW; -#else - set_t_errno (TBUFOVFLW); -#endif /* ACE_HAS_SET_T_ERRNO */ - return -1; - } - - opthdr = (struct opthdr *) this->so_opt_req.opt.buf; - opthdr->level = level; - opthdr->name = option; - opthdr->len = OPTLEN (optlen); - ACE_OS::memcpy (OPTVAL (opthdr), optval, optlen); - - return ACE_OS::t_optmgmt (this->get_handle (), &this->so_opt_req, &this->so_opt_ret); -#else - ACE_UNUSED_ARG (level); - ACE_UNUSED_ARG (option); - ACE_UNUSED_ARG (optval); - ACE_UNUSED_ARG (optlen); - return -1; -#endif /* ACE_HAS_SVR4_TLI */ -} - -int -ACE_TLI::get_option (int level, int option, void *optval, int &optlen) -{ - ACE_TRACE ("ACE_TLI::get_option"); -#if defined (ACE_HAS_SVR4_TLI) - struct opthdr *opthdr = 0; /* See for details on this format */ - - this->so_opt_req.flags = T_CHECK; - this->so_opt_ret.opt.len = sizeof *opthdr + OPTLEN (optlen); - - if (this->so_opt_ret.opt.len > this->so_opt_ret.opt.maxlen) - { -#if !defined (ACE_HAS_SET_T_ERRNO) - t_errno = TBUFOVFLW; -#else - set_t_errno (TBUFOVFLW); -#endif /* ACE_HAS_SET_T_ERRNO */ - return -1; - } - - opthdr = (struct opthdr *) this->so_opt_req.opt.buf; - opthdr->level = level; - opthdr->name = option; - opthdr->len = OPTLEN (optlen); - if (ACE_OS::t_optmgmt (this->get_handle (), &this->so_opt_req, &this->so_opt_ret) == -1) - return -1; - else - { - ACE_OS::memcpy (optval, OPTVAL (opthdr), optlen); - return 0; - } -#else - ACE_UNUSED_ARG (level); - ACE_UNUSED_ARG (option); - ACE_UNUSED_ARG (optval); - ACE_UNUSED_ARG (optlen); - return -1; -#endif /* ACE_HAS_SVR4_TLI */ -} - -#endif /* ACE_HAS_TLI */ diff --git a/ace/TLI.h b/ace/TLI.h deleted file mode 100644 index 4bce35bd78a..00000000000 --- a/ace/TLI.h +++ /dev/null @@ -1,108 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file TLI.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_TLI_H -#define ACE_TLI_H -#include "ace/pre.h" - -#include "ace/IPC_SAP.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Addr.h" - -#if defined (ACE_HAS_TLI) - -// There's not a universal device name for TLI devices. If the platform -// needs something other than /dev/tcp, it needs to be set up in the config.h -// file as ACE_TLI_TCP_DEVICE. -#ifndef ACE_TLI_TCP_DEVICE -#define ACE_TLI_TCP_DEVICE "/dev/tcp" -#endif - -// There's not a universal device name for XTI/ATM devices. If the platform -// needs something other than /dev/xtisvc0, it needs to be set up in the -// config.h file as ACE_XTI_ATM_DEVICE. This may be FORE vendor specific and -// there may be no good default. -#ifndef ACE_XTI_ATM_DEVICE -#define ACE_XTI_ATM_DEVICE "/dev/xtisvc0" -#endif - -/** - * @class ACE_TLI - * - * @brief Defines the member functions for the base class of the - * ACE_TLI abstraction. - */ -class ACE_Export ACE_TLI : public ACE_IPC_SAP -{ -public: - // = Initialization and termination methods. - /// Initialize a TLI endpoint. - ACE_HANDLE open (const char device[], - int oflag = O_RDWR, - struct t_info *info = 0); - - /// Close a TLI endpoint and release resources. - int close (void); - - /// Set underlying protocol options. - int set_option (int level, int option, void *optval, int optlen); - - /// Get underlying protocol options. - int get_option (int level, int option, void *optval, int &optlen); - - // = Calls to underlying TLI operations. - int look (void) const; - int rcvdis (struct t_discon * = 0) const; - int snddis (struct t_call * = 0) const; - int sndrel (void) const; - int rcvrel (void) const; - - /// Return our local endpoint address. - int get_local_addr (ACE_Addr &) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - // = Ensure we are an abstract class. - /// Default constructor. - ACE_TLI (void); - - /// Destructor. - ~ACE_TLI (void); - - /// Initialize a TLI endpoint. - ACE_TLI (const char device[], int oflag = O_RDWR, struct t_info *info = 0); - -private: -#if defined (ACE_HAS_SVR4_TLI) - // Insane TLI option management. - struct t_optmgmt so_opt_req; - struct t_optmgmt so_opt_ret; -#endif /* ACE_HAS_SVR4_TLI */ -}; - -#if defined (__ACE_INLINE__) -#include "ace/TLI.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_TLI */ -#include "ace/post.h" -#endif /* ACE_TLI_H */ diff --git a/ace/TLI.i b/ace/TLI.i deleted file mode 100644 index 8f32186deaf..00000000000 --- a/ace/TLI.i +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// TLI.i - -#include "ace/TLI.h" - -ACE_INLINE -int -ACE_TLI::look (void) const -{ - ACE_TRACE ("ACE_TLI::look"); - return ACE_OS::t_look (this->get_handle ()); -} - -ACE_INLINE -int -ACE_TLI::rcvdis (struct t_discon *discon) const -{ - ACE_TRACE ("ACE_TLI::rcvdis"); - return ACE_OS::t_rcvdis (this->get_handle (), discon); -} - -ACE_INLINE -int -ACE_TLI::snddis (struct t_call *call) const -{ - ACE_TRACE ("ACE_TLI::snddis"); - return ACE_OS::t_snddis (this->get_handle (), call); -} - -ACE_INLINE -int -ACE_TLI::rcvrel (void) const -{ - ACE_TRACE ("ACE_TLI::rcvrel"); - return ACE_OS::t_rcvrel (this->get_handle ()); -} - -ACE_INLINE -int -ACE_TLI::sndrel (void) const -{ - ACE_TRACE ("ACE_TLI::sndrel"); - return ACE_OS::t_sndrel (this->get_handle ()); -} diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp deleted file mode 100644 index 60b63359031..00000000000 --- a/ace/TLI_Acceptor.cpp +++ /dev/null @@ -1,547 +0,0 @@ -// $Id$ - -#include "ace/TLI_Acceptor.h" -#include "ace/Log_Msg.h" -#include "ace/ACE.h" - -ACE_RCSID(ace, TLI_Acceptor, "$Id$") - -#if defined (ACE_HAS_TLI) - -// Put the actual definitions of the ACE_TLI_Request and -// ACE_TLI_Request_Queue classes here to hide them from clients... - -struct ACE_TLI_Request -{ - struct t_call *callp_; - ACE_HANDLE handle_; - ACE_TLI_Request *next_; -}; - -class ACE_TLI_Request_Queue -{ -public: - ACE_TLI_Request_Queue (void); - - ACE_HANDLE open (ACE_HANDLE fd, int size); - int close (void); - - int enqueue (const char device[], int restart, int rwflag); - int dequeue (ACE_TLI_Request *&ptr); - int remove (int sequence_number); - - int is_empty (void) const; - int is_full (void) const; - - ACE_TLI_Request *alloc (void); - void free (ACE_TLI_Request *node); - - void dump (void) const; - // Dump the state of an object. - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -private: - ACE_HANDLE handle_; - int size_; - int current_count_; - ACE_TLI_Request *base_; - ACE_TLI_Request *tail_; - ACE_TLI_Request *free_list_; -}; - -ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Request_Queue) - -void -ACE_TLI_Request_Queue::dump (void) const -{ - ACE_TRACE ("ACE_TLI_Request_Queue::dump"); -} - -int -ACE_TLI_Request_Queue::is_empty (void) const -{ - ACE_TRACE ("ACE_TLI_Request_Queue::is_empty"); - return this->current_count_ == 0; -} - -int -ACE_TLI_Request_Queue::is_full (void) const -{ - ACE_TRACE ("ACE_TLI_Request_Queue::is_full"); - return this->current_count_ + 1 == this->size_; // Add 1 for the dummy. -} - -// Add a node to the free list stack. - -void -ACE_TLI_Request_Queue::free (ACE_TLI_Request *node) -{ - ACE_TRACE ("ACE_TLI_Request_Queue::free"); - node->next_ = this->free_list_; - this->free_list_ = node; -} - -// Remove a node from the free list stack. - -ACE_TLI_Request * -ACE_TLI_Request_Queue::alloc (void) -{ - ACE_TRACE ("ACE_TLI_Request_Queue::alloc"); - ACE_TLI_Request *temp = this->free_list_; - this->free_list_ = this->free_list_->next_; - return temp; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Acceptor) - -void -ACE_TLI_Acceptor::dump (void) const -{ - ACE_TRACE ("ACE_TLI_Acceptor::dump"); -} - -ACE_TLI_Acceptor::ACE_TLI_Acceptor (void) - : queue_ (0) -{ - ACE_TRACE ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"); -} - -int -ACE_TLI_Request_Queue::dequeue (ACE_TLI_Request *&ptr) -{ - ACE_TRACE ("ACE_TLI_Request_Queue::dequeue"); - ptr = this->tail_->next_; - this->tail_->next_ = ptr->next_; - this->current_count_--; - return 0; -} - -// This is hideous... - -static ACE_HANDLE -open_new_endpoint (ACE_HANDLE listen_handle, - const char dev[], - struct t_call *callp, - int rwf, - ACE_Addr *remote_sap = 0) -{ - ACE_TRACE ("open_new_endpoint"); -#if defined (ACE_PSOS) - ACE_HANDLE fd = ACE_OS::t_open ((char *) dev, - S_IRUSR | S_IWUSR, - 0); -#else - ACE_HANDLE fd = ACE_OS::t_open ((char *) dev, - O_RDWR, - 0); -#endif /* ACE_PSOS */ - - struct t_bind req, *req_p = 0; - if (remote_sap != 0) - { - req.qlen = 0; - req.addr.buf = (char *) remote_sap->get_addr (); - req.addr.len = remote_sap->get_size (); - req.addr.maxlen = remote_sap->get_size (); - req_p = &req; - } - - if (fd == ACE_INVALID_HANDLE - || ACE_OS::t_bind (fd, req_p, 0) == -1) - fd = ACE_INVALID_HANDLE; -#if defined (I_PUSH) && !defined (ACE_HAS_FORE_ATM_XTI) - else if (rwf != 0 && ACE_OS::ioctl (fd, - I_PUSH, - ACE_const_cast (char *, "tirdwr")) - == ACE_INVALID_HANDLE) - fd = ACE_INVALID_HANDLE; -#endif /* I_PUSH */ - - if (fd == ACE_INVALID_HANDLE) - ACE_OS::t_snddis (listen_handle, - callp); - return fd; -} - -// Close down the acceptor and release resources. - -int -ACE_TLI_Request_Queue::close (void) -{ - ACE_TRACE ("ACE_TLI_Request_Queue::close"); - int res = 0; - - for (int i = 0; i < this->size_; i++) - { - ACE_TLI_Request &item = this->base_[i]; - - item.handle_ = ACE_INVALID_HANDLE; - if (ACE_OS::t_free ((char *) item.callp_, - T_CALL) != 0) - res = -1; - } - - delete [] this->base_; - this->base_ = 0; - return res; -} - -ACE_HANDLE -ACE_TLI_Request_Queue::open (ACE_HANDLE f, int sz) -{ - ACE_TRACE ("ACE_TLI_Request_Queue::open"); - this->handle_ = f; - this->size_ = sz + 1; // Add one more for the dummy node. - - ACE_NEW_RETURN (this->base_, - ACE_TLI_Request[this->size_], - ACE_INVALID_HANDLE); - - // Initialize the ACE_Queue and the free list. - - for (int i = 0; i < this->size_; i++) - { - ACE_TLI_Request *item = &this->base_[i]; - this->free (item); - - item->handle_ = ACE_INVALID_HANDLE; - item->callp_ = (t_call *) ACE_OS::t_alloc (this->handle_, - T_CALL, - T_ALL); - if (item->callp_ == 0) - return ACE_INVALID_HANDLE; - } - - this->tail_ = this->alloc (); - this->tail_->next_ = this->tail_; - return 0; -} - -ACE_TLI_Request_Queue::ACE_TLI_Request_Queue (void) - : size_ (0), - current_count_ (0), - base_ (0), - tail_ (0), - free_list_ (0) -{ - ACE_TRACE ("ACE_TLI_Request_Queue::ACE_TLI_Request_Queue"); -} - -// Listen for a new connection request and allocate appropriate data -// structures when one arrives. - -int -ACE_TLI_Request_Queue::enqueue (const char device[], - int restart, int rwflag) -{ - ACE_TRACE ("ACE_TLI_Request_Queue::enqueue"); - ACE_TLI_Request *temp = this->alloc (); - ACE_TLI_Request &req = *this->tail_; - int res; - - do - res = ACE_OS::t_listen (this->handle_, req.callp_); - while (res == -1 - && restart - && t_errno == TSYSERR - && errno == EINTR); - - if (res != -1) - { - req.handle_ = open_new_endpoint (this->handle_, - device, - req.callp_, - rwflag); - if (req.handle_ != ACE_INVALID_HANDLE) - { - temp->next_ = this->tail_->next_; - this->tail_->next_ = temp; - this->tail_ = temp; - this->current_count_++; - return 0; - } - } - - // Something must have gone wrong, so free up allocated space. - this->free (temp); - return -1; -} - -// Locate and remove SEQUENCE_NUMBER from the list of pending -// connections. - -int -ACE_TLI_Request_Queue::remove (int sequence_number) -{ - ACE_TRACE ("ACE_TLI_Request_Queue::remove"); - ACE_TLI_Request *prev = this->tail_; - - // Put the sequence # in the dummy node to simply the search... - prev->callp_->sequence = sequence_number; - - ACE_TLI_Request *temp; - - for (temp = this->tail_->next_; - temp->callp_->sequence != sequence_number; - temp = temp->next_) - prev = temp; - - if (temp == this->tail_) - // Sequence # was not found, since we're back at the dummy node! - return -1; - else - { - prev->next_ = temp->next_; - ACE_OS::t_close (temp->handle_); - this->current_count_--; - this->free (temp); - return 0; - } -} - -ACE_HANDLE -ACE_TLI_Acceptor::open (const ACE_Addr &remote_sap, - int reuse_addr, - int oflag, - struct t_info *info, - int qlen, - const char dev[]) -{ - ACE_TRACE ("ACE_TLI_Acceptor::open"); - ACE_HANDLE res = 0; - int one = 1; - - this->disp_ = 0; - - ACE_ALLOCATOR_RETURN (this->device_, - ACE_OS::strdup (dev), - ACE_INVALID_HANDLE); - if (this->ACE_TLI::open (dev, - oflag, - info) == ACE_INVALID_HANDLE) - res = ACE_INVALID_HANDLE; -#if !defined (ACE_HAS_FORE_ATM_XTI) - // Reusing the address causes problems with FORE's API. The issue - // may be that t_optmgmt isn't fully supported by FORE. t_errno is - // TBADOPT after the t_optmgmt call so maybe options are configured - // differently for XTI than for TLI (at least for FORE's - // implementation - XTI is supposed to be a superset of TLI). - else if (reuse_addr - && this->set_option (SOL_SOCKET, - SO_REUSEADDR, - &one, - sizeof one) == -1) - res = ACE_INVALID_HANDLE; -#endif /* ACE_HAS_FORE_ATM_XTI */ - else if ((this->disp_ = - (struct t_discon *) ACE_OS::t_alloc (this->get_handle (), - T_DIS, - T_ALL)) == 0) - res = ACE_INVALID_HANDLE; - else - { - struct t_bind req; - -#if defined (ACE_HAS_FORE_ATM_XTI) - // Not sure why but FORE's t_bind call won't work if t_bind.qlen - // != 1 Adjust the backlog accordingly. - this->backlog_ = 1; - req.qlen = 1; -#else - this->backlog_ = qlen; - req.qlen = qlen; -#endif /* ACE_HAS_FORE_ATM_XTI */ - req.addr.maxlen = remote_sap.get_size (); - - if (remote_sap == ACE_Addr::sap_any) - // Note that if addr.len == 0 then ACE_TLI selects the port - // number. - req.addr.len = 0; - else - { - req.addr.buf = (char *) remote_sap.get_addr (); - req.addr.len = remote_sap.get_size (); - } - - res = (ACE_HANDLE) ACE_OS::t_bind (this->get_handle (), - &req, - 0); - if (res != ACE_INVALID_HANDLE) - { - ACE_NEW_RETURN (this->queue_, - ACE_TLI_Request_Queue, - ACE_INVALID_HANDLE); - res = this->queue_->open (this->get_handle (), - this->backlog_); - } - } - if (res == ACE_INVALID_HANDLE) - this->close (); - return this->get_handle (); -} - -ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap, - int reuse_addr, - int oflag, - struct t_info *info, - int back, - const char dev[]) -{ - ACE_TRACE ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"); - if (this->open (remote_sap, - reuse_addr, - oflag, - info, - back, - dev) == ACE_INVALID_HANDLE) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"))); -} - -int -ACE_TLI_Acceptor::close (void) -{ - ACE_TRACE ("ACE_TLI_Acceptor::close"); - if (this->device_ != 0) - { - if (this->queue_ != 0) - { - this->queue_->close (); - delete this->queue_; - } - - ACE_OS::t_free ((char *) this->disp_, T_DIS); - ACE_OS::free (ACE_MALLOC_T (this->device_)); - this->disp_ = 0; - this->device_ = 0; - return this->ACE_TLI::close (); - } - return 0; -} - -// Perform the logic required to handle the arrival of asynchronous -// events while we are trying to accept a new connection request. - -int -ACE_TLI_Acceptor::handle_async_event (int restart, int rwf) -{ - ACE_TRACE ("ACE_TLI_Acceptor::handle_async_event"); - int event = this->look (); - - switch (event) - { - case T_DISCONNECT: - this->rcvdis (this->disp_); - this->queue_->remove (this->disp_->sequence); - break; - case T_LISTEN: - this->queue_->enqueue (this->device_, - restart, - rwf); - break; - default: - return -1; - } - return 0; -} - -int -ACE_TLI_Acceptor::accept (ACE_TLI_Stream &new_tli_sap, - ACE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle, - int rwf, - netbuf *udata, - netbuf *opt) -{ - ACE_TRACE ("ACE_TLI_Acceptor::accept"); - ACE_UNUSED_ARG (reset_new_handle); - - ACE_TLI_Request *req = 0; - int res = 0; - if (timeout != 0 - && ACE::handle_timed_accept (this->get_handle (), - timeout, - restart) == -1) - return -1; - else if (this->queue_->is_empty ()) - { - req = this->queue_->alloc (); - - do - res = ACE_OS::t_listen (this->get_handle (), - req->callp_); - while (res == -1 - && restart - && errno == EINTR); - - if (res != -1) - { - req->handle_ = open_new_endpoint (this->get_handle (), - this->device_, - req->callp_, - rwf -#if defined (ACE_WIN32) - , remote_addr -#endif /* ACE_WIN32 */ - ); - if (req->handle_ == ACE_INVALID_HANDLE) - res = -1; - else - res = 0; - } - } - else - res = this->queue_->dequeue (req); - - if (udata != 0) - ACE_OS::memcpy ((void *) &req->callp_->udata, - (void *) udata, - sizeof *udata); - if (opt != 0) - ACE_OS::memcpy ((void *) &req->callp_->opt, - (void *) opt, - sizeof *opt); - - while (res != -1) - { - res = ACE_OS::t_accept (this->get_handle (), - req->handle_, - req->callp_); - if (res != -1) - break; // Got one! - else if (t_errno == TLOOK) - res = this->handle_async_event (restart, rwf); - else if (restart && t_errno == TSYSERR && errno == EINTR) - res = 0; - } - - if (res == -1) - { - if (errno != EWOULDBLOCK) - { - new_tli_sap.set_handle (ACE_INVALID_HANDLE); - if (req->handle_ != ACE_INVALID_HANDLE) - ACE_OS::t_close (req->handle_); - } - } - else - { - new_tli_sap.set_handle (req->handle_); - - if (remote_addr != 0) - remote_addr->set_addr ((void *) req->callp_->addr.buf, - req->callp_->addr.len); - } - - req->handle_ = ACE_INVALID_HANDLE; - this->queue_->free (req); - new_tli_sap.set_rwflag (rwf); - return new_tli_sap.get_handle () == ACE_INVALID_HANDLE ? -1 : 0; -} - -#endif /* ACE_HAS_TLI */ diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h deleted file mode 100644 index 2112bf4535c..00000000000 --- a/ace/TLI_Acceptor.h +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file TLI_Acceptor.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_TLI_ACCEPTOR_H -#define ACE_TLI_ACCEPTOR_H -#include "ace/pre.h" - -#include "ace/TLI.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Time_Value.h" -#include "ace/TLI_Stream.h" - -#if defined (ACE_HAS_TLI) - -// Forward reference... -class ACE_TLI_Request_Queue; - -/** - * @class ACE_TLI_Acceptor - * - * @brief Defines the member functions for ACE_TLI_Acceptor abstraction. - * - * This class implements the algorithm described in Steve Rago's - * book on System V UNIX network programming. It basically - * makes TLI look like the C++ SOCK_SAP socket wrappers with - * respect to establishing passive-mode listener endpoints. - */ -class ACE_Export ACE_TLI_Acceptor : public ACE_TLI -{ -public: - friend class ACE_Request_Queue; - - // = Initialization and termination methods. - /// Default constructor. - ACE_TLI_Acceptor (void); - - /// Initiate a passive mode socket. - ACE_TLI_Acceptor (const ACE_Addr &remote_sap, - int reuse_addr = 0, - int oflag = O_RDWR, - struct t_info *info = 0, - int backlog = ACE_DEFAULT_BACKLOG, - const char device[] = ACE_TLI_TCP_DEVICE); - - /// Initiate a passive mode socket. - ACE_HANDLE open (const ACE_Addr &remote_sap, - int reuse_addr = 0, - int oflag = O_RDWR, - struct t_info *info = 0, - int backlog = ACE_DEFAULT_BACKLOG, - const char device[] = ACE_TLI_TCP_DEVICE); - - /// Close down the acceptor and release resources. - int close (void); - - // = Passive connection acceptance method. - - /** - * Accept a new data transfer connection. A of 0 means - * block forever, a of {0, 0} means poll. == 1 - * means "restart if interrupted." - */ - int accept (ACE_TLI_Stream &new_tli_sap, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0, - int rwflag = 1, - netbuf *udata = 0, - netbuf *opt = 0); - - // = Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - typedef ACE_TLI_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Network "device" we are using. - const char *device_; - - /// Number of connections to queue. - int backlog_; - - /// Are we using "tirdwr" mod? - int rwflag_; - - /// Handle TLI accept insanity... - int handle_async_event (int restart, int rwflag); - - /// Used for queueing up pending requests. - ACE_TLI_Request_Queue *queue_; - - /// Used for handling disconnects - struct t_discon *disp_; -}; - -#endif /* ACE_HAS_TLI */ -#include "ace/post.h" -#endif /* ACE_TLI_ACCEPTOR_H */ diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp deleted file mode 100644 index 53491547734..00000000000 --- a/ace/TLI_Connector.cpp +++ /dev/null @@ -1,248 +0,0 @@ -// TLI_Connector.cpp -// $Id$ - -#include "ace/Handle_Set.h" -#include "ace/TLI_Connector.h" -#include "ace/ACE.h" - -ACE_RCSID(ace, TLI_Connector, "$Id$") - -#if defined (ACE_HAS_TLI) - -#if !defined (__ACE_INLINE__) -#include "ace/TLI_Connector.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Connector) - -void -ACE_TLI_Connector::dump (void) const -{ - ACE_TRACE ("ACE_TLI_Connector::dump"); -} - -ACE_TLI_Connector::ACE_TLI_Connector (void) -{ - ACE_TRACE ("ACE_TLI_Connector::ACE_TLI_Connector"); -} - -// Connect the to the , waiting up to -// amount of time if necessary. It's amazing how -// complicated this is to do in TLI... - -int -ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int /* perms */, - const char device[], - struct t_info *info, - int rwf, - struct netbuf *udata, - struct netbuf *opt) -{ - ACE_TRACE ("ACE_TLI_Connector::connect"); - int result = 0; - - // Only open a new endpoint if we don't already have a valid handle. - - if (new_stream.get_handle () == ACE_INVALID_HANDLE - && new_stream.open (device, flags, info) == ACE_INVALID_HANDLE) - return -1; - - if (local_sap != ACE_Addr::sap_any) - { - // Bind the local endpoint to a specific addr. - - struct t_bind *localaddr; - - localaddr = (struct t_bind *) - ACE_OS::t_alloc (new_stream.get_handle (), T_BIND, T_ADDR); - - if (localaddr == 0) - result = -1; - else - { - int one = 1; -#if !defined (ACE_HAS_FORE_ATM_XTI) - // Reusing the address causes problems with FORE's API. The - // issue may be that t_optmgmt isn't fully supported by - // FORE. t_errno is TBADOPT after the t_optmgmt call so - // maybe options are configured differently for XTI than for - // TLI (at least for FORE's implementation - XTI is supposed - // to be a superset of TLI). - if (reuse_addr - && new_stream.set_option (SOL_SOCKET, - SO_REUSEADDR, - &one, - sizeof one) == -1) - result = -1; - else -#endif /* ACE_HAS_FORE_ATM_XTI */ - { - void *addr_buf = local_sap.get_addr (); - localaddr->addr.len = local_sap.get_size (); - ACE_OS::memcpy(localaddr->addr.buf, - addr_buf, - localaddr->addr.len); - - if (ACE_OS::t_bind (new_stream.get_handle (), - localaddr, - localaddr) == -1) - result = -1; - - ACE_OS::t_free ((char *) localaddr, - T_BIND); - } - } - - if (result == -1) - { - new_stream.close (); - return -1; - } - } - // Let TLI select the local endpoint addr. - else if (ACE_OS::t_bind (new_stream.get_handle (), 0, 0) == -1) - return -1; - - struct t_call *callptr = 0; - - callptr = (struct t_call *) - ACE_OS::t_alloc (new_stream.get_handle (), T_CALL, T_ADDR); - - if (callptr == 0) - { - new_stream.close (); - return -1; - } - - void *addr_buf = remote_sap.get_addr (); - callptr->addr.len = remote_sap.get_size (); - ACE_OS::memcpy (callptr->addr.buf, - addr_buf, - callptr->addr.len); - //callptr->addr.buf = (char *) remote_sap.get_addr (); - - if (udata != 0) - ACE_OS::memcpy ((void *) &callptr->udata, (void *) udata, sizeof *udata); - if (opt != 0) - ACE_OS::memcpy ((void *) &callptr->opt, (void *) opt, sizeof *opt); - - // Connect to remote endpoint. -#if defined (ACE_HAS_FORE_ATM_XTI) - // FORE's XTI/ATM driver has problems with ioctl/fcntl calls so (at least - // for now) always have blocking calls. - timeout = 0; -#endif /* ACE_HAS_FORE_ATM_XTI */ - - if (timeout != 0) // Enable non-blocking, if required. - { - if (new_stream.enable (ACE_NONBLOCK) == -1) - result = -1; - - // Do a non-blocking connect. - if (ACE_OS::t_connect (new_stream.get_handle (), callptr, 0) == -1) - { - result = -1; - - // Check to see if we simply haven't connected yet on a - // non-blocking handle or whether there's really an error. - if (t_errno == TNODATA) - { - if (timeout->sec () == 0 && timeout->usec () == 0) - errno = EWOULDBLOCK; - else - result = this->complete (new_stream, 0, timeout); - } - else if (t_errno == TLOOK && new_stream.look () == T_DISCONNECT) - new_stream.rcvdis (); - } - } - // Do a blocking connect to the server. - else if (ACE_OS::t_connect (new_stream.get_handle (), callptr, 0) == -1) - result = -1; - - if (result != -1) - { - new_stream.set_rwflag (rwf); -#if defined (I_PUSH) && !defined (ACE_HAS_FORE_ATM_XTI) - if (new_stream.get_rwflag ()) - result = ACE_OS::ioctl (new_stream.get_handle (), - I_PUSH, - ACE_const_cast (char *, "tirdwr")); -#endif /* I_PUSH */ - } - else if (!(errno == EWOULDBLOCK || errno == ETIME)) - { - // If things have gone wrong, close down and return an error. - new_stream.close (); - new_stream.set_handle (ACE_INVALID_HANDLE); - } - - if (ACE_OS::t_free ((char *) callptr, T_CALL) == -1) - return -1; - return result; -} - -// Try to complete a non-blocking connection. - -int -ACE_TLI_Connector::complete (ACE_TLI_Stream &new_stream, - ACE_Addr *remote_sap, - ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_TLI_Connector::complete"); -#if defined (ACE_WIN32) - if (WaitForSingleObject (new_stream.get_handle(), tv->msec()) == WAIT_OBJECT_0) - { - if (ACE_OS::t_look (new_stream.get_handle()) == T_CONNECT) - return t_rcvconnect (new_stream.get_handle(), 0); - else - return -1; - } - else - return -1; -#else - ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), - tv, - 1); - if (h == ACE_INVALID_HANDLE) - { - new_stream.close (); - return -1; - } - else // We've successfully connected! - { - if (remote_sap != 0) - { -#if defined (ACE_HAS_SVR4_TLI) - struct netbuf name; - - name.maxlen = remote_sap->get_size (); - name.buf = (char *) remote_sap->get_addr (); - - if (ACE_OS::ioctl (new_stream.get_handle (), - TI_GETPEERNAME, - &name) == -1) -#else /* SunOS4 */ - if (0) -#endif /* ACE_HAS_SVR4_TLI */ - { - new_stream.close (); - return -1; - } - } - - // Start out with non-blocking disabled on the . - new_stream.disable (ACE_NONBLOCK); - - return 0; - } -#endif /* ACE_WIN32 */ -} - -#endif /* ACE_HAS_TLI */ diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h deleted file mode 100644 index 785f109712a..00000000000 --- a/ace/TLI_Connector.h +++ /dev/null @@ -1,126 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file TLI_Connector.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_TLI_CONNECTOR_H -#define ACE_TLI_CONNECTOR_H -#include "ace/pre.h" - -#include "ace/TLI_Stream.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_TLI) - -/** - * @class ACE_TLI_Connector - * - * @brief Defines an active connection factory for the ACE_TLI C++ - * wrappers. - */ -class ACE_Export ACE_TLI_Connector -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_TLI_Connector (void); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the maximum amount of time to wait before timing out. If the - * time expires before the connection is made . The - * is the value of local address to bind to. If it's - * the default value of then the user is letting - * the OS do the binding. If == 1 then the - * is reused, even if it hasn't been cleanedup yet. - */ - ACE_TLI_Connector (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0, - const char device[] = ACE_TLI_TCP_DEVICE, - struct t_info *info = 0, - int rw_flag = 1, - struct netbuf *udata = 0, - struct netbuf *opt = 0); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the maximum amount of time to wait before timing out. If the - * time expires before the connection is made . The - * is the value of local address to bind to. If it's - * the default value of then the user is letting - * the OS do the binding. If == 1 then the - * is reused, even if it hasn't been cleanedup yet. - */ - int connect (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0, - const char device[] = ACE_TLI_TCP_DEVICE, - struct t_info *info = 0, - int rw_flag = 1, - struct netbuf *udata = 0, - struct netbuf *opt = 0); - - /** - * Try to complete a non-blocking connection. - * If connection completion is successful then contains - * the connected ACE_SOCK_Stream. If is non-NULL then it - * will contain the address of the connected peer. - */ - int complete (ACE_TLI_Stream &new_stream, - ACE_Addr *remote_sap, - ACE_Time_Value *tv); - - /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); - - // = Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - typedef ACE_TLI_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if defined (__ACE_INLINE__) -#include "ace/TLI_Connector.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_TLI */ -#include "ace/post.h" -#endif /* ACE_TLI_CONNECTOR_H */ diff --git a/ace/TLI_Connector.i b/ace/TLI_Connector.i deleted file mode 100644 index 6539e19a6cd..00000000000 --- a/ace/TLI_Connector.i +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// TLI_Connector.i - -ACE_INLINE -ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms, - const char device[], - struct t_info *info, - int rw_flag, - struct netbuf *udata, - struct netbuf *opt) -{ - ACE_TRACE ("ACE_TLI_Connector::ACE_TLI_Connector"); - if (this->connect (new_stream, - remote_sap, - timeout, - local_sap, - reuse_addr, - flags, - perms, - device, - info, - rw_flag, - udata, - opt) == -1 - && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); -} - -ACE_INLINE -int -ACE_TLI_Connector::reset_new_handle (ACE_HANDLE handle) -{ - ACE_UNUSED_ARG (handle); - // Nothing to do here since the handle is not a socket - return 0; -} - diff --git a/ace/TLI_Stream.cpp b/ace/TLI_Stream.cpp deleted file mode 100644 index 4a216137ea5..00000000000 --- a/ace/TLI_Stream.cpp +++ /dev/null @@ -1,230 +0,0 @@ -// $Id$ - -/* Defines the member functions for the base class of the ACE_TLI_Stream - abstraction. */ - -#include "ace/TLI_Stream.h" -#include "ace/ACE.h" - -ACE_RCSID(ace, TLI_Stream, "$Id$") - -#if defined (ACE_HAS_TLI) - -#if !defined (__ACE_INLINE__) -#include "ace/TLI_Stream.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Stream) - -void -ACE_TLI_Stream::dump (void) const -{ - ACE_TRACE ("ACE_TLI_Stream::dump"); -} - -ACE_TLI_Stream::ACE_TLI_Stream (void) - : rwflag_ (0) -{ - ACE_TRACE ("ACE_TLI_Stream::ACE_TLI_Stream"); -} - -int -ACE_TLI_Stream::get_remote_addr (ACE_Addr &sa) const -{ - ACE_TRACE ("ACE_TLI_Stream::get_remote_addr"); - -#if defined (ACE_HAS_SVR4_TLI) - struct netbuf name; - name.maxlen = sa.get_size (); - name.buf = (char *) sa.get_addr (); - - // if (ACE_OS::t_getname (this->get_handle (), &name, REMOTENAME) == -1) - if (ACE_OS::ioctl (this->get_handle (), - TI_GETPEERNAME, - &name) == -1) - return -1; - else - return 0; -#else /* SunOS4 */ - ACE_UNUSED_ARG (sa); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_SVR4_TLI */ -} - -// Send a release and then await the release from the other side. - -int -ACE_TLI_Stream::active_close (void) -{ - ACE_TRACE ("ACE_TLI_Stream::active_close"); - char buf; - - if (this->sndrel () == -1) - return -1; - else if (this->recv (&buf, sizeof buf) == -1) - { - if (t_errno == TLOOK && this->look () == T_ORDREL) - { - if (this->rcvrel () == -1) - return -1; - } - else - return -1; - } - - return this->close (); -} - -// Acknowledge the release from the other side and then send the -// release to the other side. - -int -ACE_TLI_Stream::passive_close (void) -{ - ACE_TRACE ("ACE_TLI_Stream::passive_close"); - - if (this->rcvrel () == -1) - return -1; - else if (this->sndrel () == -1) - return -1; - - return this->close (); -} - -int -ACE_TLI_Stream::close (void) -{ - ACE_TRACE ("ACE_TLI_Stream::close"); - - ACE_HANDLE fd = this->get_handle (); - - this->set_handle (ACE_INVALID_HANDLE); - -#if !defined (ACE_WIN32) - if (this->rwflag_) - return ACE_OS::close (fd); - else -#endif /* ACE_WIN32 */ - return ACE_OS::t_close (fd); -} - -ssize_t -ACE_TLI_Stream::send (const void *buf, - size_t n, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_TLI_Stream::send"); - return ACE::send (this->get_handle (), - buf, - n, - timeout); -} - -ssize_t -ACE_TLI_Stream::send (const void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_TLI_Stream::send"); - return ACE::t_snd (this->get_handle (), - buf, - n, - flags, - timeout); -} - -ssize_t -ACE_TLI_Stream::recv (void *buf, - size_t n, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_TLI_Stream::recv"); - return ACE::recv (this->get_handle (), - buf, - n, - timeout); -} - -ssize_t -ACE_TLI_Stream::recv (void *buf, - size_t n, - int *flags, - const ACE_Time_Value *timeout) const -{ - ACE_TRACE ("ACE_TLI_Stream::recv"); - int f = 0; - - if (flags == 0) - flags = &f; - - return ACE::t_rcv (this->get_handle (), - buf, - n, - flags, - timeout); -} - -ssize_t -ACE_TLI_Stream::send_n (const void *buf, - size_t n, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_TLI_Stream::send_n"); - return ACE::send_n (this->get_handle (), - buf, - n, - timeout, - bytes_transferred); -} - -ssize_t -ACE_TLI_Stream::send_n (const void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_TLI_Stream::send_n"); - - return ACE::t_snd_n (this->get_handle (), - buf, - n, - flags, - timeout, - bytes_transferred); -} - -ssize_t -ACE_TLI_Stream::recv_n (void *buf, - size_t n, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_TLI_Stream::recv_n"); - return ACE::recv_n (this->get_handle (), - buf, - n, - timeout, - bytes_transferred); -} - -ssize_t -ACE_TLI_Stream::recv_n (void *buf, - size_t n, - int *flags, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_TLI_Stream::recv_n"); - - return ACE::t_rcv_n (this->get_handle (), - buf, - n, - flags, - timeout, - bytes_transferred); -} - -#endif /* ACE_HAS_TLI */ diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h deleted file mode 100644 index 750ba3cedd6..00000000000 --- a/ace/TLI_Stream.h +++ /dev/null @@ -1,133 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file TLI_Stream.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_TLI_STREAM_H -#define ACE_TLI_STREAM_H -#include "ace/pre.h" - -#include "ace/TLI.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/INET_Addr.h" - -#if defined (ACE_HAS_TLI) - -/** - * @class ACE_TLI_Stream - * - * @brief Defines the member functions for ACE_TLI_Stream abstraction. - */ -class ACE_Export ACE_TLI_Stream : public ACE_TLI -{ -public: - friend class ACE_TLI_Acceptor; - friend class ACE_TLI_Connector; - - // = Initialization and termination methods. - /// Default constructor. - ACE_TLI_Stream (void); - - // = TLI-specific shutdown operations. - /// Close down and release resources. - int close (void); - - /// Send a release and then await the release from the other side. - int active_close (void); - - /// Acknowledge the release from the other side and then send the - /// release to the other side. - int passive_close (void); - - /// Return address of remotely connected peer. - int get_remote_addr (ACE_Addr &) const; - - // = timod bindings - /// Send an n byte buffer to the connected socket (uses t_snd(3)). - ssize_t send (const void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout = 0) const; - - /// Recv an n byte buffer from the connected socket (uses t_rcv(3)). - ssize_t recv (void *buf, - size_t n, - int *flags, - const ACE_Time_Value *timeout = 0) const; - - /// Send exactly n bytes to the connected socket (uses t_snd(3)). - ssize_t send_n (const void *buf, - size_t n, - int flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Recv exactly n bytes from the connected socket (uses t_rcv(3)). - ssize_t recv_n (void *buf, - size_t n, - int *flags, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - // = tirdwr bindings - /// Send an n byte buffer to the connected socket (uses write(2)). - ssize_t send (const void *buf, - size_t n, - const ACE_Time_Value *timeout = 0) const; - - /// Recv an n byte buffer from the connected socket (uses read(2)). - ssize_t recv (void *buf, - size_t n, - const ACE_Time_Value *timeout = 0) const; - - /// Send n bytes, keep trying until n are sent (uses write(2)). - ssize_t send_n (const void *buf, - size_t n, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - /// Recv n bytes, keep trying until n are received (uses read (2)). - ssize_t recv_n (void *buf, - size_t n, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) const; - - // = Meta-type info - typedef ACE_INET_Addr PEER_ADDR; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Indicates whether the tirdwr module should be pushed - int rwflag_; - - /// Get rwflag - int get_rwflag (void); - - /// Set rwflag - void set_rwflag (int); -}; - -#if defined (__ACE_INLINE__) -#include "ace/TLI_Stream.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_TLI */ -#include "ace/post.h" -#endif /* ACE_TLI_STREAM_H */ diff --git a/ace/TLI_Stream.i b/ace/TLI_Stream.i deleted file mode 100644 index 89583e7fb8b..00000000000 --- a/ace/TLI_Stream.i +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// TLI_Stream.i - -#include "ace/TLI_Stream.h" - -ACE_INLINE -void -ACE_TLI_Stream::set_rwflag (int value) -{ - ACE_TRACE ("ACE_TLI_Stream::set_rwflag"); - this->rwflag_ = value; -} - -ACE_INLINE -int -ACE_TLI_Stream::get_rwflag (void) -{ - ACE_TRACE ("ACE_TLI_Stream::get_rwflag"); - return this->rwflag_; -} diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp deleted file mode 100644 index 8c58233a391..00000000000 --- a/ace/TP_Reactor.cpp +++ /dev/null @@ -1,872 +0,0 @@ -// $Id$ - - -#include "ace/TP_Reactor.h" -#include "ace/Reactor.h" -#include "ace/Thread.h" - -#if !defined (__ACE_INLINE__) -#include "ace/TP_Reactor.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, TP_Reactor, "$Id$") - - -ACE_ALLOC_HOOK_DEFINE (ACE_TP_Reactor) - -int -ACE_TP_Token_Guard::grab_token (ACE_Time_Value *max_wait_time) -{ - ACE_TRACE ("ACE_TP_Token_Guard::grab_token"); - - // The order of these events is very subtle, modify with care. - - // Try to grab the lock. If someone if already there, don't wake - // them up, just queue up in the thread pool. - int result = 0; - - if (max_wait_time) - { - ACE_Time_Value tv = ACE_OS::gettimeofday (); - tv += *max_wait_time; - - ACE_MT (result = this->token_.acquire_read (&ACE_TP_Reactor::no_op_sleep_hook, - 0, - &tv)); - } - else - { - ACE_MT (result = this->token_.acquire_read (&ACE_TP_Reactor::no_op_sleep_hook)); - } - - // Now that this thread owns the token let us make - // Check for timeouts and errors. - if (result == -1) - { - if (errno == ETIME) - return 0; - else - return -1; - } - - // We got the token and so let us mark ourselves as owner - this->owner_ = 1; - - return result; -} - - -int -ACE_TP_Token_Guard::acquire_token (ACE_Time_Value *max_wait_time) -{ - ACE_TRACE ("ACE_TP_Token_Guard::acquire_token"); - - // Try to grab the lock. If someone if already there, don't wake - // them up, just queue up in the thread pool. - int result = 0; - - if (max_wait_time) - { - ACE_Time_Value tv = ACE_OS::gettimeofday (); - tv += *max_wait_time; - - ACE_MT (result = this->token_.acquire (0, - 0, - &tv)); - } - else - { - ACE_MT (result = this->token_.acquire ()); - } - - // Now that this thread owns the token let us make - // Check for timeouts and errors. - if (result == -1) - { - if (errno == ETIME) - return 0; - else - return -1; - } - - // We got the token and so let us mark ourseleves as owner - this->owner_ = 1; - - return result; -} - - - -ACE_TP_Reactor::ACE_TP_Reactor (ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - int mask_signals, - int s_queue) - : ACE_Select_Reactor (sh, tq, 0, 0, mask_signals, s_queue) -{ - ACE_TRACE ("ACE_TP_Reactor::ACE_TP_Reactor"); - this->supress_notify_renew (1); -} - -ACE_TP_Reactor::ACE_TP_Reactor (size_t size, - int rs, - ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - int mask_signals, - int s_queue) - : ACE_Select_Reactor (size, rs, sh, tq, 0, 0, mask_signals, s_queue) -{ - ACE_TRACE ("ACE_TP_Reactor::ACE_TP_Reactor"); - this->supress_notify_renew (1); -} - -int -ACE_TP_Reactor::owner (ACE_thread_t, ACE_thread_t *o_id) -{ - ACE_TRACE ("ACE_TP_Reactor::owner"); - if (o_id) - *o_id = ACE_Thread::self (); - - return 0; -} - -int -ACE_TP_Reactor::owner (ACE_thread_t *t_id) -{ - ACE_TRACE ("ACE_TP_Reactor::owner"); - *t_id = ACE_Thread::self (); - - return 0; -} - -int -ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time) -{ - ACE_TRACE ("ACE_TP_Reactor::handle_events"); - - // Stash the current time -- the destructor of this object will - // automatically compute how much time elapsed since this method was - // called. - ACE_Countdown_Time countdown (max_wait_time); - - // The order of these events is very subtle, modify with care. - - - // Instantiate the token guard which will try grabbing the token for - // this thread. - ACE_TP_Token_Guard guard (this->token_); - - - int result = guard.grab_token (max_wait_time); - - // If the guard is NOT the owner just return the retval - if (!guard.is_owner ()) - return result; - - // After getting the lock just just for deactivation.. - if (this->deactivated_) - return -1; - - // Update the countdown to reflect time waiting for the token. - countdown.update (); - - - return this->dispatch_i (max_wait_time, - guard); -} - - -int -ACE_TP_Reactor::remove_handler (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) -{ - int result = 0; - // Artificial scoping for grabbing and releasing the token - { - ACE_TP_Token_Guard guard (this->token_); - - // Acquire the token - result = guard.acquire_token (); - - if (!guard.is_owner ()) - return result; - - // Call the remove_handler_i () with a DONT_CALL mask. We dont - // want to call the handle_close with the token held. - result = this->remove_handler_i (eh->get_handle (), - mask | ACE_Event_Handler::DONT_CALL); - - if (result == -1) - return -1; - } - - // Close down the unless we've been instructed not - // to. - if (result == 0 && (ACE_BIT_ENABLED (mask, ACE_Event_Handler::DONT_CALL) == 0)) - eh->handle_close (ACE_INVALID_HANDLE, mask); - - return 0; -} - -int -ACE_TP_Reactor::remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - - ACE_Event_Handler *eh = 0; - int result = 0; - // Artificial scoping for grabbing and releasing the token - { - ACE_TP_Token_Guard guard (this->token_); - - // Acquire the token - result = guard.acquire_token (); - - if (!guard.is_owner ()) - return result; - - size_t slot = 0; - eh = this->handler_rep_.find (handle, &slot); - - if (eh == 0) - return -1; - - // Call the remove_handler_i () with a DONT_CALL mask. We dont - // want to call the handle_close with the token held. - result = this->remove_handler_i (handle, - mask | ACE_Event_Handler::DONT_CALL); - - if (result == -1) - return -1; - } - - // Close down the unless we've been instructed not - // to. - // @@ Note: The check for result ==0 may be redundant, but shouldnt - // be a problem. - if (result ==0 && (ACE_BIT_ENABLED (mask, ACE_Event_Handler::DONT_CALL) == 0)) - eh->handle_close (handle, mask); - - return 0; -} - - -int -ACE_TP_Reactor::remove_handler (const ACE_Handle_Set &handles, - ACE_Reactor_Mask m) -{ - // Array of corresponding to - ACE_Event_Handler **aeh = 0; - - // Allocate memory for the size of the handle set - ACE_NEW_RETURN (aeh, - ACE_Event_Handler *[handles.num_set ()], - -1); - - size_t index = 0; - - // Artificial scoping for grabbing and releasing the token - { - ACE_TP_Token_Guard guard (this->token_); - - // Acquire the token - int result = guard.acquire_token (); - - if (!guard.is_owner ()) - return result; - - ACE_HANDLE h; - - ACE_Handle_Set_Iterator handle_iter (handles); - - while ((h = handle_iter ()) != ACE_INVALID_HANDLE) - { - size_t slot = 0; - ACE_Event_Handler *eh = - this->handler_rep_.find (h, &slot); - - if (this->remove_handler_i (h, - m | ACE_Event_Handler::DONT_CALL) == -1) - { - delete [] aeh; - return -1; - } - - aeh [index] = eh; - index ++; - } - } - - // Close down the unless we've been instructed not - // to. - if (ACE_BIT_ENABLED (m, ACE_Event_Handler::DONT_CALL) == 0) - { - for (size_t i = 0; i < index; i++) - aeh[i]->handle_close (ACE_INVALID_HANDLE, m); - } - - delete [] aeh; - return 0; -} - -int -ACE_TP_Reactor::remove_handler (int /*signum*/, - ACE_Sig_Action * /*new_disp*/, - ACE_Sig_Action * /*old_disp*/, - int /*sigkey*/) -{ - ACE_NOTSUP_RETURN (-1); -} - -int -ACE_TP_Reactor::remove_handler (const ACE_Sig_Set & /*sigset*/) -{ - ACE_NOTSUP_RETURN (-1); -} - - -int -ACE_TP_Reactor::dispatch_i (ACE_Time_Value *max_wait_time, - ACE_TP_Token_Guard &guard) -{ - int event_count = - this->get_event_for_dispatching (max_wait_time); - - int result = 0; - - // Note: We are passing the around, to have record of - // how many events still need processing. May be this could be - // useful in future. - - // Dispatch signals - if (event_count == -1) - { - // Looks like we dont do any upcalls in dispatch signals. If at - // a later point of time, we decide to handle signals we have to - // release the lock before we make any upcalls.. What is here - // now is not the right thing... - // @@ We need to do better.. - return this->handle_signals (event_count, - guard); - } - - // If there are no signals and if we had received a proper - // event_count then first look at dispatching timeouts. We need to - // handle timers early since they may have higher latency - // constraints than I/O handlers. Ideally, the order of - // dispatching should be a strategy... - - // NOTE: The event count does not have the number of timers that - // needs dispatching. But we are still passing this along. We dont - // need to do that. In the future we *may* have the timers also - // returned through the . Just passing that along for - // that day. - result = this->handle_timer_events (event_count, - guard); - - if (result > 0) - return result; - - - // Else justgo ahead fall through for further handling - - if (event_count > 0) - { - // Next dispatch the notification handlers (if there are any to - // dispatch). These are required to handle multiple-threads that - // are trying to update the . - result = this->handle_notify_events (event_count, - guard); - - if (result > 0) - return result; - - // Else just fall through for further handling - } - - if (event_count > 0) - { - // Handle socket events - return this->handle_socket_events (event_count, - guard); - } - - return 0; - -} - - - - -int -ACE_TP_Reactor::handle_signals (int & /*event_count*/, - ACE_TP_Token_Guard & /*guard*/) -{ - ACE_TRACE ("ACE_TP_Reactor::handle_signals"); - - /* - * - * THIS METHOD SEEMS BROKEN - * - * - */ - // First check for interrupts. - // Bail out -- we got here since are persistent if not acted upon immediately. It - * works by remembering the event handler that just got - * activated, releasing the internal lock (so that some other - * thread can start waiting in the event loop) and then - * dispatching the event handler outside the context of the - * Reactor lock. - * This Reactor is best suited for situations when the callbacks - * to event handlers can take arbitrarily long and/or a number - * of threads are available to run the event loops. - * Note that callback code in Event Handlers - * (e.g. Event_Handler::handle_input) does not have to be - * modified or made thread-safe for this Reactor. This is - * because an activated Event Handler is suspended in the - * Reactor before the upcall is made and resumed after the - * upcall completes. Therefore, one Event Handler cannot be - * called by multiple threads simultaneously. - */ -class ACE_Export ACE_TP_Reactor : public ACE_Select_Reactor -{ -public: - - // = Initialization and termination methods. - - /// Initialize with the default size. - ACE_TP_Reactor (ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int mask_signals = 1, - int s_queue = ACE_Select_Reactor_Token::FIFO); - - /** - * Initialize the to manage - * . If is non-0 then the - * 's method will be restarted - * automatically when occurs. If or - * are non-0 they are used as the signal handler and - * timer queue, respectively. - */ - ACE_TP_Reactor (size_t max_number_of_handles, - int restart = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int mask_signals = 1, - int s_queue = ACE_Select_Reactor_Token::FIFO); - - // = Event loop drivers. - - /** - * This event loop driver that blocks for before - * returning. It will return earlier if timer events, I/O events, - * or signal events occur. Note that can be 0, in - * which case this method blocks indefinitely until events occur. - * - * is decremented to reflect how much time this call - * took. For instance, if a time value of 3 seconds is passed to - * handle_events and an event occurs after 2 seconds, - * will equal 1 second. This can be used if an - * application wishes to handle events for some fixed amount of - * time. - * - * Returns the total number of s that were - * dispatched, 0 if the elapsed without dispatching - * any handlers, or -1 if something goes wrong. - */ - virtual int handle_events (ACE_Time_Value *max_wait_time = 0); - - virtual int handle_events (ACE_Time_Value &max_wait_time); - - - /// The following two overloaded methods are necessary as we dont - /// want the TP_Reactor to call handle_close () with the token - /// held. - /** - * Removes the binding of from the Select_Reactor. If - * there are no more bindings for this then it is removed from - * the Select_Reactor. Note that the Select_Reactor will call - * to extract the underlying I/O - * handle. - */ - virtual int remove_handler (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); - - /** - * Removes the bind of whose handle is - * from the Select_Reactor. If there are no more bindings - * for this then it is removed from the Select_Reactor. - */ - virtual int remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask); - - /** - * Removes all the bindings for handles in the - * bind of . If there are no more bindings for any - * of these handlers then they are removed from the Select_Reactor. - */ - virtual int remove_handler (const ACE_Handle_Set &handle_set, - ACE_Reactor_Mask); - - /* @todo The following methods are not supported. Support for - * signals is not available in the TP_Reactor. These methods will be - * supported once signal handling is supported. We have to include - * these two methods in the TP_Reactor to keep some compilers - * silent. - */ - /** - * Remove the ACE_Event_Handler currently associated with . - * is ignored in this implementation since there is only - * one instance of a signal handler. Install the new disposition - * (if given) and return the previous disposition (if desired by the - * caller). Returns 0 on success and -1 if is invalid. - */ - virtual int remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp = 0, - int sigkey = -1); - - /// Calls for every signal in . - virtual int remove_handler (const ACE_Sig_Set &sigset); - - /// Does the reactor allow the application to resume the handle on - /// its own ie. can it pass on the control of handle resumption to - /// the application. The TP reactor has can allow applications to - /// resume handles. So return a +ve value. - virtual int resumable_handler (void); - - /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the and - /// . - virtual int mask_ops (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask, - int ops); - - /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the - /// and . - virtual int mask_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops); - - /// Called from handle events - static void no_op_sleep_hook (void *); - - // = Any thread can perform a , override the owner() - // methods to avoid the overhead of setting the owner thread. - - /// Set the new owner of the thread and return the old owner. - virtual int owner (ACE_thread_t n_id, ACE_thread_t *o_id = 0); - - /// Return the current owner of the thread. - virtual int owner (ACE_thread_t *); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - // = Internal methods that do the actual work. - - - /// Dispatch just 1 signal, timer, notification handlers - int dispatch_i (ACE_Time_Value *max_wait_time, - ACE_TP_Token_Guard &guard); - - /// Get the event that needs dispatching.It could be either a - /// signal, timer, notification handlers or return possibly 1 I/O - /// handler for dispatching. In the most common use case, this would - /// return 1 I/O handler for dispatching - int get_event_for_dispatching (ACE_Time_Value *max_wait_time); - - /// Method to handle signals - /// NOTE: It is just busted at this point in time. - int handle_signals (int &event_count, - ACE_TP_Token_Guard &g); - - /// Handle timer events - int handle_timer_events (int &event_count, - ACE_TP_Token_Guard &g); - - /// Handle notify events - int handle_notify_events (int &event_count, - ACE_TP_Token_Guard &g); - - /// handle socket events - int handle_socket_events (int &event_count, - ACE_TP_Token_Guard &g); - - /// This method shouldn't get called. - virtual void notify_handle (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Handle_Set &, - ACE_Event_Handler *eh, - ACE_EH_PTMF callback); -private: - - /// Get the handle of the notify pipe from the ready set if there is - /// an event in the notify pipe. - ACE_HANDLE get_notify_handle (void); - - /// Get socket event dispatch information. - int get_socket_event_info (ACE_EH_Dispatch_Info &info); - - /// Notify the appropriate in the context of the - /// associated with that a particular event has occurred. - int dispatch_socket_event (ACE_EH_Dispatch_Info &dispatch_info); - - /// Clear the from the read_set - void clear_handle_read_set (ACE_HANDLE handle); - -private: - /// Deny access since member-wise won't work... - ACE_TP_Reactor (const ACE_TP_Reactor &); - ACE_TP_Reactor &operator = (const ACE_TP_Reactor &); -}; - -#if defined (__ACE_INLINE__) -#include "ace/TP_Reactor.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_TP_REACTOR_H */ diff --git a/ace/TP_Reactor.i b/ace/TP_Reactor.i deleted file mode 100644 index bfb3f02e2dd..00000000000 --- a/ace/TP_Reactor.i +++ /dev/null @@ -1,101 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -/************************************************************************/ -// Methods for ACE_EH_Dispatch_Info -/************************************************************************/ - -ACE_INLINE void -ACE_EH_Dispatch_Info::reset (void) -{ - this->dispatch_ = 0; - - this->handle_ = ACE_INVALID_HANDLE; - this->event_handler_ = 0; - this->mask_ = ACE_Event_Handler::NULL_MASK; - this->callback_ = 0; -} - - -ACE_INLINE -ACE_EH_Dispatch_Info::ACE_EH_Dispatch_Info (void) -{ - this->reset (); -} - -ACE_INLINE void -ACE_EH_Dispatch_Info::set (ACE_HANDLE handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - ACE_EH_PTMF callback) -{ - this->dispatch_ = 1; - - this->handle_ = handle; - this->event_handler_ = event_handler; - this->mask_ = mask; - this->callback_ = callback; -} - -ACE_INLINE int -ACE_EH_Dispatch_Info::dispatch (void) const -{ - return this->dispatch_; -} - -/************************************************************************/ -// Methods for ACE_TP_Token_Guard -/************************************************************************/ - -ACE_INLINE -ACE_TP_Token_Guard::ACE_TP_Token_Guard (ACE_Select_Reactor_Token &token) - - :token_ (token), - owner_ (0) -{ -} - -ACE_INLINE -ACE_TP_Token_Guard::~ACE_TP_Token_Guard (void) -{ - if (this->owner_ == 1) - { - ACE_MT (this->token_.release ()); - this->owner_ = 0; - } -} - -ACE_INLINE void -ACE_TP_Token_Guard::release_token (void) -{ - if (this->owner_) - { - ACE_MT (this->token_.release ()); - - // We are not the owner anymore.. - this->owner_ = 0; - } -} - -ACE_INLINE int -ACE_TP_Token_Guard::is_owner (void) -{ - return this->owner_; -} - - -/************************************************************************/ -// Methods for ACE_TP_Reactor -/************************************************************************/ -ACE_INLINE void -ACE_TP_Reactor::no_op_sleep_hook (void *) -{ -} - -ACE_INLINE void -ACE_TP_Reactor::clear_handle_read_set (ACE_HANDLE handle) -{ - this->ready_set_.wr_mask_.clr_bit (handle); - this->ready_set_.ex_mask_.clr_bit (handle); - this->ready_set_.rd_mask_.clr_bit (handle); -} diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp deleted file mode 100644 index 8fd68145d38..00000000000 --- a/ace/TTY_IO.cpp +++ /dev/null @@ -1,515 +0,0 @@ -// $Id$ - -#include "ace/TTY_IO.h" - -ACE_RCSID(ace, TTY_IO, "$Id$") - -ACE_TTY_IO::Serial_Params::Serial_Params (void) -{ - ACE_OS::memset (this, 0, sizeof *this); -} - -// Interface for reading/writing serial device parameters - -int -ACE_TTY_IO::control (Control_Mode cmd, - Serial_Params *arg) const -{ -#if defined (ACE_HAS_TERM_IOCTLS) -#if defined(TCGETS) - struct termios devpar; -#elif defined(TCGETA) - struct termio devpar; -#else - errno = ENOSYS; - return -1; -#endif - u_long c_iflag; - u_long c_oflag; - u_long c_cflag; - u_long c_lflag; - // u_long c_line; - u_char ivmin_cc4; - u_char ivtime_cc5; - - c_iflag=0; - c_oflag=0; - c_cflag=0; - c_lflag=0; - // c_line=0; - - // Get default device parameters. - -#if defined (TCGETS) - if (this->ACE_IO_SAP::control (TCGETS, (void *) &devpar) == -1) -#elif defined (TCGETA) - if (this->ACE_IO_SAP::control (TCGETA, (void *) &devpar) == -1) -#else - errno = ENOSYS; -#endif /* TCGETS */ - return -1; - - u_int newbaudrate = 0; - - switch (cmd) - { - case SETPARAMS: - switch (arg->baudrate) - { -#if defined (B0) - case 0: newbaudrate = B0; break; -#endif /* B0 */ -#if defined (B50) - case 50: newbaudrate = B50; break; -#endif /* B50 */ -#if defined (B75) - case 75: newbaudrate = B75; break; -#endif /* B75 */ -#if defined (B110) - case 110: newbaudrate = B110; break; -#endif /* B110 */ -#if defined (B134) - case 134: newbaudrate = B134; break; -#endif /* B134 */ -#if defined (B150) - case 150: newbaudrate = B150; break; -#endif /* B150 */ -#if defined (B200) - case 200: newbaudrate = B200; break; -#endif /* B200 */ -#if defined (B300) - case 300: newbaudrate = B300; break; -#endif /* B300 */ -#if defined (B600) - case 600: newbaudrate = B600; break; -#endif /* B600 */ -#if defined (B1200) - case 1200: newbaudrate = B1200; break; -#endif /* B1200 */ -#if defined (B1800) - case 1800: newbaudrate = B1800; break; -#endif /* B1800 */ -#if defined (B2400) - case 2400: newbaudrate = B2400; break; -#endif /* B2400 */ -#if defined (B4800) - case 4800: newbaudrate = B4800; break; -#endif /* B4800 */ -#if defined (B9600) - case 9600: newbaudrate = B9600; break; -#endif /* B9600 */ -#if defined (B19200) - case 19200: newbaudrate = B19200; break; -#endif /* B19200 */ -#if defined (B38400) - case 38400: newbaudrate = B38400; break; -#endif /* B38400 */ -#if defined (B56000) - case 56000: newbaudrate = B56000; break; -#endif /* B56000 */ -#if defined (B57600) - case 57600: newbaudrate = B57600; break; -#endif /* B57600 */ -#if defined (B76800) - case 76800: newbaudrate = B76800; break; -#endif /* B76800 */ -#if defined (B115200) - case 115200: newbaudrate = B115200; break; -#endif /* B115200 */ -#if defined (B128000) - case 128000: newbaudrate = B128000; break; -#endif /* B128000 */ -#if defined (B153600) - case 153600: newbaudrate = B153600; break; -#endif /* B153600 */ -#if defined (B230400) - case 230400: newbaudrate = B230400; break; -#endif /* B230400 */ -#if defined (B307200) - case 307200: newbaudrate = B307200; break; -#endif /* B307200 */ -#if defined (B256000) - case 256000: newbaudrate = B256000; break; -#endif /* B256000 */ -#if defined (B460800) - case 460800: newbaudrate = B460800; break; -#endif /* B460800 */ -#if defined (B500000) - case 500000: newbaudrate = B500000; break; -#endif /* B500000 */ -#if defined (B576000) - case 576000: newbaudrate = B576000; break; -#endif /* B576000 */ -#if defined (B921600) - case 921600: newbaudrate = B921600; break; -#endif /* B921600 */ -#if defined (B1000000) - case 1000000: newbaudrate = B1000000; break; -#endif /* B1000000 */ -#if defined (B1152000) - case 1152000: newbaudrate = B1152000; break; -#endif /* B1152000 */ -#if defined (B1500000) - case 1500000: newbaudrate = B1500000; break; -#endif /* B1500000 */ -#if defined (B2000000) - case 2000000: newbaudrate = B2000000; break; -#endif /* B2000000 */ -#if defined (B2500000) - case 2500000: newbaudrate = B2500000; break; -#endif /* B2500000 */ -#if defined (B3000000) - case 3000000: newbaudrate = B3000000; break; -#endif /* B3000000 */ -#if defined (B3500000) - case 3500000: newbaudrate = B3500000; break; -#endif /* B3500000 */ -#if defined (B4000000) - case 4000000: newbaudrate = B4000000; break; -#endif /* B4000000 */ - default: - return -1; - } - -#if defined(ACE_USES_NEW_TERMIOS_STRUCT) - // @@ Can you really have different input and output baud - // rates?! - devpar.c_ispeed = newbaudrate; - devpar.c_ospeed = newbaudrate; -#else - c_cflag |= newbaudrate; -#endif /* ACE_USES_NEW_TERMIOS_STRUCT */ - - switch (arg->databits) - { - case 5: - c_cflag |= CS5; - break; - case 6: - c_cflag |= CS6; - break; - case 7: - c_cflag |= CS7; - break; - case 8: - c_cflag |= CS8; - break; - default: - return -1; - } - - switch (arg->stopbits) - { - case 1: - break; - case 2: - c_cflag |= CSTOPB; - break; - default: - return -1; - } - if (arg->parityenb) - { - c_cflag |= PARENB; - if (ACE_OS::strcasecmp (arg->paritymode, "odd") == 0) - c_cflag |= PARODD; - } - -#if defined (CRTSCTS) - // 6/22/00 MLS add rtsenb to if statement - if ((arg->ctsenb)||(arg->rtsenb)) /* enable CTS/RTS protocoll */ - c_cflag |= CRTSCTS; -#endif /* CRTSCTS */ -#if defined (NEW_RTSCTS) - // 8/30/00 MLS add rtsenb to if statement to support new termios - if ((arg->ctsenb)||(arg->rtsenb)) /* enable CTS/RTS protocoll */ - c_cflag |= NEW_RTSCTS; -#endif /* CRTSCTS */ -#if defined (CREAD) - if (arg->rcvenb) /* enable receiver */ - c_cflag |= CREAD; -#endif /* CREAD */ - - -#if defined (HUPCL) - // Cause DTR to be drop after port close MS 7/24/2000; - c_cflag |= HUPCL; -#endif /* HUPCL */ - -#if defined (CLOCAL) - // if device is not a modem set to local device MS 7/24/2000 - if(!arg->modem) - c_cflag |= CLOCAL; -#endif /* CLOCAL */ - - c_oflag = 0; - c_iflag = IGNPAR | INPCK; - if (arg->databits < 8) - c_iflag |= ISTRIP; -#if defined (IGNBRK) - // if device is not a modem set to ignore break points MS 7/24/2000 - if(!arg->modem) - c_iflag |= IGNBRK; -#endif /* IGNBRK */ - // 6/22/00 MLS add enable xon/xoff -#if defined (IXON) - if (arg->xinenb) /* enable XON/XOFF output*/ - c_iflag |= IXON; -#endif /* IXON */ -#if defined (IXOFF) - if (arg->xoutenb) /* enable XON/XOFF input*/ - c_iflag |= IXOFF; -#endif /* IXOFF */ - c_lflag = 0; - - ivmin_cc4 = (u_char) 0; - ivtime_cc5= (u_char) (arg->readtimeoutmsec / 100); - devpar.c_iflag = c_iflag; - devpar.c_oflag = c_oflag; - devpar.c_cflag = c_cflag; - devpar.c_lflag = c_lflag; - devpar.c_cc[ACE_VMIN] = ivmin_cc4; - devpar.c_cc[ACE_VTIME] = ivtime_cc5; - -#if defined(TIOCMGET) - // ensure DTR is enabled - int status; - this->ACE_IO_SAP::control (TIOCMGET, &status); - - if (arg->dtrdisable) - status &= ~TIOCM_DTR; - else - status |= TIOCM_DTR; - - this->ACE_IO_SAP::control (TIOCMSET,&status); -#endif /* definded (TIOCMGET) */ - -#if defined(TCSETS) - return this->ACE_IO_SAP::control (TCSETS, - (void *) &devpar); -#elif defined(TCSETA) - return this->ACE_IO_SAP::control (TCSETA, - (void *) &devpar); -#else - errno = ENOSYS; - return -1; -#endif - case GETPARAMS: - return -1; // Not yet implemented. - default: - return -1; // Wrong cmd. - } -#elif defined (ACE_WIN32) - switch (cmd) - { - case SETPARAMS: - DCB dcb; - dcb.DCBlength = sizeof dcb; - if (!::GetCommState (this->get_handle (), &dcb)) - { - ACE_OS::set_errno_to_last_error (); - return -1; - } -/*SadreevAA - switch (arg->baudrate) - { - case 300: dcb.BaudRate = CBR_300; break; - case 600: dcb.BaudRate = CBR_600; break; - case 1200: dcb.BaudRate = CBR_1200; break; - case 2400: dcb.BaudRate = CBR_2400; break; - case 4800: dcb.BaudRate = CBR_4800; break; - case 9600: dcb.BaudRate = CBR_9600; break; - case 19200: dcb.BaudRate = CBR_19200; break; - case 38400: dcb.BaudRate = CBR_38400; break; -// case 56000: dcb.BaudRate = CBR_56000; break; - case 57600: dcb.BaudRate = CBR_57600; break; - case 115200: dcb.BaudRate = CBR_115200; break; -// case 128000: dcb.BaudRate = CBR_128000; break; -// case 256000: dcb.BaudRate = CBR_256000; break; - default: return -1; - } -*/ - dcb.BaudRate = arg->baudrate; - switch (arg->databits) - { - case 4: - case 5: - case 6: - case 7: - case 8: - dcb.ByteSize = u_char (arg->databits); - break; - default: - return -1; - } - - switch (arg->stopbits) - { - case 1: - dcb.StopBits = ONESTOPBIT; - break; - case 2: - dcb.StopBits = TWOSTOPBITS; - break; - default: - return -1; - } - - - // 6/22/00 MLS enabled extra paths for win32 parity checking. - if (arg->parityenb) - { - dcb.fParity = TRUE; - if (ACE_OS::strcasecmp (arg->paritymode, "odd") == 0) - dcb.Parity = ODDPARITY; - else if (ACE_OS::strcasecmp (arg->paritymode, "even") == 0) - dcb.Parity = EVENPARITY; - else if (ACE_OS::strcasecmp (arg->paritymode, "mark") == 0) - dcb.Parity = MARKPARITY; - else if (ACE_OS::strcasecmp (arg->paritymode, "space") == 0) - dcb.Parity = SPACEPARITY; - else - dcb.Parity = NOPARITY; - } - else - { - dcb.fParity = FALSE; - dcb.Parity = NOPARITY; - } - - if (arg->ctsenb) // enable CTS protocol. - dcb.fOutxCtsFlow = TRUE; - else - dcb.fOutxCtsFlow = FALSE; - - // SadreevAA - if (arg->dsrenb) // enable DSR protocol. - dcb.fOutxDsrFlow = TRUE; - else - dcb.fOutxDsrFlow = FALSE; - - // 6/22/00 MLS add great flexibility for win32 - // pulled rts out of ctsenb - switch (arg->rtsenb) // enable RTS protocol. - { - case 1: - dcb.fRtsControl = RTS_CONTROL_ENABLE; - break; - case 2: - dcb.fRtsControl = RTS_CONTROL_HANDSHAKE; - break; - case 3: - dcb.fRtsControl = RTS_CONTROL_TOGGLE; - break; - default: - dcb.fRtsControl = RTS_CONTROL_DISABLE; - } - - // 6/22/00 MLS add enable xon/xoff - if (arg->xinenb) // enable XON/XOFF for reception - dcb.fInX = TRUE; // Fixed by SadreevAA - else - dcb.fInX = FALSE; // Fixed by SadreevAA - - if (arg->xoutenb) // enable XON/XOFF for transmission - dcb.fOutX = TRUE; - else - dcb.fOutX = FALSE; - - // always set limits unless set to -1 to use default - // 6/22/00 MLS add xon/xoff limits - if (arg->xonlim != -1) - dcb.XonLim = arg->xonlim; - if (arg->xofflim != -1) - dcb.XoffLim = arg->xofflim; - - if (arg->dtrdisable) - dcb.fDtrControl = DTR_CONTROL_DISABLE; - else - dcb.fDtrControl = DTR_CONTROL_ENABLE; - - dcb.fAbortOnError = FALSE; - dcb.fErrorChar = FALSE; - dcb.fNull = FALSE; - dcb.fBinary = TRUE; - if (!::SetCommState (this->get_handle (), &dcb)) - { - ACE_OS::set_errno_to_last_error (); - return -1; - } - - // 2/13/97 BWF added drop out timer - // modified time out to operate correctly with when delay - // is requested or no delay is requestes - COMMTIMEOUTS timeouts; - if (!::GetCommTimeouts (this->get_handle(), &timeouts)) - { - ACE_OS::set_errno_to_last_error (); - return -1; - } - - if (arg->readtimeoutmsec == 0) - { - // return immediately if no data in the input buffer - timeouts.ReadIntervalTimeout = MAXDWORD; - timeouts.ReadTotalTimeoutMultiplier = 0; - timeouts.ReadTotalTimeoutConstant = 0; - } - else - { - // Wait for specified time-out for char to arrive - // before returning. - timeouts.ReadIntervalTimeout = MAXDWORD; - timeouts.ReadTotalTimeoutMultiplier = MAXDWORD; - - // ensure specified timeout is below MAXDWORD - - // We don't test arg->readtimeoutmsec against MAXDWORD - // directly to avoid a warning in the case DWORD is - // unsigned. Ensure specified timeout is below MAXDWORD use - // MAXDWORD as indicator for infinite timeout. - DWORD dw = arg->readtimeoutmsec; - if (dw < MAXDWORD) - { - // Wait for specified time-out for char to arrive before - // returning. - timeouts.ReadIntervalTimeout = MAXDWORD; - timeouts.ReadTotalTimeoutMultiplier = MAXDWORD; - timeouts.ReadTotalTimeoutConstant = dw; - } - else - { - // settings for infinite timeout - timeouts.ReadIntervalTimeout = 0; - timeouts.ReadTotalTimeoutMultiplier = 0; - timeouts.ReadTotalTimeoutConstant = 0; - } - } - - if (!::SetCommTimeouts (this->get_handle (), &timeouts)) - { - ACE_OS::set_errno_to_last_error (); - return -1; - } - - return 0; - - case GETPARAMS: - ACE_NOTSUP_RETURN (-1); // Not yet implemented. - default: - return -1; // Wrong cmd. - - } // arg switch -#else - ACE_UNUSED_ARG (cmd); - ACE_UNUSED_ARG (arg); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_TERM_IOCTLS */ -} - -#if defined (ACE_NEEDS_DEV_IO_CONVERSION) -ACE_TTY_IO::operator ACE_DEV_IO &() -{ - return (ACE_DEV_IO &) *this; -} -#endif /* ACE_NEEDS_DEV_IO_CONVERSION */ diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h deleted file mode 100644 index bf67457c93b..00000000000 --- a/ace/TTY_IO.h +++ /dev/null @@ -1,86 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file TTY_IO.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_TTY_IO_H -#define ACE_TTY_IO_H - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/DEV_IO.h" - -/** - * @class ACE_TTY_IO - * - * @brief Class definitions for platform specific TTY features. - * - * This class represents an example interface for a specific - * device (a serial line) It extends the capability of the - * underlying DEV_IO class by adding a control method that takes - * a special structure (Serial_Params) as argument to allow a - * comfortable user interface (away from that annoying termios - * structure, which is very specific to UNIX). - */ -class ACE_Export ACE_TTY_IO : public ACE_DEV_IO -{ -public: - enum Control_Mode - { - /// Set control parameters. - SETPARAMS, - /// Get control parameters. - GETPARAMS - }; - - struct ACE_Export Serial_Params - { - Serial_Params (void); - - // Common params - int baudrate; - int parityenb; - const char *paritymode; - int databits; - int stopbits; - int readtimeoutmsec; - int ctsenb; // CTS & RTS are the same under unix - int rtsenb; // enable & set rts mode (win32) - int xinenb; // enable xon/xoff reception - int xoutenb; // enable xon/xoff transmission - - // Posix - unix variant - int modem; - int rcvenb; - - //Win32 - int dsrenb; // SadreevAA - - int xonlim; // min bytes in input buffer before xon - int xofflim; // max bytes in input buffer before xoff - - int dtrdisable; // Controls whether DTR is disabled or not. - }; - - /// Interface for reading/writing serial device parameters. - int control (Control_Mode cmd, - Serial_Params *arg) const; - -#if defined (ACE_NEEDS_DEV_IO_CONVERSION) - /// This is necessary to pass ACE_TTY_IO as parameter to DEV_Connector. - operator ACE_DEV_IO &(); -#endif /* ACE_NEEDS_DEV_IO_CONVERSION */ -}; - -#endif /* ACE_TTY_IO_H */ diff --git a/ace/Task.cpp b/ace/Task.cpp deleted file mode 100644 index 960977d84ae..00000000000 --- a/ace/Task.cpp +++ /dev/null @@ -1,234 +0,0 @@ -// $Id$ - -#include "ace/Task.h" -#include "ace/Module.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Task.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Task, "$Id$") - -ACE_Task_Base::~ACE_Task_Base (void) -{ -} - -ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man) - : thr_count_ (0), - thr_mgr_ (thr_man), - flags_ (0), - grp_id_ (-1) -{ -} - -// Wait for all threads running in a task to exit. - -int -ACE_Task_Base::wait (void) -{ - ACE_TRACE ("ACE_Task_Base::wait"); - - // If we don't have a thread manager, we probably were never - // activated. - if (this->thr_mgr () != 0) - return this->thr_mgr ()->wait_task (this); - else - return 0; -} - -// Suspend a task. -int -ACE_Task_Base::suspend (void) -{ - ACE_TRACE ("ACE_Task_Base::suspend"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - if (this->thr_count_ > 0) - return this->thr_mgr_->suspend_task (this); - - return 0; -} - -// Resume a suspended task. -int -ACE_Task_Base::resume (void) -{ - ACE_TRACE ("ACE_Task_Base::resume"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - if (this->thr_count_ > 0) - return this->thr_mgr_->resume_task (this); - - return 0; -} - -int -ACE_Task_Base::activate (long flags, - int n_threads, - int force_active, - long priority, - int grp_id, - ACE_Task_Base *task, - ACE_hthread_t thread_handles[], - void *stack[], - size_t stack_size[], - ACE_thread_t thread_ids[]) -{ - ACE_TRACE ("ACE_Task_Base::activate"); - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1); - - // If the task passed in is zero, we will use - if (task == 0) - task = this; - - if (this->thr_count_ > 0 && force_active == 0) - return 1; // Already active. - else - { - if (this->thr_count_ > 0 && grp_id != -1) - // If we're joining an existing group of threads then make - // sure to use its group id. - grp_id = this->grp_id_; - this->thr_count_ += n_threads; - } - - // Use the ACE_Thread_Manager singleton if we're running as an - // active object and the caller didn't supply us with a - // Thread_Manager. - if (this->thr_mgr_ == 0) -# if defined (ACE_THREAD_MANAGER_LACKS_STATICS) - this->thr_mgr_ = ACE_THREAD_MANAGER_SINGLETON::instance (); -# else /* ! ACE_THREAD_MANAGER_LACKS_STATICS */ - this->thr_mgr_ = ACE_Thread_Manager::instance (); -# endif /* ACE_THREAD_MANAGER_LACKS_STATICS */ - - int grp_spawned = -1; - if (thread_ids == 0) - // Thread Ids were not specified - grp_spawned = - this->thr_mgr_->spawn_n (n_threads, - &ACE_Task_Base::svc_run, - (void *) this, - flags, - priority, - grp_id, - task, - thread_handles, - stack, - stack_size); - else - // thread names were specified - grp_spawned = - this->thr_mgr_->spawn_n (thread_ids, - n_threads, - &ACE_Task_Base::svc_run, - (void *) this, - flags, - priority, - grp_id, - stack, - stack_size, - thread_handles, - task); - if (grp_spawned == -1) - { - // If spawn_n fails, restore original thread count. - this->thr_count_ -= n_threads; - return -1; - } - - if (this->grp_id_ == -1) - this->grp_id_ = grp_spawned; - - return 0; - -#else - { - // Keep the compiler from complaining. - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (n_threads); - ACE_UNUSED_ARG (force_active); - ACE_UNUSED_ARG (priority); - ACE_UNUSED_ARG (grp_id); - ACE_UNUSED_ARG (task); - ACE_UNUSED_ARG (thread_handles); - ACE_UNUSED_ARG (stack); - ACE_UNUSED_ARG (stack_size); - ACE_UNUSED_ARG (thread_ids); - ACE_NOTSUP_RETURN (-1); - } -#endif /* ACE_MT_SAFE */ -} - -void -ACE_Task_Base::cleanup (void *object, void *) -{ - ACE_Task_Base *t = (ACE_Task_Base *) object; - - // The thread count must be decremented first in case the - // hook does something crazy like "delete this". - t->thr_count_dec (); - - // @@ Is it possible to pass in the exit status somehow? - t->close (); -} - - -#if defined (ACE_HAS_SIG_C_FUNC) -extern "C" void -ACE_Task_Base_cleanup (void *object, void *) -{ - ACE_Task_Base::cleanup (object, 0); -} -#endif /* ACE_HAS_SIG_C_FUNC */ - -ACE_THR_FUNC_RETURN -ACE_Task_Base::svc_run (void *args) -{ - ACE_TRACE ("ACE_Task_Base::svc_run"); - - ACE_Task_Base *t = (ACE_Task_Base *) args; - - // Register ourself with our 's thread exit hook - // mechanism so that our close() hook will be sure to get invoked - // when this thread exits. - -#if defined ACE_HAS_SIG_C_FUNC - t->thr_mgr ()->at_exit (t, ACE_Task_Base_cleanup, 0); -#else - t->thr_mgr ()->at_exit (t, ACE_Task_Base::cleanup, 0); -#endif /* ACE_HAS_SIG_C_FUNC */ - - // Call the Task's svc() hook method. - int svc_status = t->svc (); - ACE_THR_FUNC_RETURN status; -#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1200)) - // Some compilers complain about reinterpret_cast from int to unsigned long... - status = ACE_static_cast (ACE_THR_FUNC_RETURN, svc_status); -#else - status = ACE_reinterpret_cast (ACE_THR_FUNC_RETURN, svc_status); -#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1200 */ - -// If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke -#if 1 - // Call the close> hook. - ACE_Thread_Manager *thr_mgr_ptr = t->thr_mgr (); - - // This calls the Task->close () hook. - t->cleanup (t, 0); - - // This prevents a second invocation of the cleanup code - // (called later by . - thr_mgr_ptr->at_exit (t, 0, 0); -#endif - return status; -} - -// Forward the call to close() so that existing applications don't -// break. - -int -ACE_Task_Base::module_closed (void) -{ - return this->close (1); -} diff --git a/ace/Task.h b/ace/Task.h deleted file mode 100644 index ce0e51f2dd8..00000000000 --- a/ace/Task.h +++ /dev/null @@ -1,282 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Task.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_TASK_H -#define ACE_TASK_H -#include "ace/pre.h" - -#include "ace/Service_Object.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Thread_Manager.h" - -/** - * @class ACE_Task_Flags - * - * @brief These flags are used within the ACE_Task. - * - * These flags should be hidden within ACE_Task. Unfortunately, the - * HP/UX C++ compiler can't grok this... Fortunately, there's no - * code defined here, so we don't have to worry about multiple - * definitions. - */ -class ACE_Export ACE_Task_Flags -{ -public: - enum - { - /// Identifies a Task as being the "reader" in a Module. - ACE_READER = 01, - /// Just flush data messages in the queue. - ACE_FLUSHDATA = 02, - /// Flush all messages in the Queue. - ACE_FLUSHALL = 04, - /// Flush read queue - ACE_FLUSHR = 010, - /// Flush write queue - ACE_FLUSHW = 020, - /// Flush both queues - ACE_FLUSHRW = 030 - }; -}; - -/** - * @class ACE_Task_Base - * - * @brief Direct base class for the ACE_Task template. - * - * This class factors out the non-template code in order to - * reduce template bloat, as well as to make it possible for the - * to store *'s - * polymorphically. - */ -class ACE_Export ACE_Task_Base : public ACE_Service_Object -{ -public: - // = Initialization and termination methods. - /// Constructor. - ACE_Task_Base (ACE_Thread_Manager * = 0); - - /// Destructor. - virtual ~ACE_Task_Base (void); - - // = Initialization and termination hooks. - - // These methods should be overridden by subclasses if you'd like to - // provide -specific initialization and termination behavior. - - /// Hook called to open a Task. can be used to pass arbitrary - /// information into . - virtual int open (void *args = 0); - - /** - * Hook called from when during thread exit and from - * the default implementation of . In general, this - * method shouldn't be called directly by an application, - * particularly if the is running as an Active Object. - * Instead, a special message should be passed into the via - * the method defined below, and the method should - * interpret this as a flag to shut down the . - */ - virtual int close (u_long flags = 0); - - /** - * Hook called during . The default - * implementation calls forwards the call to close(1). Please - * notice the changed value of the default argument of . - * This allows tasks to differ between the call has been originated - * from or from . Be aware that - * close(0) will be also called when a thread associated with the - * ACE_Task instance exits. - */ - virtual int module_closed (void); - - // = Immediate and deferred processing methods, respectively. - - // These methods should be overridden by subclasses if you'd like to - // provide -specific message processing behavior. - - /// A hook method that can be used to pass a message to a - /// task, where it can be processed immediately or queued for subsequent - /// processing in the hook method. - virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0); - - /// Run by a daemon thread to handle deferred processing. - virtual int svc (void); - - // = Active object activation method. - /** - * Turn the task into an active object, i.e., having of - * control, all running at the level (see below) with the - * same , all of which invoke . Returns -1 if - * failure occurs, returns 1 if Task is already an active object and - * is false (i.e., do *not* create a new thread in - * this case), and returns 0 if Task was not already an active - * object and a thread is created successfully or thread is an - * active object and is true. Note that if - * is true and there are already threads spawned in - * this , the parameter is ignored and the - * of any newly activated thread(s) will inherit the existing - * of the existing thread(s) in the . - * - * The <{flags}> are a bitwise-OR of the following: - * = BEGIN - * THR_CANCEL_DISABLE, THR_CANCEL_ENABLE, THR_CANCEL_DEFERRED, - * THR_CANCEL_ASYNCHRONOUS, THR_BOUND, THR_NEW_LWP, THR_DETACHED, - * THR_SUSPENDED, THR_DAEMON, THR_JOINABLE, THR_SCHED_FIFO, - * THR_SCHED_RR, THR_SCHED_DEFAULT, THR_EXPLICIT_SCHED, - * THR_SCOPE_SYSTEM, THR_SCOPE_PROCESS - * = END - * - * By default, or if <{priority}> is set to - * ACE_DEFAULT_THREAD_PRIORITY, an "appropriate" priority value for - * the given scheduling policy (specified in <{flags}>, e.g., - * ) is used. This value is calculated - * dynamically, and is the median value between the minimum and - * maximum priority values for the given policy. If an explicit - * value is given, it is used. Note that actual priority values are - * EXTREMEMLY implementation-dependent, and are probably best - * avoided. - * - * If != 0 it is assumed to be an array of - * thread_handles that will be assigned the values of the thread - * handles being spawned. Returns -1 on failure ( will - * explain...), otherwise returns the group id of the threads. - * - * Assigning allows you to associate the newly spawned - * threads with an instance of ACE_Task_Base. If == 0, then - * the new threads are associated automatically with - * ACE_Task_Base. Setting the argument to value other than - * makes the thread manipulating methods, such as wait(), - * suspend(), resume(), useless. Threads spawned with user - * specified value must therefore be manipulated thru - * ACE_Thread_Manager directly. - * - * If != 0 it is assumed to be an array of pointers to - * the base of the stacks to use for the threads being spawned. - * Likewise, if != 0 it is assumed to be an array of - * values indicating how big each of the corresponding s - * are. */ - virtual int activate (long flags = THR_NEW_LWP | THR_JOINABLE, - int n_threads = 1, - int force_active = 0, - long priority = ACE_DEFAULT_THREAD_PRIORITY, - int grp_id = -1, - ACE_Task_Base *task = 0, - ACE_hthread_t thread_handles[] = 0, - void *stack[] = 0, - size_t stack_size[] = 0, - ACE_thread_t thread_ids[] = 0); - - /** - * Block until there are no more threads running in this task. - * This method will not wait for either detached or daemon threads; - * the threads must have been spawned with the @c THR_JOINABLE flag. - * Upon successful completion, the threads have been joined, so further - * attempts to join with any of the waited-for threads will fail. - * - * @retval 0 Success. - * @retval -1 Failure (consult errno for further information). - */ - virtual int wait (void); - - // = Suspend/resume a Task. - - // Note that these methods are not portable and should be avoided - // since they are inherently error-prone to use. They are only here - // for (the rare) applications that know how to use them correctly. - /// Suspend a task. - virtual int suspend (void); - /// Resume a suspended task. - virtual int resume (void); - - /// Get the current group id. - int grp_id (void) const; - - /// Set the current group id. - void grp_id (int); - - /// Get the thread manager associated with this Task. - ACE_Thread_Manager *thr_mgr (void) const; - - /// Set the thread manager associated with this Task. - void thr_mgr (ACE_Thread_Manager *); - - /// True if queue is a reader, else false. - int is_reader (void) const; - - /// True if queue is a writer, else false. - int is_writer (void) const; - - /** - * Returns the number of threads currently running within a task. - * If we're a passive object this value is 0, else it's greater than - * 0. - */ - size_t thr_count (void) const; - - /// Atomically decrement the thread count by 1. This should only be - /// called by the class destructor. - void thr_count_dec (void); - - /// Routine that runs the service routine as a daemon thread. - static ACE_THR_FUNC_RETURN svc_run (void *); - - /// Cleanup hook that is called when a thread exits to gracefully - /// shutdown an . - static void cleanup (void *object, void *params); - - // = Internal data (should be private...). -// private: - - /** - * Count of the number of threads running within the task. If this - * value is greater than 0 then we're an active object and the value - * of is the number of active threads at this instant. - * If the value == 0, then we're a passive object. - */ - size_t thr_count_; - - /// Multi-threading manager. - ACE_Thread_Manager *thr_mgr_; - - /// ACE_Task flags. - u_long flags_; - - /// This maintains the group id of the Task. - int grp_id_; - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - /// Protect the state of a Task during concurrent operations, but - /// only if we're configured as MT safe... - ACE_Thread_Mutex lock_; -#endif /* ACE_MT_SAFE */ - -private: - - // = Disallow these operations. - ACE_Task_Base &operator= (const ACE_Task_Base &); - ACE_Task_Base (const ACE_Task_Base &); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Task.i" -#endif /* __ACE_INLINE__ */ - -// Include the ACE_Task templates classes at this point. -#include "ace/Task_T.h" - -#include "ace/post.h" -#endif /* ACE_TASK_H */ diff --git a/ace/Task.i b/ace/Task.i deleted file mode 100644 index fd9f992579b..00000000000 --- a/ace/Task.i +++ /dev/null @@ -1,114 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Task.i - -ACE_INLINE ACE_Thread_Manager * -ACE_Task_Base::thr_mgr (void) const -{ - ACE_TRACE ("ACE_Task_Base::thr_mgr"); - return this->thr_mgr_; -} - -ACE_INLINE void -ACE_Task_Base::thr_mgr (ACE_Thread_Manager *thr_mgr) -{ - ACE_TRACE ("ACE_Task_Base::thr_mgr"); - this->thr_mgr_ = thr_mgr; -} - -// Return the count of the current number of threads. -ACE_INLINE size_t -ACE_Task_Base::thr_count (void) const -{ - ACE_TRACE ("ACE_Task_Base::thr_count"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, 0)); - - return this->thr_count_; -} - -// Decrement the count of the active threads by 1. - -ACE_INLINE void -ACE_Task_Base::thr_count_dec (void) -{ - ACE_TRACE ("ACE_Task_Base::thr_count_dec"); - ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_)); - - this->thr_count_--; -} - -ACE_INLINE int -ACE_Task_Base::is_reader (void) const -{ - ACE_TRACE ("ACE_Task_Base::is_reader"); - return (ACE_BIT_ENABLED (this->flags_, ACE_Task_Flags::ACE_READER)); -} - -ACE_INLINE int -ACE_Task_Base::is_writer (void) const -{ - ACE_TRACE ("ACE_Task_Base::is_writer"); - return (ACE_BIT_DISABLED (this->flags_, ACE_Task_Flags::ACE_READER)); -} - -// Default ACE_Task service routine - -ACE_INLINE int -ACE_Task_Base::svc (void) -{ - ACE_TRACE ("ACE_Task_Base::svc"); - return 0; -} - -// Default ACE_Task open routine - -ACE_INLINE int -ACE_Task_Base::open (void *) -{ - ACE_TRACE ("ACE_Task_Base::open"); - return 0; -} - -// Default ACE_Task close routine - -ACE_INLINE int -ACE_Task_Base::close (u_long) -{ - ACE_TRACE ("ACE_Task_Base::close"); - return 0; -} - -// Default ACE_Task put routine. - -ACE_INLINE int -ACE_Task_Base::put (ACE_Message_Block *, ACE_Time_Value *) -{ - ACE_TRACE ("ACE_Task_Base::put"); - return 0; -} - -// Get the current group id. -ACE_INLINE int -ACE_Task_Base::grp_id (void) const -{ - ACE_TRACE ("ACE_Task_Base::grp_id"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1)); - return this->grp_id_; -} - -// Set the current group id. - -ACE_INLINE void -ACE_Task_Base::grp_id (int id) -{ - ACE_TRACE ("ACE_Task_Base::grp_id"); - ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_)); - - // Cache the group id in the task and then set it in the - // Thread_Manager, if there is one. - this->grp_id_ = id; - if (this->thr_mgr ()) - this->thr_mgr ()->set_grp (this, id); -} - diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp deleted file mode 100644 index 88bc3a2bfc5..00000000000 --- a/ace/Task_T.cpp +++ /dev/null @@ -1,105 +0,0 @@ -// Task.cpp -// $Id$ - -#ifndef ACE_TASK_T_C -#define ACE_TASK_T_C - -#include "ace/Task_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Module.h" -//#include "ace/Service_Config.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Task_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Task_T, "$Id$") - -template void -ACE_Task::dump (void) const -{ - ACE_TRACE ("ACE_Task::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); - this->msg_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags = %x"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmod_ = %x"), this->mod_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_count_ = %d"), this->thr_count_)); -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - this->lock_.dump (); -#endif /* ACE_MT_SAFE */ - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// If the user doesn't supply a ACE_Message_Queue pointer then we'll -// allocate one dynamically. Otherwise, we'll use the one they give. - -template -ACE_Task::ACE_Task (ACE_Thread_Manager *thr_man, - ACE_Message_Queue *mq) - : ACE_Task_Base (thr_man), - msg_queue_ (0), - delete_msg_queue_ (0), - mod_ (0), - next_ (0) -{ - ACE_TRACE ("ACE_Task::ACE_Task"); - - if (mq == 0) - { - ACE_NEW (mq, - ACE_Message_Queue); - this->delete_msg_queue_ = 1; - } - - this->msg_queue_ = mq; -} - -template -ACE_Task::~ACE_Task (void) -{ - ACE_TRACE ("ACE_Task::~ACE_Task"); - if (this->delete_msg_queue_) - delete this->msg_queue_; - - // These assignments aren't strickly necessary but they help guard - // against odd race conditions... - this->delete_msg_queue_ = 0; -} - -template ACE_Task * -ACE_Task::sibling (void) -{ - ACE_TRACE ("ACE_Task::sibling"); - if (this->mod_ == 0) - return 0; - else - return this->mod_->sibling (this); -} - -template const ACE_TCHAR * -ACE_Task::name (void) const -{ - ACE_TRACE ("ACE_Task::name"); - if (this->mod_ == 0) - return 0; - else - return this->mod_->name (); -} - -template ACE_Module * -ACE_Task::module (void) const -{ - ACE_TRACE ("ACE_Task::module"); - return this->mod_; -} - -#endif /* ACE_TASK_T_C */ diff --git a/ace/Task_T.h b/ace/Task_T.h deleted file mode 100644 index 2ba9e01ca47..00000000000 --- a/ace/Task_T.h +++ /dev/null @@ -1,183 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Task_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_TASK_T_H -#define ACE_TASK_T_H -#include "ace/pre.h" - -#include "ace/Message_Queue.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch_T.h" -#include "ace/Task.h" - -// Forward decls... -template class ACE_Module; - -/** - * @class ACE_Task - * - * @brief Primary interface for application message processing, as well - * as input and output message queueing. - * - * This class serves as the basis for passive and active objects - * in ACE. - */ -template -class ACE_Task : public ACE_Task_Base -{ -public: - friend class ACE_Module; - friend class ACE_Module_Type; - - // = Initialization/termination methods. - /** - * Initialize a Task, supplying a thread manager and a message - * queue. If the user doesn't supply a ACE_Message_Queue pointer - * then we'll allocate one dynamically. Otherwise, we'll use the - * one passed as a parameter. - */ - ACE_Task (ACE_Thread_Manager *thr_mgr = 0, - ACE_Message_Queue *mq = 0); - - /// Destructor. - virtual ~ACE_Task (void); - - /// Gets the message queue associated with this task. - ACE_Message_Queue *msg_queue (void); - - /// Sets the message queue associated with this task. - void msg_queue (ACE_Message_Queue *); - -public: // Should be protected: - // = Message queue manipulation methods. - - // = Enqueue and dequeue methods. - - // For the following five method if == 0, the caller will - // block until action is possible, else will wait until the - // <{absolute}> time specified in * elapses). These calls - // will return, however, when queue is closed, deactivated, when a - // signal occurs, or if the time specified in timeout elapses, (in - // which case errno = EWOULDBLOCK). - - /// Insert message into the message queue. Note that uses - /// <{absolute}> time rather than <{relative}> time. - int putq (ACE_Message_Block *, ACE_Time_Value *timeout = 0); - - /** - * Extract the first message from the queue (blocking). Note that - * uses <{absolute}> time rather than <{relative}> time. - * Returns number of items in queue if the call succeeds or -1 otherwise. - */ - int getq (ACE_Message_Block *&mb, ACE_Time_Value *timeout = 0); - - /// Return a message to the queue. Note that uses - /// <{absolute}> time rather than <{relative}> time. - int ungetq (ACE_Message_Block *, ACE_Time_Value *timeout = 0); - - /** - * Turn the message around and send it back down the Stream. Note - * that uses <{absolute}> time rather than <{relative}> - * time. - */ - int reply (ACE_Message_Block *, ACE_Time_Value *timeout = 0); - - /** - * Transfer message to the adjacent ACE_Task in a ACE_Stream. Note - * that uses <{absolute}> time rather than <{relative}> - * time. - */ - int put_next (ACE_Message_Block *msg, ACE_Time_Value *timeout = 0); - - /// Tests whether we can enqueue a message without blocking. - int can_put (ACE_Message_Block *); - - // = ACE_Task utility routines to identify names et al. - /// Return the name of the enclosing Module if there's one associated - /// with the Task, else returns 0. - const ACE_TCHAR *name (void) const; - - // = Pointers to next ACE_Task_Base (if ACE is part of an ACE_Stream). - /// Get next Task pointer. - ACE_Task *next (void); - - /// Set next Task pointer. - void next (ACE_Task *); - - /// Return the Task's sibling if there's one associated with the - /// Task's Module, else returns 0. - ACE_Task *sibling (void); - - /// Return the Task's Module if there is one, else returns 0. - ACE_Module *module (void) const; - - /** - * Flush the task's queue, i.e., free all of the enqueued - * message blocks and releases any threads blocked on the queue. - * Note that if this conflicts with the C++ iostream - * function, just rewrite the iostream function as ::. - */ - int flush (u_long flag = ACE_Task_Flags::ACE_FLUSHALL); - - // = Special routines corresponding to certain message types. - - /// Manipulate watermarks. - void water_marks (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds, size_t); - - /// Queue of messages on the ACE_Task.. - ACE_Message_Queue *msg_queue_; - - /// 1 if should delete Message_Queue, 0 otherwise. - int delete_msg_queue_; - - /// Back-pointer to the enclosing module. - ACE_Module *mod_; - - /// Pointer to adjacent ACE_Task. - ACE_Task *next_; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Task &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Task (const ACE_Task &)) -}; - -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class ACE_Export ACE_Task; -template class ACE_Export ACE_Task; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -#if defined (__ACE_INLINE__) -#include "ace/Task_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Task_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Task_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_TASK_T_H */ diff --git a/ace/Task_T.i b/ace/Task_T.i deleted file mode 100644 index 1a78650279f..00000000000 --- a/ace/Task_T.i +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Task_T.i - -template ACE_INLINE void -ACE_Task::water_marks (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, - size_t wm_size) -{ - ACE_TRACE ("ACE_Task::water_marks"); - if (cmd == ACE_IO_Cntl_Msg::SET_LWM) - this->msg_queue_->low_water_mark (wm_size); - else /* cmd == ACE_IO_Cntl_Msg::SET_HWM */ - this->msg_queue_->high_water_mark (wm_size); -} - -template ACE_INLINE int -ACE_Task::getq (ACE_Message_Block *&mb, ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_Task::getq"); - return this->msg_queue_->dequeue_head (mb, tv); -} - -template ACE_INLINE int -ACE_Task::can_put (ACE_Message_Block *) -{ - ACE_TRACE ("ACE_Task::can_put"); - assert (!"not implemented"); - return -1; -} - -template ACE_INLINE int -ACE_Task::putq (ACE_Message_Block *mb, ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_Task::putq"); - return this->msg_queue_->enqueue_tail (mb, tv); -} - -template ACE_INLINE int -ACE_Task::ungetq (ACE_Message_Block *mb, ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_Task::ungetq"); - return this->msg_queue_->enqueue_head (mb, tv); -} - -template ACE_INLINE int -ACE_Task::flush (u_long flag) -{ - ACE_TRACE ("ACE_Task::flush"); - if (ACE_BIT_ENABLED (flag, ACE_Task_Flags::ACE_FLUSHALL)) - return this->msg_queue_ != 0 && this->msg_queue_->close (); - else - return -1; // Note, need to be more careful about what we free... -} - -template ACE_INLINE void -ACE_Task::msg_queue (ACE_Message_Queue *mq) -{ - ACE_TRACE ("ACE_Task::msg_queue"); - if (this->delete_msg_queue_) - { - delete this->msg_queue_; - this->delete_msg_queue_ = 0; - } - this->msg_queue_ = mq; -} - -template ACE_Message_Queue * -ACE_Task::msg_queue (void) -{ - ACE_TRACE ("ACE_Task::msg_queue"); - return this->msg_queue_; -} - -template ACE_INLINE int -ACE_Task::reply (ACE_Message_Block *mb, ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_Task::reply"); - return this->sibling ()->put_next (mb, tv); -} - -template ACE_INLINE ACE_Task * -ACE_Task::next (void) -{ - ACE_TRACE ("ACE_Task::next"); - return this->next_; -} - -template ACE_INLINE void -ACE_Task::next (ACE_Task *q) -{ - ACE_TRACE ("ACE_Task::next"); - this->next_ = q; -} - -// Transfer msg to the next ACE_Task. - -template ACE_INLINE int -ACE_Task::put_next (ACE_Message_Block *msg, ACE_Time_Value *tv) -{ - ACE_TRACE ("ACE_Task::put_next"); - return this->next_ == 0 ? -1 : this->next_->put (msg, tv); -} diff --git a/ace/Template_Instantiations.cpp b/ace/Template_Instantiations.cpp deleted file mode 100644 index 28f6aa318e7..00000000000 --- a/ace/Template_Instantiations.cpp +++ /dev/null @@ -1,356 +0,0 @@ -// $Id$ - -// Note: this file has been created through concatenation of ALL -// explicit template instantiations in ACE, and only those that -// interfered with the multithreaded port of ACE to pSOS using the -// Diab D-C++ 4.1a compiler have been wrapped with the appropriate -// preprocesor directives for conditional compilation. If you are -// trying to use this file, you will need to ensure that any -// additional preprocessor directives needed are added. Also, if you -// wish to extend this technique to instantiation pragmas, you will -// need to modify the preprocesor directives below - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE) - -// header files that are not already included -#include "ace/Local_Tokens.h" -#include "ace/Token.h" -#include "ace/Containers.h" -#include "ace/Obstack.h" -#include "ace/Select_Reactor.h" -#include "ace/Message_Queue.h" -#include "ace/Module.h" -#include "ace/Name_Space.h" -#include "ace/Stream.h" -#include "ace/Stream_Modules.h" -#include "ace/Dynamic.h" -#include "ace/Local_Name_Space_T.h" -#include "ace/Filecache.h" -#include "ace/Token_Invariants.h" -#include "ace/Remote_Tokens.h" -#include "ace/Singleton.h" -#include "ace/Timer_Hash.h" -#include "ace/Timer_Wheel_T.h" -#include "ace/Auto_Ptr.h" - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#error ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE may not be used with ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION or ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA -#endif /* defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) */ - -// D E P T H = 0 -// Templates with nesting depth 0 (no dependencies on -// other templates), ordered by number of template arguments - -ACE_MT (template class ACE_Guard); - -// ACE_MT (template class ACE_Guard); -ACE_MT (template class ACE_Guard); -ACE_MT (template class ACE_Guard); - -ACE_MT (template class ACE_Guard); - -template class ACE_Guard; -template class ACE_Guard; -template class ACE_Guard; -template class ACE_Guard; -template class ACE_Guard; - -ACE_MT (template class ACE_TSS_Guard); - -template class ACE_Array; -template class ACE_Array_Base; -template class ACE_Array; -template class ACE_Array_Base; -template class ACE_Array; -template class ACE_Array_Base; -template class ACE_Array; -template class ACE_Array_Base; -template class ACE_Array_Iterator; - -// ACE_PROCESS_MUTEX is defined in Malloc.h, -// depending on whether ACE_HAS_THREADS is defined -#if defined (ACE_HAS_MALLOC_STATS) -template class ACE_Atomic_Op; -#endif /* ACE_HAS_MALLOC_STATS */ - -template class ACE_Auto_Array_Ptr; -template class ACE_Auto_Basic_Array_Ptr; -template class ACE_Auto_Basic_Ptr; - -template class ACE_Cleanup_Adapter; -template class ACE_Cleanup_Adapter; -template class ACE_Cleanup_Adapter; -template class ACE_Cleanup_Adapter; - -// ACE_SYNCH_RW_MUTEX is defined in Synch_T.h -template class ACE_Cleanup_Adapter; - -template class ACE_Cleanup_Adapter; -template class ACE_Double_Linked_List; -template class ACE_Double_Linked_List_Iterator_Base; -template class ACE_Double_Linked_List_Iterator; -template class ACE_Double_Linked_List_Reverse_Iterator; -// ACE_SYNCH_RECURSIVE_MUTEX is defined in Synch_T.h -template class ACE_Event_Handler_Handle_Timeout_Upcall; - -template class ACE_Lock_Adapter; - -template class ACE_Managed_Object; -template class ACE_Managed_Object; -template class ACE_Managed_Object; - -// ACE_SYNCH_RW_MUTEX is defined in Synch_T.h -template class ACE_Managed_Object; -template class ACE_Managed_Object; - -template class ACE_Managed_Object; - -// ACE_NULL_SYNCH is defined in Synch_T.h -template class ACE_Message_Queue; - -// ACE_SYNCH is defined in Synch_T.h -template class ACE_Message_Queue; - -// ACE_NULL_SYNCH is defined in Synch_T.h -template class ACE_Module; - -// ACE_SYNCH is defined in Synch_T.h -template class ACE_Module; - -template class ACE_Node ; -template class ACE_Node; -template class ACE_Node; -template class ACE_Node; -template class ACE_Node; -template class ACE_Node; -template class ACE_Node; -template class ACE_Node; - -template class ACE_Node; - -// ACE_TCHAR is defined in OS.h -template class ACE_Node; - -template class ACE_Read_Guard; -template class ACE_Read_Guard; -template class ACE_Read_Guard; - -// ACE_SYNCH is defined in Synch_T.h -template class ACE_Stream; -template class ACE_Stream_Head; -template class ACE_Stream_Tail; - -template class ACE_TSS ; -template class ACE_TSS ; -template class ACE_TSS; -template class ACE_TSS; -template class ACE_TSS; - -// ACE_NULL_SYNCH is defined in Synch_T.h -template class ACE_Task; - -// ACE_SYNCH is defined in Synch_T.h -template class ACE_Task; - -// ACE_NULL_SYNCH is defined in Synch_T.h -template class ACE_Thru_Task; - -// ACE_SYNCH is defined in Synch_T.h -template class ACE_Thru_Task; - -template class ACE_Timer_Node_T; -template class ACE_Unbounded_Queue; -template class ACE_Unbounded_Queue; -template class ACE_Unbounded_Queue; -template class ACE_Unbounded_Queue; - -// ACE_TCHAR is defined in OS.h -template class ACE_Unbounded_Queue; - -template class ACE_Unbounded_Queue_Iterator; -template class ACE_Unbounded_Queue_Iterator; -template class ACE_Unbounded_Queue_Iterator; -template class ACE_Unbounded_Queue_Iterator; - -// ACE_TCHAR is defined in OS.h -template class ACE_Unbounded_Queue_Iterator; - -template class ACE_Unbounded_Set; -template class ACE_Unbounded_Set; -template class ACE_Unbounded_Set; -template class ACE_Unbounded_Set_Iterator; -template class ACE_Unbounded_Set_Iterator; -template class ACE_Unbounded_Set_Iterator; -template class ACE_Unbounded_Stack ; -template class ACE_Write_Guard; -template class ACE_Write_Guard; -template class ACE_Write_Guard; - -// ACE_SYNCH_RW_MUTEX is defined in Synch_T.h -template class ACE_Write_Guard; - -template class auto_ptr; - -// from Signal.cpp -#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#define ACE_MAX_SIGNAL_HANDLERS ((size_t) 20) -template class ACE_Fixed_Set; -template class ACE_Fixed_Set_Iterator; -#endif /* !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) */ - -// ACE_LOCAL_MEMORY_POOL, ACE_MMAP_MEMORY_POOL, and -// ACE_LITE_MMAP_MEMORY_POOL are all defined in OS.h - -template class ACE_Local_Name_Space ; -template class ACE_Local_Name_Space ; -template class ACE_Malloc; -template class ACE_Malloc; -template class ACE_Malloc; -template class ACE_Malloc_T; -template class ACE_Malloc_T; -template class ACE_Malloc_T; -template class ACE_Allocator_Adapter >; - -template class ACE_Map_Entry ; -template class ACE_Map_Entry; -template class ACE_Map_Entry; -template class ACE_Map_Entry; -template class ACE_Module; - -// from Remote_Tokens.cpp -template class ACE_Singleton ; - -template class ACE_TSS_Singleton; - -// from Local_Name_Space.cpp -#if (1) -template class ACE_Hash_Map_Entry; -template class ACE_Hash; -template class ACE_Equal_To; -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; -#else -template class ACE_Map_Entry; -template class ACE_Map_Manager; -template class ACE_Map_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Iterator_Base; -#endif - -// from Filecache.cpp -#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) -template class ACE_Hash_Map_Entry; -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -#else -template class ACE_Hash_Map_Entry; -template class ACE_Hash; -template class ACE_Equal_To; -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ - -template class ACE_Map_Iterator; -template class ACE_Map_Iterator; -template class ACE_Map_Iterator; -template class ACE_Map_Iterator; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Manager ; -template class ACE_Map_Manager; -template class ACE_Map_Manager; -template class ACE_Map_Manager; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Reverse_Iterator; - -// D E P T H = 1 -// Templates with nesting depth 1 (dependencies on other templates 1 -// level deep), ordered by number of template arguments at top level - - -// ACE_MMAP_MEMORY_POOL is defined in OS.h - -template class ACE_Allocator_Adapter >; -template class ACE_Allocator_Adapter >; - -template class ACE_Node *>; - -// ACE_SYNCH_NULL_MUTEX is defined in Synch_T.h -template class ACE_Cached_Allocator, ACE_SYNCH_NULL_MUTEX>; - -template class ACE_Cached_Mem_Pool_Node >; -template class ACE_Free_List >; - -// ACE_SYNCH_RECURSIVE_MUTEX is defined in Synch_T.h -template class ACE_Timer_Heap_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_Heap_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_List_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_List_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_Queue_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_Queue_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_Wheel_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_Wheel_T, ACE_SYNCH_RECURSIVE_MUTEX>; - -template class ACE_Unbounded_Set *>; -template class ACE_Unbounded_Set_Iterator *>; -template class ACE_Locked_Free_List, ACE_Null_Mutex>; - -template class ACE_Timer_Hash_Upcall, ACE_Null_Mutex>; - -// ACE_SYNCH_RECURSIVE_MUTEX is defined in Synch_T.h -template class ACE_Timer_Hash_Upcall , ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_Hash_T, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_List>; -template class ACE_Timer_Hash_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_List>; -template class ACE_Timer_Hash_T, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_Heap>; -template class ACE_Timer_Hash_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_Heap>; - -// D E P T H = 2 -// Templates with nesting depth 2 (dependencies on other templates 2 -// levels deep), ordered by number of template arguments at top level - -template class ACE_Timer_Queue_T ; - -template class ACE_Timer_Queue_Iterator_T ; - -template class ACE_Timer_List_T ; - -template class ACE_Timer_List_Iterator_T ; - -template class ACE_Timer_Heap_T ; - -template class ACE_Timer_Heap_Iterator_T ; - -// ACE_MMAP_MEMORY_POOL and ACE_LITE_MMAP_MEMORY_POOL are defined in OS.h - -template class ACE_Name_Space_Map > >; -template class ACE_Name_Space_Map > >; - -template class ACE_Free_List > >; - -// ACE_SYNCH_NULL_MUTEX is defined in Synch_T.h -template class ACE_Locked_Free_List >, ACE_SYNCH_NULL_MUTEX>; - -template class ACE_Timer_Heap_T, ACE_Null_Mutex>, ACE_Null_Mutex>; - -template class ACE_Timer_Heap_Iterator_T, ACE_Null_Mutex>, ACE_Null_Mutex>; - -template class ACE_Timer_List_T, ACE_Null_Mutex>, ACE_Null_Mutex>; - -template class ACE_Timer_List_Iterator_T, ACE_Null_Mutex>, ACE_Null_Mutex>; - -template class ACE_Timer_Queue_T, ACE_Null_Mutex>, ACE_Null_Mutex>; - -template class ACE_Timer_Queue_Iterator_T, ACE_Null_Mutex>, ACE_Null_Mutex>; - - -#endif /* defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE) */ diff --git a/ace/Test_and_Set.cpp b/ace/Test_and_Set.cpp deleted file mode 100644 index 73896eb387a..00000000000 --- a/ace/Test_and_Set.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// $Id$ - -#ifndef ACE_TEST_AND_SET_C -#define ACE_TEST_AND_SET_C - -#include "ace/Test_and_Set.h" -#include "ace/Synch_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Test_and_Set, "$Id$") - -template -ACE_Test_and_Set::ACE_Test_and_Set (TYPE initial_value) - : is_set_ (initial_value) -{ -} - -// Returns true if we are done, else false. -template TYPE -ACE_Test_and_Set::is_set (void) const -{ - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->lock_, this->is_set_); - return this->is_set_; -} - -// Sets the status. -template TYPE -ACE_Test_and_Set::set (TYPE status) -{ - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, this->is_set_); - TYPE o_status = this->is_set_; - this->is_set_ = status; - return o_status; -} - -template int -ACE_Test_and_Set::handle_signal (int, siginfo_t *, ucontext_t *) -{ - // By setting this to 1, we are "signaling" to anyone calling - // or or that the "test and set" object is in the - // "signaled" state, i.e., it's "available" to be set back to 0. - this->set (1); - return 0; -} - -#endif /* ACE_TEST_AND_SET_C */ diff --git a/ace/Test_and_Set.h b/ace/Test_and_Set.h deleted file mode 100644 index 4def53af1bd..00000000000 --- a/ace/Test_and_Set.h +++ /dev/null @@ -1,76 +0,0 @@ - -//============================================================================= -/** - * @file Test_and_Set.h - * - * $Id$ - * - * @author Priyanka Gontla - */ -//============================================================================= - - -#ifndef ACE_TEST_AND_SET_H -#define ACE_TEST_AND_SET_H - -#include "ace/pre.h" -#include "ace/Event_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Test_and_Set - * - * @brief Implements the classic ``test and set'' operation. - * - * - * This class keeps track of the status of , which can - * be set based on various events (such as receipt of a - * signal). This class is derived from so - * that it can be "signaled" by a Reactor when a signal occurs. - * We assume that is a data type that can be assigned the - * value 0 or 1. - */ -template -class ACE_Test_and_Set : public ACE_Event_Handler -{ -public: - ACE_Test_and_Set (TYPE initial_value = 0); - - /// Returns true if we are set, else false. - TYPE is_set (void) const; - - /// Sets the status, returning the original value of - /// . - TYPE set (TYPE); - - /// Called when object is signaled by OS (either via UNIX signals or - /// when a Win32 object becomes signaled). - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0); - -private: - /// Keeps track of our state. - TYPE is_set_; - - /// Protect the state from race conditions. - ACE_LOCK lock_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Test_and_Set.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Test_and_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Test_and_Set.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_TEST_AND_SET_H */ diff --git a/ace/Test_and_Set.i b/ace/Test_and_Set.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/Test_and_Set.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/Thread.cpp b/ace/Thread.cpp deleted file mode 100644 index 45a0dce23eb..00000000000 --- a/ace/Thread.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// Thread.cpp -// $Id$ - -#include "ace/Thread.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Thread.i" -#endif /* !defined (__ACE_INLINE__) */ - -ACE_RCSID(ace, Thread, "$Id$") - -#if defined (ACE_HAS_THREADS) - -size_t -ACE_Thread::spawn_n (size_t n, - ACE_THR_FUNC func, - void *arg, - long flags, - long priority, - void *stack[], - size_t stack_size[], - ACE_Thread_Adapter *thread_adapter) -{ - ACE_TRACE ("ACE_Thread::spawn_n"); - ACE_thread_t t_id; - size_t i; - - for (i = 0; i < n; i++) - // Bail out if error occurs. - if (ACE_OS::thr_create (func, - arg, - flags, - &t_id, - 0, - priority, - stack == 0 ? 0 : stack[i], - stack_size == 0 ? 0 : stack_size[i], - thread_adapter) != 0) - break; - - return i; -} - -size_t -ACE_Thread::spawn_n (ACE_thread_t thread_ids[], - size_t n, - ACE_THR_FUNC func, - void *arg, - long flags, - long priority, - void *stack[], - size_t stack_size[], - ACE_hthread_t thread_handles[], - ACE_Thread_Adapter *thread_adapter) -{ - ACE_TRACE ("ACE_Thread::spawn_n"); - size_t i; - - for (i = 0; i < n; i++) - { - ACE_thread_t t_id; - ACE_hthread_t t_handle; - - int result = - ACE_OS::thr_create (func, - arg, - flags, - &t_id, - &t_handle, - priority, - stack == 0 ? 0 : stack[i], - stack_size == 0 ? 0 : stack_size[i], - thread_adapter); - - if (result == 0) - { - if (thread_ids != 0) - thread_ids[i] = t_id; - if (thread_handles != 0) - thread_handles[i] = t_handle; - } - else - // Bail out if error occurs. - break; - } - - return i; -} - -#endif /* ACE_HAS_THREADS */ diff --git a/ace/Thread.h b/ace/Thread.h deleted file mode 100644 index 30cbc611097..00000000000 --- a/ace/Thread.h +++ /dev/null @@ -1,245 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file Thread.h - * - * $Id$ - * - * @author Douglas Schmidt - */ -//========================================================================== - -#ifndef ACE_THREAD_H -#define ACE_THREAD_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" -#include "ace/Thread_Adapter.h" - -/** - * @class ACE_Thread - * - * @brief Provides a wrapper for threads. - * - * This class provides a common interface that is mapped onto - * POSIX Pthreads, Solaris threads, Win32 threads, VxWorks - * threads, or pSoS threads. Note, however, that it is - * generally a better idea to use the - * programming API rather than the API since the - * thread manager is more powerful. - */ -class ACE_Export ACE_Thread -{ -public: - /** - * Creates a new thread having attributes and running - * with (if is non-0 then and - * are ignored and are obtained from ). - * and are set to the thread's ID and handle (?), - * respectively. The thread runs at priority (see - * below). - * - * The are a bitwise-OR of the following: - * = BEGIN - * THR_CANCEL_DISABLE, THR_CANCEL_ENABLE, THR_CANCEL_DEFERRED, - * THR_CANCEL_ASYNCHRONOUS, THR_BOUND, THR_NEW_LWP, THR_DETACHED, - * THR_SUSPENDED, THR_DAEMON, THR_JOINABLE, THR_SCHED_FIFO, - * THR_SCHED_RR, THR_SCHED_DEFAULT, THR_EXPLICIT_SCHED, - * THR_SCOPE_SYSTEM, THR_SCOPE_PROCESS - * = END - * - * By default, or if is set to - * ACE_DEFAULT_THREAD_PRIORITY, an "appropriate" priority value for - * the given scheduling policy (specified in , e.g., - * ) is used. This value is calculated - * dynamically, and is the median value between the minimum and - * maximum priority values for the given policy. If an explicit - * value is given, it is used. Note that actual priority values are - * EXTREMEMLY implementation-dependent, and are probably best - * avoided. - * - * Note that is always deleted when - * is called, so it must be allocated with global operator new. - */ - static int spawn (ACE_THR_FUNC func, - void *arg = 0, - long flags = THR_NEW_LWP | THR_JOINABLE, - ACE_thread_t *t_id = 0, - ACE_hthread_t *t_handle = 0, - long priority = ACE_DEFAULT_THREAD_PRIORITY, - void *stack = 0, - size_t stack_size = 0, - ACE_Thread_Adapter *thread_adapter = 0); - - /** - * Spawn N new threads, which execute with argument (if - * is non-0 then and are ignored and - * are obtained from ). If != 0 it is - * assumed to be an array of pointers to the base of the stacks - * to use for the threads being spawned. Likewise, if - * != 0 it is assumed to be an array of values indicating how - * big each of the corresponding s are. Returns the number - * of threads actually spawned (if this doesn't equal the number - * requested then something has gone wrong and will - * explain...). - * - * @see spawn() - */ - static size_t spawn_n (size_t n, - ACE_THR_FUNC func, - void *arg = 0, - long flags = THR_NEW_LWP | THR_JOINABLE, - long priority = ACE_DEFAULT_THREAD_PRIORITY, - void *stack[] = 0, - size_t stack_size[] = 0, - ACE_Thread_Adapter *thread_adapter = 0); - - /** - * Spawn new threads, which execute with argument - * (if is non-0 then and are ignored - * and are obtained from ). The thread_ids of - * successfully spawned threads will be placed into the - * buffer (which must be the same size as ). If != 0 it - * is assumed to be an array of pointers to the base of the - * stacks to use for the threads being spawned. If != - * 0 it is assumed to be an array of values indicating how big - * each of the corresponding s are. If != 0 - * it is assumed to be an array of thread_handles that will be - * assigned the values of the thread handles being spawned. Returns - * the number of threads actually spawned (if this doesn't equal the - * number requested then something has gone wrong and will - * explain...). - * - * @see spawn() - */ - static size_t spawn_n (ACE_thread_t thread_ids[], - size_t n, - ACE_THR_FUNC func, - void *arg, - long flags, - long priority = ACE_DEFAULT_THREAD_PRIORITY, - void *stack[] = 0, - size_t stack_size[] = 0, - ACE_hthread_t thread_handles[] = 0, - ACE_Thread_Adapter *thread_adapter = 0); - - /// Wait for one or more threads to exit and reap their exit status. - static int join (ACE_thread_t, - ACE_thread_t *, - ACE_THR_FUNC_RETURN *status); - - /// Wait for one thread to exit and reap its exit status. - static int join (ACE_hthread_t, - ACE_THR_FUNC_RETURN * = 0); - - /// Continue the execution of a previously suspended thread. - static int resume (ACE_hthread_t); - - /// Suspend the execution of a particular thread. - static int suspend (ACE_hthread_t); - - /// Get the priority of a particular thread. - static int getprio (ACE_hthread_t, int &prio); - - /// Set the priority of a particular thread. - static int setprio (ACE_hthread_t, int prio); - - /// Send a signal to the thread. - static int kill (ACE_thread_t, int signum); - - /// Yield the thread to another. - static void yield (void); - - /** - * Return the unique kernel handle of the thread. Note that on - * Win32 this is actually a pseudohandle, which cannot be shared - * with other processes or waited on by threads. To locate the real - * handle, please use the method. - */ - static void self (ACE_hthread_t &t_handle); - - /// Return the unique ID of the thread. - static ACE_thread_t self (void); - - /// Exit the current thread and return "status". - /// Should _not_ be called by main thread. - static void exit (ACE_THR_FUNC_RETURN status = 0); - - /// Get the LWP concurrency level of the process. - static int getconcurrency (void); - - /// Set the LWP concurrency level of the process. - static int setconcurrency (int new_level); - - /// Change and/or examine calling thread's signal mask. - static int sigsetmask (int how, - const sigset_t *sigset, - sigset_t *osigset = 0); - - static int keycreate (ACE_thread_key_t *keyp, -#if defined (ACE_HAS_THR_C_DEST) - ACE_THR_C_DEST destructor, -#else - ACE_THR_DEST destructor, -#endif /* ACE_HAS_THR_C_DEST */ - /** - * Allocates a that is used to identify data that is specific - * to each thread in the process. The key is global to all threads - * in the process. - */ - void * = 0); - - /// Free up the key so that other threads can reuse it. - static int keyfree (ACE_thread_key_t key); - - /// Bind value to the thread-specific data key, , for the calling - /// thread. - static int setspecific (ACE_thread_key_t key, - void *value); - - /// Stores the current value bound to for the calling thread - /// into the location pointed to by . - static int getspecific (ACE_thread_key_t key, - void **valuep); - - /// Disable thread cancellation. - static int disablecancel (struct cancel_state *old_state); - - /// Enable thread cancellation. - static int enablecancel (struct cancel_state *old_state, - int flag); - - /// Set the cancellation state. - static int setcancelstate (struct cancel_state &new_state, - struct cancel_state *old_state); - - /** - * Cancel a thread. Note that this method is only portable on - * platforms, such as POSIX pthreads, that support thread - * cancellation. - */ - static int cancel (ACE_thread_t t_id); - - /// Test the cancel. - static void testcancel (void); - -private: - /// Ensure that we don't get instantiated. - ACE_Thread (void); -}; - -#if defined (__ACE_INLINE__) -#include "ace/Thread.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_THREAD_H */ diff --git a/ace/Thread.i b/ace/Thread.i deleted file mode 100644 index f678c47b336..00000000000 --- a/ace/Thread.i +++ /dev/null @@ -1,272 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Thread.i - -// Allocates a that is used to identify data that is specific -// to each thread in the process. The key is global to all threads in -// the process. - -ACE_INLINE int -ACE_Thread::keycreate (ACE_thread_key_t *keyp, -#if defined (ACE_HAS_THR_C_DEST) - ACE_THR_C_DEST destructor, -#else - ACE_THR_DEST destructor, -#endif /* ACE_HAS_THR_C_DEST */ - void *inst) -{ - // ACE_TRACE ("ACE_Thread::keycreate"); - return ACE_OS::thr_keycreate (keyp, destructor, inst); -} - -// Free up the key so that other threads can reuse it. - -ACE_INLINE int -ACE_Thread::keyfree (ACE_thread_key_t key) -{ - ACE_TRACE ("ACE_Thread::keyfree"); - return ACE_OS::thr_keyfree (key); -} - -// Bind value to the thread-specific data key, , for the calling -// thread. - -ACE_INLINE int -ACE_Thread::setspecific (ACE_thread_key_t key, void *value) -{ - // ACE_TRACE ("ACE_Thread::setspecific"); - return ACE_OS::thr_setspecific (key, value); -} - -// Stores the current value bound to for the calling thread -// into the location pointed to by . - -ACE_INLINE int -ACE_Thread::getspecific (ACE_thread_key_t key, void **valuep) -{ - // ACE_TRACE ("ACE_Thread::getspecific"); - return ACE_OS::thr_getspecific (key, valuep); -} - -ACE_INLINE ACE_thread_t -ACE_Thread::self (void) -{ -// ACE_TRACE ("ACE_Thread::self"); - return ACE_OS::thr_self (); -} - -ACE_INLINE void -ACE_Thread::exit (ACE_THR_FUNC_RETURN status) -{ - ACE_TRACE ("ACE_Thread::exit"); - ACE_OS::thr_exit (status); -} - -ACE_INLINE void -ACE_Thread::yield (void) -{ - ACE_TRACE ("ACE_Thread::yield"); - ACE_OS::thr_yield (); -} - -ACE_INLINE int -ACE_Thread::spawn (ACE_THR_FUNC func, - void *arg, - long flags, - ACE_thread_t *t_id, - ACE_hthread_t *t_handle, - long priority, - void *thr_stack, - size_t thr_stack_size, - ACE_Thread_Adapter *thread_adapter) -{ - ACE_TRACE ("ACE_Thread::spawn"); - - return ACE_OS::thr_create (func, - arg, - flags, - t_id, - t_handle, - priority, - thr_stack, - thr_stack_size, - thread_adapter); -} - -ACE_INLINE int -ACE_Thread::resume (ACE_hthread_t t_id) -{ - ACE_TRACE ("ACE_Thread::resume"); - return ACE_OS::thr_continue (t_id); -} - -ACE_INLINE int -ACE_Thread::suspend (ACE_hthread_t t_id) -{ - ACE_TRACE ("ACE_Thread::suspend"); - return ACE_OS::thr_suspend (t_id); -} - -ACE_INLINE int -ACE_Thread::kill (ACE_thread_t t_id, int signum) -{ - ACE_TRACE ("ACE_Thread::kill"); - return ACE_OS::thr_kill (t_id, signum); -} - -ACE_INLINE int -ACE_Thread::join (ACE_thread_t wait_for, - ACE_thread_t *departed, - ACE_THR_FUNC_RETURN *status) -{ - ACE_TRACE ("ACE_Thread::join"); - return ACE_OS::thr_join (wait_for, departed, status); -} - -ACE_INLINE int -ACE_Thread::join (ACE_hthread_t wait_for, - ACE_THR_FUNC_RETURN *status) -{ - ACE_TRACE ("ACE_Thread::join"); - return ACE_OS::thr_join (wait_for, status); -} - -ACE_INLINE int -ACE_Thread::getconcurrency (void) -{ - ACE_TRACE ("ACE_Thread::getconcurrency"); - return ACE_OS::thr_getconcurrency (); -} - -ACE_INLINE int -ACE_Thread::setconcurrency (int new_level) -{ - ACE_TRACE ("ACE_Thread::setconcurrency"); - return ACE_OS::thr_setconcurrency (new_level); -} - -ACE_INLINE int -ACE_Thread::sigsetmask (int how, - const sigset_t *sigset, - sigset_t *osigset) -{ - ACE_TRACE ("ACE_Thread::sigsetmask"); - return ACE_OS::thr_sigsetmask (how, sigset, osigset); -} - -ACE_INLINE int -ACE_Thread::disablecancel (struct cancel_state *old_state) -{ - ACE_TRACE ("ACE_Thread::disablecancel"); - int old_cstate = 0; - int result = ACE_OS::thr_setcancelstate (THR_CANCEL_DISABLE, - &old_cstate); - if (result == 0 && old_state != 0) - { - ACE_OS::memset (old_state, - 0, - sizeof (old_state)); - old_state->cancelstate = old_cstate; - } - - return result; -} - -ACE_INLINE int -ACE_Thread::enablecancel (struct cancel_state *old_state, - int flag) -{ - ACE_TRACE ("ACE_Thread::enablecancel"); - int old_cstate = 0; - int old_ctype = 0; - int result; - - result = ACE_OS::thr_setcancelstate (THR_CANCEL_ENABLE, - &old_cstate); - if (result != 0) - return result; - - result = ACE_OS::thr_setcanceltype (flag, - &old_ctype); - if (result != 0) - return result; - - if (old_state != 0) - { - old_state->cancelstate = old_cstate; - old_state->canceltype = old_ctype; - } - - return 0; -} - -ACE_INLINE int -ACE_Thread::setcancelstate (struct cancel_state &new_state, - struct cancel_state *old_state) -{ - ACE_TRACE ("ACE_Thread::setcancelstate"); - int old_cstate = 0; - int old_ctype = 0; - - if (new_state.cancelstate != 0 - && ACE_OS::thr_setcancelstate (new_state.cancelstate, - &old_cstate) != 0) - return -1; - - if (new_state.canceltype != 0 - && ACE_OS::thr_setcanceltype (new_state.canceltype, - &old_ctype) != 0) - { - int o_cstate; - - ACE_OS::thr_setcancelstate (old_cstate, - &o_cstate); - return -1; - } - - if (old_state != 0) - { - old_state->cancelstate = old_cstate; - old_state->canceltype = old_ctype; - } - - return 0; -} - -ACE_INLINE int -ACE_Thread::cancel (ACE_thread_t t_id) -{ - ACE_TRACE ("ACE_Thread::cancel"); - - return ACE_OS::thr_cancel (t_id); -} - -ACE_INLINE void -ACE_Thread::testcancel (void) -{ - ACE_TRACE ("ACE_Thread::testcancel"); - - ACE_OS::thr_testcancel (); -} - -ACE_INLINE void -ACE_Thread::self (ACE_hthread_t &t_id) -{ -// ACE_TRACE ("ACE_Thread::self"); - ACE_OS::thr_self (t_id); -} - -ACE_INLINE int -ACE_Thread::getprio (ACE_hthread_t t_id, int &prio) -{ - ACE_TRACE ("ACE_Thread::getprio"); - return ACE_OS::thr_getprio (t_id, prio); -} - -ACE_INLINE int -ACE_Thread::setprio (ACE_hthread_t t_id, int prio) -{ - ACE_TRACE ("ACE_Thread::setprio"); - return ACE_OS::thr_setprio (t_id, prio); -} diff --git a/ace/Thread_Adapter.cpp b/ace/Thread_Adapter.cpp deleted file mode 100644 index 0fef397baf2..00000000000 --- a/ace/Thread_Adapter.cpp +++ /dev/null @@ -1,248 +0,0 @@ -// $Id$ - -#include "ace/Thread_Adapter.h" -#include "ace/OS.h" -#include "ace/Thread_Manager.h" -#include "ace/Thread_Exit.h" -#include "ace/Thread_Hook.h" - -ACE_RCSID (ace, - Thread_Adapter, - "$Id$") - -#if !defined (ACE_HAS_INLINED_OSCALLS) -# include "ace/Thread_Adapter.inl" -#endif /* ACE_HAS_INLINED_OS_CALLS */ - -ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func, - void *arg, - ACE_THR_C_FUNC entry_point, - ACE_Thread_Manager *tm, - ACE_Thread_Descriptor *td -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , ACE_SEH_EXCEPT_HANDLER selector, - ACE_SEH_EXCEPT_HANDLER handler -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - ) - : ACE_Base_Thread_Adapter ( - user_func - , arg - , entry_point - , td -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , selector - , handler -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - ) - , thr_mgr_ (tm) -{ - ACE_OS_TRACE ("ACE_Thread_Adapter::ACE_Thread_Adapter"); -} - -ACE_Thread_Adapter::~ACE_Thread_Adapter (void) -{ -} - -ACE_THR_FUNC_RETURN -ACE_Thread_Adapter::invoke (void) -{ - // Inherit the logging features if the parent thread has an - // ACE_Log_Msg instance in thread-specific storage. - this->inherit_log_msg (); - -#if !defined(ACE_USE_THREAD_MANAGER_ADAPTER) - // NOTE: this preprocessor directive should match the one in above - // ACE_Thread_Exit::instance (). With the Xavier Pthreads package, - // the exit_hook in TSS causes a seg fault. So, this works around - // that by creating exit_hook on the stack. -# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) - // Obtain our thread-specific exit hook and make sure that it knows - // how to clean us up! Note that we never use this pointer directly - // (it's stored in thread-specific storage), so it's ok to - // dereference it here and only store it as a reference. - - // Except if it is null, then the thr_mgr() method crashes. - // -jxh - - ACE_Thread_Exit *exit_hook_instance = ACE_Thread_Exit::instance (); - ACE_Thread_Exit_Maybe exit_hook_maybe (exit_hook_instance == 0); - ACE_Thread_Exit *exit_hook_ptr = exit_hook_instance - ? exit_hook_instance - : exit_hook_maybe.instance (); - ACE_Thread_Exit &exit_hook = *exit_hook_ptr; - - if (this->thr_mgr () != 0) - { - // Keep track of the that's associated with this - // . - exit_hook.thr_mgr (this->thr_mgr ()); - } -# else - // Without TSS, create an instance. When this - // function returns, its destructor will be called because the - // object goes out of scope. The drawback with this appraoch is - // that the destructor _won't_ get called if is called. - // So, threads shouldn't exit that way. Instead, they should return - // from . - ACE_Thread_Exit exit_hook; - exit_hook.thr_mgr (this->thr_mgr ()); -# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ - -#endif /* ! ACE_USE_THREAD_MANAGER_ADAPTER */ - - return this->invoke_i (); -} - -ACE_THR_FUNC_RETURN -ACE_Thread_Adapter::invoke_i (void) -{ - // Extract the arguments. - ACE_THR_FUNC func = ACE_reinterpret_cast (ACE_THR_FUNC, - this->user_func_); - void *arg = this->arg_; - -#if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) - ACE_OS_Thread_Descriptor *thr_desc = this->thr_desc_; -#endif /* ACE_WIN32 && ACE_HAS_MFC && (ACE_HAS_MFC != 0) */ - - // Delete ourselves since we don't need anymore. Make sure - // not to access anywhere below this point. - delete this; - -#if defined (ACE_NEEDS_LWP_PRIO_SET) - // On SunOS, the LWP priority needs to be set in order to get - // preemption when running in the RT class. This is the ACE way to - // do that . . . - ACE_hthread_t thr_handle; - ACE_OS::thr_self (thr_handle); - int prio; - - // thr_getprio () on the current thread should never fail. - ACE_OS::thr_getprio (thr_handle, prio); - - // ACE_OS::thr_setprio () has the special logic to set the LWP priority, - // if running in the RT class. - ACE_OS::thr_setprio (prio); - -#endif /* ACE_NEEDS_LWP_PRIO_SET */ - - ACE_THR_FUNC_RETURN status = 0; - - ACE_SEH_TRY - { - ACE_SEH_TRY - { - ACE_Thread_Hook *hook = - ACE_OS_Object_Manager::thread_hook (); - - if (hook) - // Invoke the start hook to give the user a chance to - // perform some initialization processing before the - // is invoked. - status = hook->start (func, arg); - else - { - // Call thread entry point. -#if defined (ACE_PSOS) - status = 0; - (*func) (arg); -#else /* ! ACE_PSOS */ - status = (*func) (arg); -#endif /* ACE_PSOS */ - } - } - -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - ACE_SEH_EXCEPT (ACE_OS_Object_Manager::seh_except_selector ()( - (void *) GetExceptionInformation ())) - { - ACE_OS_Object_Manager::seh_except_handler ()(0); - } -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - } - - ACE_SEH_FINALLY - { - // If we changed this to 1, change the respective if in - // Task::svc_run to 0. -#if 0 - // Call the close> hook. - if (func == ACE_reinterpret_cast (ACE_THR_FUNC_INTERNAL, - ACE_Task_Base::svc_run)) - { - ACE_Task_Base *task_ptr = (ACE_Task_Base *) arg; - ACE_Thread_Manager *thr_mgr_ptr = task_ptr->thr_mgr (); - - // This calls the Task->close () hook. - task_ptr->cleanup (task_ptr, 0); - - // This prevents a second invocation of the cleanup code - // (called later by . - thr_mgr_ptr->at_exit (task_ptr, 0, 0); - } -#endif /* 0 */ - -#if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) -# if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) - int using_afx = -1; - if (thr_desc) - using_afx = ACE_BIT_ENABLED (thr_desc->flags (), THR_USE_AFX); -# endif /* ACE_WIN32 && ACE_HAS_MFC && (ACE_HAS_MFC != 0) */ - // Call TSS destructors. - ACE_OS::cleanup_tss (0 /* not main thread */); - -# if defined (ACE_WIN32) - // Exit the thread. Allow CWinThread-destructor to be invoked - // from AfxEndThread. _endthreadex will be called from - // AfxEndThread so don't exit the thread now if we are running - // an MFC thread. -# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) - if (using_afx != -1) - { - if (using_afx) - ::AfxEndThread ((DWORD) status); - else - ACE_ENDTHREADEX (status); - } - else - { - // Not spawned by ACE_Thread_Manager, use the old buggy - // version. You should seriously consider using - // ACE_Thread_Manager to spawn threads. The following code - // is know to cause some problem. - CWinThread *pThread = ::AfxGetThread (); - - if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ()) - ACE_ENDTHREADEX (status); - else - ::AfxEndThread ((DWORD)status); - } -# else - - ACE_ENDTHREADEX (status); -# endif /* ACE_HAS_MFC && ACE_HAS_MFS != 0*/ -# endif /* ACE_WIN32 */ -#endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION */ - -#if defined (ACE_PSOS) - // This sequence of calls is documented by ISI as the proper way to - // clean up a pSOS task. They affect different components, so only - // try the ones for components that are built with ACE. -# if defined (SC_PREPC) && (SC_PREPC == YES) - ::fclose (0); // Return pREPC+ resources -# endif /* SC_PREPC */ -# if defined (SC_PHILE) && (SC_PHILE == YES) - ::close_f (0); // Return pHILE+ resources -# endif /* SC_PHILE */ -# if defined (SC_PNA) && (SC_PNA == YES) - ::close (0); // Return pNA+ resources -# endif /* SC_PNA */ -# if defined (SC_SC_PREPC) && (SC_PREPC == YES) - ::free (-1); // Return pREPC+ memory -# endif /* SC_PREPC */ - status = ::t_delete (0); // Suicide - only returns on error -#endif /* ACE_PSOS */ - } - - return status; -} diff --git a/ace/Thread_Adapter.h b/ace/Thread_Adapter.h deleted file mode 100644 index d5ee674a486..00000000000 --- a/ace/Thread_Adapter.h +++ /dev/null @@ -1,94 +0,0 @@ - -//============================================================================= -/** - * @file Thread_Adapter.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ -//============================================================================= - -#ifndef ACE_THREAD_ADAPTER_H -#define ACE_THREAD_ADAPTER_H -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Base_Thread_Adapter.h" - -// Forward decl. -class ACE_Thread_Manager; -class ACE_Thread_Descriptor; - -/** - * @class ACE_Thread_Adapter - * - * @brief Converts a C++ function into a function that - * can be called from a thread creation routine - * (e.g., pthread_create() or _beginthreadex()) that expects an - * extern "C" entry point. This class also makes it possible to - * transparently provide hooks to register a thread with an - * ACE_Thread_Manager. - * - * This class is used in ACE_OS::thr_create(). In general, the - * thread that creates an object of this class is different from - * the thread that calls @c invoke() on this object. Therefore, - * the @c invoke() method is responsible for deleting itself. - */ -class ACE_Export ACE_Thread_Adapter : public ACE_Base_Thread_Adapter -{ -public: - /// Constructor. - ACE_Thread_Adapter (ACE_THR_FUNC user_func, - void *arg, - ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter, - ACE_Thread_Manager *thr_mgr = 0, - ACE_Thread_Descriptor *td = 0 -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , ACE_SEH_EXCEPT_HANDLER selector = 0, - ACE_SEH_EXCEPT_HANDLER handler = 0 -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - ); - - /** - * Execute the with the . This function deletes - * , thereby rendering the object useless after the call - * returns. - */ - virtual ACE_THR_FUNC_RETURN invoke (void); - - /// Accessor for the optional . - ACE_Thread_Manager *thr_mgr (void); - -private: - /// Ensure that this object must be allocated on the heap. - ~ACE_Thread_Adapter (void); - - /// Called by invoke, mainly here to separate the SEH stuff because - /// SEH on Win32 doesn't compile with local vars with destructors. - virtual ACE_THR_FUNC_RETURN invoke_i (void); - -private: - /// Optional thread manager. - ACE_Thread_Manager *thr_mgr_; - - /// Friend declaration to avoid compiler warning: only defines a private - /// destructor and has no friends. - friend class ACE_Thread_Adapter_Has_Private_Destructor; -}; - -# if defined (ACE_HAS_INLINED_OSCALLS) -# if defined (ACE_INLINE) -# undef ACE_INLINE -# endif /* ACE_INLINE */ -# define ACE_INLINE inline -# include "ace/Thread_Adapter.inl" -# endif /* ACE_HAS_INLINED_OSCALLS */ - -#include "ace/post.h" -#endif /* ACE_THREAD_ADAPTER_H */ diff --git a/ace/Thread_Adapter.inl b/ace/Thread_Adapter.inl deleted file mode 100644 index 53855b300cc..00000000000 --- a/ace/Thread_Adapter.inl +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -ACE_INLINE ACE_Thread_Manager * -ACE_Thread_Adapter::thr_mgr (void) -{ - return this->thr_mgr_; -} diff --git a/ace/Thread_Control.cpp b/ace/Thread_Control.cpp deleted file mode 100644 index c5828d61842..00000000000 --- a/ace/Thread_Control.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// $Id$ - -// -#include "ace/config-all.h" -#if defined (ACE_LEGACY_MODE) -// This silly include breaks a cycle when compiling in backwards -// compatibility mode -# include "ace/Thread_Exit.h" -#endif /* ACE_LEGACY_MODE */ -// - -#include "ace/Thread_Control.h" -#include "ace/Thread_Manager.h" - -ACE_RCSID(ace, Thread_Control, "$Id$") - -#if !defined (ACE_HAS_INLINED_OSCALLS) -# include "ace/Thread_Control.inl" -#endif /* ACE_HAS_INLINED_OS_CALLS */ - -void -ACE_Thread_Control::dump (void) const -{ - ACE_OS_TRACE ("ACE_Thread_Control::dump"); -} - -int -ACE_Thread_Control::insert (ACE_Thread_Manager *tm, int insert) -{ - ACE_OS_TRACE ("ACE_Thread_Control::insert"); - - ACE_hthread_t t_id; - ACE_OS::thr_self (t_id); - this->tm_ = tm; - - if (insert) - return this->tm_->insert_thr (ACE_OS::thr_self (), t_id); - else - return 0; -} - -// Initialize the thread controller. - -ACE_Thread_Control::ACE_Thread_Control (ACE_Thread_Manager *t, - int insert) - : tm_ (t), - status_ (0) -{ - ACE_OS_TRACE ("ACE_Thread_Control::ACE_Thread_Control"); - - if (this->tm_ != 0 && insert) - { - ACE_hthread_t t_id; - ACE_OS::thr_self (t_id); - this->tm_->insert_thr (ACE_OS::thr_self (), t_id); - } -} - -// Automatically kill thread on exit. - -ACE_Thread_Control::~ACE_Thread_Control (void) -{ - ACE_OS_TRACE ("ACE_Thread_Control::~ACE_Thread_Control"); - -#if defined (ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS) || defined (ACE_HAS_TSS_EMULATION) || defined (ACE_WIN32) - this->exit (this->status_, 0); -#else - this->exit (this->status_, 1); -#endif /* ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS */ -} - -// Exit from thread (but clean up first). - -ACE_THR_FUNC_RETURN -ACE_Thread_Control::exit (ACE_THR_FUNC_RETURN exit_status, int do_thr_exit) -{ - ACE_OS_TRACE ("ACE_Thread_Control::exit"); - - if (this->tm_ != 0) - return this->tm_->exit (exit_status, do_thr_exit); - else - { -#if !defined (ACE_HAS_TSS_EMULATION) - // With ACE_HAS_TSS_EMULATION, we let ACE_Thread_Adapter::invoke () - // exit the thread after cleaning up TSS. - ACE_OS::thr_exit (exit_status); -#endif /* ! ACE_HAS_TSS_EMULATION */ - return 0; - } -} diff --git a/ace/Thread_Control.h b/ace/Thread_Control.h deleted file mode 100644 index ed32db58184..00000000000 --- a/ace/Thread_Control.h +++ /dev/null @@ -1,101 +0,0 @@ - -//============================================================================= -/** - * @file Thread_Control.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ -//============================================================================= - - -#ifndef ACE_THREAD_CONTROL_H -#define ACE_THREAD_CONTROL_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (ACE_LEGACY_MODE) -# include "ace/OS.h" -#endif /* ACE_LEGACY_MODE */ - -class ACE_Thread_Manager; - -/** - * @class ACE_Thread_Control - * - * @brief Used to keep track of a thread's activities within its entry - * point function. - * - * A ACE_Thread_Manager uses this class to ensure that threads - * it spawns automatically register and unregister themselves - * with it. - * This class can be stored in thread-specific storage using the - * ACE_TSS wrapper. When a thread exits the - * function deletes this object, thereby - * ensuring that it gets removed from its associated - * ACE_Thread_Manager. - */ -class ACE_Export ACE_Thread_Control -{ -public: - /// Initialize the thread control object. If != 0, then - /// register the thread with the Thread_Manager. - ACE_Thread_Control (ACE_Thread_Manager *tm = 0, - int insert = 0); - - /// Remove the thread from its associated and exit - /// the thread if is enabled. - ~ACE_Thread_Control (void); - - /// Remove this thread from its associated ACE_Thread_Manager and exit - /// the thread if @a do_thr_exit is enabled. - ACE_THR_FUNC_RETURN exit (ACE_THR_FUNC_RETURN status, - int do_thr_exit); - - /// Store the and use it to register ourselves for - /// correct shutdown. - int insert (ACE_Thread_Manager *tm, int insert = 0); - - /// Returns the current . - ACE_Thread_Manager *thr_mgr (void); - - /// Atomically set a new and return the old - /// . - ACE_Thread_Manager *thr_mgr (ACE_Thread_Manager *); - - /// Set the exit status (and return existing status). - ACE_THR_FUNC_RETURN status (ACE_THR_FUNC_RETURN status); - - /// Get the current exit status. - ACE_THR_FUNC_RETURN status (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Pointer to the thread manager for this block of code. - ACE_Thread_Manager *tm_; - - /// Keeps track of the exit status for the thread. - ACE_THR_FUNC_RETURN status_; -}; - -# if defined (ACE_HAS_INLINED_OSCALLS) -# if defined (ACE_INLINE) -# undef ACE_INLINE -# endif /* ACE_INLINE */ -# define ACE_INLINE inline -# include "ace/Thread_Control.inl" -# endif /* ACE_HAS_INLINED_OSCALLS */ - -#include "ace/post.h" -#endif /* ACE_THREAD_CONTROL_H */ diff --git a/ace/Thread_Control.inl b/ace/Thread_Control.inl deleted file mode 100644 index 0c2ab504112..00000000000 --- a/ace/Thread_Control.inl +++ /dev/null @@ -1,42 +0,0 @@ -// -*- C++ -*- -// $Id$ - -// Set the exit status. - -ACE_INLINE ACE_THR_FUNC_RETURN -ACE_Thread_Control::status (ACE_THR_FUNC_RETURN s) -{ - ACE_OS_TRACE ("ACE_Thread_Control::status"); - return this->status_ = s; -} - -// Get the exit status. - -ACE_INLINE ACE_THR_FUNC_RETURN -ACE_Thread_Control::status (void) -{ - ACE_OS_TRACE ("ACE_Thread_Control::status"); - return this->status_; -} - -// Returns the current . - -ACE_INLINE ACE_Thread_Manager * -ACE_Thread_Control::thr_mgr (void) -{ - ACE_OS_TRACE ("ACE_Thread_Control::thr_mgr"); - return this->tm_; -} - -// Atomically set a new and return the old -// . - -ACE_INLINE ACE_Thread_Manager * -ACE_Thread_Control::thr_mgr (ACE_Thread_Manager *tm) -{ - ACE_OS_TRACE ("ACE_Thread_Control::thr_mgr"); - ACE_Thread_Manager *o_tm = this->tm_; - this->tm_ = tm; - return o_tm; -} - diff --git a/ace/Thread_Exit.cpp b/ace/Thread_Exit.cpp deleted file mode 100644 index c3ebe0f577f..00000000000 --- a/ace/Thread_Exit.cpp +++ /dev/null @@ -1,127 +0,0 @@ -// $Id$ - -#include "ace/Thread_Exit.h" -#include "ace/Synch.h" -#include "ace/Managed_Object.h" -#include "ace/Thread_Manager.h" - -ACE_RCSID(ace, Thread_Exit, "$Id$") - -u_int ACE_Thread_Exit::is_constructed_ = 0; - -void -ACE_Thread_Exit::cleanup (void *instance) -{ - ACE_OS_TRACE ("ACE_Thread_Exit::cleanup"); - - delete (ACE_TSS_TYPE (ACE_Thread_Exit) *) instance; - - ACE_Thread_Exit::is_constructed_ = 0; - // All TSS objects have been destroyed. Reset this flag so - // ACE_Thread_Exit singleton can be created again. -} - -// NOTE: this preprocessor directive should match the one in -// ACE_Task_Base::svc_run () below. This prevents the two statics -// from being defined. - -ACE_Thread_Exit * -ACE_Thread_Exit::instance (void) -{ -#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) - ACE_OS_TRACE ("ACE_Thread_Exit::instance"); - - // Determines if we were dynamically allocated. - static ACE_TSS_TYPE (ACE_Thread_Exit) *instance_; - - // Implement the Double Check pattern. - - if (ACE_Thread_Exit::is_constructed_ == 0) - { - ACE_MT (ACE_Thread_Mutex *lock = - ACE_Managed_Object::get_preallocated_object - (ACE_Object_Manager::ACE_THREAD_EXIT_LOCK); - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0)); - - if (ACE_Thread_Exit::is_constructed_ == 0) - { - ACE_NEW_RETURN (instance_, - ACE_TSS_TYPE (ACE_Thread_Exit), - 0); - - ACE_Thread_Exit::is_constructed_ = 1; - - ACE_Thread_Manager::set_thr_exit (instance_); - } - } - - return ACE_TSS_GET (instance_, ACE_Thread_Exit); -#else - return 0; -#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ -} - -// Grab hold of the Task * so that we can close() it in the -// destructor. - -ACE_Thread_Exit::ACE_Thread_Exit (void) -{ - ACE_OS_TRACE ("ACE_Thread_Exit::ACE_Thread_Exit"); -} - -// Set the this pointer... - -void -ACE_Thread_Exit::thr_mgr (ACE_Thread_Manager *tm) -{ - ACE_OS_TRACE ("ACE_Thread_Exit::thr_mgr"); - - if (tm != 0) - this->thread_control_.insert (tm, 0); -} - -// When this object is destroyed the Task is automatically closed -// down! - -ACE_Thread_Exit::~ACE_Thread_Exit (void) -{ - ACE_OS_TRACE ("ACE_Thread_Exit::~ACE_Thread_Exit"); -} - -ACE_Thread_Exit_Maybe::ACE_Thread_Exit_Maybe (int flag) - : instance_ (0) -{ - if (flag) - { - ACE_NEW (instance_, ACE_Thread_Exit); - } -} - -ACE_Thread_Exit_Maybe::~ACE_Thread_Exit_Maybe (void) -{ - delete this->instance_; -} - -ACE_Thread_Exit * -ACE_Thread_Exit_Maybe::operator -> (void) const -{ - return this->instance_; -} - -ACE_Thread_Exit * -ACE_Thread_Exit_Maybe::instance (void) const -{ - return this->instance_; -} - -#if (defined (ACE_HAS_THREADS) && \ - (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \ - defined (ACE_HAS_TSS_EMULATION))) - -# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_TSS; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_TSS -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */ diff --git a/ace/Thread_Exit.h b/ace/Thread_Exit.h deleted file mode 100644 index c47b4f7307d..00000000000 --- a/ace/Thread_Exit.h +++ /dev/null @@ -1,107 +0,0 @@ - -//============================================================================= -/** - * @file Thread_Exit.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ -//============================================================================= - - -#ifndef ACE_THREAD_EXIT_H -#define ACE_THREAD_EXIT_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" -#include "ace/Thread_Control.h" - -/** - * @class ACE_Thread_Exit - * - * @brief Keep exit information for a Thread in thread specific storage. - * so that the thread-specific exit hooks will get called no - * matter how the thread exits (e.g., via , C++ - * or Win32 exception, "falling off the end" of the thread entry - * point function, etc.). - * - * This clever little helper class is stored in thread-specific - * storage using the wrapper. When a thread exits the - * function deletes this object, thereby - * closing it down gracefully. - */ -class ACE_Export ACE_Thread_Exit -{ -public: - /// Capture the Thread that will be cleaned up automatically. - ACE_Thread_Exit (void); - - /// Set the . - void thr_mgr (ACE_Thread_Manager *tm); - - /// Destructor calls the thread-specific exit hooks when a thread - /// exits. - ~ACE_Thread_Exit (void); - - /// Singleton access point. - static ACE_Thread_Exit *instance (void); - - /// Cleanup method, used by the to destroy the - /// singleton. - static void cleanup (void *instance); - -private: - /// Automatically add/remove the thread from the - /// . - ACE_Thread_Control thread_control_; - - /** - * Used to detect whether we should create a new instance (or not) - * within the instance method -- we don't trust the instance_ ptr - * because the destructor may have run (if ACE::fini() was called). - * See bug #526. - * We don't follow the singleton pattern due to dependency issues. - */ - static u_int is_constructed_; -}; - -/** - * @class ACE_Thread_Exit_Maybe - * - * @brief A version of ACE_Thread_Exit that is created dynamically - * under the hood if the flag is set to TRUE. - * - * Allows the appearance of a "smart pointer", but is not - * always created. - */ -class ACE_Export ACE_Thread_Exit_Maybe -{ -public: - /// Don't create an ACE_Thread_Exit instance by default. - ACE_Thread_Exit_Maybe (int flag = 0); - - /// Destroys the underlying ACE_Thread_Exit instance if it exists. - ~ACE_Thread_Exit_Maybe (void); - - /// Delegates to underlying instance. - ACE_Thread_Exit * operator -> (void) const; - - /// Returns the underlying instance. - ACE_Thread_Exit * instance (void) const; - -private: - - /// Holds the underlying instance. - ACE_Thread_Exit *instance_; - -}; - -#include "ace/post.h" -#endif /* ACE_THREAD_EXIT_H */ diff --git a/ace/Thread_Hook.cpp b/ace/Thread_Hook.cpp deleted file mode 100644 index 4d7a582f6c5..00000000000 --- a/ace/Thread_Hook.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// $Id$ - -#include "ace/Thread_Hook.h" -#include "ace/OS.h" - -ACE_RCSID(ace, Thread_Hook, "$Id$") - -ACE_THR_FUNC_RETURN -ACE_Thread_Hook::start (ACE_THR_FUNC func, - void *arg) -{ - return (func) (arg); -} - -ACE_Thread_Hook * -ACE_Thread_Hook::thread_hook (ACE_Thread_Hook *hook) -{ - return ACE_OS_Object_Manager::thread_hook (hook); -} - -ACE_Thread_Hook * -ACE_Thread_Hook::thread_hook (void) -{ - return ACE_OS_Object_Manager::thread_hook (); -} diff --git a/ace/Thread_Hook.h b/ace/Thread_Hook.h deleted file mode 100644 index deec5544479..00000000000 --- a/ace/Thread_Hook.h +++ /dev/null @@ -1,56 +0,0 @@ - -//============================================================================= -/** - * @file Thread_Hook.h - * - * $Id$ - * - * @author Carlos O'Ryan - */ -//============================================================================= - - -#ifndef ACE_THREAD_HOOK_H -#define ACE_THREAD_HOOK_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS_Export.h" - -/** - * @class ACE_Thread_Hook - * - * @brief This class makes it possible to provide user-defined "start" - * hooks that are called before the thread entry point function - * is invoked. - */ -class ACE_OS_Export ACE_Thread_Hook -{ - -public: - /** - * This method can be overridden in a subclass to customize this - * pre-function call "hook" invocation that can perform - * initialization processing before the thread entry point - * method is called back. The @a func and @a arg passed into the - * start hook are the same as those passed by the application that - * spawned the thread. - */ - virtual ACE_THR_FUNC_RETURN start (ACE_THR_FUNC func, - void *arg); - - /// sets the system wide thread hook, returns the previous thread - /// hook or 0 if none is set. - static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *hook); - - /// Returns the current system thread hook. - static ACE_Thread_Hook *thread_hook (void); -}; - -#include "ace/post.h" -#endif /* ACE_THREAD_HOOK_H */ diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp deleted file mode 100644 index 1df82bd00e1..00000000000 --- a/ace/Thread_Manager.cpp +++ /dev/null @@ -1,2273 +0,0 @@ -// $Id$ - -#include "ace/Synch_T.h" -#include "ace/Thread_Manager.h" -#include "ace/Dynamic.h" -#include "ace/Object_Manager.h" -#include "ace/Singleton.h" -#include "ace/Auto_Ptr.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Thread_Manager.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Thread_Manager, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Control) -ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Manager) - -#if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) -// Process-wide Thread Manager. -ACE_Thread_Manager *ACE_Thread_Manager::thr_mgr_ = 0; - -// Controls whether the Thread_Manager is deleted when we shut down -// (we can only delete it safely if we created it!) -int ACE_Thread_Manager::delete_thr_mgr_ = 0; -#endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ - -ACE_TSS_TYPE (ACE_Thread_Exit) *ACE_Thread_Manager::thr_exit_ = 0; - -int -ACE_Thread_Manager::set_thr_exit (ACE_TSS_TYPE (ACE_Thread_Exit) *ptr) -{ - if (ACE_Thread_Manager::thr_exit_ == 0) - ACE_Thread_Manager::thr_exit_ = ptr; - else - return -1; - return 0; -} - -void -ACE_Thread_Manager::dump (void) -{ - ACE_TRACE ("ACE_Thread_Manager::dump"); - // Cast away const-ness of this in order to use its non-const lock_. - ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, - ((ACE_Thread_Manager *) this)->lock_)); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ())); - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - iter.next ()->dump (); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Thread_Descriptor::~ACE_Thread_Descriptor (void) -{ - delete this->sync_; -} - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) -void ACE_Thread_Descriptor::at_pop (int apply) - -{ - ACE_TRACE ("ACE_Thread_Descriptor::at_pop"); - // Get first at from at_exit_list - ACE_At_Thread_Exit* at = this->at_exit_list_; - // Remove at from at_exit list - this->at_exit_list_ = at->next_; - // Apply if required - if (apply) - { - at->apply (); - // Do the apply method - at->was_applied (1); - // Mark at has been applied to avoid double apply from - // at destructor - } - // If at is not owner delete at. - if (!at->is_owner ()) - delete at; -} - -void -ACE_Thread_Descriptor::at_push (ACE_At_Thread_Exit* cleanup, int is_owner) - -{ - ACE_TRACE ("ACE_Thread_Descriptor::at_push"); - cleanup->is_owner (is_owner); - cleanup->td_ = this; - cleanup->next_ = at_exit_list_; - at_exit_list_ = cleanup; -} - -int -ACE_Thread_Descriptor::at_exit (ACE_At_Thread_Exit& cleanup) - -{ - ACE_TRACE ("ACE_Thread_Descriptor::at_exit"); - at_push (&cleanup, 1); - return 0; -} - -int -ACE_Thread_Descriptor::at_exit (ACE_At_Thread_Exit* cleanup) - -{ - ACE_TRACE ("ACE_Thread_Descriptor::at_exit"); - if (cleanup==0) - return -1; - else - { - this->at_push (cleanup); - return 0; - } -} - -void -ACE_Thread_Descriptor::do_at_exit () - -{ - ACE_TRACE ("ACE_Thread_Descriptor::do_at_exit"); - while (at_exit_list_!=0) - this->at_pop (); -} - -void -ACE_Thread_Descriptor::terminate () - -{ - ACE_TRACE ("ACE_Thread_Descriptor::terminate"); - - if (!terminated_) - { - ACE_Log_Msg* log_msg = this->log_msg_; - terminated_ = 1; - // Run at_exit hooks - this->do_at_exit (); - // We must remove Thread_Descriptor from Thread_Manager list - if (this->tm_ != 0) - { - int close_handle = 0; - -#if !defined (VXWORKS) - // Threads created with THR_DAEMON shouldn't exist here, but - // just to be safe, let's put it here. - - if (ACE_BIT_DISABLED (this->thr_state_, ACE_Thread_Manager::ACE_THR_JOINING)) - { - if (ACE_BIT_DISABLED (this->flags_, THR_DETACHED | THR_DAEMON) - || ACE_BIT_ENABLED (this->flags_, THR_JOINABLE)) - { - // Mark thread as terminated. - ACE_SET_BITS (this->thr_state_, ACE_Thread_Manager::ACE_THR_TERMINATED); - tm_->register_as_terminated (this); - // Must copy the information here because td will be - // "freed" below. - } -#if defined (ACE_WIN32) - else - { - close_handle = 1; - } -#endif /* ACE_WIN32 */ - } -#endif /* ! VXWORKS */ - - // Remove thread descriptor from the table. - if (this->tm_ != 0) - tm_->remove_thr (this, close_handle); - } - - // Check if we need delete ACE_Log_Msg instance - // If ACE_TSS_cleanup was not executed first log_msg == 0 - if (log_msg == 0) - { - // Only inform to ACE_TSS_cleanup that it must delete the log instance - // setting ACE_LOG_MSG thr_desc to 0. - ACE_LOG_MSG->thr_desc (0); - } - else - { - // Thread_Descriptor is the owner of the Log_Msg instance!! - // deleted. - this->log_msg_ = 0; - delete log_msg; - } - } -} - -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - -int -ACE_Thread_Descriptor::at_exit (void *object, - ACE_CLEANUP_FUNC cleanup_hook, - void *param) -{ - ACE_TRACE ("ACE_Thread_Descriptor::at_exit"); -#if defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - this->cleanup_info_.cleanup_hook_ = cleanup_hook; - this->cleanup_info_.object_ = object; - this->cleanup_info_.param_ = param; -#else - // To keep compatibility, when cleanup_hook is null really is a at_pop - // without apply. - if (cleanup_hook == 0) - { - if (this->at_exit_list_!= 0) - this->at_pop(0); - } - else - { - ACE_At_Thread_Exit* cleanup; - ACE_NEW_RETURN (cleanup, - ACE_At_Thread_Exit_Func (object, - cleanup_hook, - param), - -1); - this->at_push (cleanup); - } -#endif /* ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - return 0; -} - -void -ACE_Thread_Descriptor::dump (void) const -{ - ACE_TRACE ("ACE_Thread_Descriptor::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_id_ = %d"), this->thr_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_handle_ = %d"), this->thr_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_state_ = %d"), this->thr_state_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncleanup_info_.cleanup_hook_ = %x"), this->cleanup_info_.cleanup_hook_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = %x\n"), this->flags_)); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Thread_Descriptor::ACE_Thread_Descriptor (void) -#if !defined (ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - : log_msg_ (0), - at_exit_list_ (0), - terminated_ (0) -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ -{ - ACE_TRACE ("ACE_Thread_Descriptor::ACE_Thread_Descriptor"); - ACE_NEW (this->sync_, - ACE_DEFAULT_THREAD_MANAGER_LOCK); -} - -void -ACE_Thread_Descriptor::acquire_release (void) -{ - // Just try to acquire the lock then release it. -#if defined (ACE_THREAD_MANAGER_USES_SAFE_SPAWN) - if (ACE_BIT_DISABLED (this->thr_state_, ACE_Thread_Manager::ACE_THR_SPAWNED)) -#endif /* ACE_THREAD_MANAGER_USES_SAFE_SPAWN */ - { - this->sync_->acquire (); - // Acquire the lock before removing from the thread table. If - // this thread is in the table already, it should simply acquire the - // lock easily. - - // Once we get the lock, we must have registered. - ACE_ASSERT (ACE_BIT_ENABLED (this->thr_state_, ACE_Thread_Manager::ACE_THR_SPAWNED)); - - this->sync_->release (); - // Release the lock before putting it back to freelist. - } -} - -// The following macro simplifies subsequence code. -#define ACE_FIND(OP,INDEX) \ - ACE_Thread_Descriptor *INDEX = OP; \ - -ACE_Thread_Descriptor * -ACE_Thread_Manager::thread_descriptor (ACE_thread_t thr_id) -{ - ACE_TRACE ("ACE_Thread_Manager::thread_descriptor"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - ACE_FIND (this->find_thread (thr_id), ptr); - return ptr; -} - -ACE_Thread_Descriptor * -ACE_Thread_Manager::hthread_descriptor (ACE_hthread_t thr_handle) -{ - ACE_TRACE ("ACE_Thread_Manager::hthread_descriptor"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - ACE_FIND (this->find_hthread (thr_handle), ptr); - return ptr; -} - -// Return the thread descriptor (indexed by ACE_hthread_t). - -int -ACE_Thread_Manager::thr_self (ACE_hthread_t &self) -{ - ACE_TRACE ("ACE_Thread_Manager::thr_self"); - - ACE_Thread_Descriptor *desc = - this->thread_desc_self (); - - if (desc == 0) - return -1; - else - desc->self (self); - - return 0; -} - -// Initialize the synchronization variables. - -ACE_Thread_Manager::ACE_Thread_Manager (size_t prealloc, - size_t lwm, - size_t inc, - size_t hwm) - : grp_id_ (1), - automatic_wait_ (1) -#if defined (ACE_HAS_THREADS) - , zero_cond_ (lock_) -#endif /* ACE_HAS_THREADS */ - , thread_desc_freelist_ (ACE_FREE_LIST_WITH_POOL, - prealloc, lwm, hwm, inc) -{ - ACE_TRACE ("ACE_Thread_Manager::ACE_Thread_Manager"); -} - -#if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) -ACE_Thread_Manager * -ACE_Thread_Manager::instance (void) -{ - ACE_TRACE ("ACE_Thread_Manager::instance"); - - if (ACE_Thread_Manager::thr_mgr_ == 0) - { - // Perform Double-Checked Locking Optimization. - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance (), 0)); - - if (ACE_Thread_Manager::thr_mgr_ == 0) - { - ACE_NEW_RETURN (ACE_Thread_Manager::thr_mgr_, - ACE_Thread_Manager, - 0); - ACE_Thread_Manager::delete_thr_mgr_ = 1; - } - } - - return ACE_Thread_Manager::thr_mgr_; -} - -ACE_Thread_Manager * -ACE_Thread_Manager::instance (ACE_Thread_Manager *tm) -{ - ACE_TRACE ("ACE_Thread_Manager::instance"); - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance (), 0)); - - ACE_Thread_Manager *t = ACE_Thread_Manager::thr_mgr_; - // We can't safely delete it since we don't know who created it! - ACE_Thread_Manager::delete_thr_mgr_ = 0; - - ACE_Thread_Manager::thr_mgr_ = tm; - return t; -} - -void -ACE_Thread_Manager::close_singleton (void) -{ - ACE_TRACE ("ACE_Thread_Manager::close_singleton"); - - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance ())); - - if (ACE_Thread_Manager::delete_thr_mgr_) - { - // First, we clean up the thread descriptor list. - ACE_Thread_Manager::thr_mgr_->close (); - delete ACE_Thread_Manager::thr_mgr_; - ACE_Thread_Manager::thr_mgr_ = 0; - ACE_Thread_Manager::delete_thr_mgr_ = 0; - } - - ACE_Thread_Exit::cleanup (ACE_Thread_Manager::thr_exit_); -} -#endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ - -// Close up and release all resources. - -int -ACE_Thread_Manager::close () -{ - ACE_TRACE ("ACE_Thread_Manager::close"); - - // Clean up the thread descriptor list. - if (this->automatic_wait_) - this->wait (0, 1); - else - { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - this->remove_thr_all (); - } - - return 0; -} - -ACE_Thread_Manager::~ACE_Thread_Manager (void) -{ - ACE_TRACE ("ACE_Thread_Manager::~ACE_Thread_Manager"); - this->close (); -} - - -// Run the entry point for thread spawned under the control of the -// . This must be an extern "C" to make certain -// compilers happy... -// -// The interaction with and -// works like this, with -// ACE_HAS_THREAD_SPECIFIC_STORAGE or ACE_HAS_TSS_EMULATION: -// -// o Every thread in the is run with -// . -// -// o retrieves the singleton -// instance from . -// The singleton gets created in thread-specific storage -// in the first call to that function. The key point is that the -// instance is in thread-specific storage. -// -// o A thread can exit by various means, such as , C++ -// or Win32 exception, "falling off the end" of the thread entry -// point function, etc. -// -// o If you follow this so far, now it gets really fun . . . -// When the thread-specific storage (for the thread that -// is being destroyed) is cleaned up, the OS threads package (or -// the ACE emulation of thread-specific storage) will destroy any -// objects that are in thread-specific storage. It has a list of -// them, and just walks down the list and destroys each one. -// -// o That's where the ACE_Thread_Exit destructor gets called. - -#if defined(ACE_USE_THREAD_MANAGER_ADAPTER) -extern "C" void * -ace_thread_manager_adapter (void *args) -{ -#if defined (ACE_HAS_TSS_EMULATION) - // As early as we can in the execution of the new thread, allocate - // its local TS storage. Allocate it on the stack, to save dynamic - // allocation/dealloction. - void *ts_storage[ACE_TSS_Emulation::ACE_TSS_THREAD_KEYS_MAX]; - ACE_TSS_Emulation::tss_open (ts_storage); -#endif /* ACE_HAS_TSS_EMULATION */ - - ACE_Thread_Adapter *thread_args = (ACE_Thread_Adapter *) args; - - // NOTE: this preprocessor directive should match the one in above - // ACE_Thread_Exit::instance (). With the Xavier Pthreads package, - // the exit_hook in TSS causes a seg fault. So, this works around - // that by creating exit_hook on the stack. -#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) - // Obtain our thread-specific exit hook and make sure that it knows - // how to clean us up! Note that we never use this pointer directly - // (it's stored in thread-specific storage), so it's ok to - // dereference it here and only store it as a reference. - ACE_Thread_Exit &exit_hook = *ACE_Thread_Exit::instance (); -#else - // Without TSS, create an instance. When this - // function returns, its destructor will be called because the - // object goes out of scope. The drawback with this appraoch is - // that the destructor _won't_ get called if is called. - // So, threads shouldn't exit that way. Instead, they should return - // from . - ACE_Thread_Exit exit_hook; -#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ - - // Keep track of the that's associated with this - // . - exit_hook.thr_mgr (thread_args->thr_mgr ()); - - // Invoke the user-supplied function with the args. - void *status = thread_args->invoke (); - - return status; -} -#endif - -// Call the appropriate OS routine to spawn a thread. Should *not* be -// called with the lock_ held... - -int -ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, - void *args, - long flags, - ACE_thread_t *t_id, - ACE_hthread_t *t_handle, - long priority, - int grp_id, - void *stack, - size_t stack_size, - ACE_Task_Base *task) -{ - // First, threads created by Thread Manager should not be daemon threads. - // Using assertion is probably a bit too strong. However, it helps - // finding this kind of error as early as possible. Perhaps we can replace - // assertion by returning error. - ACE_ASSERT (ACE_BIT_DISABLED (flags, THR_DAEMON)); - - // Create a new thread running . *Must* be called with the - // held... - // Get a "new" Thread Descriptor from the freelist. - auto_ptr new_thr_desc (this->thread_desc_freelist_.remove ()); - - // Reset thread descriptor status - new_thr_desc->reset (this); - - ACE_Thread_Adapter *thread_args = 0; -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - ACE_NEW_RETURN (thread_args, - ACE_Thread_Adapter (func, - args, - (ACE_THR_C_FUNC) ace_thread_adapter, - this, - new_thr_desc.get (), - ACE_OS_Object_Manager::seh_except_selector(), - ACE_OS_Object_Manager::seh_except_handler()), - -1); -#else - ACE_NEW_RETURN (thread_args, - ACE_Thread_Adapter (func, - args, - (ACE_THR_C_FUNC) ace_thread_adapter, - this, - new_thr_desc.get ()), - -1); -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - - ACE_TRACE ("ACE_Thread_Manager::spawn_i"); - ACE_hthread_t thr_handle; - -#if defined (VXWORKS) - // On VxWorks, ACE_thread_t is char *. If t_id is 0, allocate space - // for ACE_OS::thr_create () to store the task name. If t_id is not - // 0, and it doesn't point to a 0 char *, then the non-zero char * - // will be used for the task name in ACE_OS::thr_create (). If t_id - // is not 0, but does point to a 0 char *, the t_id will be set to - // point to the task name in the TCB in ACE_OS::thr_create (). - if (t_id == 0) - { - char *thr_id; - ACE_NEW_RETURN (thr_id, - char[16], - -1); - // Mark the thread ID to show that the ACE_Thread_Manager - // allocated it. - thr_id[0] = ACE_THR_ID_ALLOCATED; - thr_id[1] = '\0'; - t_id = &thr_id; - } -#else /* ! VXWORKS */ - ACE_thread_t thr_id; - if (t_id == 0) - t_id = &thr_id; -#endif /* ! VXWORKS */ - - new_thr_desc->sync_->acquire (); - // Acquire the lock to block the spawned thread from - // removing this Thread Descriptor before it gets put into our - // thread table. - - int result = ACE_Thread::spawn (func, - args, - flags, - t_id, - &thr_handle, - priority, - stack, - stack_size, - thread_args); - - if (result != 0) - { - // _Don't_ clobber errno here! result is either 0 or -1, and - // ACE_OS::thr_create () already set errno! D. Levine 28 Mar 1997 - // errno = result; - ACE_Errno_Guard guard (errno); // Lock release may smash errno - new_thr_desc->sync_->release (); - return -1; - } - else - { -#if defined (ACE_HAS_WTHREADS) - // Have to duplicate handle if client asks for it. - // @@ How are thread handles implemented on AIX? Do they - // also need to be duplicated? - if (t_handle != 0) -# if defined (ACE_HAS_WINCE) - *t_handle = thr_handle; -# else /* ! ACE_HAS_WINCE */ - (void) ::DuplicateHandle (::GetCurrentProcess (), - thr_handle, - ::GetCurrentProcess (), - t_handle, - 0, - TRUE, - DUPLICATE_SAME_ACCESS); -# endif /* ! ACE_HAS_WINCE */ -#elif defined (VXWORKS) - if (t_handle != 0) - *t_handle = thr_handle; -#else /* ! ACE_HAS_WTHREADS && ! VXWORKS */ - ACE_UNUSED_ARG (t_handle); -#endif /* ! ACE_HAS_WTHREADS && ! VXWORKS */ - - // append_thr also put the into Thread_Manager's - // double-linked list. Only after this point, can we manipulate - // double-linked list from a spawned thread's context. - return this->append_thr (*t_id, - thr_handle, - ACE_THR_SPAWNED, - grp_id, - task, - flags, - new_thr_desc.release ()); - } -} - -int -ACE_Thread_Manager::spawn (ACE_THR_FUNC func, - void *args, - long flags, - ACE_thread_t *t_id, - ACE_hthread_t *t_handle, - long priority, - int grp_id, - void *stack, - size_t stack_size) -{ - ACE_TRACE ("ACE_Thread_Manager::spawn"); - - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - if (grp_id == -1) - grp_id = this->grp_id_++; // Increment the group id. - - if (this->spawn_i (func, args, flags, t_id, t_handle, - priority, grp_id, stack, stack_size) == -1) - return -1; - - return grp_id; -} - -// Create N new threads running FUNC. - -int -ACE_Thread_Manager::spawn_n (size_t n, - ACE_THR_FUNC func, - void *args, - long flags, - long priority, - int grp_id, - ACE_Task_Base *task, - ACE_hthread_t thread_handles[], - void *stack[], - size_t stack_size[]) -{ - ACE_TRACE ("ACE_Thread_Manager::spawn_n"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - if (grp_id == -1) - grp_id = this->grp_id_++; // Increment the group id. - - for (size_t i = 0; i < n; i++) - { - // @@ What should happen if this fails?! e.g., should we try to - // cancel the other threads that we've already spawned or what? - if (this->spawn_i (func, - args, - flags, - 0, - thread_handles == 0 ? 0 : &thread_handles[i], - priority, - grp_id, - stack == 0 ? 0 : stack[i], - stack_size == 0 ? 0 : stack_size[i], - task) == -1) - return -1; - } - - return grp_id; -} - -// Create N new threads running FUNC. - -int -ACE_Thread_Manager::spawn_n (ACE_thread_t thread_ids[], - size_t n, - ACE_THR_FUNC func, - void *args, - long flags, - long priority, - int grp_id, - void *stack[], - size_t stack_size[], - ACE_hthread_t thread_handles[], - ACE_Task_Base *task) -{ - ACE_TRACE ("ACE_Thread_Manager::spawn_n"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - if (grp_id == -1) - grp_id = this->grp_id_++; // Increment the group id. - - for (size_t i = 0; i < n; i++) - { - // @@ What should happen if this fails?! e.g., should we try to - // cancel the other threads that we've already spawned or what? - if (this->spawn_i (func, - args, - flags, - thread_ids == 0 ? 0 : &thread_ids[i], - thread_handles == 0 ? 0 : &thread_handles[i], - priority, - grp_id, - stack == 0 ? 0 : stack[i], - stack_size == 0 ? 0 : stack_size[i], - task) == -1) - return -1; - } - - return grp_id; -} - -// Append a thread into the pool (does not check for duplicates). -// Must be called with locks held. - -int -ACE_Thread_Manager::append_thr (ACE_thread_t t_id, - ACE_hthread_t t_handle, - ACE_UINT32 thr_state, - int grp_id, - ACE_Task_Base *task, - long flags, - ACE_Thread_Descriptor *td) -{ - ACE_TRACE ("ACE_Thread_Manager::append_thr"); - ACE_Thread_Descriptor *thr_desc; - - if (td == 0) - { - ACE_NEW_RETURN (thr_desc, - ACE_Thread_Descriptor, - -1); -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - thr_desc->tm_ = this; - // Setup the Thread_Manager. -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - } - else - thr_desc = td; - - thr_desc->thr_id_ = t_id; - thr_desc->thr_handle_ = t_handle; - thr_desc->grp_id_ = grp_id; - thr_desc->task_ = task; - thr_desc->flags_ = flags; - - this->thr_list_.insert_head (thr_desc); - ACE_SET_BITS (thr_desc->thr_state_, thr_state); - thr_desc->sync_->release (); - - return 0; -} - -// Return the thread descriptor (indexed by ACE_hthread_t). - -ACE_Thread_Descriptor * -ACE_Thread_Manager::find_hthread (ACE_hthread_t h_id) -{ - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if (ACE_OS::thr_cmp (iter.next ()->thr_handle_, h_id)) - return iter.next (); - - return 0; -} - -// Locate the index in the table associated with . Must be -// called with the lock held. - -ACE_Thread_Descriptor * -ACE_Thread_Manager::find_thread (ACE_thread_t t_id) -{ - ACE_TRACE ("ACE_Thread_Manager::find_thread"); - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if (ACE_OS::thr_equal (iter.next ()->thr_id_, t_id)) - return iter.next (); - return 0; -} - -// Insert a thread into the pool (checks for duplicates and doesn't -// allow them to be inserted twice). - -int -ACE_Thread_Manager::insert_thr (ACE_thread_t t_id, - ACE_hthread_t t_handle, - int grp_id, - long flags) -{ - ACE_TRACE ("ACE_Thread_Manager::insert_thr"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - // Check for duplicates and bail out if we're already registered... -#if defined (VXWORKS) - if (this->find_hthread (t_handle) != 0 ) - return -1; -#else /* ! VXWORKS */ - if (this->find_thread (t_id) != 0 ) - return -1; -#endif /* ! VXWORKS */ - - if (grp_id == -1) - grp_id = this->grp_id_++; - - if (this->append_thr (t_id, - t_handle, - ACE_THR_SPAWNED, - grp_id, - 0, - flags) == -1) - return -1; - - return grp_id; -} - -// Run the registered hooks when the thread exits. - -void -ACE_Thread_Manager::run_thread_exit_hooks (int i) -{ -#if 0 // currently unused! - ACE_TRACE ("ACE_Thread_Manager::run_thread_exit_hooks"); - - // @@ Currently, we have just one hook. This should clearly be - // generalized to support an arbitrary number of hooks. - - ACE_Thread_Descriptor *td = this->thread_desc_self (); - if (td != 0 && td->cleanup_info.cleanup_hook_ != 0) - { - (*td->cleanup_info_.cleanup_hook_) - (td->cleanup_info_.object_, - td->cleanup_info_.param_); - - td->cleanup_info_.cleanup_hook_ = 0; - } - ACE_UNUSED_ARG (i); -#else - ACE_UNUSED_ARG (i); -#endif /* 0 */ -} - -// Remove a thread from the pool. Must be called with locks held. - -void -ACE_Thread_Manager::remove_thr (ACE_Thread_Descriptor *td, - int close_handler) -{ - ACE_TRACE ("ACE_Thread_Manager::remove_thr"); - -#if defined (VXWORKS) - ACE_thread_t tid = td->self (); -#endif /* VXWORKS */ - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - td->tm_ = 0; -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - this->thr_list_.remove (td); - -#if defined (VXWORKS) - // Delete the thread ID, if the ACE_Thread_Manager allocated it. - if (tid && tid[0] == ACE_THR_ID_ALLOCATED) - { - delete [] tid; - } -#endif /* VXWORKS */ - -#if defined (ACE_WIN32) - if (close_handler != 0) - ::CloseHandle (td->thr_handle_); -#else - ACE_UNUSED_ARG (close_handler); -#endif /* ACE_WIN32 */ - -#if 1 - - this->thread_desc_freelist_.add (td); -#else - delete td; -#endif /* 1 */ - -#if defined (ACE_HAS_THREADS) - // Tell all waiters when there are no more threads left in the pool. - if (this->thr_list_.size () == 0) - this->zero_cond_.broadcast (); -#endif /* ACE_HAS_THREADS */ -} - -// Repeatedly call remove_thr on all table entries until there -// is no thread left. Must be called with lock held. - -void -ACE_Thread_Manager::remove_thr_all (void) -{ - ACE_Thread_Descriptor *td; - - while ((td = this->thr_list_.delete_head ()) != 0) - { -#if defined (ACE_WIN32) - // We need to let go handles if we want to let the threads - // run wild. - // @@ Do we need to close down AIX thread handles too? - ::CloseHandle (td->thr_handle_); -#endif /* ACE_WIN32 */ - delete td; - } - -} - -// ------------------------------------------------------------------ -// Factor out some common behavior to simplify the following methods. -#define ACE_THR_OP(OP,STATE) \ - int result = OP (td->thr_handle_); \ - if (result == -1) { \ - if (errno != ENOTSUP) \ - this->thr_to_be_removed_.enqueue_tail (td); \ - return -1; \ - } \ - else { \ - ACE_SET_BITS (td->thr_state_, STATE); \ - return 0; \ - } - -int -ACE_Thread_Manager::join_thr (ACE_Thread_Descriptor *td, int) -{ - ACE_TRACE ("ACE_Thread_Manager::join_thr"); - int result = ACE_Thread::join (td->thr_handle_); - if (result != 0) - { - // Since the thread are being joined, we should - // let it remove itself from the list. - - // this->remove_thr (td); - errno = result; - return -1; - } - - return 0; -} - -int -ACE_Thread_Manager::suspend_thr (ACE_Thread_Descriptor *td, int) -{ - ACE_TRACE ("ACE_Thread_Manager::suspend_thr"); - - int result = ACE_Thread::suspend (td->thr_handle_); - if (result == -1) { - if (errno != ENOTSUP) - this->thr_to_be_removed_.enqueue_tail (td); - return -1; - } - else { - ACE_SET_BITS (td->thr_state_, ACE_THR_SUSPENDED); - return 0; - } -} - -int -ACE_Thread_Manager::resume_thr (ACE_Thread_Descriptor *td, int) -{ - ACE_TRACE ("ACE_Thread_Manager::resume_thr"); - - int result = ACE_Thread::resume (td->thr_handle_); - if (result == -1) { - if (errno != ENOTSUP) - this->thr_to_be_removed_.enqueue_tail (td); - return -1; - } - else { - ACE_CLR_BITS (td->thr_state_, ACE_THR_SUSPENDED); - return 0; - } -} - -int -ACE_Thread_Manager::cancel_thr (ACE_Thread_Descriptor *td, int async_cancel) -{ - ACE_TRACE ("ACE_Thread_Manager::cancel_thr"); - // Must set the state first and then try to cancel the thread. - ACE_SET_BITS (td->thr_state_, ACE_THR_CANCELLED); - - if (async_cancel != 0) - // Note that this call only does something relevant if the OS - // platform supports asynchronous thread cancellation. Otherwise, - // it's a no-op. - return ACE_Thread::cancel (td->thr_id_); - - return 0; -} - -int -ACE_Thread_Manager::kill_thr (ACE_Thread_Descriptor *td, int signum) -{ - ACE_TRACE ("ACE_Thread_Manager::kill_thr"); - - ACE_thread_t tid = td->thr_id_; -#if defined (VXWORKS) - // Skip over the ID-allocated marker, if present. - tid += tid[0] == ACE_THR_ID_ALLOCATED ? 1 : 0; -#endif /* VXWORKS */ - - int result = ACE_Thread::kill (tid, signum); - - if (result != 0) - { - // Only remove a thread from us when there is a "real" error. - if (errno != ENOTSUP) - this->thr_to_be_removed_.enqueue_tail (td); - - return -1; - } -#if defined (CHORUS) - else if (signum == SIGTHREADKILL) - this->thr_to_be_removed_.enqueue_tail (td); -#endif /* CHORUS */ - - return 0; -} - -// ------------------------------------------------------------------ -// Factor out some common behavior to simplify the following methods. -#define ACE_EXECUTE_OP(OP, ARG) \ - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); \ - ACE_ASSERT (this->thr_to_be_removed_.is_empty ()); \ - ACE_FIND (this->find_thread (t_id), ptr); \ - if (ptr == 0) \ - { \ - errno = ENOENT; \ - return -1; \ - } \ - int result = OP (ptr, ARG); \ - ACE_Errno_Guard error (errno); \ - while (! this->thr_to_be_removed_.is_empty ()) { \ - ACE_Thread_Descriptor *td; \ - this->thr_to_be_removed_.dequeue_head (td); \ - this->remove_thr (td, 1); \ - } \ - return result - -// Suspend a single thread. - -int -ACE_Thread_Manager::suspend (ACE_thread_t t_id) -{ - ACE_TRACE ("ACE_Thread_Manager::suspend"); - ACE_EXECUTE_OP (this->suspend_thr, 0); -} - -// Resume a single thread. - -int -ACE_Thread_Manager::resume (ACE_thread_t t_id) -{ - ACE_TRACE ("ACE_Thread_Manager::resume"); - ACE_EXECUTE_OP (this->resume_thr, 0); -} - -// Cancel a single thread. - -int -ACE_Thread_Manager::cancel (ACE_thread_t t_id, int async_cancel) -{ - ACE_TRACE ("ACE_Thread_Manager::cancel"); - ACE_EXECUTE_OP (this->cancel_thr, async_cancel); -} - -// Send a signal to a single thread. - -int -ACE_Thread_Manager::kill (ACE_thread_t t_id, int signum) -{ - ACE_TRACE ("ACE_Thread_Manager::kill"); - ACE_EXECUTE_OP (this->kill_thr, signum); -} - -int -ACE_Thread_Manager::check_state (ACE_UINT32 state, - ACE_thread_t id, - int enable) -{ - ACE_TRACE ("ACE_Thread_Manager::check_state"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - ACE_UINT32 thr_state; - - int self_check = ACE_OS::thr_equal (id, ACE_OS::thr_self ()); - - // If we're checking the state of our thread, try to get the cached - // value out of TSS to avoid lookup. - if (self_check) - { - ACE_Thread_Descriptor *desc = ACE_LOG_MSG->thr_desc (); - if (desc == 0) - return 0; // Always return false. - thr_state = desc->thr_state_; - } - else - { - // Not calling from self, have to look it up from the list. - ACE_FIND (this->find_thread (id), ptr); - if (ptr == 0) - return 0; - thr_state = ptr->thr_state_; - } - if (enable) - return ACE_BIT_ENABLED (thr_state, state); - - return ACE_BIT_DISABLED (thr_state, state); -} - -// Test if a single thread is suspended. - -int -ACE_Thread_Manager::testsuspend (ACE_thread_t t_id) -{ - ACE_TRACE ("ACE_Thread_Manager::testsuspend"); - return this->check_state (ACE_THR_SUSPENDED, t_id); -} - -// Test if a single thread is active (i.e., resumed). - -int -ACE_Thread_Manager::testresume (ACE_thread_t t_id) -{ - ACE_TRACE ("ACE_Thread_Manager::testresume"); - return this->check_state (ACE_THR_SUSPENDED, t_id, 0); -} - -// Test if a single thread is cancelled. - -int -ACE_Thread_Manager::testcancel (ACE_thread_t t_id) -{ - ACE_TRACE ("ACE_Thread_Manager::testcancel"); - return this->check_state (ACE_THR_CANCELLED, t_id); -} - -// Thread information query functions. - -int -ACE_Thread_Manager::hthread_within (ACE_hthread_t handle) -{ - ACE_TRACE ("ACE_Thread_Manager::hthread_within"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_monx, this->lock_, -1)); - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if (ACE_OS::thr_cmp(iter.next ()->thr_handle_, handle)) - return 1; - - return 0; -} - -int -ACE_Thread_Manager::thread_within (ACE_thread_t tid) -{ - ACE_TRACE ("ACE_Thread_Manager::thread_within"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_monx, this->lock_, -1)); - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if (ACE_OS::thr_equal (iter.next ()->thr_id_, tid)) - return 1; - - return 0; -} - -// Get group ids for a particular thread id. - -int -ACE_Thread_Manager::get_grp (ACE_thread_t t_id, int &grp_id) -{ - ACE_TRACE ("ACE_Thread_Manager::get_grp"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - ACE_FIND (this->find_thread (t_id), ptr); - - if (ptr) - grp_id = ptr->grp_id_; - else - return -1; - return 0; -} - -// Set group ids for a particular thread id. - -int -ACE_Thread_Manager::set_grp (ACE_thread_t t_id, int grp_id) -{ - ACE_TRACE ("ACE_Thread_Manager::set_grp"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - ACE_FIND (this->find_thread (t_id), ptr); - if (ptr) - ptr->grp_id_ = grp_id; - else - return -1; - return 0; -} - -// Suspend a group of threads. - -int -ACE_Thread_Manager::apply_grp (int grp_id, - ACE_THR_MEMBER_FUNC func, - int arg) -{ - ACE_TRACE ("ACE_Thread_Manager::apply_grp"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_monx, this->lock_, -1)); - ACE_ASSERT (this->thr_to_be_removed_.is_empty ()); - - int result = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if (iter.next ()->grp_id_ == grp_id) - if ((this->*func) (iter.next (), arg) == -1) - result = -1; - - // Must remove threads after we have traversed the thr_list_ to - // prevent clobber thr_list_'s integrity. - - if (! this->thr_to_be_removed_.is_empty ()) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - - for (ACE_Thread_Descriptor *td; - this->thr_to_be_removed_.dequeue_head (td) != -1; - ) - this->remove_thr (td, 1); - } - - return result; -} - -int -ACE_Thread_Manager::suspend_grp (int grp_id) -{ - ACE_TRACE ("ACE_Thread_Manager::suspend_grp"); - return this->apply_grp (grp_id, - ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::suspend_thr)); -} - -// Resume a group of threads. - -int -ACE_Thread_Manager::resume_grp (int grp_id) -{ - ACE_TRACE ("ACE_Thread_Manager::resume_grp"); - return this->apply_grp (grp_id, - ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::resume_thr)); -} - -// Kill a group of threads. - -int -ACE_Thread_Manager::kill_grp (int grp_id, int signum) -{ - ACE_TRACE ("ACE_Thread_Manager::kill_grp"); - return this->apply_grp (grp_id, - ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::kill_thr), signum); -} - -// Cancel a group of threads. - -int -ACE_Thread_Manager::cancel_grp (int grp_id, int async_cancel) -{ - ACE_TRACE ("ACE_Thread_Manager::cancel_grp"); - return this->apply_grp (grp_id, - ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::cancel_thr), - async_cancel); -} - -int -ACE_Thread_Manager::apply_all (ACE_THR_MEMBER_FUNC func, int arg) -{ - ACE_TRACE ("ACE_Thread_Manager::apply_all"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - ACE_ASSERT (this->thr_to_be_removed_.is_empty ()); - - int result = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if ((this->*func)(iter.next (), arg) == -1) - result = -1; - - // Must remove threads after we have traversed the thr_list_ to - // prevent clobber thr_list_'s integrity. - - if (! this->thr_to_be_removed_.is_empty ()) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - - for (ACE_Thread_Descriptor *td; - this->thr_to_be_removed_.dequeue_head (td) != -1; - ) - this->remove_thr (td, 1); - } - - return result; -} - -// Resume all threads that are suspended. - -int -ACE_Thread_Manager::resume_all (void) -{ - ACE_TRACE ("ACE_Thread_Manager::resume_all"); - return this->apply_all (ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::resume_thr)); -} - -int -ACE_Thread_Manager::suspend_all (void) -{ - ACE_TRACE ("ACE_Thread_Manager::suspend_all"); - return this->apply_all (ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::suspend_thr)); -} - -int -ACE_Thread_Manager::kill_all (int sig) -{ - ACE_TRACE ("ACE_Thread_Manager::kill_all"); - return this->apply_all (&ACE_Thread_Manager::kill_thr, sig); -} - -int -ACE_Thread_Manager::cancel_all (int async_cancel) -{ - ACE_TRACE ("ACE_Thread_Manager::cancel_all"); - return this->apply_all (ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::cancel_thr), - async_cancel); -} - -int -ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status) -{ - ACE_TRACE ("ACE_Thread_Manager::join"); - - ACE_Thread_Descriptor_Base tdb; - int found = 0; - - { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - -#if !defined (VXWORKS) - for (ACE_Double_Linked_List_Iterator biter (this->terminated_thr_list_); - !biter.done (); - biter.advance ()) - if (ACE_OS::thr_equal (biter.next ()->thr_id_, tid)) - { - ACE_Thread_Descriptor_Base *tdb = biter.advance_and_remove (0); -# if defined (_AIX) - // The AIX xlC compiler does not match the proper function here - it - // confuses ACE_Thread::join(ACE_thread_t, ACE_thread_t *, void **=0) and - // ACE_Thread::join(ACE_hthread_t, void **=0). At least at 3.1.4.7 and .8. - // The 2nd arg is ignored for pthreads anyway. - - // And, g++ on AIX needs the three-arg thr_join, also, to pick up the - // proper version from the AIX libraries. - if (ACE_Thread::join (tdb->thr_handle_, - &tdb->thr_handle_, - status) == -1) -# else /* ! _AIX */ - if (ACE_Thread::join (tdb->thr_handle_, status) == -1) -# endif /* ! _AIX */ - return -1; - -# if defined (ACE_HAS_PTHREADS_DRAFT4) && defined (ACE_LACKS_SETDETACH) - // Must explicitly detach threads. Threads without THR_DETACHED - // were detached in ACE_OS::thr_create (). - ::pthread_detach (&tdb->thr_handle_); -# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */ - - delete tdb; - return 0; - // return immediately if we've found the thread we want to join. - } -#endif /* !VXWORKS */ - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - // If threads are created as THR_DETACHED or THR_DAEMON, we - // can't help much. - if (ACE_OS::thr_equal (iter.next ()->thr_id_,tid) && - (ACE_BIT_DISABLED (iter.next ()->flags_, THR_DETACHED | THR_DAEMON) - || ACE_BIT_ENABLED (iter.next ()->flags_, THR_JOINABLE))) - { - tdb = *iter.next (); - ACE_SET_BITS (iter.next ()->thr_state_, ACE_THR_JOINING); - found = 1; - break; - } - - if (found == 0) - return -1; - // Didn't find the thread we want or the thread is not joinable. - } - -# if defined (_AIX) - // The AIX xlC compiler does not match the proper function here - it - // confuses ACE_Thread::join(ACE_thread_t, ACE_thread_t *, void **=0) and - // ACE_Thread::join(ACE_hthread_t, void **=0). At least at 3.1.4.7 and .8. - // The 2nd arg is ignored for pthreads anyway. - - // And, g++ on AIX needs the three-arg thr_join, also, to pick up the - // proper version from the AIX libraries. - if (ACE_Thread::join (tdb.thr_handle_, &tdb.thr_handle_, status) == -1) -# else /* ! _AIX */ - if (ACE_Thread::join (tdb.thr_handle_, status) == -1) -# endif /* ! _AIX */ - return -1; - -# if defined (ACE_HAS_PTHREADS_DRAFT4) && defined (ACE_LACKS_SETDETACH) - // Must explicitly detach threads. Threads without THR_DETACHED - // were detached in ACE_OS::thr_create (). - -# if defined (HPUX_10) - // HP-UX DCE threads' pthread_detach will smash thr_id if it's just given - // as an argument. Since the thread handle is still needed, give - // pthread_detach a junker to scribble on. - ACE_thread_t junker; - cma_handle_assign(&tdb.thr_handle_, &junker); - ::pthread_detach (&junker); -# else - ::pthread_detach (&tdb.thr_handle_); - #endif /* HPUX_10 */ -# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */ - return 0; -} - -// Wait for group of threads - -int -ACE_Thread_Manager::wait_grp (int grp_id) -{ - ACE_TRACE ("ACE_Thread_Manager::wait_grp"); - - int copy_count = 0; - ACE_Thread_Descriptor_Base *copy_table = 0; - - // We have to make sure that while we wait for these threads to - // exit, we do not have the lock. Therefore we make a copy of all - // interesting entries and let go of the lock. - { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - -#if !defined (VXWORKS) - ACE_NEW_RETURN (copy_table, - ACE_Thread_Descriptor_Base [this->thr_list_.size () - + this->terminated_thr_list_.size ()], - -1); -#else - ACE_NEW_RETURN (copy_table, - ACE_Thread_Descriptor_Base [this->thr_list_.size ()], - -1); -#endif /* VXWORKS */ - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - // If threads are created as THR_DETACHED or THR_DAEMON, we - // can't help much. - if (iter.next ()->grp_id_ == grp_id && - (ACE_BIT_DISABLED (iter.next ()->flags_, THR_DETACHED | THR_DAEMON) - || ACE_BIT_ENABLED (iter.next ()->flags_, THR_JOINABLE))) - { - ACE_SET_BITS (iter.next ()->thr_state_, ACE_THR_JOINING); - copy_table[copy_count++] = *iter.next (); - } - -#if !defined (VXWORKS) - for (ACE_Double_Linked_List_Iterator biter (this->terminated_thr_list_); - !biter.done (); - biter.advance ()) - // If threads are created as THR_DETACHED or THR_DAEMON, we - // can't help much. - if (biter.next ()->grp_id_ == grp_id) - { - ACE_Thread_Descriptor_Base *tdb = biter.advance_and_remove (0); - copy_table[copy_count++] = *tdb; - delete tdb; - } -#endif /* !VXWORKS */ - } - - // Now actually join() with all the threads in this group. - int result = 0; - - for (int i = 0; - i < copy_count && result != -1; - i++) - { - if (ACE_Thread::join (copy_table[i].thr_handle_) == -1) - result = -1; - -# if defined (ACE_HAS_PTHREADS_DRAFT4) && defined (ACE_LACKS_SETDETACH) - // Must explicitly detach threads. Threads without THR_DETACHED - // were detached in ACE_OS::thr_create (). - ::pthread_detach (©_table[i].thr_handle_); -# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */ - } - - delete [] copy_table; - - return result; -} - -// Must be called when thread goes out of scope to clean up its table -// slot. - -ACE_THR_FUNC_RETURN -ACE_Thread_Manager::exit (ACE_THR_FUNC_RETURN status, int do_thr_exit) -{ - ACE_TRACE ("ACE_Thread_Manager::exit"); -#if defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - int close_handle = 0; -#endif /* ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - -#if defined (ACE_WIN32) - // Remove detached thread handle. - - if (do_thr_exit) - { -#if 0 - // @@ This callback is now taken care of by TSS_Cleanup. Do we - // need it anymore? - - // On Win32, if we really wants to exit from a thread, we must - // first clean up the thread specific storage. By doing so, - // ACE_Thread_Manager::exit will be called again with - // do_thr_exit = 0 and cleaning up the ACE_Cleanup_Info (but not - // exiting the thread.) After the following call returns, we - // are safe to exit this thread. - delete ACE_Thread_Exit::instance (); -#endif /* 0 */ - ACE_Thread::exit (status); - } -#endif /* ACE_WIN32 */ - -#if defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - ACE_Cleanup_Info cleanup_info; - - // Just hold onto the guard while finding this thread's id and - // copying the exit hook. - { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - // Find the thread id, but don't use the cache. It might have been - // deleted already. -#if defined (VXWORKS) - ACE_hthread_t id; - ACE_OS::thr_self (id); - ACE_Thread_Descriptor *td = this->find_hthread (id); -#else /* ! VXWORKS */ - ACE_thread_t id = ACE_OS::thr_self (); - ACE_Thread_Descriptor *td = this->find_thread (id); -#endif /* ! VXWORKS */ - - // Locate thread id. - if (td != 0) - { - // @@ Currently, we have just one hook. This should clearly - // be generalized to support an arbitrary number of hooks. - - if (td->cleanup_info_.cleanup_hook_ != 0) - { - // Copy the hook so that we can call it after releasing - // the guard. - cleanup_info = td->cleanup_info_; - td->cleanup_info_.cleanup_hook_ = 0; - } - -#if !defined (VXWORKS) - // Threads created with THR_DAEMON shouldn't exist here, but - // just to be safe, let's put it here. - - if (ACE_BIT_DISABLED (td->thr_state_, ACE_THR_JOINING)) - if (ACE_BIT_DISABLED (td->flags_, THR_DETACHED | THR_DAEMON) - || ACE_BIT_ENABLED (td->flags_, THR_JOINABLE)) - { - // Mark thread as terminated. - ACE_SET_BITS (td->thr_state_, ACE_THR_TERMINATED); - this->register_as_terminated (td); - // Must copy the information here because td will be "freed" below. - } -#if defined (ACE_WIN32) - else - { - close_handle = 1; - } -#endif /* ACE_WIN32 */ -#endif /* ! VXWORKS */ - - // Remove thread descriptor from the table. - this->remove_thr (td, close_handle); - } - // Release the guard. - } - - // Call the cleanup hook. - if (cleanup_info.cleanup_hook_ != 0) - (*cleanup_info.cleanup_hook_) (cleanup_info.object_, - cleanup_info.param_); -#else /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - // Just hold onto the guard while finding this thread's id and - { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - - // Find the thread id, but don't use the cache. It might have been - // deleted already. -#if defined (VXWORKS) - ACE_hthread_t id; - ACE_OS::thr_self (id); - ACE_Thread_Descriptor* td = this->find_hthread (id); -#else /* ! VXWORKS */ - ACE_thread_t id = ACE_OS::thr_self (); - ACE_Thread_Descriptor* td = this->find_thread (id); -#endif /* ! VXWORKS */ - if (td != 0) - { - // @@ We call Thread_Descriptor terminate this realize the cleanup - // process itself. - td->terminate(); - } - } - - -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - - if (do_thr_exit) - { - ACE_Thread::exit (status); - // On reasonable systems should not return. - // However, due to horrible semantics with Win32 thread-specific - // storage this call can return (don't ask...). - } - - return 0; -} - -// Wait for all the threads to exit. - -int -ACE_Thread_Manager::wait (const ACE_Time_Value *timeout, - int abandon_detached_threads) -{ - ACE_TRACE ("ACE_Thread_Manager::wait"); - -#if defined (ACE_HAS_THREADS) - { - // Just hold onto the guard while waiting. - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - if (ACE_Object_Manager::shutting_down () != 1) - { - // Program is not shutting down. Perform a normal wait on threads. - if (abandon_detached_threads != 0) - { - ACE_ASSERT (this->thr_to_be_removed_.is_empty ()); - for (ACE_Double_Linked_List_Iterator - iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if (ACE_BIT_ENABLED (iter.next ()->flags_, - THR_DETACHED | THR_DAEMON) - && ACE_BIT_DISABLED (iter.next ()->flags_, THR_JOINABLE)) - { - this->thr_to_be_removed_.enqueue_tail (iter.next ()); - ACE_SET_BITS (iter.next ()->thr_state_, ACE_THR_JOINING); - } - - if (! this->thr_to_be_removed_.is_empty ()) - { - ACE_Thread_Descriptor *td; - while (this->thr_to_be_removed_.dequeue_head (td) != -1) - this->remove_thr (td, 1); - } - } - - while (this->thr_list_.size () > 0) - if (this->zero_cond_.wait (timeout) == -1) - return -1; - } - else - // Program is shutting down, no chance to wait on threads. - // Therefore, we'll just remove threads from the list. - this->remove_thr_all (); - // Release the guard, giving other threads a chance to run. - } - -#if !defined (VXWORKS) - // @@ VxWorks doesn't support thr_join (yet.) We are working - //on our implementation. Chorus'es thr_join seems broken. - ACE_Thread_Descriptor_Base *item; - -#if defined (CHORUS) - if (ACE_Object_Manager::shutting_down () != 1) - { -#endif /* CHORUS */ - while ((item = this->terminated_thr_list_.delete_head ()) != 0) - { - if (ACE_BIT_DISABLED (item->flags_, THR_DETACHED | THR_DAEMON) - || ACE_BIT_ENABLED (item->flags_, THR_JOINABLE)) - // Detached handles shouldn't reached here. - ACE_Thread::join (item->thr_handle_); - -# if defined (ACE_HAS_PTHREADS_DRAFT4) && defined (ACE_LACKS_SETDETACH) - // Must explicitly detach threads. Threads without - // THR_DETACHED were detached in ACE_OS::thr_create (). - ::pthread_detach (&item->thr_handle_); -# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */ - delete item; - } -#if defined (CHORUS) - } -#endif /* CHORUS */ - -#endif /* ! VXWORKS */ -#else - ACE_UNUSED_ARG (timeout); - ACE_UNUSED_ARG (abandon_detached_threads); -#endif /* ACE_HAS_THREADS */ - - return 0; -} - -int -ACE_Thread_Manager::apply_task (ACE_Task_Base *task, - ACE_THR_MEMBER_FUNC func, - int arg) -{ - ACE_TRACE ("ACE_Thread_Manager::apply_task"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - ACE_ASSERT (this->thr_to_be_removed_.is_empty ()); - - int result = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if (iter.next ()->task_ == task - && (this->*func) (iter.next (), arg) == -1) - result = -1; - - // Must remove threads after we have traversed the thr_list_ to - // prevent clobber thr_list_'s integrity. - - if (! this->thr_to_be_removed_.is_empty ()) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - - for (ACE_Thread_Descriptor *td; - this->thr_to_be_removed_.dequeue_head (td) != -1; - ) - this->remove_thr (td, 1); - } - - return result; -} - -// Wait for all threads to exit a task. - -int -ACE_Thread_Manager::wait_task (ACE_Task_Base *task) -{ - int copy_count = 0; - ACE_Thread_Descriptor_Base *copy_table = 0; - - // We have to make sure that while we wait for these threads to - // exit, we do not have the lock. Therefore we make a copy of all - // interesting entries and let go of the lock. - { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - -#if !defined (VXWORKS) - ACE_NEW_RETURN (copy_table, - ACE_Thread_Descriptor_Base [this->thr_list_.size () - + this->terminated_thr_list_.size ()], - -1); -#else - ACE_NEW_RETURN (copy_table, - ACE_Thread_Descriptor_Base [this->thr_list_.size ()], - -1); -#endif /* VXWORKS */ - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - // If threads are created as THR_DETACHED or THR_DAEMON, we - // can't wait on them here. - if (iter.next ()->task_ == task && - (ACE_BIT_DISABLED (iter.next ()->flags_, - THR_DETACHED | THR_DAEMON) - || ACE_BIT_ENABLED (iter.next ()->flags_, - THR_JOINABLE))) - { - ACE_SET_BITS (iter.next ()->thr_state_, - ACE_THR_JOINING); - copy_table[copy_count++] = *iter.next (); - } - -#if !defined (VXWORKS) - for (ACE_Double_Linked_List_Iterator titer (this->terminated_thr_list_); - !titer.done (); - titer.advance ()) - // If threads are created as THR_DETACHED or THR_DAEMON, we can't help much here. - if (titer.next ()->task_ == task) - { - ACE_Thread_Descriptor_Base *tdb = - titer.advance_and_remove (0); - copy_table[copy_count++] = *tdb; - delete tdb; - } -#endif /* VXWORKS */ - } - - // Now to do the actual work - int result = 0; - - for (int i = 0; - i < copy_count && result != -1; - i++) - { - if (ACE_Thread::join (copy_table[i].thr_handle_) == -1) - result = -1; - -# if defined (ACE_HAS_PTHREADS_DRAFT4) && defined (ACE_LACKS_SETDETACH) - // Must explicitly detach threads. Threads without THR_DETACHED - // were detached in ACE_OS::thr_create (). - ::pthread_detach (©_table[i].thr_handle_); -# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */ - } - - delete [] copy_table; - - return result; -} - -// Suspend a task - -int -ACE_Thread_Manager::suspend_task (ACE_Task_Base *task) -{ - ACE_TRACE ("ACE_Thread_Manager::suspend_task"); - return this->apply_task (task, - ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::suspend_thr)); -} - -// Resume a task. -int -ACE_Thread_Manager::resume_task (ACE_Task_Base *task) -{ - ACE_TRACE ("ACE_Thread_Manager::resume_task"); - return this->apply_task (task, - ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::resume_thr)); -} - -// Kill a task. - -int -ACE_Thread_Manager::kill_task (ACE_Task_Base *task, int /* signum */) -{ - ACE_TRACE ("ACE_Thread_Manager::kill_task"); - return this->apply_task (task, - ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::kill_thr)); -} - -// Cancel a task. -int -ACE_Thread_Manager::cancel_task (ACE_Task_Base *task, - int async_cancel) -{ - ACE_TRACE ("ACE_Thread_Manager::cancel_task"); - return this->apply_task (task, - ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::cancel_thr), - async_cancel); -} - -// Locate the index in the table associated with from the -// beginning of the table up to an index. Must be called with the -// lock held. - -ACE_Thread_Descriptor * -ACE_Thread_Manager::find_task (ACE_Task_Base *task, size_t slot) -{ - ACE_TRACE ("ACE_Thread_Manager::find_task"); - - size_t i = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - { - if (i >= slot) - break; - - if (task == iter.next ()->task_) - return iter.next (); - - i++; - } - - return 0; -} - -// Returns the number of ACE_Task in a group. - -int -ACE_Thread_Manager::num_tasks_in_group (int grp_id) -{ - ACE_TRACE ("ACE_Thread_Manager::num_tasks_in_group"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - int tasks_count = 0; - size_t i = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - { - if (iter.next ()->grp_id_ == grp_id - && this->find_task (iter.next ()->task_, i) == 0 - && iter.next ()->task_ != 0) - tasks_count++; - - i++; - } - return tasks_count; -} - -// Returns the number of threads in an ACE_Task. - -int -ACE_Thread_Manager::num_threads_in_task (ACE_Task_Base *task) -{ - ACE_TRACE ("ACE_Thread_Manager::num_threads_in_task"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - int threads_count = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if (iter.next ()->task_ == task) - threads_count++; - - return threads_count; -} - -// Returns in task_list a list of ACE_Tasks registered with ACE_Thread_Manager. - -ssize_t -ACE_Thread_Manager::task_all_list (ACE_Task_Base *task_list[], - size_t n) -{ - ACE_TRACE ("ACE_Thread_Manager::task_all_list"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - size_t task_list_count = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - { - if (task_list_count >= n) - break; - - ACE_Task_Base *task_p = iter.next ()->task_; - if (0 != task_p) - { - // This thread has a task pointer; see if it's already in the - // list. Don't add duplicates. - size_t i = 0; - for (; i < task_list_count; ++i) - if (task_list[i] == task_p) - break; - if (i == task_list_count) // No match - add this one - task_list[task_list_count++] = task_p; - } - } - - return task_list_count; -} - -// Returns in thread_list a list of all thread ids - -ssize_t -ACE_Thread_Manager::thread_all_list (ACE_thread_t thread_list[], - size_t n) -{ - ACE_TRACE ("ACE_Thread_Manager::thread_all_list"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - size_t thread_count = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - { - if (thread_count >= n) - break; - - thread_list[thread_count] = iter.next ()->thr_id_; - thread_count ++; - } - - return thread_count; -} - -// Returns in task_list a list of ACE_Tasks in a group. - -ssize_t -ACE_Thread_Manager::task_list (int grp_id, - ACE_Task_Base *task_list[], - size_t n) -{ - ACE_TRACE ("ACE_Thread_Manager::task_list"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - ACE_Task_Base **task_list_iterator = task_list; - size_t task_list_count = 0; - size_t i = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - { - if (task_list_count >= n) - break; - - if (iter.next ()->grp_id_ == grp_id - && this->find_task (iter.next ()->task_, i) == 0) - { - task_list_iterator[task_list_count] = iter.next ()->task_; - task_list_count++; - } - - i++; - } - - return task_list_count; -} - -// Returns in thread_list a list of thread ids in an ACE_Task. - -ssize_t -ACE_Thread_Manager::thread_list (ACE_Task_Base *task, - ACE_thread_t thread_list[], - size_t n) -{ - ACE_TRACE ("ACE_Thread_Manager::thread_list"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - size_t thread_count = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - { - if (thread_count >= n) - break; - - if (iter.next ()->task_ == task) - { - thread_list[thread_count] = iter.next ()->thr_id_; - thread_count++; - } - } - - return thread_count; -} - -// Returns in thread_list a list of thread handles in an ACE_Task. - -ssize_t -ACE_Thread_Manager::hthread_list (ACE_Task_Base *task, - ACE_hthread_t hthread_list[], - size_t n) -{ - ACE_TRACE ("ACE_Thread_Manager::hthread_list"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - size_t hthread_count = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - { - if (hthread_count >= n) - break; - - if (iter.next ()->task_ == task) - { - hthread_list[hthread_count] = iter.next ()->thr_handle_; - hthread_count++; - } - } - - return hthread_count; -} - -ssize_t -ACE_Thread_Manager::thread_grp_list (int grp_id, - ACE_thread_t thread_list[], - size_t n) -{ - ACE_TRACE ("ACE_Thread_Manager::thread_grp_list"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - size_t thread_count = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - { - if (thread_count >= n) - break; - - if (iter.next ()->grp_id_ == grp_id) - { - thread_list[thread_count] = iter.next ()->thr_id_; - thread_count++; - } - } - - return thread_count; -} - -// Returns in thread_list a list of thread handles in an ACE_Task. - -ssize_t -ACE_Thread_Manager::hthread_grp_list (int grp_id, - ACE_hthread_t hthread_list[], - size_t n) -{ - ACE_TRACE ("ACE_Thread_Manager::hthread_grp_list"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - size_t hthread_count = 0; - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - { - if (hthread_count >= n) - break; - - if (iter.next ()->grp_id_ == grp_id) - { - hthread_list[hthread_count] = iter.next ()->thr_handle_; - hthread_count++; - } - } - - return hthread_count; -} - -int -ACE_Thread_Manager::set_grp (ACE_Task_Base *task, int grp_id) -{ - ACE_TRACE ("ACE_Thread_Manager::set_grp"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - for (ACE_Double_Linked_List_Iterator iter (this->thr_list_); - !iter.done (); - iter.advance ()) - if (iter.next ()->task_ == task) - iter.next ()->grp_id_ = grp_id; - - return 0; -} - -int -ACE_Thread_Manager::get_grp (ACE_Task_Base *task, int &grp_id) -{ - ACE_TRACE ("ACE_Thread_Manager::get_grp"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - ACE_FIND (this->find_task (task), ptr); - grp_id = ptr->grp_id_; - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -# if defined (ACE_THREAD_MANAGER_LACKS_STATICS) -template class ACE_Singleton; -# endif /* defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -template class ACE_Auto_Basic_Ptr; -# endif /* ACE_LACKS_AUTO_PTR */ -template class auto_ptr; -template class ACE_Double_Linked_List; -template class ACE_Double_Linked_List_Iterator_Base; -template class ACE_Double_Linked_List_Iterator; -template class ACE_Double_Linked_List; -template class ACE_Double_Linked_List_Iterator_Base; -template class ACE_Double_Linked_List_Iterator; -template class ACE_Node; -template class ACE_Unbounded_Queue; -template class ACE_Unbounded_Queue_Iterator; -template class ACE_Free_List; -template class ACE_Locked_Free_List; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# if defined (ACE_THREAD_MANAGER_LACKS_STATICS) -# pragma instantiate ACE_Singleton -# endif /* defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ - -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -# pragma instantiate ACE_Auto_Basic_Ptr -# endif /* ACE_LACKS_AUTO_PTR */ -# pragma instantiate auto_ptr -# pragma instantiate ACE_Double_Linked_List -# pragma instantiate ACE_Double_Linked_List_Iterator_Base -# pragma instantiate ACE_Double_Linked_List_Iterator -# pragma instantiate ACE_Double_Linked_List -# pragma instantiate ACE_Double_Linked_List_Iterator_Base -# pragma instantiate ACE_Double_Linked_List_Iterator -# pragma instantiate ACE_Node -# pragma instantiate ACE_Unbounded_Queue -# pragma instantiate ACE_Unbounded_Queue_Iterator -# pragma instantiate ACE_Free_List -# pragma instantiate ACE_Locked_Free_List -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h deleted file mode 100644 index 3b1a78a0a5d..00000000000 --- a/ace/Thread_Manager.h +++ /dev/null @@ -1,1098 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Thread_Manager.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_THREAD_MANAGER_H -#define ACE_THREAD_MANAGER_H -#include "ace/pre.h" - -#include "ace/Thread.h" -#include "ace/Thread_Adapter.h" -#include "ace/Thread_Exit.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" -#include "ace/Unbounded_Queue.h" -#include "ace/Containers.h" -#include "ace/Free_List.h" -#include "ace/Singleton.h" -#include "ace/Log_Msg.h" - -// The following macros control how a Thread Manager manages a pool of -// Thread_Descriptor. Currently, the default behavior is not to -// preallocate any thread descriptor and never (well, almost never) -// free up any thread descriptor until the Thread Manager gets -// destructed. Which means, once your system is stable, you rarely -// need to pay the price of memory allocation. On a deterministic -// system, which means, the number of threads spawned can be -// determined before hand, you can either redefine the memory pool -// size macros to suit your need or constructed the Thread_Manager -// accordingly. That way, you don't pay the price of memory -// allocation when the system is really doing its job. OTOH, on -// system with resources constraint, you may want to lower the size of -// ACE_DEFAULT_THREAD_MANAGER_HWM to avoid unused memory hanging -// around. - -#if !defined (ACE_DEFAULT_THREAD_MANAGER_PREALLOC) -# define ACE_DEFAULT_THREAD_MANAGER_PREALLOC 0 -#endif /* ACE_DEFAULT_THREAD_MANAGER_PREALLOC */ - -#if !defined (ACE_DEFAULT_THREAD_MANAGER_LWM) -# define ACE_DEFAULT_THREAD_MANAGER_LWM 1 -#endif /* ACE_DEFAULT_THREAD_MANAGER_LWM */ - -#if !defined (ACE_DEFAULT_THREAD_MANAGER_INC) -# define ACE_DEFAULT_THREAD_MANAGER_INC 1 -#endif /* ACE_DEFAULT_THREAD_MANAGER_INC */ - -#if !defined (ACE_DEFAULT_THREAD_MANAGER_HWM) -# define ACE_DEFAULT_THREAD_MANAGER_HWM ACE_DEFAULT_FREE_LIST_HWM -// this is a big number -#endif /* ACE_DEFAULT_THREAD_MANAGER_HWM */ - -// This is the synchronization mechanism used to prevent a thread -// descriptor gets removed from the Thread_Manager before it gets -// stash into it. If you want to disable this feature (and risk of -// corrupting the freelist,) you define the lock as ACE_Null_Mutex. -// Usually, if you can be sure that your threads will run for an -// extended period of time, you can safely disable the lock. - -#if !defined (ACE_DEFAULT_THREAD_MANAGER_LOCK) -# define ACE_DEFAULT_THREAD_MANAGER_LOCK ACE_SYNCH_MUTEX -#endif /* ACE_DEFAULT_THREAD_MANAGER_LOCK */ - -// Forward declarations. -class ACE_Task_Base; -class ACE_Thread_Manager; -class ACE_Thread_Descriptor; - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - /** - * @class ACE_At_Thread_Exit - * - * @brief Contains a method to be applied when a thread is terminated. - */ -class ACE_Export ACE_At_Thread_Exit -{ - friend class ACE_Thread_Descriptor; - friend class ACE_Thread_Manager; -public: - /// Default constructor - ACE_At_Thread_Exit (void); - - /// The destructor - virtual ~ACE_At_Thread_Exit (void); - - /// has the ownership? - int is_owner (void) const; - - /// Set the ownership of the . - int is_owner (int owner); - - /// This was applied? - int was_applied (void) const; - - /// Set applied state of . - int was_applied (int applied); - -protected: - /// The next hook in the list. - ACE_At_Thread_Exit *next_; - - /// Do the apply if necessary - void do_apply (void); - - /// The apply method. - virtual void apply (void) = 0; - - /// The Thread_Descriptor where this at is registered. - ACE_Thread_Descriptor* td_; - - /// The at was applied? - int was_applied_; - - /// The at has the ownership of this? - int is_owner_; -}; - -class ACE_Export ACE_At_Thread_Exit_Func : public ACE_At_Thread_Exit -{ -public: - /// Constructor - ACE_At_Thread_Exit_Func (void *object, - ACE_CLEANUP_FUNC func, - void *param = 0); - - virtual ~ACE_At_Thread_Exit_Func (void); - -protected: - /// The object to be cleanup - void *object_; - - /// The cleanup func - ACE_CLEANUP_FUNC func_; - - /// A param if required - void *param_; - - /// The apply method - void apply (void); -}; - -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - -/** - * @class ACE_Thread_Descriptor_Base - * - * @brief Basic information for thread descriptors. These information - * gets extracted out because we need it after a thread is - * terminated. - */ -class ACE_Export ACE_Thread_Descriptor_Base : public ACE_OS_Thread_Descriptor -{ - - friend class ACE_Thread_Manager; - friend class ACE_Double_Linked_List; - friend class ACE_Double_Linked_List_Iterator_Base; - friend class ACE_Double_Linked_List_Iterator; - friend class ACE_Double_Linked_List; - friend class ACE_Double_Linked_List_Iterator_Base; - friend class ACE_Double_Linked_List_Iterator; -public: - ACE_Thread_Descriptor_Base (void); - ~ACE_Thread_Descriptor_Base (void); - - // = We need the following operators to make Borland happy. - - /// Equality operator. - int operator== (const ACE_Thread_Descriptor_Base &rhs) const; - - /// Inequality operator. - int operator!= (const ACE_Thread_Descriptor_Base &rhs) const; - - /// Group ID. - int grp_id (void) const; - - /// Current state of the thread. - ACE_UINT32 state (void) const; - - /// Return the pointer to an or NULL if there's no - /// associated with this thread.; - ACE_Task_Base *task (void) const; - -protected: - /// Reset this base thread descriptor. - void reset (void); - - /// Unique thread ID. - ACE_thread_t thr_id_; - - /// Unique handle to thread (used by Win32 and AIX). - ACE_hthread_t thr_handle_; - - /// Group ID. - int grp_id_; - - /// Current state of the thread. - ACE_UINT32 thr_state_; - - /// Pointer to an or NULL if there's no - /// . - ACE_Task_Base *task_; - - /// We need these pointers to maintain the double-linked list in a - /// thread managers. - ACE_Thread_Descriptor_Base *next_; - ACE_Thread_Descriptor_Base *prev_; -}; - -/** - * @class ACE_Thread_Descriptor - * - * @brief Information for controlling threads that run under the control - * of the . - */ -class ACE_Export ACE_Thread_Descriptor : public ACE_Thread_Descriptor_Base -{ -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - friend class ACE_At_Thread_Exit; -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - friend class ACE_Thread_Manager; - friend class ACE_Double_Linked_List; - friend class ACE_Double_Linked_List_Iterator; -public: - // = Initialization method. - ACE_Thread_Descriptor (void); - - // = Accessor methods. - /// Unique thread id. - ACE_thread_t self (void) const; - - /// Unique handle to thread (used by Win32 and AIX). - void self (ACE_hthread_t &); - - /// Dump the state of an object. - void dump (void) const; - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - /** - * This cleanup function must be called only for ACE_TSS_cleanup. - * The ACE_TSS_cleanup delegate Log_Msg instance destruction when - * Log_Msg cleanup is called before terminate. - */ - void log_msg_cleanup(ACE_Log_Msg* log_msg); - - /** - * Register an At_Thread_Exit hook and the ownership is acquire by - * Thread_Descriptor, this is the usual case when the AT is dynamically - * allocated. - */ - int at_exit (ACE_At_Thread_Exit* cleanup); - - /// Register an At_Thread_Exit hook and the ownership is retained for the - /// caller. Normally used when the at_exit hook is created in stack. - int at_exit (ACE_At_Thread_Exit& cleanup); -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - - /** - * Register an object (or array) for cleanup at thread termination. - * "cleanup_hook" points to a (global, or static member) function - * that is called for the object or array when it to be destroyed. - * It may perform any necessary cleanup specific for that object or - * its class. "param" is passed as the second parameter to the - * "cleanup_hook" function; the first parameter is the object (or - * array) to be destroyed. Returns 0 on success, non-zero on - * failure: -1 if virtual memory is exhausted or 1 if the object (or - * arrayt) had already been registered. - */ - int at_exit (void *object, - ACE_CLEANUP_FUNC cleanup_hook, - void *param); - - /// Do nothing destructor to keep some compilers happy - ~ACE_Thread_Descriptor (void); - - /** - * Do nothing but to acquire the thread descriptor's lock and - * release. This will first check if the thread is registered or - * not. If it is already registered, there's no need to reacquire - * the lock again. This is used mainly to get newly spawned thread - * in synch with thread manager and prevent it from accessing its - * thread descriptor before it gets fully built. This function is - * only called from ACE_Log_Msg::thr_desc. - */ - void acquire_release (void); - - /** - * Set/get the pointer. These are required by the - * ACE_Free_List. ACE_INLINE is specified here because one version - * of g++ couldn't grok this code without it. - */ - ACE_INLINE_FOR_GNUC void set_next (ACE_Thread_Descriptor *td); - ACE_INLINE_FOR_GNUC ACE_Thread_Descriptor *get_next (void) const; - -private: - /// Reset this thread descriptor. - void reset (ACE_Thread_Manager *tm); - -#if !defined (ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - /// Pop an At_Thread_Exit from at thread termination list, apply the at - /// if apply is true. - void at_pop (int apply = 1); - - /// Push an At_Thread_Exit to at thread termination list and set the - /// ownership of at. - void at_push (ACE_At_Thread_Exit* cleanup, - int is_owner = 0); - - /// Run the AT_Thread_Exit hooks. - void do_at_exit (void); - - /// terminate realize the cleanup process to thread termination - void terminate (void); - - /// Thread_Descriptor is the ownership of ACE_Log_Msg if log_msg_!=0 - /// This can occur because ACE_TSS_cleanup was executed before terminate. - ACE_Log_Msg *log_msg_; - - /// The AT_Thread_Exit list - ACE_At_Thread_Exit *at_exit_list_; -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - - /** - * Stores the cleanup info for a thread. - * @@ Note, this should be generalized to be a stack of - * s. - */ - ACE_Cleanup_Info cleanup_info_; - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - /// Pointer to an or NULL if there's no - /// . - ACE_Thread_Manager* tm_; -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - - /// Registration lock to prevent premature removal of thread descriptor. - ACE_DEFAULT_THREAD_MANAGER_LOCK *sync_; - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - /// Keep track of termination status. - int terminated_; -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ -}; - -// Forward declaration. -class ACE_Thread_Control; - -// This typedef should be (and used to be) inside the -// ACE_Thread_Manager declaration. But, it caused compilation -// problems on g++/VxWorks/i960 with -g. Note that -// ACE_Thread_Manager::THR_FUNC is only used internally in -// ACE_Thread_Manager, so it's not useful for anyone else. -// It also caused problems on IRIX5 with g++. -#if defined (__GNUG__) -typedef int (ACE_Thread_Manager::*ACE_THR_MEMBER_FUNC)(ACE_Thread_Descriptor *, int); -#endif /* __GNUG__ */ - -/** - * @class ACE_Thread_Manager - * - * @brief Manages a pool of threads. - * - * This class allows operations on groups of threads atomically. - * The default behavior of thread manager is to wait on - * all threads under it's management when it gets destructed. - * Therefore, remember to remove a thread from thread manager if - * you don't want it to wait for the thread. There are also - * function to disable this default wait-on-exit behavior. - * However, if your program depends on turning this off to run - * correctly, you are probably doing something wrong. Rule of - * thumb, use ACE_Thread to manage your daemon threads. - * Notice that if there're threads live beyond the scope of - *
    , you are sure to have resource leaks in your program. - * Remember to wait on threads before exiting
    if that - * could happen in your programs. - */ -class ACE_Export ACE_Thread_Manager -{ -public: - friend class ACE_Thread_Control; - - // Allow ACE_THread_Exit to register the global TSS instance object. - friend class ACE_Thread_Exit; -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - friend class ACE_Thread_Descriptor; -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - -#if !defined (__GNUG__) - typedef int (ACE_Thread_Manager::*ACE_THR_MEMBER_FUNC)(ACE_Thread_Descriptor *, int); -#endif /* !__GNUG__ */ - - // These are the various states a thread managed by the - // can be in. - enum - { - /// Uninitialized. - ACE_THR_IDLE = 0x00000000, - - /// Created but not yet running. - ACE_THR_SPAWNED = 0x00000001, - - /// Thread is active (naturally, we don't know if it's actually - /// *running* because we aren't the scheduler...). - ACE_THR_RUNNING = 0x00000002, - - /// Thread is suspended. - ACE_THR_SUSPENDED = 0x00000004, - - /// Thread has been cancelled (which is an indiction that it needs to - /// terminate...). - ACE_THR_CANCELLED = 0x00000008, - - /// Thread has shutdown, but the slot in the thread manager hasn't - /// been reclaimed yet. - ACE_THR_TERMINATED = 0x00000010, - - /// Join operation has been invoked on the thread by thread manager. - ACE_THR_JOINING = 0x10000000 - }; - - // = Initialization and termination methods. - /** - * @brief Initialization and termination methods. - * - * Internally, ACE_Thread_Manager keeps a freelist for caching - * resources it uses to keep track of managed threads (not the - * threads themselves.) @a prealloc, @a lwm, @a inc, @hwm - * determine the initial size, the low water mark, increment step, - * and high water mark of the freelist. - * - * @sa ACE_Free_List - */ - ACE_Thread_Manager (size_t preaolloc = ACE_DEFAULT_THREAD_MANAGER_PREALLOC, - size_t lwm = ACE_DEFAULT_THREAD_MANAGER_LWM, - size_t inc = ACE_DEFAULT_THREAD_MANAGER_INC, - size_t hwm = ACE_DEFAULT_THREAD_MANAGER_HWM); - virtual ~ACE_Thread_Manager (void); - -#if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) - /// Get pointer to a process-wide . - static ACE_Thread_Manager *instance (void); - - /// Set pointer to a process-wide and return - /// existing pointer. - static ACE_Thread_Manager *instance (ACE_Thread_Manager *); - - /// Delete the dynamically allocated Singleton - static void close_singleton (void); -#endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ - - /// No-op. Currently unused. - int open (size_t size = 0); - - /** - * Release all resources. - * By default, this method will wait till all threads - * exit. However, when called from , most global resources - * are destroyed and thus, we don't try to wait but just clean up the thread - * descriptor list. - */ - int close (void); - - // The * argument to each of the family member - // functions is interpreted and used as shown in the following - // table. NOTE: the final option, to provide task names, is _only_ - // supported on VxWorks! - // - // Value of ACE_thread_t * argument Use Platforms - // ================================ ========================== ========= - // 0 Not used. All - // non-0 (and points to 0 char * The task name is passed All - // on VxWorks) back in the char *. - // non-0, points to non-0 char * The char * is used as VxWorks only - // the task name. The - // argument is not modified. - - /** - * Create a new thread, which executes . - * Returns: on success a unique group id that can be used to control - * other threads added to the same group. On failure, returns -1. - */ - int spawn (ACE_THR_FUNC func, - void *args = 0, - long flags = THR_NEW_LWP | THR_JOINABLE, - ACE_thread_t * = 0, - ACE_hthread_t *t_handle = 0, - long priority = ACE_DEFAULT_THREAD_PRIORITY, - int grp_id = -1, - void *stack = 0, - size_t stack_size = 0); - - /** - * Spawn N new threads, which execute with argument . - * If != 0 the thread_ids of successfully spawned - * threads will be placed into the buffer (which must - * be the same size as ). If != 0 it is assumed to be an - * array of pointers to the base of the stacks to use for the - * threads being spawned. If != 0 it is assumed to be - * an array of values indicating how big each of the - * corresponding s are. If != 0 it is - * assumed to be an array of thread_handles that will be - * assigned the values of the thread handles being spawned. - * - * Threads in Thread_Manager can be manipulated in groups based on - * or using functions such as kill_grp() or - * cancel_task(). - * - * If is assigned, the newly spawned threads are added into - * the group. Otherwise, the Thread_Manager assigns these - * threads with a grp_id. You should choose either assigning - * everytime, or let the Thread_Manager handles it for - * you consistently. - * - * The argument is usually assigned by - * . It associates the newly spawned - * threads with an ACE_Task instance, which defaults to . - * - * @retval -1 on failure ( will explain...), otherwise returns the - * group id of the threads. - */ - int spawn_n (size_t n, - ACE_THR_FUNC func, - void *args = 0, - long flags = THR_NEW_LWP | THR_JOINABLE, - long priority = ACE_DEFAULT_THREAD_PRIORITY, - int grp_id = -1, - ACE_Task_Base *task = 0, - ACE_hthread_t thread_handles[] = 0, - void *stack[] = 0, - size_t stack_size[] = 0); - - /** - * Spawn N new threads, which execute with argument . - * If != 0 the thread_ids of successfully spawned - * threads will be placed into the buffer (which must - * be the same size as ). If != 0 it is assumed to be an - * array of pointers to the base of the stacks to use for the - * threads being spawned. If != 0 it is assumed to be - * an array of values indicating how big each of the - * corresponding s are. If != 0 it is - * assumed to be an array of thread_handles that will be - * assigned the values of the thread handles being spawned. - * - * Threads in Thread_Manager can be manipulated in groups based on - * or using functions such as kill_grp() or - * cancel_task(). - * - * If is assigned, the newly spawned threads are added into - * the group. Otherwise, the Thread_Manager assigns these - * threads with a grp_id. You should choose either assigning - * everytime, or let the Thread_Manager handles it for - * you consistently. - * - * The argument is usually assigned by - * . It associates the newly spawned - * threads with an ACE_Task instance, which defaults to . - * - * @retval -1 on failure ( will explain...), otherwise returns the - * group id of the threads. - */ - int spawn_n (ACE_thread_t thread_ids[], - size_t n, - ACE_THR_FUNC func, - void *args, - long flags, - long priority = ACE_DEFAULT_THREAD_PRIORITY, - int grp_id = -1, - void *stack[] = 0, - size_t stack_size[] = 0, - ACE_hthread_t thread_handles[] = 0, - ACE_Task_Base *task = 0); - - /** - * Called to clean up when a thread exits. - * - * @param do_thread_exit If non-0 then ACE_Thread::exit is called to - * exit the thread - * @param status If ACE_Thread_Exit is called, this is passed as - * the exit value of the thread. - * Should _not_ be called by main thread. - */ - ACE_THR_FUNC_RETURN exit (ACE_THR_FUNC_RETURN status = 0, - int do_thread_exit = 1); - - /** - * Block until there are no more threads running in the - * or expires. Note that is - * treated as "absolute" time. Returns 0 on success and -1 on - * failure. If is set, wait will first - * check thru its thread list for threads with THR_DETACHED or - * THR_DAEMON flags set and remove these threads. Notice that - * unlike other wait_* function, by default, does wait on - * all thread spawned by this thread_manager no matter the detached - * flags are set or not unless it is called with - * flag set. - * NOTE that if this function is called while the ACE_Object_Manager - * is shutting down (as a result of program rundown via ACE::fini), - * it will not wait for any threads to complete. If you must wait for - * threads spawned by this thread manager to complete and you are in a - * ACE rundown situation (such as your object is being destroyed by the - * ACE_Object_Manager) you can use wait_grp instead. - */ - int wait (const ACE_Time_Value *timeout = 0, - int abandon_detached_threads = 0); - - /// Join a thread specified by . Do not wait on a detached thread. - int join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status = 0); - - /** - * Block until there are no more threads running in a group. - * Returns 0 on success and -1 on failure. Notice that wait_grp - * will not wait on detached threads. - */ - int wait_grp (int grp_id); - - /** - * Return the "real" handle to the calling thread, caching it if - * necessary in TSS to speed up subsequent lookups. This is - * necessary since on some platforms (e.g., Win32) we can't get this - * handle via direct method calls. Notice that you should *not* - * close the handle passed back from this method. It is used - * internally by Thread Manager. On the other hand, you *have to* - * use this internal thread handle when working on Thread_Manager. - * Return -1 if fail. - */ - int thr_self (ACE_hthread_t &); - - /** - * Return the unique ID of the thread. This is not strictly - * necessary (because a thread can always just call - * ). However, we put it here to be complete. - */ - ACE_thread_t thr_self (void); - - /** - * Returns a pointer to the current we're executing - * in if this thread is indeed running in an , else - * return 0. - */ - ACE_Task_Base *task (void); - - // = Suspend methods, which isn't supported on POSIX pthreads (will not block). - /// Suspend all threads - int suspend_all (void); - - /// Suspend a single thread. - int suspend (ACE_thread_t); - - /// Suspend a group of threads. - int suspend_grp (int grp_id); - - /** - * True if is inactive (i.e., suspended), else false. Always - * return false if is not managed by the Thread_Manager. - */ - int testsuspend (ACE_thread_t t_id); - - // = Resume methods, which isn't supported on POSIX pthreads (will not block). - /// Resume all stopped threads - int resume_all (void); - - /// Resume a single thread. - int resume (ACE_thread_t); - - /// Resume a group of threads. - int resume_grp (int grp_id); - - /** - * True if is active (i.e., resumed), else false. Always - * return false if is not managed by the Thread_Manager. - */ - int testresume (ACE_thread_t t_id); - - // = Send signals to one or more threads without blocking. - /** - * Send to all stopped threads. Not supported on platforms - * that do not have advanced signal support, such as Win32. - * Send the to a single thread. Not supported on platforms - * that do not have advanced signal support, such as Win32. - * Send to a group of threads, not supported on platforms - * that do not have advanced signal support, such as Win32. - */ - int kill_all (int signum); - int kill (ACE_thread_t, - int signum); - int kill_grp (int grp_id, - int signum); - - // = Cancel methods, which provides a cooperative thread-termination mechanism (will not block). - /** - * Cancel's all the threads. - */ - int cancel_all (int async_cancel = 0); - - /** - * Cancel a single thread. - */ - int cancel (ACE_thread_t, int async_cancel = 0); - - /** - * Cancel a group of threads. - */ - int cancel_grp (int grp_id, int async_cancel = 0); - - /** - * True if is cancelled, else false. Always return false if - * is not managed by the Thread_Manager. - */ - int testcancel (ACE_thread_t t_id); - - /// Set group ids for a particular thread id. - int set_grp (ACE_thread_t, - int grp_id); - - /// Get group ids for a particular thread id. - int get_grp (ACE_thread_t, - int &grp_id); - - // = The following methods are new methods which resemble current - // methods in . For example, the - // method resembles the method, and - // resembles . - - // = Operations on ACE_Tasks. - - /** - * Block until there are no more threads running in a specified task. - * This method will not wait for either detached or daemon threads; - * the threads must have been spawned with the @c THR_JOINABLE flag. - * Upon successful completion, the threads have been joined, so further - * attempts to join with any of the waited-for threads will fail. - * - * @param task The ACE_Task_Base object whose threads are to waited for. - * - * @retval 0 Success. - * @retval -1 Failure (consult errno for further information). - */ - int wait_task (ACE_Task_Base *task); - - /** - * Suspend all threads in an ACE_Task. - */ - int suspend_task (ACE_Task_Base *task); - - /** - * Resume all threads in an ACE_Task. - */ - int resume_task (ACE_Task_Base *task); - - /** - * Send a signal to all threads in an . - */ - int kill_task (ACE_Task_Base *task, - int signum); - - /** - * Cancel all threads in an . If is non-0, - * then asynchronously cancel these threads if the OS platform - * supports cancellation. Otherwise, perform a "cooperative" - * cancellation. - */ - int cancel_task (ACE_Task_Base *task, int async_cancel = 0); - - // = Collect thread handles in the thread manager. Notice that - // the collected information is just a snapshot. - /// Check if the thread is managed by the thread manager. Return true if - /// the thread is found, false otherwise. - int hthread_within (ACE_hthread_t handle); - int thread_within (ACE_thread_t tid); - - /// Returns the number of in a group. - int num_tasks_in_group (int grp_id); - - /// Returns the number of threads in an . - int num_threads_in_task (ACE_Task_Base *task); - - /** - * Returns in a list of up to in a - * group. The caller must allocate the memory for . In - * case of an error, -1 is returned. If no requested values are - * found, 0 is returned, otherwise correct number of retrieved - * values are returned. - */ - ssize_t task_list (int grp_id, - ACE_Task_Base *task_list[], - size_t n); - - /** - * Returns in a list of up to thread ids in an - * . The caller must allocate the memory for - * . In case of an error, -1 is returned. If no - * requested values are found, 0 is returned, otherwise correct - * number of retrieved values are returned. - */ - ssize_t thread_list (ACE_Task_Base *task, - ACE_thread_t thread_list[], - size_t n); - - /** - * Returns in a list of up to thread handles in - * an . The caller must allocate memory for - * . In case of an error, -1 is returned. If no - * requested values are found, 0 is returned, otherwise correct - * number of retrieved values are returned. - */ - ssize_t hthread_list (ACE_Task_Base *task, - ACE_hthread_t hthread_list[], - size_t n); - - /** - * Returns in a list of up to thread ids in a - * group . The caller must allocate the memory for - * . In case of an error, -1 is returned. If no - * requested values are found, 0 is returned, otherwise correct - * number of retrieved values are returned. - */ - ssize_t thread_grp_list (int grp_id, - ACE_thread_t thread_list[], - size_t n); - - /** - * Returns in a list of up to thread handles in - * a group . The caller must allocate memory for - * . - */ - ssize_t hthread_grp_list (int grp_id, - ACE_hthread_t hthread_list[], - size_t n); - - /** - * Returns in a list of up to . The - * caller must allocate the memory for . In case of an - * error, -1 is returned. If no requested values are found, 0 is - * returned, otherwise correct number of retrieved values are - * returned. - */ - ssize_t task_all_list (ACE_Task_Base *task_list[], - size_t n); - - /** - * Returns in a list of up to thread ids. The - * caller must allocate the memory for . In case of an - * error, -1 is returned. If no requested values are found, 0 is - * returned, otherwise correct number of retrieved values are - * returned. - */ - ssize_t thread_all_list (ACE_thread_t thread_list[], - size_t n); - - /// Set group ids for a particular task. - int set_grp (ACE_Task_Base *task, int grp_id); - - /// Get group ids for a particular task. - int get_grp (ACE_Task_Base *task, int &grp_id); - - /// Return a count of the current number of threads active in the - /// . - size_t count_threads (void) const; - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - /** - * Register an At_Thread_Exit hook and the ownership is acquire by - * Thread_Descriptor, this is the usual case when the AT is dynamically - * allocated. - */ - int at_exit (ACE_At_Thread_Exit* cleanup); - - /// Register an At_Thread_Exit hook and the ownership is retained for the - /// caller. Normally used when the at_exit hook is created in stack. - int at_exit (ACE_At_Thread_Exit& cleanup); -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - - /** - * - ***** - * @deprecated This function is deprecated. Please use the previous two - * at_exit method. Notice that you should avoid mixing this method - * with the previous two at_exit methods. - ***** - * - * Register an object (or array) for cleanup at - * thread termination. "cleanup_hook" points to a (global, or - * static member) function that is called for the object or array - * when it to be destroyed. It may perform any necessary cleanup - * specific for that object or its class. "param" is passed as the - * second parameter to the "cleanup_hook" function; the first - * parameter is the object (or array) to be destroyed. - * "cleanup_hook", for example, may delete the object (or array). - * If == 0, the will _NOT_ get cleanup at - * thread exit. You can use this to cancel the previously added - * at_exit. - */ - int at_exit (void *object, - ACE_CLEANUP_FUNC cleanup_hook, - void *param); - - /// Access function to determine whether the Thread_Manager will - /// wait for its thread to exit or not when being closing down. - void wait_on_exit (int dowait); - int wait_on_exit (void); - - /// Dump the state of an object. - void dump (void); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - // = Accessors for ACE_Thread_Descriptors. - /** - * Get a pointer to the calling thread's own thread_descriptor. - * This must be called from a spawn thread. This function will - * fetch the info from TSS. - */ - ACE_Thread_Descriptor *thread_desc_self (void); - - /// Return a pointer to the thread's Thread_Descriptor, - /// 0 if fail. - ACE_Thread_Descriptor *thread_descriptor (ACE_thread_t); - - /// Return a pointer to the thread's Thread_Descriptor, - /// 0 if fail. - ACE_Thread_Descriptor *hthread_descriptor (ACE_hthread_t); - - /// Create a new thread (must be called with locks held). - virtual int spawn_i (ACE_THR_FUNC func, - void *args, - long flags, - ACE_thread_t * = 0, - ACE_hthread_t *t_handle = 0, - long priority = ACE_DEFAULT_THREAD_PRIORITY, - int grp_id = -1, - void *stack = 0, - size_t stack_size = 0, - ACE_Task_Base *task = 0); - - /// Run the registered hooks when the thread exits. - void run_thread_exit_hooks (int i); - - /// Locate the index of the table slot occupied by . Returns - /// -1 if is not in the table doesn't contain . - ACE_Thread_Descriptor *find_thread (ACE_thread_t t_id); - - /// Locate the index of the table slot occupied by . Returns - /// -1 if is not in the table doesn't contain . - ACE_Thread_Descriptor *find_hthread (ACE_hthread_t h_id); - - /** - * Locate the thread descriptor address of the list occupied by - * . Returns 0 if is not in the table doesn't contain - * . - */ - ACE_Thread_Descriptor *find_task (ACE_Task_Base *task, - size_t slot = 0); - - /// Insert a thread in the table (checks for duplicates). - int insert_thr (ACE_thread_t t_id, - ACE_hthread_t, - int grp_id = -1, - long flags = 0); - - /// Append a thread in the table (adds at the end, growing the table - /// if necessary). - int append_thr (ACE_thread_t t_id, ACE_hthread_t, - ACE_UINT32, - int grp_id, - ACE_Task_Base *task = 0, - long flags = 0, - ACE_Thread_Descriptor *td = 0); - - /// Remove thread from the table. - void remove_thr (ACE_Thread_Descriptor *td, - int close_handler); - - /// Remove all threads from the table. - void remove_thr_all (void); - - // = The following four methods implement a simple scheme for - // operating on a collection of threads atomically. - - /** - * Efficiently check whether is in a particular . - * This call updates the TSS cache if possible to speed up - * subsequent searches. - */ - int check_state (ACE_UINT32 state, - ACE_thread_t thread, - int enable = 1); - - /// Apply to all members of the table that match the - int apply_task (ACE_Task_Base *task, - ACE_THR_MEMBER_FUNC, - int = 0); - - /// Apply to all members of the table that match the . - int apply_grp (int grp_id, - ACE_THR_MEMBER_FUNC func, - int arg = 0); - - /// Apply to all members of the table. - int apply_all (ACE_THR_MEMBER_FUNC, - int = 0); - - /// Join the thread described in . - int join_thr (ACE_Thread_Descriptor *td, - int = 0); - - /// Resume the thread described in . - int resume_thr (ACE_Thread_Descriptor *td, - int = 0); - - /// Suspend the thread described in . - int suspend_thr (ACE_Thread_Descriptor *td, - int = 0); - - /// Send signal to the thread described in . - int kill_thr (ACE_Thread_Descriptor *td, - int signum); - - /// Set the cancellation flag for the thread described in . - int cancel_thr (ACE_Thread_Descriptor *td, - int async_cancel = 0); - - /// Register a thread as terminated and put it into the . - int register_as_terminated (ACE_Thread_Descriptor *td); - - /// Setting the static ACE_TSS_TYPE (ACE_Thread_Exit) *thr_exit_ pointer. - static int set_thr_exit (ACE_TSS_TYPE (ACE_Thread_Exit) *ptr); - - /** - * Keeping a list of thread descriptors within the thread manager. - * Double-linked list enables us to cache the entries in TSS - * and adding/removing thread descriptor entries without - * affecting other thread's descriptor entries. - */ - ACE_Double_Linked_List thr_list_; - -#if !defined (VXWORKS) - /// Collect terminated but not yet joined thread entries. - ACE_Double_Linked_List terminated_thr_list_; -#endif /* VXWORKS */ - - /// Collect pointers to thread descriptors of threads to be removed later. - ACE_Unbounded_Queue thr_to_be_removed_; - - /// Keeps track of the next group id to assign. - int grp_id_; - - /// Set if we want the Thread_Manager to wait on all threads before - /// being closed, reset otherwise. - int automatic_wait_; - - // = ACE_Thread_Mutex and condition variable for synchronizing termination. -#if defined (ACE_HAS_THREADS) - /// Serialize access to the . - ACE_Thread_Mutex lock_; - - /// Keep track of when there are no more threads. - ACE_Condition_Thread_Mutex zero_cond_; -#endif /* ACE_HAS_THREADS */ - -private: - ACE_Locked_Free_List thread_desc_freelist_; - -#if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) - /// Pointer to a process-wide . - static ACE_Thread_Manager *thr_mgr_; - - /// Must delete the if non-0. - static int delete_thr_mgr_; - - /// Global ACE_TSS (ACE_Thread_Exit) object ptr. - static ACE_TSS_TYPE (ACE_Thread_Exit) *thr_exit_; -#endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ -}; - -#if defined (ACE_THREAD_MANAGER_LACKS_STATICS) -#define ACE_THREAD_MANAGER_SINGLETON_DEFINE \ - ACE_Singleton; -typedef ACE_Singleton ACE_THREAD_MANAGER_SINGLETON; -#endif /* defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ - -#if defined (__ACE_INLINE__) -#include "ace/Thread_Manager.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_THREAD_MANAGER_H */ diff --git a/ace/Thread_Manager.i b/ace/Thread_Manager.i deleted file mode 100644 index 4a49398eaab..00000000000 --- a/ace/Thread_Manager.i +++ /dev/null @@ -1,334 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Thread_Manager.i - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) -ACE_INLINE -ACE_At_Thread_Exit::ACE_At_Thread_Exit (void) - : next_ (0), - td_ (0), - was_applied_ (0), - is_owner_ (1) -{ -} - -ACE_INLINE int -ACE_At_Thread_Exit::was_applied() const - -{ - return was_applied_; -} - -ACE_INLINE int -ACE_At_Thread_Exit::was_applied (int applied) -{ - was_applied_ = applied; - if (was_applied_) - td_ = 0; - return was_applied_; -} - -ACE_INLINE int -ACE_At_Thread_Exit::is_owner() const -{ - return is_owner_; -} - -ACE_INLINE int -ACE_At_Thread_Exit::is_owner (int owner) -{ - is_owner_ = owner; - return is_owner_; -} - -ACE_INLINE void -ACE_At_Thread_Exit::do_apply (void) -{ - if (!this->was_applied_ && this->is_owner_) - td_->at_pop(); -} - -ACE_INLINE -ACE_At_Thread_Exit::~ACE_At_Thread_Exit (void) -{ - this->do_apply (); -} - -ACE_INLINE -ACE_At_Thread_Exit_Func::ACE_At_Thread_Exit_Func (void *object, - ACE_CLEANUP_FUNC func, - void *param) - : object_(object), - func_(func), - param_(param) -{ -} - -ACE_INLINE -ACE_At_Thread_Exit_Func::~ACE_At_Thread_Exit_Func (void) -{ - this->do_apply (); -} - -ACE_INLINE void -ACE_At_Thread_Exit_Func::apply () -{ - func_ (object_, param_); -} -#endif /* ! ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - -ACE_INLINE -ACE_Thread_Descriptor_Base::ACE_Thread_Descriptor_Base (void) - : ACE_OS_Thread_Descriptor (), - thr_id_ (ACE_OS::NULL_thread), - thr_handle_ (ACE_OS::NULL_hthread), - grp_id_ (0), - thr_state_ (ACE_Thread_Manager::ACE_THR_IDLE), - task_ (0), - next_ (0), - prev_ (0) -{ -} - -ACE_INLINE -ACE_Thread_Descriptor_Base::~ACE_Thread_Descriptor_Base (void) -{ -} - -ACE_INLINE int -ACE_Thread_Descriptor_Base::operator==(const ACE_Thread_Descriptor_Base &rhs) const -{ - return ACE_OS::thr_cmp (this->thr_handle_, rhs.thr_handle_) == 0 - && ACE_OS::thr_equal (this->thr_id_, rhs.thr_id_) == 0; -} - -ACE_INLINE int -ACE_Thread_Descriptor_Base::operator!=(const ACE_Thread_Descriptor_Base &rhs) const -{ - return !(*this == rhs); -} - -ACE_INLINE ACE_Task_Base * -ACE_Thread_Descriptor_Base::task (void) const -{ - ACE_TRACE ("ACE_Thread_Descriptor_Base::task"); - return this->task_; -} - -// Group ID. - -ACE_INLINE int -ACE_Thread_Descriptor_Base::grp_id (void) const -{ - ACE_TRACE ("ACE_Thread_Descriptor_Base::grp_id"); - return grp_id_; -} - -// Current state of the thread. -ACE_INLINE ACE_UINT32 -ACE_Thread_Descriptor_Base::state (void) const -{ - ACE_TRACE ("ACE_Thread_Descriptor_Base::state"); - return thr_state_; -} - -// Reset this base descriptor. -ACE_INLINE void -ACE_Thread_Descriptor_Base::reset (void) -{ - ACE_TRACE ("ACE_Thread_Descriptor_Base::reset"); - this->thr_id_ = ACE_OS::NULL_thread; - this->thr_handle_ = ACE_OS::NULL_hthread; - this->grp_id_ = 0; - this->thr_state_ = ACE_Thread_Manager::ACE_THR_IDLE; - this->task_ = 0; - this->flags_ = 0; -} - -// Unique thread id. -ACE_INLINE ACE_thread_t -ACE_Thread_Descriptor::self (void) const -{ - ACE_TRACE ("ACE_Thread_Descriptor::self"); - return this->thr_id_; -} - -// Unique kernel-level thread handle. - -ACE_INLINE void -ACE_Thread_Descriptor::self (ACE_hthread_t &handle) -{ - ACE_TRACE ("ACE_Thread_Descriptor::self"); - handle = this->thr_handle_; -} - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) -ACE_INLINE void -ACE_Thread_Descriptor::log_msg_cleanup (ACE_Log_Msg* log_msg) - -{ - log_msg_ = log_msg; -} -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - -// Set the pointer -ACE_INLINE void -ACE_Thread_Descriptor::set_next (ACE_Thread_Descriptor *td) -{ - ACE_TRACE ("ACE_Thread_Descriptor::set_next"); - this->next_ = td; -} - -// Get the pointer -ACE_INLINE ACE_Thread_Descriptor * -ACE_Thread_Descriptor::get_next (void) const -{ - ACE_TRACE ("ACE_Thread_Descriptor::get_next"); - return ACE_static_cast (ACE_Thread_Descriptor * ACE_CAST_CONST, - this->next_); -} - -// Reset this thread descriptor -ACE_INLINE void -ACE_Thread_Descriptor::reset (ACE_Thread_Manager *tm) -{ - ACE_TRACE ("ACE_Thread_Descriptor::reset"); - this->ACE_Thread_Descriptor_Base::reset (); -#if defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) - this->cleanup_info_.cleanup_hook_ = 0; - this->cleanup_info_.object_ = 0; - this->cleanup_info_.param_ = 0; -#else /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - this->at_exit_list_ = 0; - // Start the at_exit hook list. - this->tm_ = tm; - // Setup the Thread_Manager. - this->log_msg_ = 0; - this->terminated_ = 0; -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ -} - -ACE_INLINE ACE_Thread_Descriptor * -ACE_Thread_Manager::thread_desc_self (void) -{ - // This method must be called with lock held. - - // Try to get it from cache. - ACE_Thread_Descriptor *desc = ACE_LOG_MSG->thr_desc (); - -#if 1 - // ACE_ASSERT (desc != 0); - // Thread descriptor should always get cached. -#else - if (desc == 0) - { - ACE_thread_t id = ACE_OS::thr_self (); - - desc = this->find_thread (id); - - // Thread descriptor adapter might not have been put into the - // list yet. - if (desc != 0) - // Update the TSS cache. - ACE_LOG_MSG->thr_desc (desc); - } -#endif - return desc; -} - -// Return the unique ID of the thread. - -ACE_INLINE ACE_thread_t -ACE_Thread_Manager::thr_self (void) -{ - ACE_TRACE ("ACE_Thread_Manager::thr_self"); - return ACE_Thread::self (); -} - -ACE_INLINE ACE_Task_Base * -ACE_Thread_Manager::task (void) -{ - ACE_TRACE ("ACE_Thread_Manager::task"); - - ACE_Thread_Descriptor *td = this->thread_desc_self () ; - - if (td == 0) - return 0; - else - return td->task (); -} - -ACE_INLINE int -ACE_Thread_Manager::open (size_t) -{ - // Currently no-op. - return 0; -} - -#if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) -ACE_INLINE int -ACE_Thread_Manager::at_exit (ACE_At_Thread_Exit* at) -{ - ACE_Thread_Descriptor *td = this->thread_desc_self (); - if (td == 0) - return -1; - else - return td->at_exit (at); -} - -ACE_INLINE int -ACE_Thread_Manager::at_exit (ACE_At_Thread_Exit& at) -{ - ACE_Thread_Descriptor *td = this->thread_desc_self (); - if (td == 0) - return -1; - else - return td->at_exit (at); -} -#endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ - -ACE_INLINE int -ACE_Thread_Manager::at_exit (void *object, - ACE_CLEANUP_FUNC cleanup_hook, - void *param) -{ - ACE_Thread_Descriptor *td = this->thread_desc_self (); - if (td == 0) - return -1; - else - return td->at_exit (object, - cleanup_hook, - param); -} - -ACE_INLINE void -ACE_Thread_Manager::wait_on_exit (int do_wait) -{ - this->automatic_wait_ = do_wait; -} - -ACE_INLINE int -ACE_Thread_Manager::wait_on_exit (void) -{ - return this->automatic_wait_; -} - -ACE_INLINE int -ACE_Thread_Manager::register_as_terminated (ACE_Thread_Descriptor *td) -{ -#if defined (VXWORKS) - ACE_UNUSED_ARG (td); -#else /* ! VXWORKS */ - ACE_Thread_Descriptor_Base *tdb; - ACE_NEW_RETURN (tdb, ACE_Thread_Descriptor_Base (*td), -1); - this->terminated_thr_list_.insert_tail (tdb); -#endif /* ! VXWORKS */ - return 0; -} - -ACE_INLINE size_t -ACE_Thread_Manager::count_threads (void) const -{ - return this->thr_list_.size (); -} diff --git a/ace/Time_Request_Reply.cpp b/ace/Time_Request_Reply.cpp deleted file mode 100644 index 689099f92dc..00000000000 --- a/ace/Time_Request_Reply.cpp +++ /dev/null @@ -1,188 +0,0 @@ -// $Id$ - -#include "ace/Time_Request_Reply.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, Time_Request_Reply, "$Id$") - -// Default "do nothing" constructor. - -ACE_Time_Request::ACE_Time_Request (void) -{ - ACE_TRACE ("ACE_Time_Request::ACE_Time_Request"); -} - -// Create a ACE_Time_Request message. - -ACE_Time_Request::ACE_Time_Request (ACE_INT32 t, // Type of request. - const ACE_UINT32 time, - ACE_Time_Value *timeout) // Max time waiting for request. -{ - ACE_TRACE ("ACE_Time_Request::ACE_Time_Request"); - this->msg_type (t); - - // If timeout is a NULL pointer, then block forever... - if (timeout == 0) - { - this->transfer_.block_forever_ = 1; - this->transfer_.sec_timeout_ = 0; - this->transfer_.usec_timeout_ = 0; - } - else // Do a "timed wait." - { - this->block_forever (0); - // Keep track of how long client is willing to wait. - this->transfer_.sec_timeout_ = timeout->sec (); - this->transfer_.usec_timeout_ = timeout->usec (); - } - - // Copy time into request - this->time_ = this->transfer_.time_ = time; -} - -// Initialize length_ in order to avoid problems with byte-ordering -void -ACE_Time_Request::init (void) -{ - ACE_TRACE ("ACE_Time_Request::init"); -// this->length (sizeof this->transfer_); -} - -// Get the fixed size of message -ssize_t -ACE_Time_Request::size (void) const -{ - ACE_TRACE ("ACE_Time_Request::size"); - return sizeof (this->transfer_); -} - -// = Set/get the type of the message. -ACE_INT32 -ACE_Time_Request::msg_type (void) const -{ - ACE_TRACE ("ACE_Time_Request::msg_type"); - return this->transfer_.msg_type_; -} - -void -ACE_Time_Request::msg_type (ACE_INT32 t) -{ - ACE_TRACE ("ACE_Time_Request::msg_type"); - this->transfer_.msg_type_ = t; -} - -// = Set/get the blocking semantics. -ACE_UINT32 -ACE_Time_Request::block_forever (void) const -{ - ACE_TRACE ("ACE_Time_Request::block_forever"); - return this->transfer_.block_forever_; -} - -void -ACE_Time_Request::block_forever (ACE_UINT32 bs) -{ - ACE_TRACE ("ACE_Time_Request::block_forever"); - this->transfer_.block_forever_ = bs; -} - -// = Set/get the timeout. -ACE_Time_Value -ACE_Time_Request::timeout (void) const -{ - ACE_TRACE ("ACE_Time_Request::timeout"); - return ACE_Time_Value (this->transfer_.sec_timeout_, this->transfer_.usec_timeout_); -} - -void -ACE_Time_Request::timeout (const ACE_Time_Value& timeout) -{ - ACE_TRACE ("ACE_Time_Request::timeout"); - this->transfer_.sec_timeout_ = timeout.sec (); - this->transfer_.usec_timeout_ = timeout.usec (); -} - -// = Set/get the time -ACE_UINT32 -ACE_Time_Request::time (void) const -{ - ACE_TRACE ("ACE_Time_Request::time"); - return this->time_; -} - -void -ACE_Time_Request::time (ACE_UINT32 t) -{ - ACE_TRACE ("ACE_Time_Request::time"); - this->time_ = t; -} - -// Encode the transfer buffer into network byte order -// so that it can be sent to the server. -int -ACE_Time_Request::encode (void *&buf) -{ - ACE_TRACE ("ACE_Time_Request::encode"); - // Compute the length *before* doing the marshaling. - - buf = (void *) &this->transfer_; - this->transfer_.block_forever_ = htonl (this->transfer_.block_forever_); - this->transfer_.usec_timeout_ = htonl (this->transfer_.usec_timeout_); - this->transfer_.sec_timeout_ = htonl (this->transfer_.sec_timeout_); - this->transfer_.msg_type_ = htonl (this->transfer_.msg_type_); - this->transfer_.time_ = htonl (this->transfer_.time_); - - return this->size (); // Always fixed -} - -// Decode the transfer buffer into host byte byte order -// so that it can be used by the server. -int -ACE_Time_Request::decode (void) -{ - ACE_TRACE ("ACE_Time_Request::decode"); - // Decode - this->transfer_.block_forever_ = ntohl (this->transfer_.block_forever_); - this->transfer_.usec_timeout_ = ntohl (this->transfer_.usec_timeout_); - this->transfer_.sec_timeout_ = ntohl (this->transfer_.sec_timeout_); - this->transfer_.msg_type_ = ntohl (this->transfer_.msg_type_); - this->transfer_.time_ = ntohl (this->transfer_.time_); - - this->time_ = this->transfer_.time_; - return 0; -} - -// Print out the current values of the ACE_Time_Request. - -void -ACE_Time_Request::dump (void) const -{ - ACE_TRACE ("ACE_Time_Request::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\nlength = %d\n"), - this->size ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("message-type = "))); - - switch (this->msg_type ()) - { - case ACE_Time_Request::TIME_UPDATE: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("TIME_UPDATE\n"))); - break; - default: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" = %d\n"), this->msg_type ())); - break; - } - - if (this->block_forever ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("blocking forever\n"))); - else - { -#if !defined (ACE_NLOGGING) - ACE_Time_Value tv = this->timeout (); -#endif /* ! ACE_NLOGGING */ - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"), - tv.sec (), tv.usec ())); - } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\ntime = %d\n"), - this->time ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("+++++++\n"))); -} diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h deleted file mode 100644 index 0314f43bb00..00000000000 --- a/ace/Time_Request_Reply.h +++ /dev/null @@ -1,137 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file Time_Request_Reply.h - * - * $Id$ - * - * Define the format used to exchange messages between the - * ACE_Time_Server and clerks. - * - * @author Prashant Jain - */ -//============================================================================= - - -#ifndef ACE_TIME_REQUEST_REPLY_H -#define ACE_TIME_REQUEST_REPLY_H -#include "ace/pre.h" - -#include "ace/Time_Value.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" - -/** - * @class ACE_Time_Request - * - * @brief Message format for delivering requests to the ACE_Time Server. - * - * This class is implemented to minimize data copying. - * In particular, all marshaling is done in situ... - */ -class ACE_Export ACE_Time_Request -{ -public: - enum Constants - { - /// Request message types. - TIME_UPDATE = 01, - - /// Class-specific constant values. - MAX_TIME_LEN = MAXPATHLEN + 1 - }; - - /// Default constructor. - ACE_Time_Request (void); - - /** - * Create a ACE_Time_Request message. - * @param msg_type Type of request. - * @param time Time. - * @param timeout Max time waiting for request. - */ - ACE_Time_Request (ACE_INT32 msg_type, - const ACE_UINT32 time, - ACE_Time_Value *timeout = 0); - - /** - * Initialize length_ in order to ensure correct byte ordering before a - * request is sent. - * @deprecated This method is a no-op. - */ - void init (void); - - // Get the fixed size of message - ssize_t size (void) const; - - /// Get the type of the message. - ACE_INT32 msg_type (void) const; - - /// Set the type of the message. - void msg_type (ACE_INT32); - - /// Get the time - ACE_UINT32 time (void) const; - - // Set the time - void time (ACE_UINT32 t); - - /// Get the blocking semantics. - ACE_UINT32 block_forever (void) const; - - /// Set the blocking semantics. - void block_forever (ACE_UINT32); - - /// Get the timeout. - ACE_Time_Value timeout (void) const; - - /// Set the timeout. - void timeout (const ACE_Time_Value& timeout); - - /// Encode the message before transmission. - int encode (void *&); - - /// Decode message after reception. - int decode (void); - - /// Print out the values of the message for debugging purposes. - void dump (void) const; - -private: - // = The 5 fields in the struct are transmitted to the server. - // The remaining 2 fields are not tranferred -- they are used only on - // the server-side to simplify lookups. - - struct Transfer - { - /// Type of the request (i.e., ) - ACE_INT32 msg_type_; - - /// Indicates if we should block forever. If 0, then sec_timeout_ - /// and usec_timeout_ indicates how long we should wait. - ACE_UINT32 block_forever_; - - /// Max seconds willing to wait for name if not blocking forever. - ACE_UINT32 sec_timeout_; - - /// Max micro seconds to wait for name if not blocking forever. - ACE_UINT32 usec_timeout_; - - /// The data portion contains - ACE_UINT32 time_; - }; - - /// Transfer buffer. - Transfer transfer_; - - /// Time - ACE_UINT32 time_; -}; - - -#include "ace/post.h" -#endif /* ACE_TIME_REQUEST_REPLY_H */ diff --git a/ace/Time_Value.cpp b/ace/Time_Value.cpp deleted file mode 100644 index f783c135acc..00000000000 --- a/ace/Time_Value.cpp +++ /dev/null @@ -1,199 +0,0 @@ -#include "ace/Time_Value.h" -#include "ace/Basic_Types.h" - - -ACE_RCSID (ace, - Time_Value, - "$Id$") - - -#if !defined (__ACE_INLINE__) -#include "ace/Time_Value.inl" -#endif /* __ACE_INLINE__ */ - - -// Static constant representing `zero-time'. -// Note: this object requires static construction. -const ACE_Time_Value ACE_Time_Value::zero; - -// Constant for maximum time representable. Note that this time -// is not intended for use with select () or other calls that may -// have *their own* implementation-specific maximum time representations. -// Its primary use is in time computations such as those used by the -// dynamic subpriority strategies in the ACE_Dynamic_Message_Queue class. -// Note: this object requires static construction. -const ACE_Time_Value ACE_Time_Value::max_time (LONG_MAX, - ACE_ONE_SECOND_IN_USECS - 1); - -ACE_ALLOC_HOOK_DEFINE (ACE_Time_Value) - -// Increment microseconds (the only reason this is here is to allow -// the use of ACE_Atomic_Op with ACE_Time_Value). - -ACE_Time_Value -ACE_Time_Value::operator ++ (int) -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator ++ (int)"); - ACE_Time_Value tv (*this); - ++*this; - return tv; -} - -ACE_Time_Value & -ACE_Time_Value::operator ++ (void) -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator ++ (void)"); - this->usec (this->usec () + 1); - this->normalize (); - return *this; -} - -// Decrement microseconds (the only reason this is here is / to allow -// the use of ACE_Atomic_Op with ACE_Time_Value). - -ACE_Time_Value -ACE_Time_Value::operator -- (int) -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator -- (int)"); - ACE_Time_Value tv (*this); - --*this; - return tv; -} - -ACE_Time_Value & -ACE_Time_Value::operator -- (void) -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator -- (void)"); - this->usec (this->usec () - 1); - this->normalize (); - return *this; -} - -#if defined (ACE_WIN32) -// Static constant to remove time skew between FILETIME and POSIX -// time. POSIX and Win32 use different epochs (Jan. 1, 1970 v.s. -// Jan. 1, 1601). The following constant defines the difference -// in 100ns ticks. -// -// In the beginning (Jan. 1, 1601), there was no time and no computer. -// And Bill said: "Let there be time," and there was time.... -# if defined (ACE_LACKS_LONGLONG_T) -const ACE_U_LongLong ACE_Time_Value::FILETIME_to_timval_skew = -ACE_U_LongLong (0xd53e8000, 0x19db1de); -# else -const DWORDLONG ACE_Time_Value::FILETIME_to_timval_skew = -ACE_INT64_LITERAL (0x19db1ded53e8000); -# endif - -// Initializes the ACE_Time_Value object from a Win32 FILETIME - -ACE_Time_Value::ACE_Time_Value (const FILETIME &file_time) -{ - // // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value"); - this->set (file_time); -} - -void ACE_Time_Value::set (const FILETIME &file_time) -{ - // Initializes the ACE_Time_Value object from a Win32 FILETIME -#if defined (ACE_LACKS_LONGLONG_T) - ACE_U_LongLong LL_100ns(file_time.dwLowDateTime, file_time.dwHighDateTime); - LL_100ns -= ACE_Time_Value::FILETIME_to_timval_skew; - // Convert 100ns units to seconds; - this->tv_.tv_sec = (long) (LL_100ns / ((double) (10000 * 1000))); - // Convert remainder to microseconds; - this->tv_.tv_usec = (long)((LL_100ns % ((ACE_UINT32)(10000 * 1000))) / 10); -#else - // Don't use a struct initializer, gcc don't like it. - ULARGE_INTEGER _100ns; - _100ns.LowPart = file_time.dwLowDateTime; - _100ns.HighPart = file_time.dwHighDateTime; - - _100ns.QuadPart -= ACE_Time_Value::FILETIME_to_timval_skew; - - // Convert 100ns units to seconds; - this->tv_.tv_sec = (long) (_100ns.QuadPart / (10000 * 1000)); - // Convert remainder to microseconds; - this->tv_.tv_usec = (long) ((_100ns.QuadPart % (10000 * 1000)) / 10); -#endif // ACE_LACKS_LONGLONG_T - this->normalize (); -} - -// Returns the value of the object as a Win32 FILETIME. - -ACE_Time_Value::operator FILETIME () const -{ - FILETIME file_time; - // ACE_OS_TRACE ("ACE_Time_Value::operator FILETIME"); - -#if defined (ACE_LACKS_LONGLONG_T) - ACE_U_LongLong LL_sec(this->tv_.tv_sec); - ACE_U_LongLong LL_usec(this->tv_.tv_usec); - ACE_U_LongLong LL_100ns = LL_sec * (ACE_UINT32)(10000 * 1000) + - LL_usec * (ACE_UINT32)10 + - ACE_Time_Value::FILETIME_to_timval_skew; - file_time.dwLowDateTime = LL_100ns.lo(); - file_time.dwHighDateTime = LL_100ns.hi(); -#else - ULARGE_INTEGER _100ns; - _100ns.QuadPart = (((DWORDLONG) this->tv_.tv_sec * (10000 * 1000) + - this->tv_.tv_usec * 10) + - ACE_Time_Value::FILETIME_to_timval_skew); - - file_time.dwLowDateTime = _100ns.LowPart; - file_time.dwHighDateTime = _100ns.HighPart; -#endif //ACE_LACKS_LONGLONG_T - - return file_time; -} - -#endif /* ACE_WIN32 */ - -void -ACE_Time_Value::dump (void) const -{ - // ACE_OS_TRACE ("ACE_Time_Value::dump"); -#if 0 - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntv_sec_ = %d"), this->tv_.tv_sec)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntv_usec_ = %d\n"), this->tv_.tv_usec)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -#endif /* 0 */ -} - -void -ACE_Time_Value::normalize (void) -{ - // // ACE_OS_TRACE ("ACE_Time_Value::normalize"); - // From Hans Rohnert... - - if (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS) - { - do - { - this->tv_.tv_sec++; - this->tv_.tv_usec -= ACE_ONE_SECOND_IN_USECS; - } - while (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS); - } - else if (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS) - { - do - { - this->tv_.tv_sec--; - this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS; - } - while (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS); - } - - if (this->tv_.tv_sec >= 1 && this->tv_.tv_usec < 0) - { - this->tv_.tv_sec--; - this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS; - } - else if (this->tv_.tv_sec < 0 && this->tv_.tv_usec > 0) - { - this->tv_.tv_sec++; - this->tv_.tv_usec -= ACE_ONE_SECOND_IN_USECS; - } -} diff --git a/ace/Time_Value.h b/ace/Time_Value.h deleted file mode 100644 index 1a6eb495fc6..00000000000 --- a/ace/Time_Value.h +++ /dev/null @@ -1,330 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Time_Value.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_TIME_VALUE_H -#define ACE_TIME_VALUE_H - -#include "ace/pre.h" - -#include "ace/OS_Export.h" -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -# if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS_DIAB_MIPS) -# include /**/ -# if defined (__Lynx__) -# include /**/ -# include /**/ -# endif /* __Lynx__ */ -# endif /* ACE_HAS_WINCE ACE_PSOS_DIAB_MIPS */ - -# if defined (ACE_LACKS_SYSTIME_H) -// Some platforms may need to include this, but I suspect that most -// will get it from -# if defined (VXWORKS) -# include /**/ -# else -# include /**/ -# endif /* VXWORKS */ -# endif /* ACE_LACKS_SYSTIME_H */ - -// HP-UX 10.20 doesn't define timespec_t - it defined struct timespec. -#if defined (HPUX_10) -typedef struct timespec timespec_t; -#endif /* HPUX_10 */ - -// Define some helpful constants. -// Not type-safe, and signed. For backward compatibility. -#define ACE_ONE_SECOND_IN_MSECS 1000L -#define ACE_ONE_SECOND_IN_USECS 1000000L -#define ACE_ONE_SECOND_IN_NSECS 1000000000L - -// ------------------------------------------------------------------- -// These forward declarations are only used to circumvent a bug in -// MSVC 6.0 compiler. They shouldn't cause any problem for other -// compilers and they can be removed once MS release a SP that contains -// the fix. -class ACE_Time_Value; -ACE_OS_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - -ACE_OS_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - -// This forward declaration is needed by the set() and FILETIME() functions -#if defined (ACE_LACKS_LONGLONG_T) -class ACE_Export ACE_U_LongLong; -#endif /* ACE_LACKS_LONGLONG_T */ -// ------------------------------------------------------------------- - -# if !defined (ACE_HAS_POSIX_TIME) && !defined (ACE_PSOS) -// Definition per POSIX. -typedef struct timespec -{ - /// Seconds - time_t tv_sec; - /// Nanoseconds - long tv_nsec; -} timespec_t; -# elif defined (ACE_HAS_BROKEN_POSIX_TIME) -// OSF/1 defines struct timespec in - Tom Marrs -# include /**/ -# endif /* !ACE_HAS_POSIX_TIME */ - -# if defined(ACE_LACKS_TIMESPEC_T) -typedef struct timespec timespec_t; -# endif /* ACE_LACKS_TIMESPEC_T */ - -// ------------------------------------------------------------------- - -/** - * @class ACE_Time_Value - * - * @brief Operations on "timeval" structures, which express time in - * seconds (secs) and microseconds (usecs). - * - * This class centralizes all the time related processing in - * ACE. These time values are typically used in conjunction with OS - * mechanisms like or other calls that may have - * *their own* implementation-specific maximum time representations. - * Its primary use is in time computations such as those used by the - * dynamic subpriority strategies in the ACE_Dynamic_Message_Queue - * class. - */ - static const ACE_Time_Value max_time; - - // = Initialization methods. - - /// Default Constructor. - ACE_Time_Value (void); - - /// Constructor. - ACE_Time_Value (long sec, long usec = 0); - - // = Methods for converting to/from various time formats. - - /// Construct the ACE_Time_Value from a timeval. - ACE_Time_Value (const struct timeval &t); - - /// Construct the ACE_Time_Value object from a timespec_t. - ACE_Time_Value (const timespec_t &t); - -# if defined (ACE_WIN32) - /// Construct the ACE_Time_Value object from a Win32 FILETIME - ACE_Time_Value (const FILETIME &ft); -# endif /* ACE_WIN32 */ - - /// Initializes the ACE_Time_Value from two longs. - void set (long sec, long usec); - - /// Initializes the ACE_Time_Value from a double, which is assumed to be - /// in second format, with any remainder treated as microseconds. - void set (double d); - - /// Initializes the ACE_Time_Value from a timeval. - void set (const timeval &t); - - /// Initializes the ACE_Time_Value object from a timespec_t. - void set (const timespec_t &t); - -# if defined (ACE_WIN32) - /// Initializes the ACE_Time_Value object from a Win32 FILETIME. - void set (const FILETIME &ft); -# endif /* ACE_WIN32 */ - - /// Converts from ACE_Time_Value format into milli-seconds format. - /** - * @return Sum of second field (in milliseconds) and microsecond field - * (in milliseconds). - * - * @note The semantics of this method differs from the sec() and - * usec() methods. There is no analogous "millisecond" - * component in an ACE_Time_Value. - */ - long msec (void) const; - - /// Converts from milli-seconds format into ACE_Time_Value format. - /** - * @note The semantics of this method differs from the sec() and - * usec() methods. There is no analogous "millisecond" - * component in an ACE_Time_Value. - */ - void msec (long); - - /// Returns the value of the object as a timespec_t. - operator timespec_t () const; - - /// Returns the value of the object as a timeval. - operator timeval () const; - - /// Returns a pointer to the object as a timeval. - operator const timeval *() const; - -# if defined (ACE_WIN32) - /// Returns the value of the object as a Win32 FILETIME. - operator FILETIME () const; -# endif /* ACE_WIN32 */ - - // = The following are accessor/mutator methods. - - /// Get seconds. - /** - * @return The second field/component of this ACE_Time_Value. - * - * @note The semantics of this method differs from the msec() - * method. - */ - long sec (void) const; - - /// Set seconds. - void sec (long sec); - - /// Get microseconds. - /** - * @return The microsecond field/component of this ACE_Time_Value. - * - * @note The semantics of this method differs from the msec() - * method. - */ - long usec (void) const; - - /// Set microseconds. - void usec (long usec); - - // = The following arithmetic methods operate on ACE_Time_Value's. - - /// Add @a tv to this. - ACE_Time_Value &operator += (const ACE_Time_Value &tv); - - /// Subtract @a tv to this. - ACE_Time_Value &operator -= (const ACE_Time_Value &tv); - - /// Multiply the time value by the @a d factor, which must be >= 0. - ACE_Time_Value &operator *= (double d); - - /// Increment microseconds as postfix. - /** - * @note The only reason this is here is to allow the use of ACE_Atomic_Op - * with ACE_Time_Value. - */ - ACE_Time_Value operator++ (int); - - /// Increment microseconds as prefix. - /** - * @note The only reason this is here is to allow the use of ACE_Atomic_Op - * with ACE_Time_Value. - */ - ACE_Time_Value &operator++ (void); - - /// Decrement microseconds as postfix. - /** - * @note The only reason this is here is to allow the use of ACE_Atomic_Op - * with ACE_Time_Value. - */ - ACE_Time_Value operator-- (int); - - /// Decrement microseconds as prefix. - /** - * @note The only reason this is here is to allow the use of ACE_Atomic_Op - * with ACE_Time_Value. - */ - ACE_Time_Value &operator-- (void); - - /// Adds two ACE_Time_Value objects together, returns the sum. - friend ACE_OS_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - - /// Subtracts two ACE_Time_Value objects, returns the difference. - friend ACE_OS_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - - /// True if @a tv1 < @a tv2. - friend ACE_OS_Export int operator < (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - - /// True if @a tv1 > @a tv2. - friend ACE_OS_Export int operator > (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - - /// True if @a tv1 <= @a tv2. - friend ACE_OS_Export int operator <= (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - - /// True if @a tv1 >= @a tv2. - friend ACE_OS_Export int operator >= (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - - /// True if @a tv1 == @a tv2. - friend ACE_OS_Export int operator == (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - - /// True if @a tv1 != @a tv2. - friend ACE_OS_Export int operator != (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2); - - //@{ - /// Multiplies the time value by @a d - friend ACE_OS_Export ACE_Time_Value operator * (double d, - const ACE_Time_Value &tv); - - friend ACE_OS_Export ACE_Time_Value operator * (const ACE_Time_Value &tv, - double d); - //@} - - /// Dump is a no-op. - /** - * The dump() method is a no-op. It's here for backwards compatibility - * only, but does not dump anything. Invoking logging methods here - * violates layering restrictions in ACE because this class is part - * of the OS layer and @c ACE_Log_Msg is at a higher level. - */ - void dump (void) const; - -# if defined (ACE_WIN32) - /// Const time difference between FILETIME and POSIX time. -# if defined (ACE_LACKS_LONGLONG_T) - static const ACE_U_LongLong FILETIME_to_timval_skew; -# else - static const DWORDLONG FILETIME_to_timval_skew; -# endif // ACE_LACKS_LONGLONG_T -# endif /* ACE_WIN32 */ - -private: - /// Put the timevalue into a canonical form. - void normalize (void); - - /// Store the values as a timeval. - timeval tv_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Time_Value.inl" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" - -#endif /* ACE_TIME_VALUE_H */ diff --git a/ace/Time_Value.inl b/ace/Time_Value.inl deleted file mode 100644 index 7710c1e5880..00000000000 --- a/ace/Time_Value.inl +++ /dev/null @@ -1,329 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - - -// Returns the value of the object as a timeval. - -ACE_INLINE -ACE_Time_Value::operator timeval () const -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator timeval"); - return this->tv_; -} - -// Returns a pointer to the object as a timeval. - -ACE_INLINE -ACE_Time_Value::operator const timeval * () const -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator const timeval *"); - return (const timeval *) &this->tv_; -} - -ACE_INLINE void -ACE_Time_Value::set (long sec, long usec) -{ - // ACE_OS_TRACE ("ACE_Time_Value::set"); - this->tv_.tv_sec = sec; - this->tv_.tv_usec = usec; - this->normalize (); -} - -ACE_INLINE void -ACE_Time_Value::set (double d) -{ - // ACE_OS_TRACE ("ACE_Time_Value::set"); - long l = (long) d; - this->tv_.tv_sec = l; - this->tv_.tv_usec = (long) ((d - (double) l) * ACE_ONE_SECOND_IN_USECS); - this->normalize (); -} - -// Initializes a timespec_t. Note that this approach loses precision -// since it converts the nano-seconds into micro-seconds. But then -// again, do any real systems have nano-second timer precision?! - -ACE_INLINE void -ACE_Time_Value::set (const timespec_t &tv) -{ - // ACE_OS_TRACE ("ACE_Time_Value::set"); -#if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS) - this->tv_.tv_sec = tv.tv_sec; - // Convert nanoseconds into microseconds. - this->tv_.tv_usec = tv.tv_nsec / 1000; -#else - this->tv_.tv_sec = tv.ts_sec; - // Convert nanoseconds into microseconds. - this->tv_.tv_usec = tv.ts_nsec / 1000; -#endif /* ACE_HAS_BROKEN_TIMESPEC_MEMBERS */ - - this->normalize (); -} - -ACE_INLINE void -ACE_Time_Value::set (const timeval &tv) -{ - // ACE_OS_TRACE ("ACE_Time_Value::set"); - this->tv_.tv_sec = tv.tv_sec; - this->tv_.tv_usec = tv.tv_usec; - - this->normalize (); -} - -ACE_INLINE -ACE_Time_Value::ACE_Time_Value (const struct timeval &tv) - // : tv_ () -{ - // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value"); - this->set (tv); -} - -ACE_INLINE -ACE_Time_Value::ACE_Time_Value (void) - // : tv_ () -{ - // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value"); - this->set (0, 0); -} - -ACE_INLINE -ACE_Time_Value::ACE_Time_Value (long sec, long usec) -{ - // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value"); - this->set (sec, usec); -} - -// Returns number of seconds. - -ACE_INLINE long -ACE_Time_Value::sec (void) const -{ - // ACE_OS_TRACE ("ACE_Time_Value::sec"); - return this->tv_.tv_sec; -} - -// Sets the number of seconds. - -ACE_INLINE void -ACE_Time_Value::sec (long sec) -{ - // ACE_OS_TRACE ("ACE_Time_Value::sec"); - this->tv_.tv_sec = sec; -} - -// Converts from Time_Value format into milli-seconds format. - -ACE_INLINE long -ACE_Time_Value::msec (void) const -{ - // ACE_OS_TRACE ("ACE_Time_Value::msec"); - return this->tv_.tv_sec * 1000 + this->tv_.tv_usec / 1000; -} - -// Converts from milli-seconds format into Time_Value format. - -ACE_INLINE void -ACE_Time_Value::msec (long milliseconds) -{ - // ACE_OS_TRACE ("ACE_Time_Value::msec"); - // Convert millisecond units to seconds; - this->tv_.tv_sec = milliseconds / 1000; - // Convert remainder to microseconds; - this->tv_.tv_usec = (milliseconds - (this->tv_.tv_sec * 1000)) * 1000; -} - -// Returns number of micro-seconds. - -ACE_INLINE long -ACE_Time_Value::usec (void) const -{ - // ACE_OS_TRACE ("ACE_Time_Value::usec"); - return this->tv_.tv_usec; -} - -// Sets the number of micro-seconds. - -ACE_INLINE void -ACE_Time_Value::usec (long usec) -{ - // ACE_OS_TRACE ("ACE_Time_Value::usec"); - this->tv_.tv_usec = usec; -} - -ACE_INLINE ACE_Time_Value & -ACE_Time_Value::operator *= (double d) -{ - double time = - ((double) this->sec ()) * ACE_ONE_SECOND_IN_USECS + this->usec (); - time *= d; - this->sec ((long)(time / ACE_ONE_SECOND_IN_USECS)); - this->usec (((long)time) % ACE_ONE_SECOND_IN_USECS); - this->normalize (); - return *this; -} - -ACE_INLINE ACE_Time_Value -operator * (double d, const ACE_Time_Value &tv) -{ - return ACE_Time_Value (tv) *= d; -} - -ACE_INLINE ACE_Time_Value -operator * (const ACE_Time_Value &tv, double d) -{ - return ACE_Time_Value (tv) *= d; -} - -// True if tv1 > tv2. - -ACE_INLINE int -operator > (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2) -{ - // ACE_OS_TRACE ("operator >"); - if (tv1.sec () > tv2.sec ()) - return 1; - else if (tv1.sec () == tv2.sec () - && tv1.usec () > tv2.usec ()) - return 1; - else - return 0; -} - -// True if tv1 >= tv2. - -ACE_INLINE int -operator >= (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2) -{ - // ACE_OS_TRACE ("operator >="); - if (tv1.sec () > tv2.sec ()) - return 1; - else if (tv1.sec () == tv2.sec () - && tv1.usec () >= tv2.usec ()) - return 1; - else - return 0; -} - -// Returns the value of the object as a timespec_t. - -ACE_INLINE -ACE_Time_Value::operator timespec_t () const -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator timespec_t"); - timespec_t tv; -#if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS) - tv.tv_sec = this->sec (); - // Convert microseconds into nanoseconds. - tv.tv_nsec = this->tv_.tv_usec * 1000; -#else - tv.ts_sec = this->sec (); - // Convert microseconds into nanoseconds. - tv.ts_nsec = this->tv_.tv_usec * 1000; -#endif /* ACE_HAS_BROKEN_TIMESPEC_MEMBERS */ - return tv; -} - -// Initializes the ACE_Time_Value object from a timespec_t. - -ACE_INLINE -ACE_Time_Value::ACE_Time_Value (const timespec_t &tv) - // : tv_ () -{ - // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value"); - this->set (tv); -} - -// True if tv1 < tv2. - -ACE_INLINE int -operator < (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2) -{ - // ACE_OS_TRACE ("operator <"); - return tv2 > tv1; -} - -// True if tv1 >= tv2. - -ACE_INLINE int -operator <= (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2) -{ - // ACE_OS_TRACE ("operator <="); - return tv2 >= tv1; -} - -// True if tv1 == tv2. - -ACE_INLINE int -operator == (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2) -{ - // ACE_OS_TRACE ("operator =="); - return tv1.sec () == tv2.sec () - && tv1.usec () == tv2.usec (); -} - -// True if tv1 != tv2. - -ACE_INLINE int -operator != (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2) -{ - // ACE_OS_TRACE ("operator !="); - return !(tv1 == tv2); -} - -// Add TV to this. - -ACE_INLINE ACE_Time_Value & -ACE_Time_Value::operator+= (const ACE_Time_Value &tv) -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator+="); - this->sec (this->sec () + tv.sec ()); - this->usec (this->usec () + tv.usec ()); - this->normalize (); - return *this; -} - -// Subtract TV to this. - -ACE_INLINE ACE_Time_Value & -ACE_Time_Value::operator-= (const ACE_Time_Value &tv) -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator-="); - this->sec (this->sec () - tv.sec ()); - this->usec (this->usec () - tv.usec ()); - this->normalize (); - return *this; -} - -// Adds two ACE_Time_Value objects together, returns the sum. - -ACE_INLINE ACE_Time_Value -operator + (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2) -{ - // ACE_OS_TRACE ("operator +"); - ACE_Time_Value sum (tv1.sec () + tv2.sec (), - tv1.usec () + tv2.usec ()); - - sum.normalize (); - return sum; -} - -// Subtracts two ACE_Time_Value objects, returns the difference. - -ACE_INLINE ACE_Time_Value -operator - (const ACE_Time_Value &tv1, - const ACE_Time_Value &tv2) -{ - // ACE_OS_TRACE ("operator -"); - ACE_Time_Value delta (tv1.sec () - tv2.sec (), - tv1.usec () - tv2.usec ()); - delta.normalize (); - return delta; -} diff --git a/ace/Timeprobe.cpp b/ace/Timeprobe.cpp deleted file mode 100644 index cdfdb116913..00000000000 --- a/ace/Timeprobe.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// $Id$ - -#include "ace/OS.h" - -ACE_RCSID(ace, Timeprobe, "$Id$") - -#if defined (ACE_COMPILE_TIMEPROBES) - -#include "ace/Timeprobe.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Timeprobe.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Timeprobe; -template class ACE_Function_Timeprobe >; -template class ACE_Unbounded_Set_Iterator; -template class ACE_Unbounded_Set; -template class ACE_Node; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Timeprobe -#pragma instantiate ACE_Function_Timeprobe > -#pragma instantiate ACE_Unbounded_Set_Iterator -#pragma instantiate ACE_Unbounded_Set -#pragma instantiate ACE_Node -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -# if defined (ACE_TSS_TIMEPROBES) -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_TSS_Singleton; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_TSS_Singleton -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -# else /* ACE_TSS_TIMEPROBES */ -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -# endif /* ACE_TSS_TIMEPROBES */ - -#endif /* ACE_COMPILE_TIMEPROBES */ - diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h deleted file mode 100644 index e45a6eb7bf2..00000000000 --- a/ace/Timeprobe.h +++ /dev/null @@ -1,173 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timeprobe.h - * - * $Id$ - * - * @author Irfan Pyarali - * - * If users want to use time probes, the ACE_COMPILE_TIMEPROBES - * flag must be defined when compiling ACE. This can be achieved - * by doing one of the following: - * - * . Use make probe = 1, if you are using the make utility. - * - * . Define ACE_COMPILE_TIMEPROBES in config.h - * - * . Define ACE_COMPILE_TIMEPROBES in the VC project file. - * - * . Other regular methods will also work. - * - * It is not necessary to define ACE_COMPILE_TIMEPROBES when using - * time probes, you simply need ACE_ENABLE_TIMEPROBES. You can use - * the ACE_TIMEPROBE_* macros to program the time probes, and use - * the ACE_ENABLE_TIMEPROBE to enable the time probes. If you - * define ACE_ENABLE_TIMEPROBE in your code, but forget to compile - * ACE with ACE_COMPILE_TIMEPROBES, you will end up with linker - * errors. - * - * Remember that ACE_COMPILE_TIMEPROBES means that the ACE library - * will contain code for time probes. This is only useful when - * compiling ACE. ACE_ENABLE_TIMEPROBES means that the - * ACE_TIMEPROBE_* macros should spring to life. - */ -//============================================================================= - -#ifndef ACE_TIMEPROBE_H -#define ACE_TIMEPROBE_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_ENABLE_TIMEPROBES) - #if !defined (ACE_COMPILE_TIMEPROBES) - #define ACE_COMPILE_TIMEPROBES - #endif /* ACE_COMPILE_TIMEPROBES */ -#endif /* ACE_ENABLE_TIMEPROBES */ - -#if defined (ACE_COMPILE_TIMEPROBES) - -/** - * @class ACE_Event_Descriptions - * - * @brief Event Descriptions. - */ -class ACE_Export ACE_Event_Descriptions -{ -public: - /// Event descriptions - const char **descriptions_; - - /// Minimum id of this description set - u_long minimum_id_; - - /// Comparison - int operator== (const ACE_Event_Descriptions &rhs) const; -}; - -/** - * @class ACE_timeprobe_t - * - * @brief Time probe record. - */ -class ACE_Export ACE_timeprobe_t -{ -public: - /// Events are record as strings or numbers. - union event - { - u_long event_number_; - const char *event_description_; - }; - - /// Type of event. - enum event_type - { - NUMBER, - STRING - }; - - /// Event. - event event_; - - /// Type of event. - event_type event_type_; - - /// Timestamp. - ACE_hrtime_t time_; - - /// Id of thread posting the time probe. - ACE_thread_t thread_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Timeprobe.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/Synch.h" -#include "ace/Singleton.h" -#include "ace/Timeprobe_T.h" - -// If ACE_MT_TIMEPROBES is defined, use a Thread_Mutex to lock the -// internal state of ACE_Timerprobe. This allows multiple threads to -// use the same ACE_Timerprobe. -# if defined (ACE_MT_TIMEPROBES) -typedef ACE_SYNCH_MUTEX ACE_TIMEPROBE_MUTEX; -# else /* ACE_MT_TIMEPROBES */ -typedef ACE_SYNCH_NULL_MUTEX ACE_TIMEPROBE_MUTEX; -# endif /* ACE_MT_TIMEPROBES */ - -typedef ACE_Timeprobe - ACE_TIMEPROBE_WITH_LOCKING; - -// If ACE_TSS_TIMEPROBES is defined, store the ACE_Timeprobe singleton -// in thread specific storage. This allows multiple threads to use -// their own instance of ACE_Timerprobe, without interfering with each -// other. -# if defined (ACE_TSS_TIMEPROBES) -# define ACE_TIMEPROBE_SINGLETON_TYPE ACE_TSS_Singleton -# define ACE_TIMEPROBE_SINGLETON_LOCK_TYPE ACE_SYNCH_NULL_MUTEX -# else /* ACE_TSS_TIMEPROBES */ -# define ACE_TIMEPROBE_SINGLETON_TYPE ACE_Singleton -# define ACE_TIMEPROBE_SINGLETON_LOCK_TYPE ACE_SYNCH_MUTEX -# endif /* ACE_TSS_TIMEPROBES */ - -typedef ACE_TIMEPROBE_SINGLETON_TYPE - ACE_TIMEPROBE_SINGLETON; - -ACE_SINGLETON_DECLARE (ACE_TIMEPROBE_SINGLETON_TYPE, \ - ACE_TIMEPROBE_WITH_LOCKING, \ - ACE_TIMEPROBE_SINGLETON_LOCK_TYPE); - -#endif /* ACE_COMPILE_TIMEPROBES */ - -// If ACE_ENABLE_TIMEPROBES is defined, the macros below will -// work. Otherwise, they just vanish. Using this macro, you can -// control which files/libraries are probed. -#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) - -# define ACE_TIMEPROBE_RESET ACE_TIMEPROBE_SINGLETON::instance ()->reset () -# define ACE_TIMEPROBE(id) ACE_TIMEPROBE_SINGLETON::instance ()->timeprobe (id) -# define ACE_TIMEPROBE_PRINT ACE_TIMEPROBE_SINGLETON::instance ()->print_times () -# define ACE_TIMEPROBE_PRINT_ABSOLUTE ACE_TIMEPROBE_SINGLETON::instance ()->print_absolute_times () -# define ACE_TIMEPROBE_EVENT_DESCRIPTIONS(descriptions, minimum_id) static int ace_timeprobe_##descriptions##_return = ACE_TIMEPROBE_SINGLETON::instance ()->event_descriptions (descriptions, minimum_id) -# define ACE_FUNCTION_TIMEPROBE(X) ACE_Function_Timeprobe function_timeprobe (*ACE_TIMEPROBE_SINGLETON::instance (), X) - -#else /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */ - -# define ACE_TIMEPROBE_RESET -# define ACE_TIMEPROBE(id) -# define ACE_TIMEPROBE_PRINT -# define ACE_TIMEPROBE_PRINT_ABSOLUTE -# define ACE_TIMEPROBE_EVENT_DESCRIPTIONS(descriptions, minimum_id) -# define ACE_FUNCTION_TIMEPROBE(X) - -#endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */ -#include "ace/post.h" -#endif /* ACE_TIMEPROBE_H */ diff --git a/ace/Timeprobe.i b/ace/Timeprobe.i deleted file mode 100644 index 31f022f77b4..00000000000 --- a/ace/Timeprobe.i +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -ACE_INLINE int -ACE_Event_Descriptions::operator== (const ACE_Event_Descriptions &rhs) const -{ - return this->minimum_id_ == rhs.minimum_id_ && - this->descriptions_ == rhs.descriptions_; -} diff --git a/ace/Timeprobe_T.cpp b/ace/Timeprobe_T.cpp deleted file mode 100644 index 988565ccee1..00000000000 --- a/ace/Timeprobe_T.cpp +++ /dev/null @@ -1,300 +0,0 @@ -// $Id$ - -#ifndef ACE_TIMEPROBE_T_C -#define ACE_TIMEPROBE_T_C - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Timeprobe_T, "$Id$") - -#if defined (ACE_COMPILE_TIMEPROBES) - -#include "ace/Timeprobe.h" -#include "ace/High_Res_Timer.h" - -template -ACE_Timeprobe::ACE_Timeprobe (u_long size) - : timeprobes_ (0), - lock_ (), - max_size_ (size), - current_size_ (0) -{ - ACE_NEW (this->timeprobes_, - ACE_timeprobe_t[this->max_size_]); - -#if defined (VXWORKS) - if (sysProcNumGet () == 0) - this->current_slot_vme_address_ = (u_int *) 0xDa010000; - else - this->current_slot_vme_address_ = (u_int *) 0xD8010000; -#endif /* VXWORKS */ -} - -template -ACE_Timeprobe::ACE_Timeprobe (const ACE_Timeprobe &) -{ - // - // Stupid MSVC is forcing me to define this; please don't use it. - // - - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__)); - errno = ENOTSUP; -} - -template -ACE_Timeprobe::~ACE_Timeprobe (void) -{ - delete [] this->timeprobes_; -} - -template void -ACE_Timeprobe::timeprobe (u_long event) -{ - ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - - ACE_ASSERT (this->current_size_ < this->max_size_); - - this->timeprobes_[this->current_size_].event_.event_number_ = event; - this->timeprobes_[this->current_size_].event_type_ = ACE_timeprobe_t::NUMBER; - this->timeprobes_[this->current_size_].time_ = ACE_OS::gethrtime (); - this->timeprobes_[this->current_size_].thread_ = ACE_OS::thr_self (); - - this->current_size_++; - -#if defined (VMETRO_TIME_TEST) && (VXWORKS) - // If we are using the VMETRO board to get time samples, then write - // to the other boards VME address. - *this->current_slot_vme_address_ = event; -#endif /* VMETRO_TIME_TEST && VXWORKS */ -} - -template void -ACE_Timeprobe::timeprobe (const char *event) -{ - ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - - ACE_ASSERT (this->current_size_ < this->max_size_); - - this->timeprobes_[this->current_size_].event_.event_description_ = event; - this->timeprobes_[this->current_size_].event_type_ = ACE_timeprobe_t::STRING; - this->timeprobes_[this->current_size_].time_ = ACE_OS::gethrtime (); - this->timeprobes_[this->current_size_].thread_ = ACE_OS::thr_self (); - - this->current_size_++; -} - -template void -ACE_Timeprobe::reset (void) -{ - ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - - this->current_size_ = 0; -} - -template ACE_Unbounded_Set & -ACE_Timeprobe::event_descriptions (void) -{ - return this->event_descriptions_; -} - -template ACE_Unbounded_Set & -ACE_Timeprobe::sorted_event_descriptions (void) -{ - return this->sorted_event_descriptions_; -} - -template u_int * -ACE_Timeprobe::current_slot_vme_address (void) -{ - return this->current_slot_vme_address_; -} - -template ACE_timeprobe_t * -ACE_Timeprobe::timeprobes (void) -{ - return this->timeprobes_; -} - -template ACE_LOCK & -ACE_Timeprobe::lock (void) -{ - return this->lock_; -} - -template u_long -ACE_Timeprobe::max_size (void) -{ - return this->max_size_; -} - -template u_long -ACE_Timeprobe::current_size (void) -{ - return this->current_size_; -} - -template int -ACE_Timeprobe::event_descriptions (const char **descriptions, - u_long minimum_id) -{ - ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - - ACE_Event_Descriptions events; - events.descriptions_ = descriptions; - events.minimum_id_ = minimum_id; - - this->event_descriptions_.insert (events); - - return 0; -} - -template void -ACE_Timeprobe::print_times (void) -{ - ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - - // Sort the event descriptions - this->sort_event_descriptions_i (); - - ACE_DEBUG ((LM_DEBUG, - "\nACE_Timeprobe; %d timestamps were recorded:\n", - this->current_size_)); - - if (this->current_size_ == 0) - return; - - ACE_DEBUG ((LM_DEBUG, - "\n%-50.50s %8.8s %13.13s\n\n", - "Event", - "thread", - "usec")); - - ACE_DEBUG ((LM_DEBUG, - "%-50.50s %8.8x %13.13s\n", - this->find_description_i (0), - this->timeprobes_[0].thread_, - "START")); - - ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - for (u_long i = 1; i < this->current_size_; i++) - { - ACE_hrtime_t time_difference = - this->timeprobes_[i].time_ - this->timeprobes_[i-1].time_; - - ACE_UINT32 elapsed_time_in_micro_seconds = - (ACE_UINT32) (time_difference / gsf); - ACE_UINT32 remainder = - (ACE_UINT32) (time_difference % gsf); - // Convert to the fractional part in microseconds, with 3 digits - // of precision (hence the 1000). - ACE_UINT32 fractional = remainder * 1000 / gsf; - - ACE_DEBUG ((LM_DEBUG, - "%-50.50s %8.8x %10u.%03.3u\n", - this->find_description_i (i), - this->timeprobes_[i].thread_, - (unsigned int) elapsed_time_in_micro_seconds, - (unsigned int) fractional)); - } -} - -template void -ACE_Timeprobe::print_absolute_times (void) -{ - ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - - // Sort the event descriptions - this->sort_event_descriptions_i (); - - ACE_DEBUG ((LM_DEBUG, - "\nACE_Timeprobe; %d timestamps were recorded:\n", - this->current_size_)); - - if (this->current_size_ == 0) - return; - - ACE_DEBUG ((LM_DEBUG, - "\n%-50.50s %8.8s %13.13s\n\n", - "Event", - "thread", - "stamp")); - - for (u_long i = 0; i < this->current_size_; i++) - { - char buf[64]; - ACE_OS::sprintf (buf, "%llu", this->timeprobes_[i].time_); - ACE_DEBUG ((LM_DEBUG, - "%-50.50s %8.8x %13.13s\n", - this->find_description_i (i), - this->timeprobes_[i].thread_, - buf)); - } -} - -template const char * -ACE_Timeprobe::find_description_i (u_long i) -{ - if (this->timeprobes_[i].event_type_ == ACE_timeprobe_t::STRING) - return this->timeprobes_[i].event_.event_description_; - else - { - EVENT_DESCRIPTIONS::iterator iterator = this->sorted_event_descriptions_.begin (); - for (u_long j = 0; - j < this->sorted_event_descriptions_.size () - 1; - iterator++, j++) - { - EVENT_DESCRIPTIONS::iterator next_event_descriptions = iterator; - next_event_descriptions++; - - if (this->timeprobes_[i].event_.event_number_ < (*next_event_descriptions).minimum_id_) - break; - } - return (*iterator).descriptions_[this->timeprobes_[i].event_.event_number_ - (*iterator).minimum_id_]; - } -} - -template void -ACE_Timeprobe::sort_event_descriptions_i (void) -{ - size_t total_elements = this->event_descriptions_.size (); - - for (size_t i = 0; - i < total_elements; - i++) - { - EVENT_DESCRIPTIONS::iterator iterator = this->event_descriptions_.begin (); - ACE_Event_Descriptions min_entry = *iterator; - - for (; - iterator != this->event_descriptions_.end (); - iterator++) - if ((*iterator).minimum_id_ < min_entry.minimum_id_) - min_entry = *iterator; - - this->sorted_event_descriptions_.insert (min_entry); - this->event_descriptions_.remove (min_entry); - } -} - -template -ACE_Function_Timeprobe::ACE_Function_Timeprobe (Timeprobe &timeprobe, - u_long event) - : timeprobe_ (timeprobe), - event_ (event) -{ - this->timeprobe_.timeprobe (this->event_); -} - -template -ACE_Function_Timeprobe::~ACE_Function_Timeprobe (void) -{ - this->timeprobe_.timeprobe (this->event_ + 1); -} - -#endif /* ACE_COMPILE_TIMEPROBES */ -#endif /* ACE_TIMEPROBE_T_C */ diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h deleted file mode 100644 index 8b4891938c2..00000000000 --- a/ace/Timeprobe_T.h +++ /dev/null @@ -1,188 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timeprobe_T.h - * - * $Id$ - * - * @author Irfan Pyarali - */ -//============================================================================= - - -#ifndef ACE_TIMEPROBE_T_H -#define ACE_TIMEPROBE_T_H -#include "ace/pre.h" - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_COMPILE_TIMEPROBES) - -#include "ace/Unbounded_Set.h" - -/** - * @class ACE_Timeprobe - * - * @brief This class is used to instrument code. This is accomplished - * by inserting time probes at different location in the code. - * ACE_Timeprobe then measures the time difference between two - * time probes. - * - * This class provides a lightweight implementation for - * measuring the time required to execute code between two time - * probes. When a time probe executes, it records the time, the - * id of the calling thread, and an event description. The - * event description can either be an unsigned long or a string - * (char *). If string are used, care must be taken cause only - * pointer copies are done and the string data is *not* copied. - * The recorded time probes can then be printed by calling - * . If you have used unsigned longs as event - * descriptions in any of your time probes, you must have - * provided an event description table that maps the unsigned - * longs to readable strings. This map is a simple array of - * strings, and the event number is used as the index into the - * array when looking for the event description. If you have - * only used strings for the event description, this map is not - * necessary. - * Multiple maps can also be used to chunk up the time probes. - * Each one can be added by calling . - * Different tables are used internally by consulting the - * minimum_id for each table. It is up to the user to make sure - * that multiple tables do not share the same event id range. - */ -template -class ACE_Timeprobe -{ -public: - - /// Self - typedef ACE_Timeprobe - SELF; - - /// We can hold multiple event description tables. - typedef ACE_Unbounded_Set - EVENT_DESCRIPTIONS; - - /// Create Timeprobes with slots - ACE_Timeprobe (u_long size = ACE_DEFAULT_TIMEPROBE_TABLE_SIZE); - - /// Destructor. - ~ACE_Timeprobe (void); - - /// Record a time. is used to describe this time probe. - void timeprobe (u_long event); - - /// Record a time. is used to describe this time probe. - void timeprobe (const char *id); - - /// Record event descriptions. - int event_descriptions (const char **descriptions, - u_long minimum_id); - - /// Print the time probes. - void print_times (void); - - /// Print the time probes. - void print_absolute_times (void); - - /// Reset the slots. All old time probes will be lost. - void reset (void); - - /// Not implemented (stupid MSVC won't let it be protected). - ACE_Timeprobe (const ACE_Timeprobe &); - - // = (Somewhat private) Accessors - - /// Event Descriptions - ACE_Unbounded_Set &event_descriptions (void); - - /// Sorted Event Descriptions. - ACE_Unbounded_Set &sorted_event_descriptions (void); - - /// VME slot address. - u_int *current_slot_vme_address (void); - - /// Find description of event \ - const char *find_description_i (u_long i); - - /// Sort event descriptions - void sort_event_descriptions_i (void); - - /// Time probe slots - ACE_timeprobe_t *timeprobes (void); - - /// Synchronization variable. - ACE_LOCK &lock (void); - - /// Max size of timestamp table - u_long max_size (void); - - /// Current size of timestamp table - u_long current_size (void); - -protected: - - /// Event Descriptions - EVENT_DESCRIPTIONS event_descriptions_; - - /// Sorted Event Descriptions. - EVENT_DESCRIPTIONS sorted_event_descriptions_; - - /// Added sections below here to make compatible with the VMETRO - /// board test. - u_int *current_slot_vme_address_; - - /// Time probe slots - ACE_timeprobe_t *timeprobes_; - - /// Synchronization variable. - ACE_LOCK lock_; - - /// Max size of timestamp table - u_long max_size_; - - /// Current size of timestamp table - u_long current_size_; -}; - -/** - * @class ACE_Function_Timeprobe - * - * @brief Auto pointer like time probes. It will record on - * construction and on destruction. - */ -template -class ACE_Function_Timeprobe -{ -public: - /// Constructor. - ACE_Function_Timeprobe (Timeprobe &timeprobe, - u_long event); - - /// Destructor. - ~ACE_Function_Timeprobe (void); - -protected: - /// Reference to timeprobe. - Timeprobe &timeprobe_; - - /// Event. - u_long event_; -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Timeprobe_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timeprobe_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* ACE_COMPILE_TIMEPROBES */ -#include "ace/post.h" -#endif /* ACE_TIMEPROBE_T_H */ diff --git a/ace/Timer_Hash.cpp b/ace/Timer_Hash.cpp deleted file mode 100644 index a37df2e2fb4..00000000000 --- a/ace/Timer_Hash.cpp +++ /dev/null @@ -1,123 +0,0 @@ -// $Id$ - -// Timer_Hash.cpp - -#if !defined (ACE_TIMER_HASH_C) -#define ACE_TIMER_HASH_C - -#include "ace/Timer_Hash.h" - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Hash_T.cpp" -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -ACE_RCSID(ace, Timer_Hash, "$Id$") - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Free_List >; -template class ACE_Locked_Free_List, - ACE_Null_Mutex>; -template class ACE_Timer_Hash_Upcall , - ACE_SYNCH_RECURSIVE_MUTEX>; - -template class ACE_Timer_Queue_T ; - -template class ACE_Timer_Queue_Iterator_T ; - -template class ACE_Timer_List_T ; - -template class ACE_Timer_List_Iterator_T ; - -template class ACE_Timer_Heap_T ; - -template class ACE_Timer_Heap_Iterator_T ; - -template class ACE_Timer_Hash_T, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_Hash_Timer_List>; - -template class ACE_Timer_Hash_Iterator_T, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_Hash_Timer_List>; - -template class ACE_Timer_Hash_T, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_Hash_Timer_Heap>; - -template class ACE_Timer_Hash_Iterator_T, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_Hash_Timer_Heap>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Free_List > -#pragma instantiate ACE_Locked_Free_List, \ - ACE_Null_Mutex> -#pragma instantiate ACE_Timer_Hash_Upcall , \ - ACE_SYNCH_RECURSIVE_MUTEX> - -#pragma instantiate ACE_Timer_Queue_T - -#pragma instantiate ACE_Timer_Queue_Iterator_T - -#pragma instantiate ACE_Timer_List_T - -#pragma instantiate ACE_Timer_List_Iterator_T - -#pragma instantiate ACE_Timer_Heap_T - -#pragma instantiate ACE_Timer_Heap_Iterator_T - -#pragma instantiate ACE_Timer_Hash_T, \ - ACE_SYNCH_RECURSIVE_MUTEX, \ - ACE_Hash_Timer_List> - -#pragma instantiate ACE_Timer_Hash_Iterator_T, \ - ACE_SYNCH_RECURSIVE_MUTEX, \ - ACE_Hash_Timer_List> - -#pragma instantiate ACE_Timer_Hash_T, \ - ACE_SYNCH_RECURSIVE_MUTEX, \ - ACE_Hash_Timer_Heap> - -#pragma instantiate ACE_Timer_Hash_Iterator_T, \ - ACE_SYNCH_RECURSIVE_MUTEX, \ - ACE_Hash_Timer_Heap> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - -#endif /* ACE_TIMER_HASH_C */ diff --git a/ace/Timer_Hash.h b/ace/Timer_Hash.h deleted file mode 100644 index 189fbb7bace..00000000000 --- a/ace/Timer_Hash.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_Hash.h - * - * $Id$ - * - * @author Darrell Brunsch - */ -//============================================================================= - - -#ifndef ACE_TIMER_HASH_H -#define ACE_TIMER_HASH_H -#include "ace/pre.h" - -#include "ace/Timer_Hash_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Timer_Heap_T.h" -#include "ace/Timer_List_T.h" - -// The following typedef are here for ease of use - -typedef ACE_Timer_Hash_Upcall , - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Hash_Upcall; - -typedef ACE_Timer_List_T - ACE_Hash_Timer_List; - -typedef ACE_Timer_Heap_T - ACE_Hash_Timer_Heap; - - -typedef ACE_Timer_Hash_T, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_Hash_Timer_List> - - ACE_Timer_Hash; - -typedef ACE_Timer_Hash_Iterator_T, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_Hash_Timer_List> - ACE_Timer_Hash_Iterator; - -typedef ACE_Timer_Hash_T, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_Hash_Timer_Heap> - ACE_Timer_Hash_Heap; - -typedef ACE_Timer_Hash_Iterator_T, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_Hash_Timer_Heap> - ACE_Timer_Hash_Heap_Iterator; - -#include "ace/post.h" -#endif /* ACE_TIMER_HASH_H */ diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp deleted file mode 100644 index a83a5e3acb6..00000000000 --- a/ace/Timer_Hash_T.cpp +++ /dev/null @@ -1,649 +0,0 @@ -// $Id$ - -#ifndef ACE_TIMER_HASH_T_C -#define ACE_TIMER_HASH_T_C - -#include "ace/Timer_Hash_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/High_Res_Timer.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, - Timer_Hash_T, - "$Id$") - -struct Hash_Token -{ - Hash_Token (const void *act, - size_t pos, - long orig_id) - : act_ (act), - pos_ (pos), - orig_id_ (orig_id) - {} - - const void *act_; - size_t pos_; - long orig_id_; -}; - -// Default constructor - -template -ACE_Timer_Hash_Upcall::ACE_Timer_Hash_Upcall (void) - : timer_hash_ (0) -{ - // Nothing -} - -// Constructor that specifies a Timer_Hash to call up to - -template -ACE_Timer_Hash_Upcall::ACE_Timer_Hash_Upcall (ACE_Timer_Queue_T *timer_hash) - : timer_hash_ (timer_hash) -{ - // Nothing -} - -// Calls up to timer_hash's upcall functor - -template int -ACE_Timer_Hash_Upcall::timeout (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *arg, - const ACE_Time_Value &cur_time) -{ - ACE_UNUSED_ARG (timer_queue); - - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - arg)); - int result = - this->timer_hash_->upcall_functor ().timeout (*this->timer_hash_, - handler, - h->act_, - cur_time); - delete h; - return result; -} - - -// Calls up to timer_hash's upcall functor - -template int -ACE_Timer_Hash_Upcall::cancellation (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler) -{ - ACE_UNUSED_ARG (timer_queue); - return this->timer_hash_->upcall_functor ().cancellation (*this->timer_hash_, - handler); -} - - -// Calls up to timer_hash's upcall functor - -template int -ACE_Timer_Hash_Upcall::deletion (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *arg) -{ - ACE_UNUSED_ARG (timer_queue); - - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - arg)); - int result = - this->timer_hash_->upcall_functor ().deletion (*this->timer_hash_, - handler, - h->act_); - delete h; - return result; -} - - - -template -ACE_Timer_Hash_Iterator_T::ACE_Timer_Hash_Iterator_T (ACE_Timer_Hash_T &hash) - : timer_hash_ (hash) -{ - this->first (); - // Nothing -} - -// Positions the iterator at the first node in the timing hash table - -template void -ACE_Timer_Hash_Iterator_T::first (void) -{ - for (this->position_ = 0; - this->position_ < this->timer_hash_.table_size_; - this->position_++) - { - // Check for an empty entry - if (!this->timer_hash_.table_[this->position_]->is_empty ()) - { - this->iter_ = &this->timer_hash_.table_[this->position_]->iter (); - this->iter_->first (); - return; - } - } - - // Didn't find any - this->iter_ = 0; -} - -// Positions the iterator at the next node in the bucket or goes to the next -// bucket - -template void -ACE_Timer_Hash_Iterator_T::next (void) -{ - if (this->isdone ()) - return; - - // If there is no more in the current bucket, go to the next - if (this->iter_->isdone ()) - { - for (this->position_++; - this->position_ < this->timer_hash_.table_size_; - this->position_++) - { - // Check for an empty entry - if (!this->timer_hash_.table_[this->position_]->is_empty ()) - { - this->iter_ = &this->timer_hash_.table_[this->position_]->iter (); - this->iter_->first (); - return; - } - } - - // Didn't find any. - this->iter_ = 0; - } - else - this->iter_->next (); -} - -// Returns true when we are at the end (when bucket_item_ == 0) - -template int -ACE_Timer_Hash_Iterator_T::isdone (void) const -{ - return this->iter_ == 0; -} - -// Returns the node at the current position in the sequence - -template ACE_Timer_Node_T * -ACE_Timer_Hash_Iterator_T::item (void) -{ - if (this->isdone ()) - return 0; - - return this->iter_->item (); -} - -template ACE_Timer_Queue_Iterator_T & -ACE_Timer_Hash_T::iter (void) -{ - this->iterator_->first (); - return *this->iterator_; -} - -// Create an empty queue. - -template -ACE_Timer_Hash_T::ACE_Timer_Hash_T (size_t table_size, - FUNCTOR *upcall_functor, - ACE_Free_List > *freelist) - : ACE_Timer_Queue_T (upcall_functor, freelist), - size_ (0), - table_size_ (table_size), - table_functor_ (this), - earliest_position_ (0) -#if defined (ACE_WIN64) - , pointer_base_ (0) -#endif /* ACE_WIN64 */ -{ - ACE_TRACE ("ACE_Timer_Hash_T::ACE_Timer_Hash_T"); - - ACE_NEW (table_, - BUCKET *[table_size]); - - this->gettimeofday (ACE_OS::gettimeofday); - - for (size_t i = 0; - i < table_size; - i++) - { - ACE_NEW (this->table_[i], - BUCKET (&this->table_functor_, - this->free_list_)); - this->table_[i]->gettimeofday (ACE_OS::gettimeofday); - } - - ACE_NEW (iterator_, - HASH_ITERATOR (*this)); -} - - -template -ACE_Timer_Hash_T::ACE_Timer_Hash_T (FUNCTOR *upcall_functor, - ACE_Free_List > *freelist) - : ACE_Timer_Queue_T (upcall_functor, freelist), - size_ (0), - table_size_ (ACE_DEFAULT_TIMER_HASH_TABLE_SIZE), - table_functor_ (this), - earliest_position_ (0) -#if defined (ACE_WIN64) - , pointer_base_ (0) -#endif /* ACE_WIN64 */ -{ - ACE_TRACE ("ACE_Timer_Hash_T::ACE_Timer_Hash_T"); - - ACE_NEW (table_, - BUCKET *[ACE_DEFAULT_TIMER_HASH_TABLE_SIZE]); - - - this->gettimeofday (ACE_OS::gettimeofday); - - for (size_t i = 0; - i < this->table_size_; - i++) - { - ACE_NEW (this->table_[i], - BUCKET (&this->table_functor_, - this->free_list_)); - this->table_[i]->gettimeofday (ACE_OS::gettimeofday); - } - - ACE_NEW (iterator_, - HASH_ITERATOR (*this)); -} - -// Remove all remaining items in the Queue. - -template -ACE_Timer_Hash_T::~ACE_Timer_Hash_T (void) -{ - ACE_TRACE ("ACE_Timer_Hash_T::~ACE_Timer_Hash_T"); - ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_)); - - delete iterator_; - - for (size_t i = 0; - i < this->table_size_; - i++) - delete this->table_[i]; - - delete [] this->table_; -} - -// Checks if queue is empty. - -template int -ACE_Timer_Hash_T::is_empty (void) const -{ - ACE_TRACE ("ACE_Timer_Hash_T::is_empty"); - return this->table_[this->earliest_position_]->is_empty (); -} - -// Returns earliest time in a non-empty bucket - -template const ACE_Time_Value & -ACE_Timer_Hash_T::earliest_time (void) const -{ - ACE_TRACE ("ACE_Timer_Hash_T::earliest_time"); - return this->table_[this->earliest_position_]->earliest_time (); -} - -template void -ACE_Timer_Hash_T::dump (void) const -{ - ACE_TRACE ("ACE_Timer_Hash_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntable_size_ = %d"), this->table_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nearliest_position_ = %d"), this->earliest_position_)); - - for (size_t i = 0; i < this->table_size_; i++) - if (!this->table_[i]->is_empty ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nBucket %d contains nodes"), i)); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// Reschedule a periodic timer. This function must be called with the -// mutex lock held. - -template void -ACE_Timer_Hash_T::reschedule (ACE_Timer_Node_T *expired) -{ - ACE_TRACE ("ACE_Timer_Hash_T::reschedule"); - - size_t position = - expired->get_timer_value ().sec () % this->table_size_; - - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - expired->get_act ())); - - h->orig_id_ = this->table_[position]->schedule (expired->get_type (), - h, - expired->get_timer_value (), - expired->get_interval ()); - - if (this->table_[this->earliest_position_]->is_empty () - || this->table_[position]->earliest_time () - < this->table_[this->earliest_position_]->earliest_time ()) - this->earliest_position_ = position; -} - -// Insert a new handler that expires at time future_time; if interval -// is > 0, the handler will be reinvoked periodically. - -template long -ACE_Timer_Hash_T::schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Timer_Hash_T::schedule"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - size_t position = - future_time.sec () % this->table_size_; - - Hash_Token *h; - - ACE_NEW_RETURN (h, - Hash_Token (act, - position, - 0), - -1); - - h->orig_id_ = this->table_[position]->schedule (type, - h, - future_time, - interval); - - if (this->table_[this->earliest_position_]->is_empty () - || this->table_[position]->earliest_time () - < this->table_[this->earliest_position_]->earliest_time ()) - this->earliest_position_ = position; - - ++this->size_; - -#if defined (ACE_WIN64) - // This is a Win64 hack, necessary because of the original (bad) decision - // to use a pointer as the timer ID. This class doesn't follow the usual - // timer expiration rules (see comments in header file) and is probably - // not used much. The dynamic allocation of Hash_Tokens without - // recording them anywhere is a large problem for Win64 since the - // size of a pointer is 64 bits, but a long is 32. Since this class - // is not much used, I'm hacking this, at least for now. If it becomes - // an issue, I'll look at it again then. - ptrdiff_t hi = ACE_reinterpret_cast (ptrdiff_t, h); - if (this->pointer_base_ == 0) - this->pointer_base_ = hi & 0xffffffff00000000; - return ACE_reinterpret_cast (long, hi & 0xffffffff); -#else - return ACE_reinterpret_cast (long, h); -#endif -} - -// Locate and update the inteval on the timer_id - -template int -ACE_Timer_Hash_T::reset_interval (long timer_id, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Timer_Hash_T::reset_interval"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - // Make sure we are getting a valid , not an error - // returned by . - if (timer_id == -1) - return -1; - - -#if defined (ACE_WIN64) - unsigned long timer_offset = ACE_static_cast (unsigned long, timer_id); - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - (this->pointer_base_ + timer_offset)); -#else - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - timer_id); -#endif /* ACE_WIN64 */ - - return this->table_[h->pos_]->reset_interval (h->orig_id_, - interval); -} - -// Locate and remove the single with a value of -// from the correct table timer queue. - -template int -ACE_Timer_Hash_T::cancel (long timer_id, - const void **act, - int dont_call) -{ - ACE_TRACE ("ACE_Timer_Hash_T::cancel"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - // Make sure we are getting a valid , not an error - // returned by . - if (timer_id == -1) - return 0; - -#if defined (ACE_WIN64) - unsigned long timer_offset = ACE_static_cast (unsigned long, timer_id); - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - (this->pointer_base_ + timer_offset)); -#else - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - timer_id); -#endif /* ACE_WIN64 */ - - int result = this->table_[h->pos_]->cancel (h->orig_id_, - act, - dont_call); - - if (h->pos_ == this->earliest_position_) - this->find_new_earliest (); - - if (act != 0) - *act = h->act_; - - delete h; - - --this->size_; - - return result; -} - -// Locate and remove all values of from the timer queue. - -template int -ACE_Timer_Hash_T::cancel (const TYPE &type, - int dont_call) -{ - ACE_TRACE ("ACE_Timer_Hash_T::cancel"); - - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - size_t i; // loop variable. - - Hash_Token **timer_ids; - - ACE_NEW_RETURN (timer_ids, - Hash_Token *[this->size_], - -1); - size_t pos = 0; - - for (i = 0; - i < this->table_size_; - i++) - { - ACE_Timer_Queue_Iterator_T, - ACE_Null_Mutex> &iter = - this->table_[i]->iter (); - - for (iter.first (); - !iter.isdone (); - iter.next ()) - if (iter.item ()->get_type () == type) - timer_ids[pos++] = - ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - iter.item ()->get_act ())); - } - - if (pos > this->size_) - return -1; - - for (i = 0; i < pos; i++) - { - this->table_[timer_ids[i]->pos_]->cancel (timer_ids[i]->orig_id_, - 0, - 1); - delete timer_ids[i]; - --this->size_; - } - - delete [] timer_ids; - - if (dont_call == 0) - this->upcall_functor ().cancellation (*this, - type); - this->find_new_earliest (); - - return ACE_static_cast (int, pos); -} - -// Removes the earliest node and finds the new earliest position - -template ACE_Timer_Node_T * -ACE_Timer_Hash_T::remove_first (void) -{ - if (this->is_empty ()) - return 0; - - ACE_Timer_Node_T *temp = - this->table_[this->earliest_position_]->remove_first (); - - this->find_new_earliest (); - - --this->size_; - - return temp; -} - -// Finds a new earliest position - -template void -ACE_Timer_Hash_T::find_new_earliest (void) -{ - for (size_t i = 0; i < this->table_size_; i++) - if (!this->table_[i]->is_empty ()) - if (this->table_[this->earliest_position_]->is_empty () - || this->earliest_time () == ACE_Time_Value::zero - || this->table_[i]->earliest_time () <= this->earliest_time ()) - this->earliest_position_ = i; -} - -// Returns the earliest node without removing it - -template ACE_Timer_Node_T * -ACE_Timer_Hash_T::get_first (void) -{ - ACE_TRACE ("ACE_Timer_Hash_T::get_first"); - - if (this->is_empty ()) - return 0; - - return this->table_[this->earliest_position_]->get_first (); -} - -// Dummy version of expire to get rid of warnings in Sun CC 4.2 - -template int -ACE_Timer_Hash_T::expire () -{ - return ACE_Timer_Queue_T::expire(); -} - -// Specialized expire for Timer Hash - -template int -ACE_Timer_Hash_T::expire (const ACE_Time_Value &cur_time) -{ - ACE_TRACE ("ACE_Timer_Hash_T::expire"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - int number_of_timers_expired = 0; - - ACE_Timer_Node_T *expired; - - // Go through the table and expire anything that can be expired - - for (size_t i = 0; - i < this->table_size_; - i++) - { - while (!this->table_[i]->is_empty () - && this->table_[i]->earliest_time () <= cur_time) - { - expired = this->table_[i]->get_first (); - TYPE type = expired->get_type (); - const void *act = expired->get_act (); - int reclaim = 1; - - // Check if this is an interval timer. - if (expired->get_interval () > ACE_Time_Value::zero) - { - // Make sure that we skip past values that have already - // "expired". - do - expired->set_timer_value (expired->get_timer_value () - + expired->get_interval ()); - while (expired->get_timer_value () <= cur_time); - - // Since this is an interval timer, we need to - // reschedule it. - this->reschedule (expired); - reclaim = 0; - } - - // Now remove the timer from the original table... if - // it's a simple, non-recurring timer, it's got to be - // removed anyway. If it was rescheduled, it's been - // scheduled into the correct table (regardless of whether - // it's the same one or not) already. - this->table_[i]->cancel (expired->get_timer_id ()); - - Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, - ACE_const_cast (void *, - act)); - // Call the functor. - this->upcall (type, - h->act_, - cur_time); - if (reclaim) - { - --this->size_; - delete h; - } - number_of_timers_expired++; - } - } - - return number_of_timers_expired; -} - -#endif /* ACE_TIMER_HASH_T_C */ diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h deleted file mode 100644 index 3e0d0548427..00000000000 --- a/ace/Timer_Hash_T.h +++ /dev/null @@ -1,289 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_Hash_T.h - * - * $Id$ - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_TIMER_HASH_T_H -#define ACE_TIMER_HASH_T_H -#include "ace/pre.h" - -#include "ace/Timer_Queue_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Free_List.h" - -// Forward declaration. -template -class ACE_Timer_Hash_T; - -/** - * @class ACE_Timer_Hash_Upcall - * - * @brief Functor for Timer_Hash - * - * This class calls up to the Timer Hash's functor from the - * timer queues in the hash table - */ -template -class ACE_Timer_Hash_Upcall -{ -public: - typedef ACE_Timer_Queue_T, - ACE_Null_Mutex> - TIMER_QUEUE; - - /// Default constructor (creates an invalid object, but needs to be here - /// so timer queues using this functor can be constructed) - ACE_Timer_Hash_Upcall (void); - - /// Constructor that specifies a Timer_Hash to call up to - ACE_Timer_Hash_Upcall (ACE_Timer_Queue_T *timer_hash); - - /// This method is called when the timer expires - int timeout (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *arg, - const ACE_Time_Value &cur_time); - - /// This method is called when the timer is cancelled - int cancellation (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler); - - /// This method is called when the timer queue is destroyed and - /// the timer is still contained in it - int deletion (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *arg); - -private: - /// Timer Queue to do the calling up to - ACE_Timer_Queue_T *timer_hash_; - - // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Hash_Upcall (const ACE_Timer_Hash_Upcall &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_Upcall &)) -}; - -/** - * @class ACE_Timer_Hash_Iterator_T - * - * @brief Iterates over an . - * - * This is a generic iterator that can be used to visit every - * node of a timer queue. Be aware that it doesn't transverse - * in the order of timeout values. - */ -template -class ACE_Timer_Hash_Iterator_T : public ACE_Timer_Queue_Iterator_T -{ -public: - /// Constructor. - ACE_Timer_Hash_Iterator_T (ACE_Timer_Hash_T &); - - /// Positions the iterator at the earliest node in the Timer Queue - virtual void first (void); - - /// Positions the iterator at the next node in the Timer Queue - virtual void next (void); - - /// Returns true when there are no more nodes in the sequence - virtual int isdone (void) const; - - /// Returns the node at the current position in the sequence - virtual ACE_Timer_Node_T *item (void); - -protected: - /// Pointer to the that we are iterating over. - ACE_Timer_Hash_T &timer_hash_; - - /// Current position in 's table - size_t position_; - - /// Current iterator used on 's bucket - ACE_Timer_Queue_Iterator_T, ACE_Null_Mutex> *iter_; -}; - -/** - * @class ACE_Timer_Hash_T - * - * @brief Provides a hash table of s as an implementation for - * a timer queue. - * - * This implementation uses a hash table of BUCKETs. The hash - * is based on the time_value of the event. Unlike other Timer - * Queues, ACE_Timer_Hash does not expire events in order. - */ -template -class ACE_Timer_Hash_T : public ACE_Timer_Queue_T -{ -public: - /// Type of iterator - typedef ACE_Timer_Hash_Iterator_T - HASH_ITERATOR; - - /// Iterator is a friend - friend class ACE_Timer_Hash_Iterator_T; - - /// Type inherited from - typedef ACE_Timer_Queue_T INHERITED; - - // = Initialization and termination methods. - /** - * Default constructor. determines the size of the - * hash table. is the instance of the FUNCTOR - * to be used by the buckets. If is 0, a default - * FUNCTOR will be created. - */ - ACE_Timer_Hash_T (size_t table_size, - FUNCTOR *upcall_functor = 0, - ACE_Free_List > *freelist = 0); - - /** - * Default constructor. is the instance of the - * FUNCTOR to be used by the queue. If is 0, Timer - * Hash will create a default FUNCTOR. the freelist of - * timer nodes. If 0, then a default freelist will be created. The default - * size will be ACE_DEFAULT_TIMERS and there will be no preallocation. - */ - ACE_Timer_Hash_T (FUNCTOR *upcall_functor = 0, ACE_Free_List > *freelist = 0); - - /// Destructor - virtual ~ACE_Timer_Hash_T (void); - - /// True if queue is empty, else false. - virtual int is_empty (void) const; - - /// Returns the time of the earlier node in the . - /// Must be called on a non-empty queue. - virtual const ACE_Time_Value &earliest_time (void) const; - - /** - * Schedule that will expire at , - * which is specified in absolute time. If it expires then is - * passed in as the value to the . If is != to - * then it is used to reschedule the - * automatically, using relative time to the current . - * This method returns a that is a pointer to a token - * which stores information about the event. This can be - * used to cancel the timer before it expires. Returns -1 on - * failure. - */ - virtual long schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval = ACE_Time_Value::zero); - - /** - * Resets the interval of the timer represented by to - * , which is specified in relative time to the current - * . If is equal to - * , the timer will become a non-rescheduling - * timer. Returns 0 if successful, -1 if not. - */ - virtual int reset_interval (long timer_id, - const ACE_Time_Value &interval); - - /** - * Cancel all timer associated with . If is 0 - * then the will be invoked. Returns number of timers - * cancelled. - */ - virtual int cancel (const TYPE &type, - int dont_call_handle_close = 1); - - /** - * Cancel the single timer that matches the value (which - * was returned from the method). If act is non-NULL - * then it will be set to point to the ``magic cookie'' argument - * passed in when the timer was registered. This makes it possible - * to free up the memory and avoid memory leaks. If is - * 0 then the will be invoked. Returns 1 if cancellation - * succeeded and 0 if the wasn't found. - */ - virtual int cancel (long timer_id, - const void **act = 0, - int dont_call_handle_close = 1); - - /** - * Run the for all timers whose values are <= - * . Also accounts for . Returns - * the number of timers canceled. - */ - virtual int expire (void); - - /** - * Run the for all timers whose values are <= . - * This does not account for . Returns the number of - * timers canceled. - */ - virtual int expire (const ACE_Time_Value ¤t_time); - - /// Returns a pointer to this 's iterator. - virtual ACE_Timer_Queue_Iterator_T &iter (void); - - /// Removes the earliest node from the queue and returns it - virtual ACE_Timer_Node_T *remove_first (void); - - /// Dump the state of an object. - virtual void dump (void) const; - - /// Reads the earliest node from the queue and returns it. - virtual ACE_Timer_Node_T *get_first (void); - -private: - /// Reschedule an "interval" . - virtual void reschedule (ACE_Timer_Node_T *); - - /// Finds the earliest node - void find_new_earliest (void); - - /// Keeps track of the size of the queue - size_t size_; - - /// Table of BUCKETS - BUCKET **table_; - - /// Keeps track of the size of table_ - size_t table_size_; - - /// Functor used for the table's timer queues - ACE_Timer_Hash_Upcall table_functor_; - - /// Index to the position with the earliest entry - size_t earliest_position_; - - /// Iterator used to expire timers. - HASH_ITERATOR *iterator_; - -#if defined (ACE_WIN64) - // Part of a hack... see comments in schedule(). - // This is, essentially, the upper 32 bits of a 64-bit pointer on Win64. - ptrdiff_t pointer_base_; -#endif - - // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Hash_T (const ACE_Timer_Hash_T &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_T &)) -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Hash_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Hash_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_TIMER_HASH_T_H */ diff --git a/ace/Timer_Heap.cpp b/ace/Timer_Heap.cpp deleted file mode 100644 index 63e9f886bcc..00000000000 --- a/ace/Timer_Heap.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -#if !defined (ACE_TIMER_HEAP_C) -#define ACE_TIMER_HEAP_C - -#include "ace/Timer_Heap.h" - -ACE_RCSID(ace, Timer_Heap, "$Id$") - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Hash.h" -#include "ace/Timer_Heap_T.cpp" -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class - ACE_Timer_Heap_T< - ACE_Event_Handler*, - ACE_Timer_Hash_Upcall< - ACE_Event_Handler*, - ACE_Event_Handler_Handle_Timeout_Upcall, - ACE_Null_Mutex>, - ACE_Null_Mutex>; - -template class - ACE_Timer_Heap_Iterator_T< - ACE_Event_Handler*, - ACE_Timer_Hash_Upcall< - ACE_Event_Handler*, - ACE_Event_Handler_Handle_Timeout_Upcall, - ACE_Null_Mutex>, - ACE_Null_Mutex>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Timer_Heap_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_Heap_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Timer_Heap_T, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Timer_Heap_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_TIMER_HEAP_C */ diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h deleted file mode 100644 index 52b211fab10..00000000000 --- a/ace/Timer_Heap.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_Heap.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_TIMER_HEAP_H -#define ACE_TIMER_HEAP_H -#include "ace/pre.h" - -#include "ace/Timer_Heap_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// The following typedef are here for ease of use and backward -// compatibility. - -typedef ACE_Timer_Heap_T, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Heap; - -typedef ACE_Timer_Heap_Iterator_T, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Heap_Iterator; - -#include "ace/post.h" -#endif /* ACE_TIMER_HEAP_H */ diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp deleted file mode 100644 index a9aae8639fc..00000000000 --- a/ace/Timer_Heap_T.cpp +++ /dev/null @@ -1,787 +0,0 @@ -// $Id$ - -#ifndef ACE_TIMER_HEAP_T_C -#define ACE_TIMER_HEAP_T_C - -#include "ace/Timer_Heap_T.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Timer_Heap_T, "$Id$") - -// Define some simple macros to clarify the code. -#define ACE_HEAP_PARENT(X) (X == 0 ? 0 : (((X) - 1) / 2)) -#define ACE_HEAP_LCHILD(X) (((X)+(X))+1) - -// Constructor that takes in an to iterate over. - -template -ACE_Timer_Heap_Iterator_T::ACE_Timer_Heap_Iterator_T (ACE_Timer_Heap_T &heap) - : timer_heap_ (heap) -{ - ACE_TRACE ("ACE_Timer_Heap_Iterator_T::ACE_Timer_Heap_Iterator"); - this->first(); -} - -template -ACE_Timer_Heap_Iterator_T::~ACE_Timer_Heap_Iterator_T (void) -{ -} - -// Positions the iterator at the first node in the heap array - -template void -ACE_Timer_Heap_Iterator_T::first (void) -{ - this->position_ = 0; -} - -// Positions the iterator at the next node in the heap array - -template void -ACE_Timer_Heap_Iterator_T::next (void) -{ - if (this->position_ != this->timer_heap_.cur_size_) - this->position_++; -} - -// Returns true the is at the end of the heap array - -template int -ACE_Timer_Heap_Iterator_T::isdone (void) const -{ - return this->position_ == this->timer_heap_.cur_size_; -} - -// Returns the node at the current position in the heap or 0 if at the end - -template ACE_Timer_Node_T * -ACE_Timer_Heap_Iterator_T::item (void) -{ - if (this->position_ != this->timer_heap_.cur_size_) - return this->timer_heap_.heap_[this->position_]; - return 0; -} - -// Constructor -// Note that timer_ids_curr_ and timer_ids_min_free_ both start at 0. -// Since timer IDs are assigned by first incrementing the timer_ids_curr_ -// value, the first ID assigned will be 1 (just as in the previous design). -// When it's time to wrap, the next ID given out will be 0. -template -ACE_Timer_Heap_T::ACE_Timer_Heap_T (size_t size, - int preallocate, - FUNCTOR *upcall_functor, - ACE_Free_List > *freelist) - : ACE_Timer_Queue_T (upcall_functor, freelist), - max_size_ (size), - cur_size_ (0), - cur_limbo_ (0), - timer_ids_curr_ (0), - timer_ids_min_free_ (0), - preallocated_nodes_ (0), - preallocated_nodes_freelist_ (0) -{ - ACE_TRACE ("ACE_Timer_Heap_T::ACE_Timer_Heap_T"); - - // Create the heap array. - ACE_NEW (this->heap_, - ACE_Timer_Node_T *[size]); - - // Create the parallel - ACE_NEW (this->timer_ids_, - ssize_t[size]); - - // Initialize the "freelist," which uses negative values to - // distinguish freelist elements from "pointers" into the - // array. - for (size_t i = 0; i < size; i++) - this->timer_ids_[i] = -1; - - if (preallocate) - { - ACE_NEW (this->preallocated_nodes_, - ACE_Timer_Node_T[size]); - - // Add allocated array to set of such arrays for deletion on - // cleanup. - this->preallocated_node_set_.insert (this->preallocated_nodes_); - - // Form the freelist by linking the next_ pointers together. - for (size_t j = 1; j < size; j++) - this->preallocated_nodes_[j - 1].set_next (&this->preallocated_nodes_[j]); - - // NULL-terminate the freelist. - this->preallocated_nodes_[size - 1].set_next (0); - - // Assign the freelist pointer to the front of the list. - this->preallocated_nodes_freelist_ = - &this->preallocated_nodes_[0]; - } - - ACE_NEW (iterator_, - HEAP_ITERATOR (*this)); -} - -// Note that timer_ids_curr_ and timer_ids_min_free_ both start at 0. -// Since timer IDs are assigned by first incrementing the timer_ids_curr_ -// value, the first ID assigned will be 1 (just as in the previous design). -// When it's time to wrap, the next ID given out will be 0. -template -ACE_Timer_Heap_T::ACE_Timer_Heap_T (FUNCTOR *upcall_functor, - ACE_Free_List > *freelist) - : ACE_Timer_Queue_T (upcall_functor, freelist), - max_size_ (ACE_DEFAULT_TIMERS), - cur_size_ (0), - cur_limbo_ (0), - timer_ids_curr_ (0), - timer_ids_min_free_ (0), - preallocated_nodes_ (0), - preallocated_nodes_freelist_ (0) -{ - ACE_TRACE ("ACE_Timer_Heap_T::ACE_Timer_Heap_T"); - - // Create the heap array. -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) - ACE_NEW (this->heap_, - ACE_Timer_Node_T *[ACE_DEFAULT_TIMERS]); -#else - ACE_NEW (this->heap_, - ACE_Timer_Node_T *[this->max_size_]); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) */ - - // Create the parallel array. - ACE_NEW (this->timer_ids_, - ssize_t[this->max_size_]); - - // Initialize the "freelist," which uses negative values to - // distinguish freelist elements from "pointers" into the - // array. - for (size_t i = 0; i < this->max_size_; i++) - this->timer_ids_[i] = -1; - - ACE_NEW (iterator_, - HEAP_ITERATOR (*this)); -} - -template -ACE_Timer_Heap_T::~ACE_Timer_Heap_T (void) -{ - ACE_TRACE ("ACE_Timer_Heap_T::~ACE_Timer_Heap_T"); - - delete iterator_; - - // Clean up all the nodes still in the queue - for (size_t i = 0; i < this->cur_size_; i++) - { - this->upcall_functor ().deletion (*this, - this->heap_[i]->get_type (), - this->heap_[i]->get_act ()); - this->free_node (this->heap_[i]); - } - - delete [] this->heap_; - delete [] this->timer_ids_; - - // clean up any preallocated timer nodes - if (preallocated_nodes_ != 0) - { - ACE_Unbounded_Set_Iterator *> - set_iterator (this->preallocated_node_set_); - - for (ACE_Timer_Node_T **entry = 0; - set_iterator.next (entry) !=0; - set_iterator.advance ()) - delete [] *entry; - } -} - -template int -ACE_Timer_Heap_T::pop_freelist (void) -{ - ACE_TRACE ("ACE_Timer_Heap_T::pop_freelist"); - - // Scan for a free timer ID. Note that since this function is called - // _after_ the check for a full timer heap, we are guaranteed to find - // a free ID, even if we need to wrap around and start reusing freed IDs. - // On entry, the curr_ index is at the previous ID given out; start - // up where we left off last time. - // NOTE - a timer_ids_ slot with -2 is out of the heap, but not freed. - // It must be either freed (free_node) or rescheduled (reschedule). - ++this->timer_ids_curr_; - while (this->timer_ids_curr_ < this->max_size_ && - (this->timer_ids_[this->timer_ids_curr_] >= 0 || - this->timer_ids_[this->timer_ids_curr_] == -2 )) - ++this->timer_ids_curr_; - if (this->timer_ids_curr_ == this->max_size_) - { - ACE_ASSERT (this->timer_ids_min_free_ < this->max_size_); - this->timer_ids_curr_ = this->timer_ids_min_free_; - // We restarted the free search at min. Since min won't be - // free anymore, and curr_ will just keep marching up the list - // on each successive need for an ID, reset min_free_ to the - // size of the list until an ID is freed that curr_ has already - // gone past (see push_freelist). - this->timer_ids_min_free_ = this->max_size_; - } - - // We need to truncate this to for backwards compatibility. - int new_id = ACE_static_cast (int, - this->timer_ids_curr_); - return new_id; -} - -template void -ACE_Timer_Heap_T::push_freelist (int old_id) -{ - ACE_TRACE ("ACE_Timer_Heap_T::push_freelist"); - - // Since this ID has already been checked by one of the public - // functions, it's safe to cast it here. - size_t oldid = size_t (old_id); - - // The freelist values in the are negative, so set the - // freed entry back to 'free'. If this is the new lowest value free - // timer ID that curr_ won't see on it's normal march through the list, - // remember it. - ACE_ASSERT (this->timer_ids_[oldid] >= 0 || this->timer_ids_[oldid] == -2); - if (this->timer_ids_[oldid] == -2) - --this->cur_limbo_; - else - --this->cur_size_; - this->timer_ids_[oldid] = -1; - if (oldid < this->timer_ids_min_free_ && oldid <= this->timer_ids_curr_) - this->timer_ids_min_free_ = oldid; - return; -} - -template int -ACE_Timer_Heap_T::timer_id (void) -{ - ACE_TRACE ("ACE_Timer_Heap_T::timer_id"); - - // Return the next item off the freelist and use it as the timer id. - return this->pop_freelist (); -} - -// Checks if queue is empty. - -template int -ACE_Timer_Heap_T::is_empty (void) const -{ - ACE_TRACE ("ACE_Timer_Heap_T::is_empty"); - return this->cur_size_ == 0; -} - -template ACE_Timer_Queue_Iterator_T & -ACE_Timer_Heap_T::iter (void) -{ - this->iterator_->first (); - return *this->iterator_; -} - -// Returns earliest time in a non-empty queue. - -template const ACE_Time_Value & -ACE_Timer_Heap_T::earliest_time (void) const -{ - ACE_TRACE ("ACE_Timer_Heap_T::earliest_time"); - return this->heap_[0]->get_timer_value (); -} - -template void -ACE_Timer_Heap_T::dump (void) const -{ - ACE_TRACE ("ACE_Timer_Heap_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmax_size_ = %d"), this->max_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_limbo_= %d"), this->cur_limbo_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nids_curr_ = %d"), - this->timer_ids_curr_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmin_free_ = %d"), - this->timer_ids_min_free_)); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nheap_ = \n"))); - - for (size_t i = 0; i < this->cur_size_; i++) - { - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%d\n"), - i)); - this->heap_[i]->dump (); - } - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_ids_ = \n"))); - - for (size_t j = 0; j < this->max_size_; j++) - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%d\t%d\n"), - j, - this->timer_ids_[j])); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template void -ACE_Timer_Heap_T::copy (size_t slot, - ACE_Timer_Node_T *moved_node) -{ - // Insert into its new location in the heap. - this->heap_[slot] = moved_node; - - ACE_ASSERT (moved_node->get_timer_id () >= 0 - && moved_node->get_timer_id () < (int) this->max_size_); - - // Update the corresponding slot in the parallel array. - this->timer_ids_[moved_node->get_timer_id ()] = slot; -} - -// Remove the slot'th timer node from the heap, but do not reclaim its -// timer ID or change the size of this timer heap object. The caller of -// this function must call either free_node (to reclaim the timer ID -// and the timer node memory, as well as decrement the size of the queue) -// or reschedule (to reinsert the node in the heap at a new time). -template ACE_Timer_Node_T * -ACE_Timer_Heap_T::remove (size_t slot) -{ - ACE_Timer_Node_T *removed_node = - this->heap_[slot]; - - // NOTE - the cur_size_ is being decremented since the queue has one - // less active timer in it. However, this ACE_Timer_Node is not being - // freed, and there is still a place for it in timer_ids_ (the timer ID - // is not being relinquished). The node can still be rescheduled, or - // it can be freed via free_node. - --this->cur_size_; - - // Only try to reheapify if we're not deleting the last entry. - - if (slot < this->cur_size_) - { - ACE_Timer_Node_T *moved_node = - this->heap_[this->cur_size_]; - - // Move the end node to the location being removed and update - // the corresponding slot in the parallel array. - this->copy (slot, moved_node); - - // If the time_value_> is great than or equal its - // parent it needs be moved down the heap. - size_t parent = ACE_HEAP_PARENT (slot); - - if (moved_node->get_timer_value () - >= this->heap_[parent]->get_timer_value ()) - this->reheap_down (moved_node, - slot, - ACE_HEAP_LCHILD (slot)); - else - this->reheap_up (moved_node, - slot, - parent); - } - - this->timer_ids_[removed_node->get_timer_id ()] = -2; - ++this->cur_limbo_; - return removed_node; -} - -template void -ACE_Timer_Heap_T::reheap_down (ACE_Timer_Node_T *moved_node, - size_t slot, - size_t child) -{ - // Restore the heap property after a deletion. - - while (child < this->cur_size_) - { - // Choose the smaller of the two children. - if (child + 1 < this->cur_size_ - && this->heap_[child + 1]->get_timer_value () - < this->heap_[child]->get_timer_value ()) - child++; - - // Perform a if the child has a larger timeout value than - // the . - if (this->heap_[child]->get_timer_value () - < moved_node->get_timer_value ()) - { - this->copy (slot, - this->heap_[child]); - slot = child; - child = ACE_HEAP_LCHILD (child); - } - else - // We've found our location in the heap. - break; - } - - this->copy (slot, moved_node); -} - -template void -ACE_Timer_Heap_T::reheap_up (ACE_Timer_Node_T *moved_node, - size_t slot, - size_t parent) -{ - // Restore the heap property after an insertion. - - while (slot > 0) - { - // If the parent node is greater than the we need - // to copy it down. - if (moved_node->get_timer_value () - < this->heap_[parent]->get_timer_value ()) - { - this->copy (slot, this->heap_[parent]); - slot = parent; - parent = ACE_HEAP_PARENT (slot); - } - else - break; - } - - // Insert the new node into its proper resting place in the heap and - // update the corresponding slot in the parallel array. - this->copy (slot, - moved_node); -} - -template void -ACE_Timer_Heap_T::insert (ACE_Timer_Node_T *new_node) -{ - if (this->cur_size_ + 2 >= this->max_size_) - this->grow_heap (); - - this->reheap_up (new_node, - this->cur_size_, - ACE_HEAP_PARENT (this->cur_size_)); - this->cur_size_++; -} - -template void -ACE_Timer_Heap_T::grow_heap (void) -{ - // All the containers will double in size from max_size_ - size_t new_size = this->max_size_ * 2; - - // First grow the heap itself. - - ACE_Timer_Node_T **new_heap = 0; - -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) - ACE_NEW (new_heap, - ACE_Timer_Node_T *[1024]); -#else - ACE_NEW (new_heap, - ACE_Timer_Node_T *[new_size]); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) */ - ACE_OS::memcpy (new_heap, - this->heap_, - this->max_size_ * sizeof *new_heap); - delete [] this->heap_; - this->heap_ = new_heap; - - // Grow the array of timer ids. - - ssize_t *new_timer_ids = 0; - - ACE_NEW (new_timer_ids, - ssize_t[new_size]); - - ACE_OS::memcpy (new_timer_ids, - this->timer_ids_, - this->max_size_ * sizeof (ssize_t)); - - delete [] timer_ids_; - this->timer_ids_ = new_timer_ids; - - // And add the new elements to the end of the "freelist". - for (size_t i = this->max_size_; i < new_size; i++) - this->timer_ids_[i] = -(ACE_static_cast (ssize_t, i) + 1); - - // Grow the preallocation array (if using preallocation) - if (this->preallocated_nodes_ != 0) - { - // Create a new array with max_size elements to link in to - // existing list. -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) - ACE_NEW (this->preallocated_nodes_, - ACE_Timer_Node_T[88]); -#else - ACE_NEW (this->preallocated_nodes_, - ACE_Timer_Node_T[this->max_size_]); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) */ - - // Add it to the set for later deletion - this->preallocated_node_set_.insert (this->preallocated_nodes_); - - // Link new nodes together (as for original list). - for (size_t k = 1; k < this->max_size_; k++) - this->preallocated_nodes_[k - 1].set_next (&this->preallocated_nodes_[k]); - - // NULL-terminate the new list. - this->preallocated_nodes_[this->max_size_ - 1].set_next (0); - - // Link new array to the end of the existling list. - if (this->preallocated_nodes_freelist_ == 0) - this->preallocated_nodes_freelist_ = - &preallocated_nodes_[0]; - else - { - ACE_Timer_Node_T *previous = - this->preallocated_nodes_freelist_; - - for (ACE_Timer_Node_T *current = this->preallocated_nodes_freelist_->get_next (); - current != 0; - current = current->get_next ()) - previous = current; - - previous->set_next (&this->preallocated_nodes_[0]); - } - } - - this->max_size_ = new_size; -} - -// Reschedule a periodic timer. This function must be called with the -// mutex lock held. - -template void -ACE_Timer_Heap_T::reschedule (ACE_Timer_Node_T *expired) -{ - ACE_TRACE ("ACE_Timer_Heap_T::reschedule"); - - // If we are rescheduling, then the most recent call was to - // remove_first (). That called remove () to remove the node from the - // heap, but did not free the timer ID. The ACE_Timer_Node still has - // its assigned ID - just needs to be inserted at the new proper - // place, and the heap restored properly. - if (this->timer_ids_[expired->get_timer_id ()] == -2) - --this->cur_limbo_; - this->insert (expired); -} - -template ACE_Timer_Node_T * -ACE_Timer_Heap_T::alloc_node (void) -{ - ACE_Timer_Node_T *temp = 0; - - // Only allocate a node if we are *not* using the preallocated heap. - if (this->preallocated_nodes_ == 0) - ACE_NEW_RETURN (temp, - ACE_Timer_Node_T, - 0); - else - { - // check to see if the heap needs to grow - if (this->preallocated_nodes_freelist_ == 0) - this->grow_heap (); - - temp = this->preallocated_nodes_freelist_; - - // Remove the first element from the freelist. - this->preallocated_nodes_freelist_ = - this->preallocated_nodes_freelist_->get_next (); - } - return temp; -} - -template void -ACE_Timer_Heap_T::free_node (ACE_Timer_Node_T *node) -{ - - // Return this timer id to the freelist. - this->push_freelist (node->get_timer_id ()); - - // Only free up a node if we are *not* using the preallocated heap. - if (this->preallocated_nodes_ == 0) - delete node; - else - { - node->set_next (this->preallocated_nodes_freelist_); - this->preallocated_nodes_freelist_ = node; - } -} - -// Insert a new timer that expires at time future_time; if interval is -// > 0, the handler will be reinvoked periodically. - -template long -ACE_Timer_Heap_T::schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Timer_Heap_T::schedule"); - - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - if ((this->cur_size_ + this->cur_limbo_) < this->max_size_) - { - // Obtain the next unique sequence number. - int timer_id = this->timer_id (); - - // Obtain the memory to the new node. - ACE_Timer_Node_T *temp = 0; - - ACE_ALLOCATOR_RETURN (temp, - this->alloc_node (), - -1); - temp->set (type, - act, - future_time, - interval, - 0, - timer_id); - - this->insert (temp); - return timer_id; - } - else - return -1; -} - -// Locate and remove the single timer with a value of from -// the timer queue. - -template int -ACE_Timer_Heap_T::cancel (long timer_id, - const void **act, - int dont_call) -{ - ACE_TRACE ("ACE_Timer_Heap_T::cancel"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - // Locate the ACE_Timer_Node that corresponds to the timer_id. - - // Check to see if the timer_id is out of range - if (timer_id < 0 - || (size_t) timer_id > this->max_size_) - return 0; - - ssize_t timer_node_slot = this->timer_ids_[timer_id]; - - // Check to see if timer_id is still valid. - if (timer_node_slot < 0) - return 0; - - if (timer_id != this->heap_[timer_node_slot]->get_timer_id ()) - { - ACE_ASSERT (timer_id == this->heap_[timer_node_slot]->get_timer_id ()); - return 0; - } - else - { - ACE_Timer_Node_T *temp = - this->remove (timer_node_slot); - - if (dont_call == 0) - // Call the close hook. - this->upcall_functor ().cancellation (*this, - temp->get_type ()); - - if (act != 0) - *act = temp->get_act (); - - this->free_node (temp); - return 1; - } -} - -// Locate and update the inteval on the timer_id - -template int -ACE_Timer_Heap_T::reset_interval (long timer_id, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Timer_Heap_T::reset_interval"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - // Locate the ACE_Timer_Node that corresponds to the timer_id. - - // Check to see if the timer_id is out of range - if (timer_id < 0 - || (size_t) timer_id > this->max_size_) - return -1; - - ssize_t timer_node_slot = this->timer_ids_[timer_id]; - - // Check to see if timer_id is still valid. - if (timer_node_slot < 0) - return -1; - - if (timer_id != this->heap_[timer_node_slot]->get_timer_id ()) - { - ACE_ASSERT (timer_id == this->heap_[timer_node_slot]->get_timer_id ()); - return -1; - } - else - { - // Reset the timer interval - this->heap_[timer_node_slot]->set_interval (interval); - return 0; - } -} - -// Locate and remove all values of from the timer queue. - -template int -ACE_Timer_Heap_T::cancel (const TYPE &type, - int dont_call) -{ - ACE_TRACE ("ACE_Timer_Heap_T::cancel"); - - int number_of_cancellations = 0; - - // Try to locate the ACE_Timer_Node that matches the timer_id. - { - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - for (size_t i = 0; i < this->cur_size_; ) - { - if (this->heap_[i]->get_type () == type) - { - ACE_Timer_Node_T *temp = this->remove (i); - - number_of_cancellations++; - - this->free_node (temp); - } - else - i++; - } - } - - if (dont_call == 0) - this->upcall_functor ().cancellation (*this, type); - - return number_of_cancellations; -} - -// Returns the earliest node or returns 0 if the heap is empty. - -template ACE_Timer_Node_T * -ACE_Timer_Heap_T::remove_first (void) -{ - ACE_TRACE ("ACE_Timer_Heap_T::remove_first"); - - if (this->cur_size_ == 0) - return 0; - - return this->remove (0); -} - -template ACE_Timer_Node_T * -ACE_Timer_Heap_T::get_first (void) -{ - ACE_TRACE ("ACE_Timer_Heap_T::get_first"); - - return this->cur_size_ == 0 ? 0 : this->heap_[0]; -} - -#endif /* ACE_TIMER_HEAP_T_C */ diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h deleted file mode 100644 index 73ba57dd3e2..00000000000 --- a/ace/Timer_Heap_T.h +++ /dev/null @@ -1,333 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_Heap_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_TIMER_HEAP_T_H -#define ACE_TIMER_HEAP_T_H -#include "ace/pre.h" - -#include "ace/Timer_Queue_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Free_List.h" -#include "ace/Unbounded_Set.h" - -// Forward declaration -template -class ACE_Timer_Heap_T; - -/** - * @class ACE_Timer_Heap_Iterator_T - * - * @brief Iterates over an . - * - * This is a generic iterator that can be used to visit every - * node of a timer queue. Be aware that it doesn't transverse - * in the order of timeout values. - */ -template -class ACE_Timer_Heap_Iterator_T : public ACE_Timer_Queue_Iterator_T -{ -public: - /// Constructor. - ACE_Timer_Heap_Iterator_T (ACE_Timer_Heap_T &); - - /// Destructor. - ~ACE_Timer_Heap_Iterator_T (void); - - /// Positions the iterator at the earliest node in the Timer Queue - virtual void first (void); - - /// Positions the iterator at the next node in the Timer Queue - virtual void next (void); - - /// Returns true when there are no more nodes in the sequence - virtual int isdone (void) const; - - /// Returns the node at the current position in the sequence - virtual ACE_Timer_Node_T *item (void); - -protected: - /// Pointer to the that we are iterating over. - ACE_Timer_Heap_T &timer_heap_; - - /// Position in the array where the iterator is at - size_t position_; -}; - -/** - * @class ACE_Timer_Heap_T - * - * @brief Provides a very fast and predictable timer implementation. - * - * This implementation uses a heap-based callout queue of - * absolute times. Therefore, in the average and worst case, - * scheduling, canceling, and expiring timers is O(log N) (where - * N is the total number of timers). In addition, we can also - * preallocate as many @c ACE_Timer_Node objects as there are slots - * in the heap. This allows us to completely remove the need for - * dynamic memory allocation, which is important for real-time - * systems. - */ -template -class ACE_Timer_Heap_T : public ACE_Timer_Queue_T -{ -public: - typedef ACE_Timer_Heap_Iterator_T HEAP_ITERATOR; - friend class ACE_Timer_Heap_Iterator_T; - - typedef ACE_Timer_Queue_T INHERITED; - - // = Initialization and termination methods. - /** - * The Constructor creates a heap with specified number of elements. - * This can also take in a upcall functor and freelist (if 0, then - * defaults will be created). - * - * @param size The maximum number of timers that can be - * inserted into the new object. - * @param preallocated Default 0, if non-0 then all the memory - * for the @c ACE_Timer_Node objects will be pre-allocated. This saves - * time and is more predictable (though it requires more space). - * Otherwise, timer nodes are allocated as needed. - * @param freelist is the freelist of timer nodes. - * @param upcall_functor If 0 Timer Heap will create a default FUNCTOR. - */ - ACE_Timer_Heap_T (size_t size, - int preallocated = 0, - FUNCTOR *upcall_functor = 0, - ACE_Free_List > *freelist = 0); - - /** - * Default constructor. @c upcall_functor is the instance of the - * FUNCTOR to be used by the queue. If @c upcall_functor is 0, Timer - * Heap will create a default FUNCTOR. @c freelist is the freelist of - * timer nodes. If 0, then a default freelist will be created. The default - * size will be ACE_DEFAULT_TIMERS and there will be no preallocation. - */ - ACE_Timer_Heap_T (FUNCTOR *upcall_functor = 0, - ACE_Free_List > *freelist = 0); - - /// Destructor. - virtual ~ACE_Timer_Heap_T (void); - - /// True if heap is empty, else false. - virtual int is_empty (void) const; - - /// Returns the time of the earliest node in the Timer_Queue. - /// Must be called on a non-empty queue. - virtual const ACE_Time_Value &earliest_time (void) const; - - /** - * Schedule a timer that may optionally auto-reset. - * Schedule that will expire at , - * which is specified in absolute time. If it expires then is - * passed in as the value to the . If is != to - * then it is used to reschedule the - * automatically, using relative time to the current . - * This method returns a that uniquely identifies the the - * entry in an internal list. This can be used to - * cancel the timer before it expires. The cancellation ensures - * that are unique up to values of greater than 2 - * billion timers. As long as timers don't stay around longer than - * this there should be no problems with accidentally deleting the - * wrong timer. Returns -1 on failure (which is guaranteed never to - * be a valid ). - */ - virtual long schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval = ACE_Time_Value::zero); - - /** - * Resets the interval of the timer represented by to - * , which is specified in relative time to the current - * . If is equal to - * , the timer will become a non-rescheduling - * timer. Returns 0 if successful, -1 if not. - */ - virtual int reset_interval (long timer_id, - const ACE_Time_Value &interval); - - /** - * Cancel all timers associated with . If is 0 - * then the will be invoked. Returns number of timers - * cancelled. - */ - virtual int cancel (const TYPE &type, - int dont_call_handle_close = 1); - - /** - * Cancel the single timer that matches the value (which - * was returned from the method). If act is non-NULL - * then it will be set to point to the ``magic cookie'' argument - * passed in when the timer was registered. This makes it possible - * to free up the memory and avoid memory leaks. If is - * 0 then the will be invoked. Returns 1 if cancellation - * succeeded and 0 if the wasn't found. - */ - virtual int cancel (long timer_id, - const void **act = 0, - int dont_call_handle_close = 1); - - /// Returns a pointer to this 's iterator. - virtual ACE_Timer_Queue_Iterator_T &iter (void); - - /** - * Removes the earliest node from the queue and returns it. Note that - * the timer is removed from the heap, but is not freed, and its ID - * is not reclaimed. The caller is responsible for calling either - * @c reschedule() or @c free_node() after this function returns. Thus, - * this function is for support of @c ACE_Timer_Queue::expire and - * should not be used unadvisedly in other conditions. - */ - ACE_Timer_Node_T *remove_first (void); - - /// Dump the state of an object. - virtual void dump (void) const; - - /// Reads the earliest node from the queue and returns it. - virtual ACE_Timer_Node_T *get_first (void); - -protected: - /// Reschedule an "interval" . - virtual void reschedule (ACE_Timer_Node_T *); - - /// Factory method that allocates a new node (uses operator new if - /// we're *not* preallocating, otherwise uses an internal freelist). - virtual ACE_Timer_Node_T *alloc_node (void); - - /** - * Factory method that frees a previously allocated node (uses - * operator delete if we're *not* preallocating, otherwise uses an - * internal freelist). - */ - virtual void free_node (ACE_Timer_Node_T *); - -private: - /// Remove and return the th and restore the - /// heap property. - ACE_Timer_Node_T *remove (size_t slot); - - /// Insert @a new_node into the heap and restore the heap property. - void insert (ACE_Timer_Node_T *new_node); - - /** - * Doubles the size of the heap and the corresponding timer_ids array. - * If preallocation is used, will also double the size of the - * preallocated array of ACE_Timer_Nodes. - */ - void grow_heap (void); - - /// Restore the heap property, starting at . - void reheap_up (ACE_Timer_Node_T *new_node, - size_t slot, - size_t parent); - - /// Restore the heap property, starting at . - void reheap_down (ACE_Timer_Node_T *moved_node, - size_t slot, - size_t child); - - /// Copy into the slot of and move - /// into the corresponding slot in the array. - void copy (size_t slot, ACE_Timer_Node_T *moved_node); - - /** - * Returns a timer id that uniquely identifies this timer. This id - * can be used to cancel a timer via the method. The - * timer id returned from this method will never == -1 to avoid - * conflicts with other failure return values. - */ - int timer_id (void); - - /// Pops and returns a new timer id from the freelist. - int pop_freelist (void); - - /// Pushes onto the freelist. - void push_freelist (int old_id); - - /// Maximum size of the heap. - size_t max_size_; - - /// Current size of the heap. - size_t cur_size_; - - /// Number of heap entries in transition (removed from the queue, but - /// not freed) and may be rescheduled or freed. - size_t cur_limbo_; - - /// Iterator used to expire timers. - HEAP_ITERATOR *iterator_; - - /** - * Current contents of the Heap, which is organized as a "heap" of - * *'s. In this context, a heap is a "partially - * ordered, almost complete" binary tree, which is stored in an - * array. - */ - ACE_Timer_Node_T **heap_; - - /** - * An array of "pointers" that allows each in the - * to be located in O(1) time. Basically, - * contains the slot in the array where an - * * with timer id \ resides. Thus, the timer id passed back from - * is really a slot into the array. The - * array serves two purposes: negative values are - * indications of free timer IDs, whereas positive values are - * "pointers" into the array for assigned timer IDs. - */ - ssize_t *timer_ids_; - - /// "Pointer" to the element in the array that was - /// last given out as a timer ID. - size_t timer_ids_curr_; - - /// Index representing the lowest timer ID that has been freed. When - /// the timer_ids_next_ value wraps around, it starts back at this - /// point. - size_t timer_ids_min_free_; - - /** - * If this is non-0, then we preallocate number of - * objects in order to reduce dynamic allocation - * costs. In auto-growing implementation, this points to the - * last array of nodes allocated. - */ - ACE_Timer_Node_T *preallocated_nodes_; - - /// This points to the head of the freelist, - /// which is organized as a stack. - ACE_Timer_Node_T *preallocated_nodes_freelist_; - - /// Set of pointers to the arrays of preallocated timer nodes. - /// Used to delete the allocated memory when required. - ACE_Unbounded_Set *> preallocated_node_set_; - - // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Heap_T (const ACE_Timer_Heap_T &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Heap_T &)) -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Heap_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Heap_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_TIMER_HEAP_T_H */ diff --git a/ace/Timer_List.cpp b/ace/Timer_List.cpp deleted file mode 100644 index 3834178a0b0..00000000000 --- a/ace/Timer_List.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// $Id$ - -#if !defined (ACE_TIMER_LIST_C) -#define ACE_TIMER_LIST_C - -#include "ace/Timer_List.h" - -ACE_RCSID(ace, Timer_List, "$Id$") - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Hash.h" -#include "ace/Timer_List_T.cpp" - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class - ACE_Timer_List_T< - ACE_Event_Handler*, - ACE_Timer_Hash_Upcall< - ACE_Event_Handler*, - ACE_Event_Handler_Handle_Timeout_Upcall, - ACE_Null_Mutex>, - ACE_Null_Mutex>; - -template class -ACE_Timer_List_Iterator_T< - ACE_Event_Handler*, - ACE_Timer_Hash_Upcall< - ACE_Event_Handler*, - ACE_Event_Handler_Handle_Timeout_Upcall, - ACE_Null_Mutex>, - ACE_Null_Mutex>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Timer_List_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_List_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Timer_List_T, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Timer_List_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - -#endif /* ACE_TIMER_LIST_C */ diff --git a/ace/Timer_List.h b/ace/Timer_List.h deleted file mode 100644 index a9586061307..00000000000 --- a/ace/Timer_List.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_List.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_TIMER_LIST_H -#define ACE_TIMER_LIST_H -#include "ace/pre.h" - -#include "ace/Timer_List_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// The following typedef are here for ease of use and backward -// compatibility. - -typedef ACE_Timer_List_T, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_List; - -typedef ACE_Timer_List_Iterator_T, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_List_Iterator; - -#include "ace/post.h" -#endif /* ACE_TIMER_LIST_H */ diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp deleted file mode 100644 index ecf2d71544d..00000000000 --- a/ace/Timer_List_T.cpp +++ /dev/null @@ -1,370 +0,0 @@ -// $Id$ - -#ifndef ACE_TIMER_LIST_T_C -#define ACE_TIMER_LIST_T_C - -#include "ace/Timer_List_T.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_RCSID(ace, Timer_List_T, "$Id$") - -// Default Constructor - -template -ACE_Timer_List_Iterator_T::ACE_Timer_List_Iterator_T (List& lst) - : list_ (lst) -{ - this->first(); -} - -template -ACE_Timer_List_Iterator_T::~ACE_Timer_List_Iterator_T (void) -{ -} - -// Positions the iterator at the node right after the dummy node - -template void -ACE_Timer_List_Iterator_T::first (void) -{ - this->current_node_ = this->list_.get_first(); -} - -// Positions the iterator at the next node in the Timer Queue - -template void -ACE_Timer_List_Iterator_T::next (void) -{ - // Make sure that if we are at the end, we don't wrap around - if (! this->isdone()) - this->current_node_ = this->current_node_->get_next (); - if (this->current_node_ == this->list_.head_) - this->current_node_ = 0; -} - -// Returns true when we are at - -template int -ACE_Timer_List_Iterator_T::isdone (void) const -{ - return this->current_node_ == 0; -} - -// Returns the node at or 0 if we are at the end - -template ACE_Timer_Node_T * -ACE_Timer_List_Iterator_T::item (void) -{ - if (! this->isdone()) - return this->current_node_; - return 0; -} - -/////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// - -// Return our instance of the iterator - -template ACE_Timer_Queue_Iterator_T & -ACE_Timer_List_T::iter (void) -{ - this->iterator_->first (); - return *this->iterator_; -} - -// Create an empty list. - -template -ACE_Timer_List_T::ACE_Timer_List_T (FUNCTOR* uf, FreeList* fl) - : Base(uf, fl) - , head_ (new ACE_Timer_Node_T) - , id_counter_ (0) -{ - ACE_TRACE ("ACE_Timer_List_T::ACE_Timer_List_T"); - - this->head_->set_next (this->head_); - this->head_->set_prev (this->head_); - - ACE_NEW (iterator_, Iterator(*this)); -} - - -// Checks if list is empty. - -template int -ACE_Timer_List_T::is_empty (void) const -{ - ACE_TRACE ("ACE_Timer_List_T::is_empty"); - return this->get_first_i() == 0; -} - - -// Returns earliest time in a non-empty list. - -template const ACE_Time_Value & -ACE_Timer_List_T::earliest_time (void) const -{ - ACE_TRACE ("ACE_Timer_List_T::earliest_time"); - ACE_Timer_Node_T* first = this->get_first_i(); - if (first != 0) - return first->get_timer_value (); - return ACE_Time_Value::zero; -} - - -// Remove all remaining items in the list. - -template -ACE_Timer_List_T::~ACE_Timer_List_T (void) -{ - ACE_TRACE ("ACE_Timer_List_T::~ACE_Timer_List_T"); - ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_)); - - delete iterator_; - - if (! this->is_empty()) { - for (ACE_Timer_Node_T* n = this->get_first(); n != this->head_;) { - ACE_Timer_Node_T* next = n->get_next(); - this->upcall_functor ().deletion (*this, n->get_type(), n->get_act()); - this->free_node(n); - n = next; - } - } - - // delete the dummy node - delete this->head_; -} - -template void -ACE_Timer_List_T::dump (void) const -{ - ACE_TRACE ("ACE_Timer_List_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - int count = 0; - - ACE_Timer_Node_T* n = this->get_first_i(); - if (n != 0) { - for (; n != this->head_; n = n->get_next()) { - count++; - } - } - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize_ = %d"), count)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - - -// Reschedule a periodic timer. This function must be called with the -// lock held. - -template void -ACE_Timer_List_T::reschedule (ACE_Timer_Node_T* n) -{ - ACE_TRACE ("ACE_Timer_List_T::reschedule"); - this->schedule_i(n, n->get_timer_value()); -} - - -// Insert a new handler that expires at time future_time; if interval -// is > 0, the handler will be reinvoked periodically. - -template long -ACE_Timer_List_T::schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Timer_List_T::schedule"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - ACE_Timer_Node_T* n = this->alloc_node(); - - if (n != 0) - { - long id = this->id_counter_++; - - if (id != -1) { - n->set (type, act, future_time, interval, 0, 0, id); - this->schedule_i (n, future_time); - } - return id; - } - - // Failure return - errno = ENOMEM; - return -1; -} - -/// The shared scheduling functionality between schedule() and reschedule() -template void -ACE_Timer_List_T::schedule_i (ACE_Timer_Node_T* n, - const ACE_Time_Value& expire) -{ - if (this->is_empty()) { - n->set_prev(this->head_); - n->set_next(this->head_); - this->head_->set_prev(n); - this->head_->set_next(n); - return; - } - - // We always want to search backwards from the tail of the list, because - // this minimizes the search in the extreme case when lots of timers are - // scheduled for exactly the same time, and it also assumes that most of - // the timers will be scheduled later than existing timers. - ACE_Timer_Node_T* p = this->head_->get_prev(); - while (p != this->head_ && p->get_timer_value() > expire) - p = p->get_prev(); - - // insert after - n->set_prev(p); - n->set_next(p->get_next()); - p->get_next()->set_prev(n); - p->set_next(n); -} - -template -ACE_Timer_Node_T* -ACE_Timer_List_T::find_node(long timer_id) const -{ - ACE_Timer_Node_T* n = this->get_first_i(); - if (n == 0) - return 0; - - for (; n != this->head_; n = n->get_next()) { - if (n->get_timer_id() == timer_id) { - return n; - } - } - return 0; -} - -// Locate and update the inteval on the timer_id -template int -ACE_Timer_List_T::reset_interval (long timer_id, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_Timer_List_T::reset_interval"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - ACE_Timer_Node_T* n = this->find_node(timer_id); - if (n != 0) { - n->set_interval(interval); // The interval will take effect the next time this node is expired. - return 0; - } - return -1; -} - -// Locate and remove the single with a value of -// from the timer queue. -template int -ACE_Timer_List_T::cancel (long timer_id, - const void **act, - int skip_close) -{ - ACE_TRACE ("ACE_Timer_List_T::cancel"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - ACE_Timer_Node_T* n = this->find_node(timer_id); - if (n != 0) { - if (act != 0) - *act = n->get_act(); - this->cancel_i(n, skip_close); - return 1; - } - return 0; -} - -// Locate and remove all values of from the timer queue. -template int -ACE_Timer_List_T::cancel (const TYPE &type, int skip_close) -{ - ACE_TRACE ("ACE_Timer_List_T::cancel"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - int num_canceled = 0; // Note : Technically this can overflow. - - if (! this->is_empty()) { - - for (ACE_Timer_Node_T* n = this->get_first(); n != this->head_;) - { - if (n->get_type() == type) // Note: Typically Type is an ACE_Event_Handler* - { - ++num_canceled; - - ACE_Timer_Node_T* tmp = n; - n = n->get_next(); - int always_skip_close = 1; // todo : Is this correct? - this->cancel_i(tmp, always_skip_close); - } - else - { - n = n->get_next(); - } - } - - } - - if (! skip_close) { // && num_canceled > 0) { - this->upcall_functor().cancellation (*this, type); - } - return num_canceled; -} - -template void -ACE_Timer_List_T::unlink (ACE_Timer_Node_T* n) -{ - n->get_prev()->set_next(n->get_next()); - n->get_next()->set_prev(n->get_prev()); - n->set_prev(0); - n->set_next(0); -} - -/// Shared subset of the two cancel() methods. -template void -ACE_Timer_List_T::cancel_i (ACE_Timer_Node_T* n, int skip_close) -{ - this->unlink(n); - this->free_node (n); - if (! skip_close) { - this->upcall_functor().cancellation (*this, n->get_type()); - } -} - -// Reads the first node on the list and returns it. -template ACE_Timer_Node_T * -ACE_Timer_List_T::get_first (void) -{ - ACE_TRACE ("ACE_Timer_List_T::get_first"); - return this->get_first_i(); -} - -template ACE_Timer_Node_T * -ACE_Timer_List_T::get_first_i (void) const -{ - ACE_TRACE ("ACE_Timer_List_T::get_first_i"); - ACE_Timer_Node_T* first = this->head_->get_next(); - if (first != this->head_) // Note : is_empty() uses get_first() - return first; - return 0; -} - - -// Removes the first node on the list and returns it. - -template ACE_Timer_Node_T * -ACE_Timer_List_T::remove_first (void) -{ - ACE_TRACE ("ACE_Timer_List_T::remove_first"); - ACE_Timer_Node_T* first = this->get_first(); - if (first != 0) { - this->unlink(first); - return first; - } - return 0; -} - -#endif /* ACE_TIMER_LIST_T_C */ diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h deleted file mode 100644 index 0f13647e591..00000000000 --- a/ace/Timer_List_T.h +++ /dev/null @@ -1,222 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_List_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_TIMER_LIST_T_H -#define ACE_TIMER_LIST_T_H -#include "ace/pre.h" - -#include "ace/Timer_Queue_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward declaration. -template -class ACE_Timer_List_T; - -/** - * @class ACE_Timer_List_Iterator_T - * - * @brief Iterates over an . - * - * This is a generic iterator that can be used to visit every - * node of a timer queue. - */ -template -class ACE_Timer_List_Iterator_T -: public ACE_Timer_Queue_Iterator_T -{ -public: - typedef ACE_Timer_List_T List; - /// Constructor. - ACE_Timer_List_Iterator_T (List& lst); - - /// Destructor. - virtual ~ACE_Timer_List_Iterator_T (void); - - /// Positions the iterator at the earliest node in the Timer Queue - virtual void first (void); - - /// Positions the iterator at the next node in the Timer Queue - virtual void next (void); - - /// Returns true when there are no more nodes in the sequence - virtual int isdone (void) const; - - /// Returns the node at the current position in the sequence - virtual ACE_Timer_Node_T *item (void); - -protected: - /// Pointer to the that we are iterating over. - List& list_; - - /// Current position in the - ACE_Timer_Node_T* current_node_; -}; - -/** - * @class ACE_Timer_List_T - * - * @brief Provides a simple implementation of timers. - * - * This implementation uses a linked list of absolute times. - * Therefore, in the average case, scheduling and canceling - * timers is O(N) (where N is the total number of timers) and - * expiring timers is O(K) (where K is the total number of timers - * that are < the current time of day). - * More clever implementations could use a delta-list, a heap, - * or timing wheels, etc. For instance, - * is a subclass of that implements a - * heap-based callout queue. For most applications, the - * will perform substantially faster than the - * . - */ -template -class ACE_Timer_List_T : public ACE_Timer_Queue_T -{ -public: - /// Type of iterator - typedef ACE_Timer_List_Iterator_T Iterator; - - /// Iterator is a friend - friend class ACE_Timer_List_Iterator_T; - - typedef ACE_Timer_Node_T Node; - /// Type inherited from - typedef ACE_Timer_Queue_T Base; - typedef ACE_Free_List FreeList; - - // = Initialization and termination methods. - /** - * Default constructor. is the instance of the - * FUNCTOR to be used by the list. If is 0, a - * default FUNCTOR will be created. the freelist of - * timer nodes. If 0, then a default freelist will be created. - */ - ACE_Timer_List_T (FUNCTOR* upcall_functor = 0, FreeList* freelist = 0); - - /// Destructor - virtual ~ACE_Timer_List_T (void); - - /// True if queue is empty, else false. - virtual int is_empty (void) const; - - /// Returns the time of the earlier node in the . - /// Must be called on a non-empty queue. - virtual const ACE_Time_Value& earliest_time (void) const; - - /** - * Schedule that will expire at , - * which is specified in absolute time. If it expires then is - * passed in as the value to the . If is != to - * then it is used to reschedule the - * automatically, using relative time to the current . - * This method returns a that uniquely identifies the the - * entry in an internal list. This can be used to - * cancel the timer before it expires. The cancellation ensures - * that are unique up to values of greater than 2 - * billion timers. As long as timers don't stay around longer than - * this there should be no problems with accidentally deleting the - * wrong timer. Returns -1 on failure (which is guaranteed never to - * be a valid ). - */ - virtual long schedule (const TYPE& type, - const void* act, - const ACE_Time_Value& future_time, - const ACE_Time_Value& interval = ACE_Time_Value::zero); - - /** - * Resets the interval of the timer represented by to - * , which is specified in relative time to the current - * . If is equal to - * , the timer will become a non-rescheduling - * timer. Returns 0 if successful, -1 if not. - */ - virtual int reset_interval (long timer_id, - const ACE_Time_Value& interval); - - /** - * Cancel all timers associated with . If is 0 - * then the will be invoked. Returns number of timers - * cancelled. - */ - virtual int cancel (const TYPE& type, - int dont_call_handle_close = 1); - - /** - * Cancel the single timer that matches the value (which - * was returned from the method). If act is non-NULL - * then it will be set to point to the ``magic cookie'' argument - * passed in when the timer was registered. This makes it possible - * to free up the memory and avoid memory leaks. If is - * 0 then the will be invoked. Returns 1 if cancellation - * succeeded and 0 if the wasn't found. - */ - virtual int cancel (long timer_id, - const void** act = 0, - int dont_call_handle_close = 1); - - /// Returns a pointer to this 's iterator. - virtual ACE_Timer_Queue_Iterator_T& iter (void); - - /// Removes the earliest node from the queue and returns it - virtual ACE_Timer_Node_T* remove_first (void); - - /// Dump the state of an object. - virtual void dump (void) const; - - /// Reschedule an "interval" . This should be private - /// but for now it needs to be public for - virtual void reschedule (ACE_Timer_Node_T *); - - /// Reads the earliest node from the queue and returns it. - virtual ACE_Timer_Node_T* get_first (void); - -private: - - void schedule_i(ACE_Timer_Node_T* n, const ACE_Time_Value& exp); - ACE_Timer_Node_T* find_node(long timer_id) const; - void cancel_i (ACE_Timer_Node_T* n, int skip_close); - void unlink (ACE_Timer_Node_T* n); - ACE_Timer_Node_T* get_first_i(void) const; - -private: - - /// Pointer to linked list of . - ACE_Timer_Node_T* head_; - - /// Iterator used to expire timers. - Iterator* iterator_; - - /** - * Keeps track of the timer id that uniquely identifies each timer. - * This id can be used to cancel a timer via the - * method. - */ - long id_counter_; - - // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_List_T (const ACE_Timer_List_T &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_List_T &)) -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_List_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_TIMER_LIST_T_H */ diff --git a/ace/Timer_Queue.cpp b/ace/Timer_Queue.cpp deleted file mode 100644 index e883a527bdd..00000000000 --- a/ace/Timer_Queue.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -#if !defined (ACE_TIMER_QUEUE_C) -#define ACE_TIMER_QUEUE_C - -#include "ace/Containers.h" -#include "ace/Timer_Queue.h" - -ACE_RCSID(ace, Timer_Queue, "$Id$") - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Hash.h" -#include "ace/Timer_Queue_T.cpp" - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class - ACE_Timer_Queue_T< - ACE_Event_Handler*, - ACE_Timer_Hash_Upcall< - ACE_Event_Handler*, - ACE_Event_Handler_Handle_Timeout_Upcall, - ACE_Null_Mutex>, - ACE_Null_Mutex>; - -template class - ACE_Timer_Queue_Iterator_T< - ACE_Event_Handler*, - ACE_Timer_Hash_Upcall< - ACE_Event_Handler*, - ACE_Event_Handler_Handle_Timeout_Upcall, - ACE_Null_Mutex>, - ACE_Null_Mutex>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Unbounded_Set *>; -template class ACE_Node *>; -template class ACE_Unbounded_Set_Iterator *>; -template class ACE_Timer_Node_Dispatch_Info_T; -template class ACE_Timer_Node_T; -template class ACE_Timer_Queue_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_Queue_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Event_Handler_Handle_Timeout_Upcall; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Unbounded_Set *> -#pragma instantiate ACE_Node *> -#pragma instantiate ACE_Unbounded_Set_Iterator *> -#pragma instantiate ACE_Timer_Node_Dispatch_Info_T -#pragma instantiate ACE_Timer_Node_T -#pragma instantiate ACE_Timer_Queue_T, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Timer_Queue_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Event_Handler_Handle_Timeout_Upcall - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_TIMER_QUEUE_C */ diff --git a/ace/Timer_Queue.h b/ace/Timer_Queue.h deleted file mode 100644 index 54a0a8f1137..00000000000 --- a/ace/Timer_Queue.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_Queue.h - * - * $Id$ - * - * @author Douglas C. Schmidt and - * Irfan Pyarali . - */ -//============================================================================= - -#ifndef ACE_TIMER_QUEUE_H -#define ACE_TIMER_QUEUE_H -#include "ace/pre.h" - -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Timer_Queue_T.h" - -// The following typedef are here for ease of use and backward -// compatibility. -typedef ACE_Timer_Node_Dispatch_Info_T - ACE_Timer_Node_Dispatch_Info; - -typedef ACE_Timer_Node_T - ACE_Timer_Node; - -typedef ACE_Timer_Queue_T, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Queue; - -typedef ACE_Timer_Queue_Iterator_T, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Queue_Iterator; - -#include "ace/post.h" -#endif /* ACE_TIMER_QUEUE_H */ diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp deleted file mode 100644 index 00d5723d80a..00000000000 --- a/ace/Timer_Queue_Adapters.cpp +++ /dev/null @@ -1,321 +0,0 @@ -// $Id$ - -#include "ace/Timer_Queue_Adapters.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#ifndef ACE_TIMER_QUEUE_ADAPTERS_C -# define ACE_TIMER_QUEUE_ADAPTERS_C - -ACE_RCSID(ace, Timer_Queue_Adapters, "$Id$") - -# if !defined (__ACE_INLINE__) -# include "ace/Timer_Queue_Adapters.i" -# endif /* __ACE_INLINE__ */ - -template TQ & -ACE_Async_Timer_Queue_Adapter::timer_queue (void) -{ - return this->timer_queue_; -} - -template int -ACE_Async_Timer_Queue_Adapter::cancel (long timer_id, - const void **act) -{ - // Block designated signals. - ACE_Sig_Guard sg (&this->mask_); - ACE_UNUSED_ARG (sg); - - return this->timer_queue_.cancel (timer_id, act); -} - -template int -ACE_Async_Timer_Queue_Adapter::expire (void) -{ - // Block designated signals. - ACE_Sig_Guard sg (&this->mask_); - ACE_UNUSED_ARG (sg); - - return this->timer_queue_.expire (); -} - -template int -ACE_Async_Timer_Queue_Adapter::schedule_ualarm (void) -{ - ACE_Time_Value tv = this->timer_queue_.earliest_time () - - ACE_OS::gettimeofday (); - - // Beware of negative times and zero times (which cause problems for - // ). - if (tv < ACE_Time_Value::zero) - tv = ACE_Time_Value (0, 1); - - // @@ This code should be clever enough to avoid updating the - // if we haven't actually changed the earliest time. - // Schedule a new timer. - ACE_OS::ualarm (tv); - return 0; -} - -template long -ACE_Async_Timer_Queue_Adapter::schedule (ACE_Event_Handler *eh, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval) -{ - ACE_UNUSED_ARG (act); - ACE_UNUSED_ARG (interval); - - // Block designated signals. - ACE_Sig_Guard sg (&this->mask_); - ACE_UNUSED_ARG (sg); - - // @@ We still need to implement interval timers... - long tid = this->timer_queue_.schedule (eh, act, future_time); - - if (tid == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("schedule_timer")), - -1); - - if (this->schedule_ualarm () == -1) - return 0; - - return tid; -} - -template -ACE_Async_Timer_Queue_Adapter::ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *mask) - // If == 0, block *all* signals when the SIGARLM handler is - // running, else just block those in the mask. - : mask_ (mask) -{ - // The following code is necessary to selectively "block" certain - // signals when SIGALRM is running. Also, we always restart system - // calls that are interrupted by the signals. - - ACE_Sig_Action sa ((ACE_SignalHandler) 0, - this->mask_, - SA_RESTART); - - if (this->sig_handler_.register_handler (SIGALRM, this, &sa) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("register_handler"))); -} - -// This is the signal handler function for the asynchronous timer -// list. It gets invoked asynchronously when the SIGALRM signal -// occurs. - -template int -ACE_Async_Timer_Queue_Adapter::handle_signal (int signum, - siginfo_t *, - ucontext_t *) -{ - switch (signum) - { - case SIGALRM: - { - // Expire the pending timers. - - // @@ We need to figure out how to implement interval - // timers... - this->timer_queue_.expire (); - - // Only schedule a new timer if there is one in the list. - - // @@ This code should also become smarter to avoid - // unnecessary calls to ualarm(). - if (this->timer_queue_.is_empty () == 0) - return this->schedule_ualarm (); - else - return 0; - /* NOTREACHED */ - } - default: - ACE_ERROR_RETURN ((LM_ERROR, - "unexpected signal %S\n", - signum), - -1); - /* NOTREACHED */ - } -} - -template -ACE_Thread_Timer_Queue_Adapter::ACE_Thread_Timer_Queue_Adapter (ACE_Thread_Manager *tm, - TQ* timer_queue) - : ACE_Task_Base (tm), - timer_queue_(timer_queue), - delete_timer_queue_(0), - condition_ (mutex_), - active_ (1), // Assume that we start in active mode. - thr_id_ (ACE_OS::NULL_thread) -{ - if (timer_queue_ == 0) - { - ACE_NEW (this->timer_queue_, - TQ); - this->delete_timer_queue_ = 1; - } -} - -template -ACE_Thread_Timer_Queue_Adapter::~ACE_Thread_Timer_Queue_Adapter (void) -{ - if (this->delete_timer_queue_) - { - delete this->timer_queue_; - this->timer_queue_ = 0; - this->delete_timer_queue_ = 0; - } -} - -template ACE_SYNCH_RECURSIVE_MUTEX & -ACE_Thread_Timer_Queue_Adapter::mutex (void) -{ - return this->mutex_; -} - -template long -ACE_Thread_Timer_Queue_Adapter::schedule - (ACE_Event_Handler* handler, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval) -{ - ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, -1); - - long result = this->timer_queue_->schedule (handler, act, future_time, interval); - this->condition_.signal (); - return result; -} - -template int -ACE_Thread_Timer_Queue_Adapter::cancel (long timer_id, - const void **act) -{ - ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, -1); - - int result = this->timer_queue_->cancel (timer_id, act); - condition_.signal (); - return result; -} - -template void -ACE_Thread_Timer_Queue_Adapter::deactivate (void) -{ - ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_); - - this->active_ = 0; - this->condition_.signal (); -} - -template int -ACE_Thread_Timer_Queue_Adapter::svc (void) -{ - ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, -1); - - this->thr_id_ = ACE_Thread::self (); - - // Thread cancellation point, if ACE supports it. - // - // Note: This call generates a warning under Solaris because the header - // file /usr/include/pthread.h redefines the routine argument. This - // is a bug in the Solaris header files and has nothing to do with - // ACE. -# if !defined (ACE_LACKS_PTHREAD_CANCEL) - ACE_PTHREAD_CLEANUP_PUSH (&this->condition_.mutex ().get_nesting_mutex ()); -# endif /* ACE_LACKS_PTHREAD_CANCEL */ - - while (this->active_) - { -# if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) - // Temporarily suspend ownership of the timer queue mutex in - // order to dispatch deferred execution commands. These - // commands are to be treated as executing in a context - // "external" to the timer queue adapter, and thus must compete - // separately for this lock. - mutex_.release (); - this->dispatch_commands (); - - // Re-acquire ownership of the timer queue mutex in order to - // restore the "internal" timer queue adapter context - mutex_.acquire (); -# endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */ - - // If the queue is empty, sleep until there is a change on it. - if (this->timer_queue_->is_empty ()) - this->condition_.wait (); - else - { - // Compute the remaining time, being careful not to sleep - // for "negative" amounts of time. - ACE_Time_Value tv = this->timer_queue_->earliest_time (); - - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiting until %u.%3.3u secs\n"), - // tv.sec(), tv.msec())); - this->condition_.wait (&tv); - } - - // Expire timers anyway, at worst this is a no-op. - this->timer_queue_->expire (); - } - - // Thread cancellation point, if ACE supports it. -# if !defined (ACE_LACKS_PTHREAD_CANCEL) - ACE_PTHREAD_CLEANUP_POP (0); -# endif /* ACE_LACKS_PTHREAD_CANCEL */ - - return 0; -} - -# if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) - -// Enqueues a command object for execution just before waiting on the next -// timer event. This allows deferred execution of commands that cannot -// be performed in the timer event handler context, such as registering -// or cancelling timers on platforms where the timer queue mutex is not -// recursive. - -template int -ACE_Thread_Timer_Queue_Adapter::enqueue_command (ACE_Command_Base *cmd, - COMMAND_ENQUEUE_POSITION pos) -{ - // Serialize access to the command queue. - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->command_mutex_, -1); - - if (pos == ACE_Thread_Timer_Queue_Adapter::TAIL) - return command_queue_.enqueue_tail (cmd); - else - return command_queue_.enqueue_head (cmd); -} - -// Dispatches all command objects enqueued in the most recent event -// handler context. - -template int -ACE_Thread_Timer_Queue_Adapter::dispatch_commands (void) -{ - // Serialize access to the command queue. - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->command_mutex_, -1); - - // loop through the enqueued commands - ACE_Command_Base *cmd = 0; - while (command_queue_.dequeue_head (cmd) == 0) - if (cmd) - { - cmd->execute (); - delete cmd; - } - - return 0; -} - -# endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */ - -#endif /* ACE_TIMER_QUEUE_ADAPTERS_C*/ diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h deleted file mode 100644 index 83934af0c25..00000000000 --- a/ace/Timer_Queue_Adapters.h +++ /dev/null @@ -1,244 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Timer_Queue_Adapters.h - * - * $Id$ - * - * @author Douglas C. Schmidt and - * Carlos O'Ryan - */ -//============================================================================= - -#ifndef ACE_TIMER_QUEUE_ADAPTERS_H -#define ACE_TIMER_QUEUE_ADAPTERS_H -#include "ace/pre.h" - -#include "ace/Task.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Signal.h" - -/** - * @class ACE_Async_Timer_Queue_Adapter - * - * @brief Adapts a to be run asynchronously. - * - * This implementation uses the call, which generates - * the SIGARLM signal that is caught by this class. - */ -template -class ACE_Async_Timer_Queue_Adapter : public ACE_Event_Handler -{ -public: - typedef TQ TIMER_QUEUE; - - /// Constructor - /** - * Register the SIGALRM handler. If == 0 then block all - * signals when is run. Otherwise, just block the signals - * indicated in . - */ - ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *mask = 0); - - /// Schedule the timer according to the semantics of the - /// . - /** - * This timer gets dispatched via a signal, rather than by a user - * calling expire(). Note that interval timers are not implemented - * yet. - */ - long schedule (ACE_Event_Handler *type, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval = ACE_Time_Value::zero); - - /// Cancel the @a timer_id and pass back the @a act if an address is - /// passed in. - int cancel (long timer_id, const void **act = 0); - - /// Dispatch all timers whose values are <= . Returns the - /// number of timers canceled. - int expire (void); - - /// Access the underlying . - TQ &timer_queue (void); - -private: - /// Perform the logic to compute the new ualarm(2) setting. - virtual int schedule_ualarm (void); - - /// Called back by handler. - virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); - - /// Handler for the signal, so that we can access our state - /// without requiring any global variables. - ACE_Sig_Handler sig_handler_; - - /// Implementation of the timer queue (e.g., , - /// , etc.). - TQ timer_queue_; - - /// Mask of signals to be blocked when we're servicing . - ACE_Sig_Set mask_; -}; - -/** - * @class ACE_Thread_Timer_Queue_Adapter - * - * @brief Adapts a Timer_Queue using a separate thread for dispatching. - * - * This implementation of a Timer_Queue uses a separate thread to - * dispatch the timers. The base queue need not be thread safe, - * this class takes all the necessary locks. - * - * @note This is a case where template parameters will be useful, but - * (IMHO) the effort and portability problems discourage their - * use. - * - */ -template -class ACE_Thread_Timer_Queue_Adapter : public ACE_Task_Base -{ -public: - /// Trait for the underlying queue type. - typedef TQ TIMER_QUEUE; - -# if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) - - /// Typedef for the position at which to enqueue a deferred - /// execution command. - enum COMMAND_ENQUEUE_POSITION {HEAD, TAIL}; - -# endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */ - - /// Creates the timer queue. Activation of the task is the user's - /// responsibility. Optionally a pointer to a timer queue can be passed, - /// when no pointer is passed, a TQ is dynamically created - ACE_Thread_Timer_Queue_Adapter (ACE_Thread_Manager * = ACE_Thread_Manager::instance (), - TQ* timer_queue = 0); - - /// Destructor. - virtual ~ACE_Thread_Timer_Queue_Adapter (void); - - /// Schedule the timer according to the semantics of the ; wakes - /// up the dispatching thread. - long schedule (ACE_Event_Handler *handler, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval = ACE_Time_Value::zero); - - /// Cancel the and return the parameter if an - /// address is passed in. Also wakes up the dispatching thread. - int cancel (long timer_id, const void **act = 0); - - /// Runs the dispatching thread. - virtual int svc (void); - - /// Inform the dispatching thread that it should terminate. - virtual void deactivate (void); - - /// Access the locking mechanism, useful for iteration. - ACE_SYNCH_RECURSIVE_MUTEX &mutex (void); - - /// @deprecated Access the implementation queue, useful for iteration. - /// Use the method that returns a pointer instead - TQ &timer_queue (void); - - /// Set a user-specified timer queue. - int timer_queue (TQ *tq); - - /// Return the current . - TQ *timer_queue (void) const; - - /// Return the thread id of our active object. - ACE_thread_t thr_id (void) const; - - /** - * We override the default activate() method so that we can ensure - * that only a single thread is ever spawned. Otherwise, too many - * weird things can happen... - */ - virtual int activate (long flags = THR_NEW_LWP | THR_JOINABLE, - int n_threads = 1, - int force_active = 0, - long priority = ACE_DEFAULT_THREAD_PRIORITY, - int grp_id = -1, - ACE_Task_Base *task = 0, - ACE_hthread_t thread_handles[] = 0, - void *stack[] = 0, - size_t stack_size[] = 0, - ACE_thread_t thread_names[] = 0); - -# if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) - - /** - * Enqueues a command object for execution just before waiting on the next - * timer event. This allows deferred execution of commands that cannot - * be performed in the timer event handler context, such as registering - * or cancelling timers on platforms where the timer queue mutex is not - * recursive. - */ - int enqueue_command (ACE_Command_Base *command_, - COMMAND_ENQUEUE_POSITION pos = TAIL); - -# endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */ - -private: - -# if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) - /// Dispatches all command objects enqueued in the most - /// recent event handler context. - int dispatch_commands (void); - - /// Queue of commands for deferred execution. - ACE_Unbounded_Queue command_queue_; - - /// The mutual exclusion mechanism for the command queue. - ACE_SYNCH_MUTEX command_mutex_; -# endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */ - - /// The underlying Timer_Queue. - TQ* timer_queue_; - - /// Keeps track of whether we should delete the timer queue (if we - /// didn't create it, then we don't delete it). - int delete_timer_queue_; - - /// The mutual exclusion mechanism that is required to use the - /// . - ACE_SYNCH_RECURSIVE_MUTEX mutex_; - - /** - * The dispatching thread sleeps on this condition while waiting to - * dispatch the next timer; it is used to wake it up if there is a - * change on the timer queue. - */ - ACE_SYNCH_RECURSIVE_CONDITION condition_; - - /// When deactivate is called this variable turns to false and the - /// dispatching thread is signalled, to terminate its main loop. - int active_; - - /// Thread id of our active object task. - ACE_thread_t thr_id_; -}; - -#if defined (__ACE_INLINE__) -# include "ace/Timer_Queue_Adapters.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Timer_Queue_Adapters.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("Timer_Queue_Adapters.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_TIMER_QUEUE_ADAPTERS_H */ diff --git a/ace/Timer_Queue_Adapters.i b/ace/Timer_Queue_Adapters.i deleted file mode 100644 index b8c4c13840d..00000000000 --- a/ace/Timer_Queue_Adapters.i +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -template ACE_INLINE TQ & -ACE_Thread_Timer_Queue_Adapter::timer_queue (void) -{ - return *(this->timer_queue_); -} - -template ACE_INLINE TQ * -ACE_Thread_Timer_Queue_Adapter::timer_queue (void) const -{ - return this->timer_queue_; -} - -template ACE_INLINE int -ACE_Thread_Timer_Queue_Adapter::timer_queue (TQ *tq) -{ - if (this->delete_timer_queue_ != 0) - delete this->timer_queue_; - this->timer_queue_ = tq; - this->delete_timer_queue_ = 0; - return 0; -} - -template ACE_INLINE ACE_thread_t -ACE_Thread_Timer_Queue_Adapter::thr_id (void) const -{ - return this->thr_id_; -} - -template ACE_INLINE int -ACE_Thread_Timer_Queue_Adapter::activate (long flags, - int n_threads, - int force_active, - long priority, - int grp_id, - ACE_Task_Base *task, - ACE_hthread_t thread_handles[], - void *stack[], - size_t stack_size[], - ACE_thread_t thread_names[]) -{ - // Macros to avoid "warning: unused parameter" type warning. - ACE_UNUSED_ARG (n_threads); - ACE_UNUSED_ARG (force_active); - ACE_UNUSED_ARG (thread_handles); - - // Make sure that we only allow a single thread to be spawned for - // our adapter. Otherwise, too many weird things can happen. - return ACE_Task_Base::activate (flags, 1, 0, priority, grp_id, task, 0, - stack, stack_size, thread_names); -} diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp deleted file mode 100644 index e63c618c0d4..00000000000 --- a/ace/Timer_Queue_T.cpp +++ /dev/null @@ -1,350 +0,0 @@ -// $Id$ - -#ifndef ACE_TIMER_QUEUE_T_C -#define ACE_TIMER_QUEUE_T_C - -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Signal.h" -#include "ace/Timer_Queue_T.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Timer_Queue_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Timer_Queue_T, "$Id$") - -template void -ACE_Timer_Node_T::dump (void) const -{ - ACE_TRACE ("ACE_Timer_Node_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nact_ = %x"), this->act_)); - this->timer_value_.dump (); - this->interval_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nprev_ = %x"), this->prev_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template -ACE_Timer_Node_T::ACE_Timer_Node_T (void) -{ - ACE_TRACE ("ACE_Timer_Node_T::ACE_Timer_Node_T"); -} - -template -ACE_Timer_Node_T::~ACE_Timer_Node_T (void) -{ - ACE_TRACE ("ACE_Timer_Node_T::~ACE_Timer_Node_T"); -} - - - -template -ACE_Timer_Queue_Iterator_T::ACE_Timer_Queue_Iterator_T (void) -{ -} - -template -ACE_Timer_Queue_Iterator_T::~ACE_Timer_Queue_Iterator_T (void) -{ -} - -template ACE_Time_Value * -ACE_Timer_Queue_T::calculate_timeout (ACE_Time_Value *max_wait_time) -{ - ACE_TRACE ("ACE_Timer_Queue_T::calculate_timeout"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, max_wait_time)); - - if (this->is_empty ()) - // Nothing on the Timer_Queue, so use whatever the caller gave us. - return max_wait_time; - else - { - ACE_Time_Value cur_time = this->gettimeofday (); - - if (this->earliest_time () > cur_time) - { - // The earliest item on the Timer_Queue is still in the - // future. Therefore, use the smaller of (1) caller's wait - // time or (2) the delta time between now and the earliest - // time on the Timer_Queue. - - this->timeout_ = this->earliest_time () - cur_time; - if (max_wait_time == 0 || *max_wait_time > timeout_) - return &this->timeout_; - else - return max_wait_time; - } - else - { - // The earliest item on the Timer_Queue is now in the past. - // Therefore, we've got to "poll" the Reactor, i.e., it must - // just check the descriptors and then dispatch timers, etc. - this->timeout_ = ACE_Time_Value::zero; - return &this->timeout_; - } - } -} - -template ACE_Time_Value * -ACE_Timer_Queue_T::calculate_timeout (ACE_Time_Value *max_wait_time, - ACE_Time_Value *the_timeout) -{ - ACE_TRACE ("ACE_Timer_Queue_T::calculate_timeout"); - - if (the_timeout == 0) - return 0; - - if (this->is_empty ()) - { - // Nothing on the Timer_Queue, so use whatever the caller gave us. - if (max_wait_time) - *the_timeout = *max_wait_time; - else - return 0; - } - else - { - ACE_Time_Value cur_time = this->gettimeofday (); - - if (this->earliest_time () > cur_time) - { - // The earliest item on the Timer_Queue is still in the - // future. Therefore, use the smaller of (1) caller's wait - // time or (2) the delta time between now and the earliest - // time on the Timer_Queue. - - *the_timeout = this->earliest_time () - cur_time; - if (!(max_wait_time == 0 || *max_wait_time > *the_timeout)) - *the_timeout = *max_wait_time; - } - else - { - // The earliest item on the Timer_Queue is now in the past. - // Therefore, we've got to "poll" the Reactor, i.e., it must - // just check the descriptors and then dispatch timers, etc. - *the_timeout = ACE_Time_Value::zero; - } - } - return the_timeout; -} - -template void -ACE_Timer_Queue_T::dump (void) const -{ - ACE_TRACE ("ACE_Timer_Queue_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->timeout_.dump (); - this->timer_skew_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template -ACE_Timer_Queue_T::ACE_Timer_Queue_T (FUNCTOR *upcall_functor, - ACE_Free_List > *freelist) - : gettimeofday_ (ACE_OS::gettimeofday), - delete_upcall_functor_ (upcall_functor == 0), - delete_free_list_ (freelist == 0), - timer_skew_ (0, ACE_TIMER_SKEW) -{ - ACE_TRACE ("ACE_Timer_Queue_T::ACE_Timer_Queue_T"); - - if (!freelist) - ACE_NEW (free_list_, - (ACE_Locked_Free_List,ACE_Null_Mutex>)); - else - free_list_ = freelist; - - if (!upcall_functor) - ACE_NEW (upcall_functor_, - FUNCTOR); - else - upcall_functor_ = upcall_functor; -} - -template -ACE_Timer_Queue_T::~ACE_Timer_Queue_T (void) -{ - ACE_TRACE ("ACE_Timer_Queue_T::~ACE_Timer_Queue_T"); - - // Cleanup the functor and free_list on the way out - if (this->delete_upcall_functor_) - delete this->upcall_functor_; - - if (this->delete_free_list_) - delete this->free_list_; -} - -template ACE_Timer_Node_T * -ACE_Timer_Queue_T::alloc_node (void) -{ - return this->free_list_->remove (); -} - -template void -ACE_Timer_Queue_T::free_node (ACE_Timer_Node_T *node) -{ - this->free_list_->add (node); -} - -template ACE_LOCK & -ACE_Timer_Queue_T::mutex (void) -{ - return this->mutex_; -} - - -// Run the method for all Timers whose values are <= -// . -template int -ACE_Timer_Queue_T::expire (const ACE_Time_Value &cur_time) -{ - ACE_TRACE ("ACE_Timer_Queue_T::expire"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - // Keep looping while there are timers remaining and the earliest - // timer is <= the passed in to the method. - - if (this->is_empty ()) - return 0; - - int number_of_timers_expired = 0; - int result = 0; - - ACE_Timer_Node_Dispatch_Info_T info; - - while ((result = this->dispatch_info_i (cur_time, - info)) != 0) - { - // call the functor - this->upcall (info.type_, info.act_, cur_time); - - number_of_timers_expired++; - - } - - ACE_UNUSED_ARG (result); - return number_of_timers_expired; -} - - -template int -ACE_Timer_Queue_T::dispatch_info_i (const ACE_Time_Value &cur_time, - ACE_Timer_Node_Dispatch_Info_T &info) -{ - ACE_TRACE ("ACE_Timer_Queue_T::dispatch_info_i"); - - if (this->is_empty ()) - return 0; - - ACE_Timer_Node_T *expired = 0; - - if (this->earliest_time () <= cur_time) - { - expired = this->remove_first (); - - // Get the dispatch info - expired->get_dispatch_info (info); - - // Check if this is an interval timer. - if (expired->get_interval () > ACE_Time_Value::zero) - { - // Make sure that we skip past values that have already - // "expired". - do - expired->set_timer_value (expired->get_timer_value () + expired->get_interval ()); - while (expired->get_timer_value () <= cur_time); - - // Since this is an interval timer, we need to reschedule - // it. - this->reschedule (expired); - } - else - { - // Call the factory method to free up the node. - this->free_node (expired); - } - - return 1; - } - - return 0; -} - - -template void -ACE_Timer_Queue_T::return_node (ACE_Timer_Node_T *node) -{ - ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_)); - this->free_node (node); -} - - -template -ACE_Event_Handler_Handle_Timeout_Upcall::ACE_Event_Handler_Handle_Timeout_Upcall (void) -{ -} - -template -ACE_Event_Handler_Handle_Timeout_Upcall::~ACE_Event_Handler_Handle_Timeout_Upcall (void) -{ -} - -template int -ACE_Event_Handler_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *act, - const ACE_Time_Value &cur_time) -{ - // Upcall to the s handle_timeout() method. - if (handler->handle_timeout (cur_time, act) == -1) - { -#if 0 - // Commented out until we figure out how to break the coupling that results... - if (handler->reactor ()) - // Call the reactor's cancel_timer() method to minimize locking. - handler->reactor ()->cancel_timer (handler, 0); // 0 means "call handle_close()". - else -#endif - // Upcall to the handler's handle_timeout method. - timer_queue.cancel (handler, 0); - } - - return 0; -} - -template int -ACE_Event_Handler_Handle_Timeout_Upcall::cancellation (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler) -{ - ACE_UNUSED_ARG (timer_queue); - - // Upcall to the s handle_close method - handler->handle_close (ACE_INVALID_HANDLE, - ACE_Event_Handler::TIMER_MASK); - return 0; -} - -template int -ACE_Event_Handler_Handle_Timeout_Upcall::deletion (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *arg) -{ - ACE_UNUSED_ARG (timer_queue); - ACE_UNUSED_ARG (handler); - ACE_UNUSED_ARG (arg); - - // Does nothing - - return 0; -} - -#endif /* ACE_TIMER_QUEUE_T_C*/ diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h deleted file mode 100644 index 1cae4f56e8d..00000000000 --- a/ace/Timer_Queue_T.h +++ /dev/null @@ -1,504 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_Queue_T.h - * - * $Id$ - * - * @author Doug Schmidt - * @author Irfan Pyarali and - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_TIMER_QUEUE_T_H -#define ACE_TIMER_QUEUE_T_H -#include "ace/pre.h" - -#include "ace/Free_List.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Test_and_Set.h" - -/** - * @class ACE_Timer_Node_Dispatch_Info_T - * - * @brief Maintains generated dispatch information for Timer nodes. - * - */ -template -class ACE_Timer_Node_Dispatch_Info_T -{ -public: - /// The type of object held in the queue - TYPE type_; - - /// Asynchronous completion token associated with the timer. - const void *act_; -}; - -/** - * @class ACE_Timer_Node_T - * - * @brief Maintains the state associated with a Timer entry. - */ -template -class ACE_Timer_Node_T -{ -public: - /// Default constructor - ACE_Timer_Node_T (void); - - /// Destructor - ~ACE_Timer_Node_T (void); - - /// Useful typedef .. - typedef ACE_Timer_Node_Dispatch_Info_T DISPATCH_INFO; - - /// Singly linked list - void set (const TYPE &type, - const void *a, - const ACE_Time_Value &t, - const ACE_Time_Value &i, - ACE_Timer_Node_T *n, - long timer_id); - - /// Doubly linked list version - void set (const TYPE &type, - const void *a, - const ACE_Time_Value &t, - const ACE_Time_Value &i, - ACE_Timer_Node_T *p, - ACE_Timer_Node_T *n, - long timer_id); - - // = Accessors - - /// Get the type. - TYPE &get_type (void); - - /// Set the type. - void set_type (TYPE &type); - - /// Get the asynchronous completion token. - const void *get_act (void); - - /// Set the asynchronous completion token. - void set_act (void *act); - - /// Get the timer value. - const ACE_Time_Value &get_timer_value (void) const; - - /// Set the timer value. - void set_timer_value (const ACE_Time_Value &timer_value); - - /// Get the timer interval. - const ACE_Time_Value &get_interval (void) const; - - /// Set the timer interval. - void set_interval (const ACE_Time_Value &interval); - - /// Get the previous pointer. - ACE_Timer_Node_T *get_prev (void); - - /// Set the previous pointer. - void set_prev (ACE_Timer_Node_T *prev); - - /// Get the next pointer. - ACE_Timer_Node_T *get_next (void); - - /// Set the next pointer. - void set_next (ACE_Timer_Node_T *next); - - /// Get the timer_id. - long get_timer_id (void) const; - - /// Set the timer_id. - void set_timer_id (long timer_id); - - /// Get the dispatch info. The dispatch information is got - /// through . This form helps us in preventing allocation and - /// deleting data along the criticl path. - /// @@TODO: We may want to have a copying version too, so that our - /// interface will be complete.. - void get_dispatch_info (ACE_Timer_Node_Dispatch_Info_T &info); - - /// Dump the state of an TYPE. - void dump (void) const; - -private: - /// Type of object stored in the Queue - TYPE type_; - - /// Asynchronous completion token associated with the timer. - const void *act_; - - /// Time until the timer expires. - ACE_Time_Value timer_value_; - - /// If this is a periodic timer this holds the time until the next - /// timeout. - ACE_Time_Value interval_; - - /// Pointer to previous timer. - ACE_Timer_Node_T *prev_; - - /// Pointer to next timer. - ACE_Timer_Node_T *next_; - - /// Id of this timer (used to cancel timers before they expire). - long timer_id_; -}; - -/** - * @class ACE_Timer_Queue_Iterator_T - * - * @brief Generic interface for iterating over a subclass of - * . - * - * This is a generic iterator that can be used to visit every - * node of a timer queue. Be aware that it isn't guaranteed - * that the transversal will be in order of timeout values. - */ -template -class ACE_Timer_Queue_Iterator_T -{ -public: - // = Initialization and termination methods. - /// Constructor. - ACE_Timer_Queue_Iterator_T (void); - - /// Destructor. - virtual ~ACE_Timer_Queue_Iterator_T (void); - - /// Positions the iterator at the earliest node in the Timer Queue - virtual void first (void) = 0; - - /// Positions the iterator at the next node in the Timer Queue - virtual void next (void) = 0; - - /// Returns true when there are no more nodes in the sequence - virtual int isdone (void) const = 0; - - /// Returns the node at the current position in the sequence - virtual ACE_Timer_Node_T *item (void) = 0; -}; - -/** - * @class ACE_Timer_Queue_T - * - * @brief Provides an interface to timers. - * - * This is an abstract base class that provides hook for - * implementing specialized policies such as - * and . - */ -template -class ACE_Timer_Queue_T -{ -public: - /// Type of Iterator. - typedef ACE_Timer_Queue_Iterator_T ITERATOR; - - // = Initialization and termination methods. - /** - * Default constructor. is the instance of the - * FUNCTOR to be used by the queue. If is 0, Timer - * Queue will create a default FUNCTOR. the freelist of - * timer nodes. If 0, then a default freelist will be created. - */ - ACE_Timer_Queue_T (FUNCTOR *upcall_functor = 0, - ACE_Free_List > *freelist = 0); - - /// Destructor - make virtual for proper destruction of inherited - /// classes. - virtual ~ACE_Timer_Queue_T (void); - - /// True if queue is empty, else false. - virtual int is_empty (void) const = 0; - - /// Returns the time of the earlier node in the Timer_Queue. Must - /// be called on a non-empty queue. - virtual const ACE_Time_Value &earliest_time (void) const = 0; - - /** - * Schedule that will expire at , - * which is specified in absolute time. If it expires then is - * passed in as the value to the . If is != to - * then it is used to reschedule the - * automatically, using relative time to the current . - * This method returns a that uniquely identifies the the - * entry in an internal list. This can be used to - * cancel the timer before it expires. The cancellation ensures - * that are unique up to values of greater than 2 - * billion timers. As long as timers don't stay around longer than - * this there should be no problems with accidentally deleting the - * wrong timer. Returns -1 on failure (which is guaranteed never to - * be a valid ). - */ - virtual long schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &future_time, - const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0; - - /** - * Resets the interval of the timer represented by to - * , which is specified in relative time to the current - * . If is equal to - * , the timer will become a non-rescheduling - * timer. Returns 0 if successful, -1 if not. - */ - virtual int reset_interval (long timer_id, - const ACE_Time_Value &interval) = 0; - - /** - * Cancel all timer associated with . If - * is 0 then the will be invoked, - * which typically invokes the hook. Returns number - * of timers cancelled. - */ - virtual int cancel (const TYPE &type, - int dont_call_handle_close = 1) = 0; - - /** - * Cancel the single timer that matches the value (which - * was returned from the method). If act is non-NULL - * then it will be set to point to the ``magic cookie'' argument - * passed in when the timer was registered. This makes it possible - * to free up the memory and avoid memory leaks. If - * is 0 then the will be invoked, - * which typically calls the hook. Returns 1 if - * cancellation succeeded and 0 if the wasn't found. - */ - virtual int cancel (long timer_id, - const void **act = 0, - int dont_call_handle_close = 1) = 0; - - /** - * Run the for all timers whose values are <= . - * This does not account for . Returns the number of - * timers canceled. - */ - virtual int expire (const ACE_Time_Value ¤t_time); - - /** - * Get the dispatch information for a timer whose value is <= . - * This does not account for . Returns 1 if - * there is a node whose value <= else returns a 0. - * - */ - int dispatch_info (const ACE_Time_Value ¤t_time, - ACE_Timer_Node_Dispatch_Info_T &info); - - /** - * Run the for all timers whose values are <= - * . Also accounts for . - * - * Depending on the resolution of the underlying OS the system calls - * like select()/poll() might return at time different than that is - * specified in the timeout. Suppose the OS guarantees a resolution of t ms. - * The timeline will look like - * - * A B - * | | - * V V - * |-------------|-------------|-------------|-------------| - * t t t t t - * - * - * If you specify a timeout value of A, then the timeout will not occur - * at A but at the next interval of the timer, which is later than - * that is expected. Similarly, if your timeout value is equal to B, - * then the timeout will occur at interval after B. Now depending upon the - * resolution of your timeouts and the accuracy of the timeouts - * needed for your application, you should set the value of - * . In the above case, if you want the timeout A to fire - * no later than A, then you should specify your to be - * A % t. - * - * The timeout value should be specified via the macro ACE_TIMER_SKEW - * in your config.h file. The default value is zero. - * - * Things get interesting if the t before the timeout value B is zero - * i.e your timeout is less than the interval. In that case, you are - * almost sure of not getting the desired timeout behaviour. Maybe you - * should look for a better OS :-) - * - * Returns the number of timers canceled. - */ - - /* virtual */ int expire (void); - - /** - * Returns the current time of day. This method allows different - * implementations of the timer queue to use special high resolution - * timers. - */ - /* virtual */ ACE_Time_Value gettimeofday (void); - - /// Allows applications to control how the timer queue gets the time - /// of day. - void gettimeofday (ACE_Time_Value (*gettimeofday)(void)); - - /// Determine the next event to timeout. Returns if there are - /// no pending timers or if all pending timers are longer than max. - /// This method acquires a lock internally since it modifies internal state. - virtual ACE_Time_Value *calculate_timeout (ACE_Time_Value *max); - - /** - * Determine the next event to timeout. Returns if there are - * no pending timers or if all pending timers are longer than max. - * should be a pointer to storage for the timeout value, - * and this value is also returned. This method does not acquire a - * lock internally since it doesn't modify internal state. If you - * need to call this method when the queue is being modified - * concurrently, however, you should make sure to acquire the - * externally before making the call. - */ - virtual ACE_Time_Value *calculate_timeout (ACE_Time_Value *max, - ACE_Time_Value *the_timeout); - - /// Set the timer skew for the Timer_Queue. - void timer_skew (const ACE_Time_Value &skew); - - /// Get the timer skew for the Timer_Queue. - const ACE_Time_Value &timer_skew (void) const; - - /// Synchronization variable used by the queue - ACE_LOCK &mutex (void); - - /// Accessor to the upcall functor - FUNCTOR &upcall_functor (void); - - /// Returns a pointer to this 's iterator. - virtual ITERATOR &iter (void) = 0; - - /// Removes the earliest node from the queue and returns it - virtual ACE_Timer_Node_T *remove_first (void) = 0; - - /// Dump the state of a object. - virtual void dump (void) const; - - /// Reads the earliest node from the queue and returns it. - virtual ACE_Timer_Node_T *get_first (void) = 0; - - /// Method used to return a timer node to the queue's ownership - /// after it is returned by a method like . - virtual void return_node (ACE_Timer_Node_T *); - - - /// This method will call the with the , and - /// - /* virtual */ void upcall (TYPE &type, - const void *act, - const ACE_Time_Value &cur_time); - -protected: - /// Reschedule an "interval" . - virtual void reschedule (ACE_Timer_Node_T *) = 0; - - /// Factory method that allocates a new node. - virtual ACE_Timer_Node_T *alloc_node (void); - - /// Factory method that frees a previously allocated node. - virtual void free_node (ACE_Timer_Node_T *); - - /// Non-locking version of dispatch_info () - int dispatch_info_i (const ACE_Time_Value ¤t_time, - ACE_Timer_Node_Dispatch_Info_T &info); - - /// Synchronization variable for . - /// NOTE: the right name would be lock_, but HP/C++ will choke on that! - ACE_LOCK mutex_; - - /// Class that implements a free list - ACE_Free_List > *free_list_; - - /// Pointer to function that returns the current time of day. - ACE_Time_Value (*gettimeofday_)(void); - - /// Upcall functor - FUNCTOR *upcall_functor_; - - /// To delete or not to delete is the question? - int delete_upcall_functor_; - - /// Flag to delete only if the class created the - int delete_free_list_; - -private: - - /// Returned by . - ACE_Time_Value timeout_; - - /// Adjusts for timer skew in various clocks. - ACE_Time_Value timer_skew_; - - // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Timer_Queue_T (const ACE_Timer_Queue_T &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Queue_T &)) -}; - -/** - * @class ACE_Event_Handler_Handle_Timeout_Upcall - * - * @brief Functor for Timer_Queues. - * - * This class implements the functor required by the Timer - * Queue to call on ACE_Event_Handlers. - */ -template -class ACE_Event_Handler_Handle_Timeout_Upcall -{ -public: - typedef ACE_Timer_Queue_T, - ACE_LOCK> - TIMER_QUEUE; - - // = Initialization and termination methods. - /// Constructor. - ACE_Event_Handler_Handle_Timeout_Upcall (void); - - /// Destructor. - ~ACE_Event_Handler_Handle_Timeout_Upcall (void); - - /// This method is called when the timer expires - int timeout (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *arg, - const ACE_Time_Value &cur_time); - - /// This method is called when the timer is cancelled - int cancellation (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler); - - /// This method is called when the timer queue is destroyed and - /// the timer is still contained in it - int deletion (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *arg); -private: - // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC (ACE_Event_Handler_Handle_Timeout_Upcall (const ACE_Event_Handler_Handle_Timeout_Upcall &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Event_Handler_Handle_Timeout_Upcall &)) -}; - -#if defined (__ACE_INLINE__) -#include "ace/Timer_Queue_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Queue_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_TIMER_QUEUE_T_H */ diff --git a/ace/Timer_Queue_T.i b/ace/Timer_Queue_T.i deleted file mode 100644 index 8af63669a6f..00000000000 --- a/ace/Timer_Queue_T.i +++ /dev/null @@ -1,188 +0,0 @@ -// $Id$ - -/* -*- C++ -*- */ - -template ACE_INLINE void -ACE_Timer_Node_T::set (const TYPE &type, - const void *a, - const ACE_Time_Value &t, - const ACE_Time_Value &i, - ACE_Timer_Node_T *n, - long timer_id) -{ - this->type_ = type; - this->act_ = a; - this->timer_value_ = t; - this->interval_ = i; - this->next_ = n; - this->timer_id_ = timer_id; -} - -template ACE_INLINE void -ACE_Timer_Node_T::set (const TYPE &type, - const void *a, - const ACE_Time_Value &t, - const ACE_Time_Value &i, - ACE_Timer_Node_T *p, - ACE_Timer_Node_T *n, - long timer_id) -{ - this->type_ = type; - this->act_ = a; - this->timer_value_ = t; - this->interval_ = i; - this->prev_ = p; - this->next_ = n; - this->timer_id_ = timer_id; -} - -template ACE_INLINE TYPE & -ACE_Timer_Node_T::get_type (void) -{ - return this->type_; -} - -template ACE_INLINE void -ACE_Timer_Node_T::set_type (TYPE &type) -{ - this->type_ = type; -} - -template ACE_INLINE const void * -ACE_Timer_Node_T::get_act (void) -{ - return this->act_; -} - -template ACE_INLINE void -ACE_Timer_Node_T::set_act (void *act) -{ - this->act_ = act; -} - -template ACE_INLINE const ACE_Time_Value & -ACE_Timer_Node_T::get_timer_value (void) const -{ - return this->timer_value_; -} - -template ACE_INLINE void -ACE_Timer_Node_T::set_timer_value (const ACE_Time_Value &timer_value) -{ - this->timer_value_ = timer_value; -} - -template ACE_INLINE const ACE_Time_Value & -ACE_Timer_Node_T::get_interval (void) const -{ - return this->interval_; -} - -template ACE_INLINE void -ACE_Timer_Node_T::set_interval (const ACE_Time_Value &interval) -{ - this->interval_ = interval; -} - -template ACE_INLINE ACE_Timer_Node_T * -ACE_Timer_Node_T::get_prev (void) -{ - return this->prev_; -} - -template ACE_INLINE void -ACE_Timer_Node_T::set_prev (ACE_Timer_Node_T *prev) -{ - this->prev_ = prev; -} - -template ACE_INLINE ACE_Timer_Node_T * -ACE_Timer_Node_T::get_next (void) -{ - return this->next_; -} - -template ACE_INLINE void -ACE_Timer_Node_T::set_next (ACE_Timer_Node_T *next) -{ - this->next_ = next; -} - -template ACE_INLINE long -ACE_Timer_Node_T::get_timer_id (void) const -{ - return this->timer_id_; -} - -template ACE_INLINE void -ACE_Timer_Node_T::set_timer_id (long timer_id) -{ - this->timer_id_ = timer_id; -} - -template ACE_INLINE void -ACE_Timer_Node_T::get_dispatch_info (ACE_Timer_Node_Dispatch_Info_T &info) -{ - // Yes, do a copy - info.type_ = this->type_; - info.act_ = this->act_; -} - -template ACE_INLINE void -ACE_Timer_Queue_T::timer_skew (const ACE_Time_Value &skew) -{ - timer_skew_ = skew; -} - -template ACE_INLINE const ACE_Time_Value & -ACE_Timer_Queue_T::timer_skew (void) const -{ - return timer_skew_; -} - -template ACE_INLINE int -ACE_Timer_Queue_T::expire (void) -{ - if (!this->is_empty ()) - return this->expire (this->gettimeofday () + timer_skew_); - else - return 0; -} - -template int -ACE_Timer_Queue_T::dispatch_info (const ACE_Time_Value &cur_time, - ACE_Timer_Node_Dispatch_Info_T &info) -{ - ACE_TRACE ("ACE_Timer_Queue_T::dispatch_info"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, 0)); - - return this->dispatch_info_i (cur_time, info); -} - -template ACE_INLINE void -ACE_Timer_Queue_T::upcall (TYPE &type, - const void *act, - const ACE_Time_Value &cur_time) -{ - this->upcall_functor ().timeout (*this, type, act, cur_time); -} - - -template ACE_INLINE ACE_Time_Value -ACE_Timer_Queue_T::gettimeofday (void) -{ - // Invoke gettimeofday via pointer to function. - return this->gettimeofday_ (); -} - -template ACE_INLINE void -ACE_Timer_Queue_T::gettimeofday (ACE_Time_Value (*gettimeofday)(void)) -{ - this->gettimeofday_ = gettimeofday; -} - -template ACE_INLINE FUNCTOR & -ACE_Timer_Queue_T::upcall_functor (void) -{ - return *this->upcall_functor_; -} diff --git a/ace/Timer_Wheel.cpp b/ace/Timer_Wheel.cpp deleted file mode 100644 index de72afccb18..00000000000 --- a/ace/Timer_Wheel.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - -#if !defined (ACE_TIMER_WHEEL_C) -#define ACE_TIMER_WHEEL_C - -#include "ace/Timer_Wheel.h" - -#if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Wheel_T.cpp" -#endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ - -ACE_RCSID(ace, Timer_Wheel, "$Id$") - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Timer_Wheel_T, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Timer_Wheel_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Timer_Wheel_T, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Timer_Wheel_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - -#endif /* ACE_TIMER_WHEEL_C */ diff --git a/ace/Timer_Wheel.h b/ace/Timer_Wheel.h deleted file mode 100644 index 5d37d0488dc..00000000000 --- a/ace/Timer_Wheel.h +++ /dev/null @@ -1,39 +0,0 @@ - -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_Wheel.h - * - * $Id$ - * - * @author Darrell Brunsch (brunsch@cs.wustl.edu) - */ -//============================================================================= - - -#ifndef ACE_TIMER_WHEEL_H -#define ACE_TIMER_WHEEL_H -#include "ace/pre.h" - -#include "ace/Timer_Wheel_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// The following typedef are here for ease of use and backward -// compatibility. - -typedef ACE_Timer_Wheel_T, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Wheel; - -typedef ACE_Timer_Wheel_Iterator_T, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Wheel_Iterator; - -#include "ace/post.h" -#endif /* ACE_TIMER_WHEEL_H */ diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp deleted file mode 100644 index 3385ca06fa7..00000000000 --- a/ace/Timer_Wheel_T.cpp +++ /dev/null @@ -1,908 +0,0 @@ -// $Id$ - -#ifndef ACE_TIMER_WHEEL_T_C -#define ACE_TIMER_WHEEL_T_C - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Timer_Wheel_T.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(ace, Timer_Wheel_T, "$Id$") - - -// Design/implementation notes for ACE_Timer_Wheel_T. -// -// Each timer queue entry is represented by a ACE_Timer_Node. -// The timing wheel is divided into a number of "spokes"; there are -// spoke_count_ spokes in the wheel. Each timer is hashed into one of the -// spokes. Entries within each spoke are linked in a double-linked list -// in order of increasing expiration. The first ACE_Timer_Node in each -// spoke is a "dummy node" that marks the end of the list of ACE_Timer_Nodes -// in that spoke. -// -// The timer ID for a scheduled timer is formed by its spoke position in -// the wheel, and the number of timers that have been inserted in that spoke -// since the queue was initialized. N bits of the long timer_id are used -// to determine the spoke, and M bits are used as a counter. -// Each time a Node is inserted into a spoke, it's counter -// is incremented. The count is kept in the timer ID field -// of the dummy root Node. In the event of overflow of the counter, the spoke -// must be searched for each new id to make sure it's not already in use. To -// prevent having to do an exhaustive search each time, we keep extra data -// in the dummy root Node. -/** -* Default Constructor that sets defaults for spoke_count_ and resolution_ -* and doesn't do any preallocation. -* -* @param upcall_functor A pointer to a functor to use instead of the default -* @param freelist A pointer to a freelist to use instead of the default -*/ -template -ACE_Timer_Wheel_T::ACE_Timer_Wheel_T -(FUNCTOR* upcall_functor - , FreeList* freelist - ) -: Base (upcall_functor, freelist) -, spokes_(0) -, spoke_count_(0) // calculated in open_i -, spoke_bits_(0) -, res_bits_ (0) -, earliest_spoke_ (0) -, iterator_(0) -, timer_count_(0) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::ACE_Timer_Wheel_T"); - this->open_i (0, - ACE_DEFAULT_TIMER_WHEEL_SIZE, - ACE_DEFAULT_TIMER_WHEEL_RESOLUTION); -} - -/** -* Constructor that sets up the timing wheel and also may preallocate -* some nodes on the free list -* -* @param spoke_count The number of lists in the timer wheel -* @param resolution The time resolution in milliseconds used by the hashing function -* @param prealloc The number of entries to prealloc in the free_list -* @param upcall_functor A pointer to a functor to use instead of the default -* @param freelist A pointer to a freelist to use instead of the default -*/ -template -ACE_Timer_Wheel_T::ACE_Timer_Wheel_T - (u_int spoke_count, - u_int resolution, - size_t prealloc, - FUNCTOR* upcall_functor, - FreeList* freelist) -: Base (upcall_functor, freelist) -, spokes_ (0) -, spoke_count_ (0) // calculated in open_i -, spoke_bits_ (0) -, res_bits_ (0) -, earliest_spoke_ (0) -, iterator_ (0) -, timer_count_ (0) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::ACE_Timer_Wheel_T"); - this->open_i (prealloc, spoke_count, resolution); -} - -namespace { - int power2bits(int n, int min_bits, int max_bits) { - int max = (1 << max_bits) - 1; - if (n > max) { - return max_bits; - } - // count the bits in n. - int i = 0; - int tmp = n; - do { - tmp >>= 1; - ++i; - } while (tmp != 0); - - if (i <= min_bits) { - return min_bits; - } - // Which is nearest? - int a = (1 << i) - n; - int b = (1 << (i - 1)) - n; - if (b < 0) - b = -b; - if (b < a) - return i - 1; - return i; - } -} - -/** -* Initialize the queue. Uses the established members for all needed -* information. -*/ -template void -ACE_Timer_Wheel_T::open_i - (size_t prealloc, u_int spokes, u_int res) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::open_i"); - - this->gettimeofday (ACE_OS::gettimeofday); - - // Rather than waste bits in our timer id, we might as well round up - // the spoke count to the next power of two - 1 . (i.e 1,3,7,15,...127,etc.) - const int MIN_SPOKE_BITS = 3; // Allow between 8 and 4096 spokes - const int MAX_SPOKE_BITS = 12; - const int MAX_RES_BITS = 20; // 20 is plenty, even on 64 bit platforms. - - this->spoke_bits_ = power2bits (spokes, MIN_SPOKE_BITS, MAX_SPOKE_BITS); - this->res_bits_ = power2bits (res, 1, MAX_RES_BITS); - - this->spoke_count_ = 1 << this->spoke_bits_; - - this->free_list_->resize (prealloc + this->spoke_count_); - - this->wheel_time_.msec (1 << (this->res_bits_ + this->spoke_bits_)); - - ACE_NEW (this->spokes_, ACE_Timer_Node_T* [this->spoke_count_]); - - // Create the root nodes. These will be treated specially - for (u_int i = 0; i < this->spoke_count_; ++i) - { - ACE_Timer_Node_T* root = this->alloc_node (); - root->set (0, 0, ACE_Time_Value::zero, ACE_Time_Value::zero, root, root, 0); - this->spokes_[i] = root; - } - - ACE_NEW (iterator_, Iterator (*this)); -} - -/// Destructor just cleans up its memory -template -ACE_Timer_Wheel_T::~ACE_Timer_Wheel_T (void) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::~ACE_Timer_Wheel_T"); - - delete iterator_; - - for (u_int i = 0; i < this->spoke_count_; ++i) - { - // Free all the nodes starting at the root - ACE_Timer_Node_T* root = this->spokes_[i]; - for (ACE_Timer_Node_T* n = root->get_next (); n != root;) - { - ACE_Timer_Node_T* next = n->get_next (); - this->upcall_functor ().deletion (*this, n->get_type (), n->get_act ()); - this->free_node (n); - n = next; - } - delete root; - } - delete[] this->spokes_; -} - -/// Searches for a node by timer_id within one spoke. -template -ACE_Timer_Node_T* -ACE_Timer_Wheel_T::find_spoke_node - (u_int spoke, long timer_id) const -{ - ACE_Timer_Node_T* root = this->spokes_[spoke]; - for (ACE_Timer_Node_T* n = root->get_next (); - n != root; - n = n->get_next ()) - { - if (n->get_timer_id () == timer_id) - return n; - } - return 0; -} - -/// Searches all spokes for a node matching the specified timer_id -/// Uses the spoke encoded in the timer_id as a starting place. -template -ACE_Timer_Node_T* -ACE_Timer_Wheel_T::find_node (long timer_id) const -{ - if (timer_id == -1) - return 0; - - // Search the spoke where timer_id was originally scheduled - u_int spoke_mask = this->spoke_count_ - 1; - u_int start = timer_id & spoke_mask; - ACE_Timer_Node_T* n = this->find_spoke_node (start, timer_id); - if (n != 0) - return n; - - //ACE_ERROR((LM_ERROR, "Node not found in original spoke.\n")); - - // Search the rest of the spokes - for (u_int i = 0; i < this->spoke_count_; ++i) - { - if (i != start) - { // already searched this one - n = this->find_spoke_node (i, timer_id); - if (n != 0) - return n; - } - } - - //ACE_ERROR((LM_ERROR, "Node not found.\n")); - return 0; -} - -/** -* Check to see if the wheel is empty -* -* @return True if empty -*/ -template int -ACE_Timer_Wheel_T::is_empty (void) const -{ - ACE_TRACE ("ACE_Timer_Wheel_T::is_empty"); - return timer_count_ == 0; -} - - -/** -* @return First (earliest) node in the wheel_'s earliest_spoke_ list -*/ -template const ACE_Time_Value & -ACE_Timer_Wheel_T::earliest_time (void) const -{ - ACE_TRACE ("ACE_Timer_Wheel_T::earliest_time"); - ACE_Timer_Node_T* n = this->get_first_i (); - if (n != 0) - return n->get_timer_value (); - return ACE_Time_Value::zero; -} - -/// Uses a simple hash to find which spoke to use based on when the -/// timer is due to expire. Hopefully the 64bit int operations avoid -/// any overflow problems. -template u_int -ACE_Timer_Wheel_T::calculate_spoke - (const ACE_Time_Value& t) const -{ - return ACE_static_cast(u_int, (t.msec () >> this->res_bits_) & (this->spoke_count_ - 1)); -} - -/// Generates a unique timer_id for the given spoke. It should be pretty -/// fast until the point where the counter overflows. At that time you -/// have to do exhaustive searches within the spoke to ensure that a particular -/// timer id is not already in use. Some optimizations are in place so -/// that this hopefully doesn't have to happen often. -template long -ACE_Timer_Wheel_T::generate_timer_id (u_int spoke) -{ - - int cnt_bits = sizeof (long) * 8 - this->spoke_bits_; - long max_cnt = ((long)1 << cnt_bits) - 1; - if (spoke == this->spoke_count_) - --max_cnt; // Because -1 is used as a special invalid timer_id. - - ACE_Timer_Node_T* root = this->spokes_[spoke]; - - if (root == root->get_next ()) - root->set_act(0); - - // We use this field to keep track of the next counter value that - // may be in use. Of course it may have expired, so we just use - // this field so that we know when we don't have to check for duplicates -#if defined (ACE_WIN64) - // The cast below is legit... we know that long is shorter than a - // pointer, but are only using it as a 'long' storage area. -# pragma warning(push) -# pragma warning(disable : 4311) -#endif /* ACE_WIN64 */ - long next_cnt = ACE_reinterpret_cast (long, root->get_act ()); -#if defined (ACE_WIN64) -# pragma warning(pop) -#endif /* ACE_WIN64 */ - - // This field is used as a counter instead of a timer_id. - long cnt = root->get_timer_id (); - - if (cnt >= max_cnt && root == root->get_next ()) - { - // Special case when we overflow on an empty spoke. We can just - // wrap the count around without searching for duplicates. We only - // want to do this when the counter overflows, so that we return - // unique timer_id values as often as possible. - root->set_timer_id (1); - return spoke; - } - else if (cnt >= max_cnt) - { // overflow - cnt = 0; // try again starting at zero - } - else if (next_cnt == 0 || cnt < next_cnt) - { - root->set_timer_id (cnt + 1); - return (cnt << this->spoke_bits_) | spoke; - } - - //ACE_ERROR((LM_ERROR, "Timer id overflow. We have to search now.\n")); - - // We've run out of consecutive id numbers so now we have to search - // for a unique id. - // We'll try increasing numbers until we find one that is not in use, - // and we'll record the next highest number so that we can avoid this - // search as often as possible. - for (; cnt < max_cnt - 1; ++cnt) - { - long id = (cnt << this->spoke_bits_) | spoke; - ACE_Timer_Node_T* n = this->find_spoke_node (spoke, id); - if (n == 0) - { - root->set_timer_id (cnt + 1); - // Now we need to find the next highest cnt in use - next_cnt = 0; - for (; n != root; n = n->get_next ()) - { - long tmp = n->get_timer_id () >> this->spoke_bits_; - if (tmp > cnt && (tmp < next_cnt || next_cnt == 0)) - next_cnt = tmp; - } -#if defined (ACE_WIN64) - // The cast below is legit... we know we're storing a long in - // a pointer, but are only using it as a 'long' storage area. -# pragma warning(push) -# pragma warning(disable : 4312) -#endif /* ACE_WIN64 */ - root->set_act (ACE_reinterpret_cast (void*, next_cnt)); -#if defined (ACE_WIN64) -# pragma warning(pop) -#endif /* ACE_WIN64 */ - return id; - } - } - - return -1; // We did our best, but the spoke is full. -} - -/** -* Creates a ACE_Timer_Node_T based on the input parameters. Then inserts -* the node into the wheel using reschedule (). Then returns a timer_id. -* -* @param type The data of the timer node -* @param act Asynchronous Completion Token (AKA magic cookie) -* @param future_time The time the timer is scheduled for (absolute time) -* @param interval If not ACE_Time_Value::zero, then this is a periodic -* timer and interval is the time period -* -* @return Unique identifier (can be used to cancel the timer). -* -1 on failure. -*/ -template long -ACE_Timer_Wheel_T::schedule ( - const TYPE& type, - const void* act, - const ACE_Time_Value& future_time, - const ACE_Time_Value& interval - ) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::schedule"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - ACE_Timer_Node_T* n = this->alloc_node (); - - if (n != 0) - { - u_int spoke = calculate_spoke (future_time); - long id = generate_timer_id (spoke); - - //ACE_ERROR((LM_ERROR, "Scheduling %x spoke:%d id:%d\n", (long) n, spoke, id)); - - if (id != -1) - { - n->set (type, act, future_time, interval, 0, 0, id); - this->schedule_i (n, spoke, future_time); - } - return id; - } - - // Failure return - errno = ENOMEM; - return -1; -} - -/** -* Takes an ACE_Timer_Node and inserts it into the correct position in -* the correct list. Also makes sure to update the earliest time. -* -* @param n The timer node to reschedule -*/ -template void -ACE_Timer_Wheel_T::reschedule (ACE_Timer_Node_T* n) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::reschedule"); - const ACE_Time_Value& expire = n->get_timer_value (); - u_int spoke = calculate_spoke (expire); - this->schedule_i (n, spoke, expire); -} - -/// The shared scheduling functionality between schedule() and reschedule() -template void -ACE_Timer_Wheel_T::schedule_i - (ACE_Timer_Node_T* n, - u_int spoke, - const ACE_Time_Value& expire) -{ - // See if we need to update the earliest time - if (this->is_empty() || expire < this->earliest_time ()) - this->earliest_spoke_ = spoke; - - ACE_Timer_Node_T* root = this->spokes_[spoke]; - ACE_Timer_Node_T* last = root->get_prev (); - - ++timer_count_; - - // If the spoke is empty - if (last == root) { - n->set_prev (root); - n->set_next (root); - root->set_prev (n); - root->set_next (n); - return; - } - - // We always want to search backwards from the tail of the list, because - // this minimizes the search in the extreme case when lots of timers are - // scheduled for exactly the same time - ACE_Timer_Node_T* p = root->get_prev (); - while (p != root && p->get_timer_value () > expire) - p = p->get_prev (); - - // insert after - n->set_prev (p); - n->set_next (p->get_next ()); - p->get_next ()->set_prev (n); - p->set_next (n); -} - - -/** -* Find the timer node by using the id as a pointer. Then use set_interval() -* on the node to update the interval. -* -* @param timer_id The timer identifier -* @param interval The new interval -* -* @return 0 if successful, -1 if no. -*/ -template int -ACE_Timer_Wheel_T::reset_interval (long timer_id, - const ACE_Time_Value &interval - ) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::reset_interval"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - ACE_Timer_Node_T* n = this->find_node (timer_id); - if (n != 0) - { - // The interval will take effect the next time this node is expired. - n->set_interval (interval); - return 0; - } - return -1; -} - - -/** -* Goes through every list in the wheel and whenever we find one with the -* correct type value, we remove it and continue. At the end make sure -* we reset the earliest time value in case the earliest timers were -* removed. -* -* @param type The value to search for. -* @param skip_close If this non-zero, the cancellation method of the -* functor will not be called for each cancelled timer. -* -* @return Number of timers cancelled -*/ -template int -ACE_Timer_Wheel_T::cancel (const TYPE& type, int skip_close) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::cancel"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - int num_canceled = 0; // Note : Technically this can overflow. - - if (!this->is_empty ()) - { - ACE_Timer_Node_T* first = this->get_first (); - ACE_Time_Value last = first->get_timer_value (); - int recalc = 0; - - for (u_int i = 0; i < this->spoke_count_; ++i) - { - ACE_Timer_Node_T* root = this->spokes_[i]; - for (ACE_Timer_Node_T* n = root->get_next (); n != root; ) - { - if (n->get_type () == type) - { - ++num_canceled; - if (n == first) - recalc = 1; - - ACE_Timer_Node_T* tmp = n; - n = n->get_next (); - int always_skip_close = 1; // todo : Is this correct? - this->cancel_i (tmp, always_skip_close); - } - else - { - n = n->get_next (); - } - } - } - - if (recalc) - this->recalc_earliest (last); - } - - if (!skip_close) // && num_canceled > 0) - this->upcall_functor().cancellation (*this, type); - - return num_canceled; -} - - -/** -* Cancels the single timer that is specified by the timer_id. In this -* case the timer_id is actually a pointer to the node, so we cast it -* to the node. This can be dangerous if the timer_id is made up -* (or deleted twice) so we do a little sanity check. Finally we update -* the earliest time in case the earliest timer was removed. -* -* @param timer_id Timer Identifier -* @param act Asychronous Completion Token (AKA magic cookie): -* If this is non-zero, stores the magic cookie of -* the cancelled timer here. -* @param skip_close If this non-zero, the cancellation method of the -* functor will not be called. -* -* @return 1 for sucess and 0 if the timer_id wasn't found (or was -* found to be invalid) -*/ -template int -ACE_Timer_Wheel_T::cancel (long timer_id, - const void **act, - int skip_close) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::cancel"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - ACE_Timer_Node_T* n = this->find_node (timer_id); - if (n != 0) - { - ACE_Time_Value last = n->get_timer_value (); - int recalc = (this->get_first_i () == n); - if (act != 0) - *act = n->get_act (); - this->cancel_i (n, skip_close); - if (recalc) - this->recalc_earliest (last); - return 1; - } - return 0; -} - -/// Shared subset of the two cancel() methods. -template void -ACE_Timer_Wheel_T::cancel_i (ACE_Timer_Node_T* n, int skip_close) -{ - //ACE_ERROR((LM_ERROR, "Canceling %x\n", (long) n)); - this->unlink (n); - this->free_node (n); - if (!skip_close) - this->upcall_functor ().cancellation (*this, n->get_type ()); -} - -/// There are a few places where we have to figure out which timer -/// will expire next. This method makes the assumption that spokes -/// are always sorted, and that timers are always in the correct spoke -/// determined from their expiration time. -/// The last time is always passed in, even though you can often calculate -/// it as get_first()->get_timer_value(). -template void -ACE_Timer_Wheel_T::recalc_earliest - (const ACE_Time_Value& last) -{ - // This is possible because we use a count for is_empty() - if (this->is_empty ()) - return; - - ACE_Time_Value et = ACE_Time_Value::zero; - - u_int spoke = this->earliest_spoke_; - - // We will have to go around the wheel at most one time. - for (u_int i = 0; i < this->spoke_count_; ++i) - { - ACE_Timer_Node_T* root = this->spokes_[spoke]; - ACE_Timer_Node_T* n = root->get_next (); - if (n != root) - { - ACE_Time_Value t = n->get_timer_value (); - if (t < last + this->wheel_time_) - { - this->earliest_spoke_ = spoke; - return; - } - else if (et == ACE_Time_Value::zero || t < et) - { - et = t; - } - } - if (++spoke >= this->spoke_count_) - spoke = 0; - } - //ACE_ERROR((LM_ERROR, "We had to search the whole wheel.\n")); -} - -/** -* Dumps out the size of the wheel, the resolution, and the contents -* of the wheel. -*/ -template void -ACE_Timer_Wheel_T::dump (void) const -{ - ACE_TRACE ("ACE_Timer_Wheel_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nspoke_count_ = %d"), this->spoke_count_)); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nresolution_ = %d"), 1 << this->res_bits_)); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nwheel_ = \n"))); - - for (u_int i = 0; i < this->spoke_count_; ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%d\n"), i)); - ACE_Timer_Node_T* root = this->spokes_[i]; - for (ACE_Timer_Node_T* n = root->get_next (); - n != root; - n = n->get_next ()) - { - n->dump (); - } - } - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - - -/** -* Removes the earliest node and then find the new -* -* @return The earliest timer node. -*/ -template ACE_Timer_Node_T * -ACE_Timer_Wheel_T::remove_first (void) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::remove_first"); - return remove_first_expired (ACE_Time_Value::max_time); -} - -template void -ACE_Timer_Wheel_T::unlink (ACE_Timer_Node_T* n) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::unlink"); - --timer_count_; - n->get_prev ()->set_next (n->get_next ()); - n->get_next ()->set_prev (n->get_prev ()); - n->set_prev (0); - n->set_next (0); -} - -template ACE_Timer_Node_T * -ACE_Timer_Wheel_T::remove_first_expired (const ACE_Time_Value& now) -{ - ACE_Timer_Node_T* n = this->get_first (); - if (n != 0 && n->get_timer_value() <= now) - { - this->unlink (n); - this->recalc_earliest (n->get_timer_value ()); - return n; - } - return 0; -} - -/** -* Returns the earliest node without removing it -* -* @return The earliest timer node. -*/ -template -ACE_Timer_Node_T* -ACE_Timer_Wheel_T::get_first (void) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::get_first"); - return this->get_first_i (); -} - -template -ACE_Timer_Node_T* -ACE_Timer_Wheel_T::get_first_i (void) const -{ - ACE_Timer_Node_T* root = this->spokes_[this->earliest_spoke_]; - ACE_Timer_Node_T* first = root->get_next (); - if (first != root) - return first; - return 0; -} - - -/** -* @return The iterator -*/ -template -ACE_Timer_Queue_Iterator_T& -ACE_Timer_Wheel_T::iter (void) -{ - this->iterator_->first (); - return *this->iterator_; -} - -/** -* Dummy version of expire to get rid of warnings in Sun CC 4.2 -* Just call the expire of the base class. -*/ -template int -ACE_Timer_Wheel_T::expire () -{ - return ACE_Timer_Queue_T::expire (); -} - -/** -* This is a specialized version of expire that is more suited for the -* internal data representation. -* -* @param cur_time The time to expire timers up to. -* -* @return Number of timers expired -*/ -template int -ACE_Timer_Wheel_T::expire (const ACE_Time_Value& cur_time) -{ - ACE_TRACE ("ACE_Timer_Wheel_T::expire"); - ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); - - int expcount = 0; - ACE_Timer_Node_T* n = this->remove_first_expired (cur_time); - - while (n != 0) - { - ++ expcount; - - //ACE_ERROR((LM_ERROR, "Expiring %x\n", (long) n)); - - this->upcall (n->get_type (), n->get_act (), cur_time); - - if (n->get_interval () > ACE_Time_Value::zero) - { - n->set_timer_value (cur_time + n->get_interval ()); - this->reschedule (n); - } - else - { - this->free_node (n); - } - - n = this->remove_first_expired (cur_time); - } - - //ACE_ERROR((LM_ERROR, "Expired %d nodes\n", expcount)); - - return expcount; -} - -/////////////////////////////////////////////////////////////////////////// -// ACE_Timer_Wheel_Iterator_T - -/** -* Just initializes the iterator with a ACE_Timer_Wheel_T and then calls -* first() to initialize the rest of itself. -* -* @param wheel A reference for a timer queue to iterate over -*/ -template -ACE_Timer_Wheel_Iterator_T::ACE_Timer_Wheel_Iterator_T -(Wheel& wheel) -: timer_wheel_ (wheel) -{ - this->first(); -} - - -/** -* Destructor, at this level does nothing. -*/ -template -ACE_Timer_Wheel_Iterator_T::~ACE_Timer_Wheel_Iterator_T (void) -{ -} - - -/** -* Positions the iterator at the first position in the timing wheel -* that contains something. spoke_ will be set to the spoke position of -* this entry and current_node_ will point to the first entry in that spoke. -* -* If the wheel is empty, spoke_ will be equal timer_wheel_.spoke_count_ and -* current_node_ would be 0. -*/ -template void -ACE_Timer_Wheel_Iterator_T::first (void) -{ - this->goto_next(0); -} - - -/** -* Positions the iterator at the next node. -*/ -template void -ACE_Timer_Wheel_Iterator_T::next (void) -{ - if (this->isdone()) - return; - - ACE_Timer_Node_T* n = this->current_node_->get_next (); - ACE_Timer_Node_T* root = this->timer_wheel_.spokes_[this->spoke_]; - if (n == root) - this->goto_next (this->spoke_ + 1); - else - this->current_node_ = n; -} - -/// Helper class for common functionality of next() and first() -template void -ACE_Timer_Wheel_Iterator_T::goto_next (u_int start_spoke) -{ - // Find the first non-empty entry. - u_int sc = this->timer_wheel_.spoke_count_; - for (u_int i = start_spoke; i < sc; ++i) - { - ACE_Timer_Node_T* root = this->timer_wheel_.spokes_[i]; - ACE_Timer_Node_T* n = root->get_next (); - if (n != root) - { - this->spoke_ = i; - this->current_node_ = n; - return; - } - } - // empty - this->spoke_ = sc; - this->current_node_ = 0; -} - - -/** -* @return True when we there aren't any more items (when current_node_ == 0) -*/ -template int -ACE_Timer_Wheel_Iterator_T::isdone (void) const -{ - return this->current_node_ == 0; -} - - -/** -* @return The node at the current spokeition in the sequence or 0 if the wheel -* is empty -*/ -template ACE_Timer_Node_T * -ACE_Timer_Wheel_Iterator_T::item (void) -{ - return this->current_node_; -} - - -#endif /* ACE_TIMER_WHEEL_T_C */ diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h deleted file mode 100644 index 05d50248e93..00000000000 --- a/ace/Timer_Wheel_T.h +++ /dev/null @@ -1,222 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Timer_Wheel_T.h - * - * $Id$ - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_TIMER_WHEEL_T_H -#define ACE_TIMER_WHEEL_T_H -#include "ace/pre.h" - -#include "ace/Timer_Queue_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward declaration -template -class ACE_Timer_Wheel_T; - -/** - * @class ACE_Timer_Wheel_Iterator_T - * - * @brief Iterates over an . - * - * This is a generic iterator that can be used to visit every - * node of a timer queue. Be aware that it doesn't traverse - * in the order of timeout values. - */ -template -class ACE_Timer_Wheel_Iterator_T - : public ACE_Timer_Queue_Iterator_T -{ -public: - typedef ACE_Timer_Wheel_T Wheel; - typedef ACE_Timer_Node_T Node; - - /// Constructor - ACE_Timer_Wheel_Iterator_T (Wheel &); - - /// Destructor - ~ACE_Timer_Wheel_Iterator_T (void); - - /// Positions the iterator at the earliest node in the Timer Queue - virtual void first (void); - - /// Positions the iterator at the next node in the Timer Queue - virtual void next (void); - - /// Returns true when there are no more nodes in the sequence - virtual int isdone (void) const; - - /// Returns the node at the current position in the sequence - virtual ACE_Timer_Node_T* item (void); - -protected: - /// Pointer to the that we are iterating over. - Wheel& timer_wheel_; - - /// Current position in the timing wheel - u_int spoke_; - - /// Pointer to the position in the the th list - ACE_Timer_Node_T* current_node_; -private: - void goto_next(u_int start_spoke); -}; - -/** - * @class ACE_Timer_Wheel_T - * - * @brief Provides a Timing Wheel version of ACE_Timer_Queue. - * - * This implementation uses a hash table of ordered doubly- - * linked lists of absolute times. The enhancements over the - * @c ACE_Timer_List include adding a free list and the ability - * to preallocate nodes. Timer Wheel is based on the timing - * wheel implementation used in Adam M. Costello and - * George Varghese's paper "Redesigning the BSD Callout and - * Timer Facilities" - * (http://dworkin.wustl.edu/~varghese/PAPERS/newbsd.ps.Z) - */ -template -class ACE_Timer_Wheel_T : public ACE_Timer_Queue_T -{ -public: - /// Type of iterator - typedef ACE_Timer_Wheel_Iterator_T Iterator; - /// Iterator is a friend - friend class ACE_Timer_Wheel_Iterator_T; - typedef ACE_Timer_Node_T Node; - /// Type inherited from - typedef ACE_Timer_Queue_T Base; - typedef ACE_Free_List FreeList; - - /// Default constructor - ACE_Timer_Wheel_T (FUNCTOR* upcall_functor = 0, FreeList* freelist = 0); - - /// Constructor with opportunities to set the wheelsize and resolution - ACE_Timer_Wheel_T (u_int spoke_count, - u_int resolution, - size_t prealloc = 0, - FUNCTOR* upcall_functor = 0, - FreeList* freelist = 0); - - /// Destructor - virtual ~ACE_Timer_Wheel_T (void); - - /// True if queue is empty, else false. - virtual int is_empty (void) const; - - /// Returns the time of the earlier node in the . - /// Must be called on a non-empty queue. - virtual const ACE_Time_Value& earliest_time (void) const; - - /// Schedules a timer. - virtual long schedule (const TYPE& type, - const void* act, - const ACE_Time_Value& future_time, - const ACE_Time_Value& interval - = ACE_Time_Value::zero); - - /// Changes the interval of a timer (and can make it periodic or non - /// periodic by setting it to ACE_Time_Value::zero or not). - virtual int reset_interval (long timer_id, - const ACE_Time_Value& interval); - - /// Cancel all timer associated with . If is 0 - /// then the will be invoked. Returns number of timers - /// cancelled. - virtual int cancel (const TYPE& type, - int dont_call_handle_close = 1); - - // Cancel a timer, storing the magic cookie in act (if nonzero). - // Calls the functor if dont_call_handle_close is 0 and returns 1 - // on success - virtual int cancel (long timer_id, - const void** act = 0, - int dont_call_handle_close = 1); - - /// Run the for all timers whose values are <= - /// . Also accounts for . Returns - /// the number of timers canceled. - virtual int expire (void); - - // Run the for all timers whose values are <= . - // This does not account for . Returns the number of - // timers canceled. - int expire (const ACE_Time_Value&); - - /// Returns a pointer to this 's iterator. - virtual ACE_Timer_Queue_Iterator_T& iter (void); - - /// Removes the earliest node from the queue and returns it - virtual ACE_Timer_Node_T* remove_first (void); - - /// Dump the state of an object. - virtual void dump (void) const; - - /// Reads the earliest node from the queue and returns it. - virtual ACE_Timer_Node_T* get_first (void); - -private: - // The following are documented in the .cpp file. - ACE_Timer_Node_T* get_first_i (void) const; - ACE_Timer_Node_T* remove_first_expired (const ACE_Time_Value& now); - void open_i (size_t prealloc, u_int spokes, u_int res); - virtual void reschedule (ACE_Timer_Node_T *); - ACE_Timer_Node_T* find_spoke_node(u_int spoke, long timer_id) const; - ACE_Timer_Node_T* find_node(long timer_id) const; - u_int calculate_spoke(const ACE_Time_Value& expire) const; - long generate_timer_id(u_int spoke); - void schedule_i (ACE_Timer_Node_T* n, u_int spoke, const ACE_Time_Value& expire); - void cancel_i (ACE_Timer_Node_T* n, int skip_close); - void unlink (ACE_Timer_Node_T* n); - void recalc_earliest(const ACE_Time_Value& last); - -private: - /// Timing Wheel. - ACE_Timer_Node_T** spokes_; - /// Size of the timing wheel. - u_int spoke_count_; - /// Number of timer_id bits used for the spoke - int spoke_bits_; - /// Maximum number of timers per spoke - u_int max_per_spoke_; - /// Resolution (in microsoconds) of the timing wheel. - int res_bits_; - /// Index of the list with the earliest time - u_int earliest_spoke_; - /// Iterator used to expire timers. - Iterator* iterator_; - /// The total amount of time in one iteration of the wheel. (resolution * spoke_count) - ACE_Time_Value wheel_time_; - /// The total number of timers currently scheduled. - u_int timer_count_; - - // = Don't allow these operations for now. - ACE_UNIMPLEMENTED_FUNC ( - ACE_Timer_Wheel_T (const ACE_Timer_Wheel_T &)) - ACE_UNIMPLEMENTED_FUNC ( - void operator= (const ACE_Timer_Wheel_T &)) -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) -#include "ace/Timer_Wheel_T.cpp" -#endif /* !ACE_HAS_BROKEN_HPUX_TEMPLATES */ -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Wheel_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_TIMER_WHEEL_T_H */ diff --git a/ace/TkReactor.cpp b/ace/TkReactor.cpp deleted file mode 100644 index 87a496f0f3e..00000000000 --- a/ace/TkReactor.cpp +++ /dev/null @@ -1,439 +0,0 @@ -#include "ace/TkReactor.h" - -#if defined (ACE_HAS_TK) -#include "ace/Synch_T.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Connector.h" - -ACE_RCSID(ace, TkReactor, "$Id$") - -ACE_ALLOC_HOOK_DEFINE (ACE_TkReactor) - -// Must be called with lock held -ACE_TkReactor::ACE_TkReactor (size_t size, - int restart, - ACE_Sig_Handler *h) - : ACE_Select_Reactor (size, restart, h), - ids_ (0), - timeout_ (0) -{ - // When the ACE_Select_Reactor is constructed it creates the notify - // pipe and registers it with the register_handler_i() method. The - // TkReactor overloads this method BUT because the - // register_handler_i occurs when constructing the base class - // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i() - // is called not the TkReactor register_handler_i(). This means - // that the notify pipe is registered with the ACE_Select_Reactor - // event handling code not the TkReactor and so notfications don't - // work. To get around this we simply close and re-opened the - // notification handler in the constructor of the TkReactor. - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - this->notify_handler_->close (); - this->notify_handler_->open (this, 0); -#endif /* ACE_MT_SAFE */ -} - -ACE_TkReactor::~ACE_TkReactor (void) -{ - // Delete the remaining items in the linked list. - - while (this->ids_) - { - ACE_TkReactorID *TkID = this->ids_->next_; - delete this->ids_; - this->ids_ = TkID; - } -} - -// This is just the from ace/Reactor.cpp -// but we use the Tk functions to wait for an event, not to find out which - * one might be available. - */ -void -ACE_TkReactor::InputCallbackProc (ClientData cd, - int /* mask */) -{ - ACE_TkReactor_Input_Callback *callback = (ACE_TkReactor_Input_Callback *) cd; - ACE_TkReactor *self = callback->reactor_; - ACE_HANDLE handle = callback->handle_; - - // my copy isn't const. - ACE_Time_Value zero = ACE_Time_Value::zero; - - ACE_Select_Reactor_Handle_Set wait_set; - - // Deal with one file event. - - // - read which kind of event - if (self->wait_set_.rd_mask_.is_set (handle)) - wait_set.rd_mask_.set_bit (handle); - if (self->wait_set_.wr_mask_.is_set (handle)) - wait_set.wr_mask_.set_bit (handle); - if (self->wait_set_.ex_mask_.is_set (handle)) - wait_set.ex_mask_.set_bit (handle); - - int result = ACE_OS::select (handle + 1, - wait_set.rd_mask_, - wait_set.wr_mask_, - wait_set.ex_mask_, &zero); - - ACE_Select_Reactor_Handle_Set dispatch_set; - - // - Use only that one file event (removes events for other files). - if (result > 0) - { - if (wait_set.rd_mask_.is_set (handle)) - dispatch_set.rd_mask_.set_bit (handle); - if (wait_set.wr_mask_.is_set (handle)) - dispatch_set.wr_mask_.set_bit (handle); - if (wait_set.ex_mask_.is_set (handle)) - dispatch_set.ex_mask_.set_bit (handle); - - self->dispatch (1, dispatch_set); - } -} - -int -ACE_TkReactor::TkWaitForMultipleEvents (int width, - ACE_Select_Reactor_Handle_Set &wait_set, - ACE_Time_Value *) -{ - // Check to make sure our handle's are all usable. - ACE_Select_Reactor_Handle_Set temp_set = wait_set; - - if (ACE_OS::select (width, - temp_set.rd_mask_, - temp_set.wr_mask_, - temp_set.ex_mask_, - (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) - return -1; // Bad file arguments... - - // Instead of waiting using . - return ACE_OS::select (width, - wait_set.rd_mask_, - wait_set.wr_mask_, - wait_set.ex_mask_, - (ACE_Time_Value *) &ACE_Time_Value::zero); -} - -int -ACE_TkReactor::register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_TkReactor::register_handler_i"); - - int result = ACE_Select_Reactor::register_handler_i (handle, - handler, mask); - if (result == -1) - return -1; - - int condition = 0; - -#if !defined ACE_WIN32 - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK)) - ACE_SET_BITS (condition, TK_READABLE); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK)) - ACE_SET_BITS (condition, TK_WRITABLE); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK)) - ACE_SET_BITS (condition, TK_EXCEPTION); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK)) - ACE_SET_BITS (condition, TK_READABLE); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){ - ACE_SET_BITS (condition, TK_READABLE); // connected, you may write - ACE_SET_BITS (condition, TK_WRITABLE); // connected, you have data/err - } -#else - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK)) - ACE_SET_BITS (condition, TK_READABLE); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK)) - ACE_SET_BITS (condition, TK_WRITABLE); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK)) - ACE_NOTSUP_RETURN(-1); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK)) - ACE_SET_BITS (condition, TK_READABLE); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){ - ACE_SET_BITS (condition, TK_READABLE); // connected, you may write - ACE_SET_BITS (condition, TK_WRITABLE); // connected, you have data/err - } -#endif /* !ACE_WIN32 */ - - if (condition != 0) - { - ACE_TkReactorID *TkID = this->ids_; - - while(TkID) - { - if (TkID->handle_ == handle) - { - ::Tk_DeleteFileHandler (TkID->handle_); - - ACE_TkReactor_Input_Callback *callback; - ACE_NEW_RETURN (callback, - ACE_TkReactor_Input_Callback, - -1); - callback->reactor_ = this; - callback->handle_ = handle; - ::Tk_CreateFileHandler ((int) handle, - condition, - InputCallbackProc, - (ClientData) callback); - return 0; - } - else - TkID = TkID->next_; - } - - ACE_NEW_RETURN (TkID, - ACE_TkReactorID, - -1); - TkID->next_ = this->ids_; - TkID->handle_ = handle; - ACE_TkReactor_Input_Callback *callback; - ACE_NEW_RETURN (callback, - ACE_TkReactor_Input_Callback, - -1); - callback->reactor_ = this; - callback->handle_ = handle; - - ::Tk_CreateFileHandler ((int) handle, - condition, - InputCallbackProc, - (ClientData) callback); - this->ids_ = TkID; - } - return 0; -} - -int -ACE_TkReactor::register_handler_i (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - return ACE_Select_Reactor::register_handler_i (handles, - handler, - mask); -} - -int -ACE_TkReactor::remove_handler_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_TkReactor::remove_handler_i"); - - // In the registration phase we registered first with - // ACE_Select_Reactor and then with X. Now we are now doing things - // in reverse order. - - // First clean up the corresponding X11Input. - this->remove_TkFileHandler (handle); - - // Now let the reactor do its work. - return ACE_Select_Reactor::remove_handler_i (handle, - mask); -} - -void -ACE_TkReactor::remove_TkFileHandler (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_TkReactor::remove_TkFileHandler"); - - ACE_TkReactorID *TkID = this->ids_; - - if (TkID) - { - if (TkID->handle_ == handle) - { - ::Tk_DeleteFileHandler (TkID->handle_); - this->ids_ = TkID->next_; - delete TkID; - return; - } - - ACE_TkReactorID *NextID = TkID->next_; - - while (NextID) - { - if (NextID->handle_ == handle) - { - ::Tk_DeleteFileHandler (NextID->handle_); - TkID->next_ = NextID->next_; - delete NextID; - return; - } - else - { - TkID = NextID; - NextID = NextID->next_; - } - } - } -} - -int -ACE_TkReactor::remove_handler_i (const ACE_Handle_Set &handles, - ACE_Reactor_Mask mask) -{ - return ACE_Select_Reactor::remove_handler_i (handles, - mask); -} - -// The following functions ensure that there is an Tk timeout for the -// first timeout in the Reactor's Timer_Queue. - -void -ACE_TkReactor::reset_timeout (void) -{ - if (this->timeout_) - ::Tk_DeleteTimerHandler (this->timeout_); - timeout_ = 0; - - ACE_Time_Value *max_wait_time = - this->timer_queue_->calculate_timeout (0); - - if (max_wait_time) - timeout_ = ::Tk_CreateTimerHandler (max_wait_time->msec (), - TimerCallbackProc, - (ClientData) this); -} - -int -ACE_TkReactor::reset_timer_interval - (long timer_id, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_TkReactor::reset_timer_interval"); - ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1)); - - int result = ACE_Select_Reactor::timer_queue_->reset_interval - (timer_id, - interval); - - if (result == -1) - return -1; - else - { - this->reset_timeout (); - return result; - } -} - -long -ACE_TkReactor::schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_TkReactor::schedule_timer"); - ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1)); - - long result = ACE_Select_Reactor::schedule_timer (event_handler, - arg, - delay, - interval); - if (result == -1) - return -1; - else - { - this->reset_timeout (); - return result; - } -} - -int -ACE_TkReactor::cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_TkReactor::cancel_timer"); - - if (ACE_Select_Reactor::cancel_timer (handler, - dont_call_handle_close) == -1) - return -1; - else - { - this->reset_timeout (); - return 0; - } -} - -int -ACE_TkReactor::cancel_timer (long timer_id, - const void **arg, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_TkReactor::cancel_timer"); - - if (ACE_Select_Reactor::cancel_timer (timer_id, - arg, - dont_call_handle_close) == -1) - return -1; - else - { - this->reset_timeout (); - return 0; - } -} - -#endif /* ACE_HAS_TK */ diff --git a/ace/TkReactor.h b/ace/TkReactor.h deleted file mode 100644 index 9d960ef5fb6..00000000000 --- a/ace/TkReactor.h +++ /dev/null @@ -1,133 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file TkReactor.h - * - * $Id$ - * - * @author Nagarajan Surendran - */ -//============================================================================= - - -#ifndef ACE_TKREACTOR_H -#define ACE_TKREACTOR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_TK) - -#include "ace/Select_Reactor.h" -#include /**/ - -/** - * @class ACE_TkReactorID - * - * @brief This little class is necessary due to the way that Microsoft - * implements sockets to be pointers rather than indices. - */ -class ACE_Export ACE_TkReactorID -{ -public: - /// Underlying handle. - ACE_HANDLE handle_; - - /// Pointer to next node in the linked list. - ACE_TkReactorID *next_; -}; - -class ACE_TkReactor; - -class ACE_Export ACE_TkReactor_Input_Callback -{ -public: - ACE_TkReactor *reactor_; - ACE_HANDLE handle_; -}; - -/** - * @class ACE_TkReactor - * - * @brief An object-oriented event demultiplexor and event handler - * dispatcher that uses the Tk functions. - */ -class ACE_Export ACE_TkReactor : public ACE_Select_Reactor -{ -public: - // = Initialization and termination methods. - ACE_TkReactor (size_t size = DEFAULT_SIZE, - int restart = 0, - ACE_Sig_Handler * = 0); - - virtual ~ACE_TkReactor (void); - - // = Timer operations. - virtual long schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval); - virtual int reset_timer_interval (long timer_id, - const ACE_Time_Value &interval); - virtual int cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close = 1); - virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1); - -protected: - // = Register timers/handles with Tk. - /// Register a single . - virtual int register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); - - /// Register a set of . - virtual int register_handler_i (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); - - /// Remove the associated with this . - virtual int remove_handler_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask); - - /// Remove a set of . - virtual int remove_handler_i (const ACE_Handle_Set &handles, - ACE_Reactor_Mask); - - /// Removes an Tk FileHandler. - virtual void remove_TkFileHandler (ACE_HANDLE handle); - - /// Wait for events to occur. - virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &, - ACE_Time_Value *); - - ///Wait for Tk events to occur. - virtual int TkWaitForMultipleEvents (int, - ACE_Select_Reactor_Handle_Set &, - ACE_Time_Value *); - - ACE_TkReactorID *ids_; - Tk_TimerToken timeout_; - -private: - /// This method ensures there's a Tk timeout for the first timeout in - /// the Reactor's Timer_Queue. - void reset_timeout (void); - - // = Integrate with the X callback function mechanism. - static void TimerCallbackProc (ClientData cd); - static void InputCallbackProc (ClientData cd,int mask); - - /// Deny access since member-wise won't work... - ACE_TkReactor (const ACE_TkReactor &); - ACE_TkReactor &operator = (const ACE_TkReactor &); -}; - -#endif /* ACE_HAS_TK */ -#include "ace/post.h" -#endif /* ACE_TK_REACTOR_H */ diff --git a/ace/Token.cpp b/ace/Token.cpp deleted file mode 100644 index f15de7d1fe4..00000000000 --- a/ace/Token.cpp +++ /dev/null @@ -1,549 +0,0 @@ -// $Id$ - -#include "ace/Thread.h" -#include "ace/Token.h" -#include "ace/Log_Msg.h" - -#if defined (DEBUGGING) -#include "ace/streams.h" -#endif /* DEBUGGING */ - -ACE_RCSID(ace, Token, "$Id$") - -#if defined (ACE_HAS_THREADS) - -#if !defined (__ACE_INLINE__) -#include "ace/Synch_T.h" -#include "ace/Token.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_Token) - - -void -ACE_Token::dump (void) const -{ - ACE_TRACE ("ACE_Token::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthread = %d"), ACE_Thread::self ())); - // @@ Is there a portable way to do this? - // ACE_DEBUG ((LM_DEBUG, "\nowner_ = %l", (long) this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nowner_ addr = %x"), &this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nwaiters_ = %d"), this->waiters_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nin_use_ = %d"), this->in_use_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnesting level = %d"), this->nesting_level_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -ACE_Token::ACE_Token_Queue_Entry::ACE_Token_Queue_Entry (ACE_Thread_Mutex &m, - ACE_thread_t t_id) - : next_ (0), - thread_id_ (t_id), -#if defined (ACE_TOKEN_USES_SEMAPHORE) - cv_ (0), -#else - cv_ (m), -#endif /* ACE_TOKEN_USES_SEMAPHORE */ - runable_ (0) -{ -#if defined (ACE_TOKEN_USES_SEMAPHORE) - ACE_UNUSED_ARG (m); -#endif /* ACE_TOKEN_USES_SEMAPHORE */ - - ACE_TRACE ("ACE_Token::ACE_Token_Queue_Entry::ACE_Token_Queue_Entry"); -} - -ACE_Token::ACE_Token_Queue_Entry::ACE_Token_Queue_Entry (ACE_Thread_Mutex &m, - ACE_thread_t t_id, - ACE_Condition_Attributes &attributes) - : next_ (0), - thread_id_ (t_id), -#if defined (ACE_TOKEN_USES_SEMAPHORE) - cv_ (0), -#else - cv_ (m, attributes), -#endif /* ACE_TOKEN_USES_SEMAPHORE */ - runable_ (0) -{ -#if defined (ACE_TOKEN_USES_SEMAPHORE) - ACE_UNUSED_ARG (m); - ACE_UNUSED_ARG (attributes); -#endif /* ACE_TOKEN_USES_SEMAPHORE */ - - ACE_TRACE ("ACE_Token::ACE_Token_Queue_Entry::ACE_Token_Queue_Entry"); -} - -ACE_Token::ACE_Token_Queue::ACE_Token_Queue (void) - : head_ (0), - tail_ (0) -{ - ACE_TRACE ("ACE_Token::ACE_Token_Queue::ACE_Token_Queue"); -} - -// -// Remove an entry from the list. Must be called with locks held. -// -void -ACE_Token::ACE_Token_Queue::remove_entry (ACE_Token::ACE_Token_Queue_Entry *entry) -{ - ACE_TRACE ("ACE_Token::ACE_Token_Queue::remove_entry"); - ACE_Token_Queue_Entry *curr = 0; - ACE_Token_Queue_Entry *prev = 0; - - if (this->head_ == 0) - return; - - for (curr = this->head_; - curr != 0 && curr != entry; - curr = curr->next_) - prev = curr; - - if (curr == 0) - // Didn't find the entry... - return; - else if (prev == 0) - // Delete at the head. - this->head_ = this->head_->next_; - else - // Delete in the middle. - prev->next_ = curr->next_; - - // We need to update the tail of the list if we've deleted the last - // entry. - if (curr->next_ == 0) - this->tail_ = prev; -} - -// -// Add an entry into the list. Must be called with locks held. -// -void -ACE_Token::ACE_Token_Queue::insert_entry (ACE_Token::ACE_Token_Queue_Entry &entry, - int requeue_position) -{ - if (this->head_ == 0) - { - // No other threads - just add me - this->head_ = &entry; - this->tail_ = &entry; - } - else if (requeue_position == -1) - { - // Insert at the end of the queue. - this->tail_->next_ = &entry; - this->tail_ = &entry; - } - else if (requeue_position == 0) - { - // Insert at head of queue. - entry.next_ = this->head_; - this->head_ = &entry; - } - else - // Insert in the middle of the queue somewhere. - { - // Determine where our thread should go in the queue of waiters. - - ACE_Token::ACE_Token_Queue_Entry *insert_after = this->head_; - while (requeue_position-- && insert_after->next_ != 0) - insert_after = insert_after->next_; - - entry.next_ = insert_after->next_; - - if (entry.next_ == 0) - this->tail_ = &entry; - - insert_after->next_ = &entry; - } -} - -ACE_Token::ACE_Token (const ACE_TCHAR *name, void *any) - : lock_ (name, (ACE_mutexattr_t *) any), - owner_ (ACE_OS::NULL_thread), - in_use_ (0), - waiters_ (0), - nesting_level_ (0), - attributes_ (USYNC_THREAD), - queueing_strategy_ (FIFO) -{ -// ACE_TRACE ("ACE_Token::ACE_Token"); -} - -ACE_Token::~ACE_Token (void) -{ - ACE_TRACE ("ACE_Token::~ACE_Token"); -} - -int -ACE_Token::shared_acquire (void (*sleep_hook_func)(void *), - void *arg, - ACE_Time_Value *timeout, - ACE_Token_Op_Type op_type) -{ - ACE_TRACE ("ACE_Token::shared_acquire"); - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1); - -#if defined (DEBUGGING) - this->dump (); -#endif /* DEBUGGING */ - - ACE_thread_t thr_id = ACE_Thread::self (); - - // Nobody holds the token. - if (!this->in_use_) - { - // Its mine! - this->in_use_ = op_type; - this->owner_ = thr_id; - return 0; - } - - // - // Someone already holds the token. - // - - // Check if it is us. - if (ACE_OS::thr_equal (thr_id, this->owner_)) - { - this->nesting_level_++; - return 0; - } - - // Do a quick check for "polling" behavior. - if (timeout != 0 && timeout->sec () == 0 && timeout->usec () == 0) - { - errno = ETIME; - return -1; - } - - // - // We've got to sleep until we get the token. - // - - // Which queue we should end up in... - ACE_Token_Queue *queue = (op_type == ACE_Token::READ_TOKEN - ? &this->readers_ - : &this->writers_); - - // Allocate queue entry on stack. This works since we don't exit - // this method's activation record until we've got the token. - ACE_Token::ACE_Token_Queue_Entry my_entry (this->lock_, - thr_id, - this->attributes_); - queue->insert_entry (my_entry, this->queueing_strategy_); - this->waiters_++; - - // Execute appropriate callback. (@@ should these - // methods return a success/failure status, and if so, what should - // we do with it?) - int ret = 0; - if (sleep_hook_func) - { - (*sleep_hook_func) (arg); - ret++; - } - else - { - // Execute virtual method. - this->sleep_hook (); - ret++; - } - - int timed_out = 0; - int error = 0; - - // Sleep until we've got the token (ignore signals). - do - { - int result = my_entry.wait (timeout, - this->lock_); - - if (result == -1) - { - // Note, this should obey whatever thread-specific interrupt - // policy is currently in place... - if (errno == EINTR) - continue; - -#if defined (DEBUGGING) - cerr << '(' << ACE_Thread::self () << ')' - << " acquire: " - << (errno == ETIME ? "timed out" : "error occurred") - << endl; -#endif /* DEBUGGING */ - - // We come here if a timeout occurs or some serious - // ACE_Condition object error. - if (errno == ETIME) - timed_out = 1; - else - error = 1; - - // Stop the loop. - break; - } - } - while (!ACE_OS::thr_equal (thr_id, this->owner_)); - - // Do this always and irrespective of the result of wait(). - this->waiters_--; - queue->remove_entry (&my_entry); - -#if defined (DEBUGGING) - cerr << '(' << ACE_Thread::self () << ')' - << " acquire (UNBLOCKED)" << endl; -#endif /* DEBUGGING */ - - // If timeout occured - if (timed_out) - { - // This thread was still selected to own the token. - if (my_entry.runable_) - { - // Wakeup next waiter since this thread timed out. - this->wakeup_next_waiter (); - } - - // Return error. - return -1; - } - else if (error) - { - // Return error. - return -1; - } - - // If this is a normal wakeup, this thread should be runnable. - ACE_ASSERT (my_entry.runable_); - - return ret; -} - -// By default this is a no-op. - -/* virtual */ -void -ACE_Token::sleep_hook (void) -{ - ACE_TRACE ("ACE_Token::sleep_hook"); -} - -int -ACE_Token::acquire (ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_Token::acquire"); - return this->shared_acquire (0, 0, timeout, ACE_Token::WRITE_TOKEN); -} - -// Acquire the token, sleeping until it is obtained or until -// expires. - -int -ACE_Token::acquire (void (*sleep_hook_func)(void *), - void *arg, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_Token::acquire"); - return this->shared_acquire (sleep_hook_func, arg, timeout, ACE_Token::WRITE_TOKEN); -} - -// Try to renew the token. - -int -ACE_Token::renew (int requeue_position, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_Token::renew"); - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1); - -#if defined (DEBUGGING) - this->dump (); -#endif /* DEBUGGING */ - // ACE_ASSERT (ACE_OS::thr_equal (ACE_Thread::self (), this->owner_)); - - // Check to see if there are any waiters worth giving up the lock - // for. - - // If no writers and either we are a writer or there are no readers. - if (this->writers_.head_ == 0 && - (this->in_use_ == ACE_Token::WRITE_TOKEN || - this->readers_.head_ == 0)) - // Immediate return. - return 0; - - // We've got to sleep until we get the token again. - - // Determine which queue should this thread go to. - ACE_Token::ACE_Token_Queue *this_threads_queue = - this->in_use_ == ACE_Token::READ_TOKEN ? - &this->readers_ : &this->writers_; - - ACE_Token::ACE_Token_Queue_Entry my_entry (this->lock_, - this->owner_); - - this_threads_queue->insert_entry (my_entry, - // if requeue_position == 0 then we want to go next, - // otherwise use the queueing strategy, which might also - // happen to be 0. - requeue_position == 0 ? 0 : this->queueing_strategy_); - this->waiters_++; - - // Remember nesting level... - int save_nesting_level_ = this->nesting_level_; - - // Reset state for new owner. - this->nesting_level_ = 0; - - // Wakeup waiter. - this->wakeup_next_waiter (); - - int timed_out = 0; - int error = 0; - - // Sleep until we've got the token (ignore signals). - do - { - int result = my_entry.wait (timeout, - this->lock_); - - if (result == -1) - { - // Note, this should obey whatever thread-specific interrupt - // policy is currently in place... - if (errno == EINTR) - continue; - -#if defined (DEBUGGING) - cerr << '(' << ACE_Thread::self () << ')' - << " renew: " - << (errno == ETIME ? "timed out" : "error occurred") - << endl; -#endif /* DEBUGGING */ - - // We come here if a timeout occurs or some serious - // ACE_Condition object error. - if (errno == ETIME) - timed_out = 1; - else - error = 1; - - // Stop the loop. - break; - } - } - while (!ACE_OS::thr_equal (my_entry.thread_id_, this->owner_)); - - // Do this always and irrespective of the result of wait(). - this->waiters_--; - this_threads_queue->remove_entry (&my_entry); - -#if defined (DEBUGGING) - cerr << '(' << ACE_Thread::self () << ')' - << " acquire (UNBLOCKED)" << endl; -#endif /* DEBUGGING */ - - // If timeout occured - if (timed_out) - { - // This thread was still selected to own the token. - if (my_entry.runable_) - { - // Wakeup next waiter since this thread timed out. - this->wakeup_next_waiter (); - } - - // Return error. - return -1; - } - else if (error) - { - // Return error. - return -1; - } - - // If this is a normal wakeup, this thread should be runnable. - ACE_ASSERT (my_entry.runable_); - - // Reinstate nesting level. - this->nesting_level_ = save_nesting_level_; - - return 0; -} - -// Release the current holder of the token (which had -// better be the caller's thread!). - -int -ACE_Token::release (void) -{ - ACE_TRACE ("ACE_Token::release"); - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1); - - // ACE_ASSERT (ACE_OS::thr_equal (ACE_Thread::self (), this->owner_)); - -#if defined (DEBUGGING) - this->dump (); -#endif /* DEBUGGING */ - - // Nested release... - if (this->nesting_level_ > 0) - --this->nesting_level_; - else - { - // - // Regular release... - // - - // Wakeup waiter. - this->wakeup_next_waiter (); - } - - return 0; -} - -void -ACE_Token::wakeup_next_waiter (void) -{ - ACE_TRACE ("ACE_Token::wakeup_next_waiter"); - - // Reset state for new owner. - this->owner_ = ACE_OS::NULL_thread; - this->in_use_ = 0; - - // Any waiters... - if (this->writers_.head_ == 0 && - this->readers_.head_ == 0) - { - // No more waiters... - return; - } - - // Wakeup next waiter. - ACE_Token_Queue *queue; - - // Writer threads get priority to run first. - if (this->writers_.head_ != 0) - { - this->in_use_ = ACE_Token::WRITE_TOKEN; - queue = &this->writers_; - } - else - { - this->in_use_ = ACE_Token::READ_TOKEN; - queue = &this->readers_; - } - - // Wake up waiter and make it runable. - queue->head_->runable_ = 1; - queue->head_->signal (); - - this->owner_ = queue->head_->thread_id_; -} - -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Token.h b/ace/Token.h deleted file mode 100644 index 94b05460fd4..00000000000 --- a/ace/Token.h +++ /dev/null @@ -1,318 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Token.h - * - * $Id$ - * - * @author Original author - * @author Karl-Heinz Dorn (kdorn@erlh.siemens.de) - * @author Ported to ACE by - * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) - */ -//============================================================================= - -#ifndef ACE_TOKEN_H -#define ACE_TOKEN_H -#include "ace/pre.h" - -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_THREADS) - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || defined (VXWORKS) || defined (ACE_PSOS) -// If platforms support semaphores with timed wait, then we use semaphores instead of c.v. -# define ACE_TOKEN_USES_SEMAPHORE -#endif /* (ACE_WIN32 && !ACE_HAS_WINCE) || VXWORKS || ACE_PSOS */ - -/** - * @class ACE_Token - * - * @brief Class that acquires, renews, and releases a synchronization - * token that is serviced in strict FIFO/LIFO ordering and that also - * supports (1) recursion and (2) readers/writer semantics. - * - * This class is a more general-purpose synchronization mechanism - * than many native OS mutexes. For example, it implements - * "recursive mutex" semantics, where a thread that owns the token - * can reacquire it without deadlocking. If the same thread calls - * multiple times, however, it must call an - * equal number of times before the token is actually released. - * Threads that are blocked awaiting the token are serviced in - * strict FIFO/LIFO order as other threads release the token (Solaris - * and Pthread mutexes don't strictly enforce an acquisition - * order). There are two lists within the class. Write - * acquires always have higher priority over read acquires. Which - * means, if you use both write/read operations, care must be - * taken to avoid starvation on the readers. Notice that the - * read/write acquire operations do not have the usual semantic of - * reader/writer locks. Only one reader can acquire the token at - * a time (which is different from the usual reader/writer locks - * where several readers can acquire a lock at the same time as - * long as there is no writer waiting for the lock). We choose - * the names to (1) borrow the semantic to give writers higher - * priority and (2) support a common interface for all locking - * classes in ACE. - */ -class ACE_Export ACE_Token -{ -public: - - /** - * Available queueing strategies. - */ - enum QUEUEING_STRATEGY - { - /// FIFO, First In, First Out. - FIFO = -1, - /// LIFO, Last In, First Out - LIFO = 0 - }; - - // = Initialization and termination. - - /// Constructor - ACE_Token (const ACE_TCHAR *name = 0, void * = 0); - - /// Destructor - virtual ~ACE_Token (void); - - // = Strategies - - /// Retrieve the current queueing strategy. - int queueing_strategy (void); - - /// Set the queueing strategy. - void queueing_strategy (int queueing_strategy); - - // = Synchronization operations. - - /** - * Acquire the token, sleeping until it is obtained or until the - * expiration of , which is treated as "absolute" time. If - * some other thread currently holds the token then is - * called before our thread goes to sleep. This can be - * used by the requesting thread to unblock a token-holder that is - * sleeping, e.g., by means of writing to a pipe (the ACE - * ACE_Reactor uses this functionality). Return values: 0 if - * acquires without calling 1 if is - * called. 2 if the token is signaled. -1 if failure or timeout - * occurs (if timeout occurs errno == ETIME) If == - * <&ACE_Time_Value::zero> then acquire has polling semantics (and - * does *not* call ). - */ - int acquire (void (*sleep_hook)(void *), - void *arg = 0, - ACE_Time_Value *timeout = 0); - - /** - * This behaves just like the previous method, except that - * it invokes the virtual function called that can be - * overridden by a subclass of ACE_Token. - */ - int acquire (ACE_Time_Value *timeout = 0); - - /** - * This should be overridden by a subclass to define the appropriate - * behavior before goes to sleep. By default, this is a - * no-op... - */ - virtual void sleep_hook (void); - - /** - * An optimized method that efficiently reacquires the token if no - * other threads are waiting. This is useful for situations where - * you don't want to degrade the quality of service if there are - * other threads waiting to get the token. If == - * -1 and there are other threads waiting to obtain the token we are - * queued according to the queueing strategy. If - * > -1 then it indicates how many entries to skip over before - * inserting our thread into the list of waiters (e.g., - * == 0 means "insert at front of the queue"). - * Renew has the rather odd semantics such that if there are other - * waiting threads it will give up the token even if the - * nesting_level_ > 1. I'm not sure if this is really the right - * thing to do (since it makes it possible for shared data to be - * changed unexpectedly) so use with caution... This method - * maintians the original token priority. As in , the - * value is an absolute time. - */ - int renew (int requeue_position = 0, - ACE_Time_Value *timeout = 0); - - /// Become interface-compliant with other lock mechanisms (implements - /// a non-blocking ). - int tryacquire (void); - - /// Shuts down the ACE_Token instance. - int remove (void); - - /// Relinquish the token. If there are any waiters then the next one - /// in line gets it. - int release (void); - - /// Behave like acquire but in a lower priority. It should probably - /// be called acquire_yield. - int acquire_read (void); - - /// More sophisticate version of acquire_read. - int acquire_read (void (*sleep_hook)(void *), - void *arg = 0, - ACE_Time_Value *timeout = 0); - - /// Just calls . - int acquire_write (void); - - /// More sophisticate version of acquire_write. - int acquire_write (void (*sleep_hook)(void *), - void *arg = 0, - ACE_Time_Value *timeout = 0); - - /// Lower priority try_acquire. - int tryacquire_read (void); - - /// Just calls . - int tryacquire_write (void); - - /// Assumes the caller has acquired the token and returns 0. - int tryacquire_write_upgrade (void); - - // = Accessor methods. - - /// Return the number of threads that are currently waiting to get - /// the token. - int waiters (void); - - /// Return the id of the current thread that owns the token. - ACE_thread_t current_owner (void); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /// The following structure implements a LIFO/FIFO queue of waiter threads - /// that are asleep waiting to obtain the token. - struct ACE_Token_Queue_Entry - { - /// Constructor - ACE_Token_Queue_Entry (ACE_Thread_Mutex &m, - ACE_thread_t t_id); - - /// Constructor using a pre-allocated attributes - ACE_Token_Queue_Entry (ACE_Thread_Mutex &m, - ACE_thread_t t_id, - ACE_Condition_Attributes &attributes); - - /// Entry blocks on the token. - int wait (ACE_Time_Value *timeout, ACE_Thread_Mutex &lock); - - /// Notify (unblock) the entry. - int signal (void); - - /// Pointer to next waiter. - ACE_Token_Queue_Entry *next_; - - /// ACE_Thread id of this waiter. - ACE_thread_t thread_id_; - -#if defined (ACE_TOKEN_USES_SEMAPHORE) - /// ACE_Semaphore object used to wake up waiter when it can run again. - ACE_Semaphore cv_; -#else - /// ACE_Condition object used to wake up waiter when it can run again. - ACE_Condition_Thread_Mutex cv_; -#endif /* ACE_TOKEN_USES_SEMAPHORE */ - - /// Ok to run. - int runable_; - }; - -private: - enum ACE_Token_Op_Type - { - READ_TOKEN = 1, - WRITE_TOKEN - }; - - struct ACE_Token_Queue - { - /// Constructor - ACE_Token_Queue (void); - - /// Remove a waiter from the queue. - void remove_entry (ACE_Token_Queue_Entry *); - - /// Insert a waiter into the queue. - void insert_entry (ACE_Token_Queue_Entry &entry, - int requeue_position = -1); - - /// Head of the list of waiting threads. - ACE_Token_Queue_Entry *head_; - - /// Tail of the list of waiting threads. - ACE_Token_Queue_Entry *tail_; - }; - - /// Implements the and methods above. - int shared_acquire (void (*sleep_hook_func)(void *), - void *arg, - ACE_Time_Value *timeout, - ACE_Token_Op_Type op_type); - - /// Wake next in line for ownership. - void wakeup_next_waiter (void); - - /// A queue of writer threads. - ACE_Token_Queue writers_; - - /// A queue of reader threads. - ACE_Token_Queue readers_; - - /// ACE_Thread_Mutex used to lock internal data structures. - ACE_Thread_Mutex lock_; - - /// Current owner of the token. - ACE_thread_t owner_; - - /// Some thread (i.e., ) is using the token. We need this - /// extra variable to deal with POSIX pthreads madness... - int in_use_; - - /// Number of waiters. - int waiters_; - - /// Current nesting level. - int nesting_level_; - - /// The attributes for the condition variables, optimizes lock time. - ACE_Condition_Attributes attributes_; - - /// Queueing strategy, LIFO/FIFO. - int queueing_strategy_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Synch_T.h" -#include "ace/Token.i" -#endif /* __ACE_INLINE__ */ -#else -class ACE_Export ACE_Token -{ -public: - int queueing_strategy (void) { ACE_NOTSUP_RETURN (-1); } - void queueing_strategy (int /*queueing_strategy*/) { } - int acquire (ACE_Time_Value * = 0) { ACE_NOTSUP_RETURN (-1); } - int tryacquire (void) { ACE_NOTSUP_RETURN (-1); } - int remove (void) { ACE_NOTSUP_RETURN (-1); } - int release (void) { ACE_NOTSUP_RETURN (-1); } -}; -#endif /* ACE_HAS_THREADS */ -#include "ace/post.h" -#endif /* ACE_TOKEN_H */ diff --git a/ace/Token.i b/ace/Token.i deleted file mode 100644 index c7c0f2d9285..00000000000 --- a/ace/Token.i +++ /dev/null @@ -1,135 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Token.i - -ACE_INLINE int -ACE_Token::queueing_strategy (void) -{ - return this->queueing_strategy_; -} - -ACE_INLINE void -ACE_Token::queueing_strategy (int queueing_strategy) -{ - this->queueing_strategy_ = queueing_strategy == -1 ? -1 : 0; -} - -ACE_INLINE int -ACE_Token::remove (void) -{ - ACE_TRACE ("ACE_Token::remove"); - // Don't have an implementation for this yet... - ACE_NOTSUP_RETURN (-1); -} - -ACE_INLINE int -ACE_Token::tryacquire (void) -{ - ACE_TRACE ("ACE_Token::tryacquire"); - return this->shared_acquire - (0, 0, (ACE_Time_Value *) &ACE_Time_Value::zero, ACE_Token::WRITE_TOKEN); -} - -ACE_INLINE int -ACE_Token::waiters (void) -{ - ACE_TRACE ("ACE_Token::waiters"); - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1); - - int ret = this->waiters_; - return ret; -} - -ACE_INLINE ACE_thread_t -ACE_Token::current_owner (void) -{ - ACE_TRACE ("ACE_Token::current_owner"); - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, this->owner_); - - return this->owner_; -} - -ACE_INLINE int -ACE_Token::acquire_read (void) -{ - ACE_TRACE ("ACE_Token::acquire_read"); - return this->shared_acquire - (0, 0, 0, ACE_Token::READ_TOKEN); -} - -ACE_INLINE int -ACE_Token::acquire_write (void) -{ - ACE_TRACE ("ACE_Token::acquire_write"); - return this->shared_acquire - (0, 0, 0, ACE_Token::WRITE_TOKEN); -} - -ACE_INLINE int -ACE_Token::tryacquire_read (void) -{ - ACE_TRACE ("ACE_Token::tryacquire_read"); - return this->shared_acquire - (0, 0, (ACE_Time_Value *) &ACE_Time_Value::zero, ACE_Token::READ_TOKEN); -} - -ACE_INLINE int -ACE_Token::acquire_read (void (*sleep_hook_func)(void *), - void *arg, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_Token::acquire_read"); - return this->shared_acquire (sleep_hook_func, arg, timeout, ACE_Token::READ_TOKEN); -} - -ACE_INLINE int -ACE_Token::tryacquire_write (void) -{ - ACE_TRACE ("ACE_Token::tryacquire_write"); - return this->shared_acquire - (0, 0, (ACE_Time_Value *) &ACE_Time_Value::zero, ACE_Token::WRITE_TOKEN); -} - -ACE_INLINE int -ACE_Token::tryacquire_write_upgrade (void) -{ - ACE_TRACE ("ACE_Token::tryacquire_write_upgrade"); - return 0; -} - -ACE_INLINE int -ACE_Token::acquire_write (void (*sleep_hook_func)(void *), - void *arg, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_Token::acquire_write"); - return this->shared_acquire (sleep_hook_func, arg, timeout, ACE_Token::WRITE_TOKEN); -} - -ACE_INLINE int -ACE_Token::ACE_Token_Queue_Entry::wait (ACE_Time_Value *timeout, ACE_Thread_Mutex &lock) -{ -#if defined (ACE_TOKEN_USES_SEMAPHORE) - lock.release (); - int retv = (timeout == 0 ? - this->cv_.acquire () : - this->cv_.acquire (*timeout)); - lock.acquire (); - return retv; -#else - ACE_UNUSED_ARG (lock); - return this->cv_.wait (timeout); -#endif /* ACE_TOKEN_USES_SEMAPHORE */ -} - -ACE_INLINE int -ACE_Token::ACE_Token_Queue_Entry::signal (void) -{ - return -#if defined (ACE_TOKEN_USES_SEMAPHORE) - this->cv_.release (); -#else - this->cv_.signal (); -#endif /* ACE_TOKEN_USES_SEMAPHORE */ -} diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp deleted file mode 100644 index 291a0f3a450..00000000000 --- a/ace/Token_Collection.cpp +++ /dev/null @@ -1,304 +0,0 @@ -#include "ace/Token_Collection.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Token_Collection.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_HAS_TOKENS_LIBRARY) - - -ACE_RCSID (ace, - Token_Collection, - "$Id$") - - -ACE_Token_Collection::ACE_Token_Collection (int debug, - const ACE_TCHAR *name) -: debug_ (debug) -{ - ACE_TRACE ("ACE_Token_Collection::ACE_Token_Collection"); - - if (name == 0) - name = ACE_LIB_TEXT ("no name"); - - ACE_OS::strsncpy (this->name_, - ACE_const_cast (ACE_TCHAR *, - name), - ACE_MAXTOKENNAMELEN); -} - -int -ACE_Token_Collection::insert (ACE_Token_Proxy &new_token) -{ - ACE_TRACE ("ACE_Token_Collection::insert"); - - TOKEN_NAME name (new_token.name ()); - - // Check if the new_proxy is already in the list. - if (collection_.find (name) == 1) - // One already exists, so fail. - return -1; - - // Clone the new token. - ACE_Token_Proxy *temp = new_token.clone (); - - if (collection_.bind (name, temp) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("bind failed\n")), -1); - return 0; -} - -int -ACE_Token_Collection::extract (const ACE_TCHAR *token_name, ACE_Token_Proxy *&proxy) -{ - ACE_TRACE ("ACE_Token_Collection::extract"); - TOKEN_NAME name (token_name); - return collection_.unbind (token_name, proxy); -} - -ACE_Token_Proxy * -ACE_Token_Collection::is_member (const ACE_TCHAR *token_name) -{ - ACE_TRACE ("ACE_Token_Collection::is_member"); - TOKEN_NAME name (token_name); - ACE_Token_Proxy *temp; - // Get the token from the collection. - return collection_.find (name, temp) == -1 ? 0 : temp; -} - -int -ACE_Token_Collection::is_member (const ACE_Token_Proxy &token) -{ - ACE_TRACE ("ACE_Token_Collection::is_member"); - TOKEN_NAME token_name (token.name ()); - return collection_.find (token_name) == 0; -} - -int -ACE_Token_Collection::acquire (int notify, - void (*sleep_hook)(void *), - ACE_Synch_Options &options) -{ - ACE_TRACE ("ACE_Token_Collection::acquire"); - - COLLECTION::ITERATOR iterator (collection_); - - for (COLLECTION::ENTRY *temp = 0; - iterator.next (temp) != 0; - iterator.advance ()) - { - if (debug_) - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("collection acquiring %s\n"), - temp->int_id_->name ())); - if (temp->int_id_->acquire (notify, - sleep_hook, - options) == -1) - { - // Save/restore errno. - ACE_Errno_Guard error (errno); - this->release (); - ACE_RETURN (-1); - } - } - - return 0; -} - -int -ACE_Token_Collection::acquire (const ACE_TCHAR *token_name, - int notify, - void (*sleep_hook)(void *), - ACE_Synch_Options &options) -{ - ACE_TRACE ("ACE_Token_Collection::acquire"); - TOKEN_NAME name (token_name); - ACE_Token_Proxy *temp; - // Get the token from the collection. - int result = collection_.find (name, temp); - // did we find it? - if (result == -1) - return result; - // perform the operation - return temp->acquire (notify, sleep_hook, options); -} - - -int -ACE_Token_Collection::tryacquire (const ACE_TCHAR *token_name, - void (*sleep_hook)(void *)) -{ - ACE_TRACE ("ACE_Token_Collection::tryacquire"); - TOKEN_NAME name (token_name); - ACE_Token_Proxy *temp; - // Get the token from the collection. - int result = collection_.find (name, temp); - // did we find it? - if (result == -1) - return result; - - // perform the operation - return temp->tryacquire (sleep_hook); -} - -int -ACE_Token_Collection::tryacquire (void (*sleep_hook)(void *)) -{ - ACE_TRACE ("ACE_Token_Collection::tryacquire"); - - COLLECTION::ITERATOR iterator (collection_); - - for (COLLECTION::ENTRY *temp = 0; - iterator.next (temp) != 0; - iterator.advance ()) - { - if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection acquiring %s\n"), - temp->int_id_->name ())); - // We will fail if _any_ token is not free. - if (temp->int_id_->tryacquire (sleep_hook) == -1) - return -1; - } - - return 0; -} - -int -ACE_Token_Collection::renew (int requeue_position, - ACE_Synch_Options &options) -{ - ACE_TRACE ("ACE_Token_Collection::renew"); - - COLLECTION::ITERATOR iterator (collection_); - - for (COLLECTION::ENTRY *temp = 0; - iterator.next (temp) != 0; - iterator.advance ()) - { - if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection renewing %s\n"), - temp->int_id_->name ())); - if (temp->int_id_->renew (requeue_position, options) == -1) - return -1; - } - - return 0; -} - -int -ACE_Token_Collection::renew (const ACE_TCHAR *token_name, - int requeue_position, - ACE_Synch_Options &options) -{ - ACE_TRACE ("ACE_Token_Collection::renew"); - TOKEN_NAME name (token_name); - ACE_Token_Proxy *temp; - - // Get the token from the collection. - int result = collection_.find (name, temp); - - // Did we find it? - if (result == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ACE_LIB_TEXT ("%p %s\n"), - ACE_LIB_TEXT ("not in collection "), - token_name), -1); - // perform the operation - return temp->renew (requeue_position, options); -} - -int -ACE_Token_Collection::release (ACE_Synch_Options &) - -{ - ACE_TRACE ("ACE_Token_Collection::release"); - COLLECTION::ITERATOR iterator (collection_); - - for (COLLECTION::ENTRY *temp = 0; - iterator.next (temp) != 0; - iterator.advance ()) - { - if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection releasing %s\n"), - temp->int_id_->name ())); - temp->int_id_->release (); - } - - return 0; -} - -int -ACE_Token_Collection::release (const ACE_TCHAR *token_name, - ACE_Synch_Options &options) -{ - ACE_TRACE ("ACE_Token_Collection::release"); - TOKEN_NAME name (token_name); - ACE_Token_Proxy *temp; - // get the token from the collection - int result = collection_.find (name, temp); - // did we find it? - if (result != 0) - return result; - // perform the operation - return temp->release (options); -} - -ACE_Token_Collection::~ACE_Token_Collection (void) -{ - ACE_TRACE ("ACE_Token_Collection::~ACE_Token_Collection"); - COLLECTION::ITERATOR iterator (collection_); - - for (COLLECTION::ENTRY *temp = 0; - iterator.next (temp) != 0; - iterator.advance ()) - { - delete temp->int_id_; - // The ext_id_'s delete themselves when the array of - // COLLECTION::ENTRYs goes away. - } -} - - -// This method doesn't mean anything for a collection. -ACE_Token_Proxy * -ACE_Token_Collection::clone (void) const -{ - ACE_TRACE ("ACE_Token_Collection::clone"); - return (ACE_Token_Proxy *) 0; -} - -// This method doesn't mean anything for a collection. -ACE_Tokens * -ACE_Token_Collection::create_token (const ACE_TCHAR *) -{ - ACE_TRACE ("ACE_Token_Collection::create_token"); - return (ACE_Tokens *) 0; -} - -void -ACE_Token_Collection::dump (void) const -{ - ACE_TRACE ("ACE_Token_Collection::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Collection::dump:\n") - ACE_LIB_TEXT (" debug_ = %d\n"), debug_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection_\n"))); - collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); - ACE_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Map_Manager; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Entry; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Map_Manager -#pragma instantiate ACE_Map_Iterator_Base -#pragma instantiate ACE_Map_Iterator -#pragma instantiate ACE_Map_Reverse_Iterator -#pragma instantiate ACE_Map_Entry -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_HAS_TOKENS_LIBRARY */ diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h deleted file mode 100644 index 60ecf8270e6..00000000000 --- a/ace/Token_Collection.h +++ /dev/null @@ -1,240 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Token_Collection.h - * - * $Id$ - * - * The ACE_Token class offers methods for acquiring, renewing, - * and releasing a synchronization token on a per-token basis. The - * ACE_Token_Collection offers an interface for performing - * operations on groups of tokens as a whole, or on a single token - * within the collection. - * - * The atomic group operations are not yet implemented. - * - * - * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) - * @author Tim Harrison (harrison@cs.wustl.edu) - */ -//============================================================================= - -#ifndef ACE_TOKEN_COLLECTION_H -#define ACE_TOKEN_COLLECTION_H -#include "ace/pre.h" - -#include "ace/Map_Manager.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Local_Tokens.h" -#include "ace/SString.h" - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -/** - * @class ACE_Token_Collection - * - * @brief Allows atomic token group operations AND - * provides a ACE_Token manager interface. - * - * There are two types of operations offered by - * ACE_Token_Collection. The first is atomic operations on - * collections of Token_Proxies. In this respect, the - * ACE_Token_Collection can be thought of as a single token - * consisting of multiple Token_Proxies. The second role of the - * ACE_Token_Collection is as a ACE_Token manager. - * ACE_Token_Collection allows individual operations on single - * members of a collection of Token_Proxies. This provides a - * single access point for operations on multiple tokens. - */ -class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy -{ - - // = BUGS - // Although ACE_Token_Collection inherits from ACE_Token_Proxy, it - // can not be including in a collection. This is because - // returns zero for now. -public: - /** - * print out verbose debugging messages. will give a - * name to the collection. Collections don't really need names, but - * are sometimes useful for debugging. - */ - ACE_Token_Collection (int debug = 0, - const ACE_TCHAR *name = 0); - -// Collection Management operations - - int insert (ACE_Token_Proxy &token); - - // Insert a Token into the collection. All ACE_Token type - // operations performed on the collection will also be performed on - // the new_proxy until it is removed. Note that no operations - // performed prior to the insertion will be performed. Returns: 0 - // on success, -1 on failure with == problem. If a token - // proxy already exists in the collection with the same name, the - // insertion will fail. Also, is copied. Note that during - // the copy, client_id's are *not* inherited. The client ID of the - // thread using the collection will be used. Client ID's can be - // changed explicity on each proxy using is_member. - - /** - * removes the ACE_Token matching the given token_name from the - * collection. On success, extract returns 0. On failure - * (token_name was not in the collection,) extract returns -1. On - * success, the state of the token found is copied into proxy. - * The returned ACE_Token_Proxy* must be deleted by the user. - */ - int extract (const ACE_TCHAR *token_name, ACE_Token_Proxy *&proxy); - - /// returns the proxy if true. 0 otherwise. - ACE_Token_Proxy *is_member (const ACE_TCHAR *token_name); - - /** - * Is the specified token in the collection? - * 1, yes. - * 0, no. - */ - int is_member (const ACE_Token_Proxy &token); - -// = Collective operation semantics. - -// For acquire, renew, and release, there are two interfaces. Once -// interface allows an operation on a single token in the -// collection. The collective interfaces perform atomic operations -// on the entire collection. For instance, a collective acquire -// will perform an acquire for each and every token in the -// collection or the operation will fail. Currently, these -// operations are performed with no ordering heuristics. That is, -// the Collection steps through the tokens in the order they were -// inserted. For each one it performs the operation (acquire, -// renew, or release). - - /** - * Acquire "atomically" all resources in the collection. This is - * only successfull if all tokens in the collection could be - * acquired. options contains the blocking semantics, timeout - * value, etc. Returns: 0 on success, -1 on failure with == - * problem. If and error or deadlock occurs for one of the tokens, - * all the tokens will be released and the method will return -1. - * Note that returning on detection of deadlock prevents livelock - * between competing collections. If a collection returns after - * detecting deadlock, it is the application's responsibility to not - * to blindly loop on the collection::acquire operation. In other - * words, once the collection reports deadlock, it is out of our - * hands. - */ - virtual int acquire (int notify = 0, - void (*sleep_hook)(void *) = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); - - /// Acquire the token corresponding to . The other - /// parameters are passed to ::acquire. - virtual int acquire (const ACE_TCHAR *token_name, - int notify = 0, - void (*sleep_hook)(void *) = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); - - /// Try to acquire all tokens in collection. - virtual int tryacquire (void (*sleep_hook)(void *) = 0); - - /// Try to acquire . - virtual int tryacquire (const ACE_TCHAR *token_name, - void (*sleep_hook)(void *) = 0); - - /** - * Renews "atomically" all resources in the collection. This is - * only successfull if all tokens in the collection could be - * renewed. options contains the blocking semantics, timeout - * value, etc. Returns: 0 on success, -1 on failure with == - * problem. - */ - virtual int renew (int requeue_position = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); - - - /// Renew the token corresponding to . The other - /// parameters are passed to ::renew. - virtual int renew (const ACE_TCHAR *token_name, - int requeue_position = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); - - /** - * Releases "atomically" all resources in the collection. This is - * only successfull if all tokens in the collection could be - * released. options contains the blocking semantics, timeout - * value, etc. Returns: 0 on success, -1 on failure with == - * problem. - */ - virtual int release (ACE_Synch_Options &options = - ACE_Synch_Options::defaults); - - - /// Release the token corresponding to . The other - /// parameters are passed to ::release. - virtual int release (const ACE_TCHAR *token_name, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); - - ~ACE_Token_Collection (void); - - /// Dump the state of the class. - void dump (void) const; - - /// Return the name of the collection. Not very functionally - /// important, but sometimes a useful debugging tool. - virtual const ACE_TCHAR *name (void) const; - -protected: - - typedef ACE_Token_Name TOKEN_NAME; - - /// COLLECTION maintains a mapping from token names to ACE_Tokens* - typedef ACE_Map_Manager - COLLECTION; - - /// Allows iterations through collection_ - /** - * @note Deprecated typedef. Use COLLECTION::ITERATOR trait - * instead. - */ - typedef COLLECTION::ITERATOR COLLECTION_ITERATOR; - - /// Allows iterations through collection_ - /** - * @note Deprecated typedef. Use COLLECTION::ENTRY trait - * instead. - */ - typedef COLLECTION::ENTRY COLLECTION_ENTRY; - - /// COLLECTION maintains a mapping from token names to ACE_Tokens*. - COLLECTION collection_; - - /// Whether to print out debug messages or not. - int debug_; - - /// Name of the collection. - ACE_TCHAR name_[ACE_MAXTOKENNAMELEN]; - - // = I'm not sure what these mean, but they have to be defined since they're - // pure virtual in ACE_Token_Proxy. - virtual ACE_Token_Proxy *clone (void) const; - virtual ACE_Tokens *create_token (const ACE_TCHAR *name); -}; - -#endif /* ACE_HAS_TOKENS_LIBRARY */ - -#if defined (__ACE_INLINE__) -#include "ace/Token_Collection.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_TOKEN_COLLECTION_H */ diff --git a/ace/Token_Collection.i b/ace/Token_Collection.i deleted file mode 100644 index fcab4df9b09..00000000000 --- a/ace/Token_Collection.i +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -ACE_INLINE const ACE_TCHAR * -ACE_Token_Collection::name (void) const -{ - return name_; -} - -#endif /* ACE_HAS_TOKENS_LIBRARY */ diff --git a/ace/Token_Invariants.cpp b/ace/Token_Invariants.cpp deleted file mode 100644 index 69f2c8fd32b..00000000000 --- a/ace/Token_Invariants.cpp +++ /dev/null @@ -1,371 +0,0 @@ -#include "ace/Token_Invariants.h" -#include "ace/Object_Manager.h" - -#if defined (ACE_HAS_TOKENS_LIBRARY) - - -ACE_RCSID (ace, - Token_Invariants, - "$Id$") - - -ACE_Token_Invariant_Manager *ACE_Token_Invariant_Manager::instance_ = 0; - -ACE_Token_Invariant_Manager * -ACE_Token_Invariant_Manager::instance (void) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::instance"); - - // Perform the Double-Check pattern... - if (instance_ == 0) - { - ACE_MT (ACE_TOKEN_CONST::MUTEX *lock = - ACE_Managed_Object::get_preallocated_object - (ACE_Object_Manager::ACE_TOKEN_INVARIANTS_CREATION_LOCK); - ACE_GUARD_RETURN (ACE_TOKEN_CONST::MUTEX, ace_mon, *lock, 0)); - - if (instance_ == 0) - { - ACE_NEW_RETURN (instance_, - ACE_Token_Invariant_Manager, - 0); - // Register for destruction with ACE_Object_Manager. - ACE_Object_Manager::at_exit (instance_); - } - } - - return instance_; -} - -ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager (void) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager"); -} - -int -ACE_Token_Invariant_Manager::mutex_acquired (const ACE_TCHAR *token_name) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::mutex_acquired"); - - ACE_GUARD_RETURN (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_, -1); - - ACE_Mutex_Invariants *inv = 0; - if (this->get_mutex (token_name, inv) == -1) - return -1; - - return inv->acquired (); -} - -int -ACE_Token_Invariant_Manager::acquired (const ACE_Token_Proxy *proxy) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::acquired"); - - // Reach into the proxy to find the token type. - if (proxy->token_->type () == ACE_Tokens::MUTEX) - return this->mutex_acquired (proxy->name ()); - else // ACE_Tokens::RWLOCK. - { - if (proxy->type () == ACE_RW_Token::READER) - return this->reader_acquired (proxy->name ()); - else // ACE_RW_Token::WRITER. - return this->writer_acquired (proxy->name ()); - } -} - -void -ACE_Token_Invariant_Manager::releasing (const ACE_Token_Proxy *proxy) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::releasing"); - - // Reach into the proxy to find the token type. - if (proxy->token_->type () == ACE_Tokens::MUTEX) - this->mutex_releasing (proxy->name ()); - else // ACE_Tokens::RWLOCK. - this->rwlock_releasing (proxy->name ()); -} - -void -ACE_Token_Invariant_Manager::mutex_releasing (const ACE_TCHAR *token_name) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::mutex_releasing"); - ACE_GUARD (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_); - - ACE_Mutex_Invariants *inv = 0; - if (this->get_mutex (token_name, inv) == 0) - inv->releasing (); -} - -int -ACE_Token_Invariant_Manager::reader_acquired (const ACE_TCHAR *token_name) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::reader_acquired"); - ACE_GUARD_RETURN (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_, -1); - - ACE_RWLock_Invariants *inv = 0; - if (this->get_rwlock (token_name, inv) == -1) - return -1; - - return inv->reader_acquired (); -} - -int -ACE_Token_Invariant_Manager::writer_acquired (const ACE_TCHAR *token_name) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::writer_acquired"); - - ACE_GUARD_RETURN (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_, -1); - - ACE_RWLock_Invariants *inv = 0; - if (this->get_rwlock (token_name, inv) == -1) - return -1; - - return inv->writer_acquired (); -} - -void -ACE_Token_Invariant_Manager::rwlock_releasing (const ACE_TCHAR *token_name) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::rwlock_releasing"); - - ACE_GUARD (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_); - - ACE_RWLock_Invariants *inv = 0; - if (this->get_rwlock (token_name, inv) == 0) - inv->releasing (); -} - -void -ACE_Token_Invariant_Manager::dump (void) const -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("mutex_collection_:\n"))); - mutex_collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rwlock_collection_:\n"))); - rwlock_collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - - -int -ACE_Token_Invariant_Manager::get_mutex (const ACE_TCHAR *token_name, - ACE_Mutex_Invariants *&inv) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::get_mutex"); - TOKEN_NAME name (token_name); - if (mutex_collection_.find (name, inv) == -1) - // We did not find one in the collection. - { - ACE_Mutex_Invariants *new_invariant; - - ACE_NEW_RETURN (new_invariant, - ACE_Mutex_Invariants, - -1); - if (mutex_collection_.bind (name, new_invariant) == -1) - { - delete new_invariant; - return -1; - } - - if (mutex_collection_.find (name, inv) == -1) - // We did not find one in the collection. - return -1; - } - - return 0; -} - -int -ACE_Token_Invariant_Manager::get_rwlock (const ACE_TCHAR *token_name, - ACE_RWLock_Invariants *&inv) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::get_rwlock"); - TOKEN_NAME name (token_name); - if (rwlock_collection_.find (name, inv) == -1) - // We did not find one in the collection. - { - ACE_RWLock_Invariants *new_invariant; - - ACE_NEW_RETURN (new_invariant, - ACE_RWLock_Invariants, - -1); - if (rwlock_collection_.bind (name, new_invariant) == -1) - return -1; - - if (rwlock_collection_.find (name, inv) == -1) - // We did not find one in the collection. - return -1; - } - - return 0; -} - - -ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager (void) -{ - ACE_TRACE ("ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager"); - - MUTEX_COLLECTION::ITERATOR iterator (mutex_collection_); - - for (MUTEX_COLLECTION::ENTRY *temp = 0; - iterator.next (temp) != 0; - iterator.advance ()) - delete temp->int_id_; - - RWLOCK_COLLECTION::ITERATOR iterator2 (rwlock_collection_); - - for (RWLOCK_COLLECTION::ENTRY *temp2 = 0; - iterator2.next (temp2) != 0; - iterator2.advance ()) - delete temp2->int_id_; -} - -// ************************************************** -// ************************************************** -// ************************************************** - -ACE_Mutex_Invariants::ACE_Mutex_Invariants (void) -: owners_ (0) -{ -} - -int -ACE_Mutex_Invariants::acquired (void) -{ - if (++owners_ > 1) - { - owners_ = 42; - return 0; - } - else - return 1; -} - -void -ACE_Mutex_Invariants::releasing (void) -{ - if (owners_ == 1) - --owners_; -} - -ACE_Mutex_Invariants::ACE_Mutex_Invariants (const ACE_Mutex_Invariants &rhs) -: owners_ (rhs.owners_) -{ -} - -void -ACE_Mutex_Invariants::operator= (const ACE_Mutex_Invariants &rhs) -{ - owners_ = rhs.owners_; -} - -void -ACE_Mutex_Invariants::dump (void) const -{ - ACE_TRACE ("ACE_Mutex_Invariants::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owners_ = %d\n"), owners_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// ************************************************** -// ************************************************** -// ************************************************** - -ACE_RWLock_Invariants::ACE_RWLock_Invariants (void) -: writers_ (0), - readers_ (0) -{ -} - -int -ACE_RWLock_Invariants::writer_acquired (void) -{ - if (readers_ > 0) - { - writers_ = readers_ = 42; - return 0; - } - else if (++writers_ > 1) - { - writers_ = readers_ = 42; - return 0; - } - else - return 1; -} - -int -ACE_RWLock_Invariants::reader_acquired (void) -{ - if (writers_ > 0) - { - writers_ = readers_ = 42; - return 0; - } - else - { - ++readers_; - return 1; - } -} - -void -ACE_RWLock_Invariants::releasing (void) -{ - if (writers_ == 1) - writers_ = 0; - else if (readers_ > 0) - --readers_; -} - -ACE_RWLock_Invariants::ACE_RWLock_Invariants (const ACE_RWLock_Invariants &rhs) -: writers_ (rhs.writers_), - readers_ (rhs.readers_) -{ -} - -void -ACE_RWLock_Invariants::operator= (const ACE_RWLock_Invariants &rhs) -{ - writers_ = rhs.writers_; - readers_ = rhs.readers_; -} - -void -ACE_RWLock_Invariants::dump (void) const -{ - ACE_TRACE ("ACE_RWLock_Invariants::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("writers_ = %d\n"), - "readers_ = %d\n", - writers_, readers_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Map_Manager; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Entry; -template class ACE_Map_Manager; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Entry; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Map_Manager -#pragma instantiate ACE_Map_Iterator_Base -#pragma instantiate ACE_Map_Iterator -#pragma instantiate ACE_Map_Reverse_Iterator -#pragma instantiate ACE_Map_Entry -#pragma instantiate ACE_Map_Manager -#pragma instantiate ACE_Map_Iterator_Base -#pragma instantiate ACE_Map_Iterator -#pragma instantiate ACE_Map_Reverse_Iterator -#pragma instantiate ACE_Map_Entry -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_HAS_TOKENS_LIBRARY */ diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h deleted file mode 100644 index 84372a731a5..00000000000 --- a/ace/Token_Invariants.h +++ /dev/null @@ -1,240 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Token_Invariants.h - * - * $Id$ - * - * @author Tim Harrison (harrison@cs.wustl.edu) - * - * Allows applications to test that invariants are always - * satisfied. Can test mutexes and readers/writer locks. Does - * not test recursive acquisition. - * - * - */ -//============================================================================= - -#ifndef ACE_TOKEN_INVARIANTS_H -#define ACE_TOKEN_INVARIANTS_H -#include "ace/pre.h" - -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Map_Manager.h" -#include "ace/Local_Tokens.h" - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -/** - * @class ACE_Mutex_Invariants - * - * @brief Mutex Invariants - * = INVARIANTS - * 1. Only one owner at a time. - */ -class ACE_Export ACE_Mutex_Invariants -{ -public: - /// Default construction. - ACE_Mutex_Invariants (void); - - /// Returns 1 on success, 0 when an invariant has been violated and - /// -1 on error. - int acquired (void); - - /// Updates internal database. - void releasing (void); - - // = Map_Manager operations. - - /// Copy construction. - ACE_Mutex_Invariants (const ACE_Mutex_Invariants &rhs); - - /// Copy. - void operator= (const ACE_Mutex_Invariants &rhs); - - /// Dump the state of the class. - void dump (void) const; - -private: - /// Number of owners. This had better be 0 >= owners_ <= 1; - int owners_; -}; - -/** - * @class ACE_RWLock_Invariants - * - * @brief RWLock Invariants - * - * Preserve the following invariants: - * -# Only one writer at a time. - * -# If there is an owning writer, there are no owning readers. - */ -class ACE_Export ACE_RWLock_Invariants -{ -public: - /// Default construction. - ACE_RWLock_Invariants (void); - - /// Returns 1 on success, 0 when an invariant has been violated and - /// -1 on error. - int writer_acquired (void); - - /// Returns 1 on success, 0 when an invariant has been violated and - /// -1 on error. - int reader_acquired (void); - - /// Updates internal database. - void releasing (void); - - // = Map_Manager operations. - - /// Copy construction. - ACE_RWLock_Invariants (const ACE_RWLock_Invariants &rhs); - - /// Copy. - void operator= (const ACE_RWLock_Invariants &rhs); - - /// Dump the state of the class. - void dump (void) const; - -private: - /// Number of owning writers. - int writers_; - - /// Number of owning readers. - int readers_; -}; - -/** - * @class ACE_Token_Invariant_Manager - * - * @brief Token Invariants - * - * The Token Invariant Manager allows applications to test that - * invariants are always satisfied. Currently, Token_Invariants - * can test mutexes and readers/writer locks. Does not test - * recursive acquisition. - * Note that this class does not ever clean its database. Until - * destroyed, it's size will forever increase. - */ -class ACE_Export ACE_Token_Invariant_Manager : public ACE_Cleanup -{ -public: - - /// Singleton access point. - static ACE_Token_Invariant_Manager *instance (void); - - // = Polymorphic methods. Just pass in the proxy and the method - // figures out the type of the token. - - /// Returns 1 on success, 0 when an invariant has been violated and - /// -1 on error. - int acquired (const ACE_Token_Proxy *proxy); - - /// Updates internal database. - void releasing (const ACE_Token_Proxy *proxy); - - // = Explicit methods. These to not require actual proxies in order - // to test a scenario. - - /// Returns 1 on success, 0 when an invariant has been violated and - /// -1 on error. - int mutex_acquired (const ACE_TCHAR *token_name); - - /// Updates internal database. - void mutex_releasing (const ACE_TCHAR *token_name); - - /// Returns 1 on success, 0 when an invariant has been violated and - /// -1 on error. - int reader_acquired (const ACE_TCHAR *token_name); - - /// Returns 1 on success, 0 when an invariant has been violated and - /// -1 on error. - int writer_acquired (const ACE_TCHAR *token_name); - - /// Updates internal database. - void rwlock_releasing (const ACE_TCHAR *token_name); - - /// Dump the state of the class. - void dump (void) const; - - // = The following two method should be in the protected part of the - // class. Bugs with certain compilers preclude this. - /// Prevent non-singleton construction. - ACE_Token_Invariant_Manager (void); - - /// Destruction. - virtual ~ACE_Token_Invariant_Manager (void); - -protected: - /// Return or create. - int get_mutex (const ACE_TCHAR *token_name, - ACE_Mutex_Invariants *&inv); - - /// Return or create. - int get_rwlock (const ACE_TCHAR *token_name, - ACE_RWLock_Invariants *&inv); - - /// ACE_Mutex_Token used to lock internal data structures. - ACE_TOKEN_CONST::MUTEX lock_; - - /// This may be changed to a template type. - typedef ACE_Token_Name TOKEN_NAME; - - /// COLLECTION maintains a mapping from token names to mutexes. - typedef ACE_Map_Manager - MUTEX_COLLECTION; - - /// Allows iterations through collection. - /** - * @note Deprecated typedef. Use MUTEX_COLLECTION::ITERATOR trait - * instead. - */ - typedef MUTEX_COLLECTION::ITERATOR MUTEX_COLLECTION_ITERATOR; - - /// Allows iterations through collection. - /** - * @note Deprecated typedef. Use MUTEX_COLLECTION::ENTRY trait - * instead. - */ - typedef MUTEX_COLLECTION::ENTRY MUTEX_COLLECTION_ENTRY; - - /// MUTEX_COLLECTION maintains a mapping from token names to mutexes. - MUTEX_COLLECTION mutex_collection_; - - /// COLLECTION maintains a mapping from token names to mutexes. - typedef ACE_Map_Manager - RWLOCK_COLLECTION; - - /// Allows iterations through collection. - /** - * @note Deprecated typedef. Use RWLOCK_COLLECTION::ITERATOR trait - * instead. - */ - typedef RWLOCK_COLLECTION::ITERATOR RWLOCK_COLLECTION_ITERATOR; - - /// Allows iterations through collection. - /** - * @note Deprecated typedef. Use RWLOCK_COLLECTION::ENTRY trait - * instead. - */ - typedef RWLOCK_COLLECTION::ENTRY RWLOCK_COLLECTION_ENTRY; - - /// MUTEX_COLLECTION maintains a mapping from token names to mutexes. - RWLOCK_COLLECTION rwlock_collection_; - - /// Singleton pointer. - static ACE_Token_Invariant_Manager *instance_; -}; - -#endif /* ACE_HAS_TOKENS_LIBRARY */ - -#include "ace/post.h" -#endif /* ACE_TOKEN_INVARIANTS_H */ diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp deleted file mode 100644 index d14871ab52c..00000000000 --- a/ace/Token_Manager.cpp +++ /dev/null @@ -1,280 +0,0 @@ -#include "ace/Token_Manager.h" -#include "ace/Object_Manager.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Token_Manager.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -ACE_RCSID (ace, - Token_Manager, - "$Id$") - -// singleton token manager -ACE_Token_Manager *ACE_Token_Manager::token_manager_ = 0; - -ACE_Token_Manager::ACE_Token_Manager () -{ - ACE_TRACE ("ACE_Token_Manager::ACE_Token_Manager"); -} - -ACE_Token_Manager::~ACE_Token_Manager () -{ - ACE_TRACE ("ACE_Token_Manager::~ACE_Token_Manager"); - - COLLECTION::ITERATOR iterator (collection_); - - for (COLLECTION::ENTRY *temp = 0; - iterator.next (temp) != 0; - iterator.advance ()) - { - // @ should I be doing an unbind here? - delete temp->int_id_; - // The ext_id_'s delete themselves when the array of - // COLLECTION::ENTRYs goes away. - } -} - -ACE_Token_Manager * -ACE_Token_Manager::instance (void) -{ - ACE_TRACE ("ACE_Token_Manager::instance"); - - // This first check is to avoid acquiring the mutex in the common - // case. Double-Check pattern rules. - if (token_manager_ == 0) - { -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - ACE_TOKEN_CONST::MUTEX *lock = - ACE_Managed_Object::get_preallocated_object - (ACE_Object_Manager::ACE_TOKEN_MANAGER_CREATION_LOCK); - ACE_GUARD_RETURN (ACE_TOKEN_CONST::MUTEX, ace_mon, *lock, 0); -#endif /* ACE_MT_SAFE */ - - if (token_manager_ == 0) - { - ACE_NEW_RETURN (token_manager_, - ACE_Token_Manager, - 0); - // Register for destruction with ACE_Object_Manager. - ACE_Object_Manager::at_exit (token_manager_); - } - } - - return token_manager_; -} - -void -ACE_Token_Manager::get_token (ACE_Token_Proxy *proxy, - const ACE_TCHAR *token_name) -{ - ACE_TRACE ("ACE_Token_Manager::get_token"); - // Hmm. I think this makes sense. We perform our own locking here - // (see safe_acquire.) We have to make sure that only one thread - // uses the collection at a time. - - ACE_GUARD (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_); - - TOKEN_NAME name (token_name); - - if (collection_.find (name, proxy->token_) == -1) - // We did not find one in the collection. - { - // Make one. - proxy->token_ = proxy->create_token (token_name); - - // Put it in the collection. - if (collection_.bind (name, proxy->token_) == -1) - { - delete proxy->token_; - proxy->token_ = 0; - } - } - - if (proxy->token_ != 0) - proxy->token_->inc_reference (); - - // We may be returning proxy->token_ == 0 if new failed, caller must - // check. -} - -// 0. check_deadlock (TOKEN) -// 1. if TOKEN->visited (), return 0. -// 2. mark TOKEN visited. -// 3. get ALL_OWNERS -// 4. if CLIENT in ALL_OWNERS, return *DEADLOCK*. -// 5. for each OWNER in ALL_OWNERS, -// 6. if OWNER is not waiting for a NEW_TOKEN, continue. -// 7. else, if check_deadlock (NEW_TOKEN) == 1, return *DEADLOCK* -// 8. return 0. - -int -ACE_Token_Manager::check_deadlock (ACE_Token_Proxy *proxy) -{ - ACE_TRACE ("ACE_Token_Manager::check_deadlock"); - - // Start the recursive deadlock detection algorithm. - int result = this->check_deadlock (proxy->token_, proxy); - - // Whether or not we detect deadlock, we have to unmark all tokens - // for the next time. - COLLECTION::ITERATOR iterator (collection_); - for (COLLECTION::ENTRY *temp = 0; - iterator.next (temp) != 0; - iterator.advance ()) - temp->int_id_->visit (0); - - return result; -} - -int -ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) -{ - ACE_TRACE ("ACE_Token_Manager::check_deadlock"); - - if (token->visited ()) - return 0; - - token->visit (1); - - ACE_Tokens::OWNER_STACK owners; - - int is_owner = token->owners (owners, proxy->client_id ()); - - switch (is_owner) - { - case -1: - // Error. - return -1; - case 1: - // The caller is an owner, so we have a deadlock situation. - if (debug_) - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) Deadlock detected.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s owns %s and is waiting for %s.\n"), - proxy->client_id (), - token->name (), - proxy->token_->name ())); - } - - return 1; - case 0: - default: - // Recurse on each owner. - while (!owners.is_empty ()) - { - ACE_TPQ_Entry *e; - owners.pop (e); - // If the owner is waiting on another token, recurse. - ACE_Tokens *twf = this->token_waiting_for (e->client_id ()); - if ((twf != 0) && - (this->check_deadlock (twf, proxy) == 1)) - { - if (debug_) - { - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s owns %s and is waiting for %s.\n"), - e->client_id (), - token->name (), - twf->name ())); - } - return 1; - } - // else, check the next owner. - } - - // We've checked all the owners and found no deadlock. - return 0; - } -} - - -ACE_Tokens * -ACE_Token_Manager::token_waiting_for (const ACE_TCHAR *client_id) -{ - COLLECTION::ITERATOR iterator (collection_); - for (COLLECTION::ENTRY *temp = 0; - iterator.next (temp) != 0; - iterator.advance ()) - { - if (temp->int_id_->is_waiting_for (client_id)) - return temp->int_id_; - } - - // nothing was found, return NULL. - return 0; -} - -// Notify the token manager that a token is has been released. If -// as a result, there is no owner of the token, the token is -// deleted. -void -ACE_Token_Manager::release_token (ACE_Tokens *&token) -{ - ACE_TRACE ("ACE_Token_Manager::release_token"); - // again, let's perform our own locking here. - - ACE_GUARD (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_); - - if (token->dec_reference () == 0) - { - // No one has the token, so we can delete it and remove it from - // our collection. First, let's get it from the collection. - TOKEN_NAME token_name (token->name ()); - - ACE_Tokens *temp; - - if (collection_.unbind (token_name, temp) == -1) - // we did not find one in the collection - { - errno = ENOENT; - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("Token Manager could not release %s:%d\n"), - token->name (), token->type ())); - // @@ bad - } - else - // we found it - { - // sanity pointer comparison. The token referenced by the - // proxy better be the one we found in the list. - ACE_ASSERT (token == temp); - delete token; // or delete temp - // we set their token to zero. if the calling proxy is - // still going to be used, it had better check it's token - // value before calling a method on it! - token = 0; - } - } - // else - // someone is still interested in the token, so keep it around. -} - -void -ACE_Token_Manager::dump (void) const -{ - ACE_TRACE ("ACE_Token_Manager::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Manager::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lock_\n"))); - lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection_\n"))); - collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Map_Manager ; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Entry ; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Map_Manager -#pragma instantiate ACE_Map_Iterator_Base -#pragma instantiate ACE_Map_Iterator -#pragma instantiate ACE_Map_Reverse_Iterator -#pragma instantiate ACE_Map_Entry -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_HAS_TOKENS_LIBRARY */ diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h deleted file mode 100644 index 15b17624b40..00000000000 --- a/ace/Token_Manager.h +++ /dev/null @@ -1,144 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Token_Manager.h - * - * $Id$ - * - * @author Tim Harrison (harrison@cs.wustl.edu) - */ -//============================================================================= - -#ifndef ACE_TOKEN_MANAGER_H -#define ACE_TOKEN_MANAGER_H -#include "ace/pre.h" - -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Map_Manager.h" -#include "ace/Local_Tokens.h" - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -class ACE_Local_Mutex; -class ACE_Mutex_Token; - -/** - * @class ACE_Token_Manager - * - * @brief Manages all tokens in a process space. - * - * Factory: Proxies use the token manager to obtain token - * references. This allows multiple proxies to reference the same - * logical token. - * Deadlock detection: Tokens use the manager to check for - * deadlock situations during acquires. - */ -class ACE_Export ACE_Token_Manager : public ACE_Cleanup -{ - - // To add a new type of token (e.g. semaphore), do the following - // steps: 1. Create a new derivation of ACE_Token. This class - // defines the semantics of the new Token. 2. Create a - // derivation of ACE_Token_Manager. You will only need to - // redefine make_mutex. -public: - ACE_Token_Manager (void); - virtual ~ACE_Token_Manager (void); - - /// Get the pointer to token manager singleton. - static ACE_Token_Manager *instance (void); - - /// Set the pointer to token manager singleton. - void instance (ACE_Token_Manager *); - - /** - * The Token manager uses ACE_Token_Proxy::token_id_ to look for - * an existing token. If none is found, the Token Manager calls - * ACE_Token_Proxy::create_token to create a new one. When - * finished, sets ACE_Token_Proxy::token_. uniquely - * id's the token name. - */ - void get_token (ACE_Token_Proxy *, const ACE_TCHAR *token_name); - - /** - * Check whether acquire will cause deadlock or not. - * returns 1 if the acquire will _not_ cause deadlock. - * returns 0 if the acquire _will_ cause deadlock. - * This method ignores recursive acquisition. That is, it will not - * report deadlock if the client holding the token requests the - * token again. Thus, it assumes recursive mutexes. - */ - int check_deadlock (ACE_Token_Proxy *proxy); - int check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy); - - /// Notify the token manager that a token has been released. If as a - /// result, there is no owner of the token, the token is deleted. - void release_token (ACE_Tokens *&token); - - /** - * This is to allow Tokens to perform atomic transactions. The - * typical usage is to acquire this mutex, check for a safe_acquire, - * perform some queueing (if need be) and then release the lock. - * This is necessary since safe_acquire is implemented in terms of - * the Token queues. - */ - ACE_TOKEN_CONST::MUTEX &mutex (void); - - /// Dump the state of the class. - void dump (void) const; - - /// Turn debug mode on/off. - void debug (int d); - -private: - /// Whether to print debug messages or not. - int debug_; - - /// pointer to singleton token manager. - static ACE_Token_Manager *token_manager_; - - /// Return the token that the given client_id is waiting for, if any - ACE_Tokens *token_waiting_for (const ACE_TCHAR *client_id); - - /// ACE_Mutex_Token used to lock internal data structures. - ACE_TOKEN_CONST::MUTEX lock_; - - /// This may be changed to a template type. - typedef ACE_Token_Name TOKEN_NAME; - - /// COLLECTION maintains a mapping from token names to ACE_Tokens* - typedef ACE_Map_Manager - COLLECTION; - - /// Allows iterations through collection_ - /** - * @note Deprecated typedef. Use COLLECTION::ITERATOR trait - * instead. - */ - typedef COLLECTION::ITERATOR COLLECTION_ITERATOR; - - /// Allows iterations through collection_ - /** - * @note Deprecated typedef. Use COLLECTION::ENTRY trait - * instead. - */ - typedef COLLECTION::ENTRY COLLECTION_ENTRY; - - /// COLLECTION maintains a mapping from token names to ACE_Tokens*. - COLLECTION collection_; -}; - -#endif /* ACE_HAS_TOKENS_LIBRARY */ - -#if defined (__ACE_INLINE__) -#include "ace/Token_Manager.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_TOKEN_MANAGER_H */ diff --git a/ace/Token_Manager.i b/ace/Token_Manager.i deleted file mode 100644 index 2ef2d7e1f53..00000000000 --- a/ace/Token_Manager.i +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -ACE_INLINE ACE_TOKEN_CONST::MUTEX & -ACE_Token_Manager::mutex (void) -{ - ACE_TRACE ("ACE_Token_Manager::mutex"); - return lock_; -} - -ACE_INLINE void -ACE_Token_Manager::debug (int d) -{ - ACE_TRACE ("ACE_Token_Manager::debug"); - debug_ = d; -} - -#endif /* ACE_HAS_TOKENS_LIBRARY */ diff --git a/ace/Token_Request_Reply.cpp b/ace/Token_Request_Reply.cpp deleted file mode 100644 index 9fecb01e443..00000000000 --- a/ace/Token_Request_Reply.cpp +++ /dev/null @@ -1,178 +0,0 @@ -// $Id$ - -#include "ace/Token_Request_Reply.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Token_Request_Reply.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -ACE_RCSID(ace, Token_Request_Reply, "$Id$") - -// Default "do nothing" constructor. - -ACE_Token_Request::ACE_Token_Request (void) - : token_name_ (0), - client_id_ (0) -{ -} - -// Create a ACE_Token_Request message. - -ACE_Token_Request::ACE_Token_Request (int token_type, - int proxy_type, - ACE_UINT32 operation_type, - const ACE_TCHAR token_name[], - const ACE_TCHAR client_id[], - const ACE_Synch_Options &options) -{ - this->token_type (token_type); - this->proxy_type (proxy_type); - this->operation_type (operation_type); - this->requeue_position (0); // to avoid Purify UMR - this->notify (0); // to avoid Purify UMR - transfer_.arg_ = 0; // to avoid Purify UMR - ACE_OS::memset (transfer_.data_, 0, sizeof transfer_.data_); // to avoid Purify UMR - this->token_name (token_name, client_id); - this->options (options); -} - -// Encode the transfer buffer into network byte order -// so that it can be sent to the server. - -int -ACE_Token_Request::encode (void *&buf) -{ - buf = (void *) &this->transfer_; - return this->length (); -} - -// Decode the transfer buffer into host byte byte order -// so that it can be used by the server. - -int -ACE_Token_Request::decode (void) -{ - this->token_name_ = this->transfer_.data_; - - options_.set (transfer_.use_timeout_ == 1 ? ACE_Synch_Options::USE_TIMEOUT : 0, - ACE_Time_Value (transfer_.sec_, transfer_.usec_), - (void *) transfer_.arg_); - - // Decode the variable-sized portion. - int token_len = ACE_OS::strlen (this->token_name_); - - // Check to make sure this->tokenName_ isn't too long! - if (token_len >= ACE_MAXTOKENNAMELEN) - { - errno = ENAMETOOLONG; - return -1; - } - else // Skip this->tokenName_ + '\0' + ':'. - this->client_id_ = - &this->token_name_[(token_len + 2) * sizeof (ACE_TCHAR)]; - - // Fixed size header - // token_name_ plus '\0' - // ':' - // client_id_ plus '\0' - size_t data_size = ACE_TOKEN_REQUEST_HEADER_SIZE - + ACE_OS::strlen (this->token_name_) + 1 - + ACE_OS::strlen (this->client_id_) + 1 - + 1; - - // Make sure the message was correctly received and framed. - return this->length () == data_size ? 0 : -1; -} - -// Print out the current values of the ACE_Token_Request. - -void -ACE_Token_Request::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"), - this->length (), this->token_name (), this->client_id ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("type = "))); - - if (this->token_type () == ACE_Tokens::MUTEX) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("MUTEX\n"))); - else // == ACE_Tokens::RWLOCK - { - if (this->proxy_type () == ACE_RW_Token::READER) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("RLOCK\n"))); - else // == WRITER - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("WLOCK\n"))); - } - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("operation = "))); - switch (this->operation_type ()) - { - case ACE_Token_Request::ACQUIRE: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACQUIRE\n"))); - break; - case ACE_Token_Request::RELEASE: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("RELEASE\n"))); - break; - case ACE_Token_Request::RENEW: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("RENEW\n"))); - break; - default: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" = %d\n"), this->operation_type ())); - break; - } - - if (this->options ()[ACE_Synch_Options::USE_TIMEOUT] == 0) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("blocking forever\n"))); - else - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"), - this->options ().timeout ().sec (), this->options ().timeout ().usec ())); - } - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -// ************************************************************ -// ************************************************************ -// ************************************************************ - -// Create a ACE_Token_Reply message. - -ACE_Token_Reply::ACE_Token_Reply (void) // Type of reply. -{ - this->arg (0); - this->errnum (0); - this->length (sizeof (Transfer)); -} - -// Encode the transfer buffer into network byte order -// so that it can be sent to the client. - -int -ACE_Token_Reply::encode (void *&buf) -{ - buf = (void *) &this->transfer_; - return this->length (); -} - -// Decode the transfer buffer into host byte order -// so that it can be used by the client. - -int -ACE_Token_Reply::decode (void) -{ - return 0; -} - -// Print out current values of the ACE_Token_Reply object. - -void -ACE_Token_Reply::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\nlength = %d\nerrnum = %d"), - this->length (), this->errnum ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("arg = %d"), this->arg ())); -} - -#endif /* ACE_HAS_TOKENS_LIBRARY */ diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h deleted file mode 100644 index b21f4457c24..00000000000 --- a/ace/Token_Request_Reply.h +++ /dev/null @@ -1,266 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Token_Request_Reply.h - * - * $Id$ - * - * Define the format used to exchange messages between the - * ACE_Token Server and its clients. - * - * - * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) - * @author Tim Harrison (harrison@cs.wustl.edu) - */ -//============================================================================= - - -#ifndef ACE_TOKEN_REQUEST_REPLY_H -#define ACE_TOKEN_REQUEST_REPLY_H -#include "ace/pre.h" - -#include "ace/Local_Tokens.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Time_Value.h" - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -// Specifies the size of the fixed length portion of -// the Transfer structure in ACE_Token_Request -#define ACE_TOKEN_REQUEST_HEADER_SIZE 40 - -/** - * @class ACE_Token_Request - * - * @brief Message format for delivering requests to the ACE_Token Server. - * - * This class is implemented to minimize data copying. - * In particular, all marshaling is done in situ... - */ -class ACE_Export ACE_Token_Request -{ -public: - /// Operation types. - enum OPERATION - { - /// Acquire the token. - ACQUIRE, - /// Release the token. - RELEASE, - /// Renew the token. - RENEW, - /// Remove the token. - REMOVE, - // Try to acquire the token. - TRY_ACQUIRE - }; - - /// Default constructor. - ACE_Token_Request (void); - - /** - * token_type - MUTEX, RWLOCK - * proxy_type - MUTEX, RLOCK, WLOCK (acquires mean different things) - * operation - method - * token_name - * client_id - * options - we check USE_TIMEOUT and use the arg. - */ - ACE_Token_Request (int token_type, - int proxy_type, - ACE_UINT32 operation, - const ACE_TCHAR token_name[], - const ACE_TCHAR client_id[], - const ACE_Synch_Options &options); - - /// Get the length of the encoded/decoded message. - ACE_UINT32 length (void) const; - - /// Set the length of the encoded/decoded message. - void length (ACE_UINT32); - - /// Get the type of proxy - int proxy_type (void) const; - - /// Set the type of proxy - void proxy_type (int proxy_type); - - /// Get the type of token - int token_type (void) const; - - /// Set the type of token - void token_type (int token_type); - - /// Get the type of the operation. - ACE_UINT32 operation_type (void) const; - - /// Set the type of the operation. - void operation_type (ACE_UINT32); - - /// Get the requeue position. These should be used when renew - /// is the operation type. - ACE_UINT32 requeue_position (void) const; - - /// Set the requeue position. These should be used when renew - /// is the operation type. - void requeue_position (ACE_UINT32); - - /// Get notify. These should be used when acquire is the operation type. - ACE_UINT32 notify (void) const; - - /// Set notify. These should be used when acquire is the operation type. - void notify (ACE_UINT32); - - // = Set/get the timeout. - ACE_Synch_Options &options (void) const; - void options (const ACE_Synch_Options &options); - - // = Set/get the name of the token and the client id. The set - // method is combined to make it easier on us. We're copying the - // names as a contiguous buffer. - ACE_TCHAR *token_name (void) const; - ACE_TCHAR *client_id (void) const; - void token_name (const ACE_TCHAR *token_name, const ACE_TCHAR *client_id); - - /// Encode the message before transmission. - int encode (void *&); - - /// Decode message after reception. This must be called to set the - /// internal options. - int decode (void); - - /// Print out the values of the message for debugging purposes. - void dump (void) const; - -private: - // = The 5 fields in the struct are transmitted to the server. - // The remaining 2 fields are not tranferred -- they are used only on - // the server-side to simplify lookups. - - struct Transfer - { - /// Length of entire request. - ACE_UINT32 length_; - - /// Type of the request (i.e., MUTEX, RLOCK, WLOCK... - ACE_UINT32 token_type_; - - /// Type of the request (i.e., MUTEX, RLOCK, WLOCK... - ACE_UINT32 proxy_type_; - - /// Type of the request (i.e., , , , and ). - ACE_UINT32 operation_type_; - - /// this only makes sense when operation type is renew - ACE_UINT32 requeue_position_; - - /// this only makes sense when operation type is renew - ACE_UINT32 notify_; - - // = ACE_Synch_Options stuff - - /// Indicates if we should block forever. If 1, then - /// and indicates how long we should wait. If 0, - /// then we block forever. - ACE_UINT32 use_timeout_; - - /// Max seconds willing to wait for token if not blocking forever. - ACE_UINT32 sec_; - - /// Max micro seconds to wait for token if not blocking forever. - ACE_UINT32 usec_; - - /// value returned in ; - ACE_UINT32 arg_; - - /// The data portion contains the including a 0 terminator, - /// a ':', then the including a 0 terminator - ACE_TCHAR data_[ACE_MAXTOKENNAMELEN + ACE_MAXCLIENTIDLEN + 3]; - } transfer_; - - /// Pointer to the beginning of the token name in this->data_. - ACE_TCHAR *token_name_; - - /// Pointer to the beginning of the client id in this->data_; - ACE_TCHAR *client_id_; - - /// Holds arg, sec, usec, etc. - ACE_Synch_Options options_; -}; - -/** - * @class ACE_Token_Reply - * - * @brief Message format for delivering replies from the ACE_Token Server. - * - * This class is implemented to minimize data copying. - * In particular, all marshaling is done in situ... - */ -class ACE_Export ACE_Token_Reply -{ -public: - /// Default constructor. - ACE_Token_Reply (void); - - /// Get the length of the encoded/decoded message. - ACE_UINT32 length (void) const; - - /// Set the length of the encoded/decoded message. - void length (ACE_UINT32); - - /// Get the errno of a reply. - ACE_UINT32 errnum (void) const; - - /// Set the errno of a reply. - void errnum (ACE_UINT32); - - /// Get the arg of a reply. - ACE_UINT32 arg (void) const; - - /// Set the arg of a reply. - void arg (ACE_UINT32); - - /// Encode the message before transfer. - int encode (void *&); - - /// Decode a message after reception. - int decode (void); - - /// Print out the values of the message for debugging purposes. - void dump (void) const; - -private: - // = The 2 fields in the struct are transmitted to the server. - - struct Transfer - { - /// Length of entire reply. - ACE_UINT32 length_; - - /// Indicates why error occurred if type_> == . - /// Typical reasons include: - /// (if client requested a non-blocking check for the token). - /// (if the client timed out after waiting for the token). - /// (if the token lock was removed out from underneath a waiter). - /// (attempt to renew a token that isn't owned by the client). - ACE_UINT32 errno_; - - /// magic cookie - ACE_UINT32 arg_; - - } transfer_; -}; - -#endif /* ACE_HAS_TOKENS_LIBRARY */ - -#if defined (__ACE_INLINE__) -#include "ace/Token_Request_Reply.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* ACE_TOKEN_REQUEST_REPLY_H */ diff --git a/ace/Token_Request_Reply.i b/ace/Token_Request_Reply.i deleted file mode 100644 index e1c8ace3ad5..00000000000 --- a/ace/Token_Request_Reply.i +++ /dev/null @@ -1,196 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#if defined (ACE_HAS_TOKENS_LIBRARY) - -// = Set/get the length of the encoded/decoded message. - -ACE_INLINE ACE_UINT32 -ACE_Token_Request::length (void) const -{ - return ntohl (this->transfer_.length_); -} - -ACE_INLINE void -ACE_Token_Request::length (ACE_UINT32 l) -{ - this->transfer_.length_ = htonl (l); -} - -// = Set/get the type of the message. -ACE_INLINE int -ACE_Token_Request::token_type (void) const -{ - return (int) ntohl (this->transfer_.token_type_); -} - -ACE_INLINE void -ACE_Token_Request::token_type (int t) -{ - this->transfer_.token_type_ = htonl ((ACE_UINT32) t); -} - -// = Set/get the type of the message. -ACE_INLINE int -ACE_Token_Request::proxy_type (void) const -{ - return (int) ntohl (this->transfer_.proxy_type_); -} - -ACE_INLINE void -ACE_Token_Request::proxy_type (int t) -{ - this->transfer_.proxy_type_ = htonl ((ACE_UINT32) t); -} - -// = Set/get the type of the message. -ACE_INLINE ACE_UINT32 -ACE_Token_Request::operation_type (void) const -{ - return ntohl (this->transfer_.operation_type_); -} - -ACE_INLINE void -ACE_Token_Request::operation_type (ACE_UINT32 t) -{ - this->transfer_.operation_type_ = htonl (t); -} - -// = Set/get the requeue position -ACE_INLINE ACE_UINT32 -ACE_Token_Request::requeue_position (void) const -{ - return ntohl (this->transfer_.requeue_position_); -} - -ACE_INLINE void -ACE_Token_Request::requeue_position (ACE_UINT32 rq) -{ - this->transfer_.requeue_position_ = htonl (rq); -} - -// = Set/get the requeue position -ACE_INLINE ACE_UINT32 -ACE_Token_Request::notify (void) const -{ - return ntohl (this->transfer_.notify_); -} - -ACE_INLINE void -ACE_Token_Request::notify (ACE_UINT32 rq) -{ - this->transfer_.notify_ = htonl (rq); -} - -// = Set/get the blocking semantics. -ACE_INLINE ACE_Synch_Options & -ACE_Token_Request::options (void) const -{ - return (ACE_Synch_Options &) options_; -} - -ACE_INLINE void -ACE_Token_Request::options (const ACE_Synch_Options &opt) -{ - // fight the friggin const from hell - ACE_Synch_Options *options = (ACE_Synch_Options *) &opt; - - transfer_.use_timeout_ = options->operator[](ACE_Synch_Options::USE_TIMEOUT); - if (transfer_.use_timeout_ == 1) - { - transfer_.usec_ = options->timeout ().usec (); - transfer_.sec_ = options->timeout ().sec (); - } - else - { - transfer_.usec_ = 0; - transfer_.sec_ = 0; - } -} - -// = Set/get the name of the token. -ACE_INLINE ACE_TCHAR * -ACE_Token_Request::token_name (void) const -{ - return token_name_; -} - -ACE_INLINE void -ACE_Token_Request::token_name (const ACE_TCHAR *token_name, - const ACE_TCHAR *client_id) -{ - size_t token_name_length = ACE_OS::strlen (token_name) + 1; // Add 1 for '\0'. - size_t client_id_length = ACE_OS::strlen (client_id) + 1; // Add 1 for '\0'. - - // Set up pointers and copy token_name and client_id into request. - token_name_ = this->transfer_.data_; - client_id_ = &this->token_name_[token_name_length + 1]; // Add 1 for ':'; - client_id_[-1] = ACE_LIB_TEXT (':'); // Insert the ':' before this->clientId_. - - (void) ACE_OS::memcpy (this->token_name_, - token_name, - token_name_length * sizeof (ACE_TCHAR)); - (void) ACE_OS::memcpy (this->client_id_, - client_id, - client_id_length * sizeof (ACE_TCHAR)); - - // Fixed length header size - size_t len = ACE_TOKEN_REQUEST_HEADER_SIZE; - - // ... then add in the amount of the variable-sized portion. - len += token_name_length + client_id_length + 1; - - this->length (len); -} - -// = Set/get the id of the client. -ACE_INLINE ACE_TCHAR * -ACE_Token_Request::client_id (void) const -{ - return this->client_id_; -} - -// ************************************************************ -// ************************************************************ -// ************************************************************ - -// = Set/get the length of the encoded/decoded message. -ACE_INLINE ACE_UINT32 -ACE_Token_Reply::length (void) const -{ - return ntohl (this->transfer_.length_); -} - -ACE_INLINE void -ACE_Token_Reply::length (ACE_UINT32 l) -{ - this->transfer_.length_ = htonl (l); -} - -// = Set/get the errno of a failed reply. -ACE_INLINE ACE_UINT32 -ACE_Token_Reply::errnum (void) const -{ - return ntohl (this->transfer_.errno_); -} - -ACE_INLINE void -ACE_Token_Reply::errnum (ACE_UINT32 e) -{ - this->transfer_.errno_ = htonl (e); -} - -// = Set/get the length of the encoded/decoded message. -ACE_INLINE ACE_UINT32 -ACE_Token_Reply::arg (void) const -{ - return ntohl (this->transfer_.arg_); -} - -ACE_INLINE void -ACE_Token_Reply::arg (ACE_UINT32 arg) -{ - this->transfer_.arg_ = htonl (arg); -} - -#endif /* ACE_HAS_TOKENS_LIBRARY */ diff --git a/ace/Trace.cpp b/ace/Trace.cpp deleted file mode 100644 index 5a0688ee4bd..00000000000 --- a/ace/Trace.cpp +++ /dev/null @@ -1,131 +0,0 @@ -// $Id$ - - -#include "ace/Trace.h" - -ACE_RCSID (ace, - Trace, - "$Id$") - -// Turn off tracing for the duration of this file. -#if defined (ACE_NTRACE) -#undef ACE_NTRACE -#endif /* ACE_NTRACE */ -#define ACE_NTRACE 1 - -#include "ace/Log_Msg.h" -#include "ace/OS.h" - -// = Static initialization. - -// Keeps track of how far to indent per trace call. -int ACE_Trace::nesting_indent_ = ACE_Trace::DEFAULT_INDENT; - -// Is tracing enabled? -int ACE_Trace::enable_tracing_ = ACE_Trace::DEFAULT_TRACING; - -ACE_ALLOC_HOOK_DEFINE(ACE_Trace) - -void -ACE_Trace::dump (void) const -{ -} - -// Determine whether or not tracing is enabled - -int -ACE_Trace::is_tracing (void) -{ - return ACE_Trace::enable_tracing_; -} - -// Enable the tracing facility. - -void -ACE_Trace::start_tracing (void) -{ - ACE_Trace::enable_tracing_ = 1; -} - -// Disable the tracing facility. - -void -ACE_Trace::stop_tracing (void) -{ - ACE_Trace::enable_tracing_ = 0; -} - -// Change the nesting indentation level. - -void -ACE_Trace::set_nesting_indent (int indent) -{ - ACE_Trace::nesting_indent_ = indent; -} - -// Get the nesting indentation level. - -int -ACE_Trace::get_nesting_indent (void) -{ - return ACE_Trace::nesting_indent_; -} - -// Perform the first part of the trace, which prints out the string N, -// the LINE, and the ACE_FILE as the function is entered. - -ACE_Trace::ACE_Trace (const ACE_TCHAR *n, - int line, - const ACE_TCHAR *file) -{ -#if defined (ACE_NLOGGING) - ACE_UNUSED_ARG (line); - ACE_UNUSED_ARG (file); -#endif /* ACE_NLOGGING */ - - this->name_ = n; - - // If ACE has not yet been initialized, don't try to trace... there's - // too much stuff not yet initialized. - if (ACE_Trace::enable_tracing_ && !ACE_OS_Object_Manager::starting_up ()) - { - ACE_Log_Msg *lm = ACE_LOG_MSG; - if (lm->tracing_enabled () - && lm->trace_active () == 0) - { - lm->trace_active (1); - ACE_DEBUG ((LM_TRACE, - ACE_LIB_TEXT ("%*s(%t) calling %s in file `%s' on line %d\n"), - ACE_Trace::nesting_indent_ * lm->inc (), - ACE_LIB_TEXT (""), - this->name_, - file, - line)); - lm->trace_active (0); - } - } -} - -// Perform the second part of the trace, which prints out the NAME as -// the function is exited. - -ACE_Trace::~ACE_Trace (void) -{ - // If ACE has not yet been initialized, don't try to trace... there's - // too much stuff not yet initialized. - if (ACE_Trace::enable_tracing_ && !ACE_OS_Object_Manager::starting_up ()) - { - ACE_Log_Msg *lm = ACE_LOG_MSG; - if (lm->tracing_enabled () - && lm->trace_active () == 0) - { - lm->trace_active (1); - ACE_DEBUG ((LM_TRACE, - ACE_LIB_TEXT ("%*s(%t) leaving %s\n"), - ACE_Trace::nesting_indent_ * lm->dec (), - ACE_LIB_TEXT (""), - this->name_)); - lm->trace_active (0); - } - } -} diff --git a/ace/Trace.h b/ace/Trace.h deleted file mode 100644 index b6b5429cc8a..00000000000 --- a/ace/Trace.h +++ /dev/null @@ -1,94 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Trace.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_TRACE_H -#define ACE_TRACE_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Global_Macros.h" - -/** - * @class ACE_Trace - * - * @brief A C++ trace facility that keeps track of which methods are - * entered and exited. - * - * This class uses C++ constructors and destructors to automate - * the ACE_Trace nesting. In addition, thread-specific storage - * is used to enable multiple threads to work correctly. - */ -class ACE_Export ACE_Trace -{ -public: - // = Initialization and termination methods. - - /// Perform the first part of the trace, which prints out the string - /// N, the LINE, and the ACE_FILE as the function is entered. - ACE_Trace (const ACE_TCHAR *n, - int line = 0, - const ACE_TCHAR *file = ACE_LIB_TEXT ("")); - - /// Perform the second part of the trace, which prints out the NAME - /// as the function is exited. - ~ACE_Trace (void); - - // = Control the tracing level. - /// Determine if tracing is enabled (return == 1) or not (== 0) - static int is_tracing(void); - - /// Enable the tracing facility. - static void start_tracing (void); - - /// Disable the tracing facility. - static void stop_tracing (void); - - /// Change the nesting indentation level. - static void set_nesting_indent (int indent); - - /// Get the nesting indentation level. - static int get_nesting_indent (void); - - /// Dump the state of an object. - void dump (void) const; - -private: - // Keeps track of how deeply the call stack is nested (this is - // maintained in thread-specific storage to ensure correctness in - // multiple threads of control. - - /// Name of the method we are in. - const ACE_TCHAR *name_; - - /// Keeps track of how far to indent per trace call. - static int nesting_indent_; - - /// Is tracing enabled? - static int enable_tracing_; - - /// Default values. - enum - { - DEFAULT_INDENT = 3, - DEFAULT_TRACING = 1 - }; -}; - -#include "ace/post.h" - -#endif /* ACE_TRACE_H */ diff --git a/ace/Typed_SV_Message.cpp b/ace/Typed_SV_Message.cpp deleted file mode 100644 index 6b4ae9024b0..00000000000 --- a/ace/Typed_SV_Message.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// Typed_SV_Message.cpp -// $Id$ - -#ifndef ACE_TYPED_SV_MESSAGE_C -#define ACE_TYPED_SV_MESSAGE_C -#include "ace/Typed_SV_Message.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Typed_SV_Message.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Typed_SV_Message, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Typed_SV_Message) - -template void -ACE_Typed_SV_Message::dump (void) const -{ - ACE_TRACE ("ACE_Typed_SV_Message::dump"); -} - -#endif /* ACE_TYPED_SV_MESSAGE_C */ diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h deleted file mode 100644 index e3973d78590..00000000000 --- a/ace/Typed_SV_Message.h +++ /dev/null @@ -1,105 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file Typed_SV_Message.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//========================================================================== - - -#ifndef ACE_TYPED_SV_MESSAGE_H -#define ACE_TYPED_SV_MESSAGE_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/OS.h" - -/** - * @class ACE_Typed_SV_Message - * - * @brief Defines the header file for the C++ wrapper for System V - * message queues. - */ -template -class ACE_Typed_SV_Message -{ -public: - // = Initialization and termination methods. - ACE_Typed_SV_Message (long type = 0, - int length = sizeof (T), - int max_size = sizeof (T)); - ACE_Typed_SV_Message (const T &data, - long type = 0, - int length = sizeof (T), - int max_size = sizeof (T)); - ~ACE_Typed_SV_Message (void); - - /// Get the type of the message. - long type (void) const; - - /// Set the type of the message. - void type (long type); - - /// Get the length of the message. - int length (void) const; - - /// Set the length of the message. - void length (int l); - - /// Get the maximum size of the message. - int max_size (void) const; - - /// Set the maximum size of the message. - void max_size (int m); - - /// Get a pointer to the data in the message. - T &data (void); - - /// Set a pointer to the data in the message. - void data (const T &data); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Type of message. - long type_; - - /// Length of this message. - int length_; - - /// Maximum length of any message. - int max_; - - /// Data stored in a message. - T data_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Typed_SV_Message.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Typed_SV_Message.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Typed_SV_Message.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_TYPED_SV_MESSAGE_H */ diff --git a/ace/Typed_SV_Message.i b/ace/Typed_SV_Message.i deleted file mode 100644 index 4d74a14f5dd..00000000000 --- a/ace/Typed_SV_Message.i +++ /dev/null @@ -1,91 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Typed_SV_Message.i - -template ACE_INLINE -ACE_Typed_SV_Message::ACE_Typed_SV_Message (long t, - int l, - int m) - : type_ (t) -{ - ACE_TRACE ("ACE_Typed_SV_Message::ACE_Typed_SV_Message"); - this->length (l); - this->max_size (m); -} - -template ACE_INLINE -ACE_Typed_SV_Message::ACE_Typed_SV_Message (const T &d, - long t, - int l, - int m) - : type_ (t), - data_ (d) -{ - ACE_TRACE ("ACE_Typed_SV_Message::ACE_Typed_SV_Message"); - this->length (l); - this->max_size (m); -} - -template ACE_INLINE -ACE_Typed_SV_Message::~ACE_Typed_SV_Message (void) -{ - ACE_TRACE ("ACE_Typed_SV_Message::~ACE_Typed_SV_Message"); -} - -template ACE_INLINE long -ACE_Typed_SV_Message::type (void) const -{ - ACE_TRACE ("ACE_Typed_SV_Message::type"); - return this->type_; -} - -template ACE_INLINE void -ACE_Typed_SV_Message::type (long t) -{ - ACE_TRACE ("ACE_Typed_SV_Message::type"); - this->type_ = t; -} - -template ACE_INLINE int -ACE_Typed_SV_Message::length (void) const -{ - ACE_TRACE ("ACE_Typed_SV_Message::length"); - return this->length_; -} - -template ACE_INLINE void -ACE_Typed_SV_Message::length (int len) -{ - ACE_TRACE ("ACE_Typed_SV_Message::length"); - this->length_ = len + (sizeof *this - (sizeof this->type_ + sizeof this->data_)); -} - -template ACE_INLINE int -ACE_Typed_SV_Message::max_size (void) const -{ - ACE_TRACE ("ACE_Typed_SV_Message::max_size"); - return this->max_; -} - -template ACE_INLINE void -ACE_Typed_SV_Message::max_size (int m) -{ - ACE_TRACE ("ACE_Typed_SV_Message::max_size"); - this->max_ = m + (sizeof *this - (sizeof this->type_ + sizeof this->data_)); -} - -template T & -ACE_Typed_SV_Message::data (void) -{ - ACE_TRACE ("ACE_Typed_SV_Message::data"); - return this->data_; -} - -template void -ACE_Typed_SV_Message::data (const T &d) -{ - ACE_TRACE ("ACE_Typed_SV_Message::data"); - this->data_ = d; -} - diff --git a/ace/Typed_SV_Message_Queue.cpp b/ace/Typed_SV_Message_Queue.cpp deleted file mode 100644 index 1a0a3b99943..00000000000 --- a/ace/Typed_SV_Message_Queue.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// Typed_SV_Message_Queue.cpp -// $Id$ - -#ifndef ACE_TYPED_SV_MESSAGE_QUEUE_C -#define ACE_TYPED_SV_MESSAGE_QUEUE_C - -#include "ace/Typed_SV_Message.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Typed_SV_Message_Queue.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Typed_SV_Message_Queue.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Typed_SV_Message_Queue, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Typed_SV_Message_Queue) - -template void -ACE_Typed_SV_Message_Queue::dump (void) const -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::dump"); -} - -template -ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue (void) -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue"); -} - -template -ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue (key_t external_id, - int create, - int perms) -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue"); - if (this->open (external_id, create, perms) == -1) - ACE_ERROR ((LM_ERROR, - "ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue")); -} - -template -ACE_Typed_SV_Message_Queue::~ACE_Typed_SV_Message_Queue (void) -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::~ACE_Typed_SV_Message_Queue"); -} - -#endif /* ACE_TYPED_SV_MESSAGE_QUEUE_C */ diff --git a/ace/Typed_SV_Message_Queue.h b/ace/Typed_SV_Message_Queue.h deleted file mode 100644 index 9b12b694bc5..00000000000 --- a/ace/Typed_SV_Message_Queue.h +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Typed_SV_Message_Queue.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_TYPED_MESSAGE_QUEUE_H -#define ACE_TYPED_MESSAGE_QUEUE_H -#include "ace/pre.h" - -#include "ace/SV_Message_Queue.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Typed_SV_Message.h" - -/** - * @class ACE_Typed_SV_Message_Queue - * - * @brief Defines the header file for the C++ wrapper facade for typed message queues. - */ -template -class ACE_Typed_SV_Message_Queue -{ -public: - enum - { - ACE_CREATE = IPC_CREAT, - ACE_OPEN = 0, - ACE_NOWAIT = IPC_NOWAIT - }; - - // = Initialization and termination operations. - ACE_Typed_SV_Message_Queue (void); - ACE_Typed_SV_Message_Queue (key_t external_id, - int create = ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); - int open (key_t external_id, - int create = ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); - int close (void); - int remove (void); - ~ACE_Typed_SV_Message_Queue (void); - - /// Send method. - int send (const ACE_Typed_SV_Message &mb, int mflags = 0); - - /// Recv method. - int recv (ACE_Typed_SV_Message &mb, int mflags = 0); - - /// Return the id of the underlying ACE_SV_Message_Queue. - int get_id (void) const; - - /// Control the underlying message queue. - int control (int option, void *arg = 0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - ACE_SV_Message_Queue message_queue_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Typed_SV_Message_Queue.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Typed_SV_Message_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Typed_SV_Message_Queue.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_TYPED_MESSAGE_QUEUE_H */ diff --git a/ace/Typed_SV_Message_Queue.i b/ace/Typed_SV_Message_Queue.i deleted file mode 100644 index afbea9c455d..00000000000 --- a/ace/Typed_SV_Message_Queue.i +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Typed_SV_Message_Queue.i - -#include "ace/SV_Message_Queue.h" - -template ACE_INLINE int -ACE_Typed_SV_Message_Queue::open (key_t external_id, - int create, - int perms) -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::open"); - return this->message_queue_.open (external_id, create, perms); -} - -// What does it mean to close a message queue?! - -template ACE_INLINE int -ACE_Typed_SV_Message_Queue::close (void) -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::close"); - return 1; -} - -template ACE_INLINE int -ACE_Typed_SV_Message_Queue::recv (ACE_Typed_SV_Message &mb, - int mflags) -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::recv"); - - int length = this->message_queue_.recv (ACE_reinterpret_cast (ACE_SV_Message &, - mb), - mb.max_size (), - mb.type (), - mflags); - if (length != -1) - mb.length (length); - - return length; -} - -template ACE_INLINE int -ACE_Typed_SV_Message_Queue::send (const ACE_Typed_SV_Message &mb, - int mflags) -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::send"); - return this->message_queue_. - send (ACE_reinterpret_cast (ACE_SV_Message &, - ACE_const_cast (ACE_Typed_SV_Message &, - mb)), - mb.length (), - mflags); -} - -template ACE_INLINE int -ACE_Typed_SV_Message_Queue::remove (void) -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::remove"); - - return this->message_queue_.remove (); -} - -template ACE_INLINE int -ACE_Typed_SV_Message_Queue::control (int option, - void *arg) -{ - ACE_TRACE ("ACE_Typed_SV_Message_Queue::control"); - - return this->message_queue_.control (option, arg); -} - -template ACE_INLINE int -ACE_Typed_SV_Message_Queue::get_id (void) const -{ - return this->message_queue_.get_id (); -} diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp deleted file mode 100644 index 13bb91e1db1..00000000000 --- a/ace/UNIX_Addr.cpp +++ /dev/null @@ -1,114 +0,0 @@ -// UNIX_Addr.cpp -// $Id$ - -#include "ace/UNIX_Addr.h" - -ACE_RCSID(ace, UNIX_Addr, "$Id$") - -#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) - -#if !defined (__ACE_INLINE__) -#include "ace/UNIX_Addr.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_UNIX_Addr) - -// Set a pointer to the address. -void -ACE_UNIX_Addr::set_addr (void *addr, int len) -{ - ACE_TRACE ("ACE_UNIX_Addr::set_addr"); - - this->ACE_Addr::base_set (AF_UNIX, len); - ACE_OS::memcpy ((void *) &this->unix_addr_, - (void *) addr, - len); -} - -void -ACE_UNIX_Addr::dump (void) const -{ -} - -// Do nothing constructor. - -ACE_UNIX_Addr::ACE_UNIX_Addr (void) - : ACE_Addr (AF_UNIX, sizeof this->unix_addr_) -{ - (void) ACE_OS::memset ((void *) &this->unix_addr_, - 0, - sizeof this->unix_addr_); - - this->unix_addr_.sun_family = AF_UNIX; -} - -int -ACE_UNIX_Addr::set (const ACE_UNIX_Addr &sa) -{ - if (sa.get_type () == AF_ANY) - (void) ACE_OS::memset ((void *) &this->unix_addr_, - 0, - sizeof this->unix_addr_); - else - ACE_OS::strcpy (this->unix_addr_.sun_path, - sa.unix_addr_.sun_path); - - this->unix_addr_.sun_family = AF_UNIX; - this->base_set (sa.get_type (), sa.get_size ()); - - return 0; -} - -// Copy constructor. - -ACE_UNIX_Addr::ACE_UNIX_Addr (const ACE_UNIX_Addr &sa) - : ACE_Addr (AF_UNIX, sa.get_size ()) -{ - this->set (sa); -} - -int -ACE_UNIX_Addr::set (const sockaddr_un *un, int len) -{ - (void) ACE_OS::memset ((void *) &this->unix_addr_, 0, - sizeof this->unix_addr_); - this->unix_addr_.sun_family = AF_UNIX; - ACE_OS::strcpy (this->unix_addr_.sun_path, un->sun_path); - this->base_set (AF_UNIX, len); - return 0; -} - -ACE_UNIX_Addr::ACE_UNIX_Addr (const sockaddr_un *un, int len) -{ - this->set (un, len); -} - -int -ACE_UNIX_Addr::set (const char rendezvous_point[]) -{ - (void) ACE_OS::memset ((void *) &this->unix_addr_, - 0, - sizeof this->unix_addr_); - this->unix_addr_.sun_family = AF_UNIX; - size_t len = ACE_OS::strlen (rendezvous_point); - size_t maxlen = sizeof this->unix_addr_.sun_path; - - (void) ACE_OS::memcpy (this->unix_addr_.sun_path, - rendezvous_point, - len >= maxlen ? maxlen - 1 : len); - - this->ACE_Addr::base_set (AF_UNIX, - sizeof this->unix_addr_ - - sizeof (this->unix_addr_.sun_path) + - ACE_OS::strlen (this->unix_addr_.sun_path)); - return 0; -} - -// Create a ACE_Addr from a UNIX pathname. - -ACE_UNIX_Addr::ACE_UNIX_Addr (const char rendezvous_point[]) -{ - this->set (rendezvous_point); -} - -#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h deleted file mode 100644 index 807a84d99f4..00000000000 --- a/ace/UNIX_Addr.h +++ /dev/null @@ -1,101 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file UNIX_Addr.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_UNIX_ADDR_H -#define ACE_UNIX_ADDR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) - -#include "ace/Addr.h" -#include "ace/Log_Msg.h" -#include "ace/ACE.h" - -/** - * @class ACE_UNIX_Addr - * - * @brief Defines the ``UNIX domain address family'' address format. - */ -class ACE_Export ACE_UNIX_Addr : public ACE_Addr -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_UNIX_Addr (void); - - /// Copy constructor. - ACE_UNIX_Addr (const ACE_UNIX_Addr &sa); - - /// Creates an ACE_UNIX_Addr from a string. - ACE_UNIX_Addr (const char rendezvous_point[]); - - /// Creates an ACE_INET_Addr from a sockaddr_un structure. - ACE_UNIX_Addr (const sockaddr_un *, int len); - - /// Creates an ACE_UNIX_Addr from another ACE_UNIX_Addr. - int set (const ACE_UNIX_Addr &sa); - - /// Creates an ACE_UNIX_Addr from a string. - int set (const char rendezvous_point[]); - - /// Creates an ACE_UNIX_Addr from a sockaddr_un structure. - int set (const sockaddr_un *, int len); - - /// Return a pointer to the underlying network address. - virtual void *get_addr (void) const; - - /// Set a pointer to the underlying network address. - virtual void set_addr (void *addr, int len); - - /// Transform the current address into string format. - virtual int addr_to_string (char addr[], size_t) const; - - /// Transform the string into the current addressing format. - virtual int string_to_addr (const char addr[]); - - /// Compare two addresses for equality. - int operator == (const ACE_UNIX_Addr &SAP) const; - - /// Compare two addresses for inequality. - int operator != (const ACE_UNIX_Addr &SAP) const; - - /// Return the path name of the underlying rendezvous point. - const char *get_path_name (void) const; - - /// Computes and returns hash value. - virtual u_long hash (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Underlying socket address. - sockaddr_un unix_addr_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/UNIX_Addr.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ -#include "ace/post.h" -#endif /* ACE_UNIX_ADDR_H */ diff --git a/ace/UNIX_Addr.i b/ace/UNIX_Addr.i deleted file mode 100644 index 2ef10e67556..00000000000 --- a/ace/UNIX_Addr.i +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// UNIX_Addr.i - -#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) - -// Return a pointer to the underlying address. - -ACE_INLINE void * -ACE_UNIX_Addr::get_addr (void) const -{ - return (void *) &this->unix_addr_; -} - -// Transform the string into the current addressing format. - -ACE_INLINE int -ACE_UNIX_Addr::string_to_addr (const char addr[]) -{ - ACE_OS::strsncpy (this->unix_addr_.sun_path, addr, - sizeof this->unix_addr_.sun_path); - return 0; -} - -// Transform the current address into string format. - -ACE_INLINE int -ACE_UNIX_Addr::addr_to_string (char s[], size_t len) const -{ - ACE_OS::strsncpy (s, this->unix_addr_.sun_path, len); - return 0; -} - -// Compare two addresses for equality. - -ACE_INLINE int -ACE_UNIX_Addr::operator == (const ACE_UNIX_Addr &sap) const -{ - return ACE_OS::strncmp (this->unix_addr_.sun_path, - sap.unix_addr_.sun_path, - sizeof this->unix_addr_.sun_path) == 0; -} - -// Compare two addresses for inequality. - -ACE_INLINE int -ACE_UNIX_Addr::operator != (const ACE_UNIX_Addr &sap) const -{ - return !((*this) == sap); // This is lazy, of course... ;-) -} - -// Return the path name used for the rendezvous point. - -ACE_INLINE const char * -ACE_UNIX_Addr::get_path_name (void) const -{ - return this->unix_addr_.sun_path; -} - -ACE_INLINE u_long -ACE_UNIX_Addr::hash (void) const -{ - return ACE::hash_pjw (this->unix_addr_.sun_path); -} - -#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp deleted file mode 100644 index 379155616f3..00000000000 --- a/ace/UPIPE_Acceptor.cpp +++ /dev/null @@ -1,122 +0,0 @@ -// UPIPE_Acceptor.cpp -// $Id$ - -#include "ace/UPIPE_Acceptor.h" - -ACE_RCSID(ace, UPIPE_Acceptor, "$Id$") - -#if defined (ACE_HAS_THREADS) - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/UPIPE_Acceptor.i" -#endif - -ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Acceptor) - -void -ACE_UPIPE_Acceptor::dump (void) const -{ - ACE_TRACE ("ACE_UPIPE_Acceptor::dump"); -} - -/* Do nothing routine for constructor. */ - -ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (void) - : mb_ (sizeof (ACE_UPIPE_Stream *)) -{ - ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor"); -} - -ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor (void) -{ - ACE_TRACE ("ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor"); -} - -// General purpose routine for performing server ACE_UPIPE. - -int -ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr, - int reuse_addr) -{ - ACE_TRACE ("ACE_UPIPE_Acceptor::open"); - return this->ACE_SPIPE_Acceptor::open (local_addr, reuse_addr); -} - -int -ACE_UPIPE_Acceptor::close (void) -{ - ACE_TRACE ("ACE_UPIPE_Acceptor::close"); - return this->ACE_SPIPE_Acceptor::close (); -} - -// General purpose routine for accepting new connections. - -ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr, - int reuse_addr) - : mb_ (sizeof (ACE_UPIPE_Stream *)) -{ - ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor"); - - if (this->open (local_addr, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor"))); -} - -int -ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, - ACE_UPIPE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, - int reset_new_handle) -{ - ACE_TRACE ("ACE_UPIPE_Acceptor::accept"); - ACE_UNUSED_ARG (reset_new_handle); - - ACE_SPIPE_Stream new_io; - - if (this->ACE_SPIPE_Acceptor::accept (new_io, remote_addr, - timeout, restart) == -1) - return -1; - else - { - ACE_UPIPE_Stream *remote_stream = 0; - - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, new_stream.lock_, -1)); - - new_stream.set_handle (new_io.get_handle ()); - new_stream.reference_count_++; - - // Transfer address ownership. - new_io.get_local_addr (new_stream.local_addr_); - new_io.get_remote_addr (new_stream.remote_addr_); - - // Now that we got the handle, we'll read the address of the - // connector-side ACE_UPIPE_Stream out of the pipe and link that - // ACE_UPIPE_Stream to our ACE_UPIPE_Stream. - - if (ACE_OS::read (new_stream.get_handle (), - (char *) &remote_stream, - sizeof remote_stream) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_LIB_TEXT ("read stream address failed"))); - else if (new_stream.stream_.link (remote_stream->stream_) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_LIB_TEXT ("link streams failed"))); - // Send a message over the new streampipe to confirm acceptance. - else if (new_stream.send (&mb_, 0) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_LIB_TEXT ("linked stream.put failed"))); - - // Close down the new_stream at this point in order to conserve - // handles. Note that we don't need the SPIPE connection - // anymore since we're now linked via the . - new_stream.ACE_SPIPE::close (); - return 0; - } -} - -#endif /* ACE_HAS_THREADS */ diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h deleted file mode 100644 index bb24251e8b2..00000000000 --- a/ace/UPIPE_Acceptor.h +++ /dev/null @@ -1,94 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file UPIPE_Acceptor.h - * - * $Id$ - * - * @author Gerhard Lenzer - * @author Douglas C. Schmidt - */ -//============================================================================= - - -#ifndef ACE_UPIPE_ACCEPTOR_H -#define ACE_UPIPE_ACCEPTOR_H -#include "ace/pre.h" - -#include "ace/UPIPE_Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" -#include "ace/SPIPE_Acceptor.h" -#include "ace/Thread_Manager.h" - -#if defined (ACE_HAS_THREADS) - -/** - * @class ACE_UPIPE_Acceptor - * - * @brief Defines the format and interface for the listener side of the - * ACE_UPIPE_Stream. - */ -class ACE_Export ACE_UPIPE_Acceptor : public ACE_SPIPE_Acceptor -{ -public: - // = Initialization and termination. - /// Default constructor. - ACE_UPIPE_Acceptor (void); - - /// Initialize passive endpoint. - ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_sap, - int reuse_addr = 0); - - /// Initialize passive endpoint. - int open (const ACE_UPIPE_Addr &local_sap, - int reuse_addr = 0); - - /// Close down and release resources. - ~ACE_UPIPE_Acceptor (void); - - /// Close down and release resources. - int close (void); - - /// Close down and release resources and remove the underlying SPIPE - /// rendezvous point. - int remove (void); - - // = Passive connection acceptance method. - /** - * Accept a new data transfer connection. A @a timeout of 0 means - * block forever, a @a timeout of {0, 0} means poll. @a restart == 1 - * means "restart if interrupted." - */ - int accept (ACE_UPIPE_Stream &server_stream, - ACE_UPIPE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0); - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Manage threads. - ACE_Thread_Manager tm; - - /// To confirm connection establishment. - ACE_Message_Block mb_; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/UPIPE_Acceptor.i" -#endif - -#endif /* ACE_HAS_THREADS */ -#include "ace/post.h" -#endif /* ACE_UPIPE_ACCEPTOR_H */ diff --git a/ace/UPIPE_Acceptor.i b/ace/UPIPE_Acceptor.i deleted file mode 100644 index d47cf593242..00000000000 --- a/ace/UPIPE_Acceptor.i +++ /dev/null @@ -1,11 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// UPIPE_Acceptor.i - -ASYS_INLINE int -ACE_UPIPE_Acceptor::remove (void) -{ - ACE_TRACE ("ACE_UPIPE_Acceptor::remove"); - return this->ACE_SPIPE_Acceptor::remove (); -} diff --git a/ace/UPIPE_Addr.h b/ace/UPIPE_Addr.h deleted file mode 100644 index acdec342fe1..00000000000 --- a/ace/UPIPE_Addr.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- C++ -*- */ - - -//============================================================================= -/** - * @file UPIPE_Addr.h - * - * $Id$ - * - * @author Doug Schmidt - */ -//============================================================================= - - -#ifndef ACE_UPIPE_ADDR_H -#define ACE_UPIPE_ADDR_H -#include "ace/pre.h" - -#include "ace/SPIPE_Addr.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -typedef ACE_SPIPE_Addr ACE_UPIPE_Addr; - -#include "ace/post.h" -#endif /* ACE_UPIPE_ADDR_H */ diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp deleted file mode 100644 index d2edc143a50..00000000000 --- a/ace/UPIPE_Connector.cpp +++ /dev/null @@ -1,91 +0,0 @@ -// UPIPE_Connector.cpp -// $Id$ - -#include "ace/UPIPE_Connector.h" - -ACE_RCSID(ace, UPIPE_Connector, "$Id$") - -#if defined (ACE_HAS_THREADS) - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/UPIPE_Connector.i" -#endif - -ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Connector) - -void -ACE_UPIPE_Connector::dump (void) const -{ - ACE_TRACE ("ACE_UPIPE_Connector::dump"); -} - -ACE_UPIPE_Connector::ACE_UPIPE_Connector (void) -{ - ACE_TRACE ("ACE_UPIPE_Connector::ACE_UPIPE_Connector"); -} - -int -ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, - const ACE_UPIPE_Addr &addr, - ACE_Time_Value *timeout, - const ACE_Addr & /* local_sap */, - int /* reuse_addr */, - int flags, - int perms) -{ - ACE_TRACE ("ACE_UPIPE_Connector::connect"); - ACE_ASSERT (new_stream.get_handle () == ACE_INVALID_HANDLE); - - ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout, - addr.get_path_name (), - flags, perms); - - if (handle == ACE_INVALID_HANDLE) - return -1; -#if !defined (ACE_WIN32) - else if (ACE_OS::isastream (handle) != 1) - return -1; -#endif - else // We're connected! - { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, new_stream.lock_, -1)); - - ACE_UPIPE_Stream *ustream = &new_stream; - - new_stream.set_handle (handle); - new_stream.remote_addr_ = addr; // class copy. - new_stream.reference_count_++; - - // Now send the address of our ACE_UPIPE_Stream over this pipe - // to our corresponding ACE_UPIPE_Acceptor, so he may link the - // two streams. - ssize_t result = ACE_OS::write (handle, - (const char *) &ustream, - sizeof ustream); - if (result == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Connector %p\n"), - ACE_LIB_TEXT ("write to pipe failed"))); - - // Wait for confirmation of stream linking. - ACE_Message_Block *mb_p = 0; - - // Our part is done, wait for server to confirm connection. - result = new_stream.recv (mb_p, 0); - - // Do *not* coalesce the following two checks for result == -1. - // They perform different checks and cannot be merged. - if (result == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Connector %p\n"), - ACE_LIB_TEXT ("no confirmation from server"))); - else - // Close down the new_stream at this point in order to - // conserve handles. Note that we don't need the SPIPE - // connection anymore since we're linked via the Message_Queue - // now. - new_stream.ACE_SPIPE::close (); - return result; - } -} -#endif /* ACE_HAS_THREADS */ diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h deleted file mode 100644 index a12e111558b..00000000000 --- a/ace/UPIPE_Connector.h +++ /dev/null @@ -1,112 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file UPIPE_Connector.h - * - * $Id$ - * - * @author Gerhard Lenzer and Douglas C. Schmidt - */ -//============================================================================= - - -#ifndef ACE_UPIPE_CONNECTOR_H -#define ACE_UPIPE_CONNECTOR_H -#include "ace/pre.h" - -#include "ace/UPIPE_Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" -#include "ace/SPIPE_Stream.h" - -#if defined (ACE_HAS_THREADS) - -/** - * @class ACE_UPIPE_Connector - * - * @brief Defines an active connection factory for the - * ACE_UPIPE_STREAM wrappers. - */ -class ACE_Export ACE_UPIPE_Connector -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_UPIPE_Connector (void); - - /** - * Actively connect and produce a @a new_stream if things go well. - * The @a addr is the address that we are trying to connect - * with. The @a timeout is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the maximum amount of time to wait before timing out. If the - * time expires before the connection is made . The - * @a local_sap is the value of local address to bind to. If it's - * the default value of ACE_Addr::sap_any then the user is letting - * the OS do the binding. If @a reuse_addr == 1 then the - * @a local_addr is reused, even if it hasn't been cleanedup yet. - * The @a flags and @a perms arguments are passed down to the open() - * method. - */ - ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, - const ACE_UPIPE_Addr &addr, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); - - /** - * Actively connect and produce a @a new_stream if things go well. - * The @a addr is the address that we are trying to connect - * with. The @a timeout is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the maximum amount of time to wait before timing out. If the - * time expires before the connection is made . The - * @a local_sap is the value of local address to bind to. If it's - * the default value of ACE_Addr::sap_any then the user is letting - * the OS do the binding. If @a reuse_addr == 1 then the - * @a local_addr is reused, even if it hasn't been cleanedup yet. - * The @a flags and @a perms arguments are passed down to the open() - * method. - */ - int connect (ACE_UPIPE_Stream &new_stream, - const ACE_UPIPE_Addr &addr, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); - - /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); - - // = Meta-type info - typedef ACE_UPIPE_Addr PEER_ADDR; - typedef ACE_UPIPE_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/UPIPE_Connector.i" -#endif - -#endif /* ACE_HAS_THREADS */ -#include "ace/post.h" -#endif /* ACE_UPIPE_CONNECTOR_H */ diff --git a/ace/UPIPE_Connector.i b/ace/UPIPE_Connector.i deleted file mode 100644 index a8a68342e77..00000000000 --- a/ace/UPIPE_Connector.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// UPIPE_Connector.i - -// Creates a Local ACE_UPIPE. - -ASYS_INLINE -ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, - const ACE_UPIPE_Addr &addr, - ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms) -{ - ACE_TRACE ("ACE_UPIPE_Connector::ACE_UPIPE_Connector"); - if (this->connect (new_stream, addr, timeout, local_sap, - reuse_addr, flags, perms) == -1 - && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("address %s, %p\n"), - addr.get_path_name (), - ACE_LIB_TEXT ("ACE_UPIPE_Connector"))); -} - -ASYS_INLINE int -ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE handle) -{ - ACE_UNUSED_ARG (handle); - // Nothing to do here since the handle is not a socket - return 0; -} diff --git a/ace/UPIPE_Stream.cpp b/ace/UPIPE_Stream.cpp deleted file mode 100644 index c66ccde36c9..00000000000 --- a/ace/UPIPE_Stream.cpp +++ /dev/null @@ -1,226 +0,0 @@ -// UPIPE_Stream.cpp -// $Id$ - -#include "ace/UPIPE_Stream.h" - -ACE_RCSID(ace, UPIPE_Stream, "$Id$") - -#if defined (ACE_HAS_THREADS) - -#if !defined (__ACE_INLINE__) -#include "ace/UPIPE_Stream.i" -#endif /* __ACE_INLINE__ */ - - -ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Stream) - -ACE_UPIPE_Stream::ACE_UPIPE_Stream (void) - : mb_last_ (0), - reference_count_ (0) -{ - ACE_TRACE ("ACE_UPIPE_Stream::ACE_UPIPE_STREAM"); -} - -ACE_UPIPE_Stream::~ACE_UPIPE_Stream (void) -{ - if (this->mb_last_ != 0) - { - this->mb_last_->release (); - this->mb_last_ = 0; - } -} - -int -ACE_UPIPE_Stream::control (int cmd, - void * val) const -{ - ACE_TRACE ("ACE_UPIPE_Stream::control"); - - return ((ACE_UPIPE_Stream *) this)->stream_.control - ((ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds) cmd, val); -} - -void -ACE_UPIPE_Stream::dump (void) const -{ - ACE_TRACE ("ACE_UPIPE_Stream::dump"); -} - -int -ACE_UPIPE_Stream::close (void) -{ - ACE_TRACE ("ACE_UPIPE_Stream::close"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); - - this->reference_count_--; - - if (this->reference_count_ == 0) - { - // Since the UPIPE should have been closed earlier we won't bother - // checking to see if closing it now fails. - - if (this->ACE_SPIPE::get_handle () != ACE_INVALID_HANDLE) - this->ACE_SPIPE::close (); - - // Close down the ACE_stream. - return this->stream_.close (); - } - return 0; -} - -int -ACE_UPIPE_Stream::get_remote_addr (ACE_UPIPE_Addr &remote_sap) const -{ - ACE_TRACE ("ACE_UPIPE_Stream::get_remote_addr"); - remote_sap = this->remote_addr_; - return 0; -} - -int -ACE_UPIPE_Stream::send (ACE_Message_Block *mb_p, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_UPIPE_Stream::send_msg"); - return this->stream_.put (mb_p, timeout) == -1 ? -1 : 0; -} - -int ACE_UPIPE_Stream::recv (ACE_Message_Block *& mb_p, - ACE_Time_Value *timeout) -{ - return this->stream_.get (mb_p, timeout) == -1 ? -1 : 0; -} - -// Send a buffer. - -ssize_t -ACE_UPIPE_Stream::send (const char *buffer, - size_t n, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_UPIPE_Stream::send"); - - ACE_Message_Block *mb_p; - ACE_NEW_RETURN (mb_p, - ACE_Message_Block (n), - -1); - mb_p->copy (buffer, n); - return - this->stream_.put (mb_p, timeout) == -1 - ? -1 - : ACE_static_cast (ssize_t, n); -} - -// Receive a buffer. - -ssize_t -ACE_UPIPE_Stream::recv (char *buffer, - size_t n, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_UPIPE_Stream::recv"); - // Index in buffer. - size_t bytes_read = 0; - - while (bytes_read < n) - if (this->mb_last_ != 0) - { - // We have remaining data in our last read Message_Buffer. - size_t this_len = this->mb_last_->length (); - if (this_len < n) - { - // The remaining data is not enough. - - ACE_OS::memcpy ((void *) &buffer[bytes_read], - this->mb_last_->rd_ptr (), - this_len); - bytes_read += this_len; - this->mb_last_ = this->mb_last_->release (); // mb_last_ now 0 - return bytes_read; - } - else - { - // The remaining data is at least enough. If there's - // more, we'll get it the next time through. - ACE_OS::memcpy (&buffer[bytes_read], - this->mb_last_->rd_ptr (), - n); - bytes_read += n; - - // Advance rd_ptr. - this->mb_last_->rd_ptr (n); - - if (this->mb_last_->length () == 0) - // Now the Message_Buffer is empty. - this->mb_last_ = this->mb_last_->release (); - } - } - else - { - // We have to get a new Message_Buffer from our stream. - int result = this->stream_.get (this->mb_last_, timeout); - - if (result == -1) - { - if (errno == EWOULDBLOCK && bytes_read > 0) - // Return the number of bytes read before we timed out. - return bytes_read; - else - return -1; - } - } - - return bytes_read; -} - -ssize_t -ACE_UPIPE_Stream::send_n (const char *buf, - size_t n, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_UPIPE_Stream::send_n"); - - size_t bytes_written; - ssize_t len = 0; - - for (bytes_written = 0; - bytes_written < n; - bytes_written += len) - { - len = this->send (buf + bytes_written, - n - bytes_written, - timeout); - - if (len == -1) - return -1; - } - - return bytes_written; -} - -ssize_t -ACE_UPIPE_Stream::recv_n (char *buf, - size_t n, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_UPIPE_Stream::recv_n"); - size_t bytes_read; - ssize_t len = 0; - - for (bytes_read = 0; - bytes_read < n; - bytes_read += len) - { - len = this->recv (buf + bytes_read, - n - bytes_read, - timeout); - if (len == -1) - return -1; - else if (len == 0) - break; - } - - return bytes_read; -} - - -#endif /* ACE_HAS_THREADS */ diff --git a/ace/UPIPE_Stream.h b/ace/UPIPE_Stream.h deleted file mode 100644 index 5c789c85e44..00000000000 --- a/ace/UPIPE_Stream.h +++ /dev/null @@ -1,137 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file UPIPE_Stream.h - * - * $Id$ - * - * @author Gerhard Lenzer - * @author Douglas C. Schmidt - */ -//============================================================================= - - -#ifndef ACE_UPIPE_STREAM_H -#define ACE_UPIPE_STREAM_H -#include "ace/pre.h" - -#include "ace/Stream.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" -#include "ace/SPIPE.h" -#include "ace/Message_Queue.h" -#include "ace/UPIPE_Addr.h" - -#if defined (ACE_HAS_THREADS) - -// Use a typedef to make life easier later on. -typedef ACE_Stream MT_Stream; - -/** - * @class ACE_UPIPE_Stream - * - * @brief Defines the method that transfer data on a UPIPE. - */ -class ACE_Export ACE_UPIPE_Stream : public ACE_SPIPE -{ -public: - friend class ACE_UPIPE_Acceptor; - friend class ACE_UPIPE_Connector; - - // = Initialization and Termination. - - ACE_UPIPE_Stream (void); - - virtual ~ACE_UPIPE_Stream (void); - - /// Shut down the UPIPE and release resources. - int close (void); - - /// Return the underlying I/O handle. - ACE_HANDLE get_handle (void) const; - - // = Send/recv ACE Message_Blocks. - /// Send a message through the message queue. Returns -1 on error, - /// else 0. - int send (ACE_Message_Block *mb_p, - ACE_Time_Value *timeout = 0); - - /// Recv a message from the message queue. Returns -1 on error, else - /// 0. - int recv (ACE_Message_Block *&mb_p, - ACE_Time_Value *timeout = 0); - - // = Send/recv char buffers. - /// Send a buffer of bytes through the message queue. Returns -1 - /// on error, else number of bytes sent. - ssize_t send (const char *buffer, - size_t n, - ACE_Time_Value *timeout = 0); - - /// Recv a buffer of upto bytes from the message queue. Returns - /// -1 on error, else number of bytes read. - ssize_t recv (char *buffer, - size_t n, - ACE_Time_Value *timeout = 0); - - /// Send a buffer of exactly bytes to the message queue. Returns - /// -1 on error, else number of bytes written (which should == n). - ssize_t send_n (const char *buffer, - size_t n, - ACE_Time_Value *timeout = 0); - - /// Recv a buffer of exactly bytes from the message queue. - /// Returns -1 on error, else the number of bytes read. - ssize_t recv_n (char *buffer, - size_t n, - ACE_Time_Value *timeout = 0); - - /// Perform control operations on the UPIPE_Stream. - int control (int cmd, void *val) const; - - /// Return the remote address we are connected to. - int get_remote_addr (ACE_UPIPE_Addr &remote_sap) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - // = Meta-type info - typedef ACE_UPIPE_Addr PEER_ADDR; - -private: - /// To hold the last ACE_Message_Block read out of the stream. Thus - /// allowing subsequent reads from one ACE_Message_Block - ACE_Message_Block *mb_last_; - - /// Address of who we are connected to. - ACE_UPIPE_Addr remote_addr_; - - /// Stream component used by the and - /// to link together two UPIPE_Streams. - MT_Stream stream_; - - /// Keep track of whether the sender and receiver have both shut - /// down. - int reference_count_; - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - /// Ensure that we are thread-safe. - ACE_Thread_Mutex lock_; -#endif /* ACE_MT_SAFE */ -}; - -#if defined (__ACE_INLINE__) -#include "ace/UPIPE_Stream.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_THREADS */ -#include "ace/post.h" -#endif /*ACE_UPIPE_STREAM_H */ diff --git a/ace/UPIPE_Stream.i b/ace/UPIPE_Stream.i deleted file mode 100644 index c2297fcffce..00000000000 --- a/ace/UPIPE_Stream.i +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// UPIPE_Stream.i - -ACE_INLINE ACE_HANDLE -ACE_UPIPE_Stream::get_handle (void) const -{ - ACE_TRACE ("ACE_UPIPE_Stream::get_handle"); - return this->ACE_SPIPE::get_handle (); -} - diff --git a/ace/Unbounded_Queue.cpp b/ace/Unbounded_Queue.cpp deleted file mode 100644 index c5aad55fd31..00000000000 --- a/ace/Unbounded_Queue.cpp +++ /dev/null @@ -1,426 +0,0 @@ -// $Id$ - -#ifndef ACE_UNBOUNDED_QUEUE_C -#define ACE_UNBOUNDED_QUEUE_C - -#include "ace/Unbounded_Queue.h" -#include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Unbounded_Queue.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Unbounded_Queue, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Queue) - -template -ACE_Unbounded_Queue::ACE_Unbounded_Queue (ACE_Allocator *alloc) - : head_ (0), - cur_size_ (0), - allocator_ (alloc) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::ACE_Unbounded_Queue (void)"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (ACE_Node *) this->allocator_->malloc (sizeof (ACE_Node)), - ACE_Node); - // Make the list circular by pointing it back to itself. - this->head_->next_ = this->head_; -} - -template -ACE_Unbounded_Queue::ACE_Unbounded_Queue (const ACE_Unbounded_Queue &us) - : head_ (0), - cur_size_ (0), - allocator_ (us.allocator_) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::ACE_Unbounded_Queue"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (ACE_Node *) this->allocator_->malloc (sizeof (ACE_Node)), - ACE_Node); - this->head_->next_ = this->head_; - this->copy_nodes (us); -} - -template void -ACE_Unbounded_Queue::operator= (const ACE_Unbounded_Queue &us) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::operator="); - - if (this != &us) - { - this->delete_nodes (); - this->copy_nodes (us); - } -} - -template ACE_Unbounded_Queue_Iterator -ACE_Unbounded_Queue::begin (void) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::begin"); - return ACE_Unbounded_Queue_Iterator (*this); -} - -template ACE_Unbounded_Queue_Iterator -ACE_Unbounded_Queue::end (void) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::end"); - return ACE_Unbounded_Queue_Iterator (*this, 1); -} - -template void -ACE_Unbounded_Queue::dump (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Queue::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); - - T *item = 0; -#if !defined (ACE_NLOGGING) - size_t count = 1; -#endif /* ! ACE_NLOGGING */ - - for (ACE_Unbounded_Queue_Iterator iter (*(ACE_Unbounded_Queue *) this); - iter.next (item) != 0; - iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %d\n"), count++)); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template void -ACE_Unbounded_Queue::copy_nodes (const ACE_Unbounded_Queue &us) -{ - for (ACE_Node *curr = us.head_->next_; - curr != us.head_; - curr = curr->next_) - if (this->enqueue_tail (curr->item_) == -1) - // @@ What's the right thing to do here? - this->delete_nodes (); -} - -template void -ACE_Unbounded_Queue::delete_nodes (void) -{ - for (ACE_Node *curr = this->head_->next_; - // Keep looking until we've hit the dummy node. - curr != this->head_; - ) - { - ACE_Node *temp = curr; - curr = curr->next_; - - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_Node, - ); - this->cur_size_--; - // @@ Doesnt make sense to have this check since - // this will always be true. - // ACE_ASSERT (this->cur_size_ >= 0); - } - - // Reset the list to be a circular list with just a dummy node. - this->head_->next_ = this->head_; -} - -template -ACE_Unbounded_Queue::~ACE_Unbounded_Queue (void) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::~ACE_Unbounded_Queue (void)"); - - this->delete_nodes (); - ACE_DES_FREE_TEMPLATE (head_, - this->allocator_->free, - ACE_Node, - ); - this->head_ = 0; -} - -template int -ACE_Unbounded_Queue::enqueue_head (const T &new_item) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::enqueue_head"); - - ACE_Node *temp; - - // Create a new node that points to the original head. - ACE_NEW_MALLOC_RETURN (temp, - ACE_static_cast(ACE_Node *, - this->allocator_->malloc (sizeof (ACE_Node))), - ACE_Node (new_item, this->head_->next_), - -1); - // Link this pointer into the front of the list. Note that the - // "real" head of the queue is next_>, whereas is - // just a pointer to the dummy node. - this->head_->next_ = temp; - - this->cur_size_++; - return 0; -} - -template int -ACE_Unbounded_Queue::enqueue_tail (const T &new_item) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::enqueue_tail"); - - // Insert into the old dummy node location. Note that this - // isn't actually the "head" item in the queue, it's a dummy node at - // the "tail" of the queue... - this->head_->item_ = new_item; - - ACE_Node *temp; - - // Create a new dummy node. - ACE_NEW_MALLOC_RETURN (temp, - ACE_static_cast(ACE_Node *, - this->allocator_->malloc (sizeof (ACE_Node))), - ACE_Node (this->head_->next_), - -1); - // Link this dummy pointer into the list. - this->head_->next_ = temp; - - // Point the head to the new dummy node. - this->head_ = temp; - - this->cur_size_++; - return 0; -} - -template int -ACE_Unbounded_Queue::dequeue_head (T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::dequeue_head"); - - // Check for empty queue. - if (this->is_empty ()) - return -1; - - ACE_Node *temp = this->head_->next_; - - item = temp->item_; - this->head_->next_ = temp->next_; - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_Node, - ); - --this->cur_size_; - return 0; -} - -template void -ACE_Unbounded_Queue::reset (void) -{ - ACE_TRACE ("reset"); - - this->delete_nodes (); -} - -template int -ACE_Unbounded_Queue::get (T *&item, size_t slot) const -{ - // ACE_TRACE ("ACE_Unbounded_Queue::get"); - - ACE_Node *curr = this->head_->next_; - - size_t i; - - for (i = 0; i < this->cur_size_; i++) - { - if (i == slot) - break; - - curr = curr->next_; - } - - if (i < this->cur_size_) - { - item = &curr->item_; - return 0; - } - else - return -1; -} - -template int -ACE_Unbounded_Queue::set (const T &item, - size_t slot) -{ - // ACE_TRACE ("ACE_Unbounded_Queue::set"); - - ACE_Node *curr = this->head_->next_; - - size_t i; - - for (i = 0; - i < slot && i < this->cur_size_; - i++) - curr = curr->next_; - - if (i < this->cur_size_) - { - // We're in range, so everything's cool. - curr->item_ = item; - return 0; - } - else - { - // We need to expand the list. - - // A common case will be increasing the set size by 1. - // Therefore, we'll optimize for this case. - if (i == slot) - { - // Try to expand the size of the set by 1. - if (this->enqueue_tail (item) == -1) - return -1; - else - return 0; - } - else - { - T dummy; - - // We need to expand the list by multiple (dummy) items. - for (; i < slot; i++) - { - // This head points to the existing dummy node, which is - // about to be overwritten when we add the new dummy - // node. - curr = this->head_; - - // Try to expand the size of the set by 1, but don't - // store anything in the dummy node (yet). - if (this->enqueue_tail (dummy) == -1) - return -1; - } - - curr->item_ = item; - return 0; - } - } -} - -// **************************************************************** - -template void -ACE_Unbounded_Queue_Const_Iterator::dump (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator::dump"); -} - -template -ACE_Unbounded_Queue_Const_Iterator::ACE_Unbounded_Queue_Const_Iterator (const ACE_Unbounded_Queue &q, int end) - : current_ (end == 0 ? q.head_->next_ : q.head_ ), - queue_ (q) -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator::ACE_Unbounded_Queue_Const_Iterator"); -} - -template int -ACE_Unbounded_Queue_Const_Iterator::advance (void) -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator::advance"); - this->current_ = this->current_->next_; - return this->current_ != this->queue_.head_; -} - -template int -ACE_Unbounded_Queue_Const_Iterator::first (void) -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator::first"); - this->current_ = this->queue_.head_->next_; - return this->current_ != this->queue_.head_; -} - -template int -ACE_Unbounded_Queue_Const_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator::done"); - - return this->current_ == this->queue_.head_; -} - -template int -ACE_Unbounded_Queue_Const_Iterator::next (T *&item) -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator::next"); - if (this->current_ == this->queue_.head_) - return 0; - else - { - item = &this->current_->item_; - return 1; - } -} - -// **************************************************************** - -template void -ACE_Unbounded_Queue_Iterator::dump (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Iterator::dump"); -} - -template -ACE_Unbounded_Queue_Iterator::ACE_Unbounded_Queue_Iterator (ACE_Unbounded_Queue &q, int end) - : current_ (end == 0 ? q.head_->next_ : q.head_ ), - queue_ (q) -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Iterator::ACE_Unbounded_Queue_Iterator"); -} - -template int -ACE_Unbounded_Queue_Iterator::advance (void) -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Iterator::advance"); - this->current_ = this->current_->next_; - return this->current_ != this->queue_.head_; -} - -template int -ACE_Unbounded_Queue_Iterator::first (void) -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Iterator::first"); - this->current_ = this->queue_.head_->next_; - return this->current_ != this->queue_.head_; -} - -template int -ACE_Unbounded_Queue_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Unbounded_Queue_Iterator::done"); - - return this->current_ == this->queue_.head_; -} - -template int -ACE_Unbounded_Queue_Iterator::next (T *&item) -{ - // ACE_TRACE ("ACE_Unbounded_Queue_Iterator::next"); - if (this->current_ == this->queue_.head_) - return 0; - else - { - item = &this->current_->item_; - return 1; - } -} - -#endif /* ACE_UNBOUNDED_QUEUE_C */ diff --git a/ace/Unbounded_Queue.h b/ace/Unbounded_Queue.h deleted file mode 100644 index 0c110c896dc..00000000000 --- a/ace/Unbounded_Queue.h +++ /dev/null @@ -1,294 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Unbounded_Queue.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_UNBOUNDED_QUEUE_H -#define ACE_UNBOUNDED_QUEUE_H -#include "ace/pre.h" - -#include "ace/Node.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// For size_t under Chorus -#include "ace/OS_Memory.h" - -class ACE_Allocator; - -template -class ACE_Unbounded_Queue; - -/** - * @class ACE_Unbounded_Queue_Iterator - * - * @brief Implement an iterator over an unbounded queue. - */ -template -class ACE_Unbounded_Queue_Iterator -{ -public: - // = Initialization method. - ACE_Unbounded_Queue_Iterator (ACE_Unbounded_Queue &q, int end = 0); - - // = Iteration methods. - - /// Pass back the @a next_item that hasn't been seen in the queue. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the queue have been seen, else 1. - int advance (void); - - /// Move to the first element in the queue. Returns 0 if the - /// queue is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Pointer to the current node in the iteration. - ACE_Node *current_; - - /// Pointer to the queue we're iterating over. - ACE_Unbounded_Queue &queue_; -}; - -/** - * @class ACE_Unbounded_Queue_Const_Iterator - * - * @brief Implement an iterator over an const unbounded queue. - */ -template -class ACE_Unbounded_Queue_Const_Iterator -{ -public: - // = Initialization method. - ACE_Unbounded_Queue_Const_Iterator (const ACE_Unbounded_Queue &q, int end = 0); - - // = Iteration methods. - - /// Pass back the @a next_item that hasn't been seen in the queue. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the queue have been seen, else 1. - int advance (void); - - /// Move to the first element in the queue. Returns 0 if the - /// queue is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Pointer to the current node in the iteration. - ACE_Node *current_; - - /// Pointer to the queue we're iterating over. - const ACE_Unbounded_Queue &queue_; -}; - -/** - * @class ACE_Unbounded_Queue - * - * @brief A Queue of "infinite" length. - * - * This implementation of an unbounded queue uses a circular - * linked list with a dummy node. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Circular linked list - * - Duplicates allowed? - * Yes - * - Random access allowed? - * No - * - Search speed - * N/A - * - Insert/replace speed - * N/A - * - Iterator still valid after change to container? - * Yes - * - Frees memory for removed elements? - * Yes - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * - */ -template -class ACE_Unbounded_Queue -{ -public: - friend class ACE_Unbounded_Queue_Iterator; - friend class ACE_Unbounded_Queue_Const_Iterator; - - // Trait definition. - typedef ACE_Unbounded_Queue_Iterator ITERATOR; - typedef ACE_Unbounded_Queue_Const_Iterator CONST_ITERATOR; - - // = Initialization and termination methods. - /// Construction. Use user specified allocation strategy - /// if specified. - /** - * Initialize an empty queue using the strategy provided. - */ - ACE_Unbounded_Queue (ACE_Allocator *alloc = 0); - - /// Copy constructor. - /** - * Initialize the queue to be a copy of the provided queue. - */ - ACE_Unbounded_Queue (const ACE_Unbounded_Queue &); - - /// Assignment operator. - /** - * Perform a deep copy of rhs. - */ - void operator= (const ACE_Unbounded_Queue &); - - /// Destructor. - /** - * Clean up the memory for the queue. - */ - ~ACE_Unbounded_Queue (void); - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, otherwise returns 0. - /** - * Constant time check to see if the queue is empty. - */ - int is_empty (void) const; - - /// Returns 0. - /** - * The queue cannot be full, so it always returns 0. - */ - int is_full (void) const; - - // = Classic queue operations. - - /// Adds @a new_item to the tail of the queue. Returns 0 on success, - /// -1 on failure. - /** - * Insert an item at the end of the queue. - */ - int enqueue_tail (const T &new_item); - - /// Adds @a new_item to the head of the queue. Returns 0 on success, - /// -1 on failure. - /** - * Insert an item at the head of the queue. - */ - int enqueue_head (const T &new_item); - - /// Removes and returns the first @a item on the queue. Returns 0 on - /// success, -1 if the queue was empty. - /** - * Remove an item from the head of the queue. - */ - int dequeue_head (T &item); - - // = Additional utility methods. - - /// Reset the ACE_Unbounded_Queue to be empty and release all its - /// dynamically allocated resources. - /** - * Delete the queue nodes. - */ - void reset (void); - - /// Get the @a slot th element in the set. Returns -1 if the element - /// isn't in the range {0..#cur_size_ - 1}, else 0. - /** - * Find the item in the queue between 0 and the provided index of the - * queue. - */ - int get (T *&item, size_t slot = 0) const; - - /// Set the @a slot th element of the queue to @a item. - /** - * Set the @a slot th element in the set. Will pad out the set with - * empty nodes if @a slot is beyond the range {0..#cur_size_ - 1}. - * Returns -1 on failure, 0 if @a slot isn't initially in range, and - * 0 otherwise. - */ - int set (const T &item, size_t slot); - - /// The number of items in the queue. - /** - * Return the size of the queue. - */ - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - // = STL-styled unidirectional iterator factory. - ACE_Unbounded_Queue_Iterator begin (void); - ACE_Unbounded_Queue_Iterator end (void); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -protected: - /// Delete all the nodes in the queue. - void delete_nodes (void); - - /// Copy nodes into this queue. - void copy_nodes (const ACE_Unbounded_Queue &); - - /// Pointer to the dummy node in the circular linked Queue. - ACE_Node *head_; - - /// Current size of the queue. - size_t cur_size_; - - /// Allocation Strategy of the queue. - ACE_Allocator *allocator_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Unbounded_Queue.inl" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Unbounded_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Unbounded_Queue.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_UNBOUNDED_QUEUE_H */ diff --git a/ace/Unbounded_Queue.inl b/ace/Unbounded_Queue.inl deleted file mode 100644 index ea552e7d3d8..00000000000 --- a/ace/Unbounded_Queue.inl +++ /dev/null @@ -1,21 +0,0 @@ -// $Id$ - -template ACE_INLINE size_t -ACE_Unbounded_Queue::size (void) const -{ - return this->cur_size_; -} - -template ACE_INLINE int -ACE_Unbounded_Queue::is_empty (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Queue::is_empty"); - return this->head_ == this->head_->next_; -} - -template ACE_INLINE int -ACE_Unbounded_Queue::is_full (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Queue::is_full"); - return 0; // We should implement a "node of last resort for this..." -} diff --git a/ace/Unbounded_Set.cpp b/ace/Unbounded_Set.cpp deleted file mode 100644 index e1cf0708e6a..00000000000 --- a/ace/Unbounded_Set.cpp +++ /dev/null @@ -1,443 +0,0 @@ -// $Id$ - -#ifndef ACE_UNBOUNDED_SET_C -#define ACE_UNBOUNDED_SET_C - -#include "ace/Unbounded_Set.h" -#include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Unbounded_Set.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Unbounded_Set, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set) - - template size_t -ACE_Unbounded_Set::size (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Set::size"); - return this->cur_size_; -} - -template int -ACE_Unbounded_Set::insert_tail (const T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Set::insert_tail"); - ACE_Node *temp; - - // Insert into the old dummy node location. - this->head_->item_ = item; - - // Create a new dummy node. - ACE_NEW_MALLOC_RETURN (temp, - ACE_static_cast(ACE_Node*, - this->allocator_->malloc (sizeof (ACE_Node))), - ACE_Node (this->head_->next_), - -1); - // Link this pointer into the list. - this->head_->next_ = temp; - - // Point the head to the new dummy node. - this->head_ = temp; - - this->cur_size_++; - return 0; -} - -template void -ACE_Unbounded_Set::reset (void) -{ - ACE_TRACE ("reset"); - - this->delete_nodes (); -} - -template void -ACE_Unbounded_Set::dump (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); - - T *item = 0; -#if !defined (ACE_NLOGGING) - size_t count = 1; -#endif /* ! ACE_NLOGGING */ - - for (ACE_Unbounded_Set_Iterator iter (*(ACE_Unbounded_Set *) this); - iter.next (item) != 0; - iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %d\n"), count++)); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template void -ACE_Unbounded_Set::copy_nodes (const ACE_Unbounded_Set &us) -{ - for (ACE_Node *curr = us.head_->next_; - curr != us.head_; - curr = curr->next_) - this->insert_tail (curr->item_); -} - -template void -ACE_Unbounded_Set::delete_nodes (void) -{ - ACE_Node *curr = this->head_->next_; - - // Keep looking until we've hit the dummy node. - - while (curr != this->head_) - { - ACE_Node *temp = curr; - curr = curr->next_; - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_Node, - ); - this->cur_size_--; - } - - // Reset the list to be a circular list with just a dummy node. - this->head_->next_ = this->head_; -} - -template -ACE_Unbounded_Set::~ACE_Unbounded_Set (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set::~ACE_Unbounded_Set"); - - this->delete_nodes (); - - // Delete the dummy node. - ACE_DES_FREE_TEMPLATE (head_, - this->allocator_->free, - ACE_Node, - ); - this->head_ = 0; -} - -template -ACE_Unbounded_Set::ACE_Unbounded_Set (ACE_Allocator *alloc) - : head_ (0), - cur_size_ (0), - allocator_ (alloc) -{ - // ACE_TRACE ("ACE_Unbounded_Set::ACE_Unbounded_Set"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (ACE_Node*) this->allocator_->malloc (sizeof (ACE_Node)), - ACE_Node); - // Make the list circular by pointing it back to itself. - this->head_->next_ = this->head_; -} - -template -ACE_Unbounded_Set::ACE_Unbounded_Set (const ACE_Unbounded_Set &us) - : head_ (0), - cur_size_ (0), - allocator_ (us.allocator_) -{ - ACE_TRACE ("ACE_Unbounded_Set::ACE_Unbounded_Set"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (ACE_Node*) this->allocator_->malloc (sizeof (ACE_Node)), - ACE_Node); - this->head_->next_ = this->head_; - this->copy_nodes (us); -} - -template void -ACE_Unbounded_Set::operator= (const ACE_Unbounded_Set &us) -{ - ACE_TRACE ("ACE_Unbounded_Set::operator="); - - if (this != &us) - { - this->delete_nodes (); - this->copy_nodes (us); - } -} - -template int -ACE_Unbounded_Set::find (const T &item) const -{ - // ACE_TRACE ("ACE_Unbounded_Set::find"); - // Set into the dummy node. - this->head_->item_ = item; - - ACE_Node *temp = this->head_->next_; - - // Keep looping until we find the item. - while (!(temp->item_ == item)) - temp = temp->next_; - - // If we found the dummy node then it's not really there, otherwise, - // it is there. - return temp == this->head_ ? -1 : 0; -} - -template int -ACE_Unbounded_Set::insert (const T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Set::insert"); - if (this->find (item) == 0) - return 1; - else - return this->insert_tail (item); -} - -template int -ACE_Unbounded_Set::remove (const T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Set::remove"); - - // Insert the item to be founded into the dummy node. - this->head_->item_ = item; - - ACE_Node *curr = this->head_; - - while (!(curr->next_->item_ == item)) - curr = curr->next_; - - if (curr->next_ == this->head_) - return -1; // Item was not found. - else - { - ACE_Node *temp = curr->next_; - // Skip over the node that we're deleting. - curr->next_ = temp->next_; - this->cur_size_--; - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_Node, - ); - return 0; - } -} - -template ACE_Unbounded_Set_Iterator -ACE_Unbounded_Set::begin (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set::begin"); - return ACE_Unbounded_Set_Iterator (*this); -} - -template ACE_Unbounded_Set_Iterator -ACE_Unbounded_Set::end (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set::end"); - return ACE_Unbounded_Set_Iterator (*this, 1); -} - - -ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Iterator) - - template void -ACE_Unbounded_Set_Iterator::dump (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Set_Iterator::dump"); -} - -template -ACE_Unbounded_Set_Iterator::ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set &s, int end) - : current_ (end == 0 ? s.head_->next_ : s.head_ ), - set_ (&s) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Iterator::ACE_Unbounded_Set_Iterator"); -} - -template int -ACE_Unbounded_Set_Iterator::advance (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Iterator::advance"); - this->current_ = this->current_->next_; - return this->current_ != this->set_->head_; -} - -template int -ACE_Unbounded_Set_Iterator::first (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Iterator::first"); - this->current_ = this->set_->head_->next_; - return this->current_ != this->set_->head_; -} - -template int -ACE_Unbounded_Set_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set_Iterator::done"); - - return this->current_ == this->set_->head_; -} - -template int -ACE_Unbounded_Set_Iterator::next (T *&item) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Iterator::next"); - if (this->current_ == this->set_->head_) - return 0; - else - { - item = &this->current_->item_; - return 1; - } -} - -template ACE_Unbounded_Set_Iterator -ACE_Unbounded_Set_Iterator::operator++ (int) -{ - //ACE_TRACE ("ACE_Unbounded_Set_Iterator::operator++ (int)"); - ACE_Unbounded_Set_Iterator retv (*this); - - // postfix operator - - this->advance (); - return retv; -} - -template ACE_Unbounded_Set_Iterator& -ACE_Unbounded_Set_Iterator::operator++ (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Iterator::operator++ (void)"); - - // prefix operator - - this->advance (); - return *this; -} - -template T& -ACE_Unbounded_Set_Iterator::operator* (void) -{ - //ACE_TRACE ("ACE_Unbounded_Set_Iterator::operator*"); - T *retv = 0; - - int result = this->next (retv); - ACE_ASSERT (result != 0); - ACE_UNUSED_ARG (result); - - return *retv; -} - -template int -ACE_Unbounded_Set_Iterator::operator== (const ACE_Unbounded_Set_Iterator &rhs) const -{ - //ACE_TRACE ("ACE_Unbounded_Set_Iterator::operator=="); - return (this->set_ == rhs.set_ && this->current_ == rhs.current_); -} - -template int -ACE_Unbounded_Set_Iterator::operator!= (const ACE_Unbounded_Set_Iterator &rhs) const -{ - //ACE_TRACE ("ACE_Unbounded_Set_Iterator::operator!="); - return (this->set_ != rhs.set_ || this->current_ != rhs.current_); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Const_Iterator) - -template void -ACE_Unbounded_Set_Const_Iterator::dump (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator::dump"); -} - -template -ACE_Unbounded_Set_Const_Iterator::ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set &s, int end) - : current_ (end == 0 ? s.head_->next_ : s.head_ ), - set_ (&s) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator::ACE_Unbounded_Set_Const_Iterator"); -} - -template int -ACE_Unbounded_Set_Const_Iterator::advance (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator::advance"); - this->current_ = this->current_->next_; - return this->current_ != this->set_->head_; -} - -template int -ACE_Unbounded_Set_Const_Iterator::first (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator::first"); - this->current_ = this->set_->head_->next_; - return this->current_ != this->set_->head_; -} - -template int -ACE_Unbounded_Set_Const_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator::done"); - - return this->current_ == this->set_->head_; -} - -template int -ACE_Unbounded_Set_Const_Iterator::next (T *&item) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator::next"); - if (this->current_ == this->set_->head_) - return 0; - else - { - item = &this->current_->item_; - return 1; - } -} - -template ACE_Unbounded_Set_Const_Iterator -ACE_Unbounded_Set_Const_Iterator::operator++ (int) -{ - //ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator::operator++ (int)"); - ACE_Unbounded_Set_Const_Iterator retv (*this); - - // postfix operator - - this->advance (); - return retv; -} - -template ACE_Unbounded_Set_Const_Iterator& -ACE_Unbounded_Set_Const_Iterator::operator++ (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator::operator++ (void)"); - - // prefix operator - - this->advance (); - return *this; -} - -template T& -ACE_Unbounded_Set_Const_Iterator::operator* (void) -{ - //ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator::operator*"); - T *retv = 0; - - int result = this->next (retv); - ACE_ASSERT (result != 0); - ACE_UNUSED_ARG (result); - - return *retv; -} - -#endif /* ACE_UNBOUNDED_SET_C */ diff --git a/ace/Unbounded_Set.h b/ace/Unbounded_Set.h deleted file mode 100644 index d4c882b6f5c..00000000000 --- a/ace/Unbounded_Set.h +++ /dev/null @@ -1,314 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Unbounded_Set.h - * - * $Id$ - * - * @author Douglas C. Schmidt - */ -//============================================================================= - -#ifndef ACE_UNBOUNDED_SET_H -#define ACE_UNBOUNDED_SET_H -#include "ace/pre.h" - -#include "ace/Node.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_Allocator; - -/** - * @class ACE_Unbounded_Set_Iterator - * - * @brief Implement an iterator over an unbounded set. - */ -template -class ACE_Unbounded_Set_Iterator -{ -public: - // = Initialization method. - ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set &s, int end = 0); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the Set. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int advance (void); - - /// Move to the first element in the set. Returns 0 if the - /// set is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - // = STL styled iteration, compare, and reference functions. - - /// Postfix advance. - ACE_Unbounded_Set_Iterator operator++ (int); - - /// Prefix advance. - ACE_Unbounded_Set_Iterator& operator++ (void); - - /// Returns a reference to the internal element is pointing to. - T& operator* (void); - - /// Check if two iterators point to the same position - int operator== (const ACE_Unbounded_Set_Iterator &) const; - int operator!= (const ACE_Unbounded_Set_Iterator &) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - /// Pointer to the current node in the iteration. - ACE_Node *current_; - - /// Pointer to the set we're iterating over. - ACE_Unbounded_Set *set_; -}; - -/** - * @class ACE_Unbounded_Set_Const_Iterator - * - * @brief Implement an const iterator over an unbounded set. - */ -template -class ACE_Unbounded_Set_Const_Iterator -{ -public: - // = Initialization method. - ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set &s, int end = 0); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the Set. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int advance (void); - - /// Move to the first element in the set. Returns 0 if the - /// set is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - // = STL styled iteration, compare, and reference functions. - - /// Postfix advance. - ACE_Unbounded_Set_Const_Iterator operator++ (int); - - /// Prefix advance. - ACE_Unbounded_Set_Const_Iterator& operator++ (void); - - /// Returns a reference to the internal element is pointing to. - T& operator* (void); - - /// Check if two iterators point to the same position - int operator== (const ACE_Unbounded_Set_Const_Iterator &) const; - int operator!= (const ACE_Unbounded_Set_Const_Iterator &) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - /// Pointer to the current node in the iteration. - ACE_Node *current_; - - /// Pointer to the set we're iterating over. - const ACE_Unbounded_Set *set_; -}; - -/** - * @class ACE_Unbounded_Set - * - * @brief Implement a simple unordered set of of unbounded size. - * - * This implementation of an unordered set uses a circular - * linked list with a dummy node. This implementation does not - * allow duplicates, but it maintains FIFO ordering of insertions. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Circular linked list - * - Duplicates allowed? - * No - * - Random access allowed? - * No - * - Search speed - * Linear - * - Insert/replace speed - * Linear - * - Iterator still valid after change to container? - * Yes - * - Frees memory for removed elements? - * Yes - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * -# operator== - * - */ -template -class ACE_Unbounded_Set -{ -public: - friend class ACE_Unbounded_Set_Iterator; - friend class ACE_Unbounded_Set_Const_Iterator; - - // Trait definition. - typedef ACE_Unbounded_Set_Iterator ITERATOR; - typedef ACE_Unbounded_Set_Iterator iterator; - typedef ACE_Unbounded_Set_Const_Iterator CONST_ITERATOR; - typedef ACE_Unbounded_Set_Const_Iterator const_iterator; - - // = Initialization and termination methods. - /// Constructor. Use user specified allocation strategy - /// if specified. - /** - * Initialize an empty set using the allocation strategy of the user if - * provided. - */ - ACE_Unbounded_Set (ACE_Allocator *alloc = 0); - - /// Copy constructor. - /** - * Initialize this set to be an exact copy of the set provided. - */ - ACE_Unbounded_Set (const ACE_Unbounded_Set &); - - /// Assignment operator. - /** - * Perform a deep copy of the rhs into the lhs. - */ - void operator= (const ACE_Unbounded_Set &); - - /// Destructor. - /** - * Destroy the nodes of the set. - */ - ~ACE_Unbounded_Set (void); - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, otherwise returns 0. - /** - * Constant time is_empty check. - */ - int is_empty (void) const; - - /// Returns 0. - /** - * Always returns 0 since the set can never fill up. - */ - int is_full (void) const; - - // = Classic unordered set operations. - - ///Linear insertion of an item. - /** - * Insert into the set (doesn't allow duplicates). - * Returns -1 if failures occur, 1 if item is already present, else - * 0. - */ - int insert (const T &new_item); - - /// Insert at the tail of the set (doesn't check for - /// duplicates). - /** - * Constant time insert at the end of the set. - */ - int insert_tail (const T &item); - - ///Linear remove operation. - /** - * Remove first occurrence of from the set. Returns 0 if - * it removes the item, -1 if it can't find the item, and -1 if a - * failure occurs. - */ - int remove (const T &item); - - /// Finds if occurs in the set. Returns 0 if find succeeds, - /// else -1. - /** - * Performs a linear find operation. - */ - int find (const T &item) const; - - /// Size of the set. - /** - * Access the size of the set. - */ - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Reset the to be empty. - /** - * Delete the nodes of the set. - */ - void reset (void); - - // = STL-styled unidirectional iterator factory. - ACE_Unbounded_Set_Iterator begin (void); - ACE_Unbounded_Set_Iterator end (void); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Delete all the nodes in the Set. - void delete_nodes (void); - - /// Copy nodes into this set. - void copy_nodes (const ACE_Unbounded_Set &); - - /// Head of the linked list of Nodes. - ACE_Node *head_; - - /// Current size of the set. - size_t cur_size_; - - /// Allocation strategy of the set. - ACE_Allocator *allocator_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Unbounded_Set.inl" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Unbounded_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Unbounded_Set.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_UNBOUNDED_SET_H */ diff --git a/ace/Unbounded_Set.inl b/ace/Unbounded_Set.inl deleted file mode 100644 index 3f71cd2b498..00000000000 --- a/ace/Unbounded_Set.inl +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -template ACE_INLINE int -ACE_Unbounded_Set::is_empty (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set::is_empty"); - return this->head_ == this->head_->next_; -} - -template ACE_INLINE int -ACE_Unbounded_Set::is_full (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set::is_full"); - return 0; // We should implement a "node of last resort for this..." -} diff --git a/ace/Unbounded_Set_Ex.cpp b/ace/Unbounded_Set_Ex.cpp deleted file mode 100644 index 2dedd6a5537..00000000000 --- a/ace/Unbounded_Set_Ex.cpp +++ /dev/null @@ -1,620 +0,0 @@ -// $Id$ - -#ifndef ACE_UNBOUNDED_SET_EX_C -#define ACE_UNBOUNDED_SET_EX_C - -#include "ace/Unbounded_Set_Ex.h" -#include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Unbounded_Set_Ex.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Unbounded_Set_Ex, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex) - -template size_t -ACE_Unbounded_Set_Ex::size (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex::size"); - return this->cur_size_; -} - -template int -ACE_Unbounded_Set_Ex::insert_tail (const T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex::insert_tail"); - ACE_Node *temp; - - // Insert into the old dummy node location. - this->head_->item_ = item; - - // Create a new dummy node. - ACE_NEW_MALLOC_RETURN (temp, - ACE_static_cast(ACE_Node*, - this->allocator_->malloc (sizeof (ACE_Node))), - ACE_Node (this->head_->next_), - -1); - // Link this pointer into the list. - this->head_->next_ = temp; - - // Point the head to the new dummy node. - this->head_ = temp; - - this->cur_size_++; - return 0; -} - -template void -ACE_Unbounded_Set_Ex::reset (void) -{ - ACE_TRACE ("reset"); - - this->delete_nodes (); -} - -template void -ACE_Unbounded_Set_Ex::dump (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set_Ex::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); - - T *item = 0; -#if !defined (ACE_NLOGGING) - size_t count = 1; -#endif /* ! ACE_NLOGGING */ - - for (ACE_Unbounded_Set_Ex_Iterator iter (*(ACE_Unbounded_Set_Ex *) this); - iter.next (item) != 0; - iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %d\n"), count++)); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -template void -ACE_Unbounded_Set_Ex::copy_nodes (const ACE_Unbounded_Set_Ex &us) -{ - for (ACE_Node *curr = us.head_->next_; - curr != us.head_; - curr = curr->next_) - { - if (!curr->deleted_) - this->insert_tail (curr->item_); - } -} - -template void -ACE_Unbounded_Set_Ex::delete_nodes (void) -{ - ACE_Node *curr = this->head_->next_; - ACE_ASSERT (number_of_iterators_ == 0); - // Keep looking until we've hit the dummy node. - - while (curr != this->head_) - { - ACE_Node *temp = curr; - curr = curr->next_; - if (!temp->deleted_) - this->cur_size_--; - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_Node, - ); - } - - // Reset the list to be a circular list with just a dummy node. - this->head_->next_ = this->head_; -} - -template void -ACE_Unbounded_Set_Ex::cleanup () -{ - /// curr is the address of the chaining - ACE_Node **curr = &(this->head_->next_); - ACE_ASSERT (number_of_iterators_ == 0); - - // Keep looking until we've hit the dummy node. - while (*curr != this->head_) - { - if ((*curr)->deleted_) - { - ACE_Node *temp = *curr; - *curr = (*curr)->next_; // skip the deleted, curr is still the same - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_Node, - ); - } - else - { - curr = &((*curr)->next_); - } - } -} - -template -ACE_Unbounded_Set_Ex::~ACE_Unbounded_Set_Ex (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex::~ACE_Unbounded_Set_Ex"); - - this->delete_nodes (); - - // Delete the dummy node. - ACE_DES_FREE_TEMPLATE (head_, - this->allocator_->free, - ACE_Node, - ); - this->head_ = 0; -} - -template -ACE_Unbounded_Set_Ex::ACE_Unbounded_Set_Ex (ACE_Allocator *alloc) - : head_ (0), - cur_size_ (0), - allocator_ (alloc), - number_of_iterators_ (0) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex::ACE_Unbounded_Set_Ex"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (ACE_Node*) this->allocator_->malloc (sizeof (ACE_Node)), - ACE_Node); - // Make the list circular by pointing it back to itself. - this->head_->next_ = this->head_; -} - -template -ACE_Unbounded_Set_Ex::ACE_Unbounded_Set_Ex (const ACE_Unbounded_Set_Ex &us) - : head_ (0), - cur_size_ (0), - allocator_ (us.allocator_), - number_of_iterators_ (0) -{ - ACE_TRACE ("ACE_Unbounded_Set_Ex::ACE_Unbounded_Set_Ex"); - - if (this->allocator_ == 0) - this->allocator_ = ACE_Allocator::instance (); - - ACE_NEW_MALLOC (this->head_, - (ACE_Node*) this->allocator_->malloc (sizeof (ACE_Node)), - ACE_Node); - this->head_->next_ = this->head_; - this->copy_nodes (us); -} - -template void -ACE_Unbounded_Set_Ex::operator= (const ACE_Unbounded_Set_Ex &us) -{ - ACE_TRACE ("ACE_Unbounded_Set_Ex::operator="); - - if (this != &us) - { - this->delete_nodes (); - this->copy_nodes (us); - } -} - -template int -ACE_Unbounded_Set_Ex::find (const T &item) const -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex::find"); - // Set into the dummy node. - this->head_->item_ = item; - - ACE_Node *temp = this->head_->next_; - - // Keep looping until we find the item. - while (!(temp->item_ == item && !temp->deleted_)) - temp = temp->next_; - - // If we found the dummy node then it's not really there, otherwise, - // it is there. - return temp == this->head_ ? -1 : 0; -} - -template int -ACE_Unbounded_Set_Ex::insert (const T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex::insert"); - if (this->find (item) == 0) - return 1; - else - return this->insert_tail (item); -} - -template int -ACE_Unbounded_Set_Ex::remove (const T &item) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex::remove"); - - // Insert the item to be founded into the dummy node. - this->head_->item_ = item; - this->head_->deleted_ = false; - - ACE_Node *curr = this->head_; - - while (!(curr->next_->item_ == item) || curr->next_->deleted_) - curr = curr->next_; - - if (curr->next_ == this->head_) - return -1; // Item was not found. - else - { - this->cur_size_--; - ACE_Node *temp = curr->next_; - if (number_of_iterators_>0) - { - temp->deleted_=true; - } - else - { - // Skip over the node that we're deleting. - curr->next_ = temp->next_; - ACE_DES_FREE_TEMPLATE (temp, - this->allocator_->free, - ACE_Node, - ); - } - return 0; - } -} - -template ACE_Unbounded_Set_Ex_Iterator -ACE_Unbounded_Set_Ex::begin (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex::begin"); - return ACE_Unbounded_Set_Ex_Iterator (*this); -} - -template ACE_Unbounded_Set_Ex_Iterator -ACE_Unbounded_Set_Ex::end (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex::end"); - return ACE_Unbounded_Set_Ex_Iterator (*this, 1); -} - -template void -ACE_Unbounded_Set_Ex::iterator_add (void) const -{ - number_of_iterators_++; -} - -template void -ACE_Unbounded_Set_Ex::iterator_leave (void) -{ - ACE_ASSERT (number_of_iterators_ > 0); - number_of_iterators_--; - if (number_of_iterators_ == 0) - cleanup (); -} - -template void -ACE_Unbounded_Set_Ex::const_iterator_leave (void) const -{ - ACE_ASSERT (number_of_iterators_ > 0); - number_of_iterators_--; -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex_Iterator) - -template void -ACE_Unbounded_Set_Ex_Iterator::dump (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::dump"); -} - -template -ACE_Unbounded_Set_Ex_Iterator::ACE_Unbounded_Set_Ex_Iterator (ACE_Unbounded_Set_Ex &s, int end) - : current_ (end == 0 ? s.head_->next_ : s.head_ ), set_ (&s) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::ACE_Unbounded_Set_Ex_Iterator"); - // the first one may be deleted - while (this->current_->deleted_ && this->current_ != this->set_->head_) - this->current_ = this->current_->next_; - registered_in_set_ = (!end && this->current_ != this->set_->head_); - if (registered_in_set_) - set_->iterator_add (); -} - -template -ACE_Unbounded_Set_Ex_Iterator::ACE_Unbounded_Set_Ex_Iterator (const ACE_Unbounded_Set_Ex_Iterator &o) - : current_ (o.current_), set_ (o.set_), - registered_in_set_ (o.registered_in_set_) -{ - if (registered_in_set_) - set_->iterator_add (); -} - -template void -ACE_Unbounded_Set_Ex_Iterator::operator= (const ACE_Unbounded_Set_Ex_Iterator &o) -{ - if (this == &o) - return; - if (registered_in_set_) - set_->iterator_leave (); - this->set_ = o.set_; - this->current_ = o.current_; - this->registered_in_set_ = o.registered_in_set_; - if (registered_in_set_) - set_->iterator_add (); -} - - -template -ACE_Unbounded_Set_Ex_Iterator::~ACE_Unbounded_Set_Ex_Iterator () -{ - if (registered_in_set_) - set_->iterator_leave (); -} - -template int -ACE_Unbounded_Set_Ex_Iterator::advance (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::advance"); - this->current_ = this->current_->next_; - while (this->current_->deleted_ && this->current_ != this->set_->head_) - this->current_ = this->current_->next_; - int completed = (this->current_ == this->set_->head_); - if (completed && registered_in_set_) - { - set_->iterator_leave (); - registered_in_set_ = false; - } - return !completed; -} - -template int -ACE_Unbounded_Set_Ex_Iterator::first (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::first"); - this->current_ = this->set_->head_->next_; - while (this->current_->deleted_ && this->current_ != this->set_->head_) - this->current_ = this->current_->next_; - int non_empty = (this->current_ != this->set_->head_); - if (non_empty && !registered_in_set_) - { - registered_in_set_ = true; - set_->iterator_add (); - } - return non_empty; -} - -template int -ACE_Unbounded_Set_Ex_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::done"); - - return this->current_ == this->set_->head_; -} - -template int -ACE_Unbounded_Set_Ex_Iterator::next (T *&item) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::next"); - int completed = (this->current_ == this->set_->head_); - if (completed) - { - if (registered_in_set_) - { - set_->iterator_leave (); - registered_in_set_ = false; - } - return 0; - } - item = &this->current_->item_; - return 1; -} - -template ACE_Unbounded_Set_Ex_Iterator -ACE_Unbounded_Set_Ex_Iterator::operator++ (int) -{ - //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::operator++ (int)"); - ACE_Unbounded_Set_Ex_Iterator retv (*this); - - // postfix operator - - this->advance (); - return retv; -} - -template ACE_Unbounded_Set_Ex_Iterator& -ACE_Unbounded_Set_Ex_Iterator::operator++ (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::operator++ (void)"); - - // prefix operator - - this->advance (); - return *this; -} - -template T& -ACE_Unbounded_Set_Ex_Iterator::operator* (void) -{ - //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::operator*"); - T *retv = 0; - - int result = this->next (retv); - ACE_ASSERT (result != 0); - ACE_UNUSED_ARG (result); - - return *retv; -} - -template int -ACE_Unbounded_Set_Ex_Iterator::operator== (const ACE_Unbounded_Set_Ex_Iterator &rhs) const -{ - //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::operator=="); - return (this->set_ == rhs.set_ && this->current_ == rhs.current_); -} - -template int -ACE_Unbounded_Set_Ex_Iterator::operator!= (const ACE_Unbounded_Set_Ex_Iterator &rhs) const -{ - //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::operator!="); - return (this->set_ != rhs.set_ || this->current_ != rhs.current_); -} - -ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex_Const_Iterator) - -template void -ACE_Unbounded_Set_Ex_Const_Iterator::dump (void) const -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::dump"); -} - -template -ACE_Unbounded_Set_Ex_Const_Iterator::ACE_Unbounded_Set_Ex_Const_Iterator (const ACE_Unbounded_Set_Ex &s, int end) - : current_ (end == 0 ? s.head_->next_ : s.head_ ), set_ (&s) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::ACE_Unbounded_Set_Ex_Const_Iterator"); - // the first one may be deleted - while (this->current_->deleted_ && this->current_ != this->set_->head_) - this->current_ = this->current_->next_; - registered_in_set_ = (!end && this->current_ != this->set_->head_); - if (registered_in_set_) - set_->iterator_add (); -} - -template -ACE_Unbounded_Set_Ex_Const_Iterator::ACE_Unbounded_Set_Ex_Const_Iterator - (const ACE_Unbounded_Set_Ex_Const_Iterator &o) - : current_ (o.current_), - set_ (o.set_), - registered_in_set_ (o.registered_in_set_) -{ - if (registered_in_set_) - set_->iterator_add (); -} - -template -void ACE_Unbounded_Set_Ex_Const_Iterator::operator= - (const ACE_Unbounded_Set_Ex_Const_Iterator& o) -{ - if (this == &o) - return; - if (registered_in_set_) - set_->const_iterator_leave (); - this->set_ = o.set_; - this->current_ = o.current_; - this->registered_in_set_ = o.registered_in_set_; - if (registered_in_set_) - set_->iterator_add (); -} - -template -ACE_Unbounded_Set_Ex_Const_Iterator::~ACE_Unbounded_Set_Ex_Const_Iterator () -{ - if (registered_in_set_) - set_->const_iterator_leave (); -} - -template int -ACE_Unbounded_Set_Ex_Const_Iterator::advance (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::advance"); - this->current_ = this->current_->next_; - while (this->current_->deleted_ && this->current_ != this->set_->head_) - this->current_ = this->current_->next_; - int completed = (this->current_ == this->set_->head_); - if (completed && registered_in_set_) - { - set_->const_iterator_leave (); - registered_in_set_ = false; - } - return !completed; -} - -template int -ACE_Unbounded_Set_Ex_Const_Iterator::first (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::first"); - this->current_ = this->set_->head_->next_; - while (this->current_->deleted_ && this->current_ != this->set_->head_) - this->current_ = this->current_->next_; - int non_empty = (this->current_ != this->set_->head_); - if (non_empty && !registered_in_set_) - { - registered_in_set_ = true; - set_->iterator_add (); - } - return non_empty; -} - -template int -ACE_Unbounded_Set_Ex_Const_Iterator::done (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::done"); - - return this->current_ == this->set_->head_; -} - -template int -ACE_Unbounded_Set_Ex_Const_Iterator::next (T *&item) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::next"); - int completed = (this->current_ == this->set_->head_); - if (completed) - { - if (registered_in_set_) - { - set_->const_iterator_leave (); - registered_in_set_ = false; - } - return 0; - } - item = &this->current_->item_; - return 1; -} - -template ACE_Unbounded_Set_Ex_Const_Iterator -ACE_Unbounded_Set_Ex_Const_Iterator::operator++ (int) -{ - //ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::operator++ (int)"); - ACE_Unbounded_Set_Ex_Const_Iterator retv (*this); - - // postfix operator - - this->advance (); - return retv; -} - -template ACE_Unbounded_Set_Ex_Const_Iterator& -ACE_Unbounded_Set_Ex_Const_Iterator::operator++ (void) -{ - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::operator++ (void)"); - - // prefix operator - - this->advance (); - return *this; -} - -template T& -ACE_Unbounded_Set_Ex_Const_Iterator::operator* (void) -{ - //ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::operator*"); - T *retv = 0; - - int result = this->next (retv); - ACE_ASSERT (result != 0); - ACE_UNUSED_ARG (result); - - return *retv; -} - -#endif /* ACE_UNBOUNDED_SET_EX_C */ diff --git a/ace/Unbounded_Set_Ex.h b/ace/Unbounded_Set_Ex.h deleted file mode 100644 index 29811d19a15..00000000000 --- a/ace/Unbounded_Set_Ex.h +++ /dev/null @@ -1,359 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Unbounded_Set_Ex.h - * - * $Id$ - * - * @author Douglas C. Schmidt - * ACE_Unbounded_Set Extension by Rudolf Weber - * - * If iterators are working in an Unbounded_Set_Ex, the elements are not - * deleted physically, but marked as deleted. - * There is a bookkeeping of the iterators active in the set. - * It is an error if a set is reset() or destructed while iterators are - * still working on the set. - * - * CAUTION: Pay attention to the state of the iterators. - * Deleting a set, or an element in a set, is only feasible - * when no iterator is active. - * - */ -//============================================================================= - -#ifndef ACE_UNBOUNDED_SET_EX_H -#define ACE_UNBOUNDED_SET_EX_H -#include "ace/pre.h" - -#include "ace/Node.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class ACE_Allocator; - -/** - * @class ACE_Unbounded_Set_Ex_Iterator - * - * @brief Implement an iterator over an unbounded set. - */ -template -class ACE_Unbounded_Set_Ex_Iterator -{ -public: - // = Initialization method. - ACE_Unbounded_Set_Ex_Iterator (ACE_Unbounded_Set_Ex &s, int end = 0); - ACE_Unbounded_Set_Ex_Iterator (const ACE_Unbounded_Set_Ex_Iterator &o); - void operator= (const ACE_Unbounded_Set_Ex_Iterator &o); - ~ACE_Unbounded_Set_Ex_Iterator (); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the Set. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int advance (void); - - /// Move to the first element in the set. Returns 0 if the - /// set is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - // = STL styled iteration, compare, and reference functions. - - /// Postfix advance. - ACE_Unbounded_Set_Ex_Iterator operator++ (int); - - /// Prefix advance. - ACE_Unbounded_Set_Ex_Iterator& operator++ (void); - - /// Returns a reference to the internal element is pointing to. - T& operator* (void); - - /// Check if two iterators point to the same position - int operator== (const ACE_Unbounded_Set_Ex_Iterator &) const; - int operator!= (const ACE_Unbounded_Set_Ex_Iterator &) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - /// Pointer to the current node in the iteration. - ACE_Node *current_; - - /// Pointer to the set we're iterating over. - ACE_Unbounded_Set_Ex *set_; - - // Flag that indicates whether this iterator is registered at the set. - int registered_in_set_; -}; - -/** - * @class ACE_Unbounded_Set_Ex_Const_Iterator - * - * @brief Implement a const iterator over an unbounded set. - * - * The bookkeeping operations are regarded as const. (The member - * number_of_iterators_ in ACE_Unbounded_Set_Ex is `mutable'.) - * Some asynchronous activity may cause a deletion under a Const_Iterator - * so Const_Iterators are registered too. - * However, the cleanup operation isn't const at all, thus it is not - * called from const iterators. - * - */ -template -class ACE_Unbounded_Set_Ex_Const_Iterator -{ -public: - // = Initialization method. - ACE_Unbounded_Set_Ex_Const_Iterator (const ACE_Unbounded_Set_Ex &s, int end = 0); - ACE_Unbounded_Set_Ex_Const_Iterator (const ACE_Unbounded_Set_Ex_Const_Iterator& o); - void operator= (const ACE_Unbounded_Set_Ex_Const_Iterator& o); - ~ACE_Unbounded_Set_Ex_Const_Iterator (); - - // = Iteration methods. - - /// Pass back the that hasn't been seen in the Set. - /// Returns 0 when all items have been seen, else 1. - int next (T *&next_item); - - /// Move forward by one element in the set. Returns 0 when all the - /// items in the set have been seen, else 1. - int advance (void); - - /// Move to the first element in the set. Returns 0 if the - /// set is empty, else 1. - int first (void); - - /// Returns 1 when all items have been seen, else 0. - int done (void) const; - - /// Dump the state of an object. - void dump (void) const; - - // = STL styled iteration, compare, and reference functions. - - /// Postfix advance. - ACE_Unbounded_Set_Ex_Const_Iterator operator++ (int); - - /// Prefix advance. - ACE_Unbounded_Set_Ex_Const_Iterator& operator++ (void); - - /// Returns a reference to the internal element is pointing to. - T& operator* (void); - - /// Check if two iterators point to the same position - int operator== (const ACE_Unbounded_Set_Ex_Const_Iterator &) const; - int operator!= (const ACE_Unbounded_Set_Ex_Const_Iterator &) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - /// Pointer to the current node in the iteration. - ACE_Node *current_; - - /// Pointer to the set we're iterating over. - const ACE_Unbounded_Set_Ex *set_; - - // Flag that indicates whether this iterator is registered at the set. - int registered_in_set_; -}; - -/** - * @class ACE_Unbounded_Set_Ex - * - * @brief Implement a simple unordered set of of unbounded size. - * - * This implementation of an unordered set uses a circular - * linked list with a dummy node. This implementation does not - * allow duplicates, but it maintains FIFO ordering of insertions. - * - * Requirements and Performance Characteristics - * - Internal Structure - * Circular linked list - * - Duplicates allowed? - * No - * - Random access allowed? - * No - * - Search speed - * Linear - * - Insert/replace speed - * Linear - * - Iterator still valid after change to container? - * Yes - * - Frees memory for removed elements? - * Yes - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - * -# operator== - * - */ -template -class ACE_Unbounded_Set_Ex -{ -public: - friend class ACE_Unbounded_Set_Ex_Iterator; - friend class ACE_Unbounded_Set_Ex_Const_Iterator; - - // Trait definition. - typedef ACE_Unbounded_Set_Ex_Iterator ITERATOR; - typedef ACE_Unbounded_Set_Ex_Iterator iterator; - typedef ACE_Unbounded_Set_Ex_Const_Iterator CONST_ITERATOR; - typedef ACE_Unbounded_Set_Ex_Const_Iterator const_iterator; - - // = Initialization and termination methods. - /// Constructor. Use user specified allocation strategy - /// if specified. - /** - * Initialize an empty set using the allocation strategy of the user if - * provided. - */ - ACE_Unbounded_Set_Ex (ACE_Allocator *alloc = 0); - - /// Copy constructor. - /** - * Initialize this set to be an exact copy of the set provided. - */ - ACE_Unbounded_Set_Ex (const ACE_Unbounded_Set_Ex &); - - /// Assignment operator. - /** - * Perform a deep copy of the rhs into the lhs. - */ - void operator= (const ACE_Unbounded_Set_Ex &); - - /// Destructor. - /** - * Destroy the nodes of the set. - */ - ~ACE_Unbounded_Set_Ex (void); - - // = Check boundary conditions. - - /// Returns 1 if the container is empty, otherwise returns 0. - /** - * Constant time is_empty check. - */ - int is_empty (void) const; - - /// Returns 0. - /** - * Always returns 0 since the set can never fill up. - */ - int is_full (void) const; - - // = Classic unordered set operations. - - ///Linear insertion of an item. - /** - * Insert into the set (doesn't allow duplicates). - * Returns -1 if failures occur, 1 if item is already present, else - * 0. - */ - int insert (const T &new_item); - - /// Insert at the tail of the set (doesn't check for - /// duplicates). - /** - * Constant time insert at the end of the set. - */ - int insert_tail (const T &item); - - ///Linear remove operation. - /** - * Remove first occurrence of from the set. Returns 0 if - * it removes the item, -1 if it can't find the item, and -1 if a - * failure occurs. - */ - int remove (const T &item); - - /// Finds if occurs in the set. Returns 0 if find succeeds, - /// else -1. - /** - * Performs a linear find operation. - */ - int find (const T &item) const; - - /// Size of the set. - /** - * Access the size of the set. - */ - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Reset the to be empty. - /** - * Delete the nodes of the set. - */ - void reset (void); - - // = STL-styled unidirectional iterator factory. - ACE_Unbounded_Set_Ex_Iterator begin (void); - ACE_Unbounded_Set_Ex_Iterator end (void); - - /// An Iterator has to register itself here. - void iterator_add () const; - /// A non-const Iterator has to unregister itself here. - void iterator_leave (); - /// A Const_Iterator has to unregister itself here. - void const_iterator_leave () const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - /// Delete all the nodes in the Set. - void delete_nodes (void); - - /// Copy nodes into this set. - void copy_nodes (const ACE_Unbounded_Set_Ex &); - - /// Really delete all nodes marked for deletion. - void cleanup (); - - /// Head of the linked list of Nodes. - ACE_Node *head_; - - /// Current size of the set. - size_t cur_size_; - - /// Allocation strategy of the set. - ACE_Allocator *allocator_; - - /// Number of iterators working on this set. - mutable int number_of_iterators_; -}; - -#if defined (__ACE_INLINE__) -#include "ace/Unbounded_Set_Ex.inl" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Unbounded_Set_Ex.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Unbounded_Set_Ex.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" -#endif /* ACE_UNBOUNDED_SET_EX_H */ diff --git a/ace/Unbounded_Set_Ex.inl b/ace/Unbounded_Set_Ex.inl deleted file mode 100644 index c6f38c7a9a0..00000000000 --- a/ace/Unbounded_Set_Ex.inl +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -template ACE_INLINE int -ACE_Unbounded_Set_Ex::is_empty (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set_Ex::is_empty"); - return this->head_ == this->head_->next_; -} - -template ACE_INLINE int -ACE_Unbounded_Set_Ex::is_full (void) const -{ - ACE_TRACE ("ACE_Unbounded_Set_Ex::is_full"); - return 0; // We should implement a "node of last resort for this..." -} diff --git a/ace/Vector_T.cpp b/ace/Vector_T.cpp deleted file mode 100644 index 734eab8a2fb..00000000000 --- a/ace/Vector_T.cpp +++ /dev/null @@ -1,125 +0,0 @@ -// $Id$ - -#ifndef ACE_VECTOR_T_C -#define ACE_VECTOR_T_C - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Vector_T.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Vector_T.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, Vector_T, "$Id$") - -ACE_ALLOC_HOOK_DEFINE(ACE_Vector) - -template -void ACE_Vector::resize (const size_t new_size, - const T& t) -{ - ACE_Array::size (new_size); - if (new_size > length_) - for (size_t i = length_; i < new_size; ++i) - (*this)[i]=t; - - curr_max_size_ = this->max_size (); - length_ = new_size; -} - -template -void ACE_Vector::push_back (const T& elem) -{ - if (length_ == curr_max_size_) - { - ACE_Array::size (curr_max_size_ * 2); - curr_max_size_ = this->max_size (); - } - ++length_; - (*this)[length_-1] = elem; -} - -template -void ACE_Vector::dump (void) const -{ -#if 0 - // Can't do this unless the vector is an object with a dump - // function. - for (size_t i = 0; i < this->size (); ++i) - (*this)[i].dump (); -#endif /* 0 */ -} - -#if 0 -template -int compare(const ACE_Vector& v1, - const ACE_Vector& v2, - const size_t from_ndx, - const size_t to_ndx) -{ - size_t last1 = v1.size () - 1; - size_t last2 = v2.size () - 1; - if(last1 < from_ndx || last1 < to_ndx) - { - return false; - } - if (last2 < from_ndx || last2 < to_ndx) - { - return false; - } - if (last1 != last2) - { - return false; - } - - // cout<<"compare() <================="<"< -int partial_compare(const ACE_Vector& v1, - const ACE_Vector& v2, - const size_t from_ndx, - const size_t to_ndx) -{ - size_t last1 = v1.size () - 1; - size_t last2 = v2.size () - 1; - if (last1 < from_ndx || last1 < to_ndx) - { - return false; - } - if (last2 < from_ndx || last2 < to_ndx) - { - return false; - } - // cout<<"partial_compare() <================="<"< - * @author Gonzalo Diethelm - */ -//========================================================================== - -#ifndef ACE_VECTOR_T_H -#define ACE_VECTOR_T_H - -#include "ace/pre.h" - -#include "ace/Array.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/* - * Default size for an ACE_Vector. - */ -const size_t ACE_VECTOR_DEFAULT_SIZE = 32; - -/** - * @class ACE_Vector - * - * @brief Defines an STL-like vector container. - * - * This is an STL-like template vector container, a wrapper around - * ACE_Array. It provides at least the basic std::vector look and - * feel: push_back(), clear(), resize(), capacity(). This template - * class uses the copy semantic paradigm, though it is okay to use - * reference counted smart pointers (see ACE_Ptr<T>) with this - * template class. - * - * Requirements and Performance Characteristics - * - Internal Structure - * ACE_Array - * - Duplicates allowed? - * Yes - * - Random access allowed? - * No - * - Search speed - * N/A - * - Insert/replace speed - * Linear - * - Iterator still valid after change to container? - * Yes - * - Frees memory for removed elements? - * No - * - Items inserted by - * Value - * - Requirements for contained type - * -# Default constructor - * -# Copy constructor - * -# operator= - */ -template -class ACE_Vector : public ACE_Array -{ -public: - /** - * A short name for iterator for ACE_Vector. - */ - typedef ACE_Array_Iterator Iterator; - - - /** - * General constructor. - * - * @param init_size Initial size of the vector with the default - * value of DEFAULT_SIZE - * @param alloc Pointer to an ACE allocator. If it is NULL then the - * default ACE allocator is used - */ - ACE_Vector (const size_t init_size = DEFAULT_SIZE, - ACE_Allocator* alloc = 0); - - /** - * Destructor. - */ - ~ACE_Vector (); - - /** - * Returns the current vector capacity, that is, the currently - * allocated buffer size. - * - * @return Current buffer size of the vector - */ - size_t capacity (void) const; - - /** - * Returns the vector's dynamic size / actual current size of the - * vector. Do not confuse it with ACE_Array::size(), which returns - * the array's capacity. Unfortunately, ACE is not very consistent - * with the function names. - * - * @return Dynamic size / actual current size of the vector. - */ - size_t size (void) const; - - /** - * Clears out the vector. It does not reallocate the vector's - * buffer, it is just sets the vector's dynamic size to 0. - */ - void clear (void); - - /** - * Resizes the vector to the new capacity. If the vector's current - * capacity is smaller than the size to be specified, then the - * buffer gets reallocated. If the new capacity is less than the - * current capacity of the vector, the buffer size stays the same. - * - * @param new_size New capacity of the vector - * @param t A filler value (of the class T) for initializing the - * elements of the vector with. By default, if this - * parameter is not specified, the default value of the - * class T will be used (for more detail, see the - * initialization clause for this parameter). - */ - void resize (const size_t new_size, - const T& t); - - /** - * Appends a new element to the vector ("push back"). If the - * dynamic size of the vector is equal to the capacity of the vector - * (vector is at capacity), the vector automatically doubles its - * capacity. - * - * @param elem A reference to the new element to be appended. By - * default, this parameters gets initialized with the - * default value of the class T. - */ - void push_back (const T& elem); - - /** - * Deletes the last element from the vector ("pop back"). What this - * function really does is decrement the dynamic size of the - * vector. The vector's buffer does not get reallocated for - * performance. - */ - void pop_back (void); - - /** - * This function dumps the content of the vector. TO BE MOVED out - * of this class. It needs to be implemented as a global template - * function that accepts a const ACE_Vector<T>, in order to - * make instances of this class compile on Linux, AIX. G++ and xlC - * have template instantiation algoriths, which are different from - * the one in Visual C++. The algorithms try to instantiate ALL - * methods declared in the template class, regardless of whether the - * functions are used or not. That is, all of the classes, that are - * used as elements in ACE_Vector's, have to have the dump() methods - * defined in them (seems to be overkill). - * - * This function calls T::dump() for each element of the vector. - */ - void dump (void) const; - -protected: - - /** - * Dynamic size (length) of the vector. - */ - size_t length_; - - /** - * Current capacity (buffer size) of the vector. - */ - size_t curr_max_size_; -}; - -#if 0 -/* - * Not sure about including these functions, if for no other reason, - * because they polute the global namespace! - */ - -/** - * Compare two vectors in the range of [from_ndx..to_ndx]. This - * template function requires class T to have the operator!=() - * declared in the class. It is safe to define vectors of scalar data - * types, like int, double, etc., including class ACE_TString. - * - * @param v1 The first vector (out of the two) to be compared. - * @param v2 The Second vector (out of the two) to be compared. - * @param from_ndx Compare vector v1 and v2, starting with the - * "from_ndx" index . - * @param to_ndx Compare vector v1 and v2, from "from_ndx" to - * "to_ndx". - * @return Returns true if v1==v2 in the specified index range, - * returns false otherwise. Also, returns false in case if - * v1's size is not equal to v2's size. - */ -template -int compare (const ACE_Vector& v1, - const ACE_Vector& v2, - const size_t from_ndx, - const size_t to_ndx); - -/** - * Does a partial comparison of two vectors in the range of - * [from_ndx..to_ndx]. The only difference between this function and - * the template compare<T> function is that this function does - * not require v1 and v2 to be of equal size. - * - * @param v1 The first vector (out of the two) to be compared. - * @param v2 The Second vector (out of the two) to be compared. - * @param from_ndx Compare vector v1 and v2, starting with the - * "from_ndx" index . - * @param to_ndx Compare vector v1 and v2, from "from_ndx" to - * "to_ndx". - * @return Returns true if vector v1 and v2 are equal in the specified - * index range. - */ - -template -int partial_compare (const ACE_Vector& v1, - const ACE_Vector& v2, - const size_t from_ndx, - const size_t to_ndx); -#endif /* 0 */ - -#if defined (__ACE_INLINE__) -#include "ace/Vector_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Vector_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Vector_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include "ace/post.h" - -#endif /* ACE_VECTOR_T_H */ diff --git a/ace/Vector_T.i b/ace/Vector_T.i deleted file mode 100644 index 4d22680fd8c..00000000000 --- a/ace/Vector_T.i +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -template ACE_INLINE -ACE_Vector::ACE_Vector (const size_t init_size, - ACE_Allocator* alloc) - : ACE_Array (init_size == 0 ? DEFAULT_SIZE : init_size, alloc) -{ - length_ = 0; - curr_max_size_ = this->max_size (); -} - -template ACE_INLINE -ACE_Vector::~ACE_Vector () -{ -} - -template ACE_INLINE -size_t ACE_Vector::capacity (void) const -{ - return curr_max_size_; -} - -template ACE_INLINE -size_t ACE_Vector::size (void) const -{ - return length_; -} - -template ACE_INLINE -void ACE_Vector::clear (void) -{ - length_ = 0; -} - -template ACE_INLINE -void ACE_Vector::pop_back (void) -{ - if (length_ > 0) - --length_; -} - diff --git a/ace/Version.h b/ace/Version.h deleted file mode 100644 index 55fcc4dde8a..00000000000 --- a/ace/Version.h +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ -// This is an automatically generated file. - -#define ACE_MAJOR_VERSION 5 -#define ACE_MINOR_VERSION 3 -#define ACE_BETA_VERSION 1 -#define ACE_VERSION "5.3.1" diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp deleted file mode 100644 index 3f55ad7a693..00000000000 --- a/ace/WFMO_Reactor.cpp +++ /dev/null @@ -1,2559 +0,0 @@ -// $Id$ - -#include "ace/WFMO_Reactor.h" - -#if defined (ACE_WIN32) - -#include "ace/Handle_Set.h" -#include "ace/Timer_Heap.h" -#include "ace/Thread.h" - -#if !defined (__ACE_INLINE__) -#include "ace/WFMO_Reactor.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(ace, WFMO_Reactor, "$Id$") - -#include "ace/Auto_Ptr.h" - -ACE_WFMO_Reactor_Handler_Repository::ACE_WFMO_Reactor_Handler_Repository (ACE_WFMO_Reactor &wfmo_reactor) - : wfmo_reactor_ (wfmo_reactor) -{ -} - -int -ACE_WFMO_Reactor_Handler_Repository::open (size_t size) -{ - if (size > MAXIMUM_WAIT_OBJECTS) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%d exceeds MAXIMUM_WAIT_OBJECTS (%d)\n"), - size, - MAXIMUM_WAIT_OBJECTS), - -1); - - // Dynamic allocation - ACE_NEW_RETURN (this->current_handles_, - ACE_HANDLE[size], - -1); - ACE_NEW_RETURN (this->current_info_, - Current_Info[size], - -1); - ACE_NEW_RETURN (this->current_suspended_info_, - Suspended_Info[size], - -1); - ACE_NEW_RETURN (this->to_be_added_info_, - To_Be_Added_Info[size], - -1); - - // Initialization - this->max_size_ = size; - this->max_handlep1_ = 0; - this->suspended_handles_ = 0; - this->handles_to_be_added_ = 0; - this->handles_to_be_deleted_ = 0; - this->handles_to_be_suspended_ = 0; - this->handles_to_be_resumed_ = 0; - - for (size_t i = 0; i < size; i++) - this->current_handles_[i] = ACE_INVALID_HANDLE; - - return 0; -} - -ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository (void) -{ - // Free up dynamically allocated space - delete [] this->current_handles_; - delete [] this->current_info_; - delete [] this->current_suspended_info_; - delete [] this->to_be_added_info_; -} - -ACE_Reactor_Mask -ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks, - ACE_Reactor_Mask change_masks, - int operation) -{ - // Find the old reactor masks. This automatically does the work of - // the GET_MASK operation. - - ACE_Reactor_Mask old_masks = ACE_Event_Handler::NULL_MASK; - - if (ACE_BIT_ENABLED (existing_masks, FD_READ) - || ACE_BIT_ENABLED (existing_masks, FD_CLOSE)) - ACE_SET_BITS (old_masks, ACE_Event_Handler::READ_MASK); - - if (ACE_BIT_ENABLED (existing_masks, FD_WRITE)) - ACE_SET_BITS (old_masks, ACE_Event_Handler::WRITE_MASK); - - if (ACE_BIT_ENABLED (existing_masks, FD_OOB)) - ACE_SET_BITS (old_masks, ACE_Event_Handler::EXCEPT_MASK); - - if (ACE_BIT_ENABLED (existing_masks, FD_ACCEPT)) - ACE_SET_BITS (old_masks, ACE_Event_Handler::ACCEPT_MASK); - - if (ACE_BIT_ENABLED (existing_masks, FD_CONNECT)) - ACE_SET_BITS (old_masks, ACE_Event_Handler::CONNECT_MASK); - - if (ACE_BIT_ENABLED (existing_masks, FD_QOS)) - ACE_SET_BITS (old_masks, ACE_Event_Handler::QOS_MASK); - - if (ACE_BIT_ENABLED (existing_masks, FD_GROUP_QOS)) - ACE_SET_BITS (old_masks, ACE_Event_Handler::GROUP_QOS_MASK); - - switch (operation) - { - case ACE_Reactor::CLR_MASK: - // For the CLR_MASK operation, clear only the specific masks. - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::READ_MASK)) - { - ACE_CLR_BITS (existing_masks, FD_READ); - ACE_CLR_BITS (existing_masks, FD_CLOSE); - } - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::WRITE_MASK)) - ACE_CLR_BITS (existing_masks, FD_WRITE); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::EXCEPT_MASK)) - ACE_CLR_BITS (existing_masks, FD_OOB); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::ACCEPT_MASK)) - ACE_CLR_BITS (existing_masks, FD_ACCEPT); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::CONNECT_MASK)) - ACE_CLR_BITS (existing_masks, FD_CONNECT); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::QOS_MASK)) - ACE_CLR_BITS (existing_masks, FD_QOS); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::GROUP_QOS_MASK)) - ACE_CLR_BITS (existing_masks, FD_GROUP_QOS); - - break; - - case ACE_Reactor::SET_MASK: - // If the operation is a set, first reset any existing masks - - existing_masks = 0; - /* FALLTHRU */ - - case ACE_Reactor::ADD_MASK: - // For the ADD_MASK and the SET_MASK operation, add only the - // specific masks. - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::READ_MASK)) - { - ACE_SET_BITS (existing_masks, FD_READ); - ACE_SET_BITS (existing_masks, FD_CLOSE); - } - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::WRITE_MASK)) - ACE_SET_BITS (existing_masks, FD_WRITE); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::EXCEPT_MASK)) - ACE_SET_BITS (existing_masks, FD_OOB); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::ACCEPT_MASK)) - ACE_SET_BITS (existing_masks, FD_ACCEPT); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::CONNECT_MASK)) - ACE_SET_BITS (existing_masks, FD_CONNECT); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::QOS_MASK)) - ACE_SET_BITS (existing_masks, FD_QOS); - - if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::GROUP_QOS_MASK)) - ACE_SET_BITS (existing_masks, FD_GROUP_QOS); - - break; - - case ACE_Reactor::GET_MASK: - - // The work for this operation is done in all cases at the - // begining of the function. - - ACE_UNUSED_ARG (change_masks); - - break; - } - - return old_masks; -} - -int -ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int &changes_required) -{ - int error = 0; - - // Remember this value; only if it changes do we need to wakeup - // the other threads - size_t original_handle_count = this->handles_to_be_deleted_; - int result = 0; - size_t i; - - // Go through all the handles looking for . Even if we find - // it, we continue through the rest of the list since could - // appear multiple times. All handles are checked. - - // First check the current entries - for (i = 0; i < this->max_handlep1_ && error == 0; i++) - // Since the handle can either be the event or the I/O handle, - // we have to check both - if ((this->current_handles_[i] == handle - || this->current_info_[i].io_handle_ == handle) - && // Make sure that it is not already marked for deleted - !this->current_info_[i].delete_entry_) - { - result = this->remove_handler_i (i, - mask); - if (result == -1) - error = 1; - } - - // Then check the suspended entries - for (i = 0; i < this->suspended_handles_ && error == 0; i++) - // Since the handle can either be the event or the I/O handle, we - // have to check both - if ((this->current_suspended_info_[i].io_handle_ == handle - || this->current_suspended_info_[i].event_handle_ == handle) - && - // Make sure that it is not already marked for deleted - !this->current_suspended_info_[i].delete_entry_) - { - result = this->remove_suspended_handler_i (i, - mask); - if (result == -1) - error = 1; - } - - // Then check the to_be_added entries - for (i = 0; i < this->handles_to_be_added_ && error == 0; i++) - // Since the handle can either be the event or the I/O handle, - // we have to check both - if ((this->to_be_added_info_[i].io_handle_ == handle - || this->to_be_added_info_[i].event_handle_ == handle) - && - // Make sure that it is not already marked for deleted - !this->to_be_added_info_[i].delete_entry_) - { - result = this->remove_to_be_added_handler_i (i, - mask); - if (result == -1) - error = 1; - } - - // Only if the number of handlers to be deleted changes do we need - // to wakeup the other threads - if (original_handle_count < this->handles_to_be_deleted_) - changes_required = 1; - - return error ? -1 : 0; -} - -int -ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t slot, - ACE_Reactor_Mask to_be_removed_masks) -{ - // I/O entries - if (this->current_info_[slot].io_entry_) - { - // See if there are other events that the is - // interested in - this->bit_ops (this->current_info_[slot].network_events_, - to_be_removed_masks, - ACE_Reactor::CLR_MASK); - - // Disassociate/Reassociate the event from/with the I/O handle. - // This will depend on the value of remaining set of network - // events that the is interested in. I don't - // think we can do anything about errors here, so I will not - // check this. - ::WSAEventSelect ((SOCKET) this->current_info_[slot].io_handle_, - this->current_handles_[slot], - this->current_info_[slot].network_events_); - } - // Normal event entries. - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL)) - // Preserve DONT_CALL - to_be_removed_masks = ACE_Event_Handler::DONT_CALL; - else - // Make sure that the is the NULL_MASK - to_be_removed_masks = ACE_Event_Handler::NULL_MASK; - - // If this event was marked for suspension, undo the suspension flag - // and reduce the to be suspended count. - if (this->current_info_[slot].suspend_entry_) - { - // Undo suspension - this->current_info_[slot].suspend_entry_ = 0; - // Decrement the handle count - this->handles_to_be_suspended_--; - } - - // If there are no more events that the is - // interested in, or this is a non-I/O entry, schedule the - // for removal - if (this->current_info_[slot].network_events_ == 0) - { - // Mark to be deleted - this->current_info_[slot].delete_entry_ = 1; - // Remember the mask - this->current_info_[slot].close_masks_ = to_be_removed_masks; - // Increment the handle count - this->handles_to_be_deleted_++; - } - - // Since it is not a complete removal, we'll call handle_close - // for all the masks that were removed. This does not change - // the internal state of the reactor. - // - // Note: this condition only applies to I/O entries - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0) - { - ACE_HANDLE handle = this->current_info_[slot].io_handle_; - this->current_info_[slot].event_handler_->handle_close (handle, - to_be_removed_masks); - } - - return 0; -} - -int -ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t slot, - ACE_Reactor_Mask to_be_removed_masks) -{ - // I/O entries - if (this->current_suspended_info_[slot].io_entry_) - { - // See if there are other events that the is - // interested in - this->bit_ops (this->current_suspended_info_[slot].network_events_, - to_be_removed_masks, - ACE_Reactor::CLR_MASK); - - // Disassociate/Reassociate the event from/with the I/O handle. - // This will depend on the value of remaining set of network - // events that the is interested in. I don't - // think we can do anything about errors here, so I will not - // check this. - ::WSAEventSelect ((SOCKET) this->current_suspended_info_[slot].io_handle_, - this->current_suspended_info_[slot].event_handle_, - this->current_suspended_info_[slot].network_events_); - } - // Normal event entries. - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL)) - // Preserve DONT_CALL - to_be_removed_masks = ACE_Event_Handler::DONT_CALL; - else - // Make sure that the is the NULL_MASK - to_be_removed_masks = ACE_Event_Handler::NULL_MASK; - - // If this event was marked for resumption, undo the resumption flag - // and reduce the to be resumed count. - if (this->current_suspended_info_[slot].resume_entry_) - { - // Undo resumption - this->current_suspended_info_[slot].resume_entry_ = 0; - // Decrement the handle count - this->handles_to_be_resumed_--; - } - - // If there are no more events that the is - // interested in, or this is a non-I/O entry, schedule the - // for removal - if (this->current_suspended_info_[slot].network_events_ == 0) - { - // Mark to be deleted - this->current_suspended_info_[slot].delete_entry_ = 1; - // Remember the mask - this->current_suspended_info_[slot].close_masks_ = to_be_removed_masks; - // Increment the handle count - this->handles_to_be_deleted_++; - } - // Since it is not a complete removal, we'll call handle_close for - // all the masks that were removed. This does not change the - // internal state of the reactor. - // - // Note: this condition only applies to I/O entries - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0) - { - ACE_HANDLE handle = this->current_suspended_info_[slot].io_handle_; - this->current_suspended_info_[slot].event_handler_->handle_close (handle, - to_be_removed_masks); - } - - return 0; -} - -int -ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t slot, - ACE_Reactor_Mask to_be_removed_masks) -{ - // I/O entries - if (this->to_be_added_info_[slot].io_entry_) - { - // See if there are other events that the is - // interested in - this->bit_ops (this->to_be_added_info_[slot].network_events_, - to_be_removed_masks, - ACE_Reactor::CLR_MASK); - - // Disassociate/Reassociate the event from/with the I/O handle. - // This will depend on the value of remaining set of network - // events that the is interested in. I don't - // think we can do anything about errors here, so I will not - // check this. - ::WSAEventSelect ((SOCKET) this->to_be_added_info_[slot].io_handle_, - this->to_be_added_info_[slot].event_handle_, - this->to_be_added_info_[slot].network_events_); - } - // Normal event entries. - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL)) - // Preserve DONT_CALL - to_be_removed_masks = ACE_Event_Handler::DONT_CALL; - else - // Make sure that the is the NULL_MASK - to_be_removed_masks = ACE_Event_Handler::NULL_MASK; - - // If this event was marked for suspension, undo the suspension flag - // and reduce the to be suspended count. - if (this->to_be_added_info_[slot].suspend_entry_) - { - // Undo suspension - this->to_be_added_info_[slot].suspend_entry_ = 0; - // Decrement the handle count - this->handles_to_be_suspended_--; - } - - // If there are no more events that the is - // interested in, or this is a non-I/O entry, schedule the - // for removal - if (this->to_be_added_info_[slot].network_events_ == 0) - { - // Mark to be deleted - this->to_be_added_info_[slot].delete_entry_ = 1; - // Remember the mask - this->to_be_added_info_[slot].close_masks_ = to_be_removed_masks; - // Increment the handle count - this->handles_to_be_deleted_++; - } - // Since it is not a complete removal, we'll call handle_close - // for all the masks that were removed. This does not change - // the internal state of the reactor. - // - // Note: this condition only applies to I/O entries - else if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0) - { - ACE_HANDLE handle = this->to_be_added_info_[slot].io_handle_; - this->to_be_added_info_[slot].event_handler_->handle_close (handle, - to_be_removed_masks); - } - - return 0; -} - -int -ACE_WFMO_Reactor_Handler_Repository::suspend_handler_i (ACE_HANDLE handle, - int &changes_required) -{ - size_t i = 0; - - // Go through all the handles looking for . Even if we find - // it, we continue through the rest of the list since could - // appear multiple times. All handles are checked. - - // Check the current entries first. - for (i = 0; i < this->max_handlep1_; i++) - // Since the handle can either be the event or the I/O handle, - // we have to check both - if ((this->current_handles_[i] == handle || - this->current_info_[i].io_handle_ == handle) && - // Make sure that it is not already marked for suspension - !this->current_info_[i].suspend_entry_) - { - // Mark to be suspended - this->current_info_[i].suspend_entry_ = 1; - // Increment the handle count - this->handles_to_be_suspended_++; - // Changes will be required - changes_required = 1; - } - - // Then check the suspended entries. - for (i = 0; i < this->suspended_handles_; i++) - // Since the handle can either be the event or the I/O handle, - // we have to check both - if ((this->current_suspended_info_[i].event_handle_ == handle || - this->current_suspended_info_[i].io_handle_ == handle) && - // Make sure that the resumption is not already undone - this->current_suspended_info_[i].resume_entry_) - { - // Undo resumption - this->current_suspended_info_[i].resume_entry_ = 0; - // Decrement the handle count - this->handles_to_be_resumed_--; - // Changes will be required - changes_required = 1; - } - - // Then check the to_be_added entries. - for (i = 0; i < this->handles_to_be_added_; i++) - // Since the handle can either be the event or the I/O handle, - // we have to check both - if ((this->to_be_added_info_[i].io_handle_ == handle || - this->to_be_added_info_[i].event_handle_ == handle) && - // Make sure that it is not already marked for suspension - !this->to_be_added_info_[i].suspend_entry_) - { - // Mark to be suspended - this->to_be_added_info_[i].suspend_entry_ = 1; - // Increment the handle count - this->handles_to_be_suspended_++; - // Changes will be required - changes_required = 1; - } - - return 0; -} - -int -ACE_WFMO_Reactor_Handler_Repository::resume_handler_i (ACE_HANDLE handle, - int &changes_required) -{ - size_t i = 0; - - // Go through all the handles looking for . Even if we find - // it, we continue through the rest of the list since could - // appear multiple times. All handles are checked. - - // Check the current entries first. - for (i = 0; i < this->max_handlep1_; i++) - // Since the handle can either be the event or the I/O handle, - // we have to check both - if ((this->current_handles_[i] == handle || - this->current_info_[i].io_handle_ == handle) && - // Make sure that the suspension is not already undone - this->current_info_[i].suspend_entry_) - { - // Undo suspension - this->current_info_[i].suspend_entry_ = 0; - // Decrement the handle count - this->handles_to_be_suspended_--; - // Changes will be required - changes_required = 1; - } - - // Then check the suspended entries. - for (i = 0; i < this->suspended_handles_; i++) - // Since the handle can either be the event or the I/O handle, - // we have to check both - if ((this->current_suspended_info_[i].event_handle_ == handle || - this->current_suspended_info_[i].io_handle_ == handle) && - // Make sure that it is not already marked for resumption - !this->current_suspended_info_[i].resume_entry_) - { - // Mark to be resumed - this->current_suspended_info_[i].resume_entry_ = 1; - // Increment the handle count - this->handles_to_be_resumed_++; - // Changes will be required - changes_required = 1; - } - - // Then check the to_be_added entries. - for (i = 0; i < this->handles_to_be_added_; i++) - // Since the handle can either be the event or the I/O handle, - // we have to check both - if ((this->to_be_added_info_[i].io_handle_ == handle || - this->to_be_added_info_[i].event_handle_ == handle) && - // Make sure that the suspension is not already undone - this->to_be_added_info_[i].suspend_entry_) - { - // Undo suspension - this->to_be_added_info_[i].suspend_entry_ = 0; - // Decrement the handle count - this->handles_to_be_suspended_--; - // Changes will be required - changes_required = 1; - } - - return 0; -} - -void -ACE_WFMO_Reactor_Handler_Repository::unbind_all (void) -{ - { - ACE_GUARD (ACE_Process_Mutex, ace_mon, this->wfmo_reactor_.lock_); - - int dummy; - size_t i; - - // Remove all the current handlers - for (i = 0; i < this->max_handlep1_; i++) - this->unbind_i (this->current_handles_[i], - ACE_Event_Handler::ALL_EVENTS_MASK, - dummy); - - // Remove all the suspended handlers - for (i = 0; i < this->suspended_handles_; i++) - this->unbind_i (this->current_suspended_info_[i].event_handle_, - ACE_Event_Handler::ALL_EVENTS_MASK, - dummy); - - // Remove all the to_be_added handlers - for (i = 0; i < this->handles_to_be_added_; i++) - this->unbind_i (this->to_be_added_info_[i].event_handle_, - ACE_Event_Handler::ALL_EVENTS_MASK, - dummy); - - } - - // The guard is released here - - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wfmo_reactor_.wakeup_all_threads (); -} - -int -ACE_WFMO_Reactor_Handler_Repository::bind_i (int io_entry, - ACE_Event_Handler *event_handler, - long network_events, - ACE_HANDLE io_handle, - ACE_HANDLE event_handle, - int delete_event) -{ - // Make sure that the is valid - if (event_handle == ACE_INVALID_HANDLE) - event_handle = event_handler->get_handle (); - if (this->invalid_handle (event_handle)) - return -1; - - size_t current_size = this->max_handlep1_ + - this->handles_to_be_added_ - - this->handles_to_be_deleted_ + - this->suspended_handles_; - - // Make sure that there's room in the table. - if (current_size < this->max_size_) - { - // Cache this set into the , till we come - // around to actually adding this to the - this->to_be_added_info_[this->handles_to_be_added_].set (event_handle, - io_entry, - event_handler, - io_handle, - network_events, - delete_event); - - this->handles_to_be_added_++; - - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wfmo_reactor_.wakeup_all_threads (); - } - else - { - errno = EMFILE; // File descriptor table is full (better than nothing) - return -1; - } - - return 0; -} - -int -ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void) -{ - // Go through the entire valid array and check for all handles that - // have been schedule for deletion - if (this->handles_to_be_deleted_ > 0 || this->handles_to_be_suspended_ > 0) - { - for (size_t i = 0; i < this->max_handlep1_; i++) - { - // This stuff is necessary here, since we should not make - // the upcall until all the internal data structures have - // been updated. This is to protect against upcalls that - // try to deregister again. - ACE_HANDLE handle = ACE_INVALID_HANDLE; - ACE_Reactor_Mask masks = ACE_Event_Handler::NULL_MASK; - ACE_Event_Handler *event_handler = 0; - - // See if this entry is scheduled for deletion - if (this->current_info_[i].delete_entry_) - { - // Calling the method here will ensure that we - // will only call it once per deregistering . - // This is essential in the case when the will - // do something like delete itself and we have multiple - // threads in WFMO_Reactor. - // - // Make sure that the DONT_CALL mask is not set - masks = this->current_info_[i].close_masks_; - if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0) - { - // Grab the correct handle depending on the type entry - if (this->current_info_[i].io_entry_) - handle = this->current_info_[i].io_handle_; - else - handle = this->current_handles_[i]; - - // Event handler - event_handler = this->current_info_[i].event_handler_; - } - - // If created the event, we need to clean it up - if (this->current_info_[i].delete_event_) - ACE_OS::event_destroy (&this->current_handles_[i]); - - // Reduce count by one - this->handles_to_be_deleted_--; - } - - // See if this entry is scheduled for suspension - else if (this->current_info_[i].suspend_entry_) - { - this->current_suspended_info_ [this->suspended_handles_].set (this->current_handles_[i], - this->current_info_[i]); - // Increase number of suspended handles - this->suspended_handles_++; - - // Reduce count by one - this->handles_to_be_suspended_--; - } - - // See if this entry is scheduled for deletion or suspension - // If so we need to clean up - if (this->current_info_[i].delete_entry_ || - this->current_info_[i].suspend_entry_ ) - { - size_t last_valid_slot = this->max_handlep1_ - 1; - // If this is the last handle in the set, no need to swap - // places. Simply remove it. - if (i < last_valid_slot) - // Swap this handle with the last valid handle - { - // Struct copy - this->current_info_[i] = - this->current_info_[last_valid_slot]; - this->current_handles_[i] = - this->current_handles_[last_valid_slot]; - } - // Reset the info in this slot - this->current_info_[last_valid_slot].reset (); - this->current_handles_[last_valid_slot] = ACE_INVALID_HANDLE; - this->max_handlep1_--; - } - - // Now that all internal structures have been updated, make - // the upcall. - if (event_handler != 0) - event_handler->handle_close (handle, masks); - } - } - - return 0; -} - -int -ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void) -{ - // Go through the array - if (this->handles_to_be_deleted_ > 0 || this->handles_to_be_resumed_ > 0) - { - for (size_t i = 0; i < this->suspended_handles_; i++) - { - // This stuff is necessary here, since we should not make - // the upcall until all the internal data structures have - // been updated. This is to protect against upcalls that - // try to deregister again. - ACE_HANDLE handle = ACE_INVALID_HANDLE; - ACE_Reactor_Mask masks = ACE_Event_Handler::NULL_MASK; - ACE_Event_Handler *event_handler = 0; - - // See if this entry is scheduled for deletion - if (this->current_suspended_info_[i].delete_entry_) - { - // Calling the method here will ensure that we - // will only call it once per deregistering . - // This is essential in the case when the will - // do something like delete itself and we have multiple - // threads in WFMO_Reactor. - // - // Make sure that the DONT_CALL mask is not set - masks = this->current_suspended_info_[i].close_masks_; - if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0) - { - // Grab the correct handle depending on the type entry - if (this->current_suspended_info_[i].io_entry_) - handle = this->current_suspended_info_[i].io_handle_; - else - handle = this->current_suspended_info_[i].event_handle_; - - // Upcall - event_handler = this->current_suspended_info_[i].event_handler_; - } - - // If created the event, we need to clean it up - if (this->current_suspended_info_[i].delete_event_) - ACE_OS::event_destroy (&this->current_suspended_info_[i].event_handle_); - - // Reduce count by one - this->handles_to_be_deleted_--; - } - - else if (this->current_suspended_info_[i].resume_entry_) - { - // Add to the end of the current handles set - this->current_handles_[this->max_handlep1_] = this->current_suspended_info_[i].event_handle_; - // Struct copy - this->current_info_[this->max_handlep1_].set (this->current_suspended_info_[i]); - this->max_handlep1_++; - - // Reduce count by one - this->handles_to_be_resumed_--; - } - - // If an entry needs to be removed, either because it - // was deleted or resumed, remove it now before doing - // the upcall. - if (this->current_suspended_info_[i].resume_entry_ || - this->current_suspended_info_[i].delete_entry_) - { - size_t last_valid_slot = this->suspended_handles_ - 1; - // Net effect is that we're removing an entry and - // compressing the list from the end. So, if removing - // an entry from the middle, copy the last valid one to the - // removed slot. Reset the end and decrement the number - // of suspended handles. - if (i < last_valid_slot) - // Struct copy - this->current_suspended_info_[i] = - this->current_suspended_info_[last_valid_slot]; - this->current_suspended_info_[last_valid_slot].reset (); - this->suspended_handles_--; - } - - // Now that all internal structures have been updated, make - // the upcall. - if (event_handler != 0) - event_handler->handle_close (handle, masks); - } - } - - return 0; -} - -int -ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos (void) -{ - // Go through the arrays - for (size_t i = 0; i < this->handles_to_be_added_; i++) - { - // This stuff is necessary here, since we should not make - // the upcall until all the internal data structures have - // been updated. This is to protect against upcalls that - // try to deregister again. - ACE_HANDLE handle = ACE_INVALID_HANDLE; - ACE_Reactor_Mask masks = ACE_Event_Handler::NULL_MASK; - ACE_Event_Handler *event_handler = 0; - - // See if this entry is scheduled for deletion - if (this->to_be_added_info_[i].delete_entry_) - { - // Calling the method here will ensure that we - // will only call it once per deregistering . - // This is essential in the case when the will - // do something like delete itself and we have multiple - // threads in WFMO_Reactor. - // - // Make sure that the DONT_CALL mask is not set - masks = this->to_be_added_info_[i].close_masks_; - if (ACE_BIT_ENABLED (masks, ACE_Event_Handler::DONT_CALL) == 0) - { - // Grab the correct handle depending on the type entry - if (this->to_be_added_info_[i].io_entry_) - handle = this->to_be_added_info_[i].io_handle_; - else - handle = this->to_be_added_info_[i].event_handle_; - - // Upcall - event_handler = this->to_be_added_info_[i].event_handler_; - } - - // If created the event, we need to clean it up - if (this->to_be_added_info_[i].delete_event_) - ACE_OS::event_destroy (&this->to_be_added_info_[i].event_handle_); - - // Reduce count by one - this->handles_to_be_deleted_--; - } - - // See if this entry is scheduled for suspension - else if (this->to_be_added_info_[i].suspend_entry_) - { - this->current_suspended_info_ [this->suspended_handles_].set (this->to_be_added_info_[i].event_handle_, - this->to_be_added_info_[i]); - // Increase number of suspended handles - this->suspended_handles_++; - - // Reduce count by one - this->handles_to_be_suspended_--; - } - - // If neither of the two flags are on, add to current - else - { - // Add to the end of the current handles set - this->current_handles_[this->max_handlep1_] = this->to_be_added_info_[i].event_handle_; - // Struct copy - this->current_info_[this->max_handlep1_].set (this->to_be_added_info_[i]); - this->max_handlep1_++; - } - - // Reset the - this->to_be_added_info_[i].reset (); - - // Now that all internal structures have been updated, make the - // upcall. - if (event_handler != 0) - event_handler->handle_close (handle, masks); - } - - // Since all to be added handles have been taken care of, reset the - // counter - this->handles_to_be_added_ = 0; - - return 0; -} - -void -ACE_WFMO_Reactor_Handler_Repository::dump (void) const -{ - size_t i = 0; - - ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Max size = %d\n"), - this->max_size_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Current info table\n\n"))); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tSize = %d\n"), - this->max_handlep1_)); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tHandles to be suspended = %d\n"), - this->handles_to_be_suspended_)); - - for (i = 0; i < this->max_handlep1_; i++) - this->current_info_[i].dump (this->current_handles_[i]); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\n"))); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("To-be-added info table\n\n"))); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tSize = %d\n"), - this->handles_to_be_added_)); - - for (i = 0; i < this->handles_to_be_added_; i++) - this->to_be_added_info_[i].dump (); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\n"))); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Suspended info table\n\n"))); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tSize = %d\n"), - this->suspended_handles_)); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tHandles to be resumed = %d\n"), - this->handles_to_be_resumed_)); - - for (i = 0; i < this->suspended_handles_; i++) - this->current_suspended_info_[i].dump (); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\n"))); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Total handles to be deleted = %d\n"), - this->handles_to_be_deleted_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_END_DUMP)); -} - -/************************************************************/ - -int -ACE_WFMO_Reactor::work_pending (const ACE_Time_Value &) -{ - ACE_NOTSUP_RETURN (-1); -} - -ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - ACE_Reactor_Notify *notify) - : signal_handler_ (0), - delete_signal_handler_ (0), - timer_queue_ (0), - delete_timer_queue_ (0), - delete_handler_rep_ (0), - delete_notify_handler_ (0), - lock_adapter_ (lock_), - handler_rep_ (*this), - // this event is initially signaled - ok_to_wait_ (1), - // this event is initially unsignaled - wakeup_all_threads_ (0), - // this event is initially unsignaled - waiting_to_change_state_ (0), - active_threads_ (0), - owner_ (ACE_Thread::self ()), - new_owner_ (0), - change_state_thread_ (0), - open_for_business_ (0), - deactivated_ (0) -{ - if (this->open (ACE_WFMO_Reactor::DEFAULT_SIZE, 0, sh, tq, 0, notify) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WFMO_Reactor"))); -} - -ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, - int unused, - ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - ACE_Reactor_Notify *notify) - : signal_handler_ (0), - delete_signal_handler_ (0), - timer_queue_ (0), - delete_timer_queue_ (0), - delete_handler_rep_ (0), - delete_notify_handler_ (0), - lock_adapter_ (lock_), - handler_rep_ (*this), - // this event is initially signaled - ok_to_wait_ (1), - // this event is initially unsignaled - wakeup_all_threads_ (0), - // this event is initially unsignaled - waiting_to_change_state_ (0), - active_threads_ (0), - owner_ (ACE_Thread::self ()), - new_owner_ (0), - change_state_thread_ (0), - open_for_business_ (0), - deactivated_ (0) -{ - ACE_UNUSED_ARG (unused); - - if (this->open (size, 0, sh, tq, 0, notify) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WFMO_Reactor"))); -} - -int -ACE_WFMO_Reactor::current_info (ACE_HANDLE, size_t &) -{ - return -1; -} - -int -ACE_WFMO_Reactor::open (size_t size, - int unused, - ACE_Sig_Handler *sh, - ACE_Timer_Queue *tq, - int disable_notify_pipe, - ACE_Reactor_Notify *notify) -{ - ACE_UNUSED_ARG (unused); - ACE_UNUSED_ARG (disable_notify_pipe); - - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - // If we are already open, return -1 - if (this->open_for_business_) - return -1; - - // Timer Queue - if (this->delete_timer_queue_) - delete this->timer_queue_; - - if (tq == 0) - { - ACE_NEW_RETURN (this->timer_queue_, - ACE_Timer_Heap, - -1); - this->delete_timer_queue_ = 1; - } - else - { - this->timer_queue_ = tq; - this->delete_timer_queue_ = 0; - } - - // Signal Handler - if (this->delete_signal_handler_) - delete this->signal_handler_; - - if (sh == 0) - { - ACE_NEW_RETURN (this->signal_handler_, - ACE_Sig_Handler, - -1); - this->delete_signal_handler_ = 1; - } - else - { - this->signal_handler_ = sh; - this->delete_signal_handler_ = 0; - } - - // Setup the atomic wait array (used later in ) - this->atomic_wait_array_[0] = this->lock_.lock ().proc_mutex_; - this->atomic_wait_array_[1] = this->ok_to_wait_.handle (); - - // This is to guard against reopens of WFMO_Reactor - if (this->delete_handler_rep_) - this->handler_rep_.~ACE_WFMO_Reactor_Handler_Repository (); - - // Open the handle repository. Two additional handles for internal - // purposes - if (this->handler_rep_.open (size + 2) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("opening handler repository")), - -1); - else - this->delete_handler_rep_ = 1; - - this->notify_handler_ = notify; - - if (this->notify_handler_ == 0) - { - ACE_NEW_RETURN (this->notify_handler_, - ACE_WFMO_Reactor_Notify, - -1); - - if (this->notify_handler_ == 0) - return -1; - else - this->delete_notify_handler_ = 1; - } - - /* NOTE */ - // The order of the following two registrations is very important - - // Open the notification handler - if (this->notify_handler_->open (this, this->timer_queue_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("opening notify handler ")), - -1); - - // Register for event - if (this->register_handler (&this->wakeup_all_threads_handler_, - this->wakeup_all_threads_.handle ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("registering thread wakeup handler")), - -1); - - // Since we have added two handles into the handler repository, - // update the - if (this->handler_rep_.changes_required ()) - { - // Make necessary changes to the handler repository - this->handler_rep_.make_changes (); - // Turn off since all necessary changes - // have completed - this->wakeup_all_threads_.reset (); - } - - // We are open for business - this->open_for_business_ = 1; - - return 0; -} - -int -ACE_WFMO_Reactor::set_sig_handler (ACE_Sig_Handler *signal_handler) -{ - if (this->signal_handler_ != 0 && this->delete_signal_handler_ != 0) - delete this->signal_handler_; - this->signal_handler_ = signal_handler; - this->delete_signal_handler_ = 0; - return 0; -} - -ACE_Timer_Queue * -ACE_WFMO_Reactor::timer_queue (void) const -{ - return this->timer_queue_; -} - -int -ACE_WFMO_Reactor::timer_queue (ACE_Timer_Queue *tq) -{ - if (this->timer_queue_ != 0 && this->delete_timer_queue_ != 0) - delete this->timer_queue_; - this->timer_queue_ = tq; - this->delete_timer_queue_ = 0; - return 0; -} - -int -ACE_WFMO_Reactor::set_timer_queue (ACE_Timer_Queue *tq) -{ - return this->timer_queue (tq); -} - -int -ACE_WFMO_Reactor::close (void) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - // If we are already closed, return error - if (!this->open_for_business_) - return -1; - - // We are now closed - this->open_for_business_ = 0; - // This will unregister all handles - this->handler_rep_.close (); - - return 0; -} - -ACE_WFMO_Reactor::~ACE_WFMO_Reactor (void) -{ - // Assumption: No threads are left in the Reactor when this method - // is called (i.e., active_threads_ == 0) - - // Close down - this->close (); - - // Make necessary changes to the handler repository that we caused - // by . - this->handler_rep_.make_changes (); - - if (this->delete_timer_queue_) - { - delete this->timer_queue_; - this->timer_queue_ = 0; - this->delete_timer_queue_ = 0; - } - - if (this->delete_signal_handler_) - { - delete this->signal_handler_; - this->signal_handler_ = 0; - this->delete_signal_handler_ = 0; - } - - if (this->delete_notify_handler_) - { - delete this->notify_handler_; - this->notify_handler_ = 0; - this->delete_notify_handler_ = 0; - } -} - -int -ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask new_masks) -{ - // If this is a Winsock 1 system, the underlying event assignment will - // not work, so don't try. Winsock 1 must use ACE_Select_Reactor for - // reacting to socket activity. -#if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) - ACE_UNUSED_ARG (event_handle); - ACE_UNUSED_ARG (io_handle); - ACE_UNUSED_ARG (event_handler); - ACE_UNUSED_ARG (new_masks); - ACE_NOTSUP_RETURN (-1); -#else - - // Make sure that the is valid - if (io_handle == ACE_INVALID_HANDLE) - io_handle = event_handler->get_handle (); - - if (this->handler_rep_.invalid_handle (io_handle)) - { - errno = ERROR_INVALID_HANDLE; - return -1; - } - - long new_network_events = 0; - int delete_event = 0; - auto_ptr event; - - // Look up the repository to see if the is already - // there. - ACE_Reactor_Mask old_masks; - int found = this->handler_rep_.modify_network_events_i (io_handle, - new_masks, - old_masks, - new_network_events, - event_handle, - delete_event, - ACE_Reactor::ADD_MASK); - - // Check to see if the user passed us a valid event; If not then we - // need to create one - if (event_handle == ACE_INVALID_HANDLE) - { - // Note: don't change this since some C++ compilers have - // s that don't work properly... - auto_ptr tmp (new ACE_Auto_Event); - event = tmp; - event_handle = event->handle (); - delete_event = 1; - } - - int result = ::WSAEventSelect ((SOCKET) io_handle, - event_handle, - new_network_events); - // If we had found the there is nothing more to do - if (found) - return result; - else if (result != SOCKET_ERROR && - this->handler_rep_.bind_i (1, - event_handler, - new_network_events, - io_handle, - event_handle, - delete_event) != -1) - { - // The was not found in the repository, add to - // the repository. - if (delete_event) - { - // Clear out the handle in the ACE_Auto_Event so that when - // it is destroyed, the handle isn't closed out from under - // the reactor. After setting it, running down the event - // (via auto_ptr<> event, above) at function return will - // cause an error because it'll try to close an invalid handle. - // To avoid that smashing the errno value, save the errno - // here, explicitly remove the event so the dtor won't do it - // again, then restore errno. - ACE_Errno_Guard guard (errno); - event->handle (ACE_INVALID_HANDLE); - event->remove (); - } - return 0; - } - else - return -1; -#endif /* ACE_HAS_PHARLAP */ -} - -int -ACE_WFMO_Reactor::mask_ops_i (ACE_HANDLE io_handle, - ACE_Reactor_Mask new_masks, - int operation) -{ - // Make sure that the is valid - if (this->handler_rep_.invalid_handle (io_handle)) - return -1; - - long new_network_events = 0; - int delete_event = 0; - ACE_HANDLE event_handle = ACE_INVALID_HANDLE; - - // Look up the repository to see if the is already - // there. - ACE_Reactor_Mask old_masks; - int found = this->handler_rep_.modify_network_events_i (io_handle, - new_masks, - old_masks, - new_network_events, - event_handle, - delete_event, - operation); - if (found) - { - int result = ::WSAEventSelect ((SOCKET) io_handle, - event_handle, - new_network_events); - if (result == 0) - return old_masks; - else - return result; - } - else - return -1; -} - - - -int -ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_handle, - ACE_Reactor_Mask new_masks, - ACE_Reactor_Mask &old_masks, - long &new_network_events, - ACE_HANDLE &event_handle, - int &delete_event, - int operation) -{ - long *modified_network_events = &new_network_events; - int found = 0; - size_t i; - - // First go through the current entries - // - // Look for all entries in the current handles for matching handle - // (except those that have been scheduled for deletion) - for (i = 0; i < this->max_handlep1_ && !found; i++) - if (io_handle == this->current_info_[i].io_handle_ && - !this->current_info_[i].delete_entry_) - { - found = 1; - modified_network_events = &this->current_info_[i].network_events_; - delete_event = this->current_info_[i].delete_event_; - event_handle = this->current_handles_[i]; - } - - // Then pass through the suspended handles - // - // Look for all entries in the suspended handles for matching handle - // (except those that have been scheduled for deletion) - for (i = 0; i < this->suspended_handles_ && !found; i++) - if (io_handle == this->current_suspended_info_[i].io_handle_ && - !this->current_suspended_info_[i].delete_entry_) - { - found = 1; - modified_network_events = &this->current_suspended_info_[i].network_events_; - delete_event = this->current_suspended_info_[i].delete_event_; - event_handle = this->current_suspended_info_[i].event_handle_; - } - - // Then check the to_be_added handles - // - // Look for all entries in the to_be_added handles for matching - // handle (except those that have been scheduled for deletion) - for (i = 0; i < this->handles_to_be_added_ && !found; i++) - if (io_handle == this->to_be_added_info_[i].io_handle_ && - !this->to_be_added_info_[i].delete_entry_) - { - found = 1; - modified_network_events = &this->to_be_added_info_[i].network_events_; - delete_event = this->to_be_added_info_[i].delete_event_; - event_handle = this->to_be_added_info_[i].event_handle_; - } - - old_masks = this->bit_ops (*modified_network_events, - new_masks, - operation); - - new_network_events = *modified_network_events; - - return found; -} - -int -ACE_WFMO_Reactor_Handler_Repository::handler (ACE_HANDLE handle, - ACE_Reactor_Mask user_masks, - ACE_Event_Handler **user_event_handler) -{ - int found = 0; - size_t i = 0; - ACE_Event_Handler *event_handler = 0; - long existing_masks = 0; - - // Look for the handle first - - // First go through the current entries - // - // Look for all entries in the current handles for matching handle - // (except those that have been scheduled for deletion) - for (i = 0; i < this->max_handlep1_ && !found; i++) - if ((handle == this->current_info_[i].io_handle_ || - handle == this->current_handles_[i]) && - !this->current_info_[i].delete_entry_) - { - found = 1; - event_handler = this->current_info_[i].event_handler_; - existing_masks = this->current_info_[i].network_events_; - } - - // Then pass through the suspended handles - // - // Look for all entries in the suspended handles for matching handle - // (except those that have been scheduled for deletion) - for (i = 0; i < this->suspended_handles_ && !found; i++) - if ((handle == this->current_suspended_info_[i].io_handle_ || - handle == this->current_suspended_info_[i].event_handle_) && - !this->current_suspended_info_[i].delete_entry_) - { - found = 1; - event_handler = this->current_suspended_info_[i].event_handler_; - existing_masks = this->current_suspended_info_[i].network_events_; - } - - // Then check the to_be_added handles - // - // Look for all entries in the to_be_added handles for matching - // handle (except those that have been scheduled for deletion) - for (i = 0; i < this->handles_to_be_added_ && !found; i++) - if ((handle == this->to_be_added_info_[i].io_handle_ || - handle == this->to_be_added_info_[i].event_handle_) && - !this->to_be_added_info_[i].delete_entry_) - { - found = 1; - event_handler = this->to_be_added_info_[i].event_handler_; - existing_masks = this->to_be_added_info_[i].network_events_; - } - - // If the handle is not found, return failure. - if (!found) - return -1; - - // Otherwise, make sure that the masks that the user is looking for - // are on. - if (found && - ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::READ_MASK)) - if (!ACE_BIT_ENABLED (existing_masks, FD_READ) - && !ACE_BIT_ENABLED (existing_masks, FD_CLOSE)) - found = 0; - - if (found && - ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::WRITE_MASK)) - if (!ACE_BIT_ENABLED (existing_masks, FD_WRITE)) - found = 0; - - if (found && - ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::EXCEPT_MASK)) - if (!ACE_BIT_ENABLED (existing_masks, FD_OOB)) - found = 0; - - if (found && - ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::ACCEPT_MASK)) - if (!ACE_BIT_ENABLED (existing_masks, FD_ACCEPT)) - found = 0; - - if (found && - ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::CONNECT_MASK)) - if (!ACE_BIT_ENABLED (existing_masks, FD_CONNECT)) - found = 0; - - if (found && - ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::QOS_MASK)) - if (!ACE_BIT_ENABLED (existing_masks, FD_QOS)) - found = 0; - - if (found && - ACE_BIT_ENABLED (user_masks, ACE_Event_Handler::GROUP_QOS_MASK)) - if (!ACE_BIT_ENABLED (existing_masks, FD_GROUP_QOS)) - found = 0; - - if (found && - user_event_handler) - *user_event_handler = event_handler; - - if (found) - return 0; - else - return -1; -} - -// Waits for and dispatches all events. Returns -1 on error, 0 if -// max_wait_time expired, or the number of events that were dispatched. -int -ACE_WFMO_Reactor::event_handling (ACE_Time_Value *max_wait_time, - int alertable) -{ - ACE_TRACE ("ACE_WFMO_Reactor::event_handling"); - - // Make sure we are not closed - if (!this->open_for_business_ || this->deactivated_) - return -1; - - // Stash the current time -- the destructor of this object will - // automatically compute how much time elapsed since this method was - // called. - ACE_Countdown_Time countdown (max_wait_time); - - int result; - do - { - // Check to see if it is ok to enter ::WaitForMultipleObjects - // This will acquire lock_> on success On failure, the - // lock will not be acquired - result = this->ok_to_wait (max_wait_time, alertable); - if (result != 1) - return result; - - // Increment the number of active threads - this->active_threads_++; - - // Release the - this->lock_.release (); - - // Update the countdown to reflect time waiting to play with the - // mut and event. - countdown.update (); - - // Calculate timeout - int timeout = this->calculate_timeout (max_wait_time); - - // Wait for event to happen - DWORD wait_status = this->wait_for_multiple_events (timeout, - alertable); - - // Upcall - result = this->safe_dispatch (wait_status); - if (0 == result) - { - // wait_for_multiple_events timed out without dispatching - // anything. Because of rounding and conversion errors and - // such, it could be that the wait loop timed out, but - // the timer queue said it wasn't quite ready to expire a - // timer. In this case, max_wait_time won't have quite been - // reduced to 0, and we need to go around again. If max_wait_time - // is all the way to 0, just return, as the entire time the - // caller wanted to wait has been used up. - countdown.update (); // Reflect time waiting for events - if (0 == max_wait_time || max_wait_time->usec () == 0) - break; - } - } - while (result == 0); - - return result; -} - -int -ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, - int alertable) -{ - // Calculate the max time we should spend here - // - // Note: There is really no need to involve the here - // because even if a timeout in the does expire we - // will not be able to dispatch it - int timeout = max_wait_time == 0 ? INFINITE : max_wait_time->msec (); - - // Atomically wait for both the and event - DWORD result = 0; - while (1) - { -#if defined (ACE_HAS_PHARLAP) - // PharLap doesn't implement WaitForMultipleObjectsEx, and doesn't - // do async I/O, so it's not needed in this case anyway. - result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), - this->atomic_wait_array_, - TRUE, - timeout); - - if (result != WAIT_IO_COMPLETION) - break; - -#elif defined (ACE_HAS_WINCE) - result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), - this->atomic_wait_array_, - TRUE, - timeout); - break; // CE does not have WAIT_IO_COMPLETION defined. -#else - result = ::WaitForMultipleObjectsEx (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), - this->atomic_wait_array_, - TRUE, - timeout, - alertable); - - if (result != WAIT_IO_COMPLETION) - break; - -#endif /* ACE_HAS_PHARLAP */ - } - - switch (result) - { - case WAIT_TIMEOUT: - errno = ETIME; - return 0; - case WAIT_FAILED: - case WAIT_ABANDONED_0: - ACE_OS::set_errno_to_last_error (); - return -1; - default: - break; - } - - // It is ok to enter ::WaitForMultipleObjects - return 1; -} - -DWORD -ACE_WFMO_Reactor::wait_for_multiple_events (int timeout, - int alertable) -{ - // Wait for any of handles_ to be active, or until timeout expires. - // If is enabled allow asynchronous completion of - // ReadFile and WriteFile operations. - -#if defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) - // PharLap doesn't do async I/O and doesn't implement - // WaitForMultipleObjectsEx, so use WaitForMultipleObjects. - ACE_UNUSED_ARG (alertable); - return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 (), - this->handler_rep_.handles (), - FALSE, - timeout); -#else - return ::WaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (), - this->handler_rep_.handles (), - FALSE, - timeout, - alertable); -#endif /* ACE_HAS_PHARLAP */ -} - -DWORD -ACE_WFMO_Reactor::poll_remaining_handles (DWORD slot) -{ - return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 () - slot, - this->handler_rep_.handles () + slot, - FALSE, - 0); -} - -int -ACE_WFMO_Reactor::calculate_timeout (ACE_Time_Value *max_wait_time) -{ - ACE_Time_Value *time = 0; - if (this->owner_ == ACE_Thread::self ()) - time = this->timer_queue_->calculate_timeout (max_wait_time); - else - time = max_wait_time; - - if (time == 0) - return INFINITE; - else - return time->msec (); -} - - -int -ACE_WFMO_Reactor::expire_timers (void) -{ - // If "owner" thread - if (ACE_Thread::self () == this->owner_) - // expire all pending timers. - return this->timer_queue_->expire (); - - else - // Nothing to expire - return 0; -} - -int -ACE_WFMO_Reactor::dispatch (DWORD wait_status) -{ - int handlers_dispatched = 0; - - // Expire timers - handlers_dispatched += this->expire_timers (); - - switch (wait_status) - { - case WAIT_FAILED: // Failure. - ACE_OS::set_errno_to_last_error (); - return -1; - - case WAIT_TIMEOUT: // Timeout. - errno = ETIME; - return handlers_dispatched; - -#ifndef ACE_HAS_WINCE - case WAIT_IO_COMPLETION: // APC. - return handlers_dispatched; -#endif // ACE_HAS_WINCE - - default: // Dispatch. - // We'll let dispatch worry about abandoned mutes. - handlers_dispatched += this->dispatch_handles (wait_status); - return handlers_dispatched; - } -} - -// Dispatches any active handles from to -// , polling through our handle set looking -// for active handles. -int -ACE_WFMO_Reactor::dispatch_handles (DWORD wait_status) -{ - // dispatch_slot is the absolute slot. Only += is used to - // increment it. - DWORD dispatch_slot = 0; - - // Cache this value, this is the absolute value. - DWORD max_handlep1 = this->handler_rep_.max_handlep1 (); - - // nCount starts off at , this is a transient count of - // handles last waited on. - DWORD nCount = max_handlep1; - - for (int number_of_handlers_dispatched = 1; - ; - number_of_handlers_dispatched++) - { - int ok = ( -#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530)) \ - && !defined (ghs) \ - && !defined (__MINGW32__) - // wait_status is unsigned in Borland, Green Hills - // and mingw32; - // This >= is always true, with a warning. - wait_status >= WAIT_OBJECT_0 && -#endif - wait_status <= (WAIT_OBJECT_0 + nCount)); - if (ok) - dispatch_slot += wait_status - WAIT_OBJECT_0; - else - // Otherwise, a handle was abandoned. - dispatch_slot += wait_status - WAIT_ABANDONED_0; - - // Dispatch handler - if (this->dispatch_handler (dispatch_slot, max_handlep1) == -1) - return -1; - - // Increment slot - dispatch_slot++; - - // We're done. - if (dispatch_slot >= max_handlep1) - return number_of_handlers_dispatched; - - // Readjust nCount - nCount = max_handlep1 - dispatch_slot; - - // Check the remaining handles - wait_status = this->poll_remaining_handles (dispatch_slot); - switch (wait_status) - { - case WAIT_FAILED: // Failure. - ACE_OS::set_errno_to_last_error (); - /* FALLTHRU */ - case WAIT_TIMEOUT: - // There are no more handles ready, we can return. - return number_of_handlers_dispatched; - } - } -} - -int -ACE_WFMO_Reactor::dispatch_handler (DWORD slot, - DWORD max_handlep1) -{ - // Check if there are window messages that need to be dispatched - if (slot == max_handlep1) - return this->dispatch_window_messages (); - - // Dispatch the handler if it has not been scheduled for deletion. - // Note that this is a very week test if there are multiple threads - // dispatching this slot as no locks are held here. Generally, you - // do not want to do something like deleting the this pointer in - // handle_close() if you have registered multiple times and there is - // more than one thread in WFMO_Reactor->handle_events(). - else if (!this->handler_rep_.scheduled_for_deletion (slot)) - { - ACE_HANDLE event_handle = *(this->handler_rep_.handles () + slot); - - if (this->handler_rep_.current_info ()[slot].io_entry_) - return this->complex_dispatch_handler (slot, - event_handle); - else - return this->simple_dispatch_handler (slot, - event_handle); - } - else - // The handle was scheduled for deletion, so we will skip it. - return 0; -} - -int -ACE_WFMO_Reactor::simple_dispatch_handler (DWORD slot, - ACE_HANDLE event_handle) -{ - // This dispatch is used for non-I/O entires - - // Assign the ``signaled'' HANDLE so that callers can get it. - // siginfo_t is an ACE - specific fabrication. Constructor exists. - siginfo_t sig (event_handle); - - ACE_Event_Handler *eh = - this->handler_rep_.current_info ()[slot].event_handler_; - - // Upcall - if (eh->handle_signal (0, &sig) == -1) - this->handler_rep_.unbind (event_handle, - ACE_Event_Handler::NULL_MASK); - - return 0; -} - -int -ACE_WFMO_Reactor::complex_dispatch_handler (DWORD slot, - ACE_HANDLE event_handle) -{ - // This dispatch is used for I/O entires. - - ACE_WFMO_Reactor_Handler_Repository::Current_Info ¤t_info = - this->handler_rep_.current_info ()[slot]; - - WSANETWORKEVENTS events; - ACE_Reactor_Mask problems = ACE_Event_Handler::NULL_MASK; - if (::WSAEnumNetworkEvents ((SOCKET) current_info.io_handle_, - event_handle, - &events) == SOCKET_ERROR) - problems = ACE_Event_Handler::ALL_EVENTS_MASK; - else - { - // Prepare for upcalls. Clear the bits from representing - // events the handler is not interested in. If there are any left, - // do the upcall(s). upcall will replace events.lNetworkEvents - // with bits representing any functions that requested a repeat - // callback before checking handles again. In this case, continue - // to call back unless the handler is unregistered as a result of - // one of the upcalls. The way this is written, the upcalls will - // keep being done even if one or more upcalls reported problems. - // In practice this may turn out not so good, but let's see. If any - // problems, please notify Steve Huston - // before or after you change this code. - events.lNetworkEvents &= current_info.network_events_; - while (events.lNetworkEvents != 0) - { - // Upcall - problems |= this->upcall (current_info.event_handler_, - current_info.io_handle_, - events); - if (this->handler_rep_.scheduled_for_deletion (slot)) - break; - } - } - - if (problems != ACE_Event_Handler::NULL_MASK - && !this->handler_rep_.scheduled_for_deletion (slot) ) - this->handler_rep_.unbind (event_handle, problems); - - return 0; -} - -ACE_Reactor_Mask -ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - WSANETWORKEVENTS &events) -{ - // This method figures out what exactly has happened to the socket - // and then calls appropriate methods. - ACE_Reactor_Mask problems = ACE_Event_Handler::NULL_MASK; - - // Go through the events and do the indicated upcalls. If the handler - // doesn't want to be called back, clear the bit for that event. - // At the end, set the bits back to to request a repeat call. - - long actual_events = events.lNetworkEvents; - int action; - - if (ACE_BIT_ENABLED (actual_events, FD_WRITE)) - { - action = event_handler->handle_output (io_handle); - if (action <= 0) - { - ACE_CLR_BITS (actual_events, FD_WRITE); - if (action == -1) - ACE_SET_BITS (problems, ACE_Event_Handler::WRITE_MASK); - } - } - - if (ACE_BIT_ENABLED (actual_events, FD_CONNECT)) - { - if (events.iErrorCode[FD_CONNECT_BIT] == 0) - { - // Successful connect - action = event_handler->handle_output (io_handle); - if (action <= 0) - { - ACE_CLR_BITS (actual_events, FD_CONNECT); - if (action == -1) - ACE_SET_BITS (problems, - ACE_Event_Handler::CONNECT_MASK); - } - } - // Unsuccessful connect - else - { - action = event_handler->handle_input (io_handle); - if (action <= 0) - { - ACE_CLR_BITS (actual_events, FD_CONNECT); - if (action == -1) - ACE_SET_BITS (problems, - ACE_Event_Handler::CONNECT_MASK); - } - } - } - - if (ACE_BIT_ENABLED (actual_events, FD_OOB)) - { - action = event_handler->handle_exception (io_handle); - if (action <= 0) - { - ACE_CLR_BITS (actual_events, FD_OOB); - if (action == -1) - ACE_SET_BITS (problems, ACE_Event_Handler::EXCEPT_MASK); - } - } - - if (ACE_BIT_ENABLED (actual_events, FD_READ)) - { - action = event_handler->handle_input (io_handle); - if (action <= 0) - { - ACE_CLR_BITS (actual_events, FD_READ); - if (action == -1) - ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK); - } - } - - if (ACE_BIT_ENABLED (actual_events, FD_CLOSE) - && ACE_BIT_DISABLED (problems, ACE_Event_Handler::READ_MASK)) - { - action = event_handler->handle_input (io_handle); - if (action <= 0) - { - ACE_CLR_BITS (actual_events, FD_CLOSE); - if (action == -1) - ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK); - } - } - - if (ACE_BIT_ENABLED (actual_events, FD_ACCEPT)) - { - action = event_handler->handle_input (io_handle); - if (action <= 0) - { - ACE_CLR_BITS (actual_events, FD_ACCEPT); - if (action == -1) - ACE_SET_BITS (problems, ACE_Event_Handler::ACCEPT_MASK); - } - } - - if (ACE_BIT_ENABLED (actual_events, FD_QOS)) - { - action = event_handler->handle_qos (io_handle); - if (action <= 0) - { - ACE_CLR_BITS (actual_events, FD_QOS); - if (action == -1) - ACE_SET_BITS (problems, ACE_Event_Handler::QOS_MASK); - } - } - - if (ACE_BIT_ENABLED (actual_events, FD_GROUP_QOS)) - { - action = event_handler->handle_group_qos (io_handle); - if (action <= 0) - { - ACE_CLR_BITS (actual_events, FD_GROUP_QOS); - if (action == -1) - ACE_SET_BITS (problems, ACE_Event_Handler::GROUP_QOS_MASK); - } - } - - events.lNetworkEvents = actual_events; - return problems; -} - - -int -ACE_WFMO_Reactor::update_state (void) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1); - - // Decrement active threads - this->active_threads_--; - - // Check if the state of the handler repository has changed or new - // owner has to be set - if (this->handler_rep_.changes_required () || this->new_owner ()) - { - if (this->change_state_thread_ == 0) - // Try to become the thread which will be responsible for the - // changes - { - this->change_state_thread_ = ACE_Thread::self (); - // Make sure no new threads are allowed to enter - this->ok_to_wait_.reset (); - - if (this->active_threads_ > 0) - // Check for other active threads - { - // Wake up all other threads - this->wakeup_all_threads_.signal (); - // Release - monitor.release (); - // Go to sleep waiting for all other threads to get done - this->waiting_to_change_state_.wait (); - // Re-acquire again - monitor.acquire (); - } - - // Note that make_changes() calls into user code which can - // request other changes. So keep looping until all - // requested changes are completed. - while (this->handler_rep_.changes_required ()) - // Make necessary changes to the handler repository - this->handler_rep_.make_changes (); - if (this->new_owner ()) - // Update the owner - this->change_owner (); - // Turn off - this->wakeup_all_threads_.reset (); - // Let everyone know that it is ok to go ahead - this->ok_to_wait_.signal (); - // Reset this flag - this->change_state_thread_ = 0; - } - else if (this->active_threads_ == 0) - // This thread did not get a chance to become the change - // thread. If it is the last one out, it will wakeup the - // change thread - this->waiting_to_change_state_.signal (); - } - // This is if we were woken up explicitily by the user and there are - // no state changes required. - else if (this->active_threads_ == 0) - // Turn off - this->wakeup_all_threads_.reset (); - - return 0; -} - -void -ACE_WFMO_Reactor::dump (void) const -{ - ACE_TRACE ("ACE_WFMO_Reactor::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Count of currently active threads = %d\n"), - this->active_threads_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ID of owner thread = %d\n"), - this->owner_)); - - this->handler_rep_.dump (); - this->signal_handler_->dump (); - this->timer_queue_->dump (); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -int -ACE_WFMO_Reactor_Notify::dispatch_notifications (int & /*number_of_active_handles*/, - ACE_Handle_Set & /*rd_mask*/) -{ - return -1; -} - -int -ACE_WFMO_Reactor_Notify::is_dispatchable (ACE_Notification_Buffer & /*buffer*/) -{ - return 0; -} - -ACE_HANDLE -ACE_WFMO_Reactor_Notify::notify_handle (void) -{ - return ACE_INVALID_HANDLE; -} - -int -ACE_WFMO_Reactor_Notify::read_notify_pipe (ACE_HANDLE , - ACE_Notification_Buffer &) -{ - return 0; -} - -int -ACE_WFMO_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &) -{ - return 0; -} - -int -ACE_WFMO_Reactor_Notify::close (void) -{ - return -1; -} - -ACE_WFMO_Reactor_Notify::ACE_WFMO_Reactor_Notify (size_t max_notifies) - : timer_queue_ (0), - message_queue_ (max_notifies * sizeof (ACE_Notification_Buffer), - max_notifies * sizeof (ACE_Notification_Buffer)), - max_notify_iterations_ (-1) -{ -} - -int -ACE_WFMO_Reactor_Notify::open (ACE_Reactor_Impl *wfmo_reactor, - ACE_Timer_Queue *timer_queue, - int ignore_notify) -{ - ACE_UNUSED_ARG (ignore_notify); - timer_queue_ = timer_queue; - return wfmo_reactor->register_handler (this); -} - -ACE_HANDLE -ACE_WFMO_Reactor_Notify::get_handle (void) const -{ - return this->wakeup_one_thread_.handle (); -} - -// Handle all pending notifications. - -int -ACE_WFMO_Reactor_Notify::handle_signal (int signum, - siginfo_t *siginfo, - ucontext_t *) -{ - ACE_UNUSED_ARG (signum); - - // Just check for sanity... - if (siginfo->si_handle_ != this->wakeup_one_thread_.handle ()) - return -1; - - // This will get called when wakeup_one_thread_> event - // is signaled. - // ACE_DEBUG ((LM_DEBUG, - // ACE_LIB_TEXT ("(%t) waking up to handle internal notifications\n"))); - - for (int i = 1; ; i++) - { - ACE_Message_Block *mb = 0; - // Copy ACE_Time_Value::zero since dequeue_head will modify it. - ACE_Time_Value zero_timeout (ACE_Time_Value::zero); - if (this->message_queue_.dequeue_head (mb, &zero_timeout) == -1) - { - if (errno == EWOULDBLOCK) - // We've reached the end of the processing, return - // normally. - return 0; - else - return -1; // Something weird happened... - } - else - { - ACE_Notification_Buffer *buffer = - (ACE_Notification_Buffer *) mb->base (); - - // If eh == 0 then we've got major problems! Otherwise, we - // need to dispatch the appropriate handle_* method on the - // ACE_Event_Handler pointer we've been passed. - - if (buffer->eh_ != 0) - { - int result = 0; - - switch (buffer->mask_) - { - case ACE_Event_Handler::READ_MASK: - case ACE_Event_Handler::ACCEPT_MASK: - result = buffer->eh_->handle_input (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::WRITE_MASK: - result = buffer->eh_->handle_output (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::EXCEPT_MASK: - result = buffer->eh_->handle_exception (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::QOS_MASK: - result = buffer->eh_->handle_qos (ACE_INVALID_HANDLE); - break; - case ACE_Event_Handler::GROUP_QOS_MASK: - result = buffer->eh_->handle_group_qos (ACE_INVALID_HANDLE); - break; - default: - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("invalid mask = %d\n"), - buffer->mask_)); - break; - } - if (result == -1) - buffer->eh_->handle_close (ACE_INVALID_HANDLE, - ACE_Event_Handler::EXCEPT_MASK); - } - - // Make sure to delete the memory regardless of success or - // failure! - mb->release (); - - // Bail out if we've reached the . - // Note that by default is -1, so - // we'll loop until we're done. - if (i == this->max_notify_iterations_) - { - // If there are still notification in the queue, we need - // to wake up again - if (!this->message_queue_.is_empty ()) - this->wakeup_one_thread_.signal (); - - // Break the loop as we have reached max_notify_iterations_ - return 0; - } - } - } -} - -// Notify the WFMO_Reactor, potentially enqueueing the -// for subsequent processing in the WFMO_Reactor -// thread of control. - -int -ACE_WFMO_Reactor_Notify::notify (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask, - ACE_Time_Value *timeout) -{ - if (eh != 0) - { - ACE_Message_Block *mb = 0; - ACE_NEW_RETURN (mb, - ACE_Message_Block (sizeof (ACE_Notification_Buffer)), - -1); - - ACE_Notification_Buffer *buffer = - (ACE_Notification_Buffer *) mb->base (); - buffer->eh_ = eh; - buffer->mask_ = mask; - - // Convert from relative time to absolute time by adding the - // current time of day. This is what - // expects. - if (timeout != 0) - *timeout += timer_queue_->gettimeofday (); - - if (this->message_queue_.enqueue_tail - (mb, timeout) == -1) - { - mb->release (); - return -1; - } - } - - return this->wakeup_one_thread_.signal (); -} - -void -ACE_WFMO_Reactor_Notify::max_notify_iterations (int iterations) -{ - ACE_TRACE ("ACE_WFMO_Reactor_Notify::max_notify_iterations"); - // Must always be > 0 or < 0 to optimize the loop exit condition. - if (iterations == 0) - iterations = 1; - - this->max_notify_iterations_ = iterations; -} - -int -ACE_WFMO_Reactor_Notify::max_notify_iterations (void) -{ - ACE_TRACE ("ACE_WFMO_Reactor_Notify::max_notify_iterations"); - return this->max_notify_iterations_; -} - -int -ACE_WFMO_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_WFMO_Reactor_Notify::purge_pending_notifications"); - - // Go over message queue and take out all the matching event - // handlers. If eh == 0, purge all. Note that reactor notifies (no - // handler specified) are never purged, as this may lose a needed - // notify the reactor queued for itself. - - if (this->message_queue_.is_empty ()) - return 0; - - // Guard against new and/or delivered notifications while purging. - // WARNING!!! The use of the notification queue's lock object for - // this guard makes use of the knowledge that on Win32, the mutex - // protecting the queue is really a CriticalSection, which is - // recursive. This is how we can get away with locking it down here - // and still calling member functions on the queue object. - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->message_queue_.lock(), -1); - - // first, copy all to our own local queue. Since we've locked everyone out - // of here, there's no need to use any synchronization on this queue. - ACE_Message_Queue local_queue; - - size_t queue_size = this->message_queue_.message_count (); - int number_purged = 0; - - size_t index; - - for (index = 0; index < queue_size; ++index) - { - ACE_Message_Block *mb; - if (-1 == this->message_queue_.dequeue_head (mb)) - return -1; // This shouldn't happen... - - ACE_Notification_Buffer *buffer = - ACE_reinterpret_cast (ACE_Notification_Buffer *, mb->base ()); - - // If this is not a Reactor notify (it is for a particular handler), - // and it matches the specified handler (or purging all), - // and applying the mask would totally eliminate the notification, then - // release it and count the number purged. - if ((0 != buffer->eh_) && - (0 == eh || eh == buffer->eh_) && - ACE_BIT_DISABLED (buffer->mask_, ~mask)) // the existing notification mask - // is left with nothing when - // applying the mask - { - mb->release (); - ++number_purged; - } - else - { - // To preserve it, move it to the local_queue. But first, if - // this is not a Reactor notify (it is for a - // particularhandler), and it matches the specified handler - // (or purging all), then apply the mask - if ((0 != buffer->eh_) && - (0 == eh || eh == buffer->eh_)) - ACE_CLR_BITS(buffer->mask_, mask); - if (-1 == local_queue.enqueue_head (mb)) - return -1; - } - } - - if (this->message_queue_.message_count ()) - { // Should be empty! - ACE_ASSERT (0); - return -1; - } - - // Now copy back from the local queue to the class queue, taking - // care to preserve the original order... - queue_size = local_queue.message_count (); - for (index = 0; index < queue_size; ++index) - { - ACE_Message_Block *mb; - if (-1 == local_queue.dequeue_head (mb)) - { - ACE_ASSERT (0); - return -1; - } - - if (-1 == this->message_queue_.enqueue_head (mb)) - { - ACE_ASSERT (0); - return -1; - } - } - - return number_purged; -} - -void -ACE_WFMO_Reactor_Notify::dump (void) const -{ - ACE_TRACE ("ACE_WFMO_Reactor_Notify::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - this->timer_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Max. iteration: %d\n"), - this->max_notify_iterations_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -void -ACE_WFMO_Reactor::max_notify_iterations (int iterations) -{ - ACE_TRACE ("ACE_WFMO_Reactor::max_notify_iterations"); - ACE_GUARD (ACE_Process_Mutex, monitor, this->lock_); - - // Must always be > 0 or < 0 to optimize the loop exit condition. - this->notify_handler_->max_notify_iterations (iterations); -} - -int -ACE_WFMO_Reactor::max_notify_iterations (void) -{ - ACE_TRACE ("ACE_WFMO_Reactor::max_notify_iterations"); - ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1); - - return this->notify_handler_->max_notify_iterations (); -} - -int -ACE_WFMO_Reactor::purge_pending_notifications (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_WFMO_Reactor::purge_pending_notifications"); - if (this->notify_handler_ == 0) - return 0; - else - return this->notify_handler_->purge_pending_notifications (eh, mask); -} - -int -ACE_WFMO_Reactor::resumable_handler (void) -{ - ACE_TRACE ("ACE_WFMO_Reactor::resumable_handler"); - return 0; -} - - -// No-op WinSOCK2 methods to help WFMO_Reactor compile -#if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) -int -WSAEventSelect (SOCKET s, - WSAEVENT hEventObject, - long lNetworkEvents) -{ - ACE_UNUSED_ARG (s); - ACE_UNUSED_ARG (hEventObject); - ACE_UNUSED_ARG (lNetworkEvents); - - return -1; -} - -int -WSAEnumNetworkEvents (SOCKET s, - WSAEVENT hEventObject, - LPWSANETWORKEVENTS lpNetworkEvents) -{ - ACE_UNUSED_ARG (s); - ACE_UNUSED_ARG (hEventObject); - ACE_UNUSED_ARG (lpNetworkEvents); - - return -1; -} -#endif /* !defined ACE_HAS_WINSOCK2 */ - -#endif /* ACE_WIN32 */ diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h deleted file mode 100644 index e8c81546c09..00000000000 --- a/ace/WFMO_Reactor.h +++ /dev/null @@ -1,1334 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file WFMO_Reactor.h - * - * $Id$ - * - * @author Irfan Pyarali - * @author Tim Harrison - * @author and Doug Schmidt - */ -//============================================================================= - -#ifndef ACE_WFMO_REACTOR_H -#define ACE_WFMO_REACTOR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_WIN32) - -#include "ace/Signal.h" -#include "ace/Timer_Queue.h" -#include "ace/Event_Handler.h" -#include "ace/Synch.h" -#include "ace/Reactor_Impl.h" -#include "ace/Message_Queue.h" -#include "ace/Process_Mutex.h" - -// If we don't have WinSOCK2, we need these defined -#if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) -/* - * WinSock 2 extension -- bit values and indices for FD_XXX network events - */ -#define FD_READ_BIT 0 -#define FD_WRITE_BIT 1 -#define FD_OOB_BIT 2 -#define FD_ACCEPT_BIT 3 -#define FD_CONNECT_BIT 4 -#define FD_CLOSE_BIT 5 -#define FD_QOS_BIT 6 -#define FD_GROUP_QOS_BIT 7 - -#define FD_QOS (1 << FD_QOS_BIT) -#define FD_GROUP_QOS (1 << FD_GROUP_QOS_BIT) - -#define FD_MAX_EVENTS 8 -#define FD_ALL_EVENTS ((1 << FD_MAX_EVENTS) - 1) - -#define WSAEVENT HANDLE - -typedef struct _WSANETWORKEVENTS -{ - long lNetworkEvents; - int iErrorCode[FD_MAX_EVENTS]; -} WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS; - -int WSAEventSelect (SOCKET s, - WSAEVENT hEventObject, - long lNetworkEvents); - -int WSAEnumNetworkEvents (SOCKET s, - WSAEVENT hEventObject, - LPWSANETWORKEVENTS lpNetworkEvents); - -#endif /* !defined ACE_HAS_WINSOCK2 */ - -// Forward decl. -class ACE_WFMO_Reactor; -class ACE_Handle_Set; - -/** - * @class ACE_Wakeup_All_Threads_Handler - * - * @brief This is a helper class whose sole purpose is to handle events - * on wakeup_all_threads_> - */ -class ACE_Export ACE_Wakeup_All_Threads_Handler : public ACE_Event_Handler -{ -public: - /// Called when the wakeup_all_threads_> - virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); -}; - -/** - * @class ACE_WFMO_Reactor_Handler_Repository - * - * @brief Used to map s onto the appropriate - * * and other information. - */ -class ACE_Export ACE_WFMO_Reactor_Handler_Repository -{ -public: - friend class ACE_WFMO_Reactor; - friend class ACE_WFMO_Reactor_Test; - - /** - * @class Common_Info - * - * @brief This struct contains the necessary information for every - * entry. The reason the event is not in this - * structure is because we need to pass an event array into - * WaitForMultipleObjects and therefore keeping the events - * seperate makes sense. - */ - class Common_Info - { - public: - /// This indicates whether this entry is for I/O or for a regular - /// event - int io_entry_; - - /// The assosiated - ACE_Event_Handler *event_handler_; - - /// The I/O handle related to the . This entry is - /// only valid if the flag is true. - ACE_HANDLE io_handle_; - - /** - * This is the set of events that the is - * interested in. This entry is only valid if the flag - * is true. - */ - long network_events_; - - /** - * This flag indicates that created the event on - * behalf of the user. Therefore we need to clean this up when the - * removes itself from . This entry - * is only valid if the flag is true. - */ - int delete_event_; - - /// This is set when the entry needed to be deleted. - int delete_entry_; - - /** - * These are the masks related to for the - * . This is only valid when is - * set. - */ - ACE_Reactor_Mask close_masks_; - - /// Constructor used for initializing the structure - Common_Info (void); - - /// Reset the state of the structure - void reset (void); - - /// Set the structure to these new values - void set (int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry, - ACE_Reactor_Mask close_masks); - - /// Set the structure to these new values - void set (Common_Info &common_info); - - /// Dump the state of an object. - void dump (void) const; - }; - - /** - * @class Current_Info - * - * @brief This structure inherits from the common structure to add - * information for current entries. - */ - class Current_Info : public Common_Info - { - public: - /// This is set when the entry needed to be suspended. - int suspend_entry_; - - /// Default constructor - Current_Info (void); - - /// Reset the state of the structure - void reset (void); - - /// Set the structure to these new values - void set (int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry = 0, - ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK, - int suspend_entry = 0); - - /// Set the structure to these new values - void set (Common_Info &common_info, - int suspend_entry = 0); - - /// Dump the state of an object. - void dump (ACE_HANDLE event_handle) const; - }; - - /** - * @class To_Be_Added_Info - * - * @brief This structure inherits from the common structure to add - * information for entries. - */ - class To_Be_Added_Info : public Common_Info - { - public: - /// Handle for the event - ACE_HANDLE event_handle_; - - /// This is set when the entry needed to be suspended. - int suspend_entry_; - - /// Default constructor - To_Be_Added_Info (void); - - /// Reset the state of the structure - void reset (void); - - /// Set the structure to these new values - void set (ACE_HANDLE event_handle, - int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry = 0, - ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK, - int suspend_entry = 0); - - /// Set the structure to these new values - void set (ACE_HANDLE event_handle, - Common_Info &common_info, - int suspend_entry = 0); - - /// Dump the state of an object. - void dump (void) const; - }; - - /** - * @class Suspended_Info - * - * @brief This structure inherits from the common structure to add - * information for suspended entries. - */ - class Suspended_Info : public Common_Info - { - public: - /// Handle for the event - ACE_HANDLE event_handle_; - - /// This is set when the entry needed to be resumed. - int resume_entry_; - - /// Constructor used for initializing the structure - Suspended_Info (void); - - /// Reset the state of the structure - void reset (void); - - /// Set the structure to these new values - void set (ACE_HANDLE event_handle, - int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry = 0, - ACE_Reactor_Mask close_masks = 0, - int resume_entry = 0); - - /// Set the structure to these new values - void set (ACE_HANDLE event_handle, - Common_Info &common_info, - int resume_entry = 0); - - /// Dump the state of an object. - void dump (void) const; - }; - - /// Constructor. - ACE_WFMO_Reactor_Handler_Repository (ACE_WFMO_Reactor &wfmo_reactor); - - /// Destructor. - virtual ~ACE_WFMO_Reactor_Handler_Repository (void); - - /// Initialize the repository of the approriate . - int open (size_t size); - - /// Close down the handler repository. - int close (void); - - // = Search structure operations. - - /// Bind the to the . This is for - /// the simple event entry. - int bind (ACE_HANDLE, ACE_Event_Handler *); - - /// Insert I/O entry into the system. This method - /// assumes that the lock are head *before* this method is invoked. - int bind_i (int io_entry, - ACE_Event_Handler *event_handler, - long network_events, - ACE_HANDLE io_handle, - ACE_HANDLE event_handle, - int delete_event); - - /// Remove the binding of in accordance with the . - int unbind (ACE_HANDLE, - ACE_Reactor_Mask mask); - - /// Non-lock-grabbing version of - int unbind_i (ACE_HANDLE, - ACE_Reactor_Mask mask, - int &changes_required); - - /// Remove all bindings of tuples. - void unbind_all (void); - - // = Sanity checking. - - // Check the to make sure it's a valid ACE_HANDLE - int invalid_handle (ACE_HANDLE handle) const; - - // = Accessors. - /// Maximum ACE_HANDLE value, plus 1. - DWORD max_handlep1 (void) const; - - /// Pointer to the beginning of the current array of - /// *'s. - ACE_HANDLE *handles (void) const; - - /// Pointer to the beginning of the current array of - /// *'s. - Current_Info *current_info (void) const; - - /// Check if changes to the handle set are required. - virtual int changes_required (void); - - /// Make changes to the handle set - virtual int make_changes (void); - - /// Check to see if has been scheduled for deletion - int scheduled_for_deletion (size_t slot) const; - - /** - * This method is used to calculate the network mask after a mask_op - * request to . Note that because the - * may already be in the handler repository, we may have to find the - * old event and the old network events - */ - int modify_network_events_i (ACE_HANDLE io_handle, - ACE_Reactor_Mask new_masks, - ACE_Reactor_Mask &old_masks, - long &new_network_events, - ACE_HANDLE &event_handle, - int &delete_event, - int operation); - - /// This method is used to change the network mask left (if any) - /// after a remove request to - ACE_Reactor_Mask bit_ops (long &existing_masks, - ACE_Reactor_Mask to_be_removed_masks, - int operation); - - /// Temporarily suspend entry - int suspend_handler_i (ACE_HANDLE handle, - int &changes_required); - - /// Resume suspended entry - int resume_handler_i (ACE_HANDLE handle, - int &changes_required); - - /// Deletions and suspensions in current_info_ - int make_changes_in_current_infos (void); - - /// Deletions and resumptions in current_suspended_info_ - int make_changes_in_suspension_infos (void); - - /// Deletions in to_be_added_info_, or transfers to current_info_ or - /// current_suspended_info_ from to_be_added_info_ - int make_changes_in_to_be_added_infos (void); - - /// Removes the at from the table. - int remove_handler_i (size_t slot, - ACE_Reactor_Mask mask); - - /// Removes the at from the table. - int remove_suspended_handler_i (size_t slot, - ACE_Reactor_Mask mask); - - /// Removes the at from the table. - int remove_to_be_added_handler_i (size_t slot, - ACE_Reactor_Mask to_be_removed_masks); - - /** - * Check to see if is associated with a valid Event_Handler - * bound to . Return the associated with this - * if != 0. - */ - int handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler = 0); - - /// Dump the state of an object. - void dump (void) const; - -protected: - /// Reference to our . - ACE_WFMO_Reactor &wfmo_reactor_; - - /// Maximum number of handles. - size_t max_size_; - - /** - * Array of passed to . This - * is not part of the structure as the handle array needs to be - * passed directly to . - */ - ACE_HANDLE *current_handles_; - - /// Array of current entries in the table - Current_Info *current_info_; - - /// A count of the number of active handles. - DWORD max_handlep1_; - - /// Information for entries to be added - To_Be_Added_Info *to_be_added_info_; - - /// Number of records to be added - size_t handles_to_be_added_; - - /// Currently suspended handles - Suspended_Info *current_suspended_info_; - - /// Number of currently suspended handles - size_t suspended_handles_; - - /// Number of records to be suspended - size_t handles_to_be_suspended_; - - /// Number of records to be resumed - size_t handles_to_be_resumed_; - - /// Number of records to be deleted - size_t handles_to_be_deleted_; - -}; - -/** - * @class ACE_WFMO_Reactor_Notify - * - * @brief Unblock the from its event loop, passing - * it an optional to dispatch. - * - * This implementation is necessary for cases where the - * is run in a multi-threaded program. In - * this case, we need to be able to unblock - * when updates occur other than in the - * main thread. To do this, we signal an - * auto-reset event the is listening on. If - * an and is passed to - * , the appropriate method is dispatched. - */ -class ACE_Export ACE_WFMO_Reactor_Notify : public ACE_Reactor_Notify -{ -public: - /// Constructor - ACE_WFMO_Reactor_Notify (size_t max_notifies = 1024); - - /// Initialization. is stored to call . - virtual int open (ACE_Reactor_Impl *wfmo_reactor, - ACE_Timer_Queue *timer_queue, - int disable_notify = 0); - - /// No-op. - virtual int close (void); - - /** - * Special trick to unblock when updates - * occur. All we do is enqueue and onto the - * and wakeup the by signaling - * its handle. The indicates how long - * to blocking trying to notify the . If == - * 0, the caller will block until action is possible, else will wait - * until the relative time specified in elapses). - */ - virtual int notify (ACE_Event_Handler *event_handler = 0, - ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value *timeout = 0); - - /// No-op. - virtual int dispatch_notifications (int &number_of_active_handles, - ACE_Handle_Set &rd_mask); - - /// Returns a handle to the . - virtual ACE_HANDLE get_handle (void) const; - - /// Returns the ACE_HANDLE of the notify pipe on which the reactor - /// is listening for notifications so that other threads can unblock - /// the - virtual ACE_HANDLE notify_handle (void); - - /// Handle one of the notify call on the . This could be - /// because of a thread trying to unblock the - virtual int dispatch_notify (ACE_Notification_Buffer &buffer); - - /// Verify whether the buffer has dispatchable info or not. - virtual int is_dispatchable (ACE_Notification_Buffer &buffer); - - /// Read one of the notify call on the into the - /// . This could be because of a thread trying to unblock - /// the - virtual int read_notify_pipe (ACE_HANDLE handle, - ACE_Notification_Buffer &buffer); - - /** - * Set the maximum number of times that the - * method will iterate and - * dispatch the that are passed in via the - * notify queue before breaking out of its - * loop. By default, this is set to - * -1, which means "iterate until the queue is empty." Setting this - * to a value like "1 or 2" will increase "fairness" (and thus - * prevent starvation) at the expense of slightly higher dispatching - * overhead. - */ - void max_notify_iterations (int); - - /** - * Get the maximum number of times that the - * method will iterate and - * dispatch the that are passed in via the - * notify queue before breaking out of its - * loop. - */ - int max_notify_iterations (void); - - /** - * Purge any notifications pending in this reactor for the specified - * object. If == 0, all notifications for all - * handlers are removed (but not any notifications posted just to wake up - * the reactor itself). Returns the number of notifications purged. - * Returns -1 on error. - */ - virtual int purge_pending_notifications (ACE_Event_Handler *, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - - /// Dump the state of an object. - virtual void dump (void) const; - -private: - /// Pointer to the wfmo_reactor's timer queue. - ACE_Timer_Queue *timer_queue_; - - /** - * Called when the notification event waited on by - * is signaled. This dequeues all pending - * and dispatches them. - */ - virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); - - /// An auto event is used so that we can it to wakeup one - /// thread up (e.g., when the method is called). - ACE_Auto_Event wakeup_one_thread_; - - /// Message queue that keeps track of pending . - /// This queue must be thread-safe because it can be called by - /// multiple threads of control. - ACE_Message_Queue message_queue_; - - /** - * Keeps track of the maximum number of times that the - * method will iterate and - * dispatch the that are passed in via the - * notify queue before breaking out of its - * loop. By default, this is set to - * -1, which means "iterate until the queue is empty." - */ - int max_notify_iterations_; -}; - -/** - * @class ACE_WFMO_Reactor - * - * @brief An object oriented event demultiplexor and event handler. - * ACE_WFMO_Reactor is a Windows-only implementation of the ACE_Reactor - * interface that uses the WaitForMultipleObjects() event demultiplexer. - * - * Like the other ACE Reactors, ACE_WFMO_Reactor can schedule timers. - * It also reacts to signalable handles, such as events (see the documentation - * for WaitForMultipleObjects() for a complete list of signalable handle - * types). Therefore, I/O handles are not directly usable for registering - * for input, output, and exception notification. The exception to this - * is ACE_SOCK-based handles, which can be registered for input, output, and - * exception notification just as with other platforms. See Chapter 4 in - * C++NPv2 for complete details. - * - * Note that changes to the state of ACE_WFMO_Reactor are not - * instantaneous. Most changes (registration, removal, - * suspension, and resumption of handles, and changes in - * ownership) are made when the ACE_WFMO_Reactor reaches a stable - * state. Users should be careful, especially when removing - * handlers. This is because the ACE_WFMO_Reactor will call - * handle_close() on the handler when it is finally removed and - * not when remove_handler() is called. If the registered handler's pointer - * is not valid when ACE_WFMO_Reactor calls ACE_Event_Handler::handle_close(), - * use the DONT_CALL flag with remove_handler(). Preferably, use dynamically - * allocated event handlers and call "delete this" inside the handle_close() - * hook method. - */ -class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl -{ -public: - friend class ACE_WFMO_Reactor_Handler_Repository; - friend class ACE_WFMO_Reactor_Test; - - enum - { - /// Default size of the WFMO_Reactor's handle table. - /** - * Two slots will be added to the @a size parameter in the - * constructor and open methods which will store handles used for - * internal management purposes. - */ - DEFAULT_SIZE = MAXIMUM_WAIT_OBJECTS - 2 - }; - - // = Initialization and termination methods. - - /// Initialize ACE_WFMO_Reactor with the default size. - ACE_WFMO_Reactor (ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - ACE_Reactor_Notify * = 0); - - /** - * Initialize ACE_WFMO_Reactor with the specified size. - * - * @param size The maximum number of handles the reactor can - * register. The value should not exceed - * ACE_WFMO_Reactor::DEFAULT_SIZE. Two slots will be - * added to the @a size parameter which will store handles - * used for internal management purposes. - */ - ACE_WFMO_Reactor (size_t size, - int unused = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - ACE_Reactor_Notify * = 0); - - /** - * Initialize ACE_WFMO_Reactor with the specified size. - * - * @param size The maximum number of handles the reactor can - * register. The value should not exceed - * ACE_WFMO_Reactor::DEFAULT_SIZE. Two slots will be - * added to the @a size parameter which will store handles - * used for internal management purposes. - */ - virtual int open (size_t size = ACE_WFMO_Reactor::DEFAULT_SIZE, - int restart = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, - int disable_notify_pipe = 0, - ACE_Reactor_Notify * = 0); - - /// Returns -1 (not used in this implementation); - virtual int current_info (ACE_HANDLE, size_t & /* size */); - - /// Use a user specified signal handler instead. - virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); - - /// @deprecated The following method is deprecated. - /// Instead, either specify a timer queue when creating/opening the - /// object or use the timer_queue() method. - virtual int set_timer_queue (ACE_Timer_Queue *tq); - - /// Set a user-specified timer queue. - virtual int timer_queue (ACE_Timer_Queue *tq); - - /// Return the current ACE_Timer_Queue. - virtual ACE_Timer_Queue *timer_queue (void) const; - - /// Close down the ACE_WFMO_Reactor and release all of its resources. - virtual int close (void); - - /// Close down the ACE_WFMO_Reactor and release all of its resources. - virtual ~ACE_WFMO_Reactor (void); - - // = Event loop drivers. - - /** - * This method is not currently implemented. We recommend that you - * use handle_events (ACE_Time_Value::zero) to get basically the - * same effect, i.e., it won't block the caller if there are no events. - */ - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); - - /** - * This event loop driver blocks for up to before - * returning. It will return earlier if timer events, I/O events, - * or signal events occur. Note that can be 0, in - * which case this method blocks indefinitely until events occur. - * - * is decremented to reflect how much time this call - * took. For instance, if a time value of 3 seconds is passed to - * handle_events and an event occurs after 2 seconds, - * will equal 1 second. This can be used if an - * application wishes to handle events for some fixed amount of - * time. - * - * is used as the demultiplexing call - * - * Returns the total number of I/O and timer s - * that were dispatched, 0 if the elapsed without - * dispatching any handlers, or -1 if an error occurs. - * - * The only difference between and - * is that in the alertable case, TRUE is passed to - * for the option. - */ - virtual int handle_events (ACE_Time_Value *max_wait_time = 0); - virtual int alertable_handle_events (ACE_Time_Value *max_wait_time = 0); - - /** - * This method is just like the one above, except the - * value is a reference and can therefore never be - * NULL. - * - * The only difference between and - * is that in the alertable case, TRUE is passed to - * for the option. - */ - virtual int handle_events (ACE_Time_Value &max_wait_time); - virtual int alertable_handle_events (ACE_Time_Value &max_wait_time); - - - // = Event handling control. - - /** - * Return the status of Reactor. If this function returns 0, the reactor is - * actively handling events. If it returns non-zero, and - * return -1 immediately. - */ - virtual int deactivated (void); - - /** - * Control whether the Reactor will handle any more incoming events or not. - * If == 1, the Reactor will be disabled. By default, a reactor - * is in active state and can be deactivated/reactived as wish. - */ - virtual void deactivate (int do_stop); - - // = Register and remove Handlers. - - /** - * Register an . Since no Event - * Mask is passed through this interface, it is assumed that the - * being passed in is an event handle and when the event - * becomes signaled, will call handle_signal on - * . If == the - * will call the method of - * to extract the underlying event handle. - */ - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_HANDLE event_handle = ACE_INVALID_HANDLE); - - /** - * Register an . specifies - * the network events that the is interested in. If - * == the will - * call the method of to extract the - * underlying I/O handle. If the == - * , WFMO_Reactor will create an event for - * associating it with the I/O handle. When the is - * signalled, the appropriate callback will be invoked on - * the - */ - virtual int register_handler (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /** - * This is a simple version of the above method - * where the I/O handle is passed in and the event handle will - * always be created by - */ - virtual int register_handler (ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /** - * This is a simple version of the above method - * where the I/O handle will always come from on the - * and the event handle will always be created by - * - */ - virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /// Register with all the in the - /// . - virtual int register_handler (const ACE_Handle_Set &handles, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /** - * Register to handle the signal using the - * . Returns the that was previously registered - * (if any), along with the of the signal handler. - */ - virtual int register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0, - ACE_Event_Handler **old_sh = 0, - ACE_Sig_Action *old_disp = 0); - - /// Registers to handle a set of signals using the - /// . - virtual int register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0); - - /** - * Removes from the . Note that - * the will call the method of - * to extract the underlying handle. If == - * then the method of - * the is not invoked. Note that the can - * either be the or the - */ - virtual int remove_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /** - * Removes from the . If == - * then the method of - * the is not invoked. Note that the can - * either be the or the - * - * For the case of I/O entries, this removes the binding of - * whose handle is from . If - * there are no more bindings for this then it is - * removed from the WFMO_Reactor. For simple event entries, mask is - * mostly ignored and the is always removed from - * - */ - virtual int remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask); - - /** - * Removes all the bindings for handles in the - * bind of . If there are no more bindings for any - * of these handles then they are removed from WFMO_Reactor. - */ - virtual int remove_handler (const ACE_Handle_Set &handle_set, - ACE_Reactor_Mask); - - /** - * Remove the ACE_Event_Handler currently associated with . - * is ignored in this implementation since there is only - * one instance of a signal handler. Install the new disposition - * (if given) and return the previous disposition (if desired by the - * caller). Returns 0 on success and -1 if is invalid. - */ - virtual int remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp = 0, - int sigkey = -1); - - /// Calls for every signal in . - virtual int remove_handler (const ACE_Sig_Set &sigset); - - // = Suspend and resume Handlers. - - /// Suspend temporarily. Use - /// to get the handle. - virtual int suspend_handler (ACE_Event_Handler *event_handler); - - /// Suspend temporarily. - virtual int suspend_handler (ACE_HANDLE handle); - - /// Suspend all in handle set temporarily. - virtual int suspend_handler (const ACE_Handle_Set &handles); - - /// Suspend all temporarily. - virtual int suspend_handlers (void); - - /// Resume . Use to - /// get the handle. - virtual int resume_handler (ACE_Event_Handler *event_handler); - - /// Resume . - virtual int resume_handler (ACE_HANDLE handle); - - /// Resume all in handle set. - virtual int resume_handler (const ACE_Handle_Set &handles); - - /// Resume all . - virtual int resume_handlers (void); - - /// Does the reactor allow the application to resume the handle on - /// its own ie. can it pass on the control of handle resumption to - /// the application. A positive value indicates that the handlers - /// are application resumable. A value of 0 indicates otherwise. - virtual int resumable_handler (void); - - /** - * Return 1 if we any event associations were made by the reactor - * for the handles that it waits on, 0 otherwise. Since the - * WFMO_Reactor does use event associations, this function always - * return 1. - */ - virtual int uses_event_associations (void); - - // Timer management. - - /** - * Schedule an ACE_Event_Handler that will expire after an amount - * of time. The return value of this method, a timer_id value, - * uniquely identifies the event_handler in the ACE_Reactor's - * internal list of timers. - * This timer_id value can be used to cancel the timer - * with the cancel_timer() call. - * - * @see cancel_timer() - * @see reset_timer_interval() - * - * @param event_handler event handler to schedule on reactor - * @param arg argument passed to the handle_timeout() method of event_handler - * @param delay time interval after which the timer will expire - * @param interval time interval after which the timer will be automatically rescheduled - * @return -1 on failure, a timer_id value on success - */ - virtual long schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero); - - /** - * Resets the interval of the timer represented by to - * , which is specified in relative time to the current - * . If is equal to - * , the timer will become a non-rescheduling - * timer. Returns 0 if successful, -1 if not. - */ - virtual int reset_timer_interval (long timer_id, - const ACE_Time_Value &interval); - - /// Cancel all Event_Handlers that match the address of - /// . Returns number of handler's cancelled. - virtual int cancel_timer (ACE_Event_Handler *event_handler, - int dont_call_handle_close = 1); - - /** - * Cancel the single Event_Handler that matches the value - * (which was returned from the schedule method). If arg is - * non-NULL then it will be set to point to the ``magic cookie'' - * argument passed in when the Event_Handler was registered. This - * makes it possible to free up the memory and avoid memory leaks. - * Returns 1 if cancellation succeeded and 0 if the - * wasn't found. - */ - virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1); - - // = High-level Event_Handler scheduling operations - - /** - * Add to the 's entry in - * WFMO_Reactor. must already have been registered - * with WFMO_Reactor. - */ - virtual int schedule_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_added); - - /** - * Add to the 's entry in WFMO_Reactor. - * The Event_Handler associated with must already have been - * registered with WFMO_Reactor. - */ - virtual int schedule_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_added); - - /** - * Remove to the 's entry in - * WFMO_Reactor. The Event_Handler associated with must - * already have been registered with WFMO_Reactor. - */ - virtual int cancel_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_deleted); - - /** - * Remove to the 's entry in - * WFMO_Reactor. The Event_Handler associated with must - * already have been registered with WFMO_Reactor. - */ - virtual int cancel_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_deleted); - - // = Notification methods. - - /** - * Wakeup one thread if it is currently blocked - * in . The indicates how - * long to blocking trying to notify the . If - * == 0, the caller will block until action is possible, - * else will wait until the relative time specified in - * elapses). - */ - virtual int notify (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value * = 0); - - /** - * Set the maximum number of times that the - * method will iterate and - * dispatch the that are passed in via the - * notify queue before breaking out of its - * loop. By default, this is set to - * -1, which means "iterate until the queue is empty." Setting this - * to a value like "1 or 2" will increase "fairness" (and thus - * prevent starvation) at the expense of slightly higher dispatching - * overhead. - */ - virtual void max_notify_iterations (int); - - /** - * Get the maximum number of times that the - * method will iterate and - * dispatch the that are passed in via the - * notify queue before breaking out of its - * loop. - */ - virtual int max_notify_iterations (void); - - /** - * Purge any notifications pending in this reactor for the specified - * object. Returns the number of notifications - * purged. Returns -1 on error. - */ - virtual int purge_pending_notifications (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - - // = Assorted helper methods. - - /** - * Check to see if is associated with a valid Event_Handler - * bound to . Return the associated with this - * if != 0. - */ - virtual int handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler = 0); - - /** - * Check to see if is associated with a valid Event_Handler - * bound to a signal. Return the associated with - * this if != 0. - */ - virtual int handler (int signum, - ACE_Event_Handler ** = 0); - - /// Returns true if WFMO_Reactor has been successfully initialized, else - /// false. - virtual int initialized (void); - - /// Returns the current size of the WFMO_Reactor's internal - /// descriptor table. - virtual size_t size (void) const; - - /// Returns a reference to the WFMO_Reactor's internal lock. - virtual ACE_Lock &lock (void); - - /// Wake up all threads in WaitForMultipleObjects so that they can - /// reconsult the handle set - virtual void wakeup_all_threads (void); - - /** - * Transfers ownership of the WFMO_Reactor to the . The - * transfer will not complete until all threads are ready (just like - * the handle set). - */ - virtual int owner (ACE_thread_t new_owner, ACE_thread_t *old_owner = 0); - - /// Return the ID of the "owner" thread. - virtual int owner (ACE_thread_t *owner); - - /// Get the existing restart value. - virtual int restart (void); - - /// Set a new value for restart and return the original value. - virtual int restart (int r); - - /// Not implemented - virtual void requeue_position (int); - - /// Not implemented - virtual int requeue_position (void); - - // = Low-level wait_set mask manipulation methods. - - /** - * Modify of the 's entry in WFMO_Reactor - * depending upon . must already have - * been registered with WFMO_Reactor. - */ - virtual int mask_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks, - int operation); - - /** - * Modify of the 's entry in WFMO_Reactor depending - * upon . must already have been registered - * with WFMO_Reactor. - */ - virtual int mask_ops (ACE_HANDLE handle, - ACE_Reactor_Mask masks, - int ops); - - // = Low-level ready_set mask manipulation methods. - - /// Not implemented - virtual int ready_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops); - - /// Not implemented - virtual int ready_ops (ACE_HANDLE handle, - ACE_Reactor_Mask, - int ops); - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /// Dump the state of an object. - virtual void dump (void) const; - -protected: - /// Registration workhorse - virtual int register_handler_i (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); - - /// Event handling workhorse - virtual int event_handling (ACE_Time_Value *max_wait_time = 0, - int alertable = 0); - - /// Bit masking workhorse - virtual int mask_ops_i (ACE_HANDLE io_handle, - ACE_Reactor_Mask masks, - int operation); - - /// Return the ID of the "owner" thread. Does not do any locking. - virtual ACE_thread_t owner_i (void); - - /// Check to see if it is ok to enter <::WaitForMultipleObjects>. - virtual int ok_to_wait (ACE_Time_Value *max_wait_time, - int alertable); - - /// Wait for timer and I/O events to occur. - virtual DWORD wait_for_multiple_events (int timeout, - int alertable); - - /// Check for activity on remaining handles. - virtual DWORD poll_remaining_handles (DWORD slot); - - /// Expire timers. Only the owner thread does useful stuff in this - /// function. - virtual int expire_timers (void); - - /// Dispatches the timers and I/O handlers. - virtual int dispatch (DWORD wait_status); - - /// Protect against structured exceptions caused by user code when - /// dispatching handles - virtual int safe_dispatch (DWORD wait_status); - - /** - * Dispatches any active handles from handles_[] to - * handles_[active_handles_] using to poll - * through our handle set looking for active handles. - */ - virtual int dispatch_handles (DWORD slot); - - /// Dispatches a single handler. Returns 0 on success, -1 if the - /// handler was removed. - virtual int dispatch_handler (DWORD slot, - DWORD max_handlep1); - - /// Dispatches a single handler. Returns 0 on success, -1 if the - /// handler was removed. - virtual int simple_dispatch_handler (DWORD slot, - ACE_HANDLE event_handle); - - /// Dispatches a single handler. Returns 0 on success, -1 if the - /// handler was removed. - virtual int complex_dispatch_handler (DWORD slot, - ACE_HANDLE event_handle); - - /// Dispatches window messages. Noop for WFMO_Reactor. - virtual int dispatch_window_messages (void); - - virtual ACE_Reactor_Mask upcall (ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - WSANETWORKEVENTS &events); - - /// Used to caluculate the next timeout - virtual int calculate_timeout (ACE_Time_Value *time); - - /// Update the state of the handler repository - virtual int update_state (void); - - /// Check to see if we have a new owner - virtual int new_owner (void); - - /// Set owner to new owner - virtual int change_owner (void); - - /// Handle signals without requiring global/static variables. - ACE_Sig_Handler *signal_handler_; - - /// Keeps track of whether we should delete the signal handler (if we - /// didn't create it, then we don't delete it). - int delete_signal_handler_; - - /// Defined as a pointer to allow overriding by derived classes... - ACE_Timer_Queue *timer_queue_; - - /// Keeps track of whether we should delete the timer queue (if we - /// didn't create it, then we don't delete it). - int delete_timer_queue_; - - /// Keeps track of whether we should delete the handler repository - int delete_handler_rep_; - - /// Used when is called. - ACE_Reactor_Notify *notify_handler_; - - /// Keeps track of whether we should delete the notify handler. - int delete_notify_handler_; - - /** - * Synchronization for the ACE_WFMO_Reactor. - * - * A Process Mutex is used here because of two reasons: - * (a) The implementation of ACE_Thread_Mutex uses CriticalSections - * CriticalSections are not waitable using ::WaitForMultipleObjects - * (b) This is really not a process mutex because it is not - * named. No other process can use this mutex. - */ - ACE_Process_Mutex lock_; - - /// Adapter used to return internal lock to outside world. - ACE_Lock_Adapter lock_adapter_; - - /// Table that maps to 's. - ACE_WFMO_Reactor_Handler_Repository handler_rep_; - - /// A manual event used to block threads from proceeding into - /// WaitForMultipleObjects - ACE_Manual_Event ok_to_wait_; - - /** - * A manual event is used so that we can wake everyone up (e.g., - * when are bounded and unbound from the - * handler repository). - */ - ACE_Manual_Event wakeup_all_threads_; - - /// Used when is signaled - ACE_Wakeup_All_Threads_Handler wakeup_all_threads_handler_; - - /// The changing thread waits on this event, till all threads are not - /// active anymore - ACE_Auto_Event waiting_to_change_state_; - - /// Count of currently active threads - size_t active_threads_; - - /** - * The thread which is "owner" of the WFMO_Reactor. The owner - * concept is used because we don't want multiple threads to try to - * expire timers. Therefore the "owner" thread is the only one - * allowed to expire timers. Also, the owner thread is the only - * thread which waits on the notify handle. Note that the ownership - * can be transferred. - */ - ACE_thread_t owner_; - - /// The owner to be of the WFMO_Reactor - ACE_thread_t new_owner_; - - /// This is the thread which is responsible for the changing the - /// state of the handle set - ACE_thread_t change_state_thread_; - - /// This is an array of ACE_HANDLEs which keep track of the - /// and handles - ACE_HANDLE atomic_wait_array_ [2]; - - /// This flag is used to keep track of whether we are already closed. - int open_for_business_; - - /// This flag is used to keep track of whether we are actively handling - /// events or not. - sig_atomic_t deactivated_; - -private: - /// Deny access since member-wise won't work... - ACE_WFMO_Reactor (const ACE_WFMO_Reactor &); - ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &); -}; - -#if defined (__ACE_INLINE__) -#include "ace/WFMO_Reactor.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_WIN32 */ -#include "ace/post.h" -#endif /* ACE_WFMO_REACTOR_H */ diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i deleted file mode 100644 index 98c6c5d81ba..00000000000 --- a/ace/WFMO_Reactor.i +++ /dev/null @@ -1,1131 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Handle_Set.h" -#include "ace/Reactor.h" -/************************************************************/ - -ACE_INLINE int -ACE_Wakeup_All_Threads_Handler::handle_signal (int signum, - siginfo_t *siginfo, - ucontext_t *) -{ - ACE_UNUSED_ARG (signum); - ACE_UNUSED_ARG (siginfo); - - // This will get called when wakeup_all_threads_> event - // is signaled. There is nothing to be done here. - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) waking up to get updated handle set info\n"))); - return 0; -} - -#if defined (ACE_WIN32) - -/************************************************************/ - -ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::Common_Info::Common_Info (void) - : io_entry_ (0), - event_handler_ (0), - io_handle_ (ACE_INVALID_HANDLE), - network_events_ (0), - delete_event_ (0), - delete_entry_ (0), - close_masks_ (ACE_Event_Handler::NULL_MASK) -{ -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Common_Info::reset (void) -{ - this->event_handler_ = 0; - this->io_entry_ = 0; - this->io_handle_ = ACE_INVALID_HANDLE; - this->network_events_ = 0; - this->delete_event_ = 0; - this->delete_entry_ = 0; - this->close_masks_ = ACE_Event_Handler::NULL_MASK; -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Common_Info::set (int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry, - ACE_Reactor_Mask close_masks) -{ - this->event_handler_ = event_handler; - this->io_entry_ = io_entry; - this->io_handle_ = io_handle; - this->network_events_ = network_events; - this->delete_event_ = delete_event; - this->delete_entry_ = delete_entry; - this->close_masks_ = close_masks; -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Common_Info::set (Common_Info &common_info) -{ - *this = common_info; -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump (void) const -{ - ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("I/O Entry = %d\n"), - this->io_entry_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Event Handler = %d\n"), - this->event_handler_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("I/O Handle = %d\n"), - this->io_handle_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Network Events = %d\n"), - this->network_events_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Delete Event = %d\n"), - this->delete_event_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Delete Entry = %d\n"), - this->delete_entry_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Close Masks = %d\n"), - this->close_masks_)); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -/************************************************************/ - -ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::Current_Info::Current_Info (void) - : suspend_entry_ (0) -{ -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Current_Info::set (int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry, - ACE_Reactor_Mask close_masks, - int suspend_entry) -{ - this->suspend_entry_ = suspend_entry; - Common_Info::set (io_entry, - event_handler, - io_handle, - network_events, - delete_event, - delete_entry, - close_masks); -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Current_Info::set (Common_Info &common_info, - int suspend_entry) -{ - this->suspend_entry_ = suspend_entry; - Common_Info::set (common_info); -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Current_Info::reset (void) -{ - this->suspend_entry_ = 0; - Common_Info::reset (); -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle) const -{ - ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - Common_Info::dump (); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Event Handle = %d\n"), - event_handle)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Suspend Entry = %d\n"), - this->suspend_entry_)); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -/************************************************************/ - -ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::To_Be_Added_Info (void) - : event_handle_ (ACE_INVALID_HANDLE), - suspend_entry_ (0) -{ -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::set (ACE_HANDLE event_handle, - int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry, - ACE_Reactor_Mask close_masks, - int suspend_entry) -{ - this->event_handle_ = event_handle; - this->suspend_entry_ = suspend_entry; - Common_Info::set (io_entry, - event_handler, - io_handle, - network_events, - delete_event, - delete_entry, - close_masks); -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::set (ACE_HANDLE event_handle, - Common_Info &common_info, - int suspend_entry) -{ - this->event_handle_ = event_handle; - this->suspend_entry_ = suspend_entry; - Common_Info::set (common_info); -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::reset (void) -{ - this->event_handle_ = ACE_INVALID_HANDLE; - this->suspend_entry_ = 0; - Common_Info::reset (); -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const -{ - ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - Common_Info::dump (); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Event Handle = %d\n"), - this->event_handle_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Suspend Entry = %d\n"), - this->suspend_entry_)); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -/************************************************************/ - -ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::Suspended_Info (void) - : event_handle_ (ACE_INVALID_HANDLE), - resume_entry_ (0) -{ -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::reset (void) -{ - this->event_handle_ = ACE_INVALID_HANDLE; - this->resume_entry_ = 0; - Common_Info::reset (); -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::set (ACE_HANDLE event_handle, - int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry, - ACE_Reactor_Mask close_masks, - int resume_entry) -{ - this->event_handle_ = event_handle; - this->resume_entry_ = resume_entry; - Common_Info::set (io_entry, - event_handler, - io_handle, - network_events, - delete_event, - delete_entry, - close_masks); -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::set (ACE_HANDLE event_handle, - Common_Info &common_info, - int resume_entry) -{ - this->event_handle_ = event_handle; - this->resume_entry_ = resume_entry; - Common_Info::set (common_info); -} - -ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const -{ - ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - Common_Info::dump (); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Event Handle = %d\n"), - this->event_handle_)); - - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Resume Entry = %d\n"), - this->resume_entry_)); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -/************************************************************/ - -ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::close (void) -{ - // Let all the handlers know that the is closing down - this->unbind_all (); - - return 0; -} - -ACE_INLINE ACE_HANDLE * -ACE_WFMO_Reactor_Handler_Repository::handles (void) const -{ - // This code is probably too subtle to be useful in the long run... - // The basic idea is that all threads wait on all user handles plus - // the handle. The owner thread additional - // waits on the handle. This is to ensure that only the - // thread get to expire timers and handle event on the - // notify pipe. - if (ACE_Thread::self () == this->wfmo_reactor_.owner_i ()) - return this->current_handles_; - else - return this->current_handles_ + 1; -} - -ACE_INLINE ACE_WFMO_Reactor_Handler_Repository::Current_Info * -ACE_WFMO_Reactor_Handler_Repository::current_info (void) const -{ - if (ACE_Thread::self () == this->wfmo_reactor_.owner_i ()) - return this->current_info_; - else - return this->current_info_ + 1; -} - -ACE_INLINE DWORD -ACE_WFMO_Reactor_Handler_Repository::max_handlep1 (void) const -{ - if (ACE_Thread::self () == this->wfmo_reactor_.owner_i ()) - return this->max_handlep1_; - else - return this->max_handlep1_ - 1; -} - -ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::scheduled_for_deletion (size_t slot) const -{ - if (ACE_Thread::self () == this->wfmo_reactor_.owner_i ()) - return this->current_info_[slot].delete_entry_ == 1; - else - return this->current_info_[slot + 1].delete_entry_ == 1; -} - -ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::invalid_handle (ACE_HANDLE handle) const -{ - ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::invalid_handle"); - // It's too expensive to perform more exhaustive validity checks on - // Win32 due to the way that they implement SOCKET HANDLEs. - if (handle == ACE_INVALID_HANDLE) - { - errno = EINVAL; - return 1; - } - else - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::changes_required (void) -{ - // Check if handles have be scheduled for additions or removal - return this->handles_to_be_added_ > 0 - || this->handles_to_be_deleted_ > 0 - || this->handles_to_be_suspended_ > 0 - || this->handles_to_be_resumed_ > 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::make_changes (void) -{ - // This method must ONLY be called by the - // change_state_thread_>. We therefore assume that - // there will be no contention for this method and hence no guards - // are neccessary. - - // Deletions and suspensions in current_info_ - this->make_changes_in_current_infos (); - - // Deletions and resumptions in current_suspended_info_ - this->make_changes_in_suspension_infos (); - - // Deletions in to_be_added_info_, or transfers to current_info_ or - // current_suspended_info_ from to_be_added_info_ - this->make_changes_in_to_be_added_infos (); - - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::unbind (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - if (this->invalid_handle (handle)) - return -1; - - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->wfmo_reactor_.lock_, -1); - - int changes_required = 0; - int result = this->unbind_i (handle, - mask, - changes_required); - - if (changes_required) - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wfmo_reactor_.wakeup_all_threads (); - - return result; -} - -ACE_INLINE int -ACE_WFMO_Reactor::reset_timer_interval - (long timer_id, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_WFMO_Reactor::reset_timer_interval"); - - long result = this->timer_queue_->reset_interval - (timer_id, - interval); - - // Wakeup the owner thread so that it gets the latest timer values - this->notify (); - - return result; -} - -ACE_INLINE long -ACE_WFMO_Reactor::schedule_timer (ACE_Event_Handler *handler, - const void *arg, - const ACE_Time_Value &delay_time, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_WFMO_Reactor::schedule_timer"); - - long result = this->timer_queue_->schedule - (handler, - arg, - timer_queue_->gettimeofday () + delay_time, - interval); - - // Wakeup the owner thread so that it gets the latest timer values - this->notify (); - - return result; -} - -ACE_INLINE int -ACE_WFMO_Reactor::cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_WFMO_Reactor::cancel_timer"); - return this->timer_queue_->cancel (handler, dont_call_handle_close); -} - -ACE_INLINE int -ACE_WFMO_Reactor::cancel_timer (long timer_id, - const void **arg, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_WFMO_Reactor::cancel_timer"); - return this->timer_queue_->cancel (timer_id, arg, dont_call_handle_close); -} - -ACE_INLINE int -ACE_WFMO_Reactor::register_handler (ACE_Event_Handler *event_handler, - ACE_HANDLE event_handle) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - return this->handler_rep_.bind_i (0, - event_handler, - 0, - ACE_INVALID_HANDLE, - event_handle, - 0); -} - -ACE_INLINE int -ACE_WFMO_Reactor::register_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - return this->register_handler_i (ACE_INVALID_HANDLE, - ACE_INVALID_HANDLE, - event_handler, - mask); -} - -ACE_INLINE int -ACE_WFMO_Reactor::register_handler (ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - return this->register_handler_i (ACE_INVALID_HANDLE, - io_handle, - event_handler, - mask); -} - -ACE_INLINE int -ACE_WFMO_Reactor::register_handler (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - return this->register_handler_i (event_handle, - io_handle, - event_handler, - mask); -} - -ACE_INLINE int -ACE_WFMO_Reactor::register_handler (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - ACE_Handle_Set_Iterator handle_iter (handles); - ACE_HANDLE h; - - while ((h = handle_iter ()) != ACE_INVALID_HANDLE) - if (this->register_handler_i (h, - ACE_INVALID_HANDLE, - handler, - mask) == -1) - return -1; - - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::schedule_wakeup (ACE_HANDLE io_handle, - ACE_Reactor_Mask masks_to_be_added) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - return this->mask_ops_i (io_handle, - masks_to_be_added, - ACE_Reactor::ADD_MASK); -} - -ACE_INLINE int -ACE_WFMO_Reactor::schedule_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_added) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - return this->mask_ops_i (event_handler->get_handle (), - masks_to_be_added, - ACE_Reactor::ADD_MASK); -} - -ACE_INLINE int -ACE_WFMO_Reactor::cancel_wakeup (ACE_HANDLE io_handle, - ACE_Reactor_Mask masks_to_be_removed) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - return this->mask_ops_i (io_handle, - masks_to_be_removed, - ACE_Reactor::CLR_MASK); -} - -ACE_INLINE int -ACE_WFMO_Reactor::cancel_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_removed) -{ - // This GUARD is necessary since we are updating shared state. - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - return this->mask_ops_i (event_handler->get_handle (), - masks_to_be_removed, - ACE_Reactor::CLR_MASK); -} - -ACE_INLINE int -ACE_WFMO_Reactor::remove_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask) -{ - return this->handler_rep_.unbind (event_handler->get_handle (), - mask); -} - -ACE_INLINE int -ACE_WFMO_Reactor::remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - return this->handler_rep_.unbind (handle, - mask); -} - -ACE_INLINE int -ACE_WFMO_Reactor::remove_handler (const ACE_Handle_Set &handles, - ACE_Reactor_Mask mask) -{ - ACE_Handle_Set_Iterator handle_iter (handles); - ACE_HANDLE h; - int changes_required = 0; - - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - while ((h = handle_iter ()) != ACE_INVALID_HANDLE) - if (this->handler_rep_.unbind_i (h, - mask, - changes_required) == -1) - return -1; - - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wakeup_all_threads (); - - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::suspend_handler (ACE_HANDLE handle) -{ - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - int changes_required = 0; - int result = - this->handler_rep_.suspend_handler_i (handle, - changes_required); - - if (changes_required) - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wakeup_all_threads (); - - return result; -} - -ACE_INLINE int -ACE_WFMO_Reactor::suspend_handler (ACE_Event_Handler *event_handler) -{ - return this->suspend_handler (event_handler->get_handle ()); -} - -ACE_INLINE int -ACE_WFMO_Reactor::suspend_handler (const ACE_Handle_Set &handles) -{ - ACE_Handle_Set_Iterator handle_iter (handles); - ACE_HANDLE h; - int changes_required = 0; - - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - while ((h = handle_iter ()) != ACE_INVALID_HANDLE) - if (this->handler_rep_.suspend_handler_i (h, - changes_required) == -1) - return -1; - - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wakeup_all_threads (); - - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::suspend_handlers (void) -{ - int error = 0; - int result = 0; - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - // First suspend all current handles - int changes_required = 0; - - for (size_t i = 0; - i < this->handler_rep_.max_handlep1_ && error == 0; - i++) - { - result = - this->handler_rep_.suspend_handler_i (this->handler_rep_.current_handles_[i], - changes_required); - if (result == -1) - error = 1; - } - - if (!error) - // Then suspend all to_be_added_handles - for (size_t i = 0; - i < this->handler_rep_.handles_to_be_added_; - i++) - this->handler_rep_.to_be_added_info_[i].suspend_entry_ = 1; - - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wakeup_all_threads (); - - return error ? -1 : 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::resume_handler (ACE_HANDLE handle) -{ - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - int changes_required = 0; - int result = - this->handler_rep_.resume_handler_i (handle, - changes_required); - - if (changes_required) - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wakeup_all_threads (); - - return result; -} - -ACE_INLINE int -ACE_WFMO_Reactor::resume_handler (ACE_Event_Handler *event_handler) -{ - return this->resume_handler (event_handler->get_handle ()); -} - -ACE_INLINE int -ACE_WFMO_Reactor::resume_handler (const ACE_Handle_Set &handles) -{ - ACE_Handle_Set_Iterator handle_iter (handles); - ACE_HANDLE h; - int changes_required = 0; - - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - while ((h = handle_iter ()) != ACE_INVALID_HANDLE) - if (this->handler_rep_.resume_handler_i (h, - changes_required) == -1) - return -1; - - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wakeup_all_threads (); - - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::resume_handlers (void) -{ - int error = 0; - int result = 0; - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - - int changes_required = 0; - for (size_t i = 0; - i < this->handler_rep_.suspended_handles_ && error == 0; - i++) - { - result = - this->handler_rep_.resume_handler_i (this->handler_rep_.current_suspended_info_[i].event_handle_, - changes_required); - if (result == -1) - error = 1; - } - - if (!error) - // Then resume all to_be_added_handles - for (size_t i = 0; - i < this->handler_rep_.handles_to_be_added_; - i++) - this->handler_rep_.to_be_added_info_[i].suspend_entry_ = 0; - - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the handle set - this->wakeup_all_threads (); - - return error ? -1 : 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::uses_event_associations (void) -{ - // Since the WFMO_Reactor does use event associations, this function - // always return 1. - return 1; -} - -ACE_INLINE int -ACE_WFMO_Reactor::handle_events (ACE_Time_Value &how_long) -{ - return this->event_handling (&how_long, FALSE); -} - -ACE_INLINE int -ACE_WFMO_Reactor::alertable_handle_events (ACE_Time_Value &how_long) -{ - return this->event_handling (&how_long, TRUE); -} - -ACE_INLINE int -ACE_WFMO_Reactor::handle_events (ACE_Time_Value *how_long) -{ - return this->event_handling (how_long, FALSE); -} - -ACE_INLINE int -ACE_WFMO_Reactor::alertable_handle_events (ACE_Time_Value *how_long) -{ - return this->event_handling (how_long, TRUE); -} - -ACE_INLINE int -ACE_WFMO_Reactor::deactivated (void) -{ - return this->deactivated_; -} - -ACE_INLINE void -ACE_WFMO_Reactor::deactivate (int do_stop) -{ - this->deactivated_ = do_stop; - this->wakeup_all_threads (); -} - -ACE_INLINE int -ACE_WFMO_Reactor::owner (ACE_thread_t *t) -{ - ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); - *t = this->owner_i (); - return 0; -} - -ACE_INLINE ACE_thread_t -ACE_WFMO_Reactor::owner_i (void) -{ - return this->owner_; -} - -ACE_INLINE int -ACE_WFMO_Reactor::owner (ACE_thread_t new_owner, ACE_thread_t *old_owner) -{ - ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1); - this->new_owner_ = new_owner; - - if (old_owner != 0) - *old_owner = this->owner_i (); - - // Wake up all threads in WaitForMultipleObjects so that they can - // reconsult the new owner responsibilities - this->wakeup_all_threads (); - - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::new_owner (void) -{ - return this->new_owner_ != ACE_thread_t (0); -} - -ACE_INLINE int -ACE_WFMO_Reactor::change_owner (void) -{ - this->owner_ = this->new_owner_; - this->new_owner_ = ACE_thread_t (0); - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::safe_dispatch (DWORD wait_status) -{ - int result = -1; - ACE_SEH_TRY - { - result = this->dispatch (wait_status); - } - ACE_SEH_FINALLY - { - this->update_state (); - } - - return result; -} - -ACE_INLINE int -ACE_WFMO_Reactor::dispatch_window_messages (void) -{ - return 0; -} - -ACE_INLINE void -ACE_WFMO_Reactor::wakeup_all_threads (void) -{ - this->wakeup_all_threads_.signal (); -} - -ACE_INLINE int -ACE_WFMO_Reactor::notify (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - ACE_Time_Value *timeout) -{ - return this->notify_handler_->notify (event_handler, mask, timeout); -} - -ACE_INLINE int -ACE_WFMO_Reactor::register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp, - ACE_Event_Handler **old_sh, - ACE_Sig_Action *old_disp) -{ - return this->signal_handler_->register_handler (signum, - new_sh, new_disp, - old_sh, old_disp); -} - -ACE_INLINE int -ACE_WFMO_Reactor::register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp) -{ - int result = 0; - -#if (ACE_NSIG > 0) - for (int s = 1; s < ACE_NSIG; s++) - if (sigset.is_member (s) - && this->signal_handler_->register_handler (s, - new_sh, - new_disp) == -1) - result = -1; -#else - ACE_UNUSED_ARG (sigset); - ACE_UNUSED_ARG (new_sh); - ACE_UNUSED_ARG (new_disp); -#endif /* ACE_NSIG */ - - return result; -} - -ACE_INLINE int -ACE_WFMO_Reactor::remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp, - int sigkey) -{ - return this->signal_handler_->remove_handler (signum, - new_disp, - old_disp, - sigkey); -} - -ACE_INLINE int -ACE_WFMO_Reactor::remove_handler (const ACE_Sig_Set &sigset) -{ - int result = 0; - -#if (ACE_NSIG > 0) - for (int s = 1; s < ACE_NSIG; s++) - if (sigset.is_member (s) - && this->signal_handler_->remove_handler (s) == -1) - result = -1; -#else - ACE_UNUSED_ARG (sigset); -#endif /* ACE_NSIG */ - - return result; -} - -ACE_INLINE int -ACE_WFMO_Reactor::handler (int signum, ACE_Event_Handler **eh) -{ - ACE_Event_Handler *handler = - this->signal_handler_->handler (signum); - - if (handler == 0) - return -1; - else if (eh != 0) - *eh = handler; - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::mask_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int operation) -{ - ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1); - - return this->mask_ops_i (event_handler->get_handle (), - mask, - operation); -} - -ACE_INLINE int -ACE_WFMO_Reactor::mask_ops (ACE_HANDLE io_handle, - ACE_Reactor_Mask mask, - int operation) -{ - ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1); - - return this->mask_ops_i (io_handle, - mask, - operation); -} - -ACE_INLINE void -ACE_WFMO_Reactor::requeue_position (int) -{ - // Not implemented -} - -ACE_INLINE int -ACE_WFMO_Reactor::requeue_position (void) -{ - // Don't have an implementation for this yet... - ACE_NOTSUP_RETURN (-1); -} - -ACE_INLINE int -ACE_WFMO_Reactor::restart (void) -{ - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::restart (int) -{ - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor::ready_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops) -{ - // Don't have an implementation for this yet... - ACE_UNUSED_ARG (event_handler); - ACE_UNUSED_ARG (mask); - ACE_UNUSED_ARG (ops); - ACE_NOTSUP_RETURN (-1); -} - -ACE_INLINE int -ACE_WFMO_Reactor::ready_ops (ACE_HANDLE handle, - ACE_Reactor_Mask, - int ops) -{ - // Don't have an implementation for this yet... - ACE_UNUSED_ARG (handle); - ACE_UNUSED_ARG (ops); - ACE_NOTSUP_RETURN (-1); -} - -ACE_INLINE int -ACE_WFMO_Reactor::handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler) -{ - return this->handler_rep_.handler (handle, - mask, - event_handler); -} - -ACE_INLINE int -ACE_WFMO_Reactor::initialized (void) -{ - return this->open_for_business_; -} - -ACE_INLINE ACE_Lock & -ACE_WFMO_Reactor::lock (void) -{ - return this->lock_adapter_; -} - -ACE_INLINE size_t -ACE_WFMO_Reactor::size (void) const -{ - // Size of repository minus the 2 used for internal purposes - return this->handler_rep_.max_size_ - 2; -} -#else -ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::changes_required (void) -{ - return 0; -} - -ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::make_changes (void) -{ - return 0; -} - -ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository (void) -{ -} - -#endif /* ACE_WIN32 */ diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp deleted file mode 100644 index 4c02cf88324..00000000000 --- a/ace/WIN32_Asynch_IO.cpp +++ /dev/null @@ -1,3802 +0,0 @@ -#include "ace/WIN32_Asynch_IO.h" - -ACE_RCSID (ace, - Win32_Asynch_IO, - "$Id$") - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - -#include "ace/WIN32_Proactor.h" -#include "ace/Message_Block.h" -#include "ace/Service_Config.h" -#include "ace/INET_Addr.h" -#include "ace/Task_T.h" - -size_t -ACE_WIN32_Asynch_Result::bytes_transferred (void) const -{ - return this->bytes_transferred_; -} - -const void * -ACE_WIN32_Asynch_Result::act (void) const -{ - return this->act_; -} - -int -ACE_WIN32_Asynch_Result::success (void) const -{ - return this->success_; -} - -const void * -ACE_WIN32_Asynch_Result::completion_key (void) const -{ - return this->completion_key_; -} - -u_long -ACE_WIN32_Asynch_Result::error (void) const -{ - return this->error_; -} - -ACE_HANDLE -ACE_WIN32_Asynch_Result::event (void) const -{ - return this->hEvent; -} - -u_long -ACE_WIN32_Asynch_Result::offset (void) const -{ - return this->Offset; -} - -u_long -ACE_WIN32_Asynch_Result::offset_high (void) const -{ - return this->OffsetHigh; -} - -int -ACE_WIN32_Asynch_Result::priority (void) const -{ - ACE_NOTSUP_RETURN (0); -} - -int -ACE_WIN32_Asynch_Result::signal_number (void) const -{ - ACE_NOTSUP_RETURN (0); -} - -int -ACE_WIN32_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - // Get to the platform specific implementation. - ACE_WIN32_Proactor *win32_proactor = ACE_dynamic_cast (ACE_WIN32_Proactor *, - proactor); - - if (win32_proactor == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Dynamic cast to WIN32 Proactor failed\n")), - -1); - - // Post myself. - return win32_proactor->post_completion (this); -} - -void -ACE_WIN32_Asynch_Result::set_bytes_transferred (size_t nbytes) -{ - this->bytes_transferred_ = nbytes; -} - -void -ACE_WIN32_Asynch_Result::set_error (u_long errcode) -{ - this->error_ = errcode; -} - -ACE_WIN32_Asynch_Result::~ACE_WIN32_Asynch_Result (void) -{ -} - -ACE_WIN32_Asynch_Result::ACE_WIN32_Asynch_Result (ACE_Handler &handler, - const void* act, - ACE_HANDLE event, - u_long offset, - u_long offset_high, - int priority, - int signal_number) - : ACE_Asynch_Result_Impl (), - OVERLAPPED (), - handler_ (handler), - act_ (act), - bytes_transferred_ (0), - success_ (0), - completion_key_ (0), - error_ (0) -{ - // Set the ACE_OVERLAPPED structure - this->Internal = 0; - this->InternalHigh = 0; - this->Offset = offset; - this->OffsetHigh = offset_high; - this->hEvent = event; - - ACE_UNUSED_ARG (priority); - ACE_UNUSED_ARG (signal_number); -} - -int -ACE_WIN32_Asynch_Operation::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - this->proactor_ = proactor; - this->handler_ = &handler; - this->handle_ = handle; - - // Grab the handle from the if is invalid - if (this->handle_ == ACE_INVALID_HANDLE) - this->handle_ = this->handler_->handle (); - if (this->handle_ == ACE_INVALID_HANDLE) - return -1; - - // Register with the . - return this->win32_proactor_->register_handle (this->handle_, - completion_key); -} - -int -ACE_WIN32_Asynch_Operation::cancel (void) -{ -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \ - && ( (defined (_MSC_VER) && (_MSC_VER > 1020)) \ - || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)) \ - || (defined (__MINGW32))) - // All I/O operations that are canceled will complete with the error - // ERROR_OPERATION_ABORTED. All completion notifications for the I/O - // operations will occur normally. - - // @@ This API returns 0 on failure. So, I am returning -1 in that - // case. Is that right? (Alex). - - int result = (int) ::CancelIo (this->handle_); - - if (result == 0) - // Couldnt cancel the operations. - return 2; - - // result is non-zero. All the operations are cancelled then. - return 0; - -#else /* Not ACE_HAS_WINNT4 && ACE_HAS_WINNT4!=0 && _MSC... */ - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_AIO_CALLS */ -} - -ACE_Proactor * -ACE_WIN32_Asynch_Operation::proactor (void) const -{ - return this->proactor_; -} - -ACE_WIN32_Asynch_Operation::ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win32_proactor) - : ACE_Asynch_Operation_Impl (), - win32_proactor_ (win32_proactor), - proactor_ (0), - handler_ (0), - handle_ (ACE_INVALID_HANDLE) -{ -} - -ACE_WIN32_Asynch_Operation::~ACE_WIN32_Asynch_Operation (void) -{ -} - -// ************************************************************ - -size_t -ACE_WIN32_Asynch_Read_Stream_Result::bytes_to_read (void) const -{ - return this->bytes_to_read_; -} - -ACE_Message_Block & -ACE_WIN32_Asynch_Read_Stream_Result::message_block (void) const -{ - return this->message_block_; -} - -ACE_HANDLE -ACE_WIN32_Asynch_Read_Stream_Result::handle (void) const -{ - return this->handle_; -} - -ACE_WIN32_Asynch_Read_Stream_Result::ACE_WIN32_Asynch_Read_Stream_Result ( - ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number, - int scatter_enabled) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Read_Stream_Result_Impl (), - ACE_WIN32_Asynch_Result (handler, - act, - event, - 0, - 0, - priority, - signal_number), - bytes_to_read_ (bytes_to_read), - message_block_ (message_block), - handle_ (handle), - scatter_enabled_ (scatter_enabled) -{ -} - -void -ACE_WIN32_Asynch_Read_Stream_Result::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - // Copy the data which was returned by GetQueuedCompletionStatus - this->bytes_transferred_ = bytes_transferred; - this->success_ = success; - this->completion_key_ = completion_key; - this->error_ = error; - - // Appropriately move the pointers in the message block. - if (!this->scatter_enabled ()) - this->message_block_.wr_ptr (bytes_transferred); - else - { - for (ACE_Message_Block* mb = &this->message_block_; - (mb != 0) && (bytes_transferred > 0); - mb = mb->cont ()) - { - size_t len_part = mb->space (); - - if (len_part > bytes_transferred) - len_part = bytes_transferred; - - mb->wr_ptr (len_part); - - bytes_transferred -= len_part; - } - } - - // Create the interface result class. - ACE_Asynch_Read_Stream::Result result (this); - - // Call the application handler. - this->handler_.handle_read_stream (result); -} - -ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result (void) -{ -} - -// Base class operations. These operations are here to kill dominance -// warnings. These methods call the base class methods. - -size_t -ACE_WIN32_Asynch_Read_Stream_Result::bytes_transferred (void) const -{ - return ACE_WIN32_Asynch_Result::bytes_transferred (); -} - -const void * -ACE_WIN32_Asynch_Read_Stream_Result::act (void) const -{ - return ACE_WIN32_Asynch_Result::act (); -} - -int -ACE_WIN32_Asynch_Read_Stream_Result::success (void) const -{ - return ACE_WIN32_Asynch_Result::success (); -} - -const void * -ACE_WIN32_Asynch_Read_Stream_Result::completion_key (void) const -{ - return ACE_WIN32_Asynch_Result::completion_key (); -} - -u_long -ACE_WIN32_Asynch_Read_Stream_Result::error (void) const -{ - return ACE_WIN32_Asynch_Result::error (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Read_Stream_Result::event (void) const -{ - return ACE_WIN32_Asynch_Result::event (); -} - -u_long -ACE_WIN32_Asynch_Read_Stream_Result::offset (void) const -{ - return ACE_WIN32_Asynch_Result::offset (); -} - -u_long -ACE_WIN32_Asynch_Read_Stream_Result::offset_high (void) const -{ - return ACE_WIN32_Asynch_Result::offset_high (); -} - -int -ACE_WIN32_Asynch_Read_Stream_Result::priority (void) const -{ - return ACE_WIN32_Asynch_Result::priority (); -} - -int -ACE_WIN32_Asynch_Read_Stream_Result::signal_number (void) const -{ - return ACE_WIN32_Asynch_Result::signal_number (); -} - -int -ACE_WIN32_Asynch_Read_Stream_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - return ACE_WIN32_Asynch_Result::post_completion (proactor); -} - -int -ACE_WIN32_Asynch_Read_Stream_Result::scatter_enabled (void) const -{ - return this->scatter_enabled_; -} - -ACE_WIN32_Asynch_Read_Stream::ACE_WIN32_Asynch_Read_Stream (ACE_WIN32_Proactor *win32_proactor) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Read_Stream_Impl (), - ACE_WIN32_Asynch_Operation (win32_proactor) -{ -} - -int -ACE_WIN32_Asynch_Read_Stream::read (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) -{ - size_t space = message_block.space (); - if (bytes_to_read > space) - bytes_to_read = space; - - if (bytes_to_read == 0) - { - errno = ENOSPC; - return -1; - } - - // Create the Asynch_Result. - ACE_WIN32_Asynch_Read_Stream_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Read_Stream_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_read, - act, - this->win32_proactor_->get_handle (), - priority, - signal_number), - -1); - - // Shared read - ssize_t return_val = this->shared_read (result); - - // Upon errors - if (return_val == -1) - delete result; - - return return_val; -} - -int -ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) -{ - - iovec iov[ACE_IOV_MAX]; - int iovcnt = 0; - - // We should not read more than user requested, - // but it is allowed to read less - - for (const ACE_Message_Block* msg = &message_block; - msg != 0 && bytes_to_read > 0 && iovcnt < ACE_IOV_MAX; - msg = msg->cont () , ++iovcnt ) - { - size_t msg_space = msg->space (); - - // OS should correctly process zero length buffers - // if ( msg_space == 0 ) - // ACE_ERROR_RETURN ((LM_ERROR, - // ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:") - // ACE_LIB_TEXT ("No space in the message block\n")), - // -1); - - if (msg_space > bytes_to_read) - msg_space = bytes_to_read; - bytes_to_read -= msg_space; - - // Make as many iovec as needed to fit all of msg_space. - size_t wr_ptr_offset = 0; - while (msg_space > 0 && iovcnt < ACE_IOV_MAX) - { - u_long this_chunk_length; - if (msg_space > ULONG_MAX) - this_chunk_length = ULONG_MAX; - else - this_chunk_length = ACE_static_cast (u_long, msg_space); - // Collect the data in the iovec. - iov[iovcnt].iov_base = msg->wr_ptr () + wr_ptr_offset; - iov[iovcnt].iov_len = this_chunk_length; - msg_space -= this_chunk_length; - wr_ptr_offset += this_chunk_length; - - // Increment iovec counter if there's more to do. - if (msg_space > 0) - iovcnt++; - } - if (msg_space > 0) // Ran out of iovecs before msg_space exhausted - { - errno = ERANGE; - return -1; - } - } - - // Re-calculate number bytes to read - bytes_to_read = 0; - - for (int i = 0; i < iovcnt ; ++i) - bytes_to_read += iov[i].iov_len; - - if (bytes_to_read == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:") - ACE_LIB_TEXT ("Attempt to read 0 bytes\n")), - -1); - - // Create the Asynch_Result. - ACE_WIN32_Asynch_Read_Stream_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Read_Stream_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_read, - act, - this->win32_proactor_->get_handle (), - priority, - signal_number, - 1), // scatter read enabled - -1); - - // do the scatter recv - - result->set_error (0); // Clear error before starting IO. - - DWORD bytes_recvd = 0; - u_long flags = 0; - - int initiate_result = ::WSARecv (ACE_reinterpret_cast (SOCKET, result->handle ()), - ACE_reinterpret_cast (WSABUF *, iov), - iovcnt, - &bytes_recvd, - &flags, - result, - 0); - - if (0 == initiate_result) - // Immediate success: the OVERLAPPED will still get queued. - return 1; - - ACE_ASSERT (initiate_result == SOCKET_ERROR); - - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - initiate_result = 0; - break; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WSARecv"))); - } - - delete result; - initiate_result = -1; - break; - } - - return initiate_result; -} - -ACE_WIN32_Asynch_Read_Stream::~ACE_WIN32_Asynch_Read_Stream (void) -{ -} - -int -ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *result) -{ - // ReadFile API limits us to DWORD range. - if (result->bytes_to_read () > MAXDWORD) - { - errno = ERANGE; - return -1; - } - DWORD bytes_to_read = ACE_static_cast (DWORD, result->bytes_to_read ()); - u_long bytes_read; - - result->set_error (0); // Clear error before starting IO. - - // Initiate the read - int initiate_result = ::ReadFile (result->handle (), - result->message_block ().wr_ptr (), - bytes_to_read, - &bytes_read, - result); - if (initiate_result == 1) - // Immediate success: the OVERLAPPED will still get queued. - return 1; - - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - return 0; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ReadFile"))); - } - - return -1; - } -} - -// Methods belong to ACE_WIN32_Asynch_Operation base class. These -// methods are defined here to avoid VC++ warnings. They route the -// call to the ACE_WIN32_Asynch_Operation base class. - -int -ACE_WIN32_Asynch_Read_Stream::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - return ACE_WIN32_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_WIN32_Asynch_Read_Stream::cancel (void) -{ - return ACE_WIN32_Asynch_Operation::cancel (); -} - -ACE_Proactor * -ACE_WIN32_Asynch_Read_Stream::proactor (void) const -{ - return ACE_WIN32_Asynch_Operation::proactor (); -} - -size_t -ACE_WIN32_Asynch_Write_Stream_Result::bytes_to_write (void) const -{ - return this->bytes_to_write_; -} - -ACE_Message_Block & -ACE_WIN32_Asynch_Write_Stream_Result::message_block (void) const -{ - return this->message_block_; -} - -ACE_HANDLE -ACE_WIN32_Asynch_Write_Stream_Result::handle (void) const -{ - return this->handle_; -} - -ACE_WIN32_Asynch_Write_Stream_Result::ACE_WIN32_Asynch_Write_Stream_Result ( - ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number, - int gather_enabled) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Write_Stream_Result_Impl (), - ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number), - bytes_to_write_ (bytes_to_write), - message_block_ (message_block), - handle_ (handle), - gather_enabled_ (gather_enabled) -{ -} - -void -ACE_WIN32_Asynch_Write_Stream_Result::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - // Copy the data which was returned by . - this->bytes_transferred_ = bytes_transferred; - this->success_ = success; - this->completion_key_ = completion_key; - this->error_ = error; - - // Appropriately move the pointers in the message block. - if (!this->gather_enabled ()) - this->message_block_.rd_ptr (bytes_transferred); - else - { - for (ACE_Message_Block* mb = &this->message_block_; - (mb != 0) && (bytes_transferred > 0); - mb = mb->cont ()) - { - size_t len_part = mb->length (); - - if ( len_part > bytes_transferred) - len_part = bytes_transferred; - - mb->rd_ptr (len_part); - - bytes_transferred -= len_part; - } - } - - // Create the interface result class. - ACE_Asynch_Write_Stream::Result result (this); - - // Call the application handler. - this->handler_.handle_write_stream (result); -} - -ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result (void) -{ -} - -// Base class operations. These operations are here to kill dominance -// warnings. These methods call the base class methods. - -size_t -ACE_WIN32_Asynch_Write_Stream_Result::bytes_transferred (void) const -{ - return ACE_WIN32_Asynch_Result::bytes_transferred (); -} - -const void * -ACE_WIN32_Asynch_Write_Stream_Result::act (void) const -{ - return ACE_WIN32_Asynch_Result::act (); -} - -int -ACE_WIN32_Asynch_Write_Stream_Result::success (void) const -{ - return ACE_WIN32_Asynch_Result::success (); -} - -const void * -ACE_WIN32_Asynch_Write_Stream_Result::completion_key (void) const -{ - return ACE_WIN32_Asynch_Result::completion_key (); -} - -u_long -ACE_WIN32_Asynch_Write_Stream_Result::error (void) const -{ - return ACE_WIN32_Asynch_Result::error (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Write_Stream_Result::event (void) const -{ - return ACE_WIN32_Asynch_Result::event (); -} - -u_long -ACE_WIN32_Asynch_Write_Stream_Result::offset (void) const -{ - return ACE_WIN32_Asynch_Result::offset (); -} - -u_long -ACE_WIN32_Asynch_Write_Stream_Result::offset_high (void) const -{ - return ACE_WIN32_Asynch_Result::offset_high (); -} - -int -ACE_WIN32_Asynch_Write_Stream_Result::priority (void) const -{ - return ACE_WIN32_Asynch_Result::priority (); -} - -int -ACE_WIN32_Asynch_Write_Stream_Result::signal_number (void) const -{ - return ACE_WIN32_Asynch_Result::signal_number (); -} - -int -ACE_WIN32_Asynch_Write_Stream_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - return ACE_WIN32_Asynch_Result::post_completion (proactor); -} - -int -ACE_WIN32_Asynch_Write_Stream_Result::gather_enabled (void) const -{ - return this->gather_enabled_; -} - -ACE_WIN32_Asynch_Write_Stream::ACE_WIN32_Asynch_Write_Stream (ACE_WIN32_Proactor *win32_proactor) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Write_Stream_Impl (), - ACE_WIN32_Asynch_Operation (win32_proactor) -{ -} - -int -ACE_WIN32_Asynch_Write_Stream::write (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) -{ - size_t len = message_block.length(); - - if (bytes_to_write > len) - bytes_to_write = len ; - - if (bytes_to_write == 0) - ACE_ERROR_RETURN - ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_Stream::write:") - ACE_LIB_TEXT ("Attempt to write 0 bytes\n")), - -1); - - ACE_WIN32_Asynch_Write_Stream_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Write_Stream_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_write, - act, - this->win32_proactor_->get_handle (), - priority, - signal_number), - -1); - - // Shared write - ssize_t return_val = this->shared_write (result); - - // Upon errors - if (return_val == -1) - delete result; - - return return_val; -} - -int -ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) -{ - iovec iov[ACE_IOV_MAX]; - int iovcnt = 0; - - // We should not write more than user requested, - // but it is allowed to write less - - for (const ACE_Message_Block* msg = &message_block; - msg != 0 && bytes_to_write > 0 && iovcnt < ACE_IOV_MAX; - msg = msg->cont () , ++iovcnt) - { - size_t msg_len = msg->length (); - - // OS should process zero length block correctly - // if ( msg_len == 0 ) - // ACE_ERROR_RETURN ((LM_ERROR, - // ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_Stream::writev:") - // ACE_LIB_TEXT ("Zero-length message block\n")), - // -1); - - if (msg_len > bytes_to_write) - msg_len = bytes_to_write; - bytes_to_write -= msg_len; - - // Make as many iovec as needed to fit all of msg_len. - size_t rd_ptr_offset = 0; - while (msg_len > 0 && iovcnt < ACE_IOV_MAX) - { - u_long this_chunk_length; - if (msg_len > ULONG_MAX) - this_chunk_length = ULONG_MAX; - else - this_chunk_length = ACE_static_cast (u_long, msg_len); - // Collect the data in the iovec. - iov[iovcnt].iov_base = msg->rd_ptr () + rd_ptr_offset; - iov[iovcnt].iov_len = this_chunk_length; - msg_len -= this_chunk_length; - rd_ptr_offset += this_chunk_length; - - // Increment iovec counter if there's more to do. - if (msg_len > 0) - iovcnt++; - } - if (msg_len > 0) // Ran out of iovecs before msg_space exhausted - { - errno = ERANGE; - return -1; - } - } - - // Re-calculate number bytes to write - bytes_to_write = 0; - - for ( int i=0; i < iovcnt ; ++i ) - bytes_to_write += iov[i].iov_len; - - if ( bytes_to_write == 0 ) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_Stream::writev:") - ACE_LIB_TEXT ("Attempt to write 0 bytes\n")), - -1); - - - ACE_WIN32_Asynch_Write_Stream_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Write_Stream_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_write, - act, - this->win32_proactor_->get_handle (), - priority, - signal_number, - 1), // gather write enabled - -1); - - // do the gather send - - u_long bytes_sent = 0; - - int initiate_result = ::WSASend (ACE_reinterpret_cast (SOCKET, result->handle ()), - ACE_reinterpret_cast (WSABUF *, iov), - iovcnt, - &bytes_sent, - 0, // flags - result, - 0); - - if (0 == initiate_result) - // Immediate success: the OVERLAPPED will still get queued. - return 1; - - ACE_ASSERT (initiate_result == SOCKET_ERROR); - - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - initiate_result = 0; - break; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WSASend"))); - } - - delete result; - initiate_result = -1; - break; - } - - return initiate_result; -} - -ACE_WIN32_Asynch_Write_Stream::~ACE_WIN32_Asynch_Write_Stream (void) -{ -} - -int -ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Result *result) -{ - u_long bytes_written; - if (result->bytes_to_write () > MAXDWORD) - { - errno = ERANGE; - return -1; - } - DWORD bytes_to_write = ACE_static_cast (DWORD, result->bytes_to_write ()); - - result->set_error (0); // Clear error before starting IO. - - // Initiate the write - int initiate_result = ::WriteFile (result->handle (), - result->message_block ().rd_ptr (), - bytes_to_write, - &bytes_written, - result); - if (initiate_result == 1) - // Immediate success: the OVERLAPPED will still get queued. - return 1; - - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - return 0; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WriteFile"))); - } - return -1; - } -} - -// Methods belong to ACE_WIN32_Asynch_Operation base class. These -// methods are defined here to avoid VC++ warnings. They route the -// call to the ACE_WIN32_Asynch_Operation base class. - -int -ACE_WIN32_Asynch_Write_Stream::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - return ACE_WIN32_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_WIN32_Asynch_Write_Stream::cancel (void) -{ - return ACE_WIN32_Asynch_Operation::cancel (); -} - -ACE_Proactor * -ACE_WIN32_Asynch_Write_Stream::proactor (void) const -{ - return ACE_WIN32_Asynch_Operation::proactor (); -} - -ACE_WIN32_Asynch_Read_File_Result::ACE_WIN32_Asynch_Read_File_Result ( - ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number, - int scatter_enabled) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Read_Stream_Result_Impl (), - ACE_Asynch_Read_File_Result_Impl (), - ACE_WIN32_Asynch_Read_Stream_Result (handler, - handle, - message_block, - bytes_to_read, - act, - event, - priority, - signal_number, - scatter_enabled) -{ - this->Offset = offset; - this->OffsetHigh = offset_high; -} - -void -ACE_WIN32_Asynch_Read_File_Result::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - // Copy the data which was returned by GetQueuedCompletionStatus. - this->bytes_transferred_ = bytes_transferred; - this->success_ = success; - this->completion_key_ = completion_key; - this->error_ = error; - - // Appropriately move the pointers in the message block. - if (!this->scatter_enabled ()) - this->message_block_.wr_ptr (bytes_transferred); - else - { - static const size_t page_size = ACE_OS::getpagesize(); - - for (ACE_Message_Block* mb = &this->message_block_; - (mb != 0) && (bytes_transferred > 0); - mb = mb->cont ()) - { - // mb->space () is ought to be >= page_size. - // this is verified in the readv method - // ACE_ASSERT (mb->space () >= page_size); - - size_t len_part = page_size ; - - if ( len_part > bytes_transferred) - len_part = bytes_transferred; - - mb->wr_ptr (len_part); - - bytes_transferred -= len_part; - } - } - - // Create the interface result class. - ACE_Asynch_Read_File::Result result (this); - - // Call the application handler. - this->handler_.handle_read_file (result); -} - -ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result (void) -{ -} - -// Base class operations. These operations are here to kill dominance -// warnings. These methods call the base class methods. - -size_t -ACE_WIN32_Asynch_Read_File_Result::bytes_transferred (void) const -{ - return ACE_WIN32_Asynch_Result::bytes_transferred (); -} - -const void * -ACE_WIN32_Asynch_Read_File_Result::act (void) const -{ - return ACE_WIN32_Asynch_Result::act (); -} - -int -ACE_WIN32_Asynch_Read_File_Result::success (void) const -{ - return ACE_WIN32_Asynch_Result::success (); -} - -const void * -ACE_WIN32_Asynch_Read_File_Result::completion_key (void) const -{ - return ACE_WIN32_Asynch_Result::completion_key (); -} - -u_long -ACE_WIN32_Asynch_Read_File_Result::error (void) const -{ - return ACE_WIN32_Asynch_Result::error (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Read_File_Result::event (void) const -{ - return ACE_WIN32_Asynch_Result::event (); -} - -u_long -ACE_WIN32_Asynch_Read_File_Result::offset (void) const -{ - return ACE_WIN32_Asynch_Result::offset (); -} - -u_long -ACE_WIN32_Asynch_Read_File_Result::offset_high (void) const -{ - return ACE_WIN32_Asynch_Result::offset_high (); -} - -int -ACE_WIN32_Asynch_Read_File_Result::priority (void) const -{ - return ACE_WIN32_Asynch_Result::priority (); -} - -int -ACE_WIN32_Asynch_Read_File_Result::signal_number (void) const -{ - return ACE_WIN32_Asynch_Result::signal_number (); -} - -// The following methods belong to -// ACE_WIN32_Asynch_Read_Stream_Result. They are here to avoid VC++ -// warnings. These methods route their call to the -// ACE_WIN32_Asynch_Read_Stream_Result base class. - -size_t -ACE_WIN32_Asynch_Read_File_Result::bytes_to_read (void) const -{ - return ACE_WIN32_Asynch_Read_Stream_Result::bytes_to_read (); -} - -ACE_Message_Block & -ACE_WIN32_Asynch_Read_File_Result::message_block (void) const -{ - return ACE_WIN32_Asynch_Read_Stream_Result::message_block (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Read_File_Result::handle (void) const -{ - return ACE_WIN32_Asynch_Read_Stream_Result::handle (); -} - -int -ACE_WIN32_Asynch_Read_File_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - return ACE_WIN32_Asynch_Result::post_completion (proactor); -} - -// ************************************************************ - -ACE_WIN32_Asynch_Read_File::ACE_WIN32_Asynch_Read_File (ACE_WIN32_Proactor *win32_proactor) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Read_Stream_Impl (), - ACE_Asynch_Read_File_Impl (), - ACE_WIN32_Asynch_Read_Stream (win32_proactor) -{ -} - -int -ACE_WIN32_Asynch_Read_File::read (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) -{ - size_t space = message_block.space (); - if ( bytes_to_read > space ) - bytes_to_read = space; - - if ( bytes_to_read == 0 ) - ACE_ERROR_RETURN - ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_File::read:") - ACE_LIB_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), - -1); - - - ACE_WIN32_Asynch_Read_File_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Read_File_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_read, - act, - offset, - offset_high, - this->win32_proactor_->get_handle (), - priority, - signal_number), - -1); - - // Shared read - ssize_t return_val = this->shared_read (result); - - // Upon errors - if (return_val == -1) - delete result; - - return return_val; -} - -int -ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) -{ -#if ((ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - static const size_t page_size = ACE_OS::getpagesize(); - - FILE_SEGMENT_ELEMENT buffer_pointers[ACE_IOV_MAX + 1]; - int buffer_pointers_count = 0; - - // Each buffer must be at least the size of a system memory page - // and must be aligned on a system memory page size boundary - - // We should not read more than user requested, - // but it is allowed to read less - - size_t total_space = 0; - - for (const ACE_Message_Block* msg = &message_block; - msg != 0 && buffer_pointers_count < ACE_IOV_MAX && total_space < bytes_to_read; - msg = msg->cont(), ++buffer_pointers_count ) - { - size_t msg_space = msg->space (); - - if (msg_space < page_size) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_File::readv:") - ACE_LIB_TEXT ("Invalid message block size\n")), - -1); - - buffer_pointers[buffer_pointers_count].Buffer = msg->wr_ptr (); - total_space += page_size; - } - - // not read more than buffers space - if (bytes_to_read > total_space) - bytes_to_read = total_space; - - // ReadFileScatter API limits us to DWORD range. - if (bytes_to_read > MAXDWORD) - { - errno = ERANGE; - return -1; - } - DWORD dword_bytes_to_read = ACE_static_cast (DWORD, bytes_to_read); - - // last one should be completely 0 - buffer_pointers[buffer_pointers_count].Buffer = 0; - - ACE_WIN32_Asynch_Read_File_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Read_File_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_read, - act, - offset, - offset_high, - this->win32_proactor_->get_handle (), - priority, - signal_number, - 1), // scatter read enabled - -1); - - // do the scatter read - result->set_error (0); // Clear error before starting IO. - - int initiate_result = ::ReadFileScatter (result->handle (), - buffer_pointers, - dword_bytes_to_read, - 0, // reserved, must be NULL - result); - - if (0 != initiate_result) - // Immediate success: the OVERLAPPED will still get queued. - return 1; - - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - initiate_result = 0; - break; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ReadFileScatter"))); - } - - delete result; - initiate_result = -1; - break; - } - - return initiate_result; -#else /*#if ( (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))*/ - ACE_NOTSUP_RETURN (-1); -#endif /*#if ( (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))*/ -} - - -ACE_WIN32_Asynch_Read_File::~ACE_WIN32_Asynch_Read_File (void) -{ -} - -int -ACE_WIN32_Asynch_Read_File::read (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) -{ - return ACE_WIN32_Asynch_Read_Stream::read (message_block, - bytes_to_read, - act, - priority, - signal_number); -} - -int -ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number) -{ - return ACE_WIN32_Asynch_Read_Stream::readv (message_block, - bytes_to_read, - act, - priority, - signal_number); -} - -// Methods belong to ACE_WIN32_Asynch_Operation base class. These -// methods are defined here to avoid VC++ warnings. They route the -// call to the ACE_WIN32_Asynch_Operation base class. - -int -ACE_WIN32_Asynch_Read_File::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - return ACE_WIN32_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_WIN32_Asynch_Read_File::cancel (void) -{ - return ACE_WIN32_Asynch_Operation::cancel (); -} - -ACE_Proactor * -ACE_WIN32_Asynch_Read_File::proactor (void) const -{ - return ACE_WIN32_Asynch_Operation::proactor (); -} - -ACE_WIN32_Asynch_Write_File_Result::ACE_WIN32_Asynch_Write_File_Result ( - ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number, - int gather_enabled) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Write_Stream_Result_Impl (), - ACE_Asynch_Write_File_Result_Impl (), - ACE_WIN32_Asynch_Write_Stream_Result (handler, - handle, - message_block, - bytes_to_write, - act, - event, - priority, - signal_number, - gather_enabled) -{ - this->Offset = offset; - this->OffsetHigh = offset_high; -} - -void -ACE_WIN32_Asynch_Write_File_Result::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - // Copy the data which was returned by GetQueuedCompletionStatus - this->bytes_transferred_ = bytes_transferred; - this->success_ = success; - this->completion_key_ = completion_key; - this->error_ = error; - - // Appropriately move the pointers in the message block. - if (!this->gather_enabled ()) - this->message_block_.rd_ptr (bytes_transferred); - else - { - static const size_t page_size = ACE_OS::getpagesize(); - - for (ACE_Message_Block* mb = &this->message_block_; - (mb != 0) && (bytes_transferred > 0); - mb = mb->cont ()) - { - // mb->length () is ought to be >= page_size. - // this is verified in the writev method - // ACE_ASSERT (mb->length () >= page_size); - - size_t len_part = page_size; - - if ( len_part > bytes_transferred) - len_part = bytes_transferred; - - mb->rd_ptr (len_part); - - bytes_transferred -= len_part; - } - - } - - // Create the interface result class. - ACE_Asynch_Write_File::Result result (this); - - // Call the application handler. - this->handler_.handle_write_file (result); -} - -ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result (void) -{ -} - -// Base class operations. These operations are here to kill dominance -// warnings. These methods call the base class methods. - -size_t -ACE_WIN32_Asynch_Write_File_Result::bytes_transferred (void) const -{ - return ACE_WIN32_Asynch_Result::bytes_transferred (); -} - -const void * -ACE_WIN32_Asynch_Write_File_Result::act (void) const -{ - return ACE_WIN32_Asynch_Result::act (); -} - -int -ACE_WIN32_Asynch_Write_File_Result::success (void) const -{ - return ACE_WIN32_Asynch_Result::success (); -} - -const void * -ACE_WIN32_Asynch_Write_File_Result::completion_key (void) const -{ - return ACE_WIN32_Asynch_Result::completion_key (); -} - -u_long -ACE_WIN32_Asynch_Write_File_Result::error (void) const -{ - return ACE_WIN32_Asynch_Result::error (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Write_File_Result::event (void) const -{ - return ACE_WIN32_Asynch_Result::event (); -} - -u_long -ACE_WIN32_Asynch_Write_File_Result::offset (void) const -{ - return ACE_WIN32_Asynch_Result::offset (); -} - -u_long -ACE_WIN32_Asynch_Write_File_Result::offset_high (void) const -{ - return ACE_WIN32_Asynch_Result::offset_high (); -} - -int -ACE_WIN32_Asynch_Write_File_Result::priority (void) const -{ - return ACE_WIN32_Asynch_Result::priority (); -} - -int -ACE_WIN32_Asynch_Write_File_Result::signal_number (void) const -{ - return ACE_WIN32_Asynch_Result::signal_number (); -} - -// The following methods belong to -// ACE_WIN32_Asynch_Write_Stream_Result. They are here to avoid VC++ -// warnings. These methods route their call to the -// ACE_WIN32_Asynch_Write_Stream_Result base class. - -size_t -ACE_WIN32_Asynch_Write_File_Result::bytes_to_write (void) const -{ - return ACE_WIN32_Asynch_Write_Stream_Result::bytes_to_write (); -} - -ACE_Message_Block & -ACE_WIN32_Asynch_Write_File_Result::message_block (void) const -{ - return ACE_WIN32_Asynch_Write_Stream_Result::message_block (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Write_File_Result::handle (void) const -{ - return ACE_WIN32_Asynch_Write_Stream_Result::handle (); -} - -int -ACE_WIN32_Asynch_Write_File_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - return ACE_WIN32_Asynch_Result::post_completion (proactor); -} - -ACE_WIN32_Asynch_Write_File::ACE_WIN32_Asynch_Write_File (ACE_WIN32_Proactor *win32_proactor) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Write_Stream_Impl (), - ACE_Asynch_Write_File_Impl (), - ACE_WIN32_Asynch_Write_Stream (win32_proactor) -{ -} - -int -ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) -{ - size_t len = message_block.length (); - if ( bytes_to_write > len ) - bytes_to_write = len; - - if ( bytes_to_write == 0 ) - ACE_ERROR_RETURN - ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_File::write:") - ACE_LIB_TEXT ("Attempt to read 0 bytes\n")), - -1); - - ACE_WIN32_Asynch_Write_File_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Write_File_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_write, - act, - offset, - offset_high, - this->win32_proactor_->get_handle (), - priority, - signal_number), - -1); - - // Shared write - ssize_t return_val = this->shared_write (result); - - // Upon errors - if (return_val == -1) - delete result; - - return return_val; -} - -int -ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number) -{ -#if ((ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - static const size_t page_size = ACE_OS::getpagesize(); - - FILE_SEGMENT_ELEMENT buffer_pointers[ACE_IOV_MAX + 1]; - int buffer_pointers_count = 0; - - // Each buffer must be at least the size of a system memory page - // and must be aligned on a system memory page size boundary - - // We should not read more than user requested, - // but it is allowed to read less - - size_t total_len = 0; - - for (const ACE_Message_Block* msg = &message_block; - msg != 0 && buffer_pointers_count < ACE_IOV_MAX && total_len < bytes_to_write; - msg = msg->cont (), ++buffer_pointers_count ) - { - size_t msg_len = msg->length (); - - // Don't allow writing less than page_size, unless - // the size of the message block is big enough (so we don't write from - // memory which does not belong to the message block), and the message - // block is the last in the chain. - if (msg_len < page_size && - (msg->size () - (msg->rd_ptr () - msg->base ()) < page_size || // message block too small - bytes_to_write - total_len > page_size ))// NOT last chunk - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_File::writev:") - ACE_LIB_TEXT ("Invalid message block length\n")), - -1); - - buffer_pointers[buffer_pointers_count].Buffer = msg->rd_ptr (); - total_len += page_size; - } - - // not write more than we have in buffers - if (bytes_to_write > total_len) - bytes_to_write = total_len; - // WriteFileGather API limits us to DWORD range. - if (bytes_to_write > MAXDWORD) - { - errno = ERANGE; - return -1; - } - DWORD dword_bytes_to_write = ACE_static_cast (DWORD, bytes_to_write); - - // last one should be completely 0 - buffer_pointers[buffer_pointers_count].Buffer = 0; - - ACE_WIN32_Asynch_Write_File_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Write_File_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_write, - act, - offset, - offset_high, - this->win32_proactor_->get_handle (), - priority, - signal_number, - 1), // gather write enabled - -1); - - result->set_error(0); - - // do the gather write - int initiate_result = ::WriteFileGather (result->handle (), - buffer_pointers, - dword_bytes_to_write, - 0, // reserved, must be NULL - result); - - if (0 != initiate_result) - // Immediate success: the OVERLAPPED will still get queued. - return 1; - - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - initiate_result = 0; - break; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WriteFileGather"))); - } - - delete result; - initiate_result = -1; - break; - } - - return initiate_result; -#else /*#if ((ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))*/ - - ACE_NOTSUP_RETURN (-1); - -#endif /* */ -} - - -ACE_WIN32_Asynch_Write_File::~ACE_WIN32_Asynch_Write_File (void) -{ -} - -int -ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) -{ - return ACE_WIN32_Asynch_Write_Stream::write (message_block, - bytes_to_write, - act, - priority, - signal_number); -} - -int -ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number) -{ - return ACE_WIN32_Asynch_Write_Stream::writev (message_block, - bytes_to_write, - act, - priority, - signal_number); -} - -// Methods belong to ACE_WIN32_Asynch_Operation base class. These -// methods are defined here to avoid VC++ warnings. They route the -// call to the ACE_WIN32_Asynch_Operation base class. - -int -ACE_WIN32_Asynch_Write_File::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - return ACE_WIN32_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_WIN32_Asynch_Write_File::cancel (void) -{ - return ACE_WIN32_Asynch_Operation::cancel (); -} - -ACE_Proactor * -ACE_WIN32_Asynch_Write_File::proactor (void) const -{ - return ACE_WIN32_Asynch_Operation::proactor (); -} - -size_t -ACE_WIN32_Asynch_Accept_Result::bytes_to_read (void) const -{ - return this->bytes_to_read_; -} - -ACE_Message_Block & -ACE_WIN32_Asynch_Accept_Result::message_block (void) const -{ - return this->message_block_; -} - -ACE_HANDLE -ACE_WIN32_Asynch_Accept_Result::listen_handle (void) const -{ - return this->listen_handle_; -} - -ACE_HANDLE -ACE_WIN32_Asynch_Accept_Result::accept_handle (void) const -{ - return this->accept_handle_; -} - -ACE_WIN32_Asynch_Accept_Result::ACE_WIN32_Asynch_Accept_Result ( - ACE_Handler &handler, - ACE_HANDLE listen_handle, - ACE_HANDLE accept_handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Accept_Result_Impl (), - ACE_WIN32_Asynch_Result (handler, - act, - event, - 0, - 0, - priority, - signal_number), - bytes_to_read_ (bytes_to_read), - message_block_ (message_block), - listen_handle_ (listen_handle), - accept_handle_ (accept_handle) -{ -} - -void -ACE_WIN32_Asynch_Accept_Result::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - // Copy the data which was returned by GetQueuedCompletionStatus - this->bytes_transferred_ = bytes_transferred; - this->success_ = success; - this->completion_key_ = completion_key; - this->error_ = error; - - // Appropriately move the pointers in the message block. - this->message_block_.wr_ptr (bytes_transferred); - - // Create the interface result class. - ACE_Asynch_Accept::Result result (this); - - // Call the application handler. - this->handler_.handle_accept (result); -} - -ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result (void) -{ -} - -// Base class operations. These operations are here to kill dominance -// warnings. These methods call the base class methods. - -size_t -ACE_WIN32_Asynch_Accept_Result::bytes_transferred (void) const -{ - return ACE_WIN32_Asynch_Result::bytes_transferred (); -} - -const void * -ACE_WIN32_Asynch_Accept_Result::act (void) const -{ - return ACE_WIN32_Asynch_Result::act (); -} - -int -ACE_WIN32_Asynch_Accept_Result::success (void) const -{ - return ACE_WIN32_Asynch_Result::success (); -} - -const void * -ACE_WIN32_Asynch_Accept_Result::completion_key (void) const -{ - return ACE_WIN32_Asynch_Result::completion_key (); -} - -u_long -ACE_WIN32_Asynch_Accept_Result::error (void) const -{ - return ACE_WIN32_Asynch_Result::error (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Accept_Result::event (void) const -{ - return ACE_WIN32_Asynch_Result::event (); -} - -u_long -ACE_WIN32_Asynch_Accept_Result::offset (void) const -{ - return ACE_WIN32_Asynch_Result::offset (); -} - -u_long -ACE_WIN32_Asynch_Accept_Result::offset_high (void) const -{ - return ACE_WIN32_Asynch_Result::offset_high (); -} - -int -ACE_WIN32_Asynch_Accept_Result::priority (void) const -{ - return ACE_WIN32_Asynch_Result::priority (); -} - -int -ACE_WIN32_Asynch_Accept_Result::signal_number (void) const -{ - return ACE_WIN32_Asynch_Result::signal_number (); -} - -int -ACE_WIN32_Asynch_Accept_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - return ACE_WIN32_Asynch_Result::post_completion (proactor); -} - -ACE_WIN32_Asynch_Accept::ACE_WIN32_Asynch_Accept (ACE_WIN32_Proactor *win32_proactor) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Accept_Impl (), - ACE_WIN32_Asynch_Operation (win32_proactor) -{ -} - -int -ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, - size_t bytes_to_read, - ACE_HANDLE accept_handle, - const void *act, - int priority, - int signal_number) -{ -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) - // Sanity check: make sure that enough space has been allocated by - // the caller. - size_t address_size = sizeof (sockaddr_in) + sizeof (sockaddr); - size_t space_in_use = message_block.wr_ptr () - message_block.base (); - size_t total_size = message_block.size (); - size_t available_space = total_size - space_in_use; - size_t space_needed = bytes_to_read + 2 * address_size; - if (available_space < space_needed) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Buffer too small\n")), -1); - - // WIN Specific. - - // AcceptEx API limits us to DWORD range. - if (bytes_to_read > MAXDWORD) - { - errno = ERANGE; - return -1; - } - DWORD dword_bytes_to_read = ACE_static_cast (DWORD, bytes_to_read); - - int close_accept_handle = 0; - // If the is invalid, we will create a new socket. - if (accept_handle == ACE_INVALID_HANDLE) - { - accept_handle = ACE_OS::socket (PF_INET, - SOCK_STREAM, - 0); - if (accept_handle == ACE_INVALID_HANDLE) - { - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_OS::socket"))); - } - return -1; - } - else - // Remember to close the socket down if failures occur. - close_accept_handle = 1; - } - - // Common code for both WIN and POSIX. - ACE_WIN32_Asynch_Accept_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Accept_Result (*this->handler_, - this->handle_, - accept_handle, - message_block, - bytes_to_read, - act, - this->win32_proactor_->get_handle (), - priority, - signal_number), - -1); - - u_long bytes_read; - - // Initiate the accept. - int initiate_result = ::AcceptEx ((SOCKET) result->listen_handle (), - (SOCKET) result->accept_handle (), - result->message_block ().wr_ptr (), - dword_bytes_to_read, - ACE_static_cast (DWORD, address_size), - ACE_static_cast (DWORD, address_size), - &bytes_read, - result); - if (initiate_result == 1) - // Immediate success: the OVERLAPPED will still get queued. - return 1; - - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - return 0; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - if (close_accept_handle == 1) - // Close the newly created socket - ACE_OS::closesocket (accept_handle); - - // Cleanup dynamically allocated Asynch_Result. - delete result; - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ReadFile"))); - } - return -1; - } -#else /* ACE_HAS_WINNT4 .......|| ACE_HAS_AIO_CALLS */ - ACE_UNUSED_ARG (message_block); - ACE_UNUSED_ARG (bytes_to_read); - ACE_UNUSED_ARG (accept_handle); - ACE_UNUSED_ARG (act); - ACE_UNUSED_ARG (priority); - ACE_UNUSED_ARG (signal_number); - ACE_NOTSUP_RETURN (-1); -#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (defined (ACE_HAS_AIO_CALLS) */ -} - -ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept (void) -{ -} - -// Methods belong to ACE_WIN32_Asynch_Operation base class. These -// methods are defined here to avoid VC++ warnings. They route the -// call to the ACE_WIN32_Asynch_Operation base class. - -int -ACE_WIN32_Asynch_Accept::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - return ACE_WIN32_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_WIN32_Asynch_Accept::cancel (void) -{ - return ACE_WIN32_Asynch_Operation::cancel (); -} - -ACE_Proactor * -ACE_WIN32_Asynch_Accept::proactor (void) const -{ - return ACE_WIN32_Asynch_Operation::proactor (); -} - -// ********************************************************************* - -ACE_HANDLE -ACE_WIN32_Asynch_Connect_Result::connect_handle (void) const -{ - return this->connect_handle_; -} - -void ACE_WIN32_Asynch_Connect_Result::connect_handle ( ACE_HANDLE handle ) -{ - this->connect_handle_ = handle; -} - - -ACE_WIN32_Asynch_Connect_Result::ACE_WIN32_Asynch_Connect_Result - (ACE_Handler &handler, - ACE_HANDLE connect_handle, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Connect_Result_Impl (), - ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number), - connect_handle_ ( connect_handle ) -{ - ; -} - -void -ACE_WIN32_Asynch_Connect_Result::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - // Copy the data. - this->bytes_transferred_ = bytes_transferred; - this->success_ = success; - this->completion_key_ = completion_key; - this->error_ = error; - - // Create the interface result class. - ACE_Asynch_Connect::Result result (this); - - // Call the application handler. - this->handler_.handle_connect (result); -} - -ACE_WIN32_Asynch_Connect_Result::~ACE_WIN32_Asynch_Connect_Result (void) -{ -} - -// Base class operations. These operations are here to kill dominance -// warnings. These methods call the base class methods. - -size_t -ACE_WIN32_Asynch_Connect_Result::bytes_transferred (void) const -{ - return ACE_WIN32_Asynch_Result::bytes_transferred (); -} - -const void * -ACE_WIN32_Asynch_Connect_Result::act (void) const -{ - return ACE_WIN32_Asynch_Result::act (); -} - -int -ACE_WIN32_Asynch_Connect_Result::success (void) const -{ - return ACE_WIN32_Asynch_Result::success (); -} - -const void * -ACE_WIN32_Asynch_Connect_Result::completion_key (void) const -{ - return ACE_WIN32_Asynch_Result::completion_key (); -} - -u_long -ACE_WIN32_Asynch_Connect_Result::error (void) const -{ - return ACE_WIN32_Asynch_Result::error (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Connect_Result::event (void) const -{ - return ACE_WIN32_Asynch_Result::event (); -} - -u_long -ACE_WIN32_Asynch_Connect_Result::offset (void) const -{ - return ACE_WIN32_Asynch_Result::offset (); -} - -u_long -ACE_WIN32_Asynch_Connect_Result::offset_high (void) const -{ - return ACE_WIN32_Asynch_Result::offset_high (); -} - -int -ACE_WIN32_Asynch_Connect_Result::priority (void) const -{ - return ACE_WIN32_Asynch_Result::priority (); -} - -int -ACE_WIN32_Asynch_Connect_Result::signal_number (void) const -{ - return ACE_WIN32_Asynch_Result::signal_number (); -} - -int -ACE_WIN32_Asynch_Connect_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - return ACE_WIN32_Asynch_Result::post_completion (proactor); -} - -// ********************************************************************* - -ACE_WIN32_Asynch_Connect::ACE_WIN32_Asynch_Connect (ACE_WIN32_Proactor * win32_proactor) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Connect_Impl (), - ACE_WIN32_Asynch_Operation (win32_proactor), - flg_open_ (0), - task_lock_count_ (0) -{ -} - -ACE_WIN32_Asynch_Connect::~ACE_WIN32_Asynch_Connect (void) -{ - this->close (); - this->reactor (0); // to avoid purge_pending_notifications -} - -ACE_Proactor * -ACE_WIN32_Asynch_Connect::proactor (void) const -{ - return ACE_WIN32_Asynch_Operation::proactor (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Connect::get_handle (void) const -{ - - ACE_ASSERT (0); - return ACE_INVALID_HANDLE; -} - -void -ACE_WIN32_Asynch_Connect::set_handle (ACE_HANDLE) -{ - ACE_ASSERT (0) ; -} - -int -ACE_WIN32_Asynch_Connect::open (ACE_Handler &handler, - ACE_HANDLE, - const void *completion_key, - ACE_Proactor *proactor) -{ - ACE_TRACE (ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::open\n")); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - // if we are already opened, - // we could not create a new handler without closing the previous - if (this->flg_open_ != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::open:") - ACE_LIB_TEXT ("connector already open \n")), - -1); - - //int result = - ACE_WIN32_Asynch_Operation::open (handler, - ACE_INVALID_HANDLE, - completion_key, - proactor); - - // Ignore result as we pass ACE_INVALID_HANDLE - //if (result == -1) - // return result; - - this->flg_open_ = 1; - - return 0; -} - -int -ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle, - const ACE_Addr & remote_sap, - const ACE_Addr & local_sap, - int reuse_addr, - const void *act, - int priority, - int signal_number) -{ - ACE_TRACE (ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::connect\n")); - - { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - if (this->flg_open_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect") - ACE_LIB_TEXT ("connector was not opened before\n")), - -1); - - // Common code for both WIN and WIN32. - // Create future Asynch_Connect_Result - ACE_WIN32_Asynch_Connect_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Connect_Result (*this->handler_, - connect_handle, - act, - this->win32_proactor_->get_handle (), - priority, - signal_number), - -1); - - int rc = connect_i (result, - remote_sap, - local_sap, - reuse_addr); - - // update handle - connect_handle = result->connect_handle (); - - if (rc != 0) - return post_result (result, 1); - - // Enqueue result we will wait for completion - - if (this->result_map_.bind (connect_handle, result) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect:") - ACE_LIB_TEXT ("result map binding failed\n"))); - result->set_error (EFAULT); - return post_result (result, 1); - } - - this->task_lock_count_++; - } - - ACE_Asynch_Pseudo_Task & task = - this->win32_proactor_->get_asynch_pseudo_task (); - - int rc_task = task.register_io_handler (connect_handle, - this, - ACE_Event_Handler::CONNECT_MASK, - 0); // not to suspend after register - - { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - this->task_lock_count_--; - - int post_enable = 1; - - if (rc_task == -2 && task_lock_count_ == 0) // task is closing - { - post_enable = 0; - task.unlock_finish (); - } - - if (rc_task < 0) - { - ACE_WIN32_Asynch_Connect_Result *result = 0; - - this->result_map_.unbind (connect_handle, result); - - if (result != 0) - { - result->set_error (EFAULT); - - return post_result (result, post_enable); - } - } - } - - return 0; -} - -int ACE_WIN32_Asynch_Connect::post_result (ACE_WIN32_Asynch_Connect_Result * result, - int post_enable) -{ - if (this->flg_open_ != 0 && post_enable != 0) - { - if (this->win32_proactor_ ->post_completion (result) == 0) - return 0; - - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Error:(%P | %t):%p\n"), - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::post_result: ") - ACE_LIB_TEXT (" failed"))); - } - - ACE_HANDLE handle = result->connect_handle (); - - if (handle != ACE_INVALID_HANDLE) - ACE_OS::closesocket (handle); - - delete result; - - return -1; -} - -//@@ New method connect_i -// return code : -// -1 errors before attempt to connect -// 0 connect started -// 1 connect finished ( may be unsuccessfully) - -int -ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, - const ACE_Addr & remote_sap, - const ACE_Addr & local_sap, - int reuse_addr) -{ - result->set_bytes_transferred (0); - - ACE_HANDLE handle = result->connect_handle (); - - if (handle == ACE_INVALID_HANDLE) - { - int protocol_family = remote_sap.get_type (); - - handle = ACE_OS::socket (protocol_family, - SOCK_STREAM, - 0); - - // save it - result->connect_handle (handle); - - if (handle == ACE_INVALID_HANDLE) - { - result->set_error (errno); - - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect_i: ") - ACE_LIB_TEXT (" ACE_OS::socket failed\n")), - -1); - } - - // Reuse the address - int one = 1; - if (protocol_family != PF_UNIX && - reuse_addr != 0 && - ACE_OS::setsockopt (handle, - SOL_SOCKET, - SO_REUSEADDR, - (const char*) &one, - sizeof one) == -1) - { - result->set_error (errno); - - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect_i: ") - ACE_LIB_TEXT (" ACE_OS::setsockopt failed\n")), - -1); - } - } - - if (local_sap != ACE_Addr::sap_any) - { - sockaddr * laddr = ACE_reinterpret_cast (sockaddr *, - local_sap.get_addr ()); - int size = local_sap.get_size (); - - if (ACE_OS::bind (handle, laddr, size) == -1) - { - result->set_error (errno); - - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect_i: ") - ACE_LIB_TEXT (" ACE_OS::bind failed\n")), - -1); - } - } - - // set non blocking mode - - if (ACE::set_flags (handle, ACE_NONBLOCK) != 0) - { - result->set_error (errno); - - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect_i: ") - ACE_LIB_TEXT (" ACE::set_flags failed\n")), - -1); - } - - for (;;) - { - int rc = ACE_OS::connect (handle, - ACE_reinterpret_cast (sockaddr *, - remote_sap.get_addr ()), - remote_sap.get_size ()); - - if (rc < 0) // failure - { - if (errno == EWOULDBLOCK || errno == EINPROGRESS) - return 0; // connect started - - if (errno == EINTR) - continue; - - result->set_error (errno); - } - return 1 ; // connect finished - } - - ACE_NOTREACHED (return 0); -} - - -//@@ New method cancel_uncompleted -// It performs cancellation of all pending requests -// -// Parameter flg_notify can be -// 0 - don't send notifications about canceled accepts -// !0 - notify user about canceled accepts -// according WIN32 standards we should receive notifications -// on canceled AIO requests -// -// Return value : number of cancelled requests -// - -int -ACE_WIN32_Asynch_Connect::cancel_uncompleted (int flg_notify, ACE_Handle_Set & set) -{ - ACE_TRACE (ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::cancel_uncompleted\n")); - - int retval = 0; - - MAP_MANAGER::ITERATOR iter (result_map_); - - MAP_MANAGER::ENTRY * me = 0; - - set.reset (); - - for (; iter.next (me) != 0; retval++, iter.advance ()) - { - ACE_HANDLE handle = me->ext_id_; - ACE_WIN32_Asynch_Connect_Result* result = me->int_id_ ; - - set.set_bit (handle); - - result->set_bytes_transferred (0); - result->set_error (ERROR_OPERATION_ABORTED); - this->post_result (result, flg_notify); - } - - result_map_.unbind_all (); - - return retval; -} - -int -ACE_WIN32_Asynch_Connect::cancel (void) -{ - ACE_TRACE (ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::cancel\n")); - - //We are not really ACE_WIN32_Asynch_Operation - //so we could not call ::aiocancel () - // or just write - //return ACE_WIN32_Asynch_Operation::cancel (); - //We delegate real cancelation to cancel_uncompleted (1) - - int rc = -1 ; // ERRORS - - ACE_Handle_Set set; - - { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - int num_cancelled = cancel_uncompleted (flg_open_, set); - - if (num_cancelled == 0) - rc = 1; // AIO_ALLDONE - else if (num_cancelled > 0) - rc = 0; // AIO_CANCELED - - if (this->flg_open_ == 0) - return rc; - - this->task_lock_count_++; - } - - ACE_Asynch_Pseudo_Task & task = - this->win32_proactor_->get_asynch_pseudo_task (); - - int rc_task = task.remove_io_handler (set); - - { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - this->task_lock_count_--; - - if (rc_task == -2 && task_lock_count_ == 0) // task is closing - task.unlock_finish (); - } - - return rc; -} - -int -ACE_WIN32_Asynch_Connect::close (void) -{ - ACE_TRACE (ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::close\n")); - - ACE_Handle_Set set; - - { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - int num_cancelled = cancel_uncompleted (flg_open_, set); - - if (num_cancelled == 0 || this->flg_open_ == 0) - { - this->flg_open_ = 0; - return 0; - } - - this->task_lock_count_++; - } - - ACE_Asynch_Pseudo_Task & task = - this->win32_proactor_->get_asynch_pseudo_task (); - - int rc_task = task.remove_io_handler (set); - - { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); - - this->task_lock_count_--; - - if (rc_task == -2 && task_lock_count_ == 0) // task is closing - task.unlock_finish (); - - this->flg_open_ = 0; - } - - return 0; -} - -int -ACE_WIN32_Asynch_Connect::handle_exception (ACE_HANDLE fd) -{ - ACE_TRACE (ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::handle_exception\n")); - return handle_output (fd); -} - -int -ACE_WIN32_Asynch_Connect::handle_input (ACE_HANDLE fd) -{ - ACE_TRACE (ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::handle_input\n")); - return handle_output (fd); -} - -int -ACE_WIN32_Asynch_Connect::handle_output (ACE_HANDLE fd) -{ - ACE_TRACE (ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::handle_output\n")); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0)); - - ACE_WIN32_Asynch_Connect_Result* result = 0; - - if (this->result_map_.unbind (fd, result) != 0) // not found - return -1; - - int sockerror = 0 ; - int lsockerror = sizeof sockerror; - - ACE_OS::getsockopt (fd, - SOL_SOCKET, - SO_ERROR, - (char*) & sockerror, - & lsockerror); - - result->set_bytes_transferred (0); - result->set_error (sockerror); - this->post_result (result, this->flg_open_); - - //ACE_Asynch_Pseudo_Task & task = - // this->win32_proactor_->get_asynch_pseudo_task(); - - // remove_io_handler() contains flag DONT_CALL - //task.remove_io_handler ( fd ); - - //return 0; - return -1; -} - - -int -ACE_WIN32_Asynch_Connect::handle_close (ACE_HANDLE fd, ACE_Reactor_Mask) -{ - ACE_TRACE(ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::handle_close\n")); - - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0)); - - ACE_Asynch_Pseudo_Task & task = - this->win32_proactor_->get_asynch_pseudo_task (); - - if (task.is_active () == 0) // task is closing - { - if (this->flg_open_ != 0) // we are open - { - this->flg_open_ = 0; - - // it means other thread is waiting for reactor token_ - if (this->task_lock_count_ > 0) - task.lock_finish (); - } - - ACE_Handle_Set set; - this->cancel_uncompleted (0, set); - - return 0; - } - - // remove_io_handler() contains flag DONT_CALL - // so it is save - task.remove_io_handler (fd); - - ACE_WIN32_Asynch_Connect_Result* result = 0; - - if (this->result_map_.unbind (fd, result) != 0) // not found - return -1; - - result->set_bytes_transferred (0); - result->set_error (ERROR_OPERATION_ABORTED); - this->post_result (result, this->flg_open_); - - return 0; -} - -// ********************************************************************* - -ACE_HANDLE -ACE_WIN32_Asynch_Transmit_File_Result::socket (void) const -{ - return this->socket_; -} - -ACE_HANDLE -ACE_WIN32_Asynch_Transmit_File_Result::file (void) const -{ - return this->file_; -} - -ACE_Asynch_Transmit_File::Header_And_Trailer * -ACE_WIN32_Asynch_Transmit_File_Result::header_and_trailer (void) const -{ - return this->header_and_trailer_; -} - -size_t -ACE_WIN32_Asynch_Transmit_File_Result::bytes_to_write (void) const -{ - return this->bytes_to_write_; -} - -size_t -ACE_WIN32_Asynch_Transmit_File_Result::bytes_per_send (void) const -{ - return this->bytes_per_send_; -} - -u_long -ACE_WIN32_Asynch_Transmit_File_Result::flags (void) const -{ - return this->flags_; -} - -ACE_WIN32_Asynch_Transmit_File_Result::ACE_WIN32_Asynch_Transmit_File_Result ( - ACE_Handler &handler, - ACE_HANDLE socket, - ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - ACE_HANDLE event, - int priority, - int signal_number) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Transmit_File_Result_Impl (), - ACE_WIN32_Asynch_Result (handler, - act, - event, - offset, - offset_high, - priority, - signal_number), - socket_ (socket), - file_ (file), - header_and_trailer_ (header_and_trailer), - bytes_to_write_ (bytes_to_write), - bytes_per_send_ (bytes_per_send), - flags_ (flags) -{ -} - -void -ACE_WIN32_Asynch_Transmit_File_Result::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - // Copy the data which was returned by GetQueuedCompletionStatus - this->bytes_transferred_ = bytes_transferred; - this->success_ = success; - this->completion_key_ = completion_key; - this->error_ = error; - - // We will not do this because (a) the header and trailer blocks may - // be the same message_blocks and (b) in cases of failures we have - // no idea how much of what (header, data, trailer) was sent. - /* - if (this->success_ && this->header_and_trailer_ != 0) - { - ACE_Message_Block *header = this->header_and_trailer_->header (); - if (header != 0) - header->rd_ptr (this->header_and_trailer_->header_bytes ()); - - ACE_Message_Block *trailer = this->header_and_trailer_->trailer (); - if (trailer != 0) - trailer->rd_ptr (this->header_and_trailer_->trailer_bytes ()); - } - */ - - // Create the interface result class. - ACE_Asynch_Transmit_File::Result result (this); - - // Call the application handler. - this->handler_.handle_transmit_file (result); -} - -ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result (void) -{ -} - -// Base class operations. These operations are here to kill dominance -// warnings. These methods call the base class methods. - -size_t -ACE_WIN32_Asynch_Transmit_File_Result::bytes_transferred (void) const -{ - return ACE_WIN32_Asynch_Result::bytes_transferred (); -} - -const void * -ACE_WIN32_Asynch_Transmit_File_Result::act (void) const -{ - return ACE_WIN32_Asynch_Result::act (); -} - -int -ACE_WIN32_Asynch_Transmit_File_Result::success (void) const -{ - return ACE_WIN32_Asynch_Result::success (); -} - -const void * -ACE_WIN32_Asynch_Transmit_File_Result::completion_key (void) const -{ - return ACE_WIN32_Asynch_Result::completion_key (); -} - -u_long -ACE_WIN32_Asynch_Transmit_File_Result::error (void) const -{ - return ACE_WIN32_Asynch_Result::error (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Transmit_File_Result::event (void) const -{ - return ACE_WIN32_Asynch_Result::event (); -} - -u_long -ACE_WIN32_Asynch_Transmit_File_Result::offset (void) const -{ - return ACE_WIN32_Asynch_Result::offset (); -} - -u_long -ACE_WIN32_Asynch_Transmit_File_Result::offset_high (void) const -{ - return ACE_WIN32_Asynch_Result::offset_high (); -} - -int -ACE_WIN32_Asynch_Transmit_File_Result::priority (void) const -{ - return ACE_WIN32_Asynch_Result::priority (); -} - -int -ACE_WIN32_Asynch_Transmit_File_Result::signal_number (void) const -{ - return ACE_WIN32_Asynch_Result::signal_number (); -} - -int -ACE_WIN32_Asynch_Transmit_File_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - return ACE_WIN32_Asynch_Result::post_completion (proactor); -} - -ACE_WIN32_Asynch_Transmit_File::ACE_WIN32_Asynch_Transmit_File (ACE_WIN32_Proactor *win32_proactor) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Transmit_File_Impl (), - ACE_WIN32_Asynch_Operation (win32_proactor) -{ -} - -int -ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - int priority, - int signal_number) -{ -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) - - // TransmitFile API limits us to DWORD range. - if (bytes_to_write > MAXDWORD || bytes_per_send > MAXDWORD) - { - errno = ERANGE; - return -1; - } - DWORD dword_bytes_to_write = ACE_static_cast (DWORD, bytes_to_write); - DWORD dword_bytes_per_send = ACE_static_cast (DWORD, bytes_per_send); - - ACE_WIN32_Asynch_Transmit_File_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Transmit_File_Result (*this->handler_, - this->handle_, - file, - header_and_trailer, - bytes_to_write, - offset, - offset_high, - bytes_per_send, - flags, - act, - this->win32_proactor_->get_handle (), - priority, - signal_number), - -1); - - ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers = 0; - if (result->header_and_trailer () != 0) - transmit_buffers = result->header_and_trailer ()->transmit_buffers (); - - // Initiate the transmit file - int initiate_result = ::TransmitFile ((SOCKET) result->socket (), - result->file (), - dword_bytes_to_write, - dword_bytes_per_send, - result, - transmit_buffers, - result->flags ()); - if (initiate_result == 1) - // Immediate success: the OVERLAPPED will still get queued. - return 1; - - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - return 0; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - // Cleanup dynamically allocated Asynch_Result - delete result; - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("TransmitFile"))); - } - return -1; - } -#else /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */ - ACE_UNUSED_ARG (file); - ACE_UNUSED_ARG (header_and_trailer); - ACE_UNUSED_ARG (bytes_to_write); - ACE_UNUSED_ARG (offset); - ACE_UNUSED_ARG (offset_high); - ACE_UNUSED_ARG (bytes_per_send); - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (act); - ACE_UNUSED_ARG (priority); - ACE_UNUSED_ARG (signal_number); - ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_AIO_CALLS */ -} - -ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File (void) -{ -} - -// Methods belong to ACE_WIN32_Asynch_Operation base class. These -// methods are defined here to avoid VC++ warnings. They route the -// call to the ACE_WIN32_Asynch_Operation base class. - -int -ACE_WIN32_Asynch_Transmit_File::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - return ACE_WIN32_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_WIN32_Asynch_Transmit_File::cancel (void) -{ - return ACE_WIN32_Asynch_Operation::cancel (); -} - -ACE_Proactor * -ACE_WIN32_Asynch_Transmit_File::proactor (void) const -{ - return ACE_WIN32_Asynch_Operation::proactor (); -} - -size_t -ACE_WIN32_Asynch_Read_Dgram_Result::bytes_to_read (void) const -{ - return this->bytes_to_read_; -} - -ACE_Message_Block* -ACE_WIN32_Asynch_Read_Dgram_Result::message_block (void) const -{ - return this->message_block_; -} - - -int -ACE_WIN32_Asynch_Read_Dgram_Result::remote_address (ACE_Addr& addr) const -{ - int retVal = -1; // failure - - // make sure the addresses are of the same type - if (addr.get_type () == this->remote_address_->get_type ()) - { // copy the remote_address_ into addr - addr.set_addr (this->remote_address_->get_addr (), - this->remote_address_->get_size ()); - retVal = 0; // success - } - - return retVal; -} - -sockaddr * -ACE_WIN32_Asynch_Read_Dgram_Result::saddr () const -{ - return (sockaddr *) this->remote_address_->get_addr (); -} - - -int -ACE_WIN32_Asynch_Read_Dgram_Result::flags (void) const -{ - return this->flags_; -} - -ACE_HANDLE -ACE_WIN32_Asynch_Read_Dgram_Result::handle (void) const -{ - return this->handle_; -} - -size_t -ACE_WIN32_Asynch_Read_Dgram_Result::bytes_transferred (void) const -{ - return ACE_WIN32_Asynch_Result::bytes_transferred (); -} - -const void * -ACE_WIN32_Asynch_Read_Dgram_Result::act (void) const -{ - return ACE_WIN32_Asynch_Result::act (); -} - -int -ACE_WIN32_Asynch_Read_Dgram_Result::success (void) const -{ - return ACE_WIN32_Asynch_Result::success (); -} - -const void * -ACE_WIN32_Asynch_Read_Dgram_Result::completion_key (void) const -{ - return ACE_WIN32_Asynch_Result::completion_key (); -} - -u_long -ACE_WIN32_Asynch_Read_Dgram_Result::error (void) const -{ - return ACE_WIN32_Asynch_Result::error (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Read_Dgram_Result::event (void) const -{ - return ACE_WIN32_Asynch_Result::event (); -} - -u_long -ACE_WIN32_Asynch_Read_Dgram_Result::offset (void) const -{ - return ACE_WIN32_Asynch_Result::offset (); -} - -u_long -ACE_WIN32_Asynch_Read_Dgram_Result::offset_high (void) const -{ - return ACE_WIN32_Asynch_Result::offset_high (); -} - -int -ACE_WIN32_Asynch_Read_Dgram_Result::priority (void) const -{ - return ACE_WIN32_Asynch_Result::priority (); -} - -int -ACE_WIN32_Asynch_Read_Dgram_Result::signal_number (void) const -{ - return ACE_WIN32_Asynch_Result::signal_number (); -} - -int -ACE_WIN32_Asynch_Read_Dgram_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - return ACE_WIN32_Asynch_Result::post_completion (proactor); -} - -ACE_WIN32_Asynch_Read_Dgram_Result::ACE_WIN32_Asynch_Read_Dgram_Result ( - ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_read, - int flags, - int protocol_family, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Read_Dgram_Result_Impl(), - ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number), - bytes_to_read_ (bytes_to_read), - message_block_ (message_block), - remote_address_ (0), - addr_len_ (0), - flags_ (flags), - handle_ (handle) -{ - ACE_ASSERT (protocol_family == PF_INET); // only supporting INET addresses - - ACE_NEW (remote_address_, ACE_INET_Addr); - addr_len_ = remote_address_->get_size (); - - ACE_UNUSED_ARG (protocol_family); -} - -void -ACE_WIN32_Asynch_Read_Dgram_Result::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - // Copy the data which was returned by GetQueuedCompletionStatus - this->bytes_transferred_ = bytes_transferred; - this->success_ = success; - this->completion_key_ = completion_key; - this->error_ = error; - - // Appropriately move the pointers in the message block. - for (ACE_Message_Block* mb = this->message_block_; - (mb != 0) && (bytes_transferred > 0); - mb = mb->cont ()) - { - size_t len_part = mb->space (); - - if ( len_part > bytes_transferred) - len_part = bytes_transferred; - - mb->wr_ptr (len_part); - - bytes_transferred -= len_part; - } - - // Adjust the address length - this->remote_address_->set_size (this->addr_len_); - - // Create the interface result class. - ACE_Asynch_Read_Dgram::Result result (this); - - // Call the application handler. - this->handler_.handle_read_dgram (result); -} - -ACE_WIN32_Asynch_Read_Dgram_Result::~ACE_WIN32_Asynch_Read_Dgram_Result (void) -{ - delete this->remote_address_; -} - -//*************************************************************************** - -ACE_WIN32_Asynch_Read_Dgram::~ACE_WIN32_Asynch_Read_Dgram (void) -{ -} - -ssize_t -ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, - size_t & number_of_bytes_recvd, - int flags, - int protocol_family, - const void *act, - int priority, - int signal_number) -{ - number_of_bytes_recvd = 0; - - size_t bytes_to_read = 0; - - iovec iov[ACE_IOV_MAX]; - int iovcnt = 0; - - for (const ACE_Message_Block* msg = message_block; - msg != 0 && iovcnt < ACE_IOV_MAX; - msg = msg->cont () , ++iovcnt ) - { - size_t msg_space = msg->space (); - - // OS should correctly process zero length buffers - // if ( msg_space == 0 ) - // ACE_ERROR_RETURN ((LM_ERROR, - // ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:") - // ACE_LIB_TEXT ("No space in the message block\n")), - // -1); - - bytes_to_read += msg_space; - - // Make as many iovec as needed to fit all of msg_len. - size_t wr_ptr_offset = 0; - while (msg_space > 0 && iovcnt < ACE_IOV_MAX) - { - u_long this_chunk_length; - if (msg_space > ULONG_MAX) - this_chunk_length = ULONG_MAX; - else - this_chunk_length = ACE_static_cast (u_long, msg_space); - // Collect the data in the iovec. - iov[iovcnt].iov_base = msg->wr_ptr () + wr_ptr_offset; - iov[iovcnt].iov_len = this_chunk_length; - msg_space -= this_chunk_length; - wr_ptr_offset += this_chunk_length; - - // Increment iovec counter if there's more to do. - if (msg_space > 0) - iovcnt++; - } - if (msg_space > 0) // Ran out of iovecs before msg_space exhausted - { - errno = ERANGE; - return -1; - } - } - - if (bytes_to_read == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:") - ACE_LIB_TEXT ("Attempt to read 0 bytes\n")), - -1); - - // Create the Asynch_Result. - ACE_WIN32_Asynch_Read_Dgram_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Read_Dgram_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_read, - flags, - protocol_family, - act, - this->win32_proactor_->get_handle (), - priority, - signal_number), - -1); - - // do the scatter/gather recv - int initiate_result = ACE_OS::recvfrom (result->handle (), - iov, - iovcnt, - number_of_bytes_recvd, - result->flags_, - result->saddr (), - &(result->addr_len_), - result, - 0); - if (initiate_result == SOCKET_ERROR) - { - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - initiate_result = 0; - break; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WSARecvFrom"))); - } - - delete result; - initiate_result = -1; - break; - } - - } - else - { - // Immediate success: the OVERLAPPED will still get queued. - // number_of_bytes_recvd contains the number of bytes recvd - // addr contains the peer address - // flags was updated - - // number_of_bytes_recvd = bytes_recvd; - initiate_result = 1; - } - - return initiate_result; -} - -int -ACE_WIN32_Asynch_Read_Dgram::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - return ACE_WIN32_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_WIN32_Asynch_Read_Dgram::cancel (void) -{ - return ACE_WIN32_Asynch_Operation::cancel (); -} - -ACE_Proactor * -ACE_WIN32_Asynch_Read_Dgram::proactor (void) const -{ - return ACE_WIN32_Asynch_Operation::proactor (); -} - -ACE_WIN32_Asynch_Read_Dgram::ACE_WIN32_Asynch_Read_Dgram (ACE_WIN32_Proactor *win32_proactor) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Read_Dgram_Impl (), - ACE_WIN32_Asynch_Operation (win32_proactor) -{ -} - -//*********************************************** - -size_t -ACE_WIN32_Asynch_Write_Dgram_Result::bytes_to_write (void) const -{ - return this->bytes_to_write_; -} - -ACE_Message_Block* -ACE_WIN32_Asynch_Write_Dgram_Result::message_block () const -{ - return this->message_block_; -} - -int -ACE_WIN32_Asynch_Write_Dgram_Result::flags (void) const -{ - return this->flags_; -} - -ACE_HANDLE -ACE_WIN32_Asynch_Write_Dgram_Result::handle (void) const -{ - return this->handle_; -} - -size_t -ACE_WIN32_Asynch_Write_Dgram_Result::bytes_transferred (void) const -{ - return ACE_WIN32_Asynch_Result::bytes_transferred (); -} - -const void * -ACE_WIN32_Asynch_Write_Dgram_Result::act (void) const -{ - return ACE_WIN32_Asynch_Result::act (); -} - -int -ACE_WIN32_Asynch_Write_Dgram_Result::success (void) const -{ - return ACE_WIN32_Asynch_Result::success (); -} - -const void * -ACE_WIN32_Asynch_Write_Dgram_Result::completion_key (void) const -{ - return ACE_WIN32_Asynch_Result::completion_key (); -} - -u_long -ACE_WIN32_Asynch_Write_Dgram_Result::error (void) const -{ - return ACE_WIN32_Asynch_Result::error (); -} - -ACE_HANDLE -ACE_WIN32_Asynch_Write_Dgram_Result::event (void) const -{ - return ACE_WIN32_Asynch_Result::event (); -} - -u_long -ACE_WIN32_Asynch_Write_Dgram_Result::offset (void) const -{ - return ACE_WIN32_Asynch_Result::offset (); -} - -u_long -ACE_WIN32_Asynch_Write_Dgram_Result::offset_high (void) const -{ - return ACE_WIN32_Asynch_Result::offset_high (); -} - -int -ACE_WIN32_Asynch_Write_Dgram_Result::priority (void) const -{ - return ACE_WIN32_Asynch_Result::priority (); -} - -int -ACE_WIN32_Asynch_Write_Dgram_Result::signal_number (void) const -{ - return ACE_WIN32_Asynch_Result::signal_number (); -} - -int -ACE_WIN32_Asynch_Write_Dgram_Result::post_completion (ACE_Proactor_Impl *proactor) -{ - return ACE_WIN32_Asynch_Result::post_completion (proactor); -} - -ACE_WIN32_Asynch_Write_Dgram_Result::ACE_WIN32_Asynch_Write_Dgram_Result ( - ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_write, - int flags, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) - : ACE_Asynch_Result_Impl (), - ACE_Asynch_Write_Dgram_Result_Impl(), - ACE_WIN32_Asynch_Result (handler, - act, - event, - 0, - 0, - priority, - signal_number), - bytes_to_write_ (bytes_to_write), - message_block_ (message_block), - flags_ (flags), - handle_ (handle) -{ -} - -void -ACE_WIN32_Asynch_Write_Dgram_Result::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - // Copy the data which was returned by GetQueuedCompletionStatus - this->bytes_transferred_ = bytes_transferred; - this->success_ = success; - this->completion_key_ = completion_key; - this->error_ = error; - - // Appropriately move the pointers in the message block. - for (ACE_Message_Block* mb = this->message_block_; - (mb != 0) && (bytes_transferred > 0); - mb = mb->cont ()) - { - size_t len_part = mb->length (); - - if ( len_part > bytes_transferred) - len_part = bytes_transferred; - - mb->rd_ptr (len_part); - - bytes_transferred -= len_part; - } - - // Create the interface result class. - ACE_Asynch_Write_Dgram::Result result (this); - - // Call the application handler. - this->handler_.handle_write_dgram (result); -} - -ACE_WIN32_Asynch_Write_Dgram_Result::~ACE_WIN32_Asynch_Write_Dgram_Result (void) -{ -} - - -//*********************************************** - -ACE_WIN32_Asynch_Write_Dgram::~ACE_WIN32_Asynch_Write_Dgram (void) -{ -} - -ssize_t -ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr &addr, - const void *act, - int priority, - int signal_number) -{ - number_of_bytes_sent = 0; - - size_t bytes_to_write = 0; - - iovec iov[ACE_IOV_MAX]; - int iovcnt = 0; - - for (const ACE_Message_Block* msg = message_block; - msg != 0 && iovcnt < ACE_IOV_MAX; - msg = msg->cont () , ++iovcnt ) - { - size_t msg_len = msg->length (); - - // OS should process zero length block correctly - // if ( msg_len == 0 ) - // ACE_ERROR_RETURN ((LM_ERROR, - // ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_Dgram::send:") - // ACE_LIB_TEXT ("Zero-length message block\n")), - // -1); - - bytes_to_write += msg_len; - - // Make as many iovec as needed to fit all of msg_len. - size_t rd_ptr_offset = 0; - while (msg_len > 0 && iovcnt < ACE_IOV_MAX) - { - u_long this_chunk_length; - if (msg_len > ULONG_MAX) - this_chunk_length = ULONG_MAX; - else - this_chunk_length = ACE_static_cast (u_long, msg_len); - // Collect the data in the iovec. - iov[iovcnt].iov_base = msg->rd_ptr () + rd_ptr_offset; - iov[iovcnt].iov_len = this_chunk_length; - msg_len -= this_chunk_length; - rd_ptr_offset += this_chunk_length; - - // Increment iovec counter if there's more to do. - if (msg_len > 0) - iovcnt++; - } - if (msg_len > 0) // Ran out of iovecs before msg_space exhausted - { - errno = ERANGE; - return -1; - } - } - - if ( bytes_to_write == 0 ) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_Dgram::send:") - ACE_LIB_TEXT ("Attempt to write 0 bytes\n")), - -1); - - // Create the Asynch_Result. - ACE_WIN32_Asynch_Write_Dgram_Result *result = 0; - ACE_NEW_RETURN (result, - ACE_WIN32_Asynch_Write_Dgram_Result (*this->handler_, - this->handle_, - message_block, - bytes_to_write, - flags, - act, - this->win32_proactor_->get_handle (), - priority, - signal_number), - -1); - - // do the scatter/gather send - - int initiate_result = ACE_OS::sendto (result->handle (), - iov, - iovcnt, - number_of_bytes_sent, - result->flags_, - (sockaddr *) addr.get_addr (), - addr.get_size(), - result, - 0); - - - if (initiate_result == SOCKET_ERROR) - { - // If initiate failed, check for a bad error. - ACE_OS::set_errno_to_last_error (); - switch (errno) - { - case ERROR_IO_PENDING: - // The IO will complete proactively: the OVERLAPPED will still - // get queued. - initiate_result = 0; - break; - - default: - // Something else went wrong: the OVERLAPPED will not get - // queued. - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WSASendTo"))); - } - - delete result; - initiate_result = -1; - break; - } - - } - else - { - // Immediate success: the OVERLAPPED will still get queued. - // number_of_bytes_recvd contains the number of bytes recvd - // addr contains the peer address - // flags was updated - - // number_of_bytes_sent = bytes_sent; - initiate_result = 1; - } - - return initiate_result; -} - -int -ACE_WIN32_Asynch_Write_Dgram::open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor) -{ - return ACE_WIN32_Asynch_Operation::open (handler, - handle, - completion_key, - proactor); -} - -int -ACE_WIN32_Asynch_Write_Dgram::cancel (void) -{ - return ACE_WIN32_Asynch_Operation::cancel (); -} - -ACE_Proactor * -ACE_WIN32_Asynch_Write_Dgram::proactor (void) const -{ - return ACE_WIN32_Asynch_Operation::proactor (); -} - -ACE_WIN32_Asynch_Write_Dgram::ACE_WIN32_Asynch_Write_Dgram (ACE_WIN32_Proactor *win32_proactor) - : ACE_Asynch_Operation_Impl (), - ACE_Asynch_Write_Dgram_Impl (), - ACE_WIN32_Asynch_Operation (win32_proactor) -{ -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Map_Entry; -template class ACE_Map_Manager; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Const_Iterator_Base; -template class ACE_Map_Iterator; -template class ACE_Map_Const_Iterator; -template class ACE_Map_Reverse_Iterator; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Map_Entry -#pragma instantiate ACE_Map_Manager -#pragma instantiate ACE_Map_Iterator_Base -#pragma instantiate ACE_Map_Const_Iterator_Base -#pragma instantiate ACE_Map_Iterator -#pragma instantiate ACE_Map_Const_Iterator -#pragma instantiate ACE_Map_Reverse_Iterator - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_WIN32 || ACE_HAS_WINCE */ diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h deleted file mode 100644 index cbed064d077..00000000000 --- a/ace/WIN32_Asynch_IO.h +++ /dev/null @@ -1,1945 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file WIN32_Asynch_IO.h - * - * $Id$ - * - * - * These classes only works on Win32 platforms. - * - * The implementation of ACE_Asynch_Transmit_File, - * ACE_Asynch_Accept, and ACE_Asynch_Connect are only supported if - * ACE_HAS_WINSOCK2 is defined or you are on WinNT 4.0 or higher. - * - * - * @author Irfan Pyarali - * @author Tim Harrison - * @author Alexander Babu Arulanthu - * @author Roger Tragin - * @author Alexander Libman - */ -//============================================================================= - -#ifndef ACE_WIN32_ASYNCH_IO_H -#define ACE_WIN32_ASYNCH_IO_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - -#include "ace/OS.h" -#include "ace/Asynch_IO_Impl.h" -#include "ace/Addr.h" -#include "ace/Event_Handler.h" - -#include "ace/Map_Manager.h" - -// Forward declaration -class ACE_WIN32_Proactor; - -/** - * @class ACE_WIN32_Asynch_Result - * - * @brief An abstract class which adds information to the OVERLAPPED - * structure to make it more useful. - * - * An abstract base class from which you can obtain some basic - * information like the number of bytes transferred, the ACT - * associated with the asynchronous operation, indication of - * success or failure, etc. Subclasses may want to store more - * information that is particular to the asynchronous operation - * it represents. - */ -class ACE_Export ACE_WIN32_Asynch_Result : public virtual ACE_Asynch_Result_Impl, - public OVERLAPPED -{ - /// Factory class has special permissions. - friend class ACE_WIN32_Asynch_Accept; - - /// Proactor class has special permission. - friend class ACE_WIN32_Proactor; - -public: - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// Returns 0. - int signal_number (void) const; - - /// Post to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Result (void); - - /// Simulate error value to use in the post_completion () - void set_error (u_long errcode); - - /// Simulate value to use in the post_completion () - void set_bytes_transferred (size_t nbytes); - -protected: - /// Constructor. - ACE_WIN32_Asynch_Result (ACE_Handler &handler, - const void* act, - ACE_HANDLE event, - u_long offset, - u_long offset_high, - int priority, - int signal_number = 0); - - /// Handler that will be called back. - ACE_Handler &handler_; - - /// ACT for this operation. - const void *act_; - - /// Bytes transferred by this operation. - size_t bytes_transferred_; - - /// Success indicator. - int success_; - - /// ACT associated with handle. - const void *completion_key_; - - /// Error if operation failed. - u_long error_; -}; - -/** - * @class ACE_WIN32_Asynch_Operation - * - * @brief This class abstracts out the common things needed for - * implementing Asynch_Operation for WIN32 platform. - * - */ -class ACE_Export ACE_WIN32_Asynch_Operation : public virtual ACE_Asynch_Operation_Impl -{ -public: - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - int cancel (void); - - // = Access methods. - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; - -protected: - /// Constructor. - ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win32_proactor); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Operation (void); - - /// Win32 Proactor. - ACE_WIN32_Proactor *win32_proactor_; - - /// Proactor that this asynch IO is registered with. - ACE_Proactor *proactor_; - - /// Handler that will receive the callback. - ACE_Handler *handler_; - - /// I/O handle used for reading. - ACE_HANDLE handle_; -}; - -/** - * @class ACE_WIN32_Asynch_Read_Stream_Result - * - * @brief This class provides concrete implementation for - * ACE_Asynch_Read_Stream::Result class. - */ -class ACE_Export ACE_WIN32_Asynch_Read_Stream_Result : public virtual ACE_Asynch_Read_Stream_Result_Impl, - public ACE_WIN32_Asynch_Result -{ - /// Factory class will have special permissions. - friend class ACE_WIN32_Asynch_Read_Stream; - - /// Proactor class has special permission. - friend class ACE_WIN32_Proactor; - -public: - /// The number of bytes which were requested at the start of the - /// asynchronous read. - size_t bytes_to_read (void) const; - - /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; - - /// I/O handle used for reading. - ACE_HANDLE handle (void) const; - - // Base class operations. These operations are here to kill - // dominance warnings. These methods call the base class methods. - - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// No-op. Returns 0. - int signal_number (void) const; - - /// Post to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - - /// Accessor for the scatter read flag - int scatter_enabled (void) const; - -protected: - /// Constructor is protected since creation is limited to - /// ACE_Asynch_Read_Stream factory. - ACE_WIN32_Asynch_Read_Stream_Result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0, - int scatter_enabled = 0); - - /// Proactor will call this method when the read completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Stream_Result (void); - - /// Bytes requested when the asynchronous read was initiated. - size_t bytes_to_read_; - - /// Message block for reading the data into. - ACE_Message_Block &message_block_; - - /// I/O handle used for reading. - ACE_HANDLE handle_; - - /// Flag for scatter read - int scatter_enabled_; -}; - -/** - * @class ACE_WIN32_Asynch_Read_Stream - * - * @brief This class is a factory for starting off asynchronous reads - * on a stream. - * - * Once is called, multiple asynchronous s can - * started using this class. An ACE_Asynch_Read_Stream::Result - * will be passed back to the when the asynchronous - * reads completes through the - * callback. - */ -class ACE_Export ACE_WIN32_Asynch_Read_Stream : public virtual ACE_Asynch_Read_Stream_Impl, - public ACE_WIN32_Asynch_Operation -{ - -public: - /// Constructor. - ACE_WIN32_Asynch_Read_Stream (ACE_WIN32_Proactor *win32_proactor); - - /// This starts off an asynchronous read. Upto will - /// be read and stored in the . - int read (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number = 0); - - /** - * Same as above but with scatter support, through chaining of composite - * message blocks using the continuation field. - */ - int readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number = 0); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Stream (void); - - // Methods belong to ACE_WIN32_Asynch_Operation base class. These - // methods are defined here to avoid VC++ warnings. They route the - // call to the ACE_WIN32_Asynch_Operation base class. - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - int cancel (void); - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; - -protected: - /// This is the method which does the real work and is there so that - /// the ACE_Asynch_Read_File class can use it too. - int shared_read (ACE_WIN32_Asynch_Read_Stream_Result *result); -}; - -/** - * @class ACE_WIN32_Asynch_Write_Stream_Result - * - * @brief This class provides concrete implementation for - * ACE_Asynch_Write_Stream::Result class. - */ -class ACE_Export ACE_WIN32_Asynch_Write_Stream_Result : public virtual ACE_Asynch_Write_Stream_Result_Impl, - public ACE_WIN32_Asynch_Result -{ - /// Factory class willl have special permissions. - friend class ACE_WIN32_Asynch_Write_Stream; - - /// Proactor class has special permission. - friend class ACE_WIN32_Proactor; - -public: - /// The number of bytes which were requested at the start of the - /// asynchronous write. - size_t bytes_to_write (void) const; - - /// Message block that contains the data to be written. - ACE_Message_Block &message_block (void) const; - - /// I/O handle used for writing. - ACE_HANDLE handle (void) const; - - // = Base class operations. These operations are here to kill some - // warnings. These methods call the base class methods. - - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// No-op. Returns 0. - int signal_number (void) const; - - /// Post to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - - /// Accessor for the gather write flag - int gather_enabled (void) const; - -protected: - /// Constructor is protected since creation is limited to - /// ACE_Asynch_Write_Stream factory. - ACE_WIN32_Asynch_Write_Stream_Result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0, - int gather_enabled = 0); - - /// ACE_Proactor will call this method when the write completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Stream_Result (void); - - /// The number of bytes which were requested at the start of the - /// asynchronous write. - size_t bytes_to_write_; - - /// Message block that contains the data to be written. - ACE_Message_Block &message_block_; - - /// I/O handle used for writing. - ACE_HANDLE handle_; - - /// Flag for gather write - int gather_enabled_; -}; - -/** - * @class ACE_WIN32_Asynch_Write_Stream - * - * @brief This class is a factory for starting off asynchronous writes - * on a stream. - * - * - * Once is called, multiple asynchronous s can - * started using this class. A ACE_Asynch_Write_Stream::Result - * will be passed back to the when the asynchronous - * write completes through the - * callback. - */ -class ACE_Export ACE_WIN32_Asynch_Write_Stream : public virtual ACE_Asynch_Write_Stream_Impl, - public ACE_WIN32_Asynch_Operation -{ -public: - /// Constructor. - ACE_WIN32_Asynch_Write_Stream (ACE_WIN32_Proactor *win32_proactor); - - /// This starts off an asynchronous write. Upto - /// will be written from the . - int write (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number = 0); - - /** - * Same as above but with gather support, through chaining of composite - * message blocks using the continuation field. - */ - int writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number = 0); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Stream (void); - - // = Methods belonging to base class. - - // These methods are defined here to avoid VC++ warnings. They route - // the call to the base class. - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - int cancel (void); - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; - -protected: - /// This is the method which does the real work and is there so that - /// the ACE_Asynch_Write_File class can use it too. - int shared_write (ACE_WIN32_Asynch_Write_Stream_Result *result); -}; - -/** - * @class ACE_WIN32_Asynch_Read_File_Result - * - * @brief This class provides concrete implementation for - * ACE_Asynch_Read_File::Result class. - */ -class ACE_Export ACE_WIN32_Asynch_Read_File_Result : public virtual ACE_Asynch_Read_File_Result_Impl, - public ACE_WIN32_Asynch_Read_Stream_Result -{ - /// Factory class will have special permissions. - friend class ACE_WIN32_Asynch_Read_File; - - /// Proactor class has special permission. - friend class ACE_WIN32_Proactor; - -public: - // = These methods belong to ACE_WIN32_Asynch_Result class base - // class. These operations are here to kill some warnings. These - // methods call the base class methods. - - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// No-op. Returns 0. - int signal_number (void) const; - - // The following methods belong to - // ACE_WIN32_Asynch_Read_Stream_Result. They are here to avoid VC++ - // dominance warnings. These methods route their call to the - // ACE_WIN32_Asynch_Read_Stream_Result base class. - - /// The number of bytes which were requested at the start of the - /// asynchronous read. - size_t bytes_to_read (void) const; - - /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; - - /// I/O handle used for reading. - ACE_HANDLE handle (void) const; - - /// Post to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - -protected: - /// Constructor is protected since creation is limited to - /// ACE_Asynch_Read_File factory. - ACE_WIN32_Asynch_Read_File_Result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number = 0, - int scatter_enabled = 0); - - /// ACE_Proactor will call this method when the read completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_File_Result (void); -}; - -/** - * @class ACE_WIN32_Asynch_Read_File - * - * @brief This class is a factory for starting off asynchronous reads - * on a file. - * - * Once is called, multiple asynchronous s can - * started using this class. A ACE_Asynch_Read_File::Result - * will be passed back to the when the asynchronous - * reads completes through the - * callback. - * - * This class differs slightly from ACE_Asynch_Read_Stream as it - * allows the user to specify an offset for the read. - */ -class ACE_Export ACE_WIN32_Asynch_Read_File : public virtual ACE_Asynch_Read_File_Impl, - public ACE_WIN32_Asynch_Read_Stream -{ - -public: - /// Constructor. - ACE_WIN32_Asynch_Read_File (ACE_WIN32_Proactor *win32_proactor); - - /** - * This starts off an asynchronous read. Upto will - * be read and stored in the . The read will start - * at from the beginning of the file. - */ - int read (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number = 0); - - /** - * Same as above but with scatter support, through chaining of - * composite message blocks using the continuation field. - * NOTE: Each data block payload must be at least the size of a - * system memory page and must be aligned on a system memory page - * size boundary - */ - int readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number = 0); - - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_File (void); - - // = Methods belong to ACE_WIN32_Asynch_Operation base class. These - // methods are defined here to avoid VC++ warnings. They route the - // call to the ACE_WIN32_Asynch_Operation base class. - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - int cancel (void); - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; - -private: - /** - * This method belongs to ACE_WIN32_Asynch_Read_Stream. It is here - * to avoid the compiler warnings. We forward this call to the - * ACE_WIN32_Asynch_Read_Stream class. - */ - int read (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number = 0); - - /** - * Same as above but with scatter support, through chaining of composite - * message blocks using the continuation field. - */ - int readv (ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - int priority, - int signal_number = 0); -}; - -/** - * @class ACE_WIN32_Asynch_Write_File_Result - * - * @brief This class provides implementation for - * ACE_Asynch_Write_File_Result for WIN32 platforms. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous write. - * - * This class differs slightly from - * ACE_Asynch_Write_Stream::Result as it calls back - * on the instead - * of . No additional state - * is required by this class as ACE_Asynch_Result can store - * the . - */ -class ACE_Export ACE_WIN32_Asynch_Write_File_Result : public virtual ACE_Asynch_Write_File_Result_Impl, - public ACE_WIN32_Asynch_Write_Stream_Result -{ - /// Factory class will have special permission. - friend class ACE_WIN32_Asynch_Write_File; - - /// Proactor class has special permission. - friend class ACE_WIN32_Proactor; - -public: - // = Base class operations. These operations are here to kill some - // warnings. These methods call the base class methods. - - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// No-op. Returns 0. - int signal_number (void) const; - - // The following methods belong to - // ACE_WIN32_Asynch_Read_Stream_Result. They are here to avoid VC++ - // warnings. These methods route their call to the - // ACE_WIN32_Asynch_Read_Stream_Result base class. - - /// The number of bytes which were requested at the start of the - /// asynchronous write. - size_t bytes_to_write (void) const; - - /// Message block that contains the data to be written. - ACE_Message_Block &message_block (void) const; - - /// I/O handle used for writing. - ACE_HANDLE handle (void) const; - - /// Post to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - -protected: - /// Constructor is protected since creation is limited to - /// ACE_Asynch_Write_File factory. - ACE_WIN32_Asynch_Write_File_Result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number = 0, - int gather_enabled = 0); - - /// ACE_Proactor will call this method when the write completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_File_Result (void); -}; - -/** - * @class ACE_WIN32_Asynch_Write_File - * - * @brief This class is a factory for starting off asynchronous writes - * on a file. - * - * Once is called, multiple asynchronous s can be - * started using this class. A ACE_Asynch_Write_File::Result - * will be passed back to the when the asynchronous - * writes completes through the - * callback. - */ -class ACE_Export ACE_WIN32_Asynch_Write_File : public virtual ACE_Asynch_Write_File_Impl, - public ACE_WIN32_Asynch_Write_Stream -{ -public: - /// Constructor. - ACE_WIN32_Asynch_Write_File (ACE_WIN32_Proactor *win32_proactor); - - /** - * This starts off an asynchronous write. Upto - * will be write and stored in the . The write will - * start at from the beginning of the file. - */ - int write (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number = 0); - - /** - * Same as above but with gather support, through chaining of - * composite message blocks using the continuation field. - * NOTE: Each data block payload must be at least the size of a - * system memory page and must be aligned on a system memory page - * size boundary - */ - int writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - const void *act, - int priority, - int signal_number = 0); - - /// Destrcutor. - virtual ~ACE_WIN32_Asynch_Write_File (void); - - // = Methods belong to ACE_WIN32_Asynch_Operation base class. These - // methods are defined here to avoid VC++ warnings. They route the - // call to the ACE_WIN32_Asynch_Operation base class. - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - int cancel (void); - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; - -private: - /** - * This method belongs to ACE_WIN32_Asynch_Write_Stream. It is here - * to avoid compiler warnings. This method is forwarded to the - * ACE_WIN32_Asynch_Write_Stream class. - */ - int write (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number = 0); - - /** - * Same as above but with gather support, through chaining of composite - * message blocks using the continuation field. - */ - int writev (ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - int priority, - int signal_number = 0); -}; - -/** - * @class ACE_WIN32_Asynch_Accept_Result - * - * @brief This class implements ACE_Asynch_Accept::Result for WIN32 - * platform. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous accept. - */ -class ACE_Export ACE_WIN32_Asynch_Accept_Result : public virtual ACE_Asynch_Accept_Result_Impl, - public ACE_WIN32_Asynch_Result -{ - /// Factory will have special permission. - friend class ACE_WIN32_Asynch_Accept; - - /// Proactor class has special permission. - friend class ACE_WIN32_Proactor; - -public: - /// The number of bytes which were requested at the start of the - /// asynchronous accept. - size_t bytes_to_read (void) const; - - /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; - - /// I/O handle used for accepting new connections. - ACE_HANDLE listen_handle (void) const; - - /// I/O handle for the new connection. - ACE_HANDLE accept_handle (void) const; - - // = Base class operations. These operations are here to kill some - // warnings. These methods call the base class methods. - - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// No-op. Returns 0. - int signal_number (void) const; - - /// Post to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - -protected: - /// Constructor is protected since creation is limited to - /// ACE_Asynch_Accept factory. - ACE_WIN32_Asynch_Accept_Result (ACE_Handler &handler, - ACE_HANDLE listen_handle, - ACE_HANDLE accept_handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - /// ACE_Proactor will call this method when the accept completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Accept_Result (void); - - /// Bytes requested when the asynchronous read was initiated. - size_t bytes_to_read_; - - /// Message block for reading the data into. - ACE_Message_Block &message_block_; - - /// I/O handle used for accepting new connections. - ACE_HANDLE listen_handle_; - - /// I/O handle for the new connection. - ACE_HANDLE accept_handle_; -}; - -/** - * @class ACE_WIN32_Asynch_Accept - * - * @brief This class is a factory for starting off asynchronous accepts - * on a listen handle. - * - * Once is called, multiple asynchronous s can - * started using this class. A ACE_Asynch_Accept::Result will - * be passed back to the when the asynchronous accept - * completes through the - * callback. - */ -class ACE_Export ACE_WIN32_Asynch_Accept : public virtual ACE_Asynch_Accept_Impl, - public ACE_WIN32_Asynch_Operation -{ -public: - /// Constructor. - ACE_WIN32_Asynch_Accept (ACE_WIN32_Proactor *win32_proactor); - - /** - * This starts off an asynchronous accept. The asynchronous accept - * call also allows any initial data to be returned to the - * . Upto will be read and stored in the - * . The will be used for the - * call. If ( == INVALID_HANDLE), a new - * handle will be created. - * - * must be specified. This is because the address of - * the new connection is placed at the end of this buffer. - */ - int accept (ACE_Message_Block &message_block, - size_t bytes_to_read, - ACE_HANDLE accept_handle, - const void *act, - int priority, - int signal_number = 0); - - /// Destructor. - ~ACE_WIN32_Asynch_Accept (void); - - // Methods belong to ACE_WIN32_Asynch_Operation base class. These - // methods are defined here to avoid VC++ warnings. They route the - // call to the ACE_WIN32_Asynch_Operation base class. - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - int cancel (void); - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; -}; - -/** - * @class ACE_WIN32_Asynch_Connect_Result - * - * @brief This is that class which will be passed back to the - * completion handler when the asynchronous connect completes. - * - * This class has all the information necessary for the - * completion handler to uniquiely identify the completion of the - * asynchronous connect. - */ -class ACE_Export ACE_WIN32_Asynch_Connect_Result : public virtual ACE_Asynch_Connect_Result_Impl, - public ACE_WIN32_Asynch_Result -{ - /// Factory classes will have special permissions. - friend class ACE_WIN32_Asynch_Connect; - - /// The Proactor constructs the Result class for faking results. - friend class ACE_WIN32_Proactor; - -public: - - /// I/O handle for the connection. - ACE_HANDLE connect_handle (void) const; - - // = Base class operations. These operations are here to kill some - // warnings. These methods call the base class methods. - - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * Returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// No-op. Returns 0. - int signal_number (void) const; - - /// Post this object to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - -protected: - /// Constructor is protected since creation is limited to - /// ACE_Asynch_Connect factory. - ACE_WIN32_Asynch_Connect_Result (ACE_Handler &handler, - ACE_HANDLE connect_handle, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number); - - /// ACE_Proactor will call this method when the accept completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Connect_Result (void); - - /// Set the I/O handle for the new connection. - void connect_handle (ACE_HANDLE handle); - - ACE_HANDLE connect_handle_; -}; - - -/** - * @class ACE_WIN32_Asynch_Connect - */ -class ACE_Export ACE_WIN32_Asynch_Connect : - public virtual ACE_Asynch_Connect_Impl, - public ACE_WIN32_Asynch_Operation, - public ACE_Event_Handler -{ -public: - - /// Constructor. - ACE_WIN32_Asynch_Connect (ACE_WIN32_Proactor * win32_proactor); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Connect (void); - - /** - * This open belongs to ACE_WIN32_Asynch_Operation. We forward - * this call to that method. We have put this here to avoid the - * compiler warnings. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor = 0); - - /** - * Start an asynchronous connect. - * - * @param connect_handle Handle to use for the connect. If the value - * ACE_INVALID_HANDLE, a new handle will be created. - * - * @retval 0 Success - * @retval -1 Error - */ - int connect (ACE_HANDLE connect_handle, - const ACE_Addr &remote_sap, - const ACE_Addr &local_sap, - int reuse_addr, - const void *act, - int priority, - int signal_number = 0); - - /** - * Cancel all pending pseudo-asynchronus requests - * Behavior as usual AIO request - */ - int cancel (void); - - /** - * Close performs cancellation of all pending requests - * and close the connect handle - */ - int close (void); - - /// Virtual from ACE_Event_Handler - ACE_HANDLE get_handle (void) const; - - /// Virtual from ACE_Event_Handler - void set_handle (ACE_HANDLE handle); - - /// Virtual from ACE_Event_Handler - int handle_input ( ACE_HANDLE handle); - int handle_output ( ACE_HANDLE handle); - int handle_exception ( ACE_HANDLE handle); - - /// Virtual from ACE_Event_Handler - int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) ; - - // = Methods belong to ACE_WIN32_Asynch_Operation base class. These - // methods are defined here to avoid dominace warnings. They route - // the call to the ACE_WIN32_Asynch_Operation base class. - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; - -private: - int connect_i (ACE_WIN32_Asynch_Connect_Result *result, - const ACE_Addr &remote_sap, - const ACE_Addr &local_sap, - int reuse_addr); - - int post_result (ACE_WIN32_Asynch_Connect_Result *result, int flg_post); - - /// Cancel uncompleted connect operations. - /** - * @param flg_notify Indicates whether or not to send notification about - * canceled connect operations. If 0, don't send - * notifications. If 1, notify user about canceled - * connects. - * According WIN32 standards we should receive - * notifications on canceled AIO requests. - * - * @param set Receives the set of I/O handles on which asynchronous - * connect requests were canceled as a result of this - * method. The contents of @a set are completely - * replaced. - */ - int cancel_uncompleted (int flg_notify, ACE_Handle_Set & set); - - /// 1 - Connect is registered in ACE_Asynch_Pseudo_Task - /// 0 - Aceept is deregisted in ACE_Asynch_Pseudo_Task - int flg_open_ ; - - /// To prevent ACE_Asynch_Pseudo_Task from deletion - /// while we make a call to the ACE_Asynch_Pseudo_Task - /// This is extra cost !!! - /// we could avoid them if all applications will follow the rule: - /// Proactor should be deleted only after deletion all - /// AsynchOperation objects connected with it - int task_lock_count_; - - typedef ACE_Map_Manager - MAP_MANAGER; - - // (Two) Deprecated typedefs. Use appropriate MAP_MANAGER traits - // instead. - typedef MAP_MANAGER::ITERATOR MAP_ITERATOR; - typedef MAP_MANAGER::ENTRY MAP_ENTRY; - - /// Map of Result pointers that correspond to all the 's - /// pending. - MAP_MANAGER result_map_; - - /// The lock to protect the result queue which is shared. The queue - /// is updated by main thread in the register function call and - /// through the auxillary thread in the deregister fun. So let us - /// mutex it. - ACE_SYNCH_MUTEX lock_; -}; - -/** - * @class ACE_WIN32_Asynch_Transmit_File_Result - * - * - * @brief This class implements ACE_Asynch_Transmit_File::Result for - * WIN32 platforms. - * - * This class has all the information necessary for the - * to uniquiely identify the completion of the - * asynchronous transmit file. - */ -class ACE_Export ACE_WIN32_Asynch_Transmit_File_Result : public virtual ACE_Asynch_Transmit_File_Result_Impl, - public ACE_WIN32_Asynch_Result -{ - /// Factory class will have special permission. - friend class ACE_WIN32_Asynch_Transmit_File; - - /// Proactor class has special permission. - friend class ACE_WIN32_Proactor; - -public: - /// Socket used for transmitting the file. - ACE_HANDLE socket (void) const; - - /// File from which the data is read. - ACE_HANDLE file (void) const; - - /// Header and trailer data associated with this transmit file. - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer (void) const; - - /// The number of bytes which were requested at the start of the - /// asynchronous transmit file. - size_t bytes_to_write (void) const; - - /// Number of bytes per send requested at the start of the transmit - /// file. - size_t bytes_per_send (void) const; - - /// Flags which were passed into transmit file. - u_long flags (void) const; - - // Base class operations. These operations are here to kill some - // warnings. These methods call the base class methods. - - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// No-op. Returns 0. - int signal_number (void) const; - - /// Post to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - -protected: - /// Constructor is protected since creation is limited to - /// ACE_Asynch_Transmit_File factory. - ACE_WIN32_Asynch_Transmit_File_Result (ACE_Handler &handler, - ACE_HANDLE socket, - ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - /// Proactor will call this method when the write completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Transmit_File_Result (void); - - /// Network I/O handle. - ACE_HANDLE socket_; - - /// File I/O handle. - ACE_HANDLE file_; - - /// Header and trailer data associated with this transmit file. - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer_; - - /// The number of bytes which were requested at the start of the - /// asynchronous transmit file. - size_t bytes_to_write_; - - /// Number of bytes per send requested at the start of the transmit - /// file. - size_t bytes_per_send_; - - /// Flags which were passed into transmit file. - u_long flags_; -}; - -/** - * @class ACE_WIN32_Asynch_Transmit_File - * - * @brief This class is a factory for starting off asynchronous - * transmit files on a stream. - * - * Once is called, multiple asynchronous s - * can started using this class. A - * ACE_Asynch_Transmit_File::Result will be passed back to the - * when the asynchronous transmit file completes - * through the callback. - * - * The transmit_file function transmits file data over a - * connected network connection. The function uses the operating - * system's cache manager to retrieve the file data. This - * function provides high-performance file data transfer over - * network connections. This function would be of great use in - * a Web Server, Image Server, etc. - */ -class ACE_Export ACE_WIN32_Asynch_Transmit_File : public virtual ACE_Asynch_Transmit_File_Impl, - public ACE_WIN32_Asynch_Operation -{ -public: - /// Constructor. - ACE_WIN32_Asynch_Transmit_File (ACE_WIN32_Proactor *win32_proactor); - - /** - * This starts off an asynchronous transmit file. The is a - * handle to an open file. is a pointer to a - * data structure that contains pointers to data to send before and - * after the file data is sent. Set this parameter to 0 if you only - * want to transmit the file data. Upto will be - * written to the . If you want to send the entire file, - * let = 0. is the size of each - * block of data sent per send operation. Please read the Win32 - * documentation on what the flags should be. - */ - int transmit_file (ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - int priority, - int signal_number = 0); - - /// Destructor. - ~ACE_WIN32_Asynch_Transmit_File (void); - - // Methods belong to ACE_WIN32_Asynch_Operation base class. These - // methods are defined here to avoid VC++ warnings. They route the - // call to the ACE_WIN32_Asynch_Operation base class. - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - int cancel (void); - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; -}; - -/** - * @class ACE_WIN32_Asynch_Read_Dgram_Result - * - * @brief This class provides concrete implementation for - * ACE_Asynch_Read_Dgram::Result class. - */ -class ACE_Export ACE_WIN32_Asynch_Read_Dgram_Result : public virtual ACE_Asynch_Read_Dgram_Result_Impl, - public ACE_WIN32_Asynch_Result -{ - /// Factory class will have special permissions. - friend class ACE_WIN32_Asynch_Read_Dgram; - - /// Proactor class has special permission. - friend class ACE_WIN32_Proactor; - -public: - /// The number of bytes which were requested at the start of the - /// asynchronous read. - size_t bytes_to_read (void) const; - - /// Message block which contains the read data - ACE_Message_Block *message_block (void) const; - - /// The address of where the packet came from - int remote_address (ACE_Addr& addr) const; - - sockaddr *saddr () const; - - /// The flags used in the read - int flags (void) const; - - /// I/O handle used for reading. - ACE_HANDLE handle (void) const; - - // Base class operations. These operations are here to kill - // dominance warnings. These methods call the base class methods. - - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// No-op. Returns 0. - int signal_number (void) const; - - /// Post to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - -protected: - /// Constructor is protected since creation is limited to - /// ACE_Asynch_Read_Dgram factory. - ACE_WIN32_Asynch_Read_Dgram_Result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_read, - int flags, - int protocol_family, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - /// Proactor will call this method when the read completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Dgram_Result (void); - - /// Bytes requested when the asynchronous read was initiated. - size_t bytes_to_read_; - - /// Message block for reading the data into. - ACE_Message_Block *message_block_; - - /// The address of where the packet came from - ACE_Addr *remote_address_; - - int addr_len_; - - /// The flags used in the read - int flags_; - - /// I/O handle used for reading. - ACE_HANDLE handle_; -}; - -/** - * @class ACE_WIN32_Asynch_Read_Dgram - * - * @brief This class is a factory for starting off asynchronous reads - * on a UDP socket. - * - * Once is called, multiple asynchronous s can be - * started using this class. An ACE_Asynch_Read_Dgram::Result - * will be passed back to the when the asynchronous - * reads completes through the - * callback. - * - */ -class ACE_Export ACE_WIN32_Asynch_Read_Dgram : public virtual ACE_Asynch_Read_Dgram_Impl, - public ACE_WIN32_Asynch_Operation -{ -public: - /// Constructor. - ACE_WIN32_Asynch_Read_Dgram (ACE_WIN32_Proactor *win32_proactor); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Dgram (void); - - /** This starts off an asynchronous read. Upto - * total_size()> will be read and stored in the - * . 's will be updated to reflect - * the added bytes if the read operation is successfully completed. - * Return code of 1 means immediate success and - * will contain number of bytes read. The - * method will still be called. Return code of 0 means the IO will - * complete proactively. Return code of -1 means there was an error, use - * errno to get the error code. - * - * Scatter/gather is supported on WIN32 by using the cont()> - * method. Up to ACE_IOV_MAX 's are supported. Upto - * size()> bytes will be read into each for - * a total of total_size()> bytes. All 's - * 's will be updated to reflect the added bytes for each - * - */ - virtual ssize_t recv (ACE_Message_Block *message_block, - size_t &number_of_bytes_recvd, - int flags, - int protocol_family, - const void *act, - int priority, - int signal_number); - - // Methods belong to ACE_WIN32_Asynch_Operation base class. These - // methods are defined here to avoid VC++ warnings. They route the - // call to the ACE_WIN32_Asynch_Operation base class. - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - int cancel (void); - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; - -protected: - /// Do-nothing constructor. - ACE_WIN32_Asynch_Read_Dgram (void); -}; - -/** - * @class ACE_WIN32_Asynch_Write_Dgram_Result - * - * @brief This class provides concrete implementation for - * ACE_Asynch_Write_Dgram::Result class. - */ -class ACE_Export ACE_WIN32_Asynch_Write_Dgram_Result : public virtual ACE_Asynch_Write_Dgram_Result_Impl, - public ACE_WIN32_Asynch_Result -{ - /// Factory class willl have special permissions. - friend class ACE_WIN32_Asynch_Write_Dgram; - - /// Proactor class has special permission. - friend class ACE_WIN32_Proactor; - -public: - /// The number of bytes which were requested at the start of the - /// asynchronous write. - size_t bytes_to_write (void) const; - - /// Message block which contains the sent data - ACE_Message_Block *message_block (void) const; - - /// The flags using in the write - int flags (void) const; - - /// I/O handle used for writing. - ACE_HANDLE handle (void) const; - - // = Base class operations. These operations are here to kill some - // warnings. These methods call the base class methods. - - /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; - - /// ACT associated with the operation. - const void *act (void) const; - - /// Did the operation succeed? - int success (void) const; - - /** - * This returns the ACT associated with the handle when it was - * registered with the I/O completion port. This ACT is not the - * same as the ACT associated with the asynchronous operation. - */ - const void *completion_key (void) const; - - /// Error value if the operation fail. - u_long error (void) const; - - /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; - - /// This really make sense only when doing file I/O. - u_long offset (void) const; - - /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; - - /// The priority of the asynchronous operation. Currently, this is - /// not supported on Win32. - int priority (void) const; - - /// No-op. Returns 0. - int signal_number (void) const; - - /// Post to the Proactor's completion port. - int post_completion (ACE_Proactor_Impl *proactor); - -protected: - /// Constructor is protected since creation is limited to - /// ACE_Asynch_Write_Stream factory. - ACE_WIN32_Asynch_Write_Dgram_Result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_write, - int flags, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - /// ACE_Proactor will call this method when the write completes. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Dgram_Result (void); - - /// The number of bytes which were requested at the start of the - /// asynchronous write. - size_t bytes_to_write_; - - /// Message block used for the send. - ACE_Message_Block *message_block_; - - /// The flags using in the write - int flags_; - - /// I/O handle used for writing. - ACE_HANDLE handle_; -}; - -/** - * @class ACE_WIN32_Asynch_Write_Dgram - * - * @brief This class is a factory for starting off asynchronous writes - * on a UDP socket. - * - * - * Once is called, multiple asynchronous s can - * started using this class. A ACE_Asynch_Write_Stream::Result - * will be passed back to the when the asynchronous - * write completes through the - * callback. - */ -class ACE_Export ACE_WIN32_Asynch_Write_Dgram : public virtual ACE_Asynch_Write_Dgram_Impl, - public ACE_WIN32_Asynch_Operation -{ -public: - /// Constructor. - ACE_WIN32_Asynch_Write_Dgram (ACE_WIN32_Proactor *win32_proactor); - - /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Dgram (void); - - /** This starts off an asynchronous send. Upto - * total_length()> will be sent. 's - * will be updated to reflect the sent bytes if the send operation - * is successfully completed. - * Return code of 1 means immediate success and - * is updated to number of bytes sent. The - * method will still be called. Return code of 0 means the IO will - * complete proactively. Return code of -1 means there was an error, use - * errno to get the error code. - * - * Scatter/gather is supported on WIN32 by using the cont()> - * method. Up to ACE_IOV_MAX 's are supported. Upto - * length()> bytes will be sent from each - * for a total of total_length()> bytes. All - * 's 's will be updated to reflect the bytes sent - * from each . - */ - virtual ssize_t send (ACE_Message_Block *message_block, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr &addr, - const void *act, - int priority, - int signal_number); - - // = Methods belonging to base class. - - // These methods are defined here to avoid VC++ warnings. They route - // the call to the base class. - - /** - * Initializes the factory with information which will be used with - * each asynchronous call. If ( == ACE_INVALID_HANDLE), - * will be called on the to get the - * correct handle. - */ - int open (ACE_Handler &handler, - ACE_HANDLE handle, - const void *completion_key, - ACE_Proactor *proactor); - - /** - * This cancels all pending accepts operations that were issued by - * the calling thread. The function does not cancel asynchronous - * operations issued by other threads. - */ - int cancel (void); - - /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; - -protected: - /// Do-nothing constructor. - ACE_WIN32_Asynch_Write_Dgram (void); -}; - -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ -#include "ace/post.h" -#endif /* ACE_WIN32_ASYNCH_IO_H */ diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp deleted file mode 100644 index dfbbe4fd025..00000000000 --- a/ace/WIN32_Proactor.cpp +++ /dev/null @@ -1,803 +0,0 @@ -// $Id$ - -// ACE_RCSID(ace, Proactor, "$Id$") - -#include "ace/WIN32_Proactor.h" - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) -// WIN implemenatation of the Proactor. - -#include "ace/Log_Msg.h" -#include "ace/Object_Manager.h" - -/** - * @class ACE_WIN32_Wakeup_Completion - * - * This is result object is used by the of the - * ACE_Proactor interface to wake up all the threads blocking - * for completions. - */ -class ACE_Export ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result -{ - -public: - /// Constructor. - ACE_WIN32_Wakeup_Completion (ACE_Handler &handler, - const void *act = 0, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - /// Destructor. - virtual ~ACE_WIN32_Wakeup_Completion (void); - - /// This method calls the 's method. - virtual void complete (size_t bytes_transferred = 0, - int success = 1, - const void *completion_key = 0, - u_long error = 0); -}; - -ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads, - int used_with_reactor_event_loop) - : completion_port_ (0), - // This *MUST* be 0, *NOT* ACE_INVALID_HANDLE !!! - number_of_threads_ (ACE_static_cast (DWORD, number_of_threads)), - used_with_reactor_event_loop_ (used_with_reactor_event_loop) -{ - // Create the completion port. - this->completion_port_ = ::CreateIoCompletionPort (INVALID_HANDLE_VALUE, - 0, - 0, - this->number_of_threads_); - if (this->completion_port_ == 0) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("CreateIoCompletionPort"))); - - this->get_asynch_pseudo_task ().start (); -} - -ACE_WIN32_Proactor::~ACE_WIN32_Proactor (void) -{ - this->get_asynch_pseudo_task ().stop (); - - this->close (); -} - -ACE_Asynch_Pseudo_Task & -ACE_WIN32_Proactor::get_asynch_pseudo_task () -{ - return this->pseudo_task_; -} - -int -ACE_WIN32_Proactor::close (void) -{ - // Close the completion port - if (this->completion_port_ != 0) - { - // To avoid memory leaks we should delete all results from queue. - - for (;;) - { - ACE_OVERLAPPED *overlapped = 0; - u_long bytes_transferred = 0; -#if defined (ACE_WIN64) - ULONG_PTR completion_key = 0; -#else - ULONG completion_key = 0; -#endif /* ACE_WIN64 */ - - // Get the next asynchronous operation that completes - BOOL res = ::GetQueuedCompletionStatus - (this->completion_port_, - &bytes_transferred, - &completion_key, - &overlapped, - 0); // poll - - if (overlapped == 0 || res == FALSE) - break; - - ACE_WIN32_Asynch_Result *asynch_result = - (ACE_WIN32_Asynch_Result *) overlapped; - - delete asynch_result; - } - - int result = ACE_OS::close (this->completion_port_); - this->completion_port_ = 0; - return result; - } - - return 0; -} - -int -ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle, - const void *completion_key) -{ -#if defined (ACE_WIN64) - ULONG_PTR comp_key (ACE_static_cast (ULONG_PTR, completion_key)); -#else - ULONG comp_key (ACE_reinterpret_cast (ULONG, completion_key)); -#endif /* ACE_WIN64 */ - - // No locking is needed here as no state changes. - ACE_HANDLE cp = ::CreateIoCompletionPort (handle, - this->completion_port_, - comp_key, - this->number_of_threads_); - if (cp == 0) - { - ACE_OS::set_errno_to_last_error (); - // If errno == ERROR_INVALID_PARAMETER, then this handle was - // already registered. - if (errno != ERROR_INVALID_PARAMETER) - { - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("CreateIoCompletionPort"))); - } - return -1; - } - } - return 0; -} - -ACE_Asynch_Read_Stream_Impl * -ACE_WIN32_Proactor::create_asynch_read_stream (void) -{ - ACE_Asynch_Read_Stream_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Read_Stream (this), - 0); - return implementation; -} - -ACE_Asynch_Write_Stream_Impl * -ACE_WIN32_Proactor::create_asynch_write_stream (void) -{ - ACE_Asynch_Write_Stream_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Write_Stream (this), - 0); - return implementation; -} - -ACE_Asynch_Read_Dgram_Impl * -ACE_WIN32_Proactor::create_asynch_read_dgram (void) -{ - ACE_Asynch_Read_Dgram_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Read_Dgram (this), - 0); - return implementation; -} - -ACE_Asynch_Write_Dgram_Impl * -ACE_WIN32_Proactor::create_asynch_write_dgram (void) -{ - ACE_Asynch_Write_Dgram_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Write_Dgram (this), - 0); - return implementation; -} - -ACE_Asynch_Read_File_Impl * -ACE_WIN32_Proactor::create_asynch_read_file (void) -{ - ACE_Asynch_Read_File_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Read_File (this), - 0); - return implementation; -} - -ACE_Asynch_Write_File_Impl * -ACE_WIN32_Proactor::create_asynch_write_file (void) -{ - ACE_Asynch_Write_File_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Write_File (this), - 0); - return implementation; -} - -ACE_Asynch_Accept_Impl * -ACE_WIN32_Proactor::create_asynch_accept (void) -{ - ACE_Asynch_Accept_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Accept (this), - 0); - return implementation; -} - -ACE_Asynch_Connect_Impl * -ACE_WIN32_Proactor::create_asynch_connect (void) -{ - ACE_Asynch_Connect_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Connect (this), - 0); - return implementation; -} - -ACE_Asynch_Transmit_File_Impl * -ACE_WIN32_Proactor::create_asynch_transmit_file (void) -{ - ACE_Asynch_Transmit_File_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Transmit_File (this), - 0); - return implementation; -} - -ACE_Asynch_Read_Stream_Result_Impl * -ACE_WIN32_Proactor::create_asynch_read_stream_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) -{ - ACE_Asynch_Read_Stream_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Read_Stream_Result (handler, - handle, - message_block, - bytes_to_read, - act, - event, - priority, - signal_number), - 0); - return implementation; -} - -ACE_Asynch_Write_Stream_Result_Impl * -ACE_WIN32_Proactor::create_asynch_write_stream_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) -{ - ACE_Asynch_Write_Stream_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Write_Stream_Result (handler, - handle, - message_block, - bytes_to_write, - act, - event, - priority, - signal_number), - 0); - return implementation; -} - -ACE_Asynch_Read_File_Result_Impl * -ACE_WIN32_Proactor::create_asynch_read_file_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number) -{ - ACE_Asynch_Read_File_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Read_File_Result (handler, - handle, - message_block, - bytes_to_read, - act, - offset, - offset_high, - event, - priority, - signal_number), - 0); - return implementation; -} - -ACE_Asynch_Write_File_Result_Impl * -ACE_WIN32_Proactor::create_asynch_write_file_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number) -{ - ACE_Asynch_Write_File_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Write_File_Result (handler, - handle, - message_block, - bytes_to_write, - act, - offset, - offset_high, - event, - priority, - signal_number), - 0); - return implementation; -} - -ACE_Asynch_Read_Dgram_Result_Impl * -ACE_WIN32_Proactor::create_asynch_read_dgram_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_read, - int flags, - int protocol_family, - const void* act, - ACE_HANDLE event , - int priority , - int signal_number) -{ - ACE_Asynch_Read_Dgram_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Read_Dgram_Result (handler, - handle, - message_block, - bytes_to_read, - flags, - protocol_family, - act, - event, - priority, - signal_number), - 0); - return implementation; -} - -ACE_Asynch_Write_Dgram_Result_Impl * -ACE_WIN32_Proactor::create_asynch_write_dgram_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_read, - int flags, - const void* act, - ACE_HANDLE event , - int priority , - int signal_number) -{ - ACE_Asynch_Write_Dgram_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Write_Dgram_Result(handler, - handle, - message_block, - bytes_to_read, - flags, - act, - event, - priority, - signal_number), - 0); - return implementation; -} - -ACE_Asynch_Accept_Result_Impl * -ACE_WIN32_Proactor::create_asynch_accept_result (ACE_Handler &handler, - ACE_HANDLE listen_handle, - ACE_HANDLE accept_handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) -{ - ACE_Asynch_Accept_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Accept_Result (handler, - listen_handle, - accept_handle, - message_block, - bytes_to_read, - act, - event, - priority, - signal_number), - 0); - return implementation; -} - -ACE_Asynch_Connect_Result_Impl * -ACE_WIN32_Proactor::create_asynch_connect_result (ACE_Handler & handler, - ACE_HANDLE connect_handle, - const void *act, - ACE_HANDLE event, - int priority , - int signal_number) -{ - ACE_Asynch_Connect_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Connect_Result (handler, - connect_handle, - act, - event, - priority, - signal_number), - 0); - return implementation; -} - -ACE_Asynch_Transmit_File_Result_Impl * -ACE_WIN32_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler, - ACE_HANDLE socket, - ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - ACE_HANDLE event, - int priority, - int signal_number) -{ - ACE_Asynch_Transmit_File_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Transmit_File_Result (handler, - socket, - file, - header_and_trailer, - bytes_to_write, - offset, - offset_high, - bytes_per_send, - flags, - act, - event, - priority, - signal_number), - 0); - return implementation; -} - -ACE_Asynch_Result_Impl * -ACE_WIN32_Proactor::create_asynch_timer (ACE_Handler &handler, - const void *act, - const ACE_Time_Value &tv, - ACE_HANDLE event, - int priority, - int signal_number) -{ - ACE_Asynch_Result_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_WIN32_Asynch_Timer (handler, - act, - tv, - event, - priority, - signal_number), - 0); - return implementation; -} - -int -ACE_WIN32_Proactor::handle_signal (int, siginfo_t *, ucontext_t *) -{ - // Perform a non-blocking "poll" for all the I/O events that have - // completed in the I/O completion queue. - - int result = 0; - - for (ACE_Time_Value timeout (0, 0); - ; - ) - { - result = this->handle_events (timeout); - - if (result != 1) - break; - } - - // If our handle_events failed, we'll report a failure to the - // Reactor. - return result == -1 ? -1 : 0; -} - -int -ACE_WIN32_Proactor::handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask) -{ - ACE_UNUSED_ARG (close_mask); - ACE_UNUSED_ARG (handle); - - return this->close (); -} - -ACE_HANDLE -ACE_WIN32_Proactor::get_handle (void) const -{ - if (this->used_with_reactor_event_loop_) - return this->event_.handle (); - else - return 0; -} - -int -ACE_WIN32_Proactor::handle_events (ACE_Time_Value &wait_time) -{ - // Decrement with the amount of time spent in the method - ACE_Countdown_Time countdown (&wait_time); - return this->handle_events (wait_time.msec ()); -} - -int -ACE_WIN32_Proactor::handle_events (void) -{ - return this->handle_events (ACE_INFINITE); -} - -int -ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds) -{ - ACE_OVERLAPPED *overlapped = 0; - u_long bytes_transferred = 0; -#if defined (ACE_WIN64) - ULONG_PTR completion_key = 0; -#else - ULONG completion_key = 0; -#endif /* ACE_WIN64 */ - - // Get the next asynchronous operation that completes - BOOL result = ::GetQueuedCompletionStatus (this->completion_port_, - &bytes_transferred, - &completion_key, - &overlapped, - milli_seconds); - if (result == FALSE && overlapped == 0) - { - ACE_OS::set_errno_to_last_error (); - - switch (errno) - { - case WAIT_TIMEOUT: - errno = ETIME; - return 0; - - case ERROR_SUCCESS: - // Calling GetQueuedCompletionStatus with timeout value 0 - // returns FALSE with extended errno "ERROR_SUCCESS" errno = - // ETIME; ?? I don't know if this has to be done !! - return 0; - - default: - if (ACE::debug ()) - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("GetQueuedCompletionStatus"))); - return -1; - } - } - else - { - // Narrow the result. - ACE_WIN32_Asynch_Result *asynch_result = (ACE_WIN32_Asynch_Result *) overlapped; - - // If errors happen, grab the error. - if (result == FALSE) - ACE_OS::set_errno_to_last_error (); - else - errno = 0; - - u_long result_err = asynch_result->error (); - - // if "result_err" is 0 than - // It is normal OS/WIN32 AIO completion. - // We have cleared asynch_result->error_ - // during shared_read/shared_write. - // The real error code is already stored in "errno", - // so copy "errno" value to the "result_err" - // and pass this "result_err" code - // to the application_specific_code () - // else - // "result_err" non zero - // it means we have "post_completed" result - // so pass this "result_err" code - // to the application_specific_code () - - if ( result_err == 0 ) - result_err = errno ; - - this->application_specific_code (asynch_result, - ACE_static_cast (size_t, - bytes_transferred), - (void *) completion_key, - result_err); - } - return 1; -} - -void -ACE_WIN32_Proactor::application_specific_code (ACE_WIN32_Asynch_Result *asynch_result, - size_t bytes_transferred, - const void *completion_key, - u_long error) -{ - ACE_SEH_TRY - { - // Call completion hook - asynch_result->complete (bytes_transferred, - error ? 0 : 1, - (void *) completion_key, - error); - } - ACE_SEH_FINALLY - { - // This is crucial to prevent memory leaks - delete asynch_result; - } -} - -int -ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result) -{ - // Grab the event associated with the Proactor - HANDLE handle = this->get_handle (); - - // If Proactor event is valid, signal it - if (handle != ACE_INVALID_HANDLE && - handle != 0) - ACE_OS::event_signal (&handle); - - // pass - // bytes_transferred - // completion_key - // to the ::PostQueuedCompletionStatus() - // error will be extracted later in handle_events() - - DWORD bytes_transferred = 0; - const void * completion_key = 0 ; - - if ( result != 0 ) - { - // This cast is ok since the original API calls restricted the transfer - // counts to DWORD range. - bytes_transferred = ACE_static_cast (DWORD, - result->bytes_transferred ()); - completion_key = result->completion_key(); - } -#if defined (ACE_WIN64) - ULONG_PTR comp_key (ACE_static_cast (ULONG_PTR, completion_key)); -#else - ULONG comp_key (ACE_reinterpret_cast (ULONG, completion_key)); -#endif /* ACE_WIN64 */ - - // Post a completion - if (::PostQueuedCompletionStatus (this->completion_port_, // completion port - bytes_transferred, // xfer count - comp_key, // completion key - result // overlapped - ) == FALSE) - { - delete result; - - if (ACE::debug ()) - { - ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("PostQueuedCompletionStatus failed"))); - } - return -1; - } - - return 0; -} - -int -ACE_WIN32_Proactor::post_wakeup_completions (int how_many) -{ - ACE_WIN32_Wakeup_Completion *wakeup_completion = 0; - - for (ssize_t ci = 0; ci < how_many; ci++) - { - ACE_NEW_RETURN (wakeup_completion, - ACE_WIN32_Wakeup_Completion (this->wakeup_handler_), - -1); - - if (wakeup_completion->post_completion (this) == -1) - return -1; - } - - return 0; -} - -int -ACE_WIN32_Proactor::wake_up_dispatch_threads (void) -{ - return 0; -} - -int -ACE_WIN32_Proactor::close_dispatch_threads (int) -{ - return 0; -} - -size_t -ACE_WIN32_Proactor::number_of_threads (void) const -{ - return ACE_static_cast (size_t, this->number_of_threads_); -} - -void -ACE_WIN32_Proactor::number_of_threads (size_t threads) -{ - this->number_of_threads_ = ACE_static_cast (DWORD, threads); -} - -ACE_WIN32_Asynch_Timer::ACE_WIN32_Asynch_Timer (ACE_Handler &handler, - const void *act, - const ACE_Time_Value &tv, - ACE_HANDLE event, - int priority, - int signal_number) - : ACE_Asynch_Result_Impl (), - ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, - signal_number), - time_ (tv) -{ -} - -void -ACE_WIN32_Asynch_Timer::complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error) -{ - ACE_UNUSED_ARG (error); - ACE_UNUSED_ARG (completion_key); - ACE_UNUSED_ARG (success); - ACE_UNUSED_ARG (bytes_transferred); - - this->handler_.handle_time_out (this->time_, this->act ()); -} - -ACE_WIN32_Wakeup_Completion::ACE_WIN32_Wakeup_Completion (ACE_Handler &handler, - const void *act, - ACE_HANDLE event, - int priority, - int signal_number) - : ACE_Asynch_Result_Impl (), - ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number) -{ -} - -ACE_WIN32_Wakeup_Completion::~ACE_WIN32_Wakeup_Completion (void) -{ -} - -void -ACE_WIN32_Wakeup_Completion::complete (size_t /* bytes_transferred */, - int /* success */, - const void * /* completion_key */, - u_long /* error */) -{ - this->handler_.handle_wakeup (); -} - -#endif /* ACE_WIN32 */ diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h deleted file mode 100644 index 6d83b0cc341..00000000000 --- a/ace/WIN32_Proactor.h +++ /dev/null @@ -1,323 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file WIN32_Proactor.h - * - * $Id$ - * - * @author Irfan Pyarali (irfan@cs.wustl.edu) - * @author Tim Harrison (harrison@cs.wustl.edu) - * @author Alexander Babu Arulanthu - * @author Roger Tragin - * @author Alexander Libman - */ -//============================================================================= - -#ifndef ACE_WIN32_PROACTOR_H -#define ACE_WIN32_PROACTOR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) -// WIN32 implementation of the Proactor. - -#include "ace/OS.h" -#include "ace/WIN32_Asynch_IO.h" -#include "ace/Event_Handler.h" - -#include "ace/Proactor_Impl.h" -#include "ace/Asynch_Pseudo_Task.h" - -// Forward declarations. -class ACE_WIN32_Asynch_Result; -class ACE_WIN32_Proactor_Timer_Handler; - -/** - * @class ACE_WIN32_Proactor - * - * @brief A manager for asynchronous event demultiplexing on Win32. - * - * See the Proactor pattern description at - * http://www.cs.wustl.edu/~schmidt/PDF/proactor.pdf for more - * details. - */ -class ACE_Export ACE_WIN32_Proactor : public ACE_Proactor_Impl -{ - friend class ACE_WIN32_Asynch_Connect; - -public: - /// A do nothing constructor. - ACE_WIN32_Proactor (size_t number_of_threads = 0, - int used_with_reactor_event_loop = 0); - - /// Virtual destruction. - virtual ~ACE_WIN32_Proactor (void); - - /// Close the IO completion port. - virtual int close (void); - - /// This method adds the to the I/O completion port. This - /// function is a no-op function for Unix systems. - virtual int register_handle (ACE_HANDLE handle, - const void *completion_key); - - /** - * Dispatch a single set of events. If elapses before - * any events occur, return 0. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (ACE_Time_Value &wait_time); - - /** - * Block indefinitely until at least one event is dispatched. - * Dispatch a single set of events. If elapses before - * any events occur, return 0. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (void); - - /** - * Post a result to the completion port of the Proactor. If errors - * occur, the result will be deleted by this method. If successful, - * the result will be deleted by the Proactor when the result is - * removed from the completion port. Therefore, the result should - * have been dynamically allocated and should be orphaned by the - * user once this method is called. - */ - virtual int post_completion (ACE_WIN32_Asynch_Result *result); - - /// Add wakeup dispatch threads (reinit). - int wake_up_dispatch_threads (void); - - /// Close all dispatch threads. - int close_dispatch_threads (int wait); - - /// Get number of thread used as a parameter to CreatIoCompletionPort. - size_t number_of_threads (void) const; - - /// Set number of thread used as a parameter to CreatIoCompletionPort. - void number_of_threads (size_t threads); - - /// Get the event handle. - virtual ACE_HANDLE get_handle (void) const; - - virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void); - virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void); - virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void); - virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void); - virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void); - virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void); - virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void); - virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void); - virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void); - - // Methods used to create Asynch_IO_Result objects. We create the right - // objects here in these methods. - - virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - /// Create the correct implementation class for ACE_Asynch_Read_Dgram::Result. - virtual ACE_Asynch_Read_Dgram_Result_Impl *create_asynch_read_dgram_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_read, - int flags, - int protocol_family, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - /// Create the correct implementation class for ACE_Asynch_Write_Dgram::Result. - virtual ACE_Asynch_Write_Dgram_Result_Impl *create_asynch_write_dgram_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_write, - int flags, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler, - ACE_HANDLE listen_handle, - ACE_HANDLE accept_handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - virtual ACE_Asynch_Connect_Result_Impl *create_asynch_connect_result (ACE_Handler & handler, - ACE_HANDLE connect_handle, - const void *act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - - virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler &handler, - ACE_HANDLE socket, - ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - ACE_HANDLE event, - int priority, - int signal_number = 0); - - /// Create a timer result object which can be used with the Timer - /// mechanism of the Proactor. - virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler, - const void *act, - const ACE_Time_Value &tv, - ACE_HANDLE event, - int priority, - int signal_number = 0); - -protected: - /// Task to process pseudo-asynchronous operations - ACE_Asynch_Pseudo_Task & get_asynch_pseudo_task (void); - - /// Called when object is signaled by OS (either via UNIX signals or - /// when a Win32 object becomes signaled). - virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); - - /// Called when object is removed from the ACE_Reactor. - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); - - /** - * Dispatch a single set of events. If elapses - * before any events occur, return 0. Return 1 if a completion is - * dispatched. Return -1 on errors. - */ - virtual int handle_events (unsigned long milli_seconds); - - /// Protect against structured exceptions caused by user code when - /// dispatching handles. - void application_specific_code (ACE_WIN32_Asynch_Result *asynch_result, - size_t bytes_transferred, - const void *completion_key, - u_long error); - - /** - * Post completions to the completion port so that all - * threads can wake up. This is used in conjunction with the - * . - */ - virtual int post_wakeup_completions (int how_many); - - /// Handle for the completion port. Unix doesnt have completion - /// ports. - ACE_HANDLE completion_port_; - - /// This number is passed to the system - /// call. - DWORD number_of_threads_; - - /// This event is used in conjunction with Reactor when we try to - /// integrate the event loops of Reactor and the Proactor. - ACE_Auto_Event event_; - - /// Flag that indicates whether we are used in conjunction with - /// Reactor. - int used_with_reactor_event_loop_; - - /// Handler to handle the wakeups. This works in conjunction with the - /// . - ACE_Handler wakeup_handler_; - - /// Pseudo-task for asynch connect ( NT/2000) - /// In future should removed in XP with ConnectEx support - ACE_Asynch_Pseudo_Task pseudo_task_; -}; - -/** - * @class ACE_WIN32_Asynch_Timer - * - * @brief This class is posted to the completion port when a timer - * expires. When the complete method of this object is - * called, the 's handle_timeout method will be - * called. - */ -class ACE_Export ACE_WIN32_Asynch_Timer : public ACE_WIN32_Asynch_Result -{ - - /// The factory method for this class is with the POSIX_Proactor - /// class. - friend class ACE_WIN32_Proactor; - -protected: - /// Constructor. - ACE_WIN32_Asynch_Timer (ACE_Handler &handler, - const void *act, - const ACE_Time_Value &tv, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = 0); - - /// This method calls the 's handle_timeout method. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error = 0); - - /// Time value requested by caller - ACE_Time_Value time_; -}; - -#endif /* ACE_WIN32 */ -#include "ace/post.h" -#endif /* ACE_PROACTOR_H */ diff --git a/ace/XML_Svc_Conf.cpp b/ace/XML_Svc_Conf.cpp deleted file mode 100644 index 76300b641d7..00000000000 --- a/ace/XML_Svc_Conf.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// $Id$ - -#include "ace/XML_Svc_Conf.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 0) -ACE_XML_Svc_Conf::~ACE_XML_Svc_Conf (void) -{ -} -#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ diff --git a/ace/XML_Svc_Conf.h b/ace/XML_Svc_Conf.h deleted file mode 100644 index 0146b2eb839..00000000000 --- a/ace/XML_Svc_Conf.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file XML_Svc_Conf.h - * - * $Id$ - * - * @author Nanbor Wang - */ -//============================================================================= - - -#ifndef ACE_XML_SVC_CONF_H -#define ACE_XML_SVC_CONF_H - -#include "ace/pre.h" - -#include "ace/ACE_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if (ACE_USES_CLASSIC_SVC_CONF==0) -/** - * @class ACE_XML_Svc_Conf - * - * @brief This abstract class defines the common operations - * ACE_Service_Config expects when using the XML Service Config Parser. - * - * When implementing a concret XML_Svc_Conf class, be sure to overload - * the new/delete function so the dynamically created concret XML_Svc_Conf - * instance can be deleted from the original heap in the DLL/SO. The - * concret XML_Svc_Conf implementation will be put into a DLL/SO that - * ACE applications can link to dynamically using the ACE_DLL class. - * This DLL should include an operation as follow: - * - * extern "C" ACE_XML_Svc_Conf_Parser * _ACEXML_create_XML_Svc_Conf_Object (void); - * - * - */ - -class ACE_Export ACE_XML_Svc_Conf -{ -public: - typedef ACE_XML_Svc_Conf *(*Factory)(void); - - virtual ~ACE_XML_Svc_Conf (void) = 0; - - virtual int parse_file (const ACE_TCHAR file[]) = 0; - - virtual int parse_string (const ACE_TCHAR str[]) = 0; -}; -#endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ - -#include "ace/post.h" - -#endif /* ACE_XML_SVC_CONF_H */ diff --git a/ace/XTI_ATM_Mcast.cpp b/ace/XTI_ATM_Mcast.cpp deleted file mode 100644 index 0892672635e..00000000000 --- a/ace/XTI_ATM_Mcast.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// XTI_ATM_Mcast.cpp -// $Id$ - -#include "ace/XTI_ATM_Mcast.h" - -ACE_RCSID(ace, XTI_ATM_Mcast, "$Id$") - -#if defined (ACE_HAS_XTI_ATM) - -#if !defined (__ACE_INLINE__) -#include "ace/XTI_ATM_Mcast.i" -#endif /* __ACE_INLINE__ */ - -ACE_ALLOC_HOOK_DEFINE(ACE_XTI_ATM_Mcast) - -void -ACE_XTI_ATM_Mcast::dump (void) const -{ - ACE_TRACE ("ACE_XTI_ATM_Mcast::dump"); -} - -ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (void) -{ - ACE_TRACE ("ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast"); -} - -// Add a leaf to the current connection (i.e., multicast). - -int -ACE_XTI_ATM_Mcast::add_leaf (ACE_TLI_Stream ¤t_stream, - const ACE_Addr &remote_sap, - ACE_INT32 leaf_id, - ACE_Time_Value *timeout) -{ - ACE_TRACE ("ACE_XTI_ATM_Mcast::add_leaf"); - - struct netbuf call_req; - memset(&call_req, 0, sizeof(call_req)); - call_req.len = remote_sap.get_size (); - call_req.buf = (char *)remote_sap.get_addr (); - - if (::t_addleaf(current_stream.get_handle(), - leaf_id, - &call_req) < 0) - { - // Check for asynchronous event - if (t_errno == TLOOK) - { - int event; - event = ACE_OS::t_look(current_stream.get_handle()); - if (event != TNODATA && event != T_DATA) - return -1; - else - // If this doesn't work for asynchronous calls we need to call - // the XTI/ATM t_rcvleafchange() function to check for t_addleaf - // completion. - return complete (current_stream, 0, timeout); - } - else - return -1; - } - - return 0; -} - -#endif /* ACE_HAS_XTI_ATM */ diff --git a/ace/XTI_ATM_Mcast.h b/ace/XTI_ATM_Mcast.h deleted file mode 100644 index 5c3e8821f81..00000000000 --- a/ace/XTI_ATM_Mcast.h +++ /dev/null @@ -1,131 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file XTI_ATM_Mcast.h - * - * $Id$ - * - * @author Joe Hoffert - */ -//============================================================================= - - -#ifndef ACE_XTI_ATM_MCAST_H -#define ACE_XTI_ATM_MCAST_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_XTI_ATM) - -#include "ace/TLI_Connector.h" -#include "ace/ATM_Addr.h" - -/** - * @class ACE_XTI_ATM_Mcast - * - * @brief Defines an active connection factory for the ACE_TLI C++ - * wrappers to support XTI/ATM multicast. - */ -class ACE_Export ACE_XTI_ATM_Mcast : public ACE_TLI_Connector -{ -public: - // = Initialization methods. - /// Default constructor. - ACE_XTI_ATM_Mcast (void); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the amount of time to wait before timing out. If the - * time expires before the connection is made . The - * is the value of local address to bind to. If it's - * the default value of then the user is letting - * the OS do the binding. If == 1 then the - * is reused, even if it hasn't been cleanedup yet. - */ - ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0, - const char device[] = ACE_XTI_ATM_DEVICE, - struct t_info *info = 0, - int rw_flag = 1, - struct netbuf *udata = 0, - struct netbuf *opt = 0); - - /** - * Actively connect and produce a if things go well. - * The is the address that we are trying to connect - * with. The is the amount of time to wait to connect. - * If it's 0 then we block indefinitely. If *timeout == {0, 0} then - * the connection is done using non-blocking mode. In this case, if - * the connection can't be made immediately the value of -1 is - * returned with . If *timeout > {0, 0} then - * this is the amount of time to wait before timing out. If the - * time expires before the connection is made . The - * is the value of local address to bind to. If it's - * the default value of then the user is letting - * the OS do the binding. If == 1 then the - * is reused, even if it hasn't been cleanedup yet. - */ - int connect (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0, - const char device[] = ACE_XTI_ATM_DEVICE, - struct t_info *info = 0, - int rw_flag = 1, - struct netbuf *udata = 0, - struct netbuf *opt = 0); - - /** - * Actively add a leaf to the currently connected stream (i.e., - * multicast). The is the address of the leaf that we - * are trying to add. The is the amount of time to wait to - * connect. If it's 0 then we block indefinitely. If *timeout == - * {0, 0} then the connection is done using non-blocking mode. In - * this case, if the connection can't be made immediately the value - * of -1 is returned with . If *timeout > - * {0, 0} then this is the amount of time to wait before timing out. - * If the time expires before the connection is made . - */ - int add_leaf (ACE_TLI_Stream ¤t_stream, - const ACE_Addr &remote_sap, - ACE_INT32 leaf_id, - ACE_Time_Value *timeout = 0); - - // = Meta-type info - typedef ACE_ATM_Addr PEER_ADDR; - typedef ACE_TLI_Stream PEER_STREAM; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; -}; - -#if defined (__ACE_INLINE__) -#include "ace/XTI_ATM_Mcast.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_HAS_XTI_ATM */ -#include "ace/post.h" -#endif /* ACE_XTI_ATM_MCAST_H */ diff --git a/ace/XTI_ATM_Mcast.i b/ace/XTI_ATM_Mcast.i deleted file mode 100644 index 895f37f30ff..00000000000 --- a/ace/XTI_ATM_Mcast.i +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// XTI_ATM_Mcast.i - -ACE_INLINE -ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms, - const char device[], - struct t_info *info, - int rw_flag, - struct netbuf *udata, - struct netbuf *opt) -{ - ACE_TRACE ("ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast"); - if (this->connect (new_stream, remote_sap, timeout, local_sap, reuse_addr, - flags, perms, device, - info, rw_flag, - udata, opt) == ACE_INVALID_HANDLE - && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); -} - -// Connect the to the , waiting up to -// amount of time if necessary. This is simple a pass- -// through function to ACE_TLI_Connector::connect(). It is over- -// ridden to change the default device from TCP to XTI/ATM. - -ACE_INLINE -int -ACE_XTI_ATM_Mcast::connect (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout, - const ACE_Addr &local_sap, - int reuse_addr, - int flags, - int perms, - const char device[], - struct t_info *info, - int rw_flag, - struct netbuf *udata, - struct netbuf *opt) -{ - ACE_TRACE ("ACE_XTI_ATM_Mcast::connect"); - return ACE_TLI_Connector::connect(new_stream, - remote_sap, - timeout, - local_sap, - reuse_addr, - flags, - perms, - device, - info, - rw_flag, - udata, - opt); -} diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp deleted file mode 100644 index 5a38e73ce34..00000000000 --- a/ace/XtReactor.cpp +++ /dev/null @@ -1,450 +0,0 @@ -// $Id$ - -#include "ace/XtReactor.h" -#if defined (ACE_HAS_XT) - -#include "ace/Synch_T.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Connector.h" - -ACE_RCSID(ace, XtReactor, "$Id$") - -ACE_ALLOC_HOOK_DEFINE (ACE_XtReactor) - -// Must be called with lock held -ACE_XtReactor::ACE_XtReactor (XtAppContext context, - size_t size, - int restart, - ACE_Sig_Handler *h) - : ACE_Select_Reactor (size, restart, h), - context_ (context), - ids_ (0), - timeout_ (0) -{ - // When the ACE_Select_Reactor is constructed it creates the notify - // pipe and registers it with the register_handler_i() method. The - // XtReactor overloads this method BUT because the - // register_handler_i occurs when constructing the base class - // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i() - // is called not the XtReactor register_handler_i(). This means - // that the notify pipe is registered with the ACE_Select_Reactor - // event handling code not the XtReactor and so notfications don't - // work. To get around this we simply close and re-opened the - // notification handler in the constructor of the XtReactor. - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - this->notify_handler_->close (); - this->notify_handler_->open (this, 0); -#endif /* ACE_MT_SAFE */ -} - -ACE_XtReactor::~ACE_XtReactor (void) -{ - // Delete the remaining items in the linked list. - - while (this->ids_) - { - ACE_XtReactorID *XtID = this->ids_->next_; - delete this->ids_; - this->ids_ = XtID; - } -} - -// This is just the from ace/Reactor.cpp -// but we use the Xt functions to wait for an event, not to find out which one might be -// available. - -void -ACE_XtReactor::InputCallbackProc (XtPointer closure, - int *source, - XtInputId *) -{ - ACE_XtReactor *self = (ACE_XtReactor *) closure; - ACE_HANDLE handle = (ACE_HANDLE) *source; - - // my copy isn't const. - ACE_Time_Value zero = ACE_Time_Value::zero; - - ACE_Select_Reactor_Handle_Set wait_set; - - // Deal with one file event. - - // - read which kind of event - if (self->wait_set_.rd_mask_.is_set (handle)) - wait_set.rd_mask_.set_bit (handle); - if (self->wait_set_.wr_mask_.is_set (handle)) - wait_set.wr_mask_.set_bit (handle); - if (self->wait_set_.ex_mask_.is_set (handle)) - wait_set.ex_mask_.set_bit (handle); - - int result = ACE_OS::select (*source + 1, - wait_set.rd_mask_, - wait_set.wr_mask_, - wait_set.ex_mask_, &zero); - - ACE_Select_Reactor_Handle_Set dispatch_set; - - // - Use only that one file event (removes events for other files). - if (result > 0) - { - if (wait_set.rd_mask_.is_set (handle)) - dispatch_set.rd_mask_.set_bit (handle); - if (wait_set.wr_mask_.is_set (handle)) - dispatch_set.wr_mask_.set_bit (handle); - if (wait_set.ex_mask_.is_set (handle)) - dispatch_set.ex_mask_.set_bit (handle); - - self->dispatch (1, dispatch_set); - } -} - -int -ACE_XtReactor::XtWaitForMultipleEvents (int width, - ACE_Select_Reactor_Handle_Set &wait_set, - ACE_Time_Value *) -{ - // Make sure we have a valid context - ACE_ASSERT (this->context_ != 0); - - // Check to make sure our handle's are all usable. - ACE_Select_Reactor_Handle_Set temp_set = wait_set; - - if (ACE_OS::select (width, - temp_set.rd_mask_, - temp_set.wr_mask_, - temp_set.ex_mask_, - (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) - return -1; // Bad file arguments... - - // Instead of waiting using . - return ACE_OS::select (width, - wait_set.rd_mask_, - wait_set.wr_mask_, - wait_set.ex_mask_, - (ACE_Time_Value *) &ACE_Time_Value::zero); -} - -XtAppContext -ACE_XtReactor::context (void) const -{ - return this->context_; -} - -void -ACE_XtReactor::context (XtAppContext context) -{ - this->context_ = context; -} - -int -ACE_XtReactor::register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_XtReactor::register_handler_i"); - - // Make sure we have a valid context - ACE_ASSERT (this->context_ != 0); - - int result = ACE_Select_Reactor::register_handler_i (handle, - handler, mask); - if (result == -1) - return -1; - - int condition = 0; - -#if !defined ACE_WIN32 - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK)) - ACE_SET_BITS (condition, XtInputReadMask); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK)) - ACE_SET_BITS (condition, XtInputWriteMask); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK)) - ACE_SET_BITS (condition, XtInputExceptMask); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK)) - ACE_SET_BITS (condition, XtInputReadMask); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){ - ACE_SET_BITS (condition, XtInputWriteMask); // connected, you may write - ACE_SET_BITS (condition, XtInputReadMask); // connected, you have data/err - } -#else - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK)) - ACE_SET_BITS (condition, XtInputReadWinsock); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK)) - ACE_SET_BITS (condition, XtInputWriteWinsock); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK)) - ACE_NOTSUP_RETURN(-1); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK)) - ACE_SET_BITS (condition, XtInputReadWinsock); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){ - ACE_SET_BITS (condition, XtInputWriteWinsock); // connected, you may write - ACE_SET_BITS (condition, XtInputReadWinsock); // connected, you have data/err - } -#endif /* !ACE_WIN32 */ - - if (condition != 0) - { - ACE_XtReactorID *XtID = this->ids_; - - while(XtID) - { - if (XtID->handle_ == handle) - { - ::XtRemoveInput (XtID->id_); - - XtID->id_ = ::XtAppAddInput (this->context_, - (int) handle, - (XtPointer) condition, - InputCallbackProc, - (XtPointer) this); - return 0; - } - else - XtID = XtID->next_; - } - - ACE_NEW_RETURN (XtID, - ACE_XtReactorID, - -1); - XtID->next_ = this->ids_; - XtID->handle_ = handle; - XtID->id_ = ::XtAppAddInput (this->context_, - (int) handle, - (XtPointer) condition, - InputCallbackProc, - (XtPointer) this); - this->ids_ = XtID; - } - return 0; -} - -int -ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) -{ - return ACE_Select_Reactor::register_handler_i (handles, - handler, - mask); -} - -int -ACE_XtReactor::remove_handler_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_XtReactor::remove_handler_i"); - - // In the registration phase we registered first with - // ACE_Select_Reactor and then with X. Now we are now doing things - // in reverse order. - - // First clean up the corresponding X11Input. - this->remove_XtInput (handle); - - // Now let the reactor do its work. - return ACE_Select_Reactor::remove_handler_i (handle, - mask); -} - -void -ACE_XtReactor::remove_XtInput (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_XtReactor::remove_XtInput"); - - ACE_XtReactorID *XtID = this->ids_; - - if (XtID) - { - if (XtID->handle_ == handle) - { - ::XtRemoveInput (XtID->id_); - this->ids_ = XtID->next_; - delete XtID; - return; - } - - ACE_XtReactorID *NextID = XtID->next_; - - while (NextID) - { - if (NextID->handle_ == handle) - { - ::XtRemoveInput(NextID->id_); - XtID->next_ = NextID->next_; - delete NextID; - return; - } - else - { - XtID = NextID; - NextID = NextID->next_; - } - } - } -} - -int -ACE_XtReactor::remove_handler_i (const ACE_Handle_Set &handles, - ACE_Reactor_Mask mask) -{ - return ACE_Select_Reactor::remove_handler_i (handles, - mask); -} - -// The following functions ensure that there is an Xt timeout for the -// first timeout in the Reactor's Timer_Queue. - -void -ACE_XtReactor::reset_timeout (void) -{ - // Make sure we have a valid context - ACE_ASSERT (this->context_ != 0); - - if (timeout_) - ::XtRemoveTimeOut (timeout_); - timeout_ = 0; - - ACE_Time_Value *max_wait_time = - this->timer_queue_->calculate_timeout (0); - - if (max_wait_time) - timeout_ = ::XtAppAddTimeOut (this->context_, - max_wait_time->msec (), - TimerCallbackProc, - (XtPointer) this); -} - -int -ACE_XtReactor::reset_timer_interval - (long timer_id, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_XtReactor::reset_timer_interval"); - ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1)); - - int result = ACE_Select_Reactor::timer_queue_->reset_interval - (timer_id, - interval); - - if (result == -1) - return -1; - else - { - this->reset_timeout (); - return result; - } -} - -long -ACE_XtReactor::schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval) -{ - ACE_TRACE ("ACE_XtReactor::schedule_timer"); - ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1)); - - long result = ACE_Select_Reactor::schedule_timer (event_handler, - arg, - delay, - interval); - if (result == -1) - return -1; - else - { - this->reset_timeout (); - return result; - } -} - -int -ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_XtReactor::cancel_timer"); - - if (ACE_Select_Reactor::cancel_timer (handler, - dont_call_handle_close) == -1) - return -1; - else - { - this->reset_timeout (); - return 0; - } -} - -int -ACE_XtReactor::cancel_timer (long timer_id, - const void **arg, - int dont_call_handle_close) -{ - ACE_TRACE ("ACE_XtReactor::cancel_timer"); - - if (ACE_Select_Reactor::cancel_timer (timer_id, - arg, - dont_call_handle_close) == -1) - return -1; - else - { - this->reset_timeout (); - return 0; - } -} - -#endif /* ACE_HAS_XT */ diff --git a/ace/XtReactor.h b/ace/XtReactor.h deleted file mode 100644 index 62a22c44f8b..00000000000 --- a/ace/XtReactor.h +++ /dev/null @@ -1,138 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file XtReactor.h - * - * $Id$ - * - * @author Eric C. Newton's - * @author Kirill Rybaltchenko - * @author Douglas C. Schmidt - */ -//============================================================================= - - -#ifndef ACE_XTREACTOR_H -#define ACE_XTREACTOR_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_XT) - -#include "ace/Select_Reactor.h" - -//#define String XtString -#include /**/ -//#undef String - -/** - * @class ACE_XtReactorID - * - * @brief This little class is necessary due to the way that Microsoft - * implements sockets to be pointers rather than indices. - */ -class ACE_Export ACE_XtReactorID -{ -public: - /// Magic cookie. - XtInputId id_; - - /// Underlying handle. - ACE_HANDLE handle_; - - /// Pointer to next node in the linked list. - ACE_XtReactorID *next_; -}; - -/** - * @class ACE_XtReactor - * - * @brief An object-oriented event demultiplexor and event handler - * dispatcher that uses the X Toolkit functions. - */ -class ACE_Export ACE_XtReactor : public ACE_Select_Reactor -{ -public: - // = Initialization and termination methods. - ACE_XtReactor (XtAppContext context = 0, - size_t size = DEFAULT_SIZE, - int restart = 0, - ACE_Sig_Handler * = 0); - virtual ~ACE_XtReactor (void); - - XtAppContext context (void) const; - void context (XtAppContext); - - // = Timer operations. - virtual long schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval); - virtual int reset_timer_interval (long timer_id, - const ACE_Time_Value &interval); - virtual int cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close = 1); - - virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1); - -protected: - // = Register timers/handles with Xt. - /// Register a single . - virtual int register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); - - /// Register a set of . - virtual int register_handler_i (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); - - /// Remove the associated with this . - virtual int remove_handler_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask); - - /// Remove a set of . - virtual int remove_handler_i (const ACE_Handle_Set &handles, - ACE_Reactor_Mask); - - /// Removes an Xt handle. - virtual void remove_XtInput (ACE_HANDLE handle); - - /// Wait for events to occur. - virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &, - ACE_Time_Value *); - - ///Wait for Xt events to occur. - virtual int XtWaitForMultipleEvents (int, - ACE_Select_Reactor_Handle_Set &, - ACE_Time_Value *); - - XtAppContext context_; - ACE_XtReactorID *ids_; - XtIntervalId timeout_; - -private: - /// This method ensures there's an Xt timeout for the first timeout - /// in the Reactor's Timer_Queue. - void reset_timeout (void); - - // = Integrate with the X callback function mechanism. - static void TimerCallbackProc (XtPointer closure, XtIntervalId *id); - static void InputCallbackProc (XtPointer closure, int* source, XtInputId *id); - - /// Deny access since member-wise won't work... - ACE_XtReactor (const ACE_XtReactor &); - ACE_XtReactor &operator = (const ACE_XtReactor &); -}; -#endif /* ACE_HAS_XT */ - -#include "ace/post.h" -#endif /* ACE_XTREACTOR_H */ diff --git a/ace/ace-dll.icc b/ace/ace-dll.icc deleted file mode 100644 index 40af7b1f046..00000000000 --- a/ace/ace-dll.icc +++ /dev/null @@ -1,523 +0,0 @@ -// $Id$ -// -// Configuration file to build ACE shared library (aka DLL) on both Win32 -// and AIX using Visual Age C++ 4 (or later) - -if $__TOS_WIN__ { - option PlatformOptions = - define ("ACE_HAS_DLL","0"), - define ("ACE_HAS_WINSOCK2","1"), - define ("ACE_HAS_WCHAR_TYPEDEFS_CHAR","1"), - define ("_stricmp", "stricmp"), - define ("_strnicmp", "strnicmp"), - define ("_O_TEMPORARY", 0x08), - define ("_O_CREAT", "O_CREAT"), - define ("_O_TRUNC", "O_TRUNC"), - define ("_O_EXCL", "O_EXCL"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define ("_INTEGRAL_MAX_BITS", 64) - TargetType = "dll" - TargetName = "aced.dll" -} -if $__TOS_AIX__ { - option PlatformOptions = - defaults(xlC_r), - gen(check,bounds,no), - link(typecheck,yes), - opt(level, 0), // for debugging - gen(enumsize, small), - report (level,W), - report (disable, "1540-1612"), - report (disable, "1540-1613") - TargetType = "shr" - TargetName = "shr.o" - run after sources("shr.o") targets ("libACE.a") "ar -r -u libACE.a shr.o", "rm -rf shr.o" - run cleanup "rm -rf libACE.a shr.o" -} - -option - PlatformOptions, - link(exportAll), - link(linkwithsharedlib), - link(linkWithMultiThreadLib,yes), - incl(searchpath, "..") - { - target type ( TargetType ) TargetName - { - option macros(global) - { - source type(hpp) 'wchar.h' - source type(hpp) 'wcstr.h' - if $__TOS_WIN__ { - source type(hpp) - 'config-win32-common.h', - 'config-win32-visualage.h', - 'config-visualage.h', - 'config-win32.h' - } - - source type(hpp) - 'Acceptor.h', - 'ACE.h', - 'Activation_Queue.h', - 'Active_Map_Manager.h', - 'Active_Map_Manager_T.h', - 'Addr.h', - 'ARGV.h', - 'Arg_Shifter.h', - 'Array.h', - 'Asynch_Acceptor.h', - 'Asynch_IO.h', - 'Asynch_IO_Impl.h', - 'ATM_Addr.h', - 'Auto_Ptr.h', - 'Base_Thread_Adapter.h', - 'Based_Pointer_Repository.h', - 'Basic_Stats.h', - 'Basic_Types.h', - 'Cached_Connect_Strategy_T.h', - 'Cache_Map_Manager_T.h', - 'Caching_Strategies_T.h', - 'Caching_Utility_T.h', - 'Capabilities.h', - 'CDR_Base.h', - 'CDR_Stream.h', - 'Cleanup_Strategies_T.h', - 'Codeset_IBM1047.h', - 'Codeset_Registry.h', - 'config.h', - 'Connector.h', - 'Containers.h', - 'Containers_T.h', - 'CORBA_macros.h', - 'Date_Time.h', - 'DEV.h', - 'DEV_Addr.h', - 'DEV_Connector.h', - 'DEV_IO.h', - 'Dirent.h', - 'DLL.h', - 'Dump.h', - 'Dump_T.h', - 'Dynamic.h', - 'Dynamic_Service.h', - 'Env_Value_T.h', - 'Event_Handler.h', - 'Event_Handler_T.h', - 'FIFO.h', - 'FIFO_Recv.h', - 'FIFO_Recv_Msg.h', - 'FIFO_Send.h', - 'FIFO_Send_Msg.h', - 'FILE.h', - 'Filecache.h', - 'FILE_Addr.h', - 'FILE_Connector.h', - 'FILE_IO.h', - 'Flag_Manip.h', - 'FlReactor.h', - 'Free_List.h', - 'Functor.h', - 'Functor_T.h', - 'Future.h', - 'Future_Set.h', - 'Get_Opt.h', - 'Handle_Gobbler.h', - 'Handle_Ops.h', - 'Handle_Set.h', - 'Hash_Cache_Map_Manager_T.h', - 'Hash_Map_Manager.h', - 'Hash_Map_Manager_T.h', - 'Hash_Map_With_Allocator_T.h', - 'High_Res_Timer.h', - 'config-all.h', - 'INET_Addr.h', - 'Init_ACE.h', - 'iosfwd.h', - 'IOStream.h', - 'IOStream_T.h', - 'IO_Cntl_Msg.h', - 'IO_SAP.h', - 'IPC_SAP.h', - 'Lib_Find.h', - 'Local_Name_Space.h', - 'Local_Name_Space_T.h', - 'Local_Tokens.h', - 'LOCK_SOCK_Acceptor.h', - 'Log_Msg.h', - 'Log_Msg_Backend.h', - 'Log_Msg_IPC.h', - 'Log_Priority.h', - 'Log_Record.h', - 'LSOCK.h', - 'LSOCK_Acceptor.h', - 'LSOCK_CODgram.h', - 'LSOCK_Connector.h', - 'LSOCK_Dgram.h', - 'LSOCK_Stream.h', - 'Malloc.h', - 'Malloc_Allocator.h', - 'Malloc_Base.h', - 'Malloc_T.h', - 'Managed_Object.h', - 'Map.h', - 'Map_Manager.h', - 'Map_T.h', - 'Memory_Pool.h', - 'Mem_Map.h', - 'Message_Block.h', - 'Message_Block_T.h', - 'Message_Queue.h', - 'Message_Queue_T.h', - 'Method_Object.h', - 'Method_Request.h', - 'Module.h', - 'Msg_WFMO_Reactor.h', - 'Name_Proxy.h', - 'Name_Request_Reply.h', - 'Name_Space.h', - 'Naming_Context.h', - 'NT_Service.h', - 'Object_Manager.h', - 'Obstack.h', - 'OS.h', - 'OS_Dirent.h', - 'OS_Errno.h', - 'OS_Log_Msg_Attributes.h', - 'OS_Memory.h', - 'OS_String.h', - 'OS_Thread_Adapter.h', - 'OS_TLI.h', - 'PI_Malloc.h', - 'POSIX_Asynch_IO.h', - 'POSIX_Proactor.h', - 'Pair.h', - 'Pair_T.h', - 'Parse_Node.h', - 'Pipe.h', - 'Priority_Reactor.h', - 'Proactor.h', - 'Proactor_Impl.h', - 'Process.h', - 'Process_Manager.h', - 'Profile_Timer.h', - 'RB_Tree.h', - 'Reactor.h', - 'Reactor_Impl.h', - 'Read_Buffer.h', - 'Registry.h', - 'Registry_Name_Space.h', - 'Remote_Name_Space.h', - 'Remote_Tokens.h', - 'Sched_Params.h', - 'Select_Reactor.h', - 'Select_Reactor_Base.h', - 'Select_Reactor_T.h', - 'Service_Config.h', - 'Service_Manager.h', - 'Service_Object.h', - 'Service_Repository.h', - 'Service_Types.h', - 'Shared_Memory.h', - 'Shared_Memory_MM.h', - 'Shared_Memory_SV.h', - 'Shared_Object.h', - 'Signal.h', - 'Singleton.h', - 'SOCK.h', - 'SOCK_Acceptor.h', - 'SOCK_CODgram.h', - 'SOCK_Connector.h', - 'SOCK_Dgram.h', - 'SOCK_Dgram_Bcast.h', - 'SOCK_Dgram_Mcast.h', - 'SOCK_IO.h', - 'SOCK_Stream.h', - 'Sock_Connect.h', - 'SPIPE.h', - 'SPIPE_Acceptor.h', - 'SPIPE_Addr.h', - 'SPIPE_Connector.h', - 'SPIPE_Stream.h', - 'String_Base_Const.h', - 'String_Base.h', - 'SString.h', - 'Stats.h', - 'Strategies.h', - 'Strategies_T.h', - 'Stream.h', - 'streams.h', - 'Stream_Modules.h', - 'Svc_Conf.h', - 'Svc_Conf_Tokens.h', - 'Svc_Handler.h', - 'SV_Message.h', - 'SV_Message_Queue.h', - 'SV_Semaphore_Complex.h', - 'SV_Semaphore_Simple.h', - 'SV_Shared_Memory.h', - 'Synch.h', - 'Process_Semaphore.h', - 'Process_Mutex.h', - 'RW_Process_Mutex.h', - 'File_Lock.h', - 'Synch_Options.h', - 'Synch_T.h', - 'System_Time.h', - 'Task.h', - 'Task_T.h', - 'Thread.h', - 'Thread_Adapter.h', - 'Thread_Control.h', - 'Thread_Exit.h', - 'Thread_Manager.h', - 'Timeprobe.h', - 'Timeprobe_T.h', - 'Timer_Hash.h', - 'Timer_Hash_T.h', - 'Timer_Heap.h', - 'Timer_Heap_T.h', - 'Timer_List.h', - 'Timer_List_T.h', - 'Timer_Queue.h', - 'Timer_Queue_Adapters.h', - 'Timer_Queue_T.h', - 'Timer_Wheel.h', - 'Timer_Wheel_T.h', - 'Time_Request_Reply.h', - 'Time_Value.h', - 'TkReactor.h', - 'TLI.h', - 'TLI_Acceptor.h', - 'TLI_Connector.h', - 'TLI_Stream.h', - 'Token.h', - 'Token_Collection.h', - 'Token_Invariants.h', - 'Token_Manager.h', - 'Token_Request_Reply.h', - 'TP_Reactor.h', - 'Trace.h', - 'TTY_IO.h', - 'Typed_SV_Message.h', - 'Typed_SV_Message_Queue.h', - 'UNIX_Addr.h', - 'UPIPE_Acceptor.h', - 'UPIPE_Addr.h', - 'UPIPE_Connector.h', - 'UPIPE_Stream.h', - 'Version.h', - 'WFMO_Reactor.h', - 'WIN32_Asynch_IO.h', - 'WIN32_Proactor.h', - 'XtReactor.h' - } - source type(cpp) "Log_Msg.cpp" - source type(cpp) "ACE.cpp" - source type(cpp) "Activation_Queue.cpp" - source type(cpp) "Active_Map_Manager.cpp" - source type(cpp) "Addr.cpp" - source type(cpp) "Arg_Shifter.cpp" - source type(cpp) "ARGV.cpp" - source type(cpp) "Asynch_IO.cpp" - source type(cpp) "Asynch_IO_Impl.cpp" - source type(cpp) "Base_Thread_Adapter.cpp" - source type(cpp) "Based_Pointer_Repository.cpp" - source type(cpp) "Basic_Stats.cpp" - source type(cpp) "Basic_Types.cpp" - source type(cpp) "Capabilities.cpp" - source type(cpp) "CDR_Base.cpp" - source type(cpp) "CDR_Stream.cpp" - source type(cpp) "Codeset_Registry.cpp" - source type(cpp) "Codeset_Registry_db.cpp" - source type(cpp) "Configuration.cpp" - source type(cpp) "Containers.cpp" - source type(cpp) "Date_Time.cpp" - source type(cpp) "DEV.cpp" - source type(cpp) "DEV_Addr.cpp" - source type(cpp) "DEV_Connector.cpp" - source type(cpp) "DEV_IO.cpp" - source type(cpp) "Dirent.cpp" - source type(cpp) "DLL.cpp" - source type(cpp) "Dump.cpp" - source type(cpp) "Dynamic.cpp" - source type(cpp) "Dynamic_Service.cpp" - source type(cpp) "Event_Handler.cpp" - source type(cpp) "FIFO.cpp" - source type(cpp) "FIFO_Recv.cpp" - source type(cpp) "FIFO_Recv_Msg.cpp" - source type(cpp) "FIFO_Send.cpp" - source type(cpp) "FIFO_Send_Msg.cpp" - source type(cpp) "FILE.cpp" - source type(cpp) "FILE_Addr.cpp" - source type(cpp) "FILE_Connector.cpp" - source type(cpp) "FILE_IO.cpp" - source type(cpp) "Filecache.cpp" - source type(cpp) "Flag_Manip.cpp" - source type(cpp) "Functor.cpp" - source type(cpp) "Future.cpp" - source type(cpp) "Get_Opt.cpp" - source type(cpp) "Handle_Ops.cpp" - source type(cpp) "Handle_Set.cpp" - source type(cpp) "Hash_Map_Manager.cpp" - source type(cpp) "High_Res_Timer.cpp" - source type(cpp) "INET_Addr.cpp" - source type(cpp) "Init_ACE.cpp" - source type(cpp) "IO_Cntl_Msg.cpp" - source type(cpp) "IO_SAP.cpp" - source type(cpp) "IOStream.cpp" - source type(cpp) "IPC_SAP.cpp" - source type(cpp) "Lib_Find.cpp" - source type(cpp) "Local_Name_Space.cpp" - source type(cpp) "Local_Tokens.cpp" - source type(cpp) "Log_Msg_Backend.cpp" - source type(cpp) "Log_Msg_IPC.cpp" - source type(cpp) "Log_Record.cpp" - source type(cpp) "LSOCK.cpp" - source type(cpp) "LSOCK_Acceptor.cpp" - source type(cpp) "LSOCK_CODgram.cpp" - source type(cpp) "LSOCK_Connector.cpp" - source type(cpp) "LSOCK_Dgram.cpp" - source type(cpp) "LSOCK_Stream.cpp" - source type(cpp) "Malloc.cpp" - source type(cpp) "Malloc_Allocator.cpp" - source type(cpp) "Map.cpp" - source type(cpp) "Mem_Map.cpp" - source type(cpp) "Memory_Pool.cpp" - source type(cpp) "Message_Block.cpp" - source type(cpp) "Message_Queue.cpp" - source type(cpp) "Method_Request.cpp" - source type(cpp) "Msg_WFMO_Reactor.cpp" - source type(cpp) "Name_Proxy.cpp" - source type(cpp) "Name_Request_Reply.cpp" - source type(cpp) "Name_Space.cpp" - source type(cpp) "Naming_Context.cpp" - source type(cpp) "NT_Service.cpp" - source type(cpp) "Object_Manager.cpp" - source type(cpp) "Obstack.cpp" - source type(cpp) "OS.cpp" - source type(cpp) "OS_Dirent.cpp" - source type(cpp) "OS_Errno.cpp" - source type(cpp) "OS_Log_Msg_Attributes.cpp" - source type(cpp) "OS_Memory.cpp" - source type(cpp) "OS_String.cpp" - source type(cpp) "OS_Thread_Adapter.cpp" - source type(cpp) "OS_TLI.cpp" - source type(cpp) "PI_Malloc.cpp" - source type(cpp) "Pair.cpp" - source type(cpp) "Parse_Node.cpp" - source type(cpp) "Pipe.cpp" - source type(cpp) "Priority_Reactor.cpp" - source type(cpp) "Proactor.cpp" - source type(cpp) "Process.cpp" - source type(cpp) "Process_Manager.cpp" - source type(cpp) "Profile_Timer.cpp" - source type(cpp) "RB_Tree.cpp" - source type(cpp) "Reactor.cpp" - source type(cpp) "Read_Buffer.cpp" - source type(cpp) "Registry.cpp" - source type(cpp) "Registry_Name_Space.cpp" - source type(cpp) "Remote_Name_Space.cpp" - source type(cpp) "Remote_Tokens.cpp" - source type(cpp) "Sched_Params.cpp" - source type(cpp) "Select_Reactor.cpp" - source type(cpp) "Select_Reactor_Base.cpp" - source type(cpp) "Service_Config.cpp" - source type(cpp) "Service_Manager.cpp" - source type(cpp) "Service_Object.cpp" - source type(cpp) "Service_Repository.cpp" - source type(cpp) "Service_Types.cpp" - source type(cpp) "Shared_Memory.cpp" - source type(cpp) "Shared_Memory_MM.cpp" - source type(cpp) "Shared_Memory_SV.cpp" - source type(cpp) "Shared_Object.cpp" - source type(cpp) "Signal.cpp" - source type(cpp) "SOCK.cpp" - source type(cpp) "SOCK_Acceptor.cpp" - source type(cpp) "SOCK_CODgram.cpp" - source type(cpp) "SOCK_Connector.cpp" - source type(cpp) "SOCK_Dgram.cpp" - source type(cpp) "SOCK_Dgram_Bcast.cpp" - source type(cpp) "SOCK_Dgram_Mcast.cpp" - source type(cpp) "SOCK_IO.cpp" - source type(cpp) "SOCK_Stream.cpp" - source type(cpp) "Sock_Connect.cpp" - source type(cpp) "SPIPE.cpp" - source type(cpp) "SPIPE_Acceptor.cpp" - source type(cpp) "SPIPE_Addr.cpp" - source type(cpp) "SPIPE_Connector.cpp" - source type(cpp) "SPIPE_Stream.cpp" - source type(cpp) "String_Base_Const.cpp" - source type(cpp) "SString.cpp" - source type(cpp) "Stats.cpp" - source type(cpp) "Strategies.cpp" - source type(cpp) "SV_Message.cpp" - source type(cpp) "SV_Message_Queue.cpp" - source type(cpp) "SV_Semaphore_Complex.cpp" - source type(cpp) "SV_Semaphore_Simple.cpp" - source type(cpp) "SV_Shared_Memory.cpp" - source type(cpp) "Svc_Conf_l.cpp" - source type(cpp) "Svc_Conf_y.cpp" - source type(cpp) "Synch.cpp" - source type(cpp) "Process_Semaphore.cpp" - source type(cpp) "Process_Mutex.cpp" - source type(cpp) "RW_Process_Mutex.cpp" - source type(cpp) "File_Lock.cpp" - source type(cpp) "Synch_Options.cpp" - source type(cpp) "System_Time.cpp" - source type(cpp) "Task.cpp" - source type(cpp) "Thread.cpp" - source type(cpp) "Thread_Adapter.cpp" - source type(cpp) "Thread_Control.cpp" - source type(cpp) "Thread_Exit.cpp" - source type(cpp) "Thread_Manager.cpp" - source type(cpp) "Time_Request_Reply.cpp" - source type(cpp) "Timeprobe.cpp" - source type(cpp) "Timer_Hash.cpp" - source type(cpp) "Timer_Heap.cpp" - source type(cpp) "Timer_List.cpp" - source type(cpp) "Timer_Queue.cpp" - source type(cpp) "Timer_Queue_Adapters.cpp" - source type(cpp) "Timer_Wheel.cpp" - source type(cpp) "TLI.cpp" - source type(cpp) "TLI_Acceptor.cpp" - source type(cpp) "TLI_Connector.cpp" - source type(cpp) "TLI_Stream.cpp" - source type(cpp) "Token.cpp" - source type(cpp) "Token_Collection.cpp" - source type(cpp) "Token_Invariants.cpp" - source type(cpp) "Token_Manager.cpp" - source type(cpp) "Token_Request_Reply.cpp" - source type(cpp) "TP_Reactor.cpp" - source type(cpp) "Trace.cpp" - source type(cpp) "TTY_IO.cpp" - source type(cpp) "Typed_SV_Message.cpp" - source type(cpp) "Typed_SV_Message_Queue.cpp" - source type(cpp) "UNIX_Addr.cpp" - source type(cpp) "UPIPE_Acceptor.cpp" - source type(cpp) "UPIPE_Connector.cpp" - source type(cpp) "UPIPE_Stream.cpp" - source type(cpp) "WFMO_Reactor.cpp" - source type(cpp) "WIN32_Asynch_IO.cpp" - source type(cpp) "WIN32_Proactor.cpp" - source type(cpp) "XtReactor.cpp" - - // Libraries needed during linking - if $__TOS_WIN__ { - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - if $__TOS_AIX__ { - source type (lib) "libtli_r.a" - source type (lib) "libpthreads.a" - source type (lib) "libc_r.a" - source type (lib) "libdl.a" - // Imports - source type (imp) "pse.exp" - } - } -} diff --git a/ace/ace-lib.icc b/ace/ace-lib.icc deleted file mode 100644 index 8c92312ba8b..00000000000 --- a/ace/ace-lib.icc +++ /dev/null @@ -1,284 +0,0 @@ -if $__TOS_WIN__ { - option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"), - define ("WIN32","1"), - define ("_WINDOWS","1") - TARG = "aced.lib" -} -if $__TOS_AIX__ { - option PlatformOptions = null - TARG = "libACE.a" -} - -option - PlatformOptions, - incl(searchPath,'..'), - define ("__ACE_INLINE__","0"), - define("ACE_HAS_DLL","0"), - link(exportAll), - link(linkwithsharedlib), - link(linkWithMultiThreadLib,yes) - { - target type (lib) TARG - { - option macros(global) - { - source type(cpp) "OS.h" - } - source type(cpp) "Log_Msg.cpp" - source type(cpp) "ACE.cpp" - source type(cpp) "Activation_Queue.cpp" - source type(cpp) "Active_Map_Manager.cpp" - source type(cpp) "Addr.cpp" - source type(cpp) "Arg_Shifter.cpp" - source type(cpp) "ARGV.cpp" - source type(cpp) "Asynch_IO.cpp" - source type(cpp) "Asynch_IO_Impl.cpp" - source type(cpp) "Basic_Types.cpp" - source type(cpp) "CDR_Base.cpp" - source type(cpp) "CDR_Stream.cpp" - source type(cpp) "Codeset_Registry.cpp" - source type(cpp) "Codeset_Registry_db.cpp" - source type(cpp) "Containers.cpp" - source type(cpp) "Date_Time.cpp" - source type(cpp) "DEV.cpp" - source type(cpp) "DEV_Addr.cpp" - source type(cpp) "DEV_Connector.cpp" - source type(cpp) "DEV_IO.cpp" - source type(cpp) "Dirent.cpp" - source type(cpp) "DLL.cpp" - source type(cpp) "Dump.cpp" - source type(cpp) "Dynamic.cpp" - source type(cpp) "Dynamic_Service.cpp" - source type(cpp) "Event_Handler.cpp" - source type(cpp) "Event_Handler_T.cpp" - source type(cpp) "FIFO.cpp" - source type(cpp) "FIFO_Recv.cpp" - source type(cpp) "FIFO_Recv_Msg.cpp" - source type(cpp) "FIFO_Send.cpp" - source type(cpp) "FIFO_Send_Msg.cpp" - source type(cpp) "FILE.cpp" - source type(cpp) "FILE_Addr.cpp" - source type(cpp) "FILE_Connector.cpp" - source type(cpp) "FILE_IO.cpp" - source type(cpp) "Filecache.cpp" - source type(cpp) "Functor.cpp" - source type(cpp) "Future.cpp" - source type(cpp) "Get_Opt.cpp" - source type(cpp) "Handle_Set.cpp" - source type(cpp) "Hash_Map_Manager.cpp" - source type(cpp) "High_Res_Timer.cpp" - source type(cpp) "INET_Addr.cpp" - source type(cpp) "IO_Cntl_Msg.cpp" - source type(cpp) "IO_SAP.cpp" - source type(cpp) "IOStream.cpp" - source type(cpp) "IPC_SAP.cpp" - source type(cpp) "Local_Name_Space.cpp" - source type(cpp) "Local_Tokens.cpp" - source type(cpp) "Log_Record.cpp" - source type(cpp) "LSOCK.cpp" - source type(cpp) "LSOCK_Acceptor.cpp" - source type(cpp) "LSOCK_CODgram.cpp" - source type(cpp) "LSOCK_Connector.cpp" - source type(cpp) "LSOCK_Dgram.cpp" - source type(cpp) "LSOCK_Stream.cpp" - source type(cpp) "Malloc.cpp" - source type(cpp) "Map.cpp" - source type(cpp) "Mem_Map.cpp" - source type(cpp) "Memory_Pool.cpp" - source type(cpp) "Message_Block.cpp" - source type(cpp) "Message_Queue.cpp" - source type(cpp) "Method_Request.cpp" - source type(cpp) "Msg_WFMO_Reactor.cpp" - source type(cpp) "Multiplexor.cpp" - source type(cpp) "Name_Proxy.cpp" - source type(cpp) "Name_Request_Reply.cpp" - source type(cpp) "Name_Space.cpp" - source type(cpp) "Naming_Context.cpp" - source type(cpp) "NT_Service.cpp" - source type(cpp) "Object_Manager.cpp" - source type(cpp) "Obstack.cpp" - source type(cpp) "OS.cpp" - source type(cpp) "OS_Dirent.cpp" - source type(cpp) "OS_Errno.cpp" - source type(cpp) "OS_Memory.cpp" - source type(cpp) "OS_String.cpp" - source type(cpp) "OS_TLI.cpp" - source type(cpp) "Pair.cpp" - source type(cpp) "Parse_Node.cpp" - source type(cpp) "Pipe.cpp" - source type(cpp) "Priority_Reactor.cpp" - source type(cpp) "Proactor.cpp" - source type(cpp) "Process.cpp" - source type(cpp) "Process_Manager.cpp" - source type(cpp) "Profile_Timer.cpp" - source type(cpp) "RB_Tree.cpp" - source type(cpp) "Reactor.cpp" - source type(cpp) "Read_Buffer.cpp" - source type(cpp) "Registry.cpp" - source type(cpp) "Registry_Name_Space.cpp" - source type(cpp) "Remote_Name_Space.cpp" - source type(cpp) "Remote_Tokens.cpp" - source type(cpp) "Sched_Params.cpp" - source type(cpp) "Select_Reactor.cpp" - source type(cpp) "Select_Reactor_Base.cpp" - source type(cpp) "Service_Config.cpp" - source type(cpp) "Service_Manager.cpp" - source type(cpp) "Service_Object.cpp" - source type(cpp) "Service_Repository.cpp" - source type(cpp) "Service_Types.cpp" - source type(cpp) "Shared_Memory.cpp" - source type(cpp) "Shared_Memory_MM.cpp" - source type(cpp) "Shared_Memory_SV.cpp" - source type(cpp) "Shared_Object.cpp" - source type(cpp) "Signal.cpp" - source type(cpp) "SOCK.cpp" - source type(cpp) "SOCK_Acceptor.cpp" - source type(cpp) "SOCK_CODgram.cpp" - source type(cpp) "SOCK_Connector.cpp" - source type(cpp) "SOCK_Dgram.cpp" - source type(cpp) "SOCK_Dgram_Bcast.cpp" - source type(cpp) "SOCK_Dgram_Mcast.cpp" - source type(cpp) "SOCK_IO.cpp" - source type(cpp) "SOCK_Stream.cpp" - source type(cpp) "SPIPE.cpp" - source type(cpp) "SPIPE_Acceptor.cpp" - source type(cpp) "SPIPE_Addr.cpp" - source type(cpp) "SPIPE_Connector.cpp" - source type(cpp) "SPIPE_Stream.cpp" - source type(cpp) "String_Base_Const.cpp" - source type(cpp) "SString.cpp" - source type(cpp) "Stats.cpp" - source type(cpp) "Strategies.cpp" - source type(cpp) "SV_Message.cpp" - source type(cpp) "SV_Message_Queue.cpp" - source type(cpp) "SV_Semaphore_Complex.cpp" - source type(cpp) "SV_Semaphore_Simple.cpp" - source type(cpp) "SV_Shared_Memory.cpp" - source type(cpp) "Svc_Conf_l.cpp" - source type(cpp) "Svc_Conf_y.cpp" - source type(cpp) "Svc_Handler.cpp" - source type(cpp) "Synch.cpp" - source type(cpp) "Process_Semaphore.cpp" - source type(cpp) "Process_Mutex.cpp" - source type(cpp) "RW_Process_Mutex.cpp" - source type(cpp) "File_Lock.cpp" - source type(cpp) "Synch_Options.cpp" - source type(cpp) "System_Time.cpp" - source type(cpp) "Task.cpp" - source type(cpp) "Thread.cpp" - source type(cpp) "Base_Thread_Adapter.cpp" - source type(cpp) "OS_Thread_Adapter.cpp" - source type(cpp) "Thread_Adapter.cpp" - source type(cpp) "Thread_Manager.cpp" - source type(cpp) "Time_Request_Reply.cpp" - source type(cpp) "Timeprobe.cpp" - source type(cpp) "Timer_Hash.cpp" - source type(cpp) "Timer_Heap.cpp" - source type(cpp) "Timer_List.cpp" - source type(cpp) "Timer_Queue.cpp" - source type(cpp) "Timer_Queue_Adapters.cpp" - source type(cpp) "Timer_Wheel.cpp" - source type(cpp) "TLI.cpp" - source type(cpp) "TLI_Acceptor.cpp" - source type(cpp) "TLI_Connector.cpp" - source type(cpp) "TLI_Stream.cpp" - source type(cpp) "Token.cpp" - source type(cpp) "Token_Collection.cpp" - source type(cpp) "Token_Invariants.cpp" - source type(cpp) "Token_Manager.cpp" - source type(cpp) "Token_Request_Reply.cpp" - source type(cpp) "TP_Reactor.cpp" - source type(cpp) "Trace.cpp" - source type(cpp) "TTY_IO.cpp" - source type(cpp) "Typed_SV_Message.cpp" - source type(cpp) "Typed_SV_Message_Queue.cpp" - source type(cpp) "UNIX_Addr.cpp" - source type(cpp) "UPIPE_Acceptor.cpp" - source type(cpp) "UPIPE_Connector.cpp" - source type(cpp) "UPIPE_Stream.cpp" - source type(cpp) "WFMO_Reactor.cpp" - source type(cpp) "WIN32_Asynch_IO.cpp" - source type(cpp) "WIN32_Proactor.cpp" - source type(cpp) "XtReactor.cpp" - source type(cpp) "Active_Map_Manager_T.cpp" - source type(cpp) "Containers_T.cpp" - source type(cpp) "Dump_T.cpp" - source type(cpp) "Env_Value_T.cpp" - source type(cpp) "Event_Handler_T.cpp" - source type(cpp) "Functor_T.cpp" - source type(cpp) "Hash_Map_Manager_T.cpp" - source type(cpp) "IOStream_T.cpp" - source type(cpp) "Local_Name_Space_T.cpp" - source type(cpp) "Malloc_T.cpp" - source type(cpp) "Map_T.cpp" - source type(cpp) "Message_Block_T.cpp" - source type(cpp) "Message_Queue_T.cpp" - source type(cpp) "Pair_T.cpp" - source type(cpp) "Select_Reactor_T.cpp" - source type(cpp) "Strategies_T.cpp" - source type(cpp) "Synch_T.cpp" - source type(cpp) "Task_T.cpp" - source type(cpp) "Timeprobe_T.cpp" - source type(cpp) "Timer_Hash_T.cpp" - source type(cpp) "Timer_Heap_T.cpp" - source type(cpp) "Timer_List_T.cpp" - source type(cpp) "Timer_Queue_T.cpp" - source type(cpp) "Timer_Wheel_T.cpp" - // Template implementation files (#pragma implementation) - source type (cpp) "Acceptor.cpp" - source type (cpp) "Active_Map_Manager_T.cpp" - source type (cpp) "Containers.cpp" - source type (cpp) "Asynch_Acceptor.cpp" - source type (cpp) "Auto_Ptr.cpp" - source type (cpp) "Containers_T.cpp" - source type (cpp) "Dump_T.cpp" - source type (cpp) "Env_Value_T.cpp" - source type (cpp) "Event_Handler_T.cpp" - source type (cpp) "Free_List.cpp" - source type (cpp) "Functor_T.cpp" - source type (cpp) "Future.cpp" - source type (cpp) "Hash_Map_Manager_T.cpp" - source type (cpp) "IOStream_T.cpp" - source type (cpp) "LOCK_SOCK_Acceptor.cpp" - source type (cpp) "Local_Name_Space_T.cpp" - source type (cpp) "Malloc_T.cpp" - source type (cpp) "Managed_Object.cpp" - source type (cpp) "Map_Manager.cpp" - source type (cpp) "Map_T.cpp" - source type (cpp) "Message_Block_T.cpp" - source type (cpp) "Message_Queue_T.cpp" - source type (cpp) "Module.cpp" - source type (cpp) "Pair_T.cpp" - source type (cpp) "RB_Tree.cpp" - source type (cpp) "Select_Reactor_T.cpp" - source type (cpp) "Singleton.cpp" - source type (cpp) "Strategies_T.cpp" - source type (cpp) "Stream.cpp" - source type (cpp) "Stream_Modules.cpp" - source type (cpp) "Svc_Handler.cpp" - source type (cpp) "Synch_T.cpp" - source type (cpp) "Task_T.cpp" - source type (cpp) "Timeprobe_T.cpp" - source type (cpp) "Timer_Hash_T.cpp" - source type (cpp) "Timer_Heap_T.cpp" - source type (cpp) "Timer_List_T.cpp" - source type (cpp) "Timer_Queue_T.cpp" - source type (cpp) "Timer_Wheel_T.cpp" - source type (cpp) "Typed_SV_Message.cpp" - source type (cpp) "Typed_SV_Message_Queue.cpp" - - // Libraries needed during linking - if $__TOS_WIN__ { - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - if $__TOS_AIX__ { - source type (lib) "libtli_r.a" - source type (lib) "libpthreads.a" - source type (lib) "libc_r.a" - } - } -} diff --git a/ace/ace.dsw b/ace/ace.dsw deleted file mode 100644 index 9ae12b376b0..00000000000 --- a/ace/ace.dsw +++ /dev/null @@ -1,41 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ACE dynamic library"=.\ace_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ACE static library"=.\ace_lib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/ace/ace.icc b/ace/ace.icc deleted file mode 100755 index cf99f67fddd..00000000000 --- a/ace/ace.icc +++ /dev/null @@ -1,654 +0,0 @@ -// $Id$ -// -// Configuration file to build ACE shared library on AIX using -// Visual Age C++ 5 (or later). - -include "ace_vacpp_options.icc" - -group OS_FILES = - "Basic_Types.cpp", - "Time_Value.cpp", - "OS.cpp", - "OS_Dirent.cpp", - "OS_Memory.cpp", - "OS_QoS.cpp", - "OS_String.cpp", - "OS_TLI.cpp", - "OS_Errno.cpp", - "Base_Thread_Adapter.cpp", - "OS_Thread_Adapter.cpp", - "OS_Log_Msg_Attributes.cpp", - "Thread_Hook.cpp", - "Sched_Params.cpp", - "Handle_Set.cpp", - "Copy_Disabled.cpp" - -group OS_INCLUDES = - "Basic_Types.h", - "Time_Value.h", - "OS.h", - "OS_Dirent.h", - "OS_Memory.h", - "OS_QoS.h", - "OS_String.h", - "OS_TLI.h", - "OS_Errno.h", - "Base_Thread_Adapter.h", - "OS_Thread_Adapter.h", - "OS_Log_Msg_Attributes.h", - "Thread_Hook.h", - "Sched_Params.h", - "Handle_Set.h", - "Copy_Disabled.h" - -group UTILS_FILES = - "ACE.cpp", - "Active_Map_Manager.cpp", - "Arg_Shifter.cpp", - "ARGV.cpp", - "Argv_Type_Converter.cpp", - "Capabilities.cpp", - "Containers.cpp", - "Configuration.cpp", - "Configuration_Import_Export.cpp", - "Dirent.cpp", - "Dirent_Selector.cpp", - "Dynamic.cpp", - "Flag_Manip.cpp", - "Framework_Component.cpp", - "Functor.cpp", - "Get_Opt.cpp", - "Hash_Map_Manager.cpp", - "Connection_Recycling_Strategy.cpp", - "Hashable.cpp", - "Notification_Strategy.cpp", - "Recyclable.cpp", - "Refcountable.cpp", - "Handle_Ops.cpp", - "Init_ACE.cpp", - "Lib_Find.cpp", - "Message_Block.cpp", - "Method_Request.cpp", - "Object_Manager.cpp", - "Registry.cpp", - "String_Base_Const.cpp", - "SString.cpp", - "Stats.cpp", - "Sample_History.cpp" -// #### NOTE: see below for Filecache. - -group UTILS_INCLUDES = - "ACE.h", - "Active_Map_Manager.h", - "Arg_Shifter.h", - "ARGV.h", - "Argv_Type_Converter.h", - "Capabilities.h", - "Containers.h", - "Configuration.h", - "Configuration_Import_Export.h", - "Dirent.h", - "Dirent_Selector.h", - "Dynamic.h", - "Flag_Manip.h", - "Framework_Component.h", - "Functor.h", - "Get_Opt.h", - "Hash_Map_Manager.h", - "Connection_Recycling_Strategy.h", - "Hashable.h", - "Notification_Strategy.h", - "Recyclable.h", - "Refcountable.h", - "Handle_Ops.h", - "Init_ACE.h", - "Lib_Find.h", - "Message_Block.h", - "Method_Request.h", - "Object_Manager.h", - "Registry.h", - "String_Base_Const.h", - "SString.h", - "Stats.h", - "Sample_History.h" -// #### NOTE: see below for Filecache. - -group LOGGING_FILES = - "Dump.cpp", - "Log_Msg.cpp", - "Log_Msg_Callback.cpp", - "Log_Msg_Backend.cpp", - "Log_Msg_IPC.cpp", - "Log_Msg_NT_Event_Log.cpp", - "Log_Msg_UNIX_Syslog.cpp", - "Log_Record.cpp", - "Logging_Strategy.cpp", - "Trace.cpp" - -group LOGGING_INCLUDES = - "Dump.h", - "Log_Msg.h", - "Log_Msg_Callback.h", - "Log_Msg_Backend.h", - "Log_Msg_IPC.h", - "Log_Msg_NT_Event_Log.h", - "Log_Msg_UNIX_Syslog.h", - "Log_Record.h", - "Logging_Strategy.h", - "Trace.h" - -group THREADS_FILES = - "Activation_Queue.cpp", - "Atomic_Op.cpp", - "Process.cpp", - "Process_Manager.cpp", - "Synch.cpp", - "Synch_Options.cpp", - "Process_Semaphore.cpp", - "Process_Mutex.cpp", - "RW_Process_Mutex.cpp", - "File_Lock.cpp", - "Thread.cpp", - "Thread_Manager.cpp", - "Thread_Adapter.cpp", - "Thread_Exit.cpp", - "Thread_Control.cpp", - "Token.cpp" - -group THREADS_INCLUDES = - "Activation_Queue.h", - "Atomic_Op.h", - "Process.h", - "Process_Manager.h", - "Synch.h", - "Synch_Options.h", - "Process_Semaphore.h", - "Process_Mutex.h", - "RW_Process_Mutex.h", - "File_Lock.h", - "Thread.h", - "Thread_Manager.h", - "Thread_Adapter.h", - "Thread_Exit.h", - "Thread_Control.h", - "Token.h" - -group DEMUX_FILES = - "Event_Handler.cpp", - "FlReactor.cpp", - "Msg_WFMO_Reactor.cpp", - "POSIX_Proactor.cpp", - "POSIX_CB_Proactor.cpp", - "WIN32_Proactor.cpp", - "Priority_Reactor.cpp", - "Proactor.cpp", - "Reactor.cpp", - "Select_Reactor.cpp", - "Select_Reactor_Base.cpp", - "SUN_Proactor.cpp", - "Dev_Poll_Reactor.cpp", - "TP_Reactor.cpp", - "TkReactor.cpp", - "WFMO_Reactor.cpp", - "XtReactor.cpp", - "QtReactor.cpp" - -group DEMUX_INCLUDES = - "Event_Handler.h", - "FlReactor.h", - "Msg_WFMO_Reactor.h", - "POSIX_Proactor.h", - "POSIX_CB_Proactor.h", - "WIN32_Proactor.h", - "Priority_Reactor.h", - "Proactor.h", - "Reactor.h", - "Select_Reactor.h", - "Select_Reactor_Base.h", - "SUN_Proactor.h", - "Dev_Poll_Reactor.h", - "TP_Reactor.h", - "TkReactor.h", - "WFMO_Reactor.h", - "XtReactor.h", - "QtReactor.h" - -group CONNECTION_FILES = - "Asynch_IO.cpp", - "Asynch_IO_Impl.cpp", - "Asynch_Pseudo_Task.cpp", - "POSIX_Asynch_IO.cpp", - "WIN32_Asynch_IO.cpp" - -group CONNECTION_INCLUDES = - "Asynch_IO.h", - "Asynch_IO_Impl.h", - "Asynch_Pseudo_Task.h", - "POSIX_Asynch_IO.h", - "WIN32_Asynch_IO.h" - -group SOCKETS_FILES = - "Addr.cpp", - "INET_Addr.cpp", - "IPC_SAP.cpp", - "LSOCK.cpp", - "LSOCK_Acceptor.cpp", - "LSOCK_CODgram.cpp", - "LSOCK_Connector.cpp", - "LSOCK_Dgram.cpp", - "LSOCK_Stream.cpp", - "SOCK.cpp", - "SOCK_Acceptor.cpp", - "SOCK_CODgram.cpp", - "Sock_Connect.cpp", - "SOCK_Connector.cpp", - "SOCK_Dgram.cpp", - "SOCK_Dgram_Bcast.cpp", - "SOCK_Dgram_Mcast.cpp", - "SOCK_IO.cpp", - "SOCK_Stream.cpp" - -group SOCKETS_INCLUDES = - "Addr.h", - "INET_Addr.h", - "IPC_SAP.h", - "LSOCK.h", - "LSOCK_Acceptor.h", - "LSOCK_CODgram.h", - "LSOCK_Connector.h", - "LSOCK_Dgram.h", - "LSOCK_Stream.h", - "SOCK.h", - "SOCK_Acceptor.h", - "SOCK_CODgram.h", - "Sock_Connect.h", - "SOCK_Connector.h", - "SOCK_Dgram.h", - "SOCK_Dgram_Bcast.h", - "SOCK_Dgram_Mcast.h", - "SOCK_IO.h", - "SOCK_Stream.h" - -group IPC_FILES = - "ATM_Addr.cpp", - "ATM_Acceptor.cpp", - "ATM_Connector.cpp", - "ATM_Params.cpp", - "ATM_QoS.cpp", - "ATM_Stream.cpp", - "XTI_ATM_Mcast.cpp", - "DEV.cpp", - "DEV_Addr.cpp", - "DEV_Connector.cpp", - "DEV_IO.cpp", - "FIFO.cpp", - "FIFO_Recv.cpp", - "FIFO_Recv_Msg.cpp", - "FIFO_Send.cpp", - "FIFO_Send_Msg.cpp", - "FILE_Addr.cpp", - "FILE.cpp", - "FILE_Connector.cpp", - "FILE_IO.cpp", - "IO_SAP.cpp", - "IOStream.cpp", - "Pipe.cpp", - "Signal.cpp", - "SPIPE_Addr.cpp", - "SPIPE.cpp", - "SPIPE_Acceptor.cpp", - "SPIPE_Connector.cpp", - "SPIPE_Stream.cpp", - "SV_Message.cpp", - "SV_Message_Queue.cpp", - "SV_Semaphore_Complex.cpp", - "SV_Semaphore_Simple.cpp", - "SV_Shared_Memory.cpp", - "TLI.cpp", - "TLI_Acceptor.cpp", - "TLI_Connector.cpp", - "TLI_Stream.cpp", - "TTY_IO.cpp", - "UNIX_Addr.cpp", - "UPIPE_Acceptor.cpp", - "UPIPE_Connector.cpp", - "UPIPE_Stream.cpp", - "MEM_Acceptor.cpp", - "MEM_Addr.cpp", - "MEM_Connector.cpp", - "MEM_IO.cpp", - "MEM_SAP.cpp", - "MEM_Stream.cpp" - -group IPC_INCLUDES = - "ATM_Addr.h", - "ATM_Acceptor.h", - "ATM_Connector.h", - "ATM_Params.h", - "ATM_QoS.h", - "ATM_Stream.h", - "XTI_ATM_Mcast.h", - "DEV.h", - "DEV_Addr.h", - "DEV_Connector.h", - "DEV_IO.h", - "FIFO.h", - "FIFO_Recv.h", - "FIFO_Recv_Msg.h", - "FIFO_Send.h", - "FIFO_Send_Msg.h", - "FILE_Addr.h", - "FILE.h", - "FILE_Connector.h", - "FILE_IO.h", - "IO_SAP.h", - "IOStream.h", - "Pipe.h", - "Signal.h", - "SPIPE_Addr.h", - "SPIPE.h", - "SPIPE_Acceptor.h", - "SPIPE_Connector.h", - "SPIPE_Stream.h", - "SV_Message.h", - "SV_Message_Queue.h", - "SV_Semaphore_Complex.h", - "SV_Semaphore_Simple.h", - "SV_Shared_Memory.h", - "TLI.h", - "TLI_Acceptor.h", - "TLI_Connector.h", - "TLI_Stream.h", - "TTY_IO.h", - "UNIX_Addr.h", - "UPIPE_Acceptor.h", - "UPIPE_Connector.h", - "UPIPE_Stream.h", - "MEM_Acceptor.h", - "MEM_Addr.h", - "MEM_Connector.h", - "MEM_IO.h", - "MEM_SAP.h", - "MEM_Stream.h" - -group SVCCONF_FILES = - "DLL.cpp", - "DLL_Manager.cpp", - "Dynamic_Service_Base.cpp", - "Parse_Node.cpp", - "Service_Config.cpp", - "Service_Manager.cpp", - "Service_Object.cpp", - "Service_Repository.cpp", - "Service_Types.cpp", - "Service_Templates.cpp", - "Shared_Object.cpp", - "XML_Svc_Conf.cpp", - "Svc_Conf_l.cpp", - "Svc_Conf_y.cpp", - "Svc_Conf_Lexer_Guard.cpp" - -group SVCCONF_INCLUDES = - "DLL.h", - "DLL_Manager.h", - "Dynamic_Service_Base.h", - "Parse_Node.h", - "Service_Config.h", - "Service_Manager.h", - "Service_Object.h", - "Service_Repository.h", - "Service_Types.h", - "Service_Templates.h", - "Shared_Object.h", - "Svc_Conf.h", - "XML_Svc_Conf.h" - -group STREAMS_FILES = - "CDR_Base.cpp", - "CDR_Stream.cpp", - "Codeset_IBM1047.cpp", - "Codeset_Registry.cpp", - "Codeset_Registry_db.cpp", - "Message_Queue.cpp", - "Reactor_Notification_Strategy.cpp", - "Task.cpp" - -group STREAMS_INCLUDES = - "CDR_Base.h", - "CDR_Stream.h", - "Codeset_IBM1047.h", - "Message_Queue.h", - "Reactor_Notification_Strategy.h", - "Task.h" - -group MEMORY_FILES = - "Based_Pointer_Repository.cpp", - "Malloc.cpp", - "PI_Malloc.cpp", - "Malloc_Allocator.cpp", - "Malloc_Instantiations.cpp", - "Mem_Map.cpp", - "Memory_Pool.cpp", - "Obchunk.cpp", - "Obstack.cpp", - "Read_Buffer.cpp", - "Shared_Memory.cpp", - "Shared_Memory_MM.cpp", - "Shared_Memory_SV.cpp" - -group MEMORY_INCLUDES = - "Based_Pointer_Repository.h", - "Malloc.h", - "PI_Malloc.h", - "Malloc_Allocator.h", - "Mem_Map.h", - "Memory_Pool.h", - "Obchunk.h", - "Obstack.h", - "Read_Buffer.h", - "Shared_Memory.h", - "Shared_Memory_MM.h", - "Shared_Memory_SV.h" - -group TIMER_FILES = - "Basic_Stats.cpp", - "High_Res_Timer.cpp", - "Profile_Timer.cpp", - "System_Time.cpp", - "Time_Request_Reply.cpp", - "Timeprobe.cpp", - "Timer_Hash.cpp", - "Timer_Heap.cpp", - "Timer_List.cpp", - "Timer_Queue.cpp", - "Timer_Wheel.cpp" - -group TIMER_INCLUDES = - "Basic_Stats.h", - "High_Res_Timer.h", - "Profile_Timer.h", - "System_Time.h", - "Time_Request_Reply.h", - "Timeprobe.h", - "Timer_Hash.h", - "Timer_Heap.h", - "Timer_List.h", - "Timer_Queue.h", - "Timer_Wheel.h" - -group TOKEN_FILES = - "Local_Tokens.cpp", - "Remote_Tokens.cpp", - "Token_Collection.cpp", - "Token_Invariants.cpp", - "Token_Manager.cpp", - "Token_Request_Reply.cpp" - -group TOKEN_INCLUDES = - "Local_Tokens.h", - "Remote_Tokens.h", - "Token_Collection.h", - "Token_Invariants.h", - "Token_Manager.h", - "Token_Request_Reply.h" - -group CODECS_FILES = - "Codecs.cpp" - -group CODECS_INCLUDES = - "Codecs.h" - -group OTHER_FILES = - "Local_Name_Space.cpp", - "Name_Proxy.cpp", - "Name_Request_Reply.cpp", - "Name_Space.cpp", - "Naming_Context.cpp", - "Registry_Name_Space.cpp", - "Remote_Name_Space.cpp" - -group OTHER_INCLUDES = - "Local_Name_Space.h", - "Name_Proxy.h", - "Name_Request_Reply.h", - "Name_Space.h", - "Naming_Context.h", - "Registry_Name_Space.h", - "Remote_Name_Space.h" - -group TEMPLATE_FILES = - "Acceptor.cpp", - "Active_Map_Manager_T.cpp", - "Array_Base.cpp", - "Node.cpp", - "Unbounded_Set.cpp", - "Unbounded_Queue.cpp", - "Asynch_Acceptor.cpp", - "Asynch_Connector.cpp", - "Atomic_Op_T.cpp", - "Auto_IncDec_T.cpp", - "Auto_Ptr.cpp", - "Based_Pointer_T.cpp", - "Connector.cpp", - "Containers_T.cpp", - "Cache_Map_Manager_T.cpp", - "Cached_Connect_Strategy_T.cpp", - "Caching_Strategies_T.cpp", - "Caching_Utility_T.cpp", - "Cleanup_Strategies_T.cpp", - "Dump_T.cpp", - "Dynamic_Service.cpp", - "Env_Value_T.cpp", - "Event_Handler_T.cpp", - "Framework_Component_T.cpp", - "Free_List.cpp", - "Functor_T.cpp", - "Future.cpp", - "Future_Set.cpp", - "Hash_Map_Manager_T.cpp", - "Hash_Map_With_Allocator_T.cpp", - "Hash_Cache_Map_Manager_T.cpp", - "IOStream_T.cpp", - "Intrusive_List.cpp", - "Intrusive_List_Node.cpp", - "LOCK_SOCK_Acceptor.cpp", - "Local_Name_Space_T.cpp", - "Malloc_T.cpp", - "Managed_Object.cpp", - "Map_Manager.cpp", - "Map_T.cpp", - "Message_Block_T.cpp", - "Message_Queue_T.cpp", - "Module.cpp", - "Obstack_T.cpp", - "Pair_T.cpp", - "RB_Tree.cpp", - "Select_Reactor_T.cpp", - "Singleton.cpp", - "Strategies_T.cpp", - "Stream.cpp", - "Stream_Modules.cpp", - "String_Base.cpp", - "Svc_Handler.cpp", - "Synch_T.cpp", - "Task_T.cpp", - "Template_Instantiations.cpp", - "Test_and_Set.cpp", - "Timeprobe_T.cpp", - "Timer_Hash_T.cpp", - "Timer_Heap_T.cpp", - "Timer_List_T.cpp", - "Timer_Queue_Adapters.cpp", - "Timer_Queue_T.cpp", - "Timer_Wheel_T.cpp", - "Typed_SV_Message.cpp", - "Typed_SV_Message_Queue.cpp", - "Vector_T.cpp" - -option - PlatformOptions, - link(exportAll), - link(linkwithsharedlib), - link(linkWithMultiThreadLib,yes), - incl(searchpath, "..") - { - target type ( shr ) "shr.o" - { - run after sources("shr.o") targets ("libACE.a") "ar -r -u libACE.a shr.o", "rm -rf shr.o" - run cleanup "rm -rf libACE.a shr.o" - - option macros(global) - { - source type(hpp) "wchar.h" - source type(hpp) "wcstr.h" - source type(hpp) - OS_INCLUDES, - UTILS_INCLUDES, - LOGGING_INCLUDES, - THREADS_INCLUDES, - DEMUX_INCLUDES, - CONNECTION_INCLUDES, - SOCKETS_INCLUDES, - IPC_INCLUDES, - SVCCONF_INCLUDES, - STREAMS_INCLUDES, - MEMORY_INCLUDES, - TIMER_INCLUDES, - TOKEN_INCLUDES, - CODECS_INCLUDES, - OTHER_INCLUDES, - "config.h", - "config-aix-4.x.h", - "config-all.h", - "iosfwd.h", - "streams.h", - "Version.h" - } - source type(cpp) - OS_FILES, - UTILS_FILES, - LOGGING_FILES, - THREADS_FILES, - DEMUX_FILES, - CONNECTION_FILES, - SOCKETS_FILES, - IPC_FILES, - SVCCONF_FILES, - STREAMS_FILES, - MEMORY_FILES, - TIMER_FILES, - TOKEN_FILES, - CODECS_FILES, - OTHER_FILES - if ($__IBMCPP__ >= 500) { - source type(cpp) TEMPLATE_FILES - } - source type (lib) "libtli_r.a" - source type (lib) "libpthreads.a" - source type (lib) "libc_r.a" - source type (lib) "libdl.a" - // Imports - source type (imp) "pse.exp" - } - } - diff --git a/ace/ace.icp b/ace/ace.icp deleted file mode 100644 index f0f4006aa26..00000000000 --- a/ace/ace.icp +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ -// -// Visual Age C++ 5 project file for building libACE. - -subproject ace icc "ace.icc", ics "ace.ics" -{ -} diff --git a/ace/ace.mpc b/ace/ace.mpc deleted file mode 100644 index 99c65e535e2..00000000000 --- a/ace/ace.mpc +++ /dev/null @@ -1,395 +0,0 @@ -project : acelib, core { - sharedname = ACE - install = - defaultlibs = - dllflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL - include_dir = ace - - Source_Files(ACE_COMPONENTS) { - OS { - Basic_Types.cpp - Time_Value.cpp - OS.cpp - OS_Dirent.cpp - OS_Memory.cpp - OS_QoS.cpp - OS_String.cpp - OS_TLI.cpp - OS_Errno.cpp - Base_Thread_Adapter.cpp - OS_Thread_Adapter.cpp - OS_Log_Msg_Attributes.cpp - Thread_Hook.cpp - Sched_Params.cpp - Handle_Set.cpp - Copy_Disabled.cpp - Date_Time.cpp - gethrtime.cpp - } - - Utils { - ACE.cpp - Active_Map_Manager.cpp - Arg_Shifter.cpp - ARGV.cpp - Argv_Type_Converter.cpp - Capabilities.cpp - Containers.cpp - Configuration.cpp - Configuration_Import_Export.cpp - Dirent.cpp - Dirent_Selector.cpp - Dynamic.cpp - Flag_Manip.cpp - Framework_Component.cpp - Functor.cpp - Get_Opt.cpp - Hash_Map_Manager.cpp - Connection_Recycling_Strategy.cpp - Hashable.cpp - Notification_Strategy.cpp - Recyclable.cpp - Refcountable.cpp - Handle_Ops.cpp - Init_ACE.cpp - Lib_Find.cpp - Message_Block.cpp - Method_Request.cpp - Object_Manager.cpp - Registry.cpp - String_Base_Const.cpp - SString.cpp - Stats.cpp - Sample_History.cpp - } - - Filecache { - Filecache.cpp - } - - Logging { - Dump.cpp - Log_Msg.cpp - Log_Msg_Callback.cpp - Log_Msg_Backend.cpp - Log_Msg_IPC.cpp - Log_Msg_NT_Event_Log.cpp - Log_Msg_UNIX_Syslog.cpp - Log_Record.cpp - Logging_Strategy.cpp - Trace.cpp - } - - Threads { - Activation_Queue.cpp - Atomic_Op.cpp - Process.cpp - Process_Manager.cpp - Synch.cpp - Synch_Options.cpp - Process_Semaphore.cpp - Process_Mutex.cpp - RW_Process_Mutex.cpp - File_Lock.cpp - Thread.cpp - Thread_Manager.cpp - Thread_Adapter.cpp - Thread_Exit.cpp - Thread_Control.cpp - Token.cpp - } - - Demux { - Event_Handler.cpp - FlReactor.cpp - Msg_WFMO_Reactor.cpp - POSIX_Proactor.cpp - POSIX_CB_Proactor.cpp - WIN32_Proactor.cpp - Priority_Reactor.cpp - Proactor.cpp - Reactor.cpp - Select_Reactor.cpp - Select_Reactor_Base.cpp - SUN_Proactor.cpp - Dev_Poll_Reactor.cpp - TP_Reactor.cpp - TkReactor.cpp - WFMO_Reactor.cpp - XtReactor.cpp - QtReactor.cpp - } - - Connection { - Asynch_IO.cpp - Asynch_IO_Impl.cpp - Asynch_Pseudo_Task.cpp - POSIX_Asynch_IO.cpp - WIN32_Asynch_IO.cpp - } - - Sockets { - Addr.cpp - INET_Addr.cpp - IPC_SAP.cpp - LSOCK.cpp - LSOCK_Acceptor.cpp - LSOCK_CODgram.cpp - LSOCK_Connector.cpp - LSOCK_Dgram.cpp - LSOCK_Stream.cpp - SOCK.cpp - SOCK_Acceptor.cpp - SOCK_CODgram.cpp - Sock_Connect.cpp - SOCK_Connector.cpp - SOCK_Dgram.cpp - SOCK_Dgram_Bcast.cpp - SOCK_Dgram_Mcast.cpp - SOCK_IO.cpp - SOCK_Stream.cpp - } - - IPC { - ATM_Addr.cpp - ATM_Acceptor.cpp - ATM_Connector.cpp - ATM_Params.cpp - ATM_QoS.cpp - ATM_Stream.cpp - XTI_ATM_Mcast.cpp - DEV.cpp - DEV_Addr.cpp - DEV_Connector.cpp - DEV_IO.cpp - FIFO.cpp - FIFO_Recv.cpp - FIFO_Recv_Msg.cpp - FIFO_Send.cpp - FIFO_Send_Msg.cpp - FILE_Addr.cpp - FILE.cpp - FILE_Connector.cpp - FILE_IO.cpp - IO_SAP.cpp - IOStream.cpp - Pipe.cpp - Signal.cpp - SPIPE_Addr.cpp - SPIPE.cpp - SPIPE_Acceptor.cpp - SPIPE_Connector.cpp - SPIPE_Stream.cpp - SV_Message.cpp - SV_Message_Queue.cpp - SV_Semaphore_Complex.cpp - SV_Semaphore_Simple.cpp - SV_Shared_Memory.cpp - TLI.cpp - TLI_Acceptor.cpp - TLI_Connector.cpp - TLI_Stream.cpp - TTY_IO.cpp - UNIX_Addr.cpp - UPIPE_Acceptor.cpp - UPIPE_Connector.cpp - UPIPE_Stream.cpp - MEM_Acceptor.cpp - MEM_Addr.cpp - MEM_Connector.cpp - MEM_IO.cpp - MEM_SAP.cpp - MEM_Stream.cpp - } - - Svcconf { - DLL.cpp - DLL_Manager.cpp - Dynamic_Service_Base.cpp - Parse_Node.cpp - Service_Config.cpp - Service_Manager.cpp - Service_Object.cpp - Service_Repository.cpp - Service_Types.cpp - Service_Templates.cpp - Shared_Object.cpp - Svc_Conf_l.cpp - Svc_Conf_y.cpp - Svc_Conf_Lexer_Guard.cpp - XML_Svc_Conf.cpp - } - - Streams { - CDR_Base.cpp - CDR_Stream.cpp - Codeset_IBM1047.cpp - Codeset_Registry.cpp - Codeset_Registry_db.cpp - Message_Queue.cpp - Reactor_Notification_Strategy.cpp - Task.cpp - } - - Memory { - Based_Pointer_Repository.cpp - Malloc.cpp - PI_Malloc.cpp - Malloc_Allocator.cpp - Malloc_Instantiations.cpp - Mem_Map.cpp - Memory_Pool.cpp - Obchunk.cpp - Obstack.cpp - Read_Buffer.cpp - Shared_Memory.cpp - Shared_Memory_MM.cpp - Shared_Memory_SV.cpp - } - - Timer { - Basic_Stats.cpp - High_Res_Timer.cpp - Profile_Timer.cpp - System_Time.cpp - Time_Request_Reply.cpp - Timeprobe.cpp - Timer_Hash.cpp - Timer_Heap.cpp - Timer_List.cpp - Timer_Queue.cpp - Timer_Wheel.cpp - } - - Token { - Local_Tokens.cpp - Remote_Tokens.cpp - Token_Collection.cpp - Token_Invariants.cpp - Token_Manager.cpp - Token_Request_Reply.cpp - } - - Codecs { - Codecs.cpp - } - - Other { - Local_Name_Space.cpp - Name_Proxy.cpp - Name_Request_Reply.cpp - Name_Space.cpp - Naming_Context.cpp - Registry_Name_Space.cpp - Remote_Name_Space.cpp - NT_Service.cpp - } - } - - Template_Files { - default { - Acceptor.cpp - Active_Map_Manager_T.cpp - Array_Base.cpp - Atomic_Op_T.cpp - Node.cpp - Unbounded_Set.cpp - Unbounded_Queue.cpp - Asynch_Acceptor.cpp - Asynch_Connector.cpp - Auto_IncDec_T.cpp - Auto_Ptr.cpp - Based_Pointer_T.cpp - Connector.cpp - Containers_T.cpp - Cache_Map_Manager_T.cpp - Cached_Connect_Strategy_T.cpp - Caching_Strategies_T.cpp - Caching_Utility_T.cpp - Cleanup_Strategies_T.cpp - Dump_T.cpp - Dynamic_Service.cpp - Env_Value_T.cpp - Event_Handler_T.cpp - Framework_Component_T.cpp - Free_List.cpp - Functor_T.cpp - Future.cpp - Future_Set.cpp - Hash_Map_Manager_T.cpp - Hash_Map_With_Allocator_T.cpp - Hash_Cache_Map_Manager_T.cpp - IOStream_T.cpp - Intrusive_List.cpp - Intrusive_List_Node.cpp - LOCK_SOCK_Acceptor.cpp - Local_Name_Space_T.cpp - Malloc_T.cpp - Managed_Object.cpp - Map_Manager.cpp - Map_T.cpp - Message_Block_T.cpp - Message_Queue_T.cpp - Module.cpp - Obstack_T.cpp - Pair_T.cpp - Refcounted_Auto_Ptr.cpp - RB_Tree.cpp - Select_Reactor_T.cpp - Singleton.cpp - Strategies_T.cpp - Stream.cpp - Stream_Modules.cpp - String_Base.cpp - Svc_Handler.cpp - Synch_T.cpp - Task_T.cpp - Template_Instantiations.cpp - Test_and_Set.cpp - Timeprobe_T.cpp - Timer_Hash_T.cpp - Timer_Heap_T.cpp - Timer_List_T.cpp - Timer_Queue_Adapters.cpp - Timer_Queue_T.cpp - Timer_Wheel_T.cpp - Typed_SV_Message.cpp - Typed_SV_Message_Queue.cpp - Vector_T.cpp - } - } - - Inline_Files { - ace_wchar.inl - } - - Header_Files { - ACE_Export.h - ace_wchar.h - config-all.h - config-win32-common.h - config-win32-msvc.h - config-win32.h - config.h - Default_Constants.h - Global_Macros.h - Log_Priority.h - Malloc_Base.h - Min_Max.h - OS_Export.h - post.h - pre.h - Proactor_Impl.h - Reactor_Impl.h - streams.h - Svc_Conf.h - Svc_Conf_Tokens.h - UPIPE_Addr.h - Version.h - } - - Documentation_Files { - README - ../VERSION - } -} diff --git a/ace/ace.mwc b/ace/ace.mwc deleted file mode 100644 index 7f374d21c96..00000000000 --- a/ace/ace.mwc +++ /dev/null @@ -1,4 +0,0 @@ -workspace { - ace.mpc - RMCast/rmcast.mpc -} diff --git a/ace/ace.rc b/ace/ace.rc deleted file mode 100644 index 54792491900..00000000000 --- a/ace/ace.rc +++ /dev/null @@ -1,38 +0,0 @@ -#include "Version.h" - -1 VERSIONINFO - FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0 - PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0 - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "FileDescription", "ACE\0" - VALUE "FileVersion", ACE_VERSION "\0" - VALUE "InternalName", "ACEDLL\0" - VALUE "LegalCopyright", "\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "ACE.DLL\0" - VALUE "ProductName", "ACE\0" - VALUE "ProductVersion", ACE_VERSION "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -/* - * The following resource is used by the ACE logger to write messages - * to the NT event log. If you are statically linking to the ACE - * library, and you wish to use the NT event log, you should copy this - * message table to your application's resource script. - */ -1 MESSAGETABLE ace_message_table.bin diff --git a/ace/ace_ce_dll.cfg b/ace/ace_ce_dll.cfg deleted file mode 100644 index 80c479b3205..00000000000 --- a/ace/ace_ce_dll.cfg +++ /dev/null @@ -1 +0,0 @@ -WCE_CFG=WCE200; \ No newline at end of file diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp deleted file mode 100644 index 0611fd8c339..00000000000 --- a/ace/ace_dll.dsp +++ /dev/null @@ -1,3472 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ACE DLL" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ACE DLL - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ace_dll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE DLL - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ACE DLL - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ACE DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ACE DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "Desktop" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ACE DLL - Win32 MFC Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ACE_DLL___Win32_MFC_Release" -# PROP BASE Intermediate_Dir "ACE_DLL___Win32_MFC_Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "DLL\MFC_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../" /I "../PACE" /D "NDEBUG" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FD /c -# SUBTRACT CPP /Fr /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo /o".\ace.bsc" -# ADD BSC32 /nologo /o".\ace.bsc" -LINK32=link.exe -# ADD BASE LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:I386 /out:"..\bin\ace.dll" -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\acemfc.pdb" /map /debug /machine:I386 /out:"..\bin\acemfc.dll" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ACE_DLL___Win32_MFC_Debug" -# PROP BASE Intermediate_Dir "ACE_DLL___Win32_MFC_Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "DLL\MFC_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c -# SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_DEBUG" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo /o".\ace.bsc" -# ADD BSC32 /nologo /o".\ace.bsc" -LINK32=link.exe -# ADD BASE LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\acemfcd.pdb" /debug /machine:I386 /out:"..\bin\acemfcd.dll" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\DLL\Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../" /I "../PACE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o".\ace.bsc" -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace.pdb" /map /debug /machine:I386 /out:"..\bin\ace.dll" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "" -# PROP BASE Intermediate_Dir ".\DLL\Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\DLL\Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FD /c -# SUBTRACT CPP /Fr /YX /Yc /Yu -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o".\ace.bsc" -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\aced.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "ACE DLL - Win32 MFC Release" -# Name "ACE DLL - Win32 MFC Debug" -# Name "ACE DLL - Win32 Release" -# Name "ACE DLL - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp" -# Begin Source File - -SOURCE=.\ACE.cpp -# End Source File -# Begin Source File - -SOURCE=.\Activation_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\Arg_Shifter.cpp -# End Source File -# Begin Source File - -SOURCE=.\ARGV.cpp -# End Source File -# Begin Source File - -SOURCE=.\Argv_Type_Converter.cpp -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO_Impl.cpp -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Pseudo_Task.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Params.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_QoS.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Atomic_Op.cpp -# End Source File -# Begin Source File - -SOURCE=.\Base_Thread_Adapter.cpp -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_Repository.cpp -# End Source File -# Begin Source File - -SOURCE=.\Basic_Stats.cpp -# End Source File -# Begin Source File - -SOURCE=.\Basic_Types.cpp -# End Source File -# Begin Source File - -SOURCE=.\Capabilities.cpp -# End Source File -# Begin Source File - -SOURCE=.\CDR_Base.cpp -# End Source File -# Begin Source File - -SOURCE=.\CDR_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Codecs.cpp -# End Source File -# Begin Source File - -SOURCE=.\Configuration.cpp -# End Source File -# Begin Source File - -SOURCE=.\Configuration_Import_Export.cpp -# End Source File -# Begin Source File - -SOURCE=.\Connection_Recycling_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\Containers.cpp -# End Source File -# Begin Source File - -SOURCE=.\Copy_Disabled.cpp -# End Source File -# Begin Source File - -SOURCE=.\Date_Time.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEV.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEV_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEV_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEV_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dirent.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dirent_Selector.cpp -# End Source File -# Begin Source File - -SOURCE=.\DLL.cpp -# End Source File -# Begin Source File - -SOURCE=.\DLL_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dump.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dynamic.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dynamic_Service.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dynamic_Service_Base.cpp -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv_Msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send_Msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\FILE.cpp -# End Source File -# Begin Source File - -SOURCE=.\FILE_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\FILE_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\FILE_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\File_Lock.cpp -# End Source File -# Begin Source File - -SOURCE=.\Filecache.cpp -# End Source File -# Begin Source File - -SOURCE=.\Flag_Manip.cpp -# End Source File -# Begin Source File - -SOURCE=.\Framework_Component.cpp -# End Source File -# Begin Source File - -SOURCE=.\Functor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Get_Opt.cpp -# End Source File -# Begin Source File - -SOURCE=.\Handle_Ops.cpp -# End Source File -# Begin Source File - -SOURCE=.\Handle_Set.cpp -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Hashable.cpp -# End Source File -# Begin Source File - -SOURCE=.\High_Res_Timer.cpp -# End Source File -# Begin Source File - -SOURCE=.\INET_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\Init_ACE.cpp -# End Source File -# Begin Source File - -SOURCE=.\IO_Cntl_Msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\IO_SAP.cpp -# End Source File -# Begin Source File - -SOURCE=.\IOStream.cpp -# End Source File -# Begin Source File - -SOURCE=.\IPC_SAP.cpp -# End Source File -# Begin Source File - -SOURCE=.\Lib_Find.cpp -# End Source File -# Begin Source File - -SOURCE=.\Local_Name_Space.cpp -# End Source File -# Begin Source File - -SOURCE=.\Local_Tokens.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_Backend.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_Callback.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_IPC.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_NT_Event_Log.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_UNIX_Syslog.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Record.cpp -# End Source File -# Begin Source File - -SOURCE=.\Logging_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_CODgram.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Dgram.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Malloc.cpp -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Allocator.cpp -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Instantiations.cpp -# End Source File -# Begin Source File - -SOURCE=.\Map.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\Mem_Map.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_SAP.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Memory_Pool.cpp -# End Source File -# Begin Source File - -SOURCE=.\Message_Block.cpp -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\Method_Request.cpp -# End Source File -# Begin Source File - -SOURCE=.\Msg_WFMO_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Multihomed_INET_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\Multiplexor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Name_Proxy.cpp -# End Source File -# Begin Source File - -SOURCE=.\Name_Request_Reply.cpp -# End Source File -# Begin Source File - -SOURCE=.\Name_Space.cpp -# End Source File -# Begin Source File - -SOURCE=.\Naming_Context.cpp -# End Source File -# Begin Source File - -SOURCE=.\Notification_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\NT_Service.cpp -# End Source File -# Begin Source File - -SOURCE=.\Obchunk.cpp -# End Source File -# Begin Source File - -SOURCE=.\Object_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Obstack.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Dirent.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Errno.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Log_Msg_Attributes.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Memory.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_QoS.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_String.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Thread_Adapter.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_TLI.cpp -# End Source File -# Begin Source File - -SOURCE=.\Pair.cpp -# End Source File -# Begin Source File - -SOURCE=.\Parse_Node.cpp -# End Source File -# Begin Source File - -SOURCE=.\PI_Malloc.cpp -# End Source File -# Begin Source File - -SOURCE=.\Pipe.cpp -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Asynch_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Proactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Priority_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Proactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Process.cpp -# End Source File -# Begin Source File - -SOURCE=.\Process_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Process_Mutex.cpp -# End Source File -# Begin Source File - -SOURCE=.\Process_Semaphore.cpp -# End Source File -# Begin Source File - -SOURCE=.\Profile_Timer.cpp -# End Source File -# Begin Source File - -SOURCE=.\Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Reactor_Notification_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\Read_Buffer.cpp -# End Source File -# Begin Source File - -SOURCE=.\Recyclable.cpp -# End Source File -# Begin Source File - -SOURCE=.\Refcountable.cpp -# End Source File -# Begin Source File - -SOURCE=.\Registry.cpp -# End Source File -# Begin Source File - -SOURCE=.\Registry_Name_Space.cpp -# End Source File -# Begin Source File - -SOURCE=.\Remote_Name_Space.cpp -# End Source File -# Begin Source File - -SOURCE=.\Remote_Tokens.cpp -# End Source File -# Begin Source File - -SOURCE=.\RW_Process_Mutex.cpp -# End Source File -# Begin Source File - -SOURCE=.\Sample_History.cpp -# End Source File -# Begin Source File - -SOURCE=.\Sched_Params.cpp -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_Base.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Config.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Object.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Repository.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Templates.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Types.cpp -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory.cpp -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_MM.cpp -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_SV.cpp -# End Source File -# Begin Source File - -SOURCE=.\Shared_Object.cpp -# End Source File -# Begin Source File - -SOURCE=.\Signal.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_CODgram.cpp -# End Source File -# Begin Source File - -SOURCE=.\Sock_Connect.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Bcast.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_SEQPACK_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_SEQPACK_Association.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_SEQPACK_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\SString.cpp -# End Source File -# Begin Source File - -SOURCE=.\Stats.cpp -# End Source File -# Begin Source File - -SOURCE=.\String_Base_Const.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Message.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Message_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Complex.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Simple.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Shared_Memory.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_l.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_Lexer_Guard.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_y.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svc_Handler.cpp -# End Source File -# Begin Source File - -SOURCE=.\Synch.cpp -# End Source File -# Begin Source File - -SOURCE=.\Synch_Options.cpp -# End Source File -# Begin Source File - -SOURCE=.\System_Time.cpp -# End Source File -# Begin Source File - -SOURCE=.\Task.cpp -# End Source File -# Begin Source File - -SOURCE=.\Template_Instantiations.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Adapter.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Control.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Exit.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Hook.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Time_Request_Reply.cpp -# End Source File -# Begin Source File - -SOURCE=.\Time_Value.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timeprobe.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Hash.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Heap.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_List.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_Adapters.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Wheel.cpp -# End Source File -# Begin Source File - -SOURCE=.\TLI.cpp -# End Source File -# Begin Source File - -SOURCE=.\TLI_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\TLI_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\TLI_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token_Collection.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token_Invariants.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token_Request_Reply.cpp -# End Source File -# Begin Source File - -SOURCE=.\TP_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Trace.cpp -# End Source File -# Begin Source File - -SOURCE=.\TTY_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message.cpp -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\UNIX_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\WFMO_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\WIN32_Asynch_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\WIN32_Proactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\XML_Svc_Conf.cpp -# End Source File -# Begin Source File - -SOURCE=.\XtReactor.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h" -# Begin Source File - -SOURCE=.\Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\ACE.h -# End Source File -# Begin Source File - -SOURCE=.\ACE_export.h -# End Source File -# Begin Source File - -SOURCE=.\ace_wchar.h -# End Source File -# Begin Source File - -SOURCE=.\Activation_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager_T.h -# End Source File -# Begin Source File - -SOURCE=.\Addr.h -# End Source File -# Begin Source File - -SOURCE=.\Arg_Shifter.h -# End Source File -# Begin Source File - -SOURCE=.\ARGV.h -# End Source File -# Begin Source File - -SOURCE=.\Argv_Type_Converter.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO_Impl.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Pseudo_Task.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Params.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_QoS.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Atomic_Op.h -# End Source File -# Begin Source File - -SOURCE=.\Auto_Ptr.h -# End Source File -# Begin Source File - -SOURCE=.\Base_Thread_Adapter.h -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_Repository.h -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_T.h -# End Source File -# Begin Source File - -SOURCE=.\Basic_Stats.h -# End Source File -# Begin Source File - -SOURCE=.\Basic_Types.h -# End Source File -# Begin Source File - -SOURCE=.\Bound_Ptr.h -# End Source File -# Begin Source File - -SOURCE=.\Cache_Map_Manager_T.h -# End Source File -# Begin Source File - -SOURCE=.\Cached_Connect_Strategy_T.h -# End Source File -# Begin Source File - -SOURCE=.\Caching_Strategies_T.h -# End Source File -# Begin Source File - -SOURCE=.\Caching_Utility_T.h -# End Source File -# Begin Source File - -SOURCE=.\Capabilities.h -# End Source File -# Begin Source File - -SOURCE=.\CDR_Base.h -# End Source File -# Begin Source File - -SOURCE=.\CDR_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Cleanup_Strategies_T.h -# End Source File -# Begin Source File - -SOURCE=.\Codecs.h -# End Source File -# Begin Source File - -SOURCE=".\config-all.h" -# End Source File -# Begin Source File - -SOURCE=".\config-all.h" -# End Source File -# Begin Source File - -SOURCE=".\config-win32-common.h" -# End Source File -# Begin Source File - -SOURCE=".\config-win32-msvc.h" -# End Source File -# Begin Source File - -SOURCE=".\config-win32.h" -# End Source File -# Begin Source File - -SOURCE=.\config.h -# End Source File -# Begin Source File - -SOURCE=.\Configuration.h -# End Source File -# Begin Source File - -SOURCE=.\Configuration_Import_Export.h -# End Source File -# Begin Source File - -SOURCE=.\Connection_Recycling_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\Connector.h -# End Source File -# Begin Source File - -SOURCE=.\Containers.h -# End Source File -# Begin Source File - -SOURCE=.\Containers_T.h -# End Source File -# Begin Source File - -SOURCE=.\Copy_Disabled.h -# End Source File -# Begin Source File - -SOURCE=.\Date_Time.h -# End Source File -# Begin Source File - -SOURCE=.\Default_Constants.h -# End Source File -# Begin Source File - -SOURCE=.\DEV.h -# End Source File -# Begin Source File - -SOURCE=.\DEV_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\DEV_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\DEV_IO.h -# End Source File -# Begin Source File - -SOURCE=.\Dirent.h -# End Source File -# Begin Source File - -SOURCE=.\Dirent_Selector.h -# End Source File -# Begin Source File - -SOURCE=.\DLL.h -# End Source File -# Begin Source File - -SOURCE=.\DLL_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Dump.h -# End Source File -# Begin Source File - -SOURCE=.\Dump_T.h -# End Source File -# Begin Source File - -SOURCE=.\Dynamic.h -# End Source File -# Begin Source File - -SOURCE=.\Dynamic_Service.h -# End Source File -# Begin Source File - -SOURCE=.\Dynamic_Service_Base.h -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler.h -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler_T.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv_Msg.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send_Msg.h -# End Source File -# Begin Source File - -SOURCE=.\FILE.h -# End Source File -# Begin Source File - -SOURCE=.\FILE_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\FILE_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\FILE_IO.h -# End Source File -# Begin Source File - -SOURCE=.\File_Lock.h -# End Source File -# Begin Source File - -SOURCE=.\Filecache.h -# End Source File -# Begin Source File - -SOURCE=.\Flag_Manip.h -# End Source File -# Begin Source File - -SOURCE=.\Framework_Component.h -# End Source File -# Begin Source File - -SOURCE=.\Free_List.h -# End Source File -# Begin Source File - -SOURCE=.\Functor.h -# End Source File -# Begin Source File - -SOURCE=.\Functor_T.h -# End Source File -# Begin Source File - -SOURCE=.\Future.h -# End Source File -# Begin Source File - -SOURCE=.\Get_Opt.h -# End Source File -# Begin Source File - -SOURCE=.\Global_Macros.h -# End Source File -# Begin Source File - -SOURCE=.\Handle_Ops.h -# End Source File -# Begin Source File - -SOURCE=.\Handle_Set.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_Cache_Map_Manager_T.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager_rt.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager_T.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_With_Allocator_T.h -# End Source File -# Begin Source File - -SOURCE=.\Hashable.h -# End Source File -# Begin Source File - -SOURCE=.\High_Res_Timer.h -# End Source File -# Begin Source File - -SOURCE=.\INET_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\Init_ACE.h -# End Source File -# Begin Source File - -SOURCE=.\IO_Cntl_Msg.h -# End Source File -# Begin Source File - -SOURCE=.\IO_SAP.h -# End Source File -# Begin Source File - -SOURCE=.\IOStream.h -# End Source File -# Begin Source File - -SOURCE=.\IOStream_T.h -# End Source File -# Begin Source File - -SOURCE=.\IPC_SAP.h -# End Source File -# Begin Source File - -SOURCE=.\Lib_Find.h -# End Source File -# Begin Source File - -SOURCE=.\Local_Name_Space.h -# End Source File -# Begin Source File - -SOURCE=.\Local_Name_Space_T.h -# End Source File -# Begin Source File - -SOURCE=.\Local_Tokens.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_Backend.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_Callback.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_IPC.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_NT_Event_Log.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_UNIX_Syslog.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Priority.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Record.h -# End Source File -# Begin Source File - -SOURCE=.\Logging_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_CODgram.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Dgram.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Malloc.h -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Allocator.h -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Base.h -# End Source File -# Begin Source File - -SOURCE=.\Malloc_T.h -# End Source File -# Begin Source File - -SOURCE=.\Managed_Object.h -# End Source File -# Begin Source File - -SOURCE=.\Map.h -# End Source File -# Begin Source File - -SOURCE=.\Map_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Map_T.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_IO.h -# End Source File -# Begin Source File - -SOURCE=.\Mem_Map.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_SAP.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Memory_Pool.h -# End Source File -# Begin Source File - -SOURCE=.\Message_Block.h -# End Source File -# Begin Source File - -SOURCE=.\Message_Block_T.h -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue_T.h -# End Source File -# Begin Source File - -SOURCE=.\Method_Request.h -# End Source File -# Begin Source File - -SOURCE=.\Min_Max.h -# End Source File -# Begin Source File - -SOURCE=.\Module.h -# End Source File -# Begin Source File - -SOURCE=.\Msg_WFMO_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Multihomed_INET_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\Multiplexor.h -# End Source File -# Begin Source File - -SOURCE=.\Name_Proxy.h -# End Source File -# Begin Source File - -SOURCE=.\Name_Request_Reply.h -# End Source File -# Begin Source File - -SOURCE=.\Name_Space.h -# End Source File -# Begin Source File - -SOURCE=.\Naming_Context.h -# End Source File -# Begin Source File - -SOURCE=.\Notification_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\NT_Service.h -# End Source File -# Begin Source File - -SOURCE=.\Obchunk.h -# End Source File -# Begin Source File - -SOURCE=.\Object_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Obstack.h -# End Source File -# Begin Source File - -SOURCE=.\Obstack_T.h -# End Source File -# Begin Source File - -SOURCE=.\OS.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Dirent.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Errno.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Log_Msg_Attributes.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Memory.h -# End Source File -# Begin Source File - -SOURCE=.\OS_QoS.h -# End Source File -# Begin Source File - -SOURCE=.\OS_String.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Thread_Adapter.h -# End Source File -# Begin Source File - -SOURCE=.\OS_TLI.h -# End Source File -# Begin Source File - -SOURCE=.\Pair.h -# End Source File -# Begin Source File - -SOURCE=.\Pair_T.h -# End Source File -# Begin Source File - -SOURCE=.\Parse_Node.h -# End Source File -# Begin Source File - -SOURCE=.\PI_Malloc.h -# End Source File -# Begin Source File - -SOURCE=.\Pipe.h -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Asynch_IO.h -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Proactor.h -# End Source File -# Begin Source File - -SOURCE=.\post.h -# End Source File -# Begin Source File - -SOURCE=.\pre.h -# End Source File -# Begin Source File - -SOURCE=.\Priority_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Proactor.h -# End Source File -# Begin Source File - -SOURCE=.\Proactor_Impl.h -# End Source File -# Begin Source File - -SOURCE=.\Process.h -# End Source File -# Begin Source File - -SOURCE=.\Process_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Process_Mutex.h -# End Source File -# Begin Source File - -SOURCE=.\Process_Semaphore.h -# End Source File -# Begin Source File - -SOURCE=.\Profile_Timer.h -# End Source File -# Begin Source File - -SOURCE=.\QoS_Decorator.h -# End Source File -# Begin Source File - -SOURCE=.\QoS_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\QoS_Session.h -# End Source File -# Begin Source File - -SOURCE=.\QoS_Session_Factory.h -# End Source File -# Begin Source File - -SOURCE=.\QoS_Session_Impl.h -# End Source File -# Begin Source File - -SOURCE=.\RB_Tree.h -# End Source File -# Begin Source File - -SOURCE=.\Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Reactor_Impl.h -# End Source File -# Begin Source File - -SOURCE=.\Reactor_Notification_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\Read_Buffer.h -# End Source File -# Begin Source File - -SOURCE=.\Recyclable.h -# End Source File -# Begin Source File - -SOURCE=.\Refcountable.h -# End Source File -# Begin Source File - -SOURCE=.\Refcounted_Auto_Ptr.h -# End Source File -# Begin Source File - -SOURCE=.\Registry.h -# End Source File -# Begin Source File - -SOURCE=.\Registry_Name_Space.h -# End Source File -# Begin Source File - -SOURCE=.\Remote_Name_Space.h -# End Source File -# Begin Source File - -SOURCE=.\Remote_Tokens.h -# End Source File -# Begin Source File - -SOURCE=.\RW_Process_Mutex.h -# End Source File -# Begin Source File - -SOURCE=.\Sample_History.h -# End Source File -# Begin Source File - -SOURCE=.\Sched_Params.h -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_Base.h -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_T.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Config.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Object.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Repository.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Templates.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Types.h -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory.h -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_MM.h -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_SV.h -# End Source File -# Begin Source File - -SOURCE=.\Shared_Object.h -# End Source File -# Begin Source File - -SOURCE=.\Signal.h -# End Source File -# Begin Source File - -SOURCE=.\Singleton.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_CODgram.h -# End Source File -# Begin Source File - -SOURCE=.\Sock_Connect.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Bcast.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast_QoS.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_IO.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_SEQPACK_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_SEQPACK_Association.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_SEQPACK_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\SString.h -# End Source File -# Begin Source File - -SOURCE=.\Stats.h -# End Source File -# Begin Source File - -SOURCE=.\Strategies_T.h -# End Source File -# Begin Source File - -SOURCE=.\Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Stream_Modules.h -# End Source File -# Begin Source File - -SOURCE=.\streams.h -# End Source File -# Begin Source File - -SOURCE=.\String_Base.h -# End Source File -# Begin Source File - -SOURCE=.\String_Base_Const.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Message.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Message_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Complex.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Simple.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Shared_Memory.h -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf.h -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_Lexer_Guard.h -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_Tokens.h -# End Source File -# Begin Source File - -SOURCE=.\svc_export.h -# End Source File -# Begin Source File - -SOURCE=.\Svc_Handler.h -# End Source File -# Begin Source File - -SOURCE=.\Synch.h -# End Source File -# Begin Source File - -SOURCE=.\Synch_Options.h -# End Source File -# Begin Source File - -SOURCE=.\Synch_T.h -# End Source File -# Begin Source File - -SOURCE=.\System_Time.h -# End Source File -# Begin Source File - -SOURCE=.\Task.h -# End Source File -# Begin Source File - -SOURCE=.\Task_T.h -# End Source File -# Begin Source File - -SOURCE=.\Test_and_Set.h -# End Source File -# Begin Source File - -SOURCE=.\Thread.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Adapter.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Control.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Exit.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Hook.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Time_Request_Reply.h -# End Source File -# Begin Source File - -SOURCE=.\Time_Value.h -# End Source File -# Begin Source File - -SOURCE=.\Timeprobe.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Hash.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Hash_T.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Heap.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Heap_T.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_List.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_List_T.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_Adapters.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_T.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Wheel.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Wheel_T.h -# End Source File -# Begin Source File - -SOURCE=.\TLI.h -# End Source File -# Begin Source File - -SOURCE=.\TLI_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\TLI_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\TLI_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Token.h -# End Source File -# Begin Source File - -SOURCE=.\Token_Collection.h -# End Source File -# Begin Source File - -SOURCE=.\Token_Invariants.h -# End Source File -# Begin Source File - -SOURCE=.\Token_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Token_Request_Reply.h -# End Source File -# Begin Source File - -SOURCE=.\TP_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Trace.h -# End Source File -# Begin Source File - -SOURCE=.\TTY_IO.h -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message.h -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\UNIX_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Version.h -# End Source File -# Begin Source File - -SOURCE=.\WFMO_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\WIN32_Asynch_IO.h -# End Source File -# Begin Source File - -SOURCE=.\WIN32_Proactor.h -# End Source File -# Begin Source File - -SOURCE=.\XML_Svc_Conf.h -# End Source File -# Begin Source File - -SOURCE=.\XtReactor.h -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "i;inl" -# Begin Source File - -SOURCE=.\Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\ACE.i -# End Source File -# Begin Source File - -SOURCE=.\Activation_Queue.i -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager_T.i -# End Source File -# Begin Source File - -SOURCE=.\Addr.i -# End Source File -# Begin Source File - -SOURCE=.\ARGV.i -# End Source File -# Begin Source File - -SOURCE=.\Argv_Type_Converter.inl -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO.i -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO_Impl.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Params.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_QoS.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Atomic_Op.i -# End Source File -# Begin Source File - -SOURCE=.\Auto_Ptr.i -# End Source File -# Begin Source File - -SOURCE=.\Base_Thread_Adapter.inl -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_T.i -# End Source File -# Begin Source File - -SOURCE=.\Basic_Stats.inl -# End Source File -# Begin Source File - -SOURCE=.\Basic_Types.i -# End Source File -# Begin Source File - -SOURCE=.\Bound_Ptr.i -# End Source File -# Begin Source File - -SOURCE=.\Cache_Map_Manager_T.i -# End Source File -# Begin Source File - -SOURCE=.\Cached_Connect_Strategy_T.i -# End Source File -# Begin Source File - -SOURCE=.\Caching_Strategies_T.i -# End Source File -# Begin Source File - -SOURCE=.\Caching_Strategy_Utility_T.i -# End Source File -# Begin Source File - -SOURCE=.\Capabilities.i -# End Source File -# Begin Source File - -SOURCE=.\CDR_Base.inl -# End Source File -# Begin Source File - -SOURCE=.\CDR_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Cleanup_Strategies_T.i -# End Source File -# Begin Source File - -SOURCE=.\Connector.i -# End Source File -# Begin Source File - -SOURCE=.\Containers.i -# End Source File -# Begin Source File - -SOURCE=.\Containers_T.i -# End Source File -# Begin Source File - -SOURCE=.\Date_Time.i -# End Source File -# Begin Source File - -SOURCE=.\DEV.i -# End Source File -# Begin Source File - -SOURCE=.\DEV_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\DEV_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\DEV_IO.i -# End Source File -# Begin Source File - -SOURCE=.\Dirent.i -# End Source File -# Begin Source File - -SOURCE=.\Dirent_Selector.inl -# End Source File -# Begin Source File - -SOURCE=.\Dynamic.i -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv_Msg.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send_Msg.i -# End Source File -# Begin Source File - -SOURCE=.\FILE.i -# End Source File -# Begin Source File - -SOURCE=.\FILE_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\FILE_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\FILE_IO.i -# End Source File -# Begin Source File - -SOURCE=.\File_Lock.inl -# End Source File -# Begin Source File - -SOURCE=.\Flag_Manip.i -# End Source File -# Begin Source File - -SOURCE=.\Framework_Component.inl -# End Source File -# Begin Source File - -SOURCE=.\Free_List.i -# End Source File -# Begin Source File - -SOURCE=.\Functor.i -# End Source File -# Begin Source File - -SOURCE=.\Functor_T.i -# End Source File -# Begin Source File - -SOURCE=.\Get_Opt.i -# End Source File -# Begin Source File - -SOURCE=.\Handle_Ops.i -# End Source File -# Begin Source File - -SOURCE=.\Handle_Set.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_Cache_Map_Manager_T.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager_rt.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager_T.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_With_Allocator_T.i -# End Source File -# Begin Source File - -SOURCE=.\Hashable.inl -# End Source File -# Begin Source File - -SOURCE=.\High_Res_Timer.i -# End Source File -# Begin Source File - -SOURCE=.\INET_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\Init_ACE.i -# End Source File -# Begin Source File - -SOURCE=.\IO_SAP.i -# End Source File -# Begin Source File - -SOURCE=.\IOStream_T.i -# End Source File -# Begin Source File - -SOURCE=.\IPC_SAP.i -# End Source File -# Begin Source File - -SOURCE=.\Lib_Find.i -# End Source File -# Begin Source File - -SOURCE=.\Local_Tokens.i -# End Source File -# Begin Source File - -SOURCE=.\Log_Record.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_CODgram.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Dgram.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Malloc.i -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Allocator.i -# End Source File -# Begin Source File - -SOURCE=.\Malloc_T.i -# End Source File -# Begin Source File - -SOURCE=.\Managed_Object.i -# End Source File -# Begin Source File - -SOURCE=.\Map_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Map_T.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_IO.i -# End Source File -# Begin Source File - -SOURCE=.\Mem_Map.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_SAP.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Memory_Pool.i -# End Source File -# Begin Source File - -SOURCE=.\Message_Block.i -# End Source File -# Begin Source File - -SOURCE=.\Message_Block_T.i -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue.i -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue_T.i -# End Source File -# Begin Source File - -SOURCE=.\Module.i -# End Source File -# Begin Source File - -SOURCE=.\Msg_WFMO_Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Multihomed_INET_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\Multiplexor.i -# End Source File -# Begin Source File - -SOURCE=.\Notification_Strategy.inl -# End Source File -# Begin Source File - -SOURCE=.\NT_Service.i -# End Source File -# Begin Source File - -SOURCE=.\Object_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Obstack_T.i -# End Source File -# Begin Source File - -SOURCE=.\OS.i -# End Source File -# Begin Source File - -SOURCE=.\OS_Dirent.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_Errno.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_Log_Msg_Attributes.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_Memory.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_String.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_Thread_Adapter.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_TLI.inl -# End Source File -# Begin Source File - -SOURCE=.\Pair_T.i -# End Source File -# Begin Source File - -SOURCE=.\Parse_Node.i -# End Source File -# Begin Source File - -SOURCE=.\PI_Malloc.i -# End Source File -# Begin Source File - -SOURCE=.\Pipe.i -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Asynch_IO.i -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Proactor.i -# End Source File -# Begin Source File - -SOURCE=.\Priority_Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Proactor.i -# End Source File -# Begin Source File - -SOURCE=.\Process.i -# End Source File -# Begin Source File - -SOURCE=.\Process_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Process_Mutex.inl -# End Source File -# Begin Source File - -SOURCE=.\Process_Semaphore.inl -# End Source File -# Begin Source File - -SOURCE=.\Profile_Timer.i -# End Source File -# Begin Source File - -SOURCE=.\QoS_Session_Impl.i -# End Source File -# Begin Source File - -SOURCE=.\RB_Tree.i -# End Source File -# Begin Source File - -SOURCE=.\Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Reactor_Notification_Strategy.inl -# End Source File -# Begin Source File - -SOURCE=.\ReactorEx.i -# End Source File -# Begin Source File - -SOURCE=.\Read_Buffer.i -# End Source File -# Begin Source File - -SOURCE=.\Recyclable.inl -# End Source File -# Begin Source File - -SOURCE=.\Refcountable.inl -# End Source File -# Begin Source File - -SOURCE=.\Refcounted_Auto_Ptr.i -# End Source File -# Begin Source File - -SOURCE=.\Remote_Tokens.i -# End Source File -# Begin Source File - -SOURCE=.\RW_Process_Mutex.inl -# End Source File -# Begin Source File - -SOURCE=.\Sample_History.inl -# End Source File -# Begin Source File - -SOURCE=.\Sched_Params.i -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_Base.i -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_T.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Config.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Object.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Repository.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Types.i -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_MM.i -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_SV.i -# End Source File -# Begin Source File - -SOURCE=.\Shared_Object.i -# End Source File -# Begin Source File - -SOURCE=.\Signal.i -# End Source File -# Begin Source File - -SOURCE=.\Singleton.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_CODgram.i -# End Source File -# Begin Source File - -SOURCE=.\Sock_Connect.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Bcast.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast_QoS.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_IO.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_SEQPACK_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_SEQPACK_Association.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_SEQPACK_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\SPIPE.i -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\SString.i -# End Source File -# Begin Source File - -SOURCE=.\Stats.i -# End Source File -# Begin Source File - -SOURCE=.\Strategies_T.i -# End Source File -# Begin Source File - -SOURCE=.\Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Stream_Modules.i -# End Source File -# Begin Source File - -SOURCE=.\String_Base.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Message.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Message_Queue.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Complex.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Simple.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Shared_Memory.i -# End Source File -# Begin Source File - -SOURCE=.\Synch.i -# End Source File -# Begin Source File - -SOURCE=.\Synch_Options.i -# End Source File -# Begin Source File - -SOURCE=.\Synch_T.i -# End Source File -# Begin Source File - -SOURCE=.\Task.i -# End Source File -# Begin Source File - -SOURCE=.\Task_T.i -# End Source File -# Begin Source File - -SOURCE=.\Test_and_Set.i -# End Source File -# Begin Source File - -SOURCE=.\Thread.i -# End Source File -# Begin Source File - -SOURCE=.\Thread_Adapter.inl -# End Source File -# Begin Source File - -SOURCE=.\Thread_Control.inl -# End Source File -# Begin Source File - -SOURCE=.\Thread_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Time_Value.inl -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_Adapters.i -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_T.i -# End Source File -# Begin Source File - -SOURCE=.\TLI.i -# End Source File -# Begin Source File - -SOURCE=.\TLI_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\TLI_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\TLI_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Token.i -# End Source File -# Begin Source File - -SOURCE=.\Token_Collection.i -# End Source File -# Begin Source File - -SOURCE=.\Token_Invariants.i -# End Source File -# Begin Source File - -SOURCE=.\Token_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Token_Request_Reply.i -# End Source File -# Begin Source File - -SOURCE=.\TP_Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Trace.i -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message.i -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message_Queue.i -# End Source File -# Begin Source File - -SOURCE=.\UNIX_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\WFMO_Reactor.i -# End Source File -# End Group -# Begin Group "Template Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\Acceptor.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Acceptor.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Auto_Ptr.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Cache_Map_Manager_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Cached_Connect_Strategy_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Caching_Strategies_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Caching_Utility_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Cleanup_Strategies_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Connector.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Containers_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Dump_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Framework_Component_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Free_List.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Functor_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Future.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Hash_Cache_Map_Manager_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_With_Allocator_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\IOStream_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Local_Name_Space_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Malloc_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Managed_Object.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Map_Manager.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Map_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Message_Block_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Module.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Obstack_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Pair_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\RB_Tree.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Singleton.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Strategies_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Stream.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Stream_Modules.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\String_Base.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Synch_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Task_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Test_and_Set.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_Hash_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_Heap_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_List_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_Wheel_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# End Group -# Begin Group "Documentation" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\Readme -# End Source File -# Begin Source File - -SOURCE=..\Version -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\ace.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/ace/ace_dll64.mak b/ace/ace_dll64.mak deleted file mode 100644 index c629da7b67a..00000000000 --- a/ace/ace_dll64.mak +++ /dev/null @@ -1,3456 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on ace_dll.dsp -!IF "$(CFG)" == "" -CFG=ACE DLL - Win64 Debug -!MESSAGE No configuration specified. Defaulting to ACE DLL - Win64 Debug. -!ENDIF - -!IF "$(CFG)" != "ACE DLL - Win64 MFC Release" && "$(CFG)" != "ACE DLL - Win64 MFC Debug" && "$(CFG)" != "ACE DLL - Win64 Release" && "$(CFG)" != "ACE DLL - Win64 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE DLL - Win64 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ACE DLL - Win64 MFC Release" (based on "Win64 (x86) Dynamic-Link Library") -!MESSAGE "ACE DLL - Win64 MFC Debug" (based on "Win64 (x86) Dynamic-Link Library") -!MESSAGE "ACE DLL - Win64 Release" (based on "Win64 (x86) Dynamic-Link Library") -!MESSAGE "ACE DLL - Win64 Debug" (based on "Win64 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "ACE DLL - Win64 MFC Release" - -OUTDIR=. -INTDIR=.\DLL\MFC_Release - -ALL : "..\bin\acemfc.dll" - - -CLEAN : - -@erase "$(INTDIR)\ACE.obj" - -@erase "$(INTDIR)\ace.res" - -@erase "$(INTDIR)\Activation_Queue.obj" - -@erase "$(INTDIR)\Active_Map_Manager.obj" - -@erase "$(INTDIR)\Addr.obj" - -@erase "$(INTDIR)\Arg_Shifter.obj" - -@erase "$(INTDIR)\ARGV.obj" - -@erase "$(INTDIR)\Argv_Type_Converter.obj" - -@erase "$(INTDIR)\Asynch_Connector.obj" - -@erase "$(INTDIR)\Asynch_IO.obj" - -@erase "$(INTDIR)\Asynch_IO_Impl.obj" - -@erase "$(INTDIR)\Asynch_Pseudo_Task.obj" - -@erase "$(INTDIR)\ATM_Acceptor.obj" - -@erase "$(INTDIR)\ATM_Addr.obj" - -@erase "$(INTDIR)\ATM_Connector.obj" - -@erase "$(INTDIR)\ATM_Params.obj" - -@erase "$(INTDIR)\ATM_QoS.obj" - -@erase "$(INTDIR)\ATM_Stream.obj" - -@erase "$(INTDIR)\Atomic_Op.obj" - -@erase "$(INTDIR)\Base_Thread_Adapter.obj" - -@erase "$(INTDIR)\Based_Pointer_Repository.obj" - -@erase "$(INTDIR)\Basic_Stats.obj" - -@erase "$(INTDIR)\Basic_Types.obj" - -@erase "$(INTDIR)\Capabilities.obj" - -@erase "$(INTDIR)\CDR_Base.obj" - -@erase "$(INTDIR)\CDR_Stream.obj" - -@erase "$(INTDIR)\Codecs.obj" - -@erase "$(INTDIR)\Codeset_Registry.obj" - -@erase "$(INTDIR)\Codeset_Registry_db.obj" - -@erase "$(INTDIR)\Configuration.obj" - -@erase "$(INTDIR)\Configuration_Import_Export.obj" - -@erase "$(INTDIR)\Connection_Recycling_Strategy.obj" - -@erase "$(INTDIR)\Containers.obj" - -@erase "$(INTDIR)\Copy_Disabled.obj" - -@erase "$(INTDIR)\Date_Time.obj" - -@erase "$(INTDIR)\DEV.obj" - -@erase "$(INTDIR)\DEV_Addr.obj" - -@erase "$(INTDIR)\DEV_Connector.obj" - -@erase "$(INTDIR)\DEV_IO.obj" - -@erase "$(INTDIR)\Dirent.obj" - -@erase "$(INTDIR)\Dirent_Selector.obj" - -@erase "$(INTDIR)\DLL.obj" - -@erase "$(INTDIR)\DLL_Manager.obj" - -@erase "$(INTDIR)\Dump.obj" - -@erase "$(INTDIR)\Dynamic.obj" - -@erase "$(INTDIR)\Dynamic_Service.obj" - -@erase "$(INTDIR)\Dynamic_Service_Base.obj" - -@erase "$(INTDIR)\Event_Handler.obj" - -@erase "$(INTDIR)\Event_Handler_T.obj" - -@erase "$(INTDIR)\FIFO.obj" - -@erase "$(INTDIR)\FIFO_Recv.obj" - -@erase "$(INTDIR)\FIFO_Recv_Msg.obj" - -@erase "$(INTDIR)\FIFO_Send.obj" - -@erase "$(INTDIR)\FIFO_Send_Msg.obj" - -@erase "$(INTDIR)\FILE.obj" - -@erase "$(INTDIR)\FILE_Addr.obj" - -@erase "$(INTDIR)\FILE_Connector.obj" - -@erase "$(INTDIR)\FILE_IO.obj" - -@erase "$(INTDIR)\File_Lock.obj" - -@erase "$(INTDIR)\Filecache.obj" - -@erase "$(INTDIR)\Flag_Manip.obj" - -@erase "$(INTDIR)\Framework_Component.obj" - -@erase "$(INTDIR)\Framework_Component_T.obj" - -@erase "$(INTDIR)\Functor.obj" - -@erase "$(INTDIR)\Get_Opt.obj" - -@erase "$(INTDIR)\Handle_Ops.obj" - -@erase "$(INTDIR)\Handle_Set.obj" - -@erase "$(INTDIR)\Hash_Map_Manager.obj" - -@erase "$(INTDIR)\Hashable.obj" - -@erase "$(INTDIR)\High_Res_Timer.obj" - -@erase "$(INTDIR)\INET_Addr.obj" - -@erase "$(INTDIR)\Init_ACE.obj" - -@erase "$(INTDIR)\IO_Cntl_Msg.obj" - -@erase "$(INTDIR)\IO_SAP.obj" - -@erase "$(INTDIR)\IOStream.obj" - -@erase "$(INTDIR)\IPC_SAP.obj" - -@erase "$(INTDIR)\Lib_Find.obj" - -@erase "$(INTDIR)\Local_Name_Space.obj" - -@erase "$(INTDIR)\Local_Tokens.obj" - -@erase "$(INTDIR)\Log_Msg.obj" - -@erase "$(INTDIR)\Log_Msg_Backend.obj" - -@erase "$(INTDIR)\Log_Msg_Callback.obj" - -@erase "$(INTDIR)\Log_Msg_IPC.obj" - -@erase "$(INTDIR)\Log_Msg_NT_Event_Log.obj" - -@erase "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" - -@erase "$(INTDIR)\Log_Record.obj" - -@erase "$(INTDIR)\Logging_Strategy.obj" - -@erase "$(INTDIR)\LSOCK.obj" - -@erase "$(INTDIR)\LSOCK_Acceptor.obj" - -@erase "$(INTDIR)\LSOCK_CODgram.obj" - -@erase "$(INTDIR)\LSOCK_Connector.obj" - -@erase "$(INTDIR)\LSOCK_Dgram.obj" - -@erase "$(INTDIR)\LSOCK_Stream.obj" - -@erase "$(INTDIR)\Malloc.obj" - -@erase "$(INTDIR)\Malloc_Allocator.obj" - -@erase "$(INTDIR)\Malloc_Instantiations.obj" - -@erase "$(INTDIR)\Map.obj" - -@erase "$(INTDIR)\MEM_Acceptor.obj" - -@erase "$(INTDIR)\MEM_Addr.obj" - -@erase "$(INTDIR)\MEM_Connector.obj" - -@erase "$(INTDIR)\MEM_IO.obj" - -@erase "$(INTDIR)\Mem_Map.obj" - -@erase "$(INTDIR)\MEM_SAP.obj" - -@erase "$(INTDIR)\MEM_Stream.obj" - -@erase "$(INTDIR)\Memory_Pool.obj" - -@erase "$(INTDIR)\Message_Block.obj" - -@erase "$(INTDIR)\Message_Queue.obj" - -@erase "$(INTDIR)\Method_Request.obj" - -@erase "$(INTDIR)\Msg_WFMO_Reactor.obj" - -@erase "$(INTDIR)\Multiplexor.obj" - -@erase "$(INTDIR)\Name_Proxy.obj" - -@erase "$(INTDIR)\Name_Request_Reply.obj" - -@erase "$(INTDIR)\Name_Space.obj" - -@erase "$(INTDIR)\Naming_Context.obj" - -@erase "$(INTDIR)\Notification_Strategy.obj" - -@erase "$(INTDIR)\NT_Service.obj" - -@erase "$(INTDIR)\Obchunk.obj" - -@erase "$(INTDIR)\Object_Manager.obj" - -@erase "$(INTDIR)\Obstack.obj" - -@erase "$(INTDIR)\OS.obj" - -@erase "$(INTDIR)\OS_Dirent.obj" - -@erase "$(INTDIR)\OS_Errno.obj" - -@erase "$(INTDIR)\OS_Log_Msg_Attributes.obj" - -@erase "$(INTDIR)\OS_Memory.obj" - -@erase "$(INTDIR)\OS_QoS.obj" - -@erase "$(INTDIR)\OS_String.obj" - -@erase "$(INTDIR)\OS_Thread_Adapter.obj" - -@erase "$(INTDIR)\OS_TLI.obj" - -@erase "$(INTDIR)\Pair.obj" - -@erase "$(INTDIR)\Parse_Node.obj" - -@erase "$(INTDIR)\PI_Malloc.obj" - -@erase "$(INTDIR)\Pipe.obj" - -@erase "$(INTDIR)\POSIX_Asynch_IO.obj" - -@erase "$(INTDIR)\POSIX_Proactor.obj" - -@erase "$(INTDIR)\Priority_Reactor.obj" - -@erase "$(INTDIR)\Proactor.obj" - -@erase "$(INTDIR)\Process.obj" - -@erase "$(INTDIR)\Process_Manager.obj" - -@erase "$(INTDIR)\Process_Mutex.obj" - -@erase "$(INTDIR)\Process_Semaphore.obj" - -@erase "$(INTDIR)\Profile_Timer.obj" - -@erase "$(INTDIR)\Reactor.obj" - -@erase "$(INTDIR)\Reactor_Notification_Strategy.obj" - -@erase "$(INTDIR)\Read_Buffer.obj" - -@erase "$(INTDIR)\Recyclable.obj" - -@erase "$(INTDIR)\Refcountable.obj" - -@erase "$(INTDIR)\Registry.obj" - -@erase "$(INTDIR)\Registry_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Tokens.obj" - -@erase "$(INTDIR)\RW_Process_Mutex.obj" - -@erase "$(INTDIR)\Sample_History.obj" - -@erase "$(INTDIR)\Sched_Params.obj" - -@erase "$(INTDIR)\Select_Reactor.obj" - -@erase "$(INTDIR)\Select_Reactor_Base.obj" - -@erase "$(INTDIR)\Service_Config.obj" - -@erase "$(INTDIR)\Service_Manager.obj" - -@erase "$(INTDIR)\Service_Object.obj" - -@erase "$(INTDIR)\Service_Repository.obj" - -@erase "$(INTDIR)\Service_Templates.obj" - -@erase "$(INTDIR)\Service_Types.obj" - -@erase "$(INTDIR)\Shared_Memory.obj" - -@erase "$(INTDIR)\Shared_Memory_MM.obj" - -@erase "$(INTDIR)\Shared_Memory_SV.obj" - -@erase "$(INTDIR)\Shared_Object.obj" - -@erase "$(INTDIR)\Signal.obj" - -@erase "$(INTDIR)\SOCK.obj" - -@erase "$(INTDIR)\SOCK_Acceptor.obj" - -@erase "$(INTDIR)\SOCK_CODgram.obj" - -@erase "$(INTDIR)\Sock_Connect.obj" - -@erase "$(INTDIR)\SOCK_Connector.obj" - -@erase "$(INTDIR)\SOCK_Dgram.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Bcast.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Mcast.obj" - -@erase "$(INTDIR)\SOCK_IO.obj" - -@erase "$(INTDIR)\SOCK_Stream.obj" - -@erase "$(INTDIR)\SPIPE.obj" - -@erase "$(INTDIR)\SPIPE_Acceptor.obj" - -@erase "$(INTDIR)\SPIPE_Addr.obj" - -@erase "$(INTDIR)\SPIPE_Connector.obj" - -@erase "$(INTDIR)\SPIPE_Stream.obj" - -@erase "$(INTDIR)\SString.obj" - -@erase "$(INTDIR)\Stats.obj" - -@erase "$(INTDIR)\String_Base_Const.obj" - -@erase "$(INTDIR)\SV_Message.obj" - -@erase "$(INTDIR)\SV_Message_Queue.obj" - -@erase "$(INTDIR)\SV_Semaphore_Complex.obj" - -@erase "$(INTDIR)\SV_Semaphore_Simple.obj" - -@erase "$(INTDIR)\SV_Shared_Memory.obj" - -@erase "$(INTDIR)\Svc_Conf_l.obj" - -@erase "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" - -@erase "$(INTDIR)\Svc_Conf_y.obj" - -@erase "$(INTDIR)\Svc_Handler.obj" - -@erase "$(INTDIR)\Synch.obj" - -@erase "$(INTDIR)\Synch_Options.obj" - -@erase "$(INTDIR)\System_Time.obj" - -@erase "$(INTDIR)\Task.obj" - -@erase "$(INTDIR)\Template_Instantiations.obj" - -@erase "$(INTDIR)\Thread.obj" - -@erase "$(INTDIR)\Thread_Adapter.obj" - -@erase "$(INTDIR)\Thread_Control.obj" - -@erase "$(INTDIR)\Thread_Exit.obj" - -@erase "$(INTDIR)\Thread_Hook.obj" - -@erase "$(INTDIR)\Thread_Manager.obj" - -@erase "$(INTDIR)\Time_Request_Reply.obj" - -@erase "$(INTDIR)\Time_Value.obj" - -@erase "$(INTDIR)\Timeprobe.obj" - -@erase "$(INTDIR)\Timer_Hash.obj" - -@erase "$(INTDIR)\Timer_Heap.obj" - -@erase "$(INTDIR)\Timer_List.obj" - -@erase "$(INTDIR)\Timer_Queue.obj" - -@erase "$(INTDIR)\Timer_Queue_Adapters.obj" - -@erase "$(INTDIR)\Timer_Wheel.obj" - -@erase "$(INTDIR)\TLI.obj" - -@erase "$(INTDIR)\TLI_Acceptor.obj" - -@erase "$(INTDIR)\TLI_Connector.obj" - -@erase "$(INTDIR)\TLI_Stream.obj" - -@erase "$(INTDIR)\Token.obj" - -@erase "$(INTDIR)\Token_Collection.obj" - -@erase "$(INTDIR)\Token_Invariants.obj" - -@erase "$(INTDIR)\Token_Manager.obj" - -@erase "$(INTDIR)\Token_Request_Reply.obj" - -@erase "$(INTDIR)\TP_Reactor.obj" - -@erase "$(INTDIR)\Trace.obj" - -@erase "$(INTDIR)\TTY_IO.obj" - -@erase "$(INTDIR)\Typed_SV_Message.obj" - -@erase "$(INTDIR)\Typed_SV_Message_Queue.obj" - -@erase "$(INTDIR)\UNIX_Addr.obj" - -@erase "$(INTDIR)\UPIPE_Acceptor.obj" - -@erase "$(INTDIR)\UPIPE_Connector.obj" - -@erase "$(INTDIR)\UPIPE_Stream.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\WFMO_Reactor.obj" - -@erase "$(INTDIR)\WIN32_Asynch_IO.obj" - -@erase "$(INTDIR)\WIN32_Proactor.obj" - -@erase "$(INTDIR)\XML_Svc_Conf.obj" - -@erase "$(INTDIR)\XtReactor.obj" - -@erase "$(OUTDIR)\acemfc.exp" - -@erase "$(OUTDIR)\acemfc.lib" - -@erase "$(OUTDIR)\acemfc.pdb" - -@erase "$(OUTDIR)\DLL\MFC_Release\acemfc.map" - -@erase "..\bin\acemfc.dll" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Wp64 /GX /Zi /O2 /Ob2 /I "../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ace.res" /d "NDEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ace.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=advapi32.lib user32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\acemfc.pdb" /map:"$(INTDIR)\acemfc.map" /debug /machine:IA64 /out:"..\bin\acemfc.dll" /implib:"$(OUTDIR)\acemfc.lib" -LINK32_OBJS= \ - "$(INTDIR)\ACE.obj" \ - "$(INTDIR)\Activation_Queue.obj" \ - "$(INTDIR)\Active_Map_Manager.obj" \ - "$(INTDIR)\Addr.obj" \ - "$(INTDIR)\Arg_Shifter.obj" \ - "$(INTDIR)\ARGV.obj" \ - "$(INTDIR)\Argv_Type_Converter.obj" \ - "$(INTDIR)\Asynch_Connector.obj" \ - "$(INTDIR)\Asynch_IO.obj" \ - "$(INTDIR)\Asynch_IO_Impl.obj" \ - "$(INTDIR)\Asynch_Pseudo_Task.obj" \ - "$(INTDIR)\ATM_Acceptor.obj" \ - "$(INTDIR)\ATM_Addr.obj" \ - "$(INTDIR)\ATM_Connector.obj" \ - "$(INTDIR)\ATM_Params.obj" \ - "$(INTDIR)\ATM_QoS.obj" \ - "$(INTDIR)\ATM_Stream.obj" \ - "$(INTDIR)\Base_Thread_Adapter.obj" \ - "$(INTDIR)\Based_Pointer_Repository.obj" \ - "$(INTDIR)\Basic_Stats.obj" \ - "$(INTDIR)\Basic_Types.obj" \ - "$(INTDIR)\Capabilities.obj" \ - "$(INTDIR)\CDR_Base.obj" \ - "$(INTDIR)\CDR_Stream.obj" \ - "$(INTDIR)\Codecs.obj" \ - "$(INTDIR)\Codeset_Registry.obj" - "$(INTDIR)\Codeset_Registry_db.obj" - "$(INTDIR)\Configuration.obj" \ - "$(INTDIR)\Configuration_Import_Export.obj" \ - "$(INTDIR)\Connection_Recycling_Strategy.obj" \ - "$(INTDIR)\Containers.obj" \ - "$(INTDIR)\Copy_Disabled.obj" \ - "$(INTDIR)\Date_Time.obj" \ - "$(INTDIR)\DEV.obj" \ - "$(INTDIR)\DEV_Addr.obj" \ - "$(INTDIR)\DEV_Connector.obj" \ - "$(INTDIR)\DEV_IO.obj" \ - "$(INTDIR)\Dirent.obj" \ - "$(INTDIR)\Dirent_Selector.obj" \ - "$(INTDIR)\DLL.obj" \ - "$(INTDIR)\DLL_Manager.obj" \ - "$(INTDIR)\Dump.obj" \ - "$(INTDIR)\Dynamic.obj" \ - "$(INTDIR)\Dynamic_Service.obj" \ - "$(INTDIR)\Dynamic_Service_Base.obj" \ - "$(INTDIR)\Event_Handler.obj" \ - "$(INTDIR)\Event_Handler_T.obj" \ - "$(INTDIR)\FIFO.obj" \ - "$(INTDIR)\FIFO_Recv.obj" \ - "$(INTDIR)\FIFO_Recv_Msg.obj" \ - "$(INTDIR)\FIFO_Send.obj" \ - "$(INTDIR)\FIFO_Send_Msg.obj" \ - "$(INTDIR)\FILE.obj" \ - "$(INTDIR)\FILE_Addr.obj" \ - "$(INTDIR)\FILE_Connector.obj" \ - "$(INTDIR)\FILE_IO.obj" \ - "$(INTDIR)\File_Lock.obj" \ - "$(INTDIR)\Filecache.obj" \ - "$(INTDIR)\Flag_Manip.obj" \ - "$(INTDIR)\Framework_Component.obj" \ - "$(INTDIR)\Functor.obj" \ - "$(INTDIR)\Get_Opt.obj" \ - "$(INTDIR)\Handle_Ops.obj" \ - "$(INTDIR)\Handle_Set.obj" \ - "$(INTDIR)\Hash_Map_Manager.obj" \ - "$(INTDIR)\Hashable.obj" \ - "$(INTDIR)\High_Res_Timer.obj" \ - "$(INTDIR)\INET_Addr.obj" \ - "$(INTDIR)\Init_ACE.obj" \ - "$(INTDIR)\IO_Cntl_Msg.obj" \ - "$(INTDIR)\IO_SAP.obj" \ - "$(INTDIR)\IOStream.obj" \ - "$(INTDIR)\IPC_SAP.obj" \ - "$(INTDIR)\Lib_Find.obj" \ - "$(INTDIR)\Local_Name_Space.obj" \ - "$(INTDIR)\Local_Tokens.obj" \ - "$(INTDIR)\Log_Msg.obj" \ - "$(INTDIR)\Log_Msg_Backend.obj" \ - "$(INTDIR)\Log_Msg_Callback.obj" \ - "$(INTDIR)\Log_Msg_IPC.obj" \ - "$(INTDIR)\Log_Msg_NT_Event_Log.obj" \ - "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" \ - "$(INTDIR)\Log_Record.obj" \ - "$(INTDIR)\Logging_Strategy.obj" \ - "$(INTDIR)\LSOCK.obj" \ - "$(INTDIR)\LSOCK_Acceptor.obj" \ - "$(INTDIR)\LSOCK_CODgram.obj" \ - "$(INTDIR)\LSOCK_Connector.obj" \ - "$(INTDIR)\LSOCK_Dgram.obj" \ - "$(INTDIR)\LSOCK_Stream.obj" \ - "$(INTDIR)\Malloc.obj" \ - "$(INTDIR)\Malloc_Allocator.obj" \ - "$(INTDIR)\Malloc_Instantiations.obj" \ - "$(INTDIR)\Map.obj" \ - "$(INTDIR)\MEM_Acceptor.obj" \ - "$(INTDIR)\MEM_Addr.obj" \ - "$(INTDIR)\MEM_Connector.obj" \ - "$(INTDIR)\MEM_IO.obj" \ - "$(INTDIR)\Mem_Map.obj" \ - "$(INTDIR)\MEM_SAP.obj" \ - "$(INTDIR)\MEM_Stream.obj" \ - "$(INTDIR)\Memory_Pool.obj" \ - "$(INTDIR)\Message_Block.obj" \ - "$(INTDIR)\Message_Queue.obj" \ - "$(INTDIR)\Method_Request.obj" \ - "$(INTDIR)\Msg_WFMO_Reactor.obj" \ - "$(INTDIR)\Multiplexor.obj" \ - "$(INTDIR)\Name_Proxy.obj" \ - "$(INTDIR)\Name_Request_Reply.obj" \ - "$(INTDIR)\Name_Space.obj" \ - "$(INTDIR)\Naming_Context.obj" \ - "$(INTDIR)\Notification_Strategy.obj" \ - "$(INTDIR)\NT_Service.obj" \ - "$(INTDIR)\Obchunk.obj" \ - "$(INTDIR)\Object_Manager.obj" \ - "$(INTDIR)\Obstack.obj" \ - "$(INTDIR)\OS.obj" \ - "$(INTDIR)\OS_Dirent.obj" \ - "$(INTDIR)\OS_Errno.obj" \ - "$(INTDIR)\OS_Log_Msg_Attributes.obj" \ - "$(INTDIR)\OS_Memory.obj" \ - "$(INTDIR)\OS_QoS.obj" \ - "$(INTDIR)\OS_String.obj" \ - "$(INTDIR)\OS_Thread_Adapter.obj" \ - "$(INTDIR)\OS_TLI.obj" \ - "$(INTDIR)\Pair.obj" \ - "$(INTDIR)\Parse_Node.obj" \ - "$(INTDIR)\PI_Malloc.obj" \ - "$(INTDIR)\Pipe.obj" \ - "$(INTDIR)\POSIX_Asynch_IO.obj" \ - "$(INTDIR)\POSIX_Proactor.obj" \ - "$(INTDIR)\Priority_Reactor.obj" \ - "$(INTDIR)\Proactor.obj" \ - "$(INTDIR)\Process.obj" \ - "$(INTDIR)\Process_Manager.obj" \ - "$(INTDIR)\Process_Mutex.obj" \ - "$(INTDIR)\Process_Semaphore.obj" \ - "$(INTDIR)\Profile_Timer.obj" \ - "$(INTDIR)\Reactor.obj" \ - "$(INTDIR)\Reactor_Notification_Strategy.obj" \ - "$(INTDIR)\Read_Buffer.obj" \ - "$(INTDIR)\Recyclable.obj" \ - "$(INTDIR)\Refcountable.obj" \ - "$(INTDIR)\Registry.obj" \ - "$(INTDIR)\Registry_Name_Space.obj" \ - "$(INTDIR)\Remote_Name_Space.obj" \ - "$(INTDIR)\Remote_Tokens.obj" \ - "$(INTDIR)\RW_Process_Mutex.obj" \ - "$(INTDIR)\Sample_History.obj" \ - "$(INTDIR)\Sched_Params.obj" \ - "$(INTDIR)\Select_Reactor.obj" \ - "$(INTDIR)\Select_Reactor_Base.obj" \ - "$(INTDIR)\Service_Config.obj" \ - "$(INTDIR)\Service_Manager.obj" \ - "$(INTDIR)\Service_Object.obj" \ - "$(INTDIR)\Service_Repository.obj" \ - "$(INTDIR)\Service_Templates.obj" \ - "$(INTDIR)\Service_Types.obj" \ - "$(INTDIR)\Shared_Memory.obj" \ - "$(INTDIR)\Shared_Memory_MM.obj" \ - "$(INTDIR)\Shared_Memory_SV.obj" \ - "$(INTDIR)\Shared_Object.obj" \ - "$(INTDIR)\Signal.obj" \ - "$(INTDIR)\SOCK.obj" \ - "$(INTDIR)\SOCK_Acceptor.obj" \ - "$(INTDIR)\SOCK_CODgram.obj" \ - "$(INTDIR)\Sock_Connect.obj" \ - "$(INTDIR)\SOCK_Connector.obj" \ - "$(INTDIR)\SOCK_Dgram.obj" \ - "$(INTDIR)\SOCK_Dgram_Bcast.obj" \ - "$(INTDIR)\SOCK_Dgram_Mcast.obj" \ - "$(INTDIR)\SOCK_IO.obj" \ - "$(INTDIR)\SOCK_Stream.obj" \ - "$(INTDIR)\SPIPE.obj" \ - "$(INTDIR)\SPIPE_Acceptor.obj" \ - "$(INTDIR)\SPIPE_Addr.obj" \ - "$(INTDIR)\SPIPE_Connector.obj" \ - "$(INTDIR)\SPIPE_Stream.obj" \ - "$(INTDIR)\SString.obj" \ - "$(INTDIR)\Stats.obj" \ - "$(INTDIR)\String_Base_Const.obj" \ - "$(INTDIR)\SV_Message.obj" \ - "$(INTDIR)\SV_Message_Queue.obj" \ - "$(INTDIR)\SV_Semaphore_Complex.obj" \ - "$(INTDIR)\SV_Semaphore_Simple.obj" \ - "$(INTDIR)\SV_Shared_Memory.obj" \ - "$(INTDIR)\Svc_Conf_l.obj" \ - "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" \ - "$(INTDIR)\Svc_Conf_y.obj" \ - "$(INTDIR)\Svc_Handler.obj" \ - "$(INTDIR)\Synch.obj" \ - "$(INTDIR)\Synch_Options.obj" \ - "$(INTDIR)\System_Time.obj" \ - "$(INTDIR)\Task.obj" \ - "$(INTDIR)\Template_Instantiations.obj" \ - "$(INTDIR)\Thread.obj" \ - "$(INTDIR)\Thread_Adapter.obj" \ - "$(INTDIR)\Thread_Control.obj" \ - "$(INTDIR)\Thread_Exit.obj" \ - "$(INTDIR)\Thread_Hook.obj" \ - "$(INTDIR)\Thread_Manager.obj" \ - "$(INTDIR)\Time_Request_Reply.obj" \ - "$(INTDIR)\Time_Value.obj" \ - "$(INTDIR)\Timeprobe.obj" \ - "$(INTDIR)\Timer_Hash.obj" \ - "$(INTDIR)\Timer_Heap.obj" \ - "$(INTDIR)\Timer_List.obj" \ - "$(INTDIR)\Timer_Queue.obj" \ - "$(INTDIR)\Timer_Queue_Adapters.obj" \ - "$(INTDIR)\Timer_Wheel.obj" \ - "$(INTDIR)\TLI.obj" \ - "$(INTDIR)\TLI_Acceptor.obj" \ - "$(INTDIR)\TLI_Connector.obj" \ - "$(INTDIR)\TLI_Stream.obj" \ - "$(INTDIR)\Token.obj" \ - "$(INTDIR)\Token_Collection.obj" \ - "$(INTDIR)\Token_Invariants.obj" \ - "$(INTDIR)\Token_Manager.obj" \ - "$(INTDIR)\Token_Request_Reply.obj" \ - "$(INTDIR)\TP_Reactor.obj" \ - "$(INTDIR)\Trace.obj" \ - "$(INTDIR)\TTY_IO.obj" \ - "$(INTDIR)\Typed_SV_Message.obj" \ - "$(INTDIR)\Typed_SV_Message_Queue.obj" \ - "$(INTDIR)\UNIX_Addr.obj" \ - "$(INTDIR)\UPIPE_Acceptor.obj" \ - "$(INTDIR)\UPIPE_Connector.obj" \ - "$(INTDIR)\UPIPE_Stream.obj" \ - "$(INTDIR)\WFMO_Reactor.obj" \ - "$(INTDIR)\WIN32_Asynch_IO.obj" \ - "$(INTDIR)\WIN32_Proactor.obj" \ - "$(INTDIR)\XML_Svc_Conf.obj" \ - "$(INTDIR)\XtReactor.obj" \ - "$(INTDIR)\Atomic_Op.obj" \ - "$(INTDIR)\Framework_Component_T.obj" \ - "$(INTDIR)\ace.res" - -"..\bin\acemfc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "ACE DLL - Win64 MFC Debug" - -OUTDIR=. -INTDIR=.\DLL\MFC_Debug - -ALL : "..\bin\acemfcd.dll" - - -CLEAN : - -@erase "$(INTDIR)\ACE.obj" - -@erase "$(INTDIR)\ace.res" - -@erase "$(INTDIR)\Activation_Queue.obj" - -@erase "$(INTDIR)\Active_Map_Manager.obj" - -@erase "$(INTDIR)\Addr.obj" - -@erase "$(INTDIR)\Arg_Shifter.obj" - -@erase "$(INTDIR)\ARGV.obj" - -@erase "$(INTDIR)\Argv_Type_Converter.obj" - -@erase "$(INTDIR)\Asynch_Connector.obj" - -@erase "$(INTDIR)\Asynch_IO.obj" - -@erase "$(INTDIR)\Asynch_IO_Impl.obj" - -@erase "$(INTDIR)\Asynch_Pseudo_Task.obj" - -@erase "$(INTDIR)\ATM_Acceptor.obj" - -@erase "$(INTDIR)\ATM_Addr.obj" - -@erase "$(INTDIR)\ATM_Connector.obj" - -@erase "$(INTDIR)\ATM_Params.obj" - -@erase "$(INTDIR)\ATM_QoS.obj" - -@erase "$(INTDIR)\ATM_Stream.obj" - -@erase "$(INTDIR)\Atomic_Op.obj" - -@erase "$(INTDIR)\Base_Thread_Adapter.obj" - -@erase "$(INTDIR)\Based_Pointer_Repository.obj" - -@erase "$(INTDIR)\Basic_Stats.obj" - -@erase "$(INTDIR)\Basic_Types.obj" - -@erase "$(INTDIR)\Capabilities.obj" - -@erase "$(INTDIR)\CDR_Base.obj" - -@erase "$(INTDIR)\CDR_Stream.obj" - -@erase "$(INTDIR)\Codecs.obj" - -@erase "$(INTDIR)\Codeset_Registry.obj" - -@erase "$(INTDIR)\Codeset_Registry_db.obj" - -@erase "$(INTDIR)\Configuration.obj" - -@erase "$(INTDIR)\Configuration_Import_Export.obj" - -@erase "$(INTDIR)\Connection_Recycling_Strategy.obj" - -@erase "$(INTDIR)\Containers.obj" - -@erase "$(INTDIR)\Copy_Disabled.obj" - -@erase "$(INTDIR)\Date_Time.obj" - -@erase "$(INTDIR)\DEV.obj" - -@erase "$(INTDIR)\DEV_Addr.obj" - -@erase "$(INTDIR)\DEV_Connector.obj" - -@erase "$(INTDIR)\DEV_IO.obj" - -@erase "$(INTDIR)\Dirent.obj" - -@erase "$(INTDIR)\Dirent_Selector.obj" - -@erase "$(INTDIR)\DLL.obj" - -@erase "$(INTDIR)\DLL_Manager.obj" - -@erase "$(INTDIR)\Dump.obj" - -@erase "$(INTDIR)\Dynamic.obj" - -@erase "$(INTDIR)\Dynamic_Service.obj" - -@erase "$(INTDIR)\Dynamic_Service_Base.obj" - -@erase "$(INTDIR)\Event_Handler.obj" - -@erase "$(INTDIR)\Event_Handler_T.obj" - -@erase "$(INTDIR)\FIFO.obj" - -@erase "$(INTDIR)\FIFO_Recv.obj" - -@erase "$(INTDIR)\FIFO_Recv_Msg.obj" - -@erase "$(INTDIR)\FIFO_Send.obj" - -@erase "$(INTDIR)\FIFO_Send_Msg.obj" - -@erase "$(INTDIR)\FILE.obj" - -@erase "$(INTDIR)\FILE_Addr.obj" - -@erase "$(INTDIR)\FILE_Connector.obj" - -@erase "$(INTDIR)\FILE_IO.obj" - -@erase "$(INTDIR)\File_Lock.obj" - -@erase "$(INTDIR)\Filecache.obj" - -@erase "$(INTDIR)\Flag_Manip.obj" - -@erase "$(INTDIR)\Framework_Component.obj" - -@erase "$(INTDIR)\Framework_Component_T.obj" - -@erase "$(INTDIR)\Functor.obj" - -@erase "$(INTDIR)\Get_Opt.obj" - -@erase "$(INTDIR)\Handle_Ops.obj" - -@erase "$(INTDIR)\Handle_Set.obj" - -@erase "$(INTDIR)\Hash_Map_Manager.obj" - -@erase "$(INTDIR)\Hashable.obj" - -@erase "$(INTDIR)\High_Res_Timer.obj" - -@erase "$(INTDIR)\INET_Addr.obj" - -@erase "$(INTDIR)\Init_ACE.obj" - -@erase "$(INTDIR)\IO_Cntl_Msg.obj" - -@erase "$(INTDIR)\IO_SAP.obj" - -@erase "$(INTDIR)\IOStream.obj" - -@erase "$(INTDIR)\IPC_SAP.obj" - -@erase "$(INTDIR)\Lib_Find.obj" - -@erase "$(INTDIR)\Local_Name_Space.obj" - -@erase "$(INTDIR)\Local_Tokens.obj" - -@erase "$(INTDIR)\Log_Msg.obj" - -@erase "$(INTDIR)\Log_Msg_Backend.obj" - -@erase "$(INTDIR)\Log_Msg_Callback.obj" - -@erase "$(INTDIR)\Log_Msg_IPC.obj" - -@erase "$(INTDIR)\Log_Msg_NT_Event_Log.obj" - -@erase "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" - -@erase "$(INTDIR)\Log_Record.obj" - -@erase "$(INTDIR)\Logging_Strategy.obj" - -@erase "$(INTDIR)\LSOCK.obj" - -@erase "$(INTDIR)\LSOCK_Acceptor.obj" - -@erase "$(INTDIR)\LSOCK_CODgram.obj" - -@erase "$(INTDIR)\LSOCK_Connector.obj" - -@erase "$(INTDIR)\LSOCK_Dgram.obj" - -@erase "$(INTDIR)\LSOCK_Stream.obj" - -@erase "$(INTDIR)\Malloc.obj" - -@erase "$(INTDIR)\Malloc_Allocator.obj" - -@erase "$(INTDIR)\Malloc_Instantiations.obj" - -@erase "$(INTDIR)\Map.obj" - -@erase "$(INTDIR)\MEM_Acceptor.obj" - -@erase "$(INTDIR)\MEM_Addr.obj" - -@erase "$(INTDIR)\MEM_Connector.obj" - -@erase "$(INTDIR)\MEM_IO.obj" - -@erase "$(INTDIR)\Mem_Map.obj" - -@erase "$(INTDIR)\MEM_SAP.obj" - -@erase "$(INTDIR)\MEM_Stream.obj" - -@erase "$(INTDIR)\Memory_Pool.obj" - -@erase "$(INTDIR)\Message_Block.obj" - -@erase "$(INTDIR)\Message_Queue.obj" - -@erase "$(INTDIR)\Method_Request.obj" - -@erase "$(INTDIR)\Msg_WFMO_Reactor.obj" - -@erase "$(INTDIR)\Multiplexor.obj" - -@erase "$(INTDIR)\Name_Proxy.obj" - -@erase "$(INTDIR)\Name_Request_Reply.obj" - -@erase "$(INTDIR)\Name_Space.obj" - -@erase "$(INTDIR)\Naming_Context.obj" - -@erase "$(INTDIR)\Notification_Strategy.obj" - -@erase "$(INTDIR)\NT_Service.obj" - -@erase "$(INTDIR)\Obchunk.obj" - -@erase "$(INTDIR)\Object_Manager.obj" - -@erase "$(INTDIR)\Obstack.obj" - -@erase "$(INTDIR)\OS.obj" - -@erase "$(INTDIR)\OS_Dirent.obj" - -@erase "$(INTDIR)\OS_Errno.obj" - -@erase "$(INTDIR)\OS_Log_Msg_Attributes.obj" - -@erase "$(INTDIR)\OS_Memory.obj" - -@erase "$(INTDIR)\OS_QoS.obj" - -@erase "$(INTDIR)\OS_String.obj" - -@erase "$(INTDIR)\OS_Thread_Adapter.obj" - -@erase "$(INTDIR)\OS_TLI.obj" - -@erase "$(INTDIR)\Pair.obj" - -@erase "$(INTDIR)\Parse_Node.obj" - -@erase "$(INTDIR)\PI_Malloc.obj" - -@erase "$(INTDIR)\Pipe.obj" - -@erase "$(INTDIR)\POSIX_Asynch_IO.obj" - -@erase "$(INTDIR)\POSIX_Proactor.obj" - -@erase "$(INTDIR)\Priority_Reactor.obj" - -@erase "$(INTDIR)\Proactor.obj" - -@erase "$(INTDIR)\Process.obj" - -@erase "$(INTDIR)\Process_Manager.obj" - -@erase "$(INTDIR)\Process_Mutex.obj" - -@erase "$(INTDIR)\Process_Semaphore.obj" - -@erase "$(INTDIR)\Profile_Timer.obj" - -@erase "$(INTDIR)\Reactor.obj" - -@erase "$(INTDIR)\Reactor_Notification_Strategy.obj" - -@erase "$(INTDIR)\Read_Buffer.obj" - -@erase "$(INTDIR)\Recyclable.obj" - -@erase "$(INTDIR)\Refcountable.obj" - -@erase "$(INTDIR)\Registry.obj" - -@erase "$(INTDIR)\Registry_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Tokens.obj" - -@erase "$(INTDIR)\RW_Process_Mutex.obj" - -@erase "$(INTDIR)\Sample_History.obj" - -@erase "$(INTDIR)\Sched_Params.obj" - -@erase "$(INTDIR)\Select_Reactor.obj" - -@erase "$(INTDIR)\Select_Reactor_Base.obj" - -@erase "$(INTDIR)\Service_Config.obj" - -@erase "$(INTDIR)\Service_Manager.obj" - -@erase "$(INTDIR)\Service_Object.obj" - -@erase "$(INTDIR)\Service_Repository.obj" - -@erase "$(INTDIR)\Service_Templates.obj" - -@erase "$(INTDIR)\Service_Types.obj" - -@erase "$(INTDIR)\Shared_Memory.obj" - -@erase "$(INTDIR)\Shared_Memory_MM.obj" - -@erase "$(INTDIR)\Shared_Memory_SV.obj" - -@erase "$(INTDIR)\Shared_Object.obj" - -@erase "$(INTDIR)\Signal.obj" - -@erase "$(INTDIR)\SOCK.obj" - -@erase "$(INTDIR)\SOCK_Acceptor.obj" - -@erase "$(INTDIR)\SOCK_CODgram.obj" - -@erase "$(INTDIR)\Sock_Connect.obj" - -@erase "$(INTDIR)\SOCK_Connector.obj" - -@erase "$(INTDIR)\SOCK_Dgram.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Bcast.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Mcast.obj" - -@erase "$(INTDIR)\SOCK_IO.obj" - -@erase "$(INTDIR)\SOCK_Stream.obj" - -@erase "$(INTDIR)\SPIPE.obj" - -@erase "$(INTDIR)\SPIPE_Acceptor.obj" - -@erase "$(INTDIR)\SPIPE_Addr.obj" - -@erase "$(INTDIR)\SPIPE_Connector.obj" - -@erase "$(INTDIR)\SPIPE_Stream.obj" - -@erase "$(INTDIR)\SString.obj" - -@erase "$(INTDIR)\Stats.obj" - -@erase "$(INTDIR)\String_Base_Const.obj" - -@erase "$(INTDIR)\SV_Message.obj" - -@erase "$(INTDIR)\SV_Message_Queue.obj" - -@erase "$(INTDIR)\SV_Semaphore_Complex.obj" - -@erase "$(INTDIR)\SV_Semaphore_Simple.obj" - -@erase "$(INTDIR)\SV_Shared_Memory.obj" - -@erase "$(INTDIR)\Svc_Conf_l.obj" - -@erase "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" - -@erase "$(INTDIR)\Svc_Conf_y.obj" - -@erase "$(INTDIR)\Svc_Handler.obj" - -@erase "$(INTDIR)\Synch.obj" - -@erase "$(INTDIR)\Synch_Options.obj" - -@erase "$(INTDIR)\System_Time.obj" - -@erase "$(INTDIR)\Task.obj" - -@erase "$(INTDIR)\Template_Instantiations.obj" - -@erase "$(INTDIR)\Thread.obj" - -@erase "$(INTDIR)\Thread_Adapter.obj" - -@erase "$(INTDIR)\Thread_Control.obj" - -@erase "$(INTDIR)\Thread_Exit.obj" - -@erase "$(INTDIR)\Thread_Hook.obj" - -@erase "$(INTDIR)\Thread_Manager.obj" - -@erase "$(INTDIR)\Time_Request_Reply.obj" - -@erase "$(INTDIR)\Time_Value.obj" - -@erase "$(INTDIR)\Timeprobe.obj" - -@erase "$(INTDIR)\Timer_Hash.obj" - -@erase "$(INTDIR)\Timer_Heap.obj" - -@erase "$(INTDIR)\Timer_List.obj" - -@erase "$(INTDIR)\Timer_Queue.obj" - -@erase "$(INTDIR)\Timer_Queue_Adapters.obj" - -@erase "$(INTDIR)\Timer_Wheel.obj" - -@erase "$(INTDIR)\TLI.obj" - -@erase "$(INTDIR)\TLI_Acceptor.obj" - -@erase "$(INTDIR)\TLI_Connector.obj" - -@erase "$(INTDIR)\TLI_Stream.obj" - -@erase "$(INTDIR)\Token.obj" - -@erase "$(INTDIR)\Token_Collection.obj" - -@erase "$(INTDIR)\Token_Invariants.obj" - -@erase "$(INTDIR)\Token_Manager.obj" - -@erase "$(INTDIR)\Token_Request_Reply.obj" - -@erase "$(INTDIR)\TP_Reactor.obj" - -@erase "$(INTDIR)\Trace.obj" - -@erase "$(INTDIR)\TTY_IO.obj" - -@erase "$(INTDIR)\Typed_SV_Message.obj" - -@erase "$(INTDIR)\Typed_SV_Message_Queue.obj" - -@erase "$(INTDIR)\UNIX_Addr.obj" - -@erase "$(INTDIR)\UPIPE_Acceptor.obj" - -@erase "$(INTDIR)\UPIPE_Connector.obj" - -@erase "$(INTDIR)\UPIPE_Stream.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\WFMO_Reactor.obj" - -@erase "$(INTDIR)\WIN32_Asynch_IO.obj" - -@erase "$(INTDIR)\WIN32_Proactor.obj" - -@erase "$(INTDIR)\XML_Svc_Conf.obj" - -@erase "$(INTDIR)\XtReactor.obj" - -@erase "$(OUTDIR)\acemfcd.exp" - -@erase "$(OUTDIR)\acemfcd.lib" - -@erase "$(OUTDIR)\acemfcd.pdb" - -@erase "..\bin\acemfcd.dll" - -@erase "..\bin\acemfcd.ilk" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Wp64 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ace.res" /d "_DEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ace.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=advapi32.lib user32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\acemfcd.pdb" /debug /machine:IA64 /out:"..\bin\acemfcd.dll" /implib:"$(OUTDIR)\acemfcd.lib" -LINK32_OBJS= \ - "$(INTDIR)\ACE.obj" \ - "$(INTDIR)\Activation_Queue.obj" \ - "$(INTDIR)\Active_Map_Manager.obj" \ - "$(INTDIR)\Addr.obj" \ - "$(INTDIR)\Arg_Shifter.obj" \ - "$(INTDIR)\ARGV.obj" \ - "$(INTDIR)\Argv_Type_Converter.obj" \ - "$(INTDIR)\Asynch_Connector.obj" \ - "$(INTDIR)\Asynch_IO.obj" \ - "$(INTDIR)\Asynch_IO_Impl.obj" \ - "$(INTDIR)\Asynch_Pseudo_Task.obj" \ - "$(INTDIR)\ATM_Acceptor.obj" \ - "$(INTDIR)\ATM_Addr.obj" \ - "$(INTDIR)\ATM_Connector.obj" \ - "$(INTDIR)\ATM_Params.obj" \ - "$(INTDIR)\ATM_QoS.obj" \ - "$(INTDIR)\ATM_Stream.obj" \ - "$(INTDIR)\Base_Thread_Adapter.obj" \ - "$(INTDIR)\Based_Pointer_Repository.obj" \ - "$(INTDIR)\Basic_Stats.obj" \ - "$(INTDIR)\Basic_Types.obj" \ - "$(INTDIR)\Capabilities.obj" \ - "$(INTDIR)\CDR_Base.obj" \ - "$(INTDIR)\CDR_Stream.obj" \ - "$(INTDIR)\Codecs.obj" \ - "$(INTDIR)\Codeset_Registry.obj" - "$(INTDIR)\Codeset_Registry_db.obj" - "$(INTDIR)\Configuration.obj" \ - "$(INTDIR)\Configuration_Import_Export.obj" \ - "$(INTDIR)\Connection_Recycling_Strategy.obj" \ - "$(INTDIR)\Containers.obj" \ - "$(INTDIR)\Copy_Disabled.obj" \ - "$(INTDIR)\Date_Time.obj" \ - "$(INTDIR)\DEV.obj" \ - "$(INTDIR)\DEV_Addr.obj" \ - "$(INTDIR)\DEV_Connector.obj" \ - "$(INTDIR)\DEV_IO.obj" \ - "$(INTDIR)\Dirent.obj" \ - "$(INTDIR)\Dirent_Selector.obj" \ - "$(INTDIR)\DLL.obj" \ - "$(INTDIR)\DLL_Manager.obj" \ - "$(INTDIR)\Dump.obj" \ - "$(INTDIR)\Dynamic.obj" \ - "$(INTDIR)\Dynamic_Service.obj" \ - "$(INTDIR)\Dynamic_Service_Base.obj" \ - "$(INTDIR)\Event_Handler.obj" \ - "$(INTDIR)\Event_Handler_T.obj" \ - "$(INTDIR)\FIFO.obj" \ - "$(INTDIR)\FIFO_Recv.obj" \ - "$(INTDIR)\FIFO_Recv_Msg.obj" \ - "$(INTDIR)\FIFO_Send.obj" \ - "$(INTDIR)\FIFO_Send_Msg.obj" \ - "$(INTDIR)\FILE.obj" \ - "$(INTDIR)\FILE_Addr.obj" \ - "$(INTDIR)\FILE_Connector.obj" \ - "$(INTDIR)\FILE_IO.obj" \ - "$(INTDIR)\File_Lock.obj" \ - "$(INTDIR)\Filecache.obj" \ - "$(INTDIR)\Flag_Manip.obj" \ - "$(INTDIR)\Framework_Component.obj" \ - "$(INTDIR)\Functor.obj" \ - "$(INTDIR)\Get_Opt.obj" \ - "$(INTDIR)\Handle_Ops.obj" \ - "$(INTDIR)\Handle_Set.obj" \ - "$(INTDIR)\Hash_Map_Manager.obj" \ - "$(INTDIR)\Hashable.obj" \ - "$(INTDIR)\High_Res_Timer.obj" \ - "$(INTDIR)\INET_Addr.obj" \ - "$(INTDIR)\Init_ACE.obj" \ - "$(INTDIR)\IO_Cntl_Msg.obj" \ - "$(INTDIR)\IO_SAP.obj" \ - "$(INTDIR)\IOStream.obj" \ - "$(INTDIR)\IPC_SAP.obj" \ - "$(INTDIR)\Lib_Find.obj" \ - "$(INTDIR)\Local_Name_Space.obj" \ - "$(INTDIR)\Local_Tokens.obj" \ - "$(INTDIR)\Log_Msg.obj" \ - "$(INTDIR)\Log_Msg_Backend.obj" \ - "$(INTDIR)\Log_Msg_Callback.obj" \ - "$(INTDIR)\Log_Msg_IPC.obj" \ - "$(INTDIR)\Log_Msg_NT_Event_Log.obj" \ - "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" \ - "$(INTDIR)\Log_Record.obj" \ - "$(INTDIR)\Logging_Strategy.obj" \ - "$(INTDIR)\LSOCK.obj" \ - "$(INTDIR)\LSOCK_Acceptor.obj" \ - "$(INTDIR)\LSOCK_CODgram.obj" \ - "$(INTDIR)\LSOCK_Connector.obj" \ - "$(INTDIR)\LSOCK_Dgram.obj" \ - "$(INTDIR)\LSOCK_Stream.obj" \ - "$(INTDIR)\Malloc.obj" \ - "$(INTDIR)\Malloc_Allocator.obj" \ - "$(INTDIR)\Malloc_Instantiations.obj" \ - "$(INTDIR)\Map.obj" \ - "$(INTDIR)\MEM_Acceptor.obj" \ - "$(INTDIR)\MEM_Addr.obj" \ - "$(INTDIR)\MEM_Connector.obj" \ - "$(INTDIR)\MEM_IO.obj" \ - "$(INTDIR)\Mem_Map.obj" \ - "$(INTDIR)\MEM_SAP.obj" \ - "$(INTDIR)\MEM_Stream.obj" \ - "$(INTDIR)\Memory_Pool.obj" \ - "$(INTDIR)\Message_Block.obj" \ - "$(INTDIR)\Message_Queue.obj" \ - "$(INTDIR)\Method_Request.obj" \ - "$(INTDIR)\Msg_WFMO_Reactor.obj" \ - "$(INTDIR)\Multiplexor.obj" \ - "$(INTDIR)\Name_Proxy.obj" \ - "$(INTDIR)\Name_Request_Reply.obj" \ - "$(INTDIR)\Name_Space.obj" \ - "$(INTDIR)\Naming_Context.obj" \ - "$(INTDIR)\Notification_Strategy.obj" \ - "$(INTDIR)\NT_Service.obj" \ - "$(INTDIR)\Obchunk.obj" \ - "$(INTDIR)\Object_Manager.obj" \ - "$(INTDIR)\Obstack.obj" \ - "$(INTDIR)\OS.obj" \ - "$(INTDIR)\OS_Dirent.obj" \ - "$(INTDIR)\OS_Errno.obj" \ - "$(INTDIR)\OS_Log_Msg_Attributes.obj" \ - "$(INTDIR)\OS_Memory.obj" \ - "$(INTDIR)\OS_QoS.obj" \ - "$(INTDIR)\OS_String.obj" \ - "$(INTDIR)\OS_Thread_Adapter.obj" \ - "$(INTDIR)\OS_TLI.obj" \ - "$(INTDIR)\Pair.obj" \ - "$(INTDIR)\Parse_Node.obj" \ - "$(INTDIR)\PI_Malloc.obj" \ - "$(INTDIR)\Pipe.obj" \ - "$(INTDIR)\POSIX_Asynch_IO.obj" \ - "$(INTDIR)\POSIX_Proactor.obj" \ - "$(INTDIR)\Priority_Reactor.obj" \ - "$(INTDIR)\Proactor.obj" \ - "$(INTDIR)\Process.obj" \ - "$(INTDIR)\Process_Manager.obj" \ - "$(INTDIR)\Process_Mutex.obj" \ - "$(INTDIR)\Process_Semaphore.obj" \ - "$(INTDIR)\Profile_Timer.obj" \ - "$(INTDIR)\Reactor.obj" \ - "$(INTDIR)\Reactor_Notification_Strategy.obj" \ - "$(INTDIR)\Read_Buffer.obj" \ - "$(INTDIR)\Recyclable.obj" \ - "$(INTDIR)\Refcountable.obj" \ - "$(INTDIR)\Registry.obj" \ - "$(INTDIR)\Registry_Name_Space.obj" \ - "$(INTDIR)\Remote_Name_Space.obj" \ - "$(INTDIR)\Remote_Tokens.obj" \ - "$(INTDIR)\RW_Process_Mutex.obj" \ - "$(INTDIR)\Sample_History.obj" \ - "$(INTDIR)\Sched_Params.obj" \ - "$(INTDIR)\Select_Reactor.obj" \ - "$(INTDIR)\Select_Reactor_Base.obj" \ - "$(INTDIR)\Service_Config.obj" \ - "$(INTDIR)\Service_Manager.obj" \ - "$(INTDIR)\Service_Object.obj" \ - "$(INTDIR)\Service_Repository.obj" \ - "$(INTDIR)\Service_Templates.obj" \ - "$(INTDIR)\Service_Types.obj" \ - "$(INTDIR)\Shared_Memory.obj" \ - "$(INTDIR)\Shared_Memory_MM.obj" \ - "$(INTDIR)\Shared_Memory_SV.obj" \ - "$(INTDIR)\Shared_Object.obj" \ - "$(INTDIR)\Signal.obj" \ - "$(INTDIR)\SOCK.obj" \ - "$(INTDIR)\SOCK_Acceptor.obj" \ - "$(INTDIR)\SOCK_CODgram.obj" \ - "$(INTDIR)\Sock_Connect.obj" \ - "$(INTDIR)\SOCK_Connector.obj" \ - "$(INTDIR)\SOCK_Dgram.obj" \ - "$(INTDIR)\SOCK_Dgram_Bcast.obj" \ - "$(INTDIR)\SOCK_Dgram_Mcast.obj" \ - "$(INTDIR)\SOCK_IO.obj" \ - "$(INTDIR)\SOCK_Stream.obj" \ - "$(INTDIR)\SPIPE.obj" \ - "$(INTDIR)\SPIPE_Acceptor.obj" \ - "$(INTDIR)\SPIPE_Addr.obj" \ - "$(INTDIR)\SPIPE_Connector.obj" \ - "$(INTDIR)\SPIPE_Stream.obj" \ - "$(INTDIR)\SString.obj" \ - "$(INTDIR)\Stats.obj" \ - "$(INTDIR)\String_Base_Const.obj" \ - "$(INTDIR)\SV_Message.obj" \ - "$(INTDIR)\SV_Message_Queue.obj" \ - "$(INTDIR)\SV_Semaphore_Complex.obj" \ - "$(INTDIR)\SV_Semaphore_Simple.obj" \ - "$(INTDIR)\SV_Shared_Memory.obj" \ - "$(INTDIR)\Svc_Conf_l.obj" \ - "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" \ - "$(INTDIR)\Svc_Conf_y.obj" \ - "$(INTDIR)\Svc_Handler.obj" \ - "$(INTDIR)\Synch.obj" \ - "$(INTDIR)\Synch_Options.obj" \ - "$(INTDIR)\System_Time.obj" \ - "$(INTDIR)\Task.obj" \ - "$(INTDIR)\Template_Instantiations.obj" \ - "$(INTDIR)\Thread.obj" \ - "$(INTDIR)\Thread_Adapter.obj" \ - "$(INTDIR)\Thread_Control.obj" \ - "$(INTDIR)\Thread_Exit.obj" \ - "$(INTDIR)\Thread_Hook.obj" \ - "$(INTDIR)\Thread_Manager.obj" \ - "$(INTDIR)\Time_Request_Reply.obj" \ - "$(INTDIR)\Time_Value.obj" \ - "$(INTDIR)\Timeprobe.obj" \ - "$(INTDIR)\Timer_Hash.obj" \ - "$(INTDIR)\Timer_Heap.obj" \ - "$(INTDIR)\Timer_List.obj" \ - "$(INTDIR)\Timer_Queue.obj" \ - "$(INTDIR)\Timer_Queue_Adapters.obj" \ - "$(INTDIR)\Timer_Wheel.obj" \ - "$(INTDIR)\TLI.obj" \ - "$(INTDIR)\TLI_Acceptor.obj" \ - "$(INTDIR)\TLI_Connector.obj" \ - "$(INTDIR)\TLI_Stream.obj" \ - "$(INTDIR)\Token.obj" \ - "$(INTDIR)\Token_Collection.obj" \ - "$(INTDIR)\Token_Invariants.obj" \ - "$(INTDIR)\Token_Manager.obj" \ - "$(INTDIR)\Token_Request_Reply.obj" \ - "$(INTDIR)\TP_Reactor.obj" \ - "$(INTDIR)\Trace.obj" \ - "$(INTDIR)\TTY_IO.obj" \ - "$(INTDIR)\Typed_SV_Message.obj" \ - "$(INTDIR)\Typed_SV_Message_Queue.obj" \ - "$(INTDIR)\UNIX_Addr.obj" \ - "$(INTDIR)\UPIPE_Acceptor.obj" \ - "$(INTDIR)\UPIPE_Connector.obj" \ - "$(INTDIR)\UPIPE_Stream.obj" \ - "$(INTDIR)\WFMO_Reactor.obj" \ - "$(INTDIR)\WIN32_Asynch_IO.obj" \ - "$(INTDIR)\WIN32_Proactor.obj" \ - "$(INTDIR)\XML_Svc_Conf.obj" \ - "$(INTDIR)\XtReactor.obj" \ - "$(INTDIR)\Atomic_Op.obj" \ - "$(INTDIR)\Framework_Component_T.obj" \ - "$(INTDIR)\ace.res" - -"..\bin\acemfcd.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "ACE DLL - Win64 Release" - -OUTDIR=. -INTDIR=.\DLL\Release - -ALL : "..\bin\ace.dll" - - -CLEAN : - -@erase "$(INTDIR)\ACE.obj" - -@erase "$(INTDIR)\ace.res" - -@erase "$(INTDIR)\Activation_Queue.obj" - -@erase "$(INTDIR)\Active_Map_Manager.obj" - -@erase "$(INTDIR)\Addr.obj" - -@erase "$(INTDIR)\Arg_Shifter.obj" - -@erase "$(INTDIR)\ARGV.obj" - -@erase "$(INTDIR)\Argv_Type_Converter.obj" - -@erase "$(INTDIR)\Asynch_Connector.obj" - -@erase "$(INTDIR)\Asynch_IO.obj" - -@erase "$(INTDIR)\Asynch_IO_Impl.obj" - -@erase "$(INTDIR)\Asynch_Pseudo_Task.obj" - -@erase "$(INTDIR)\ATM_Acceptor.obj" - -@erase "$(INTDIR)\ATM_Addr.obj" - -@erase "$(INTDIR)\ATM_Connector.obj" - -@erase "$(INTDIR)\ATM_Params.obj" - -@erase "$(INTDIR)\ATM_QoS.obj" - -@erase "$(INTDIR)\ATM_Stream.obj" - -@erase "$(INTDIR)\Atomic_Op.obj" - -@erase "$(INTDIR)\Base_Thread_Adapter.obj" - -@erase "$(INTDIR)\Based_Pointer_Repository.obj" - -@erase "$(INTDIR)\Basic_Stats.obj" - -@erase "$(INTDIR)\Basic_Types.obj" - -@erase "$(INTDIR)\Capabilities.obj" - -@erase "$(INTDIR)\CDR_Base.obj" - -@erase "$(INTDIR)\CDR_Stream.obj" - -@erase "$(INTDIR)\Codecs.obj" - -@erase "$(INTDIR)\Codeset_Registry.obj" - -@erase "$(INTDIR)\Codeset_Registry_db.obj" - -@erase "$(INTDIR)\Configuration.obj" - -@erase "$(INTDIR)\Configuration_Import_Export.obj" - -@erase "$(INTDIR)\Connection_Recycling_Strategy.obj" - -@erase "$(INTDIR)\Containers.obj" - -@erase "$(INTDIR)\Copy_Disabled.obj" - -@erase "$(INTDIR)\Date_Time.obj" - -@erase "$(INTDIR)\DEV.obj" - -@erase "$(INTDIR)\DEV_Addr.obj" - -@erase "$(INTDIR)\DEV_Connector.obj" - -@erase "$(INTDIR)\DEV_IO.obj" - -@erase "$(INTDIR)\Dirent.obj" - -@erase "$(INTDIR)\Dirent_Selector.obj" - -@erase "$(INTDIR)\DLL.obj" - -@erase "$(INTDIR)\DLL_Manager.obj" - -@erase "$(INTDIR)\Dump.obj" - -@erase "$(INTDIR)\Dynamic.obj" - -@erase "$(INTDIR)\Dynamic_Service.obj" - -@erase "$(INTDIR)\Dynamic_Service_Base.obj" - -@erase "$(INTDIR)\Event_Handler.obj" - -@erase "$(INTDIR)\Event_Handler_T.obj" - -@erase "$(INTDIR)\FIFO.obj" - -@erase "$(INTDIR)\FIFO_Recv.obj" - -@erase "$(INTDIR)\FIFO_Recv_Msg.obj" - -@erase "$(INTDIR)\FIFO_Send.obj" - -@erase "$(INTDIR)\FIFO_Send_Msg.obj" - -@erase "$(INTDIR)\FILE.obj" - -@erase "$(INTDIR)\FILE_Addr.obj" - -@erase "$(INTDIR)\FILE_Connector.obj" - -@erase "$(INTDIR)\FILE_IO.obj" - -@erase "$(INTDIR)\File_Lock.obj" - -@erase "$(INTDIR)\Filecache.obj" - -@erase "$(INTDIR)\Flag_Manip.obj" - -@erase "$(INTDIR)\Framework_Component.obj" - -@erase "$(INTDIR)\Framework_Component_T.obj" - -@erase "$(INTDIR)\Functor.obj" - -@erase "$(INTDIR)\Get_Opt.obj" - -@erase "$(INTDIR)\Handle_Ops.obj" - -@erase "$(INTDIR)\Handle_Set.obj" - -@erase "$(INTDIR)\Hash_Map_Manager.obj" - -@erase "$(INTDIR)\Hashable.obj" - -@erase "$(INTDIR)\High_Res_Timer.obj" - -@erase "$(INTDIR)\INET_Addr.obj" - -@erase "$(INTDIR)\Init_ACE.obj" - -@erase "$(INTDIR)\IO_Cntl_Msg.obj" - -@erase "$(INTDIR)\IO_SAP.obj" - -@erase "$(INTDIR)\IOStream.obj" - -@erase "$(INTDIR)\IPC_SAP.obj" - -@erase "$(INTDIR)\Lib_Find.obj" - -@erase "$(INTDIR)\Local_Name_Space.obj" - -@erase "$(INTDIR)\Local_Tokens.obj" - -@erase "$(INTDIR)\Log_Msg.obj" - -@erase "$(INTDIR)\Log_Msg_Backend.obj" - -@erase "$(INTDIR)\Log_Msg_Callback.obj" - -@erase "$(INTDIR)\Log_Msg_IPC.obj" - -@erase "$(INTDIR)\Log_Msg_NT_Event_Log.obj" - -@erase "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" - -@erase "$(INTDIR)\Log_Record.obj" - -@erase "$(INTDIR)\Logging_Strategy.obj" - -@erase "$(INTDIR)\LSOCK.obj" - -@erase "$(INTDIR)\LSOCK_Acceptor.obj" - -@erase "$(INTDIR)\LSOCK_CODgram.obj" - -@erase "$(INTDIR)\LSOCK_Connector.obj" - -@erase "$(INTDIR)\LSOCK_Dgram.obj" - -@erase "$(INTDIR)\LSOCK_Stream.obj" - -@erase "$(INTDIR)\Malloc.obj" - -@erase "$(INTDIR)\Malloc_Allocator.obj" - -@erase "$(INTDIR)\Malloc_Instantiations.obj" - -@erase "$(INTDIR)\Map.obj" - -@erase "$(INTDIR)\MEM_Acceptor.obj" - -@erase "$(INTDIR)\MEM_Addr.obj" - -@erase "$(INTDIR)\MEM_Connector.obj" - -@erase "$(INTDIR)\MEM_IO.obj" - -@erase "$(INTDIR)\Mem_Map.obj" - -@erase "$(INTDIR)\MEM_SAP.obj" - -@erase "$(INTDIR)\MEM_Stream.obj" - -@erase "$(INTDIR)\Memory_Pool.obj" - -@erase "$(INTDIR)\Message_Block.obj" - -@erase "$(INTDIR)\Message_Queue.obj" - -@erase "$(INTDIR)\Method_Request.obj" - -@erase "$(INTDIR)\Msg_WFMO_Reactor.obj" - -@erase "$(INTDIR)\Multiplexor.obj" - -@erase "$(INTDIR)\Name_Proxy.obj" - -@erase "$(INTDIR)\Name_Request_Reply.obj" - -@erase "$(INTDIR)\Name_Space.obj" - -@erase "$(INTDIR)\Naming_Context.obj" - -@erase "$(INTDIR)\Notification_Strategy.obj" - -@erase "$(INTDIR)\NT_Service.obj" - -@erase "$(INTDIR)\Obchunk.obj" - -@erase "$(INTDIR)\Object_Manager.obj" - -@erase "$(INTDIR)\Obstack.obj" - -@erase "$(INTDIR)\OS.obj" - -@erase "$(INTDIR)\OS_Dirent.obj" - -@erase "$(INTDIR)\OS_Errno.obj" - -@erase "$(INTDIR)\OS_Log_Msg_Attributes.obj" - -@erase "$(INTDIR)\OS_Memory.obj" - -@erase "$(INTDIR)\OS_QoS.obj" - -@erase "$(INTDIR)\OS_String.obj" - -@erase "$(INTDIR)\OS_Thread_Adapter.obj" - -@erase "$(INTDIR)\OS_TLI.obj" - -@erase "$(INTDIR)\Pair.obj" - -@erase "$(INTDIR)\Parse_Node.obj" - -@erase "$(INTDIR)\PI_Malloc.obj" - -@erase "$(INTDIR)\Pipe.obj" - -@erase "$(INTDIR)\POSIX_Asynch_IO.obj" - -@erase "$(INTDIR)\POSIX_Proactor.obj" - -@erase "$(INTDIR)\Priority_Reactor.obj" - -@erase "$(INTDIR)\Proactor.obj" - -@erase "$(INTDIR)\Process.obj" - -@erase "$(INTDIR)\Process_Manager.obj" - -@erase "$(INTDIR)\Process_Mutex.obj" - -@erase "$(INTDIR)\Process_Semaphore.obj" - -@erase "$(INTDIR)\Profile_Timer.obj" - -@erase "$(INTDIR)\Reactor.obj" - -@erase "$(INTDIR)\Reactor_Notification_Strategy.obj" - -@erase "$(INTDIR)\Read_Buffer.obj" - -@erase "$(INTDIR)\Recyclable.obj" - -@erase "$(INTDIR)\Refcountable.obj" - -@erase "$(INTDIR)\Registry.obj" - -@erase "$(INTDIR)\Registry_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Tokens.obj" - -@erase "$(INTDIR)\RW_Process_Mutex.obj" - -@erase "$(INTDIR)\Sample_History.obj" - -@erase "$(INTDIR)\Sched_Params.obj" - -@erase "$(INTDIR)\Select_Reactor.obj" - -@erase "$(INTDIR)\Select_Reactor_Base.obj" - -@erase "$(INTDIR)\Service_Config.obj" - -@erase "$(INTDIR)\Service_Manager.obj" - -@erase "$(INTDIR)\Service_Object.obj" - -@erase "$(INTDIR)\Service_Repository.obj" - -@erase "$(INTDIR)\Service_Templates.obj" - -@erase "$(INTDIR)\Service_Types.obj" - -@erase "$(INTDIR)\Shared_Memory.obj" - -@erase "$(INTDIR)\Shared_Memory_MM.obj" - -@erase "$(INTDIR)\Shared_Memory_SV.obj" - -@erase "$(INTDIR)\Shared_Object.obj" - -@erase "$(INTDIR)\Signal.obj" - -@erase "$(INTDIR)\SOCK.obj" - -@erase "$(INTDIR)\SOCK_Acceptor.obj" - -@erase "$(INTDIR)\SOCK_CODgram.obj" - -@erase "$(INTDIR)\Sock_Connect.obj" - -@erase "$(INTDIR)\SOCK_Connector.obj" - -@erase "$(INTDIR)\SOCK_Dgram.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Bcast.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Mcast.obj" - -@erase "$(INTDIR)\SOCK_IO.obj" - -@erase "$(INTDIR)\SOCK_Stream.obj" - -@erase "$(INTDIR)\SPIPE.obj" - -@erase "$(INTDIR)\SPIPE_Acceptor.obj" - -@erase "$(INTDIR)\SPIPE_Addr.obj" - -@erase "$(INTDIR)\SPIPE_Connector.obj" - -@erase "$(INTDIR)\SPIPE_Stream.obj" - -@erase "$(INTDIR)\SString.obj" - -@erase "$(INTDIR)\Stats.obj" - -@erase "$(INTDIR)\String_Base_Const.obj" - -@erase "$(INTDIR)\SV_Message.obj" - -@erase "$(INTDIR)\SV_Message_Queue.obj" - -@erase "$(INTDIR)\SV_Semaphore_Complex.obj" - -@erase "$(INTDIR)\SV_Semaphore_Simple.obj" - -@erase "$(INTDIR)\SV_Shared_Memory.obj" - -@erase "$(INTDIR)\Svc_Conf_l.obj" - -@erase "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" - -@erase "$(INTDIR)\Svc_Conf_y.obj" - -@erase "$(INTDIR)\Svc_Handler.obj" - -@erase "$(INTDIR)\Synch.obj" - -@erase "$(INTDIR)\Synch_Options.obj" - -@erase "$(INTDIR)\System_Time.obj" - -@erase "$(INTDIR)\Task.obj" - -@erase "$(INTDIR)\Template_Instantiations.obj" - -@erase "$(INTDIR)\Thread.obj" - -@erase "$(INTDIR)\Thread_Adapter.obj" - -@erase "$(INTDIR)\Thread_Control.obj" - -@erase "$(INTDIR)\Thread_Exit.obj" - -@erase "$(INTDIR)\Thread_Hook.obj" - -@erase "$(INTDIR)\Thread_Manager.obj" - -@erase "$(INTDIR)\Time_Request_Reply.obj" - -@erase "$(INTDIR)\Time_Value.obj" - -@erase "$(INTDIR)\Timeprobe.obj" - -@erase "$(INTDIR)\Timer_Hash.obj" - -@erase "$(INTDIR)\Timer_Heap.obj" - -@erase "$(INTDIR)\Timer_List.obj" - -@erase "$(INTDIR)\Timer_Queue.obj" - -@erase "$(INTDIR)\Timer_Queue_Adapters.obj" - -@erase "$(INTDIR)\Timer_Wheel.obj" - -@erase "$(INTDIR)\TLI.obj" - -@erase "$(INTDIR)\TLI_Acceptor.obj" - -@erase "$(INTDIR)\TLI_Connector.obj" - -@erase "$(INTDIR)\TLI_Stream.obj" - -@erase "$(INTDIR)\Token.obj" - -@erase "$(INTDIR)\Token_Collection.obj" - -@erase "$(INTDIR)\Token_Invariants.obj" - -@erase "$(INTDIR)\Token_Manager.obj" - -@erase "$(INTDIR)\Token_Request_Reply.obj" - -@erase "$(INTDIR)\TP_Reactor.obj" - -@erase "$(INTDIR)\Trace.obj" - -@erase "$(INTDIR)\TTY_IO.obj" - -@erase "$(INTDIR)\Typed_SV_Message.obj" - -@erase "$(INTDIR)\Typed_SV_Message_Queue.obj" - -@erase "$(INTDIR)\UNIX_Addr.obj" - -@erase "$(INTDIR)\UPIPE_Acceptor.obj" - -@erase "$(INTDIR)\UPIPE_Connector.obj" - -@erase "$(INTDIR)\UPIPE_Stream.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\WFMO_Reactor.obj" - -@erase "$(INTDIR)\WIN32_Asynch_IO.obj" - -@erase "$(INTDIR)\WIN32_Proactor.obj" - -@erase "$(INTDIR)\XML_Svc_Conf.obj" - -@erase "$(INTDIR)\XtReactor.obj" - -@erase "$(OUTDIR)\ace.exp" - -@erase "$(OUTDIR)\ace.lib" - -@erase "$(OUTDIR)\ace.pdb" - -@erase "$(OUTDIR)\DLL\Release\ace.map" - -@erase "..\bin\ace.dll" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Wp64 /GX /Zi /O2 /Ob2 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ace.res" /d "NDEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ace.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=advapi32.lib user32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ace.pdb" /map:"$(INTDIR)\ace.map" /debug /machine:IA64 /out:"..\bin\ace.dll" /implib:"$(OUTDIR)\ace.lib" -LINK32_OBJS= \ - "$(INTDIR)\ACE.obj" \ - "$(INTDIR)\Activation_Queue.obj" \ - "$(INTDIR)\Active_Map_Manager.obj" \ - "$(INTDIR)\Addr.obj" \ - "$(INTDIR)\Arg_Shifter.obj" \ - "$(INTDIR)\ARGV.obj" \ - "$(INTDIR)\Argv_Type_Converter.obj" \ - "$(INTDIR)\Asynch_Connector.obj" \ - "$(INTDIR)\Asynch_IO.obj" \ - "$(INTDIR)\Asynch_IO_Impl.obj" \ - "$(INTDIR)\Asynch_Pseudo_Task.obj" \ - "$(INTDIR)\ATM_Acceptor.obj" \ - "$(INTDIR)\ATM_Addr.obj" \ - "$(INTDIR)\ATM_Connector.obj" \ - "$(INTDIR)\ATM_Params.obj" \ - "$(INTDIR)\ATM_QoS.obj" \ - "$(INTDIR)\ATM_Stream.obj" \ - "$(INTDIR)\Base_Thread_Adapter.obj" \ - "$(INTDIR)\Based_Pointer_Repository.obj" \ - "$(INTDIR)\Basic_Stats.obj" \ - "$(INTDIR)\Basic_Types.obj" \ - "$(INTDIR)\Capabilities.obj" \ - "$(INTDIR)\CDR_Base.obj" \ - "$(INTDIR)\CDR_Stream.obj" \ - "$(INTDIR)\Codecs.obj" \ - "$(INTDIR)\Codeset_Registry.obj" - "$(INTDIR)\Codeset_Registry_db.obj" - "$(INTDIR)\Configuration.obj" \ - "$(INTDIR)\Configuration_Import_Export.obj" \ - "$(INTDIR)\Connection_Recycling_Strategy.obj" \ - "$(INTDIR)\Containers.obj" \ - "$(INTDIR)\Copy_Disabled.obj" \ - "$(INTDIR)\Date_Time.obj" \ - "$(INTDIR)\DEV.obj" \ - "$(INTDIR)\DEV_Addr.obj" \ - "$(INTDIR)\DEV_Connector.obj" \ - "$(INTDIR)\DEV_IO.obj" \ - "$(INTDIR)\Dirent.obj" \ - "$(INTDIR)\Dirent_Selector.obj" \ - "$(INTDIR)\DLL.obj" \ - "$(INTDIR)\DLL_Manager.obj" \ - "$(INTDIR)\Dump.obj" \ - "$(INTDIR)\Dynamic.obj" \ - "$(INTDIR)\Dynamic_Service.obj" \ - "$(INTDIR)\Dynamic_Service_Base.obj" \ - "$(INTDIR)\Event_Handler.obj" \ - "$(INTDIR)\Event_Handler_T.obj" \ - "$(INTDIR)\FIFO.obj" \ - "$(INTDIR)\FIFO_Recv.obj" \ - "$(INTDIR)\FIFO_Recv_Msg.obj" \ - "$(INTDIR)\FIFO_Send.obj" \ - "$(INTDIR)\FIFO_Send_Msg.obj" \ - "$(INTDIR)\FILE.obj" \ - "$(INTDIR)\FILE_Addr.obj" \ - "$(INTDIR)\FILE_Connector.obj" \ - "$(INTDIR)\FILE_IO.obj" \ - "$(INTDIR)\File_Lock.obj" \ - "$(INTDIR)\Filecache.obj" \ - "$(INTDIR)\Flag_Manip.obj" \ - "$(INTDIR)\Framework_Component.obj" \ - "$(INTDIR)\Functor.obj" \ - "$(INTDIR)\Get_Opt.obj" \ - "$(INTDIR)\Handle_Ops.obj" \ - "$(INTDIR)\Handle_Set.obj" \ - "$(INTDIR)\Hash_Map_Manager.obj" \ - "$(INTDIR)\Hashable.obj" \ - "$(INTDIR)\High_Res_Timer.obj" \ - "$(INTDIR)\INET_Addr.obj" \ - "$(INTDIR)\Init_ACE.obj" \ - "$(INTDIR)\IO_Cntl_Msg.obj" \ - "$(INTDIR)\IO_SAP.obj" \ - "$(INTDIR)\IOStream.obj" \ - "$(INTDIR)\IPC_SAP.obj" \ - "$(INTDIR)\Lib_Find.obj" \ - "$(INTDIR)\Local_Name_Space.obj" \ - "$(INTDIR)\Local_Tokens.obj" \ - "$(INTDIR)\Log_Msg.obj" \ - "$(INTDIR)\Log_Msg_Backend.obj" \ - "$(INTDIR)\Log_Msg_Callback.obj" \ - "$(INTDIR)\Log_Msg_IPC.obj" \ - "$(INTDIR)\Log_Msg_NT_Event_Log.obj" \ - "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" \ - "$(INTDIR)\Log_Record.obj" \ - "$(INTDIR)\Logging_Strategy.obj" \ - "$(INTDIR)\LSOCK.obj" \ - "$(INTDIR)\LSOCK_Acceptor.obj" \ - "$(INTDIR)\LSOCK_CODgram.obj" \ - "$(INTDIR)\LSOCK_Connector.obj" \ - "$(INTDIR)\LSOCK_Dgram.obj" \ - "$(INTDIR)\LSOCK_Stream.obj" \ - "$(INTDIR)\Malloc.obj" \ - "$(INTDIR)\Malloc_Allocator.obj" \ - "$(INTDIR)\Malloc_Instantiations.obj" \ - "$(INTDIR)\Map.obj" \ - "$(INTDIR)\MEM_Acceptor.obj" \ - "$(INTDIR)\MEM_Addr.obj" \ - "$(INTDIR)\MEM_Connector.obj" \ - "$(INTDIR)\MEM_IO.obj" \ - "$(INTDIR)\Mem_Map.obj" \ - "$(INTDIR)\MEM_SAP.obj" \ - "$(INTDIR)\MEM_Stream.obj" \ - "$(INTDIR)\Memory_Pool.obj" \ - "$(INTDIR)\Message_Block.obj" \ - "$(INTDIR)\Message_Queue.obj" \ - "$(INTDIR)\Method_Request.obj" \ - "$(INTDIR)\Msg_WFMO_Reactor.obj" \ - "$(INTDIR)\Multiplexor.obj" \ - "$(INTDIR)\Name_Proxy.obj" \ - "$(INTDIR)\Name_Request_Reply.obj" \ - "$(INTDIR)\Name_Space.obj" \ - "$(INTDIR)\Naming_Context.obj" \ - "$(INTDIR)\Notification_Strategy.obj" \ - "$(INTDIR)\NT_Service.obj" \ - "$(INTDIR)\Obchunk.obj" \ - "$(INTDIR)\Object_Manager.obj" \ - "$(INTDIR)\Obstack.obj" \ - "$(INTDIR)\OS.obj" \ - "$(INTDIR)\OS_Dirent.obj" \ - "$(INTDIR)\OS_Errno.obj" \ - "$(INTDIR)\OS_Log_Msg_Attributes.obj" \ - "$(INTDIR)\OS_Memory.obj" \ - "$(INTDIR)\OS_QoS.obj" \ - "$(INTDIR)\OS_String.obj" \ - "$(INTDIR)\OS_Thread_Adapter.obj" \ - "$(INTDIR)\OS_TLI.obj" \ - "$(INTDIR)\Pair.obj" \ - "$(INTDIR)\Parse_Node.obj" \ - "$(INTDIR)\PI_Malloc.obj" \ - "$(INTDIR)\Pipe.obj" \ - "$(INTDIR)\POSIX_Asynch_IO.obj" \ - "$(INTDIR)\POSIX_Proactor.obj" \ - "$(INTDIR)\Priority_Reactor.obj" \ - "$(INTDIR)\Proactor.obj" \ - "$(INTDIR)\Process.obj" \ - "$(INTDIR)\Process_Manager.obj" \ - "$(INTDIR)\Process_Mutex.obj" \ - "$(INTDIR)\Process_Semaphore.obj" \ - "$(INTDIR)\Profile_Timer.obj" \ - "$(INTDIR)\Reactor.obj" \ - "$(INTDIR)\Reactor_Notification_Strategy.obj" \ - "$(INTDIR)\Read_Buffer.obj" \ - "$(INTDIR)\Recyclable.obj" \ - "$(INTDIR)\Refcountable.obj" \ - "$(INTDIR)\Registry.obj" \ - "$(INTDIR)\Registry_Name_Space.obj" \ - "$(INTDIR)\Remote_Name_Space.obj" \ - "$(INTDIR)\Remote_Tokens.obj" \ - "$(INTDIR)\RW_Process_Mutex.obj" \ - "$(INTDIR)\Sample_History.obj" \ - "$(INTDIR)\Sched_Params.obj" \ - "$(INTDIR)\Select_Reactor.obj" \ - "$(INTDIR)\Select_Reactor_Base.obj" \ - "$(INTDIR)\Service_Config.obj" \ - "$(INTDIR)\Service_Manager.obj" \ - "$(INTDIR)\Service_Object.obj" \ - "$(INTDIR)\Service_Repository.obj" \ - "$(INTDIR)\Service_Templates.obj" \ - "$(INTDIR)\Service_Types.obj" \ - "$(INTDIR)\Shared_Memory.obj" \ - "$(INTDIR)\Shared_Memory_MM.obj" \ - "$(INTDIR)\Shared_Memory_SV.obj" \ - "$(INTDIR)\Shared_Object.obj" \ - "$(INTDIR)\Signal.obj" \ - "$(INTDIR)\SOCK.obj" \ - "$(INTDIR)\SOCK_Acceptor.obj" \ - "$(INTDIR)\SOCK_CODgram.obj" \ - "$(INTDIR)\Sock_Connect.obj" \ - "$(INTDIR)\SOCK_Connector.obj" \ - "$(INTDIR)\SOCK_Dgram.obj" \ - "$(INTDIR)\SOCK_Dgram_Bcast.obj" \ - "$(INTDIR)\SOCK_Dgram_Mcast.obj" \ - "$(INTDIR)\SOCK_IO.obj" \ - "$(INTDIR)\SOCK_Stream.obj" \ - "$(INTDIR)\SPIPE.obj" \ - "$(INTDIR)\SPIPE_Acceptor.obj" \ - "$(INTDIR)\SPIPE_Addr.obj" \ - "$(INTDIR)\SPIPE_Connector.obj" \ - "$(INTDIR)\SPIPE_Stream.obj" \ - "$(INTDIR)\SString.obj" \ - "$(INTDIR)\Stats.obj" \ - "$(INTDIR)\String_Base_Const.obj" \ - "$(INTDIR)\SV_Message.obj" \ - "$(INTDIR)\SV_Message_Queue.obj" \ - "$(INTDIR)\SV_Semaphore_Complex.obj" \ - "$(INTDIR)\SV_Semaphore_Simple.obj" \ - "$(INTDIR)\SV_Shared_Memory.obj" \ - "$(INTDIR)\Svc_Conf_l.obj" \ - "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" \ - "$(INTDIR)\Svc_Conf_y.obj" \ - "$(INTDIR)\Svc_Handler.obj" \ - "$(INTDIR)\Synch.obj" \ - "$(INTDIR)\Synch_Options.obj" \ - "$(INTDIR)\System_Time.obj" \ - "$(INTDIR)\Task.obj" \ - "$(INTDIR)\Template_Instantiations.obj" \ - "$(INTDIR)\Thread.obj" \ - "$(INTDIR)\Thread_Adapter.obj" \ - "$(INTDIR)\Thread_Control.obj" \ - "$(INTDIR)\Thread_Exit.obj" \ - "$(INTDIR)\Thread_Hook.obj" \ - "$(INTDIR)\Thread_Manager.obj" \ - "$(INTDIR)\Time_Request_Reply.obj" \ - "$(INTDIR)\Time_Value.obj" \ - "$(INTDIR)\Timeprobe.obj" \ - "$(INTDIR)\Timer_Hash.obj" \ - "$(INTDIR)\Timer_Heap.obj" \ - "$(INTDIR)\Timer_List.obj" \ - "$(INTDIR)\Timer_Queue.obj" \ - "$(INTDIR)\Timer_Queue_Adapters.obj" \ - "$(INTDIR)\Timer_Wheel.obj" \ - "$(INTDIR)\TLI.obj" \ - "$(INTDIR)\TLI_Acceptor.obj" \ - "$(INTDIR)\TLI_Connector.obj" \ - "$(INTDIR)\TLI_Stream.obj" \ - "$(INTDIR)\Token.obj" \ - "$(INTDIR)\Token_Collection.obj" \ - "$(INTDIR)\Token_Invariants.obj" \ - "$(INTDIR)\Token_Manager.obj" \ - "$(INTDIR)\Token_Request_Reply.obj" \ - "$(INTDIR)\TP_Reactor.obj" \ - "$(INTDIR)\Trace.obj" \ - "$(INTDIR)\TTY_IO.obj" \ - "$(INTDIR)\Typed_SV_Message.obj" \ - "$(INTDIR)\Typed_SV_Message_Queue.obj" \ - "$(INTDIR)\UNIX_Addr.obj" \ - "$(INTDIR)\UPIPE_Acceptor.obj" \ - "$(INTDIR)\UPIPE_Connector.obj" \ - "$(INTDIR)\UPIPE_Stream.obj" \ - "$(INTDIR)\WFMO_Reactor.obj" \ - "$(INTDIR)\WIN32_Asynch_IO.obj" \ - "$(INTDIR)\WIN32_Proactor.obj" \ - "$(INTDIR)\XML_Svc_Conf.obj" \ - "$(INTDIR)\XtReactor.obj" \ - "$(INTDIR)\Atomic_Op.obj" \ - "$(INTDIR)\Framework_Component_T.obj" \ - "$(INTDIR)\ace.res" - -"..\bin\ace.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "ACE DLL - Win64 Debug" - -OUTDIR=. -INTDIR=.\DLL\Debug - -ALL : "..\bin\aced.dll" - - -CLEAN : - -@erase "$(INTDIR)\ACE.obj" - -@erase "$(INTDIR)\ace.res" - -@erase "$(INTDIR)\Activation_Queue.obj" - -@erase "$(INTDIR)\Active_Map_Manager.obj" - -@erase "$(INTDIR)\Addr.obj" - -@erase "$(INTDIR)\Arg_Shifter.obj" - -@erase "$(INTDIR)\ARGV.obj" - -@erase "$(INTDIR)\Argv_Type_Converter.obj" - -@erase "$(INTDIR)\Asynch_Connector.obj" - -@erase "$(INTDIR)\Asynch_IO.obj" - -@erase "$(INTDIR)\Asynch_IO_Impl.obj" - -@erase "$(INTDIR)\Asynch_Pseudo_Task.obj" - -@erase "$(INTDIR)\Atomic_Op.obj" - -@erase "$(INTDIR)\ATM_Acceptor.obj" - -@erase "$(INTDIR)\ATM_Addr.obj" - -@erase "$(INTDIR)\ATM_Connector.obj" - -@erase "$(INTDIR)\ATM_Params.obj" - -@erase "$(INTDIR)\ATM_QoS.obj" - -@erase "$(INTDIR)\ATM_Stream.obj" - -@erase "$(INTDIR)\Base_Thread_Adapter.obj" - -@erase "$(INTDIR)\Based_Pointer_Repository.obj" - -@erase "$(INTDIR)\Basic_Stats.obj" - -@erase "$(INTDIR)\Basic_Types.obj" - -@erase "$(INTDIR)\Capabilities.obj" - -@erase "$(INTDIR)\CDR_Base.obj" - -@erase "$(INTDIR)\CDR_Stream.obj" - -@erase "$(INTDIR)\Codecs.obj" - -@erase "$(INTDIR)\Codeset_Registry.obj" - -@erase "$(INTDIR)\Codeset_Registry_db.obj" - -@erase "$(INTDIR)\Configuration.obj" - -@erase "$(INTDIR)\Configuration_Import_Export.obj" - -@erase "$(INTDIR)\Connection_Recycling_Strategy.obj" - -@erase "$(INTDIR)\Containers.obj" - -@erase "$(INTDIR)\Copy_Disabled.obj" - -@erase "$(INTDIR)\Date_Time.obj" - -@erase "$(INTDIR)\DEV.obj" - -@erase "$(INTDIR)\DEV_Addr.obj" - -@erase "$(INTDIR)\DEV_Connector.obj" - -@erase "$(INTDIR)\DEV_IO.obj" - -@erase "$(INTDIR)\Dirent.obj" - -@erase "$(INTDIR)\Dirent_Selector.obj" - -@erase "$(INTDIR)\DLL.obj" - -@erase "$(INTDIR)\DLL_Manager.obj" - -@erase "$(INTDIR)\Dump.obj" - -@erase "$(INTDIR)\Dynamic.obj" - -@erase "$(INTDIR)\Dynamic_Service.obj" - -@erase "$(INTDIR)\Dynamic_Service_Base.obj" - -@erase "$(INTDIR)\Event_Handler.obj" - -@erase "$(INTDIR)\Event_Handler_T.obj" - -@erase "$(INTDIR)\FIFO.obj" - -@erase "$(INTDIR)\FIFO_Recv.obj" - -@erase "$(INTDIR)\FIFO_Recv_Msg.obj" - -@erase "$(INTDIR)\FIFO_Send.obj" - -@erase "$(INTDIR)\FIFO_Send_Msg.obj" - -@erase "$(INTDIR)\FILE.obj" - -@erase "$(INTDIR)\FILE_Addr.obj" - -@erase "$(INTDIR)\FILE_Connector.obj" - -@erase "$(INTDIR)\FILE_IO.obj" - -@erase "$(INTDIR)\File_Lock.obj" - -@erase "$(INTDIR)\Filecache.obj" - -@erase "$(INTDIR)\Flag_Manip.obj" - -@erase "$(INTDIR)\Framework_Component.obj" - -@erase "$(INTDIR)\Functor.obj" - -@erase "$(INTDIR)\Get_Opt.obj" - -@erase "$(INTDIR)\Handle_Ops.obj" - -@erase "$(INTDIR)\Handle_Set.obj" - -@erase "$(INTDIR)\Hash_Map_Manager.obj" - -@erase "$(INTDIR)\Hashable.obj" - -@erase "$(INTDIR)\High_Res_Timer.obj" - -@erase "$(INTDIR)\INET_Addr.obj" - -@erase "$(INTDIR)\Init_ACE.obj" - -@erase "$(INTDIR)\IO_Cntl_Msg.obj" - -@erase "$(INTDIR)\IO_SAP.obj" - -@erase "$(INTDIR)\IOStream.obj" - -@erase "$(INTDIR)\IPC_SAP.obj" - -@erase "$(INTDIR)\Lib_Find.obj" - -@erase "$(INTDIR)\Local_Name_Space.obj" - -@erase "$(INTDIR)\Local_Tokens.obj" - -@erase "$(INTDIR)\Log_Msg.obj" - -@erase "$(INTDIR)\Log_Msg_Backend.obj" - -@erase "$(INTDIR)\Log_Msg_Callback.obj" - -@erase "$(INTDIR)\Log_Msg_IPC.obj" - -@erase "$(INTDIR)\Log_Msg_NT_Event_Log.obj" - -@erase "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" - -@erase "$(INTDIR)\Log_Record.obj" - -@erase "$(INTDIR)\Logging_Strategy.obj" - -@erase "$(INTDIR)\LSOCK.obj" - -@erase "$(INTDIR)\LSOCK_Acceptor.obj" - -@erase "$(INTDIR)\LSOCK_CODgram.obj" - -@erase "$(INTDIR)\LSOCK_Connector.obj" - -@erase "$(INTDIR)\LSOCK_Dgram.obj" - -@erase "$(INTDIR)\LSOCK_Stream.obj" - -@erase "$(INTDIR)\Malloc.obj" - -@erase "$(INTDIR)\Malloc_Allocator.obj" - -@erase "$(INTDIR)\Malloc_Instantiations.obj" - -@erase "$(INTDIR)\Map.obj" - -@erase "$(INTDIR)\MEM_Acceptor.obj" - -@erase "$(INTDIR)\MEM_Addr.obj" - -@erase "$(INTDIR)\MEM_Connector.obj" - -@erase "$(INTDIR)\MEM_IO.obj" - -@erase "$(INTDIR)\Mem_Map.obj" - -@erase "$(INTDIR)\MEM_SAP.obj" - -@erase "$(INTDIR)\MEM_Stream.obj" - -@erase "$(INTDIR)\Memory_Pool.obj" - -@erase "$(INTDIR)\Message_Block.obj" - -@erase "$(INTDIR)\Message_Queue.obj" - -@erase "$(INTDIR)\Method_Request.obj" - -@erase "$(INTDIR)\Msg_WFMO_Reactor.obj" - -@erase "$(INTDIR)\Multiplexor.obj" - -@erase "$(INTDIR)\Name_Proxy.obj" - -@erase "$(INTDIR)\Name_Request_Reply.obj" - -@erase "$(INTDIR)\Name_Space.obj" - -@erase "$(INTDIR)\Naming_Context.obj" - -@erase "$(INTDIR)\Notification_Strategy.obj" - -@erase "$(INTDIR)\NT_Service.obj" - -@erase "$(INTDIR)\Obchunk.obj" - -@erase "$(INTDIR)\Object_Manager.obj" - -@erase "$(INTDIR)\Obstack.obj" - -@erase "$(INTDIR)\OS.obj" - -@erase "$(INTDIR)\OS_Dirent.obj" - -@erase "$(INTDIR)\OS_Errno.obj" - -@erase "$(INTDIR)\OS_Log_Msg_Attributes.obj" - -@erase "$(INTDIR)\OS_Memory.obj" - -@erase "$(INTDIR)\OS_QoS.obj" - -@erase "$(INTDIR)\OS_String.obj" - -@erase "$(INTDIR)\OS_Thread_Adapter.obj" - -@erase "$(INTDIR)\OS_TLI.obj" - -@erase "$(INTDIR)\Pair.obj" - -@erase "$(INTDIR)\Parse_Node.obj" - -@erase "$(INTDIR)\PI_Malloc.obj" - -@erase "$(INTDIR)\Pipe.obj" - -@erase "$(INTDIR)\POSIX_Asynch_IO.obj" - -@erase "$(INTDIR)\POSIX_Proactor.obj" - -@erase "$(INTDIR)\Priority_Reactor.obj" - -@erase "$(INTDIR)\Proactor.obj" - -@erase "$(INTDIR)\Process.obj" - -@erase "$(INTDIR)\Process_Manager.obj" - -@erase "$(INTDIR)\Process_Mutex.obj" - -@erase "$(INTDIR)\Process_Semaphore.obj" - -@erase "$(INTDIR)\Profile_Timer.obj" - -@erase "$(INTDIR)\Reactor.obj" - -@erase "$(INTDIR)\Reactor_Notification_Strategy.obj" - -@erase "$(INTDIR)\Read_Buffer.obj" - -@erase "$(INTDIR)\Recyclable.obj" - -@erase "$(INTDIR)\Refcountable.obj" - -@erase "$(INTDIR)\Registry.obj" - -@erase "$(INTDIR)\Registry_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Tokens.obj" - -@erase "$(INTDIR)\RW_Process_Mutex.obj" - -@erase "$(INTDIR)\Sample_History.obj" - -@erase "$(INTDIR)\Sched_Params.obj" - -@erase "$(INTDIR)\Select_Reactor.obj" - -@erase "$(INTDIR)\Select_Reactor_Base.obj" - -@erase "$(INTDIR)\Service_Config.obj" - -@erase "$(INTDIR)\Service_Manager.obj" - -@erase "$(INTDIR)\Service_Object.obj" - -@erase "$(INTDIR)\Service_Repository.obj" - -@erase "$(INTDIR)\Service_Templates.obj" - -@erase "$(INTDIR)\Service_Types.obj" - -@erase "$(INTDIR)\Shared_Memory.obj" - -@erase "$(INTDIR)\Shared_Memory_MM.obj" - -@erase "$(INTDIR)\Shared_Memory_SV.obj" - -@erase "$(INTDIR)\Shared_Object.obj" - -@erase "$(INTDIR)\Signal.obj" - -@erase "$(INTDIR)\SOCK.obj" - -@erase "$(INTDIR)\SOCK_Acceptor.obj" - -@erase "$(INTDIR)\SOCK_CODgram.obj" - -@erase "$(INTDIR)\Sock_Connect.obj" - -@erase "$(INTDIR)\SOCK_Connector.obj" - -@erase "$(INTDIR)\SOCK_Dgram.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Bcast.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Mcast.obj" - -@erase "$(INTDIR)\SOCK_IO.obj" - -@erase "$(INTDIR)\SOCK_Stream.obj" - -@erase "$(INTDIR)\SPIPE.obj" - -@erase "$(INTDIR)\SPIPE_Acceptor.obj" - -@erase "$(INTDIR)\SPIPE_Addr.obj" - -@erase "$(INTDIR)\SPIPE_Connector.obj" - -@erase "$(INTDIR)\SPIPE_Stream.obj" - -@erase "$(INTDIR)\SString.obj" - -@erase "$(INTDIR)\Stats.obj" - -@erase "$(INTDIR)\String_Base_Const.obj" - -@erase "$(INTDIR)\SV_Message.obj" - -@erase "$(INTDIR)\SV_Message_Queue.obj" - -@erase "$(INTDIR)\SV_Semaphore_Complex.obj" - -@erase "$(INTDIR)\SV_Semaphore_Simple.obj" - -@erase "$(INTDIR)\SV_Shared_Memory.obj" - -@erase "$(INTDIR)\Svc_Conf_l.obj" - -@erase "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" - -@erase "$(INTDIR)\Svc_Conf_y.obj" - -@erase "$(INTDIR)\Svc_Handler.obj" - -@erase "$(INTDIR)\Synch.obj" - -@erase "$(INTDIR)\Synch_Options.obj" - -@erase "$(INTDIR)\System_Time.obj" - -@erase "$(INTDIR)\Task.obj" - -@erase "$(INTDIR)\Template_Instantiations.obj" - -@erase "$(INTDIR)\Thread.obj" - -@erase "$(INTDIR)\Thread_Adapter.obj" - -@erase "$(INTDIR)\Thread_Control.obj" - -@erase "$(INTDIR)\Thread_Exit.obj" - -@erase "$(INTDIR)\Thread_Hook.obj" - -@erase "$(INTDIR)\Thread_Manager.obj" - -@erase "$(INTDIR)\Time_Request_Reply.obj" - -@erase "$(INTDIR)\Time_Value.obj" - -@erase "$(INTDIR)\Timeprobe.obj" - -@erase "$(INTDIR)\Timer_Hash.obj" - -@erase "$(INTDIR)\Timer_Heap.obj" - -@erase "$(INTDIR)\Timer_List.obj" - -@erase "$(INTDIR)\Timer_Queue.obj" - -@erase "$(INTDIR)\Timer_Queue_Adapters.obj" - -@erase "$(INTDIR)\Timer_Wheel.obj" - -@erase "$(INTDIR)\TLI.obj" - -@erase "$(INTDIR)\TLI_Acceptor.obj" - -@erase "$(INTDIR)\TLI_Connector.obj" - -@erase "$(INTDIR)\TLI_Stream.obj" - -@erase "$(INTDIR)\Token.obj" - -@erase "$(INTDIR)\Token_Collection.obj" - -@erase "$(INTDIR)\Token_Invariants.obj" - -@erase "$(INTDIR)\Token_Manager.obj" - -@erase "$(INTDIR)\Token_Request_Reply.obj" - -@erase "$(INTDIR)\TP_Reactor.obj" - -@erase "$(INTDIR)\Trace.obj" - -@erase "$(INTDIR)\TTY_IO.obj" - -@erase "$(INTDIR)\Typed_SV_Message.obj" - -@erase "$(INTDIR)\Typed_SV_Message_Queue.obj" - -@erase "$(INTDIR)\UNIX_Addr.obj" - -@erase "$(INTDIR)\UPIPE_Acceptor.obj" - -@erase "$(INTDIR)\UPIPE_Connector.obj" - -@erase "$(INTDIR)\UPIPE_Stream.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\WFMO_Reactor.obj" - -@erase "$(INTDIR)\WIN32_Asynch_IO.obj" - -@erase "$(INTDIR)\WIN32_Proactor.obj" - -@erase "$(INTDIR)\XML_Svc_Conf.obj" - -@erase "$(INTDIR)\XtReactor.obj" - -@erase "$(OUTDIR)\aced.exp" - -@erase "$(OUTDIR)\aced.lib" - -@erase "$(OUTDIR)\aced.pdb" - -@erase "..\bin\aced.dll" - -@erase "..\bin\aced.ilk" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Wp64 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ace.res" /d "_DEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ace.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=advapi32.lib user32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\aced.pdb" /debug /machine:IA64 /out:"..\bin\aced.dll" /implib:"$(OUTDIR)\aced.lib" -LINK32_OBJS= \ - "$(INTDIR)\ACE.obj" \ - "$(INTDIR)\Activation_Queue.obj" \ - "$(INTDIR)\Active_Map_Manager.obj" \ - "$(INTDIR)\Addr.obj" \ - "$(INTDIR)\Arg_Shifter.obj" \ - "$(INTDIR)\ARGV.obj" \ - "$(INTDIR)\Argv_Type_Converter.obj" \ - "$(INTDIR)\Asynch_Connector.obj" \ - "$(INTDIR)\Asynch_IO.obj" \ - "$(INTDIR)\Asynch_IO_Impl.obj" \ - "$(INTDIR)\Asynch_Pseudo_Task.obj" \ - "$(INTDIR)\Atomic_Op.obj" \ - "$(INTDIR)\ATM_Acceptor.obj" \ - "$(INTDIR)\ATM_Addr.obj" \ - "$(INTDIR)\ATM_Connector.obj" \ - "$(INTDIR)\ATM_Params.obj" \ - "$(INTDIR)\ATM_QoS.obj" \ - "$(INTDIR)\ATM_Stream.obj" \ - "$(INTDIR)\Base_Thread_Adapter.obj" \ - "$(INTDIR)\Based_Pointer_Repository.obj" \ - "$(INTDIR)\Basic_Stats.obj" \ - "$(INTDIR)\Basic_Types.obj" \ - "$(INTDIR)\Capabilities.obj" \ - "$(INTDIR)\CDR_Base.obj" \ - "$(INTDIR)\CDR_Stream.obj" \ - "$(INTDIR)\Codecs.obj" \ - "$(INTDIR)\Codeset_Registry.obj" - "$(INTDIR)\Codeset_Registry_db.obj" - "$(INTDIR)\Configuration.obj" \ - "$(INTDIR)\Configuration_Import_Export.obj" \ - "$(INTDIR)\Connection_Recycling_Strategy.obj" \ - "$(INTDIR)\Containers.obj" \ - "$(INTDIR)\Copy_Disabled.obj" \ - "$(INTDIR)\Date_Time.obj" \ - "$(INTDIR)\DEV.obj" \ - "$(INTDIR)\DEV_Addr.obj" \ - "$(INTDIR)\DEV_Connector.obj" \ - "$(INTDIR)\DEV_IO.obj" \ - "$(INTDIR)\Dirent.obj" \ - "$(INTDIR)\Dirent_Selector.obj" \ - "$(INTDIR)\DLL.obj" \ - "$(INTDIR)\DLL_Manager.obj" \ - "$(INTDIR)\Dump.obj" \ - "$(INTDIR)\Dynamic.obj" \ - "$(INTDIR)\Dynamic_Service.obj" \ - "$(INTDIR)\Dynamic_Service_Base.obj" \ - "$(INTDIR)\Event_Handler.obj" \ - "$(INTDIR)\Event_Handler_T.obj" \ - "$(INTDIR)\FIFO.obj" \ - "$(INTDIR)\FIFO_Recv.obj" \ - "$(INTDIR)\FIFO_Recv_Msg.obj" \ - "$(INTDIR)\FIFO_Send.obj" \ - "$(INTDIR)\FIFO_Send_Msg.obj" \ - "$(INTDIR)\FILE.obj" \ - "$(INTDIR)\FILE_Addr.obj" \ - "$(INTDIR)\FILE_Connector.obj" \ - "$(INTDIR)\FILE_IO.obj" \ - "$(INTDIR)\File_Lock.obj" \ - "$(INTDIR)\Filecache.obj" \ - "$(INTDIR)\Flag_Manip.obj" \ - "$(INTDIR)\Framework_Component.obj" \ - "$(INTDIR)\Functor.obj" \ - "$(INTDIR)\Get_Opt.obj" \ - "$(INTDIR)\Handle_Ops.obj" \ - "$(INTDIR)\Handle_Set.obj" \ - "$(INTDIR)\Hash_Map_Manager.obj" \ - "$(INTDIR)\Hashable.obj" \ - "$(INTDIR)\High_Res_Timer.obj" \ - "$(INTDIR)\INET_Addr.obj" \ - "$(INTDIR)\Init_ACE.obj" \ - "$(INTDIR)\IO_Cntl_Msg.obj" \ - "$(INTDIR)\IO_SAP.obj" \ - "$(INTDIR)\IOStream.obj" \ - "$(INTDIR)\IPC_SAP.obj" \ - "$(INTDIR)\Lib_Find.obj" \ - "$(INTDIR)\Local_Name_Space.obj" \ - "$(INTDIR)\Local_Tokens.obj" \ - "$(INTDIR)\Log_Msg.obj" \ - "$(INTDIR)\Log_Msg_Backend.obj" \ - "$(INTDIR)\Log_Msg_Callback.obj" \ - "$(INTDIR)\Log_Msg_IPC.obj" \ - "$(INTDIR)\Log_Msg_NT_Event_Log.obj" \ - "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" \ - "$(INTDIR)\Log_Record.obj" \ - "$(INTDIR)\Logging_Strategy.obj" \ - "$(INTDIR)\LSOCK.obj" \ - "$(INTDIR)\LSOCK_Acceptor.obj" \ - "$(INTDIR)\LSOCK_CODgram.obj" \ - "$(INTDIR)\LSOCK_Connector.obj" \ - "$(INTDIR)\LSOCK_Dgram.obj" \ - "$(INTDIR)\LSOCK_Stream.obj" \ - "$(INTDIR)\Malloc.obj" \ - "$(INTDIR)\Malloc_Allocator.obj" \ - "$(INTDIR)\Malloc_Instantiations.obj" \ - "$(INTDIR)\Map.obj" \ - "$(INTDIR)\MEM_Acceptor.obj" \ - "$(INTDIR)\MEM_Addr.obj" \ - "$(INTDIR)\MEM_Connector.obj" \ - "$(INTDIR)\MEM_IO.obj" \ - "$(INTDIR)\Mem_Map.obj" \ - "$(INTDIR)\MEM_SAP.obj" \ - "$(INTDIR)\MEM_Stream.obj" \ - "$(INTDIR)\Memory_Pool.obj" \ - "$(INTDIR)\Message_Block.obj" \ - "$(INTDIR)\Message_Queue.obj" \ - "$(INTDIR)\Method_Request.obj" \ - "$(INTDIR)\Msg_WFMO_Reactor.obj" \ - "$(INTDIR)\Multiplexor.obj" \ - "$(INTDIR)\Name_Proxy.obj" \ - "$(INTDIR)\Name_Request_Reply.obj" \ - "$(INTDIR)\Name_Space.obj" \ - "$(INTDIR)\Naming_Context.obj" \ - "$(INTDIR)\Notification_Strategy.obj" \ - "$(INTDIR)\NT_Service.obj" \ - "$(INTDIR)\Obchunk.obj" \ - "$(INTDIR)\Object_Manager.obj" \ - "$(INTDIR)\Obstack.obj" \ - "$(INTDIR)\OS.obj" \ - "$(INTDIR)\OS_Dirent.obj" \ - "$(INTDIR)\OS_Errno.obj" \ - "$(INTDIR)\OS_Log_Msg_Attributes.obj" \ - "$(INTDIR)\OS_Memory.obj" \ - "$(INTDIR)\OS_QoS.obj" \ - "$(INTDIR)\OS_String.obj" \ - "$(INTDIR)\OS_Thread_Adapter.obj" \ - "$(INTDIR)\OS_TLI.obj" \ - "$(INTDIR)\Pair.obj" \ - "$(INTDIR)\Parse_Node.obj" \ - "$(INTDIR)\PI_Malloc.obj" \ - "$(INTDIR)\Pipe.obj" \ - "$(INTDIR)\POSIX_Asynch_IO.obj" \ - "$(INTDIR)\POSIX_Proactor.obj" \ - "$(INTDIR)\Priority_Reactor.obj" \ - "$(INTDIR)\Proactor.obj" \ - "$(INTDIR)\Process.obj" \ - "$(INTDIR)\Process_Manager.obj" \ - "$(INTDIR)\Process_Mutex.obj" \ - "$(INTDIR)\Process_Semaphore.obj" \ - "$(INTDIR)\Profile_Timer.obj" \ - "$(INTDIR)\Reactor.obj" \ - "$(INTDIR)\Reactor_Notification_Strategy.obj" \ - "$(INTDIR)\Read_Buffer.obj" \ - "$(INTDIR)\Recyclable.obj" \ - "$(INTDIR)\Refcountable.obj" \ - "$(INTDIR)\Registry.obj" \ - "$(INTDIR)\Registry_Name_Space.obj" \ - "$(INTDIR)\Remote_Name_Space.obj" \ - "$(INTDIR)\Remote_Tokens.obj" \ - "$(INTDIR)\RW_Process_Mutex.obj" \ - "$(INTDIR)\Sample_History.obj" \ - "$(INTDIR)\Sched_Params.obj" \ - "$(INTDIR)\Select_Reactor.obj" \ - "$(INTDIR)\Select_Reactor_Base.obj" \ - "$(INTDIR)\Service_Config.obj" \ - "$(INTDIR)\Service_Manager.obj" \ - "$(INTDIR)\Service_Object.obj" \ - "$(INTDIR)\Service_Repository.obj" \ - "$(INTDIR)\Service_Templates.obj" \ - "$(INTDIR)\Service_Types.obj" \ - "$(INTDIR)\Shared_Memory.obj" \ - "$(INTDIR)\Shared_Memory_MM.obj" \ - "$(INTDIR)\Shared_Memory_SV.obj" \ - "$(INTDIR)\Shared_Object.obj" \ - "$(INTDIR)\Signal.obj" \ - "$(INTDIR)\SOCK.obj" \ - "$(INTDIR)\SOCK_Acceptor.obj" \ - "$(INTDIR)\SOCK_CODgram.obj" \ - "$(INTDIR)\Sock_Connect.obj" \ - "$(INTDIR)\SOCK_Connector.obj" \ - "$(INTDIR)\SOCK_Dgram.obj" \ - "$(INTDIR)\SOCK_Dgram_Bcast.obj" \ - "$(INTDIR)\SOCK_Dgram_Mcast.obj" \ - "$(INTDIR)\SOCK_IO.obj" \ - "$(INTDIR)\SOCK_Stream.obj" \ - "$(INTDIR)\SPIPE.obj" \ - "$(INTDIR)\SPIPE_Acceptor.obj" \ - "$(INTDIR)\SPIPE_Addr.obj" \ - "$(INTDIR)\SPIPE_Connector.obj" \ - "$(INTDIR)\SPIPE_Stream.obj" \ - "$(INTDIR)\SString.obj" \ - "$(INTDIR)\Stats.obj" \ - "$(INTDIR)\String_Base_Const.obj" \ - "$(INTDIR)\SV_Message.obj" \ - "$(INTDIR)\SV_Message_Queue.obj" \ - "$(INTDIR)\SV_Semaphore_Complex.obj" \ - "$(INTDIR)\SV_Semaphore_Simple.obj" \ - "$(INTDIR)\SV_Shared_Memory.obj" \ - "$(INTDIR)\Svc_Conf_l.obj" \ - "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" \ - "$(INTDIR)\Svc_Conf_y.obj" \ - "$(INTDIR)\Svc_Handler.obj" \ - "$(INTDIR)\Synch.obj" \ - "$(INTDIR)\Synch_Options.obj" \ - "$(INTDIR)\System_Time.obj" \ - "$(INTDIR)\Task.obj" \ - "$(INTDIR)\Template_Instantiations.obj" \ - "$(INTDIR)\Thread.obj" \ - "$(INTDIR)\Thread_Adapter.obj" \ - "$(INTDIR)\Thread_Control.obj" \ - "$(INTDIR)\Thread_Exit.obj" \ - "$(INTDIR)\Thread_Hook.obj" \ - "$(INTDIR)\Thread_Manager.obj" \ - "$(INTDIR)\Time_Request_Reply.obj" \ - "$(INTDIR)\Time_Value.obj" \ - "$(INTDIR)\Timeprobe.obj" \ - "$(INTDIR)\Timer_Hash.obj" \ - "$(INTDIR)\Timer_Heap.obj" \ - "$(INTDIR)\Timer_List.obj" \ - "$(INTDIR)\Timer_Queue.obj" \ - "$(INTDIR)\Timer_Queue_Adapters.obj" \ - "$(INTDIR)\Timer_Wheel.obj" \ - "$(INTDIR)\TLI.obj" \ - "$(INTDIR)\TLI_Acceptor.obj" \ - "$(INTDIR)\TLI_Connector.obj" \ - "$(INTDIR)\TLI_Stream.obj" \ - "$(INTDIR)\Token.obj" \ - "$(INTDIR)\Token_Collection.obj" \ - "$(INTDIR)\Token_Invariants.obj" \ - "$(INTDIR)\Token_Manager.obj" \ - "$(INTDIR)\Token_Request_Reply.obj" \ - "$(INTDIR)\TP_Reactor.obj" \ - "$(INTDIR)\Trace.obj" \ - "$(INTDIR)\TTY_IO.obj" \ - "$(INTDIR)\Typed_SV_Message.obj" \ - "$(INTDIR)\Typed_SV_Message_Queue.obj" \ - "$(INTDIR)\UNIX_Addr.obj" \ - "$(INTDIR)\UPIPE_Acceptor.obj" \ - "$(INTDIR)\UPIPE_Connector.obj" \ - "$(INTDIR)\UPIPE_Stream.obj" \ - "$(INTDIR)\WFMO_Reactor.obj" \ - "$(INTDIR)\WIN32_Asynch_IO.obj" \ - "$(INTDIR)\WIN32_Proactor.obj" \ - "$(INTDIR)\XML_Svc_Conf.obj" \ - "$(INTDIR)\XtReactor.obj" \ - "$(INTDIR)\ace.res" - -"..\bin\aced.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("ace_dll.dep") -!INCLUDE "ace_dll.dep" -!ELSE -!MESSAGE Warning: cannot find "ace_dll.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "ACE DLL - Win64 MFC Release" || "$(CFG)" == "ACE DLL - Win64 MFC Debug" || "$(CFG)" == "ACE DLL - Win64 Release" || "$(CFG)" == "ACE DLL - Win64 Debug" -SOURCE=.\ACE.cpp - -"$(INTDIR)\ACE.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Activation_Queue.cpp - -"$(INTDIR)\Activation_Queue.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Active_Map_Manager.cpp - -"$(INTDIR)\Active_Map_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Addr.cpp - -"$(INTDIR)\Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Arg_Shifter.cpp - -"$(INTDIR)\Arg_Shifter.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ARGV.cpp - -"$(INTDIR)\ARGV.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Argv_Type_Converter.cpp - -"$(INTDIR)\Argv_Type_Converter.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Asynch_Connector.cpp - -"$(INTDIR)\Asynch_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Asynch_IO.cpp - -"$(INTDIR)\Asynch_IO.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Asynch_IO_Impl.cpp - -"$(INTDIR)\Asynch_IO_Impl.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Asynch_Pseudo_Task.cpp - -"$(INTDIR)\Asynch_Pseudo_Task.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Atomic_Op.cpp - -"$(INTDIR)\Atomic_Op.obj" : $(SOURCE) "$(INTDIR)" ".\Atomic_Op.cpp" - - -SOURCE=.\ATM_Acceptor.cpp - -"$(INTDIR)\ATM_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_Addr.cpp - -"$(INTDIR)\ATM_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_Connector.cpp - -"$(INTDIR)\ATM_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_Params.cpp - -"$(INTDIR)\ATM_Params.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_QoS.cpp - -"$(INTDIR)\ATM_QoS.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_Stream.cpp - -"$(INTDIR)\ATM_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Base_Thread_Adapter.cpp - -"$(INTDIR)\Base_Thread_Adapter.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Based_Pointer_Repository.cpp - -"$(INTDIR)\Based_Pointer_Repository.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Basic_Stats.cpp - -"$(INTDIR)\Basic_Stats.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Basic_Types.cpp - -"$(INTDIR)\Basic_Types.obj" : $(SOURCE) "$(INTDIR)" ".\Template_Instantiations.cpp" ".\Framework_Component_T.cpp" - - -SOURCE=.\Capabilities.cpp - -"$(INTDIR)\Capabilities.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\CDR_Base.cpp - -"$(INTDIR)\CDR_Base.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\CDR_Stream.cpp - -"$(INTDIR)\CDR_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Codecs.cpp - -"$(INTDIR)\Codecs.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Codeset_Registry.cpp - -"$(INTDIR)\Codeset_Registry.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Codeset_Registry_db.cpp - -"$(INTDIR)\Codeset_Registry_db.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Configuration.cpp - -"$(INTDIR)\Configuration.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Configuration_Import_Export.cpp - -"$(INTDIR)\Configuration_Import_Export.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Connection_Recycling_Strategy.cpp - -"$(INTDIR)\Connection_Recycling_Strategy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Containers.cpp - -"$(INTDIR)\Containers.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Copy_Disabled.cpp - -"$(INTDIR)\Copy_Disabled.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Date_Time.cpp - -"$(INTDIR)\Date_Time.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DEV.cpp - -"$(INTDIR)\DEV.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DEV_Addr.cpp - -"$(INTDIR)\DEV_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DEV_Connector.cpp - -"$(INTDIR)\DEV_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DEV_IO.cpp - -"$(INTDIR)\DEV_IO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Dirent.cpp - -"$(INTDIR)\Dirent.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Dirent_Selector.cpp - -"$(INTDIR)\Dirent_Selector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DLL.cpp - -"$(INTDIR)\DLL.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DLL_Manager.cpp - -"$(INTDIR)\DLL_Manager.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Dump.cpp - -"$(INTDIR)\Dump.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Dynamic.cpp - -"$(INTDIR)\Dynamic.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Dynamic_Service.cpp - -"$(INTDIR)\Dynamic_Service.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Dynamic_Service_Base.cpp - -"$(INTDIR)\Dynamic_Service_Base.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Event_Handler.cpp - -"$(INTDIR)\Event_Handler.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Event_Handler_T.cpp - -"$(INTDIR)\Event_Handler_T.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO.cpp - -"$(INTDIR)\FIFO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO_Recv.cpp - -"$(INTDIR)\FIFO_Recv.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO_Recv_Msg.cpp - -"$(INTDIR)\FIFO_Recv_Msg.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO_Send.cpp - -"$(INTDIR)\FIFO_Send.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO_Send_Msg.cpp - -"$(INTDIR)\FIFO_Send_Msg.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FILE.cpp - -"$(INTDIR)\FILE.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FILE_Addr.cpp - -"$(INTDIR)\FILE_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FILE_Connector.cpp - -"$(INTDIR)\FILE_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FILE_IO.cpp - -"$(INTDIR)\FILE_IO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\File_Lock.cpp - -"$(INTDIR)\File_Lock.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Filecache.cpp - -"$(INTDIR)\Filecache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Flag_Manip.cpp - -"$(INTDIR)\Flag_Manip.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Framework_Component.cpp - -"$(INTDIR)\Framework_Component.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Functor.cpp - -"$(INTDIR)\Functor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Get_Opt.cpp - -"$(INTDIR)\Get_Opt.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Handle_Ops.cpp - -"$(INTDIR)\Handle_Ops.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Handle_Set.cpp - -"$(INTDIR)\Handle_Set.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Hash_Map_Manager.cpp - -"$(INTDIR)\Hash_Map_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Hashable.cpp - -"$(INTDIR)\Hashable.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\High_Res_Timer.cpp - -"$(INTDIR)\High_Res_Timer.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\INET_Addr.cpp - -"$(INTDIR)\INET_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Init_ACE.cpp - -"$(INTDIR)\Init_ACE.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\IO_Cntl_Msg.cpp - -"$(INTDIR)\IO_Cntl_Msg.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\IO_SAP.cpp - -"$(INTDIR)\IO_SAP.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\IOStream.cpp - -"$(INTDIR)\IOStream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\IPC_SAP.cpp - -"$(INTDIR)\IPC_SAP.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Lib_Find.cpp - -"$(INTDIR)\Lib_Find.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Local_Name_Space.cpp - -"$(INTDIR)\Local_Name_Space.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Local_Tokens.cpp - -"$(INTDIR)\Local_Tokens.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg.cpp - -"$(INTDIR)\Log_Msg.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Log_Msg_Backend.cpp - -"$(INTDIR)\Log_Msg_Backend.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg_Callback.cpp - -"$(INTDIR)\Log_Msg_Callback.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg_IPC.cpp - -"$(INTDIR)\Log_Msg_IPC.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg_NT_Event_Log.cpp - -"$(INTDIR)\Log_Msg_NT_Event_Log.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg_UNIX_Syslog.cpp - -"$(INTDIR)\Log_Msg_UNIX_Syslog.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Record.cpp - -"$(INTDIR)\Log_Record.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Logging_Strategy.cpp - -"$(INTDIR)\Logging_Strategy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK.cpp - -"$(INTDIR)\LSOCK.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_Acceptor.cpp - -"$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_CODgram.cpp - -"$(INTDIR)\LSOCK_CODgram.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_Connector.cpp - -"$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_Dgram.cpp - -"$(INTDIR)\LSOCK_Dgram.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_Stream.cpp - -"$(INTDIR)\LSOCK_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Malloc.cpp - -"$(INTDIR)\Malloc.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Malloc_Allocator.cpp - -"$(INTDIR)\Malloc_Allocator.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Malloc_Instantiations.cpp - -"$(INTDIR)\Malloc_Instantiations.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Map.cpp - -"$(INTDIR)\Map.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\MEM_Acceptor.cpp - -"$(INTDIR)\MEM_Acceptor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\MEM_Addr.cpp - -"$(INTDIR)\MEM_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\MEM_Connector.cpp - -"$(INTDIR)\MEM_Connector.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\MEM_IO.cpp - -"$(INTDIR)\MEM_IO.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Mem_Map.cpp - -"$(INTDIR)\Mem_Map.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\MEM_SAP.cpp - -"$(INTDIR)\MEM_SAP.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\MEM_Stream.cpp - -"$(INTDIR)\MEM_Stream.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Memory_Pool.cpp - -"$(INTDIR)\Memory_Pool.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Message_Block.cpp - -"$(INTDIR)\Message_Block.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Message_Queue.cpp - -"$(INTDIR)\Message_Queue.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Method_Request.cpp - -"$(INTDIR)\Method_Request.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Msg_WFMO_Reactor.cpp - -"$(INTDIR)\Msg_WFMO_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Multiplexor.cpp - -"$(INTDIR)\Multiplexor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Name_Proxy.cpp - -"$(INTDIR)\Name_Proxy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Name_Request_Reply.cpp - -"$(INTDIR)\Name_Request_Reply.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Name_Space.cpp - -"$(INTDIR)\Name_Space.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Naming_Context.cpp - -"$(INTDIR)\Naming_Context.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Notification_Strategy.cpp - -"$(INTDIR)\Notification_Strategy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\NT_Service.cpp - -"$(INTDIR)\NT_Service.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Obchunk.cpp - -"$(INTDIR)\Obchunk.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Object_Manager.cpp - -"$(INTDIR)\Object_Manager.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Obstack.cpp - -"$(INTDIR)\Obstack.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS.cpp - -"$(INTDIR)\OS.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Dirent.cpp - -"$(INTDIR)\OS_Dirent.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Errno.cpp - -"$(INTDIR)\OS_Errno.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Log_Msg_Attributes.cpp - -"$(INTDIR)\OS_Log_Msg_Attributes.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Memory.cpp - -"$(INTDIR)\OS_Memory.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_QoS.cpp - -"$(INTDIR)\OS_QoS.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_String.cpp - -"$(INTDIR)\OS_String.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Thread_Adapter.cpp - -"$(INTDIR)\OS_Thread_Adapter.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_TLI.cpp - -"$(INTDIR)\OS_TLI.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Pair.cpp - -"$(INTDIR)\Pair.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Parse_Node.cpp - -"$(INTDIR)\Parse_Node.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\PI_Malloc.cpp - -"$(INTDIR)\PI_Malloc.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Pipe.cpp - -"$(INTDIR)\Pipe.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\POSIX_Asynch_IO.cpp - -"$(INTDIR)\POSIX_Asynch_IO.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\POSIX_Proactor.cpp - -"$(INTDIR)\POSIX_Proactor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Priority_Reactor.cpp - -"$(INTDIR)\Priority_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Proactor.cpp - -"$(INTDIR)\Proactor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Process.cpp - -"$(INTDIR)\Process.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Process_Manager.cpp - -"$(INTDIR)\Process_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Process_Mutex.cpp - -"$(INTDIR)\Process_Mutex.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Process_Semaphore.cpp - -"$(INTDIR)\Process_Semaphore.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Profile_Timer.cpp - -"$(INTDIR)\Profile_Timer.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Reactor.cpp - -"$(INTDIR)\Reactor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Reactor_Notification_Strategy.cpp - -"$(INTDIR)\Reactor_Notification_Strategy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Read_Buffer.cpp - -"$(INTDIR)\Read_Buffer.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Recyclable.cpp - -"$(INTDIR)\Recyclable.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Refcountable.cpp - -"$(INTDIR)\Refcountable.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Registry.cpp - -"$(INTDIR)\Registry.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Registry_Name_Space.cpp - -"$(INTDIR)\Registry_Name_Space.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Remote_Name_Space.cpp - -"$(INTDIR)\Remote_Name_Space.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Remote_Tokens.cpp - -"$(INTDIR)\Remote_Tokens.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\RW_Process_Mutex.cpp - -"$(INTDIR)\RW_Process_Mutex.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Sample_History.cpp - -"$(INTDIR)\Sample_History.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Sched_Params.cpp - -"$(INTDIR)\Sched_Params.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Select_Reactor.cpp - -"$(INTDIR)\Select_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Select_Reactor_Base.cpp - -"$(INTDIR)\Select_Reactor_Base.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Service_Config.cpp - -"$(INTDIR)\Service_Config.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Service_Manager.cpp - -"$(INTDIR)\Service_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Service_Object.cpp - -"$(INTDIR)\Service_Object.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Service_Repository.cpp - -"$(INTDIR)\Service_Repository.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Service_Templates.cpp - -"$(INTDIR)\Service_Templates.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Service_Types.cpp - -"$(INTDIR)\Service_Types.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Shared_Memory.cpp - -"$(INTDIR)\Shared_Memory.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Shared_Memory_MM.cpp - -"$(INTDIR)\Shared_Memory_MM.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Shared_Memory_SV.cpp - -"$(INTDIR)\Shared_Memory_SV.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Shared_Object.cpp - -"$(INTDIR)\Shared_Object.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Signal.cpp - -"$(INTDIR)\Signal.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK.cpp - -"$(INTDIR)\SOCK.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Acceptor.cpp - -"$(INTDIR)\SOCK_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_CODgram.cpp - -"$(INTDIR)\SOCK_CODgram.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Sock_Connect.cpp - -"$(INTDIR)\Sock_Connect.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Connector.cpp - -"$(INTDIR)\SOCK_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Dgram.cpp - -"$(INTDIR)\SOCK_Dgram.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Dgram_Bcast.cpp - -"$(INTDIR)\SOCK_Dgram_Bcast.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Dgram_Mcast.cpp - -"$(INTDIR)\SOCK_Dgram_Mcast.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_IO.cpp - -"$(INTDIR)\SOCK_IO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Stream.cpp - -"$(INTDIR)\SOCK_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE.cpp - -"$(INTDIR)\SPIPE.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE_Acceptor.cpp - -"$(INTDIR)\SPIPE_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE_Addr.cpp - -"$(INTDIR)\SPIPE_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE_Connector.cpp - -"$(INTDIR)\SPIPE_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE_Stream.cpp - -"$(INTDIR)\SPIPE_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SString.cpp - -"$(INTDIR)\SString.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Stats.cpp - -"$(INTDIR)\Stats.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\String_Base_Const.cpp - -"$(INTDIR)\String_Base_Const.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Message.cpp - -"$(INTDIR)\SV_Message.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Message_Queue.cpp - -"$(INTDIR)\SV_Message_Queue.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Semaphore_Complex.cpp - -"$(INTDIR)\SV_Semaphore_Complex.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Semaphore_Simple.cpp - -"$(INTDIR)\SV_Semaphore_Simple.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Shared_Memory.cpp - -"$(INTDIR)\SV_Shared_Memory.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Svc_Conf_l.cpp - -"$(INTDIR)\Svc_Conf_l.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Svc_Conf_Lexer_Guard.cpp - -"$(INTDIR)\Svc_Conf_Lexer_Guard.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Svc_Conf_y.cpp - -"$(INTDIR)\Svc_Conf_y.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Svc_Handler.cpp - -"$(INTDIR)\Svc_Handler.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Synch.cpp - -"$(INTDIR)\Synch.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Synch_Options.cpp - -"$(INTDIR)\Synch_Options.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\System_Time.cpp - -"$(INTDIR)\System_Time.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Task.cpp - -"$(INTDIR)\Task.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Template_Instantiations.cpp - -"$(INTDIR)\Template_Instantiations.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Thread.cpp - -"$(INTDIR)\Thread.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Thread_Adapter.cpp - -"$(INTDIR)\Thread_Adapter.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Thread_Control.cpp - -"$(INTDIR)\Thread_Control.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Thread_Exit.cpp - -"$(INTDIR)\Thread_Exit.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Thread_Hook.cpp - -"$(INTDIR)\Thread_Hook.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Thread_Manager.cpp - -"$(INTDIR)\Thread_Manager.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Time_Request_Reply.cpp - -"$(INTDIR)\Time_Request_Reply.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Time_Value.cpp - -"$(INTDIR)\Time_Value.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timeprobe.cpp - -"$(INTDIR)\Timeprobe.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Timer_Hash.cpp - -"$(INTDIR)\Timer_Hash.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timer_Heap.cpp - -"$(INTDIR)\Timer_Heap.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timer_List.cpp - -"$(INTDIR)\Timer_List.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timer_Queue.cpp - -"$(INTDIR)\Timer_Queue.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timer_Queue_Adapters.cpp - -"$(INTDIR)\Timer_Queue_Adapters.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Timer_Wheel.cpp - -"$(INTDIR)\Timer_Wheel.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TLI.cpp - -"$(INTDIR)\TLI.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TLI_Acceptor.cpp - -"$(INTDIR)\TLI_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TLI_Connector.cpp - -"$(INTDIR)\TLI_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TLI_Stream.cpp - -"$(INTDIR)\TLI_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token.cpp - -"$(INTDIR)\Token.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token_Collection.cpp - -"$(INTDIR)\Token_Collection.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token_Invariants.cpp - -"$(INTDIR)\Token_Invariants.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token_Manager.cpp - -"$(INTDIR)\Token_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token_Request_Reply.cpp - -"$(INTDIR)\Token_Request_Reply.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TP_Reactor.cpp - -"$(INTDIR)\TP_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Trace.cpp - -"$(INTDIR)\Trace.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TTY_IO.cpp - -"$(INTDIR)\TTY_IO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Typed_SV_Message.cpp - -"$(INTDIR)\Typed_SV_Message.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Typed_SV_Message_Queue.cpp - -"$(INTDIR)\Typed_SV_Message_Queue.obj" : $(SOURCE) "$(INTDIR)" ".\Typed_SV_Message.cpp" - - -SOURCE=.\UNIX_Addr.cpp - -"$(INTDIR)\UNIX_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\UPIPE_Acceptor.cpp - -"$(INTDIR)\UPIPE_Acceptor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\UPIPE_Connector.cpp - -"$(INTDIR)\UPIPE_Connector.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\UPIPE_Stream.cpp - -"$(INTDIR)\UPIPE_Stream.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\WFMO_Reactor.cpp - -"$(INTDIR)\WFMO_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\WIN32_Asynch_IO.cpp - -"$(INTDIR)\WIN32_Asynch_IO.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\WIN32_Proactor.cpp - -"$(INTDIR)\WIN32_Proactor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\XML_Svc_Conf.cpp - -"$(INTDIR)\XML_Svc_Conf.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\XtReactor.cpp - -"$(INTDIR)\XtReactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Acceptor.cpp -SOURCE=.\Active_Map_Manager_T.cpp -SOURCE=.\Asynch_Acceptor.cpp -SOURCE=.\Auto_Ptr.cpp -SOURCE=.\Based_Pointer_T.cpp -SOURCE=.\Cache_Map_Manager_T.cpp -SOURCE=.\Cached_Connect_Strategy_T.cpp -SOURCE=.\Caching_Strategies_T.cpp -SOURCE=.\Caching_Utility_T.cpp -SOURCE=.\Cleanup_Strategies_T.cpp -SOURCE=.\Connector.cpp -SOURCE=.\Containers_T.cpp -SOURCE=.\Dump_T.cpp -SOURCE=.\Framework_Component_T.cpp - -!IF "$(CFG)" == "ACE DLL - Win64 MFC Release" - - -"$(INTDIR)\Framework_Component_T.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ACE DLL - Win64 MFC Debug" - - -"$(INTDIR)\Framework_Component_T.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ACE DLL - Win64 Release" - - -"$(INTDIR)\Framework_Component_T.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ACE DLL - Win64 Debug" - -!ENDIF - -SOURCE=.\Free_List.cpp -SOURCE=.\Functor_T.cpp -SOURCE=.\Future.cpp -SOURCE=.\Hash_Cache_Map_Manager_T.cpp -SOURCE=.\Hash_Map_Manager_T.cpp -SOURCE=.\Hash_Map_With_Allocator_T.cpp -SOURCE=.\IOStream_T.cpp -SOURCE=.\Local_Name_Space_T.cpp -SOURCE=.\Malloc_T.cpp -SOURCE=.\Managed_Object.cpp -SOURCE=.\Map_Manager.cpp -SOURCE=.\Map_T.cpp -SOURCE=.\Message_Block_T.cpp -SOURCE=.\Message_Queue_T.cpp -SOURCE=.\Module.cpp -SOURCE=.\Obstack_T.cpp -SOURCE=.\Pair_T.cpp -SOURCE=.\RB_Tree.cpp -SOURCE=.\Select_Reactor_T.cpp -SOURCE=.\Singleton.cpp -SOURCE=.\Strategies_T.cpp -SOURCE=.\Stream.cpp -SOURCE=.\Stream_Modules.cpp -SOURCE=.\String_Base.cpp -SOURCE=.\Synch_T.cpp -SOURCE=.\Task_T.cpp -SOURCE=.\Test_and_Set.cpp -SOURCE=.\Timer_Hash_T.cpp -SOURCE=.\Timer_Heap_T.cpp -SOURCE=.\Timer_List_T.cpp -SOURCE=.\Timer_Queue_T.cpp -SOURCE=.\Timer_Wheel_T.cpp -SOURCE=.\ace.rc - -"$(INTDIR)\ace.res" : $(SOURCE) "$(INTDIR)" - $(RSC) $(RSC_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp deleted file mode 100644 index 18ea03662f6..00000000000 --- a/ace/ace_lib.dsp +++ /dev/null @@ -1,3427 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ACE LIB" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=ACE LIB - Win32 Static Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ace_lib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ace_lib.mak" CFG="ACE LIB - Win32 Static Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ACE LIB - Win32 Pharlap ETS Static Release" (based on "Win32 (x86) Static Library") -!MESSAGE "ACE LIB - Win32 Pharlap ETS Static Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "ACE LIB - Win32 Static Release" (based on "Win32 (x86) Static Library") -!MESSAGE "ACE LIB - Win32 Static Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "Desktop" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ACE_LIB___Win32_PharLap_ETS_Release" -# PROP BASE Intermediate_Dir "ACE_LIB___Win32_PharLap_ETS_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\LIB\Release" -# PROP Target_Dir "" -MTL=midl.exe -LINK32=link.exe -lib -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MT /W3 /GX /O1 /I "../" /I "../PACE" /D ACE_OS_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo /o".\ace.bsc" -# ADD BSC32 /nologo /o".\ace.bsc" -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:".\aces.lib" -# ADD LIB32 /nologo /out:".\aces.lib" - -!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ACE_LIB___Win32_PharLap_ETS_Debug" -# PROP BASE Intermediate_Dir "ACE_LIB___Win32_PharLap_ETS_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\LIB\Debug" -# PROP Target_Dir "" -MTL=midl.exe -LINK32=link.exe -lib -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /Gy /I "../" /I "../PACE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo /o".\ace.bsc" -# ADD BSC32 /nologo /o".\ace.bsc" -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:".\acesd.lib" -# ADD LIB32 /nologo /out:".\acesd.lib" - -!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\LIB\Release" -# PROP Target_Dir "" -MTL=midl.exe -LINK32=link.exe -lib -# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../" /I "../PACE" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo /o"ace.bsc" -# ADD BSC32 /nologo /o".\ace.bsc" -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:".\libace-r.lib" -# ADD LIB32 /nologo /out:".\aces.lib" - -!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir ".\LIB\Debug" -# PROP Target_Dir "" -MTL=midl.exe -LINK32=link.exe -lib -# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo /o"ace.bsc" -# ADD BSC32 /nologo /o".\ace.bsc" -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:".\libace.lib" -# ADD LIB32 /nologo /out:".\acesd.lib" - -!ENDIF - -# Begin Target - -# Name "ACE LIB - Win32 Pharlap ETS Static Release" -# Name "ACE LIB - Win32 Pharlap ETS Static Debug" -# Name "ACE LIB - Win32 Static Release" -# Name "ACE LIB - Win32 Static Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp" -# Begin Source File - -SOURCE=.\ACE.cpp -# End Source File -# Begin Source File - -SOURCE=.\Activation_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\Arg_Shifter.cpp -# End Source File -# Begin Source File - -SOURCE=.\ARGV.cpp -# End Source File -# Begin Source File - -SOURCE=.\Argv_Type_Converter.cpp -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO_Impl.cpp -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Pseudo_Task.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Params.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_QoS.cpp -# End Source File -# Begin Source File - -SOURCE=.\ATM_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Atomic_Op.cpp -# End Source File -# Begin Source File - -SOURCE=.\Base_Thread_Adapter.cpp -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_Repository.cpp -# End Source File -# Begin Source File - -SOURCE=.\Basic_Stats.cpp -# End Source File -# Begin Source File - -SOURCE=.\Basic_Types.cpp -# End Source File -# Begin Source File - -SOURCE=.\Capabilities.cpp -# End Source File -# Begin Source File - -SOURCE=.\CDR_Base.cpp -# End Source File -# Begin Source File - -SOURCE=.\CDR_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Codecs.cpp -# End Source File -# Begin Source File - -SOURCE=.\Codeset_Registry.cpp -# End Source File -# Begin Source File - -SOURCE=.\Codeset_Registry_db.cpp -# End Source File -# Begin Source File - -SOURCE=.\Configuration.cpp -# End Source File -# Begin Source File - -SOURCE=.\Configuration_Import_Export.cpp -# End Source File -# Begin Source File - -SOURCE=.\Connection_Recycling_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\Containers.cpp -# End Source File -# Begin Source File - -SOURCE=.\Copy_Disabled.cpp -# End Source File -# Begin Source File - -SOURCE=.\Date_Time.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEV.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEV_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEV_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEV_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dirent.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dirent_Selector.cpp -# End Source File -# Begin Source File - -SOURCE=.\DLL.cpp -# End Source File -# Begin Source File - -SOURCE=.\DLL_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dump.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dynamic.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dynamic_Service.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dynamic_Service_Base.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dynamic_Service_Base.h -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv_Msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send.cpp -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send_Msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\FILE.cpp -# End Source File -# Begin Source File - -SOURCE=.\FILE_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\FILE_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\FILE_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\File_Lock.cpp -# End Source File -# Begin Source File - -SOURCE=.\Filecache.cpp -# End Source File -# Begin Source File - -SOURCE=.\Flag_Manip.cpp -# End Source File -# Begin Source File - -SOURCE=.\Framework_Component.cpp -# End Source File -# Begin Source File - -SOURCE=.\Functor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Get_Opt.cpp -# End Source File -# Begin Source File - -SOURCE=.\Handle_Ops.cpp -# End Source File -# Begin Source File - -SOURCE=.\Handle_Set.cpp -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Hashable.cpp -# End Source File -# Begin Source File - -SOURCE=.\High_Res_Timer.cpp -# End Source File -# Begin Source File - -SOURCE=.\INET_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\Init_ACE.cpp -# End Source File -# Begin Source File - -SOURCE=.\IO_Cntl_Msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\IO_SAP.cpp -# End Source File -# Begin Source File - -SOURCE=.\IOStream.cpp -# End Source File -# Begin Source File - -SOURCE=.\IPC_SAP.cpp -# End Source File -# Begin Source File - -SOURCE=.\Lib_Find.cpp -# End Source File -# Begin Source File - -SOURCE=.\Local_Name_Space.cpp -# End Source File -# Begin Source File - -SOURCE=.\Local_Tokens.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_Backend.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_Callback.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_IPC.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_NT_Event_Log.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_UNIX_Syslog.cpp -# End Source File -# Begin Source File - -SOURCE=.\Log_Record.cpp -# End Source File -# Begin Source File - -SOURCE=.\Logging_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_CODgram.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Dgram.cpp -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Malloc.cpp -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Allocator.cpp -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Instantiations.cpp -# End Source File -# Begin Source File - -SOURCE=.\Map.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\Mem_Map.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_SAP.cpp -# End Source File -# Begin Source File - -SOURCE=.\MEM_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Memory_Pool.cpp -# End Source File -# Begin Source File - -SOURCE=.\Message_Block.cpp -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\Method_Request.cpp -# End Source File -# Begin Source File - -SOURCE=.\Msg_WFMO_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Multiplexor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Name_Proxy.cpp -# End Source File -# Begin Source File - -SOURCE=.\Name_Request_Reply.cpp -# End Source File -# Begin Source File - -SOURCE=.\Name_Space.cpp -# End Source File -# Begin Source File - -SOURCE=.\Naming_Context.cpp -# End Source File -# Begin Source File - -SOURCE=.\Notification_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\NT_Service.cpp -# End Source File -# Begin Source File - -SOURCE=.\Obchunk.cpp -# End Source File -# Begin Source File - -SOURCE=.\Object_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Obstack.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Dirent.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Errno.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Log_Msg_Attributes.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Memory.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_QoS.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_String.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_Thread_Adapter.cpp -# End Source File -# Begin Source File - -SOURCE=.\OS_TLI.cpp -# End Source File -# Begin Source File - -SOURCE=.\Pair.cpp -# End Source File -# Begin Source File - -SOURCE=.\Parse_Node.cpp -# End Source File -# Begin Source File - -SOURCE=.\PI_Malloc.cpp -# End Source File -# Begin Source File - -SOURCE=.\Pipe.cpp -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Asynch_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Proactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Priority_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Proactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Process.cpp -# End Source File -# Begin Source File - -SOURCE=.\Process_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Process_Mutex.cpp -# End Source File -# Begin Source File - -SOURCE=.\Process_Semaphore.cpp -# End Source File -# Begin Source File - -SOURCE=.\Profile_Timer.cpp -# End Source File -# Begin Source File - -SOURCE=.\Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Reactor_Notification_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\Read_Buffer.cpp -# End Source File -# Begin Source File - -SOURCE=.\Recyclable.cpp -# End Source File -# Begin Source File - -SOURCE=.\Refcountable.cpp -# End Source File -# Begin Source File - -SOURCE=.\Registry.cpp -# End Source File -# Begin Source File - -SOURCE=.\Registry_Name_Space.cpp -# End Source File -# Begin Source File - -SOURCE=.\Remote_Name_Space.cpp -# End Source File -# Begin Source File - -SOURCE=.\Remote_Tokens.cpp -# End Source File -# Begin Source File - -SOURCE=.\RW_Process_Mutex.cpp -# End Source File -# Begin Source File - -SOURCE=.\Sample_History.cpp -# End Source File -# Begin Source File - -SOURCE=.\Sched_Params.cpp -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_Base.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Config.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Object.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Repository.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Templates.cpp -# End Source File -# Begin Source File - -SOURCE=.\Service_Types.cpp -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory.cpp -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_MM.cpp -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_SV.cpp -# End Source File -# Begin Source File - -SOURCE=.\Shared_Object.cpp -# End Source File -# Begin Source File - -SOURCE=.\Signal.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_CODgram.cpp -# End Source File -# Begin Source File - -SOURCE=.\Sock_Connect.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Bcast.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\SString.cpp -# End Source File -# Begin Source File - -SOURCE=.\Stats.cpp -# End Source File -# Begin Source File - -SOURCE=.\String_Base_Const.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Message.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Message_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Complex.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Simple.cpp -# End Source File -# Begin Source File - -SOURCE=.\SV_Shared_Memory.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_l.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_Lexer_Guard.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_y.cpp -# End Source File -# Begin Source File - -SOURCE=.\Svc_Handler.cpp -# End Source File -# Begin Source File - -SOURCE=.\Synch.cpp -# End Source File -# Begin Source File - -SOURCE=.\Synch_Options.cpp -# End Source File -# Begin Source File - -SOURCE=.\System_Time.cpp -# End Source File -# Begin Source File - -SOURCE=.\Task.cpp -# End Source File -# Begin Source File - -SOURCE=.\Template_Instantiations.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Adapter.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Control.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Exit.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Hook.cpp -# End Source File -# Begin Source File - -SOURCE=.\Thread_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Time_Request_Reply.cpp -# End Source File -# Begin Source File - -SOURCE=.\Time_Value.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timeprobe.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Hash.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Heap.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_List.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_Adapters.cpp -# End Source File -# Begin Source File - -SOURCE=.\Timer_Wheel.cpp -# End Source File -# Begin Source File - -SOURCE=.\TLI.cpp -# End Source File -# Begin Source File - -SOURCE=.\TLI_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\TLI_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\TLI_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token_Collection.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token_Invariants.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token_Manager.cpp -# End Source File -# Begin Source File - -SOURCE=.\Token_Request_Reply.cpp -# End Source File -# Begin Source File - -SOURCE=.\TP_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Trace.cpp -# End Source File -# Begin Source File - -SOURCE=.\TTY_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message.cpp -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message_Queue.cpp -# End Source File -# Begin Source File - -SOURCE=.\UNIX_Addr.cpp -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Stream.cpp -# End Source File -# Begin Source File - -SOURCE=.\WFMO_Reactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\WIN32_Asynch_IO.cpp -# End Source File -# Begin Source File - -SOURCE=.\WIN32_Proactor.cpp -# End Source File -# Begin Source File - -SOURCE=.\XML_Svc_Conf.cpp -# End Source File -# Begin Source File - -SOURCE=.\XtReactor.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h" -# Begin Source File - -SOURCE=.\Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\ACE.h -# End Source File -# Begin Source File - -SOURCE=.\ACE_export.h -# End Source File -# Begin Source File - -SOURCE=.\ace_wchar.h -# End Source File -# Begin Source File - -SOURCE=.\Activation_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager_T.h -# End Source File -# Begin Source File - -SOURCE=.\Addr.h -# End Source File -# Begin Source File - -SOURCE=.\Arg_Shifter.h -# End Source File -# Begin Source File - -SOURCE=.\ARGV.h -# End Source File -# Begin Source File - -SOURCE=.\Argv_Type_Converter.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO_Impl.h -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Pseudo_Task.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Params.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_QoS.h -# End Source File -# Begin Source File - -SOURCE=.\ATM_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Atomic_Op.h -# End Source File -# Begin Source File - -SOURCE=.\Auto_Ptr.h -# End Source File -# Begin Source File - -SOURCE=.\Base_Pointer_T.h -# End Source File -# Begin Source File - -SOURCE=.\Base_Thread_Adapter.h -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_Repository.h -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_T.h -# End Source File -# Begin Source File - -SOURCE=.\Basic_Stats.h -# End Source File -# Begin Source File - -SOURCE=.\Basic_Types.h -# End Source File -# Begin Source File - -SOURCE=.\Bound_Ptr.h -# End Source File -# Begin Source File - -SOURCE=.\Cache_Map_Manager_T.h -# End Source File -# Begin Source File - -SOURCE=.\Cached_Connect_Strategy_T.h -# End Source File -# Begin Source File - -SOURCE=.\Caching_Strategies_T.h -# End Source File -# Begin Source File - -SOURCE=.\Caching_Strategy_Utility_T.h -# End Source File -# Begin Source File - -SOURCE=.\Capabilities.h -# End Source File -# Begin Source File - -SOURCE=.\CDR_Base.h -# End Source File -# Begin Source File - -SOURCE=.\CDR_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Cleanup_Strategies_T.h -# End Source File -# Begin Source File - -SOURCE=.\Codecs.h -# End Source File -# Begin Source File - -SOURCE=.\Codeset_Registry.h -# End Source File -# Begin Source File - -SOURCE=".\config-all.h" -# End Source File -# Begin Source File - -SOURCE=".\config-all.h" -# End Source File -# Begin Source File - -SOURCE=".\config-win32-common.h" -# End Source File -# Begin Source File - -SOURCE=".\config-win32-msvc.h" -# End Source File -# Begin Source File - -SOURCE=".\config-win32.h" -# End Source File -# Begin Source File - -SOURCE=.\config.h -# End Source File -# Begin Source File - -SOURCE=.\Configuration.h -# End Source File -# Begin Source File - -SOURCE=.\Configuration_Import_Export.h -# End Source File -# Begin Source File - -SOURCE=.\Connection_Recycling_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\Connector.h -# End Source File -# Begin Source File - -SOURCE=.\Containers.h -# End Source File -# Begin Source File - -SOURCE=.\Containers_T.h -# End Source File -# Begin Source File - -SOURCE=.\Copy_Disabled.h -# End Source File -# Begin Source File - -SOURCE=.\Date_Time.h -# End Source File -# Begin Source File - -SOURCE=.\Default_Constants.h -# End Source File -# Begin Source File - -SOURCE=.\DEV.h -# End Source File -# Begin Source File - -SOURCE=.\DEV_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\DEV_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\DEV_IO.h -# End Source File -# Begin Source File - -SOURCE=.\Dirent.h -# End Source File -# Begin Source File - -SOURCE=.\Dirent_Selector.h -# End Source File -# Begin Source File - -SOURCE=.\DLL.h -# End Source File -# Begin Source File - -SOURCE=.\DLL_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Dump.h -# End Source File -# Begin Source File - -SOURCE=.\Dump_T.h -# End Source File -# Begin Source File - -SOURCE=.\Dynamic.h -# End Source File -# Begin Source File - -SOURCE=.\Dynamic_Service.h -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler.h -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler_T.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv_Msg.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send.h -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send_Msg.h -# End Source File -# Begin Source File - -SOURCE=.\FILE.h -# End Source File -# Begin Source File - -SOURCE=.\FILE_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\FILE_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\FILE_IO.h -# End Source File -# Begin Source File - -SOURCE=.\File_Lock.h -# End Source File -# Begin Source File - -SOURCE=.\Filecache.h -# End Source File -# Begin Source File - -SOURCE=.\Flag_Manip.h -# End Source File -# Begin Source File - -SOURCE=.\Framework_Component.h -# End Source File -# Begin Source File - -SOURCE=.\Free_List.h -# End Source File -# Begin Source File - -SOURCE=.\Functor.h -# End Source File -# Begin Source File - -SOURCE=.\Functor_T.h -# End Source File -# Begin Source File - -SOURCE=.\Future.h -# End Source File -# Begin Source File - -SOURCE=.\Get_Opt.h -# End Source File -# Begin Source File - -SOURCE=.\Global_Macros.h -# End Source File -# Begin Source File - -SOURCE=.\Handle_Ops.h -# End Source File -# Begin Source File - -SOURCE=.\Handle_Set.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_Cache_Map_Manager_T.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager_T.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_With_Allocator_T.h -# End Source File -# Begin Source File - -SOURCE=.\Hashable.h -# End Source File -# Begin Source File - -SOURCE=.\High_Res_Timer.h -# End Source File -# Begin Source File - -SOURCE=.\INET_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\Init_ACE.h -# End Source File -# Begin Source File - -SOURCE=.\IO_Cntl_Msg.h -# End Source File -# Begin Source File - -SOURCE=.\IO_SAP.h -# End Source File -# Begin Source File - -SOURCE=.\IOStream.h -# End Source File -# Begin Source File - -SOURCE=.\IOStream_T.h -# End Source File -# Begin Source File - -SOURCE=.\IPC_SAP.h -# End Source File -# Begin Source File - -SOURCE=.\Lib_Find.h -# End Source File -# Begin Source File - -SOURCE=.\Local_Name_Space.h -# End Source File -# Begin Source File - -SOURCE=.\Local_Name_Space_T.h -# End Source File -# Begin Source File - -SOURCE=.\Local_Tokens.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_Backend.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_Callback.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_IPC.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_NT_Event_Log.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Msg_UNIX_Syslog.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Priority.h -# End Source File -# Begin Source File - -SOURCE=.\Log_Record.h -# End Source File -# Begin Source File - -SOURCE=.\Logging_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_CODgram.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Dgram.h -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Malloc.h -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Allocator.h -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Base.h -# End Source File -# Begin Source File - -SOURCE=.\Malloc_T.h -# End Source File -# Begin Source File - -SOURCE=.\Managed_Object.h -# End Source File -# Begin Source File - -SOURCE=.\Map.h -# End Source File -# Begin Source File - -SOURCE=.\Map_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Map_T.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_IO.h -# End Source File -# Begin Source File - -SOURCE=.\Mem_Map.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_SAP.h -# End Source File -# Begin Source File - -SOURCE=.\MEM_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Memory_Pool.h -# End Source File -# Begin Source File - -SOURCE=.\Message_Block.h -# End Source File -# Begin Source File - -SOURCE=.\Message_Block_T.h -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue_T.h -# End Source File -# Begin Source File - -SOURCE=.\Method_Request.h -# End Source File -# Begin Source File - -SOURCE=.\Min_Max.h -# End Source File -# Begin Source File - -SOURCE=.\Module.h -# End Source File -# Begin Source File - -SOURCE=.\Msg_WFMO_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Multiplexor.h -# End Source File -# Begin Source File - -SOURCE=.\Name_Proxy.h -# End Source File -# Begin Source File - -SOURCE=.\Name_Request_Reply.h -# End Source File -# Begin Source File - -SOURCE=.\Name_Space.h -# End Source File -# Begin Source File - -SOURCE=.\Naming_Context.h -# End Source File -# Begin Source File - -SOURCE=.\Notification_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\NT_Service.h -# End Source File -# Begin Source File - -SOURCE=.\Obchunk.h -# End Source File -# Begin Source File - -SOURCE=.\Object_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Obstack.h -# End Source File -# Begin Source File - -SOURCE=.\Obstack_T.h -# End Source File -# Begin Source File - -SOURCE=.\OS.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Dirent.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Errno.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Log_Msg_Attributes.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Memory.h -# End Source File -# Begin Source File - -SOURCE=.\OS_QoS.h -# End Source File -# Begin Source File - -SOURCE=.\OS_String.h -# End Source File -# Begin Source File - -SOURCE=.\OS_Thread_Adapter.h -# End Source File -# Begin Source File - -SOURCE=.\OS_TLI.h -# End Source File -# Begin Source File - -SOURCE=.\Pair.h -# End Source File -# Begin Source File - -SOURCE=.\Pair_T.h -# End Source File -# Begin Source File - -SOURCE=.\Parse_Node.h -# End Source File -# Begin Source File - -SOURCE=.\PI_Malloc.h -# End Source File -# Begin Source File - -SOURCE=.\Pipe.h -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Asynch_IO.h -# End Source File -# Begin Source File - -SOURCE=.\POSIX_Proactor.h -# End Source File -# Begin Source File - -SOURCE=.\post.h -# End Source File -# Begin Source File - -SOURCE=.\pre.h -# End Source File -# Begin Source File - -SOURCE=.\Priority_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Proactor.h -# End Source File -# Begin Source File - -SOURCE=.\Proactor_Impl.h -# End Source File -# Begin Source File - -SOURCE=.\Process.h -# End Source File -# Begin Source File - -SOURCE=.\Process_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Process_Mutex.h -# End Source File -# Begin Source File - -SOURCE=.\Process_Semaphore.h -# End Source File -# Begin Source File - -SOURCE=.\Profile_Timer.h -# End Source File -# Begin Source File - -SOURCE=.\QoS_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\QoS_Session.h -# End Source File -# Begin Source File - -SOURCE=.\QoS_Session_Factory.h -# End Source File -# Begin Source File - -SOURCE=.\QoS_Session_Impl.h -# End Source File -# Begin Source File - -SOURCE=.\RB_Tree.h -# End Source File -# Begin Source File - -SOURCE=.\Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Reactor_Impl.h -# End Source File -# Begin Source File - -SOURCE=.\Reactor_Notification_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\ReactorEx.h -# End Source File -# Begin Source File - -SOURCE=.\Read_Buffer.h -# End Source File -# Begin Source File - -SOURCE=.\Recyclable.h -# End Source File -# Begin Source File - -SOURCE=.\Refcountable.h -# End Source File -# Begin Source File - -SOURCE=.\Refcounted_Auto_Ptr.h -# End Source File -# Begin Source File - -SOURCE=.\Registry.h -# End Source File -# Begin Source File - -SOURCE=.\Registry_Name_Space.h -# End Source File -# Begin Source File - -SOURCE=.\Remote_Name_Space.h -# End Source File -# Begin Source File - -SOURCE=.\Remote_Tokens.h -# End Source File -# Begin Source File - -SOURCE=.\RW_Process_Mutex.h -# End Source File -# Begin Source File - -SOURCE=.\Sample_History.h -# End Source File -# Begin Source File - -SOURCE=.\Sched_Params.h -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_Base.h -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_T.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Config.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Object.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Repository.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Templates.h -# End Source File -# Begin Source File - -SOURCE=.\Service_Types.h -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory.h -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_MM.h -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_SV.h -# End Source File -# Begin Source File - -SOURCE=.\Shared_Object.h -# End Source File -# Begin Source File - -SOURCE=.\Signal.h -# End Source File -# Begin Source File - -SOURCE=.\Singleton.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_CODgram.h -# End Source File -# Begin Source File - -SOURCE=.\Sock_Connect.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Bcast.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast_QoS.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_IO.h -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\SString.h -# End Source File -# Begin Source File - -SOURCE=.\Stats.h -# End Source File -# Begin Source File - -SOURCE=.\stdcpp.h -# End Source File -# Begin Source File - -SOURCE=.\Strategies_T.h -# End Source File -# Begin Source File - -SOURCE=.\Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Stream_Modules.h -# End Source File -# Begin Source File - -SOURCE=.\streams.h -# End Source File -# Begin Source File - -SOURCE=.\String_Base.h -# End Source File -# Begin Source File - -SOURCE=.\String_Base_Const.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Message.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Message_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Complex.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Simple.h -# End Source File -# Begin Source File - -SOURCE=.\SV_Shared_Memory.h -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf.h -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_Lexer_Guard.h -# End Source File -# Begin Source File - -SOURCE=.\Svc_Conf_Tokens.h -# End Source File -# Begin Source File - -SOURCE=.\svc_export.h -# End Source File -# Begin Source File - -SOURCE=.\Svc_Handler.h -# End Source File -# Begin Source File - -SOURCE=.\Synch.h -# End Source File -# Begin Source File - -SOURCE=.\Synch_Options.h -# End Source File -# Begin Source File - -SOURCE=.\Synch_T.h -# End Source File -# Begin Source File - -SOURCE=.\System_Time.h -# End Source File -# Begin Source File - -SOURCE=.\Task.h -# End Source File -# Begin Source File - -SOURCE=.\Task_T.h -# End Source File -# Begin Source File - -SOURCE=.\Test_and_Set.h -# End Source File -# Begin Source File - -SOURCE=.\Thread.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Adapter.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Control.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Exit.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Hook.h -# End Source File -# Begin Source File - -SOURCE=.\Thread_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Time_Request_Reply.h -# End Source File -# Begin Source File - -SOURCE=.\Time_Value.h -# End Source File -# Begin Source File - -SOURCE=.\Timeprobe.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Hash.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Hash_T.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Heap.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Heap_T.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_List.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_List_T.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_Adapters.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_T.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Wheel.h -# End Source File -# Begin Source File - -SOURCE=.\Timer_Wheel_T.h -# End Source File -# Begin Source File - -SOURCE=.\TLI.h -# End Source File -# Begin Source File - -SOURCE=.\TLI_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\TLI_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\TLI_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Token.h -# End Source File -# Begin Source File - -SOURCE=.\Token_Collection.h -# End Source File -# Begin Source File - -SOURCE=.\Token_Invariants.h -# End Source File -# Begin Source File - -SOURCE=.\Token_Manager.h -# End Source File -# Begin Source File - -SOURCE=.\Token_Request_Reply.h -# End Source File -# Begin Source File - -SOURCE=.\TP_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\Trace.h -# End Source File -# Begin Source File - -SOURCE=.\TTY_IO.h -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message.h -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message_Queue.h -# End Source File -# Begin Source File - -SOURCE=.\UNIX_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Acceptor.h -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Addr.h -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Connector.h -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Stream.h -# End Source File -# Begin Source File - -SOURCE=.\Version.h -# End Source File -# Begin Source File - -SOURCE=.\WFMO_Reactor.h -# End Source File -# Begin Source File - -SOURCE=.\WIN32_Asynch_IO.h -# End Source File -# Begin Source File - -SOURCE=.\WIN32_Proactor.h -# End Source File -# Begin Source File - -SOURCE=.\XML_Svc_Conf.h -# End Source File -# Begin Source File - -SOURCE=.\XtReactor.h -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "i;inl" -# Begin Source File - -SOURCE=.\Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\ACE.i -# End Source File -# Begin Source File - -SOURCE=.\Activation_Queue.i -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager_T.i -# End Source File -# Begin Source File - -SOURCE=.\Addr.i -# End Source File -# Begin Source File - -SOURCE=.\ARGV.i -# End Source File -# Begin Source File - -SOURCE=.\Argv_Type_Converter.inl -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO.i -# End Source File -# Begin Source File - -SOURCE=.\Asynch_IO_Impl.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Params.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_QoS.i -# End Source File -# Begin Source File - -SOURCE=.\ATM_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Atomic_Op.i -# End Source File -# Begin Source File - -SOURCE=.\Auto_Ptr.i -# End Source File -# Begin Source File - -SOURCE=.\Base_Thread_Adapter.inl -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_T.i -# End Source File -# Begin Source File - -SOURCE=.\Basic_Stats.inl -# End Source File -# Begin Source File - -SOURCE=.\Basic_Types.i -# End Source File -# Begin Source File - -SOURCE=.\Bound_Ptr.i -# End Source File -# Begin Source File - -SOURCE=.\Cache_Map_Manager_T.i -# End Source File -# Begin Source File - -SOURCE=.\Cached_Connect_Strategy_T.i -# End Source File -# Begin Source File - -SOURCE=.\Caching_Strategies_T.i -# End Source File -# Begin Source File - -SOURCE=.\Caching_Strategy_Utility_T.i -# End Source File -# Begin Source File - -SOURCE=.\Capabilities.i -# End Source File -# Begin Source File - -SOURCE=.\CDR_Base.inl -# End Source File -# Begin Source File - -SOURCE=.\CDR_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Cleanup_Strategies_T.i -# End Source File -# Begin Source File - -SOURCE=.\Codeset_Registry.inl -# End Source File -# Begin Source File - -SOURCE=.\Configuration.i -# End Source File -# Begin Source File - -SOURCE=.\Connector.i -# End Source File -# Begin Source File - -SOURCE=.\Containers.i -# End Source File -# Begin Source File - -SOURCE=.\Containers_T.i -# End Source File -# Begin Source File - -SOURCE=.\Date_Time.i -# End Source File -# Begin Source File - -SOURCE=.\DEV.i -# End Source File -# Begin Source File - -SOURCE=.\DEV_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\DEV_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\DEV_IO.i -# End Source File -# Begin Source File - -SOURCE=.\Dirent.i -# End Source File -# Begin Source File - -SOURCE=.\Dirent_Selector.inl -# End Source File -# Begin Source File - -SOURCE=.\Dynamic.i -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Recv_Msg.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send.i -# End Source File -# Begin Source File - -SOURCE=.\FIFO_Send_Msg.i -# End Source File -# Begin Source File - -SOURCE=.\FILE.i -# End Source File -# Begin Source File - -SOURCE=.\FILE_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\FILE_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\FILE_IO.i -# End Source File -# Begin Source File - -SOURCE=.\File_Lock.inl -# End Source File -# Begin Source File - -SOURCE=.\Flag_Manip.i -# End Source File -# Begin Source File - -SOURCE=.\Framework_Component.inl -# End Source File -# Begin Source File - -SOURCE=.\Free_List.i -# End Source File -# Begin Source File - -SOURCE=.\Functor.i -# End Source File -# Begin Source File - -SOURCE=.\Functor_T.i -# End Source File -# Begin Source File - -SOURCE=.\Get_Opt.i -# End Source File -# Begin Source File - -SOURCE=.\Handle_Ops.i -# End Source File -# Begin Source File - -SOURCE=.\Handle_Set.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_Cache_Map_Manager_T.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager_T.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_With_Allocator_T.i -# End Source File -# Begin Source File - -SOURCE=.\Hashable.inl -# End Source File -# Begin Source File - -SOURCE=.\High_Res_Timer.i -# End Source File -# Begin Source File - -SOURCE=.\INET_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\Init_ACE.i -# End Source File -# Begin Source File - -SOURCE=.\IO_SAP.i -# End Source File -# Begin Source File - -SOURCE=.\IOStream_T.i -# End Source File -# Begin Source File - -SOURCE=.\IPC_SAP.i -# End Source File -# Begin Source File - -SOURCE=.\Lib_Find.i -# End Source File -# Begin Source File - -SOURCE=.\Local_Tokens.i -# End Source File -# Begin Source File - -SOURCE=.\Log_Record.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_CODgram.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Dgram.i -# End Source File -# Begin Source File - -SOURCE=.\LSOCK_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Malloc.i -# End Source File -# Begin Source File - -SOURCE=.\Malloc_Allocator.i -# End Source File -# Begin Source File - -SOURCE=.\Malloc_T.i -# End Source File -# Begin Source File - -SOURCE=.\Managed_Object.i -# End Source File -# Begin Source File - -SOURCE=.\Map_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Map_T.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_IO.i -# End Source File -# Begin Source File - -SOURCE=.\Mem_Map.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_SAP.i -# End Source File -# Begin Source File - -SOURCE=.\MEM_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Memory_Pool.i -# End Source File -# Begin Source File - -SOURCE=.\Message_Block.i -# End Source File -# Begin Source File - -SOURCE=.\Message_Block_T.i -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue.i -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue_T.i -# End Source File -# Begin Source File - -SOURCE=.\Module.i -# End Source File -# Begin Source File - -SOURCE=.\Msg_WFMO_Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Multiplexor.i -# End Source File -# Begin Source File - -SOURCE=.\Notification_Strategy.inl -# End Source File -# Begin Source File - -SOURCE=.\NT_Service.i -# End Source File -# Begin Source File - -SOURCE=.\Object_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Obstack.i -# End Source File -# Begin Source File - -SOURCE=.\Obstack_T.i -# End Source File -# Begin Source File - -SOURCE=.\OS.i -# End Source File -# Begin Source File - -SOURCE=.\OS_Dirent.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_Errno.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_Log_Msg_Attributes.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_Memory.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_String.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_Thread_Adapter.inl -# End Source File -# Begin Source File - -SOURCE=.\OS_TLI.inl -# End Source File -# Begin Source File - -SOURCE=.\Pair_T.i -# End Source File -# Begin Source File - -SOURCE=.\Parse_Node.i -# End Source File -# Begin Source File - -SOURCE=.\PI_Malloc.i -# End Source File -# Begin Source File - -SOURCE=.\Pipe.i -# End Source File -# Begin Source File - -SOURCE=.\Priority_Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Proactor.i -# End Source File -# Begin Source File - -SOURCE=.\Process.i -# End Source File -# Begin Source File - -SOURCE=.\Process_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Process_Mutex.inl -# End Source File -# Begin Source File - -SOURCE=.\Process_Semaphore.inl -# End Source File -# Begin Source File - -SOURCE=.\Profile_Timer.i -# End Source File -# Begin Source File - -SOURCE=.\QoS_Session_Impl.i -# End Source File -# Begin Source File - -SOURCE=.\RB_Tree.i -# End Source File -# Begin Source File - -SOURCE=.\Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Reactor_Notification_Strategy.inl -# End Source File -# Begin Source File - -SOURCE=.\ReactorEx.i -# End Source File -# Begin Source File - -SOURCE=.\Read_Buffer.i -# End Source File -# Begin Source File - -SOURCE=.\Recyclable.inl -# End Source File -# Begin Source File - -SOURCE=.\Refcountable.inl -# End Source File -# Begin Source File - -SOURCE=.\Refcounted_Auto_Ptr.i -# End Source File -# Begin Source File - -SOURCE=.\Remote_Tokens.i -# End Source File -# Begin Source File - -SOURCE=.\RW_Process_Mutex.inl -# End Source File -# Begin Source File - -SOURCE=.\Sample_History.inl -# End Source File -# Begin Source File - -SOURCE=.\Sched_Params.i -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_Base.i -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_T.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Config.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Object.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Repository.i -# End Source File -# Begin Source File - -SOURCE=.\Service_Types.i -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_MM.i -# End Source File -# Begin Source File - -SOURCE=.\Shared_Memory_SV.i -# End Source File -# Begin Source File - -SOURCE=.\Shared_Object.i -# End Source File -# Begin Source File - -SOURCE=.\Signal.i -# End Source File -# Begin Source File - -SOURCE=.\Singleton.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_CODgram.i -# End Source File -# Begin Source File - -SOURCE=.\Sock_Connect.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Bcast.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Dgram_Mcast_QoS.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_IO.i -# End Source File -# Begin Source File - -SOURCE=.\SOCK_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\SPIPE.i -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\SPIPE_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\SString.i -# End Source File -# Begin Source File - -SOURCE=.\Stats.i -# End Source File -# Begin Source File - -SOURCE=.\Strategies_T.i -# End Source File -# Begin Source File - -SOURCE=.\Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Stream_Modules.i -# End Source File -# Begin Source File - -SOURCE=.\String_Base.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Message.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Message_Queue.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Complex.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Semaphore_Simple.i -# End Source File -# Begin Source File - -SOURCE=.\SV_Shared_Memory.i -# End Source File -# Begin Source File - -SOURCE=.\Synch.i -# End Source File -# Begin Source File - -SOURCE=.\Synch_Options.i -# End Source File -# Begin Source File - -SOURCE=.\Synch_T.i -# End Source File -# Begin Source File - -SOURCE=.\Task.i -# End Source File -# Begin Source File - -SOURCE=.\Task_T.i -# End Source File -# Begin Source File - -SOURCE=.\Test_and_Set.i -# End Source File -# Begin Source File - -SOURCE=.\Thread.i -# End Source File -# Begin Source File - -SOURCE=.\Thread_Adapter.inl -# End Source File -# Begin Source File - -SOURCE=.\Thread_Control.inl -# End Source File -# Begin Source File - -SOURCE=.\Thread_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Time_Value.inl -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_Adapters.i -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_T.i -# End Source File -# Begin Source File - -SOURCE=.\TLI.i -# End Source File -# Begin Source File - -SOURCE=.\TLI_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\TLI_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\TLI_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\Token.i -# End Source File -# Begin Source File - -SOURCE=.\Token_Collection.i -# End Source File -# Begin Source File - -SOURCE=.\Token_Invariants.i -# End Source File -# Begin Source File - -SOURCE=.\Token_Manager.i -# End Source File -# Begin Source File - -SOURCE=.\Token_Request_Reply.i -# End Source File -# Begin Source File - -SOURCE=.\TP_Reactor.i -# End Source File -# Begin Source File - -SOURCE=.\Trace.i -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message.i -# End Source File -# Begin Source File - -SOURCE=.\Typed_SV_Message_Queue.i -# End Source File -# Begin Source File - -SOURCE=.\UNIX_Addr.i -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Acceptor.i -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Connector.i -# End Source File -# Begin Source File - -SOURCE=.\UPIPE_Stream.i -# End Source File -# Begin Source File - -SOURCE=.\WFMO_Reactor.i -# End Source File -# End Group -# Begin Group "Template Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\Acceptor.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Active_Map_Manager_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Asynch_Acceptor.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Auto_Ptr.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Based_Pointer_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Cache_Map_Manager_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Cached_Connect_Strategy_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Caching_Strategies_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Caching_Utility_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Cleanup_Strategies_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Connector.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Containers_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Dump_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Event_Handler_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Framework_Component_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Free_List.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Functor_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Future.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Hash_Cache_Map_Manager_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_Manager_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Hash_Map_With_Allocator_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\IOStream_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Local_Name_Space_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Malloc_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Managed_Object.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Map_Manager.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Map_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Message_Block_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Message_Queue_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Module.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Obstack_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Pair_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\RB_Tree.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Select_Reactor_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Singleton.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Strategies_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Stream.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Stream_Modules.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\String_Base.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Synch_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Task_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Test_and_Set.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_Hash_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_Heap_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_List_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_Queue_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\Timer_Wheel_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# End Group -# Begin Group "Documentation" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\Readme -# End Source File -# Begin Source File - -SOURCE=..\Version -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\ace.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/ace/ace_lib64.mak b/ace/ace_lib64.mak deleted file mode 100644 index 53aafa60801..00000000000 --- a/ace/ace_lib64.mak +++ /dev/null @@ -1,2361 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on ace_lib.dsp -!IF "$(CFG)" == "" -CFG=ACE LIB - Win64 Static Debug -!MESSAGE No configuration specified. Defaulting to ACE LIB - Win64 Static Debug. -!ENDIF - -!IF "$(CFG)" != "ACE LIB - Win64 Static Release" && "$(CFG)" != "ACE LIB - Win64 Static Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ace_lib.mak" CFG="ACE LIB - Win64 Static Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ACE LIB - Win64 Static Release" (based on "Win64 (x86) Static Library") -!MESSAGE "ACE LIB - Win64 Static Debug" (based on "Win64 (x86) Static Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "ACE LIB - Win64 Static Release" - -OUTDIR=. -INTDIR=.\LIB\Release -# Begin Custom Macros -OutDir=. -# End Custom Macros - -ALL : "$(OUTDIR)\aces.lib" - - -CLEAN : - -@erase "$(INTDIR)\ACE.obj" - -@erase "$(INTDIR)\ace.res" - -@erase "$(INTDIR)\Activation_Queue.obj" - -@erase "$(INTDIR)\Active_Map_Manager.obj" - -@erase "$(INTDIR)\Addr.obj" - -@erase "$(INTDIR)\Arg_Shifter.obj" - -@erase "$(INTDIR)\ARGV.obj" - -@erase "$(INTDIR)\Argv_Type_Converter.obj" - -@erase "$(INTDIR)\Asynch_Connector.obj" - -@erase "$(INTDIR)\Asynch_IO.obj" - -@erase "$(INTDIR)\Asynch_IO_Impl.obj" - -@erase "$(INTDIR)\Asynch_Pseudo_Task.obj" - -@erase "$(INTDIR)\ATM_Acceptor.obj" - -@erase "$(INTDIR)\ATM_Addr.obj" - -@erase "$(INTDIR)\ATM_Connector.obj" - -@erase "$(INTDIR)\ATM_Params.obj" - -@erase "$(INTDIR)\ATM_QoS.obj" - -@erase "$(INTDIR)\ATM_Stream.obj" - -@erase "$(INTDIR)\Atomic_Op.obj" - -@erase "$(INTDIR)\Base_Thread_Adapter.obj" - -@erase "$(INTDIR)\Based_Pointer_Repository.obj" - -@erase "$(INTDIR)\Basic_Stats.obj" - -@erase "$(INTDIR)\Basic_Types.obj" - -@erase "$(INTDIR)\Capabilities.obj" - -@erase "$(INTDIR)\CDR_Base.obj" - -@erase "$(INTDIR)\CDR_Stream.obj" - -@erase "$(INTDIR)\Codecs.obj" - -@erase "$(INTDIR)\Codeset_Registry.obj" - -@erase "$(INTDIR)\Codeset_Registry_db.obj" - -@erase "$(INTDIR)\Configuration.obj" - -@erase "$(INTDIR)\Configuration_Import_Export.obj" - -@erase "$(INTDIR)\Connection_Recycling_Strategy.obj" - -@erase "$(INTDIR)\Containers.obj" - -@erase "$(INTDIR)\Copy_Disabled.obj" - -@erase "$(INTDIR)\Date_Time.obj" - -@erase "$(INTDIR)\DEV.obj" - -@erase "$(INTDIR)\DEV_Addr.obj" - -@erase "$(INTDIR)\DEV_Connector.obj" - -@erase "$(INTDIR)\DEV_IO.obj" - -@erase "$(INTDIR)\Dirent.obj" - -@erase "$(INTDIR)\Dirent_Selector.obj" - -@erase "$(INTDIR)\DLL.obj" - -@erase "$(INTDIR)\DLL_Manager.obj" - -@erase "$(INTDIR)\Dump.obj" - -@erase "$(INTDIR)\Dynamic.obj" - -@erase "$(INTDIR)\Dynamic_Service.obj" - -@erase "$(INTDIR)\Dynamic_Service_Base.obj" - -@erase "$(INTDIR)\Event_Handler.obj" - -@erase "$(INTDIR)\Event_Handler_T.obj" - -@erase "$(INTDIR)\FIFO.obj" - -@erase "$(INTDIR)\FIFO_Recv.obj" - -@erase "$(INTDIR)\FIFO_Recv_Msg.obj" - -@erase "$(INTDIR)\FIFO_Send.obj" - -@erase "$(INTDIR)\FIFO_Send_Msg.obj" - -@erase "$(INTDIR)\FILE.obj" - -@erase "$(INTDIR)\FILE_Addr.obj" - -@erase "$(INTDIR)\FILE_Connector.obj" - -@erase "$(INTDIR)\FILE_IO.obj" - -@erase "$(INTDIR)\File_Lock.obj" - -@erase "$(INTDIR)\Filecache.obj" - -@erase "$(INTDIR)\Flag_Manip.obj" - -@erase "$(INTDIR)\Framework_Component.obj" - -@erase "$(INTDIR)\Framework_Component_T.obj" - -@erase "$(INTDIR)\Functor.obj" - -@erase "$(INTDIR)\Get_Opt.obj" - -@erase "$(INTDIR)\Handle_Ops.obj" - -@erase "$(INTDIR)\Handle_Set.obj" - -@erase "$(INTDIR)\Hash_Map_Manager.obj" - -@erase "$(INTDIR)\Hashable.obj" - -@erase "$(INTDIR)\High_Res_Timer.obj" - -@erase "$(INTDIR)\INET_Addr.obj" - -@erase "$(INTDIR)\Init_ACE.obj" - -@erase "$(INTDIR)\IO_Cntl_Msg.obj" - -@erase "$(INTDIR)\IO_SAP.obj" - -@erase "$(INTDIR)\IOStream.obj" - -@erase "$(INTDIR)\IPC_SAP.obj" - -@erase "$(INTDIR)\Lib_Find.obj" - -@erase "$(INTDIR)\Local_Name_Space.obj" - -@erase "$(INTDIR)\Local_Tokens.obj" - -@erase "$(INTDIR)\Log_Msg.obj" - -@erase "$(INTDIR)\Log_Msg_Backend.obj" - -@erase "$(INTDIR)\Log_Msg_Callback.obj" - -@erase "$(INTDIR)\Log_Msg_IPC.obj" - -@erase "$(INTDIR)\Log_Msg_NT_Event_Log.obj" - -@erase "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" - -@erase "$(INTDIR)\Log_Record.obj" - -@erase "$(INTDIR)\Logging_Strategy.obj" - -@erase "$(INTDIR)\LSOCK.obj" - -@erase "$(INTDIR)\LSOCK_Acceptor.obj" - -@erase "$(INTDIR)\LSOCK_CODgram.obj" - -@erase "$(INTDIR)\LSOCK_Connector.obj" - -@erase "$(INTDIR)\LSOCK_Dgram.obj" - -@erase "$(INTDIR)\LSOCK_Stream.obj" - -@erase "$(INTDIR)\Malloc.obj" - -@erase "$(INTDIR)\Malloc_Allocator.obj" - -@erase "$(INTDIR)\Malloc_Instantiations.obj" - -@erase "$(INTDIR)\Map.obj" - -@erase "$(INTDIR)\MEM_Acceptor.obj" - -@erase "$(INTDIR)\MEM_Addr.obj" - -@erase "$(INTDIR)\MEM_Connector.obj" - -@erase "$(INTDIR)\MEM_IO.obj" - -@erase "$(INTDIR)\Mem_Map.obj" - -@erase "$(INTDIR)\MEM_SAP.obj" - -@erase "$(INTDIR)\MEM_Stream.obj" - -@erase "$(INTDIR)\Memory_Pool.obj" - -@erase "$(INTDIR)\Message_Block.obj" - -@erase "$(INTDIR)\Message_Queue.obj" - -@erase "$(INTDIR)\Method_Request.obj" - -@erase "$(INTDIR)\Msg_WFMO_Reactor.obj" - -@erase "$(INTDIR)\Multiplexor.obj" - -@erase "$(INTDIR)\Name_Proxy.obj" - -@erase "$(INTDIR)\Name_Request_Reply.obj" - -@erase "$(INTDIR)\Name_Space.obj" - -@erase "$(INTDIR)\Naming_Context.obj" - -@erase "$(INTDIR)\Notification_Strategy.obj" - -@erase "$(INTDIR)\NT_Service.obj" - -@erase "$(INTDIR)\Obchunk.obj" - -@erase "$(INTDIR)\Object_Manager.obj" - -@erase "$(INTDIR)\Obstack.obj" - -@erase "$(INTDIR)\OS.obj" - -@erase "$(INTDIR)\OS_Dirent.obj" - -@erase "$(INTDIR)\OS_Errno.obj" - -@erase "$(INTDIR)\OS_Log_Msg_Attributes.obj" - -@erase "$(INTDIR)\OS_Memory.obj" - -@erase "$(INTDIR)\OS_QoS.obj" - -@erase "$(INTDIR)\OS_String.obj" - -@erase "$(INTDIR)\OS_Thread_Adapter.obj" - -@erase "$(INTDIR)\OS_TLI.obj" - -@erase "$(INTDIR)\Pair.obj" - -@erase "$(INTDIR)\Parse_Node.obj" - -@erase "$(INTDIR)\PI_Malloc.obj" - -@erase "$(INTDIR)\Pipe.obj" - -@erase "$(INTDIR)\POSIX_Asynch_IO.obj" - -@erase "$(INTDIR)\POSIX_Proactor.obj" - -@erase "$(INTDIR)\Priority_Reactor.obj" - -@erase "$(INTDIR)\Proactor.obj" - -@erase "$(INTDIR)\Process.obj" - -@erase "$(INTDIR)\Process_Manager.obj" - -@erase "$(INTDIR)\Process_Mutex.obj" - -@erase "$(INTDIR)\Process_Semaphore.obj" - -@erase "$(INTDIR)\Profile_Timer.obj" - -@erase "$(INTDIR)\Reactor.obj" - -@erase "$(INTDIR)\Reactor_Notification_Strategy.obj" - -@erase "$(INTDIR)\Read_Buffer.obj" - -@erase "$(INTDIR)\Recyclable.obj" - -@erase "$(INTDIR)\Refcountable.obj" - -@erase "$(INTDIR)\Registry.obj" - -@erase "$(INTDIR)\Registry_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Tokens.obj" - -@erase "$(INTDIR)\RW_Process_Mutex.obj" - -@erase "$(INTDIR)\Sample_History.obj" - -@erase "$(INTDIR)\Sched_Params.obj" - -@erase "$(INTDIR)\Select_Reactor.obj" - -@erase "$(INTDIR)\Select_Reactor_Base.obj" - -@erase "$(INTDIR)\Service_Config.obj" - -@erase "$(INTDIR)\Service_Manager.obj" - -@erase "$(INTDIR)\Service_Object.obj" - -@erase "$(INTDIR)\Service_Repository.obj" - -@erase "$(INTDIR)\Service_Templates.obj" - -@erase "$(INTDIR)\Service_Types.obj" - -@erase "$(INTDIR)\Shared_Memory.obj" - -@erase "$(INTDIR)\Shared_Memory_MM.obj" - -@erase "$(INTDIR)\Shared_Memory_SV.obj" - -@erase "$(INTDIR)\Shared_Object.obj" - -@erase "$(INTDIR)\Signal.obj" - -@erase "$(INTDIR)\SOCK.obj" - -@erase "$(INTDIR)\SOCK_Acceptor.obj" - -@erase "$(INTDIR)\SOCK_CODgram.obj" - -@erase "$(INTDIR)\Sock_Connect.obj" - -@erase "$(INTDIR)\SOCK_Connector.obj" - -@erase "$(INTDIR)\SOCK_Dgram.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Bcast.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Mcast.obj" - -@erase "$(INTDIR)\SOCK_IO.obj" - -@erase "$(INTDIR)\SOCK_Stream.obj" - -@erase "$(INTDIR)\SPIPE.obj" - -@erase "$(INTDIR)\SPIPE_Acceptor.obj" - -@erase "$(INTDIR)\SPIPE_Addr.obj" - -@erase "$(INTDIR)\SPIPE_Connector.obj" - -@erase "$(INTDIR)\SPIPE_Stream.obj" - -@erase "$(INTDIR)\SString.obj" - -@erase "$(INTDIR)\Stats.obj" - -@erase "$(INTDIR)\String_Base_Const.obj" - -@erase "$(INTDIR)\SV_Message.obj" - -@erase "$(INTDIR)\SV_Message_Queue.obj" - -@erase "$(INTDIR)\SV_Semaphore_Complex.obj" - -@erase "$(INTDIR)\SV_Semaphore_Simple.obj" - -@erase "$(INTDIR)\SV_Shared_Memory.obj" - -@erase "$(INTDIR)\Svc_Conf_l.obj" - -@erase "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" - -@erase "$(INTDIR)\Svc_Conf_y.obj" - -@erase "$(INTDIR)\Svc_Handler.obj" - -@erase "$(INTDIR)\Synch.obj" - -@erase "$(INTDIR)\Synch_Options.obj" - -@erase "$(INTDIR)\System_Time.obj" - -@erase "$(INTDIR)\Task.obj" - -@erase "$(INTDIR)\Template_Instantiations.obj" - -@erase "$(INTDIR)\Thread.obj" - -@erase "$(INTDIR)\Thread_Adapter.obj" - -@erase "$(INTDIR)\Thread_Control.obj" - -@erase "$(INTDIR)\Thread_Exit.obj" - -@erase "$(INTDIR)\Thread_Hook.obj" - -@erase "$(INTDIR)\Thread_Manager.obj" - -@erase "$(INTDIR)\Time_Request_Reply.obj" - -@erase "$(INTDIR)\Time_Value.obj" - -@erase "$(INTDIR)\Timeprobe.obj" - -@erase "$(INTDIR)\Timer_Hash.obj" - -@erase "$(INTDIR)\Timer_Heap.obj" - -@erase "$(INTDIR)\Timer_List.obj" - -@erase "$(INTDIR)\Timer_Queue.obj" - -@erase "$(INTDIR)\Timer_Queue_Adapters.obj" - -@erase "$(INTDIR)\Timer_Wheel.obj" - -@erase "$(INTDIR)\TLI.obj" - -@erase "$(INTDIR)\TLI_Acceptor.obj" - -@erase "$(INTDIR)\TLI_Connector.obj" - -@erase "$(INTDIR)\TLI_Stream.obj" - -@erase "$(INTDIR)\Token.obj" - -@erase "$(INTDIR)\Token_Collection.obj" - -@erase "$(INTDIR)\Token_Invariants.obj" - -@erase "$(INTDIR)\Token_Manager.obj" - -@erase "$(INTDIR)\Token_Request_Reply.obj" - -@erase "$(INTDIR)\TP_Reactor.obj" - -@erase "$(INTDIR)\Trace.obj" - -@erase "$(INTDIR)\TTY_IO.obj" - -@erase "$(INTDIR)\Typed_SV_Message.obj" - -@erase "$(INTDIR)\Typed_SV_Message_Queue.obj" - -@erase "$(INTDIR)\UNIX_Addr.obj" - -@erase "$(INTDIR)\UPIPE_Acceptor.obj" - -@erase "$(INTDIR)\UPIPE_Connector.obj" - -@erase "$(INTDIR)\UPIPE_Stream.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\WFMO_Reactor.obj" - -@erase "$(INTDIR)\WIN32_Asynch_IO.obj" - -@erase "$(INTDIR)\WIN32_Proactor.obj" - -@erase "$(INTDIR)\XML_Svc_Conf.obj" - -@erase "$(INTDIR)\XtReactor.obj" - -@erase "$(OUTDIR)\aces.lib" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -LINK32=link.exe -lib -MTL=midl.exe -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Wp64 /GX /Zi /O1 /I "../" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ace.res" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ace.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\aces.lib" -LIB32_OBJS= \ - "$(INTDIR)\ACE.obj" \ - "$(INTDIR)\Activation_Queue.obj" \ - "$(INTDIR)\Active_Map_Manager.obj" \ - "$(INTDIR)\Addr.obj" \ - "$(INTDIR)\Arg_Shifter.obj" \ - "$(INTDIR)\ARGV.obj" \ - "$(INTDIR)\Argv_Type_Converter.obj" \ - "$(INTDIR)\Asynch_Connector.obj" \ - "$(INTDIR)\Asynch_IO.obj" \ - "$(INTDIR)\Asynch_IO_Impl.obj" \ - "$(INTDIR)\Asynch_Pseudo_Task.obj" \ - "$(INTDIR)\ATM_Acceptor.obj" \ - "$(INTDIR)\ATM_Addr.obj" \ - "$(INTDIR)\ATM_Connector.obj" \ - "$(INTDIR)\ATM_Params.obj" \ - "$(INTDIR)\ATM_QoS.obj" \ - "$(INTDIR)\ATM_Stream.obj" \ - "$(INTDIR)\Base_Thread_Adapter.obj" \ - "$(INTDIR)\Based_Pointer_Repository.obj" \ - "$(INTDIR)\Basic_Stats.obj" \ - "$(INTDIR)\Basic_Types.obj" \ - "$(INTDIR)\Capabilities.obj" \ - "$(INTDIR)\CDR_Base.obj" \ - "$(INTDIR)\CDR_Stream.obj" \ - "$(INTDIR)\Codecs.obj" \ - "$(INTDIR)\Codeset_Registry.obj" - "$(INTDIR)\Codeset_Registry_db.obj" - "$(INTDIR)\Configuration.obj" \ - "$(INTDIR)\Configuration_Import_Export.obj" \ - "$(INTDIR)\Connection_Recycling_Strategy.obj" \ - "$(INTDIR)\Containers.obj" \ - "$(INTDIR)\Copy_Disabled.obj" \ - "$(INTDIR)\Date_Time.obj" \ - "$(INTDIR)\DEV.obj" \ - "$(INTDIR)\DEV_Addr.obj" \ - "$(INTDIR)\DEV_Connector.obj" \ - "$(INTDIR)\DEV_IO.obj" \ - "$(INTDIR)\Dirent.obj" \ - "$(INTDIR)\Dirent_Selector.obj" \ - "$(INTDIR)\DLL.obj" \ - "$(INTDIR)\DLL_Manager.obj" \ - "$(INTDIR)\Dump.obj" \ - "$(INTDIR)\Dynamic.obj" \ - "$(INTDIR)\Dynamic_Service.obj" \ - "$(INTDIR)\Dynamic_Service_Base.obj" \ - "$(INTDIR)\Event_Handler.obj" \ - "$(INTDIR)\Event_Handler_T.obj" \ - "$(INTDIR)\FIFO.obj" \ - "$(INTDIR)\FIFO_Recv.obj" \ - "$(INTDIR)\FIFO_Recv_Msg.obj" \ - "$(INTDIR)\FIFO_Send.obj" \ - "$(INTDIR)\FIFO_Send_Msg.obj" \ - "$(INTDIR)\FILE.obj" \ - "$(INTDIR)\FILE_Addr.obj" \ - "$(INTDIR)\FILE_Connector.obj" \ - "$(INTDIR)\FILE_IO.obj" \ - "$(INTDIR)\File_Lock.obj" \ - "$(INTDIR)\Filecache.obj" \ - "$(INTDIR)\Flag_Manip.obj" \ - "$(INTDIR)\Framework_Component.obj" \ - "$(INTDIR)\Functor.obj" \ - "$(INTDIR)\Get_Opt.obj" \ - "$(INTDIR)\Handle_Ops.obj" \ - "$(INTDIR)\Handle_Set.obj" \ - "$(INTDIR)\Hash_Map_Manager.obj" \ - "$(INTDIR)\Hashable.obj" \ - "$(INTDIR)\High_Res_Timer.obj" \ - "$(INTDIR)\INET_Addr.obj" \ - "$(INTDIR)\Init_ACE.obj" \ - "$(INTDIR)\IO_Cntl_Msg.obj" \ - "$(INTDIR)\IO_SAP.obj" \ - "$(INTDIR)\IOStream.obj" \ - "$(INTDIR)\IPC_SAP.obj" \ - "$(INTDIR)\Lib_Find.obj" \ - "$(INTDIR)\Local_Name_Space.obj" \ - "$(INTDIR)\Local_Tokens.obj" \ - "$(INTDIR)\Log_Msg.obj" \ - "$(INTDIR)\Log_Msg_Backend.obj" \ - "$(INTDIR)\Log_Msg_Callback.obj" \ - "$(INTDIR)\Log_Msg_IPC.obj" \ - "$(INTDIR)\Log_Msg_NT_Event_Log.obj" \ - "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" \ - "$(INTDIR)\Log_Record.obj" \ - "$(INTDIR)\Logging_Strategy.obj" \ - "$(INTDIR)\LSOCK.obj" \ - "$(INTDIR)\LSOCK_Acceptor.obj" \ - "$(INTDIR)\LSOCK_CODgram.obj" \ - "$(INTDIR)\LSOCK_Connector.obj" \ - "$(INTDIR)\LSOCK_Dgram.obj" \ - "$(INTDIR)\LSOCK_Stream.obj" \ - "$(INTDIR)\Malloc.obj" \ - "$(INTDIR)\Malloc_Allocator.obj" \ - "$(INTDIR)\Malloc_Instantiations.obj" \ - "$(INTDIR)\Map.obj" \ - "$(INTDIR)\MEM_Acceptor.obj" \ - "$(INTDIR)\MEM_Addr.obj" \ - "$(INTDIR)\MEM_Connector.obj" \ - "$(INTDIR)\MEM_IO.obj" \ - "$(INTDIR)\Mem_Map.obj" \ - "$(INTDIR)\MEM_SAP.obj" \ - "$(INTDIR)\MEM_Stream.obj" \ - "$(INTDIR)\Memory_Pool.obj" \ - "$(INTDIR)\Message_Block.obj" \ - "$(INTDIR)\Message_Queue.obj" \ - "$(INTDIR)\Method_Request.obj" \ - "$(INTDIR)\Msg_WFMO_Reactor.obj" \ - "$(INTDIR)\Multiplexor.obj" \ - "$(INTDIR)\Name_Proxy.obj" \ - "$(INTDIR)\Name_Request_Reply.obj" \ - "$(INTDIR)\Name_Space.obj" \ - "$(INTDIR)\Naming_Context.obj" \ - "$(INTDIR)\Notification_Strategy.obj" \ - "$(INTDIR)\NT_Service.obj" \ - "$(INTDIR)\Obchunk.obj" \ - "$(INTDIR)\Object_Manager.obj" \ - "$(INTDIR)\Obstack.obj" \ - "$(INTDIR)\OS.obj" \ - "$(INTDIR)\OS_Dirent.obj" \ - "$(INTDIR)\OS_Errno.obj" \ - "$(INTDIR)\OS_Log_Msg_Attributes.obj" \ - "$(INTDIR)\OS_Memory.obj" \ - "$(INTDIR)\OS_QoS.obj" \ - "$(INTDIR)\OS_String.obj" \ - "$(INTDIR)\OS_Thread_Adapter.obj" \ - "$(INTDIR)\OS_TLI.obj" \ - "$(INTDIR)\Pair.obj" \ - "$(INTDIR)\Parse_Node.obj" \ - "$(INTDIR)\PI_Malloc.obj" \ - "$(INTDIR)\Pipe.obj" \ - "$(INTDIR)\POSIX_Asynch_IO.obj" \ - "$(INTDIR)\POSIX_Proactor.obj" \ - "$(INTDIR)\Priority_Reactor.obj" \ - "$(INTDIR)\Proactor.obj" \ - "$(INTDIR)\Process.obj" \ - "$(INTDIR)\Process_Manager.obj" \ - "$(INTDIR)\Process_Mutex.obj" \ - "$(INTDIR)\Process_Semaphore.obj" \ - "$(INTDIR)\Profile_Timer.obj" \ - "$(INTDIR)\Reactor.obj" \ - "$(INTDIR)\Reactor_Notification_Strategy.obj" \ - "$(INTDIR)\Read_Buffer.obj" \ - "$(INTDIR)\Recyclable.obj" \ - "$(INTDIR)\Refcountable.obj" \ - "$(INTDIR)\Registry.obj" \ - "$(INTDIR)\Registry_Name_Space.obj" \ - "$(INTDIR)\Remote_Name_Space.obj" \ - "$(INTDIR)\Remote_Tokens.obj" \ - "$(INTDIR)\RW_Process_Mutex.obj" \ - "$(INTDIR)\Sample_History.obj" \ - "$(INTDIR)\Sched_Params.obj" \ - "$(INTDIR)\Select_Reactor.obj" \ - "$(INTDIR)\Select_Reactor_Base.obj" \ - "$(INTDIR)\Service_Config.obj" \ - "$(INTDIR)\Service_Manager.obj" \ - "$(INTDIR)\Service_Object.obj" \ - "$(INTDIR)\Service_Repository.obj" \ - "$(INTDIR)\Service_Templates.obj" \ - "$(INTDIR)\Service_Types.obj" \ - "$(INTDIR)\Shared_Memory.obj" \ - "$(INTDIR)\Shared_Memory_MM.obj" \ - "$(INTDIR)\Shared_Memory_SV.obj" \ - "$(INTDIR)\Shared_Object.obj" \ - "$(INTDIR)\Signal.obj" \ - "$(INTDIR)\SOCK.obj" \ - "$(INTDIR)\SOCK_Acceptor.obj" \ - "$(INTDIR)\SOCK_CODgram.obj" \ - "$(INTDIR)\Sock_Connect.obj" \ - "$(INTDIR)\SOCK_Connector.obj" \ - "$(INTDIR)\SOCK_Dgram.obj" \ - "$(INTDIR)\SOCK_Dgram_Bcast.obj" \ - "$(INTDIR)\SOCK_Dgram_Mcast.obj" \ - "$(INTDIR)\SOCK_IO.obj" \ - "$(INTDIR)\SOCK_Stream.obj" \ - "$(INTDIR)\SPIPE.obj" \ - "$(INTDIR)\SPIPE_Acceptor.obj" \ - "$(INTDIR)\SPIPE_Addr.obj" \ - "$(INTDIR)\SPIPE_Connector.obj" \ - "$(INTDIR)\SPIPE_Stream.obj" \ - "$(INTDIR)\SString.obj" \ - "$(INTDIR)\Stats.obj" \ - "$(INTDIR)\String_Base_Const.obj" \ - "$(INTDIR)\SV_Message.obj" \ - "$(INTDIR)\SV_Message_Queue.obj" \ - "$(INTDIR)\SV_Semaphore_Complex.obj" \ - "$(INTDIR)\SV_Semaphore_Simple.obj" \ - "$(INTDIR)\SV_Shared_Memory.obj" \ - "$(INTDIR)\Svc_Conf_l.obj" \ - "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" \ - "$(INTDIR)\Svc_Conf_y.obj" \ - "$(INTDIR)\Svc_Handler.obj" \ - "$(INTDIR)\Synch.obj" \ - "$(INTDIR)\Synch_Options.obj" \ - "$(INTDIR)\System_Time.obj" \ - "$(INTDIR)\Task.obj" \ - "$(INTDIR)\Template_Instantiations.obj" \ - "$(INTDIR)\Thread.obj" \ - "$(INTDIR)\Thread_Adapter.obj" \ - "$(INTDIR)\Thread_Control.obj" \ - "$(INTDIR)\Thread_Exit.obj" \ - "$(INTDIR)\Thread_Hook.obj" \ - "$(INTDIR)\Thread_Manager.obj" \ - "$(INTDIR)\Time_Request_Reply.obj" \ - "$(INTDIR)\Time_Value.obj" \ - "$(INTDIR)\Timeprobe.obj" \ - "$(INTDIR)\Timer_Hash.obj" \ - "$(INTDIR)\Timer_Heap.obj" \ - "$(INTDIR)\Timer_List.obj" \ - "$(INTDIR)\Timer_Queue.obj" \ - "$(INTDIR)\Timer_Queue_Adapters.obj" \ - "$(INTDIR)\Timer_Wheel.obj" \ - "$(INTDIR)\TLI.obj" \ - "$(INTDIR)\TLI_Acceptor.obj" \ - "$(INTDIR)\TLI_Connector.obj" \ - "$(INTDIR)\TLI_Stream.obj" \ - "$(INTDIR)\Token.obj" \ - "$(INTDIR)\Token_Collection.obj" \ - "$(INTDIR)\Token_Invariants.obj" \ - "$(INTDIR)\Token_Manager.obj" \ - "$(INTDIR)\Token_Request_Reply.obj" \ - "$(INTDIR)\TP_Reactor.obj" \ - "$(INTDIR)\Trace.obj" \ - "$(INTDIR)\TTY_IO.obj" \ - "$(INTDIR)\Typed_SV_Message.obj" \ - "$(INTDIR)\Typed_SV_Message_Queue.obj" \ - "$(INTDIR)\UNIX_Addr.obj" \ - "$(INTDIR)\UPIPE_Acceptor.obj" \ - "$(INTDIR)\UPIPE_Connector.obj" \ - "$(INTDIR)\UPIPE_Stream.obj" \ - "$(INTDIR)\WFMO_Reactor.obj" \ - "$(INTDIR)\WIN32_Asynch_IO.obj" \ - "$(INTDIR)\WIN32_Proactor.obj" \ - "$(INTDIR)\XML_Svc_Conf.obj" \ - "$(INTDIR)\XtReactor.obj" \ - "$(INTDIR)\Atomic_Op.obj" \ - "$(INTDIR)\Framework_Component_T.obj" \ - "$(INTDIR)\ace.res" - -"$(OUTDIR)\aces.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "ACE LIB - Win64 Static Debug" - -OUTDIR=. -INTDIR=.\LIB\Debug -# Begin Custom Macros -OutDir=. -# End Custom Macros - -ALL : "$(OUTDIR)\acesd.lib" - - -CLEAN : - -@erase "$(INTDIR)\ACE.obj" - -@erase "$(INTDIR)\ace.res" - -@erase "$(INTDIR)\Activation_Queue.obj" - -@erase "$(INTDIR)\Active_Map_Manager.obj" - -@erase "$(INTDIR)\Addr.obj" - -@erase "$(INTDIR)\Arg_Shifter.obj" - -@erase "$(INTDIR)\ARGV.obj" - -@erase "$(INTDIR)\Argv_Type_Converter.obj" - -@erase "$(INTDIR)\Asynch_Connector.obj" - -@erase "$(INTDIR)\Asynch_IO.obj" - -@erase "$(INTDIR)\Asynch_IO_Impl.obj" - -@erase "$(INTDIR)\Asynch_Pseudo_Task.obj" - -@erase "$(INTDIR)\ATM_Acceptor.obj" - -@erase "$(INTDIR)\ATM_Addr.obj" - -@erase "$(INTDIR)\ATM_Connector.obj" - -@erase "$(INTDIR)\ATM_Params.obj" - -@erase "$(INTDIR)\ATM_QoS.obj" - -@erase "$(INTDIR)\ATM_Stream.obj" - -@erase "$(INTDIR)\Base_Thread_Adapter.obj" - -@erase "$(INTDIR)\Based_Pointer_Repository.obj" - -@erase "$(INTDIR)\Basic_Stats.obj" - -@erase "$(INTDIR)\Basic_Types.obj" - -@erase "$(INTDIR)\Capabilities.obj" - -@erase "$(INTDIR)\CDR_Base.obj" - -@erase "$(INTDIR)\CDR_Stream.obj" - -@erase "$(INTDIR)\Codecs.obj" - -@erase "$(INTDIR)\Codeset_Registry.obj" - -@erase "$(INTDIR)\Codeset_Registry_db.obj" - -@erase "$(INTDIR)\Configuration.obj" - -@erase "$(INTDIR)\Configuration_Import_Export.obj" - -@erase "$(INTDIR)\Connection_Recycling_Strategy.obj" - -@erase "$(INTDIR)\Containers.obj" - -@erase "$(INTDIR)\Copy_Disabled.obj" - -@erase "$(INTDIR)\Date_Time.obj" - -@erase "$(INTDIR)\DEV.obj" - -@erase "$(INTDIR)\DEV_Addr.obj" - -@erase "$(INTDIR)\DEV_Connector.obj" - -@erase "$(INTDIR)\DEV_IO.obj" - -@erase "$(INTDIR)\Dirent.obj" - -@erase "$(INTDIR)\Dirent_Selector.obj" - -@erase "$(INTDIR)\DLL.obj" - -@erase "$(INTDIR)\DLL_Manager.obj" - -@erase "$(INTDIR)\Dump.obj" - -@erase "$(INTDIR)\Dynamic.obj" - -@erase "$(INTDIR)\Dynamic_Service.obj" - -@erase "$(INTDIR)\Dynamic_Service_Base.obj" - -@erase "$(INTDIR)\Event_Handler.obj" - -@erase "$(INTDIR)\Event_Handler_T.obj" - -@erase "$(INTDIR)\FIFO.obj" - -@erase "$(INTDIR)\FIFO_Recv.obj" - -@erase "$(INTDIR)\FIFO_Recv_Msg.obj" - -@erase "$(INTDIR)\FIFO_Send.obj" - -@erase "$(INTDIR)\FIFO_Send_Msg.obj" - -@erase "$(INTDIR)\FILE.obj" - -@erase "$(INTDIR)\FILE_Addr.obj" - -@erase "$(INTDIR)\FILE_Connector.obj" - -@erase "$(INTDIR)\FILE_IO.obj" - -@erase "$(INTDIR)\File_Lock.obj" - -@erase "$(INTDIR)\Filecache.obj" - -@erase "$(INTDIR)\Flag_Manip.obj" - -@erase "$(INTDIR)\Framework_Component.obj" - -@erase "$(INTDIR)\Functor.obj" - -@erase "$(INTDIR)\Get_Opt.obj" - -@erase "$(INTDIR)\Handle_Ops.obj" - -@erase "$(INTDIR)\Handle_Set.obj" - -@erase "$(INTDIR)\Hash_Map_Manager.obj" - -@erase "$(INTDIR)\Hashable.obj" - -@erase "$(INTDIR)\High_Res_Timer.obj" - -@erase "$(INTDIR)\INET_Addr.obj" - -@erase "$(INTDIR)\Init_ACE.obj" - -@erase "$(INTDIR)\IO_Cntl_Msg.obj" - -@erase "$(INTDIR)\IO_SAP.obj" - -@erase "$(INTDIR)\IOStream.obj" - -@erase "$(INTDIR)\IPC_SAP.obj" - -@erase "$(INTDIR)\Lib_Find.obj" - -@erase "$(INTDIR)\Local_Name_Space.obj" - -@erase "$(INTDIR)\Local_Tokens.obj" - -@erase "$(INTDIR)\Log_Msg.obj" - -@erase "$(INTDIR)\Log_Msg_Backend.obj" - -@erase "$(INTDIR)\Log_Msg_Callback.obj" - -@erase "$(INTDIR)\Log_Msg_IPC.obj" - -@erase "$(INTDIR)\Log_Msg_NT_Event_Log.obj" - -@erase "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" - -@erase "$(INTDIR)\Log_Record.obj" - -@erase "$(INTDIR)\Logging_Strategy.obj" - -@erase "$(INTDIR)\LSOCK.obj" - -@erase "$(INTDIR)\LSOCK_Acceptor.obj" - -@erase "$(INTDIR)\LSOCK_CODgram.obj" - -@erase "$(INTDIR)\LSOCK_Connector.obj" - -@erase "$(INTDIR)\LSOCK_Dgram.obj" - -@erase "$(INTDIR)\LSOCK_Stream.obj" - -@erase "$(INTDIR)\Malloc.obj" - -@erase "$(INTDIR)\Malloc_Allocator.obj" - -@erase "$(INTDIR)\Malloc_Instantiations.obj" - -@erase "$(INTDIR)\Map.obj" - -@erase "$(INTDIR)\MEM_Acceptor.obj" - -@erase "$(INTDIR)\MEM_Addr.obj" - -@erase "$(INTDIR)\MEM_Connector.obj" - -@erase "$(INTDIR)\MEM_IO.obj" - -@erase "$(INTDIR)\Mem_Map.obj" - -@erase "$(INTDIR)\MEM_SAP.obj" - -@erase "$(INTDIR)\MEM_Stream.obj" - -@erase "$(INTDIR)\Memory_Pool.obj" - -@erase "$(INTDIR)\Message_Block.obj" - -@erase "$(INTDIR)\Message_Queue.obj" - -@erase "$(INTDIR)\Method_Request.obj" - -@erase "$(INTDIR)\Msg_WFMO_Reactor.obj" - -@erase "$(INTDIR)\Multiplexor.obj" - -@erase "$(INTDIR)\Name_Proxy.obj" - -@erase "$(INTDIR)\Name_Request_Reply.obj" - -@erase "$(INTDIR)\Name_Space.obj" - -@erase "$(INTDIR)\Naming_Context.obj" - -@erase "$(INTDIR)\Notification_Strategy.obj" - -@erase "$(INTDIR)\NT_Service.obj" - -@erase "$(INTDIR)\Obchunk.obj" - -@erase "$(INTDIR)\Object_Manager.obj" - -@erase "$(INTDIR)\Obstack.obj" - -@erase "$(INTDIR)\OS.obj" - -@erase "$(INTDIR)\OS_Dirent.obj" - -@erase "$(INTDIR)\OS_Errno.obj" - -@erase "$(INTDIR)\OS_Log_Msg_Attributes.obj" - -@erase "$(INTDIR)\OS_Memory.obj" - -@erase "$(INTDIR)\OS_QoS.obj" - -@erase "$(INTDIR)\OS_String.obj" - -@erase "$(INTDIR)\OS_Thread_Adapter.obj" - -@erase "$(INTDIR)\OS_TLI.obj" - -@erase "$(INTDIR)\Pair.obj" - -@erase "$(INTDIR)\Parse_Node.obj" - -@erase "$(INTDIR)\PI_Malloc.obj" - -@erase "$(INTDIR)\Pipe.obj" - -@erase "$(INTDIR)\POSIX_Asynch_IO.obj" - -@erase "$(INTDIR)\POSIX_Proactor.obj" - -@erase "$(INTDIR)\Priority_Reactor.obj" - -@erase "$(INTDIR)\Proactor.obj" - -@erase "$(INTDIR)\Process.obj" - -@erase "$(INTDIR)\Process_Manager.obj" - -@erase "$(INTDIR)\Process_Mutex.obj" - -@erase "$(INTDIR)\Process_Semaphore.obj" - -@erase "$(INTDIR)\Profile_Timer.obj" - -@erase "$(INTDIR)\Reactor.obj" - -@erase "$(INTDIR)\Reactor_Notification_Strategy.obj" - -@erase "$(INTDIR)\Read_Buffer.obj" - -@erase "$(INTDIR)\Recyclable.obj" - -@erase "$(INTDIR)\Refcountable.obj" - -@erase "$(INTDIR)\Registry.obj" - -@erase "$(INTDIR)\Registry_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Name_Space.obj" - -@erase "$(INTDIR)\Remote_Tokens.obj" - -@erase "$(INTDIR)\RW_Process_Mutex.obj" - -@erase "$(INTDIR)\Sample_History.obj" - -@erase "$(INTDIR)\Sched_Params.obj" - -@erase "$(INTDIR)\Select_Reactor.obj" - -@erase "$(INTDIR)\Select_Reactor_Base.obj" - -@erase "$(INTDIR)\Service_Config.obj" - -@erase "$(INTDIR)\Service_Manager.obj" - -@erase "$(INTDIR)\Service_Object.obj" - -@erase "$(INTDIR)\Service_Repository.obj" - -@erase "$(INTDIR)\Service_Templates.obj" - -@erase "$(INTDIR)\Service_Types.obj" - -@erase "$(INTDIR)\Shared_Memory.obj" - -@erase "$(INTDIR)\Shared_Memory_MM.obj" - -@erase "$(INTDIR)\Shared_Memory_SV.obj" - -@erase "$(INTDIR)\Shared_Object.obj" - -@erase "$(INTDIR)\Signal.obj" - -@erase "$(INTDIR)\SOCK.obj" - -@erase "$(INTDIR)\SOCK_Acceptor.obj" - -@erase "$(INTDIR)\SOCK_CODgram.obj" - -@erase "$(INTDIR)\Sock_Connect.obj" - -@erase "$(INTDIR)\SOCK_Connector.obj" - -@erase "$(INTDIR)\SOCK_Dgram.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Bcast.obj" - -@erase "$(INTDIR)\SOCK_Dgram_Mcast.obj" - -@erase "$(INTDIR)\SOCK_IO.obj" - -@erase "$(INTDIR)\SOCK_Stream.obj" - -@erase "$(INTDIR)\SPIPE.obj" - -@erase "$(INTDIR)\SPIPE_Acceptor.obj" - -@erase "$(INTDIR)\SPIPE_Addr.obj" - -@erase "$(INTDIR)\SPIPE_Connector.obj" - -@erase "$(INTDIR)\SPIPE_Stream.obj" - -@erase "$(INTDIR)\SString.obj" - -@erase "$(INTDIR)\Stats.obj" - -@erase "$(INTDIR)\String_Base_Const.obj" - -@erase "$(INTDIR)\SV_Message.obj" - -@erase "$(INTDIR)\SV_Message_Queue.obj" - -@erase "$(INTDIR)\SV_Semaphore_Complex.obj" - -@erase "$(INTDIR)\SV_Semaphore_Simple.obj" - -@erase "$(INTDIR)\SV_Shared_Memory.obj" - -@erase "$(INTDIR)\Svc_Conf_l.obj" - -@erase "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" - -@erase "$(INTDIR)\Svc_Conf_y.obj" - -@erase "$(INTDIR)\Svc_Handler.obj" - -@erase "$(INTDIR)\Synch.obj" - -@erase "$(INTDIR)\Synch_Options.obj" - -@erase "$(INTDIR)\System_Time.obj" - -@erase "$(INTDIR)\Task.obj" - -@erase "$(INTDIR)\Template_Instantiations.obj" - -@erase "$(INTDIR)\Thread.obj" - -@erase "$(INTDIR)\Thread_Adapter.obj" - -@erase "$(INTDIR)\Thread_Control.obj" - -@erase "$(INTDIR)\Thread_Exit.obj" - -@erase "$(INTDIR)\Thread_Hook.obj" - -@erase "$(INTDIR)\Thread_Manager.obj" - -@erase "$(INTDIR)\Time_Request_Reply.obj" - -@erase "$(INTDIR)\Time_Value.obj" - -@erase "$(INTDIR)\Timeprobe.obj" - -@erase "$(INTDIR)\Timer_Hash.obj" - -@erase "$(INTDIR)\Timer_Heap.obj" - -@erase "$(INTDIR)\Timer_List.obj" - -@erase "$(INTDIR)\Timer_Queue.obj" - -@erase "$(INTDIR)\Timer_Queue_Adapters.obj" - -@erase "$(INTDIR)\Timer_Wheel.obj" - -@erase "$(INTDIR)\TLI.obj" - -@erase "$(INTDIR)\TLI_Acceptor.obj" - -@erase "$(INTDIR)\TLI_Connector.obj" - -@erase "$(INTDIR)\TLI_Stream.obj" - -@erase "$(INTDIR)\Token.obj" - -@erase "$(INTDIR)\Token_Collection.obj" - -@erase "$(INTDIR)\Token_Invariants.obj" - -@erase "$(INTDIR)\Token_Manager.obj" - -@erase "$(INTDIR)\Token_Request_Reply.obj" - -@erase "$(INTDIR)\TP_Reactor.obj" - -@erase "$(INTDIR)\Trace.obj" - -@erase "$(INTDIR)\TTY_IO.obj" - -@erase "$(INTDIR)\Typed_SV_Message.obj" - -@erase "$(INTDIR)\Typed_SV_Message_Queue.obj" - -@erase "$(INTDIR)\UNIX_Addr.obj" - -@erase "$(INTDIR)\UPIPE_Acceptor.obj" - -@erase "$(INTDIR)\UPIPE_Connector.obj" - -@erase "$(INTDIR)\UPIPE_Stream.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\WFMO_Reactor.obj" - -@erase "$(INTDIR)\WIN32_Asynch_IO.obj" - -@erase "$(INTDIR)\WIN32_Proactor.obj" - -@erase "$(INTDIR)\XML_Svc_Conf.obj" - -@erase "$(INTDIR)\XtReactor.obj" - -@erase "$(OUTDIR)\acesd.lib" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -LINK32=link.exe -lib -MTL=midl.exe -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Wp64 /Gm /GX /Zi /Od /Gy /I "../" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ace.res" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ace.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\acesd.lib" -LIB32_OBJS= \ - "$(INTDIR)\ACE.obj" \ - "$(INTDIR)\Activation_Queue.obj" \ - "$(INTDIR)\Active_Map_Manager.obj" \ - "$(INTDIR)\Addr.obj" \ - "$(INTDIR)\Arg_Shifter.obj" \ - "$(INTDIR)\ARGV.obj" \ - "$(INTDIR)\Argv_Type_Converter.obj" \ - "$(INTDIR)\Asynch_Connector.obj" \ - "$(INTDIR)\Asynch_IO.obj" \ - "$(INTDIR)\Asynch_IO_Impl.obj" \ - "$(INTDIR)\Asynch_Pseudo_Task.obj" \ - "$(INTDIR)\ATM_Acceptor.obj" \ - "$(INTDIR)\ATM_Addr.obj" \ - "$(INTDIR)\ATM_Connector.obj" \ - "$(INTDIR)\ATM_Params.obj" \ - "$(INTDIR)\ATM_QoS.obj" \ - "$(INTDIR)\ATM_Stream.obj" \ - "$(INTDIR)\Base_Thread_Adapter.obj" \ - "$(INTDIR)\Based_Pointer_Repository.obj" \ - "$(INTDIR)\Basic_Stats.obj" \ - "$(INTDIR)\Basic_Types.obj" \ - "$(INTDIR)\Capabilities.obj" \ - "$(INTDIR)\CDR_Base.obj" \ - "$(INTDIR)\CDR_Stream.obj" \ - "$(INTDIR)\Codecs.obj" \ - "$(INTDIR)\Codeset_Registry.obj" - "$(INTDIR)\Codeset_Registry_db.obj" - "$(INTDIR)\Configuration.obj" \ - "$(INTDIR)\Configuration_Import_Export.obj" \ - "$(INTDIR)\Connection_Recycling_Strategy.obj" \ - "$(INTDIR)\Containers.obj" \ - "$(INTDIR)\Copy_Disabled.obj" \ - "$(INTDIR)\Date_Time.obj" \ - "$(INTDIR)\DEV.obj" \ - "$(INTDIR)\DEV_Addr.obj" \ - "$(INTDIR)\DEV_Connector.obj" \ - "$(INTDIR)\DEV_IO.obj" \ - "$(INTDIR)\Dirent.obj" \ - "$(INTDIR)\Dirent_Selector.obj" \ - "$(INTDIR)\DLL.obj" \ - "$(INTDIR)\DLL_Manager.obj" \ - "$(INTDIR)\Dump.obj" \ - "$(INTDIR)\Dynamic.obj" \ - "$(INTDIR)\Dynamic_Service.obj" \ - "$(INTDIR)\Dynamic_Service_Base.obj" \ - "$(INTDIR)\Event_Handler.obj" \ - "$(INTDIR)\Event_Handler_T.obj" \ - "$(INTDIR)\FIFO.obj" \ - "$(INTDIR)\FIFO_Recv.obj" \ - "$(INTDIR)\FIFO_Recv_Msg.obj" \ - "$(INTDIR)\FIFO_Send.obj" \ - "$(INTDIR)\FIFO_Send_Msg.obj" \ - "$(INTDIR)\FILE.obj" \ - "$(INTDIR)\FILE_Addr.obj" \ - "$(INTDIR)\FILE_Connector.obj" \ - "$(INTDIR)\FILE_IO.obj" \ - "$(INTDIR)\File_Lock.obj" \ - "$(INTDIR)\Filecache.obj" \ - "$(INTDIR)\Flag_Manip.obj" \ - "$(INTDIR)\Framework_Component.obj" \ - "$(INTDIR)\Functor.obj" \ - "$(INTDIR)\Get_Opt.obj" \ - "$(INTDIR)\Handle_Ops.obj" \ - "$(INTDIR)\Handle_Set.obj" \ - "$(INTDIR)\Hash_Map_Manager.obj" \ - "$(INTDIR)\Hashable.obj" \ - "$(INTDIR)\High_Res_Timer.obj" \ - "$(INTDIR)\INET_Addr.obj" \ - "$(INTDIR)\Init_ACE.obj" \ - "$(INTDIR)\IO_Cntl_Msg.obj" \ - "$(INTDIR)\IO_SAP.obj" \ - "$(INTDIR)\IOStream.obj" \ - "$(INTDIR)\IPC_SAP.obj" \ - "$(INTDIR)\Lib_Find.obj" \ - "$(INTDIR)\Local_Name_Space.obj" \ - "$(INTDIR)\Local_Tokens.obj" \ - "$(INTDIR)\Log_Msg.obj" \ - "$(INTDIR)\Log_Msg_Backend.obj" \ - "$(INTDIR)\Log_Msg_Callback.obj" \ - "$(INTDIR)\Log_Msg_IPC.obj" \ - "$(INTDIR)\Log_Msg_NT_Event_Log.obj" \ - "$(INTDIR)\Log_Msg_UNIX_Syslog.obj" \ - "$(INTDIR)\Log_Record.obj" \ - "$(INTDIR)\Logging_Strategy.obj" \ - "$(INTDIR)\LSOCK.obj" \ - "$(INTDIR)\LSOCK_Acceptor.obj" \ - "$(INTDIR)\LSOCK_CODgram.obj" \ - "$(INTDIR)\LSOCK_Connector.obj" \ - "$(INTDIR)\LSOCK_Dgram.obj" \ - "$(INTDIR)\LSOCK_Stream.obj" \ - "$(INTDIR)\Malloc.obj" \ - "$(INTDIR)\Malloc_Allocator.obj" \ - "$(INTDIR)\Malloc_Instantiations.obj" \ - "$(INTDIR)\Map.obj" \ - "$(INTDIR)\MEM_Acceptor.obj" \ - "$(INTDIR)\MEM_Addr.obj" \ - "$(INTDIR)\MEM_Connector.obj" \ - "$(INTDIR)\MEM_IO.obj" \ - "$(INTDIR)\Mem_Map.obj" \ - "$(INTDIR)\MEM_SAP.obj" \ - "$(INTDIR)\MEM_Stream.obj" \ - "$(INTDIR)\Memory_Pool.obj" \ - "$(INTDIR)\Message_Block.obj" \ - "$(INTDIR)\Message_Queue.obj" \ - "$(INTDIR)\Method_Request.obj" \ - "$(INTDIR)\Msg_WFMO_Reactor.obj" \ - "$(INTDIR)\Multiplexor.obj" \ - "$(INTDIR)\Name_Proxy.obj" \ - "$(INTDIR)\Name_Request_Reply.obj" \ - "$(INTDIR)\Name_Space.obj" \ - "$(INTDIR)\Naming_Context.obj" \ - "$(INTDIR)\Notification_Strategy.obj" \ - "$(INTDIR)\NT_Service.obj" \ - "$(INTDIR)\Obchunk.obj" \ - "$(INTDIR)\Object_Manager.obj" \ - "$(INTDIR)\Obstack.obj" \ - "$(INTDIR)\OS.obj" \ - "$(INTDIR)\OS_Dirent.obj" \ - "$(INTDIR)\OS_Errno.obj" \ - "$(INTDIR)\OS_Log_Msg_Attributes.obj" \ - "$(INTDIR)\OS_Memory.obj" \ - "$(INTDIR)\OS_QoS.obj" \ - "$(INTDIR)\OS_String.obj" \ - "$(INTDIR)\OS_Thread_Adapter.obj" \ - "$(INTDIR)\OS_TLI.obj" \ - "$(INTDIR)\Pair.obj" \ - "$(INTDIR)\Parse_Node.obj" \ - "$(INTDIR)\PI_Malloc.obj" \ - "$(INTDIR)\Pipe.obj" \ - "$(INTDIR)\POSIX_Asynch_IO.obj" \ - "$(INTDIR)\POSIX_Proactor.obj" \ - "$(INTDIR)\Priority_Reactor.obj" \ - "$(INTDIR)\Proactor.obj" \ - "$(INTDIR)\Process.obj" \ - "$(INTDIR)\Process_Manager.obj" \ - "$(INTDIR)\Process_Mutex.obj" \ - "$(INTDIR)\Process_Semaphore.obj" \ - "$(INTDIR)\Profile_Timer.obj" \ - "$(INTDIR)\Reactor.obj" \ - "$(INTDIR)\Reactor_Notification_Strategy.obj" \ - "$(INTDIR)\Read_Buffer.obj" \ - "$(INTDIR)\Recyclable.obj" \ - "$(INTDIR)\Refcountable.obj" \ - "$(INTDIR)\Registry.obj" \ - "$(INTDIR)\Registry_Name_Space.obj" \ - "$(INTDIR)\Remote_Name_Space.obj" \ - "$(INTDIR)\Remote_Tokens.obj" \ - "$(INTDIR)\RW_Process_Mutex.obj" \ - "$(INTDIR)\Sample_History.obj" \ - "$(INTDIR)\Sched_Params.obj" \ - "$(INTDIR)\Select_Reactor.obj" \ - "$(INTDIR)\Select_Reactor_Base.obj" \ - "$(INTDIR)\Service_Config.obj" \ - "$(INTDIR)\Service_Manager.obj" \ - "$(INTDIR)\Service_Object.obj" \ - "$(INTDIR)\Service_Repository.obj" \ - "$(INTDIR)\Service_Templates.obj" \ - "$(INTDIR)\Service_Types.obj" \ - "$(INTDIR)\Shared_Memory.obj" \ - "$(INTDIR)\Shared_Memory_MM.obj" \ - "$(INTDIR)\Shared_Memory_SV.obj" \ - "$(INTDIR)\Shared_Object.obj" \ - "$(INTDIR)\Signal.obj" \ - "$(INTDIR)\SOCK.obj" \ - "$(INTDIR)\SOCK_Acceptor.obj" \ - "$(INTDIR)\SOCK_CODgram.obj" \ - "$(INTDIR)\Sock_Connect.obj" \ - "$(INTDIR)\SOCK_Connector.obj" \ - "$(INTDIR)\SOCK_Dgram.obj" \ - "$(INTDIR)\SOCK_Dgram_Bcast.obj" \ - "$(INTDIR)\SOCK_Dgram_Mcast.obj" \ - "$(INTDIR)\SOCK_IO.obj" \ - "$(INTDIR)\SOCK_Stream.obj" \ - "$(INTDIR)\SPIPE.obj" \ - "$(INTDIR)\SPIPE_Acceptor.obj" \ - "$(INTDIR)\SPIPE_Addr.obj" \ - "$(INTDIR)\SPIPE_Connector.obj" \ - "$(INTDIR)\SPIPE_Stream.obj" \ - "$(INTDIR)\SString.obj" \ - "$(INTDIR)\Stats.obj" \ - "$(INTDIR)\String_Base_Const.obj" \ - "$(INTDIR)\SV_Message.obj" \ - "$(INTDIR)\SV_Message_Queue.obj" \ - "$(INTDIR)\SV_Semaphore_Complex.obj" \ - "$(INTDIR)\SV_Semaphore_Simple.obj" \ - "$(INTDIR)\SV_Shared_Memory.obj" \ - "$(INTDIR)\Svc_Conf_l.obj" \ - "$(INTDIR)\Svc_Conf_Lexer_Guard.obj" \ - "$(INTDIR)\Svc_Conf_y.obj" \ - "$(INTDIR)\Svc_Handler.obj" \ - "$(INTDIR)\Synch.obj" \ - "$(INTDIR)\Synch_Options.obj" \ - "$(INTDIR)\System_Time.obj" \ - "$(INTDIR)\Task.obj" \ - "$(INTDIR)\Template_Instantiations.obj" \ - "$(INTDIR)\Thread.obj" \ - "$(INTDIR)\Thread_Adapter.obj" \ - "$(INTDIR)\Thread_Control.obj" \ - "$(INTDIR)\Thread_Exit.obj" \ - "$(INTDIR)\Thread_Hook.obj" \ - "$(INTDIR)\Thread_Manager.obj" \ - "$(INTDIR)\Time_Request_Reply.obj" \ - "$(INTDIR)\Time_Value.obj" \ - "$(INTDIR)\Timeprobe.obj" \ - "$(INTDIR)\Timer_Hash.obj" \ - "$(INTDIR)\Timer_Heap.obj" \ - "$(INTDIR)\Timer_List.obj" \ - "$(INTDIR)\Timer_Queue.obj" \ - "$(INTDIR)\Timer_Queue_Adapters.obj" \ - "$(INTDIR)\Timer_Wheel.obj" \ - "$(INTDIR)\TLI.obj" \ - "$(INTDIR)\TLI_Acceptor.obj" \ - "$(INTDIR)\TLI_Connector.obj" \ - "$(INTDIR)\TLI_Stream.obj" \ - "$(INTDIR)\Token.obj" \ - "$(INTDIR)\Token_Collection.obj" \ - "$(INTDIR)\Token_Invariants.obj" \ - "$(INTDIR)\Token_Manager.obj" \ - "$(INTDIR)\Token_Request_Reply.obj" \ - "$(INTDIR)\TP_Reactor.obj" \ - "$(INTDIR)\Trace.obj" \ - "$(INTDIR)\TTY_IO.obj" \ - "$(INTDIR)\Typed_SV_Message.obj" \ - "$(INTDIR)\Typed_SV_Message_Queue.obj" \ - "$(INTDIR)\UNIX_Addr.obj" \ - "$(INTDIR)\UPIPE_Acceptor.obj" \ - "$(INTDIR)\UPIPE_Connector.obj" \ - "$(INTDIR)\UPIPE_Stream.obj" \ - "$(INTDIR)\WFMO_Reactor.obj" \ - "$(INTDIR)\WIN32_Asynch_IO.obj" \ - "$(INTDIR)\WIN32_Proactor.obj" \ - "$(INTDIR)\XML_Svc_Conf.obj" \ - "$(INTDIR)\XtReactor.obj" \ - "$(INTDIR)\ace.res" - -"$(OUTDIR)\acesd.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("ace_lib.dep") -!INCLUDE "ace_lib.dep" -!ELSE -!MESSAGE Warning: cannot find "ace_lib.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "ACE LIB - Win64 Static Release" || "$(CFG)" == "ACE LIB - Win64 Static Debug" -SOURCE=.\ACE.cpp - -"$(INTDIR)\ACE.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Activation_Queue.cpp - -"$(INTDIR)\Activation_Queue.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Active_Map_Manager.cpp - -"$(INTDIR)\Active_Map_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Addr.cpp - -"$(INTDIR)\Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Arg_Shifter.cpp - -"$(INTDIR)\Arg_Shifter.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ARGV.cpp - -"$(INTDIR)\ARGV.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Argv_Type_Converter.cpp - -"$(INTDIR)\Argv_Type_Converter.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Asynch_Connector.cpp - -"$(INTDIR)\Asynch_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Asynch_IO.cpp - -"$(INTDIR)\Asynch_IO.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Asynch_IO_Impl.cpp - -"$(INTDIR)\Asynch_IO_Impl.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Asynch_Pseudo_Task.cpp - -"$(INTDIR)\Asynch_Pseudo_Task.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\ATM_Acceptor.cpp - -"$(INTDIR)\ATM_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_Addr.cpp - -"$(INTDIR)\ATM_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_Connector.cpp - -"$(INTDIR)\ATM_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_Params.cpp - -"$(INTDIR)\ATM_Params.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_QoS.cpp - -"$(INTDIR)\ATM_QoS.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ATM_Stream.cpp - -"$(INTDIR)\ATM_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Base_Thread_Adapter.cpp - -"$(INTDIR)\Base_Thread_Adapter.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Based_Pointer_Repository.cpp - -"$(INTDIR)\Based_Pointer_Repository.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Basic_Stats.cpp - -"$(INTDIR)\Basic_Stats.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Basic_Types.cpp - -"$(INTDIR)\Basic_Types.obj" : $(SOURCE) "$(INTDIR)" ".\Template_Instantiations.cpp" ".\Framework_Component_T.cpp" - - -SOURCE=.\Capabilities.cpp - -"$(INTDIR)\Capabilities.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\CDR_Base.cpp - -"$(INTDIR)\CDR_Base.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\CDR_Stream.cpp - -"$(INTDIR)\CDR_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Codecs.cpp - -"$(INTDIR)\Codecs.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Codeset_Registry.cpp - -"$(INTDIR)\Codeset_Registry.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Codeset_Registry_db.cpp - -"$(INTDIR)\Codeset_Registry_db.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Configuration.cpp - -"$(INTDIR)\Configuration.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Configuration_Import_Export.cpp - -"$(INTDIR)\Configuration_Import_Export.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Connection_Recycling_Strategy.cpp - -"$(INTDIR)\Connection_Recycling_Strategy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Containers.cpp - -"$(INTDIR)\Containers.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Copy_Disabled.cpp - -"$(INTDIR)\Copy_Disabled.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Date_Time.cpp - -"$(INTDIR)\Date_Time.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DEV.cpp - -"$(INTDIR)\DEV.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DEV_Addr.cpp - -"$(INTDIR)\DEV_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DEV_Connector.cpp - -"$(INTDIR)\DEV_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DEV_IO.cpp - -"$(INTDIR)\DEV_IO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Dirent.cpp - -"$(INTDIR)\Dirent.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Dirent_Selector.cpp - -"$(INTDIR)\Dirent_Selector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DLL.cpp - -"$(INTDIR)\DLL.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DLL_Manager.cpp - -"$(INTDIR)\DLL_Manager.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Dump.cpp - -"$(INTDIR)\Dump.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Dynamic.cpp - -"$(INTDIR)\Dynamic.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Dynamic_Service.cpp - -"$(INTDIR)\Dynamic_Service.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Dynamic_Service_Base.cpp - -"$(INTDIR)\Dynamic_Service_Base.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Event_Handler.cpp - -"$(INTDIR)\Event_Handler.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Event_Handler_T.cpp - -"$(INTDIR)\Event_Handler_T.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO.cpp - -"$(INTDIR)\FIFO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO_Recv.cpp - -"$(INTDIR)\FIFO_Recv.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO_Recv_Msg.cpp - -"$(INTDIR)\FIFO_Recv_Msg.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO_Send.cpp - -"$(INTDIR)\FIFO_Send.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FIFO_Send_Msg.cpp - -"$(INTDIR)\FIFO_Send_Msg.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FILE.cpp - -"$(INTDIR)\FILE.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FILE_Addr.cpp - -"$(INTDIR)\FILE_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FILE_Connector.cpp - -"$(INTDIR)\FILE_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\FILE_IO.cpp - -"$(INTDIR)\FILE_IO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\File_Lock.cpp - -"$(INTDIR)\File_Lock.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Filecache.cpp - -"$(INTDIR)\Filecache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Flag_Manip.cpp - -"$(INTDIR)\Flag_Manip.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Framework_Component.cpp - -"$(INTDIR)\Framework_Component.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Functor.cpp - -"$(INTDIR)\Functor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Get_Opt.cpp - -"$(INTDIR)\Get_Opt.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Handle_Ops.cpp - -"$(INTDIR)\Handle_Ops.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Handle_Set.cpp - -"$(INTDIR)\Handle_Set.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Hash_Map_Manager.cpp - -"$(INTDIR)\Hash_Map_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Hashable.cpp - -"$(INTDIR)\Hashable.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\High_Res_Timer.cpp - -"$(INTDIR)\High_Res_Timer.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\INET_Addr.cpp - -"$(INTDIR)\INET_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Init_ACE.cpp - -"$(INTDIR)\Init_ACE.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\IO_Cntl_Msg.cpp - -"$(INTDIR)\IO_Cntl_Msg.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\IO_SAP.cpp - -"$(INTDIR)\IO_SAP.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\IOStream.cpp - -"$(INTDIR)\IOStream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\IPC_SAP.cpp - -"$(INTDIR)\IPC_SAP.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Lib_Find.cpp - -"$(INTDIR)\Lib_Find.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Local_Name_Space.cpp - -"$(INTDIR)\Local_Name_Space.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Local_Tokens.cpp - -"$(INTDIR)\Local_Tokens.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg.cpp - -"$(INTDIR)\Log_Msg.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Log_Msg_Backend.cpp - -"$(INTDIR)\Log_Msg_Backend.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg_Callback.cpp - -"$(INTDIR)\Log_Msg_Callback.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg_IPC.cpp - -"$(INTDIR)\Log_Msg_IPC.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg_NT_Event_Log.cpp - -"$(INTDIR)\Log_Msg_NT_Event_Log.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Msg_UNIX_Syslog.cpp - -"$(INTDIR)\Log_Msg_UNIX_Syslog.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Log_Record.cpp - -"$(INTDIR)\Log_Record.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Logging_Strategy.cpp - -"$(INTDIR)\Logging_Strategy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK.cpp - -"$(INTDIR)\LSOCK.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_Acceptor.cpp - -"$(INTDIR)\LSOCK_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_CODgram.cpp - -"$(INTDIR)\LSOCK_CODgram.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_Connector.cpp - -"$(INTDIR)\LSOCK_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_Dgram.cpp - -"$(INTDIR)\LSOCK_Dgram.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\LSOCK_Stream.cpp - -"$(INTDIR)\LSOCK_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Malloc.cpp - -"$(INTDIR)\Malloc.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Malloc_Allocator.cpp - -"$(INTDIR)\Malloc_Allocator.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Malloc_Instantiations.cpp - -"$(INTDIR)\Malloc_Instantiations.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Map.cpp - -"$(INTDIR)\Map.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\MEM_Acceptor.cpp - -"$(INTDIR)\MEM_Acceptor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\MEM_Addr.cpp - -"$(INTDIR)\MEM_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\MEM_Connector.cpp - -"$(INTDIR)\MEM_Connector.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\MEM_IO.cpp - -"$(INTDIR)\MEM_IO.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Mem_Map.cpp - -"$(INTDIR)\Mem_Map.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\MEM_SAP.cpp - -"$(INTDIR)\MEM_SAP.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\MEM_Stream.cpp - -"$(INTDIR)\MEM_Stream.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Memory_Pool.cpp - -"$(INTDIR)\Memory_Pool.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Message_Block.cpp - -"$(INTDIR)\Message_Block.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Message_Queue.cpp - -"$(INTDIR)\Message_Queue.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Method_Request.cpp - -"$(INTDIR)\Method_Request.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Msg_WFMO_Reactor.cpp - -"$(INTDIR)\Msg_WFMO_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Multiplexor.cpp - -"$(INTDIR)\Multiplexor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Name_Proxy.cpp - -"$(INTDIR)\Name_Proxy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Name_Request_Reply.cpp - -"$(INTDIR)\Name_Request_Reply.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Name_Space.cpp - -"$(INTDIR)\Name_Space.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Naming_Context.cpp - -"$(INTDIR)\Naming_Context.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Notification_Strategy.cpp - -"$(INTDIR)\Notification_Strategy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\NT_Service.cpp - -"$(INTDIR)\NT_Service.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Obchunk.cpp - -"$(INTDIR)\Obchunk.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Object_Manager.cpp - -"$(INTDIR)\Object_Manager.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Obstack.cpp - -"$(INTDIR)\Obstack.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS.cpp - -"$(INTDIR)\OS.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Dirent.cpp - -"$(INTDIR)\OS_Dirent.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Errno.cpp - -"$(INTDIR)\OS_Errno.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Log_Msg_Attributes.cpp - -"$(INTDIR)\OS_Log_Msg_Attributes.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Memory.cpp - -"$(INTDIR)\OS_Memory.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_QoS.cpp - -"$(INTDIR)\OS_QoS.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_String.cpp - -"$(INTDIR)\OS_String.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_Thread_Adapter.cpp - -"$(INTDIR)\OS_Thread_Adapter.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\OS_TLI.cpp - -"$(INTDIR)\OS_TLI.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Pair.cpp - -"$(INTDIR)\Pair.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Parse_Node.cpp - -"$(INTDIR)\Parse_Node.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\PI_Malloc.cpp - -"$(INTDIR)\PI_Malloc.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Pipe.cpp - -"$(INTDIR)\Pipe.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\POSIX_Asynch_IO.cpp - -"$(INTDIR)\POSIX_Asynch_IO.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\POSIX_Proactor.cpp - -"$(INTDIR)\POSIX_Proactor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Priority_Reactor.cpp - -"$(INTDIR)\Priority_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Proactor.cpp - -"$(INTDIR)\Proactor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Process.cpp - -"$(INTDIR)\Process.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Process_Manager.cpp - -"$(INTDIR)\Process_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Process_Mutex.cpp - -"$(INTDIR)\Process_Mutex.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Process_Semaphore.cpp - -"$(INTDIR)\Process_Semaphore.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Profile_Timer.cpp - -"$(INTDIR)\Profile_Timer.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Reactor.cpp - -"$(INTDIR)\Reactor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Reactor_Notification_Strategy.cpp - -"$(INTDIR)\Reactor_Notification_Strategy.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Read_Buffer.cpp - -"$(INTDIR)\Read_Buffer.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Recyclable.cpp - -"$(INTDIR)\Recyclable.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Refcountable.cpp - -"$(INTDIR)\Refcountable.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Registry.cpp - -"$(INTDIR)\Registry.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Registry_Name_Space.cpp - -"$(INTDIR)\Registry_Name_Space.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Remote_Name_Space.cpp - -"$(INTDIR)\Remote_Name_Space.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Remote_Tokens.cpp - -"$(INTDIR)\Remote_Tokens.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\RW_Process_Mutex.cpp - -"$(INTDIR)\RW_Process_Mutex.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Sample_History.cpp - -"$(INTDIR)\Sample_History.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Sched_Params.cpp - -"$(INTDIR)\Sched_Params.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Select_Reactor.cpp - -"$(INTDIR)\Select_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Select_Reactor_Base.cpp - -"$(INTDIR)\Select_Reactor_Base.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Service_Config.cpp - -"$(INTDIR)\Service_Config.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Service_Manager.cpp - -"$(INTDIR)\Service_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Service_Object.cpp - -"$(INTDIR)\Service_Object.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Service_Repository.cpp - -"$(INTDIR)\Service_Repository.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Service_Templates.cpp - -"$(INTDIR)\Service_Templates.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Service_Types.cpp - -"$(INTDIR)\Service_Types.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Shared_Memory.cpp - -"$(INTDIR)\Shared_Memory.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Shared_Memory_MM.cpp - -"$(INTDIR)\Shared_Memory_MM.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Shared_Memory_SV.cpp - -"$(INTDIR)\Shared_Memory_SV.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Shared_Object.cpp - -"$(INTDIR)\Shared_Object.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Signal.cpp - -"$(INTDIR)\Signal.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK.cpp - -"$(INTDIR)\SOCK.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Acceptor.cpp - -"$(INTDIR)\SOCK_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_CODgram.cpp - -"$(INTDIR)\SOCK_CODgram.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Sock_Connect.cpp - -"$(INTDIR)\Sock_Connect.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Connector.cpp - -"$(INTDIR)\SOCK_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Dgram.cpp - -"$(INTDIR)\SOCK_Dgram.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Dgram_Bcast.cpp - -"$(INTDIR)\SOCK_Dgram_Bcast.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Dgram_Mcast.cpp - -"$(INTDIR)\SOCK_Dgram_Mcast.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_IO.cpp - -"$(INTDIR)\SOCK_IO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SOCK_Stream.cpp - -"$(INTDIR)\SOCK_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE.cpp - -"$(INTDIR)\SPIPE.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE_Acceptor.cpp - -"$(INTDIR)\SPIPE_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE_Addr.cpp - -"$(INTDIR)\SPIPE_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE_Connector.cpp - -"$(INTDIR)\SPIPE_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SPIPE_Stream.cpp - -"$(INTDIR)\SPIPE_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SString.cpp - -"$(INTDIR)\SString.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Stats.cpp - -"$(INTDIR)\Stats.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\String_Base_Const.cpp - -"$(INTDIR)\String_Base_Const.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Message.cpp - -"$(INTDIR)\SV_Message.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Message_Queue.cpp - -"$(INTDIR)\SV_Message_Queue.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Semaphore_Complex.cpp - -"$(INTDIR)\SV_Semaphore_Complex.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Semaphore_Simple.cpp - -"$(INTDIR)\SV_Semaphore_Simple.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SV_Shared_Memory.cpp - -"$(INTDIR)\SV_Shared_Memory.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Svc_Conf_l.cpp - -"$(INTDIR)\Svc_Conf_l.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Svc_Conf_Lexer_Guard.cpp - -"$(INTDIR)\Svc_Conf_Lexer_Guard.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Svc_Conf_y.cpp - -"$(INTDIR)\Svc_Conf_y.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Svc_Handler.cpp - -"$(INTDIR)\Svc_Handler.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Synch.cpp - -"$(INTDIR)\Synch.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Synch_Options.cpp - -"$(INTDIR)\Synch_Options.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\System_Time.cpp - -"$(INTDIR)\System_Time.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Task.cpp - -"$(INTDIR)\Task.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Template_Instantiations.cpp - -"$(INTDIR)\Template_Instantiations.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Thread.cpp - -"$(INTDIR)\Thread.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Thread_Adapter.cpp - -"$(INTDIR)\Thread_Adapter.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Thread_Control.cpp - -"$(INTDIR)\Thread_Control.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Thread_Exit.cpp - -"$(INTDIR)\Thread_Exit.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Thread_Hook.cpp - -"$(INTDIR)\Thread_Hook.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Thread_Manager.cpp - -"$(INTDIR)\Thread_Manager.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Time_Request_Reply.cpp - -"$(INTDIR)\Time_Request_Reply.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Time_Value.cpp - -"$(INTDIR)\Time_Value.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timeprobe.cpp - -"$(INTDIR)\Timeprobe.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Timer_Hash.cpp - -"$(INTDIR)\Timer_Hash.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timer_Heap.cpp - -"$(INTDIR)\Timer_Heap.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timer_List.cpp - -"$(INTDIR)\Timer_List.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timer_Queue.cpp - -"$(INTDIR)\Timer_Queue.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Timer_Queue_Adapters.cpp - -"$(INTDIR)\Timer_Queue_Adapters.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\Timer_Wheel.cpp - -"$(INTDIR)\Timer_Wheel.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TLI.cpp - -"$(INTDIR)\TLI.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TLI_Acceptor.cpp - -"$(INTDIR)\TLI_Acceptor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TLI_Connector.cpp - -"$(INTDIR)\TLI_Connector.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TLI_Stream.cpp - -"$(INTDIR)\TLI_Stream.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token.cpp - -"$(INTDIR)\Token.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token_Collection.cpp - -"$(INTDIR)\Token_Collection.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token_Invariants.cpp - -"$(INTDIR)\Token_Invariants.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token_Manager.cpp - -"$(INTDIR)\Token_Manager.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Token_Request_Reply.cpp - -"$(INTDIR)\Token_Request_Reply.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TP_Reactor.cpp - -"$(INTDIR)\TP_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Trace.cpp - -"$(INTDIR)\Trace.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TTY_IO.cpp - -"$(INTDIR)\TTY_IO.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Typed_SV_Message.cpp - -"$(INTDIR)\Typed_SV_Message.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Typed_SV_Message_Queue.cpp - -"$(INTDIR)\Typed_SV_Message_Queue.obj" : $(SOURCE) "$(INTDIR)" ".\Typed_SV_Message.cpp" - - -SOURCE=.\UNIX_Addr.cpp - -"$(INTDIR)\UNIX_Addr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\UPIPE_Acceptor.cpp - -"$(INTDIR)\UPIPE_Acceptor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\UPIPE_Connector.cpp - -"$(INTDIR)\UPIPE_Connector.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\UPIPE_Stream.cpp - -"$(INTDIR)\UPIPE_Stream.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\WFMO_Reactor.cpp - -"$(INTDIR)\WFMO_Reactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\WIN32_Asynch_IO.cpp - -"$(INTDIR)\WIN32_Asynch_IO.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\WIN32_Proactor.cpp - -"$(INTDIR)\WIN32_Proactor.obj" : $(SOURCE) "$(INTDIR)" ".\Framework_Component_T.cpp" - - -SOURCE=.\XML_Svc_Conf.cpp - -"$(INTDIR)\XML_Svc_Conf.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\XtReactor.cpp - -"$(INTDIR)\XtReactor.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Acceptor.cpp -SOURCE=.\Active_Map_Manager_T.cpp -SOURCE=.\Asynch_Acceptor.cpp -SOURCE=.\Atomic_Op.cpp - -!IF "$(CFG)" == "ACE LIB - Win64 Static Release" - - -"$(INTDIR)\Atomic_Op.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ACE LIB - Win64 Static Debug" - -!ENDIF - -SOURCE=.\Auto_Ptr.cpp -SOURCE=.\Based_Pointer_T.cpp -SOURCE=.\Cache_Map_Manager_T.cpp -SOURCE=.\Cached_Connect_Strategy_T.cpp -SOURCE=.\Caching_Strategies_T.cpp -SOURCE=.\Caching_Utility_T.cpp -SOURCE=.\Cleanup_Strategies_T.cpp -SOURCE=.\Connector.cpp -SOURCE=.\Containers_T.cpp -SOURCE=.\Dump_T.cpp -SOURCE=.\Framework_Component_T.cpp - -!IF "$(CFG)" == "ACE LIB - Win64 Static Release" - - -"$(INTDIR)\Framework_Component_T.obj" : $(SOURCE) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ACE LIB - Win64 Static Debug" - -!ENDIF - -SOURCE=.\Free_List.cpp -SOURCE=.\Functor_T.cpp -SOURCE=.\Future.cpp -SOURCE=.\Hash_Cache_Map_Manager_T.cpp -SOURCE=.\Hash_Map_Manager_T.cpp -SOURCE=.\Hash_Map_With_Allocator_T.cpp -SOURCE=.\IOStream_T.cpp -SOURCE=.\Local_Name_Space_T.cpp -SOURCE=.\Malloc_T.cpp -SOURCE=.\Managed_Object.cpp -SOURCE=.\Map_Manager.cpp -SOURCE=.\Map_T.cpp -SOURCE=.\Message_Block_T.cpp -SOURCE=.\Message_Queue_T.cpp -SOURCE=.\Module.cpp -SOURCE=.\Obstack_T.cpp -SOURCE=.\Pair_T.cpp -SOURCE=.\RB_Tree.cpp -SOURCE=.\Select_Reactor_T.cpp -SOURCE=.\Singleton.cpp -SOURCE=.\Strategies_T.cpp -SOURCE=.\Stream.cpp -SOURCE=.\Stream_Modules.cpp -SOURCE=.\String_Base.cpp -SOURCE=.\Synch_T.cpp -SOURCE=.\Task_T.cpp -SOURCE=.\Test_and_Set.cpp -SOURCE=.\Timer_Hash_T.cpp -SOURCE=.\Timer_Heap_T.cpp -SOURCE=.\Timer_List_T.cpp -SOURCE=.\Timer_Queue_T.cpp -SOURCE=.\Timer_Wheel_T.cpp -SOURCE=.\ace.rc - -"$(INTDIR)\ace.res" : $(SOURCE) "$(INTDIR)" - $(RSC) $(RSC_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/ace/ace_message_table.bin b/ace/ace_message_table.bin deleted file mode 100644 index 6ac08e5dc69..00000000000 Binary files a/ace/ace_message_table.bin and /dev/null differ diff --git a/ace/ace_vacpp_options.icc b/ace/ace_vacpp_options.icc deleted file mode 100644 index db5515e8756..00000000000 --- a/ace/ace_vacpp_options.icc +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ -// -// Configuration file to define Visual Age C++ options used commonly -// across all (sub)projects built on AIX using Visual Age C++ 5 (or later). - -option PlatformOptions = - defaults(xlC_r), - gen(check,bounds,no), - link(typecheck,yes), - opt(level, 0), // for debugging - gen(enumsize, small), - report (level,W) diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h deleted file mode 100644 index 08ccbd17859..00000000000 --- a/ace/ace_wchar.h +++ /dev/null @@ -1,329 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file ace_wchar.h - * - * $Id$ - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_WCHAR_H -#define ACE_WCHAR_H - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// These macros have been deprecated and should be replaced by their -// ACE_TEXT_* equivalents. These macros are just hacks and may not -// completely provide the old functionality. -#if defined (ACE_LEGACY_MODE) -// Convert the old unicode indicators -# if defined (ACE_HAS_MOSTLY_UNICODE_APIS) -# define ACE_USES_WCHAR -# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ -# if defined (ACE_HAS_UNICODE) -# define ACE_HAS_WCHAR -# endif /* ACE_HAS_UNICODE */ - -// These are defined to get older stuff to compile -// FUZZ: disable check_for_tchar -# define ASYS_TCHAR ACE_TCHAR -# define ASYS_TEXT ACE_TEXT -# define ASYS_ONLY_MULTIBYTE_STRING ACE_TEXT_ALWAYS_CHAR -# define ASYS_MULTIBYTE_STRING ACE_TEXT_CHAR_TO_TCHAR -# define ASYS_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR -# define ACE_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR - -# if defined (ACE_USES_WCHAR) -# define ASYS_ONLY_WIDE_STRING(STRING) STRING -# else /* ACE_USES_WCHAR */ -# define ASYS_ONLY_WIDE_STRING(STRING) \ - ACE_Ascii_To_Wide (STRING).wchar_rep () -# endif /* ACE_USES_WCHAR */ - -# define ACE_TEXT_STRING ACE_TString - -#endif /* ACE_LEGACY_MODE */ - -#if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) -# include /**/ -#endif /* ACE_HAS_XPG4_MULTIBYPTE_CHAR */ - -#if defined (ACE_HAS_WCHAR) -# if defined (VXWORKS) -# include /**/ /* For wchar_t */ -# include /**/ /* For mbstowcs, etc. */ -# include /**/ /* For strlen */ -# define wint_t unsigned int /* VxWorks has wchar_t but not wint_t */ -# elif defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ - (ACE_HAS_STANDARD_CPP_LIBRARY != 0) -# include /**/ -# include /**/ -# elif defined (ACE_HAS_WINCE) -# include /**/ -# elif !defined (__BORLANDC__) -# include /**/ -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#endif /* ACE_HAS_WCHAR */ - -#if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0) -using std::size_t; -#endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */ - -// Since MSVC uses ushort16 = wchar_t, it is the only one -// that does not need this defined - -#if defined (ACE_HAS_WCHAR) && !defined (_MSC_VER) -# if !defined (ACE_WSTRING_HAS_USHORT_SUPPORT) -# define ACE_WSTRING_HAS_USHORT_SUPPORT -# endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */ -#endif /* ACE_HAS_WCHAR && !_MSC_VER */ - -// Set the default behaviour for ACE_TEXT_WIDE to use the L-prefix -#if !defined (ACE_USES_L_PREFIX) -# define ACE_USES_L_PREFIX 1 -#endif /* ACE_USES_L_PREFIX */ - -// Define the unicode/wchar related macros correctly - -# if !defined (ACE_TEXT_WIDE) -# if (ACE_USES_L_PREFIX == 1) -# define ACE_TEXT_WIDE_I(STRING) L##STRING -# else /* ACE_USES_L_PREFIX */ -# define ACE_TEXT_WIDE_I(STRING) STRING -# endif /* ACE_USES_L_PREFIX */ -# define ACE_TEXT_WIDE(STRING) ACE_TEXT_WIDE_I (STRING) -# endif /* ACE_TEXT_WIDE */ - -#if defined (ACE_USES_WCHAR) -typedef wchar_t ACE_TCHAR; -typedef char ACE_ANTI_TCHAR; -# define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE (STRING) -# define ACE_TEXT_ALWAYS_CHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () -# define ACE_TEXT_ALWAYS_WCHAR(STRING) STRING -# define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () -# define ACE_TEXT_WCHAR_TO_TCHAR(STRING) STRING -# define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () -#else /* ACE_USES_WCHAR */ -typedef char ACE_TCHAR; -typedef wchar_t ACE_ANTI_TCHAR; -# define ACE_LIB_TEXT(STRING) STRING -# define ACE_TEXT_ALWAYS_CHAR(STRING) STRING -# define ACE_TEXT_ALWAYS_WCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () -# define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING -# define ACE_TEXT_WCHAR_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () -# define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () -#endif /* ACE_USES_WCHAR */ - -#if defined (ACE_LEGACY_MODE) -# define ACE_TEXT TEXT -#else /* ACE_LEGACY_MODE */ -# define ACE_TEXT ACE_LIB_TEXT -#endif /* ACE_LEGACY_MODE */ - -// The OS_String module defines some wide-char functions that are not -// universally available. In particular, they're not part of the -// XPG4 Worldwide Portability Interface wide-character string handling -// functions. So, if ACE_HAS_XPG4_MULTIBYTE_CHAR is defined, note that -// these functions are missing. -#if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) - -# if !defined (ACE_LACKS_ITOW) -# define ACE_LACKS_ITOW -# endif - -# if !defined (ACE_LACKS_WCSICMP) -# define ACE_LACKS_WCSICMP -# endif - -# if !defined (ACE_LACKS_WCSNICMP) -# define ACE_LACKS_WCSNICMP -# endif - -# if !defined (ACE_LACKS_WCSDUP) -# define ACE_LACKS_WCSDUP -# endif - -#endif /* ACE_HAS_XPG4_MULTIBYTE_CHAR */ - -#if defined ACE_HAS_WCHAR -/** - * @class ACE_Wide_To_Ascii - * - * @brief A lightweight wchar* to char* string conversion class. - * - * The purpose of this class is to perform conversion from - * wchar* to char* strings. It is not intended for general - * purpose use. - */ -class ACE_Wide_To_Ascii -{ -public: - /// Ctor must take a wchar string. - ACE_Wide_To_Ascii (const wchar_t *s); - - /// Dtor will free up the memory. - ~ACE_Wide_To_Ascii (void); - - /// Return the internal char* representation. - char *char_rep (void); - - /// Converts an wchar_t string to ascii and returns a new string. - static char *convert (const wchar_t *wstr); - -private: - /// Internal pointer to the converted string. - char *s_; - - /// Disallow these operation. - ACE_Wide_To_Ascii (void); - ACE_Wide_To_Ascii (ACE_Wide_To_Ascii &); - ACE_Wide_To_Ascii& operator= (ACE_Wide_To_Ascii &); -}; - -/** - * @class ACE_Ascii_To_Wide - * - * @brief A lightweight char* to wchar* string conversion class. - * - * The purpose of this class is to perform conversion from - * char* to wchar* strings. It is not intended for general - * purpose use. - */ -class ACE_Ascii_To_Wide -{ -public: - /// Ctor must take a wchar string. - ACE_Ascii_To_Wide (const char *s); - - /// Dtor will free up the memory. - ~ACE_Ascii_To_Wide (void); - - /// Return the internal wchar* representation. - wchar_t *wchar_rep (void); - - /// Converts an char string to unicode/wide and returns a new string. - static wchar_t *convert (const char *str); - -private: - /// Internal pointer to the converted string. - wchar_t *s_; - - /// Disallow these operation. - ACE_Ascii_To_Wide (void); - ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &); - ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &); -}; - -#if defined (ACE_LEGACY_MODE) -typedef ACE_Ascii_To_Wide ACE_OS_CString; -typedef ACE_Wide_To_Ascii ACE_OS_WString; -#endif /* ACE_LEGACY_MODE */ - -#endif /* ACE_HAS_WCHAR */ - -#if defined (ACE_WIN32) -#if defined (ACE_USES_WCHAR) -#define ACE_TEXT_SERVICE_TABLE_ENTRY SERVICE_TABLE_ENTRYW -#define ACE_TEXT_STARTUPINFO STARTUPINFOW -#define ACE_TEXT_WIN32_FIND_DATA WIN32_FIND_DATAW - -#define ACE_TEXT_CreateEvent ::CreateEventW -#define ACE_TEXT_CreateFile ::CreateFileW -#define ACE_TEXT_CreateFileMapping ::CreateFileMappingW -#define ACE_TEXT_CreateMutex ::CreateMutexW -#define ACE_TEXT_CreateProcess ::CreateProcessW -#define ACE_TEXT_CreateSemaphore ::CreateSemaphoreW -#define ACE_TEXT_CreateService ::CreateServiceW -#define ACE_TEXT_ExpandEnvironmentStrings ::ExpandEnvironmentStringsW -#define ACE_TEXT_FindFirstChangeNotification ::FindFirstChangeNotificationW -#define ACE_TEXT_FindFirstFile ::FindFirstFileW -#define ACE_TEXT_FindNextFile ::FindNextFileW -#define ACE_TEXT_FormatMessage ::FormatMessageW -#define ACE_TEXT_FreeEnvironmentStrings ::FreeEnvironmentStringsW -#define ACE_TEXT_GetComputerName ::GetComputerNameW -#define ACE_TEXT_GetEnvironmentStrings ::GetEnvironmentStringsW -#define ACE_TEXT_GetModuleFileName ::GetModuleFileNameW -#define ACE_TEXT_GetTempPath ::GetTempPathW -#define ACE_TEXT_GetUserName ::GetUserNameW -#define ACE_TEXT_LoadLibrary ::LoadLibraryW -#define ACE_TEXT_MoveFileEx ::MoveFileExW -#define ACE_TEXT_WaitNamedPipe ::WaitNamedPipeW -#define ACE_TEXT_OpenFileMapping ::OpenFileMappingW -#define ACE_TEXT_OpenSCManager ::OpenSCManagerW -#define ACE_TEXT_OpenService ::OpenServiceW -#define ACE_TEXT_RegisterEventSource ::RegisterEventSourceW -#define ACE_TEXT_RegisterServiceCtrlHandler ::RegisterServiceCtrlHandlerW -#define ACE_TEXT_RegConnectRegistry ::RegConnectRegistryW -#define ACE_TEXT_RegCreateKeyEx ::RegCreateKeyExW -#define ACE_TEXT_RegDeleteKey ::RegDeleteKeyW -#define ACE_TEXT_RegDeleteValue ::RegDeleteValueW -#define ACE_TEXT_RegEnumKeyEx ::RegEnumKeyExW -#define ACE_TEXT_RegEnumValue ::RegEnumValueW -#define ACE_TEXT_RegCreateKey ::RegCreateKeyW -#define ACE_TEXT_RegOpenKey ::RegOpenKeyW -#define ACE_TEXT_RegOpenKeyEx ::RegOpenKeyExW -#define ACE_TEXT_RegQueryValueEx ::RegQueryValueExW -#define ACE_TEXT_RegSetValueEx ::RegSetValueExW -#define ACE_TEXT_ReportEvent ::ReportEventW -#define ACE_TEXT_SearchPath ::SearchPathW -#define ACE_TEXT_StartService ::StartServiceW -#define ACE_TEXT_StartServiceCtrlDispatcher ::StartServiceCtrlDispatcherW - -#else /* ACE_USES_WCHAR */ -#define ACE_TEXT_SERVICE_TABLE_ENTRY SERVICE_TABLE_ENTRYA -#define ACE_TEXT_STARTUPINFO STARTUPINFOA -#define ACE_TEXT_WIN32_FIND_DATA WIN32_FIND_DATAA - -#define ACE_TEXT_CreateEvent ::CreateEventA -#define ACE_TEXT_CreateFile ::CreateFileA -#define ACE_TEXT_CreateFileMapping ::CreateFileMappingA -#define ACE_TEXT_CreateMutex ::CreateMutexA -#define ACE_TEXT_CreateProcess ::CreateProcessA -#define ACE_TEXT_CreateSemaphore ::CreateSemaphoreA -#define ACE_TEXT_CreateService ::CreateServiceA -#define ACE_TEXT_ExpandEnvironmentStrings ::ExpandEnvironmentStringsA -#define ACE_TEXT_FindFirstChangeNotification ::FindFirstChangeNotificationA -#define ACE_TEXT_FindFirstFile ::FindFirstFileA -#define ACE_TEXT_FindNextFile ::FindNextFileA -#define ACE_TEXT_FormatMessage ::FormatMessageA -#define ACE_TEXT_FreeEnvironmentStrings ::FreeEnvironmentStringsA -#define ACE_TEXT_GetComputerName ::GetComputerNameA -#define ACE_TEXT_GetEnvironmentStrings ::GetEnvironmentStringsA -#define ACE_TEXT_GetModuleFileName ::GetModuleFileNameA -#define ACE_TEXT_GetTempPath ::GetTempPathA -#define ACE_TEXT_GetUserName ::GetUserNameA -#define ACE_TEXT_LoadLibrary ::LoadLibraryA -#define ACE_TEXT_MoveFileEx ::MoveFileExA -#define ACE_TEXT_WaitNamedPipe ::WaitNamedPipeA -#define ACE_TEXT_OpenFileMapping ::OpenFileMappingA -#define ACE_TEXT_OpenSCManager ::OpenSCManagerA -#define ACE_TEXT_OpenService ::OpenServiceA -#define ACE_TEXT_RegisterEventSource ::RegisterEventSourceA -#define ACE_TEXT_RegisterServiceCtrlHandler ::RegisterServiceCtrlHandlerA -#define ACE_TEXT_RegConnectRegistry ::RegConnectRegistryA -#define ACE_TEXT_RegCreateKeyEx ::RegCreateKeyExA -#define ACE_TEXT_RegDeleteKey ::RegDeleteKeyA -#define ACE_TEXT_RegDeleteValue ::RegDeleteValueA -#define ACE_TEXT_RegEnumKeyEx ::RegEnumKeyExA -#define ACE_TEXT_RegEnumValue ::RegEnumValueA -#define ACE_TEXT_RegCreateKey ::RegCreateKeyA -#define ACE_TEXT_RegOpenKey ::RegOpenKeyA -#define ACE_TEXT_RegOpenKeyEx ::RegOpenKeyExA -#define ACE_TEXT_RegQueryValueEx ::RegQueryValueExA -#define ACE_TEXT_RegSetValueEx ::RegSetValueExA -#define ACE_TEXT_ReportEvent ::ReportEventA -#define ACE_TEXT_SearchPath ::SearchPathA -#define ACE_TEXT_StartService ::StartServiceA -#define ACE_TEXT_StartServiceCtrlDispatcher ::StartServiceCtrlDispatcherA -#endif /* ACE_USES_WCHAR */ -#endif /* ACE_WIN32 */ - -#include "ace/ace_wchar.inl" - -#endif /* ACE_WCHAR_H */ diff --git a/ace/ace_wchar.inl b/ace/ace_wchar.inl deleted file mode 100644 index 68fd3d2fac2..00000000000 --- a/ace/ace_wchar.inl +++ /dev/null @@ -1,120 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// These are always inlined -// FUZZ: disable check_for_inline - -#if defined (ACE_HAS_WCHAR) - -#if !defined (ACE_WIN32) -# include /**/ // Need to see strlen() -#endif /* ACE_WIN32 */ - -inline -ACE_Wide_To_Ascii::~ACE_Wide_To_Ascii (void) -{ - delete [] this->s_; -} - -inline char * -ACE_Wide_To_Ascii::char_rep (void) -{ - return this->s_; -} - -inline char * -ACE_Wide_To_Ascii::convert (const wchar_t *wstr) -{ - // Short circuit null pointer case - if (wstr == 0) - return 0; - -# if defined (ACE_WIN32) - int len = ::WideCharToMultiByte (CP_OEMCP, - 0, - wstr, - -1, - 0, - 0, - 0, - 0); -# elif defined (ACE_LACKS_WCSLEN) - const wchar_t *wtemp = wstr; - while (wtemp != 0) - ++wtemp; - - int len = wtemp - wstr + 1; -# else /* ACE_WIN32 */ - int len = ::wcslen (wstr) + 1; -# endif /* ACE_WIN32 */ - - char *str = new char[len]; - -# if defined (ACE_WIN32) - ::WideCharToMultiByte (CP_OEMCP, 0, wstr, -1, str, len, 0, 0); -# elif defined (VXWORKS) - ::wcstombs (str, wstr, len); -# else /* ACE_WIN32 */ - for (int i = 0; i < len; i++) - { - wchar_t *t = ACE_const_cast (wchar_t *, wstr); - str[i] = ACE_static_cast (char, *(t + i)); - } -# endif /* ACE_WIN32 */ - return str; -} - -inline -ACE_Wide_To_Ascii::ACE_Wide_To_Ascii (const wchar_t *s) - : s_ (ACE_Wide_To_Ascii::convert (s)) -{ -} - -inline -ACE_Ascii_To_Wide::~ACE_Ascii_To_Wide (void) -{ - delete [] this->s_; -} - -inline wchar_t * -ACE_Ascii_To_Wide::wchar_rep (void) -{ - return this->s_; -} - -inline wchar_t * -ACE_Ascii_To_Wide::convert (const char *str) -{ - // Short circuit null pointer case - if (str == 0) - return 0; - -# if defined (ACE_WIN32) - int len = ::MultiByteToWideChar (CP_OEMCP, 0, str, -1, 0, 0); -# else /* ACE_WIN32 */ - int len = strlen (str) + 1; -# endif /* ACE_WIN32 */ - - wchar_t *wstr = new wchar_t[len]; - -# if defined (ACE_WIN32) - ::MultiByteToWideChar (CP_OEMCP, 0, str, -1, wstr, len); -# elif defined (VXWORKS) - ::mbstowcs (wstr, str, len); -# else /* ACE_WIN32 */ - for (int i = 0; i < len; i++) - { - char *t = ACE_const_cast (char *, str); - wstr[i] = ACE_static_cast (wchar_t, *(t + i)); - } -# endif /* ACE_WIN32 */ - return wstr; -} - -inline -ACE_Ascii_To_Wide::ACE_Ascii_To_Wide (const char *s) -: s_ (ACE_Ascii_To_Wide::convert (s)) -{ -} - -#endif /* ACE_HAS_WCHAR */ diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h deleted file mode 100644 index 0f93b2eaed6..00000000000 --- a/ace/config-WinCE.h +++ /dev/null @@ -1,255 +0,0 @@ -// $Id$ - -// Note: For WinCE build, simply use: #include "ace/config-win32.h" -// It is same as config.h for Windows NT/2k so that you can -// share same files and directories for both WinCE and NT/2k -// builds, unless you add additional definition(s) for each -// specific build or change the output directory. - -#ifndef ACE_CONFIG_WINCE_H -#define ACE_CONFIG_WINCE_H - -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -# error Use config-win32.h in config.h instead of this header -#endif // ACE_CONFIG_WIN32_H - -#if !defined (UNDER_CE) -# error Define UNDER_CE to version (i.e. 300 = 3.0) -#endif // UNDER_CE - -#if (UNDER_CE < 300) -# error ACE requires Windows CE 3.0 and later. -#endif // UNDER_CE - -// CE 3 doesn't have Winsock 2, but CE 4 does. -#if (UNDER_CE < 400) -# if !defined (ACE_HAS_WINSOCK2) -# define ACE_HAS_WINSOCK2 0 -# endif -#endif /* UNDER_CE < 400 */ - -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_WINCE 1 -#endif - -// We need these libraries to build: -#pragma comment(lib,"corelibc.lib") -#pragma comment(linker, "/nodefaultlib:oldnames.lib") - -// Unicode is the OS standard string type for WinCE. -#ifdef ACE_HAS_UNICODE -# undef ACE_HAS_UNICODE -#endif // ACE_HAS_UNICODE -#define ACE_HAS_UNICODE 1 - -// Only DLL version is supported on CE. -//#if defined (ACE_HAS_DLL) -//# undef ACE_HAS_DLL -//#endif // ACE_HAS_DLL -//#define ACE_HAS_DLL 1 - -// Need to define LD search path explicitly on CE because -// CE doesn't have environment variables and we can't get -// the information using getenv. -#define ACE_DEFAULT_LD_SEARCH_PATH ACE_LIB_TEXT (".\\;\\windows") - -#define ACE_LACKS_SYS_TYPES_H - -#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 - -// CE is not NT. -#if defined (ACE_HAS_WINNT4) -# undef ACE_HAS_WINNT4 -#endif // ACE_HAS_WINNT4 -#define ACE_HAS_WINNT4 0 - -#define ACE_LACKS_ACE_TOKEN -#define ACE_LACKS_ACE_OTHER -#define ACE_LACKS_MSG_WFMO - -#define ACE_HAS_WCHAR - -#if !defined (ACE_USES_WCHAR) -# define ACE_USES_WCHAR -#endif // ACE_USES_WCHAR - -#define ACE_USES_WINCE_SEMA_SIMULATION - -#define ACE_LACKS_IOSTREAM_TOTALLY -#define ACE_LACKS_ACE_IOSTREAM - -#if defined (ACE_HAS_STRICT) -# undef ACE_HAS_STRICT -#endif // ACE_HAS_STRICT -#define ACE_HAS_STRICT 1 - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1 - -// FILE stuff isn't always defined in CE -#ifndef _FILE_DEFINED - typedef void FILE; -# define _FILE_DEFINED -#endif // _FILE_DEFINED - -// This was defined in previous versions of CE, but not 2.11 -#define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION - -#define ACE_MAIN WINAPI WinMain - -// SH3 cross-compiler can't handle inline functions correctly -// (along with other bugs.) -#if defined (SH3) -# define ACE_LACKS_INLINE_FUNCTIONS -#endif // SH3 && _DEBUG - -#ifndef ACE_DEFAULT_SERVER_HOST -# define ACE_DEFAULT_SERVER_HOST L"localhost" -#endif // ACE_DEFAULT_SERVER_HOST - -// @@ Need to remap every function that uses any of these flags to -// Win32 API. These are for ANSI styled function and are not -// available on WinCE. - -#define _O_RDONLY 0x0000 // open for reading only -#define _O_WRONLY 0x0001 // open for writing only -#define _O_RDWR 0x0002 // open for reading and writing -#define _O_APPEND 0x0008 // writes done at eof - -#define _O_CREAT 0x0100 // create and open file -#define _O_TRUNC 0x0200 // open and truncate -#define _O_EXCL 0x0400 // open only if file doesn't already exist - -// O_TEXT files have sequences translated to on read()'s, -// and sequences translated to on write()'s -#define _O_TEXT 0x4000 // file mode is text (translated) -#define _O_BINARY 0x8000 // file mode is binary (untranslated) - -// macro to translate the C 2.0 name used to force binary mode for files -//#define _O_RAW _O_BINARY - -// Open handle inherit bit -//#define _O_NOINHERIT 0x0080 // child process doesn't inherit file - -// Temporary file bit - file is deleted when last handle is closed -#define _O_TEMPORARY 0x0040 // temporary file bit - -// temporary access hint -//#define _O_SHORT_LIVED 0x1000 // temporary storage file, try not to flush - -// sequential/random access hints -//#define _O_SEQUENTIAL 0x0020 // file access is primarily sequential -//#define _O_RANDOM 0x0010 // file access is primarily random - - -// Non-ANSI names -#define O_RDONLY _O_RDONLY -#define O_WRONLY _O_WRONLY -#define O_RDWR _O_RDWR -#define O_APPEND _O_APPEND -#define O_CREAT _O_CREAT -#define O_TRUNC _O_TRUNC -#define O_EXCL _O_EXCL -#define O_TEXT _O_TEXT -#define O_BINARY _O_BINARY -#define O_TEMPORARY _O_TEMPORARY -//#define O_RAW _O_BINARY -//#define O_NOINHERIT _O_NOINHERIT -//#define O_SEQUENTIAL _O_SEQUENTIAL -//#define O_RANDOM _O_RANDOM - - -// @@ NSIG value. This is definitely not correct. -#define NSIG 23 - - -// @@ For some reason, WinCE forgot to define this. -// Need to find out what it is. (Used in MapViewOfFile ().) -#define FILE_MAP_COPY 0 - - -#define ACE_LACKS_STRCASECMP // WinCE doesn't support _stricmp -#define ACE_LACKS_GETSERVBYNAME -#define ACE_LACKS_ACCESS -#define ACE_LACKS_FILELOCKS -#define ACE_LACKS_EXEC -#define ACE_LACKS_MKTEMP -#define ACE_LACKS_STRRCHR -#define ACE_LACKS_BSEARCH -#define ACE_LACKS_SOCKET_BUFSIZ -#define ACE_LACKS_ISATTY -#define ACE_LACKS_STRERROR - -#define ERRMAX 256 // Needed for following define -#define ACE_LACKS_SYS_NERR // Needed for sys_nerr in Log_Msg.cpp - -#define ACE_LACKS_CUSERID -#define ACE_LACKS_CHDIR -#define ACE_LACKS_ENV -#define ACE_LACKS_HOSTNAME - -#if defined (_WIN32_WCE_EMULATION) -// @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl) -// under emulation. So for right now, exclude it. -# define ACE_LACKS_QSORT -#endif // _WIN32_WCE_EMULATION - -// @@ Followings are used to keep existing programs happy. - -#define ostream FILE -# if !defined (BUFSIZ) -# define BUFSIZ 1024 -#endif // BUFSIZ - -typedef void (__cdecl * __sighandler_t)(int); // keep Signal compilation happy -typedef long off_t; - -//#if (UNDER_CE > 200) // from prior ACE porting effort; left for future reference -#define EMFILE WSAEMFILE -#define EINTR WSAEINTR -#define EACCES ERROR_ACCESS_DENIED -#define ENOSPC ERROR_HANDLE_DISK_FULL -#define EEXIST ERROR_FILE_EXISTS -#define EPIPE ERROR_BROKEN_PIPE -#define EFAULT WSAEFAULT -#define ENOENT WSAEINVAL -#define EINVAL WSAEINVAL -#define ERANGE WSAEINVAL -#define EAGAIN WSAEWOULDBLOCK -#define ENOMEM ERROR_OUTOFMEMORY -#define ENODEV ERROR_BAD_DEVICE -#define ACE_LACKS_MALLOC_H // We do have malloc.h, but don't use it. -//#endif // UNDER_CE - -//#if (UNDER_CE < 300) // from prior ACE porting effort; left for future reference -//#define ACE_LACKS_STRPBRK -//#define ACE_LACKS_STRSPN -//#define ACE_LACKS_STRTOD -//#define ACE_LACKS_STRTOL -//#define ACE_LACKS_STRTOUL -//#endif // UNDER_CE < 300 - -//#if (UNDER_CE >= 211) // from prior ACE porting effort; left for future reference -#define ACE_HAS_WINCE_BROKEN_ERRNO -#define _MAX_FNAME 255 -//#endif // UNDER_CE - -#define ACE_HAS_STRDUP_EMULATION - -// CE doesn't have instead -#define ACE_HAS_FLAT_TYPES_H - -// @@ This needs to be defined and initialized as a static. (Singleton?) -#define ACE_DEFAULT_LOG_STREAM 0 - -// If you don't use MFC, this doesn't get defined -#if !defined (ACE_HAS_MFC) - inline void *operator new (unsigned int, void *p) { return p; } -#endif // ACE_HAS_MFC - -#define ACE_ENDTHREADEX(STATUS) ExitThread ((DWORD) STATUS) - -#include "ace/post.h" - -#endif // ACE_CONFIG_WINCE_H diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h deleted file mode 100644 index a739c1ae49a..00000000000 --- a/ace/config-aix-4.1.x.h +++ /dev/null @@ -1,8 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_AIX_VERS -# define ACE_AIX_VERS 401 -#endif - -#include "ace/config-aix-4.x.h" diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h deleted file mode 100644 index b44c851a437..00000000000 --- a/ace/config-aix-4.2.x.h +++ /dev/null @@ -1,8 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_AIX_VERS -# define ACE_AIX_VERS 402 -#endif - -#include "ace/config-aix-4.x.h" diff --git a/ace/config-aix-4.3.x.h b/ace/config-aix-4.3.x.h deleted file mode 100644 index d6b2824ec35..00000000000 --- a/ace/config-aix-4.3.x.h +++ /dev/null @@ -1,8 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_AIX_VERS -# define ACE_AIX_VERS 403 -#endif - -#include "ace/config-aix-4.x.h" diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h deleted file mode 100644 index c8ad970e6f7..00000000000 --- a/ace/config-aix-4.x.h +++ /dev/null @@ -1,314 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for OS -// platforms running AIX 4.x using the IBM C++ compiler (xlC), -// Visual Age C++ or g++. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// Both IBM and g++ compilers set _THREAD_SAFE if compiler is asked to compile -// threaded code (xlC_r, as opposed to xlC; and g++ -pthread) -# if defined (ACE_HAS_THREADS) -# undef ACE_HAS_THREADS -# endif -# if defined (_THREAD_SAFE) -# define ACE_HAS_THREADS 1 -# else -# define ACE_HAS_THREADS 0 -# endif /* _THREAD_SAFE */ - -#if defined (__xlC__) || defined (__IBMCPP__) - // AIX xlC, IBM C/C++, and Visual Age C++ compilers - //******************************************************************** - // - -// Compiler does this with a builtin - it's not in libc. -# define ACE_HAS_ALLOCA - -// Compiler supports the ssize_t typedef. -# define ACE_HAS_SSIZE_T - -// When using the preprocessor, Ignore info msg; invalid #pragma -# if defined (__IBMCPP__) && (__IBMCPP__ < 400) // IBM C++ 3.6 -# define ACE_CC_PREPROCESSOR_ARGS "-E -qflag=w:w" -# endif /* (__IBMCPP__) && (__IBMCPP__ < 400) */ - - // Keep an eye on this as the compiler and standards converge... -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_PRAGMA_ONCE - - // C Set++ 3.1, IBM C/C++ 3.6, and Visual Age C++ 5 batch (__xlC__) -# if defined (__xlC__) -# if (__xlC__ < 0x0500) -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -# endif /* __xlC__ < 0x0500 */ -# define ACE_TEMPLATES_REQUIRE_PRAGMA - // If compiling without thread support, turn off ACE's thread capability. -# endif - - // These are for Visual Age C++ only -# if defined (__IBMCPP__) && (__IBMCPP__ >= 400) -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -# define ACE_HAS_TYPENAME_KEYWORD -# undef WIFEXITED -# undef WEXITSTATUS -# if (__IBMCPP__ >= 500) /* Visual Age C++ 5 */ -# if !defined (ACE_HAS_USING_KEYWORD) -# define ACE_HAS_USING_KEYWORD 1 -# endif /* ACE_HAS_USING_KEYWORD */ -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* __IBMCPP__ >= 500 */ -# endif /* __IBMCPP__ */ - -#elif defined (__GNUG__) - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS - -# include "ace/config-g++-common.h" - // Denotes that GNU has cstring.h as standard, to redefine memchr(). -# define ACE_HAS_GNU_CSTRING_H -# define ACE_HAS_SSIZE_T - -# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0 - // ACE_MT_SAFE is #defined below, for all compilers. -# if !defined (_REENTRANT) -# define _REENTRANT -# endif /* _REENTRANT */ -# endif /* !ACE_MT_SAFE */ - -#else /* ! __xlC__ && ! __GNUG__ */ -# error unsupported compiler in ace/config-aix-4.x.h -#endif /* ! __xlC__ && ! __GNUG__ */ - - -// Compiling for AIX. -#ifndef AIX -# define AIX -#endif /* AIX */ - -// Pick up all the detectable settings. -#include "ace/config-posix.h" - -// AIX shared libs look strangely like archive libs until you look inside -// them. -#if defined (ACE_DLL_SUFFIX) -# undef ACE_DLL_SUFFIX -#endif -#define ACE_DLL_SUFFIX ".a" - -// Use BSD 4.4 socket definitions for pre-AIX 4.2. The _BSD setting also -// controls the data type used for waitpid(), wait(), and wait3(). -#if (ACE_AIX_VERS < 402) -# define _BSD 44 -# define ACE_HAS_UNION_WAIT -#endif /* ACE_AIX_VERS < 402 */ - -// This environment requires this thing, pre-AIX 4.3 -#if (ACE_AIX_VERS < 403) -# define _BSD_INCLUDES -#endif /* ACE_AIX_VERS < 403 */ - -#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) - -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -// ACE_HAS_AIX_BROKEN_SOCKET_HEADER may be required if your OS patches are -// not up to date. On up-to-date 4.2+ systems, it should not be required. -// 4.2+ has 4.4 BSD sendmsg/recvmsg -#if (ACE_AIX_VERS < 402) -# define ACE_HAS_AIX_BROKEN_SOCKET_HEADER -#else -# if (ACE_AIX_VERS == 402) -# define ACE_HAS_SIZET_SOCKET_LEN -# else -# define ACE_HAS_SOCKLEN_T -# endif -# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#endif /* ACE_AIX_VERS < 402 */ - -#if (ACE_AIX_VERS >= 403) -// AIX has AIO, but the functions don't match those of other AIO-enabled -// platforms. If this is to work, it'll require some significant work, -// maybe moving the OS-abstraction stuff to an OS_AIO or some such thing. -//# define ACE_HAS_AIO_CALLS -#endif /* ACE_AIX_VERS >= 403 */ - -#define ACE_HAS_AIX_HI_RES_TIMER - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS -#if (ACE_AIX_VERS < 403) -# define ACE_HAS_CHARPTR_DL -#endif /* ACE_AIX_VERS < 403 */ - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// OS has readdir and friends. -#define ACE_HAS_DIRENT - -// OS supports the getrusage() system call -#define ACE_HAS_GETRUSAGE - -#define ACE_HAS_GPERF - -#define ACE_HAS_H_ERRNO - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_IP_MULTICAST - -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - -#define ACE_HAS_MSG -#if (ACE_AIX_VERS < 402) -# define ACE_LACKS_MSG_ACCRIGHTS -# define ACE_LACKS_RLIMIT -#endif - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_HAS_POSIX_TIME -// ... but needs to include another header for it on 4.2+ -#if (ACE_AIX_VERS >= 402) -# define ACE_HAS_BROKEN_POSIX_TIME -#endif /* ACE_AIX_VERS > 402 */ -// ... and needs another typedef -#define ACE_LACKS_TIMESPEC_T -#define ACE_HAS_SELECT_H - -#define ACE_HAS_REENTRANT_FUNCTIONS - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T -#if (ACE_AIX_VERS >= 402) -# define ACE_HAS_SIGINFO_T -# define ACE_LACKS_SIGINFO_H -#endif /* ACE_AIX_VERS >= 402 */ -#if (ACE_AIX_VERS >= 403) -// it may exist in earlier revs, but I'm not sure and I don't have a -// system to validate -# define ACE_HAS_P_READ_WRITE -#endif /* ACE_AIX_VERS >= 403 */ - -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIN_LEN -#define ACE_HAS_STRBUF_T - -// Compiler supports stropts.h -#define ACE_HAS_STREAMS -// #define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// AIX bzero() -#define ACE_HAS_STRINGS - -#define ACE_HAS_STRUCT_NETDB_DATA - -// Dynamic linking is in good shape on newer OS/patch levels. If you have -// trouble with the dynamic linking parts of ACE, and can't patch your OS -// up to latest levels, comment this out. -#define ACE_HAS_SVR4_DYNAMIC_LINKING -// This is tightly related to dynamic linking... -#define ACE_HAS_AUTOMATIC_INIT_FINI - -#define ACE_HAS_SVR4_GETTIMEOFDAY - -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_TIMOD_H -#define ACE_HAS_TIUSER_H -#define ACE_HAS_TLI -#define ACE_HAS_BROKEN_T_ERROR -#define ACE_HAS_TLI_PROTOTYPES -#define ACE_TLI_TCP_DEVICE "/dev/xti/tcp" - -#define ACE_HAS_UALARM - -#if (ACE_AIX_VERS >= 402) -# define ACE_HAS_UCONTEXT_T -#endif /* ACE_AIX_VERS >= 402 */ - -#define ACE_HAS_UTIME - -// Platform has XPG4 wide character type and functions -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -#define ACE_LACKS_TCP_H - -// AIX uses LIBPATH to search for libraries -#define ACE_LD_SEARCH_PATH "LIBPATH" - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -//************************************************************** -// -// Threads related definitions. -// -// The threads on AIX are generally POSIX P1003.1c (ACE_HAS_PTHREADS). -// However, there is also a kernel thread ID (tid_t) that is used in -// ACE_Log_Msg (printing the thread ID). The tid_t is not the same as -// pthread_t, and can't derive one from the other - thread_self() gets -// the tid_t (kernel thread ID) if called from a thread. -// Thanks very much to Chris Lahey for straightening this out. - -#if defined (ACE_HAS_THREADS) -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif - -# define ACE_HAS_PTHREADS -// 4.3 and up has 1003.1c standard; 4.2 has draft 7 -# if (ACE_AIX_VERS >= 403) -# define ACE_HAS_PTHREADS_STD -# define ACE_HAS_PTHREADS_UNIX98_EXT -# define ACE_HAS_PTHREAD_CONTINUE -# define ACE_HAS_PTHREAD_SUSPEND -# else -# define ACE_HAS_PTHREADS_DRAFT7 -# define ACE_LACKS_RWLOCK_T -# define ACE_LACKS_THREAD_STACK_ADDR -// If ACE doesn't compile due to the lack of these methods, please -// send email to ace-users@cs.wustl.edu reporting this. -// #define ACE_LACKS_CONDATTR_PSHARED -// #define ACE_LACKS_MUTEXATTR_PSHARED -# define ACE_LACKS_SETSCHED -# endif /* ACE_AIX_VERS >= 403 */ - -# define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -# define ACE_HAS_SIGTHREADMASK -# define ACE_HAS_THREAD_SPECIFIC_STORAGE - -# define ACE_LACKS_THREAD_PROCESS_SCOPING -#else -# undef ACE_HAS_THREADS -#endif /* ACE_HAS_THREADS != 0 */ - -#define ACE_MALLOC_ALIGN 8 - -// By default, tracing code is not compiled. To compile it in, cause -// ACE_NTRACE to not be defined, and rebuild ACE. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#if (_XOPEN_SOURCE == 500) && !defined(_UNIX95) -# define ACE_HAS_3_PARAM_WCSTOK -#endif /* _XOPEN_SOURCE == 500 && !_UNIX95 */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-aix5.1.h b/ace/config-aix5.1.h deleted file mode 100644 index 8103f64d902..00000000000 --- a/ace/config-aix5.1.h +++ /dev/null @@ -1,21 +0,0 @@ -// $Id$ -// -// Config file for AIX 5.1 - -// This define is needed for building with Visual Age C++ 5 in incremental -// mode. In the batch mode build, platform_aix_ibm.GNU sets it. The incremental -// mode compiler won't be supported after ACE 5.3, so this will also go away -// in that timeframe, so don't worry about future AIX versions. -#if !defined (ACE_AIX_VERS) -# define ACE_AIX_VERS 501 -#endif - -#include "ace/config-aix-4.x.h" - -// AIX 5.1 has AIO, but it doesn't have the same API as other POSIX -// systems, and the semantics of operations are a bit different. Will take -// some real work to get this going. -//#define ACE_HAS_AIO_CALLS - -// I think this is correct, but needs to be verified... -Steve Huston -#define ACE_HAS_SIGTIMEDWAIT diff --git a/ace/config-all.h b/ace/config-all.h deleted file mode 100644 index 3026090db47..00000000000 --- a/ace/config-all.h +++ /dev/null @@ -1,625 +0,0 @@ -// -*- C++ -*- - -//========================================================================== -/** - * @file config-all.h - * - * $Id$ - * - * @author (Originally in OS.h)Doug Schmidt - * @author Jesper S. M|ller - * @author and a cast of thousands... - */ -//========================================================================== - -#ifndef ACE_CONFIG_ALL_H -#define ACE_CONFIG_ALL_H -#include "ace/pre.h" - -#include "ace/config.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// ========================================================================= -// Perfect Multicast filting refers to RFC 3376, where a socket is only -// delivered dgrams for groups joined even if it didn't bind the group -// address. We turn this option off by default, although most OS's -// except for Windows and Solaris probably lack perfect filtering. -// ========================================================================= - -# if !defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING) -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 0 -# endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - -// ========================================================================= -// Enable/Disable Features By Default -// ========================================================================= - -# if !defined (ACE_HAS_POSITION_INDEPENDENT_POINTERS) -# define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 -# endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS */ - -// ========================================================================= -// RCSID Macros -// ========================================================================= - -// By default, DO include RCS Id strings in object code. -#if ! defined (ACE_USE_RCSID) -# define ACE_USE_RCSID 1 -#endif /* #if ! defined (ACE_USE_RCSID) */ - -#if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0)) -# if ! defined (ACE_RCSID) - - // This hack has the following purposes: - // 1. To define the RCS id string variable as a static char*, so - // that there won't be any duplicate extern symbols at link - // time. - // 2. To have a RCS id string variable with a unique name for each - // file. - // 3. To avoid warnings of the type "variable declared and never - // used". - -# define ACE_RCSID(path, file, id) \ - static inline const char* get_rcsid_ ## path ## _ ## file (const char*) \ - { \ - return id ; \ - } \ - static const char* rcsid_ ## path ## _ ## file = \ - get_rcsid_ ## path ## _ ## file ( rcsid_ ## path ## _ ## file ) ; - -# endif /* #if ! defined (ACE_RCSID) */ -#else - - // RCS id strings are not wanted. -# if defined (ACE_RCSID) -# undef ACE_RCSID -# endif /* #if defined (ACE_RCSID) */ -# define ACE_RCSID(path, file, id) /* noop */ -#endif /* #if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0)) */ - -// ========================================================================= -// INLINE macros -// -// These macros handle all the inlining of code via the .i or .inl files -// ========================================================================= - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) && !defined (ACE_NO_INLINE) -# define ACE_NO_INLINE -#endif /* defined (ACE_LACKS_INLINE_FUNCTIONS) && !defined (ACE_NO_INLINE) */ - -// ACE inlining has been explicitly disabled. Implement -// internally within ACE by undefining __ACE_INLINE__. -#if defined (ACE_NO_INLINE) -# undef __ACE_INLINE__ -#endif /* ! ACE_NO_INLINE */ - -#if defined (__ACE_INLINE__) -# define ACE_INLINE inline -# if !defined (ACE_HAS_INLINED_OSCALLS) -# define ACE_HAS_INLINED_OSCALLS -# endif /* !ACE_HAS_INLINED_OSCALLS */ -#else -# define ACE_INLINE -#endif /* __ACE_INLINE__ */ - -# if !defined (ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS) -# define ACE_INLINE_FOR_GNUC ACE_INLINE -# else -# define ACE_INLINE_FOR_GNUC -# endif /* ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS */ - -// Some ACE classes always use inline functions to maintain high -// performance, but some platforms have buggy inline function support. -// In this case, we don't use inline with them. -# if defined (ACE_LACKS_INLINE_FUNCTIONS) -# if defined (ASYS_INLINE) -# undef ASYS_INLINE -# endif /* ASYS_INLINE */ -# define ASYS_INLINE -# if defined (ACE_HAS_INLINED_OSCALLS) -# undef ACE_HAS_INLINED_OSCALLS -# endif /* ACE_HAS_INLINED_OSCALLS */ -# else -# define ASYS_INLINE inline -# endif /* ACE_LACKS_INLINE_FUNCTIONS */ - -// ========================================================================= -// EXPLICIT macro -// ========================================================================= - -# if defined (ACE_HAS_EXPLICIT_KEYWORD) -# define ACE_EXPLICIT explicit -# else /* ! ACE_HAS_EXPLICIT_KEYWORD */ -# define ACE_EXPLICIT -# endif /* ! ACE_HAS_EXPLICIT_KEYWORD */ - -// ========================================================================= -// MUTABLE macro -// ========================================================================= - -# if defined (ACE_HAS_MUTABLE_KEYWORD) -# define ACE_MUTABLE mutable -# define ACE_CONST_WHEN_MUTABLE const // Addition #1 -# else /* ! ACE_HAS_MUTABLE_KEYWORD */ -# define ACE_MUTABLE -# define ACE_CONST_WHEN_MUTABLE // Addition #2 -# endif /* ! ACE_HAS_MUTABLE_KEYWORD */ - -// ============================================================================ -// EXPORT macros -// -// Since Win32 DLL's do not export all symbols by default, they must be -// explicitly exported (which is done by *_Export macros). -// ============================================================================ - -// Win32 should have already defined the macros in config-win32-common.h -#if !defined (ACE_HAS_CUSTOM_EXPORT_MACROS) -# define ACE_Proper_Export_Flag -# define ACE_Proper_Import_Flag -# define ACE_EXPORT_SINGLETON_DECLARATION(T) -# define ACE_IMPORT_SINGLETON_DECLARATION(T) -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_HAS_CUSTOM_EXPORT_MACROS */ - -// This is a whim of mine -- that instead of annotating a class with -// ACE_Export in its declaration, we make the declaration near the TOP -// of the file with ACE_DECLARE_EXPORT. -// TS = type specifier (e.g., class, struct, int, etc.) -// ID = identifier -// So, how do you use it? Most of the time, just use ... -// ACE_DECLARE_EXPORT(class, someobject); -// If there are global functions to be exported, then use ... -// ACE_DECLARE_EXPORT(void, globalfunction) (int, ...); -// Someday, when template libraries are supported, we made need ... -// ACE_DECLARE_EXPORT(template class, sometemplate) ; -# define ACE_DECLARE_EXPORT(TS,ID) TS ACE_Export ID - -// ============================================================================ -// Cast macros -// -// These macros are used to choose between the old cast style and the new -// *_cast<> operators -// ============================================================================ - -# if defined (ACE_HAS_ANSI_CASTS) - -# define ACE_sap_any_cast(TYPE) reinterpret_cast (const_cast (ACE_Addr::sap_any)) - -# define ACE_static_cast(TYPE, EXPR) static_cast (EXPR) -# define ACE_static_cast_1_ptr(TYPE, T1, EXPR) static_cast *> (EXPR) -# define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR) static_cast *> (EXPR) -# define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR) static_cast *> (EXPR) -# define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) static_cast *> (EXPR) -# define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast *> (EXPR) -# define ACE_static_cast_1_ref(TYPE, T1, EXPR) static_cast &> (EXPR) -# define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR) static_cast &> (EXPR) -# define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR) static_cast &> (EXPR) -# define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) static_cast &> (EXPR) -# define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast &> (EXPR) - -# define ACE_const_cast(TYPE, EXPR) const_cast (EXPR) -# define ACE_const_cast_1_ptr(TYPE, T1, EXPR) const_cast *> (EXPR) -# define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR) const_cast *> (EXPR) -# define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR) const_cast *> (EXPR) -# define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) const_cast *> (EXPR) -# define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) const_cast *> (EXPR) -# define ACE_const_cast_1_ref(TYPE, T1, EXPR) const_cast &> (EXPR) -# define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR) const_cast &> (EXPR) -# define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR) const_cast &> (EXPR) -# define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) const_cast &> (EXPR) -# define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) const_cast &> (EXPR) - -# define ACE_reinterpret_cast(TYPE, EXPR) reinterpret_cast (EXPR) -# define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR) reinterpret_cast *> (EXPR) -# define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR) reinterpret_cast *> (EXPR) -# define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR) reinterpret_cast *> (EXPR) -# define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) reinterpret_cast *> (EXPR) -# define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) reinterpret_cast *> (EXPR) -# define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR) reinterpret_cast &> (EXPR) -# define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR) reinterpret_cast &> (EXPR) -# define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR) reinterpret_cast &> (EXPR) -# define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) reinterpret_cast &> (EXPR) -# define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) reinterpret_cast &> (EXPR) - -# if defined (ACE_LACKS_RTTI) -# define ACE_dynamic_cast(TYPE, EXPR) static_cast (EXPR) -# define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR) static_cast *> (EXPR) -# define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR) static_cast *> (EXPR) -# define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR) static_cast *> (EXPR) -# define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) static_cast *> (EXPR) -# define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast *> (EXPR) -# define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR) static_cast &> (EXPR) -# define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR) static_cast &> (EXPR) -# define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR) static_cast &> (EXPR) -# define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) static_cast &> (EXPR) -# define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast &> (EXPR) -# else /* ! ACE_LACKS_RTTI */ -# define ACE_dynamic_cast(TYPE, EXPR) dynamic_cast (EXPR) -# define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR) dynamic_cast *> (EXPR) -# define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR) dynamic_cast *> (EXPR) -# define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR) dynamic_cast *> (EXPR) -# define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) dynamic_cast *> (EXPR) -# define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) dynamic_cast *> (EXPR) -# define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR) dynamic_cast &> (EXPR) -# define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR) dynamic_cast &> (EXPR) -# define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR) dynamic_cast &> (EXPR) -# define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) dynamic_cast &> (EXPR) -# define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) dynamic_cast &> (EXPR) -# endif /* ! ACE_LACKS_RTTI */ - -# else - -# define ACE_sap_any_cast(TYPE) ((TYPE) (ACE_Addr::sap_any)) - -# define ACE_static_cast(TYPE, EXPR) ((TYPE) (EXPR)) -# define ACE_static_cast_1_ptr(TYPE, T1, EXPR) ((TYPE *) (EXPR)) -# define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR) ((TYPE *) (EXPR)) -# define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR) ((TYPE *) (EXPR)) -# define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) ((TYPE *) (EXPR)) -# define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) ((TYPE *) (EXPR)) -# define ACE_static_cast_1_ref(TYPE, T1, EXPR) ((TYPE &) (EXPR)) -# define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR) ((TYPE &) (EXPR)) -# define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR) ((TYPE &) (EXPR)) -# define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) ((TYPE &) (EXPR)) -# define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) ((TYPE &) (EXPR)) - -# define ACE_const_cast(TYPE, EXPR) ((TYPE) (EXPR)) -# define ACE_const_cast_1_ptr(TYPE, T1, EXPR) ((TYPE *) (EXPR)) -# define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR) ((TYPE *) (EXPR)) -# define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR) ((TYPE *) (EXPR)) -# define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) ((TYPE *) (EXPR)) -# define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) ((TYPE *) (EXPR)) -# define ACE_const_cast_1_ref(TYPE, T1, EXPR) ((TYPE &) (EXPR)) -# define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR) ((TYPE &) (EXPR)) -# define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR) ((TYPE &) (EXPR)) -# define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) ((TYPE &) (EXPR)) -# define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) ((TYPE &) (EXPR)) - -# define ACE_reinterpret_cast(TYPE, EXPR) ((TYPE) (EXPR)) -# define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR) ((TYPE *) (EXPR)) -# define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR) ((TYPE *) (EXPR)) -# define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR) ((TYPE *) (EXPR)) -# define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) ((TYPE *) (EXPR)) -# define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) ((TYPE *) (EXPR)) -# define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR) ((TYPE &) (EXPR)) -# define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR) ((TYPE &) (EXPR)) -# define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR) ((TYPE &) (EXPR)) -# define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) ((TYPE &) (EXPR)) -# define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) ((TYPE &) (EXPR)) - -# define ACE_dynamic_cast(TYPE, EXPR) ((TYPE) (EXPR)) -# define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR) ((TYPE *) (EXPR)) -# define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR) ((TYPE *) (EXPR)) -# define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR) ((TYPE *) (EXPR)) -# define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) ((TYPE *) (EXPR)) -# define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) ((TYPE *) (EXPR)) -# define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR) ((TYPE &) (EXPR)) -# define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR) ((TYPE &) (EXPR)) -# define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR) ((TYPE &) (EXPR)) -# define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) ((TYPE &) (EXPR)) -# define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) ((TYPE &) (EXPR)) -# endif /* ACE_HAS_ANSI_CASTS */ - -# if !defined (ACE_CAST_CONST) - // Sun CC 4.2, for example, requires const in reinterpret casts of - // data members in const member functions. But, other compilers - // complain about the useless const. This keeps everyone happy. -# if defined (__SUNPRO_CC) -# define ACE_CAST_CONST const -# else /* ! __SUNPRO_CC */ -# define ACE_CAST_CONST -# endif /* ! __SUNPRO_CC */ -# endif /* ! ACE_CAST_CONST */ - -// ============================================================================ -// UNICODE macros (to be added later) -// ============================================================================ - -// Get the unicode (i.e. ACE_TCHAR) defines -# include "ace/ace_wchar.h" - - -// ============================================================================ -// Compiler Silencing macros -// -// Some compilers complain about parameters that are not used. This macro -// should keep them quiet. -// ============================================================================ - -#if defined (ghs) || defined (__GNUC__) || defined (__hpux) || defined (__sgi) || defined (__DECCXX) || defined (__KCC) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) -// Some compilers complain about "statement with no effect" with (a). -// This eliminates the warnings, and no code is generated for the null -// conditional statement. NOTE: that may only be true if -O is enabled, -// such as with GreenHills (ghs) 1.8.8. -# define ACE_UNUSED_ARG(a) do {/* null */} while (&a == 0) -#else /* ghs || __GNUC__ || ..... */ -# define ACE_UNUSED_ARG(a) (a) -#endif /* ghs || __GNUC__ || ..... */ - -#if defined (__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__KCC) || defined (ACE_RM544) || defined (__USLC__) -# define ACE_NOTREACHED(a) -#else /* __sgi || ghs || ..... */ -# define ACE_NOTREACHED(a) a -#endif /* __sgi || ghs || ..... */ - -// ============================================================================ -// ACE_ALLOC_HOOK* macros -// -// Macros to declare and define class-specific allocation operators. -// ============================================================================ - -# if defined (ACE_HAS_ALLOC_HOOKS) -# define ACE_ALLOC_HOOK_DECLARE \ - void *operator new (size_t bytes); \ - void operator delete (void *ptr); - - // Note that these are just place holders for now. Some day they - // may be be replaced by . -# define ACE_ALLOC_HOOK_DEFINE(CLASS) \ - void *CLASS::operator new (size_t bytes) { return ::new char[bytes]; } \ - void CLASS::operator delete (void *ptr) { delete [] ((char *) ptr); } -# else -# define ACE_ALLOC_HOOK_DECLARE struct __Ace {} /* Just need a dummy... */ -# define ACE_ALLOC_HOOK_DEFINE(CLASS) -# endif /* ACE_HAS_ALLOC_HOOKS */ - -// ============================================================================ -// ACE_OSCALL_* macros -// -// The following two macros ensure that system calls are properly -// restarted (if necessary) when interrupts occur. -// ============================================================================ - -#if defined (ACE_HAS_SIGNAL_SAFE_OS_CALLS) -# define ACE_OSCALL(OP,TYPE,FAILVALUE,RESULT) \ - do \ - RESULT = (TYPE) OP; \ - while (RESULT == FAILVALUE && errno == EINTR) -# define ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) \ - do { \ - TYPE ace_result_; \ - do \ - ace_result_ = (TYPE) OP; \ - while (ace_result_ == FAILVALUE && errno == EINTR); \ - return ace_result_; \ - } while (0) -# elif defined (ACE_WIN32) -# define ACE_OSCALL_RETURN(X,TYPE,FAILVALUE) \ - do \ - return (TYPE) X; \ - while (0) -# define ACE_OSCALL(X,TYPE,FAILVALUE,RESULT) \ - do \ - RESULT = (TYPE) X; \ - while (0) -# if defined (__BORLANDC__) && (__BORLANDC__ <= 0x550) -# define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ - do { \ - TYPE ace_result_; \ - TYPE ace_local_result_ = (TYPE) X; \ - ace_result_ = ace_local_result_; \ - if (ace_result_ == FAILVALUE) \ - ACE_OS::set_errno_to_last_error (); \ - return ace_result_; \ - } while (0) -# else -# define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ - do { \ - TYPE ace_result_; \ - ace_result_ = (TYPE) X; \ - if (ace_result_ == FAILVALUE) \ - ACE_OS::set_errno_to_last_error (); \ - return ace_result_; \ - } while (0) -# endif /* defined (__BORLANDC__) && (__BORLANDC__ <= 0x550) */ -# define ACE_WIN32CALL(X,TYPE,FAILVALUE,RESULT) \ - do { \ - RESULT = (TYPE) X; \ - if (RESULT == FAILVALUE) \ - ACE_OS::set_errno_to_last_error (); \ - } while (0) -#else /* ACE_HAS_SIGNAL_SAFE_OS_CALLS */ -# define ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) do { TYPE ace_result_ = FAILVALUE; ace_result_ = ace_result_; return OP; } while (0) -# define ACE_OSCALL(OP,TYPE,FAILVALUE,RESULT) do { RESULT = (TYPE) OP; } while (0) -#endif /* ACE_HAS_SIGNAL_SAFE_OS_CALLS */ - -// ============================================================================ -// at_exit declarations -// ============================================================================ - -// Marker for cleanup, used by ACE_Exit_Info. -extern int ace_exit_hook_marker; - -// For use by . -extern "C" -{ - typedef void (*ACE_EXIT_HOOK) (void); -} - -// ============================================================================ -// log_msg declarations -// ============================================================================ - -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) -typedef int (*ACE_SEH_EXCEPT_HANDLER)(void *); -// Prototype of win32 structured exception handler functions. -// They are used to get the exception handling expression or -// as exception handlers. -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - -class ACE_OS_Thread_Descriptor; -class ACE_OS_Log_Msg_Attributes; -typedef void (*ACE_INIT_LOG_MSG_HOOK) (ACE_OS_Log_Msg_Attributes &attr -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , ACE_SEH_EXCEPT_HANDLER selector - , ACE_SEH_EXCEPT_HANDLER handler -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - ); -typedef void (*ACE_INHERIT_LOG_MSG_HOOK) (ACE_OS_Thread_Descriptor*, - ACE_OS_Log_Msg_Attributes &); - -typedef void (*ACE_CLOSE_LOG_MSG_HOOK) (void); - -typedef void (*ACE_SYNC_LOG_MSG_HOOK) (const ACE_TCHAR *prog_name); - -typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) (void); - -// ============================================================================ -// Fundamental types -// ============================================================================ - -#if defined (ACE_WIN32) - -typedef HANDLE ACE_HANDLE; -typedef SOCKET ACE_SOCKET; -# define ACE_INVALID_HANDLE INVALID_HANDLE_VALUE - -#else /* ! ACE_WIN32 */ - -typedef int ACE_HANDLE; -typedef ACE_HANDLE ACE_SOCKET; -# define ACE_INVALID_HANDLE -1 - -#endif /* ACE_WIN32 */ - -// Define the type that's returned from the platform's native thread -// functions. ACE_THR_FUNC_RETURN is the type defined as the thread -// function's return type, except when the thread function doesn't return -// anything (pSoS). The ACE_THR_FUNC_NO_RETURN_VAL macro is used to -// indicate that the actual thread function doesn't return anything. The -// rest of ACE uses a real type so there's no a ton of conditional code -// everywhere to deal with the possibility of no return type. -# if defined (VXWORKS) -//typedef FUNCPTR ACE_THR_FUNC; // where typedef int (*FUNCPTR) (...) -typedef int ACE_THR_FUNC_RETURN; -# elif defined (ACE_PSOS) -typedef int ACE_THR_FUNC_RETURN; -// pSOS task functions don't really return anything... this just makes it -// easier to deal with declaring variables internally in ACE. -# elif defined (ACE_WIN32) -typedef DWORD ACE_THR_FUNC_RETURN; -# else -typedef void* ACE_THR_FUNC_RETURN; -# endif /* VXWORKS */ -typedef ACE_THR_FUNC_RETURN (*ACE_THR_FUNC)(void *); - -extern "C" { -typedef void (*ACE_THR_C_DEST)(void *); -} -typedef void (*ACE_THR_DEST)(void *); - -# if defined (VXWORKS) -# if defined (ghs) - // GreenHills 1.8.8 needs the stdarg.h #include before the #include of - // vxWorks.h. - // Also, be sure that these #includes come _after_ the key_t typedef, and - // before the #include of time.h. -# include /**/ -# endif /* ghs */ - -# include /**/ -# endif /* VXWORKS */ - -// Now some platforms have special requirements... -# if defined (VXWORKS) -typedef FUNCPTR ACE_THR_FUNC_INTERNAL; // where typedef int (*FUNCPTR) (...) -# elif defined (ACE_PSOS) -typedef void (*ACE_THR_FUNC_INTERNAL)(void *); -# else -typedef ACE_THR_FUNC ACE_THR_FUNC_INTERNAL; -# endif /* VXWORKS */ - -extern "C" -{ -# if defined (VXWORKS) -typedef FUNCPTR ACE_THR_C_FUNC; // where typedef int (*FUNCPTR) (...) -# elif defined (ACE_PSOS) -// needed to handle task entry point type inconsistencies in pSOS+ -typedef void (*PSOS_TASK_ENTRY_POINT)(); -typedef void (*ACE_THR_C_FUNC)(void *); -# else -typedef ACE_THR_FUNC_RETURN (*ACE_THR_C_FUNC)(void *); -# endif /* VXWORKS */ -} - -// ============================================================================ -// Macros for controlling the lifetimes of dlls loaded by ACE_DLL--including -// all dlls loaded via the ACE Service Config framework. -// -// Please don't change these values or add new ones wantonly, since we use -// the ACE_BIT_ENABLED, etc..., macros to test them. -// ============================================================================ - -// Per-process policy that unloads dlls eagerly. -#define ACE_DLL_UNLOAD_POLICY_PER_PROCESS 0 -// Apply policy on a per-dll basis. If the dll doesn't use one of the macros -// below, the current per-process policy will be used. -#define ACE_DLL_UNLOAD_POLICY_PER_DLL 1 -// Don't unload dll when refcount reaches zero, i.e., wait for either an -// explicit unload request or program exit. -#define ACE_DLL_UNLOAD_POLICY_LAZY 2 -// Default policy allows dlls to control their own destinies, but will -// unload those that don't make a choice eagerly. -#define ACE_DLL_UNLOAD_POLICY_DEFAULT ACE_DLL_UNLOAD_POLICY_PER_DLL - -// Add this macro you one of your cpp file in your dll. X should -// be either ACE_DLL_UNLOAD_POLICY_DEFAULT or ACE_DLL_UNLOAD_POLICY_LAZY. -#define ACE_DLL_UNLOAD_POLICY(CLS,X) \ -extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ - { return X;} - -// ============================================================================ -// ACE_USES_CLASSIC_SVC_CONF macro -// ============================================================================ - -// For now, default is to use the classic svc.conf format. -#if !defined (ACE_USES_CLASSIC_SVC_CONF) -# if defined (ACE_HAS_CLASSIC_SVC_CONF) && defined (ACE_HAS_XML_SVC_CONF) -# error You can only use either CLASSIC or XML svc.conf, not both. -# endif -// Change the ACE_HAS_XML_SVC_CONF to ACE_HAS_CLASSIC_SVC_CONF when -// we switch ACE to use XML svc.conf as default format. -# if defined (ACE_HAS_XML_SVC_CONF) -# define ACE_USES_CLASSIC_SVC_CONF 0 -# else -# define ACE_USES_CLASSIC_SVC_CONF 1 -# endif /* ACE_HAS_XML_SVC_CONF */ -#endif /* ACE_USES_CLASSIC_SVC_CONF */ - -// ============================================================================ -// Default svc.conf file extension. -// ============================================================================ -#if defined (ACE_USES_CLASSIC_SVC_CONF) && (ACE_USES_CLASSIC_SVC_CONF == 1) -# define ACE_DEFAULT_SVC_CONF_EXT ".conf" -#else -# define ACE_DEFAULT_SVC_CONF_EXT ".conf.xml" -#endif /* ACE_USES_CLASSIC_SVC_CONF && ACE_USES_CLASSIC_SVC_CONF == 1 */ - -// ============================================================================ -// Miscellaneous macros -// ============================================================================ - -// This is used to indicate that a platform doesn't support a -// particular feature. -#if defined ACE_HAS_VERBOSE_NOTSUP - // Print a console message with the file and line number of the - // unsupported function. -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) -# include /**/ -# else -# include /**/ // LynxOS requires this before stdio.h -# include /**/ -# endif -# define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP; fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return FAILVALUE; } while (0) -# define ACE_NOTSUP do { errno = ENOTSUP; fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return; } while (0) -#else /* ! ACE_HAS_VERBOSE_NOTSUP */ -# define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP ; return FAILVALUE; } while (0) -# define ACE_NOTSUP do { errno = ENOTSUP; return; } while (0) -#endif /* ! ACE_HAS_VERBOSE_NOTSUP */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_ALL_H */ diff --git a/ace/config-borland-common.h b/ace/config-borland-common.h deleted file mode 100644 index b2876262a89..00000000000 --- a/ace/config-borland-common.h +++ /dev/null @@ -1,87 +0,0 @@ -// -*- C++ -*- -//$Id$ - -// The following configuration file contains defines for Borland compilers. - -#ifndef ACE_CONFIG_BORLAND_COMMON_H -#define ACE_CONFIG_BORLAND_COMMON_H -#include "ace/pre.h" - -#define ACE_HAS_CUSTOM_EXPORT_MACROS -#define ACE_Proper_Export_Flag __declspec (dllexport) -#define ACE_Proper_Import_Flag __declspec (dllimport) -#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T -#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE; -#define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T -#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE ; - -# if (__BORLANDC__ == 0x540) -// The linker in C++Builder 4 has trouble with the large number of DLL -// function exports created when you compile without inline functions. -// Therefore we will always use inline functions with this version of -// the compiler. -# if defined (__ACE_INLINE__) -# undef __ACE_INLINE__ -# endif /* __ACE_INLINE__ */ -# define __ACE_INLINE__ 1 -# else /* __BORLANDC__ == 0x540 */ -// In later versions of C++Builder we will prefer inline functions by -// default. The debug configuration of ACE is built with functions -// out-of-line, so when linking your application against a debug ACE -// build, you can choose to use the out-of-line functions by adding -// ACE_NO_INLINE=1 to your project settings. -# if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ 1 -# endif /* __ACE_INLINE__ */ -# endif /* __BORLANDC__ == 0x540 */ - -# define ACE_CC_NAME ACE_LIB_TEXT ("Borland C++ Builder") -# define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) -# define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) -# define ACE_CC_BETA_VERSION (0) -# define ACE_CC_PREPROCESSOR "CPP32.EXE" -# define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s" - -# define ACE_HAS_ITOA 1 - -# define ACE_EXPORT_NESTED_CLASSES 1 -# define ACE_HAS_ANSI_CASTS 1 -# define ACE_HAS_CPLUSPLUS_HEADERS 1 -# define ACE_HAS_EXCEPTIONS -# define ACE_HAS_EXPLICIT_KEYWORD 1 -# define ACE_HAS_GNU_CSTRING_H 1 -# define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION 1 -# define ACE_HAS_MUTABLE_KEYWORD 1 -# define ACE_HAS_NONCONST_SELECT_TIMEVAL -# define ACE_HAS_SIG_ATOMIC_T -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION 1 -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION 1 -# define ACE_HAS_STDCPP_STL_INCLUDES 1 -# define ACE_HAS_STRERROR -# define ACE_HAS_STRING_CLASS 1 -# define ACE_HAS_STRPTIME -# define ACE_HAS_TEMPLATE_SPECIALIZATION 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS 1 -# define ACE_HAS_TYPENAME_KEYWORD 1 -# define ACE_HAS_USER_MODE_MASKS 1 -# define ACE_HAS_USING_KEYWORD 1 -# define ACE_LACKS_ACE_IOSTREAM 1 -# define ACE_LACKS_INLINE_ASSEMBLY 1 -# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -# define ACE_LACKS_NATIVE_STRPTIME 1 -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1 -# define ACE_LACKS_PRAGMA_ONCE 1 -# define ACE_LACKS_STRRECVFD -# define ACE_NEW_THROWS_EXCEPTIONS 1 -# define ACE_SIZEOF_LONG_DOUBLE 10 -# define ACE_TEMPLATES_REQUIRE_SOURCE 1 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Lu") -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 0 - -# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) - -#include "ace/post.h" -#endif /* ACE_CONFIG_BORLAND_COMMON_H */ diff --git a/ace/config-chorus.h b/ace/config-chorus.h deleted file mode 100644 index 827777a8a0f..00000000000 --- a/ace/config-chorus.h +++ /dev/null @@ -1,159 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for Chorus -// platforms using one of these compilers: -// * GNU g++ -// * GreenHills -// It uses the Chorus POSIX threads interface. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// Define CHORUS to the correct version number -#ifdef CHORUS_4 -# define CHORUS 4.0 -#else -# define CHORUS 3.1b -#endif - -#if defined (linux) - // This shouldn't be necessary. -# undef linux -#endif /* linux */ - -// Compiler-specific configuration. - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -# undef ACE_HAS_ANSI_CASTS -# define ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS -#elif defined (ghs) -# define ACE_CONFIG_INCLUDE_GHS_COMMON -# include "ace/config-ghs-common.h" - -# define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -# define ACE_HAS_TANDEM_SIGNALS -# define ACE_HAS_TEMPLATE_SPECIALIZATION -# define ACE_LACKS_ACE_IOSTREAM /* MVME lacks signed and unsigned char */ -# define ACE_LACKS_FLOATING_POINT -#else /* ! __GNUG__ && ! ghs */ -# error unsupported compiler for ACE on Chorus -#endif /* ! __GNUG__ && ! ghs */ - -// OS-specific configuration - -// Chorus cannot grow shared memory, so this is the default size for a -// local name space -#define ACE_CHORUS_LOCAL_NAME_SPACE_T_SIZE 128000 -// Used in OS.i to map an actor id into a KnCap. -#define ACE_CHORUS_MAX_ACTORS 64 - -// This is not needed when compiling for PPC. It is necessary -// for certain methods in ACE.cpp. -#if defined(sparc) && !defined(__unix) -# define __unix -#endif - -#if defined(CHORUS_4) -# define ACE_CHORUS_DEFAULT_MIN_STACK_SIZE 0x8000 -# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -# define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#else -# define ACE_CHORUS_DEFAULT_MIN_STACK_SIZE 0x2000 -# define ACE_LACKS_KEY_T -# define ACE_LACKS_ACCESS -# define ACE_LACKS_FSYNC -# define ACE_LACKS_GETSERVBYNAME -# define ACE_LACKS_MKFIFO -# define ACE_LACKS_READLINK -# define ACE_LACKS_TRUNCATE -# define ACE_LACKS_LONGLONG_T -#endif - -#define ACE_HAS_BROKEN_READV -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_DIRENT -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_LONG_MAP_FAILED -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_POSIX_SEM -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRDUP_EMULATION -#define ACE_HAS_STRERROR -#define ACE_HAS_TSS_EMULATION -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_FORK -#define ACE_LACKS_GETHOSTENT -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MALLOC_H -#define ACE_LACKS_MEMORY_H -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_NAMED_POSIX_SEM -#define ACE_LACKS_PARAM_H -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_READV -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SBRK -#define ACE_LACKS_SEMBUF_T -#define ACE_LACKS_SIGSET -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSV_MSG_H -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_UNIX_SIGNALS -#define ACE_LACKS_UTSNAME_T -#define ACE_LACKS_WRITEV -#define ACE_PAGE_SIZE 4096 - -// Chorus has syslog, but doesn't have setlogmask() -#define ACE_LACKS_SETLOGMASK - -// Yes, we do have threads. -#define ACE_HAS_THREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif -// And they're even POSIX pthreads -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_STD -#define ACE_LACKS_PTHREAD_CANCEL -#define ACE_LACKS_PTHREAD_CLEANUP -#define ACE_LACKS_PTHREAD_SIGMASK -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -// Chorus 4.0 supports POSIX Threads 1003.1b/1003.1c -#if !defined(CHORUS_4) -# define ACE_HAS_PTHREAD_PROCESS_ENUM -#endif - - -#if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// By default, don't include RCS Id strings in object code. -#if !defined (ACE_USE_RCSID) -# define ACE_USE_RCSID 0 -#endif /* #if !defined (ACE_USE_RCSID) */ - -// Needed to wait for "processes" to exit. -#include - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-cray.h b/ace/config-cray.h deleted file mode 100644 index 20d66fa333b..00000000000 --- a/ace/config-cray.h +++ /dev/null @@ -1,242 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_CONFIG_CRAY_H -#define ACE_CONFIG_CRAY_H -#include "ace/pre.h" - -/* - The following predefined macros are used within ACE ifdefs. - These are defined when using the Cray compilers. _CRAYMPP - is defined, for example, if you are running on a Cray T3E - massively parallel machine. Moreover, in the case of the T3E, - _CRAYT3E will be defined. This is used to determine the - ACE_SIZEOF defines for primitive types. - - _UNICOS is defined as either the major version of UNICOS being run, - e.g. 9 or 10 on the vector machines (e.g. C90, T90, J90, YMP, ...) - or the major+minor+level UNICOS/mk version, e.g. 2.0.3 => 203, - being run on an MPP machine. - - Summary: - - _CRAYMPP (defined only if running on MPP machine, e.g. T3E, UNICOS/mk) - _CRAYT3E (defined specifically if compiling on a Cray T3E) - _UNICOS (defined if running UNICOS or UNICOS/mk) - - Tested on UNICOS 10.0.0.5, UNICOS/mk 2.0.4.57 - Compiles on UNICOS 9.0.2.8, but some tests deadlock - - Contributed by Doug Anderson -*/ - -#if defined (_UNICOS) && !defined (MAXPATHLEN) -#define MAXPATHLEN 1023 -#endif /* _UNICOS */ - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0 - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -#define ACE_HAS_CPLUSPLUS_HEADERS - -// using cray's autoinstantiation gives C++ prelinker: error: instantiation loop -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - -#define ACE_HAS_TEMPLATE_SPECIALIZATION - -#define ACE_HAS_ANSI_CASTS - -#define ACE_HAS_USING_KEYWORD - -#define ACE_HAS_SSIZE_T - -#define ACE_HAS_SYSV_IPC - -#define ACE_MT_SAFE 1 - -#define ACE_HAS_THREADS - -#define ACE_HAS_PTHREADS - -// UNICOS 10 and UNICOS/mk implement a small subset of POSIX Threads, -// but the prototypes follow the POSIX.1c-1995 definitions. Earlier -// UNICOS versions sport Draft 7 threads. - -#if _UNICOS > 9 -# define ACE_HAS_PTHREADS_STD -#else -# define ACE_HAS_PTHREADS_DRAFT7 -# define ACE_LACKS_THREAD_STACK_SIZE -# define ACE_LACKS_THREAD_STACK_ADDR - // UNICOS 9 doesn't have this, nor sched.h -# define SCHED_OTHER 0 -# define SCHED_FIFO 1 -# define SCHED_RR 2 -#endif - -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -#define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP - -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -#define ACE_HAS_POSIX_TIME - -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_HAS_TERM_IOCTLS - -#define ACE_HAS_DIRENT - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_IP_MULTICAST - -#define ACE_HAS_SIN_LEN - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -#define ACE_HAS_NONCONST_READLINK - -#define ACE_HAS_CHARPTR_SOCKOPT - -#define ACE_HAS_NONCONST_GETBY - -// has man pages, but links with missing symbols and I can't find lib yet -/* #define ACE_HAS_REGEX */ - -#define ACE_HAS_SIG_MACROS - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#if _UNICOS > 9 -# define ACE_HAS_SIGWAIT -#endif - -#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_HAS_SIGISMEMBER_BUG - -#define ACE_HAS_MSG - -#define ACE_HAS_STRERROR - -#define ACE_HAS_GPERF - -// Special modifications that apply to UNICOS/mk -#if defined(_CRAYMPP) - -# define ACE_HAS_SIGINFO_T -# define ACE_HAS_UCONTEXT_T - -#endif - -// The Cray T90 supposedly supports SYSV SHMEM, but I was unable to get it -// working. Of course, all other Cray PVP and MPP systems do NOT support it, -// so it's probably good to just define like this for consistency -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_MMAP -#define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_MADVISE -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_PTHREAD_CLEANUP -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_THREAD_PROCESS_SCOPING - -#if !defined(_CRAYMPP) - -#define ACE_LACKS_PTHREAD_CANCEL -#define ACE_LACKS_PTHREAD_KILL - -#endif - -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_PRI_T -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_READV -#define ACE_LACKS_RLIMIT - -// we probably want to fake not having this, since Cray memory mgmt is different -#define ACE_LACKS_SBRK - -#define ACE_LACKS_SETSCHED - -#define ACE_LACKS_SIGINFO_H - -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_WRITEV - -// Cray vector machines are "word" oriented, and modern ones are hard 64-bit. -// "char" is somewhat of a special case. Most problems arise when code thinks -// it can address 32-bit quantities and the like. MPP crays are typically -// byte oriented, e.g. T3E uses Alpha processors, so we don't need as much -// special treatment. - -#ifndef _CRAYMPP - -# define ACE_SIZEOF_CHAR 1 -# define ACE_SIZEOF_SHORT 8 -# define ACE_SIZEOF_INT 8 -# define ACE_SIZEOF_LONG 8 -# define ACE_SIZEOF_LONG_LONG 8 -# define ACE_SIZEOF_FLOAT 8 -# define ACE_SIZEOF_DOUBLE 8 -# define ACE_SIZEOF_LONG_DOUBLE 16 -# define ACE_SIZEOF_VOID_P 8 - -#elif defined(_CRAYT3E) - -# define ACE_SIZEOF_CHAR 1 -# define ACE_SIZEOF_SHORT 4 -# define ACE_SIZEOF_INT 8 -# define ACE_SIZEOF_LONG 8 -# define ACE_SIZEOF_LONG_LONG 8 -# define ACE_SIZEOF_FLOAT 4 -# define ACE_SIZEOF_DOUBLE 8 -# define ACE_SIZEOF_LONG_DOUBLE 8 -# define ACE_SIZEOF_VOID_P 8 - -#endif - -// Ones to check out at some point - -/* #define ACE_HAS_SYS_SIGLIST */ - -// C++ Compiler stuff to verify -/* #define ACE_NEW_THROWS_EXCEPTIONS */ -/* #define ACE_HAS_TEMPLATE_TYPEDEFS */ - -// thread issues to check out -/* #define ACE_LACKS_TIMEDWAIT_PROTOTYPES */ - -// Cray does seem to support it, in -lnsl and has tiuser.h header -/* #define ACE_HAS_TLI */ -/* #define ACE_HAS_TIUSER_H */ -/* #define ACE_HAS_TLI_PROTOTYPES */ -/* #define ACE_LACKS_T_ERRNO */ - -/* #define ACE_LACKS_NAMED_POSIX_SEM */ - -/* #define ACE_HAS_SYS_ERRLIST */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_CRAY_H */ diff --git a/ace/config-cxx-common.h b/ace/config-cxx-common.h deleted file mode 100644 index 4ffee9f4b7d..00000000000 --- a/ace/config-cxx-common.h +++ /dev/null @@ -1,89 +0,0 @@ -// $Id$ - -#ifndef ACE_CXX_COMMON_H -#define ACE_CXX_COMMON_H -#include "ace/pre.h" - -#if !defined (ACE_CONFIG_INCLUDE_CXX_COMMON) -# error ace/config-cxx-common.h: ACE configuration error! Do not #include this file directly! -#endif - -#if defined (__DECCXX) -# if !defined (linux) -# define ACE_HAS_STRING_CLASS -# if (__DECCXX_VER >= 60090010) -# define ACE_HAS_STDCPP_STL_INCLUDES -# endif /* __DECCXX_VER < 60090010 */ -# endif /* ! linux */ - -# define DEC_CXX -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_SIGNED_CHAR -# define ACE_HAS_CPLUSPLUS_HEADERS -# define ACE_TEMPLATES_REQUIRE_SOURCE -# if (__DECCXX_VER >= 60090010) - // DEC CXX 6.0 supports exceptions, etc., by default. Exceptions - // are enabled by platform_osf1_4.x.GNU/wrapper_macros.GNU. -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ -# define ACE_HAS_ANSI_CASTS -# if !defined (__RTTI) -# define ACE_LACKS_RTTI -# endif -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_HAS_TEMPLATE_SPECIALIZATION -# define ACE_HAS_TEMPLATE_TYPEDEFS -# define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_USING_KEYWORD - -# define ACE_ENDLESS_LOOP \ - unsigned int ace_endless_loop____ = 0; if (ace_endless_loop____) break; - -# if defined (__USE_STD_IOSTREAM) -# define ACE_LACKS_CHAR_RIGHT_SHIFTS -# define ACE_LACKS_IOSTREAM_FX -# define ACE_LACKS_UNBUFFERED_STREAMBUF -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# else /* ! __USE_STD_IOSTREAM */ -# define ACE_USES_OLD_IOSTREAMS -# endif /* ! __USE_STD_IOSTREAM */ - -// 9: nested comment not allowed. (/usr/include/pdsc.h!) (nestcomment) -// 177: variable was declared but never referenced (declbutnotref) -// 193: zero used for undefined preprocessing identifier (undpreid) -// 236: controlling expression is constant (boolexprconst) -// 401: base_class_with_nonvirtual_dtor (basclsnondto) -// 1016: expected type is incompatible with declared type of int (incint) -// 1136: conversion to smaller size integer could lose data (intconlosbit) - -# pragma message disable basclsnondto -# pragma message disable boolexprconst -# pragma message disable undpreid - -# if (__DECCXX_VER >= 60190029) - // 6.1-029 and later support msg 1136. Disable it because it - // causes warnings from ACE and/or TAO. -# pragma message disable intconlosbit -# endif /* __DECCXX_VER >= 60190029 */ - -# if (__DECCXX_VER == 60190027) - // Seems that this version of cxx doesn't have reset -# define ACE_AUTO_PTR_LACKS_RESET -# endif /* __DECCXX_VER == 60190027 */ - -# if defined (DIGITAL_UNIX) && DIGITAL_UNIX >= 0x40D - // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced -# pragma message disable declbutnotref -# endif /* DIGITAL_UNIX >= 4.0f */ - -# else /* __DECCXX_VER < 60090010 */ -# define ACE_LACKS_PRAGMA_ONCE -# endif /* __DECCXX_VER < 60090010 */ -#else /* ! __DECCXX */ -# error ace/config-cxx-common.h can only be used with Compaq CXX! -#endif /* ! __DECCXX */ - -#include "ace/post.h" -#endif /* ACE_CXX_COMMON_H */ diff --git a/ace/config-cygwin32-common.h b/ace/config-cygwin32-common.h deleted file mode 100644 index d308d27e32c..00000000000 --- a/ace/config-cygwin32-common.h +++ /dev/null @@ -1,154 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file is designed to be included by another, -// specific configuration file. It provides config information common -// to all CygWin platforms. It automatically determines the CPU -// architecture, compiler (g++ or egcs), and libc (libc5/glibc/newlib), -// and configures based on those. - -#ifndef ACE_CYGWIN32_COMMON_H -#define ACE_CYGWIN32_COMMON_H -#include "ace/pre.h" - -#define CYGWIN32 - -// We trust this file will get included before -#if !defined(FD_SETSIZE) -# define FD_SETSIZE 1024 -#endif - -#if !defined (ACE_IOV_MAX) -# define ACE_IOV_MAX 64 -#endif /* ACE_IOV_MAX */ - -// Define custom export macros for export/import of symbols from/of dll's -#define ACE_HAS_CUSTOM_EXPORT_MACROS -#define ACE_Proper_Export_Flag __declspec (dllexport) -#define ACE_Proper_Import_Flag __declspec (dllimport) -#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T -#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE; -#define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T -#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE ; - -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS -#define ACE_LACKS_SYSV_MSG_H -#define ACE_HAS_SIG_MACROS -#define ACE_LACKS_SYSTIME_H -#define ACE_LACKS_TELLDIR -#define ACE_LACKS_SYSV_SHMEM - -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT - -#define ACE_LACKS_SEMBUF_T -#define ACE_LACKS_NAMED_POSIX_SEM -#define ACE_LACKS_SENDMSG -#define ACE_LACKS_RECVMSG -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_SEEKDIR -#define ACE_LACKS_TEMPNAM -#define ACE_LACKS_MKTEMP -// #define ACE_HAS_BROKEN_SAP_ANY - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Needed to differentiate between libc 5 and libc 6 (aka glibc). -// It's there on all libc 5 systems I checked. -#include /**/ - - -// First the machine specific part -// #define ACE_HAS_CYGWIN32_SOCKET_H - -// Then the compiler specific parts - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#else -# error unsupported compiler in ace/config-cygwin32-common.h -#endif /* __GNUG__ */ - - -// Completely common part :-) - -// Platform/compiler has the sigwait(2) prototype -#define ACE_HAS_SIGWAIT -#define ACE_HAS_POSIX_TIME -#define ACE_LACKS_TIMESPEC_T -#define ACE_HAS_MSG -#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#define ACE_LACKS_SETREUID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_GETHOSTENT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_LACKS_GETPGID_PROTOTYPE - -// Compiler/platform supports alloca(). -#define ACE_HAS_ALLOCA - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_GETRUSAGE_PROTO - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#if !defined(ACE_HAS_IP_MULTICAST) -# define ACE_HAS_IP_MULTICAST -#endif /* #if ! defined(ACE_HAS_IP_MULTICAST) */ - -#define ACE_HAS_BIG_FD_SET - -#define ACE_HAS_TERM_IOCTLS - -#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65535 - -#define ACE_DEFAULT_SELECT_REACTOR_SIZE 256 - -#define ACE_HAS_GETPAGESIZE 1 - -// Platform lacks POSIX prototypes for certain System V functions -// like shared memory and message queues. -#define ACE_LACKS_SOME_POSIX_PROTOTYPES - - -#define ACE_LACKS_STRRECVFD - -#define ACE_LACKS_MSYNC -#define ACE_LACKS_MADVISE - -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_HAS_GPERF - -#define ACE_HAS_DIRENT - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_LACKS_MKFIFO - -#include "ace/post.h" -#endif /* ACE_CYGWIN32_COMMON_H */ diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h deleted file mode 100644 index 91eefab4a53..00000000000 --- a/ace/config-cygwin32.h +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for CygWin -// platforms using GNU C++. - -#ifndef ACE_CONFIG_CYGWIN32_H -#define ACE_CONFIG_CYGWIN32_H -#include "ace/pre.h" - -#include "ace/config-cygwin32-common.h" - -#define ACE_HAS_AUTOMATIC_INIT_FINI - -#include "ace/post.h" -#endif /* ACE_CONFIG_CYGWIN32_H */ diff --git a/ace/config-dgux-4.11-epc.h b/ace/config-dgux-4.11-epc.h deleted file mode 100644 index b19d56cf7f1..00000000000 --- a/ace/config-dgux-4.11-epc.h +++ /dev/null @@ -1,195 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for DG/UX -// 4.11 platforms using the EPC compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define ACE_DGUX - -// Platform requires (struct sockaddr *) for msg_name field of struct -// msghdr. -#define ACE_HAS_SOCKADDR_MSG_NAME - -// Platform lacks strcasecmp(). -#define ACE_LACKS_STRCASECMP - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Platform supports system configuration information. -#define ACE_HAS_SYSINFO - -// Platform supports the POSIX regular expression library. -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -// #define ACE_HAS_SYSCALL_H - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -// Platform has terminal ioctl flags like TCGETS and TCSETS. -#define ACE_HAS_TERM_IOCTLS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform supports SunOS high resolution timers. -// #define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -// #define ACE_HAS_ALLOCA - -// Compiler/platform has -// #define ACE_HAS_ALLOCA_H - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -// #define ACE_HAS_PRUSAGE_T -#define ACE_HAS_GETRUSAGE - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -// #define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -// #define ACE_HAS_SVR4_GETTIMEOFDAY - -// DG/UX uses the same gettimeofday() prototype as OSF/1. -#define ACE_HAS_OSF1_GETTIMEOFDAY - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_SVR4_SIGNAL_T - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides header. -// #define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports sys_siglist array. -#define ACE_HAS_SYS_SIGLIST - -/* Turn off the following four defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 0 -#endif - -// Platform supports threads. -// #define ACE_HAS_THREADS - -// Platform supports POSIX pthreads *and* Solaris threads! -// #define ACE_HAS_STHREADS -// #define ACE_HAS_PTHREADS -#define ACE_HAS_SIGWAIT -// If ACE doesn't compile due to the lack of these methods, please -// send email to schmidt@cs.wustl.edu reporting this. -// #define ACE_LACKS_CONDATTR_PSHARED -// #define ACE_LACKS_MUTEXATTR_PSHARED - -// Compiler/platform has thread-specific storage -// -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Reactor detects deadlock -// #define ACE_REACTOR_HAS_DEADLOCK_DETECTION - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// #define _USING_POSIX4A_DRAFT6 -#define _POSIX_SOURCE -#define _DGUX_SOURCE -// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_HAS_UCONTEXT_T -#define ACE_LACKS_SYSTIME_H -#define ACE_HAS_NONCONST_GETBY -#define ACE_LACKS_MADVISE - -#if !defined (IP_ADD_MEMBERSHIP) -# define IP_ADD_MEMBERSHIP 0x13 -#endif - -#if !defined (IP_DROP_MEMBERSHIP) -# define IP_DROP_MEMBERSHIP 0x14 -#endif - -// Header files lack t_errno for ACE_TLI. -#define ACE_LACKS_T_ERRNO - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_IDTYPE_T - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h deleted file mode 100644 index b53126b59ed..00000000000 --- a/ace/config-dgux-4.x-ghs.h +++ /dev/null @@ -1,214 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for DG/UX -// 4.x platforms using the Green Hills Multi C++ compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define ACE_DGUX - -# define ACE_CONFIG_INCLUDE_GHS_COMMON -# include "ace/config-ghs-common.h" - -// Static objects do not get initialized correctly, so this is needed. -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -// Platform requires (struct sockaddr *) for msg_name field of struct -// msghdr. -#define ACE_HAS_SOCKADDR_MSG_NAME - -// Platform lacks strcasecmp(). -#define ACE_LACKS_STRCASECMP - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Platform supports system configuration information. -#define ACE_HAS_SYSINFO - -// Platform supports the POSIX regular expression library. -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -//#define ACE_HAS_REENTRANT_FUNCTIONS - -// Platform has terminal ioctl flags like TCGETS and TCSETS. -#define ACE_HAS_TERM_IOCTLS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform supports SunOS high resolution timers. -// #define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Green Hills doesn't give a preprocessor symbol for long double -#define ACE_SIZEOF_LONG_DOUBLE 8 - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -// #define ACE_HAS_PRUSAGE_T -#define ACE_HAS_GETRUSAGE - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING -// ... but redefines the entrypoint names with a leading underscore -#define dlopen _dlopen -#define dlclose _dlclose -#define dlerror _dlerror -#define dlsym _dlsym -// ... and uses 'char *' rather than 'const char *' -#define ACE_HAS_CHARPTR_DL - -// DG/UX uses the same gettimeofday() prototype as OSF/1. -#define ACE_HAS_OSF1_GETTIMEOFDAY - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_SVR4_SIGNAL_T - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Compiler/platform supports sys_siglist array. -// On DG/UX this is only done if the /usr/include/sys/_int_dg_features.h -// file determines it should be turned on. It will take some work to -// figure out the magic options to turn it on reliably, so it'll have to -// be delayed for now. -//#define _TARGETTING_DGUXELF 1 -//#define _IX86_DG 1 -//#define _DGUX_TARGET 1 -//#define ACE_HAS_SYS_SIGLIST - -/* Turn off the following four defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -// Platform supports threads. -#define ACE_HAS_THREADS -#define ACE_HAS_PTHREADS -// DG/UX claims to implement draft 10 of the pthreads standard (which became -// (with editorial change only) the final standard. To get the behavior, some -// further macros need to be defined which are specific to DG/UX. -// _POSIX4A_DRAFT10_SOURCE turns on the draft 10 variant of threads. -// _POSIX4A_DRAFT_SOURCE turns on sched_yield(). -#define _POSIX4A_DRAFT10_SOURCE -#define ACE_HAS_PTHREADS_STD -#define _POSIX4_DRAFT_SOURCE -// Well, here are some from the standard they don't have... -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_HAS_SIGWAIT -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_THREAD_PROCESS_SCOPING -// The default thread stacksize on DG/UX 4.x is 4096. This needs to be bumped -// up to do anything real in ACE. -#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 - -// Need to #include -#define ACE_NEEDS_SCHED_H - -// Compiler/platform has thread-specific storage -// -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -// Platform doesn't have read-write locks natively. -#define ACE_LACKS_RWLOCK_T - -// Platform doesn't have timespec_t data type. -#define ACE_LACKS_TIMESPEC_T - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -#define ACE_HAS_UCONTEXT_T -#define ACE_LACKS_SYSTIME_H -#define ACE_HAS_NONCONST_GETBY -#define ACE_LACKS_MADVISE - -#if !defined (IP_ADD_MEMBERSHIP) -#define IP_ADD_MEMBERSHIP 0x13 -#endif - -#if !defined (IP_DROP_MEMBERSHIP) -# define IP_DROP_MEMBERSHIP 0x14 -#endif - -// Header files lack t_errno for ACE_TLI. -#define ACE_LACKS_T_ERRNO - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h deleted file mode 100644 index 85b492322c6..00000000000 --- a/ace/config-doxygen.h +++ /dev/null @@ -1,103 +0,0 @@ -/** - * This is a configuration file to define all the macros that Doxygen - * needs - * - * @file config-doxygen.h - * - * $Id$ - * - * @author Carlos O'Ryan - * @author Darrell Brunsch - * - */ -#ifndef ACE_CONFIG_DOXYGEN_H -#define ACE_CONFIG_DOXYGEN_H - -/// Make the wchar_t interfaces available. -#define ACE_HAS_WCHAR - -/// Make all the emulation versions of string operations visible -// #define ACE_LACKS_WCSTOK -#define ACE_LACKS_ITOW -#define ACE_LACKS_STRCASECMP -#define ACE_LACKS_STRCSPN -#define ACE_LACKS_STRCHR -#define ACE_LACKS_STRRCHR -#define ACE_LACKS_WCSCAT -#define ACE_LACKS_WCSCHR -#define ACE_LACKS_WCSCMP -#define ACE_LACKS_WCSCPY -#define ACE_LACKS_WCSICMP -#define ACE_LACKS_WCSLEN -#define ACE_LACKS_WCSNCAT -#define ACE_LACKS_WCSNCMP -#define ACE_LACKS_WCSNCPY -#define ACE_LACKS_WCSNICMP -#define ACE_LACKS_WCSPBRK -#define ACE_LACKS_WCSRCHR -#define ACE_LACKS_WCSCSPN -#define ACE_LACKS_WCSSPN -#define ACE_LACKS_WCSSTR - -/// Support for threads enables several important classes -#define ACE_HAS_THREADS - -/// Support for Win32 enables the WFMO_Reactor and several Async I/O -/// classes -#define ACE_WIN32 - -/// Enable support for POSIX Asynchronous I/O calls -#define ACE_HAS_AIO_CALLS - -/// Enable support for TLI interfaces -#define ACE_HAS_TLI - -/// Enable support for the SSL wrappers -#define ACE_HAS_SSL 1 - -/// Several GUI Reactors that are only enabled in some platforms. -#define ACE_HAS_XT -#define ACE_HAS_FL -#define ACE_HAS_QT -#define ACE_HAS_TK -#define ACE_HAS_GTK - -/// Enable exceptions -#define ACE_HAS_EXCEPTIONS - -/// Enable timeprobes -#define ACE_COMPILE_TIMEPROBES - -/// Enable unicode to generate ACE_Registry_Name_Space -#define UNICODE - -/// These defines make sure that Svc_Conf_y.cpp and Svc_Conf_l.cpp are correctly -/// parsed -#define __cplusplus -#define ACE_YY_USE_PROTOS - -/// TAO features that should be documented too -#define TAO_HAS_RT_CORBA 1 -#define TAO_HAS_MINIMUM_CORBA 0 -#define TAO_HAS_AMI 1 -#define TAO_HAS_INTERCEPTORS 1 - -/// Generate token library documentation -#define ACE_HAS_TOKENS_LIBRARY - -/// Generate ACE ATM classes documentation -#define ACE_HAS_ATM - -/// Generate ACE XTI ATM class documentation -#define ACE_HAS_XTI_ATM - -/// Generate ACE_Dev_Poll_Reactor documentation -#define ACE_HAS_EVENT_POLL - -/// Generate ACE_Event_Handler_T documentation -#define ACE_HAS_TEMPLATE_TYPEDEFS - -/// Generate ACE_Log_Msg_NT_Event_Log documentation -#define ACE_HAS_LOG_MSG_NT_EVENT_LOG - -#endif /* ACE_CONFIG_DOXYGEN_H */ diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h deleted file mode 100644 index e8c2fec976f..00000000000 --- a/ace/config-freebsd.h +++ /dev/null @@ -1,247 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for FreeBSD - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#include "ace/config-posix.h" - -#include -// Make sure we source in the OS version. - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#if (__FreeBSD_version < 220000) -#if defined (ACE_HAS_THREADS) -#error Threads are not supported. -#endif /* ACE_HAS_THREADS */ -#endif /* __FreeBSD_version < 220000 */ - -#define ACE_SIZEOF_LONG_DOUBLE 12 - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - -#if defined (ACE_HAS_PENTIUM) -# undef ACE_HAS_PENTIUM -#endif /* ACE_HAS_PENTIUM */ - -// Platform specific directives -// gcc defines __FreeBSD__ automatically for us. -#ifdef ACE_HAS_THREADS -#if !defined (_THREAD_SAFE) -#define _THREAD_SAFE -#endif /* _THREAD_SAFE */ -#endif - -#define ACE_HAS_GPERF - -#if (__FreeBSD_version < 420000) -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_LACKS_PTHREAD_CANCEL -#endif /* __FreeBSD_version < 420000 */ - -#define ACE_HAS_ALT_CUSERID -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_HAS_SIG_MACROS -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_CHARPTR_DL - -#if (__FreeBSD_version < 400000) -#define ACE_LACKS_SIGSET -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_SETSCHED -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_UCONTEXT_H -#endif - -#define ACE_NEEDS_SCHED_H - -#if (__FreeBSD_version < 400000) -enum schedparam_policy { - SCHED_RR, - SCHED_IO, - SCHED_FIFO, - SCHED_OTHER -}; -#endif - -// Use of is deprecated. -#define ACE_LACKS_MALLOC_H - - -// This won't be necessary after it is fixed in the system include headers. -extern "C" { char * cuserid (char *s); } - -// Platform supports POSIX timers via struct timespec. -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_UALARM - -// Platform defines struct timespec but not timespec_t -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_SYSTIME_H - -#define ACE_LACKS_STRRECVFD - -#define ACE_HAS_SIN_LEN - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -#if (__FreeBSD_version >= 300000) -#define ACE_HAS_SIGINFO_T -#endif /* __FreeBSD_version >= 300000 */ - -#if (__FreeBSD_version >= 320000) -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS -#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#endif /* __FreeBSD_version >= 320000 */ - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_LACKS_SIGINFO_H - -#define ACE_LACKS_SI_ADDR - -// Compiler/platform supports SVR4 signal typedef -#define ACE_HAS_SVR4_SIGNAL_T - -// Compiler/platform supports alloca(). -#define ACE_HAS_ALLOCA - -// Compiler/platform supports SVR4 dynamic linking semantics.. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Explicit dynamic linking permits "lazy" symbol resolution -#define ACE_HAS_RTLD_LAZY_V - -// platform supports POSIX O_NONBLOCK semantics -#define ACE_HAS_POSIX_NONBLOCK - -// platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - -// Compiler/platform has -//#define ACE_HAS_ALLOCA_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler/platform supports sys_siglist array. -// *** This refers to (_sys_siglist) instead of (sys_siglist) -// #define ACE_HAS_SYS_SIGLIST - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports SVR4 gettimeofday() prototype -#define ACE_HAS_SUNOS4_GETTIMEOFDAY -// #define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_HAS_MSG -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG - -#if (__FreeBSD_version < 500100) -# define ACE_HAS_NONCONST_MSGSND -#endif - -// Thread specific settings -// Yes, we do have threads. -#ifdef ACE_HAS_THREADS -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* ! ACE_MT_SAFE */ -#endif /* ACE_HAS_THREADS */ - -#define ACE_LACKS_THREAD_PROCESS_SCOPING -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_DIRENT - -#define ACE_HAS_SIGWAIT - -#define ACE_HAS_TERM_IOCTLS -#define ACE_USES_NEW_TERMIOS_STRUCT -#define TCGETS TIOCGETA -#define TCSETS TIOCSETA - -#if (__FreeBSD_version > 400000) -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_SOCKLEN_T -#define ACE_HAS_GETIFADDRS -#define ACE_HAS_PTHREADS_UNIX98_EXT -#endif - -#ifndef ACE_HAS_SNPRINTF -#define ACE_HAS_SNPRINTF -#endif - -// Note, on FreeBSD 5, POSIX aio is now an optional kernel module which -// must be loaded. -// Read the aio(4) man page for what to do, otherwise any aio_* call -// will coredump. - -// By default use Proactor which does not use POSIX Real-time Signals -#ifdef ACE_HAS_AIO_CALLS -#ifndef ACE_POSIX_AIOCB_PROACTOR -#define ACE_POSIX_AIOCB_PROACTOR -#endif /* ACE_POSIX_AIOCB_PROACTOR */ -#endif /* ACE_HAS_AIO_CALLS */ - -/* FreeBSD does not define sigval_t */ -#include -typedef union sigval sigval_t; - -#include "ace/post.h" - -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-fsu-pthread.h b/ace/config-fsu-pthread.h deleted file mode 100644 index 4ce0c5fa4e3..00000000000 --- a/ace/config-fsu-pthread.h +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -#ifndef ACE_CONFIG_FSU_PTHREAD_H -#define ACE_CONFIG_FSU_PTHREAD_H -#include "ace/pre.h" - -#define ACE_LACKS_CONST_TIMESPEC_PTR - -// Threads -#define ACE_HAS_THREADS -#if !defined(ACE_MT_SAFE) -#define ACE_MT_SAFE 1 -#endif - -/* -** FSU implements 1003.4a draft 6 threads - the ACE_HAS_FSU_PTHREADS def -** is needed for some peculiarities with this particular implementation. -*/ -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_DRAFT6 -#define ACE_HAS_FSU_PTHREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_SIGWAIT -#define ACE_HAS_PTHREAD_YIELD_VOID_PTR -#define ACE_HAS_PTHREAD_ATTR_INIT -#define ACE_HAS_PTHREAD_ATTR_DESTROY -#define ACE_LACKS_THREAD_STACK_ADDR -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SETSCHED -#if defined(M_UNIX) -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#endif - -#if !defined(ACE_HAS_POSIX_TIME) -#define ACE_HAS_POSIX_TIME -#define ACE_LACKS_TIMESPEC_T -#endif - -#include - -#if !defined(PTHREAD_STACK_MIN) -#define PTHREAD_STACK_MIN (1024*10) -#endif - -#define ACE_LACKS_THREAD_PROCESS_SCOPING - -#undef PTHREAD_INHERIT_SCHED - -struct sched_param -{ - int sched_priority; - int prio; -}; - -#include "ace/post.h" -#endif /* ACE_CONFIG_FSU_PTHREAD_H */ diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h deleted file mode 100644 index b1a063235bc..00000000000 --- a/ace/config-g++-common.h +++ /dev/null @@ -1,115 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// This configuration file is designed to be included by another, -// specific configuration file. It provides config information common -// to all g++ platforms, including egcs. - -#ifndef ACE_GNUG_COMMON_H -#define ACE_GNUG_COMMON_H -#include "ace/pre.h" - -#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8) || \ - (defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x540) - // egcs or g++ >= 2.8.0 - -# define ACE_HAS_ANSI_CASTS -# define ACE_HAS_CPLUSPLUS_HEADERS -# define ACE_HAS_EXPLICIT_KEYWORD -# define ACE_HAS_MUTABLE_KEYWORD -# define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS -# define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION - -#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95) -# define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION -#endif - -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_OLD_IOSTREAMS - -#if (__GNUC__ == 2 && __GNUC_MINOR__ <= 91) -// EGCS (gcc 2.91) doesn't define this in its C++ standard library. -# define ACE_LACKS_AUTO_PTR -# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -#endif - -# if __GNUC__ == 2 && __GNUC_MINOR__ != 9 && __GNUC_MINOR__ != 91 -# // g++ 2.9 and egcs 2.91 apparently have a bug with this . . . -# define ACE_HAS_TEMPLATE_SPECIALIZATION -# endif /* __GNUC__ != 2.9 && __GNUC__ != 2.91*/ - -# if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 91 ) -# define ACE_HAS_USING_KEYWORD - // This is only needed with egcs 1.1 (egcs-2.91.57). It can't be - // used with older versions. -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -# endif /* __GNUC__ >= 2.91 */ - -# if (defined (VXWORKS) && __GNUC__ == 2 && __GNUC_MINOR__ == 96) -// This is for inofficial(!) gcc2.96 shipped with Tornado2.1.0 for -// Hitachi SuperH platform. -# define ACE_LACKS_AUTO_PTR -# endif /* (defined (VXWORKS) && __GNUC__ == 2 && __GNUC_MINOR__ == 96) */ - -#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 97 ) - // gcc 2.97 and higher use libstdc++-v3 and require - // the use of the std namespace for using iostreams -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# undef ACE_USES_OLD_IOSTREAMS -#endif /* __GNUC__ >= 2.97 */ - - // __EXCEPTIONS is defined with -fexceptions, the egcs default. It - // is not defined with -fno-exceptions, the ACE default for g++. - // ACE_HAS_EXCEPTIONS is defined in - // include/makeinclude/wrapper_macros.GNU, so this really isn't - // necessary. Just in case . . . -# if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS) -# define ACE_HAS_EXCEPTIONS -# endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */ - -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ - -#else /* ! egcs */ - // Plain old g++. -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -# define ACE_HAS_GNUG_PRE_2_8 -# define ACE_HAS_TEMPLATE_SPECIALIZATION -# define ACE_LACKS_MIN_MAX_TEMPLATES -#endif /* ! egcs */ - -#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 12 -#endif /* i386 */ - -#if !defined (__MINGW32__) && (defined (i386) || defined (__i386__)) - // If running an Intel, assume that it's a Pentium so that - // ACE_OS::gethrtime () can use the RDTSC instruction. If running a - // 486 or lower, be sure to comment this out. (If not running an - // Intel CPU, this #define will not be seen because of the i386 - // protection, so it can be ignored.) -# define ACE_HAS_PENTIUM -#endif /* i386 */ - -#if !defined (ACE_LACKS_PRAGMA_ONCE) - // We define it with a -D with make depend. -# define ACE_LACKS_PRAGMA_ONCE -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_GNU_REPO) - // -frepo causes unresolved symbols of basic_string left- and - // right-shift operators with ACE_HAS_STRING_CLASS. -# if defined (ACE_HAS_STRING_CLASS) -# undef ACE_HAS_STRING_CLASS -# endif /* ACE_HAS_STRING_CLASS */ -#endif /* ! ACE_HAS_GNU_REPO */ - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -#include "ace/post.h" -#endif /* ACE_GNUG_COMMON_H */ diff --git a/ace/config-ghs-common.h b/ace/config-ghs-common.h deleted file mode 100644 index 673a7c5ec15..00000000000 --- a/ace/config-ghs-common.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file is designed to be included by another, -// specific configuration file. It provides config information common -// to all Green Hills platforms. - -#ifndef ACE_GHS_COMMON_H -#define ACE_GHS_COMMON_H -#include "ace/pre.h" - -#if !defined (ACE_CONFIG_INCLUDE_GHS_COMMON) -# error ace/config-ghs-common.h: ACE configuration error! Do not #include this file directly! -#endif - -#if defined (ghs) - -# if defined (sun) - // Need nonstatic Object_Manager on Solaris to prevent seg fault - // on startup. -# define ACE_HAS_NONSTATIC_OBJECT_MANAGER -# endif /* sun */ - -# if defined (__STANDARD_CXX) - // Green Hills 1.8.9, but not 1.8.8. -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_LACKS_AUTO_PTR -# define ACE_LACKS_CHAR_RIGHT_SHIFTS -# define ACE_LACKS_UNBUFFERED_STREAMBUF -# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -# else -# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA -# endif /* __STANDARD_CXX */ - -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_LONGLONG_T -# define ACE_LACKS_SIGNED_CHAR - -#else /* ! ghs */ -# error ace/config-ghs-common.h can only be used with Green Hills compilers! -#endif /* ! ghs */ - -#include "ace/post.h" -#endif /* ACE_GHS_COMMON_H */ diff --git a/ace/config-hpux-10.x-g++.h b/ace/config-hpux-10.x-g++.h deleted file mode 100644 index 239e63e43a0..00000000000 --- a/ace/config-hpux-10.x-g++.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for HP -// platforms running HP/UX 10.x using G++. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - -#include "ace/config-g++-common.h" - -// These are apparantly some things which are special to g++ on HP? They are -// compiler-related settings, but not in config-g++-common.h - -#define ACE_HAS_BROKEN_CONVERSIONS -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T -#define _CLOCKID_T - -#include "ace/config-hpux-10.x.h" - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h deleted file mode 100644 index 380c54c0107..00000000000 --- a/ace/config-hpux-10.x-hpc++.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for HP -// platforms running HP/UX 10.x with either of the HP C++ compilers. -// This file contains compiler-specific settings, and uses the common -// HP-UX file (config-hpux-10.x.h) for the platform information. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// There are 2 compiler-specific sections, plus a 3rd for common to both. -// First is the HP C++ section... -#if __cplusplus < 199707L - -// To use HP/C++ you need some patches, the following set -// -// PHSS_9855 -// PHSS_9096 -// PHSS_10261 -// PHSS_9062 -// PHSS_7505 -// PHSS_8490 -// -// worked for me (Carlos O'Ryan), but you should check by yourself. -// The most important one is PHSS_9855, but in depends on some of the -// others. - -# define ACE_HAS_BROKEN_HPUX_TEMPLATES - -// Compiler can't handle calls like foo->operator T *() -# define ACE_HAS_BROKEN_CONVERSIONS - -// Necessary with some compilers to pass ACE_TTY_IO as parameter to -// DEV_Connector. -# define ACE_NEEDS_DEV_IO_CONVERSION - -// Compiler's template mechanism must see source code (i.e., .C files). -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Compiler's template mechanism requires the use of explicit C++ -// specializations for all used templates. -# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - -// The HP/UX compiler doesn't support volatile!!!! -# define volatile - -#else // aC++ definitions - -// Parts of TAO (at least) use __HP_aCC to detect this compiler, but the -// macro is not set until A.01.18. If it's not set, set it - it won't be an -// HP-advertised value, but we don't check the value/version - just whether -// it's set or not. -# if !defined (__HP_aCC) -# define __HP_aCC -# endif /* __HP_aCC */ - -// Compiler doesn't support the operator placement delete. -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE - -// Precompiler needs extra flags to ignore "invalid #pragma directive" -# define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" - -// Compiler supports to-be-ANSI casts -# define ACE_HAS_ANSI_CASTS - -// Compiler can't handle calls like foo->operator T *() -# define ACE_HAS_BROKEN_CONVERSIONS - -// Compiler supports C++ exception handling. It's on by default. If the -// +noeh compiler option is used to disable exceptions, the compiler defines -// __HPACC_NOEH. -# if !defined (__HPACC_NOEH) -# define ACE_HAS_EXCEPTIONS 1 -# endif - -// Compiler enforces need for 'template<>" when specializing template -// classes. -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION - -// If the -AA compile option is used, the compiler defines _HP_NAMESPACE_STD. -// The -AA option enables the 2.0 standard C++ library. If not used, then -// we have the old, 1.2.1 C++ library. -# if defined (_HP_NAMESPACE_STD) -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# undef ACE_HAS_STANDARD_CPP_LIBRARY -# endif -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB -# endif -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# else -# define ACE_USES_OLD_IOSTREAMS -# endif /* _HP_NAMESPACE_STD */ - -// Compiler enforces proper use of 'typename' -# define ACE_HAS_TYPENAME_KEYWORD - -// Compiler implements templates that support typedefs inside of classes -// used as formal arguments to a template class. -# define ACE_HAS_TEMPLATE_TYPEDEFS - -// Compiler supports the 'typename' qualifier. -# define ACE_HAS_TYPENAME_KEYWORD - -// This is legit for A.01.12 and probably at least as far back as A.01.07. -// Before that, not sure. But you shouldn't be there anyway ;-) -# define ACE_HAS_USING_KEYWORD - -// Platform lacks streambuf "linebuffered ()". -# define ACE_LACKS_LINEBUFFERED_STREAMBUF - -// Compiler's template mechanism must see source code (i.e., .C files). -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Compiler supports template specialization. -# define ACE_HAS_TEMPLATE_SPECIALIZATION - -// Compiler's runtime new throws bad_alloc on out-of-memory condition. -// If being compiled without exceptions though (+noeh), it doesn't. -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# define ACE_HAS_NEW_NOTHROW -# endif /* ACE_HAS_EXCEPTIONS */ - -#endif /* __cplusplus < 199707L */ - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T -#define ACE_HAS_UALARM - -#define ACE_HAS_GPERF - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Compiler doesn't handle 'signed char' correctly (used in ace/IOStream.h) -#define ACE_LACKS_SIGNED_CHAR - -#include "ace/config-hpux-10.x.h" /* OS information */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h deleted file mode 100644 index 43ef24aa6e7..00000000000 --- a/ace/config-hpux-10.x.h +++ /dev/null @@ -1,255 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for HP -// platforms running HP/UX 10.x. It includes all of the ACE information -// needed for HP-UX 10.x itself. The compiler-specific information is in -// config-hpux-10.x-.h - they include this file. - -#ifndef ACE_CONFIG_H -#error "You need to use a compiler-specific .h file - they include this file" -#endif - -// Compiling for HPUX. -#if !defined (HPUX) -#define HPUX -#endif /* HPUX */ -#define HPUX_10 - -#ifndef _HPUX_SOURCE -#define _HPUX_SOURCE -#include "ace/pre.h" -#endif - -// Some things are different for 10.10 vs. 10.20 vs. 10.30 -// If the version number wasn't set up by the compiler command line, -// set up as if it was 10.20. -#if !defined (HPUX_VERS) -#define HPUX_VERS 1020 -#endif - -#if (HPUX_VERS < 1020) // 10.10 -# define ACE_HAS_BROKEN_MMAP_H -# define ACE_LACKS_T_ERRNO -# define ACE_LACKS_TIMESPEC_T -#elif (HPUX_VERS < 1030) // 10.20 - - // Platform supports reentrant functions (all the POSIX *_r functions). -# define ACE_HAS_REENTRANT_FUNCTIONS - // But this one is not like other platforms -# define ACE_CTIME_R_RETURNS_INT - // And _REENTRANT must be set, even if not using threads. -# if !defined (_REENTRANT) -# define _REENTRANT -# endif /* _REENTRANT */ - -#else // 10.30 -// Don't know yet... probably will be 10.20 but with some different thread -// settings. -#endif /* HPUX_VERS tests */ - -#include /**/ -#include /**/ /* pthread.h doesn't include this */ - -extern int h_errno; /* This isn't declared in a header file on HP-UX */ - -// HP-UX is a POSIX-compliant system - see what's available. -#include "ace/config-posix.h" - - -//////////////////////////////////////////////////////////////////////////// -// -// General OS information - see README for more details on what they mean -// -/////////////////////////////////////////////////////////////////////////// - -// HP/UX needs to have these addresses in a special range. -#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H -// But doesn't have a prototype for syscall() -#define ACE_LACKS_SYSCALL - -// Platform supports POSIX 1.b clock_gettime () -#define ACE_HAS_CLOCK_GETTIME - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform has Dirent iterator functions. -#define ACE_HAS_DIRENT - -// Platform supports getpagesize() call -#define ACE_HAS_GETPAGESIZE -// But we define this just to be safe -#define ACE_PAGE_SIZE 4096 - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// select's timeval arg is non-const -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports the POSIX struct timespec type -#define ACE_HAS_POSIX_TIME - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals -#define ACE_HAS_SIGINFO_T - -// Platform doesn't detect a signal out of range unless it's way out of range. -#define ACE_HAS_SIGISMEMBER_BUG - -// Platform supports ucontext_t (which is used in the extended signal API). -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// SunOS 4 style prototype for gettimeofday -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// HP/UX has an undefined syscall for GETRUSAGE... -#define ACE_HAS_SYSCALL_GETRUSAGE -// Note, this only works if the flag is set above! -#define ACE_HAS_GETRUSAGE - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -#define ACE_HAS_UALARM - -// Platform has XPG4 wide character support -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform lacks readers/writer locks. -#define ACE_LACKS_RWLOCK_T - -// Shared library path/search components -#define ACE_DLL_SUFFIX ".sl" -#define ACE_LD_SEARCH_PATH "SHLIB_PATH" - -////////////////////////////////////////////////////////////////////////// -// -// STREAMS information -// -////////////////////////////////////////////////////////////////////////// - -// Platform supports STREAMS -#define ACE_HAS_STREAMS -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T -// But the putmsg signature doesn't have it as const... -#define ACE_LACKS_CONST_STRBUF_PTR - -// Platform supports STREAM pipes -// This is possible, but not by default - need to rebuild the kernel to -// get them enabled - see pipe(2) and "STREAMS/UX for the HP 9000" -// #define ACE_HAS_STREAM_PIPES - -///////////////////////////////////////////////////////////////////////// -// -// TLI information -// -//////////////////////////////////////////////////////////////////////// - -// Platform supports ACE_TLI, including SVR4 facilities. -#define ACE_HAS_TLI - -// t_error's arg is char *, not const char * -#define ACE_HAS_BROKEN_T_ERROR -// ACE_HAS_SVR4_TLI should work on HP-UX, but doesn't yet. Riverace -// problem ID P27. -//#define ACE_HAS_SVR4_TLI -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H -// But it has _terrno() outside the extern "C" stuff. -#define ACE_HAS_TIUSER_H_BROKEN_EXTERN_C -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES -// Platform uses a TCP TLI device other than /dev/tcp. Uses XTI only. -#define ACE_TLI_TCP_DEVICE "/dev/inet_cots" - -///////////////////////////////////////////////////////////////////////// -// -// Threads information. -// Threads definitions are controlled by the threads setting in the -// include/makeinclude/platform_hpux_aCC.GNU file - see that for details. -// If you build with threads support, the DCE Core subset must be installed -// from the core OS CD. -// -//////////////////////////////////////////////////////////////////////// - -#ifdef ACE_HAS_THREADS -# if !defined (ACE_MT_SAFE) - #define ACE_MT_SAFE 1 -# endif - -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_DRAFT4 -// POSIX real-time semaphore definitions are in the header files, and it -// will compile and link with this in place, but will not run. HP says -// the functions are not implemented. -//# define ACE_HAS_POSIX_SEM - -# define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// They forgot a const in the prototype of pthread_cond_timedwait -# define ACE_LACKS_CONST_TIMESPEC_PTR - -// Platform lacks pthread_thr_sigsetmask -# define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Platform has no implementation of pthread_condattr_setpshared() -# define ACE_LACKS_CONDATTR_PSHARED - -// Platform lacks pthread_attr_setdetachstate() -# define ACE_LACKS_SETDETACH - -// Platform lacks pthread_attr_setscope -# define ACE_LACKS_THREAD_PROCESS_SCOPING - -// Platform lacks pthread_attr_setstackaddr -# define ACE_LACKS_THREAD_STACK_ADDR - -// If this is not turned on, the CMA wrappers will redefine a bunch of -// system calls with wrappers - one being select() and it only defines -// select with int arguments (not fd_set). So, as long as _CMA_NOWRAPPERS_ -// is set, the regular fd_set arg types are used for select(). -// Without threads being compiled in, the fd_set/int thing is not an issue. -# define _CMA_NOWRAPPERS_ - -#else -// If threading is disabled, then timespec_t does not get defined. -# ifndef ACE_LACKS_TIMESPEC_T -# define ACE_LACKS_TIMESPEC_T -# endif -#endif /* ACE_HAS_THREADS */ - -// Manually tweaking malloc paddings. -#define ACE_MALLOC_PADDING 16 -#define ACE_MALLOC_ALIGN 8 -#define ACE_CONTROL_BLOCK_ALIGN_LONGS 0 -#define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 2 - -// Turns off the tracing feature. -// To build with tracing enabled, make sure ACE_NTRACE is not defined -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#include "ace/post.h" -#endif /* ACE_NTRACE */ diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h deleted file mode 100644 index 32468e816ae..00000000000 --- a/ace/config-hpux-11.00.h +++ /dev/null @@ -1,442 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for HP -// platforms running HP-UX 11.00 using aC++, CC, or gcc (2.95 and up). - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if defined (__GNUG__) - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -# define ACE_HAS_STRING_CLASS - -# include "ace/config-g++-common.h" - -// gcc 2.95.2 supplies the ssize_t typedef. -# define ACE_HAS_SSIZE_T - -// gcc 3.0 claims to have wide character stuff, but (at least the version -// built by HP) can't actually compile it. It refers to a wctype.h file -// that's only available with aC++. - -#else - -// The following configuration section is designed to work for HP -// platforms running HP/UX 11.x with either of the HP C++ compilers. -// There isn't a predefined macro for all cases of the compilers that -// can be used to tell them apart from other compilers (e.g. __KCC, etc.) -// only to tell C++ from aC++, using the value of __cplusplus. -// -// NOTE - HP advises people on 11.x to use aC++ since the older C++ doesn't -// support 64-bit or kernel threads. So, though this file has the C++ info -// in it, it's copied from the 10.x file and hasn't been verified. - -// There are 2 compiler-specific sections, plus a 3rd for common to both. -// First is the HP C++ section... -# if __cplusplus < 199707L - -# define ACE_HAS_BROKEN_HPUX_TEMPLATES - -// Compiler can't handle calls like foo->operator T *() -# define ACE_HAS_BROKEN_CONVERSIONS - -// Necessary with some compilers to pass ACE_TTY_IO as parameter to -// DEV_Connector. -# define ACE_NEEDS_DEV_IO_CONVERSION - -// Compiler's template mechanism must see source code (i.e., .C files). -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Compiler's template mechanism requires the use of explicit C++ -// specializations for all used templates. -# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - -// The HP/UX compiler doesn't support volatile!!!! -# define volatile - -# else // aC++ definitions - -// Parts of TAO (at least) use __HP_aCC to detect this compiler, but the -// macro is not set until A.03.13. If it's not set, set it - it won't be an -// HP-advertised value, but we don't check the value/version - just whether -// it's set or not. -# if !defined (__KCC) && !defined (__HP_aCC) -# define __HP_aCC -# endif /* __HP_aCC */ - -// Precompiler needs extra flags to ignore "invalid #pragma directive" -# define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" - -// Compiler supports ANSI casts -# define ACE_HAS_ANSI_CASTS - -// Compiler can't handle calls like foo->operator T *() -# define ACE_HAS_BROKEN_CONVERSIONS - -// Compiler supports C++ exception handling. It's on by default. If the -// +noeh compiler option is used to disable exceptions, the compiler defines -// __HPACC_NOEH. -# if !defined (__HPACC_NOEH) -# define ACE_HAS_EXCEPTIONS 1 -# endif - -// If the -AA compile option is used, the compiler defines _HP_NAMESPACE_STD. -// The -AA option enables the 2.0 standard C++ library. If not used, then -// we have the old, 1.2.1 C++ library. -# if defined (_HP_NAMESPACE_STD) -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# undef ACE_HAS_STANDARD_CPP_LIBRARY -# endif -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB -# endif -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# else -# define ACE_USES_OLD_IOSTREAMS -# endif /* _HP_NAMESPACE_STD */ - -# define ACE_HAS_TYPENAME_KEYWORD - -// Compiler implements templates that support typedefs inside of classes -// used as formal arguments to a template class. -# define ACE_HAS_TEMPLATE_TYPEDEFS - -// This is legit for A.03.05 - not sure A.03.04, but it should be. -# define ACE_HAS_USING_KEYWORD - -// Platform lacks streambuf "linebuffered ()". -# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 - -// Lack of (and broken) support for placement operator delete is a known -// bug by HP, at least as of aC++ A.03.10. It may be fixed later, and if so -// this would change to be a #if against an appropriate value of __HP_aCC -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE - -// Compiler's 'new' throws exceptions on failure, regardless of whether or -// not exception handling is enabled in the compiler options. Fortunately, -// new(nothrow_t) is offered. -# define ACE_NEW_THROWS_EXCEPTIONS -# define ACE_HAS_NEW_NOTHROW - -// Compiler's template mechanism must see source code (i.e., .C files). -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Compiler supports template specialization. -# define ACE_HAS_TEMPLATE_SPECIALIZATION -// ... and uses the template<> syntax -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -# define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION - -// Preprocessor needs some help with data types -# if defined (__LP64__) -# define ACE_SIZEOF_LONG 8 -# else -# define ACE_SIZEOF_LONG 4 -# endif - -// Platform has XPG4 wide character support -# define ACE_HAS_XPG4_MULTIBYTE_CHAR -# define ACE_HAS_WCHAR -# define ACE_SIZEOF_WCHAR _WCHAR_T - -# endif /* __cplusplus < 199707L */ - -// Compiler supports the ssize_t typedef. -# define ACE_HAS_SSIZE_T - -// Compiler doesn't handle 'signed char' correctly (used in ace/IOStream.h) -# define ACE_LACKS_SIGNED_CHAR - -#endif /* __GNUG__, HP */ - -// KCC Specific Section -#if defined(__KCC) -# include "ace/config-kcc-common.h" -# undef ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION -# undef ACE_CC_PREPROCESSOR_ARGS -#endif - -//********************************************************************* -// -// From here down is the compiler-INdependent OS settings. -// -//********************************************************************* - -// Compiling for HPUX. -#if !defined (HPUX) -#define HPUX -#endif /* HPUX */ -#define HPUX_11 - -#ifndef _HPUX_SOURCE -#define _HPUX_SOURCE -#endif - -#include /**/ - -#if defined (_INCLUDE_HPUX_SOURCE) -# define ACE_HAS_SNPRINTF -#endif - -// HP-UX is a POSIX-compliant system - see what's available. -#include "ace/config-posix.h" - -//////////////////////////////////////////////////////////////////////////// -// -// General OS information - see README for more details on what they mean -// -/////////////////////////////////////////////////////////////////////////// - -// HP/UX needs to have these addresses in a special range. -// If this is on a 64-bit model, the default is to use 64-bit addressing. -// It can also be set so that the mapped region is shareable with 32-bit -// programs. To enable the 32/64 sharing, comment out the first definition -// of ACE_DEFAULT_BASE_ADDR and uncomment the two lines after it. -// Note - there's a compiler bug on aC++ A.03.04 in 64-bit mode which prevents -// these from working as-is. So, there's some hackery in Naming_Context.cpp -// and Memory_Pool.cpp which works around it. It requires the -// ACE_DEFAULT_BASE_ADDRL definition below - make sure it has the same -// value as what you use for ACE_DEFAULT_BASE_ADDR. This is allegedly fixed -// in A.03.10 on the June Applications CD. -#if defined (__LP64__) -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -//# define ACE_OS_EXTRA_MMAP_FLAGS MAP_ADDR32 - -# define ACE_DEFAULT_BASE_ADDRL (0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDRL (0x80000000) -#else -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#endif /* __LP64__ */ - -// Platform can do async I/O (aio_*) (set up in config-posix.h) -// ... but seems to require this in order to keep from hanging. Needs some -// investigation, maybe with HP. John Mulhern determined this value -// empirically. YMMV. If it does vary, set it up in your own config.h which -// then includes the ACE-supplied config. -#if !defined (ACE_INFINITE) -# define ACE_INFINITE 10000000 -#endif - -// Manually tweak the malloc control block paddings to properly align -// things. -#define ACE_MALLOC_PADDING 16 -#define ACE_MALLOC_ALIGN 8 -#define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 3 - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H -// But doesn't have a prototype for syscall() -#define ACE_LACKS_SYSCALL - -// Platform supports POSIX 1.b clock_gettime () -#define ACE_HAS_CLOCK_GETTIME - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform has Dirent iterator functions. -#define ACE_HAS_DIRENT - -// Platform supports getpagesize() call -#define ACE_HAS_GETPAGESIZE -// But we define this just to be safe -#define ACE_PAGE_SIZE 4096 - -// Can run gperf on this platform (needed for TAO) -# define ACE_HAS_GPERF - -// Optimize ACE_Handle_Set for select(). -# define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Platform's select() has non-const timeval argument -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports the POSIX struct timespec type -#define ACE_HAS_POSIX_TIME - -// Platform supports reentrant functions (all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS -// ctime_r and asctime_r conform to POSIX.1c (2 param version) -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -// HP-UX 11 has reentrant netdb functions. The catch is that the old -// functions (gethostbyname, etc.) are thread-safe and the _r versions are -// not used and will be removed at some point. So, define things so -// the _r versions are not used. This will slow things down a bit due to -// the extra mutex lock in the ACE_NETDBCALL_RETURN macro, and will be fixed -// in the future (problem ID P64). -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -// Platform has shm_open -#define ACE_HAS_SHM_OPEN - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals -#define ACE_HAS_SIGINFO_T - -// Platform doesn't detect a signal out of range unless it's way out of range. -#define ACE_HAS_SIGISMEMBER_BUG - -#define ACE_HAS_UALARM - -// Platform supports ucontext_t (which is used in the extended signal API). -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// SunOS 4 style prototype for gettimeofday -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// Platform supports SVR4 dynamic linking semantics, in 64-bit mode only. -// When used, this requires -ldl on the ACE library link line. -#ifdef __LP64__ -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#endif - -// HP/UX has an undefined syscall for GETRUSAGE... -#define ACE_HAS_SYSCALL_GETRUSAGE -// Note, this only works if the flag is set above! -#define ACE_HAS_GETRUSAGE - -// Platform has the sigwait function in a header file -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIGTIMEDWAIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// accept() is thread-safe -#define ACE_HAS_THREAD_SAFE_ACCEPT - -// Platform lacks a typedef for timespec_t, but has struct timespec -#define ACE_LACKS_TIMESPEC_T - -// dlopen() takes a char* instead of const char* -#define ACE_HAS_CHARPTR_DL - -// Shared library name/path components -#define ACE_DLL_SUFFIX ".sl" -#if defined (__LP64__) -# define ACE_LD_SEARCH_PATH "LD_LIBRARY_PATH" -#else -# define ACE_LD_SEARCH_PATH "SHLIB_PATH" -#endif /* __LP64__ */ - -////////////////////////////////////////////////////////////////////////// -// -// STREAMS information -// -////////////////////////////////////////////////////////////////////////// - -// Platform supports STREAMS -#define ACE_HAS_STREAMS -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T -// But the putmsg signature doesn't have it as const... -// Well, it really does, but it depends on preprocessor defines. -#define ACE_LACKS_CONST_STRBUF_PTR - -// Platform supports STREAM pipes -// This is possible, but not by default - need to rebuild the kernel to -// get them enabled - see pipe(2) and "STREAMS/UX for the HP 9000" -// #define ACE_HAS_STREAM_PIPES - -///////////////////////////////////////////////////////////////////////// -// -// TLI/XTI information -// -//////////////////////////////////////////////////////////////////////// - -// Platform supports XTI (includes TLI), including SVR4 facilities. -#define ACE_HAS_TLI -// ACE_HAS_SVR4_TLI should work on HP-UX, but doesn't yet. Riverace -// problem ID P27. -//#define ACE_HAS_SVR4_TLI -// Platform uses , not tiuser.h -#define ACE_HAS_XTI -// But it has _terrno() outside the extern "C" stuff. -#define ACE_HAS_TIUSER_H_BROKEN_EXTERN_C -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES -// HP-UX 11.00 (at least at initial releases) has some busted macro defs -#define ACE_HAS_BROKEN_XTI_MACROS -// HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the -// errmsg not being const... -#define ACE_HAS_BROKEN_T_ERROR -// The definitions of TCP_NODELAY and TCP_MAXSEG conflict between -// sys/xti.h and netinet/tcp.h. -#define ACE_HAS_CONFLICTING_XTI_MACROS - -///////////////////////////////////////////////////////////////////////// -// -// Threads information. -// -// Use of threads is controlled by the 'threads' argument to make. See -// include/makeinclude/platform_hpux_aCC.GNU for details. If it's not set, -// the default is to enable it, since kernel threads are always available -// on HP-UX 11, as opposed to 10.x where it was optional software. -// -//////////////////////////////////////////////////////////////////////// - -#if defined (ACE_HAS_THREADS) -# if (ACE_HAS_THREADS == 0) -# undef ACE_HAS_THREADS -# endif /* ACE_HAS_THREADS == 0 */ -#else -# define ACE_HAS_THREADS -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_HAS_THREADS) - -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif - -// HP-UX doesn't define _POSIX_THREADS since it doesn't implement all -// features (lacks thread priority inheritance and protection), so -// config-posix.h doesn't get this one... -# define ACE_HAS_PTHREADS - -# define ACE_HAS_PTHREADS_STD -# define ACE_HAS_PTHREADS_UNIX98_EXT -# define ACE_HAS_PTHREAD_CONTINUE -# define ACE_HAS_PTHREAD_SUSPEND - -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -#endif /* ACE_HAS_THREADS */ - -#define ACE_HAS_POSIX_SEM -#define ACE_HAS_TERM_IOCTLS - -// Turns off the tracing feature. -// To build with tracing enabled, make sure ACE_NTRACE is not defined -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h deleted file mode 100644 index 992b96d1eb5..00000000000 --- a/ace/config-hpux11.h +++ /dev/null @@ -1,250 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for HP -// platforms running HP/UX 11.x. It includes all of the ACE information -// needed for HP-UX 11.x itself. The compiler-specific information is in -// config-hpux-11.x-.h - they include this file. - -#ifndef ACE_CONFIG_H -#error "You need to use a compiler-specific .h file - they include this file" -#endif - -// Compiling for HPUX. -#if !defined (HPUX) -#define HPUX -#endif /* HPUX */ -#define HPUX_11 - -#ifndef _HPUX_SOURCE -#define _HPUX_SOURCE -#include "ace/pre.h" -#endif - -#include /**/ - -//////////////////////////////////////////////////////////////////////////// -// -// General OS information - see README for more details on what they mean -// -/////////////////////////////////////////////////////////////////////////// - -// HP/UX needs to have these addresses in a special range. -// If this is on a 64-bit model, the default is to use 64-bit addressing. -// It can also be set so that the mapped region is shareable with 32-bit -// programs. To enable the 32/64 sharing, comment out the first definition -// of ACE_DEFAULT_BASE_ADDR and uncomment the two lines after it. -// Note - there's a compiler bug on aC++ A.03.04 in 64-bit mode which prevents -// these from working as-is. So, there's some hackery in Naming_Context.cpp -// and Memory_Pool.cpp which works around it. It requires the -// ACE_DEFAULT_BASE_ADDRL definition below - make sure it has the same -// value as what you use for ACE_DEFAULT_BASE_ADDR. This is allegedly fixed -// in A.03.10 on the June Applications CD. -#if defined (__LP64__) -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -//# define ACE_OS_EXTRA_MMAP_FLAGS MAP_ADDR32 - -# define ACE_DEFAULT_BASE_ADDRL (0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDRL (0x80000000) -#else -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#endif /* __LP64__ */ - -// Platform can do async I/O (aio_*) -#define ACE_HAS_AIO_CALLS -// ... but seems to require this in order to keep from hanging. Needs some -// investigation, maybe with HP. John Mulhern determined this value -// empirically. YMMV. If it does vary, set it up in your own config.h which -// then includes the ACE-supplied config. -#if !defined (ACE_INFINITE) -# define ACE_INFINITE 10000000 -#endif - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H -// But doesn't have a prototype for syscall() -#define ACE_LACKS_SYSCALL - -// Platform supports POSIX 1.b clock_gettime () -#define ACE_HAS_CLOCK_GETTIME - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform has Dirent iterator functions. -#define ACE_HAS_DIRENT - -// Platform supports getpagesize() call -#define ACE_HAS_GETPAGESIZE -// But we define this just to be safe -#define ACE_PAGE_SIZE 4096 - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Platform's select() has non-const timeval argument -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports the POSIX struct timespec type -#define ACE_HAS_POSIX_TIME - -// Platform supports reentrant functions (all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -// HP-UX 11 has reentrant netdb functions. The catch is that the old -// functions (gethostbyname, etc.) are thread-safe and the _r versions are -// not used and will be removed at some point. So, define things so -// the _r versions are not used. This will slow things down a bit due to -// the extra mutex lock in the ACE_NETDBCALL_RETURN macro, and will be fixed -// in the future (problem ID P64). -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals -#define ACE_HAS_SIGINFO_T - -// Platform doesn't detect a signal out of range unless it's way out of range. -#define ACE_HAS_SIGISMEMBER_BUG - -#define ACE_HAS_UALARM - -// Platform supports ucontext_t (which is used in the extended signal API). -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// SunOS 4 style prototype for gettimeofday -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// Platform supports SVR4 dynamic linking semantics, in 64-bit mode only. -// When used, this requires -ldl on the ACE library link line. -#ifdef __LP64__ -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#endif - -// HP/UX has an undefined syscall for GETRUSAGE... -#define ACE_HAS_SYSCALL_GETRUSAGE -// Note, this only works if the flag is set above! -#define ACE_HAS_GETRUSAGE - -// Platform has the sigwait function in a header file -#define ACE_HAS_SIGWAIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// accept() is thread-safe -#define ACE_HAS_THREAD_SAFE_ACCEPT - -// Platform has XPG4 wide character support -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform lacks a typedef for timespec_t, but has struct timespec -#define ACE_LACKS_TIMESPEC_T - -// Shared library name/path components -#define ACE_DLL_SUFFIX ".sl" -#if defined (__LP64__) -# define ACE_LD_SEARCH_PATH "LD_LIBRARY_PATH" -#else -# define ACE_LD_SEARCH_PATH "SHLIB_PATH" -#endif /* __LP64__ */ - -////////////////////////////////////////////////////////////////////////// -// -// STREAMS information -// -////////////////////////////////////////////////////////////////////////// - -// Platform supports STREAMS -#define ACE_HAS_STREAMS -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T -// But the putmsg signature doesn't have it as const... -// Well, it really does, but it depends on preprocessor defines. -#define ACE_LACKS_CONST_STRBUF_PTR - -// Platform supports STREAM pipes -// This is possible, but not by default - need to rebuild the kernel to -// get them enabled - see pipe(2) and "STREAMS/UX for the HP 9000" -// #define ACE_HAS_STREAM_PIPES - -///////////////////////////////////////////////////////////////////////// -// -// TLI/XTI information -// -//////////////////////////////////////////////////////////////////////// - -// Platform supports XTI (includes TLI), including SVR4 facilities. -#define ACE_HAS_TLI -// ACE_HAS_SVR4_TLI should work on HP-UX, but doesn't yet. Riverace -// problem ID P27. -//#define ACE_HAS_SVR4_TLI -// Platform uses , not tiuser.h -#define ACE_HAS_XTI -// But it has _terrno() outside the extern "C" stuff. -#define ACE_HAS_TIUSER_H_BROKEN_EXTERN_C -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES -// HP-UX 11.00 (at least at initial releases) has some busted macro defs -#define ACE_HAS_BROKEN_XTI_MACROS -// HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the -// errmsg not being const... -#define ACE_HAS_BROKEN_T_ERROR - -///////////////////////////////////////////////////////////////////////// -// -// Threads information. -// -// Use of threads is controlled by the 'threads' argument to make. See -// include/makeinclude/platform_hpux_aCC.GNU for details. If it's not set, -// the default is to enable it, since kernel threads are always available -// on HP-UX 11, as opposed to 10.x where it was optional software. -// -//////////////////////////////////////////////////////////////////////// - -#if defined (ACE_HAS_THREADS) -# if (ACE_HAS_THREADS == 0) -# undef ACE_HAS_THREADS -# endif /* ACE_HAS_THREADS == 0 */ -#else -# define ACE_HAS_THREADS -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_HAS_THREADS) - -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif - -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_STD -# define ACE_HAS_PTHREADS_UNIX98_EXT - -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -#endif /* ACE_HAS_THREADS */ - -#define ACE_HAS_POSIX_SEM - -// Turns off the tracing feature. -// To build with tracing enabled, make sure ACE_NTRACE is not defined -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#include "ace/post.h" -#endif /* ACE_NTRACE */ diff --git a/ace/config-icc-common.h b/ace/config-icc-common.h deleted file mode 100644 index 3887c918683..00000000000 --- a/ace/config-icc-common.h +++ /dev/null @@ -1,60 +0,0 @@ -// $Id$ - -#ifndef ACE_LINUX_ICC_COMMON_H -#define ACE_LINUX_ICC_COMMON_H -#include "ace/pre.h" - -# define ACE_HAS_ANSI_CASTS -# define ACE_HAS_CPLUSPLUS_HEADERS -# define ACE_HAS_EXPLICIT_KEYWORD -# define ACE_HAS_MUTABLE_KEYWORD -# define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS -# define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_HAS_TEMPLATE_SPECIALIZATION -# define ACE_HAS_USING_KEYWORD -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_STRING_CLASS - -// __EXCEPTIONS is defined with -fexceptions, the egcs default. It -// is not defined with -fno-exceptions, the ACE default for g++. -// ACE_HAS_EXCEPTIONS is defined in -// include/makeinclude/wrapper_macros.GNU, so this really isn't -// necessary. Just in case . . . -# if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS) -# define ACE_HAS_EXCEPTIONS -# endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */ - -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ - -#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 12 -#endif /* i386 */ - -#if !defined (__MINGW32__) && (defined (i386) || defined (__i386__)) - // If running an Intel, assume that it's a Pentium so that - // ACE_OS::gethrtime () can use the RDTSC instruction. If running a - // 486 or lower, be sure to comment this out. (If not running an - // Intel CPU, this #define will not be seen because of the i386 - // protection, so it can be ignored.) -# define ACE_HAS_PENTIUM -#endif /* i386 */ - -#if !defined (ACE_LACKS_PRAGMA_ONCE) - // We define it with a -D with make depend. -# define ACE_LACKS_PRAGMA_ONCE -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ - -#include "ace/post.h" -#endif /* ACE_LINUX_ICC_COMMON_H */ diff --git a/ace/config-irix5.2.h b/ace/config-irix5.2.h deleted file mode 100644 index 35098a8170c..00000000000 --- a/ace/config-irix5.2.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for the SGI -// Indigo2EX running Irix 5.2 platform using the gcc v2.6.x compiler -// and libg++ v2.6.x. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// Platform supports STREAM pipes (note that this is disabled by -// default, see the manual page on pipe(2) to find out how to enable -// it). -//#define ACE_HAS_STREAM_PIPES - -// Platform supports getpagesize() call. -#define ACE_HAS_GETPAGESIZE -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_SIGWAIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform requires void * for mmap(). -#define ACE_HAS_VOIDPTR_MMAP - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -#define ACE_SIZEOF_LONG_DOUBLE 8 - -#define IRIX5 -#define ACE_HAS_ALLOCA -// Compiler/platform has -#define ACE_HAS_ALLOCA_H -#define ACE_HAS_BSTRING -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_POLL -#define ACE_HAS_PROC_FS -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_STREAMS -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRERROR -#define ACE_HAS_STRBUF_T -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_SVR4_SIGNAL_T -#define ACE_HAS_SYS_SIGLIST -#define ACE_HAS_SYS_FILIO_H -#define ACE_HAS_SEMUN -#define ACE_NEEDS_DEV_IO_CONVERSION - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h deleted file mode 100644 index 554167e9ec3..00000000000 --- a/ace/config-irix5.3-g++.h +++ /dev/null @@ -1,120 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for the SGI -// Indigo2EX running Irix 5.3 platform using the GNU C++ Compiler - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - -#include "ace/config-g++-common.h" - -#define ACE_SIZEOF_LONG_DOUBLE 8 - -#define ACE_LACKS_SYSTIME_H -// Platform supports getpagesize() call. -#define ACE_HAS_GETPAGESIZE -#define IRIX5 -#define ACE_HAS_SIGWAIT -#define ACE_HAS_DIRENT - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform requires void * for mmap(). -#define ACE_HAS_VOIDPTR_MMAP - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform supports alloca() -#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// IRIX5 needs to define bzero() in this odd file -#define ACE_HAS_BSTRING - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Denotes that GNU has cstring.h as standard -// which redefines memchr() -#define ACE_HAS_GNU_CSTRING_H - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes (note that this is disabled by -// default, see the manual page on pipe(2) to find out how to enable -// it). -// #define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_IRIX_53_SIGNALS - -// Compiler/platform supports sys_siglist array. -// #define ACE_HAS_SYS_SIGLIST - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h deleted file mode 100644 index 269bab43bb6..00000000000 --- a/ace/config-irix5.3-sgic++.h +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work -// for the SGI Indigo2EX running Irix 5.3 platform using -// the SGI C++ Compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define IRIX5 - -#include -#define _BSD_TYPES - -#define ACE_SIZEOF_LONG_DOUBLE 8 - -#define ACE_LACKS_SYSTIME_H -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports getpagesize() call. -#define ACE_HAS_GETPAGESIZE - -#define ACE_LACKS_SYSTIME_H -#define ACE_HAS_SIGWAIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform requires void * for mmap(). -#define ACE_HAS_VOIDPTR_MMAP - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform supports alloca() -#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// IRIX5 needs to define bzero() in this odd file -#define ACE_HAS_BSTRING - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Platform contains . -#define ACE_HAS_POLL - -// No multi-threading so use poll() call -// - for easier debugging, if nothing else -// #define ACE_USE_POLL - -// Platform supports the /proc file system. -// #define ACE_HAS_PROC_FS - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -// #define ACE_HAS_UCONTEXT_T -#define ACE_LACKS_UCONTEXT_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes (note that this is disabled by -// default, see the manual page on pipe(2) to find out how to enable -// it). -// #define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_IRIX_53_SIGNALS - -// Compiler/platform supports sys_siglist array. -// #define ACE_HAS_SYS_SIGLIST - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -#define ACE_NEEDS_DEV_IO_CONVERSION - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-irix6.5.x-sgic++.h b/ace/config-irix6.5.x-sgic++.h deleted file mode 100644 index a2f0f328b0a..00000000000 --- a/ace/config-irix6.5.x-sgic++.h +++ /dev/null @@ -1,18 +0,0 @@ -// -*- C++ -*- -// $Id$ - -// Use this file for IRIX 6.5.x - -#ifndef ACE_CONFIG_IRIX65X_H -#define ACE_CONFIG_IRIX65X_H -#include "ace/pre.h" - -// Include IRIX 6.[234] configuration -#include "ace/config-irix6.x-sgic++.h" - -// Irix 6.5 man pages show that they exist -#undef ACE_LACKS_CONDATTR_PSHARED -#undef ACE_LACKS_MUTEXATTR_PSHARED - -#include "ace/post.h" -#endif /* ACE_CONFIG_IRIX65X_H */ diff --git a/ace/config-irix6.x-common.h b/ace/config-irix6.x-common.h deleted file mode 100644 index e1273d4f943..00000000000 --- a/ace/config-irix6.x-common.h +++ /dev/null @@ -1,173 +0,0 @@ -/* -*- C++ -*- */ -// -// $Id$ -// -// This file contains the common configuration options for both -// SGI/MIPSPro C++ and g++ under IRIX 6.X -// -#ifndef ACE_CONFIG_IRIX6X_COMMON_H - -#if !(defined(ACE_CONFIG_H) || defined(ACE_CONFIG_IRIX6X_NTHR_H)) -#error "This file may only be included via config.h or config-irix6.x-nothreads.h" -#endif - -#if (defined(ACE_CONFIG_H) && defined(ACE_CONFIG_IRIX6X_NTHR_H)) -#error "May only be included via config.h *OR* config-irix6.x-nothreads.h, not both!" -#endif - -// The Irix 6.x float.h doesn't allow us to distinguish between a -// double and a long double. So, we have to hard-code this. Thanks -// to Bob Laferriere for figuring it out. -#if defined (_MIPS_SIM) /* 6.X System */ -# include -# if defined (__GNUC__) /* GNU Compiler reports long doubles as 8 bytes */ -# define ACE_SIZEOF_LONG_DOUBLE 8 -# elif defined (_MIPS_SIM_NABI32) && (_MIPS_SIM == _MIPS_SIM_NABI32) -# define ACE_SIZEOF_LONG_DOUBLE 16 -# elif defined (_MIPS_SIM_ABI32) && (_MIPS_SIM == _MIPS_SIM_ABI32) -# define ACE_SIZEOF_LONG_DOUBLE 8 -# elif defined (_MIPS_SIM_ABI64) && (_MIPS_SIM == _MIPS_SIM_ABI64) -# define ACE_SIZEOF_LONG_DOUBLE 16 -# elif !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 8 -# endif -#else -# define ACE_SIZEOF_LONG_DOUBLE 8 /* 5.3 System */ -#endif - -// petern, Next part of it: - -// Platform supports getpagesize() call. -#define ACE_HAS_GETPAGESIZE - -// Platform has no implementation of pthread_condattr_setpshared(), -// even though it supports pthreads! (like Irix 6.2) -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED - -// Platform/compiler has the sigwait(2) prototype -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIGTIMEDWAIT -#define ACE_HAS_SIGSUSPEND - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform requires void * for mmap(). -#define ACE_HAS_VOIDPTR_MMAP - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform supports alloca() -#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Irix needs to define bzero() in this odd file -#define ACE_HAS_BSTRING - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Platform contains . -#define ACE_HAS_POLL - -// No multi-threading so use poll() call -// - for easier debugging, if nothing else -// #define ACE_USE_POLL - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes (note that this is disabled by -// default, see the manual page on pipe(2) to find out how to enable -// it). -// #define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -#define ACE_HAS_STRPTIME - -//************************************************************** -// Not so sure how next lines should look like - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME -#define ACE_LACKS_SYSTIME_H - -//************************************************************** - -// IRIX 6.4 and below do not support reentrant netdb functions -// (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, -// gethostbyname_r, getservbyname_r). -#if ACE_IRIX_VERS <= 64 && !defined (ACE_HAS_NETDB_REENTRANT_FUNCTIONS) -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#endif /* ACE_HAS_NETDB_REENTRANT_FUNCTIONS */ - -#define ACE_HAS_DIRENT -// Unless the thread enabled version is used the readdir_r interface -// does not get defined in IRIX 6.2 -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_RWLOCK_T - -#define ACE_HAS_GPERF - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_BROKEN_DGRAM_SENDV - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -#define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 2 - -// Enables use of POSIX termios struct -#define ACE_USES_NEW_TERMIOS - -// IRIX 6.5 supports AIO -#define ACE_HAS_AIO_CALLS -#define ACE_POSIX_AIOCB_PROACTOR - -#endif /* ACE_CONFIG_IRIX6X_COMMON_H */ diff --git a/ace/config-irix6.x-g++.h b/ace/config-irix6.x-g++.h deleted file mode 100644 index 1317197244e..00000000000 --- a/ace/config-irix6.x-g++.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for the SGI -// Indigo2EX running Irix 6.2 platform using the GNU C++ Compiler - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - -#include "ace/config-g++-common.h" - -// Platform supports the very odd IRIX 6.2 threads... -#define ACE_HAS_THREADS -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* !ACE_MT_SAFE */ -#define ACE_HAS_IRIX62_THREADS - -// IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_STD - -#include "ace/config-irix6.x-common.h" - -// Needed for the threading stuff? -#include /**/ -#include /**/ - -#define PTHREAD_MIN_PRIORITY PX_PRIO_MIN -#define PTHREAD_MAX_PRIORITY PX_PRIO_MAX - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -#define IRIX6 - -// Denotes that GNU has cstring.h as standard -// which redefines memchr() -#define ACE_HAS_GNU_CSTRING_H - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_IRIX_53_SIGNALS - -// Compiler/platform supports sys_siglist array. -//#define ACE_HAS_SYS_SIGLIST - - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-irix6.x-kcc.h b/ace/config-irix6.x-kcc.h deleted file mode 100644 index 5b1ba941c69..00000000000 --- a/ace/config-irix6.x-kcc.h +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for the SGI -// Indigo2EX running Irix 6.5 platform using the KAI C++ compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#include "ace/config-kcc-common.h" - - -// Platform supports the very odd IRIX 6.2 threads... -#define ACE_HAS_THREADS -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* !ACE_MT_SAFE */ -#define ACE_HAS_IRIX62_THREADS - -// IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_STD - -#include "ace/config-irix6.x-common.h" - -// Needed for the threading stuff? -#include /**/ -#include /**/ - -#define PTHREAD_MIN_PRIORITY PX_PRIO_MIN -#define PTHREAD_MAX_PRIORITY PX_PRIO_MAX - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// The pthread_cond_timedwait call does not reset the timer. -#define ACE_LACKS_COND_TIMEDWAIT_RESET 1 - -#define ACE_HAS_STRING_CLASS -#ifndef IRIX6 -# define IRIX6 -#endif - -// Denotes that GNU has cstring.h as standard -// which redefines memchr() -#define ACE_HAS_GNU_CSTRING_H - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_IRIX_53_SIGNALS - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform supports sys_siglist array. -//#define ACE_HAS_SYS_SIGLIST - -// This gets defined in config-irix6.x-common.h, but kcc does support this. -#undef ACE_LACKS_PLACEMENT_OPERATOR_DELETE - -// Shift this --- otherwise, it lands on top of libKCC. -#define ACE_DEFAULT_BASE_ADDR ((char*) 0x0500000) - -// kcc 4.0d miscompiles memchr_emulation on irix at +K3 optimization. -// So just use the library version instead. -#define ACE_HAS_MEMCHR - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h deleted file mode 100644 index bc4740e96d4..00000000000 --- a/ace/config-irix6.x-sgic++-nothreads.h +++ /dev/null @@ -1,95 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This is the config file for IRIX 6.2, 6.4 and hopefully 6.3, using -// the SGI C++ compiler (7.1 or higher). - -// For IRIX 6.2 there are several patches that should be applied to -// get reliable operation with multi-threading and exceptions. -// Specifically you should get a reasonable current IRIX, Compiler -// and POSIX patch-sets. - -// For IRIX 6.[34] it's less critical, but it's still recommended -// that you apply the applicable patch-sets (IRIX and Compiler I believe). - -// These patches are updated frequently, so you should ask your support -// contact or search SGI's web site (http://www.sgi.com) for the latest -// version. - -// Since this files gets included from config-irix6.x-sgic++.h we -// cannot use ACE_CONFIG_H here. -#ifndef ACE_CONFIG_IRIX6X_NTHR_H -#define ACE_CONFIG_IRIX6X_NTHR_H -#include "ace/pre.h" - -// Include this file to set the _MIPS_SIM*ABI* macros. -#include /**/ -#include "ace/config-irix6.x-common.h" - -#define ACE_HAS_SGIDLADD -#define ACE_HAS_P_READ_WRITE -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_HAS_SETOWN -#define ACE_HAS_SYSENT_H -#define ACE_HAS_SYSINFO -#define ACE_HAS_UALARM - -// Platform has support for multi-byte character support compliant -// with the XPG4 Worldwide Portability Interface wide-character -// classification. -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// We need to setup a very high address or Naming_Test won't run. -#define ACE_DEFAULT_BASE_ADDR ((char *) (1024U * 1024 * 1024)) - -#define ACE_LACKS_SIGNED_CHAR - -// Platform supports reentrant functions (i.e., all the POSIX *_r -// functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform has terminal ioctl flags like TCGETS and TCSETS. -#define ACE_HAS_TERM_IOCTLS - -// Platform does not support reentrant password file accessor functiions. -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS - -// uses ctime_r & asctime_r with only two parameters vs. three -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - - -// The following three should be enabled/disabled together. -#if _COMPILER_VERSION >= 720 -#define ACE_HAS_TEMPLATE_SPECIALIZATION -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_HAS_USING_KEYWORD -# ifdef _STANDARD_C_PLUS_PLUS -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -# define ACE_HAS_TYPENAME_KEYWORD -# endif /* _STANDARD_C_PLUS_PLUS */ -#else -#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA -#endif /* _COMPILER_VERSION >= 720 */ -#define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_NEEDS_FUNC_DEFINITIONS - -// Platform supports STREAM pipes (note that this is disabled by -// default, see the manual page on pipe(2) to find out how to enable -// it). -// #define ACE_HAS_STREAM_PIPES - -#if defined (_COMPILER_VERSION) -# define ACE_CC_NAME "SGI/MIPSPro" -# define ACE_CC_MAJOR_VERSION (_COMPILER_VERSION / 100) -# define ACE_CC_MINOR_VERSION (_COMPILER_VERSION % 100) -# define ACE_CC_BETA_VERSION (0) -#endif /* _COMPILER_VERSION */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_IRIX6X_NTHR_H */ diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h deleted file mode 100644 index 06001f1ca2f..00000000000 --- a/ace/config-irix6.x-sgic++.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Use this file for IRIX 6.[234] if you have the pthreads patches -// installed. - -#ifndef ACE_CONFIG_IRIX6X_H -#define ACE_CONFIG_IRIX6X_H -#include "ace/pre.h" - -// Include basic (non-threaded) configuration -#include "ace/config-irix6.x-sgic++-nothreads.h" - -#define ACE_HAS_UALARM - -// Scheduling functions are declared in -#define ACE_NEEDS_SCHED_H - -// Compile using multi-thread libraries by default -#if !defined (ACE_MT_SAFE) - #define ACE_MT_SAFE 1 -#endif /* ACE_MT_SAFE */ - -#if (ACE_MT_SAFE != 0) - -// Add threading support - -#define ACE_HAS_IRIX62_THREADS - -// Needed for the threading stuff? -#include /**/ -#define PTHREAD_MIN_PRIORITY PX_PRIO_MIN -#define PTHREAD_MAX_PRIORITY PX_PRIO_MAX - -// ACE supports threads. -#define ACE_HAS_THREADS - -// Platform has no implementation of pthread_condattr_setpshared(), -// even though it supports pthreads! (like Irix 6.2) -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED - -// IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_STD - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// The pthread_cond_timedwait call does not reset the timer. -#define ACE_LACKS_COND_TIMEDWAIT_RESET 1 - -// When threads are enabled READDIR_R is supported on IRIX. -#undef ACE_LACKS_READDIR_R - -#endif /* (ACE_MT_SAFE == 0) */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_IRIX6X_H */ diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h deleted file mode 100644 index 3f0b9c6d00b..00000000000 --- a/ace/config-kcc-common.h +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file is designed to be included by another, -// specific configuration file. It provides config information common -// to all KAI C++ platforms (KCC version 3.3a). -// -// KAI C++ 3.2d for Linux had a known problem with being unable to call -// static object constructors and destructors within shared libraries. -// -// KAI C++ 3.3a requires glibc 2. This configuration was tested with -// egcs 1.0.2 and glibc-2.0.7-7. The KCC_BASE/bin/KCC script requires -// the following settings for i386-linux to work: -// -//case i386-linux: -// set common_na = "-Dlinux -Dunix -Di386" -// set cpp_defines = "-D__CPLUSPLUS -D__inline__=inline -D__inline=inline -D__signed__=signed" -// set c_defines = "-D__inline__= -D__inline= -D__signed__=signed" -// set knr_c_defines = "-D__inline__= -D__inline= -D__signed__=" -// set ansi_c_defines = "" -// breaksw -// - -#ifndef ACE_KCC_COMMON_H -#define ACE_KCC_COMMON_H -#include "ace/pre.h" - -#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 12 -#endif /* i386 */ - -#if defined (i386) || defined (__i386__) - // If running an Intel, assume that it's a Pentium so that - // ACE_OS::gethrtime () can use the RDTSC instruction. If - // running a 486 or lower, be sure to comment this out. - // (If not running an Intel CPU, this #define will not be seen - // because of the i386 protection, so it can be ignored.) -# define ACE_HAS_PENTIUM -#endif /* i386 */ - -// ****** Need to move this somewhere else -// #define TAO_YY_BREAK - -#define ACE_SIZEOF_LONG_LONG 8 -#define ACE_TEMPLATES_REQUIRE_SOURCE - -#define ACE_HAS_TEMPLATE_SPECIALIZATION -#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - -// Compiler doesn't support static data member templates. -//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - -#define ACE_HAS_USING_KEYWORD - -// Define this if you want to use the standard C++ library -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_STRING_CLASS -#define ACE_HAS_STDCPP_STL_INCLUDES 1 -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#define ACE_LACKS_IOSTREAM_FX 1 -#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -#define ACE_LACKS_UNBUFFERED_STREAMBUF 1 -#define ACE_HAS_EXCEPTIONS 1 -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_NEW_THROWS_EXCEPTIONS - -// __KCC_VERSION is not defined before 3.4. -#if !defined (__KCC_VERSION) -#define ACE_AUTO_PTR_LACKS_RESET -#endif /* !__KCC_VERSION */ - -//#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1 - -#include "ace/post.h" -#endif /* ACE_KCC_COMMON_H */ diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h deleted file mode 100644 index 7ea071e6cd0..00000000000 --- a/ace/config-linux-common.h +++ /dev/null @@ -1,339 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Do not use this configuration file directly since it's designed to -// be included by another, specific configuration file, such as -// config-linux.h. It provides config information common to all Linux -// platforms. It automatically determines the CPU architecture, -// compiler (g++ or egcs), and libc (libc5 or glibc), and configures -// based on those. - -#ifndef ACE_LINUX_COMMON_H -#define ACE_LINUX_COMMON_H -#include "ace/pre.h" - -#define ACE_HAS_BYTESEX_H - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// #ifndef _XOPEN_SOURCE -// # define _XOPEN_SOURCE 600 -// #endif /* _XOPEN_SOURCE */ - -// Needed to differentiate between libc 5 and libc 6 (aka glibc). -#include - -#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) -# define ACE_HAS_PTHREADS_UNIX98_EXT -#endif /* _XOPEN_SOURCE - 0 >= 500 */ - -// First the machine specific part - -#if defined (__alpha) - // This is necessary on Alphas with glibc 2.0.7-13. -# define ACE_POLL_IS_BROKEN -#elif defined (__powerpc__) -# if !defined (ACE_DEFAULT_BASE_ADDR) -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x40000000) -# endif /* ! ACE_DEFAULT_BASE_ADDR */ -#elif defined (__ia64) -# if !defined (ACE_DEFAULT_BASE_ADDR) -// Zero base address should work fine for Linux of IA-64: it just lets -// the kernel to choose the right value. -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000000000000000) -# endif /* ! ACE_DEFAULT_BASE_ADDR */ -#endif /* ! __alpha && ! __powerpc__ && ! __ia64 */ - -// Then glibc/libc5 specific parts - -#if defined(__GLIBC__) -# define ACE_HAS_BROKEN_SETRLIMIT -# define ACE_HAS_RUSAGE_WHO_ENUM enum __rusage_who -# define ACE_HAS_RLIMIT_RESOURCE_ENUM enum __rlimit_resource -# define ACE_HAS_SOCKLEN_T -# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG - - // glibc defines both of these, used in OS_String. -# if defined (_GNU_SOURCE) -# define ACE_HAS_STRNLEN -# define ACE_HAS_WCSNLEN -# endif - - // To avoid the strangeness with Linux's ::select (), which modifies - // its timeout argument, use ::poll () instead. -# define ACE_HAS_POLL - -// Don't define _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED in ACE to make -// getpgid() prototype visible. ACE shouldn't depend on feature test -// macros to make prototypes visible. -# define ACE_LACKS_GETPGID_PROTOTYPE - -// NOTE: the following defines are necessary with glibc 2.0 (0.961212-5) -// on Alpha. I assume that they're necessary on Intel as well, -// but that may depend on the version of glibc that is used. -//# define ACE_HAS_DLFCN_H_BROKEN_EXTERN_C -# define ACE_HAS_VOIDPTR_SOCKOPT -# define ACE_LACKS_SYSTIME_H - -// Don't define _POSIX_SOURCE in ACE to make strtok() prototype -// visible. ACE shouldn't depend on feature test macros to make -// prototypes visible. -# define ACE_LACKS_STRTOK_R_PROTOTYPE -// NOTE: end of glibc 2.0 (0.961212-5)-specific configuration. - -// These macros determined by reading stdio.h on RH 7.1. -# if defined (__USE_BSD) || defined (__USE_ISOC99) || defined (__USE_UNIX98) -# define ACE_HAS_SNPRINTF -# endif - -# if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 - // These were suggested by Robert Hanzlik to get - // ACE to compile on Linux using glibc 2.1 and libg++/gcc 2.8. -# undef ACE_HAS_BYTESEX_H -# define ACE_HAS_SIGINFO_T -# define ACE_LACKS_SIGINFO_H -# define ACE_HAS_UCONTEXT_T - - // Pre-glibc (RedHat 5.2) doesn't have sigtimedwait. -# define ACE_HAS_SIGTIMEDWAIT -# endif /* __GLIBC__ 2.1+ */ -#else /* ! __GLIBC__ */ - // Fixes a problem with some non-glibc versions of Linux... -# define ACE_LACKS_MADVISE -# define ACE_LACKS_MSG_ACCRIGHTS -#endif /* ! __GLIBC__ */ - -// Don't define _LARGEFILE64_SOURCE in ACE to make llseek() or -// lseek64() prototype visible. ACE shouldn't depend on feature test -// macros to make prototypes visible. -#if __GLIBC__ > 1 -# if __GLIBC_MINOR__ == 0 -# define ACE_HAS_LLSEEK -# define ACE_LACKS_LLSEEK_PROTOTYPE -# else /* __GLIBC_MINOR__ > 0 */ -# define ACE_HAS_LSEEK64 -# define ACE_LACKS_LSEEK64_PROTOTYPE -# endif -#endif /* __GLIBC__ > 1 */ - -#if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 -# define ACE_HAS_P_READ_WRITE -# define ACE_LACKS_PREAD_PROTOTYPE -// Use ACE's alternate cuserid() implementation since the use of the -// system cuserid() is discouraged. -# define ACE_HAS_ALT_CUSERID -#endif /* __GLIBC__ > 1 && __GLIBC_MINOR__ >= 0 */ - - -// Then the compiler specific parts - -#if defined (__GNUG__) - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS -# include "ace/config-g++-common.h" -#define ACE_CC_NAME ACE_LIB_TEXT ("g++") -#define ACE_CC_MAJOR_VERSION __GNUC__ -#define ACE_CC_MINOR_VERSION __GNUC_MINOR__ -//#define ACE_CC_BETA_VERSION 0 /* ??? */ -#elif defined (__KCC) -# define ACE_HAS_STRING_CLASS -# undef ACE_HAS_LLSEEK -# undef ACE_HAS_LSEEK64 -# undef ACE_LACKS_LLSEEK_PROTOTYPE -# undef ACE_LACKS_LSEEK64_PROTOTYPE -# include "ace/config-kcc-common.h" -#elif defined (__DECCXX) -# define ACE_CONFIG_INCLUDE_CXX_COMMON -# include "ace/config-cxx-common.h" -#elif defined (__INTEL_COMPILER) -# include "ace/config-icc-common.h" -#elif defined (__BORLANDC__) -# undef ACE_HAS_LLSEEK -# undef ACE_HAS_LSEEK64 -# undef ACE_LACKS_LLSEEK_PROTOTYPE -# undef ACE_LACKS_LSEEK64_PROTOTYPE -# include "ace/config-borland-common.h" -#else /* ! __GNUG__ && ! __KCC && !__DECCXX && !__INTEL_COMPILER && !__BORLANDC__*/ -# error unsupported compiler in ace/config-linux-common.h -#endif /* ! __GNUG__ && ! __KCC */ - -// Completely common part :-) - -// Platform/compiler has the sigwait(2) prototype -# define ACE_HAS_SIGWAIT - -# define ACE_HAS_SIGSUSPEND - -// However, sigqueue-ing things across threads does not work (at least -// prior to the 2.4 kernel) so unless the user has specifically requested -// the POSIX_SIG_PROACTOR, use the AIOCB version to avoid this problem. -# if !defined (ACE_POSIX_SIG_PROACTOR) -# define ACE_POSIX_AIOCB_PROACTOR -# endif /* ACE_POSIX_SIG_PROACTOR */ - -#if __GLIBC__ >= 2 -#ifndef ACE_HAS_POSIX_REALTIME_SIGNALS -#define ACE_HAS_POSIX_REALTIME_SIGNALS -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - -#ifndef ACE_HAS_AIO_CALLS -#define ACE_HAS_AIO_CALLS -#endif /* ACE_HAS_AIO_CALLS */ -#endif - -#if __GLIBC__ >= 2 -// glibc 2 and higher has wchar support -# define ACE_HAS_XPG4_MULTIBYTE_CHAR -#endif - -#if __GLIBC__ < 2 -// These are present in glibc 2 and higher -# define ACE_LACKS_WCSTOK -# define ACE_LACKS_WCSDUP_PROTOTYPE -#endif /* __GLIBC__ < 2 */ - -#define ACE_LACKS_ITOW -#define ACE_LACKS_WCSICMP -#define ACE_LACKS_WCSNICMP -#define ACE_LACKS_TOWLOWER - -#if __GLIBC__ >= 2 -# define ACE_HAS_3_PARAM_WCSTOK -#endif - -#if !defined (ACE_DEFAULT_BASE_ADDR) -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#endif /* ! ACE_DEFAULT_BASE_ADDR */ - -// Compiler/platform supports alloca(). -#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_GETRUSAGE_PROTO - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// ONLY define this if you have config'd multicast into a 2.0.34 or -// prior kernel. It is enabled by default in 2.0.35 kernels. -#if !defined (ACE_HAS_IP_MULTICAST) -# define ACE_HAS_IP_MULTICAST -#endif /* ! ACE_HAS_IP_MULTICAST */ - -// At least for IPv4, Linux lacks perfect filtering. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - -#define ACE_HAS_BIG_FD_SET - -// Linux defines struct msghdr in /usr/include/socket.h -#define ACE_HAS_MSG - -// Linux "improved" the interface to select() so that it modifies -// the struct timeval to reflect the amount of time not slept -// (see NOTES in Linux's select(2) man page). -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -#define ACE_HAS_TERM_IOCTLS - -#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65535 - -#define ACE_HAS_GETPAGESIZE 1 - -#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) - // GLIBC 2.2 and higher doesn't need this macro any more. - // Platform lacks POSIX prototypes for certain System V functions - // like shared memory and message queues. -# define ACE_LACKS_SOME_POSIX_PROTOTYPES - -// glibc supports wchar, but lacks fgetwc and ungetwc -#define ACE_LACKS_FGETWC - -#endif - -// glibc supports the mkstemp() function. -#define ACE_HAS_MKSTEMP - -// glibc requires _XOPEN_SOURCE_EXTENDED to make this prototype -// visible, so force ACE to declare one. Yuk! -#define ACE_LACKS_MKSTEMP_PROTOTYPE - -// Platform defines struct timespec but not timespec_t -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_STRRECVFD - -//#define ACE_LACKS_MSYNC - -// A conflict appears when including both and -// with recent glibc headers. -//#define ACE_HAS_PROC_FS - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -#define ACE_HAS_STRPTIME -// Don't define _XOPEN_SOURCE in ACE to make strptime() prototype -// visible. ACE shouldn't depend on feature test macros to make -// prototypes visible. -#define ACE_LACKS_STRPTIME_PROTOTYPE - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -#define ACE_HAS_POSIX_TIME - -#define ACE_HAS_GPERF - -#define ACE_HAS_DIRENT - -#if defined (__ia64) -// On 64 bit platforms, the "long" type is 64-bits. Override the -// default 32-bit platform-specific format specifiers appropriately. -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") -#endif /* __ia64 */ - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_SIZEOF_WCHAR 4 - -#include "ace/post.h" - -// Enables use of POSIX termios struct -#define ACE_USES_NEW_TERMIOS - -// Use new pthread_attr_setstack -#if defined (__USE_XOPEN2K) && (__GLIBC__ > 2 || ( __GLIBC__ == 2 && __GLIBC_MINOR__ >=2)) -#define ACE_HAS_PTHREAD_SETSTACK -#endif /* __USE_XOPEN2K && glibc >2.2 */ - -#endif /* ACE_LINUX_COMMON_H */ diff --git a/ace/config-linux.h b/ace/config-linux.h deleted file mode 100644 index 6aa891c4335..00000000000 --- a/ace/config-linux.h +++ /dev/null @@ -1,73 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// The following configuration file is designed to work for Linux -// platforms using GNU C++. - -#ifndef ACE_CONFIG_LINUX_H -#define ACE_CONFIG_LINUX_H -#include "ace/pre.h" - -#include "ace/config-linux-common.h" - -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_AUTOMATIC_INIT_FINI - -#if !defined (ACE_MT_SAFE) -#define ACE_MT_SAFE 1 // JCEJ 12/22/96 #1 -#endif - -#if ACE_MT_SAFE -// Yes, we do have threads. -#define ACE_HAS_THREADS -// And they're even POSIX pthreads (LinuxThreads implementation) -#define ACE_HAS_PTHREADS - -#if !defined (ACE_HAS_PTHREADS_UNIX98_EXT) -# define ACE_LACKS_RWLOCK_T -#endif /* !ACE_HAS_PTHREADS_UNIX98_EXT */ - -// ... and the final standard even! -#define ACE_HAS_PTHREADS_STD -#define ACE_HAS_THREAD_SPECIFIC_STORAGE // jcej 12/22/96 #2 - -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS // JCEJ 1/7-8/96 - -#if defined(__GLIBC__) -// Platform supports reentrant functions (i.e., all the POSIX *_r -// functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) - // Older versions of glibc lacked reentrant netdb functions -# define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - - // glibc < 2.1 lacks pthread_attr_setstacksize() -# define ACE_LACKS_THREAD_STACK_SIZE -#endif /* (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) */ - -// uses ctime_r & asctime_r with only two parameters vs. three -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#endif - -#include /**/ - -#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) - // glibc 2.2.x or better has pthread_mutex_timedlock() -# define ACE_HAS_MUTEX_TIMEOUTS -# if !defined (_XOPEN_SOURCE) \ - || (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0) < 600) -// pthread_mutex_timedlock() prototype is not visible if _XOPEN_SOURCE -// is not >= 600 (i.e. for XPG6). -extern "C" int pthread_mutex_timedlock (pthread_mutex_t *mutex, - const struct timespec * abstime); -# endif /* _XOPEN_SOURCE && _XOPEN_SOURCE < 600 */ -#endif /* (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) */ - -#endif /* ACE_MT_SAFE */ - - -#include "ace/post.h" - -#endif /* ACE_CONFIG_LINUX_H */ diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h deleted file mode 100644 index add5e985f23..00000000000 --- a/ace/config-lynxos.h +++ /dev/null @@ -1,209 +0,0 @@ -// $Id$ - -// The following configuration file is designed to work for LynxOS, -// version 2.5.0 and later, using the GNU g++ compiler. - -// Note on why ACE_HAS_POSIX_SEM is not #defined: -// ACE_HAS_POSIX_SEM would cause native LynxOS mutexes and condition -// variables to be used. But, they don't appear to be intended to be -// used between processes. Without ACE_HAS_POSIX_SEM, ACE uses -// semaphores for all synchronization. Those can be used between -// processes - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#if defined (__GNUG__) -# if __GNUC_MINOR__ == 7 - -# include "ace/config-g++-common.h" - - // The g++ that's distributed with LynxOS 3.0.0 needs this. - // It won't hurt with 2.5.0. -# undef ACE_HAS_TEMPLATE_SPECIALIZATION -# elif __LYNXOS_SDK_VERSION <= 199603L - /* LynxOS <= 2.5.0 */ - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. - - // If ACE_HAS_STRING_CLASS is used with LynxOS 3.0.0, some - // executables, such as IOStream_Test, require linking with - // libg++. -# define ACE_HAS_STRING_CLASS - -# include "ace/config-g++-common.h" -# endif /* __GNUC_MINOR__ == 7 */ -#endif /* __GNUG__ */ - -#if defined (__x86__) - // PowerPC libraries don't seem to have alloca (), so only use with x86. -# define ACE_HAS_ALLOCA -# define ACE_HAS_ALLOCA_H -# define ACE_HAS_PENTIUM -#elif defined (__powerpc__) - // It looks like the default stack size is 15000. - // ACE's Recursive_Mutex_Test needs more. -# define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 - // This doesn't work on LynxOS 3.0.0, because it resets the TimeBaseRegister. - // # define ACE_HAS_POWERPC_TIMER -#endif /* __x86__ || __powerpc__ */ - -#define ACE_DEFAULT_BASE_ADDR ((char *) 0) -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_BROKEN_READV -#define ACE_HAS_BROKEN_SETRLIMIT -#define ACE_HAS_BROKEN_WRITEV -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_DIRENT -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_GNU_CSTRING_H -#define ACE_HAS_GPERF -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_LYNXOS_SIGNALS -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_GETBY -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_POLL -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_HAS_SEMUN -#define ACE_HAS_SHM_OPEN -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SOCKIO_H -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRBUF_T -#define ACE_HAS_STREAMS -#define ACE_HAS_STRERROR -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_SYS_SIGLIST -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_GETHOSTENT -#define ACE_LACKS_GETOPT_PROTO -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MKTEMP -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SIGINFO_H -#define ACE_LACKS_SI_ADDR -#define ACE_LACKS_SOME_POSIX_PROTOTYPES -#define ACE_LACKS_STRCASECMP -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_UCONTEXT_H -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_INET_ATON -#define ACE_MALLOC_ALIGN 8 -#define ACE_HAS_TYPENAME_KEYWORD -// Don't use MAP_FIXED, at least for now. -#define ACE_MAP_FIXED 0 -// LynxOS, through 3.0.0, does not support MAP_PRIVATE, so map it to -// MAP_SHARED. -#define ACE_MAP_PRIVATE ACE_MAP_SHARED -#define ACE_PAGE_SIZE 4096 -#define ACE_POLL_IS_BROKEN - -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# define _REENTRANT -#endif - -#if ACE_MT_SAFE == 1 - // Platform supports threads. -# define ACE_HAS_PTHREADS -# include -# if _POSIX_VERSION >= 199506L - // LynxOS 3.1.0 or greater -# define ACE_HAS_PTHREADS_STD - // Though there's a pthread_sigmask man page, there isn't a - // declaration in a system header file. -# include - extern "C" int pthread_sigmask (int, const sigset_t *, sigset_t *); -# else /* LynxOS < 3.1.0 */ -# define ACE_HAS_PTHREADS_DRAFT4 -# define ACE_HAS_STDARG_THR_DEST - // Without TSS emulation, you'll only have 3 native TSS keys, on - // LynxOS 3.0.0/ppc. -# define ACE_HAS_TSS_EMULATION -# endif /* LynxOS < 3.1.0 */ -# define ACE_HAS_THREADS -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_LACKS_NULL_PTHREAD_STATUS -# define ACE_LACKS_SETDETACH -# define ACE_LACKS_THREAD_PROCESS_SCOPING -# define ACE_LACKS_THREAD_STACK_ADDR - // This gets around Lynx broken macro calls resulting in "::0" -# define _POSIX_THREADS_CALLS -#endif /* ACE_MT_SAFE */ - -#define ACE_HAS_AIO_CALLS -#define ACE_POSIX_AIOCB_PROACTOR -// AIOCB Proactor works on Lynx. But it is not -// multi-threaded. -// Lynx OS 3.0.0 lacks POSIX call . So,we cannot use -// SIG Proactor also, with multiple threads. So, let us use the AIOCB -// Proactor. Once is available on Lynx, we can turn -// on SIG Proactor for this platform. -// #define ACE_POSIX_SIG_PROACTOR - -#define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1 - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// Looks like the modern compilers have support for namespaces. Or -// rather we dont support any compiler without this support. Need to -// get this macro off of ACE. -#define ACE_HAS_USING_KEYWORD - -// By default, don't include RCS Id strings in object code. -#if !defined (ACE_USE_RCSID) -# define ACE_USE_RCSID 0 -#endif /* ! ACE_USE_RCSID */ - -// System include files are not in sys/, this gets rid of warning. -#define __NO_INCLUDE_WARN__ - -extern "C" -{ - int getopt (int, char *const *, const char *); - int putenv (const char *); -} - -#if 0 -// The following are patches for LynxOS 4.0.0, which we'll add as soon -// as we know the right incantations to avoid breaking earlier -// versions of LynxOS! - -// "changes signedness" error (OS.i and many other files) -#define ACE_HAS_SOCKLEN_T - -// LSOCK.cpp uses a macro from param.h, not included -#define ALIGNBYTES (sizeof(int) - 1) -#define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES) - -// Linking problems with alloca -#undef ACE_HAS_ALLOCA -#undef ACE_HAS_ALLOCA_H - -// Requested for example: $ACE_ROOT/examples/IPC_SAP/DEV_SAP -#define ACE_HAS_TERM_IOCTLS -#endif /* 0 */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-m88k.h b/ace/config-m88k.h deleted file mode 100644 index 19f5f30886c..00000000000 --- a/ace/config-m88k.h +++ /dev/null @@ -1,227 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for Motorola -// 88k SVR4 platforms using pthreads from Florida State (ACE_HAS_FSU_PTHREADS). - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" - // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION. - // Maybe it will work? -# undef ACE_HAS_TEMPLATE_SPECIALIZATION -#endif /* __GNUG__ */ - -#if !defined (m88k) -#define m88k -#endif - -extern "C" void pthread_init(); - -#define PTHREAD_STACK_MIN 1024 - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#if !defined (IP_ADD_MEMBERSHIP) -#define IP_ADD_MEMBERSHIP 0x13 -#endif /* m88k */ - -#if !defined (IP_DROP_MEMBERSHIP) -#define IP_DROP_MEMBERSHIP 0x14 -#endif /* m88k */ - -struct sched_param -{ - int sched_priority; - int prio; -}; - -// This seems to be necessary for m88k. -struct ip_mreq -{ - struct in_addr imr_multiaddr; // IP multicast address of the group - struct in_addr imr_interface; // local IP address of the interface -}; - -#if !defined (ACE_HAS_FSU_PTHREADS) -# define ACE_HAS_FSU_PTHREADS -#endif -#if !defined (ACE_HAS_PTHREADS_DRAFT6) -# define ACE_HAS_PTHREADS_DRAFT6 -#endif - -// Added for compilation on the m88k -#if defined (m88k) -# define ACE_LACKS_T_ERRNO -# define ACE_LACKS_MADVISE -# define ACE_HAS_GNU_CSTRING_H -#endif /* m88k */ - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_BROKEN_SENDMSG - -// The SunOS 5.x version of rand_r is inconsistent with the header files... -#define ACE_HAS_BROKEN_RANDR - -// Platform supports system configuration information. -#define ACE_HAS_SYSINFO - -// Platform supports the POSIX regular expression library. -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -#if !defined (ACE_HAS_FSU_PTHREADS) -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS -#endif /* ACE_HAS_FSU_PTHREADS */ - -// Platform has terminal ioctl flags like TCGETS and TCSETS. -#define ACE_HAS_TERM_IOCTLS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -#if !defined (m88k) -// Compiler/platform supports SunOS high resolution timers. -# define ACE_HAS_HI_RES_TIMER -#endif /* m88k */ - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -#define ACE_HAS_ALLOCA - -#if !defined (m88k) -// Compiler/platform has -#define ACE_HAS_ALLOCA_H -#endif /* m88k */ - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -#if !defined (m88k) -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T -#endif /* m88k */ - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_SVR4_SIGNAL_T - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -#if !defined (m88k) -// Compiler/platform supports sys_siglist array. -#define ACE_HAS_SYS_SIGLIST -#endif /* m88k */ - -/* Turn off the following five defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_HAS_PTHREADS -#define ACE_LACKS_RWLOCK_T - -// Platform supports threads. -#define ACE_HAS_THREADS - -#if defined (ACE_HAS_FSU_PTHREADS) -#define ACE_LACKS_THREAD_STACK_ADDR -#endif /* ACE_HAS_FSU_PTHREADS */ - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Reactor detects deadlock -// #define ACE_REACTOR_HAS_DEADLOCK_DETECTION - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-macosx.h b/ace/config-macosx.h deleted file mode 100644 index 33d7c7779f8..00000000000 --- a/ace/config-macosx.h +++ /dev/null @@ -1,195 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file is designed to work with the MacOS X operating system. - -#ifndef ACE_CONFIG_MACOSX_H -#define ACE_CONFIG_MACOSX_H - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - -#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") - -#if defined (ACE_HAS_PENTIUM) -# undef ACE_HAS_PENTIUM -#endif /* ACE_HAS_PENTIUM */ - -#if !defined (_THREAD_SAFE) -#define _THREAD_SAFE -#endif /* _THREAD_SAFE */ - -#define ACE_HAS_GPERF -#define ACE_HAS_POSIX_SEM - -//#define ACE_HAS_SVR4_TLI - -#define ACE_HAS_MEMCHR - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler/platform supports SVR4 signal typedef -#define ACE_HAS_SVR4_SIGNAL_T - -//Platform/compiler has the sigwait(2) prototype -#define ACE_HAS_SIGWAIT - -//Platform supports sigsuspend() -#define ACE_HAS_SIGSUSPEND - -//Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., SCO and FreeBSD) -#define ACE_HAS_SIG_MACROS - -//#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_LACKS_GETPGID -#define ACE_LACKS_RWLOCK_T - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -//? -#define ACE_LACKS_SIGSET - -#define ACE_NEEDS_SCHED_H - -// Use of is deprecated. -#define ACE_LACKS_MALLOC_H - -#define ACE_HAS_ALT_CUSERID - -// Platform supports POSIX timers via struct timespec. -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_UALARM - -// Platform defines struct timespec but not timespec_t -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_STRRECVFD - -#define ACE_HAS_SIN_LEN - -#define ACE_HAS_ANSI_CASTS - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -//#define ACE_HAS_SYSV_IPC - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform supports alloca(). -#define ACE_HAS_ALLOCA - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Explicit dynamic linking permits "lazy" symbol resolution -//#define ACE_HAS_RTLD_LAZY_V - -// platform supports POSIX O_NONBLOCK semantics -#define ACE_HAS_POSIX_NONBLOCK - -// platform supports IP multicast -#define ACE_HAS_IP_MULTICAST -#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 - -//platform supports snprintf () -#define ACE_HAS_SNPRINTF - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Defines the page size of the system. -#define ACE_HAS_GETPAGESIZE - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports SVR4 gettimeofday() prototype -#define ACE_HAS_SUNOS4_GETTIMEOFDAY -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_LACKS_SYSV_MSG_H -#define ACE_HAS_MSG -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_NONCONST_MSGSND - -// Thread specific settings -// Yes, we do have threads. -#define ACE_HAS_THREADS -// And they're even POSIX pthreads -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* ! ACE_MT_SAFE */ -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_STD -#define ACE_HAS_PTHREAD_KILL -#define ACE_HAS_PTHREAD_CANCEL -#define ACE_HAS_PTHREAD_SIGMASK -#define ACE_LACKS_THREAD_PROCESS_SCOPING -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_DIRENT -#define ACE_LACKS_SYSTIME_H - -#define ACE_LACKS_SETSCHED -//#define ACE_HAS_RECURSIVE_MUTEXES - -#define ACE_HAS_TERM_IOCTLS -#define TCGETS TIOCGETA -#define TCSETS TIOCSETA - -#define ACE_HAS_SEMUN -#define ACE_HAS_SIGINFO_T -#define ACE_LACKS_SIGINFO_H -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_GETIFADDRS -#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -#define ACE_LACKS_UNNAMED_SEMAPHORE - -// dlcompat package (not part of base Darwin) is needed for dlopen(). -// You may download directly from sourceforge and install or use fink -// Fink installer puts libraries in /sw/lib and headers in /sw/include -// In order to install dlcompat do the following: -// - download fink from http://fink.sf.net -// - type: -// fink install dlcompat -// as of Dec 2002, if you use fink you will need to uncomment the next line -//#define ACE_NEEDS_DL_UNDERSCORE -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("DYLD_LIBRARY_PATH") -#define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dylib") -#define ACE_LACKS_DLCLOSE - -// gperf seems to need this -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#if defined(__APPLE_CC__) && (__APPLE_CC__ < 1173) -#error "Compiler must be upgraded, see http://developer.apple.com" -#endif /* __APPLE_CC__ */ - -#endif /* ACE_CONFIG_MACOSX_H */ diff --git a/ace/config-minimal.h b/ace/config-minimal.h deleted file mode 100644 index 11d66eb7b01..00000000000 --- a/ace/config-minimal.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file is designed to build only the minimal -// ACE_OS adaptation layer. - -#ifndef ACE_CONFIG_MINIMAL_H -#define ACE_CONFIG_MINIMAL_H -#include "ace/pre.h" - -#define ACE_HAS_MINIMAL_ACE_OS - -// Only instantiate the ACE_OS_Object_Manager. -#define ACE_MAIN_OBJECT_MANAGER \ - ACE_OS_Object_Manager ace_os_object_manager; - -#if !defined(ACE_USE_THREAD_MANAGER_ADAPTER) - // To prevent use of ACE_Thread_Exit functions in - // ACE_Thread_Adapter::invoke (). -# define ACE_USE_THREAD_MANAGER_ADAPTER -#endif /* ! ACE_USE_THREAD_MANAGER_ADAPTER */ - -#if defined (ACE_ASSERT) -# undef ACE_ASSERT -#endif /* ACE_ASSERT */ -#define ACE_ASSERT(x) - -#if defined (ACE_DEBUG) -# undef ACE_DEBUG -#endif /* ACE_DEBUG */ -#define ACE_DEBUG(x) - -#if defined (ACE_ERROR) -# undef ACE_ERROR -#endif /* ACE_ERROR */ -#define ACE_ERROR(x) - -#include "ace/post.h" -#endif /* ACE_CONFIG_MINIMAL_H */ diff --git a/ace/config-mit-pthread.h b/ace/config-mit-pthread.h deleted file mode 100644 index 03eda51c41b..00000000000 --- a/ace/config-mit-pthread.h +++ /dev/null @@ -1,53 +0,0 @@ -// $Id$ - -#ifndef ACE_CONFIG_MIT_PTHREAD_H -#define ACE_CONFIG_MIT_PTHREAD_H -#include "ace/pre.h" - -// Platform uses int for select() rather than fd_set. -#if !defined(ACE_HAS_SELECT_H) -#define ACE_HAS_SELECT_H -#endif - -// Threads -#define ACE_HAS_THREADS -#if !defined (ACE_MT_SAFE) - #define ACE_MT_SAFE 1 -#endif -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_STD -#define ACE_LACKS_PTHREAD_CANCEL -#define ACE_HAS_PTHREAD_SIGMASK -#define ACE_HAS_SIGWAIT -//#define ACE_HAS_PTHREAD_YIELD_VOID_PTR -//#define ACE_HAS_PTHREAD_ATTR_INIT -//#define ACE_HAS_PTHREAD_ATTR_DESTROY -#define ACE_LACKS_THREAD_PROCESS_SCOPING -//#define ACE_LACKS_THREAD_STACK_ADDR -// If ACE doesn't compile due to the lack of these methods, please -// send email to schmidt@cs.wustl.edu reporting this. -// #define ACE_LACKS_CONDATTR_PSHARED -// #define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SETSCHED - -#include -#if defined(_M_UNIX) -#include -#endif - -#define ACE_LACKS_TIMEDWAIT_PROTOTYPES -#define ACE_HAS_RECV_TIMEDWAIT -#define ACE_HAS_RECVFROM_TIMEDWAIT -#define ACE_HAS_RECVMSG_TIMEDWAIT -#define ACE_HAS_SEND_TIMEDWAIT -#define ACE_HAS_SENDTO_TIMEDWAIT -#define ACE_HAS_SENDMSG_TIMEDWAIT -#define ACE_HAS_READ_TIMEDWAIT -#define ACE_HAS_READV_TIMEDWAIT -#define ACE_HAS_WRITE_TIMEDWAIT -#define ACE_HAS_WRITEV_TIMEDWAIT - -#include "ace/post.h" -#endif /* ACE_CONFIG_MIT_PTHREAD_H */ diff --git a/ace/config-mklinux.h b/ace/config-mklinux.h deleted file mode 100644 index 31957b70be0..00000000000 --- a/ace/config-mklinux.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for MkLinux -// platforms using GNU C++. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#include "ace/config-linux-common.h" - -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_AUTOMATIC_INIT_FINI - -#undef ACE_HAS_SOCKLEN_T -#define ACE_HAS_SIZET_SOCKET_LEN - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-mvs.h b/ace/config-mvs.h deleted file mode 100644 index 51e8a86e843..00000000000 --- a/ace/config-mvs.h +++ /dev/null @@ -1,122 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Config file for MVS with OpenEdition - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// The following #defines are hacks to get around things -// that seem to be missing or different in MVS land -#define MAXPATHLEN 1024 /* sys/param.h not on MVS */ -#define NSIG 44 /* missing from Signal.h */ -#define MAXHOSTNAMELEN 256 /* missing form netdb.h */ -#define howmany __howmany /* MVS uses different names than most others */ -#define fd_mask __fd_mask -#define MAXNAMLEN __DIR_NAME_MAX -#define ERRMAX __sys_nerr -#if defined (log) /* log is a macro in math.h */ -# undef log /* conflicts with log function in ACE */ -#endif /* log */ - -#define ACE_MVS - -// Preprocesor requires an extra argument -#define ACE_CC_PREPROCESSOR_ARGS "-+ -E" - -// See the README file in this directory -// for a description of the following ACE_ macros - -#if __COMPILER_VER__ >= 0x21020000 /* OS/390 r2 or higher */ -# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -# define ACE_HAS_UCONTEXT_T -#else /* __COMPILER_VER__ < 0x21020000 */ -# define ACE_LACKS_UCONTEXT_H -#endif /* __COMPILER_VER__ < 0x21020000 */ - -#if __COMPILER_VER__ < 0x22060000 /* before OS/390 r2.6 */ -# define ACE_LACKS_LONGLONG_T -#endif /* __COMPILER_VER__ < 0x22060000 */ - -#define ACE_HAS_BROKEN_CTIME -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_DIRENT -#define ACE_HAS_EXCEPTIONS -#define ACE_HAS_GETPAGESIZE -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_LIMITED_RUSAGE_T -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_NONSCALAR_THREAD_KEY_T -#define ACE_HAS_POLL -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_DRAFT6 -#define ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP -#define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIG_C_FUNC -#define ACE_HAS_SIN_LEN -#define ACE_HAS_SIZET_SOCKET_LEN -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRERROR -#define ACE_HAS_STRINGS -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_TEMPLATE_SPECIALIZATION -#define ACE_HAS_THREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_THR_C_DEST -#define ACE_HAS_THR_C_FUNC -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#define ACE_HAS_UALARM -#define ACE_HAS_UTIME -#define ACE_HAS_VOIDPTR_MMAP -#define ACE_HAS_VOIDPTR_SOCKOPT -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_IOSTREAM_FX -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MALLOC_H -#define ACE_LACKS_MSGBUF_T -#define ACE_LACKS_PARAM_H -#define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SETSCHED -#define ACE_LACKS_SIGINFO_H -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSTIME_H -#define ACE_LACKS_SYS_NERR -#define ACE_LACKS_TCP_H -#define ACE_LACKS_THREAD_PROCESS_SCOPING -#define ACE_LACKS_THREAD_STACK_ADDR -#define ACE_LACKS_TIMESPEC_T - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_NEEDS_DEV_IO_CONVERSION - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_SIZEOF_FLOAT 4 -#define ACE_SIZEOF_DOUBLE 8 -#define ACE_SIZEOF_LONG_DOUBLE 16 - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h deleted file mode 100644 index ab5eadae6e7..00000000000 --- a/ace/config-netbsd.h +++ /dev/null @@ -1,184 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ***** This configuration file is still under testing. ***** - -// The following configuration file is designed to work for NetBSD -// platforms using GNU g++. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// ******************************************************** -// uncomment next line if you are using FreeBSD 2.1.x[R] -// #define FreeBSD_2_1 -// ******************************************************** -#define ACE_NETBSD - -#define ACE_SIZEOF_LONG_DOUBLE 12 - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - -// #define ACE_HAS_BROKEN_NETBSD_MSYNC - -// Platform specific directives -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_LACKS_RWLOCK_T -#define ACE_HAS_SIG_MACROS -#define ACE_HAS_CHARPTR_DL -#define ACE_USES_ASM_SYMBOL_IN_DLSYM - -// NetBSD appears to have dirent support. -#define ACE_HAS_DIRENT - -// NetBSD appears to have a sigset_t type. -// #define ACE_LACKS_SIGSET - -// This is for 2.1.x only. By default, gcc defines __FreeBSD__ automatically -#if defined(FreeBSD_2_1) - -#define ACE_HAS_CPLUSPLUS_HEADERS - -// This is to fix the nested struct if_data definition on FreeBSD 2.1.x -#include -#include -struct if_data { -/* generic interface information */ - u_char ifi_type; /* ethernet, tokenring, etc */ - u_char ifi_physical; /* e.g., AUI, Thinnet, 10base-T, etc */ - u_char ifi_addrlen; /* media address length */ - u_char ifi_hdrlen; /* media header length */ - u_long ifi_mtu; /* maximum transmission unit */ - u_long ifi_metric; /* routing metric (external only) */ - u_long ifi_baudrate; /* linespeed */ -/* volatile statistics */ - u_long ifi_ipackets; /* packets received on interface */ - u_long ifi_ierrors; /* input errors on interface */ - u_long ifi_opackets; /* packets sent on interface */ - u_long ifi_oerrors; /* output errors on interface */ - u_long ifi_collisions; /* collisions on csma interfaces */ - u_long ifi_ibytes; /* total number of octets received */ - u_long ifi_obytes; /* total number of octets sent */ - u_long ifi_imcasts; /* packets received via multicast */ - u_long ifi_omcasts; /* packets sent via multicast */ - u_long ifi_iqdrops; /* dropped on input, this interface */ - u_long ifi_noproto; /* destined for unsupported protocol */ - struct timeval ifi_lastchange;/* time of last administrative ch -ange */ -} ; - -// this is a hack, but since this only occured in FreeBSD 2.1.x, -// I guess it is ok. -#define ACE_HAS_BROKEN_TIMESPEC_MEMBERS - -#endif /* defined FreeBSD_2_1 */ - -// Platform supports POSIX timers via struct timespec. -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_UALARM - -// Platform defines struct timespec but not timespec_t -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_SYSTIME_H - -#define ACE_LACKS_STRRECVFD - -#define ACE_HAS_SIN_LEN - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -#if !defined(FreeBSD_2_1) -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#endif /* defined FreeBSD_2_1 */ - -// Compiler/platform supports SVR4 signal typedef -#define ACE_HAS_SVR4_SIGNAL_T - -// Compiler/platform supports alloca(). -#define ACE_HAS_ALLOCA - -// Compiler/platform supports SVR4 dynamic linking semantics.. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Explicit dynamic linking permits "lazy" symbol resolution -#define ACE_HAS_RTLD_LAZY_V - -// platform supports POSIX O_NONBLOCK semantics -#define ACE_HAS_POSIX_NONBLOCK - -// platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - -// Compiler/platform has -//#define ACE_HAS_ALLOCA_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler/platform supports sys_siglist array. -// *** This refers to (_sys_siglist) instead of (sys_siglist) -// #define ACE_HAS_SYS_SIGLIST - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports SVR4 gettimeofday() prototype -#define ACE_HAS_SUNOS4_GETTIMEOFDAY -// #define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_HAS_MSG -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_LACKS_GETHOSTENT - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-openbsd.h b/ace/config-openbsd.h deleted file mode 100644 index f0edabffd19..00000000000 --- a/ace/config-openbsd.h +++ /dev/null @@ -1,237 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for OpenBSD -// platforms using GNU g++. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if defined (ACE_HAS_THREADS) -#include /**/ -#endif /* ACE_HAS_THREADS */ - -#include "ace/config-posix.h" - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#define ACE_SIZEOF_LONG_DOUBLE 12 - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - - -// Platform specific directives -// gcc defines __OpenBSD__ automatically for us. -#if defined (ACE_HAS_THREADS) -#if !defined (_THREAD_SAFE) -#define _THREAD_SAFE -#endif /* _THREAD_SAFE */ - -// Check if pthreads and native exceptions are being used together. -// This causes SEGVs to tbe thrown somewhat randomly for some -// reason. According to newsgroup postings, it appears to be an -// OpenBSD or gcc bug. -#if defined (ACE_USES_NATIVE_EXCEPTIONS) -#error "OpenBSD pthreads and native exceptions currently do not work. See OpenBSD bug #1750" -#endif /* ACE_USES_NATIVE_EXCEPTIONS */ - -#endif /* ACE_HAS_THREADS */ - -#define ACE_HAS_GPERF - -// Platform specific directives -/* Are the following true? */ -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID - -#define ACE_HAS_ALT_CUSERID -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS - -#define ACE_LACKS_RWLOCK_T -#define ACE_HAS_SIG_MACROS -#define ACE_HAS_CHARPTR_DL -#define ACE_HAS_DIRENT -#define ACE_USES_ASM_SYMBOL_IN_DLSYM - -#define ACE_LACKS_UCONTEXT_H - - -// OpenBSD has sigwait defined -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIGINFO_T - -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS -#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -#define ACE_HAS_SOCKLEN_T - -#define ACE_HAS_POLL - -// Use of is deprecated. -#define ACE_LACKS_MALLOC_H - -// NetBSD appears to have a sigset_t type. -// #define ACE_LACKS_SIGSET - -// Platform supports POSIX timers via struct timespec. -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_UALARM - -// Platform defines struct timespec but not timespec_t -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_SYSTIME_H - -#define ACE_LACKS_STRRECVFD - -#define ACE_HAS_SIN_LEN - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// OpenBSD supports the getifaddrs interface -#define ACE_HAS_GETIFADDRS - -// Compiler/platform supports SVR4 signal typedef -#define ACE_HAS_SVR4_SIGNAL_T -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform supports alloca(). -#define ACE_HAS_ALLOCA - -// Compiler/platform supports SVR4 dynamic linking semantics.. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Explicit dynamic linking permits "lazy" symbol resolution -#define ACE_HAS_RTLD_LAZY_V - -// platform supports POSIX O_NONBLOCK semantics -#define ACE_HAS_POSIX_NONBLOCK - -// platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - -// Compiler/platform has -//#define ACE_HAS_ALLOCA_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler/platform supports sys_siglist array. -// *** This refers to (_sys_siglist) instead of (sys_siglist) -// #define ACE_HAS_SYS_SIGLIST - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports SVR4 gettimeofday() prototype -#define ACE_HAS_SUNOS4_GETTIMEOFDAY -// #define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -//#define ACE_HAS_SIG_C_FUNC - -// OpenBSD's dlsym call segfaults when passed an invalid handle. -// It seems as if most other OSs detect this and just report an -// error. -#define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_HAS_MSG -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_NONCONST_MSGSND - -#ifdef ACE_HAS_THREADS -// Thread specific settings - -// And they're even POSIX pthreads -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* ! ACE_MT_SAFE */ -#endif /* ACE_HAS_THREADS */ - -#define ACE_HAS_SIGWAIT - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_LACKS_THREAD_PROCESS_SCOPING -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_DIRENT - -#if !defined (ACE_HAS_THREADS) -// OpenBSD really has readdir_r () in single threaded mode, -// but the #ifdefs in OS.i select one with the wrong parameter -// sets if the ACE_HAS_POSIX_STD isn't defined (which is defined -// when ACE_HAS_THREADS is defined.) - -#define ACE_LACKS_READDIR_R - -#endif /* ! ACE_HAD_THREADS */ - -#define ACE_HAS_TERM_IOCTLS -#define ACE_USES_NEW_TERMIOS_STRUCT -#define TCGETS TIOCGETA -#define TCSETS TIOCSETA - -// OpenBSD actually has the clearerr call, but it causes a -// bogus compiler syntax error. -#define ACE_LACKS_CLEARERR - -#define ACE_HAS_MKSTEMP - -#define ACE_HAS_SNPRINTF - -// OpenBSD 3.2 lacks sched_setscheduler (see /usr/src/lib/libc_r/TODO) -#define ACE_LACKS_SETSCHED - -// OpenBSD supports IPv6 by default, but ACE IPv6 code -// has compile errors. -//#define ACE_HAS_IPV6 - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-osf1-3.2.h b/ace/config-osf1-3.2.h deleted file mode 100644 index 6412896a0a3..00000000000 --- a/ace/config-osf1-3.2.h +++ /dev/null @@ -1,188 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for OSF1 3.2 -// platforms with the DEC 5.1 C++ compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define ACE_LACKS_SETSCHED -#define ACE_LACKS_RWLOCK_T -// DF: this platform uses Digital's CXX compiler -#define DEC_CXX - -// DF: DEC's CXX supports explicit template specialization. -#define ACE_HAS_TEMPLATE_SPECIALIZATION - -// DF: 3.2 has getpgid but no prototype defined anywhere. So we cheat -// and declare it here. -extern "C" pid_t getpgid (pid_t); - -// DF: ACE_HAS_STRING_CLASS seems the right thing to do... -#define ACE_HAS_STRING_CLASS - -// DF: Seems apropriate since this is a new compiler... -#if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#define ACE_HAS_BROKEN_MSG_H -#define ACE_LACKS_SYSV_MSQ_PROTOS - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports -#define ACE_HAS_PROC_FS - -#define ACE_HAS_UALARM - -// If ACE doesn't compile due to the lack of these methods, please -// send email to schmidt@cs.wustl.edu reporting this. -// #define ACE_LACKS_CONDATTR_PSHARED -// #define ACE_LACKS_MUTEXATTR_PSHARED - -// Platform lacks support for stack address information -#define ACE_LACKS_THREAD_STACK_ADDR - -// Platform lacks thread process scoping -#define ACE_LACKS_THREAD_PROCESS_SCOPING - -// Platform has non-POSIX setkind and other functions. -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_HAS_SETKIND_NP - -// Platform supports POSIX 1.b clock_gettime () -#define ACE_HAS_CLOCK_GETTIME - -// Platform defines MAP_FAILED as a long constant. -#define ACE_HAS_LONG_MAP_FAILED - -// Platform's implementation of sendmsg() has a non-const msgheader parameter. -#define ACE_HAS_BROKEN_SENDMSG - -// Platform's implementation of writev() has a non-const iovec parameter. -#define ACE_HAS_BROKEN_WRITEV - -// Platform's implementation of setlrmit() has a non-const rlimit parameter. -#define ACE_HAS_BROKEN_SETRLIMIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform correctly calls init()/fini(). -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports C++ headers -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Platform supports the OSF ACE_TLI timod STREAMS module. -#define ACE_HAS_OSF_TIMOD_H - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform defines struct timespec in -#define ACE_HAS_BROKEN_POSIX_TIME - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// ACE supports POSIX Pthreads. OSF/1 3.2 has draft 4 -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_DRAFT4 -#define ACE_HAS_THREAD_SELF - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Added 6/13/95, 1 line -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform has ssize_t. -#define ACE_HAS_SSIZE_T - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform has 64bit longs and 32bit ints... -// NOTE: ACE_HAS_64BIT_LONGS is deprecated. Instead, use ACE_SIZEOF_LONG == 8. -#define ACE_HAS_64BIT_LONGS - -// Platform supports STREAM pipes. -// #define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform support OSF1 gettimeofday -#define ACE_HAS_OSF1_GETTIMEOFDAY - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_SVR4_SIGNAL_T - -// Compiler/platform has strerror(). -#define ACE_HAS_STRERROR - -// ACE supports threads. -#define ACE_HAS_THREADS - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform supports ACE_TLI timod STREAMS module. -// #define ACE_HAS_TIMOD_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_NEEDS_DEV_IO_CONVERSION - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 8192 -#define ACE_HAS_GETPAGESIZE - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h deleted file mode 100644 index db4c7b0652d..00000000000 --- a/ace/config-osf1-4.0.h +++ /dev/null @@ -1,191 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// NOTE: if you are using Digital UNIX V4.0f or later, you must -// use config-tru64.h instead of directly using this config file. - -// The following configuration file is designed to work for the -// Digital UNIX V4.0a through V4.0d with either the GNU g++, DEC -// cxx 5.4 and later, Rational RCC (2.4.1) compilers, or KAI 3.3 -// compilers. It is configured to use the IEEE Std 1003.1c-1995, -// POSIX System Application Program Interface, or DCE threads (with -// cxx only); it automatically selects the proper thread interface -// depending on whether the cxx -pthread or -threads option was -// specified. By 4.0a, the version is meant that is called "V4.0 464" -// by uname -a. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -/*clearerr is not defined when _REENTRANT is not defined*/ -#if ACE_MT_SAFE == 0 -#define ACE_LACKS_CLEARERR -#endif /* ACE_MT_SAFE == 0 */ - -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* ! ACE_MT_SAFE */ - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ! ACE_NTRACE */ - -// Include unistd.h to define _POSIX_C_SOURCE. -#include - -// Configuration-specific #defines: -// 1) g++ or cxx -// 2) pthreads or DCE threads -#if defined (__GNUG__) - // g++ with pthreads - - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS - -# include "ace/config-g++-common.h" - -# define ACE_HAS_GNU_CSTRING_H -# define ACE_HAS_REENTRANT_FUNCTIONS -#elif defined (__DECCXX) - -# define ACE_CONFIG_INCLUDE_CXX_COMMON -# include "ace/config-cxx-common.h" - -#elif defined (__rational__) -# define ACE_HAS_REENTRANT_FUNCTIONS -# define ACE_HAS_STRING_CLASS -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_SIGNED_CHAR - - // Exceptions are enabled by platform_osf1_4.0_rcc.GNU. -# define ACE_HAS_ANSI_CASTS -# define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_SPECIALIZATION -# define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_USING_KEYWORD -#elif defined (__KCC) -# define ACE_HAS_STRING_CLASS -# include "ace/config-kcc-common.h" -#else -# error unsupported compiler on Digital Unix -#endif /* ! __GNUG__ && ! __DECCXX && ! __rational__ && !_KCC */ - -#if (DIGITAL_UNIX >= 0x400) && (DIGITAL_UNIX < 0x500) -#define ACE_LACKS_PREAD_PROTOTYPE -#endif // (DIGITAL_UNIX >= 0x400) && (DIGITAL_UNIX < 0x500) - -#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 199506L) - // cxx with POSIX 1003.1c-1995 threads (pthreads) . . . -# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -# define ACE_HAS_BROKEN_IF_HEADER -# define ACE_HAS_BROKEN_R_ROUTINES -#if (ACE_MT_SAFE != 0) -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_STD -# define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#endif /* ACE_MT_SAFE != 0 */ -# define ACE_LACKS_T_ERRNO -# define ACE_POLL_IS_BROKEN -# if !defined (DIGITAL_UNIX) -# define DIGITAL_UNIX 0x400 -# endif /* ! DIGITAL_UNIX */ - // DJT removed this due to some minor issues related to the - // definitions of timestruc_t and tid_t in procfs.h not sure what - // functionality is lost? Platform supports - //#define ACE_HAS_PROC_FS -#else /* _POSIX_C_SOURCE < 199506L */ - // cxx with DCE threads . . . - // This ACE configuration is only supported with cxx; it has not been - // test with g++. -# define ACE_HAS_BROKEN_MSG_H -# define ACE_HAS_BROKEN_POSIX_TIME -#if (ACE_MT_SAFE != 0) -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_DRAFT4 -# define ACE_HAS_THREAD_SELF -# define ACE_LACKS_THREAD_PROCESS_SCOPING -# define ACE_LACKS_PTHREAD_THR_SIGSETMASK -# define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#endif -# define ACE_HAS_GETPAGESIZE -# define ACE_HAS_PROC_FS -# define ACE_HAS_SETKIND_NP -# define ACE_LACKS_CONST_TIMESPEC_PTR -# define ACE_LACKS_READDIR_R -# define ACE_LACKS_SETSCHED -# define ACE_LACKS_SIGNED_CHAR -# define ACE_LACKS_SYSV_MSQ_PROTOS -#endif /* _POSIX_C_SOURCE < 199506L */ - -#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -// NOTE: ACE_HAS_64BIT_LONGS is deprecated. Instead, use ACE_SIZEOF_LONG == 8. -#define ACE_HAS_64BIT_LONGS -#define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_BROKEN_SETRLIMIT -#define ACE_HAS_BROKEN_T_ERROR -#define ACE_HAS_BROKEN_WRITEV -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_DIRENT -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_GPERF -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_LLSEEK -#define ACE_HAS_LONG_MAP_FAILED -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_OSF1_GETTIMEOFDAY -#define ACE_HAS_OSF_TIMOD_H -#define ACE_HAS_POLL -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_PRIOCNTL -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRBUF_T -#define ACE_HAS_STREAMS -#define ACE_HAS_STRERROR -#define ACE_HAS_STRPTIME -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_SVR4_SIGNAL_T -#define ACE_HAS_SYSCALL_H -#define ACE_HAS_SYSV_IPC -#if (ACE_MT_SAFE == 0) -// clearerr is not defined when _REENTRANT is not defined -#define ACE_LACKS_CLEARERR -#else /* ACE_MT_SAFE != 0 */ -#define ACE_HAS_THREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_LACKS_THREAD_STACK_ADDR -#endif /* ACE_MT_SAFE != 0 */ -#define ACE_HAS_TIUSER_H -#define ACE_HAS_TLI -#define ACE_HAS_TLI_PROTOTYPES -#define ACE_HAS_UALARM -#define ACE_HAS_UCONTEXT_T -#define ACE_LACKS_PRI_T -#define ACE_LACKS_RWLOCK_T -#define ACE_PAGE_SIZE 8192 -#define ACE_HAS_SIGTIMEDWAIT -#define ACE_HAS_SIGSUSPEND - -// DJT 6/10/96 All these broken macro's can now be removed with the -// approporiate ordering of the include files. The Platinum release -// now temporarily supports both forms. Platform's implementation of -// sendmsg() has a non-const msgheader parameter. -#define ACE_HAS_BROKEN_SENDMSG -#define ACE_HAS_IDTYPE_T - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-pharlap.h b/ace/config-pharlap.h deleted file mode 100644 index 51433b4fe77..00000000000 --- a/ace/config-pharlap.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file is for use with the PharLap Realtime ETS Kernel. -// It has been tested with PharLap TNT Embedded ToolSuite version 9.1. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define ACE_HAS_PHARLAP -// Some features are only available with the Realtime edition of ETS. -// Assume that if using ACE, the realtime version is also being used, but -// allow it to be turned off as well. -#ifndef ACE_HAS_PHARLAP_RT -# define ACE_HAS_PHARLAP_RT -#else -# if (ACE_HAS_PHARLAP_RT == 0) -# undef ACE_HAS_PHARLAP_RT -# endif -#endif - -// Fortunately, PharLap ETS offers much of the Win32 API. But it's still on -// WinNT 3.5, Winsock 1.1 -#define ACE_HAS_WINNT4 0 -#define ACE_HAS_WINSOCK2 0 - -// The TSS implementation doesn't pass muster on the TSS_Test, but it works -// well with ACE's TSS emulation. -#define ACE_HAS_TSS_EMULATION - -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_TCP_NODELAY -#define ACE_LACKS_MSG_WFMO - -// There's no host table, by default. So using "localhost" won't work. -// If your system does have the ability to use "localhost" and you want to, -// define it before including this file. -#if !defined (ACE_LOCALHOST) -# define ACE_LOCALHOST "127.0.0.1" -#endif /* ACE_LOCALHOST */ - -// Don't know how to get the page size at execution time. This is most likely -// the correct value. -#define ACE_PAGE_SIZE 4096 - -// Let the config-win32.h file do its thing -#undef ACE_CONFIG_H -#include "ace/config-win32.h" -#undef ACE_HAS_WCHAR - -#include /**/ -#if defined (ACE_HAS_PHARLAP_RT) -# include /**/ -#endif /* ACE_HAS_PHARLAP_RT */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-posix.h b/ace/config-posix.h deleted file mode 100644 index fdf6a7b2fd7..00000000000 --- a/ace/config-posix.h +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_CONFIG_POSIX_H -#define ACE_CONFIG_POSIX_H - -#include - -/* The following POSIX constants are defined after is - * included. They are documented in: - * http://www.opengroup.org/onlinepubs/007904975/basedefs/unistd.h.html - */ -#if defined(_POSIX_REALTIME_SIGNALS) && (_POSIX_REALTIME_SIGNALS-0 != -1 ) -# if !defined(ACE_HAS_POSIX_REALTIME_SIGNALS) -# define ACE_HAS_POSIX_REALTIME_SIGNALS -# endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -#endif /* _POSIX_REALTIME_SIGNALS */ - -#if defined(_POSIX_ASYNCHRONOUS_IO) && (_POSIX_ASYNCHRONOUS_IO-0 != -1 ) -# if !defined(ACE_HAS_AIO_CALLS) -# define ACE_HAS_AIO_CALLS -# endif /* ACE_HAS_AIO_CALLS */ -#endif /* _POSIX_ASYNCHRONOUS_IO */ - -#if defined(_POSIX_SEMAPHORES) && (_POSIX_SEMAPHORES-0 != -1 ) -# if !defined(ACE_HAS_POSIX_SEM) -# define ACE_HAS_POSIX_SEM -# endif /* ACE_HAS_POSIX_SEM */ -#endif /* ACE_HAS_POSIX_SEM */ - -#if defined(_POSIX_MESSAGE_PASSING) && (_POSIX_MESSAGE_PASSING-0 != -1 ) -# if !defined(ACE_HAS_POSIX_MESSAGE_PASSING) -# define ACE_HAS_POSIX_MESSAGE_PASSING -# endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ -#endif /* _POSIX_MESSAGE_PASSING */ - -#if defined(_POSIX_SHARED_MEMORY_OBJECTS) && (_POSIX_SHARED_MEMORY_OBJECTS-0 != -1 ) -# if !defined(ACE_HAS_SHM_OPEN) -# define ACE_HAS_SHM_OPEN -# endif /* ACE_HAS_SHM_OPEN */ -#endif /* _POSIX_SHARED_MEMORY_OBJECTS */ - -// Allow the user to disable use of threads by setting ACE_HAS_THREADS to 0 -// before including this file. The platform config (not macros) file can -// often detect that the compiler was invoked with or without threads support -// and set this accordingly. -#if defined (ACE_HAS_THREADS) && (ACE_HAS_THREADS == 0) -# undef ACE_HAS_THREADS -#else -# if defined(_POSIX_THREADS) && (_POSIX_THREADS-0 != -1 ) -# if !defined(ACE_HAS_THREADS) -# define ACE_HAS_THREADS -# endif /* ACE_HAS_THREADS */ - -# if !defined(ACE_HAS_PTHREADS) -# define ACE_HAS_PTHREADS -# endif /* ACE_HAS_PTHREADS */ - -# if !defined(ACE_HAS_PTHREADS_STD) -# define ACE_HAS_PTHREADS_STD -# endif /* ACE_HAS_PTHREADS_STD */ -# endif /* _POSIX_THREADS */ -#endif /* ACE_HAS_THREADS */ - -#if defined(_POSIX_MESSAGE_PASSING) && (_POSIX_MESSAGE_PASSING-0 != -1 ) -# if !defined(ACE_HAS_POSIX_MESSAGE_PASSING) -# define ACE_HAS_POSIX_MESSAGE_PASSING -# endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ -#endif /* _POSIX_MESSAGE_PASSING */ - -#if defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -# define ACE_HAS_SNPRINTF -#endif /* _XOPEN_SOURCE */ - -#endif /* ACE_CONFIG_POSIX_H */ - diff --git a/ace/config-psos-diab-mips.h b/ace/config-psos-diab-mips.h deleted file mode 100644 index 954dcd9e2f9..00000000000 --- a/ace/config-psos-diab-mips.h +++ /dev/null @@ -1,246 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for pSOSystem V2.2.1, -// using the Diab Data D-C++ 4.2 p3 compiler (or a later version) - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// #if ! defined (__ACE_INLINE__) -// # define __ACE_INLINE__ -// #endif /* ! __ACE_INLINE__ */ -#if defined (__ACE_INLINE__) -# undef __ACE_INLINE__ -#endif /* __ACE_INLINE__ */ - -#define ACE_LACKS_ISATTY - -#define ACE_LACKS_DIFFTIME - -#define ACE_LACKS_INLINE_FUNCTIONS - -#define ACE_LACKS_TEMPLATE_AS_TEMPLATE_PARAMETER - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - - -// Don't use RCSID -#if !defined (ACE_USE_RCSID) -#define ACE_USE_RCSID 0 -#endif /* #if !defined (ACE_USE_RCSID) */ - -#define ACE_LACKS_ASSERT_MACRO - -#define ACE_LACKS_SIGSET -#define ACE_LACKS_SIGACTION -#define ACE_LACKS_FCNTL -#define ACE_LACKS_FILELOCKS -#define ACE_LACKS_TRUNCATE -#define ACE_LACKS_PRAGMA_ONCE -#define ACE_NLOGGING -#define ACE_NDEBUG - -#define ACE_PSOS_LACKS_PREPC - -#define ACE_HAS_STRDUP_EMULATION - -#define ACE_HAS_IP_MULTICAST - -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS - -#define ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR - -# define ACE_HAS_BROKEN_NOOP_DTORS - -# define ACE_HAS_DIRENT -# define ACE_LACKS_READDIR_R -# define ACE_LACKS_TELLDIR -# define ACE_LACKS_SEEKDIR -# define ACE_LACKS_REWINDDIR - -# define ACE_THREADS_DONT_INHERIT_LOG_MSG - -// Template instantiation definitions -// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE -#define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE - -#define ACE_LACKS_HRTIME_T - -// #define ACE_LACKS_EVENT_T - -// #define ACE_HAS_VERBOSE_NOTSUP - -#define ACE_LACKS_MEMORY_H - -// #define ACE_LACKS_MALLOC_H - -#define ACE_LACKS_MMAP - -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#define ACE_LACKS_SEMBUF_T - -#define ACE_LACKS_EXEC - -#define ACE_LACKS_FORK - -#define ACE_LACKS_WRITEV - -#define ACE_LACKS_READV - -// rename the main entry point -// #define ACE_MAIN extern "C" void root - -// All this was commented out for the single threaded port -/* -#define ACE_HAS_THREADS - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_HAS_TSS_EMULATION - -#define ACE_DEFAULT_THREAD_KEYS 256 - -#define ACE_LACKS_COND_T -// #define ACE_HAS_TSS_EMULATION - -*/ - -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -/* #define ACE_HAS_BROKEN_SENDMSG */ - -/* #define ACE_HAS_BROKEN_WRITEV */ - -#define ACE_HAS_BROKEN_CONVERSIONS - -#define ACE_HAS_CHARPTR_SOCKOPT - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_MSG - -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_HAS_SIGINFO_T -#define ACE_LACKS_SIGINFO_H -#define ACE_SIGINFO_IS_SIGINFO_T -#define ACE_LACKS_SIGSET_DEFINITIONS - -#define ACE_HAS_SIGWAIT - -//#define ACE_HAS_SIG_ATOMIC_T - -// #define ACE_HAS_STRERROR - -#define ACE_LACKS_ACCESS - -#define ACE_LACKS_GETHOSTENT - -#define ACE_LACKS_GETSERVBYNAME - -// IO Streams stuff -/* #define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ -#define ACE_LACKS_IOSTREAM_TOTALLY -#define ACE_LACKS_ACE_IOSTREAM -#define ACE_LACKS_IOSTREAM_FX -#define ACE_DEFAULT_LOG_STREAM 0 -#define ostream FILE - -#define ACE_LACKS_IOSTREAM_FX - -#define ACE_LACKS_KEY_T - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#define ACE_LACKS_LONGLONG_T - -#define ACE_LACKS_MADVISE - -#define ACE_LACKS_MKTEMP - -#define ACE_LACKS_MPROTECT - -#define ACE_LACKS_MSYNC - -#define ACE_LACKS_PARAM_H - -#define ACE_LACKS_PWD_FUNCTIONS - -#define ACE_LACKS_RLIMIT - -#define ACE_LACKS_RPC_H - -#define ACE_LACKS_RWLOCK_T - -#define ACE_LACKS_SBRK - -#define ACE_LACKS_SIGNED_CHAR - -#define ACE_LACKS_SI_ADDR - -#define ACE_LACKS_SOCKETPAIR - -#define ACE_LACKS_STRCASECMP - -#define ACE_LACKS_STRRECVFD - -#define ACE_LACKS_SYSCALL - -#define ACE_LACKS_SYSV_MSG_H - -#define ACE_LACKS_SYSV_SHMEM - -// #define ACE_LACKS_SYS_NERR - -#define ACE_LACKS_SYS_TYPES_H - -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_UCONTEXT_H - -#define ACE_LACKS_UNIX_SIGNALS - -// #define ACE_LACKS_SYSTIME_H - -#define ACE_PAGE_SIZE 4096 - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_PSOS_CANT_USE_SYS_TYPES - -// #define ACE_PSOS_SNARFS_HEADER_INFO - -#if !defined (ACE_PSOS) -#define ACE_PSOS -#endif /* ACE_PSOS */ - -#if !defined (ACE_PSOS_TBD) -#define ACE_PSOS_TBD -#endif /* ACE_PSOS_TBD */ - -#define ACE_LACKS_MKFIFO - -#define ACE_LACKS_MALLOC_H - -#define ACE_PSOS_DIAB - -#define ACE_PSOS_DIAB_MIPS -#define ACE_MALLOC_ALIGN 8 -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h deleted file mode 100644 index 9cbf2d63c7f..00000000000 --- a/ace/config-psos-diab-ppc.h +++ /dev/null @@ -1,281 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for: -// a) pSOSystem V2.5.0 for PowerPC (pssppc.250) -// b) DiabData C++ compiler - dplus 4.2b -// *note pSOSystem V2.5.0 is contained in the PRISM+2.0.0 package - - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// #if ! defined (__ACE_INLINE__) -// # define __ACE_INLINE__ -// #endif /* ! __ACE_INLINE__ */ -#if defined (__ACE_INLINE__) -# undef __ACE_INLINE__ -#endif /* __ACE_INLINE__ */ - -#define ACE_LACKS_ISATTY - -#define ACE_LACKS_DIFFTIME - -#define ACE_LACKS_FCNTL - -#define ACE_LACKS_FILELOCKS - -#define ACE_LACKS_FSYNC - -#define ACE_LACKS_INLINE_FUNCTIONS - -#define ACE_LACKS_TEMPLATE_AS_TEMPLATE_PARAMETER - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#else -// At least true with newer Diab compiler... -# define ACE_LACKS_PRAGMA_ONCE -# define ACE_HAS_EXCEPTIONS -#endif /* __GNUG__ */ - -#define ACE_PSOS_LACKS_PREPC - -#define ACE_PSOS_HAS_TIME - -#define ACE_HAS_STRDUP_EMULATION - -#define ACE_HAS_IP_MULTICAST - -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_HAS_BROKEN_EXPLICIT_TYPECAST_OPERATOR_INVOCATION - -#define ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS - -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -# define ACE_HAS_BROKEN_NOOP_DTORS - -# define ACE_HAS_DIRENT -# define ACE_LACKS_READDIR_R -# define ACE_LACKS_TELLDIR -# define ACE_LACKS_SEEKDIR -# define ACE_LACKS_REWINDDIR - -#define ACE_LACKS_TRUNCATE - -// Template instantiation definitions -// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE -#define ACE_TEMPLATES_REQUIRE_SOURCE - -// IO Streams stuff -// #define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION -//#define ACE_LACKS_IOSTREAM_TOTALLY -//#define ACE_LACKS_ACE_IOSTREAM -//#define ACE_LACKS_IOSTREAM_FX -//#define ACE_DEFAULT_LOG_STREAM 0 -//#define ostream FILE - -#define ACE_LACKS_HRTIME_T - -// #define ACE_LACKS_EVENT_T - -#define ACE_HAS_VERBOSE_NOTSUP - -#define ACE_LACKS_MEMORY_H - -// #define ACE_LACKS_MALLOC_H - -#define ACE_LACKS_MMAP - -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -#define ACE_LACKS_SEMBUF_T - -#define ACE_LACKS_EXEC - -#define ACE_LACKS_FORK - -#define ACE_LACKS_WRITEV - -#define ACE_LACKS_READV - -// rename the main entry point -#define ACE_MAIN extern "C" void root - -// All this was commented out for the single threaded port - -#define ACE_HAS_THREADS - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -// #define ACE_HAS_TSS_EMULATION -// #define ACE_DEFAULT_THREAD_KEYS 256 -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_PSOS_HAS_TSS -#define ACE_DEFAULT_THREAD_KEYS KC_NTSD - -#define ACE_PSOS_HAS_MUTEX -#define ACE_PSOS_HAS_PRIO_MUTEX -#define ACE_PSOS_HAS_PRIO_INHERIT_MUTEX -#define ACE_HAS_RECURSIVE_MUTEXES - -// #define ACE_LACKS_COND_T -#define ACE_PSOS_HAS_COND_T - -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -/* #define ACE_HAS_BROKEN_SENDMSG */ - -/* #define ACE_HAS_BROKEN_WRITEV */ - -#define ACE_HAS_BROKEN_CONVERSIONS - -#define ACE_HAS_CHARPTR_SOCKOPT - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_MSG - -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_HAS_SIGINFO_T -#define ACE_LACKS_SIGINFO_H -#define ACE_SIGINFO_IS_SIGINFO_T -#define ACE_LACKS_SIGSET_DEFINITIONS -#define ACE_LACKS_SIGSET -#define ACE_LACKS_SIGACTION - -#define ACE_HAS_SIGWAIT - -//#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_HAS_STRERROR - -#define ACE_LACKS_ACCESS - -#define ACE_LACKS_GETHOSTENT - -#define ACE_LACKS_GETSERVBYNAME - -#define ACE_LACKS_KEY_T - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#define ACE_LACKS_LONGLONG_T - -#define ACE_LACKS_LSTAT - -#define ACE_LACKS_MADVISE - -#define ACE_LACKS_MKTEMP - -#define ACE_LACKS_MPROTECT - -#define ACE_LACKS_MSYNC - -#define ACE_LACKS_PARAM_H - -#define ACE_LACKS_PWD_FUNCTIONS - -#define ACE_LACKS_READLINK - -#define ACE_LACKS_RLIMIT - -#define ACE_LACKS_RWLOCK_T - -#define ACE_LACKS_SBRK - -#define ACE_LACKS_SIGNED_CHAR - -#define ACE_LACKS_SI_ADDR - -#define ACE_LACKS_SOCKETPAIR - -#define ACE_LACKS_STRCASECMP - -#define ACE_LACKS_STRRECVFD - -#define ACE_LACKS_SYSCALL - -#define ACE_LACKS_SYSV_MSG_H - -#define ACE_LACKS_SYSV_SHMEM - -#define ACE_LACKS_SYS_NERR - -#define ACE_LACKS_SYS_TYPES_H - -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_UCONTEXT_H - -#define ACE_LACKS_UNIX_SIGNALS - -#define ACE_THREADS_LACK_SHARED_SOCKETS - -// #define ACE_MALLOC_ALIGN 8 -// #define ACE_LACKS_SYSTIME_H - -#define ACE_PAGE_SIZE 4096 - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_PSOS_CANT_USE_SYS_TYPES - -// #define ACE_PSOS_LACKS_PHILE - -#define ACE_PSOS_HAS_C_LIBRARY - -#define ACE_PSOS_SNARFS_HEADER_INFO - -#define ACE_PSOS_LACKS_ARGC_ARGV - -#if !defined (ACE_PSOS) -#define ACE_PSOS -#endif /* ACE_PSOS */ - -#if !defined (ACE_PSOS_TBD) -#define ACE_PSOS_TBD -#endif /* ACE_PSOS_TBD */ - -#define ACE_LACKS_MKFIFO - -#define ACE_PSOS_DIAB - -#define ACE_PSOS_DIAB_PPC - -/* Defining PNANOREDEF will avoid the redefinition of close to pna_close in - * pna.h In OS.i we make sure that pna_close is called in place of close - * when a socket is closed. - */ -#define _PNANOREDEF_ - -/* needed for portability, due to non-standard ip_mreq - structure definition for pSOS Diab PPC */ -#define IMR_MULTIADDR imr_mcastaddr - -#define ACE_THREADS_DONT_INHERIT_LOG_MSG /* Stream sharing problem for tasks */ - -#define ACE_THREADS_MUST_EXPLICITLY_SHARE_SOCKETS /* Can't just share sockets */ - -#define ACE_PSOS_DEFAULT_STACK_SIZE 30720 /* Default task stack size to 30K */ - -#define ACE_DEFAULT_THREAD_PRIORITY 239 - -#define ACE_THREAD_MANAGER_LACKS_STATICS - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h deleted file mode 100644 index 7c439aa677d..00000000000 --- a/ace/config-psos-diab.h +++ /dev/null @@ -1,237 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for pSOSystem V2.2.2, -// using the Diab Data D-C++ 4.2a compiler (or a later version) - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// #if ! defined (__ACE_INLINE__) -// # define __ACE_INLINE__ -// #endif /* ! __ACE_INLINE__ */ -#if defined (__ACE_INLINE__) -# undef __ACE_INLINE__ -#endif /* __ACE_INLINE__ */ - -#define ACE_LACKS_ISATTY - -#define ACE_LACKS_DIFFTIME - -#define ACE_LACKS_FCNTL - -#define ACE_LACKS_FILELOCKS - -#define ACE_LACKS_FSYNC - -#define ACE_LACKS_INLINE_FUNCTIONS - -#define ACE_LACKS_TEMPLATE_AS_TEMPLATE_PARAMETER - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - -#define ACE_PSOS_LACKS_PREPC - -#define ACE_PSOS_HAS_TIME - -#define ACE_HAS_STRDUP_EMULATION - -#define ACE_HAS_IP_MULTICAST - -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_HAS_BROKEN_EXPLICIT_TYPECAST_OPERATOR_INVOCATION - -#define ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS - -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -# define ACE_HAS_BROKEN_NOOP_DTORS - -# define ACE_HAS_DIRENT -# define ACE_LACKS_READDIR_R -# define ACE_LACKS_TELLDIR -# define ACE_LACKS_SEEKDIR -# define ACE_LACKS_REWINDDIR - -#define ACE_LACKS_TRUNCATE - -// Template instantiation definitions -// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE -#define ACE_TEMPLATES_REQUIRE_SOURCE - -// IO Streams stuff -// #define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION -#define ACE_LACKS_IOSTREAM_TOTALLY -#define ACE_LACKS_ACE_IOSTREAM -#define ACE_LACKS_IOSTREAM_FX -#define ACE_DEFAULT_LOG_STREAM 0 -#define ostream FILE - -#define ACE_LACKS_HRTIME_T - -// #define ACE_LACKS_EVENT_T - -#define ACE_HAS_VERBOSE_NOTSUP - -#define ACE_LACKS_MEMORY_H - -// #define ACE_LACKS_MALLOC_H - -#define ACE_LACKS_MMAP - -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#define ACE_LACKS_SEMBUF_T - -#define ACE_LACKS_EXEC - -#define ACE_LACKS_FORK - -#define ACE_LACKS_WRITEV - -#define ACE_LACKS_READV - -// rename the main entry point -#define ACE_MAIN extern "C" void root - -// All this was commented out for the single threaded port - -#define ACE_HAS_THREADS - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_HAS_TSS_EMULATION - -#define ACE_DEFAULT_THREAD_KEYS 256 - -#define ACE_LACKS_COND_T - -// #define ACE_HAS_TSS_EMULATION - -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -/* #define ACE_HAS_BROKEN_SENDMSG */ - -/* #define ACE_HAS_BROKEN_WRITEV */ - -#define ACE_HAS_BROKEN_CONVERSIONS - -#define ACE_HAS_CHARPTR_SOCKOPT - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_MSG - -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_HAS_SIGINFO_T -#define ACE_LACKS_SIGINFO_H -#define ACE_SIGINFO_IS_SIGINFO_T -#define ACE_LACKS_SIGSET_DEFINITIONS - -#define ACE_HAS_SIGWAIT - -#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_HAS_STRERROR - -#define ACE_LACKS_ACCESS - -#define ACE_LACKS_GETHOSTENT - -#define ACE_LACKS_GETSERVBYNAME - -#define ACE_LACKS_KEY_T - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#define ACE_LACKS_LONGLONG_T - -#define ACE_LACKS_LSTAT - -#define ACE_LACKS_MADVISE - -#define ACE_LACKS_MKTEMP - -#define ACE_LACKS_MPROTECT - -#define ACE_LACKS_MSYNC - -#define ACE_LACKS_PARAM_H - -#define ACE_LACKS_PWD_FUNCTIONS - -#define ACE_LACKS_READLINK - -#define ACE_LACKS_RLIMIT - -#define ACE_LACKS_RWLOCK_T - -#define ACE_LACKS_SBRK - -#define ACE_LACKS_SIGNED_CHAR - -#define ACE_LACKS_SI_ADDR - -#define ACE_LACKS_SOCKETPAIR - -#define ACE_LACKS_STRCASECMP - -#define ACE_LACKS_STRRECVFD - -#define ACE_LACKS_SYSCALL - -#define ACE_LACKS_SYSV_MSG_H - -#define ACE_LACKS_SYSV_SHMEM - -#define ACE_LACKS_SYS_NERR - -#define ACE_LACKS_SYS_TYPES_H - -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_UCONTEXT_H - -#define ACE_LACKS_UNIX_SIGNALS - -// #define ACE_LACKS_SYSTIME_H - -#define ACE_PAGE_SIZE 4096 - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_PSOS_CANT_USE_SYS_TYPES - -// #define ACE_PSOS_LACKS_PHILE - -#define ACE_PSOS_HAS_C_LIBRARY - -#define ACE_PSOS_SNARFS_HEADER_INFO - -#define ACE_PSOS_LACKS_ARGC_ARGV - -#if !defined (ACE_PSOS) -#define ACE_PSOS -#endif /* ACE_PSOS */ - -#define ACE_MALLOC_ALIGN 8 - -#if !defined (ACE_PSOS_DIAB) -#define ACE_PSOS_DIAB -#endif /* ACE_PSOS_DIAB */ -#define ACE_LACKS_MKFIFO -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h deleted file mode 100644 index aa077e2bca6..00000000000 --- a/ace/config-psos-tm.h +++ /dev/null @@ -1,210 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for pSOSystem V2.2.1, -// using the Diab Data D-C++ 4.1a compiler - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// #if ! defined (__ACE_INLINE__) -// # define __ACE_INLINE__ -// #endif /* ! __ACE_INLINE__ */ -#if defined (__ACE_INLINE__) -# undef __ACE_INLINE__ -#endif /* __ACE_INLINE__ */ - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - -#define ACE_HAS_STRDUP_EMULATION - -#define ACE_HAS_IP_MULTICAST - -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -// Template instantiation definitions -// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE -#define ACE_TEMPLATES_REQUIRE_SOURCE - -#define ACE_DONT_INCLUDE_ACE_SIGNAL_H -# include //JINLU -#undef ACE_DONT_INCLUDE_ACE_SIGNAL_H -#include //JINLU -#define NSIG _NSIG //_NSIG = 32 defined in signal.h JINLU -#define TCP_NODELAY 1 // this will be defined later by pSOS/TM - -/* #define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ - -#define ACE_LACKS_HRTIME_T - -// #define ACE_LACKS_EVENT_T - -#define ACE_HAS_VERBOSE_NOTSUP - -#define ACE_LACKS_MEMORY_H - -// #define ACE_LACKS_MALLOC_H - -#define ACE_LACKS_MMAP - -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#define ACE_LACKS_SEMBUF_T - -#define ACE_LACKS_EXEC - -#define ACE_LACKS_FORK - -#define ACE_LACKS_WRITEV - -#define ACE_LACKS_READV - -// rename the main entry point -// #define ACE_MAIN extern "C" void root - -// All this was commented out for the single threaded port - -#define ACE_HAS_THREADS - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_HAS_TSS_EMULATION - -#define ACE_DEFAULT_THREAD_KEYS 256 - -#define ACE_LACKS_COND_T - -// #define ACE_HAS_TSS_EMULATION - -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -/* #define ACE_HAS_BROKEN_SENDMSG */ - -/* #define ACE_HAS_BROKEN_WRITEV */ - -#define ACE_HAS_BROKEN_CONVERSIONS - -#define ACE_HAS_CHARPTR_SOCKOPT - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_MSG - -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_HAS_SIGINFO_T -#define ACE_LACKS_SIGINFO_H -#define ACE_SIGINFO_IS_SIGINFO_T - -#define ACE_HAS_SIGWAIT - -#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_HAS_STRERROR - -#define ACE_LACKS_ACCESS - -#define ACE_LACKS_GETHOSTENT - -#define ACE_LACKS_GETSERVBYNAME - -#define ACE_LACKS_IOSTREAM_FX - -#define ACE_LACKS_KEY_T - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#define ACE_LACKS_LONGLONG_T - -#define ACE_LACKS_LSTAT - -#define ACE_LACKS_MADVISE - -#define ACE_LACKS_MKTEMP - -#define ACE_LACKS_MPROTECT - -#define ACE_LACKS_MSYNC - -#define ACE_LACKS_PARAM_H - -#define ACE_LACKS_PWD_FUNCTIONS - -#define ACE_LACKS_READLINK - -#define ACE_LACKS_RLIMIT - -#define ACE_LACKS_RWLOCK_T - -#define ACE_LACKS_SBRK - -#define ACE_LACKS_SIGNED_CHAR - -#define ACE_LACKS_SI_ADDR - -#define ACE_LACKS_SOCKETPAIR - -#define ACE_LACKS_STRCASECMP - -#define ACE_LACKS_STRRECVFD - -#define ACE_LACKS_SYSCALL - -#define ACE_LACKS_SYSV_MSG_H - -#define ACE_LACKS_SYSV_SHMEM - -#define ACE_LACKS_SYS_NERR // psos/tm does not have sys_nerr - -#define ACE_LACKS_SYS_TYPES_H - -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_UCONTEXT_H - -#define ACE_LACKS_UNIX_SIGNALS - -// #define ACE_LACKS_SYSTIME_H - -#define ACE_PAGE_SIZE 4096 - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_PSOS_TM -#define ACE_PSOS_PROVIDES_ERROR_SYMBOLS_TM -#define USER_INCLUDE_SYS_TIME_TM -#define ACE_LACKS_FILELOCKS -#define ACE_LACKS_SIGSET -#define ACE_LACKS_SIGACTION -#define ACE_LACKS_FCNTL -#define ACE_PSOS_LACKS_PHILE -#define ACE_PSOS_LACKS_PREPC -#define ACE_PSOS_CANT_USE_SYS_TYPES -#define ACE_PSOS_HAS_TIME - -//#define ACE_PSOS_SNARFS_HEADER_INFO - -#if !defined (ACE_PSOS) -#define ACE_PSOS -#endif /* ACE_PSOS */ - -#if !defined (ACE_PSOS_TBD) -#define ACE_PSOS_TBD -#endif /* ACE_PSOS_TBD */ -#define ACE_LACKS_MKFIFO -#define ACE_MALLOC_ALIGN 8 -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h deleted file mode 100644 index f288b93f18e..00000000000 --- a/ace/config-psosim-g++.h +++ /dev/null @@ -1,246 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for pSOSim on SunOS5 -// using the GNU/Cygnus g++ 2.7.2 compiler, without repo patch. - -/////////////////////////////////////////////////////////////////////////////// -// * IMPORTANT * IMPORTANT * IMPORTANT * IMPORTANT * IMPORTANT * IMPORTANT * // -// // -// Because pSOSim includes UNIX system header files in order to do // -// its emulation of pSOSystSem on Solaris, there are a number of // -// things that are "available" to ACE on pSOSim that are *not* // -// really available on pSOSystem. Every effort has been made to // -// avoid dependencies on these "features" in the ACE pSOSim port, // -// which has in turn necessarily required pSOSim specific definitions. // -// // -// To ease portability between pSOSim and pSOSystem, the definitions // -// in this file have been separated into three groups: those that // -// are known to be appropriate for both pSOSim and pSOSystem, those // -// known to be appropriate for pSOSim but (probably) not for pSOSystem, // -// and those that are (probably) appropriate for pSOSystem, but are // -// not appropriate for pSOSim. // -// // -// When porting from pSOSim to pSOSystem, it is (probably) a good // -// idea to leave the definitions in the first category alone, // -// comment out the definitions in the second category, and uncomment // -// the definitions in the third category. Additional definitions // -// may need to be added to the third category, as only those that // -// were encountered during the pSOSim port were added (that is, one // -// of the system files included by pSOSim could be compensating for // -// a definition pSOSystem really needs. // -// // -// * IMPORTANT * IMPORTANT * IMPORTANT * IMPORTANT * IMPORTANT * IMPORTANT * // -/////////////////////////////////////////////////////////////////////////////// - - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -//////////////////////////////////////////////////////////////// -// // -// Definitions appropriate for both pSOSim and pSOSystem // -// // -//////////////////////////////////////////////////////////////// - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - -#define ACE_HAS_IP_MULTICAST - -#define ACE_HAS_CPLUSPLUS_HEADERS - -/* #define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ - -// #define ACE_LACKS_U_LONG_LONG - -#define ACE_LACKS_HRTIME_T - -// #define ACE_LACKS_EVENT_T - -#define ACE_HAS_VERBOSE_NOTSUP - -#define ACE_LACKS_MEMORY_H - -#define ACE_LACKS_MALLOC_H - -#define ACE_LACKS_MMAP - -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#define ACE_LACKS_SEMBUF_T - -#define ACE_LACKS_EXEC - -#define ACE_LACKS_FORK - - -// rename the main entry point -#define ACE_MAIN extern "C" void root - -// All this is commented out for the single threaded port -/* - -#define ACE_HAS_THREADS - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_DEFAULT_THREAD_KEYS 256 - -#define ACE_LACKS_COND_T - - -*/ - -#define ACE_HAS_TSS_EMULATION - - -//////////////////////////////////////////////////////////////// -// // -// Definitions appropriate for pSOSim but not pSOSystem // -// // -//////////////////////////////////////////////////////////////// - -#define ACE_HAS_POSIX_TIME - -//////////////////////////////////////////////////////////////// -// // -// Definitions appropriate for pSOSystem but not pSOSim // -// // -//////////////////////////////////////////////////////////////// - - -//////////////////////////////////////////////////////////////// -// // -// Definitions that have not been categorized // -// // -//////////////////////////////////////////////////////////////// - - -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -/* #define ACE_HAS_BROKEN_SENDMSG */ - -/* #define ACE_HAS_BROKEN_WRITEV */ - -#define ACE_HAS_CHARPTR_SOCKOPT - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_MSG - -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_HAS_SIGINFO_T - -#define ACE_HAS_SIGWAIT - -#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_HAS_STRERROR - -#define ACE_LACKS_ACCESS - -#define ACE_LACKS_GETHOSTENT - -#define ACE_LACKS_GETSERVBYNAME - -#define ACE_LACKS_IOSTREAM_FX - -#define ACE_LACKS_KEY_T - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#define ACE_LACKS_LONGLONG_T - -#define ACE_LACKS_LSTAT - -#define ACE_LACKS_MADVISE - -#define ACE_LACKS_MKTEMP - -#define ACE_LACKS_MPROTECT - -#define ACE_LACKS_MSYNC - -#define ACE_LACKS_PARAM_H - -#define ACE_LACKS_PWD_FUNCTIONS - -#define ACE_LACKS_READLINK - -#define ACE_LACKS_RLIMIT - -#define ACE_LACKS_RWLOCK_T - -#define ACE_LACKS_SBRK - -#define ACE_LACKS_SIGINFO_H - -#define ACE_LACKS_SIGNED_CHAR - -#define ACE_LACKS_SI_ADDR - -#define ACE_LACKS_SOCKETPAIR - -#define ACE_LACKS_STRCASECMP - -#define ACE_LACKS_STRRECVFD - -#define ACE_LACKS_SYSCALL - -#define ACE_LACKS_SYSV_MSG_H - -#define ACE_LACKS_SYSV_SHMEM - -#define ACE_LACKS_SYS_NERR - -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_UCONTEXT_H - -#define ACE_LACKS_UNIX_SIGNALS - -#define ACE_LACKS_UTSNAME_T - -// #define ACE_LACKS_SYSTIME_H - -#define ACE_PAGE_SIZE 4096 - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#if !defined (ACE_PSOS) -#define ACE_PSOS -#endif /* ACE_PSOS */ - -#if !defined (ACE_PSOSIM) -#define ACE_PSOSIM -#endif /* ACE_PSOSIM */ - -#if !defined (ACE_PSOS_TBD) -#define ACE_PSOS_TBD -#endif /* ACE_PSOS_TBD */ - -// By default, don't include RCS Id strings in object code. -#if !defined (ACE_USE_RCSID) -#define ACE_USE_RCSID 0 -#endif /* #if !defined (ACE_USE_RCSID) */ -#define ACE_LACKS_MKFIFO - -#define ACE_MALLOC_ALIGN 8 -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-qnx-neutrino.h b/ace/config-qnx-neutrino.h deleted file mode 100644 index 560e00f175a..00000000000 --- a/ace/config-qnx-neutrino.h +++ /dev/null @@ -1,148 +0,0 @@ -// $Id$ - -// The following configuration file is designed to work for Neutrino -// 2.0 (Beta) with GNU C++ and the POSIX (pthread) threads package. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define _POSIX_C_SOURCE 199506 -#define _QNX_SOURCE - -// These constants are in i386-nto/include/limits.h, but egcs -// picks up its own limits.h instead: -#define _POSIX_NAME_MAX 14 /* Max bytes in a filename */ -#define _POSIX_PATH_MAX 256 /* Num. bytes in pathname (excl. NULL) */ - -// gcc can do inline -#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8) -# if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ -# endif /* ! __ACE_INLINE__ */ -#endif - -#if defined(__OPTIMIZE__) -# if defined(__X86__) - // string.h can't be used by ACE with __OPTIMIZE__. -# undef __OPTIMIZE__ -# include -# define __OPTIMIZE__ -# endif /* __X86__ */ -#endif /* __OPTIMIZE__ */ - -#include "ace/config-g++-common.h" - -// The following defines the Neutrino compiler. -// gcc should know to call g++ as necessary -#ifdef __GNUC__ -# define ACE_CC_NAME "gcc" -#else -# define ACE_CC_NAME "NTO compiler ??" -#endif - -// /usr/nto/include/float.h defines -// FLT_MAX_EXP 127 -// DBL_MAX_EXP 1023 -// ace expects 128 & 1024 respectively -// to set the following macros in ace/Basic_Types.h -// These macros are: -// #define ACE_SIZEOF_DOUBLE 8 -// #define ACE_SIZEOF_FLOAT 4 - -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_ALLOCA -#define ACE_HAS_ALLOCA_H -#define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_DIRENT -#define ACE_HAS_GETPAGESIZE -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER -#define ACE_HAS_INLINED_OSCALLS -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_MSG -#define ACE_HAS_MT_SAFE_MKTIME -#define ACE_HAS_MUTEX_TIMEOUTS -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_POSIX_SEM -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_STD -#define ACE_HAS_PTHREAD_SIGMASK -#define ACE_HAS_P_READ_WRITE -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_HAS_SELECT_H -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGISMEMBER_BUG -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIG_MACROS -#define ACE_HAS_SIN_LEN -#define ACE_HAS_SIZET_SOCKET_LEN -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRERROR -#define ACE_HAS_STRINGS -#define ACE_HAS_SVR4_GETTIMEOFDAY -#define ACE_HAS_TERM_IOCTLS -#define ACE_HAS_THREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_THR_C_DEST -#define ACE_HAS_THR_C_FUNC -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#define ACE_HAS_UALARM -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_VOIDPTR_MMAP -#define ACE_HAS_VOIDPTR_SOCKOPT -#define ACE_LACKS_CMSG_DATA_MEMBER -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_FORK -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MSGBUF_T -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_NAMED_POSIX_SEM -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_RPC_H -#define ACE_LACKS_RTTI -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SBRK -#define ACE_LACKS_SEEKDIR -#define ACE_LACKS_SOCKET_BUFSIZ -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_SOME_POSIX_PROTOTYPES -#define ACE_LACKS_STREAM_MODULES -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_SYSTIME_H -#define ACE_LACKS_SYSV_MSG_H -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_TCP_NODELAY -#define ACE_LACKS_TELLDIR -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_TRUNCATE -#define ACE_LACKS_T_ERRNO -#define ACE_LACKS_UALARM_PROTOTYPE -#define ACE_LACKS_UCONTEXT_H -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS -#define ACE_LACKS_U_LONGLONG_T -#define ACE_MT_SAFE 1 -#define ACE_NEEDS_FUNC_DEFINITIONS -#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 -#define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_THR_PRI_FIFO_DEF 10 -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#define ACE_HAS_SIGTIMEDWAIT -#define ACE_HAS_SIGSUSPEND - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-qnx-rtp.h b/ace/config-qnx-rtp.h deleted file mode 100644 index 65e55ac13d1..00000000000 --- a/ace/config-qnx-rtp.h +++ /dev/null @@ -1,199 +0,0 @@ -// $Id$ - -// The following configuration file is designed to work for QNX RTP -// GNU C++ and the POSIX (pthread) threads package. You can get QNX -// RTP at http://get.qnx.com - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define _POSIX_C_SOURCE 199506 -#define _QNX_SOURCE - -// These constants are in i386-nto/include/limits.h, but egcs -// picks up its own limits.h instead: -#define _POSIX_NAME_MAX 14 /* Max bytes in a filename */ -#define _POSIX_PATH_MAX 256 /* Num. bytes in pathname (excl. NULL) */ - -// gcc can do inline -#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8) -# if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ -# endif /* ! __ACE_INLINE__ */ -#endif - -#if defined(__OPTIMIZE__) -# if defined(__X86__) - // string.h can't be used by ACE with __OPTIMIZE__. -# undef __OPTIMIZE__ -# include -# define __OPTIMIZE__ -# endif /* __X86__ */ -#endif /* __OPTIMIZE__ */ - -#include "ace/config-g++-common.h" - -// The following defines the Neutrino compiler. -// gcc should know to call g++ as necessary -#ifdef __GNUC__ -# define ACE_CC_NAME "gcc" -#else -# define ACE_CC_NAME "QNX-RTP compiler ??" -#endif - -// /usr/nto/include/float.h defines -// FLT_MAX_EXP 127 -// DBL_MAX_EXP 1023 -// ace expects 128 & 1024 respectively -// to set the following macros in ace/Basic_Types.h -// These macros are: -#define ACE_SIZEOF_DOUBLE 8 -#define ACE_SIZEOF_FLOAT 4 - -///////////////////////////////////////////////////////////////// -// Definition of the features that are available. -// -// ACE_HAS Section -///////////////////////////////////////////////////////////////// - -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_ALLOCA -#define ACE_HAS_ALLOCA_H -#define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_DIRENT -#define ACE_HAS_GETPAGESIZE -// Enable gperf, this is a hosted configuration. -#define ACE_HAS_GPERF -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -//#define ACE_HAS_NONSTATIC_OBJECT_MANAGER -#define ACE_HAS_INLINED_OSCALLS -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_MSG -#define ACE_HAS_MT_SAFE_MKTIME -#define ACE_HAS_MUTEX_TIMEOUTS -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_POSIX_SEM -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_STD -#define ACE_HAS_PTHREAD_SIGMASK -#define ACE_HAS_P_READ_WRITE -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_HAS_SELECT_H -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGISMEMBER_BUG -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIG_MACROS -#define ACE_HAS_SIN_LEN -// #define ACE_HAS_SIZET_SOCKET_LEN -#define ACE_HAS_SOCKLEN_T -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRERROR -#define ACE_HAS_STRINGS -#define ACE_HAS_SVR4_GETTIMEOFDAY -#define ACE_HAS_TERM_IOCTLS -#define ACE_HAS_THREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_THR_C_DEST -#define ACE_HAS_THR_C_FUNC -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#define ACE_HAS_UALARM -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_VOIDPTR_MMAP -#define ACE_HAS_VOIDPTR_SOCKOPT - -///////////////////////////////////////////////////////////////// -// Definition of the features that are not available. -// -// ACE_LACKS Section -///////////////////////////////////////////////////////////////// -#define ACE_LACKS_CMSG_DATA_MEMBER -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MSGBUF_T -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_NAMED_POSIX_SEM -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_RPC_H -#define ACE_LACKS_RTTI -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SBRK -#define ACE_LACKS_SEEKDIR -#define ACE_LACKS_SOCKET_BUFSIZ -#define ACE_LACKS_SOCKETPAIR // Even if the QNX RTP docs says that socket pair are - // available, there is actually no implementation of - // soket-pairs. -#define ACE_LACKS_SOME_POSIX_PROTOTYPES -#define ACE_LACKS_STREAM_MODULES -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_SYSTIME_H -#define ACE_LACKS_SYSV_MSG_H -#define ACE_LACKS_SYSV_SHMEM -//#define ACE_LACKS_TCP_NODELAY // Based on the QNX RTP documentation, this option seems to - // to be supported. -#define ACE_LACKS_TELLDIR -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_TRUNCATE -#define ACE_LACKS_T_ERRNO -#define ACE_LACKS_UALARM_PROTOTYPE -#define ACE_LACKS_UCONTEXT_H -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS -#define ACE_LACKS_U_LONGLONG_T - -#define ACE_LACKS_RLIMIT // QNX rlimit syscalls don't work properly with ACE. - -#define ACE_MT_SAFE 1 -#define ACE_NEEDS_FUNC_DEFINITIONS -#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 64000 -#define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_THR_PRI_FIFO_DEF 10 -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#define ACE_HAS_SIGTIMEDWAIT -#define ACE_HAS_SIGSUSPEND - -#define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1 - -#define ACE_SIZEOF_WCHAR 4 - -// Not really, but the prototype returns wchar_t instead of wchar_t * -#define ACE_LACKS_WCSSTR - -// No prototypes -#define ACE_LACKS_ITOW -#define ACE_LACKS_WCSICMP -#define ACE_LACKS_WCSNICMP -#define ACE_LACKS_WCSDUP - -// And these have prototypes but no implementation -#define ACE_LACKS_WCSLEN -#define ACE_LACKS_WCSNCMP -#define ACE_LACKS_WCSCPY -#define ACE_LACKS_WCSNCPY -#define ACE_LACKS_TOWLOWER -#define ACE_LACKS_WCSCMP -#define ACE_LACKS_WCSCAT -#define ACE_LACKS_WCSNCAT -#define ACE_LACKS_WCSSPN -#define ACE_LACKS_WCSCHR -#define ACE_LACKS_WCSPBRK -#define ACE_LACKS_WCSRCHR - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_LACKS_ACE_IOSTREAM - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-rtems.h b/ace/config-rtems.h deleted file mode 100644 index e0a1d102255..00000000000 --- a/ace/config-rtems.h +++ /dev/null @@ -1,164 +0,0 @@ -/* -*- C -*- */ -// $Id$ - -/* The following configuration file is designed to work for RTEMS - platforms using GNU C. -*/ - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H - -// begin of linux-common.h - -/* #define ACE_HAS_BYTESEX_H */ - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Needed to make some prototypes visible. -// #if ! defined (_GNU_SOURCE) -// #define _GNU_SOURCE -// #endif /* ! _GNU_SOURCE */ - -// First the machine specific part -// There are no known port specific issues with the RTEMS port of ACE. -// XXX Pentium and PowerPC have high res timer support in ACE. - -// Then the compiler specific parts -#if defined (__GNUG__) - // config-g-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS -# include "ace/config-g-common.h" -#elif defined (__KCC) -# define ACE_HAS_STRING_CLASS -# include "ace/config-kcc-common.h" -#elif defined (__DECCXX) -# define ACE_CONFIG_INCLUDE_CXX_COMMON -# include "ace/config-cxx-common.h" -#else /* ! __GNUG__ && ! __KCC && !__DECCXX */ -# error unsupported compiler in ace/config-linux-common.h -#endif /* ! __GNUG__ && ! __KCC */ - -// Completely common part :-) - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER -# if !defined (ACE_MAIN) -# define ACE_MAIN ace_main -# endif /* ! ACE_MAIN */ - -// Yes, we do have threads. -#define ACE_HAS_THREADS -// And they're even POSIX pthreads (MIT implementation) -#define ACE_HAS_PTHREADS -// ... and the final standard even! -#define ACE_HAS_PTHREADS_STD -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// XXX thread defines go here -#define ACE_MT_SAFE 1 -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_ALT_CUSERID -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_CLOCK_GETTIME -/* #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES */ -#define ACE_HAS_DIRENT -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -/* #define ACE_HAS_LLSEEK */ -#define ACE_HAS_MEMCHR -#define ACE_HAS_MSG -#define ACE_HAS_MT_SAFE_MKTIME -#define ACE_HAS_POSIX_SEM -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_PROCESS_ENUM -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGSUSPEND -#define ACE_HAS_SSIZE_T -/* #define ACE_HAS_STANDARD_CPP_LIBRARY */ -#define ACE_HAS_STRERROR -#define ACE_HAS_SUNOS4_GETTIMEOFDAY -#define ACE_HAS_SYS_ERRLIST -#define ACE_HAS_SYS_FILIO_H -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#define ACE_LACKS_DIFFTIME -#define ACE_LACKS_EXEC -#define ACE_LACKS_FILELOCKS -#define ACE_LACKS_FORK -#define ACE_LACKS_GETOPT_PROTO -#define ACE_LACKS_GETPGID -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MKFIFO -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -/* #define ACE_LACKS_POSIX_PROTOTYPES */ - // ... for System V functions like shared memory and message queues -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_READLINK -#define ACE_HAS_BROKEN_READV -#define ACE_LACKS_READV -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_RLIMIT_PROTOTYPE -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SBRK -#define ACE_LACKS_SEMBUF_T -#define ACE_LACKS_SETREUID -#define ACE_LACKS_SETREUID_PROTOTYPE -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREGID_PROTOTYPE -#define ACE_LACKS_SOME_POSIX_PROTOTYPES - // ... for System V functions like shared memory and message queues -#define ACE_LACKS_NATIVE_STRPTIME -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SI_ADDR -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_SYSV_MSG_H -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_SYS_NERR -#define ACE_LACKS_UALARM_PROTOTYPE -#define ACE_LACKS_UCONTEXT_H -#define ACE_HAS_BROKEN_WRITEV -#define ACE_LACKS_WRITEV -#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 -#define ACE_NEEDS_SCHED_H -#define ACE_HAS_POSIX_NONBLOCK - -/* What should these be set to?. - -ACE_TLI_TCP_DEVICE -ACE_HAS_RECVFROM_TIMEDWAIT -ACE_HAS_SEND_TIMEDWAIT -ACE_HAS_SENDTO_TIMEDWAIT -ACE_HAS_IP_MULTICAST -ACE_HAS_NONCONST_SELECT_TIMEVAL -ACE_HAS_WCHAR_TYPEDEFS_CHAR -ACE_HAS_WCHAR_TYPEDEFS_USHORT -ACE_HAS_SIGNAL_SAFE_OS_CALLS -ACE_HAS_SIZET_SOCKET_LEN -ACE_HAS_SOCKADDR_MSG_NAME -ACE_HAS_SOCKLEN_T -ACE_HAS_STRBUF_T -ACE_HAS_SYS_SIGLIST -ACE_HAS_TERM_IOCTLS -ACE_HAS_THREAD_SAFE_ACCEPT -ACE_LACKS_COND_TIMEDWAIT_RESET -ACE_LACKS_MSG_ACCRIGHTS -ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -Why don't we have alloca.h? - */ - -#include /**/ - -extern "C" -{ - int getopt (int, char *const *, const char *); -} - -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h deleted file mode 100644 index bb7df289328..00000000000 --- a/ace/config-sco-4.2-nothread.h +++ /dev/null @@ -1,116 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SCO UNIX -// version 4.2 without threads. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" - // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION. - // Maybe it will work? -# undef ACE_HAS_TEMPLATE_SPECIALIZATION -#endif /* __GNUG__ */ - -// Compiling for SCO. -#if !defined (SCO) -#define SCO -#endif /* SCO */ - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0 - -#if defined (SCO) && !defined (MAXPATHLEN) -#define MAXPATHLEN 1023 -#endif /* SCO */ - -#define ACE_HAS_SIG_MACROS -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_MMAP -#define ACE_LACKS_SOCKETPAIR -#define ACE_HAS_SEMUN -#define ACE_LACKS_MSYNC -#define ACE_LACKS_MADVISE -#define ACE_LACKS_WRITEV -#define ACE_LACKS_READV -#define ACE_NEEDS_FTRUNCATE -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_RECVMSG -#define ACE_LACKS_SENDMSG - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform supports recvmsg and sendmsg. -//#define ACE_HAS_MSG - -// Compiler/platform contains the file. -//#define ACE_HAS_SYSCALL_H - -// Fixes a problem with HP/UX not wrapping the mmap(2) header files -// with extern "C". -//#define ACE_HAS_BROKEN_MMAP_H - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Header files lack t_errno for ACE_TLI. -//#define ACE_LACKS_T_ERRNO - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler supports the ssize_t typedef. -//#define ACE_HAS_SSIZE_T - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// ??? -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// HP/UX has an undefined syscall for GETRUSAGE... -//#define ACE_HAS_SYSCALL_GETRUSAGE - -// Note, this only works if the flag is set above! -//#define ACE_HAS_GETRUSAGE - -// Platform uses int for select() rather than fd_set. -#define ACE_SELECT_USES_INT - -// Platform has prototypes for ACE_TLI. -//#define ACE_HAS_TLI_PROTOTYPES -// Platform has the XLI version of ACE_TLI. -// #define ACE_HAS_XLI - -#define ACE_HAS_GNU_CSTRING_H - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ -#define ACE_HAS_DIRENT -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sco-5.0.0-fsu-pthread.h b/ace/config-sco-5.0.0-fsu-pthread.h deleted file mode 100644 index 2c873f48c87..00000000000 --- a/ace/config-sco-5.0.0-fsu-pthread.h +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#include "ace/config-g++-common.h" -#include "ace/config-sco-5.0.0.h" -#include "ace/config-fsu-pthread.h" - -#define ACE_HAS_GNU_CSTRING_H - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h deleted file mode 100644 index 70ce1167694..00000000000 --- a/ace/config-sco-5.0.0-mit-pthread.h +++ /dev/null @@ -1,178 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SCO UNIX -// version 5.0 with MIT pthreads. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if !defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" - // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION. - // Maybe it will work? -# undef ACE_HAS_TEMPLATE_SPECIALIZATION -#endif /* __GNUG__ */ - -// Compiling for SCO. -#if !defined (SCO) -#define SCO -#define _SVID3 -#endif /* SCO */ - -#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0 -#define ACE_HAS_SIG_MACROS -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#if defined (SCO) && !defined (MAXPATHLEN) -#define MAXPATHLEN 1023 -#endif /* SCO */ - -#define ACE_LACKS_PWD_FUNCTIONS -#define ACE_HAS_BIG_FD_SET - -//#define ACE_LACKS_SYSCALL -//#define ACE_LACKS_STRRECVFD -//#define ACE_NEEDS_FTRUNCATE -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_MADVISE - -#define ACE_HAS_REENTRANT_FUNCTIONS - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_NONCONST_MSGSND -// #define ACE_LACKS_POSIX_PROTOTYPES -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports Term Ioctls -#define ACE_HAS_TERM_IOCTLS - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -//#define ACE_HAS_SYSCALL_H - -// Fixes a problem with HP/UX not wrapping the mmap(2) header files -// with extern "C". -//#define ACE_HAS_BROKEN_MMAP_H - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Header files lack t_errno for ACE_TLI. -//#define ACE_LACKS_T_ERRNO - -// Compiler/platform supports poll(). -// #define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler supports the ssize_t typedef. -//#define ACE_HAS_SSIZE_T - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// ??? -// #define ACE_HAS_SUNOS4_GETTIMEOFDAY -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -// HP/UX has an undefined syscall for GETRUSAGE... -//#define ACE_HAS_SYSCALL_GETRUSAGE - -// Note, this only works if the flag is set above! -//#define ACE_HAS_GETRUSAGE - -// Platform uses int for select() rather than fd_set. -#define ACE_HAS_SELECT_H - -// Platform has prototypes for ACE_TLI. -#define ACE_HAS_TLI -//#define ACE_HAS_SVR4_TLI -#define ACE_HAS_T_OPMGMT -#define ACE_HAS_TLI_PROTOTYPES -#define ACE_HAS_TIMOD_H -#define ACE_HAS_TIUSER_H -#define ACE_LACKS_T_ERRNO - -// Platform has the XLI version of ACE_TLI. -// #define ACE_HAS_XLI - -#define ACE_HAS_GNU_CSTRING_H - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -#define ACE_LACKS_SYSTIME_H -#define ACE_HAS_INLINED_OSCALLS - -#define ACE_HAS_STRBUF_T -#define ACE_HAS_STREAMS -//#define ACE_HAS_STREAM_PIPES -#define ACE_HAS_IP_MULTICAST - -// Threads -#define ACE_HAS_THREADS -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREADS_STD -#define ACE_LACKS_PTHREAD_CANCEL -#define ACE_HAS_SIGWAIT -//#define ACE_HAS_PTHREAD_YIELD_VOID_PTR -//#define ACE_HAS_PTHREAD_ATTR_INIT -//#define ACE_HAS_PTHREAD_ATTR_DESTROY -#define ACE_LACKS_THREAD_PROCESS_SCOPING -//#define ACE_LACKS_THREAD_STACK_ADDR -// If ACE doesn't compile due to the lack of these methods, please -// send email to schmidt@cs.wustl.edu reporting this. -// #define ACE_LACKS_CONDATTR_PSHARED -// #define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SETSCHED -#define ACE_HAS_POSIX_TIME - -#include -#include - -#define ACE_LACKS_TIMEDWAIT_PROTOTYPES -#define ACE_HAS_RECV_TIMEDWAIT -#define ACE_HAS_RECVFROM_TIMEDWAIT -#define ACE_HAS_RECVMSG_TIMEDWAIT -#define ACE_HAS_SEND_TIMEDWAIT -#define ACE_HAS_SENDTO_TIMEDWAIT -#define ACE_HAS_SENDMSG_TIMEDWAIT -#define ACE_HAS_READ_TIMEDWAIT -#define ACE_HAS_READV_TIMEDWAIT -#define ACE_HAS_WRITE_TIMEDWAIT -#define ACE_HAS_WRITEV_TIMEDWAIT -#define ACE_HAS_DIRENT - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sco-5.0.0-nothread.h b/ace/config-sco-5.0.0-nothread.h deleted file mode 100644 index ca241adbd1d..00000000000 --- a/ace/config-sco-5.0.0-nothread.h +++ /dev/null @@ -1,14 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#include "ace/config-g++-common.h" -#include "ace/config-sco-5.0.0.h" - -#define ACE_HAS_GNU_CSTRING_H - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h deleted file mode 100644 index b8a2b738182..00000000000 --- a/ace/config-sco-5.0.0.h +++ /dev/null @@ -1,110 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_CONFIG_SCO_5_0_0_H -#define ACE_CONFIG_SCO_5_0_0_H -#include "ace/pre.h" - -// Compiling for SCO. -#if !defined (SCO) -#define SCO -#endif /* SCO */ - -#if defined (SCO) && !defined (MAXPATHLEN) -#define MAXPATHLEN 1023 -#endif /* SCO */ - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_SIG_MACROS -#define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_STRRECVFD -#define ACE_NEEDS_FTRUNCATE -#define ACE_LACKS_MADVISE -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0 - -// Compiler doesn't support static data member templates. -//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_NONCONST_MSGSND -#define ACE_HAS_BIG_FD_SET -// #define ACE_LACKS_POSIX_PROTOTYPES -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports Term Ioctls -#define ACE_HAS_TERM_IOCTLS - -// Compiler/platform contains the file. -//#define ACE_HAS_SYSCALL_H - -// Fixes a problem with HP/UX not wrapping the mmap(2) header files -// with extern "C". -//#define ACE_HAS_BROKEN_MMAP_H - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Header files lack t_errno for ACE_TLI. -//#define ACE_LACKS_T_ERRNO - -// Compiler/platform supports poll(). -// #define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler supports the ssize_t typedef. -//#define ACE_HAS_SSIZE_T - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -// HP/UX has an undefined syscall for GETRUSAGE... -//#define ACE_HAS_SYSCALL_GETRUSAGE - -// Note, this only works if the flag is set above! -//#define ACE_HAS_GETRUSAGE - -// Platform uses int for select() rather than fd_set. -#define ACE_HAS_SELECT_H - -// Platform has prototypes for ACE_TLI. -#define ACE_HAS_TLI_PROTOTYPES -// Platform has the XLI version of ACE_TLI. -// #define ACE_HAS_XLI - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -#define ACE_LACKS_SYSTIME_H -#define ACE_LACKS_STRCASECMP - -// #define ACE_HAS_POSIX_TIME -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_DIRENT -#define ACE_LACKS_READDIR_R -#define ACE_HAS_GPERF - -#include "ace/post.h" -#endif /* ACE_CONFIG_SCO_5_0_0_H */ diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h deleted file mode 100644 index b1d5f485e00..00000000000 --- a/ace/config-sunos4-g++.h +++ /dev/null @@ -1,105 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// for SunOS4 platforms using the GNU g++ compiler - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - -#include "ace/config-g++-common.h" -// This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION. -// Maybe it will work? -#undef ACE_HAS_TEMPLATE_SPECIALIZATION - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_LACKS_SYSTIME_H -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID - -#define ACE_HAS_CHARPTR_SPRINTF -#define ACE_HAS_UNION_WAIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler/platform supports strerror (). -// #define ACE_HAS_STRERROR -#define ACE_HAS_SYS_ERRLIST - -// Header files lack t_errno for ACE_TLI. -// #define ACE_LACKS_T_ERRNO - -// Compiler/platform uses old malloc()/free() prototypes (ugh). -#define ACE_HAS_OLD_MALLOC - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler/platform supports struct strbuf -#define ACE_HAS_STRBUF_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H -// Platform supports ACE_TLI tiuser header. -// #define ACE_HAS_TIUSER_H - -// Platform has ACE_TLI. -// #define ACE_HAS_TLI - -#define ACE_LACKS_U_LONGLONG_T - -#define ACE_LACKS_DIFFTIME -#define ACE_HAS_DIRENT - -#define ACE_HAS_SUNOS4_SIGNAL_T -#define ACE_HAS_CPLUSPLUS_HEADERS -#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 6)) -#define ACE_HAS_SYSENT_H -#endif -#define ACE_HAS_ALLOCA -// Compiler/platform has -#define ACE_HAS_ALLOCA_H -#define ACE_HAS_SVR4_GETTIMEOFDAY -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h deleted file mode 100644 index e0738e124a8..00000000000 --- a/ace/config-sunos4-lucid3.2.h +++ /dev/null @@ -1,95 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work -// for SunOS4 platforms using the Lucid 3.2 compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_SYS_ERRLIST -#define ACE_HAS_CHARPTR_SPRINTF -#define ACE_HAS_UNION_WAIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform supports alloca() -#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Header files lack t_errno for ACE_TLI. -// #define ACE_LACKS_T_ERRNO - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler/platform supports struct strbuf -#define ACE_HAS_STRBUF_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Compiler/platform supports strerror (). -// #define ACE_HAS_STRERROR - -// SunOS 4 style prototype. -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform provides header. -#define ACE_HAS_SYSENT_H - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Platform supports ACE_TLI tiuser header. -// #define ACE_HAS_TIUSER_H - -// Platform has ACE_TLI. -// #define ACE_HAS_TLI - -#define ACE_NEEDS_DEV_IO_CONVERSION - -#define ACE_LACKS_U_LONGLONG_T - -#define ACE_LACKS_DIFFTIME - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos4-sun3.x.h b/ace/config-sunos4-sun3.x.h deleted file mode 100644 index 88acc3e5ded..00000000000 --- a/ace/config-sunos4-sun3.x.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS4 -// platforms using the SunC++ 3.0.x compiler. - -#ifndef ACE_CONFIG_H - -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_LACKS_POSIX_PROTOTYPES -#define ACE_HAS_UNION_WAIT -#define ACE_HAS_SPARCWORKS_401_SIGNALS - -#define ACE_CONFIG_H -#define ACE_HAS_CHARPTR_SPRINTF -#define ACE_HAS_SYS_ERRLIST - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Header files lack t_errno for ACE_TLI. -// #define ACE_LACKS_T_ERRNO - -// Compiler/platform uses old malloc()/free() prototypes (ugh). -#define ACE_HAS_OLD_MALLOC - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler/platform supports struct strbuf -#define ACE_HAS_STRBUF_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// SunOS 4 style prototype. -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Platform supports ACE_TLI tiuser header. -// #define ACE_HAS_TIUSER_H - -// Platform has ACE_TLI. -// #define ACE_HAS_TLI - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_SIGNED_CHAR - -#define ACE_NEEDS_DEV_IO_CONVERSION - -#define ACE_LACKS_U_LONGLONG_T - -#define ACE_LACKS_DIFFTIME - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h deleted file mode 100644 index 54ab33b2aa8..00000000000 --- a/ace/config-sunos4-sun4.1.4.h +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS4.1.4 -// platforms using the SunC++ 4.x compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_CHARPTR_SPRINTF -#define ACE_LACKS_SYSTIME_H -#define ACE_HAS_UNION_WAIT - -// Special addition to handle sunOS 4.1 which is unable to -// handle POSIX Prototypes ! -#define ACE_LACKS_POSIX_PROTOTYPES - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler/platform supports strerror (). -// #define ACE_HAS_STRERROR -#define ACE_HAS_SYS_ERRLIST - -// Header files lack t_errno for ACE_TLI. -// #define ACE_LACKS_T_ERRNO - -// Compiler/platform uses old malloc()/free() prototypes (ugh). -#define ACE_HAS_OLD_MALLOC - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler has brain-damaged SPARCwork signal prototype... -#define ACE_HAS_SPARCWORKS_401_SIGNALS - -// Compiler/platform supports struct strbuf -#define ACE_HAS_STRBUF_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// SunOS 4 style prototype. -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Platform supports ACE_TLI tiuser header. -// #define ACE_HAS_TIUSER_H - -// Platform has ACE_TLI. -// #define ACE_HAS_TLI - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_SIGNED_CHAR - -#define ACE_NEEDS_DEV_IO_CONVERSION - -#define ACE_LACKS_U_LONGLONG_T - -#define ACE_LACKS_DIFFTIME - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h deleted file mode 100644 index a5f1fd23063..00000000000 --- a/ace/config-sunos4-sun4.x.h +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work -// for SunOS4 platforms using the SunC++ 4.x compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define ACE_LACKS_SYSTIME_H -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID - -#define ACE_HAS_CHARPTR_SPRINTF -#define ACE_LACKS_POSIX_PROTOTYPES -// #define ACE_HAS_UNION_WAIT - -// Maximum compensation (10 ms) for early return from timed ::select (). -#if !defined (ACE_TIMER_SKEW) -# define ACE_TIMER_SKEW 10 * 1000 -#endif /* ACE_TIMER_SKEW */ - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler/platform supports strerror (). -// #define ACE_HAS_STRERROR -#define ACE_HAS_SYS_ERRLIST - -// Header files lack t_errno for ACE_TLI. -// #define ACE_LACKS_T_ERRNO - -// Compiler/platform uses old malloc()/free() prototypes (ugh). -#define ACE_HAS_OLD_MALLOC - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler has brain-damaged SPARCwork signal prototype... -#define ACE_HAS_SPARCWORKS_401_SIGNALS - -// Compiler/platform supports struct strbuf -#define ACE_HAS_STRBUF_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// SunOS 4 style prototype. -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Platform supports ACE_TLI tiuser header. -// #define ACE_HAS_TIUSER_H - -// Platform has ACE_TLI. -// #define ACE_HAS_TLI - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_SIGNED_CHAR - -#define ACE_NEEDS_DEV_IO_CONVERSION - -#define ACE_LACKS_U_LONGLONG_T - -#define ACE_LACKS_DIFFTIME - -// 10 millisecond fudge factor to account for Solaris timers... -#if !defined (ACE_TIMER_SKEW) -#define ACE_TIMER_SKEW 1000 * 10 -#endif /* ACE_TIMER_SKEW */ - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h deleted file mode 100644 index 84a685f9153..00000000000 --- a/ace/config-sunos5.4-centerline-2.x.h +++ /dev/null @@ -1,162 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS 5.4 -// platforms using the Centerline 2.x C++ compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#define ACE_HAS_TEMPLATE_SPECIALIZATION - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_BROKEN_SENDMSG - -// The SunOS 5.x version of rand_r is inconsistent with the header files... -#define ACE_HAS_BROKEN_RANDR - -// Platform supports system configuration information. -#define ACE_HAS_SYSINFO - -// Platform supports the POSIX regular expression library -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Platform has terminal ioctl flags like TCGETS and TCSETS. -#define ACE_HAS_TERM_IOCTLS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform supports SunOS high resolution timers. -#define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_SVR4_SIGNAL_T - -// Platform lacks pthread_sigaction -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports sys_siglist array. -#define ACE_HAS_SYS_SIGLIST - -/* Turn off the following defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -// Platform supports threads. -#define ACE_HAS_THREADS - -// Platform supports Solaris threads. -#define ACE_HAS_STHREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* end threading defines */ - -#define ACE_HAS_PRIOCNTL -#define ACE_NEEDS_LWP_PRIO_SET - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -#define ACE_NEEDS_DEV_IO_CONVERSION - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_IDTYPE_T -#define ACE_HAS_DIRENT - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h deleted file mode 100644 index 3059e3c2aae..00000000000 --- a/ace/config-sunos5.4-g++.h +++ /dev/null @@ -1,181 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS 5.4 -// platforms using the GNU g++ compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - -#include "ace/config-g++-common.h" -#define ACE_HAS_GNU_CSTRING_H - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -#define ACE_HAS_TERM_IOCTLS - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_BROKEN_SENDMSG - -// The SunOS 5.x version of rand_r is inconsistent with the header files... -#define ACE_HAS_BROKEN_RANDR - -// Platform supports system configuration information. -#define ACE_HAS_SYSINFO - -// Platform supports the POSIX regular expression library -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform supports SunOS high resolution timers. -#define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Platform lacks pthread_sigaction -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports sys_siglist array. -#define ACE_HAS_SYS_SIGLIST - -/* Turn off the following defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# if !defined (_REENTRANT) -# define _REENTRANT -# endif /* _REENTRANT */ -#endif /* !ACE_MT_SAFE */ - -// Platform supports Solaris threads. -#define ACE_HAS_STHREADS - -// Platform supports threads. -#define ACE_HAS_THREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* end threading defines */ - -#define ACE_HAS_PRIOCNTL -#define ACE_NEEDS_LWP_PRIO_SET - -// Platform supports TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports TLI. -#define ACE_HAS_TLI - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_IDTYPE_T -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h deleted file mode 100644 index 7e09eb292f3..00000000000 --- a/ace/config-sunos5.4-sunc++-4.x.h +++ /dev/null @@ -1,194 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS 5.4 -// platforms using the SunC++ 4.0.x compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#define ACE_HAS_TEMPLATE_SPECIALIZATION - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_BROKEN_SENDMSG - -// The SunOS 5.x version of rand_r is inconsistent with the header files... -#define ACE_HAS_BROKEN_RANDR - -// Platform supports system configuration information. -#define ACE_HAS_SYSINFO - -// Platform supports the POSIX regular expression library. -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Platform has terminal ioctl flags like TCGETS and TCSETS. -#define ACE_HAS_TERM_IOCTLS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform supports SunOS high resolution timers. -#define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_SVR4_SIGNAL_T - -// Platform lacks pthread_sigaction -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports sys_siglist array. -#define ACE_HAS_SYS_SIGLIST - -/* Turn off the following defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -// Platform supports Solaris threads. -#define ACE_HAS_STHREADS - -// Platform supports threads. -#define ACE_HAS_THREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* end threading defines */ - -#define ACE_HAS_PRIOCNTL -#define ACE_NEEDS_LWP_PRIO_SET - -// Reactor detects deadlock -// #define ACE_REACTOR_HAS_DEADLOCK_DETECTION - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_SIGNED_CHAR - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -#define ACE_NEEDS_DEV_IO_CONVERSION - -// Turns off the tracing feature. -// #define ACE_NTRACE 0 -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_IDTYPE_T - -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -# if defined (ACE_HAS_EXCEPTIONS) - // If exceptions are enabled and we are using Sun/CC then - // throws an exception instead of returning 0. -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h deleted file mode 100644 index a884f01dab8..00000000000 --- a/ace/config-sunos5.5.h +++ /dev/null @@ -1,376 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file is designed to work for SunOS 5.5 platforms -// using the following compilers: -// * Sun C++ 4.2 and later (including 5.x), patched as noted below -// * g++ 2.7.2 and later, including egcs -// * Green Hills 1.8.8 and later - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// Before we do anything, we should include to -// ensure that things are set up properly. -#include - -// Compiler version-specific settings: -#if defined (__SUNPRO_CC) -# if (__SUNPRO_CC < 0x410) - // The following might not be necessary, but I can't tell: my build - // with Sun C++ 4.0.1 never completes. -# define ACE_NEEDS_DEV_IO_CONVERSION -# elif (__SUNPRO_CC >= 0x420) -# define ACE_HAS_ANSI_CASTS -# if (__SUNPRO_CC >= 0x500) - // string.h and memory.h conflict for memchr definitions -# define ACE_LACKS_MEMORY_H - // Sun C++ 5.0 supports the `using' and `typename' keywords. -# define ACE_HAS_TYPENAME_KEYWORD -# define ACE_TEMPLATES_REQUIRE_SOURCE - // If -compat=4 is turned on, the old 4.2 settings for iostreams are used, - // but the newer, explicit instantiation is used (above) -# if (__SUNPRO_CC_COMPAT >= 5) -# define ACE_HAS_USING_KEYWORD -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION - // Note that SunC++ 5.0 doesn't yet appear to support - // ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION... - // However, Forte 6 Update 1 does... if this needs to be backed up, - // change this to an earlier version. -# if (__SUNPRO_CC >= 0x520) -# define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION -# endif /* __SUNPRO_CC >= 0x530 */ -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_THR_C_DEST -# endif /* __SUNPRO_CC_COMPAT >= 5 */ -# if !defined (ACE_HAS_EXCEPTIONS) - // See /opt/SUNWspro_5.0/SC5.0/include/CC/stdcomp.h: -# define _RWSTD_NO_EXCEPTIONS 1 -# endif /* ! ACE_HAS_EXCEPTIONS */ -# elif (__SUNPRO_CC == 0x420) || (__SUNPRO_CC == 0x410) -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -# endif /* __SUNPRO_CC >= 0x500 */ -# endif /* __SUNPRO_CC >= 0x420 */ - -# define ACE_CAST_CONST const -# define ACE_HAS_HI_RES_TIMER -# define ACE_HAS_SIG_C_FUNC /* Sun CC 5.0 needs this, 4.2 doesn't mind. */ -# define ACE_HAS_TEMPLATE_SPECIALIZATION -# define ACE_HAS_XPG4_MULTIBYTE_CHAR -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_SIGNED_CHAR - - // ACE_HAS_EXCEPTIONS precludes -noex in - // include/makeinclude/platform_macros.GNU. But beware, we have - // seen problems with exception handling on multiprocessor - // UltraSparcs: threaded executables core dump when threads exit. - // This problem does not seem to appear on single-processor UltraSparcs. - // And, it is solved with the application of patch - // 104631-02 "C++ 4.2: Jumbo Patch for C++ 4.2 on Solaris SPARC" - // to Sun C++ 4.2. - // To provide optimum performance, ACE_HAS_EXCEPTIONS is disabled by - // default. It can be enabled by adding "exceptions=1" to the "make" - // invocation. See include/makeinclude/platform_sunos5_sunc++.GNU - // for details. - -# if defined (ACE_HAS_EXCEPTIONS) - // If exceptions are enabled and we are using Sun/CC then - // throws an exception instead of returning 0. -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ - - /* If you want to disable threading with Sun CC, remove -mt - from your CFLAGS, e.g., using make threads=0. */ - -#elif defined (__GNUG__) - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS -# include "ace/config-g++-common.h" -# define ACE_HAS_HI_RES_TIMER - // Denotes that GNU has cstring.h as standard, to redefine memchr(). -# define ACE_HAS_GNU_CSTRING_H -# define ACE_HAS_XPG4_MULTIBYTE_CHAR - -# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0 - // ACE_MT_SAFE is #defined below, for all compilers. -# if !defined (_REENTRANT) - /* If you want to disable threading, comment out the following - line. Or, add -DACE_MT_SAFE=0 to your CFLAGS, e.g., using - make threads=0. */ -# define _REENTRANT -# endif /* _REENTRANT */ -# endif /* !ACE_MT_SAFE */ - -#elif defined (ghs) - -# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0 - // ACE_MT_SAFE is #defined below, for all compilers. -# if !defined (_REENTRANT) - /* If you want to disable threading, comment out the following - line. Or, add -DACE_MT_SAFE=0 to your CFLAGS, e.g., using - make threads=0. */ -# define _REENTRANT -# endif /* _REENTRANT */ -# endif /* !ACE_MT_SAFE */ - -# define ACE_CONFIG_INCLUDE_GHS_COMMON -# include "ace/config-ghs-common.h" - - // To avoid warning about inconsistent declaration between Sun's - // stdlib.h and Green Hills' ctype.h. -# include - - // IOStream_Test never halts with Green Hills 1.8.9. -# define ACE_LACKS_ACE_IOSTREAM - -#elif defined (__KCC) /* KAI compiler */ - -# define ACE_HAS_ANSI_CASTS -# include "ace/config-kcc-common.h" - -#else /* ! __SUNPRO_CC && ! __GNUG__ && ! ghs */ -# error unsupported compiler in ace/config-sunos5.5.h -#endif /* ! __SUNPRO_CC && ! __GNUG__ && ! ghs */ - -#if !defined (__ACE_INLINE__) -// NOTE: if you have link problems with undefined inline template -// functions with Sun C++, be sure that the #define of __ACE_INLINE__ -// below is not commented out. -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Platform supports the POSIX regular expression library. -// NOTE: please comment out the ACE_HAS_REGEX #define if you -// have link problems with g++ or egcs on SunOS 5.5. -#define ACE_HAS_REGEX - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// select()'s timeval arg is not declared as const and may be modified -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_HAS_UALARM -#define ACE_LACKS_UALARM_PROTOTYPE - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Platform supports system configuration information. -#define ACE_HAS_SYSINFO - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -// Platform has terminal ioctl flags like TCGETS and TCSETS. -#define ACE_HAS_TERM_IOCTLS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// ACE_HAS_CLOCK_GETTIME requires linking with -lposix4. -#define ACE_HAS_CLOCK_GETTIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports sys_siglist array. -#define ACE_HAS_SYS_SIGLIST - -// SunOS 5.5.x does not support mkstemp -#define ACE_LACKS_MKSTEMP - -// Platform has posix getpwnam_r -#if (defined (_POSIX_C_SOURCE) && _POSIX_C_SOURCE - 0 >= 199506L) || \ - defined(_POSIX_PTHREAD_SEMANTICS) -# define ACE_HAS_POSIX_GETPWNAM_R -#endif /* _POSIX_C_SOURCE || _POSIX_PTHREAD_SEMANTICS */ - -#if defined (_REENTRANT) || \ - (defined (_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L)) || \ - defined (_POSIX_PTHREAD_SEMANTICS) - // Compile using multi-thread libraries. -# define ACE_HAS_THREADS - -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif /* ACE_MT_SAFE */ - - // Platform supports POSIX pthreads *and* Solaris threads, by - // default! If you only want to use POSIX pthreads, add - // -D_POSIX_PTHREAD_SEMANTICS to your CFLAGS. Or, #define it right - // here. See the Intro (3) man page for information on - // -D_POSIX_PTHREAD_SEMANTICS. -# if defined (_POSIX_PTHREAD_SEMANTICS) -# define ACE_LACKS_RWLOCK_T -# else -# define ACE_HAS_STHREADS -# endif /* ! _POSIX_PTHREAD_SEMANTICS */ - -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_STD - // . . . but only supports SCHED_OTHER scheduling policy -# define ACE_HAS_ONLY_SCHED_OTHER -# define ACE_HAS_SIGWAIT -# define ACE_HAS_SIGTIMEDWAIT -# define ACE_HAS_SIGSUSPEND - - // Compiler/platform has thread-specific storage -# define ACE_HAS_THREAD_SPECIFIC_STORAGE - - // Platform supports reentrant functions (i.e., all the POSIX *_r functions). -# define ACE_HAS_REENTRANT_FUNCTIONS - -# define ACE_NEEDS_LWP_PRIO_SET -# define ACE_HAS_THR_YIELD -# define ACE_LACKS_PTHREAD_YIELD -#endif /* _REENTRANT || _POSIX_C_SOURCE >= 199506L || \ - _POSIX_PTHREAD_SEMANTICS */ - -# define ACE_HAS_PRIOCNTL - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform has broken t_error() prototype. -#define ACE_HAS_BROKEN_T_ERROR - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -#define ACE_HAS_STRPTIME - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_HAS_GETPAGESIZE 1 - -#define ACE_HAS_STL_MAP_CONFLICT - -// Sieg - gcc 2.95.1 declares queue in stream.h. Might want to change -// the == to >= to allow for future versions -#if !( __GNUG__ && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95) ) -#define ACE_HAS_STL_QUEUE_CONFLICT -#endif /* !( __GNUG__ && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95) ) */ -#define ACE_HAS_IDTYPE_T - -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT -#define ACE_HAS_MEMCHR - -#if defined (__SUNPRO_CC) -# define ACE_CC_NAME "SunPro C++" -# define ACE_CC_MAJOR_VERSION (__SUNPRO_CC >> 8) -# define ACE_CC_MINOR_VERSION (__SUNPRO_CC & 0x00ff) -# define ACE_CC_BETA_VERSION (0) -#elif defined (__GNUG__) -# define ACE_CC_MAJOR_VERSION __GNUC__ -# define ACE_CC_MINOR_VERSION __GNUC_MINOR__ -# define ACE_CC_BETA_VERSION (0) -# if __GNUC_MINOR__ >= 90 -# define ACE_CC_NAME "egcs" -# else -# define ACE_CC_NAME "g++" -# endif /* __GNUC_MINOR__ */ -#endif /* __GNUG__ */ - -#if defined (i386) -# define ACE_HAS_X86_STAT_MACROS -#endif /* i386 */ - -#define ACE_MALLOC_ALIGN 8 -#define ACE_LACKS_SETREUID_PROTOTYPE -#define ACE_LACKS_SETREGID_PROTOTYPE - -// Solaris does indeed implement the inet_aton() function, but it is -// found in `libresolv.*'. It doesn't seem worth it to link another -// library just for that function. Just use the emulation in ACE that -// has been used for years. -#define ACE_LACKS_INET_ATON - -#if defined (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) -#undef ACE_HAS_PROC_FS -#undef ACE_HAS_PRUSAGE_T -#endif /* (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) */ -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.6.h b/ace/config-sunos5.6.h deleted file mode 100644 index 81127a1a809..00000000000 --- a/ace/config-sunos5.6.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS 5.6 -// platforms using the SunC++ 4.x or g++ compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.5 config file, then add SunOS 5.6 updates below. - -#include "ace/config-sunos5.5.h" - -#if defined(__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 95 -// gcc-2.95 fixes this problem for us! -#undef ACE_HAS_STL_QUEUE_CONFLICT -#endif /* __GNUC__ */ - -#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE > 2) || \ - defined (__EXTENSIONS__) -// The asctime_r/ctime_r parameters change at POSIX.1c-1995 -# if (defined (_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199506L) -# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -# endif /* POSIX_C_SOURCE >= 199506L */ -# define ACE_HAS_SIGWAIT -// Hack 'cuz _POSIX_C_SOURCE > 2 and -DEXTENSIONS hides this. -# include - extern "C" int madvise(caddr_t, size_t, int); -#endif /* _POSIX_C_SOURCE > 2 || __EXTENSIONS__ */ - -// Support for the SunC++ 5.2 compiler. -// Do not undefine for compat mode < 5 -#if defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510 -#if defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT >= 5) -#ifdef ACE_LACKS_ACE_IOSTREAM -#undef ACE_LACKS_ACE_IOSTREAM -#endif /* ACE_LACKS_ACE_IOSTREAM */ -#endif /* defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT >= 5) */ - -#ifndef ACE_LACKS_UNBUFFERED_STREAMBUF -#define ACE_LACKS_UNBUFFERED_STREAMBUF 1 -#endif /* ACE_LACKS_UNBUFFERED_STREAMBUF */ -#ifndef ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#ifndef ACE_HAS_STD_TEMPLATE_SPECIALIZATION -#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION 1 -#endif /* ACE_HAS_STD_TEMPLATE_SPECIALIZATION */ -#ifndef ACE_HAS_ANSI_CASTS -#define ACE_HAS_ANSI_CASTS 1 -#endif /* ACE_HAS_ANSI_CASTS */ -#ifndef ACE_HAS_TEMPLATE_TYPEDEFS -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ -// Forte 7 seems to botch this one... -#if __SUNPRO_CC == 0x540 -#undef ACE_HAS_TEMPLATE_TYPEDEFS -#endif -#ifndef ACE_HAS_TYPENAME_KEYWORD -#define ACE_HAS_TYPENAME_KEYWORD 1 -#endif /* ACE_HAS_TYPENAME_KEYWORD */ -#ifndef ACE_HAS_USING_KEYWORD -#define ACE_HAS_USING_KEYWORD 1 -#endif /* ACE_HAS_USING_KEYWORD */ -#ifndef ACE_HAS_THR_C_DEST -#define ACE_HAS_THR_C_DEST 1 -#endif /* ACE_HAS_THR_C_DEST */ -#ifndef ACE_HAS_THR_C_FUNC -#define ACE_HAS_THR_C_FUNC 1 -#endif /* ACE_HAS_THR_C_FUNC */ -#ifndef ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 -#endif /* ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES */ -#ifndef ACE_HAS_SIG_C_FUNC -#define ACE_HAS_SIG_C_FUNC 1 -#endif /* ACE_HAS_SIG_C_FUNC */ -#ifndef ACE_HAS_STDCPP_STL_INCLUDES -#define ACE_HAS_STDCPP_STL_INCLUDES 1 -#endif /* ACE_HAS_STDCPP_STL_INCLUDES */ -#ifndef ACE_HAS_STRING_CLASS -#define ACE_HAS_STRING_CLASS 1 -#endif /* ACE_HAS_STRING_CLASS */ -#ifndef ACE_HAS_STANDARD_CPP_LIBRARY -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#ifndef ACE_HAS_STDCPP_STL_INCLUDES -#define ACE_HAS_STDCPP_STL_INCLUDES 1 -#endif /* ACE_HAS_STDCPP_STL_INCLUDES */ -#ifndef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ -#ifndef ACE_HAS_TEMPLATE_SPECIALIZATION -#define ACE_HAS_TEMPLATE_SPECIALIZATION 1 -#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ -#ifndef ACE_LACKS_IOSTREAM_FX -#define ACE_LACKS_IOSTREAM_FX 1 -#endif /* ACE_LACKS_IOSTREAM_FX */ -#ifndef ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -#endif /* ACE_LACKS_LINEBUFFERED_STREAMBUF */ - -#endif /* defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510 */ - -// SunOS 5.6 and above support mkstemp -#undef ACE_LACKS_MKSTEMP - - -// SunOS 5.6 has AIO calls. -#if !defined (ACE_HAS_AIO_CALLS) -#define ACE_HAS_AIO_CALLS -#endif /* ACE_HAS_AIO_CALLS */ - -#if !defined (ACE_HAS_POSIX_REALTIME_SIGNALS) -#define ACE_HAS_POSIX_REALTIME_SIGNALS -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - -#if !defined (ACE_HAS_POSIX_MESSAGE_PASSING) -#define ACE_HAS_POSIX_MESSAGE_PASSING -#endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ - -#if !defined (ACE_HAS_POSIX_SEM) -#define ACE_HAS_POSIX_SEM -#endif /* ACE_HAS_POSIX_SEM */ - -// Sunos 5.6's aio_* with RT signals is broken. -#if !defined (ACE_POSIX_AIOCB_PROACTOR) -#define ACE_POSIX_AIOCB_PROACTOR -#endif /* ACE_POSIX_AIOCB_PROACTOR */ - -// SunOS 5.6 has a buggy select -#define ACE_HAS_LIMITED_SELECT - -// SunOS 5.6 introduced shm_open, but need to turn on POSIX.1b or higher -// to pick it up. -#if defined (_POSIX_C_SOURCE) && (_POSIX_C_SOURCE > 2) -# define ACE_HAS_SHM_OPEN -#endif /* _POSIX_C_SOURCE > 2 */ - -// The struct msghdr is conditional on SunOS 5.6 based on _XPG4_2 -#if defined(_XPG4_2) -# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#endif /* _XPG4_2 */ - -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.7.h b/ace/config-sunos5.7.h deleted file mode 100644 index 0d101e0fc25..00000000000 --- a/ace/config-sunos5.7.h +++ /dev/null @@ -1,90 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS 5.7 -// (Solaris 7) platforms using the SunC++ 4.x, 5.x, or g++ compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.6 config file, then add SunOS 5.7 updates below. - -#include "ace/config-sunos5.6.h" - -#if defined (__GNUG__) -# if __GNUC__ <= 2 && __GNUC_MINOR__ < 8 - // Assume that later g++ were built on SunOS 5.7, so they don't - // have these problems . . . - - // Disable the following, because g++ 2.7.2.3 can't handle it. - // Maybe later g++ versions can? -# undef ACE_HAS_XPG4_MULTIBYTE_CHAR - - // The Solaris86 g++ 2.7.2.3 sys/types.h doesn't have these . . . - typedef long t_scalar_t; /* historical versions */ - typedef unsigned long t_uscalar_t; - typedef void *timeout_id_t; -# endif /* __GNUC__ <= 2 && __GNUC_MINOR__ < 8 */ - -#elif defined (ghs) - // SunOS 5.7's /usr/include/sys/procfs_isa.h needs uint64_t, - // but /usr/include/sys/int_types.h doesn't #define it because - // _NO_LONGLONG is # -# undef ACE_HAS_PROC_FS -# undef ACE_HAS_PRUSAGE_T - -#elif defined (__KCC) -typedef unsigned long long uint64_t; -#endif /* __GNUG__ || ghs || __KCC */ - -// SunOS 5.7 supports SCHED_FIFO and SCHED_RR, as well as SCHED_OTHER. -#undef ACE_HAS_ONLY_SCHED_OTHER - -// SunOS 5.7 gets this right . . . -#undef ACE_HAS_BROKEN_T_ERROR - -// And doesn't need to set LWP priorities, as shown by -// performance-tests/Misc/preempt. -#undef ACE_NEEDS_LWP_PRIO_SET - -// SunOS 5.7 can support Real-Time Signals and POSIX4 AIO operations -// are supported. - -#if !defined (ACE_HAS_AIO_CALLS) -#define ACE_HAS_AIO_CALLS -#endif /* !ACE_HAS_AIO_CALLS */ - -#if defined (ACE_POSIX_AIOCB_PROACTOR) -#undef ACE_POSIX_AIOCB_PROACTOR -#endif /* ACE_POSIX_AIOCB_PROACTOR */ - -// This is anyway default. -#define ACE_POSIX_SIG_PROACTOR - -#ifdef ACE_HAS_LIMITED_SELECT -#undef ACE_HAS_LIMITED_SELECT -#endif /* ACE_HAS_LIMITED_SELECT */ - -// SunOS 5.7 has socklen_t -#define ACE_HAS_SOCKLEN_T - -// snprintf() is available at least from Solaris 7 on. If it can be determined -// that it's also available in Solaris 2.6, this can be moved into -// config-sunos5.6.h. -#define ACE_HAS_SNPRINTF - -#if defined (__sparcv9) -#define ERRMAX 256 /* Needed for following define */ -#define ACE_LACKS_SYS_NERR -#define _LP64 -#define ACE_SIZEOF_LONG 8 /* Needed to circumvent compiler bug #4294969 */ -#endif /* __sparcv9 */ - -#if (defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4)) /* XPG4 or XPG4v2 */ -// 2 parameter wcstok() -#else /* XPG4 or XPG4v2 */ -# define ACE_HAS_3_PARAM_WCSTOK -#endif - -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.8.h b/ace/config-sunos5.8.h deleted file mode 100644 index de6803e9822..00000000000 --- a/ace/config-sunos5.8.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS 5.8 -// (Solaris 8) platforms using the SunC++ 4.x, 5.x, 6.x, or g++ compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.7 config, then add any SunOS 5.8 updates below. -#include "ace/config-sunos5.7.h" - -// The range of thread priorities for 5.8 differs from 5.7 in the -// minimum priority for the SCHED_OTHER policy (i.e., -// ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) -20 - -# if defined (_POSIX_PTHREAD_SEMANTICS) -# ifdef ACE_LACKS_RWLOCK_T -# undef ACE_LACKS_RWLOCK_T -# endif /* ACE_LACKS_RWLOCK_T */ -# endif /* _POSIX_PTHREAD_SEMANTICS */ - -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.9.h b/ace/config-sunos5.9.h deleted file mode 100644 index 5107546f49b..00000000000 --- a/ace/config-sunos5.9.h +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SunOS 5.9 -// (Solaris 9) platforms using the SunC++ 5.x (Forte 6 and 7), or g++ -// compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.8 config, then add any SunOS 5.9 updates below. -#include "ace/config-sunos5.8.h" - -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-tandem.h b/ace/config-tandem.h deleted file mode 100644 index 47777c9f53d..00000000000 --- a/ace/config-tandem.h +++ /dev/null @@ -1,445 +0,0 @@ -/* -*- C++ -*- */ -// Testing TANDEM -// $Id$ - -// The following configuration file is designed to work for Tandems NonStop-UX -// 4.2MP platforms using the NCC 3.20 compiler. - -// Note this is a test version it might include several errors I -// have done a test and set/unset until I errors disappered. -// Some of the options that should be set aren't because of the simple fact -// that i haven't the time to check what is wrong. -// e.g. widecharacter are supported but a wcstok which only take 2 parameters -// are included by the compiler, to get the correct wcstok that takes 3 params -// we must set _XOPEN_SOURCE and we get ALOT of errors and warnings. -// So this config is done to get things to start to work it isn't finished. -// Janne (Jan.Perman@osd.Ericsson.se) - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#define ACE_HAS_IDTYPE_T -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Tandem doesn't include this although they are defined -// in sys/time.h and sys/resource.h -#define ACE_LACKS_RLIMIT_PROTOTYPE // jjpp -// Tandem has a function to set t_errno (set_t_errno) -#define ACE_HAS_SET_T_ERRNO // jjpp - -//Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// OS/compiler omits the const from the sendmsg() prototype. -#define ACE_HAS_BROKEN_SENDMSG - -//OS/compiler's header files are inconsistent with libC definition of rand_r(). -//#define ACE_HAS_BROKEN_RANDR // Defines it the same way as sunos5.4 - -//Platform supports system configuration information -#define ACE_HAS_SYSINFO - -//Platform supports the POSIX regular expression library -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg -#define ACE_HAS_MSG - -//Compiler/platform contains the file. -#define ACE_HAS_SYSCALL_H - -//Platform provides header -#define ACE_HAS_SYSENT_H - -// Platform has terminal ioctl flags like TCGETS and TCSETS. -#define ACE_HAS_TERM_IOCTLS - -// ? ACE_HAS_AUTOMATIC_INIT_FINI Compiler/platform correctly calls -// init()/fini() for shared libraries - -//Platform supports POSIX O_NONBLOCK semantics -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Platform supports IP multicast -//#define ACE_HAS_IP_MULTICAST - -//Compiler/platform supports alloca() -#define ACE_HAS_ALLOCA -//Compiler/platform has -#define ACE_HAS_ALLOCA_H - -//Platform contains -#define ACE_HAS_POLL - -// Platform supports the POSIX struct timespec type -#define ACE_HAS_POSIX_TIME // As i understand it, but i'm in deep water -//Platform supports the SVR4 timestruc_t type - -//ACE_HAS_PROC_FS Platform supports the /proc file system - -//ACE_HAS_PRUSAGE_T Platform supports the prusage_t struct - - -// To get this to work a patch in sys/signal must be made -// typedef void SIG_FUNC_TYPE(int); -//#if defined (__cplusplus) -// void (*sa_handler)(int); -//#else -// ... -//#endif -//#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_TANDEM_SIGNALS -//Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T -//Platform supports SVR4 extended signals -#define ACE_HAS_SIGINFO_T -//Platform supports ucontext_t (which is used in the extended signal API). -#define ACE_HAS_UCONTEXT_T -//Compiler/platform supports SVR4 signal typedef -//#define ACE_HAS_SVR4_SIGNAL_T -//ACE_HAS_SVR4_SIGNAL_T - - -// Platform/compiler has the sigwait(2) prototype -#define ACE_HAS_SIGWAIT - -//Compiler/platform provides the sockio.h file -#define ACE_HAS_SOCKIO_H - -// Compiler supports the ssize_t typedef -#define ACE_HAS_SSIZE_T // Limits.h must be included - -//Platform supports STREAMS -#define ACE_HAS_STREAMS - -#define ACE_HAS_STREAM_PIPES -//Platform supports STREAM pipes - -//Compiler/platform supports strerror () -#define ACE_HAS_STRERROR - -//Compiler/platform supports struct strbuf -#define ACE_HAS_STRBUF_T - -//Compiler/platform supports SVR4 dynamic linking semantics -#define ACE_HAS_SVR4_DYNAMIC_LINKING -//Compiler/platform supports SVR4 gettimeofday() prototype -//#define ACE_HAS_SVR4_GETTIMEOFDAY // Defines it the same way as sunos5.4 - -//Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -//Platform provides header -#define ACE_HAS_SYS_FILIO_H - -//Platform supports TLI timod STREAMS module -#define ACE_HAS_TIMOD_H -//Platform supports TLI tiuser header -#define ACE_HAS_TIUSER_H - -//Platform supports TLI -#define ACE_HAS_TLI -//Platform provides TLI function prototypes -#define ACE_HAS_TLI_PROTOTYPES - -//Platform lacks streambuf "linebuffered ()". -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -// Platform lacks "signed char" type (broken!) -#define ACE_LACKS_SIGNED_CHAR - - -//? ACE_NEEDS_DEV_IO_CONVERSION Necessary with some compilers -//to pass ACE_TTY_IO as parameter to DEV_Connector. - -#define ACE_PAGE_SIZE 4096 -// Defines the page size of the system (not used on Win32 or -// with ACE_HAS_GETPAGESIZE). - -/****** THREAD SPECIFIC **********/ -/* If you want to remove threading then comment out the following four #defines .*/ -#if !defined (ACE_MT_SAFE) - #define ACE_MT_SAFE 1 //Compile using multi-thread libraries -#endif -#define ACE_HAS_THREADS //Platform supports threads -#define ACE_HAS_STHREADS //Platform supports Solaris threads - -// Compiler/platform has threadspecific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -//Platform supports thr_keydelete (e.g,. UNIXWARE) - -#define ACE_HAS_THR_MINSTACK // Tandem uses thr_minstack instead of thr_min_stack -#define ACE_LACKS_PRI_T // Tandem lacks pri_t -#define ACE_HAS_THR_KEYDELETE - -//ACE_HAS_REENTRANT_FUNCTIONS Platform supports reentrant -// functions (i.e., all the POSIX *_r functions). -//ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS Platform will recurse infinitely on -// thread exits from TSS cleanup routines (e.g., AIX). -//ACE_NEEDS_HUGE_THREAD_STACKSIZE Required by platforms with small -// default stacks. -//ACE_HAS_ONLY_SCHED_OTHER Platform, e.g., Solaris 2.5, only -// supports SCHED_OTHER POSIX scheduling policy. - - -//************************************* -//ACE_HAS_PTHREADS Platform supports POSIX Pthreads -//ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP Platform has pthread_condattr_ -// setkind_np(). -//ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP Platform has -// pthread_mutexattr_setkind_np(). -//ACE_HAS_THREAD_SELF Platform has thread_self() rather -// than pthread_self() (e.g., DCETHREADS and AIX) -//ACE_HAS_THR_C_DEST The pthread_keycreate() routine * -// must* take extern C functions. -//ACE_HAS_THR_C_FUNC The pthread_create() routine *must* -// take extern C functions. -//ACE_LACKS_CONDATTR_PSHARED Platform has no implementation of -// pthread_condattr_setpshared(), even though it supports pthreads! -//ACE_LACKS_PTHREAD_THR_SIGSETMASK Platform lacks pthread_thr_ -// sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2) -//ACE_LACKS_SETDETACH Platform lacks pthread_attr_ -// setdetachstate() (e.g., HP/UX 10.x) -//ACE_LACKS_SETSCHED Platform lacks pthread_attr_ -// setsched() (e.g. MVS) -//ACE_LACKS_THREAD_STACK_SIZE Platform lacks pthread_attr_ -// setstacksize() (e.g., Linux pthreads) - -//ACE_HAS_IRIX62_THREADS Platform supports the very odd IRIX -// 6.2 threads... - -/*********************************/ - -/******* SIGNAL STUFF *******/ -//ACE_HAS_SIGNAL_OBJECT_AND_WAIT Platform supports the Win32 -// SignalObjectAndWait() function (WinNT 4.0 and beyond). -//#define ACE_HAS_SIGNAL_SAFE_OS_CALLS -//Automatically restart OS system -// calls when EINTR occurs - - -// Platform supports the getrusage() system call. -//#define ACE_HAS_GETRUSAGE -//Platform uses non-const char * in calls to gethostbyaddr, gethostbyname, -// getservbyname -#define ACE_HAS_NONCONST_GETBY -// Platform's select() uses non-const timeval* (only found on Linux right now) -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -// And on Tandem :-) -//Uses ctime_r & asctime_r with only two parameters vs. three. -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -//Platform has special header for select(). -#define ACE_HAS_SELECT_H -// Platform/compiler supports Standard C++ Library -#define ACE_HAS_STANDARD_CPP_LIBRARY -//Platform/compiler supports _sys_errlist symbol -//#define ACE_HAS_SYS_ERRLIST -//Platform lacks madvise() (e.g., Linux) -#define ACE_LACKS_MADVISE -//Platform lacks the si_addr field of siginfo_t (e.g.,VxWorks and HP/UX 10.x) -//?#define ACE_LACKS_SI_ADDR -//Compiler/platform lacks strcasecmp() (e.g., DG/UX, UNIXWARE, VXWORKS) -#define ACE_LACKS_STRCASECMP -// doesn't automatically #include /**/ -#define ACE_LACKS_SYSTIME_H - -//ACE_HAS_AIX_BROKEN_SOCKET_HEADER Platform, such as AIX4, needs to wrap -// #include of sys/socket.h with #undef/#define of __cplusplus. -//ACE_HAS_AIX_HI_RES_TIMER Platform has AIX4 ::read_real_time () -// ? ACE_HAS_BROKEN_BITSHIFT Compiler has integer overflow -// problem with bit-shift operations. -// ? ACE_HAS_BROKEN_CONVERSIONS Compiler can't handle calls like -// foo->operator T *() -//ACE_HAS_BROKEN_CTIME Compiler/platform uses macro for ctime -// (e.g., MVS) -//ACE_HAS_BROKEN_HPUX_TEMPLATES Earlier versions of HP/UX C++ are -// damned... -//ACE_HAS_BROKEN_MSG_H Platform headers don't support -// prototypes -//ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the mmap(2) header -// files with extern "C". -//ACE_HAS_BROKEN_POSIX_TIME Platform defines struct timespec in -// -//ACE_HAS_BROKEN_SETRLIMIT OS/compiler omits the const from the -// rlimit parameter in the setrlimit() prototype. -//ACE_HAS_BROKEN_WRITEV OS/compiler omits the const from the -// iovec parameter in the writev() prototype. -// There is a bstring in the Tandem but where man bstring OK, find bstring NOK -// ? ACE_HAS_BSTRING Platform has (which contains bzero() prototype) -//ACE_HAS_CANCEL_IO Platform supports the Win32 CancelIO() -// function (WinNT 4.0 and beyond). -//ACE_HAS_CHARPTR_DL OS/platform uses char * for -// dlopen/dlsym args, rather than const char *. -// Yes in man, no in header file -//ACE_HAS_CHARPTR_SOCKOPT OS/platform uses char * for sockopt, -// rather than const char * -// sprintf() returns char * rather than int (e.g., SunOS 4.x) -//#define ACE_HAS_CHARPTR_SPRINTF -//ACE_HAS_CLOCK_GETTIME Platform supports POSIX 1.b -// clock_gettime () -//ACE_HAS_COMPLEX_LOCK Platform supports non-standard -// readers/writer locks... -//? ACE_HAS_EXCEPTIONS Compiler supports C++ exception -// handling -// Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be -// defined, except on Win32) -//#define ACE_HAS_GETPAGESIZE // Man getpagesize ok grep /usr/.. not -// found -//ACE_HAS_GNU_CSTRING_H Denotes that GNU has cstring.h as -// standard which redefines memchr() -//ACE_HAS_HI_RES_TIMER Compiler/platform supports SunOS -// high resolution timers -//ACE_HAS_INLINED_OSCALLS Inline all the static class OS -// methods to remove call overhead -//ACE_HAS_LIMITED_RUSAGE_T The rusage_t structure has only two -// fields. -//ACE_HAS_LONG_MAP_FAILED Platform defines MAP_FAILED as a -// long constant. -//? ACE_HAS_NONCONST_MSGSND Platform has a non-const parameter to -// msgsend() (e.g., SCO). -// Has it msgsend at all - -//ACE_HAS_OLD_MALLOC Compiler/platform uses old malloc()/ -// free() prototypes (ugh) -//? ACE_HAS_POSIX_SEM Platform supports POSIX real-time -//semaphores (e.g., VxWorks and Solaris) -//Compiler/platform defines a union semun for SysV shared memory -//#define ACE_HAS_SEMUN -//ACE_HAS_SIN_LEN Platform supports new BSD inet_addr -// len field. -//? ACE_HAS_SIZET_SOCKET_LEN OS/compiler uses size_t * rather -//than int * for socket lengths -//ACE_HAS_SOCKADDR_MSG_NAME Platform requires (struct sockaddr *) -//for msg_name field of struct msghdr. -//ACE_HAS_STRICT Use the STRICT compilation mode on Win32. -//? ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange -// hostent API for socket *_r() calls -//ACE_HAS_SUNOS4_GETTIMEOFDAY SunOS 4 style prototype. -//? ACE_HAS_SYSCALL_GETRUSAGE HP/UX has an undefined syscall for -//GETRUSAGE... -//ACE_HAS_TEMPLATE_TYPEDEFS Compiler implements templates that -// support typedefs inside of classes used as formal arguments to a template -// class. -//Platform/compiler supports timezone * as second parameter to gettimeofday() -//#define ACE_HAS_TIMEZONE_GETTIMEOFDAY According to man we have but not -//when compiling -//ACE_HAS_UNION_WAIT The wait() system call takes a ( -// union wait *) rather than int * -//? ACE_HAS_USING_KEYWORD Compiler supports the new using -// keyword for C++ namespaces. -//ACE_HAS_VOIDPTR_MMAP Platform requires void * for mmap(). -//ACE_HAS_VOIDPTR_SOCKOPT OS/compiler uses void * arg 4 -// setsockopt() rather than const char * -//ACE_HAS_WIN32_TRYLOCK The Win32 platform support -//TryEnterCriticalSection() (WinNT 4.0 and beyond) -//ACE_HAS_WINSOCK2 The Win32 platform supports WinSock 2.0 -//ACE_HAS_XLI Platform has the XLI version of TLI -//ACE_HAS_XT Platform has Xt and Motif -//ACE_LACKS_CONST_TIMESPEC_PTR Platform forgot const in cond_timewait -// (e.g., HP/UX). -//ACE_LACKS_COND_T Platform lacks condition variables -// (e.g., Win32 and VxWorks) -//ACE_LACKS_EXEC Platform lacks the exec() family of -// system calls (e.g., Win32, VxWorks, Chorus) -//ACE_LACKS_FILELOCKS Platform lacks file locking mechanism -//ACE_LACKS_IOSTREAM_FX iostream header does not declare -// ipfx (), opfx (), etc. -//ACE_LACKS_MALLOC_H Platform lacks malloc.h -//ACE_LACKS_MEMORY_H Platform lacks memory.h -//(e.g., VxWorks and Chorus) -//ACE_LACKS_MKTEMP ACE has no mktemp() -//ACE_LACKS_MMAP The platform doesn't have mmap(2) -// (e.g., SCO UNIX). -//ACE_LACKS_MODE_MASKS Platform/compiler doesn't have -//open() mode masks. -//ACE_LACKS_MPROTECT The platform doesn't have mprotect(2) -//(e.g., EPLX real time OS from CDC (based on LYNX)) -//ACE_LACKS_MSGBUF_T Platform lacks struct msgbuf (e.g., -// NT and MSV). -//ACE_LACKS_MSYNC Platform lacks msync() (e.g., Linux) -//ACE_LACKS_NETDB_REENTRANT_FUNCTIONS Platform does not support reentrant -// netdb functions (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, -// gethostbyname_r, getservbyname_r). -//ACE_LACKS_PARAM_H Platform lacks (e.g., -//MVS) -//ACE_LACKS_POSIX_PROTOTYPES Platform lacks POSIX prototypes for -//certain System V functions like shared memory and message queues. -//ACE_LACKS_RECVMSG Platform lacks recvmsg() (e.g., Linux) -//ACE_LACKS_RWLOCK_T Platform lacks readers/writer locks. -//ACE_LACKS_SBRK Platform lacks a working sbrk() -// (e.g., Win32 and VxWorks) -//ACE_LACKS_SEMBUF_T Platform lacks struct sembuf -//(e.g., Win32 and VxWorks) -//ACE_LACKS_SIGACTION Platform lacks struct sigaction -// (e.g., Win32 and Chorus) -//? ACE_LACKS_SYS_NERR Platforms/compiler lacks the sys_nerr -// variable (e.g., VxWorks and MVS). -//ACE_LACKS_SYSV_MSG_H Platform lacks sys/msg.h -//(e.g., Chorus and VxWorks) -//ACE_LACKS_KEY_T Platform lacks key_t -//(e.g., Chorus, VxWorks, Win32) -//ACE_LACKS_SENDMSG Platform lacks sendmsg() -// (e.g., Linux) -//ACE_LACKS_SYSV_SHMEM Platform lacks System V shared -// memory (e.g., Win32 and VxWorks) -//ACE_LACKS_SIGINFO_H Platform lacks the siginfo.h include -// file (e.g., MVS) -//ACE_LACKS_SOCKETPAIR Platform lacks the socketpair() -// call (e.g., SCO UNIX) -//? ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES Compiler doesn't support -// static data member templates -//ACE_LACKS_STRRECVFD Platform doesn't define struct -//strrecvfd. -//ACE_LACKS_SYSCALL Platform doesn't have syscall() -// prototype -//ACE_LACKS_SYSV_MSQ_PROTOS Platform doesn't have prototypes for -//Sys V msg()* queues. -//ACE_LACKS_T_ERRNO Header files lack t_errno for TLI -//ACE_LACKS_TCP_H Platform doesn't have netinet/tcp.h -//ACE_LACKS_UCONTEXT_H Platform lacks the ucontext.h file -//ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX domain sockets -//ACE_LACKS_UTSNAME_T Platform lacks struct utsname -// (e.g., Win32 and VxWorks) -//ACE_NDEBUG Turns off debugging features -//ACE_LACKS_READV Platform doesn't define readv, so -// use our own -//ACE_LACKS_WRITEV Platform doesn't define writev, so -//use our own -//ACE_NLOGGING Turns off the LM_DEBUG and LM_ERROR -//logging macros... -//ACE_NTRACE Turns off the tracing feature. -//ACE_REDEFINES_XTI_FUNCTIONS Platform redefines the t_... names -//(UnixWare) -//ACE_SELECT_USES_INT Platform uses int for select() -//rather than fd_set -//? ACE_TEMPLATES_REQUIRE_PRAGMA Compiler's template mechanism must -// use a pragma This is used for AIX's C++ compiler. -//? ACE_TEMPLATES_REQUIRE_SOURCE Compiler's template mechanim must -// see source code (i.e., .cpp files). This is used for GNU G++. -//? ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION Compiler's template mechanism -//requires the use of explicit C++ specializations for all used -//templates. This is also used for GNU G++ if you don't use the "repo" -//patches. -//ACE_USE_POLL Use the poll() event demultiplexor -//rather than select(). - -// Turns off the tracing feature. -// #define ACE_NTRACE 0 -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-tru64.h b/ace/config-tru64.h deleted file mode 100644 index 06aa1c3596b..00000000000 --- a/ace/config-tru64.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for the -// Digital UNIX V4.0a and later platforms. It relies on -// config-osf1-4.0.h, and adds deltas for newer platforms. - -#ifndef ACE_CONFIG_TRU64_H -#define ACE_CONFIG_TRU64_H -#include "ace/pre.h" - -#if defined (DIGITAL_UNIX) -# include "ace/config-osf1-4.0.h" -# define ACE_HAS_NONSTATIC_OBJECT_MANAGER -# if DIGITAL_UNIX >= 0x500 -// It's possible that snprintf() is available on earlier Tru64 versions, -// but this is the only way it's been tested. Steve Huston, 22-Jan-2003 -// It is not on 4.0F. Rich Seibel, 6 Feb 2003 -# ifndef ACE_HAS_SNPRINTF -# define ACE_HAS_SNPRINTF -# endif /* ACE_HAS_SNPRINTF */ -# endif /* DIGITAL_UNIX >= 0x500 */ -# if DIGITAL_UNIX >= 0x40D -# define ACE_LACKS_SYSTIME_H -# endif /* DIGITAL_UNIX >= 0x40D */ -#else /* ! DIGITAL_UNIX */ -# include "ace/config-osf1-3.2.h" -#endif /* ! DIGITAL_UNIX */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_TRU64_H */ diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h deleted file mode 100644 index 92fe9d4c58a..00000000000 --- a/ace/config-unixware-2.01-g++.h +++ /dev/null @@ -1,113 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work -// for Unixware platforms running UnixWare 2.01. -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// See README for what the ACE_HAS... and ACE_LACKS... macros mean - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_IDTYPE_T -#define ACE_LACKS_STRCASECMP -#define ACE_HAS_SIZET_SOCKET_LEN -#define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_GNU_CSTRING_H -#define ACE_HAS_MSG -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -// Not yet sure about threads -#define ACE_HAS_NONCONST_GETBY -#define ACE_HAS_OSF1_GETTIMEOFDAY -#define ACE_HAS_POLL -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_HAS_REGEX -#define ACE_HAS_LAZY_V -#define ACE_HAS_SELECT_H -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SOCKIO_H -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STHREADS -#define ACE_HAS_THR_KEYDELETE -#define ACE_HAS_STRBUF_T -#define ACE_HAS_STREAMS -#define ACE_HAS_STREAM_PIPES -#define ACE_HAS_STRERROR -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_SYSCALL_H -#define ACE_HAS_SYSINFO -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_SYS_FILIO_H -#define ACE_HAS_SYS_SIGLIST -#define ACE_HAS_TERM_IOCTLS -#define ACE_HAS_THREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_THREAD_T -#define ACE_HAS_TIMOD_H -#define ACE_HAS_TIUSER_H -#define ACE_HAS_TLI -#define ACE_HAS_TLI_PROTOTYPES -#define ACE_HAS_UNIXWARE_SVR4_SIGNAL_T -#define ACE_HAS_VOIDPTR_SOCKOPT - -#define ACE_LACKS_MADVISE -#define ACE_LACKS_SYSCALL - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_PAGE_SIZE 4096 -#define ACE_REDEFINES_XTI_FUNCTIONS - -// Compiling for UNIXWARE -#if !defined (UNIXWARE) -# define UNIXWARE -# define UNIXARE_2_0 -#endif /* UNIXWARE */ - -// These seem to be missing... Process_Manager uses them -// -//typedef int Process_t; -//typedef int hProcess_t; -//typedef int hpid_t; - - -// Compiler/platform supports OSF/1 gettimeofday() prototype. -//#define ACE_HAS_OSF1_GETTIMEOFDAY - -// Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... -//#define ACE_HAS_SVR4_TLI - - -// Platform doesn't have getby... char *arg defined as const -//#define ACE_GET_BLAH_BY_NO_CONST - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h deleted file mode 100644 index fced5901150..00000000000 --- a/ace/config-unixware-2.1.2-g++.h +++ /dev/null @@ -1,102 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work -// for Unixware platforms running UnixWare 2.1.2 and gcc version 2.7.2.2 - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -// See README for what the ACE_HAS... and ACE_LACKS... macros mean - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_LACKS_SYSTIME_H -// ualarm is only in BSD compatibility lib, but no header is provided -// #define ACE_HAS_UALARM -#define ACE_HAS_SIZET_SOCKET_LEN -#define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_GNU_CSTRING_H -#define ACE_HAS_MSG -#define ACE_HAS_SVR4_GETTIMEOFDAY -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#define ACE_HAS_NONCONST_GETBY -#define ACE_HAS_POLL -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_LACKS_TIMESPEC_T -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_HAS_REGEX -#define ACE_HAS_LAZY_V -#define ACE_HAS_SELECT_H -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SOCKIO_H -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STHREADS -#define ACE_HAS_THR_KEYDELETE -#define ACE_HAS_STRBUF_T -#define ACE_HAS_STREAMS -#define ACE_HAS_STREAM_PIPES -#define ACE_HAS_STRERROR -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_SYSCALL_H -#define ACE_HAS_SYSINFO -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_SYS_FILIO_H -#define ACE_HAS_TERM_IOCTLS -#define ACE_HAS_THREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_THREAD_T -#define ACE_HAS_TIMOD_H -#define ACE_HAS_TIUSER_H -#define ACE_HAS_TLI -#define ACE_HAS_TLI_PROTOTYPES -#define ACE_HAS_UNIXWARE_SVR4_SIGNAL_T -#define ACE_HAS_VOIDPTR_SOCKOPT -#define ACE_HAS_THR_MINSTACK - -#define ACE_LACKS_MADVISE -#define ACE_LACKS_STRCASECMP -#define ACE_LACKS_PRI_T -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_PAGE_SIZE 4096 -#define ACE_REDEFINES_XTI_FUNCTIONS - -#if !defined (UNIXWARE) -# define UNIXWARE -# define UNIXWARE_2_1 -#endif /* ! UNIXWARE */ - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_HAS_IDTYPE_T - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-unixware-7.1.0.h b/ace/config-unixware-7.1.0.h deleted file mode 100644 index b5a228d1a81..00000000000 --- a/ace/config-unixware-7.1.0.h +++ /dev/null @@ -1,447 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H - -/* ACE configuration header file */ - -/* Include the commong gnu config file */ -#include "config-g++-common.h" - -/* For unixware 7.1 && g++ 2.91.57, see if this fixes my problem */ -#ifndef UNIXWARE_7_1 -#define UNIXWARE_7_1 -#endif - -/* Define if you have alloca, as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define if you have the strftime function. */ -#define HAVE_STRFTIME 1 - -/* Define if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#define YYTEXT_POINTER 1 - -/* Define _REENTRANT if reentrant functions should be used. */ -#ifndef _REENTRANT -# define _REENTRANT 1 -#endif - -#define ACE_HAS_NEW_NO_H 1 -#define ACE_HAS_STDEXCEPT_NO_H 1 -#define ACE_HAS_IOMANIP_NO_H 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_IOCTL_H 1 - -#define ACE_THREAD_MIN_PRIORITY 0 -#if defined (ACE_THREAD_MIN_PRIORITY) -# define PTHREAD_MIN_PRIORITY ACE_THREAD_MIN_PRIORITY -#endif /* #if defined (ACE_THREAD_MIN_PRIORITY) */ - -#define ACE_THREAD_MAX_PRIORITY 99 -#if defined (ACE_THREAD_MAX_PRIORITY) -# define PTHREAD_MAX_PRIORITY ACE_THREAD_MAX_PRIORITY -#endif /* #if defined (ACE_THREAD_MAX_PRIORITY) */ - -/* Specify sizes of given built-in types. If a size isn't defined here, - then ace/Basic_Types.h will attempt to deduce the size. */ -/* #undef ACE_SIZEOF_CHAR */ -#define ACE_SIZEOF_SHORT 2 -#define ACE_SIZEOF_INT 4 -#define ACE_SIZEOF_LONG 4 -#define ACE_SIZEOF_LONG_LONG 8 -#define ACE_SIZEOF_VOID_P 4 -#define ACE_SIZEOF_FLOAT 4 -#define ACE_SIZEOF_DOUBLE 8 -#define ACE_SIZEOF_LONG_DOUBLE 12 - -/* typedef for ACE_UINT64 */ -/* - We only make the typedef if ACE_UINT64_TYPEDEF is defined. Otherwise, - let ace/Basic_Types.h do the work for us. -*/ -#define ACE_UINT64_TYPEDEF unsigned long long -#if defined(ACE_UINT64_TYPEDEF) - typedef ACE_UINT64_TYPEDEF ACE_UINT64; -#endif /* ACE_UINT64_TYPEDEF && !ACE_DISABLE_AUTOCONF_UINT64 */ - -/* Enable ACE inlining */ -#define __ACE_INLINE__ 1 - -/* OS has priocntl (2) */ -#define ACE_HAS_PRIOCNTL 1 - -/* Platform has pread() and pwrite() support */ -#define ACE_HAS_P_READ_WRITE 1 - -/* Compiler/platform supports alloca() */ -#define ACE_HAS_ALLOCA 1 - -/* Compiler/platform correctly calls init()/fini() for shared libraries */ -#define ACE_HAS_AUTOMATIC_INIT_FINI 1 - -/* Platform doesn't cast MAP_FAILED to a (void *). */ -/* #undef ACE_HAS_BROKEN_MAP_FAILED */ -/* Staller: oh yes, let's do this! */ -#define ACE_HAS_BROKEN_MAP_FAILED - -/* Prototypes for both signal() and struct sigaction are consistent. */ -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 - -/* Platform supports operations on directories via struct dirent, - readdir_r, etc. */ -#define ACE_HAS_DIRENT 1 - -/* Compiler supports C++ exception handling */ -// MM-Graz if ! defined inserted, to prevent warnings, because it is already -// defined in config-g++common.h -# if !defined (ACE_HAS_EXCEPTIONS) -#define ACE_HAS_EXCEPTIONS 1 -# endif - -/* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be - defined, except on Win32) */ -#define ACE_HAS_GETPAGESIZE 1 - -/* Platform supports the getrusage() system call. */ -#define ACE_HAS_GETRUSAGE 1 - -/* Platform has a getrusage () prototype in sys/resource.h that differs from - the one in ace/OS.i. */ -#define ACE_HAS_GETRUSAGE_PROTO 1 - -/* Denotes that GNU has cstring.h as standard which redefines memchr() */ -#define ACE_HAS_GNU_CSTRING_H - -/* The GPERF utility is compiled for this platform */ -#define ACE_HAS_GPERF 1 - -/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) */ -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1 - -/* Compiler/platform supports idtype_t. */ -#define ACE_HAS_IDTYPE_T 1 - -/* Platform supports IP multicast */ -#define ACE_HAS_IP_MULTICAST 1 - -/* Platform supports thr_keydelete (e.g,. UNIXWARE) */ -#define ACE_HAS_THR_KEYDELETE 1 - -/* Platform calls thr_minstack() rather than thr_min_stack() (e.g., Tandem). */ -#define ACE_HAS_THR_MINSTACK 1 - -/* Platform supports recvmsg and sendmsg */ -#define ACE_HAS_MSG 1 - -/* Platform's select() uses non-const timeval* (only found on Linux right - now) */ -#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 - -/* Uses ctime_r & asctime_r with only two parameters vs. three. */ -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1 - -/* Platform is an Intel Pentium microprocessor. */ -/* There is a problem with the gethrtime() because of (apparently) a problem - with the inline assembly instruction. Hopefully there is a way to resolve - that with an improvement to the assembler -*/ -#ifdef ACE_HAS_PENTIUM -#undef ACE_HAS_PENTIUM -#endif /* ACE_HAS_PENTIUM */ - - -/* Platform contains */ -#define ACE_HAS_POLL 1 - -/* Platform supports POSIX O_NONBLOCK semantics */ -#define ACE_HAS_POSIX_NONBLOCK 1 - -/* Platform supports the POSIX struct timespec type */ -#define ACE_HAS_POSIX_TIME 1 - -/* Platform supports the /proc file system and defines tid_t - in */ -#define ACE_HAS_PROC_FS 1 - -/* Platform supports POSIX Threads */ -#define ACE_HAS_PTHREADS 1 - -/* Platform supports POSIX.1c-1995 threads */ -#define ACE_HAS_PTHREADS_STD 1 - -/* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and - PTHREAD_PROCESS_SHARED values */ -#define ACE_HAS_PTHREAD_PROCESS_ENUM 1 - -/* Platform has pthread_sigmask() defined. */ -#define ACE_HAS_PTHREAD_SIGMASK 1 - -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1 - -/* Platform supports reentrant functions (i.e., all the POSIX *_r - functions). */ -#define ACE_HAS_REENTRANT_FUNCTIONS 1 - -/* Platform has support for multi-byte character support compliant with the - XPG4 Worldwide Portability Interface wide-character classification. */ -#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 - -/* Platform does not support reentrant netdb functions (getprotobyname_r, - getprotobynumber_r, gethostbyaddr_r, gethostbyname_r, getservbyname_r). */ -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1 - -/* Platform supports the POSIX regular expression library */ -#define ACE_HAS_REGEX 1 - -/* Platform has special header for select(). */ -#define ACE_HAS_SELECT_H 1 - -/* Platform has a function to set t_errno (e.g., Tandem). */ -#define ACE_HAS_SET_T_ERRNO 1 - -/* Platform supports SVR4 extended signals */ -#define ACE_HAS_SIGINFO_T 1 - -/* Platform/compiler has the sigwait(2) prototype */ -#define ACE_HAS_SIGWAIT 1 - -/* Compiler/platform defines the sig_atomic_t typedef */ -#define ACE_HAS_SIG_ATOMIC_T 1 - -/* Platform supports new BSD inet_addr len field. */ -#define ACE_HAS_SIN_LEN 1 - -/* OS/compiler uses size_t * rather than int * for socket lengths */ -#define ACE_HAS_SIZET_SOCKET_LEN 1 - -/* Compiler/platform provides the sys/sockio.h file */ -#define ACE_HAS_SOCKIO_H 1 - -/* Compiler supports the ssize_t typedef */ -#define ACE_HAS_SSIZE_T 1 - -/* Platform supports UNIX International Threads */ -#define ACE_HAS_STHREADS 1 - -/* Platform has thr_yield() */ -#define ACE_HAS_THR_YIELD 1 - -/* Compiler/platform supports struct strbuf */ -#define ACE_HAS_STRBUF_T 1 - -/* Platform supports STREAMS */ -#define ACE_HAS_STREAMS 1 - -/* Platform supports STREAM pipes */ -#define ACE_HAS_STREAM_PIPES 1 - -/* Compiler/platform supports strerror () */ -#define ACE_HAS_STRERROR 1 - -/* Platform/Compiler supports a String class (e.g., GNU or Win32). */ -#define ACE_HAS_STRING_CLASS 1 - -/* Platform has (which contains bzero() prototype) */ -#define ACE_HAS_STRINGS 1 - -/* Platform has void * as second parameter to gettimeofday and a has a - prototype */ -#define ACE_HAS_SUNOS4_GETTIMEOFDAY 1 - -/* Compiler/platform supports SVR4 dynamic linking semantics */ -#define ACE_HAS_SVR4_DYNAMIC_LINKING 1 - -/* Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... */ -#define ACE_HAS_SVR4_TLI 1 - -/* Compiler/platform contains the file. */ -#define ACE_HAS_SYSCALL_H 1 - -/* Platform supports system configuration information */ -#define ACE_HAS_SYSINFO 1 - -/* Platform supports System V IPC (most versions of UNIX, but not Win32) */ -#define ACE_HAS_SYSV_IPC 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_FILIO_H 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_XTI_H 1 - -/* Platform has terminal ioctl flags like TCGETS and TCSETS. */ -#define ACE_HAS_TERM_IOCTLS 1 - -/* Platform supports threads */ -#define ACE_HAS_THREADS 1 - -/* Compiler/platform has thread-specific storage */ -#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1 - -/* Platform supports TLI timod STREAMS module */ -#define ACE_HAS_TIMOD_H 1 - -/* Platform supports TLI tiuser header */ -#define ACE_HAS_TIUSER_H 1 - -/* Platform supports TLI. Also see ACE_TLI_TCP_DEVICE. */ -#define ACE_HAS_TLI 1 - -/* Platform provides TLI function prototypes */ -#define ACE_HAS_TLI_PROTOTYPES 1 - -/* Platform supports ualarm() */ -#define ACE_HAS_UALARM 1 - -/* Platform supports ucontext_t (which is used in the extended signal API). */ -#define ACE_HAS_UCONTEXT_T 1 - -/* Platform has header file */ -#define ACE_HAS_UTIME 1 - -/* Platform requires void * for mmap(). */ -#define ACE_HAS_VOIDPTR_MMAP 1 - -/* Platform has XTI (X/Open-standardized superset of TLI). Implies - ACE_HAS_TLI but uses a different header file. */ -#define ACE_HAS_XTI 1 - -/* Platform can not build ace/IOStream{,_T}.cpp. This does not necessarily - mean that the platform does not support iostreams. */ -#define ACE_LACKS_ACE_IOSTREAM 1 - -/* Platform does not have u_longlong_t typedef */ -#define ACE_LACKS_U_LONGLONG_T 1 - -/* Platform lacks madvise() (e.g., Linux) */ -#define ACE_LACKS_MADVISE 1 - -/* Platform lacks POSIX prototypes for certain System V functions like shared - memory and message queues. */ -#define ACE_LACKS_SOME_POSIX_PROTOTYPES 1 - -/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */ -#define ACE_LACKS_PRI_T 1 - -/* Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2) */ -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 - -/* Platfrom lack pthread_yield() support. */ -#define ACE_LACKS_PTHREAD_YIELD 1 - -/* Platform lacks readers/writer locks. */ -#define ACE_LACKS_RWLOCK_T 1 - -/* MIT pthreads platform lacks the timedwait prototypes */ -#define ACE_LACKS_TIMEDWAIT_PROTOTYPES 1 - -/* Platform does not define timepec_t as a typedef for struct timespec. */ -#define ACE_LACKS_TIMESPEC_T 1 - -/* Compile using multi-thread libraries */ -#define ACE_MT_SAFE 1 - -/* Platform needs regexpr.h for regular expression support */ -#define ACE_NEEDS_REGEXPR_H 1 - -/* Platform needs to #include to get thread scheduling defs. */ -#define ACE_NEEDS_SCHED_H 1 - -/* doesn't automatically #include */ -#define ACE_LACKS_SYSTIME_H 1 - -/* Turns off the tracing feature. */ -#define ACE_NTRACE 1 - -/*********************************************************************/ -/* Compiler's template mechanim must see source code (i.e., .cpp files). This - is used for GNU G++. */ -/* Staller -> make 0 */ -// #undef ACE_TEMPLATES_REQUIRE_SOURCE - -/* Compiler's template instantiation mechanism supports the use of explicit - C++ specializations for all used templates. This is also used for GNU G++ - if you don't use the "repo" patches. */ -/* Staller -> make 0 */ -// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION 1 -/*********************************************************************/ - -/* The OS/platform supports the poll() event demultiplexor */ -#define ACE_USE_POLL 1 - -/* Platform has its standard c++ library in the namespace std. */ -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 - -/* The number of bytes in a double. */ -#define SIZEOF_DOUBLE 8 - -/* The number of bytes in a float. */ -#define SIZEOF_FLOAT 4 - -/* The number of bytes in a int. */ -#define SIZEOF_INT 4 - -/* The number of bytes in a long. */ -#define SIZEOF_LONG 4 - -/* The number of bytes in a long double. */ -#define SIZEOF_LONG_DOUBLE 12 - -/* The number of bytes in a long long. */ -#define SIZEOF_LONG_LONG 8 - -/* The number of bytes in a short. */ -#define SIZEOF_SHORT 2 - -/* The number of bytes in a signed char. */ -#define SIZEOF_SIGNED_CHAR 1 - -/* The number of bytes in a void *. */ -#define SIZEOF_VOID_P 4 - -/* Define if you have the execv function. */ -#define HAVE_EXECV 1 - -/* Define if you have the execve function. */ -#define HAVE_EXECVE 1 - -/* Define if you have the execvp function. */ -#define HAVE_EXECVP 1 - -/* Define if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define if you have the header file. */ -#define HAVE_FSTREAM 1 - -/* Define if you have the header file. */ -#define HAVE_IOMANIP 1 - -/* Define if you have the header file. */ -#define HAVE_IOSTREAM 1 - -/* Define if you have the header file. */ -#define HAVE_PWD_H 1 - -/* Name of package */ -#define PACKAGE "ace" - -/* Added by Staller */ -#define ENUM_BOOLEAN // See file /usr/local/lib/gcc-lib/i486-pc-sysv5/egcs-2.91.60/include/sys/types.h -#define howmany(x, y) (((x)+((y)-1))/(y)) -#define ACE_HAS_BROKEN_T_ERROR // make a nasty warning disappear in OS.i -#define __USLC__ 1 -#define __IOCTL_VERSIONED__ // By Carlo! - -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-unixware-7.1.0.udk.h b/ace/config-unixware-7.1.0.udk.h deleted file mode 100644 index ecda2189807..00000000000 --- a/ace/config-unixware-7.1.0.udk.h +++ /dev/null @@ -1,529 +0,0 @@ -/* -*- C++ -*- */ -#ifndef ACE_CONFIG_UNIXWARE_UDK_H -#define ACE_CONFIG_UNIXWARE_UDK_H - -// $Id$ - -// Configuration for the unixware UDK compiler. derived from the unixware/g++ config -// which was itself derived from an autoconfig run. - -/* ACE configuration header file */ - -#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -#define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -//#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA - -/* For unixware 7.1 && g++ 2.91.57, see if this fixes my problem */ -//#define ACE_HAS_BROKEN_NOOP_DTORS -#ifndef UNIXWARE_7_1 -#define UNIXWARE_7_1 -#endif - -#define ACE_LACKS_PLACEMENT_OPERATOR_DELETE - -/* Define if you have the strftime function. */ -#define HAVE_STRFTIME 1 - -/* Define if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#define YYTEXT_POINTER 1 - -/* Define _REENTRANT if reentrant functions should be used. */ -#ifndef _REENTRANT -# define _REENTRANT 1 -#endif - -#define ACE_HAS_NEW_NO_H 1 -#define ACE_HAS_STDEXCEPT_NO_H 1 -#define ACE_HAS_IOMANIP_NO_H 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_IOCTL_H 1 - -/* - * TODO: These two next #defines have an #undef before them, in - * case the variable being defined already had a value. - * The #undefs are being picked up by configure, and are commented out! - */ -#define ACE_THREAD_MIN_PRIORITY 0 -#if defined (ACE_THREAD_MIN_PRIORITY) -/* # undef PTHREAD_MIN_PRIORITY */ -# define PTHREAD_MIN_PRIORITY ACE_THREAD_MIN_PRIORITY -#endif /* #if defined (ACE_THREAD_MIN_PRIORITY) */ - -#define ACE_THREAD_MAX_PRIORITY 99 -#if defined (ACE_THREAD_MAX_PRIORITY) -/* # undef PTHREAD_MAX_PRIORITY */ -# define PTHREAD_MAX_PRIORITY ACE_THREAD_MAX_PRIORITY -#endif /* #if defined (ACE_THREAD_MAX_PRIORITY) */ - - - -/* UnixWare specific configuration parameters */ -/* #undef UNIXWARE */ -/* #undef UNIXWARE_2_0 */ -/* #undef UNIXWARE_2_1 */ - -/* Specify sizes of given built-in types. If a size isn't defined here, - then ace/Basic_Types.h will attempt to deduce the size. */ -/* #undef ACE_SIZEOF_CHAR */ -#define ACE_SIZEOF_SHORT 2 -#define ACE_SIZEOF_INT 4 -#define ACE_SIZEOF_LONG 4 -#define ACE_SIZEOF_LONG_LONG 8 -#define ACE_SIZEOF_VOID_P 4 -#define ACE_SIZEOF_FLOAT 4 -#define ACE_SIZEOF_DOUBLE 8 -#define ACE_SIZEOF_LONG_DOUBLE 12 - -/* typedef for ACE_UINT64 */ -/* - We only make the typedef if ACE_UINT64_TYPEDEF is defined. Otherwise, - let ace/Basic_Types.h do the work for us. -*/ -#define ACE_UINT64_TYPEDEF unsigned long long -#if defined(ACE_UINT64_TYPEDEF) - typedef ACE_UINT64_TYPEDEF ACE_UINT64; -#endif /* ACE_UINT64_TYPEDEF && !ACE_DISABLE_AUTOCONF_UINT64 */ - -/* Enable ACE inlining */ -#define __ACE_INLINE__ 1 - -/* Platform supports new C++ style casts (dynamic_cast, static_cast, - reinterpret_cast and const_cast) */ -#define ACE_HAS_ANSI_CASTS - -/* Platform supports Asynchronous IO calls */ -/* #define ACE_HAS_AIO_CALLS */ - -/* Specify this if you don't want threads to inherit parent thread's - ACE_Log_Msg properties. */ -/* #undef ACE_THREADS_DONT_INHERIT_LOG_MSG */ - -/* OS has priocntl (2) */ -#define ACE_HAS_PRIOCNTL 1 - -/* Platform has pread() and pwrite() support */ -#define ACE_HAS_P_READ_WRITE 1 - -/* Compiler/platform correctly calls init()/fini() for shared libraries */ -#define ACE_HAS_AUTOMATIC_INIT_FINI 1 - -/* Compiler handles explicit calling of template destructor correctly. - See "ace/OS.h" for details. */ -/* Staller: already defined by config-g++-common.h -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR 1 -*/ - -/* Platform doesn't cast MAP_FAILED to a (void *). */ -/* #undef ACE_HAS_BROKEN_MAP_FAILED */ -/* Staller: oh yes, let's do this! */ -#define ACE_HAS_BROKEN_MAP_FAILED - - -/* Prototypes for both signal() and struct sigaction are consistent. */ -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 - -/* Compiler/platform has correctly prototyped header files */ -#define ACE_HAS_CPLUSPLUS_HEADERS - -/* Platform supports operations on directories via struct dirent, - readdir_r, etc. */ -#define ACE_HAS_DIRENT - -/* Compiler supports C++ exception handling */ -# if !defined (ACE_HAS_EXCEPTIONS) -#define ACE_HAS_EXCEPTIONS -# endif - -/* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be - defined, except on Win32) */ -#define ACE_HAS_GETPAGESIZE - -/* Platform supports the getrusage() system call. */ -#define ACE_HAS_GETRUSAGE - -/* Platform has a getrusage () prototype in sys/resource.h that differs from - the one in ace/OS.i. */ -#define ACE_HAS_GETRUSAGE_PROTO - -/* The GPERF utility is compiled for this platform */ -#define ACE_HAS_GPERF - -/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) */ -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1 - -/* Compiler/platform supports SunOS high resolution timers */ -/* #undef ACE_HAS_HI_RES_TIMER */ - -/* Compiler/platform supports idtype_t. */ -#define ACE_HAS_IDTYPE_T - -/* Inline all the static class OS methods to remove call overhead */ -/* Note: This gets defined by OS.h if __ACE_INLINE__ is defined */ -/* #undef ACE_HAS_INLINED_OSCALLS */ - -/* Platform supports IP multicast */ -#define ACE_HAS_IP_MULTICAST - -/* Platform supports thr_keydelete (e.g,. UNIXWARE) */ -#define ACE_HAS_THR_KEYDELETE - -/* Platform calls thr_minstack() rather than thr_min_stack() (e.g., Tandem). */ -#define ACE_HAS_THR_MINSTACK - -/* Some files, such as ace/streams.h, want to include new style C++ stream - headers. These headers are iomanip, ios, iostream, istream, ostream, - fstream and streambuf. If _all_ of these headers aren't available, then - assume that only iostream.h and fstream.h are available. */ -/* #define ACE_USES_OLD_IOSTREAMS */ - -/* Platform supports recvmsg and sendmsg */ -#define ACE_HAS_MSG - -/* Platform's select() uses non-const timeval* (only found on Linux right - now) */ -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -/* Uses ctime_r & asctime_r with only two parameters vs. three. */ -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - - -/* Platform is an Intel Pentium microprocessor. */ -/* There is a problem with the gethrtime() because of (apparently) a problem - with the inline assembly instruction. Hopefully there is a way to resolve - that with an improvement to the assembler -*/ -#ifdef ACE_HAS_PENTIUM -//#undef ACE_HAS_PENTIUM -#endif /* ACE_HAS_PENTIUM */ - - -/* Platform contains */ -#define ACE_HAS_POLL - -/* Platform supports POSIX O_NONBLOCK semantics */ -#define ACE_HAS_POSIX_NONBLOCK - -/* Platform supports the POSIX struct timespec type */ -#define ACE_HAS_POSIX_TIME - -/* Platform supports the /proc file system and defines tid_t - in */ -#define ACE_HAS_PROC_FS - -/* Platform supports POSIX Threads */ -#define ACE_HAS_PTHREADS - -/* Platform supports POSIX Threads .4a Draft 4 */ -/* #undef ACE_HAS_PTHREADS_DRAFT4 */ - -/* Platform supports POSIX Threads .4a Draft 6 */ -/* #undef ACE_HAS_PTHREADS_DRAFT6 */ - -/* Platform supports POSIX Threads .1c Draft 7 */ -/* #undef ACE_HAS_PTHREADS_DRAFT7 */ - -/* Platform supports POSIX.1c-1995 threads */ -#define ACE_HAS_PTHREADS_STD - -/* Platform has pthread_condattr_setkind_np(). */ -/* #undef ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP */ - -/* Platform has pthread_mutexattr_setkind_np(). */ -/* #undef ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP */ - -/* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and - PTHREAD_PROCESS_SHARED values */ -#define ACE_HAS_PTHREAD_PROCESS_ENUM - -/* Platform has pthread_sigmask() defined. */ -#define ACE_HAS_PTHREAD_SIGMASK - -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS - -/* Platform supports reentrant functions (i.e., all the POSIX *_r - functions). */ -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* Platform has support for multi-byte character support compliant with the - XPG4 Worldwide Portability Interface wide-character classification. */ -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -/* Platform does not support reentrant netdb functions (getprotobyname_r, - getprotobynumber_r, gethostbyaddr_r, gethostbyname_r, getservbyname_r). */ -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -/* Platform supports the POSIX regular expression library */ -#define ACE_HAS_REGEX - -/* Platform has special header for select(). */ -#define ACE_HAS_SELECT_H - -/* Platform has a function to set t_errno (e.g., Tandem). */ -#define ACE_HAS_SET_T_ERRNO - -/* Platform supports SVR4 extended signals */ -#define ACE_HAS_SIGINFO_T - -/* Platform/compiler has the sigwait(2) prototype */ -#define ACE_HAS_SIGWAIT - -/* Compiler/platform defines the sig_atomic_t typedef */ -#define ACE_HAS_SIG_ATOMIC_T - -/* Platform supports new BSD inet_addr len field. */ -#define ACE_HAS_SIN_LEN - -/* OS/compiler uses size_t * rather than int * for socket lengths */ -#define ACE_HAS_SIZET_SOCKET_LEN - -/* Compiler/platform provides the sys/sockio.h file */ -#define ACE_HAS_SOCKIO_H - -/* Compiler supports the ssize_t typedef */ -#define ACE_HAS_SSIZE_T - -/* Platform supports UNIX International Threads */ -#define ACE_HAS_STHREADS - -/* Platform has thr_yield() */ -#define ACE_HAS_THR_YIELD - -/* Platform/compiler supports Standard C++ Library */ -/* It seems that UDK provides std-like declarations for only portions - such as -*/ -#define ACE_HAS_STANDARD_CPP_LIBRARY 0 - -/* Compiler/platform supports struct strbuf */ -#define ACE_HAS_STRBUF_T - -/* Platform supports STREAMS */ -#define ACE_HAS_STREAMS - -/* Platform supports STREAM pipes */ -#define ACE_HAS_STREAM_PIPES - -/* Compiler/platform supports strerror () */ -#define ACE_HAS_STRERROR - -/* Platform/Compiler supports a String class (e.g., GNU or Win32). */ -#define ACE_HAS_STRING_CLASS - -/* Platform has (which contains bzero() prototype) */ -#define ACE_HAS_STRINGS - -/* Platform has void * as second parameter to gettimeofday and a has a - prototype */ -#define ACE_HAS_SUNOS4_GETTIMEOFDAY - -/* Compiler/platform supports SVR4 dynamic linking semantics */ -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -/* Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... */ -#define ACE_HAS_SVR4_TLI - -/* Compiler/platform contains the file. */ -#define ACE_HAS_SYSCALL_H - -/* Platform supports system configuration information */ -#define ACE_HAS_SYSINFO 1 - -/* Platform supports System V IPC (most versions of UNIX, but not Win32) */ -#define ACE_HAS_SYSV_IPC 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_FILIO_H 1 - -/* Platform provides header */ -#define ACE_HAS_SYS_XTI_H 1 - -/* Compiler implements template specialization */ -#define ACE_HAS_TEMPLATE_SPECIALIZATION 1 - -/* Compiler implements templates that support typedefs inside of classes used - as formal arguments to a template class. */ -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 - -/* Platform has terminal ioctl flags like TCGETS and TCSETS. */ -#define ACE_HAS_TERM_IOCTLS 1 - -/* Platform supports threads */ -#define ACE_HAS_THREADS 1 - -/* Compiler/platform has thread-specific storage */ -#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1 - -/* Platform supports TLI timod STREAMS module */ -#define ACE_HAS_TIMOD_H 1 - -/* Platform supports TLI tiuser header */ -#define ACE_HAS_TIUSER_H 1 - -/* Platform supports TLI. Also see ACE_TLI_TCP_DEVICE. */ -#define ACE_HAS_TLI 1 - -/* Platform provides TLI function prototypes */ -#define ACE_HAS_TLI_PROTOTYPES 1 - -/* Platform supports ualarm() */ -#define ACE_HAS_UALARM 1 - -/* Platform supports ucontext_t (which is used in the extended signal API). */ -#define ACE_HAS_UCONTEXT_T 1 - -/* Platform has header file */ -#define ACE_HAS_UTIME 1 - -/* Compiler supports the C++ typename keyword */ -#define ACE_HAS_TYPENAME_KEYWORD 1 - -/* Compiler supports the new using keyword for C++ namespaces. */ -#define ACE_HAS_USING_KEYWORD 1 - -/* Prints out console message in ACE_NOTSUP. Useful for tracking down origin - of ACE_NOTSUP. */ -/* #undef ACE_HAS_VERBOSE_NOTSUP */ - -/* Platform requires void * for mmap(). */ -#define ACE_HAS_VOIDPTR_MMAP 1 - -/* Platform has XTI (X/Open-standardized superset of TLI). Implies - ACE_HAS_TLI but uses a different header file. */ -#define ACE_HAS_XTI 1 - -/* Platform can not build ace/IOStream{,_T}.cpp. This does not necessarily - mean that the platform does not support iostreams. */ -#define ACE_LACKS_ACE_IOSTREAM 1 - -/* Platform does not have u_longlong_t typedef */ -#define ACE_LACKS_U_LONGLONG_T 1 - -/* Platform lacks madvise() (e.g., Linux) */ -#define ACE_LACKS_MADVISE 1 - -/* Platform lacks POSIX prototypes for certain System V functions like shared - memory and message queues. */ -#define ACE_LACKS_SOME_POSIX_PROTOTYPES 1 - -/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */ -#define ACE_LACKS_PRI_T 1 - -/* Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2) */ -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 - -/* Platfrom lack pthread_yield() support. */ -#define ACE_LACKS_PTHREAD_YIELD 1 - -/* Platform lacks readers/writer locks. */ -#define ACE_LACKS_RWLOCK_T 1 - -/* MIT pthreads platform lacks the timedwait prototypes */ -#define ACE_LACKS_TIMEDWAIT_PROTOTYPES 1 - -/* Platform does not define timepec_t as a typedef for struct timespec. */ -#define ACE_LACKS_TIMESPEC_T 1 - -/* Compile using multi-thread libraries */ -#define ACE_MT_SAFE 1 - -/* Platform needs regexpr.h for regular expression support */ -#define ACE_NEEDS_REGEXPR_H 1 - -/* Platform needs to #include to get thread scheduling defs. */ -#define ACE_NEEDS_SCHED_H 1 - -/* doesn't automatically #include */ -#define ACE_LACKS_SYSTIME_H 1 - -/* Turns off the LM_DEBUG and LM_ERROR logging macros... */ -/* #undef ACE_NLOGGING */ - -/* Turns off the tracing feature. */ -#define ACE_NTRACE 1 - -/* The OS/platform supports the poll() event demultiplexor */ -#define ACE_USE_POLL 1 - -/* Platform has its standard c++ library in the namespace std. */ -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 - -/* The number of bytes in a double. */ -#define SIZEOF_DOUBLE 8 - -/* The number of bytes in a float. */ -#define SIZEOF_FLOAT 4 - -/* The number of bytes in a int. */ -#define SIZEOF_INT 4 - -/* The number of bytes in a long. */ -#define SIZEOF_LONG 4 - -/* The number of bytes in a long double. */ -#define SIZEOF_LONG_DOUBLE 12 - -/* The number of bytes in a long long. */ -#define SIZEOF_LONG_LONG 8 - -/* The number of bytes in a short. */ -#define SIZEOF_SHORT 2 - -/* The number of bytes in a signed char. */ -#define SIZEOF_SIGNED_CHAR 1 - -/* The number of bytes in a void *. */ -#define SIZEOF_VOID_P 4 - -/* Define if you have the execv function. */ -#define HAVE_EXECV 1 - -/* Define if you have the execve function. */ -#define HAVE_EXECVE 1 - -/* Define if you have the execvp function. */ -#define HAVE_EXECVP 1 - -/* Define if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define if you have the header file. */ -#define HAVE_FSTREAM 1 - -/* Define if you have the header file. */ -#define HAVE_IOMANIP 1 - -/* Define if you have the header file. */ -#define HAVE_IOSTREAM 1 - -/* Define if you have the header file. */ -#define HAVE_PWD_H 1 - -/* Name of package */ -#define PACKAGE "ace" - -/* Version number of package */ -#define VERSION "4.6.37" - -/* Added by Staller */ -#define ENUM_BOOLEAN // See file /usr/local/lib/gcc-lib/i486-pc-sysv5/egcs-2.91.60/include/sys/types.h -/* Hat nix gebracht -#define ACE_DEFAULT_SELECT_REACTOR_SIZE 256 // this is like in linux config fileto avoid another error -*/ -#define howmany(x, y) (((x)+((y)-1))/(y)) -#define ACE_HAS_BROKEN_T_ERROR // let disappear a nasty warning from OS.i -#if !defined (__USLC__) -# define __USLC__ 1 -#endif - -#define __IOCTL_VERSIONED__ // By Carlo! -#endif /* ACE_UNIXWARE_UDK_H */ diff --git a/ace/config-visualage.h b/ace/config-visualage.h deleted file mode 100644 index ccaaec9c776..00000000000 --- a/ace/config-visualage.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// This configuration file automatically includes the proper -// configurations for IBM's VisualAge C++ compiler on Win32 and AIX. - -#ifndef CONFIG_VISUALAGE_H -#define CONFIG_VISUALAGE_H -#include "ace/pre.h" - -#ifdef __TOS_WIN__ - #include "ace/config-win32.h" -#elif __TOS_AIX__ - #include "ace/config-aix-4.x.h" -#else - #include "PLATFORM NOT SPECIFIED" -#endif /* __TOS_WIN__ */ - -#include "ace/post.h" -#endif //CONFIG_VISUALAGE_H diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h deleted file mode 100644 index d4b42f231bc..00000000000 --- a/ace/config-vxworks5.x.h +++ /dev/null @@ -1,222 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for VxWorks -// 5.2/5.3 platforms using one of these compilers: -// 1) The GNU/Cygnus g++ compiler that is shipped with Tornado 1.0.1. -// 2) The Green Hills 1.8.8 (not 1.8.7!!!!) and 1.8.9 compilers. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include "ace/pre.h" - -#if ! defined (VXWORKS) -# define VXWORKS -#endif /* ! VXWORKS */ - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Compiler-specific configuration. -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -# undef ACE_HAS_TEMPLATE_SPECIALIZATION - -# define ACE_LACKS_IOSTREAM_FX -# if !defined (ACE_MAIN) -# define ACE_MAIN ace_main -# endif /* ! ACE_MAIN */ - - // Even though the documentation suggests that g++/VxWorks 5.3.1 - // (Tornado 1.0.1) supports long long, Wind River tech support says - // that it doesn't. It causes undefined symbols for math functions. -# define ACE_LACKS_LONGLONG_T - - // On g++/VxWorks, iostream.h defines a static instance (yes, instance) - // of the Iostream_init class. That causes all files that #include it - // to put in the global constructor/destructor hooks. For files that - // don't have any static instances of non-class (built-in) types, the - // hooks refer to the file name, e.g., "foo.cpp". That file name gets - // embedded in a variable name by munch. The output from munch won't - // compile, though, because of the period! So, let g++/VxWorks users - // include iostream.h only where they need it. -# define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION - -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_SIGNED_CHAR - -# if defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x542 -# define ACE_LACKS_CLEARERR -# endif /* ACE_VXWORKS >= 0x542 */ - -#elif defined (ghs) - // Processor type, if necessary. Green Hills defines "ppc". -# if defined (ppc) -# define ACE_HAS_POWERPC_TIMER -# define ACE_LACKS_CLEARERR -# elif defined (i386) || defined (__i386__) - // If running an Intel, assume that it's a Pentium so that - // ACE_OS::gethrtime () can use the RDTSC instruction. If - // running a 486 or lower, be sure to comment this out. - // (If not running an Intel CPU, this #define will not be seen - // because of the i386 protection, so it can be ignored.) -# define ACE_HAS_PENTIUM -# endif /* ppc || i386 */ - -# define ACE_CONFIG_INCLUDE_GHS_COMMON -# include "ace/config-ghs-common.h" - -# define ACE_LACKS_UNISTD_H -# define ACE_LACKS_IOSTREAM_TOTALLY - -// Short-circuit the include of -// Green Hills has a problem with multiply defined functions -// with different parameters. -# define __INCineth - -#elif defined (__DCPLUSPLUS__) - // Diab 4.2a or later. -# if !defined (ACE_LACKS_PRAGMA_ONCE) - // We define it with a -D with make depend. -# define ACE_LACKS_PRAGMA_ONCE -# endif /* ! ACE_LACKS_PRAGMA_ONCE */ - - // Diab doesn't support VxWorks' iostream libraries. -# define ACE_LACKS_IOSTREAM_TOTALLY - - // #include causes strange compilation errors in - // the system header files. -# define ACE_LACKS_NEW_H - -#else /* ! __GNUG__ && ! ghs */ -# error unsupported compiler on VxWorks -#endif /* ! __GNUG__ && ! ghs */ - -// OS-specific configuration - -#define ACE_LACKS_UNIX_SYSLOG -#define ACE_HAS_MUTEX_TIMEOUTS -#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768 -#define ACE_DEFAULT_THREAD_KEYS 16 -#define ACE_HAS_BROKEN_ACCEPT_ADDR -#define ACE_HAS_BROKEN_SENDMSG -#define ACE_HAS_BROKEN_WRITEV -#define ACE_HAS_CHARPTR_SOCKOPT -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_DIRENT -#define ACE_HAS_DLL 0 -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_RECURSIVE_MUTEXES -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_STRDUP_EMULATION -#define ACE_HAS_STRERROR -#define ACE_HAS_THREADS -#define ACE_HAS_TSS_EMULATION -#define ACE_LACKS_ACCESS -#define ACE_LACKS_COND_T -#define ACE_LACKS_EXEC -#define ACE_LACKS_FCNTL -#define ACE_LACKS_FILELOCKS -#define ACE_LACKS_FORK -#define ACE_LACKS_FSYNC -#define ACE_LACKS_GETHOSTENT -#define ACE_LACKS_GETSERVBYNAME -#define ACE_LACKS_KEY_T -#define ACE_LACKS_LSTAT -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MALLOC_H -#define ACE_LACKS_MEMORY_H -#define ACE_LACKS_MKFIFO -#define ACE_LACKS_MKTEMP -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PARAM_H -#define ACE_LACKS_PWD_FUNCTIONS -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_READLINK -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SBRK -#define ACE_LACKS_SEEKDIR -#define ACE_LACKS_SEMBUF_T -#define ACE_LACKS_SIGINFO_H -#define ACE_LACKS_SI_ADDR -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_STRCASECMP -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_SYSTIME_H -#define ACE_LACKS_SYSV_MSG_H -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_SYS_NERR -#define ACE_LACKS_TELLDIR -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_TRUNCATE -#define ACE_LACKS_UCONTEXT_H -#define ACE_LACKS_UNIX_SIGNALS -#define ACE_LACKS_UTSNAME_T -#define ACE_PAGE_SIZE 4096 -#define ACE_THR_PRI_FIFO_DEF 101 -#define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF -#define ACE_HAS_SIGTIMEDWAIT -#define ACE_HAS_SIGSUSPEND -#if !defined (ACE_VXWORKS_SPARE) -# define ACE_VXWORKS_SPARE spare4 -#endif /* ! ACE_VXWORKS_SPARE */ - -// Some string things -#define ACE_LACKS_WCSCAT -#define ACE_LACKS_WCSCHR -#define ACE_LACKS_WCSCMP -#define ACE_LACKS_WCSCPY -#define ACE_LACKS_WCSCSPN -#define ACE_LACKS_WCSLEN -#define ACE_LACKS_WCSNCAT -#define ACE_LACKS_WCSNCMP -#define ACE_LACKS_WCSNCPY -#define ACE_LACKS_WCSPBRK -#define ACE_LACKS_WCSRCHR -#define ACE_LACKS_WCSSPN -#define ACE_LACKS_WCSSTR -#define ACE_LACKS_WCSTOK -#define ACE_LACKS_TOWLOWER -#define ACE_LACKS_ITOW -#define ACE_LACKS_WCSICMP -#define ACE_LACKS_WCSNICMP -#define ACE_LACKS_WCSTOD -#define ACE_LACKS_WCSTOL -#define ACE_LACKS_WCSTOUL -#define ACE_LACKS_WCSDUP - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#if !defined (ACE_NEEDS_HUGE_THREAD_STACKSIZE) -# define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 -#endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */ - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// By default, don't include RCS Id strings in object code. -#if !defined (ACE_USE_RCSID) -#define ACE_USE_RCSID 0 -#endif /* #if !defined (ACE_USE_RCSID) */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h deleted file mode 100644 index 642c605779d..00000000000 --- a/ace/config-win32-borland.h +++ /dev/null @@ -1,64 +0,0 @@ -// -*- C++ -*- -//$Id$ - -// The following configuration file contains defines for Borland compilers. - -#ifndef ACE_CONFIG_WIN32_BORLAND_H -#define ACE_CONFIG_WIN32_BORLAND_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#include "config-borland-common.h" - -# if (__BORLANDC__ == 0x540) -// The linker in C++Builder 4 has trouble with the large number of DLL -// function exports created when you compile without inline functions. -// Therefore we will always use inline functions with this version of -// the compiler. -# if defined (__ACE_INLINE__) -# undef __ACE_INLINE__ -# endif /* __ACE_INLINE__ */ -# define __ACE_INLINE__ 1 -# else /* __BORLANDC__ == 0x540 */ -// In later versions of C++Builder we will prefer inline functions by -// default. The debug configuration of ACE is built with functions -// out-of-line, so when linking your application against a debug ACE -// build, you can choose to use the out-of-line functions by adding -// ACE_NO_INLINE=1 to your project settings. -# if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ 1 -# endif /* __ACE_INLINE__ */ -# endif /* __BORLANDC__ == 0x540 */ - -// Automatically define WIN32 macro if the compiler tells us it is our -// target platform. -# if defined (__WIN32__) && !defined (WIN32) -# define WIN32 1 -# endif - -// When building a VCL application, the main VCL header file should be -// included before anything else. You can define ACE_HAS_VCL=1 in your -// project settings to have this file included for you automatically. -# if defined (ACE_HAS_VCL) && (ACE_HAS_VCL != 0) -# include /**/ -# endif - -# include "ace/config-win32-common.h" - -# define ACE_STRCASECMP_EQUIVALENT ::stricmp -# define ACE_STRNCASECMP_EQUIVALENT ::strnicmp -# define ACE_WCSDUP_EQUIVALENT ::_wcsdup - -# define ACE_LACKS_MODE_MASKS 1 -# define ACE_WSTRING_HAS_USHORT_SUPPORT 1 - -#ifdef ACE_USES_STD_NAMESPACE_FOR_STDC_LIB -#undef ACE_USES_STD_NAMESPACE_FOR_STDC_LIB -#define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1 -#endif - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_BORLAND_H */ diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h deleted file mode 100644 index fcefdfdebf5..00000000000 --- a/ace/config-win32-common.h +++ /dev/null @@ -1,573 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_CONFIG_WIN32_COMMON_H -#define ACE_CONFIG_WIN32_COMMON_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -// Complain if WIN32 is not already defined. -#if !defined (WIN32) && !defined (ACE_HAS_WINCE) -# error Please define WIN32 in your project settings. -#endif - -#define ACE_WIN32 -#if defined (_WIN64) || defined (WIN64) -# define ACE_WIN64 -#endif /* _WIN64 || WIN64 */ - -// Define this if you're running NT >= 4.0 (Win2K == NT 5). -// Setting applies to : building ACE -// Runtime restrictions: System must be Windows NT => 4.0 -#if !defined (ACE_HAS_WINNT4) -# define ACE_HAS_WINNT4 1 /* assuming Win NT 4.0 or greater */ -#endif - -#if (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 != 0) -# if !defined (_WIN32_WINNT) -# define _WIN32_WINNT 0x0400 -# endif -#else -// On Win9X, a shared address SHOULD be between the 2nd and 3rd Gb. -// Note this will not work for NT: The addresses above 2Gb are -// reserved for the system, so this one will fail. -# define ACE_DEFAULT_BASE_ADDR ((char*) ((2048UL+512UL)*1024UL*1024UL)) -#endif - -// Define ACE_HAS_MFC to 1, if you want ACE to use CWinThread. This should -// be defined, if your application uses MFC. -// Setting applies to : building ACE -// Runtime restrictions: MFC DLLs must be installed -// Additonal notes : If both ACE_HAS_MFC and ACE_MT_SAFE are -// defined, the MFC DLL (not the static lib) -// will be used from ACE. -#if !defined (ACE_HAS_MFC) -# define ACE_HAS_MFC 0 -#endif - -// If the invoking procedure turned off debugging by setting NDEBUG, then -// also set ACE_NDEBUG, unless the user has already set it. -#if defined (NDEBUG) -# if !defined (ACE_NDEBUG) -# define ACE_NDEBUG -# endif /* ACE_NDEBUG */ -#endif /* NDEBUG */ - -// Define ACE_HAS_STRICT to 1 in your config.h file if you want to use -// STRICT type checking. It is disabled by default because it will -// break existing application code. -// Setting applies to : building ACE, linking with ACE -// Runtime restrictions: - -// Additonal notes : ACE_HAS_MFC implies ACE_HAS_STRICT -#if !defined (ACE_HAS_STRICT) -# define ACE_HAS_STRICT 0 -#endif - -// Turn off the following define if you want to disable threading. -// Compile using multi-thread libraries. -// Setting applies to : building ACE, linking with ACE -// Runtime restrictions: multithreaded runtime DLL must be installed -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -// Build ACE services as DLLs. If you write a library and want it to -// use ACE_Svc_Export, this will cause those macros to build dlls. If -// you want your ACE service to be a static library, comment out this -// line. As far as I know, the only reason to have a library be an -// ACE "service" is to leverage the ACE_Svc_Export macros. It's just -// as easy to define your own export macros. -// #if !defined (ACE_SVC_HAS_DLL) -// # define ACE_SVC_HAS_DLL 1 -// #endif - -// Define the special export macros needed to export symbols outside a dll -#ifndef __BORLANDC__ -#define ACE_HAS_CUSTOM_EXPORT_MACROS -#define ACE_Proper_Export_Flag __declspec (dllexport) -#define ACE_Proper_Import_Flag __declspec (dllimport) -#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T -#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE; -#define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T -#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE ; -#endif /* !__BORLANDC__ */ - -// Define ACE_HAS_WINSOCK2 to 0 in your config.h file if you do *not* -// want to compile with WinSock 2.0. -// Setting applies to : building ACE -// Runtime restrictions: winsock2 must be installed. -// #define ACE_HAS_WINSOCK2 0 - -// By default, we use non-static object manager on Win32. That is, -// the object manager is allocated in main's stack memory. If this -// does not suit your need, i.e., if your programs depend on the use -// of static object manager, you neet to disable the behavior by adding -// -// #undef ACE_HAS_NONSTATIC_OBJECT_MANAGER -// -// in the config.h after including config-win32.h -// -// MFC users: the main function is defined within a MFC library and -// therefore, ACE won't be able to meddle with main function and -// instantiate the non-static object manager for you. To solve the -// problem, you'll need to instantiate the ACE_Object_Manager by -// either: -// -// 1. Using static object manager (as described above), however, using -// the non-static object manager is prefered, therefore, -// 2. Instantiate the non-static object manager yourself by either 1) -// call ACE::init () at the beginning and ACE::fini () at the end, -// _or_ 2) instantiate the ACE_Object_Manager in your CWinApp -// derived class. -// -// Optionally, you can #define -// ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER in your -// ace/config.h and always take care of the business by yourself. -// ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER has no effect when -// using static object managers. -#if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) -# define ACE_HAS_NONSTATIC_OBJECT_MANAGER -#elif (ACE_HAS_NONSTATIC_OBJECT_MANAGER == 0) -# undef ACE_HAS_NONSTATIC_OBJECT_MANAGER -#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ - -#define ACE_HAS_GPERF - -// By default, don't include RCS Id strings in object code. -#if !defined (ACE_USE_RCSID) -# define ACE_USE_RCSID 0 -#endif /* ! ACE_USE_RCSID */ - -// ---------------- platform features or lack of them ------------- - -// By default WIN32 has FD_SETSIZE of 64, which places the limit -// between 61 and 64 on the number of clients a server using the -// Select Reactor can support at the same time (i.e., 64 - standard in, -// out, error). Here we raise the limit to 1024. Adjust the definition -// below if you need to raise or lower it. - -#if !defined (FD_SETSIZE) -#define FD_SETSIZE 1024 -#endif /* FD_SETSIZE */ - - -// Windows doesn't like 65536 ;-) If 65536 is specified, it is -// listenly ignored by the OS, i.e., setsockopt does not fail, and you -// get stuck with the default size of 8k. -#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65535 - -// It seems like Win32 does not have a limit on the number of buffers -// that can be transferred by the scatter/gather type of I/O -// functions, e.g., WSASend and WSARecv. We are setting this to be 64 -// for now. The typically use case is to create an I/O vector array -// of size ACE_IOV_MAX on the stack and then filled in. Note that we -// probably don't want too big a value for ACE_IOV_MAX since it may -// mostly go to waste or the size of the activation record may become -// excessively large. - -#if !defined (ACE_IOV_MAX) -# define ACE_IOV_MAX 64 -#endif /* ACE_IOV_MAX */ - -#if !defined (ACE_HAS_WINCE) -// Platform supports pread() and pwrite() -# define ACE_HAS_P_READ_WRITE -#endif /* ! ACE_HAS_WINCE */ - -#if !defined (__MINGW32__) -# define ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS -#endif /* __MINGW32__ */ - -#define ACE_DEFAULT_THREAD_PRIORITY 0 - -#define ACE_HAS_RECURSIVE_MUTEXES -#define ACE_HAS_MSG -#define ACE_HAS_DIRENT -#define ACE_HAS_SOCKADDR_MSG_NAME -#define ACE_LACKS_GETPGID -#define ACE_LACKS_GETPPID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_HAS_THREAD_SAFE_ACCEPT -#define ACE_LACKS_GETHOSTENT -#define ACE_LACKS_SIGACTION -#define ACE_LACKS_SIGSET -#define ACE_LACKS_FORK -#define ACE_LACKS_UNIX_SIGNALS -#define ACE_LACKS_SBRK -#define ACE_LACKS_UTSNAME_T -#define ACE_LACKS_SEMBUF_T -#define ACE_LACKS_MSGBUF_T -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_UNISTD_H -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_MKFIFO -#define ACE_LACKS_TELLDIR -#define ACE_LACKS_SEEKDIR -#define ACE_LACKS_REWINDDIR -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_INET_ATON -#define ACE_LACKS_PARAM_H - -#define ACE_HAS_SNPRINTF -#define ACE_HAS_VFWPRINTF - -#define ACE_SIZEOF_LONG_LONG 8 -// Green Hills Native x86 does not support __int64 keyword -// Neither does mingw32. -#if !defined (ACE_LACKS_LONGLONG_T) && !defined (__MINGW32__) -typedef unsigned __int64 ACE_UINT64; -#endif /* (ghs) */ - -#if defined (__MINGW32__) -typedef unsigned long long ACE_UINT64; -#endif - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Win32 has wchar_t support -#define ACE_HAS_WCHAR - -// Compiler/platform correctly calls init()/fini() for shared -// libraries. - applied for DLLs ? -//define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -//define ACE_HAS_POSIX_NONBLOCK - -// Platform contains . -//define ACE_HAS_POLL - -// Platform supports the /proc file system. -//define ACE_HAS_PROC_FS - -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) -// Platform supports the rusage struct. -#define ACE_HAS_GETRUSAGE -#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ - -// Compiler/platform supports SVR4 signal typedef. -//define ACE_HAS_SVR4_SIGNAL_T - -// Platform provides header. -//define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports sys_siglist array. -//define ACE_HAS_SYS_SIGLIST - -// Platform supports ACE_TLI timod STREAMS module. -//define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -//define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -//define ACE_HAS_TLI - -// I'm pretty sure NT lacks these -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS - -// Windows NT needs readv() and writev() -#define ACE_LACKS_WRITEV -#define ACE_LACKS_READV - -#define ACE_LACKS_COND_T -#define ACE_LACKS_RWLOCK_T - -#define ACE_LACKS_KEY_T - -// No system support for replacing any previous mappings. -#define ACE_LACKS_AUTO_MMAP_REPLACEMENT - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ -// #define ACE_NLOGGING - -// MFC itself defines STRICT. -#if defined( ACE_HAS_MFC ) && (ACE_HAS_MFC != 0) -# if !defined(ACE_HAS_STRICT) -# define ACE_HAS_STRICT 1 -# endif -# if (ACE_HAS_STRICT != 1) -# undef ACE_HAS_STRICT -# define ACE_HAS_STRICT 1 -# endif -#endif - -// If you want to use highres timers, ensure that -// Build.Settings.C++.CodeGeneration.Processor is -// set to Pentium ! -#if !defined(ACE_HAS_PENTIUM) && (_M_IX86 > 400) -# define ACE_HAS_PENTIUM -#endif - -#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -// Platform supports threads. -# define ACE_HAS_THREADS - -// Platform supports Windows32 threads. -# define ACE_HAS_WTHREADS - -// Compiler/platform has thread-specific storage -# define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Win32 doesn't have fcntl -#define ACE_LACKS_FCNTL - -// must have _MT defined to include multithreading -// features from win32 headers -# if !defined(_MT) && !defined (ACE_HAS_WINCE) -// *** DO NOT *** defeat this error message by defining _MT yourself. -// On MSVC, this is changed by selecting the Multithreaded -// DLL or Debug Multithreaded DLL in the Project Settings -// under C++ Code Generation. -# error You must link against multi-threaded libraries when using ACE (check your project settings) -# endif /* !_MT && !ACE_HAS_WINCE */ -#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ - -// We are using STL's min and max (in algobase.h). Therefore the -// macros in window.h are extra -#if !defined (NOMINMAX) -# define NOMINMAX -#endif /* NOMINMAX */ - -#if !defined(_DEBUG) -// If we are making a release, and the user has not specified -// inline directives, we will default to inline -# if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ 1 -# endif /* __ACE_INLINE__ */ -#endif - -// If __ACE_INLINE__ is defined to be 0, we will undefine it -#if defined (__ACE_INLINE__) && (__ACE_INLINE__ == 0) -# undef __ACE_INLINE__ -#endif /* __ACE_INLINE__ */ - -// ACE_USES_STATIC_MFC always implies ACE_HAS_MFC -#if defined (ACE_USES_STATIC_MFC) -# if defined (ACE_HAS_MFC) -# undef ACE_HAS_MFC -# endif -# define ACE_HAS_MFC 1 -#endif /* ACE_USES_STATIC_MFC */ - -// We are build ACE and want to use MFC (multithreaded) -#if defined(ACE_HAS_MFC) && (ACE_HAS_MFC != 0) && defined (_MT) -# if (ACE_HAS_DLL != 0) && defined(ACE_BUILD_DLL) && !defined (_WINDLL) -// force multithreaded MFC DLL -# define _WINDLL -# endif /* _AFXDLL */ -# if !defined (_AFXDLL) && !defined (ACE_USES_STATIC_MFC) -# define _AFXDLL -# endif /* _AFXDLL */ -#endif - -// and MFC's are mutually -// incompatible. is brain-dead about MFC; it doesn't check -// to see whether MFC stuff is anticipated or already in progress -// before doing its thing. ACE needs (practically always) , -// and winsock in turn needs support either from windows.h or from -// afxwin.h. One or the other, not both. -// -// The MSVC++ V4.0 environment defines preprocessor macros that -// indicate the programmer has chosen something from the -// Build-->Settings-->General-->MFC combo-box. defines a -// macro itself to protect against double inclusion. We'll take -// advantage of all this to select the proper support for winsock. - -// trl 26-July-1996 - -// This is necessary since MFC users apparently can't #include -// directly. -#if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) -# include /**/ /* He is doing MFC */ -// Windows.h will be included via afxwin.h->afx.h->afx_ver_.h->afxv_w32.h -// #define _INC_WINDOWS // Prevent winsock.h from including windows.h -# if defined (ACE_HAS_WINCE) -# include /**/ -# endif /* ACE_HAS_WINCE */ -#elif defined (ACE_HAS_WINCE) -# include /**/ -#endif - -#if !defined (_INC_WINDOWS) /* Already include windows.h ? */ -// Must define strict before including windows.h ! -# if defined (ACE_HAS_STRICT) && (ACE_HAS_STRICT != 0) && !defined (STRICT) -# define STRICT 1 -# endif /* ACE_HAS_STRICT */ - -# if !defined (WIN32_LEAN_AND_MEAN) && !defined (ACE_NO_WIN32_LEAN_AND_MEAN) -# define WIN32_LEAN_AND_MEAN -# endif /* WIN32_LEAN_AND_MEAN */ - -#endif /* !defined (_INC_WINDOWS) */ - -// Always use WS2 when available -#if !defined(ACE_HAS_WINSOCK2) -# define ACE_HAS_WINSOCK2 1 -#endif /* !defined(ACE_HAS_WINSOCK2) */ - - -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) -# if !defined (_WINSOCK2API_) -// will also include windows.h, if not present -# include /**/ -// WinCE 4 doesn't define the Exxx values without the WSA prefix, so do that -// here. This is all lifted from the #if 0'd out part of winsock2.h. -# if defined (UNDER_CE) && (UNDER_CE == 4) -# define EWOULDBLOCK WSAEWOULDBLOCK -# define EINPROGRESS WSAEINPROGRESS -# define EALREADY WSAEALREADY -# define ENOTSOCK WSAENOTSOCK -# define EDESTADDRREQ WSAEDESTADDRREQ -# define EMSGSIZE WSAEMSGSIZE -# define EPROTOTYPE WSAEPROTOTYPE -# define ENOPROTOOPT WSAENOPROTOOPT -# define EPROTONOSUPPORT WSAEPROTONOSUPPORT -# define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT -# define EOPNOTSUPP WSAEOPNOTSUPP -# define EPFNOSUPPORT WSAEPFNOSUPPORT -# define EAFNOSUPPORT WSAEAFNOSUPPORT -# define EADDRINUSE WSAEADDRINUSE -# define EADDRNOTAVAIL WSAEADDRNOTAVAIL -# define ENETDOWN WSAENETDOWN -# define ENETUNREACH WSAENETUNREACH -# define ENETRESET WSAENETRESET -# define ECONNABORTED WSAECONNABORTED -# define ECONNRESET WSAECONNRESET -# define ENOBUFS WSAENOBUFS -# define EISCONN WSAEISCONN -# define ENOTCONN WSAENOTCONN -# define ESHUTDOWN WSAESHUTDOWN -# define ETOOMANYREFS WSAETOOMANYREFS -# define ETIMEDOUT WSAETIMEDOUT -# define ECONNREFUSED WSAECONNREFUSED -# define ELOOP WSAELOOP -# define ENAMETOOLONG WSAENAMETOOLONG -# define EHOSTDOWN WSAEHOSTDOWN -# define EHOSTUNREACH WSAEHOSTUNREACH -# define ENOTEMPTY WSAENOTEMPTY -# define EPROCLIM WSAEPROCLIM -# define EUSERS WSAEUSERS -# define EDQUOT WSAEDQUOT -# define ESTALE WSAESTALE -# define EREMOTE WSAEREMOTE -# endif /* UNDER_CE == 4 */ -# endif /* _WINSOCK2API */ - -# if defined (ACE_HAS_FORE_ATM_WS2) -# include /**/ -# endif /*ACE_HAS_FORE_ATM_WS2 */ - -// CE doesn't have Microsoft Winsock 2 extensions -# if !defined _MSWSOCK_ && !defined (ACE_HAS_WINCE) -# include /**/ -# endif /* _MSWSOCK_ */ - -# if defined (_MSC_VER) -# if defined (ACE_HAS_WINCE) -# pragma comment(lib, "ws2.lib") -# else -# pragma comment(lib, "ws2_32.lib") -# pragma comment(lib, "mswsock.lib") -# endif /* ACE_HAS_WINCE */ -# endif /* _MSC_VER */ - -# define ACE_WSOCK_VERSION 2, 0 -#else -# if !defined (_WINSOCKAPI_) - // will also include windows.h, if not present -# include /**/ -# endif /* _WINSOCKAPI */ - -// PharLap ETS has its own winsock lib, so don't grab the one -// supplied with the OS. -# if defined (_MSC_VER) && !defined (UNDER_CE) && !defined (ACE_HAS_PHARLAP) -# pragma comment(lib, "wsock32.lib") -# endif /* _MSC_VER */ - -// We can't use recvmsg and sendmsg unless WinSock 2 is available -# define ACE_LACKS_RECVMSG -# define ACE_LACKS_SENDMSG - -// Version 1.1 of WinSock -# define ACE_WSOCK_VERSION 1, 1 -#endif /* ACE_HAS_WINSOCK2 */ - -// mingw32 doesn't define this (yet...) -#if defined(__MINGW32__) && !defined(MWMO_ALERTABLE) -# define MWMO_ALERTABLE 0x0002 -#endif - -// Platform supports IP multicast on Winsock 2 -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) -# define ACE_HAS_IP_MULTICAST -#endif /* ACE_HAS_WINSOCK2 */ - -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || \ - defined (ACE_HAS_WINCE) /* WinCE 3 has these */ -# if !defined (ACE_HAS_WINCE) || defined (PPC) /* CE only on some CPUs */ -# define ACE_HAS_INTERLOCKED_EXCHANGEADD -# endif -# define ACE_HAS_WIN32_TRYLOCK -#endif - -#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) -# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT - -// If CancelIO is undefined get the updated sp2-sdk from MS -# define ACE_HAS_CANCEL_IO -#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) */ - -#if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION) -# define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH -#endif /* ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION */ - -// Try to make a good guess whether we are compiling with the newer version -// of WinSock 2 that has GQOS support. -#if !defined (ACE_HAS_WINSOCK2_GQOS) -# if defined (WINSOCK_VERSION) -# define ACE_HAS_WINSOCK2_GQOS 1 -# endif /* WINSOCK_VERSION */ -#endif /* ACE_HAS_WINSOCK2_GQOS */ - -#define ACE_SIZEOF_WCHAR 2 -#define ACE_HAS_MUTEX_TIMEOUTS -#define ACE_LACKS_STRUCT_DIR -#define ACE_LACKS_MKSTEMP - -// If we are using winsock2 then the SO_REUSEADDR feature is broken -// SO_REUSEADDR=1 behaves like SO_REUSEPORT=1. (SO_REUSEPORT is an -// extension to sockets on some platforms) -// We define SO_REUSEPORT here so that ACE_OS::setsockopt() can still -// allow the user to specify that a socketaddr can *always* be reused. -#if defined (ACE_HAS_WINSOCK2) && ACE_HAS_WINSOCK2 != 0 && ! defined(SO_REUSEPORT) -#define SO_REUSEPORT 0x0400 // We just have to pick a value that won't conflict -#endif - -#if defined (ACE_WIN64) -// Data must be aligned on 8-byte boundaries, at a minimum. -# define ACE_MALLOC_ALIGN 8 -#endif /* ACE_WIN64 */ - -#if !defined (ACE_DISABLES_THREAD_LIBRARY_CALLS) -# define ACE_DISABLES_THREAD_LIBRARY_CALLS 0 -#endif /* ACE_DISABLES_THREAD_LIBRARY_CALLS */ - -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) -# define ACE_HAS_LOG_MSG_NT_EVENT_LOG -#endif /* !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_COMMON_H */ diff --git a/ace/config-win32-ghs.h b/ace/config-win32-ghs.h deleted file mode 100644 index bebd8a53e70..00000000000 --- a/ace/config-win32-ghs.h +++ /dev/null @@ -1,110 +0,0 @@ -// -*- C++ -*- -// $Id$ - -// The following configuration file contains defines for Green Hills compilers. - -#ifndef ACE_CONFIG_WIN32_GHS_H -#define ACE_CONFIG_WIN32_GHS_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef WIN32 -# define WIN32 -#endif /* WIN32 */ - -#undef _M_IX86 -// This turns on ACE_HAS_PENTIUM -#define _M_IX86 500 -// GHS does not provide DLL support -#define ACE_HAS_DLL 0 -#define TAO_HAS_DLL 0 -#undef _DLL -#define ACE_OS_HAS_DLL 0 - -//Green Hills Native x86 does not support structural exceptions -# undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS -# undef ACE_HAS_WCHAR -# define ACE_CONFIG_INCLUDE_GHS_COMMON -# include "ace/config-ghs-common.h" - -// Changed ACE_TEXT to ACE_LIB_TEXT in the following line -# define ACE_CC_NAME ACE_LIB_TEXT ("Green Hills C++") -# define ACE_CC_MAJOR_VERSION (1) -# define ACE_CC_MINOR_VERSION (8) -# define ACE_CC_BETA_VERSION (9) -# define ACE_CC_PREPROCESSOR "GCX.EXE" -# define ACE_CC_PREPROCESSOR_ARGS "-E" - -// GHS uses Microsoft's standard cpp library, which has auto_ptr. -# undef ACE_LACKS_AUTO_PTR -// Microsoft's standard cpp library auto_ptr doesn't have reset (). -# define ACE_AUTO_PTR_LACKS_RESET - -#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) - -// This section below was extracted from config-win32-msvc -#define ACE_HAS_ITOA -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup -// This section above was extracted from config-win32-msvc - -# define ACE_EXPORT_NESTED_CLASSES 1 -# define ACE_HAS_ANSI_CASTS 1 -# define ACE_HAS_CPLUSPLUS_HEADERS 1 -//# define ACE_HAS_EXCEPTIONS 1 -# define ACE_HAS_EXPLICIT_KEYWORD 1 -# define ACE_HAS_GNU_CSTRING_H 1 -# define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION 1 -# define ACE_HAS_MUTABLE_KEYWORD 1 -# define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 -# define ACE_HAS_SIG_ATOMIC_T 1 -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -//# if (__BORLANDC__ <= 0x540) -//# define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION 1 -//# endif -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION 1 -# define ACE_HAS_STDCPP_STL_INCLUDES 1 -# define ACE_HAS_STRERROR 1 -# define ACE_HAS_STRING_CLASS 1 -# define ACE_HAS_STRPTIME 1 -# define ACE_HAS_TEMPLATE_SPECIALIZATION 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS 1 -# define ACE_HAS_TYPENAME_KEYWORD 1 -//# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -# define ACE_HAS_USER_MODE_MASKS 1 -# define ACE_HAS_USING_KEYWORD 1 -# define ACE_LACKS_ACE_IOSTREAM 1 -//# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -# define ACE_LACKS_MODE_MASKS 1 -# define ACE_LACKS_NATIVE_STRPTIME 1 -//# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1 -//# define ACE_LACKS_PRAGMA_ONCE 1 -# define ACE_LACKS_STRRECVFD 1 -//# define ACE_NEW_THROWS_EXCEPTIONS 1 -# define ACE_SIZEOF_LONG_DOUBLE 10 -# define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_LIB_TEXT in the following two lines -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -// Set the following to zero to placate SString.h ACE_WString CTOR -# undef ACE_WSTRING_HAS_USHORT_SUPPORT - -// Green Hills Native x86 does not support __int64 keyword -# define ACE_LACKS_LONGLONG_T - -/* need to ensure these are included before */ -# include -# include - -# if !defined (ACE_LD_DECORATOR_STR) && defined (_DEBUG) -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") -# endif - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_GHS_H */ diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h deleted file mode 100644 index e4cc77e30de..00000000000 --- a/ace/config-win32-mingw.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- -// $Id$ - -// -// The following configuration file is designed to work for win32 -// platforms using gcc/g++ with mingw32 (http://www.mingw.org). -// - -#ifndef ACE_CONFIG_WIN32_MINGW_H -#define ACE_CONFIG_WIN32_MINGW_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -# error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#define ACE_CC_NAME ACE_LIB_TEXT ("g++") -#define ACE_CC_PREPROCESSOR "cpp" -#define ACE_CC_PREPROCESOR_ARGS "" - -#define ACE_HAS_BROKEN_SAP_ANY - -// Why all this is not in config-g++-common.h? -#define ACE_CC_MAJOR_VERSION __GNUC__ -#define ACE_CC_MINOR_VERSION __GNUC_MINOR__ -#define ACE_CC_BETA_VERSION (0) - -#if !defined(__MINGW32__) -# error You do not seem to be using mingw32 -#endif - -#include "ace/config-g++-common.h" - -#include /**/ <_mingw.h> -#include /**/ - -#define ACE_LACKS_MODE_MASKS -#define ACE_HAS_USER_MODE_MASKS - -#if (__MINGW32_MAJOR_VERSION < 2) -# error You need a newer version (>= 2.0) of mingw32/w32api -#endif - -#define ACE_LACKS_STRRECVFD -#define ACE_HAS_STRERROR - -// We trust the user: He must have used -mpentiumpro or -mpentium -// if that is what he wants. -#if defined(pentiumpro) || defined(pentium) -# define ACE_HAS_PENTIUM -#endif - -#if !defined (ACE_HAS_WINNT4) -# if (defined (WINNT) && WINNT == 1) \ - || (defined (__WINNT__) && __WINNT__ == 1) -# define ACE_HAS_WINNT4 1 -# else -# define ACE_HAS_WINNT4 0 -# endif -#endif - -#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) (STATUS)) - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MINGW_H */ diff --git a/ace/config-win32-msvc-5.h b/ace/config-win32-msvc-5.h deleted file mode 100644 index 2b53bf345e3..00000000000 --- a/ace/config-win32-msvc-5.h +++ /dev/null @@ -1,191 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-5.h - * - * $Id$ - * - * @brief Microsoft Visual C++ 5.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 5. - * - * @note Do not include this file directly, include config-win32.h instead. - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_5_H -#define ACE_CONFIG_WIN32_MSVC_5_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -# if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# define ACE_HAS_STANDARD_CPP_LIBRARY 0 -# endif - -// The STL that comes with ACE uses the std namespace. Note however, it is not -// part of the standard C++ library -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -# if !defined (ACE_HAS_BROKEN_NESTED_TEMPLATES) -# define ACE_HAS_BROKEN_NESTED_TEMPLATES -# endif /* ACE_HAS_BROKEN_NESTED_TEMPLATES */ - -// By default, we disable the C++ casting because -// it requires the RTTI support to be turned on which -// is not something we usually do. -# if !defined (ACE_HAS_ANSI_CASTS) -# define ACE_HAS_ANSI_CASTS 0 -# endif - -# define ACE_HAS_EXPLICIT_KEYWORD -# define ACE_HAS_MUTABLE_KEYWORD - -#define ACE_HAS_ITOA - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup - -// VC5 doesn't support operator placement delete -# if (_MSC_VER < 1200) -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -# endif /* _MSC_VER < 1200 */ - -# if !defined (ACE_HAS_WINCE) -# define ACE_HAS_EXCEPTIONS -# endif /* ACE_HAS_WINCE */ -# define ACE_HAS_BROKEN_NAMESPACES -# define ACE_HAS_BROKEN_IMPLICIT_CONST_CAST -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -# if defined (ACE_HAS_ANSI_CASTS) && (ACE_HAS_ANSI_CASTS == 0) -# undef ACE_HAS_ANSI_CASTS -# endif /* ACE_HAS_ANSI_CASTS && ACE_HAS_ANSI_CASTS == 0 */ - -# if !defined (ACE_HAS_WINCE) -# define ACE_HAS_SIG_ATOMIC_T -# endif /* ACE_HAS_WINCE */ - -// Only >= MSVC 6.0 definitions -# if (_MSC_VER >= 1200) -# define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -# endif /* _MSC_VER >= 1200 */ - -// Compiler doesn't support static data member templates. -# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - -# define ACE_LACKS_MODE_MASKS -# define ACE_LACKS_STRRECVFD - -# if !defined (ACE_HAS_WINCE) -# define ACE_HAS_LLSEEK -# endif /* ACE_HAS_WINCE */ - -// Compiler/platform has correctly prototyped header files. -# define ACE_HAS_CPLUSPLUS_HEADERS - -// Platform supports POSIX timers via timestruc_t. -//define ACE_HAS_POSIX_TIME -# define ACE_HAS_STRPTIME -# define ACE_LACKS_NATIVE_STRPTIME - -// Compiler/platform supports strerror (). -# define ACE_HAS_STRERROR - -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -# define ACE_HAS_TLI_PROTOTYPES - -// Platform support linebuffered streaming is broken -# define ACE_LACKS_LINEBUFFERED_STREAMBUF - -// Template specialization is supported. -# define ACE_HAS_TEMPLATE_SPECIALIZATION - -// ----------------- "derived" defines and includes ----------- - -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -// Platform has its Standard C++ library in the namespace std -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -// Microsoft's auto_ptr in standard cpp library doesn't have reset (). -# define ACE_AUTO_PTR_LACKS_RESET - -// ace/iostream.h does not work with the standard cpp library (yet). -# if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -# endif /* ! ACE_USES_OLD_IOSTREAMS */ -# else -// iostream header lacks ipfx (), isfx (), etc., declarations -# define ACE_LACKS_IOSTREAM_FX -# endif - -// While digging the MSVC 4.0 include files, I found how to disable -// MSVC warnings: --Amos Shapira - -// "C4355: 'this' : used in base member initializer list" -# pragma warning(disable:4355) /* disable C4514 warning */ -// #pragma warning(default:4355) // use this to reenable, if desired - -# pragma warning(disable:4201) /* winnt.h uses nameless structs */ - -# pragma warning(disable:4231) -// Disable warning of using Microsoft Extension. - -// MSVC allows throw keyword but complains about it. -# pragma warning( disable : 4290 ) - -// Inheritance by dominance is A-OK by us -# pragma warning (disable:4250) - -// Compiler/Platform supports the "using" keyword. -#define ACE_HAS_USING_KEYWORD - -# if !defined(ACE_HAS_WINCE) -# if defined(ACE_HAS_DLL) && (ACE_HAS_DLL != 0) -# if !defined(_DLL) -// *** DO NOT *** DO NOT *** defeat this error message -// by defining _DLL yourself. RTFM and see who set _DLL. -# error You must link against (Debug) Multithreaded DLL run-time libraries. -# endif /* !_DLL */ -# endif /* ACE_HAS_DLL && ACE_HAS_DLL != 0 */ -# endif /* !ACE_HAS_WINCE */ - -# pragma warning(default: 4201) /* winnt.h uses nameless structs */ - -// At least for Win32 - MSVC compiler (ver. 5) -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") - -# if !defined (ACE_LD_DECORATOR_STR) -# if defined (_DEBUG) -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfcd") -# else -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") -# endif //ACE_HAS_MFC -# else // _NDEBUG -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfc") -# endif //ACE_HAS_MFC -# endif // _DEBUG -# endif - -# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_5_H */ diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h deleted file mode 100644 index b17eaa8a54e..00000000000 --- a/ace/config-win32-msvc-6.h +++ /dev/null @@ -1,179 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file config-win32-msvc-6.h - * - * $Id$ - * - * @brief Microsoft Visual C++ 6.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 6. - * - * @note Do not include this file directly, include config-win32.h instead. - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_6_H -#define ACE_CONFIG_WIN32_MSVC_6_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -# if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# define ACE_HAS_STANDARD_CPP_LIBRARY 0 -# endif - -// The STL that comes with ACE uses the std namespace. Note however, it is not -// part of the standard C++ library -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -# if !defined (ACE_HAS_BROKEN_NESTED_TEMPLATES) -# define ACE_HAS_BROKEN_NESTED_TEMPLATES -# endif /* ACE_HAS_BROKEN_NESTED_TEMPLATES */ - -// By default, we disable the C++ casting because -// it requires the RTTI support to be turned on which -// is not something we usually do. -# if !defined (ACE_HAS_ANSI_CASTS) -# define ACE_HAS_ANSI_CASTS 0 -# endif - -// Keywords - -# define ACE_HAS_EXPLICIT_KEYWORD -# define ACE_HAS_MUTABLE_KEYWORD -# define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_USING_KEYWORD - - - -#define ACE_HAS_ITOA - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup - -# if !defined (ACE_HAS_WINCE) -# define ACE_HAS_EXCEPTIONS -# define ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS -# endif /* ACE_HAS_WINCE */ - -# define ACE_HAS_BROKEN_NAMESPACES -# define ACE_HAS_BROKEN_IMPLICIT_CONST_CAST -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION - -# if defined (ACE_HAS_ANSI_CASTS) && (ACE_HAS_ANSI_CASTS == 0) -# undef ACE_HAS_ANSI_CASTS -# endif /* ACE_HAS_ANSI_CASTS && ACE_HAS_ANSI_CASTS == 0 */ - -# if !defined (ACE_HAS_WINCE) -# define ACE_HAS_SIG_ATOMIC_T -# endif /* ACE_HAS_WINCE */ - - -// Compiler doesn't support static data member templates. -# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - -# define ACE_LACKS_MODE_MASKS -# define ACE_LACKS_STRRECVFD - -# if !defined (ACE_HAS_WINCE) -# define ACE_HAS_LLSEEK -# endif /* ACE_HAS_WINCE */ - -// Compiler/platform has correctly prototyped header files. -# define ACE_HAS_CPLUSPLUS_HEADERS - -// Platform supports POSIX timers via timestruc_t. -# define ACE_HAS_STRPTIME -# define ACE_LACKS_NATIVE_STRPTIME - -// Compiler/platform supports strerror (). -# define ACE_HAS_STRERROR - -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -# define ACE_HAS_TLI_PROTOTYPES - -// Platform support linebuffered streaming is broken -# define ACE_LACKS_LINEBUFFERED_STREAMBUF - -// Template specialization is supported. -# define ACE_HAS_TEMPLATE_SPECIALIZATION - -// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to -// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. -# define ACE_NEEDS_FUNC_DEFINITIONS - -// ----------------- "derived" defines and includes ----------- - -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -// Platform has its Standard C++ library in the namespace std -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -// Microsoft's auto_ptr in standard cpp library doesn't have reset (). -# define ACE_AUTO_PTR_LACKS_RESET - -// ace/iostream.h does not work with the standard cpp library (yet). -# if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -# endif /* ! ACE_USES_OLD_IOSTREAMS */ -# else -// iostream header lacks ipfx (), isfx (), etc., declarations -# define ACE_LACKS_IOSTREAM_FX -# endif - -// While digging the MSVC 4.0 include files, I found how to disable -// MSVC warnings: --Amos Shapira - -// "C4355: 'this' : used in base member initializer list" -# pragma warning(disable:4355) /* disable C4514 warning */ -// #pragma warning(default:4355) // use this to reenable, if desired - -# pragma warning(disable:4201) /* winnt.h uses nameless structs */ - -# pragma warning(disable:4231) -// Disable warning of using Microsoft Extension. - -// MSVC allows throw keyword but complains about it. -# pragma warning( disable : 4290 ) - -// Inheritance by dominance is A-OK by us -# pragma warning (disable:4250) - - -# if !defined(ACE_HAS_WINCE) -# if defined(ACE_HAS_DLL) && (ACE_HAS_DLL != 0) -# if !defined(_DLL) -// *** DO NOT *** DO NOT *** defeat this error message -// by defining _DLL yourself. RTFM and see who set _DLL. -# error You must link against (Debug) Multithreaded DLL run-time libraries. -# endif /* !_DLL */ -# endif /* ACE_HAS_DLL && ACE_HAS_DLL != 0 */ -# endif /* !ACE_HAS_WINCE */ - -# pragma warning(default: 4201) /* winnt.h uses nameless structs */ - -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") - -# if !defined (ACE_ENDTHREADEX) -# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) -# endif - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_6_H */ diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h deleted file mode 100644 index 695a7742138..00000000000 --- a/ace/config-win32-msvc-7.h +++ /dev/null @@ -1,141 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-7.h - * - * $Id$ - * - * @brief Microsoft Visual C++ 7.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 7. - * - * @note Do not include this file directly, include config-win32.h instead. - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_7_H -#define ACE_CONFIG_WIN32_MSVC_7_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -// Visual C++ 7.0 (.NET) deprecated the old iostreams -#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#endif - -#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#endif - -// Win64 SDK compiler claims std::auto_ptr<>::reset not available. -#if defined (_WIN64) || defined (WIN64) -#define ACE_AUTO_PTR_LACKS_RESET -#endif - -#if !defined (ACE_HAS_BROKEN_NESTED_TEMPLATES) -#define ACE_HAS_BROKEN_NESTED_TEMPLATES -#endif - -// By default, we disable the C++ casting because -// it requires the RTTI support to be turned on which -// is not something we usually do. -#if !defined (ACE_HAS_ANSI_CASTS) -#define ACE_HAS_ANSI_CASTS 0 -#endif - -#define ACE_HAS_EXPLICIT_KEYWORD -#define ACE_HAS_MUTABLE_KEYWORD -#define ACE_HAS_TYPENAME_KEYWORD -#define ACE_HAS_USING_KEYWORD - -#define ACE_HAS_ITOA - -#define ACE_HAS_BROKEN_IMPLICIT_CONST_CAST -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup - -#if !defined (ACE_HAS_WINCE) -#define ACE_HAS_EXCEPTIONS -#endif /* ACE_HAS_WINCE */ - -#if defined (ACE_HAS_ANSI_CASTS) && (ACE_HAS_ANSI_CASTS == 0) -#undef ACE_HAS_ANSI_CASTS -#endif /* ACE_HAS_ANSI_CASTS && ACE_HAS_ANSI_CASTS == 0 */ - -#define ACE_HAS_STRERROR -#define ACE_HAS_STRPTIME -#define ACE_LACKS_NATIVE_STRPTIME - -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION -#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -#define ACE_LACKS_MODE_MASKS -#define ACE_LACKS_STRRECVFD -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_HAS_TEMPLATE_SPECIALIZATION - -#define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -#define ACE_HAS_TLI_PROTOTYPES - -// Platform support linebuffered streaming is broken -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -// Platform has its Standard C++ library in the namespace std -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -// ace/iostream.h does not work with the standard cpp library (yet). -# if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -#else - -// iostream header lacks ipfx (), isfx (), etc., declarations -# define ACE_LACKS_IOSTREAM_FX - -#endif - -// There are too many instances of this warning to fix it right now. -// Maybe in the future. -// 'this' : used in base member initializer list -#pragma warning(disable:4355) -// 'class1' : inherits 'class2::member' via dominance -#pragma warning(disable:4250) -// C++ Exception Specification ignored -#pragma warning(disable:4290) - -# pragma warning(disable:4231) -// Disable warning of using Microsoft Extension. - -#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) - -// With the MSVC7 compiler there is a new 'feature' when a base-class is a -// specialization of a class template. The class template must be explicit -// instantiated and exported. -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - -// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to -// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. -# define ACE_NEEDS_FUNC_DEFINITIONS - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_7_H */ diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h deleted file mode 100644 index 3881662031f..00000000000 --- a/ace/config-win32-msvc.h +++ /dev/null @@ -1,63 +0,0 @@ -//============================================================================= -/** - * @file config-win32-msvc.h - * - * $Id$ - * - * @brief Microsoft Visual C++ configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ versions - * 5.0, 6.0, and 7.0 (.NET) - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_H -#define ACE_CONFIG_WIN32_MSVC_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#define ACE_CC_NAME ACE_LIB_TEXT ("Visual C++") -#define ACE_CC_PREPROCESSOR "CL.EXE" -#define ACE_CC_PREPROCESSOR_ARGS "-nologo -E" - -#define ACE_CC_MAJOR_VERSION (_MSC_VER / 100 - 6) -#define ACE_CC_MINOR_VERSION (_MSC_VER % 100) -#define ACE_CC_BETA_VERSION (0) - -// Support "decorated" library names for MSVC 6 or better. -#if (_MSC_VER >= 1200) -# if !defined (ACE_LD_DECORATOR_STR) -# if defined (_DEBUG) -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfcd") -# else -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") -# endif /* ACE_HAS_MFC */ -# else /* _NDEBUG */ -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfc") -# endif /* ACE_HAS_MFC */ -# endif /* _DEBUG */ -# endif /* ACE_LD_DECORATOR_STR */ -#endif /* _MSC_VER >= 1200 */ - -#if (_MSC_VER >= 1300) -# include "ace/config-win32-msvc-7.h" -#elif (_MSC_VER >= 1200) -# include "ace/config-win32-msvc-6.h" -#elif (_MSC_VER >= 1100) -# include "ace/config-win32-msvc-5.h" -#else -# error This version of Microsoft Visual C++ not supported. -#endif - -#include -#define ACE_HAS_ALLOCA 1 - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_H */ diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h deleted file mode 100644 index fab98161d8e..00000000000 --- a/ace/config-win32-visualage.h +++ /dev/null @@ -1,101 +0,0 @@ -//============================================================================= -/** - * @file config-win32-visualage.h - * - * $Id$ - * - * @brief Configuration file for VisualAge compilers - * - * @note Do not include this file directly, include config-win32.h instead. - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_VISUALAGE_H -#define ACE_CONFIG_WIN32_VISUALAGE_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) - -#define ACE_CC_NAME ACE_LIB_TEXT ("IBM VisualAge C++") -#define ACE_CC_MAJOR_VERSION (__IBMCPP__ / 0x100) -#define ACE_CC_MINOR_VERSION (__IBMCPP__ % 0x100) -#define ACE_CC_BETA_VERSION (0) -#define ACE_CC_PREPROCESSOR "" -#define ACE_CC_PREPROCESSOR_ARGS "" - -// By default WIN32 has FD_SETSIZE of 64, which places the limit -// between 61 and 64 on the number of clients a server using the -// Select Reactor can support at the same time (i.e., 64 - standard in, -// out, error). He we raise the limit to 1024. Adjust the definition -// below if you need to raise or lower it. -// -#define FD_SETSIZE 1024 - -//These need to be defined for VisualAgeC++ -#define ERRMAX 256 /* Needed for following define */ -#define ACE_LACKS_SYS_NERR /* Needed for sys_nerr in Log_Msg.cpp */ -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES /* For signal handling */ -#define ACE_LACKS_MKTEMP -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define NSIG 23 /* Maximum no. of signals + 1 */ -#define ACE_HAS_ANSI_CASTS 1 -#define ACE_HAS_BROKEN_NESTED_TEMPLATES 1 -#define ACE_HAS_CPLUSPLUS_HEADERS 1 -#define ACE_HAS_EXCEPTIONS 1 -#define ACE_HAS_EXPLICIT_KEYWORD 1 -#define ACE_HAS_GNU_CSTRING_H 1 -#define ACE_HAS_MUTABLE_KEYWORD 1 -#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 -#define ACE_HAS_SIG_ATOMIC_T 1 -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_STDCPP_STL_INCLUDES 1 -#define ACE_HAS_STRERROR 1 -#define ACE_HAS_STRING_CLASS 1 -#define ACE_HAS_STRPTIME 1 -#define ACE_HAS_TEMPLATE_SPECIALIZATION 1 -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 -#define ACE_HAS_TYPENAME_KEYWORD 1 -#define ACE_HAS_USING_KEYWORD 1 -#define ACE_LACKS_ACE_IOSTREAM 1 -#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -#define ACE_LACKS_MODE_MASKS 1 -#define ACE_LACKS_NATIVE_STRPTIME 1 -#define ACE_LACKS_PRAGMA_ONCE 1 -#define ACE_LACKS_STRRECVFD 1 -#define ACE_NEW_THROWS_EXCEPTIONS 1 -#define ACE_SIZEOF_LONG_DOUBLE 10 -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 - -#undef WIFEXITED -#undef WEXITSTATUS - -#define _O_RDWR O_RDWR -#define _O_WRONLY O_WRONLY -#define _O_RDONLY O_RDONLY -#define _O_APPEND O_APPEND -#define _O_BINARY O_BINARY -#define _O_TEXT O_TEXT - -#define _endthreadex _endthread -#define _beginthreadex _beginthread - -//Error codes that are in MS Visual C++ -#define EFAULT 99 /* Error code (should be in errno.h) */ -#define ENODEV 19 -#define EPIPE 32 -#define ENAMETOOLONG 38 - -#define ACE_ENDTHREADEX(STATUS) ::_endthread () - -#endif /* defined(__IBMCPP__) */ - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_VISUALAGE_H */ diff --git a/ace/config-win32.h b/ace/config-win32.h deleted file mode 100644 index 68d1e9d93ef..00000000000 --- a/ace/config-win32.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32.h - * - * $Id$ - * - * @brief Microsoft Windows configuration file. - * - * This file is the ACE configuration file for all of Microsoft Windows - * platforms that ACE runs on. Based on preprocessor definitions, it - * includes other more specific configuration files. - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_H -#define ACE_CONFIG_WIN32_H -#include "ace/pre.h" - -// NOTE: Please do not add anything besides #include's here. Put other stuff -// (definitions, etc.) in the included headers - -// Include the platform specific config file (Windows CE is special) - -#if defined (_WIN32_WCE) -# include "ace/config-WinCE.h" -#endif /* _WIN32_WCE */ - -// We need to ensure that for Borland vcl.h can be included before -// windows.h. So we will not include config-win32-common.h from here, -// but instead let it be included at the appropriate place in -// config-win32-borland.h. -#if !defined (__BORLANDC__) -# include "ace/config-win32-common.h" -#endif /* !__BORLANDC__ */ - -// Include the config-win32-* file specific to the compiler - -#if defined (_MSC_VER) -# include "ace/config-win32-msvc.h" -#elif defined (__BORLANDC__) -# include "ace/config-win32-borland.h" -#elif defined (__IBMCPP__) -# include "ace/config-win32-visualage.h" -#elif defined (ghs) -# include "ace/config-win32-ghs.h" -#elif defined (__MINGW32__) -# include "ace/config-win32-mingw.h" -#else -# error Compiler is not supported -#endif - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_H */ diff --git a/ace/gethrtime.cpp b/ace/gethrtime.cpp deleted file mode 100644 index 08de489f7f6..00000000000 --- a/ace/gethrtime.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// $Id$ -// -// Build this file with g++. It can be linked in to a ACE application -// that was compiled with GreenHills. It wouldn't be necessary if I -// knew a way to correctly move values from registers to a 64-bit -// variable in GHS asm code. That's easy with g++ asm. - -#include "ace/OS.h" - -ACE_RCSID(ace, gethrtime, "$Id$") - -#if defined (ghs) && (defined (i386) || defined(__i386__)) -extern "C" -ACE_hrtime_t -ACE_gethrtime (void) -{ -#if defined (ACE_HAS_PENTIUM) - // ACE_TRACE ("ACE_gethrtime"); - -#if defined (ACE_LACKS_LONGLONG_T) - double now; -#else /* ! ACE_LACKS_LONGLONG_T */ - ACE_hrtime_t now; -#endif /* ! ACE_LACKS_LONGLONG_T */ - - // See comments about the RDTSC Pentium instruction for the - // ACE_WIN32 version of ACE_OS::gethrtime () in ace/OS.i. - // - // Read the high-res tick counter directly into memory variable - // "now". The A constraint signifies a 64-bit int. -#if defined (__GNUG__) - asm volatile ("rdtsc" : "=A" (now) : : "memory"); -// #elif defined (ghs) -// The following doesn't work. For now, this file must be compile with g++. -// asm ("rdtsc"); -// asm ("movl %edx,-16(%ebp)"); -// asm ("movl %eax,-12(%ebp)"); -#else -# error unsupported compiler -#endif - -#if defined (ACE_LACKS_LONGLONG_T) - // ACE_U_LongLong doesn't have the same layout as now, so construct - // it "properly". - ACE_UINT32 least, most; - ACE_OS::memcpy (&least, &now, sizeof (ACE_UINT32)); - ACE_OS::memcpy (&most, (unsigned char *) &now + sizeof (ACE_UINT32), - sizeof (ACE_UINT32)); - - const ACE_hrtime_t ret (least, most); - return ret; -#else /* ! ACE_LACKS_LONGLONG_T */ - return now; -#endif /* ! ACE_LACKS_LONGLONG_T */ - -#else /* ! ACE_HAS_PENTIUM */ -# error This file can _only_ be compiled with ACE_HAS_PENTIUM. -#endif /* ! ACE_HAS_PENTIUM */ -} -#endif /* ghs */ diff --git a/ace/iosfwd.h b/ace/iosfwd.h deleted file mode 100644 index 412b6b3bdde..00000000000 --- a/ace/iosfwd.h +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file iosfwd.h - * - * $Id$ - * - * @author Irfan Pyarali - * - * This file contains the portability ugliness for the Standard C++ - * Library. As implementations of the "standard" emerge, this file - * will need to be updated. - * - * This files deals with forward declaration for the stream - * classes. Remember that since the new Standard C++ Library code - * for streams uses templates, simple forward declaration will not - * work. - * - * - */ -//============================================================================= - - -#ifndef ACE_IOSFWD_H -#define ACE_IOSFWD_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ - (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -# if !defined (ACE_USES_OLD_IOSTREAMS) || \ - defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) -# include /**/ -# endif /* ! ACE_USES_OLD_IOSTREAMS || ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ - -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) - -# if !defined (ACE_USES_OLD_IOSTREAMS) - // Make these available in the global name space - using std::ios; - using std::streambuf; - using std::istream; - using std::ostream; - using std::iostream; - using std::filebuf; - using std::ifstream; - using std::ofstream; - using std::fstream; -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -#else /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ - - class ios; - class streambuf; - class istream; - class ostream; - class iostream; - class filebuf; - class ifstream; - class ofstream; - class fstream; - -# endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ - -#include "ace/post.h" -#endif /* ACE_IOSFWD_H */ diff --git a/ace/post.h b/ace/post.h deleted file mode 100644 index 746a6398e33..00000000000 --- a/ace/post.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file post.h - * - * $Id$ - * - * @author Christopher Kohlhoff - * - * This file restore the original alignment rules. - * - * - */ -//============================================================================= - - -// No header guard -#if defined (_MSC_VER) -# pragma pack (pop) -#elif defined (__BORLANDC__) -# pragma option pop -# pragma nopushoptwarn -# pragma nopackwarning -#endif diff --git a/ace/pre.h b/ace/pre.h deleted file mode 100644 index 07cbfe6716d..00000000000 --- a/ace/pre.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file pre.h - * - * $Id$ - * - * @author Christopher Kohlhoff - * - * This file save the original alignment rules and changes the alignment - * boundary to ACE's default. - * - * - */ -//============================================================================= - - -// No header guard -#if defined (_MSC_VER) -# pragma warning (disable:4103) -# pragma pack (push, 8) -#elif defined (__BORLANDC__) -# pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig -# pragma nopushoptwarn -# pragma nopackwarning -#endif diff --git a/ace/streams.h b/ace/streams.h deleted file mode 100644 index bf027a9438c..00000000000 --- a/ace/streams.h +++ /dev/null @@ -1,140 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file streams.h - * - * $Id$ - * - * @author Irfan Pyarali - * - * This file contains the portability ugliness for the Standard C++ - * Library. As implementations of the "standard" emerge, this file - * will need to be updated. - * - * This files deals with the streams includes. - * - * - */ -//============================================================================= - - -#ifndef ACE_STREAMS_H -#define ACE_STREAMS_H -#include "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once - -#endif /* ACE_LACKS_PRAGMA_ONCE */ -// Do this so the #pragma warning in the MSVC headers do not -// affect our #pragma warning settings -#if defined (_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ - - -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ - (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -# if defined (_MSC_VER) -# pragma warning(disable: 4018 4114 4146 4245) -# pragma warning(disable: 4663 4664 4665 4511 4512) -# endif /* _MSC_VER */ - -# if defined (ACE_USES_OLD_IOSTREAMS) -# include /**/ -# include /**/ - // This has been commented as it is not needed and causes problems with Qt. - // (brunsch) But has been uncommented since it should be included. Qt - // probably should have some sort of macro that will prevent including this - // when it is used. -# include /**/ -# else -# if defined (__BORLANDC__) && (__BORLANDC__ == 0x551) -# include /**/ -# endif /* __BORLANDC__ && __BORLANDC__ == 0x551 */ -# include /**/ -# include /**/ -# include /**/ -# include /**/ -# include /**/ -# include /**/ -# include /**/ -# endif /* ACE_USES_OLD_IOSTREAMS */ - -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) - -# if !defined (ACE_USES_OLD_IOSTREAMS) - // Make these available in the global name space - using std::ios; - using std::streambuf; - using std::istream; - using std::ostream; - using std::iostream; - using std::filebuf; - using std::ifstream; - using std::ofstream; - using std::fstream; - - using std::cin; - using std::cout; - using std::cerr; - using std::clog; - - using std::endl; - using std::ends; - using std::flush; - - using std::ws; - - using std::resetiosflags; - using std::setfill; - using std::setiosflags; - using std::setprecision; - using std::setw; - - using std::dec; - using std::hex; - using std::oct; -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -# if defined (_MSC_VER) -# pragma warning(4: 4018 4114 4146 4245) -# pragma warning(4: 4663 4664 4665 4512 4511) -# endif /* _MSC_VER */ - -# else /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ - -# include /**/ -# include /**/ -# include /**/ - -# if defined (ACE_WIN32) && !defined(__MINGW32__) -# if defined(_MSC_VER) // VSB -# include /**/ -# include /**/ -# include /**/ -# include /**/ -# endif /* _MSC_VER */ -# endif /* ACE_WIN32 && !__MINGW32__ */ - -# endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ - -#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - -// Do this so the #pragma warning in the MSVC headers do not -// affect our #pragma warning settings -#if defined (_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER >= 1200 */ - -#include "ace/post.h" -#endif /* ACE_STREAMS_H */ diff --git a/ace/svc_export.h b/ace/svc_export.h deleted file mode 100644 index b10b4f33bc5..00000000000 --- a/ace/svc_export.h +++ /dev/null @@ -1,44 +0,0 @@ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. - -// This file was generated by generate_export_file.pl -// but needed to be altered to support ACE_BUILD_SVC_DLL -// instead of ACE_SVC_BUILD_DLL which was already being -// used. - -// ------------------------------ -#if !defined (ACE_SVC_EXPORT_H) -#define ACE_SVC_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_SVC_HAS_DLL) -# define ACE_SVC_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACE_SVC_HAS_DLL */ - -#if !defined (ACE_SVC_HAS_DLL) -#define ACE_SVC_HAS_DLL 1 -#endif /* ! ACE_SVC_HAS_DLL */ - -#if defined (ACE_SVC_HAS_DLL) -# if (ACE_SVC_HAS_DLL == 1) -# if defined (ACE_BUILD_SVC_DLL) || defined (ACE_SVC_BUILD_DLL) -# define ACE_Svc_Export ACE_Proper_Export_Flag -# define ACE_SVC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# else -# define ACE_Svc_Export ACE_Proper_Import_Flag -# define ACE_SVC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# endif /* ACE_BUILD_SVC_DLL */ -# else -# define ACE_Svc_Export -# define ACE_SVC_SINGLETON_DECLARATION(T) -# endif /* ! ACE_SVC_HAS_DLL == 1 */ -#else -# define ACE_Svc_Export -# define ACE_SVC_SINGLETON_DECLARATION(T) -#endif /* ACE_SVC_HAS_DLL */ - -#endif /* ACE_SVC_EXPORT_H */ - -// End of auto generated file. diff --git a/aceConf.sh.in b/aceConf.sh.in deleted file mode 100644 index bff456f6928..00000000000 --- a/aceConf.sh.in +++ /dev/null @@ -1,8 +0,0 @@ -# -# Configuration of the ACE distribution -# - -ACE_COMPILER="@CXX@" -ACE_LIBDIR="@ACE_LIBDIR@" -ACE_INCLUDEDIR="@ACE_INCLUDEDIR@ @CXXFLAGS@" -ACE_LIBS="@ACE_LIBS@" diff --git a/apps/FaCE/ACE.ico b/apps/FaCE/ACE.ico deleted file mode 100644 index 3efedc9021b..00000000000 Binary files a/apps/FaCE/ACE.ico and /dev/null differ diff --git a/apps/FaCE/ACE_Racer.bmp b/apps/FaCE/ACE_Racer.bmp deleted file mode 100644 index a487f63f81c..00000000000 Binary files a/apps/FaCE/ACE_Racer.bmp and /dev/null differ diff --git a/apps/FaCE/CE_ARGV.CPP b/apps/FaCE/CE_ARGV.CPP deleted file mode 100644 index 6b97a30b640..00000000000 --- a/apps/FaCE/CE_ARGV.CPP +++ /dev/null @@ -1,118 +0,0 @@ -// $Id$ - -#include "CE_ARGV.H" - - -CE_ARGV::CE_ARGV(wchar_t* cmdLine) -: ce_argv_(0) -, ce_argc_(0) -{ - const wchar_t* dummyArgv = L"root"; // dummy for the first argv - const wchar_t* separator = L" "; // blank space is a separator - - int formattedCmdLineLength = wcslen(dummyArgv) + - wcslen(separator) + - 1; // 1 is for the NULL at the end - - if (wcslen(cmdLine) > 0) { - formattedCmdLineLength += wcslen(cmdLine); - formattedCmdLineLength += wcslen(separator); - } - - // formattedCmdLine will have dummyArgv and a separator at the beginning of cmdLine - // and a separator at the end to generalize format and reduce the amount of code - wchar_t* formattedCmdLine = 0; - formattedCmdLine = new wchar_t[formattedCmdLineLength]; - - wcscpy(formattedCmdLine, dummyArgv); - wcscat(formattedCmdLine, separator); - - int max_possible_argc = 1; // start with 1 because of the dummyArgv at the beginning - - if (wcslen(cmdLine) > 0) { - int formattedPos = wcslen(formattedCmdLine); - int cmdLineLength = wcslen(cmdLine); - - // Inside of this for loop, it does same thing as strcat except it - // checks and puts only one single white space between two argv entries. - for (int i = 0; i < cmdLineLength; ++i) { - if (iswspace(cmdLine[i]) != 0) { - ++max_possible_argc; // counting the number of white spaces - } - - formattedCmdLine[formattedPos++] = cmdLine[i]; - - if (iswspace(cmdLine[i]) != 0) { - // make sure there is only one white space between two argv entries. - while ((i < cmdLineLength) && (iswspace(cmdLine[i + 1]) != 0)) { - ++i; - } - } - } - - formattedCmdLine[formattedPos] = 0; - wcscat(formattedCmdLine, separator); // make sure formattedCmdLine ends with a blank - } - - int formattedCmdLength = wcslen(formattedCmdLine); - - bool insideQuotation = false; - int* argv_strlen = 0; - int entry_size = 0; - argv_strlen = new int[max_possible_argc]; - - // determine argc - for (int i = 0; i < formattedCmdLength; ++i) { - if (formattedCmdLine[i] == '\\') { - ++i; // ignore the following character - ++entry_size; - } - else if (formattedCmdLine[i] == '"') { - insideQuotation = !insideQuotation; - } - else if ((!insideQuotation) && (iswspace(formattedCmdLine[i]) != 0)) { - // new argv entry end found - argv_strlen[ce_argc_++] = entry_size; // cache the size of this entry - entry_size = 0; - } - else { - ++entry_size; - } - } - - ce_argv_ = new wchar_t*[ce_argc_ + 1]; - ce_argv_[ce_argc_] = 0; // Last command line entry is a NULL. - - for (int j = 0, cmdLinePos = 0; j < ce_argc_; ++j, ++cmdLinePos) { - int length = argv_strlen[j]; - - ce_argv_[j] = new wchar_t[length + 1]; - ce_argv_[j][length] = 0; // string termination null - - if (iswspace(formattedCmdLine[cmdLinePos]) != 0) { - // This is where prior argv has trailing '"' at the end. - ++cmdLinePos; - } - - for (int n = 0; n < length; ++n, ++cmdLinePos) { - if ((formattedCmdLine[cmdLinePos] == '\\') || (formattedCmdLine[cmdLinePos] == '"')) { - ++cmdLinePos; - } - - ce_argv_[j][n] = formattedCmdLine[cmdLinePos]; - } - } - - delete argv_strlen; - delete formattedCmdLine; -} - - -CE_ARGV::~CE_ARGV(void) -{ - for (int i = 0; i < ce_argc_; ++i) { - delete [] ce_argv_[i]; - } - - delete [] ce_argv_; -} diff --git a/apps/FaCE/CE_ARGV.H b/apps/FaCE/CE_ARGV.H deleted file mode 100644 index 78e848abae1..00000000000 --- a/apps/FaCE/CE_ARGV.H +++ /dev/null @@ -1,90 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file CE_ARGV.H - * - * $Id$ - * - * @author Si Mong Park - */ -//============================================================================= - -#ifndef CE_ARGV_H -#define CE_ARGV_H - -#include - - -/** - * @class CE_ARGV - * - * @brief This class is to hash input parameters, argc and argv, for WinCE platform. - * - * Since WinCE only supports wchar_t as an input from OS, some implementation detail, - * especially for CORBA spec, will not support wchar_t (wchar_t) type parameter. - * Moreover, WinCE's input parameter type is totally different than any other OS; - * all command line parameters will be stored in a single wide-character string with - * each unit parameter divided by blank space, and it does not provide the name of - * executable (generally known as argv[0]). - * This class is to convert CE's command line parameters and simulate as in the same - * manner as other general platforms, adding 'root' as a first argc, which is for the - * name of executable in other OS. - */ -class CE_ARGV -{ -public: - /** - * Ctor accepts CE command line as a paramter. - */ - CE_ARGV(wchar_t* cmdLine); - - /** - * Default Dtor that deletes any memory allocated for the converted string. - */ - ~CE_ARGV(void); - - /** - * Returns the number of command line paramters, same as argc on Unix. - */ - int argc(void); - - /** - * Returns the 'char**' that contains the converted command line parameters. - */ - wchar_t** const argv(void); - -private: - /** - * Copy Ctor is not allowed. - */ - CE_ARGV(void); - - /** - * Copy Ctor is not allowed. - */ - CE_ARGV(CE_ARGV&); - - /** - * Pointer of converted command line paramters. - */ - wchar_t** ce_argv_; - - /** - * Integer that is same as argc on other OS's. - */ - int ce_argc_; -}; - - -inline int CE_ARGV::argc() -{ - return ce_argc_; -} - - -inline wchar_t** const CE_ARGV::argv() -{ - return ce_argv_; -} - -#endif // CE_ARGV_H diff --git a/apps/FaCE/CE_Screen_Output.cpp b/apps/FaCE/CE_Screen_Output.cpp deleted file mode 100644 index 59364523a8c..00000000000 --- a/apps/FaCE/CE_Screen_Output.cpp +++ /dev/null @@ -1,162 +0,0 @@ -// $Id$ - -#include "CE_Screen_Output.h" -#include - - -HWND CE_Screen_Output::handler_ = 0; - - -CE_Screen_Output::CE_Screen_Output() -: pFile_(0) -{ -} - - -CE_Screen_Output::~CE_Screen_Output() -{ - if (pFile_ != 0) { - fclose(pFile_); - } -} - - -void CE_Screen_Output::SetOutputWindow(HWND hEdit) -{ - handler_ = hEdit; -} - - -void CE_Screen_Output::clear() -{ - SetWindowText(handler_, NULL); -} - - -CE_Screen_Output& CE_Screen_Output::operator << (wchar_t* output) -{ - int length = GetWindowTextLength(handler_); - SendMessage(handler_, EM_SETSEL, length, length); - SendMessage(handler_, EM_REPLACESEL, 0, (LPARAM)output); - - if (pFile_ != NULL) - { - fwprintf(pFile_, L"%s", output); - } - - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (const wchar_t* output) -{ - wchar_t* buffer = _wcsdup(output); - if (buffer != 0) - { - *this << buffer; - delete buffer; - } - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (char* output) -{ - int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, NULL, 0); - wchar_t* w_output = new wchar_t[len]; - - MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len); - *this << w_output; - - delete w_output; - - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (const char* output) -{ - int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, NULL, 0); - wchar_t* w_output = new wchar_t[len]; - - MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len); - *this << w_output; - - delete w_output; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (char output) -{ - *this << (int)output; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned char output) -{ - *this << (int)output; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned short output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%u", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (int output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%d", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned int output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%du", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (float output) -{ - wchar_t buffer[20]; - swprintf(buffer, L"%f", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (long output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%l", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned long output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%lu", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (FILE* pFile) -{ - pFile_ = pFile; - return *this; -} diff --git a/apps/FaCE/CE_Screen_Output.h b/apps/FaCE/CE_Screen_Output.h deleted file mode 100644 index 9f29c9cf30f..00000000000 --- a/apps/FaCE/CE_Screen_Output.h +++ /dev/null @@ -1,97 +0,0 @@ -/** - * @file CE_Screen_Output.h - * - * $Id$ - * - * @author Si Mong Park - */ -//============================================================================= - -#ifndef CE_Screen_Output_h -#define CE_Screen_Output_h - -#include - -const wchar_t endl[] = L"\r\n"; -const wchar_t tab[] = L"\t"; - -/** - * @class CE_Screen_Output - * - * @brief Replacement of text output for Windows CE. - * - * This class allows standard text output to be displayed on - * text window for Windows CE. Generally, all ACE output will - * go through under CE if and only if user uses WindozeCE - * implementation by using main_ce instead of main. - * Also, for the easier debugging purpose, object pointer of - * this class can be gotten from ACE_Log_Msg::msg_callback() - * and then can be used directly by user just like cout stream. - */ -class CE_Screen_Output -{ -public: - /** - * Default Ctor - */ - CE_Screen_Output(); - - /** - * Default Dtor - */ - virtual ~CE_Screen_Output(); - - /** - * Interface to specify active window handle. - */ - void SetOutputWindow(HWND hWnd); - - /** - * Clears text screen. - */ - void clear(); - - /** - * << operator that performs actual print out. - * - * Note: This is the only one operator that performs - * output. All other perators convert the type and - * use this operator underneath. - */ - CE_Screen_Output& operator << (wchar_t*); - CE_Screen_Output& operator << (const wchar_t*); - - CE_Screen_Output& operator << (char* output); - CE_Screen_Output& operator << (const char* output); - - CE_Screen_Output& operator << (char output); - CE_Screen_Output& operator << (unsigned char output); - - CE_Screen_Output& operator << (unsigned short output); - - CE_Screen_Output& operator << (int output); - CE_Screen_Output& operator << (unsigned int output); - - CE_Screen_Output& operator << (float output); - - CE_Screen_Output& operator << (long output); - CE_Screen_Output& operator << (unsigned long output); - - CE_Screen_Output& operator << (FILE* pFile); - -private: - /** - * Copy Ctor - */ - CE_Screen_Output(CE_Screen_Output&); - - static HWND handler_; - - /** - * File pointer that used to save output to file. - * This class does not own the file handler pointer. - */ - FILE* pFile_; -}; - -#endif // CE_Screen_Output_h diff --git a/apps/FaCE/FACE.ico b/apps/FaCE/FACE.ico deleted file mode 100644 index 8a91925b128..00000000000 Binary files a/apps/FaCE/FACE.ico and /dev/null differ diff --git a/apps/FaCE/FaCE.cpp b/apps/FaCE/FaCE.cpp deleted file mode 100644 index 7d7c50ffcd3..00000000000 --- a/apps/FaCE/FaCE.cpp +++ /dev/null @@ -1,652 +0,0 @@ -// $Id$ - -#include "FaCE.h" - -#ifdef NO_ACE - -#include "CE_ARGV.h" - -#else - -#include -#include - -#endif // NO_ACE - -#include -#include -#include - - -ACE_TCHAR* g_ParameterFileName = ACE_LIB_TEXT("Parameters.txt"); - -/** - * This simple and small class manages user-input command line - * parameters and parameter history file. - * - * @author Si Mong Park (spark@ociweb.com) - * @version $Revision$ $Date$ - */ -class ParameterList -{ -public: - /** - * Default Ctor. - */ - ParameterList() : next_(0), param_(0) {}; - - /** - * Dtor: deletes all sub-PameterList objects as well as - * memory block allocated for the param_ by _wcsdup(). - */ - ~ParameterList() { free(param_); delete next_; }; - - /** - * Add a new parameter to the list. - */ - void addParameter(char*); - - /** - * Add a new parameter to the list. - */ - void addParameter(ACE_TCHAR*); - - /** - * Save all parameters stored in the list to the - * file. - * Note that 'outputFile' is only for the internal use - * and user must call this function without any parameter. - */ - void saveParameter(FILE* outputFile = 0); - - /** - * Send out windows message to load/update parameters. - */ - void sendParameterMSG(HWND, UINT); - -private: - /** - * A pointer to the next ParameterList object. - * This attribute is totally hidden from user. - */ - ParameterList* next_; - - /** - * User-specified command line parameter. - * This attribute is totally hidden from user. - */ - ACE_TCHAR* param_; -}; - - -void ParameterList::addParameter(char* newParameter) -{ -#ifdef NO_ACE - int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, NULL, 0); - wchar_t* w_output = new wchar_t[len]; - - MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, w_output, len); - this->addParameter(w_output); - - delete w_output; -#else - this->addParameter(ACE_TEXT_CHAR_TO_TCHAR(newParameter)); -#endif // NO_ACE -} - - -void ParameterList::addParameter(ACE_TCHAR* newParameter) -{ - if (this->param_ == 0) { - this->param_ = _wcsdup(newParameter); - this->next_ = new ParameterList(); // create and add a new ParameterList object - } - else { - if (wcscmp(this->param_, newParameter) != 0) { - this->next_->addParameter(newParameter); - } - } -} - - -void ParameterList::saveParameter(FILE* outputFile) -{ - if ( (outputFile == 0) && (this->param_ != 0) ) { - outputFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("w+")); - } - - if (outputFile != 0) { - if (this->param_ != 0) { - fwprintf(outputFile, ACE_LIB_TEXT("%s\n"), this->param_); - this->next_->saveParameter(outputFile); - } - else { - fclose(outputFile); - } - } -} - - -void ParameterList::sendParameterMSG(HWND hDlg, UINT message) -{ - if (param_ != 0) { - SendDlgItemMessage(hDlg, IDC_CMDEDIT, message, 0, (LPARAM)this->param_); - this->next_->sendParameterMSG(hDlg, message); - } -} - - -// Global Variables: -HINSTANCE g_hInst; // The current instance -HWND g_hwndCB; // The command bar handle -HWND hWndEdit; // Read only edit box for output display -FILE* g_OutputFile; // File handler for output save - -ParameterList g_Parameter; // command line parameter list - -ACE_CE_Screen_Output cout; // Replacement of std::cout - -ACE_TCHAR g_CommandLine[MAX_COMMAND_LINE]; // User-specified command line parameter -ACE_TCHAR g_SaveFileName[MAX_LOADSTRING]; // Name of the output file - -static SHACTIVATEINFO s_sai; - -// Forward declarations of functions included in this code module: -ATOM MyRegisterClass (HINSTANCE, ACE_TCHAR*); -BOOL InitInstance (HINSTANCE, int); -LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK About (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK CommandLine (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK SaveFileName (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK FileError (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK FileExist (HWND, UINT, WPARAM, LPARAM); -HWND CreateRpCommandBar(HWND); - - -void InitSetup() -{ - g_OutputFile = 0; - memset(g_CommandLine, 0, MAX_COMMAND_LINE * sizeof(ACE_TCHAR)); - memset(g_SaveFileName, 0, MAX_LOADSTRING * sizeof(ACE_TCHAR)); -} - - -void LoadParameterHistory() -{ - FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("r")); - - if (parameterFile != NULL) { - while (feof(parameterFile) == 0) { - // Note: Remember that fwprintf takes wide-character format specifier but - // save string as ASCII. Thus, history must be read as ASCII then converted - // to wide-character (Unicode on WinCE). - char singleParameter[MAX_COMMAND_LINE]; - int size = 0; - fread(&singleParameter[size], sizeof(char), 1, parameterFile); - - // WinCE does not have function that reads upto the end of line. - while (singleParameter[size] != '\n') { - fread(&singleParameter[++size], sizeof(char), 1, parameterFile); - } - - if (size > 0) { - singleParameter[size] = 0; // NULL terminator - g_Parameter.addParameter(singleParameter); - } - } - fclose(parameterFile); - } -} - - -// -// FUNCTION: MyRegisterClass() -// -// PURPOSE: Registers the window class. -// -// COMMENTS: -// -// It is important to call this function so that the application -// will get 'well formed' small icons associated with it. -// -ATOM MyRegisterClass(HINSTANCE hInstance, ACE_TCHAR* szWindowClass) -{ - WNDCLASS wc; - - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = (WNDPROC) WndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_FACE)); - wc.hCursor = 0; - wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH); - wc.lpszMenuName = 0; - wc.lpszClassName = szWindowClass; - - return RegisterClass(&wc); -} - -// -// FUNCTION: InitInstance(HANDLE, int) -// -// PURPOSE: Saves instance handle and creates main window -// -// COMMENTS: -// -// In this function, we save the instance handle in a global variable and -// create and display the main program window. -// -BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) -{ - HWND hWnd = NULL; - - ACE_TCHAR szTitle[MAX_LOADSTRING]; // The title bar text - ACE_TCHAR szWindowClass[MAX_LOADSTRING]; // The window class name - - g_hInst = hInstance; // Store instance handle in our global variable - // Initialize global strings - LoadString(hInstance, IDC_FACE, szWindowClass, MAX_LOADSTRING); - LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - - //If it is already running, then focus on the window - hWnd = FindWindow(szWindowClass, szTitle); - if (hWnd) - { - // set focus to foremost child window - // The "| 0x01" is used to bring any owned windows to the foreground and - // activate them. - SetForegroundWindow((HWND)((ULONG) hWnd | 0x00000001)); - return 0; - } - - MyRegisterClass(hInstance, szWindowClass); - - RECT rect; - GetClientRect(hWnd, &rect); - - hWnd = CreateWindow(szWindowClass, szTitle, WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance, NULL); - - if (!hWnd) - { - int error = 0; - error = GetLastError(); - return FALSE; - } - //When the main window is created using CW_USEDEFAULT the height of the menubar (if one - // is created is not taken into account). So we resize the window after creating it - // if a menubar is present - { - RECT rc; - GetWindowRect(hWnd, &rc); - rc.bottom -= MENU_HEIGHT; - if (g_hwndCB) - MoveWindow(hWnd, rc.left, rc.top, rc.right, rc.bottom, FALSE); - } - - ShowWindow(hWnd, nCmdShow); - UpdateWindow(hWnd); - - return TRUE; -} - -// -// FUNCTION: WndProc(HWND, unsigned, WORD, LONG) -// -// PURPOSE: Processes messages for the main window. -// -// WM_COMMAND - process the application menu -// WM_PAINT - Paint the main window -// WM_DESTROY - post a quit message and return -// -// -LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - HDC hdc; - int wmId, wmEvent, nCmdHt; - PAINTSTRUCT ps; - RECT textRect; - - switch (message) - { - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDM_HELP_ABOUT: - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ABOUTBOX, hWnd, (DLGPROC)About); - break; - - case IDOK: - SendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), (LPARAM)hWnd); - SendMessage(hWnd, WM_CLOSE, 0, 0); - break; - - case ID_SETTING_RUN: - { -#ifdef NO_ACE - cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl; - CE_ARGV ce_argv(g_CommandLine); - main_i(ce_argv.argc(), ce_argv.argv()); - cout << ACE_LIB_TEXT("END") << endl << endl; -#else - cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl; - ACE_CE_ARGV ce_argv(g_CommandLine); - ACE::init(); - ACE_MAIN_OBJECT_MANAGER - ACE_LOG_MSG->msg_callback(&cout); // register call back - ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK); // set call back flag - ace_main_i(ce_argv.argc(), ce_argv.argv()); - ACE::fini(); - cout << ACE_LIB_TEXT("END") << endl << endl; -#endif // NO_ACE - } - break; - - case ID_SETTING_EXIT: - SendMessage(hWnd, WM_DESTROY, 0, 0); - break; - - case ID_TOOLS_SAVETOFILE: - // create a dialog box to get the file name - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_OUTFILE, hWnd, (DLGPROC)SaveFileName); - break; - - case ID_SETTING_COMMANDLINE: - // create a dialog box to get the command line - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_CMDLINE, hWnd, (DLGPROC)CommandLine); - break; - - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - break; - - case WM_CREATE: - SHMENUBARINFO mbi; - - memset(&mbi, 0, sizeof(SHMENUBARINFO)); - mbi.cbSize = sizeof(SHMENUBARINFO); - mbi.hwndParent = hWnd; - mbi.nToolBarId = IDM_MENU; - mbi.hInstRes = g_hInst; - mbi.nBmpId = 0; - mbi.cBmpImages = 0; - - if (!SHCreateMenuBar(&mbi)) - return NULL; - - g_hwndCB = mbi.hwndMB; - - // Initialize the shell activate info structure - memset (&s_sai, 0, sizeof (s_sai)); - s_sai.cbSize = sizeof (s_sai); - - GetClientRect(hWnd, &textRect); - nCmdHt = CommandBar_Height(mbi.hwndMB); - - hWndEdit = CreateWindow(ACE_LIB_TEXT("EDIT"), - NULL, - WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL, - 0, - 0, - textRect.right, - textRect.bottom - MENU_HEIGHT, - hWnd, - NULL, - g_hInst, - NULL); - cout.SetOutputWindow(hWndEdit); - LoadParameterHistory(); - break; - - case WM_PAINT: - RECT rt; - hdc = BeginPaint(hWnd, &ps); - GetClientRect(hWnd, &rt); - EndPaint(hWnd, &ps); - break; - - case WM_ACTIVATE: - // Notify shell of our activate message - SHHandleWMActivate(hWnd, wParam, lParam, &s_sai, FALSE); - break; - - case WM_SETTINGCHANGE: - SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai); - break; - - case WM_HIBERNATE: // low power - case WM_CLOSE: - case WM_DESTROY: - g_Parameter.saveParameter(); // save parameters to history file - CommandBar_Destroy(g_hwndCB); - PostQuitMessage(0); - break; - - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - return 0; -} - - -HWND CreateRpCommandBar(HWND hwnd) -{ - SHMENUBARINFO mbi; - - memset(&mbi, 0, sizeof(SHMENUBARINFO)); - mbi.cbSize = sizeof(SHMENUBARINFO); - mbi.hwndParent = hwnd; - mbi.nToolBarId = IDM_MENU; - mbi.hInstRes = g_hInst; - mbi.nBmpId = 0; - mbi.cBmpImages = 0; - - if (!SHCreateMenuBar(&mbi)) - return NULL; - - return mbi.hwndMB; -} - -// Mesage handler for the About box. -LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - SHINITDLGINFO shidi; - - ACE_TCHAR* copyrightNote = ACE_LIB_TEXT( -"ACE® and TAO® are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object \ -Computing at Washington University,© 1993-2002, all rights reserved. \ -FaCE is copyrighted by Object Computing, Inc.,© 2002,\n all rights reserved.\n\ -See License.txt for more information."); - - switch (message) - { - case WM_INITDIALOG: - // Create a Done button and size it. - shidi.dwMask = SHIDIM_FLAGS; - shidi.dwFlags = SHIDIF_DONEBUTTON | SHIDIF_SIPDOWN | SHIDIF_SIZEDLGFULLSCREEN; - shidi.hDlg = hDlg; - SHInitDialog(&shidi); - SetDlgItemText(hDlg, IDC_COPYRIGHT, copyrightNote); - return TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - } - return FALSE; -} - - -LRESULT CALLBACK CommandLine(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - int wmId; - int wmEvent; - - switch (message) - { - case WM_INITDIALOG: - g_Parameter.sendParameterMSG(hDlg, CB_INSERTSTRING); - SetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine); // pass existing command line for display - return TRUE; - - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDOK: - // new command line accepted - GetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine, MAX_COMMAND_LINE - 1); - EndDialog(hDlg, wmId); - g_Parameter.addParameter(g_CommandLine); - return TRUE; - - case IDCANCEL: - EndDialog(hDlg, wmId); - return TRUE; - - default: - return FALSE; - } - break; - default: - return FALSE; - } - - return FALSE; -} - - -LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - int wmId; - int wmEvent; - - ACE_TCHAR tempBuffer[MAX_LOADSTRING]; - ACE_TCHAR fileMode[3] = { 0, '+', 0 }; // mode will either be "a+" or "w+" - FILE* tempFile; - - switch (message) - { - case WM_INITDIALOG: - SetDlgItemText(hDlg, IDC_SAVEFILE, g_SaveFileName); - return TRUE; - - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDOK: - GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1); - EndDialog(hDlg, wmId); - - tempFile = _wfopen(tempBuffer, ACE_LIB_TEXT("r")); - - if (tempFile != NULL) // if file exists - { - fclose(tempFile); // close temp handler - int choice = DialogBox(g_hInst, (const ACE_TCHAR*)IDD_FILEEXIST, hDlg, (DLGPROC)FileExist); - switch (choice) - { - case IDOVERWRITE: // overwrite existing file - fileMode[0] = 'w'; - break; - - case IDC_APPEND: // append to existing file - fileMode[0] = 'a'; - break; - - case IDCANCEL: // cancel operation without changing g_OutputFile - return TRUE; - } - } - else // if file does not exist - { - fileMode[0] = 'w'; - } - - tempFile = _wfopen(tempBuffer, fileMode); - - if (tempFile == NULL) - { - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ERRFILE, hDlg, (DLGPROC)FileError); - } - else - { - wcscpy(g_SaveFileName, tempBuffer); - - if (g_OutputFile != NULL) - { - fclose(g_OutputFile); // close any open file - } - - g_OutputFile = tempFile; - - cout << g_OutputFile; // update FILE* for the CE_Screen_Output class object. - } - - return TRUE; - - case IDCANCEL: - EndDialog(hDlg, wmId); - return TRUE; - - default: - return FALSE; - } - break; - default: - return FALSE; - } - - return FALSE; -} - - -LRESULT CALLBACK FileError(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (message) - { - case WM_INITDIALOG: - return TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - } - - return FALSE; -} - - -LRESULT CALLBACK FileExist(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (message) - { - case WM_INITDIALOG: - return TRUE; - case WM_COMMAND: - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - default: - return FALSE; - } - - return FALSE; -} diff --git a/apps/FaCE/FaCE.h b/apps/FaCE/FaCE.h deleted file mode 100644 index 8a4b80425d9..00000000000 --- a/apps/FaCE/FaCE.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file FaCE.h - * - * $Id$ - * - * @author Si Mong Park - */ -//============================================================================= - -#if !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_) -#define AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#if (_WIN32_WCE <= 211) -#error This project can not be built for H/PC Pro 2.11 or earlier platforms. -#endif - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -////// -// BEGIN FaCE specific preprocessor -#ifdef NO_ACE - -#include -#include "CE_Screen_Output.h" - -#define ACE_TCHAR wchar_t -#define ACE_LIB_TEXT(STRING) L##STRING -#define ACE_CE_Screen_Output CE_Screen_Output - -int main_i(int, wchar_t**); - -#else - -#include -#include - -int ace_main_i(int, ACE_TCHAR**); - -#endif // NO_ACE -// END FaCE specific -////// - -#include "resource.h" - -#define MENU_HEIGHT 26 -#define MAX_LOADSTRING 101 -#define MAX_COMMAND_LINE 1001 // Max number of characters + 1 (null at the end) for user-input argv - -extern ACE_CE_Screen_Output cout; // Replacement of std::cout - -#endif // !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_) diff --git a/apps/FaCE/FaCE.rc b/apps/FaCE/FaCE.rc deleted file mode 100644 index 1d1b40df81e..00000000000 --- a/apps/FaCE/FaCE.rc +++ /dev/null @@ -1,268 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "newres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_FACE ICON DISCARDABLE "FACE.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""newres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Data -// - -IDM_MENU SHMENUBAR MOVEABLE PURE -BEGIN - IDM_MENU, 2, - I_IMAGENONE, ID_SETTING, TBSTATE_ENABLED, - TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_SETTING, 0, 0, - I_IMAGENONE, IDM_MAIN_COMMAND1, TBSTATE_ENABLED, - TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_HELP, 0, 1, -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Menubar -// - -IDM_MENU MENU DISCARDABLE -BEGIN - POPUP "Setting" - BEGIN - MENUITEM "Command Line", ID_SETTING_COMMANDLINE - MENUITEM "Run", ID_SETTING_RUN - MENUITEM SEPARATOR - MENUITEM "Exit", ID_SETTING_EXIT - END - POPUP "Tools" - BEGIN - MENUITEM "About", IDM_HELP_ABOUT - MENUITEM "Save To File", ID_TOOLS_SAVETOFILE - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 148, 161 -STYLE WS_POPUP | WS_CAPTION -EXSTYLE 0x80000000L -CAPTION "About FACE" -FONT 8, "System" -BEGIN - CONTROL 113,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,33,6, - 69,52 - CTEXT "Static",IDC_COPYRIGHT,7,86,128,68 - CONTROL 114,IDC_TAO,"Static",SS_BITMAP,7,61,134,22 -END - -IDD_CMDLINE DIALOG DISCARDABLE 0, 0, 125, 50 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Command Line" -FONT 8, "System" -BEGIN - DEFPUSHBUTTON "OK",IDOK,7,29,50,14 - PUSHBUTTON "Cancel",IDCANCEL,68,29,50,14 - COMBOBOX IDC_CMDEDIT,7,7,111,80,CBS_DROPDOWN | CBS_AUTOHSCROLL | - CBS_OEMCONVERT | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | - WS_TABSTOP -END - -IDD_OUTFILE DIALOG DISCARDABLE 0, 0, 127, 49 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Output File Name" -FONT 8, "System" -BEGIN - DEFPUSHBUTTON "OK",IDOK,7,28,50,14 - PUSHBUTTON "Cancel",IDCANCEL,70,28,50,14 - EDITTEXT IDC_SAVEFILE,7,7,113,14,ES_AUTOHSCROLL -END - -IDD_ERRFILE DIALOG DISCARDABLE 0, 0, 124, 49 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ERROR" -FONT 8, "System" -BEGIN - DEFPUSHBUTTON "OK",IDOK,37,28,50,14 - CTEXT "File Creation Error!",IDC_ERRFILE,13,7,98,17, - SS_CENTERIMAGE -END - -IDD_FILEEXIST DIALOG DISCARDABLE 0, 0, 114, 90 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "File Exists" -FONT 8, "System" -BEGIN - DEFPUSHBUTTON "Overwrite",IDOVERWRITE,32,32,50,14 - PUSHBUTTON "Cancel",IDCANCEL,32,68,50,14 - PUSHBUTTON "Append",IDC_APPEND,32,50,50,14 - CTEXT "File already exists!",IDC_STATIC,7,15,100,11 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDC_FACE ACCELERATORS DISCARDABLE -BEGIN - "A", IDM_HELP_ABOUT, VIRTKEY, CONTROL, NOINVERT - "Q", IDOK, VIRTKEY, CONTROL, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 141 - TOPMARGIN, 6 - BOTTOMMARGIN, 154 - END - - IDD_CMDLINE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 118 - TOPMARGIN, 7 - BOTTOMMARGIN, 43 - END - - IDD_OUTFILE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 120 - TOPMARGIN, 7 - BOTTOMMARGIN, 42 - END - - IDD_ERRFILE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 117 - TOPMARGIN, 7 - BOTTOMMARGIN, 42 - END - - IDD_FILEEXIST, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 107 - TOPMARGIN, 7 - BOTTOMMARGIN, 82 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_ACERACER BITMAP DISCARDABLE "ACE_Racer.bmp" -IDB_TAO BITMAP DISCARDABLE "TAO.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APP_TITLE "FaCE" - IDC_FACE "FaCE" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_HELP "Tools" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_COMMAND1 "Done " -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_CAP_SETTING "Setting" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/apps/FaCE/FaCE.vcp b/apps/FaCE/FaCE.vcp deleted file mode 100644 index 1dcf8c5fe60..00000000000 --- a/apps/FaCE/FaCE.vcp +++ /dev/null @@ -1,604 +0,0 @@ -# Microsoft eMbedded Visual Tools Project File - Name="FaCE" - Package Owner=<4> -# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (WCE x86) Application" 0x8301 -# TARGTYPE "Win32 (WCE ARM) Application" 0x8501 - -CFG=FaCE - Win32 (WCE ARM) Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "FaCE.vcn". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "FaCE.vcn" CFG="FaCE - Win32 (WCE ARM) Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "FaCE - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application") -!MESSAGE "FaCE - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application") -!MESSAGE "FaCE - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Application") -!MESSAGE "FaCE - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -# PROP ATL_Project 2 - -!IF "$(CFG)" == "FaCE - Win32 (WCE ARM) Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ARMRel" -# PROP BASE Intermediate_Dir "ARMRel" -# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" -# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ARMRel" -# PROP Intermediate_Dir "ARMRel" -# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" -# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r -# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r -CPP=clarm.exe -# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c -# ADD CPP /nologo /W3 /I "$(ACE_ROOT)" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Oxs /M$(CECrtMT) /c -# SUBTRACT CPP /YX /Yc /Yu -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM -# ADD LINK32 commctrl.lib coredll.lib aygshell.lib ace_os.lib ace.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /libpath:"$(ACE_ROOT)\LIB\Release\ARM" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ARMDbg" -# PROP BASE Intermediate_Dir "ARMDbg" -# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" -# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "ARMDbg" -# PROP Intermediate_Dir "ARMDbg" -# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" -# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r -# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r -CPP=clarm.exe -# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c -# ADD CPP /nologo /W3 /Zi /Od /I "$(ACE_ROOT)" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c -# SUBTRACT CPP /YX /Yc /Yu -MTL=midl.exe -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM -# ADD LINK32 commctrl.lib coredll.lib aygshell.lib ace_osd.lib aced.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"$(ACE_ROOT)\LIB\Debug\ARM" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "X86Rel" -# PROP BASE Intermediate_Dir "X86Rel" -# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}" -# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "X86Rel" -# PROP Intermediate_Dir "X86Rel" -# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}" -# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r -# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r -CPP=cl.exe -# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /Oxs /c -# ADD CPP /nologo /W3 /I "$(ACE_ROOT)" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Gs8192 /GF /Oxs /c -# SUBTRACT CPP /YX /Yc /Yu -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86 -# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib ace_os.lib ace.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86 - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "X86Dbg" -# PROP BASE Intermediate_Dir "X86Dbg" -# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}" -# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "X86Dbg" -# PROP Intermediate_Dir "X86Dbg" -# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}" -# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r -# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r -CPP=cl.exe -# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c -# ADD CPP /nologo /W3 /Zi /Od /I "$(ACE_ROOT)" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Gs8192 /GF /c -# SUBTRACT CPP /YX /Yc /Yu -MTL=midl.exe -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86 -# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib ace_osd.lib aced.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"$(ACE_ROOT)\LIB\Debug\X86EM" /subsystem:$(CESubsystem) /MACHINE:IX86 - -!ENDIF - -# Begin Target - -# Name "FaCE - Win32 (WCE ARM) Release" -# Name "FaCE - Win32 (WCE ARM) Debug" -# Name "FaCE - Win32 (WCE x86) Release" -# Name "FaCE - Win32 (WCE x86) Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\FaCE.cpp - -!IF "$(CFG)" == "FaCE - Win32 (WCE ARM) Release" - -DEP_CPP_FACE_=\ - ".\FaCE.h"\ - -NODEP_CPP_FACE_=\ - ".\ipapi.h"\ - ".\StdAfx.h"\ - ".\ygshell.h"\ - - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug" - -DEP_CPP_FACE_=\ - ".\FaCE.h"\ - -NODEP_CPP_FACE_=\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ACE.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\CE_Screen_Output.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\ - ".\ipapi.h"\ - ".\StdAfx.h"\ - ".\ygshell.h"\ - - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Release" - -DEP_CPP_FACE_=\ - ".\FaCE.h"\ - -NODEP_CPP_FACE_=\ - ".\ipapi.h"\ - ".\StdAfx.h"\ - ".\ygshell.h"\ - - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Debug" - -DEP_CPP_FACE_=\ - "..\..\ace\ace.h"\ - "..\..\ace\ACE.i"\ - "..\..\ace\ACE_export.h"\ - "..\..\ace\ace_wchar.h"\ - "..\..\ace\ace_wchar.inl"\ - "..\..\ace\Argv_Type_Converter.h"\ - "..\..\ace\Argv_Type_Converter.inl"\ - "..\..\ace\Base_Thread_Adapter.h"\ - "..\..\ace\Base_Thread_Adapter.inl"\ - "..\..\ace\Basic_Types.h"\ - "..\..\ace\Basic_Types.i"\ - "..\..\ace\CE_Screen_Output.h"\ - "..\..\ace\config-all.h"\ - "..\..\ace\config-cygwin32-common.h"\ - "..\..\ace\config-cygwin32.h"\ - "..\..\ace\config-g++-common.h"\ - "..\..\ace\config-ghs-common.h"\ - "..\..\ace\config-win32-borland.h"\ - "..\..\ace\config-win32-common.h"\ - "..\..\ace\config-win32-ghs.h"\ - "..\..\ace\config-win32-mingw.h"\ - "..\..\ace\config-win32-msvc-5.h"\ - "..\..\ace\config-win32-msvc-6.h"\ - "..\..\ace\config-win32-msvc-7.h"\ - "..\..\ace\config-win32-msvc.h"\ - "..\..\ace\config-win32-visualage.h"\ - "..\..\ace\config-win32.h"\ - "..\..\ace\config-WinCE.h"\ - "..\..\ace\config.h"\ - "..\..\ace\Default_Constants.h"\ - "..\..\ace\Flag_Manip.h"\ - "..\..\ace\Flag_Manip.i"\ - "..\..\ace\Global_Macros.h"\ - "..\..\ace\Handle_Ops.h"\ - "..\..\ace\Handle_Ops.i"\ - "..\..\ace\Init_ACE.h"\ - "..\..\ace\Init_ACE.i"\ - "..\..\ace\iosfwd.h"\ - "..\..\ace\Lib_Find.h"\ - "..\..\ace\Lib_Find.i"\ - "..\..\ace\Log_Msg.h"\ - "..\..\ace\Log_Msg_Callback.h"\ - "..\..\ace\Log_Priority.h"\ - "..\..\ace\Log_Record.h"\ - "..\..\ace\Log_Record.i"\ - "..\..\ace\Managed_Object.cpp"\ - "..\..\ace\Managed_Object.h"\ - "..\..\ace\Managed_Object.i"\ - "..\..\ace\Min_Max.h"\ - "..\..\ace\Object_Manager.h"\ - "..\..\ace\Object_Manager.i"\ - "..\..\ace\OS.h"\ - "..\..\ace\OS.i"\ - "..\..\ace\OS_Dirent.h"\ - "..\..\ace\OS_Dirent.inl"\ - "..\..\ace\OS_Errno.h"\ - "..\..\ace\OS_Errno.inl"\ - "..\..\ace\OS_Export.h"\ - "..\..\ace\OS_Log_Msg_Attributes.h"\ - "..\..\ace\OS_Log_Msg_Attributes.inl"\ - "..\..\ace\OS_Memory.h"\ - "..\..\ace\OS_Memory.inl"\ - "..\..\ace\OS_String.h"\ - "..\..\ace\OS_String.inl"\ - "..\..\ace\OS_TLI.h"\ - "..\..\ace\OS_TLI.inl"\ - "..\..\ace\post.h"\ - "..\..\ace\pre.h"\ - "..\..\ace\Sock_Connect.h"\ - "..\..\ace\Sock_Connect.i"\ - "..\..\ace\streams.h"\ - "..\..\ace\svc_export.h"\ - "..\..\ace\Thread_Adapter.h"\ - "..\..\ace\Thread_Adapter.inl"\ - "..\..\ace\Thread_Control.h"\ - "..\..\ace\Thread_Control.inl"\ - "..\..\ace\Thread_Exit.h"\ - "..\..\ace\Thread_Hook.h"\ - "..\..\ace\Trace.h"\ - ".\CE_ARGV.h"\ - ".\CE_Screen_Output.h"\ - ".\FaCE.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\FaCE.rc - -!IF "$(CFG)" == "FaCE - Win32 (WCE ARM) Release" - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug" - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Release" - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\Main.cpp - -!IF "$(CFG)" == "FaCE - Win32 (WCE ARM) Release" - -DEP_CPP_MAIN_=\ - ".\FaCE.h"\ - - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug" - -DEP_CPP_MAIN_=\ - ".\FaCE.h"\ - -NODEP_CPP_MAIN_=\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\ - - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Release" - -DEP_CPP_MAIN_=\ - ".\FaCE.h"\ - - -!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Debug" - -DEP_CPP_MAIN_=\ - "..\..\ace\ACE_export.h"\ - "..\..\ace\ace_wchar.h"\ - "..\..\ace\ace_wchar.inl"\ - "..\..\ace\Argv_Type_Converter.h"\ - "..\..\ace\Argv_Type_Converter.inl"\ - "..\..\ace\Base_Thread_Adapter.h"\ - "..\..\ace\Base_Thread_Adapter.inl"\ - "..\..\ace\Basic_Types.h"\ - "..\..\ace\Basic_Types.i"\ - "..\..\ace\CE_Screen_Output.h"\ - "..\..\ace\config-all.h"\ - "..\..\ace\config-cygwin32-common.h"\ - "..\..\ace\config-cygwin32.h"\ - "..\..\ace\config-g++-common.h"\ - "..\..\ace\config-ghs-common.h"\ - "..\..\ace\config-win32-borland.h"\ - "..\..\ace\config-win32-common.h"\ - "..\..\ace\config-win32-ghs.h"\ - "..\..\ace\config-win32-mingw.h"\ - "..\..\ace\config-win32-msvc-5.h"\ - "..\..\ace\config-win32-msvc-6.h"\ - "..\..\ace\config-win32-msvc-7.h"\ - "..\..\ace\config-win32-msvc.h"\ - "..\..\ace\config-win32-visualage.h"\ - "..\..\ace\config-win32.h"\ - "..\..\ace\config-WinCE.h"\ - "..\..\ace\config.h"\ - "..\..\ace\Default_Constants.h"\ - "..\..\ace\Global_Macros.h"\ - "..\..\ace\iosfwd.h"\ - "..\..\ace\Log_Msg.h"\ - "..\..\ace\Log_Msg_Callback.h"\ - "..\..\ace\Log_Priority.h"\ - "..\..\ace\Log_Record.h"\ - "..\..\ace\Log_Record.i"\ - "..\..\ace\Managed_Object.cpp"\ - "..\..\ace\Managed_Object.h"\ - "..\..\ace\Managed_Object.i"\ - "..\..\ace\Min_Max.h"\ - "..\..\ace\Object_Manager.h"\ - "..\..\ace\Object_Manager.i"\ - "..\..\ace\OS.h"\ - "..\..\ace\OS.i"\ - "..\..\ace\OS_Dirent.h"\ - "..\..\ace\OS_Dirent.inl"\ - "..\..\ace\OS_Errno.h"\ - "..\..\ace\OS_Errno.inl"\ - "..\..\ace\OS_Export.h"\ - "..\..\ace\OS_Log_Msg_Attributes.h"\ - "..\..\ace\OS_Log_Msg_Attributes.inl"\ - "..\..\ace\OS_Memory.h"\ - "..\..\ace\OS_Memory.inl"\ - "..\..\ace\OS_String.h"\ - "..\..\ace\OS_String.inl"\ - "..\..\ace\OS_TLI.h"\ - "..\..\ace\OS_TLI.inl"\ - "..\..\ace\post.h"\ - "..\..\ace\pre.h"\ - "..\..\ace\streams.h"\ - "..\..\ace\svc_export.h"\ - "..\..\ace\Thread_Adapter.h"\ - "..\..\ace\Thread_Adapter.inl"\ - "..\..\ace\Thread_Control.h"\ - "..\..\ace\Thread_Control.inl"\ - "..\..\ace\Thread_Exit.h"\ - "..\..\ace\Thread_Hook.h"\ - "..\..\ace\Trace.h"\ - ".\CE_Screen_Output.h"\ - ".\FaCE.h"\ - - -!ENDIF - -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\FaCE.h -# End Source File -# Begin Source File - -SOURCE=.\newres.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\ACE_Racer.bmp -# End Source File -# Begin Source File - -SOURCE=.\FaCE.ico -# End Source File -# Begin Source File - -SOURCE=.\TAO.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=.\License.txt -# End Source File -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/apps/FaCE/FaCE.vcw b/apps/FaCE/FaCE.vcw deleted file mode 100644 index 3ef52974f61..00000000000 --- a/apps/FaCE/FaCE.vcw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "FaCE"=".\FaCE.vcp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/apps/FaCE/FaCENOACE.vcp b/apps/FaCE/FaCENOACE.vcp deleted file mode 100644 index a6cabffe420..00000000000 --- a/apps/FaCE/FaCENOACE.vcp +++ /dev/null @@ -1,528 +0,0 @@ -# Microsoft eMbedded Visual Tools Project File - Name="FaCENOACE" - Package Owner=<4> -# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (WCE x86) Application" 0x8301 -# TARGTYPE "Win32 (WCE ARM) Application" 0x8501 - -CFG=FaCENOACE - Win32 (WCE ARM) Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "FaCENOACE.vcn". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "FaCENOACE.vcn" CFG="FaCENOACE - Win32 (WCE ARM) Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "FaCENOACE - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application") -!MESSAGE "FaCENOACE - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application") -!MESSAGE "FaCENOACE - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Application") -!MESSAGE "FaCENOACE - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -# PROP ATL_Project 2 - -!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ARMRel" -# PROP BASE Intermediate_Dir "ARMRel" -# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" -# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ARMRelNOACE" -# PROP Intermediate_Dir "ARMRelNOACE" -# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" -# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r -# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r -CPP=clarm.exe -# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c -# ADD CPP /nologo /W3 /D "ARM" /D "_ARM_" /D "NDEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /Oxs /M$(CECrtMT) /c -# SUBTRACT CPP /YX /Yc /Yu -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM -# ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ARMDbg" -# PROP BASE Intermediate_Dir "ARMDbg" -# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" -# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "ARMDbgNOACE" -# PROP Intermediate_Dir "ARMDbgNOACE" -# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" -# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r -# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r -CPP=clarm.exe -# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c -# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /M$(CECrtMTDebug) /c -# SUBTRACT CPP /YX /Yc /Yu -MTL=midl.exe -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM -# ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "X86Rel" -# PROP BASE Intermediate_Dir "X86Rel" -# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}" -# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "X86RelNOACE" -# PROP Intermediate_Dir "X86RelNOACE" -# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}" -# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r -# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r -CPP=cl.exe -# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /Oxs /c -# ADD CPP /nologo /W3 /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "NDEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /Gs8192 /GF /Oxs /c -# SUBTRACT CPP /YX /Yc /Yu -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86 -# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86 - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "X86Dbg" -# PROP BASE Intermediate_Dir "X86Dbg" -# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}" -# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "X86DbgNOACE" -# PROP Intermediate_Dir "X86DbgNOACE" -# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}" -# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -RSC=rc.exe -# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r -# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r -CPP=cl.exe -# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c -# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /Gs8192 /GF /c -# SUBTRACT CPP /YX /Yc /Yu -MTL=midl.exe -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86 -# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86 - -!ENDIF - -# Begin Target - -# Name "FaCENOACE - Win32 (WCE ARM) Release" -# Name "FaCENOACE - Win32 (WCE ARM) Debug" -# Name "FaCENOACE - Win32 (WCE x86) Release" -# Name "FaCENOACE - Win32 (WCE x86) Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\CE_ARGV.CPP - -!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release" - -DEP_CPP_CE_AR=\ - ".\CE_ARGV.H"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug" - -DEP_CPP_CE_AR=\ - ".\CE_ARGV.H"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release" - -DEP_CPP_CE_AR=\ - ".\CE_ARGV.H"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug" - -DEP_CPP_CE_AR=\ - ".\CE_ARGV.H"\ - - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\CE_Screen_Output.cpp - -!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release" - -DEP_CPP_CE_SC=\ - ".\CE_Screen_Output.h"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug" - -DEP_CPP_CE_SC=\ - ".\CE_Screen_Output.h"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release" - -DEP_CPP_CE_SC=\ - ".\CE_Screen_Output.h"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug" - -DEP_CPP_CE_SC=\ - ".\CE_Screen_Output.h"\ - - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\FaCE.cpp - -!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release" - -DEP_CPP_FACE_=\ - ".\FaCE.h"\ - ".\StdAfx.h"\ - -NODEP_CPP_FACE_=\ - ".\ipapi.h"\ - ".\ygshell.h"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug" - -DEP_CPP_FACE_=\ - ".\FaCE.h"\ - ".\StdAfx.h"\ - -NODEP_CPP_FACE_=\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ACE.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\CE_Screen_Output.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\ - ".\ipapi.h"\ - ".\ygshell.h"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release" - -DEP_CPP_FACE_=\ - ".\FaCE.h"\ - ".\StdAfx.h"\ - -NODEP_CPP_FACE_=\ - ".\ipapi.h"\ - ".\ygshell.h"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug" - -DEP_CPP_FACE_=\ - ".\CE_ARGV.H"\ - ".\CE_Screen_Output.h"\ - ".\FaCE.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\FaCE.rc - -!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release" - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug" - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release" - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\Main.cpp - -!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release" - -DEP_CPP_MAIN_=\ - ".\FaCE.h"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug" - -DEP_CPP_MAIN_=\ - ".\FaCE.h"\ - -NODEP_CPP_MAIN_=\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\ - "..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release" - -DEP_CPP_MAIN_=\ - ".\FaCE.h"\ - - -!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug" - -DEP_CPP_MAIN_=\ - ".\CE_Screen_Output.h"\ - ".\FaCE.h"\ - - -!ENDIF - -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\CE_ARGV.H -# End Source File -# Begin Source File - -SOURCE=.\CE_Screen_Output.h -# End Source File -# Begin Source File - -SOURCE=.\FaCE.h -# End Source File -# Begin Source File - -SOURCE=.\newres.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\ACE_Racer.bmp -# End Source File -# Begin Source File - -SOURCE=.\FaCE.ico -# End Source File -# Begin Source File - -SOURCE=.\TAO.bmp -# End Source File -# End Group -# Begin Source File - -SOURCE=.\License.txt -# End Source File -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/apps/FaCE/FaCENOACE.vcw b/apps/FaCE/FaCENOACE.vcw deleted file mode 100644 index 98a3b7e412a..00000000000 --- a/apps/FaCE/FaCENOACE.vcw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "FaCENOACE"=".\FaCENOACE.vcp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/apps/FaCE/FaCE_OS.h b/apps/FaCE/FaCE_OS.h deleted file mode 100644 index 79e0cf313ed..00000000000 --- a/apps/FaCE/FaCE_OS.h +++ /dev/null @@ -1,38 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file FaCE_OS.h - * - * $Id$ - * - * @author Si Mong Park - */ -//============================================================================= - -#ifndef FaCE_OS_h -#define FaCE_OS_h - -// This definition is for the "int FaCE_MAIN(int, wchar_t**)" using FaCE. -# define FaCE_MAIN \ -ace_main_i (int, ACE_TCHAR**); \ -extern BOOL InitInstance (HINSTANCE, int); \ -extern void InitSetup(); \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, ACE_TCHAR* lpCmdLine, int nCmdShow) \ -{ \ - MSG msg; \ - HACCEL hAccelTable; \ - if (!InitInstance (hInstance, nCmdShow)) return FALSE; \ - hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); \ - InitSetup(); \ - while (GetMessage(&msg, NULL, 0, 0)) { \ - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { \ - TranslateMessage(&msg); \ - DispatchMessage(&msg); \ - } \ - } \ - return msg.wParam; \ -} \ -int ace_main_i - -#endif // FaCE_OS_h diff --git a/apps/FaCE/License.txt b/apps/FaCE/License.txt deleted file mode 100644 index ceaf85d3550..00000000000 --- a/apps/FaCE/License.txt +++ /dev/null @@ -1,27 +0,0 @@ -== -== Copyright and Licensing Information -== - -ACE(tm) and TAO(tm) are copyrighted by Dr. Douglas C. Schmidt and the Center for Distributed -Object Computing ('DOC' group) at Washington University, Copyright (C) 1993 - 2002, all rights -reserved. Since ACE and TAO are open source, free software, you are free to use, modify, and -distribute the ACE and TAO source code and object code produced from the source, as long as -you include this copyright statement along with code built using ACE and TAO. Please refer to -ACE and TAO documentations for detailed copyright and license information on ACE and TAO. - -FaCE is an additional front-end shell package designed for ACE and TAO testing work for Pocket -PC 2002 platform, created and released by Object Computing, Inc. (OCI) and distributed with ACE -and TAO under the same licensing terms. You can modify and change the source of FaCE for your -own use as long as you provide attribution to OCI by including its copyright statement in your -distributions of source and object code. OCI welcomes submissions of improvements to the FaCE -code base. - -FaCE is copyrighted by Object Computing, Inc., St. Louis Missouri, Copyright (C) 2002, -all rights reserved. - - -== -== Warranty Information -== - -FaCE is provided 'as is' without warranties of any kind. diff --git a/apps/FaCE/Main.cpp b/apps/FaCE/Main.cpp deleted file mode 100644 index 9c7df885341..00000000000 --- a/apps/FaCE/Main.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// $Id$ - -// ************************************************ -// ** This file is NOT to be used for framework. ** -// ************************************************ - -// This file defines the entry point for Windows CE, which is defined in OS.h for real applications. - - -#include "FaCE.h" - -extern BOOL InitInstance (HINSTANCE, int); -extern void InitSetup(); - - -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, ACE_TCHAR* lpCmdLine, int nCmdShow) -{ - MSG msg; - HACCEL hAccelTable; - if (!InitInstance (hInstance, nCmdShow)) return FALSE; - hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); - InitSetup(); - while (GetMessage(&msg, NULL, 0, 0)) { - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - return msg.wParam; -} - - -#ifdef NO_ACE - -int main_i(int, ACE_TCHAR**) -{ - // this function will be replaced by user's main_ce function - return 0; -} - -#else - -int ace_main_i(int, ACE_TCHAR**) -{ - // this function will be replaced by user's main_ce function - return 0; -} - -#endif // NO_ACE diff --git a/apps/FaCE/ReadMe.txt b/apps/FaCE/ReadMe.txt deleted file mode 100644 index a4bd2d981b1..00000000000 --- a/apps/FaCE/ReadMe.txt +++ /dev/null @@ -1,287 +0,0 @@ -=== -=== FaCE (Front-end for ACE CE) -=== -=== Object Computing, Inc. -=== St. Louis, Missouri -=== Copyright (C) 2002. All rights reserved. -=== -=== V1.01, March 30th, 2002 -=== - - -== What's FaCE? - -FaCE is a simple front-end framework for testing and debugging non-Windows -CE applications on the Pocket PC 2002 platform. Originally, FaCE was -developed to test ACE and TAO components internally in Object Computing, Inc. -However, since it has shown dramatic increase of productivity in a lot -shorter amount of time, it has been prepared as a package for all programmers -who want to test and run existing codes (non-WinCE native codes) on Pocket PC -2002 and WinCE 3.0. - -The features of FaCE are: - - 1. command line parameter support - 2. command line history support (never type in same command line again) - 3. output displayed on the windows screen - 4. output to file (with append and overwrite support) - 5. does not use MFC - 6. almost no modification to existing user code - 7. easy to enable and disable after install - -* Default project files only contain Pocket PC 2002 platform configuration. - A new configuration can be added for other WinCE 3.0 platform from eVC. - - -== Package Contents - -Files contained in FaCE package are: - - Main Framework Files for both ACE users and non-ACE users - - ACE_Racer.bmp - - FaCE.h & cpp - - FaCE.ico - - FaCE.rc - - newres.h - - resource.h - - TAO.bmp - - ACE entry point definition file - - FaCE_OS.h - - Additional Framework files for non-ACE users - - CE_ARGV.h & cpp - - CE_Screen_Output.h & cpp - - Files for loading skeleton FaCE from eVC - - FaCE.vcp & vcw : FaCE Project files for ACE users - - FaCENOACE.vcp & vcw : FaCE Project files for non-ACE users - - Main.cpp : almost empty entry point function - - Misc. Files - - ACE.ico : a bonus icon of ACE logo - - License.txt : license and warranty information - - ReadMe.txt : this document - - -== Requirement - - - Microsoft(C) eMbedded Visual Studio/C++ (eVC) 3.0 - - Pocket PC 2002 SDK - - ** For ACE-users only: - - ACE+TAO installed and configured for WinCE build only for ACE-users - - ace and ace_os libraries built for WinCE and loaded on machine - - -== Important Note - -It has been reported that certain Pocket PC 2002 machines with ARM processor -can be totally dead and will not even respond to the hard reset. While the -real cause of this problem is unknown, HP has released a patch for this -problem. We have tested it, and it seems working fine on our machine (HP -Jornada 568), which is our 5th machine that has been running fine for the -longest time. - -As this has been identified by hardware manufacturer and can be fixed as HP -did, Object Computing, Inc. (OCI) or any member of ACE+TAO community cannot -be responsible for this problem. If this problem happens during debugging, -contact your hardware manufacturer for fix or replacement. It has found -that almost all Pocket PC 2002 machines regardless of manufacturers have same -problem. - -Also, Phil Mesnier at OCI has found that virtual function calls under certain -situation can cause a problem that randomly changes parameter and pointer -values over function calls. This is due to the incorrect instructions -generated by eVC for ARM processor. So far, no solution or patch has been -released by compiler vendor, although vendor is aware of this problem. - -Since Pocket PC 2002 is based on WinCE 3.0, ACE+TAO as well as FaCE should -be able to run on any WinCE 3.0 platform by adding a new configuraion with -minimal change. - - -== Installation & Setup - -1. Create a subdirectory named 'FaCE' (or anything in your taste) under - your current project directory. - -2. Copy FaCE_OS.h to the ACE_ROOT/ace directory, and add following line at - the end of your ACE_ROOT/ace/config.h file: - - #include "FaCE_OS.h" - -3. Copy main framework files listed above and add them into "your" project - (NOT FaCE.vcw/vcp). For non-ACE users, copy additional framework files - for non-ACE users in addition to the main framework files. - It would be a good idea to create a new folder in your project and put - all FaCE files into it. This way, it will be easy to disable FaCE by - setting the folder excluded from the build on the folder property option. - - ** IMPORTANT! ** - FaCE does NOT use MFC. Thus, if your project is already set for - 'Not using MFC', then do not change the setting. - - * Note: Make sure those files are not shared by multiple executables. - Each project must have its own copy of those files. - It is a good idea to create a separate folder on your project - and put FaCE related files into that folder. In that case, - if you want to disable FaCE and run by using normal 'main', - then you can simply set the whole FaCE folder excluded from - build in the project setting menu. - -4. Change your 'main()' function part similar to the following example. - - #ifdef ACE_HAS_WINCE - #include "FaCE/FaCE.h" // use the name of subdirectory you created - int FaCE_MAIN (int argc, ACE_TCHAR *argv[]) - #else - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // ACE normal entry point - #endif - - Change the directory name for "FaCE/FaCE.h" if necessary. - For non-ACE users, use 'UNDER_CE' instead of 'ACE_HAS_WINCE'. - - == Possible Additional Change - - Above change will be the only change if your program compiles and links - fine under eVC. It does not mean that your program is WinCE-ready but - just means that your program does not include the libraries that are not - supported by WinCE, such as iostream. - - For ACE users, good examples will be the ACE test programs under - $ACE_ROOT/test. - - For non-ACE users, I highly recommend to create a project for WinCE first - if it has not already been done and write your code using wmain. - Try compile and link your program without FaCE to check your program does - not include any libraries not supported by WinCE. FaCE supports text output - by aliasing 'cout' in FaCE.h; however, it is NOT a real iostream but an alias - for CE_Screen_Output class. You may need to use '#ifdef UNDER_CE' for your - iostream includes, if you want to share the code among different platforms. - - Also, it is important to match the parameter types for 'wmain' function. - For WinCE, it MUST be in the format of: - - int FaCE_MAIN (int, wchar_t**) - - and you can leave your original wmain type as it was for non-CE platform - definition. - -5. Go to 'ResourceView' or double-click on the 'FaCE.rc'. Open 'String Table -> - String Table' from the resource browse view, and change the string value (caption) - defined for 'IDS_APP_TITLE' from 'FaCE' to your program name. This will - help identifying multiple FaCE-fied applications when you brose them - through system memory -> running programs in case of crash. - -6. That's it! - -** Optionally, you can personalize the icons defined for FaCE for your own. - To do this easily, load "FaCE.vcw" (requires ACE library) or "FaCENOACE.vcw" - from eVC. Also, FaCENOACE.vcw can be used as 'hello world'-type starting - frame-work for non-WinCE programmers. - -** Non-ACE users may see the warning messages saying, "Could not find the file xxx", - for ace.h, Log_Msg.h, OS.h, and CE_Screen_Output.h. This is due to the eVC's - not-so-perfect precompilation file checking and totally harmless. - -** Later if you don't want to use FaCE anymore, simply restore your original - main function and remove FaCE files from your project (or exclude FaCE files - from build). ACE library does not have to be rebuilt as FaCE_OS.h only - contains macro. - -== Running FaCE - -1. Command line option - -User can specify the command line option for the program by using 'Settings -> -Command Line' from the FaCE menu. FaCE will automatically save all user-entered -command line parameters as a ASCII format file named 'Parameters.txt' in the -root directory of WinCE device/emulator. User can edit and change by openning -this file from any text editor and save as a ASCII text file with DOS standard -CR/LF combo. This will greatly save time especially when you are working on the -Pocket PC machine that does not have keyboard. Remember NOT to convert file -format to Unicode; it must be standard DOS ASCII text file. - -2. Output Saving - -You can save output to file by selecting 'Tools -> Save To File'. By default, -FaCE will not create/save any file. Also, any output received before setting -up this feature will not be saved. - -If the file with specified name exists, FaCE will ask whether you want to -append to the end of file or erase and overwrite. All output files will be -saved in the root directory of the system. - -3. Running Your Program - -'Setting -> Run' will execute your program. Two tags, 'START' and 'END' -indicate the beginning and end of your code. - -For ACE users, any log message sent to ACE message log (ACE_DEBUG, for example) -will be displayed on the screen. Also, if you have setup to save to file, -the same contents will be saved to the file as well. Note that the output will -NOT have ACE internal tags (i.e. Dec 04 14:51:12.000 2001@LM_DEBUG@) because -FaCE uses callback message function, and ACE does not pass those tags along -with the output message. - -For non-ACE users, you can declare your own local copy of CE_Screen_Output -object. For example, you can declare CE_Screen_Output object in your cpp file -like: - - CE_Screen_Output cout; - -and use it like, - - int a = 100; - wchar_t* strTemp = L"Hello, world!"; - cout << L"String : " << strTemp << L"a = " << a << endl; - -Remember, CE_Screen_Output is just a simple text output function and does not -have the full capabilities of iostream, which is not available for WinCE 3.0. - -4. In case of crash - -If you have started your code, but the code crashes, which can be easily -identified by looking for the 'END' tag, then you can use Windows CE's memory -program to kill the process (Start -> Settings -> System tag -> Memory -> -Running Programs tag). If you have changed IDS_APP_TITLE in the resource -viewer, then you will see the name you have specified; otherwise, FaCE will be -listed. You can select the name and stop the process by clicking 'Stop' button. -Sometimes, you may need to reset the machine if you cannot access memory program. - - -== Note - -- This FaCE framework does not use any MFC; it only uses general Win32 - API, thus, your project setting does not have to be changed. - -- FaCE is for the 'legacy' Unix/DOS style console applications that - do not use any Win32 and MFC for Windows OS. Programs that are already - using native Windows/WinCE API's will not need FaCE framework. - -- If you run your application from FaCE (Settings -> Run), 'START' and - 'END' will appear at the beginning and end of output messages from your - application. If you see 'END' lable after execution, you can run your - program again without exit and start up FaCE again. - -- Make sure to terminate FaCE by selecting 'Settings -> Exit'. It will - completely terminate FaCE session; Clicking on the 'X' button - at the top-left corner of the screen will not, just like most WinCE programs. - -- FaCE_MAIN is only for the WinCE port of ACE, ensuring proper windows system - message filtering along with proper registraion so that user can see the - process from memory setting and task switcher applications. - -- ACE and FaCE do not overrides native WinMain. If you are developing for - Windows OS only, your WinMain should be just safe from any overrides. - In this case, of course, you don't need to use FaCE package. - - -== Question or Comment - -If you have question and/or comment specific to the FaCE, please contact -Si Park at spark@ociweb.com or Justin Michel at michel_j@ociweb.com. - -For general ACE+TAO support, please refer to comp.soft-sys.ace or contact -Object Computing, Inc. at http://www.ociweb.com. diff --git a/apps/FaCE/TAO.bmp b/apps/FaCE/TAO.bmp deleted file mode 100644 index 1492f789509..00000000000 Binary files a/apps/FaCE/TAO.bmp and /dev/null differ diff --git a/apps/FaCE/newres.h b/apps/FaCE/newres.h deleted file mode 100644 index 0fdbcaa3bb0..00000000000 --- a/apps/FaCE/newres.h +++ /dev/null @@ -1,43 +0,0 @@ -// $Id$ - -#ifndef __NEWRES_H__ -#define __NEWRES_H__ - -#if !defined(UNDER_CE) -#define UNDER_CE _WIN32_WCE -#endif - -#if defined(_WIN32_WCE) - #if !defined(WCEOLE_ENABLE_DIALOGEX) - #define DIALOGEX DIALOG DISCARDABLE - #endif - #include - #define SHMENUBAR RCDATA - #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300) - #include - #define AFXCE_IDR_SCRATCH_SHMENU 28700 - #else - #define I_IMAGENONE (-2) - #define NOMENU 0xFFFF - #define IDS_SHNEW 1 - - #define IDM_SHAREDNEW 10 - #define IDM_SHAREDNEWDEFAULT 11 - #endif // _WIN32_WCE_PSPC - #define AFXCE_IDD_SAVEMODIFIEDDLG 28701 -#endif // _WIN32_WCE - -#ifdef RC_INVOKED -#ifndef _INC_WINDOWS -#define _INC_WINDOWS - #include "winuser.h" // extract from windows header - #include "winver.h" -#endif -#endif - -#ifdef IDC_STATIC -#undef IDC_STATIC -#endif -#define IDC_STATIC (-1) - -#endif //__NEWRES_H__ diff --git a/apps/FaCE/resource.h b/apps/FaCE/resource.h deleted file mode 100644 index a79d8345d1b..00000000000 --- a/apps/FaCE/resource.h +++ /dev/null @@ -1,45 +0,0 @@ -// $Id$ - -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by FaCE.rc -// -#define IDS_APP_TITLE 1 -#define IDC_FACE 3 -#define IDI_FACE 101 -#define IDM_MENU 102 -#define IDD_ABOUTBOX 103 -#define IDS_HELP 104 -#define IDD_CMDLINE 104 -#define IDD_OUTFILE 105 -#define IDD_ERRFILE 107 -#define IDD_FILEEXIST 109 -#define IDB_ACERACER 113 -#define IDB_TAO 114 -#define IDS_COMMAND1 301 -#define IDC_CMDEDIT 1001 -#define IDC_SAVEFILE 1002 -#define IDC_ERRFILE 1003 -#define IDOVERWRITE 1004 -#define IDC_APPEND 1005 -#define IDC_COPYRIGHT 1007 -#define IDC_TAO 1008 -#define IDM_MAIN_COMMAND1 40001 -#define IDM_HELP_ABOUT 40003 -#define ID_SETTING 40004 -#define IDS_CAP_SETTING 40006 -#define ID_SETTING_COMMANDLINE 40007 -#define ID_SETTING_RUN 40008 -#define ID_SETTING_EXIT 40011 -#define ID_TOOLS_SAVETOFILE 40012 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 116 -#define _APS_NEXT_COMMAND_VALUE 40013 -#define _APS_NEXT_CONTROL_VALUE 1009 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp b/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp deleted file mode 100644 index 2b69f852964..00000000000 --- a/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp +++ /dev/null @@ -1,802 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "Event_Channel.h" -#include "Concrete_Connection_Handlers.h" - -ACE_RCSID(Gateway, Concrete_Connection_Handlers, "$Id$") - -Consumer_Handler::Consumer_Handler (const Connection_Config_Info &pci) - : Connection_Handler (pci) -{ - this->connection_role_ = 'C'; - this->msg_queue ()->high_water_mark (Options::instance ()->max_queue_size ()); -} - -// This method should be called only when the Consumer shuts down -// unexpectedly. This method simply marks the Connection_Handler as -// having failed so that handle_close () can reconnect. - -// Do not close handler when received data successfully. -// Consumer_Handler should could process received data. -// For example, Consumer could send reply-event to Supplier. -int -Consumer_Handler::handle_input (ACE_HANDLE) -{ - // Do not set FAILED state at here, just at real failed place. - - char buf[BUFSIZ]; - ssize_t received = this->peer ().recv (buf, sizeof buf); - - switch (received) - { - case -1: - this->state (Connection_Handler::FAILED); - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) Peer has failed unexpectedly for Consumer_Handler %d\n", - this->connection_id ()), - -1); - /* NOTREACHED */ - case 0: - this->state (Connection_Handler::FAILED); - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) Peer has shutdown unexpectedly for Consumer_Handler %d\n", - this->connection_id ()), - -1); - /* NOTREACHED */ - default: - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) IGNORED: Consumer is erroneously sending input to Consumer_Handler %d\n" - "data size = %d\n", - this->connection_id (), - received), - 0); // Return 0 to identify received data successfully. - /* NOTREACHED */ - } -} - -// Perform a non-blocking put() of event. If we are unable to send -// the entire event the remainder is re-queued at the *front* of the -// Event_List. - -int -Consumer_Handler::nonblk_put (ACE_Message_Block *event) -{ - // Try to send the event. If we don't send it all (e.g., due to - // flow control), then re-queue the remainder at the head of the - // Event_List and ask the ACE_Reactor to inform us (via - // handle_output()) when it is possible to try again. - - ssize_t n = this->send (event); - - if (n == -1) - { - // -1 is returned only when things have really gone wrong (i.e., - // not when flow control occurs). Thus, let's try to close down - // and set up a new reconnection by calling handle_close(). - this->state (Connection_Handler::FAILED); - this->handle_close (); - return -1; - } - else if (errno == EWOULDBLOCK) - { - // We didn't manage to send everything, so we need to queue - // things up. - - ACE_DEBUG ((LM_DEBUG, - "(%t) queueing activated on handle %d to routing id %d\n", - this->get_handle (), - this->connection_id ())); - - // ACE_Queue in *front* of the list to preserve order. - if (this->msg_queue ()->enqueue_head - (event, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "enqueue_head"), - -1); - - // Tell ACE_Reactor to call us back when we can send again. - else if (ACE_Reactor::instance ()->schedule_wakeup - (this, ACE_Event_Handler::WRITE_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "schedule_wakeup"), - -1); - return 0; - } - else - return n; -} - -ssize_t -Consumer_Handler::send (ACE_Message_Block *event) -{ - ACE_DEBUG ((LM_DEBUG, - "(%t) sending %d bytes to Consumer %d\n", - event->length (), - this->connection_id ())); - - ssize_t len = event->length (); - ssize_t n = this->peer ().send (event->rd_ptr (), len); - - if (n <= 0) - return errno == EWOULDBLOCK ? 0 : n; - else if (n < len) - { - // Re-adjust pointer to skip over the part we did send. - event->rd_ptr (n); - errno = EWOULDBLOCK; - } - else // if (n == length) - { - // The whole event is sent, we now decrement the reference count - // (which deletes itself with it reaches 0). - event->release (); - errno = 0; - } - this->total_bytes (n); - return n; -} - -// Finish sending an event when flow control conditions abate. -// This method is automatically called by the ACE_Reactor. - -int -Consumer_Handler::handle_output (ACE_HANDLE) -{ - ACE_Message_Block *event = 0; - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Receiver signalled 'resume transmission' %d\n"), - this->get_handle ())); - - // WIN32 Notes: When the receiver blocked, we started adding to the - // consumer handler's message Q. At this time, we registered a - // callback with the reactor to tell us when the TCP layer signalled - // that we could continue to send messages to the consumer. However, - // Winsock only sends this notification ONCE, so we have to assume - // at the application level, that we can continue to send until we - // get any subsequent blocking signals from the receiver's buffer. - -#if defined (ACE_WIN32) - // Win32 Winsock doesn't trigger multiple "You can write now" - // signals, so we have to assume that we can continue to write until - // we get another EWOULDBLOCK. - - // We cancel the wakeup callback we set earlier. - if (ACE_Reactor::instance ()->cancel_wakeup - (this, ACE_Event_Handler::WRITE_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("Error in ACE_Reactor::cancel_wakeup()")), - -1); - - // The list had better not be empty, otherwise there's a bug! - while (this->msg_queue ()->dequeue_head - (event, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1) - { - switch (this->nonblk_put (event)) - { - case -1: // Error sending message to consumer. - { - // We are responsible for releasing an ACE_Message_Block if - // failures occur. - event->release (); - - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("transmission failure"))); - break; - } - case 0: // Partial Send - we got flow controlled by the receiver - { - ACE_ASSERT (errno == EWOULDBLOCK); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%D Partial Send due to flow control") - ACE_TEXT ("- scheduling new wakeup with reactor\n"))); - - // Re-schedule a wakeup call from the reactor when the - // flow control conditions abate. - if (ACE_Reactor::instance ()->schedule_wakeup - (this, - ACE_Event_Handler::WRITE_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("Error in ACE_Reactor::schedule_wakeup()")), - -1); - - // Didn't write everything this time, come back later... - return 0; - } - default: // Sent the whole thing - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Sent message from message Q, Q size = %d\n"), - this->msg_queue()->message_count ())); - break; - } - } - } - - // If we drop out of the while loop, then the message Q should be - // empty...or there's a problem in the dequeue_head() call...but - // thats another story. - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%D Sent all messages from consumers message Q\n"))); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) queueing deactivated on handle %d to routing id %d\n"), - this->get_handle (), - this->connection_id ())); -#else /* !defined (ACE_WIN32) */ - // The list had better not be empty, otherwise there's a bug! - if (this->msg_queue ()->dequeue_head - (event, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1) - { - switch (this->nonblk_put (event)) - { - case 0: // Partial send. - ACE_ASSERT (errno == EWOULDBLOCK); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%D Partial Send\n"))); - - // Didn't write everything this time, come back later... - break; - - case -1: - // We are responsible for releasing an ACE_Message_Block if - // failures occur. - event->release (); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("transmission failure"))); - - /* FALLTHROUGH */ - default: // Sent the whole thing. - - // If we succeed in writing the entire event (or we did not - // fail due to EWOULDBLOCK) then check if there are more - // events on the Message_Queue. If there aren't, tell the - // ACE_Reactor not to notify us anymore (at least until - // there are new events queued up). - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("QQQ::Sent Message from consumer's Q\n"))); - - if (this->msg_queue ()->is_empty ()) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) queueing deactivated on handle %d to routing id %d\n"), - this->get_handle (), - this->connection_id ())); - - if (ACE_Reactor::instance ()->cancel_wakeup - (this, ACE_Event_Handler::WRITE_MASK) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("cancel_wakeup"))); - } - } - } - else - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("dequeue_head - handle_output called by reactor but nothing in Q"))); -#endif /* ACE_WIN32 */ - return 0; -} - -// Send an event to a Consumer (may queue if necessary). - -int -Consumer_Handler::put (ACE_Message_Block *event, - ACE_Time_Value *) -{ - if (this->msg_queue ()->is_empty ()) - // Try to send the event *without* blocking! - return this->nonblk_put (event); - else - // If we have queued up events due to flow control then just - // enqueue and return. - return this->msg_queue ()->enqueue_tail - (event, (ACE_Time_Value *) &ACE_Time_Value::zero); -} - -Supplier_Handler::Supplier_Handler (const Connection_Config_Info &pci) - : Connection_Handler (pci), - msg_frag_ (0) -{ - this->connection_role_ = 'S'; - this->msg_queue ()->high_water_mark (0); -} - -// Receive an Event from a Supplier. Handles fragmentation. -// -// The event returned from recv consists of two parts: -// -// 1. The Address part, contains the "virtual" routing id. -// -// 2. The Data part, which contains the actual data to be forwarded. -// -// The reason for having two parts is to shield the higher layers -// of software from knowledge of the event structure. - -int -Supplier_Handler::recv (ACE_Message_Block *&forward_addr) -{ - if (this->msg_frag_ == 0) - // No existing fragment... - ACE_NEW_RETURN (this->msg_frag_, - ACE_Message_Block (sizeof (Event), - ACE_Message_Block::MB_DATA, - 0, - 0, - 0, - Options::instance ()->locking_strategy ()), - -1); - - Event *event = (Event *) this->msg_frag_->rd_ptr (); - ssize_t header_received = 0; - - const size_t HEADER_SIZE = sizeof (Event_Header); - ssize_t header_bytes_left_to_read = - HEADER_SIZE - this->msg_frag_->length (); - - if (header_bytes_left_to_read > 0) - { - header_received = this->peer ().recv - (this->msg_frag_->wr_ptr (), header_bytes_left_to_read); - - if (header_received == -1 /* error */ - || header_received == 0 /* EOF */) - { - ACE_ERROR ((LM_ERROR, "%p\n", - "Recv error during header read ")); - ACE_DEBUG ((LM_DEBUG, - "attempted to read %d\n", - header_bytes_left_to_read)); - this->msg_frag_ = this->msg_frag_->release (); - return header_received; - } - - // Bump the write pointer by the amount read. - this->msg_frag_->wr_ptr (header_received); - - // At this point we may or may not have the ENTIRE header. - if (this->msg_frag_->length () < HEADER_SIZE) - { - ACE_DEBUG ((LM_DEBUG, - "Partial header received: only %d bytes\n", - this->msg_frag_->length ())); - // Notify the caller that we didn't get an entire event. - errno = EWOULDBLOCK; - return -1; - } - - // Convert the header into host byte order so that we can access - // it directly without having to repeatedly muck with it... - event->header_.decode (); - - if (event->header_.len_ > ACE_INT32 (sizeof event->data_)) - { - // This data_ payload is too big! - errno = EINVAL; - ACE_DEBUG ((LM_DEBUG, - "Data payload is too big (%d bytes)\n", - event->header_.len_)); - return -1; - } - - } - - // At this point there is a complete, valid header in Event. Now we - // need to get the event payload. Due to incomplete reads this may - // not be the first time we've read in a fragment for this message. - // We account for this here. Note that the first time in here - // msg_frag_->wr_ptr() will point to event->data_. Every time we do - // a successful fragment read, we advance wr_ptr(). Therefore, by - // subtracting how much we've already read from the - // event->header_.len_ we complete the data_bytes_left_to_read... - - ssize_t data_bytes_left_to_read = - ssize_t (event->header_.len_ - (msg_frag_->wr_ptr () - event->data_)); - - ssize_t data_received = - !data_bytes_left_to_read - ? 0 // peer().recv() should not be called when data_bytes_left_to_read is 0. - : this->peer ().recv (this->msg_frag_->wr_ptr (), data_bytes_left_to_read); - - // Try to receive the remainder of the event. - - switch (data_received) - { - case -1: - if (errno == EWOULDBLOCK) - // This might happen if only the header came through. - return -1; - else - /* FALLTHROUGH */; - - case 0: // Premature EOF. - if (data_bytes_left_to_read) - { - this->msg_frag_ = this->msg_frag_->release (); - return 0; - } - /* FALLTHROUGH */; - - default: - // Set the write pointer at 1 past the end of the event. - this->msg_frag_->wr_ptr (data_received); - - if (data_received != data_bytes_left_to_read) - { - errno = EWOULDBLOCK; - // Inform caller that we didn't get the whole event. - return -1; - } - else - { - // Set the read pointer to the beginning of the event. - this->msg_frag_->rd_ptr (this->msg_frag_->base ()); - - // Allocate an event forwarding header and chain the data - // portion onto its continuation field. - forward_addr = new ACE_Message_Block (sizeof (Event_Key), - ACE_Message_Block::MB_PROTO, - this->msg_frag_, - 0, - 0, - Options::instance ()->locking_strategy ()); - if (forward_addr == 0) - { - this->msg_frag_ = this->msg_frag_->release (); - errno = ENOMEM; - return -1; - } - - Event_Key event_addr (this->connection_id (), - event->header_.type_); - // Copy the forwarding address from the Event_Key into - // forward_addr. - forward_addr->copy ((char *) &event_addr, sizeof (Event_Key)); - - // Reset the pointer to indicate we've got an entire event. - this->msg_frag_ = 0; - } - - this->total_bytes (data_received + header_received); - ACE_DEBUG ((LM_DEBUG, - "(%t) connection id = %d, cur len = %d, total bytes read = %d\n", - event->header_.connection_id_, - event->header_.len_, - data_received + header_received)); - if (Options::instance ()->enabled (Options::VERBOSE)) - ACE_DEBUG ((LM_DEBUG, - "data_ = %*s\n", - event->header_.len_ - 2, - event->data_)); - - // Encode before returning so that we can set things out in - // network byte order. - event->header_.encode (); - return data_received + header_received; - } -} - -// Receive various types of input (e.g., Peer event from the gatewayd, -// as well as stdio). - -int -Supplier_Handler::handle_input (ACE_HANDLE) -{ - ACE_Message_Block *event_key = 0; - - switch (this->recv (event_key)) - { - case 0: - // Note that a peer shouldn't initiate a shutdown by closing the - // connection. Therefore, the peer must have crashed, so we'll - // need to bail out here and let the higher layers reconnect. - this->state (Connection_Handler::FAILED); - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) Peer has closed down unexpectedly for Input Connection_Handler %d\n", - this->connection_id ()), - -1); - /* NOTREACHED */ - case -1: - if (errno == EWOULDBLOCK) - // A short-read, we'll come back and finish it up later on! - return 0; - else // A weird problem occurred, shut down and start again. - { - this->state (Connection_Handler::FAILED); - ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p for Input Connection_Handler %d\n", - "Peer has failed unexpectedly", - this->connection_id ()), - -1); - } - /* NOTREACHED */ - default: - // Route messages to Consumers. - return this->process (event_key); - } -} - -// This delegates to the to do the actual processing. -// Typically, this forwards the event to its appropriate Consumer(s). - -int -Supplier_Handler::process (ACE_Message_Block *event_key) -{ - return this->event_channel_->put (event_key); -} - -Thr_Consumer_Handler::Thr_Consumer_Handler (const Connection_Config_Info &pci) - : Consumer_Handler (pci) -{ - // It is not in thread svc() now. - in_thread_ = 0; -} - -// Overriding handle_close() method. If in thread svc(), no need to -// process handle_close() when call peer().close(), because the -// connection is blocked now. - -int -Thr_Consumer_Handler::handle_close (ACE_HANDLE h, ACE_Reactor_Mask m) -{ - if (in_thread_) - return 0; - else - return Consumer_Handler::handle_close (h, m); -} - -// This method should be called only when the Consumer shuts down -// unexpectedly. This method marks the Connection_Handler as having -// failed and deactivates the ACE_Message_Queue (to wake up the thread -// blocked on in svc()). -// Thr_Consumer_Handler::handle_close () will eventually try to -// reconnect... - -// Let Consumer_Handler receive normal data. -int -Thr_Consumer_Handler::handle_input (ACE_HANDLE h) -{ - // Call down to the to handle this first. - if (this->Consumer_Handler::handle_input (h) != 0) - { - // Only do such work when failed. - - ACE_Reactor::instance ()->remove_handler - (h, ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL); - - // Deactivate the queue while we try to get reconnected. - this->msg_queue ()->deactivate (); - // Will call handle_close. - return -1; - } - return 0; -} - -// Initialize the threaded Consumer_Handler object and spawn a new -// thread. - -int -Thr_Consumer_Handler::open (void *) -{ - // Turn off non-blocking I/O. - if (this->peer ().disable (ACE_NONBLOCK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "disable"), - -1); // Incorrect info fixed. - - // Call back to the to complete our initialization. - else if (this->event_channel_->complete_connection_connection (this) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "complete_connection_connection"), - -1); - - // Register ourselves to receive input events (which indicate that - // the Consumer has shut down unexpectedly). - else if (ACE_Reactor::instance ()->register_handler - (this, ACE_Event_Handler::READ_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "register_handler"), - -1); - - // Reactivate message queue. If it was active then this is the - // first time in and we need to spawn a thread, otherwise the queue - // was inactive due to some problem and we've already got a thread. - else if (this->msg_queue ()->activate () == ACE_Message_Queue::WAS_ACTIVE) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) spawning new thread\n")); - // Become an active object by spawning a new thread to transmit - // events to Consumers. - return this->activate (THR_NEW_LWP | THR_DETACHED); - } - else - { - ACE_DEBUG ((LM_DEBUG, - "(%t) reusing existing thread\n")); - return 0; - } -} - -// Queue up an event for transmission (must not block since -// Supplier_Handlers may be single-threaded). - -int -Thr_Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *) -{ - // Perform non-blocking enqueue, i.e., if is full - // *don't* block! - return this->msg_queue ()->enqueue_tail - (mb, (ACE_Time_Value *) &ACE_Time_Value::zero); -} - -// Transmit events to the peer. Note the simplification resulting -// from the use of threads, compared with the Reactive solution. - -int -Thr_Consumer_Handler::svc (void) -{ - for (in_thread_ = 1;;) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) Thr_Consumer_Handler's handle = %d\n", - this->peer ().get_handle ())); - - // Since this method runs in its own thread it is OK to block on - // output. - - for (ACE_Message_Block *mb = 0; - this->msg_queue ()->dequeue_head (mb) != -1; - ) - if (this->send (mb) == -1) - ACE_ERROR ((LM_ERROR, - "(%t) %p\n", - "send failed")); - - ACE_ASSERT (errno == ESHUTDOWN); - - ACE_DEBUG ((LM_DEBUG, - "(%t) shutting down threaded Consumer_Handler %d on handle %d\n", - this->connection_id (), - this->get_handle ())); - - this->peer ().close (); - - // Re-establish the connection, using exponential backoff. - for (this->timeout (1); - // Default is to reconnect synchronously. - this->event_channel_->initiate_connection_connection (this, 1) == -1; - // Second parameter '1' means using sync mode directly, - // don't care Options::blocking_semantics(). If don't do - // so, async mode will be used to connect which won't - // satisfy original design. - ) - { - ACE_Time_Value tv (this->timeout ()); - - ACE_ERROR ((LM_ERROR, - "(%t) reattempting connection, sec = %d\n", - tv.sec ())); - - ACE_OS::sleep (tv); - } - } - - ACE_NOTREACHED (return 0;) -} - -Thr_Supplier_Handler::Thr_Supplier_Handler (const Connection_Config_Info &pci) - : Supplier_Handler (pci) -{ - // It is not in thread svc() now. - in_thread_ = 0; -} - -// Overriding handle_close() method. If in thread svc(), no need to -// process handle_close() when call peer().close(), because the -// connection is blocked now. - -int -Thr_Supplier_Handler::handle_close (ACE_HANDLE h, ACE_Reactor_Mask m) -{ - if (in_thread_) - return 0; - else - return Supplier_Handler::handle_close (h, m); -} - -int -Thr_Supplier_Handler::open (void *) -{ - // Turn off non-blocking I/O. - if (this->peer ().disable (ACE_NONBLOCK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "disable"), - -1); // Incorrect info fixed. - - // Call back to the to complete our initialization. - else if (this->event_channel_->complete_connection_connection (this) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "complete_connection_connection"), - -1); - - // Reactivate message queue. If it was active then this is the - // first time in and we need to spawn a thread, otherwise the queue - // was inactive due to some problem and we've already got a thread. - else if (this->msg_queue ()->activate () == ACE_Message_Queue::WAS_ACTIVE) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) spawning new thread\n")); - // Become an active object by spawning a new thread to transmit - // events to peers. - return this->activate (THR_NEW_LWP | THR_DETACHED); - } - else - { - ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n")); - return 0; - } -} - -// Receive events from a Peer in a separate thread (note reuse of -// existing code!). - -int -Thr_Supplier_Handler::svc (void) -{ - for (in_thread_ = 1;;) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) Thr_Supplier_Handler's handle = %d\n", - this->peer ().get_handle ())); - - // Since this method runs in its own thread and processes events - // for one connection it is OK to call down to the - // method, which blocks on - // input. - - while (this->Supplier_Handler::handle_input () != -1) - continue; - - ACE_DEBUG ((LM_DEBUG, - "(%t) shutting down threaded Supplier_Handler %d on handle %d\n", - this->connection_id (), - this->get_handle ())); - - this->peer ().close (); - - // Deactivate the queue while we try to get reconnected. - this->msg_queue ()->deactivate (); - - // Re-establish the connection, using expoential backoff. - for (this->timeout (1); - // Default is to reconnect synchronously. - this->event_channel_->initiate_connection_connection (this, 1) == -1; - // Second parameter '1' means using sync mode directly, - // don't care Options::blocking_semantics(). If don't do - // so, async mode will be used to connect which won't - // satisfy original design. - ) - { - ACE_Time_Value tv (this->timeout ()); - ACE_ERROR ((LM_ERROR, - "(%t) reattempting connection, sec = %d\n", - tv.sec ())); - ACE_OS::sleep (tv); - } - } - ACE_NOTREACHED(return 0); -} diff --git a/apps/Gateway/Gateway/Concrete_Connection_Handlers.h b/apps/Gateway/Gateway/Concrete_Connection_Handlers.h deleted file mode 100644 index 287a4c8ec34..00000000000 --- a/apps/Gateway/Gateway/Concrete_Connection_Handlers.h +++ /dev/null @@ -1,151 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Concrete_Connection_Handlers.h -// -// = DESCRIPTION -// These are all the subclasses of Connection_Handler that define the -// appropriate threaded/reactive Consumer/Supplier behavior. -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef CONCRETE_CONNECTION_HANDLER -#define CONCRETE_CONNECTION_HANDLER - -#include "Connection_Handler.h" - -class Supplier_Handler : public Connection_Handler -{ - // = TITLE - // Handles reception of Events from Suppliers. - // - // = DESCRIPTION - // Performs framing and error checking on Events. Intended to - // run reactively, i.e., in one thread of control using a - // Reactor for demuxing and dispatching. -public: - // = Initialization method. - Supplier_Handler (const Connection_Config_Info &); - -protected: - // = All the following methods are upcalls, so they can be protected. - - virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE); - // Receive and process peer events. - - virtual int recv (ACE_Message_Block *&); - // Receive an event from a Supplier. - - int process (ACE_Message_Block *event); - // This delegates to the to do the actual - // processing. Typically, it forwards the to its - // appropriate Consumer. - - ACE_Message_Block *msg_frag_; - // Keep track of event fragment to handle non-blocking recv's from - // Suppliers. -}; - -class Consumer_Handler : public Connection_Handler -{ - // = TITLE - // Handles transmission of events to Consumers. - // - // = DESCRIPTION - // Performs queueing and error checking. Intended to run - // reactively, i.e., in one thread of control using a Reactor - // for demuxing and dispatching. Also uses a Reactor to handle - // flow controlled output connections. -public: - // = Initialization method. - Consumer_Handler (const Connection_Config_Info &); - - virtual int put (ACE_Message_Block *event, - ACE_Time_Value * = 0); - // Send an event to a Consumer (may be queued if necessary). - -protected: - virtual int handle_output (ACE_HANDLE); - // Finish sending event when flow control conditions abate. - - int nonblk_put (ACE_Message_Block *mb); - // Perform a non-blocking put(). - - virtual ssize_t send (ACE_Message_Block *); - // Send an event to a Consumer. - - virtual int handle_input (ACE_HANDLE); - // Receive and process shutdowns from a Consumer. -}; - -class Thr_Consumer_Handler : public Consumer_Handler -{ - // = TITLE - // Runs each in a separate thread. -public: - Thr_Consumer_Handler (const Connection_Config_Info &); - - virtual int open (void *); - // Initialize the threaded Consumer_Handler object and spawn a new - // thread. - - virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0); - // Send a message to a peer. - -protected: - virtual int handle_input (ACE_HANDLE); - // Called when Peer shutdown unexpectedly. - - virtual int svc (void); - // Transmit peer messages. - - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - // When thread started, connection become blocked, so no need to use - // handle_close to reinitiate the connection_handler, so should - // override this function to justify if controlling is in thread or - // not. If yes, handle_close do nothing, otherwise, it call parent - // handle_close(). - -private: - int in_thread_; - // If the controlling is in thread's svc() or not. -}; - -class Thr_Supplier_Handler : public Supplier_Handler -{ - // = TITLE - // Runs each in a separate thread. -public: - Thr_Supplier_Handler (const Connection_Config_Info &pci); - - virtual int open (void *); - // Initialize the object and spawn a new thread. - -protected: - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - // When thread started, connection become blocked, so no need to use - // handle_close to reinitiate the connection_handler, so should - // override this function to justify if controlling is in thread or - // not. If yes, handle_close do nothing, otherwise, it call parent - // handle_close(). - - virtual int svc (void); - // Transmit peer messages. - -private: - int in_thread_; - // If the controlling is in thread's svc() or not. -}; - -#endif /* CONCRETE_CONNECTION_HANDLER */ diff --git a/apps/Gateway/Gateway/Config_Files.cpp b/apps/Gateway/Gateway/Config_Files.cpp deleted file mode 100644 index 0e3d776227e..00000000000 --- a/apps/Gateway/Gateway/Config_Files.cpp +++ /dev/null @@ -1,222 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "Config_Files.h" -#include "Options.h" - -ACE_RCSID(Gateway, Config_Files, "$Id$") - -// This fixes a nasty bug with cfront-based compilers (like -// Centerline). -typedef FP::Return_Type FP_RETURN_TYPE; - -FP_RETURN_TYPE -Consumer_Config_File_Parser::read_entry (Consumer_Config_Info &entry, - int &line_number) -{ - FP_RETURN_TYPE result; - - // Increment the line count. - line_number++; - - // Ignore comments, check for EOF and EOLINE if this succeeds, we - // have our connection id. - - while ((result = this->getint (entry.connection_id_)) != FP::SUCCESS) - if (result == FP::EOFILE) - return FP::EOFILE; - else if (result == FP::EOLINE - || result == FP::COMMENT) - line_number++; - - // Get the payload type. - result = this->getint (entry.type_); - if (result != FP::SUCCESS) - return result; - - // get all the consumers. - entry.total_consumers_ = 0; - - while ((result = this->getint - (entry.consumers_[entry.total_consumers_])) == FP::SUCCESS) - ++entry.total_consumers_; // do nothing (should check against max...) - - if (result == FP::EOLINE || result == FP::EOFILE) - return FP::SUCCESS; - else - return result; -} - -FP_RETURN_TYPE -Connection_Config_File_Parser::read_entry (Connection_Config_Info &entry, - int &line_number) -{ - char buf[BUFSIZ]; - FP_RETURN_TYPE result; - - // Increment the line count. - line_number++; - - // Ignore comments, check for EOF and EOLINE if this succeeds, we - // have our connection id - - while ((result = this->getint (entry.connection_id_)) != FP::SUCCESS) - if (result == FP::EOFILE) - return FP::EOFILE; - else if (result == FP::EOLINE - || result == FP::COMMENT) - line_number++; - - // Get the hostname. - result = this->getword (entry.host_); - if (result != FP::SUCCESS) - return result; - - ACE_INT32 port; - - // Get the port number. - result = this->getint (port); - if (result == FP::DEFAULT) - { - // Get the proxy role, i.e., 'C' (Consumer) or 'S' (Supplier). - result = this->getword (buf); - if (result != FP::SUCCESS) - return result; - else - entry.connection_role_ = buf[0]; - - if (entry.connection_role_ == 'C') - entry.remote_port_ = Options::instance ()->consumer_connector_port (); - else if (entry.connection_role_ == 'S') - entry.remote_port_ = Options::instance ()->supplier_connector_port (); - else - // Yikes, this is a *weird* error! - entry.remote_port_ = 0; - } - else if (result != FP::SUCCESS) - return result; - else - { - entry.remote_port_ = (unsigned short) port; - - // Get the proxy role, i.e., 'C' (Consumer) or 'S' (Supplier). - result = this->getword (buf); - if (result != FP::SUCCESS) - return result; - else - entry.connection_role_ = buf[0]; - } - - // Get the max retry delay. - result = this->getint (entry.max_retry_timeout_); - if (result == FP::DEFAULT) - entry.max_retry_timeout_ = Options::instance ()->max_timeout (); - else if (result != FP::SUCCESS) - return result; - - // Get the local port number. - result = this->getint (port); - if (result == FP::DEFAULT) - entry.local_port_ = 0; // @@ Should make this an option. - else if (result != FP::SUCCESS) - return result; - else - entry.local_port_ = (unsigned short) port; - - ACE_INT32 priority; - - // Get the priority. - result = this->getint (priority); - if (result != FP::SUCCESS) - return result; - else - entry.priority_ = priority; - - return FP::SUCCESS; -} - -#if defined (DEBUGGING) -int -main (int argc, char *argv[]) -{ - FP_RETURN_TYPE result; - int line_number = 0; - - { - Connection_Config_Info entry; - Connection_Config_File_Parser connection_config_file; - - connection_config_file.open (argc > 1 ? argv[1] : "connection_config"); - - int line_number = 0; - - ACE_DEBUG ((LM_DEBUG, - "ConnID\tHost\t\tRPort\tRole\tRetry\tLPort\tPriority\n")); - - // Read config file line at a time. - while ((result = connection_config_file.read_entry (entry, line_number)) != FP::EOFILE) - if (result == FP::PARSE_ERROR) - ACE_DEBUG ((LM_DEBUG, - "Error line %d.\n", - line_number)); - else - ACE_DEBUG ((LM_DEBUG, - "%d\t%s\t%d\t%c\t%d\t%d\t%d\n", - entry.connection_id_, - entry.host_, - entry.remote_port_, - entry.connection_role_, - entry.max_retry_timeout_, - entry.local_port_, - entry.priority_)); - - connection_config_file.close (); - } - - { - Consumer_Config_Info entry; - Consumer_Config_File_Parser consumer_config_file; - - consumer_config_file.open (argc > 2 ? argv[2] : "consumer_config"); - - line_number = 0; - - ACE_DEBUG ((LM_DEBUG, - "\nConnID\tLogic\tPayload\tDestinations\n")); - - // Read config file line at a time. - while ((result = consumer_config_file.read_entry (entry, line_number)) != FP::EOFILE) - if (result == FP::PARSE_ERROR) - ACE_DEBUG ((LM_DEBUG, - "Error line %d.\n", - line_number)); - else - { - ACE_DEBUG ((LM_DEBUG, - "%d\t%d\t", - entry.connection_id_, - entry.type_)); - - while (--entry.total_consumers_ >= 0) - ACE_DEBUG ((LM_DEBUG, - "%d,", - entry.consumers_[entry.total_consumers_])); - ACE_DEBUG ((LM_DEBUG, - "\n")); - } - - consumer_config_file.close (); - } - - return 0; -} -#endif /* DEBUGGING */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class File_Parser; -template class File_Parser; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate File_Parser -#pragma instantiate File_Parser -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/Gateway/Gateway/Config_Files.h b/apps/Gateway/Gateway/Config_Files.h deleted file mode 100644 index 9fd96b687f6..00000000000 --- a/apps/Gateway/Gateway/Config_Files.h +++ /dev/null @@ -1,98 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Config_Files.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef _CONFIG_FILES -#define _CONFIG_FILES - -#include "File_Parser.h" -#include "Event.h" - -// Forward declaration. -class Event_Channel; - -class Connection_Config_Info - // = TITLE - // Stores connection configuration information. -{ -public: - ACE_INT32 connection_id_; - // Connection id for this Connection_Handler. - - char host_[BUFSIZ]; - // Host to connect with. - - u_short remote_port_; - // Port to connect with. - - char connection_role_; - // 'S' (supplier) or 'C' (consumer). - - ACE_INT32 max_retry_timeout_; - // Maximum amount of time to wait for reconnecting. - - u_short local_port_; - // Our local port number. - - ACE_INT32 priority_; - // Priority by which different Consumers and Suppliers should be - // serviced. - - Event_Channel *event_channel_; - // We just need a place to store this until we can pass it along - // when creating a Connection_Handler. -}; - -class Connection_Config_File_Parser : public File_Parser - // = TITLE - // Parser for the Connection_Handler Connection file. -{ -public: - virtual FP::Return_Type read_entry (Connection_Config_Info &entry, - int &line_number); - // Read in a entry. - -}; - -class Consumer_Config_Info - // = TITLE - // Stores the information in a Consumer Map entry. -{ -public: - ACE_INT32 connection_id_; - // Connection id. - - ACE_INT32 type_; - // Message type. - - ACE_INT32 consumers_[MAX_CONSUMERS]; - // Connection ids for consumers that will be routed information - // containing this - - ACE_INT32 total_consumers_; - // Total number of these consumers. -}; - -class Consumer_Config_File_Parser : public File_Parser - // = TITLE - // Parser for the Consumer Map file. -{ -public: - virtual FP::Return_Type read_entry (Consumer_Config_Info &entry, - int &line_number); - // Read in a entry. -}; - -#endif /* _CONFIG_FILES */ diff --git a/apps/Gateway/Gateway/Connection_Handler.cpp b/apps/Gateway/Gateway/Connection_Handler.cpp deleted file mode 100644 index 95212a7b2c7..00000000000 --- a/apps/Gateway/Gateway/Connection_Handler.cpp +++ /dev/null @@ -1,289 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "Event_Channel.h" -#include "Concrete_Connection_Handlers.h" - -ACE_RCSID(Gateway, Connection_Handler, "$Id$") - -Event_Channel * -Connection_Handler::event_channel (void) const -{ - return this->event_channel_; -} - -void -Connection_Handler::event_channel (Event_Channel *ec) -{ - this->event_channel_ = ec; -} - -void -Connection_Handler::connection_id (CONNECTION_ID id) -{ - this->connection_id_ = id; -} - -CONNECTION_ID -Connection_Handler::connection_id (void) const -{ - return this->connection_id_; -} - -// The total number of bytes sent/received on this Proxy. - -size_t -Connection_Handler::total_bytes (void) const -{ - return this->total_bytes_; -} - -void -Connection_Handler::total_bytes (size_t bytes) -{ - this->total_bytes_ += bytes; -} - -Connection_Handler::Connection_Handler (void) -{ -} - -Connection_Handler::Connection_Handler (const Connection_Config_Info &pci) - : remote_addr_ (pci.remote_port_, pci.host_[0] == '\0' ? ACE_DEFAULT_SERVER_HOST : pci.host_), - local_addr_ (pci.local_port_), - connection_id_ (pci.connection_id_), - total_bytes_ (0), - state_ (Connection_Handler::IDLE), - timeout_ (1), - max_timeout_ (pci.max_retry_timeout_), - event_channel_ (pci.event_channel_) -{ - // Set the priority of the Proxy. - this->priority (int (pci.priority_)); -} - -// Set the connection_role. - -void -Connection_Handler::connection_role (char d) -{ - this->connection_role_ = d; -} - -// Get the connection_role. - -char -Connection_Handler::connection_role (void) const -{ - return this->connection_role_; -} - -// Sets the timeout delay. - -void -Connection_Handler::timeout (int to) -{ - if (to > this->max_timeout_) - to = this->max_timeout_; - - this->timeout_ = to; -} - -// Re-calculate the current retry timeout delay using exponential -// backoff. Returns the original timeout (i.e., before the -// re-calculation). - -int -Connection_Handler::timeout (void) -{ - int old_timeout = this->timeout_; - this->timeout_ *= 2; - - if (this->timeout_ > this->max_timeout_) - this->timeout_ = this->max_timeout_; - - return old_timeout; -} - -// Sets the max timeout delay. - -void -Connection_Handler::max_timeout (int mto) -{ - this->max_timeout_ = mto; -} - -// Gets the max timeout delay. - -int -Connection_Handler::max_timeout (void) const -{ - return this->max_timeout_; -} - -// Restart connection asynchronously when timeout occurs. - -int -Connection_Handler::handle_timeout (const ACE_Time_Value &, - const void *) -{ - ACE_DEBUG ((LM_DEBUG, - "(%t) attempting to reconnect Connection_Handler %d with timeout = %d\n", - this->connection_id (), - this->timeout_)); - - // Delegate the re-connection attempt to the Event Channel. - this->event_channel_->initiate_connection_connection (this); - - return 0; -} - -// Handle shutdown of the Connection_Handler object. - -int -Connection_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) -{ - ACE_DEBUG ((LM_DEBUG, - "(%t) shutting down %s Connection_Handler %d on handle %d\n", - this->connection_role () == 'C' ? "Consumer" : "Supplier", - this->connection_id (), - this->get_handle ())); - - // Restart the connection, if possible. - return this->event_channel_->reinitiate_connection_connection (this); -} - -// Set the state of the Proxy. - -void -Connection_Handler::state (Connection_Handler::State s) -{ - this->state_ = s; -} - -// Return the current state of the Proxy. - -Connection_Handler::State -Connection_Handler::state (void) const -{ - return this->state_; -} - -// Upcall from the or that delegates -// control to our Connection_Handler. - -int -Connection_Handler::open (void *) -{ - ACE_DEBUG ((LM_DEBUG, "(%t) %s Connection_Handler's handle = %d\n", - this->connection_role () == 'C' ? "Consumer" : "Supplier", - this->peer ().get_handle ())); - - // Call back to the to complete our initialization. - if (this->event_channel_->complete_connection_connection (this) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "complete_connection_connection"), -1); - - // Turn on non-blocking I/O. - else if (this->peer ().enable (ACE_NONBLOCK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1); - - // Register ourselves to receive input events. - else if (ACE_Reactor::instance ()->register_handler - (this, ACE_Event_Handler::READ_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1); - else - return 0; -} - -const ACE_INET_Addr & -Connection_Handler::remote_addr (void) const -{ - return this->remote_addr_; -} - -void -Connection_Handler::remote_addr (ACE_INET_Addr &ra) -{ - this->remote_addr_ = ra; -} - -const ACE_INET_Addr & -Connection_Handler::local_addr (void) const -{ - return this->local_addr_; -} - -void -Connection_Handler::local_addr (ACE_INET_Addr &la) -{ - this->local_addr_ = la; -} - -// Make the appropriate type of (i.e., -// , , , or -// ). - -Connection_Handler * -Connection_Handler_Factory::make_connection_handler (const Connection_Config_Info &pci) -{ - Connection_Handler *connection_handler = 0; - - // The next few lines of code are dependent on whether we are making - // a threaded/reactive Supplier_Handler/Consumer_Handler. - - if (pci.connection_role_ == 'C') // Configure a Consumer_Handler. - { - // Create a threaded Consumer_Handler. - if (ACE_BIT_ENABLED (Options::instance ()->threading_strategy (), - Options::OUTPUT_MT)) - ACE_NEW_RETURN (connection_handler, - Thr_Consumer_Handler (pci), - 0); - - // Create a reactive Consumer_Handler. - else - ACE_NEW_RETURN (connection_handler, - Consumer_Handler (pci), - 0); - } - else // connection_role == 'S', so configure a Supplier_Handler. - { - // Create a threaded Supplier_Handler. - if (ACE_BIT_ENABLED (Options::instance ()->threading_strategy (), - Options::INPUT_MT)) - ACE_NEW_RETURN (connection_handler, - Thr_Supplier_Handler (pci), - 0); - - // Create a reactive Supplier_Handler. - else - ACE_NEW_RETURN (connection_handler, - Supplier_Handler (pci), - 0); - } - - return connection_handler; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Map_Entry; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Manager; -template class ACE_Svc_Handler; -#if defined (ACE_HAS_THREADS) -template class ACE_Svc_Handler; -#endif /* ACE_HAS_THREADS */ -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Map_Entry -#pragma instantiate ACE_Map_Iterator -#pragma instantiate ACE_Map_Reverse_Iterator -#pragma instantiate ACE_Map_Iterator_Base -#pragma instantiate ACE_Map_Manager -#pragma instantiate ACE_Svc_Handler -#if defined (ACE_HAS_THREADS) -#pragma instantiate ACE_Svc_Handler -#endif /* ACE_HAS_THREADS */ -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/Gateway/Gateway/Connection_Handler.h b/apps/Gateway/Gateway/Connection_Handler.h deleted file mode 100644 index 3003a81874e..00000000000 --- a/apps/Gateway/Gateway/Connection_Handler.h +++ /dev/null @@ -1,157 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Connection_Handler.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef _CONNECTION_HANDLER -#define _CONNECTION_HANDLER - -#include "ace/Service_Config.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK_Connector.h" -#include "ace/Svc_Handler.h" -#include "Config_Files.h" -#include "Options.h" -#include "Event.h" - -// Forward declaration. -class Event_Channel; - -class Connection_Handler : public ACE_Svc_Handler -{ - // = TITLE - // contains info about connection state and - // addressing. - // - // = DESCRIPTION - // The classes process events sent to the - // Event Channel from Suppliers and forward them to Consumers. -public: - Connection_Handler (void); - // Default constructor (needed to make happy). - - Connection_Handler (const Connection_Config_Info &); - // Real constructor. - - virtual int open (void * = 0); - // Initialize and activate a single-threaded - // (called by ). - - // = The current state of the Connection_Handler. - enum State - { - IDLE = 1, // Prior to initialization. - CONNECTING, // During connection establishment. - ESTABLISHED, // Connection_Handler is established and active. - DISCONNECTING, // Connection_Handler is in the process of connecting. - FAILED // Connection_Handler has failed. - }; - - // = Set/get the current state. - void state (State); - State state (void) const; - - // = Set/get remote INET addr. - void remote_addr (ACE_INET_Addr &); - const ACE_INET_Addr &remote_addr (void) const; - - // = Set/get local INET addr. - void local_addr (ACE_INET_Addr &); - const ACE_INET_Addr &local_addr (void) const; - - // = Set/get connection id. - void connection_id (CONNECTION_ID); - CONNECTION_ID connection_id (void) const; - - // = Set/get the current retry timeout delay. - void timeout (int); - int timeout (void); - - // = Set/get the maximum retry timeout delay. - void max_timeout (int); - int max_timeout (void) const; - - // = Set/get proxy role (i.e., 'S' for Supplier and 'C' for Consumer - // (necessary for error checking). - void connection_role (char); - char connection_role (void) const; - - // = Set/get the *. - void event_channel (Event_Channel *); - Event_Channel *event_channel (void) const; - - // = The total number of bytes sent/received on this proxy. - void total_bytes (size_t bytes); - // Increment count by . - size_t total_bytes (void) const; - // Return the current byte count. - - virtual int handle_timeout (const ACE_Time_Value &, const void *arg); - // Perform timer-based Connection_Handler reconnection. - - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - // Perform Connection_Handler termination. - -protected: - ACE_INET_Addr remote_addr_; - // Address of peer. - - ACE_INET_Addr local_addr_; - // Address of us. - - CONNECTION_ID connection_id_; - // The assigned connection ID of this entry. - - size_t total_bytes_; - // The total number of bytes sent/received on this proxy. - - State state_; - // The current state of the proxy. - - int timeout_; - // Amount of time to wait between reconnection attempts. - - int max_timeout_; - // Maximum amount of time to wait between reconnection attempts. - - char connection_role_; - // Indicates which role the proxy plays ('S' == Supplier and 'C' == - // Consumer). - - Event_Channel *event_channel_; - // Reference to the that we use to forward all - // the events from Consumers and Suppliers. -}; - -class Connection_Handler_Factory -{ - // = TITLE - // Creates the appropriate type of . - // - // = DESCRIPTION - // s can include , - // , , or - // ). -public: - Connection_Handler *make_connection_handler (const Connection_Config_Info &); - // Make the appropriate type of , based on the - // parameter. -}; - -#endif /* _CONNECTION_HANDLER */ diff --git a/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp b/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp deleted file mode 100644 index 90c251ae8cc..00000000000 --- a/apps/Gateway/Gateway/Connection_Handler_Acceptor.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "Event_Channel.h" -#include "Connection_Handler_Acceptor.h" - -ACE_RCSID(Gateway, Connection_Handler_Acceptor, "$Id$") - -int -Connection_Handler_Acceptor::make_svc_handler (Connection_Handler *&ch) -{ - ACE_ALLOCATOR_RETURN (ch, - this->connection_handler_factory_.make_connection_handler (this->connection_config_info_), - -1); - return 0; -} - -int -Connection_Handler_Acceptor::accept_svc_handler (Connection_Handler *ch) -{ - if (this->inherited::accept_svc_handler (ch) == -1) - return -1; - else - { - ch->connection_id (Options::instance ()->connection_id ()); - ACE_INET_Addr remote_addr; - - if (ch->peer ().get_remote_addr (remote_addr) == -1) - return -1; - - // Set the remote address of our connected Peer. - ch->remote_addr (remote_addr); - - // Set the Event_Channel pointer. - ch->event_channel (&this->event_channel_); - - // Increment the connection ID by one. - Options::instance ()->connection_id ()++; - return 0; - } -} - -Connection_Handler_Acceptor::Connection_Handler_Acceptor (Event_Channel &ec, - char connection_role) - : event_channel_ (ec) -{ - this->connection_config_info_.connection_id_ = 0; - this->connection_config_info_.host_[0] = '\0'; - this->connection_config_info_.remote_port_ = 0; - this->connection_config_info_.connection_role_ = connection_role; - this->connection_config_info_.max_retry_timeout_ = Options::instance ()->max_timeout (); - this->connection_config_info_.local_port_ = 0; - this->connection_config_info_.priority_ = 1; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Acceptor; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Acceptor -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/apps/Gateway/Gateway/Connection_Handler_Acceptor.h b/apps/Gateway/Gateway/Connection_Handler_Acceptor.h deleted file mode 100644 index 777f58c4a5b..00000000000 --- a/apps/Gateway/Gateway/Connection_Handler_Acceptor.h +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Connection_Handler_acceptor.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef _CONNECTION_HANDLER_ACCEPTOR -#define _CONNECTION_HANDLER_ACCEPTOR - -#include "ace/Acceptor.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK_Acceptor.h" -#include "Connection_Handler.h" - -// Forward declaration -class Event_Channel; - -class Connection_Handler_Acceptor : public ACE_Acceptor -{ - // = TITLE - // A concrete factory class that setups connections to peerds - // and produces a new Connection_Handler object to do the dirty - // work... -public: - Connection_Handler_Acceptor (Event_Channel &, - char connection_role); - // Constructor. - - virtual int make_svc_handler (Connection_Handler *&ch); - // Hook method for creating an appropriate . - - virtual int accept_svc_handler (Connection_Handler *ch); - // Hook method for accepting a connection into the - // . - -protected: - typedef ACE_Acceptor - inherited; - // Make life easier later on. - - Event_Channel &event_channel_; - // Reference to the event channel. - - Connection_Config_Info connection_config_info_; - // Keeps track of what type of proxy we need to create. - - Connection_Handler_Factory connection_handler_factory_; - // Make the appropriate type of . -}; - -#endif /* _CONNECTION_HANDLER_ACCEPTOR */ diff --git a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp b/apps/Gateway/Gateway/Connection_Handler_Connector.cpp deleted file mode 100644 index d5a250cec60..00000000000 --- a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// $Id$ - -#include "Connection_Handler_Connector.h" - -ACE_RCSID(Gateway, Connection_Handler_Connector, "$Id$") - -Connection_Handler_Connector::Connection_Handler_Connector (void) -{ -} - -// Initiate (or reinitiate) a connection to the Connection_Handler. - -int -Connection_Handler_Connector::initiate_connection (Connection_Handler *connection_handler, - ACE_Synch_Options &synch_options) -{ - char addr_buf[MAXHOSTNAMELEN]; - - // Mark ourselves as idle so that the various iterators will ignore - // us until we are reconnected. - connection_handler->state (Connection_Handler::IDLE); - - // We check the remote addr second so that it remains in the - // addr_buf. - if (connection_handler->local_addr ().addr_to_string (addr_buf, sizeof addr_buf) == -1 - || connection_handler->remote_addr ().addr_to_string (addr_buf, sizeof addr_buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", - "can't obtain peer's address"), -1); - - // Try to connect to the Peer. - if (this->connect (connection_handler, - connection_handler->remote_addr (), - synch_options, - connection_handler->local_addr ()) == -1) - { - if (errno != EWOULDBLOCK) - { - connection_handler->state (Connection_Handler::FAILED); - ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", - "connect", addr_buf)); - return -1; - } - else - { - connection_handler->state (Connection_Handler::CONNECTING); - ACE_DEBUG ((LM_DEBUG, - "(%t) in the process of connecting to %s\n", - addr_buf)); - } - } - else - { - connection_handler->state (Connection_Handler::ESTABLISHED); - ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", - addr_buf, connection_handler->get_handle ())); - } - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Connector; -template class ACE_Svc_Tuple; -template class ACE_Map_Manager *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Entry *>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Connector -#pragma instantiate ACE_Svc_Tuple -#pragma instantiate ACE_Map_Manager *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Entry *> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/Gateway/Gateway/Connection_Handler_Connector.h b/apps/Gateway/Gateway/Connection_Handler_Connector.h deleted file mode 100644 index f4e7d7d06a1..00000000000 --- a/apps/Gateway/Gateway/Connection_Handler_Connector.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Connection_Handler_Connector.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef _IO_HANDLER_CONNECTOR -#define _IO_HANDLER_CONNECTOR - -#include "ace/Connector.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK_Connector.h" -#include "Connection_Handler.h" - -class Connection_Handler_Connector : public ACE_Connector -{ - // = TITLE - // A concrete factory class that setups connections to peerds - // and produces a new Connection_Handler object to do the dirty - // work... -public: - Connection_Handler_Connector (void); - - // Initiate (or reinitiate) a connection on the Connection_Handler. - int initiate_connection (Connection_Handler *, - ACE_Synch_Options & = ACE_Synch_Options::synch); - -}; - -#endif /* _IO_HANDLER_CONNECTOR */ diff --git a/apps/Gateway/Gateway/Consumer_Dispatch_Set.h b/apps/Gateway/Gateway/Consumer_Dispatch_Set.h deleted file mode 100644 index 3a5d0cf3e25..00000000000 --- a/apps/Gateway/Gateway/Consumer_Dispatch_Set.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// apps -// -// = FILENAME -// Consumer_Dispatch_Set.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef CONSUMER_DISPATCH_SET -#define CONSUMER_DISPATCH_SET - -#include "ace/Containers.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward reference. -class Connection_Handler; - -typedef ACE_Unbounded_Set Consumer_Dispatch_Set; -typedef ACE_Unbounded_Set_Iterator Consumer_Dispatch_Set_Iterator; - -#endif /* CONSUMER_DISPATCH_SET */ diff --git a/apps/Gateway/Gateway/Event.h b/apps/Gateway/Gateway/Event.h deleted file mode 100644 index fe4ae2c2272..00000000000 --- a/apps/Gateway/Gateway/Event.h +++ /dev/null @@ -1,223 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Event.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef EVENT_H -#define EVENT_H - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// = The following #defines should really be in a separate include -// file that is shared with the ../Peer/ directory. For now, we'll -// keep them here to simplify the sharing between the two directories. -// BTW, this is also the reason why all the methods are inlined... - -// Used by Peers to create Consumers in a Gateway. -#if !defined (DEFAULT_GATEWAY_CONSUMER_PORT) -#define DEFAULT_GATEWAY_CONSUMER_PORT 10009 -#endif /* DEFAULT_GATEWAY_CONSUMER_PORT */ - -// Used by Peers create Suppliers in a Gateway. -#if !defined (DEFAULT_GATEWAY_SUPPLIER_PORT) -#define DEFAULT_GATEWAY_SUPPLIER_PORT 10010 -#endif /* DEFAULT_GATEWAY_SUPPLIER_PORT */ - -// Used by a Gateway to create Consumers in a Peer. -#if !defined (DEFAULT_PEER_CONSUMER_PORT) -#define DEFAULT_PEER_CONSUMER_PORT 10011 -#endif /* DEFAULT_PEER_CONSUMER_PORT */ - -// Used by a Gateway to create Suppliers in a Peer. -#if !defined (DEFAULT_PEER_SUPPLIER_PORT) -#define DEFAULT_PEER_SUPPLIER_PORT 10012 -#endif /* DEFAULT_PEER_SUPPLIER_PORT */ - -#if !defined (MAX_CONSUMERS) -#define MAX_CONSUMERS 1000 -#endif /* MAX_CONSUMERS */ - -// This is the unique supplier identifier that denotes a particular -// in the Gateway. -typedef ACE_INT32 CONNECTION_ID; - -enum -{ - // = These are the types of events generated by the and - // handled by the . - - ROUTING_EVENT = 0, - // A normal event, which is forwarded to the . - - SUBSCRIPTION_EVENT = 1 - // A subscription to managed by the . -}; - -class Event_Key -{ - // = TITLE - // Address used to identify the source/destination of an event. - // - // = DESCRIPTION - // This is really a "processing descriptor" that is used to - // decouple the processing, filtering, and forwarding logic of - // the Event Channel from the format of the data. The - // and fields are copied from the - // class below. -public: - Event_Key (CONNECTION_ID cid = -1, - ACE_INT32 type = 0, - ACE_INT32 priority = 0) - : connection_id_ (cid), - type_ (type), - priority_ (priority) - { - } - - int operator== (const Event_Key &event_addr) const - { - return this->connection_id_ == event_addr.connection_id_ - && this->type_ == event_addr.type_; - } - - CONNECTION_ID connection_id_; - // Unique connection identifier that denotes a particular - // Connection_Handler. - - ACE_INT32 type_; - // Event type, e.g., or . - - ACE_INT32 priority_; - // Event priority. -}; - -class Event_Header -{ - // = TITLE - // Fixed sized header. - // - // = DESCRIPTION - // This is designed to have a sizeof (16) to avoid alignment - // problems on most platforms. -public: - enum - { - INVALID_ID = -1 // No peer can validly use this number. - }; - - Event_Header (ACE_INT32 len, - CONNECTION_ID connection_id, - ACE_INT32 type, - ACE_INT32 priority) - : len_ (len), - connection_id_ (connection_id), - type_ (type), - priority_ (priority) - { - } - - void decode (void) - { - this->len_ = ntohl (this->len_); - this->connection_id_ = ntohl (this->connection_id_); - this->type_ = ntohl (this->type_); - this->priority_ = ntohl (this->priority_); - } - // Decode from network byte order to host byte order. - - void encode (void) - { - this->len_ = htonl (this->len_); - this->connection_id_ = htonl (this->connection_id_); - this->type_ = htonl (this->type_); - this->priority_ = htonl (this->priority_); - } - // Encode from host byte order to network byte order. - - ACE_INT32 len_; - // Length of the data_ payload, in bytes. - - CONNECTION_ID connection_id_; - // Unique connection identifier that denotes a particular - // Connection_Handler. - - ACE_INT32 type_; - // Event type, e.g., or . - - ACE_INT32 priority_; - // Event priority. -}; - -class Event -{ - // = TITLE - // Variable-sized event (data_ may be variable-sized between - // 0 and MAX_PAYLOAD_SIZE). -public: - enum { MAX_PAYLOAD_SIZE = 1024 }; - // The maximum size of an Event. - - Event () : header_ (0, -1, 0, 0) {}; - - Event_Header header_; - // Event header. - - char data_[MAX_PAYLOAD_SIZE]; - // Event data. -}; - -class Subscription -{ - // = TITLE - // Allows Consumers to subscribe to be routed information - // arriving from a particular Supplier connection id. -public: - void decode (void) - { - this->connection_id_ = ntohl (this->connection_id_); - - for (ACE_INT32 i = 0; i < this->total_consumers_; i++) - this->consumers_[i] = ntohl (this->consumers_[i]); - - this->total_consumers_ = ntohl (this->total_consumers_); - } - // Decode from network byte order to host byte order. - - void encode (void) - { - this->connection_id_ = htonl (this->connection_id_); - - for (ACE_INT32 i = 0; i < this->total_consumers_; i++) - this->consumers_[i] = htonl (this->consumers_[i]); - - this->total_consumers_ = htonl (this->total_consumers_); - } - // Encode from host byte order to network byte order. - - ACE_INT32 connection_id_; - // Connection id. - - ACE_INT32 consumers_[MAX_CONSUMERS]; - // Connection ids for consumers that will be routed information - // containing this - - ACE_INT32 total_consumers_; - // Total number of these consumers. -}; - -#endif /* EVENT_H */ diff --git a/apps/Gateway/Gateway/Event_Channel.cpp b/apps/Gateway/Gateway/Event_Channel.cpp deleted file mode 100644 index 350a72a4c16..00000000000 --- a/apps/Gateway/Gateway/Event_Channel.cpp +++ /dev/null @@ -1,599 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "Connection_Handler_Connector.h" -#include "Event_Channel.h" - -ACE_RCSID(Gateway, Event_Channel, "$Id$") - -Event_Channel::~Event_Channel (void) -{ -} - -Event_Channel::Event_Channel (void) - : supplier_acceptor_ (*this, 'S'), - consumer_acceptor_ (*this, 'C') -{ -} - -int -Event_Channel::compute_performance_statistics (void) -{ - ACE_DEBUG ((LM_DEBUG, "(%t) doing the performance timeout here...\n")); - CONNECTION_MAP_ITERATOR cmi (this->connection_map_); - - // If we've got a then use it to suspend all - // the threads. This will enable us to get an accurate count. - - if (Options::instance ()->threading_strategy () - != Options::REACTIVE) - { - if (ACE_Thread_Manager::instance ()->suspend_all () == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "suspend_all"), - -1); - ACE_DEBUG ((LM_DEBUG, - "(%t) suspending all threads...")); - } - - size_t total_bytes_in = 0; - size_t total_bytes_out = 0; - - // Iterate through the connection map summing up the number of bytes - // sent/received. - - for (CONNECTION_MAP_ENTRY *me = 0; - cmi.next (me) != 0; - cmi.advance ()) - { - Connection_Handler *connection_handler = me->int_id_; - - if (connection_handler->connection_role () == 'C') - total_bytes_out += connection_handler->total_bytes (); - else // connection_handler->connection_role () == 'S' - total_bytes_in += connection_handler->total_bytes (); - } - - ACE_DEBUG ((LM_DEBUG, - "(%t) after %d seconds, \ntotal_bytes_in = %d\ntotal_bytes_out = %d\n", - Options::instance ()->performance_window (), - total_bytes_in, - total_bytes_out)); - - ACE_DEBUG ((LM_DEBUG, - "(%t) %f Mbits/sec received.\n", - (float) (total_bytes_in * 8 / - (float) (1024 * 1024 * Options::instance ()->performance_window ())))); - - ACE_DEBUG ((LM_DEBUG, - "(%t) %f Mbits/sec sent.\n", - (float) (total_bytes_out * 8 / - (float) (1024 * 1024 * Options::instance ()->performance_window ())))); - - // Resume all the threads again. - - if (Options::instance ()->threading_strategy () - != Options::REACTIVE) - { - if (ACE_Thread_Manager::instance ()->resume_all () == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "resume_all"), - -1); - ACE_DEBUG ((LM_DEBUG, - "(%t) resuming all threads...")); - } - - - return 0; -} - -int -Event_Channel::handle_timeout (const ACE_Time_Value &, - const void *) -{ - // This is called periodically to compute performance statistics. - return this->compute_performance_statistics (); -} - -int -Event_Channel::put (ACE_Message_Block *event, - ACE_Time_Value *) -{ - // We got a valid event, so determine its type, which is stored in - // the first of the two s, which are chained - // together by . - Event_Key *event_key = (Event_Key *) event->rd_ptr (); - - // Skip over the address portion and get the data, which is in the - // second . - ACE_Message_Block *data = event->cont (); - - switch (event_key->type_) - { - case ROUTING_EVENT: - this->routing_event (event_key, - data); - break; - case SUBSCRIPTION_EVENT: - this->subscription_event (data); - break; - } - - // Release the memory in the message block. - event->release (); - return 0; -} - -void -Event_Channel::subscription_event (ACE_Message_Block *data) -{ - Event *event = (Event *) data->rd_ptr (); - - ACE_DEBUG ((LM_DEBUG, - "(%t) received a subscription with %d bytes from connection id %d\n", - event->header_.len_, - event->header_.connection_id_)); - Subscription *subscription = (Subscription *) event->data_; - // Convert the subscription into host byte order so that we can - // access it directly without having to repeatedly muck with it... - subscription->decode (); - - ACE_DEBUG ((LM_DEBUG, - "(%t) connection_id_ = %d, total_consumers_ = %d\n", - subscription->connection_id_, - subscription->total_consumers_)); - - for (ACE_INT32 i = 0; - i < subscription->total_consumers_; - i++) - ACE_DEBUG ((LM_DEBUG, - "(%t) consumers_[%d] = %d\n", - i, - subscription->consumers_[i])); - -} - -void -Event_Channel::routing_event (Event_Key *forwarding_address, - ACE_Message_Block *data) -{ - Consumer_Dispatch_Set *dispatch_set = 0; - - // Initialize the to points to the set of Consumers - // associated with this forwarding address. - - if (this->efd_.find (*forwarding_address, - dispatch_set) == -1) - // Failure. - ACE_ERROR ((LM_DEBUG, - "(%t) find failed on connection id = %d, type = %d\n", - forwarding_address->connection_id_, - forwarding_address->type_)); - else - { - // Check to see if there are any consumers. - if (dispatch_set->size () == 0) - ACE_DEBUG ((LM_WARNING, - "there are no active consumers for this event currently\n")); - - else // There are consumers, so forward the event. - { - // Initialize the interator. - Consumer_Dispatch_Set_Iterator dsi (*dispatch_set); - - // At this point, we should assign a thread-safe locking - // strategy to the is we're running in a - // multi-threaded configuration. - data->locking_strategy (Options::instance ()->locking_strategy ()); - - for (Connection_Handler **connection_handler = 0; - dsi.next (connection_handler) != 0; - dsi.advance ()) - { - // Only process active connection_handlers. - if ((*connection_handler)->state () == Connection_Handler::ESTABLISHED) - { - // Duplicate the event portion via reference - // counting. - ACE_Message_Block *dup_msg = data->duplicate (); - - ACE_DEBUG ((LM_DEBUG, - "(%t) forwarding to Consumer %d\n", - (*connection_handler)->connection_id ())); - - if ((*connection_handler)->put (dup_msg) == -1) - { - if (errno == EWOULDBLOCK) // The queue has filled up! - ACE_ERROR ((LM_ERROR, - "(%t) %p\n", - "gateway is flow controlled, so we're dropping events")); - else - ACE_ERROR ((LM_ERROR, - "(%t) %p transmission error to peer %d\n", - "put", - (*connection_handler)->connection_id ())); - - // We are responsible for releasing an - // ACE_Message_Block if failures occur. - dup_msg->release (); - } - } - } - } - } -} - -int -Event_Channel::initiate_connection_connection (Connection_Handler *connection_handler, - int sync_directly) -{ - ACE_Synch_Options synch_options; - - if (sync_directly) - // In separated connection handler thread, connection can be - // initiated by block mode (synch mode) directly. - synch_options = ACE_Synch_Options::synch; - else if (Options::instance ()->blocking_semantics () == ACE_NONBLOCK) - synch_options = ACE_Synch_Options::asynch; - else - synch_options = ACE_Synch_Options::synch; - - return this->connector_.initiate_connection (connection_handler, - synch_options); -} - -int -Event_Channel::complete_connection_connection (Connection_Handler *connection_handler) -{ - int option = connection_handler->connection_role () == 'S' - ? SO_RCVBUF - : SO_SNDBUF; - int socket_queue_size = - Options::instance ()->socket_queue_size (); - - if (socket_queue_size > 0) - if (connection_handler->peer ().set_option (SOL_SOCKET, - option, - &socket_queue_size, - sizeof (int)) == -1) - ACE_ERROR ((LM_ERROR, - "(%t) %p\n", - "set_option")); - - connection_handler->thr_mgr (ACE_Thread_Manager::instance ()); - - // Our state is now "established." - connection_handler->state (Connection_Handler::ESTABLISHED); - - // Restart the timeout to 1. - connection_handler->timeout (1); - - ACE_INT32 id = htonl (connection_handler->connection_id ()); - - // Send the connection id to the peerd. - - ssize_t n = connection_handler->peer ().send ((const void *) &id, - sizeof id); - - if (n != sizeof id) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - n == 0 ? "peer has closed down unexpectedly" : "send"), - -1); - return 0; -} - -// Restart connection (blocking_semantics dicates whether we restart -// synchronously or asynchronously). - -int -Event_Channel::reinitiate_connection_connection (Connection_Handler *connection_handler) -{ - // Cancel asynchronous connecting before re-initializing. It will - // close the peer and cancel the asynchronous connecting. - this->cancel_connection_connection(connection_handler); - - if (connection_handler->state () != Connection_Handler::DISCONNECTING) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) scheduling reinitiation of Connection_Handler %d\n", - connection_handler->connection_id ())); - - // Reschedule ourselves to try and connect again. - if (ACE_Reactor::instance ()->schedule_timer - (connection_handler, - 0, - connection_handler->timeout ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "schedule_timer"), - -1); - } - return 0; -} - -// It is useful to provide a separate method to cancel the -// asynchronous connecting. - -int -Event_Channel::cancel_connection_connection (Connection_Handler *connection_handler) -{ - // Skip over proxies with deactivated handles. - if (connection_handler->get_handle () != ACE_INVALID_HANDLE) - { - // Make sure to close down peer to reclaim descriptor. - connection_handler->peer ().close (); - // Cancel asynchronous connecting before re-initializing. - return this->connector_.cancel(connection_handler); - } - return 0; -} - -// Initiate active connections with the Consumer and Supplier Peers. - -void -Event_Channel::initiate_connector (void) -{ - if (Options::instance ()->enabled - (Options::CONSUMER_CONNECTOR | Options::SUPPLIER_CONNECTOR)) - { - CONNECTION_MAP_ITERATOR cmi (this->connection_map_); - - // Iterate through the Consumer Map connecting all the - // Connection_Handlers. - - for (CONNECTION_MAP_ENTRY *me = 0; - cmi.next (me) != 0; - cmi.advance ()) - { - Connection_Handler *connection_handler = me->int_id_; - - if (this->initiate_connection_connection (connection_handler) == -1) - continue; // Failures are handled elsewhere... - } - } -} - -// Initiate passive acceptor to wait for Consumer and Supplier Peers -// to accept. - -int -Event_Channel::initiate_acceptors (void) -{ - if (Options::instance ()->enabled (Options::CONSUMER_ACCEPTOR)) - { - - if (this->consumer_acceptor_.open - (Options::instance ()->consumer_acceptor_port (), - ACE_Reactor::instance (), - Options::instance ()->blocking_semantics ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "cannot register acceptor"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "accepting Consumers at %d\n", - Options::instance ()->consumer_acceptor_port ())); - } - if (Options::instance ()->enabled (Options::SUPPLIER_ACCEPTOR)) - { - if(this->supplier_acceptor_.open - (Options::instance ()->supplier_acceptor_port (), - ACE_Reactor::instance (), - Options::instance ()->blocking_semantics ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "cannot register acceptor"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "accepting Suppliers at %d\n", - Options::instance ()->supplier_acceptor_port ())); - } - - return 0; -} - -// This method gracefully shuts down all the Handlers in the -// Connection_Handler Connection Map. - -int -Event_Channel::close (u_long) -{ - if (Options::instance ()->threading_strategy () != Options::REACTIVE) - { - if (ACE_Thread_Manager::instance ()->suspend_all () == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "suspend_all"), - -1); - ACE_DEBUG ((LM_DEBUG, - "(%t) suspending all threads\n")); - } - - // First tell everyone that the spaceship is here... - { - CONNECTION_MAP_ITERATOR cmi (this->connection_map_); - - // Iterate over all the handlers and shut them down. - - for (CONNECTION_MAP_ENTRY *me = 0; // It's safe to reset me to 0. - cmi.next (me) != 0; - cmi.advance ()) - { - Connection_Handler *connection_handler = me->int_id_; - - ACE_DEBUG ((LM_DEBUG, - "(%t) closing down connection %d\n", - connection_handler->connection_id ())); - - // If have no this statement, the gatewayd will abort when exiting - // with some Consumer/Supplier not connected. - if (connection_handler->state()==Connection_Handler::CONNECTING) - this->cancel_connection_connection(connection_handler); - // Mark Connection_Handler as DISCONNECTING so we don't try to - // reconnect... - connection_handler->state (Connection_Handler::DISCONNECTING); - } - } - - // Close down the connector - this->connector_.close (); - - // Close down the supplier acceptor. - this->supplier_acceptor_.close (); - - // Close down the consumer acceptor. - this->consumer_acceptor_.close (); - - // Now tell everyone that it is now time to commit suicide. - { - CONNECTION_MAP_ITERATOR cmi (this->connection_map_); - - for (CONNECTION_MAP_ENTRY *me = 0; // It's safe to reset me to 0. - cmi.next (me) != 0; - cmi.advance ()) - { - Connection_Handler *connection_handler = me->int_id_; - - // Deallocate Connection_Handler resources. - connection_handler->destroy (); // Will trigger a delete. - } - } - - return 0; -} - -int -Event_Channel::find_proxy (ACE_INT32 connection_id, - Connection_Handler *&connection_handler) -{ - return this->connection_map_.find (connection_id, - connection_handler); -} - -int -Event_Channel::bind_proxy (Connection_Handler *connection_handler) -{ - int result = this->connection_map_.bind (connection_handler->connection_id (), - connection_handler); - - switch (result) - { - case -1: - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) bind failed for connection %d\n", - connection_handler->connection_id ()), - -1); - /* NOTREACHED */ - case 1: // Oops, found a duplicate! - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) duplicate connection %d, already bound\n", - connection_handler->connection_id ()), - -1); - /* NOTREACHED */ - case 0: - // Success. - return 0; - /* NOTREACHED */ - default: - ACE_ERROR_RETURN ((LM_DEBUG, - "(%t) invalid result %d\n", - result), - -1); - /* NOTREACHED */ - } - - ACE_NOTREACHED (return 0); -} - -int -Event_Channel::subscribe (const Event_Key &event_addr, - Consumer_Dispatch_Set *cds) -{ - int result = this->efd_.bind (event_addr, cds); - - // Bind with consumer map, keyed by peer address. - switch (result) - { - case -1: - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) bind failed for connection %d\n", - event_addr.connection_id_), - -1); - /* NOTREACHED */ - case 1: // Oops, found a duplicate! - ACE_ERROR_RETURN ((LM_DEBUG, - "(%t) duplicate consumer map entry %d, " - "already bound\n", - event_addr.connection_id_), - -1); - /* NOTREACHED */ - case 0: - // Success. - return 0; - default: - ACE_ERROR_RETURN ((LM_DEBUG, - "(%t) invalid result %d\n", - result), - -1); - /* NOTREACHED */ - } - - ACE_NOTREACHED (return 0); -} - -int -Event_Channel::open (void *) -{ - // Ignore so each can handle it. - ACE_Sig_Action sig ((ACE_SignalHandler) SIG_IGN, SIGPIPE); - ACE_UNUSED_ARG (sig); - - // Actively initiate Peer connections. - this->initiate_connector (); - - // Passively initiate Peer acceptor. - if (this->initiate_acceptors () == -1) - return -1; - - // If we're not running reactively, then we need to make sure that - // reference counting operations are - // thread-safe. Therefore, we create an that is - // parameterized by to prevent race conditions. - if (Options::instance ()->threading_strategy () - != Options::REACTIVE) - { - ACE_Lock_Adapter *la; - - ACE_NEW_RETURN (la, - ACE_Lock_Adapter, - -1); - - Options::instance ()->locking_strategy (la); - } - - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Lock_Adapter; -template class ACE_Map_Entry; -template class ACE_Map_Iterator; -template class ACE_Map_Reverse_Iterator; -template class ACE_Map_Iterator_Base; -template class ACE_Map_Manager; -template class ACE_Unbounded_Set_Iterator; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Lock_Adapter -#pragma instantiate ACE_Map_Entry -#pragma instantiate ACE_Map_Iterator -#pragma instantiate ACE_Map_Reverse_Iterator -#pragma instantiate ACE_Map_Iterator_Base -#pragma instantiate ACE_Map_Manager -#pragma instantiate ACE_Unbounded_Set_Iterator -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/Gateway/Gateway/Event_Channel.h b/apps/Gateway/Gateway/Event_Channel.h deleted file mode 100644 index 64788cc0cdb..00000000000 --- a/apps/Gateway/Gateway/Event_Channel.h +++ /dev/null @@ -1,135 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Event_Channel.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef ACE_EVENT_CHANNEL -#define ACE_EVENT_CHANNEL - -#include "Connection_Handler_Connector.h" -#include "Connection_Handler_Acceptor.h" -#include "Consumer_Dispatch_Set.h" -#include "Event_Forwarding_Discriminator.h" -#include "ace/svc_export.h" - -typedef ACE_Null_Mutex MAP_MUTEX; - -class ACE_Svc_Export Event_Channel : public ACE_Event_Handler -{ - // = TITLE - // Define a generic Event_Channel. - // - // = DESCRIPTION - // The inspiration for this class is derived from the CORBA COS - // Event Channel, though the design is simplified. - // - // We inherit from so that we can be - // registered with an to handle timeouts. -public: - // = Initialization and termination methods. - Event_Channel (void); - ~Event_Channel (void); - - virtual int open (void * = 0); - // Open the channel. - - virtual int close (u_long = 0); - // Close down the Channel. - - // = Proxy management methods. - int initiate_connection_connection (Connection_Handler *, int sync_directly = 0); - // Initiate the connection of the to its peer. - // Second paratemer is used for thread connection-handler which will - // block the connecting procedure directly, need not care - // Options::blocking_semantics(). - - int complete_connection_connection (Connection_Handler *); - // Complete the initialization of the once it's - // connected to its Peer. - - int reinitiate_connection_connection (Connection_Handler *); - // Reinitiate a connection asynchronously when the Peer fails. - int cancel_connection_connection (Connection_Handler *); - // Cancel a asynchronous connection. - - int bind_proxy (Connection_Handler *); - // Bind the to the . - - int find_proxy (ACE_INT32 connection_id, - Connection_Handler *&); - // Locate the with . - - int subscribe (const Event_Key &event_addr, - Consumer_Dispatch_Set *cds); - // Subscribe the to receive events that - // match . - - // = Event processing entry point. - virtual int put (ACE_Message_Block *mb, - ACE_Time_Value * = 0); - // Pass to the Event Channel so it can forward it to Consumers. - - void initiate_connector (void); - // Actively initiate connections to the Peers. - - int initiate_acceptors (void); - // Passively initiate the s for Consumer and - // Suppliers. - -private: - int parse_args (int argc, char *argv[]); - // Parse the command-line arguments. - - // = Methods for handling events. - void routing_event (Event_Key *event_key, - ACE_Message_Block *data); - // Forwards the to Consumer that have registered to receive - // it, based on addressing information in the . - - void subscription_event (ACE_Message_Block *data); - // Add a Consumer subscription. - - int compute_performance_statistics (void); - // Perform timer-based performance profiling. - - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg); - // Periodically callback to perform timer-based performance - // profiling. - - Connection_Handler_Connector connector_; - // Used to establish the connections actively. - - Connection_Handler_Acceptor supplier_acceptor_; - // Used to establish connections passively and create Suppliers. - - Connection_Handler_Acceptor consumer_acceptor_; - // Used to establish connections passively and create Consumers. - - // = Make life easier by defining typedefs. - typedef ACE_Map_Manager - CONNECTION_MAP; - typedef ACE_Map_Iterator - CONNECTION_MAP_ITERATOR; - typedef ACE_Map_Entry - CONNECTION_MAP_ENTRY; - - CONNECTION_MAP connection_map_; - // Table that maps s to *'s. - - Event_Forwarding_Discriminator efd_; - // Map that associates an event to a set of *'s. -}; - -#endif /* ACE_EVENT_CHANNEL */ diff --git a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp deleted file mode 100644 index d170dee9005..00000000000 --- a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// $Id$ - -#if !defined (_CONSUMER_MAP_C) -#define _CONSUMER_MAP_C - -#include "Event_Forwarding_Discriminator.h" - -ACE_RCSID(Gateway, Event_Forwarding_Discriminator, "$Id$") - -// Bind the Event_Key to the INT_ID. - -int -Event_Forwarding_Discriminator::bind (Event_Key event_addr, - Consumer_Dispatch_Set *cds) -{ - return this->map_.bind (event_addr, cds); -} - -// Find the Consumer_Dispatch_Set corresponding to the Event_Key. - -int -Event_Forwarding_Discriminator::find (Event_Key event_addr, - Consumer_Dispatch_Set *&cds) -{ - return this->map_.find (event_addr, cds); -} - -// Unbind (remove) the Event_Key from the map. - -int -Event_Forwarding_Discriminator::unbind (Event_Key event_addr) -{ - Consumer_Dispatch_Set *cds = 0; - int result = this->map_.unbind (event_addr, cds); - delete cds; - return result; -} - -Event_Forwarding_Discriminator_Iterator::Event_Forwarding_Discriminator_Iterator - (Event_Forwarding_Discriminator &rt) - : map_iter_ (rt.map_) -{ -} - -int -Event_Forwarding_Discriminator_Iterator::next (Consumer_Dispatch_Set *&cds) -{ - ACE_Map_Entry *temp; - - if (this->map_iter_.next (temp) == 0) - return 0; - else - { - cds = temp->int_id_; - return 1; - } -} - -int -Event_Forwarding_Discriminator_Iterator::advance (void) -{ - return this->map_iter_.advance (); -} -#endif /* _CONSUMER_MAP_C */ diff --git a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h deleted file mode 100644 index 10bc4409589..00000000000 --- a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Event_Forwarding_Discriminator.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef _CONSUMER_MAP_H -#define _CONSUMER_MAP_H - -#include "ace/Map_Manager.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" -#include "Event.h" -#include "Consumer_Dispatch_Set.h" - -class Event_Forwarding_Discriminator -{ - // = TITLE - // Map events to the set of Consumer_Proxies that have subscribed - // to receive the event. -public: - int bind (Event_Key event, Consumer_Dispatch_Set *cds); - // Associate Event with the Consumer_Dispatch_Set. - - int unbind (Event_Key event); - // Locate EXID and pass out parameter via INID. If found, - // return 0, else -1. - - int find (Event_Key event, Consumer_Dispatch_Set *&cds); - // Break any association of EXID. - -public: - ACE_Map_Manager map_; - // Map that associates s (external ids) with - // *'s . -}; - -class Event_Forwarding_Discriminator_Iterator -{ - // = TITLE - // Define an iterator for the Consumer Map. -public: - Event_Forwarding_Discriminator_Iterator (Event_Forwarding_Discriminator &mm); - int next (Consumer_Dispatch_Set *&); - int advance (void); - -private: - ACE_Map_Iterator map_iter_; - // Map we are iterating over. -}; -#endif /* _CONSUMER_MAP_H */ diff --git a/apps/Gateway/Gateway/File_Parser.cpp b/apps/Gateway/Gateway/File_Parser.cpp deleted file mode 100644 index 6f248e6762d..00000000000 --- a/apps/Gateway/Gateway/File_Parser.cpp +++ /dev/null @@ -1,164 +0,0 @@ -// $Id$ - -#ifndef FILE_PARSER_C - -#define FILE_PARSER_C - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "File_Parser.h" - -ACE_RCSID(Gateway, File_Parser, "$Id$") - -// This fixes a nasty bug with cfront-based compilers (like -// Centerline). -typedef FP::Return_Type FP_RETURN_TYPE; - -// File_Parser stuff. - -template int -File_Parser::open (const char filename[]) -{ - this->infile_ = ACE_OS::fopen (filename, "r"); - if (this->infile_ == 0) - return -1; - else - return 0; -} - -template int -File_Parser::close (void) -{ - return ACE_OS::fclose (this->infile_); -} - -template FP_RETURN_TYPE -File_Parser::getword (char buf[]) -{ - return this->readword (buf); -} - -// Get the next string from the file via this->readword() -// Check make sure the string forms a valid number. - -template FP_RETURN_TYPE -File_Parser::getint (ACE_INT32 &value) -{ - char buf[BUFSIZ]; -#if defined (__GNUG__) - // egcs 1.1b can't handle the typedef. - FP::Return_Type -#else /* ! __GNUG__ */ - FP_RETURN_TYPE -#endif /* ! __GNUG__ */ - read_result = this->readword (buf); - - if (read_result == FP::SUCCESS) - { - // Check to see if this is the "use the default value" symbol? - if (buf[0] == '*') - return FP::DEFAULT; - else - { - // ptr is used for error checking with ACE_OS::strtol. - char *ptr; - - // try to convert the buf to a decimal number - value = ACE_OS::strtol (buf, &ptr, 10); - - // check if the buf is a decimal or not - if (value == 0 && ptr == buf) - return FP::PARSE_ERROR; - else - return FP::SUCCESS; - } - } - else - return read_result; -} - - -template FP_RETURN_TYPE -File_Parser::readword (char buf[]) -{ - int wordlength = 0; - int c; - - // Skip over leading delimiters and get word. - - while ((c = getc (this->infile_)) != EOF && c != '\n') - if (this->delimiter (c)) - { - // We've reached the end of a "word". - if (wordlength > 0) - break; - } - else - buf[wordlength++] = c; - - buf[wordlength] = '\0'; - - if (c == EOF) { - // If EOF is just a delimiter, don't return EOF so that the word - // gets processed. - if (wordlength > 0) - { - ungetc (c, this->infile_); - return FP::SUCCESS; - } - else - // else return EOF so that read loops stop - return FP::EOFILE; - } - else if (c == '\n') - { - // if the EOLINE is just a delimiter, don't return EOLINE - // so that the word gets processed - if (wordlength > 0) - ungetc (c, this->infile_); - else - return FP::EOLINE; - } - - // Skip comments. - if (this->comments (buf[0])) - { - if (this->skipline () == EOF) - return FP::EOFILE; - else - return FP::COMMENT; - } - else - return FP::SUCCESS; -} - -template int -File_Parser::delimiter (char ch) -{ - return ch == ' ' || ch == ',' || ch == '\t'; -} - -template int -File_Parser::comments (char ch) -{ - return ch == '#'; -} - -template int -File_Parser::skipline (void) -{ - // Skip the remainder of the line. - - int c; - - while ((c = getc (this->infile_)) != '\n' && c != EOF) - continue; - - return c; -} - -#endif /* _FILE_PARSER_C */ diff --git a/apps/Gateway/Gateway/File_Parser.h b/apps/Gateway/Gateway/File_Parser.h deleted file mode 100644 index a91a8f75827..00000000000 --- a/apps/Gateway/Gateway/File_Parser.h +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// File_Parser.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef _FILE_PARSER -#define _FILE_PARSER - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class FP -{ - // = TITLE - // This class serves as a namespace for the . -public: - enum Return_Type - { - EOLINE, - EOFILE, - SUCCESS, - COMMENT, - DEFAULT, - PARSE_ERROR - }; -}; - -template -class File_Parser -{ - // = TITLE - // Class used to parse the configuration file for the - // . -public: - // = Open and Close the file specified - int open (const char filename[]); - int close (void); - - virtual FP::Return_Type read_entry (ENTRY &entry, - int &line_number) = 0; - // Pure virtual hook that subclasses override and use the protected - // methods to fill in the . - -protected: - FP::Return_Type getword (char buf[]); - // Read the next ASCII word. - - FP::Return_Type getint (ACE_INT32 &value); - // Read the next integer. - - FP::Return_Type readword (char buf[]); - // Read the next "word," which is demarcated by s. - // - // @@ This function is inherently flawed since it doesn't take a - // count of the size of ... - - int delimiter (char ch); - // Returns true if is a delimiter, i.e., ' ', ',', or '\t'. - - int comments (char ch); - // Returns true if is the comment character, i.e., '#'. - - int skipline (void); - // Skips to the remainder of a line, e.g., when we find a comment - // character. - - FILE *infile_; - // Pointer to the file we're reading. -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "File_Parser.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("File_Parser.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* _FILE_PARSER */ diff --git a/apps/Gateway/Gateway/Gateway.cpp b/apps/Gateway/Gateway/Gateway.cpp deleted file mode 100644 index 3838f6f8758..00000000000 --- a/apps/Gateway/Gateway/Gateway.cpp +++ /dev/null @@ -1,342 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "ace/Service_Config.h" -#include "Config_Files.h" -#include "Event_Channel.h" -#include "Gateway.h" - -ACE_RCSID(Gateway, Gateway, "$Id$") - -class ACE_Svc_Export Gateway : public ACE_Service_Object -{ - // = TITLE - // Integrates the whole Gateway application. - // - // = DESCRIPTION - // This implementation uses the as the basis - // for the routing. -protected: - // = Service configurator hooks. - virtual int init (int argc, char *argv[]); - // Perform initialization. - - virtual int fini (void); - // Perform termination when unlinked dynamically. - - virtual int info (char **, size_t) const; - // Return info about this service. - - // = Configuration methods. - int parse_connection_config_file (void); - // Parse the proxy configuration file. - - int parse_consumer_config_file (void); - // Parse the consumer configuration file. - - // = Lifecycle management methods. - int handle_input (ACE_HANDLE); - // Shut down the Gateway when input comes in from the controlling - // console. - - int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); - // Shut down the Gateway when a signal arrives. - - Event_Channel event_channel_; - // The Event Channel routes events from Supplier(s) to Consumer(s) - // using and objects. - - Connection_Handler_Factory connection_handler_factory_; - // Creates the appropriate type of . -}; - -int -Gateway::handle_signal (int signum, siginfo_t *, ucontext_t *) -{ - ACE_UNUSED_ARG (signum); - - // Shut down the main event loop. - ACE_Reactor::end_event_loop (); - return 0; -} - -int -Gateway::handle_input (ACE_HANDLE h) -{ - char buf[BUFSIZ]; - // Consume the input... - ACE_OS::read (h, buf, sizeof (buf)); - - // Shut us down. - return this->handle_signal ((int) h); -} - -int -Gateway::init (int argc, char *argv[]) -{ - // Parse the "command-line" arguments. - Options::instance ()->parse_args (argc, argv); - - ACE_Sig_Set sig_set; - sig_set.sig_add (SIGINT); - sig_set.sig_add (SIGQUIT); - - // Register ourselves to receive signals so we can shut down - // gracefully. - - if (ACE_Reactor::instance ()->register_handler (sig_set, - this) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "register_handler"), - -1); - - // Register this handler to receive events on stdin. We use this to - // shutdown the Gateway gracefully. - if (ACE_Event_Handler::register_stdin_handler (this, - ACE_Reactor::instance (), - ACE_Thread_Manager::instance ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "register_stdin_handler"), - -1); - - // If this->performance_window_ > 0 start a timer. - - if (Options::instance ()->performance_window () > 0) - { - if (ACE_Reactor::instance ()->schedule_timer - (&this->event_channel_, 0, - Options::instance ()->performance_window ()) == -1) - ACE_ERROR ((LM_ERROR, - "(%t) %p\n", - "schedule_timer")); - else - ACE_DEBUG ((LM_DEBUG, - "starting timer for %d seconds...\n", - Options::instance ()->performance_window ())); - } - - // Are we running as a connector? - if (Options::instance ()->enabled - (Options::CONSUMER_CONNECTOR | Options::SUPPLIER_CONNECTOR)) - { - // Parse the proxy configuration file. - this->parse_connection_config_file (); - - // Parse the consumer config file and build the event forwarding - // discriminator. - this->parse_consumer_config_file (); - } - - // Initialize the Event_Channel. - return this->event_channel_.open (); -} - -// This method is automatically called when the Gateway is shutdown. - -int -Gateway::fini (void) -{ - // Remove the handler that receive events on stdin. Otherwise, we - // will crash on shutdown. - ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance (), - ACE_Thread_Manager::instance ()); - - // Close down the event channel. - this->event_channel_.close (); - - // Need to make sure we cleanup this Singleton. - delete Options::instance (); - return 0; -} - -// Returns information on the currently active service. - -int -Gateway::info (char **strp, size_t length) const -{ - char buf[BUFSIZ]; - - ACE_OS::sprintf (buf, "%s\t %s", "Gateway daemon", - "# Application-level gateway\n"); - - if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) - return -1; - else - ACE_OS::strncpy (*strp, buf, length); - return ACE_OS::strlen (buf); -} - -// Parse and build the proxy table. - -int -Gateway::parse_connection_config_file (void) -{ - // File that contains the proxy configuration information. - Connection_Config_File_Parser connection_file; - int file_empty = 1; - int line_number = 0; - - if (connection_file.open (Options::instance ()->connection_config_file ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - Options::instance ()->connection_config_file ()), - -1); - - // Keep track of the previous connection id to make sure the - // connection config file isn't corrupted. - int previous_connection_id = 0; - - // Read config file one line at a time. - - for (Connection_Config_Info pci; - connection_file.read_entry (pci, line_number) != FP::EOFILE; - ) - { - file_empty = 0; - - // First time in check. - if (previous_connection_id == 0) - { - previous_connection_id = 1; - - if (pci.connection_id_ != 1) - ACE_DEBUG ((LM_DEBUG, - "(%t) warning, the first connection id should be 1 not %d\n", - pci.connection_id_)); - } - else if (previous_connection_id + 1 != pci.connection_id_) - ACE_DEBUG ((LM_DEBUG, - "(%t) warning, connection ids should keep increasing by 1 and %d + 1 != %d\n", - previous_connection_id, - pci.connection_id_)); - - // Update the last connection id to ensure that we monotonically - // increase by 1. - previous_connection_id = pci.connection_id_; - - if (Options::instance ()->enabled (Options::DEBUG)) - ACE_DEBUG ((LM_DEBUG, - "(%t) conn id = %d, " - "host = %s, " - "remote port = %d, " - "proxy role = %c, " - "max retry timeout = %d, " - "local port = %d, " - "priority = %d\n", - pci.connection_id_, - pci.host_, - pci.remote_port_, - pci.connection_role_, - pci.max_retry_timeout_, - pci.local_port_, - pci.priority_)); - - pci.event_channel_ = &this->event_channel_; - - // Create the appropriate type of Proxy. - Connection_Handler *connection_handler; - - ACE_ALLOCATOR_RETURN (connection_handler, - this->connection_handler_factory_.make_connection_handler (pci), - -1); - - // Bind the new Connection_Handler to the connection ID. - this->event_channel_.bind_proxy (connection_handler); - } - - // Keep track of the next available connection id, which is - // necessary for Peers that connect with us, rather than vice versa. - Options::instance ()->connection_id () = previous_connection_id + 1; - - if (file_empty) - ACE_ERROR ((LM_WARNING, - "warning: connection connection_handler configuration file was empty\n")); - return 0; -} - -int -Gateway::parse_consumer_config_file (void) -{ - // File that contains the consumer event forwarding information. - Consumer_Config_File_Parser consumer_file; - int file_empty = 1; - int line_number = 0; - - if (consumer_file.open (Options::instance ()->consumer_config_file ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - Options::instance ()->consumer_config_file ()), - -1); - - // Read config file line at a time. - for (Consumer_Config_Info cci_entry; - consumer_file.read_entry (cci_entry, line_number) != FP::EOFILE; - ) - { - file_empty = 0; - - if (Options::instance ()->enabled (Options::DEBUG)) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) connection id = %d, payload = %d, " - "number of consumers = %d\n", - cci_entry.connection_id_, - cci_entry.type_, - cci_entry.total_consumers_)); - - for (int i = 0; i < cci_entry.total_consumers_; i++) - ACE_DEBUG ((LM_DEBUG, - "(%t) destination[%d] = %d\n", - i, - cci_entry.consumers_[i])); - } - - Consumer_Dispatch_Set *dispatch_set; - ACE_NEW_RETURN (dispatch_set, - Consumer_Dispatch_Set, - -1); - - Event_Key event_addr (cci_entry.connection_id_, - cci_entry.type_); - - // Add the Consumers to the Dispatch_Set. - for (int i = 0; i < cci_entry.total_consumers_; i++) - { - Connection_Handler *connection_handler = 0; - - // Lookup destination and add to Consumer_Dispatch_Set set - // if found. - if (this->event_channel_.find_proxy (cci_entry.consumers_[i], - connection_handler) != -1) - dispatch_set->insert (connection_handler); - else - ACE_ERROR ((LM_ERROR, - "(%t) not found: destination[%d] = %d\n", - i, - cci_entry.consumers_[i])); - } - - this->event_channel_.subscribe (event_addr, dispatch_set); - } - - if (file_empty) - ACE_ERROR ((LM_WARNING, - "warning: consumer map configuration file was empty\n")); - return 0; -} - -// The following is a "Factory" used by the ACE_Service_Config and -// svc.conf file to dynamically initialize the state of the Gateway. - -ACE_SVC_FACTORY_DEFINE (Gateway) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node; -template class ACE_Unbounded_Set; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node -#pragma instantiate ACE_Unbounded_Set -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/Gateway/Gateway/Gateway.dsp b/apps/Gateway/Gateway/Gateway.dsp deleted file mode 100644 index 28f982104b7..00000000000 --- a/apps/Gateway/Gateway/Gateway.dsp +++ /dev/null @@ -1,98 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Gateway" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=Gateway - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Gateway.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Gateway.mak" CFG="Gateway - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Gateway - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" -# Begin Target - -# Name "Gateway - Win32 Debug" -# Begin Source File - -SOURCE=.\Concrete_Connection_Handlers.cpp -# End Source File -# Begin Source File - -SOURCE=.\Config_Files.cpp -# End Source File -# Begin Source File - -SOURCE=.\Connection_Handler.cpp -# End Source File -# Begin Source File - -SOURCE=.\Connection_Handler_Acceptor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Connection_Handler_Connector.cpp -# End Source File -# Begin Source File - -SOURCE=.\Event_Channel.cpp -# End Source File -# Begin Source File - -SOURCE=.\Event_Forwarding_Discriminator.cpp -# End Source File -# Begin Source File - -SOURCE=.\File_Parser.cpp -# End Source File -# Begin Source File - -SOURCE=.\Gateway.cpp -# End Source File -# Begin Source File - -SOURCE=.\Options.cpp -# End Source File -# End Target -# End Project diff --git a/apps/Gateway/Gateway/Gateway.dsw b/apps/Gateway/Gateway/Gateway.dsw deleted file mode 100644 index 46009cd5c09..00000000000 --- a/apps/Gateway/Gateway/Gateway.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Gateway"=.\Gateway.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "gatewayd"=.\gatewayd.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Gateway - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/apps/Gateway/Gateway/Gateway.h b/apps/Gateway/Gateway/Gateway.h deleted file mode 100644 index cd50cfa6e8e..00000000000 --- a/apps/Gateway/Gateway/Gateway.h +++ /dev/null @@ -1,34 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Gateway.h -// -// = DESCRIPTION -// Since the Gateway is an , this file defines -// the entry point into the Service Configurator framework. -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#ifndef ACE_GATEWAY -#define ACE_GATEWAY - -#include "ace/OS.h" -#include "ace/svc_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_SVC_FACTORY_DECLARE (Gateway) - -#endif /* ACE_GATEWAY */ diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile deleted file mode 100644 index 3cec4a10c25..00000000000 --- a/apps/Gateway/Gateway/Makefile +++ /dev/null @@ -1,1652 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the Gateway. -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -BIN = gatewayd -LIB = libGateway.a -SHLIB = libGateway.$(SOEXT) - -ACE_SHLIBS += $(ACELIB) - -FILES = Concrete_Connection_Handlers \ - Config_Files \ - File_Parser \ - Gateway \ - Event_Channel \ - Event_Forwarding_Discriminator \ - Options \ - Connection_Handler \ - Connection_Handler_Acceptor \ - Connection_Handler_Connector - -LSRC = $(addsuffix .cpp,$(FILES)) -LDLIBS = - -BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -ifeq ($(static_libs_only),1) -$(VBIN): $(VLIB) -else -$(VBIN): $(VSHLIB) -endif - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Concrete_Connection_Handlers.o .obj/Concrete_Connection_Handlers.so .shobj/Concrete_Connection_Handlers.o .shobj/Concrete_Connection_Handlers.so: Concrete_Connection_Handlers.cpp \ - Event_Channel.h Connection_Handler_Connector.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \ - Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h \ - $(ACE_ROOT)/ace/svc_export.h Connection_Handler_Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \ - Event_Forwarding_Discriminator.h Concrete_Connection_Handlers.h - -.obj/Config_Files.o .obj/Config_Files.so .shobj/Config_Files.o .shobj/Config_Files.so: Config_Files.cpp Config_Files.h File_Parser.h \ - $(ACE_ROOT)/ace/OS.h $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - File_Parser.cpp Event.h Options.h $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/svc_export.h - -.obj/File_Parser.o .obj/File_Parser.so .shobj/File_Parser.o .shobj/File_Parser.so: File_Parser.cpp $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - File_Parser.h File_Parser.cpp - -.obj/Gateway.o .obj/Gateway.so .shobj/Gateway.o .shobj/Gateway.so: Gateway.cpp $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Config_Files.h \ - File_Parser.h File_Parser.cpp Event.h Event_Channel.h \ - Connection_Handler_Connector.h $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \ - Options.h $(ACE_ROOT)/ace/svc_export.h \ - Connection_Handler_Acceptor.h $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \ - Event_Forwarding_Discriminator.h Gateway.h - -.obj/Event_Channel.o .obj/Event_Channel.so .shobj/Event_Channel.o .shobj/Event_Channel.so: Event_Channel.cpp Connection_Handler_Connector.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \ - Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h \ - $(ACE_ROOT)/ace/svc_export.h Event_Channel.h \ - Connection_Handler_Acceptor.h $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \ - Event_Forwarding_Discriminator.h - -.obj/Event_Forwarding_Discriminator.o .obj/Event_Forwarding_Discriminator.so .shobj/Event_Forwarding_Discriminator.o .shobj/Event_Forwarding_Discriminator.so: Event_Forwarding_Discriminator.cpp \ - Event_Forwarding_Discriminator.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Event.h \ - Consumer_Dispatch_Set.h $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp - -.obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.cpp Event.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - Options.h $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i - -.obj/Connection_Handler.o .obj/Connection_Handler.so .shobj/Connection_Handler.o .shobj/Connection_Handler.so: Connection_Handler.cpp Event_Channel.h \ - Connection_Handler_Connector.h $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \ - Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h \ - $(ACE_ROOT)/ace/svc_export.h Connection_Handler_Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \ - Event_Forwarding_Discriminator.h Concrete_Connection_Handlers.h - -.obj/Connection_Handler_Acceptor.o .obj/Connection_Handler_Acceptor.so .shobj/Connection_Handler_Acceptor.o .shobj/Connection_Handler_Acceptor.so: Connection_Handler_Acceptor.cpp \ - Event_Channel.h Connection_Handler_Connector.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \ - Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h \ - $(ACE_ROOT)/ace/svc_export.h Connection_Handler_Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i Consumer_Dispatch_Set.h \ - Event_Forwarding_Discriminator.h - -.obj/Connection_Handler_Connector.o .obj/Connection_Handler_Connector.so .shobj/Connection_Handler_Connector.o .shobj/Connection_Handler_Connector.so: Connection_Handler_Connector.cpp \ - Connection_Handler_Connector.h $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.i Connection_Handler.h \ - Config_Files.h File_Parser.h File_Parser.cpp Event.h Options.h \ - $(ACE_ROOT)/ace/svc_export.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/apps/Gateway/Gateway/Makefile.bor b/apps/Gateway/Gateway/Makefile.bor deleted file mode 100644 index 1fc1899b603..00000000000 --- a/apps/Gateway/Gateway/Makefile.bor +++ /dev/null @@ -1,15 +0,0 @@ -NAME = gatewayd -OBJFILES = \ - $(OBJDIR)\Concrete_Connection_Handlers.obj \ - $(OBJDIR)\Config_Files.obj \ - $(OBJDIR)\File_Parser.obj \ - $(OBJDIR)\Gateway.obj \ - $(OBJDIR)\Event_Channel.obj \ - $(OBJDIR)\Event_Forwarding_Discriminator.obj \ - $(OBJDIR)\Options.obj \ - $(OBJDIR)\Connection_Handler.obj \ - $(OBJDIR)\Connection_Handler_Acceptor.obj \ - $(OBJDIR)\Connection_Handler_Connector.obj \ - $(OBJDIR)\gatewayd.obj -!include <$(ACE_ROOT)\apps\build.bor> - diff --git a/apps/Gateway/Gateway/Options.cpp b/apps/Gateway/Gateway/Options.cpp deleted file mode 100644 index d13848835bf..00000000000 --- a/apps/Gateway/Gateway/Options.cpp +++ /dev/null @@ -1,285 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "Event.h" -#include "Options.h" -#include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(Gateway, Options, "$Id$") - -// Static initialization. -Options *Options::instance_ = 0; - -// Let's have a usage prompt. -void -Options::print_usage (void) -{ - ACE_DEBUG ((LM_INFO, - "gatewayd [-a {C|S}:acceptor-port] [-c {C|S}:connector-port]" - " [-C consumer_config_file] [-P connection_config_filename]" - " [-q socket_queue_size] [-t OUTPUT_MT|INPUT_MT] [-w time_out]" - " [-b] [-d] [-v] [-T]\n" - "" - "\t-a Become an Acceptor\n" - "\t-b Use blocking connection establishment\n" - "\t-c Become a Connector\n" - "\t-d debugging\n" - "\t-q Use a different socket queue size\n" - "\t-t Use a different threading strategy\n" - "\t-v Verbose mode\n" - "\t-w Time performance for a designated amount of time\n" - "\t-C Use a different proxy config filename\n" - "\t-P Use a different consumer config filename\n" - "\t-T Tracing\n" - )); -} -Options * -Options::instance (void) -{ - if (Options::instance_ == 0) - ACE_NEW_RETURN (Options::instance_, Options, 0); - - return Options::instance_; -} - -Options::Options (void) - : locking_strategy_ (0), - performance_window_ (0), - blocking_semantics_ (ACE_NONBLOCK), - socket_queue_size_ (0), - threading_strategy_ (REACTIVE), - options_ (0), - supplier_acceptor_port_ (DEFAULT_GATEWAY_SUPPLIER_PORT), - consumer_acceptor_port_ (DEFAULT_GATEWAY_CONSUMER_PORT), - supplier_connector_port_ (DEFAULT_PEER_SUPPLIER_PORT), - consumer_connector_port_ (DEFAULT_PEER_CONSUMER_PORT), - max_timeout_ (MAX_TIMEOUT), - max_queue_size_ (MAX_QUEUE_SIZE), - connection_id_ (1) -{ - ACE_OS::strcpy (this->connection_config_file_, "connection_config"); - ACE_OS::strcpy (this->consumer_config_file_, "consumer_config"); -} - -int -Options::enabled (int option) const -{ - return ACE_BIT_ENABLED (this->options_, option); -} - -Options::~Options (void) -{ - delete this->locking_strategy_; -} - -ACE_Lock_Adapter * -Options::locking_strategy (void) const -{ - return this->locking_strategy_; -} - -void -Options::locking_strategy (ACE_Lock_Adapter *ls) -{ - this->locking_strategy_ = ls; -} - -int -Options::performance_window (void) const -{ - return this->performance_window_; -} - -CONNECTION_ID & -Options::connection_id (void) -{ - return this->connection_id_; -} - -long -Options::max_timeout (void) const -{ - return this->max_timeout_; -} - -int -Options::blocking_semantics (void) const -{ - return this->blocking_semantics_; -} - -int -Options::socket_queue_size (void) const -{ - return this->socket_queue_size_; -} - -u_long -Options::threading_strategy (void) const -{ - return this->threading_strategy_; -} - -const char * -Options::connection_config_file (void) const -{ - return this->connection_config_file_; -} - -const char * -Options::consumer_config_file (void) const -{ - return this->consumer_config_file_; -} - -u_short -Options::consumer_acceptor_port (void) const -{ - return this->consumer_acceptor_port_; -} - -u_short -Options::supplier_acceptor_port (void) const -{ - return this->supplier_acceptor_port_; -} - -u_short -Options::consumer_connector_port (void) const -{ - return this->consumer_connector_port_; -} - -long -Options::max_queue_size (void) const -{ - return this->max_queue_size_; -} - -u_short -Options::supplier_connector_port (void) const -{ - return this->supplier_connector_port_; -} - -// Parse the "command-line" arguments and set the corresponding flags. - -int -Options::parse_args (int argc, char *argv[]) -{ - // Assign defaults. - ACE_Get_Opt get_opt (argc, - argv, - "a:bC:c:dm:P:p:q:r:t:vw:", - 0); - - for (int c; (c = get_opt ()) != EOF; ) - { - switch (c) - { - case 'a': - { - // Become an Acceptor. - - for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|"); - flag != 0; - flag = ACE_OS::strtok (0, "|")) - if (ACE_OS::strncasecmp (flag, "C", 1) == 0) - { - ACE_SET_BITS (this->options_, - Options::CONSUMER_ACCEPTOR); - if (ACE_OS::strlen (flag) > 1) - // Set the Consumer Acceptor port number. - this->consumer_acceptor_port_ = ACE_OS::atoi (flag + 2); - } - else if (ACE_OS::strncasecmp (flag, "S", 1) == 0) - { - ACE_SET_BITS (this->options_, - Options::SUPPLIER_ACCEPTOR); - if (ACE_OS::strlen (flag) > 1) - // Set the Supplier Acceptor port number. - this->supplier_acceptor_port_ = ACE_OS::atoi (flag + 2); - } - } - break; - /* NOTREACHED */ - case 'b': // Use blocking connection establishment. - this->blocking_semantics_ = 1; - break; - case 'C': // Use a different proxy config filename. - ACE_OS::strncpy (this->consumer_config_file_, - get_opt.opt_arg (), - sizeof this->consumer_config_file_ - / sizeof (ACE_TCHAR)); - break; - case 'c': - { - // Become a Connector. - - for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|"); - flag != 0; - flag = ACE_OS::strtok (0, "|")) - if (ACE_OS::strncasecmp (flag, "C", 1) == 0) - { - ACE_SET_BITS (this->options_, - Options::CONSUMER_CONNECTOR); - if (ACE_OS::strlen (flag) > 1) - // Set the Consumer Connector port number. - this->consumer_connector_port_ = ACE_OS::atoi (flag + 2); - } - else if (ACE_OS::strncasecmp (flag, "S", 1) == 0) - { - ACE_SET_BITS (this->options_, - Options::SUPPLIER_CONNECTOR); - if (ACE_OS::strlen (flag) > 1) - // Set the Supplier Connector port number. - this->supplier_connector_port_ = ACE_OS::atoi (flag + 2); - } - } - break; - /* NOTREACHED */ - case 'd': // We are debugging. - ACE_SET_BITS (this->options_, - Options::DEBUG); - break; - case 'P': // Use a different connection config filename. - ACE_OS::strncpy (this->connection_config_file_, - get_opt.opt_arg (), - sizeof this->connection_config_file_); - break; - case 'q': // Use a different socket queue size. - this->socket_queue_size_ = ACE_OS::atoi (get_opt.opt_arg ()); - break; - case 't': // Use a different threading strategy. - { - for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|"); - flag != 0; - flag = ACE_OS::strtok (0, "|")) - if (ACE_OS::strcmp (flag, "OUTPUT_MT") == 0) - ACE_SET_BITS (this->threading_strategy_, - Options::OUTPUT_MT); - else if (ACE_OS::strcmp (flag, "INPUT_MT") == 0) - ACE_SET_BITS (this->threading_strategy_, - Options::INPUT_MT); - break; - } - case 'v': // Verbose mode. - ACE_SET_BITS (this->options_, - Options::VERBOSE); - break; - case 'w': // Time performance for a designated amount of time. - this->performance_window_ = ACE_OS::atoi (get_opt.opt_arg ()); - // Use blocking connection semantics so that we get accurate - // timings (since all connections start at once). - this->blocking_semantics_ = 0; - break; - default: - this->print_usage(); // It's nice to have a usage prompt. - break; - } - } - - return 0; -} diff --git a/apps/Gateway/Gateway/Options.h b/apps/Gateway/Gateway/Options.h deleted file mode 100644 index 82bb7069c3a..00000000000 --- a/apps/Gateway/Gateway/Options.h +++ /dev/null @@ -1,197 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Options.h -// -// = AUTHOR -// Douglas C. Schmidt -// -// ============================================================================ - -#ifndef OPTIONS_H -#define OPTIONS_H - -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/svc_export.h" - -class ACE_Svc_Export Options -{ - // = TITLE - // Singleton that consolidates all Options for a gatewayd. -public: - // = Options that can be enabled/disabled. - enum - { - // = The types of threading strategies. - REACTIVE = 0, - OUTPUT_MT = 1, - INPUT_MT = 2, - - VERBOSE = 01, - DEBUG = 02, - - SUPPLIER_ACCEPTOR = 04, - CONSUMER_ACCEPTOR = 010, - SUPPLIER_CONNECTOR = 020, - CONSUMER_CONNECTOR = 040 - }; - - static Options *instance (void); - // Return Singleton. - - ~Options (void); - // Termination. - - int parse_args (int argc, char *argv[]); - // Parse the arguments and set the options. - - void print_usage(void); - // Print the gateway supported parameters. - // = Accessor methods. - int enabled (int option) const; - // Determine if an option is enabled. - - ACE_Lock_Adapter *locking_strategy (void) const; - // Gets the locking strategy used for serializing access to the - // reference count in . If it's 0, then there's - // no locking strategy and we're using a REACTIVE concurrency - // strategy. - - void locking_strategy (ACE_Lock_Adapter *); - // Set the locking strategy used for serializing access to the - // reference count in . - - int performance_window (void) const; - // Number of seconds after connection establishment to report - // throughput. - - int blocking_semantics (void) const; - // 0 == blocking connects, ACE_NONBLOCK == non-blocking connects. - - int socket_queue_size (void) const; - // Size of the socket queue (0 means "use default"). - - u_long threading_strategy (void) const; - // i.e., REACTIVE, OUTPUT_MT, and/or INPUT_MT. - - u_short supplier_acceptor_port (void) const; - // Our acceptor port number, i.e., the one that we passively listen - // on for connections to arrive from a gatewayd and create a - // Supplier. - - u_short consumer_acceptor_port (void) const; - // Our acceptor port number, i.e., the one that we passively listen - // on for connections to arrive from a gatewayd and create a - // Consumer. - - u_short supplier_connector_port (void) const; - // The connector port number, i.e., the one that we use to actively - // establish connections with a gatewayd and create a Supplier. - - u_short consumer_connector_port (void) const; - // The connector port number, i.e., the one that we use to actively - // establish connections with a gatewayd and create a Consumer. - - const char *connector_host (void) const; - // Our connector port host, i.e., the host running the gatewayd - // process. - - const char *connection_config_file (void) const; - // Name of the connection configuration file. - - const char *consumer_config_file (void) const; - // Name of the consumer map configuration file. - - long max_timeout (void) const; - // The maximum retry timeout delay. - - long max_queue_size (void) const; - // The maximum size of the queue. - - CONNECTION_ID &connection_id (void); - // Returns a reference to the next available connection id; - -private: - enum - { - MAX_QUEUE_SIZE = 1024 * 1024 * 16, - // We'll allow up to 16 megabytes to be queued per-output proxy. - - MAX_TIMEOUT = 32 - // The maximum timeout for trying to re-establish connections. - }; - - Options (void); - // Initialization. - - static Options *instance_; - // Options Singleton instance. - - ACE_Lock_Adapter *locking_strategy_; - // Points to the locking strategy used for serializing access to the - // reference count in . If it's 0, then there's - // no locking strategy and we're using a REACTIVE concurrency - // strategy. - - int performance_window_; - // Number of seconds after connection establishment to report - // throughput. - - int blocking_semantics_; - // 0 == blocking connects, ACE_NONBLOCK == non-blocking connects. - - int socket_queue_size_; - // Size of the socket queue (0 means "use default"). - - u_long threading_strategy_; - // i.e., REACTIVE, OUTPUT_MT, and/or INPUT_MT. - - u_long options_; - // Flag to indicate if we want verbose diagnostics. - - u_short supplier_acceptor_port_; - // The acceptor port number, i.e., the one that we passively listen - // on for connections to arrive from a gatewayd and create a - // Supplier. - - u_short consumer_acceptor_port_; - // The acceptor port number, i.e., the one that we passively listen - // on for connections to arrive from a gatewayd and create a - // Consumer. - - u_short supplier_connector_port_; - // The connector port number, i.e., the one that we use to actively - // establish connections with a gatewayd and create a Supplier. - - u_short consumer_connector_port_; - // The connector port number, i.e., the one that we use to actively - // establish connections with a gatewayd and create a Consumer. - - long max_timeout_; - // The maximum retry timeout delay. - - long max_queue_size_; - // The maximum size of the queue. - - CONNECTION_ID connection_id_; - // The next available connection id. - - char connection_config_file_[MAXPATHLEN + 1]; - // Name of the connection configuration file. - - char consumer_config_file_[MAXPATHLEN + 1]; - // Name of the consumer map configuration file. -}; - -#endif /* OPTIONS_H */ diff --git a/apps/Gateway/Gateway/connection_config b/apps/Gateway/Gateway/connection_config deleted file mode 100644 index 93730edc0da..00000000000 --- a/apps/Gateway/Gateway/connection_config +++ /dev/null @@ -1,55 +0,0 @@ -# Configuration file that the gatewayd process uses to determine -# connection information about proxies. -# -# The following provides an explanation for the fields in this file, -# and how they relate to fields in the corresponding "consumer_config" -# file. -# -# 1. Connection ID -- Each Connection Handler is given a unique ID -# that is used in the "consumer_config" file to specify to which -# Consumers the Event Channel will forward incoming events from -# Suppliers using that connection. The Connection ID field is the -# "key" that is used to match up connections in this file with the -# Consumer subscription requests in the "consumer_config" file. -# The connection ids should start at 1 and monotonically increase -# by increments of 1. This makes it possible for the Gateway to -# properly allocate connection ids for Peers that connect to it. -# -# 2. Host -- The host name where the Supplier/Consumer peerd -# process is running. -# -# 3. Remote Port -- The port number where the remote -# Supplier/Consumer peerd process is listening on. -# If this is a '*' character it is an indication to the -# Gateway to use the "default value," e.g., which can be provided -# on the command-line, etc. -# -# 4. Handler Role -- i.e., Consumer ('C') or Supplier ('S') -# -# 5. Max Retry Timeout -- The maximum amount of time that we'll -# wait between retry attempts (these start at 1 second and -# double until they reach the Max Retry Timeout). -# If this is a '*' character it is an indication to the -# Gateway to use the "default value," e.g., which can be provided -# on the command-line, etc. -# -# 6. Local Port -- The port number that we want to use for -# our local Proxy connection. If this is the value 0 or the '*' -# character, then we'll let the socket implementation pick this -# value for us. -# -# 7. Priority -- Each Consumer/Supplier can be given a priority -# that will determine its importance relative to other -# Consumers/Suppliers (this feature isn't implemented yet). -# -# Connection Host Remote Handler Max Retry Local Priority -# ID Port Role Timeout Port -# ---------- -------- ------ ------ ---------- ----- -------- - 1 localhost * S * * 1 - 2 localhost * C * * 1 -# 3 mambo.cs * C * * 1 -# 4 lambada.cs * C * * 1 -# 5 lambada.cs * C * * 1 -# 6 tango.cs * C * * 1 -# 7 tango.cs * S * * 1 -# 8 tango.cs * C * * 1 diff --git a/apps/Gateway/Gateway/consumer_config b/apps/Gateway/Gateway/consumer_config deleted file mode 100644 index 1aaa3fc4028..00000000000 --- a/apps/Gateway/Gateway/consumer_config +++ /dev/null @@ -1,35 +0,0 @@ -# Configuration file that the gatewayd process uses to determine which -# Consumers will receive events from which Suppliers. For now, the -# Gateway only allows Consumers to "subscribe" to receive events from -# particular Suppliers. A more flexible implementation will allow -# Consumers to subscribe to particular types of events, as well. -# -# The following provides an explanation for the fields in this file, -# and how they relate to fields in the corresponding "connection_config" -# file. -# -# 1. Connection ID -- Each Connection Handler is given a unique ID -# that is used in the "consumer_config" file to specify to which -# Consumers the Event Channel will forward incoming events from -# Suppliers. The Connection ID field is the "key" that is used to -# match up Consumer subscription requests in this file with -# connections in the "connection_config" file. -# -# 2. Event Type -- Indicates the type of the event. Consumers -# can use this to only subscribe to certain types of events. -# This feature is currently not implemented. -# -# 3. Consumers -- Indicates which Consumers will receive events sent -# from this Proxy/Supplier ID, i.e., Consumers can subscribe to -# receive events from particular Suppliers. Note that more than -# one Consumer can subscribe to the same Supplier event, i.e., -# we support logical "multicast" (which is currently implemented -# using multi-point unicast via TCP/IP). -# -# Connection Event Consumers -# ID Type -# ---------- ---- --------- - 1 0 2 -# 2 0 3,4 -# 3 0 4 -# 4 0 5 diff --git a/apps/Gateway/Gateway/gatewayd.cpp b/apps/Gateway/Gateway/gatewayd.cpp deleted file mode 100644 index 99a93b35408..00000000000 --- a/apps/Gateway/Gateway/gatewayd.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// peerd.h -// -// = DESCRIPTION -// Driver for the gateway daemon (gatewayd). Note that this is -// completely generic code due to the Service Configurator -// framework! -// -// = AUTHOR -// Douglas C. Schmidt -// -// ============================================================================ - -#include "ace/Service_Config.h" -#include "ace/Service_Object.h" -#include "ace/Log_Msg.h" -#include "Gateway.h" - -ACE_RCSID (Gateway, - gatewayd, - "$Id$") - -int -main (int argc, char *argv[]) -{ - if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0) - { - // Use static linking. - ACE_Service_Object_Ptr sp = ACE_SVC_INVOKE (Gateway); - - if (sp->init (argc - 1, argv + 1) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "init"), - 1); - - // Run forever, performing the configured services until we - // are shut down by a SIGINT/SIGQUIT signal. - - ACE_Reactor::run_event_loop (); - - // Destructor of automagically call - // . - } - else - { - if (ACE_Service_Config::open (argc, argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "open"), - 1); - else // Use dynamic linking. - - // Run forever, performing the configured services until we are - // shut down by a signal (e.g., SIGINT or SIGQUIT). - - ACE_Reactor::run_event_loop (); - } - return 0; -} diff --git a/apps/Gateway/Gateway/gatewayd.dsp b/apps/Gateway/Gateway/gatewayd.dsp deleted file mode 100644 index 308a4410e65..00000000000 --- a/apps/Gateway/Gateway/gatewayd.dsp +++ /dev/null @@ -1,59 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gatewayd" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=gatewayd - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "gatewayd.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gatewayd.mak" CFG="gatewayd - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gatewayd - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Gateway.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" -# Begin Target - -# Name "gatewayd - Win32 Debug" -# Begin Source File - -SOURCE=.\gatewayd.cpp -# End Source File -# End Target -# End Project diff --git a/apps/Gateway/Gateway/svc.conf b/apps/Gateway/Gateway/svc.conf deleted file mode 100644 index 9b35a7dcbd6..00000000000 --- a/apps/Gateway/Gateway/svc.conf +++ /dev/null @@ -1,3 +0,0 @@ -#static Svc_Manager "-d -p 2913" -dynamic Gateway Service_Object * ./Gateway:_make_Gateway() active "-b -d -c C|S -a C|S -P connection_config -C consumer_config" - diff --git a/apps/Gateway/Makefile b/apps/Gateway/Makefile deleted file mode 100644 index feb67278477..00000000000 --- a/apps/Gateway/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id: Makefile 1.1 10/18/96 -# -# Makefile for the Gateway application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -INFO = README - -DIRS = Gateway \ - Peer - - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU - diff --git a/apps/Gateway/Makefile.bor b/apps/Gateway/Makefile.bor deleted file mode 100644 index 60b7e1be137..00000000000 --- a/apps/Gateway/Makefile.bor +++ /dev/null @@ -1,3 +0,0 @@ -DIRS = Gateway Peer - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/apps/Gateway/Peer/Makefile b/apps/Gateway/Peer/Makefile deleted file mode 100644 index 6ae3ef6c513..00000000000 --- a/apps/Gateway/Peer/Makefile +++ /dev/null @@ -1,371 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the Peer test driver portion of the Gateway application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- -ACE_SHLIBS += $(ACELIB) - -BIN = peerd -LIB = libPeer.a -SHLIB = libPeer.$(SOEXT) - -FILES = Options \ - Peer - -LSRC = $(addsuffix .cpp,$(FILES)) -LDLIBS = - -BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -INCLDIRS += -I../Gateway - -ifeq ($(static_libs_only),1) -$(VBIN): $(VLIB) -else -$(VBIN): $(VSHLIB) -endif - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.cpp $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i Options.h ../Gateway/Event.h \ - $(ACE_ROOT)/ace/svc_export.h - -.obj/Peer.o .obj/Peer.so .shobj/Peer.o .shobj/Peer.so: Peer.cpp Peer.h $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Connector.cpp Options.h ../Gateway/Event.h \ - $(ACE_ROOT)/ace/svc_export.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/apps/Gateway/Peer/Makefile.bor b/apps/Gateway/Peer/Makefile.bor deleted file mode 100644 index 7d01fd58d4a..00000000000 --- a/apps/Gateway/Peer/Makefile.bor +++ /dev/null @@ -1,8 +0,0 @@ - -NAME = peerd -OBJFILES = \ - $(OBJDIR)\Options.obj \ - $(OBJDIR)\Peer.obj \ - $(OBJDIR)\peerd.obj -!include <$(ACE_ROOT)\apps\build.bor> - diff --git a/apps/Gateway/Peer/Options.cpp b/apps/Gateway/Peer/Options.cpp deleted file mode 100644 index e4c5842c696..00000000000 --- a/apps/Gateway/Peer/Options.cpp +++ /dev/null @@ -1,195 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" -#include "Options.h" - -ACE_RCSID(Peer, Options, "$Id$") - -// Static initialization. -Options *Options::instance_ = 0; - -void -Options::print_usage_and_die (void) -{ - ACE_DEBUG ((LM_DEBUG, - "%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n")); - ACE_OS::exit (1); -} - -Options::Options (void) - : options_ (0), - supplier_acceptor_port_ (DEFAULT_PEER_SUPPLIER_PORT), - consumer_acceptor_port_ (DEFAULT_PEER_CONSUMER_PORT), - supplier_connector_port_ (DEFAULT_GATEWAY_SUPPLIER_PORT), - consumer_connector_port_ (DEFAULT_GATEWAY_CONSUMER_PORT), - connector_host_ (ACE_DEFAULT_SERVER_HOST), - timeout_ (0), - max_queue_size_ (MAX_QUEUE_SIZE), - connection_id_ (0) -{ - char *timeout = ACE_OS::getenv ("TIMEOUT"); - - if (timeout == 0) - this->timeout_ = Options::DEFAULT_TIMEOUT; - else - this->timeout_ = ACE_OS::atoi (timeout); -} - -Options * -Options::instance (void) -{ - if (Options::instance_ == 0) - ACE_NEW_RETURN (Options::instance_, Options, 0); - - return Options::instance_; -} - -long -Options::timeout (void) const -{ - return this->timeout_; -} - -CONNECTION_ID & -Options::connection_id (void) -{ - return this->connection_id_; -} - -long -Options::max_queue_size (void) const -{ - return this->max_queue_size_; -} - -u_short -Options::consumer_acceptor_port (void) const -{ - return this->consumer_acceptor_port_; -} - -u_short -Options::supplier_acceptor_port (void) const -{ - return this->supplier_acceptor_port_; -} - -u_short -Options::consumer_connector_port (void) const -{ - return this->consumer_connector_port_; -} - -u_short -Options::supplier_connector_port (void) const -{ - return this->supplier_connector_port_; -} - -const char * -Options::connector_host (void) const -{ - return this->connector_host_; -} - -int -Options::enabled (int option) const -{ - return ACE_BIT_ENABLED (this->options_, option); -} - -void -Options::parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opt (argc, argv, "a:c:C:h:m:t:v", 0); - - for (int c; (c = get_opt ()) != -1; ) - { - switch (c) - { - case 'a': - { - // Become an Acceptor. - - for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|"); - flag != 0; - flag = ACE_OS::strtok (0, "|")) - if (ACE_OS::strncasecmp (flag, "C", 1) == 0) - { - ACE_SET_BITS (this->options_, - Options::CONSUMER_ACCEPTOR); - if (ACE_OS::strlen (flag) > 1) - // Set the Consumer Acceptor port number. - this->consumer_acceptor_port_ = ACE_OS::atoi (flag + 2); - } - else if (ACE_OS::strncasecmp (flag, "S", 1) == 0) - { - ACE_SET_BITS (this->options_, - Options::SUPPLIER_ACCEPTOR); - if (ACE_OS::strlen (flag) > 1) - // Set the Supplier Acceptor port number. - this->supplier_acceptor_port_ = ACE_OS::atoi (flag + 2); - } - } - break; - /* NOTREACHED */ - case 'c': - { - // Become a Connector. - - for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|"); - flag != 0; - flag = ACE_OS::strtok (0, "|")) - if (ACE_OS::strncasecmp (flag, "C", 1) == 0) - { - ACE_SET_BITS (this->options_, - Options::CONSUMER_CONNECTOR); - if (ACE_OS::strlen (flag) > 1) - // Set the Consumer Connector port number. - this->consumer_connector_port_ = ACE_OS::atoi (flag + 2); - } - else if (ACE_OS::strncasecmp (flag, "S", 1) == 0) - { - ACE_SET_BITS (this->options_, - Options::SUPPLIER_CONNECTOR); - if (ACE_OS::strlen (flag) > 1) - // Set the Supplier Connector port number. - this->supplier_connector_port_ = ACE_OS::atoi (flag + 2); - } - } - break; - /* NOTREACHED */ - case 'C': - this->connection_id_ = ACE_OS::atoi (get_opt.opt_arg ()); - break; - /* NOTREACHED */ - case 'h': - // connector host - this->connector_host_ = get_opt.opt_arg (); - break; - /* NOTREACHED */ - case 'm': - // max queue size. - this->max_queue_size_ = ACE_OS::atoi (get_opt.opt_arg ()); - break; - /* NOTREACHED */ - case 't': - // Timeout - this->timeout_ = ACE_OS::atoi (get_opt.opt_arg ()); - break; - /* NOTREACHED */ - case 'v': - // Verbose mode. - ACE_SET_BITS (this->options_, Options::VERBOSE); - break; - /* NOTREACHED */ - default: - this->print_usage_and_die (); - /* NOTREACHED */ - } - } -} - diff --git a/apps/Gateway/Peer/Options.h b/apps/Gateway/Peer/Options.h deleted file mode 100644 index 371b043deac..00000000000 --- a/apps/Gateway/Peer/Options.h +++ /dev/null @@ -1,135 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Options.h -// -// = AUTHOR -// Douglas C. Schmidt -// -// ============================================================================ - -#ifndef OPTIONS_H -#define OPTIONS_H - -#include "../Gateway/Event.h" -#include "ace/svc_export.h" - -class ACE_Svc_Export Options - // = TITLE - // Singleton that consolidates all Options for a peerd. -{ -public: - // = Options that can be enabled/disabled. - enum - { - VERBOSE = 01, - SUPPLIER_ACCEPTOR = 02, - CONSUMER_ACCEPTOR = 04, - SUPPLIER_CONNECTOR = 010, - CONSUMER_CONNECTOR = 020 - }; - - static Options *instance (void); - // Return Singleton. - - void parse_args (int argc, char *argv[]); - // Parse the arguments and set the options. - - // = Accessor methods. - int enabled (int option) const; - // Determine if an option is enabled. - - u_short supplier_acceptor_port (void) const; - // Our acceptor port number, i.e., the one that we passively listen - // on for connections to arrive from a gatewayd and create a - // Supplier. - - u_short consumer_acceptor_port (void) const; - // Our acceptor port number, i.e., the one that we passively listen - // on for connections to arrive from a gatewayd and create a - // Consumer. - - u_short supplier_connector_port (void) const; - // The connector port number, i.e., the one that we use to actively - // establish connections with a gatewayd and create a Supplier. - - u_short consumer_connector_port (void) const; - // The connector port number, i.e., the one that we use to actively - // establish connections with a gatewayd and create a Consumer. - - const char *connector_host (void) const; - // Our connector port host, i.e., the host running the gatewayd - // process. - - long timeout (void) const; - // Duration between disconnects. - - long max_queue_size (void) const; - // The maximum size of the queue. - - CONNECTION_ID &connection_id (void); - // Returns a reference to the connection id. - -private: - enum - { - MAX_QUEUE_SIZE = 1024 * 1024 * 16, - // We'll allow up to 16 megabytes to be queued per-output - // channel!!!! This is clearly a policy in search of - // refinement... - - DEFAULT_TIMEOUT = 60 - // By default, disconnect the peer every minute. - }; - - Options (void); - // Ensure Singleton. - - void print_usage_and_die (void); - // Explain usage and exit. - - static Options *instance_; - // Singleton. - - u_long options_; - // Flag to indicate if we want verbose diagnostics. - - u_short supplier_acceptor_port_; - // The acceptor port number, i.e., the one that we passively listen - // on for connections to arrive from a gatewayd and create a - // Supplier. - - u_short consumer_acceptor_port_; - // The acceptor port number, i.e., the one that we passively listen - // on for connections to arrive from a gatewayd and create a - // Consumer. - - u_short supplier_connector_port_; - // The connector port number, i.e., the one that we use to actively - // establish connections with a gatewayd and create a Supplier. - - u_short consumer_connector_port_; - // The connector port number, i.e., the one that we use to actively - // establish connections with a gatewayd and create a Consumer. - - const char *connector_host_; - // Our connector host, i.e., where the gatewayd process is running. - - long timeout_; - // The amount of time to wait before disconnecting from the Peerd. - - long max_queue_size_; - // The maximum size that the queue can grow to. - - CONNECTION_ID connection_id_; - // The connection id. -}; - -#endif /* OPTIONS_H */ diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp deleted file mode 100644 index c19790fd9bf..00000000000 --- a/apps/Gateway/Peer/Peer.cpp +++ /dev/null @@ -1,908 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "Peer.h" - -ACE_RCSID(Peer, Peer, "$Id$") - -Peer_Handler::Peer_Handler (void) - : connection_id_ (-1), // Maybe it's better than 0. - msg_frag_ (0), - total_bytes_ (0) -{ - // Set the high water mark of the . This is used - // to exert flow control. - this->msg_queue ()->high_water_mark (Options::instance ()->max_queue_size ()); - first_time_ = 1; // It will be first time to open Peer_Handler. -} - -// Upcall from the that turns control -// over to our application-specific Gateway handler. - -int -Peer_Handler::open (void *a) -{ - ACE_DEBUG ((LM_DEBUG, - "handle = %d\n", - this->peer ().get_handle ())); - - // Call down to the base class to activate and register this handler - // with an . - if (this->inherited::open (a) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "open"), - -1); - - if (this->peer ().enable (ACE_NONBLOCK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "enable"), - -1); - - ACE_Time_Value timeout (Options::instance ()->timeout ()); - - // Schedule the time between disconnects. This should really be a - // "tunable" parameter. - if (ACE_Reactor::instance ()->schedule_timer - (this, 0, timeout) == -1) - ACE_ERROR ((LM_ERROR, - "%p\n", - "schedule_timer")); - - // If there are events left in the queue, make sure we enable the - // appropriately to get them sent out. - if (this->msg_queue ()->is_empty () == 0 - && ACE_Reactor::instance ()->schedule_wakeup - (this, ACE_Event_Handler::WRITE_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "schedule_wakeup"), - -1); - - // First action is to wait to be notified of our connection id. - this->do_action_ = &Peer_Handler::await_connection_id; - return 0; -} - -int -Peer_Handler::transmit (ACE_Message_Block *mb, - size_t n, - int event_type) -{ - Event *event = (Event *) mb->rd_ptr (); - - // Initialize the header. - new (&event->header_) Event_Header (n, - this->connection_id_, - event_type, - 0); - - // Convert all the fields into network byte order. - event->header_.encode (); - - // Move the write pointer to the end of the event. - mb->wr_ptr (sizeof (Event_Header) + n); - - if (this->put (mb) == -1) - { - if (errno == EWOULDBLOCK) // The queue has filled up! - ACE_ERROR ((LM_ERROR, - "%p\n", - "gateway is flow controlled, so we're dropping events")); - else - ACE_ERROR ((LM_ERROR, - "%p\n", - "transmission failure in transmit()")); // Function name fixed. - // Caller is responsible for freeing a ACE_Message_Block - // if failures occur. - mb->release (); - return -1; - } - return 0; -} - -// Read events from stdin and send them to the gatewayd. - -int -Peer_Handler::transmit_stdin (void) -{ - // If return value is -1, then first_time_ must be reset to 1. - int result = 0; - if (this->connection_id_ != -1) - { - ACE_Message_Block *mb; - - ACE_NEW_RETURN (mb, - ACE_Message_Block (sizeof (Event)), - -1); - - // Cast the message block payload into an pointer. - Event *event = (Event *) mb->rd_ptr (); - - ssize_t n = ACE_OS::read (ACE_STDIN, - event->data_, - sizeof event->data_); - switch (n) - { - case 0: - ACE_DEBUG ((LM_DEBUG, - "stdin closing down\n")); - - // Take stdin out of the ACE_Reactor so we stop trying to - // send events. - ACE_Reactor::instance ()->remove_handler - (ACE_STDIN, - ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK); - mb->release (); - result = 0; // - break; - /* NOTREACHED */ - case -1: - mb->release (); - ACE_ERROR ((LM_ERROR, - "%p\n", - "read")); - result = 0; // - break; - /* NOTREACHED */ - default: - // Do not return directly, save the return value. - result = this->transmit (mb, n, ROUTING_EVENT); - break; - /* NOTREACHED */ - } - - // Do not return at here, but at exit of function. - /*return 0;*/ - } - else - { - ACE_DEBUG ((LM_DEBUG, - "Must transmit over an opened channel.\n")); - result = -1; // Save return value at here, return at exit of function. - } - // If transmit error, the stdin-thread will be cancelled, so should - // reset first_time_ to 1, which will register_stdin_handler again. - if (result == -1) - first_time_ = 1; - - return result; -} - -// Perform a non-blocking of event MB. If we are unable to send -// the entire event the remainder is re-queue'd at the *front* of the -// Message_Queue. - -int -Peer_Handler::nonblk_put (ACE_Message_Block *mb) -{ - // Try to send the event. If we don't send it all (e.g., due to - // flow control), then re-queue the remainder at the head of the - // and ask the to inform us (via - // ) when it is possible to try again. - - ssize_t n = this->send (mb); - - if (n == -1) - // -1 is returned only when things have really gone wrong (i.e., - // not when flow control occurs). - return -1; - else if (errno == EWOULDBLOCK) - { - // We didn't manage to send everything, so requeue. - ACE_DEBUG ((LM_DEBUG, - "queueing activated on handle %d to connection id %d\n", - this->get_handle (), - this->connection_id_)); - - // Re-queue in *front* of the list to preserve order. - if (this->msg_queue ()->enqueue_head - (mb, - (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "enqueue_head"), - -1); - // Tell ACE_Reactor to call us back when we can send again. - if (ACE_Reactor::instance ()->schedule_wakeup - (this, ACE_Event_Handler::WRITE_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "schedule_wakeup"), - -1); - return 0; - } - else - return n; -} - -// Finish sending a event when flow control conditions abate. This -// method is automatically called by the ACE_Reactor. - -int -Peer_Handler::handle_output (ACE_HANDLE) -{ - ACE_Message_Block *mb = 0; - - ACE_DEBUG ((LM_DEBUG, - "in handle_output\n")); - - if (this->msg_queue ()->dequeue_head - (mb, - (ACE_Time_Value *) &ACE_Time_Value::zero) != -1) - { - switch (this->nonblk_put (mb)) - { - case 0: // Partial send. - ACE_ASSERT (errno == EWOULDBLOCK); - // Didn't write everything this time, come back later... - break; - /* NOTREACHED */ - case -1: - // Caller is responsible for freeing a ACE_Message_Block if - // failures occur. - mb->release (); - ACE_ERROR ((LM_ERROR, - "%p\n", - "transmission failure in handle_output")); - /* FALLTHROUGH */ - default: // Sent the whole thing. - // If we succeed in writing the entire event (or we did not - // fail due to EWOULDBLOCK) then check if there are more - // events on the . If there aren't, tell - // the not to notify us anymore (at least - // until there are new events queued up). - - if (this->msg_queue ()->is_empty ()) - { - ACE_DEBUG ((LM_DEBUG, - "queue now empty on handle %d to connection id %d\n", - this->get_handle (), - this->connection_id_)); - - if (ACE_Reactor::instance ()->cancel_wakeup - (this, ACE_Event_Handler::WRITE_MASK) == -1) - ACE_ERROR ((LM_ERROR, - "%p\n", - "cancel_wakeup")); - } - } - return 0; - } - else - // If the list is empty there's a bug! - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "dequeue_head"), - 0); -} - -// Send an event to a peer (may block if necessary). - -int -Peer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *) -{ - if (this->msg_queue ()->is_empty ()) - // Try to send the event *without* blocking! - return this->nonblk_put (mb); - else - // If we have queued up events due to flow control then just - // enqueue and return. - return this->msg_queue ()->enqueue_tail - (mb, (ACE_Time_Value *) &ACE_Time_Value::zero); -} - -// Send an Peer event to gatewayd. - -int -Peer_Handler::send (ACE_Message_Block *mb) -{ - size_t len = mb->length (); - - ssize_t n = this->peer ().send (mb->rd_ptr (), len); - - if (n <= 0) - return errno == EWOULDBLOCK ? 0 : n; - else if (n < (ssize_t) len) - { - // Re-adjust pointer to skip over the part we did send. - mb->rd_ptr (n); - this->total_bytes_ += n; - } - else // if (n == length). - { - // The whole event is sent, we can now safely deallocate the - // buffer. Note that this should decrement a reference count... - this->total_bytes_ += n; - mb->release (); - errno = 0; - } - - ACE_DEBUG ((LM_DEBUG, - "sent %d bytes, total bytes sent = %d\n", - n, - this->total_bytes_)); - return n; -} - -// Receive an Event from gatewayd. Handles fragmentation. - -int -Peer_Handler::recv (ACE_Message_Block *&mb) -{ - if (this->msg_frag_ == 0) - // No existing fragment... - ACE_NEW_RETURN (this->msg_frag_, - ACE_Message_Block (sizeof (Event)), - -1); - - Event *event = (Event *) this->msg_frag_->rd_ptr (); - ssize_t header_received = 0; - - const size_t HEADER_SIZE = sizeof (Event_Header); - ssize_t header_bytes_left_to_read = - HEADER_SIZE - this->msg_frag_->length (); - - if (header_bytes_left_to_read > 0) - { - header_received = this->peer ().recv - (this->msg_frag_->wr_ptr (), - header_bytes_left_to_read); - - if (header_received == -1 /* error */ - || header_received == 0 /* EOF */) - { - ACE_ERROR ((LM_ERROR, - "%p\n", - "Recv error during header read")); - ACE_DEBUG ((LM_DEBUG, - "attempted to read %d bytes\n", - header_bytes_left_to_read)); - this->msg_frag_ = this->msg_frag_->release (); - return header_received; - } - - // Bump the write pointer by the amount read. - this->msg_frag_->wr_ptr (header_received); - - // At this point we may or may not have the ENTIRE header. - if (this->msg_frag_->length () < HEADER_SIZE) - { - ACE_DEBUG ((LM_DEBUG, - "Partial header received: only %d bytes\n", - this->msg_frag_->length ())); - // Notify the caller that we didn't get an entire event. - errno = EWOULDBLOCK; - return -1; - } - - // Convert the header into host byte order so that we can access - // it directly without having to repeatedly muck with it... - event->header_.decode (); - - if (event->header_.len_ > ACE_INT32 (sizeof event->data_)) - { - // This data_ payload is too big! - errno = EINVAL; - ACE_DEBUG ((LM_DEBUG, - "Data payload is too big (%d bytes)\n", - event->header_.len_)); - return -1; - } - } - - // At this point there is a complete, valid header in Event. Now we - // need to get the event payload. Due to incomplete reads this may - // not be the first time we've read in a fragment for this message. - // We account for this here. Note that the first time in here - // wr_ptr> will point to data_>. Every time we - // do a successful fragment read, we advance . Therefore, - // by subtracting how much we've already read from the - // header_.len_> we complete the - // ... - - ssize_t data_bytes_left_to_read = - ssize_t (event->header_.len_ - (msg_frag_->wr_ptr () - event->data_)); - - // peer().recv() should not be called when data_bytes_left_to_read is 0. - ssize_t data_received = !data_bytes_left_to_read ? 0 : - this->peer ().recv (this->msg_frag_->wr_ptr (), - data_bytes_left_to_read); - - // Try to receive the remainder of the event. - - switch (data_received) - { - case -1: - if (errno == EWOULDBLOCK) - // This might happen if only the header came through. - return -1; - else - /* FALLTHROUGH */; - - case 0: // Premature EOF. - if (data_bytes_left_to_read) - { - this->msg_frag_ = this->msg_frag_->release (); - return 0; - } - /* FALLTHROUGH */; - - default: - // Set the write pointer at 1 past the end of the event. - this->msg_frag_->wr_ptr (data_received); - - if (data_received != data_bytes_left_to_read) - { - errno = EWOULDBLOCK; - // Inform caller that we didn't get the whole event. - return -1; - } - else - { - // Set the read pointer to the beginning of the event. - this->msg_frag_->rd_ptr (this->msg_frag_->base ()); - - mb = this->msg_frag_; - - // Reset the pointer to indicate we've got an entire event. - this->msg_frag_ = 0; - } - - ACE_DEBUG ((LM_DEBUG, - "(%t) connection id = %d, cur len = %d, total bytes read = %d\n", - event->header_.connection_id_, - event->header_.len_, - data_received + header_received)); - if (Options::instance ()->enabled (Options::VERBOSE)) - ACE_DEBUG ((LM_DEBUG, - "data_ = %*s\n", - event->header_.len_ - 2, - event->data_)); - return data_received + header_received; - } -} - -// Receive various types of input (e.g., Peer event from the gatewayd, -// as well as stdio). - -int -Peer_Handler::handle_input (ACE_HANDLE sd) -{ - ACE_DEBUG ((LM_DEBUG, - "in handle_input, sd = %d\n", - sd)); - if (sd == ACE_STDIN) // Handle event from stdin. - return this->transmit_stdin (); - else - // Perform the appropriate action depending on the state we are - // in. - return (this->*do_action_) (); -} - -// Action that receives our connection id from the Gateway. - -int -Peer_Handler::await_connection_id (void) -{ - ssize_t n = this->peer ().recv (&this->connection_id_, - sizeof this->connection_id_); - - if (n != sizeof this->connection_id_) - { - if (n == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "gatewayd has closed down unexpectedly\n"), - -1); - else - ACE_ERROR_RETURN ((LM_ERROR, - "%p, bytes received on handle %d = %d\n", - "recv", - this->get_handle (), - n), - -1); - } - else - { - this->connection_id_ = ntohl (this->connection_id_); - ACE_DEBUG ((LM_DEBUG, - "assigned connection id %d\n", - this->connection_id_)); - } - - // Subscribe for events if we're a Consumer. - if (Options::instance ()->enabled (Options::CONSUMER_CONNECTOR)) - this->subscribe (); - - // No need to disconnect by timeout. - ACE_Reactor::instance ()->cancel_timer(this); - // Transition to the action that waits for Peer events. - this->do_action_ = &Peer_Handler::await_events; - - // Reset standard input. - ACE_OS::rewind (stdin); - - // Call register_stdin_handler only once, until the stdin-thread - // closed which caused by transmit_stdin error. - if (first_time_) - { - // Register this handler to receive test events on stdin. - if (ACE_Event_Handler::register_stdin_handler - (this, - ACE_Reactor::instance (), - ACE_Thread_Manager::instance ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\n", - "register_stdin_handler"), - -1); - - // Next time in await_connection_id(), I'll don't call - // register_stdin_handler(). - first_time_ = 0; - } - return 0; -} - -int -Peer_Handler::subscribe (void) -{ - ACE_Message_Block *mb; - - ACE_NEW_RETURN (mb, - ACE_Message_Block (sizeof (Event)), - -1); - - Subscription *subscription = - (Subscription *) ((Event *) mb->rd_ptr ())->data_; - subscription->connection_id_ = - Options::instance ()->connection_id (); - - return this->transmit (mb, sizeof *subscription, SUBSCRIPTION_EVENT); -} - -// Action that receives events from the Gateway. - -int -Peer_Handler::await_events (void) -{ - ACE_Message_Block *mb = 0; - - ssize_t n = this->recv (mb); - - switch (n) - { - case 0: - ACE_ERROR_RETURN ((LM_ERROR, - "gatewayd has closed down\n"), - -1); - /* NOTREACHED */ - case -1: - if (errno == EWOULDBLOCK) - // A short-read, we'll come back and finish it up later on! - return 0; - else - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "recv"), - -1); - /* NOTREACHED */ - default: - { - // We got a valid event, so let's process it now! At the - // moment, we just print out the event contents... - - Event *event = (Event *) mb->rd_ptr (); - this->total_bytes_ += mb->length (); - - ACE_DEBUG ((LM_DEBUG, - "route id = %d, cur len = %d, total len = %d\n", - event->header_.connection_id_, - event->header_.len_, - this->total_bytes_)); - if (Options::instance ()->enabled (Options::VERBOSE)) - ACE_DEBUG ((LM_DEBUG, - "data_ = %*s\n", - event->header_.len_ - 2, - event->data_)); - mb->release (); - return 0; - } - } -} - -// Periodically send events via ACE_Reactor timer mechanism. - -int -Peer_Handler::handle_timeout (const ACE_Time_Value &, - const void *) -{ - // Shut down the handler. - return this->handle_close (); -} - -Peer_Handler::~Peer_Handler (void) -{ - // Shut down the handler. - this->handle_close (); -} - -// Handle shutdown of the Peer object. - -int -Peer_Handler::handle_close (ACE_HANDLE, - ACE_Reactor_Mask) -{ - if (this->get_handle () != ACE_INVALID_HANDLE) - { - ACE_DEBUG ((LM_DEBUG, - "shutting down Peer on handle %d\n", - this->get_handle ())); - - ACE_Reactor_Mask mask = - ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK; - - // Explicitly remove ourselves for ACE_STDIN (the - // removes the HANDLE. Note that - // instructs the ACE_Reactor *not* to call , which - // would otherwise lead to infinite recursion!). - ACE_Reactor::instance ()->remove_handler - (ACE_STDIN, mask); - - // Deregister this handler with the ACE_Reactor. - if (ACE_Reactor::instance ()->remove_handler - (this, mask) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "handle = %d: %p\n", - this->get_handle (), - "remove_handler"), - -1); - // Close down the peer. - this->peer ().close (); - } - return 0; -} - -int -Peer_Acceptor::start (u_short port) -{ - // This object only gets allocated once and is just recycled - // forever. - ACE_NEW_RETURN (peer_handler_, Peer_Handler, -1); - - this->addr_.set (port); - - ACE_DEBUG ((LM_DEBUG, - "opening acceptor at port %d\n", - port)); - - // Call down to the method. - if (this->inherited::open (this->addr_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "open"), - -1); - else if (this->acceptor ().get_local_addr (this->addr_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "get_local_addr"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "accepting at port %d\n", - this->addr_.get_port_number ())); - return 0; -} - -Peer_Acceptor::Peer_Acceptor (void) - : peer_handler_ (0) -{ -} - -int -Peer_Acceptor::close (void) -{ - // Will trigger a delete. - if (this->peer_handler_ != 0) - this->peer_handler_->destroy (); - - // Close down the base class. - return this->inherited::close (); -} - -// Note how this method just passes back the pre-allocated -// instead of having the allocate a new -// one each time! - -int -Peer_Acceptor::make_svc_handler (Peer_Handler *&sh) -{ - sh = this->peer_handler_; - return 0; -} - -int -Peer_Connector::open_connector (Peer_Handler *&peer_handler, - u_short port) -{ - // This object only gets allocated once and is just recycled - // forever. - ACE_NEW_RETURN (peer_handler, - Peer_Handler, - -1); - - ACE_INET_Addr addr (port, - Options::instance ()->connector_host ()); - - ACE_DEBUG ((LM_DEBUG, - "connecting to %s:%d\n", - addr.get_host_name (), - addr.get_port_number ())); - - if (this->connect (peer_handler, addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "connect"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "connected to %s:%d\n", - addr.get_host_name (), - addr.get_port_number ())); - return 0; -} - -int -Peer_Connector::open (ACE_Reactor *, int) -{ - this->supplier_peer_handler_ = 0; - this->consumer_peer_handler_ = 0; - - if (Options::instance ()->enabled (Options::SUPPLIER_CONNECTOR) - && this->open_connector (this->supplier_peer_handler_, - Options::instance ()->supplier_connector_port ()) == -1) - return -1; - - if (Options::instance ()->enabled (Options::CONSUMER_CONNECTOR) - && this->open_connector (this->consumer_peer_handler_, - Options::instance ()->consumer_connector_port ()) == -1) - return -1; - - return 0; -} - -int -Peer_Factory::handle_signal (int signum, siginfo_t *, ucontext_t *) -{ - if (signum != SIGPIPE) - { - // Shut down the main event loop. - ACE_DEBUG((LM_NOTICE, "Exit case signal\n")); // Why do I exit? - ACE_Reactor::end_event_loop(); - } - - return 0; -} - -// Returns information on the currently active service. - -int -Peer_Factory::info (char **strp, size_t length) const -{ - char buf[BUFSIZ]; - char consumer_addr_str[BUFSIZ]; - char supplier_addr_str[BUFSIZ]; - - ACE_INET_Addr addr; - - if (this->consumer_acceptor_.acceptor ().get_local_addr (addr) == -1) - return -1; - else if (addr.addr_to_string (consumer_addr_str, - sizeof addr) == -1) - return -1; - else if (this->supplier_acceptor_.acceptor ().get_local_addr (addr) == -1) - return -1; - else if (addr.addr_to_string (supplier_addr_str, - sizeof addr) == -1) - return -1; - - ACE_OS::sprintf (buf, - "%s\t C:%s|S:%s/%s %s", - "peerd", - consumer_addr_str, - supplier_addr_str, - "tcp", - "# Gateway traffic generator and data sink\n"); - - if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) - return -1; - else - ACE_OS::strncpy (*strp, buf, length); - return ACE_OS::strlen (buf); -} - -// Hook called by the explicit dynamic linking facility to terminate -// the peer. - -int -Peer_Factory::fini (void) -{ - this->consumer_acceptor_.close (); - this->supplier_acceptor_.close (); - return 0; -} - -// Hook called by the explicit dynamic linking facility to initialize -// the peer. - -int -Peer_Factory::init (int argc, char *argv[]) -{ - Options::instance ()->parse_args (argc, argv); - - ACE_Sig_Set sig_set; - - sig_set.sig_add (SIGINT); - sig_set.sig_add (SIGQUIT); - sig_set.sig_add (SIGPIPE); - - // Register ourselves to receive signals so we can shut down - // gracefully. - - if (ACE_Reactor::instance ()->register_handler (sig_set, - this) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "register_handler"), - -1); - - if (Options::instance ()->enabled (Options::SUPPLIER_ACCEPTOR) - && this->supplier_acceptor_.start - (Options::instance ()->supplier_acceptor_port ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "Acceptor::open"), - -1); - else if (Options::instance ()->enabled (Options::CONSUMER_ACCEPTOR) - && this->consumer_acceptor_.start - (Options::instance ()->consumer_acceptor_port ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "Acceptor::open"), - -1); - else if (this->connector_.open () == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "Connector::open"), - -1); - return 0; -} - -// The following is a "Factory" used by the and -// svc.conf file to dynamically initialize the and -// . - -ACE_SVC_FACTORY_DEFINE (Peer_Factory) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Acceptor; -template class ACE_Connector; -template class ACE_Map_Manager *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Entry *>; -template class ACE_Svc_Handler; -template class ACE_Svc_Tuple; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Acceptor -#pragma instantiate ACE_Connector -#pragma instantiate ACE_Map_Manager *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Entry *> -#pragma instantiate ACE_Svc_Handler -#pragma instantiate ACE_Svc_Tuple -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/Gateway/Peer/Peer.dsp b/apps/Gateway/Peer/Peer.dsp deleted file mode 100644 index 057a8414568..00000000000 --- a/apps/Gateway/Peer/Peer.dsp +++ /dev/null @@ -1,66 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Peer" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=Peer - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Peer.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Peer.mak" CFG="Peer - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Peer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\Gateway" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" -# Begin Target - -# Name "Peer - Win32 Debug" -# Begin Source File - -SOURCE=.\Options.cpp -# End Source File -# Begin Source File - -SOURCE=.\Peer.cpp -# End Source File -# End Target -# End Project diff --git a/apps/Gateway/Peer/Peer.dsw b/apps/Gateway/Peer/Peer.dsw deleted file mode 100644 index d1dd3f1d06a..00000000000 --- a/apps/Gateway/Peer/Peer.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Peer"=.\Peer.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "peerd"=.\peerd.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Peer - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/apps/Gateway/Peer/Peer.h b/apps/Gateway/Peer/Peer.h deleted file mode 100644 index 5857c0c5070..00000000000 --- a/apps/Gateway/Peer/Peer.h +++ /dev/null @@ -1,255 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// Peer.h -// -// = DESCRIPTION -// These classes process Supplier/Consumer events sent from the -// gateway (gatewayd) to its various peers (peerd). The general -// collaboration works as follows: -// -// 1. creates a listener endpoint and waits -// passively for gatewayd to connect with it. -// -// 2. When a gatewayd connects, creates an -// object that sends/receives events from -// gatewayd on that connection. -// -// 3. The waits for gatewayd to inform it of its -// connection ID, which is prepended to all subsequent outgoing -// events sent from peerd. -// -// 4. Once the connection ID is set, peerd periodically sends events -// to gatewayd. Peerd also receives and "processes" events -// forwarded to it from gatewayd. In this program, peerd -// "processes" the events sent to it by writing them to stdout. -// -// Note that in the current peerd implementation, one Peer process -// cannot serve as both a Consumer and Supplier of Events. This is -// because the gatewayd establishes a separate connection for -// Suppliers and Consumers and the peerd only maintains a single -// object to handle this one connection. Enhancing -// this implementation to be both a Consumer and Supplier -// simultaneously is straightforward, however. In addition, -// multiple peerd processes can already work together to play these -// different roles. -// -// = AUTHOR -// Douglas C. Schmidt -// -// ============================================================================ - -#ifndef PEER_H -#define PEER_H - -#include "ace/Service_Config.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Acceptor.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Connector.h" -#include "ace/Svc_Handler.h" -#include "ace/Connector.h" -#include "Options.h" - -ACE_SVC_FACTORY_DECLARE (Peer_Factory) - -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class ACE_Svc_Export ACE_Svc_Handler; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -class ACE_Svc_Export Peer_Handler : public ACE_Svc_Handler -{ - // = TITLE - // Handle Peer events arriving from a Gateway. -public: - // = Initialization and termination methods. - Peer_Handler (void); - // Initialize the peer. - - ~Peer_Handler (void); - // Shutdown the Peer. - - virtual int open (void * = 0); - // Initialize the handler when called by - // . - - virtual int handle_input (ACE_HANDLE); - // Receive and process peer events. - - virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0); - // Send a event to a gateway (may be queued if necessary due to flow - // control). - - virtual int handle_output (ACE_HANDLE); - // Finish sending a event when flow control conditions abate. - - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg); - // Periodically send events via timer mechanism. - - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); - // Perform object termination. - -protected: - typedef ACE_Svc_Handler inherited; - - int transmit (ACE_Message_Block *mb, - size_t n, - int event_type); - // Transmit to the gatewayd. - - virtual int recv (ACE_Message_Block *&mb); - // Receive an Peer event from gatewayd. - - virtual int send (ACE_Message_Block *mb); - // Send an Peer event to gatewayd, using . - - virtual int nonblk_put (ACE_Message_Block *mb); - // Perform a non-blocking , which tries to send an event to the - // gatewayd, but only if it isn't flow controlled. - - int subscribe (void); - // Register Consumer subscriptions with the gateway. - - // = Event/state/action handlers. - int transmit_stdin (void); - // Receive a event from stdin and send it to the gateway. - - int await_connection_id (void); - // Action that receives the route id. - - int await_events (void); - // Action that receives events. - - int (Peer_Handler::*do_action_)(void); - // Pointer-to-member-function for the current action to run in this - // state. This points to one of the preceding 3 methods. - - CONNECTION_ID connection_id_; - // Connection ID of the peer, which is obtained from the gatewayd. - - ACE_Message_Block *msg_frag_; - // Keep track of event fragments that arrive in non-blocking recv's - // from the gatewayd. - - size_t total_bytes_; - // The total number of bytes sent/received to the gatewayd thus far. - - int first_time_; - // Used to call register_stdin_handle only once. Otherwise, thread - // leak will occur on Win32. -}; - -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class ACE_Svc_Export ACE_Acceptor; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -class ACE_Svc_Export Peer_Acceptor : public ACE_Acceptor -{ - // = TITLE - // Passively accept connections from gatewayd and dynamically - // create a new object to communicate with the - // gatewayd. -public: - // = Initialization and termination methods. - Peer_Acceptor (void); - // Default initialization. - - int start (u_short); - // the . - - int close (void); - // Terminate the . - - virtual int make_svc_handler (Peer_Handler *&); - // Factory method that creates a just once. - -private: - int open_acceptor (u_short port); - // Factor out common code for initializing the . - - Peer_Handler *peer_handler_; - // Pointer to allocated just once. - - ACE_INET_Addr addr_; - // Our acceptor addr. - - typedef ACE_Acceptor inherited; -}; - -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class ACE_Svc_Export ACE_Connector; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -class ACE_Svc_Export Peer_Connector : public ACE_Connector -{ - // = TITLE - // Actively establish connections with gatewayd and dynamically - // create a new object to communicate with the - // gatewayd. -public: - // = Initialization method. - int open (ACE_Reactor * = 0, int = 0); - // Initialize the . NOTE: the arguments are - // ignored. They are only provided to avoid a compiler warning - // about hiding the virtual function ACE_Connector::open(ACE_Reactor*, int). - -private: - int open_connector (Peer_Handler *&ph, u_short port); - // Factor out common code for initializing the . - - Peer_Handler *consumer_peer_handler_; - // Consumer that is connected to a gatewayd. - - Peer_Handler *supplier_peer_handler_; - // Supplier that is connected to a gatewayd. -}; - -class ACE_Svc_Export Peer_Factory : public ACE_Service_Object -{ - // = TITLE - // A factory class that actively and/or passively establishes - // connections with the gatewayd. -public: - // = Dynamic initialization and termination hooks from . - - virtual int init (int argc, char *argv[]); - // Initialize the acceptor and connector. - - virtual int fini (void); - // Perform termination activities. - - virtual int info (char **, size_t) const; - // Return info about this service. - - virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); - // Handle various signals (e.g., SIGPIPE, SIGINT, and SIGQUIT). - -private: - Peer_Acceptor consumer_acceptor_; - // Pointer to an instance of our that's used to - // accept connections and create Consumers. - - Peer_Acceptor supplier_acceptor_; - // Pointer to an instance of our that's used to - // accept connections and create Suppliers. - - Peer_Connector connector_; - // An instance of our . Note that one - // is used to establish s for both - // Consumers and Suppliers. -}; - -#endif /* PEER_H */ diff --git a/apps/Gateway/Peer/peerd.cpp b/apps/Gateway/Peer/peerd.cpp deleted file mode 100644 index 94df916851e..00000000000 --- a/apps/Gateway/Peer/peerd.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// gateway -// -// = FILENAME -// peerd.h -// -// = DESCRIPTION -// Driver for the peer daemon (peerd). Note that this is -// completely generic code due to the Service Configurator -// framework! -// -// = AUTHOR -// Douglas C. Schmidt -// -// ============================================================================ - -#include "Peer.h" - -ACE_RCSID(Peer, peerd, "$Id$") - -int -main (int argc, char *argv[]) -{ - if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0) - { - // Use static linking. - ACE_Service_Object_Ptr sp = ACE_SVC_INVOKE (Peer_Factory); - - if (sp->init (argc - 1, argv + 1) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "init"), - 1); - - // Run forever, performing the configured services until we are - // shut down by a SIGINT/SIGQUIT signal. - - ACE_Reactor::run_event_loop (); - - // Destructor of automagically call - // . - } - else - { - if (ACE_Service_Config::open (argc, argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "open"), - 1); - else // Use dynamic linking. - - // Run forever, performing the configured services until we - // are shut down by a signal (e.g., SIGINT or SIGQUIT). - - ACE_Reactor::run_event_loop (); - } - return 0; -} diff --git a/apps/Gateway/Peer/peerd.dsp b/apps/Gateway/Peer/peerd.dsp deleted file mode 100644 index ceb9529fbf8..00000000000 --- a/apps/Gateway/Peer/peerd.dsp +++ /dev/null @@ -1,59 +0,0 @@ -# Microsoft Developer Studio Project File - Name="peerd" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=peerd - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "peerd.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "peerd.mak" CFG="peerd - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "peerd - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Peer.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" -# Begin Target - -# Name "peerd - Win32 Debug" -# Begin Source File - -SOURCE=.\peerd.cpp -# End Source File -# End Target -# End Project diff --git a/apps/Gateway/Peer/svc.conf b/apps/Gateway/Peer/svc.conf deleted file mode 100644 index c27eb06cec8..00000000000 --- a/apps/Gateway/Peer/svc.conf +++ /dev/null @@ -1,2 +0,0 @@ -#static Svc_Manager "-d -p 291" -dynamic Peer1 Service_Object * ./Peer:_make_Peer_Factory() active "-a C|S" diff --git a/apps/Gateway/README b/apps/Gateway/README deleted file mode 100644 index 09a04814536..00000000000 --- a/apps/Gateway/README +++ /dev/null @@ -1,140 +0,0 @@ -OVERVIEW - -This directory contains source code for an application-level -Communication Gateway implemented with ACE. This prototype was -developed in my cs422 OS class at Washington University in 1994. The -Gateway has recently been updated to illustrate the use of Event -Channels, which forward events from Suppliers to Consumers in a -distributed system. - -You can get a paper that explains the patterns used in this -implementation at the following WWW URL: - -http://www.cs.wustl.edu/~schmidt/PDF/TAPOS-00.pdf - ----------------------------------------- - -DIRECTORY STRUCTURE - -There are 2 directories: - -1. Gateway - - This directory contains the source code for the - application-level Gateway process, gatewayd. The gatewayd - routes event messages between Peers. By default, the gatewayd - plays the Connector role and initializes itself by reading the - connection_config and consumer_config files: - - 1. The connection_config file establishes the "physical - configuration" of the Consumer and Supplier proxies. This - file tells the Gateway what connections to establish with - particular hosts using particular ports. - - 2. The consumer_config file establishes the "logical - configuration." This file tells the Gateway how to forward - data coming from Suppliers to the appropriate Consumers. - - The application Gateway generally should be started after all - the Peers described below, though the process should work - correctly even if it starts first. - -2. Peer - - This directory contains the source code for the Peer process, - peerd. There are typically many Peers, which act as suppliers - and consumers of event messages that are routed through the - gatewayd. - - To do anything interesting you'll need at least two Peers: one - to supply events and one to consume events. In the - configuration files, these two types of Peers are designated - as follows: - - 1. Supplier Peers (designated by an 'S' in the Gateway's - connection_config configuration file). These Peers are - "suppliers" of events to the Gateway. - - 2. Consumer Peers (designated by an 'C' in the Gateway's - connection_config file). These Peers are "consumers" of - events forwarded by the Gateway. Forwarding is based on - the settings in the consumer_config configuration file. - ----------------------------------------- - -HOW TO RUN THE TESTS - -To run the tests do the following: - -1. Compile everything (i.e., first compile the ACE libraries, then - compile the Gateway and Peer directories). - -2. Edit the consumer_config and connection_config files as discussed - above to indicate the desired physical and logical mappings - for Consumers and Suppliers. - -3. Start up the Peers (peerd). You can start up as many as you - like, as per the connection_config file, but you'll need at least two - (i.e., one Supplier and Consumer). I typically start up each Peer - in a different window on a different machine, but you can run them - on the same machine as long as you pick different port numbers. - The Peers will print out some diagnostic info and then block - awaiting connections from the Gateway. - - If you want to set the port numbers of the Peers from - the command-line do the following: - - a. Change the svc.conf file in the ./Peer/ directory to - another name (e.g., foo.conf). This will keep the - program from starting up with the svc.conf file - (which dynamically links in the Peers and uses the -a option to - set the port). - - b. Then run the peers in different windows as - - # Window 1 (Supplier) - % peerd -a S:10011 - - # Window 2 (Consumer) - % peerd -a C:10012 - - etc. Naturally, you can also edit the svc.conf file, but that - may be more of a pain if you've got a network filesystem and - all your hosts share the same svc.conf file. - -4. Start up the Gateway (gatewayd). This will print out a bunch of - messages as it reads the config files and connects to all the Peers. - By default, the Gateway is purely reactive, i.e., it handles - Consumers and Suppliers in the same thread of control. However, - if you give the '-t OUTPUT_MT' option the Gateway will handle all - Consumers in separate threads. If you give the '-t INPUT_MT' option - the Gateway will handle all Suppliers in separate threads. If you - give the '-t INPUT_MT|OUTPUT_MT' option both Consumers and Suppliers - will be handled in the separate threads. - - Assuming everything works, then all the Peers will be connected. - If some of the Peers aren't set up correctly, or if they aren't - started first, then the Gateway will use an exponential backoff - algorithm to attempt to reestablish those connections. - -5. Once the Gateway has connected with all the Peers you can send - events from Supplier Peers by typing commands in the Peer window. - This Supplier will be sent to the Gateway, which will forward the - event to all Consumer Peers that have "subscribed" to receive these - events. - - Note that if you type ^C in a Peer window the Peer will shutdown - its handlers and exit. The Gateway will detect this and will start - trying to reestablish the connection using the same exponential - backoff algorithm it used for the initial connection establishment. - -7. When you want to terminate a Gateway, just type ^C or type any - characters in the ./gatewayd window and the process will shut down - gracefully. - -Please let me know if there are any problems, questions, or -suggestions for improvement. - - Doug - - schmidt@cs.wustl.edu diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog deleted file mode 100644 index 0b8c3274945..00000000000 --- a/apps/JAWS/ChangeLog +++ /dev/null @@ -1,932 +0,0 @@ -Tue Feb 25 18:58:26 2003 Carlos O'Ryan - - * clients/WebSTONE/src/cgi-send: - Removed pre-compiled binary for MIPS (R3000 of all things!) - -Wed Dec 26 09:35:35 2001 Douglas C. Schmidt - - * clients/Blobby/Options.cpp - server/HTTP_Server.cpp - stress_testing/benchd.cpp - JAWS2/JAWS/Server.cpp: Replaced all uses of getopt.optarg - with getopt.opt_arg(). - -Thu Dec 6 09:00:31 2001 Douglas C. Schmidt - - * clients/Caching/http_client.cpp (main): Make sure to remove the - trailing '\n' so the example works properly. Thanks to Andrey - Shkinev for reporting this. - -Wed Nov 14 16:21:46 2001 Douglas C. Schmidt - - * clients/Blobby/Blob.{h,cpp}, - * clients/Blobby/Blob_Handler.{h,cpp}, - * clients/Blobby/blobby.{h,cpp}, - * clients/Blobby/Options.{h,cpp}: - Fixed the code to be Unicode-compliant. Thanks to Johnny - Willemsen for contributing this. - -Fri Aug 24 18:39:39 2001 Douglas C. Schmidt - - * server/HTTP_Response.cpp (normal_response), - * server/HTTP_Helpers.cpp (HTTP_decode_base64): Use delete [] buf - rather than delete buf. Thanks to Don Hinton for reporting - this. - -Thu Aug 16 09:57:15 2001 Balachandran Natarajan - - * */Makefile: Updated dependencies. - -Mon Aug 13 14:04:44 2001 Douglas C. Schmidt - - * Applied the following fixes courtesy of Blair Zajac - : - - 1) Allow a static libHTTPU.a to be built when - "make static_libs_only=1" is used. - - 2) When I try to build both JAWS and JAWS2 with the same - ACE_ROOT, the libJAWS.* that is built and installed first - prevents the other JAWS from properly compiling. This - resolves this problem by renaming the JAWS2 library to - libJAWS2.*. - - 3) The JAWS2 subdirectory is now descended into by - apps/Makefile. - - 4) The Makefile in JAWS2 now descends into HTTPU and JAWS to - build those libraries. - -Tue Jun 12 20:35:26 2001 Krishnakumar B - - * clients/Blobby/Blob_Handler.cpp: - - Fixed a size_t printf to make gcc happy on IA-64 Linux. - -Sun Feb 18 09:33:33 2001 Douglas C. Schmidt - - * server/IO.cpp (handle): Added a const to the handle() method - to make compilers happy. Thanks to Kitty for reporting this. - -Mon Jun 12 14:22:35 PDT 2000 James Hu - - * server/HTTP_Response.cpp: Added content length support. - Thanks to Greg Gallant (gcg@micrografx.com) for the fixes! - - * server/HTTP_Helpers.cpp: Fix date handling for NT. - Thanks to Greg Gallant (gcg@micrografx.com) for the fixes! - -Sun Jun 4 14:57:04 2000 Darrell Brunsch - - * clients/WebSTONE/bin/WebStone-common.pl: - * clients/WebSTONE/bin/WebStone-manage.pl: - * clients/WebSTONE/bin/WebStone-run.pl: - * clients/WebSTONE/bin/WebStone-setup.pl: - * clients/WebSTONE/bin/killbench.pl: - * clients/WebSTONE/bin/mine-logs.pl: - * clients/WebSTONE/bin/move-filelist.pl: - * clients/WebSTONE/bin/move-runs.pl: - * clients/WebSTONE/bin/runbench.pl: - * clients/WebSTONE/bin/view-results.pl: - * clients/WebSTONE/bin/webstone-gui.pl: - * clients/WebSTONE/bin/write-testbed.pl: - * clients/WebSTONE/bin/wscollect.pl: - * clients/WebSTONE/conf/paths.pl: - * clients/WebSTONE/doc/FAQ-webstone.html: - * clients/WebSTONE/doc/LICENSE.html: - * clients/WebSTONE/doc/WebStone.html: - * clients/WebSTONE/doc/webstone2.html: - * clients/WebSTONE/src/acconfig.h: - * clients/WebSTONE/src/bench.c: - * clients/WebSTONE/src/bench.h: - * clients/WebSTONE/src/cgi-send.c: - * clients/WebSTONE/src/config.h: - * clients/WebSTONE/src/debug.h: - * clients/WebSTONE/src/errexit.c: - * clients/WebSTONE/src/genrand.c: - * clients/WebSTONE/src/get.c: - * clients/WebSTONE/src/get.h: - * clients/WebSTONE/src/getopt.c: - * clients/WebSTONE/src/gettimeofday.c: - * clients/WebSTONE/src/nsapi-send.c: - * clients/WebSTONE/src/parse_file_list.c: - * clients/WebSTONE/src/parse_file_list.h: - * clients/WebSTONE/src/rexec.c: - * clients/WebSTONE/src/statistics.c: - * clients/WebSTONE/src/statistics.h: - * clients/WebSTONE/src/sysdep.c: - * clients/WebSTONE/src/sysdep.h: - * clients/WebSTONE/src/timefunc.c: - * clients/WebSTONE/src/timefunc.h: - * clients/WebSTONE/src/webclient.c: - * clients/WebSTONE/src/webmaster.c: - * clients/WebSTONE/src/nsapi-includes/netsite.h: - * clients/WebSTONE/src/nsapi-includes/base/buffer.h: - * clients/WebSTONE/src/nsapi-includes/base/cinfo.h: - * clients/WebSTONE/src/nsapi-includes/base/crit.h: - * clients/WebSTONE/src/nsapi-includes/base/daemon.h: - * clients/WebSTONE/src/nsapi-includes/base/dll.h: - * clients/WebSTONE/src/nsapi-includes/base/ereport.h: - * clients/WebSTONE/src/nsapi-includes/base/eventlog.h: - * clients/WebSTONE/src/nsapi-includes/base/file.h: - * clients/WebSTONE/src/nsapi-includes/base/minissl.h: - * clients/WebSTONE/src/nsapi-includes/base/net.h: - * clients/WebSTONE/src/nsapi-includes/base/nodelock.h: - * clients/WebSTONE/src/nsapi-includes/base/nterrors.h: - * clients/WebSTONE/src/nsapi-includes/base/objndx.h: - * clients/WebSTONE/src/nsapi-includes/base/pblock.h: - * clients/WebSTONE/src/nsapi-includes/base/sem.h: - * clients/WebSTONE/src/nsapi-includes/base/session.h: - * clients/WebSTONE/src/nsapi-includes/base/shexp.h: - * clients/WebSTONE/src/nsapi-includes/base/shmem.h: - * clients/WebSTONE/src/nsapi-includes/base/systems.h: - * clients/WebSTONE/src/nsapi-includes/base/systhr.h: - * clients/WebSTONE/src/nsapi-includes/base/util.h: - * clients/WebSTONE/src/nsapi-includes/frame/conf.h: - * clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h: - * clients/WebSTONE/src/nsapi-includes/frame/func.h: - * clients/WebSTONE/src/nsapi-includes/frame/http.h: - * clients/WebSTONE/src/nsapi-includes/frame/httpact.h: - * clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h: - * clients/WebSTONE/src/nsapi-includes/frame/log.h: - * clients/WebSTONE/src/nsapi-includes/frame/object.h: - * clients/WebSTONE/src/nsapi-includes/frame/objset.h: - * clients/WebSTONE/src/nsapi-includes/frame/protocol.h: - * clients/WebSTONE/src/nsapi-includes/frame/req.h: - * clients/WebSTONE/src/nsapi-includes/frame/servact.h: - - Added missing CVS Id strings. - -Wed Mar 22 12:36:00 2000 James Hu - - * stress_testing/connection.h: - - Fixes to class declaration. Method return types should never - be implicit. Thanks to Craig Rodrigues (rodrigc@mediaone.net) - for the heads up. - - * stress_testing/Makefile: - - Fixed it so that the programs actually link. Thanks to Craig - Rodrigues (rodrigc@mediaone.net) for the heads up. - -Tue Sep 21 11:47:00 1999 Ossama Othman - - * server/HTTP_Server.cpp (init): - - Changed cast style to make gcc 2.95.1 happy. Thanks to Jeffrey - Franks for reporting the problems. - -Tue Aug 31 05:10:32 1999 Douglas C. Schmidt - - * server/HTTP_Handler.cpp (destroy_http_handler): Switched - the order in which handler and io were deleted since the current - order seems to destroy handler first, which is problematic since - io is contained within handler! Thanks to Yosi Sarusi - for reporting this. - -Wed Aug 18 16:00:46 1999 David L. Levine - - * server/Makefile,client/Caching/Makefile: don't build if - ACE_COMPONENTS is FOR_TAO, because we now exclude Filecache - from the ACE library in that case. - -Thu Jul 29 16:05:59 1999 Douglas C. Schmidt - - * PROTOTYPE/JAWS/IO.cpp (transmit_file): Added some fixes so this - code will compile on NT. Thanks to Brian Jones - for reporting this problem and to James Hu - for fixing it. - -Tue Jun 22 13:42:51 1999 David L. Levine - - * remora/app/Makefile: replaced rm -f with $(RM). - -Tue Mar 16 01:08:05 1999 Nanbor Wang - - * server/Makefile: - * server/jaws.dsp: Updated makefiles to build shared library. - - * server/svc.conf: Added example settings for using HTTP_Server as - a dynamic service. - - * server/HTTP_Server.{h,cpp}: Added macros to build dynamic - HTTP_Server service. - - * server/main.cpp (main): Since we use static service in JAWS, we - must open the service configure without ignoring the static - svcs. Thanks to Bill Rizzi for pointing - this out. - -Mon Feb 01 17:04:39 1999 David L. Levine - - * clients/WebSTONE/conf/paths.{pl,sh}.old: - removed these apparently useless files. - -Sat Jan 02 08:44:48 1999 David L. Levine - - * server/HTTP_Request.cpp,Parse_Headers.cpp: initialized - third param to strtok_r with 0. DU 4.0 cxx was complaining - about it, with ACE_NDEBUG. According to the strtok_r - man page on DU 4.0, it must be initialized to 0 on the - first call to strtok_r. - -Fri Sep 25 23:29:14 1998 David L. Levine - - * server/IO.cpp (receive_file,transmit_file): changed - NOMAP to ACE_NOMAP. Thanks to Dann Corbit - for reporting this. - -Thu Sep 17 18:53:05 1998 Carlos O'Ryan - - * server/IO.cpp: - * PROTOTYPE/JAWS/IO.cpp: - Revert back to iovec. Also added some missing casts. - -Wed Sep 16 22:53:06 1998 Carlos O'Ryan - - * server/IO.cpp: - * PROTOTYPE/JAWS/IO.cpp: - Use ACE_IO_Vector instead of iovec, because it is more - protable. - -Tue Aug 25 10:18:16 1998 David L. Levine - - * clients/Caching/URL_Properties.cpp: removed explicit - ACE_Auto_Basic_Array_Ptr instantiation because it's - now in libACE. This file doesn't compile with g++/Solaris, - but the Makefile doesn't build it anyways. - -Fri Jul 31 18:31:32 1998 Gonzalo Diethelm - - * PROTOTYPE/HTTP_10.cpp - * PROTOTYPE/HTTP_10_Parse.cpp - * PROTOTYPE/HTTP_10_Read.cpp - * PROTOTYPE/HTTP_10_Request.cpp - * PROTOTYPE/HTTP_10_Write.cpp - * PROTOTYPE/HTTP_Policy.cpp - * PROTOTYPE/main.cpp - * PROTOTYPE/JAWS/Assoc_Array.cpp - * PROTOTYPE/JAWS/Concurrency.cpp - * PROTOTYPE/JAWS/Data_Block.cpp - * PROTOTYPE/JAWS/IO.cpp - * PROTOTYPE/JAWS/IO_Acceptor.cpp - * PROTOTYPE/JAWS/IO_Handler.cpp - * PROTOTYPE/JAWS/Pipeline.cpp - * PROTOTYPE/JAWS/Pipeline_Handler.cpp - * PROTOTYPE/JAWS/Pipeline_Tasks.cpp - * PROTOTYPE/JAWS/Policy.cpp - * PROTOTYPE/JAWS/Reaper.cpp - * PROTOTYPE/JAWS/Server.cpp - * PROTOTYPE/JAWS/Waiter.cpp - * clients/Blobby/Blob.cpp - * clients/Blobby/Blob_Handler.cpp - * clients/Blobby/Options.cpp - * clients/Blobby/blobby.cpp - * clients/Caching/ID_Generator.cpp - * clients/Caching/Local_Locator.cpp - * clients/Caching/Locator_Request_Reply.cpp - * clients/Caching/URL_Array_Helper.cpp - * clients/Caching/URL_Locator.cpp - * clients/Caching/URL_Properties.cpp - * clients/Caching/http_client.cpp - * clients/Caching/http_handler.cpp - * clients/Caching/test_URL.cpp - * server/HTTP_Config.cpp - * server/HTTP_Handler.cpp - * server/HTTP_Helpers.cpp - * server/HTTP_Request.cpp - * server/HTTP_Response.cpp - * server/HTTP_Server.cpp - * server/IO.cpp - * server/JAWS_Concurrency.cpp - * server/JAWS_Pipeline.cpp - * server/JAWS_Pipeline_Handler.cpp - * server/Parse_Headers.cpp - * server/main.cpp - * stress_testing/benchd.cpp - * stress_testing/connection.cpp - * stress_testing/cp.cpp - * stress_testing/http_tester.cpp - * stress_testing/stats.cpp - * stress_testing/util.cpp - Added ACE_RCSID to these files. - -Thu Feb 19 22:14:09 1998 Alexander Babu Arulanthu - - * server/JAWS_Concurrency.cpp (put): Modified line number 11 to - get away with a compilation error. - -Wed Feb 18 12:31:28 1998 Carlos O'Ryan - - * server/JAWS_Pipeline.cpp: - Removed extra definitions for default arguments. - -Sun Feb 15 08:05:28 1998 David L. Levine - - * server/JAWS_Pipeline.h: added missing ; at end of constructor - declaration. - -Wed Jan 7 17:26:43 1998 James C Hu - - * server/Pipeline.cpp: Put base class initialization of - JAWS_Protocol_Filter ahead of data members. - -Fri Jan 2 16:28:00 1998 Nanbor Wang - - * clients/Caching/http_handler.cpp: - * clients/Blobby/Blob.cpp: Added missing explicit template - instantiations. - -Mon Dec 29 20:20:36 1997 James C Hu - - * clients/Caching/http_handler.cpp: Idem to previous change. - -Mon Dec 29 18:50:02 1997 James C Hu - - * server/IO.cpp: Idem to previous change, but fixes to improve - compatibility and portability to Windows NT. - -Thu Dec 18 15:37:36 1997 James C Hu - - * server/IO.cpp: Modified to account for changes in ACE_Filecache - to not map file on NT. - -Tue Dec 16 09:29:11 1997 David L. Levine - - * server/Makefile: expanded rules.bin.GNU, but without - $(VOBJS), to avoid make warnings. - - * client/WebSTONE/src/nsapi-includes/base/systems.h: - #ifdef linux, not LINUX. - -Fri Dec 12 03:06:16 1997 James C Hu - - * server/Parse_Headers.cpp: Many things have been touched, but - only a few things have significantly changed. I originally - attempted to change the implementation entirely to use - Hash_Map_Manager instead, but it was getting more complicated - than I wanted, so I went back to debugging. - - - Trailing whitespace has been removed. - - A couple of debug messages have been added the - Headers::parse_header_line (). - - Method declarations had to be changed to account for the - fact that the Map_Item class (which had previously - been declared inside of Headers_Map) is now in global - scope and has been renamed to Headers_Map_Item. - - The no_value_ data member and the char* cast operator of - Map_Item have been removed. - - The assignment operator for Map_Item has been made a bit - tidier in its memory management (say no to memory - leaks!). - - Debugged the Headers_Map data structure. This involved - the following: - . Re-implementation of strcasecmp (red-herring). - . Re-implementation of Headers::compare (). This is - needed because empty table entries need to compare as - infinity against real strings, so that real strings get - inserted correctly. - . Debugging the Headers_Map::find () method by - implementing first a linear search, and then my own binary - search. It turns out the C library ::bsearch() does work, - but I will leave in my implementation for now, since - ::bsearch () is not in ACE_OS yet. - . Re-implementation of Headers::place (). The old one - was badly written. The new one is more efficient, and - less error prone. This method turned out to be the main - problem. It was the reason that binary search was - previously failing (but linear search worked). The - reason? It was corrupting memory, believe it or not. - No longer! - - In addition, Headers::place () had a serious bug in which a call - to ACE_OS::free () was added, but included the ++ operator on - the pointer from the previous line. Ug. - - * server/Parse_Headers.h: See comments for HTTP_Request.cpp. - - * server/HTTP_Request.cpp: Removed extraneous whitespace. It's - not what you think Doug! Just trailing whitespace at the end of - lines that somehow get added on when people use LoseNT editors. - Also, changes were made to Parse_Headers which made it necessary - to explicitly use the value () accessor method when examining - parsed headers. There use to be a operator char* () method. - - * server/HTTP_Response.cpp: See comments for HTTP_Request.cpp. - - * server/HTTP_Helpers.cpp: Added a comment to - HTTP_Helper::fixyear (). - -Tue Dec 9 01:19:09 1997 James C Hu - - * stress_testing/util.cpp: Off by one errors when parsing a URL. - Did I write this code? I don't think so. Thanks to Valik - Solorzano Barboza for pointing this out. - -Thu Nov 20 00:36:34 1997 James C Hu - - * server/Pipeline.h: Added methods and members so that the - pipeline can be both push and pull driven. - - * server/Pipeline.cpp: Made the pipeline a doubly linked list of - components, so that it can be operated as push-driven or - pull-driven pipelines. - -Wed Nov 19 05:10:38 1997 Douglas C. Schmidt - - * server/HTTP_Handler.h: Added the keyword "virtual" on the open() - method which is inherited from ACE_Sevice_Handler. Perhaps this - will fix a bug with BORLANDC reported by Valik Solorzano Barboza - . - -Mon Nov 17 07:34:09 1997 Douglas C. Schmidt - - * server/Parse_Headers.cpp (end_of_line): Replaced a const char * - with a char * to work with the new ACE_OS::strchr() signature. - Thanks to James for finding this. - -Tue Nov 11 19:52:38 1997 James C Hu - - * server/Pipeline.{h,cpp}: The beginning of a new Pipeline - framework has been added. - -Sun Oct 12 16:21:32 1997 Carlos O'Ryan - - * clients/Caching/Makefile: - * stress_testing/Makefile: - There is no need to set LDLIBS to add local object files - anymore, using FILES is enough. - -Fri Oct 10 18:41:47 1997 Carlos O'Ryan - - * clients/Blobby/Makefile: - Fixed problem that made compilation fail. - -Thu Sep 11 10:40:38 1997 Carlos O'Ryan - - * server/HTTP_Request.cpp: - I checked the use of MAXNAMELEN vs. MAXPATHLEN; all buffers - intended to keep full filenames should have at least - MAXPATHLEN+1 chars. - Only buffers that will keep basenames (without any directories) - should have MAXNAMELEN+1 bytes. - I also added a new macro ACE_MAX_FULLY_QUALIFIED_NAME_LEN which - is the maximum number of characters for a fully qualified - internet hostname. - There remain one obscure usage of these macros in ace/Malloc.h - and Local_Naming_Space_T.{h,cpp}, but a quick fix broke - something, I will try again soon. - -Tue Sep 9 22:08:36 1997 James C Hu - - * server/HTTP_Server.{cpp,h}: Changes which answer questions - brought up in design review. Mostly additional comments. Also - changes to have a task spawn a number of threads rather than - iterating through calls to the activate method. - -Fri Aug 29 11:07:43 1997 James C Hu - - * server/*.{cpp,h}: Changes to make JAWS comply with ACE - coding standards. In particular, broke up CGI method in - HTTP_Request, remove dependency on static object in - HTTP_Config, and answered all questions from Doug. - -Tue Aug 26 21:34:11 1997 Douglas C. Schmidt - - * clients/Caching/ID_Generator.h: Made some minor changes to - the programming style. - -Sun Aug 10 13:44:14 1997 Douglas C. Schmidt - - * server/HTTP_Helpers.cpp (HTTP_date): We can't use - ACE_Thread_Mutex directly in the code since that breaks - platforms that lack threads. - -Wed Aug 6 16:45:48 1997 James C Hu - - * server/main.cpp: Added another signal handler so I can kill JAWS - when purifying. - -Mon Aug 4 00:07:24 1997 Nanbor Wang - - * server/main.cpp (main): Service configurator now doesn't return - -1 when errors occur. Therefore, we check for not success - instread of fail when opening the service contifurator. - -Mon Jul 28 04:54:01 1997 Douglas C. Schmidt - - * server/Parse_Headers.cpp (place): Reformatted the same - stuff again... - -Mon Jul 28 01:48:40 1997 James C Hu - - * server/README: Updated the README file to reflect new features - and server flags. - - * server/Parse_Headers.cpp (place): Fixed a compile error found by - David Levine. I don't know why this was compiling for me. - -Sun Jul 27 21:56:12 1997 Douglas C. Schmidt - - * server/Parse_Headers.cpp (place): Reformatted a few things - to make them easier to read. - -Fri Jul 25 02:05:20 1997 James C Hu - - * server/HTTP_Server.cpp: Changes to allow the thread creation - flags to be specified from the command line. Removed some code - that was used to track down memory leaks. - - * server/HTTP_Helpers.{h,cpp}: Added another method - HTTP_date (char *), so that a buffer to which the date will be - written to can be passed into the HTTP_date routine. - - * server/HTTP_Response.cpp: Changed some code so that the baseline - implementation can be created at compile time. - - * server/IO.cpp: Changed some code so that the baseline - implementation can be created at compile time. - - * server/main.cpp: Changed the signal handler to wait for threads - to die. However, this code will remain dormant for now, until - we design a nice way to shut down a thread pool. - - * server/svc.conf: Changes to add some other entries people can - try. - - * server/Makefile: Changes to allow JAWS to be built with static - linking only, to ease the process of using Purify and Quantify. - Dynamic linking will be re-configured in the future when we have - all the memory leaks worked out. - -Mon Jul 22 16:55:00 1997 Chris Cleeland - - * Changed references to WRAPPER_ROOT to ACE_ROOT in every - place except ChangeLog entries. - -Mon Jul 21 15:09:03 1997 James C Hu - - * server/HTTP_Server.{h,cpp}: Got rid of Solaris specific - debugging code (thr_create, thr_join). - -Fri Jul 11 02:15:12 1997 James C Hu - - * server/HTTP_Response.cpp: Changes so that the HEADER is not - rebuilt all the time. - - * server/IO.cpp (JAWS_Synch_IO::transmit_file): Changed to use - writev () instead of multiple send ()s. - -Thu Jul 10 01:53:48 1997 James C Hu - - * server/HTTP_Helpers.{h,cpp}: Changed so that creating the date - header is less expensive. - - * server/HTTP_Response.cpp: Changes to match above. - - * clients/Caching/README: Added to the repository. - - * clients/Caching/http_handler.{h,cpp}: Added some comments to the - code. Also, moved the code to check to see if the file is in - cache already into the connector, so that a connect is not - done if the file is cached. This required a filename () - accessor method to be added to the handler. - -Wed Jul 9 13:08:00 1997 James C Hu - - * clients/Caching/http_handler.cpp (svc): Added code to check to - see if the file is already cached before trying to cache it. - - * clients/Caching/http_client.cpp (main): Added a comment block at - the top of the file. - - * server/HTTP_Handler.cpp and IO.cpp: Changes that were needed - since JAWS_File is now integrated into ACE (as ACE_Filecache). - - * server/HTTP_Server.*: Attempting to track down memory leak. - This code may be in a state a flux for the next week or so. - -Mon Jul 7 23:40:13 1997 Nanbor Wang - - * clients/WebSTONE/src/webclient.c: Removed a bunch of THREAD - storage class decorators from function makeload() because auto - variables can't be declared as TSS. Also #ifdef random number - generation code so it uses rand_r on Solaris() and rand() on NT. - - * clients/WebSTONE/src/rexec.c: Modified prototypes for - PassOutputThread() and PassErrorThread() to avoid warnings from - MSVC. Still need more refinement on this one. ;( - - * clients/WebSTONE/src/webmaster.c: Added prototype for - HostEntCpy() and a null statement to avoid warning from MSVC. - - * clients/WebSTONE/src/gendata/genrand.mak: - * clients/WebSTONE/src/master/webmaster.mak: - * clients/WebSTONE/src/client/webclient.mak: Updated file paths - and dependencies. - -Sat Jul 5 14:19:20 1997 Douglas C. Schmidt - - * Renamed the client directory "clients" to reflect the fact that - we've got multiple client tests now. Also, moved the original - contents of the client directory into a new clients/Blobby - directory and added Caching and WebSTONE. - - * Moved the ChangeLog from the ./server directory into the ./JAWS - directory since we want to apply ChangeLog entries to all - aspects of JAWS, not just the server. - - * HTTP_Server.cpp (open): Added THR_DETACHED as a flag to - activate(). This should prevent a memory leak that was - occurring since no thread was ever "joining" the threads that - were spawned. - -Thu Jul 3 23:33:47 1997 James C Hu - - * HTTP_Response.cpp (~HTTP_Response): changed delete to delete [], - removing a major memory leak from JAWS. Still to find is a - memory lead associated with thread per request. Nanbor's fix is - about what I did to EMPTY_HEADER too. - - * JAWS_File.cpp: David points out I need to add specializations - for the GNU C++ compiler. - -Thu Jul 3 22:38:04 1997 Nanbor Wang - - * HTTP_Response.cpp (build_headers): Added explicit cast for - EMPTY_HEADER from (const char *) to (char *) in order to make - MSVC happy. This is probably very badly styled. But - HTTP_HEADER is only used in places that require (const char *), - so I think it's safe to do so. - -Thu Jul 3 15:34:30 1997 James C Hu - - * HTTP_Response.cpp (HTTP_Response): Moved a call to delete out of - constructor into the destructor where it belongs. - -Thu Jul 3 12:28:44 1997 Sumedh Mungee - - * Parse_Headers.cpp: Line 137, Changed pt to ptr (it was a typo) - -Wed Jul 2 22:33:52 1997 James C Hu - - * JAWS_File.{h,cpp}: Fixed deadlock bug, since RW_MUTEX's are not - recursive (drat!). - -Wed Jul 2 21:03:12 1997 Douglas C. Schmidt - - * Made a major pass through all the code and made the style - consistent with that found in ACE. - -Wed Jul 2 14:33:27 1997 James C Hu - - * JAWS_File.cpp: Added double check locking pattern to the fetch - routine of the virtual filesystem. This slows things down - considerably for files which change frequently and for cache - misses in general, but it should be correct. - -Wed Jul 2 14:59:29 1997 Nanbor Wang - - * HTTP_Helpers.cpp (HTTP_decode_string): Added cast from strtol to - char explicitly to prevent NT from complaining. - -Wed Jul 2 14:33:27 1997 James C Hu - - * JAWS_File.{h.cpp}: Modifications to support RW_MUTEX for both - the virtual filesystem and the low level ACE_File. Next major - change will be to re-implement the virtual filesystem to use a - hash table ala ACE_Hash_Map_Manager. - -Wed Jul 2 00:23:22 1997 James C Hu - - * HTTP_Server.{h,cpp}: Changed parsing of options to use - mnemonic names rather than numbers. Added a new thread - strategy, THROTTLE. This is thread-per-request until some - maximum number. Unfortunately, it does not become thread-pool - at this point... yet :-). Added a new option to pass in a - backlog value. - - * svc.conf: adjusted to account for the changed options. - - * README: changed to explain new svc.conf options. - - * JAWS_File.cpp: Changed it so that when the file is added to the - cache, it is also acquired. When it is removed from the cache, - it is released. This is so that the reference count is at least - one while the file is in the cache. Also, fixed the virtual - filesystem by giving it a simple replacement strategy if the - table is full. For now, it will replace the largest file in the - cache with the request for the current file. - -Tue Jul 1 19:13:44 1997 Nanbor Wang - - * JAWS_File.cpp (JAWS_File): Changes the creation method of a - cached copy from using plain file copy to using mmap and memcpy. - This avoid the extra complexity caused by FILE_FLAG_OVERLAPPED. - -Sat Jun 28 11:55:38 1997 James C Hu - - * HTTP_Handler.cpp (open): fixed a typo - - * HTTP_Handler.cpp (cgi): fixed a bug, strdup fails on NULL - -Sat Jun 28 16:14:38 1997 Sumedh Mungee - - * HTTP_Handler.cpp (open): Changed socket send-buffer to 64k - -Wed Jun 25 01:11:50 1997 Nanbor Wang - - * JAWS_File.cpp: Removed initialization of vfs_ (see below) and - changed all references of vfs_ to - JAWS_Virtual_Filesystem::instance (). Thanks to Detlef Becker - for pointing this out. - (init): Added initialization of reference_count_ to 0. - - * JAWS_File.h: Removed private member JAWS_Virtual_Filesystem vfs_ - since JAWS_Virtual_Filesystem is a singleton already. Caching - it doesn't seem to win much and depends on the order of static - variables initialization, which is non-portable. - -Fri Jun 13 02:42:39 1997 Nanbor Wang - - * jaws.{mdp,mak}: Updated to incoporate latest changes. - -Thu Jun 5 14:13:22 1997 James C Hu - - * HTTP_Server.cpp: Added more informative comments to the - asynch_thread_pool() method due to comments posed by Mehul - (MehulM@spa-marketing.com). - -Wed Jun 4 23:00:47 1997 James C Hu - - * JAWS_File.cpp (JAWS_File): Fixed a bug where JAWS_File wanted - the file to have write permissions before openning it. This is - now only true if the file is to be written to. - -Wed Jun 4 22:30:41 1997 Nanbor Wang - - * main.cpp (main): Changed SIGCLD to SIGCHLD for better - portability. - - * IO.cpp (transmit_file): The third argument passed - ACE_Asynch_Transmit_File::Header_And_Trailer() should be an - address (&). - -Mon Jun 2 16:35:18 1997 James C Hu - - * HTTP_Helpers.cpp: Serious bug in base64 decoder routine - squashed. Didn't initialize an array with 0's. The original - source had them declared static. Also, changed sizeof alphabet_ - to strlen (alphabet_), because original code had alphabet_ as an - array, but my translation has alphabet_ as a pointer. - - * HTTP_Response.cpp: Added some code to check to see if the - decoder returns 0. If it does, flag this as a failed - authorization attempt. - - * HTTP_Handler.cpp: Added a "\r\n" to the confirmation message in - receive_file_complete () method. - - * HTTP_Request.cpp: In parse_request_line (), created conditional - expressions in the debugging print statement so that a null - string will not cause the server to crash. - - * HTTP_Response.cpp: - (1) cgi_resposnse () no longer has to wait for the process to - die. The fix to ACE_Process of closing down child handles was - enough to get the connection to die on its own. - (2) Mike (mrm@cisco.com) pointed out that the output for CGI - responses was not create. The fix was to output a small header - before execing the CGI program. - - * test.cgi: a sample cgi program to use when testing the JAWS - server. - -Sat May 31 13:34:14 1997 James C Hu - - * *.h, *.cpp: Changed include lines from "apps/JAWS/server/..." to - "..." to avoid dependencies on the WRAPPER_ROOT tree. - - * jaws.auth: This file is added to be a sample authorization - file. This is the file which JAWS is currently hardcoded to use - to verify authenticated PUT requests. - - * HTTP_Response.cpp: Added code to normal_response () and to - error_response () to better handle authentication. Now, all PUT - methods are required to be authenticated. The strategy now is - very simple, there is only one authorization file and only one - realm of authorization. This will be easy to bring up to spec - later, though. - - * HTTP_Helpers.h: Added alphabet_ data member for the - decode/encode base64 methods. - - * HTTP_Helpers.cpp: Added HTTP_decode_base64 and - HTTP_encode_base64 methods. HTTP_encode_base64 is currently not - used, but HTTP_decode_base64 is being used for Basic - authentication. - - * *.h, *.cpp: Changed include lines from "JAWS/server/..." to - "apps/JAWS/server/..." to fix an error reported by Rob Payne - . This was really due to a bug in the - platform_macros.GNU file not adding INCLDIRS to the CCFLAGS - during compilation, but in the case other platforms have the - same problem, changing the source is a better fix. - -Fri May 30 23:19:03 1997 James C Hu - - * README: updated to better reflect the status of JAWS. - - * main.cpp (handler): Added a signal handler for SIGINT, and also - set SIG_IGN for SIGCLD. The first handler calls exit (0) if - SIGINT is received, so that static destructors are called. The - second is so that zombies are not formed. - - * HTTP_Response.cpp (cgi_response): Debugging. (1) The CGI - program spewed output on the server side instead of the client. - (2) The CGI program had environment variable being set even - though there was no associated value. (3) The client connection - was not being closed after the CGI program executed. Problem - (1) was fixed by using set_handles () in cgi_options. Problem - (2) was fixed by testing to see if the header had an associated - value before assigning it to the environment. Problem (3) was - fixed by sending an empty confirmation message after waiting for - the CGI process to exit. - - * HTTP_Request.cpp (cgi): Debugging. It was not looking for a - ".cgi" extension during the stage of determining if a URI is a - CGI script. This will later be fixed when a full mime-type - facility is implemented. - -Fri May 23 00:45:24 1997 James C Hu - - * JAWS/server: Debugged HTTP/0.9 GET requests, and HTTP/1.0 PUT - requests. Both work now, with minor problems: e.g. the - Content-type header doesn't really work (always sends text/html - as the content type). What it should do is see if the request - included a content type header, and use it, otherwise, resort to - some file suffix and mimetype matching algorithm. - - * Parse_Headers.h (complete_header_line): Added comments - explaining the new return values of -1, 0 and 1 (see comments - for Parse_Headers.cpp below). - - * Parse_Headers.cpp (complete_header_line): modified so that it - returns three values instead of two. -1 means that an end of - line was encountered, but nothing after it yet to verify if it - is really a complete header line. 0 means the read cut off in - the middle of a line (no end of line character found). 1 means - the line is verified to be a complete header line. - - * HTTP_Request.cpp (parse_request): Changed the test so that an - HTTP/0.9 request would be sent immediately after being issued. - This involved changes to Parse_Headers. - - * JAWS_File.cpp (acquire): Changes involved adding some debugging - statements to understand why PUT was not working. Discovered a - bug in how ACE_Mem_Map was being used. - - * HTTP_Request.cpp (content_length): Changed to extract value from - the headers, if available. - -Thu May 22 16:22:03 1997 James C. Hu - - * HTTP_Request.cpp (cgi_env): Added a cast so that a warning - generated by SGI C++ compiler goes away. - - * Makefile: Reordered the way the files are compiled/linked so - that useless warnings about object files not resolving any - symbols go away. - -Wed May 21 15:33:33 1997 James C Hu - - * JAWS_File.{h,cpp}: Added some comments. Will add a copy () - method soon, after I move my workspace over to lambada. - - * JAWS_Tilde.{h,cpp}: This class is being implemented but has not - been added to the repository yet, since JAWS as yet does not use - it, and it is still being developed. This will be a cache of - the expansions from ~foo to the home directory of foo. - -Tue May 20 22:49:24 1997 James C Hu - - * JAWS_File.{h,cpp}: New class created to replace the old kludgy - VFS thingy. This new cached virtual filesystem is way cool: a - file which is being retrieved can be simultaneously replaced - without causing either reader or writer to wait. Reference - counts are maintained now, which was missing in VFS. Also, - there is no longer a dependency on the JXH_List template now, - which is a plus. - - * IO.cpp: Changes to adapt to the new virtual filesystem. The - changes all involved simplifications to the programming - interface. - - * HTTP_Handler.cpp: Changes required to deal with the more - generic error responses returned from the JAWS_File/JAWS_IO - interface. This generality will make it easier to adapt - JAWS_File and JAWS_IO into ACE. - - * test_JAWS_File.cpp: A test program written to see if the new - virtual filesystem works the way I expect it to. diff --git a/apps/JAWS/Makefile b/apps/JAWS/Makefile deleted file mode 100644 index 950d3cd73b3..00000000000 --- a/apps/JAWS/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id: Makefile 1.1 10/18/96 -# -# Makefile for JAWS -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -INFO = README - -DIRS = server \ - clients - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU - diff --git a/apps/JAWS/Makefile.bor b/apps/JAWS/Makefile.bor deleted file mode 100644 index 9bdeebefeab..00000000000 --- a/apps/JAWS/Makefile.bor +++ /dev/null @@ -1,3 +0,0 @@ -DIRS = clients server - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/apps/JAWS/README b/apps/JAWS/README deleted file mode 100644 index e67da72afd1..00000000000 --- a/apps/JAWS/README +++ /dev/null @@ -1,15 +0,0 @@ -This directory contains the source code and test examples for JAWS, -which is a high-performance HTTP Web server written with ACE. For -more information on JAWS, please see - -http://www.cs.wustl.edu/~jxh/research/ - -The subdirectories in this directory contain the following components - - . clients -- This contains the source code for various - client applications that exercise the file uploading and - downloading features of JAWS - - . server -- This contains the source code for the JAWS - HTTP Web server. It illustrates a number of sophisticated - ACE concurrency and event demultiplexing strategies. diff --git a/apps/JAWS/clients/Blobby/Blob.cpp b/apps/JAWS/clients/Blobby/Blob.cpp deleted file mode 100644 index 207a9cc5ded..00000000000 --- a/apps/JAWS/clients/Blobby/Blob.cpp +++ /dev/null @@ -1,93 +0,0 @@ -// $Id$ - -#include "Blob.h" -#include "Blob_Handler.h" - -ACE_RCSID(Blobby, Blob, "$Id$") - -ACE_Blob::ACE_Blob (void) -{ -} - -ACE_Blob::~ACE_Blob (void) -{ - this->close (); -} - -// initialize address and filename. No network i/o in open - -int -ACE_Blob::open (ACE_TCHAR *filename, const ACE_TCHAR *hostname , u_short port) -{ - filename_ = ACE_OS_String::strdup (filename); - inet_addr_.set (port, hostname); - return 0; -} - -// read from connection length bytes from offset, into Message block - -int -ACE_Blob::read (ACE_Message_Block *mb, size_t length, size_t offset) -{ - - // Create a Blob Reader - ACE_Blob_Reader blob_reader (mb, length, offset, filename_); - ACE_Blob_Handler *brp = &blob_reader; - - // Connect to the server - if (connector_.connect (brp, inet_addr_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Blob::read():Connector error"), -1); - - return blob_reader.byte_count (); - -} - -// write to connection length bytes from offset, into Message block - -int -ACE_Blob::write (ACE_Message_Block *mb, size_t length, size_t offset) -{ - - // Create a Blob Writer - ACE_Blob_Writer blob_writer (mb, length, offset, filename_); - ACE_Blob_Handler *bwp = &blob_writer; - - // Connect to the server - if (connector_.connect (bwp, inet_addr_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Blob::write():Connector error"), -1); - - return blob_writer.byte_count (); -} - -// close down the blob - -int -ACE_Blob::close (void) -{ - - if (filename_) - { - ACE_OS::free ((void *) filename_); - filename_ = 0; - } - return 0; - -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Connector; -template class ACE_Svc_Tuple ; -template class ACE_Map_Entry *>; -template class ACE_Map_Iterator_Base *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Manager *, ACE_SYNCH_RW_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Connector -#pragma instantiate ACE_Svc_Tuple -#pragma instantiate ACE_Map_Entry *> -#pragma instantiate ACE_Map_Iterator_Base *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Manager *, ACE_SYNCH_RW_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/JAWS/clients/Blobby/Blob.h b/apps/JAWS/clients/Blobby/Blob.h deleted file mode 100644 index b2c078b0af2..00000000000 --- a/apps/JAWS/clients/Blobby/Blob.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -//============================================================================ -// -// = LIBRARY -// JAWS -// -// = FILENAME -// Blob.h -// -// = DESCRIPTION -// This is the ACE_Blob class, which is the API for doing file -// uploads/downloads. -// -// = AUTHOR -// Prashant Jain and Sumedh Mungee -// -//============================================================================ - -#ifndef ACE_BLOB_H -#define ACE_BLOB_H - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/INET_Addr.h" -#include "ace/Svc_Handler.h" -#include "ace/SOCK_Connector.h" -#include "ace/Connector.h" -#include "ace/Message_Block.h" -#include "Blob_Handler.h" - -class ACE_Blob - // = TITLE - // Blob is intended to provide application API to - // classes that wish to do network i/o at a very - // high level of abstraction. - // - // = This class provides the ability to retrieve data from - // the network, of specified length and offset, and potentially - // use any protocol "under the hood" to do so. It currently - // uses HTTP. See Blob_Handler also. -{ -public: - ACE_Blob (void); - ~ACE_Blob (void); - - int open (ACE_TCHAR *filename, - const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST , - u_short port = 80); - // initializes the class with the given filename, hostname and port. - // it should be called with the filename, before any read/write calls - - - int read (ACE_Message_Block *mb, size_t length, size_t offset); - // starts a connection, and reads a file from the server, - // of length and offset as specified, into Message_Block mb - // The message block should have capacity to hold length number - // of bytes - - int write (ACE_Message_Block *mb, size_t length, size_t offset); - // starts a connection, and writes a file to the server, - // of length and offset as specified, from Message_Block mb - // thus the message block should contain atleast length + offset - // bytes of data - - - int close (); - // Frees memory allocated for filename. - -private: - ACE_INET_Addr inet_addr_; - // store the internet address of the server - - ACE_TCHAR *filename_; - // The filename - - ACE_Connector connector_; - // The connector endpoint to initiate the client connection - -}; - -#endif /* ACE_BLOB_H */ diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/apps/JAWS/clients/Blobby/Blob_Handler.cpp deleted file mode 100644 index 783736eb05f..00000000000 --- a/apps/JAWS/clients/Blobby/Blob_Handler.cpp +++ /dev/null @@ -1,346 +0,0 @@ -// $Id$ - -#include "Blob_Handler.h" - -ACE_RCSID(Blobby, Blob_Handler, "$Id$") - -// Empty constructor for compliance with new Connector behavior. -ACE_Blob_Handler::ACE_Blob_Handler (void) -{ -} - -// Always use this constructor -ACE_Blob_Handler::ACE_Blob_Handler (ACE_Message_Block * mb, - size_t length, - size_t offset, - ACE_TCHAR *filename) : - mb_ (mb), - length_ (length), - offset_ (offset), - filename_ (ACE_OS_String::strdup (filename)), - bytecount_ (0) -{ -} - -ACE_Blob_Handler::~ACE_Blob_Handler (void) -{ - if (filename_) - { - ACE_OS::free ((void *) filename_); - filename_ = 0; - } -} - -// Called by Connector after connection is established -int -ACE_Blob_Handler::open (void *) -{ - if (this->send_request () != 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Blob_Handler::open():send_request failed"), -1); - - if (this->receive_reply () != 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Blob_Handler::open():receive_reply failed"), -1); - return 0; - -} - -// No-op -int -ACE_Blob_Handler::close (u_long flags) -{ - ACE_UNUSED_ARG (flags); - return 0; -} - - -// Always overridden by the derived classes -int -ACE_Blob_Handler::send_request (void) -{ - return -1; -} - -// Always overridden by the derived classes -int -ACE_Blob_Handler::receive_reply (void) -{ - return -1; -} - -// used to retrieve the number of bytes read/written by the -// last operation on the Blob -int -ACE_Blob_Handler::byte_count (void) -{ - return bytecount_; -} - -// Reader ************************************************** - -ACE_Blob_Reader::ACE_Blob_Reader (ACE_Message_Block * mb, - size_t length, - size_t offset, - ACE_TCHAR *filename, - const char *request_prefix, - const char *request_suffix) : - ACE_Blob_Handler (mb, length, offset, filename), - request_prefix_ (request_prefix), - request_suffix_ (request_suffix) -{ -} - -// Send the HTTP request -int -ACE_Blob_Reader::send_request (void) -{ - char mesg [MAX_HEADER_SIZE]; - - // Check to see if the request is too big - if (MAX_HEADER_SIZE < (ACE_OS_String::strlen (request_prefix_) - + ACE_OS_String::strlen (filename_) - + ACE_OS_String::strlen (request_suffix_) + 4)) - ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1); - - // Create a message to send to the server requesting retrieval of the file - int len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_); - - // Send the message to server - if (peer ().send_n (mesg, len) != len) - ACE_ERROR_RETURN((LM_ERROR,"Error sending request"), -1); - - - return 0; -} - -// Recieve the HTTP Reply -int -ACE_Blob_Reader::receive_reply (void) -{ - ssize_t len; - char buf [MAX_HEADER_SIZE + 1]; - char *buf_ptr; - int bytes_read = 0; - int bytes_left = length_; - int offset_left = offset_; - - // Receive the first MAX_HEADER_SIZE bytes to be able to strip off the - // header. Note that we assume that the header will fit into the - // first MAX_HEADER_SIZE bytes of the transmitted data. - if ((len = peer ().recv_n (buf, MAX_HEADER_SIZE)) >= 0) - { - buf[len] = '\0'; - - // Search for the header termination string "\r\n\r\n", or "\n\n". If - // found, move past it to get to the data portion. - if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0) - buf_ptr += 4; - else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0) - buf_ptr += 2; - else - buf_ptr = buf; - - // Determine number of data bytes read. This is equal to the - // total butes read minus number of header bytes. - bytes_read = (buf + len) - buf_ptr; - } - else - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Blob_Reader::receiveReply():Error while reading header"), -1); - - // *************************************************************** - // At this point, we have stripped off the header and are ready to - // process data. buf_ptr points to the data - - // First adjust for offset. There are two cases: - // (1) The first block of data encountered the offset. In this case - // we simply increment the buf_ptr by offset. - // (2) The first block of data did not encounter the offset. That - // is, the offset needs to go past the number of data bytes already read. - if (bytes_read > offset_left) - { - // The first case is true -- that is offset is less than the - // data bytes we just read. - buf_ptr += offset_left; - - // Determine how many data bytes are actually there. This is - // basically the total number of data bytes we read minus any - // offset we have. - int data_bytes = bytes_read - offset_left; - - // Check for the case where the bytes read are enough to fulfill - // our request (for length bytes). If this is the case, then we - // don't need to do any extra recvs and can simply return with - // the data. - if (data_bytes >= bytes_left) - { - // The first block contains enough data to satisfy the - // length. So copy the data into the message buffer. - if (mb_->copy (buf_ptr, bytes_left) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "ACE Blob_Reader::receiveReply():Error copying data into Message_Block"), -1); - bytecount_ = length_; - return 0; - } - - // Copy over all the data bytes into our message buffer. - if (mb_->copy (buf_ptr, data_bytes) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "ACE_Blob_Reader::receiveReply():Error copying data into Message_Block" ), -1); - - // Adjust bytes left - bytes_left -= data_bytes; - - // No more offset left. So set it to zero. - offset_left = 0; - } - else - { - // The second case is true -- that is offset is greater than - // the data bytes we just read. - offset_left -= bytes_read; - } - - // If we had any offset left, take care of that. - while (offset_left > 0) - { - // MAX_HEADER_SIZE in which case we should do a receive of - // offset bytes into a temporary buffer. Otherwise, we should - // receive MAX_HEADER_SIZE bytes into temporary buffer and - // decrement offset_left. - if (offset_left < (int) (sizeof buf)) - len = offset_left; - else - len = sizeof buf; - if (peer().recv_n (buf, len) != len) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "ACE_Blob_Reader::receiveReply():Read error" ), - -1); - offset_left -= len; - } - - // ***************************************************************** - // At this point we are all set to receive the actual data which the - // user wants. We have made adjustments for offset and are ready to - // receive the actual data. Receive the data directly into the - // message buffer. - - len = peer().recv_n (mb_->wr_ptr (), bytes_left); - - if (len != bytes_left) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "ACE_Blob_Reader::receiveReply():Read error" ), -1); - - // Adjust the message buffer write pointer by number of bytes we - // received. - mb_->wr_ptr (len); - - // Set the byte count to number of bytes received - this->bytecount_ = length_; - - return 0; -} - -// Writer ************************************************** - -ACE_Blob_Writer::ACE_Blob_Writer (ACE_Message_Block * mb, - size_t length, - size_t offset, - ACE_TCHAR *filename, - const char *request_prefix, - const char *request_suffix) : - ACE_Blob_Handler (mb, length, offset, filename), - request_prefix_ (request_prefix), - request_suffix_ (request_suffix) -{ -} - -int -ACE_Blob_Writer::send_request (void) -{ - // Check for sanity -- check if we have any data to send. - if (offset_+ length_ > mb_->length ()) - ACE_ERROR_RETURN((LM_ERROR, "%p\n", - "ACE_Blob_Writer::sendRequest():Invalid offset/length"), -1); - - // Determine the length of the header message we will be sending to - // the server. Note that we add 32 for safety -- this corresponds to - // the number of bytes needed for the length field. - u_short mesglen = - ACE_OS::strlen (request_prefix_) - + ACE_OS::strlen (filename_) - + ACE_OS::strlen (request_suffix_) - + 32; // safety - - // Allocate a buffer to hold the header - char *mesg; - ACE_NEW_RETURN (mesg, char [mesglen], -1); - - // Create the header, store the actual length in mesglen - mesglen = ACE_OS::sprintf (mesg, "%s /%s %s " - ACE_SIZE_T_FORMAT_SPECIFIER"\n\n", - request_prefix_, filename_, request_suffix_, - length_); - - // Send the header followed by the data - - // First send the header - if (peer ().send_n (mesg, mesglen) == -1) - ACE_ERROR_RETURN((LM_ERROR, "%p\n", "Error sending request"), -1); - - // "Consume" the offset by moving the read pointer of the message - // buffer - mb_->rd_ptr (offset_); - - // Now send the data - if (peer ().send_n (mb_->rd_ptr (), length_) != (int)length_) - ACE_ERROR_RETURN((LM_ERROR, "%p\n", "Error sending file"), -1); - - // Adjust the read pointer of the mesage buffer - mb_->rd_ptr (length_); - - return 0; -} - -int -ACE_Blob_Writer::receive_reply (void) -{ - // Allocate a buffer big enough to hold the header - char buf[MAX_HEADER_SIZE]; - - // Receive the reply from the server - ssize_t len = peer ().recv_n (buf, sizeof buf - 1); // reserve one byte to store the \0 - if (len ==-1) - ACE_ERROR_RETURN((LM_ERROR, "%p\n", "Error reading header"), -1); - - buf [len] = 0; - - // Parse the header - char *lasts; - - // First check if this was a valid header -- HTTP/1.0 - char *token = ACE_OS::strtok_r (buf, " \t", &lasts); - - if ( (token == 0) || (ACE_OS::strcasecmp (token, "HTTP/1.0") != 0)) - ACE_ERROR_RETURN((LM_ERROR, "%p\n", "Did not receive a HTTP/1.0 response"), -1); - - // Get the return code. - int return_code = ACE_OS::atoi (ACE_OS::strtok_r (0, " \t", &lasts)); - - // Check if the transaction succeeded. The only success codes are in - // the range of 200-299 (HTTP specification). - if (return_code >= 200 && return_code < 300) - return 0; - else - { - // Something went wrong! - // Get the description from the header message of what went wrong. - char *description = ACE_OS::strtok_r (0, "\n\r", &lasts); - ACE_ERROR_RETURN((LM_ERROR, "%p\n", description), -1); - } - ACE_NOTREACHED(return 0); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Svc_Handler ; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Svc_Handler -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.h b/apps/JAWS/clients/Blobby/Blob_Handler.h deleted file mode 100644 index b18df484ac5..00000000000 --- a/apps/JAWS/clients/Blobby/Blob_Handler.h +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -//============================================================================ -// -// = LIBRARY -// JAWS -// -// = FILENAME -// Blob.h -// -// = DESCRIPTION -// ACE_Blob_Handler is a base class for ACE_Blob_Reader and -// ACE_Blob_Writer which are created in response to calls to -// read/write, as appropriate -// -// = AUTHOR -// Prashant Jain and Sumedh Mungee -// -//============================================================================ - -#ifndef ACE_BLOB_HANDLER_H -#define ACE_BLOB_HANDLER_H - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SOCK_Stream.h" -#include "ace/Svc_Handler.h" -#include "ace/Message_Block.h" - -class ACE_Blob_Handler : public ACE_Svc_Handler - // = TITLE - // Blob is intended to provide application API to - // classes that wish to do network i/o at a very - // high level of abstraction. - // - // = This class provides the ability to retrieve data from - // the network, of specified length and offset, and potentially - // use any protocol "under the hood" to do so. It currently - // uses HTTP. See Blob_Handler also. -{ -public: - ACE_Blob_Handler (void); - // Null constructor, insures that it works properly with Connector - - ACE_Blob_Handler (ACE_Message_Block *mb, - size_t length, - size_t offset, - ACE_TCHAR *filename); - // Always use this constructor to make Blob_Handlers - - int byte_count (void); - // returns the number of bytes read/written in the last operation. - - virtual int open (void * = 0); - // Activate this instance of the - - virtual int close (u_long flags = 0); - // Close down the Blob - - ~ACE_Blob_Handler (void); - -protected: - virtual int send_request (void); - virtual int receive_reply (void); - - ACE_Message_Block *mb_; - size_t length_; - size_t offset_; - ACE_TCHAR *filename_; - int bytecount_; - enum - { - MAX_HEADER_SIZE = 2048 - // The handler assumes that the first 2048 bytes of a server response - // contains the header - }; -}; - -class ACE_Blob_Reader : public ACE_Blob_Handler -{ -public: - ACE_Blob_Reader (ACE_Message_Block *mb, - size_t length, - size_t offset, - ACE_TCHAR *filename, - const char *request_prefix = "GET", - const char *request_suffix = "HTTP/1.0\r\n\r\n"); - -private: - int send_request (void); - int receive_reply (void); - const char *request_prefix_; - const char *request_suffix_; -}; - -class ACE_Blob_Writer : public ACE_Blob_Handler -{ -public: - ACE_Blob_Writer (ACE_Message_Block *mb, - size_t length, - size_t offset, - ACE_TCHAR *filename, - const char *request_prefix = "PUT", - const char *request_suffix = "HTTP/1.0\nContent-length:"); - -private: - int send_request (void); - int receive_reply (void); - const char *request_prefix_; - const char *request_suffix_; -}; - -#endif /* ACE_BLOB_HANDLER_H */ diff --git a/apps/JAWS/clients/Blobby/Makefile b/apps/JAWS/clients/Blobby/Makefile deleted file mode 100644 index 674fa0f7ade..00000000000 --- a/apps/JAWS/clients/Blobby/Makefile +++ /dev/null @@ -1,642 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the ACE Adapter Web Server (JAWS) client -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -BIN = blobby - -FILES = Blob \ - Blob_Handler \ - Options - -SRC = $(addsuffix .cpp,$(FILES)) -OBJ = $(addsuffix .o,$(FILES)) - -BUILD = $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Blob.o .obj/Blob.so .shobj/Blob.o .shobj/Blob.so: Blob.cpp Blob.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - Blob_Handler.h - -.obj/Blob_Handler.o .obj/Blob_Handler.so .shobj/Blob_Handler.o .shobj/Blob_Handler.so: Blob_Handler.cpp Blob_Handler.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i - -.obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.cpp \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/ARGV.h \ - $(ACE_ROOT)/ace/ARGV.i Blob.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - Blob_Handler.h Options.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/apps/JAWS/clients/Blobby/Makefile.bor b/apps/JAWS/clients/Blobby/Makefile.bor deleted file mode 100644 index 881de0e493e..00000000000 --- a/apps/JAWS/clients/Blobby/Makefile.bor +++ /dev/null @@ -1,10 +0,0 @@ - -NAME = blobby -OBJFILES = \ - $(OBJDIR)\Blob.obj \ - $(OBJDIR)\Blob_Handler.obj \ - $(OBJDIR)\Options.obj \ - $(OBJDIR)\blobby.obj - -!include <$(ACE_ROOT)\apps\build.bor> - diff --git a/apps/JAWS/clients/Blobby/Options.cpp b/apps/JAWS/clients/Blobby/Options.cpp deleted file mode 100644 index 08f7de4ad8b..00000000000 --- a/apps/JAWS/clients/Blobby/Options.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// $Id$ - -#include "ace/Get_Opt.h" -#include "ace/ARGV.h" -#include "Blob.h" -#include "Blob_Handler.h" -#include "Options.h" - -ACE_RCSID(Blobby, Options, "$Id$") - -Options *Options::instance_ = 0; - -Options * -Options::instance (void) -{ - - if (Options::instance_ == 0) - Options::instance_ = new Options; - - return Options::instance_; -} - -void -Options::parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("rwh:p:f:l:o:d")); - - int c; - - while ((c = get_opt ()) != -1) - switch (c) - { - case 'd': - this->debug_ = 1; - break; - case 'r': - this->operation_ = 'r'; - break; - case 'w': - this->operation_ = 'w'; - break; - case 'h': - this->hostname_ = get_opt.opt_arg (); - break; - case 'p': - this->port_ = ACE_OS::atoi (get_opt.opt_arg ()); - break; - case 'f': - this->filename_ = get_opt.opt_arg (); - break; - case 'l': - this->length_ = ACE_OS::atoi (get_opt.opt_arg ()); - break; - case 'o': - this->offset_ = ACE_OS::atoi (get_opt.opt_arg ()); - break; - // Usage fallthrough. - default: - ACE_DEBUG ((LM_DEBUG, "%s -h hostname -f filename -[r/w] [-p port] [-l length] [-o offset] [-d]\n", argv[0])); - ACE_OS::exit (1); - } - if (this->hostname_ == 0 || this->filename_ == 0) - { - ACE_DEBUG ((LM_DEBUG, - "%s -h hostname -f filename -[r/w] [-p port] [-l length] [-o offset] [-d]\n", - argv[0])); - ACE_OS::exit (1); - } - -} - -Options::Options (void) - : hostname_ (0), - port_ (ACE_DEFAULT_HTTP_SERVER_PORT), - filename_ (0), - length_ (0), - offset_ (0), - operation_ ('r'), - debug_ (0) -{ -} diff --git a/apps/JAWS/clients/Blobby/Options.h b/apps/JAWS/clients/Blobby/Options.h deleted file mode 100644 index 47c0c852036..00000000000 --- a/apps/JAWS/clients/Blobby/Options.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -//============================================================================ -// -// = LIBRARY -// JAWS -// -// = FILENAME -// Options.h -// -// = DESCRIPTION -// Options is an Singleton for blobby -// -// = AUTHOR -// Prashant Jain and Sumedh Mungee -// -//============================================================================ - -#ifndef ACE_BLOBBY_OPTIONS_H -#define ACE_BLOBBY_OPTIONS_H - -#include "Blob.h" -#include "Blob_Handler.h" -#include "ace/Get_Opt.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/ARGV.h" - -class Options -{ -public: - static Options *instance (void); - // Returns the singleton instance - - void parse_args (int argc, ACE_TCHAR *argv[]); - // parses commandline arguments - - char *hostname_; - // Hostname to connect to - - u_short port_; - // Port number to use - - ACE_TCHAR *filename_; - // Filename to upload/download - - int length_; - // number of bytes to read/write - - int offset_; - // offset to read/write - - char operation_; - // "r" means download (read), and "w" means upload (write). - - int debug_; - // turns on verbosity - -protected: - Options (void); - // protected constructor, singleton - - static Options *instance_; - // the singleton -}; - -#endif /* ACE_BLOBBY_OPTIONS_H */ diff --git a/apps/JAWS/clients/Blobby/README b/apps/JAWS/clients/Blobby/README deleted file mode 100644 index 1a1cadf91ca..00000000000 --- a/apps/JAWS/clients/Blobby/README +++ /dev/null @@ -1,33 +0,0 @@ -README for blobby, the example application for JAWS ---------------------------------------------------- - -Blobby is a simple application written using the ACE_Blob class, which -is capable of doing both file uploads and downloads from the JAWS -server. - -If a file is downloaded, the downloaded data is sent to standard -output, so that it can be piped as necessary. - -It is an ACE application, and should be compiled exactly like any -other ACE application. - -It accepts the following command line arguments: - - - -r Read (download) the file from the server - -w Write (upload) the file to the server - (Default is Read file) - - -h hostname Use the server running on hostname - (Default is localhost) - - -p port Port number of the server - (Default is 80) - - -f filename The file to upload/download from the server - - -l length The number of bytes to read/write from the server - -o offset The offset into the file to be read/written - - -d Puts blobby into debug mode, where it echoes - its command line arguments diff --git a/apps/JAWS/clients/Blobby/blobby.cpp b/apps/JAWS/clients/Blobby/blobby.cpp deleted file mode 100644 index cb2067e083d..00000000000 --- a/apps/JAWS/clients/Blobby/blobby.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// $Id$ - -//============================================================================ -// -// = LIBRARY -// JAWS -// -// = FILENAME -// blobby.c -// -// = DESCRIPTION -// Simple client application to illustrate the use of the ACE_Blob class -// -// It reads "length" number of bytes, after skipping offset "offset" -// from hostname, port and filename as specified. (if -r specified) -// -// It writes "length" number of bytes, after skipping offset "offset" -// to hostname, port and filename as specified (if -w specified) -// -// = AUTHOR -// Prashant Jain and Sumedh Mungee -// -//============================================================================ - -#include "Options.h" - -ACE_RCSID(Blobby, blobby, "$Id$") - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - // Options is a singleton - Options *options = Options::instance (); - options->parse_args (argc, argv); - - // Explain what is going to happen - if (options->debug_) - ACE_DEBUG ((LM_DEBUG, - "hostname = %s, port = %d, filename = %s, length = %d, offset = %d, operation = %c\n", - options->hostname_, - options->port_, - options->filename_, - options->length_, - options->offset_, - options->operation_)); - - // Create a blob - ACE_Blob blob; - - // User requested a read - if (options->operation_ == 'r') - { - ACE_Message_Block mb (0, options->length_); - - // Open the blob - if (blob.open (options->filename_, options->hostname_, options->port_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open error"), -1); - - // Read from it - if (blob.read (&mb, options->length_, options->offset_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "read error"), -1); - - // Write to STDOUT - if (ACE_OS::write (ACE_STDOUT, mb.rd_ptr(), mb.length()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "write error"), -1); - } - else - { - int total = options->length_ + options->offset_; - ACE_Message_Block mb (total); - - // Open the file to be sent - ACE_HANDLE h = ACE_OS::open (options->filename_, O_RDONLY); - if (h == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "file open error"), -1); - - // Open the blob - if (blob.open (options->filename_, options->hostname_, options->port_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "connection open error"), -1); - - // Read from the file - if (ACE_OS::read (h, mb.wr_ptr (), total) != total) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "file read error"), -1); - - // Close the file - ACE_OS::close (h); - - // Adjust the offset - mb.wr_ptr (mb.size ()); - - // Write to the blob - if (blob.write (&mb, options->length_, options->offset_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "network write error"), -1); - } - - blob.close (); - return 0; -} diff --git a/apps/JAWS/clients/Caching/Caching.dsp b/apps/JAWS/clients/Caching/Caching.dsp deleted file mode 100644 index 260f6f46202..00000000000 --- a/apps/JAWS/clients/Caching/Caching.dsp +++ /dev/null @@ -1,112 +0,0 @@ -# Microsoft Developer Studio Project File - Name="http_client" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=http_client - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Caching.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Caching.mak" CFG="http_client - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "http_client - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "http_client - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "http_client - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\http_client\Release" -# PROP BASE Intermediate_Dir ".\http_client\Release" -# PROP BASE Target_Dir ".\http_client" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "." -# PROP Intermediate_Dir ".\Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir ".\http_client" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../ace" - -!ELSEIF "$(CFG)" == "http_client - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\http_client\Debug" -# PROP BASE Intermediate_Dir ".\http_client\Debug" -# PROP BASE Target_Dir ".\http_client" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "." -# PROP Intermediate_Dir ".\Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir ".\http_client" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"../../../../ace" - -!ENDIF - -# Begin Target - -# Name "http_client - Win32 Release" -# Name "http_client - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" -# Begin Source File - -SOURCE=.\http_client.cpp -# End Source File -# Begin Source File - -SOURCE=.\http_handler.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\http_handler.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/apps/JAWS/clients/Caching/Caching.dsw b/apps/JAWS/clients/Caching/Caching.dsw deleted file mode 100644 index b1fb6547d22..00000000000 --- a/apps/JAWS/clients/Caching/Caching.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "http_client"=.\Caching.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/apps/JAWS/clients/Caching/ID_Generator.cpp b/apps/JAWS/clients/Caching/ID_Generator.cpp deleted file mode 100644 index 6e868611835..00000000000 --- a/apps/JAWS/clients/Caching/ID_Generator.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// $Id$ - -#if !defined (ACE_ID_GENERATOR_C) -#define ACE_ID_GENERATOR_C - -#include "ace/Object_Manager.h" -#include "ID_Generator.h" - -ACE_RCSID(Caching, ID_Generator, "$Id$") - -time_t ACE_ID_Generator::last_time_ = 0; - -size_t ACE_ID_Generator::last_number_ = 0; - -ACE_SYNCH_MUTEX *ACE_ID_Generator::lock_ = 0; - -char * -ACE_ID_Generator::get_new_id (char *id) -{ - time_t t; - size_t sn; - - ACE_ID_Generator::get_serial_id (t, sn); - ACE_NEW_RETURN (id, char [ACE_OFFER_ID_LENGTH], 0); - - ACE_OS::sprintf (id, "%014d%06d", t, sn); - return id; -} - -void -ACE_ID_Generator::get_serial_id (time_t &t, size_t &s) -{ - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, *ACE_ID_Generator::get_lock ())); - ACE_OS::time (&t); - - if (t != ACE_ID_Generator::last_time_) - { - ACE_ID_Generator::last_time_ = t; - s = ACE_ID_Generator::last_number_ = 0; - } - else - s = ACE_ID_Generator::last_number_++; -} - -ACE_SYNCH_MUTEX * -ACE_ID_Generator::get_lock (void) -{ -#if defined (ACE_HAS_THREADS) - if (ACE_ID_Generator::lock_ == 0) - { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance (), 0)); - - // Double-checked Locking Optimization. - if (ACE_ID_Generator::lock_ == 0) - ACE_NEW_RETURN (ACE_ID_Generator::lock_, ACE_SYNCH_MUTEX, 0); - } -#endif /* ACE_HAS_THREADS */ - return ACE_ID_Generator::lock_; -} - -#endif /* ACE_ID_GENERATOR_C */ diff --git a/apps/JAWS/clients/Caching/ID_Generator.h b/apps/JAWS/clients/Caching/ID_Generator.h deleted file mode 100644 index 3c02779f36e..00000000000 --- a/apps/JAWS/clients/Caching/ID_Generator.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// none -// -// = FILENAME -// ID_Generator.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ - -#ifndef ACE_ID_GENERATOR_H -#define ACE_ID_GENERATOR_h - -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#define ACE_OFFER_ID_LENGTH 21 - -class ACE_ID_Generator - // = TITLE - // An unique ID generator. - // - // = DESCRIPTION - - // Generate an offer ID according to current time and avoid - // duplicate ID. It guarantees ID uniqueness within a process, - // i.e. no two threads may get the same ID string. Using a - // similar method like the backery algorithm. -{ -public: - static char *get_new_id (char *id); - // allocate a new ID string and point to it. - -private: - static void get_serial_id (time_t &t, size_t &s); - // Atomically get info required to generate an offer ID. - - static ACE_SYNCH_MUTEX *get_lock (void); - // Get the lock instance. - - static time_t last_time_; - // Record the time last offer ID generated. - - static size_t last_number_; - // Record serial number of last offer ID with same - // generation time. - - static ACE_SYNCH_MUTEX *lock_; - // mutex to access private member. -}; - -#endif /* ACE_ID_GENERATOR_H */ diff --git a/apps/JAWS/clients/Caching/Local_Locator.cpp b/apps/JAWS/clients/Caching/Local_Locator.cpp deleted file mode 100644 index 5c084bd783a..00000000000 --- a/apps/JAWS/clients/Caching/Local_Locator.cpp +++ /dev/null @@ -1,257 +0,0 @@ -// $Id$ - -#if !defined (ACE_LOCAL_LOCATOR_C) -#define ACE_LOCAL_LOCATOR_C - -#include "Local_Locator.h" - -#if !defined (__ACE_INLINE__) -#include "Local_Locator.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(Caching, Local_Locator, "$Id$") - -int -ACE_URL_Local_Locator::url_query (const ACE_URL_Locator::ACE_Selection_Criteria how, - const ACE_URL_Property_Seq *pseq, - const size_t how_many, - size_t &num_query, - ACE_URL_Offer_Seq *offer) -{ - ACE_URL_Record *item = 0; - - ACE_NEW_RETURN (offer, ACE_URL_Offer_Seq (how_many), -1); - - if (how >= ACE_URL_Locator::INVALID_SELECTION) - { - errno = ACE_URL_Locator::INVALID_ARGUMENT; - return -1; - } - - num_query = 0; - for (ACE_Unbounded_Set_Iterator iter (this->repository_); - iter.next (item) != 0; - iter.advance ()) - { - size_t i_query; - size_t i_db; - int found = 0; - - // Now this is a stupid implementation. Perhaps we can - // implement this using Hash_Map. Better yet, I think we should - // put this in a database and put SQL query here. - for (i_query = 0; found == 0 && i_query < pseq->size (); i_query++) - for (i_db = 0; i_db < item->offer_->url_properties ().size (); i_db++) - { - if ((*pseq)[i_query].name () == item->offer_->url_properties ()[i_db].name ()) - if (how == ACE_URL_Locator::SOME) - ; - - // if match and Some, copy to , inc , advance iterator - - // else if All, advance iterator - - // else if None, check next property in . - - if (all properties checked and found and ALL) - copy to ; inc ; - else if (all properties checked and not found and NONE) - copy to ; inc ; - else - shouldn't happen, internal error - - if (num_query == how_many) - break; - } - - return 0; -} - -int -ACE_URL_Local_Locator::export_offer (ACE_URL_Offer *offer, - ACE_WString &offer_id) -{ - ACE_URL_Record *item = 0; - - // First check if we have registered this URL already. - for (ACE_Unbounded_Set_Iterator iter (this->repository_); - iter.next (item) != 0; - iter.advance ()) - if (*item->offer_->url () == *offer->url ()) - { - errno = ACE_URL_Locator::OFFER_EXIST; - return -1; - } - - ACE_URL_Record *new_offer; - - // Offer is not in repository, we can add new one in safely. - ACE_NEW_RETURN (new_offer, ACE_URL_Record (offer), - ACE_URL_Locator::NOMEM); - - this->repository_.push (*new_offer); - - offer_id = *new_offer->id_; - return 0; -} - -int -ACE_URL_Local_Locator::withdraw_offer (const ACE_WString &offer_id) -{ - ACE_URL_Record *item = 0; - - // Iterate thru repository and remove offer with . - for (ACE_Unbounded_Set_Iterator iter (this->repository_); - iter.next (item) != 0; - iter.advance ()) - if (offer_id == *item->id_) - { - if (this->repository_.remove (*item) == 0) - return 0 - else - { - errno = ACE_URL_Locator::UNKNOWN; - return -1; - } - } - - errno = ACE_URL_Locator::NO_SUCH_OFFER; - return 0; -} - -int -ACE_URL_Local_Locator::describe_offer (const ACE_WString &offer_id, - ACE_URL_Offer *offer) -{ - ACE_URL_Record *item = 0; - - // Iterate thru the repository and produce a copy of offer's - // description. - for (ACE_Unbounded_Set_Iterator iter (this->repository_); - iter.next (item) != 0; - iter.advance ()) - if (offer_id == *item->id_) - { - ACE_NEW_RETURN (offer, ACE_URL_Offer (*item->offer_), -1); - return 0; - } - - errno = ACE_URL_Locator::NO_SUCH_OFFER; - return -1; -} - -int -ACE_URL_Local_Locator::modify_offer (const ACE_WString &offer_id, - const ACE_WString *url, - const ACE_URL_Property_Seq *del, - const ACE_URL_Property_Seq *modify) -{ - ACE_Unbounded_Set_Iterator iter (this->repository_); - ACE_URL_Record *item = 0; - ACE_URL_Record *target = 0; - - // Errno Checking - - for (; iter.next (item) != 0; iter.advance ()) - { - if (url != 0 && *url == item->offer_->url ()) - { - errno = ACE_URL_Locator::OFFER_EXIST; - return -1; - } - if (offer_id == *item->id_) - target = item; - } - - if (target != 0) // Aha, we found a target to work on - { - if (del != 0 && modify != 0) - { - // We need to make a copy of the original property sequence - // so if any error occurs, we can revert our change easily. - - // First we need to calculate the maximum number of perperties. - int psize = target->offer_->url_properties ().size (); - if (del != 0) - if ((psize -= del->size ()) < 0) - { - // If you try to delete more properties than we have, - // you are doomed. No need to proceed. - errno = ACE_URL_Locator::INVALID_ARGUMENT; - return -1; - } - if (modify != 0) - // In the worst case, all properties in will be added. - psize += modify->size (); - - // Now, create a temporary work space. - ACE_URL_Property_Seq working (psize); - size_t sz = 0; - for (; sz < item->offer_->url_properties ().size ()) - working[sz] = item->offer_->url_properties() [sz]; - - if (del != 0) - { - // Argh, this is really a stupid design. - // Go thru every property we want to delete - for (size_t i = 0; i < del->size () && sz > 0; i++) - // For earch, go thru our property sequence and - // search for the property. - for (size_t j = 0; j < sz; j++) - if ((*del)[i].name () == working[j].name ()) - { - sz -= 1; - working[j] = working[sz]; // pack the array. - break; - } - // Doesn't generate error when we want to delete an - // imaginary property. Is this appropriate? - } - - if (modify != 0) - { - // This is also stupid. - // Go thru every property we want to modify/add - for (size_t i = 0; i < modify->size () && sz > 0; i++) - { - // For each property, go thru our property list - // and search for the matching property - for (size_t j = 0; j < sz; j++) - if ((*modify)[i].name () == working[j].name ()) - { - // A match found. - working[j].value ((*modify)[i].value ().fast_rep ()); - break; - } - - // No matching property name were found, - // We want to add this property into the list. - if (j == sz) - working[sz++] = (*modify)[i]; - } - } - } - - // Yes, all operations passed. We can now copy the working version back. - item->offer_->url_properties (ACE_URL_Property_Seq (sz)); - for (size_t i = 0; i < sz; i ++) - item->offer_->url_properties ()[i] = working[i]; - - if (url != 0) - item->offer_->url (url->fast_rep ()); // replace URL location. - return 0; - } - errno = ACE_URL_Locator::NO_SUCH_OFFER; - return -1; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Unbounded_Set; -template class ACE_Unbounded_Set_Iterator; -template class ACE_Node; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Unbounded_Set -#pragma instantiate ACE_Unbounded_Set_Iterator -#pragma instantiate ACE_Node -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* ACE_LOCAL_LOCATOR_C */ diff --git a/apps/JAWS/clients/Caching/Local_Locator.h b/apps/JAWS/clients/Caching/Local_Locator.h deleted file mode 100644 index 36969e6cb2c..00000000000 --- a/apps/JAWS/clients/Caching/Local_Locator.h +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// none -// -// = FILENAME -// Local_Locator.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ - -#ifndef ACE_LOCAL_LOCATOR_H -#define ACE_LOCAL_LOCATOR_H - -#include "URL_Locator.h" -#include "ace/Containers.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ID_Generator.h" - -class ACE_Svc_Export ACE_URL_Record - // = TITLE - // A URL Record. - // - // = DESCRIPTION - // A record placed in URL repository. Notice that - // both member pointers are own by URL_Record. - // They will get deallocated when the object goes - // out of scope. -{ - friend class ACE_URL_Local_Locator; - friend class ACE_Node; - // We are making ACE_Node as friend class because we don't want - // others to access default constructor and pushing in an invalid - // record. However, container classes need to use default constructor - // for its head record. -public: - ACE_URL_Record (ACE_URL_Offer *offer); - // ctor. - - ~ACE_URL_Record (void); - // dtor. - - int operator== (const ACE_URL_Record &rhs) const; - // Two records are equal if they have the same offer id. - - int operator!= (const ACE_URL_Record &rhs) const; - // Unequal, complement of equal. - -private: - ACE_URL_Record (void); - // Default ctor. This is put here to prevent users from - // pushing in an invalid record. - - ACE_WString *id_; - // Offer ID in the repository. - - ACE_URL_Offer *offer_; - // Offer (and its properties). -}; - -class ACE_Svc_Export ACE_URL_Local_Locator - // = TITLE - // A simple URL repository to store URL offer locally. - // - // = DESCRIPTION - // This class manage a collection of URL offers - // for local query and registration. But we should - // really use it within a server. -{ - virtual ~ACE_URL_Local_Locator (void); - // Default destructor. - - virtual int url_query (const ACE_URL_Locator::ACE_Selection_Criteria how, - const ACE_URL_Property_Seq *pseq, - const size_t how_many, - size_t &num_query, - ACE_URL_Offer_Seq *offer); - // Query the locator for HTTP with designate properties (none, some, - // or all). The locator being queried will return a sequence of - // offers with offers in it. This interface allocates - // so users must deallocate it after use. - - virtual int export_offer (ACE_URL_Offer *offer, - ACE_WString &offer_id); - // Export an offer to the locator. - - virtual int withdraw_offer (const ACE_WString &offer_id); - // Withdraw an offer. return 0 if succeed, -1 otherwise. - - virtual int describe_offer (const ACE_WString &offer_id, - ACE_URL_Offer *offer); - // Query a specific offer. - - virtual int modify_offer (const ACE_WString &offer_id, - const ACE_WString *url = 0, - const ACE_URL_Property_Seq *del = 0, - const ACE_URL_Property_Seq *modify = 0); - // Modify a previously registered offer. - -protected: - ACE_Unbounded_Set repository_; -}; - -#if defined (__ACE_INLINE__) -#include "Local_Locator.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_LOCAL_LOCATOR_H */ diff --git a/apps/JAWS/clients/Caching/Local_Locator.i b/apps/JAWS/clients/Caching/Local_Locator.i deleted file mode 100644 index 1d693472eb8..00000000000 --- a/apps/JAWS/clients/Caching/Local_Locator.i +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - -ACE_INLINE -ACE_URL_Record::ACE_URL_Record (void) - : id_ (0), - offer_ (0) -{ -} - -ACE_INLINE -ACE_URL_Record::ACE_URL_Record (ACE_URL_Offer *offer) - : offer_ (offer) -{ - char buf[ACE_OFFER_ID_LENGTH]; - - ACE_NEW (this->id_, ACE_WString (ACE_ID_Generator::get_new_id (buf))); -} - -ACE_INLINE -ACE_URL_Record::~ACE_URL_Record (void) -{ - delete this->id_; - delete this->offer_; -} - -ACE_INLINE int -ACE_URL_Record::operator== (const ACE_URL_Record &rhs) const -{ - return this == &rhs || *this->id_ == *rhs.id_; -} - -ACE_INLINE int -ACE_URL_Record::operator!= (const ACE_URL_Record &rhs) const -{ - return !(*this == rhs); -} - -ACE_INLINE -ACE_URL_Local_Locator::~ACE_URL_Local_Locator (void) -{ -} - diff --git a/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp b/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp deleted file mode 100644 index 6f7a7898e59..00000000000 --- a/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp +++ /dev/null @@ -1,459 +0,0 @@ -// $Id$ - -#if !defined (ACE_LOCATOR_REQUEST_REPLY_C) -#define ACE_LOCATOR_REQUEST_REPLY_C - -#include "Locator_Request_Reply.h" - -#if !defined (__ACE_INLINE__) -#include "Locator_Request_Reply.i" -#endif - -#include "ace/Auto_Ptr.h" -#include "URL_Properties.h" -#include "URL_Array_Helper.h" -#include "URL_Locator.h" - -ACE_RCSID(Caching, Locator_Request_Reply, "$Id$") - -int -ACE_URL_Locator_Request::url_query (const int how, - const ACE_URL_Property_Seq &pseq, - const int how_many) -{ - ACE_TRACE ("ACE_URL_Locator_Request::url_query"); - - if (how >= ACE_URL_Locator::INVALID_SELECTION) - return -1; - ACE_NEW_RETURN (this->seq1_, ACE_URL_Property_Seq (pseq), -1); - this->how_ = how; - this->how_many_ = how_many; - this->code_ = ACE_URL_Locator::QUERY; - return 0; -} - -int -ACE_URL_Locator_Request::export_offer (const ACE_URL_Offer &offer) -{ - ACE_TRACE ("ACE_URL_Locator_Request::export_offer"); - - ACE_NEW_RETURN (this->offer_, ACE_URL_Offer (offer), -1); - this->code_ = ACE_URL_Locator::EXPORT; - return 0; -} - -int -ACE_URL_Locator_Request::withdraw_offer (const ACE_WString &offer_id) -{ - ACE_TRACE ("ACE_URL_Locator_Request::withdraw_offer"); - - this->id_ = offer_id; - this->code_ = ACE_URL_Locator::WITHDRAW; - return 0; -} - -int -ACE_URL_Locator_Request::describe_offer (const ACE_WString &offer_id) -{ - ACE_TRACE ("ACE_URL_Locator_Request::describe_offer"); - - this->id_ = offer_id; - this->code_ = ACE_URL_Locator::DESCRIBE; - return 0; -} - -int -ACE_URL_Locator_Request::modify_offer (const ACE_WString &offer_id, - const ACE_WString *url, - const ACE_URL_Property_Seq &del, - const ACE_URL_Property_Seq &modify) -{ - ACE_TRACE ("ACE_URL_Locator_Request::modify_offer"); - - ACE_NEW_RETURN (this->seq1_, ACE_URL_Property_Seq (del), -1); - ACE_NEW_RETURN (this->seq2_, ACE_URL_Property_Seq (modify), -1); - - if (url != 0) - this->url_ = *url; - - this->id_ = offer_id; - this->code_ = ACE_URL_Locator::MODIFY; - return 0; -} - -#define ENCODE_UINT32(ADDR,LEN,V) \ - * (ACE_UINT32 *) (ADDR+LEN) = htonl (V); \ - LEN += sizeof (ACE_UINT32); - -#define DECODE_UINT32(ADDR,LEN,V) \ - V = ntohl (* (ACE_UINT32 *) (ADDR+LEN)); \ - LEN += sizeof (ACE_UINT32); - -size_t -ACE_URL_Locator_Request::encode (void) -{ - ACE_TRACE ("ACE_URL_Locator_Request::encode"); - - size_t buf_size = this->size (); - size_t total_length = 0; - - ACE_NEW_RETURN (this->buffer_, char [buf_size], 0); - - ENCODE_UINT32 (this->buffer_, total_length, buf_size); - // Encode buffer size. - - ENCODE_UINT32 (this->buffer_, total_length, this->code_); - // Encode Op code. - - ENCODE_UINT32 (this->buffer_, total_length, this->how_); - // Encode selection criteria. - - ENCODE_UINT32 (this->buffer_, total_length, this->how_many_); - // Encode number of offers interested. - - ENCODE_UINT32 (this->buffer_, total_length, this->valid_ptr_); - // Encode valide pointer flag. - - if (this->seq1_ != 0) - { - ENCODE_UINT32 (this->buffer_, total_length, this->seq1_->size ()); - total_length += ace_array_encode (this->buffer_ + total_length, *this->seq1_); - } - if (this->seq2_ != 0) - { - ENCODE_UINT32 (this->buffer_, total_length, this->seq2_->size ()); - total_length += ace_array_encode (this->buffer_ + total_length, *this->seq2_); - } - if (this->offer_ != 0) - total_length += this->offer_->encode (this->buffer_ + total_length); - - total_length += ACE_WString_Helper::encode (this->buffer_ + total_length, - this->id_); - total_length += ACE_WString_Helper::encode (this->buffer_ + total_length, - this->url_); - - ACE_ASSERT (total_length == buf_size); - return total_length; -} - -size_t -ACE_URL_Locator_Request::decode (void *buffer) -{ - ACE_TRACE ("ACE_URL_Locator_Request::decode"); - - if (buffer == 0) - return 0; - // Check if we have a valid buffer available. - - char *cbuffer = (char *) buffer; - - size_t buf_size; - size_t total_length = 0; - - DECODE_UINT32 (cbuffer, total_length, buf_size); - // Decode length of buffer size first. - - DECODE_UINT32 (cbuffer, total_length, this->code_); - // Get the operation code. - - DECODE_UINT32 (cbuffer, total_length, this->how_); - // Decode selection criteria. - - DECODE_UINT32 (cbuffer, total_length, this->how_many_); - // Decode number of offers interested. - - DECODE_UINT32 (cbuffer, total_length, this->valid_ptr_); - // Decode valide pointer flag. - - if ((this->valid_ptr_ & VALID_SEQ1) != 0) - { - size_t n; - DECODE_UINT32 (cbuffer, total_length, n); - ACE_NEW_RETURN (this->seq1_, ACE_URL_Property_Seq (n), 0); - total_length += ace_array_decode (cbuffer + total_length, *this->seq1_); - } - if ((this->valid_ptr_ & VALID_SEQ2) != 0) - { - size_t n; - DECODE_UINT32 (cbuffer, total_length, n); - ACE_NEW_RETURN (this->seq2_, ACE_URL_Property_Seq (n), 0); - total_length += ace_array_decode (cbuffer + total_length, *this->seq2_); - } - if ((this->valid_ptr_ & VALID_OFFER) != 0) - { - ACE_NEW_RETURN (this->offer_, ACE_URL_Offer, 0); - total_length += this->offer_->decode (cbuffer + total_length); - } - - this->id_ = ACE_WString ((ACE_USHORT16 *) (cbuffer + total_length)); - total_length += ACE_WString_Helper::decode (cbuffer + total_length); - this->url_ = ACE_WString ((ACE_USHORT16 *) (cbuffer + total_length)); - total_length += ACE_WString_Helper::decode (cbuffer + total_length); - - ACE_ASSERT (total_length == buf_size); - return total_length; -} - - -size_t -ACE_URL_Locator_Request::size (void) -{ - ACE_TRACE ("ACE_URL_Locator_Request::size"); - - size_t total_length = 5 * sizeof (ACE_UINT32); - // There are 5 UINT32 variables at the beginning - // of the buffer. , , , - // , . - - this->valid_ptr_ = 0; - // Check valid pointers and mark corresponding flag in . - - if (this->seq1_ != 0) - { - this->valid_ptr_ |= VALID_SEQ1; - total_length += ace_array_size (*this->seq1_); - } - if (this->seq2_ != 0) - { - this->valid_ptr_ |= VALID_SEQ2; - total_length += ace_array_size (*this->seq2_); - } - if (this->offer_ != 0) - { - this->valid_ptr_ |= VALID_OFFER; - total_length += this->offer_->size (); - } - - total_length += ACE_WString_Helper::size (this->id_); - total_length += ACE_WString_Helper::size (this->url_); - - return total_length; -} - -void -ACE_URL_Locator_Request::dump (void) const -{ - //ACE_TRACE ("ACE_URL_Locator_Request::dump"); - - size_t i; - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - if (this->code_ < ACE_URL_Locator::INVALID_OPERATION) - ACE_DEBUG ((LM_DEBUG, "%s Request:\n", ACE_URL_Locator::opname[this->code_])); - else - ACE_DEBUG ((LM_DEBUG, "Invalid Operation: %d\n", this->code_)); - - if (this->how_ < ACE_URL_Locator::INVALID_SELECTION) - ACE_DEBUG ((LM_DEBUG, "Select: %s\n", ACE_URL_Locator::selection_name[this->how_])); - else - ACE_DEBUG ((LM_DEBUG, "Invalid selection method: %d\n", this->how_)); - - ACE_DEBUG ((LM_DEBUG, "At most %d reply.\n", this->how_many_)); - - ACE_DEBUG ((LM_DEBUG, "Valid pointer pattern: %x\n", this->valid_ptr_)); - - ACE_DEBUG ((LM_DEBUG, "Property sequence 1: %x\n", this->seq1_)); - if (this->seq1_ != 0) - for (i = 0; i < this->seq1_->size (); i++) - (*this->seq1_)[i].dump (); - - ACE_DEBUG ((LM_DEBUG, "Property sequence 2: %x\n", this->seq2_)); - if (this->seq2_ != 0) - for (i = 0; i < this->seq2_->size (); i++) - (*this->seq2_)[i].dump(); - - ACE_DEBUG ((LM_DEBUG, "Offer: %x\n", this->offer_)); - if (this->offer_ != 0) - this->offer_->dump (); - - if (this->id_.length () > 0) - ACE_DEBUG ((LM_DEBUG, "Offer ID: %s\n", - ACE_Auto_Basic_Array_Ptr (this->id_.char_rep ()).get ())); - else - ACE_DEBUG ((LM_DEBUG, "Offer ID: \"\"\n")); - - if (this->url_.length () > 0) - ACE_DEBUG ((LM_DEBUG, "URL: %s\n", - ACE_Auto_Basic_Array_Ptr (this->url_.char_rep ()).get ())); - else - ACE_DEBUG ((LM_DEBUG, "URL: \"\"\n")); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -int -ACE_URL_Locator_Reply::status_reply (u_int op, int result) -{ - ACE_TRACE ("ACE_URL_Locator_Reply::status_reply"); - - this->code_ = op; - this->status_ = result; - return 0; -} - -int -ACE_URL_Locator_Reply::query_reply (int result, size_t num, - const ACE_URL_Offer_Seq &offers) -{ - ACE_TRACE ("ACE_URL_Locator_Reply::query_reply"); - - this->code_ = ACE_URL_Locator::QUERY; - this->status_ = result; - ACE_NEW_RETURN (this->offers_, ACE_URL_Offer_Seq (offers), -1); - return 0; -} - -int -ACE_URL_Locator_Reply::describe_reply (int result, - const ACE_URL_Offer &offer) -{ - ACE_TRACE ("ACE_URL_Locator_Reply::describe_reply"); - - this->code_ = ACE_URL_Locator::DESCRIBE; - this->status_ = result; - ACE_NEW_RETURN (this->offer_, ACE_URL_Offer (offer), -1); - return 0; -} - -size_t -ACE_URL_Locator_Reply::encode (void) -{ - ACE_TRACE ("ACE_URL_Locator_Reply::encode"); - - size_t buf_size = this->size (); - size_t total_length = 0; - - ACE_NEW_RETURN (this->buffer_, char [buf_size], 0); - - ENCODE_UINT32 (this->buffer_, total_length, buf_size); - // Encode buffer size. - - ENCODE_UINT32 (this->buffer_, total_length, this->code_); - // Encode Op code. - - ENCODE_UINT32 (this->buffer_, total_length, this->status_); - // Encode Op result status. - - ENCODE_UINT32 (this->buffer_, total_length, this->num_offers_); - // Encode number of offers in this->offers_. - - ENCODE_UINT32 (this->buffer_, total_length, this->valid_ptr_); - // Encode valid pointers mask. - - if (this->offer_ != 0) - total_length += this->offer_->encode (this->buffer_ + total_length); - - if (this->offers_ != 0) - { - ENCODE_UINT32 (this->buffer_, total_length, this->offers_->size ()); - total_length += ace_array_encode (this->buffer_ + total_length, *this->offers_); - } - - ACE_ASSERT (total_length == buf_size); - return 0; -} - -size_t -ACE_URL_Locator_Reply::decode (void *buffer) -{ - ACE_TRACE ("ACE_URL_Locator_Reply::decode"); - - if (buffer == 0) - return 0; - // Check if we have a buffer available. - - char *cbuffer = (char *) buffer; - - size_t buf_size; - size_t total_length = 0; - - DECODE_UINT32 (cbuffer, total_length, buf_size); - // Get the length of the buffer first. - - DECODE_UINT32 (cbuffer, total_length, this->code_); - // Decode Op code. - - DECODE_UINT32 (cbuffer, total_length, this->status_); - // Decode Op result status. - - DECODE_UINT32 (cbuffer, total_length, this->num_offers_); - // Decode number of offers in this->offers_. - - DECODE_UINT32 (cbuffer, total_length, this->valid_ptr_); - // Decode valid pointers mask. - - if ((this->valid_ptr_ & VALID_OFFER) != 0) - { - ACE_NEW_RETURN (this->offer_, ACE_URL_Offer, 0); - total_length += this->offer_->decode (cbuffer + total_length); - } - - if ((this->valid_ptr_ & VALID_OFFERS) != 0) - { - size_t n; - DECODE_UINT32 (cbuffer, total_length, n); - ACE_NEW_RETURN (this->offers_, ACE_URL_Offer_Seq (n), 0); - total_length += ace_array_decode (cbuffer + total_length, *this->offers_); - } - - ACE_ASSERT (total_length ==buf_size); - return 0; -} - -size_t -ACE_URL_Locator_Reply::size (void) -{ - ACE_TRACE ("ACE_URL_Locator_Reply:size"); - - size_t total_length = 5 * sizeof (ACE_UINT32); - // size for 5 ACE_UINT32 objects: , , - // , , and . - - this->valid_ptr_ = 0; - if (this->offer_ != 0) - { - this->valid_ptr_ |= VALID_OFFER; - total_length += this->offer_->size (); - } - if (this->offers_ != 0) - { - this->valid_ptr_ |= VALID_OFFERS; - total_length += ace_array_size (*this->offers_); - } - return total_length; -} - -void -ACE_URL_Locator_Reply::dump (void) const -{ - //ACE_TRACE ("ACE_URL_Locator_Reply::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - if (this->code_ < ACE_URL_Locator::INVALID_OPERATION) - ACE_DEBUG ((LM_DEBUG, "Original request: %s\n", ACE_URL_Locator::opname[this->code_])); - else - ACE_DEBUG ((LM_DEBUG, "Invalid Original Request: %d\n", this->code_)); - - if (this->status_ < ACE_URL_Locator::MAX_URL_ERROR) - ACE_DEBUG ((LM_DEBUG, "Reply status: %s\n", ACE_URL_Locator::err_name[this->status_])); - else - ACE_DEBUG ((LM_DEBUG, "Invalid reply status: %d\n", this->status_)); - - ACE_DEBUG ((LM_DEBUG, "Number of offers: %d\n", this->num_offers_)); - - ACE_DEBUG ((LM_DEBUG, "Valid pointer pattern: %x\n", this->valid_ptr_)); - - ACE_DEBUG ((LM_DEBUG, "Offer: %x\n", this->offer_)); - if (this->offer_ != 0) - this->offer_->dump (); - - ACE_DEBUG ((LM_DEBUG, "Offer sequence: %x\n", this->offers_)); - if (this->offers_ != 0) - for (size_t i = 0; i < this->offers_->size (); i++) - (*this->offers_)[i].dump(); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} -#endif /* ACE_LOCATOR_REQUEST_REPLY_C */ diff --git a/apps/JAWS/clients/Caching/Locator_Request_Reply.h b/apps/JAWS/clients/Caching/Locator_Request_Reply.h deleted file mode 100644 index 057607c351d..00000000000 --- a/apps/JAWS/clients/Caching/Locator_Request_Reply.h +++ /dev/null @@ -1,220 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// none -// -// = FILENAME -// Locator_Request_Response.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ - -#ifndef ACE_LOCATOR_REQUEST_REPLY_H -#define ACE_LOCATOR_REQUEST_REPLY_H - -#include "URL_Properties.h" - -class ACE_Svc_Export ACE_URL_Locator_Request - // = TITLE - // A URL request message formater/wrapper. - // - // = DESCRIPTION - // This class defines a URL request data. It is used - // to transform requests to an object so that we can - // ship them across network. -{ -public: - ACE_URL_Locator_Request (void); - // Default ctor. - - ~ACE_URL_Locator_Request (void); - // Default dtor. - - int url_query (const int how, - const ACE_URL_Property_Seq &pseq, - const int how_many); - // Query the locator for HTTP with designate properties (none, some, - // or all). The locator being queried will return a sequence of - // offers with offers in it. This interface allocates - // so users must deallocate it after use. - - int export_offer (const ACE_URL_Offer &offer); - // Export an offer to the locator. - - int withdraw_offer (const ACE_WString &offer_id); - // Withdraw an offer. return 0 if succeed, -1 otherwise. - - int describe_offer (const ACE_WString &offer_id); - // Query a specific offer. - - int modify_offer (const ACE_WString &offer_id, - const char *url = 0, - const ACE_URL_Property_Seq &del = 0, - const ACE_URL_Property_Seq &modify = 0); - // Modify a previously registered offer. - - int modify_offer (const ACE_WString &offer_id, - const ACE_WString *url = 0, - const ACE_URL_Property_Seq &del = 0, - const ACE_URL_Property_Seq &modify = 0); - // Modify a previously registered offer. - - size_t encode (void); - // Encode request for network communication. If succeed, - // returns the size of the buffer, otherwise, return 0. - - size_t decode (void *buffer); - // Restore from network data. Returns size of the buffer - // if succeed, 0 otherwise. When passing in a buffer, - // caller must take the responsibility to delete the buffer - // afterward, if so needed. - - const int how (void) const; - const int how_many (void) const; - const u_int opcode (void) const; - const ACE_URL_Property_Seq *seq (void) const; - const ACE_URL_Property_Seq *del (void) const; - const ACE_URL_Property_Seq *modify (void) const; - const ACE_URL_Offer *offer (void) const; - const ACE_WString &id (void) const; - const ACE_WString &url (void) const; - const char *buffer (void) const; - // A bunch of methods to access internal data. - - void dump (void) const; - // Print out this object. - -protected: - size_t size (void); - // Return the size of the buffer required to encode - // this request. - - enum { - VALID_SEQ1 = 0x1, - VALID_SEQ2 = 0X2, - VALID_OFFER = 0X4 - }; - // These constants used to indicate which pointers are valid. - - u_int code_; - // Request type code. - - int how_; - // Query method (if code_ == QUERY.) - - int how_many_; - // How many offers are we interested in in this query. - - int valid_ptr_; - // Bit flag to mark valid pointers within this object. - - ACE_URL_Property_Seq *seq1_; - // For query or del in modify_offer. - - ACE_URL_Property_Seq *seq2_; - // For modify seq. in modify_offer. - - ACE_URL_Offer *offer_; - // Offer to export. - - ACE_WString id_; - // Offer ID. - - ACE_WString url_; - // URL of this offer. - - char *buffer_; - // Buffer to store encoded data. -}; - -class ACE_Svc_Export ACE_URL_Locator_Reply - // = TITLE - // A URL reply message formater/wrapper. - // - // = DESCRIPTION - // This class defines a URL reply data. It is used - // to transform reply messages to an object so that we can - // ship them across network. -{ -public: - ACE_URL_Locator_Reply (void); - // Default ctor. - - ~ACE_URL_Locator_Reply (void); - // Default dtor. - - int status_reply (u_int op, int result); - // Setup a reply message for EXPORT, WITHDRAW, or MODIFY operations. - - int query_reply (int result, size_t num, - const ACE_URL_Offer_Seq &offers); - // Setup a reply for QUERY operation. - - int describe_reply (int result, - const ACE_URL_Offer &offer); - // Construct a reply for DESCRIBE operation. - - size_t encode (void); - // Encode request for network communication. If succeed, - // returns the size of the buffer, otherwise, return 0. - - size_t decode (void *buffer); - // Restore from network data. Returns size of the buffer - // if succeed, 0 otherwise. When passing in a buffer, - // caller must take the responsibility to delete the buffer - // afterward, if so needed. - - // Accessor function. - const size_t num_offers (void) const; - const ACE_URL_Offer *offer (void) const; - const ACE_URL_Offer_Seq *offers (void) const; - const u_int opcode (void) const; - const u_int status (void) const; - const char *buffer (void) const ; - - void dump (void) const ; - // Print out this object. - -protected: - size_t size (void); - // Return the size of the buffer required to encode - // this request. - - enum { - VALID_OFFER = 0x1, - VALID_OFFERS = 0x2 - }; - // Valid pointer masks. - - u_int code_; - // Holds the original op code. - - int status_; - // Holds the result of an operation from the Location Server. - - size_t num_offers_; - // Holds the number of valid offers in the offers_ sequence. - - int valid_ptr_; - // Flag that marks valid internal pointers. - - ACE_URL_Offer *offer_; - // Holds a single offer. Used in query offer property. - - ACE_URL_Offer_Seq *offers_; - // Holds the replying offer sequence from a Locator. - - char *buffer_; - // Buffer to store encoded data. -}; -#if defined (__ACE_INLINE__) -#include "Locator_Request_Reply.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_LOCATOR_REQUEST_REPLY_H */ diff --git a/apps/JAWS/clients/Caching/Locator_Request_Reply.i b/apps/JAWS/clients/Caching/Locator_Request_Reply.i deleted file mode 100644 index 9dd2f851ceb..00000000000 --- a/apps/JAWS/clients/Caching/Locator_Request_Reply.i +++ /dev/null @@ -1,138 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - -#include "URL_Locator.h" - -ACE_INLINE -ACE_URL_Locator_Request::ACE_URL_Locator_Request (void) - : code_(ACE_URL_Locator::INVALID_OPERATION), - seq1_ (0), - seq2_ (0), - offer_ (0), - buffer_ (0) -{ -} - -ACE_INLINE -ACE_URL_Locator_Request::~ACE_URL_Locator_Request (void) -{ - delete this->seq1_; - delete this->seq2_; - delete this->offer_; - delete [] this->buffer_; -} - -ACE_INLINE const int -ACE_URL_Locator_Request::how (void) const -{ - return this-> how_; -} - -ACE_INLINE const int -ACE_URL_Locator_Request::how_many (void) const -{ - return this->how_many_; -} - -ACE_INLINE const u_int -ACE_URL_Locator_Request::opcode (void) const -{ - return this->code_; -} - -ACE_INLINE const ACE_URL_Property_Seq * -ACE_URL_Locator_Request::seq (void) const -{ - return this->seq1_; -} - -ACE_INLINE const ACE_URL_Property_Seq * -ACE_URL_Locator_Request::del (void) const -{ - return this->seq1_; -} - -ACE_INLINE const ACE_URL_Property_Seq * -ACE_URL_Locator_Request::modify (void) const -{ - return this->seq2_; -} - -ACE_INLINE const ACE_URL_Offer * -ACE_URL_Locator_Request::offer (void) const -{ - return this->offer_; -} - -ACE_INLINE const ACE_WString & -ACE_URL_Locator_Request::id (void) const -{ - return this->id_; -} - -ACE_INLINE const ACE_WString & -ACE_URL_Locator_Request::url (void) const -{ - return this->url_; -} - -ACE_INLINE const char * -ACE_URL_Locator_Request::buffer (void) const -{ - return this->buffer_; -} - -ACE_INLINE -ACE_URL_Locator_Reply::ACE_URL_Locator_Reply (void) - : code_ (ACE_URL_Locator::INVALID_OPERATION), - offer_ (0), - offers_ (0), - buffer_ (0) -{ -} - -ACE_INLINE -ACE_URL_Locator_Reply::~ACE_URL_Locator_Reply (void) -{ - delete this->offer_; - delete this->offers_; - delete [] this->buffer_; -} - -ACE_INLINE const size_t -ACE_URL_Locator_Reply::num_offers (void) const -{ - return this->num_offers_; -} - - -ACE_INLINE const ACE_URL_Offer * -ACE_URL_Locator_Reply::offer (void) const -{ - return this->offer_; -} - -ACE_INLINE const ACE_URL_Offer_Seq * -ACE_URL_Locator_Reply::offers (void) const -{ - return this->offers_; -} - -ACE_INLINE const u_int -ACE_URL_Locator_Reply::opcode (void) const -{ - return this->code_; -} - -ACE_INLINE const u_int -ACE_URL_Locator_Reply::status (void) const -{ - return this->status_; -} - -ACE_INLINE const char * -ACE_URL_Locator_Reply::buffer (void) const -{ - return this->buffer_; -} diff --git a/apps/JAWS/clients/Caching/Makefile b/apps/JAWS/clients/Caching/Makefile deleted file mode 100644 index 315628299f4..00000000000 --- a/apps/JAWS/clients/Caching/Makefile +++ /dev/null @@ -1,260 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the ACE Adapter Web Server (JAWS) client -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -BIN2 = http_client - -FILES = http_handler - -SRC = $(addsuffix .cpp,$(FILES)) -OBJ = $(addsuffix .o,$(FILES)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -#### If the ACE library wasn't built with sufficient components, don't -#### try to build here. -ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) -ifeq (Utils,$(findstring Utils,$(ACE_BUILD_COMPONENTS))) - ifneq (FOR_TAO,$(ACE_COMPONENTS)) - BIN = $(BIN2) - endif # ! FOR_TAO -endif # ! Utils - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/http_handler.o .obj/http_handler.so .shobj/http_handler.o .shobj/http_handler.so: http_handler.cpp \ - $(ACE_ROOT)/ace/Filecache.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - http_handler.h \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Notification_Strategy.h \ - $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Connector.cpp - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/apps/JAWS/clients/Caching/Makefile.bor b/apps/JAWS/clients/Caching/Makefile.bor deleted file mode 100644 index af633030078..00000000000 --- a/apps/JAWS/clients/Caching/Makefile.bor +++ /dev/null @@ -1,6 +0,0 @@ - -NAME = http_client -OBJFILES = \ - $(OBJDIR)\http_client.obj \ - $(OBJDIR)\http_handler.obj -!include <$(ACE_ROOT)\apps\build.bor> diff --git a/apps/JAWS/clients/Caching/README b/apps/JAWS/clients/Caching/README deleted file mode 100644 index 3dcfcd32815..00000000000 --- a/apps/JAWS/clients/Caching/README +++ /dev/null @@ -1,83 +0,0 @@ -# -*- text -*- -# Hey, Emacs! This is a TEXT file. - ----------------------------------- -README for the caching http_client ----------------------------------- - -This is the README file for the simple caching http_client. - ------------- -1. Compiling ------------- - -1a. Compiling on UNIX. - - On UNIX, with a properly configured ACE distribution, just -type make (using GNU make, of course). - -1b. Compiling on NT. - - Thus far, this code has only been tested under UNIX. A -Windows NT version will be out soon. - ------------- -2. Executing ------------- - -2a. Command line parameters. - - The program does not support any command line parameters. - -2b. General information. - - When the program runs, the client offers a ``*'' as a prompt. -At the prompt, you may enter a URL. The client will check to see if -the filename portion of the URL has already been cached. If so, a -message appears saying so. If not, the client will fetch the file -from the HTTP server and then cache it. - - Furthermore, the client supports the ``!'' shell escape -command. The content after the ``!'' will be executed by a shell. - - To exit the session, send the end-of-file character -(typically, ^D in UNIX). - - unix$ ./http_client - * http://www.cs.wustl.edu/cs/Art/brookings.gif - [1] sending request -- - GET /cs/Art/brookings.gif HTTP/1.0 - Accept: HTTP/1.0 - - ``brookings.gif'' is now cached. - * http://www.cs.wustl.edu/cs/Art/brookings.gif - ``brookings.gif'' is already cached. - * !ls - Makefile http_client http_handler.cpp zJAWSAAAa000Yg - brookings.gif http_client.cpp http_handler.h - * ^D - Bye! - unix$ ls - Makefile http_client http_handler.cpp - brookings.gif http_client.cpp http_handler.h - unix$ - --------------- -3. Limitations --------------- - - The caching mechanism as currently implemented requires a -``Content-length:'' to appear in the response header of the HTTP -response. This is because the caching utilizes mmap () to allocate -space for the file to be cached before the file is received. Unitl -the caching mecahnism is extended, you are limited to using servers -which will report the size of the file being transmitted. - - Currently, the cache creates temporary files (see the above -sample execution). - - The cache is not persistent between executions. - - Suggestions and other correspondence should be sent to me: - -James Hu diff --git a/apps/JAWS/clients/Caching/URL_Array_Helper.cpp b/apps/JAWS/clients/Caching/URL_Array_Helper.cpp deleted file mode 100644 index c8dbb55e197..00000000000 --- a/apps/JAWS/clients/Caching/URL_Array_Helper.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// $Id$ - -// URL_Array_Helper.cpp - -#ifndef ACE_URL_ARRAY_HELPER_C -#define ACE_URL_ARRAY_HELPER_C - -#include "URL_Array_Helper.h" - -ACE_RCSID(Caching, URL_Array_Helper, "$Id$") - -// Some helper functions for encoding/decoding - -template -size_t ace_array_size (const T &x) -{ - size_t sum = sizeof (ACE_UINT32); - for (size_t i = 0; i < x.size (); i++) - sum += x[i].size (); - return sum; -} - -template -size_t ace_array_encode (void *buf, const T &x) -{ - size_t len = 0; - for (size_t i = 0; i < x.size (); i++) - len+= x[i].encode ((void *) ((char *) buf + len)); - return len ; -} - -template -size_t ace_array_decode (void *buf, T &x) -{ - size_t len = 0; - for (size_t i = 0; i < x.size (); i++) - len += x[i].decode ((void *) ((char *) buf + len)); - return len; -} - - - -#endif /* ACE_URL_ARRAY_HELPER_C */ diff --git a/apps/JAWS/clients/Caching/URL_Array_Helper.h b/apps/JAWS/clients/Caching/URL_Array_Helper.h deleted file mode 100644 index f38f9ebf5dd..00000000000 --- a/apps/JAWS/clients/Caching/URL_Array_Helper.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// none -// -// = FILENAME -// URL_Array_Helper.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ - -#ifndef ACE_URL_ARRAY_HELPER_H -#define ACE_URL_ARRAY_HELPER_H - -// ### These template functions are probably named improperly. -// You should find some way to avoid name space polution. - -template -size_t ace_array_size (const T &x); - -template -size_t ace_array_encode (void *buf, const T &x); - -template -size_t ace_array_decode (void *buf, T &x); - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "URL_Array_Helper.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("URL_Array_Helper.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* ACE_URL_ARRAY_HELPER_H */ diff --git a/apps/JAWS/clients/Caching/URL_Locator.cpp b/apps/JAWS/clients/Caching/URL_Locator.cpp deleted file mode 100644 index fd3eacab06d..00000000000 --- a/apps/JAWS/clients/Caching/URL_Locator.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ - -#if !defined (ACE_URL_LOCATOR_C) -#define ACE_URL_LOCATOR_C - -#include "URL_Locator.h" - -#if !defined (__ACE_INLINE__) -#include "URL_Locator.i" -#endif - -ACE_RCSID(Caching, URL_Locator, "$Id$") - -const char * const -ACE_URL_Locator::opname[] = -// Human readable operation name -{ - "Query", - "Export", - "Withdraw", - "Describe", - "Modify", - "Invalid Operation" -}; - -const char * const -ACE_URL_Locator::selection_name[] = -{ - "None", - "Some", - "All", - "Invalid Selection" -}; - -const char * const -ACE_URL_Locator::err_name[] = -{ - "No error", - "Offer already exist", - "no such offer", - "invalid argument", - "function not implemented", - "unknown error" -}; - -ACE_URL_Locator::~ACE_URL_Locator (void) -{ -} - -const char * -ACE_URL_Locator::error_status (void) -{ - return "Not implemented yet."; -} - -#endif /* ACE_URL_LOCATOR_C */ diff --git a/apps/JAWS/clients/Caching/URL_Locator.h b/apps/JAWS/clients/Caching/URL_Locator.h deleted file mode 100644 index cf6f294145e..00000000000 --- a/apps/JAWS/clients/Caching/URL_Locator.h +++ /dev/null @@ -1,116 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// none -// -// = FILENAME -// URL_Locator.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ - -#ifndef ACE_URL_LOCATOR_H -#define ACE_URL_LOCATOR_H - -#include "URL_Properties.h" - -class ACE_Svc_Export ACE_URL_Locator - // = TITLE - // Abstract Base class designates what interfaces a URL_Locator - // should provide. - // - // = DESCRIPTION - // This class defines the basic URL_Locator APIs. - // An URL locator provides services for URL clients to - // query specific URL location that has certain properties - // and URL providers to export their services and a set of - // APIs to maintain their offers. -{ -public: - // Request type - enum ACE_URL_Locator_Op_Type - { - QUERY = 0, - EXPORT, - WITHDRAW, - DESCRIBE, - MODIFY, - INVALID_OPERATION // LAST - }; - - static const char * const opname[]; - // Human Readable operation name. - - // = Specify how to select offers. - enum ACE_Selection_Criteria - { - NONE = 0, // URL that contains none of the properties. - SOME, // URL that contains some of the properties. - ALL, // URL that contains all of the properties. - INVALID_SELECTION // Invalid. - }; - - static const char * const selection_name[]; - - enum ACE_URL_Locator_Error - // errno will set to one of these value. - { - OK, // Everything is fine. - OFFER_EXIST, // trying to register an offer. - // that is already exist in repository. - NO_SUCH_OFFER, // No such offer in the repository. - INVALID_ARGUMENT, // Invalid argument encountered. - UNIMPLEMENTED, // function not implemented. - UNKNOWN, // Unknown error. - MAX_URL_ERROR - }; - // Possible error code of URL_Locator. - - static const char * const err_name[]; - // Human readable error status. - - virtual ~ACE_URL_Locator (void) = 0; - // Default destructor. - - virtual int url_query (const ACE_Selection_Criteria how, - const ACE_URL_Property_Seq *pseq, - const size_t how_many, - size_t &num_query, - ACE_URL_Offer_Seq *offer) = 0; - // Query the locator for HTTP with designate properties (none, some, - // or all). The locator being queried will return a sequence of - // offers with offers in it. This interface allocates - // so users must deallocate it after use. - - virtual int export_offer (ACE_URL_Offer *offer, - ACE_WString &offer_id) = 0; - // Export an offer to the locator. - - virtual int withdraw_offer (const ACE_WString &offer_id) = 0; - // Withdraw an offer. return 0 if succeed, -1 otherwise. - - virtual int describe_offer (const ACE_WString &offer_id, - ACE_URL_Offer *offer) = 0; - // Query a specific offer. - - virtual int modify_offer (const ACE_WString &offer_id, - const ACE_WString *url = 0, - const ACE_URL_Property_Seq *del = 0, - const ACE_URL_Property_Seq *modify = 0) = 0; - // Modify a previously registered offer. - - virtual const char *error_status (void); - // Provide a human readable error status. -}; - -#if defined (__ACE_INLINE__) -#include "URL_Locator.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_WEB_LOCATOR_H */ diff --git a/apps/JAWS/clients/Caching/URL_Locator.i b/apps/JAWS/clients/Caching/URL_Locator.i deleted file mode 100644 index 722888896c1..00000000000 --- a/apps/JAWS/clients/Caching/URL_Locator.i +++ /dev/null @@ -1,4 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - diff --git a/apps/JAWS/clients/Caching/URL_Properties.cpp b/apps/JAWS/clients/Caching/URL_Properties.cpp deleted file mode 100644 index eeae1f43581..00000000000 --- a/apps/JAWS/clients/Caching/URL_Properties.cpp +++ /dev/null @@ -1,163 +0,0 @@ -// $Id$ - -#if !defined (ACE_URL_PROPERTIES_C) -#define ACE_URL_PROPERTIES_C - -#include "URL_Properties.h" - -#if !defined (__ACE_INLINE__) -#include "URL_Properties.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/OS.h" -#include "ace/Auto_Ptr.h" -#include "URL_Array_Helper.h" - -ACE_RCSID(Caching, URL_Properties, "$Id$") - -size_t -ACE_WString_Helper::encode (void *buf, const ACE_WString &wstr) -{ - ACE_USHORT16 *wptr = (ACE_USHORT16 *) buf; - size_t i; - - for (i= 0; i <= wstr.length (); i++) - wptr[i] = htons (wstr[i]); - - return i * sizeof (ACE_USHORT16); -} - -size_t -ACE_WString_Helper::decode (void *buf) -{ - ACE_USHORT16 *wptr = (ACE_USHORT16 *) buf; - size_t i; - - for (i = 0; wptr[i] != 0; i++) - wptr[i] = ntohs (wptr[i]); - - return (i + 1) * sizeof (ACE_USHORT16); -} - -size_t -ACE_URL_Property::encode (void *buf) const -{ - size_t blen = ACE_WString_Helper::encode (buf, this->name_); - blen += ACE_WString_Helper::encode ((void *) ((char *) buf + blen), - this->value_); - return blen; -} - -size_t -ACE_URL_Property::decode (void *buf) -{ - char *cbuf = (char *) buf; - size_t len = ACE_WString_Helper::decode(buf); - this->name ((ACE_USHORT16 *) cbuf); - - cbuf += len; - len += ACE_WString_Helper::decode ((void *) cbuf); - this->value ((ACE_USHORT16 *) cbuf); - return len; -} - -void -ACE_URL_Property::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - if (this->name_.length () > 0) - ACE_DEBUG ((LM_DEBUG, "\n name_: \"%s\"\n", - ACE_Auto_Basic_Array_Ptr (this->name_.char_rep ()).get ())); - else - ACE_DEBUG ((LM_DEBUG, "\n name_: \"\"\n")); - - if (this->value_.length () > 0) - ACE_DEBUG ((LM_DEBUG, " value_: \"%s\"\n", - ACE_Auto_Basic_Array_Ptr (this->value_.char_rep ()).get ())); - else - ACE_DEBUG ((LM_DEBUG, " value_: \"\"\n")); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -size_t -ACE_URL_Offer::size (void) const -{ - size_t sum = (this->url_.length () + 1) * sizeof (ACE_USHORT16); - sum += ::ace_array_size (this->prop_); - return sum; -} - -size_t -ACE_URL_Offer::encode (void *buf) const -{ - ACE_UINT32 *s_buf = (ACE_UINT32 *) buf; - *s_buf = htonl (this->prop_.size ()); - - size_t len = sizeof (ACE_UINT32); - len += ACE_WString_Helper::encode ((void *) ((char *) buf + len), - this->url_); - - len += ::ace_array_encode ((void *) ((char *) buf + len), - this->prop_); - return len; -} - -size_t -ACE_URL_Offer::decode (void *buf) -{ - size_t len = sizeof (ACE_UINT32); - size_t a_size = (size_t) ntohl (*(ACE_UINT32 *) buf); - len += ACE_WString_Helper::decode ((void *) ((char *) buf + len)); - this->url ((ACE_USHORT16 *) ((char *) buf + len)); - - ACE_URL_Property_Seq prop_seq (a_size); - this->url_properties (prop_seq); - - len += ::ace_array_decode ((void *)((char *) buf + len), - this->prop_); - return len; -} - -void -ACE_URL_Offer::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - - if (this->url_.length () > 0) - ACE_DEBUG ((LM_DEBUG, "\n url_: \"%s\"\n", - ACE_Auto_Basic_Array_Ptr (this->url_.char_rep ()).get ())); - else - ACE_DEBUG ((LM_DEBUG, "\n url_: \"\"\n")); - - for (size_t i = 0; i < this->prop_.size (); i++) - this->prop_[i].dump (); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Array_Base; -template class ACE_Array; -template class ACE_Array_Base; -template class ACE_Array; -template size_t ace_array_size (ACE_Array &); -template size_t ace_array_encode (void *, ACE_Array &); -template size_t ace_array_decode (void *, ACE_Array &); -template size_t ace_array_size (ACE_Array &); -template size_t ace_array_encode (void *, ACE_Array &); -template size_t ace_array_decode (void *, ACE_Array &); -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Array_Base -#pragma instantiate ACE_Array -#pragma instantiate ACE_Array_Base -#pragma instantiate ACE_Array -#pragma instantiate size_t ace_array_size (ACE_Array &) -#pragma instantiate size_t ace_array_encode (void *, ACE_Array &) -#pragma instantiate size_t ace_array_decode (void *, ACE_Array &) -#pragma instantiate size_t ace_array_size (ACE_Array &) -#pragma instantiate size_t ace_array_encode (void *, ACE_Array &) -#pragma instantiate size_t ace_array_decode (void *, ACE_Array &) -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* ACE_URL_PROPERTIES_C */ diff --git a/apps/JAWS/clients/Caching/URL_Properties.h b/apps/JAWS/clients/Caching/URL_Properties.h deleted file mode 100644 index 17e3c6df114..00000000000 --- a/apps/JAWS/clients/Caching/URL_Properties.h +++ /dev/null @@ -1,201 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// none -// -// = FILENAME -// URL_Locator.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ - -#ifndef ACE_URL_PROPERTIES_H -#define ACE_URL_PROPERTIES_H - -#include "ace/SString.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Containers.h" - -class ACE_Svc_Export ACE_WString_Helper - // = TITLE - // Some helper functions for manipulate ACE_WString. - // - // = DESCRIPTION - // These functions simplify encoding/decoding of - // ACE_WString objects for network communication. -{ -public: - static size_t size (const ACE_WString &wstr); - // Returns the actual size (in bytes) required to contain the - // ACE_WString. - - static size_t encode (void *buf, const ACE_WString &wstr); - // Encode into for network communication. - // Return total octets consumed. - - static size_t decode (void *buf); - // This function doesn't relate to ACE_WString directly. - // It converts an ACE_USHORT16 string from network - // byte order to host byte order. Returns size of the string. -}; - -class ACE_Svc_Export ACE_URL_Property - // = TITLE - // Defines a property of a URL. - // - // = DESCRIPTION - // A property contains a and a . - // A URL may contain some properties and we can "locate" - // the URL's we are looking for by examming URL for certain - // properties that match our need. -{ -public: - ACE_URL_Property (const char *name = 0, - const char *value=0); - // Create a new property. - - ACE_URL_Property (const ACE_USHORT16 *name, - const ACE_USHORT16 *value); - // Create a new property using wchar strings. This is mostly used - // to support DBCS or UNICODE. - - ACE_URL_Property (const ACE_URL_Property &p); - // Copy constructor. - - ~ACE_URL_Property (void); - // Destructor. - - ACE_URL_Property &operator= (const ACE_URL_Property &rhs); - // Assignment operator. - - int operator== (const ACE_URL_Property &rhs) const; - // Equals operator. - - int operator!= (const ACE_URL_Property &rhs) const; - // Inequality operator. - - // = Query property name. - ACE_WString &name_rep (void); - const ACE_WString &name (void) const; - - // = Set property name. - void name (const ACE_USHORT16 *n); - void name (const char *n); - - // = Query property value. - ACE_WString &value_rep (void); - const ACE_WString &value (void) const; - - // = Set property value. - void value (const ACE_USHORT16 *v); - void value (const char *v); - - // = Helper functions for encoding and decoding. - size_t size (void) const; - // Returns memory size (in bytes) required to encode this object. - - size_t encode (void *buf) const; - // Encodes this object into buf for network transmission. - - size_t decode (void *buf); - // Decodes buf and modifies this object, you should - // probably create this with default ctor. - - void dump (void) const; - // Dump out this object for debug. - -protected: - ACE_WString name_; - // Property name pointer. - - ACE_WString value_; - // Property value. -} ; - -typedef ACE_Array ACE_URL_Property_Seq; -// type of URL_Property collections. - -class ACE_Svc_Export ACE_URL_Offer - // = TITLE - // Defines a URL offer. - // - // = DESCRIPTION - // A URL offer is defined by a and an - // . An offer is stored at server end - // thru registering or reported back to querying client from the - // sever. -{ -public: - ACE_URL_Offer (const size_t size = 1, const char *url = 0); - // Create an offer. - - ACE_URL_Offer (const ACE_URL_Offer &o); - // Copy ctor. - - ~ACE_URL_Offer (void); - // Default destructor. - - ACE_URL_Offer &operator= (const ACE_URL_Offer &rhs); - // Assignment operator. - - int operator== (const ACE_URL_Offer &rhs) const; - // Equality operator. - - int operator!= (const ACE_URL_Offer &rhs) const; - // Inequality operator. - - // = Get URL string. - ACE_WString &url_rep (void); - const ACE_WString &url (void) const; - - // = Set URL. - void url (const char *url); - void url (const ACE_USHORT16 *url); - - ACE_URL_Property_Seq &url_properties (void); - // Get properties of this offer. - - void url_properties (const ACE_URL_Property_Seq &prop); - // Set properties of this offer. This operation virtually get a - // copy of the passed in prop. - - // = Helper functions for encoding and decoding. - size_t size (void) const; - // Returns memory size (in bytes) required to encode this object. - - size_t encode (void *buf) const; - // Encodes this object into buf for network transmission. - - size_t decode (void *buf); - // Decodes buf into current object, you better use - // the default ctor. - - void dump (void) const; - // Dump this object for debug. - -protected: - ACE_WString url_; - // URL of this offer. - - ACE_URL_Property_Seq prop_; - // Properties associate with this offer. -}; - -typedef ACE_Array ACE_URL_Offer_Seq; -// type of URL offer collections. - -#if defined (__ACE_INLINE__) -#include "URL_Properties.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_WEB_PROPERTIES_H */ diff --git a/apps/JAWS/clients/Caching/URL_Properties.i b/apps/JAWS/clients/Caching/URL_Properties.i deleted file mode 100644 index 9e0cb59d03e..00000000000 --- a/apps/JAWS/clients/Caching/URL_Properties.i +++ /dev/null @@ -1,203 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - -ACE_INLINE size_t -ACE_WString_Helper::size (const ACE_WString &wstr) -{ - return (wstr.length () + 1) * sizeof (ACE_USHORT16); -} - -ACE_INLINE -ACE_URL_Property::ACE_URL_Property (const char *name, const char *value) - : name_ (name), - value_ (value) -{ -} - -ACE_INLINE -ACE_URL_Property::ACE_URL_Property (const ACE_USHORT16 *name, - const ACE_USHORT16 *value) - : name_ (name), - value_ (value) -{ -} - -ACE_INLINE -ACE_URL_Property::ACE_URL_Property (const ACE_URL_Property &p) - : name_ (p.name_), - value_ (p.value_) -{ -} - -ACE_INLINE -ACE_URL_Property::~ACE_URL_Property (void) -{ -} - -ACE_INLINE ACE_URL_Property & -ACE_URL_Property::operator= (const ACE_URL_Property &rhs) -{ - if (this != &rhs) - { - this->name_ = rhs.name_; - this->value_ = rhs.value_; - } - return *this; -} - -ACE_INLINE int -ACE_URL_Property::operator== (const ACE_URL_Property &rhs) const -{ - if (this == &rhs || this->name_ != rhs.name_ || - this->value_ != rhs.value_) - return 1; - else - return 0; -} - -ACE_INLINE int -ACE_URL_Property::operator!= (const ACE_URL_Property &rhs) const -{ - return !(*this == rhs); -} - -ACE_INLINE ACE_WString & -ACE_URL_Property::name_rep (void) -{ - return this->name_; -} - -ACE_INLINE const ACE_WString & -ACE_URL_Property::name (void) const -{ - return this->name_; -} - -ACE_INLINE void -ACE_URL_Property::name (const char *n) -{ - this->name_ = ACE_WString (n); -} - -ACE_INLINE void -ACE_URL_Property::name (const ACE_USHORT16 *n) -{ - this->name_ = ACE_WString (n); -} - -ACE_INLINE ACE_WString & -ACE_URL_Property::value_rep (void) -{ - return this->value_; -} - -ACE_INLINE const ACE_WString & -ACE_URL_Property::value (void) const -{ - return this->value_; -} - -ACE_INLINE void -ACE_URL_Property::value (const char *v) -{ - this->value_ = ACE_WString (v); -} - -ACE_INLINE void -ACE_URL_Property::value (const ACE_USHORT16 *v) -{ - this->value_ = ACE_WString (v); -} - - -ACE_INLINE size_t -ACE_URL_Property::size (void) const -{ - size_t len = 2; - len += this->name_.length () + this->value_.length (); - return len * sizeof (ACE_USHORT16); -} - -ACE_INLINE -ACE_URL_Offer::ACE_URL_Offer (const size_t size, const char *url) - : url_ (url), - prop_ (size) -{ -} - -ACE_INLINE -ACE_URL_Offer::ACE_URL_Offer (const ACE_URL_Offer &o) - : url_ (o.url_), - prop_ (o.prop_) -{ -} - -ACE_INLINE -ACE_URL_Offer::~ACE_URL_Offer (void) -{ -} - -ACE_INLINE ACE_URL_Offer & -ACE_URL_Offer::operator= (const ACE_URL_Offer &rhs) -{ - if (this != &rhs) - { - this->url_ = rhs.url_; - this->prop_ = rhs.prop_; - } - return *this; -} - -ACE_INLINE int -ACE_URL_Offer::operator== (const ACE_URL_Offer &rhs) const -{ - if (this == &rhs - && this->url_ == rhs.url_ - && this->prop_ == rhs.prop_) - return 1; - else - return 0; -} - -ACE_INLINE int -ACE_URL_Offer::operator!= (const ACE_URL_Offer &rhs) const -{ - return !(*this == rhs); -} - -ACE_INLINE ACE_WString & -ACE_URL_Offer::url_rep (void) -{ - return this->url_; -} - -ACE_INLINE const ACE_WString & -ACE_URL_Offer::url (void) const -{ - return this->url_; -} - -ACE_INLINE void -ACE_URL_Offer::url (const ACE_USHORT16 *url) -{ - this->url_ = ACE_WString (url); -} - -ACE_INLINE void -ACE_URL_Offer::url (const char *url) -{ - this->url_ = ACE_WString (url); -} - -ACE_INLINE ACE_URL_Property_Seq & -ACE_URL_Offer::url_properties (void) -{ - return this->prop_; -} - -ACE_INLINE void -ACE_URL_Offer::url_properties (const ACE_URL_Property_Seq &prop) -{ - this->prop_ = prop; -} diff --git a/apps/JAWS/clients/Caching/http_client.cpp b/apps/JAWS/clients/Caching/http_client.cpp deleted file mode 100644 index 6022cb289f2..00000000000 --- a/apps/JAWS/clients/Caching/http_client.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// apps/JAWS/clients/Caching -// -// = FILENAME -// http_client.cpp -// -// = DESCRIPTION -// This is a very simple client. It accepts URLs from a prompt, and -// will try to fetch them. Also accepts shell escapes. -// -// = AUTHOR -// James Hu -// -// ============================================================================ - -#include "http_handler.h" - -ACE_RCSID(Caching, http_client, "$Id$") - -int -main (int, char *[]) -{ - // Present a command line. - // * Accept a URL. - // Pass it to the HTTP_Connector. - // Connect. - // Report status. - // * Accept shell escape character. - - char buf[BUFSIZ]; - - ACE_DEBUG ((LM_DEBUG, "* ")); - - while (ACE_OS::fgets (buf, sizeof (buf), stdin) != NULL) - { - char *s = buf; - - // get rid of trailing '\n' - int len = ACE_OS::strlen (s); - - if (len > 0 && s[len - 1] == '\n') - s[len - 1] = 0; - - while (isspace (*s)) - s++; - - if (*s == '!') - { - do - s++; - while (isspace (*s)); - - // Shell command. - if (ACE_OS::system (s) == -1) - ACE_ERROR ((LM_ERROR, " ! Error executing: %s\n", s)); - } - else if (ACE_OS::strncmp (s, "http://", 7) == 0) - { - // URL - HTTP_Connector connector; - connector.connect (s); - } - else - ACE_ERROR ((LM_ERROR, " ? I don't understand: %s\n", s)); - - ACE_ERROR ((LM_ERROR, "* ")); - } - - ACE_DEBUG ((LM_DEBUG, "\nBye!\n")); - - return 0; -} diff --git a/apps/JAWS/clients/Caching/http_handler.cpp b/apps/JAWS/clients/Caching/http_handler.cpp deleted file mode 100644 index 7a1ceafd086..00000000000 --- a/apps/JAWS/clients/Caching/http_handler.cpp +++ /dev/null @@ -1,255 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// apps/JAWS/clients/Caching -// -// = FILENAME -// http_handler.cpp -// -// = AUTHOR -// James Hu -// -// ============================================================================ - -#include "ace/Filecache.h" -#include "http_handler.h" - -ACE_RCSID(Caching, http_handler, "$Id$") - -HTTP_Handler::HTTP_Handler (void) -{ -} - -HTTP_Handler::HTTP_Handler (const char * path) -{ - // How long is the request going to be? - this->request_[0] = '\0'; - this->request_size_ = - ACE_OS::strlen ("GET ") - + ACE_OS::strlen (path) - + ACE_OS::strlen (" HTTP/1.0\r\nAccept: HTTP/1.0\r\n\r\n"); - - // Make the request. - if ((u_int) this->request_size_ < sizeof (this->request_)) - ACE_OS::sprintf (this->request_, - "GET %s HTTP/1.0\r\nAccept: HTTP/1.0\r\n\r\n", - path); - - // Find the filename. - const char *last = ACE_OS::strrchr (path, '/'); - - if (last == 0) - last = path; - else if (last[1] == '\0') - last = "index.html"; - else - last = last+1; - - ACE_OS::sprintf (this->filename_, "%s", last); -} - -int -HTTP_Handler::open (void *) -{ - // If you want threads, use the activate stuff. -#if 0 - if (this->activate () != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, "HTTP_Handler::open, whups!\n"), -1); - } - - return 0; -#else - return this->svc (); -#endif /* 0 */ -} - -int -HTTP_Handler::svc (void) -{ - static char buf[BUFSIZ]; - int count = 0; - - ACE_DEBUG ((LM_DEBUG, "[%t] sending request --\n%s", this->request_)); - - this->peer ().send_n (this->request_, this->request_size_); - - // Read in characters until encounter \r\n\r\n - int done = 0; - char *contentlength; - - do - { - while (((count += this->peer ().recv_n (buf + count, 1)) > 0) - && ((u_int) count < sizeof (buf))) - { - buf[count] = '\0'; - - if (count < 2) - continue; - done = ACE_OS::strcmp (buf + count - 4, "\n\n") == 0; - - if (done) - break; - - if (count < 4) - continue; - - done = ACE_OS::strcmp (buf + count - 4, "\r\n\r\n") == 0; - - if (done) - break; - } - - if (!done) - { - char *last = ACE_OS::strrchr (buf, '\n'); - last[0] = '\0'; - - if ((contentlength = ACE_OS::strstr (buf, "\nContent-length:")) - || (contentlength = ACE_OS::strstr (buf, "\nContent-Length:"))) - done = 1; - else - { - last[0] = '\n'; - count = ACE_OS::strlen (last); - ACE_OS::memmove (buf, last, count + 1); - } - } - else - { - contentlength = ACE_OS::strstr (buf, "\nContent-length:"); - - if (!contentlength) - contentlength = - ACE_OS::strstr (buf, "\nContent-Length:"); - } - - } - while (!done); - - // ASSERT (contentlength != 0) - if (contentlength - && (::sscanf (contentlength, "\nContent-%*[lL]ength: %d ", - &this->response_size_) == 1)) - { - ACE_Filecache_Handle afh (this->filename_, - this->response_size_); - - this->peer ().recv_n (afh.address (), this->response_size_); - - ACE_DEBUG ((LM_DEBUG, - " ``%s'' is now cached.\n", - this->filename_)); - } - else - { - // Maybe we should do something more clever here, such as extend - // ACE_Filecache_Handle to allow the creation of cache objects - // whose size is unknown? - - // Another possibility is to write the contents out to a file, - // and then cache it. - - // Perhaps make ACE_Filecache_Handle more savvy, and allow a - // constructor which accepts a PEER as a parameter. - ACE_DEBUG ((LM_DEBUG, - "HTTP_Handler, no content-length header!\n")); - } - - return 0; -} - -const char * -HTTP_Handler::filename (void) const -{ - return this->filename_; -} - -int -HTTP_Connector::connect (const char * url) -{ - char host[BUFSIZ]; - u_short port; - char path[BUFSIZ]; - - if (this->parseurl (url, host, &port, path) == -1) - { - ACE_DEBUG ((LM_DEBUG, - "HTTP_Connector, error parsing url: %s\n", - url)); - return -1; - } - - HTTP_Handler hh (path); - HTTP_Handler *hhptr = &hh; - - // First check the cache. - if (ACE_Filecache::instance ()->find (hh.filename ()) == 0) - { - ACE_DEBUG ((LM_DEBUG, " ``%s'' is already cached.\n", - hh.filename ())); - return 0; - } - - return this->connector_.connect (hhptr, ACE_INET_Addr (port, host)); -} - -#define DEFAULT_SERVER_PORT 80 - -// extract the main components of a URL -int -HTTP_Connector::parseurl (const char *url, - char *host, - u_short *port, - char *path) -{ - int status = 0; - - // hackish, but useful - if (3 != ::sscanf (url, "http://%[^:/]:%hu%s", host, port, path)) - { - if (2 != ::sscanf (url, "http://%[^:/]:%hu", host, port)) - { - if (2 != ::sscanf (url, "http://%[^:/]%s", host, path)) - { - if (1 != ::sscanf (url, "http://%[^:/]", host)) - status = -1; - else - { - *port = DEFAULT_SERVER_PORT; - ACE_OS::strcpy (path, "/"); - } - } - else - *port = DEFAULT_SERVER_PORT; - } - else ACE_OS::strcpy (path, "/"); - } - - // 0 => success - // -1 => error - return status; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Connector; -template class ACE_Svc_Tuple; -template class ACE_Svc_Handler; -template class ACE_Map_Entry*>; -template class ACE_Map_Manager*, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base*, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator*, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator*, ACE_SYNCH_RW_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Connector -#pragma instantiate ACE_Svc_Tuple -#pragma instantiate ACE_Svc_Handler -#pragma instantiate ACE_Map_Entry*> -#pragma instantiate ACE_Map_Manager*, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base*, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator*, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator*, ACE_SYNCH_RW_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/JAWS/clients/Caching/http_handler.h b/apps/JAWS/clients/Caching/http_handler.h deleted file mode 100644 index 83bab4811d5..00000000000 --- a/apps/JAWS/clients/Caching/http_handler.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- c++ -*- */ -// Hey, Emacs! This is a C++ file. -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// apps/JAWS/clients/Caching -// -// = FILENAME -// http_handler.h -// -// = AUTHOR -// James Hu -// -// ============================================================================ - -#include "ace/SOCK_Connector.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Connector.h" - -class HTTP_Handler : public ACE_Svc_Handler - // = TITLE - // A simple HTTP protocol handler for clients. - // - // = DESCRIPTION - // Checks to see if the requested file is already cached. If - // so, it says so. If not, the request is issued to the - // connection. The fetched file is cached. -{ -public: - // = Initialization methods. - HTTP_Handler (void); - HTTP_Handler (const char * path); - - virtual int open (void *); - // Open hook. - - virtual int svc (void); - // Entry points defined by the abstract Svc_Handler. - - const char *filename (void) const; - // Accessor to the file being fetched. - -private: - char request_[BUFSIZ]; - int request_size_; - - char filename_[BUFSIZ]; - int response_size_; -}; - -class HTTP_Connector - // = TITLE - // A simple HTTP connector. - // - // = DESCRIPTION - // Creates an HTTP Handler based on the URL, and then delegates - // to to the SOCK_CONNECTOR. Adapter pattern. -{ -public: - int connect (const char * url); - // User entry point into the HTTP connector. - -private: - int parseurl (const char *url, - char *host, - u_short *port, - char *path); - // Helper function. - -private: - ACE_Connector connector_; - // Factory that actively establishes a connection with an HTTP - // server. -}; - diff --git a/apps/JAWS/clients/Caching/test_URL.cpp b/apps/JAWS/clients/Caching/test_URL.cpp deleted file mode 100644 index fdf7a632daa..00000000000 --- a/apps/JAWS/clients/Caching/test_URL.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// $Id$ - -#include "ace/streams.h" -#include "Locator_Request_Reply.h" - -ACE_RCSID(Caching, test_URL, "$Id$") - -int main (int argc, char *argv[]) -{ - ACE_UNUSED_ARG (argc); - ACE_UNUSED_ARG (argv); - - ACE_URL_Locator_Request original, derived; - - ACE_URL_Property_Seq ouch1(3); - ouch1[0].name ("name 1"); - ouch1[0].value ("value 1"); - ouch1[1].name ("name 2"); - ouch1[1].value ("value 2"); - ouch1[2].name ("name 3"); - ouch1[2].value ("value 3"); - - original.url_query (1, ouch1, 3); - - original.dump (); - derived.dump (); - - original.encode (); - - derived.decode ((void*) original.buffer ()); - - derived.dump (); - - return 0; -} diff --git a/apps/JAWS/clients/Makefile b/apps/JAWS/clients/Makefile deleted file mode 100644 index a09d6b017da..00000000000 --- a/apps/JAWS/clients/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id: Makefile 1.1 10/18/96 -# -# Makefile for JAWS -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -INFO = README - -DIRS = Blobby \ - Caching - - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU - diff --git a/apps/JAWS/clients/Makefile.bor b/apps/JAWS/clients/Makefile.bor deleted file mode 100644 index 02206e7ebba..00000000000 --- a/apps/JAWS/clients/Makefile.bor +++ /dev/null @@ -1,3 +0,0 @@ -DIRS = Blobby Caching - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/apps/JAWS/clients/README b/apps/JAWS/clients/README deleted file mode 100644 index e35d7af53c9..00000000000 --- a/apps/JAWS/clients/README +++ /dev/null @@ -1,13 +0,0 @@ -This directory contains the source code for various clients related to -JAWS, which is a high-performance HTTP Web server written with ACE. For -more information on JAWS, please see - -http://www.cs.wustl.edu/~jxh/research/ - -The subdirectories in this directory contain the following components - - . Blobby - a Blobby client - - . Caching - a Web client which caches - - . WebSTONE - modified to be multi-threaded diff --git a/apps/JAWS/clients/WebSTONE/COPYING b/apps/JAWS/clients/WebSTONE/COPYING deleted file mode 100644 index 13057b45514..00000000000 --- a/apps/JAWS/clients/WebSTONE/COPYING +++ /dev/null @@ -1,348 +0,0 @@ - While most of the source code in WebStone is covered by the terms -in the file LICENSE, the following files are covered by the GNU license, -reproduced below: - - config.guess - config.sub - ------------------------------ - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/apps/JAWS/clients/WebSTONE/README b/apps/JAWS/clients/WebSTONE/README deleted file mode 100644 index 2d024b925a1..00000000000 --- a/apps/JAWS/clients/WebSTONE/README +++ /dev/null @@ -1,245 +0,0 @@ -README WebStone 2.0.1 bug fix release - Proxy server bug fixed (now correctly handles proxy server) - Error reading page_stats error fixed - More Windows NT integration - Correctly handles URL's to different hostnames in the filelist - Improved Solaris compatibility - - NOTE: If you intend to run webstone with more than 100 URL -entries in the filelist, please edit src/bench.h and change the -MAXNUMOFPAGES value to reflect the higher number, and then recompile -everything. Copy the new binaries into the bin directory and then -run webstone. - -README WebStone 2.0 Release version - -WARNING: WebStone 2.0 results should not be compared with WebStone 1.1 - results. Even under the same fileset performance will not be - equivalent. - -Please see the notes for 2.0beta6 for quick and dirty install - This version includes a port of the webstone source code to Windows -NT. This port is still in progress, so it is not possible to guarantee -that everything is working correctly - however in our test configurations -it has performed correctly. Note that the supporting scripts and report -generating code has not been ported to NT yet. - - This version also institutes some basic run rules to eliminate the -lack of conformity in Webstone performance quotes. - To report Webstone numbers, some basic rules should be followed: - - 1) The fileset used for the test must be the fileset.standard fileset - included in the distribution. Tests of CGI performance must be - with the file filelist.cgi-heavy, and tests of NSAPI performance - must be carried out with filelist.dynamic-heavy - - 2) The run time should be set for 10 minutes, and the number of - clients should vary from 20 clients to 100 clients in increments - of 10. When a connections/second time is quoted, it must include - information about the number of clients involved. - - 3) Any special TCP/IP tuning which the server has recieved should - be documented, as well as HTTPD server version and configuration - information such as logging, DNS lookups and number of threads. - - -README - WebStone 2.0beta6 - -WARNING: Do not compare WebStone 2.0 results with WebStone 1.0 results. - WebStone 2.0 introduces significant changes in testing methodology - and reporting. - -This is the WebStone benchmark. Quick and dirty install: - - set up a Web server - - put this directory (WebStone) on a seperate machine (the "controller") - - "./webstone -setup", which does the following: - - gui-configure - This script may fail if you don't have a Web browser or - Perl5. Don't worry, unless you want to use the GUI. - - autoconf - If the GNU autoconf fails for your OS, please forward the - error messages, and any porting hints, to the author. - - make install - This may not be necessary, since IRIX binaries are included. - - edit conf/testbed to reflect your site - See the doc/FAQ-webstone.html for details. - - ./webstone -genfiles will put the files in conf/fileset - onto your Web server. - - ./webstone - - to display a table of results: ./webstone -results - -If you'd like to try out the GUI for WebStone: - - run "./webstone -setup", as above. - - make sure you have a Web browser installed - - ./configure - - ./webstone -gui - -Files of interest: - README: This document. - README.FIRST: Quick and dirty directions. - README.DynamicWorkload: Information on the CGI and NSAPI workloads. - webstone: wrapper shell script for everything. - Takes options: - -gui: start the GUI mode - -kill: kill stray WebStone processes - -genfiles: build files (from conf/fileset) - and rcp onto the server $SERVER - - results: print table of results - -setup: initial make and setup - -silent: runs in the background - -tail: tail -f of most recent run - -Files of interest (./src): - Makefile, *.c, *.h: The Webstone source code - -Files of interest (./bin): - checkfilelist: uses rsh to check web server for files in filelist. - genfiles, genrand: generates files of arbitrary length. - getstats: Collects network statistics from Web server, clients. - killbench: terminates stray WebStone processes. - rebootall: reboots all WebStone webclients. - runbench: wrapper script for WebStone. - webmaster: WebStone controller executable. - webstone: WebStone client executable. - wscollect: reports results in tabular format. - -Files of interest (./conf): - filelist: default list of files on the Web server, - with workload description. - filelist.photo: Model of a popular Web site - containing photographic images. - filelist.ss: Model of SGI's Silicon Surf WWW site. - fileset: list of files for genfiles to create. - testbed: config file describing Web server, client, and network setup. - -Documentation (./doc): - FAQ.html: The FAQ, current as of this distribution. - LICENSE: Legal status of WebStone. - testbed.help: Explains the parameters in conf/testbed. - webstone-white-paper.ps: The original WebStone white paper. - webstone.gif: The WebStone logo. - -Additional documentation: - FAQ.html: Frequently Asked Questions, with answers - webstone.ps: PostScript white paper on WebStone - -Problems, etc. may be addressed to the WebStone mailing list. -Read the FAQ for details. - -Release Notes (2.0 beta6): - * fixed a bug for Web servers not on port 80 - * further changes to bin/wscollect.pl - -Release Notes (2.0 beta5): - * numerous minor fixes suggested by gcc -Wall -pedantic - * updated FAQ - * changed bin/wscollect.pl to use Perl formats - -Release Notes (2.0 beta4): - * added #include to bench.h - * changed webclient located to $TMPDIR - this should help people - who don't want to run WebStone as root - * changed check for libm to floor() instead of sqrt(). Apparently - some systems implement sqrt() in libc - let's hope no one implement - floor() in libc and sqrt() in libm! - -Release Notes (2.0 beta3): - * more portability fixes - * successfully compiled on FreeBSD 2.2, IRIX without any source - changes - -Release Notes (2.0 beta2): - * additional timezone fixes for SunOS - -Release Notes (2.0 beta1): - * fixed a bug in the rexec portion of webmaster.c - * fixed a bug in the usage() routine of webmaster.c - * added bin/genfiles-from-filelist.sh - - bin/genfiles-from-filelist.sh - - generates appropriate-length files from - - must contain three fields: - # - example: /file.html 1 #1024 - * added bin/mine-logs.pl - - usage: mine-logs.pl - where is an http server log file - - writes a WebStone workload to standard output - -Release Notes (2.0 alpha5): - * revised default testbed file - * changed wscollect to wscollect.pl for consistency - * changed webstone-gui to webstone-gui.pl for consistency - * added some NT porting hints - * added autoconf, which should help Linux and SunOS porting - -Release Notes (2.0 alpha4): - * added SunOS and Linux portability elements - * new scheme for random access to pages - * converted several static arrays to dynamic pointers - -Release Notes (2.0 alpha2): - * fixed per-page statistics - * new, client-independent data-passing scheme - * added support for proxy servers - -Release Notes (2.0 alpha1): - * new filelist scheme - however, this breaks per-page statistics - * minor fixes - -Release Notes (1.1): - * Improved webclient performance by combining GET and ACCEPT - HTTP headers in one write() call. - * Improved webclient performance on systems that always attempt - to map protocol names to numbers using YP. - * WARNING: since the old code introduced a significant latency - in some systems, DO NOT compare WebStone 1.1 results - with results generated by any previous versions. - -Release Notes (1.0.3): - * Netscape Server 1.1.2 exposed a couple bugs, which I've now fixed. - -Release Notes (1.0.2): - * Fixed runbench so that ITERATIONS, MINCLIENTS, and MAXCLIENTS don't - have to have a common denominator any more. - * Fixed a few cosmetic bugs. - -Release Notes (1.0.1): - * Fixed select() bug in webmaster - -Release Notes (1.0 final): - * Fixed the "Error reading 2nd timing info" bug - * Fixed numerous bugs in the GUI - * Froze feature set. Work can now begin on WebStone 1.1 - -Release Notes (1.0b3): - * New Web browser GUI - NOTE: most Web browsers take up substantial CPU time. - If you run the GUI, we recommend that you make the controller - a separate machine, and don't run any WebStone clients on it. - * Minor bug fixes - Squashed some dubious error messages, fixed some client- - controller communications problems. - * Reporting changes - Changes the units and order of the final summary statistics. - Basically, this is for my own convenience, so I don't have to - massage the data quite so much before using it. wscollect - now reports only the metrics I regard as important - but all - metrics are still reported in the runs/*/run files. - -LEGAL STUFF: - -This file and all files contained in this directory are -copyright 1995, Silicon Graphics, Inc. - -This software is provided without support and without any obligation on the -part of Silicon Graphics, Inc. to assist in its use, correction, modification -or enhancement. There is no guarantee that this software will be included in -future software releases, and it probably will not be included. - -THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTIES OF ANY KIND INCLUDING THE -WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, -OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - -In no event will Silicon Graphics, Inc. be liable for any lost revenue or -profits or other special, indirect and consequential damages, even if -Silicon Graphics, Inc. has been advised of the possibility of such damages. \ No newline at end of file diff --git a/apps/JAWS/clients/WebSTONE/README.DynamicWorkload b/apps/JAWS/clients/WebSTONE/README.DynamicWorkload deleted file mode 100644 index a263d1a8a0e..00000000000 --- a/apps/JAWS/clients/WebSTONE/README.DynamicWorkload +++ /dev/null @@ -1,37 +0,0 @@ -WebStone Dynamic Workload - - WebStone now includes a workload that tests dynamically generated -Web pages. - - To use the dynamic workload models, you must install a dynamic module -on the Web server to be tested. The Web server must also be configured such -that a request for "/file.dyn-send?size=1024" (for example) will cause the -module to be run, and will return 1024 bytes of data. - -Example configuration (Netscape server, executable is "nsapi-send"): - cd src - make nsapi - cp nsapi-send.so /usr/lib - cd /usr/ns-home/httpd-80/config - in magnus.conf, add the line: - Init fn=load-modules shlib=nsapi.so funcs=nsapi-send - in obj.conf, add the line: - Service method=(GET|HEAD) fn=nsapi-send \ - type=magnus-internal/dyn-send - in mime.types, add the line: - type=magnus-internal/dyn-send exts=dyn-send - restart the Web server - - Example code for CGI and NS-API is included as src/cgi-send.c -and src/nsapi-send.c - if you implement other APIs, please forward a copy -of your code to the WebStone mailing list or to the WebStone authors. - -Included workloads: - conf/workload.dynamic-heavy: All content is dynamically generated. - conf/filelist.dynamic-medium: About 50% of content is dynamically - generated. - conf/filelist.dynamic-light: About 25% of content is dynamically - generated. - -As always, we encourage you to design your own workloads, tailored for your -environment. diff --git a/apps/JAWS/clients/WebSTONE/README.FIRST b/apps/JAWS/clients/WebSTONE/README.FIRST deleted file mode 100644 index b93c02afe3b..00000000000 --- a/apps/JAWS/clients/WebSTONE/README.FIRST +++ /dev/null @@ -1,21 +0,0 @@ -QUICK AND DIRTY README FOR WEBSTONE 2.0 - -For more details, consult the README* files and the doc/FAQ-webstone.html - -First, run: - - ./webstone -setup - - This script uses GNU autoconf, makes the binaries, and then -puts you into the vi editor with the conf/testbed file. For details on -how to edit conf/testbed, consult the FAQ. - -Next, if you have a Web broswer available, and you'd like to try the GUI - - ./webstone -gui - -Otherwise, run the benchmark by typing - - ./webstone - - diff --git a/apps/JAWS/clients/WebSTONE/WEBSTONE-VERSION-2.0 b/apps/JAWS/clients/WebSTONE/WEBSTONE-VERSION-2.0 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl b/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl deleted file mode 100755 index 9e52c1dec97..00000000000 --- a/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl +++ /dev/null @@ -1,63 +0,0 @@ -#!/pkg/gnu/bin//perl5 -# -#$Id$ -# - -1; - -sub show_model { - $model = `head -1 $wd/conf/filelist`; - $model =~ s/\#//; - ( $model ) = split(':', $model); - - print CLIENT < -$model - -EOF - ; -} - -sub html_begin { - - ( $title ) = @_; - - close(STDOUT); - open(STDOUT, ">&CLIENT"); - close(STDERR); - open(STDERR, ">&CLIENT"); - - print CLIENT < - -WebStone $title - -WebStone -

    World Wide Web Server Benchmarking

    -
    -
    If you have any questions, please read the -WebStone FAQ. -
    -EOF - ; - -} - -sub html_end { - - print CLIENT < -
    copyright 1995 Silicon Graphics -
    - - -EOF - ; - - close(STDERR); - close(STDOUT); - open(STDOUT); - open(STDERR); -} - -# end diff --git a/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl b/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl deleted file mode 100755 index 77d2495a741..00000000000 --- a/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl +++ /dev/null @@ -1,33 +0,0 @@ -#!/pkg/gnu/bin//perl5 -# -#$Id$ -# - -push(@INC, "$wd/bin"); -require('WebStone-common.pl'); - -html_begin("Administration"); - -$runsdir = "$wd/bin/runs"; -$thelength = length($runsdir) + 10; -$oldrunsdir = $runsdir; -$oldfilelist = "$wd/conf/filelist"; - -print CLIENT < -

    Clean up stray WebStone processes

    - - - -
    -
    -

    Move Results Directory to:

    - - -
    -EOF - ; - -html_end(); - -# end diff --git a/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl b/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl deleted file mode 100755 index 28efe90c4d5..00000000000 --- a/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl +++ /dev/null @@ -1,39 +0,0 @@ -#!/pkg/gnu/bin//perl5 -# -#$Id$ -# - -$testbed = "conf/testbed"; - -push(@INC, "$wd/bin"); -require('WebStone-common.pl'); - -html_begin("Run"); - -print CLIENT <
    Edit Configuration -
    -EOF - ; - -&show_model(); -print CLIENT "
    ";
    -
    -open(FILEHANDLE, $testbed);
    -while () {
    -    (/^\#/) || print CLIENT $_;
    -}
    -close(FILEHANDLE);
    -
    -print CLIENT <
    -
    -
    - -
    -EOF - ; - -html_end(); - -# end diff --git a/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl b/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl deleted file mode 100755 index f47ac6a8f06..00000000000 --- a/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl +++ /dev/null @@ -1,97 +0,0 @@ -#!/pkg/gnu/bin//perl5 -# -#$Id$ -# - -push(@INC, "$wd/bin"); -require('WebStone-common.pl'); - -@keylist = (); - -html_begin("Setup"); - -show_model(); - -print CLIENT < -EOF - ; - -&gettestbed(); -&getconfig(); - -print CLIENT < -

    - - -


    -
    -

    Choose a Web site model:

    -
    -EOF - ; - -for $key (sort(keys %filelist)) { - print CLIENT "
    $key: $filelist{$key}"; -} - -print CLIENT < - - -EOF - ; - -html_end(); - -# end of main program - -sub gettestbed { - open(TESTBED, "$wd/conf/testbed"); - while () { - if (/^\#|^(\w)*$/) { # do nothing - } - else { - ( $textvalue, $thevalue ) = split( '=', $_ ); - ( $thevalue ) = split( '#', $thevalue); - $testbed{$textvalue} = $thevalue; - push(@keylist, $textvalue); - } - } - close(TESTBED); - - open(HELPFILE, "$wd/doc/testbed.help"); - while () { - ( $key, $textvalue ) = split( ':', $_ ); - $helptext{$key} = $textvalue; - } - close(HELPFILE); - - foreach $key (@keylist) { - print CLIENT "

    $helptext{$key}"; - $thesize = length($testbed{$key}) + 5; - print CLIENT "
    $key \n"; - } -} - -sub getconfig { - opendir(CONF, "$wd/conf") || die "open $wd/conf: $!"; - %filelist = ""; - foreach $file (sort readdir(CONF)) { - if ( $file =~ /^filelist.*/ ) { - $headtext = `head -1 $wd/conf/$file`; - $headtext =~ s/\#//; - ( $headtext ) = split(':', $headtext); - $filelist{$file} = $headtext; - } - } - closedir(CONF); -} - -# end diff --git a/apps/JAWS/clients/WebSTONE/bin/checkfilelist b/apps/JAWS/clients/WebSTONE/bin/checkfilelist deleted file mode 100755 index 4cc2d11c49e..00000000000 --- a/apps/JAWS/clients/WebSTONE/bin/checkfilelist +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh - -# -# NAME -# checkfilelist - try retrieving files from server -# -# SYNOPSIS -# checkfilelist servername portno filelist -# -# - -if test "$#" -lt 3 ; then - echo "usage: $0 servername portno filelist" - exit 2 -fi - -HOSTNAME=$1 ; export HOSTNAME -PORTNO=$2 ; export PORTNO -FILELIST=$3 ; export FILELIST - -grep '^/' $FILELIST | cut -f1 | -( -while read URL -do - export URL - echo ">>>>> $URL" - ( - telnet $HOSTNAME $PORTNO << _EOF_ -GET $URL HTTP/1.0 - -_EOF_ - ) 2> /dev/null | head -5 | grep 'HTTP/1.0' - killall telnet -done -) diff --git a/apps/JAWS/clients/WebSTONE/bin/genfiles b/apps/JAWS/clients/WebSTONE/bin/genfiles deleted file mode 100755 index d5f06aee6df..00000000000 --- a/apps/JAWS/clients/WebSTONE/bin/genfiles +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh -# - -# get configuration -. $WEBSTONEROOT/conf/testbed - -cat $WEBSTONEROOT/conf/fileset | -nawk ' -($1 ~ /^[0-9][0-9]*[kK][bB]*$/) { - sub(/[kK][bB]*/, "", $1); - cmd = "$WEBSTONEROOT/bin/genrand " $1*1024 " " $2 - print cmd; - system(cmd); - next -} - -($1 ~ /^[0-9][0-9]*[mM][bB]*$/) { - sub(/[kK][bB]*/, "", $1); - cmd = "$WEBSTONEROOT/bin/genrand " $1*1024*1024 " " $2 - print cmd; - system(cmd); - next -} - -($1 ~ /^[0-9][0-9]*$/) { - sub(/[kK][bB]*/, "", $1); - cmd = "$WEBSTONEROOT/bin/genrand " $1 " " $2 - print cmd; - system(cmd); - next -} ' $* - -# copy files -files=`cat $WEBSTONEROOT/conf/fileset | cut -f2 -d' '` -for f in $files -do - $RCP $f $SERVER:$WEBDOCDIR - rm -f $f -done - -#end diff --git a/apps/JAWS/clients/WebSTONE/bin/genfiles-from-filelist.sh b/apps/JAWS/clients/WebSTONE/bin/genfiles-from-filelist.sh deleted file mode 100755 index 1293709238c..00000000000 --- a/apps/JAWS/clients/WebSTONE/bin/genfiles-from-filelist.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# - -# get configuration -[ -n "$WEBSTONEROOT" ] || WEBSTONEROOT=`pwd`/.. -. $WEBSTONEROOT/conf/testbed - -case $# in - 1) - FILELIST=$1 - ;; - *) - FILELIST=$WEBSTONEROOT/conf/filelist - ;; -esac - -TIMESTAMP=`date +"%y%m%d_%H%M"` -mkdir $TMPDIR/webstone-genfiles.$TIMESTAMP -cd $TMPDIR/webstone-genfiles.$TIMESTAMP - -cat $FILELIST | -nawk ' -($3 ~ /^\#[0-9]*/) { - sub(/^\#/, "", $3); - cmd = WEBSTONEROOT "/bin/genrand " $3 " ."$1 - print cmd; - system(cmd); - cmd = RCP " ." $1 " " SERVER ":" WEBDOCDIR - print cmd; - system(cmd); - cmd = "rm -f ." $1 - print cmd; - system(cmd); - next -} -' $* WEBSTONEROOT=$WEBSTONEROOT RCP=$RCP SERVER=$SERVER WEBDOCDIR=$WEBDOCDIR - -cd $TMPDIR -rm -rf $TMPDIR/webstone-genfiles.$TIMESTAMP - -#end diff --git a/apps/JAWS/clients/WebSTONE/bin/gui-configure b/apps/JAWS/clients/WebSTONE/bin/gui-configure deleted file mode 100755 index dcea4e3fe1c..00000000000 --- a/apps/JAWS/clients/WebSTONE/bin/gui-configure +++ /dev/null @@ -1,174 +0,0 @@ -#!/bin/sh -- because we're not sure where perl is yet -# - -'true' || eval 'exec perl -S $0 $argv:q'; -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' -& eval 'exec /usr/local/bin/perl -S $0 $argv:q' - if 0; - -# Usage: [perl] configure [file] -# -# This replaces the program paths (e.g. /bin/awk) with an -# alternate path that is found in the file "file.paths". It also finds -# perl5 and changes the path in all the stand-alone perl programs. -# - -$debug = 0; - -# -# Target shell scripts in question: -@shell_scripts=("conf/paths.pl", "conf/paths.sh"); -@perl5_src = < bin/webstone-gui.pl bin/WebStone-common.pl bin/killbench.pl bin/view-results.pl bin/WebStone-manage.pl bin/move-filelist.pl bin/write-testbed.pl bin/WebStone-run.pl bin/move-runs.pl bin/WebStone-setup.pl bin/runbench.pl >; -@perl_src = < bin/wscollect.pl bin/mine-logs.pl >; -@benchmark_dir_src = < webstone bin/killbench bin/runbench >; - -# all the HTML browsers we know about, IN ORDER OF PREFERENCE! -@all_www= ("netscape", "Mosaic", "xmosaic", "lynx"); - -# -# Potential directories to find commands; first, find the user's path... -$PATH = $ENV{"PATH"}; - -# additional dirs; *COLON* separated! -$other_dirs="/usr/ccs/bin:/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/ucb/bin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/bin/X11:/usr/X11/bin:/usr/openwin/bin"; - -# -# split into a more reasonable format. Personal aliases come last. -@all_dirs = split(/:/, $other_dirs . ":" . $PATH); - -print "checking to make sure all the target(s) are here...\n"; - -for (@shell_scripts) { - die "ERROR -- $_ not found!\n" unless -f $_; - } - -# find perl -print "Trying to find perl...\n"; -for $dir (@all_dirs) { - # first, find where it might be - next if (! -d $dir); - while (<$dir/perl*>) { - if (-x $_) { - $perl_version=`($_ -v 2> /dev/null) | - awk '/This is perl/ { print $NF }'`; - if ($perl_version) { - $PERL=$_; - $pflag="1"; - last; - } - } - last if $pflag; - } - last if $pflag; - } - -if ($PERL) { - print "\nPerl is in $PERL\n"; - for (@perl_src) { $perl_src .= "$_ "; } - print "\nchanging the source in: $perl_src\n"; - system "$PERL -pi -e \"s@^#!.*/perl.*@#!$PERL@;\" $perl_src"; - - # make sure things are executable... - system("chmod u+x $perl_src"); -} -else -{ - printf "\nSome WebStone functions require Perl\n" unless $PERL; -} -# end if $PERL - -# find perl5 -$pflag = 0; -print "Trying to find perl5...\n"; -for $dir (@all_dirs) { - # first, find where it might be; oftentimes you'll see perl, - # perl4, perl5, etc. in the same dir - next if (! -d $dir); - while (<$dir/perl5* $dir/perl*>) { - if (-x $_) { - $perl_version=`($_ -v 2> /dev/null) | - awk '/This is perl, version 5/ { print $NF }'`; - if ($perl_version) { - $PERL5=$_; - $pflag="1"; - last; - } - } - last if $pflag; - } - last if $pflag; -} - -if ($PERL5) { - print "\nPerl5 is in $PERL5\n"; - - for (@perl5_src) { $perl5_src .= "$_ "; } - print "\nchanging the source in: $perl5_src\n"; - system "$PERL5 -pi -e \"s@^#!.*/perl.*@#!$PERL5@;\" $perl5_src"; - system("chmod u+x $perl5_src"); -} -else -{ - printf "\nThe WebStone GUI requires Perl5\n" unless $PERL5; -} -#end if $PERL5 - -# find the most preferred www viewer first. -for $www (@all_www) { - for $dir (@all_dirs) { - if (!$MOSAIC) { - if (-x "$dir/$www") { - $MOSAIC="$dir/$www"; - next; - } - } - } - } -if ($MOSAIC) { - print "\nHTML/WWW Browser is $MOSAIC\n"; - - $upper{"MOSAIC"} = $MOSAIC; - } -else { print "Cannot find a web browser! WebStone cannot be run except in CLI"; } - -print "\nOk, now doing substitutions on the shell scripts...\n"; -for $shell (@shell_scripts) { - print "Changing paths in $shell...\n"; - die "Can't open $shell\n" unless open(SCRIPT, $shell); - rename($shell, $shell . '.old'); - die "Can't open $shell\n" unless open(OUT, ">$shell"); - - # - # Open up the script, search for lines beginning with - # stuff like "TEST", "AWK", etc. If the file ends in "pl", - # assume it's a perl script and change it accordingly - while (